From 79fa7ba16d17c485ac9356f90cb2386e8a539286 Mon Sep 17 00:00:00 2001
From: Renan DelValle <rdelval@users.noreply.github.com>
Date: Wed, 20 Feb 2019 11:11:46 -0800
Subject: [PATCH] Upgrading gorealis v1 to Thrift 0.12.0 code generation. End
 to end tests cleanup (#96)

* Ported all code from Thrift 0.9.3 to Thrift 0.12.0 while backporting some fixes from gorealis v2

* Removing git.apache.org dependency from Vendor folder as this dependency has migrated to github.

* Adding github.com thrift dependency back but now it points to github.com

* Removing unnecessary files from Thrift Vendor folder and adding them to .gitignore.

* Updating dep dependencies to include Thrift 0.12.0 from github.com

* Adding changelog.

* End to end tests: Adding coverage for killinstances.

*  End to end tests: Deleting instances after partition policy recovers them.

*  End to end tests: Adding more coverage to the realis API.

*  End to end tests: Allowing arguments to be passed to runTestMac so that '-run <test name>' can be passed in.

*  End to end tests: Reducing the resources used by CreateJob test.

*  End to end tests: Adding coverage for Pause and Resume update.

*   End to end tests: Removed checks for Aurora_OK response as that should always be handled by the error returned by the API. Changed names to be less verbose and repetitive.

*  End to end tests: Reducing watch time for instance running when creating service for reducing time it takes to run end to end test.
---
 .gitignore                                    |    11 +
 CHANGELOG.md                                  |     6 +
 Gopkg.lock                                    |    32 +-
 Gopkg.toml                                    |     5 +-
 examples/client.go                            |    19 +-
 gen-go/apache/aurora/GoUnusedProtection__.go  |     7 +
 gen-go/apache/aurora/auroraAPI-consts.go      |    54 +
 gen-go/apache/aurora/auroraAPI.go             | 29020 ++++++++++++++++
 .../aurora_admin-remote.go                    |  2343 +-
 .../aurora_scheduler_manager-remote.go        |  1607 +-
 gen-go/apache/aurora/auroraadmin.go           |  5870 ----
 .../apache/aurora/auroraschedulermanager.go   |  5115 ---
 gen-go/apache/aurora/constants.go             |    89 -
 .../read_only_scheduler-remote.go             |   769 +-
 gen-go/apache/aurora/readonlyscheduler.go     |  4293 ---
 gen-go/apache/aurora/ttypes.go                | 16424 ---------
 job.go                                        |    67 +-
 monitors.go                                   |    12 +-
 realis.go                                     |   188 +-
 realis_e2e_test.go                            |   250 +-
 retry.go                                      |     2 +-
 runTestsMac.sh                                |     2 +-
 updatejob.go                                  |    11 +-
 util.go                                       |    75 +
 .../git.apache.org/thrift.git/.clang-format   |    56 -
 .../git.apache.org/thrift.git/.dockerignore   |     1 -
 .../git.apache.org/thrift.git/.editorconfig   |   112 -
 .../git.apache.org/thrift.git/.gitattributes  |     1 -
 vendor/git.apache.org/thrift.git/.gitignore   |   326 -
 vendor/git.apache.org/thrift.git/.travis.yml  |   199 -
 vendor/git.apache.org/thrift.git/CHANGES      |  2366 --
 .../git.apache.org/thrift.git/CMakeLists.txt  |   117 -
 .../git.apache.org/thrift.git/CONTRIBUTING.md |    49 -
 vendor/git.apache.org/thrift.git/Dockerfile   |    61 -
 vendor/git.apache.org/thrift.git/LICENSE      |   239 -
 vendor/git.apache.org/thrift.git/Makefile.am  |   131 -
 vendor/git.apache.org/thrift.git/NOTICE       |     5 -
 vendor/git.apache.org/thrift.git/README.md    |   166 -
 .../git.apache.org/thrift.git/Thrift.podspec  |    18 -
 .../thrift.git/aclocal/ac_prog_bison.m4       |    54 -
 .../thrift.git/aclocal/ax_boost_base.m4       |   272 -
 .../thrift.git/aclocal/ax_check_openssl.m4    |   124 -
 .../aclocal/ax_cxx_compile_stdcxx_11.m4       |   165 -
 .../thrift.git/aclocal/ax_dmd.m4              |   107 -
 .../thrift.git/aclocal/ax_javac_and_java.m4   |   129 -
 .../thrift.git/aclocal/ax_lib_event.m4        |   194 -
 .../thrift.git/aclocal/ax_lib_zlib.m4         |   173 -
 .../thrift.git/aclocal/ax_lua.m4              |   664 -
 .../aclocal/ax_prog_haxe_version.m4           |    60 -
 .../aclocal/ax_prog_perl_modules.m4           |    77 -
 .../aclocal/ax_signed_right_shift.m4          |   127 -
 .../thrift.git/aclocal/ax_thrift_internal.m4  |    28 -
 .../aclocal/m4_ax_compare_version.m4          |   177 -
 vendor/git.apache.org/thrift.git/appveyor.yml |    93 -
 vendor/git.apache.org/thrift.git/bootstrap.sh |    54 -
 vendor/git.apache.org/thrift.git/bower.json   |    16 -
 .../build/appveyor/download_openssl.py        |    41 -
 .../thrift.git/build/cmake/CPackConfig.cmake  |    68 -
 .../build/cmake/ConfigureChecks.cmake         |    76 -
 .../build/cmake/DefineCMakeDefaults.cmake     |    70 -
 .../build/cmake/DefineInstallationPaths.cmake |    26 -
 .../build/cmake/DefineOptions.cmake           |   210 -
 .../build/cmake/DefinePlatformSpecifc.cmake   |   106 -
 .../thrift.git/build/cmake/FindAnt.cmake      |    30 -
 .../thrift.git/build/cmake/FindCabal.cmake    |    30 -
 .../thrift.git/build/cmake/FindGHC.cmake      |    36 -
 .../thrift.git/build/cmake/FindGLIB.cmake     |   122 -
 .../thrift.git/build/cmake/FindGradle.cmake   |    30 -
 .../thrift.git/build/cmake/FindLibevent.cmake |    41 -
 .../thrift.git/build/cmake/README.md          |    60 -
 .../thrift.git/build/cmake/ThriftMacros.cmake |   105 -
 .../build/cmake/android-toolchain.cmake       |    26 -
 .../thrift.git/build/cmake/config.h.in        |   157 -
 .../build/cmake/mingw32-toolchain.cmake       |    24 -
 .../thrift.git/build/docker/README.md         |    27 -
 .../thrift.git/build/docker/Vagrantfile       |    59 -
 .../thrift.git/build/docker/centos/Dockerfile |   142 -
 .../build/docker/centos6/Dockerfile           |    54 -
 .../build/docker/check_unmodified.sh          |    42 -
 .../thrift.git/build/docker/debian/Dockerfile |   192 -
 .../build/docker/scripts/autotools.sh         |     6 -
 .../thrift.git/build/docker/scripts/cmake.sh  |    23 -
 .../build/docker/scripts/cross-test.sh        |    16 -
 .../thrift.git/build/docker/scripts/dpkg.sh   |     5 -
 .../build/docker/scripts/make-dist.sh         |     9 -
 .../thrift.git/build/docker/ubuntu/Dockerfile |   209 -
 .../build/travis/installCXXDependencies.sh    |    29 -
 .../build/travis/installDependencies.sh       |    66 -
 vendor/git.apache.org/thrift.git/cleanup.sh   |    89 -
 .../thrift.git/compiler/cpp/CMakeLists.txt    |   206 -
 .../thrift.git/compiler/cpp/Makefile.am       |   203 -
 .../thrift.git/compiler/cpp/README.md         |    83 -
 .../compiler/cpp/coding_standards.md          |     4 -
 .../thrift.git/compiler/cpp/compiler.sln      |    20 -
 .../thrift.git/compiler/cpp/compiler.vcxproj  |   249 -
 .../compiler/cpp/compiler.vcxproj.filters     |   196 -
 .../thrift.git/compiler/cpp/src/Makefile.am   |    87 -
 .../compiler/cpp/src/thrift/audit/t_audit.cpp |   464 -
 .../compiler/cpp/src/thrift/audit/t_audit.h   |    14 -
 .../compiler/cpp/src/thrift/common.cc         |    69 -
 .../compiler/cpp/src/thrift/common.h          |    43 -
 .../src/thrift/generate/t_as3_generator.cc    |  2594 --
 .../src/thrift/generate/t_c_glib_generator.cc |  4562 ---
 .../src/thrift/generate/t_cocoa_generator.cc  |  3301 --
 .../src/thrift/generate/t_cpp_generator.cc    |  4374 ---
 .../src/thrift/generate/t_csharp_generator.cc |  3202 --
 .../cpp/src/thrift/generate/t_d_generator.cc  |   728 -
 .../src/thrift/generate/t_dart_generator.cc   |  2516 --
 .../src/thrift/generate/t_delphi_generator.cc |  3920 ---
 .../src/thrift/generate/t_erl_generator.cc    |  1169 -
 .../cpp/src/thrift/generate/t_generator.cc    |   190 -
 .../cpp/src/thrift/generate/t_generator.h     |   310 -
 .../thrift/generate/t_generator_registry.h    |   106 -
 .../cpp/src/thrift/generate/t_go_generator.cc |  3685 --
 .../cpp/src/thrift/generate/t_gv_generator.cc |   345 -
 .../src/thrift/generate/t_haxe_generator.cc   |  2981 --
 .../cpp/src/thrift/generate/t_hs_generator.cc |  1734 -
 .../src/thrift/generate/t_html_generator.cc   |  1088 -
 .../src/thrift/generate/t_html_generator.h    |   240 -
 .../src/thrift/generate/t_java_generator.cc   |  5280 ---
 .../src/thrift/generate/t_javame_generator.cc |  3296 --
 .../cpp/src/thrift/generate/t_js_generator.cc |  2273 --
 .../src/thrift/generate/t_json_generator.cc   |   727 -
 .../src/thrift/generate/t_lua_generator.cc    |  1138 -
 .../src/thrift/generate/t_ocaml_generator.cc  |  1762 -
 .../cpp/src/thrift/generate/t_oop_generator.h |   112 -
 .../src/thrift/generate/t_perl_generator.cc   |  1648 -
 .../src/thrift/generate/t_php_generator.cc    |  2656 --
 .../cpp/src/thrift/generate/t_py_generator.cc |  2648 --
 .../cpp/src/thrift/generate/t_rb_generator.cc |  1263 -
 .../cpp/src/thrift/generate/t_st_generator.cc |  1055 -
 .../src/thrift/generate/t_swift_generator.cc  |  2209 --
 .../src/thrift/generate/t_xml_generator.cc    |   687 -
 .../src/thrift/generate/t_xsd_generator.cc    |   376 -
 .../compiler/cpp/src/thrift/globals.h         |   141 -
 .../compiler/cpp/src/thrift/logging.cc        |    77 -
 .../compiler/cpp/src/thrift/logging.h         |    47 -
 .../compiler/cpp/src/thrift/main.cc           |  1307 -
 .../thrift.git/compiler/cpp/src/thrift/main.h |   119 -
 .../compiler/cpp/src/thrift/parse/parse.cc    |    39 -
 .../cpp/src/thrift/parse/t_base_type.h        |   117 -
 .../compiler/cpp/src/thrift/parse/t_const.h   |    50 -
 .../cpp/src/thrift/parse/t_const_value.h      |   155 -
 .../cpp/src/thrift/parse/t_container.h        |    47 -
 .../compiler/cpp/src/thrift/parse/t_doc.h     |    55 -
 .../compiler/cpp/src/thrift/parse/t_enum.h    |   110 -
 .../cpp/src/thrift/parse/t_enum_value.h       |    50 -
 .../compiler/cpp/src/thrift/parse/t_field.h   |   134 -
 .../cpp/src/thrift/parse/t_function.h         |    84 -
 .../compiler/cpp/src/thrift/parse/t_list.h    |    41 -
 .../compiler/cpp/src/thrift/parse/t_map.h     |    45 -
 .../compiler/cpp/src/thrift/parse/t_program.h |   395 -
 .../compiler/cpp/src/thrift/parse/t_scope.h   |   181 -
 .../compiler/cpp/src/thrift/parse/t_service.h |    61 -
 .../compiler/cpp/src/thrift/parse/t_set.h     |    41 -
 .../compiler/cpp/src/thrift/parse/t_struct.h  |   171 -
 .../compiler/cpp/src/thrift/parse/t_type.h    |   108 -
 .../cpp/src/thrift/parse/t_typedef.cc         |    34 -
 .../compiler/cpp/src/thrift/parse/t_typedef.h |    67 -
 .../compiler/cpp/src/thrift/platform.h        |    47 -
 .../cpp/src/thrift/plugin/Makefile.am         |    47 -
 .../compiler/cpp/src/thrift/plugin/plugin.cc  |   503 -
 .../compiler/cpp/src/thrift/plugin/plugin.h   |    44 -
 .../cpp/src/thrift/plugin/plugin.thrift       |   202 -
 .../cpp/src/thrift/plugin/plugin_output.cc    |   410 -
 .../cpp/src/thrift/plugin/plugin_output.h     |    38 -
 .../cpp/src/thrift/plugin/type_util.h         |    94 -
 .../compiler/cpp/src/thrift/thriftl.ll        |   463 -
 .../compiler/cpp/src/thrift/thrifty.yy        |  1193 -
 .../compiler/cpp/src/thrift/version.h.in      |    29 -
 .../compiler/cpp/src/thrift/windows/config.h  |    66 -
 .../compiler/cpp/test/CMakeLists.txt          |    77 -
 .../thrift.git/compiler/cpp/test/Makefile.am  |    51 -
 .../compiler/cpp/test/cpp_plugin_test.cmake   |    45 -
 .../compiler/cpp/test/cpp_plugin_test.sh      |    27 -
 .../cpp/test/plugin/conversion_test.cc        |   496 -
 .../compiler/cpp/test/plugin/cpp_plugin.cc    |    43 -
 .../git.apache.org/thrift.git/composer.json   |    30 -
 vendor/git.apache.org/thrift.git/configure.ac |   959 -
 .../thrift.git/contrib/Rebus/App.config       |    33 -
 .../thrift.git/contrib/Rebus/Program.cs       |    81 -
 .../contrib/Rebus/Properties/AssemblyInfo.cs  |    38 -
 .../thrift.git/contrib/Rebus/README.md        |    21 -
 .../contrib/Rebus/RebusSample.csproj          |   102 -
 .../thrift.git/contrib/Rebus/RebusSample.sln  |    28 -
 .../contrib/Rebus/ServiceImpl/Both.cs         |    35 -
 .../contrib/Rebus/ServiceImpl/Client.cs       |   157 -
 .../contrib/Rebus/ServiceImpl/Server.cs       |   143 -
 .../thrift.git/contrib/Rebus/sample.thrift    |    30 -
 .../thrift.git/contrib/Stomp/README.md        |    18 -
 .../contrib/Stomp/Thrift.Transport.STOMP.pas  |   200 -
 .../thrift.git/contrib/Vagrantfile            |   133 -
 .../thrift.git/contrib/async-test/aggr.thrift |     8 -
 .../contrib/async-test/test-leaf.py           |    24 -
 .../contrib/async-test/test-server.cpp        |    97 -
 .../thrift.git/contrib/fb303/LICENSE          |    16 -
 .../thrift.git/contrib/fb303/Makefile.am      |    46 -
 .../thrift.git/contrib/fb303/README.md        |    37 -
 .../thrift.git/contrib/fb303/TClientInfo.cpp  |   178 -
 .../thrift.git/contrib/fb303/TClientInfo.h    |   320 -
 .../contrib/fb303/aclocal/ax_boost_base.m4    |   198 -
 .../fb303/aclocal/ax_cxx_compile_stdcxx_11.m4 |   134 -
 .../fb303/aclocal/ax_javac_and_java.m4        |   121 -
 .../fb303/aclocal/ax_thrift_internal.m4       |    28 -
 .../thrift.git/contrib/fb303/bootstrap.sh     |    26 -
 .../thrift.git/contrib/fb303/configure.ac     |   164 -
 .../contrib/fb303/cpp/FacebookBase.cpp        |   124 -
 .../contrib/fb303/cpp/FacebookBase.h          |   103 -
 .../thrift.git/contrib/fb303/cpp/Makefile.am  |    84 -
 .../contrib/fb303/cpp/ServiceTracker.cpp      |   481 -
 .../contrib/fb303/cpp/ServiceTracker.h        |   215 -
 .../thrift.git/contrib/fb303/global_footer.mk |    21 -
 .../thrift.git/contrib/fb303/global_header.mk |    38 -
 .../thrift.git/contrib/fb303/if/fb303.thrift  |   112 -
 .../thrift.git/contrib/fb303/java/build.xml   |   195 -
 .../contrib/fb303/java/src/FacebookBase.java  |   114 -
 .../contrib/fb303/php/FacebookBase.php        |    89 -
 .../thrift.git/contrib/fb303/py/Makefile.am   |    44 -
 .../contrib/fb303/py/fb303/FacebookBase.py    |    83 -
 .../fb303/py/fb303_scripts/__init__.py        |    20 -
 .../py/fb303_scripts/fb303_simple_mgmt.py     |   194 -
 .../thrift.git/contrib/fb303/py/setup.py      |    48 -
 .../thrift.git/contrib/mingw-cross-compile.sh |    19 -
 .../thrift.git/contrib/parse_profiling.py     |   312 -
 .../contrib/thrift-maven-plugin/pom.xml       |    86 -
 .../thrift/maven/AbstractThriftMojo.java      |   377 -
 .../java/org/apache/thrift/maven/Thrift.java  |   262 -
 .../thrift/maven/ThriftCompileMojo.java       |    78 -
 .../thrift/maven/ThriftTestCompileMojo.java   |    74 -
 .../org/apache/thrift/maven/TestThrift.java   |   163 -
 .../src/test/resources/idl/shared.thrift      |    36 -
 .../src/test/resources/idl/tutorial.thrift    |   152 -
 .../thrift.git/contrib/thrift.el              |   140 -
 .../thrift.git/contrib/thrift.spec            |   238 -
 .../thrift.git/contrib/thrift.vim             |    91 -
 .../thrift.git/contrib/thrift_dump.cpp        |    91 -
 .../contrib/transport-sample/README.md        |    61 -
 .../contrib/transport-sample/Sample.thrift    |    39 -
 .../contrib/transport-sample/ThriftCommon.cpp |    37 -
 .../contrib/transport-sample/ThriftCommon.h   |   207 -
 .../transport-sample/client/ReadMe.txt        |    40 -
 .../transport-sample/client/client.cpp        |   195 -
 .../transport-sample/client/client.vcxproj    |   105 -
 .../client/client.vcxproj.filters             |    66 -
 .../transport-sample/client/stdafx.cpp        |     8 -
 .../contrib/transport-sample/client/stdafx.h  |    15 -
 .../transport-sample/client/targetver.h       |     8 -
 .../contrib/transport-sample/config.h         |    24 -
 .../transport-sample/server/ReadMe.txt        |    40 -
 .../transport-sample/server/server.cpp        |   168 -
 .../transport-sample/server/server.vcxproj    |   106 -
 .../server/server.vcxproj.filters             |    66 -
 .../transport-sample/server/stdafx.cpp        |     8 -
 .../contrib/transport-sample/server/stdafx.h  |    15 -
 .../transport-sample/server/targetver.h       |     8 -
 .../contrib/transport-sample/thriftme.bat     |     1 -
 .../contrib/transport-sample/thriftme.sh      |    24 -
 .../transport-sample/transport-sample.sln     |    26 -
 .../thrift.git/contrib/zeromq/README.md       |    30 -
 .../thrift.git/contrib/zeromq/TZmqClient.cpp  |    48 -
 .../thrift.git/contrib/zeromq/TZmqClient.h    |    65 -
 .../thrift.git/contrib/zeromq/TZmqClient.py   |    64 -
 .../thrift.git/contrib/zeromq/TZmqServer.cpp  |    96 -
 .../thrift.git/contrib/zeromq/TZmqServer.h    |    83 -
 .../thrift.git/contrib/zeromq/TZmqServer.py   |    79 -
 .../contrib/zeromq/csharp/AssemblyInfo.cs     |    46 -
 .../thrift.git/contrib/zeromq/csharp/Main.cs  |    60 -
 .../contrib/zeromq/csharp/TZmqClient.cs       |    78 -
 .../contrib/zeromq/csharp/TZmqServer.cs       |    56 -
 .../contrib/zeromq/csharp/ThriftZMQ.csproj    |    91 -
 .../contrib/zeromq/csharp/ThriftZMQ.sln       |    42 -
 .../thrift.git/contrib/zeromq/storage.thrift  |     4 -
 .../thrift.git/contrib/zeromq/test-client.cpp |    40 -
 .../thrift.git/contrib/zeromq/test-client.py  |    36 -
 .../contrib/zeromq/test-receiver.cpp          |    40 -
 .../thrift.git/contrib/zeromq/test-sender.cpp |    32 -
 .../thrift.git/contrib/zeromq/test-server.cpp |    43 -
 .../thrift.git/contrib/zeromq/test-server.py  |    33 -
 .../thrift.git/debian/README.md               |    41 -
 .../thrift.git/debian/changelog               |    65 -
 .../git.apache.org/thrift.git/debian/compat   |     1 -
 .../git.apache.org/thrift.git/debian/control  |   191 -
 .../thrift.git/debian/copyright               |   129 -
 vendor/git.apache.org/thrift.git/debian/dirs  |     2 -
 vendor/git.apache.org/thrift.git/debian/docs  |     1 -
 .../thrift.git/debian/libthrift-dev.install   |     4 -
 .../thrift.git/debian/libthrift0.install      |     5 -
 .../thrift.git/debian/php5-thrift.dirs        |     1 -
 vendor/git.apache.org/thrift.git/debian/rules |   226 -
 .../thrift.git/debian/substvars               |     1 -
 .../thrift.git/debian/thrift-doc.docs         |     2 -
 .../thrift.git/debian/thrift-doc.install      |     2 -
 vendor/git.apache.org/thrift.git/doap.rdf     |   132 -
 .../thrift.git/doc/coding_standards.md        |    48 -
 .../thrift.git/doc/committers.md              |    54 -
 .../thrift.git/doc/install/README.md          |    43 -
 .../thrift.git/doc/install/centos.md          |    75 -
 .../thrift.git/doc/install/debian.md          |    46 -
 .../thrift.git/doc/install/os_x.md            |    27 -
 .../thrift.git/doc/install/windows.md         |   186 -
 .../thrift.git/doc/licenses/lgpl-2.1.txt      |   504 -
 .../doc/licenses/otp-base-license.txt         |    20 -
 .../thrift.git/doc/specs/HeaderFormat.md      |    82 -
 .../thrift.git/doc/specs/idl.md               |   272 -
 .../doc/specs/thrift-binary-protocol.md       |   254 -
 .../doc/specs/thrift-compact-protocol.md      |   294 -
 .../doc/specs/thrift-protocol-spec.md         |   101 -
 .../thrift.git/doc/specs/thrift-rpc.md        |   178 -
 .../thrift.git/doc/specs/thrift-sasl-spec.txt |   108 -
 .../thrift.git/doc/specs/thrift.tex           |  1057 -
 .../git.apache.org/thrift.git/lib/Makefile.am |   109 -
 .../thrift.git/lib/as3/build.xml              |   180 -
 .../thrift.git/lib/as3/coding_standards.md    |     1 -
 .../org/apache/thrift/AbstractMethodError.as  |    31 -
 .../lib/as3/src/org/apache/thrift/Set.as      |    82 -
 .../org/apache/thrift/TApplicationError.as    |   106 -
 .../lib/as3/src/org/apache/thrift/TBase.as    |    67 -
 .../lib/as3/src/org/apache/thrift/TError.as   |    29 -
 .../apache/thrift/TFieldRequirementType.as    |    32 -
 .../as3/src/org/apache/thrift/TProcessor.as   |    32 -
 .../apache/thrift/meta_data/FieldMetaData.as  |    57 -
 .../thrift/meta_data/FieldValueMetaData.as    |    44 -
 .../apache/thrift/meta_data/ListMetaData.as   |    31 -
 .../apache/thrift/meta_data/MapMetaData.as    |    33 -
 .../apache/thrift/meta_data/SetMetaData.as    |    31 -
 .../apache/thrift/meta_data/StructMetaData.as |    31 -
 .../apache/thrift/protocol/TBinaryProtocol.as |   316 -
 .../src/org/apache/thrift/protocol/TField.as  |    43 -
 .../src/org/apache/thrift/protocol/TList.as   |    33 -
 .../src/org/apache/thrift/protocol/TMap.as    |    33 -
 .../org/apache/thrift/protocol/TMessage.as    |    42 -
 .../apache/thrift/protocol/TMessageType.as    |    28 -
 .../org/apache/thrift/protocol/TProtocol.as   |   124 -
 .../apache/thrift/protocol/TProtocolError.as  |    39 -
 .../thrift/protocol/TProtocolFactory.as       |    27 -
 .../apache/thrift/protocol/TProtocolUtil.as   |   148 -
 .../src/org/apache/thrift/protocol/TSet.as    |    33 -
 .../src/org/apache/thrift/protocol/TStruct.as |    31 -
 .../src/org/apache/thrift/protocol/TType.as   |    39 -
 .../thrift/transport/TFullDuplexHttpClient.as |   251 -
 .../apache/thrift/transport/THttpClient.as    |   134 -
 .../org/apache/thrift/transport/TSocket.as    |   194 -
 .../org/apache/thrift/transport/TTransport.as |   127 -
 .../thrift/transport/TTransportError.as       |    37 -
 .../thrift.git/lib/c_glib/CMakeLists.txt      |    72 -
 .../thrift.git/lib/c_glib/Makefile.am         |   105 -
 .../thrift.git/lib/c_glib/README.md           |    34 -
 .../thrift.git/lib/c_glib/coding_standards.md |     5 -
 .../processor/thrift_dispatch_processor.c     |   143 -
 .../processor/thrift_dispatch_processor.h     |    95 -
 .../c_glib/processor/thrift_processor.c       |    45 -
 .../c_glib/processor/thrift_processor.h       |    76 -
 .../c_glib/protocol/thrift_binary_protocol.c  |   904 -
 .../c_glib/protocol/thrift_binary_protocol.h  |    72 -
 .../protocol/thrift_binary_protocol_factory.c |    50 -
 .../protocol/thrift_binary_protocol_factory.h |    56 -
 .../c_glib/protocol/thrift_compact_protocol.c |  1609 -
 .../c_glib/protocol/thrift_compact_protocol.h |   107 -
 .../thrift_compact_protocol_factory.c         |   140 -
 .../thrift_compact_protocol_factory.h         |    70 -
 .../thrift/c_glib/protocol/thrift_protocol.c  |   605 -
 .../thrift/c_glib/protocol/thrift_protocol.h  |   341 -
 .../c_glib/protocol/thrift_protocol_factory.c |    43 -
 .../c_glib/protocol/thrift_protocol_factory.h |    73 -
 .../src/thrift/c_glib/server/thrift_server.c  |   174 -
 .../src/thrift/c_glib/server/thrift_server.h  |    93 -
 .../c_glib/server/thrift_simple_server.c      |   138 -
 .../c_glib/server/thrift_simple_server.h      |    70 -
 .../lib/c_glib/src/thrift/c_glib/thrift.c     |   101 -
 .../lib/c_glib/src/thrift/c_glib/thrift.h     |    49 -
 .../c_glib/thrift_application_exception.c     |   277 -
 .../c_glib/thrift_application_exception.h     |    86 -
 .../c_glib/src/thrift/c_glib/thrift_struct.c  |    52 -
 .../c_glib/src/thrift/c_glib/thrift_struct.h  |    68 -
 .../transport/thrift_buffered_transport.c     |   391 -
 .../transport/thrift_buffered_transport.h     |    77 -
 .../thrift_buffered_transport_factory.c       |    55 -
 .../thrift_buffered_transport_factory.h       |    86 -
 .../c_glib/transport/thrift_fd_transport.c    |   265 -
 .../c_glib/transport/thrift_fd_transport.h    |    74 -
 .../transport/thrift_framed_transport.c       |   384 -
 .../transport/thrift_framed_transport.h       |    77 -
 .../thrift_framed_transport_factory.c         |    55 -
 .../thrift_framed_transport_factory.h         |    86 -
 .../c_glib/transport/thrift_memory_buffer.c   |   286 -
 .../c_glib/transport/thrift_memory_buffer.h   |    72 -
 .../c_glib/transport/thrift_server_socket.c   |   253 -
 .../c_glib/transport/thrift_server_socket.h   |    90 -
 .../transport/thrift_server_transport.c       |    62 -
 .../transport/thrift_server_transport.h       |    89 -
 .../thrift/c_glib/transport/thrift_socket.c   |   368 -
 .../thrift/c_glib/transport/thrift_socket.h   |    75 -
 .../c_glib/transport/thrift_transport.c       |   162 -
 .../c_glib/transport/thrift_transport.h       |   176 -
 .../transport/thrift_transport_factory.c      |    44 -
 .../transport/thrift_transport_factory.h      |    71 -
 .../thrift.git/lib/c_glib/test/CMakeLists.txt |   200 -
 .../lib/c_glib/test/ContainerTest.thrift      |    35 -
 .../thrift.git/lib/c_glib/test/Makefile.am    |   315 -
 .../thrift.git/lib/c_glib/test/glib.suppress  |    64 -
 .../c_glib/test/testapplicationexception.c    |   180 -
 .../lib/c_glib/test/testbinaryprotocol.c      |   838 -
 .../lib/c_glib/test/testbufferedtransport.c   |   287 -
 .../lib/c_glib/test/testcompactprotocol.c     |  1272 -
 .../lib/c_glib/test/testcontainertest.c       |   530 -
 .../lib/c_glib/test/testdebugproto.c          |   942 -
 .../lib/c_glib/test/testfdtransport.c         |   185 -
 .../lib/c_glib/test/testframedtransport.c     |   284 -
 .../lib/c_glib/test/testmemorybuffer.c        |   224 -
 .../lib/c_glib/test/testoptionalrequired.c    |   228 -
 .../lib/c_glib/test/testserialization.c       |    95 -
 .../lib/c_glib/test/testsimpleserver.c        |   123 -
 .../thrift.git/lib/c_glib/test/teststruct.c   |   112 -
 .../lib/c_glib/test/testthrifttest.c          |   113 -
 .../lib/c_glib/test/testthrifttestclient.cpp  |   628 -
 .../lib/c_glib/test/testtransportsocket.c     |   323 -
 .../thrift.git/lib/c_glib/thrift_c_glib.pc.in |    30 -
 .../thrift.git/lib/cocoa/README.md            |    21 -
 .../thrift.git/lib/cocoa/coding_standards.md  |     1 -
 .../lib/cocoa/src/TApplicationError.h         |    55 -
 .../lib/cocoa/src/TApplicationError.m         |   231 -
 .../thrift.git/lib/cocoa/src/TBaseClient.h    |    27 -
 .../thrift.git/lib/cocoa/src/TBaseClient.m    |    51 -
 .../thrift.git/lib/cocoa/src/TBinary.swift    |   122 -
 .../thrift.git/lib/cocoa/src/TEnum.swift      |    31 -
 .../thrift.git/lib/cocoa/src/TError.h         |    23 -
 .../thrift.git/lib/cocoa/src/TList.swift      |   148 -
 .../thrift.git/lib/cocoa/src/TMap.swift       |   158 -
 .../thrift.git/lib/cocoa/src/TProcessor.h     |    35 -
 .../lib/cocoa/src/TProcessorFactory.h         |    33 -
 .../thrift.git/lib/cocoa/src/TProtocol.swift  |   190 -
 .../lib/cocoa/src/TSerializable.swift         |   178 -
 .../thrift.git/lib/cocoa/src/TSet.swift       |   161 -
 .../lib/cocoa/src/TSharedProcessorFactory.h   |    28 -
 .../lib/cocoa/src/TSharedProcessorFactory.m   |    49 -
 .../thrift.git/lib/cocoa/src/TStruct.swift    |    31 -
 .../thrift.git/lib/cocoa/src/Thrift.h         |    20 -
 .../thrift.git/lib/cocoa/src/protocol/TBase.h |    46 -
 .../lib/cocoa/src/protocol/TBinaryProtocol.h  |    49 -
 .../lib/cocoa/src/protocol/TBinaryProtocol.m  |   740 -
 .../lib/cocoa/src/protocol/TCompactProtocol.h |    42 -
 .../lib/cocoa/src/protocol/TCompactProtocol.m |   983 -
 .../cocoa/src/protocol/TMultiplexedProtocol.h |    38 -
 .../cocoa/src/protocol/TMultiplexedProtocol.m |    66 -
 .../lib/cocoa/src/protocol/TProtocol.h        |   164 -
 .../cocoa/src/protocol/TProtocolDecorator.h   |    34 -
 .../cocoa/src/protocol/TProtocolDecorator.m   |   295 -
 .../lib/cocoa/src/protocol/TProtocolError.h   |    76 -
 .../lib/cocoa/src/protocol/TProtocolError.m   |    33 -
 .../lib/cocoa/src/protocol/TProtocolFactory.h |    36 -
 .../lib/cocoa/src/protocol/TProtocolUtil.h    |    33 -
 .../lib/cocoa/src/protocol/TProtocolUtil.m    |   171 -
 .../lib/cocoa/src/server/TSocketServer.h      |    47 -
 .../lib/cocoa/src/server/TSocketServer.m      |   164 -
 .../lib/cocoa/src/transport/TAsyncTransport.h |    46 -
 .../cocoa/src/transport/TFramedTransport.h    |    33 -
 .../cocoa/src/transport/TFramedTransport.m    |   180 -
 .../src/transport/THTTPSessionTransport.h     |    47 -
 .../src/transport/THTTPSessionTransport.m     |   268 -
 .../lib/cocoa/src/transport/THTTPTransport.h  |    39 -
 .../lib/cocoa/src/transport/THTTPTransport.m  |   182 -
 .../lib/cocoa/src/transport/TMemoryBuffer.h   |    37 -
 .../lib/cocoa/src/transport/TMemoryBuffer.m   |   121 -
 .../src/transport/TNSFileHandleTransport.h    |    38 -
 .../src/transport/TNSFileHandleTransport.m    |   118 -
 .../cocoa/src/transport/TNSStreamTransport.h  |    43 -
 .../cocoa/src/transport/TNSStreamTransport.m  |   153 -
 .../cocoa/src/transport/TSSLSocketTransport.h |    37 -
 .../cocoa/src/transport/TSSLSocketTransport.m |   304 -
 .../src/transport/TSSLSocketTransportError.h  |    30 -
 .../src/transport/TSSLSocketTransportError.m  |    23 -
 .../cocoa/src/transport/TSocketTransport.h    |    34 -
 .../cocoa/src/transport/TSocketTransport.m    |    73 -
 .../lib/cocoa/src/transport/TTransport.h      |    48 -
 .../lib/cocoa/src/transport/TTransportError.h |    43 -
 .../lib/cocoa/src/transport/TTransportError.m |    27 -
 .../thrift.git/lib/cpp/3rdparty.props         |    25 -
 .../thrift.git/lib/cpp/CMakeLists.txt         |   217 -
 .../thrift.git/lib/cpp/Makefile.am            |   287 -
 .../thrift.git/lib/cpp/README.md              |   274 -
 .../thrift.git/lib/cpp/coding_standards.md    |     4 -
 .../thrift.git/lib/cpp/libthrift.vcxproj      |   363 -
 .../lib/cpp/libthrift.vcxproj.filters         |   283 -
 .../thrift.git/lib/cpp/libthriftnb.vcxproj    |   293 -
 .../lib/cpp/libthriftnb.vcxproj.filters       |    57 -
 .../cpp/src/thrift/TApplicationException.cpp  |    81 -
 .../cpp/src/thrift/TApplicationException.h    |   115 -
 .../thrift.git/lib/cpp/src/thrift/TBase.h     |    38 -
 .../lib/cpp/src/thrift/TDispatchProcessor.h   |   141 -
 .../thrift.git/lib/cpp/src/thrift/TLogging.h  |   195 -
 .../thrift.git/lib/cpp/src/thrift/TOutput.cpp |   126 -
 .../thrift.git/lib/cpp/src/thrift/TOutput.h   |    58 -
 .../lib/cpp/src/thrift/TProcessor.h           |   230 -
 .../thrift.git/lib/cpp/src/thrift/TToString.h |    89 -
 .../thrift.git/lib/cpp/src/thrift/Thrift.h    |   136 -
 .../lib/cpp/src/thrift/VirtualProfiling.cpp   |   425 -
 .../src/thrift/async/TAsyncBufferProcessor.h  |    48 -
 .../cpp/src/thrift/async/TAsyncChannel.cpp    |    37 -
 .../lib/cpp/src/thrift/async/TAsyncChannel.h  |    73 -
 .../thrift/async/TAsyncDispatchProcessor.h    |   151 -
 .../cpp/src/thrift/async/TAsyncProcessor.h    |    86 -
 .../thrift/async/TAsyncProtocolProcessor.cpp  |    53 -
 .../thrift/async/TAsyncProtocolProcessor.h    |    55 -
 .../async/TConcurrentClientSyncInfo.cpp       |   242 -
 .../thrift/async/TConcurrentClientSyncInfo.h  |   126 -
 .../src/thrift/async/TEvhttpClientChannel.cpp |   155 -
 .../src/thrift/async/TEvhttpClientChannel.h   |    86 -
 .../cpp/src/thrift/async/TEvhttpServer.cpp    |   159 -
 .../lib/cpp/src/thrift/async/TEvhttpServer.h  |    74 -
 .../src/thrift/concurrency/BoostMonitor.cpp   |   214 -
 .../cpp/src/thrift/concurrency/BoostMutex.cpp |    71 -
 .../thrift/concurrency/BoostThreadFactory.cpp |   147 -
 .../thrift/concurrency/BoostThreadFactory.h   |    64 -
 .../cpp/src/thrift/concurrency/Exception.h    |    64 -
 .../src/thrift/concurrency/FunctionRunner.h   |   118 -
 .../cpp/src/thrift/concurrency/Monitor.cpp    |   224 -
 .../lib/cpp/src/thrift/concurrency/Monitor.h  |   133 -
 .../lib/cpp/src/thrift/concurrency/Mutex.cpp  |   373 -
 .../lib/cpp/src/thrift/concurrency/Mutex.h    |   180 -
 .../concurrency/PlatformThreadFactory.h       |    52 -
 .../thrift/concurrency/PosixThreadFactory.cpp |   317 -
 .../thrift/concurrency/PosixThreadFactory.h   |   129 -
 .../cpp/src/thrift/concurrency/StdMonitor.cpp |   213 -
 .../cpp/src/thrift/concurrency/StdMutex.cpp   |    67 -
 .../thrift/concurrency/StdThreadFactory.cpp   |   135 -
 .../src/thrift/concurrency/StdThreadFactory.h |    61 -
 .../lib/cpp/src/thrift/concurrency/Thread.h   |   178 -
 .../src/thrift/concurrency/ThreadManager.cpp  |   588 -
 .../src/thrift/concurrency/ThreadManager.h    |   214 -
 .../src/thrift/concurrency/TimerManager.cpp   |   305 -
 .../cpp/src/thrift/concurrency/TimerManager.h |   126 -
 .../lib/cpp/src/thrift/concurrency/Util.cpp   |    44 -
 .../lib/cpp/src/thrift/concurrency/Util.h     |   151 -
 .../lib/cpp/src/thrift/cxxfunctional.h        |   132 -
 .../src/thrift/processor/PeekProcessor.cpp    |   132 -
 .../cpp/src/thrift/processor/PeekProcessor.h  |    83 -
 .../cpp/src/thrift/processor/StatsProcessor.h |   242 -
 .../thrift/processor/TMultiplexedProcessor.h  |   201 -
 .../cpp/src/thrift/protocol/TBase64Utils.cpp  |   317 -
 .../cpp/src/thrift/protocol/TBase64Utils.h    |    45 -
 .../cpp/src/thrift/protocol/TBinaryProtocol.h |   250 -
 .../src/thrift/protocol/TBinaryProtocol.tcc   |   454 -
 .../src/thrift/protocol/TCompactProtocol.h    |   266 -
 .../src/thrift/protocol/TCompactProtocol.tcc  |   826 -
 .../src/thrift/protocol/TDebugProtocol.cpp    |   394 -
 .../cpp/src/thrift/protocol/TDebugProtocol.h  |   204 -
 .../src/thrift/protocol/THeaderProtocol.cpp   |   254 -
 .../cpp/src/thrift/protocol/THeaderProtocol.h |   210 -
 .../cpp/src/thrift/protocol/TJSONProtocol.cpp |  1099 -
 .../cpp/src/thrift/protocol/TJSONProtocol.h   |   324 -
 .../thrift/protocol/TMultiplexedProtocol.cpp  |    40 -
 .../thrift/protocol/TMultiplexedProtocol.h    |    95 -
 .../lib/cpp/src/thrift/protocol/TProtocol.cpp |    33 -
 .../lib/cpp/src/thrift/protocol/TProtocol.h   |   762 -
 .../src/thrift/protocol/TProtocolDecorator.h  |   151 -
 .../src/thrift/protocol/TProtocolException.h  |   105 -
 .../cpp/src/thrift/protocol/TProtocolTap.h    |   177 -
 .../cpp/src/thrift/protocol/TProtocolTypes.h  |    36 -
 .../src/thrift/protocol/TVirtualProtocol.h    |   513 -
 .../lib/cpp/src/thrift/qt/CMakeLists.txt      |    28 -
 .../cpp/src/thrift/qt/TQIODeviceTransport.cpp |   167 -
 .../cpp/src/thrift/qt/TQIODeviceTransport.h   |    68 -
 .../lib/cpp/src/thrift/qt/TQTcpServer.cpp     |   150 -
 .../lib/cpp/src/thrift/qt/TQTcpServer.h       |    81 -
 .../src/thrift/server/TConnectedClient.cpp    |   123 -
 .../cpp/src/thrift/server/TConnectedClient.h  |   110 -
 .../src/thrift/server/TNonblockingServer.cpp  |  1625 -
 .../src/thrift/server/TNonblockingServer.h    |   877 -
 .../lib/cpp/src/thrift/server/TServer.cpp     |    52 -
 .../lib/cpp/src/thrift/server/TServer.h       |   273 -
 .../src/thrift/server/TServerFramework.cpp    |   246 -
 .../cpp/src/thrift/server/TServerFramework.h  |   184 -
 .../cpp/src/thrift/server/TSimpleServer.cpp   |   107 -
 .../lib/cpp/src/thrift/server/TSimpleServer.h |    77 -
 .../src/thrift/server/TThreadPoolServer.cpp   |   132 -
 .../cpp/src/thrift/server/TThreadPoolServer.h |   101 -
 .../cpp/src/thrift/server/TThreadedServer.cpp |   153 -
 .../cpp/src/thrift/server/TThreadedServer.h   |   143 -
 .../lib/cpp/src/thrift/thrift-config.h        |    24 -
 .../cpp/src/thrift/transport/PlatformSocket.h |   126 -
 .../thrift/transport/TBufferTransports.cpp    |   411 -
 .../src/thrift/transport/TBufferTransports.h  |   718 -
 .../cpp/src/thrift/transport/TFDTransport.cpp |    93 -
 .../cpp/src/thrift/transport/TFDTransport.h   |    77 -
 .../src/thrift/transport/TFileTransport.cpp   |  1069 -
 .../cpp/src/thrift/transport/TFileTransport.h |   442 -
 .../src/thrift/transport/THeaderTransport.cpp |   601 -
 .../src/thrift/transport/THeaderTransport.h   |   270 -
 .../cpp/src/thrift/transport/THttpClient.cpp  |   122 -
 .../cpp/src/thrift/transport/THttpClient.h    |    50 -
 .../cpp/src/thrift/transport/THttpServer.cpp  |   164 -
 .../cpp/src/thrift/transport/THttpServer.h    |    64 -
 .../src/thrift/transport/THttpTransport.cpp   |   267 -
 .../cpp/src/thrift/transport/THttpTransport.h |   104 -
 .../lib/cpp/src/thrift/transport/TPipe.cpp    |   399 -
 .../lib/cpp/src/thrift/transport/TPipe.h      |   113 -
 .../cpp/src/thrift/transport/TPipeServer.cpp  |   457 -
 .../cpp/src/thrift/transport/TPipeServer.h    |   103 -
 .../src/thrift/transport/TSSLServerSocket.cpp |    60 -
 .../src/thrift/transport/TSSLServerSocket.h   |    77 -
 .../cpp/src/thrift/transport/TSSLSocket.cpp   |   942 -
 .../lib/cpp/src/thrift/transport/TSSLSocket.h |   397 -
 .../src/thrift/transport/TServerSocket.cpp    |   710 -
 .../cpp/src/thrift/transport/TServerSocket.h  |   158 -
 .../src/thrift/transport/TServerTransport.h   |   105 -
 .../thrift/transport/TShortReadTransport.h    |    82 -
 .../thrift/transport/TSimpleFileTransport.cpp |    67 -
 .../thrift/transport/TSimpleFileTransport.h   |    42 -
 .../lib/cpp/src/thrift/transport/TSocket.cpp  |   934 -
 .../lib/cpp/src/thrift/transport/TSocket.h    |   340 -
 .../cpp/src/thrift/transport/TSocketPool.cpp  |   254 -
 .../cpp/src/thrift/transport/TSocketPool.h    |   195 -
 .../lib/cpp/src/thrift/transport/TTransport.h |   271 -
 .../thrift/transport/TTransportException.cpp  |    61 -
 .../thrift/transport/TTransportException.h    |    90 -
 .../src/thrift/transport/TTransportUtils.cpp  |   181 -
 .../src/thrift/transport/TTransportUtils.h    |   310 -
 .../src/thrift/transport/TVirtualTransport.h  |   140 -
 .../src/thrift/transport/TZlibTransport.cpp   |   393 -
 .../cpp/src/thrift/transport/TZlibTransport.h |   240 -
 .../cpp/src/thrift/windows/GetTimeOfDay.cpp   |   106 -
 .../lib/cpp/src/thrift/windows/GetTimeOfDay.h |    44 -
 .../lib/cpp/src/thrift/windows/Operators.h    |    40 -
 .../windows/OverlappedSubmissionThread.cpp    |   151 -
 .../windows/OverlappedSubmissionThread.h      |   133 -
 .../lib/cpp/src/thrift/windows/SocketPair.cpp |   100 -
 .../lib/cpp/src/thrift/windows/SocketPair.h   |    37 -
 .../lib/cpp/src/thrift/windows/Sync.h         |   104 -
 .../src/thrift/windows/TWinsockSingleton.cpp  |    71 -
 .../src/thrift/windows/TWinsockSingleton.h    |    84 -
 .../lib/cpp/src/thrift/windows/WinFcntl.cpp   |   101 -
 .../lib/cpp/src/thrift/windows/WinFcntl.h     |    56 -
 .../lib/cpp/src/thrift/windows/config.h       |   105 -
 .../lib/cpp/test/AllProtocolTests.cpp         |    47 -
 .../lib/cpp/test/AllProtocolTests.tcc         |   225 -
 .../thrift.git/lib/cpp/test/Base64Test.cpp    |    70 -
 .../thrift.git/lib/cpp/test/Benchmark.cpp     |   243 -
 .../thrift.git/lib/cpp/test/CMakeLists.txt    |   361 -
 .../lib/cpp/test/DebugProtoTest.cpp           |   309 -
 .../lib/cpp/test/DebugProtoTest_extras.cpp    |    35 -
 .../thrift.git/lib/cpp/test/EnumTest.cpp      |    59 -
 .../thrift.git/lib/cpp/test/GenericHelpers.h  |   110 -
 .../thrift.git/lib/cpp/test/JSONProtoTest.cpp |   340 -
 .../thrift.git/lib/cpp/test/Makefile.am       |   374 -
 .../lib/cpp/test/OpenSSLManualInitTest.cpp    |    94 -
 .../lib/cpp/test/OptionalRequiredTest.cpp     |   386 -
 .../lib/cpp/test/RWMutexStarveTest.cpp        |   159 -
 .../thrift.git/lib/cpp/test/RecursiveTest.cpp |    91 -
 .../thrift.git/lib/cpp/test/SecurityTest.cpp  |   276 -
 .../lib/cpp/test/SpecializationTest.cpp       |   103 -
 .../lib/cpp/test/TBufferBaseTest.cpp          |   645 -
 .../lib/cpp/test/TFDTransportTest.cpp         |    50 -
 .../lib/cpp/test/TFileTransportTest.cpp       |   417 -
 .../lib/cpp/test/TMemoryBufferTest.cpp        |   119 -
 .../lib/cpp/test/TNonblockingServerTest.cpp   |   178 -
 .../lib/cpp/test/TPipeInterruptTest.cpp       |    89 -
 .../lib/cpp/test/TPipedTransportTest.cpp      |    51 -
 .../lib/cpp/test/TSSLSocketInterruptTest.cpp  |   280 -
 .../lib/cpp/test/TServerIntegrationTest.cpp   |   534 -
 .../lib/cpp/test/TServerSocketTest.cpp        |    67 -
 .../lib/cpp/test/TServerTransportTest.cpp     |    56 -
 .../lib/cpp/test/TSocketInterruptTest.cpp     |   145 -
 .../lib/cpp/test/TTransportCheckThrow.h       |    44 -
 .../lib/cpp/test/ThriftTest_extras.cpp        |    33 -
 .../thrift.git/lib/cpp/test/ToStringTest.cpp  |   137 -
 .../thrift.git/lib/cpp/test/TransportTest.cpp |  1061 -
 .../thrift.git/lib/cpp/test/TypedefTest.cpp   |    28 -
 .../thrift.git/lib/cpp/test/UnitTestMain.cpp  |    21 -
 .../thrift.git/lib/cpp/test/ZlibTest.cpp      |   461 -
 .../lib/cpp/test/concurrency/Tests.cpp        |   189 -
 .../cpp/test/concurrency/ThreadFactoryTests.h |   313 -
 .../cpp/test/concurrency/ThreadManagerTests.h |   685 -
 .../cpp/test/concurrency/TimerManagerTests.h  |   137 -
 .../thrift.git/lib/cpp/test/link/LinkTest.cpp |    22 -
 .../lib/cpp/test/link/TemplatedService1.cpp   |    26 -
 .../lib/cpp/test/link/TemplatedService2.cpp   |    26 -
 .../lib/cpp/test/processor/EventLog.cpp       |   136 -
 .../lib/cpp/test/processor/EventLog.h         |    95 -
 .../lib/cpp/test/processor/Handlers.h         |   338 -
 .../lib/cpp/test/processor/ProcessorTest.cpp  |   927 -
 .../lib/cpp/test/processor/ServerThread.cpp   |   150 -
 .../lib/cpp/test/processor/ServerThread.h     |   136 -
 .../lib/cpp/test/processor/proc.thrift        |    22 -
 .../thrift.git/lib/cpp/test/qt/CMakeLists.txt |    32 -
 .../lib/cpp/test/qt/TQTcpServerTest.cpp       |   114 -
 .../thrift.git/lib/cpp/thrift-nb.pc.in        |    30 -
 .../thrift.git/lib/cpp/thrift-qt.pc.in        |    30 -
 .../thrift.git/lib/cpp/thrift-qt5.pc.in       |    30 -
 .../thrift.git/lib/cpp/thrift-z.pc.in         |    30 -
 .../thrift.git/lib/cpp/thrift.pc.in           |    29 -
 .../thrift.git/lib/cpp/thrift.sln             |    61 -
 .../thrift.git/lib/csharp/Makefile.am         |   105 -
 .../thrift.git/lib/csharp/README.md           |    26 -
 .../Properties/AssemblyInfo.cs                |    60 -
 .../csharp/ThriftMSBuildTask/ThriftBuild.cs   |   246 -
 .../ThriftMSBuildTask.csproj                  |   118 -
 .../thrift.git/lib/csharp/coding_standards.md |     6 -
 .../csharp/src/Collections/TCollections.cs    |    94 -
 .../lib/csharp/src/Collections/THashSet.cs    |   160 -
 .../lib/csharp/src/Properties/AssemblyInfo.cs |    55 -
 .../lib/csharp/src/Protocol/TAbstractBase.cs  |    29 -
 .../lib/csharp/src/Protocol/TBase.cs          |    29 -
 .../lib/csharp/src/Protocol/TBase64Utils.cs   |   100 -
 .../csharp/src/Protocol/TBinaryProtocol.cs    |   395 -
 .../csharp/src/Protocol/TCompactProtocol.cs   |   851 -
 .../lib/csharp/src/Protocol/TField.cs         |    62 -
 .../lib/csharp/src/Protocol/TJSONProtocol.cs  |  1128 -
 .../lib/csharp/src/Protocol/TList.cs          |    54 -
 .../lib/csharp/src/Protocol/TMap.cs           |    62 -
 .../lib/csharp/src/Protocol/TMessage.cs       |    62 -
 .../lib/csharp/src/Protocol/TMessageType.cs   |    31 -
 .../src/Protocol/TMultiplexedProcessor.cs     |   180 -
 .../src/Protocol/TMultiplexedProtocol.cs      |   105 -
 .../lib/csharp/src/Protocol/TProtocol.cs      |   140 -
 .../csharp/src/Protocol/TProtocolDecorator.cs |   262 -
 .../csharp/src/Protocol/TProtocolException.cs |    67 -
 .../csharp/src/Protocol/TProtocolFactory.cs   |    33 -
 .../lib/csharp/src/Protocol/TProtocolUtil.cs  |   107 -
 .../lib/csharp/src/Protocol/TSet.cs           |    59 -
 .../lib/csharp/src/Protocol/TStruct.cs        |    46 -
 .../lib/csharp/src/Protocol/TType.cs          |    44 -
 .../lib/csharp/src/Server/TServer.cs          |   155 -
 .../csharp/src/Server/TServerEventHandler.cs  |    50 -
 .../lib/csharp/src/Server/TSimpleServer.cs    |   180 -
 .../csharp/src/Server/TThreadPoolServer.cs    |   223 -
 .../lib/csharp/src/Server/TThreadedServer.cs  |   268 -
 .../lib/csharp/src/TApplicationException.cs   |   141 -
 .../lib/csharp/src/TAsyncProcessor.cs         |    38 -
 .../lib/csharp/src/TControllingHandler.cs     |    29 -
 .../thrift.git/lib/csharp/src/TException.cs   |    40 -
 .../thrift.git/lib/csharp/src/TProcessor.cs   |    33 -
 .../lib/csharp/src/TProcessorFactory.cs       |    30 -
 .../csharp/src/TPrototypeProcessorFactory.cs  |    55 -
 .../csharp/src/TSingletonProcessorFactory.cs  |    43 -
 .../lib/csharp/src/Thrift.45.csproj           |   129 -
 .../thrift.git/lib/csharp/src/Thrift.csproj   |   154 -
 .../thrift.git/lib/csharp/src/Thrift.sln      |    47 -
 .../src/Transport/TBufferedTransport.cs       |   165 -
 .../csharp/src/Transport/TFramedTransport.cs  |   182 -
 .../lib/csharp/src/Transport/THttpClient.cs   |   430 -
 .../lib/csharp/src/Transport/THttpHandler.cs  |   102 -
 .../src/Transport/THttpTaskAsyncHandler.cs    |    97 -
 .../lib/csharp/src/Transport/TMemoryBuffer.cs |    99 -
 .../Transport/TNamedPipeClientTransport.cs    |    95 -
 .../Transport/TNamedPipeServerTransport.cs    |   276 -
 .../lib/csharp/src/Transport/TServerSocket.cs |   176 -
 .../csharp/src/Transport/TServerTransport.cs  |    43 -
 .../src/Transport/TSilverlightSocket.cs       |   393 -
 .../lib/csharp/src/Transport/TSocket.cs       |   241 -
 .../csharp/src/Transport/TStreamTransport.cs  |   128 -
 .../csharp/src/Transport/TTLSServerSocket.cs  |   223 -
 .../lib/csharp/src/Transport/TTLSSocket.cs    |   371 -
 .../lib/csharp/src/Transport/TTransport.cs    |   146 -
 .../src/Transport/TTransportException.cs      |    69 -
 .../csharp/src/Transport/TTransportFactory.cs |    42 -
 .../lib/csharp/test/JSON/JSONTest.csproj      |    85 -
 .../lib/csharp/test/JSON/Program.cs           |    95 -
 .../test/JSON/Properties/AssemblyInfo.cs      |    55 -
 .../lib/csharp/test/JSON/app.config           |    21 -
 .../Multiplex/Client/Multiplex.Test.Client.cs |    82 -
 .../Multiplex/Client/MultiplexClient.csproj   |   148 -
 .../Client/Properties/AssemblyInfo.cs         |    55 -
 .../lib/csharp/test/Multiplex/Makefile.am     |    52 -
 .../test/Multiplex/Multiplex.Test.Common.cs   |    40 -
 .../Multiplex/Server/Multiplex.Test.Server.cs |   107 -
 .../Multiplex/Server/MultiplexServer.csproj   |   148 -
 .../Server/Properties/AssemblyInfo.cs         |    55 -
 .../ThriftMVCTest/App_Start/FilterConfig.cs   |    31 -
 .../ThriftMVCTest/App_Start/RouteConfig.cs    |    39 -
 .../test/ThriftMVCTest/AsyncHttpHandler.cs    |    32 -
 .../Controllers/HomeController.cs             |    72 -
 .../lib/csharp/test/ThriftMVCTest/Global.asax |    19 -
 .../csharp/test/ThriftMVCTest/Global.asax.cs  |    34 -
 .../ThriftMVCTest/Properties/AssemblyInfo.cs  |    53 -
 .../test/ThriftMVCTest/SecondServiceImpl.cs   |    47 -
 .../test/ThriftMVCTest/SyncHttpHandler.cs     |    32 -
 .../test/ThriftMVCTest/ThriftMVCTest.csproj   |   200 -
 .../ThriftMVCTest/Views/Home/Index.cshtml     |    25 -
 .../ThriftMVCTest/Views/Shared/_Layout.cshtml |    30 -
 .../test/ThriftMVCTest/Views/Web.config       |    60 -
 .../ThriftMVCTest/Views/_ViewStart.cshtml     |    22 -
 .../test/ThriftMVCTest/Web.Debug.config       |    45 -
 .../test/ThriftMVCTest/Web.Release.config     |    46 -
 .../lib/csharp/test/ThriftMVCTest/Web.config  |    92 -
 .../lib/csharp/test/ThriftMVCTest/favicon.ico |   Bin 32038 -> 0 bytes
 .../csharp/test/ThriftMVCTest/packages.config |    25 -
 .../thrift.git/lib/d/Makefile.am              |   194 -
 .../git.apache.org/thrift.git/lib/d/README.md |    58 -
 .../thrift.git/lib/d/coding_standards.md      |     1 -
 .../thrift.git/lib/d/src/thrift/async/base.d  |   228 -
 .../lib/d/src/thrift/async/libevent.d         |   461 -
 .../lib/d/src/thrift/async/socket.d           |   357 -
 .../thrift.git/lib/d/src/thrift/async/ssl.d   |   292 -
 .../thrift.git/lib/d/src/thrift/base.d        |   123 -
 .../lib/d/src/thrift/codegen/async_client.d   |   255 -
 .../d/src/thrift/codegen/async_client_pool.d  |   906 -
 .../lib/d/src/thrift/codegen/base.d           |  1021 -
 .../lib/d/src/thrift/codegen/client.d         |   486 -
 .../lib/d/src/thrift/codegen/client_pool.d    |   262 -
 .../lib/d/src/thrift/codegen/idlgen.d         |   770 -
 .../lib/d/src/thrift/codegen/processor.d      |   497 -
 .../thrift.git/lib/d/src/thrift/index.d       |    33 -
 .../lib/d/src/thrift/internal/algorithm.d     |    55 -
 .../lib/d/src/thrift/internal/codegen.d       |   451 -
 .../lib/d/src/thrift/internal/ctfe.d          |    98 -
 .../lib/d/src/thrift/internal/endian.d        |    75 -
 .../lib/d/src/thrift/internal/resource_pool.d |   431 -
 .../lib/d/src/thrift/internal/socket.d        |    96 -
 .../lib/d/src/thrift/internal/ssl.d           |   240 -
 .../lib/d/src/thrift/internal/ssl_bio.d       |   190 -
 .../lib/d/src/thrift/internal/test/protocol.d |   183 -
 .../lib/d/src/thrift/internal/test/server.d   |   110 -
 .../lib/d/src/thrift/internal/traits.d        |    33 -
 .../lib/d/src/thrift/protocol/base.d          |   449 -
 .../lib/d/src/thrift/protocol/binary.d        |   414 -
 .../lib/d/src/thrift/protocol/compact.d       |   698 -
 .../lib/d/src/thrift/protocol/json.d          |  1037 -
 .../lib/d/src/thrift/protocol/processor.d     |   145 -
 .../thrift.git/lib/d/src/thrift/server/base.d |   147 -
 .../lib/d/src/thrift/server/nonblocking.d     |  1397 -
 .../lib/d/src/thrift/server/simple.d          |   181 -
 .../lib/d/src/thrift/server/taskpool.d        |   302 -
 .../lib/d/src/thrift/server/threaded.d        |   215 -
 .../lib/d/src/thrift/server/transport/base.d  |   133 -
 .../d/src/thrift/server/transport/socket.d    |   380 -
 .../lib/d/src/thrift/server/transport/ssl.d   |    88 -
 .../lib/d/src/thrift/transport/base.d         |   370 -
 .../lib/d/src/thrift/transport/buffered.d     |   215 -
 .../lib/d/src/thrift/transport/file.d         |  1100 -
 .../lib/d/src/thrift/transport/framed.d       |   334 -
 .../lib/d/src/thrift/transport/http.d         |   459 -
 .../lib/d/src/thrift/transport/memory.d       |   233 -
 .../lib/d/src/thrift/transport/piped.d        |   219 -
 .../lib/d/src/thrift/transport/range.d        |   147 -
 .../lib/d/src/thrift/transport/socket.d       |   453 -
 .../lib/d/src/thrift/transport/ssl.d          |   680 -
 .../lib/d/src/thrift/transport/zlib.d         |   497 -
 .../lib/d/src/thrift/util/awaitable.d         |   212 -
 .../lib/d/src/thrift/util/cancellation.d      |   105 -
 .../thrift.git/lib/d/src/thrift/util/future.d |   549 -
 .../lib/d/src/thrift/util/hashset.d           |   146 -
 .../thrift.git/lib/d/test/Makefile.am         |   129 -
 .../thrift.git/lib/d/test/async_test.d        |   396 -
 .../lib/d/test/async_test_runner.sh           |    28 -
 .../thrift.git/lib/d/test/client_pool_test.d  |   416 -
 .../thrift.git/lib/d/test/openssl.test.cnf    |    14 -
 .../lib/d/test/serialization_benchmark.d      |    70 -
 .../lib/d/test/stress_test_server.d           |    81 -
 .../thrift.git/lib/d/test/test_utils.d        |    96 -
 .../lib/d/test/thrift_test_client.d           |   386 -
 .../lib/d/test/thrift_test_common.d           |    92 -
 .../lib/d/test/thrift_test_runner.sh          |    93 -
 .../lib/d/test/thrift_test_server.d           |   286 -
 .../thrift.git/lib/d/test/transport_test.d    |   803 -
 .../thrift.git/lib/dart/.analysis_options     |     2 -
 .../thrift.git/lib/dart/LICENSE_HEADER        |    16 -
 .../thrift.git/lib/dart/Makefile.am           |    28 -
 .../thrift.git/lib/dart/README.md             |    26 -
 .../thrift.git/lib/dart/coding_standards.md   |     6 -
 .../dart/lib/src/browser/t_web_socket.dart    |   130 -
 .../dart/lib/src/console/t_tcp_socket.dart    |    81 -
 .../dart/lib/src/console/t_web_socket.dart    |    89 -
 .../lib/src/protocol/t_binary_protocol.dart   |   281 -
 .../lib/src/protocol/t_compact_protocol.dart  |   470 -
 .../lib/dart/lib/src/protocol/t_field.dart    |    26 -
 .../lib/src/protocol/t_json_protocol.dart     |   784 -
 .../lib/dart/lib/src/protocol/t_list.dart     |    25 -
 .../lib/dart/lib/src/protocol/t_map.dart      |    26 -
 .../lib/dart/lib/src/protocol/t_message.dart  |    35 -
 .../src/protocol/t_multiplexed_protocol.dart  |    43 -
 .../lib/dart/lib/src/protocol/t_protocol.dart |    95 -
 .../src/protocol/t_protocol_decorator.dart    |   150 -
 .../lib/src/protocol/t_protocol_error.dart    |    33 -
 .../lib/src/protocol/t_protocol_factory.dart  |    22 -
 .../lib/src/protocol/t_protocol_util.dart     |   107 -
 .../lib/dart/lib/src/protocol/t_set.dart      |    25 -
 .../lib/dart/lib/src/protocol/t_struct.dart   |    24 -
 .../lib/dart/lib/src/protocol/t_type.dart     |    34 -
 .../lib/src/serializer/t_deserializer.dart    |    50 -
 .../dart/lib/src/serializer/t_serializer.dart |    48 -
 .../lib/dart/lib/src/t_application_error.dart |   104 -
 .../thrift.git/lib/dart/lib/src/t_base.dart   |    37 -
 .../thrift.git/lib/dart/lib/src/t_error.dart  |    27 -
 .../lib/dart/lib/src/t_processor.dart         |    24 -
 .../src/transport/t_buffered_transport.dart   |    98 -
 .../lib/src/transport/t_framed_transport.dart |    83 -
 .../lib/src/transport/t_http_transport.dart   |   100 -
 .../lib/src/transport/t_message_reader.dart   |    99 -
 .../lib/dart/lib/src/transport/t_socket.dart  |    38 -
 .../lib/src/transport/t_socket_transport.dart |   175 -
 .../dart/lib/src/transport/t_transport.dart   |    70 -
 .../lib/src/transport/t_transport_error.dart  |    31 -
 .../src/transport/t_transport_factory.dart    |    27 -
 .../thrift.git/lib/dart/lib/thrift.dart       |    64 -
 .../lib/dart/lib/thrift_browser.dart          |    22 -
 .../lib/dart/lib/thrift_console.dart          |    23 -
 .../thrift.git/lib/dart/pubspec.yaml          |    43 -
 .../dart/test/protocol/t_protocol_test.dart   |   406 -
 .../dart/test/serializer/serializer_test.dart |   119 -
 .../test/serializer/serializer_test_data.dart |   342 -
 .../dart/test/t_application_error_test.dart   |    46 -
 .../test/transport/t_http_transport_test.dart |   164 -
 .../transport/t_socket_transport_test.dart    |   311 -
 .../dart/test/transport/t_transport_test.dart |    41 -
 .../thrift.git/lib/dart/tool/dev.dart         |    33 -
 .../thrift.git/lib/delphi/README.md           |    30 -
 .../thrift.git/lib/delphi/coding_standards.md |     1 -
 .../lib/delphi/src/Thrift.Collections.pas     |   619 -
 .../lib/delphi/src/Thrift.Console.pas         |   133 -
 .../lib/delphi/src/Thrift.Defines.inc         |    50 -
 .../delphi/src/Thrift.Processor.Multiplex.pas |   216 -
 .../delphi/src/Thrift.Protocol.Compact.pas    |  1105 -
 .../lib/delphi/src/Thrift.Protocol.JSON.pas   |  1239 -
 .../delphi/src/Thrift.Protocol.Multiplex.pas  |   107 -
 .../lib/delphi/src/Thrift.Protocol.pas        |  1724 -
 .../lib/delphi/src/Thrift.Serializer.pas      |   230 -
 .../lib/delphi/src/Thrift.Server.pas          |   423 -
 .../lib/delphi/src/Thrift.Socket.pas          |  1617 -
 .../lib/delphi/src/Thrift.Stream.pas          |   288 -
 .../lib/delphi/src/Thrift.Transport.Pipes.pas |   997 -
 .../lib/delphi/src/Thrift.Transport.pas       |  1604 -
 .../lib/delphi/src/Thrift.TypeRegistry.pas    |    95 -
 .../lib/delphi/src/Thrift.Utils.pas           |   244 -
 .../thrift.git/lib/delphi/src/Thrift.pas      |   258 -
 .../thrift.git/lib/delphi/test/TestClient.pas |  1314 -
 .../lib/delphi/test/TestConstants.pas         |   162 -
 .../thrift.git/lib/delphi/test/TestServer.pas |   756 -
 .../lib/delphi/test/TestServerEvents.pas      |   174 -
 .../thrift.git/lib/delphi/test/client.dpr     |    72 -
 .../lib/delphi/test/codegen/README.md         |    28 -
 .../test/codegen/ReservedKeywords.thrift      |    55 -
 .../codegen/run-Pascal-Codegen-Tests.bat.tmpl |   173 -
 .../thrift.git/lib/delphi/test/maketest.sh    |    23 -
 .../multiplexed/Multiplex.Client.Main.pas     |   131 -
 .../multiplexed/Multiplex.Server.Main.pas     |   201 -
 .../multiplexed/Multiplex.Test.Client.dpr     |    67 -
 .../multiplexed/Multiplex.Test.Common.pas     |    35 -
 .../multiplexed/Multiplex.Test.Server.dpr     |    67 -
 .../test/serializer/TestSerializer.Data.pas   |   349 -
 .../delphi/test/serializer/TestSerializer.dpr |   230 -
 .../thrift.git/lib/delphi/test/server.dpr     |    73 -
 .../thrift.git/lib/delphi/test/skip/README.md |    11 -
 .../test/skip/idl/skiptest_version_1.thrift   |    45 -
 .../test/skip/idl/skiptest_version_2.thrift   |    69 -
 .../delphi/test/skip/skiptest_version1.dpr    |   201 -
 .../delphi/test/skip/skiptest_version2.dpr    |   228 -
 .../test/typeregistry/TestTypeRegistry.dpr    |    90 -
 .../thrift.git/lib/erl/Makefile.am            |    81 -
 .../thrift.git/lib/erl/README.md              |    51 -
 .../thrift.git/lib/erl/coding_standards.md    |     1 -
 .../lib/erl/include/thrift_constants.hrl      |    62 -
 .../lib/erl/include/thrift_protocol.hrl       |    66 -
 .../erl/include/thrift_protocol_behaviour.hrl |    37 -
 .../include/thrift_transport_behaviour.hrl    |    31 -
 .../thrift.git/lib/erl/rebar.config           |     1 -
 .../thrift.git/lib/erl/rebar.config.script    |     7 -
 .../thrift.git/lib/erl/rebar.test.config      |     5 -
 .../lib/erl/src/thrift_base64_transport.erl   |    69 -
 .../lib/erl/src/thrift_binary_protocol.erl    |   347 -
 .../lib/erl/src/thrift_buffered_transport.erl |    98 -
 .../thrift.git/lib/erl/src/thrift_client.erl  |   162 -
 .../lib/erl/src/thrift_client_util.erl        |   112 -
 .../lib/erl/src/thrift_compact_protocol.erl   |   390 -
 .../lib/erl/src/thrift_disk_log_transport.erl |   123 -
 .../lib/erl/src/thrift_file_transport.erl     |   115 -
 .../lib/erl/src/thrift_framed_transport.erl   |   125 -
 .../lib/erl/src/thrift_http_transport.erl     |   116 -
 .../lib/erl/src/thrift_json_parser.erl        |   419 -
 .../lib/erl/src/thrift_json_protocol.erl      |   567 -
 .../erl/src/thrift_membuffer_transport.erl    |    83 -
 .../lib/erl/src/thrift_memory_buffer.erl      |    47 -
 .../src/thrift_multiplexed_map_wrapper.erl    |    57 -
 .../erl/src/thrift_multiplexed_protocol.erl   |    83 -
 .../lib/erl/src/thrift_processor.erl          |   219 -
 .../lib/erl/src/thrift_protocol.erl           |   413 -
 .../erl/src/thrift_reconnecting_client.erl    |   258 -
 .../thrift.git/lib/erl/src/thrift_server.erl  |   183 -
 .../thrift.git/lib/erl/src/thrift_service.erl |    25 -
 .../lib/erl/src/thrift_socket_server.erl      |   320 -
 .../lib/erl/src/thrift_socket_transport.erl   |   176 -
 .../erl/src/thrift_sslsocket_transport.erl    |   147 -
 .../lib/erl/src/thrift_transport.erl          |   128 -
 .../erl/src/thrift_transport_state_test.erl   |   117 -
 .../thrift.git/lib/erl/test/Thrift1151.thrift |     3 -
 .../thrift.git/lib/erl/test/Thrift1475.thrift |    34 -
 .../lib/erl/test/flags/LegacyNames.thrift     |    33 -
 .../lib/erl/test/flags/Thrift3214.thrift      |    23 -
 .../lib/erl/test/legacy_names_test.erl        |    69 -
 .../lib/erl/test/multiplexing.thrift          |     7 -
 .../lib/erl/test/multiplexing_test.erl        |    57 -
 .../lib/erl/test/name_conflict_test.erl       |   299 -
 .../thrift.git/lib/erl/test/stress_server.erl |    64 -
 .../thrift.git/lib/erl/test/test_disklog.erl  |    99 -
 .../lib/erl/test/test_thrift_1151.erl         |    34 -
 .../lib/erl/test/test_thrift_3214.erl         |    60 -
 .../test/test_thrift_buffered_transport.erl   |   359 -
 .../erl/test/test_thrift_compact_protocol.erl |   219 -
 .../erl/test/test_thrift_file_transport.erl   |   213 -
 .../erl/test/test_thrift_framed_transport.erl |   404 -
 .../test/test_thrift_membuffer_transport.erl  |   167 -
 .../erl/test/test_thrift_socket_transport.erl |   199 -
 .../erl/test/thrift_socket_server_test.erl    |    49 -
 .../lib/erl/test/thrift_test_test.erl         |   655 -
 .../thrift.git/lib/go/Makefile.am             |    42 -
 .../thrift.git/lib/go/README.md               |    81 -
 .../thrift.git/lib/go/coding_standards.md     |     1 -
 .../lib/go/test/BinaryKeyTest.thrift          |    24 -
 .../lib/go/test/DontExportRWTest.thrift       |    27 -
 .../thrift.git/lib/go/test/ErrorTest.thrift   |    35 -
 .../thrift.git/lib/go/test/GoTagTest.thrift   |    24 -
 .../lib/go/test/IgnoreInitialismsTest.thrift  |    26 -
 .../lib/go/test/IncludesTest.thrift           |    67 -
 .../lib/go/test/InitialismsTest.thrift        |    24 -
 .../thrift.git/lib/go/test/Makefile.am        |   103 -
 .../go/test/MultiplexedProtocolTest.thrift    |    27 -
 .../thrift.git/lib/go/test/NamesTest.thrift   |    32 -
 .../lib/go/test/NamespacedTest.thrift         |    40 -
 .../thrift.git/lib/go/test/OnewayTest.thrift  |    24 -
 .../lib/go/test/OptionalFieldsTest.thrift     |    50 -
 .../go/test/RefAnnotationFieldsTest.thrift    |    58 -
 .../lib/go/test/ServicesTest.thrift           |   111 -
 .../lib/go/test/TypedefFieldTest.thrift       |    39 -
 .../lib/go/test/UnionDefaultValueTest.thrift  |    34 -
 .../go/test/dontexportrwtest/compile_test.go  |    38 -
 .../lib/go/test/tests/binary_key_test.go      |    31 -
 .../lib/go/test/tests/client_error_test.go    |   680 -
 .../lib/go/test/tests/encoding_json_test.go   |    79 -
 .../lib/go/test/tests/gotag_test.go           |    53 -
 .../go/test/tests/ignoreinitialisms_test.go   |    51 -
 .../lib/go/test/tests/initialisms_test.go     |    43 -
 .../test/tests/multiplexed_protocol_test.go   |   159 -
 .../lib/go/test/tests/names_test.go           |    35 -
 .../lib/go/test/tests/one_way_test.go         |    90 -
 .../lib/go/test/tests/optional_fields_test.go |   280 -
 .../lib/go/test/tests/protocol_mock.go        |   511 -
 .../lib/go/test/tests/protocols_test.go       |    97 -
 .../lib/go/test/tests/required_fields_test.go |    95 -
 .../go/test/tests/struct_args_rets_test.go    |    36 -
 .../lib/go/test/tests/thrifttest_driver.go    |   236 -
 .../lib/go/test/tests/thrifttest_handler.go   |   209 -
 .../go/test/tests/union_default_value_test.go |    33 -
 .../thrift.git/lib/go/thrift/processor.go     |    30 -
 .../thrift.git/lib/haxe/README.md             |   164 -
 .../thrift.git/lib/haxe/coding_standards.md   |     1 -
 .../thrift.git/lib/haxe/haxelib.json          |    12 -
 .../org/apache/thrift/AbstractMethodError.hx  |    40 -
 .../src/org/apache/thrift/ArgumentError.hx    |    29 -
 .../lib/haxe/src/org/apache/thrift/Limits.hx  |    44 -
 .../apache/thrift/TApplicationException.hx    |   104 -
 .../lib/haxe/src/org/apache/thrift/TBase.hx   |    73 -
 .../haxe/src/org/apache/thrift/TException.hx  |    36 -
 .../apache/thrift/TFieldRequirementType.hx    |    31 -
 .../haxe/src/org/apache/thrift/TProcessor.hx  |    30 -
 .../org/apache/thrift/helper/BitConverter.hx  |   170 -
 .../src/org/apache/thrift/helper/Int64Map.hx  |   295 -
 .../src/org/apache/thrift/helper/IntSet.hx    |    96 -
 .../src/org/apache/thrift/helper/ObjectSet.hx |    96 -
 .../src/org/apache/thrift/helper/StringSet.hx |    96 -
 .../src/org/apache/thrift/helper/ZigZag.hx    |   158 -
 .../apache/thrift/meta_data/FieldMetaData.hx  |    56 -
 .../thrift/meta_data/FieldValueMetaData.hx    |    43 -
 .../apache/thrift/meta_data/ListMetaData.hx   |    31 -
 .../apache/thrift/meta_data/MapMetaData.hx    |    33 -
 .../apache/thrift/meta_data/SetMetaData.hx    |    30 -
 .../apache/thrift/meta_data/StructMetaData.hx |    30 -
 .../apache/thrift/protocol/TBinaryProtocol.hx |   301 -
 .../thrift/protocol/TBinaryProtocolFactory.hx |    45 -
 .../thrift/protocol/TCompactProtocol.hx       |   718 -
 .../protocol/TCompactProtocolFactory.hx       |    40 -
 .../apache/thrift/protocol/TCompactTypes.hx   |    41 -
 .../src/org/apache/thrift/protocol/TField.hx  |    43 -
 .../apache/thrift/protocol/TJSONProtocol.hx   |  1073 -
 .../thrift/protocol/TJSONProtocolFactory.hx   |    40 -
 .../src/org/apache/thrift/protocol/TList.hx   |    32 -
 .../src/org/apache/thrift/protocol/TMap.hx    |    34 -
 .../org/apache/thrift/protocol/TMessage.hx    |    41 -
 .../apache/thrift/protocol/TMessageType.hx    |    28 -
 .../thrift/protocol/TMultiplexedProcessor.hx  |   177 -
 .../thrift/protocol/TMultiplexedProtocol.hx   |    97 -
 .../org/apache/thrift/protocol/TProtocol.hx   |    85 -
 .../thrift/protocol/TProtocolDecorator.hx     |   226 -
 .../thrift/protocol/TProtocolException.hx     |    41 -
 .../thrift/protocol/TProtocolFactory.hx       |    26 -
 .../apache/thrift/protocol/TProtocolUtil.hx   |   110 -
 .../thrift/protocol/TRecursionTracker.hx      |    48 -
 .../src/org/apache/thrift/protocol/TSet.hx    |    32 -
 .../src/org/apache/thrift/protocol/TStruct.hx |    30 -
 .../src/org/apache/thrift/protocol/TType.hx   |    37 -
 .../src/org/apache/thrift/server/TServer.hx   |   111 -
 .../thrift/server/TServerEventHandler.hx      |    41 -
 .../org/apache/thrift/server/TSimpleServer.hx |   136 -
 .../thrift/transport/TBufferedTransport.hx    |   155 -
 .../transport/TBufferedTransportFactory.hx    |    37 -
 .../apache/thrift/transport/TFileStream.hx    |   101 -
 .../thrift/transport/TFramedTransport.hx      |   158 -
 .../transport/TFramedTransportFactory.hx      |    37 -
 .../thrift/transport/TFullDuplexHttpClient.hx |   253 -
 .../apache/thrift/transport/THttpClient.hx    |   103 -
 .../apache/thrift/transport/TServerSocket.hx  |   130 -
 .../thrift/transport/TServerTransport.hx      |    43 -
 .../org/apache/thrift/transport/TSocket.hx    |   318 -
 .../org/apache/thrift/transport/TStream.hx    |    32 -
 .../thrift/transport/TStreamTransport.hx      |   103 -
 .../org/apache/thrift/transport/TTransport.hx |   139 -
 .../thrift/transport/TTransportException.hx   |    39 -
 .../thrift/transport/TTransportFactory.hx     |    44 -
 .../transport/TWrappingServerTransport.hx     |    47 -
 .../thrift.git/lib/haxe/test/HaxeTests.hxproj |    69 -
 .../thrift.git/lib/haxe/test/Makefile.am      |    86 -
 .../thrift.git/lib/haxe/test/cpp.hxml         |    41 -
 .../thrift.git/lib/haxe/test/csharp.hxml      |    38 -
 .../thrift.git/lib/haxe/test/flash.hxml       |    38 -
 .../thrift.git/lib/haxe/test/java.hxml        |    38 -
 .../thrift.git/lib/haxe/test/javascript.hxml  |    44 -
 .../thrift.git/lib/haxe/test/make_all.bat     |    70 -
 .../thrift.git/lib/haxe/test/make_all.sh      |    43 -
 .../thrift.git/lib/haxe/test/neko.hxml        |    38 -
 .../thrift.git/lib/haxe/test/php.hxml         |    39 -
 .../thrift.git/lib/haxe/test/project.hide     |    67 -
 .../thrift.git/lib/haxe/test/python.hxml      |    38 -
 .../thrift.git/lib/haxe/test/src/Main.hx      |    93 -
 .../lib/haxe/test/src/MultiplexTest.hx        |   224 -
 .../lib/haxe/test/src/StreamTest.hx           |    95 -
 .../thrift.git/lib/haxe/test/src/TestBase.hx  |    46 -
 .../thrift.git/lib/hs/CMakeLists.txt          |    93 -
 .../git.apache.org/thrift.git/lib/hs/LICENSE  |   202 -
 .../thrift.git/lib/hs/Makefile.am             |    50 -
 .../thrift.git/lib/hs/README.md               |    99 -
 .../thrift.git/lib/hs/Setup.lhs               |    21 -
 vendor/git.apache.org/thrift.git/lib/hs/TODO  |     2 -
 .../thrift.git/lib/hs/Thrift.cabal            |    80 -
 .../thrift.git/lib/hs/coding_standards.md     |     1 -
 .../thrift.git/lib/hs/src/Thrift.hs           |   114 -
 .../lib/hs/src/Thrift/Arbitraries.hs          |    55 -
 .../thrift.git/lib/hs/src/Thrift/Protocol.hs  |   149 -
 .../lib/hs/src/Thrift/Protocol/Binary.hs      |   191 -
 .../lib/hs/src/Thrift/Protocol/Compact.hs     |   301 -
 .../lib/hs/src/Thrift/Protocol/JSON.hs        |   352 -
 .../thrift.git/lib/hs/src/Thrift/Server.hs    |    66 -
 .../thrift.git/lib/hs/src/Thrift/Transport.hs |    65 -
 .../lib/hs/src/Thrift/Transport/Empty.hs      |    36 -
 .../lib/hs/src/Thrift/Transport/Framed.hs     |    99 -
 .../lib/hs/src/Thrift/Transport/Handle.hs     |    68 -
 .../lib/hs/src/Thrift/Transport/HttpClient.hs |   101 -
 .../lib/hs/src/Thrift/Transport/IOBuffer.hs   |    69 -
 .../lib/hs/src/Thrift/Transport/Memory.hs     |    77 -
 .../thrift.git/lib/hs/src/Thrift/Types.hs     |   130 -
 .../thrift.git/lib/hs/test/BinarySpec.hs      |    91 -
 .../thrift.git/lib/hs/test/CompactSpec.hs     |    81 -
 .../thrift.git/lib/hs/test/JSONSpec.hs        |   225 -
 .../thrift.git/lib/hs/test/Spec.hs            |    38 -
 .../thrift.git/lib/java/CMakeLists.txt        |    80 -
 .../thrift.git/lib/java/Makefile.am           |    50 -
 .../thrift.git/lib/java/README.md             |    53 -
 .../thrift.git/lib/java/android/build.gradle  |    50 -
 .../lib/java/android/settings.gradle          |     1 -
 .../java/android/src/main/AndroidManifest.xml |     4 -
 .../thrift.git/lib/java/build.properties      |    31 -
 .../thrift.git/lib/java/build.xml             |   414 -
 .../thrift.git/lib/java/coding_standards.md   |     1 -
 .../apache/thrift/AsyncProcessFunction.java   |    56 -
 .../src/org/apache/thrift/EncodingUtils.java  |   148 -
 .../java/src/org/apache/thrift/Option.java    |   121 -
 .../org/apache/thrift/ProcessFunction.java    |    70 -
 .../src/org/apache/thrift/ShortStack.java     |    82 -
 .../apache/thrift/TApplicationException.java  |   150 -
 .../org/apache/thrift/TAsyncProcessor.java    |    35 -
 .../lib/java/src/org/apache/thrift/TBase.java |    67 -
 .../apache/thrift/TBaseAsyncProcessor.java    |   105 -
 .../src/org/apache/thrift/TBaseHelper.java    |   337 -
 .../src/org/apache/thrift/TBaseProcessor.java |    42 -
 .../apache/thrift/TByteArrayOutputStream.java |    56 -
 .../src/org/apache/thrift/TDeserializer.java  |   358 -
 .../lib/java/src/org/apache/thrift/TEnum.java |    24 -
 .../src/org/apache/thrift/TEnumHelper.java    |    57 -
 .../src/org/apache/thrift/TException.java     |    45 -
 .../src/org/apache/thrift/TFieldIdEnum.java   |    34 -
 .../apache/thrift/TFieldRequirementType.java  |    30 -
 .../apache/thrift/TMultiplexedProcessor.java  |   143 -
 .../thrift/TNonblockingMultiFetchClient.java  |   399 -
 .../thrift/TNonblockingMultiFetchStats.java   |    80 -
 .../src/org/apache/thrift/TProcessor.java     |    32 -
 .../org/apache/thrift/TProcessorFactory.java  |    43 -
 .../src/org/apache/thrift/TSerializable.java  |    44 -
 .../src/org/apache/thrift/TSerializer.java    |   110 -
 .../src/org/apache/thrift/TServiceClient.java |    92 -
 .../apache/thrift/TServiceClientFactory.java  |    45 -
 .../java/src/org/apache/thrift/TUnion.java    |   279 -
 .../thrift/async/AsyncMethodCallback.java     |    51 -
 .../org/apache/thrift/async/TAsyncClient.java |   102 -
 .../thrift/async/TAsyncClientFactory.java     |    25 -
 .../thrift/async/TAsyncClientManager.java     |   201 -
 .../apache/thrift/async/TAsyncMethodCall.java |   284 -
 .../apache/thrift/meta_data/EnumMetaData.java |    31 -
 .../thrift/meta_data/FieldMetaData.java       |    70 -
 .../thrift/meta_data/FieldValueMetaData.java  |    72 -
 .../apache/thrift/meta_data/ListMetaData.java |    29 -
 .../apache/thrift/meta_data/MapMetaData.java  |    31 -
 .../apache/thrift/meta_data/SetMetaData.java  |    29 -
 .../thrift/meta_data/StructMetaData.java      |    31 -
 .../apache/thrift/protocol/TBase64Utils.java  |   127 -
 .../thrift/protocol/TBinaryProtocol.java      |   426 -
 .../thrift/protocol/TCompactProtocol.java     |   908 -
 .../org/apache/thrift/protocol/TField.java    |    66 -
 .../apache/thrift/protocol/TJSONProtocol.java |  1007 -
 .../src/org/apache/thrift/protocol/TList.java |    38 -
 .../src/org/apache/thrift/protocol/TMap.java  |    40 -
 .../org/apache/thrift/protocol/TMessage.java  |    76 -
 .../apache/thrift/protocol/TMessageType.java  |    31 -
 .../thrift/protocol/TMultiplexedProtocol.java |    93 -
 .../org/apache/thrift/protocol/TProtocol.java |   162 -
 .../thrift/protocol/TProtocolDecorator.java   |   213 -
 .../thrift/protocol/TProtocolException.java   |    82 -
 .../thrift/protocol/TProtocolFactory.java     |    31 -
 .../apache/thrift/protocol/TProtocolUtil.java |   220 -
 .../src/org/apache/thrift/protocol/TSet.java  |    42 -
 .../thrift/protocol/TSimpleJSONProtocol.java  |   448 -
 .../org/apache/thrift/protocol/TStruct.java   |    36 -
 .../thrift/protocol/TTupleProtocol.java       |    98 -
 .../src/org/apache/thrift/protocol/TType.java |    40 -
 .../src/org/apache/thrift/scheme/IScheme.java |    29 -
 .../apache/thrift/scheme/SchemeFactory.java   |    25 -
 .../apache/thrift/scheme/StandardScheme.java  |    25 -
 .../org/apache/thrift/scheme/TupleScheme.java |    25 -
 .../server/AbstractNonblockingServer.java     |   612 -
 .../org/apache/thrift/server/Invocation.java  |    20 -
 .../apache/thrift/server/ServerContext.java   |    26 -
 .../thrift/server/TExtensibleServlet.java     |   171 -
 .../org/apache/thrift/server/THsHaServer.java |   201 -
 .../thrift/server/TNonblockingServer.java     |   248 -
 .../src/org/apache/thrift/server/TServer.java |   177 -
 .../thrift/server/TServerEventHandler.java    |    59 -
 .../org/apache/thrift/server/TServlet.java    |   119 -
 .../apache/thrift/server/TSimpleServer.java   |   117 -
 .../thrift/server/TThreadPoolServer.java      |   314 -
 .../server/TThreadedSelectorServer.java       |   668 -
 .../thrift/transport/AutoExpandingBuffer.java |    52 -
 .../AutoExpandingBufferReadTransport.java     |    84 -
 .../AutoExpandingBufferWriteTransport.java    |    66 -
 .../apache/thrift/transport/TByteBuffer.java  |    87 -
 .../transport/TFastFramedTransport.java       |   191 -
 .../thrift/transport/TFileProcessor.java      |   118 -
 .../thrift/transport/TFileTransport.java      |   621 -
 .../thrift/transport/TFramedTransport.java    |   178 -
 .../apache/thrift/transport/THttpClient.java  |   359 -
 .../thrift/transport/TIOStreamTransport.java  |   164 -
 .../thrift/transport/TMemoryBuffer.java       |   102 -
 .../transport/TMemoryInputTransport.java      |    96 -
 .../transport/TNonblockingServerSocket.java   |   163 -
 .../TNonblockingServerTransport.java          |    31 -
 .../thrift/transport/TNonblockingSocket.java  |   210 -
 .../transport/TNonblockingTransport.java      |    47 -
 .../transport/TSSLTransportFactory.java       |   385 -
 .../transport/TSaslClientTransport.java       |   113 -
 .../transport/TSaslServerTransport.java       |   236 -
 .../thrift/transport/TSaslTransport.java      |   578 -
 .../transport/TSaslTransportException.java    |    43 -
 .../thrift/transport/TSeekableFile.java       |    33 -
 .../thrift/transport/TServerSocket.java       |   158 -
 .../thrift/transport/TServerTransport.java    |    80 -
 .../transport/TSimpleFileTransport.java       |   216 -
 .../org/apache/thrift/transport/TSocket.java  |   248 -
 .../thrift/transport/TStandardFile.java       |    60 -
 .../apache/thrift/transport/TTransport.java   |   163 -
 .../thrift/transport/TTransportException.java |    81 -
 .../thrift/transport/TTransportFactory.java   |    41 -
 .../thrift/transport/TZlibTransport.java      |   148 -
 .../thrift.git/lib/java/test/.keystore        |   Bin 2429 -> 0 bytes
 .../thrift.git/lib/java/test/.truststore      |   Bin 1149 -> 0 bytes
 .../thrift.git/lib/java/test/log4j.properties |     6 -
 .../java/test/org/apache/thrift/Fixtures.java |   339 -
 .../test/org/apache/thrift/TestFullCamel.java |    59 -
 .../org/apache/thrift/TestOptionType.java     |    66 -
 .../test/org/apache/thrift/TestOptionals.java |    88 -
 .../test/org/apache/thrift/TestReuse.java     |    60 -
 .../org/apache/thrift/TestShortStack.java     |   116 -
 .../test/org/apache/thrift/TestStruct.java    |   396 -
 .../org/apache/thrift/TestTBaseHelper.java    |   209 -
 .../org/apache/thrift/TestTDeserializer.java  |   126 -
 .../org/apache/thrift/TestTEnumHelper.java    |    41 -
 .../test/org/apache/thrift/TestTUnion.java    |   268 -
 .../apache/thrift/async/TestTAsyncClient.java |    28 -
 .../thrift/async/TestTAsyncClientManager.java |   378 -
 .../thrift/protocol/BenchmarkProtocols.java   |    88 -
 .../thrift/protocol/ProtocolTestBase.java     |   427 -
 .../thrift/protocol/TestTCompactProtocol.java |    56 -
 .../thrift/protocol/TestTJSONProtocol.java    |    48 -
 .../thrift/protocol/TestTProtocolUtil.java    |    97 -
 .../protocol/TestTSimpleJSONProtocol.java     |    98 -
 .../thrift/protocol/TestTTupleProtocol.java   |    27 -
 .../thrift/scheme/TestStandardScheme.java     |    40 -
 .../apache/thrift/server/ServerTestBase.java  |   705 -
 .../apache/thrift/server/TestAsyncServer.java |    28 -
 .../apache/thrift/server/TestHsHaServer.java  |    30 -
 .../thrift/server/TestNonblockingServer.java  |   123 -
 .../server/TestThreadedSelectorServer.java    |    30 -
 .../org/apache/thrift/test/EqualityTest.java  |   663 -
 .../org/apache/thrift/test/JavaBeansTest.java |   112 -
 .../org/apache/thrift/test/ReadStruct.java    |    62 -
 .../thrift/test/SerializationBenchmark.java   |    80 -
 .../org/apache/thrift/test/TestClient.java    |   782 -
 .../thrift/test/TestNonblockingServer.java    |    76 -
 .../org/apache/thrift/test/TestServer.java    |   284 -
 .../org/apache/thrift/test/WriteStruct.java   |    48 -
 .../transport/ReadCountingTransport.java      |    61 -
 .../transport/TestAutoExpandingBuffer.java    |    37 -
 .../TestAutoExpandingBufferReadTransport.java |    50 -
 ...TestAutoExpandingBufferWriteTransport.java |    44 -
 .../thrift/transport/TestTByteBuffer.java     |    36 -
 .../transport/TestTFastFramedTransport.java   |    31 -
 .../transport/TestTFramedTransport.java       |   186 -
 .../transport/TestTMemoryInputTransport.java  |    85 -
 .../transport/TestTSSLTransportFactory.java   |    88 -
 ...TestTSSLTransportFactoryCustomClient1.java |    35 -
 ...TestTSSLTransportFactoryCustomClient2.java |    34 -
 .../thrift/transport/TestTSaslTransports.java |   478 -
 .../transport/TestTSimpleFileTransport.java   |    74 -
 .../thrift/transport/TestTZlibTransport.java  |   140 -
 .../transport/WriteCountingTransport.java     |    54 -
 .../thrift.git/lib/javame/coding_standards.md |     1 -
 .../apache/thrift/TApplicationException.java  |   132 -
 .../javame/src/org/apache/thrift/TBase.java   |    46 -
 .../src/org/apache/thrift/TBaseHelper.java    |   209 -
 .../apache/thrift/TByteArrayOutputStream.java |    41 -
 .../src/org/apache/thrift/TDeserializer.java  |    95 -
 .../javame/src/org/apache/thrift/TEnum.java   |    24 -
 .../src/org/apache/thrift/TException.java     |    45 -
 .../apache/thrift/TFieldRequirementType.java  |    48 -
 .../src/org/apache/thrift/TProcessor.java     |    32 -
 .../org/apache/thrift/TProcessorFactory.java  |    39 -
 .../src/org/apache/thrift/TSerializer.java    |   110 -
 .../src/org/apache/thrift/TServiceClient.java |    39 -
 .../thrift/meta_data/FieldMetaData.java       |    88 -
 .../thrift/meta_data/FieldValueMetaData.java  |    61 -
 .../apache/thrift/meta_data/ListMetaData.java |    49 -
 .../apache/thrift/meta_data/MapMetaData.java  |    51 -
 .../apache/thrift/meta_data/SetMetaData.java  |    47 -
 .../thrift/meta_data/StructMetaData.java      |    51 -
 .../apache/thrift/protocol/TBase64Utils.java  |   127 -
 .../thrift/protocol/TBinaryProtocol.java      |   329 -
 .../org/apache/thrift/protocol/TField.java    |    38 -
 .../apache/thrift/protocol/TJSONProtocol.java |   973 -
 .../src/org/apache/thrift/protocol/TList.java |    36 -
 .../src/org/apache/thrift/protocol/TMap.java  |    38 -
 .../org/apache/thrift/protocol/TMessage.java  |    38 -
 .../apache/thrift/protocol/TMessageType.java  |    30 -
 .../org/apache/thrift/protocol/TProtocol.java |   169 -
 .../thrift/protocol/TProtocolException.java   |    81 -
 .../thrift/protocol/TProtocolFactory.java     |    30 -
 .../apache/thrift/protocol/TProtocolUtil.java |   158 -
 .../src/org/apache/thrift/protocol/TSet.java  |    36 -
 .../org/apache/thrift/protocol/TStruct.java   |    34 -
 .../src/org/apache/thrift/protocol/TType.java |    40 -
 .../thrift/transport/TFramedTransport.java    |   122 -
 .../apache/thrift/transport/THttpClient.java  |   163 -
 .../thrift/transport/TIOStreamTransport.java  |   153 -
 .../thrift/transport/TMemoryBuffer.java       |    97 -
 .../apache/thrift/transport/TTransport.java   |   121 -
 .../thrift/transport/TTransportException.java |    80 -
 .../thrift/transport/TTransportFactory.java   |    41 -
 .../thrift.git/lib/js/Gruntfile.js            |   172 -
 .../thrift.git/lib/js/Makefile.am             |    27 -
 .../thrift.git/lib/js/README.md               |   147 -
 .../thrift.git/lib/js/coding_standards.md     |     1 -
 .../thrift.git/lib/js/package.json            |    15 -
 .../thrift.git/lib/js/src/thrift.js           |  1555 -
 .../thrift.git/lib/js/test/Makefile.am        |    29 -
 .../thrift.git/lib/js/test/README.md          |    68 -
 .../thrift.git/lib/js/test/build.xml          |   227 -
 .../lib/js/test/deep-constructor.test.js      |   195 -
 .../thrift.git/lib/js/test/jsTestDriver.conf  |    17 -
 .../thrift.git/lib/js/test/phantom-client.js  |   382 -
 .../thrift.git/lib/js/test/phantomjs-qunit.js |    91 -
 .../thrift.git/lib/js/test/server_http.js     |    49 -
 .../thrift.git/lib/js/test/server_https.js    |    57 -
 .../lib/js/test/src/test/Httpd.java           |   323 -
 .../thrift.git/lib/js/test/test-async.js      |   348 -
 .../lib/js/test/test-deep-constructor.html    |    49 -
 .../thrift.git/lib/js/test/test-jq.js         |   158 -
 .../thrift.git/lib/js/test/test-nojq.html     |    52 -
 .../thrift.git/lib/js/test/test-nojq.js       |    49 -
 .../thrift.git/lib/js/test/test.html          |    59 -
 .../thrift.git/lib/js/test/test.js            |   412 -
 .../thrift.git/lib/js/test/test_handler.js    |   199 -
 .../thrift.git/lib/js/test/testws.html        |    62 -
 .../thrift.git/lib/json/Makefile.am           |    29 -
 .../thrift.git/lib/json/schema.json           |   330 -
 .../thrift.git/lib/json/test/Makefile.am      |    26 -
 .../thrift.git/lib/json/test/build.properties |    10 -
 .../thrift.git/lib/json/test/build.xml        |   144 -
 .../thrift.git/lib/lua/Makefile.am            |    73 -
 .../thrift.git/lib/lua/TBinaryProtocol.lua    |   264 -
 .../thrift.git/lib/lua/TBufferedTransport.lua |    91 -
 .../thrift.git/lib/lua/TCompactProtocol.lua   |   457 -
 .../thrift.git/lib/lua/TFramedTransport.lua   |   118 -
 .../thrift.git/lib/lua/THttpTransport.lua     |   182 -
 .../thrift.git/lib/lua/TJsonProtocol.lua      |   727 -
 .../thrift.git/lib/lua/TMemoryBuffer.lua      |    91 -
 .../thrift.git/lib/lua/TProtocol.lua          |   162 -
 .../thrift.git/lib/lua/TServer.lua            |   140 -
 .../thrift.git/lib/lua/TSocket.lua            |   132 -
 .../thrift.git/lib/lua/TTransport.lua         |    93 -
 .../thrift.git/lib/lua/Thrift.lua             |   281 -
 .../thrift.git/lib/lua/coding_standards.md    |     1 -
 .../thrift.git/lib/lua/src/longnumberutils.c  |    47 -
 .../thrift.git/lib/lua/src/luabitwise.c       |    83 -
 .../thrift.git/lib/lua/src/luabpack.c         |   308 -
 .../thrift.git/lib/lua/src/lualongnumber.c    |   228 -
 .../thrift.git/lib/lua/src/luasocket.c        |   380 -
 .../thrift.git/lib/lua/src/socket.h           |    78 -
 .../thrift.git/lib/lua/src/usocket.c          |   370 -
 .../thrift.git/lib/nodejs/Makefile.am         |    43 -
 .../thrift.git/lib/nodejs/README.md           |    65 -
 .../thrift.git/lib/nodejs/coding_standards.md |     1 -
 .../thrift.git/lib/nodejs/examples/README.md  |    40 -
 .../thrift.git/lib/nodejs/examples/client.js  |    49 -
 .../nodejs/examples/client_multitransport.js  |    58 -
 .../thrift.git/lib/nodejs/examples/hello.html |    65 -
 .../thrift.git/lib/nodejs/examples/hello.js   |    63 -
 .../lib/nodejs/examples/hello.thrift          |    27 -
 .../lib/nodejs/examples/httpClient.js         |    23 -
 .../lib/nodejs/examples/httpServer.js         |    31 -
 .../lib/nodejs/examples/httpServer.py         |    19 -
 .../thrift.git/lib/nodejs/examples/parse.js   |    46 -
 .../thrift.git/lib/nodejs/examples/server.js  |    39 -
 .../lib/nodejs/examples/server_http.js        |    53 -
 .../nodejs/examples/server_multitransport.js  |    46 -
 .../lib/nodejs/examples/user.thrift           |    27 -
 .../lib/nodejs/lib/thrift/binary.js           |   168 -
 .../lib/nodejs/lib/thrift/binary_protocol.js  |   366 -
 .../lib/nodejs/lib/thrift/browser.js          |    34 -
 .../nodejs/lib/thrift/buffered_transport.js   |   175 -
 .../lib/nodejs/lib/thrift/compact_protocol.js |   918 -
 .../lib/nodejs/lib/thrift/connection.js       |   353 -
 .../lib/nodejs/lib/thrift/create_client.js    |    54 -
 .../lib/nodejs/lib/thrift/framed_transport.js |   182 -
 .../lib/nodejs/lib/thrift/http_connection.js  |   238 -
 .../thrift.git/lib/nodejs/lib/thrift/index.js |    67 -
 .../lib/thrift/input_buffer_underrun_error.js |    30 -
 .../lib/nodejs/lib/thrift/int64_util.js       |    91 -
 .../lib/nodejs/lib/thrift/json_parse.js       |   299 -
 .../lib/nodejs/lib/thrift/json_protocol.js    |   743 -
 .../thrift.git/lib/nodejs/lib/thrift/log.js   |    26 -
 .../lib/thrift/multiplexed_processor.js       |    63 -
 .../nodejs/lib/thrift/multiplexed_protocol.js |    73 -
 .../lib/nodejs/lib/thrift/protocol.js         |    22 -
 .../lib/nodejs/lib/thrift/server.js           |   107 -
 .../lib/nodejs/lib/thrift/thrift.js           |   232 -
 .../lib/nodejs/lib/thrift/transport.js        |    22 -
 .../lib/nodejs/lib/thrift/web_server.js       |   564 -
 .../lib/nodejs/lib/thrift/ws_connection.js    |   286 -
 .../lib/nodejs/lib/thrift/ws_transport.js     |   204 -
 .../lib/nodejs/lib/thrift/xhr_connection.js   |   280 -
 .../thrift.git/lib/nodejs/test/binary.test.js |   137 -
 .../lib/nodejs/test/browser_client.js         |    27 -
 .../lib/nodejs/test/certificates.README       |     7 -
 .../thrift.git/lib/nodejs/test/client.js      |   130 -
 .../lib/nodejs/test/deep-constructor.test.js  |   314 -
 .../thrift.git/lib/nodejs/test/exceptions.js  |    55 -
 .../thrift.git/lib/nodejs/test/helpers.js     |    13 -
 .../thrift.git/lib/nodejs/test/server.crt     |    25 -
 .../thrift.git/lib/nodejs/test/server.js      |   101 -
 .../thrift.git/lib/nodejs/test/server.key     |    28 -
 .../thrift.git/lib/nodejs/test/test-cases.js  |   144 -
 .../thrift.git/lib/nodejs/test/testAll.sh     |   107 -
 .../thrift.git/lib/nodejs/test/test_driver.js |   327 -
 .../lib/nodejs/test/test_handler.js           |   227 -
 .../thrift.git/lib/ocaml/OCamlMakefile        |  1231 -
 .../thrift.git/lib/ocaml/README-OCamlMakefile |   643 -
 .../thrift.git/lib/ocaml/README.md            |   119 -
 .../git.apache.org/thrift.git/lib/ocaml/TODO  |     5 -
 .../thrift.git/lib/ocaml/_oasis               |    19 -
 .../thrift.git/lib/ocaml/coding_standards.md  |     1 -
 .../lib/ocaml/src/TBinaryProtocol.ml          |   171 -
 .../lib/ocaml/src/TChannelTransport.ml        |    39 -
 .../lib/ocaml/src/TFramedTransport.ml         |    93 -
 .../thrift.git/lib/ocaml/src/TServer.ml       |    42 -
 .../thrift.git/lib/ocaml/src/TServerSocket.ml |    41 -
 .../thrift.git/lib/ocaml/src/TSimpleServer.ml |    40 -
 .../thrift.git/lib/ocaml/src/TSocket.ml       |    59 -
 .../lib/ocaml/src/TThreadedServer.ml          |    45 -
 .../thrift.git/lib/ocaml/src/Thrift.ml        |   383 -
 .../thrift.git/lib/perl/Makefile.PL           |    29 -
 .../thrift.git/lib/perl/Makefile.am           |   105 -
 .../thrift.git/lib/perl/README.md             |    45 -
 .../thrift.git/lib/perl/coding_standards.md   |     1 -
 .../thrift.git/lib/perl/lib/Thrift.pm         |   193 -
 .../lib/perl/lib/Thrift/BinaryProtocol.pm     |   511 -
 .../lib/perl/lib/Thrift/BufferedTransport.pm  |   136 -
 .../lib/perl/lib/Thrift/FramedTransport.pm    |   193 -
 .../lib/perl/lib/Thrift/HttpClient.pm         |   200 -
 .../lib/perl/lib/Thrift/MemoryBuffer.pm       |   146 -
 .../lib/perl/lib/Thrift/MessageType.pm        |    32 -
 .../perl/lib/Thrift/MultiplexedProcessor.pm   |   121 -
 .../perl/lib/Thrift/MultiplexedProtocol.pm    |    67 -
 .../lib/perl/lib/Thrift/Protocol.pm           |   544 -
 .../lib/perl/lib/Thrift/ProtocolDecorator.pm  |   360 -
 .../lib/perl/lib/Thrift/SSLServerSocket.pm    |    68 -
 .../lib/perl/lib/Thrift/SSLSocket.pm          |    93 -
 .../thrift.git/lib/perl/lib/Thrift/Server.pm  |   315 -
 .../lib/perl/lib/Thrift/ServerSocket.pm       |   114 -
 .../thrift.git/lib/perl/lib/Thrift/Socket.pm  |   317 -
 .../lib/perl/lib/Thrift/Transport.pm          |   177 -
 .../lib/perl/lib/Thrift/UnixServerSocket.pm   |    84 -
 .../lib/perl/lib/Thrift/UnixSocket.pm         |    68 -
 .../thrift.git/lib/perl/test.pl               |    25 -
 .../thrift.git/lib/perl/test/Makefile.am      |    20 -
 .../thrift.git/lib/perl/test/memory_buffer.t  |    53 -
 .../thrift.git/lib/perl/test/multiplex.t      |   203 -
 .../thrift.git/lib/perl/test/processor.t      |   104 -
 .../thrift.git/lib/php/Makefile.am            |   150 -
 .../thrift.git/lib/php/README.apache.md       |    74 -
 .../thrift.git/lib/php/README.md              |    53 -
 .../thrift.git/lib/php/coding_standards.md    |     1 -
 .../lib/php/lib/Thrift/Base/TBase.php         |   380 -
 .../Thrift/ClassLoader/ThriftClassLoader.php  |   210 -
 .../Exception/TApplicationException.php       |    76 -
 .../php/lib/Thrift/Exception/TException.php   |   383 -
 .../Thrift/Exception/TProtocolException.php   |    50 -
 .../Thrift/Exception/TTransportException.php  |    40 -
 .../Thrift/Factory/TBinaryProtocolFactory.php |    45 -
 .../Factory/TCompactProtocolFactory.php       |    40 -
 .../Thrift/Factory/TJSONProtocolFactory.php   |    40 -
 .../lib/Thrift/Factory/TProtocolFactory.php   |    36 -
 .../lib/Thrift/Factory/TStringFuncFactory.php |    66 -
 .../lib/Thrift/Factory/TTransportFactory.php  |    18 -
 .../lib/Thrift/Protocol/JSON/BaseContext.php  |    39 -
 .../lib/Thrift/Protocol/JSON/ListContext.php  |    54 -
 .../Thrift/Protocol/JSON/LookaheadReader.php  |    57 -
 .../lib/Thrift/Protocol/JSON/PairContext.php  |    64 -
 .../SimpleJSON/CollectionMapKeyException.php  |    33 -
 .../Thrift/Protocol/SimpleJSON/Context.php    |    36 -
 .../Protocol/SimpleJSON/ListContext.php       |    45 -
 .../Thrift/Protocol/SimpleJSON/MapContext.php |    51 -
 .../Protocol/SimpleJSON/StructContext.php     |    53 -
 .../lib/Thrift/Protocol/TBinaryProtocol.php   |   453 -
 .../Protocol/TBinaryProtocolAccelerated.php   |    65 -
 .../lib/Thrift/Protocol/TCompactProtocol.php  |   739 -
 .../php/lib/Thrift/Protocol/TJSONProtocol.php |   807 -
 .../Thrift/Protocol/TMultiplexedProtocol.php  |    85 -
 .../lib/php/lib/Thrift/Protocol/TProtocol.php |   352 -
 .../Thrift/Protocol/TProtocolDecorator.php    |   284 -
 .../Thrift/Protocol/TSimpleJSONProtocol.php   |   371 -
 .../Thrift/Serializer/TBinarySerializer.php   |    85 -
 .../php/lib/Thrift/Server/TForkingServer.php  |   120 -
 .../lib/Thrift/Server/TSSLServerSocket.php    |    94 -
 .../lib/php/lib/Thrift/Server/TServer.php     |   100 -
 .../php/lib/Thrift/Server/TServerSocket.php   |   122 -
 .../lib/Thrift/Server/TServerTransport.php    |    56 -
 .../php/lib/Thrift/Server/TSimpleServer.php   |    58 -
 .../lib/php/lib/Thrift/StringFunc/Core.php    |    40 -
 .../php/lib/Thrift/StringFunc/Mbstring.php    |    46 -
 .../php/lib/Thrift/StringFunc/TStringFunc.php |    28 -
 .../php/lib/Thrift/TMultiplexedProcessor.php  |   143 -
 .../Thrift/Transport/TBufferedTransport.php   |   181 -
 .../php/lib/Thrift/Transport/TCurlClient.php  |   231 -
 .../lib/Thrift/Transport/TFramedTransport.php |   193 -
 .../php/lib/Thrift/Transport/THttpClient.php  |   229 -
 .../lib/Thrift/Transport/TMemoryBuffer.php    |   100 -
 .../lib/Thrift/Transport/TNullTransport.php   |    51 -
 .../php/lib/Thrift/Transport/TPhpStream.php   |   123 -
 .../php/lib/Thrift/Transport/TSSLSocket.php   |   112 -
 .../lib/php/lib/Thrift/Transport/TSocket.php  |   337 -
 .../php/lib/Thrift/Transport/TSocketPool.php  |   300 -
 .../php/lib/Thrift/Transport/TTransport.php   |    95 -
 .../lib/php/lib/Thrift/Type/TConstant.php     |    50 -
 .../lib/php/lib/Thrift/Type/TMessageType.php  |    34 -
 .../lib/php/lib/Thrift/Type/TType.php         |    47 -
 .../thrift.git/lib/php/src/TStringUtils.php   |    90 -
 .../thrift.git/lib/php/src/Thrift.php         |   821 -
 .../thrift.git/lib/php/src/autoload.php       |    51 -
 .../thrift_protocol/php_thrift_protocol.cpp   |  1084 -
 .../ext/thrift_protocol/php_thrift_protocol.h |    27 -
 .../thrift_protocol/php_thrift_protocol7.cpp  |  1020 -
 .../thrift.git/lib/php/test/Makefile.am       |    61 -
 .../lib/php/test/Test/Thrift/Fixtures.php     |   194 -
 .../JsonSerialize/JsonSerializeTest.php       |   116 -
 .../Thrift/Protocol/TestBinarySerializer.php  |    64 -
 .../Thrift/Protocol/TestTJSONProtocol.php     |   583 -
 .../Protocol/TestTSimpleJSONProtocol.php      |   300 -
 .../php/test/Test/Thrift/TestValidators.php   |   156 -
 .../lib/php/test/TestValidators.thrift        |    31 -
 .../thrift.git/lib/php/thrift_protocol.ini    |     1 -
 .../thrift.git/lib/py/CMakeLists.txt          |    31 -
 .../thrift.git/lib/py/Makefile.am             |    58 -
 .../thrift.git/lib/py/README.md               |    35 -
 .../thrift.git/lib/py/coding_standards.md     |     7 -
 .../thrift.git/lib/py/compat/win32/stdint.h   |   247 -
 .../thrift.git/lib/py/setup.cfg               |     6 -
 .../git.apache.org/thrift.git/lib/py/setup.py |   134 -
 .../lib/py/src/TMultiplexedProcessor.py       |    55 -
 .../thrift.git/lib/py/src/TSCons.py           |    36 -
 .../thrift.git/lib/py/src/TSerialization.py   |    38 -
 .../thrift.git/lib/py/src/TTornado.py         |   188 -
 .../thrift.git/lib/py/src/Thrift.py           |   192 -
 .../thrift.git/lib/py/src/__init__.py         |    20 -
 .../thrift.git/lib/py/src/compat.py           |    40 -
 .../thrift.git/lib/py/src/ext/binary.cpp      |    38 -
 .../thrift.git/lib/py/src/ext/binary.h        |   214 -
 .../thrift.git/lib/py/src/ext/compact.cpp     |   107 -
 .../thrift.git/lib/py/src/ext/compact.h       |   367 -
 .../thrift.git/lib/py/src/ext/endian.h        |    92 -
 .../thrift.git/lib/py/src/ext/module.cpp      |   208 -
 .../thrift.git/lib/py/src/ext/protocol.h      |    96 -
 .../thrift.git/lib/py/src/ext/protocol.tcc    |   913 -
 .../thrift.git/lib/py/src/ext/types.cpp       |   113 -
 .../thrift.git/lib/py/src/ext/types.h         |   191 -
 .../thrift.git/lib/py/src/protocol/TBase.py   |    82 -
 .../lib/py/src/protocol/TBinaryProtocol.py    |   301 -
 .../lib/py/src/protocol/TCompactProtocol.py   |   472 -
 .../lib/py/src/protocol/TJSONProtocol.py      |   677 -
 .../py/src/protocol/TMultiplexedProtocol.py   |    40 -
 .../lib/py/src/protocol/TProtocol.py          |   419 -
 .../lib/py/src/protocol/TProtocolDecorator.py |    50 -
 .../lib/py/src/protocol/__init__.py           |    21 -
 .../lib/py/src/server/THttpServer.py          |    87 -
 .../lib/py/src/server/TNonblockingServer.py   |   350 -
 .../lib/py/src/server/TProcessPoolServer.py   |   123 -
 .../thrift.git/lib/py/src/server/TServer.py   |   276 -
 .../thrift.git/lib/py/src/server/__init__.py  |    20 -
 .../lib/py/src/transport/THttpClient.py       |   194 -
 .../lib/py/src/transport/TSSLSocket.py        |   396 -
 .../lib/py/src/transport/TSocket.py           |   192 -
 .../lib/py/src/transport/TTransport.py        |   452 -
 .../lib/py/src/transport/TTwisted.py          |   331 -
 .../lib/py/src/transport/TZlibTransport.py    |   248 -
 .../lib/py/src/transport/__init__.py          |    20 -
 .../lib/py/src/transport/sslcompat.py         |    99 -
 .../lib/py/test/_import_local_thrift.py       |    30 -
 .../thrift.git/lib/py/test/test_sslsocket.py  |   339 -
 .../thrift.git/lib/py/test/thrift_json.py     |    50 -
 .../git.apache.org/thrift.git/lib/rb/Gemfile  |     4 -
 .../thrift.git/lib/rb/Makefile.am             |    51 -
 .../thrift.git/lib/rb/README.md               |    43 -
 .../git.apache.org/thrift.git/lib/rb/Rakefile |   119 -
 .../lib/rb/benchmark/Benchmark.thrift         |    24 -
 .../thrift.git/lib/rb/benchmark/benchmark.rb  |   271 -
 .../thrift.git/lib/rb/benchmark/client.rb     |    74 -
 .../thrift.git/lib/rb/benchmark/server.rb     |    82 -
 .../lib/rb/benchmark/thin_server.rb           |    44 -
 .../thrift.git/lib/rb/coding_standards.md     |     1 -
 .../lib/rb/ext/binary_protocol_accelerated.c  |   460 -
 .../lib/rb/ext/binary_protocol_accelerated.h  |    20 -
 .../thrift.git/lib/rb/ext/bytes.c             |    36 -
 .../thrift.git/lib/rb/ext/bytes.h             |    31 -
 .../thrift.git/lib/rb/ext/compact_protocol.c  |   637 -
 .../thrift.git/lib/rb/ext/compact_protocol.h  |    20 -
 .../thrift.git/lib/rb/ext/constants.h         |    99 -
 .../thrift.git/lib/rb/ext/extconf.rb          |    34 -
 .../thrift.git/lib/rb/ext/macros.h            |    41 -
 .../thrift.git/lib/rb/ext/memory_buffer.c     |   134 -
 .../thrift.git/lib/rb/ext/memory_buffer.h     |    20 -
 .../thrift.git/lib/rb/ext/protocol.c          |     0
 .../thrift.git/lib/rb/ext/protocol.h          |     0
 .../thrift.git/lib/rb/ext/strlcpy.c           |    41 -
 .../thrift.git/lib/rb/ext/strlcpy.h           |    34 -
 .../thrift.git/lib/rb/ext/struct.c            |   711 -
 .../thrift.git/lib/rb/ext/struct.h            |    25 -
 .../thrift.git/lib/rb/ext/thrift_native.c     |   201 -
 .../thrift.git/lib/rb/lib/thrift.rb           |    70 -
 .../thrift.git/lib/rb/lib/thrift/bytes.rb     |   131 -
 .../thrift.git/lib/rb/lib/thrift/client.rb    |    71 -
 .../thrift.git/lib/rb/lib/thrift/core_ext.rb  |    23 -
 .../lib/rb/lib/thrift/core_ext/fixnum.rb      |    29 -
 .../lib/rb/lib/thrift/exceptions.rb           |    87 -
 .../rb/lib/thrift/multiplexed_processor.rb    |    76 -
 .../thrift.git/lib/rb/lib/thrift/processor.rb |    66 -
 .../rb/lib/thrift/protocol/base_protocol.rb   |   379 -
 .../rb/lib/thrift/protocol/binary_protocol.rb |   237 -
 .../protocol/binary_protocol_accelerated.rb   |    39 -
 .../lib/thrift/protocol/compact_protocol.rb   |   435 -
 .../rb/lib/thrift/protocol/json_protocol.rb   |   778 -
 .../thrift/protocol/multiplexed_protocol.rb   |    40 -
 .../lib/thrift/protocol/protocol_decorator.rb |   194 -
 .../rb/lib/thrift/serializer/deserializer.rb  |    33 -
 .../rb/lib/thrift/serializer/serializer.rb    |    34 -
 .../lib/rb/lib/thrift/server/base_server.rb   |    31 -
 .../lib/thrift/server/mongrel_http_server.rb  |    60 -
 .../lib/thrift/server/nonblocking_server.rb   |   305 -
 .../lib/rb/lib/thrift/server/simple_server.rb |    43 -
 .../rb/lib/thrift/server/thin_http_server.rb  |    91 -
 .../lib/thrift/server/thread_pool_server.rb   |    75 -
 .../rb/lib/thrift/server/threaded_server.rb   |    47 -
 .../thrift.git/lib/rb/lib/thrift/struct.rb    |   237 -
 .../lib/rb/lib/thrift/struct_union.rb         |   192 -
 .../lib/rb/lib/thrift/thrift_native.rb        |    24 -
 .../thrift/transport/base_server_transport.rb |    37 -
 .../rb/lib/thrift/transport/base_transport.rb |   109 -
 .../thrift/transport/buffered_transport.rb    |   114 -
 .../lib/thrift/transport/framed_transport.rb  |   117 -
 .../thrift/transport/http_client_transport.rb |    57 -
 .../thrift/transport/io_stream_transport.rb   |    39 -
 .../transport/memory_buffer_transport.rb      |   125 -
 .../rb/lib/thrift/transport/server_socket.rb  |    63 -
 .../lib/rb/lib/thrift/transport/socket.rb     |   141 -
 .../lib/thrift/transport/ssl_server_socket.rb |    37 -
 .../lib/rb/lib/thrift/transport/ssl_socket.rb |    47 -
 .../thrift/transport/unix_server_socket.rb    |    60 -
 .../rb/lib/thrift/transport/unix_socket.rb    |    40 -
 .../thrift.git/lib/rb/lib/thrift/types.rb     |   101 -
 .../thrift.git/lib/rb/lib/thrift/union.rb     |   176 -
 .../lib/rb/script/proto_benchmark.rb          |   121 -
 .../thrift.git/lib/rb/script/read_struct.rb   |    43 -
 .../thrift.git/lib/rb/script/write_struct.rb  |    30 -
 .../thrift.git/lib/rb/spec/BaseService.thrift |    27 -
 .../lib/rb/spec/ExtendedService.thrift        |    25 -
 .../thrift.git/lib/rb/spec/Referenced.thrift  |    44 -
 .../lib/rb/spec/ThriftNamespacedSpec.thrift   |    53 -
 .../thrift.git/lib/rb/spec/ThriftSpec.thrift  |   183 -
 .../lib/rb/spec/base_protocol_spec.rb         |   217 -
 .../lib/rb/spec/base_transport_spec.rb        |   350 -
 .../spec/binary_protocol_accelerated_spec.rb  |    42 -
 .../lib/rb/spec/binary_protocol_spec.rb       |    66 -
 .../rb/spec/binary_protocol_spec_shared.rb    |   455 -
 .../thrift.git/lib/rb/spec/bytes_spec.rb      |   160 -
 .../thrift.git/lib/rb/spec/client_spec.rb     |    99 -
 .../lib/rb/spec/compact_protocol_spec.rb      |   143 -
 .../thrift.git/lib/rb/spec/exception_spec.rb  |   141 -
 .../thrift.git/lib/rb/spec/flat_spec.rb       |    62 -
 .../lib/rb/spec/http_client_spec.rb           |   135 -
 .../lib/rb/spec/json_protocol_spec.rb         |   544 -
 .../thrift.git/lib/rb/spec/namespaced_spec.rb |    67 -
 .../lib/rb/spec/nonblocking_server_spec.rb    |   263 -
 .../thrift.git/lib/rb/spec/processor_spec.rb  |    80 -
 .../thrift.git/lib/rb/spec/serializer_spec.rb |    67 -
 .../lib/rb/spec/server_socket_spec.rb         |    79 -
 .../thrift.git/lib/rb/spec/server_spec.rb     |   147 -
 .../thrift.git/lib/rb/spec/socket_spec.rb     |    61 -
 .../lib/rb/spec/socket_spec_shared.rb         |   104 -
 .../thrift.git/lib/rb/spec/spec_helper.rb     |    64 -
 .../thrift.git/lib/rb/spec/ssl_socket_spec.rb |    74 -
 .../rb/spec/struct_nested_containers_spec.rb  |   191 -
 .../thrift.git/lib/rb/spec/struct_spec.rb     |   293 -
 .../lib/rb/spec/thin_http_server_spec.rb      |   141 -
 .../thrift.git/lib/rb/spec/types_spec.rb      |   115 -
 .../thrift.git/lib/rb/spec/union_spec.rb      |   215 -
 .../lib/rb/spec/unix_socket_spec.rb           |   107 -
 .../thrift.git/lib/rb/thrift.gemspec          |    37 -
 .../thrift.git/lib/st/README.md               |    39 -
 .../thrift.git/lib/st/coding_standards.md     |     1 -
 .../thrift.git/lib/st/package.xml             |    26 -
 .../thrift.git/lib/st/thrift.st               |   815 -
 .../thrift.git/lib/ts/coding_standards.md     |     1 -
 .../thrift.git/lib/ts/thrift.d.ts             |   699 -
 .../thrift.git/lib/xml/Makefile.am            |    29 -
 .../thrift.git/lib/xml/test/Makefile.am       |    26 -
 .../thrift.git/lib/xml/test/build.xml         |   112 -
 .../thrift.git/lib/xml/thrift-idl.xsd         |   283 -
 vendor/git.apache.org/thrift.git/package.json |    54 -
 .../thrift.git/sonar-project.properties       |   140 -
 .../thrift.git/test/AnnotationTest.thrift     |    63 -
 .../thrift.git/test/BrokenConstants.thrift    |    25 -
 .../thrift.git/test/ConstantsDemo.thrift      |    74 -
 .../thrift.git/test/DebugProtoTest.thrift     |   378 -
 .../thrift.git/test/DenseLinkingTest.thrift   |    98 -
 .../thrift.git/test/DocTest.thrift            |   287 -
 .../thrift.git/test/EnumTest.thrift           |   114 -
 .../thrift.git/test/FullCamelTest.thrift      |    38 -
 .../thrift.git/test/Include.thrift            |    24 -
 .../thrift.git/test/JavaBeansTest.thrift      |    39 -
 .../thrift.git/test/JavaTypes.thrift          |    98 -
 .../test/JsDeepConstructorTest.thrift         |    18 -
 .../thrift.git/test/Makefile.am               |   150 -
 .../thrift.git/test/ManyOptionals.thrift      |   231 -
 .../thrift.git/test/ManyTypedefs.thrift       |    50 -
 .../thrift.git/test/NameConflictTest.thrift   |   110 -
 .../test/OptionalRequiredTest.thrift          |    88 -
 .../git.apache.org/thrift.git/test/README.md  |   185 -
 .../thrift.git/test/Recursive.thrift          |    47 -
 .../thrift.git/test/ReuseObjects.thrift       |    30 -
 .../thrift.git/test/SmallTest.thrift          |    60 -
 .../thrift.git/test/StressTest.thrift         |    35 -
 .../thrift.git/test/ThriftTest.thrift         |   411 -
 .../thrift.git/test/TypedefTest.thrift        |    36 -
 .../thrift.git/test/audit/README.md           |    40 -
 .../thrift.git/test/audit/break1.thrift       |   188 -
 .../thrift.git/test/audit/break10.thrift      |   190 -
 .../thrift.git/test/audit/break11.thrift      |   190 -
 .../thrift.git/test/audit/break12.thrift      |   191 -
 .../thrift.git/test/audit/break13.thrift      |   191 -
 .../thrift.git/test/audit/break14.thrift      |   190 -
 .../thrift.git/test/audit/break15.thrift      |   190 -
 .../thrift.git/test/audit/break16.thrift      |   191 -
 .../thrift.git/test/audit/break17.thrift      |   191 -
 .../thrift.git/test/audit/break18.thrift      |   191 -
 .../thrift.git/test/audit/break19.thrift      |   191 -
 .../thrift.git/test/audit/break2.thrift       |   190 -
 .../thrift.git/test/audit/break20.thrift      |   190 -
 .../thrift.git/test/audit/break21.thrift      |   190 -
 .../thrift.git/test/audit/break22.thrift      |   190 -
 .../thrift.git/test/audit/break23.thrift      |   192 -
 .../thrift.git/test/audit/break24.thrift      |   191 -
 .../thrift.git/test/audit/break25.thrift      |   191 -
 .../thrift.git/test/audit/break26.thrift      |   191 -
 .../thrift.git/test/audit/break27.thrift      |   190 -
 .../thrift.git/test/audit/break28.thrift      |   190 -
 .../thrift.git/test/audit/break29.thrift      |   191 -
 .../thrift.git/test/audit/break3.thrift       |   191 -
 .../thrift.git/test/audit/break30.thrift      |   190 -
 .../thrift.git/test/audit/break31.thrift      |   191 -
 .../thrift.git/test/audit/break32.thrift      |   191 -
 .../thrift.git/test/audit/break33.thrift      |   191 -
 .../thrift.git/test/audit/break34.thrift      |   192 -
 .../thrift.git/test/audit/break4.thrift       |   190 -
 .../thrift.git/test/audit/break5.thrift       |   190 -
 .../thrift.git/test/audit/break6.thrift       |   191 -
 .../thrift.git/test/audit/break7.thrift       |   190 -
 .../thrift.git/test/audit/break8.thrift       |   191 -
 .../thrift.git/test/audit/break9.thrift       |   190 -
 .../thrift.git/test/audit/test.thrift         |   189 -
 .../test/audit/thrift_audit_test.pl           |   261 -
 .../thrift.git/test/audit/warning.thrift      |   190 -
 .../thrift.git/test/c_glib/Makefile.am        |    74 -
 .../thrift.git/test/c_glib/src/test_client.c  |  1600 -
 .../thrift.git/test/c_glib/src/test_server.c  |   227 -
 .../test/c_glib/src/thrift_test_handler.c     |   837 -
 .../test/c_glib/src/thrift_test_handler.h     |   245 -
 .../thrift.git/test/cpp/CMakeLists.txt        |    89 -
 .../thrift.git/test/cpp/Makefile.am           |   125 -
 .../test/cpp/realloc/realloc_test.c           |   107 -
 .../thrift.git/test/cpp/src/StressTest.cpp    |   605 -
 .../test/cpp/src/StressTestNonBlocking.cpp    |   538 -
 .../thrift.git/test/cpp/src/TestClient.cpp    |  1110 -
 .../thrift.git/test/cpp/src/TestServer.cpp    |   775 -
 .../test/cpp/src/ThriftTest_extras.cpp        |    33 -
 .../thrift.git/test/crossrunner/__init__.py   |    23 -
 .../thrift.git/test/crossrunner/collect.py    |   162 -
 .../thrift.git/test/crossrunner/compat.py     |    24 -
 .../thrift.git/test/crossrunner/report.py     |   434 -
 .../thrift.git/test/crossrunner/run.py        |   389 -
 .../thrift.git/test/crossrunner/setup.cfg     |     2 -
 .../thrift.git/test/crossrunner/test.py       |   143 -
 .../thrift.git/test/crossrunner/util.py       |    31 -
 .../thrift.git/test/csharp/Makefile.am        |    87 -
 .../thrift.git/test/csharp/Program.cs         |    71 -
 .../test/csharp/Properties/AssemblyInfo.cs    |    55 -
 .../thrift.git/test/csharp/TestClient.cs      |   836 -
 .../thrift.git/test/csharp/TestServer.cs      |   547 -
 .../thrift.git/test/csharp/ThriftTest.csproj  |   141 -
 .../thrift.git/test/csharp/ThriftTest.sln     |    17 -
 .../thrift.git/test/dart/Makefile.am          |    43 -
 .../test/dart/test_client/.analysis_options   |     2 -
 .../test/dart/test_client/bin/main.dart       |   337 -
 .../test/dart/test_client/pubspec.yaml        |    36 -
 .../thrift.git/test/erl/Makefile.am           |    43 -
 .../thrift.git/test/erl/rebar.config          |     6 -
 .../thrift.git/test/erl/src/test_client.erl   |   174 -
 .../test/erl/src/test_thrift_server.erl       |   233 -
 .../test/erl/src/thrift_test.app.src          |    54 -
 .../thrift.git/test/features/Makefile.am      |    28 -
 .../test/features/container_limit.py          |    72 -
 .../thrift.git/test/features/index.html       |    51 -
 .../test/features/known_failures_Linux.json   |    36 -
 .../test/features/local_thrift/__init__.py    |    32 -
 .../thrift.git/test/features/setup.cfg        |     2 -
 .../thrift.git/test/features/string_limit.py  |    61 -
 .../thrift.git/test/features/tests.json       |    94 -
 .../test/features/theader_binary.py           |    70 -
 .../thrift.git/test/features/util.py          |    40 -
 .../thrift.git/test/go/Makefile.am            |    63 -
 .../thrift.git/test/go/src/bin/stress/main.go |   253 -
 .../test/go/src/bin/testclient/main.go        |   306 -
 .../test/go/src/bin/testserver/main.go        |    70 -
 .../thrift.git/test/go/src/common/client.go   |   114 -
 .../test/go/src/common/clientserver_test.go   |   317 -
 .../test/go/src/common/mock_handler.go        |   289 -
 .../test/go/src/common/printing_handler.go    |   383 -
 .../thrift.git/test/go/src/common/server.go   |   111 -
 .../test/go/src/common/simple_handler.go      |   155 -
 .../thrift.git/test/haxe/Makefile.am          |   103 -
 .../test/haxe/TestClientServer.hxproj         |    67 -
 .../thrift.git/test/haxe/cpp.hxml             |    41 -
 .../thrift.git/test/haxe/csharp.hxml          |    38 -
 .../thrift.git/test/haxe/flash.hxml           |    41 -
 .../thrift.git/test/haxe/java.hxml            |    38 -
 .../thrift.git/test/haxe/javascript.hxml      |    44 -
 .../thrift.git/test/haxe/make_all.bat         |    68 -
 .../thrift.git/test/haxe/make_all.sh          |    41 -
 .../thrift.git/test/haxe/neko.hxml            |    38 -
 .../thrift.git/test/haxe/php-web-server.hxml  |    43 -
 .../thrift.git/test/haxe/php.hxml             |    40 -
 .../thrift.git/test/haxe/project.hide         |    76 -
 .../thrift.git/test/haxe/python.hxml          |    38 -
 .../thrift.git/test/haxe/router.php           |    31 -
 .../thrift.git/test/haxe/src/Arguments.hx     |   335 -
 .../thrift.git/test/haxe/src/Main.hx          |    83 -
 .../thrift.git/test/haxe/src/TestClient.hx    |   932 -
 .../thrift.git/test/haxe/src/TestMacro.hx     |    40 -
 .../thrift.git/test/haxe/src/TestServer.hx    |   131 -
 .../test/haxe/src/TestServerEventHandler.hx   |    53 -
 .../test/haxe/src/TestServerHandler.hx        |   500 -
 .../thrift.git/test/hs/CMakeLists.txt         |   114 -
 .../thrift.git/test/hs/ConstantsDemo_Main.hs  |    68 -
 .../thrift.git/test/hs/DebugProtoTest_Main.hs |   168 -
 .../thrift.git/test/hs/Include_Main.hs        |     7 -
 .../thrift.git/test/hs/Makefile.am            |    43 -
 .../thrift.git/test/hs/TestClient.hs          |   302 -
 .../thrift.git/test/hs/TestServer.hs          |   303 -
 .../thrift.git/test/hs/ThriftTestUtils.hs     |    65 -
 .../thrift.git/test/hs/ThriftTest_Main.hs     |   214 -
 .../thrift.git/test/hs/run-test.sh            |    43 -
 .../git.apache.org/thrift.git/test/index.html |    51 -
 .../thrift.git/test/keys/CA.pem               |    82 -
 .../thrift.git/test/keys/README.md            |   102 -
 .../thrift.git/test/keys/client.crt           |    23 -
 .../thrift.git/test/keys/client.key           |    27 -
 .../thrift.git/test/keys/client.p12           |   Bin 2589 -> 0 bytes
 .../thrift.git/test/keys/client.pem           |    60 -
 .../thrift.git/test/keys/client_v3.crt        |    24 -
 .../thrift.git/test/keys/client_v3.key        |    27 -
 .../thrift.git/test/keys/server.crt           |    25 -
 .../thrift.git/test/keys/server.key           |    28 -
 .../thrift.git/test/keys/server.p12           |   Bin 2685 -> 0 bytes
 .../thrift.git/test/keys/server.pem           |    53 -
 .../thrift.git/test/known_failures_Linux.json |   245 -
 .../thrift.git/test/lua/Makefile.am           |    31 -
 .../thrift.git/test/lua/test_basic_client.lua |   179 -
 .../thrift.git/test/lua/test_basic_server.lua |   142 -
 .../test/ocaml/client/TestClient.ml           |    82 -
 .../test/ocaml/server/TestServer.ml           |   137 -
 .../thrift.git/test/perl/Makefile.am          |    31 -
 .../thrift.git/test/perl/TestClient.pl        |   427 -
 .../thrift.git/test/perl/TestServer.pl        |   398 -
 .../thrift.git/test/php/Makefile.am           |    36 -
 .../thrift.git/test/php/TestClient.php        |   492 -
 .../thrift.git/test/php/TestInline.php        |    24 -
 .../thrift.git/test/php/TestPsr4.php          |    23 -
 .../thrift.git/test/py.tornado/Makefile.am    |    30 -
 .../thrift.git/test/py.tornado/setup.cfg      |     3 -
 .../thrift.git/test/py.tornado/test_suite.py  |   232 -
 .../thrift.git/test/py.twisted/Makefile.am    |    31 -
 .../thrift.git/test/py.twisted/setup.cfg      |     3 -
 .../thrift.git/test/py.twisted/test_suite.py  |   193 -
 .../thrift.git/test/py/CMakeLists.txt         |    34 -
 .../thrift.git/test/py/FastbinaryTest.py      |   251 -
 .../thrift.git/test/py/Makefile.am            |    84 -
 .../thrift.git/test/py/RunClientServer.py     |   321 -
 .../thrift.git/test/py/SerializationTest.py   |   390 -
 .../test/py/TSimpleJSONProtocolTest.py        |   108 -
 .../thrift.git/test/py/TestClient.py          |   348 -
 .../thrift.git/test/py/TestEof.py             |   131 -
 .../thrift.git/test/py/TestFrozen.py          |   122 -
 .../thrift.git/test/py/TestServer.py          |   315 -
 .../thrift.git/test/py/TestSocket.py          |    77 -
 .../thrift.git/test/py/TestSyntax.py          |    24 -
 .../test/py/explicit_module/runtest.sh        |    35 -
 .../test/py/explicit_module/test1.thrift      |    24 -
 .../test/py/explicit_module/test2.thrift      |    24 -
 .../test/py/explicit_module/test3.thrift      |    25 -
 .../thrift.git/test/py/generate.cmake         |    22 -
 .../thrift.git/test/py/setup.cfg              |     2 -
 .../git.apache.org/thrift.git/test/py/util.py |    32 -
 .../git.apache.org/thrift.git/test/rb/Gemfile |     7 -
 .../thrift.git/test/rb/Makefile.am            |    33 -
 .../test/rb/benchmarks/protocol_benchmark.rb  |   174 -
 .../rb/core/test_backwards_compatability.rb   |    30 -
 .../test/rb/core/test_exceptions.rb           |    30 -
 .../test/rb/core/transport/test_transport.rb  |    70 -
 .../thrift.git/test/rb/fixtures/structs.rb    |   298 -
 .../test/rb/generation/test_enum.rb           |    34 -
 .../test/rb/generation/test_struct.rb         |    48 -
 .../test/rb/integration/TestClient.rb         |   353 -
 .../test/rb/integration/TestServer.rb         |   159 -
 .../thrift.git/test/rb/test_helper.rb         |    35 -
 .../thrift.git/test/rb/test_suite.rb          |    20 -
 .../thrift.git/test/rebuild_known_failures.sh |    24 -
 .../git.apache.org/thrift.git/test/result.js  |    64 -
 vendor/git.apache.org/thrift.git/test/test.py |   170 -
 .../git.apache.org/thrift.git/test/tests.json |   550 -
 .../thrift.git/test/threads/ThreadsClient.cpp |    69 -
 .../thrift.git/test/threads/ThreadsServer.cpp |   148 -
 .../test/threads/ThreadsTest.thrift           |    28 -
 .../thrift.git/test/valgrind.suppress         |     9 -
 .../thrift.git/tutorial/Makefile.am           |    98 -
 .../thrift.git/tutorial/README.md             |    42 -
 .../thrift.git/tutorial/as3/build.xml         |    50 -
 .../tutorial/as3/src/CalculatorUI.as          |   142 -
 .../thrift.git/tutorial/c_glib/Makefile.am    |    85 -
 .../tutorial/c_glib/c_glib_client.c           |   190 -
 .../tutorial/c_glib/c_glib_server.c           |   527 -
 .../thrift.git/tutorial/cpp/CMakeLists.txt    |    52 -
 .../thrift.git/tutorial/cpp/CppClient.cpp     |    80 -
 .../thrift.git/tutorial/cpp/CppServer.cpp     |   181 -
 .../thrift.git/tutorial/cpp/Makefile.am       |    88 -
 .../csharp/CsharpClient/CsharpClient.cs       |    92 -
 .../csharp/CsharpClient/CsharpClient.csproj   |   110 -
 .../CsharpClient/Properties/AssemblyInfo.cs   |    55 -
 .../csharp/CsharpServer/CsharpServer.cs       |   129 -
 .../csharp/CsharpServer/CsharpServer.csproj   |   111 -
 .../CsharpServer/Properties/AssemblyInfo.cs   |    55 -
 .../thrift.git/tutorial/csharp/tutorial.sln   |    39 -
 .../thrift.git/tutorial/d/Makefile.am         |    46 -
 .../thrift.git/tutorial/d/async_client.d      |    86 -
 .../thrift.git/tutorial/d/client.d            |    64 -
 .../thrift.git/tutorial/d/server.d            |   111 -
 .../thrift.git/tutorial/dart/Makefile.am      |    71 -
 .../thrift.git/tutorial/dart/build.sh         |    56 -
 .../tutorial/dart/client/.analysis_options    |     2 -
 .../tutorial/dart/client/pubspec.yaml         |    34 -
 .../tutorial/dart/client/web/client.dart      |   278 -
 .../tutorial/dart/client/web/index.html       |    36 -
 .../tutorial/dart/client/web/styles.css       |    33 -
 .../dart/console_client/.analysis_options     |     2 -
 .../dart/console_client/bin/main.dart         |   149 -
 .../tutorial/dart/console_client/pubspec.yaml |    36 -
 .../tutorial/dart/server/.analysis_options    |     2 -
 .../tutorial/dart/server/bin/main.dart        |   163 -
 .../tutorial/dart/server/pubspec.yaml         |    34 -
 .../delphi/DelphiClient/DelphiClient.dpr      |   114 -
 .../delphi/DelphiClient/DelphiClient.dproj    |   119 -
 .../delphi/DelphiServer/DelphiServer.dpr      |   173 -
 .../delphi/DelphiServer/DelphiServer.dproj    |   118 -
 .../tutorial/delphi/Tutorial.groupproj        |    48 -
 .../thrift.git/tutorial/erl/README.md         |     8 -
 .../thrift.git/tutorial/erl/client.erl        |    78 -
 .../thrift.git/tutorial/erl/client.sh         |     1 -
 .../thrift.git/tutorial/erl/json_client.erl   |    89 -
 .../thrift.git/tutorial/erl/server.erl        |    82 -
 .../thrift.git/tutorial/erl/server.sh         |    37 -
 .../thrift.git/tutorial/go/Makefile.am        |    61 -
 .../thrift.git/tutorial/go/server.crt         |    25 -
 .../thrift.git/tutorial/go/server.key         |    28 -
 .../thrift.git/tutorial/go/src/client.go      |   102 -
 .../thrift.git/tutorial/go/src/handler.go     |   101 -
 .../thrift.git/tutorial/go/src/main.go        |    82 -
 .../thrift.git/tutorial/go/src/server.go      |    54 -
 .../thrift.git/tutorial/haxe/Makefile.am      |    98 -
 .../thrift.git/tutorial/haxe/Tutorial.hxproj  |    67 -
 .../thrift.git/tutorial/haxe/cpp.hxml         |    41 -
 .../thrift.git/tutorial/haxe/csharp.hxml      |    38 -
 .../thrift.git/tutorial/haxe/flash.hxml       |    41 -
 .../thrift.git/tutorial/haxe/java.hxml        |    38 -
 .../thrift.git/tutorial/haxe/javascript.hxml  |    44 -
 .../thrift.git/tutorial/haxe/make_all.bat     |    68 -
 .../thrift.git/tutorial/haxe/make_all.sh      |    41 -
 .../thrift.git/tutorial/haxe/neko.hxml        |    38 -
 .../tutorial/haxe/php-web-server.hxml         |    43 -
 .../thrift.git/tutorial/haxe/php.hxml         |    39 -
 .../thrift.git/tutorial/haxe/project.hide     |   105 -
 .../thrift.git/tutorial/haxe/python.hxml      |    38 -
 .../thrift.git/tutorial/haxe/router.php       |    31 -
 .../tutorial/haxe/src/CalculatorHandler.hx    |   101 -
 .../thrift.git/tutorial/haxe/src/Main.hx      |   375 -
 .../thrift.git/tutorial/hs/HaskellClient.hs   |    76 -
 .../thrift.git/tutorial/hs/HaskellServer.hs   |   103 -
 .../thrift.git/tutorial/hs/Makefile.am        |    39 -
 .../thrift.git/tutorial/hs/Setup.lhs          |    21 -
 .../tutorial/hs/ThriftTutorial.cabal          |    73 -
 .../thrift.git/tutorial/java/Makefile.am      |    45 -
 .../thrift.git/tutorial/java/README.md        |    24 -
 .../thrift.git/tutorial/java/build.xml        |   113 -
 .../tutorial/java/src/CalculatorHandler.java  |    92 -
 .../tutorial/java/src/JavaClient.java         |   106 -
 .../tutorial/java/src/JavaServer.java         |   110 -
 .../thrift.git/tutorial/js/Makefile.am        |    39 -
 .../thrift.git/tutorial/js/build.xml          |    90 -
 .../thrift.git/tutorial/js/src/Httpd.java     |   299 -
 .../thrift.git/tutorial/js/tutorial.html      |   109 -
 .../thrift.git/tutorial/nodejs/Makefile.am    |    47 -
 .../thrift.git/tutorial/nodejs/NodeClient.js  |    77 -
 .../tutorial/nodejs/NodeClientPromise.js      |    80 -
 .../thrift.git/tutorial/nodejs/NodeServer.js  |    85 -
 .../tutorial/nodejs/NodeServerPromise.js      |    80 -
 .../thrift.git/tutorial/ocaml/CalcClient.ml   |    74 -
 .../thrift.git/tutorial/ocaml/CalcServer.ml   |    89 -
 .../thrift.git/tutorial/ocaml/README.md       |    15 -
 .../thrift.git/tutorial/ocaml/_oasis          |    32 -
 .../thrift.git/tutorial/perl/PerlClient.pl    |    82 -
 .../thrift.git/tutorial/perl/PerlServer.pl    |   124 -
 .../thrift.git/tutorial/php/PhpClient.php     |    91 -
 .../thrift.git/tutorial/php/PhpServer.php     |   130 -
 .../thrift.git/tutorial/php/runserver.py      |    33 -
 .../tutorial/py.tornado/Makefile.am           |    38 -
 .../tutorial/py.tornado/PythonClient.py       |   108 -
 .../tutorial/py.tornado/PythonServer.py       |   100 -
 .../tutorial/py.twisted/Makefile.am           |    39 -
 .../tutorial/py.twisted/PythonClient.py       |    79 -
 .../tutorial/py.twisted/PythonServer.py       |    96 -
 .../tutorial/py.twisted/PythonServer.tac      |    53 -
 .../thrift.git/tutorial/py/Makefile.am        |    39 -
 .../thrift.git/tutorial/py/PythonClient.py    |    88 -
 .../thrift.git/tutorial/py/PythonServer.py    |   102 -
 .../thrift.git/tutorial/py/setup.cfg          |     2 -
 .../thrift.git/tutorial/rb/Makefile.am        |    38 -
 .../thrift.git/tutorial/rb/RubyClient.rb      |    75 -
 .../thrift.git/tutorial/rb/RubyServer.rb      |    95 -
 .../thrift.git/tutorial/shared.thrift         |    40 -
 .../thrift.git/tutorial/tutorial.thrift       |   154 -
 .../lib/go/thrift/application_exception.go    |    46 +-
 .../go/thrift/application_exception_test.go   |     6 +-
 .../thrift}/lib/go/thrift/binary_protocol.go  |    11 +-
 .../lib/go/thrift/binary_protocol_test.go     |     0
 .../lib/go/thrift/buffered_transport.go       |     5 +-
 .../lib/go/thrift/buffered_transport_test.go  |     0
 .../apache/thrift/lib/go/thrift/client.go     |    85 +
 .../thrift/lib/go/thrift/common_test.go}      |    17 +-
 .../thrift}/lib/go/thrift/compact_protocol.go |    13 +-
 .../lib/go/thrift/compact_protocol_test.go    |     7 +
 .../apache/thrift/lib/go/thrift/context.go}   |     5 +-
 .../thrift}/lib/go/thrift/debug_protocol.go   |     5 +-
 .../thrift}/lib/go/thrift/deserializer.go     |     0
 .../apache/thrift}/lib/go/thrift/exception.go |     0
 .../thrift}/lib/go/thrift/exception_test.go   |     0
 .../apache/thrift}/lib/go/thrift/field.go     |     0
 .../thrift}/lib/go/thrift/framed_transport.go |     7 +-
 .../lib/go/thrift/framed_transport_test.go    |     0
 .../thrift}/lib/go/thrift/http_client.go      |     6 +-
 .../thrift}/lib/go/thrift/http_client_test.go |     0
 .../thrift}/lib/go/thrift/http_transport.go   |    35 +-
 .../lib/go/thrift/iostream_transport.go       |     3 +-
 .../lib/go/thrift/iostream_transport_test.go  |     0
 .../thrift}/lib/go/thrift/json_protocol.go    |     5 +-
 .../lib/go/thrift/json_protocol_test.go       |    41 +-
 .../lib/go/thrift/lowlevel_benchmarks_test.go |     0
 .../thrift}/lib/go/thrift/memory_buffer.go    |     3 +-
 .../lib/go/thrift/memory_buffer_test.go       |     0
 .../thrift}/lib/go/thrift/messagetype.go      |     0
 .../lib/go/thrift/multiplexed_protocol.go     |     7 +-
 .../apache/thrift}/lib/go/thrift/numeric.go   |     0
 .../thrift}/lib/go/thrift/pointerize.go       |     0
 .../lib/go/thrift/processor_factory.go        |    12 +
 .../apache/thrift}/lib/go/thrift/protocol.go  |     6 +-
 .../lib/go/thrift/protocol_exception.go       |     0
 .../thrift}/lib/go/thrift/protocol_factory.go |     0
 .../thrift}/lib/go/thrift/protocol_test.go    |    56 +-
 .../thrift}/lib/go/thrift/rich_transport.go   |     0
 .../lib/go/thrift/rich_transport_test.go      |     0
 .../thrift}/lib/go/thrift/serializer.go       |    16 +-
 .../thrift}/lib/go/thrift/serializer_test.go  |     5 +-
 .../lib/go/thrift/serializer_types_test.go    |     2 +-
 .../apache/thrift}/lib/go/thrift/server.go    |     0
 .../thrift}/lib/go/thrift/server_socket.go    |    31 +-
 .../lib/go/thrift/server_socket_test.go       |    10 +
 .../thrift}/lib/go/thrift/server_test.go      |     0
 .../thrift}/lib/go/thrift/server_transport.go |     0
 .../lib/go/thrift/simple_json_protocol.go     |     5 +-
 .../go/thrift/simple_json_protocol_test.go    |    49 +-
 .../thrift}/lib/go/thrift/simple_server.go    |    73 +-
 .../lib/go/thrift/simple_server_test.go       |   156 +
 .../apache/thrift}/lib/go/thrift/socket.go    |     3 +-
 .../lib/go/thrift/ssl_server_socket.go        |     5 +-
 .../thrift}/lib/go/thrift/ssl_socket.go       |    12 +-
 .../apache/thrift}/lib/go/thrift/transport.go |     9 +-
 .../lib/go/thrift/transport_exception.go      |     0
 .../lib/go/thrift/transport_exception_test.go |     0
 .../lib/go/thrift/transport_factory.go        |     0
 .../thrift}/lib/go/thrift/transport_test.go   |     7 +-
 .../apache/thrift}/lib/go/thrift/type.go      |     0
 .../thrift}/lib/go/thrift/zlib_transport.go   |    24 +-
 .../lib/go/thrift/zlib_transport_test.go      |    62 +
 2150 files changed, 32523 insertions(+), 412691 deletions(-)
 create mode 100644 CHANGELOG.md
 create mode 100644 gen-go/apache/aurora/GoUnusedProtection__.go
 create mode 100644 gen-go/apache/aurora/auroraAPI-consts.go
 create mode 100644 gen-go/apache/aurora/auroraAPI.go
 delete mode 100644 gen-go/apache/aurora/auroraadmin.go
 delete mode 100644 gen-go/apache/aurora/auroraschedulermanager.go
 delete mode 100644 gen-go/apache/aurora/constants.go
 delete mode 100644 gen-go/apache/aurora/readonlyscheduler.go
 delete mode 100644 gen-go/apache/aurora/ttypes.go
 create mode 100644 util.go
 delete mode 100644 vendor/git.apache.org/thrift.git/.clang-format
 delete mode 100644 vendor/git.apache.org/thrift.git/.dockerignore
 delete mode 100755 vendor/git.apache.org/thrift.git/.editorconfig
 delete mode 100644 vendor/git.apache.org/thrift.git/.gitattributes
 delete mode 100644 vendor/git.apache.org/thrift.git/.gitignore
 delete mode 100644 vendor/git.apache.org/thrift.git/.travis.yml
 delete mode 100644 vendor/git.apache.org/thrift.git/CHANGES
 delete mode 100644 vendor/git.apache.org/thrift.git/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/CONTRIBUTING.md
 delete mode 100644 vendor/git.apache.org/thrift.git/Dockerfile
 delete mode 100644 vendor/git.apache.org/thrift.git/LICENSE
 delete mode 100755 vendor/git.apache.org/thrift.git/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/NOTICE
 delete mode 100644 vendor/git.apache.org/thrift.git/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/Thrift.podspec
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ac_prog_bison.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_boost_base.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_check_openssl.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_cxx_compile_stdcxx_11.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_dmd.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_javac_and_java.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_lib_event.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_lib_zlib.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_lua.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_prog_haxe_version.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_prog_perl_modules.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_signed_right_shift.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/ax_thrift_internal.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/aclocal/m4_ax_compare_version.m4
 delete mode 100755 vendor/git.apache.org/thrift.git/appveyor.yml
 delete mode 100755 vendor/git.apache.org/thrift.git/bootstrap.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/bower.json
 delete mode 100644 vendor/git.apache.org/thrift.git/build/appveyor/download_openssl.py
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/CPackConfig.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/ConfigureChecks.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/DefineCMakeDefaults.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/DefineInstallationPaths.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/DefineOptions.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/DefinePlatformSpecifc.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/FindAnt.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/FindCabal.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/FindGHC.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/FindGLIB.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/FindGradle.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/FindLibevent.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/ThriftMacros.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/android-toolchain.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/config.h.in
 delete mode 100644 vendor/git.apache.org/thrift.git/build/cmake/mingw32-toolchain.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/build/docker/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/build/docker/Vagrantfile
 delete mode 100644 vendor/git.apache.org/thrift.git/build/docker/centos/Dockerfile
 delete mode 100644 vendor/git.apache.org/thrift.git/build/docker/centos6/Dockerfile
 delete mode 100755 vendor/git.apache.org/thrift.git/build/docker/check_unmodified.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/build/docker/debian/Dockerfile
 delete mode 100755 vendor/git.apache.org/thrift.git/build/docker/scripts/autotools.sh
 delete mode 100755 vendor/git.apache.org/thrift.git/build/docker/scripts/cmake.sh
 delete mode 100755 vendor/git.apache.org/thrift.git/build/docker/scripts/cross-test.sh
 delete mode 100755 vendor/git.apache.org/thrift.git/build/docker/scripts/dpkg.sh
 delete mode 100755 vendor/git.apache.org/thrift.git/build/docker/scripts/make-dist.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/build/docker/ubuntu/Dockerfile
 delete mode 100755 vendor/git.apache.org/thrift.git/build/travis/installCXXDependencies.sh
 delete mode 100755 vendor/git.apache.org/thrift.git/build/travis/installDependencies.sh
 delete mode 100755 vendor/git.apache.org/thrift.git/cleanup.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/compiler.sln
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/compiler.vcxproj
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/compiler.vcxproj.filters
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/audit/t_audit.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/audit/t_audit.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/common.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/common.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_as3_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_c_glib_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_cocoa_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_cpp_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_csharp_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_d_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_dart_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_erl_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator_registry.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_go_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_gv_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_haxe_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_hs_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_html_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_html_generator.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_java_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_javame_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_js_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_json_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_lua_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_ocaml_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_oop_generator.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_perl_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_php_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_py_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_rb_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_st_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_swift_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_xml_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_xsd_generator.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/globals.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/logging.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/logging.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/main.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/main.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/parse.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_base_type.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_const.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_const_value.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_container.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_doc.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_enum.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_enum_value.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_field.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_function.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_list.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_map.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_program.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_scope.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_service.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_set.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_struct.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_type.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_typedef.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_typedef.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/platform.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin_output.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin_output.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/type_util.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/thriftl.ll
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/thrifty.yy
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/version.h.in
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/windows/config.h
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/test/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/test/cpp_plugin_test.cmake
 delete mode 100755 vendor/git.apache.org/thrift.git/compiler/cpp/test/cpp_plugin_test.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/test/plugin/conversion_test.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/compiler/cpp/test/plugin/cpp_plugin.cc
 delete mode 100644 vendor/git.apache.org/thrift.git/composer.json
 delete mode 100755 vendor/git.apache.org/thrift.git/configure.ac
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/App.config
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/Program.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/RebusSample.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/RebusSample.sln
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Both.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Client.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Server.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Rebus/sample.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Stomp/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Stomp/Thrift.Transport.STOMP.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/Vagrantfile
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/async-test/aggr.thrift
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/async-test/test-leaf.py
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/async-test/test-server.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/LICENSE
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/TClientInfo.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/TClientInfo.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_boost_base.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_cxx_compile_stdcxx_11.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_javac_and_java.m4
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_thrift_internal.m4
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/fb303/bootstrap.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/configure.ac
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/cpp/FacebookBase.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/cpp/FacebookBase.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/cpp/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/cpp/ServiceTracker.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/cpp/ServiceTracker.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/global_footer.mk
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/global_header.mk
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/if/fb303.thrift
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/fb303/java/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/java/src/FacebookBase.java
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/php/FacebookBase.php
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/py/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303/FacebookBase.py
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303_scripts/__init__.py
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/fb303/py/setup.py
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/mingw-cross-compile.sh
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/parse_profiling.py
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/pom.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/AbstractThriftMojo.java
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/Thrift.java
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/ThriftCompileMojo.java
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/ThriftTestCompileMojo.java
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/java/org/apache/thrift/maven/TestThrift.java
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/resources/idl/shared.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/resources/idl/tutorial.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift.el
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift.spec
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift.vim
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/thrift_dump.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/Sample.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/ThriftCommon.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/ThriftCommon.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/client/ReadMe.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.vcxproj
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.vcxproj.filters
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/client/stdafx.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/client/stdafx.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/client/targetver.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/config.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/server/ReadMe.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.vcxproj
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.vcxproj.filters
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/server/stdafx.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/server/stdafx.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/server/targetver.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/thriftme.bat
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/thriftme.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/transport-sample/transport-sample.sln
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.py
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.py
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/Main.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/TZmqClient.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/TZmqServer.cs
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/ThriftZMQ.csproj
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/ThriftZMQ.sln
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/storage.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/test-client.cpp
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/zeromq/test-client.py
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/test-receiver.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/test-sender.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/contrib/zeromq/test-server.cpp
 delete mode 100755 vendor/git.apache.org/thrift.git/contrib/zeromq/test-server.py
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/changelog
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/compat
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/control
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/copyright
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/dirs
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/docs
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/libthrift-dev.install
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/libthrift0.install
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/php5-thrift.dirs
 delete mode 100755 vendor/git.apache.org/thrift.git/debian/rules
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/substvars
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/thrift-doc.docs
 delete mode 100644 vendor/git.apache.org/thrift.git/debian/thrift-doc.install
 delete mode 100755 vendor/git.apache.org/thrift.git/doap.rdf
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/committers.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/install/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/install/centos.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/install/debian.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/install/os_x.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/install/windows.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/licenses/lgpl-2.1.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/licenses/otp-base-license.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/specs/HeaderFormat.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/specs/idl.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/specs/thrift-binary-protocol.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/specs/thrift-compact-protocol.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/specs/thrift-protocol-spec.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/specs/thrift-rpc.md
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/specs/thrift-sasl-spec.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/doc/specs/thrift.tex
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/as3/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/AbstractMethodError.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/Set.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TApplicationError.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TBase.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TError.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TFieldRequirementType.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TProcessor.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/FieldMetaData.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/FieldValueMetaData.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/ListMetaData.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/MapMetaData.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/SetMetaData.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/StructMetaData.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TBinaryProtocol.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TField.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TList.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMap.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMessage.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMessageType.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocol.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolError.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolFactory.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolUtil.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TSet.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TStruct.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TType.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TFullDuplexHttpClient.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/THttpClient.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TSocket.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TTransport.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TTransportError.as
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/CMakeLists.txt
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_dispatch_processor.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_dispatch_processor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol_factory.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol_factory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_server.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_server.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_application_exception.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_application_exception.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_struct.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_struct.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport_factory.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport_factory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_fd_transport.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_fd_transport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport_factory.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport_factory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/test/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/test/ContainerTest.thrift
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/test/glib.suppress
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/test/testapplicationexception.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testbinaryprotocol.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testbufferedtransport.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testcompactprotocol.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/test/testcontainertest.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/test/testdebugproto.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testfdtransport.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testframedtransport.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testmemorybuffer.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testoptionalrequired.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/test/testserialization.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testsimpleserver.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/teststruct.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testthrifttest.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testthrifttestclient.cpp
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/c_glib/test/testtransportsocket.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/c_glib/thrift_c_glib.pc.in
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TApplicationError.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TApplicationError.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TBaseClient.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TBaseClient.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TBinary.swift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TEnum.swift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TError.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TList.swift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TMap.swift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TProcessorFactory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TProtocol.swift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TSerializable.swift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TSet.swift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TSharedProcessorFactory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TSharedProcessorFactory.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/TStruct.swift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/Thrift.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBase.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBinaryProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBinaryProtocol.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TCompactProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TCompactProtocol.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TMultiplexedProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TMultiplexedProtocol.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolDecorator.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolDecorator.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolError.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolError.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolFactory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolUtil.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolUtil.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/server/TSocketServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/server/TSocketServer.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TAsyncTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TFramedTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TFramedTransport.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPSessionTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPSessionTransport.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPTransport.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TMemoryBuffer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TMemoryBuffer.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSFileHandleTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSFileHandleTransport.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSStreamTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSStreamTransport.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransport.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransportError.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransportError.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSocketTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSocketTransport.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransportError.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransportError.m
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/3rdparty.props
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/CMakeLists.txt
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/libthrift.vcxproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/libthrift.vcxproj.filters
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/libthriftnb.vcxproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/libthriftnb.vcxproj.filters
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TApplicationException.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TApplicationException.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TBase.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TDispatchProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TLogging.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TOutput.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TOutput.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TToString.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/Thrift.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/VirtualProfiling.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncBufferProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncChannel.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncChannel.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TConcurrentClientSyncInfo.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TConcurrentClientSyncInfo.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpClientChannel.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostMutex.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Exception.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/FunctionRunner.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Monitor.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Monitor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Mutex.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Mutex.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdMonitor.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdMutex.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdThreadFactory.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Thread.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/ThreadManager.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/ThreadManager.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/TimerManager.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/TimerManager.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Util.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Util.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/cxxfunctional.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/PeekProcessor.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/PeekProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/StatsProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/TMultiplexedProcessor.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBase64Utils.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBase64Utils.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBinaryProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TCompactProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TDebugProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/THeaderProtocol.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/THeaderProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TJSONProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TMultiplexedProtocol.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TMultiplexedProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocol.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolDecorator.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolException.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolTap.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolTypes.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TVirtualProtocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQIODeviceTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQTcpServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQTcpServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TConnectedClient.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TConnectedClient.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TNonblockingServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TNonblockingServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServerFramework.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServerFramework.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TSimpleServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TSimpleServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadPoolServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadPoolServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadedServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadedServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/thrift-config.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/PlatformSocket.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TBufferTransports.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TBufferTransports.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFDTransport.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFDTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFileTransport.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFileTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THeaderTransport.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THeaderTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpClient.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpClient.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpTransport.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipe.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipe.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipeServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipeServer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLServerSocket.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLSocket.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLSocket.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerSocket.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerSocket.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TShortReadTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSimpleFileTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocket.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocket.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocketPool.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocketPool.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportException.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportException.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportUtils.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportUtils.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TVirtualTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TZlibTransport.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TZlibTransport.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/GetTimeOfDay.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/Operators.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/SocketPair.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/SocketPair.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/Sync.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/TWinsockSingleton.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/WinFcntl.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/WinFcntl.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/config.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/AllProtocolTests.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/AllProtocolTests.tcc
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/Base64Test.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/Benchmark.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/DebugProtoTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/DebugProtoTest_extras.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/EnumTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/GenericHelpers.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/JSONProtoTest.cpp
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/OpenSSLManualInitTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/OptionalRequiredTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/RWMutexStarveTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/RecursiveTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/SecurityTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/SpecializationTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TBufferBaseTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TFDTransportTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TFileTransportTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TMemoryBufferTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TNonblockingServerTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TPipeInterruptTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TPipedTransportTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TSSLSocketInterruptTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TServerIntegrationTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TServerSocketTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TServerTransportTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TSocketInterruptTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TTransportCheckThrow.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/ThriftTest_extras.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/ToStringTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TransportTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/TypedefTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/UnitTestMain.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/ZlibTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/Tests.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/ThreadFactoryTests.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/ThreadManagerTests.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/TimerManagerTests.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/link/LinkTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/link/TemplatedService1.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/link/TemplatedService2.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/processor/EventLog.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/processor/EventLog.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/processor/Handlers.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ProcessorTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ServerThread.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ServerThread.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/processor/proc.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/qt/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/test/qt/TQTcpServerTest.cpp
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/thrift-nb.pc.in
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/thrift-qt.pc.in
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/thrift-qt5.pc.in
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/thrift-z.pc.in
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/cpp/thrift.pc.in
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/cpp/thrift.sln
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Collections/TCollections.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Collections/THashSet.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TAbstractBase.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBase.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBase64Utils.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBinaryProtocol.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TCompactProtocol.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TField.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TJSONProtocol.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TList.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMap.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMessage.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMessageType.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMultiplexedProcessor.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMultiplexedProtocol.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocol.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolDecorator.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolException.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolFactory.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolUtil.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TSet.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TStruct.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TType.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TServer.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TServerEventHandler.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TSimpleServer.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TThreadPoolServer.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TThreadedServer.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/TApplicationException.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/TAsyncProcessor.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/TControllingHandler.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/TException.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/TProcessor.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/TProcessorFactory.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/TPrototypeProcessorFactory.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/TSingletonProcessorFactory.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.45.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.sln
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TBufferedTransport.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TFramedTransport.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpClient.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpHandler.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpTaskAsyncHandler.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TMemoryBuffer.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TNamedPipeClientTransport.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TNamedPipeServerTransport.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TServerSocket.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TServerTransport.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TSilverlightSocket.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TSocket.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TStreamTransport.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTLSServerSocket.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTLSSocket.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransport.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransportException.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransportFactory.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/JSONTest.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/Program.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/app.config
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/Multiplex.Test.Client.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Multiplex.Test.Common.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/Multiplex.Test.Server.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/App_Start/FilterConfig.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/App_Start/RouteConfig.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/AsyncHttpHandler.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Controllers/HomeController.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Global.asax
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Global.asax.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/SecondServiceImpl.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/SyncHttpHandler.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/ThriftMVCTest.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Home/Index.cshtml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Shared/_Layout.cshtml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Web.config
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/_ViewStart.cshtml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.Debug.config
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.Release.config
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.config
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/favicon.ico
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/packages.config
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/base.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/libevent.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/socket.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/ssl.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/base.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/async_client.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/async_client_pool.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/base.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/client.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/client_pool.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/idlgen.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/processor.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/index.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/algorithm.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/codegen.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ctfe.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/endian.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/resource_pool.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/socket.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ssl.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ssl_bio.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/test/protocol.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/test/server.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/traits.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/base.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/binary.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/compact.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/json.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/processor.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/base.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/nonblocking.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/simple.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/taskpool.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/threaded.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/base.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/socket.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/ssl.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/base.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/buffered.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/file.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/framed.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/http.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/memory.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/piped.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/range.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/socket.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/ssl.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/zlib.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/awaitable.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/cancellation.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/future.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/hashset.d
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/d/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/async_test.d
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/d/test/async_test_runner.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/client_pool_test.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/openssl.test.cnf
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/serialization_benchmark.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/stress_test_server.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/test_utils.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_client.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_common.d
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_runner.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_server.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/d/test/transport_test.d
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/.analysis_options
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/LICENSE_HEADER
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/browser/t_web_socket.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/console/t_tcp_socket.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/console/t_web_socket.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_binary_protocol.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_compact_protocol.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_field.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_json_protocol.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_list.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_map.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_message.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_multiplexed_protocol.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_decorator.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_error.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_factory.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_util.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_set.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_struct.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_type.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/serializer/t_deserializer.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/serializer/t_serializer.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_application_error.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_base.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_error.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_processor.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_buffered_transport.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_framed_transport.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_http_transport.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_message_reader.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_socket.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_socket_transport.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport_error.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport_factory.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/thrift.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/thrift_browser.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/lib/thrift_console.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/pubspec.yaml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/test/protocol/t_protocol_test.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/test/serializer/serializer_test.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/test/serializer/serializer_test_data.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/test/t_application_error_test.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_http_transport_test.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_socket_transport_test.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_transport_test.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/dart/tool/dev.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Collections.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Console.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Defines.inc
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Processor.Multiplex.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.Compact.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.JSON.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.Multiplex.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Serializer.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Server.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Socket.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Stream.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Transport.Pipes.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Transport.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.TypeRegistry.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Utils.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/TestClient.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/TestConstants.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/TestServer.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/TestServerEvents.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/client.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/ReservedKeywords.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/run-Pascal-Codegen-Tests.bat.tmpl
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/delphi/test/maketest.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Client.Main.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Server.Main.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Client.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Common.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Server.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/serializer/TestSerializer.Data.pas
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/serializer/TestSerializer.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/server.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/skip/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/skip/idl/skiptest_version_1.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/skip/idl/skiptest_version_2.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/skip/skiptest_version1.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/skip/skiptest_version2.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/delphi/test/typeregistry/TestTypeRegistry.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/include/thrift_constants.hrl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/include/thrift_protocol.hrl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/include/thrift_protocol_behaviour.hrl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/include/thrift_transport_behaviour.hrl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/rebar.config
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/rebar.config.script
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/rebar.test.config
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_base64_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_binary_protocol.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_buffered_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_client.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_client_util.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_compact_protocol.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_disk_log_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_file_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_framed_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_http_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_json_parser.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_json_protocol.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_membuffer_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_memory_buffer.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_multiplexed_map_wrapper.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_multiplexed_protocol.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_processor.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_protocol.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_reconnecting_client.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_server.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_service.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_socket_server.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_socket_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_sslsocket_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/src/thrift_transport_state_test.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/Thrift1151.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/Thrift1475.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/flags/LegacyNames.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/flags/Thrift3214.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/legacy_names_test.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/multiplexing.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/multiplexing_test.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/name_conflict_test.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/stress_server.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_disklog.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_1151.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_3214.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_buffered_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_compact_protocol.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_file_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_framed_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_membuffer_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_socket_transport.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/thrift_socket_server_test.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/erl/test/thrift_test_test.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/BinaryKeyTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/DontExportRWTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/ErrorTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/GoTagTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/IgnoreInitialismsTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/IncludesTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/InitialismsTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/MultiplexedProtocolTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/NamesTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/NamespacedTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/OnewayTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/OptionalFieldsTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/RefAnnotationFieldsTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/ServicesTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/TypedefFieldTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/UnionDefaultValueTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/dontexportrwtest/compile_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/binary_key_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/client_error_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/encoding_json_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/gotag_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/ignoreinitialisms_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/initialisms_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/multiplexed_protocol_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/names_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/one_way_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/optional_fields_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/protocol_mock.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/protocols_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/required_fields_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/struct_args_rets_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/thrifttest_driver.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/thrifttest_handler.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/test/tests/union_default_value_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/go/thrift/processor.go
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/haxelib.json
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/AbstractMethodError.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/ArgumentError.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/Limits.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TApplicationException.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TBase.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TException.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TFieldRequirementType.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TProcessor.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/BitConverter.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/Int64Map.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/IntSet.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/ObjectSet.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/StringSet.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/ZigZag.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/FieldMetaData.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/FieldValueMetaData.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/ListMetaData.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/MapMetaData.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/SetMetaData.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/StructMetaData.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TBinaryProtocol.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TBinaryProtocolFactory.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactProtocol.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactProtocolFactory.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactTypes.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TField.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TJSONProtocol.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TJSONProtocolFactory.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TList.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMap.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMessage.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMessageType.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMultiplexedProcessor.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMultiplexedProtocol.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocol.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolDecorator.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolException.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolFactory.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolUtil.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TRecursionTracker.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TSet.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TStruct.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TType.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TServer.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TServerEventHandler.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TSimpleServer.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TBufferedTransport.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TBufferedTransportFactory.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFileStream.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFramedTransport.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFramedTransportFactory.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFullDuplexHttpClient.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/THttpClient.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TServerSocket.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TServerTransport.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TSocket.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TStream.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TStreamTransport.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransport.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransportException.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransportFactory.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TWrappingServerTransport.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/HaxeTests.hxproj
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/cpp.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/csharp.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/flash.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/java.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/javascript.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/make_all.bat
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/make_all.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/neko.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/php.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/project.hide
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/python.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/src/Main.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/src/MultiplexTest.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/src/StreamTest.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/haxe/test/src/TestBase.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/LICENSE
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/README.md
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/hs/Setup.lhs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/TODO
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/Thrift.cabal
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Arbitraries.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/Binary.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/Compact.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/JSON.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Server.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Empty.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Framed.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Handle.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/HttpClient.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/IOBuffer.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Memory.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Types.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/test/BinarySpec.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/test/CompactSpec.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/test/JSONSpec.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/hs/test/Spec.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/android/build.gradle
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/android/settings.gradle
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/android/src/main/AndroidManifest.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/build.properties
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/AsyncProcessFunction.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/EncodingUtils.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/Option.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/ProcessFunction.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/ShortStack.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TApplicationException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TAsyncProcessor.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBase.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseAsyncProcessor.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseHelper.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseProcessor.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TDeserializer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TEnum.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TEnumHelper.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TFieldIdEnum.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TFieldRequirementType.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TMultiplexedProcessor.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TNonblockingMultiFetchClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TNonblockingMultiFetchStats.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TProcessor.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TProcessorFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TSerializable.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TSerializer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TServiceClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TServiceClientFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TUnion.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/AsyncMethodCallback.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClientFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncMethodCall.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/EnumMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/FieldMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/FieldValueMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/ListMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/MapMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/SetMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/StructMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TCompactProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TField.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TList.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMap.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMessage.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMessageType.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMultiplexedProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolDecorator.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TSet.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TStruct.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TTupleProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TType.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/IScheme.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/SchemeFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/StandardScheme.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/TupleScheme.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/Invocation.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/ServerContext.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TExtensibleServlet.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/THsHaServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServerEventHandler.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServlet.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TSimpleServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBuffer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferReadTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TByteBuffer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFileProcessor.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFileTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/THttpClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingServerTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingSocket.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslServerTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslTransportException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSeekableFile.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TServerSocket.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TServerTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSimpleFileTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSocket.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TStandardFile.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransportException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransportFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TZlibTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/.keystore
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/.truststore
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/log4j.properties
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/Fixtures.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestFullCamel.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestOptionType.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestOptionals.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestReuse.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestShortStack.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestStruct.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTBaseHelper.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTDeserializer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTEnumHelper.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTUnion.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/async/TestTAsyncClientManager.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/BenchmarkProtocols.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTJSONProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTProtocolUtil.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTSimpleJSONProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTTupleProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/scheme/TestStandardScheme.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/ServerTestBase.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestAsyncServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestHsHaServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestThreadedSelectorServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/EqualityTest.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/JavaBeansTest.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/ReadStruct.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestServer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/WriteStruct.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBuffer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferReadTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferWriteTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTByteBuffer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTFastFramedTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTFramedTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTMemoryInputTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient1.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient2.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSimpleFileTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTZlibTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TApplicationException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TBase.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TBaseHelper.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TByteArrayOutputStream.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TDeserializer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TEnum.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TFieldRequirementType.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TProcessor.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TProcessorFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TSerializer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TServiceClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/FieldMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/FieldValueMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/ListMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/MapMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/SetMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/StructMetaData.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TBase64Utils.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TBinaryProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TField.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TList.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMap.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMessage.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMessageType.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocol.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolUtil.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TSet.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TStruct.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TType.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TFramedTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/THttpClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TIOStreamTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TMemoryBuffer.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransport.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransportException.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransportFactory.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/Gruntfile.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/package.json
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/src/thrift.js
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/js/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/README.md
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/js/test/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/deep-constructor.test.js
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/js/test/jsTestDriver.conf
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/phantom-client.js
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/js/test/phantomjs-qunit.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/server_http.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/server_https.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/src/test/Httpd.java
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/test-async.js
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/js/test/test-deep-constructor.html
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/test-jq.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/test-nojq.html
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/test-nojq.js
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/js/test/test.html
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/js/test/test.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/test_handler.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/js/test/testws.html
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/json/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/json/schema.json
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/json/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/json/test/build.properties
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/json/test/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TBinaryProtocol.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TBufferedTransport.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TCompactProtocol.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TFramedTransport.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/THttpTransport.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TJsonProtocol.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TMemoryBuffer.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TProtocol.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TServer.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TSocket.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/TTransport.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/Thrift.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/src/longnumberutils.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/src/luabitwise.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/src/luabpack.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/src/lualongnumber.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/src/luasocket.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/src/socket.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/lua/src/usocket.c
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/nodejs/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/client.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/client_multitransport.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.html
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpClient.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpServer.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpServer.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/parse.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/server.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/server_http.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/server_multitransport.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/examples/user.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/binary.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/binary_protocol.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/browser.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/buffered_transport.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/compact_protocol.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/connection.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/create_client.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/framed_transport.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/http_connection.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/index.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/input_buffer_underrun_error.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/int64_util.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/json_parse.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/json_protocol.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/log.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/multiplexed_processor.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/multiplexed_protocol.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/protocol.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/server.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/thrift.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/transport.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/web_server.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/ws_connection.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/ws_transport.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/xhr_connection.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/binary.test.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/browser_client.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/certificates.README
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/client.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/deep-constructor.test.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/exceptions.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/helpers.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/server.crt
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/server.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/server.key
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/test-cases.js
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/nodejs/test/testAll.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/test_driver.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/nodejs/test/test_handler.js
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/OCamlMakefile
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/README-OCamlMakefile
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/TODO
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/_oasis
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/TBinaryProtocol.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/TChannelTransport.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/TFramedTransport.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/TServer.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/TServerSocket.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/TSimpleServer.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/TSocket.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/TThreadedServer.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ocaml/src/Thrift.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/Makefile.PL
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/BinaryProtocol.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/BufferedTransport.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/FramedTransport.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/HttpClient.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MemoryBuffer.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MessageType.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MultiplexedProcessor.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MultiplexedProtocol.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Protocol.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/ProtocolDecorator.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/SSLServerSocket.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/SSLSocket.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Server.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/ServerSocket.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Socket.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Transport.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/UnixServerSocket.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/UnixSocket.pm
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/test.pl
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/test/memory_buffer.t
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/test/multiplex.t
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/perl/test/processor.t
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/php/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/README.apache.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Base/TBase.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TApplicationException.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TException.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TProtocolException.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TTransportException.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TBinaryProtocolFactory.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TCompactProtocolFactory.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TJSONProtocolFactory.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TProtocolFactory.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TStringFuncFactory.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TTransportFactory.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/BaseContext.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/ListContext.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/LookaheadReader.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/PairContext.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/CollectionMapKeyException.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/Context.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/ListContext.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/MapContext.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/StructContext.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TBinaryProtocol.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TBinaryProtocolAccelerated.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TCompactProtocol.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TJSONProtocol.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TMultiplexedProtocol.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TProtocol.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TProtocolDecorator.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TSimpleJSONProtocol.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Serializer/TBinarySerializer.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TForkingServer.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TSSLServerSocket.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServer.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServerSocket.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServerTransport.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TSimpleServer.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/Core.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/Mbstring.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/TStringFunc.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/TMultiplexedProcessor.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TBufferedTransport.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TCurlClient.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TFramedTransport.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/THttpClient.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TMemoryBuffer.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TNullTransport.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TPhpStream.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSSLSocket.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSocket.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSocketPool.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TTransport.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TConstant.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TMessageType.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TType.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/src/TStringUtils.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/src/Thrift.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/src/autoload.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol7.cpp
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/php/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Fixtures.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/JsonSerialize/JsonSerializeTest.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestBinarySerializer.php
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestTJSONProtocol.php
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestTSimpleJSONProtocol.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/TestValidators.php
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/test/TestValidators.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/php/thrift_protocol.ini
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/compat/win32/stdint.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/setup.cfg
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/setup.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/TMultiplexedProcessor.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/TSCons.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/TSerialization.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/TTornado.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/Thrift.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/__init__.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/compat.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/binary.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/binary.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/compact.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/compact.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/endian.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/module.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/protocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/protocol.tcc
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/types.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/ext/types.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/protocol/TBase.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/protocol/TBinaryProtocol.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/protocol/TCompactProtocol.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/protocol/TJSONProtocol.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/protocol/TMultiplexedProtocol.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/protocol/TProtocol.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/protocol/TProtocolDecorator.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/protocol/__init__.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/server/THttpServer.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/server/TNonblockingServer.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/server/TProcessPoolServer.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/server/TServer.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/server/__init__.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/transport/THttpClient.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/transport/TSSLSocket.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/transport/TSocket.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/transport/TTransport.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/transport/TTwisted.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/transport/TZlibTransport.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/transport/__init__.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/src/transport/sslcompat.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/test/_import_local_thrift.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/test/test_sslsocket.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/py/test/thrift_json.py
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/Gemfile
 delete mode 100755 vendor/git.apache.org/thrift.git/lib/rb/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/Rakefile
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/benchmark/Benchmark.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/benchmark/benchmark.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/benchmark/client.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/benchmark/server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/benchmark/thin_server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/binary_protocol_accelerated.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/binary_protocol_accelerated.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/bytes.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/bytes.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/compact_protocol.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/compact_protocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/constants.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/extconf.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/macros.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/memory_buffer.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/memory_buffer.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/protocol.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/protocol.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/strlcpy.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/strlcpy.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/struct.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/struct.h
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/ext/thrift_native.c
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/bytes.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/client.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/core_ext.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/core_ext/fixnum.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/exceptions.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/multiplexed_processor.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/processor.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/base_protocol.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/binary_protocol.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/binary_protocol_accelerated.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/compact_protocol.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/json_protocol.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/multiplexed_protocol.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/protocol_decorator.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/serializer/deserializer.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/serializer/serializer.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/base_server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/mongrel_http_server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/nonblocking_server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/simple_server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/thin_http_server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/thread_pool_server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/threaded_server.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/struct.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/struct_union.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/thrift_native.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/base_server_transport.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/base_transport.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/buffered_transport.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/framed_transport.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/http_client_transport.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/io_stream_transport.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/memory_buffer_transport.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/server_socket.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/socket.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/ssl_server_socket.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/ssl_socket.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/unix_server_socket.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/unix_socket.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/types.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/union.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/script/proto_benchmark.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/script/read_struct.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/script/write_struct.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/BaseService.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/ExtendedService.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/Referenced.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/ThriftNamespacedSpec.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/ThriftSpec.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/base_protocol_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/base_transport_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_accelerated_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_spec_shared.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/bytes_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/client_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/compact_protocol_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/exception_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/flat_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/http_client_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/json_protocol_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/namespaced_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/nonblocking_server_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/processor_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/serializer_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/server_socket_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/server_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/socket_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/socket_spec_shared.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/spec_helper.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/ssl_socket_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/struct_nested_containers_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/struct_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/thin_http_server_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/types_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/union_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/spec/unix_socket_spec.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/rb/thrift.gemspec
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/st/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/st/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/st/package.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/st/thrift.st
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ts/coding_standards.md
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/ts/thrift.d.ts
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/xml/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/xml/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/xml/test/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/lib/xml/thrift-idl.xsd
 delete mode 100644 vendor/git.apache.org/thrift.git/package.json
 delete mode 100755 vendor/git.apache.org/thrift.git/sonar-project.properties
 delete mode 100644 vendor/git.apache.org/thrift.git/test/AnnotationTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/BrokenConstants.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/ConstantsDemo.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/DebugProtoTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/DenseLinkingTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/DocTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/EnumTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/FullCamelTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/Include.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/JavaBeansTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/JavaTypes.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/JsDeepConstructorTest.thrift
 delete mode 100755 vendor/git.apache.org/thrift.git/test/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/ManyOptionals.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/ManyTypedefs.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/NameConflictTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/OptionalRequiredTest.thrift
 delete mode 100755 vendor/git.apache.org/thrift.git/test/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/test/Recursive.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/ReuseObjects.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/SmallTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/StressTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/ThriftTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/TypedefTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break1.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break10.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break11.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break12.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break13.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break14.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break15.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break16.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break17.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break18.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break19.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break2.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break20.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break21.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break22.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break23.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break24.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break25.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break26.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break27.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break28.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break29.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break3.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break30.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break31.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break32.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break33.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break34.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break4.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break5.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break6.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break7.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break8.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/break9.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/test.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/thrift_audit_test.pl
 delete mode 100644 vendor/git.apache.org/thrift.git/test/audit/warning.thrift
 delete mode 100755 vendor/git.apache.org/thrift.git/test/c_glib/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/c_glib/src/test_client.c
 delete mode 100644 vendor/git.apache.org/thrift.git/test/c_glib/src/test_server.c
 delete mode 100644 vendor/git.apache.org/thrift.git/test/c_glib/src/thrift_test_handler.c
 delete mode 100644 vendor/git.apache.org/thrift.git/test/c_glib/src/thrift_test_handler.h
 delete mode 100755 vendor/git.apache.org/thrift.git/test/cpp/CMakeLists.txt
 delete mode 100755 vendor/git.apache.org/thrift.git/test/cpp/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/cpp/realloc/realloc_test.c
 delete mode 100644 vendor/git.apache.org/thrift.git/test/cpp/src/StressTest.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/test/cpp/src/StressTestNonBlocking.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/test/cpp/src/TestClient.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/test/cpp/src/TestServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/test/cpp/src/ThriftTest_extras.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/test/crossrunner/__init__.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/crossrunner/collect.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/crossrunner/compat.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/crossrunner/report.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/crossrunner/run.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/crossrunner/setup.cfg
 delete mode 100644 vendor/git.apache.org/thrift.git/test/crossrunner/test.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/crossrunner/util.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/csharp/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/csharp/Program.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/csharp/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/csharp/TestClient.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/csharp/TestServer.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/csharp/ThriftTest.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/test/csharp/ThriftTest.sln
 delete mode 100644 vendor/git.apache.org/thrift.git/test/dart/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/dart/test_client/.analysis_options
 delete mode 100644 vendor/git.apache.org/thrift.git/test/dart/test_client/bin/main.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/test/dart/test_client/pubspec.yaml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/erl/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/erl/rebar.config
 delete mode 100644 vendor/git.apache.org/thrift.git/test/erl/src/test_client.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/test/erl/src/test_thrift_server.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/test/erl/src/thrift_test.app.src
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/container_limit.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/index.html
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/known_failures_Linux.json
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/local_thrift/__init__.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/setup.cfg
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/string_limit.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/tests.json
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/theader_binary.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/features/util.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/bin/stress/main.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/bin/testclient/main.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/bin/testserver/main.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/common/client.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/common/clientserver_test.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/common/mock_handler.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/common/printing_handler.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/common/server.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/go/src/common/simple_handler.go
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/TestClientServer.hxproj
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/cpp.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/csharp.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/flash.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/java.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/javascript.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/make_all.bat
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/make_all.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/neko.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/php-web-server.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/php.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/project.hide
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/python.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/router.php
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/src/Arguments.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/src/Main.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/src/TestClient.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/src/TestMacro.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/src/TestServer.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/src/TestServerEventHandler.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/test/haxe/src/TestServerHandler.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/ConstantsDemo_Main.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/DebugProtoTest_Main.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/Include_Main.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/TestClient.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/TestServer.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/ThriftTestUtils.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/test/hs/ThriftTest_Main.hs
 delete mode 100755 vendor/git.apache.org/thrift.git/test/hs/run-test.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/test/index.html
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/CA.pem
 delete mode 100755 vendor/git.apache.org/thrift.git/test/keys/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/client.crt
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/client.key
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/client.p12
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/client.pem
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/client_v3.crt
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/client_v3.key
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/server.crt
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/server.key
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/server.p12
 delete mode 100644 vendor/git.apache.org/thrift.git/test/keys/server.pem
 delete mode 100644 vendor/git.apache.org/thrift.git/test/known_failures_Linux.json
 delete mode 100644 vendor/git.apache.org/thrift.git/test/lua/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/lua/test_basic_client.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/test/lua/test_basic_server.lua
 delete mode 100644 vendor/git.apache.org/thrift.git/test/ocaml/client/TestClient.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/ocaml/server/TestServer.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/test/perl/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/test/perl/TestClient.pl
 delete mode 100644 vendor/git.apache.org/thrift.git/test/perl/TestServer.pl
 delete mode 100755 vendor/git.apache.org/thrift.git/test/php/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/test/php/TestClient.php
 delete mode 100644 vendor/git.apache.org/thrift.git/test/php/TestInline.php
 delete mode 100644 vendor/git.apache.org/thrift.git/test/php/TestPsr4.php
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py.tornado/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py.tornado/setup.cfg
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py.tornado/test_suite.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py.twisted/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py.twisted/setup.cfg
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py.twisted/test_suite.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/CMakeLists.txt
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/FastbinaryTest.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/RunClientServer.py
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/SerializationTest.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/TSimpleJSONProtocolTest.py
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/TestClient.py
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/TestEof.py
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/TestFrozen.py
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/TestServer.py
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/TestSocket.py
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/TestSyntax.py
 delete mode 100755 vendor/git.apache.org/thrift.git/test/py/explicit_module/runtest.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/explicit_module/test1.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/explicit_module/test2.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/explicit_module/test3.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/generate.cmake
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/setup.cfg
 delete mode 100644 vendor/git.apache.org/thrift.git/test/py/util.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/Gemfile
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/benchmarks/protocol_benchmark.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/core/test_backwards_compatability.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/core/test_exceptions.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/core/transport/test_transport.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/fixtures/structs.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/generation/test_enum.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/generation/test_struct.rb
 delete mode 100755 vendor/git.apache.org/thrift.git/test/rb/integration/TestClient.rb
 delete mode 100755 vendor/git.apache.org/thrift.git/test/rb/integration/TestServer.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/test_helper.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rb/test_suite.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/test/rebuild_known_failures.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/test/result.js
 delete mode 100755 vendor/git.apache.org/thrift.git/test/test.py
 delete mode 100644 vendor/git.apache.org/thrift.git/test/tests.json
 delete mode 100644 vendor/git.apache.org/thrift.git/test/threads/ThreadsClient.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/test/threads/ThreadsServer.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/test/threads/ThreadsTest.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/test/valgrind.suppress
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/as3/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/as3/src/CalculatorUI.as
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/c_glib/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/c_glib/c_glib_client.c
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/c_glib/c_glib_server.c
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/cpp/CMakeLists.txt
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/cpp/CppClient.cpp
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/cpp/CppServer.cpp
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/cpp/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/CsharpClient.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/CsharpClient.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/CsharpServer.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/CsharpServer.csproj
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/csharp/tutorial.sln
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/d/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/d/async_client.d
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/d/client.d
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/d/server.d
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/build.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/client/.analysis_options
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/client/pubspec.yaml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/client/web/client.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/client/web/index.html
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/client/web/styles.css
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/console_client/.analysis_options
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/console_client/bin/main.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/console_client/pubspec.yaml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/server/.analysis_options
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/server/bin/main.dart
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/dart/server/pubspec.yaml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiClient/DelphiClient.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiClient/DelphiClient.dproj
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiServer/DelphiServer.dpr
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiServer/DelphiServer.dproj
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/delphi/Tutorial.groupproj
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/erl/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/erl/client.erl
 delete mode 120000 vendor/git.apache.org/thrift.git/tutorial/erl/client.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/erl/json_client.erl
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/erl/server.erl
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/erl/server.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/go/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/go/server.crt
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/go/server.key
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/go/src/client.go
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/go/src/handler.go
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/go/src/main.go
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/go/src/server.go
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/Tutorial.hxproj
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/cpp.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/csharp.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/flash.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/java.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/javascript.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/make_all.bat
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/make_all.sh
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/neko.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/php-web-server.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/php.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/project.hide
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/python.hxml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/router.php
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/src/CalculatorHandler.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/haxe/src/Main.hx
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/hs/HaskellClient.hs
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/hs/HaskellServer.hs
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/hs/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/hs/Setup.lhs
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/hs/ThriftTutorial.cabal
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/java/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/java/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/java/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/java/src/CalculatorHandler.java
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/java/src/JavaClient.java
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/java/src/JavaServer.java
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/js/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/js/build.xml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/js/src/Httpd.java
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/js/tutorial.html
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/nodejs/Makefile.am
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeClient.js
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeClientPromise.js
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeServer.js
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeServerPromise.js
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/ocaml/CalcClient.ml
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/ocaml/CalcServer.ml
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/ocaml/README.md
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/ocaml/_oasis
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/perl/PerlClient.pl
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/perl/PerlServer.pl
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/php/PhpClient.php
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/php/PhpServer.php
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/php/runserver.py
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py.tornado/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py.tornado/PythonClient.py
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py.tornado/PythonServer.py
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py.twisted/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonClient.py
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonServer.py
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonServer.tac
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py/PythonClient.py
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/py/PythonServer.py
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/py/setup.cfg
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/rb/Makefile.am
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/rb/RubyClient.rb
 delete mode 100755 vendor/git.apache.org/thrift.git/tutorial/rb/RubyServer.rb
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/shared.thrift
 delete mode 100644 vendor/git.apache.org/thrift.git/tutorial/tutorial.thrift
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/application_exception.go (74%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/application_exception_test.go (88%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/binary_protocol.go (97%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/binary_protocol_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/buffered_transport.go (95%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/buffered_transport_test.go (100%)
 create mode 100644 vendor/github.com/apache/thrift/lib/go/thrift/client.go
 rename vendor/{git.apache.org/thrift.git/lib/go/thrift/zlib_transport_test.go => github.com/apache/thrift/lib/go/thrift/common_test.go} (78%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/compact_protocol.go (98%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/compact_protocol_test.go (87%)
 rename vendor/{git.apache.org/thrift.git/lib/cocoa/src/TError.m => github.com/apache/thrift/lib/go/thrift/context.go} (92%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/debug_protocol.go (98%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/deserializer.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/exception.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/exception_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/field.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/framed_transport.go (97%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/framed_transport_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/http_client.go (98%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/http_client_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/http_transport.go (61%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/iostream_transport.go (98%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/iostream_transport_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/json_protocol.go (99%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/json_protocol_test.go (95%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/lowlevel_benchmarks_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/memory_buffer.go (96%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/memory_buffer_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/messagetype.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/multiplexed_protocol.go (96%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/numeric.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/pointerize.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/processor_factory.go (83%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/protocol.go (96%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/protocol_exception.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/protocol_factory.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/protocol_test.go (89%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/rich_transport.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/rich_transport_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/serializer.go (79%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/serializer_test.go (97%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/serializer_types_test.go (99%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/server.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/server_socket.go (85%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/server_socket_test.go (85%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/server_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/server_transport.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/simple_json_protocol.go (99%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/simple_json_protocol_test.go (95%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/simple_server.go (81%)
 create mode 100644 vendor/github.com/apache/thrift/lib/go/thrift/simple_server_test.go
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/socket.go (98%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/ssl_server_socket.go (97%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/ssl_socket.go (92%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/transport.go (93%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/transport_exception.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/transport_exception_test.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/transport_factory.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/transport_test.go (97%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/type.go (100%)
 rename vendor/{git.apache.org/thrift.git => github.com/apache/thrift}/lib/go/thrift/zlib_transport.go (82%)
 create mode 100644 vendor/github.com/apache/thrift/lib/go/thrift/zlib_transport_test.go

diff --git a/.gitignore b/.gitignore
index 66a91e3..ecf2cf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,17 @@ _obj
 _test
 .idea
 
+# Thrift library comes with a lot of other files we don't need.
+# Ignore everything but the files we do need
+vendor/github.com/apache/thrift/*
+!vendor/github.com/apache/thrift/lib/
+
+vendor/github.com/apache/thrift/lib/*
+!vendor/github.com/apache/thrift/lib/go/
+
+vendor/github.com/apache/thrift/lib/go/*
+!vendor/github.com/apache/thrift/lib/go/thrift/
+
 # Architecture specific extensions/prefixes
 *.[568vq]
 [568vq].out
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..99eace8
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+1.4.0 (unreleased)
+
+* Moved to Thrift 0.12.0 code generator and go library.
+* `aurora.ACTIVE_STATES`, `aurora.SLAVE_ASSIGNED_STATES`, `aurora.LIVE_STATES`, `aurora.TERMINAL_STATES`, `aurora.ACTIVE_JOB_UPDATE_STATES`, `aurora.AWAITNG_PULSE_JOB_UPDATE_STATES` are all now generated as a slices.
+* Please use `realis.ActiveStates`, `realis.SlaveAssignedStates`,`realis.LiveStates`, `realis.TerminalStates`, `realis.ActiveJobUpdateStates`, `realis.AwaitingPulseJobUpdateStates` in their places when map representations are needed.
+* `GetInstanceIds(key *aurora.JobKey, states map[aurora.ScheduleStatus]bool) (map[int32]bool, error)` has changed signature to ` GetInstanceIds(key *aurora.JobKey, states []aurora.ScheduleStatus) ([]int32, error)`
diff --git a/Gopkg.lock b/Gopkg.lock
index 7ae916d..109946a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -2,43 +2,63 @@
 
 
 [[projects]]
-  branch = "0.10.0-http-client-fix"
-  name = "git.apache.org/thrift.git"
+  digest = "1:89696c38cec777120b8b1bb5e2d363d655cf2e1e7d8c851919aaa0fd576d9b86"
+  name = "github.com/apache/thrift"
   packages = ["lib/go/thrift"]
-  revision = "cb1afec972a85791e9b24a04b60fc9dbbfc3cda3"
-  source = "github.com/rdelval/thrift"
+  pruneopts = ""
+  revision = "384647d290e2e4a55a14b1b7ef1b7e66293a2c33"
+  version = "v0.12.0"
 
 [[projects]]
+  digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
   name = "github.com/davecgh/go-spew"
   packages = ["spew"]
+  pruneopts = ""
   revision = "346938d642f2ec3594ed81d874461961cd0faa76"
   version = "v1.1.0"
 
 [[projects]]
+  digest = "1:df48fb76fb2a40edea0c9b3d960bc95e326660d82ff1114e1f88001f7a236b40"
   name = "github.com/pkg/errors"
   packages = ["."]
+  pruneopts = ""
   revision = "e881fd58d78e04cf6d0de1217f8707c8cc2249bc"
 
 [[projects]]
+  digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
   name = "github.com/pmezard/go-difflib"
   packages = ["difflib"]
+  pruneopts = ""
   revision = "792786c7400a136282c1664665ae0a8db921c6c2"
   version = "v1.0.0"
 
 [[projects]]
+  digest = "1:78bea5e26e82826dacc5fd64a1013a6711b7075ec8072819b89e6ad76cb8196d"
   name = "github.com/samuel/go-zookeeper"
   packages = ["zk"]
+  pruneopts = ""
   revision = "471cd4e61d7a78ece1791fa5faa0345dc8c7d5a5"
 
 [[projects]]
+  digest = "1:2d0dc026c4aef5e2f3a0e06a4dabe268b840d8f63190cf6894e02134a03f52c5"
   name = "github.com/stretchr/testify"
-  packages = ["assert"]
+  packages = [
+    "assert",
+    "require",
+  ]
+  pruneopts = ""
   revision = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"
   version = "v1.2.0"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "fdb631400420ca7299ad56b66175c9157ca073e3de52f666a84fc1d6fa893978"
+  input-imports = [
+    "github.com/apache/thrift/lib/go/thrift",
+    "github.com/pkg/errors",
+    "github.com/samuel/go-zookeeper/zk",
+    "github.com/stretchr/testify/assert",
+    "github.com/stretchr/testify/require",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index d8c0ef0..6d4f1dd 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,7 +1,6 @@
 [[constraint]]
-    name = "git.apache.org/thrift.git"
-    branch = "0.10.0-http-client-fix"
-    source = "github.com/rdelval/thrift"
+    name = "github.com/apache/thrift"
+    version = "0.12.0"
 
 [[constraint]]
     name = "github.com/pkg/errors"
diff --git a/examples/client.go b/examples/client.go
index dd5ce2a..7425542 100644
--- a/examples/client.go
+++ b/examples/client.go
@@ -316,13 +316,9 @@ func main() {
 		}
 		currInstances := int32(len(live))
 		fmt.Println("Current num of instances: ", currInstances)
-		var instId int32
-		for k := range live {
-			instId = k
-		}
 		resp, err := r.AddInstances(aurora.InstanceKey{
 			JobKey:     job.JobKey(),
-			InstanceId: instId,
+			InstanceId: live[0],
 		},
 			numOfInstances)
 
@@ -364,13 +360,9 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		var instId int32
-		for k := range live {
-			instId = k
-		}
 		taskConfig, err := r.FetchTaskConfig(aurora.InstanceKey{
 			JobKey:     job.JobKey(),
-			InstanceId: instId,
+			InstanceId: live[0],
 		})
 		if err != nil {
 			log.Fatal(err)
@@ -467,14 +459,9 @@ func main() {
 			log.Fatal(err)
 
 		}
-		var instId int32
-		for k := range live {
-			instId = k
-			break
-		}
 		config, err := r.FetchTaskConfig(aurora.InstanceKey{
 			JobKey:     job.JobKey(),
-			InstanceId: instId,
+			InstanceId: live[0],
 		})
 
 		if err != nil {
diff --git a/gen-go/apache/aurora/GoUnusedProtection__.go b/gen-go/apache/aurora/GoUnusedProtection__.go
new file mode 100644
index 0000000..6ba25e0
--- /dev/null
+++ b/gen-go/apache/aurora/GoUnusedProtection__.go
@@ -0,0 +1,7 @@
+// Autogenerated by Thrift Compiler (0.12.0)
+// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+
+package aurora
+
+var GoUnusedProtection__ int;
+
diff --git a/gen-go/apache/aurora/auroraAPI-consts.go b/gen-go/apache/aurora/auroraAPI-consts.go
new file mode 100644
index 0000000..6e79077
--- /dev/null
+++ b/gen-go/apache/aurora/auroraAPI-consts.go
@@ -0,0 +1,54 @@
+// Autogenerated by Thrift Compiler (0.12.0)
+// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+
+package aurora
+
+import (
+	"bytes"
+	"context"
+	"reflect"
+	"fmt"
+	"github.com/apache/thrift/lib/go/thrift"
+)
+
+// (needed to ensure safety because of naive import list construction.)
+var _ = thrift.ZERO
+var _ = fmt.Printf
+var _ = context.Background
+var _ = reflect.DeepEqual
+var _ = bytes.Equal
+
+const AURORA_EXECUTOR_NAME = "AuroraExecutor"
+var ACTIVE_STATES []ScheduleStatus
+var SLAVE_ASSIGNED_STATES []ScheduleStatus
+var LIVE_STATES []ScheduleStatus
+var TERMINAL_STATES []ScheduleStatus
+const GOOD_IDENTIFIER_PATTERN = "^[\\w\\-\\.]+$"
+const GOOD_IDENTIFIER_PATTERN_JVM = "^[\\w\\-\\.]+$"
+const GOOD_IDENTIFIER_PATTERN_PYTHON = "^[\\w\\-\\.]+$"
+var ACTIVE_JOB_UPDATE_STATES []JobUpdateStatus
+var AWAITNG_PULSE_JOB_UPDATE_STATES []JobUpdateStatus
+const BYPASS_LEADER_REDIRECT_HEADER_NAME = "Bypass-Leader-Redirect"
+const TASK_FILESYSTEM_MOUNT_POINT = "taskfs"
+
+func init() {
+ACTIVE_STATES = []ScheduleStatus{
+    9,     17,     6,     0,     13,     12,     2,     1,     18,     16, }
+
+SLAVE_ASSIGNED_STATES = []ScheduleStatus{
+    9,     17,     6,     13,     12,     2,     18,     1, }
+
+LIVE_STATES = []ScheduleStatus{
+    6,     13,     12,     17,     18,     2, }
+
+TERMINAL_STATES = []ScheduleStatus{
+    4,     3,     5,     7, }
+
+ACTIVE_JOB_UPDATE_STATES = []JobUpdateStatus{
+    0,     1,     2,     3,     9,     10, }
+
+AWAITNG_PULSE_JOB_UPDATE_STATES = []JobUpdateStatus{
+    9,     10, }
+
+}
+
diff --git a/gen-go/apache/aurora/auroraAPI.go b/gen-go/apache/aurora/auroraAPI.go
new file mode 100644
index 0000000..36cde22
--- /dev/null
+++ b/gen-go/apache/aurora/auroraAPI.go
@@ -0,0 +1,29020 @@
+// Autogenerated by Thrift Compiler (0.12.0)
+// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+
+package aurora
+
+import (
+	"bytes"
+	"context"
+	"reflect"
+	"database/sql/driver"
+	"errors"
+	"fmt"
+	"github.com/apache/thrift/lib/go/thrift"
+)
+
+// (needed to ensure safety because of naive import list construction.)
+var _ = thrift.ZERO
+var _ = fmt.Printf
+var _ = context.Background
+var _ = reflect.DeepEqual
+var _ = bytes.Equal
+
+type ResponseCode int64
+const (
+  ResponseCode_INVALID_REQUEST ResponseCode = 0
+  ResponseCode_OK ResponseCode = 1
+  ResponseCode_ERROR ResponseCode = 2
+  ResponseCode_WARNING ResponseCode = 3
+  ResponseCode_AUTH_FAILED ResponseCode = 4
+  ResponseCode_JOB_UPDATING_ERROR ResponseCode = 5
+  ResponseCode_ERROR_TRANSIENT ResponseCode = 6
+)
+
+func (p ResponseCode) String() string {
+  switch p {
+  case ResponseCode_INVALID_REQUEST: return "INVALID_REQUEST"
+  case ResponseCode_OK: return "OK"
+  case ResponseCode_ERROR: return "ERROR"
+  case ResponseCode_WARNING: return "WARNING"
+  case ResponseCode_AUTH_FAILED: return "AUTH_FAILED"
+  case ResponseCode_JOB_UPDATING_ERROR: return "JOB_UPDATING_ERROR"
+  case ResponseCode_ERROR_TRANSIENT: return "ERROR_TRANSIENT"
+  }
+  return "<UNSET>"
+}
+
+func ResponseCodeFromString(s string) (ResponseCode, error) {
+  switch s {
+  case "INVALID_REQUEST": return ResponseCode_INVALID_REQUEST, nil 
+  case "OK": return ResponseCode_OK, nil 
+  case "ERROR": return ResponseCode_ERROR, nil 
+  case "WARNING": return ResponseCode_WARNING, nil 
+  case "AUTH_FAILED": return ResponseCode_AUTH_FAILED, nil 
+  case "JOB_UPDATING_ERROR": return ResponseCode_JOB_UPDATING_ERROR, nil 
+  case "ERROR_TRANSIENT": return ResponseCode_ERROR_TRANSIENT, nil 
+  }
+  return ResponseCode(0), fmt.Errorf("not a valid ResponseCode string")
+}
+
+
+func ResponseCodePtr(v ResponseCode) *ResponseCode { return &v }
+
+func (p ResponseCode) MarshalText() ([]byte, error) {
+return []byte(p.String()), nil
+}
+
+func (p *ResponseCode) UnmarshalText(text []byte) error {
+q, err := ResponseCodeFromString(string(text))
+if (err != nil) {
+return err
+}
+*p = q
+return nil
+}
+
+func (p *ResponseCode) Scan(value interface{}) error {
+v, ok := value.(int64)
+if !ok {
+return errors.New("Scan value is not int64")
+}
+*p = ResponseCode(v)
+return nil
+}
+
+func (p * ResponseCode) Value() (driver.Value, error) {
+  if p == nil {
+    return nil, nil
+  }
+return int64(*p), nil
+}
+type MaintenanceMode int64
+const (
+  MaintenanceMode_NONE MaintenanceMode = 1
+  MaintenanceMode_SCHEDULED MaintenanceMode = 2
+  MaintenanceMode_DRAINING MaintenanceMode = 3
+  MaintenanceMode_DRAINED MaintenanceMode = 4
+)
+
+func (p MaintenanceMode) String() string {
+  switch p {
+  case MaintenanceMode_NONE: return "NONE"
+  case MaintenanceMode_SCHEDULED: return "SCHEDULED"
+  case MaintenanceMode_DRAINING: return "DRAINING"
+  case MaintenanceMode_DRAINED: return "DRAINED"
+  }
+  return "<UNSET>"
+}
+
+func MaintenanceModeFromString(s string) (MaintenanceMode, error) {
+  switch s {
+  case "NONE": return MaintenanceMode_NONE, nil 
+  case "SCHEDULED": return MaintenanceMode_SCHEDULED, nil 
+  case "DRAINING": return MaintenanceMode_DRAINING, nil 
+  case "DRAINED": return MaintenanceMode_DRAINED, nil 
+  }
+  return MaintenanceMode(0), fmt.Errorf("not a valid MaintenanceMode string")
+}
+
+
+func MaintenanceModePtr(v MaintenanceMode) *MaintenanceMode { return &v }
+
+func (p MaintenanceMode) MarshalText() ([]byte, error) {
+return []byte(p.String()), nil
+}
+
+func (p *MaintenanceMode) UnmarshalText(text []byte) error {
+q, err := MaintenanceModeFromString(string(text))
+if (err != nil) {
+return err
+}
+*p = q
+return nil
+}
+
+func (p *MaintenanceMode) Scan(value interface{}) error {
+v, ok := value.(int64)
+if !ok {
+return errors.New("Scan value is not int64")
+}
+*p = MaintenanceMode(v)
+return nil
+}
+
+func (p * MaintenanceMode) Value() (driver.Value, error) {
+  if p == nil {
+    return nil, nil
+  }
+return int64(*p), nil
+}
+//The mode for a volume mount
+type Mode int64
+const (
+  Mode_RW Mode = 1
+  Mode_RO Mode = 2
+)
+
+func (p Mode) String() string {
+  switch p {
+  case Mode_RW: return "RW"
+  case Mode_RO: return "RO"
+  }
+  return "<UNSET>"
+}
+
+func ModeFromString(s string) (Mode, error) {
+  switch s {
+  case "RW": return Mode_RW, nil 
+  case "RO": return Mode_RO, nil 
+  }
+  return Mode(0), fmt.Errorf("not a valid Mode string")
+}
+
+
+func ModePtr(v Mode) *Mode { return &v }
+
+func (p Mode) MarshalText() ([]byte, error) {
+return []byte(p.String()), nil
+}
+
+func (p *Mode) UnmarshalText(text []byte) error {
+q, err := ModeFromString(string(text))
+if (err != nil) {
+return err
+}
+*p = q
+return nil
+}
+
+func (p *Mode) Scan(value interface{}) error {
+v, ok := value.(int64)
+if !ok {
+return errors.New("Scan value is not int64")
+}
+*p = Mode(v)
+return nil
+}
+
+func (p * Mode) Value() (driver.Value, error) {
+  if p == nil {
+    return nil, nil
+  }
+return int64(*p), nil
+}
+//Defines the policy for launching a new cron job when one is already running.
+type CronCollisionPolicy int64
+const (
+  CronCollisionPolicy_KILL_EXISTING CronCollisionPolicy = 0
+  CronCollisionPolicy_CANCEL_NEW CronCollisionPolicy = 1
+  CronCollisionPolicy_RUN_OVERLAP CronCollisionPolicy = 2
+)
+
+func (p CronCollisionPolicy) String() string {
+  switch p {
+  case CronCollisionPolicy_KILL_EXISTING: return "KILL_EXISTING"
+  case CronCollisionPolicy_CANCEL_NEW: return "CANCEL_NEW"
+  case CronCollisionPolicy_RUN_OVERLAP: return "RUN_OVERLAP"
+  }
+  return "<UNSET>"
+}
+
+func CronCollisionPolicyFromString(s string) (CronCollisionPolicy, error) {
+  switch s {
+  case "KILL_EXISTING": return CronCollisionPolicy_KILL_EXISTING, nil 
+  case "CANCEL_NEW": return CronCollisionPolicy_CANCEL_NEW, nil 
+  case "RUN_OVERLAP": return CronCollisionPolicy_RUN_OVERLAP, nil 
+  }
+  return CronCollisionPolicy(0), fmt.Errorf("not a valid CronCollisionPolicy string")
+}
+
+
+func CronCollisionPolicyPtr(v CronCollisionPolicy) *CronCollisionPolicy { return &v }
+
+func (p CronCollisionPolicy) MarshalText() ([]byte, error) {
+return []byte(p.String()), nil
+}
+
+func (p *CronCollisionPolicy) UnmarshalText(text []byte) error {
+q, err := CronCollisionPolicyFromString(string(text))
+if (err != nil) {
+return err
+}
+*p = q
+return nil
+}
+
+func (p *CronCollisionPolicy) Scan(value interface{}) error {
+v, ok := value.(int64)
+if !ok {
+return errors.New("Scan value is not int64")
+}
+*p = CronCollisionPolicy(v)
+return nil
+}
+
+func (p * CronCollisionPolicy) Value() (driver.Value, error) {
+  if p == nil {
+    return nil, nil
+  }
+return int64(*p), nil
+}
+//States that a task may be in.
+type ScheduleStatus int64
+const (
+  ScheduleStatus_INIT ScheduleStatus = 11
+  ScheduleStatus_THROTTLED ScheduleStatus = 16
+  ScheduleStatus_PENDING ScheduleStatus = 0
+  ScheduleStatus_ASSIGNED ScheduleStatus = 9
+  ScheduleStatus_STARTING ScheduleStatus = 1
+  ScheduleStatus_RUNNING ScheduleStatus = 2
+  ScheduleStatus_FINISHED ScheduleStatus = 3
+  ScheduleStatus_PREEMPTING ScheduleStatus = 13
+  ScheduleStatus_RESTARTING ScheduleStatus = 12
+  ScheduleStatus_DRAINING ScheduleStatus = 17
+  ScheduleStatus_FAILED ScheduleStatus = 4
+  ScheduleStatus_KILLED ScheduleStatus = 5
+  ScheduleStatus_KILLING ScheduleStatus = 6
+  ScheduleStatus_LOST ScheduleStatus = 7
+  ScheduleStatus_PARTITIONED ScheduleStatus = 18
+)
+
+func (p ScheduleStatus) String() string {
+  switch p {
+  case ScheduleStatus_INIT: return "INIT"
+  case ScheduleStatus_THROTTLED: return "THROTTLED"
+  case ScheduleStatus_PENDING: return "PENDING"
+  case ScheduleStatus_ASSIGNED: return "ASSIGNED"
+  case ScheduleStatus_STARTING: return "STARTING"
+  case ScheduleStatus_RUNNING: return "RUNNING"
+  case ScheduleStatus_FINISHED: return "FINISHED"
+  case ScheduleStatus_PREEMPTING: return "PREEMPTING"
+  case ScheduleStatus_RESTARTING: return "RESTARTING"
+  case ScheduleStatus_DRAINING: return "DRAINING"
+  case ScheduleStatus_FAILED: return "FAILED"
+  case ScheduleStatus_KILLED: return "KILLED"
+  case ScheduleStatus_KILLING: return "KILLING"
+  case ScheduleStatus_LOST: return "LOST"
+  case ScheduleStatus_PARTITIONED: return "PARTITIONED"
+  }
+  return "<UNSET>"
+}
+
+func ScheduleStatusFromString(s string) (ScheduleStatus, error) {
+  switch s {
+  case "INIT": return ScheduleStatus_INIT, nil 
+  case "THROTTLED": return ScheduleStatus_THROTTLED, nil 
+  case "PENDING": return ScheduleStatus_PENDING, nil 
+  case "ASSIGNED": return ScheduleStatus_ASSIGNED, nil 
+  case "STARTING": return ScheduleStatus_STARTING, nil 
+  case "RUNNING": return ScheduleStatus_RUNNING, nil 
+  case "FINISHED": return ScheduleStatus_FINISHED, nil 
+  case "PREEMPTING": return ScheduleStatus_PREEMPTING, nil 
+  case "RESTARTING": return ScheduleStatus_RESTARTING, nil 
+  case "DRAINING": return ScheduleStatus_DRAINING, nil 
+  case "FAILED": return ScheduleStatus_FAILED, nil 
+  case "KILLED": return ScheduleStatus_KILLED, nil 
+  case "KILLING": return ScheduleStatus_KILLING, nil 
+  case "LOST": return ScheduleStatus_LOST, nil 
+  case "PARTITIONED": return ScheduleStatus_PARTITIONED, nil 
+  }
+  return ScheduleStatus(0), fmt.Errorf("not a valid ScheduleStatus string")
+}
+
+
+func ScheduleStatusPtr(v ScheduleStatus) *ScheduleStatus { return &v }
+
+func (p ScheduleStatus) MarshalText() ([]byte, error) {
+return []byte(p.String()), nil
+}
+
+func (p *ScheduleStatus) UnmarshalText(text []byte) error {
+q, err := ScheduleStatusFromString(string(text))
+if (err != nil) {
+return err
+}
+*p = q
+return nil
+}
+
+func (p *ScheduleStatus) Scan(value interface{}) error {
+v, ok := value.(int64)
+if !ok {
+return errors.New("Scan value is not int64")
+}
+*p = ScheduleStatus(v)
+return nil
+}
+
+func (p * ScheduleStatus) Value() (driver.Value, error) {
+  if p == nil {
+    return nil, nil
+  }
+return int64(*p), nil
+}
+//States that a job update may be in.
+type JobUpdateStatus int64
+const (
+  JobUpdateStatus_ROLLING_FORWARD JobUpdateStatus = 0
+  JobUpdateStatus_ROLLING_BACK JobUpdateStatus = 1
+  JobUpdateStatus_ROLL_FORWARD_PAUSED JobUpdateStatus = 2
+  JobUpdateStatus_ROLL_BACK_PAUSED JobUpdateStatus = 3
+  JobUpdateStatus_ROLLED_FORWARD JobUpdateStatus = 4
+  JobUpdateStatus_ROLLED_BACK JobUpdateStatus = 5
+  JobUpdateStatus_ABORTED JobUpdateStatus = 6
+  JobUpdateStatus_ERROR JobUpdateStatus = 7
+  JobUpdateStatus_FAILED JobUpdateStatus = 8
+  JobUpdateStatus_ROLL_FORWARD_AWAITING_PULSE JobUpdateStatus = 9
+  JobUpdateStatus_ROLL_BACK_AWAITING_PULSE JobUpdateStatus = 10
+)
+
+func (p JobUpdateStatus) String() string {
+  switch p {
+  case JobUpdateStatus_ROLLING_FORWARD: return "ROLLING_FORWARD"
+  case JobUpdateStatus_ROLLING_BACK: return "ROLLING_BACK"
+  case JobUpdateStatus_ROLL_FORWARD_PAUSED: return "ROLL_FORWARD_PAUSED"
+  case JobUpdateStatus_ROLL_BACK_PAUSED: return "ROLL_BACK_PAUSED"
+  case JobUpdateStatus_ROLLED_FORWARD: return "ROLLED_FORWARD"
+  case JobUpdateStatus_ROLLED_BACK: return "ROLLED_BACK"
+  case JobUpdateStatus_ABORTED: return "ABORTED"
+  case JobUpdateStatus_ERROR: return "ERROR"
+  case JobUpdateStatus_FAILED: return "FAILED"
+  case JobUpdateStatus_ROLL_FORWARD_AWAITING_PULSE: return "ROLL_FORWARD_AWAITING_PULSE"
+  case JobUpdateStatus_ROLL_BACK_AWAITING_PULSE: return "ROLL_BACK_AWAITING_PULSE"
+  }
+  return "<UNSET>"
+}
+
+func JobUpdateStatusFromString(s string) (JobUpdateStatus, error) {
+  switch s {
+  case "ROLLING_FORWARD": return JobUpdateStatus_ROLLING_FORWARD, nil 
+  case "ROLLING_BACK": return JobUpdateStatus_ROLLING_BACK, nil 
+  case "ROLL_FORWARD_PAUSED": return JobUpdateStatus_ROLL_FORWARD_PAUSED, nil 
+  case "ROLL_BACK_PAUSED": return JobUpdateStatus_ROLL_BACK_PAUSED, nil 
+  case "ROLLED_FORWARD": return JobUpdateStatus_ROLLED_FORWARD, nil 
+  case "ROLLED_BACK": return JobUpdateStatus_ROLLED_BACK, nil 
+  case "ABORTED": return JobUpdateStatus_ABORTED, nil 
+  case "ERROR": return JobUpdateStatus_ERROR, nil 
+  case "FAILED": return JobUpdateStatus_FAILED, nil 
+  case "ROLL_FORWARD_AWAITING_PULSE": return JobUpdateStatus_ROLL_FORWARD_AWAITING_PULSE, nil 
+  case "ROLL_BACK_AWAITING_PULSE": return JobUpdateStatus_ROLL_BACK_AWAITING_PULSE, nil 
+  }
+  return JobUpdateStatus(0), fmt.Errorf("not a valid JobUpdateStatus string")
+}
+
+
+func JobUpdateStatusPtr(v JobUpdateStatus) *JobUpdateStatus { return &v }
+
+func (p JobUpdateStatus) MarshalText() ([]byte, error) {
+return []byte(p.String()), nil
+}
+
+func (p *JobUpdateStatus) UnmarshalText(text []byte) error {
+q, err := JobUpdateStatusFromString(string(text))
+if (err != nil) {
+return err
+}
+*p = q
+return nil
+}
+
+func (p *JobUpdateStatus) Scan(value interface{}) error {
+v, ok := value.(int64)
+if !ok {
+return errors.New("Scan value is not int64")
+}
+*p = JobUpdateStatus(v)
+return nil
+}
+
+func (p * JobUpdateStatus) Value() (driver.Value, error) {
+  if p == nil {
+    return nil, nil
+  }
+return int64(*p), nil
+}
+//Job update actions that can be applied to job instances.
+type JobUpdateAction int64
+const (
+  JobUpdateAction_INSTANCE_UPDATED JobUpdateAction = 1
+  JobUpdateAction_INSTANCE_ROLLED_BACK JobUpdateAction = 2
+  JobUpdateAction_INSTANCE_UPDATING JobUpdateAction = 3
+  JobUpdateAction_INSTANCE_ROLLING_BACK JobUpdateAction = 4
+  JobUpdateAction_INSTANCE_UPDATE_FAILED JobUpdateAction = 5
+  JobUpdateAction_INSTANCE_ROLLBACK_FAILED JobUpdateAction = 6
+)
+
+func (p JobUpdateAction) String() string {
+  switch p {
+  case JobUpdateAction_INSTANCE_UPDATED: return "INSTANCE_UPDATED"
+  case JobUpdateAction_INSTANCE_ROLLED_BACK: return "INSTANCE_ROLLED_BACK"
+  case JobUpdateAction_INSTANCE_UPDATING: return "INSTANCE_UPDATING"
+  case JobUpdateAction_INSTANCE_ROLLING_BACK: return "INSTANCE_ROLLING_BACK"
+  case JobUpdateAction_INSTANCE_UPDATE_FAILED: return "INSTANCE_UPDATE_FAILED"
+  case JobUpdateAction_INSTANCE_ROLLBACK_FAILED: return "INSTANCE_ROLLBACK_FAILED"
+  }
+  return "<UNSET>"
+}
+
+func JobUpdateActionFromString(s string) (JobUpdateAction, error) {
+  switch s {
+  case "INSTANCE_UPDATED": return JobUpdateAction_INSTANCE_UPDATED, nil 
+  case "INSTANCE_ROLLED_BACK": return JobUpdateAction_INSTANCE_ROLLED_BACK, nil 
+  case "INSTANCE_UPDATING": return JobUpdateAction_INSTANCE_UPDATING, nil 
+  case "INSTANCE_ROLLING_BACK": return JobUpdateAction_INSTANCE_ROLLING_BACK, nil 
+  case "INSTANCE_UPDATE_FAILED": return JobUpdateAction_INSTANCE_UPDATE_FAILED, nil 
+  case "INSTANCE_ROLLBACK_FAILED": return JobUpdateAction_INSTANCE_ROLLBACK_FAILED, nil 
+  }
+  return JobUpdateAction(0), fmt.Errorf("not a valid JobUpdateAction string")
+}
+
+
+func JobUpdateActionPtr(v JobUpdateAction) *JobUpdateAction { return &v }
+
+func (p JobUpdateAction) MarshalText() ([]byte, error) {
+return []byte(p.String()), nil
+}
+
+func (p *JobUpdateAction) UnmarshalText(text []byte) error {
+q, err := JobUpdateActionFromString(string(text))
+if (err != nil) {
+return err
+}
+*p = q
+return nil
+}
+
+func (p *JobUpdateAction) Scan(value interface{}) error {
+v, ok := value.(int64)
+if !ok {
+return errors.New("Scan value is not int64")
+}
+*p = JobUpdateAction(v)
+return nil
+}
+
+func (p * JobUpdateAction) Value() (driver.Value, error) {
+  if p == nil {
+    return nil, nil
+  }
+return int64(*p), nil
+}
+//Status of the coordinated update. Intended as a response to pulseJobUpdate RPC.
+type JobUpdatePulseStatus int64
+const (
+  JobUpdatePulseStatus_OK JobUpdatePulseStatus = 1
+  JobUpdatePulseStatus_FINISHED JobUpdatePulseStatus = 2
+)
+
+func (p JobUpdatePulseStatus) String() string {
+  switch p {
+  case JobUpdatePulseStatus_OK: return "OK"
+  case JobUpdatePulseStatus_FINISHED: return "FINISHED"
+  }
+  return "<UNSET>"
+}
+
+func JobUpdatePulseStatusFromString(s string) (JobUpdatePulseStatus, error) {
+  switch s {
+  case "OK": return JobUpdatePulseStatus_OK, nil 
+  case "FINISHED": return JobUpdatePulseStatus_FINISHED, nil 
+  }
+  return JobUpdatePulseStatus(0), fmt.Errorf("not a valid JobUpdatePulseStatus string")
+}
+
+
+func JobUpdatePulseStatusPtr(v JobUpdatePulseStatus) *JobUpdatePulseStatus { return &v }
+
+func (p JobUpdatePulseStatus) MarshalText() ([]byte, error) {
+return []byte(p.String()), nil
+}
+
+func (p *JobUpdatePulseStatus) UnmarshalText(text []byte) error {
+q, err := JobUpdatePulseStatusFromString(string(text))
+if (err != nil) {
+return err
+}
+*p = q
+return nil
+}
+
+func (p *JobUpdatePulseStatus) Scan(value interface{}) error {
+v, ok := value.(int64)
+if !ok {
+return errors.New("Scan value is not int64")
+}
+*p = JobUpdatePulseStatus(v)
+return nil
+}
+
+func (p * JobUpdatePulseStatus) Value() (driver.Value, error) {
+  if p == nil {
+    return nil, nil
+  }
+return int64(*p), nil
+}
+// Attributes:
+//  - User
+type Identity struct {
+  // unused field # 1
+  User string `thrift:"user,2" db:"user" json:"user"`
+}
+
+func NewIdentity() *Identity {
+  return &Identity{}
+}
+
+
+func (p *Identity) GetUser() string {
+  return p.User
+}
+func (p *Identity) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Identity)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.User = v
+}
+  return nil
+}
+
+func (p *Identity) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Identity"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Identity) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("user", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:user: ", p), err) }
+  if err := oprot.WriteString(string(p.User)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.user (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:user: ", p), err) }
+  return err
+}
+
+func (p *Identity) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Identity(%+v)", *p)
+}
+
+// A single host attribute.
+// 
+// Attributes:
+//  - Name
+//  - Values
+type Attribute struct {
+  Name string `thrift:"name,1" db:"name" json:"name"`
+  Values []string `thrift:"values,2" db:"values" json:"values"`
+}
+
+func NewAttribute() *Attribute {
+  return &Attribute{}
+}
+
+
+func (p *Attribute) GetName() string {
+  return p.Name
+}
+
+func (p *Attribute) GetValues() []string {
+  return p.Values
+}
+func (p *Attribute) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Attribute)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *Attribute)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]string, 0, size)
+  p.Values =  tSet
+  for i := 0; i < size; i ++ {
+var _elem0 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem0 = v
+}
+    p.Values = append(p.Values, _elem0)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *Attribute) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Attribute"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Attribute) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err) }
+  return err
+}
+
+func (p *Attribute) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("values", thrift.SET, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:values: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRING, len(p.Values)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Values); i++ {
+    for j := i+1; j<len(p.Values); j++ {
+      if reflect.DeepEqual(p.Values[i],p.Values[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Values[i]))
+      }
+    }
+  }
+  for _, v := range p.Values {
+    if err := oprot.WriteString(string(v)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:values: ", p), err) }
+  return err
+}
+
+func (p *Attribute) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Attribute(%+v)", *p)
+}
+
+// The attributes assigned to a host.
+// 
+// Attributes:
+//  - Host
+//  - Attributes
+//  - Mode
+//  - SlaveId
+type HostAttributes struct {
+  Host string `thrift:"host,1" db:"host" json:"host"`
+  Attributes []*Attribute `thrift:"attributes,2" db:"attributes" json:"attributes"`
+  Mode *MaintenanceMode `thrift:"mode,3" db:"mode" json:"mode,omitempty"`
+  SlaveId *string `thrift:"slaveId,4" db:"slaveId" json:"slaveId,omitempty"`
+}
+
+func NewHostAttributes() *HostAttributes {
+  return &HostAttributes{}
+}
+
+
+func (p *HostAttributes) GetHost() string {
+  return p.Host
+}
+
+func (p *HostAttributes) GetAttributes() []*Attribute {
+  return p.Attributes
+}
+var HostAttributes_Mode_DEFAULT MaintenanceMode
+func (p *HostAttributes) GetMode() MaintenanceMode {
+  if !p.IsSetMode() {
+    return HostAttributes_Mode_DEFAULT
+  }
+return *p.Mode
+}
+var HostAttributes_SlaveId_DEFAULT string
+func (p *HostAttributes) GetSlaveId() string {
+  if !p.IsSetSlaveId() {
+    return HostAttributes_SlaveId_DEFAULT
+  }
+return *p.SlaveId
+}
+func (p *HostAttributes) IsSetMode() bool {
+  return p.Mode != nil
+}
+
+func (p *HostAttributes) IsSetSlaveId() bool {
+  return p.SlaveId != nil
+}
+
+func (p *HostAttributes) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *HostAttributes)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Host = v
+}
+  return nil
+}
+
+func (p *HostAttributes)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Attribute, 0, size)
+  p.Attributes =  tSet
+  for i := 0; i < size; i ++ {
+    _elem1 := &Attribute{}
+    if err := _elem1.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem1), err)
+    }
+    p.Attributes = append(p.Attributes, _elem1)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *HostAttributes)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  temp := MaintenanceMode(v)
+  p.Mode = &temp
+}
+  return nil
+}
+
+func (p *HostAttributes)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.SlaveId = &v
+}
+  return nil
+}
+
+func (p *HostAttributes) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("HostAttributes"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *HostAttributes) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("host", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:host: ", p), err) }
+  if err := oprot.WriteString(string(p.Host)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.host (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:host: ", p), err) }
+  return err
+}
+
+func (p *HostAttributes) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("attributes", thrift.SET, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:attributes: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Attributes)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Attributes); i++ {
+    for j := i+1; j<len(p.Attributes); j++ {
+      if reflect.DeepEqual(p.Attributes[i],p.Attributes[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Attributes[i]))
+      }
+    }
+  }
+  for _, v := range p.Attributes {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:attributes: ", p), err) }
+  return err
+}
+
+func (p *HostAttributes) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMode() {
+    if err := oprot.WriteFieldBegin("mode", thrift.I32, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:mode: ", p), err) }
+    if err := oprot.WriteI32(int32(*p.Mode)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.mode (3) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:mode: ", p), err) }
+  }
+  return err
+}
+
+func (p *HostAttributes) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSlaveId() {
+    if err := oprot.WriteFieldBegin("slaveId", thrift.STRING, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:slaveId: ", p), err) }
+    if err := oprot.WriteString(string(*p.SlaveId)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.slaveId (4) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:slaveId: ", p), err) }
+  }
+  return err
+}
+
+func (p *HostAttributes) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("HostAttributes(%+v)", *p)
+}
+
+// A constraint that specifies an explicit set of values, at least one of which must be present
+// on a host for a task to be scheduled there.
+// 
+// Attributes:
+//  - Negated: If true, treat this as a 'not' - to avoid specific values.
+//  - Values
+type ValueConstraint struct {
+  Negated bool `thrift:"negated,1" db:"negated" json:"negated"`
+  Values []string `thrift:"values,2" db:"values" json:"values"`
+}
+
+func NewValueConstraint() *ValueConstraint {
+  return &ValueConstraint{}
+}
+
+
+func (p *ValueConstraint) GetNegated() bool {
+  return p.Negated
+}
+
+func (p *ValueConstraint) GetValues() []string {
+  return p.Values
+}
+func (p *ValueConstraint) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ValueConstraint)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Negated = v
+}
+  return nil
+}
+
+func (p *ValueConstraint)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]string, 0, size)
+  p.Values =  tSet
+  for i := 0; i < size; i ++ {
+var _elem2 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem2 = v
+}
+    p.Values = append(p.Values, _elem2)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *ValueConstraint) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ValueConstraint"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ValueConstraint) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("negated", thrift.BOOL, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:negated: ", p), err) }
+  if err := oprot.WriteBool(bool(p.Negated)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.negated (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:negated: ", p), err) }
+  return err
+}
+
+func (p *ValueConstraint) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("values", thrift.SET, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:values: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRING, len(p.Values)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Values); i++ {
+    for j := i+1; j<len(p.Values); j++ {
+      if reflect.DeepEqual(p.Values[i],p.Values[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Values[i]))
+      }
+    }
+  }
+  for _, v := range p.Values {
+    if err := oprot.WriteString(string(v)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:values: ", p), err) }
+  return err
+}
+
+func (p *ValueConstraint) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ValueConstraint(%+v)", *p)
+}
+
+// A constraint the specifies the maximum number of active tasks on a host with a matching
+// attribute that may be scheduled simultaneously.
+// 
+// Attributes:
+//  - Limit
+type LimitConstraint struct {
+  Limit int32 `thrift:"limit,1" db:"limit" json:"limit"`
+}
+
+func NewLimitConstraint() *LimitConstraint {
+  return &LimitConstraint{}
+}
+
+
+func (p *LimitConstraint) GetLimit() int32 {
+  return p.Limit
+}
+func (p *LimitConstraint) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *LimitConstraint)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Limit = v
+}
+  return nil
+}
+
+func (p *LimitConstraint) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("LimitConstraint"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *LimitConstraint) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("limit", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:limit: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Limit)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.limit (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:limit: ", p), err) }
+  return err
+}
+
+func (p *LimitConstraint) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("LimitConstraint(%+v)", *p)
+}
+
+// Types of constraints that may be applied to a task.
+// 
+// Attributes:
+//  - Value
+//  - Limit
+type TaskConstraint struct {
+  Value *ValueConstraint `thrift:"value,1" db:"value" json:"value,omitempty"`
+  Limit *LimitConstraint `thrift:"limit,2" db:"limit" json:"limit,omitempty"`
+}
+
+func NewTaskConstraint() *TaskConstraint {
+  return &TaskConstraint{}
+}
+
+var TaskConstraint_Value_DEFAULT *ValueConstraint
+func (p *TaskConstraint) GetValue() *ValueConstraint {
+  if !p.IsSetValue() {
+    return TaskConstraint_Value_DEFAULT
+  }
+return p.Value
+}
+var TaskConstraint_Limit_DEFAULT *LimitConstraint
+func (p *TaskConstraint) GetLimit() *LimitConstraint {
+  if !p.IsSetLimit() {
+    return TaskConstraint_Limit_DEFAULT
+  }
+return p.Limit
+}
+func (p *TaskConstraint) CountSetFieldsTaskConstraint() int {
+  count := 0
+  if (p.IsSetValue()) {
+    count++
+  }
+  if (p.IsSetLimit()) {
+    count++
+  }
+  return count
+
+}
+
+func (p *TaskConstraint) IsSetValue() bool {
+  return p.Value != nil
+}
+
+func (p *TaskConstraint) IsSetLimit() bool {
+  return p.Limit != nil
+}
+
+func (p *TaskConstraint) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *TaskConstraint)  ReadField1(iprot thrift.TProtocol) error {
+  p.Value = &ValueConstraint{}
+  if err := p.Value.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Value), err)
+  }
+  return nil
+}
+
+func (p *TaskConstraint)  ReadField2(iprot thrift.TProtocol) error {
+  p.Limit = &LimitConstraint{}
+  if err := p.Limit.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Limit), err)
+  }
+  return nil
+}
+
+func (p *TaskConstraint) Write(oprot thrift.TProtocol) error {
+  if c := p.CountSetFieldsTaskConstraint(); c != 1 {
+    return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
+  }
+  if err := oprot.WriteStructBegin("TaskConstraint"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *TaskConstraint) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetValue() {
+    if err := oprot.WriteFieldBegin("value", thrift.STRUCT, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:value: ", p), err) }
+    if err := p.Value.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Value), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:value: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConstraint) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetLimit() {
+    if err := oprot.WriteFieldBegin("limit", thrift.STRUCT, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:limit: ", p), err) }
+    if err := p.Limit.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Limit), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:limit: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConstraint) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("TaskConstraint(%+v)", *p)
+}
+
+// A constraint that defines whether a task may be scheduled on a host.
+// 
+// Attributes:
+//  - Name: Mesos slave attribute that the constraint is matched against.
+//  - Constraint
+type Constraint struct {
+  Name string `thrift:"name,1" db:"name" json:"name"`
+  Constraint *TaskConstraint `thrift:"constraint,2" db:"constraint" json:"constraint"`
+}
+
+func NewConstraint() *Constraint {
+  return &Constraint{}
+}
+
+
+func (p *Constraint) GetName() string {
+  return p.Name
+}
+var Constraint_Constraint_DEFAULT *TaskConstraint
+func (p *Constraint) GetConstraint() *TaskConstraint {
+  if !p.IsSetConstraint() {
+    return Constraint_Constraint_DEFAULT
+  }
+return p.Constraint
+}
+func (p *Constraint) IsSetConstraint() bool {
+  return p.Constraint != nil
+}
+
+func (p *Constraint) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Constraint)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *Constraint)  ReadField2(iprot thrift.TProtocol) error {
+  p.Constraint = &TaskConstraint{}
+  if err := p.Constraint.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Constraint), err)
+  }
+  return nil
+}
+
+func (p *Constraint) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Constraint"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Constraint) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err) }
+  return err
+}
+
+func (p *Constraint) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("constraint", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:constraint: ", p), err) }
+  if err := p.Constraint.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Constraint), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:constraint: ", p), err) }
+  return err
+}
+
+func (p *Constraint) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Constraint(%+v)", *p)
+}
+
+// Attributes:
+//  - Role
+//  - Name
+//  - Version
+type Package struct {
+  Role string `thrift:"role,1" db:"role" json:"role"`
+  Name string `thrift:"name,2" db:"name" json:"name"`
+  Version int32 `thrift:"version,3" db:"version" json:"version"`
+}
+
+func NewPackage() *Package {
+  return &Package{}
+}
+
+
+func (p *Package) GetRole() string {
+  return p.Role
+}
+
+func (p *Package) GetName() string {
+  return p.Name
+}
+
+func (p *Package) GetVersion() int32 {
+  return p.Version
+}
+func (p *Package) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Package)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Role = v
+}
+  return nil
+}
+
+func (p *Package)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *Package)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.Version = v
+}
+  return nil
+}
+
+func (p *Package) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Package"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Package) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("role", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:role: ", p), err) }
+  if err := oprot.WriteString(string(p.Role)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.role (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:role: ", p), err) }
+  return err
+}
+
+func (p *Package) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:name: ", p), err) }
+  return err
+}
+
+func (p *Package) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("version", thrift.I32, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:version: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Version)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.version (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:version: ", p), err) }
+  return err
+}
+
+func (p *Package) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Package(%+v)", *p)
+}
+
+// Arbitrary key-value metadata to be included into TaskConfig.
+// 
+// Attributes:
+//  - Key
+//  - Value
+type Metadata struct {
+  Key string `thrift:"key,1" db:"key" json:"key"`
+  Value string `thrift:"value,2" db:"value" json:"value"`
+}
+
+func NewMetadata() *Metadata {
+  return &Metadata{}
+}
+
+
+func (p *Metadata) GetKey() string {
+  return p.Key
+}
+
+func (p *Metadata) GetValue() string {
+  return p.Value
+}
+func (p *Metadata) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Metadata)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Key = v
+}
+  return nil
+}
+
+func (p *Metadata)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Value = v
+}
+  return nil
+}
+
+func (p *Metadata) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Metadata"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Metadata) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := oprot.WriteString(string(p.Key)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.key (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *Metadata) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("value", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:value: ", p), err) }
+  if err := oprot.WriteString(string(p.Value)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.value (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:value: ", p), err) }
+  return err
+}
+
+func (p *Metadata) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Metadata(%+v)", *p)
+}
+
+// A unique identifier for a Job.
+// 
+// Attributes:
+//  - Role: User role (Unix service account), for example "mesos"
+//  - Environment: Environment, for example "devel"
+//  - Name: Name, for example "labrat"
+type JobKey struct {
+  Role string `thrift:"role,1" db:"role" json:"role"`
+  Environment string `thrift:"environment,2" db:"environment" json:"environment"`
+  Name string `thrift:"name,3" db:"name" json:"name"`
+}
+
+func NewJobKey() *JobKey {
+  return &JobKey{}
+}
+
+
+func (p *JobKey) GetRole() string {
+  return p.Role
+}
+
+func (p *JobKey) GetEnvironment() string {
+  return p.Environment
+}
+
+func (p *JobKey) GetName() string {
+  return p.Name
+}
+func (p *JobKey) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobKey)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Role = v
+}
+  return nil
+}
+
+func (p *JobKey)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Environment = v
+}
+  return nil
+}
+
+func (p *JobKey)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *JobKey) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobKey"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobKey) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("role", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:role: ", p), err) }
+  if err := oprot.WriteString(string(p.Role)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.role (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:role: ", p), err) }
+  return err
+}
+
+func (p *JobKey) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("environment", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:environment: ", p), err) }
+  if err := oprot.WriteString(string(p.Environment)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.environment (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:environment: ", p), err) }
+  return err
+}
+
+func (p *JobKey) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:name: ", p), err) }
+  return err
+}
+
+func (p *JobKey) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobKey(%+v)", *p)
+}
+
+// A unique lock key.
+// 
+// Attributes:
+//  - Job
+type LockKey struct {
+  Job *JobKey `thrift:"job,1" db:"job" json:"job,omitempty"`
+}
+
+func NewLockKey() *LockKey {
+  return &LockKey{}
+}
+
+var LockKey_Job_DEFAULT *JobKey
+func (p *LockKey) GetJob() *JobKey {
+  if !p.IsSetJob() {
+    return LockKey_Job_DEFAULT
+  }
+return p.Job
+}
+func (p *LockKey) CountSetFieldsLockKey() int {
+  count := 0
+  if (p.IsSetJob()) {
+    count++
+  }
+  return count
+
+}
+
+func (p *LockKey) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *LockKey) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *LockKey)  ReadField1(iprot thrift.TProtocol) error {
+  p.Job = &JobKey{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *LockKey) Write(oprot thrift.TProtocol) error {
+  if c := p.CountSetFieldsLockKey(); c != 1 {
+    return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
+  }
+  if err := oprot.WriteStructBegin("LockKey"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *LockKey) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetJob() {
+    if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:job: ", p), err) }
+    if err := p.Job.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:job: ", p), err) }
+  }
+  return err
+}
+
+func (p *LockKey) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("LockKey(%+v)", *p)
+}
+
+// A generic lock struct to facilitate context specific resource/operation serialization.
+// 
+// Attributes:
+//  - Key: ID of the lock - unique per storage
+//  - Token: UUID - facilitating soft lock authorization
+//  - User: Lock creator
+//  - TimestampMs: Lock creation timestamp in milliseconds
+//  - Message: Optional message to record with the lock
+type Lock struct {
+  Key *LockKey `thrift:"key,1" db:"key" json:"key"`
+  Token string `thrift:"token,2" db:"token" json:"token"`
+  User string `thrift:"user,3" db:"user" json:"user"`
+  TimestampMs int64 `thrift:"timestampMs,4" db:"timestampMs" json:"timestampMs"`
+  Message *string `thrift:"message,5" db:"message" json:"message,omitempty"`
+}
+
+func NewLock() *Lock {
+  return &Lock{}
+}
+
+var Lock_Key_DEFAULT *LockKey
+func (p *Lock) GetKey() *LockKey {
+  if !p.IsSetKey() {
+    return Lock_Key_DEFAULT
+  }
+return p.Key
+}
+
+func (p *Lock) GetToken() string {
+  return p.Token
+}
+
+func (p *Lock) GetUser() string {
+  return p.User
+}
+
+func (p *Lock) GetTimestampMs() int64 {
+  return p.TimestampMs
+}
+var Lock_Message_DEFAULT string
+func (p *Lock) GetMessage() string {
+  if !p.IsSetMessage() {
+    return Lock_Message_DEFAULT
+  }
+return *p.Message
+}
+func (p *Lock) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *Lock) IsSetMessage() bool {
+  return p.Message != nil
+}
+
+func (p *Lock) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Lock)  ReadField1(iprot thrift.TProtocol) error {
+  p.Key = &LockKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *Lock)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Token = v
+}
+  return nil
+}
+
+func (p *Lock)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.User = v
+}
+  return nil
+}
+
+func (p *Lock)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.TimestampMs = v
+}
+  return nil
+}
+
+func (p *Lock)  ReadField5(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 5: ", err)
+} else {
+  p.Message = &v
+}
+  return nil
+}
+
+func (p *Lock) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Lock"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Lock) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *Lock) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("token", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:token: ", p), err) }
+  if err := oprot.WriteString(string(p.Token)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.token (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:token: ", p), err) }
+  return err
+}
+
+func (p *Lock) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("user", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:user: ", p), err) }
+  if err := oprot.WriteString(string(p.User)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.user (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:user: ", p), err) }
+  return err
+}
+
+func (p *Lock) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("timestampMs", thrift.I64, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:timestampMs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.TimestampMs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.timestampMs (4) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:timestampMs: ", p), err) }
+  return err
+}
+
+func (p *Lock) writeField5(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMessage() {
+    if err := oprot.WriteFieldBegin("message", thrift.STRING, 5); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:message: ", p), err) }
+    if err := oprot.WriteString(string(*p.Message)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.message (5) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:message: ", p), err) }
+  }
+  return err
+}
+
+func (p *Lock) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Lock(%+v)", *p)
+}
+
+// A unique identifier for the active task within a job.
+// 
+// Attributes:
+//  - JobKey: Key identifying the job.
+//  - InstanceId: Unique instance ID for the active task in a job.
+type InstanceKey struct {
+  JobKey *JobKey `thrift:"jobKey,1" db:"jobKey" json:"jobKey"`
+  InstanceId int32 `thrift:"instanceId,2" db:"instanceId" json:"instanceId"`
+}
+
+func NewInstanceKey() *InstanceKey {
+  return &InstanceKey{}
+}
+
+var InstanceKey_JobKey_DEFAULT *JobKey
+func (p *InstanceKey) GetJobKey() *JobKey {
+  if !p.IsSetJobKey() {
+    return InstanceKey_JobKey_DEFAULT
+  }
+return p.JobKey
+}
+
+func (p *InstanceKey) GetInstanceId() int32 {
+  return p.InstanceId
+}
+func (p *InstanceKey) IsSetJobKey() bool {
+  return p.JobKey != nil
+}
+
+func (p *InstanceKey) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *InstanceKey)  ReadField1(iprot thrift.TProtocol) error {
+  p.JobKey = &JobKey{}
+  if err := p.JobKey.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobKey), err)
+  }
+  return nil
+}
+
+func (p *InstanceKey)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.InstanceId = v
+}
+  return nil
+}
+
+func (p *InstanceKey) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("InstanceKey"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *InstanceKey) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("jobKey", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:jobKey: ", p), err) }
+  if err := p.JobKey.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobKey), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:jobKey: ", p), err) }
+  return err
+}
+
+func (p *InstanceKey) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instanceId", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instanceId: ", p), err) }
+  if err := oprot.WriteI32(int32(p.InstanceId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.instanceId (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instanceId: ", p), err) }
+  return err
+}
+
+func (p *InstanceKey) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("InstanceKey(%+v)", *p)
+}
+
+// URI which mirrors CommandInfo.URI in the Mesos Protobuf
+// 
+// Attributes:
+//  - Value: Where to get the resource from
+//  - Extract: Extract compressed archive after downloading
+//  - Cache: Cache value using Mesos Fetcher caching mechanism *
+type MesosFetcherURI struct {
+  Value string `thrift:"value,1" db:"value" json:"value"`
+  Extract *bool `thrift:"extract,2" db:"extract" json:"extract,omitempty"`
+  Cache *bool `thrift:"cache,3" db:"cache" json:"cache,omitempty"`
+}
+
+func NewMesosFetcherURI() *MesosFetcherURI {
+  return &MesosFetcherURI{}
+}
+
+
+func (p *MesosFetcherURI) GetValue() string {
+  return p.Value
+}
+var MesosFetcherURI_Extract_DEFAULT bool
+func (p *MesosFetcherURI) GetExtract() bool {
+  if !p.IsSetExtract() {
+    return MesosFetcherURI_Extract_DEFAULT
+  }
+return *p.Extract
+}
+var MesosFetcherURI_Cache_DEFAULT bool
+func (p *MesosFetcherURI) GetCache() bool {
+  if !p.IsSetCache() {
+    return MesosFetcherURI_Cache_DEFAULT
+  }
+return *p.Cache
+}
+func (p *MesosFetcherURI) IsSetExtract() bool {
+  return p.Extract != nil
+}
+
+func (p *MesosFetcherURI) IsSetCache() bool {
+  return p.Cache != nil
+}
+
+func (p *MesosFetcherURI) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *MesosFetcherURI)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Value = v
+}
+  return nil
+}
+
+func (p *MesosFetcherURI)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Extract = &v
+}
+  return nil
+}
+
+func (p *MesosFetcherURI)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.Cache = &v
+}
+  return nil
+}
+
+func (p *MesosFetcherURI) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("MesosFetcherURI"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *MesosFetcherURI) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("value", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:value: ", p), err) }
+  if err := oprot.WriteString(string(p.Value)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.value (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:value: ", p), err) }
+  return err
+}
+
+func (p *MesosFetcherURI) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetExtract() {
+    if err := oprot.WriteFieldBegin("extract", thrift.BOOL, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:extract: ", p), err) }
+    if err := oprot.WriteBool(bool(*p.Extract)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.extract (2) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:extract: ", p), err) }
+  }
+  return err
+}
+
+func (p *MesosFetcherURI) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetCache() {
+    if err := oprot.WriteFieldBegin("cache", thrift.BOOL, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:cache: ", p), err) }
+    if err := oprot.WriteBool(bool(*p.Cache)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.cache (3) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:cache: ", p), err) }
+  }
+  return err
+}
+
+func (p *MesosFetcherURI) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("MesosFetcherURI(%+v)", *p)
+}
+
+// Attributes:
+//  - Name: Name identifying the Executor.
+//  - Data: Executor configuration data.
+type ExecutorConfig struct {
+  Name string `thrift:"name,1" db:"name" json:"name"`
+  Data string `thrift:"data,2" db:"data" json:"data"`
+}
+
+func NewExecutorConfig() *ExecutorConfig {
+  return &ExecutorConfig{}
+}
+
+
+func (p *ExecutorConfig) GetName() string {
+  return p.Name
+}
+
+func (p *ExecutorConfig) GetData() string {
+  return p.Data
+}
+func (p *ExecutorConfig) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ExecutorConfig)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *ExecutorConfig)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Data = v
+}
+  return nil
+}
+
+func (p *ExecutorConfig) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ExecutorConfig"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ExecutorConfig) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err) }
+  return err
+}
+
+func (p *ExecutorConfig) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("data", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:data: ", p), err) }
+  if err := oprot.WriteString(string(p.Data)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.data (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:data: ", p), err) }
+  return err
+}
+
+func (p *ExecutorConfig) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ExecutorConfig(%+v)", *p)
+}
+
+// A volume mount point within a container
+// 
+// Attributes:
+//  - ContainerPath: The path inside the container where the mount will be created.
+//  - HostPath: The path on the host that will serve as the source for the mount.
+//  - Mode: The access mode
+type Volume struct {
+  ContainerPath string `thrift:"containerPath,1" db:"containerPath" json:"containerPath"`
+  HostPath string `thrift:"hostPath,2" db:"hostPath" json:"hostPath"`
+  Mode Mode `thrift:"mode,3" db:"mode" json:"mode"`
+}
+
+func NewVolume() *Volume {
+  return &Volume{}
+}
+
+
+func (p *Volume) GetContainerPath() string {
+  return p.ContainerPath
+}
+
+func (p *Volume) GetHostPath() string {
+  return p.HostPath
+}
+
+func (p *Volume) GetMode() Mode {
+  return p.Mode
+}
+func (p *Volume) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Volume)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.ContainerPath = v
+}
+  return nil
+}
+
+func (p *Volume)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.HostPath = v
+}
+  return nil
+}
+
+func (p *Volume)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  temp := Mode(v)
+  p.Mode = temp
+}
+  return nil
+}
+
+func (p *Volume) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Volume"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Volume) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("containerPath", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:containerPath: ", p), err) }
+  if err := oprot.WriteString(string(p.ContainerPath)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.containerPath (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:containerPath: ", p), err) }
+  return err
+}
+
+func (p *Volume) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("hostPath", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:hostPath: ", p), err) }
+  if err := oprot.WriteString(string(p.HostPath)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.hostPath (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:hostPath: ", p), err) }
+  return err
+}
+
+func (p *Volume) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("mode", thrift.I32, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:mode: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Mode)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.mode (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:mode: ", p), err) }
+  return err
+}
+
+func (p *Volume) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Volume(%+v)", *p)
+}
+
+// Describes an image for use with the Mesos unified containerizer in the Docker format
+// 
+// Attributes:
+//  - Name: The name of the image to run
+//  - Tag: The Docker tag identifying the image
+type DockerImage struct {
+  Name string `thrift:"name,1" db:"name" json:"name"`
+  Tag string `thrift:"tag,2" db:"tag" json:"tag"`
+}
+
+func NewDockerImage() *DockerImage {
+  return &DockerImage{}
+}
+
+
+func (p *DockerImage) GetName() string {
+  return p.Name
+}
+
+func (p *DockerImage) GetTag() string {
+  return p.Tag
+}
+func (p *DockerImage) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *DockerImage)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *DockerImage)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Tag = v
+}
+  return nil
+}
+
+func (p *DockerImage) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("DockerImage"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *DockerImage) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err) }
+  return err
+}
+
+func (p *DockerImage) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("tag", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:tag: ", p), err) }
+  if err := oprot.WriteString(string(p.Tag)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.tag (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:tag: ", p), err) }
+  return err
+}
+
+func (p *DockerImage) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("DockerImage(%+v)", *p)
+}
+
+// Describes an image for use with the Mesos unified containerizer in the AppC format
+// 
+// Attributes:
+//  - Name: The name of the image to run
+//  - ImageId: The appc image id identifying the image
+type AppcImage struct {
+  Name string `thrift:"name,1" db:"name" json:"name"`
+  ImageId string `thrift:"imageId,2" db:"imageId" json:"imageId"`
+}
+
+func NewAppcImage() *AppcImage {
+  return &AppcImage{}
+}
+
+
+func (p *AppcImage) GetName() string {
+  return p.Name
+}
+
+func (p *AppcImage) GetImageId() string {
+  return p.ImageId
+}
+func (p *AppcImage) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AppcImage)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *AppcImage)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.ImageId = v
+}
+  return nil
+}
+
+func (p *AppcImage) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("AppcImage"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AppcImage) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err) }
+  return err
+}
+
+func (p *AppcImage) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("imageId", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:imageId: ", p), err) }
+  if err := oprot.WriteString(string(p.ImageId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.imageId (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:imageId: ", p), err) }
+  return err
+}
+
+func (p *AppcImage) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AppcImage(%+v)", *p)
+}
+
+// Describes an image to be used with the Mesos unified containerizer
+// 
+// Attributes:
+//  - Docker
+//  - Appc
+type Image struct {
+  Docker *DockerImage `thrift:"docker,1" db:"docker" json:"docker,omitempty"`
+  Appc *AppcImage `thrift:"appc,2" db:"appc" json:"appc,omitempty"`
+}
+
+func NewImage() *Image {
+  return &Image{}
+}
+
+var Image_Docker_DEFAULT *DockerImage
+func (p *Image) GetDocker() *DockerImage {
+  if !p.IsSetDocker() {
+    return Image_Docker_DEFAULT
+  }
+return p.Docker
+}
+var Image_Appc_DEFAULT *AppcImage
+func (p *Image) GetAppc() *AppcImage {
+  if !p.IsSetAppc() {
+    return Image_Appc_DEFAULT
+  }
+return p.Appc
+}
+func (p *Image) CountSetFieldsImage() int {
+  count := 0
+  if (p.IsSetDocker()) {
+    count++
+  }
+  if (p.IsSetAppc()) {
+    count++
+  }
+  return count
+
+}
+
+func (p *Image) IsSetDocker() bool {
+  return p.Docker != nil
+}
+
+func (p *Image) IsSetAppc() bool {
+  return p.Appc != nil
+}
+
+func (p *Image) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Image)  ReadField1(iprot thrift.TProtocol) error {
+  p.Docker = &DockerImage{}
+  if err := p.Docker.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Docker), err)
+  }
+  return nil
+}
+
+func (p *Image)  ReadField2(iprot thrift.TProtocol) error {
+  p.Appc = &AppcImage{}
+  if err := p.Appc.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Appc), err)
+  }
+  return nil
+}
+
+func (p *Image) Write(oprot thrift.TProtocol) error {
+  if c := p.CountSetFieldsImage(); c != 1 {
+    return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
+  }
+  if err := oprot.WriteStructBegin("Image"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Image) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetDocker() {
+    if err := oprot.WriteFieldBegin("docker", thrift.STRUCT, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:docker: ", p), err) }
+    if err := p.Docker.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Docker), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:docker: ", p), err) }
+  }
+  return err
+}
+
+func (p *Image) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetAppc() {
+    if err := oprot.WriteFieldBegin("appc", thrift.STRUCT, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:appc: ", p), err) }
+    if err := p.Appc.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Appc), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:appc: ", p), err) }
+  }
+  return err
+}
+
+func (p *Image) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Image(%+v)", *p)
+}
+
+// Describes a mesos container, this is the default
+// 
+// Attributes:
+//  - Image: the optional filesystem image to use when launching this task.
+//  - Volumes: the optional list of volumes to mount into the task.
+type MesosContainer struct {
+  Image *Image `thrift:"image,1" db:"image" json:"image,omitempty"`
+  Volumes []*Volume `thrift:"volumes,2" db:"volumes" json:"volumes,omitempty"`
+}
+
+func NewMesosContainer() *MesosContainer {
+  return &MesosContainer{}
+}
+
+var MesosContainer_Image_DEFAULT *Image
+func (p *MesosContainer) GetImage() *Image {
+  if !p.IsSetImage() {
+    return MesosContainer_Image_DEFAULT
+  }
+return p.Image
+}
+var MesosContainer_Volumes_DEFAULT []*Volume
+
+func (p *MesosContainer) GetVolumes() []*Volume {
+  return p.Volumes
+}
+func (p *MesosContainer) IsSetImage() bool {
+  return p.Image != nil
+}
+
+func (p *MesosContainer) IsSetVolumes() bool {
+  return p.Volumes != nil
+}
+
+func (p *MesosContainer) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *MesosContainer)  ReadField1(iprot thrift.TProtocol) error {
+  p.Image = &Image{}
+  if err := p.Image.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Image), err)
+  }
+  return nil
+}
+
+func (p *MesosContainer)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*Volume, 0, size)
+  p.Volumes =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem3 := &Volume{}
+    if err := _elem3.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem3), err)
+    }
+    p.Volumes = append(p.Volumes, _elem3)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *MesosContainer) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("MesosContainer"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *MesosContainer) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetImage() {
+    if err := oprot.WriteFieldBegin("image", thrift.STRUCT, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:image: ", p), err) }
+    if err := p.Image.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Image), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:image: ", p), err) }
+  }
+  return err
+}
+
+func (p *MesosContainer) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetVolumes() {
+    if err := oprot.WriteFieldBegin("volumes", thrift.LIST, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:volumes: ", p), err) }
+    if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Volumes)); err != nil {
+      return thrift.PrependError("error writing list begin: ", err)
+    }
+    for _, v := range p.Volumes {
+      if err := v.Write(oprot); err != nil {
+        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+      }
+    }
+    if err := oprot.WriteListEnd(); err != nil {
+      return thrift.PrependError("error writing list end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:volumes: ", p), err) }
+  }
+  return err
+}
+
+func (p *MesosContainer) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("MesosContainer(%+v)", *p)
+}
+
+// Describes a parameter passed to docker cli
+// 
+// Attributes:
+//  - Name: a parameter to pass to docker. (e.g. volume)
+//  - Value: the value to pass to a parameter (e.g. /src/webapp:/opt/webapp)
+type DockerParameter struct {
+  Name string `thrift:"name,1" db:"name" json:"name"`
+  Value string `thrift:"value,2" db:"value" json:"value"`
+}
+
+func NewDockerParameter() *DockerParameter {
+  return &DockerParameter{}
+}
+
+
+func (p *DockerParameter) GetName() string {
+  return p.Name
+}
+
+func (p *DockerParameter) GetValue() string {
+  return p.Value
+}
+func (p *DockerParameter) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *DockerParameter)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *DockerParameter)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Value = v
+}
+  return nil
+}
+
+func (p *DockerParameter) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("DockerParameter"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *DockerParameter) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err) }
+  return err
+}
+
+func (p *DockerParameter) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("value", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:value: ", p), err) }
+  if err := oprot.WriteString(string(p.Value)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.value (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:value: ", p), err) }
+  return err
+}
+
+func (p *DockerParameter) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("DockerParameter(%+v)", *p)
+}
+
+// Describes a docker container
+// 
+// Attributes:
+//  - Image: The container image to be run
+//  - Parameters: The arbitrary parameters to pass to container
+type DockerContainer struct {
+  Image string `thrift:"image,1" db:"image" json:"image"`
+  Parameters []*DockerParameter `thrift:"parameters,2" db:"parameters" json:"parameters,omitempty"`
+}
+
+func NewDockerContainer() *DockerContainer {
+  return &DockerContainer{}
+}
+
+
+func (p *DockerContainer) GetImage() string {
+  return p.Image
+}
+var DockerContainer_Parameters_DEFAULT []*DockerParameter
+
+func (p *DockerContainer) GetParameters() []*DockerParameter {
+  return p.Parameters
+}
+func (p *DockerContainer) IsSetParameters() bool {
+  return p.Parameters != nil
+}
+
+func (p *DockerContainer) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *DockerContainer)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Image = v
+}
+  return nil
+}
+
+func (p *DockerContainer)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*DockerParameter, 0, size)
+  p.Parameters =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem4 := &DockerParameter{}
+    if err := _elem4.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem4), err)
+    }
+    p.Parameters = append(p.Parameters, _elem4)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *DockerContainer) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("DockerContainer"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *DockerContainer) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("image", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:image: ", p), err) }
+  if err := oprot.WriteString(string(p.Image)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.image (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:image: ", p), err) }
+  return err
+}
+
+func (p *DockerContainer) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetParameters() {
+    if err := oprot.WriteFieldBegin("parameters", thrift.LIST, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:parameters: ", p), err) }
+    if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Parameters)); err != nil {
+      return thrift.PrependError("error writing list begin: ", err)
+    }
+    for _, v := range p.Parameters {
+      if err := v.Write(oprot); err != nil {
+        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+      }
+    }
+    if err := oprot.WriteListEnd(); err != nil {
+      return thrift.PrependError("error writing list end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:parameters: ", p), err) }
+  }
+  return err
+}
+
+func (p *DockerContainer) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("DockerContainer(%+v)", *p)
+}
+
+// Describes a container to be used in a task
+// 
+// Attributes:
+//  - Mesos
+//  - Docker
+type Container struct {
+  Mesos *MesosContainer `thrift:"mesos,1" db:"mesos" json:"mesos,omitempty"`
+  Docker *DockerContainer `thrift:"docker,2" db:"docker" json:"docker,omitempty"`
+}
+
+func NewContainer() *Container {
+  return &Container{}
+}
+
+var Container_Mesos_DEFAULT *MesosContainer
+func (p *Container) GetMesos() *MesosContainer {
+  if !p.IsSetMesos() {
+    return Container_Mesos_DEFAULT
+  }
+return p.Mesos
+}
+var Container_Docker_DEFAULT *DockerContainer
+func (p *Container) GetDocker() *DockerContainer {
+  if !p.IsSetDocker() {
+    return Container_Docker_DEFAULT
+  }
+return p.Docker
+}
+func (p *Container) CountSetFieldsContainer() int {
+  count := 0
+  if (p.IsSetMesos()) {
+    count++
+  }
+  if (p.IsSetDocker()) {
+    count++
+  }
+  return count
+
+}
+
+func (p *Container) IsSetMesos() bool {
+  return p.Mesos != nil
+}
+
+func (p *Container) IsSetDocker() bool {
+  return p.Docker != nil
+}
+
+func (p *Container) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Container)  ReadField1(iprot thrift.TProtocol) error {
+  p.Mesos = &MesosContainer{}
+  if err := p.Mesos.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Mesos), err)
+  }
+  return nil
+}
+
+func (p *Container)  ReadField2(iprot thrift.TProtocol) error {
+  p.Docker = &DockerContainer{}
+  if err := p.Docker.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Docker), err)
+  }
+  return nil
+}
+
+func (p *Container) Write(oprot thrift.TProtocol) error {
+  if c := p.CountSetFieldsContainer(); c != 1 {
+    return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
+  }
+  if err := oprot.WriteStructBegin("Container"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Container) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMesos() {
+    if err := oprot.WriteFieldBegin("mesos", thrift.STRUCT, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:mesos: ", p), err) }
+    if err := p.Mesos.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Mesos), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:mesos: ", p), err) }
+  }
+  return err
+}
+
+func (p *Container) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetDocker() {
+    if err := oprot.WriteFieldBegin("docker", thrift.STRUCT, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:docker: ", p), err) }
+    if err := p.Docker.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Docker), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:docker: ", p), err) }
+  }
+  return err
+}
+
+func (p *Container) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Container(%+v)", *p)
+}
+
+// Describes resource value required to run a task.
+// 
+// Attributes:
+//  - NumCpus
+//  - RamMb
+//  - DiskMb
+//  - NamedPort
+//  - NumGpus
+type Resource struct {
+  NumCpus *float64 `thrift:"numCpus,1" db:"numCpus" json:"numCpus,omitempty"`
+  RamMb *int64 `thrift:"ramMb,2" db:"ramMb" json:"ramMb,omitempty"`
+  DiskMb *int64 `thrift:"diskMb,3" db:"diskMb" json:"diskMb,omitempty"`
+  NamedPort *string `thrift:"namedPort,4" db:"namedPort" json:"namedPort,omitempty"`
+  NumGpus *int64 `thrift:"numGpus,5" db:"numGpus" json:"numGpus,omitempty"`
+}
+
+func NewResource() *Resource {
+  return &Resource{}
+}
+
+var Resource_NumCpus_DEFAULT float64
+func (p *Resource) GetNumCpus() float64 {
+  if !p.IsSetNumCpus() {
+    return Resource_NumCpus_DEFAULT
+  }
+return *p.NumCpus
+}
+var Resource_RamMb_DEFAULT int64
+func (p *Resource) GetRamMb() int64 {
+  if !p.IsSetRamMb() {
+    return Resource_RamMb_DEFAULT
+  }
+return *p.RamMb
+}
+var Resource_DiskMb_DEFAULT int64
+func (p *Resource) GetDiskMb() int64 {
+  if !p.IsSetDiskMb() {
+    return Resource_DiskMb_DEFAULT
+  }
+return *p.DiskMb
+}
+var Resource_NamedPort_DEFAULT string
+func (p *Resource) GetNamedPort() string {
+  if !p.IsSetNamedPort() {
+    return Resource_NamedPort_DEFAULT
+  }
+return *p.NamedPort
+}
+var Resource_NumGpus_DEFAULT int64
+func (p *Resource) GetNumGpus() int64 {
+  if !p.IsSetNumGpus() {
+    return Resource_NumGpus_DEFAULT
+  }
+return *p.NumGpus
+}
+func (p *Resource) CountSetFieldsResource() int {
+  count := 0
+  if (p.IsSetNumCpus()) {
+    count++
+  }
+  if (p.IsSetRamMb()) {
+    count++
+  }
+  if (p.IsSetDiskMb()) {
+    count++
+  }
+  if (p.IsSetNamedPort()) {
+    count++
+  }
+  if (p.IsSetNumGpus()) {
+    count++
+  }
+  return count
+
+}
+
+func (p *Resource) IsSetNumCpus() bool {
+  return p.NumCpus != nil
+}
+
+func (p *Resource) IsSetRamMb() bool {
+  return p.RamMb != nil
+}
+
+func (p *Resource) IsSetDiskMb() bool {
+  return p.DiskMb != nil
+}
+
+func (p *Resource) IsSetNamedPort() bool {
+  return p.NamedPort != nil
+}
+
+func (p *Resource) IsSetNumGpus() bool {
+  return p.NumGpus != nil
+}
+
+func (p *Resource) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.DOUBLE {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Resource)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadDouble(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.NumCpus = &v
+}
+  return nil
+}
+
+func (p *Resource)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.RamMb = &v
+}
+  return nil
+}
+
+func (p *Resource)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.DiskMb = &v
+}
+  return nil
+}
+
+func (p *Resource)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.NamedPort = &v
+}
+  return nil
+}
+
+func (p *Resource)  ReadField5(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 5: ", err)
+} else {
+  p.NumGpus = &v
+}
+  return nil
+}
+
+func (p *Resource) Write(oprot thrift.TProtocol) error {
+  if c := p.CountSetFieldsResource(); c != 1 {
+    return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
+  }
+  if err := oprot.WriteStructBegin("Resource"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Resource) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetNumCpus() {
+    if err := oprot.WriteFieldBegin("numCpus", thrift.DOUBLE, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:numCpus: ", p), err) }
+    if err := oprot.WriteDouble(float64(*p.NumCpus)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.numCpus (1) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:numCpus: ", p), err) }
+  }
+  return err
+}
+
+func (p *Resource) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetRamMb() {
+    if err := oprot.WriteFieldBegin("ramMb", thrift.I64, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:ramMb: ", p), err) }
+    if err := oprot.WriteI64(int64(*p.RamMb)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.ramMb (2) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:ramMb: ", p), err) }
+  }
+  return err
+}
+
+func (p *Resource) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetDiskMb() {
+    if err := oprot.WriteFieldBegin("diskMb", thrift.I64, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:diskMb: ", p), err) }
+    if err := oprot.WriteI64(int64(*p.DiskMb)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.diskMb (3) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:diskMb: ", p), err) }
+  }
+  return err
+}
+
+func (p *Resource) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetNamedPort() {
+    if err := oprot.WriteFieldBegin("namedPort", thrift.STRING, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:namedPort: ", p), err) }
+    if err := oprot.WriteString(string(*p.NamedPort)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.namedPort (4) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:namedPort: ", p), err) }
+  }
+  return err
+}
+
+func (p *Resource) writeField5(oprot thrift.TProtocol) (err error) {
+  if p.IsSetNumGpus() {
+    if err := oprot.WriteFieldBegin("numGpus", thrift.I64, 5); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:numGpus: ", p), err) }
+    if err := oprot.WriteI64(int64(*p.NumGpus)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.numGpus (5) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:numGpus: ", p), err) }
+  }
+  return err
+}
+
+func (p *Resource) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Resource(%+v)", *p)
+}
+
+// Attributes:
+//  - Reschedule
+//  - DelaySecs
+type PartitionPolicy struct {
+  Reschedule bool `thrift:"reschedule,1" db:"reschedule" json:"reschedule"`
+  DelaySecs *int64 `thrift:"delaySecs,2" db:"delaySecs" json:"delaySecs,omitempty"`
+}
+
+func NewPartitionPolicy() *PartitionPolicy {
+  return &PartitionPolicy{}
+}
+
+
+func (p *PartitionPolicy) GetReschedule() bool {
+  return p.Reschedule
+}
+var PartitionPolicy_DelaySecs_DEFAULT int64
+func (p *PartitionPolicy) GetDelaySecs() int64 {
+  if !p.IsSetDelaySecs() {
+    return PartitionPolicy_DelaySecs_DEFAULT
+  }
+return *p.DelaySecs
+}
+func (p *PartitionPolicy) IsSetDelaySecs() bool {
+  return p.DelaySecs != nil
+}
+
+func (p *PartitionPolicy) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *PartitionPolicy)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Reschedule = v
+}
+  return nil
+}
+
+func (p *PartitionPolicy)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.DelaySecs = &v
+}
+  return nil
+}
+
+func (p *PartitionPolicy) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("PartitionPolicy"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *PartitionPolicy) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("reschedule", thrift.BOOL, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:reschedule: ", p), err) }
+  if err := oprot.WriteBool(bool(p.Reschedule)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.reschedule (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:reschedule: ", p), err) }
+  return err
+}
+
+func (p *PartitionPolicy) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetDelaySecs() {
+    if err := oprot.WriteFieldBegin("delaySecs", thrift.I64, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:delaySecs: ", p), err) }
+    if err := oprot.WriteI64(int64(*p.DelaySecs)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.delaySecs (2) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:delaySecs: ", p), err) }
+  }
+  return err
+}
+
+func (p *PartitionPolicy) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("PartitionPolicy(%+v)", *p)
+}
+
+// SLA requirements expressed as the percentage of instances to be RUNNING every durationSecs
+// 
+// Attributes:
+//  - Percentage
+//  - DurationSecs: Minimum time duration a task needs to be `RUNNING` to be treated as active
+type PercentageSlaPolicy struct {
+  Percentage float64 `thrift:"percentage,1" db:"percentage" json:"percentage"`
+  DurationSecs int64 `thrift:"durationSecs,2" db:"durationSecs" json:"durationSecs"`
+}
+
+func NewPercentageSlaPolicy() *PercentageSlaPolicy {
+  return &PercentageSlaPolicy{}
+}
+
+
+func (p *PercentageSlaPolicy) GetPercentage() float64 {
+  return p.Percentage
+}
+
+func (p *PercentageSlaPolicy) GetDurationSecs() int64 {
+  return p.DurationSecs
+}
+func (p *PercentageSlaPolicy) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.DOUBLE {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *PercentageSlaPolicy)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadDouble(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Percentage = v
+}
+  return nil
+}
+
+func (p *PercentageSlaPolicy)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.DurationSecs = v
+}
+  return nil
+}
+
+func (p *PercentageSlaPolicy) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("PercentageSlaPolicy"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *PercentageSlaPolicy) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("percentage", thrift.DOUBLE, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:percentage: ", p), err) }
+  if err := oprot.WriteDouble(float64(p.Percentage)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.percentage (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:percentage: ", p), err) }
+  return err
+}
+
+func (p *PercentageSlaPolicy) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("durationSecs", thrift.I64, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:durationSecs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.DurationSecs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.durationSecs (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:durationSecs: ", p), err) }
+  return err
+}
+
+func (p *PercentageSlaPolicy) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("PercentageSlaPolicy(%+v)", *p)
+}
+
+// SLA requirements expressed as the number of instances to be RUNNING every durationSecs
+// 
+// Attributes:
+//  - Count: The number of active instances required every `durationSecs`
+//  - DurationSecs: Minimum time duration a task needs to be `RUNNING` to be treated as active
+type CountSlaPolicy struct {
+  Count int64 `thrift:"count,1" db:"count" json:"count"`
+  DurationSecs int64 `thrift:"durationSecs,2" db:"durationSecs" json:"durationSecs"`
+}
+
+func NewCountSlaPolicy() *CountSlaPolicy {
+  return &CountSlaPolicy{}
+}
+
+
+func (p *CountSlaPolicy) GetCount() int64 {
+  return p.Count
+}
+
+func (p *CountSlaPolicy) GetDurationSecs() int64 {
+  return p.DurationSecs
+}
+func (p *CountSlaPolicy) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *CountSlaPolicy)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Count = v
+}
+  return nil
+}
+
+func (p *CountSlaPolicy)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.DurationSecs = v
+}
+  return nil
+}
+
+func (p *CountSlaPolicy) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("CountSlaPolicy"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *CountSlaPolicy) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("count", thrift.I64, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:count: ", p), err) }
+  if err := oprot.WriteI64(int64(p.Count)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.count (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:count: ", p), err) }
+  return err
+}
+
+func (p *CountSlaPolicy) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("durationSecs", thrift.I64, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:durationSecs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.DurationSecs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.durationSecs (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:durationSecs: ", p), err) }
+  return err
+}
+
+func (p *CountSlaPolicy) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("CountSlaPolicy(%+v)", *p)
+}
+
+// SLA requirements to be delegated to an external coordinator
+// 
+// Attributes:
+//  - CoordinatorUrl: URL for the coordinator service that needs to be contacted for SLA checks
+//  - StatusKey: Field in the Coordinator response json indicating if the action is allowed or not
+type CoordinatorSlaPolicy struct {
+  CoordinatorUrl string `thrift:"coordinatorUrl,1" db:"coordinatorUrl" json:"coordinatorUrl"`
+  StatusKey string `thrift:"statusKey,2" db:"statusKey" json:"statusKey"`
+}
+
+func NewCoordinatorSlaPolicy() *CoordinatorSlaPolicy {
+  return &CoordinatorSlaPolicy{}
+}
+
+
+func (p *CoordinatorSlaPolicy) GetCoordinatorUrl() string {
+  return p.CoordinatorUrl
+}
+
+func (p *CoordinatorSlaPolicy) GetStatusKey() string {
+  return p.StatusKey
+}
+func (p *CoordinatorSlaPolicy) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *CoordinatorSlaPolicy)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.CoordinatorUrl = v
+}
+  return nil
+}
+
+func (p *CoordinatorSlaPolicy)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.StatusKey = v
+}
+  return nil
+}
+
+func (p *CoordinatorSlaPolicy) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("CoordinatorSlaPolicy"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *CoordinatorSlaPolicy) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("coordinatorUrl", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:coordinatorUrl: ", p), err) }
+  if err := oprot.WriteString(string(p.CoordinatorUrl)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.coordinatorUrl (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:coordinatorUrl: ", p), err) }
+  return err
+}
+
+func (p *CoordinatorSlaPolicy) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("statusKey", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:statusKey: ", p), err) }
+  if err := oprot.WriteString(string(p.StatusKey)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.statusKey (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:statusKey: ", p), err) }
+  return err
+}
+
+func (p *CoordinatorSlaPolicy) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("CoordinatorSlaPolicy(%+v)", *p)
+}
+
+// SLA requirements expressed in one of the many types
+// 
+// Attributes:
+//  - PercentageSlaPolicy
+//  - CountSlaPolicy
+//  - CoordinatorSlaPolicy
+type SlaPolicy struct {
+  PercentageSlaPolicy *PercentageSlaPolicy `thrift:"percentageSlaPolicy,1" db:"percentageSlaPolicy" json:"percentageSlaPolicy,omitempty"`
+  CountSlaPolicy *CountSlaPolicy `thrift:"countSlaPolicy,2" db:"countSlaPolicy" json:"countSlaPolicy,omitempty"`
+  CoordinatorSlaPolicy *CoordinatorSlaPolicy `thrift:"coordinatorSlaPolicy,3" db:"coordinatorSlaPolicy" json:"coordinatorSlaPolicy,omitempty"`
+}
+
+func NewSlaPolicy() *SlaPolicy {
+  return &SlaPolicy{}
+}
+
+var SlaPolicy_PercentageSlaPolicy_DEFAULT *PercentageSlaPolicy
+func (p *SlaPolicy) GetPercentageSlaPolicy() *PercentageSlaPolicy {
+  if !p.IsSetPercentageSlaPolicy() {
+    return SlaPolicy_PercentageSlaPolicy_DEFAULT
+  }
+return p.PercentageSlaPolicy
+}
+var SlaPolicy_CountSlaPolicy_DEFAULT *CountSlaPolicy
+func (p *SlaPolicy) GetCountSlaPolicy() *CountSlaPolicy {
+  if !p.IsSetCountSlaPolicy() {
+    return SlaPolicy_CountSlaPolicy_DEFAULT
+  }
+return p.CountSlaPolicy
+}
+var SlaPolicy_CoordinatorSlaPolicy_DEFAULT *CoordinatorSlaPolicy
+func (p *SlaPolicy) GetCoordinatorSlaPolicy() *CoordinatorSlaPolicy {
+  if !p.IsSetCoordinatorSlaPolicy() {
+    return SlaPolicy_CoordinatorSlaPolicy_DEFAULT
+  }
+return p.CoordinatorSlaPolicy
+}
+func (p *SlaPolicy) CountSetFieldsSlaPolicy() int {
+  count := 0
+  if (p.IsSetPercentageSlaPolicy()) {
+    count++
+  }
+  if (p.IsSetCountSlaPolicy()) {
+    count++
+  }
+  if (p.IsSetCoordinatorSlaPolicy()) {
+    count++
+  }
+  return count
+
+}
+
+func (p *SlaPolicy) IsSetPercentageSlaPolicy() bool {
+  return p.PercentageSlaPolicy != nil
+}
+
+func (p *SlaPolicy) IsSetCountSlaPolicy() bool {
+  return p.CountSlaPolicy != nil
+}
+
+func (p *SlaPolicy) IsSetCoordinatorSlaPolicy() bool {
+  return p.CoordinatorSlaPolicy != nil
+}
+
+func (p *SlaPolicy) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *SlaPolicy)  ReadField1(iprot thrift.TProtocol) error {
+  p.PercentageSlaPolicy = &PercentageSlaPolicy{}
+  if err := p.PercentageSlaPolicy.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.PercentageSlaPolicy), err)
+  }
+  return nil
+}
+
+func (p *SlaPolicy)  ReadField2(iprot thrift.TProtocol) error {
+  p.CountSlaPolicy = &CountSlaPolicy{}
+  if err := p.CountSlaPolicy.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.CountSlaPolicy), err)
+  }
+  return nil
+}
+
+func (p *SlaPolicy)  ReadField3(iprot thrift.TProtocol) error {
+  p.CoordinatorSlaPolicy = &CoordinatorSlaPolicy{}
+  if err := p.CoordinatorSlaPolicy.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.CoordinatorSlaPolicy), err)
+  }
+  return nil
+}
+
+func (p *SlaPolicy) Write(oprot thrift.TProtocol) error {
+  if c := p.CountSetFieldsSlaPolicy(); c != 1 {
+    return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
+  }
+  if err := oprot.WriteStructBegin("SlaPolicy"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *SlaPolicy) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetPercentageSlaPolicy() {
+    if err := oprot.WriteFieldBegin("percentageSlaPolicy", thrift.STRUCT, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:percentageSlaPolicy: ", p), err) }
+    if err := p.PercentageSlaPolicy.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.PercentageSlaPolicy), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:percentageSlaPolicy: ", p), err) }
+  }
+  return err
+}
+
+func (p *SlaPolicy) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetCountSlaPolicy() {
+    if err := oprot.WriteFieldBegin("countSlaPolicy", thrift.STRUCT, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:countSlaPolicy: ", p), err) }
+    if err := p.CountSlaPolicy.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.CountSlaPolicy), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:countSlaPolicy: ", p), err) }
+  }
+  return err
+}
+
+func (p *SlaPolicy) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetCoordinatorSlaPolicy() {
+    if err := oprot.WriteFieldBegin("coordinatorSlaPolicy", thrift.STRUCT, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:coordinatorSlaPolicy: ", p), err) }
+    if err := p.CoordinatorSlaPolicy.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.CoordinatorSlaPolicy), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:coordinatorSlaPolicy: ", p), err) }
+  }
+  return err
+}
+
+func (p *SlaPolicy) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("SlaPolicy(%+v)", *p)
+}
+
+// Description of the tasks contained within a job.
+// 
+// Attributes:
+//  - Job: Job task belongs to.
+//  - Owner: contains the role component of JobKey
+//  - IsService
+//  - Priority
+//  - MaxTaskFailures
+//  - Production: Whether this is a production task, which can preempt.
+//  - Tier: Task tier type.
+//  - Resources: All resources required to run a task.
+//  - Constraints
+//  - MesosFetcherUris: Resources to retrieve with Mesos Fetcher
+//  - TaskLinks: Custom links to include when displaying this task on the scheduler dashboard. Keys are anchor
+// text, values are URLs. Wildcards are supported for dynamic link crafting based on host, ports,
+// instance, etc.
+//  - ContactEmail
+//  - ExecutorConfig: Executor configuration
+//  - Metadata: Used to display additional details in the UI.
+//  - PartitionPolicy: Policy for how to deal with task partitions
+//  - SlaPolicy: SLA requirements to be met during maintenance
+//  - Container: the container the task should use to execute
+type TaskConfig struct {
+  // unused fields # 1 to 6
+  IsService bool `thrift:"isService,7" db:"isService" json:"isService"`
+  // unused fields # 8 to 10
+  Priority int32 `thrift:"priority,11" db:"priority" json:"priority"`
+  // unused field # 12
+  MaxTaskFailures int32 `thrift:"maxTaskFailures,13" db:"maxTaskFailures" json:"maxTaskFailures"`
+  // unused fields # 14 to 16
+  Owner *Identity `thrift:"owner,17" db:"owner" json:"owner"`
+  Production *bool `thrift:"production,18" db:"production" json:"production,omitempty"`
+  // unused field # 19
+  Constraints []*Constraint `thrift:"constraints,20" db:"constraints" json:"constraints"`
+  // unused field # 21
+  TaskLinks map[string]string `thrift:"taskLinks,22" db:"taskLinks" json:"taskLinks,omitempty"`
+  ContactEmail *string `thrift:"contactEmail,23" db:"contactEmail" json:"contactEmail,omitempty"`
+  // unused field # 24
+  ExecutorConfig *ExecutorConfig `thrift:"executorConfig,25" db:"executorConfig" json:"executorConfig,omitempty"`
+  // unused field # 26
+  Metadata []*Metadata `thrift:"metadata,27" db:"metadata" json:"metadata,omitempty"`
+  Job *JobKey `thrift:"job,28" db:"job" json:"job"`
+  Container *Container `thrift:"container,29" db:"container" json:"container"`
+  Tier *string `thrift:"tier,30" db:"tier" json:"tier,omitempty"`
+  // unused field # 31
+  Resources []*Resource `thrift:"resources,32" db:"resources" json:"resources"`
+  MesosFetcherUris []*MesosFetcherURI `thrift:"mesosFetcherUris,33" db:"mesosFetcherUris" json:"mesosFetcherUris,omitempty"`
+  PartitionPolicy *PartitionPolicy `thrift:"partitionPolicy,34" db:"partitionPolicy" json:"partitionPolicy,omitempty"`
+  SlaPolicy *SlaPolicy `thrift:"slaPolicy,35" db:"slaPolicy" json:"slaPolicy,omitempty"`
+}
+
+func NewTaskConfig() *TaskConfig {
+  return &TaskConfig{}
+}
+
+var TaskConfig_Job_DEFAULT *JobKey
+func (p *TaskConfig) GetJob() *JobKey {
+  if !p.IsSetJob() {
+    return TaskConfig_Job_DEFAULT
+  }
+return p.Job
+}
+var TaskConfig_Owner_DEFAULT *Identity
+func (p *TaskConfig) GetOwner() *Identity {
+  if !p.IsSetOwner() {
+    return TaskConfig_Owner_DEFAULT
+  }
+return p.Owner
+}
+
+func (p *TaskConfig) GetIsService() bool {
+  return p.IsService
+}
+
+func (p *TaskConfig) GetPriority() int32 {
+  return p.Priority
+}
+
+func (p *TaskConfig) GetMaxTaskFailures() int32 {
+  return p.MaxTaskFailures
+}
+var TaskConfig_Production_DEFAULT bool
+func (p *TaskConfig) GetProduction() bool {
+  if !p.IsSetProduction() {
+    return TaskConfig_Production_DEFAULT
+  }
+return *p.Production
+}
+var TaskConfig_Tier_DEFAULT string
+func (p *TaskConfig) GetTier() string {
+  if !p.IsSetTier() {
+    return TaskConfig_Tier_DEFAULT
+  }
+return *p.Tier
+}
+
+func (p *TaskConfig) GetResources() []*Resource {
+  return p.Resources
+}
+
+func (p *TaskConfig) GetConstraints() []*Constraint {
+  return p.Constraints
+}
+var TaskConfig_MesosFetcherUris_DEFAULT []*MesosFetcherURI
+
+func (p *TaskConfig) GetMesosFetcherUris() []*MesosFetcherURI {
+  return p.MesosFetcherUris
+}
+var TaskConfig_TaskLinks_DEFAULT map[string]string
+
+func (p *TaskConfig) GetTaskLinks() map[string]string {
+  return p.TaskLinks
+}
+var TaskConfig_ContactEmail_DEFAULT string
+func (p *TaskConfig) GetContactEmail() string {
+  if !p.IsSetContactEmail() {
+    return TaskConfig_ContactEmail_DEFAULT
+  }
+return *p.ContactEmail
+}
+var TaskConfig_ExecutorConfig_DEFAULT *ExecutorConfig
+func (p *TaskConfig) GetExecutorConfig() *ExecutorConfig {
+  if !p.IsSetExecutorConfig() {
+    return TaskConfig_ExecutorConfig_DEFAULT
+  }
+return p.ExecutorConfig
+}
+var TaskConfig_Metadata_DEFAULT []*Metadata
+
+func (p *TaskConfig) GetMetadata() []*Metadata {
+  return p.Metadata
+}
+var TaskConfig_PartitionPolicy_DEFAULT *PartitionPolicy
+func (p *TaskConfig) GetPartitionPolicy() *PartitionPolicy {
+  if !p.IsSetPartitionPolicy() {
+    return TaskConfig_PartitionPolicy_DEFAULT
+  }
+return p.PartitionPolicy
+}
+var TaskConfig_SlaPolicy_DEFAULT *SlaPolicy
+func (p *TaskConfig) GetSlaPolicy() *SlaPolicy {
+  if !p.IsSetSlaPolicy() {
+    return TaskConfig_SlaPolicy_DEFAULT
+  }
+return p.SlaPolicy
+}
+var TaskConfig_Container_DEFAULT *Container = &Container{
+  Mesos: &MesosContainer{},
+}
+func (p *TaskConfig) GetContainer() *Container {
+  if !p.IsSetContainer() {
+    return TaskConfig_Container_DEFAULT
+  }
+return p.Container
+}
+func (p *TaskConfig) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *TaskConfig) IsSetOwner() bool {
+  return p.Owner != nil
+}
+
+func (p *TaskConfig) IsSetProduction() bool {
+  return p.Production != nil
+}
+
+func (p *TaskConfig) IsSetTier() bool {
+  return p.Tier != nil
+}
+
+func (p *TaskConfig) IsSetMesosFetcherUris() bool {
+  return p.MesosFetcherUris != nil
+}
+
+func (p *TaskConfig) IsSetTaskLinks() bool {
+  return p.TaskLinks != nil
+}
+
+func (p *TaskConfig) IsSetContactEmail() bool {
+  return p.ContactEmail != nil
+}
+
+func (p *TaskConfig) IsSetExecutorConfig() bool {
+  return p.ExecutorConfig != nil
+}
+
+func (p *TaskConfig) IsSetMetadata() bool {
+  return p.Metadata != nil
+}
+
+func (p *TaskConfig) IsSetPartitionPolicy() bool {
+  return p.PartitionPolicy != nil
+}
+
+func (p *TaskConfig) IsSetSlaPolicy() bool {
+  return p.SlaPolicy != nil
+}
+
+func (p *TaskConfig) IsSetContainer() bool {
+  return p.Container != nil
+}
+
+func (p *TaskConfig) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 28:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField28(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 17:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField17(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 7:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField7(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 11:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField11(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 13:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField13(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 18:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField18(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 30:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField30(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 32:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField32(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 20:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField20(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 33:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField33(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 22:
+      if fieldTypeId == thrift.MAP {
+        if err := p.ReadField22(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 23:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField23(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 25:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField25(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 27:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField27(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 34:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField34(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 35:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField35(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 29:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField29(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField28(iprot thrift.TProtocol) error {
+  p.Job = &JobKey{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField17(iprot thrift.TProtocol) error {
+  p.Owner = &Identity{}
+  if err := p.Owner.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Owner), err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField7(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 7: ", err)
+} else {
+  p.IsService = v
+}
+  return nil
+}
+
+func (p *TaskConfig)  ReadField11(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 11: ", err)
+} else {
+  p.Priority = v
+}
+  return nil
+}
+
+func (p *TaskConfig)  ReadField13(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 13: ", err)
+} else {
+  p.MaxTaskFailures = v
+}
+  return nil
+}
+
+func (p *TaskConfig)  ReadField18(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 18: ", err)
+} else {
+  p.Production = &v
+}
+  return nil
+}
+
+func (p *TaskConfig)  ReadField30(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 30: ", err)
+} else {
+  p.Tier = &v
+}
+  return nil
+}
+
+func (p *TaskConfig)  ReadField32(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Resource, 0, size)
+  p.Resources =  tSet
+  for i := 0; i < size; i ++ {
+    _elem5 := &Resource{}
+    if err := _elem5.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem5), err)
+    }
+    p.Resources = append(p.Resources, _elem5)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField20(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Constraint, 0, size)
+  p.Constraints =  tSet
+  for i := 0; i < size; i ++ {
+    _elem6 := &Constraint{}
+    if err := _elem6.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem6), err)
+    }
+    p.Constraints = append(p.Constraints, _elem6)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField33(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*MesosFetcherURI, 0, size)
+  p.MesosFetcherUris =  tSet
+  for i := 0; i < size; i ++ {
+    _elem7 := &MesosFetcherURI{}
+    if err := _elem7.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem7), err)
+    }
+    p.MesosFetcherUris = append(p.MesosFetcherUris, _elem7)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField22(iprot thrift.TProtocol) error {
+  _, _, size, err := iprot.ReadMapBegin()
+  if err != nil {
+    return thrift.PrependError("error reading map begin: ", err)
+  }
+  tMap := make(map[string]string, size)
+  p.TaskLinks =  tMap
+  for i := 0; i < size; i ++ {
+var _key8 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _key8 = v
+}
+var _val9 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _val9 = v
+}
+    p.TaskLinks[_key8] = _val9
+  }
+  if err := iprot.ReadMapEnd(); err != nil {
+    return thrift.PrependError("error reading map end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField23(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 23: ", err)
+} else {
+  p.ContactEmail = &v
+}
+  return nil
+}
+
+func (p *TaskConfig)  ReadField25(iprot thrift.TProtocol) error {
+  p.ExecutorConfig = &ExecutorConfig{}
+  if err := p.ExecutorConfig.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ExecutorConfig), err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField27(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Metadata, 0, size)
+  p.Metadata =  tSet
+  for i := 0; i < size; i ++ {
+    _elem10 := &Metadata{}
+    if err := _elem10.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem10), err)
+    }
+    p.Metadata = append(p.Metadata, _elem10)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField34(iprot thrift.TProtocol) error {
+  p.PartitionPolicy = &PartitionPolicy{}
+  if err := p.PartitionPolicy.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.PartitionPolicy), err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField35(iprot thrift.TProtocol) error {
+  p.SlaPolicy = &SlaPolicy{}
+  if err := p.SlaPolicy.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.SlaPolicy), err)
+  }
+  return nil
+}
+
+func (p *TaskConfig)  ReadField29(iprot thrift.TProtocol) error {
+  p.Container = &Container{}
+  if err := p.Container.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Container), err)
+  }
+  return nil
+}
+
+func (p *TaskConfig) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("TaskConfig"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField7(oprot); err != nil { return err }
+    if err := p.writeField11(oprot); err != nil { return err }
+    if err := p.writeField13(oprot); err != nil { return err }
+    if err := p.writeField17(oprot); err != nil { return err }
+    if err := p.writeField18(oprot); err != nil { return err }
+    if err := p.writeField20(oprot); err != nil { return err }
+    if err := p.writeField22(oprot); err != nil { return err }
+    if err := p.writeField23(oprot); err != nil { return err }
+    if err := p.writeField25(oprot); err != nil { return err }
+    if err := p.writeField27(oprot); err != nil { return err }
+    if err := p.writeField28(oprot); err != nil { return err }
+    if err := p.writeField29(oprot); err != nil { return err }
+    if err := p.writeField30(oprot); err != nil { return err }
+    if err := p.writeField32(oprot); err != nil { return err }
+    if err := p.writeField33(oprot); err != nil { return err }
+    if err := p.writeField34(oprot); err != nil { return err }
+    if err := p.writeField35(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *TaskConfig) writeField7(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("isService", thrift.BOOL, 7); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:isService: ", p), err) }
+  if err := oprot.WriteBool(bool(p.IsService)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.isService (7) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 7:isService: ", p), err) }
+  return err
+}
+
+func (p *TaskConfig) writeField11(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("priority", thrift.I32, 11); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:priority: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Priority)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.priority (11) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 11:priority: ", p), err) }
+  return err
+}
+
+func (p *TaskConfig) writeField13(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("maxTaskFailures", thrift.I32, 13); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:maxTaskFailures: ", p), err) }
+  if err := oprot.WriteI32(int32(p.MaxTaskFailures)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.maxTaskFailures (13) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 13:maxTaskFailures: ", p), err) }
+  return err
+}
+
+func (p *TaskConfig) writeField17(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("owner", thrift.STRUCT, 17); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 17:owner: ", p), err) }
+  if err := p.Owner.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Owner), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 17:owner: ", p), err) }
+  return err
+}
+
+func (p *TaskConfig) writeField18(oprot thrift.TProtocol) (err error) {
+  if p.IsSetProduction() {
+    if err := oprot.WriteFieldBegin("production", thrift.BOOL, 18); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 18:production: ", p), err) }
+    if err := oprot.WriteBool(bool(*p.Production)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.production (18) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 18:production: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) writeField20(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("constraints", thrift.SET, 20); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 20:constraints: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Constraints)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Constraints); i++ {
+    for j := i+1; j<len(p.Constraints); j++ {
+      if reflect.DeepEqual(p.Constraints[i],p.Constraints[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Constraints[i]))
+      }
+    }
+  }
+  for _, v := range p.Constraints {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 20:constraints: ", p), err) }
+  return err
+}
+
+func (p *TaskConfig) writeField22(oprot thrift.TProtocol) (err error) {
+  if p.IsSetTaskLinks() {
+    if err := oprot.WriteFieldBegin("taskLinks", thrift.MAP, 22); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 22:taskLinks: ", p), err) }
+    if err := oprot.WriteMapBegin(thrift.STRING, thrift.STRING, len(p.TaskLinks)); err != nil {
+      return thrift.PrependError("error writing map begin: ", err)
+    }
+    for k, v := range p.TaskLinks {
+      if err := oprot.WriteString(string(k)); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+      if err := oprot.WriteString(string(v)); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+    }
+    if err := oprot.WriteMapEnd(); err != nil {
+      return thrift.PrependError("error writing map end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 22:taskLinks: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) writeField23(oprot thrift.TProtocol) (err error) {
+  if p.IsSetContactEmail() {
+    if err := oprot.WriteFieldBegin("contactEmail", thrift.STRING, 23); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 23:contactEmail: ", p), err) }
+    if err := oprot.WriteString(string(*p.ContactEmail)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.contactEmail (23) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 23:contactEmail: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) writeField25(oprot thrift.TProtocol) (err error) {
+  if p.IsSetExecutorConfig() {
+    if err := oprot.WriteFieldBegin("executorConfig", thrift.STRUCT, 25); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 25:executorConfig: ", p), err) }
+    if err := p.ExecutorConfig.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ExecutorConfig), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 25:executorConfig: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) writeField27(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMetadata() {
+    if err := oprot.WriteFieldBegin("metadata", thrift.SET, 27); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 27:metadata: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Metadata)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.Metadata); i++ {
+      for j := i+1; j<len(p.Metadata); j++ {
+        if reflect.DeepEqual(p.Metadata[i],p.Metadata[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Metadata[i]))
+        }
+      }
+    }
+    for _, v := range p.Metadata {
+      if err := v.Write(oprot); err != nil {
+        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+      }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 27:metadata: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) writeField28(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 28); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 28:job: ", p), err) }
+  if err := p.Job.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 28:job: ", p), err) }
+  return err
+}
+
+func (p *TaskConfig) writeField29(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("container", thrift.STRUCT, 29); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 29:container: ", p), err) }
+  if err := p.Container.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Container), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 29:container: ", p), err) }
+  return err
+}
+
+func (p *TaskConfig) writeField30(oprot thrift.TProtocol) (err error) {
+  if p.IsSetTier() {
+    if err := oprot.WriteFieldBegin("tier", thrift.STRING, 30); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 30:tier: ", p), err) }
+    if err := oprot.WriteString(string(*p.Tier)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.tier (30) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 30:tier: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) writeField32(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("resources", thrift.SET, 32); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 32:resources: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Resources)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Resources); i++ {
+    for j := i+1; j<len(p.Resources); j++ {
+      if reflect.DeepEqual(p.Resources[i],p.Resources[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Resources[i]))
+      }
+    }
+  }
+  for _, v := range p.Resources {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 32:resources: ", p), err) }
+  return err
+}
+
+func (p *TaskConfig) writeField33(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMesosFetcherUris() {
+    if err := oprot.WriteFieldBegin("mesosFetcherUris", thrift.SET, 33); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 33:mesosFetcherUris: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.MesosFetcherUris)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.MesosFetcherUris); i++ {
+      for j := i+1; j<len(p.MesosFetcherUris); j++ {
+        if reflect.DeepEqual(p.MesosFetcherUris[i],p.MesosFetcherUris[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.MesosFetcherUris[i]))
+        }
+      }
+    }
+    for _, v := range p.MesosFetcherUris {
+      if err := v.Write(oprot); err != nil {
+        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+      }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 33:mesosFetcherUris: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) writeField34(oprot thrift.TProtocol) (err error) {
+  if p.IsSetPartitionPolicy() {
+    if err := oprot.WriteFieldBegin("partitionPolicy", thrift.STRUCT, 34); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 34:partitionPolicy: ", p), err) }
+    if err := p.PartitionPolicy.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.PartitionPolicy), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 34:partitionPolicy: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) writeField35(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSlaPolicy() {
+    if err := oprot.WriteFieldBegin("slaPolicy", thrift.STRUCT, 35); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 35:slaPolicy: ", p), err) }
+    if err := p.SlaPolicy.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.SlaPolicy), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 35:slaPolicy: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskConfig) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("TaskConfig(%+v)", *p)
+}
+
+// Attributes:
+//  - Resources: Aggregated resource values.
+type ResourceAggregate struct {
+  // unused fields # 1 to 3
+  Resources []*Resource `thrift:"resources,4" db:"resources" json:"resources"`
+}
+
+func NewResourceAggregate() *ResourceAggregate {
+  return &ResourceAggregate{}
+}
+
+
+func (p *ResourceAggregate) GetResources() []*Resource {
+  return p.Resources
+}
+func (p *ResourceAggregate) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 4:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ResourceAggregate)  ReadField4(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Resource, 0, size)
+  p.Resources =  tSet
+  for i := 0; i < size; i ++ {
+    _elem11 := &Resource{}
+    if err := _elem11.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem11), err)
+    }
+    p.Resources = append(p.Resources, _elem11)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *ResourceAggregate) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ResourceAggregate"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ResourceAggregate) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("resources", thrift.SET, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:resources: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Resources)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Resources); i++ {
+    for j := i+1; j<len(p.Resources); j++ {
+      if reflect.DeepEqual(p.Resources[i],p.Resources[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Resources[i]))
+      }
+    }
+  }
+  for _, v := range p.Resources {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:resources: ", p), err) }
+  return err
+}
+
+func (p *ResourceAggregate) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ResourceAggregate(%+v)", *p)
+}
+
+// Description of an Aurora job. One task will be scheduled for each instance within the job.
+// 
+// Attributes:
+//  - Key: Key for this job. If not specified name, owner.role, and a reasonable default environment are
+// used to construct it server-side.
+//  - Owner: Owner of this job.
+//  - CronSchedule: If present, the job will be handled as a cron job with this crontab-syntax schedule.
+//  - CronCollisionPolicy: Collision policy to use when handling overlapping cron runs.  Default is KILL_EXISTING.
+//  - TaskConfig: Task configuration for this job.
+//  - InstanceCount: The number of instances in the job. Generated instance IDs for tasks will be in the range
+// [0, instances).
+type JobConfiguration struct {
+  // unused fields # 1 to 3
+  CronSchedule *string `thrift:"cronSchedule,4" db:"cronSchedule" json:"cronSchedule,omitempty"`
+  CronCollisionPolicy CronCollisionPolicy `thrift:"cronCollisionPolicy,5" db:"cronCollisionPolicy" json:"cronCollisionPolicy"`
+  TaskConfig *TaskConfig `thrift:"taskConfig,6" db:"taskConfig" json:"taskConfig"`
+  Owner *Identity `thrift:"owner,7" db:"owner" json:"owner"`
+  InstanceCount int32 `thrift:"instanceCount,8" db:"instanceCount" json:"instanceCount"`
+  Key *JobKey `thrift:"key,9" db:"key" json:"key"`
+}
+
+func NewJobConfiguration() *JobConfiguration {
+  return &JobConfiguration{}
+}
+
+var JobConfiguration_Key_DEFAULT *JobKey
+func (p *JobConfiguration) GetKey() *JobKey {
+  if !p.IsSetKey() {
+    return JobConfiguration_Key_DEFAULT
+  }
+return p.Key
+}
+var JobConfiguration_Owner_DEFAULT *Identity
+func (p *JobConfiguration) GetOwner() *Identity {
+  if !p.IsSetOwner() {
+    return JobConfiguration_Owner_DEFAULT
+  }
+return p.Owner
+}
+var JobConfiguration_CronSchedule_DEFAULT string
+func (p *JobConfiguration) GetCronSchedule() string {
+  if !p.IsSetCronSchedule() {
+    return JobConfiguration_CronSchedule_DEFAULT
+  }
+return *p.CronSchedule
+}
+
+func (p *JobConfiguration) GetCronCollisionPolicy() CronCollisionPolicy {
+  return p.CronCollisionPolicy
+}
+var JobConfiguration_TaskConfig_DEFAULT *TaskConfig
+func (p *JobConfiguration) GetTaskConfig() *TaskConfig {
+  if !p.IsSetTaskConfig() {
+    return JobConfiguration_TaskConfig_DEFAULT
+  }
+return p.TaskConfig
+}
+
+func (p *JobConfiguration) GetInstanceCount() int32 {
+  return p.InstanceCount
+}
+func (p *JobConfiguration) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *JobConfiguration) IsSetOwner() bool {
+  return p.Owner != nil
+}
+
+func (p *JobConfiguration) IsSetCronSchedule() bool {
+  return p.CronSchedule != nil
+}
+
+func (p *JobConfiguration) IsSetTaskConfig() bool {
+  return p.TaskConfig != nil
+}
+
+func (p *JobConfiguration) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 9:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField9(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 7:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField7(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 8:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField8(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobConfiguration)  ReadField9(iprot thrift.TProtocol) error {
+  p.Key = &JobKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *JobConfiguration)  ReadField7(iprot thrift.TProtocol) error {
+  p.Owner = &Identity{}
+  if err := p.Owner.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Owner), err)
+  }
+  return nil
+}
+
+func (p *JobConfiguration)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.CronSchedule = &v
+}
+  return nil
+}
+
+func (p *JobConfiguration)  ReadField5(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 5: ", err)
+} else {
+  temp := CronCollisionPolicy(v)
+  p.CronCollisionPolicy = temp
+}
+  return nil
+}
+
+func (p *JobConfiguration)  ReadField6(iprot thrift.TProtocol) error {
+  p.TaskConfig = &TaskConfig{}
+  if err := p.TaskConfig.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TaskConfig), err)
+  }
+  return nil
+}
+
+func (p *JobConfiguration)  ReadField8(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 8: ", err)
+} else {
+  p.InstanceCount = v
+}
+  return nil
+}
+
+func (p *JobConfiguration) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobConfiguration"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+    if err := p.writeField7(oprot); err != nil { return err }
+    if err := p.writeField8(oprot); err != nil { return err }
+    if err := p.writeField9(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobConfiguration) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetCronSchedule() {
+    if err := oprot.WriteFieldBegin("cronSchedule", thrift.STRING, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:cronSchedule: ", p), err) }
+    if err := oprot.WriteString(string(*p.CronSchedule)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.cronSchedule (4) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:cronSchedule: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobConfiguration) writeField5(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("cronCollisionPolicy", thrift.I32, 5); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:cronCollisionPolicy: ", p), err) }
+  if err := oprot.WriteI32(int32(p.CronCollisionPolicy)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.cronCollisionPolicy (5) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:cronCollisionPolicy: ", p), err) }
+  return err
+}
+
+func (p *JobConfiguration) writeField6(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("taskConfig", thrift.STRUCT, 6); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:taskConfig: ", p), err) }
+  if err := p.TaskConfig.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TaskConfig), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:taskConfig: ", p), err) }
+  return err
+}
+
+func (p *JobConfiguration) writeField7(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("owner", thrift.STRUCT, 7); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:owner: ", p), err) }
+  if err := p.Owner.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Owner), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 7:owner: ", p), err) }
+  return err
+}
+
+func (p *JobConfiguration) writeField8(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instanceCount", thrift.I32, 8); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:instanceCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.InstanceCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.instanceCount (8) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 8:instanceCount: ", p), err) }
+  return err
+}
+
+func (p *JobConfiguration) writeField9(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 9); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 9:key: ", p), err) }
+  return err
+}
+
+func (p *JobConfiguration) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobConfiguration(%+v)", *p)
+}
+
+// Attributes:
+//  - ActiveTaskCount: Number of tasks in active state for this job.
+//  - FinishedTaskCount: Number of tasks in finished state for this job.
+//  - FailedTaskCount: Number of failed tasks for this job.
+//  - PendingTaskCount: Number of tasks in pending state for this job.
+type JobStats struct {
+  ActiveTaskCount int32 `thrift:"activeTaskCount,1" db:"activeTaskCount" json:"activeTaskCount"`
+  FinishedTaskCount int32 `thrift:"finishedTaskCount,2" db:"finishedTaskCount" json:"finishedTaskCount"`
+  FailedTaskCount int32 `thrift:"failedTaskCount,3" db:"failedTaskCount" json:"failedTaskCount"`
+  PendingTaskCount int32 `thrift:"pendingTaskCount,4" db:"pendingTaskCount" json:"pendingTaskCount"`
+}
+
+func NewJobStats() *JobStats {
+  return &JobStats{}
+}
+
+
+func (p *JobStats) GetActiveTaskCount() int32 {
+  return p.ActiveTaskCount
+}
+
+func (p *JobStats) GetFinishedTaskCount() int32 {
+  return p.FinishedTaskCount
+}
+
+func (p *JobStats) GetFailedTaskCount() int32 {
+  return p.FailedTaskCount
+}
+
+func (p *JobStats) GetPendingTaskCount() int32 {
+  return p.PendingTaskCount
+}
+func (p *JobStats) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobStats)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.ActiveTaskCount = v
+}
+  return nil
+}
+
+func (p *JobStats)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.FinishedTaskCount = v
+}
+  return nil
+}
+
+func (p *JobStats)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.FailedTaskCount = v
+}
+  return nil
+}
+
+func (p *JobStats)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.PendingTaskCount = v
+}
+  return nil
+}
+
+func (p *JobStats) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobStats"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobStats) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("activeTaskCount", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:activeTaskCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.ActiveTaskCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.activeTaskCount (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:activeTaskCount: ", p), err) }
+  return err
+}
+
+func (p *JobStats) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("finishedTaskCount", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:finishedTaskCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.FinishedTaskCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.finishedTaskCount (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:finishedTaskCount: ", p), err) }
+  return err
+}
+
+func (p *JobStats) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("failedTaskCount", thrift.I32, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:failedTaskCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.FailedTaskCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.failedTaskCount (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:failedTaskCount: ", p), err) }
+  return err
+}
+
+func (p *JobStats) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("pendingTaskCount", thrift.I32, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:pendingTaskCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.PendingTaskCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.pendingTaskCount (4) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:pendingTaskCount: ", p), err) }
+  return err
+}
+
+func (p *JobStats) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobStats(%+v)", *p)
+}
+
+// Attributes:
+//  - Job
+//  - Stats
+//  - NextCronRunMs: Timestamp of next cron run in ms since epoch, for a cron job
+type JobSummary struct {
+  Job *JobConfiguration `thrift:"job,1" db:"job" json:"job"`
+  Stats *JobStats `thrift:"stats,2" db:"stats" json:"stats"`
+  NextCronRunMs *int64 `thrift:"nextCronRunMs,3" db:"nextCronRunMs" json:"nextCronRunMs,omitempty"`
+}
+
+func NewJobSummary() *JobSummary {
+  return &JobSummary{}
+}
+
+var JobSummary_Job_DEFAULT *JobConfiguration
+func (p *JobSummary) GetJob() *JobConfiguration {
+  if !p.IsSetJob() {
+    return JobSummary_Job_DEFAULT
+  }
+return p.Job
+}
+var JobSummary_Stats_DEFAULT *JobStats
+func (p *JobSummary) GetStats() *JobStats {
+  if !p.IsSetStats() {
+    return JobSummary_Stats_DEFAULT
+  }
+return p.Stats
+}
+var JobSummary_NextCronRunMs_DEFAULT int64
+func (p *JobSummary) GetNextCronRunMs() int64 {
+  if !p.IsSetNextCronRunMs() {
+    return JobSummary_NextCronRunMs_DEFAULT
+  }
+return *p.NextCronRunMs
+}
+func (p *JobSummary) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *JobSummary) IsSetStats() bool {
+  return p.Stats != nil
+}
+
+func (p *JobSummary) IsSetNextCronRunMs() bool {
+  return p.NextCronRunMs != nil
+}
+
+func (p *JobSummary) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobSummary)  ReadField1(iprot thrift.TProtocol) error {
+  p.Job = &JobConfiguration{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *JobSummary)  ReadField2(iprot thrift.TProtocol) error {
+  p.Stats = &JobStats{}
+  if err := p.Stats.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Stats), err)
+  }
+  return nil
+}
+
+func (p *JobSummary)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.NextCronRunMs = &v
+}
+  return nil
+}
+
+func (p *JobSummary) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobSummary"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobSummary) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:job: ", p), err) }
+  if err := p.Job.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:job: ", p), err) }
+  return err
+}
+
+func (p *JobSummary) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("stats", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:stats: ", p), err) }
+  if err := p.Stats.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Stats), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:stats: ", p), err) }
+  return err
+}
+
+func (p *JobSummary) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetNextCronRunMs() {
+    if err := oprot.WriteFieldBegin("nextCronRunMs", thrift.I64, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:nextCronRunMs: ", p), err) }
+    if err := oprot.WriteI64(int64(*p.NextCronRunMs)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.nextCronRunMs (3) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:nextCronRunMs: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobSummary) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobSummary(%+v)", *p)
+}
+
+// Closed range of integers.
+// 
+// Attributes:
+//  - First
+//  - Last
+type Range struct {
+  First int32 `thrift:"first,1" db:"first" json:"first"`
+  Last int32 `thrift:"last,2" db:"last" json:"last"`
+}
+
+func NewRange() *Range {
+  return &Range{}
+}
+
+
+func (p *Range) GetFirst() int32 {
+  return p.First
+}
+
+func (p *Range) GetLast() int32 {
+  return p.Last
+}
+func (p *Range) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Range)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.First = v
+}
+  return nil
+}
+
+func (p *Range)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Last = v
+}
+  return nil
+}
+
+func (p *Range) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Range"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Range) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("first", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:first: ", p), err) }
+  if err := oprot.WriteI32(int32(p.First)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.first (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:first: ", p), err) }
+  return err
+}
+
+func (p *Range) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("last", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:last: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Last)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.last (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:last: ", p), err) }
+  return err
+}
+
+func (p *Range) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Range(%+v)", *p)
+}
+
+// Attributes:
+//  - Config
+//  - Instances
+type ConfigGroup struct {
+  Config *TaskConfig `thrift:"config,1" db:"config" json:"config"`
+  // unused field # 2
+  Instances []*Range `thrift:"instances,3" db:"instances" json:"instances"`
+}
+
+func NewConfigGroup() *ConfigGroup {
+  return &ConfigGroup{}
+}
+
+var ConfigGroup_Config_DEFAULT *TaskConfig
+func (p *ConfigGroup) GetConfig() *TaskConfig {
+  if !p.IsSetConfig() {
+    return ConfigGroup_Config_DEFAULT
+  }
+return p.Config
+}
+
+func (p *ConfigGroup) GetInstances() []*Range {
+  return p.Instances
+}
+func (p *ConfigGroup) IsSetConfig() bool {
+  return p.Config != nil
+}
+
+func (p *ConfigGroup) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ConfigGroup)  ReadField1(iprot thrift.TProtocol) error {
+  p.Config = &TaskConfig{}
+  if err := p.Config.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Config), err)
+  }
+  return nil
+}
+
+func (p *ConfigGroup)  ReadField3(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Range, 0, size)
+  p.Instances =  tSet
+  for i := 0; i < size; i ++ {
+    _elem12 := &Range{}
+    if err := _elem12.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem12), err)
+    }
+    p.Instances = append(p.Instances, _elem12)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *ConfigGroup) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ConfigGroup"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ConfigGroup) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("config", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:config: ", p), err) }
+  if err := p.Config.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Config), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:config: ", p), err) }
+  return err
+}
+
+func (p *ConfigGroup) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instances", thrift.SET, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:instances: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Instances)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Instances); i++ {
+    for j := i+1; j<len(p.Instances); j++ {
+      if reflect.DeepEqual(p.Instances[i],p.Instances[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Instances[i]))
+      }
+    }
+  }
+  for _, v := range p.Instances {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:instances: ", p), err) }
+  return err
+}
+
+func (p *ConfigGroup) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ConfigGroup(%+v)", *p)
+}
+
+// Attributes:
+//  - Key
+//  - Groups
+type ConfigSummary struct {
+  Key *JobKey `thrift:"key,1" db:"key" json:"key"`
+  Groups []*ConfigGroup `thrift:"groups,2" db:"groups" json:"groups"`
+}
+
+func NewConfigSummary() *ConfigSummary {
+  return &ConfigSummary{}
+}
+
+var ConfigSummary_Key_DEFAULT *JobKey
+func (p *ConfigSummary) GetKey() *JobKey {
+  if !p.IsSetKey() {
+    return ConfigSummary_Key_DEFAULT
+  }
+return p.Key
+}
+
+func (p *ConfigSummary) GetGroups() []*ConfigGroup {
+  return p.Groups
+}
+func (p *ConfigSummary) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *ConfigSummary) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ConfigSummary)  ReadField1(iprot thrift.TProtocol) error {
+  p.Key = &JobKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *ConfigSummary)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*ConfigGroup, 0, size)
+  p.Groups =  tSet
+  for i := 0; i < size; i ++ {
+    _elem13 := &ConfigGroup{}
+    if err := _elem13.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem13), err)
+    }
+    p.Groups = append(p.Groups, _elem13)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *ConfigSummary) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ConfigSummary"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ConfigSummary) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *ConfigSummary) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("groups", thrift.SET, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:groups: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Groups)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Groups); i++ {
+    for j := i+1; j<len(p.Groups); j++ {
+      if reflect.DeepEqual(p.Groups[i],p.Groups[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Groups[i]))
+      }
+    }
+  }
+  for _, v := range p.Groups {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:groups: ", p), err) }
+  return err
+}
+
+func (p *ConfigSummary) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ConfigSummary(%+v)", *p)
+}
+
+// Attributes:
+//  - TaskConfig
+type PopulateJobResult_ struct {
+  // unused field # 1
+  TaskConfig *TaskConfig `thrift:"taskConfig,2" db:"taskConfig" json:"taskConfig"`
+}
+
+func NewPopulateJobResult_() *PopulateJobResult_ {
+  return &PopulateJobResult_{}
+}
+
+var PopulateJobResult__TaskConfig_DEFAULT *TaskConfig
+func (p *PopulateJobResult_) GetTaskConfig() *TaskConfig {
+  if !p.IsSetTaskConfig() {
+    return PopulateJobResult__TaskConfig_DEFAULT
+  }
+return p.TaskConfig
+}
+func (p *PopulateJobResult_) IsSetTaskConfig() bool {
+  return p.TaskConfig != nil
+}
+
+func (p *PopulateJobResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *PopulateJobResult_)  ReadField2(iprot thrift.TProtocol) error {
+  p.TaskConfig = &TaskConfig{}
+  if err := p.TaskConfig.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TaskConfig), err)
+  }
+  return nil
+}
+
+func (p *PopulateJobResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("PopulateJobResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *PopulateJobResult_) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("taskConfig", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:taskConfig: ", p), err) }
+  if err := p.TaskConfig.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TaskConfig), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:taskConfig: ", p), err) }
+  return err
+}
+
+func (p *PopulateJobResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("PopulateJobResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Quota: Total allocated resource quota.
+//  - ProdSharedConsumption: Resources consumed by production jobs from a shared resource pool.
+//  - NonProdSharedConsumption: Resources consumed by non-production jobs from a shared resource pool.
+//  - ProdDedicatedConsumption: Resources consumed by production jobs from a dedicated resource pool.
+//  - NonProdDedicatedConsumption: Resources consumed by non-production jobs from a dedicated resource pool.
+type GetQuotaResult_ struct {
+  Quota *ResourceAggregate `thrift:"quota,1" db:"quota" json:"quota"`
+  ProdSharedConsumption *ResourceAggregate `thrift:"prodSharedConsumption,2" db:"prodSharedConsumption" json:"prodSharedConsumption,omitempty"`
+  NonProdSharedConsumption *ResourceAggregate `thrift:"nonProdSharedConsumption,3" db:"nonProdSharedConsumption" json:"nonProdSharedConsumption,omitempty"`
+  ProdDedicatedConsumption *ResourceAggregate `thrift:"prodDedicatedConsumption,4" db:"prodDedicatedConsumption" json:"prodDedicatedConsumption,omitempty"`
+  NonProdDedicatedConsumption *ResourceAggregate `thrift:"nonProdDedicatedConsumption,5" db:"nonProdDedicatedConsumption" json:"nonProdDedicatedConsumption,omitempty"`
+}
+
+func NewGetQuotaResult_() *GetQuotaResult_ {
+  return &GetQuotaResult_{}
+}
+
+var GetQuotaResult__Quota_DEFAULT *ResourceAggregate
+func (p *GetQuotaResult_) GetQuota() *ResourceAggregate {
+  if !p.IsSetQuota() {
+    return GetQuotaResult__Quota_DEFAULT
+  }
+return p.Quota
+}
+var GetQuotaResult__ProdSharedConsumption_DEFAULT *ResourceAggregate
+func (p *GetQuotaResult_) GetProdSharedConsumption() *ResourceAggregate {
+  if !p.IsSetProdSharedConsumption() {
+    return GetQuotaResult__ProdSharedConsumption_DEFAULT
+  }
+return p.ProdSharedConsumption
+}
+var GetQuotaResult__NonProdSharedConsumption_DEFAULT *ResourceAggregate
+func (p *GetQuotaResult_) GetNonProdSharedConsumption() *ResourceAggregate {
+  if !p.IsSetNonProdSharedConsumption() {
+    return GetQuotaResult__NonProdSharedConsumption_DEFAULT
+  }
+return p.NonProdSharedConsumption
+}
+var GetQuotaResult__ProdDedicatedConsumption_DEFAULT *ResourceAggregate
+func (p *GetQuotaResult_) GetProdDedicatedConsumption() *ResourceAggregate {
+  if !p.IsSetProdDedicatedConsumption() {
+    return GetQuotaResult__ProdDedicatedConsumption_DEFAULT
+  }
+return p.ProdDedicatedConsumption
+}
+var GetQuotaResult__NonProdDedicatedConsumption_DEFAULT *ResourceAggregate
+func (p *GetQuotaResult_) GetNonProdDedicatedConsumption() *ResourceAggregate {
+  if !p.IsSetNonProdDedicatedConsumption() {
+    return GetQuotaResult__NonProdDedicatedConsumption_DEFAULT
+  }
+return p.NonProdDedicatedConsumption
+}
+func (p *GetQuotaResult_) IsSetQuota() bool {
+  return p.Quota != nil
+}
+
+func (p *GetQuotaResult_) IsSetProdSharedConsumption() bool {
+  return p.ProdSharedConsumption != nil
+}
+
+func (p *GetQuotaResult_) IsSetNonProdSharedConsumption() bool {
+  return p.NonProdSharedConsumption != nil
+}
+
+func (p *GetQuotaResult_) IsSetProdDedicatedConsumption() bool {
+  return p.ProdDedicatedConsumption != nil
+}
+
+func (p *GetQuotaResult_) IsSetNonProdDedicatedConsumption() bool {
+  return p.NonProdDedicatedConsumption != nil
+}
+
+func (p *GetQuotaResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *GetQuotaResult_)  ReadField1(iprot thrift.TProtocol) error {
+  p.Quota = &ResourceAggregate{}
+  if err := p.Quota.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Quota), err)
+  }
+  return nil
+}
+
+func (p *GetQuotaResult_)  ReadField2(iprot thrift.TProtocol) error {
+  p.ProdSharedConsumption = &ResourceAggregate{}
+  if err := p.ProdSharedConsumption.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ProdSharedConsumption), err)
+  }
+  return nil
+}
+
+func (p *GetQuotaResult_)  ReadField3(iprot thrift.TProtocol) error {
+  p.NonProdSharedConsumption = &ResourceAggregate{}
+  if err := p.NonProdSharedConsumption.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.NonProdSharedConsumption), err)
+  }
+  return nil
+}
+
+func (p *GetQuotaResult_)  ReadField4(iprot thrift.TProtocol) error {
+  p.ProdDedicatedConsumption = &ResourceAggregate{}
+  if err := p.ProdDedicatedConsumption.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ProdDedicatedConsumption), err)
+  }
+  return nil
+}
+
+func (p *GetQuotaResult_)  ReadField5(iprot thrift.TProtocol) error {
+  p.NonProdDedicatedConsumption = &ResourceAggregate{}
+  if err := p.NonProdDedicatedConsumption.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.NonProdDedicatedConsumption), err)
+  }
+  return nil
+}
+
+func (p *GetQuotaResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("GetQuotaResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *GetQuotaResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("quota", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:quota: ", p), err) }
+  if err := p.Quota.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Quota), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:quota: ", p), err) }
+  return err
+}
+
+func (p *GetQuotaResult_) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetProdSharedConsumption() {
+    if err := oprot.WriteFieldBegin("prodSharedConsumption", thrift.STRUCT, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:prodSharedConsumption: ", p), err) }
+    if err := p.ProdSharedConsumption.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ProdSharedConsumption), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:prodSharedConsumption: ", p), err) }
+  }
+  return err
+}
+
+func (p *GetQuotaResult_) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetNonProdSharedConsumption() {
+    if err := oprot.WriteFieldBegin("nonProdSharedConsumption", thrift.STRUCT, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:nonProdSharedConsumption: ", p), err) }
+    if err := p.NonProdSharedConsumption.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.NonProdSharedConsumption), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:nonProdSharedConsumption: ", p), err) }
+  }
+  return err
+}
+
+func (p *GetQuotaResult_) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetProdDedicatedConsumption() {
+    if err := oprot.WriteFieldBegin("prodDedicatedConsumption", thrift.STRUCT, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:prodDedicatedConsumption: ", p), err) }
+    if err := p.ProdDedicatedConsumption.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ProdDedicatedConsumption), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:prodDedicatedConsumption: ", p), err) }
+  }
+  return err
+}
+
+func (p *GetQuotaResult_) writeField5(oprot thrift.TProtocol) (err error) {
+  if p.IsSetNonProdDedicatedConsumption() {
+    if err := oprot.WriteFieldBegin("nonProdDedicatedConsumption", thrift.STRUCT, 5); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:nonProdDedicatedConsumption: ", p), err) }
+    if err := p.NonProdDedicatedConsumption.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.NonProdDedicatedConsumption), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:nonProdDedicatedConsumption: ", p), err) }
+  }
+  return err
+}
+
+func (p *GetQuotaResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("GetQuotaResult_(%+v)", *p)
+}
+
+// Event marking a state transition within a task's lifecycle.
+// 
+// Attributes:
+//  - Timestamp: Epoch timestamp in milliseconds.
+//  - Status: New status of the task.
+//  - Message: Audit message that explains why a transition occurred.
+//  - Scheduler: Hostname of the scheduler machine that performed the event.
+type TaskEvent struct {
+  Timestamp int64 `thrift:"timestamp,1" db:"timestamp" json:"timestamp"`
+  Status ScheduleStatus `thrift:"status,2" db:"status" json:"status"`
+  Message *string `thrift:"message,3" db:"message" json:"message,omitempty"`
+  Scheduler *string `thrift:"scheduler,4" db:"scheduler" json:"scheduler,omitempty"`
+}
+
+func NewTaskEvent() *TaskEvent {
+  return &TaskEvent{}
+}
+
+
+func (p *TaskEvent) GetTimestamp() int64 {
+  return p.Timestamp
+}
+
+func (p *TaskEvent) GetStatus() ScheduleStatus {
+  return p.Status
+}
+var TaskEvent_Message_DEFAULT string
+func (p *TaskEvent) GetMessage() string {
+  if !p.IsSetMessage() {
+    return TaskEvent_Message_DEFAULT
+  }
+return *p.Message
+}
+var TaskEvent_Scheduler_DEFAULT string
+func (p *TaskEvent) GetScheduler() string {
+  if !p.IsSetScheduler() {
+    return TaskEvent_Scheduler_DEFAULT
+  }
+return *p.Scheduler
+}
+func (p *TaskEvent) IsSetMessage() bool {
+  return p.Message != nil
+}
+
+func (p *TaskEvent) IsSetScheduler() bool {
+  return p.Scheduler != nil
+}
+
+func (p *TaskEvent) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *TaskEvent)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Timestamp = v
+}
+  return nil
+}
+
+func (p *TaskEvent)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  temp := ScheduleStatus(v)
+  p.Status = temp
+}
+  return nil
+}
+
+func (p *TaskEvent)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.Message = &v
+}
+  return nil
+}
+
+func (p *TaskEvent)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.Scheduler = &v
+}
+  return nil
+}
+
+func (p *TaskEvent) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("TaskEvent"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *TaskEvent) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("timestamp", thrift.I64, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:timestamp: ", p), err) }
+  if err := oprot.WriteI64(int64(p.Timestamp)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.timestamp (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:timestamp: ", p), err) }
+  return err
+}
+
+func (p *TaskEvent) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("status", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:status: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Status)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.status (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:status: ", p), err) }
+  return err
+}
+
+func (p *TaskEvent) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMessage() {
+    if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err) }
+    if err := oprot.WriteString(string(*p.Message)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskEvent) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetScheduler() {
+    if err := oprot.WriteFieldBegin("scheduler", thrift.STRING, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:scheduler: ", p), err) }
+    if err := oprot.WriteString(string(*p.Scheduler)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.scheduler (4) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:scheduler: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskEvent) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("TaskEvent(%+v)", *p)
+}
+
+// A task assignment that is provided to an executor.
+// 
+// Attributes:
+//  - TaskId: The mesos task ID for this task.  Guaranteed to be globally unique
+//  - SlaveId: The mesos slave ID that this task has been assigned to.
+// This will not be populated for a PENDING task.
+//  - SlaveHost: The name of the machine that this task has been assigned to.
+// This will not be populated for a PENDING task.
+//  - Task: Information about how to run this task.
+//  - AssignedPorts: Ports reserved on the machine while this task is running.
+//  - InstanceId: The instance ID assigned to this task. Instance IDs must be unique and contiguous within a
+// job, and will be in the range [0, N-1] (inclusive) for a job that has N instances.
+type AssignedTask struct {
+  TaskId string `thrift:"taskId,1" db:"taskId" json:"taskId"`
+  SlaveId string `thrift:"slaveId,2" db:"slaveId" json:"slaveId"`
+  SlaveHost string `thrift:"slaveHost,3" db:"slaveHost" json:"slaveHost"`
+  Task *TaskConfig `thrift:"task,4" db:"task" json:"task"`
+  AssignedPorts map[string]int32 `thrift:"assignedPorts,5" db:"assignedPorts" json:"assignedPorts"`
+  InstanceId int32 `thrift:"instanceId,6" db:"instanceId" json:"instanceId"`
+}
+
+func NewAssignedTask() *AssignedTask {
+  return &AssignedTask{}
+}
+
+
+func (p *AssignedTask) GetTaskId() string {
+  return p.TaskId
+}
+
+func (p *AssignedTask) GetSlaveId() string {
+  return p.SlaveId
+}
+
+func (p *AssignedTask) GetSlaveHost() string {
+  return p.SlaveHost
+}
+var AssignedTask_Task_DEFAULT *TaskConfig
+func (p *AssignedTask) GetTask() *TaskConfig {
+  if !p.IsSetTask() {
+    return AssignedTask_Task_DEFAULT
+  }
+return p.Task
+}
+
+func (p *AssignedTask) GetAssignedPorts() map[string]int32 {
+  return p.AssignedPorts
+}
+
+func (p *AssignedTask) GetInstanceId() int32 {
+  return p.InstanceId
+}
+func (p *AssignedTask) IsSetTask() bool {
+  return p.Task != nil
+}
+
+func (p *AssignedTask) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.MAP {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AssignedTask)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.TaskId = v
+}
+  return nil
+}
+
+func (p *AssignedTask)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.SlaveId = v
+}
+  return nil
+}
+
+func (p *AssignedTask)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.SlaveHost = v
+}
+  return nil
+}
+
+func (p *AssignedTask)  ReadField4(iprot thrift.TProtocol) error {
+  p.Task = &TaskConfig{}
+  if err := p.Task.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Task), err)
+  }
+  return nil
+}
+
+func (p *AssignedTask)  ReadField5(iprot thrift.TProtocol) error {
+  _, _, size, err := iprot.ReadMapBegin()
+  if err != nil {
+    return thrift.PrependError("error reading map begin: ", err)
+  }
+  tMap := make(map[string]int32, size)
+  p.AssignedPorts =  tMap
+  for i := 0; i < size; i ++ {
+var _key14 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _key14 = v
+}
+var _val15 int32
+    if v, err := iprot.ReadI32(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _val15 = v
+}
+    p.AssignedPorts[_key14] = _val15
+  }
+  if err := iprot.ReadMapEnd(); err != nil {
+    return thrift.PrependError("error reading map end: ", err)
+  }
+  return nil
+}
+
+func (p *AssignedTask)  ReadField6(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 6: ", err)
+} else {
+  p.InstanceId = v
+}
+  return nil
+}
+
+func (p *AssignedTask) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("AssignedTask"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AssignedTask) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("taskId", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:taskId: ", p), err) }
+  if err := oprot.WriteString(string(p.TaskId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.taskId (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:taskId: ", p), err) }
+  return err
+}
+
+func (p *AssignedTask) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("slaveId", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:slaveId: ", p), err) }
+  if err := oprot.WriteString(string(p.SlaveId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.slaveId (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:slaveId: ", p), err) }
+  return err
+}
+
+func (p *AssignedTask) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("slaveHost", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:slaveHost: ", p), err) }
+  if err := oprot.WriteString(string(p.SlaveHost)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.slaveHost (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:slaveHost: ", p), err) }
+  return err
+}
+
+func (p *AssignedTask) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("task", thrift.STRUCT, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:task: ", p), err) }
+  if err := p.Task.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Task), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:task: ", p), err) }
+  return err
+}
+
+func (p *AssignedTask) writeField5(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("assignedPorts", thrift.MAP, 5); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:assignedPorts: ", p), err) }
+  if err := oprot.WriteMapBegin(thrift.STRING, thrift.I32, len(p.AssignedPorts)); err != nil {
+    return thrift.PrependError("error writing map begin: ", err)
+  }
+  for k, v := range p.AssignedPorts {
+    if err := oprot.WriteString(string(k)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+    if err := oprot.WriteI32(int32(v)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+  }
+  if err := oprot.WriteMapEnd(); err != nil {
+    return thrift.PrependError("error writing map end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:assignedPorts: ", p), err) }
+  return err
+}
+
+func (p *AssignedTask) writeField6(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instanceId", thrift.I32, 6); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:instanceId: ", p), err) }
+  if err := oprot.WriteI32(int32(p.InstanceId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.instanceId (6) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:instanceId: ", p), err) }
+  return err
+}
+
+func (p *AssignedTask) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AssignedTask(%+v)", *p)
+}
+
+// A task that has been scheduled.
+// 
+// Attributes:
+//  - AssignedTask: The task that was scheduled.
+//  - Status: The current status of this task.
+//  - FailureCount: The number of failures that this task has accumulated over the multi-generational history of
+// this task.
+//  - TimesPartitioned: The number of partitions this task has accumulated over its lifetime.
+//  - TaskEvents: State change history for this task.
+//  - AncestorId: The task ID of the previous generation of this task.  When a task is automatically rescheduled,
+// a copy of the task is created and ancestor ID of the previous task's task ID.
+type ScheduledTask struct {
+  AssignedTask *AssignedTask `thrift:"assignedTask,1" db:"assignedTask" json:"assignedTask"`
+  Status ScheduleStatus `thrift:"status,2" db:"status" json:"status"`
+  FailureCount int32 `thrift:"failureCount,3" db:"failureCount" json:"failureCount"`
+  TaskEvents []*TaskEvent `thrift:"taskEvents,4" db:"taskEvents" json:"taskEvents"`
+  AncestorId string `thrift:"ancestorId,5" db:"ancestorId" json:"ancestorId"`
+  TimesPartitioned int32 `thrift:"timesPartitioned,6" db:"timesPartitioned" json:"timesPartitioned"`
+}
+
+func NewScheduledTask() *ScheduledTask {
+  return &ScheduledTask{}
+}
+
+var ScheduledTask_AssignedTask_DEFAULT *AssignedTask
+func (p *ScheduledTask) GetAssignedTask() *AssignedTask {
+  if !p.IsSetAssignedTask() {
+    return ScheduledTask_AssignedTask_DEFAULT
+  }
+return p.AssignedTask
+}
+
+func (p *ScheduledTask) GetStatus() ScheduleStatus {
+  return p.Status
+}
+
+func (p *ScheduledTask) GetFailureCount() int32 {
+  return p.FailureCount
+}
+
+func (p *ScheduledTask) GetTimesPartitioned() int32 {
+  return p.TimesPartitioned
+}
+
+func (p *ScheduledTask) GetTaskEvents() []*TaskEvent {
+  return p.TaskEvents
+}
+
+func (p *ScheduledTask) GetAncestorId() string {
+  return p.AncestorId
+}
+func (p *ScheduledTask) IsSetAssignedTask() bool {
+  return p.AssignedTask != nil
+}
+
+func (p *ScheduledTask) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ScheduledTask)  ReadField1(iprot thrift.TProtocol) error {
+  p.AssignedTask = &AssignedTask{}
+  if err := p.AssignedTask.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.AssignedTask), err)
+  }
+  return nil
+}
+
+func (p *ScheduledTask)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  temp := ScheduleStatus(v)
+  p.Status = temp
+}
+  return nil
+}
+
+func (p *ScheduledTask)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.FailureCount = v
+}
+  return nil
+}
+
+func (p *ScheduledTask)  ReadField6(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 6: ", err)
+} else {
+  p.TimesPartitioned = v
+}
+  return nil
+}
+
+func (p *ScheduledTask)  ReadField4(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*TaskEvent, 0, size)
+  p.TaskEvents =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem16 := &TaskEvent{}
+    if err := _elem16.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem16), err)
+    }
+    p.TaskEvents = append(p.TaskEvents, _elem16)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *ScheduledTask)  ReadField5(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 5: ", err)
+} else {
+  p.AncestorId = v
+}
+  return nil
+}
+
+func (p *ScheduledTask) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ScheduledTask"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ScheduledTask) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("assignedTask", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:assignedTask: ", p), err) }
+  if err := p.AssignedTask.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.AssignedTask), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:assignedTask: ", p), err) }
+  return err
+}
+
+func (p *ScheduledTask) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("status", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:status: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Status)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.status (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:status: ", p), err) }
+  return err
+}
+
+func (p *ScheduledTask) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("failureCount", thrift.I32, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:failureCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.FailureCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.failureCount (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:failureCount: ", p), err) }
+  return err
+}
+
+func (p *ScheduledTask) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("taskEvents", thrift.LIST, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:taskEvents: ", p), err) }
+  if err := oprot.WriteListBegin(thrift.STRUCT, len(p.TaskEvents)); err != nil {
+    return thrift.PrependError("error writing list begin: ", err)
+  }
+  for _, v := range p.TaskEvents {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteListEnd(); err != nil {
+    return thrift.PrependError("error writing list end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:taskEvents: ", p), err) }
+  return err
+}
+
+func (p *ScheduledTask) writeField5(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("ancestorId", thrift.STRING, 5); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:ancestorId: ", p), err) }
+  if err := oprot.WriteString(string(p.AncestorId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.ancestorId (5) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:ancestorId: ", p), err) }
+  return err
+}
+
+func (p *ScheduledTask) writeField6(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("timesPartitioned", thrift.I32, 6); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:timesPartitioned: ", p), err) }
+  if err := oprot.WriteI32(int32(p.TimesPartitioned)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.timesPartitioned (6) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:timesPartitioned: ", p), err) }
+  return err
+}
+
+func (p *ScheduledTask) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ScheduledTask(%+v)", *p)
+}
+
+// Attributes:
+//  - Tasks
+type ScheduleStatusResult_ struct {
+  Tasks []*ScheduledTask `thrift:"tasks,1" db:"tasks" json:"tasks"`
+}
+
+func NewScheduleStatusResult_() *ScheduleStatusResult_ {
+  return &ScheduleStatusResult_{}
+}
+
+
+func (p *ScheduleStatusResult_) GetTasks() []*ScheduledTask {
+  return p.Tasks
+}
+func (p *ScheduleStatusResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ScheduleStatusResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*ScheduledTask, 0, size)
+  p.Tasks =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem17 := &ScheduledTask{}
+    if err := _elem17.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem17), err)
+    }
+    p.Tasks = append(p.Tasks, _elem17)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *ScheduleStatusResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ScheduleStatusResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ScheduleStatusResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("tasks", thrift.LIST, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:tasks: ", p), err) }
+  if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Tasks)); err != nil {
+    return thrift.PrependError("error writing list begin: ", err)
+  }
+  for _, v := range p.Tasks {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteListEnd(); err != nil {
+    return thrift.PrependError("error writing list end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:tasks: ", p), err) }
+  return err
+}
+
+func (p *ScheduleStatusResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ScheduleStatusResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Configs
+type GetJobsResult_ struct {
+  Configs []*JobConfiguration `thrift:"configs,1" db:"configs" json:"configs"`
+}
+
+func NewGetJobsResult_() *GetJobsResult_ {
+  return &GetJobsResult_{}
+}
+
+
+func (p *GetJobsResult_) GetConfigs() []*JobConfiguration {
+  return p.Configs
+}
+func (p *GetJobsResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *GetJobsResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*JobConfiguration, 0, size)
+  p.Configs =  tSet
+  for i := 0; i < size; i ++ {
+    _elem18 := &JobConfiguration{}
+    if err := _elem18.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem18), err)
+    }
+    p.Configs = append(p.Configs, _elem18)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *GetJobsResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("GetJobsResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *GetJobsResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("configs", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:configs: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Configs)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Configs); i++ {
+    for j := i+1; j<len(p.Configs); j++ {
+      if reflect.DeepEqual(p.Configs[i],p.Configs[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Configs[i]))
+      }
+    }
+  }
+  for _, v := range p.Configs {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:configs: ", p), err) }
+  return err
+}
+
+func (p *GetJobsResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("GetJobsResult_(%+v)", *p)
+}
+
+// Contains a set of restrictions on matching tasks where all restrictions must be met
+// (terms are AND'ed together).
+// 
+// Attributes:
+//  - Role
+//  - Environment
+//  - JobName
+//  - TaskIds
+//  - Statuses
+//  - InstanceIds
+//  - SlaveHosts
+//  - JobKeys
+//  - Offset
+//  - Limit
+type TaskQuery struct {
+  // unused field # 1
+  JobName *string `thrift:"jobName,2" db:"jobName" json:"jobName,omitempty"`
+  // unused field # 3
+  TaskIds []string `thrift:"taskIds,4" db:"taskIds" json:"taskIds,omitempty"`
+  Statuses []ScheduleStatus `thrift:"statuses,5" db:"statuses" json:"statuses,omitempty"`
+  // unused field # 6
+  InstanceIds []int32 `thrift:"instanceIds,7" db:"instanceIds" json:"instanceIds,omitempty"`
+  // unused field # 8
+  Environment *string `thrift:"environment,9" db:"environment" json:"environment,omitempty"`
+  SlaveHosts []string `thrift:"slaveHosts,10" db:"slaveHosts" json:"slaveHosts,omitempty"`
+  JobKeys []*JobKey `thrift:"jobKeys,11" db:"jobKeys" json:"jobKeys,omitempty"`
+  Offset *int32 `thrift:"offset,12" db:"offset" json:"offset,omitempty"`
+  Limit *int32 `thrift:"limit,13" db:"limit" json:"limit,omitempty"`
+  Role *string `thrift:"role,14" db:"role" json:"role,omitempty"`
+}
+
+func NewTaskQuery() *TaskQuery {
+  return &TaskQuery{}
+}
+
+var TaskQuery_Role_DEFAULT string
+func (p *TaskQuery) GetRole() string {
+  if !p.IsSetRole() {
+    return TaskQuery_Role_DEFAULT
+  }
+return *p.Role
+}
+var TaskQuery_Environment_DEFAULT string
+func (p *TaskQuery) GetEnvironment() string {
+  if !p.IsSetEnvironment() {
+    return TaskQuery_Environment_DEFAULT
+  }
+return *p.Environment
+}
+var TaskQuery_JobName_DEFAULT string
+func (p *TaskQuery) GetJobName() string {
+  if !p.IsSetJobName() {
+    return TaskQuery_JobName_DEFAULT
+  }
+return *p.JobName
+}
+var TaskQuery_TaskIds_DEFAULT []string
+
+func (p *TaskQuery) GetTaskIds() []string {
+  return p.TaskIds
+}
+var TaskQuery_Statuses_DEFAULT []ScheduleStatus
+
+func (p *TaskQuery) GetStatuses() []ScheduleStatus {
+  return p.Statuses
+}
+var TaskQuery_InstanceIds_DEFAULT []int32
+
+func (p *TaskQuery) GetInstanceIds() []int32 {
+  return p.InstanceIds
+}
+var TaskQuery_SlaveHosts_DEFAULT []string
+
+func (p *TaskQuery) GetSlaveHosts() []string {
+  return p.SlaveHosts
+}
+var TaskQuery_JobKeys_DEFAULT []*JobKey
+
+func (p *TaskQuery) GetJobKeys() []*JobKey {
+  return p.JobKeys
+}
+var TaskQuery_Offset_DEFAULT int32
+func (p *TaskQuery) GetOffset() int32 {
+  if !p.IsSetOffset() {
+    return TaskQuery_Offset_DEFAULT
+  }
+return *p.Offset
+}
+var TaskQuery_Limit_DEFAULT int32
+func (p *TaskQuery) GetLimit() int32 {
+  if !p.IsSetLimit() {
+    return TaskQuery_Limit_DEFAULT
+  }
+return *p.Limit
+}
+func (p *TaskQuery) IsSetRole() bool {
+  return p.Role != nil
+}
+
+func (p *TaskQuery) IsSetEnvironment() bool {
+  return p.Environment != nil
+}
+
+func (p *TaskQuery) IsSetJobName() bool {
+  return p.JobName != nil
+}
+
+func (p *TaskQuery) IsSetTaskIds() bool {
+  return p.TaskIds != nil
+}
+
+func (p *TaskQuery) IsSetStatuses() bool {
+  return p.Statuses != nil
+}
+
+func (p *TaskQuery) IsSetInstanceIds() bool {
+  return p.InstanceIds != nil
+}
+
+func (p *TaskQuery) IsSetSlaveHosts() bool {
+  return p.SlaveHosts != nil
+}
+
+func (p *TaskQuery) IsSetJobKeys() bool {
+  return p.JobKeys != nil
+}
+
+func (p *TaskQuery) IsSetOffset() bool {
+  return p.Offset != nil
+}
+
+func (p *TaskQuery) IsSetLimit() bool {
+  return p.Limit != nil
+}
+
+func (p *TaskQuery) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 14:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField14(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 9:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField9(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 7:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField7(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 10:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField10(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 11:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField11(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 12:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField12(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 13:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField13(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *TaskQuery)  ReadField14(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 14: ", err)
+} else {
+  p.Role = &v
+}
+  return nil
+}
+
+func (p *TaskQuery)  ReadField9(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 9: ", err)
+} else {
+  p.Environment = &v
+}
+  return nil
+}
+
+func (p *TaskQuery)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.JobName = &v
+}
+  return nil
+}
+
+func (p *TaskQuery)  ReadField4(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]string, 0, size)
+  p.TaskIds =  tSet
+  for i := 0; i < size; i ++ {
+var _elem19 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem19 = v
+}
+    p.TaskIds = append(p.TaskIds, _elem19)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskQuery)  ReadField5(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]ScheduleStatus, 0, size)
+  p.Statuses =  tSet
+  for i := 0; i < size; i ++ {
+var _elem20 ScheduleStatus
+    if v, err := iprot.ReadI32(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    temp := ScheduleStatus(v)
+    _elem20 = temp
+}
+    p.Statuses = append(p.Statuses, _elem20)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskQuery)  ReadField7(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]int32, 0, size)
+  p.InstanceIds =  tSet
+  for i := 0; i < size; i ++ {
+var _elem21 int32
+    if v, err := iprot.ReadI32(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem21 = v
+}
+    p.InstanceIds = append(p.InstanceIds, _elem21)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskQuery)  ReadField10(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]string, 0, size)
+  p.SlaveHosts =  tSet
+  for i := 0; i < size; i ++ {
+var _elem22 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem22 = v
+}
+    p.SlaveHosts = append(p.SlaveHosts, _elem22)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskQuery)  ReadField11(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*JobKey, 0, size)
+  p.JobKeys =  tSet
+  for i := 0; i < size; i ++ {
+    _elem23 := &JobKey{}
+    if err := _elem23.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem23), err)
+    }
+    p.JobKeys = append(p.JobKeys, _elem23)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *TaskQuery)  ReadField12(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 12: ", err)
+} else {
+  p.Offset = &v
+}
+  return nil
+}
+
+func (p *TaskQuery)  ReadField13(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 13: ", err)
+} else {
+  p.Limit = &v
+}
+  return nil
+}
+
+func (p *TaskQuery) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("TaskQuery"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField7(oprot); err != nil { return err }
+    if err := p.writeField9(oprot); err != nil { return err }
+    if err := p.writeField10(oprot); err != nil { return err }
+    if err := p.writeField11(oprot); err != nil { return err }
+    if err := p.writeField12(oprot); err != nil { return err }
+    if err := p.writeField13(oprot); err != nil { return err }
+    if err := p.writeField14(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *TaskQuery) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetJobName() {
+    if err := oprot.WriteFieldBegin("jobName", thrift.STRING, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:jobName: ", p), err) }
+    if err := oprot.WriteString(string(*p.JobName)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.jobName (2) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:jobName: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetTaskIds() {
+    if err := oprot.WriteFieldBegin("taskIds", thrift.SET, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:taskIds: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.STRING, len(p.TaskIds)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.TaskIds); i++ {
+      for j := i+1; j<len(p.TaskIds); j++ {
+        if reflect.DeepEqual(p.TaskIds[i],p.TaskIds[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.TaskIds[i]))
+        }
+      }
+    }
+    for _, v := range p.TaskIds {
+      if err := oprot.WriteString(string(v)); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:taskIds: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField5(oprot thrift.TProtocol) (err error) {
+  if p.IsSetStatuses() {
+    if err := oprot.WriteFieldBegin("statuses", thrift.SET, 5); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:statuses: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.I32, len(p.Statuses)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.Statuses); i++ {
+      for j := i+1; j<len(p.Statuses); j++ {
+        if reflect.DeepEqual(p.Statuses[i],p.Statuses[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Statuses[i]))
+        }
+      }
+    }
+    for _, v := range p.Statuses {
+      if err := oprot.WriteI32(int32(v)); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:statuses: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField7(oprot thrift.TProtocol) (err error) {
+  if p.IsSetInstanceIds() {
+    if err := oprot.WriteFieldBegin("instanceIds", thrift.SET, 7); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:instanceIds: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.I32, len(p.InstanceIds)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.InstanceIds); i++ {
+      for j := i+1; j<len(p.InstanceIds); j++ {
+        if reflect.DeepEqual(p.InstanceIds[i],p.InstanceIds[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.InstanceIds[i]))
+        }
+      }
+    }
+    for _, v := range p.InstanceIds {
+      if err := oprot.WriteI32(int32(v)); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:instanceIds: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField9(oprot thrift.TProtocol) (err error) {
+  if p.IsSetEnvironment() {
+    if err := oprot.WriteFieldBegin("environment", thrift.STRING, 9); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:environment: ", p), err) }
+    if err := oprot.WriteString(string(*p.Environment)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.environment (9) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 9:environment: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField10(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSlaveHosts() {
+    if err := oprot.WriteFieldBegin("slaveHosts", thrift.SET, 10); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:slaveHosts: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.STRING, len(p.SlaveHosts)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.SlaveHosts); i++ {
+      for j := i+1; j<len(p.SlaveHosts); j++ {
+        if reflect.DeepEqual(p.SlaveHosts[i],p.SlaveHosts[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.SlaveHosts[i]))
+        }
+      }
+    }
+    for _, v := range p.SlaveHosts {
+      if err := oprot.WriteString(string(v)); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 10:slaveHosts: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField11(oprot thrift.TProtocol) (err error) {
+  if p.IsSetJobKeys() {
+    if err := oprot.WriteFieldBegin("jobKeys", thrift.SET, 11); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:jobKeys: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.JobKeys)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.JobKeys); i++ {
+      for j := i+1; j<len(p.JobKeys); j++ {
+        if reflect.DeepEqual(p.JobKeys[i],p.JobKeys[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.JobKeys[i]))
+        }
+      }
+    }
+    for _, v := range p.JobKeys {
+      if err := v.Write(oprot); err != nil {
+        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+      }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 11:jobKeys: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField12(oprot thrift.TProtocol) (err error) {
+  if p.IsSetOffset() {
+    if err := oprot.WriteFieldBegin("offset", thrift.I32, 12); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 12:offset: ", p), err) }
+    if err := oprot.WriteI32(int32(*p.Offset)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.offset (12) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 12:offset: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField13(oprot thrift.TProtocol) (err error) {
+  if p.IsSetLimit() {
+    if err := oprot.WriteFieldBegin("limit", thrift.I32, 13); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:limit: ", p), err) }
+    if err := oprot.WriteI32(int32(*p.Limit)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.limit (13) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 13:limit: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) writeField14(oprot thrift.TProtocol) (err error) {
+  if p.IsSetRole() {
+    if err := oprot.WriteFieldBegin("role", thrift.STRING, 14); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 14:role: ", p), err) }
+    if err := oprot.WriteString(string(*p.Role)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.role (14) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 14:role: ", p), err) }
+  }
+  return err
+}
+
+func (p *TaskQuery) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("TaskQuery(%+v)", *p)
+}
+
+// Attributes:
+//  - Host
+//  - Mode
+type HostStatus struct {
+  Host string `thrift:"host,1" db:"host" json:"host"`
+  Mode MaintenanceMode `thrift:"mode,2" db:"mode" json:"mode"`
+}
+
+func NewHostStatus() *HostStatus {
+  return &HostStatus{}
+}
+
+
+func (p *HostStatus) GetHost() string {
+  return p.Host
+}
+
+func (p *HostStatus) GetMode() MaintenanceMode {
+  return p.Mode
+}
+func (p *HostStatus) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *HostStatus)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Host = v
+}
+  return nil
+}
+
+func (p *HostStatus)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  temp := MaintenanceMode(v)
+  p.Mode = temp
+}
+  return nil
+}
+
+func (p *HostStatus) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("HostStatus"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *HostStatus) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("host", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:host: ", p), err) }
+  if err := oprot.WriteString(string(p.Host)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.host (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:host: ", p), err) }
+  return err
+}
+
+func (p *HostStatus) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("mode", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:mode: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Mode)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.mode (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:mode: ", p), err) }
+  return err
+}
+
+func (p *HostStatus) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("HostStatus(%+v)", *p)
+}
+
+// Attributes:
+//  - Role
+//  - JobCount
+//  - CronJobCount
+type RoleSummary struct {
+  Role string `thrift:"role,1" db:"role" json:"role"`
+  JobCount int32 `thrift:"jobCount,2" db:"jobCount" json:"jobCount"`
+  CronJobCount int32 `thrift:"cronJobCount,3" db:"cronJobCount" json:"cronJobCount"`
+}
+
+func NewRoleSummary() *RoleSummary {
+  return &RoleSummary{}
+}
+
+
+func (p *RoleSummary) GetRole() string {
+  return p.Role
+}
+
+func (p *RoleSummary) GetJobCount() int32 {
+  return p.JobCount
+}
+
+func (p *RoleSummary) GetCronJobCount() int32 {
+  return p.CronJobCount
+}
+func (p *RoleSummary) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *RoleSummary)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Role = v
+}
+  return nil
+}
+
+func (p *RoleSummary)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.JobCount = v
+}
+  return nil
+}
+
+func (p *RoleSummary)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.CronJobCount = v
+}
+  return nil
+}
+
+func (p *RoleSummary) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("RoleSummary"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *RoleSummary) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("role", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:role: ", p), err) }
+  if err := oprot.WriteString(string(p.Role)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.role (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:role: ", p), err) }
+  return err
+}
+
+func (p *RoleSummary) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("jobCount", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:jobCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.JobCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.jobCount (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:jobCount: ", p), err) }
+  return err
+}
+
+func (p *RoleSummary) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("cronJobCount", thrift.I32, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:cronJobCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.CronJobCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.cronJobCount (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:cronJobCount: ", p), err) }
+  return err
+}
+
+func (p *RoleSummary) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("RoleSummary(%+v)", *p)
+}
+
+// Attributes:
+//  - HostNames
+type Hosts struct {
+  HostNames []string `thrift:"hostNames,1" db:"hostNames" json:"hostNames"`
+}
+
+func NewHosts() *Hosts {
+  return &Hosts{}
+}
+
+
+func (p *Hosts) GetHostNames() []string {
+  return p.HostNames
+}
+func (p *Hosts) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Hosts)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]string, 0, size)
+  p.HostNames =  tSet
+  for i := 0; i < size; i ++ {
+var _elem24 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem24 = v
+}
+    p.HostNames = append(p.HostNames, _elem24)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *Hosts) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Hosts"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Hosts) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("hostNames", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hostNames: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRING, len(p.HostNames)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.HostNames); i++ {
+    for j := i+1; j<len(p.HostNames); j++ {
+      if reflect.DeepEqual(p.HostNames[i],p.HostNames[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.HostNames[i]))
+      }
+    }
+  }
+  for _, v := range p.HostNames {
+    if err := oprot.WriteString(string(v)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hostNames: ", p), err) }
+  return err
+}
+
+func (p *Hosts) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Hosts(%+v)", *p)
+}
+
+// Attributes:
+//  - TaskId
+//  - Reason
+type PendingReason struct {
+  TaskId string `thrift:"taskId,1" db:"taskId" json:"taskId"`
+  Reason string `thrift:"reason,2" db:"reason" json:"reason"`
+}
+
+func NewPendingReason() *PendingReason {
+  return &PendingReason{}
+}
+
+
+func (p *PendingReason) GetTaskId() string {
+  return p.TaskId
+}
+
+func (p *PendingReason) GetReason() string {
+  return p.Reason
+}
+func (p *PendingReason) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *PendingReason)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.TaskId = v
+}
+  return nil
+}
+
+func (p *PendingReason)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Reason = v
+}
+  return nil
+}
+
+func (p *PendingReason) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("PendingReason"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *PendingReason) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("taskId", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:taskId: ", p), err) }
+  if err := oprot.WriteString(string(p.TaskId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.taskId (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:taskId: ", p), err) }
+  return err
+}
+
+func (p *PendingReason) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("reason", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:reason: ", p), err) }
+  if err := oprot.WriteString(string(p.Reason)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.reason (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:reason: ", p), err) }
+  return err
+}
+
+func (p *PendingReason) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("PendingReason(%+v)", *p)
+}
+
+// Job update key.
+// 
+// Attributes:
+//  - Job: Job being updated
+//  - ID: Update ID.
+type JobUpdateKey struct {
+  Job *JobKey `thrift:"job,1" db:"job" json:"job"`
+  ID string `thrift:"id,2" db:"id" json:"id"`
+}
+
+func NewJobUpdateKey() *JobUpdateKey {
+  return &JobUpdateKey{}
+}
+
+var JobUpdateKey_Job_DEFAULT *JobKey
+func (p *JobUpdateKey) GetJob() *JobKey {
+  if !p.IsSetJob() {
+    return JobUpdateKey_Job_DEFAULT
+  }
+return p.Job
+}
+
+func (p *JobUpdateKey) GetID() string {
+  return p.ID
+}
+func (p *JobUpdateKey) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *JobUpdateKey) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateKey)  ReadField1(iprot thrift.TProtocol) error {
+  p.Job = &JobKey{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateKey)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.ID = v
+}
+  return nil
+}
+
+func (p *JobUpdateKey) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateKey"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateKey) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:job: ", p), err) }
+  if err := p.Job.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:job: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateKey) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("id", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:id: ", p), err) }
+  if err := oprot.WriteString(string(p.ID)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.id (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:id: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateKey) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateKey(%+v)", *p)
+}
+
+// Job update thresholds and limits.
+// 
+// Attributes:
+//  - UpdateGroupSize: Max number of instances being updated at any given moment.
+//  - MaxPerInstanceFailures: Max number of instance failures to tolerate before marking instance as FAILED.
+//  - MaxFailedInstances: Max number of FAILED instances to tolerate before terminating the update.
+//  - MinWaitInInstanceRunningMs: Min time to watch a RUNNING instance.
+//  - RollbackOnFailure: If true, enables failed update rollback.
+//  - UpdateOnlyTheseInstances: Instance IDs to act on. All instances will be affected if this is not set.
+//  - WaitForBatchCompletion: If true, use updateGroupSize as strict batching boundaries, and avoid proceeding to another
+// batch until the preceding batch finishes updating.
+//  - BlockIfNoPulsesAfterMs: If set, requires external calls to pulseJobUpdate RPC within the specified rate for the
+// update to make progress. If no pulses received within specified interval the update will
+// block. A blocked update is unable to continue but retains its current status. It may only get
+// unblocked by a fresh pulseJobUpdate call.
+//  - SlaAware: If true, updates will obey the SLA requirements of the tasks being updated. If the SLA policy
+// differs between the old and new task configurations, updates will use the newest configuration.
+type JobUpdateSettings struct {
+  UpdateGroupSize int32 `thrift:"updateGroupSize,1" db:"updateGroupSize" json:"updateGroupSize"`
+  MaxPerInstanceFailures int32 `thrift:"maxPerInstanceFailures,2" db:"maxPerInstanceFailures" json:"maxPerInstanceFailures"`
+  MaxFailedInstances int32 `thrift:"maxFailedInstances,3" db:"maxFailedInstances" json:"maxFailedInstances"`
+  // unused field # 4
+  MinWaitInInstanceRunningMs int32 `thrift:"minWaitInInstanceRunningMs,5" db:"minWaitInInstanceRunningMs" json:"minWaitInInstanceRunningMs"`
+  RollbackOnFailure bool `thrift:"rollbackOnFailure,6" db:"rollbackOnFailure" json:"rollbackOnFailure"`
+  UpdateOnlyTheseInstances []*Range `thrift:"updateOnlyTheseInstances,7" db:"updateOnlyTheseInstances" json:"updateOnlyTheseInstances"`
+  WaitForBatchCompletion bool `thrift:"waitForBatchCompletion,8" db:"waitForBatchCompletion" json:"waitForBatchCompletion"`
+  BlockIfNoPulsesAfterMs *int32 `thrift:"blockIfNoPulsesAfterMs,9" db:"blockIfNoPulsesAfterMs" json:"blockIfNoPulsesAfterMs,omitempty"`
+  SlaAware *bool `thrift:"slaAware,10" db:"slaAware" json:"slaAware,omitempty"`
+}
+
+func NewJobUpdateSettings() *JobUpdateSettings {
+  return &JobUpdateSettings{}
+}
+
+
+func (p *JobUpdateSettings) GetUpdateGroupSize() int32 {
+  return p.UpdateGroupSize
+}
+
+func (p *JobUpdateSettings) GetMaxPerInstanceFailures() int32 {
+  return p.MaxPerInstanceFailures
+}
+
+func (p *JobUpdateSettings) GetMaxFailedInstances() int32 {
+  return p.MaxFailedInstances
+}
+
+func (p *JobUpdateSettings) GetMinWaitInInstanceRunningMs() int32 {
+  return p.MinWaitInInstanceRunningMs
+}
+
+func (p *JobUpdateSettings) GetRollbackOnFailure() bool {
+  return p.RollbackOnFailure
+}
+
+func (p *JobUpdateSettings) GetUpdateOnlyTheseInstances() []*Range {
+  return p.UpdateOnlyTheseInstances
+}
+
+func (p *JobUpdateSettings) GetWaitForBatchCompletion() bool {
+  return p.WaitForBatchCompletion
+}
+var JobUpdateSettings_BlockIfNoPulsesAfterMs_DEFAULT int32
+func (p *JobUpdateSettings) GetBlockIfNoPulsesAfterMs() int32 {
+  if !p.IsSetBlockIfNoPulsesAfterMs() {
+    return JobUpdateSettings_BlockIfNoPulsesAfterMs_DEFAULT
+  }
+return *p.BlockIfNoPulsesAfterMs
+}
+var JobUpdateSettings_SlaAware_DEFAULT bool
+func (p *JobUpdateSettings) GetSlaAware() bool {
+  if !p.IsSetSlaAware() {
+    return JobUpdateSettings_SlaAware_DEFAULT
+  }
+return *p.SlaAware
+}
+func (p *JobUpdateSettings) IsSetBlockIfNoPulsesAfterMs() bool {
+  return p.BlockIfNoPulsesAfterMs != nil
+}
+
+func (p *JobUpdateSettings) IsSetSlaAware() bool {
+  return p.SlaAware != nil
+}
+
+func (p *JobUpdateSettings) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 7:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField7(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 8:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField8(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 9:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField9(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 10:
+      if fieldTypeId == thrift.BOOL {
+        if err := p.ReadField10(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.UpdateGroupSize = v
+}
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.MaxPerInstanceFailures = v
+}
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.MaxFailedInstances = v
+}
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField5(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 5: ", err)
+} else {
+  p.MinWaitInInstanceRunningMs = v
+}
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField6(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 6: ", err)
+} else {
+  p.RollbackOnFailure = v
+}
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField7(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Range, 0, size)
+  p.UpdateOnlyTheseInstances =  tSet
+  for i := 0; i < size; i ++ {
+    _elem25 := &Range{}
+    if err := _elem25.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem25), err)
+    }
+    p.UpdateOnlyTheseInstances = append(p.UpdateOnlyTheseInstances, _elem25)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField8(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 8: ", err)
+} else {
+  p.WaitForBatchCompletion = v
+}
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField9(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 9: ", err)
+} else {
+  p.BlockIfNoPulsesAfterMs = &v
+}
+  return nil
+}
+
+func (p *JobUpdateSettings)  ReadField10(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadBool(); err != nil {
+  return thrift.PrependError("error reading field 10: ", err)
+} else {
+  p.SlaAware = &v
+}
+  return nil
+}
+
+func (p *JobUpdateSettings) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateSettings"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+    if err := p.writeField7(oprot); err != nil { return err }
+    if err := p.writeField8(oprot); err != nil { return err }
+    if err := p.writeField9(oprot); err != nil { return err }
+    if err := p.writeField10(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateSettings) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("updateGroupSize", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:updateGroupSize: ", p), err) }
+  if err := oprot.WriteI32(int32(p.UpdateGroupSize)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.updateGroupSize (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:updateGroupSize: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSettings) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("maxPerInstanceFailures", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:maxPerInstanceFailures: ", p), err) }
+  if err := oprot.WriteI32(int32(p.MaxPerInstanceFailures)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.maxPerInstanceFailures (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:maxPerInstanceFailures: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSettings) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("maxFailedInstances", thrift.I32, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:maxFailedInstances: ", p), err) }
+  if err := oprot.WriteI32(int32(p.MaxFailedInstances)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.maxFailedInstances (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:maxFailedInstances: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSettings) writeField5(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("minWaitInInstanceRunningMs", thrift.I32, 5); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:minWaitInInstanceRunningMs: ", p), err) }
+  if err := oprot.WriteI32(int32(p.MinWaitInInstanceRunningMs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.minWaitInInstanceRunningMs (5) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:minWaitInInstanceRunningMs: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSettings) writeField6(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("rollbackOnFailure", thrift.BOOL, 6); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:rollbackOnFailure: ", p), err) }
+  if err := oprot.WriteBool(bool(p.RollbackOnFailure)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.rollbackOnFailure (6) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:rollbackOnFailure: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSettings) writeField7(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("updateOnlyTheseInstances", thrift.SET, 7); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:updateOnlyTheseInstances: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.UpdateOnlyTheseInstances)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.UpdateOnlyTheseInstances); i++ {
+    for j := i+1; j<len(p.UpdateOnlyTheseInstances); j++ {
+      if reflect.DeepEqual(p.UpdateOnlyTheseInstances[i],p.UpdateOnlyTheseInstances[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.UpdateOnlyTheseInstances[i]))
+      }
+    }
+  }
+  for _, v := range p.UpdateOnlyTheseInstances {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 7:updateOnlyTheseInstances: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSettings) writeField8(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("waitForBatchCompletion", thrift.BOOL, 8); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:waitForBatchCompletion: ", p), err) }
+  if err := oprot.WriteBool(bool(p.WaitForBatchCompletion)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.waitForBatchCompletion (8) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 8:waitForBatchCompletion: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSettings) writeField9(oprot thrift.TProtocol) (err error) {
+  if p.IsSetBlockIfNoPulsesAfterMs() {
+    if err := oprot.WriteFieldBegin("blockIfNoPulsesAfterMs", thrift.I32, 9); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:blockIfNoPulsesAfterMs: ", p), err) }
+    if err := oprot.WriteI32(int32(*p.BlockIfNoPulsesAfterMs)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.blockIfNoPulsesAfterMs (9) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 9:blockIfNoPulsesAfterMs: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateSettings) writeField10(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSlaAware() {
+    if err := oprot.WriteFieldBegin("slaAware", thrift.BOOL, 10); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:slaAware: ", p), err) }
+    if err := oprot.WriteBool(bool(*p.SlaAware)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.slaAware (10) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 10:slaAware: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateSettings) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateSettings(%+v)", *p)
+}
+
+// Event marking a state transition in job update lifecycle.
+// 
+// Attributes:
+//  - Status: Update status.
+//  - TimestampMs: Epoch timestamp in milliseconds.
+//  - User: User who performed this event (if user-initiated).
+//  - Message: Message from the user (for user-initiated transitions) or the scheduler about why the state was
+// changed.
+type JobUpdateEvent struct {
+  Status JobUpdateStatus `thrift:"status,1" db:"status" json:"status"`
+  TimestampMs int64 `thrift:"timestampMs,2" db:"timestampMs" json:"timestampMs"`
+  User *string `thrift:"user,3" db:"user" json:"user,omitempty"`
+  Message *string `thrift:"message,4" db:"message" json:"message,omitempty"`
+}
+
+func NewJobUpdateEvent() *JobUpdateEvent {
+  return &JobUpdateEvent{}
+}
+
+
+func (p *JobUpdateEvent) GetStatus() JobUpdateStatus {
+  return p.Status
+}
+
+func (p *JobUpdateEvent) GetTimestampMs() int64 {
+  return p.TimestampMs
+}
+var JobUpdateEvent_User_DEFAULT string
+func (p *JobUpdateEvent) GetUser() string {
+  if !p.IsSetUser() {
+    return JobUpdateEvent_User_DEFAULT
+  }
+return *p.User
+}
+var JobUpdateEvent_Message_DEFAULT string
+func (p *JobUpdateEvent) GetMessage() string {
+  if !p.IsSetMessage() {
+    return JobUpdateEvent_Message_DEFAULT
+  }
+return *p.Message
+}
+func (p *JobUpdateEvent) IsSetUser() bool {
+  return p.User != nil
+}
+
+func (p *JobUpdateEvent) IsSetMessage() bool {
+  return p.Message != nil
+}
+
+func (p *JobUpdateEvent) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateEvent)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  temp := JobUpdateStatus(v)
+  p.Status = temp
+}
+  return nil
+}
+
+func (p *JobUpdateEvent)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.TimestampMs = v
+}
+  return nil
+}
+
+func (p *JobUpdateEvent)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.User = &v
+}
+  return nil
+}
+
+func (p *JobUpdateEvent)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.Message = &v
+}
+  return nil
+}
+
+func (p *JobUpdateEvent) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateEvent"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateEvent) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("status", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:status: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Status)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.status (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:status: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateEvent) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("timestampMs", thrift.I64, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:timestampMs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.TimestampMs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.timestampMs (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:timestampMs: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateEvent) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetUser() {
+    if err := oprot.WriteFieldBegin("user", thrift.STRING, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:user: ", p), err) }
+    if err := oprot.WriteString(string(*p.User)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.user (3) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:user: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateEvent) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMessage() {
+    if err := oprot.WriteFieldBegin("message", thrift.STRING, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:message: ", p), err) }
+    if err := oprot.WriteString(string(*p.Message)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.message (4) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:message: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateEvent) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateEvent(%+v)", *p)
+}
+
+// Event marking a state transition in job instance update lifecycle.
+// 
+// Attributes:
+//  - InstanceId: Job instance ID.
+//  - TimestampMs: Epoch timestamp in milliseconds.
+//  - Action: Job update action taken on the instance.
+//  - Message: Optional message explaining the instance update event.
+type JobInstanceUpdateEvent struct {
+  InstanceId int32 `thrift:"instanceId,1" db:"instanceId" json:"instanceId"`
+  TimestampMs int64 `thrift:"timestampMs,2" db:"timestampMs" json:"timestampMs"`
+  Action JobUpdateAction `thrift:"action,3" db:"action" json:"action"`
+  Message *string `thrift:"message,4" db:"message" json:"message,omitempty"`
+}
+
+func NewJobInstanceUpdateEvent() *JobInstanceUpdateEvent {
+  return &JobInstanceUpdateEvent{}
+}
+
+
+func (p *JobInstanceUpdateEvent) GetInstanceId() int32 {
+  return p.InstanceId
+}
+
+func (p *JobInstanceUpdateEvent) GetTimestampMs() int64 {
+  return p.TimestampMs
+}
+
+func (p *JobInstanceUpdateEvent) GetAction() JobUpdateAction {
+  return p.Action
+}
+var JobInstanceUpdateEvent_Message_DEFAULT string
+func (p *JobInstanceUpdateEvent) GetMessage() string {
+  if !p.IsSetMessage() {
+    return JobInstanceUpdateEvent_Message_DEFAULT
+  }
+return *p.Message
+}
+func (p *JobInstanceUpdateEvent) IsSetMessage() bool {
+  return p.Message != nil
+}
+
+func (p *JobInstanceUpdateEvent) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobInstanceUpdateEvent)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.InstanceId = v
+}
+  return nil
+}
+
+func (p *JobInstanceUpdateEvent)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.TimestampMs = v
+}
+  return nil
+}
+
+func (p *JobInstanceUpdateEvent)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  temp := JobUpdateAction(v)
+  p.Action = temp
+}
+  return nil
+}
+
+func (p *JobInstanceUpdateEvent)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.Message = &v
+}
+  return nil
+}
+
+func (p *JobInstanceUpdateEvent) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobInstanceUpdateEvent"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobInstanceUpdateEvent) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instanceId", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:instanceId: ", p), err) }
+  if err := oprot.WriteI32(int32(p.InstanceId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.instanceId (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:instanceId: ", p), err) }
+  return err
+}
+
+func (p *JobInstanceUpdateEvent) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("timestampMs", thrift.I64, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:timestampMs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.TimestampMs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.timestampMs (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:timestampMs: ", p), err) }
+  return err
+}
+
+func (p *JobInstanceUpdateEvent) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("action", thrift.I32, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:action: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Action)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.action (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:action: ", p), err) }
+  return err
+}
+
+func (p *JobInstanceUpdateEvent) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMessage() {
+    if err := oprot.WriteFieldBegin("message", thrift.STRING, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:message: ", p), err) }
+    if err := oprot.WriteString(string(*p.Message)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.message (4) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:message: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobInstanceUpdateEvent) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobInstanceUpdateEvent(%+v)", *p)
+}
+
+// Maps instance IDs to TaskConfigs it.
+// 
+// Attributes:
+//  - Task: A TaskConfig associated with instances.
+//  - Instances: Instances associated with the TaskConfig.
+type InstanceTaskConfig struct {
+  Task *TaskConfig `thrift:"task,1" db:"task" json:"task"`
+  Instances []*Range `thrift:"instances,2" db:"instances" json:"instances"`
+}
+
+func NewInstanceTaskConfig() *InstanceTaskConfig {
+  return &InstanceTaskConfig{}
+}
+
+var InstanceTaskConfig_Task_DEFAULT *TaskConfig
+func (p *InstanceTaskConfig) GetTask() *TaskConfig {
+  if !p.IsSetTask() {
+    return InstanceTaskConfig_Task_DEFAULT
+  }
+return p.Task
+}
+
+func (p *InstanceTaskConfig) GetInstances() []*Range {
+  return p.Instances
+}
+func (p *InstanceTaskConfig) IsSetTask() bool {
+  return p.Task != nil
+}
+
+func (p *InstanceTaskConfig) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *InstanceTaskConfig)  ReadField1(iprot thrift.TProtocol) error {
+  p.Task = &TaskConfig{}
+  if err := p.Task.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Task), err)
+  }
+  return nil
+}
+
+func (p *InstanceTaskConfig)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Range, 0, size)
+  p.Instances =  tSet
+  for i := 0; i < size; i ++ {
+    _elem26 := &Range{}
+    if err := _elem26.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem26), err)
+    }
+    p.Instances = append(p.Instances, _elem26)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *InstanceTaskConfig) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("InstanceTaskConfig"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *InstanceTaskConfig) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("task", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:task: ", p), err) }
+  if err := p.Task.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Task), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:task: ", p), err) }
+  return err
+}
+
+func (p *InstanceTaskConfig) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instances", thrift.SET, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instances: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Instances)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Instances); i++ {
+    for j := i+1; j<len(p.Instances); j++ {
+      if reflect.DeepEqual(p.Instances[i],p.Instances[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Instances[i]))
+      }
+    }
+  }
+  for _, v := range p.Instances {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instances: ", p), err) }
+  return err
+}
+
+func (p *InstanceTaskConfig) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("InstanceTaskConfig(%+v)", *p)
+}
+
+// Current job update state including status and created/modified timestamps.
+// 
+// Attributes:
+//  - Status: Current status of the update.
+//  - CreatedTimestampMs: Created timestamp in milliseconds.
+//  - LastModifiedTimestampMs: Last modified timestamp in milliseconds.
+type JobUpdateState struct {
+  Status JobUpdateStatus `thrift:"status,1" db:"status" json:"status"`
+  CreatedTimestampMs int64 `thrift:"createdTimestampMs,2" db:"createdTimestampMs" json:"createdTimestampMs"`
+  LastModifiedTimestampMs int64 `thrift:"lastModifiedTimestampMs,3" db:"lastModifiedTimestampMs" json:"lastModifiedTimestampMs"`
+}
+
+func NewJobUpdateState() *JobUpdateState {
+  return &JobUpdateState{}
+}
+
+
+func (p *JobUpdateState) GetStatus() JobUpdateStatus {
+  return p.Status
+}
+
+func (p *JobUpdateState) GetCreatedTimestampMs() int64 {
+  return p.CreatedTimestampMs
+}
+
+func (p *JobUpdateState) GetLastModifiedTimestampMs() int64 {
+  return p.LastModifiedTimestampMs
+}
+func (p *JobUpdateState) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateState)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  temp := JobUpdateStatus(v)
+  p.Status = temp
+}
+  return nil
+}
+
+func (p *JobUpdateState)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.CreatedTimestampMs = v
+}
+  return nil
+}
+
+func (p *JobUpdateState)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.LastModifiedTimestampMs = v
+}
+  return nil
+}
+
+func (p *JobUpdateState) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateState"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateState) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("status", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:status: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Status)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.status (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:status: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateState) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("createdTimestampMs", thrift.I64, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:createdTimestampMs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.CreatedTimestampMs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.createdTimestampMs (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:createdTimestampMs: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateState) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("lastModifiedTimestampMs", thrift.I64, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:lastModifiedTimestampMs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.LastModifiedTimestampMs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.lastModifiedTimestampMs (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:lastModifiedTimestampMs: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateState) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateState(%+v)", *p)
+}
+
+// Summary of the job update including job key, user and current state.
+// 
+// Attributes:
+//  - Key: Unique identifier for the update.
+//  - User: User initiated an update.
+//  - State: Current job update state.
+//  - Metadata: Update metadata supplied by the client.
+type JobUpdateSummary struct {
+  // unused fields # 1 to 2
+  User string `thrift:"user,3" db:"user" json:"user"`
+  State *JobUpdateState `thrift:"state,4" db:"state" json:"state"`
+  Key *JobUpdateKey `thrift:"key,5" db:"key" json:"key"`
+  Metadata []*Metadata `thrift:"metadata,6" db:"metadata" json:"metadata,omitempty"`
+}
+
+func NewJobUpdateSummary() *JobUpdateSummary {
+  return &JobUpdateSummary{}
+}
+
+var JobUpdateSummary_Key_DEFAULT *JobUpdateKey
+func (p *JobUpdateSummary) GetKey() *JobUpdateKey {
+  if !p.IsSetKey() {
+    return JobUpdateSummary_Key_DEFAULT
+  }
+return p.Key
+}
+
+func (p *JobUpdateSummary) GetUser() string {
+  return p.User
+}
+var JobUpdateSummary_State_DEFAULT *JobUpdateState
+func (p *JobUpdateSummary) GetState() *JobUpdateState {
+  if !p.IsSetState() {
+    return JobUpdateSummary_State_DEFAULT
+  }
+return p.State
+}
+var JobUpdateSummary_Metadata_DEFAULT []*Metadata
+
+func (p *JobUpdateSummary) GetMetadata() []*Metadata {
+  return p.Metadata
+}
+func (p *JobUpdateSummary) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *JobUpdateSummary) IsSetState() bool {
+  return p.State != nil
+}
+
+func (p *JobUpdateSummary) IsSetMetadata() bool {
+  return p.Metadata != nil
+}
+
+func (p *JobUpdateSummary) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 5:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateSummary)  ReadField5(iprot thrift.TProtocol) error {
+  p.Key = &JobUpdateKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateSummary)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.User = v
+}
+  return nil
+}
+
+func (p *JobUpdateSummary)  ReadField4(iprot thrift.TProtocol) error {
+  p.State = &JobUpdateState{}
+  if err := p.State.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.State), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateSummary)  ReadField6(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Metadata, 0, size)
+  p.Metadata =  tSet
+  for i := 0; i < size; i ++ {
+    _elem27 := &Metadata{}
+    if err := _elem27.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem27), err)
+    }
+    p.Metadata = append(p.Metadata, _elem27)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *JobUpdateSummary) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateSummary"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateSummary) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("user", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:user: ", p), err) }
+  if err := oprot.WriteString(string(p.User)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.user (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:user: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSummary) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("state", thrift.STRUCT, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:state: ", p), err) }
+  if err := p.State.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.State), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:state: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSummary) writeField5(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 5); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:key: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateSummary) writeField6(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMetadata() {
+    if err := oprot.WriteFieldBegin("metadata", thrift.SET, 6); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:metadata: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Metadata)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.Metadata); i++ {
+      for j := i+1; j<len(p.Metadata); j++ {
+        if reflect.DeepEqual(p.Metadata[i],p.Metadata[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Metadata[i]))
+        }
+      }
+    }
+    for _, v := range p.Metadata {
+      if err := v.Write(oprot); err != nil {
+        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+      }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:metadata: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateSummary) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateSummary(%+v)", *p)
+}
+
+// Update configuration and setting details.
+// 
+// Attributes:
+//  - InitialState: Actual InstanceId -> TaskConfig mapping when the update was requested.
+//  - DesiredState: Desired configuration when the update completes.
+//  - Settings: Update specific settings.
+type JobUpdateInstructions struct {
+  InitialState []*InstanceTaskConfig `thrift:"initialState,1" db:"initialState" json:"initialState"`
+  DesiredState *InstanceTaskConfig `thrift:"desiredState,2" db:"desiredState" json:"desiredState"`
+  Settings *JobUpdateSettings `thrift:"settings,3" db:"settings" json:"settings"`
+}
+
+func NewJobUpdateInstructions() *JobUpdateInstructions {
+  return &JobUpdateInstructions{}
+}
+
+
+func (p *JobUpdateInstructions) GetInitialState() []*InstanceTaskConfig {
+  return p.InitialState
+}
+var JobUpdateInstructions_DesiredState_DEFAULT *InstanceTaskConfig
+func (p *JobUpdateInstructions) GetDesiredState() *InstanceTaskConfig {
+  if !p.IsSetDesiredState() {
+    return JobUpdateInstructions_DesiredState_DEFAULT
+  }
+return p.DesiredState
+}
+var JobUpdateInstructions_Settings_DEFAULT *JobUpdateSettings
+func (p *JobUpdateInstructions) GetSettings() *JobUpdateSettings {
+  if !p.IsSetSettings() {
+    return JobUpdateInstructions_Settings_DEFAULT
+  }
+return p.Settings
+}
+func (p *JobUpdateInstructions) IsSetDesiredState() bool {
+  return p.DesiredState != nil
+}
+
+func (p *JobUpdateInstructions) IsSetSettings() bool {
+  return p.Settings != nil
+}
+
+func (p *JobUpdateInstructions) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateInstructions)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*InstanceTaskConfig, 0, size)
+  p.InitialState =  tSet
+  for i := 0; i < size; i ++ {
+    _elem28 := &InstanceTaskConfig{}
+    if err := _elem28.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem28), err)
+    }
+    p.InitialState = append(p.InitialState, _elem28)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *JobUpdateInstructions)  ReadField2(iprot thrift.TProtocol) error {
+  p.DesiredState = &InstanceTaskConfig{}
+  if err := p.DesiredState.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DesiredState), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateInstructions)  ReadField3(iprot thrift.TProtocol) error {
+  p.Settings = &JobUpdateSettings{}
+  if err := p.Settings.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Settings), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateInstructions) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateInstructions"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateInstructions) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("initialState", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:initialState: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.InitialState)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.InitialState); i++ {
+    for j := i+1; j<len(p.InitialState); j++ {
+      if reflect.DeepEqual(p.InitialState[i],p.InitialState[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.InitialState[i]))
+      }
+    }
+  }
+  for _, v := range p.InitialState {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:initialState: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateInstructions) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("desiredState", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:desiredState: ", p), err) }
+  if err := p.DesiredState.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DesiredState), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:desiredState: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateInstructions) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("settings", thrift.STRUCT, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:settings: ", p), err) }
+  if err := p.Settings.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Settings), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:settings: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateInstructions) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateInstructions(%+v)", *p)
+}
+
+// Full definition of the job update.
+// 
+// Attributes:
+//  - Summary: Update summary.
+//  - Instructions: Update configuration.
+type JobUpdate struct {
+  Summary *JobUpdateSummary `thrift:"summary,1" db:"summary" json:"summary"`
+  Instructions *JobUpdateInstructions `thrift:"instructions,2" db:"instructions" json:"instructions"`
+}
+
+func NewJobUpdate() *JobUpdate {
+  return &JobUpdate{}
+}
+
+var JobUpdate_Summary_DEFAULT *JobUpdateSummary
+func (p *JobUpdate) GetSummary() *JobUpdateSummary {
+  if !p.IsSetSummary() {
+    return JobUpdate_Summary_DEFAULT
+  }
+return p.Summary
+}
+var JobUpdate_Instructions_DEFAULT *JobUpdateInstructions
+func (p *JobUpdate) GetInstructions() *JobUpdateInstructions {
+  if !p.IsSetInstructions() {
+    return JobUpdate_Instructions_DEFAULT
+  }
+return p.Instructions
+}
+func (p *JobUpdate) IsSetSummary() bool {
+  return p.Summary != nil
+}
+
+func (p *JobUpdate) IsSetInstructions() bool {
+  return p.Instructions != nil
+}
+
+func (p *JobUpdate) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdate)  ReadField1(iprot thrift.TProtocol) error {
+  p.Summary = &JobUpdateSummary{}
+  if err := p.Summary.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Summary), err)
+  }
+  return nil
+}
+
+func (p *JobUpdate)  ReadField2(iprot thrift.TProtocol) error {
+  p.Instructions = &JobUpdateInstructions{}
+  if err := p.Instructions.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Instructions), err)
+  }
+  return nil
+}
+
+func (p *JobUpdate) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdate"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdate) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("summary", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:summary: ", p), err) }
+  if err := p.Summary.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Summary), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:summary: ", p), err) }
+  return err
+}
+
+func (p *JobUpdate) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instructions", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instructions: ", p), err) }
+  if err := p.Instructions.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Instructions), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instructions: ", p), err) }
+  return err
+}
+
+func (p *JobUpdate) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdate(%+v)", *p)
+}
+
+// Attributes:
+//  - Update: Update definition.
+//  - UpdateEvents: History for this update.
+//  - InstanceEvents: History for the individual instances updated.
+type JobUpdateDetails struct {
+  Update *JobUpdate `thrift:"update,1" db:"update" json:"update"`
+  UpdateEvents []*JobUpdateEvent `thrift:"updateEvents,2" db:"updateEvents" json:"updateEvents"`
+  InstanceEvents []*JobInstanceUpdateEvent `thrift:"instanceEvents,3" db:"instanceEvents" json:"instanceEvents"`
+}
+
+func NewJobUpdateDetails() *JobUpdateDetails {
+  return &JobUpdateDetails{}
+}
+
+var JobUpdateDetails_Update_DEFAULT *JobUpdate
+func (p *JobUpdateDetails) GetUpdate() *JobUpdate {
+  if !p.IsSetUpdate() {
+    return JobUpdateDetails_Update_DEFAULT
+  }
+return p.Update
+}
+
+func (p *JobUpdateDetails) GetUpdateEvents() []*JobUpdateEvent {
+  return p.UpdateEvents
+}
+
+func (p *JobUpdateDetails) GetInstanceEvents() []*JobInstanceUpdateEvent {
+  return p.InstanceEvents
+}
+func (p *JobUpdateDetails) IsSetUpdate() bool {
+  return p.Update != nil
+}
+
+func (p *JobUpdateDetails) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateDetails)  ReadField1(iprot thrift.TProtocol) error {
+  p.Update = &JobUpdate{}
+  if err := p.Update.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Update), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateDetails)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*JobUpdateEvent, 0, size)
+  p.UpdateEvents =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem29 := &JobUpdateEvent{}
+    if err := _elem29.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem29), err)
+    }
+    p.UpdateEvents = append(p.UpdateEvents, _elem29)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *JobUpdateDetails)  ReadField3(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*JobInstanceUpdateEvent, 0, size)
+  p.InstanceEvents =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem30 := &JobInstanceUpdateEvent{}
+    if err := _elem30.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem30), err)
+    }
+    p.InstanceEvents = append(p.InstanceEvents, _elem30)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *JobUpdateDetails) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateDetails"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateDetails) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("update", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:update: ", p), err) }
+  if err := p.Update.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Update), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:update: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateDetails) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("updateEvents", thrift.LIST, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:updateEvents: ", p), err) }
+  if err := oprot.WriteListBegin(thrift.STRUCT, len(p.UpdateEvents)); err != nil {
+    return thrift.PrependError("error writing list begin: ", err)
+  }
+  for _, v := range p.UpdateEvents {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteListEnd(); err != nil {
+    return thrift.PrependError("error writing list end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:updateEvents: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateDetails) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instanceEvents", thrift.LIST, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:instanceEvents: ", p), err) }
+  if err := oprot.WriteListBegin(thrift.STRUCT, len(p.InstanceEvents)); err != nil {
+    return thrift.PrependError("error writing list begin: ", err)
+  }
+  for _, v := range p.InstanceEvents {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteListEnd(); err != nil {
+    return thrift.PrependError("error writing list end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:instanceEvents: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateDetails) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateDetails(%+v)", *p)
+}
+
+// A request to update the following instances of an existing job. Used by startUpdate.
+// 
+// Attributes:
+//  - TaskConfig: Desired TaskConfig to apply.
+//  - InstanceCount: Desired number of instances of the task config.
+//  - Settings: Update settings and limits.
+//  - Metadata: Update metadata supplied by the client issuing the JobUpdateRequest.
+type JobUpdateRequest struct {
+  TaskConfig *TaskConfig `thrift:"taskConfig,1" db:"taskConfig" json:"taskConfig"`
+  InstanceCount int32 `thrift:"instanceCount,2" db:"instanceCount" json:"instanceCount"`
+  Settings *JobUpdateSettings `thrift:"settings,3" db:"settings" json:"settings"`
+  Metadata []*Metadata `thrift:"metadata,4" db:"metadata" json:"metadata,omitempty"`
+}
+
+func NewJobUpdateRequest() *JobUpdateRequest {
+  return &JobUpdateRequest{}
+}
+
+var JobUpdateRequest_TaskConfig_DEFAULT *TaskConfig
+func (p *JobUpdateRequest) GetTaskConfig() *TaskConfig {
+  if !p.IsSetTaskConfig() {
+    return JobUpdateRequest_TaskConfig_DEFAULT
+  }
+return p.TaskConfig
+}
+
+func (p *JobUpdateRequest) GetInstanceCount() int32 {
+  return p.InstanceCount
+}
+var JobUpdateRequest_Settings_DEFAULT *JobUpdateSettings
+func (p *JobUpdateRequest) GetSettings() *JobUpdateSettings {
+  if !p.IsSetSettings() {
+    return JobUpdateRequest_Settings_DEFAULT
+  }
+return p.Settings
+}
+var JobUpdateRequest_Metadata_DEFAULT []*Metadata
+
+func (p *JobUpdateRequest) GetMetadata() []*Metadata {
+  return p.Metadata
+}
+func (p *JobUpdateRequest) IsSetTaskConfig() bool {
+  return p.TaskConfig != nil
+}
+
+func (p *JobUpdateRequest) IsSetSettings() bool {
+  return p.Settings != nil
+}
+
+func (p *JobUpdateRequest) IsSetMetadata() bool {
+  return p.Metadata != nil
+}
+
+func (p *JobUpdateRequest) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateRequest)  ReadField1(iprot thrift.TProtocol) error {
+  p.TaskConfig = &TaskConfig{}
+  if err := p.TaskConfig.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TaskConfig), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateRequest)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.InstanceCount = v
+}
+  return nil
+}
+
+func (p *JobUpdateRequest)  ReadField3(iprot thrift.TProtocol) error {
+  p.Settings = &JobUpdateSettings{}
+  if err := p.Settings.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Settings), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateRequest)  ReadField4(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*Metadata, 0, size)
+  p.Metadata =  tSet
+  for i := 0; i < size; i ++ {
+    _elem31 := &Metadata{}
+    if err := _elem31.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem31), err)
+    }
+    p.Metadata = append(p.Metadata, _elem31)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *JobUpdateRequest) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateRequest"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateRequest) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("taskConfig", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:taskConfig: ", p), err) }
+  if err := p.TaskConfig.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TaskConfig), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:taskConfig: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateRequest) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instanceCount", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instanceCount: ", p), err) }
+  if err := oprot.WriteI32(int32(p.InstanceCount)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.instanceCount (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instanceCount: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateRequest) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("settings", thrift.STRUCT, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:settings: ", p), err) }
+  if err := p.Settings.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Settings), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:settings: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateRequest) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMetadata() {
+    if err := oprot.WriteFieldBegin("metadata", thrift.SET, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:metadata: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Metadata)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.Metadata); i++ {
+      for j := i+1; j<len(p.Metadata); j++ {
+        if reflect.DeepEqual(p.Metadata[i],p.Metadata[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Metadata[i]))
+        }
+      }
+    }
+    for _, v := range p.Metadata {
+      if err := v.Write(oprot); err != nil {
+        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+      }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:metadata: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateRequest) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateRequest(%+v)", *p)
+}
+
+// Contains a set of restrictions on matching job updates where all restrictions must be met
+// (terms are AND'ed together).
+// 
+// Attributes:
+//  - Role: Job role.
+//  - Key: Unique identifier for a job update.
+//  - JobKey: Job key.
+//  - User: User who created the update.
+//  - UpdateStatuses: Set of update statuses.
+//  - Offset: Offset to serve data from. Used by pagination.
+//  - Limit: Number or records to serve. Used by pagination.
+type JobUpdateQuery struct {
+  // unused field # 1
+  Role *string `thrift:"role,2" db:"role" json:"role,omitempty"`
+  JobKey *JobKey `thrift:"jobKey,3" db:"jobKey" json:"jobKey,omitempty"`
+  User *string `thrift:"user,4" db:"user" json:"user,omitempty"`
+  UpdateStatuses []JobUpdateStatus `thrift:"updateStatuses,5" db:"updateStatuses" json:"updateStatuses,omitempty"`
+  Offset int32 `thrift:"offset,6" db:"offset" json:"offset"`
+  Limit int32 `thrift:"limit,7" db:"limit" json:"limit"`
+  Key *JobUpdateKey `thrift:"key,8" db:"key" json:"key,omitempty"`
+}
+
+func NewJobUpdateQuery() *JobUpdateQuery {
+  return &JobUpdateQuery{}
+}
+
+var JobUpdateQuery_Role_DEFAULT string
+func (p *JobUpdateQuery) GetRole() string {
+  if !p.IsSetRole() {
+    return JobUpdateQuery_Role_DEFAULT
+  }
+return *p.Role
+}
+var JobUpdateQuery_Key_DEFAULT *JobUpdateKey
+func (p *JobUpdateQuery) GetKey() *JobUpdateKey {
+  if !p.IsSetKey() {
+    return JobUpdateQuery_Key_DEFAULT
+  }
+return p.Key
+}
+var JobUpdateQuery_JobKey_DEFAULT *JobKey
+func (p *JobUpdateQuery) GetJobKey() *JobKey {
+  if !p.IsSetJobKey() {
+    return JobUpdateQuery_JobKey_DEFAULT
+  }
+return p.JobKey
+}
+var JobUpdateQuery_User_DEFAULT string
+func (p *JobUpdateQuery) GetUser() string {
+  if !p.IsSetUser() {
+    return JobUpdateQuery_User_DEFAULT
+  }
+return *p.User
+}
+var JobUpdateQuery_UpdateStatuses_DEFAULT []JobUpdateStatus
+
+func (p *JobUpdateQuery) GetUpdateStatuses() []JobUpdateStatus {
+  return p.UpdateStatuses
+}
+
+func (p *JobUpdateQuery) GetOffset() int32 {
+  return p.Offset
+}
+
+func (p *JobUpdateQuery) GetLimit() int32 {
+  return p.Limit
+}
+func (p *JobUpdateQuery) IsSetRole() bool {
+  return p.Role != nil
+}
+
+func (p *JobUpdateQuery) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *JobUpdateQuery) IsSetJobKey() bool {
+  return p.JobKey != nil
+}
+
+func (p *JobUpdateQuery) IsSetUser() bool {
+  return p.User != nil
+}
+
+func (p *JobUpdateQuery) IsSetUpdateStatuses() bool {
+  return p.UpdateStatuses != nil
+}
+
+func (p *JobUpdateQuery) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 8:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField8(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 7:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField7(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateQuery)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Role = &v
+}
+  return nil
+}
+
+func (p *JobUpdateQuery)  ReadField8(iprot thrift.TProtocol) error {
+  p.Key = &JobUpdateKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateQuery)  ReadField3(iprot thrift.TProtocol) error {
+  p.JobKey = &JobKey{}
+  if err := p.JobKey.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobKey), err)
+  }
+  return nil
+}
+
+func (p *JobUpdateQuery)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.User = &v
+}
+  return nil
+}
+
+func (p *JobUpdateQuery)  ReadField5(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]JobUpdateStatus, 0, size)
+  p.UpdateStatuses =  tSet
+  for i := 0; i < size; i ++ {
+var _elem32 JobUpdateStatus
+    if v, err := iprot.ReadI32(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    temp := JobUpdateStatus(v)
+    _elem32 = temp
+}
+    p.UpdateStatuses = append(p.UpdateStatuses, _elem32)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *JobUpdateQuery)  ReadField6(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 6: ", err)
+} else {
+  p.Offset = v
+}
+  return nil
+}
+
+func (p *JobUpdateQuery)  ReadField7(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 7: ", err)
+} else {
+  p.Limit = v
+}
+  return nil
+}
+
+func (p *JobUpdateQuery) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobUpdateQuery"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+    if err := p.writeField7(oprot); err != nil { return err }
+    if err := p.writeField8(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobUpdateQuery) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetRole() {
+    if err := oprot.WriteFieldBegin("role", thrift.STRING, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:role: ", p), err) }
+    if err := oprot.WriteString(string(*p.Role)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.role (2) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:role: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateQuery) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetJobKey() {
+    if err := oprot.WriteFieldBegin("jobKey", thrift.STRUCT, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:jobKey: ", p), err) }
+    if err := p.JobKey.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobKey), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:jobKey: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateQuery) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetUser() {
+    if err := oprot.WriteFieldBegin("user", thrift.STRING, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:user: ", p), err) }
+    if err := oprot.WriteString(string(*p.User)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.user (4) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:user: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateQuery) writeField5(oprot thrift.TProtocol) (err error) {
+  if p.IsSetUpdateStatuses() {
+    if err := oprot.WriteFieldBegin("updateStatuses", thrift.SET, 5); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:updateStatuses: ", p), err) }
+    if err := oprot.WriteSetBegin(thrift.I32, len(p.UpdateStatuses)); err != nil {
+      return thrift.PrependError("error writing set begin: ", err)
+    }
+    for i := 0; i<len(p.UpdateStatuses); i++ {
+      for j := i+1; j<len(p.UpdateStatuses); j++ {
+        if reflect.DeepEqual(p.UpdateStatuses[i],p.UpdateStatuses[j]) { 
+          return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.UpdateStatuses[i]))
+        }
+      }
+    }
+    for _, v := range p.UpdateStatuses {
+      if err := oprot.WriteI32(int32(v)); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+    }
+    if err := oprot.WriteSetEnd(); err != nil {
+      return thrift.PrependError("error writing set end: ", err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:updateStatuses: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateQuery) writeField6(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("offset", thrift.I32, 6); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:offset: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Offset)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.offset (6) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:offset: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateQuery) writeField7(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("limit", thrift.I32, 7); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:limit: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Limit)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.limit (7) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 7:limit: ", p), err) }
+  return err
+}
+
+func (p *JobUpdateQuery) writeField8(oprot thrift.TProtocol) (err error) {
+  if p.IsSetKey() {
+    if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 8); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:key: ", p), err) }
+    if err := p.Key.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:key: ", p), err) }
+  }
+  return err
+}
+
+func (p *JobUpdateQuery) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobUpdateQuery(%+v)", *p)
+}
+
+// Attributes:
+//  - Host
+//  - DefaultSlaPolicy
+//  - TimeoutSecs
+//  - CreatedTimestampMs
+type HostMaintenanceRequest struct {
+  Host string `thrift:"host,1" db:"host" json:"host"`
+  DefaultSlaPolicy *SlaPolicy `thrift:"defaultSlaPolicy,2" db:"defaultSlaPolicy" json:"defaultSlaPolicy"`
+  TimeoutSecs int64 `thrift:"timeoutSecs,3" db:"timeoutSecs" json:"timeoutSecs"`
+  CreatedTimestampMs int64 `thrift:"createdTimestampMs,4" db:"createdTimestampMs" json:"createdTimestampMs"`
+}
+
+func NewHostMaintenanceRequest() *HostMaintenanceRequest {
+  return &HostMaintenanceRequest{}
+}
+
+
+func (p *HostMaintenanceRequest) GetHost() string {
+  return p.Host
+}
+var HostMaintenanceRequest_DefaultSlaPolicy_DEFAULT *SlaPolicy
+func (p *HostMaintenanceRequest) GetDefaultSlaPolicy() *SlaPolicy {
+  if !p.IsSetDefaultSlaPolicy() {
+    return HostMaintenanceRequest_DefaultSlaPolicy_DEFAULT
+  }
+return p.DefaultSlaPolicy
+}
+
+func (p *HostMaintenanceRequest) GetTimeoutSecs() int64 {
+  return p.TimeoutSecs
+}
+
+func (p *HostMaintenanceRequest) GetCreatedTimestampMs() int64 {
+  return p.CreatedTimestampMs
+}
+func (p *HostMaintenanceRequest) IsSetDefaultSlaPolicy() bool {
+  return p.DefaultSlaPolicy != nil
+}
+
+func (p *HostMaintenanceRequest) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *HostMaintenanceRequest)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Host = v
+}
+  return nil
+}
+
+func (p *HostMaintenanceRequest)  ReadField2(iprot thrift.TProtocol) error {
+  p.DefaultSlaPolicy = &SlaPolicy{}
+  if err := p.DefaultSlaPolicy.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DefaultSlaPolicy), err)
+  }
+  return nil
+}
+
+func (p *HostMaintenanceRequest)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.TimeoutSecs = v
+}
+  return nil
+}
+
+func (p *HostMaintenanceRequest)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.CreatedTimestampMs = v
+}
+  return nil
+}
+
+func (p *HostMaintenanceRequest) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("HostMaintenanceRequest"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *HostMaintenanceRequest) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("host", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:host: ", p), err) }
+  if err := oprot.WriteString(string(p.Host)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.host (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:host: ", p), err) }
+  return err
+}
+
+func (p *HostMaintenanceRequest) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("defaultSlaPolicy", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:defaultSlaPolicy: ", p), err) }
+  if err := p.DefaultSlaPolicy.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DefaultSlaPolicy), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:defaultSlaPolicy: ", p), err) }
+  return err
+}
+
+func (p *HostMaintenanceRequest) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("timeoutSecs", thrift.I64, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:timeoutSecs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.TimeoutSecs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.timeoutSecs (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:timeoutSecs: ", p), err) }
+  return err
+}
+
+func (p *HostMaintenanceRequest) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("createdTimestampMs", thrift.I64, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:createdTimestampMs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.CreatedTimestampMs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.createdTimestampMs (4) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:createdTimestampMs: ", p), err) }
+  return err
+}
+
+func (p *HostMaintenanceRequest) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("HostMaintenanceRequest(%+v)", *p)
+}
+
+// Attributes:
+//  - Backups
+type ListBackupsResult_ struct {
+  Backups []string `thrift:"backups,1" db:"backups" json:"backups"`
+}
+
+func NewListBackupsResult_() *ListBackupsResult_ {
+  return &ListBackupsResult_{}
+}
+
+
+func (p *ListBackupsResult_) GetBackups() []string {
+  return p.Backups
+}
+func (p *ListBackupsResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ListBackupsResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]string, 0, size)
+  p.Backups =  tSet
+  for i := 0; i < size; i ++ {
+var _elem33 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem33 = v
+}
+    p.Backups = append(p.Backups, _elem33)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *ListBackupsResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ListBackupsResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ListBackupsResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("backups", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:backups: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRING, len(p.Backups)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Backups); i++ {
+    for j := i+1; j<len(p.Backups); j++ {
+      if reflect.DeepEqual(p.Backups[i],p.Backups[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Backups[i]))
+      }
+    }
+  }
+  for _, v := range p.Backups {
+    if err := oprot.WriteString(string(v)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:backups: ", p), err) }
+  return err
+}
+
+func (p *ListBackupsResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ListBackupsResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Statuses
+type StartMaintenanceResult_ struct {
+  Statuses []*HostStatus `thrift:"statuses,1" db:"statuses" json:"statuses"`
+}
+
+func NewStartMaintenanceResult_() *StartMaintenanceResult_ {
+  return &StartMaintenanceResult_{}
+}
+
+
+func (p *StartMaintenanceResult_) GetStatuses() []*HostStatus {
+  return p.Statuses
+}
+func (p *StartMaintenanceResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *StartMaintenanceResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*HostStatus, 0, size)
+  p.Statuses =  tSet
+  for i := 0; i < size; i ++ {
+    _elem34 := &HostStatus{}
+    if err := _elem34.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem34), err)
+    }
+    p.Statuses = append(p.Statuses, _elem34)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *StartMaintenanceResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("StartMaintenanceResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *StartMaintenanceResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("statuses", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:statuses: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Statuses)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Statuses); i++ {
+    for j := i+1; j<len(p.Statuses); j++ {
+      if reflect.DeepEqual(p.Statuses[i],p.Statuses[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Statuses[i]))
+      }
+    }
+  }
+  for _, v := range p.Statuses {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:statuses: ", p), err) }
+  return err
+}
+
+func (p *StartMaintenanceResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("StartMaintenanceResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Statuses
+type DrainHostsResult_ struct {
+  Statuses []*HostStatus `thrift:"statuses,1" db:"statuses" json:"statuses"`
+}
+
+func NewDrainHostsResult_() *DrainHostsResult_ {
+  return &DrainHostsResult_{}
+}
+
+
+func (p *DrainHostsResult_) GetStatuses() []*HostStatus {
+  return p.Statuses
+}
+func (p *DrainHostsResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *DrainHostsResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*HostStatus, 0, size)
+  p.Statuses =  tSet
+  for i := 0; i < size; i ++ {
+    _elem35 := &HostStatus{}
+    if err := _elem35.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem35), err)
+    }
+    p.Statuses = append(p.Statuses, _elem35)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *DrainHostsResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("DrainHostsResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *DrainHostsResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("statuses", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:statuses: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Statuses)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Statuses); i++ {
+    for j := i+1; j<len(p.Statuses); j++ {
+      if reflect.DeepEqual(p.Statuses[i],p.Statuses[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Statuses[i]))
+      }
+    }
+  }
+  for _, v := range p.Statuses {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:statuses: ", p), err) }
+  return err
+}
+
+func (p *DrainHostsResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("DrainHostsResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Tasks
+type QueryRecoveryResult_ struct {
+  Tasks []*ScheduledTask `thrift:"tasks,1" db:"tasks" json:"tasks"`
+}
+
+func NewQueryRecoveryResult_() *QueryRecoveryResult_ {
+  return &QueryRecoveryResult_{}
+}
+
+
+func (p *QueryRecoveryResult_) GetTasks() []*ScheduledTask {
+  return p.Tasks
+}
+func (p *QueryRecoveryResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *QueryRecoveryResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*ScheduledTask, 0, size)
+  p.Tasks =  tSet
+  for i := 0; i < size; i ++ {
+    _elem36 := &ScheduledTask{}
+    if err := _elem36.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem36), err)
+    }
+    p.Tasks = append(p.Tasks, _elem36)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *QueryRecoveryResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("QueryRecoveryResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *QueryRecoveryResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("tasks", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:tasks: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Tasks)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Tasks); i++ {
+    for j := i+1; j<len(p.Tasks); j++ {
+      if reflect.DeepEqual(p.Tasks[i],p.Tasks[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Tasks[i]))
+      }
+    }
+  }
+  for _, v := range p.Tasks {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:tasks: ", p), err) }
+  return err
+}
+
+func (p *QueryRecoveryResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("QueryRecoveryResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Statuses
+type MaintenanceStatusResult_ struct {
+  Statuses []*HostStatus `thrift:"statuses,1" db:"statuses" json:"statuses"`
+}
+
+func NewMaintenanceStatusResult_() *MaintenanceStatusResult_ {
+  return &MaintenanceStatusResult_{}
+}
+
+
+func (p *MaintenanceStatusResult_) GetStatuses() []*HostStatus {
+  return p.Statuses
+}
+func (p *MaintenanceStatusResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *MaintenanceStatusResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*HostStatus, 0, size)
+  p.Statuses =  tSet
+  for i := 0; i < size; i ++ {
+    _elem37 := &HostStatus{}
+    if err := _elem37.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem37), err)
+    }
+    p.Statuses = append(p.Statuses, _elem37)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *MaintenanceStatusResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("MaintenanceStatusResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *MaintenanceStatusResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("statuses", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:statuses: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Statuses)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Statuses); i++ {
+    for j := i+1; j<len(p.Statuses); j++ {
+      if reflect.DeepEqual(p.Statuses[i],p.Statuses[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Statuses[i]))
+      }
+    }
+  }
+  for _, v := range p.Statuses {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:statuses: ", p), err) }
+  return err
+}
+
+func (p *MaintenanceStatusResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("MaintenanceStatusResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Statuses
+type EndMaintenanceResult_ struct {
+  Statuses []*HostStatus `thrift:"statuses,1" db:"statuses" json:"statuses"`
+}
+
+func NewEndMaintenanceResult_() *EndMaintenanceResult_ {
+  return &EndMaintenanceResult_{}
+}
+
+
+func (p *EndMaintenanceResult_) GetStatuses() []*HostStatus {
+  return p.Statuses
+}
+func (p *EndMaintenanceResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *EndMaintenanceResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*HostStatus, 0, size)
+  p.Statuses =  tSet
+  for i := 0; i < size; i ++ {
+    _elem38 := &HostStatus{}
+    if err := _elem38.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem38), err)
+    }
+    p.Statuses = append(p.Statuses, _elem38)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *EndMaintenanceResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("EndMaintenanceResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *EndMaintenanceResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("statuses", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:statuses: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Statuses)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Statuses); i++ {
+    for j := i+1; j<len(p.Statuses); j++ {
+      if reflect.DeepEqual(p.Statuses[i],p.Statuses[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Statuses[i]))
+      }
+    }
+  }
+  for _, v := range p.Statuses {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:statuses: ", p), err) }
+  return err
+}
+
+func (p *EndMaintenanceResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("EndMaintenanceResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Summaries
+type RoleSummaryResult_ struct {
+  Summaries []*RoleSummary `thrift:"summaries,1" db:"summaries" json:"summaries"`
+}
+
+func NewRoleSummaryResult_() *RoleSummaryResult_ {
+  return &RoleSummaryResult_{}
+}
+
+
+func (p *RoleSummaryResult_) GetSummaries() []*RoleSummary {
+  return p.Summaries
+}
+func (p *RoleSummaryResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *RoleSummaryResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*RoleSummary, 0, size)
+  p.Summaries =  tSet
+  for i := 0; i < size; i ++ {
+    _elem39 := &RoleSummary{}
+    if err := _elem39.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem39), err)
+    }
+    p.Summaries = append(p.Summaries, _elem39)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *RoleSummaryResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("RoleSummaryResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *RoleSummaryResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("summaries", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:summaries: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Summaries)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Summaries); i++ {
+    for j := i+1; j<len(p.Summaries); j++ {
+      if reflect.DeepEqual(p.Summaries[i],p.Summaries[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Summaries[i]))
+      }
+    }
+  }
+  for _, v := range p.Summaries {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:summaries: ", p), err) }
+  return err
+}
+
+func (p *RoleSummaryResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("RoleSummaryResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Summaries
+type JobSummaryResult_ struct {
+  Summaries []*JobSummary `thrift:"summaries,1" db:"summaries" json:"summaries"`
+}
+
+func NewJobSummaryResult_() *JobSummaryResult_ {
+  return &JobSummaryResult_{}
+}
+
+
+func (p *JobSummaryResult_) GetSummaries() []*JobSummary {
+  return p.Summaries
+}
+func (p *JobSummaryResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *JobSummaryResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*JobSummary, 0, size)
+  p.Summaries =  tSet
+  for i := 0; i < size; i ++ {
+    _elem40 := &JobSummary{}
+    if err := _elem40.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem40), err)
+    }
+    p.Summaries = append(p.Summaries, _elem40)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *JobSummaryResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("JobSummaryResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *JobSummaryResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("summaries", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:summaries: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Summaries)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Summaries); i++ {
+    for j := i+1; j<len(p.Summaries); j++ {
+      if reflect.DeepEqual(p.Summaries[i],p.Summaries[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Summaries[i]))
+      }
+    }
+  }
+  for _, v := range p.Summaries {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:summaries: ", p), err) }
+  return err
+}
+
+func (p *JobSummaryResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("JobSummaryResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Summary
+type ConfigSummaryResult_ struct {
+  Summary *ConfigSummary `thrift:"summary,1" db:"summary" json:"summary"`
+}
+
+func NewConfigSummaryResult_() *ConfigSummaryResult_ {
+  return &ConfigSummaryResult_{}
+}
+
+var ConfigSummaryResult__Summary_DEFAULT *ConfigSummary
+func (p *ConfigSummaryResult_) GetSummary() *ConfigSummary {
+  if !p.IsSetSummary() {
+    return ConfigSummaryResult__Summary_DEFAULT
+  }
+return p.Summary
+}
+func (p *ConfigSummaryResult_) IsSetSummary() bool {
+  return p.Summary != nil
+}
+
+func (p *ConfigSummaryResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ConfigSummaryResult_)  ReadField1(iprot thrift.TProtocol) error {
+  p.Summary = &ConfigSummary{}
+  if err := p.Summary.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Summary), err)
+  }
+  return nil
+}
+
+func (p *ConfigSummaryResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ConfigSummaryResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ConfigSummaryResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("summary", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:summary: ", p), err) }
+  if err := p.Summary.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Summary), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:summary: ", p), err) }
+  return err
+}
+
+func (p *ConfigSummaryResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ConfigSummaryResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Reasons
+type GetPendingReasonResult_ struct {
+  Reasons []*PendingReason `thrift:"reasons,1" db:"reasons" json:"reasons"`
+}
+
+func NewGetPendingReasonResult_() *GetPendingReasonResult_ {
+  return &GetPendingReasonResult_{}
+}
+
+
+func (p *GetPendingReasonResult_) GetReasons() []*PendingReason {
+  return p.Reasons
+}
+func (p *GetPendingReasonResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *GetPendingReasonResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*PendingReason, 0, size)
+  p.Reasons =  tSet
+  for i := 0; i < size; i ++ {
+    _elem41 := &PendingReason{}
+    if err := _elem41.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem41), err)
+    }
+    p.Reasons = append(p.Reasons, _elem41)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *GetPendingReasonResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("GetPendingReasonResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *GetPendingReasonResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("reasons", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:reasons: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Reasons)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Reasons); i++ {
+    for j := i+1; j<len(p.Reasons); j++ {
+      if reflect.DeepEqual(p.Reasons[i],p.Reasons[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Reasons[i]))
+      }
+    }
+  }
+  for _, v := range p.Reasons {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:reasons: ", p), err) }
+  return err
+}
+
+func (p *GetPendingReasonResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("GetPendingReasonResult_(%+v)", *p)
+}
+
+// Result of the startUpdate call.
+// 
+// Attributes:
+//  - Key: Unique identifier for the job update.
+//  - UpdateSummary: Summary of the update that is in progress for the given JobKey.
+type StartJobUpdateResult_ struct {
+  Key *JobUpdateKey `thrift:"key,1" db:"key" json:"key"`
+  UpdateSummary *JobUpdateSummary `thrift:"updateSummary,2" db:"updateSummary" json:"updateSummary,omitempty"`
+}
+
+func NewStartJobUpdateResult_() *StartJobUpdateResult_ {
+  return &StartJobUpdateResult_{}
+}
+
+var StartJobUpdateResult__Key_DEFAULT *JobUpdateKey
+func (p *StartJobUpdateResult_) GetKey() *JobUpdateKey {
+  if !p.IsSetKey() {
+    return StartJobUpdateResult__Key_DEFAULT
+  }
+return p.Key
+}
+var StartJobUpdateResult__UpdateSummary_DEFAULT *JobUpdateSummary
+func (p *StartJobUpdateResult_) GetUpdateSummary() *JobUpdateSummary {
+  if !p.IsSetUpdateSummary() {
+    return StartJobUpdateResult__UpdateSummary_DEFAULT
+  }
+return p.UpdateSummary
+}
+func (p *StartJobUpdateResult_) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *StartJobUpdateResult_) IsSetUpdateSummary() bool {
+  return p.UpdateSummary != nil
+}
+
+func (p *StartJobUpdateResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *StartJobUpdateResult_)  ReadField1(iprot thrift.TProtocol) error {
+  p.Key = &JobUpdateKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *StartJobUpdateResult_)  ReadField2(iprot thrift.TProtocol) error {
+  p.UpdateSummary = &JobUpdateSummary{}
+  if err := p.UpdateSummary.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.UpdateSummary), err)
+  }
+  return nil
+}
+
+func (p *StartJobUpdateResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("StartJobUpdateResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *StartJobUpdateResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *StartJobUpdateResult_) writeField2(oprot thrift.TProtocol) (err error) {
+  if p.IsSetUpdateSummary() {
+    if err := oprot.WriteFieldBegin("updateSummary", thrift.STRUCT, 2); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:updateSummary: ", p), err) }
+    if err := p.UpdateSummary.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.UpdateSummary), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:updateSummary: ", p), err) }
+  }
+  return err
+}
+
+func (p *StartJobUpdateResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("StartJobUpdateResult_(%+v)", *p)
+}
+
+// Result of the getJobUpdateSummaries call.
+// 
+// Attributes:
+//  - UpdateSummaries
+type GetJobUpdateSummariesResult_ struct {
+  UpdateSummaries []*JobUpdateSummary `thrift:"updateSummaries,1" db:"updateSummaries" json:"updateSummaries"`
+}
+
+func NewGetJobUpdateSummariesResult_() *GetJobUpdateSummariesResult_ {
+  return &GetJobUpdateSummariesResult_{}
+}
+
+
+func (p *GetJobUpdateSummariesResult_) GetUpdateSummaries() []*JobUpdateSummary {
+  return p.UpdateSummaries
+}
+func (p *GetJobUpdateSummariesResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateSummariesResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*JobUpdateSummary, 0, size)
+  p.UpdateSummaries =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem42 := &JobUpdateSummary{}
+    if err := _elem42.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem42), err)
+    }
+    p.UpdateSummaries = append(p.UpdateSummaries, _elem42)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateSummariesResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("GetJobUpdateSummariesResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *GetJobUpdateSummariesResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("updateSummaries", thrift.LIST, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:updateSummaries: ", p), err) }
+  if err := oprot.WriteListBegin(thrift.STRUCT, len(p.UpdateSummaries)); err != nil {
+    return thrift.PrependError("error writing list begin: ", err)
+  }
+  for _, v := range p.UpdateSummaries {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteListEnd(); err != nil {
+    return thrift.PrependError("error writing list end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:updateSummaries: ", p), err) }
+  return err
+}
+
+func (p *GetJobUpdateSummariesResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("GetJobUpdateSummariesResult_(%+v)", *p)
+}
+
+// Result of the getJobUpdateDetails call.
+// 
+// Attributes:
+//  - Details
+//  - DetailsList
+type GetJobUpdateDetailsResult_ struct {
+  Details *JobUpdateDetails `thrift:"details,1" db:"details" json:"details"`
+  DetailsList []*JobUpdateDetails `thrift:"detailsList,2" db:"detailsList" json:"detailsList"`
+}
+
+func NewGetJobUpdateDetailsResult_() *GetJobUpdateDetailsResult_ {
+  return &GetJobUpdateDetailsResult_{}
+}
+
+var GetJobUpdateDetailsResult__Details_DEFAULT *JobUpdateDetails
+func (p *GetJobUpdateDetailsResult_) GetDetails() *JobUpdateDetails {
+  if !p.IsSetDetails() {
+    return GetJobUpdateDetailsResult__Details_DEFAULT
+  }
+return p.Details
+}
+
+func (p *GetJobUpdateDetailsResult_) GetDetailsList() []*JobUpdateDetails {
+  return p.DetailsList
+}
+func (p *GetJobUpdateDetailsResult_) IsSetDetails() bool {
+  return p.Details != nil
+}
+
+func (p *GetJobUpdateDetailsResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateDetailsResult_)  ReadField1(iprot thrift.TProtocol) error {
+  p.Details = &JobUpdateDetails{}
+  if err := p.Details.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Details), err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateDetailsResult_)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*JobUpdateDetails, 0, size)
+  p.DetailsList =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem43 := &JobUpdateDetails{}
+    if err := _elem43.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem43), err)
+    }
+    p.DetailsList = append(p.DetailsList, _elem43)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateDetailsResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("GetJobUpdateDetailsResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *GetJobUpdateDetailsResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("details", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:details: ", p), err) }
+  if err := p.Details.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Details), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:details: ", p), err) }
+  return err
+}
+
+func (p *GetJobUpdateDetailsResult_) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("detailsList", thrift.LIST, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:detailsList: ", p), err) }
+  if err := oprot.WriteListBegin(thrift.STRUCT, len(p.DetailsList)); err != nil {
+    return thrift.PrependError("error writing list begin: ", err)
+  }
+  for _, v := range p.DetailsList {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteListEnd(); err != nil {
+    return thrift.PrependError("error writing list end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:detailsList: ", p), err) }
+  return err
+}
+
+func (p *GetJobUpdateDetailsResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("GetJobUpdateDetailsResult_(%+v)", *p)
+}
+
+// Result of the pulseJobUpdate call.
+// 
+// Attributes:
+//  - Status
+type PulseJobUpdateResult_ struct {
+  Status JobUpdatePulseStatus `thrift:"status,1" db:"status" json:"status"`
+}
+
+func NewPulseJobUpdateResult_() *PulseJobUpdateResult_ {
+  return &PulseJobUpdateResult_{}
+}
+
+
+func (p *PulseJobUpdateResult_) GetStatus() JobUpdatePulseStatus {
+  return p.Status
+}
+func (p *PulseJobUpdateResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *PulseJobUpdateResult_)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  temp := JobUpdatePulseStatus(v)
+  p.Status = temp
+}
+  return nil
+}
+
+func (p *PulseJobUpdateResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("PulseJobUpdateResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *PulseJobUpdateResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("status", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:status: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Status)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.status (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:status: ", p), err) }
+  return err
+}
+
+func (p *PulseJobUpdateResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("PulseJobUpdateResult_(%+v)", *p)
+}
+
+// Attributes:
+//  - Add: Instance addition diff details.
+//  - Remove: Instance removal diff details.
+//  - Update: Instance update diff details.
+//  - Unchanged: Instances unchanged by the update.
+type GetJobUpdateDiffResult_ struct {
+  Add []*ConfigGroup `thrift:"add,1" db:"add" json:"add"`
+  Remove []*ConfigGroup `thrift:"remove,2" db:"remove" json:"remove"`
+  Update []*ConfigGroup `thrift:"update,3" db:"update" json:"update"`
+  Unchanged []*ConfigGroup `thrift:"unchanged,4" db:"unchanged" json:"unchanged"`
+}
+
+func NewGetJobUpdateDiffResult_() *GetJobUpdateDiffResult_ {
+  return &GetJobUpdateDiffResult_{}
+}
+
+
+func (p *GetJobUpdateDiffResult_) GetAdd() []*ConfigGroup {
+  return p.Add
+}
+
+func (p *GetJobUpdateDiffResult_) GetRemove() []*ConfigGroup {
+  return p.Remove
+}
+
+func (p *GetJobUpdateDiffResult_) GetUpdate() []*ConfigGroup {
+  return p.Update
+}
+
+func (p *GetJobUpdateDiffResult_) GetUnchanged() []*ConfigGroup {
+  return p.Unchanged
+}
+func (p *GetJobUpdateDiffResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateDiffResult_)  ReadField1(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*ConfigGroup, 0, size)
+  p.Add =  tSet
+  for i := 0; i < size; i ++ {
+    _elem44 := &ConfigGroup{}
+    if err := _elem44.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem44), err)
+    }
+    p.Add = append(p.Add, _elem44)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateDiffResult_)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*ConfigGroup, 0, size)
+  p.Remove =  tSet
+  for i := 0; i < size; i ++ {
+    _elem45 := &ConfigGroup{}
+    if err := _elem45.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem45), err)
+    }
+    p.Remove = append(p.Remove, _elem45)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateDiffResult_)  ReadField3(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*ConfigGroup, 0, size)
+  p.Update =  tSet
+  for i := 0; i < size; i ++ {
+    _elem46 := &ConfigGroup{}
+    if err := _elem46.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem46), err)
+    }
+    p.Update = append(p.Update, _elem46)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateDiffResult_)  ReadField4(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*ConfigGroup, 0, size)
+  p.Unchanged =  tSet
+  for i := 0; i < size; i ++ {
+    _elem47 := &ConfigGroup{}
+    if err := _elem47.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem47), err)
+    }
+    p.Unchanged = append(p.Unchanged, _elem47)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *GetJobUpdateDiffResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("GetJobUpdateDiffResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *GetJobUpdateDiffResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("add", thrift.SET, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:add: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Add)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Add); i++ {
+    for j := i+1; j<len(p.Add); j++ {
+      if reflect.DeepEqual(p.Add[i],p.Add[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Add[i]))
+      }
+    }
+  }
+  for _, v := range p.Add {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:add: ", p), err) }
+  return err
+}
+
+func (p *GetJobUpdateDiffResult_) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("remove", thrift.SET, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:remove: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Remove)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Remove); i++ {
+    for j := i+1; j<len(p.Remove); j++ {
+      if reflect.DeepEqual(p.Remove[i],p.Remove[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Remove[i]))
+      }
+    }
+  }
+  for _, v := range p.Remove {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:remove: ", p), err) }
+  return err
+}
+
+func (p *GetJobUpdateDiffResult_) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("update", thrift.SET, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:update: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Update)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Update); i++ {
+    for j := i+1; j<len(p.Update); j++ {
+      if reflect.DeepEqual(p.Update[i],p.Update[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Update[i]))
+      }
+    }
+  }
+  for _, v := range p.Update {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:update: ", p), err) }
+  return err
+}
+
+func (p *GetJobUpdateDiffResult_) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("unchanged", thrift.SET, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:unchanged: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Unchanged)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Unchanged); i++ {
+    for j := i+1; j<len(p.Unchanged); j++ {
+      if reflect.DeepEqual(p.Unchanged[i],p.Unchanged[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Unchanged[i]))
+      }
+    }
+  }
+  for _, v := range p.Unchanged {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:unchanged: ", p), err) }
+  return err
+}
+
+func (p *GetJobUpdateDiffResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("GetJobUpdateDiffResult_(%+v)", *p)
+}
+
+// Tier information.
+// 
+// Attributes:
+//  - Name: Name of tier.
+//  - Settings: Tier attributes.
+type TierConfig struct {
+  Name string `thrift:"name,1" db:"name" json:"name"`
+  Settings map[string]string `thrift:"settings,2" db:"settings" json:"settings"`
+}
+
+func NewTierConfig() *TierConfig {
+  return &TierConfig{}
+}
+
+
+func (p *TierConfig) GetName() string {
+  return p.Name
+}
+
+func (p *TierConfig) GetSettings() map[string]string {
+  return p.Settings
+}
+func (p *TierConfig) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.MAP {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *TierConfig)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Name = v
+}
+  return nil
+}
+
+func (p *TierConfig)  ReadField2(iprot thrift.TProtocol) error {
+  _, _, size, err := iprot.ReadMapBegin()
+  if err != nil {
+    return thrift.PrependError("error reading map begin: ", err)
+  }
+  tMap := make(map[string]string, size)
+  p.Settings =  tMap
+  for i := 0; i < size; i ++ {
+var _key48 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _key48 = v
+}
+var _val49 string
+    if v, err := iprot.ReadString(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _val49 = v
+}
+    p.Settings[_key48] = _val49
+  }
+  if err := iprot.ReadMapEnd(); err != nil {
+    return thrift.PrependError("error reading map end: ", err)
+  }
+  return nil
+}
+
+func (p *TierConfig) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("TierConfig"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *TierConfig) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err) }
+  if err := oprot.WriteString(string(p.Name)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err) }
+  return err
+}
+
+func (p *TierConfig) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("settings", thrift.MAP, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:settings: ", p), err) }
+  if err := oprot.WriteMapBegin(thrift.STRING, thrift.STRING, len(p.Settings)); err != nil {
+    return thrift.PrependError("error writing map begin: ", err)
+  }
+  for k, v := range p.Settings {
+    if err := oprot.WriteString(string(k)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+    if err := oprot.WriteString(string(v)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+  }
+  if err := oprot.WriteMapEnd(); err != nil {
+    return thrift.PrependError("error writing map end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:settings: ", p), err) }
+  return err
+}
+
+func (p *TierConfig) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("TierConfig(%+v)", *p)
+}
+
+// Result of the getTierConfigResult call.
+// 
+// Attributes:
+//  - DefaultTierName: Name of the default tier.
+//  - Tiers: Set of tier configurations.
+type GetTierConfigResult_ struct {
+  DefaultTierName string `thrift:"defaultTierName,1" db:"defaultTierName" json:"defaultTierName"`
+  Tiers []*TierConfig `thrift:"tiers,2" db:"tiers" json:"tiers"`
+}
+
+func NewGetTierConfigResult_() *GetTierConfigResult_ {
+  return &GetTierConfigResult_{}
+}
+
+
+func (p *GetTierConfigResult_) GetDefaultTierName() string {
+  return p.DefaultTierName
+}
+
+func (p *GetTierConfigResult_) GetTiers() []*TierConfig {
+  return p.Tiers
+}
+func (p *GetTierConfigResult_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *GetTierConfigResult_)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.DefaultTierName = v
+}
+  return nil
+}
+
+func (p *GetTierConfigResult_)  ReadField2(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]*TierConfig, 0, size)
+  p.Tiers =  tSet
+  for i := 0; i < size; i ++ {
+    _elem50 := &TierConfig{}
+    if err := _elem50.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem50), err)
+    }
+    p.Tiers = append(p.Tiers, _elem50)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *GetTierConfigResult_) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("GetTierConfigResult"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *GetTierConfigResult_) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("defaultTierName", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:defaultTierName: ", p), err) }
+  if err := oprot.WriteString(string(p.DefaultTierName)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.defaultTierName (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:defaultTierName: ", p), err) }
+  return err
+}
+
+func (p *GetTierConfigResult_) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("tiers", thrift.SET, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:tiers: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Tiers)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Tiers); i++ {
+    for j := i+1; j<len(p.Tiers); j++ {
+      if reflect.DeepEqual(p.Tiers[i],p.Tiers[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Tiers[i]))
+      }
+    }
+  }
+  for _, v := range p.Tiers {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:tiers: ", p), err) }
+  return err
+}
+
+func (p *GetTierConfigResult_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("GetTierConfigResult_(%+v)", *p)
+}
+
+// Information about the scheduler.
+// 
+// Attributes:
+//  - ClusterName
+//  - StatsUrlPrefix: A url prefix for job container stats.
+type ServerInfo struct {
+  ClusterName string `thrift:"clusterName,1" db:"clusterName" json:"clusterName"`
+  // unused field # 2
+  StatsUrlPrefix string `thrift:"statsUrlPrefix,3" db:"statsUrlPrefix" json:"statsUrlPrefix"`
+}
+
+func NewServerInfo() *ServerInfo {
+  return &ServerInfo{}
+}
+
+
+func (p *ServerInfo) GetClusterName() string {
+  return p.ClusterName
+}
+
+func (p *ServerInfo) GetStatsUrlPrefix() string {
+  return p.StatsUrlPrefix
+}
+func (p *ServerInfo) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ServerInfo)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.ClusterName = v
+}
+  return nil
+}
+
+func (p *ServerInfo)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.StatsUrlPrefix = v
+}
+  return nil
+}
+
+func (p *ServerInfo) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ServerInfo"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ServerInfo) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("clusterName", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:clusterName: ", p), err) }
+  if err := oprot.WriteString(string(p.ClusterName)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.clusterName (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:clusterName: ", p), err) }
+  return err
+}
+
+func (p *ServerInfo) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("statsUrlPrefix", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:statsUrlPrefix: ", p), err) }
+  if err := oprot.WriteString(string(p.StatsUrlPrefix)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.statsUrlPrefix (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:statsUrlPrefix: ", p), err) }
+  return err
+}
+
+func (p *ServerInfo) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ServerInfo(%+v)", *p)
+}
+
+// Attributes:
+//  - PopulateJobResult_
+//  - ScheduleStatusResult_
+//  - GetJobsResult_
+//  - GetQuotaResult_
+//  - ListBackupsResult_
+//  - StartMaintenanceResult_
+//  - DrainHostsResult_
+//  - QueryRecoveryResult_
+//  - MaintenanceStatusResult_
+//  - EndMaintenanceResult_
+//  - RoleSummaryResult_
+//  - JobSummaryResult_
+//  - ConfigSummaryResult_
+//  - GetPendingReasonResult_
+//  - StartJobUpdateResult_
+//  - GetJobUpdateSummariesResult_
+//  - GetJobUpdateDetailsResult_
+//  - PulseJobUpdateResult_
+//  - GetJobUpdateDiffResult_
+//  - GetTierConfigResult_
+type Result_ struct {
+  PopulateJobResult_ *PopulateJobResult_ `thrift:"populateJobResult,1" db:"populateJobResult" json:"populateJobResult,omitempty"`
+  // unused field # 2
+  ScheduleStatusResult_ *ScheduleStatusResult_ `thrift:"scheduleStatusResult,3" db:"scheduleStatusResult" json:"scheduleStatusResult,omitempty"`
+  GetJobsResult_ *GetJobsResult_ `thrift:"getJobsResult,4" db:"getJobsResult" json:"getJobsResult,omitempty"`
+  GetQuotaResult_ *GetQuotaResult_ `thrift:"getQuotaResult,5" db:"getQuotaResult" json:"getQuotaResult,omitempty"`
+  ListBackupsResult_ *ListBackupsResult_ `thrift:"listBackupsResult,6" db:"listBackupsResult" json:"listBackupsResult,omitempty"`
+  StartMaintenanceResult_ *StartMaintenanceResult_ `thrift:"startMaintenanceResult,7" db:"startMaintenanceResult" json:"startMaintenanceResult,omitempty"`
+  DrainHostsResult_ *DrainHostsResult_ `thrift:"drainHostsResult,8" db:"drainHostsResult" json:"drainHostsResult,omitempty"`
+  QueryRecoveryResult_ *QueryRecoveryResult_ `thrift:"queryRecoveryResult,9" db:"queryRecoveryResult" json:"queryRecoveryResult,omitempty"`
+  MaintenanceStatusResult_ *MaintenanceStatusResult_ `thrift:"maintenanceStatusResult,10" db:"maintenanceStatusResult" json:"maintenanceStatusResult,omitempty"`
+  EndMaintenanceResult_ *EndMaintenanceResult_ `thrift:"endMaintenanceResult,11" db:"endMaintenanceResult" json:"endMaintenanceResult,omitempty"`
+  // unused fields # 12 to 16
+  RoleSummaryResult_ *RoleSummaryResult_ `thrift:"roleSummaryResult,17" db:"roleSummaryResult" json:"roleSummaryResult,omitempty"`
+  JobSummaryResult_ *JobSummaryResult_ `thrift:"jobSummaryResult,18" db:"jobSummaryResult" json:"jobSummaryResult,omitempty"`
+  // unused field # 19
+  ConfigSummaryResult_ *ConfigSummaryResult_ `thrift:"configSummaryResult,20" db:"configSummaryResult" json:"configSummaryResult,omitempty"`
+  GetPendingReasonResult_ *GetPendingReasonResult_ `thrift:"getPendingReasonResult,21" db:"getPendingReasonResult" json:"getPendingReasonResult,omitempty"`
+  StartJobUpdateResult_ *StartJobUpdateResult_ `thrift:"startJobUpdateResult,22" db:"startJobUpdateResult" json:"startJobUpdateResult,omitempty"`
+  GetJobUpdateSummariesResult_ *GetJobUpdateSummariesResult_ `thrift:"getJobUpdateSummariesResult,23" db:"getJobUpdateSummariesResult" json:"getJobUpdateSummariesResult,omitempty"`
+  GetJobUpdateDetailsResult_ *GetJobUpdateDetailsResult_ `thrift:"getJobUpdateDetailsResult,24" db:"getJobUpdateDetailsResult" json:"getJobUpdateDetailsResult,omitempty"`
+  PulseJobUpdateResult_ *PulseJobUpdateResult_ `thrift:"pulseJobUpdateResult,25" db:"pulseJobUpdateResult" json:"pulseJobUpdateResult,omitempty"`
+  GetJobUpdateDiffResult_ *GetJobUpdateDiffResult_ `thrift:"getJobUpdateDiffResult,26" db:"getJobUpdateDiffResult" json:"getJobUpdateDiffResult,omitempty"`
+  GetTierConfigResult_ *GetTierConfigResult_ `thrift:"getTierConfigResult,27" db:"getTierConfigResult" json:"getTierConfigResult,omitempty"`
+}
+
+func NewResult_() *Result_ {
+  return &Result_{}
+}
+
+var Result__PopulateJobResult__DEFAULT *PopulateJobResult_
+func (p *Result_) GetPopulateJobResult_() *PopulateJobResult_ {
+  if !p.IsSetPopulateJobResult_() {
+    return Result__PopulateJobResult__DEFAULT
+  }
+return p.PopulateJobResult_
+}
+var Result__ScheduleStatusResult__DEFAULT *ScheduleStatusResult_
+func (p *Result_) GetScheduleStatusResult_() *ScheduleStatusResult_ {
+  if !p.IsSetScheduleStatusResult_() {
+    return Result__ScheduleStatusResult__DEFAULT
+  }
+return p.ScheduleStatusResult_
+}
+var Result__GetJobsResult__DEFAULT *GetJobsResult_
+func (p *Result_) GetGetJobsResult_() *GetJobsResult_ {
+  if !p.IsSetGetJobsResult_() {
+    return Result__GetJobsResult__DEFAULT
+  }
+return p.GetJobsResult_
+}
+var Result__GetQuotaResult__DEFAULT *GetQuotaResult_
+func (p *Result_) GetGetQuotaResult_() *GetQuotaResult_ {
+  if !p.IsSetGetQuotaResult_() {
+    return Result__GetQuotaResult__DEFAULT
+  }
+return p.GetQuotaResult_
+}
+var Result__ListBackupsResult__DEFAULT *ListBackupsResult_
+func (p *Result_) GetListBackupsResult_() *ListBackupsResult_ {
+  if !p.IsSetListBackupsResult_() {
+    return Result__ListBackupsResult__DEFAULT
+  }
+return p.ListBackupsResult_
+}
+var Result__StartMaintenanceResult__DEFAULT *StartMaintenanceResult_
+func (p *Result_) GetStartMaintenanceResult_() *StartMaintenanceResult_ {
+  if !p.IsSetStartMaintenanceResult_() {
+    return Result__StartMaintenanceResult__DEFAULT
+  }
+return p.StartMaintenanceResult_
+}
+var Result__DrainHostsResult__DEFAULT *DrainHostsResult_
+func (p *Result_) GetDrainHostsResult_() *DrainHostsResult_ {
+  if !p.IsSetDrainHostsResult_() {
+    return Result__DrainHostsResult__DEFAULT
+  }
+return p.DrainHostsResult_
+}
+var Result__QueryRecoveryResult__DEFAULT *QueryRecoveryResult_
+func (p *Result_) GetQueryRecoveryResult_() *QueryRecoveryResult_ {
+  if !p.IsSetQueryRecoveryResult_() {
+    return Result__QueryRecoveryResult__DEFAULT
+  }
+return p.QueryRecoveryResult_
+}
+var Result__MaintenanceStatusResult__DEFAULT *MaintenanceStatusResult_
+func (p *Result_) GetMaintenanceStatusResult_() *MaintenanceStatusResult_ {
+  if !p.IsSetMaintenanceStatusResult_() {
+    return Result__MaintenanceStatusResult__DEFAULT
+  }
+return p.MaintenanceStatusResult_
+}
+var Result__EndMaintenanceResult__DEFAULT *EndMaintenanceResult_
+func (p *Result_) GetEndMaintenanceResult_() *EndMaintenanceResult_ {
+  if !p.IsSetEndMaintenanceResult_() {
+    return Result__EndMaintenanceResult__DEFAULT
+  }
+return p.EndMaintenanceResult_
+}
+var Result__RoleSummaryResult__DEFAULT *RoleSummaryResult_
+func (p *Result_) GetRoleSummaryResult_() *RoleSummaryResult_ {
+  if !p.IsSetRoleSummaryResult_() {
+    return Result__RoleSummaryResult__DEFAULT
+  }
+return p.RoleSummaryResult_
+}
+var Result__JobSummaryResult__DEFAULT *JobSummaryResult_
+func (p *Result_) GetJobSummaryResult_() *JobSummaryResult_ {
+  if !p.IsSetJobSummaryResult_() {
+    return Result__JobSummaryResult__DEFAULT
+  }
+return p.JobSummaryResult_
+}
+var Result__ConfigSummaryResult__DEFAULT *ConfigSummaryResult_
+func (p *Result_) GetConfigSummaryResult_() *ConfigSummaryResult_ {
+  if !p.IsSetConfigSummaryResult_() {
+    return Result__ConfigSummaryResult__DEFAULT
+  }
+return p.ConfigSummaryResult_
+}
+var Result__GetPendingReasonResult__DEFAULT *GetPendingReasonResult_
+func (p *Result_) GetGetPendingReasonResult_() *GetPendingReasonResult_ {
+  if !p.IsSetGetPendingReasonResult_() {
+    return Result__GetPendingReasonResult__DEFAULT
+  }
+return p.GetPendingReasonResult_
+}
+var Result__StartJobUpdateResult__DEFAULT *StartJobUpdateResult_
+func (p *Result_) GetStartJobUpdateResult_() *StartJobUpdateResult_ {
+  if !p.IsSetStartJobUpdateResult_() {
+    return Result__StartJobUpdateResult__DEFAULT
+  }
+return p.StartJobUpdateResult_
+}
+var Result__GetJobUpdateSummariesResult__DEFAULT *GetJobUpdateSummariesResult_
+func (p *Result_) GetGetJobUpdateSummariesResult_() *GetJobUpdateSummariesResult_ {
+  if !p.IsSetGetJobUpdateSummariesResult_() {
+    return Result__GetJobUpdateSummariesResult__DEFAULT
+  }
+return p.GetJobUpdateSummariesResult_
+}
+var Result__GetJobUpdateDetailsResult__DEFAULT *GetJobUpdateDetailsResult_
+func (p *Result_) GetGetJobUpdateDetailsResult_() *GetJobUpdateDetailsResult_ {
+  if !p.IsSetGetJobUpdateDetailsResult_() {
+    return Result__GetJobUpdateDetailsResult__DEFAULT
+  }
+return p.GetJobUpdateDetailsResult_
+}
+var Result__PulseJobUpdateResult__DEFAULT *PulseJobUpdateResult_
+func (p *Result_) GetPulseJobUpdateResult_() *PulseJobUpdateResult_ {
+  if !p.IsSetPulseJobUpdateResult_() {
+    return Result__PulseJobUpdateResult__DEFAULT
+  }
+return p.PulseJobUpdateResult_
+}
+var Result__GetJobUpdateDiffResult__DEFAULT *GetJobUpdateDiffResult_
+func (p *Result_) GetGetJobUpdateDiffResult_() *GetJobUpdateDiffResult_ {
+  if !p.IsSetGetJobUpdateDiffResult_() {
+    return Result__GetJobUpdateDiffResult__DEFAULT
+  }
+return p.GetJobUpdateDiffResult_
+}
+var Result__GetTierConfigResult__DEFAULT *GetTierConfigResult_
+func (p *Result_) GetGetTierConfigResult_() *GetTierConfigResult_ {
+  if !p.IsSetGetTierConfigResult_() {
+    return Result__GetTierConfigResult__DEFAULT
+  }
+return p.GetTierConfigResult_
+}
+func (p *Result_) CountSetFieldsResult_() int {
+  count := 0
+  if (p.IsSetPopulateJobResult_()) {
+    count++
+  }
+  if (p.IsSetScheduleStatusResult_()) {
+    count++
+  }
+  if (p.IsSetGetJobsResult_()) {
+    count++
+  }
+  if (p.IsSetGetQuotaResult_()) {
+    count++
+  }
+  if (p.IsSetListBackupsResult_()) {
+    count++
+  }
+  if (p.IsSetStartMaintenanceResult_()) {
+    count++
+  }
+  if (p.IsSetDrainHostsResult_()) {
+    count++
+  }
+  if (p.IsSetQueryRecoveryResult_()) {
+    count++
+  }
+  if (p.IsSetMaintenanceStatusResult_()) {
+    count++
+  }
+  if (p.IsSetEndMaintenanceResult_()) {
+    count++
+  }
+  if (p.IsSetRoleSummaryResult_()) {
+    count++
+  }
+  if (p.IsSetJobSummaryResult_()) {
+    count++
+  }
+  if (p.IsSetConfigSummaryResult_()) {
+    count++
+  }
+  if (p.IsSetGetPendingReasonResult_()) {
+    count++
+  }
+  if (p.IsSetStartJobUpdateResult_()) {
+    count++
+  }
+  if (p.IsSetGetJobUpdateSummariesResult_()) {
+    count++
+  }
+  if (p.IsSetGetJobUpdateDetailsResult_()) {
+    count++
+  }
+  if (p.IsSetPulseJobUpdateResult_()) {
+    count++
+  }
+  if (p.IsSetGetJobUpdateDiffResult_()) {
+    count++
+  }
+  if (p.IsSetGetTierConfigResult_()) {
+    count++
+  }
+  return count
+
+}
+
+func (p *Result_) IsSetPopulateJobResult_() bool {
+  return p.PopulateJobResult_ != nil
+}
+
+func (p *Result_) IsSetScheduleStatusResult_() bool {
+  return p.ScheduleStatusResult_ != nil
+}
+
+func (p *Result_) IsSetGetJobsResult_() bool {
+  return p.GetJobsResult_ != nil
+}
+
+func (p *Result_) IsSetGetQuotaResult_() bool {
+  return p.GetQuotaResult_ != nil
+}
+
+func (p *Result_) IsSetListBackupsResult_() bool {
+  return p.ListBackupsResult_ != nil
+}
+
+func (p *Result_) IsSetStartMaintenanceResult_() bool {
+  return p.StartMaintenanceResult_ != nil
+}
+
+func (p *Result_) IsSetDrainHostsResult_() bool {
+  return p.DrainHostsResult_ != nil
+}
+
+func (p *Result_) IsSetQueryRecoveryResult_() bool {
+  return p.QueryRecoveryResult_ != nil
+}
+
+func (p *Result_) IsSetMaintenanceStatusResult_() bool {
+  return p.MaintenanceStatusResult_ != nil
+}
+
+func (p *Result_) IsSetEndMaintenanceResult_() bool {
+  return p.EndMaintenanceResult_ != nil
+}
+
+func (p *Result_) IsSetRoleSummaryResult_() bool {
+  return p.RoleSummaryResult_ != nil
+}
+
+func (p *Result_) IsSetJobSummaryResult_() bool {
+  return p.JobSummaryResult_ != nil
+}
+
+func (p *Result_) IsSetConfigSummaryResult_() bool {
+  return p.ConfigSummaryResult_ != nil
+}
+
+func (p *Result_) IsSetGetPendingReasonResult_() bool {
+  return p.GetPendingReasonResult_ != nil
+}
+
+func (p *Result_) IsSetStartJobUpdateResult_() bool {
+  return p.StartJobUpdateResult_ != nil
+}
+
+func (p *Result_) IsSetGetJobUpdateSummariesResult_() bool {
+  return p.GetJobUpdateSummariesResult_ != nil
+}
+
+func (p *Result_) IsSetGetJobUpdateDetailsResult_() bool {
+  return p.GetJobUpdateDetailsResult_ != nil
+}
+
+func (p *Result_) IsSetPulseJobUpdateResult_() bool {
+  return p.PulseJobUpdateResult_ != nil
+}
+
+func (p *Result_) IsSetGetJobUpdateDiffResult_() bool {
+  return p.GetJobUpdateDiffResult_ != nil
+}
+
+func (p *Result_) IsSetGetTierConfigResult_() bool {
+  return p.GetTierConfigResult_ != nil
+}
+
+func (p *Result_) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 7:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField7(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 8:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField8(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 9:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField9(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 10:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField10(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 11:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField11(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 17:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField17(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 18:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField18(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 20:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField20(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 21:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField21(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 22:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField22(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 23:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField23(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 24:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField24(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 25:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField25(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 26:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField26(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 27:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField27(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField1(iprot thrift.TProtocol) error {
+  p.PopulateJobResult_ = &PopulateJobResult_{}
+  if err := p.PopulateJobResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.PopulateJobResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField3(iprot thrift.TProtocol) error {
+  p.ScheduleStatusResult_ = &ScheduleStatusResult_{}
+  if err := p.ScheduleStatusResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ScheduleStatusResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField4(iprot thrift.TProtocol) error {
+  p.GetJobsResult_ = &GetJobsResult_{}
+  if err := p.GetJobsResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetJobsResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField5(iprot thrift.TProtocol) error {
+  p.GetQuotaResult_ = &GetQuotaResult_{}
+  if err := p.GetQuotaResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetQuotaResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField6(iprot thrift.TProtocol) error {
+  p.ListBackupsResult_ = &ListBackupsResult_{}
+  if err := p.ListBackupsResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ListBackupsResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField7(iprot thrift.TProtocol) error {
+  p.StartMaintenanceResult_ = &StartMaintenanceResult_{}
+  if err := p.StartMaintenanceResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.StartMaintenanceResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField8(iprot thrift.TProtocol) error {
+  p.DrainHostsResult_ = &DrainHostsResult_{}
+  if err := p.DrainHostsResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DrainHostsResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField9(iprot thrift.TProtocol) error {
+  p.QueryRecoveryResult_ = &QueryRecoveryResult_{}
+  if err := p.QueryRecoveryResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.QueryRecoveryResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField10(iprot thrift.TProtocol) error {
+  p.MaintenanceStatusResult_ = &MaintenanceStatusResult_{}
+  if err := p.MaintenanceStatusResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MaintenanceStatusResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField11(iprot thrift.TProtocol) error {
+  p.EndMaintenanceResult_ = &EndMaintenanceResult_{}
+  if err := p.EndMaintenanceResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.EndMaintenanceResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField17(iprot thrift.TProtocol) error {
+  p.RoleSummaryResult_ = &RoleSummaryResult_{}
+  if err := p.RoleSummaryResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.RoleSummaryResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField18(iprot thrift.TProtocol) error {
+  p.JobSummaryResult_ = &JobSummaryResult_{}
+  if err := p.JobSummaryResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobSummaryResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField20(iprot thrift.TProtocol) error {
+  p.ConfigSummaryResult_ = &ConfigSummaryResult_{}
+  if err := p.ConfigSummaryResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ConfigSummaryResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField21(iprot thrift.TProtocol) error {
+  p.GetPendingReasonResult_ = &GetPendingReasonResult_{}
+  if err := p.GetPendingReasonResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetPendingReasonResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField22(iprot thrift.TProtocol) error {
+  p.StartJobUpdateResult_ = &StartJobUpdateResult_{}
+  if err := p.StartJobUpdateResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.StartJobUpdateResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField23(iprot thrift.TProtocol) error {
+  p.GetJobUpdateSummariesResult_ = &GetJobUpdateSummariesResult_{}
+  if err := p.GetJobUpdateSummariesResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetJobUpdateSummariesResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField24(iprot thrift.TProtocol) error {
+  p.GetJobUpdateDetailsResult_ = &GetJobUpdateDetailsResult_{}
+  if err := p.GetJobUpdateDetailsResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetJobUpdateDetailsResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField25(iprot thrift.TProtocol) error {
+  p.PulseJobUpdateResult_ = &PulseJobUpdateResult_{}
+  if err := p.PulseJobUpdateResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.PulseJobUpdateResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField26(iprot thrift.TProtocol) error {
+  p.GetJobUpdateDiffResult_ = &GetJobUpdateDiffResult_{}
+  if err := p.GetJobUpdateDiffResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetJobUpdateDiffResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_)  ReadField27(iprot thrift.TProtocol) error {
+  p.GetTierConfigResult_ = &GetTierConfigResult_{}
+  if err := p.GetTierConfigResult_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetTierConfigResult_), err)
+  }
+  return nil
+}
+
+func (p *Result_) Write(oprot thrift.TProtocol) error {
+  if c := p.CountSetFieldsResult_(); c != 1 {
+    return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
+  }
+  if err := oprot.WriteStructBegin("Result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+    if err := p.writeField7(oprot); err != nil { return err }
+    if err := p.writeField8(oprot); err != nil { return err }
+    if err := p.writeField9(oprot); err != nil { return err }
+    if err := p.writeField10(oprot); err != nil { return err }
+    if err := p.writeField11(oprot); err != nil { return err }
+    if err := p.writeField17(oprot); err != nil { return err }
+    if err := p.writeField18(oprot); err != nil { return err }
+    if err := p.writeField20(oprot); err != nil { return err }
+    if err := p.writeField21(oprot); err != nil { return err }
+    if err := p.writeField22(oprot); err != nil { return err }
+    if err := p.writeField23(oprot); err != nil { return err }
+    if err := p.writeField24(oprot); err != nil { return err }
+    if err := p.writeField25(oprot); err != nil { return err }
+    if err := p.writeField26(oprot); err != nil { return err }
+    if err := p.writeField27(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Result_) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetPopulateJobResult_() {
+    if err := oprot.WriteFieldBegin("populateJobResult", thrift.STRUCT, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:populateJobResult: ", p), err) }
+    if err := p.PopulateJobResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.PopulateJobResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:populateJobResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetScheduleStatusResult_() {
+    if err := oprot.WriteFieldBegin("scheduleStatusResult", thrift.STRUCT, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:scheduleStatusResult: ", p), err) }
+    if err := p.ScheduleStatusResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ScheduleStatusResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:scheduleStatusResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField4(oprot thrift.TProtocol) (err error) {
+  if p.IsSetGetJobsResult_() {
+    if err := oprot.WriteFieldBegin("getJobsResult", thrift.STRUCT, 4); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:getJobsResult: ", p), err) }
+    if err := p.GetJobsResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetJobsResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:getJobsResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField5(oprot thrift.TProtocol) (err error) {
+  if p.IsSetGetQuotaResult_() {
+    if err := oprot.WriteFieldBegin("getQuotaResult", thrift.STRUCT, 5); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:getQuotaResult: ", p), err) }
+    if err := p.GetQuotaResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetQuotaResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:getQuotaResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField6(oprot thrift.TProtocol) (err error) {
+  if p.IsSetListBackupsResult_() {
+    if err := oprot.WriteFieldBegin("listBackupsResult", thrift.STRUCT, 6); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:listBackupsResult: ", p), err) }
+    if err := p.ListBackupsResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ListBackupsResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:listBackupsResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField7(oprot thrift.TProtocol) (err error) {
+  if p.IsSetStartMaintenanceResult_() {
+    if err := oprot.WriteFieldBegin("startMaintenanceResult", thrift.STRUCT, 7); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:startMaintenanceResult: ", p), err) }
+    if err := p.StartMaintenanceResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.StartMaintenanceResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:startMaintenanceResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField8(oprot thrift.TProtocol) (err error) {
+  if p.IsSetDrainHostsResult_() {
+    if err := oprot.WriteFieldBegin("drainHostsResult", thrift.STRUCT, 8); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:drainHostsResult: ", p), err) }
+    if err := p.DrainHostsResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DrainHostsResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:drainHostsResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField9(oprot thrift.TProtocol) (err error) {
+  if p.IsSetQueryRecoveryResult_() {
+    if err := oprot.WriteFieldBegin("queryRecoveryResult", thrift.STRUCT, 9); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:queryRecoveryResult: ", p), err) }
+    if err := p.QueryRecoveryResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.QueryRecoveryResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 9:queryRecoveryResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField10(oprot thrift.TProtocol) (err error) {
+  if p.IsSetMaintenanceStatusResult_() {
+    if err := oprot.WriteFieldBegin("maintenanceStatusResult", thrift.STRUCT, 10); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:maintenanceStatusResult: ", p), err) }
+    if err := p.MaintenanceStatusResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MaintenanceStatusResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 10:maintenanceStatusResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField11(oprot thrift.TProtocol) (err error) {
+  if p.IsSetEndMaintenanceResult_() {
+    if err := oprot.WriteFieldBegin("endMaintenanceResult", thrift.STRUCT, 11); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:endMaintenanceResult: ", p), err) }
+    if err := p.EndMaintenanceResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.EndMaintenanceResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 11:endMaintenanceResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField17(oprot thrift.TProtocol) (err error) {
+  if p.IsSetRoleSummaryResult_() {
+    if err := oprot.WriteFieldBegin("roleSummaryResult", thrift.STRUCT, 17); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 17:roleSummaryResult: ", p), err) }
+    if err := p.RoleSummaryResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.RoleSummaryResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 17:roleSummaryResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField18(oprot thrift.TProtocol) (err error) {
+  if p.IsSetJobSummaryResult_() {
+    if err := oprot.WriteFieldBegin("jobSummaryResult", thrift.STRUCT, 18); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 18:jobSummaryResult: ", p), err) }
+    if err := p.JobSummaryResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobSummaryResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 18:jobSummaryResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField20(oprot thrift.TProtocol) (err error) {
+  if p.IsSetConfigSummaryResult_() {
+    if err := oprot.WriteFieldBegin("configSummaryResult", thrift.STRUCT, 20); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 20:configSummaryResult: ", p), err) }
+    if err := p.ConfigSummaryResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ConfigSummaryResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 20:configSummaryResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField21(oprot thrift.TProtocol) (err error) {
+  if p.IsSetGetPendingReasonResult_() {
+    if err := oprot.WriteFieldBegin("getPendingReasonResult", thrift.STRUCT, 21); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 21:getPendingReasonResult: ", p), err) }
+    if err := p.GetPendingReasonResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetPendingReasonResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 21:getPendingReasonResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField22(oprot thrift.TProtocol) (err error) {
+  if p.IsSetStartJobUpdateResult_() {
+    if err := oprot.WriteFieldBegin("startJobUpdateResult", thrift.STRUCT, 22); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 22:startJobUpdateResult: ", p), err) }
+    if err := p.StartJobUpdateResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.StartJobUpdateResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 22:startJobUpdateResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField23(oprot thrift.TProtocol) (err error) {
+  if p.IsSetGetJobUpdateSummariesResult_() {
+    if err := oprot.WriteFieldBegin("getJobUpdateSummariesResult", thrift.STRUCT, 23); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 23:getJobUpdateSummariesResult: ", p), err) }
+    if err := p.GetJobUpdateSummariesResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetJobUpdateSummariesResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 23:getJobUpdateSummariesResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField24(oprot thrift.TProtocol) (err error) {
+  if p.IsSetGetJobUpdateDetailsResult_() {
+    if err := oprot.WriteFieldBegin("getJobUpdateDetailsResult", thrift.STRUCT, 24); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 24:getJobUpdateDetailsResult: ", p), err) }
+    if err := p.GetJobUpdateDetailsResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetJobUpdateDetailsResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 24:getJobUpdateDetailsResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField25(oprot thrift.TProtocol) (err error) {
+  if p.IsSetPulseJobUpdateResult_() {
+    if err := oprot.WriteFieldBegin("pulseJobUpdateResult", thrift.STRUCT, 25); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 25:pulseJobUpdateResult: ", p), err) }
+    if err := p.PulseJobUpdateResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.PulseJobUpdateResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 25:pulseJobUpdateResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField26(oprot thrift.TProtocol) (err error) {
+  if p.IsSetGetJobUpdateDiffResult_() {
+    if err := oprot.WriteFieldBegin("getJobUpdateDiffResult", thrift.STRUCT, 26); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 26:getJobUpdateDiffResult: ", p), err) }
+    if err := p.GetJobUpdateDiffResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetJobUpdateDiffResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 26:getJobUpdateDiffResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) writeField27(oprot thrift.TProtocol) (err error) {
+  if p.IsSetGetTierConfigResult_() {
+    if err := oprot.WriteFieldBegin("getTierConfigResult", thrift.STRUCT, 27); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 27:getTierConfigResult: ", p), err) }
+    if err := p.GetTierConfigResult_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetTierConfigResult_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 27:getTierConfigResult: ", p), err) }
+  }
+  return err
+}
+
+func (p *Result_) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Result_(%+v)", *p)
+}
+
+// Attributes:
+//  - Message
+type ResponseDetail struct {
+  Message string `thrift:"message,1" db:"message" json:"message"`
+}
+
+func NewResponseDetail() *ResponseDetail {
+  return &ResponseDetail{}
+}
+
+
+func (p *ResponseDetail) GetMessage() string {
+  return p.Message
+}
+func (p *ResponseDetail) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ResponseDetail)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Message = v
+}
+  return nil
+}
+
+func (p *ResponseDetail) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ResponseDetail"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ResponseDetail) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("message", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:message: ", p), err) }
+  if err := oprot.WriteString(string(p.Message)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.message (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:message: ", p), err) }
+  return err
+}
+
+func (p *ResponseDetail) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ResponseDetail(%+v)", *p)
+}
+
+// Attributes:
+//  - ResponseCode
+//  - ServerInfo
+//  - Result_: Payload from the invoked RPC.
+//  - Details: Messages from the server relevant to the request, such as warnings or use of deprecated
+// features.
+type Response struct {
+  ResponseCode ResponseCode `thrift:"responseCode,1" db:"responseCode" json:"responseCode"`
+  // unused field # 2
+  Result_ *Result_ `thrift:"result,3" db:"result" json:"result,omitempty"`
+  // unused field # 4
+  ServerInfo *ServerInfo `thrift:"serverInfo,5" db:"serverInfo" json:"serverInfo"`
+  Details []*ResponseDetail `thrift:"details,6" db:"details" json:"details"`
+}
+
+func NewResponse() *Response {
+  return &Response{}
+}
+
+
+func (p *Response) GetResponseCode() ResponseCode {
+  return p.ResponseCode
+}
+var Response_ServerInfo_DEFAULT *ServerInfo
+func (p *Response) GetServerInfo() *ServerInfo {
+  if !p.IsSetServerInfo() {
+    return Response_ServerInfo_DEFAULT
+  }
+return p.ServerInfo
+}
+var Response_Result__DEFAULT *Result_
+func (p *Response) GetResult_() *Result_ {
+  if !p.IsSetResult_() {
+    return Response_Result__DEFAULT
+  }
+return p.Result_
+}
+
+func (p *Response) GetDetails() []*ResponseDetail {
+  return p.Details
+}
+func (p *Response) IsSetServerInfo() bool {
+  return p.ServerInfo != nil
+}
+
+func (p *Response) IsSetResult_() bool {
+  return p.Result_ != nil
+}
+
+func (p *Response) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.LIST {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *Response)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  temp := ResponseCode(v)
+  p.ResponseCode = temp
+}
+  return nil
+}
+
+func (p *Response)  ReadField5(iprot thrift.TProtocol) error {
+  p.ServerInfo = &ServerInfo{}
+  if err := p.ServerInfo.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ServerInfo), err)
+  }
+  return nil
+}
+
+func (p *Response)  ReadField3(iprot thrift.TProtocol) error {
+  p.Result_ = &Result_{}
+  if err := p.Result_.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Result_), err)
+  }
+  return nil
+}
+
+func (p *Response)  ReadField6(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadListBegin()
+  if err != nil {
+    return thrift.PrependError("error reading list begin: ", err)
+  }
+  tSlice := make([]*ResponseDetail, 0, size)
+  p.Details =  tSlice
+  for i := 0; i < size; i ++ {
+    _elem51 := &ResponseDetail{}
+    if err := _elem51.Read(iprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem51), err)
+    }
+    p.Details = append(p.Details, _elem51)
+  }
+  if err := iprot.ReadListEnd(); err != nil {
+    return thrift.PrependError("error reading list end: ", err)
+  }
+  return nil
+}
+
+func (p *Response) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("Response"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *Response) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("responseCode", thrift.I32, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:responseCode: ", p), err) }
+  if err := oprot.WriteI32(int32(p.ResponseCode)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.responseCode (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:responseCode: ", p), err) }
+  return err
+}
+
+func (p *Response) writeField3(oprot thrift.TProtocol) (err error) {
+  if p.IsSetResult_() {
+    if err := oprot.WriteFieldBegin("result", thrift.STRUCT, 3); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:result: ", p), err) }
+    if err := p.Result_.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Result_), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:result: ", p), err) }
+  }
+  return err
+}
+
+func (p *Response) writeField5(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("serverInfo", thrift.STRUCT, 5); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:serverInfo: ", p), err) }
+  if err := p.ServerInfo.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ServerInfo), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:serverInfo: ", p), err) }
+  return err
+}
+
+func (p *Response) writeField6(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("details", thrift.LIST, 6); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:details: ", p), err) }
+  if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Details)); err != nil {
+    return thrift.PrependError("error writing list begin: ", err)
+  }
+  for _, v := range p.Details {
+    if err := v.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+    }
+  }
+  if err := oprot.WriteListEnd(); err != nil {
+    return thrift.PrependError("error writing list end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:details: ", p), err) }
+  return err
+}
+
+func (p *Response) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("Response(%+v)", *p)
+}
+
+// Attributes:
+//  - BatchSize
+type ExplicitReconciliationSettings struct {
+  BatchSize *int32 `thrift:"batchSize,1" db:"batchSize" json:"batchSize,omitempty"`
+}
+
+func NewExplicitReconciliationSettings() *ExplicitReconciliationSettings {
+  return &ExplicitReconciliationSettings{}
+}
+
+var ExplicitReconciliationSettings_BatchSize_DEFAULT int32
+func (p *ExplicitReconciliationSettings) GetBatchSize() int32 {
+  if !p.IsSetBatchSize() {
+    return ExplicitReconciliationSettings_BatchSize_DEFAULT
+  }
+return *p.BatchSize
+}
+func (p *ExplicitReconciliationSettings) IsSetBatchSize() bool {
+  return p.BatchSize != nil
+}
+
+func (p *ExplicitReconciliationSettings) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ExplicitReconciliationSettings)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.BatchSize = &v
+}
+  return nil
+}
+
+func (p *ExplicitReconciliationSettings) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("ExplicitReconciliationSettings"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ExplicitReconciliationSettings) writeField1(oprot thrift.TProtocol) (err error) {
+  if p.IsSetBatchSize() {
+    if err := oprot.WriteFieldBegin("batchSize", thrift.I32, 1); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:batchSize: ", p), err) }
+    if err := oprot.WriteI32(int32(*p.BatchSize)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T.batchSize (1) field write error: ", p), err) }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:batchSize: ", p), err) }
+  }
+  return err
+}
+
+func (p *ExplicitReconciliationSettings) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ExplicitReconciliationSettings(%+v)", *p)
+}
+
+type ReadOnlyScheduler interface {
+  // Returns a summary of the jobs grouped by role.
+  GetRoleSummary(ctx context.Context) (r *Response, err error)
+  // Returns a summary of jobs, optionally only those owned by a specific role.
+  // 
+  // Parameters:
+  //  - Role
+  GetJobSummary(ctx context.Context, role string) (r *Response, err error)
+  // Fetches the status of tasks.
+  // 
+  // Parameters:
+  //  - Query
+  GetTasksStatus(ctx context.Context, query *TaskQuery) (r *Response, err error)
+  // Same as getTaskStatus but without the TaskConfig.ExecutorConfig data set.
+  // This is an interim solution until we have a better way to query TaskConfigs (AURORA-541).
+  // 
+  // Parameters:
+  //  - Query
+  GetTasksWithoutConfigs(ctx context.Context, query *TaskQuery) (r *Response, err error)
+  // Returns user-friendly reasons (if available) for tasks retained in PENDING state.
+  // 
+  // Parameters:
+  //  - Query
+  GetPendingReason(ctx context.Context, query *TaskQuery) (r *Response, err error)
+  // Fetches the configuration summary of active tasks for the specified job.
+  // 
+  // Parameters:
+  //  - Job
+  GetConfigSummary(ctx context.Context, job *JobKey) (r *Response, err error)
+  // Fetches the status of jobs.
+  // ownerRole is optional, in which case all jobs are returned.
+  // 
+  // Parameters:
+  //  - OwnerRole
+  GetJobs(ctx context.Context, ownerRole string) (r *Response, err error)
+  // Fetches the quota allocated for a user.
+  // 
+  // Parameters:
+  //  - OwnerRole
+  GetQuota(ctx context.Context, ownerRole string) (r *Response, err error)
+  // Populates fields in a job configuration as though it were about to be run.
+  // This can be used to diff a configuration running tasks.
+  // 
+  // Parameters:
+  //  - Description
+  PopulateJobConfig(ctx context.Context, description *JobConfiguration) (r *Response, err error)
+  // Gets job update summaries.
+  // 
+  // Parameters:
+  //  - JobUpdateQuery
+  GetJobUpdateSummaries(ctx context.Context, jobUpdateQuery *JobUpdateQuery) (r *Response, err error)
+  // Gets job update details.
+  // 
+  // Parameters:
+  //  - Query
+  GetJobUpdateDetails(ctx context.Context, query *JobUpdateQuery) (r *Response, err error)
+  // Gets the diff between client (desired) and server (current) job states.
+  // 
+  // Parameters:
+  //  - Request
+  GetJobUpdateDiff(ctx context.Context, request *JobUpdateRequest) (r *Response, err error)
+  // Gets tier configurations.
+  GetTierConfigs(ctx context.Context) (r *Response, err error)
+}
+
+type ReadOnlySchedulerClient struct {
+  c thrift.TClient
+}
+
+func NewReadOnlySchedulerClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *ReadOnlySchedulerClient {
+  return &ReadOnlySchedulerClient{
+    c: thrift.NewTStandardClient(f.GetProtocol(t), f.GetProtocol(t)),
+  }
+}
+
+func NewReadOnlySchedulerClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *ReadOnlySchedulerClient {
+  return &ReadOnlySchedulerClient{
+    c: thrift.NewTStandardClient(iprot, oprot),
+  }
+}
+
+func NewReadOnlySchedulerClient(c thrift.TClient) *ReadOnlySchedulerClient {
+  return &ReadOnlySchedulerClient{
+    c: c,
+  }
+}
+
+func (p *ReadOnlySchedulerClient) Client_() thrift.TClient {
+  return p.c
+}
+// Returns a summary of the jobs grouped by role.
+func (p *ReadOnlySchedulerClient) GetRoleSummary(ctx context.Context) (r *Response, err error) {
+  var _args52 ReadOnlySchedulerGetRoleSummaryArgs
+  var _result53 ReadOnlySchedulerGetRoleSummaryResult
+  if err = p.Client_().Call(ctx, "getRoleSummary", &_args52, &_result53); err != nil {
+    return
+  }
+  return _result53.GetSuccess(), nil
+}
+
+// Returns a summary of jobs, optionally only those owned by a specific role.
+// 
+// Parameters:
+//  - Role
+func (p *ReadOnlySchedulerClient) GetJobSummary(ctx context.Context, role string) (r *Response, err error) {
+  var _args54 ReadOnlySchedulerGetJobSummaryArgs
+  _args54.Role = role
+  var _result55 ReadOnlySchedulerGetJobSummaryResult
+  if err = p.Client_().Call(ctx, "getJobSummary", &_args54, &_result55); err != nil {
+    return
+  }
+  return _result55.GetSuccess(), nil
+}
+
+// Fetches the status of tasks.
+// 
+// Parameters:
+//  - Query
+func (p *ReadOnlySchedulerClient) GetTasksStatus(ctx context.Context, query *TaskQuery) (r *Response, err error) {
+  var _args56 ReadOnlySchedulerGetTasksStatusArgs
+  _args56.Query = query
+  var _result57 ReadOnlySchedulerGetTasksStatusResult
+  if err = p.Client_().Call(ctx, "getTasksStatus", &_args56, &_result57); err != nil {
+    return
+  }
+  return _result57.GetSuccess(), nil
+}
+
+// Same as getTaskStatus but without the TaskConfig.ExecutorConfig data set.
+// This is an interim solution until we have a better way to query TaskConfigs (AURORA-541).
+// 
+// Parameters:
+//  - Query
+func (p *ReadOnlySchedulerClient) GetTasksWithoutConfigs(ctx context.Context, query *TaskQuery) (r *Response, err error) {
+  var _args58 ReadOnlySchedulerGetTasksWithoutConfigsArgs
+  _args58.Query = query
+  var _result59 ReadOnlySchedulerGetTasksWithoutConfigsResult
+  if err = p.Client_().Call(ctx, "getTasksWithoutConfigs", &_args58, &_result59); err != nil {
+    return
+  }
+  return _result59.GetSuccess(), nil
+}
+
+// Returns user-friendly reasons (if available) for tasks retained in PENDING state.
+// 
+// Parameters:
+//  - Query
+func (p *ReadOnlySchedulerClient) GetPendingReason(ctx context.Context, query *TaskQuery) (r *Response, err error) {
+  var _args60 ReadOnlySchedulerGetPendingReasonArgs
+  _args60.Query = query
+  var _result61 ReadOnlySchedulerGetPendingReasonResult
+  if err = p.Client_().Call(ctx, "getPendingReason", &_args60, &_result61); err != nil {
+    return
+  }
+  return _result61.GetSuccess(), nil
+}
+
+// Fetches the configuration summary of active tasks for the specified job.
+// 
+// Parameters:
+//  - Job
+func (p *ReadOnlySchedulerClient) GetConfigSummary(ctx context.Context, job *JobKey) (r *Response, err error) {
+  var _args62 ReadOnlySchedulerGetConfigSummaryArgs
+  _args62.Job = job
+  var _result63 ReadOnlySchedulerGetConfigSummaryResult
+  if err = p.Client_().Call(ctx, "getConfigSummary", &_args62, &_result63); err != nil {
+    return
+  }
+  return _result63.GetSuccess(), nil
+}
+
+// Fetches the status of jobs.
+// ownerRole is optional, in which case all jobs are returned.
+// 
+// Parameters:
+//  - OwnerRole
+func (p *ReadOnlySchedulerClient) GetJobs(ctx context.Context, ownerRole string) (r *Response, err error) {
+  var _args64 ReadOnlySchedulerGetJobsArgs
+  _args64.OwnerRole = ownerRole
+  var _result65 ReadOnlySchedulerGetJobsResult
+  if err = p.Client_().Call(ctx, "getJobs", &_args64, &_result65); err != nil {
+    return
+  }
+  return _result65.GetSuccess(), nil
+}
+
+// Fetches the quota allocated for a user.
+// 
+// Parameters:
+//  - OwnerRole
+func (p *ReadOnlySchedulerClient) GetQuota(ctx context.Context, ownerRole string) (r *Response, err error) {
+  var _args66 ReadOnlySchedulerGetQuotaArgs
+  _args66.OwnerRole = ownerRole
+  var _result67 ReadOnlySchedulerGetQuotaResult
+  if err = p.Client_().Call(ctx, "getQuota", &_args66, &_result67); err != nil {
+    return
+  }
+  return _result67.GetSuccess(), nil
+}
+
+// Populates fields in a job configuration as though it were about to be run.
+// This can be used to diff a configuration running tasks.
+// 
+// Parameters:
+//  - Description
+func (p *ReadOnlySchedulerClient) PopulateJobConfig(ctx context.Context, description *JobConfiguration) (r *Response, err error) {
+  var _args68 ReadOnlySchedulerPopulateJobConfigArgs
+  _args68.Description = description
+  var _result69 ReadOnlySchedulerPopulateJobConfigResult
+  if err = p.Client_().Call(ctx, "populateJobConfig", &_args68, &_result69); err != nil {
+    return
+  }
+  return _result69.GetSuccess(), nil
+}
+
+// Gets job update summaries.
+// 
+// Parameters:
+//  - JobUpdateQuery
+func (p *ReadOnlySchedulerClient) GetJobUpdateSummaries(ctx context.Context, jobUpdateQuery *JobUpdateQuery) (r *Response, err error) {
+  var _args70 ReadOnlySchedulerGetJobUpdateSummariesArgs
+  _args70.JobUpdateQuery = jobUpdateQuery
+  var _result71 ReadOnlySchedulerGetJobUpdateSummariesResult
+  if err = p.Client_().Call(ctx, "getJobUpdateSummaries", &_args70, &_result71); err != nil {
+    return
+  }
+  return _result71.GetSuccess(), nil
+}
+
+// Gets job update details.
+// 
+// Parameters:
+//  - Query
+func (p *ReadOnlySchedulerClient) GetJobUpdateDetails(ctx context.Context, query *JobUpdateQuery) (r *Response, err error) {
+  var _args72 ReadOnlySchedulerGetJobUpdateDetailsArgs
+  _args72.Query = query
+  var _result73 ReadOnlySchedulerGetJobUpdateDetailsResult
+  if err = p.Client_().Call(ctx, "getJobUpdateDetails", &_args72, &_result73); err != nil {
+    return
+  }
+  return _result73.GetSuccess(), nil
+}
+
+// Gets the diff between client (desired) and server (current) job states.
+// 
+// Parameters:
+//  - Request
+func (p *ReadOnlySchedulerClient) GetJobUpdateDiff(ctx context.Context, request *JobUpdateRequest) (r *Response, err error) {
+  var _args74 ReadOnlySchedulerGetJobUpdateDiffArgs
+  _args74.Request = request
+  var _result75 ReadOnlySchedulerGetJobUpdateDiffResult
+  if err = p.Client_().Call(ctx, "getJobUpdateDiff", &_args74, &_result75); err != nil {
+    return
+  }
+  return _result75.GetSuccess(), nil
+}
+
+// Gets tier configurations.
+func (p *ReadOnlySchedulerClient) GetTierConfigs(ctx context.Context) (r *Response, err error) {
+  var _args76 ReadOnlySchedulerGetTierConfigsArgs
+  var _result77 ReadOnlySchedulerGetTierConfigsResult
+  if err = p.Client_().Call(ctx, "getTierConfigs", &_args76, &_result77); err != nil {
+    return
+  }
+  return _result77.GetSuccess(), nil
+}
+
+type ReadOnlySchedulerProcessor struct {
+  processorMap map[string]thrift.TProcessorFunction
+  handler ReadOnlyScheduler
+}
+
+func (p *ReadOnlySchedulerProcessor) AddToProcessorMap(key string, processor thrift.TProcessorFunction) {
+  p.processorMap[key] = processor
+}
+
+func (p *ReadOnlySchedulerProcessor) GetProcessorFunction(key string) (processor thrift.TProcessorFunction, ok bool) {
+  processor, ok = p.processorMap[key]
+  return processor, ok
+}
+
+func (p *ReadOnlySchedulerProcessor) ProcessorMap() map[string]thrift.TProcessorFunction {
+  return p.processorMap
+}
+
+func NewReadOnlySchedulerProcessor(handler ReadOnlyScheduler) *ReadOnlySchedulerProcessor {
+
+  self78 := &ReadOnlySchedulerProcessor{handler:handler, processorMap:make(map[string]thrift.TProcessorFunction)}
+  self78.processorMap["getRoleSummary"] = &readOnlySchedulerProcessorGetRoleSummary{handler:handler}
+  self78.processorMap["getJobSummary"] = &readOnlySchedulerProcessorGetJobSummary{handler:handler}
+  self78.processorMap["getTasksStatus"] = &readOnlySchedulerProcessorGetTasksStatus{handler:handler}
+  self78.processorMap["getTasksWithoutConfigs"] = &readOnlySchedulerProcessorGetTasksWithoutConfigs{handler:handler}
+  self78.processorMap["getPendingReason"] = &readOnlySchedulerProcessorGetPendingReason{handler:handler}
+  self78.processorMap["getConfigSummary"] = &readOnlySchedulerProcessorGetConfigSummary{handler:handler}
+  self78.processorMap["getJobs"] = &readOnlySchedulerProcessorGetJobs{handler:handler}
+  self78.processorMap["getQuota"] = &readOnlySchedulerProcessorGetQuota{handler:handler}
+  self78.processorMap["populateJobConfig"] = &readOnlySchedulerProcessorPopulateJobConfig{handler:handler}
+  self78.processorMap["getJobUpdateSummaries"] = &readOnlySchedulerProcessorGetJobUpdateSummaries{handler:handler}
+  self78.processorMap["getJobUpdateDetails"] = &readOnlySchedulerProcessorGetJobUpdateDetails{handler:handler}
+  self78.processorMap["getJobUpdateDiff"] = &readOnlySchedulerProcessorGetJobUpdateDiff{handler:handler}
+  self78.processorMap["getTierConfigs"] = &readOnlySchedulerProcessorGetTierConfigs{handler:handler}
+return self78
+}
+
+func (p *ReadOnlySchedulerProcessor) Process(ctx context.Context, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  name, _, seqId, err := iprot.ReadMessageBegin()
+  if err != nil { return false, err }
+  if processor, ok := p.GetProcessorFunction(name); ok {
+    return processor.Process(ctx, seqId, iprot, oprot)
+  }
+  iprot.Skip(thrift.STRUCT)
+  iprot.ReadMessageEnd()
+  x79 := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function " + name)
+  oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId)
+  x79.Write(oprot)
+  oprot.WriteMessageEnd()
+  oprot.Flush(ctx)
+  return false, x79
+
+}
+
+type readOnlySchedulerProcessorGetRoleSummary struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetRoleSummary) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetRoleSummaryArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getRoleSummary", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetRoleSummaryResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetRoleSummary(ctx); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getRoleSummary: " + err2.Error())
+    oprot.WriteMessageBegin("getRoleSummary", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getRoleSummary", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetJobSummary struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetJobSummary) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetJobSummaryArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getJobSummary", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetJobSummaryResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetJobSummary(ctx, args.Role); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobSummary: " + err2.Error())
+    oprot.WriteMessageBegin("getJobSummary", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getJobSummary", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetTasksStatus struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetTasksStatus) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetTasksStatusArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getTasksStatus", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetTasksStatusResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetTasksStatus(ctx, args.Query); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getTasksStatus: " + err2.Error())
+    oprot.WriteMessageBegin("getTasksStatus", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getTasksStatus", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetTasksWithoutConfigs struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetTasksWithoutConfigs) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetTasksWithoutConfigsArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getTasksWithoutConfigs", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetTasksWithoutConfigsResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetTasksWithoutConfigs(ctx, args.Query); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getTasksWithoutConfigs: " + err2.Error())
+    oprot.WriteMessageBegin("getTasksWithoutConfigs", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getTasksWithoutConfigs", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetPendingReason struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetPendingReason) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetPendingReasonArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getPendingReason", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetPendingReasonResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetPendingReason(ctx, args.Query); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getPendingReason: " + err2.Error())
+    oprot.WriteMessageBegin("getPendingReason", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getPendingReason", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetConfigSummary struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetConfigSummary) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetConfigSummaryArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getConfigSummary", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetConfigSummaryResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetConfigSummary(ctx, args.Job); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getConfigSummary: " + err2.Error())
+    oprot.WriteMessageBegin("getConfigSummary", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getConfigSummary", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetJobs struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetJobs) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetJobsArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getJobs", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetJobsResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetJobs(ctx, args.OwnerRole); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobs: " + err2.Error())
+    oprot.WriteMessageBegin("getJobs", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getJobs", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetQuota struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetQuota) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetQuotaArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getQuota", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetQuotaResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetQuota(ctx, args.OwnerRole); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getQuota: " + err2.Error())
+    oprot.WriteMessageBegin("getQuota", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getQuota", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorPopulateJobConfig struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorPopulateJobConfig) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerPopulateJobConfigArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("populateJobConfig", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerPopulateJobConfigResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.PopulateJobConfig(ctx, args.Description); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing populateJobConfig: " + err2.Error())
+    oprot.WriteMessageBegin("populateJobConfig", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("populateJobConfig", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetJobUpdateSummaries struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetJobUpdateSummaries) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetJobUpdateSummariesArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getJobUpdateSummaries", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetJobUpdateSummariesResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetJobUpdateSummaries(ctx, args.JobUpdateQuery); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobUpdateSummaries: " + err2.Error())
+    oprot.WriteMessageBegin("getJobUpdateSummaries", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getJobUpdateSummaries", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetJobUpdateDetails struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetJobUpdateDetails) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetJobUpdateDetailsArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getJobUpdateDetails", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetJobUpdateDetailsResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetJobUpdateDetails(ctx, args.Query); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobUpdateDetails: " + err2.Error())
+    oprot.WriteMessageBegin("getJobUpdateDetails", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getJobUpdateDetails", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetJobUpdateDiff struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetJobUpdateDiff) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetJobUpdateDiffArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getJobUpdateDiff", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetJobUpdateDiffResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetJobUpdateDiff(ctx, args.Request); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobUpdateDiff: " + err2.Error())
+    oprot.WriteMessageBegin("getJobUpdateDiff", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getJobUpdateDiff", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type readOnlySchedulerProcessorGetTierConfigs struct {
+  handler ReadOnlyScheduler
+}
+
+func (p *readOnlySchedulerProcessorGetTierConfigs) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := ReadOnlySchedulerGetTierConfigsArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("getTierConfigs", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := ReadOnlySchedulerGetTierConfigsResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.GetTierConfigs(ctx); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getTierConfigs: " + err2.Error())
+    oprot.WriteMessageBegin("getTierConfigs", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("getTierConfigs", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+
+// HELPER FUNCTIONS AND STRUCTURES
+
+type ReadOnlySchedulerGetRoleSummaryArgs struct {
+}
+
+func NewReadOnlySchedulerGetRoleSummaryArgs() *ReadOnlySchedulerGetRoleSummaryArgs {
+  return &ReadOnlySchedulerGetRoleSummaryArgs{}
+}
+
+func (p *ReadOnlySchedulerGetRoleSummaryArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    if err := iprot.Skip(fieldTypeId); err != nil {
+      return err
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetRoleSummaryArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getRoleSummary_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetRoleSummaryArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetRoleSummaryArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetRoleSummaryResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetRoleSummaryResult() *ReadOnlySchedulerGetRoleSummaryResult {
+  return &ReadOnlySchedulerGetRoleSummaryResult{}
+}
+
+var ReadOnlySchedulerGetRoleSummaryResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetRoleSummaryResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetRoleSummaryResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetRoleSummaryResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetRoleSummaryResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetRoleSummaryResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetRoleSummaryResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getRoleSummary_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetRoleSummaryResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetRoleSummaryResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetRoleSummaryResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Role
+type ReadOnlySchedulerGetJobSummaryArgs struct {
+  Role string `thrift:"role,1" db:"role" json:"role"`
+}
+
+func NewReadOnlySchedulerGetJobSummaryArgs() *ReadOnlySchedulerGetJobSummaryArgs {
+  return &ReadOnlySchedulerGetJobSummaryArgs{}
+}
+
+
+func (p *ReadOnlySchedulerGetJobSummaryArgs) GetRole() string {
+  return p.Role
+}
+func (p *ReadOnlySchedulerGetJobSummaryArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryArgs)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.Role = v
+}
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobSummary_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("role", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:role: ", p), err) }
+  if err := oprot.WriteString(string(p.Role)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.role (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:role: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobSummaryArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetJobSummaryResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetJobSummaryResult() *ReadOnlySchedulerGetJobSummaryResult {
+  return &ReadOnlySchedulerGetJobSummaryResult{}
+}
+
+var ReadOnlySchedulerGetJobSummaryResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetJobSummaryResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetJobSummaryResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetJobSummaryResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobSummary_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobSummaryResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobSummaryResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Query
+type ReadOnlySchedulerGetTasksStatusArgs struct {
+  Query *TaskQuery `thrift:"query,1" db:"query" json:"query"`
+}
+
+func NewReadOnlySchedulerGetTasksStatusArgs() *ReadOnlySchedulerGetTasksStatusArgs {
+  return &ReadOnlySchedulerGetTasksStatusArgs{}
+}
+
+var ReadOnlySchedulerGetTasksStatusArgs_Query_DEFAULT *TaskQuery
+func (p *ReadOnlySchedulerGetTasksStatusArgs) GetQuery() *TaskQuery {
+  if !p.IsSetQuery() {
+    return ReadOnlySchedulerGetTasksStatusArgs_Query_DEFAULT
+  }
+return p.Query
+}
+func (p *ReadOnlySchedulerGetTasksStatusArgs) IsSetQuery() bool {
+  return p.Query != nil
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Query = &TaskQuery{}
+  if err := p.Query.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getTasksStatus_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err) }
+  if err := p.Query.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetTasksStatusArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetTasksStatusResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetTasksStatusResult() *ReadOnlySchedulerGetTasksStatusResult {
+  return &ReadOnlySchedulerGetTasksStatusResult{}
+}
+
+var ReadOnlySchedulerGetTasksStatusResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetTasksStatusResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetTasksStatusResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetTasksStatusResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getTasksStatus_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetTasksStatusResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetTasksStatusResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Query
+type ReadOnlySchedulerGetTasksWithoutConfigsArgs struct {
+  Query *TaskQuery `thrift:"query,1" db:"query" json:"query"`
+}
+
+func NewReadOnlySchedulerGetTasksWithoutConfigsArgs() *ReadOnlySchedulerGetTasksWithoutConfigsArgs {
+  return &ReadOnlySchedulerGetTasksWithoutConfigsArgs{}
+}
+
+var ReadOnlySchedulerGetTasksWithoutConfigsArgs_Query_DEFAULT *TaskQuery
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) GetQuery() *TaskQuery {
+  if !p.IsSetQuery() {
+    return ReadOnlySchedulerGetTasksWithoutConfigsArgs_Query_DEFAULT
+  }
+return p.Query
+}
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) IsSetQuery() bool {
+  return p.Query != nil
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Query = &TaskQuery{}
+  if err := p.Query.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getTasksWithoutConfigs_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err) }
+  if err := p.Query.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetTasksWithoutConfigsArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetTasksWithoutConfigsResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetTasksWithoutConfigsResult() *ReadOnlySchedulerGetTasksWithoutConfigsResult {
+  return &ReadOnlySchedulerGetTasksWithoutConfigsResult{}
+}
+
+var ReadOnlySchedulerGetTasksWithoutConfigsResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetTasksWithoutConfigsResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getTasksWithoutConfigs_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetTasksWithoutConfigsResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Query
+type ReadOnlySchedulerGetPendingReasonArgs struct {
+  Query *TaskQuery `thrift:"query,1" db:"query" json:"query"`
+}
+
+func NewReadOnlySchedulerGetPendingReasonArgs() *ReadOnlySchedulerGetPendingReasonArgs {
+  return &ReadOnlySchedulerGetPendingReasonArgs{}
+}
+
+var ReadOnlySchedulerGetPendingReasonArgs_Query_DEFAULT *TaskQuery
+func (p *ReadOnlySchedulerGetPendingReasonArgs) GetQuery() *TaskQuery {
+  if !p.IsSetQuery() {
+    return ReadOnlySchedulerGetPendingReasonArgs_Query_DEFAULT
+  }
+return p.Query
+}
+func (p *ReadOnlySchedulerGetPendingReasonArgs) IsSetQuery() bool {
+  return p.Query != nil
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Query = &TaskQuery{}
+  if err := p.Query.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getPendingReason_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err) }
+  if err := p.Query.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetPendingReasonArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetPendingReasonResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetPendingReasonResult() *ReadOnlySchedulerGetPendingReasonResult {
+  return &ReadOnlySchedulerGetPendingReasonResult{}
+}
+
+var ReadOnlySchedulerGetPendingReasonResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetPendingReasonResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetPendingReasonResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetPendingReasonResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getPendingReason_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetPendingReasonResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetPendingReasonResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Job
+type ReadOnlySchedulerGetConfigSummaryArgs struct {
+  Job *JobKey `thrift:"job,1" db:"job" json:"job"`
+}
+
+func NewReadOnlySchedulerGetConfigSummaryArgs() *ReadOnlySchedulerGetConfigSummaryArgs {
+  return &ReadOnlySchedulerGetConfigSummaryArgs{}
+}
+
+var ReadOnlySchedulerGetConfigSummaryArgs_Job_DEFAULT *JobKey
+func (p *ReadOnlySchedulerGetConfigSummaryArgs) GetJob() *JobKey {
+  if !p.IsSetJob() {
+    return ReadOnlySchedulerGetConfigSummaryArgs_Job_DEFAULT
+  }
+return p.Job
+}
+func (p *ReadOnlySchedulerGetConfigSummaryArgs) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Job = &JobKey{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getConfigSummary_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:job: ", p), err) }
+  if err := p.Job.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:job: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetConfigSummaryArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetConfigSummaryResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetConfigSummaryResult() *ReadOnlySchedulerGetConfigSummaryResult {
+  return &ReadOnlySchedulerGetConfigSummaryResult{}
+}
+
+var ReadOnlySchedulerGetConfigSummaryResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetConfigSummaryResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetConfigSummaryResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetConfigSummaryResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getConfigSummary_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetConfigSummaryResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetConfigSummaryResult(%+v)", *p)
+}
+
+// Attributes:
+//  - OwnerRole
+type ReadOnlySchedulerGetJobsArgs struct {
+  OwnerRole string `thrift:"ownerRole,1" db:"ownerRole" json:"ownerRole"`
+}
+
+func NewReadOnlySchedulerGetJobsArgs() *ReadOnlySchedulerGetJobsArgs {
+  return &ReadOnlySchedulerGetJobsArgs{}
+}
+
+
+func (p *ReadOnlySchedulerGetJobsArgs) GetOwnerRole() string {
+  return p.OwnerRole
+}
+func (p *ReadOnlySchedulerGetJobsArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobsArgs)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.OwnerRole = v
+}
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobsArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobs_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobsArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("ownerRole", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:ownerRole: ", p), err) }
+  if err := oprot.WriteString(string(p.OwnerRole)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.ownerRole (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:ownerRole: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobsArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobsArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetJobsResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetJobsResult() *ReadOnlySchedulerGetJobsResult {
+  return &ReadOnlySchedulerGetJobsResult{}
+}
+
+var ReadOnlySchedulerGetJobsResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetJobsResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetJobsResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetJobsResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetJobsResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobsResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobsResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobs_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobsResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobsResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobsResult(%+v)", *p)
+}
+
+// Attributes:
+//  - OwnerRole
+type ReadOnlySchedulerGetQuotaArgs struct {
+  OwnerRole string `thrift:"ownerRole,1" db:"ownerRole" json:"ownerRole"`
+}
+
+func NewReadOnlySchedulerGetQuotaArgs() *ReadOnlySchedulerGetQuotaArgs {
+  return &ReadOnlySchedulerGetQuotaArgs{}
+}
+
+
+func (p *ReadOnlySchedulerGetQuotaArgs) GetOwnerRole() string {
+  return p.OwnerRole
+}
+func (p *ReadOnlySchedulerGetQuotaArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetQuotaArgs)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.OwnerRole = v
+}
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetQuotaArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getQuota_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetQuotaArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("ownerRole", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:ownerRole: ", p), err) }
+  if err := oprot.WriteString(string(p.OwnerRole)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.ownerRole (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:ownerRole: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetQuotaArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetQuotaArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetQuotaResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetQuotaResult() *ReadOnlySchedulerGetQuotaResult {
+  return &ReadOnlySchedulerGetQuotaResult{}
+}
+
+var ReadOnlySchedulerGetQuotaResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetQuotaResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetQuotaResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetQuotaResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetQuotaResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetQuotaResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetQuotaResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getQuota_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetQuotaResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetQuotaResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetQuotaResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Description
+type ReadOnlySchedulerPopulateJobConfigArgs struct {
+  Description *JobConfiguration `thrift:"description,1" db:"description" json:"description"`
+}
+
+func NewReadOnlySchedulerPopulateJobConfigArgs() *ReadOnlySchedulerPopulateJobConfigArgs {
+  return &ReadOnlySchedulerPopulateJobConfigArgs{}
+}
+
+var ReadOnlySchedulerPopulateJobConfigArgs_Description_DEFAULT *JobConfiguration
+func (p *ReadOnlySchedulerPopulateJobConfigArgs) GetDescription() *JobConfiguration {
+  if !p.IsSetDescription() {
+    return ReadOnlySchedulerPopulateJobConfigArgs_Description_DEFAULT
+  }
+return p.Description
+}
+func (p *ReadOnlySchedulerPopulateJobConfigArgs) IsSetDescription() bool {
+  return p.Description != nil
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Description = &JobConfiguration{}
+  if err := p.Description.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Description), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("populateJobConfig_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("description", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:description: ", p), err) }
+  if err := p.Description.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Description), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:description: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerPopulateJobConfigArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerPopulateJobConfigResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerPopulateJobConfigResult() *ReadOnlySchedulerPopulateJobConfigResult {
+  return &ReadOnlySchedulerPopulateJobConfigResult{}
+}
+
+var ReadOnlySchedulerPopulateJobConfigResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerPopulateJobConfigResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerPopulateJobConfigResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerPopulateJobConfigResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("populateJobConfig_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerPopulateJobConfigResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerPopulateJobConfigResult(%+v)", *p)
+}
+
+// Attributes:
+//  - JobUpdateQuery
+type ReadOnlySchedulerGetJobUpdateSummariesArgs struct {
+  JobUpdateQuery *JobUpdateQuery `thrift:"jobUpdateQuery,1" db:"jobUpdateQuery" json:"jobUpdateQuery"`
+}
+
+func NewReadOnlySchedulerGetJobUpdateSummariesArgs() *ReadOnlySchedulerGetJobUpdateSummariesArgs {
+  return &ReadOnlySchedulerGetJobUpdateSummariesArgs{}
+}
+
+var ReadOnlySchedulerGetJobUpdateSummariesArgs_JobUpdateQuery_DEFAULT *JobUpdateQuery
+func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) GetJobUpdateQuery() *JobUpdateQuery {
+  if !p.IsSetJobUpdateQuery() {
+    return ReadOnlySchedulerGetJobUpdateSummariesArgs_JobUpdateQuery_DEFAULT
+  }
+return p.JobUpdateQuery
+}
+func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) IsSetJobUpdateQuery() bool {
+  return p.JobUpdateQuery != nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.JobUpdateQuery = &JobUpdateQuery{}
+  if err := p.JobUpdateQuery.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobUpdateQuery), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobUpdateSummaries_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("jobUpdateQuery", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:jobUpdateQuery: ", p), err) }
+  if err := p.JobUpdateQuery.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobUpdateQuery), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:jobUpdateQuery: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateSummariesArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetJobUpdateSummariesResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetJobUpdateSummariesResult() *ReadOnlySchedulerGetJobUpdateSummariesResult {
+  return &ReadOnlySchedulerGetJobUpdateSummariesResult{}
+}
+
+var ReadOnlySchedulerGetJobUpdateSummariesResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetJobUpdateSummariesResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobUpdateSummaries_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateSummariesResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Query
+type ReadOnlySchedulerGetJobUpdateDetailsArgs struct {
+  // unused field # 1
+  Query *JobUpdateQuery `thrift:"query,2" db:"query" json:"query"`
+}
+
+func NewReadOnlySchedulerGetJobUpdateDetailsArgs() *ReadOnlySchedulerGetJobUpdateDetailsArgs {
+  return &ReadOnlySchedulerGetJobUpdateDetailsArgs{}
+}
+
+var ReadOnlySchedulerGetJobUpdateDetailsArgs_Query_DEFAULT *JobUpdateQuery
+func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) GetQuery() *JobUpdateQuery {
+  if !p.IsSetQuery() {
+    return ReadOnlySchedulerGetJobUpdateDetailsArgs_Query_DEFAULT
+  }
+return p.Query
+}
+func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) IsSetQuery() bool {
+  return p.Query != nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs)  ReadField2(iprot thrift.TProtocol) error {
+  p.Query = &JobUpdateQuery{}
+  if err := p.Query.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobUpdateDetails_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:query: ", p), err) }
+  if err := p.Query.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:query: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateDetailsArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetJobUpdateDetailsResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetJobUpdateDetailsResult() *ReadOnlySchedulerGetJobUpdateDetailsResult {
+  return &ReadOnlySchedulerGetJobUpdateDetailsResult{}
+}
+
+var ReadOnlySchedulerGetJobUpdateDetailsResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetJobUpdateDetailsResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobUpdateDetails_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateDetailsResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Request
+type ReadOnlySchedulerGetJobUpdateDiffArgs struct {
+  Request *JobUpdateRequest `thrift:"request,1" db:"request" json:"request"`
+}
+
+func NewReadOnlySchedulerGetJobUpdateDiffArgs() *ReadOnlySchedulerGetJobUpdateDiffArgs {
+  return &ReadOnlySchedulerGetJobUpdateDiffArgs{}
+}
+
+var ReadOnlySchedulerGetJobUpdateDiffArgs_Request_DEFAULT *JobUpdateRequest
+func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) GetRequest() *JobUpdateRequest {
+  if !p.IsSetRequest() {
+    return ReadOnlySchedulerGetJobUpdateDiffArgs_Request_DEFAULT
+  }
+return p.Request
+}
+func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) IsSetRequest() bool {
+  return p.Request != nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Request = &JobUpdateRequest{}
+  if err := p.Request.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Request), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobUpdateDiff_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:request: ", p), err) }
+  if err := p.Request.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Request), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:request: ", p), err) }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateDiffArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetJobUpdateDiffResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetJobUpdateDiffResult() *ReadOnlySchedulerGetJobUpdateDiffResult {
+  return &ReadOnlySchedulerGetJobUpdateDiffResult{}
+}
+
+var ReadOnlySchedulerGetJobUpdateDiffResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetJobUpdateDiffResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetJobUpdateDiffResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetJobUpdateDiffResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getJobUpdateDiff_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetJobUpdateDiffResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateDiffResult(%+v)", *p)
+}
+
+type ReadOnlySchedulerGetTierConfigsArgs struct {
+}
+
+func NewReadOnlySchedulerGetTierConfigsArgs() *ReadOnlySchedulerGetTierConfigsArgs {
+  return &ReadOnlySchedulerGetTierConfigsArgs{}
+}
+
+func (p *ReadOnlySchedulerGetTierConfigsArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    if err := iprot.Skip(fieldTypeId); err != nil {
+      return err
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTierConfigsArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getTierConfigs_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTierConfigsArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetTierConfigsArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type ReadOnlySchedulerGetTierConfigsResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewReadOnlySchedulerGetTierConfigsResult() *ReadOnlySchedulerGetTierConfigsResult {
+  return &ReadOnlySchedulerGetTierConfigsResult{}
+}
+
+var ReadOnlySchedulerGetTierConfigsResult_Success_DEFAULT *Response
+func (p *ReadOnlySchedulerGetTierConfigsResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return ReadOnlySchedulerGetTierConfigsResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *ReadOnlySchedulerGetTierConfigsResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *ReadOnlySchedulerGetTierConfigsResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTierConfigsResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTierConfigsResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("getTierConfigs_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *ReadOnlySchedulerGetTierConfigsResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *ReadOnlySchedulerGetTierConfigsResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("ReadOnlySchedulerGetTierConfigsResult(%+v)", *p)
+}
+
+
+type AuroraSchedulerManager interface {
+ReadOnlyScheduler
+
+  // Creates a new job.  The request will be denied if a job with the provided name already exists
+  // in the cluster.
+  // 
+  // Parameters:
+  //  - Description
+  CreateJob(ctx context.Context, description *JobConfiguration) (r *Response, err error)
+  // Enters a job into the cron schedule, without actually starting the job.
+  // If the job is already present in the schedule, this will update the schedule entry with the new
+  // configuration.
+  // 
+  // Parameters:
+  //  - Description
+  ScheduleCronJob(ctx context.Context, description *JobConfiguration) (r *Response, err error)
+  // Removes a job from the cron schedule. The request will be denied if the job was not previously
+  // scheduled with scheduleCronJob.
+  // 
+  // Parameters:
+  //  - Job
+  DescheduleCronJob(ctx context.Context, job *JobKey) (r *Response, err error)
+  // Starts a cron job immediately.  The request will be denied if the specified job does not
+  // exist for the role account, or the job is not a cron job.
+  // 
+  // Parameters:
+  //  - Job
+  StartCronJob(ctx context.Context, job *JobKey) (r *Response, err error)
+  // Restarts a batch of shards.
+  // 
+  // Parameters:
+  //  - Job
+  //  - ShardIds
+  RestartShards(ctx context.Context, job *JobKey, shardIds []int32) (r *Response, err error)
+  // Initiates a kill on tasks.
+  // 
+  // Parameters:
+  //  - Job
+  //  - Instances
+  //  - Message
+  KillTasks(ctx context.Context, job *JobKey, instances []int32, message string) (r *Response, err error)
+  // Adds new instances with the TaskConfig of the existing instance pointed by the key.
+  // 
+  // Parameters:
+  //  - Key
+  //  - Count
+  AddInstances(ctx context.Context, key *InstanceKey, count int32) (r *Response, err error)
+  // Replaces the template (configuration) for the existing cron job.
+  // The cron job template (configuration) must exist for the call to succeed.
+  // 
+  // Parameters:
+  //  - Config
+  ReplaceCronTemplate(ctx context.Context, config *JobConfiguration) (r *Response, err error)
+  // Starts update of the existing service job.
+  // 
+  // Parameters:
+  //  - Request: A description of how to change the job.
+  //  - Message: A user-specified message to include with the induced job update state change.
+  StartJobUpdate(ctx context.Context, request *JobUpdateRequest, message string) (r *Response, err error)
+  // Pauses the specified job update. Can be resumed by resumeUpdate call.
+  // 
+  // Parameters:
+  //  - Key: The update to pause.
+  //  - Message: A user-specified message to include with the induced job update state change.
+  PauseJobUpdate(ctx context.Context, key *JobUpdateKey, message string) (r *Response, err error)
+  // Resumes progress of a previously paused job update.
+  // 
+  // Parameters:
+  //  - Key: The update to resume.
+  //  - Message: A user-specified message to include with the induced job update state change.
+  ResumeJobUpdate(ctx context.Context, key *JobUpdateKey, message string) (r *Response, err error)
+  // Permanently aborts the job update. Does not remove the update history.
+  // 
+  // Parameters:
+  //  - Key: The update to abort.
+  //  - Message: A user-specified message to include with the induced job update state change.
+  AbortJobUpdate(ctx context.Context, key *JobUpdateKey, message string) (r *Response, err error)
+  // Rollbacks the specified active job update to the initial state.
+  // 
+  // Parameters:
+  //  - Key: The update to rollback.
+  //  - Message: A user-specified message to include with the induced job update state change.
+  RollbackJobUpdate(ctx context.Context, key *JobUpdateKey, message string) (r *Response, err error)
+  // Allows progress of the job update in case blockIfNoPulsesAfterMs is specified in
+  // JobUpdateSettings. Unblocks progress if the update was previously blocked.
+  // Responds with ResponseCode.INVALID_REQUEST in case an unknown update key is specified.
+  // 
+  // Parameters:
+  //  - Key
+  PulseJobUpdate(ctx context.Context, key *JobUpdateKey) (r *Response, err error)
+}
+
+type AuroraSchedulerManagerClient struct {
+  *ReadOnlySchedulerClient
+}
+
+func NewAuroraSchedulerManagerClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *AuroraSchedulerManagerClient {
+  return &AuroraSchedulerManagerClient{ReadOnlySchedulerClient: NewReadOnlySchedulerClientFactory(t, f)}}
+
+func NewAuroraSchedulerManagerClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *AuroraSchedulerManagerClient {
+  return &AuroraSchedulerManagerClient{ReadOnlySchedulerClient: NewReadOnlySchedulerClientProtocol(t, iprot, oprot)}
+}
+
+func NewAuroraSchedulerManagerClient(c thrift.TClient) *AuroraSchedulerManagerClient {
+  return &AuroraSchedulerManagerClient{
+    ReadOnlySchedulerClient: NewReadOnlySchedulerClient(c),
+  }
+}
+
+// Creates a new job.  The request will be denied if a job with the provided name already exists
+// in the cluster.
+// 
+// Parameters:
+//  - Description
+func (p *AuroraSchedulerManagerClient) CreateJob(ctx context.Context, description *JobConfiguration) (r *Response, err error) {
+  var _args131 AuroraSchedulerManagerCreateJobArgs
+  _args131.Description = description
+  var _result132 AuroraSchedulerManagerCreateJobResult
+  if err = p.Client_().Call(ctx, "createJob", &_args131, &_result132); err != nil {
+    return
+  }
+  return _result132.GetSuccess(), nil
+}
+
+// Enters a job into the cron schedule, without actually starting the job.
+// If the job is already present in the schedule, this will update the schedule entry with the new
+// configuration.
+// 
+// Parameters:
+//  - Description
+func (p *AuroraSchedulerManagerClient) ScheduleCronJob(ctx context.Context, description *JobConfiguration) (r *Response, err error) {
+  var _args133 AuroraSchedulerManagerScheduleCronJobArgs
+  _args133.Description = description
+  var _result134 AuroraSchedulerManagerScheduleCronJobResult
+  if err = p.Client_().Call(ctx, "scheduleCronJob", &_args133, &_result134); err != nil {
+    return
+  }
+  return _result134.GetSuccess(), nil
+}
+
+// Removes a job from the cron schedule. The request will be denied if the job was not previously
+// scheduled with scheduleCronJob.
+// 
+// Parameters:
+//  - Job
+func (p *AuroraSchedulerManagerClient) DescheduleCronJob(ctx context.Context, job *JobKey) (r *Response, err error) {
+  var _args135 AuroraSchedulerManagerDescheduleCronJobArgs
+  _args135.Job = job
+  var _result136 AuroraSchedulerManagerDescheduleCronJobResult
+  if err = p.Client_().Call(ctx, "descheduleCronJob", &_args135, &_result136); err != nil {
+    return
+  }
+  return _result136.GetSuccess(), nil
+}
+
+// Starts a cron job immediately.  The request will be denied if the specified job does not
+// exist for the role account, or the job is not a cron job.
+// 
+// Parameters:
+//  - Job
+func (p *AuroraSchedulerManagerClient) StartCronJob(ctx context.Context, job *JobKey) (r *Response, err error) {
+  var _args137 AuroraSchedulerManagerStartCronJobArgs
+  _args137.Job = job
+  var _result138 AuroraSchedulerManagerStartCronJobResult
+  if err = p.Client_().Call(ctx, "startCronJob", &_args137, &_result138); err != nil {
+    return
+  }
+  return _result138.GetSuccess(), nil
+}
+
+// Restarts a batch of shards.
+// 
+// Parameters:
+//  - Job
+//  - ShardIds
+func (p *AuroraSchedulerManagerClient) RestartShards(ctx context.Context, job *JobKey, shardIds []int32) (r *Response, err error) {
+  var _args139 AuroraSchedulerManagerRestartShardsArgs
+  _args139.Job = job
+  _args139.ShardIds = shardIds
+  var _result140 AuroraSchedulerManagerRestartShardsResult
+  if err = p.Client_().Call(ctx, "restartShards", &_args139, &_result140); err != nil {
+    return
+  }
+  return _result140.GetSuccess(), nil
+}
+
+// Initiates a kill on tasks.
+// 
+// Parameters:
+//  - Job
+//  - Instances
+//  - Message
+func (p *AuroraSchedulerManagerClient) KillTasks(ctx context.Context, job *JobKey, instances []int32, message string) (r *Response, err error) {
+  var _args141 AuroraSchedulerManagerKillTasksArgs
+  _args141.Job = job
+  _args141.Instances = instances
+  _args141.Message = message
+  var _result142 AuroraSchedulerManagerKillTasksResult
+  if err = p.Client_().Call(ctx, "killTasks", &_args141, &_result142); err != nil {
+    return
+  }
+  return _result142.GetSuccess(), nil
+}
+
+// Adds new instances with the TaskConfig of the existing instance pointed by the key.
+// 
+// Parameters:
+//  - Key
+//  - Count
+func (p *AuroraSchedulerManagerClient) AddInstances(ctx context.Context, key *InstanceKey, count int32) (r *Response, err error) {
+  var _args143 AuroraSchedulerManagerAddInstancesArgs
+  _args143.Key = key
+  _args143.Count = count
+  var _result144 AuroraSchedulerManagerAddInstancesResult
+  if err = p.Client_().Call(ctx, "addInstances", &_args143, &_result144); err != nil {
+    return
+  }
+  return _result144.GetSuccess(), nil
+}
+
+// Replaces the template (configuration) for the existing cron job.
+// The cron job template (configuration) must exist for the call to succeed.
+// 
+// Parameters:
+//  - Config
+func (p *AuroraSchedulerManagerClient) ReplaceCronTemplate(ctx context.Context, config *JobConfiguration) (r *Response, err error) {
+  var _args145 AuroraSchedulerManagerReplaceCronTemplateArgs
+  _args145.Config = config
+  var _result146 AuroraSchedulerManagerReplaceCronTemplateResult
+  if err = p.Client_().Call(ctx, "replaceCronTemplate", &_args145, &_result146); err != nil {
+    return
+  }
+  return _result146.GetSuccess(), nil
+}
+
+// Starts update of the existing service job.
+// 
+// Parameters:
+//  - Request: A description of how to change the job.
+//  - Message: A user-specified message to include with the induced job update state change.
+func (p *AuroraSchedulerManagerClient) StartJobUpdate(ctx context.Context, request *JobUpdateRequest, message string) (r *Response, err error) {
+  var _args147 AuroraSchedulerManagerStartJobUpdateArgs
+  _args147.Request = request
+  _args147.Message = message
+  var _result148 AuroraSchedulerManagerStartJobUpdateResult
+  if err = p.Client_().Call(ctx, "startJobUpdate", &_args147, &_result148); err != nil {
+    return
+  }
+  return _result148.GetSuccess(), nil
+}
+
+// Pauses the specified job update. Can be resumed by resumeUpdate call.
+// 
+// Parameters:
+//  - Key: The update to pause.
+//  - Message: A user-specified message to include with the induced job update state change.
+func (p *AuroraSchedulerManagerClient) PauseJobUpdate(ctx context.Context, key *JobUpdateKey, message string) (r *Response, err error) {
+  var _args149 AuroraSchedulerManagerPauseJobUpdateArgs
+  _args149.Key = key
+  _args149.Message = message
+  var _result150 AuroraSchedulerManagerPauseJobUpdateResult
+  if err = p.Client_().Call(ctx, "pauseJobUpdate", &_args149, &_result150); err != nil {
+    return
+  }
+  return _result150.GetSuccess(), nil
+}
+
+// Resumes progress of a previously paused job update.
+// 
+// Parameters:
+//  - Key: The update to resume.
+//  - Message: A user-specified message to include with the induced job update state change.
+func (p *AuroraSchedulerManagerClient) ResumeJobUpdate(ctx context.Context, key *JobUpdateKey, message string) (r *Response, err error) {
+  var _args151 AuroraSchedulerManagerResumeJobUpdateArgs
+  _args151.Key = key
+  _args151.Message = message
+  var _result152 AuroraSchedulerManagerResumeJobUpdateResult
+  if err = p.Client_().Call(ctx, "resumeJobUpdate", &_args151, &_result152); err != nil {
+    return
+  }
+  return _result152.GetSuccess(), nil
+}
+
+// Permanently aborts the job update. Does not remove the update history.
+// 
+// Parameters:
+//  - Key: The update to abort.
+//  - Message: A user-specified message to include with the induced job update state change.
+func (p *AuroraSchedulerManagerClient) AbortJobUpdate(ctx context.Context, key *JobUpdateKey, message string) (r *Response, err error) {
+  var _args153 AuroraSchedulerManagerAbortJobUpdateArgs
+  _args153.Key = key
+  _args153.Message = message
+  var _result154 AuroraSchedulerManagerAbortJobUpdateResult
+  if err = p.Client_().Call(ctx, "abortJobUpdate", &_args153, &_result154); err != nil {
+    return
+  }
+  return _result154.GetSuccess(), nil
+}
+
+// Rollbacks the specified active job update to the initial state.
+// 
+// Parameters:
+//  - Key: The update to rollback.
+//  - Message: A user-specified message to include with the induced job update state change.
+func (p *AuroraSchedulerManagerClient) RollbackJobUpdate(ctx context.Context, key *JobUpdateKey, message string) (r *Response, err error) {
+  var _args155 AuroraSchedulerManagerRollbackJobUpdateArgs
+  _args155.Key = key
+  _args155.Message = message
+  var _result156 AuroraSchedulerManagerRollbackJobUpdateResult
+  if err = p.Client_().Call(ctx, "rollbackJobUpdate", &_args155, &_result156); err != nil {
+    return
+  }
+  return _result156.GetSuccess(), nil
+}
+
+// Allows progress of the job update in case blockIfNoPulsesAfterMs is specified in
+// JobUpdateSettings. Unblocks progress if the update was previously blocked.
+// Responds with ResponseCode.INVALID_REQUEST in case an unknown update key is specified.
+// 
+// Parameters:
+//  - Key
+func (p *AuroraSchedulerManagerClient) PulseJobUpdate(ctx context.Context, key *JobUpdateKey) (r *Response, err error) {
+  var _args157 AuroraSchedulerManagerPulseJobUpdateArgs
+  _args157.Key = key
+  var _result158 AuroraSchedulerManagerPulseJobUpdateResult
+  if err = p.Client_().Call(ctx, "pulseJobUpdate", &_args157, &_result158); err != nil {
+    return
+  }
+  return _result158.GetSuccess(), nil
+}
+
+type AuroraSchedulerManagerProcessor struct {
+  *ReadOnlySchedulerProcessor
+}
+
+func NewAuroraSchedulerManagerProcessor(handler AuroraSchedulerManager) *AuroraSchedulerManagerProcessor {
+  self159 := &AuroraSchedulerManagerProcessor{NewReadOnlySchedulerProcessor(handler)}
+  self159.AddToProcessorMap("createJob", &auroraSchedulerManagerProcessorCreateJob{handler:handler})
+  self159.AddToProcessorMap("scheduleCronJob", &auroraSchedulerManagerProcessorScheduleCronJob{handler:handler})
+  self159.AddToProcessorMap("descheduleCronJob", &auroraSchedulerManagerProcessorDescheduleCronJob{handler:handler})
+  self159.AddToProcessorMap("startCronJob", &auroraSchedulerManagerProcessorStartCronJob{handler:handler})
+  self159.AddToProcessorMap("restartShards", &auroraSchedulerManagerProcessorRestartShards{handler:handler})
+  self159.AddToProcessorMap("killTasks", &auroraSchedulerManagerProcessorKillTasks{handler:handler})
+  self159.AddToProcessorMap("addInstances", &auroraSchedulerManagerProcessorAddInstances{handler:handler})
+  self159.AddToProcessorMap("replaceCronTemplate", &auroraSchedulerManagerProcessorReplaceCronTemplate{handler:handler})
+  self159.AddToProcessorMap("startJobUpdate", &auroraSchedulerManagerProcessorStartJobUpdate{handler:handler})
+  self159.AddToProcessorMap("pauseJobUpdate", &auroraSchedulerManagerProcessorPauseJobUpdate{handler:handler})
+  self159.AddToProcessorMap("resumeJobUpdate", &auroraSchedulerManagerProcessorResumeJobUpdate{handler:handler})
+  self159.AddToProcessorMap("abortJobUpdate", &auroraSchedulerManagerProcessorAbortJobUpdate{handler:handler})
+  self159.AddToProcessorMap("rollbackJobUpdate", &auroraSchedulerManagerProcessorRollbackJobUpdate{handler:handler})
+  self159.AddToProcessorMap("pulseJobUpdate", &auroraSchedulerManagerProcessorPulseJobUpdate{handler:handler})
+  return self159
+}
+
+type auroraSchedulerManagerProcessorCreateJob struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorCreateJob) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerCreateJobArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("createJob", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerCreateJobResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.CreateJob(ctx, args.Description); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing createJob: " + err2.Error())
+    oprot.WriteMessageBegin("createJob", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("createJob", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorScheduleCronJob struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorScheduleCronJob) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerScheduleCronJobArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("scheduleCronJob", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerScheduleCronJobResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.ScheduleCronJob(ctx, args.Description); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing scheduleCronJob: " + err2.Error())
+    oprot.WriteMessageBegin("scheduleCronJob", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("scheduleCronJob", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorDescheduleCronJob struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorDescheduleCronJob) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerDescheduleCronJobArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("descheduleCronJob", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerDescheduleCronJobResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.DescheduleCronJob(ctx, args.Job); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing descheduleCronJob: " + err2.Error())
+    oprot.WriteMessageBegin("descheduleCronJob", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("descheduleCronJob", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorStartCronJob struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorStartCronJob) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerStartCronJobArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("startCronJob", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerStartCronJobResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.StartCronJob(ctx, args.Job); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing startCronJob: " + err2.Error())
+    oprot.WriteMessageBegin("startCronJob", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("startCronJob", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorRestartShards struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorRestartShards) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerRestartShardsArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("restartShards", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerRestartShardsResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.RestartShards(ctx, args.Job, args.ShardIds); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing restartShards: " + err2.Error())
+    oprot.WriteMessageBegin("restartShards", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("restartShards", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorKillTasks struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorKillTasks) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerKillTasksArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("killTasks", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerKillTasksResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.KillTasks(ctx, args.Job, args.Instances, args.Message); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing killTasks: " + err2.Error())
+    oprot.WriteMessageBegin("killTasks", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("killTasks", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorAddInstances struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorAddInstances) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerAddInstancesArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("addInstances", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerAddInstancesResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.AddInstances(ctx, args.Key, args.Count); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing addInstances: " + err2.Error())
+    oprot.WriteMessageBegin("addInstances", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("addInstances", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorReplaceCronTemplate struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorReplaceCronTemplate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerReplaceCronTemplateArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("replaceCronTemplate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerReplaceCronTemplateResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.ReplaceCronTemplate(ctx, args.Config); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing replaceCronTemplate: " + err2.Error())
+    oprot.WriteMessageBegin("replaceCronTemplate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("replaceCronTemplate", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorStartJobUpdate struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorStartJobUpdate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerStartJobUpdateArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("startJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerStartJobUpdateResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.StartJobUpdate(ctx, args.Request, args.Message); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing startJobUpdate: " + err2.Error())
+    oprot.WriteMessageBegin("startJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("startJobUpdate", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorPauseJobUpdate struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorPauseJobUpdate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerPauseJobUpdateArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("pauseJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerPauseJobUpdateResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.PauseJobUpdate(ctx, args.Key, args.Message); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing pauseJobUpdate: " + err2.Error())
+    oprot.WriteMessageBegin("pauseJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("pauseJobUpdate", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorResumeJobUpdate struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorResumeJobUpdate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerResumeJobUpdateArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("resumeJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerResumeJobUpdateResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.ResumeJobUpdate(ctx, args.Key, args.Message); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing resumeJobUpdate: " + err2.Error())
+    oprot.WriteMessageBegin("resumeJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("resumeJobUpdate", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorAbortJobUpdate struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorAbortJobUpdate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerAbortJobUpdateArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("abortJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerAbortJobUpdateResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.AbortJobUpdate(ctx, args.Key, args.Message); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing abortJobUpdate: " + err2.Error())
+    oprot.WriteMessageBegin("abortJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("abortJobUpdate", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorRollbackJobUpdate struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorRollbackJobUpdate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerRollbackJobUpdateArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("rollbackJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerRollbackJobUpdateResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.RollbackJobUpdate(ctx, args.Key, args.Message); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing rollbackJobUpdate: " + err2.Error())
+    oprot.WriteMessageBegin("rollbackJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("rollbackJobUpdate", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraSchedulerManagerProcessorPulseJobUpdate struct {
+  handler AuroraSchedulerManager
+}
+
+func (p *auroraSchedulerManagerProcessorPulseJobUpdate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraSchedulerManagerPulseJobUpdateArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("pulseJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraSchedulerManagerPulseJobUpdateResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.PulseJobUpdate(ctx, args.Key); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing pulseJobUpdate: " + err2.Error())
+    oprot.WriteMessageBegin("pulseJobUpdate", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("pulseJobUpdate", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+
+// HELPER FUNCTIONS AND STRUCTURES
+
+// Attributes:
+//  - Description
+type AuroraSchedulerManagerCreateJobArgs struct {
+  Description *JobConfiguration `thrift:"description,1" db:"description" json:"description"`
+}
+
+func NewAuroraSchedulerManagerCreateJobArgs() *AuroraSchedulerManagerCreateJobArgs {
+  return &AuroraSchedulerManagerCreateJobArgs{}
+}
+
+var AuroraSchedulerManagerCreateJobArgs_Description_DEFAULT *JobConfiguration
+func (p *AuroraSchedulerManagerCreateJobArgs) GetDescription() *JobConfiguration {
+  if !p.IsSetDescription() {
+    return AuroraSchedulerManagerCreateJobArgs_Description_DEFAULT
+  }
+return p.Description
+}
+func (p *AuroraSchedulerManagerCreateJobArgs) IsSetDescription() bool {
+  return p.Description != nil
+}
+
+func (p *AuroraSchedulerManagerCreateJobArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerCreateJobArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Description = &JobConfiguration{}
+  if err := p.Description.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Description), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerCreateJobArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("createJob_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerCreateJobArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("description", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:description: ", p), err) }
+  if err := p.Description.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Description), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:description: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerCreateJobArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerCreateJobArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerCreateJobResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerCreateJobResult() *AuroraSchedulerManagerCreateJobResult {
+  return &AuroraSchedulerManagerCreateJobResult{}
+}
+
+var AuroraSchedulerManagerCreateJobResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerCreateJobResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerCreateJobResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerCreateJobResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerCreateJobResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerCreateJobResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerCreateJobResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("createJob_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerCreateJobResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerCreateJobResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerCreateJobResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Description
+type AuroraSchedulerManagerScheduleCronJobArgs struct {
+  Description *JobConfiguration `thrift:"description,1" db:"description" json:"description"`
+}
+
+func NewAuroraSchedulerManagerScheduleCronJobArgs() *AuroraSchedulerManagerScheduleCronJobArgs {
+  return &AuroraSchedulerManagerScheduleCronJobArgs{}
+}
+
+var AuroraSchedulerManagerScheduleCronJobArgs_Description_DEFAULT *JobConfiguration
+func (p *AuroraSchedulerManagerScheduleCronJobArgs) GetDescription() *JobConfiguration {
+  if !p.IsSetDescription() {
+    return AuroraSchedulerManagerScheduleCronJobArgs_Description_DEFAULT
+  }
+return p.Description
+}
+func (p *AuroraSchedulerManagerScheduleCronJobArgs) IsSetDescription() bool {
+  return p.Description != nil
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Description = &JobConfiguration{}
+  if err := p.Description.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Description), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("scheduleCronJob_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("description", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:description: ", p), err) }
+  if err := p.Description.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Description), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:description: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerScheduleCronJobArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerScheduleCronJobResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerScheduleCronJobResult() *AuroraSchedulerManagerScheduleCronJobResult {
+  return &AuroraSchedulerManagerScheduleCronJobResult{}
+}
+
+var AuroraSchedulerManagerScheduleCronJobResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerScheduleCronJobResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerScheduleCronJobResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerScheduleCronJobResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("scheduleCronJob_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerScheduleCronJobResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerScheduleCronJobResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Job
+type AuroraSchedulerManagerDescheduleCronJobArgs struct {
+  // unused fields # 1 to 3
+  Job *JobKey `thrift:"job,4" db:"job" json:"job"`
+}
+
+func NewAuroraSchedulerManagerDescheduleCronJobArgs() *AuroraSchedulerManagerDescheduleCronJobArgs {
+  return &AuroraSchedulerManagerDescheduleCronJobArgs{}
+}
+
+var AuroraSchedulerManagerDescheduleCronJobArgs_Job_DEFAULT *JobKey
+func (p *AuroraSchedulerManagerDescheduleCronJobArgs) GetJob() *JobKey {
+  if !p.IsSetJob() {
+    return AuroraSchedulerManagerDescheduleCronJobArgs_Job_DEFAULT
+  }
+return p.Job
+}
+func (p *AuroraSchedulerManagerDescheduleCronJobArgs) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 4:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobArgs)  ReadField4(iprot thrift.TProtocol) error {
+  p.Job = &JobKey{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("descheduleCronJob_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobArgs) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:job: ", p), err) }
+  if err := p.Job.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:job: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerDescheduleCronJobArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerDescheduleCronJobResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerDescheduleCronJobResult() *AuroraSchedulerManagerDescheduleCronJobResult {
+  return &AuroraSchedulerManagerDescheduleCronJobResult{}
+}
+
+var AuroraSchedulerManagerDescheduleCronJobResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerDescheduleCronJobResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerDescheduleCronJobResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerDescheduleCronJobResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("descheduleCronJob_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerDescheduleCronJobResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerDescheduleCronJobResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Job
+type AuroraSchedulerManagerStartCronJobArgs struct {
+  // unused fields # 1 to 3
+  Job *JobKey `thrift:"job,4" db:"job" json:"job"`
+}
+
+func NewAuroraSchedulerManagerStartCronJobArgs() *AuroraSchedulerManagerStartCronJobArgs {
+  return &AuroraSchedulerManagerStartCronJobArgs{}
+}
+
+var AuroraSchedulerManagerStartCronJobArgs_Job_DEFAULT *JobKey
+func (p *AuroraSchedulerManagerStartCronJobArgs) GetJob() *JobKey {
+  if !p.IsSetJob() {
+    return AuroraSchedulerManagerStartCronJobArgs_Job_DEFAULT
+  }
+return p.Job
+}
+func (p *AuroraSchedulerManagerStartCronJobArgs) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *AuroraSchedulerManagerStartCronJobArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 4:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartCronJobArgs)  ReadField4(iprot thrift.TProtocol) error {
+  p.Job = &JobKey{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartCronJobArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("startCronJob_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartCronJobArgs) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:job: ", p), err) }
+  if err := p.Job.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:job: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerStartCronJobArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerStartCronJobArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerStartCronJobResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerStartCronJobResult() *AuroraSchedulerManagerStartCronJobResult {
+  return &AuroraSchedulerManagerStartCronJobResult{}
+}
+
+var AuroraSchedulerManagerStartCronJobResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerStartCronJobResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerStartCronJobResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerStartCronJobResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerStartCronJobResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartCronJobResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartCronJobResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("startCronJob_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartCronJobResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerStartCronJobResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerStartCronJobResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Job
+//  - ShardIds
+type AuroraSchedulerManagerRestartShardsArgs struct {
+  // unused fields # 1 to 2
+  ShardIds []int32 `thrift:"shardIds,3" db:"shardIds" json:"shardIds"`
+  // unused field # 4
+  Job *JobKey `thrift:"job,5" db:"job" json:"job"`
+}
+
+func NewAuroraSchedulerManagerRestartShardsArgs() *AuroraSchedulerManagerRestartShardsArgs {
+  return &AuroraSchedulerManagerRestartShardsArgs{}
+}
+
+var AuroraSchedulerManagerRestartShardsArgs_Job_DEFAULT *JobKey
+func (p *AuroraSchedulerManagerRestartShardsArgs) GetJob() *JobKey {
+  if !p.IsSetJob() {
+    return AuroraSchedulerManagerRestartShardsArgs_Job_DEFAULT
+  }
+return p.Job
+}
+
+func (p *AuroraSchedulerManagerRestartShardsArgs) GetShardIds() []int32 {
+  return p.ShardIds
+}
+func (p *AuroraSchedulerManagerRestartShardsArgs) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 5:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsArgs)  ReadField5(iprot thrift.TProtocol) error {
+  p.Job = &JobKey{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsArgs)  ReadField3(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]int32, 0, size)
+  p.ShardIds =  tSet
+  for i := 0; i < size; i ++ {
+var _elem160 int32
+    if v, err := iprot.ReadI32(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem160 = v
+}
+    p.ShardIds = append(p.ShardIds, _elem160)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("restartShards_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsArgs) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("shardIds", thrift.SET, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:shardIds: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.I32, len(p.ShardIds)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.ShardIds); i++ {
+    for j := i+1; j<len(p.ShardIds); j++ {
+      if reflect.DeepEqual(p.ShardIds[i],p.ShardIds[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.ShardIds[i]))
+      }
+    }
+  }
+  for _, v := range p.ShardIds {
+    if err := oprot.WriteI32(int32(v)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:shardIds: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerRestartShardsArgs) writeField5(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 5); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:job: ", p), err) }
+  if err := p.Job.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:job: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerRestartShardsArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerRestartShardsArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerRestartShardsResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerRestartShardsResult() *AuroraSchedulerManagerRestartShardsResult {
+  return &AuroraSchedulerManagerRestartShardsResult{}
+}
+
+var AuroraSchedulerManagerRestartShardsResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerRestartShardsResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerRestartShardsResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerRestartShardsResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("restartShards_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRestartShardsResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerRestartShardsResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerRestartShardsResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Job
+//  - Instances
+//  - Message
+type AuroraSchedulerManagerKillTasksArgs struct {
+  // unused fields # 1 to 3
+  Job *JobKey `thrift:"job,4" db:"job" json:"job"`
+  Instances []int32 `thrift:"instances,5" db:"instances" json:"instances"`
+  Message string `thrift:"message,6" db:"message" json:"message"`
+}
+
+func NewAuroraSchedulerManagerKillTasksArgs() *AuroraSchedulerManagerKillTasksArgs {
+  return &AuroraSchedulerManagerKillTasksArgs{}
+}
+
+var AuroraSchedulerManagerKillTasksArgs_Job_DEFAULT *JobKey
+func (p *AuroraSchedulerManagerKillTasksArgs) GetJob() *JobKey {
+  if !p.IsSetJob() {
+    return AuroraSchedulerManagerKillTasksArgs_Job_DEFAULT
+  }
+return p.Job
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs) GetInstances() []int32 {
+  return p.Instances
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs) GetMessage() string {
+  return p.Message
+}
+func (p *AuroraSchedulerManagerKillTasksArgs) IsSetJob() bool {
+  return p.Job != nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 4:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 5:
+      if fieldTypeId == thrift.SET {
+        if err := p.ReadField5(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 6:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField6(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs)  ReadField4(iprot thrift.TProtocol) error {
+  p.Job = &JobKey{}
+  if err := p.Job.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs)  ReadField5(iprot thrift.TProtocol) error {
+  _, size, err := iprot.ReadSetBegin()
+  if err != nil {
+    return thrift.PrependError("error reading set begin: ", err)
+  }
+  tSet := make([]int32, 0, size)
+  p.Instances =  tSet
+  for i := 0; i < size; i ++ {
+var _elem161 int32
+    if v, err := iprot.ReadI32(); err != nil {
+    return thrift.PrependError("error reading field 0: ", err)
+} else {
+    _elem161 = v
+}
+    p.Instances = append(p.Instances, _elem161)
+  }
+  if err := iprot.ReadSetEnd(); err != nil {
+    return thrift.PrependError("error reading set end: ", err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs)  ReadField6(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 6: ", err)
+} else {
+  p.Message = v
+}
+  return nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("killTasks_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField4(oprot); err != nil { return err }
+    if err := p.writeField5(oprot); err != nil { return err }
+    if err := p.writeField6(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:job: ", p), err) }
+  if err := p.Job.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:job: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs) writeField5(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("instances", thrift.SET, 5); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:instances: ", p), err) }
+  if err := oprot.WriteSetBegin(thrift.I32, len(p.Instances)); err != nil {
+    return thrift.PrependError("error writing set begin: ", err)
+  }
+  for i := 0; i<len(p.Instances); i++ {
+    for j := i+1; j<len(p.Instances); j++ {
+      if reflect.DeepEqual(p.Instances[i],p.Instances[j]) { 
+        return thrift.PrependError("", fmt.Errorf("%T error writing set field: slice is not unique", p.Instances[i]))
+      }
+    }
+  }
+  for _, v := range p.Instances {
+    if err := oprot.WriteI32(int32(v)); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
+  }
+  if err := oprot.WriteSetEnd(); err != nil {
+    return thrift.PrependError("error writing set end: ", err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:instances: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs) writeField6(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("message", thrift.STRING, 6); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:message: ", p), err) }
+  if err := oprot.WriteString(string(p.Message)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.message (6) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:message: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerKillTasksArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerKillTasksArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerKillTasksResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerKillTasksResult() *AuroraSchedulerManagerKillTasksResult {
+  return &AuroraSchedulerManagerKillTasksResult{}
+}
+
+var AuroraSchedulerManagerKillTasksResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerKillTasksResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerKillTasksResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerKillTasksResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("killTasks_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerKillTasksResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerKillTasksResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerKillTasksResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Key
+//  - Count
+type AuroraSchedulerManagerAddInstancesArgs struct {
+  // unused fields # 1 to 2
+  Key *InstanceKey `thrift:"key,3" db:"key" json:"key"`
+  Count int32 `thrift:"count,4" db:"count" json:"count"`
+}
+
+func NewAuroraSchedulerManagerAddInstancesArgs() *AuroraSchedulerManagerAddInstancesArgs {
+  return &AuroraSchedulerManagerAddInstancesArgs{}
+}
+
+var AuroraSchedulerManagerAddInstancesArgs_Key_DEFAULT *InstanceKey
+func (p *AuroraSchedulerManagerAddInstancesArgs) GetKey() *InstanceKey {
+  if !p.IsSetKey() {
+    return AuroraSchedulerManagerAddInstancesArgs_Key_DEFAULT
+  }
+return p.Key
+}
+
+func (p *AuroraSchedulerManagerAddInstancesArgs) GetCount() int32 {
+  return p.Count
+}
+func (p *AuroraSchedulerManagerAddInstancesArgs) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 3:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 4:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField4(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesArgs)  ReadField3(iprot thrift.TProtocol) error {
+  p.Key = &InstanceKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesArgs)  ReadField4(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 4: ", err)
+} else {
+  p.Count = v
+}
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("addInstances_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField3(oprot); err != nil { return err }
+    if err := p.writeField4(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesArgs) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:key: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerAddInstancesArgs) writeField4(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("count", thrift.I32, 4); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:count: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Count)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.count (4) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:count: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerAddInstancesArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerAddInstancesArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerAddInstancesResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerAddInstancesResult() *AuroraSchedulerManagerAddInstancesResult {
+  return &AuroraSchedulerManagerAddInstancesResult{}
+}
+
+var AuroraSchedulerManagerAddInstancesResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerAddInstancesResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerAddInstancesResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerAddInstancesResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("addInstances_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAddInstancesResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerAddInstancesResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerAddInstancesResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Config
+type AuroraSchedulerManagerReplaceCronTemplateArgs struct {
+  Config *JobConfiguration `thrift:"config,1" db:"config" json:"config"`
+}
+
+func NewAuroraSchedulerManagerReplaceCronTemplateArgs() *AuroraSchedulerManagerReplaceCronTemplateArgs {
+  return &AuroraSchedulerManagerReplaceCronTemplateArgs{}
+}
+
+var AuroraSchedulerManagerReplaceCronTemplateArgs_Config_DEFAULT *JobConfiguration
+func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) GetConfig() *JobConfiguration {
+  if !p.IsSetConfig() {
+    return AuroraSchedulerManagerReplaceCronTemplateArgs_Config_DEFAULT
+  }
+return p.Config
+}
+func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) IsSetConfig() bool {
+  return p.Config != nil
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Config = &JobConfiguration{}
+  if err := p.Config.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Config), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("replaceCronTemplate_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("config", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:config: ", p), err) }
+  if err := p.Config.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Config), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:config: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerReplaceCronTemplateArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerReplaceCronTemplateResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerReplaceCronTemplateResult() *AuroraSchedulerManagerReplaceCronTemplateResult {
+  return &AuroraSchedulerManagerReplaceCronTemplateResult{}
+}
+
+var AuroraSchedulerManagerReplaceCronTemplateResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerReplaceCronTemplateResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerReplaceCronTemplateResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerReplaceCronTemplateResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("replaceCronTemplate_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerReplaceCronTemplateResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerReplaceCronTemplateResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Request: A description of how to change the job.
+//  - Message: A user-specified message to include with the induced job update state change.
+type AuroraSchedulerManagerStartJobUpdateArgs struct {
+  Request *JobUpdateRequest `thrift:"request,1" db:"request" json:"request"`
+  // unused field # 2
+  Message string `thrift:"message,3" db:"message" json:"message"`
+}
+
+func NewAuroraSchedulerManagerStartJobUpdateArgs() *AuroraSchedulerManagerStartJobUpdateArgs {
+  return &AuroraSchedulerManagerStartJobUpdateArgs{}
+}
+
+var AuroraSchedulerManagerStartJobUpdateArgs_Request_DEFAULT *JobUpdateRequest
+func (p *AuroraSchedulerManagerStartJobUpdateArgs) GetRequest() *JobUpdateRequest {
+  if !p.IsSetRequest() {
+    return AuroraSchedulerManagerStartJobUpdateArgs_Request_DEFAULT
+  }
+return p.Request
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateArgs) GetMessage() string {
+  return p.Message
+}
+func (p *AuroraSchedulerManagerStartJobUpdateArgs) IsSetRequest() bool {
+  return p.Request != nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Request = &JobUpdateRequest{}
+  if err := p.Request.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Request), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateArgs)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.Message = v
+}
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("startJobUpdate_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:request: ", p), err) }
+  if err := p.Request.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Request), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:request: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateArgs) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err) }
+  if err := oprot.WriteString(string(p.Message)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerStartJobUpdateArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerStartJobUpdateResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerStartJobUpdateResult() *AuroraSchedulerManagerStartJobUpdateResult {
+  return &AuroraSchedulerManagerStartJobUpdateResult{}
+}
+
+var AuroraSchedulerManagerStartJobUpdateResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerStartJobUpdateResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerStartJobUpdateResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerStartJobUpdateResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("startJobUpdate_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerStartJobUpdateResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerStartJobUpdateResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Key: The update to pause.
+//  - Message: A user-specified message to include with the induced job update state change.
+type AuroraSchedulerManagerPauseJobUpdateArgs struct {
+  Key *JobUpdateKey `thrift:"key,1" db:"key" json:"key"`
+  // unused field # 2
+  Message string `thrift:"message,3" db:"message" json:"message"`
+}
+
+func NewAuroraSchedulerManagerPauseJobUpdateArgs() *AuroraSchedulerManagerPauseJobUpdateArgs {
+  return &AuroraSchedulerManagerPauseJobUpdateArgs{}
+}
+
+var AuroraSchedulerManagerPauseJobUpdateArgs_Key_DEFAULT *JobUpdateKey
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs) GetKey() *JobUpdateKey {
+  if !p.IsSetKey() {
+    return AuroraSchedulerManagerPauseJobUpdateArgs_Key_DEFAULT
+  }
+return p.Key
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs) GetMessage() string {
+  return p.Message
+}
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Key = &JobUpdateKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.Message = v
+}
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("pauseJobUpdate_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err) }
+  if err := oprot.WriteString(string(p.Message)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerPauseJobUpdateArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerPauseJobUpdateResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerPauseJobUpdateResult() *AuroraSchedulerManagerPauseJobUpdateResult {
+  return &AuroraSchedulerManagerPauseJobUpdateResult{}
+}
+
+var AuroraSchedulerManagerPauseJobUpdateResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerPauseJobUpdateResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerPauseJobUpdateResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerPauseJobUpdateResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("pauseJobUpdate_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerPauseJobUpdateResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerPauseJobUpdateResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Key: The update to resume.
+//  - Message: A user-specified message to include with the induced job update state change.
+type AuroraSchedulerManagerResumeJobUpdateArgs struct {
+  Key *JobUpdateKey `thrift:"key,1" db:"key" json:"key"`
+  // unused field # 2
+  Message string `thrift:"message,3" db:"message" json:"message"`
+}
+
+func NewAuroraSchedulerManagerResumeJobUpdateArgs() *AuroraSchedulerManagerResumeJobUpdateArgs {
+  return &AuroraSchedulerManagerResumeJobUpdateArgs{}
+}
+
+var AuroraSchedulerManagerResumeJobUpdateArgs_Key_DEFAULT *JobUpdateKey
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs) GetKey() *JobUpdateKey {
+  if !p.IsSetKey() {
+    return AuroraSchedulerManagerResumeJobUpdateArgs_Key_DEFAULT
+  }
+return p.Key
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs) GetMessage() string {
+  return p.Message
+}
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Key = &JobUpdateKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.Message = v
+}
+  return nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("resumeJobUpdate_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err) }
+  if err := oprot.WriteString(string(p.Message)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerResumeJobUpdateArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerResumeJobUpdateResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerResumeJobUpdateResult() *AuroraSchedulerManagerResumeJobUpdateResult {
+  return &AuroraSchedulerManagerResumeJobUpdateResult{}
+}
+
+var AuroraSchedulerManagerResumeJobUpdateResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerResumeJobUpdateResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerResumeJobUpdateResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerResumeJobUpdateResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("resumeJobUpdate_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerResumeJobUpdateResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerResumeJobUpdateResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Key: The update to abort.
+//  - Message: A user-specified message to include with the induced job update state change.
+type AuroraSchedulerManagerAbortJobUpdateArgs struct {
+  Key *JobUpdateKey `thrift:"key,1" db:"key" json:"key"`
+  // unused field # 2
+  Message string `thrift:"message,3" db:"message" json:"message"`
+}
+
+func NewAuroraSchedulerManagerAbortJobUpdateArgs() *AuroraSchedulerManagerAbortJobUpdateArgs {
+  return &AuroraSchedulerManagerAbortJobUpdateArgs{}
+}
+
+var AuroraSchedulerManagerAbortJobUpdateArgs_Key_DEFAULT *JobUpdateKey
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs) GetKey() *JobUpdateKey {
+  if !p.IsSetKey() {
+    return AuroraSchedulerManagerAbortJobUpdateArgs_Key_DEFAULT
+  }
+return p.Key
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs) GetMessage() string {
+  return p.Message
+}
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Key = &JobUpdateKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.Message = v
+}
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("abortJobUpdate_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err) }
+  if err := oprot.WriteString(string(p.Message)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerAbortJobUpdateArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerAbortJobUpdateResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerAbortJobUpdateResult() *AuroraSchedulerManagerAbortJobUpdateResult {
+  return &AuroraSchedulerManagerAbortJobUpdateResult{}
+}
+
+var AuroraSchedulerManagerAbortJobUpdateResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerAbortJobUpdateResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerAbortJobUpdateResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerAbortJobUpdateResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("abortJobUpdate_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerAbortJobUpdateResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerAbortJobUpdateResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Key: The update to rollback.
+//  - Message: A user-specified message to include with the induced job update state change.
+type AuroraSchedulerManagerRollbackJobUpdateArgs struct {
+  Key *JobUpdateKey `thrift:"key,1" db:"key" json:"key"`
+  Message string `thrift:"message,2" db:"message" json:"message"`
+}
+
+func NewAuroraSchedulerManagerRollbackJobUpdateArgs() *AuroraSchedulerManagerRollbackJobUpdateArgs {
+  return &AuroraSchedulerManagerRollbackJobUpdateArgs{}
+}
+
+var AuroraSchedulerManagerRollbackJobUpdateArgs_Key_DEFAULT *JobUpdateKey
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) GetKey() *JobUpdateKey {
+  if !p.IsSetKey() {
+    return AuroraSchedulerManagerRollbackJobUpdateArgs_Key_DEFAULT
+  }
+return p.Key
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) GetMessage() string {
+  return p.Message
+}
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Key = &JobUpdateKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  p.Message = v
+}
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("rollbackJobUpdate_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("message", thrift.STRING, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:message: ", p), err) }
+  if err := oprot.WriteString(string(p.Message)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.message (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:message: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerRollbackJobUpdateArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerRollbackJobUpdateResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerRollbackJobUpdateResult() *AuroraSchedulerManagerRollbackJobUpdateResult {
+  return &AuroraSchedulerManagerRollbackJobUpdateResult{}
+}
+
+var AuroraSchedulerManagerRollbackJobUpdateResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerRollbackJobUpdateResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerRollbackJobUpdateResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerRollbackJobUpdateResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("rollbackJobUpdate_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerRollbackJobUpdateResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerRollbackJobUpdateResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Key
+type AuroraSchedulerManagerPulseJobUpdateArgs struct {
+  Key *JobUpdateKey `thrift:"key,1" db:"key" json:"key"`
+}
+
+func NewAuroraSchedulerManagerPulseJobUpdateArgs() *AuroraSchedulerManagerPulseJobUpdateArgs {
+  return &AuroraSchedulerManagerPulseJobUpdateArgs{}
+}
+
+var AuroraSchedulerManagerPulseJobUpdateArgs_Key_DEFAULT *JobUpdateKey
+func (p *AuroraSchedulerManagerPulseJobUpdateArgs) GetKey() *JobUpdateKey {
+  if !p.IsSetKey() {
+    return AuroraSchedulerManagerPulseJobUpdateArgs_Key_DEFAULT
+  }
+return p.Key
+}
+func (p *AuroraSchedulerManagerPulseJobUpdateArgs) IsSetKey() bool {
+  return p.Key != nil
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Key = &JobUpdateKey{}
+  if err := p.Key.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("pulseJobUpdate_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
+  if err := p.Key.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
+  return err
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerPulseJobUpdateArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraSchedulerManagerPulseJobUpdateResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraSchedulerManagerPulseJobUpdateResult() *AuroraSchedulerManagerPulseJobUpdateResult {
+  return &AuroraSchedulerManagerPulseJobUpdateResult{}
+}
+
+var AuroraSchedulerManagerPulseJobUpdateResult_Success_DEFAULT *Response
+func (p *AuroraSchedulerManagerPulseJobUpdateResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraSchedulerManagerPulseJobUpdateResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraSchedulerManagerPulseJobUpdateResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("pulseJobUpdate_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraSchedulerManagerPulseJobUpdateResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraSchedulerManagerPulseJobUpdateResult(%+v)", *p)
+}
+
+
+type AuroraAdmin interface {
+AuroraSchedulerManager
+
+  // Assign quota to a user.  This will overwrite any pre-existing quota for the user.
+  // 
+  // Parameters:
+  //  - OwnerRole
+  //  - Quota
+  SetQuota(ctx context.Context, ownerRole string, quota *ResourceAggregate) (r *Response, err error)
+  // Forces a task into a specific state.  This does not guarantee the task will enter the given
+  // state, as the task must still transition within the bounds of the state machine.  However,
+  // it attempts to enter that state via the state machine.
+  // 
+  // Parameters:
+  //  - TaskId
+  //  - Status
+  ForceTaskState(ctx context.Context, taskId string, status ScheduleStatus) (r *Response, err error)
+  // Immediately writes a storage snapshot to disk.
+  PerformBackup(ctx context.Context) (r *Response, err error)
+  // Lists backups that are available for recovery.
+  ListBackups(ctx context.Context) (r *Response, err error)
+  // Loads a backup to an in-memory storage.  This must precede all other recovery operations.
+  // 
+  // Parameters:
+  //  - BackupId
+  StageRecovery(ctx context.Context, backupId string) (r *Response, err error)
+  // Queries for tasks in a staged recovery.
+  // 
+  // Parameters:
+  //  - Query
+  QueryRecovery(ctx context.Context, query *TaskQuery) (r *Response, err error)
+  // Deletes tasks from a staged recovery.
+  // 
+  // Parameters:
+  //  - Query
+  DeleteRecoveryTasks(ctx context.Context, query *TaskQuery) (r *Response, err error)
+  // Commits a staged recovery, completely replacing the previous storage state.
+  CommitRecovery(ctx context.Context) (r *Response, err error)
+  // Unloads (aborts) a staged recovery.
+  UnloadRecovery(ctx context.Context) (r *Response, err error)
+  // Put the given hosts into maintenance mode.
+  // 
+  // Parameters:
+  //  - Hosts
+  StartMaintenance(ctx context.Context, hosts *Hosts) (r *Response, err error)
+  // Ask scheduler to begin moving tasks scheduled on given hosts.
+  // 
+  // Parameters:
+  //  - Hosts
+  DrainHosts(ctx context.Context, hosts *Hosts) (r *Response, err error)
+  // Retrieve the current maintenance states for a group of hosts.
+  // 
+  // Parameters:
+  //  - Hosts
+  MaintenanceStatus(ctx context.Context, hosts *Hosts) (r *Response, err error)
+  // Set the given hosts back into serving mode.
+  // 
+  // Parameters:
+  //  - Hosts
+  EndMaintenance(ctx context.Context, hosts *Hosts) (r *Response, err error)
+  // Ask scheduler to put hosts into DRAINING mode and move scheduled tasks off of the hosts
+  // such that its SLA requirements are satisfied. Use defaultSlaPolicy if it is not set for a task.
+  // 
+  // 
+  // Parameters:
+  //  - Hosts
+  //  - DefaultSlaPolicy
+  //  - TimeoutSecs
+  SlaDrainHosts(ctx context.Context, hosts *Hosts, defaultSlaPolicy *SlaPolicy, timeoutSecs int64) (r *Response, err error)
+  // Start a storage snapshot and block until it completes.
+  Snapshot(ctx context.Context) (r *Response, err error)
+  // Tell scheduler to trigger an explicit task reconciliation with the given settings.
+  // 
+  // Parameters:
+  //  - Settings
+  TriggerExplicitTaskReconciliation(ctx context.Context, settings *ExplicitReconciliationSettings) (r *Response, err error)
+  // Tell scheduler to trigger an implicit task reconciliation.
+  TriggerImplicitTaskReconciliation(ctx context.Context) (r *Response, err error)
+  // Force prune any (terminal) tasks that match the query. If no statuses are supplied with the
+  // query, it will default to all terminal task states. If statuses are supplied, they must be
+  // terminal states.
+  // 
+  // Parameters:
+  //  - Query
+  PruneTasks(ctx context.Context, query *TaskQuery) (r *Response, err error)
+}
+
+type AuroraAdminClient struct {
+  *AuroraSchedulerManagerClient
+}
+
+func NewAuroraAdminClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *AuroraAdminClient {
+  return &AuroraAdminClient{AuroraSchedulerManagerClient: NewAuroraSchedulerManagerClientFactory(t, f)}}
+
+func NewAuroraAdminClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *AuroraAdminClient {
+  return &AuroraAdminClient{AuroraSchedulerManagerClient: NewAuroraSchedulerManagerClientProtocol(t, iprot, oprot)}
+}
+
+func NewAuroraAdminClient(c thrift.TClient) *AuroraAdminClient {
+  return &AuroraAdminClient{
+    AuroraSchedulerManagerClient: NewAuroraSchedulerManagerClient(c),
+  }
+}
+
+// Assign quota to a user.  This will overwrite any pre-existing quota for the user.
+// 
+// Parameters:
+//  - OwnerRole
+//  - Quota
+func (p *AuroraAdminClient) SetQuota(ctx context.Context, ownerRole string, quota *ResourceAggregate) (r *Response, err error) {
+  var _args316 AuroraAdminSetQuotaArgs
+  _args316.OwnerRole = ownerRole
+  _args316.Quota = quota
+  var _result317 AuroraAdminSetQuotaResult
+  if err = p.Client_().Call(ctx, "setQuota", &_args316, &_result317); err != nil {
+    return
+  }
+  return _result317.GetSuccess(), nil
+}
+
+// Forces a task into a specific state.  This does not guarantee the task will enter the given
+// state, as the task must still transition within the bounds of the state machine.  However,
+// it attempts to enter that state via the state machine.
+// 
+// Parameters:
+//  - TaskId
+//  - Status
+func (p *AuroraAdminClient) ForceTaskState(ctx context.Context, taskId string, status ScheduleStatus) (r *Response, err error) {
+  var _args318 AuroraAdminForceTaskStateArgs
+  _args318.TaskId = taskId
+  _args318.Status = status
+  var _result319 AuroraAdminForceTaskStateResult
+  if err = p.Client_().Call(ctx, "forceTaskState", &_args318, &_result319); err != nil {
+    return
+  }
+  return _result319.GetSuccess(), nil
+}
+
+// Immediately writes a storage snapshot to disk.
+func (p *AuroraAdminClient) PerformBackup(ctx context.Context) (r *Response, err error) {
+  var _args320 AuroraAdminPerformBackupArgs
+  var _result321 AuroraAdminPerformBackupResult
+  if err = p.Client_().Call(ctx, "performBackup", &_args320, &_result321); err != nil {
+    return
+  }
+  return _result321.GetSuccess(), nil
+}
+
+// Lists backups that are available for recovery.
+func (p *AuroraAdminClient) ListBackups(ctx context.Context) (r *Response, err error) {
+  var _args322 AuroraAdminListBackupsArgs
+  var _result323 AuroraAdminListBackupsResult
+  if err = p.Client_().Call(ctx, "listBackups", &_args322, &_result323); err != nil {
+    return
+  }
+  return _result323.GetSuccess(), nil
+}
+
+// Loads a backup to an in-memory storage.  This must precede all other recovery operations.
+// 
+// Parameters:
+//  - BackupId
+func (p *AuroraAdminClient) StageRecovery(ctx context.Context, backupId string) (r *Response, err error) {
+  var _args324 AuroraAdminStageRecoveryArgs
+  _args324.BackupId = backupId
+  var _result325 AuroraAdminStageRecoveryResult
+  if err = p.Client_().Call(ctx, "stageRecovery", &_args324, &_result325); err != nil {
+    return
+  }
+  return _result325.GetSuccess(), nil
+}
+
+// Queries for tasks in a staged recovery.
+// 
+// Parameters:
+//  - Query
+func (p *AuroraAdminClient) QueryRecovery(ctx context.Context, query *TaskQuery) (r *Response, err error) {
+  var _args326 AuroraAdminQueryRecoveryArgs
+  _args326.Query = query
+  var _result327 AuroraAdminQueryRecoveryResult
+  if err = p.Client_().Call(ctx, "queryRecovery", &_args326, &_result327); err != nil {
+    return
+  }
+  return _result327.GetSuccess(), nil
+}
+
+// Deletes tasks from a staged recovery.
+// 
+// Parameters:
+//  - Query
+func (p *AuroraAdminClient) DeleteRecoveryTasks(ctx context.Context, query *TaskQuery) (r *Response, err error) {
+  var _args328 AuroraAdminDeleteRecoveryTasksArgs
+  _args328.Query = query
+  var _result329 AuroraAdminDeleteRecoveryTasksResult
+  if err = p.Client_().Call(ctx, "deleteRecoveryTasks", &_args328, &_result329); err != nil {
+    return
+  }
+  return _result329.GetSuccess(), nil
+}
+
+// Commits a staged recovery, completely replacing the previous storage state.
+func (p *AuroraAdminClient) CommitRecovery(ctx context.Context) (r *Response, err error) {
+  var _args330 AuroraAdminCommitRecoveryArgs
+  var _result331 AuroraAdminCommitRecoveryResult
+  if err = p.Client_().Call(ctx, "commitRecovery", &_args330, &_result331); err != nil {
+    return
+  }
+  return _result331.GetSuccess(), nil
+}
+
+// Unloads (aborts) a staged recovery.
+func (p *AuroraAdminClient) UnloadRecovery(ctx context.Context) (r *Response, err error) {
+  var _args332 AuroraAdminUnloadRecoveryArgs
+  var _result333 AuroraAdminUnloadRecoveryResult
+  if err = p.Client_().Call(ctx, "unloadRecovery", &_args332, &_result333); err != nil {
+    return
+  }
+  return _result333.GetSuccess(), nil
+}
+
+// Put the given hosts into maintenance mode.
+// 
+// Parameters:
+//  - Hosts
+func (p *AuroraAdminClient) StartMaintenance(ctx context.Context, hosts *Hosts) (r *Response, err error) {
+  var _args334 AuroraAdminStartMaintenanceArgs
+  _args334.Hosts = hosts
+  var _result335 AuroraAdminStartMaintenanceResult
+  if err = p.Client_().Call(ctx, "startMaintenance", &_args334, &_result335); err != nil {
+    return
+  }
+  return _result335.GetSuccess(), nil
+}
+
+// Ask scheduler to begin moving tasks scheduled on given hosts.
+// 
+// Parameters:
+//  - Hosts
+func (p *AuroraAdminClient) DrainHosts(ctx context.Context, hosts *Hosts) (r *Response, err error) {
+  var _args336 AuroraAdminDrainHostsArgs
+  _args336.Hosts = hosts
+  var _result337 AuroraAdminDrainHostsResult
+  if err = p.Client_().Call(ctx, "drainHosts", &_args336, &_result337); err != nil {
+    return
+  }
+  return _result337.GetSuccess(), nil
+}
+
+// Retrieve the current maintenance states for a group of hosts.
+// 
+// Parameters:
+//  - Hosts
+func (p *AuroraAdminClient) MaintenanceStatus(ctx context.Context, hosts *Hosts) (r *Response, err error) {
+  var _args338 AuroraAdminMaintenanceStatusArgs
+  _args338.Hosts = hosts
+  var _result339 AuroraAdminMaintenanceStatusResult
+  if err = p.Client_().Call(ctx, "maintenanceStatus", &_args338, &_result339); err != nil {
+    return
+  }
+  return _result339.GetSuccess(), nil
+}
+
+// Set the given hosts back into serving mode.
+// 
+// Parameters:
+//  - Hosts
+func (p *AuroraAdminClient) EndMaintenance(ctx context.Context, hosts *Hosts) (r *Response, err error) {
+  var _args340 AuroraAdminEndMaintenanceArgs
+  _args340.Hosts = hosts
+  var _result341 AuroraAdminEndMaintenanceResult
+  if err = p.Client_().Call(ctx, "endMaintenance", &_args340, &_result341); err != nil {
+    return
+  }
+  return _result341.GetSuccess(), nil
+}
+
+// Ask scheduler to put hosts into DRAINING mode and move scheduled tasks off of the hosts
+// such that its SLA requirements are satisfied. Use defaultSlaPolicy if it is not set for a task.
+// 
+// 
+// Parameters:
+//  - Hosts
+//  - DefaultSlaPolicy
+//  - TimeoutSecs
+func (p *AuroraAdminClient) SlaDrainHosts(ctx context.Context, hosts *Hosts, defaultSlaPolicy *SlaPolicy, timeoutSecs int64) (r *Response, err error) {
+  var _args342 AuroraAdminSlaDrainHostsArgs
+  _args342.Hosts = hosts
+  _args342.DefaultSlaPolicy = defaultSlaPolicy
+  _args342.TimeoutSecs = timeoutSecs
+  var _result343 AuroraAdminSlaDrainHostsResult
+  if err = p.Client_().Call(ctx, "slaDrainHosts", &_args342, &_result343); err != nil {
+    return
+  }
+  return _result343.GetSuccess(), nil
+}
+
+// Start a storage snapshot and block until it completes.
+func (p *AuroraAdminClient) Snapshot(ctx context.Context) (r *Response, err error) {
+  var _args344 AuroraAdminSnapshotArgs
+  var _result345 AuroraAdminSnapshotResult
+  if err = p.Client_().Call(ctx, "snapshot", &_args344, &_result345); err != nil {
+    return
+  }
+  return _result345.GetSuccess(), nil
+}
+
+// Tell scheduler to trigger an explicit task reconciliation with the given settings.
+// 
+// Parameters:
+//  - Settings
+func (p *AuroraAdminClient) TriggerExplicitTaskReconciliation(ctx context.Context, settings *ExplicitReconciliationSettings) (r *Response, err error) {
+  var _args346 AuroraAdminTriggerExplicitTaskReconciliationArgs
+  _args346.Settings = settings
+  var _result347 AuroraAdminTriggerExplicitTaskReconciliationResult
+  if err = p.Client_().Call(ctx, "triggerExplicitTaskReconciliation", &_args346, &_result347); err != nil {
+    return
+  }
+  return _result347.GetSuccess(), nil
+}
+
+// Tell scheduler to trigger an implicit task reconciliation.
+func (p *AuroraAdminClient) TriggerImplicitTaskReconciliation(ctx context.Context) (r *Response, err error) {
+  var _args348 AuroraAdminTriggerImplicitTaskReconciliationArgs
+  var _result349 AuroraAdminTriggerImplicitTaskReconciliationResult
+  if err = p.Client_().Call(ctx, "triggerImplicitTaskReconciliation", &_args348, &_result349); err != nil {
+    return
+  }
+  return _result349.GetSuccess(), nil
+}
+
+// Force prune any (terminal) tasks that match the query. If no statuses are supplied with the
+// query, it will default to all terminal task states. If statuses are supplied, they must be
+// terminal states.
+// 
+// Parameters:
+//  - Query
+func (p *AuroraAdminClient) PruneTasks(ctx context.Context, query *TaskQuery) (r *Response, err error) {
+  var _args350 AuroraAdminPruneTasksArgs
+  _args350.Query = query
+  var _result351 AuroraAdminPruneTasksResult
+  if err = p.Client_().Call(ctx, "pruneTasks", &_args350, &_result351); err != nil {
+    return
+  }
+  return _result351.GetSuccess(), nil
+}
+
+type AuroraAdminProcessor struct {
+  *AuroraSchedulerManagerProcessor
+}
+
+func NewAuroraAdminProcessor(handler AuroraAdmin) *AuroraAdminProcessor {
+  self352 := &AuroraAdminProcessor{NewAuroraSchedulerManagerProcessor(handler)}
+  self352.AddToProcessorMap("setQuota", &auroraAdminProcessorSetQuota{handler:handler})
+  self352.AddToProcessorMap("forceTaskState", &auroraAdminProcessorForceTaskState{handler:handler})
+  self352.AddToProcessorMap("performBackup", &auroraAdminProcessorPerformBackup{handler:handler})
+  self352.AddToProcessorMap("listBackups", &auroraAdminProcessorListBackups{handler:handler})
+  self352.AddToProcessorMap("stageRecovery", &auroraAdminProcessorStageRecovery{handler:handler})
+  self352.AddToProcessorMap("queryRecovery", &auroraAdminProcessorQueryRecovery{handler:handler})
+  self352.AddToProcessorMap("deleteRecoveryTasks", &auroraAdminProcessorDeleteRecoveryTasks{handler:handler})
+  self352.AddToProcessorMap("commitRecovery", &auroraAdminProcessorCommitRecovery{handler:handler})
+  self352.AddToProcessorMap("unloadRecovery", &auroraAdminProcessorUnloadRecovery{handler:handler})
+  self352.AddToProcessorMap("startMaintenance", &auroraAdminProcessorStartMaintenance{handler:handler})
+  self352.AddToProcessorMap("drainHosts", &auroraAdminProcessorDrainHosts{handler:handler})
+  self352.AddToProcessorMap("maintenanceStatus", &auroraAdminProcessorMaintenanceStatus{handler:handler})
+  self352.AddToProcessorMap("endMaintenance", &auroraAdminProcessorEndMaintenance{handler:handler})
+  self352.AddToProcessorMap("slaDrainHosts", &auroraAdminProcessorSlaDrainHosts{handler:handler})
+  self352.AddToProcessorMap("snapshot", &auroraAdminProcessorSnapshot{handler:handler})
+  self352.AddToProcessorMap("triggerExplicitTaskReconciliation", &auroraAdminProcessorTriggerExplicitTaskReconciliation{handler:handler})
+  self352.AddToProcessorMap("triggerImplicitTaskReconciliation", &auroraAdminProcessorTriggerImplicitTaskReconciliation{handler:handler})
+  self352.AddToProcessorMap("pruneTasks", &auroraAdminProcessorPruneTasks{handler:handler})
+  return self352
+}
+
+type auroraAdminProcessorSetQuota struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorSetQuota) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminSetQuotaArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("setQuota", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminSetQuotaResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.SetQuota(ctx, args.OwnerRole, args.Quota); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing setQuota: " + err2.Error())
+    oprot.WriteMessageBegin("setQuota", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("setQuota", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorForceTaskState struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorForceTaskState) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminForceTaskStateArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("forceTaskState", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminForceTaskStateResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.ForceTaskState(ctx, args.TaskId, args.Status); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing forceTaskState: " + err2.Error())
+    oprot.WriteMessageBegin("forceTaskState", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("forceTaskState", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorPerformBackup struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorPerformBackup) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminPerformBackupArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("performBackup", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminPerformBackupResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.PerformBackup(ctx); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing performBackup: " + err2.Error())
+    oprot.WriteMessageBegin("performBackup", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("performBackup", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorListBackups struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorListBackups) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminListBackupsArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("listBackups", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminListBackupsResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.ListBackups(ctx); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing listBackups: " + err2.Error())
+    oprot.WriteMessageBegin("listBackups", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("listBackups", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorStageRecovery struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorStageRecovery) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminStageRecoveryArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("stageRecovery", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminStageRecoveryResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.StageRecovery(ctx, args.BackupId); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing stageRecovery: " + err2.Error())
+    oprot.WriteMessageBegin("stageRecovery", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("stageRecovery", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorQueryRecovery struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorQueryRecovery) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminQueryRecoveryArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("queryRecovery", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminQueryRecoveryResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.QueryRecovery(ctx, args.Query); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing queryRecovery: " + err2.Error())
+    oprot.WriteMessageBegin("queryRecovery", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("queryRecovery", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorDeleteRecoveryTasks struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorDeleteRecoveryTasks) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminDeleteRecoveryTasksArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("deleteRecoveryTasks", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminDeleteRecoveryTasksResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.DeleteRecoveryTasks(ctx, args.Query); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing deleteRecoveryTasks: " + err2.Error())
+    oprot.WriteMessageBegin("deleteRecoveryTasks", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("deleteRecoveryTasks", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorCommitRecovery struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorCommitRecovery) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminCommitRecoveryArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("commitRecovery", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminCommitRecoveryResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.CommitRecovery(ctx); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing commitRecovery: " + err2.Error())
+    oprot.WriteMessageBegin("commitRecovery", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("commitRecovery", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorUnloadRecovery struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorUnloadRecovery) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminUnloadRecoveryArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("unloadRecovery", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminUnloadRecoveryResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.UnloadRecovery(ctx); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing unloadRecovery: " + err2.Error())
+    oprot.WriteMessageBegin("unloadRecovery", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("unloadRecovery", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorStartMaintenance struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorStartMaintenance) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminStartMaintenanceArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("startMaintenance", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminStartMaintenanceResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.StartMaintenance(ctx, args.Hosts); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing startMaintenance: " + err2.Error())
+    oprot.WriteMessageBegin("startMaintenance", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("startMaintenance", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorDrainHosts struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorDrainHosts) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminDrainHostsArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("drainHosts", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminDrainHostsResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.DrainHosts(ctx, args.Hosts); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing drainHosts: " + err2.Error())
+    oprot.WriteMessageBegin("drainHosts", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("drainHosts", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorMaintenanceStatus struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorMaintenanceStatus) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminMaintenanceStatusArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("maintenanceStatus", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminMaintenanceStatusResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.MaintenanceStatus(ctx, args.Hosts); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing maintenanceStatus: " + err2.Error())
+    oprot.WriteMessageBegin("maintenanceStatus", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("maintenanceStatus", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorEndMaintenance struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorEndMaintenance) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminEndMaintenanceArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("endMaintenance", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminEndMaintenanceResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.EndMaintenance(ctx, args.Hosts); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing endMaintenance: " + err2.Error())
+    oprot.WriteMessageBegin("endMaintenance", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("endMaintenance", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorSlaDrainHosts struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorSlaDrainHosts) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminSlaDrainHostsArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("slaDrainHosts", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminSlaDrainHostsResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.SlaDrainHosts(ctx, args.Hosts, args.DefaultSlaPolicy, args.TimeoutSecs); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing slaDrainHosts: " + err2.Error())
+    oprot.WriteMessageBegin("slaDrainHosts", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("slaDrainHosts", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorSnapshot struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorSnapshot) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminSnapshotArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("snapshot", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminSnapshotResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.Snapshot(ctx); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing snapshot: " + err2.Error())
+    oprot.WriteMessageBegin("snapshot", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("snapshot", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorTriggerExplicitTaskReconciliation struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorTriggerExplicitTaskReconciliation) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminTriggerExplicitTaskReconciliationArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("triggerExplicitTaskReconciliation", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminTriggerExplicitTaskReconciliationResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.TriggerExplicitTaskReconciliation(ctx, args.Settings); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing triggerExplicitTaskReconciliation: " + err2.Error())
+    oprot.WriteMessageBegin("triggerExplicitTaskReconciliation", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("triggerExplicitTaskReconciliation", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorTriggerImplicitTaskReconciliation struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorTriggerImplicitTaskReconciliation) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminTriggerImplicitTaskReconciliationArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("triggerImplicitTaskReconciliation", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminTriggerImplicitTaskReconciliationResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.TriggerImplicitTaskReconciliation(ctx); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing triggerImplicitTaskReconciliation: " + err2.Error())
+    oprot.WriteMessageBegin("triggerImplicitTaskReconciliation", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("triggerImplicitTaskReconciliation", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+type auroraAdminProcessorPruneTasks struct {
+  handler AuroraAdmin
+}
+
+func (p *auroraAdminProcessorPruneTasks) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
+  args := AuroraAdminPruneTasksArgs{}
+  if err = args.Read(iprot); err != nil {
+    iprot.ReadMessageEnd()
+    x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
+    oprot.WriteMessageBegin("pruneTasks", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return false, err
+  }
+
+  iprot.ReadMessageEnd()
+  result := AuroraAdminPruneTasksResult{}
+var retval *Response
+  var err2 error
+  if retval, err2 = p.handler.PruneTasks(ctx, args.Query); err2 != nil {
+    x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing pruneTasks: " + err2.Error())
+    oprot.WriteMessageBegin("pruneTasks", thrift.EXCEPTION, seqId)
+    x.Write(oprot)
+    oprot.WriteMessageEnd()
+    oprot.Flush(ctx)
+    return true, err2
+  } else {
+    result.Success = retval
+}
+  if err2 = oprot.WriteMessageBegin("pruneTasks", thrift.REPLY, seqId); err2 != nil {
+    err = err2
+  }
+  if err2 = result.Write(oprot); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
+    err = err2
+  }
+  if err2 = oprot.Flush(ctx); err == nil && err2 != nil {
+    err = err2
+  }
+  if err != nil {
+    return
+  }
+  return true, err
+}
+
+
+// HELPER FUNCTIONS AND STRUCTURES
+
+// Attributes:
+//  - OwnerRole
+//  - Quota
+type AuroraAdminSetQuotaArgs struct {
+  OwnerRole string `thrift:"ownerRole,1" db:"ownerRole" json:"ownerRole"`
+  Quota *ResourceAggregate `thrift:"quota,2" db:"quota" json:"quota"`
+}
+
+func NewAuroraAdminSetQuotaArgs() *AuroraAdminSetQuotaArgs {
+  return &AuroraAdminSetQuotaArgs{}
+}
+
+
+func (p *AuroraAdminSetQuotaArgs) GetOwnerRole() string {
+  return p.OwnerRole
+}
+var AuroraAdminSetQuotaArgs_Quota_DEFAULT *ResourceAggregate
+func (p *AuroraAdminSetQuotaArgs) GetQuota() *ResourceAggregate {
+  if !p.IsSetQuota() {
+    return AuroraAdminSetQuotaArgs_Quota_DEFAULT
+  }
+return p.Quota
+}
+func (p *AuroraAdminSetQuotaArgs) IsSetQuota() bool {
+  return p.Quota != nil
+}
+
+func (p *AuroraAdminSetQuotaArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSetQuotaArgs)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.OwnerRole = v
+}
+  return nil
+}
+
+func (p *AuroraAdminSetQuotaArgs)  ReadField2(iprot thrift.TProtocol) error {
+  p.Quota = &ResourceAggregate{}
+  if err := p.Quota.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Quota), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSetQuotaArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("setQuota_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminSetQuotaArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("ownerRole", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:ownerRole: ", p), err) }
+  if err := oprot.WriteString(string(p.OwnerRole)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.ownerRole (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:ownerRole: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminSetQuotaArgs) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("quota", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:quota: ", p), err) }
+  if err := p.Quota.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Quota), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:quota: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminSetQuotaArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminSetQuotaArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminSetQuotaResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminSetQuotaResult() *AuroraAdminSetQuotaResult {
+  return &AuroraAdminSetQuotaResult{}
+}
+
+var AuroraAdminSetQuotaResult_Success_DEFAULT *Response
+func (p *AuroraAdminSetQuotaResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminSetQuotaResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminSetQuotaResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminSetQuotaResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSetQuotaResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSetQuotaResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("setQuota_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminSetQuotaResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminSetQuotaResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminSetQuotaResult(%+v)", *p)
+}
+
+// Attributes:
+//  - TaskId
+//  - Status
+type AuroraAdminForceTaskStateArgs struct {
+  TaskId string `thrift:"taskId,1" db:"taskId" json:"taskId"`
+  Status ScheduleStatus `thrift:"status,2" db:"status" json:"status"`
+}
+
+func NewAuroraAdminForceTaskStateArgs() *AuroraAdminForceTaskStateArgs {
+  return &AuroraAdminForceTaskStateArgs{}
+}
+
+
+func (p *AuroraAdminForceTaskStateArgs) GetTaskId() string {
+  return p.TaskId
+}
+
+func (p *AuroraAdminForceTaskStateArgs) GetStatus() ScheduleStatus {
+  return p.Status
+}
+func (p *AuroraAdminForceTaskStateArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.I32 {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminForceTaskStateArgs)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.TaskId = v
+}
+  return nil
+}
+
+func (p *AuroraAdminForceTaskStateArgs)  ReadField2(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI32(); err != nil {
+  return thrift.PrependError("error reading field 2: ", err)
+} else {
+  temp := ScheduleStatus(v)
+  p.Status = temp
+}
+  return nil
+}
+
+func (p *AuroraAdminForceTaskStateArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("forceTaskState_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminForceTaskStateArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("taskId", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:taskId: ", p), err) }
+  if err := oprot.WriteString(string(p.TaskId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.taskId (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:taskId: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminForceTaskStateArgs) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("status", thrift.I32, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:status: ", p), err) }
+  if err := oprot.WriteI32(int32(p.Status)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.status (2) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:status: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminForceTaskStateArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminForceTaskStateArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminForceTaskStateResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminForceTaskStateResult() *AuroraAdminForceTaskStateResult {
+  return &AuroraAdminForceTaskStateResult{}
+}
+
+var AuroraAdminForceTaskStateResult_Success_DEFAULT *Response
+func (p *AuroraAdminForceTaskStateResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminForceTaskStateResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminForceTaskStateResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminForceTaskStateResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminForceTaskStateResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminForceTaskStateResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("forceTaskState_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminForceTaskStateResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminForceTaskStateResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminForceTaskStateResult(%+v)", *p)
+}
+
+type AuroraAdminPerformBackupArgs struct {
+}
+
+func NewAuroraAdminPerformBackupArgs() *AuroraAdminPerformBackupArgs {
+  return &AuroraAdminPerformBackupArgs{}
+}
+
+func (p *AuroraAdminPerformBackupArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    if err := iprot.Skip(fieldTypeId); err != nil {
+      return err
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminPerformBackupArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("performBackup_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminPerformBackupArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminPerformBackupArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminPerformBackupResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminPerformBackupResult() *AuroraAdminPerformBackupResult {
+  return &AuroraAdminPerformBackupResult{}
+}
+
+var AuroraAdminPerformBackupResult_Success_DEFAULT *Response
+func (p *AuroraAdminPerformBackupResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminPerformBackupResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminPerformBackupResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminPerformBackupResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminPerformBackupResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminPerformBackupResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("performBackup_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminPerformBackupResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminPerformBackupResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminPerformBackupResult(%+v)", *p)
+}
+
+type AuroraAdminListBackupsArgs struct {
+}
+
+func NewAuroraAdminListBackupsArgs() *AuroraAdminListBackupsArgs {
+  return &AuroraAdminListBackupsArgs{}
+}
+
+func (p *AuroraAdminListBackupsArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    if err := iprot.Skip(fieldTypeId); err != nil {
+      return err
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminListBackupsArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("listBackups_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminListBackupsArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminListBackupsArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminListBackupsResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminListBackupsResult() *AuroraAdminListBackupsResult {
+  return &AuroraAdminListBackupsResult{}
+}
+
+var AuroraAdminListBackupsResult_Success_DEFAULT *Response
+func (p *AuroraAdminListBackupsResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminListBackupsResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminListBackupsResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminListBackupsResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminListBackupsResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminListBackupsResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("listBackups_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminListBackupsResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminListBackupsResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminListBackupsResult(%+v)", *p)
+}
+
+// Attributes:
+//  - BackupId
+type AuroraAdminStageRecoveryArgs struct {
+  BackupId string `thrift:"backupId,1" db:"backupId" json:"backupId"`
+}
+
+func NewAuroraAdminStageRecoveryArgs() *AuroraAdminStageRecoveryArgs {
+  return &AuroraAdminStageRecoveryArgs{}
+}
+
+
+func (p *AuroraAdminStageRecoveryArgs) GetBackupId() string {
+  return p.BackupId
+}
+func (p *AuroraAdminStageRecoveryArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRING {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminStageRecoveryArgs)  ReadField1(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadString(); err != nil {
+  return thrift.PrependError("error reading field 1: ", err)
+} else {
+  p.BackupId = v
+}
+  return nil
+}
+
+func (p *AuroraAdminStageRecoveryArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("stageRecovery_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminStageRecoveryArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("backupId", thrift.STRING, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:backupId: ", p), err) }
+  if err := oprot.WriteString(string(p.BackupId)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.backupId (1) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:backupId: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminStageRecoveryArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminStageRecoveryArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminStageRecoveryResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminStageRecoveryResult() *AuroraAdminStageRecoveryResult {
+  return &AuroraAdminStageRecoveryResult{}
+}
+
+var AuroraAdminStageRecoveryResult_Success_DEFAULT *Response
+func (p *AuroraAdminStageRecoveryResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminStageRecoveryResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminStageRecoveryResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminStageRecoveryResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminStageRecoveryResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminStageRecoveryResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("stageRecovery_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminStageRecoveryResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminStageRecoveryResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminStageRecoveryResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Query
+type AuroraAdminQueryRecoveryArgs struct {
+  Query *TaskQuery `thrift:"query,1" db:"query" json:"query"`
+}
+
+func NewAuroraAdminQueryRecoveryArgs() *AuroraAdminQueryRecoveryArgs {
+  return &AuroraAdminQueryRecoveryArgs{}
+}
+
+var AuroraAdminQueryRecoveryArgs_Query_DEFAULT *TaskQuery
+func (p *AuroraAdminQueryRecoveryArgs) GetQuery() *TaskQuery {
+  if !p.IsSetQuery() {
+    return AuroraAdminQueryRecoveryArgs_Query_DEFAULT
+  }
+return p.Query
+}
+func (p *AuroraAdminQueryRecoveryArgs) IsSetQuery() bool {
+  return p.Query != nil
+}
+
+func (p *AuroraAdminQueryRecoveryArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminQueryRecoveryArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Query = &TaskQuery{}
+  if err := p.Query.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminQueryRecoveryArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("queryRecovery_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminQueryRecoveryArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err) }
+  if err := p.Query.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminQueryRecoveryArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminQueryRecoveryArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminQueryRecoveryResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminQueryRecoveryResult() *AuroraAdminQueryRecoveryResult {
+  return &AuroraAdminQueryRecoveryResult{}
+}
+
+var AuroraAdminQueryRecoveryResult_Success_DEFAULT *Response
+func (p *AuroraAdminQueryRecoveryResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminQueryRecoveryResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminQueryRecoveryResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminQueryRecoveryResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminQueryRecoveryResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminQueryRecoveryResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("queryRecovery_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminQueryRecoveryResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminQueryRecoveryResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminQueryRecoveryResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Query
+type AuroraAdminDeleteRecoveryTasksArgs struct {
+  Query *TaskQuery `thrift:"query,1" db:"query" json:"query"`
+}
+
+func NewAuroraAdminDeleteRecoveryTasksArgs() *AuroraAdminDeleteRecoveryTasksArgs {
+  return &AuroraAdminDeleteRecoveryTasksArgs{}
+}
+
+var AuroraAdminDeleteRecoveryTasksArgs_Query_DEFAULT *TaskQuery
+func (p *AuroraAdminDeleteRecoveryTasksArgs) GetQuery() *TaskQuery {
+  if !p.IsSetQuery() {
+    return AuroraAdminDeleteRecoveryTasksArgs_Query_DEFAULT
+  }
+return p.Query
+}
+func (p *AuroraAdminDeleteRecoveryTasksArgs) IsSetQuery() bool {
+  return p.Query != nil
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Query = &TaskQuery{}
+  if err := p.Query.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("deleteRecoveryTasks_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err) }
+  if err := p.Query.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminDeleteRecoveryTasksArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminDeleteRecoveryTasksResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminDeleteRecoveryTasksResult() *AuroraAdminDeleteRecoveryTasksResult {
+  return &AuroraAdminDeleteRecoveryTasksResult{}
+}
+
+var AuroraAdminDeleteRecoveryTasksResult_Success_DEFAULT *Response
+func (p *AuroraAdminDeleteRecoveryTasksResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminDeleteRecoveryTasksResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminDeleteRecoveryTasksResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("deleteRecoveryTasks_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminDeleteRecoveryTasksResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminDeleteRecoveryTasksResult(%+v)", *p)
+}
+
+type AuroraAdminCommitRecoveryArgs struct {
+}
+
+func NewAuroraAdminCommitRecoveryArgs() *AuroraAdminCommitRecoveryArgs {
+  return &AuroraAdminCommitRecoveryArgs{}
+}
+
+func (p *AuroraAdminCommitRecoveryArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    if err := iprot.Skip(fieldTypeId); err != nil {
+      return err
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminCommitRecoveryArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("commitRecovery_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminCommitRecoveryArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminCommitRecoveryArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminCommitRecoveryResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminCommitRecoveryResult() *AuroraAdminCommitRecoveryResult {
+  return &AuroraAdminCommitRecoveryResult{}
+}
+
+var AuroraAdminCommitRecoveryResult_Success_DEFAULT *Response
+func (p *AuroraAdminCommitRecoveryResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminCommitRecoveryResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminCommitRecoveryResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminCommitRecoveryResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminCommitRecoveryResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminCommitRecoveryResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("commitRecovery_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminCommitRecoveryResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminCommitRecoveryResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminCommitRecoveryResult(%+v)", *p)
+}
+
+type AuroraAdminUnloadRecoveryArgs struct {
+}
+
+func NewAuroraAdminUnloadRecoveryArgs() *AuroraAdminUnloadRecoveryArgs {
+  return &AuroraAdminUnloadRecoveryArgs{}
+}
+
+func (p *AuroraAdminUnloadRecoveryArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    if err := iprot.Skip(fieldTypeId); err != nil {
+      return err
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminUnloadRecoveryArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("unloadRecovery_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminUnloadRecoveryArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminUnloadRecoveryArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminUnloadRecoveryResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminUnloadRecoveryResult() *AuroraAdminUnloadRecoveryResult {
+  return &AuroraAdminUnloadRecoveryResult{}
+}
+
+var AuroraAdminUnloadRecoveryResult_Success_DEFAULT *Response
+func (p *AuroraAdminUnloadRecoveryResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminUnloadRecoveryResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminUnloadRecoveryResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminUnloadRecoveryResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminUnloadRecoveryResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminUnloadRecoveryResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("unloadRecovery_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminUnloadRecoveryResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminUnloadRecoveryResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminUnloadRecoveryResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Hosts
+type AuroraAdminStartMaintenanceArgs struct {
+  Hosts *Hosts `thrift:"hosts,1" db:"hosts" json:"hosts"`
+}
+
+func NewAuroraAdminStartMaintenanceArgs() *AuroraAdminStartMaintenanceArgs {
+  return &AuroraAdminStartMaintenanceArgs{}
+}
+
+var AuroraAdminStartMaintenanceArgs_Hosts_DEFAULT *Hosts
+func (p *AuroraAdminStartMaintenanceArgs) GetHosts() *Hosts {
+  if !p.IsSetHosts() {
+    return AuroraAdminStartMaintenanceArgs_Hosts_DEFAULT
+  }
+return p.Hosts
+}
+func (p *AuroraAdminStartMaintenanceArgs) IsSetHosts() bool {
+  return p.Hosts != nil
+}
+
+func (p *AuroraAdminStartMaintenanceArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminStartMaintenanceArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Hosts = &Hosts{}
+  if err := p.Hosts.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminStartMaintenanceArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("startMaintenance_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminStartMaintenanceArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err) }
+  if err := p.Hosts.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminStartMaintenanceArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminStartMaintenanceArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminStartMaintenanceResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminStartMaintenanceResult() *AuroraAdminStartMaintenanceResult {
+  return &AuroraAdminStartMaintenanceResult{}
+}
+
+var AuroraAdminStartMaintenanceResult_Success_DEFAULT *Response
+func (p *AuroraAdminStartMaintenanceResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminStartMaintenanceResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminStartMaintenanceResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminStartMaintenanceResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminStartMaintenanceResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminStartMaintenanceResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("startMaintenance_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminStartMaintenanceResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminStartMaintenanceResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminStartMaintenanceResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Hosts
+type AuroraAdminDrainHostsArgs struct {
+  Hosts *Hosts `thrift:"hosts,1" db:"hosts" json:"hosts"`
+}
+
+func NewAuroraAdminDrainHostsArgs() *AuroraAdminDrainHostsArgs {
+  return &AuroraAdminDrainHostsArgs{}
+}
+
+var AuroraAdminDrainHostsArgs_Hosts_DEFAULT *Hosts
+func (p *AuroraAdminDrainHostsArgs) GetHosts() *Hosts {
+  if !p.IsSetHosts() {
+    return AuroraAdminDrainHostsArgs_Hosts_DEFAULT
+  }
+return p.Hosts
+}
+func (p *AuroraAdminDrainHostsArgs) IsSetHosts() bool {
+  return p.Hosts != nil
+}
+
+func (p *AuroraAdminDrainHostsArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminDrainHostsArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Hosts = &Hosts{}
+  if err := p.Hosts.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminDrainHostsArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("drainHosts_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminDrainHostsArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err) }
+  if err := p.Hosts.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminDrainHostsArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminDrainHostsArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminDrainHostsResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminDrainHostsResult() *AuroraAdminDrainHostsResult {
+  return &AuroraAdminDrainHostsResult{}
+}
+
+var AuroraAdminDrainHostsResult_Success_DEFAULT *Response
+func (p *AuroraAdminDrainHostsResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminDrainHostsResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminDrainHostsResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminDrainHostsResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminDrainHostsResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminDrainHostsResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("drainHosts_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminDrainHostsResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminDrainHostsResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminDrainHostsResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Hosts
+type AuroraAdminMaintenanceStatusArgs struct {
+  Hosts *Hosts `thrift:"hosts,1" db:"hosts" json:"hosts"`
+}
+
+func NewAuroraAdminMaintenanceStatusArgs() *AuroraAdminMaintenanceStatusArgs {
+  return &AuroraAdminMaintenanceStatusArgs{}
+}
+
+var AuroraAdminMaintenanceStatusArgs_Hosts_DEFAULT *Hosts
+func (p *AuroraAdminMaintenanceStatusArgs) GetHosts() *Hosts {
+  if !p.IsSetHosts() {
+    return AuroraAdminMaintenanceStatusArgs_Hosts_DEFAULT
+  }
+return p.Hosts
+}
+func (p *AuroraAdminMaintenanceStatusArgs) IsSetHosts() bool {
+  return p.Hosts != nil
+}
+
+func (p *AuroraAdminMaintenanceStatusArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminMaintenanceStatusArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Hosts = &Hosts{}
+  if err := p.Hosts.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminMaintenanceStatusArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("maintenanceStatus_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminMaintenanceStatusArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err) }
+  if err := p.Hosts.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminMaintenanceStatusArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminMaintenanceStatusArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminMaintenanceStatusResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminMaintenanceStatusResult() *AuroraAdminMaintenanceStatusResult {
+  return &AuroraAdminMaintenanceStatusResult{}
+}
+
+var AuroraAdminMaintenanceStatusResult_Success_DEFAULT *Response
+func (p *AuroraAdminMaintenanceStatusResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminMaintenanceStatusResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminMaintenanceStatusResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminMaintenanceStatusResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminMaintenanceStatusResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminMaintenanceStatusResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("maintenanceStatus_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminMaintenanceStatusResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminMaintenanceStatusResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminMaintenanceStatusResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Hosts
+type AuroraAdminEndMaintenanceArgs struct {
+  Hosts *Hosts `thrift:"hosts,1" db:"hosts" json:"hosts"`
+}
+
+func NewAuroraAdminEndMaintenanceArgs() *AuroraAdminEndMaintenanceArgs {
+  return &AuroraAdminEndMaintenanceArgs{}
+}
+
+var AuroraAdminEndMaintenanceArgs_Hosts_DEFAULT *Hosts
+func (p *AuroraAdminEndMaintenanceArgs) GetHosts() *Hosts {
+  if !p.IsSetHosts() {
+    return AuroraAdminEndMaintenanceArgs_Hosts_DEFAULT
+  }
+return p.Hosts
+}
+func (p *AuroraAdminEndMaintenanceArgs) IsSetHosts() bool {
+  return p.Hosts != nil
+}
+
+func (p *AuroraAdminEndMaintenanceArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminEndMaintenanceArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Hosts = &Hosts{}
+  if err := p.Hosts.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminEndMaintenanceArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("endMaintenance_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminEndMaintenanceArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err) }
+  if err := p.Hosts.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminEndMaintenanceArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminEndMaintenanceArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminEndMaintenanceResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminEndMaintenanceResult() *AuroraAdminEndMaintenanceResult {
+  return &AuroraAdminEndMaintenanceResult{}
+}
+
+var AuroraAdminEndMaintenanceResult_Success_DEFAULT *Response
+func (p *AuroraAdminEndMaintenanceResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminEndMaintenanceResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminEndMaintenanceResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminEndMaintenanceResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminEndMaintenanceResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminEndMaintenanceResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("endMaintenance_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminEndMaintenanceResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminEndMaintenanceResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminEndMaintenanceResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Hosts
+//  - DefaultSlaPolicy
+//  - TimeoutSecs
+type AuroraAdminSlaDrainHostsArgs struct {
+  Hosts *Hosts `thrift:"hosts,1" db:"hosts" json:"hosts"`
+  DefaultSlaPolicy *SlaPolicy `thrift:"defaultSlaPolicy,2" db:"defaultSlaPolicy" json:"defaultSlaPolicy"`
+  TimeoutSecs int64 `thrift:"timeoutSecs,3" db:"timeoutSecs" json:"timeoutSecs"`
+}
+
+func NewAuroraAdminSlaDrainHostsArgs() *AuroraAdminSlaDrainHostsArgs {
+  return &AuroraAdminSlaDrainHostsArgs{}
+}
+
+var AuroraAdminSlaDrainHostsArgs_Hosts_DEFAULT *Hosts
+func (p *AuroraAdminSlaDrainHostsArgs) GetHosts() *Hosts {
+  if !p.IsSetHosts() {
+    return AuroraAdminSlaDrainHostsArgs_Hosts_DEFAULT
+  }
+return p.Hosts
+}
+var AuroraAdminSlaDrainHostsArgs_DefaultSlaPolicy_DEFAULT *SlaPolicy
+func (p *AuroraAdminSlaDrainHostsArgs) GetDefaultSlaPolicy() *SlaPolicy {
+  if !p.IsSetDefaultSlaPolicy() {
+    return AuroraAdminSlaDrainHostsArgs_DefaultSlaPolicy_DEFAULT
+  }
+return p.DefaultSlaPolicy
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs) GetTimeoutSecs() int64 {
+  return p.TimeoutSecs
+}
+func (p *AuroraAdminSlaDrainHostsArgs) IsSetHosts() bool {
+  return p.Hosts != nil
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs) IsSetDefaultSlaPolicy() bool {
+  return p.DefaultSlaPolicy != nil
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 2:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField2(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    case 3:
+      if fieldTypeId == thrift.I64 {
+        if err := p.ReadField3(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Hosts = &Hosts{}
+  if err := p.Hosts.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs)  ReadField2(iprot thrift.TProtocol) error {
+  p.DefaultSlaPolicy = &SlaPolicy{}
+  if err := p.DefaultSlaPolicy.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DefaultSlaPolicy), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs)  ReadField3(iprot thrift.TProtocol) error {
+  if v, err := iprot.ReadI64(); err != nil {
+  return thrift.PrependError("error reading field 3: ", err)
+} else {
+  p.TimeoutSecs = v
+}
+  return nil
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("slaDrainHosts_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+    if err := p.writeField2(oprot); err != nil { return err }
+    if err := p.writeField3(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err) }
+  if err := p.Hosts.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs) writeField2(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("defaultSlaPolicy", thrift.STRUCT, 2); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:defaultSlaPolicy: ", p), err) }
+  if err := p.DefaultSlaPolicy.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DefaultSlaPolicy), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:defaultSlaPolicy: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs) writeField3(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("timeoutSecs", thrift.I64, 3); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:timeoutSecs: ", p), err) }
+  if err := oprot.WriteI64(int64(p.TimeoutSecs)); err != nil {
+  return thrift.PrependError(fmt.Sprintf("%T.timeoutSecs (3) field write error: ", p), err) }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:timeoutSecs: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminSlaDrainHostsArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminSlaDrainHostsArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminSlaDrainHostsResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminSlaDrainHostsResult() *AuroraAdminSlaDrainHostsResult {
+  return &AuroraAdminSlaDrainHostsResult{}
+}
+
+var AuroraAdminSlaDrainHostsResult_Success_DEFAULT *Response
+func (p *AuroraAdminSlaDrainHostsResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminSlaDrainHostsResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminSlaDrainHostsResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminSlaDrainHostsResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSlaDrainHostsResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSlaDrainHostsResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("slaDrainHosts_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminSlaDrainHostsResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminSlaDrainHostsResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminSlaDrainHostsResult(%+v)", *p)
+}
+
+type AuroraAdminSnapshotArgs struct {
+}
+
+func NewAuroraAdminSnapshotArgs() *AuroraAdminSnapshotArgs {
+  return &AuroraAdminSnapshotArgs{}
+}
+
+func (p *AuroraAdminSnapshotArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    if err := iprot.Skip(fieldTypeId); err != nil {
+      return err
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSnapshotArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("snapshot_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminSnapshotArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminSnapshotArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminSnapshotResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminSnapshotResult() *AuroraAdminSnapshotResult {
+  return &AuroraAdminSnapshotResult{}
+}
+
+var AuroraAdminSnapshotResult_Success_DEFAULT *Response
+func (p *AuroraAdminSnapshotResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminSnapshotResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminSnapshotResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminSnapshotResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSnapshotResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminSnapshotResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("snapshot_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminSnapshotResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminSnapshotResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminSnapshotResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Settings
+type AuroraAdminTriggerExplicitTaskReconciliationArgs struct {
+  Settings *ExplicitReconciliationSettings `thrift:"settings,1" db:"settings" json:"settings"`
+}
+
+func NewAuroraAdminTriggerExplicitTaskReconciliationArgs() *AuroraAdminTriggerExplicitTaskReconciliationArgs {
+  return &AuroraAdminTriggerExplicitTaskReconciliationArgs{}
+}
+
+var AuroraAdminTriggerExplicitTaskReconciliationArgs_Settings_DEFAULT *ExplicitReconciliationSettings
+func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) GetSettings() *ExplicitReconciliationSettings {
+  if !p.IsSetSettings() {
+    return AuroraAdminTriggerExplicitTaskReconciliationArgs_Settings_DEFAULT
+  }
+return p.Settings
+}
+func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) IsSetSettings() bool {
+  return p.Settings != nil
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Settings = &ExplicitReconciliationSettings{}
+  if err := p.Settings.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Settings), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("triggerExplicitTaskReconciliation_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("settings", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:settings: ", p), err) }
+  if err := p.Settings.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Settings), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:settings: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminTriggerExplicitTaskReconciliationArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminTriggerExplicitTaskReconciliationResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminTriggerExplicitTaskReconciliationResult() *AuroraAdminTriggerExplicitTaskReconciliationResult {
+  return &AuroraAdminTriggerExplicitTaskReconciliationResult{}
+}
+
+var AuroraAdminTriggerExplicitTaskReconciliationResult_Success_DEFAULT *Response
+func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminTriggerExplicitTaskReconciliationResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("triggerExplicitTaskReconciliation_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminTriggerExplicitTaskReconciliationResult(%+v)", *p)
+}
+
+type AuroraAdminTriggerImplicitTaskReconciliationArgs struct {
+}
+
+func NewAuroraAdminTriggerImplicitTaskReconciliationArgs() *AuroraAdminTriggerImplicitTaskReconciliationArgs {
+  return &AuroraAdminTriggerImplicitTaskReconciliationArgs{}
+}
+
+func (p *AuroraAdminTriggerImplicitTaskReconciliationArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    if err := iprot.Skip(fieldTypeId); err != nil {
+      return err
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminTriggerImplicitTaskReconciliationArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("triggerImplicitTaskReconciliation_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminTriggerImplicitTaskReconciliationArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminTriggerImplicitTaskReconciliationArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminTriggerImplicitTaskReconciliationResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminTriggerImplicitTaskReconciliationResult() *AuroraAdminTriggerImplicitTaskReconciliationResult {
+  return &AuroraAdminTriggerImplicitTaskReconciliationResult{}
+}
+
+var AuroraAdminTriggerImplicitTaskReconciliationResult_Success_DEFAULT *Response
+func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminTriggerImplicitTaskReconciliationResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminTriggerImplicitTaskReconciliationResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("triggerImplicitTaskReconciliation_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminTriggerImplicitTaskReconciliationResult(%+v)", *p)
+}
+
+// Attributes:
+//  - Query
+type AuroraAdminPruneTasksArgs struct {
+  Query *TaskQuery `thrift:"query,1" db:"query" json:"query"`
+}
+
+func NewAuroraAdminPruneTasksArgs() *AuroraAdminPruneTasksArgs {
+  return &AuroraAdminPruneTasksArgs{}
+}
+
+var AuroraAdminPruneTasksArgs_Query_DEFAULT *TaskQuery
+func (p *AuroraAdminPruneTasksArgs) GetQuery() *TaskQuery {
+  if !p.IsSetQuery() {
+    return AuroraAdminPruneTasksArgs_Query_DEFAULT
+  }
+return p.Query
+}
+func (p *AuroraAdminPruneTasksArgs) IsSetQuery() bool {
+  return p.Query != nil
+}
+
+func (p *AuroraAdminPruneTasksArgs) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 1:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField1(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminPruneTasksArgs)  ReadField1(iprot thrift.TProtocol) error {
+  p.Query = &TaskQuery{}
+  if err := p.Query.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminPruneTasksArgs) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("pruneTasks_args"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField1(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminPruneTasksArgs) writeField1(oprot thrift.TProtocol) (err error) {
+  if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err) }
+  if err := p.Query.Write(oprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
+  }
+  if err := oprot.WriteFieldEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err) }
+  return err
+}
+
+func (p *AuroraAdminPruneTasksArgs) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminPruneTasksArgs(%+v)", *p)
+}
+
+// Attributes:
+//  - Success
+type AuroraAdminPruneTasksResult struct {
+  Success *Response `thrift:"success,0" db:"success" json:"success,omitempty"`
+}
+
+func NewAuroraAdminPruneTasksResult() *AuroraAdminPruneTasksResult {
+  return &AuroraAdminPruneTasksResult{}
+}
+
+var AuroraAdminPruneTasksResult_Success_DEFAULT *Response
+func (p *AuroraAdminPruneTasksResult) GetSuccess() *Response {
+  if !p.IsSetSuccess() {
+    return AuroraAdminPruneTasksResult_Success_DEFAULT
+  }
+return p.Success
+}
+func (p *AuroraAdminPruneTasksResult) IsSetSuccess() bool {
+  return p.Success != nil
+}
+
+func (p *AuroraAdminPruneTasksResult) Read(iprot thrift.TProtocol) error {
+  if _, err := iprot.ReadStructBegin(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+  }
+
+
+  for {
+    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+    if err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+    }
+    if fieldTypeId == thrift.STOP { break; }
+    switch fieldId {
+    case 0:
+      if fieldTypeId == thrift.STRUCT {
+        if err := p.ReadField0(iprot); err != nil {
+          return err
+        }
+      } else {
+        if err := iprot.Skip(fieldTypeId); err != nil {
+          return err
+        }
+      }
+    default:
+      if err := iprot.Skip(fieldTypeId); err != nil {
+        return err
+      }
+    }
+    if err := iprot.ReadFieldEnd(); err != nil {
+      return err
+    }
+  }
+  if err := iprot.ReadStructEnd(); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminPruneTasksResult)  ReadField0(iprot thrift.TProtocol) error {
+  p.Success = &Response{}
+  if err := p.Success.Read(iprot); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
+  }
+  return nil
+}
+
+func (p *AuroraAdminPruneTasksResult) Write(oprot thrift.TProtocol) error {
+  if err := oprot.WriteStructBegin("pruneTasks_result"); err != nil {
+    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
+  if p != nil {
+    if err := p.writeField0(oprot); err != nil { return err }
+  }
+  if err := oprot.WriteFieldStop(); err != nil {
+    return thrift.PrependError("write field stop error: ", err) }
+  if err := oprot.WriteStructEnd(); err != nil {
+    return thrift.PrependError("write struct stop error: ", err) }
+  return nil
+}
+
+func (p *AuroraAdminPruneTasksResult) writeField0(oprot thrift.TProtocol) (err error) {
+  if p.IsSetSuccess() {
+    if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) }
+    if err := p.Success.Write(oprot); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
+    }
+    if err := oprot.WriteFieldEnd(); err != nil {
+      return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) }
+  }
+  return err
+}
+
+func (p *AuroraAdminPruneTasksResult) String() string {
+  if p == nil {
+    return "<nil>"
+  }
+  return fmt.Sprintf("AuroraAdminPruneTasksResult(%+v)", *p)
+}
+
+
diff --git a/gen-go/apache/aurora/aurora_admin-remote/aurora_admin-remote.go b/gen-go/apache/aurora/aurora_admin-remote/aurora_admin-remote.go
index d6f7bfd..b600061 100755
--- a/gen-go/apache/aurora/aurora_admin-remote/aurora_admin-remote.go
+++ b/gen-go/apache/aurora/aurora_admin-remote/aurora_admin-remote.go
@@ -1,1169 +1,1198 @@
-// Autogenerated by Thrift Compiler (0.9.3)
+// Autogenerated by Thrift Compiler (0.12.0)
 // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 
 package main
 
 import (
-	"apache/aurora"
-	"flag"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-	"math"
-	"net"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
+        "context"
+        "flag"
+        "fmt"
+        "math"
+        "net"
+        "net/url"
+        "os"
+        "strconv"
+        "strings"
+        "github.com/apache/thrift/lib/go/thrift"
+        "apache/aurora"
 )
 
+
 func Usage() {
-	fmt.Fprintln(os.Stderr, "Usage of ", os.Args[0], " [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]:")
-	flag.PrintDefaults()
-	fmt.Fprintln(os.Stderr, "\nFunctions:")
-	fmt.Fprintln(os.Stderr, "  Response setQuota(string ownerRole, ResourceAggregate quota)")
-	fmt.Fprintln(os.Stderr, "  Response forceTaskState(string taskId, ScheduleStatus status)")
-	fmt.Fprintln(os.Stderr, "  Response performBackup()")
-	fmt.Fprintln(os.Stderr, "  Response listBackups()")
-	fmt.Fprintln(os.Stderr, "  Response stageRecovery(string backupId)")
-	fmt.Fprintln(os.Stderr, "  Response queryRecovery(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response deleteRecoveryTasks(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response commitRecovery()")
-	fmt.Fprintln(os.Stderr, "  Response unloadRecovery()")
-	fmt.Fprintln(os.Stderr, "  Response startMaintenance(Hosts hosts)")
-	fmt.Fprintln(os.Stderr, "  Response drainHosts(Hosts hosts)")
-	fmt.Fprintln(os.Stderr, "  Response maintenanceStatus(Hosts hosts)")
-	fmt.Fprintln(os.Stderr, "  Response endMaintenance(Hosts hosts)")
-	fmt.Fprintln(os.Stderr, "  Response slaDrainHosts(Hosts hosts, SlaPolicy defaultSlaPolicy, i64 timeoutSecs)")
-	fmt.Fprintln(os.Stderr, "  Response snapshot()")
-	fmt.Fprintln(os.Stderr, "  Response triggerExplicitTaskReconciliation(ExplicitReconciliationSettings settings)")
-	fmt.Fprintln(os.Stderr, "  Response triggerImplicitTaskReconciliation()")
-	fmt.Fprintln(os.Stderr, "  Response pruneTasks(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response createJob(JobConfiguration description)")
-	fmt.Fprintln(os.Stderr, "  Response scheduleCronJob(JobConfiguration description)")
-	fmt.Fprintln(os.Stderr, "  Response descheduleCronJob(JobKey job)")
-	fmt.Fprintln(os.Stderr, "  Response startCronJob(JobKey job)")
-	fmt.Fprintln(os.Stderr, "  Response restartShards(JobKey job,  shardIds)")
-	fmt.Fprintln(os.Stderr, "  Response killTasks(JobKey job,  instances, string message)")
-	fmt.Fprintln(os.Stderr, "  Response addInstances(InstanceKey key, i32 count)")
-	fmt.Fprintln(os.Stderr, "  Response replaceCronTemplate(JobConfiguration config)")
-	fmt.Fprintln(os.Stderr, "  Response startJobUpdate(JobUpdateRequest request, string message)")
-	fmt.Fprintln(os.Stderr, "  Response pauseJobUpdate(JobUpdateKey key, string message)")
-	fmt.Fprintln(os.Stderr, "  Response resumeJobUpdate(JobUpdateKey key, string message)")
-	fmt.Fprintln(os.Stderr, "  Response abortJobUpdate(JobUpdateKey key, string message)")
-	fmt.Fprintln(os.Stderr, "  Response rollbackJobUpdate(JobUpdateKey key, string message)")
-	fmt.Fprintln(os.Stderr, "  Response pulseJobUpdate(JobUpdateKey key)")
-	fmt.Fprintln(os.Stderr, "  Response getRoleSummary()")
-	fmt.Fprintln(os.Stderr, "  Response getJobSummary(string role)")
-	fmt.Fprintln(os.Stderr, "  Response getTasksStatus(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getTasksWithoutConfigs(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getPendingReason(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getConfigSummary(JobKey job)")
-	fmt.Fprintln(os.Stderr, "  Response getJobs(string ownerRole)")
-	fmt.Fprintln(os.Stderr, "  Response getQuota(string ownerRole)")
-	fmt.Fprintln(os.Stderr, "  Response populateJobConfig(JobConfiguration description)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateSummaries(JobUpdateQuery jobUpdateQuery)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateDetails(JobUpdateQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateDiff(JobUpdateRequest request)")
-	fmt.Fprintln(os.Stderr, "  Response getTierConfigs()")
-	fmt.Fprintln(os.Stderr)
-	os.Exit(0)
+  fmt.Fprintln(os.Stderr, "Usage of ", os.Args[0], " [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]:")
+  flag.PrintDefaults()
+  fmt.Fprintln(os.Stderr, "\nFunctions:")
+  fmt.Fprintln(os.Stderr, "  Response setQuota(string ownerRole, ResourceAggregate quota)")
+  fmt.Fprintln(os.Stderr, "  Response forceTaskState(string taskId, ScheduleStatus status)")
+  fmt.Fprintln(os.Stderr, "  Response performBackup()")
+  fmt.Fprintln(os.Stderr, "  Response listBackups()")
+  fmt.Fprintln(os.Stderr, "  Response stageRecovery(string backupId)")
+  fmt.Fprintln(os.Stderr, "  Response queryRecovery(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response deleteRecoveryTasks(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response commitRecovery()")
+  fmt.Fprintln(os.Stderr, "  Response unloadRecovery()")
+  fmt.Fprintln(os.Stderr, "  Response startMaintenance(Hosts hosts)")
+  fmt.Fprintln(os.Stderr, "  Response drainHosts(Hosts hosts)")
+  fmt.Fprintln(os.Stderr, "  Response maintenanceStatus(Hosts hosts)")
+  fmt.Fprintln(os.Stderr, "  Response endMaintenance(Hosts hosts)")
+  fmt.Fprintln(os.Stderr, "  Response slaDrainHosts(Hosts hosts, SlaPolicy defaultSlaPolicy, i64 timeoutSecs)")
+  fmt.Fprintln(os.Stderr, "  Response snapshot()")
+  fmt.Fprintln(os.Stderr, "  Response triggerExplicitTaskReconciliation(ExplicitReconciliationSettings settings)")
+  fmt.Fprintln(os.Stderr, "  Response triggerImplicitTaskReconciliation()")
+  fmt.Fprintln(os.Stderr, "  Response pruneTasks(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response createJob(JobConfiguration description)")
+  fmt.Fprintln(os.Stderr, "  Response scheduleCronJob(JobConfiguration description)")
+  fmt.Fprintln(os.Stderr, "  Response descheduleCronJob(JobKey job)")
+  fmt.Fprintln(os.Stderr, "  Response startCronJob(JobKey job)")
+  fmt.Fprintln(os.Stderr, "  Response restartShards(JobKey job,  shardIds)")
+  fmt.Fprintln(os.Stderr, "  Response killTasks(JobKey job,  instances, string message)")
+  fmt.Fprintln(os.Stderr, "  Response addInstances(InstanceKey key, i32 count)")
+  fmt.Fprintln(os.Stderr, "  Response replaceCronTemplate(JobConfiguration config)")
+  fmt.Fprintln(os.Stderr, "  Response startJobUpdate(JobUpdateRequest request, string message)")
+  fmt.Fprintln(os.Stderr, "  Response pauseJobUpdate(JobUpdateKey key, string message)")
+  fmt.Fprintln(os.Stderr, "  Response resumeJobUpdate(JobUpdateKey key, string message)")
+  fmt.Fprintln(os.Stderr, "  Response abortJobUpdate(JobUpdateKey key, string message)")
+  fmt.Fprintln(os.Stderr, "  Response rollbackJobUpdate(JobUpdateKey key, string message)")
+  fmt.Fprintln(os.Stderr, "  Response pulseJobUpdate(JobUpdateKey key)")
+  fmt.Fprintln(os.Stderr, "  Response getRoleSummary()")
+  fmt.Fprintln(os.Stderr, "  Response getJobSummary(string role)")
+  fmt.Fprintln(os.Stderr, "  Response getTasksStatus(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getTasksWithoutConfigs(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getPendingReason(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getConfigSummary(JobKey job)")
+  fmt.Fprintln(os.Stderr, "  Response getJobs(string ownerRole)")
+  fmt.Fprintln(os.Stderr, "  Response getQuota(string ownerRole)")
+  fmt.Fprintln(os.Stderr, "  Response populateJobConfig(JobConfiguration description)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateSummaries(JobUpdateQuery jobUpdateQuery)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateDetails(JobUpdateQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateDiff(JobUpdateRequest request)")
+  fmt.Fprintln(os.Stderr, "  Response getTierConfigs()")
+  fmt.Fprintln(os.Stderr)
+  os.Exit(0)
+}
+
+type httpHeaders map[string]string
+
+func (h httpHeaders) String() string {
+  var m map[string]string = h
+  return fmt.Sprintf("%s", m)
+}
+
+func (h httpHeaders) Set(value string) error {
+  parts := strings.Split(value, ": ")
+  if len(parts) != 2 {
+    return fmt.Errorf("header should be of format 'Key: Value'")
+  }
+  h[parts[0]] = parts[1]
+  return nil
 }
 
 func main() {
-	flag.Usage = Usage
-	var host string
-	var port int
-	var protocol string
-	var urlString string
-	var framed bool
-	var useHttp bool
-	var parsedUrl url.URL
-	var trans thrift.TTransport
-	_ = strconv.Atoi
-	_ = math.Abs
-	flag.Usage = Usage
-	flag.StringVar(&host, "h", "localhost", "Specify host and port")
-	flag.IntVar(&port, "p", 9090, "Specify port")
-	flag.StringVar(&protocol, "P", "binary", "Specify the protocol (binary, compact, simplejson, json)")
-	flag.StringVar(&urlString, "u", "", "Specify the url")
-	flag.BoolVar(&framed, "framed", false, "Use framed transport")
-	flag.BoolVar(&useHttp, "http", false, "Use http")
-	flag.Parse()
-
-	if len(urlString) > 0 {
-		parsedUrl, err := url.Parse(urlString)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
-			flag.Usage()
-		}
-		host = parsedUrl.Host
-		useHttp = len(parsedUrl.Scheme) <= 0 || parsedUrl.Scheme == "http"
-	} else if useHttp {
-		_, err := url.Parse(fmt.Sprint("http://", host, ":", port))
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
-			flag.Usage()
-		}
-	}
-
-	cmd := flag.Arg(0)
-	var err error
-	if useHttp {
-		trans, err = thrift.NewTHttpClient(parsedUrl.String())
-	} else {
-		portStr := fmt.Sprint(port)
-		if strings.Contains(host, ":") {
-			host, portStr, err = net.SplitHostPort(host)
-			if err != nil {
-				fmt.Fprintln(os.Stderr, "error with host:", err)
-				os.Exit(1)
-			}
-		}
-		trans, err = thrift.NewTSocket(net.JoinHostPort(host, portStr))
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "error resolving address:", err)
-			os.Exit(1)
-		}
-		if framed {
-			trans = thrift.NewTFramedTransport(trans)
-		}
-	}
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "Error creating transport", err)
-		os.Exit(1)
-	}
-	defer trans.Close()
-	var protocolFactory thrift.TProtocolFactory
-	switch protocol {
-	case "compact":
-		protocolFactory = thrift.NewTCompactProtocolFactory()
-		break
-	case "simplejson":
-		protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
-		break
-	case "json":
-		protocolFactory = thrift.NewTJSONProtocolFactory()
-		break
-	case "binary", "":
-		protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
-		break
-	default:
-		fmt.Fprintln(os.Stderr, "Invalid protocol specified: ", protocol)
-		Usage()
-		os.Exit(1)
-	}
-	client := aurora.NewAuroraAdminClientFactory(trans, protocolFactory)
-	if err := trans.Open(); err != nil {
-		fmt.Fprintln(os.Stderr, "Error opening socket to ", host, ":", port, " ", err)
-		os.Exit(1)
-	}
-
-	switch cmd {
-	case "setQuota":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "SetQuota requires 2 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		arg354 := flag.Arg(2)
-		mbTrans355 := thrift.NewTMemoryBufferLen(len(arg354))
-		defer mbTrans355.Close()
-		_, err356 := mbTrans355.WriteString(arg354)
-		if err356 != nil {
-			Usage()
-			return
-		}
-		factory357 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt358 := factory357.GetProtocol(mbTrans355)
-		argvalue1 := aurora.NewResourceAggregate()
-		err359 := argvalue1.Read(jsProt358)
-		if err359 != nil {
-			Usage()
-			return
-		}
-		value1 := argvalue1
-		fmt.Print(client.SetQuota(value0, value1))
-		fmt.Print("\n")
-		break
-	case "forceTaskState":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "ForceTaskState requires 2 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		tmp1, err := (strconv.Atoi(flag.Arg(2)))
-		if err != nil {
-			Usage()
-			return
-		}
-		argvalue1 := aurora.ScheduleStatus(tmp1)
-		value1 := argvalue1
-		fmt.Print(client.ForceTaskState(value0, value1))
-		fmt.Print("\n")
-		break
-	case "performBackup":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "PerformBackup requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.PerformBackup())
-		fmt.Print("\n")
-		break
-	case "listBackups":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "ListBackups requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.ListBackups())
-		fmt.Print("\n")
-		break
-	case "stageRecovery":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "StageRecovery requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.StageRecovery(value0))
-		fmt.Print("\n")
-		break
-	case "queryRecovery":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "QueryRecovery requires 1 args")
-			flag.Usage()
-		}
-		arg362 := flag.Arg(1)
-		mbTrans363 := thrift.NewTMemoryBufferLen(len(arg362))
-		defer mbTrans363.Close()
-		_, err364 := mbTrans363.WriteString(arg362)
-		if err364 != nil {
-			Usage()
-			return
-		}
-		factory365 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt366 := factory365.GetProtocol(mbTrans363)
-		argvalue0 := aurora.NewTaskQuery()
-		err367 := argvalue0.Read(jsProt366)
-		if err367 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.QueryRecovery(value0))
-		fmt.Print("\n")
-		break
-	case "deleteRecoveryTasks":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "DeleteRecoveryTasks requires 1 args")
-			flag.Usage()
-		}
-		arg368 := flag.Arg(1)
-		mbTrans369 := thrift.NewTMemoryBufferLen(len(arg368))
-		defer mbTrans369.Close()
-		_, err370 := mbTrans369.WriteString(arg368)
-		if err370 != nil {
-			Usage()
-			return
-		}
-		factory371 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt372 := factory371.GetProtocol(mbTrans369)
-		argvalue0 := aurora.NewTaskQuery()
-		err373 := argvalue0.Read(jsProt372)
-		if err373 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.DeleteRecoveryTasks(value0))
-		fmt.Print("\n")
-		break
-	case "commitRecovery":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "CommitRecovery requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.CommitRecovery())
-		fmt.Print("\n")
-		break
-	case "unloadRecovery":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "UnloadRecovery requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.UnloadRecovery())
-		fmt.Print("\n")
-		break
-	case "startMaintenance":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "StartMaintenance requires 1 args")
-			flag.Usage()
-		}
-		arg374 := flag.Arg(1)
-		mbTrans375 := thrift.NewTMemoryBufferLen(len(arg374))
-		defer mbTrans375.Close()
-		_, err376 := mbTrans375.WriteString(arg374)
-		if err376 != nil {
-			Usage()
-			return
-		}
-		factory377 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt378 := factory377.GetProtocol(mbTrans375)
-		argvalue0 := aurora.NewHosts()
-		err379 := argvalue0.Read(jsProt378)
-		if err379 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.StartMaintenance(value0))
-		fmt.Print("\n")
-		break
-	case "drainHosts":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "DrainHosts requires 1 args")
-			flag.Usage()
-		}
-		arg380 := flag.Arg(1)
-		mbTrans381 := thrift.NewTMemoryBufferLen(len(arg380))
-		defer mbTrans381.Close()
-		_, err382 := mbTrans381.WriteString(arg380)
-		if err382 != nil {
-			Usage()
-			return
-		}
-		factory383 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt384 := factory383.GetProtocol(mbTrans381)
-		argvalue0 := aurora.NewHosts()
-		err385 := argvalue0.Read(jsProt384)
-		if err385 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.DrainHosts(value0))
-		fmt.Print("\n")
-		break
-	case "maintenanceStatus":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "MaintenanceStatus requires 1 args")
-			flag.Usage()
-		}
-		arg386 := flag.Arg(1)
-		mbTrans387 := thrift.NewTMemoryBufferLen(len(arg386))
-		defer mbTrans387.Close()
-		_, err388 := mbTrans387.WriteString(arg386)
-		if err388 != nil {
-			Usage()
-			return
-		}
-		factory389 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt390 := factory389.GetProtocol(mbTrans387)
-		argvalue0 := aurora.NewHosts()
-		err391 := argvalue0.Read(jsProt390)
-		if err391 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.MaintenanceStatus(value0))
-		fmt.Print("\n")
-		break
-	case "endMaintenance":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "EndMaintenance requires 1 args")
-			flag.Usage()
-		}
-		arg392 := flag.Arg(1)
-		mbTrans393 := thrift.NewTMemoryBufferLen(len(arg392))
-		defer mbTrans393.Close()
-		_, err394 := mbTrans393.WriteString(arg392)
-		if err394 != nil {
-			Usage()
-			return
-		}
-		factory395 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt396 := factory395.GetProtocol(mbTrans393)
-		argvalue0 := aurora.NewHosts()
-		err397 := argvalue0.Read(jsProt396)
-		if err397 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.EndMaintenance(value0))
-		fmt.Print("\n")
-		break
-	case "slaDrainHosts":
-		if flag.NArg()-1 != 3 {
-			fmt.Fprintln(os.Stderr, "SlaDrainHosts requires 3 args")
-			flag.Usage()
-		}
-		arg398 := flag.Arg(1)
-		mbTrans399 := thrift.NewTMemoryBufferLen(len(arg398))
-		defer mbTrans399.Close()
-		_, err400 := mbTrans399.WriteString(arg398)
-		if err400 != nil {
-			Usage()
-			return
-		}
-		factory401 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt402 := factory401.GetProtocol(mbTrans399)
-		argvalue0 := aurora.NewHosts()
-		err403 := argvalue0.Read(jsProt402)
-		if err403 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		arg404 := flag.Arg(2)
-		mbTrans405 := thrift.NewTMemoryBufferLen(len(arg404))
-		defer mbTrans405.Close()
-		_, err406 := mbTrans405.WriteString(arg404)
-		if err406 != nil {
-			Usage()
-			return
-		}
-		factory407 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt408 := factory407.GetProtocol(mbTrans405)
-		argvalue1 := aurora.NewSlaPolicy()
-		err409 := argvalue1.Read(jsProt408)
-		if err409 != nil {
-			Usage()
-			return
-		}
-		value1 := argvalue1
-		argvalue2, err410 := (strconv.ParseInt(flag.Arg(3), 10, 64))
-		if err410 != nil {
-			Usage()
-			return
-		}
-		value2 := argvalue2
-		fmt.Print(client.SlaDrainHosts(value0, value1, value2))
-		fmt.Print("\n")
-		break
-	case "snapshot":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "Snapshot requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.Snapshot())
-		fmt.Print("\n")
-		break
-	case "triggerExplicitTaskReconciliation":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "TriggerExplicitTaskReconciliation requires 1 args")
-			flag.Usage()
-		}
-		arg411 := flag.Arg(1)
-		mbTrans412 := thrift.NewTMemoryBufferLen(len(arg411))
-		defer mbTrans412.Close()
-		_, err413 := mbTrans412.WriteString(arg411)
-		if err413 != nil {
-			Usage()
-			return
-		}
-		factory414 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt415 := factory414.GetProtocol(mbTrans412)
-		argvalue0 := aurora.NewExplicitReconciliationSettings()
-		err416 := argvalue0.Read(jsProt415)
-		if err416 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.TriggerExplicitTaskReconciliation(value0))
-		fmt.Print("\n")
-		break
-	case "triggerImplicitTaskReconciliation":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "TriggerImplicitTaskReconciliation requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.TriggerImplicitTaskReconciliation())
-		fmt.Print("\n")
-		break
-	case "pruneTasks":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "PruneTasks requires 1 args")
-			flag.Usage()
-		}
-		arg417 := flag.Arg(1)
-		mbTrans418 := thrift.NewTMemoryBufferLen(len(arg417))
-		defer mbTrans418.Close()
-		_, err419 := mbTrans418.WriteString(arg417)
-		if err419 != nil {
-			Usage()
-			return
-		}
-		factory420 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt421 := factory420.GetProtocol(mbTrans418)
-		argvalue0 := aurora.NewTaskQuery()
-		err422 := argvalue0.Read(jsProt421)
-		if err422 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.PruneTasks(value0))
-		fmt.Print("\n")
-		break
-	case "createJob":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "CreateJob requires 1 args")
-			flag.Usage()
-		}
-		arg423 := flag.Arg(1)
-		mbTrans424 := thrift.NewTMemoryBufferLen(len(arg423))
-		defer mbTrans424.Close()
-		_, err425 := mbTrans424.WriteString(arg423)
-		if err425 != nil {
-			Usage()
-			return
-		}
-		factory426 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt427 := factory426.GetProtocol(mbTrans424)
-		argvalue0 := aurora.NewJobConfiguration()
-		err428 := argvalue0.Read(jsProt427)
-		if err428 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.CreateJob(value0))
-		fmt.Print("\n")
-		break
-	case "scheduleCronJob":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "ScheduleCronJob requires 1 args")
-			flag.Usage()
-		}
-		arg429 := flag.Arg(1)
-		mbTrans430 := thrift.NewTMemoryBufferLen(len(arg429))
-		defer mbTrans430.Close()
-		_, err431 := mbTrans430.WriteString(arg429)
-		if err431 != nil {
-			Usage()
-			return
-		}
-		factory432 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt433 := factory432.GetProtocol(mbTrans430)
-		argvalue0 := aurora.NewJobConfiguration()
-		err434 := argvalue0.Read(jsProt433)
-		if err434 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.ScheduleCronJob(value0))
-		fmt.Print("\n")
-		break
-	case "descheduleCronJob":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "DescheduleCronJob requires 1 args")
-			flag.Usage()
-		}
-		arg435 := flag.Arg(1)
-		mbTrans436 := thrift.NewTMemoryBufferLen(len(arg435))
-		defer mbTrans436.Close()
-		_, err437 := mbTrans436.WriteString(arg435)
-		if err437 != nil {
-			Usage()
-			return
-		}
-		factory438 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt439 := factory438.GetProtocol(mbTrans436)
-		argvalue0 := aurora.NewJobKey()
-		err440 := argvalue0.Read(jsProt439)
-		if err440 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.DescheduleCronJob(value0))
-		fmt.Print("\n")
-		break
-	case "startCronJob":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "StartCronJob requires 1 args")
-			flag.Usage()
-		}
-		arg441 := flag.Arg(1)
-		mbTrans442 := thrift.NewTMemoryBufferLen(len(arg441))
-		defer mbTrans442.Close()
-		_, err443 := mbTrans442.WriteString(arg441)
-		if err443 != nil {
-			Usage()
-			return
-		}
-		factory444 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt445 := factory444.GetProtocol(mbTrans442)
-		argvalue0 := aurora.NewJobKey()
-		err446 := argvalue0.Read(jsProt445)
-		if err446 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.StartCronJob(value0))
-		fmt.Print("\n")
-		break
-	case "restartShards":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "RestartShards requires 2 args")
-			flag.Usage()
-		}
-		arg447 := flag.Arg(1)
-		mbTrans448 := thrift.NewTMemoryBufferLen(len(arg447))
-		defer mbTrans448.Close()
-		_, err449 := mbTrans448.WriteString(arg447)
-		if err449 != nil {
-			Usage()
-			return
-		}
-		factory450 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt451 := factory450.GetProtocol(mbTrans448)
-		argvalue0 := aurora.NewJobKey()
-		err452 := argvalue0.Read(jsProt451)
-		if err452 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		arg453 := flag.Arg(2)
-		mbTrans454 := thrift.NewTMemoryBufferLen(len(arg453))
-		defer mbTrans454.Close()
-		_, err455 := mbTrans454.WriteString(arg453)
-		if err455 != nil {
-			Usage()
-			return
-		}
-		factory456 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt457 := factory456.GetProtocol(mbTrans454)
-		containerStruct1 := aurora.NewAuroraAdminRestartShardsArgs()
-		err458 := containerStruct1.ReadField2(jsProt457)
-		if err458 != nil {
-			Usage()
-			return
-		}
-		argvalue1 := containerStruct1.ShardIds
-		value1 := argvalue1
-		fmt.Print(client.RestartShards(value0, value1))
-		fmt.Print("\n")
-		break
-	case "killTasks":
-		if flag.NArg()-1 != 3 {
-			fmt.Fprintln(os.Stderr, "KillTasks requires 3 args")
-			flag.Usage()
-		}
-		arg459 := flag.Arg(1)
-		mbTrans460 := thrift.NewTMemoryBufferLen(len(arg459))
-		defer mbTrans460.Close()
-		_, err461 := mbTrans460.WriteString(arg459)
-		if err461 != nil {
-			Usage()
-			return
-		}
-		factory462 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt463 := factory462.GetProtocol(mbTrans460)
-		argvalue0 := aurora.NewJobKey()
-		err464 := argvalue0.Read(jsProt463)
-		if err464 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		arg465 := flag.Arg(2)
-		mbTrans466 := thrift.NewTMemoryBufferLen(len(arg465))
-		defer mbTrans466.Close()
-		_, err467 := mbTrans466.WriteString(arg465)
-		if err467 != nil {
-			Usage()
-			return
-		}
-		factory468 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt469 := factory468.GetProtocol(mbTrans466)
-		containerStruct1 := aurora.NewAuroraAdminKillTasksArgs()
-		err470 := containerStruct1.ReadField2(jsProt469)
-		if err470 != nil {
-			Usage()
-			return
-		}
-		argvalue1 := containerStruct1.Instances
-		value1 := argvalue1
-		argvalue2 := flag.Arg(3)
-		value2 := argvalue2
-		fmt.Print(client.KillTasks(value0, value1, value2))
-		fmt.Print("\n")
-		break
-	case "addInstances":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "AddInstances requires 2 args")
-			flag.Usage()
-		}
-		arg472 := flag.Arg(1)
-		mbTrans473 := thrift.NewTMemoryBufferLen(len(arg472))
-		defer mbTrans473.Close()
-		_, err474 := mbTrans473.WriteString(arg472)
-		if err474 != nil {
-			Usage()
-			return
-		}
-		factory475 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt476 := factory475.GetProtocol(mbTrans473)
-		argvalue0 := aurora.NewInstanceKey()
-		err477 := argvalue0.Read(jsProt476)
-		if err477 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		tmp1, err478 := (strconv.Atoi(flag.Arg(2)))
-		if err478 != nil {
-			Usage()
-			return
-		}
-		argvalue1 := int32(tmp1)
-		value1 := argvalue1
-		fmt.Print(client.AddInstances(value0, value1))
-		fmt.Print("\n")
-		break
-	case "replaceCronTemplate":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "ReplaceCronTemplate requires 1 args")
-			flag.Usage()
-		}
-		arg479 := flag.Arg(1)
-		mbTrans480 := thrift.NewTMemoryBufferLen(len(arg479))
-		defer mbTrans480.Close()
-		_, err481 := mbTrans480.WriteString(arg479)
-		if err481 != nil {
-			Usage()
-			return
-		}
-		factory482 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt483 := factory482.GetProtocol(mbTrans480)
-		argvalue0 := aurora.NewJobConfiguration()
-		err484 := argvalue0.Read(jsProt483)
-		if err484 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.ReplaceCronTemplate(value0))
-		fmt.Print("\n")
-		break
-	case "startJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "StartJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg485 := flag.Arg(1)
-		mbTrans486 := thrift.NewTMemoryBufferLen(len(arg485))
-		defer mbTrans486.Close()
-		_, err487 := mbTrans486.WriteString(arg485)
-		if err487 != nil {
-			Usage()
-			return
-		}
-		factory488 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt489 := factory488.GetProtocol(mbTrans486)
-		argvalue0 := aurora.NewJobUpdateRequest()
-		err490 := argvalue0.Read(jsProt489)
-		if err490 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.StartJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "pauseJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "PauseJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg492 := flag.Arg(1)
-		mbTrans493 := thrift.NewTMemoryBufferLen(len(arg492))
-		defer mbTrans493.Close()
-		_, err494 := mbTrans493.WriteString(arg492)
-		if err494 != nil {
-			Usage()
-			return
-		}
-		factory495 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt496 := factory495.GetProtocol(mbTrans493)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err497 := argvalue0.Read(jsProt496)
-		if err497 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.PauseJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "resumeJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "ResumeJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg499 := flag.Arg(1)
-		mbTrans500 := thrift.NewTMemoryBufferLen(len(arg499))
-		defer mbTrans500.Close()
-		_, err501 := mbTrans500.WriteString(arg499)
-		if err501 != nil {
-			Usage()
-			return
-		}
-		factory502 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt503 := factory502.GetProtocol(mbTrans500)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err504 := argvalue0.Read(jsProt503)
-		if err504 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.ResumeJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "abortJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "AbortJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg506 := flag.Arg(1)
-		mbTrans507 := thrift.NewTMemoryBufferLen(len(arg506))
-		defer mbTrans507.Close()
-		_, err508 := mbTrans507.WriteString(arg506)
-		if err508 != nil {
-			Usage()
-			return
-		}
-		factory509 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt510 := factory509.GetProtocol(mbTrans507)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err511 := argvalue0.Read(jsProt510)
-		if err511 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.AbortJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "rollbackJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "RollbackJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg513 := flag.Arg(1)
-		mbTrans514 := thrift.NewTMemoryBufferLen(len(arg513))
-		defer mbTrans514.Close()
-		_, err515 := mbTrans514.WriteString(arg513)
-		if err515 != nil {
-			Usage()
-			return
-		}
-		factory516 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt517 := factory516.GetProtocol(mbTrans514)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err518 := argvalue0.Read(jsProt517)
-		if err518 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.RollbackJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "pulseJobUpdate":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "PulseJobUpdate requires 1 args")
-			flag.Usage()
-		}
-		arg520 := flag.Arg(1)
-		mbTrans521 := thrift.NewTMemoryBufferLen(len(arg520))
-		defer mbTrans521.Close()
-		_, err522 := mbTrans521.WriteString(arg520)
-		if err522 != nil {
-			Usage()
-			return
-		}
-		factory523 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt524 := factory523.GetProtocol(mbTrans521)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err525 := argvalue0.Read(jsProt524)
-		if err525 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.PulseJobUpdate(value0))
-		fmt.Print("\n")
-		break
-	case "getRoleSummary":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "GetRoleSummary requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.GetRoleSummary())
-		fmt.Print("\n")
-		break
-	case "getJobSummary":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobSummary requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetJobSummary(value0))
-		fmt.Print("\n")
-		break
-	case "getTasksStatus":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetTasksStatus requires 1 args")
-			flag.Usage()
-		}
-		arg527 := flag.Arg(1)
-		mbTrans528 := thrift.NewTMemoryBufferLen(len(arg527))
-		defer mbTrans528.Close()
-		_, err529 := mbTrans528.WriteString(arg527)
-		if err529 != nil {
-			Usage()
-			return
-		}
-		factory530 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt531 := factory530.GetProtocol(mbTrans528)
-		argvalue0 := aurora.NewTaskQuery()
-		err532 := argvalue0.Read(jsProt531)
-		if err532 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetTasksStatus(value0))
-		fmt.Print("\n")
-		break
-	case "getTasksWithoutConfigs":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetTasksWithoutConfigs requires 1 args")
-			flag.Usage()
-		}
-		arg533 := flag.Arg(1)
-		mbTrans534 := thrift.NewTMemoryBufferLen(len(arg533))
-		defer mbTrans534.Close()
-		_, err535 := mbTrans534.WriteString(arg533)
-		if err535 != nil {
-			Usage()
-			return
-		}
-		factory536 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt537 := factory536.GetProtocol(mbTrans534)
-		argvalue0 := aurora.NewTaskQuery()
-		err538 := argvalue0.Read(jsProt537)
-		if err538 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetTasksWithoutConfigs(value0))
-		fmt.Print("\n")
-		break
-	case "getPendingReason":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetPendingReason requires 1 args")
-			flag.Usage()
-		}
-		arg539 := flag.Arg(1)
-		mbTrans540 := thrift.NewTMemoryBufferLen(len(arg539))
-		defer mbTrans540.Close()
-		_, err541 := mbTrans540.WriteString(arg539)
-		if err541 != nil {
-			Usage()
-			return
-		}
-		factory542 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt543 := factory542.GetProtocol(mbTrans540)
-		argvalue0 := aurora.NewTaskQuery()
-		err544 := argvalue0.Read(jsProt543)
-		if err544 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetPendingReason(value0))
-		fmt.Print("\n")
-		break
-	case "getConfigSummary":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetConfigSummary requires 1 args")
-			flag.Usage()
-		}
-		arg545 := flag.Arg(1)
-		mbTrans546 := thrift.NewTMemoryBufferLen(len(arg545))
-		defer mbTrans546.Close()
-		_, err547 := mbTrans546.WriteString(arg545)
-		if err547 != nil {
-			Usage()
-			return
-		}
-		factory548 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt549 := factory548.GetProtocol(mbTrans546)
-		argvalue0 := aurora.NewJobKey()
-		err550 := argvalue0.Read(jsProt549)
-		if err550 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetConfigSummary(value0))
-		fmt.Print("\n")
-		break
-	case "getJobs":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobs requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetJobs(value0))
-		fmt.Print("\n")
-		break
-	case "getQuota":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetQuota requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetQuota(value0))
-		fmt.Print("\n")
-		break
-	case "populateJobConfig":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "PopulateJobConfig requires 1 args")
-			flag.Usage()
-		}
-		arg553 := flag.Arg(1)
-		mbTrans554 := thrift.NewTMemoryBufferLen(len(arg553))
-		defer mbTrans554.Close()
-		_, err555 := mbTrans554.WriteString(arg553)
-		if err555 != nil {
-			Usage()
-			return
-		}
-		factory556 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt557 := factory556.GetProtocol(mbTrans554)
-		argvalue0 := aurora.NewJobConfiguration()
-		err558 := argvalue0.Read(jsProt557)
-		if err558 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.PopulateJobConfig(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateSummaries":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateSummaries requires 1 args")
-			flag.Usage()
-		}
-		arg559 := flag.Arg(1)
-		mbTrans560 := thrift.NewTMemoryBufferLen(len(arg559))
-		defer mbTrans560.Close()
-		_, err561 := mbTrans560.WriteString(arg559)
-		if err561 != nil {
-			Usage()
-			return
-		}
-		factory562 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt563 := factory562.GetProtocol(mbTrans560)
-		argvalue0 := aurora.NewJobUpdateQuery()
-		err564 := argvalue0.Read(jsProt563)
-		if err564 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateSummaries(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateDetails":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateDetails requires 1 args")
-			flag.Usage()
-		}
-		arg565 := flag.Arg(1)
-		mbTrans566 := thrift.NewTMemoryBufferLen(len(arg565))
-		defer mbTrans566.Close()
-		_, err567 := mbTrans566.WriteString(arg565)
-		if err567 != nil {
-			Usage()
-			return
-		}
-		factory568 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt569 := factory568.GetProtocol(mbTrans566)
-		argvalue0 := aurora.NewJobUpdateQuery()
-		err570 := argvalue0.Read(jsProt569)
-		if err570 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateDetails(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateDiff":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateDiff requires 1 args")
-			flag.Usage()
-		}
-		arg571 := flag.Arg(1)
-		mbTrans572 := thrift.NewTMemoryBufferLen(len(arg571))
-		defer mbTrans572.Close()
-		_, err573 := mbTrans572.WriteString(arg571)
-		if err573 != nil {
-			Usage()
-			return
-		}
-		factory574 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt575 := factory574.GetProtocol(mbTrans572)
-		argvalue0 := aurora.NewJobUpdateRequest()
-		err576 := argvalue0.Read(jsProt575)
-		if err576 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateDiff(value0))
-		fmt.Print("\n")
-		break
-	case "getTierConfigs":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "GetTierConfigs requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.GetTierConfigs())
-		fmt.Print("\n")
-		break
-	case "":
-		Usage()
-		break
-	default:
-		fmt.Fprintln(os.Stderr, "Invalid function ", cmd)
-	}
+  flag.Usage = Usage
+  var host string
+  var port int
+  var protocol string
+  var urlString string
+  var framed bool
+  var useHttp bool
+  headers := make(httpHeaders)
+  var parsedUrl *url.URL
+  var trans thrift.TTransport
+  _ = strconv.Atoi
+  _ = math.Abs
+  flag.Usage = Usage
+  flag.StringVar(&host, "h", "localhost", "Specify host and port")
+  flag.IntVar(&port, "p", 9090, "Specify port")
+  flag.StringVar(&protocol, "P", "binary", "Specify the protocol (binary, compact, simplejson, json)")
+  flag.StringVar(&urlString, "u", "", "Specify the url")
+  flag.BoolVar(&framed, "framed", false, "Use framed transport")
+  flag.BoolVar(&useHttp, "http", false, "Use http")
+  flag.Var(headers, "H", "Headers to set on the http(s) request (e.g. -H \"Key: Value\")")
+  flag.Parse()
+  
+  if len(urlString) > 0 {
+    var err error
+    parsedUrl, err = url.Parse(urlString)
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
+      flag.Usage()
+    }
+    host = parsedUrl.Host
+    useHttp = len(parsedUrl.Scheme) <= 0 || parsedUrl.Scheme == "http" || parsedUrl.Scheme == "https"
+  } else if useHttp {
+    _, err := url.Parse(fmt.Sprint("http://", host, ":", port))
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
+      flag.Usage()
+    }
+  }
+  
+  cmd := flag.Arg(0)
+  var err error
+  if useHttp {
+    trans, err = thrift.NewTHttpClient(parsedUrl.String())
+    if len(headers) > 0 {
+      httptrans := trans.(*thrift.THttpClient)
+      for key, value := range headers {
+        httptrans.SetHeader(key, value)
+      }
+    }
+  } else {
+    portStr := fmt.Sprint(port)
+    if strings.Contains(host, ":") {
+           host, portStr, err = net.SplitHostPort(host)
+           if err != nil {
+                   fmt.Fprintln(os.Stderr, "error with host:", err)
+                   os.Exit(1)
+           }
+    }
+    trans, err = thrift.NewTSocket(net.JoinHostPort(host, portStr))
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "error resolving address:", err)
+      os.Exit(1)
+    }
+    if framed {
+      trans = thrift.NewTFramedTransport(trans)
+    }
+  }
+  if err != nil {
+    fmt.Fprintln(os.Stderr, "Error creating transport", err)
+    os.Exit(1)
+  }
+  defer trans.Close()
+  var protocolFactory thrift.TProtocolFactory
+  switch protocol {
+  case "compact":
+    protocolFactory = thrift.NewTCompactProtocolFactory()
+    break
+  case "simplejson":
+    protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
+    break
+  case "json":
+    protocolFactory = thrift.NewTJSONProtocolFactory()
+    break
+  case "binary", "":
+    protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
+    break
+  default:
+    fmt.Fprintln(os.Stderr, "Invalid protocol specified: ", protocol)
+    Usage()
+    os.Exit(1)
+  }
+  iprot := protocolFactory.GetProtocol(trans)
+  oprot := protocolFactory.GetProtocol(trans)
+  client := aurora.NewAuroraAdminClient(thrift.NewTStandardClient(iprot, oprot))
+  if err := trans.Open(); err != nil {
+    fmt.Fprintln(os.Stderr, "Error opening socket to ", host, ":", port, " ", err)
+    os.Exit(1)
+  }
+  
+  switch cmd {
+  case "setQuota":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "SetQuota requires 2 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    arg354 := flag.Arg(2)
+    mbTrans355 := thrift.NewTMemoryBufferLen(len(arg354))
+    defer mbTrans355.Close()
+    _, err356 := mbTrans355.WriteString(arg354)
+    if err356 != nil {
+      Usage()
+      return
+    }
+    factory357 := thrift.NewTJSONProtocolFactory()
+    jsProt358 := factory357.GetProtocol(mbTrans355)
+    argvalue1 := aurora.NewResourceAggregate()
+    err359 := argvalue1.Read(jsProt358)
+    if err359 != nil {
+      Usage()
+      return
+    }
+    value1 := argvalue1
+    fmt.Print(client.SetQuota(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "forceTaskState":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "ForceTaskState requires 2 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    tmp1, err := (strconv.Atoi(flag.Arg(2)))
+    if err != nil {
+      Usage()
+     return
+    }
+    argvalue1 := aurora.ScheduleStatus(tmp1)
+    value1 := argvalue1
+    fmt.Print(client.ForceTaskState(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "performBackup":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "PerformBackup requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.PerformBackup(context.Background()))
+    fmt.Print("\n")
+    break
+  case "listBackups":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "ListBackups requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.ListBackups(context.Background()))
+    fmt.Print("\n")
+    break
+  case "stageRecovery":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "StageRecovery requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.StageRecovery(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "queryRecovery":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "QueryRecovery requires 1 args")
+      flag.Usage()
+    }
+    arg362 := flag.Arg(1)
+    mbTrans363 := thrift.NewTMemoryBufferLen(len(arg362))
+    defer mbTrans363.Close()
+    _, err364 := mbTrans363.WriteString(arg362)
+    if err364 != nil {
+      Usage()
+      return
+    }
+    factory365 := thrift.NewTJSONProtocolFactory()
+    jsProt366 := factory365.GetProtocol(mbTrans363)
+    argvalue0 := aurora.NewTaskQuery()
+    err367 := argvalue0.Read(jsProt366)
+    if err367 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.QueryRecovery(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "deleteRecoveryTasks":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "DeleteRecoveryTasks requires 1 args")
+      flag.Usage()
+    }
+    arg368 := flag.Arg(1)
+    mbTrans369 := thrift.NewTMemoryBufferLen(len(arg368))
+    defer mbTrans369.Close()
+    _, err370 := mbTrans369.WriteString(arg368)
+    if err370 != nil {
+      Usage()
+      return
+    }
+    factory371 := thrift.NewTJSONProtocolFactory()
+    jsProt372 := factory371.GetProtocol(mbTrans369)
+    argvalue0 := aurora.NewTaskQuery()
+    err373 := argvalue0.Read(jsProt372)
+    if err373 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.DeleteRecoveryTasks(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "commitRecovery":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "CommitRecovery requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.CommitRecovery(context.Background()))
+    fmt.Print("\n")
+    break
+  case "unloadRecovery":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "UnloadRecovery requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.UnloadRecovery(context.Background()))
+    fmt.Print("\n")
+    break
+  case "startMaintenance":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "StartMaintenance requires 1 args")
+      flag.Usage()
+    }
+    arg374 := flag.Arg(1)
+    mbTrans375 := thrift.NewTMemoryBufferLen(len(arg374))
+    defer mbTrans375.Close()
+    _, err376 := mbTrans375.WriteString(arg374)
+    if err376 != nil {
+      Usage()
+      return
+    }
+    factory377 := thrift.NewTJSONProtocolFactory()
+    jsProt378 := factory377.GetProtocol(mbTrans375)
+    argvalue0 := aurora.NewHosts()
+    err379 := argvalue0.Read(jsProt378)
+    if err379 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.StartMaintenance(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "drainHosts":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "DrainHosts requires 1 args")
+      flag.Usage()
+    }
+    arg380 := flag.Arg(1)
+    mbTrans381 := thrift.NewTMemoryBufferLen(len(arg380))
+    defer mbTrans381.Close()
+    _, err382 := mbTrans381.WriteString(arg380)
+    if err382 != nil {
+      Usage()
+      return
+    }
+    factory383 := thrift.NewTJSONProtocolFactory()
+    jsProt384 := factory383.GetProtocol(mbTrans381)
+    argvalue0 := aurora.NewHosts()
+    err385 := argvalue0.Read(jsProt384)
+    if err385 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.DrainHosts(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "maintenanceStatus":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "MaintenanceStatus requires 1 args")
+      flag.Usage()
+    }
+    arg386 := flag.Arg(1)
+    mbTrans387 := thrift.NewTMemoryBufferLen(len(arg386))
+    defer mbTrans387.Close()
+    _, err388 := mbTrans387.WriteString(arg386)
+    if err388 != nil {
+      Usage()
+      return
+    }
+    factory389 := thrift.NewTJSONProtocolFactory()
+    jsProt390 := factory389.GetProtocol(mbTrans387)
+    argvalue0 := aurora.NewHosts()
+    err391 := argvalue0.Read(jsProt390)
+    if err391 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.MaintenanceStatus(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "endMaintenance":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "EndMaintenance requires 1 args")
+      flag.Usage()
+    }
+    arg392 := flag.Arg(1)
+    mbTrans393 := thrift.NewTMemoryBufferLen(len(arg392))
+    defer mbTrans393.Close()
+    _, err394 := mbTrans393.WriteString(arg392)
+    if err394 != nil {
+      Usage()
+      return
+    }
+    factory395 := thrift.NewTJSONProtocolFactory()
+    jsProt396 := factory395.GetProtocol(mbTrans393)
+    argvalue0 := aurora.NewHosts()
+    err397 := argvalue0.Read(jsProt396)
+    if err397 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.EndMaintenance(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "slaDrainHosts":
+    if flag.NArg() - 1 != 3 {
+      fmt.Fprintln(os.Stderr, "SlaDrainHosts requires 3 args")
+      flag.Usage()
+    }
+    arg398 := flag.Arg(1)
+    mbTrans399 := thrift.NewTMemoryBufferLen(len(arg398))
+    defer mbTrans399.Close()
+    _, err400 := mbTrans399.WriteString(arg398)
+    if err400 != nil {
+      Usage()
+      return
+    }
+    factory401 := thrift.NewTJSONProtocolFactory()
+    jsProt402 := factory401.GetProtocol(mbTrans399)
+    argvalue0 := aurora.NewHosts()
+    err403 := argvalue0.Read(jsProt402)
+    if err403 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    arg404 := flag.Arg(2)
+    mbTrans405 := thrift.NewTMemoryBufferLen(len(arg404))
+    defer mbTrans405.Close()
+    _, err406 := mbTrans405.WriteString(arg404)
+    if err406 != nil {
+      Usage()
+      return
+    }
+    factory407 := thrift.NewTJSONProtocolFactory()
+    jsProt408 := factory407.GetProtocol(mbTrans405)
+    argvalue1 := aurora.NewSlaPolicy()
+    err409 := argvalue1.Read(jsProt408)
+    if err409 != nil {
+      Usage()
+      return
+    }
+    value1 := argvalue1
+    argvalue2, err410 := (strconv.ParseInt(flag.Arg(3), 10, 64))
+    if err410 != nil {
+      Usage()
+      return
+    }
+    value2 := argvalue2
+    fmt.Print(client.SlaDrainHosts(context.Background(), value0, value1, value2))
+    fmt.Print("\n")
+    break
+  case "snapshot":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "Snapshot requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.Snapshot(context.Background()))
+    fmt.Print("\n")
+    break
+  case "triggerExplicitTaskReconciliation":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "TriggerExplicitTaskReconciliation requires 1 args")
+      flag.Usage()
+    }
+    arg411 := flag.Arg(1)
+    mbTrans412 := thrift.NewTMemoryBufferLen(len(arg411))
+    defer mbTrans412.Close()
+    _, err413 := mbTrans412.WriteString(arg411)
+    if err413 != nil {
+      Usage()
+      return
+    }
+    factory414 := thrift.NewTJSONProtocolFactory()
+    jsProt415 := factory414.GetProtocol(mbTrans412)
+    argvalue0 := aurora.NewExplicitReconciliationSettings()
+    err416 := argvalue0.Read(jsProt415)
+    if err416 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.TriggerExplicitTaskReconciliation(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "triggerImplicitTaskReconciliation":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "TriggerImplicitTaskReconciliation requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.TriggerImplicitTaskReconciliation(context.Background()))
+    fmt.Print("\n")
+    break
+  case "pruneTasks":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "PruneTasks requires 1 args")
+      flag.Usage()
+    }
+    arg417 := flag.Arg(1)
+    mbTrans418 := thrift.NewTMemoryBufferLen(len(arg417))
+    defer mbTrans418.Close()
+    _, err419 := mbTrans418.WriteString(arg417)
+    if err419 != nil {
+      Usage()
+      return
+    }
+    factory420 := thrift.NewTJSONProtocolFactory()
+    jsProt421 := factory420.GetProtocol(mbTrans418)
+    argvalue0 := aurora.NewTaskQuery()
+    err422 := argvalue0.Read(jsProt421)
+    if err422 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.PruneTasks(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "createJob":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "CreateJob requires 1 args")
+      flag.Usage()
+    }
+    arg423 := flag.Arg(1)
+    mbTrans424 := thrift.NewTMemoryBufferLen(len(arg423))
+    defer mbTrans424.Close()
+    _, err425 := mbTrans424.WriteString(arg423)
+    if err425 != nil {
+      Usage()
+      return
+    }
+    factory426 := thrift.NewTJSONProtocolFactory()
+    jsProt427 := factory426.GetProtocol(mbTrans424)
+    argvalue0 := aurora.NewJobConfiguration()
+    err428 := argvalue0.Read(jsProt427)
+    if err428 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.CreateJob(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "scheduleCronJob":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "ScheduleCronJob requires 1 args")
+      flag.Usage()
+    }
+    arg429 := flag.Arg(1)
+    mbTrans430 := thrift.NewTMemoryBufferLen(len(arg429))
+    defer mbTrans430.Close()
+    _, err431 := mbTrans430.WriteString(arg429)
+    if err431 != nil {
+      Usage()
+      return
+    }
+    factory432 := thrift.NewTJSONProtocolFactory()
+    jsProt433 := factory432.GetProtocol(mbTrans430)
+    argvalue0 := aurora.NewJobConfiguration()
+    err434 := argvalue0.Read(jsProt433)
+    if err434 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.ScheduleCronJob(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "descheduleCronJob":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "DescheduleCronJob requires 1 args")
+      flag.Usage()
+    }
+    arg435 := flag.Arg(1)
+    mbTrans436 := thrift.NewTMemoryBufferLen(len(arg435))
+    defer mbTrans436.Close()
+    _, err437 := mbTrans436.WriteString(arg435)
+    if err437 != nil {
+      Usage()
+      return
+    }
+    factory438 := thrift.NewTJSONProtocolFactory()
+    jsProt439 := factory438.GetProtocol(mbTrans436)
+    argvalue0 := aurora.NewJobKey()
+    err440 := argvalue0.Read(jsProt439)
+    if err440 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.DescheduleCronJob(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "startCronJob":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "StartCronJob requires 1 args")
+      flag.Usage()
+    }
+    arg441 := flag.Arg(1)
+    mbTrans442 := thrift.NewTMemoryBufferLen(len(arg441))
+    defer mbTrans442.Close()
+    _, err443 := mbTrans442.WriteString(arg441)
+    if err443 != nil {
+      Usage()
+      return
+    }
+    factory444 := thrift.NewTJSONProtocolFactory()
+    jsProt445 := factory444.GetProtocol(mbTrans442)
+    argvalue0 := aurora.NewJobKey()
+    err446 := argvalue0.Read(jsProt445)
+    if err446 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.StartCronJob(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "restartShards":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "RestartShards requires 2 args")
+      flag.Usage()
+    }
+    arg447 := flag.Arg(1)
+    mbTrans448 := thrift.NewTMemoryBufferLen(len(arg447))
+    defer mbTrans448.Close()
+    _, err449 := mbTrans448.WriteString(arg447)
+    if err449 != nil {
+      Usage()
+      return
+    }
+    factory450 := thrift.NewTJSONProtocolFactory()
+    jsProt451 := factory450.GetProtocol(mbTrans448)
+    argvalue0 := aurora.NewJobKey()
+    err452 := argvalue0.Read(jsProt451)
+    if err452 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    arg453 := flag.Arg(2)
+    mbTrans454 := thrift.NewTMemoryBufferLen(len(arg453))
+    defer mbTrans454.Close()
+    _, err455 := mbTrans454.WriteString(arg453)
+    if err455 != nil { 
+      Usage()
+      return
+    }
+    factory456 := thrift.NewTJSONProtocolFactory()
+    jsProt457 := factory456.GetProtocol(mbTrans454)
+    containerStruct1 := aurora.NewAuroraAdminRestartShardsArgs()
+    err458 := containerStruct1.ReadField2(jsProt457)
+    if err458 != nil {
+      Usage()
+      return
+    }
+    argvalue1 := containerStruct1.ShardIds
+    value1 := argvalue1
+    fmt.Print(client.RestartShards(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "killTasks":
+    if flag.NArg() - 1 != 3 {
+      fmt.Fprintln(os.Stderr, "KillTasks requires 3 args")
+      flag.Usage()
+    }
+    arg459 := flag.Arg(1)
+    mbTrans460 := thrift.NewTMemoryBufferLen(len(arg459))
+    defer mbTrans460.Close()
+    _, err461 := mbTrans460.WriteString(arg459)
+    if err461 != nil {
+      Usage()
+      return
+    }
+    factory462 := thrift.NewTJSONProtocolFactory()
+    jsProt463 := factory462.GetProtocol(mbTrans460)
+    argvalue0 := aurora.NewJobKey()
+    err464 := argvalue0.Read(jsProt463)
+    if err464 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    arg465 := flag.Arg(2)
+    mbTrans466 := thrift.NewTMemoryBufferLen(len(arg465))
+    defer mbTrans466.Close()
+    _, err467 := mbTrans466.WriteString(arg465)
+    if err467 != nil { 
+      Usage()
+      return
+    }
+    factory468 := thrift.NewTJSONProtocolFactory()
+    jsProt469 := factory468.GetProtocol(mbTrans466)
+    containerStruct1 := aurora.NewAuroraAdminKillTasksArgs()
+    err470 := containerStruct1.ReadField2(jsProt469)
+    if err470 != nil {
+      Usage()
+      return
+    }
+    argvalue1 := containerStruct1.Instances
+    value1 := argvalue1
+    argvalue2 := flag.Arg(3)
+    value2 := argvalue2
+    fmt.Print(client.KillTasks(context.Background(), value0, value1, value2))
+    fmt.Print("\n")
+    break
+  case "addInstances":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "AddInstances requires 2 args")
+      flag.Usage()
+    }
+    arg472 := flag.Arg(1)
+    mbTrans473 := thrift.NewTMemoryBufferLen(len(arg472))
+    defer mbTrans473.Close()
+    _, err474 := mbTrans473.WriteString(arg472)
+    if err474 != nil {
+      Usage()
+      return
+    }
+    factory475 := thrift.NewTJSONProtocolFactory()
+    jsProt476 := factory475.GetProtocol(mbTrans473)
+    argvalue0 := aurora.NewInstanceKey()
+    err477 := argvalue0.Read(jsProt476)
+    if err477 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    tmp1, err478 := (strconv.Atoi(flag.Arg(2)))
+    if err478 != nil {
+      Usage()
+      return
+    }
+    argvalue1 := int32(tmp1)
+    value1 := argvalue1
+    fmt.Print(client.AddInstances(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "replaceCronTemplate":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "ReplaceCronTemplate requires 1 args")
+      flag.Usage()
+    }
+    arg479 := flag.Arg(1)
+    mbTrans480 := thrift.NewTMemoryBufferLen(len(arg479))
+    defer mbTrans480.Close()
+    _, err481 := mbTrans480.WriteString(arg479)
+    if err481 != nil {
+      Usage()
+      return
+    }
+    factory482 := thrift.NewTJSONProtocolFactory()
+    jsProt483 := factory482.GetProtocol(mbTrans480)
+    argvalue0 := aurora.NewJobConfiguration()
+    err484 := argvalue0.Read(jsProt483)
+    if err484 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.ReplaceCronTemplate(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "startJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "StartJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg485 := flag.Arg(1)
+    mbTrans486 := thrift.NewTMemoryBufferLen(len(arg485))
+    defer mbTrans486.Close()
+    _, err487 := mbTrans486.WriteString(arg485)
+    if err487 != nil {
+      Usage()
+      return
+    }
+    factory488 := thrift.NewTJSONProtocolFactory()
+    jsProt489 := factory488.GetProtocol(mbTrans486)
+    argvalue0 := aurora.NewJobUpdateRequest()
+    err490 := argvalue0.Read(jsProt489)
+    if err490 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.StartJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "pauseJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "PauseJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg492 := flag.Arg(1)
+    mbTrans493 := thrift.NewTMemoryBufferLen(len(arg492))
+    defer mbTrans493.Close()
+    _, err494 := mbTrans493.WriteString(arg492)
+    if err494 != nil {
+      Usage()
+      return
+    }
+    factory495 := thrift.NewTJSONProtocolFactory()
+    jsProt496 := factory495.GetProtocol(mbTrans493)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err497 := argvalue0.Read(jsProt496)
+    if err497 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.PauseJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "resumeJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "ResumeJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg499 := flag.Arg(1)
+    mbTrans500 := thrift.NewTMemoryBufferLen(len(arg499))
+    defer mbTrans500.Close()
+    _, err501 := mbTrans500.WriteString(arg499)
+    if err501 != nil {
+      Usage()
+      return
+    }
+    factory502 := thrift.NewTJSONProtocolFactory()
+    jsProt503 := factory502.GetProtocol(mbTrans500)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err504 := argvalue0.Read(jsProt503)
+    if err504 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.ResumeJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "abortJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "AbortJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg506 := flag.Arg(1)
+    mbTrans507 := thrift.NewTMemoryBufferLen(len(arg506))
+    defer mbTrans507.Close()
+    _, err508 := mbTrans507.WriteString(arg506)
+    if err508 != nil {
+      Usage()
+      return
+    }
+    factory509 := thrift.NewTJSONProtocolFactory()
+    jsProt510 := factory509.GetProtocol(mbTrans507)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err511 := argvalue0.Read(jsProt510)
+    if err511 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.AbortJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "rollbackJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "RollbackJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg513 := flag.Arg(1)
+    mbTrans514 := thrift.NewTMemoryBufferLen(len(arg513))
+    defer mbTrans514.Close()
+    _, err515 := mbTrans514.WriteString(arg513)
+    if err515 != nil {
+      Usage()
+      return
+    }
+    factory516 := thrift.NewTJSONProtocolFactory()
+    jsProt517 := factory516.GetProtocol(mbTrans514)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err518 := argvalue0.Read(jsProt517)
+    if err518 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.RollbackJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "pulseJobUpdate":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "PulseJobUpdate requires 1 args")
+      flag.Usage()
+    }
+    arg520 := flag.Arg(1)
+    mbTrans521 := thrift.NewTMemoryBufferLen(len(arg520))
+    defer mbTrans521.Close()
+    _, err522 := mbTrans521.WriteString(arg520)
+    if err522 != nil {
+      Usage()
+      return
+    }
+    factory523 := thrift.NewTJSONProtocolFactory()
+    jsProt524 := factory523.GetProtocol(mbTrans521)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err525 := argvalue0.Read(jsProt524)
+    if err525 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.PulseJobUpdate(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getRoleSummary":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "GetRoleSummary requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.GetRoleSummary(context.Background()))
+    fmt.Print("\n")
+    break
+  case "getJobSummary":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobSummary requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetJobSummary(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTasksStatus":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetTasksStatus requires 1 args")
+      flag.Usage()
+    }
+    arg527 := flag.Arg(1)
+    mbTrans528 := thrift.NewTMemoryBufferLen(len(arg527))
+    defer mbTrans528.Close()
+    _, err529 := mbTrans528.WriteString(arg527)
+    if err529 != nil {
+      Usage()
+      return
+    }
+    factory530 := thrift.NewTJSONProtocolFactory()
+    jsProt531 := factory530.GetProtocol(mbTrans528)
+    argvalue0 := aurora.NewTaskQuery()
+    err532 := argvalue0.Read(jsProt531)
+    if err532 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetTasksStatus(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTasksWithoutConfigs":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetTasksWithoutConfigs requires 1 args")
+      flag.Usage()
+    }
+    arg533 := flag.Arg(1)
+    mbTrans534 := thrift.NewTMemoryBufferLen(len(arg533))
+    defer mbTrans534.Close()
+    _, err535 := mbTrans534.WriteString(arg533)
+    if err535 != nil {
+      Usage()
+      return
+    }
+    factory536 := thrift.NewTJSONProtocolFactory()
+    jsProt537 := factory536.GetProtocol(mbTrans534)
+    argvalue0 := aurora.NewTaskQuery()
+    err538 := argvalue0.Read(jsProt537)
+    if err538 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetTasksWithoutConfigs(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getPendingReason":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetPendingReason requires 1 args")
+      flag.Usage()
+    }
+    arg539 := flag.Arg(1)
+    mbTrans540 := thrift.NewTMemoryBufferLen(len(arg539))
+    defer mbTrans540.Close()
+    _, err541 := mbTrans540.WriteString(arg539)
+    if err541 != nil {
+      Usage()
+      return
+    }
+    factory542 := thrift.NewTJSONProtocolFactory()
+    jsProt543 := factory542.GetProtocol(mbTrans540)
+    argvalue0 := aurora.NewTaskQuery()
+    err544 := argvalue0.Read(jsProt543)
+    if err544 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetPendingReason(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getConfigSummary":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetConfigSummary requires 1 args")
+      flag.Usage()
+    }
+    arg545 := flag.Arg(1)
+    mbTrans546 := thrift.NewTMemoryBufferLen(len(arg545))
+    defer mbTrans546.Close()
+    _, err547 := mbTrans546.WriteString(arg545)
+    if err547 != nil {
+      Usage()
+      return
+    }
+    factory548 := thrift.NewTJSONProtocolFactory()
+    jsProt549 := factory548.GetProtocol(mbTrans546)
+    argvalue0 := aurora.NewJobKey()
+    err550 := argvalue0.Read(jsProt549)
+    if err550 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetConfigSummary(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobs":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobs requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetJobs(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getQuota":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetQuota requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetQuota(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "populateJobConfig":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "PopulateJobConfig requires 1 args")
+      flag.Usage()
+    }
+    arg553 := flag.Arg(1)
+    mbTrans554 := thrift.NewTMemoryBufferLen(len(arg553))
+    defer mbTrans554.Close()
+    _, err555 := mbTrans554.WriteString(arg553)
+    if err555 != nil {
+      Usage()
+      return
+    }
+    factory556 := thrift.NewTJSONProtocolFactory()
+    jsProt557 := factory556.GetProtocol(mbTrans554)
+    argvalue0 := aurora.NewJobConfiguration()
+    err558 := argvalue0.Read(jsProt557)
+    if err558 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.PopulateJobConfig(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateSummaries":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateSummaries requires 1 args")
+      flag.Usage()
+    }
+    arg559 := flag.Arg(1)
+    mbTrans560 := thrift.NewTMemoryBufferLen(len(arg559))
+    defer mbTrans560.Close()
+    _, err561 := mbTrans560.WriteString(arg559)
+    if err561 != nil {
+      Usage()
+      return
+    }
+    factory562 := thrift.NewTJSONProtocolFactory()
+    jsProt563 := factory562.GetProtocol(mbTrans560)
+    argvalue0 := aurora.NewJobUpdateQuery()
+    err564 := argvalue0.Read(jsProt563)
+    if err564 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateSummaries(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateDetails":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateDetails requires 1 args")
+      flag.Usage()
+    }
+    arg565 := flag.Arg(1)
+    mbTrans566 := thrift.NewTMemoryBufferLen(len(arg565))
+    defer mbTrans566.Close()
+    _, err567 := mbTrans566.WriteString(arg565)
+    if err567 != nil {
+      Usage()
+      return
+    }
+    factory568 := thrift.NewTJSONProtocolFactory()
+    jsProt569 := factory568.GetProtocol(mbTrans566)
+    argvalue0 := aurora.NewJobUpdateQuery()
+    err570 := argvalue0.Read(jsProt569)
+    if err570 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateDetails(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateDiff":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateDiff requires 1 args")
+      flag.Usage()
+    }
+    arg571 := flag.Arg(1)
+    mbTrans572 := thrift.NewTMemoryBufferLen(len(arg571))
+    defer mbTrans572.Close()
+    _, err573 := mbTrans572.WriteString(arg571)
+    if err573 != nil {
+      Usage()
+      return
+    }
+    factory574 := thrift.NewTJSONProtocolFactory()
+    jsProt575 := factory574.GetProtocol(mbTrans572)
+    argvalue0 := aurora.NewJobUpdateRequest()
+    err576 := argvalue0.Read(jsProt575)
+    if err576 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateDiff(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTierConfigs":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "GetTierConfigs requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.GetTierConfigs(context.Background()))
+    fmt.Print("\n")
+    break
+  case "":
+    Usage()
+    break
+  default:
+    fmt.Fprintln(os.Stderr, "Invalid function ", cmd)
+  }
 }
diff --git a/gen-go/apache/aurora/aurora_scheduler_manager-remote/aurora_scheduler_manager-remote.go b/gen-go/apache/aurora/aurora_scheduler_manager-remote/aurora_scheduler_manager-remote.go
index 3ca67ea..bc3abe9 100755
--- a/gen-go/apache/aurora/aurora_scheduler_manager-remote/aurora_scheduler_manager-remote.go
+++ b/gen-go/apache/aurora/aurora_scheduler_manager-remote/aurora_scheduler_manager-remote.go
@@ -1,801 +1,830 @@
-// Autogenerated by Thrift Compiler (0.9.3)
+// Autogenerated by Thrift Compiler (0.12.0)
 // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 
 package main
 
 import (
-	"apache/aurora"
-	"flag"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-	"math"
-	"net"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
+        "context"
+        "flag"
+        "fmt"
+        "math"
+        "net"
+        "net/url"
+        "os"
+        "strconv"
+        "strings"
+        "github.com/apache/thrift/lib/go/thrift"
+        "apache/aurora"
 )
 
+
 func Usage() {
-	fmt.Fprintln(os.Stderr, "Usage of ", os.Args[0], " [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]:")
-	flag.PrintDefaults()
-	fmt.Fprintln(os.Stderr, "\nFunctions:")
-	fmt.Fprintln(os.Stderr, "  Response createJob(JobConfiguration description)")
-	fmt.Fprintln(os.Stderr, "  Response scheduleCronJob(JobConfiguration description)")
-	fmt.Fprintln(os.Stderr, "  Response descheduleCronJob(JobKey job)")
-	fmt.Fprintln(os.Stderr, "  Response startCronJob(JobKey job)")
-	fmt.Fprintln(os.Stderr, "  Response restartShards(JobKey job,  shardIds)")
-	fmt.Fprintln(os.Stderr, "  Response killTasks(JobKey job,  instances, string message)")
-	fmt.Fprintln(os.Stderr, "  Response addInstances(InstanceKey key, i32 count)")
-	fmt.Fprintln(os.Stderr, "  Response replaceCronTemplate(JobConfiguration config)")
-	fmt.Fprintln(os.Stderr, "  Response startJobUpdate(JobUpdateRequest request, string message)")
-	fmt.Fprintln(os.Stderr, "  Response pauseJobUpdate(JobUpdateKey key, string message)")
-	fmt.Fprintln(os.Stderr, "  Response resumeJobUpdate(JobUpdateKey key, string message)")
-	fmt.Fprintln(os.Stderr, "  Response abortJobUpdate(JobUpdateKey key, string message)")
-	fmt.Fprintln(os.Stderr, "  Response rollbackJobUpdate(JobUpdateKey key, string message)")
-	fmt.Fprintln(os.Stderr, "  Response pulseJobUpdate(JobUpdateKey key)")
-	fmt.Fprintln(os.Stderr, "  Response getRoleSummary()")
-	fmt.Fprintln(os.Stderr, "  Response getJobSummary(string role)")
-	fmt.Fprintln(os.Stderr, "  Response getTasksStatus(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getTasksWithoutConfigs(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getPendingReason(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getConfigSummary(JobKey job)")
-	fmt.Fprintln(os.Stderr, "  Response getJobs(string ownerRole)")
-	fmt.Fprintln(os.Stderr, "  Response getQuota(string ownerRole)")
-	fmt.Fprintln(os.Stderr, "  Response populateJobConfig(JobConfiguration description)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateSummaries(JobUpdateQuery jobUpdateQuery)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateDetails(JobUpdateQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateDiff(JobUpdateRequest request)")
-	fmt.Fprintln(os.Stderr, "  Response getTierConfigs()")
-	fmt.Fprintln(os.Stderr)
-	os.Exit(0)
+  fmt.Fprintln(os.Stderr, "Usage of ", os.Args[0], " [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]:")
+  flag.PrintDefaults()
+  fmt.Fprintln(os.Stderr, "\nFunctions:")
+  fmt.Fprintln(os.Stderr, "  Response createJob(JobConfiguration description)")
+  fmt.Fprintln(os.Stderr, "  Response scheduleCronJob(JobConfiguration description)")
+  fmt.Fprintln(os.Stderr, "  Response descheduleCronJob(JobKey job)")
+  fmt.Fprintln(os.Stderr, "  Response startCronJob(JobKey job)")
+  fmt.Fprintln(os.Stderr, "  Response restartShards(JobKey job,  shardIds)")
+  fmt.Fprintln(os.Stderr, "  Response killTasks(JobKey job,  instances, string message)")
+  fmt.Fprintln(os.Stderr, "  Response addInstances(InstanceKey key, i32 count)")
+  fmt.Fprintln(os.Stderr, "  Response replaceCronTemplate(JobConfiguration config)")
+  fmt.Fprintln(os.Stderr, "  Response startJobUpdate(JobUpdateRequest request, string message)")
+  fmt.Fprintln(os.Stderr, "  Response pauseJobUpdate(JobUpdateKey key, string message)")
+  fmt.Fprintln(os.Stderr, "  Response resumeJobUpdate(JobUpdateKey key, string message)")
+  fmt.Fprintln(os.Stderr, "  Response abortJobUpdate(JobUpdateKey key, string message)")
+  fmt.Fprintln(os.Stderr, "  Response rollbackJobUpdate(JobUpdateKey key, string message)")
+  fmt.Fprintln(os.Stderr, "  Response pulseJobUpdate(JobUpdateKey key)")
+  fmt.Fprintln(os.Stderr, "  Response getRoleSummary()")
+  fmt.Fprintln(os.Stderr, "  Response getJobSummary(string role)")
+  fmt.Fprintln(os.Stderr, "  Response getTasksStatus(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getTasksWithoutConfigs(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getPendingReason(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getConfigSummary(JobKey job)")
+  fmt.Fprintln(os.Stderr, "  Response getJobs(string ownerRole)")
+  fmt.Fprintln(os.Stderr, "  Response getQuota(string ownerRole)")
+  fmt.Fprintln(os.Stderr, "  Response populateJobConfig(JobConfiguration description)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateSummaries(JobUpdateQuery jobUpdateQuery)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateDetails(JobUpdateQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateDiff(JobUpdateRequest request)")
+  fmt.Fprintln(os.Stderr, "  Response getTierConfigs()")
+  fmt.Fprintln(os.Stderr)
+  os.Exit(0)
+}
+
+type httpHeaders map[string]string
+
+func (h httpHeaders) String() string {
+  var m map[string]string = h
+  return fmt.Sprintf("%s", m)
+}
+
+func (h httpHeaders) Set(value string) error {
+  parts := strings.Split(value, ": ")
+  if len(parts) != 2 {
+    return fmt.Errorf("header should be of format 'Key: Value'")
+  }
+  h[parts[0]] = parts[1]
+  return nil
 }
 
 func main() {
-	flag.Usage = Usage
-	var host string
-	var port int
-	var protocol string
-	var urlString string
-	var framed bool
-	var useHttp bool
-	var parsedUrl url.URL
-	var trans thrift.TTransport
-	_ = strconv.Atoi
-	_ = math.Abs
-	flag.Usage = Usage
-	flag.StringVar(&host, "h", "localhost", "Specify host and port")
-	flag.IntVar(&port, "p", 9090, "Specify port")
-	flag.StringVar(&protocol, "P", "binary", "Specify the protocol (binary, compact, simplejson, json)")
-	flag.StringVar(&urlString, "u", "", "Specify the url")
-	flag.BoolVar(&framed, "framed", false, "Use framed transport")
-	flag.BoolVar(&useHttp, "http", false, "Use http")
-	flag.Parse()
-
-	if len(urlString) > 0 {
-		parsedUrl, err := url.Parse(urlString)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
-			flag.Usage()
-		}
-		host = parsedUrl.Host
-		useHttp = len(parsedUrl.Scheme) <= 0 || parsedUrl.Scheme == "http"
-	} else if useHttp {
-		_, err := url.Parse(fmt.Sprint("http://", host, ":", port))
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
-			flag.Usage()
-		}
-	}
-
-	cmd := flag.Arg(0)
-	var err error
-	if useHttp {
-		trans, err = thrift.NewTHttpClient(parsedUrl.String())
-	} else {
-		portStr := fmt.Sprint(port)
-		if strings.Contains(host, ":") {
-			host, portStr, err = net.SplitHostPort(host)
-			if err != nil {
-				fmt.Fprintln(os.Stderr, "error with host:", err)
-				os.Exit(1)
-			}
-		}
-		trans, err = thrift.NewTSocket(net.JoinHostPort(host, portStr))
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "error resolving address:", err)
-			os.Exit(1)
-		}
-		if framed {
-			trans = thrift.NewTFramedTransport(trans)
-		}
-	}
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "Error creating transport", err)
-		os.Exit(1)
-	}
-	defer trans.Close()
-	var protocolFactory thrift.TProtocolFactory
-	switch protocol {
-	case "compact":
-		protocolFactory = thrift.NewTCompactProtocolFactory()
-		break
-	case "simplejson":
-		protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
-		break
-	case "json":
-		protocolFactory = thrift.NewTJSONProtocolFactory()
-		break
-	case "binary", "":
-		protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
-		break
-	default:
-		fmt.Fprintln(os.Stderr, "Invalid protocol specified: ", protocol)
-		Usage()
-		os.Exit(1)
-	}
-	client := aurora.NewAuroraSchedulerManagerClientFactory(trans, protocolFactory)
-	if err := trans.Open(); err != nil {
-		fmt.Fprintln(os.Stderr, "Error opening socket to ", host, ":", port, " ", err)
-		os.Exit(1)
-	}
-
-	switch cmd {
-	case "createJob":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "CreateJob requires 1 args")
-			flag.Usage()
-		}
-		arg162 := flag.Arg(1)
-		mbTrans163 := thrift.NewTMemoryBufferLen(len(arg162))
-		defer mbTrans163.Close()
-		_, err164 := mbTrans163.WriteString(arg162)
-		if err164 != nil {
-			Usage()
-			return
-		}
-		factory165 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt166 := factory165.GetProtocol(mbTrans163)
-		argvalue0 := aurora.NewJobConfiguration()
-		err167 := argvalue0.Read(jsProt166)
-		if err167 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.CreateJob(value0))
-		fmt.Print("\n")
-		break
-	case "scheduleCronJob":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "ScheduleCronJob requires 1 args")
-			flag.Usage()
-		}
-		arg168 := flag.Arg(1)
-		mbTrans169 := thrift.NewTMemoryBufferLen(len(arg168))
-		defer mbTrans169.Close()
-		_, err170 := mbTrans169.WriteString(arg168)
-		if err170 != nil {
-			Usage()
-			return
-		}
-		factory171 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt172 := factory171.GetProtocol(mbTrans169)
-		argvalue0 := aurora.NewJobConfiguration()
-		err173 := argvalue0.Read(jsProt172)
-		if err173 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.ScheduleCronJob(value0))
-		fmt.Print("\n")
-		break
-	case "descheduleCronJob":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "DescheduleCronJob requires 1 args")
-			flag.Usage()
-		}
-		arg174 := flag.Arg(1)
-		mbTrans175 := thrift.NewTMemoryBufferLen(len(arg174))
-		defer mbTrans175.Close()
-		_, err176 := mbTrans175.WriteString(arg174)
-		if err176 != nil {
-			Usage()
-			return
-		}
-		factory177 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt178 := factory177.GetProtocol(mbTrans175)
-		argvalue0 := aurora.NewJobKey()
-		err179 := argvalue0.Read(jsProt178)
-		if err179 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.DescheduleCronJob(value0))
-		fmt.Print("\n")
-		break
-	case "startCronJob":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "StartCronJob requires 1 args")
-			flag.Usage()
-		}
-		arg180 := flag.Arg(1)
-		mbTrans181 := thrift.NewTMemoryBufferLen(len(arg180))
-		defer mbTrans181.Close()
-		_, err182 := mbTrans181.WriteString(arg180)
-		if err182 != nil {
-			Usage()
-			return
-		}
-		factory183 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt184 := factory183.GetProtocol(mbTrans181)
-		argvalue0 := aurora.NewJobKey()
-		err185 := argvalue0.Read(jsProt184)
-		if err185 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.StartCronJob(value0))
-		fmt.Print("\n")
-		break
-	case "restartShards":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "RestartShards requires 2 args")
-			flag.Usage()
-		}
-		arg186 := flag.Arg(1)
-		mbTrans187 := thrift.NewTMemoryBufferLen(len(arg186))
-		defer mbTrans187.Close()
-		_, err188 := mbTrans187.WriteString(arg186)
-		if err188 != nil {
-			Usage()
-			return
-		}
-		factory189 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt190 := factory189.GetProtocol(mbTrans187)
-		argvalue0 := aurora.NewJobKey()
-		err191 := argvalue0.Read(jsProt190)
-		if err191 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		arg192 := flag.Arg(2)
-		mbTrans193 := thrift.NewTMemoryBufferLen(len(arg192))
-		defer mbTrans193.Close()
-		_, err194 := mbTrans193.WriteString(arg192)
-		if err194 != nil {
-			Usage()
-			return
-		}
-		factory195 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt196 := factory195.GetProtocol(mbTrans193)
-		containerStruct1 := aurora.NewAuroraSchedulerManagerRestartShardsArgs()
-		err197 := containerStruct1.ReadField2(jsProt196)
-		if err197 != nil {
-			Usage()
-			return
-		}
-		argvalue1 := containerStruct1.ShardIds
-		value1 := argvalue1
-		fmt.Print(client.RestartShards(value0, value1))
-		fmt.Print("\n")
-		break
-	case "killTasks":
-		if flag.NArg()-1 != 3 {
-			fmt.Fprintln(os.Stderr, "KillTasks requires 3 args")
-			flag.Usage()
-		}
-		arg198 := flag.Arg(1)
-		mbTrans199 := thrift.NewTMemoryBufferLen(len(arg198))
-		defer mbTrans199.Close()
-		_, err200 := mbTrans199.WriteString(arg198)
-		if err200 != nil {
-			Usage()
-			return
-		}
-		factory201 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt202 := factory201.GetProtocol(mbTrans199)
-		argvalue0 := aurora.NewJobKey()
-		err203 := argvalue0.Read(jsProt202)
-		if err203 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		arg204 := flag.Arg(2)
-		mbTrans205 := thrift.NewTMemoryBufferLen(len(arg204))
-		defer mbTrans205.Close()
-		_, err206 := mbTrans205.WriteString(arg204)
-		if err206 != nil {
-			Usage()
-			return
-		}
-		factory207 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt208 := factory207.GetProtocol(mbTrans205)
-		containerStruct1 := aurora.NewAuroraSchedulerManagerKillTasksArgs()
-		err209 := containerStruct1.ReadField2(jsProt208)
-		if err209 != nil {
-			Usage()
-			return
-		}
-		argvalue1 := containerStruct1.Instances
-		value1 := argvalue1
-		argvalue2 := flag.Arg(3)
-		value2 := argvalue2
-		fmt.Print(client.KillTasks(value0, value1, value2))
-		fmt.Print("\n")
-		break
-	case "addInstances":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "AddInstances requires 2 args")
-			flag.Usage()
-		}
-		arg211 := flag.Arg(1)
-		mbTrans212 := thrift.NewTMemoryBufferLen(len(arg211))
-		defer mbTrans212.Close()
-		_, err213 := mbTrans212.WriteString(arg211)
-		if err213 != nil {
-			Usage()
-			return
-		}
-		factory214 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt215 := factory214.GetProtocol(mbTrans212)
-		argvalue0 := aurora.NewInstanceKey()
-		err216 := argvalue0.Read(jsProt215)
-		if err216 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		tmp1, err217 := (strconv.Atoi(flag.Arg(2)))
-		if err217 != nil {
-			Usage()
-			return
-		}
-		argvalue1 := int32(tmp1)
-		value1 := argvalue1
-		fmt.Print(client.AddInstances(value0, value1))
-		fmt.Print("\n")
-		break
-	case "replaceCronTemplate":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "ReplaceCronTemplate requires 1 args")
-			flag.Usage()
-		}
-		arg218 := flag.Arg(1)
-		mbTrans219 := thrift.NewTMemoryBufferLen(len(arg218))
-		defer mbTrans219.Close()
-		_, err220 := mbTrans219.WriteString(arg218)
-		if err220 != nil {
-			Usage()
-			return
-		}
-		factory221 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt222 := factory221.GetProtocol(mbTrans219)
-		argvalue0 := aurora.NewJobConfiguration()
-		err223 := argvalue0.Read(jsProt222)
-		if err223 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.ReplaceCronTemplate(value0))
-		fmt.Print("\n")
-		break
-	case "startJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "StartJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg224 := flag.Arg(1)
-		mbTrans225 := thrift.NewTMemoryBufferLen(len(arg224))
-		defer mbTrans225.Close()
-		_, err226 := mbTrans225.WriteString(arg224)
-		if err226 != nil {
-			Usage()
-			return
-		}
-		factory227 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt228 := factory227.GetProtocol(mbTrans225)
-		argvalue0 := aurora.NewJobUpdateRequest()
-		err229 := argvalue0.Read(jsProt228)
-		if err229 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.StartJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "pauseJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "PauseJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg231 := flag.Arg(1)
-		mbTrans232 := thrift.NewTMemoryBufferLen(len(arg231))
-		defer mbTrans232.Close()
-		_, err233 := mbTrans232.WriteString(arg231)
-		if err233 != nil {
-			Usage()
-			return
-		}
-		factory234 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt235 := factory234.GetProtocol(mbTrans232)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err236 := argvalue0.Read(jsProt235)
-		if err236 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.PauseJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "resumeJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "ResumeJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg238 := flag.Arg(1)
-		mbTrans239 := thrift.NewTMemoryBufferLen(len(arg238))
-		defer mbTrans239.Close()
-		_, err240 := mbTrans239.WriteString(arg238)
-		if err240 != nil {
-			Usage()
-			return
-		}
-		factory241 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt242 := factory241.GetProtocol(mbTrans239)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err243 := argvalue0.Read(jsProt242)
-		if err243 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.ResumeJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "abortJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "AbortJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg245 := flag.Arg(1)
-		mbTrans246 := thrift.NewTMemoryBufferLen(len(arg245))
-		defer mbTrans246.Close()
-		_, err247 := mbTrans246.WriteString(arg245)
-		if err247 != nil {
-			Usage()
-			return
-		}
-		factory248 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt249 := factory248.GetProtocol(mbTrans246)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err250 := argvalue0.Read(jsProt249)
-		if err250 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.AbortJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "rollbackJobUpdate":
-		if flag.NArg()-1 != 2 {
-			fmt.Fprintln(os.Stderr, "RollbackJobUpdate requires 2 args")
-			flag.Usage()
-		}
-		arg252 := flag.Arg(1)
-		mbTrans253 := thrift.NewTMemoryBufferLen(len(arg252))
-		defer mbTrans253.Close()
-		_, err254 := mbTrans253.WriteString(arg252)
-		if err254 != nil {
-			Usage()
-			return
-		}
-		factory255 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt256 := factory255.GetProtocol(mbTrans253)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err257 := argvalue0.Read(jsProt256)
-		if err257 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		argvalue1 := flag.Arg(2)
-		value1 := argvalue1
-		fmt.Print(client.RollbackJobUpdate(value0, value1))
-		fmt.Print("\n")
-		break
-	case "pulseJobUpdate":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "PulseJobUpdate requires 1 args")
-			flag.Usage()
-		}
-		arg259 := flag.Arg(1)
-		mbTrans260 := thrift.NewTMemoryBufferLen(len(arg259))
-		defer mbTrans260.Close()
-		_, err261 := mbTrans260.WriteString(arg259)
-		if err261 != nil {
-			Usage()
-			return
-		}
-		factory262 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt263 := factory262.GetProtocol(mbTrans260)
-		argvalue0 := aurora.NewJobUpdateKey()
-		err264 := argvalue0.Read(jsProt263)
-		if err264 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.PulseJobUpdate(value0))
-		fmt.Print("\n")
-		break
-	case "getRoleSummary":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "GetRoleSummary requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.GetRoleSummary())
-		fmt.Print("\n")
-		break
-	case "getJobSummary":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobSummary requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetJobSummary(value0))
-		fmt.Print("\n")
-		break
-	case "getTasksStatus":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetTasksStatus requires 1 args")
-			flag.Usage()
-		}
-		arg266 := flag.Arg(1)
-		mbTrans267 := thrift.NewTMemoryBufferLen(len(arg266))
-		defer mbTrans267.Close()
-		_, err268 := mbTrans267.WriteString(arg266)
-		if err268 != nil {
-			Usage()
-			return
-		}
-		factory269 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt270 := factory269.GetProtocol(mbTrans267)
-		argvalue0 := aurora.NewTaskQuery()
-		err271 := argvalue0.Read(jsProt270)
-		if err271 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetTasksStatus(value0))
-		fmt.Print("\n")
-		break
-	case "getTasksWithoutConfigs":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetTasksWithoutConfigs requires 1 args")
-			flag.Usage()
-		}
-		arg272 := flag.Arg(1)
-		mbTrans273 := thrift.NewTMemoryBufferLen(len(arg272))
-		defer mbTrans273.Close()
-		_, err274 := mbTrans273.WriteString(arg272)
-		if err274 != nil {
-			Usage()
-			return
-		}
-		factory275 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt276 := factory275.GetProtocol(mbTrans273)
-		argvalue0 := aurora.NewTaskQuery()
-		err277 := argvalue0.Read(jsProt276)
-		if err277 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetTasksWithoutConfigs(value0))
-		fmt.Print("\n")
-		break
-	case "getPendingReason":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetPendingReason requires 1 args")
-			flag.Usage()
-		}
-		arg278 := flag.Arg(1)
-		mbTrans279 := thrift.NewTMemoryBufferLen(len(arg278))
-		defer mbTrans279.Close()
-		_, err280 := mbTrans279.WriteString(arg278)
-		if err280 != nil {
-			Usage()
-			return
-		}
-		factory281 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt282 := factory281.GetProtocol(mbTrans279)
-		argvalue0 := aurora.NewTaskQuery()
-		err283 := argvalue0.Read(jsProt282)
-		if err283 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetPendingReason(value0))
-		fmt.Print("\n")
-		break
-	case "getConfigSummary":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetConfigSummary requires 1 args")
-			flag.Usage()
-		}
-		arg284 := flag.Arg(1)
-		mbTrans285 := thrift.NewTMemoryBufferLen(len(arg284))
-		defer mbTrans285.Close()
-		_, err286 := mbTrans285.WriteString(arg284)
-		if err286 != nil {
-			Usage()
-			return
-		}
-		factory287 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt288 := factory287.GetProtocol(mbTrans285)
-		argvalue0 := aurora.NewJobKey()
-		err289 := argvalue0.Read(jsProt288)
-		if err289 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetConfigSummary(value0))
-		fmt.Print("\n")
-		break
-	case "getJobs":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobs requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetJobs(value0))
-		fmt.Print("\n")
-		break
-	case "getQuota":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetQuota requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetQuota(value0))
-		fmt.Print("\n")
-		break
-	case "populateJobConfig":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "PopulateJobConfig requires 1 args")
-			flag.Usage()
-		}
-		arg292 := flag.Arg(1)
-		mbTrans293 := thrift.NewTMemoryBufferLen(len(arg292))
-		defer mbTrans293.Close()
-		_, err294 := mbTrans293.WriteString(arg292)
-		if err294 != nil {
-			Usage()
-			return
-		}
-		factory295 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt296 := factory295.GetProtocol(mbTrans293)
-		argvalue0 := aurora.NewJobConfiguration()
-		err297 := argvalue0.Read(jsProt296)
-		if err297 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.PopulateJobConfig(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateSummaries":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateSummaries requires 1 args")
-			flag.Usage()
-		}
-		arg298 := flag.Arg(1)
-		mbTrans299 := thrift.NewTMemoryBufferLen(len(arg298))
-		defer mbTrans299.Close()
-		_, err300 := mbTrans299.WriteString(arg298)
-		if err300 != nil {
-			Usage()
-			return
-		}
-		factory301 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt302 := factory301.GetProtocol(mbTrans299)
-		argvalue0 := aurora.NewJobUpdateQuery()
-		err303 := argvalue0.Read(jsProt302)
-		if err303 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateSummaries(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateDetails":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateDetails requires 1 args")
-			flag.Usage()
-		}
-		arg304 := flag.Arg(1)
-		mbTrans305 := thrift.NewTMemoryBufferLen(len(arg304))
-		defer mbTrans305.Close()
-		_, err306 := mbTrans305.WriteString(arg304)
-		if err306 != nil {
-			Usage()
-			return
-		}
-		factory307 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt308 := factory307.GetProtocol(mbTrans305)
-		argvalue0 := aurora.NewJobUpdateQuery()
-		err309 := argvalue0.Read(jsProt308)
-		if err309 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateDetails(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateDiff":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateDiff requires 1 args")
-			flag.Usage()
-		}
-		arg310 := flag.Arg(1)
-		mbTrans311 := thrift.NewTMemoryBufferLen(len(arg310))
-		defer mbTrans311.Close()
-		_, err312 := mbTrans311.WriteString(arg310)
-		if err312 != nil {
-			Usage()
-			return
-		}
-		factory313 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt314 := factory313.GetProtocol(mbTrans311)
-		argvalue0 := aurora.NewJobUpdateRequest()
-		err315 := argvalue0.Read(jsProt314)
-		if err315 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateDiff(value0))
-		fmt.Print("\n")
-		break
-	case "getTierConfigs":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "GetTierConfigs requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.GetTierConfigs())
-		fmt.Print("\n")
-		break
-	case "":
-		Usage()
-		break
-	default:
-		fmt.Fprintln(os.Stderr, "Invalid function ", cmd)
-	}
+  flag.Usage = Usage
+  var host string
+  var port int
+  var protocol string
+  var urlString string
+  var framed bool
+  var useHttp bool
+  headers := make(httpHeaders)
+  var parsedUrl *url.URL
+  var trans thrift.TTransport
+  _ = strconv.Atoi
+  _ = math.Abs
+  flag.Usage = Usage
+  flag.StringVar(&host, "h", "localhost", "Specify host and port")
+  flag.IntVar(&port, "p", 9090, "Specify port")
+  flag.StringVar(&protocol, "P", "binary", "Specify the protocol (binary, compact, simplejson, json)")
+  flag.StringVar(&urlString, "u", "", "Specify the url")
+  flag.BoolVar(&framed, "framed", false, "Use framed transport")
+  flag.BoolVar(&useHttp, "http", false, "Use http")
+  flag.Var(headers, "H", "Headers to set on the http(s) request (e.g. -H \"Key: Value\")")
+  flag.Parse()
+  
+  if len(urlString) > 0 {
+    var err error
+    parsedUrl, err = url.Parse(urlString)
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
+      flag.Usage()
+    }
+    host = parsedUrl.Host
+    useHttp = len(parsedUrl.Scheme) <= 0 || parsedUrl.Scheme == "http" || parsedUrl.Scheme == "https"
+  } else if useHttp {
+    _, err := url.Parse(fmt.Sprint("http://", host, ":", port))
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
+      flag.Usage()
+    }
+  }
+  
+  cmd := flag.Arg(0)
+  var err error
+  if useHttp {
+    trans, err = thrift.NewTHttpClient(parsedUrl.String())
+    if len(headers) > 0 {
+      httptrans := trans.(*thrift.THttpClient)
+      for key, value := range headers {
+        httptrans.SetHeader(key, value)
+      }
+    }
+  } else {
+    portStr := fmt.Sprint(port)
+    if strings.Contains(host, ":") {
+           host, portStr, err = net.SplitHostPort(host)
+           if err != nil {
+                   fmt.Fprintln(os.Stderr, "error with host:", err)
+                   os.Exit(1)
+           }
+    }
+    trans, err = thrift.NewTSocket(net.JoinHostPort(host, portStr))
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "error resolving address:", err)
+      os.Exit(1)
+    }
+    if framed {
+      trans = thrift.NewTFramedTransport(trans)
+    }
+  }
+  if err != nil {
+    fmt.Fprintln(os.Stderr, "Error creating transport", err)
+    os.Exit(1)
+  }
+  defer trans.Close()
+  var protocolFactory thrift.TProtocolFactory
+  switch protocol {
+  case "compact":
+    protocolFactory = thrift.NewTCompactProtocolFactory()
+    break
+  case "simplejson":
+    protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
+    break
+  case "json":
+    protocolFactory = thrift.NewTJSONProtocolFactory()
+    break
+  case "binary", "":
+    protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
+    break
+  default:
+    fmt.Fprintln(os.Stderr, "Invalid protocol specified: ", protocol)
+    Usage()
+    os.Exit(1)
+  }
+  iprot := protocolFactory.GetProtocol(trans)
+  oprot := protocolFactory.GetProtocol(trans)
+  client := aurora.NewAuroraSchedulerManagerClient(thrift.NewTStandardClient(iprot, oprot))
+  if err := trans.Open(); err != nil {
+    fmt.Fprintln(os.Stderr, "Error opening socket to ", host, ":", port, " ", err)
+    os.Exit(1)
+  }
+  
+  switch cmd {
+  case "createJob":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "CreateJob requires 1 args")
+      flag.Usage()
+    }
+    arg162 := flag.Arg(1)
+    mbTrans163 := thrift.NewTMemoryBufferLen(len(arg162))
+    defer mbTrans163.Close()
+    _, err164 := mbTrans163.WriteString(arg162)
+    if err164 != nil {
+      Usage()
+      return
+    }
+    factory165 := thrift.NewTJSONProtocolFactory()
+    jsProt166 := factory165.GetProtocol(mbTrans163)
+    argvalue0 := aurora.NewJobConfiguration()
+    err167 := argvalue0.Read(jsProt166)
+    if err167 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.CreateJob(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "scheduleCronJob":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "ScheduleCronJob requires 1 args")
+      flag.Usage()
+    }
+    arg168 := flag.Arg(1)
+    mbTrans169 := thrift.NewTMemoryBufferLen(len(arg168))
+    defer mbTrans169.Close()
+    _, err170 := mbTrans169.WriteString(arg168)
+    if err170 != nil {
+      Usage()
+      return
+    }
+    factory171 := thrift.NewTJSONProtocolFactory()
+    jsProt172 := factory171.GetProtocol(mbTrans169)
+    argvalue0 := aurora.NewJobConfiguration()
+    err173 := argvalue0.Read(jsProt172)
+    if err173 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.ScheduleCronJob(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "descheduleCronJob":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "DescheduleCronJob requires 1 args")
+      flag.Usage()
+    }
+    arg174 := flag.Arg(1)
+    mbTrans175 := thrift.NewTMemoryBufferLen(len(arg174))
+    defer mbTrans175.Close()
+    _, err176 := mbTrans175.WriteString(arg174)
+    if err176 != nil {
+      Usage()
+      return
+    }
+    factory177 := thrift.NewTJSONProtocolFactory()
+    jsProt178 := factory177.GetProtocol(mbTrans175)
+    argvalue0 := aurora.NewJobKey()
+    err179 := argvalue0.Read(jsProt178)
+    if err179 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.DescheduleCronJob(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "startCronJob":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "StartCronJob requires 1 args")
+      flag.Usage()
+    }
+    arg180 := flag.Arg(1)
+    mbTrans181 := thrift.NewTMemoryBufferLen(len(arg180))
+    defer mbTrans181.Close()
+    _, err182 := mbTrans181.WriteString(arg180)
+    if err182 != nil {
+      Usage()
+      return
+    }
+    factory183 := thrift.NewTJSONProtocolFactory()
+    jsProt184 := factory183.GetProtocol(mbTrans181)
+    argvalue0 := aurora.NewJobKey()
+    err185 := argvalue0.Read(jsProt184)
+    if err185 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.StartCronJob(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "restartShards":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "RestartShards requires 2 args")
+      flag.Usage()
+    }
+    arg186 := flag.Arg(1)
+    mbTrans187 := thrift.NewTMemoryBufferLen(len(arg186))
+    defer mbTrans187.Close()
+    _, err188 := mbTrans187.WriteString(arg186)
+    if err188 != nil {
+      Usage()
+      return
+    }
+    factory189 := thrift.NewTJSONProtocolFactory()
+    jsProt190 := factory189.GetProtocol(mbTrans187)
+    argvalue0 := aurora.NewJobKey()
+    err191 := argvalue0.Read(jsProt190)
+    if err191 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    arg192 := flag.Arg(2)
+    mbTrans193 := thrift.NewTMemoryBufferLen(len(arg192))
+    defer mbTrans193.Close()
+    _, err194 := mbTrans193.WriteString(arg192)
+    if err194 != nil { 
+      Usage()
+      return
+    }
+    factory195 := thrift.NewTJSONProtocolFactory()
+    jsProt196 := factory195.GetProtocol(mbTrans193)
+    containerStruct1 := aurora.NewAuroraSchedulerManagerRestartShardsArgs()
+    err197 := containerStruct1.ReadField2(jsProt196)
+    if err197 != nil {
+      Usage()
+      return
+    }
+    argvalue1 := containerStruct1.ShardIds
+    value1 := argvalue1
+    fmt.Print(client.RestartShards(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "killTasks":
+    if flag.NArg() - 1 != 3 {
+      fmt.Fprintln(os.Stderr, "KillTasks requires 3 args")
+      flag.Usage()
+    }
+    arg198 := flag.Arg(1)
+    mbTrans199 := thrift.NewTMemoryBufferLen(len(arg198))
+    defer mbTrans199.Close()
+    _, err200 := mbTrans199.WriteString(arg198)
+    if err200 != nil {
+      Usage()
+      return
+    }
+    factory201 := thrift.NewTJSONProtocolFactory()
+    jsProt202 := factory201.GetProtocol(mbTrans199)
+    argvalue0 := aurora.NewJobKey()
+    err203 := argvalue0.Read(jsProt202)
+    if err203 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    arg204 := flag.Arg(2)
+    mbTrans205 := thrift.NewTMemoryBufferLen(len(arg204))
+    defer mbTrans205.Close()
+    _, err206 := mbTrans205.WriteString(arg204)
+    if err206 != nil { 
+      Usage()
+      return
+    }
+    factory207 := thrift.NewTJSONProtocolFactory()
+    jsProt208 := factory207.GetProtocol(mbTrans205)
+    containerStruct1 := aurora.NewAuroraSchedulerManagerKillTasksArgs()
+    err209 := containerStruct1.ReadField2(jsProt208)
+    if err209 != nil {
+      Usage()
+      return
+    }
+    argvalue1 := containerStruct1.Instances
+    value1 := argvalue1
+    argvalue2 := flag.Arg(3)
+    value2 := argvalue2
+    fmt.Print(client.KillTasks(context.Background(), value0, value1, value2))
+    fmt.Print("\n")
+    break
+  case "addInstances":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "AddInstances requires 2 args")
+      flag.Usage()
+    }
+    arg211 := flag.Arg(1)
+    mbTrans212 := thrift.NewTMemoryBufferLen(len(arg211))
+    defer mbTrans212.Close()
+    _, err213 := mbTrans212.WriteString(arg211)
+    if err213 != nil {
+      Usage()
+      return
+    }
+    factory214 := thrift.NewTJSONProtocolFactory()
+    jsProt215 := factory214.GetProtocol(mbTrans212)
+    argvalue0 := aurora.NewInstanceKey()
+    err216 := argvalue0.Read(jsProt215)
+    if err216 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    tmp1, err217 := (strconv.Atoi(flag.Arg(2)))
+    if err217 != nil {
+      Usage()
+      return
+    }
+    argvalue1 := int32(tmp1)
+    value1 := argvalue1
+    fmt.Print(client.AddInstances(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "replaceCronTemplate":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "ReplaceCronTemplate requires 1 args")
+      flag.Usage()
+    }
+    arg218 := flag.Arg(1)
+    mbTrans219 := thrift.NewTMemoryBufferLen(len(arg218))
+    defer mbTrans219.Close()
+    _, err220 := mbTrans219.WriteString(arg218)
+    if err220 != nil {
+      Usage()
+      return
+    }
+    factory221 := thrift.NewTJSONProtocolFactory()
+    jsProt222 := factory221.GetProtocol(mbTrans219)
+    argvalue0 := aurora.NewJobConfiguration()
+    err223 := argvalue0.Read(jsProt222)
+    if err223 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.ReplaceCronTemplate(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "startJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "StartJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg224 := flag.Arg(1)
+    mbTrans225 := thrift.NewTMemoryBufferLen(len(arg224))
+    defer mbTrans225.Close()
+    _, err226 := mbTrans225.WriteString(arg224)
+    if err226 != nil {
+      Usage()
+      return
+    }
+    factory227 := thrift.NewTJSONProtocolFactory()
+    jsProt228 := factory227.GetProtocol(mbTrans225)
+    argvalue0 := aurora.NewJobUpdateRequest()
+    err229 := argvalue0.Read(jsProt228)
+    if err229 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.StartJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "pauseJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "PauseJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg231 := flag.Arg(1)
+    mbTrans232 := thrift.NewTMemoryBufferLen(len(arg231))
+    defer mbTrans232.Close()
+    _, err233 := mbTrans232.WriteString(arg231)
+    if err233 != nil {
+      Usage()
+      return
+    }
+    factory234 := thrift.NewTJSONProtocolFactory()
+    jsProt235 := factory234.GetProtocol(mbTrans232)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err236 := argvalue0.Read(jsProt235)
+    if err236 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.PauseJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "resumeJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "ResumeJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg238 := flag.Arg(1)
+    mbTrans239 := thrift.NewTMemoryBufferLen(len(arg238))
+    defer mbTrans239.Close()
+    _, err240 := mbTrans239.WriteString(arg238)
+    if err240 != nil {
+      Usage()
+      return
+    }
+    factory241 := thrift.NewTJSONProtocolFactory()
+    jsProt242 := factory241.GetProtocol(mbTrans239)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err243 := argvalue0.Read(jsProt242)
+    if err243 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.ResumeJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "abortJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "AbortJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg245 := flag.Arg(1)
+    mbTrans246 := thrift.NewTMemoryBufferLen(len(arg245))
+    defer mbTrans246.Close()
+    _, err247 := mbTrans246.WriteString(arg245)
+    if err247 != nil {
+      Usage()
+      return
+    }
+    factory248 := thrift.NewTJSONProtocolFactory()
+    jsProt249 := factory248.GetProtocol(mbTrans246)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err250 := argvalue0.Read(jsProt249)
+    if err250 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.AbortJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "rollbackJobUpdate":
+    if flag.NArg() - 1 != 2 {
+      fmt.Fprintln(os.Stderr, "RollbackJobUpdate requires 2 args")
+      flag.Usage()
+    }
+    arg252 := flag.Arg(1)
+    mbTrans253 := thrift.NewTMemoryBufferLen(len(arg252))
+    defer mbTrans253.Close()
+    _, err254 := mbTrans253.WriteString(arg252)
+    if err254 != nil {
+      Usage()
+      return
+    }
+    factory255 := thrift.NewTJSONProtocolFactory()
+    jsProt256 := factory255.GetProtocol(mbTrans253)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err257 := argvalue0.Read(jsProt256)
+    if err257 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    argvalue1 := flag.Arg(2)
+    value1 := argvalue1
+    fmt.Print(client.RollbackJobUpdate(context.Background(), value0, value1))
+    fmt.Print("\n")
+    break
+  case "pulseJobUpdate":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "PulseJobUpdate requires 1 args")
+      flag.Usage()
+    }
+    arg259 := flag.Arg(1)
+    mbTrans260 := thrift.NewTMemoryBufferLen(len(arg259))
+    defer mbTrans260.Close()
+    _, err261 := mbTrans260.WriteString(arg259)
+    if err261 != nil {
+      Usage()
+      return
+    }
+    factory262 := thrift.NewTJSONProtocolFactory()
+    jsProt263 := factory262.GetProtocol(mbTrans260)
+    argvalue0 := aurora.NewJobUpdateKey()
+    err264 := argvalue0.Read(jsProt263)
+    if err264 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.PulseJobUpdate(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getRoleSummary":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "GetRoleSummary requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.GetRoleSummary(context.Background()))
+    fmt.Print("\n")
+    break
+  case "getJobSummary":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobSummary requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetJobSummary(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTasksStatus":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetTasksStatus requires 1 args")
+      flag.Usage()
+    }
+    arg266 := flag.Arg(1)
+    mbTrans267 := thrift.NewTMemoryBufferLen(len(arg266))
+    defer mbTrans267.Close()
+    _, err268 := mbTrans267.WriteString(arg266)
+    if err268 != nil {
+      Usage()
+      return
+    }
+    factory269 := thrift.NewTJSONProtocolFactory()
+    jsProt270 := factory269.GetProtocol(mbTrans267)
+    argvalue0 := aurora.NewTaskQuery()
+    err271 := argvalue0.Read(jsProt270)
+    if err271 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetTasksStatus(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTasksWithoutConfigs":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetTasksWithoutConfigs requires 1 args")
+      flag.Usage()
+    }
+    arg272 := flag.Arg(1)
+    mbTrans273 := thrift.NewTMemoryBufferLen(len(arg272))
+    defer mbTrans273.Close()
+    _, err274 := mbTrans273.WriteString(arg272)
+    if err274 != nil {
+      Usage()
+      return
+    }
+    factory275 := thrift.NewTJSONProtocolFactory()
+    jsProt276 := factory275.GetProtocol(mbTrans273)
+    argvalue0 := aurora.NewTaskQuery()
+    err277 := argvalue0.Read(jsProt276)
+    if err277 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetTasksWithoutConfigs(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getPendingReason":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetPendingReason requires 1 args")
+      flag.Usage()
+    }
+    arg278 := flag.Arg(1)
+    mbTrans279 := thrift.NewTMemoryBufferLen(len(arg278))
+    defer mbTrans279.Close()
+    _, err280 := mbTrans279.WriteString(arg278)
+    if err280 != nil {
+      Usage()
+      return
+    }
+    factory281 := thrift.NewTJSONProtocolFactory()
+    jsProt282 := factory281.GetProtocol(mbTrans279)
+    argvalue0 := aurora.NewTaskQuery()
+    err283 := argvalue0.Read(jsProt282)
+    if err283 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetPendingReason(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getConfigSummary":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetConfigSummary requires 1 args")
+      flag.Usage()
+    }
+    arg284 := flag.Arg(1)
+    mbTrans285 := thrift.NewTMemoryBufferLen(len(arg284))
+    defer mbTrans285.Close()
+    _, err286 := mbTrans285.WriteString(arg284)
+    if err286 != nil {
+      Usage()
+      return
+    }
+    factory287 := thrift.NewTJSONProtocolFactory()
+    jsProt288 := factory287.GetProtocol(mbTrans285)
+    argvalue0 := aurora.NewJobKey()
+    err289 := argvalue0.Read(jsProt288)
+    if err289 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetConfigSummary(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobs":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobs requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetJobs(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getQuota":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetQuota requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetQuota(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "populateJobConfig":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "PopulateJobConfig requires 1 args")
+      flag.Usage()
+    }
+    arg292 := flag.Arg(1)
+    mbTrans293 := thrift.NewTMemoryBufferLen(len(arg292))
+    defer mbTrans293.Close()
+    _, err294 := mbTrans293.WriteString(arg292)
+    if err294 != nil {
+      Usage()
+      return
+    }
+    factory295 := thrift.NewTJSONProtocolFactory()
+    jsProt296 := factory295.GetProtocol(mbTrans293)
+    argvalue0 := aurora.NewJobConfiguration()
+    err297 := argvalue0.Read(jsProt296)
+    if err297 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.PopulateJobConfig(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateSummaries":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateSummaries requires 1 args")
+      flag.Usage()
+    }
+    arg298 := flag.Arg(1)
+    mbTrans299 := thrift.NewTMemoryBufferLen(len(arg298))
+    defer mbTrans299.Close()
+    _, err300 := mbTrans299.WriteString(arg298)
+    if err300 != nil {
+      Usage()
+      return
+    }
+    factory301 := thrift.NewTJSONProtocolFactory()
+    jsProt302 := factory301.GetProtocol(mbTrans299)
+    argvalue0 := aurora.NewJobUpdateQuery()
+    err303 := argvalue0.Read(jsProt302)
+    if err303 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateSummaries(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateDetails":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateDetails requires 1 args")
+      flag.Usage()
+    }
+    arg304 := flag.Arg(1)
+    mbTrans305 := thrift.NewTMemoryBufferLen(len(arg304))
+    defer mbTrans305.Close()
+    _, err306 := mbTrans305.WriteString(arg304)
+    if err306 != nil {
+      Usage()
+      return
+    }
+    factory307 := thrift.NewTJSONProtocolFactory()
+    jsProt308 := factory307.GetProtocol(mbTrans305)
+    argvalue0 := aurora.NewJobUpdateQuery()
+    err309 := argvalue0.Read(jsProt308)
+    if err309 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateDetails(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateDiff":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateDiff requires 1 args")
+      flag.Usage()
+    }
+    arg310 := flag.Arg(1)
+    mbTrans311 := thrift.NewTMemoryBufferLen(len(arg310))
+    defer mbTrans311.Close()
+    _, err312 := mbTrans311.WriteString(arg310)
+    if err312 != nil {
+      Usage()
+      return
+    }
+    factory313 := thrift.NewTJSONProtocolFactory()
+    jsProt314 := factory313.GetProtocol(mbTrans311)
+    argvalue0 := aurora.NewJobUpdateRequest()
+    err315 := argvalue0.Read(jsProt314)
+    if err315 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateDiff(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTierConfigs":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "GetTierConfigs requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.GetTierConfigs(context.Background()))
+    fmt.Print("\n")
+    break
+  case "":
+    Usage()
+    break
+  default:
+    fmt.Fprintln(os.Stderr, "Invalid function ", cmd)
+  }
 }
diff --git a/gen-go/apache/aurora/auroraadmin.go b/gen-go/apache/aurora/auroraadmin.go
deleted file mode 100644
index b00e9cf..0000000
--- a/gen-go/apache/aurora/auroraadmin.go
+++ /dev/null
@@ -1,5870 +0,0 @@
-// Autogenerated by Thrift Compiler (0.9.3)
-// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-
-package aurora
-
-import (
-	"bytes"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-)
-
-// (needed to ensure safety because of naive import list construction.)
-var _ = thrift.ZERO
-var _ = fmt.Printf
-var _ = bytes.Equal
-
-type AuroraAdmin interface {
-	AuroraSchedulerManager
-
-	// Assign quota to a user.  This will overwrite any pre-existing quota for the user.
-	//
-	// Parameters:
-	//  - OwnerRole
-	//  - Quota
-	SetQuota(ownerRole string, quota *ResourceAggregate) (r *Response, err error)
-	// Forces a task into a specific state.  This does not guarantee the task will enter the given
-	// state, as the task must still transition within the bounds of the state machine.  However,
-	// it attempts to enter that state via the state machine.
-	//
-	// Parameters:
-	//  - TaskId
-	//  - Status
-	ForceTaskState(taskId string, status ScheduleStatus) (r *Response, err error)
-	// Immediately writes a storage snapshot to disk.
-	PerformBackup() (r *Response, err error)
-	// Lists backups that are available for recovery.
-	ListBackups() (r *Response, err error)
-	// Loads a backup to an in-memory storage.  This must precede all other recovery operations.
-	//
-	// Parameters:
-	//  - BackupId
-	StageRecovery(backupId string) (r *Response, err error)
-	// Queries for tasks in a staged recovery.
-	//
-	// Parameters:
-	//  - Query
-	QueryRecovery(query *TaskQuery) (r *Response, err error)
-	// Deletes tasks from a staged recovery.
-	//
-	// Parameters:
-	//  - Query
-	DeleteRecoveryTasks(query *TaskQuery) (r *Response, err error)
-	// Commits a staged recovery, completely replacing the previous storage state.
-	CommitRecovery() (r *Response, err error)
-	// Unloads (aborts) a staged recovery.
-	UnloadRecovery() (r *Response, err error)
-	// Put the given hosts into maintenance mode.
-	//
-	// Parameters:
-	//  - Hosts
-	StartMaintenance(hosts *Hosts) (r *Response, err error)
-	// Ask scheduler to begin moving tasks scheduled on given hosts.
-	//
-	// Parameters:
-	//  - Hosts
-	DrainHosts(hosts *Hosts) (r *Response, err error)
-	// Retrieve the current maintenance states for a group of hosts.
-	//
-	// Parameters:
-	//  - Hosts
-	MaintenanceStatus(hosts *Hosts) (r *Response, err error)
-	// Set the given hosts back into serving mode.
-	//
-	// Parameters:
-	//  - Hosts
-	EndMaintenance(hosts *Hosts) (r *Response, err error)
-	// Ask scheduler to put hosts into DRAINING mode and move scheduled tasks off of the hosts
-	// such that its SLA requirements are satisfied. Use defaultSlaPolicy if it is not set for a task.
-	//
-	//
-	// Parameters:
-	//  - Hosts
-	//  - DefaultSlaPolicy
-	//  - TimeoutSecs
-	SlaDrainHosts(hosts *Hosts, defaultSlaPolicy *SlaPolicy, timeoutSecs int64) (r *Response, err error)
-	// Start a storage snapshot and block until it completes.
-	Snapshot() (r *Response, err error)
-	// Tell scheduler to trigger an explicit task reconciliation with the given settings.
-	//
-	// Parameters:
-	//  - Settings
-	TriggerExplicitTaskReconciliation(settings *ExplicitReconciliationSettings) (r *Response, err error)
-	// Tell scheduler to trigger an implicit task reconciliation.
-	TriggerImplicitTaskReconciliation() (r *Response, err error)
-	// Force prune any (terminal) tasks that match the query. If no statuses are supplied with the
-	// query, it will default to all terminal task states. If statuses are supplied, they must be
-	// terminal states.
-	//
-	// Parameters:
-	//  - Query
-	PruneTasks(query *TaskQuery) (r *Response, err error)
-}
-
-type AuroraAdminClient struct {
-	*AuroraSchedulerManagerClient
-}
-
-func NewAuroraAdminClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *AuroraAdminClient {
-	return &AuroraAdminClient{AuroraSchedulerManagerClient: NewAuroraSchedulerManagerClientFactory(t, f)}
-}
-
-func NewAuroraAdminClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *AuroraAdminClient {
-	return &AuroraAdminClient{AuroraSchedulerManagerClient: NewAuroraSchedulerManagerClientProtocol(t, iprot, oprot)}
-}
-
-// Assign quota to a user.  This will overwrite any pre-existing quota for the user.
-//
-// Parameters:
-//  - OwnerRole
-//  - Quota
-func (p *AuroraAdminClient) SetQuota(ownerRole string, quota *ResourceAggregate) (r *Response, err error) {
-	if err = p.sendSetQuota(ownerRole, quota); err != nil {
-		return
-	}
-	return p.recvSetQuota()
-}
-
-func (p *AuroraAdminClient) sendSetQuota(ownerRole string, quota *ResourceAggregate) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("setQuota", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminSetQuotaArgs{
-		OwnerRole: ownerRole,
-		Quota:     quota,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvSetQuota() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "setQuota" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "setQuota failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "setQuota failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error316 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error317 error
-		error317, err = error316.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error317
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "setQuota failed: invalid message type")
-		return
-	}
-	result := AuroraAdminSetQuotaResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Forces a task into a specific state.  This does not guarantee the task will enter the given
-// state, as the task must still transition within the bounds of the state machine.  However,
-// it attempts to enter that state via the state machine.
-//
-// Parameters:
-//  - TaskId
-//  - Status
-func (p *AuroraAdminClient) ForceTaskState(taskId string, status ScheduleStatus) (r *Response, err error) {
-	if err = p.sendForceTaskState(taskId, status); err != nil {
-		return
-	}
-	return p.recvForceTaskState()
-}
-
-func (p *AuroraAdminClient) sendForceTaskState(taskId string, status ScheduleStatus) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("forceTaskState", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminForceTaskStateArgs{
-		TaskId: taskId,
-		Status: status,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvForceTaskState() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "forceTaskState" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "forceTaskState failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "forceTaskState failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error318 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error319 error
-		error319, err = error318.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error319
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "forceTaskState failed: invalid message type")
-		return
-	}
-	result := AuroraAdminForceTaskStateResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Immediately writes a storage snapshot to disk.
-func (p *AuroraAdminClient) PerformBackup() (r *Response, err error) {
-	if err = p.sendPerformBackup(); err != nil {
-		return
-	}
-	return p.recvPerformBackup()
-}
-
-func (p *AuroraAdminClient) sendPerformBackup() (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("performBackup", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminPerformBackupArgs{}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvPerformBackup() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "performBackup" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "performBackup failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "performBackup failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error320 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error321 error
-		error321, err = error320.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error321
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "performBackup failed: invalid message type")
-		return
-	}
-	result := AuroraAdminPerformBackupResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Lists backups that are available for recovery.
-func (p *AuroraAdminClient) ListBackups() (r *Response, err error) {
-	if err = p.sendListBackups(); err != nil {
-		return
-	}
-	return p.recvListBackups()
-}
-
-func (p *AuroraAdminClient) sendListBackups() (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("listBackups", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminListBackupsArgs{}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvListBackups() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "listBackups" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "listBackups failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "listBackups failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error322 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error323 error
-		error323, err = error322.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error323
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "listBackups failed: invalid message type")
-		return
-	}
-	result := AuroraAdminListBackupsResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Loads a backup to an in-memory storage.  This must precede all other recovery operations.
-//
-// Parameters:
-//  - BackupId
-func (p *AuroraAdminClient) StageRecovery(backupId string) (r *Response, err error) {
-	if err = p.sendStageRecovery(backupId); err != nil {
-		return
-	}
-	return p.recvStageRecovery()
-}
-
-func (p *AuroraAdminClient) sendStageRecovery(backupId string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("stageRecovery", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminStageRecoveryArgs{
-		BackupId: backupId,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvStageRecovery() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "stageRecovery" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "stageRecovery failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "stageRecovery failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error324 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error325 error
-		error325, err = error324.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error325
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "stageRecovery failed: invalid message type")
-		return
-	}
-	result := AuroraAdminStageRecoveryResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Queries for tasks in a staged recovery.
-//
-// Parameters:
-//  - Query
-func (p *AuroraAdminClient) QueryRecovery(query *TaskQuery) (r *Response, err error) {
-	if err = p.sendQueryRecovery(query); err != nil {
-		return
-	}
-	return p.recvQueryRecovery()
-}
-
-func (p *AuroraAdminClient) sendQueryRecovery(query *TaskQuery) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("queryRecovery", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminQueryRecoveryArgs{
-		Query: query,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvQueryRecovery() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "queryRecovery" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "queryRecovery failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "queryRecovery failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error326 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error327 error
-		error327, err = error326.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error327
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "queryRecovery failed: invalid message type")
-		return
-	}
-	result := AuroraAdminQueryRecoveryResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Deletes tasks from a staged recovery.
-//
-// Parameters:
-//  - Query
-func (p *AuroraAdminClient) DeleteRecoveryTasks(query *TaskQuery) (r *Response, err error) {
-	if err = p.sendDeleteRecoveryTasks(query); err != nil {
-		return
-	}
-	return p.recvDeleteRecoveryTasks()
-}
-
-func (p *AuroraAdminClient) sendDeleteRecoveryTasks(query *TaskQuery) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("deleteRecoveryTasks", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminDeleteRecoveryTasksArgs{
-		Query: query,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvDeleteRecoveryTasks() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "deleteRecoveryTasks" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "deleteRecoveryTasks failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "deleteRecoveryTasks failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error328 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error329 error
-		error329, err = error328.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error329
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "deleteRecoveryTasks failed: invalid message type")
-		return
-	}
-	result := AuroraAdminDeleteRecoveryTasksResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Commits a staged recovery, completely replacing the previous storage state.
-func (p *AuroraAdminClient) CommitRecovery() (r *Response, err error) {
-	if err = p.sendCommitRecovery(); err != nil {
-		return
-	}
-	return p.recvCommitRecovery()
-}
-
-func (p *AuroraAdminClient) sendCommitRecovery() (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("commitRecovery", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminCommitRecoveryArgs{}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvCommitRecovery() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "commitRecovery" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "commitRecovery failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "commitRecovery failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error330 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error331 error
-		error331, err = error330.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error331
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "commitRecovery failed: invalid message type")
-		return
-	}
-	result := AuroraAdminCommitRecoveryResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Unloads (aborts) a staged recovery.
-func (p *AuroraAdminClient) UnloadRecovery() (r *Response, err error) {
-	if err = p.sendUnloadRecovery(); err != nil {
-		return
-	}
-	return p.recvUnloadRecovery()
-}
-
-func (p *AuroraAdminClient) sendUnloadRecovery() (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("unloadRecovery", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminUnloadRecoveryArgs{}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvUnloadRecovery() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "unloadRecovery" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "unloadRecovery failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "unloadRecovery failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error332 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error333 error
-		error333, err = error332.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error333
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "unloadRecovery failed: invalid message type")
-		return
-	}
-	result := AuroraAdminUnloadRecoveryResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Put the given hosts into maintenance mode.
-//
-// Parameters:
-//  - Hosts
-func (p *AuroraAdminClient) StartMaintenance(hosts *Hosts) (r *Response, err error) {
-	if err = p.sendStartMaintenance(hosts); err != nil {
-		return
-	}
-	return p.recvStartMaintenance()
-}
-
-func (p *AuroraAdminClient) sendStartMaintenance(hosts *Hosts) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("startMaintenance", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminStartMaintenanceArgs{
-		Hosts: hosts,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvStartMaintenance() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "startMaintenance" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "startMaintenance failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "startMaintenance failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error334 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error335 error
-		error335, err = error334.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error335
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "startMaintenance failed: invalid message type")
-		return
-	}
-	result := AuroraAdminStartMaintenanceResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Ask scheduler to begin moving tasks scheduled on given hosts.
-//
-// Parameters:
-//  - Hosts
-func (p *AuroraAdminClient) DrainHosts(hosts *Hosts) (r *Response, err error) {
-	if err = p.sendDrainHosts(hosts); err != nil {
-		return
-	}
-	return p.recvDrainHosts()
-}
-
-func (p *AuroraAdminClient) sendDrainHosts(hosts *Hosts) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("drainHosts", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminDrainHostsArgs{
-		Hosts: hosts,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvDrainHosts() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "drainHosts" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "drainHosts failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "drainHosts failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error336 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error337 error
-		error337, err = error336.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error337
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "drainHosts failed: invalid message type")
-		return
-	}
-	result := AuroraAdminDrainHostsResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Retrieve the current maintenance states for a group of hosts.
-//
-// Parameters:
-//  - Hosts
-func (p *AuroraAdminClient) MaintenanceStatus(hosts *Hosts) (r *Response, err error) {
-	if err = p.sendMaintenanceStatus(hosts); err != nil {
-		return
-	}
-	return p.recvMaintenanceStatus()
-}
-
-func (p *AuroraAdminClient) sendMaintenanceStatus(hosts *Hosts) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("maintenanceStatus", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminMaintenanceStatusArgs{
-		Hosts: hosts,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvMaintenanceStatus() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "maintenanceStatus" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "maintenanceStatus failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "maintenanceStatus failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error338 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error339 error
-		error339, err = error338.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error339
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "maintenanceStatus failed: invalid message type")
-		return
-	}
-	result := AuroraAdminMaintenanceStatusResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Set the given hosts back into serving mode.
-//
-// Parameters:
-//  - Hosts
-func (p *AuroraAdminClient) EndMaintenance(hosts *Hosts) (r *Response, err error) {
-	if err = p.sendEndMaintenance(hosts); err != nil {
-		return
-	}
-	return p.recvEndMaintenance()
-}
-
-func (p *AuroraAdminClient) sendEndMaintenance(hosts *Hosts) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("endMaintenance", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminEndMaintenanceArgs{
-		Hosts: hosts,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvEndMaintenance() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "endMaintenance" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "endMaintenance failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "endMaintenance failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error340 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error341 error
-		error341, err = error340.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error341
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "endMaintenance failed: invalid message type")
-		return
-	}
-	result := AuroraAdminEndMaintenanceResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Ask scheduler to put hosts into DRAINING mode and move scheduled tasks off of the hosts
-// such that its SLA requirements are satisfied. Use defaultSlaPolicy if it is not set for a task.
-//
-//
-// Parameters:
-//  - Hosts
-//  - DefaultSlaPolicy
-//  - TimeoutSecs
-func (p *AuroraAdminClient) SlaDrainHosts(hosts *Hosts, defaultSlaPolicy *SlaPolicy, timeoutSecs int64) (r *Response, err error) {
-	if err = p.sendSlaDrainHosts(hosts, defaultSlaPolicy, timeoutSecs); err != nil {
-		return
-	}
-	return p.recvSlaDrainHosts()
-}
-
-func (p *AuroraAdminClient) sendSlaDrainHosts(hosts *Hosts, defaultSlaPolicy *SlaPolicy, timeoutSecs int64) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("slaDrainHosts", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminSlaDrainHostsArgs{
-		Hosts:            hosts,
-		DefaultSlaPolicy: defaultSlaPolicy,
-		TimeoutSecs:      timeoutSecs,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvSlaDrainHosts() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "slaDrainHosts" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "slaDrainHosts failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "slaDrainHosts failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error342 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error343 error
-		error343, err = error342.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error343
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "slaDrainHosts failed: invalid message type")
-		return
-	}
-	result := AuroraAdminSlaDrainHostsResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Start a storage snapshot and block until it completes.
-func (p *AuroraAdminClient) Snapshot() (r *Response, err error) {
-	if err = p.sendSnapshot(); err != nil {
-		return
-	}
-	return p.recvSnapshot()
-}
-
-func (p *AuroraAdminClient) sendSnapshot() (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("snapshot", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminSnapshotArgs{}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvSnapshot() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "snapshot" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "snapshot failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "snapshot failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error344 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error345 error
-		error345, err = error344.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error345
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "snapshot failed: invalid message type")
-		return
-	}
-	result := AuroraAdminSnapshotResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Tell scheduler to trigger an explicit task reconciliation with the given settings.
-//
-// Parameters:
-//  - Settings
-func (p *AuroraAdminClient) TriggerExplicitTaskReconciliation(settings *ExplicitReconciliationSettings) (r *Response, err error) {
-	if err = p.sendTriggerExplicitTaskReconciliation(settings); err != nil {
-		return
-	}
-	return p.recvTriggerExplicitTaskReconciliation()
-}
-
-func (p *AuroraAdminClient) sendTriggerExplicitTaskReconciliation(settings *ExplicitReconciliationSettings) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("triggerExplicitTaskReconciliation", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminTriggerExplicitTaskReconciliationArgs{
-		Settings: settings,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvTriggerExplicitTaskReconciliation() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "triggerExplicitTaskReconciliation" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "triggerExplicitTaskReconciliation failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "triggerExplicitTaskReconciliation failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error346 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error347 error
-		error347, err = error346.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error347
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "triggerExplicitTaskReconciliation failed: invalid message type")
-		return
-	}
-	result := AuroraAdminTriggerExplicitTaskReconciliationResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Tell scheduler to trigger an implicit task reconciliation.
-func (p *AuroraAdminClient) TriggerImplicitTaskReconciliation() (r *Response, err error) {
-	if err = p.sendTriggerImplicitTaskReconciliation(); err != nil {
-		return
-	}
-	return p.recvTriggerImplicitTaskReconciliation()
-}
-
-func (p *AuroraAdminClient) sendTriggerImplicitTaskReconciliation() (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("triggerImplicitTaskReconciliation", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminTriggerImplicitTaskReconciliationArgs{}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvTriggerImplicitTaskReconciliation() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "triggerImplicitTaskReconciliation" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "triggerImplicitTaskReconciliation failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "triggerImplicitTaskReconciliation failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error348 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error349 error
-		error349, err = error348.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error349
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "triggerImplicitTaskReconciliation failed: invalid message type")
-		return
-	}
-	result := AuroraAdminTriggerImplicitTaskReconciliationResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Force prune any (terminal) tasks that match the query. If no statuses are supplied with the
-// query, it will default to all terminal task states. If statuses are supplied, they must be
-// terminal states.
-//
-// Parameters:
-//  - Query
-func (p *AuroraAdminClient) PruneTasks(query *TaskQuery) (r *Response, err error) {
-	if err = p.sendPruneTasks(query); err != nil {
-		return
-	}
-	return p.recvPruneTasks()
-}
-
-func (p *AuroraAdminClient) sendPruneTasks(query *TaskQuery) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("pruneTasks", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraAdminPruneTasksArgs{
-		Query: query,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraAdminClient) recvPruneTasks() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "pruneTasks" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "pruneTasks failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "pruneTasks failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error350 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error351 error
-		error351, err = error350.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error351
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "pruneTasks failed: invalid message type")
-		return
-	}
-	result := AuroraAdminPruneTasksResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-type AuroraAdminProcessor struct {
-	*AuroraSchedulerManagerProcessor
-}
-
-func NewAuroraAdminProcessor(handler AuroraAdmin) *AuroraAdminProcessor {
-	self352 := &AuroraAdminProcessor{NewAuroraSchedulerManagerProcessor(handler)}
-	self352.AddToProcessorMap("setQuota", &auroraAdminProcessorSetQuota{handler: handler})
-	self352.AddToProcessorMap("forceTaskState", &auroraAdminProcessorForceTaskState{handler: handler})
-	self352.AddToProcessorMap("performBackup", &auroraAdminProcessorPerformBackup{handler: handler})
-	self352.AddToProcessorMap("listBackups", &auroraAdminProcessorListBackups{handler: handler})
-	self352.AddToProcessorMap("stageRecovery", &auroraAdminProcessorStageRecovery{handler: handler})
-	self352.AddToProcessorMap("queryRecovery", &auroraAdminProcessorQueryRecovery{handler: handler})
-	self352.AddToProcessorMap("deleteRecoveryTasks", &auroraAdminProcessorDeleteRecoveryTasks{handler: handler})
-	self352.AddToProcessorMap("commitRecovery", &auroraAdminProcessorCommitRecovery{handler: handler})
-	self352.AddToProcessorMap("unloadRecovery", &auroraAdminProcessorUnloadRecovery{handler: handler})
-	self352.AddToProcessorMap("startMaintenance", &auroraAdminProcessorStartMaintenance{handler: handler})
-	self352.AddToProcessorMap("drainHosts", &auroraAdminProcessorDrainHosts{handler: handler})
-	self352.AddToProcessorMap("maintenanceStatus", &auroraAdminProcessorMaintenanceStatus{handler: handler})
-	self352.AddToProcessorMap("endMaintenance", &auroraAdminProcessorEndMaintenance{handler: handler})
-	self352.AddToProcessorMap("slaDrainHosts", &auroraAdminProcessorSlaDrainHosts{handler: handler})
-	self352.AddToProcessorMap("snapshot", &auroraAdminProcessorSnapshot{handler: handler})
-	self352.AddToProcessorMap("triggerExplicitTaskReconciliation", &auroraAdminProcessorTriggerExplicitTaskReconciliation{handler: handler})
-	self352.AddToProcessorMap("triggerImplicitTaskReconciliation", &auroraAdminProcessorTriggerImplicitTaskReconciliation{handler: handler})
-	self352.AddToProcessorMap("pruneTasks", &auroraAdminProcessorPruneTasks{handler: handler})
-	return self352
-}
-
-type auroraAdminProcessorSetQuota struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorSetQuota) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminSetQuotaArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("setQuota", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminSetQuotaResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.SetQuota(args.OwnerRole, args.Quota); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing setQuota: "+err2.Error())
-		oprot.WriteMessageBegin("setQuota", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("setQuota", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorForceTaskState struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorForceTaskState) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminForceTaskStateArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("forceTaskState", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminForceTaskStateResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.ForceTaskState(args.TaskId, args.Status); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing forceTaskState: "+err2.Error())
-		oprot.WriteMessageBegin("forceTaskState", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("forceTaskState", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorPerformBackup struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorPerformBackup) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminPerformBackupArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("performBackup", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminPerformBackupResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.PerformBackup(); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing performBackup: "+err2.Error())
-		oprot.WriteMessageBegin("performBackup", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("performBackup", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorListBackups struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorListBackups) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminListBackupsArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("listBackups", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminListBackupsResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.ListBackups(); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing listBackups: "+err2.Error())
-		oprot.WriteMessageBegin("listBackups", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("listBackups", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorStageRecovery struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorStageRecovery) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminStageRecoveryArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("stageRecovery", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminStageRecoveryResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.StageRecovery(args.BackupId); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing stageRecovery: "+err2.Error())
-		oprot.WriteMessageBegin("stageRecovery", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("stageRecovery", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorQueryRecovery struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorQueryRecovery) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminQueryRecoveryArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("queryRecovery", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminQueryRecoveryResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.QueryRecovery(args.Query); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing queryRecovery: "+err2.Error())
-		oprot.WriteMessageBegin("queryRecovery", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("queryRecovery", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorDeleteRecoveryTasks struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorDeleteRecoveryTasks) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminDeleteRecoveryTasksArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("deleteRecoveryTasks", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminDeleteRecoveryTasksResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.DeleteRecoveryTasks(args.Query); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing deleteRecoveryTasks: "+err2.Error())
-		oprot.WriteMessageBegin("deleteRecoveryTasks", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("deleteRecoveryTasks", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorCommitRecovery struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorCommitRecovery) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminCommitRecoveryArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("commitRecovery", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminCommitRecoveryResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.CommitRecovery(); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing commitRecovery: "+err2.Error())
-		oprot.WriteMessageBegin("commitRecovery", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("commitRecovery", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorUnloadRecovery struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorUnloadRecovery) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminUnloadRecoveryArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("unloadRecovery", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminUnloadRecoveryResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.UnloadRecovery(); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing unloadRecovery: "+err2.Error())
-		oprot.WriteMessageBegin("unloadRecovery", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("unloadRecovery", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorStartMaintenance struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorStartMaintenance) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminStartMaintenanceArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("startMaintenance", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminStartMaintenanceResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.StartMaintenance(args.Hosts); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing startMaintenance: "+err2.Error())
-		oprot.WriteMessageBegin("startMaintenance", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("startMaintenance", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorDrainHosts struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorDrainHosts) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminDrainHostsArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("drainHosts", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminDrainHostsResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.DrainHosts(args.Hosts); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing drainHosts: "+err2.Error())
-		oprot.WriteMessageBegin("drainHosts", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("drainHosts", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorMaintenanceStatus struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorMaintenanceStatus) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminMaintenanceStatusArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("maintenanceStatus", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminMaintenanceStatusResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.MaintenanceStatus(args.Hosts); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing maintenanceStatus: "+err2.Error())
-		oprot.WriteMessageBegin("maintenanceStatus", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("maintenanceStatus", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorEndMaintenance struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorEndMaintenance) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminEndMaintenanceArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("endMaintenance", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminEndMaintenanceResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.EndMaintenance(args.Hosts); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing endMaintenance: "+err2.Error())
-		oprot.WriteMessageBegin("endMaintenance", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("endMaintenance", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorSlaDrainHosts struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorSlaDrainHosts) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminSlaDrainHostsArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("slaDrainHosts", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminSlaDrainHostsResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.SlaDrainHosts(args.Hosts, args.DefaultSlaPolicy, args.TimeoutSecs); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing slaDrainHosts: "+err2.Error())
-		oprot.WriteMessageBegin("slaDrainHosts", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("slaDrainHosts", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorSnapshot struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorSnapshot) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminSnapshotArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("snapshot", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminSnapshotResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.Snapshot(); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing snapshot: "+err2.Error())
-		oprot.WriteMessageBegin("snapshot", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("snapshot", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorTriggerExplicitTaskReconciliation struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorTriggerExplicitTaskReconciliation) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminTriggerExplicitTaskReconciliationArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("triggerExplicitTaskReconciliation", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminTriggerExplicitTaskReconciliationResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.TriggerExplicitTaskReconciliation(args.Settings); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing triggerExplicitTaskReconciliation: "+err2.Error())
-		oprot.WriteMessageBegin("triggerExplicitTaskReconciliation", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("triggerExplicitTaskReconciliation", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorTriggerImplicitTaskReconciliation struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorTriggerImplicitTaskReconciliation) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminTriggerImplicitTaskReconciliationArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("triggerImplicitTaskReconciliation", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminTriggerImplicitTaskReconciliationResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.TriggerImplicitTaskReconciliation(); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing triggerImplicitTaskReconciliation: "+err2.Error())
-		oprot.WriteMessageBegin("triggerImplicitTaskReconciliation", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("triggerImplicitTaskReconciliation", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraAdminProcessorPruneTasks struct {
-	handler AuroraAdmin
-}
-
-func (p *auroraAdminProcessorPruneTasks) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraAdminPruneTasksArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("pruneTasks", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraAdminPruneTasksResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.PruneTasks(args.Query); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing pruneTasks: "+err2.Error())
-		oprot.WriteMessageBegin("pruneTasks", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("pruneTasks", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-// HELPER FUNCTIONS AND STRUCTURES
-
-// Attributes:
-//  - OwnerRole
-//  - Quota
-type AuroraAdminSetQuotaArgs struct {
-	OwnerRole string             `thrift:"ownerRole,1" json:"ownerRole"`
-	Quota     *ResourceAggregate `thrift:"quota,2" json:"quota"`
-}
-
-func NewAuroraAdminSetQuotaArgs() *AuroraAdminSetQuotaArgs {
-	return &AuroraAdminSetQuotaArgs{}
-}
-
-func (p *AuroraAdminSetQuotaArgs) GetOwnerRole() string {
-	return p.OwnerRole
-}
-
-var AuroraAdminSetQuotaArgs_Quota_DEFAULT *ResourceAggregate
-
-func (p *AuroraAdminSetQuotaArgs) GetQuota() *ResourceAggregate {
-	if !p.IsSetQuota() {
-		return AuroraAdminSetQuotaArgs_Quota_DEFAULT
-	}
-	return p.Quota
-}
-func (p *AuroraAdminSetQuotaArgs) IsSetQuota() bool {
-	return p.Quota != nil
-}
-
-func (p *AuroraAdminSetQuotaArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSetQuotaArgs) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.OwnerRole = v
-	}
-	return nil
-}
-
-func (p *AuroraAdminSetQuotaArgs) readField2(iprot thrift.TProtocol) error {
-	p.Quota = &ResourceAggregate{}
-	if err := p.Quota.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Quota), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSetQuotaArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("setQuota_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSetQuotaArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("ownerRole", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:ownerRole: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.OwnerRole)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.ownerRole (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:ownerRole: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminSetQuotaArgs) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("quota", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:quota: ", p), err)
-	}
-	if err := p.Quota.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Quota), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:quota: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminSetQuotaArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminSetQuotaArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminSetQuotaResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminSetQuotaResult() *AuroraAdminSetQuotaResult {
-	return &AuroraAdminSetQuotaResult{}
-}
-
-var AuroraAdminSetQuotaResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminSetQuotaResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminSetQuotaResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminSetQuotaResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminSetQuotaResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSetQuotaResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSetQuotaResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("setQuota_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSetQuotaResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminSetQuotaResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminSetQuotaResult(%+v)", *p)
-}
-
-// Attributes:
-//  - TaskId
-//  - Status
-type AuroraAdminForceTaskStateArgs struct {
-	TaskId string         `thrift:"taskId,1" json:"taskId"`
-	Status ScheduleStatus `thrift:"status,2" json:"status"`
-}
-
-func NewAuroraAdminForceTaskStateArgs() *AuroraAdminForceTaskStateArgs {
-	return &AuroraAdminForceTaskStateArgs{}
-}
-
-func (p *AuroraAdminForceTaskStateArgs) GetTaskId() string {
-	return p.TaskId
-}
-
-func (p *AuroraAdminForceTaskStateArgs) GetStatus() ScheduleStatus {
-	return p.Status
-}
-func (p *AuroraAdminForceTaskStateArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminForceTaskStateArgs) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.TaskId = v
-	}
-	return nil
-}
-
-func (p *AuroraAdminForceTaskStateArgs) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		temp := ScheduleStatus(v)
-		p.Status = temp
-	}
-	return nil
-}
-
-func (p *AuroraAdminForceTaskStateArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("forceTaskState_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminForceTaskStateArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("taskId", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:taskId: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.TaskId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.taskId (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:taskId: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminForceTaskStateArgs) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("status", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:status: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Status)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.status (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:status: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminForceTaskStateArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminForceTaskStateArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminForceTaskStateResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminForceTaskStateResult() *AuroraAdminForceTaskStateResult {
-	return &AuroraAdminForceTaskStateResult{}
-}
-
-var AuroraAdminForceTaskStateResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminForceTaskStateResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminForceTaskStateResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminForceTaskStateResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminForceTaskStateResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminForceTaskStateResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminForceTaskStateResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("forceTaskState_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminForceTaskStateResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminForceTaskStateResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminForceTaskStateResult(%+v)", *p)
-}
-
-type AuroraAdminPerformBackupArgs struct {
-}
-
-func NewAuroraAdminPerformBackupArgs() *AuroraAdminPerformBackupArgs {
-	return &AuroraAdminPerformBackupArgs{}
-}
-
-func (p *AuroraAdminPerformBackupArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		if err := iprot.Skip(fieldTypeId); err != nil {
-			return err
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPerformBackupArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("performBackup_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPerformBackupArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminPerformBackupArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminPerformBackupResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminPerformBackupResult() *AuroraAdminPerformBackupResult {
-	return &AuroraAdminPerformBackupResult{}
-}
-
-var AuroraAdminPerformBackupResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminPerformBackupResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminPerformBackupResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminPerformBackupResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminPerformBackupResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPerformBackupResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPerformBackupResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("performBackup_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPerformBackupResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminPerformBackupResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminPerformBackupResult(%+v)", *p)
-}
-
-type AuroraAdminListBackupsArgs struct {
-}
-
-func NewAuroraAdminListBackupsArgs() *AuroraAdminListBackupsArgs {
-	return &AuroraAdminListBackupsArgs{}
-}
-
-func (p *AuroraAdminListBackupsArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		if err := iprot.Skip(fieldTypeId); err != nil {
-			return err
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminListBackupsArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("listBackups_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminListBackupsArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminListBackupsArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminListBackupsResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminListBackupsResult() *AuroraAdminListBackupsResult {
-	return &AuroraAdminListBackupsResult{}
-}
-
-var AuroraAdminListBackupsResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminListBackupsResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminListBackupsResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminListBackupsResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminListBackupsResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminListBackupsResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminListBackupsResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("listBackups_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminListBackupsResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminListBackupsResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminListBackupsResult(%+v)", *p)
-}
-
-// Attributes:
-//  - BackupId
-type AuroraAdminStageRecoveryArgs struct {
-	BackupId string `thrift:"backupId,1" json:"backupId"`
-}
-
-func NewAuroraAdminStageRecoveryArgs() *AuroraAdminStageRecoveryArgs {
-	return &AuroraAdminStageRecoveryArgs{}
-}
-
-func (p *AuroraAdminStageRecoveryArgs) GetBackupId() string {
-	return p.BackupId
-}
-func (p *AuroraAdminStageRecoveryArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStageRecoveryArgs) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.BackupId = v
-	}
-	return nil
-}
-
-func (p *AuroraAdminStageRecoveryArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("stageRecovery_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStageRecoveryArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("backupId", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:backupId: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.BackupId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.backupId (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:backupId: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminStageRecoveryArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminStageRecoveryArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminStageRecoveryResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminStageRecoveryResult() *AuroraAdminStageRecoveryResult {
-	return &AuroraAdminStageRecoveryResult{}
-}
-
-var AuroraAdminStageRecoveryResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminStageRecoveryResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminStageRecoveryResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminStageRecoveryResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminStageRecoveryResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStageRecoveryResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStageRecoveryResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("stageRecovery_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStageRecoveryResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminStageRecoveryResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminStageRecoveryResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Query
-type AuroraAdminQueryRecoveryArgs struct {
-	Query *TaskQuery `thrift:"query,1" json:"query"`
-}
-
-func NewAuroraAdminQueryRecoveryArgs() *AuroraAdminQueryRecoveryArgs {
-	return &AuroraAdminQueryRecoveryArgs{}
-}
-
-var AuroraAdminQueryRecoveryArgs_Query_DEFAULT *TaskQuery
-
-func (p *AuroraAdminQueryRecoveryArgs) GetQuery() *TaskQuery {
-	if !p.IsSetQuery() {
-		return AuroraAdminQueryRecoveryArgs_Query_DEFAULT
-	}
-	return p.Query
-}
-func (p *AuroraAdminQueryRecoveryArgs) IsSetQuery() bool {
-	return p.Query != nil
-}
-
-func (p *AuroraAdminQueryRecoveryArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminQueryRecoveryArgs) readField1(iprot thrift.TProtocol) error {
-	p.Query = &TaskQuery{}
-	if err := p.Query.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminQueryRecoveryArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("queryRecovery_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminQueryRecoveryArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err)
-	}
-	if err := p.Query.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminQueryRecoveryArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminQueryRecoveryArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminQueryRecoveryResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminQueryRecoveryResult() *AuroraAdminQueryRecoveryResult {
-	return &AuroraAdminQueryRecoveryResult{}
-}
-
-var AuroraAdminQueryRecoveryResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminQueryRecoveryResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminQueryRecoveryResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminQueryRecoveryResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminQueryRecoveryResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminQueryRecoveryResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminQueryRecoveryResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("queryRecovery_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminQueryRecoveryResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminQueryRecoveryResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminQueryRecoveryResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Query
-type AuroraAdminDeleteRecoveryTasksArgs struct {
-	Query *TaskQuery `thrift:"query,1" json:"query"`
-}
-
-func NewAuroraAdminDeleteRecoveryTasksArgs() *AuroraAdminDeleteRecoveryTasksArgs {
-	return &AuroraAdminDeleteRecoveryTasksArgs{}
-}
-
-var AuroraAdminDeleteRecoveryTasksArgs_Query_DEFAULT *TaskQuery
-
-func (p *AuroraAdminDeleteRecoveryTasksArgs) GetQuery() *TaskQuery {
-	if !p.IsSetQuery() {
-		return AuroraAdminDeleteRecoveryTasksArgs_Query_DEFAULT
-	}
-	return p.Query
-}
-func (p *AuroraAdminDeleteRecoveryTasksArgs) IsSetQuery() bool {
-	return p.Query != nil
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksArgs) readField1(iprot thrift.TProtocol) error {
-	p.Query = &TaskQuery{}
-	if err := p.Query.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("deleteRecoveryTasks_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err)
-	}
-	if err := p.Query.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminDeleteRecoveryTasksArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminDeleteRecoveryTasksResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminDeleteRecoveryTasksResult() *AuroraAdminDeleteRecoveryTasksResult {
-	return &AuroraAdminDeleteRecoveryTasksResult{}
-}
-
-var AuroraAdminDeleteRecoveryTasksResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminDeleteRecoveryTasksResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminDeleteRecoveryTasksResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminDeleteRecoveryTasksResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("deleteRecoveryTasks_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminDeleteRecoveryTasksResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminDeleteRecoveryTasksResult(%+v)", *p)
-}
-
-type AuroraAdminCommitRecoveryArgs struct {
-}
-
-func NewAuroraAdminCommitRecoveryArgs() *AuroraAdminCommitRecoveryArgs {
-	return &AuroraAdminCommitRecoveryArgs{}
-}
-
-func (p *AuroraAdminCommitRecoveryArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		if err := iprot.Skip(fieldTypeId); err != nil {
-			return err
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminCommitRecoveryArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("commitRecovery_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminCommitRecoveryArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminCommitRecoveryArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminCommitRecoveryResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminCommitRecoveryResult() *AuroraAdminCommitRecoveryResult {
-	return &AuroraAdminCommitRecoveryResult{}
-}
-
-var AuroraAdminCommitRecoveryResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminCommitRecoveryResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminCommitRecoveryResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminCommitRecoveryResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminCommitRecoveryResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminCommitRecoveryResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminCommitRecoveryResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("commitRecovery_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminCommitRecoveryResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminCommitRecoveryResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminCommitRecoveryResult(%+v)", *p)
-}
-
-type AuroraAdminUnloadRecoveryArgs struct {
-}
-
-func NewAuroraAdminUnloadRecoveryArgs() *AuroraAdminUnloadRecoveryArgs {
-	return &AuroraAdminUnloadRecoveryArgs{}
-}
-
-func (p *AuroraAdminUnloadRecoveryArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		if err := iprot.Skip(fieldTypeId); err != nil {
-			return err
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminUnloadRecoveryArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("unloadRecovery_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminUnloadRecoveryArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminUnloadRecoveryArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminUnloadRecoveryResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminUnloadRecoveryResult() *AuroraAdminUnloadRecoveryResult {
-	return &AuroraAdminUnloadRecoveryResult{}
-}
-
-var AuroraAdminUnloadRecoveryResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminUnloadRecoveryResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminUnloadRecoveryResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminUnloadRecoveryResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminUnloadRecoveryResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminUnloadRecoveryResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminUnloadRecoveryResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("unloadRecovery_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminUnloadRecoveryResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminUnloadRecoveryResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminUnloadRecoveryResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Hosts
-type AuroraAdminStartMaintenanceArgs struct {
-	Hosts *Hosts `thrift:"hosts,1" json:"hosts"`
-}
-
-func NewAuroraAdminStartMaintenanceArgs() *AuroraAdminStartMaintenanceArgs {
-	return &AuroraAdminStartMaintenanceArgs{}
-}
-
-var AuroraAdminStartMaintenanceArgs_Hosts_DEFAULT *Hosts
-
-func (p *AuroraAdminStartMaintenanceArgs) GetHosts() *Hosts {
-	if !p.IsSetHosts() {
-		return AuroraAdminStartMaintenanceArgs_Hosts_DEFAULT
-	}
-	return p.Hosts
-}
-func (p *AuroraAdminStartMaintenanceArgs) IsSetHosts() bool {
-	return p.Hosts != nil
-}
-
-func (p *AuroraAdminStartMaintenanceArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStartMaintenanceArgs) readField1(iprot thrift.TProtocol) error {
-	p.Hosts = &Hosts{}
-	if err := p.Hosts.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStartMaintenanceArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("startMaintenance_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStartMaintenanceArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err)
-	}
-	if err := p.Hosts.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminStartMaintenanceArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminStartMaintenanceArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminStartMaintenanceResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminStartMaintenanceResult() *AuroraAdminStartMaintenanceResult {
-	return &AuroraAdminStartMaintenanceResult{}
-}
-
-var AuroraAdminStartMaintenanceResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminStartMaintenanceResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminStartMaintenanceResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminStartMaintenanceResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminStartMaintenanceResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStartMaintenanceResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStartMaintenanceResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("startMaintenance_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminStartMaintenanceResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminStartMaintenanceResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminStartMaintenanceResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Hosts
-type AuroraAdminDrainHostsArgs struct {
-	Hosts *Hosts `thrift:"hosts,1" json:"hosts"`
-}
-
-func NewAuroraAdminDrainHostsArgs() *AuroraAdminDrainHostsArgs {
-	return &AuroraAdminDrainHostsArgs{}
-}
-
-var AuroraAdminDrainHostsArgs_Hosts_DEFAULT *Hosts
-
-func (p *AuroraAdminDrainHostsArgs) GetHosts() *Hosts {
-	if !p.IsSetHosts() {
-		return AuroraAdminDrainHostsArgs_Hosts_DEFAULT
-	}
-	return p.Hosts
-}
-func (p *AuroraAdminDrainHostsArgs) IsSetHosts() bool {
-	return p.Hosts != nil
-}
-
-func (p *AuroraAdminDrainHostsArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDrainHostsArgs) readField1(iprot thrift.TProtocol) error {
-	p.Hosts = &Hosts{}
-	if err := p.Hosts.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDrainHostsArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("drainHosts_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDrainHostsArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err)
-	}
-	if err := p.Hosts.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminDrainHostsArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminDrainHostsArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminDrainHostsResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminDrainHostsResult() *AuroraAdminDrainHostsResult {
-	return &AuroraAdminDrainHostsResult{}
-}
-
-var AuroraAdminDrainHostsResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminDrainHostsResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminDrainHostsResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminDrainHostsResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminDrainHostsResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDrainHostsResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDrainHostsResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("drainHosts_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminDrainHostsResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminDrainHostsResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminDrainHostsResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Hosts
-type AuroraAdminMaintenanceStatusArgs struct {
-	Hosts *Hosts `thrift:"hosts,1" json:"hosts"`
-}
-
-func NewAuroraAdminMaintenanceStatusArgs() *AuroraAdminMaintenanceStatusArgs {
-	return &AuroraAdminMaintenanceStatusArgs{}
-}
-
-var AuroraAdminMaintenanceStatusArgs_Hosts_DEFAULT *Hosts
-
-func (p *AuroraAdminMaintenanceStatusArgs) GetHosts() *Hosts {
-	if !p.IsSetHosts() {
-		return AuroraAdminMaintenanceStatusArgs_Hosts_DEFAULT
-	}
-	return p.Hosts
-}
-func (p *AuroraAdminMaintenanceStatusArgs) IsSetHosts() bool {
-	return p.Hosts != nil
-}
-
-func (p *AuroraAdminMaintenanceStatusArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminMaintenanceStatusArgs) readField1(iprot thrift.TProtocol) error {
-	p.Hosts = &Hosts{}
-	if err := p.Hosts.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminMaintenanceStatusArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("maintenanceStatus_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminMaintenanceStatusArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err)
-	}
-	if err := p.Hosts.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminMaintenanceStatusArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminMaintenanceStatusArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminMaintenanceStatusResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminMaintenanceStatusResult() *AuroraAdminMaintenanceStatusResult {
-	return &AuroraAdminMaintenanceStatusResult{}
-}
-
-var AuroraAdminMaintenanceStatusResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminMaintenanceStatusResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminMaintenanceStatusResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminMaintenanceStatusResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminMaintenanceStatusResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminMaintenanceStatusResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminMaintenanceStatusResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("maintenanceStatus_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminMaintenanceStatusResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminMaintenanceStatusResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminMaintenanceStatusResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Hosts
-type AuroraAdminEndMaintenanceArgs struct {
-	Hosts *Hosts `thrift:"hosts,1" json:"hosts"`
-}
-
-func NewAuroraAdminEndMaintenanceArgs() *AuroraAdminEndMaintenanceArgs {
-	return &AuroraAdminEndMaintenanceArgs{}
-}
-
-var AuroraAdminEndMaintenanceArgs_Hosts_DEFAULT *Hosts
-
-func (p *AuroraAdminEndMaintenanceArgs) GetHosts() *Hosts {
-	if !p.IsSetHosts() {
-		return AuroraAdminEndMaintenanceArgs_Hosts_DEFAULT
-	}
-	return p.Hosts
-}
-func (p *AuroraAdminEndMaintenanceArgs) IsSetHosts() bool {
-	return p.Hosts != nil
-}
-
-func (p *AuroraAdminEndMaintenanceArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminEndMaintenanceArgs) readField1(iprot thrift.TProtocol) error {
-	p.Hosts = &Hosts{}
-	if err := p.Hosts.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminEndMaintenanceArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("endMaintenance_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminEndMaintenanceArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err)
-	}
-	if err := p.Hosts.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminEndMaintenanceArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminEndMaintenanceArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminEndMaintenanceResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminEndMaintenanceResult() *AuroraAdminEndMaintenanceResult {
-	return &AuroraAdminEndMaintenanceResult{}
-}
-
-var AuroraAdminEndMaintenanceResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminEndMaintenanceResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminEndMaintenanceResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminEndMaintenanceResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminEndMaintenanceResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminEndMaintenanceResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminEndMaintenanceResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("endMaintenance_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminEndMaintenanceResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminEndMaintenanceResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminEndMaintenanceResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Hosts
-//  - DefaultSlaPolicy
-//  - TimeoutSecs
-type AuroraAdminSlaDrainHostsArgs struct {
-	Hosts            *Hosts     `thrift:"hosts,1" json:"hosts"`
-	DefaultSlaPolicy *SlaPolicy `thrift:"defaultSlaPolicy,2" json:"defaultSlaPolicy"`
-	TimeoutSecs      int64      `thrift:"timeoutSecs,3" json:"timeoutSecs"`
-}
-
-func NewAuroraAdminSlaDrainHostsArgs() *AuroraAdminSlaDrainHostsArgs {
-	return &AuroraAdminSlaDrainHostsArgs{}
-}
-
-var AuroraAdminSlaDrainHostsArgs_Hosts_DEFAULT *Hosts
-
-func (p *AuroraAdminSlaDrainHostsArgs) GetHosts() *Hosts {
-	if !p.IsSetHosts() {
-		return AuroraAdminSlaDrainHostsArgs_Hosts_DEFAULT
-	}
-	return p.Hosts
-}
-
-var AuroraAdminSlaDrainHostsArgs_DefaultSlaPolicy_DEFAULT *SlaPolicy
-
-func (p *AuroraAdminSlaDrainHostsArgs) GetDefaultSlaPolicy() *SlaPolicy {
-	if !p.IsSetDefaultSlaPolicy() {
-		return AuroraAdminSlaDrainHostsArgs_DefaultSlaPolicy_DEFAULT
-	}
-	return p.DefaultSlaPolicy
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) GetTimeoutSecs() int64 {
-	return p.TimeoutSecs
-}
-func (p *AuroraAdminSlaDrainHostsArgs) IsSetHosts() bool {
-	return p.Hosts != nil
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) IsSetDefaultSlaPolicy() bool {
-	return p.DefaultSlaPolicy != nil
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) readField1(iprot thrift.TProtocol) error {
-	p.Hosts = &Hosts{}
-	if err := p.Hosts.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hosts), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) readField2(iprot thrift.TProtocol) error {
-	p.DefaultSlaPolicy = &SlaPolicy{}
-	if err := p.DefaultSlaPolicy.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DefaultSlaPolicy), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.TimeoutSecs = v
-	}
-	return nil
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("slaDrainHosts_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("hosts", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hosts: ", p), err)
-	}
-	if err := p.Hosts.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hosts), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hosts: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("defaultSlaPolicy", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:defaultSlaPolicy: ", p), err)
-	}
-	if err := p.DefaultSlaPolicy.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DefaultSlaPolicy), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:defaultSlaPolicy: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("timeoutSecs", thrift.I64, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:timeoutSecs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.TimeoutSecs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.timeoutSecs (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:timeoutSecs: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminSlaDrainHostsArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminSlaDrainHostsArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminSlaDrainHostsResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminSlaDrainHostsResult() *AuroraAdminSlaDrainHostsResult {
-	return &AuroraAdminSlaDrainHostsResult{}
-}
-
-var AuroraAdminSlaDrainHostsResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminSlaDrainHostsResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminSlaDrainHostsResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminSlaDrainHostsResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminSlaDrainHostsResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSlaDrainHostsResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSlaDrainHostsResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("slaDrainHosts_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSlaDrainHostsResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminSlaDrainHostsResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminSlaDrainHostsResult(%+v)", *p)
-}
-
-type AuroraAdminSnapshotArgs struct {
-}
-
-func NewAuroraAdminSnapshotArgs() *AuroraAdminSnapshotArgs {
-	return &AuroraAdminSnapshotArgs{}
-}
-
-func (p *AuroraAdminSnapshotArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		if err := iprot.Skip(fieldTypeId); err != nil {
-			return err
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSnapshotArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("snapshot_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSnapshotArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminSnapshotArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminSnapshotResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminSnapshotResult() *AuroraAdminSnapshotResult {
-	return &AuroraAdminSnapshotResult{}
-}
-
-var AuroraAdminSnapshotResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminSnapshotResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminSnapshotResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminSnapshotResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminSnapshotResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSnapshotResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSnapshotResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("snapshot_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminSnapshotResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminSnapshotResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminSnapshotResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Settings
-type AuroraAdminTriggerExplicitTaskReconciliationArgs struct {
-	Settings *ExplicitReconciliationSettings `thrift:"settings,1" json:"settings"`
-}
-
-func NewAuroraAdminTriggerExplicitTaskReconciliationArgs() *AuroraAdminTriggerExplicitTaskReconciliationArgs {
-	return &AuroraAdminTriggerExplicitTaskReconciliationArgs{}
-}
-
-var AuroraAdminTriggerExplicitTaskReconciliationArgs_Settings_DEFAULT *ExplicitReconciliationSettings
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) GetSettings() *ExplicitReconciliationSettings {
-	if !p.IsSetSettings() {
-		return AuroraAdminTriggerExplicitTaskReconciliationArgs_Settings_DEFAULT
-	}
-	return p.Settings
-}
-func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) IsSetSettings() bool {
-	return p.Settings != nil
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) readField1(iprot thrift.TProtocol) error {
-	p.Settings = &ExplicitReconciliationSettings{}
-	if err := p.Settings.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Settings), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("triggerExplicitTaskReconciliation_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("settings", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:settings: ", p), err)
-	}
-	if err := p.Settings.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Settings), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:settings: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminTriggerExplicitTaskReconciliationArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminTriggerExplicitTaskReconciliationResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminTriggerExplicitTaskReconciliationResult() *AuroraAdminTriggerExplicitTaskReconciliationResult {
-	return &AuroraAdminTriggerExplicitTaskReconciliationResult{}
-}
-
-var AuroraAdminTriggerExplicitTaskReconciliationResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminTriggerExplicitTaskReconciliationResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("triggerExplicitTaskReconciliation_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminTriggerExplicitTaskReconciliationResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminTriggerExplicitTaskReconciliationResult(%+v)", *p)
-}
-
-type AuroraAdminTriggerImplicitTaskReconciliationArgs struct {
-}
-
-func NewAuroraAdminTriggerImplicitTaskReconciliationArgs() *AuroraAdminTriggerImplicitTaskReconciliationArgs {
-	return &AuroraAdminTriggerImplicitTaskReconciliationArgs{}
-}
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		if err := iprot.Skip(fieldTypeId); err != nil {
-			return err
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("triggerImplicitTaskReconciliation_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminTriggerImplicitTaskReconciliationArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminTriggerImplicitTaskReconciliationResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminTriggerImplicitTaskReconciliationResult() *AuroraAdminTriggerImplicitTaskReconciliationResult {
-	return &AuroraAdminTriggerImplicitTaskReconciliationResult{}
-}
-
-var AuroraAdminTriggerImplicitTaskReconciliationResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminTriggerImplicitTaskReconciliationResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("triggerImplicitTaskReconciliation_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminTriggerImplicitTaskReconciliationResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Query
-type AuroraAdminPruneTasksArgs struct {
-	Query *TaskQuery `thrift:"query,1" json:"query"`
-}
-
-func NewAuroraAdminPruneTasksArgs() *AuroraAdminPruneTasksArgs {
-	return &AuroraAdminPruneTasksArgs{}
-}
-
-var AuroraAdminPruneTasksArgs_Query_DEFAULT *TaskQuery
-
-func (p *AuroraAdminPruneTasksArgs) GetQuery() *TaskQuery {
-	if !p.IsSetQuery() {
-		return AuroraAdminPruneTasksArgs_Query_DEFAULT
-	}
-	return p.Query
-}
-func (p *AuroraAdminPruneTasksArgs) IsSetQuery() bool {
-	return p.Query != nil
-}
-
-func (p *AuroraAdminPruneTasksArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPruneTasksArgs) readField1(iprot thrift.TProtocol) error {
-	p.Query = &TaskQuery{}
-	if err := p.Query.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPruneTasksArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("pruneTasks_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPruneTasksArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err)
-	}
-	if err := p.Query.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraAdminPruneTasksArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminPruneTasksArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraAdminPruneTasksResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraAdminPruneTasksResult() *AuroraAdminPruneTasksResult {
-	return &AuroraAdminPruneTasksResult{}
-}
-
-var AuroraAdminPruneTasksResult_Success_DEFAULT *Response
-
-func (p *AuroraAdminPruneTasksResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraAdminPruneTasksResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraAdminPruneTasksResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraAdminPruneTasksResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPruneTasksResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPruneTasksResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("pruneTasks_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraAdminPruneTasksResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraAdminPruneTasksResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraAdminPruneTasksResult(%+v)", *p)
-}
diff --git a/gen-go/apache/aurora/auroraschedulermanager.go b/gen-go/apache/aurora/auroraschedulermanager.go
deleted file mode 100644
index a448b72..0000000
--- a/gen-go/apache/aurora/auroraschedulermanager.go
+++ /dev/null
@@ -1,5115 +0,0 @@
-// Autogenerated by Thrift Compiler (0.9.3)
-// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-
-package aurora
-
-import (
-	"bytes"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-)
-
-// (needed to ensure safety because of naive import list construction.)
-var _ = thrift.ZERO
-var _ = fmt.Printf
-var _ = bytes.Equal
-
-type AuroraSchedulerManager interface {
-	ReadOnlyScheduler
-
-	// Creates a new job.  The request will be denied if a job with the provided name already exists
-	// in the cluster.
-	//
-	// Parameters:
-	//  - Description
-	CreateJob(description *JobConfiguration) (r *Response, err error)
-	// Enters a job into the cron schedule, without actually starting the job.
-	// If the job is already present in the schedule, this will update the schedule entry with the new
-	// configuration.
-	//
-	// Parameters:
-	//  - Description
-	ScheduleCronJob(description *JobConfiguration) (r *Response, err error)
-	// Removes a job from the cron schedule. The request will be denied if the job was not previously
-	// scheduled with scheduleCronJob.
-	//
-	// Parameters:
-	//  - Job
-	DescheduleCronJob(job *JobKey) (r *Response, err error)
-	// Starts a cron job immediately.  The request will be denied if the specified job does not
-	// exist for the role account, or the job is not a cron job.
-	//
-	// Parameters:
-	//  - Job
-	StartCronJob(job *JobKey) (r *Response, err error)
-	// Restarts a batch of shards.
-	//
-	// Parameters:
-	//  - Job
-	//  - ShardIds
-	RestartShards(job *JobKey, shardIds map[int32]bool) (r *Response, err error)
-	// Initiates a kill on tasks.
-	//
-	// Parameters:
-	//  - Job
-	//  - Instances
-	//  - Message
-	KillTasks(job *JobKey, instances map[int32]bool, message string) (r *Response, err error)
-	// Adds new instances with the TaskConfig of the existing instance pointed by the key.
-	//
-	// Parameters:
-	//  - Key
-	//  - Count
-	AddInstances(key *InstanceKey, count int32) (r *Response, err error)
-	// Replaces the template (configuration) for the existing cron job.
-	// The cron job template (configuration) must exist for the call to succeed.
-	//
-	// Parameters:
-	//  - Config
-	ReplaceCronTemplate(config *JobConfiguration) (r *Response, err error)
-	// Starts update of the existing service job.
-	//
-	// Parameters:
-	//  - Request: A description of how to change the job.
-	//  - Message: A user-specified message to include with the induced job update state change.
-	StartJobUpdate(request *JobUpdateRequest, message string) (r *Response, err error)
-	// Pauses the specified job update. Can be resumed by resumeUpdate call.
-	//
-	// Parameters:
-	//  - Key: The update to pause.
-	//  - Message: A user-specified message to include with the induced job update state change.
-	PauseJobUpdate(key *JobUpdateKey, message string) (r *Response, err error)
-	// Resumes progress of a previously paused job update.
-	//
-	// Parameters:
-	//  - Key: The update to resume.
-	//  - Message: A user-specified message to include with the induced job update state change.
-	ResumeJobUpdate(key *JobUpdateKey, message string) (r *Response, err error)
-	// Permanently aborts the job update. Does not remove the update history.
-	//
-	// Parameters:
-	//  - Key: The update to abort.
-	//  - Message: A user-specified message to include with the induced job update state change.
-	AbortJobUpdate(key *JobUpdateKey, message string) (r *Response, err error)
-	// Rollbacks the specified active job update to the initial state.
-	//
-	// Parameters:
-	//  - Key: The update to rollback.
-	//  - Message: A user-specified message to include with the induced job update state change.
-	RollbackJobUpdate(key *JobUpdateKey, message string) (r *Response, err error)
-	// Allows progress of the job update in case blockIfNoPulsesAfterMs is specified in
-	// JobUpdateSettings. Unblocks progress if the update was previously blocked.
-	// Responds with ResponseCode.INVALID_REQUEST in case an unknown update key is specified.
-	//
-	// Parameters:
-	//  - Key
-	PulseJobUpdate(key *JobUpdateKey) (r *Response, err error)
-}
-
-type AuroraSchedulerManagerClient struct {
-	*ReadOnlySchedulerClient
-}
-
-func NewAuroraSchedulerManagerClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *AuroraSchedulerManagerClient {
-	return &AuroraSchedulerManagerClient{ReadOnlySchedulerClient: NewReadOnlySchedulerClientFactory(t, f)}
-}
-
-func NewAuroraSchedulerManagerClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *AuroraSchedulerManagerClient {
-	return &AuroraSchedulerManagerClient{ReadOnlySchedulerClient: NewReadOnlySchedulerClientProtocol(t, iprot, oprot)}
-}
-
-// Creates a new job.  The request will be denied if a job with the provided name already exists
-// in the cluster.
-//
-// Parameters:
-//  - Description
-func (p *AuroraSchedulerManagerClient) CreateJob(description *JobConfiguration) (r *Response, err error) {
-	if err = p.sendCreateJob(description); err != nil {
-		return
-	}
-	return p.recvCreateJob()
-}
-
-func (p *AuroraSchedulerManagerClient) sendCreateJob(description *JobConfiguration) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("createJob", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerCreateJobArgs{
-		Description: description,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvCreateJob() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "createJob" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "createJob failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "createJob failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error131 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error132 error
-		error132, err = error131.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error132
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "createJob failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerCreateJobResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Enters a job into the cron schedule, without actually starting the job.
-// If the job is already present in the schedule, this will update the schedule entry with the new
-// configuration.
-//
-// Parameters:
-//  - Description
-func (p *AuroraSchedulerManagerClient) ScheduleCronJob(description *JobConfiguration) (r *Response, err error) {
-	if err = p.sendScheduleCronJob(description); err != nil {
-		return
-	}
-	return p.recvScheduleCronJob()
-}
-
-func (p *AuroraSchedulerManagerClient) sendScheduleCronJob(description *JobConfiguration) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("scheduleCronJob", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerScheduleCronJobArgs{
-		Description: description,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvScheduleCronJob() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "scheduleCronJob" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "scheduleCronJob failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "scheduleCronJob failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error133 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error134 error
-		error134, err = error133.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error134
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "scheduleCronJob failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerScheduleCronJobResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Removes a job from the cron schedule. The request will be denied if the job was not previously
-// scheduled with scheduleCronJob.
-//
-// Parameters:
-//  - Job
-func (p *AuroraSchedulerManagerClient) DescheduleCronJob(job *JobKey) (r *Response, err error) {
-	if err = p.sendDescheduleCronJob(job); err != nil {
-		return
-	}
-	return p.recvDescheduleCronJob()
-}
-
-func (p *AuroraSchedulerManagerClient) sendDescheduleCronJob(job *JobKey) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("descheduleCronJob", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerDescheduleCronJobArgs{
-		Job: job,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvDescheduleCronJob() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "descheduleCronJob" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "descheduleCronJob failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "descheduleCronJob failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error135 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error136 error
-		error136, err = error135.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error136
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "descheduleCronJob failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerDescheduleCronJobResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Starts a cron job immediately.  The request will be denied if the specified job does not
-// exist for the role account, or the job is not a cron job.
-//
-// Parameters:
-//  - Job
-func (p *AuroraSchedulerManagerClient) StartCronJob(job *JobKey) (r *Response, err error) {
-	if err = p.sendStartCronJob(job); err != nil {
-		return
-	}
-	return p.recvStartCronJob()
-}
-
-func (p *AuroraSchedulerManagerClient) sendStartCronJob(job *JobKey) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("startCronJob", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerStartCronJobArgs{
-		Job: job,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvStartCronJob() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "startCronJob" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "startCronJob failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "startCronJob failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error137 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error138 error
-		error138, err = error137.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error138
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "startCronJob failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerStartCronJobResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Restarts a batch of shards.
-//
-// Parameters:
-//  - Job
-//  - ShardIds
-func (p *AuroraSchedulerManagerClient) RestartShards(job *JobKey, shardIds map[int32]bool) (r *Response, err error) {
-	if err = p.sendRestartShards(job, shardIds); err != nil {
-		return
-	}
-	return p.recvRestartShards()
-}
-
-func (p *AuroraSchedulerManagerClient) sendRestartShards(job *JobKey, shardIds map[int32]bool) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("restartShards", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerRestartShardsArgs{
-		Job:      job,
-		ShardIds: shardIds,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvRestartShards() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "restartShards" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "restartShards failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "restartShards failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error139 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error140 error
-		error140, err = error139.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error140
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "restartShards failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerRestartShardsResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Initiates a kill on tasks.
-//
-// Parameters:
-//  - Job
-//  - Instances
-//  - Message
-func (p *AuroraSchedulerManagerClient) KillTasks(job *JobKey, instances map[int32]bool, message string) (r *Response, err error) {
-	if err = p.sendKillTasks(job, instances, message); err != nil {
-		return
-	}
-	return p.recvKillTasks()
-}
-
-func (p *AuroraSchedulerManagerClient) sendKillTasks(job *JobKey, instances map[int32]bool, message string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("killTasks", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerKillTasksArgs{
-		Job:       job,
-		Instances: instances,
-		Message:   message,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvKillTasks() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "killTasks" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "killTasks failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "killTasks failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error141 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error142 error
-		error142, err = error141.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error142
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "killTasks failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerKillTasksResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Adds new instances with the TaskConfig of the existing instance pointed by the key.
-//
-// Parameters:
-//  - Key
-//  - Count
-func (p *AuroraSchedulerManagerClient) AddInstances(key *InstanceKey, count int32) (r *Response, err error) {
-	if err = p.sendAddInstances(key, count); err != nil {
-		return
-	}
-	return p.recvAddInstances()
-}
-
-func (p *AuroraSchedulerManagerClient) sendAddInstances(key *InstanceKey, count int32) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("addInstances", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerAddInstancesArgs{
-		Key:   key,
-		Count: count,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvAddInstances() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "addInstances" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "addInstances failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "addInstances failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error143 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error144 error
-		error144, err = error143.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error144
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "addInstances failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerAddInstancesResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Replaces the template (configuration) for the existing cron job.
-// The cron job template (configuration) must exist for the call to succeed.
-//
-// Parameters:
-//  - Config
-func (p *AuroraSchedulerManagerClient) ReplaceCronTemplate(config *JobConfiguration) (r *Response, err error) {
-	if err = p.sendReplaceCronTemplate(config); err != nil {
-		return
-	}
-	return p.recvReplaceCronTemplate()
-}
-
-func (p *AuroraSchedulerManagerClient) sendReplaceCronTemplate(config *JobConfiguration) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("replaceCronTemplate", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerReplaceCronTemplateArgs{
-		Config: config,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvReplaceCronTemplate() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "replaceCronTemplate" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "replaceCronTemplate failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "replaceCronTemplate failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error145 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error146 error
-		error146, err = error145.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error146
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "replaceCronTemplate failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerReplaceCronTemplateResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Starts update of the existing service job.
-//
-// Parameters:
-//  - Request: A description of how to change the job.
-//  - Message: A user-specified message to include with the induced job update state change.
-func (p *AuroraSchedulerManagerClient) StartJobUpdate(request *JobUpdateRequest, message string) (r *Response, err error) {
-	if err = p.sendStartJobUpdate(request, message); err != nil {
-		return
-	}
-	return p.recvStartJobUpdate()
-}
-
-func (p *AuroraSchedulerManagerClient) sendStartJobUpdate(request *JobUpdateRequest, message string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("startJobUpdate", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerStartJobUpdateArgs{
-		Request: request,
-		Message: message,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvStartJobUpdate() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "startJobUpdate" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "startJobUpdate failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "startJobUpdate failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error147 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error148 error
-		error148, err = error147.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error148
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "startJobUpdate failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerStartJobUpdateResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Pauses the specified job update. Can be resumed by resumeUpdate call.
-//
-// Parameters:
-//  - Key: The update to pause.
-//  - Message: A user-specified message to include with the induced job update state change.
-func (p *AuroraSchedulerManagerClient) PauseJobUpdate(key *JobUpdateKey, message string) (r *Response, err error) {
-	if err = p.sendPauseJobUpdate(key, message); err != nil {
-		return
-	}
-	return p.recvPauseJobUpdate()
-}
-
-func (p *AuroraSchedulerManagerClient) sendPauseJobUpdate(key *JobUpdateKey, message string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("pauseJobUpdate", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerPauseJobUpdateArgs{
-		Key:     key,
-		Message: message,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvPauseJobUpdate() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "pauseJobUpdate" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "pauseJobUpdate failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "pauseJobUpdate failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error149 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error150 error
-		error150, err = error149.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error150
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "pauseJobUpdate failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerPauseJobUpdateResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Resumes progress of a previously paused job update.
-//
-// Parameters:
-//  - Key: The update to resume.
-//  - Message: A user-specified message to include with the induced job update state change.
-func (p *AuroraSchedulerManagerClient) ResumeJobUpdate(key *JobUpdateKey, message string) (r *Response, err error) {
-	if err = p.sendResumeJobUpdate(key, message); err != nil {
-		return
-	}
-	return p.recvResumeJobUpdate()
-}
-
-func (p *AuroraSchedulerManagerClient) sendResumeJobUpdate(key *JobUpdateKey, message string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("resumeJobUpdate", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerResumeJobUpdateArgs{
-		Key:     key,
-		Message: message,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvResumeJobUpdate() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "resumeJobUpdate" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "resumeJobUpdate failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "resumeJobUpdate failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error151 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error152 error
-		error152, err = error151.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error152
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "resumeJobUpdate failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerResumeJobUpdateResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Permanently aborts the job update. Does not remove the update history.
-//
-// Parameters:
-//  - Key: The update to abort.
-//  - Message: A user-specified message to include with the induced job update state change.
-func (p *AuroraSchedulerManagerClient) AbortJobUpdate(key *JobUpdateKey, message string) (r *Response, err error) {
-	if err = p.sendAbortJobUpdate(key, message); err != nil {
-		return
-	}
-	return p.recvAbortJobUpdate()
-}
-
-func (p *AuroraSchedulerManagerClient) sendAbortJobUpdate(key *JobUpdateKey, message string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("abortJobUpdate", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerAbortJobUpdateArgs{
-		Key:     key,
-		Message: message,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvAbortJobUpdate() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "abortJobUpdate" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "abortJobUpdate failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "abortJobUpdate failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error153 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error154 error
-		error154, err = error153.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error154
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "abortJobUpdate failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerAbortJobUpdateResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Rollbacks the specified active job update to the initial state.
-//
-// Parameters:
-//  - Key: The update to rollback.
-//  - Message: A user-specified message to include with the induced job update state change.
-func (p *AuroraSchedulerManagerClient) RollbackJobUpdate(key *JobUpdateKey, message string) (r *Response, err error) {
-	if err = p.sendRollbackJobUpdate(key, message); err != nil {
-		return
-	}
-	return p.recvRollbackJobUpdate()
-}
-
-func (p *AuroraSchedulerManagerClient) sendRollbackJobUpdate(key *JobUpdateKey, message string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("rollbackJobUpdate", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerRollbackJobUpdateArgs{
-		Key:     key,
-		Message: message,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvRollbackJobUpdate() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "rollbackJobUpdate" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "rollbackJobUpdate failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "rollbackJobUpdate failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error155 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error156 error
-		error156, err = error155.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error156
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "rollbackJobUpdate failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerRollbackJobUpdateResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Allows progress of the job update in case blockIfNoPulsesAfterMs is specified in
-// JobUpdateSettings. Unblocks progress if the update was previously blocked.
-// Responds with ResponseCode.INVALID_REQUEST in case an unknown update key is specified.
-//
-// Parameters:
-//  - Key
-func (p *AuroraSchedulerManagerClient) PulseJobUpdate(key *JobUpdateKey) (r *Response, err error) {
-	if err = p.sendPulseJobUpdate(key); err != nil {
-		return
-	}
-	return p.recvPulseJobUpdate()
-}
-
-func (p *AuroraSchedulerManagerClient) sendPulseJobUpdate(key *JobUpdateKey) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("pulseJobUpdate", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := AuroraSchedulerManagerPulseJobUpdateArgs{
-		Key: key,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *AuroraSchedulerManagerClient) recvPulseJobUpdate() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "pulseJobUpdate" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "pulseJobUpdate failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "pulseJobUpdate failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error157 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error158 error
-		error158, err = error157.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error158
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "pulseJobUpdate failed: invalid message type")
-		return
-	}
-	result := AuroraSchedulerManagerPulseJobUpdateResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-type AuroraSchedulerManagerProcessor struct {
-	*ReadOnlySchedulerProcessor
-}
-
-func NewAuroraSchedulerManagerProcessor(handler AuroraSchedulerManager) *AuroraSchedulerManagerProcessor {
-	self159 := &AuroraSchedulerManagerProcessor{NewReadOnlySchedulerProcessor(handler)}
-	self159.AddToProcessorMap("createJob", &auroraSchedulerManagerProcessorCreateJob{handler: handler})
-	self159.AddToProcessorMap("scheduleCronJob", &auroraSchedulerManagerProcessorScheduleCronJob{handler: handler})
-	self159.AddToProcessorMap("descheduleCronJob", &auroraSchedulerManagerProcessorDescheduleCronJob{handler: handler})
-	self159.AddToProcessorMap("startCronJob", &auroraSchedulerManagerProcessorStartCronJob{handler: handler})
-	self159.AddToProcessorMap("restartShards", &auroraSchedulerManagerProcessorRestartShards{handler: handler})
-	self159.AddToProcessorMap("killTasks", &auroraSchedulerManagerProcessorKillTasks{handler: handler})
-	self159.AddToProcessorMap("addInstances", &auroraSchedulerManagerProcessorAddInstances{handler: handler})
-	self159.AddToProcessorMap("replaceCronTemplate", &auroraSchedulerManagerProcessorReplaceCronTemplate{handler: handler})
-	self159.AddToProcessorMap("startJobUpdate", &auroraSchedulerManagerProcessorStartJobUpdate{handler: handler})
-	self159.AddToProcessorMap("pauseJobUpdate", &auroraSchedulerManagerProcessorPauseJobUpdate{handler: handler})
-	self159.AddToProcessorMap("resumeJobUpdate", &auroraSchedulerManagerProcessorResumeJobUpdate{handler: handler})
-	self159.AddToProcessorMap("abortJobUpdate", &auroraSchedulerManagerProcessorAbortJobUpdate{handler: handler})
-	self159.AddToProcessorMap("rollbackJobUpdate", &auroraSchedulerManagerProcessorRollbackJobUpdate{handler: handler})
-	self159.AddToProcessorMap("pulseJobUpdate", &auroraSchedulerManagerProcessorPulseJobUpdate{handler: handler})
-	return self159
-}
-
-type auroraSchedulerManagerProcessorCreateJob struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorCreateJob) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerCreateJobArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("createJob", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerCreateJobResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.CreateJob(args.Description); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing createJob: "+err2.Error())
-		oprot.WriteMessageBegin("createJob", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("createJob", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorScheduleCronJob struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorScheduleCronJob) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerScheduleCronJobArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("scheduleCronJob", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerScheduleCronJobResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.ScheduleCronJob(args.Description); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing scheduleCronJob: "+err2.Error())
-		oprot.WriteMessageBegin("scheduleCronJob", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("scheduleCronJob", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorDescheduleCronJob struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorDescheduleCronJob) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerDescheduleCronJobArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("descheduleCronJob", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerDescheduleCronJobResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.DescheduleCronJob(args.Job); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing descheduleCronJob: "+err2.Error())
-		oprot.WriteMessageBegin("descheduleCronJob", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("descheduleCronJob", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorStartCronJob struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorStartCronJob) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerStartCronJobArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("startCronJob", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerStartCronJobResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.StartCronJob(args.Job); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing startCronJob: "+err2.Error())
-		oprot.WriteMessageBegin("startCronJob", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("startCronJob", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorRestartShards struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorRestartShards) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerRestartShardsArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("restartShards", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerRestartShardsResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.RestartShards(args.Job, args.ShardIds); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing restartShards: "+err2.Error())
-		oprot.WriteMessageBegin("restartShards", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("restartShards", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorKillTasks struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorKillTasks) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerKillTasksArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("killTasks", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerKillTasksResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.KillTasks(args.Job, args.Instances, args.Message); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing killTasks: "+err2.Error())
-		oprot.WriteMessageBegin("killTasks", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("killTasks", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorAddInstances struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorAddInstances) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerAddInstancesArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("addInstances", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerAddInstancesResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.AddInstances(args.Key, args.Count); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing addInstances: "+err2.Error())
-		oprot.WriteMessageBegin("addInstances", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("addInstances", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorReplaceCronTemplate struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorReplaceCronTemplate) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerReplaceCronTemplateArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("replaceCronTemplate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerReplaceCronTemplateResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.ReplaceCronTemplate(args.Config); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing replaceCronTemplate: "+err2.Error())
-		oprot.WriteMessageBegin("replaceCronTemplate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("replaceCronTemplate", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorStartJobUpdate struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorStartJobUpdate) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerStartJobUpdateArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("startJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerStartJobUpdateResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.StartJobUpdate(args.Request, args.Message); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing startJobUpdate: "+err2.Error())
-		oprot.WriteMessageBegin("startJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("startJobUpdate", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorPauseJobUpdate struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorPauseJobUpdate) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerPauseJobUpdateArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("pauseJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerPauseJobUpdateResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.PauseJobUpdate(args.Key, args.Message); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing pauseJobUpdate: "+err2.Error())
-		oprot.WriteMessageBegin("pauseJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("pauseJobUpdate", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorResumeJobUpdate struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorResumeJobUpdate) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerResumeJobUpdateArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("resumeJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerResumeJobUpdateResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.ResumeJobUpdate(args.Key, args.Message); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing resumeJobUpdate: "+err2.Error())
-		oprot.WriteMessageBegin("resumeJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("resumeJobUpdate", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorAbortJobUpdate struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorAbortJobUpdate) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerAbortJobUpdateArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("abortJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerAbortJobUpdateResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.AbortJobUpdate(args.Key, args.Message); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing abortJobUpdate: "+err2.Error())
-		oprot.WriteMessageBegin("abortJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("abortJobUpdate", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorRollbackJobUpdate struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorRollbackJobUpdate) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerRollbackJobUpdateArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("rollbackJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerRollbackJobUpdateResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.RollbackJobUpdate(args.Key, args.Message); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing rollbackJobUpdate: "+err2.Error())
-		oprot.WriteMessageBegin("rollbackJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("rollbackJobUpdate", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type auroraSchedulerManagerProcessorPulseJobUpdate struct {
-	handler AuroraSchedulerManager
-}
-
-func (p *auroraSchedulerManagerProcessorPulseJobUpdate) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := AuroraSchedulerManagerPulseJobUpdateArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("pulseJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := AuroraSchedulerManagerPulseJobUpdateResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.PulseJobUpdate(args.Key); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing pulseJobUpdate: "+err2.Error())
-		oprot.WriteMessageBegin("pulseJobUpdate", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("pulseJobUpdate", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-// HELPER FUNCTIONS AND STRUCTURES
-
-// Attributes:
-//  - Description
-type AuroraSchedulerManagerCreateJobArgs struct {
-	Description *JobConfiguration `thrift:"description,1" json:"description"`
-}
-
-func NewAuroraSchedulerManagerCreateJobArgs() *AuroraSchedulerManagerCreateJobArgs {
-	return &AuroraSchedulerManagerCreateJobArgs{}
-}
-
-var AuroraSchedulerManagerCreateJobArgs_Description_DEFAULT *JobConfiguration
-
-func (p *AuroraSchedulerManagerCreateJobArgs) GetDescription() *JobConfiguration {
-	if !p.IsSetDescription() {
-		return AuroraSchedulerManagerCreateJobArgs_Description_DEFAULT
-	}
-	return p.Description
-}
-func (p *AuroraSchedulerManagerCreateJobArgs) IsSetDescription() bool {
-	return p.Description != nil
-}
-
-func (p *AuroraSchedulerManagerCreateJobArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerCreateJobArgs) readField1(iprot thrift.TProtocol) error {
-	p.Description = &JobConfiguration{}
-	if err := p.Description.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Description), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerCreateJobArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("createJob_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerCreateJobArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("description", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:description: ", p), err)
-	}
-	if err := p.Description.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Description), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:description: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerCreateJobArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerCreateJobArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerCreateJobResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerCreateJobResult() *AuroraSchedulerManagerCreateJobResult {
-	return &AuroraSchedulerManagerCreateJobResult{}
-}
-
-var AuroraSchedulerManagerCreateJobResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerCreateJobResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerCreateJobResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerCreateJobResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerCreateJobResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerCreateJobResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerCreateJobResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("createJob_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerCreateJobResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerCreateJobResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerCreateJobResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Description
-type AuroraSchedulerManagerScheduleCronJobArgs struct {
-	Description *JobConfiguration `thrift:"description,1" json:"description"`
-}
-
-func NewAuroraSchedulerManagerScheduleCronJobArgs() *AuroraSchedulerManagerScheduleCronJobArgs {
-	return &AuroraSchedulerManagerScheduleCronJobArgs{}
-}
-
-var AuroraSchedulerManagerScheduleCronJobArgs_Description_DEFAULT *JobConfiguration
-
-func (p *AuroraSchedulerManagerScheduleCronJobArgs) GetDescription() *JobConfiguration {
-	if !p.IsSetDescription() {
-		return AuroraSchedulerManagerScheduleCronJobArgs_Description_DEFAULT
-	}
-	return p.Description
-}
-func (p *AuroraSchedulerManagerScheduleCronJobArgs) IsSetDescription() bool {
-	return p.Description != nil
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobArgs) readField1(iprot thrift.TProtocol) error {
-	p.Description = &JobConfiguration{}
-	if err := p.Description.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Description), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("scheduleCronJob_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("description", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:description: ", p), err)
-	}
-	if err := p.Description.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Description), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:description: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerScheduleCronJobArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerScheduleCronJobResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerScheduleCronJobResult() *AuroraSchedulerManagerScheduleCronJobResult {
-	return &AuroraSchedulerManagerScheduleCronJobResult{}
-}
-
-var AuroraSchedulerManagerScheduleCronJobResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerScheduleCronJobResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerScheduleCronJobResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerScheduleCronJobResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("scheduleCronJob_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerScheduleCronJobResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerScheduleCronJobResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Job
-type AuroraSchedulerManagerDescheduleCronJobArgs struct {
-	// unused fields # 1 to 3
-	Job *JobKey `thrift:"job,4" json:"job"`
-}
-
-func NewAuroraSchedulerManagerDescheduleCronJobArgs() *AuroraSchedulerManagerDescheduleCronJobArgs {
-	return &AuroraSchedulerManagerDescheduleCronJobArgs{}
-}
-
-var AuroraSchedulerManagerDescheduleCronJobArgs_Job_DEFAULT *JobKey
-
-func (p *AuroraSchedulerManagerDescheduleCronJobArgs) GetJob() *JobKey {
-	if !p.IsSetJob() {
-		return AuroraSchedulerManagerDescheduleCronJobArgs_Job_DEFAULT
-	}
-	return p.Job
-}
-func (p *AuroraSchedulerManagerDescheduleCronJobArgs) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobArgs) readField4(iprot thrift.TProtocol) error {
-	p.Job = &JobKey{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("descheduleCronJob_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobArgs) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:job: ", p), err)
-	}
-	if err := p.Job.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:job: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerDescheduleCronJobArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerDescheduleCronJobResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerDescheduleCronJobResult() *AuroraSchedulerManagerDescheduleCronJobResult {
-	return &AuroraSchedulerManagerDescheduleCronJobResult{}
-}
-
-var AuroraSchedulerManagerDescheduleCronJobResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerDescheduleCronJobResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerDescheduleCronJobResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerDescheduleCronJobResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("descheduleCronJob_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerDescheduleCronJobResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerDescheduleCronJobResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Job
-type AuroraSchedulerManagerStartCronJobArgs struct {
-	// unused fields # 1 to 3
-	Job *JobKey `thrift:"job,4" json:"job"`
-}
-
-func NewAuroraSchedulerManagerStartCronJobArgs() *AuroraSchedulerManagerStartCronJobArgs {
-	return &AuroraSchedulerManagerStartCronJobArgs{}
-}
-
-var AuroraSchedulerManagerStartCronJobArgs_Job_DEFAULT *JobKey
-
-func (p *AuroraSchedulerManagerStartCronJobArgs) GetJob() *JobKey {
-	if !p.IsSetJob() {
-		return AuroraSchedulerManagerStartCronJobArgs_Job_DEFAULT
-	}
-	return p.Job
-}
-func (p *AuroraSchedulerManagerStartCronJobArgs) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *AuroraSchedulerManagerStartCronJobArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartCronJobArgs) readField4(iprot thrift.TProtocol) error {
-	p.Job = &JobKey{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartCronJobArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("startCronJob_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartCronJobArgs) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:job: ", p), err)
-	}
-	if err := p.Job.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:job: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerStartCronJobArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerStartCronJobArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerStartCronJobResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerStartCronJobResult() *AuroraSchedulerManagerStartCronJobResult {
-	return &AuroraSchedulerManagerStartCronJobResult{}
-}
-
-var AuroraSchedulerManagerStartCronJobResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerStartCronJobResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerStartCronJobResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerStartCronJobResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerStartCronJobResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartCronJobResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartCronJobResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("startCronJob_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartCronJobResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerStartCronJobResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerStartCronJobResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Job
-//  - ShardIds
-type AuroraSchedulerManagerRestartShardsArgs struct {
-	// unused fields # 1 to 2
-	ShardIds map[int32]bool `thrift:"shardIds,3" json:"shardIds"`
-	// unused field # 4
-	Job *JobKey `thrift:"job,5" json:"job"`
-}
-
-func NewAuroraSchedulerManagerRestartShardsArgs() *AuroraSchedulerManagerRestartShardsArgs {
-	return &AuroraSchedulerManagerRestartShardsArgs{}
-}
-
-var AuroraSchedulerManagerRestartShardsArgs_Job_DEFAULT *JobKey
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) GetJob() *JobKey {
-	if !p.IsSetJob() {
-		return AuroraSchedulerManagerRestartShardsArgs_Job_DEFAULT
-	}
-	return p.Job
-}
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) GetShardIds() map[int32]bool {
-	return p.ShardIds
-}
-func (p *AuroraSchedulerManagerRestartShardsArgs) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) readField5(iprot thrift.TProtocol) error {
-	p.Job = &JobKey{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) readField3(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[int32]bool, size)
-	p.ShardIds = tSet
-	for i := 0; i < size; i++ {
-		var _elem160 int32
-		if v, err := iprot.ReadI32(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem160 = v
-		}
-		p.ShardIds[_elem160] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("restartShards_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("shardIds", thrift.SET, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:shardIds: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.I32, len(p.ShardIds)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.ShardIds {
-		if err := oprot.WriteI32(int32(v)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:shardIds: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:job: ", p), err)
-	}
-	if err := p.Job.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:job: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerRestartShardsArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerRestartShardsArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerRestartShardsResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerRestartShardsResult() *AuroraSchedulerManagerRestartShardsResult {
-	return &AuroraSchedulerManagerRestartShardsResult{}
-}
-
-var AuroraSchedulerManagerRestartShardsResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerRestartShardsResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerRestartShardsResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerRestartShardsResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("restartShards_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRestartShardsResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerRestartShardsResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerRestartShardsResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Job
-//  - Instances
-//  - Message
-type AuroraSchedulerManagerKillTasksArgs struct {
-	// unused fields # 1 to 3
-	Job       *JobKey        `thrift:"job,4" json:"job"`
-	Instances map[int32]bool `thrift:"instances,5" json:"instances"`
-	Message   string         `thrift:"message,6" json:"message"`
-}
-
-func NewAuroraSchedulerManagerKillTasksArgs() *AuroraSchedulerManagerKillTasksArgs {
-	return &AuroraSchedulerManagerKillTasksArgs{}
-}
-
-var AuroraSchedulerManagerKillTasksArgs_Job_DEFAULT *JobKey
-
-func (p *AuroraSchedulerManagerKillTasksArgs) GetJob() *JobKey {
-	if !p.IsSetJob() {
-		return AuroraSchedulerManagerKillTasksArgs_Job_DEFAULT
-	}
-	return p.Job
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) GetInstances() map[int32]bool {
-	return p.Instances
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) GetMessage() string {
-	return p.Message
-}
-func (p *AuroraSchedulerManagerKillTasksArgs) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) readField4(iprot thrift.TProtocol) error {
-	p.Job = &JobKey{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) readField5(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[int32]bool, size)
-	p.Instances = tSet
-	for i := 0; i < size; i++ {
-		var _elem161 int32
-		if v, err := iprot.ReadI32(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem161 = v
-		}
-		p.Instances[_elem161] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) readField6(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 6: ", err)
-	} else {
-		p.Message = v
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("killTasks_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:job: ", p), err)
-	}
-	if err := p.Job.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:job: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instances", thrift.SET, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:instances: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.I32, len(p.Instances)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Instances {
-		if err := oprot.WriteI32(int32(v)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:instances: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) writeField6(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("message", thrift.STRING, 6); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:message: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Message)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.message (6) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:message: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerKillTasksArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerKillTasksArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerKillTasksResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerKillTasksResult() *AuroraSchedulerManagerKillTasksResult {
-	return &AuroraSchedulerManagerKillTasksResult{}
-}
-
-var AuroraSchedulerManagerKillTasksResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerKillTasksResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerKillTasksResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerKillTasksResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("killTasks_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerKillTasksResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerKillTasksResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerKillTasksResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Key
-//  - Count
-type AuroraSchedulerManagerAddInstancesArgs struct {
-	// unused fields # 1 to 2
-	Key   *InstanceKey `thrift:"key,3" json:"key"`
-	Count int32        `thrift:"count,4" json:"count"`
-}
-
-func NewAuroraSchedulerManagerAddInstancesArgs() *AuroraSchedulerManagerAddInstancesArgs {
-	return &AuroraSchedulerManagerAddInstancesArgs{}
-}
-
-var AuroraSchedulerManagerAddInstancesArgs_Key_DEFAULT *InstanceKey
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) GetKey() *InstanceKey {
-	if !p.IsSetKey() {
-		return AuroraSchedulerManagerAddInstancesArgs_Key_DEFAULT
-	}
-	return p.Key
-}
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) GetCount() int32 {
-	return p.Count
-}
-func (p *AuroraSchedulerManagerAddInstancesArgs) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) readField3(iprot thrift.TProtocol) error {
-	p.Key = &InstanceKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.Count = v
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("addInstances_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:key: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("count", thrift.I32, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:count: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Count)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.count (4) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:count: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerAddInstancesArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerAddInstancesArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerAddInstancesResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerAddInstancesResult() *AuroraSchedulerManagerAddInstancesResult {
-	return &AuroraSchedulerManagerAddInstancesResult{}
-}
-
-var AuroraSchedulerManagerAddInstancesResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerAddInstancesResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerAddInstancesResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerAddInstancesResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("addInstances_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAddInstancesResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerAddInstancesResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerAddInstancesResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Config
-type AuroraSchedulerManagerReplaceCronTemplateArgs struct {
-	Config *JobConfiguration `thrift:"config,1" json:"config"`
-}
-
-func NewAuroraSchedulerManagerReplaceCronTemplateArgs() *AuroraSchedulerManagerReplaceCronTemplateArgs {
-	return &AuroraSchedulerManagerReplaceCronTemplateArgs{}
-}
-
-var AuroraSchedulerManagerReplaceCronTemplateArgs_Config_DEFAULT *JobConfiguration
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) GetConfig() *JobConfiguration {
-	if !p.IsSetConfig() {
-		return AuroraSchedulerManagerReplaceCronTemplateArgs_Config_DEFAULT
-	}
-	return p.Config
-}
-func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) IsSetConfig() bool {
-	return p.Config != nil
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) readField1(iprot thrift.TProtocol) error {
-	p.Config = &JobConfiguration{}
-	if err := p.Config.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Config), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("replaceCronTemplate_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("config", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:config: ", p), err)
-	}
-	if err := p.Config.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Config), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:config: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerReplaceCronTemplateArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerReplaceCronTemplateResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerReplaceCronTemplateResult() *AuroraSchedulerManagerReplaceCronTemplateResult {
-	return &AuroraSchedulerManagerReplaceCronTemplateResult{}
-}
-
-var AuroraSchedulerManagerReplaceCronTemplateResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerReplaceCronTemplateResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerReplaceCronTemplateResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("replaceCronTemplate_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerReplaceCronTemplateResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerReplaceCronTemplateResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Request: A description of how to change the job.
-//  - Message: A user-specified message to include with the induced job update state change.
-type AuroraSchedulerManagerStartJobUpdateArgs struct {
-	Request *JobUpdateRequest `thrift:"request,1" json:"request"`
-	// unused field # 2
-	Message string `thrift:"message,3" json:"message"`
-}
-
-func NewAuroraSchedulerManagerStartJobUpdateArgs() *AuroraSchedulerManagerStartJobUpdateArgs {
-	return &AuroraSchedulerManagerStartJobUpdateArgs{}
-}
-
-var AuroraSchedulerManagerStartJobUpdateArgs_Request_DEFAULT *JobUpdateRequest
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) GetRequest() *JobUpdateRequest {
-	if !p.IsSetRequest() {
-		return AuroraSchedulerManagerStartJobUpdateArgs_Request_DEFAULT
-	}
-	return p.Request
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) GetMessage() string {
-	return p.Message
-}
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) IsSetRequest() bool {
-	return p.Request != nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) readField1(iprot thrift.TProtocol) error {
-	p.Request = &JobUpdateRequest{}
-	if err := p.Request.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Request), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Message = v
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("startJobUpdate_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:request: ", p), err)
-	}
-	if err := p.Request.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Request), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:request: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Message)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerStartJobUpdateArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerStartJobUpdateResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerStartJobUpdateResult() *AuroraSchedulerManagerStartJobUpdateResult {
-	return &AuroraSchedulerManagerStartJobUpdateResult{}
-}
-
-var AuroraSchedulerManagerStartJobUpdateResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerStartJobUpdateResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerStartJobUpdateResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerStartJobUpdateResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("startJobUpdate_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerStartJobUpdateResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerStartJobUpdateResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Key: The update to pause.
-//  - Message: A user-specified message to include with the induced job update state change.
-type AuroraSchedulerManagerPauseJobUpdateArgs struct {
-	Key *JobUpdateKey `thrift:"key,1" json:"key"`
-	// unused field # 2
-	Message string `thrift:"message,3" json:"message"`
-}
-
-func NewAuroraSchedulerManagerPauseJobUpdateArgs() *AuroraSchedulerManagerPauseJobUpdateArgs {
-	return &AuroraSchedulerManagerPauseJobUpdateArgs{}
-}
-
-var AuroraSchedulerManagerPauseJobUpdateArgs_Key_DEFAULT *JobUpdateKey
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) GetKey() *JobUpdateKey {
-	if !p.IsSetKey() {
-		return AuroraSchedulerManagerPauseJobUpdateArgs_Key_DEFAULT
-	}
-	return p.Key
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) GetMessage() string {
-	return p.Message
-}
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) readField1(iprot thrift.TProtocol) error {
-	p.Key = &JobUpdateKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Message = v
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("pauseJobUpdate_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Message)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerPauseJobUpdateArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerPauseJobUpdateResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerPauseJobUpdateResult() *AuroraSchedulerManagerPauseJobUpdateResult {
-	return &AuroraSchedulerManagerPauseJobUpdateResult{}
-}
-
-var AuroraSchedulerManagerPauseJobUpdateResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerPauseJobUpdateResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerPauseJobUpdateResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerPauseJobUpdateResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("pauseJobUpdate_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerPauseJobUpdateResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerPauseJobUpdateResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Key: The update to resume.
-//  - Message: A user-specified message to include with the induced job update state change.
-type AuroraSchedulerManagerResumeJobUpdateArgs struct {
-	Key *JobUpdateKey `thrift:"key,1" json:"key"`
-	// unused field # 2
-	Message string `thrift:"message,3" json:"message"`
-}
-
-func NewAuroraSchedulerManagerResumeJobUpdateArgs() *AuroraSchedulerManagerResumeJobUpdateArgs {
-	return &AuroraSchedulerManagerResumeJobUpdateArgs{}
-}
-
-var AuroraSchedulerManagerResumeJobUpdateArgs_Key_DEFAULT *JobUpdateKey
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) GetKey() *JobUpdateKey {
-	if !p.IsSetKey() {
-		return AuroraSchedulerManagerResumeJobUpdateArgs_Key_DEFAULT
-	}
-	return p.Key
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) GetMessage() string {
-	return p.Message
-}
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) readField1(iprot thrift.TProtocol) error {
-	p.Key = &JobUpdateKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Message = v
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("resumeJobUpdate_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Message)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerResumeJobUpdateArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerResumeJobUpdateResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerResumeJobUpdateResult() *AuroraSchedulerManagerResumeJobUpdateResult {
-	return &AuroraSchedulerManagerResumeJobUpdateResult{}
-}
-
-var AuroraSchedulerManagerResumeJobUpdateResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerResumeJobUpdateResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerResumeJobUpdateResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerResumeJobUpdateResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("resumeJobUpdate_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerResumeJobUpdateResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerResumeJobUpdateResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Key: The update to abort.
-//  - Message: A user-specified message to include with the induced job update state change.
-type AuroraSchedulerManagerAbortJobUpdateArgs struct {
-	Key *JobUpdateKey `thrift:"key,1" json:"key"`
-	// unused field # 2
-	Message string `thrift:"message,3" json:"message"`
-}
-
-func NewAuroraSchedulerManagerAbortJobUpdateArgs() *AuroraSchedulerManagerAbortJobUpdateArgs {
-	return &AuroraSchedulerManagerAbortJobUpdateArgs{}
-}
-
-var AuroraSchedulerManagerAbortJobUpdateArgs_Key_DEFAULT *JobUpdateKey
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) GetKey() *JobUpdateKey {
-	if !p.IsSetKey() {
-		return AuroraSchedulerManagerAbortJobUpdateArgs_Key_DEFAULT
-	}
-	return p.Key
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) GetMessage() string {
-	return p.Message
-}
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) readField1(iprot thrift.TProtocol) error {
-	p.Key = &JobUpdateKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Message = v
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("abortJobUpdate_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Message)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerAbortJobUpdateArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerAbortJobUpdateResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerAbortJobUpdateResult() *AuroraSchedulerManagerAbortJobUpdateResult {
-	return &AuroraSchedulerManagerAbortJobUpdateResult{}
-}
-
-var AuroraSchedulerManagerAbortJobUpdateResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerAbortJobUpdateResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerAbortJobUpdateResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerAbortJobUpdateResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("abortJobUpdate_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerAbortJobUpdateResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerAbortJobUpdateResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Key: The update to rollback.
-//  - Message: A user-specified message to include with the induced job update state change.
-type AuroraSchedulerManagerRollbackJobUpdateArgs struct {
-	Key     *JobUpdateKey `thrift:"key,1" json:"key"`
-	Message string        `thrift:"message,2" json:"message"`
-}
-
-func NewAuroraSchedulerManagerRollbackJobUpdateArgs() *AuroraSchedulerManagerRollbackJobUpdateArgs {
-	return &AuroraSchedulerManagerRollbackJobUpdateArgs{}
-}
-
-var AuroraSchedulerManagerRollbackJobUpdateArgs_Key_DEFAULT *JobUpdateKey
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) GetKey() *JobUpdateKey {
-	if !p.IsSetKey() {
-		return AuroraSchedulerManagerRollbackJobUpdateArgs_Key_DEFAULT
-	}
-	return p.Key
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) GetMessage() string {
-	return p.Message
-}
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) readField1(iprot thrift.TProtocol) error {
-	p.Key = &JobUpdateKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Message = v
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("rollbackJobUpdate_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("message", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:message: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Message)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.message (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:message: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerRollbackJobUpdateArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerRollbackJobUpdateResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerRollbackJobUpdateResult() *AuroraSchedulerManagerRollbackJobUpdateResult {
-	return &AuroraSchedulerManagerRollbackJobUpdateResult{}
-}
-
-var AuroraSchedulerManagerRollbackJobUpdateResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerRollbackJobUpdateResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerRollbackJobUpdateResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("rollbackJobUpdate_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerRollbackJobUpdateResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerRollbackJobUpdateResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Key
-type AuroraSchedulerManagerPulseJobUpdateArgs struct {
-	Key *JobUpdateKey `thrift:"key,1" json:"key"`
-}
-
-func NewAuroraSchedulerManagerPulseJobUpdateArgs() *AuroraSchedulerManagerPulseJobUpdateArgs {
-	return &AuroraSchedulerManagerPulseJobUpdateArgs{}
-}
-
-var AuroraSchedulerManagerPulseJobUpdateArgs_Key_DEFAULT *JobUpdateKey
-
-func (p *AuroraSchedulerManagerPulseJobUpdateArgs) GetKey() *JobUpdateKey {
-	if !p.IsSetKey() {
-		return AuroraSchedulerManagerPulseJobUpdateArgs_Key_DEFAULT
-	}
-	return p.Key
-}
-func (p *AuroraSchedulerManagerPulseJobUpdateArgs) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateArgs) readField1(iprot thrift.TProtocol) error {
-	p.Key = &JobUpdateKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("pulseJobUpdate_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerPulseJobUpdateArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type AuroraSchedulerManagerPulseJobUpdateResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewAuroraSchedulerManagerPulseJobUpdateResult() *AuroraSchedulerManagerPulseJobUpdateResult {
-	return &AuroraSchedulerManagerPulseJobUpdateResult{}
-}
-
-var AuroraSchedulerManagerPulseJobUpdateResult_Success_DEFAULT *Response
-
-func (p *AuroraSchedulerManagerPulseJobUpdateResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return AuroraSchedulerManagerPulseJobUpdateResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *AuroraSchedulerManagerPulseJobUpdateResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("pulseJobUpdate_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *AuroraSchedulerManagerPulseJobUpdateResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AuroraSchedulerManagerPulseJobUpdateResult(%+v)", *p)
-}
diff --git a/gen-go/apache/aurora/constants.go b/gen-go/apache/aurora/constants.go
deleted file mode 100644
index 9284ff5..0000000
--- a/gen-go/apache/aurora/constants.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Autogenerated by Thrift Compiler (0.9.3)
-// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-
-package aurora
-
-import (
-	"bytes"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-)
-
-// (needed to ensure safety because of naive import list construction.)
-var _ = thrift.ZERO
-var _ = fmt.Printf
-var _ = bytes.Equal
-
-const AURORA_EXECUTOR_NAME = "AuroraExecutor"
-
-var ACTIVE_STATES map[ScheduleStatus]bool
-var SLAVE_ASSIGNED_STATES map[ScheduleStatus]bool
-var LIVE_STATES map[ScheduleStatus]bool
-var TERMINAL_STATES map[ScheduleStatus]bool
-
-const GOOD_IDENTIFIER_PATTERN = "^[\\w\\-\\.]+$"
-const GOOD_IDENTIFIER_PATTERN_JVM = "^[\\w\\-\\.]+$"
-const GOOD_IDENTIFIER_PATTERN_PYTHON = "^[\\w\\-\\.]+$"
-
-var ACTIVE_JOB_UPDATE_STATES map[JobUpdateStatus]bool
-var AWAITNG_PULSE_JOB_UPDATE_STATES map[JobUpdateStatus]bool
-
-const BYPASS_LEADER_REDIRECT_HEADER_NAME = "Bypass-Leader-Redirect"
-const TASK_FILESYSTEM_MOUNT_POINT = "taskfs"
-
-func init() {
-	ACTIVE_STATES = map[ScheduleStatus]bool{
-		9:  true,
-		17: true,
-		6:  true,
-		0:  true,
-		13: true,
-		12: true,
-		2:  true,
-		1:  true,
-		18: true,
-		16: true,
-	}
-
-	SLAVE_ASSIGNED_STATES = map[ScheduleStatus]bool{
-		9:  true,
-		17: true,
-		6:  true,
-		13: true,
-		12: true,
-		2:  true,
-		18: true,
-		1:  true,
-	}
-
-	LIVE_STATES = map[ScheduleStatus]bool{
-		6:  true,
-		13: true,
-		12: true,
-		17: true,
-		18: true,
-		2:  true,
-	}
-
-	TERMINAL_STATES = map[ScheduleStatus]bool{
-		4: true,
-		3: true,
-		5: true,
-		7: true,
-	}
-
-	ACTIVE_JOB_UPDATE_STATES = map[JobUpdateStatus]bool{
-		0:  true,
-		1:  true,
-		2:  true,
-		3:  true,
-		9:  true,
-		10: true,
-	}
-
-	AWAITNG_PULSE_JOB_UPDATE_STATES = map[JobUpdateStatus]bool{
-		9:  true,
-		10: true,
-	}
-
-}
diff --git a/gen-go/apache/aurora/read_only_scheduler-remote/read_only_scheduler-remote.go b/gen-go/apache/aurora/read_only_scheduler-remote/read_only_scheduler-remote.go
index 2c2687f..282c92a 100755
--- a/gen-go/apache/aurora/read_only_scheduler-remote/read_only_scheduler-remote.go
+++ b/gen-go/apache/aurora/read_only_scheduler-remote/read_only_scheduler-remote.go
@@ -1,382 +1,411 @@
-// Autogenerated by Thrift Compiler (0.9.3)
+// Autogenerated by Thrift Compiler (0.12.0)
 // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 
 package main
 
 import (
-	"apache/aurora"
-	"flag"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-	"math"
-	"net"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
+        "context"
+        "flag"
+        "fmt"
+        "math"
+        "net"
+        "net/url"
+        "os"
+        "strconv"
+        "strings"
+        "github.com/apache/thrift/lib/go/thrift"
+        "apache/aurora"
 )
 
+
 func Usage() {
-	fmt.Fprintln(os.Stderr, "Usage of ", os.Args[0], " [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]:")
-	flag.PrintDefaults()
-	fmt.Fprintln(os.Stderr, "\nFunctions:")
-	fmt.Fprintln(os.Stderr, "  Response getRoleSummary()")
-	fmt.Fprintln(os.Stderr, "  Response getJobSummary(string role)")
-	fmt.Fprintln(os.Stderr, "  Response getTasksStatus(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getTasksWithoutConfigs(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getPendingReason(TaskQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getConfigSummary(JobKey job)")
-	fmt.Fprintln(os.Stderr, "  Response getJobs(string ownerRole)")
-	fmt.Fprintln(os.Stderr, "  Response getQuota(string ownerRole)")
-	fmt.Fprintln(os.Stderr, "  Response populateJobConfig(JobConfiguration description)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateSummaries(JobUpdateQuery jobUpdateQuery)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateDetails(JobUpdateQuery query)")
-	fmt.Fprintln(os.Stderr, "  Response getJobUpdateDiff(JobUpdateRequest request)")
-	fmt.Fprintln(os.Stderr, "  Response getTierConfigs()")
-	fmt.Fprintln(os.Stderr)
-	os.Exit(0)
+  fmt.Fprintln(os.Stderr, "Usage of ", os.Args[0], " [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]:")
+  flag.PrintDefaults()
+  fmt.Fprintln(os.Stderr, "\nFunctions:")
+  fmt.Fprintln(os.Stderr, "  Response getRoleSummary()")
+  fmt.Fprintln(os.Stderr, "  Response getJobSummary(string role)")
+  fmt.Fprintln(os.Stderr, "  Response getTasksStatus(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getTasksWithoutConfigs(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getPendingReason(TaskQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getConfigSummary(JobKey job)")
+  fmt.Fprintln(os.Stderr, "  Response getJobs(string ownerRole)")
+  fmt.Fprintln(os.Stderr, "  Response getQuota(string ownerRole)")
+  fmt.Fprintln(os.Stderr, "  Response populateJobConfig(JobConfiguration description)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateSummaries(JobUpdateQuery jobUpdateQuery)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateDetails(JobUpdateQuery query)")
+  fmt.Fprintln(os.Stderr, "  Response getJobUpdateDiff(JobUpdateRequest request)")
+  fmt.Fprintln(os.Stderr, "  Response getTierConfigs()")
+  fmt.Fprintln(os.Stderr)
+  os.Exit(0)
+}
+
+type httpHeaders map[string]string
+
+func (h httpHeaders) String() string {
+  var m map[string]string = h
+  return fmt.Sprintf("%s", m)
+}
+
+func (h httpHeaders) Set(value string) error {
+  parts := strings.Split(value, ": ")
+  if len(parts) != 2 {
+    return fmt.Errorf("header should be of format 'Key: Value'")
+  }
+  h[parts[0]] = parts[1]
+  return nil
 }
 
 func main() {
-	flag.Usage = Usage
-	var host string
-	var port int
-	var protocol string
-	var urlString string
-	var framed bool
-	var useHttp bool
-	var parsedUrl url.URL
-	var trans thrift.TTransport
-	_ = strconv.Atoi
-	_ = math.Abs
-	flag.Usage = Usage
-	flag.StringVar(&host, "h", "localhost", "Specify host and port")
-	flag.IntVar(&port, "p", 9090, "Specify port")
-	flag.StringVar(&protocol, "P", "binary", "Specify the protocol (binary, compact, simplejson, json)")
-	flag.StringVar(&urlString, "u", "", "Specify the url")
-	flag.BoolVar(&framed, "framed", false, "Use framed transport")
-	flag.BoolVar(&useHttp, "http", false, "Use http")
-	flag.Parse()
-
-	if len(urlString) > 0 {
-		parsedUrl, err := url.Parse(urlString)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
-			flag.Usage()
-		}
-		host = parsedUrl.Host
-		useHttp = len(parsedUrl.Scheme) <= 0 || parsedUrl.Scheme == "http"
-	} else if useHttp {
-		_, err := url.Parse(fmt.Sprint("http://", host, ":", port))
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
-			flag.Usage()
-		}
-	}
-
-	cmd := flag.Arg(0)
-	var err error
-	if useHttp {
-		trans, err = thrift.NewTHttpClient(parsedUrl.String())
-	} else {
-		portStr := fmt.Sprint(port)
-		if strings.Contains(host, ":") {
-			host, portStr, err = net.SplitHostPort(host)
-			if err != nil {
-				fmt.Fprintln(os.Stderr, "error with host:", err)
-				os.Exit(1)
-			}
-		}
-		trans, err = thrift.NewTSocket(net.JoinHostPort(host, portStr))
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "error resolving address:", err)
-			os.Exit(1)
-		}
-		if framed {
-			trans = thrift.NewTFramedTransport(trans)
-		}
-	}
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "Error creating transport", err)
-		os.Exit(1)
-	}
-	defer trans.Close()
-	var protocolFactory thrift.TProtocolFactory
-	switch protocol {
-	case "compact":
-		protocolFactory = thrift.NewTCompactProtocolFactory()
-		break
-	case "simplejson":
-		protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
-		break
-	case "json":
-		protocolFactory = thrift.NewTJSONProtocolFactory()
-		break
-	case "binary", "":
-		protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
-		break
-	default:
-		fmt.Fprintln(os.Stderr, "Invalid protocol specified: ", protocol)
-		Usage()
-		os.Exit(1)
-	}
-	client := aurora.NewReadOnlySchedulerClientFactory(trans, protocolFactory)
-	if err := trans.Open(); err != nil {
-		fmt.Fprintln(os.Stderr, "Error opening socket to ", host, ":", port, " ", err)
-		os.Exit(1)
-	}
-
-	switch cmd {
-	case "getRoleSummary":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "GetRoleSummary requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.GetRoleSummary())
-		fmt.Print("\n")
-		break
-	case "getJobSummary":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobSummary requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetJobSummary(value0))
-		fmt.Print("\n")
-		break
-	case "getTasksStatus":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetTasksStatus requires 1 args")
-			flag.Usage()
-		}
-		arg81 := flag.Arg(1)
-		mbTrans82 := thrift.NewTMemoryBufferLen(len(arg81))
-		defer mbTrans82.Close()
-		_, err83 := mbTrans82.WriteString(arg81)
-		if err83 != nil {
-			Usage()
-			return
-		}
-		factory84 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt85 := factory84.GetProtocol(mbTrans82)
-		argvalue0 := aurora.NewTaskQuery()
-		err86 := argvalue0.Read(jsProt85)
-		if err86 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetTasksStatus(value0))
-		fmt.Print("\n")
-		break
-	case "getTasksWithoutConfigs":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetTasksWithoutConfigs requires 1 args")
-			flag.Usage()
-		}
-		arg87 := flag.Arg(1)
-		mbTrans88 := thrift.NewTMemoryBufferLen(len(arg87))
-		defer mbTrans88.Close()
-		_, err89 := mbTrans88.WriteString(arg87)
-		if err89 != nil {
-			Usage()
-			return
-		}
-		factory90 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt91 := factory90.GetProtocol(mbTrans88)
-		argvalue0 := aurora.NewTaskQuery()
-		err92 := argvalue0.Read(jsProt91)
-		if err92 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetTasksWithoutConfigs(value0))
-		fmt.Print("\n")
-		break
-	case "getPendingReason":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetPendingReason requires 1 args")
-			flag.Usage()
-		}
-		arg93 := flag.Arg(1)
-		mbTrans94 := thrift.NewTMemoryBufferLen(len(arg93))
-		defer mbTrans94.Close()
-		_, err95 := mbTrans94.WriteString(arg93)
-		if err95 != nil {
-			Usage()
-			return
-		}
-		factory96 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt97 := factory96.GetProtocol(mbTrans94)
-		argvalue0 := aurora.NewTaskQuery()
-		err98 := argvalue0.Read(jsProt97)
-		if err98 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetPendingReason(value0))
-		fmt.Print("\n")
-		break
-	case "getConfigSummary":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetConfigSummary requires 1 args")
-			flag.Usage()
-		}
-		arg99 := flag.Arg(1)
-		mbTrans100 := thrift.NewTMemoryBufferLen(len(arg99))
-		defer mbTrans100.Close()
-		_, err101 := mbTrans100.WriteString(arg99)
-		if err101 != nil {
-			Usage()
-			return
-		}
-		factory102 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt103 := factory102.GetProtocol(mbTrans100)
-		argvalue0 := aurora.NewJobKey()
-		err104 := argvalue0.Read(jsProt103)
-		if err104 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetConfigSummary(value0))
-		fmt.Print("\n")
-		break
-	case "getJobs":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobs requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetJobs(value0))
-		fmt.Print("\n")
-		break
-	case "getQuota":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetQuota requires 1 args")
-			flag.Usage()
-		}
-		argvalue0 := flag.Arg(1)
-		value0 := argvalue0
-		fmt.Print(client.GetQuota(value0))
-		fmt.Print("\n")
-		break
-	case "populateJobConfig":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "PopulateJobConfig requires 1 args")
-			flag.Usage()
-		}
-		arg107 := flag.Arg(1)
-		mbTrans108 := thrift.NewTMemoryBufferLen(len(arg107))
-		defer mbTrans108.Close()
-		_, err109 := mbTrans108.WriteString(arg107)
-		if err109 != nil {
-			Usage()
-			return
-		}
-		factory110 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt111 := factory110.GetProtocol(mbTrans108)
-		argvalue0 := aurora.NewJobConfiguration()
-		err112 := argvalue0.Read(jsProt111)
-		if err112 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.PopulateJobConfig(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateSummaries":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateSummaries requires 1 args")
-			flag.Usage()
-		}
-		arg113 := flag.Arg(1)
-		mbTrans114 := thrift.NewTMemoryBufferLen(len(arg113))
-		defer mbTrans114.Close()
-		_, err115 := mbTrans114.WriteString(arg113)
-		if err115 != nil {
-			Usage()
-			return
-		}
-		factory116 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt117 := factory116.GetProtocol(mbTrans114)
-		argvalue0 := aurora.NewJobUpdateQuery()
-		err118 := argvalue0.Read(jsProt117)
-		if err118 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateSummaries(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateDetails":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateDetails requires 1 args")
-			flag.Usage()
-		}
-		arg119 := flag.Arg(1)
-		mbTrans120 := thrift.NewTMemoryBufferLen(len(arg119))
-		defer mbTrans120.Close()
-		_, err121 := mbTrans120.WriteString(arg119)
-		if err121 != nil {
-			Usage()
-			return
-		}
-		factory122 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt123 := factory122.GetProtocol(mbTrans120)
-		argvalue0 := aurora.NewJobUpdateQuery()
-		err124 := argvalue0.Read(jsProt123)
-		if err124 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateDetails(value0))
-		fmt.Print("\n")
-		break
-	case "getJobUpdateDiff":
-		if flag.NArg()-1 != 1 {
-			fmt.Fprintln(os.Stderr, "GetJobUpdateDiff requires 1 args")
-			flag.Usage()
-		}
-		arg125 := flag.Arg(1)
-		mbTrans126 := thrift.NewTMemoryBufferLen(len(arg125))
-		defer mbTrans126.Close()
-		_, err127 := mbTrans126.WriteString(arg125)
-		if err127 != nil {
-			Usage()
-			return
-		}
-		factory128 := thrift.NewTSimpleJSONProtocolFactory()
-		jsProt129 := factory128.GetProtocol(mbTrans126)
-		argvalue0 := aurora.NewJobUpdateRequest()
-		err130 := argvalue0.Read(jsProt129)
-		if err130 != nil {
-			Usage()
-			return
-		}
-		value0 := argvalue0
-		fmt.Print(client.GetJobUpdateDiff(value0))
-		fmt.Print("\n")
-		break
-	case "getTierConfigs":
-		if flag.NArg()-1 != 0 {
-			fmt.Fprintln(os.Stderr, "GetTierConfigs requires 0 args")
-			flag.Usage()
-		}
-		fmt.Print(client.GetTierConfigs())
-		fmt.Print("\n")
-		break
-	case "":
-		Usage()
-		break
-	default:
-		fmt.Fprintln(os.Stderr, "Invalid function ", cmd)
-	}
+  flag.Usage = Usage
+  var host string
+  var port int
+  var protocol string
+  var urlString string
+  var framed bool
+  var useHttp bool
+  headers := make(httpHeaders)
+  var parsedUrl *url.URL
+  var trans thrift.TTransport
+  _ = strconv.Atoi
+  _ = math.Abs
+  flag.Usage = Usage
+  flag.StringVar(&host, "h", "localhost", "Specify host and port")
+  flag.IntVar(&port, "p", 9090, "Specify port")
+  flag.StringVar(&protocol, "P", "binary", "Specify the protocol (binary, compact, simplejson, json)")
+  flag.StringVar(&urlString, "u", "", "Specify the url")
+  flag.BoolVar(&framed, "framed", false, "Use framed transport")
+  flag.BoolVar(&useHttp, "http", false, "Use http")
+  flag.Var(headers, "H", "Headers to set on the http(s) request (e.g. -H \"Key: Value\")")
+  flag.Parse()
+  
+  if len(urlString) > 0 {
+    var err error
+    parsedUrl, err = url.Parse(urlString)
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
+      flag.Usage()
+    }
+    host = parsedUrl.Host
+    useHttp = len(parsedUrl.Scheme) <= 0 || parsedUrl.Scheme == "http" || parsedUrl.Scheme == "https"
+  } else if useHttp {
+    _, err := url.Parse(fmt.Sprint("http://", host, ":", port))
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "Error parsing URL: ", err)
+      flag.Usage()
+    }
+  }
+  
+  cmd := flag.Arg(0)
+  var err error
+  if useHttp {
+    trans, err = thrift.NewTHttpClient(parsedUrl.String())
+    if len(headers) > 0 {
+      httptrans := trans.(*thrift.THttpClient)
+      for key, value := range headers {
+        httptrans.SetHeader(key, value)
+      }
+    }
+  } else {
+    portStr := fmt.Sprint(port)
+    if strings.Contains(host, ":") {
+           host, portStr, err = net.SplitHostPort(host)
+           if err != nil {
+                   fmt.Fprintln(os.Stderr, "error with host:", err)
+                   os.Exit(1)
+           }
+    }
+    trans, err = thrift.NewTSocket(net.JoinHostPort(host, portStr))
+    if err != nil {
+      fmt.Fprintln(os.Stderr, "error resolving address:", err)
+      os.Exit(1)
+    }
+    if framed {
+      trans = thrift.NewTFramedTransport(trans)
+    }
+  }
+  if err != nil {
+    fmt.Fprintln(os.Stderr, "Error creating transport", err)
+    os.Exit(1)
+  }
+  defer trans.Close()
+  var protocolFactory thrift.TProtocolFactory
+  switch protocol {
+  case "compact":
+    protocolFactory = thrift.NewTCompactProtocolFactory()
+    break
+  case "simplejson":
+    protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
+    break
+  case "json":
+    protocolFactory = thrift.NewTJSONProtocolFactory()
+    break
+  case "binary", "":
+    protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
+    break
+  default:
+    fmt.Fprintln(os.Stderr, "Invalid protocol specified: ", protocol)
+    Usage()
+    os.Exit(1)
+  }
+  iprot := protocolFactory.GetProtocol(trans)
+  oprot := protocolFactory.GetProtocol(trans)
+  client := aurora.NewReadOnlySchedulerClient(thrift.NewTStandardClient(iprot, oprot))
+  if err := trans.Open(); err != nil {
+    fmt.Fprintln(os.Stderr, "Error opening socket to ", host, ":", port, " ", err)
+    os.Exit(1)
+  }
+  
+  switch cmd {
+  case "getRoleSummary":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "GetRoleSummary requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.GetRoleSummary(context.Background()))
+    fmt.Print("\n")
+    break
+  case "getJobSummary":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobSummary requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetJobSummary(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTasksStatus":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetTasksStatus requires 1 args")
+      flag.Usage()
+    }
+    arg81 := flag.Arg(1)
+    mbTrans82 := thrift.NewTMemoryBufferLen(len(arg81))
+    defer mbTrans82.Close()
+    _, err83 := mbTrans82.WriteString(arg81)
+    if err83 != nil {
+      Usage()
+      return
+    }
+    factory84 := thrift.NewTJSONProtocolFactory()
+    jsProt85 := factory84.GetProtocol(mbTrans82)
+    argvalue0 := aurora.NewTaskQuery()
+    err86 := argvalue0.Read(jsProt85)
+    if err86 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetTasksStatus(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTasksWithoutConfigs":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetTasksWithoutConfigs requires 1 args")
+      flag.Usage()
+    }
+    arg87 := flag.Arg(1)
+    mbTrans88 := thrift.NewTMemoryBufferLen(len(arg87))
+    defer mbTrans88.Close()
+    _, err89 := mbTrans88.WriteString(arg87)
+    if err89 != nil {
+      Usage()
+      return
+    }
+    factory90 := thrift.NewTJSONProtocolFactory()
+    jsProt91 := factory90.GetProtocol(mbTrans88)
+    argvalue0 := aurora.NewTaskQuery()
+    err92 := argvalue0.Read(jsProt91)
+    if err92 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetTasksWithoutConfigs(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getPendingReason":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetPendingReason requires 1 args")
+      flag.Usage()
+    }
+    arg93 := flag.Arg(1)
+    mbTrans94 := thrift.NewTMemoryBufferLen(len(arg93))
+    defer mbTrans94.Close()
+    _, err95 := mbTrans94.WriteString(arg93)
+    if err95 != nil {
+      Usage()
+      return
+    }
+    factory96 := thrift.NewTJSONProtocolFactory()
+    jsProt97 := factory96.GetProtocol(mbTrans94)
+    argvalue0 := aurora.NewTaskQuery()
+    err98 := argvalue0.Read(jsProt97)
+    if err98 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetPendingReason(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getConfigSummary":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetConfigSummary requires 1 args")
+      flag.Usage()
+    }
+    arg99 := flag.Arg(1)
+    mbTrans100 := thrift.NewTMemoryBufferLen(len(arg99))
+    defer mbTrans100.Close()
+    _, err101 := mbTrans100.WriteString(arg99)
+    if err101 != nil {
+      Usage()
+      return
+    }
+    factory102 := thrift.NewTJSONProtocolFactory()
+    jsProt103 := factory102.GetProtocol(mbTrans100)
+    argvalue0 := aurora.NewJobKey()
+    err104 := argvalue0.Read(jsProt103)
+    if err104 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetConfigSummary(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobs":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobs requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetJobs(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getQuota":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetQuota requires 1 args")
+      flag.Usage()
+    }
+    argvalue0 := flag.Arg(1)
+    value0 := argvalue0
+    fmt.Print(client.GetQuota(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "populateJobConfig":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "PopulateJobConfig requires 1 args")
+      flag.Usage()
+    }
+    arg107 := flag.Arg(1)
+    mbTrans108 := thrift.NewTMemoryBufferLen(len(arg107))
+    defer mbTrans108.Close()
+    _, err109 := mbTrans108.WriteString(arg107)
+    if err109 != nil {
+      Usage()
+      return
+    }
+    factory110 := thrift.NewTJSONProtocolFactory()
+    jsProt111 := factory110.GetProtocol(mbTrans108)
+    argvalue0 := aurora.NewJobConfiguration()
+    err112 := argvalue0.Read(jsProt111)
+    if err112 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.PopulateJobConfig(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateSummaries":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateSummaries requires 1 args")
+      flag.Usage()
+    }
+    arg113 := flag.Arg(1)
+    mbTrans114 := thrift.NewTMemoryBufferLen(len(arg113))
+    defer mbTrans114.Close()
+    _, err115 := mbTrans114.WriteString(arg113)
+    if err115 != nil {
+      Usage()
+      return
+    }
+    factory116 := thrift.NewTJSONProtocolFactory()
+    jsProt117 := factory116.GetProtocol(mbTrans114)
+    argvalue0 := aurora.NewJobUpdateQuery()
+    err118 := argvalue0.Read(jsProt117)
+    if err118 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateSummaries(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateDetails":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateDetails requires 1 args")
+      flag.Usage()
+    }
+    arg119 := flag.Arg(1)
+    mbTrans120 := thrift.NewTMemoryBufferLen(len(arg119))
+    defer mbTrans120.Close()
+    _, err121 := mbTrans120.WriteString(arg119)
+    if err121 != nil {
+      Usage()
+      return
+    }
+    factory122 := thrift.NewTJSONProtocolFactory()
+    jsProt123 := factory122.GetProtocol(mbTrans120)
+    argvalue0 := aurora.NewJobUpdateQuery()
+    err124 := argvalue0.Read(jsProt123)
+    if err124 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateDetails(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getJobUpdateDiff":
+    if flag.NArg() - 1 != 1 {
+      fmt.Fprintln(os.Stderr, "GetJobUpdateDiff requires 1 args")
+      flag.Usage()
+    }
+    arg125 := flag.Arg(1)
+    mbTrans126 := thrift.NewTMemoryBufferLen(len(arg125))
+    defer mbTrans126.Close()
+    _, err127 := mbTrans126.WriteString(arg125)
+    if err127 != nil {
+      Usage()
+      return
+    }
+    factory128 := thrift.NewTJSONProtocolFactory()
+    jsProt129 := factory128.GetProtocol(mbTrans126)
+    argvalue0 := aurora.NewJobUpdateRequest()
+    err130 := argvalue0.Read(jsProt129)
+    if err130 != nil {
+      Usage()
+      return
+    }
+    value0 := argvalue0
+    fmt.Print(client.GetJobUpdateDiff(context.Background(), value0))
+    fmt.Print("\n")
+    break
+  case "getTierConfigs":
+    if flag.NArg() - 1 != 0 {
+      fmt.Fprintln(os.Stderr, "GetTierConfigs requires 0 args")
+      flag.Usage()
+    }
+    fmt.Print(client.GetTierConfigs(context.Background()))
+    fmt.Print("\n")
+    break
+  case "":
+    Usage()
+    break
+  default:
+    fmt.Fprintln(os.Stderr, "Invalid function ", cmd)
+  }
 }
diff --git a/gen-go/apache/aurora/readonlyscheduler.go b/gen-go/apache/aurora/readonlyscheduler.go
deleted file mode 100644
index dba7255..0000000
--- a/gen-go/apache/aurora/readonlyscheduler.go
+++ /dev/null
@@ -1,4293 +0,0 @@
-// Autogenerated by Thrift Compiler (0.9.3)
-// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-
-package aurora
-
-import (
-	"bytes"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-)
-
-// (needed to ensure safety because of naive import list construction.)
-var _ = thrift.ZERO
-var _ = fmt.Printf
-var _ = bytes.Equal
-
-type ReadOnlyScheduler interface {
-	// Returns a summary of the jobs grouped by role.
-	GetRoleSummary() (r *Response, err error)
-	// Returns a summary of jobs, optionally only those owned by a specific role.
-	//
-	// Parameters:
-	//  - Role
-	GetJobSummary(role string) (r *Response, err error)
-	// Fetches the status of tasks.
-	//
-	// Parameters:
-	//  - Query
-	GetTasksStatus(query *TaskQuery) (r *Response, err error)
-	// Same as getTaskStatus but without the TaskConfig.ExecutorConfig data set.
-	// This is an interim solution until we have a better way to query TaskConfigs (AURORA-541).
-	//
-	// Parameters:
-	//  - Query
-	GetTasksWithoutConfigs(query *TaskQuery) (r *Response, err error)
-	// Returns user-friendly reasons (if available) for tasks retained in PENDING state.
-	//
-	// Parameters:
-	//  - Query
-	GetPendingReason(query *TaskQuery) (r *Response, err error)
-	// Fetches the configuration summary of active tasks for the specified job.
-	//
-	// Parameters:
-	//  - Job
-	GetConfigSummary(job *JobKey) (r *Response, err error)
-	// Fetches the status of jobs.
-	// ownerRole is optional, in which case all jobs are returned.
-	//
-	// Parameters:
-	//  - OwnerRole
-	GetJobs(ownerRole string) (r *Response, err error)
-	// Fetches the quota allocated for a user.
-	//
-	// Parameters:
-	//  - OwnerRole
-	GetQuota(ownerRole string) (r *Response, err error)
-	// Populates fields in a job configuration as though it were about to be run.
-	// This can be used to diff a configuration running tasks.
-	//
-	// Parameters:
-	//  - Description
-	PopulateJobConfig(description *JobConfiguration) (r *Response, err error)
-	// Gets job update summaries.
-	//
-	// Parameters:
-	//  - JobUpdateQuery
-	GetJobUpdateSummaries(jobUpdateQuery *JobUpdateQuery) (r *Response, err error)
-	// Gets job update details.
-	//
-	// Parameters:
-	//  - Query
-	GetJobUpdateDetails(query *JobUpdateQuery) (r *Response, err error)
-	// Gets the diff between client (desired) and server (current) job states.
-	//
-	// Parameters:
-	//  - Request
-	GetJobUpdateDiff(request *JobUpdateRequest) (r *Response, err error)
-	// Gets tier configurations.
-	GetTierConfigs() (r *Response, err error)
-}
-
-type ReadOnlySchedulerClient struct {
-	Transport       thrift.TTransport
-	ProtocolFactory thrift.TProtocolFactory
-	InputProtocol   thrift.TProtocol
-	OutputProtocol  thrift.TProtocol
-	SeqId           int32
-}
-
-func NewReadOnlySchedulerClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *ReadOnlySchedulerClient {
-	return &ReadOnlySchedulerClient{Transport: t,
-		ProtocolFactory: f,
-		InputProtocol:   f.GetProtocol(t),
-		OutputProtocol:  f.GetProtocol(t),
-		SeqId:           0,
-	}
-}
-
-func NewReadOnlySchedulerClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *ReadOnlySchedulerClient {
-	return &ReadOnlySchedulerClient{Transport: t,
-		ProtocolFactory: nil,
-		InputProtocol:   iprot,
-		OutputProtocol:  oprot,
-		SeqId:           0,
-	}
-}
-
-// Returns a summary of the jobs grouped by role.
-func (p *ReadOnlySchedulerClient) GetRoleSummary() (r *Response, err error) {
-	if err = p.sendGetRoleSummary(); err != nil {
-		return
-	}
-	return p.recvGetRoleSummary()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetRoleSummary() (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getRoleSummary", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetRoleSummaryArgs{}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetRoleSummary() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getRoleSummary" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getRoleSummary failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getRoleSummary failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error52 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error53 error
-		error53, err = error52.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error53
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getRoleSummary failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetRoleSummaryResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Returns a summary of jobs, optionally only those owned by a specific role.
-//
-// Parameters:
-//  - Role
-func (p *ReadOnlySchedulerClient) GetJobSummary(role string) (r *Response, err error) {
-	if err = p.sendGetJobSummary(role); err != nil {
-		return
-	}
-	return p.recvGetJobSummary()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetJobSummary(role string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getJobSummary", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetJobSummaryArgs{
-		Role: role,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetJobSummary() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getJobSummary" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getJobSummary failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getJobSummary failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error54 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error55 error
-		error55, err = error54.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error55
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getJobSummary failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetJobSummaryResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Fetches the status of tasks.
-//
-// Parameters:
-//  - Query
-func (p *ReadOnlySchedulerClient) GetTasksStatus(query *TaskQuery) (r *Response, err error) {
-	if err = p.sendGetTasksStatus(query); err != nil {
-		return
-	}
-	return p.recvGetTasksStatus()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetTasksStatus(query *TaskQuery) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getTasksStatus", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetTasksStatusArgs{
-		Query: query,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetTasksStatus() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getTasksStatus" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getTasksStatus failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getTasksStatus failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error56 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error57 error
-		error57, err = error56.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error57
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getTasksStatus failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetTasksStatusResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Same as getTaskStatus but without the TaskConfig.ExecutorConfig data set.
-// This is an interim solution until we have a better way to query TaskConfigs (AURORA-541).
-//
-// Parameters:
-//  - Query
-func (p *ReadOnlySchedulerClient) GetTasksWithoutConfigs(query *TaskQuery) (r *Response, err error) {
-	if err = p.sendGetTasksWithoutConfigs(query); err != nil {
-		return
-	}
-	return p.recvGetTasksWithoutConfigs()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetTasksWithoutConfigs(query *TaskQuery) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getTasksWithoutConfigs", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetTasksWithoutConfigsArgs{
-		Query: query,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetTasksWithoutConfigs() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getTasksWithoutConfigs" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getTasksWithoutConfigs failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getTasksWithoutConfigs failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error58 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error59 error
-		error59, err = error58.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error59
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getTasksWithoutConfigs failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetTasksWithoutConfigsResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Returns user-friendly reasons (if available) for tasks retained in PENDING state.
-//
-// Parameters:
-//  - Query
-func (p *ReadOnlySchedulerClient) GetPendingReason(query *TaskQuery) (r *Response, err error) {
-	if err = p.sendGetPendingReason(query); err != nil {
-		return
-	}
-	return p.recvGetPendingReason()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetPendingReason(query *TaskQuery) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getPendingReason", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetPendingReasonArgs{
-		Query: query,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetPendingReason() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getPendingReason" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getPendingReason failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getPendingReason failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error60 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error61 error
-		error61, err = error60.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error61
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getPendingReason failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetPendingReasonResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Fetches the configuration summary of active tasks for the specified job.
-//
-// Parameters:
-//  - Job
-func (p *ReadOnlySchedulerClient) GetConfigSummary(job *JobKey) (r *Response, err error) {
-	if err = p.sendGetConfigSummary(job); err != nil {
-		return
-	}
-	return p.recvGetConfigSummary()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetConfigSummary(job *JobKey) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getConfigSummary", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetConfigSummaryArgs{
-		Job: job,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetConfigSummary() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getConfigSummary" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getConfigSummary failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getConfigSummary failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error62 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error63 error
-		error63, err = error62.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error63
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getConfigSummary failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetConfigSummaryResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Fetches the status of jobs.
-// ownerRole is optional, in which case all jobs are returned.
-//
-// Parameters:
-//  - OwnerRole
-func (p *ReadOnlySchedulerClient) GetJobs(ownerRole string) (r *Response, err error) {
-	if err = p.sendGetJobs(ownerRole); err != nil {
-		return
-	}
-	return p.recvGetJobs()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetJobs(ownerRole string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getJobs", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetJobsArgs{
-		OwnerRole: ownerRole,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetJobs() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getJobs" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getJobs failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getJobs failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error64 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error65 error
-		error65, err = error64.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error65
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getJobs failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetJobsResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Fetches the quota allocated for a user.
-//
-// Parameters:
-//  - OwnerRole
-func (p *ReadOnlySchedulerClient) GetQuota(ownerRole string) (r *Response, err error) {
-	if err = p.sendGetQuota(ownerRole); err != nil {
-		return
-	}
-	return p.recvGetQuota()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetQuota(ownerRole string) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getQuota", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetQuotaArgs{
-		OwnerRole: ownerRole,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetQuota() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getQuota" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getQuota failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getQuota failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error66 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error67 error
-		error67, err = error66.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error67
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getQuota failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetQuotaResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Populates fields in a job configuration as though it were about to be run.
-// This can be used to diff a configuration running tasks.
-//
-// Parameters:
-//  - Description
-func (p *ReadOnlySchedulerClient) PopulateJobConfig(description *JobConfiguration) (r *Response, err error) {
-	if err = p.sendPopulateJobConfig(description); err != nil {
-		return
-	}
-	return p.recvPopulateJobConfig()
-}
-
-func (p *ReadOnlySchedulerClient) sendPopulateJobConfig(description *JobConfiguration) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("populateJobConfig", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerPopulateJobConfigArgs{
-		Description: description,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvPopulateJobConfig() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "populateJobConfig" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "populateJobConfig failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "populateJobConfig failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error68 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error69 error
-		error69, err = error68.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error69
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "populateJobConfig failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerPopulateJobConfigResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Gets job update summaries.
-//
-// Parameters:
-//  - JobUpdateQuery
-func (p *ReadOnlySchedulerClient) GetJobUpdateSummaries(jobUpdateQuery *JobUpdateQuery) (r *Response, err error) {
-	if err = p.sendGetJobUpdateSummaries(jobUpdateQuery); err != nil {
-		return
-	}
-	return p.recvGetJobUpdateSummaries()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetJobUpdateSummaries(jobUpdateQuery *JobUpdateQuery) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getJobUpdateSummaries", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetJobUpdateSummariesArgs{
-		JobUpdateQuery: jobUpdateQuery,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetJobUpdateSummaries() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getJobUpdateSummaries" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getJobUpdateSummaries failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getJobUpdateSummaries failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error70 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error71 error
-		error71, err = error70.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error71
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getJobUpdateSummaries failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetJobUpdateSummariesResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Gets job update details.
-//
-// Parameters:
-//  - Query
-func (p *ReadOnlySchedulerClient) GetJobUpdateDetails(query *JobUpdateQuery) (r *Response, err error) {
-	if err = p.sendGetJobUpdateDetails(query); err != nil {
-		return
-	}
-	return p.recvGetJobUpdateDetails()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetJobUpdateDetails(query *JobUpdateQuery) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getJobUpdateDetails", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetJobUpdateDetailsArgs{
-		Query: query,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetJobUpdateDetails() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getJobUpdateDetails" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getJobUpdateDetails failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getJobUpdateDetails failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error72 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error73 error
-		error73, err = error72.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error73
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getJobUpdateDetails failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetJobUpdateDetailsResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Gets the diff between client (desired) and server (current) job states.
-//
-// Parameters:
-//  - Request
-func (p *ReadOnlySchedulerClient) GetJobUpdateDiff(request *JobUpdateRequest) (r *Response, err error) {
-	if err = p.sendGetJobUpdateDiff(request); err != nil {
-		return
-	}
-	return p.recvGetJobUpdateDiff()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetJobUpdateDiff(request *JobUpdateRequest) (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getJobUpdateDiff", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetJobUpdateDiffArgs{
-		Request: request,
-	}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetJobUpdateDiff() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getJobUpdateDiff" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getJobUpdateDiff failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getJobUpdateDiff failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error74 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error75 error
-		error75, err = error74.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error75
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getJobUpdateDiff failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetJobUpdateDiffResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-// Gets tier configurations.
-func (p *ReadOnlySchedulerClient) GetTierConfigs() (r *Response, err error) {
-	if err = p.sendGetTierConfigs(); err != nil {
-		return
-	}
-	return p.recvGetTierConfigs()
-}
-
-func (p *ReadOnlySchedulerClient) sendGetTierConfigs() (err error) {
-	oprot := p.OutputProtocol
-	if oprot == nil {
-		oprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.OutputProtocol = oprot
-	}
-	p.SeqId++
-	if err = oprot.WriteMessageBegin("getTierConfigs", thrift.CALL, p.SeqId); err != nil {
-		return
-	}
-	args := ReadOnlySchedulerGetTierConfigsArgs{}
-	if err = args.Write(oprot); err != nil {
-		return
-	}
-	if err = oprot.WriteMessageEnd(); err != nil {
-		return
-	}
-	return oprot.Flush()
-}
-
-func (p *ReadOnlySchedulerClient) recvGetTierConfigs() (value *Response, err error) {
-	iprot := p.InputProtocol
-	if iprot == nil {
-		iprot = p.ProtocolFactory.GetProtocol(p.Transport)
-		p.InputProtocol = iprot
-	}
-	method, mTypeId, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return
-	}
-	if method != "getTierConfigs" {
-		err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "getTierConfigs failed: wrong method name")
-		return
-	}
-	if p.SeqId != seqId {
-		err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "getTierConfigs failed: out of sequence response")
-		return
-	}
-	if mTypeId == thrift.EXCEPTION {
-		error76 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception")
-		var error77 error
-		error77, err = error76.Read(iprot)
-		if err != nil {
-			return
-		}
-		if err = iprot.ReadMessageEnd(); err != nil {
-			return
-		}
-		err = error77
-		return
-	}
-	if mTypeId != thrift.REPLY {
-		err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "getTierConfigs failed: invalid message type")
-		return
-	}
-	result := ReadOnlySchedulerGetTierConfigsResult{}
-	if err = result.Read(iprot); err != nil {
-		return
-	}
-	if err = iprot.ReadMessageEnd(); err != nil {
-		return
-	}
-	value = result.GetSuccess()
-	return
-}
-
-type ReadOnlySchedulerProcessor struct {
-	processorMap map[string]thrift.TProcessorFunction
-	handler      ReadOnlyScheduler
-}
-
-func (p *ReadOnlySchedulerProcessor) AddToProcessorMap(key string, processor thrift.TProcessorFunction) {
-	p.processorMap[key] = processor
-}
-
-func (p *ReadOnlySchedulerProcessor) GetProcessorFunction(key string) (processor thrift.TProcessorFunction, ok bool) {
-	processor, ok = p.processorMap[key]
-	return processor, ok
-}
-
-func (p *ReadOnlySchedulerProcessor) ProcessorMap() map[string]thrift.TProcessorFunction {
-	return p.processorMap
-}
-
-func NewReadOnlySchedulerProcessor(handler ReadOnlyScheduler) *ReadOnlySchedulerProcessor {
-
-	self78 := &ReadOnlySchedulerProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)}
-	self78.processorMap["getRoleSummary"] = &readOnlySchedulerProcessorGetRoleSummary{handler: handler}
-	self78.processorMap["getJobSummary"] = &readOnlySchedulerProcessorGetJobSummary{handler: handler}
-	self78.processorMap["getTasksStatus"] = &readOnlySchedulerProcessorGetTasksStatus{handler: handler}
-	self78.processorMap["getTasksWithoutConfigs"] = &readOnlySchedulerProcessorGetTasksWithoutConfigs{handler: handler}
-	self78.processorMap["getPendingReason"] = &readOnlySchedulerProcessorGetPendingReason{handler: handler}
-	self78.processorMap["getConfigSummary"] = &readOnlySchedulerProcessorGetConfigSummary{handler: handler}
-	self78.processorMap["getJobs"] = &readOnlySchedulerProcessorGetJobs{handler: handler}
-	self78.processorMap["getQuota"] = &readOnlySchedulerProcessorGetQuota{handler: handler}
-	self78.processorMap["populateJobConfig"] = &readOnlySchedulerProcessorPopulateJobConfig{handler: handler}
-	self78.processorMap["getJobUpdateSummaries"] = &readOnlySchedulerProcessorGetJobUpdateSummaries{handler: handler}
-	self78.processorMap["getJobUpdateDetails"] = &readOnlySchedulerProcessorGetJobUpdateDetails{handler: handler}
-	self78.processorMap["getJobUpdateDiff"] = &readOnlySchedulerProcessorGetJobUpdateDiff{handler: handler}
-	self78.processorMap["getTierConfigs"] = &readOnlySchedulerProcessorGetTierConfigs{handler: handler}
-	return self78
-}
-
-func (p *ReadOnlySchedulerProcessor) Process(iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	name, _, seqId, err := iprot.ReadMessageBegin()
-	if err != nil {
-		return false, err
-	}
-	if processor, ok := p.GetProcessorFunction(name); ok {
-		return processor.Process(seqId, iprot, oprot)
-	}
-	iprot.Skip(thrift.STRUCT)
-	iprot.ReadMessageEnd()
-	x79 := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name)
-	oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId)
-	x79.Write(oprot)
-	oprot.WriteMessageEnd()
-	oprot.Flush()
-	return false, x79
-
-}
-
-type readOnlySchedulerProcessorGetRoleSummary struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetRoleSummary) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetRoleSummaryArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getRoleSummary", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetRoleSummaryResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetRoleSummary(); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getRoleSummary: "+err2.Error())
-		oprot.WriteMessageBegin("getRoleSummary", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getRoleSummary", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetJobSummary struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetJobSummary) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetJobSummaryArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getJobSummary", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetJobSummaryResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetJobSummary(args.Role); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobSummary: "+err2.Error())
-		oprot.WriteMessageBegin("getJobSummary", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getJobSummary", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetTasksStatus struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetTasksStatus) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetTasksStatusArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getTasksStatus", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetTasksStatusResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetTasksStatus(args.Query); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getTasksStatus: "+err2.Error())
-		oprot.WriteMessageBegin("getTasksStatus", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getTasksStatus", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetTasksWithoutConfigs struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetTasksWithoutConfigs) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetTasksWithoutConfigsArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getTasksWithoutConfigs", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetTasksWithoutConfigsResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetTasksWithoutConfigs(args.Query); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getTasksWithoutConfigs: "+err2.Error())
-		oprot.WriteMessageBegin("getTasksWithoutConfigs", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getTasksWithoutConfigs", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetPendingReason struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetPendingReason) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetPendingReasonArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getPendingReason", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetPendingReasonResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetPendingReason(args.Query); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getPendingReason: "+err2.Error())
-		oprot.WriteMessageBegin("getPendingReason", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getPendingReason", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetConfigSummary struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetConfigSummary) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetConfigSummaryArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getConfigSummary", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetConfigSummaryResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetConfigSummary(args.Job); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getConfigSummary: "+err2.Error())
-		oprot.WriteMessageBegin("getConfigSummary", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getConfigSummary", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetJobs struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetJobs) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetJobsArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getJobs", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetJobsResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetJobs(args.OwnerRole); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobs: "+err2.Error())
-		oprot.WriteMessageBegin("getJobs", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getJobs", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetQuota struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetQuota) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetQuotaArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getQuota", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetQuotaResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetQuota(args.OwnerRole); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getQuota: "+err2.Error())
-		oprot.WriteMessageBegin("getQuota", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getQuota", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorPopulateJobConfig struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorPopulateJobConfig) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerPopulateJobConfigArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("populateJobConfig", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerPopulateJobConfigResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.PopulateJobConfig(args.Description); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing populateJobConfig: "+err2.Error())
-		oprot.WriteMessageBegin("populateJobConfig", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("populateJobConfig", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetJobUpdateSummaries struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetJobUpdateSummaries) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetJobUpdateSummariesArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getJobUpdateSummaries", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetJobUpdateSummariesResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetJobUpdateSummaries(args.JobUpdateQuery); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobUpdateSummaries: "+err2.Error())
-		oprot.WriteMessageBegin("getJobUpdateSummaries", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getJobUpdateSummaries", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetJobUpdateDetails struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetJobUpdateDetails) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetJobUpdateDetailsArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getJobUpdateDetails", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetJobUpdateDetailsResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetJobUpdateDetails(args.Query); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobUpdateDetails: "+err2.Error())
-		oprot.WriteMessageBegin("getJobUpdateDetails", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getJobUpdateDetails", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetJobUpdateDiff struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetJobUpdateDiff) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetJobUpdateDiffArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getJobUpdateDiff", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetJobUpdateDiffResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetJobUpdateDiff(args.Request); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getJobUpdateDiff: "+err2.Error())
-		oprot.WriteMessageBegin("getJobUpdateDiff", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getJobUpdateDiff", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-type readOnlySchedulerProcessorGetTierConfigs struct {
-	handler ReadOnlyScheduler
-}
-
-func (p *readOnlySchedulerProcessorGetTierConfigs) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) {
-	args := ReadOnlySchedulerGetTierConfigsArgs{}
-	if err = args.Read(iprot); err != nil {
-		iprot.ReadMessageEnd()
-		x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())
-		oprot.WriteMessageBegin("getTierConfigs", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return false, err
-	}
-
-	iprot.ReadMessageEnd()
-	result := ReadOnlySchedulerGetTierConfigsResult{}
-	var retval *Response
-	var err2 error
-	if retval, err2 = p.handler.GetTierConfigs(); err2 != nil {
-		x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing getTierConfigs: "+err2.Error())
-		oprot.WriteMessageBegin("getTierConfigs", thrift.EXCEPTION, seqId)
-		x.Write(oprot)
-		oprot.WriteMessageEnd()
-		oprot.Flush()
-		return true, err2
-	} else {
-		result.Success = retval
-	}
-	if err2 = oprot.WriteMessageBegin("getTierConfigs", thrift.REPLY, seqId); err2 != nil {
-		err = err2
-	}
-	if err2 = result.Write(oprot); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err2 = oprot.Flush(); err == nil && err2 != nil {
-		err = err2
-	}
-	if err != nil {
-		return
-	}
-	return true, err
-}
-
-// HELPER FUNCTIONS AND STRUCTURES
-
-type ReadOnlySchedulerGetRoleSummaryArgs struct {
-}
-
-func NewReadOnlySchedulerGetRoleSummaryArgs() *ReadOnlySchedulerGetRoleSummaryArgs {
-	return &ReadOnlySchedulerGetRoleSummaryArgs{}
-}
-
-func (p *ReadOnlySchedulerGetRoleSummaryArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		if err := iprot.Skip(fieldTypeId); err != nil {
-			return err
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetRoleSummaryArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getRoleSummary_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetRoleSummaryArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetRoleSummaryArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetRoleSummaryResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetRoleSummaryResult() *ReadOnlySchedulerGetRoleSummaryResult {
-	return &ReadOnlySchedulerGetRoleSummaryResult{}
-}
-
-var ReadOnlySchedulerGetRoleSummaryResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetRoleSummaryResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetRoleSummaryResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetRoleSummaryResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetRoleSummaryResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetRoleSummaryResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetRoleSummaryResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getRoleSummary_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetRoleSummaryResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetRoleSummaryResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetRoleSummaryResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Role
-type ReadOnlySchedulerGetJobSummaryArgs struct {
-	Role string `thrift:"role,1" json:"role"`
-}
-
-func NewReadOnlySchedulerGetJobSummaryArgs() *ReadOnlySchedulerGetJobSummaryArgs {
-	return &ReadOnlySchedulerGetJobSummaryArgs{}
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryArgs) GetRole() string {
-	return p.Role
-}
-func (p *ReadOnlySchedulerGetJobSummaryArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryArgs) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Role = v
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobSummary_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("role", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:role: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Role)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.role (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:role: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobSummaryArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetJobSummaryResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetJobSummaryResult() *ReadOnlySchedulerGetJobSummaryResult {
-	return &ReadOnlySchedulerGetJobSummaryResult{}
-}
-
-var ReadOnlySchedulerGetJobSummaryResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetJobSummaryResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetJobSummaryResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetJobSummaryResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobSummary_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobSummaryResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobSummaryResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Query
-type ReadOnlySchedulerGetTasksStatusArgs struct {
-	Query *TaskQuery `thrift:"query,1" json:"query"`
-}
-
-func NewReadOnlySchedulerGetTasksStatusArgs() *ReadOnlySchedulerGetTasksStatusArgs {
-	return &ReadOnlySchedulerGetTasksStatusArgs{}
-}
-
-var ReadOnlySchedulerGetTasksStatusArgs_Query_DEFAULT *TaskQuery
-
-func (p *ReadOnlySchedulerGetTasksStatusArgs) GetQuery() *TaskQuery {
-	if !p.IsSetQuery() {
-		return ReadOnlySchedulerGetTasksStatusArgs_Query_DEFAULT
-	}
-	return p.Query
-}
-func (p *ReadOnlySchedulerGetTasksStatusArgs) IsSetQuery() bool {
-	return p.Query != nil
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusArgs) readField1(iprot thrift.TProtocol) error {
-	p.Query = &TaskQuery{}
-	if err := p.Query.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getTasksStatus_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err)
-	}
-	if err := p.Query.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetTasksStatusArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetTasksStatusResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetTasksStatusResult() *ReadOnlySchedulerGetTasksStatusResult {
-	return &ReadOnlySchedulerGetTasksStatusResult{}
-}
-
-var ReadOnlySchedulerGetTasksStatusResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetTasksStatusResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetTasksStatusResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetTasksStatusResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getTasksStatus_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetTasksStatusResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetTasksStatusResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Query
-type ReadOnlySchedulerGetTasksWithoutConfigsArgs struct {
-	Query *TaskQuery `thrift:"query,1" json:"query"`
-}
-
-func NewReadOnlySchedulerGetTasksWithoutConfigsArgs() *ReadOnlySchedulerGetTasksWithoutConfigsArgs {
-	return &ReadOnlySchedulerGetTasksWithoutConfigsArgs{}
-}
-
-var ReadOnlySchedulerGetTasksWithoutConfigsArgs_Query_DEFAULT *TaskQuery
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) GetQuery() *TaskQuery {
-	if !p.IsSetQuery() {
-		return ReadOnlySchedulerGetTasksWithoutConfigsArgs_Query_DEFAULT
-	}
-	return p.Query
-}
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) IsSetQuery() bool {
-	return p.Query != nil
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) readField1(iprot thrift.TProtocol) error {
-	p.Query = &TaskQuery{}
-	if err := p.Query.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getTasksWithoutConfigs_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err)
-	}
-	if err := p.Query.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetTasksWithoutConfigsArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetTasksWithoutConfigsResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetTasksWithoutConfigsResult() *ReadOnlySchedulerGetTasksWithoutConfigsResult {
-	return &ReadOnlySchedulerGetTasksWithoutConfigsResult{}
-}
-
-var ReadOnlySchedulerGetTasksWithoutConfigsResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetTasksWithoutConfigsResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getTasksWithoutConfigs_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetTasksWithoutConfigsResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetTasksWithoutConfigsResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Query
-type ReadOnlySchedulerGetPendingReasonArgs struct {
-	Query *TaskQuery `thrift:"query,1" json:"query"`
-}
-
-func NewReadOnlySchedulerGetPendingReasonArgs() *ReadOnlySchedulerGetPendingReasonArgs {
-	return &ReadOnlySchedulerGetPendingReasonArgs{}
-}
-
-var ReadOnlySchedulerGetPendingReasonArgs_Query_DEFAULT *TaskQuery
-
-func (p *ReadOnlySchedulerGetPendingReasonArgs) GetQuery() *TaskQuery {
-	if !p.IsSetQuery() {
-		return ReadOnlySchedulerGetPendingReasonArgs_Query_DEFAULT
-	}
-	return p.Query
-}
-func (p *ReadOnlySchedulerGetPendingReasonArgs) IsSetQuery() bool {
-	return p.Query != nil
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonArgs) readField1(iprot thrift.TProtocol) error {
-	p.Query = &TaskQuery{}
-	if err := p.Query.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getPendingReason_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err)
-	}
-	if err := p.Query.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetPendingReasonArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetPendingReasonResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetPendingReasonResult() *ReadOnlySchedulerGetPendingReasonResult {
-	return &ReadOnlySchedulerGetPendingReasonResult{}
-}
-
-var ReadOnlySchedulerGetPendingReasonResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetPendingReasonResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetPendingReasonResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetPendingReasonResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getPendingReason_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetPendingReasonResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetPendingReasonResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Job
-type ReadOnlySchedulerGetConfigSummaryArgs struct {
-	Job *JobKey `thrift:"job,1" json:"job"`
-}
-
-func NewReadOnlySchedulerGetConfigSummaryArgs() *ReadOnlySchedulerGetConfigSummaryArgs {
-	return &ReadOnlySchedulerGetConfigSummaryArgs{}
-}
-
-var ReadOnlySchedulerGetConfigSummaryArgs_Job_DEFAULT *JobKey
-
-func (p *ReadOnlySchedulerGetConfigSummaryArgs) GetJob() *JobKey {
-	if !p.IsSetJob() {
-		return ReadOnlySchedulerGetConfigSummaryArgs_Job_DEFAULT
-	}
-	return p.Job
-}
-func (p *ReadOnlySchedulerGetConfigSummaryArgs) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryArgs) readField1(iprot thrift.TProtocol) error {
-	p.Job = &JobKey{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getConfigSummary_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:job: ", p), err)
-	}
-	if err := p.Job.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:job: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetConfigSummaryArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetConfigSummaryResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetConfigSummaryResult() *ReadOnlySchedulerGetConfigSummaryResult {
-	return &ReadOnlySchedulerGetConfigSummaryResult{}
-}
-
-var ReadOnlySchedulerGetConfigSummaryResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetConfigSummaryResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetConfigSummaryResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetConfigSummaryResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getConfigSummary_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetConfigSummaryResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetConfigSummaryResult(%+v)", *p)
-}
-
-// Attributes:
-//  - OwnerRole
-type ReadOnlySchedulerGetJobsArgs struct {
-	OwnerRole string `thrift:"ownerRole,1" json:"ownerRole"`
-}
-
-func NewReadOnlySchedulerGetJobsArgs() *ReadOnlySchedulerGetJobsArgs {
-	return &ReadOnlySchedulerGetJobsArgs{}
-}
-
-func (p *ReadOnlySchedulerGetJobsArgs) GetOwnerRole() string {
-	return p.OwnerRole
-}
-func (p *ReadOnlySchedulerGetJobsArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobsArgs) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.OwnerRole = v
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobsArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobs_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobsArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("ownerRole", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:ownerRole: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.OwnerRole)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.ownerRole (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:ownerRole: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobsArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobsArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetJobsResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetJobsResult() *ReadOnlySchedulerGetJobsResult {
-	return &ReadOnlySchedulerGetJobsResult{}
-}
-
-var ReadOnlySchedulerGetJobsResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetJobsResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetJobsResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetJobsResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetJobsResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobsResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobsResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobs_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobsResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobsResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobsResult(%+v)", *p)
-}
-
-// Attributes:
-//  - OwnerRole
-type ReadOnlySchedulerGetQuotaArgs struct {
-	OwnerRole string `thrift:"ownerRole,1" json:"ownerRole"`
-}
-
-func NewReadOnlySchedulerGetQuotaArgs() *ReadOnlySchedulerGetQuotaArgs {
-	return &ReadOnlySchedulerGetQuotaArgs{}
-}
-
-func (p *ReadOnlySchedulerGetQuotaArgs) GetOwnerRole() string {
-	return p.OwnerRole
-}
-func (p *ReadOnlySchedulerGetQuotaArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetQuotaArgs) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.OwnerRole = v
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetQuotaArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getQuota_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetQuotaArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("ownerRole", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:ownerRole: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.OwnerRole)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.ownerRole (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:ownerRole: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetQuotaArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetQuotaArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetQuotaResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetQuotaResult() *ReadOnlySchedulerGetQuotaResult {
-	return &ReadOnlySchedulerGetQuotaResult{}
-}
-
-var ReadOnlySchedulerGetQuotaResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetQuotaResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetQuotaResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetQuotaResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetQuotaResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetQuotaResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetQuotaResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getQuota_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetQuotaResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetQuotaResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetQuotaResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Description
-type ReadOnlySchedulerPopulateJobConfigArgs struct {
-	Description *JobConfiguration `thrift:"description,1" json:"description"`
-}
-
-func NewReadOnlySchedulerPopulateJobConfigArgs() *ReadOnlySchedulerPopulateJobConfigArgs {
-	return &ReadOnlySchedulerPopulateJobConfigArgs{}
-}
-
-var ReadOnlySchedulerPopulateJobConfigArgs_Description_DEFAULT *JobConfiguration
-
-func (p *ReadOnlySchedulerPopulateJobConfigArgs) GetDescription() *JobConfiguration {
-	if !p.IsSetDescription() {
-		return ReadOnlySchedulerPopulateJobConfigArgs_Description_DEFAULT
-	}
-	return p.Description
-}
-func (p *ReadOnlySchedulerPopulateJobConfigArgs) IsSetDescription() bool {
-	return p.Description != nil
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigArgs) readField1(iprot thrift.TProtocol) error {
-	p.Description = &JobConfiguration{}
-	if err := p.Description.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Description), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("populateJobConfig_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("description", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:description: ", p), err)
-	}
-	if err := p.Description.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Description), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:description: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerPopulateJobConfigArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerPopulateJobConfigResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerPopulateJobConfigResult() *ReadOnlySchedulerPopulateJobConfigResult {
-	return &ReadOnlySchedulerPopulateJobConfigResult{}
-}
-
-var ReadOnlySchedulerPopulateJobConfigResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerPopulateJobConfigResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerPopulateJobConfigResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerPopulateJobConfigResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("populateJobConfig_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerPopulateJobConfigResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerPopulateJobConfigResult(%+v)", *p)
-}
-
-// Attributes:
-//  - JobUpdateQuery
-type ReadOnlySchedulerGetJobUpdateSummariesArgs struct {
-	JobUpdateQuery *JobUpdateQuery `thrift:"jobUpdateQuery,1" json:"jobUpdateQuery"`
-}
-
-func NewReadOnlySchedulerGetJobUpdateSummariesArgs() *ReadOnlySchedulerGetJobUpdateSummariesArgs {
-	return &ReadOnlySchedulerGetJobUpdateSummariesArgs{}
-}
-
-var ReadOnlySchedulerGetJobUpdateSummariesArgs_JobUpdateQuery_DEFAULT *JobUpdateQuery
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) GetJobUpdateQuery() *JobUpdateQuery {
-	if !p.IsSetJobUpdateQuery() {
-		return ReadOnlySchedulerGetJobUpdateSummariesArgs_JobUpdateQuery_DEFAULT
-	}
-	return p.JobUpdateQuery
-}
-func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) IsSetJobUpdateQuery() bool {
-	return p.JobUpdateQuery != nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) readField1(iprot thrift.TProtocol) error {
-	p.JobUpdateQuery = &JobUpdateQuery{}
-	if err := p.JobUpdateQuery.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobUpdateQuery), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobUpdateSummaries_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("jobUpdateQuery", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:jobUpdateQuery: ", p), err)
-	}
-	if err := p.JobUpdateQuery.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobUpdateQuery), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:jobUpdateQuery: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateSummariesArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetJobUpdateSummariesResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetJobUpdateSummariesResult() *ReadOnlySchedulerGetJobUpdateSummariesResult {
-	return &ReadOnlySchedulerGetJobUpdateSummariesResult{}
-}
-
-var ReadOnlySchedulerGetJobUpdateSummariesResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetJobUpdateSummariesResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobUpdateSummaries_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateSummariesResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateSummariesResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Query
-type ReadOnlySchedulerGetJobUpdateDetailsArgs struct {
-	// unused field # 1
-	Query *JobUpdateQuery `thrift:"query,2" json:"query"`
-}
-
-func NewReadOnlySchedulerGetJobUpdateDetailsArgs() *ReadOnlySchedulerGetJobUpdateDetailsArgs {
-	return &ReadOnlySchedulerGetJobUpdateDetailsArgs{}
-}
-
-var ReadOnlySchedulerGetJobUpdateDetailsArgs_Query_DEFAULT *JobUpdateQuery
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) GetQuery() *JobUpdateQuery {
-	if !p.IsSetQuery() {
-		return ReadOnlySchedulerGetJobUpdateDetailsArgs_Query_DEFAULT
-	}
-	return p.Query
-}
-func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) IsSetQuery() bool {
-	return p.Query != nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) readField2(iprot thrift.TProtocol) error {
-	p.Query = &JobUpdateQuery{}
-	if err := p.Query.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobUpdateDetails_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:query: ", p), err)
-	}
-	if err := p.Query.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:query: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateDetailsArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetJobUpdateDetailsResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetJobUpdateDetailsResult() *ReadOnlySchedulerGetJobUpdateDetailsResult {
-	return &ReadOnlySchedulerGetJobUpdateDetailsResult{}
-}
-
-var ReadOnlySchedulerGetJobUpdateDetailsResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetJobUpdateDetailsResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobUpdateDetails_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDetailsResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateDetailsResult(%+v)", *p)
-}
-
-// Attributes:
-//  - Request
-type ReadOnlySchedulerGetJobUpdateDiffArgs struct {
-	Request *JobUpdateRequest `thrift:"request,1" json:"request"`
-}
-
-func NewReadOnlySchedulerGetJobUpdateDiffArgs() *ReadOnlySchedulerGetJobUpdateDiffArgs {
-	return &ReadOnlySchedulerGetJobUpdateDiffArgs{}
-}
-
-var ReadOnlySchedulerGetJobUpdateDiffArgs_Request_DEFAULT *JobUpdateRequest
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) GetRequest() *JobUpdateRequest {
-	if !p.IsSetRequest() {
-		return ReadOnlySchedulerGetJobUpdateDiffArgs_Request_DEFAULT
-	}
-	return p.Request
-}
-func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) IsSetRequest() bool {
-	return p.Request != nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) readField1(iprot thrift.TProtocol) error {
-	p.Request = &JobUpdateRequest{}
-	if err := p.Request.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Request), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobUpdateDiff_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:request: ", p), err)
-	}
-	if err := p.Request.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Request), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:request: ", p), err)
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateDiffArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetJobUpdateDiffResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetJobUpdateDiffResult() *ReadOnlySchedulerGetJobUpdateDiffResult {
-	return &ReadOnlySchedulerGetJobUpdateDiffResult{}
-}
-
-var ReadOnlySchedulerGetJobUpdateDiffResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetJobUpdateDiffResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetJobUpdateDiffResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getJobUpdateDiff_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetJobUpdateDiffResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetJobUpdateDiffResult(%+v)", *p)
-}
-
-type ReadOnlySchedulerGetTierConfigsArgs struct {
-}
-
-func NewReadOnlySchedulerGetTierConfigsArgs() *ReadOnlySchedulerGetTierConfigsArgs {
-	return &ReadOnlySchedulerGetTierConfigsArgs{}
-}
-
-func (p *ReadOnlySchedulerGetTierConfigsArgs) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		if err := iprot.Skip(fieldTypeId); err != nil {
-			return err
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTierConfigsArgs) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getTierConfigs_args"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTierConfigsArgs) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetTierConfigsArgs(%+v)", *p)
-}
-
-// Attributes:
-//  - Success
-type ReadOnlySchedulerGetTierConfigsResult struct {
-	Success *Response `thrift:"success,0" json:"success,omitempty"`
-}
-
-func NewReadOnlySchedulerGetTierConfigsResult() *ReadOnlySchedulerGetTierConfigsResult {
-	return &ReadOnlySchedulerGetTierConfigsResult{}
-}
-
-var ReadOnlySchedulerGetTierConfigsResult_Success_DEFAULT *Response
-
-func (p *ReadOnlySchedulerGetTierConfigsResult) GetSuccess() *Response {
-	if !p.IsSetSuccess() {
-		return ReadOnlySchedulerGetTierConfigsResult_Success_DEFAULT
-	}
-	return p.Success
-}
-func (p *ReadOnlySchedulerGetTierConfigsResult) IsSetSuccess() bool {
-	return p.Success != nil
-}
-
-func (p *ReadOnlySchedulerGetTierConfigsResult) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 0:
-			if err := p.readField0(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTierConfigsResult) readField0(iprot thrift.TProtocol) error {
-	p.Success = &Response{}
-	if err := p.Success.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTierConfigsResult) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("getTierConfigs_result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField0(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ReadOnlySchedulerGetTierConfigsResult) writeField0(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSuccess() {
-		if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err)
-		}
-		if err := p.Success.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ReadOnlySchedulerGetTierConfigsResult) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ReadOnlySchedulerGetTierConfigsResult(%+v)", *p)
-}
diff --git a/gen-go/apache/aurora/ttypes.go b/gen-go/apache/aurora/ttypes.go
deleted file mode 100644
index 1f1d45c..0000000
--- a/gen-go/apache/aurora/ttypes.go
+++ /dev/null
@@ -1,16424 +0,0 @@
-// Autogenerated by Thrift Compiler (0.9.3)
-// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-
-package aurora
-
-import (
-	"bytes"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-)
-
-// (needed to ensure safety because of naive import list construction.)
-var _ = thrift.ZERO
-var _ = fmt.Printf
-var _ = bytes.Equal
-
-var GoUnusedProtection__ int
-
-type ResponseCode int64
-
-const (
-	ResponseCode_INVALID_REQUEST    ResponseCode = 0
-	ResponseCode_OK                 ResponseCode = 1
-	ResponseCode_ERROR              ResponseCode = 2
-	ResponseCode_WARNING            ResponseCode = 3
-	ResponseCode_AUTH_FAILED        ResponseCode = 4
-	ResponseCode_JOB_UPDATING_ERROR ResponseCode = 5
-	ResponseCode_ERROR_TRANSIENT    ResponseCode = 6
-)
-
-func (p ResponseCode) String() string {
-	switch p {
-	case ResponseCode_INVALID_REQUEST:
-		return "INVALID_REQUEST"
-	case ResponseCode_OK:
-		return "OK"
-	case ResponseCode_ERROR:
-		return "ERROR"
-	case ResponseCode_WARNING:
-		return "WARNING"
-	case ResponseCode_AUTH_FAILED:
-		return "AUTH_FAILED"
-	case ResponseCode_JOB_UPDATING_ERROR:
-		return "JOB_UPDATING_ERROR"
-	case ResponseCode_ERROR_TRANSIENT:
-		return "ERROR_TRANSIENT"
-	}
-	return "<UNSET>"
-}
-
-func ResponseCodeFromString(s string) (ResponseCode, error) {
-	switch s {
-	case "INVALID_REQUEST":
-		return ResponseCode_INVALID_REQUEST, nil
-	case "OK":
-		return ResponseCode_OK, nil
-	case "ERROR":
-		return ResponseCode_ERROR, nil
-	case "WARNING":
-		return ResponseCode_WARNING, nil
-	case "AUTH_FAILED":
-		return ResponseCode_AUTH_FAILED, nil
-	case "JOB_UPDATING_ERROR":
-		return ResponseCode_JOB_UPDATING_ERROR, nil
-	case "ERROR_TRANSIENT":
-		return ResponseCode_ERROR_TRANSIENT, nil
-	}
-	return ResponseCode(0), fmt.Errorf("not a valid ResponseCode string")
-}
-
-func ResponseCodePtr(v ResponseCode) *ResponseCode { return &v }
-
-func (p ResponseCode) MarshalText() ([]byte, error) {
-	return []byte(p.String()), nil
-}
-
-func (p *ResponseCode) UnmarshalText(text []byte) error {
-	q, err := ResponseCodeFromString(string(text))
-	if err != nil {
-		return err
-	}
-	*p = q
-	return nil
-}
-
-type MaintenanceMode int64
-
-const (
-	MaintenanceMode_NONE      MaintenanceMode = 1
-	MaintenanceMode_SCHEDULED MaintenanceMode = 2
-	MaintenanceMode_DRAINING  MaintenanceMode = 3
-	MaintenanceMode_DRAINED   MaintenanceMode = 4
-)
-
-func (p MaintenanceMode) String() string {
-	switch p {
-	case MaintenanceMode_NONE:
-		return "NONE"
-	case MaintenanceMode_SCHEDULED:
-		return "SCHEDULED"
-	case MaintenanceMode_DRAINING:
-		return "DRAINING"
-	case MaintenanceMode_DRAINED:
-		return "DRAINED"
-	}
-	return "<UNSET>"
-}
-
-func MaintenanceModeFromString(s string) (MaintenanceMode, error) {
-	switch s {
-	case "NONE":
-		return MaintenanceMode_NONE, nil
-	case "SCHEDULED":
-		return MaintenanceMode_SCHEDULED, nil
-	case "DRAINING":
-		return MaintenanceMode_DRAINING, nil
-	case "DRAINED":
-		return MaintenanceMode_DRAINED, nil
-	}
-	return MaintenanceMode(0), fmt.Errorf("not a valid MaintenanceMode string")
-}
-
-func MaintenanceModePtr(v MaintenanceMode) *MaintenanceMode { return &v }
-
-func (p MaintenanceMode) MarshalText() ([]byte, error) {
-	return []byte(p.String()), nil
-}
-
-func (p *MaintenanceMode) UnmarshalText(text []byte) error {
-	q, err := MaintenanceModeFromString(string(text))
-	if err != nil {
-		return err
-	}
-	*p = q
-	return nil
-}
-
-//The mode for a volume mount
-type Mode int64
-
-const (
-	Mode_RW Mode = 1
-	Mode_RO Mode = 2
-)
-
-func (p Mode) String() string {
-	switch p {
-	case Mode_RW:
-		return "RW"
-	case Mode_RO:
-		return "RO"
-	}
-	return "<UNSET>"
-}
-
-func ModeFromString(s string) (Mode, error) {
-	switch s {
-	case "RW":
-		return Mode_RW, nil
-	case "RO":
-		return Mode_RO, nil
-	}
-	return Mode(0), fmt.Errorf("not a valid Mode string")
-}
-
-func ModePtr(v Mode) *Mode { return &v }
-
-func (p Mode) MarshalText() ([]byte, error) {
-	return []byte(p.String()), nil
-}
-
-func (p *Mode) UnmarshalText(text []byte) error {
-	q, err := ModeFromString(string(text))
-	if err != nil {
-		return err
-	}
-	*p = q
-	return nil
-}
-
-//Defines the policy for launching a new cron job when one is already running.
-type CronCollisionPolicy int64
-
-const (
-	CronCollisionPolicy_KILL_EXISTING CronCollisionPolicy = 0
-	CronCollisionPolicy_CANCEL_NEW    CronCollisionPolicy = 1
-	CronCollisionPolicy_RUN_OVERLAP   CronCollisionPolicy = 2
-)
-
-func (p CronCollisionPolicy) String() string {
-	switch p {
-	case CronCollisionPolicy_KILL_EXISTING:
-		return "KILL_EXISTING"
-	case CronCollisionPolicy_CANCEL_NEW:
-		return "CANCEL_NEW"
-	case CronCollisionPolicy_RUN_OVERLAP:
-		return "RUN_OVERLAP"
-	}
-	return "<UNSET>"
-}
-
-func CronCollisionPolicyFromString(s string) (CronCollisionPolicy, error) {
-	switch s {
-	case "KILL_EXISTING":
-		return CronCollisionPolicy_KILL_EXISTING, nil
-	case "CANCEL_NEW":
-		return CronCollisionPolicy_CANCEL_NEW, nil
-	case "RUN_OVERLAP":
-		return CronCollisionPolicy_RUN_OVERLAP, nil
-	}
-	return CronCollisionPolicy(0), fmt.Errorf("not a valid CronCollisionPolicy string")
-}
-
-func CronCollisionPolicyPtr(v CronCollisionPolicy) *CronCollisionPolicy { return &v }
-
-func (p CronCollisionPolicy) MarshalText() ([]byte, error) {
-	return []byte(p.String()), nil
-}
-
-func (p *CronCollisionPolicy) UnmarshalText(text []byte) error {
-	q, err := CronCollisionPolicyFromString(string(text))
-	if err != nil {
-		return err
-	}
-	*p = q
-	return nil
-}
-
-//States that a task may be in.
-type ScheduleStatus int64
-
-const (
-	ScheduleStatus_INIT        ScheduleStatus = 11
-	ScheduleStatus_THROTTLED   ScheduleStatus = 16
-	ScheduleStatus_PENDING     ScheduleStatus = 0
-	ScheduleStatus_ASSIGNED    ScheduleStatus = 9
-	ScheduleStatus_STARTING    ScheduleStatus = 1
-	ScheduleStatus_RUNNING     ScheduleStatus = 2
-	ScheduleStatus_FINISHED    ScheduleStatus = 3
-	ScheduleStatus_PREEMPTING  ScheduleStatus = 13
-	ScheduleStatus_RESTARTING  ScheduleStatus = 12
-	ScheduleStatus_DRAINING    ScheduleStatus = 17
-	ScheduleStatus_FAILED      ScheduleStatus = 4
-	ScheduleStatus_KILLED      ScheduleStatus = 5
-	ScheduleStatus_KILLING     ScheduleStatus = 6
-	ScheduleStatus_LOST        ScheduleStatus = 7
-	ScheduleStatus_PARTITIONED ScheduleStatus = 18
-)
-
-func (p ScheduleStatus) String() string {
-	switch p {
-	case ScheduleStatus_INIT:
-		return "INIT"
-	case ScheduleStatus_THROTTLED:
-		return "THROTTLED"
-	case ScheduleStatus_PENDING:
-		return "PENDING"
-	case ScheduleStatus_ASSIGNED:
-		return "ASSIGNED"
-	case ScheduleStatus_STARTING:
-		return "STARTING"
-	case ScheduleStatus_RUNNING:
-		return "RUNNING"
-	case ScheduleStatus_FINISHED:
-		return "FINISHED"
-	case ScheduleStatus_PREEMPTING:
-		return "PREEMPTING"
-	case ScheduleStatus_RESTARTING:
-		return "RESTARTING"
-	case ScheduleStatus_DRAINING:
-		return "DRAINING"
-	case ScheduleStatus_FAILED:
-		return "FAILED"
-	case ScheduleStatus_KILLED:
-		return "KILLED"
-	case ScheduleStatus_KILLING:
-		return "KILLING"
-	case ScheduleStatus_LOST:
-		return "LOST"
-	case ScheduleStatus_PARTITIONED:
-		return "PARTITIONED"
-	}
-	return "<UNSET>"
-}
-
-func ScheduleStatusFromString(s string) (ScheduleStatus, error) {
-	switch s {
-	case "INIT":
-		return ScheduleStatus_INIT, nil
-	case "THROTTLED":
-		return ScheduleStatus_THROTTLED, nil
-	case "PENDING":
-		return ScheduleStatus_PENDING, nil
-	case "ASSIGNED":
-		return ScheduleStatus_ASSIGNED, nil
-	case "STARTING":
-		return ScheduleStatus_STARTING, nil
-	case "RUNNING":
-		return ScheduleStatus_RUNNING, nil
-	case "FINISHED":
-		return ScheduleStatus_FINISHED, nil
-	case "PREEMPTING":
-		return ScheduleStatus_PREEMPTING, nil
-	case "RESTARTING":
-		return ScheduleStatus_RESTARTING, nil
-	case "DRAINING":
-		return ScheduleStatus_DRAINING, nil
-	case "FAILED":
-		return ScheduleStatus_FAILED, nil
-	case "KILLED":
-		return ScheduleStatus_KILLED, nil
-	case "KILLING":
-		return ScheduleStatus_KILLING, nil
-	case "LOST":
-		return ScheduleStatus_LOST, nil
-	case "PARTITIONED":
-		return ScheduleStatus_PARTITIONED, nil
-	}
-	return ScheduleStatus(0), fmt.Errorf("not a valid ScheduleStatus string")
-}
-
-func ScheduleStatusPtr(v ScheduleStatus) *ScheduleStatus { return &v }
-
-func (p ScheduleStatus) MarshalText() ([]byte, error) {
-	return []byte(p.String()), nil
-}
-
-func (p *ScheduleStatus) UnmarshalText(text []byte) error {
-	q, err := ScheduleStatusFromString(string(text))
-	if err != nil {
-		return err
-	}
-	*p = q
-	return nil
-}
-
-//States that a job update may be in.
-type JobUpdateStatus int64
-
-const (
-	JobUpdateStatus_ROLLING_FORWARD             JobUpdateStatus = 0
-	JobUpdateStatus_ROLLING_BACK                JobUpdateStatus = 1
-	JobUpdateStatus_ROLL_FORWARD_PAUSED         JobUpdateStatus = 2
-	JobUpdateStatus_ROLL_BACK_PAUSED            JobUpdateStatus = 3
-	JobUpdateStatus_ROLLED_FORWARD              JobUpdateStatus = 4
-	JobUpdateStatus_ROLLED_BACK                 JobUpdateStatus = 5
-	JobUpdateStatus_ABORTED                     JobUpdateStatus = 6
-	JobUpdateStatus_ERROR                       JobUpdateStatus = 7
-	JobUpdateStatus_FAILED                      JobUpdateStatus = 8
-	JobUpdateStatus_ROLL_FORWARD_AWAITING_PULSE JobUpdateStatus = 9
-	JobUpdateStatus_ROLL_BACK_AWAITING_PULSE    JobUpdateStatus = 10
-)
-
-func (p JobUpdateStatus) String() string {
-	switch p {
-	case JobUpdateStatus_ROLLING_FORWARD:
-		return "ROLLING_FORWARD"
-	case JobUpdateStatus_ROLLING_BACK:
-		return "ROLLING_BACK"
-	case JobUpdateStatus_ROLL_FORWARD_PAUSED:
-		return "ROLL_FORWARD_PAUSED"
-	case JobUpdateStatus_ROLL_BACK_PAUSED:
-		return "ROLL_BACK_PAUSED"
-	case JobUpdateStatus_ROLLED_FORWARD:
-		return "ROLLED_FORWARD"
-	case JobUpdateStatus_ROLLED_BACK:
-		return "ROLLED_BACK"
-	case JobUpdateStatus_ABORTED:
-		return "ABORTED"
-	case JobUpdateStatus_ERROR:
-		return "ERROR"
-	case JobUpdateStatus_FAILED:
-		return "FAILED"
-	case JobUpdateStatus_ROLL_FORWARD_AWAITING_PULSE:
-		return "ROLL_FORWARD_AWAITING_PULSE"
-	case JobUpdateStatus_ROLL_BACK_AWAITING_PULSE:
-		return "ROLL_BACK_AWAITING_PULSE"
-	}
-	return "<UNSET>"
-}
-
-func JobUpdateStatusFromString(s string) (JobUpdateStatus, error) {
-	switch s {
-	case "ROLLING_FORWARD":
-		return JobUpdateStatus_ROLLING_FORWARD, nil
-	case "ROLLING_BACK":
-		return JobUpdateStatus_ROLLING_BACK, nil
-	case "ROLL_FORWARD_PAUSED":
-		return JobUpdateStatus_ROLL_FORWARD_PAUSED, nil
-	case "ROLL_BACK_PAUSED":
-		return JobUpdateStatus_ROLL_BACK_PAUSED, nil
-	case "ROLLED_FORWARD":
-		return JobUpdateStatus_ROLLED_FORWARD, nil
-	case "ROLLED_BACK":
-		return JobUpdateStatus_ROLLED_BACK, nil
-	case "ABORTED":
-		return JobUpdateStatus_ABORTED, nil
-	case "ERROR":
-		return JobUpdateStatus_ERROR, nil
-	case "FAILED":
-		return JobUpdateStatus_FAILED, nil
-	case "ROLL_FORWARD_AWAITING_PULSE":
-		return JobUpdateStatus_ROLL_FORWARD_AWAITING_PULSE, nil
-	case "ROLL_BACK_AWAITING_PULSE":
-		return JobUpdateStatus_ROLL_BACK_AWAITING_PULSE, nil
-	}
-	return JobUpdateStatus(0), fmt.Errorf("not a valid JobUpdateStatus string")
-}
-
-func JobUpdateStatusPtr(v JobUpdateStatus) *JobUpdateStatus { return &v }
-
-func (p JobUpdateStatus) MarshalText() ([]byte, error) {
-	return []byte(p.String()), nil
-}
-
-func (p *JobUpdateStatus) UnmarshalText(text []byte) error {
-	q, err := JobUpdateStatusFromString(string(text))
-	if err != nil {
-		return err
-	}
-	*p = q
-	return nil
-}
-
-//Job update actions that can be applied to job instances.
-type JobUpdateAction int64
-
-const (
-	JobUpdateAction_INSTANCE_UPDATED         JobUpdateAction = 1
-	JobUpdateAction_INSTANCE_ROLLED_BACK     JobUpdateAction = 2
-	JobUpdateAction_INSTANCE_UPDATING        JobUpdateAction = 3
-	JobUpdateAction_INSTANCE_ROLLING_BACK    JobUpdateAction = 4
-	JobUpdateAction_INSTANCE_UPDATE_FAILED   JobUpdateAction = 5
-	JobUpdateAction_INSTANCE_ROLLBACK_FAILED JobUpdateAction = 6
-)
-
-func (p JobUpdateAction) String() string {
-	switch p {
-	case JobUpdateAction_INSTANCE_UPDATED:
-		return "INSTANCE_UPDATED"
-	case JobUpdateAction_INSTANCE_ROLLED_BACK:
-		return "INSTANCE_ROLLED_BACK"
-	case JobUpdateAction_INSTANCE_UPDATING:
-		return "INSTANCE_UPDATING"
-	case JobUpdateAction_INSTANCE_ROLLING_BACK:
-		return "INSTANCE_ROLLING_BACK"
-	case JobUpdateAction_INSTANCE_UPDATE_FAILED:
-		return "INSTANCE_UPDATE_FAILED"
-	case JobUpdateAction_INSTANCE_ROLLBACK_FAILED:
-		return "INSTANCE_ROLLBACK_FAILED"
-	}
-	return "<UNSET>"
-}
-
-func JobUpdateActionFromString(s string) (JobUpdateAction, error) {
-	switch s {
-	case "INSTANCE_UPDATED":
-		return JobUpdateAction_INSTANCE_UPDATED, nil
-	case "INSTANCE_ROLLED_BACK":
-		return JobUpdateAction_INSTANCE_ROLLED_BACK, nil
-	case "INSTANCE_UPDATING":
-		return JobUpdateAction_INSTANCE_UPDATING, nil
-	case "INSTANCE_ROLLING_BACK":
-		return JobUpdateAction_INSTANCE_ROLLING_BACK, nil
-	case "INSTANCE_UPDATE_FAILED":
-		return JobUpdateAction_INSTANCE_UPDATE_FAILED, nil
-	case "INSTANCE_ROLLBACK_FAILED":
-		return JobUpdateAction_INSTANCE_ROLLBACK_FAILED, nil
-	}
-	return JobUpdateAction(0), fmt.Errorf("not a valid JobUpdateAction string")
-}
-
-func JobUpdateActionPtr(v JobUpdateAction) *JobUpdateAction { return &v }
-
-func (p JobUpdateAction) MarshalText() ([]byte, error) {
-	return []byte(p.String()), nil
-}
-
-func (p *JobUpdateAction) UnmarshalText(text []byte) error {
-	q, err := JobUpdateActionFromString(string(text))
-	if err != nil {
-		return err
-	}
-	*p = q
-	return nil
-}
-
-//Status of the coordinated update. Intended as a response to pulseJobUpdate RPC.
-type JobUpdatePulseStatus int64
-
-const (
-	JobUpdatePulseStatus_OK       JobUpdatePulseStatus = 1
-	JobUpdatePulseStatus_FINISHED JobUpdatePulseStatus = 2
-)
-
-func (p JobUpdatePulseStatus) String() string {
-	switch p {
-	case JobUpdatePulseStatus_OK:
-		return "OK"
-	case JobUpdatePulseStatus_FINISHED:
-		return "FINISHED"
-	}
-	return "<UNSET>"
-}
-
-func JobUpdatePulseStatusFromString(s string) (JobUpdatePulseStatus, error) {
-	switch s {
-	case "OK":
-		return JobUpdatePulseStatus_OK, nil
-	case "FINISHED":
-		return JobUpdatePulseStatus_FINISHED, nil
-	}
-	return JobUpdatePulseStatus(0), fmt.Errorf("not a valid JobUpdatePulseStatus string")
-}
-
-func JobUpdatePulseStatusPtr(v JobUpdatePulseStatus) *JobUpdatePulseStatus { return &v }
-
-func (p JobUpdatePulseStatus) MarshalText() ([]byte, error) {
-	return []byte(p.String()), nil
-}
-
-func (p *JobUpdatePulseStatus) UnmarshalText(text []byte) error {
-	q, err := JobUpdatePulseStatusFromString(string(text))
-	if err != nil {
-		return err
-	}
-	*p = q
-	return nil
-}
-
-// Attributes:
-//  - User
-type Identity struct {
-	// unused field # 1
-	User string `thrift:"user,2" json:"user"`
-}
-
-func NewIdentity() *Identity {
-	return &Identity{}
-}
-
-func (p *Identity) GetUser() string {
-	return p.User
-}
-func (p *Identity) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Identity) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.User = v
-	}
-	return nil
-}
-
-func (p *Identity) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Identity"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Identity) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("user", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:user: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.User)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.user (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:user: ", p), err)
-	}
-	return err
-}
-
-func (p *Identity) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Identity(%+v)", *p)
-}
-
-// A single host attribute.
-//
-// Attributes:
-//  - Name
-//  - Values
-type Attribute struct {
-	Name   string          `thrift:"name,1" json:"name"`
-	Values map[string]bool `thrift:"values,2" json:"values"`
-}
-
-func NewAttribute() *Attribute {
-	return &Attribute{}
-}
-
-func (p *Attribute) GetName() string {
-	return p.Name
-}
-
-func (p *Attribute) GetValues() map[string]bool {
-	return p.Values
-}
-func (p *Attribute) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Attribute) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *Attribute) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[string]bool, size)
-	p.Values = tSet
-	for i := 0; i < size; i++ {
-		var _elem0 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem0 = v
-		}
-		p.Values[_elem0] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *Attribute) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Attribute"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Attribute) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err)
-	}
-	return err
-}
-
-func (p *Attribute) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("values", thrift.SET, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:values: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRING, len(p.Values)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Values {
-		if err := oprot.WriteString(string(v)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:values: ", p), err)
-	}
-	return err
-}
-
-func (p *Attribute) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Attribute(%+v)", *p)
-}
-
-// The attributes assigned to a host.
-//
-// Attributes:
-//  - Host
-//  - Attributes
-//  - Mode
-//  - SlaveId
-type HostAttributes struct {
-	Host       string              `thrift:"host,1" json:"host"`
-	Attributes map[*Attribute]bool `thrift:"attributes,2" json:"attributes"`
-	Mode       *MaintenanceMode    `thrift:"mode,3" json:"mode,omitempty"`
-	SlaveId    *string             `thrift:"slaveId,4" json:"slaveId,omitempty"`
-}
-
-func NewHostAttributes() *HostAttributes {
-	return &HostAttributes{}
-}
-
-func (p *HostAttributes) GetHost() string {
-	return p.Host
-}
-
-func (p *HostAttributes) GetAttributes() map[*Attribute]bool {
-	return p.Attributes
-}
-
-var HostAttributes_Mode_DEFAULT MaintenanceMode
-
-func (p *HostAttributes) GetMode() MaintenanceMode {
-	if !p.IsSetMode() {
-		return HostAttributes_Mode_DEFAULT
-	}
-	return *p.Mode
-}
-
-var HostAttributes_SlaveId_DEFAULT string
-
-func (p *HostAttributes) GetSlaveId() string {
-	if !p.IsSetSlaveId() {
-		return HostAttributes_SlaveId_DEFAULT
-	}
-	return *p.SlaveId
-}
-func (p *HostAttributes) IsSetMode() bool {
-	return p.Mode != nil
-}
-
-func (p *HostAttributes) IsSetSlaveId() bool {
-	return p.SlaveId != nil
-}
-
-func (p *HostAttributes) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *HostAttributes) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Host = v
-	}
-	return nil
-}
-
-func (p *HostAttributes) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Attribute]bool, size)
-	p.Attributes = tSet
-	for i := 0; i < size; i++ {
-		_elem1 := &Attribute{}
-		if err := _elem1.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem1), err)
-		}
-		p.Attributes[_elem1] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *HostAttributes) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		temp := MaintenanceMode(v)
-		p.Mode = &temp
-	}
-	return nil
-}
-
-func (p *HostAttributes) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.SlaveId = &v
-	}
-	return nil
-}
-
-func (p *HostAttributes) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("HostAttributes"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *HostAttributes) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("host", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:host: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Host)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.host (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:host: ", p), err)
-	}
-	return err
-}
-
-func (p *HostAttributes) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("attributes", thrift.SET, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:attributes: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Attributes)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Attributes {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:attributes: ", p), err)
-	}
-	return err
-}
-
-func (p *HostAttributes) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMode() {
-		if err := oprot.WriteFieldBegin("mode", thrift.I32, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:mode: ", p), err)
-		}
-		if err := oprot.WriteI32(int32(*p.Mode)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.mode (3) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:mode: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *HostAttributes) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSlaveId() {
-		if err := oprot.WriteFieldBegin("slaveId", thrift.STRING, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:slaveId: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.SlaveId)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.slaveId (4) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:slaveId: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *HostAttributes) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("HostAttributes(%+v)", *p)
-}
-
-// A constraint that specifies an explicit set of values, at least one of which must be present
-// on a host for a task to be scheduled there.
-//
-// Attributes:
-//  - Negated: If true, treat this as a 'not' - to avoid specific values.
-//  - Values
-type ValueConstraint struct {
-	Negated bool            `thrift:"negated,1" json:"negated"`
-	Values  map[string]bool `thrift:"values,2" json:"values"`
-}
-
-func NewValueConstraint() *ValueConstraint {
-	return &ValueConstraint{}
-}
-
-func (p *ValueConstraint) GetNegated() bool {
-	return p.Negated
-}
-
-func (p *ValueConstraint) GetValues() map[string]bool {
-	return p.Values
-}
-func (p *ValueConstraint) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ValueConstraint) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Negated = v
-	}
-	return nil
-}
-
-func (p *ValueConstraint) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[string]bool, size)
-	p.Values = tSet
-	for i := 0; i < size; i++ {
-		var _elem2 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem2 = v
-		}
-		p.Values[_elem2] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *ValueConstraint) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ValueConstraint"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ValueConstraint) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("negated", thrift.BOOL, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:negated: ", p), err)
-	}
-	if err := oprot.WriteBool(bool(p.Negated)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.negated (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:negated: ", p), err)
-	}
-	return err
-}
-
-func (p *ValueConstraint) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("values", thrift.SET, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:values: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRING, len(p.Values)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Values {
-		if err := oprot.WriteString(string(v)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:values: ", p), err)
-	}
-	return err
-}
-
-func (p *ValueConstraint) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ValueConstraint(%+v)", *p)
-}
-
-// A constraint the specifies the maximum number of active tasks on a host with a matching
-// attribute that may be scheduled simultaneously.
-//
-// Attributes:
-//  - Limit
-type LimitConstraint struct {
-	Limit int32 `thrift:"limit,1" json:"limit"`
-}
-
-func NewLimitConstraint() *LimitConstraint {
-	return &LimitConstraint{}
-}
-
-func (p *LimitConstraint) GetLimit() int32 {
-	return p.Limit
-}
-func (p *LimitConstraint) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *LimitConstraint) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Limit = v
-	}
-	return nil
-}
-
-func (p *LimitConstraint) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("LimitConstraint"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *LimitConstraint) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("limit", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:limit: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Limit)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.limit (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:limit: ", p), err)
-	}
-	return err
-}
-
-func (p *LimitConstraint) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("LimitConstraint(%+v)", *p)
-}
-
-// Types of constraints that may be applied to a task.
-//
-// Attributes:
-//  - Value
-//  - Limit
-type TaskConstraint struct {
-	Value *ValueConstraint `thrift:"value,1" json:"value,omitempty"`
-	Limit *LimitConstraint `thrift:"limit,2" json:"limit,omitempty"`
-}
-
-func NewTaskConstraint() *TaskConstraint {
-	return &TaskConstraint{}
-}
-
-var TaskConstraint_Value_DEFAULT *ValueConstraint
-
-func (p *TaskConstraint) GetValue() *ValueConstraint {
-	if !p.IsSetValue() {
-		return TaskConstraint_Value_DEFAULT
-	}
-	return p.Value
-}
-
-var TaskConstraint_Limit_DEFAULT *LimitConstraint
-
-func (p *TaskConstraint) GetLimit() *LimitConstraint {
-	if !p.IsSetLimit() {
-		return TaskConstraint_Limit_DEFAULT
-	}
-	return p.Limit
-}
-func (p *TaskConstraint) CountSetFieldsTaskConstraint() int {
-	count := 0
-	if p.IsSetValue() {
-		count++
-	}
-	if p.IsSetLimit() {
-		count++
-	}
-	return count
-
-}
-
-func (p *TaskConstraint) IsSetValue() bool {
-	return p.Value != nil
-}
-
-func (p *TaskConstraint) IsSetLimit() bool {
-	return p.Limit != nil
-}
-
-func (p *TaskConstraint) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *TaskConstraint) readField1(iprot thrift.TProtocol) error {
-	p.Value = &ValueConstraint{}
-	if err := p.Value.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Value), err)
-	}
-	return nil
-}
-
-func (p *TaskConstraint) readField2(iprot thrift.TProtocol) error {
-	p.Limit = &LimitConstraint{}
-	if err := p.Limit.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Limit), err)
-	}
-	return nil
-}
-
-func (p *TaskConstraint) Write(oprot thrift.TProtocol) error {
-	if c := p.CountSetFieldsTaskConstraint(); c != 1 {
-		return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
-	}
-	if err := oprot.WriteStructBegin("TaskConstraint"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *TaskConstraint) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetValue() {
-		if err := oprot.WriteFieldBegin("value", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:value: ", p), err)
-		}
-		if err := p.Value.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Value), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:value: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConstraint) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetLimit() {
-		if err := oprot.WriteFieldBegin("limit", thrift.STRUCT, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:limit: ", p), err)
-		}
-		if err := p.Limit.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Limit), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:limit: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConstraint) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("TaskConstraint(%+v)", *p)
-}
-
-// A constraint that defines whether a task may be scheduled on a host.
-//
-// Attributes:
-//  - Name: Mesos slave attribute that the constraint is matched against.
-//  - Constraint
-type Constraint struct {
-	Name       string          `thrift:"name,1" json:"name"`
-	Constraint *TaskConstraint `thrift:"constraint,2" json:"constraint"`
-}
-
-func NewConstraint() *Constraint {
-	return &Constraint{}
-}
-
-func (p *Constraint) GetName() string {
-	return p.Name
-}
-
-var Constraint_Constraint_DEFAULT *TaskConstraint
-
-func (p *Constraint) GetConstraint() *TaskConstraint {
-	if !p.IsSetConstraint() {
-		return Constraint_Constraint_DEFAULT
-	}
-	return p.Constraint
-}
-func (p *Constraint) IsSetConstraint() bool {
-	return p.Constraint != nil
-}
-
-func (p *Constraint) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Constraint) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *Constraint) readField2(iprot thrift.TProtocol) error {
-	p.Constraint = &TaskConstraint{}
-	if err := p.Constraint.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Constraint), err)
-	}
-	return nil
-}
-
-func (p *Constraint) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Constraint"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Constraint) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err)
-	}
-	return err
-}
-
-func (p *Constraint) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("constraint", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:constraint: ", p), err)
-	}
-	if err := p.Constraint.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Constraint), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:constraint: ", p), err)
-	}
-	return err
-}
-
-func (p *Constraint) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Constraint(%+v)", *p)
-}
-
-// Attributes:
-//  - Role
-//  - Name
-//  - Version
-type Package struct {
-	Role    string `thrift:"role,1" json:"role"`
-	Name    string `thrift:"name,2" json:"name"`
-	Version int32  `thrift:"version,3" json:"version"`
-}
-
-func NewPackage() *Package {
-	return &Package{}
-}
-
-func (p *Package) GetRole() string {
-	return p.Role
-}
-
-func (p *Package) GetName() string {
-	return p.Name
-}
-
-func (p *Package) GetVersion() int32 {
-	return p.Version
-}
-func (p *Package) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Package) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Role = v
-	}
-	return nil
-}
-
-func (p *Package) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *Package) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Version = v
-	}
-	return nil
-}
-
-func (p *Package) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Package"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Package) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("role", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:role: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Role)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.role (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:role: ", p), err)
-	}
-	return err
-}
-
-func (p *Package) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:name: ", p), err)
-	}
-	return err
-}
-
-func (p *Package) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("version", thrift.I32, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:version: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Version)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.version (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:version: ", p), err)
-	}
-	return err
-}
-
-func (p *Package) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Package(%+v)", *p)
-}
-
-// Arbitrary key-value metadata to be included into TaskConfig.
-//
-// Attributes:
-//  - Key
-//  - Value
-type Metadata struct {
-	Key   string `thrift:"key,1" json:"key"`
-	Value string `thrift:"value,2" json:"value"`
-}
-
-func NewMetadata() *Metadata {
-	return &Metadata{}
-}
-
-func (p *Metadata) GetKey() string {
-	return p.Key
-}
-
-func (p *Metadata) GetValue() string {
-	return p.Value
-}
-func (p *Metadata) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Metadata) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Key = v
-	}
-	return nil
-}
-
-func (p *Metadata) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Value = v
-	}
-	return nil
-}
-
-func (p *Metadata) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Metadata"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Metadata) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Key)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.key (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *Metadata) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("value", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:value: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Value)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.value (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:value: ", p), err)
-	}
-	return err
-}
-
-func (p *Metadata) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Metadata(%+v)", *p)
-}
-
-// A unique identifier for a Job.
-//
-// Attributes:
-//  - Role: User role (Unix service account), for example "mesos"
-//  - Environment: Environment, for example "devel"
-//  - Name: Name, for example "labrat"
-type JobKey struct {
-	Role        string `thrift:"role,1" json:"role"`
-	Environment string `thrift:"environment,2" json:"environment"`
-	Name        string `thrift:"name,3" json:"name"`
-}
-
-func NewJobKey() *JobKey {
-	return &JobKey{}
-}
-
-func (p *JobKey) GetRole() string {
-	return p.Role
-}
-
-func (p *JobKey) GetEnvironment() string {
-	return p.Environment
-}
-
-func (p *JobKey) GetName() string {
-	return p.Name
-}
-func (p *JobKey) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobKey) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Role = v
-	}
-	return nil
-}
-
-func (p *JobKey) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Environment = v
-	}
-	return nil
-}
-
-func (p *JobKey) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *JobKey) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobKey"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobKey) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("role", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:role: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Role)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.role (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:role: ", p), err)
-	}
-	return err
-}
-
-func (p *JobKey) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("environment", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:environment: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Environment)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.environment (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:environment: ", p), err)
-	}
-	return err
-}
-
-func (p *JobKey) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:name: ", p), err)
-	}
-	return err
-}
-
-func (p *JobKey) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobKey(%+v)", *p)
-}
-
-// A unique lock key.
-//
-// Attributes:
-//  - Job
-type LockKey struct {
-	Job *JobKey `thrift:"job,1" json:"job,omitempty"`
-}
-
-func NewLockKey() *LockKey {
-	return &LockKey{}
-}
-
-var LockKey_Job_DEFAULT *JobKey
-
-func (p *LockKey) GetJob() *JobKey {
-	if !p.IsSetJob() {
-		return LockKey_Job_DEFAULT
-	}
-	return p.Job
-}
-func (p *LockKey) CountSetFieldsLockKey() int {
-	count := 0
-	if p.IsSetJob() {
-		count++
-	}
-	return count
-
-}
-
-func (p *LockKey) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *LockKey) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *LockKey) readField1(iprot thrift.TProtocol) error {
-	p.Job = &JobKey{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *LockKey) Write(oprot thrift.TProtocol) error {
-	if c := p.CountSetFieldsLockKey(); c != 1 {
-		return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
-	}
-	if err := oprot.WriteStructBegin("LockKey"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *LockKey) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetJob() {
-		if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:job: ", p), err)
-		}
-		if err := p.Job.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:job: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *LockKey) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("LockKey(%+v)", *p)
-}
-
-// A generic lock struct to facilitate context specific resource/operation serialization.
-//
-// Attributes:
-//  - Key: ID of the lock - unique per storage
-//  - Token: UUID - facilitating soft lock authorization
-//  - User: Lock creator
-//  - TimestampMs: Lock creation timestamp in milliseconds
-//  - Message: Optional message to record with the lock
-type Lock struct {
-	Key         *LockKey `thrift:"key,1" json:"key"`
-	Token       string   `thrift:"token,2" json:"token"`
-	User        string   `thrift:"user,3" json:"user"`
-	TimestampMs int64    `thrift:"timestampMs,4" json:"timestampMs"`
-	Message     *string  `thrift:"message,5" json:"message,omitempty"`
-}
-
-func NewLock() *Lock {
-	return &Lock{}
-}
-
-var Lock_Key_DEFAULT *LockKey
-
-func (p *Lock) GetKey() *LockKey {
-	if !p.IsSetKey() {
-		return Lock_Key_DEFAULT
-	}
-	return p.Key
-}
-
-func (p *Lock) GetToken() string {
-	return p.Token
-}
-
-func (p *Lock) GetUser() string {
-	return p.User
-}
-
-func (p *Lock) GetTimestampMs() int64 {
-	return p.TimestampMs
-}
-
-var Lock_Message_DEFAULT string
-
-func (p *Lock) GetMessage() string {
-	if !p.IsSetMessage() {
-		return Lock_Message_DEFAULT
-	}
-	return *p.Message
-}
-func (p *Lock) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *Lock) IsSetMessage() bool {
-	return p.Message != nil
-}
-
-func (p *Lock) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Lock) readField1(iprot thrift.TProtocol) error {
-	p.Key = &LockKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *Lock) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Token = v
-	}
-	return nil
-}
-
-func (p *Lock) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.User = v
-	}
-	return nil
-}
-
-func (p *Lock) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.TimestampMs = v
-	}
-	return nil
-}
-
-func (p *Lock) readField5(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 5: ", err)
-	} else {
-		p.Message = &v
-	}
-	return nil
-}
-
-func (p *Lock) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Lock"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Lock) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *Lock) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("token", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:token: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Token)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.token (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:token: ", p), err)
-	}
-	return err
-}
-
-func (p *Lock) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("user", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:user: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.User)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.user (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:user: ", p), err)
-	}
-	return err
-}
-
-func (p *Lock) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("timestampMs", thrift.I64, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:timestampMs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.TimestampMs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.timestampMs (4) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:timestampMs: ", p), err)
-	}
-	return err
-}
-
-func (p *Lock) writeField5(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMessage() {
-		if err := oprot.WriteFieldBegin("message", thrift.STRING, 5); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:message: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Message)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.message (5) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:message: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Lock) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Lock(%+v)", *p)
-}
-
-// A unique identifier for the active task within a job.
-//
-// Attributes:
-//  - JobKey: Key identifying the job.
-//  - InstanceId: Unique instance ID for the active task in a job.
-type InstanceKey struct {
-	JobKey     *JobKey `thrift:"jobKey,1" json:"jobKey"`
-	InstanceId int32   `thrift:"instanceId,2" json:"instanceId"`
-}
-
-func NewInstanceKey() *InstanceKey {
-	return &InstanceKey{}
-}
-
-var InstanceKey_JobKey_DEFAULT *JobKey
-
-func (p *InstanceKey) GetJobKey() *JobKey {
-	if !p.IsSetJobKey() {
-		return InstanceKey_JobKey_DEFAULT
-	}
-	return p.JobKey
-}
-
-func (p *InstanceKey) GetInstanceId() int32 {
-	return p.InstanceId
-}
-func (p *InstanceKey) IsSetJobKey() bool {
-	return p.JobKey != nil
-}
-
-func (p *InstanceKey) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *InstanceKey) readField1(iprot thrift.TProtocol) error {
-	p.JobKey = &JobKey{}
-	if err := p.JobKey.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobKey), err)
-	}
-	return nil
-}
-
-func (p *InstanceKey) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.InstanceId = v
-	}
-	return nil
-}
-
-func (p *InstanceKey) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("InstanceKey"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *InstanceKey) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("jobKey", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:jobKey: ", p), err)
-	}
-	if err := p.JobKey.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobKey), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:jobKey: ", p), err)
-	}
-	return err
-}
-
-func (p *InstanceKey) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instanceId", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instanceId: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.InstanceId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.instanceId (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instanceId: ", p), err)
-	}
-	return err
-}
-
-func (p *InstanceKey) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("InstanceKey(%+v)", *p)
-}
-
-// URI which mirrors CommandInfo.URI in the Mesos Protobuf
-//
-// Attributes:
-//  - Value: Where to get the resource from
-//  - Extract: Extract compressed archive after downloading
-//  - Cache: Cache value using Mesos Fetcher caching mechanism *
-type MesosFetcherURI struct {
-	Value   string `thrift:"value,1" json:"value"`
-	Extract *bool  `thrift:"extract,2" json:"extract,omitempty"`
-	Cache   *bool  `thrift:"cache,3" json:"cache,omitempty"`
-}
-
-func NewMesosFetcherURI() *MesosFetcherURI {
-	return &MesosFetcherURI{}
-}
-
-func (p *MesosFetcherURI) GetValue() string {
-	return p.Value
-}
-
-var MesosFetcherURI_Extract_DEFAULT bool
-
-func (p *MesosFetcherURI) GetExtract() bool {
-	if !p.IsSetExtract() {
-		return MesosFetcherURI_Extract_DEFAULT
-	}
-	return *p.Extract
-}
-
-var MesosFetcherURI_Cache_DEFAULT bool
-
-func (p *MesosFetcherURI) GetCache() bool {
-	if !p.IsSetCache() {
-		return MesosFetcherURI_Cache_DEFAULT
-	}
-	return *p.Cache
-}
-func (p *MesosFetcherURI) IsSetExtract() bool {
-	return p.Extract != nil
-}
-
-func (p *MesosFetcherURI) IsSetCache() bool {
-	return p.Cache != nil
-}
-
-func (p *MesosFetcherURI) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *MesosFetcherURI) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Value = v
-	}
-	return nil
-}
-
-func (p *MesosFetcherURI) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Extract = &v
-	}
-	return nil
-}
-
-func (p *MesosFetcherURI) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Cache = &v
-	}
-	return nil
-}
-
-func (p *MesosFetcherURI) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("MesosFetcherURI"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *MesosFetcherURI) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("value", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:value: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Value)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.value (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:value: ", p), err)
-	}
-	return err
-}
-
-func (p *MesosFetcherURI) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetExtract() {
-		if err := oprot.WriteFieldBegin("extract", thrift.BOOL, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:extract: ", p), err)
-		}
-		if err := oprot.WriteBool(bool(*p.Extract)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.extract (2) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:extract: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *MesosFetcherURI) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetCache() {
-		if err := oprot.WriteFieldBegin("cache", thrift.BOOL, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:cache: ", p), err)
-		}
-		if err := oprot.WriteBool(bool(*p.Cache)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.cache (3) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:cache: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *MesosFetcherURI) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("MesosFetcherURI(%+v)", *p)
-}
-
-// Attributes:
-//  - Name: Name identifying the Executor.
-//  - Data: Executor configuration data.
-type ExecutorConfig struct {
-	Name string `thrift:"name,1" json:"name"`
-	Data string `thrift:"data,2" json:"data"`
-}
-
-func NewExecutorConfig() *ExecutorConfig {
-	return &ExecutorConfig{}
-}
-
-func (p *ExecutorConfig) GetName() string {
-	return p.Name
-}
-
-func (p *ExecutorConfig) GetData() string {
-	return p.Data
-}
-func (p *ExecutorConfig) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ExecutorConfig) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *ExecutorConfig) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Data = v
-	}
-	return nil
-}
-
-func (p *ExecutorConfig) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ExecutorConfig"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ExecutorConfig) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err)
-	}
-	return err
-}
-
-func (p *ExecutorConfig) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("data", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:data: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Data)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.data (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:data: ", p), err)
-	}
-	return err
-}
-
-func (p *ExecutorConfig) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ExecutorConfig(%+v)", *p)
-}
-
-// A volume mount point within a container
-//
-// Attributes:
-//  - ContainerPath: The path inside the container where the mount will be created.
-//  - HostPath: The path on the host that will serve as the source for the mount.
-//  - Mode: The access mode
-type Volume struct {
-	ContainerPath string `thrift:"containerPath,1" json:"containerPath"`
-	HostPath      string `thrift:"hostPath,2" json:"hostPath"`
-	Mode          Mode   `thrift:"mode,3" json:"mode"`
-}
-
-func NewVolume() *Volume {
-	return &Volume{}
-}
-
-func (p *Volume) GetContainerPath() string {
-	return p.ContainerPath
-}
-
-func (p *Volume) GetHostPath() string {
-	return p.HostPath
-}
-
-func (p *Volume) GetMode() Mode {
-	return p.Mode
-}
-func (p *Volume) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Volume) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.ContainerPath = v
-	}
-	return nil
-}
-
-func (p *Volume) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.HostPath = v
-	}
-	return nil
-}
-
-func (p *Volume) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		temp := Mode(v)
-		p.Mode = temp
-	}
-	return nil
-}
-
-func (p *Volume) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Volume"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Volume) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("containerPath", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:containerPath: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.ContainerPath)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.containerPath (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:containerPath: ", p), err)
-	}
-	return err
-}
-
-func (p *Volume) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("hostPath", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:hostPath: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.HostPath)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.hostPath (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:hostPath: ", p), err)
-	}
-	return err
-}
-
-func (p *Volume) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("mode", thrift.I32, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:mode: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Mode)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.mode (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:mode: ", p), err)
-	}
-	return err
-}
-
-func (p *Volume) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Volume(%+v)", *p)
-}
-
-// Describes an image for use with the Mesos unified containerizer in the Docker format
-//
-// Attributes:
-//  - Name: The name of the image to run
-//  - Tag: The Docker tag identifying the image
-type DockerImage struct {
-	Name string `thrift:"name,1" json:"name"`
-	Tag  string `thrift:"tag,2" json:"tag"`
-}
-
-func NewDockerImage() *DockerImage {
-	return &DockerImage{}
-}
-
-func (p *DockerImage) GetName() string {
-	return p.Name
-}
-
-func (p *DockerImage) GetTag() string {
-	return p.Tag
-}
-func (p *DockerImage) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *DockerImage) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *DockerImage) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Tag = v
-	}
-	return nil
-}
-
-func (p *DockerImage) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("DockerImage"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *DockerImage) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err)
-	}
-	return err
-}
-
-func (p *DockerImage) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("tag", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:tag: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Tag)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.tag (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:tag: ", p), err)
-	}
-	return err
-}
-
-func (p *DockerImage) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("DockerImage(%+v)", *p)
-}
-
-// Describes an image for use with the Mesos unified containerizer in the AppC format
-//
-// Attributes:
-//  - Name: The name of the image to run
-//  - ImageId: The appc image id identifying the image
-type AppcImage struct {
-	Name    string `thrift:"name,1" json:"name"`
-	ImageId string `thrift:"imageId,2" json:"imageId"`
-}
-
-func NewAppcImage() *AppcImage {
-	return &AppcImage{}
-}
-
-func (p *AppcImage) GetName() string {
-	return p.Name
-}
-
-func (p *AppcImage) GetImageId() string {
-	return p.ImageId
-}
-func (p *AppcImage) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AppcImage) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *AppcImage) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.ImageId = v
-	}
-	return nil
-}
-
-func (p *AppcImage) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("AppcImage"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AppcImage) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err)
-	}
-	return err
-}
-
-func (p *AppcImage) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("imageId", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:imageId: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.ImageId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.imageId (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:imageId: ", p), err)
-	}
-	return err
-}
-
-func (p *AppcImage) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AppcImage(%+v)", *p)
-}
-
-// Describes an image to be used with the Mesos unified containerizer
-//
-// Attributes:
-//  - Docker
-//  - Appc
-type Image struct {
-	Docker *DockerImage `thrift:"docker,1" json:"docker,omitempty"`
-	Appc   *AppcImage   `thrift:"appc,2" json:"appc,omitempty"`
-}
-
-func NewImage() *Image {
-	return &Image{}
-}
-
-var Image_Docker_DEFAULT *DockerImage
-
-func (p *Image) GetDocker() *DockerImage {
-	if !p.IsSetDocker() {
-		return Image_Docker_DEFAULT
-	}
-	return p.Docker
-}
-
-var Image_Appc_DEFAULT *AppcImage
-
-func (p *Image) GetAppc() *AppcImage {
-	if !p.IsSetAppc() {
-		return Image_Appc_DEFAULT
-	}
-	return p.Appc
-}
-func (p *Image) CountSetFieldsImage() int {
-	count := 0
-	if p.IsSetDocker() {
-		count++
-	}
-	if p.IsSetAppc() {
-		count++
-	}
-	return count
-
-}
-
-func (p *Image) IsSetDocker() bool {
-	return p.Docker != nil
-}
-
-func (p *Image) IsSetAppc() bool {
-	return p.Appc != nil
-}
-
-func (p *Image) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Image) readField1(iprot thrift.TProtocol) error {
-	p.Docker = &DockerImage{}
-	if err := p.Docker.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Docker), err)
-	}
-	return nil
-}
-
-func (p *Image) readField2(iprot thrift.TProtocol) error {
-	p.Appc = &AppcImage{}
-	if err := p.Appc.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Appc), err)
-	}
-	return nil
-}
-
-func (p *Image) Write(oprot thrift.TProtocol) error {
-	if c := p.CountSetFieldsImage(); c != 1 {
-		return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
-	}
-	if err := oprot.WriteStructBegin("Image"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Image) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetDocker() {
-		if err := oprot.WriteFieldBegin("docker", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:docker: ", p), err)
-		}
-		if err := p.Docker.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Docker), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:docker: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Image) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetAppc() {
-		if err := oprot.WriteFieldBegin("appc", thrift.STRUCT, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:appc: ", p), err)
-		}
-		if err := p.Appc.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Appc), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:appc: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Image) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Image(%+v)", *p)
-}
-
-// Describes a mesos container, this is the default
-//
-// Attributes:
-//  - Image: the optional filesystem image to use when launching this task.
-//  - Volumes: the optional list of volumes to mount into the task.
-type MesosContainer struct {
-	Image   *Image    `thrift:"image,1" json:"image,omitempty"`
-	Volumes []*Volume `thrift:"volumes,2" json:"volumes,omitempty"`
-}
-
-func NewMesosContainer() *MesosContainer {
-	return &MesosContainer{}
-}
-
-var MesosContainer_Image_DEFAULT *Image
-
-func (p *MesosContainer) GetImage() *Image {
-	if !p.IsSetImage() {
-		return MesosContainer_Image_DEFAULT
-	}
-	return p.Image
-}
-
-var MesosContainer_Volumes_DEFAULT []*Volume
-
-func (p *MesosContainer) GetVolumes() []*Volume {
-	return p.Volumes
-}
-func (p *MesosContainer) IsSetImage() bool {
-	return p.Image != nil
-}
-
-func (p *MesosContainer) IsSetVolumes() bool {
-	return p.Volumes != nil
-}
-
-func (p *MesosContainer) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *MesosContainer) readField1(iprot thrift.TProtocol) error {
-	p.Image = &Image{}
-	if err := p.Image.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Image), err)
-	}
-	return nil
-}
-
-func (p *MesosContainer) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*Volume, 0, size)
-	p.Volumes = tSlice
-	for i := 0; i < size; i++ {
-		_elem3 := &Volume{}
-		if err := _elem3.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem3), err)
-		}
-		p.Volumes = append(p.Volumes, _elem3)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *MesosContainer) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("MesosContainer"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *MesosContainer) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetImage() {
-		if err := oprot.WriteFieldBegin("image", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:image: ", p), err)
-		}
-		if err := p.Image.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Image), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:image: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *MesosContainer) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetVolumes() {
-		if err := oprot.WriteFieldBegin("volumes", thrift.LIST, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:volumes: ", p), err)
-		}
-		if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Volumes)); err != nil {
-			return thrift.PrependError("error writing list begin: ", err)
-		}
-		for _, v := range p.Volumes {
-			if err := v.Write(oprot); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-			}
-		}
-		if err := oprot.WriteListEnd(); err != nil {
-			return thrift.PrependError("error writing list end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:volumes: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *MesosContainer) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("MesosContainer(%+v)", *p)
-}
-
-// Describes a parameter passed to docker cli
-//
-// Attributes:
-//  - Name: a parameter to pass to docker. (e.g. volume)
-//  - Value: the value to pass to a parameter (e.g. /src/webapp:/opt/webapp)
-type DockerParameter struct {
-	Name  string `thrift:"name,1" json:"name"`
-	Value string `thrift:"value,2" json:"value"`
-}
-
-func NewDockerParameter() *DockerParameter {
-	return &DockerParameter{}
-}
-
-func (p *DockerParameter) GetName() string {
-	return p.Name
-}
-
-func (p *DockerParameter) GetValue() string {
-	return p.Value
-}
-func (p *DockerParameter) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *DockerParameter) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *DockerParameter) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Value = v
-	}
-	return nil
-}
-
-func (p *DockerParameter) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("DockerParameter"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *DockerParameter) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err)
-	}
-	return err
-}
-
-func (p *DockerParameter) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("value", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:value: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Value)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.value (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:value: ", p), err)
-	}
-	return err
-}
-
-func (p *DockerParameter) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("DockerParameter(%+v)", *p)
-}
-
-// Describes a docker container
-//
-// Attributes:
-//  - Image: The container image to be run
-//  - Parameters: The arbitrary parameters to pass to container
-type DockerContainer struct {
-	Image      string             `thrift:"image,1" json:"image"`
-	Parameters []*DockerParameter `thrift:"parameters,2" json:"parameters,omitempty"`
-}
-
-func NewDockerContainer() *DockerContainer {
-	return &DockerContainer{}
-}
-
-func (p *DockerContainer) GetImage() string {
-	return p.Image
-}
-
-var DockerContainer_Parameters_DEFAULT []*DockerParameter
-
-func (p *DockerContainer) GetParameters() []*DockerParameter {
-	return p.Parameters
-}
-func (p *DockerContainer) IsSetParameters() bool {
-	return p.Parameters != nil
-}
-
-func (p *DockerContainer) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *DockerContainer) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Image = v
-	}
-	return nil
-}
-
-func (p *DockerContainer) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*DockerParameter, 0, size)
-	p.Parameters = tSlice
-	for i := 0; i < size; i++ {
-		_elem4 := &DockerParameter{}
-		if err := _elem4.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem4), err)
-		}
-		p.Parameters = append(p.Parameters, _elem4)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *DockerContainer) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("DockerContainer"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *DockerContainer) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("image", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:image: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Image)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.image (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:image: ", p), err)
-	}
-	return err
-}
-
-func (p *DockerContainer) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetParameters() {
-		if err := oprot.WriteFieldBegin("parameters", thrift.LIST, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:parameters: ", p), err)
-		}
-		if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Parameters)); err != nil {
-			return thrift.PrependError("error writing list begin: ", err)
-		}
-		for _, v := range p.Parameters {
-			if err := v.Write(oprot); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-			}
-		}
-		if err := oprot.WriteListEnd(); err != nil {
-			return thrift.PrependError("error writing list end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:parameters: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *DockerContainer) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("DockerContainer(%+v)", *p)
-}
-
-// Describes a container to be used in a task
-//
-// Attributes:
-//  - Mesos
-//  - Docker
-type Container struct {
-	Mesos  *MesosContainer  `thrift:"mesos,1" json:"mesos,omitempty"`
-	Docker *DockerContainer `thrift:"docker,2" json:"docker,omitempty"`
-}
-
-func NewContainer() *Container {
-	return &Container{}
-}
-
-var Container_Mesos_DEFAULT *MesosContainer
-
-func (p *Container) GetMesos() *MesosContainer {
-	if !p.IsSetMesos() {
-		return Container_Mesos_DEFAULT
-	}
-	return p.Mesos
-}
-
-var Container_Docker_DEFAULT *DockerContainer
-
-func (p *Container) GetDocker() *DockerContainer {
-	if !p.IsSetDocker() {
-		return Container_Docker_DEFAULT
-	}
-	return p.Docker
-}
-func (p *Container) CountSetFieldsContainer() int {
-	count := 0
-	if p.IsSetMesos() {
-		count++
-	}
-	if p.IsSetDocker() {
-		count++
-	}
-	return count
-
-}
-
-func (p *Container) IsSetMesos() bool {
-	return p.Mesos != nil
-}
-
-func (p *Container) IsSetDocker() bool {
-	return p.Docker != nil
-}
-
-func (p *Container) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Container) readField1(iprot thrift.TProtocol) error {
-	p.Mesos = &MesosContainer{}
-	if err := p.Mesos.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Mesos), err)
-	}
-	return nil
-}
-
-func (p *Container) readField2(iprot thrift.TProtocol) error {
-	p.Docker = &DockerContainer{}
-	if err := p.Docker.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Docker), err)
-	}
-	return nil
-}
-
-func (p *Container) Write(oprot thrift.TProtocol) error {
-	if c := p.CountSetFieldsContainer(); c != 1 {
-		return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
-	}
-	if err := oprot.WriteStructBegin("Container"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Container) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMesos() {
-		if err := oprot.WriteFieldBegin("mesos", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:mesos: ", p), err)
-		}
-		if err := p.Mesos.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Mesos), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:mesos: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Container) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetDocker() {
-		if err := oprot.WriteFieldBegin("docker", thrift.STRUCT, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:docker: ", p), err)
-		}
-		if err := p.Docker.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Docker), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:docker: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Container) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Container(%+v)", *p)
-}
-
-// Describes resource value required to run a task.
-//
-// Attributes:
-//  - NumCpus
-//  - RamMb
-//  - DiskMb
-//  - NamedPort
-//  - NumGpus
-type Resource struct {
-	NumCpus   *float64 `thrift:"numCpus,1" json:"numCpus,omitempty"`
-	RamMb     *int64   `thrift:"ramMb,2" json:"ramMb,omitempty"`
-	DiskMb    *int64   `thrift:"diskMb,3" json:"diskMb,omitempty"`
-	NamedPort *string  `thrift:"namedPort,4" json:"namedPort,omitempty"`
-	NumGpus   *int64   `thrift:"numGpus,5" json:"numGpus,omitempty"`
-}
-
-func NewResource() *Resource {
-	return &Resource{}
-}
-
-var Resource_NumCpus_DEFAULT float64
-
-func (p *Resource) GetNumCpus() float64 {
-	if !p.IsSetNumCpus() {
-		return Resource_NumCpus_DEFAULT
-	}
-	return *p.NumCpus
-}
-
-var Resource_RamMb_DEFAULT int64
-
-func (p *Resource) GetRamMb() int64 {
-	if !p.IsSetRamMb() {
-		return Resource_RamMb_DEFAULT
-	}
-	return *p.RamMb
-}
-
-var Resource_DiskMb_DEFAULT int64
-
-func (p *Resource) GetDiskMb() int64 {
-	if !p.IsSetDiskMb() {
-		return Resource_DiskMb_DEFAULT
-	}
-	return *p.DiskMb
-}
-
-var Resource_NamedPort_DEFAULT string
-
-func (p *Resource) GetNamedPort() string {
-	if !p.IsSetNamedPort() {
-		return Resource_NamedPort_DEFAULT
-	}
-	return *p.NamedPort
-}
-
-var Resource_NumGpus_DEFAULT int64
-
-func (p *Resource) GetNumGpus() int64 {
-	if !p.IsSetNumGpus() {
-		return Resource_NumGpus_DEFAULT
-	}
-	return *p.NumGpus
-}
-func (p *Resource) CountSetFieldsResource() int {
-	count := 0
-	if p.IsSetNumCpus() {
-		count++
-	}
-	if p.IsSetRamMb() {
-		count++
-	}
-	if p.IsSetDiskMb() {
-		count++
-	}
-	if p.IsSetNamedPort() {
-		count++
-	}
-	if p.IsSetNumGpus() {
-		count++
-	}
-	return count
-
-}
-
-func (p *Resource) IsSetNumCpus() bool {
-	return p.NumCpus != nil
-}
-
-func (p *Resource) IsSetRamMb() bool {
-	return p.RamMb != nil
-}
-
-func (p *Resource) IsSetDiskMb() bool {
-	return p.DiskMb != nil
-}
-
-func (p *Resource) IsSetNamedPort() bool {
-	return p.NamedPort != nil
-}
-
-func (p *Resource) IsSetNumGpus() bool {
-	return p.NumGpus != nil
-}
-
-func (p *Resource) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Resource) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadDouble(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.NumCpus = &v
-	}
-	return nil
-}
-
-func (p *Resource) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.RamMb = &v
-	}
-	return nil
-}
-
-func (p *Resource) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.DiskMb = &v
-	}
-	return nil
-}
-
-func (p *Resource) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.NamedPort = &v
-	}
-	return nil
-}
-
-func (p *Resource) readField5(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 5: ", err)
-	} else {
-		p.NumGpus = &v
-	}
-	return nil
-}
-
-func (p *Resource) Write(oprot thrift.TProtocol) error {
-	if c := p.CountSetFieldsResource(); c != 1 {
-		return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
-	}
-	if err := oprot.WriteStructBegin("Resource"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Resource) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetNumCpus() {
-		if err := oprot.WriteFieldBegin("numCpus", thrift.DOUBLE, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:numCpus: ", p), err)
-		}
-		if err := oprot.WriteDouble(float64(*p.NumCpus)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.numCpus (1) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:numCpus: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Resource) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetRamMb() {
-		if err := oprot.WriteFieldBegin("ramMb", thrift.I64, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:ramMb: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.RamMb)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.ramMb (2) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:ramMb: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Resource) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetDiskMb() {
-		if err := oprot.WriteFieldBegin("diskMb", thrift.I64, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:diskMb: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.DiskMb)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.diskMb (3) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:diskMb: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Resource) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetNamedPort() {
-		if err := oprot.WriteFieldBegin("namedPort", thrift.STRING, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:namedPort: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.NamedPort)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.namedPort (4) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:namedPort: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Resource) writeField5(oprot thrift.TProtocol) (err error) {
-	if p.IsSetNumGpus() {
-		if err := oprot.WriteFieldBegin("numGpus", thrift.I64, 5); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:numGpus: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.NumGpus)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.numGpus (5) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:numGpus: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Resource) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Resource(%+v)", *p)
-}
-
-// Attributes:
-//  - Reschedule
-//  - DelaySecs
-type PartitionPolicy struct {
-	Reschedule bool   `thrift:"reschedule,1" json:"reschedule"`
-	DelaySecs  *int64 `thrift:"delaySecs,2" json:"delaySecs,omitempty"`
-}
-
-func NewPartitionPolicy() *PartitionPolicy {
-	return &PartitionPolicy{}
-}
-
-func (p *PartitionPolicy) GetReschedule() bool {
-	return p.Reschedule
-}
-
-var PartitionPolicy_DelaySecs_DEFAULT int64
-
-func (p *PartitionPolicy) GetDelaySecs() int64 {
-	if !p.IsSetDelaySecs() {
-		return PartitionPolicy_DelaySecs_DEFAULT
-	}
-	return *p.DelaySecs
-}
-func (p *PartitionPolicy) IsSetDelaySecs() bool {
-	return p.DelaySecs != nil
-}
-
-func (p *PartitionPolicy) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *PartitionPolicy) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Reschedule = v
-	}
-	return nil
-}
-
-func (p *PartitionPolicy) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.DelaySecs = &v
-	}
-	return nil
-}
-
-func (p *PartitionPolicy) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("PartitionPolicy"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *PartitionPolicy) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("reschedule", thrift.BOOL, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:reschedule: ", p), err)
-	}
-	if err := oprot.WriteBool(bool(p.Reschedule)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.reschedule (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:reschedule: ", p), err)
-	}
-	return err
-}
-
-func (p *PartitionPolicy) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetDelaySecs() {
-		if err := oprot.WriteFieldBegin("delaySecs", thrift.I64, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:delaySecs: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.DelaySecs)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.delaySecs (2) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:delaySecs: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *PartitionPolicy) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("PartitionPolicy(%+v)", *p)
-}
-
-// SLA requirements expressed as the percentage of instances to be RUNNING every durationSecs
-//
-// Attributes:
-//  - Percentage
-//  - DurationSecs: Minimum time duration a task needs to be `RUNNING` to be treated as active
-type PercentageSlaPolicy struct {
-	Percentage   float64 `thrift:"percentage,1" json:"percentage"`
-	DurationSecs int64   `thrift:"durationSecs,2" json:"durationSecs"`
-}
-
-func NewPercentageSlaPolicy() *PercentageSlaPolicy {
-	return &PercentageSlaPolicy{}
-}
-
-func (p *PercentageSlaPolicy) GetPercentage() float64 {
-	return p.Percentage
-}
-
-func (p *PercentageSlaPolicy) GetDurationSecs() int64 {
-	return p.DurationSecs
-}
-func (p *PercentageSlaPolicy) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *PercentageSlaPolicy) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadDouble(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Percentage = v
-	}
-	return nil
-}
-
-func (p *PercentageSlaPolicy) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.DurationSecs = v
-	}
-	return nil
-}
-
-func (p *PercentageSlaPolicy) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("PercentageSlaPolicy"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *PercentageSlaPolicy) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("percentage", thrift.DOUBLE, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:percentage: ", p), err)
-	}
-	if err := oprot.WriteDouble(float64(p.Percentage)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.percentage (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:percentage: ", p), err)
-	}
-	return err
-}
-
-func (p *PercentageSlaPolicy) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("durationSecs", thrift.I64, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:durationSecs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.DurationSecs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.durationSecs (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:durationSecs: ", p), err)
-	}
-	return err
-}
-
-func (p *PercentageSlaPolicy) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("PercentageSlaPolicy(%+v)", *p)
-}
-
-// SLA requirements expressed as the number of instances to be RUNNING every durationSecs
-//
-// Attributes:
-//  - Count: The number of active instances required every `durationSecs`
-//  - DurationSecs: Minimum time duration a task needs to be `RUNNING` to be treated as active
-type CountSlaPolicy struct {
-	Count        int64 `thrift:"count,1" json:"count"`
-	DurationSecs int64 `thrift:"durationSecs,2" json:"durationSecs"`
-}
-
-func NewCountSlaPolicy() *CountSlaPolicy {
-	return &CountSlaPolicy{}
-}
-
-func (p *CountSlaPolicy) GetCount() int64 {
-	return p.Count
-}
-
-func (p *CountSlaPolicy) GetDurationSecs() int64 {
-	return p.DurationSecs
-}
-func (p *CountSlaPolicy) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *CountSlaPolicy) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Count = v
-	}
-	return nil
-}
-
-func (p *CountSlaPolicy) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.DurationSecs = v
-	}
-	return nil
-}
-
-func (p *CountSlaPolicy) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("CountSlaPolicy"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *CountSlaPolicy) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("count", thrift.I64, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:count: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.Count)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.count (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:count: ", p), err)
-	}
-	return err
-}
-
-func (p *CountSlaPolicy) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("durationSecs", thrift.I64, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:durationSecs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.DurationSecs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.durationSecs (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:durationSecs: ", p), err)
-	}
-	return err
-}
-
-func (p *CountSlaPolicy) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("CountSlaPolicy(%+v)", *p)
-}
-
-// SLA requirements to be delegated to an external coordinator
-//
-// Attributes:
-//  - CoordinatorUrl: URL for the coordinator service that needs to be contacted for SLA checks
-//  - StatusKey: Field in the Coordinator response json indicating if the action is allowed or not
-type CoordinatorSlaPolicy struct {
-	CoordinatorUrl string `thrift:"coordinatorUrl,1" json:"coordinatorUrl"`
-	StatusKey      string `thrift:"statusKey,2" json:"statusKey"`
-}
-
-func NewCoordinatorSlaPolicy() *CoordinatorSlaPolicy {
-	return &CoordinatorSlaPolicy{}
-}
-
-func (p *CoordinatorSlaPolicy) GetCoordinatorUrl() string {
-	return p.CoordinatorUrl
-}
-
-func (p *CoordinatorSlaPolicy) GetStatusKey() string {
-	return p.StatusKey
-}
-func (p *CoordinatorSlaPolicy) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *CoordinatorSlaPolicy) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.CoordinatorUrl = v
-	}
-	return nil
-}
-
-func (p *CoordinatorSlaPolicy) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.StatusKey = v
-	}
-	return nil
-}
-
-func (p *CoordinatorSlaPolicy) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("CoordinatorSlaPolicy"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *CoordinatorSlaPolicy) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("coordinatorUrl", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:coordinatorUrl: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.CoordinatorUrl)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.coordinatorUrl (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:coordinatorUrl: ", p), err)
-	}
-	return err
-}
-
-func (p *CoordinatorSlaPolicy) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("statusKey", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:statusKey: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.StatusKey)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.statusKey (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:statusKey: ", p), err)
-	}
-	return err
-}
-
-func (p *CoordinatorSlaPolicy) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("CoordinatorSlaPolicy(%+v)", *p)
-}
-
-// SLA requirements expressed in one of the many types
-//
-// Attributes:
-//  - PercentageSlaPolicy
-//  - CountSlaPolicy
-//  - CoordinatorSlaPolicy
-type SlaPolicy struct {
-	PercentageSlaPolicy  *PercentageSlaPolicy  `thrift:"percentageSlaPolicy,1" json:"percentageSlaPolicy,omitempty"`
-	CountSlaPolicy       *CountSlaPolicy       `thrift:"countSlaPolicy,2" json:"countSlaPolicy,omitempty"`
-	CoordinatorSlaPolicy *CoordinatorSlaPolicy `thrift:"coordinatorSlaPolicy,3" json:"coordinatorSlaPolicy,omitempty"`
-}
-
-func NewSlaPolicy() *SlaPolicy {
-	return &SlaPolicy{}
-}
-
-var SlaPolicy_PercentageSlaPolicy_DEFAULT *PercentageSlaPolicy
-
-func (p *SlaPolicy) GetPercentageSlaPolicy() *PercentageSlaPolicy {
-	if !p.IsSetPercentageSlaPolicy() {
-		return SlaPolicy_PercentageSlaPolicy_DEFAULT
-	}
-	return p.PercentageSlaPolicy
-}
-
-var SlaPolicy_CountSlaPolicy_DEFAULT *CountSlaPolicy
-
-func (p *SlaPolicy) GetCountSlaPolicy() *CountSlaPolicy {
-	if !p.IsSetCountSlaPolicy() {
-		return SlaPolicy_CountSlaPolicy_DEFAULT
-	}
-	return p.CountSlaPolicy
-}
-
-var SlaPolicy_CoordinatorSlaPolicy_DEFAULT *CoordinatorSlaPolicy
-
-func (p *SlaPolicy) GetCoordinatorSlaPolicy() *CoordinatorSlaPolicy {
-	if !p.IsSetCoordinatorSlaPolicy() {
-		return SlaPolicy_CoordinatorSlaPolicy_DEFAULT
-	}
-	return p.CoordinatorSlaPolicy
-}
-func (p *SlaPolicy) CountSetFieldsSlaPolicy() int {
-	count := 0
-	if p.IsSetPercentageSlaPolicy() {
-		count++
-	}
-	if p.IsSetCountSlaPolicy() {
-		count++
-	}
-	if p.IsSetCoordinatorSlaPolicy() {
-		count++
-	}
-	return count
-
-}
-
-func (p *SlaPolicy) IsSetPercentageSlaPolicy() bool {
-	return p.PercentageSlaPolicy != nil
-}
-
-func (p *SlaPolicy) IsSetCountSlaPolicy() bool {
-	return p.CountSlaPolicy != nil
-}
-
-func (p *SlaPolicy) IsSetCoordinatorSlaPolicy() bool {
-	return p.CoordinatorSlaPolicy != nil
-}
-
-func (p *SlaPolicy) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *SlaPolicy) readField1(iprot thrift.TProtocol) error {
-	p.PercentageSlaPolicy = &PercentageSlaPolicy{}
-	if err := p.PercentageSlaPolicy.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.PercentageSlaPolicy), err)
-	}
-	return nil
-}
-
-func (p *SlaPolicy) readField2(iprot thrift.TProtocol) error {
-	p.CountSlaPolicy = &CountSlaPolicy{}
-	if err := p.CountSlaPolicy.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.CountSlaPolicy), err)
-	}
-	return nil
-}
-
-func (p *SlaPolicy) readField3(iprot thrift.TProtocol) error {
-	p.CoordinatorSlaPolicy = &CoordinatorSlaPolicy{}
-	if err := p.CoordinatorSlaPolicy.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.CoordinatorSlaPolicy), err)
-	}
-	return nil
-}
-
-func (p *SlaPolicy) Write(oprot thrift.TProtocol) error {
-	if c := p.CountSetFieldsSlaPolicy(); c != 1 {
-		return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
-	}
-	if err := oprot.WriteStructBegin("SlaPolicy"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *SlaPolicy) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetPercentageSlaPolicy() {
-		if err := oprot.WriteFieldBegin("percentageSlaPolicy", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:percentageSlaPolicy: ", p), err)
-		}
-		if err := p.PercentageSlaPolicy.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.PercentageSlaPolicy), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:percentageSlaPolicy: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *SlaPolicy) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetCountSlaPolicy() {
-		if err := oprot.WriteFieldBegin("countSlaPolicy", thrift.STRUCT, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:countSlaPolicy: ", p), err)
-		}
-		if err := p.CountSlaPolicy.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.CountSlaPolicy), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:countSlaPolicy: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *SlaPolicy) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetCoordinatorSlaPolicy() {
-		if err := oprot.WriteFieldBegin("coordinatorSlaPolicy", thrift.STRUCT, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:coordinatorSlaPolicy: ", p), err)
-		}
-		if err := p.CoordinatorSlaPolicy.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.CoordinatorSlaPolicy), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:coordinatorSlaPolicy: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *SlaPolicy) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("SlaPolicy(%+v)", *p)
-}
-
-// Description of the tasks contained within a job.
-//
-// Attributes:
-//  - Job: Job task belongs to.
-//  - Owner: contains the role component of JobKey
-//  - IsService
-//  - Priority
-//  - MaxTaskFailures
-//  - Production: Whether this is a production task, which can preempt.
-//  - Tier: Task tier type.
-//  - Resources: All resources required to run a task.
-//  - Constraints
-//  - MesosFetcherUris: Resources to retrieve with Mesos Fetcher
-//  - TaskLinks: Custom links to include when displaying this task on the scheduler dashboard. Keys are anchor
-// text, values are URLs. Wildcards are supported for dynamic link crafting based on host, ports,
-// instance, etc.
-//  - ContactEmail
-//  - ExecutorConfig: Executor configuration
-//  - Metadata: Used to display additional details in the UI.
-//  - PartitionPolicy: Policy for how to deal with task partitions
-//  - SlaPolicy: SLA requirements to be met during maintenance
-//  - Container: the container the task should use to execute
-type TaskConfig struct {
-	// unused fields # 1 to 6
-	IsService bool `thrift:"isService,7" json:"isService"`
-	// unused fields # 8 to 10
-	Priority int32 `thrift:"priority,11" json:"priority"`
-	// unused field # 12
-	MaxTaskFailures int32 `thrift:"maxTaskFailures,13" json:"maxTaskFailures"`
-	// unused fields # 14 to 16
-	Owner      *Identity `thrift:"owner,17" json:"owner"`
-	Production *bool     `thrift:"production,18" json:"production,omitempty"`
-	// unused field # 19
-	Constraints map[*Constraint]bool `thrift:"constraints,20" json:"constraints"`
-	// unused field # 21
-	TaskLinks    map[string]string `thrift:"taskLinks,22" json:"taskLinks,omitempty"`
-	ContactEmail *string           `thrift:"contactEmail,23" json:"contactEmail,omitempty"`
-	// unused field # 24
-	ExecutorConfig *ExecutorConfig `thrift:"executorConfig,25" json:"executorConfig,omitempty"`
-	// unused field # 26
-	Metadata  map[*Metadata]bool `thrift:"metadata,27" json:"metadata,omitempty"`
-	Job       *JobKey            `thrift:"job,28" json:"job"`
-	Container *Container         `thrift:"container,29" json:"container"`
-	Tier      *string            `thrift:"tier,30" json:"tier,omitempty"`
-	// unused field # 31
-	Resources        map[*Resource]bool        `thrift:"resources,32" json:"resources"`
-	MesosFetcherUris map[*MesosFetcherURI]bool `thrift:"mesosFetcherUris,33" json:"mesosFetcherUris,omitempty"`
-	PartitionPolicy  *PartitionPolicy          `thrift:"partitionPolicy,34" json:"partitionPolicy,omitempty"`
-	SlaPolicy        *SlaPolicy                `thrift:"slaPolicy,35" json:"slaPolicy,omitempty"`
-}
-
-func NewTaskConfig() *TaskConfig {
-	return &TaskConfig{}
-}
-
-var TaskConfig_Job_DEFAULT *JobKey
-
-func (p *TaskConfig) GetJob() *JobKey {
-	if !p.IsSetJob() {
-		return TaskConfig_Job_DEFAULT
-	}
-	return p.Job
-}
-
-var TaskConfig_Owner_DEFAULT *Identity
-
-func (p *TaskConfig) GetOwner() *Identity {
-	if !p.IsSetOwner() {
-		return TaskConfig_Owner_DEFAULT
-	}
-	return p.Owner
-}
-
-func (p *TaskConfig) GetIsService() bool {
-	return p.IsService
-}
-
-func (p *TaskConfig) GetPriority() int32 {
-	return p.Priority
-}
-
-func (p *TaskConfig) GetMaxTaskFailures() int32 {
-	return p.MaxTaskFailures
-}
-
-var TaskConfig_Production_DEFAULT bool
-
-func (p *TaskConfig) GetProduction() bool {
-	if !p.IsSetProduction() {
-		return TaskConfig_Production_DEFAULT
-	}
-	return *p.Production
-}
-
-var TaskConfig_Tier_DEFAULT string
-
-func (p *TaskConfig) GetTier() string {
-	if !p.IsSetTier() {
-		return TaskConfig_Tier_DEFAULT
-	}
-	return *p.Tier
-}
-
-func (p *TaskConfig) GetResources() map[*Resource]bool {
-	return p.Resources
-}
-
-func (p *TaskConfig) GetConstraints() map[*Constraint]bool {
-	return p.Constraints
-}
-
-var TaskConfig_MesosFetcherUris_DEFAULT map[*MesosFetcherURI]bool
-
-func (p *TaskConfig) GetMesosFetcherUris() map[*MesosFetcherURI]bool {
-	return p.MesosFetcherUris
-}
-
-var TaskConfig_TaskLinks_DEFAULT map[string]string
-
-func (p *TaskConfig) GetTaskLinks() map[string]string {
-	return p.TaskLinks
-}
-
-var TaskConfig_ContactEmail_DEFAULT string
-
-func (p *TaskConfig) GetContactEmail() string {
-	if !p.IsSetContactEmail() {
-		return TaskConfig_ContactEmail_DEFAULT
-	}
-	return *p.ContactEmail
-}
-
-var TaskConfig_ExecutorConfig_DEFAULT *ExecutorConfig
-
-func (p *TaskConfig) GetExecutorConfig() *ExecutorConfig {
-	if !p.IsSetExecutorConfig() {
-		return TaskConfig_ExecutorConfig_DEFAULT
-	}
-	return p.ExecutorConfig
-}
-
-var TaskConfig_Metadata_DEFAULT map[*Metadata]bool
-
-func (p *TaskConfig) GetMetadata() map[*Metadata]bool {
-	return p.Metadata
-}
-
-var TaskConfig_PartitionPolicy_DEFAULT *PartitionPolicy
-
-func (p *TaskConfig) GetPartitionPolicy() *PartitionPolicy {
-	if !p.IsSetPartitionPolicy() {
-		return TaskConfig_PartitionPolicy_DEFAULT
-	}
-	return p.PartitionPolicy
-}
-
-var TaskConfig_SlaPolicy_DEFAULT *SlaPolicy
-
-func (p *TaskConfig) GetSlaPolicy() *SlaPolicy {
-	if !p.IsSetSlaPolicy() {
-		return TaskConfig_SlaPolicy_DEFAULT
-	}
-	return p.SlaPolicy
-}
-
-var TaskConfig_Container_DEFAULT *Container = &Container{
-	Mesos: &MesosContainer{},
-}
-
-func (p *TaskConfig) GetContainer() *Container {
-	if !p.IsSetContainer() {
-		return TaskConfig_Container_DEFAULT
-	}
-	return p.Container
-}
-func (p *TaskConfig) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *TaskConfig) IsSetOwner() bool {
-	return p.Owner != nil
-}
-
-func (p *TaskConfig) IsSetProduction() bool {
-	return p.Production != nil
-}
-
-func (p *TaskConfig) IsSetTier() bool {
-	return p.Tier != nil
-}
-
-func (p *TaskConfig) IsSetMesosFetcherUris() bool {
-	return p.MesosFetcherUris != nil
-}
-
-func (p *TaskConfig) IsSetTaskLinks() bool {
-	return p.TaskLinks != nil
-}
-
-func (p *TaskConfig) IsSetContactEmail() bool {
-	return p.ContactEmail != nil
-}
-
-func (p *TaskConfig) IsSetExecutorConfig() bool {
-	return p.ExecutorConfig != nil
-}
-
-func (p *TaskConfig) IsSetMetadata() bool {
-	return p.Metadata != nil
-}
-
-func (p *TaskConfig) IsSetPartitionPolicy() bool {
-	return p.PartitionPolicy != nil
-}
-
-func (p *TaskConfig) IsSetSlaPolicy() bool {
-	return p.SlaPolicy != nil
-}
-
-func (p *TaskConfig) IsSetContainer() bool {
-	return p.Container != nil
-}
-
-func (p *TaskConfig) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 28:
-			if err := p.readField28(iprot); err != nil {
-				return err
-			}
-		case 17:
-			if err := p.readField17(iprot); err != nil {
-				return err
-			}
-		case 7:
-			if err := p.readField7(iprot); err != nil {
-				return err
-			}
-		case 11:
-			if err := p.readField11(iprot); err != nil {
-				return err
-			}
-		case 13:
-			if err := p.readField13(iprot); err != nil {
-				return err
-			}
-		case 18:
-			if err := p.readField18(iprot); err != nil {
-				return err
-			}
-		case 30:
-			if err := p.readField30(iprot); err != nil {
-				return err
-			}
-		case 32:
-			if err := p.readField32(iprot); err != nil {
-				return err
-			}
-		case 20:
-			if err := p.readField20(iprot); err != nil {
-				return err
-			}
-		case 33:
-			if err := p.readField33(iprot); err != nil {
-				return err
-			}
-		case 22:
-			if err := p.readField22(iprot); err != nil {
-				return err
-			}
-		case 23:
-			if err := p.readField23(iprot); err != nil {
-				return err
-			}
-		case 25:
-			if err := p.readField25(iprot); err != nil {
-				return err
-			}
-		case 27:
-			if err := p.readField27(iprot); err != nil {
-				return err
-			}
-		case 34:
-			if err := p.readField34(iprot); err != nil {
-				return err
-			}
-		case 35:
-			if err := p.readField35(iprot); err != nil {
-				return err
-			}
-		case 29:
-			if err := p.readField29(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField28(iprot thrift.TProtocol) error {
-	p.Job = &JobKey{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField17(iprot thrift.TProtocol) error {
-	p.Owner = &Identity{}
-	if err := p.Owner.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Owner), err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField7(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 7: ", err)
-	} else {
-		p.IsService = v
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField11(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 11: ", err)
-	} else {
-		p.Priority = v
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField13(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 13: ", err)
-	} else {
-		p.MaxTaskFailures = v
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField18(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 18: ", err)
-	} else {
-		p.Production = &v
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField30(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 30: ", err)
-	} else {
-		p.Tier = &v
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField32(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Resource]bool, size)
-	p.Resources = tSet
-	for i := 0; i < size; i++ {
-		_elem5 := &Resource{}
-		if err := _elem5.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem5), err)
-		}
-		p.Resources[_elem5] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField20(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Constraint]bool, size)
-	p.Constraints = tSet
-	for i := 0; i < size; i++ {
-		_elem6 := &Constraint{}
-		if err := _elem6.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem6), err)
-		}
-		p.Constraints[_elem6] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField33(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*MesosFetcherURI]bool, size)
-	p.MesosFetcherUris = tSet
-	for i := 0; i < size; i++ {
-		_elem7 := &MesosFetcherURI{}
-		if err := _elem7.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem7), err)
-		}
-		p.MesosFetcherUris[_elem7] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField22(iprot thrift.TProtocol) error {
-	_, _, size, err := iprot.ReadMapBegin()
-	if err != nil {
-		return thrift.PrependError("error reading map begin: ", err)
-	}
-	tMap := make(map[string]string, size)
-	p.TaskLinks = tMap
-	for i := 0; i < size; i++ {
-		var _key8 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_key8 = v
-		}
-		var _val9 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_val9 = v
-		}
-		p.TaskLinks[_key8] = _val9
-	}
-	if err := iprot.ReadMapEnd(); err != nil {
-		return thrift.PrependError("error reading map end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField23(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 23: ", err)
-	} else {
-		p.ContactEmail = &v
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField25(iprot thrift.TProtocol) error {
-	p.ExecutorConfig = &ExecutorConfig{}
-	if err := p.ExecutorConfig.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ExecutorConfig), err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField27(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Metadata]bool, size)
-	p.Metadata = tSet
-	for i := 0; i < size; i++ {
-		_elem10 := &Metadata{}
-		if err := _elem10.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem10), err)
-		}
-		p.Metadata[_elem10] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField34(iprot thrift.TProtocol) error {
-	p.PartitionPolicy = &PartitionPolicy{}
-	if err := p.PartitionPolicy.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.PartitionPolicy), err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField35(iprot thrift.TProtocol) error {
-	p.SlaPolicy = &SlaPolicy{}
-	if err := p.SlaPolicy.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.SlaPolicy), err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) readField29(iprot thrift.TProtocol) error {
-	p.Container = &Container{}
-	if err := p.Container.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Container), err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("TaskConfig"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField7(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField11(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField13(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField17(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField18(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField20(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField22(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField23(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField25(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField27(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField28(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField29(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField30(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField32(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField33(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField34(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField35(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *TaskConfig) writeField7(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("isService", thrift.BOOL, 7); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:isService: ", p), err)
-	}
-	if err := oprot.WriteBool(bool(p.IsService)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.isService (7) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 7:isService: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField11(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("priority", thrift.I32, 11); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:priority: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Priority)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.priority (11) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 11:priority: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField13(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("maxTaskFailures", thrift.I32, 13); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:maxTaskFailures: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.MaxTaskFailures)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.maxTaskFailures (13) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 13:maxTaskFailures: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField17(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("owner", thrift.STRUCT, 17); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 17:owner: ", p), err)
-	}
-	if err := p.Owner.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Owner), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 17:owner: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField18(oprot thrift.TProtocol) (err error) {
-	if p.IsSetProduction() {
-		if err := oprot.WriteFieldBegin("production", thrift.BOOL, 18); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 18:production: ", p), err)
-		}
-		if err := oprot.WriteBool(bool(*p.Production)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.production (18) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 18:production: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField20(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("constraints", thrift.SET, 20); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 20:constraints: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Constraints)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Constraints {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 20:constraints: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField22(oprot thrift.TProtocol) (err error) {
-	if p.IsSetTaskLinks() {
-		if err := oprot.WriteFieldBegin("taskLinks", thrift.MAP, 22); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 22:taskLinks: ", p), err)
-		}
-		if err := oprot.WriteMapBegin(thrift.STRING, thrift.STRING, len(p.TaskLinks)); err != nil {
-			return thrift.PrependError("error writing map begin: ", err)
-		}
-		for k, v := range p.TaskLinks {
-			if err := oprot.WriteString(string(k)); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-			}
-			if err := oprot.WriteString(string(v)); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-			}
-		}
-		if err := oprot.WriteMapEnd(); err != nil {
-			return thrift.PrependError("error writing map end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 22:taskLinks: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField23(oprot thrift.TProtocol) (err error) {
-	if p.IsSetContactEmail() {
-		if err := oprot.WriteFieldBegin("contactEmail", thrift.STRING, 23); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 23:contactEmail: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.ContactEmail)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.contactEmail (23) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 23:contactEmail: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField25(oprot thrift.TProtocol) (err error) {
-	if p.IsSetExecutorConfig() {
-		if err := oprot.WriteFieldBegin("executorConfig", thrift.STRUCT, 25); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 25:executorConfig: ", p), err)
-		}
-		if err := p.ExecutorConfig.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ExecutorConfig), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 25:executorConfig: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField27(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMetadata() {
-		if err := oprot.WriteFieldBegin("metadata", thrift.SET, 27); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 27:metadata: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Metadata)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.Metadata {
-			if err := v.Write(oprot); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 27:metadata: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField28(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 28); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 28:job: ", p), err)
-	}
-	if err := p.Job.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 28:job: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField29(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("container", thrift.STRUCT, 29); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 29:container: ", p), err)
-	}
-	if err := p.Container.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Container), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 29:container: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField30(oprot thrift.TProtocol) (err error) {
-	if p.IsSetTier() {
-		if err := oprot.WriteFieldBegin("tier", thrift.STRING, 30); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 30:tier: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Tier)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.tier (30) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 30:tier: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField32(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("resources", thrift.SET, 32); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 32:resources: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Resources)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Resources {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 32:resources: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField33(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMesosFetcherUris() {
-		if err := oprot.WriteFieldBegin("mesosFetcherUris", thrift.SET, 33); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 33:mesosFetcherUris: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.MesosFetcherUris)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.MesosFetcherUris {
-			if err := v.Write(oprot); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 33:mesosFetcherUris: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField34(oprot thrift.TProtocol) (err error) {
-	if p.IsSetPartitionPolicy() {
-		if err := oprot.WriteFieldBegin("partitionPolicy", thrift.STRUCT, 34); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 34:partitionPolicy: ", p), err)
-		}
-		if err := p.PartitionPolicy.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.PartitionPolicy), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 34:partitionPolicy: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) writeField35(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSlaPolicy() {
-		if err := oprot.WriteFieldBegin("slaPolicy", thrift.STRUCT, 35); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 35:slaPolicy: ", p), err)
-		}
-		if err := p.SlaPolicy.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.SlaPolicy), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 35:slaPolicy: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskConfig) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("TaskConfig(%+v)", *p)
-}
-
-// Attributes:
-//  - Resources: Aggregated resource values.
-type ResourceAggregate struct {
-	// unused fields # 1 to 3
-	Resources map[*Resource]bool `thrift:"resources,4" json:"resources"`
-}
-
-func NewResourceAggregate() *ResourceAggregate {
-	return &ResourceAggregate{}
-}
-
-func (p *ResourceAggregate) GetResources() map[*Resource]bool {
-	return p.Resources
-}
-func (p *ResourceAggregate) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ResourceAggregate) readField4(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Resource]bool, size)
-	p.Resources = tSet
-	for i := 0; i < size; i++ {
-		_elem11 := &Resource{}
-		if err := _elem11.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem11), err)
-		}
-		p.Resources[_elem11] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *ResourceAggregate) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ResourceAggregate"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ResourceAggregate) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("resources", thrift.SET, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:resources: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Resources)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Resources {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:resources: ", p), err)
-	}
-	return err
-}
-
-func (p *ResourceAggregate) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ResourceAggregate(%+v)", *p)
-}
-
-// Description of an Aurora job. One task will be scheduled for each instance within the job.
-//
-// Attributes:
-//  - Key: Key for this job. If not specified name, owner.role, and a reasonable default environment are
-// used to construct it server-side.
-//  - Owner: Owner of this job.
-//  - CronSchedule: If present, the job will be handled as a cron job with this crontab-syntax schedule.
-//  - CronCollisionPolicy: Collision policy to use when handling overlapping cron runs.  Default is KILL_EXISTING.
-//  - TaskConfig: Task configuration for this job.
-//  - InstanceCount: The number of instances in the job. Generated instance IDs for tasks will be in the range
-// [0, instances).
-type JobConfiguration struct {
-	// unused fields # 1 to 3
-	CronSchedule        *string             `thrift:"cronSchedule,4" json:"cronSchedule,omitempty"`
-	CronCollisionPolicy CronCollisionPolicy `thrift:"cronCollisionPolicy,5" json:"cronCollisionPolicy"`
-	TaskConfig          *TaskConfig         `thrift:"taskConfig,6" json:"taskConfig"`
-	Owner               *Identity           `thrift:"owner,7" json:"owner"`
-	InstanceCount       int32               `thrift:"instanceCount,8" json:"instanceCount"`
-	Key                 *JobKey             `thrift:"key,9" json:"key"`
-}
-
-func NewJobConfiguration() *JobConfiguration {
-	return &JobConfiguration{}
-}
-
-var JobConfiguration_Key_DEFAULT *JobKey
-
-func (p *JobConfiguration) GetKey() *JobKey {
-	if !p.IsSetKey() {
-		return JobConfiguration_Key_DEFAULT
-	}
-	return p.Key
-}
-
-var JobConfiguration_Owner_DEFAULT *Identity
-
-func (p *JobConfiguration) GetOwner() *Identity {
-	if !p.IsSetOwner() {
-		return JobConfiguration_Owner_DEFAULT
-	}
-	return p.Owner
-}
-
-var JobConfiguration_CronSchedule_DEFAULT string
-
-func (p *JobConfiguration) GetCronSchedule() string {
-	if !p.IsSetCronSchedule() {
-		return JobConfiguration_CronSchedule_DEFAULT
-	}
-	return *p.CronSchedule
-}
-
-func (p *JobConfiguration) GetCronCollisionPolicy() CronCollisionPolicy {
-	return p.CronCollisionPolicy
-}
-
-var JobConfiguration_TaskConfig_DEFAULT *TaskConfig
-
-func (p *JobConfiguration) GetTaskConfig() *TaskConfig {
-	if !p.IsSetTaskConfig() {
-		return JobConfiguration_TaskConfig_DEFAULT
-	}
-	return p.TaskConfig
-}
-
-func (p *JobConfiguration) GetInstanceCount() int32 {
-	return p.InstanceCount
-}
-func (p *JobConfiguration) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *JobConfiguration) IsSetOwner() bool {
-	return p.Owner != nil
-}
-
-func (p *JobConfiguration) IsSetCronSchedule() bool {
-	return p.CronSchedule != nil
-}
-
-func (p *JobConfiguration) IsSetTaskConfig() bool {
-	return p.TaskConfig != nil
-}
-
-func (p *JobConfiguration) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 9:
-			if err := p.readField9(iprot); err != nil {
-				return err
-			}
-		case 7:
-			if err := p.readField7(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		case 8:
-			if err := p.readField8(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobConfiguration) readField9(iprot thrift.TProtocol) error {
-	p.Key = &JobKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *JobConfiguration) readField7(iprot thrift.TProtocol) error {
-	p.Owner = &Identity{}
-	if err := p.Owner.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Owner), err)
-	}
-	return nil
-}
-
-func (p *JobConfiguration) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.CronSchedule = &v
-	}
-	return nil
-}
-
-func (p *JobConfiguration) readField5(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 5: ", err)
-	} else {
-		temp := CronCollisionPolicy(v)
-		p.CronCollisionPolicy = temp
-	}
-	return nil
-}
-
-func (p *JobConfiguration) readField6(iprot thrift.TProtocol) error {
-	p.TaskConfig = &TaskConfig{}
-	if err := p.TaskConfig.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TaskConfig), err)
-	}
-	return nil
-}
-
-func (p *JobConfiguration) readField8(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 8: ", err)
-	} else {
-		p.InstanceCount = v
-	}
-	return nil
-}
-
-func (p *JobConfiguration) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobConfiguration"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField7(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField8(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField9(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobConfiguration) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetCronSchedule() {
-		if err := oprot.WriteFieldBegin("cronSchedule", thrift.STRING, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:cronSchedule: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.CronSchedule)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.cronSchedule (4) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:cronSchedule: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobConfiguration) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("cronCollisionPolicy", thrift.I32, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:cronCollisionPolicy: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.CronCollisionPolicy)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.cronCollisionPolicy (5) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:cronCollisionPolicy: ", p), err)
-	}
-	return err
-}
-
-func (p *JobConfiguration) writeField6(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("taskConfig", thrift.STRUCT, 6); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:taskConfig: ", p), err)
-	}
-	if err := p.TaskConfig.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TaskConfig), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:taskConfig: ", p), err)
-	}
-	return err
-}
-
-func (p *JobConfiguration) writeField7(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("owner", thrift.STRUCT, 7); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:owner: ", p), err)
-	}
-	if err := p.Owner.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Owner), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 7:owner: ", p), err)
-	}
-	return err
-}
-
-func (p *JobConfiguration) writeField8(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instanceCount", thrift.I32, 8); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:instanceCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.InstanceCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.instanceCount (8) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 8:instanceCount: ", p), err)
-	}
-	return err
-}
-
-func (p *JobConfiguration) writeField9(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 9); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 9:key: ", p), err)
-	}
-	return err
-}
-
-func (p *JobConfiguration) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobConfiguration(%+v)", *p)
-}
-
-// Attributes:
-//  - ActiveTaskCount: Number of tasks in active state for this job.
-//  - FinishedTaskCount: Number of tasks in finished state for this job.
-//  - FailedTaskCount: Number of failed tasks for this job.
-//  - PendingTaskCount: Number of tasks in pending state for this job.
-type JobStats struct {
-	ActiveTaskCount   int32 `thrift:"activeTaskCount,1" json:"activeTaskCount"`
-	FinishedTaskCount int32 `thrift:"finishedTaskCount,2" json:"finishedTaskCount"`
-	FailedTaskCount   int32 `thrift:"failedTaskCount,3" json:"failedTaskCount"`
-	PendingTaskCount  int32 `thrift:"pendingTaskCount,4" json:"pendingTaskCount"`
-}
-
-func NewJobStats() *JobStats {
-	return &JobStats{}
-}
-
-func (p *JobStats) GetActiveTaskCount() int32 {
-	return p.ActiveTaskCount
-}
-
-func (p *JobStats) GetFinishedTaskCount() int32 {
-	return p.FinishedTaskCount
-}
-
-func (p *JobStats) GetFailedTaskCount() int32 {
-	return p.FailedTaskCount
-}
-
-func (p *JobStats) GetPendingTaskCount() int32 {
-	return p.PendingTaskCount
-}
-func (p *JobStats) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobStats) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.ActiveTaskCount = v
-	}
-	return nil
-}
-
-func (p *JobStats) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.FinishedTaskCount = v
-	}
-	return nil
-}
-
-func (p *JobStats) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.FailedTaskCount = v
-	}
-	return nil
-}
-
-func (p *JobStats) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.PendingTaskCount = v
-	}
-	return nil
-}
-
-func (p *JobStats) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobStats"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobStats) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("activeTaskCount", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:activeTaskCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.ActiveTaskCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.activeTaskCount (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:activeTaskCount: ", p), err)
-	}
-	return err
-}
-
-func (p *JobStats) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("finishedTaskCount", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:finishedTaskCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.FinishedTaskCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.finishedTaskCount (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:finishedTaskCount: ", p), err)
-	}
-	return err
-}
-
-func (p *JobStats) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("failedTaskCount", thrift.I32, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:failedTaskCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.FailedTaskCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.failedTaskCount (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:failedTaskCount: ", p), err)
-	}
-	return err
-}
-
-func (p *JobStats) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("pendingTaskCount", thrift.I32, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:pendingTaskCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.PendingTaskCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.pendingTaskCount (4) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:pendingTaskCount: ", p), err)
-	}
-	return err
-}
-
-func (p *JobStats) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobStats(%+v)", *p)
-}
-
-// Attributes:
-//  - Job
-//  - Stats
-//  - NextCronRunMs: Timestamp of next cron run in ms since epoch, for a cron job
-type JobSummary struct {
-	Job           *JobConfiguration `thrift:"job,1" json:"job"`
-	Stats         *JobStats         `thrift:"stats,2" json:"stats"`
-	NextCronRunMs *int64            `thrift:"nextCronRunMs,3" json:"nextCronRunMs,omitempty"`
-}
-
-func NewJobSummary() *JobSummary {
-	return &JobSummary{}
-}
-
-var JobSummary_Job_DEFAULT *JobConfiguration
-
-func (p *JobSummary) GetJob() *JobConfiguration {
-	if !p.IsSetJob() {
-		return JobSummary_Job_DEFAULT
-	}
-	return p.Job
-}
-
-var JobSummary_Stats_DEFAULT *JobStats
-
-func (p *JobSummary) GetStats() *JobStats {
-	if !p.IsSetStats() {
-		return JobSummary_Stats_DEFAULT
-	}
-	return p.Stats
-}
-
-var JobSummary_NextCronRunMs_DEFAULT int64
-
-func (p *JobSummary) GetNextCronRunMs() int64 {
-	if !p.IsSetNextCronRunMs() {
-		return JobSummary_NextCronRunMs_DEFAULT
-	}
-	return *p.NextCronRunMs
-}
-func (p *JobSummary) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *JobSummary) IsSetStats() bool {
-	return p.Stats != nil
-}
-
-func (p *JobSummary) IsSetNextCronRunMs() bool {
-	return p.NextCronRunMs != nil
-}
-
-func (p *JobSummary) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobSummary) readField1(iprot thrift.TProtocol) error {
-	p.Job = &JobConfiguration{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *JobSummary) readField2(iprot thrift.TProtocol) error {
-	p.Stats = &JobStats{}
-	if err := p.Stats.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Stats), err)
-	}
-	return nil
-}
-
-func (p *JobSummary) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.NextCronRunMs = &v
-	}
-	return nil
-}
-
-func (p *JobSummary) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobSummary"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobSummary) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:job: ", p), err)
-	}
-	if err := p.Job.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:job: ", p), err)
-	}
-	return err
-}
-
-func (p *JobSummary) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("stats", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:stats: ", p), err)
-	}
-	if err := p.Stats.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Stats), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:stats: ", p), err)
-	}
-	return err
-}
-
-func (p *JobSummary) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetNextCronRunMs() {
-		if err := oprot.WriteFieldBegin("nextCronRunMs", thrift.I64, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:nextCronRunMs: ", p), err)
-		}
-		if err := oprot.WriteI64(int64(*p.NextCronRunMs)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.nextCronRunMs (3) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:nextCronRunMs: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobSummary) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobSummary(%+v)", *p)
-}
-
-// Closed range of integers.
-//
-// Attributes:
-//  - First
-//  - Last
-type Range struct {
-	First int32 `thrift:"first,1" json:"first"`
-	Last  int32 `thrift:"last,2" json:"last"`
-}
-
-func NewRange() *Range {
-	return &Range{}
-}
-
-func (p *Range) GetFirst() int32 {
-	return p.First
-}
-
-func (p *Range) GetLast() int32 {
-	return p.Last
-}
-func (p *Range) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Range) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.First = v
-	}
-	return nil
-}
-
-func (p *Range) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Last = v
-	}
-	return nil
-}
-
-func (p *Range) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Range"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Range) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("first", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:first: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.First)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.first (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:first: ", p), err)
-	}
-	return err
-}
-
-func (p *Range) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("last", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:last: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Last)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.last (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:last: ", p), err)
-	}
-	return err
-}
-
-func (p *Range) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Range(%+v)", *p)
-}
-
-// Attributes:
-//  - Config
-//  - Instances
-type ConfigGroup struct {
-	Config *TaskConfig `thrift:"config,1" json:"config"`
-	// unused field # 2
-	Instances map[*Range]bool `thrift:"instances,3" json:"instances"`
-}
-
-func NewConfigGroup() *ConfigGroup {
-	return &ConfigGroup{}
-}
-
-var ConfigGroup_Config_DEFAULT *TaskConfig
-
-func (p *ConfigGroup) GetConfig() *TaskConfig {
-	if !p.IsSetConfig() {
-		return ConfigGroup_Config_DEFAULT
-	}
-	return p.Config
-}
-
-func (p *ConfigGroup) GetInstances() map[*Range]bool {
-	return p.Instances
-}
-func (p *ConfigGroup) IsSetConfig() bool {
-	return p.Config != nil
-}
-
-func (p *ConfigGroup) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ConfigGroup) readField1(iprot thrift.TProtocol) error {
-	p.Config = &TaskConfig{}
-	if err := p.Config.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Config), err)
-	}
-	return nil
-}
-
-func (p *ConfigGroup) readField3(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Range]bool, size)
-	p.Instances = tSet
-	for i := 0; i < size; i++ {
-		_elem12 := &Range{}
-		if err := _elem12.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem12), err)
-		}
-		p.Instances[_elem12] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *ConfigGroup) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ConfigGroup"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ConfigGroup) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("config", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:config: ", p), err)
-	}
-	if err := p.Config.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Config), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:config: ", p), err)
-	}
-	return err
-}
-
-func (p *ConfigGroup) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instances", thrift.SET, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:instances: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Instances)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Instances {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:instances: ", p), err)
-	}
-	return err
-}
-
-func (p *ConfigGroup) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ConfigGroup(%+v)", *p)
-}
-
-// Attributes:
-//  - Key
-//  - Groups
-type ConfigSummary struct {
-	Key    *JobKey               `thrift:"key,1" json:"key"`
-	Groups map[*ConfigGroup]bool `thrift:"groups,2" json:"groups"`
-}
-
-func NewConfigSummary() *ConfigSummary {
-	return &ConfigSummary{}
-}
-
-var ConfigSummary_Key_DEFAULT *JobKey
-
-func (p *ConfigSummary) GetKey() *JobKey {
-	if !p.IsSetKey() {
-		return ConfigSummary_Key_DEFAULT
-	}
-	return p.Key
-}
-
-func (p *ConfigSummary) GetGroups() map[*ConfigGroup]bool {
-	return p.Groups
-}
-func (p *ConfigSummary) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *ConfigSummary) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ConfigSummary) readField1(iprot thrift.TProtocol) error {
-	p.Key = &JobKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *ConfigSummary) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*ConfigGroup]bool, size)
-	p.Groups = tSet
-	for i := 0; i < size; i++ {
-		_elem13 := &ConfigGroup{}
-		if err := _elem13.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem13), err)
-		}
-		p.Groups[_elem13] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *ConfigSummary) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ConfigSummary"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ConfigSummary) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *ConfigSummary) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("groups", thrift.SET, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:groups: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Groups)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Groups {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:groups: ", p), err)
-	}
-	return err
-}
-
-func (p *ConfigSummary) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ConfigSummary(%+v)", *p)
-}
-
-// Attributes:
-//  - TaskConfig
-type PopulateJobResult_ struct {
-	// unused field # 1
-	TaskConfig *TaskConfig `thrift:"taskConfig,2" json:"taskConfig"`
-}
-
-func NewPopulateJobResult_() *PopulateJobResult_ {
-	return &PopulateJobResult_{}
-}
-
-var PopulateJobResult__TaskConfig_DEFAULT *TaskConfig
-
-func (p *PopulateJobResult_) GetTaskConfig() *TaskConfig {
-	if !p.IsSetTaskConfig() {
-		return PopulateJobResult__TaskConfig_DEFAULT
-	}
-	return p.TaskConfig
-}
-func (p *PopulateJobResult_) IsSetTaskConfig() bool {
-	return p.TaskConfig != nil
-}
-
-func (p *PopulateJobResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *PopulateJobResult_) readField2(iprot thrift.TProtocol) error {
-	p.TaskConfig = &TaskConfig{}
-	if err := p.TaskConfig.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TaskConfig), err)
-	}
-	return nil
-}
-
-func (p *PopulateJobResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("PopulateJobResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *PopulateJobResult_) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("taskConfig", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:taskConfig: ", p), err)
-	}
-	if err := p.TaskConfig.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TaskConfig), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:taskConfig: ", p), err)
-	}
-	return err
-}
-
-func (p *PopulateJobResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("PopulateJobResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Quota: Total allocated resource quota.
-//  - ProdSharedConsumption: Resources consumed by production jobs from a shared resource pool.
-//  - NonProdSharedConsumption: Resources consumed by non-production jobs from a shared resource pool.
-//  - ProdDedicatedConsumption: Resources consumed by production jobs from a dedicated resource pool.
-//  - NonProdDedicatedConsumption: Resources consumed by non-production jobs from a dedicated resource pool.
-type GetQuotaResult_ struct {
-	Quota                       *ResourceAggregate `thrift:"quota,1" json:"quota"`
-	ProdSharedConsumption       *ResourceAggregate `thrift:"prodSharedConsumption,2" json:"prodSharedConsumption,omitempty"`
-	NonProdSharedConsumption    *ResourceAggregate `thrift:"nonProdSharedConsumption,3" json:"nonProdSharedConsumption,omitempty"`
-	ProdDedicatedConsumption    *ResourceAggregate `thrift:"prodDedicatedConsumption,4" json:"prodDedicatedConsumption,omitempty"`
-	NonProdDedicatedConsumption *ResourceAggregate `thrift:"nonProdDedicatedConsumption,5" json:"nonProdDedicatedConsumption,omitempty"`
-}
-
-func NewGetQuotaResult_() *GetQuotaResult_ {
-	return &GetQuotaResult_{}
-}
-
-var GetQuotaResult__Quota_DEFAULT *ResourceAggregate
-
-func (p *GetQuotaResult_) GetQuota() *ResourceAggregate {
-	if !p.IsSetQuota() {
-		return GetQuotaResult__Quota_DEFAULT
-	}
-	return p.Quota
-}
-
-var GetQuotaResult__ProdSharedConsumption_DEFAULT *ResourceAggregate
-
-func (p *GetQuotaResult_) GetProdSharedConsumption() *ResourceAggregate {
-	if !p.IsSetProdSharedConsumption() {
-		return GetQuotaResult__ProdSharedConsumption_DEFAULT
-	}
-	return p.ProdSharedConsumption
-}
-
-var GetQuotaResult__NonProdSharedConsumption_DEFAULT *ResourceAggregate
-
-func (p *GetQuotaResult_) GetNonProdSharedConsumption() *ResourceAggregate {
-	if !p.IsSetNonProdSharedConsumption() {
-		return GetQuotaResult__NonProdSharedConsumption_DEFAULT
-	}
-	return p.NonProdSharedConsumption
-}
-
-var GetQuotaResult__ProdDedicatedConsumption_DEFAULT *ResourceAggregate
-
-func (p *GetQuotaResult_) GetProdDedicatedConsumption() *ResourceAggregate {
-	if !p.IsSetProdDedicatedConsumption() {
-		return GetQuotaResult__ProdDedicatedConsumption_DEFAULT
-	}
-	return p.ProdDedicatedConsumption
-}
-
-var GetQuotaResult__NonProdDedicatedConsumption_DEFAULT *ResourceAggregate
-
-func (p *GetQuotaResult_) GetNonProdDedicatedConsumption() *ResourceAggregate {
-	if !p.IsSetNonProdDedicatedConsumption() {
-		return GetQuotaResult__NonProdDedicatedConsumption_DEFAULT
-	}
-	return p.NonProdDedicatedConsumption
-}
-func (p *GetQuotaResult_) IsSetQuota() bool {
-	return p.Quota != nil
-}
-
-func (p *GetQuotaResult_) IsSetProdSharedConsumption() bool {
-	return p.ProdSharedConsumption != nil
-}
-
-func (p *GetQuotaResult_) IsSetNonProdSharedConsumption() bool {
-	return p.NonProdSharedConsumption != nil
-}
-
-func (p *GetQuotaResult_) IsSetProdDedicatedConsumption() bool {
-	return p.ProdDedicatedConsumption != nil
-}
-
-func (p *GetQuotaResult_) IsSetNonProdDedicatedConsumption() bool {
-	return p.NonProdDedicatedConsumption != nil
-}
-
-func (p *GetQuotaResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *GetQuotaResult_) readField1(iprot thrift.TProtocol) error {
-	p.Quota = &ResourceAggregate{}
-	if err := p.Quota.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Quota), err)
-	}
-	return nil
-}
-
-func (p *GetQuotaResult_) readField2(iprot thrift.TProtocol) error {
-	p.ProdSharedConsumption = &ResourceAggregate{}
-	if err := p.ProdSharedConsumption.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ProdSharedConsumption), err)
-	}
-	return nil
-}
-
-func (p *GetQuotaResult_) readField3(iprot thrift.TProtocol) error {
-	p.NonProdSharedConsumption = &ResourceAggregate{}
-	if err := p.NonProdSharedConsumption.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.NonProdSharedConsumption), err)
-	}
-	return nil
-}
-
-func (p *GetQuotaResult_) readField4(iprot thrift.TProtocol) error {
-	p.ProdDedicatedConsumption = &ResourceAggregate{}
-	if err := p.ProdDedicatedConsumption.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ProdDedicatedConsumption), err)
-	}
-	return nil
-}
-
-func (p *GetQuotaResult_) readField5(iprot thrift.TProtocol) error {
-	p.NonProdDedicatedConsumption = &ResourceAggregate{}
-	if err := p.NonProdDedicatedConsumption.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.NonProdDedicatedConsumption), err)
-	}
-	return nil
-}
-
-func (p *GetQuotaResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("GetQuotaResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *GetQuotaResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("quota", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:quota: ", p), err)
-	}
-	if err := p.Quota.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Quota), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:quota: ", p), err)
-	}
-	return err
-}
-
-func (p *GetQuotaResult_) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetProdSharedConsumption() {
-		if err := oprot.WriteFieldBegin("prodSharedConsumption", thrift.STRUCT, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:prodSharedConsumption: ", p), err)
-		}
-		if err := p.ProdSharedConsumption.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ProdSharedConsumption), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:prodSharedConsumption: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *GetQuotaResult_) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetNonProdSharedConsumption() {
-		if err := oprot.WriteFieldBegin("nonProdSharedConsumption", thrift.STRUCT, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:nonProdSharedConsumption: ", p), err)
-		}
-		if err := p.NonProdSharedConsumption.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.NonProdSharedConsumption), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:nonProdSharedConsumption: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *GetQuotaResult_) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetProdDedicatedConsumption() {
-		if err := oprot.WriteFieldBegin("prodDedicatedConsumption", thrift.STRUCT, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:prodDedicatedConsumption: ", p), err)
-		}
-		if err := p.ProdDedicatedConsumption.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ProdDedicatedConsumption), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:prodDedicatedConsumption: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *GetQuotaResult_) writeField5(oprot thrift.TProtocol) (err error) {
-	if p.IsSetNonProdDedicatedConsumption() {
-		if err := oprot.WriteFieldBegin("nonProdDedicatedConsumption", thrift.STRUCT, 5); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:nonProdDedicatedConsumption: ", p), err)
-		}
-		if err := p.NonProdDedicatedConsumption.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.NonProdDedicatedConsumption), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:nonProdDedicatedConsumption: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *GetQuotaResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("GetQuotaResult_(%+v)", *p)
-}
-
-// Event marking a state transition within a task's lifecycle.
-//
-// Attributes:
-//  - Timestamp: Epoch timestamp in milliseconds.
-//  - Status: New status of the task.
-//  - Message: Audit message that explains why a transition occurred.
-//  - Scheduler: Hostname of the scheduler machine that performed the event.
-type TaskEvent struct {
-	Timestamp int64          `thrift:"timestamp,1" json:"timestamp"`
-	Status    ScheduleStatus `thrift:"status,2" json:"status"`
-	Message   *string        `thrift:"message,3" json:"message,omitempty"`
-	Scheduler *string        `thrift:"scheduler,4" json:"scheduler,omitempty"`
-}
-
-func NewTaskEvent() *TaskEvent {
-	return &TaskEvent{}
-}
-
-func (p *TaskEvent) GetTimestamp() int64 {
-	return p.Timestamp
-}
-
-func (p *TaskEvent) GetStatus() ScheduleStatus {
-	return p.Status
-}
-
-var TaskEvent_Message_DEFAULT string
-
-func (p *TaskEvent) GetMessage() string {
-	if !p.IsSetMessage() {
-		return TaskEvent_Message_DEFAULT
-	}
-	return *p.Message
-}
-
-var TaskEvent_Scheduler_DEFAULT string
-
-func (p *TaskEvent) GetScheduler() string {
-	if !p.IsSetScheduler() {
-		return TaskEvent_Scheduler_DEFAULT
-	}
-	return *p.Scheduler
-}
-func (p *TaskEvent) IsSetMessage() bool {
-	return p.Message != nil
-}
-
-func (p *TaskEvent) IsSetScheduler() bool {
-	return p.Scheduler != nil
-}
-
-func (p *TaskEvent) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *TaskEvent) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Timestamp = v
-	}
-	return nil
-}
-
-func (p *TaskEvent) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		temp := ScheduleStatus(v)
-		p.Status = temp
-	}
-	return nil
-}
-
-func (p *TaskEvent) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.Message = &v
-	}
-	return nil
-}
-
-func (p *TaskEvent) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.Scheduler = &v
-	}
-	return nil
-}
-
-func (p *TaskEvent) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("TaskEvent"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *TaskEvent) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("timestamp", thrift.I64, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:timestamp: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.Timestamp)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.timestamp (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:timestamp: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskEvent) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("status", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:status: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Status)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.status (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:status: ", p), err)
-	}
-	return err
-}
-
-func (p *TaskEvent) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMessage() {
-		if err := oprot.WriteFieldBegin("message", thrift.STRING, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:message: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Message)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.message (3) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:message: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskEvent) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetScheduler() {
-		if err := oprot.WriteFieldBegin("scheduler", thrift.STRING, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:scheduler: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Scheduler)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.scheduler (4) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:scheduler: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskEvent) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("TaskEvent(%+v)", *p)
-}
-
-// A task assignment that is provided to an executor.
-//
-// Attributes:
-//  - TaskId: The mesos task ID for this task.  Guaranteed to be globally unique
-//  - SlaveId: The mesos slave ID that this task has been assigned to.
-// This will not be populated for a PENDING task.
-//  - SlaveHost: The name of the machine that this task has been assigned to.
-// This will not be populated for a PENDING task.
-//  - Task: Information about how to run this task.
-//  - AssignedPorts: Ports reserved on the machine while this task is running.
-//  - InstanceId: The instance ID assigned to this task. Instance IDs must be unique and contiguous within a
-// job, and will be in the range [0, N-1] (inclusive) for a job that has N instances.
-type AssignedTask struct {
-	TaskId        string           `thrift:"taskId,1" json:"taskId"`
-	SlaveId       string           `thrift:"slaveId,2" json:"slaveId"`
-	SlaveHost     string           `thrift:"slaveHost,3" json:"slaveHost"`
-	Task          *TaskConfig      `thrift:"task,4" json:"task"`
-	AssignedPorts map[string]int32 `thrift:"assignedPorts,5" json:"assignedPorts"`
-	InstanceId    int32            `thrift:"instanceId,6" json:"instanceId"`
-}
-
-func NewAssignedTask() *AssignedTask {
-	return &AssignedTask{}
-}
-
-func (p *AssignedTask) GetTaskId() string {
-	return p.TaskId
-}
-
-func (p *AssignedTask) GetSlaveId() string {
-	return p.SlaveId
-}
-
-func (p *AssignedTask) GetSlaveHost() string {
-	return p.SlaveHost
-}
-
-var AssignedTask_Task_DEFAULT *TaskConfig
-
-func (p *AssignedTask) GetTask() *TaskConfig {
-	if !p.IsSetTask() {
-		return AssignedTask_Task_DEFAULT
-	}
-	return p.Task
-}
-
-func (p *AssignedTask) GetAssignedPorts() map[string]int32 {
-	return p.AssignedPorts
-}
-
-func (p *AssignedTask) GetInstanceId() int32 {
-	return p.InstanceId
-}
-func (p *AssignedTask) IsSetTask() bool {
-	return p.Task != nil
-}
-
-func (p *AssignedTask) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *AssignedTask) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.TaskId = v
-	}
-	return nil
-}
-
-func (p *AssignedTask) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.SlaveId = v
-	}
-	return nil
-}
-
-func (p *AssignedTask) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.SlaveHost = v
-	}
-	return nil
-}
-
-func (p *AssignedTask) readField4(iprot thrift.TProtocol) error {
-	p.Task = &TaskConfig{}
-	if err := p.Task.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Task), err)
-	}
-	return nil
-}
-
-func (p *AssignedTask) readField5(iprot thrift.TProtocol) error {
-	_, _, size, err := iprot.ReadMapBegin()
-	if err != nil {
-		return thrift.PrependError("error reading map begin: ", err)
-	}
-	tMap := make(map[string]int32, size)
-	p.AssignedPorts = tMap
-	for i := 0; i < size; i++ {
-		var _key14 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_key14 = v
-		}
-		var _val15 int32
-		if v, err := iprot.ReadI32(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_val15 = v
-		}
-		p.AssignedPorts[_key14] = _val15
-	}
-	if err := iprot.ReadMapEnd(); err != nil {
-		return thrift.PrependError("error reading map end: ", err)
-	}
-	return nil
-}
-
-func (p *AssignedTask) readField6(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 6: ", err)
-	} else {
-		p.InstanceId = v
-	}
-	return nil
-}
-
-func (p *AssignedTask) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("AssignedTask"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *AssignedTask) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("taskId", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:taskId: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.TaskId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.taskId (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:taskId: ", p), err)
-	}
-	return err
-}
-
-func (p *AssignedTask) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("slaveId", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:slaveId: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.SlaveId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.slaveId (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:slaveId: ", p), err)
-	}
-	return err
-}
-
-func (p *AssignedTask) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("slaveHost", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:slaveHost: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.SlaveHost)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.slaveHost (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:slaveHost: ", p), err)
-	}
-	return err
-}
-
-func (p *AssignedTask) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("task", thrift.STRUCT, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:task: ", p), err)
-	}
-	if err := p.Task.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Task), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:task: ", p), err)
-	}
-	return err
-}
-
-func (p *AssignedTask) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("assignedPorts", thrift.MAP, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:assignedPorts: ", p), err)
-	}
-	if err := oprot.WriteMapBegin(thrift.STRING, thrift.I32, len(p.AssignedPorts)); err != nil {
-		return thrift.PrependError("error writing map begin: ", err)
-	}
-	for k, v := range p.AssignedPorts {
-		if err := oprot.WriteString(string(k)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-		if err := oprot.WriteI32(int32(v)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-	}
-	if err := oprot.WriteMapEnd(); err != nil {
-		return thrift.PrependError("error writing map end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:assignedPorts: ", p), err)
-	}
-	return err
-}
-
-func (p *AssignedTask) writeField6(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instanceId", thrift.I32, 6); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:instanceId: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.InstanceId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.instanceId (6) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:instanceId: ", p), err)
-	}
-	return err
-}
-
-func (p *AssignedTask) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("AssignedTask(%+v)", *p)
-}
-
-// A task that has been scheduled.
-//
-// Attributes:
-//  - AssignedTask: The task that was scheduled.
-//  - Status: The current status of this task.
-//  - FailureCount: The number of failures that this task has accumulated over the multi-generational history of
-// this task.
-//  - TimesPartitioned: The number of partitions this task has accumulated over its lifetime.
-//  - TaskEvents: State change history for this task.
-//  - AncestorId: The task ID of the previous generation of this task.  When a task is automatically rescheduled,
-// a copy of the task is created and ancestor ID of the previous task's task ID.
-type ScheduledTask struct {
-	AssignedTask     *AssignedTask  `thrift:"assignedTask,1" json:"assignedTask"`
-	Status           ScheduleStatus `thrift:"status,2" json:"status"`
-	FailureCount     int32          `thrift:"failureCount,3" json:"failureCount"`
-	TaskEvents       []*TaskEvent   `thrift:"taskEvents,4" json:"taskEvents"`
-	AncestorId       string         `thrift:"ancestorId,5" json:"ancestorId"`
-	TimesPartitioned int32          `thrift:"timesPartitioned,6" json:"timesPartitioned"`
-}
-
-func NewScheduledTask() *ScheduledTask {
-	return &ScheduledTask{}
-}
-
-var ScheduledTask_AssignedTask_DEFAULT *AssignedTask
-
-func (p *ScheduledTask) GetAssignedTask() *AssignedTask {
-	if !p.IsSetAssignedTask() {
-		return ScheduledTask_AssignedTask_DEFAULT
-	}
-	return p.AssignedTask
-}
-
-func (p *ScheduledTask) GetStatus() ScheduleStatus {
-	return p.Status
-}
-
-func (p *ScheduledTask) GetFailureCount() int32 {
-	return p.FailureCount
-}
-
-func (p *ScheduledTask) GetTimesPartitioned() int32 {
-	return p.TimesPartitioned
-}
-
-func (p *ScheduledTask) GetTaskEvents() []*TaskEvent {
-	return p.TaskEvents
-}
-
-func (p *ScheduledTask) GetAncestorId() string {
-	return p.AncestorId
-}
-func (p *ScheduledTask) IsSetAssignedTask() bool {
-	return p.AssignedTask != nil
-}
-
-func (p *ScheduledTask) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ScheduledTask) readField1(iprot thrift.TProtocol) error {
-	p.AssignedTask = &AssignedTask{}
-	if err := p.AssignedTask.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.AssignedTask), err)
-	}
-	return nil
-}
-
-func (p *ScheduledTask) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		temp := ScheduleStatus(v)
-		p.Status = temp
-	}
-	return nil
-}
-
-func (p *ScheduledTask) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.FailureCount = v
-	}
-	return nil
-}
-
-func (p *ScheduledTask) readField6(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 6: ", err)
-	} else {
-		p.TimesPartitioned = v
-	}
-	return nil
-}
-
-func (p *ScheduledTask) readField4(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*TaskEvent, 0, size)
-	p.TaskEvents = tSlice
-	for i := 0; i < size; i++ {
-		_elem16 := &TaskEvent{}
-		if err := _elem16.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem16), err)
-		}
-		p.TaskEvents = append(p.TaskEvents, _elem16)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *ScheduledTask) readField5(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 5: ", err)
-	} else {
-		p.AncestorId = v
-	}
-	return nil
-}
-
-func (p *ScheduledTask) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ScheduledTask"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ScheduledTask) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("assignedTask", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:assignedTask: ", p), err)
-	}
-	if err := p.AssignedTask.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.AssignedTask), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:assignedTask: ", p), err)
-	}
-	return err
-}
-
-func (p *ScheduledTask) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("status", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:status: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Status)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.status (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:status: ", p), err)
-	}
-	return err
-}
-
-func (p *ScheduledTask) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("failureCount", thrift.I32, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:failureCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.FailureCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.failureCount (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:failureCount: ", p), err)
-	}
-	return err
-}
-
-func (p *ScheduledTask) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("taskEvents", thrift.LIST, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:taskEvents: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.TaskEvents)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.TaskEvents {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:taskEvents: ", p), err)
-	}
-	return err
-}
-
-func (p *ScheduledTask) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("ancestorId", thrift.STRING, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:ancestorId: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.AncestorId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.ancestorId (5) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:ancestorId: ", p), err)
-	}
-	return err
-}
-
-func (p *ScheduledTask) writeField6(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("timesPartitioned", thrift.I32, 6); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:timesPartitioned: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.TimesPartitioned)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.timesPartitioned (6) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:timesPartitioned: ", p), err)
-	}
-	return err
-}
-
-func (p *ScheduledTask) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ScheduledTask(%+v)", *p)
-}
-
-// Attributes:
-//  - Tasks
-type ScheduleStatusResult_ struct {
-	Tasks []*ScheduledTask `thrift:"tasks,1" json:"tasks"`
-}
-
-func NewScheduleStatusResult_() *ScheduleStatusResult_ {
-	return &ScheduleStatusResult_{}
-}
-
-func (p *ScheduleStatusResult_) GetTasks() []*ScheduledTask {
-	return p.Tasks
-}
-func (p *ScheduleStatusResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ScheduleStatusResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*ScheduledTask, 0, size)
-	p.Tasks = tSlice
-	for i := 0; i < size; i++ {
-		_elem17 := &ScheduledTask{}
-		if err := _elem17.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem17), err)
-		}
-		p.Tasks = append(p.Tasks, _elem17)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *ScheduleStatusResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ScheduleStatusResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ScheduleStatusResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("tasks", thrift.LIST, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:tasks: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Tasks)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.Tasks {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:tasks: ", p), err)
-	}
-	return err
-}
-
-func (p *ScheduleStatusResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ScheduleStatusResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Configs
-type GetJobsResult_ struct {
-	Configs map[*JobConfiguration]bool `thrift:"configs,1" json:"configs"`
-}
-
-func NewGetJobsResult_() *GetJobsResult_ {
-	return &GetJobsResult_{}
-}
-
-func (p *GetJobsResult_) GetConfigs() map[*JobConfiguration]bool {
-	return p.Configs
-}
-func (p *GetJobsResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *GetJobsResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*JobConfiguration]bool, size)
-	p.Configs = tSet
-	for i := 0; i < size; i++ {
-		_elem18 := &JobConfiguration{}
-		if err := _elem18.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem18), err)
-		}
-		p.Configs[_elem18] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobsResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("GetJobsResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobsResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("configs", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:configs: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Configs)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Configs {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:configs: ", p), err)
-	}
-	return err
-}
-
-func (p *GetJobsResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("GetJobsResult_(%+v)", *p)
-}
-
-// Contains a set of restrictions on matching tasks where all restrictions must be met
-// (terms are AND'ed together).
-//
-// Attributes:
-//  - Role
-//  - Environment
-//  - JobName
-//  - TaskIds
-//  - Statuses
-//  - InstanceIds
-//  - SlaveHosts
-//  - JobKeys
-//  - Offset
-//  - Limit
-type TaskQuery struct {
-	// unused field # 1
-	JobName *string `thrift:"jobName,2" json:"jobName,omitempty"`
-	// unused field # 3
-	TaskIds  map[string]bool         `thrift:"taskIds,4" json:"taskIds,omitempty"`
-	Statuses map[ScheduleStatus]bool `thrift:"statuses,5" json:"statuses,omitempty"`
-	// unused field # 6
-	InstanceIds map[int32]bool `thrift:"instanceIds,7" json:"instanceIds,omitempty"`
-	// unused field # 8
-	Environment *string          `thrift:"environment,9" json:"environment,omitempty"`
-	SlaveHosts  map[string]bool  `thrift:"slaveHosts,10" json:"slaveHosts,omitempty"`
-	JobKeys     map[*JobKey]bool `thrift:"jobKeys,11" json:"jobKeys,omitempty"`
-	Offset      *int32           `thrift:"offset,12" json:"offset,omitempty"`
-	Limit       *int32           `thrift:"limit,13" json:"limit,omitempty"`
-	Role        *string          `thrift:"role,14" json:"role,omitempty"`
-}
-
-func NewTaskQuery() *TaskQuery {
-	return &TaskQuery{}
-}
-
-var TaskQuery_Role_DEFAULT string
-
-func (p *TaskQuery) GetRole() string {
-	if !p.IsSetRole() {
-		return TaskQuery_Role_DEFAULT
-	}
-	return *p.Role
-}
-
-var TaskQuery_Environment_DEFAULT string
-
-func (p *TaskQuery) GetEnvironment() string {
-	if !p.IsSetEnvironment() {
-		return TaskQuery_Environment_DEFAULT
-	}
-	return *p.Environment
-}
-
-var TaskQuery_JobName_DEFAULT string
-
-func (p *TaskQuery) GetJobName() string {
-	if !p.IsSetJobName() {
-		return TaskQuery_JobName_DEFAULT
-	}
-	return *p.JobName
-}
-
-var TaskQuery_TaskIds_DEFAULT map[string]bool
-
-func (p *TaskQuery) GetTaskIds() map[string]bool {
-	return p.TaskIds
-}
-
-var TaskQuery_Statuses_DEFAULT map[ScheduleStatus]bool
-
-func (p *TaskQuery) GetStatuses() map[ScheduleStatus]bool {
-	return p.Statuses
-}
-
-var TaskQuery_InstanceIds_DEFAULT map[int32]bool
-
-func (p *TaskQuery) GetInstanceIds() map[int32]bool {
-	return p.InstanceIds
-}
-
-var TaskQuery_SlaveHosts_DEFAULT map[string]bool
-
-func (p *TaskQuery) GetSlaveHosts() map[string]bool {
-	return p.SlaveHosts
-}
-
-var TaskQuery_JobKeys_DEFAULT map[*JobKey]bool
-
-func (p *TaskQuery) GetJobKeys() map[*JobKey]bool {
-	return p.JobKeys
-}
-
-var TaskQuery_Offset_DEFAULT int32
-
-func (p *TaskQuery) GetOffset() int32 {
-	if !p.IsSetOffset() {
-		return TaskQuery_Offset_DEFAULT
-	}
-	return *p.Offset
-}
-
-var TaskQuery_Limit_DEFAULT int32
-
-func (p *TaskQuery) GetLimit() int32 {
-	if !p.IsSetLimit() {
-		return TaskQuery_Limit_DEFAULT
-	}
-	return *p.Limit
-}
-func (p *TaskQuery) IsSetRole() bool {
-	return p.Role != nil
-}
-
-func (p *TaskQuery) IsSetEnvironment() bool {
-	return p.Environment != nil
-}
-
-func (p *TaskQuery) IsSetJobName() bool {
-	return p.JobName != nil
-}
-
-func (p *TaskQuery) IsSetTaskIds() bool {
-	return p.TaskIds != nil
-}
-
-func (p *TaskQuery) IsSetStatuses() bool {
-	return p.Statuses != nil
-}
-
-func (p *TaskQuery) IsSetInstanceIds() bool {
-	return p.InstanceIds != nil
-}
-
-func (p *TaskQuery) IsSetSlaveHosts() bool {
-	return p.SlaveHosts != nil
-}
-
-func (p *TaskQuery) IsSetJobKeys() bool {
-	return p.JobKeys != nil
-}
-
-func (p *TaskQuery) IsSetOffset() bool {
-	return p.Offset != nil
-}
-
-func (p *TaskQuery) IsSetLimit() bool {
-	return p.Limit != nil
-}
-
-func (p *TaskQuery) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 14:
-			if err := p.readField14(iprot); err != nil {
-				return err
-			}
-		case 9:
-			if err := p.readField9(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 7:
-			if err := p.readField7(iprot); err != nil {
-				return err
-			}
-		case 10:
-			if err := p.readField10(iprot); err != nil {
-				return err
-			}
-		case 11:
-			if err := p.readField11(iprot); err != nil {
-				return err
-			}
-		case 12:
-			if err := p.readField12(iprot); err != nil {
-				return err
-			}
-		case 13:
-			if err := p.readField13(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField14(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 14: ", err)
-	} else {
-		p.Role = &v
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField9(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 9: ", err)
-	} else {
-		p.Environment = &v
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.JobName = &v
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField4(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[string]bool, size)
-	p.TaskIds = tSet
-	for i := 0; i < size; i++ {
-		var _elem19 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem19 = v
-		}
-		p.TaskIds[_elem19] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField5(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[ScheduleStatus]bool, size)
-	p.Statuses = tSet
-	for i := 0; i < size; i++ {
-		var _elem20 ScheduleStatus
-		if v, err := iprot.ReadI32(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			temp := ScheduleStatus(v)
-			_elem20 = temp
-		}
-		p.Statuses[_elem20] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField7(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[int32]bool, size)
-	p.InstanceIds = tSet
-	for i := 0; i < size; i++ {
-		var _elem21 int32
-		if v, err := iprot.ReadI32(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem21 = v
-		}
-		p.InstanceIds[_elem21] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField10(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[string]bool, size)
-	p.SlaveHosts = tSet
-	for i := 0; i < size; i++ {
-		var _elem22 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem22 = v
-		}
-		p.SlaveHosts[_elem22] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField11(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*JobKey]bool, size)
-	p.JobKeys = tSet
-	for i := 0; i < size; i++ {
-		_elem23 := &JobKey{}
-		if err := _elem23.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem23), err)
-		}
-		p.JobKeys[_elem23] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField12(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 12: ", err)
-	} else {
-		p.Offset = &v
-	}
-	return nil
-}
-
-func (p *TaskQuery) readField13(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 13: ", err)
-	} else {
-		p.Limit = &v
-	}
-	return nil
-}
-
-func (p *TaskQuery) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("TaskQuery"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField7(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField9(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField10(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField11(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField12(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField13(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField14(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *TaskQuery) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetJobName() {
-		if err := oprot.WriteFieldBegin("jobName", thrift.STRING, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:jobName: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.JobName)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.jobName (2) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:jobName: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetTaskIds() {
-		if err := oprot.WriteFieldBegin("taskIds", thrift.SET, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:taskIds: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.STRING, len(p.TaskIds)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.TaskIds {
-			if err := oprot.WriteString(string(v)); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:taskIds: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField5(oprot thrift.TProtocol) (err error) {
-	if p.IsSetStatuses() {
-		if err := oprot.WriteFieldBegin("statuses", thrift.SET, 5); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:statuses: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.I32, len(p.Statuses)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.Statuses {
-			if err := oprot.WriteI32(int32(v)); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:statuses: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField7(oprot thrift.TProtocol) (err error) {
-	if p.IsSetInstanceIds() {
-		if err := oprot.WriteFieldBegin("instanceIds", thrift.SET, 7); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:instanceIds: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.I32, len(p.InstanceIds)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.InstanceIds {
-			if err := oprot.WriteI32(int32(v)); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:instanceIds: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField9(oprot thrift.TProtocol) (err error) {
-	if p.IsSetEnvironment() {
-		if err := oprot.WriteFieldBegin("environment", thrift.STRING, 9); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:environment: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Environment)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.environment (9) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 9:environment: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField10(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSlaveHosts() {
-		if err := oprot.WriteFieldBegin("slaveHosts", thrift.SET, 10); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:slaveHosts: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.STRING, len(p.SlaveHosts)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.SlaveHosts {
-			if err := oprot.WriteString(string(v)); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 10:slaveHosts: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField11(oprot thrift.TProtocol) (err error) {
-	if p.IsSetJobKeys() {
-		if err := oprot.WriteFieldBegin("jobKeys", thrift.SET, 11); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:jobKeys: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.JobKeys)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.JobKeys {
-			if err := v.Write(oprot); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 11:jobKeys: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField12(oprot thrift.TProtocol) (err error) {
-	if p.IsSetOffset() {
-		if err := oprot.WriteFieldBegin("offset", thrift.I32, 12); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 12:offset: ", p), err)
-		}
-		if err := oprot.WriteI32(int32(*p.Offset)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.offset (12) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 12:offset: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField13(oprot thrift.TProtocol) (err error) {
-	if p.IsSetLimit() {
-		if err := oprot.WriteFieldBegin("limit", thrift.I32, 13); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:limit: ", p), err)
-		}
-		if err := oprot.WriteI32(int32(*p.Limit)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.limit (13) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 13:limit: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) writeField14(oprot thrift.TProtocol) (err error) {
-	if p.IsSetRole() {
-		if err := oprot.WriteFieldBegin("role", thrift.STRING, 14); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 14:role: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Role)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.role (14) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 14:role: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *TaskQuery) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("TaskQuery(%+v)", *p)
-}
-
-// Attributes:
-//  - Host
-//  - Mode
-type HostStatus struct {
-	Host string          `thrift:"host,1" json:"host"`
-	Mode MaintenanceMode `thrift:"mode,2" json:"mode"`
-}
-
-func NewHostStatus() *HostStatus {
-	return &HostStatus{}
-}
-
-func (p *HostStatus) GetHost() string {
-	return p.Host
-}
-
-func (p *HostStatus) GetMode() MaintenanceMode {
-	return p.Mode
-}
-func (p *HostStatus) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *HostStatus) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Host = v
-	}
-	return nil
-}
-
-func (p *HostStatus) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		temp := MaintenanceMode(v)
-		p.Mode = temp
-	}
-	return nil
-}
-
-func (p *HostStatus) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("HostStatus"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *HostStatus) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("host", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:host: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Host)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.host (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:host: ", p), err)
-	}
-	return err
-}
-
-func (p *HostStatus) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("mode", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:mode: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Mode)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.mode (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:mode: ", p), err)
-	}
-	return err
-}
-
-func (p *HostStatus) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("HostStatus(%+v)", *p)
-}
-
-// Attributes:
-//  - Role
-//  - JobCount
-//  - CronJobCount
-type RoleSummary struct {
-	Role         string `thrift:"role,1" json:"role"`
-	JobCount     int32  `thrift:"jobCount,2" json:"jobCount"`
-	CronJobCount int32  `thrift:"cronJobCount,3" json:"cronJobCount"`
-}
-
-func NewRoleSummary() *RoleSummary {
-	return &RoleSummary{}
-}
-
-func (p *RoleSummary) GetRole() string {
-	return p.Role
-}
-
-func (p *RoleSummary) GetJobCount() int32 {
-	return p.JobCount
-}
-
-func (p *RoleSummary) GetCronJobCount() int32 {
-	return p.CronJobCount
-}
-func (p *RoleSummary) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *RoleSummary) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Role = v
-	}
-	return nil
-}
-
-func (p *RoleSummary) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.JobCount = v
-	}
-	return nil
-}
-
-func (p *RoleSummary) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.CronJobCount = v
-	}
-	return nil
-}
-
-func (p *RoleSummary) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("RoleSummary"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *RoleSummary) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("role", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:role: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Role)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.role (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:role: ", p), err)
-	}
-	return err
-}
-
-func (p *RoleSummary) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("jobCount", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:jobCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.JobCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.jobCount (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:jobCount: ", p), err)
-	}
-	return err
-}
-
-func (p *RoleSummary) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("cronJobCount", thrift.I32, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:cronJobCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.CronJobCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.cronJobCount (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:cronJobCount: ", p), err)
-	}
-	return err
-}
-
-func (p *RoleSummary) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("RoleSummary(%+v)", *p)
-}
-
-// Attributes:
-//  - HostNames
-type Hosts struct {
-	HostNames map[string]bool `thrift:"hostNames,1" json:"hostNames"`
-}
-
-func NewHosts() *Hosts {
-	return &Hosts{}
-}
-
-func (p *Hosts) GetHostNames() map[string]bool {
-	return p.HostNames
-}
-func (p *Hosts) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Hosts) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[string]bool, size)
-	p.HostNames = tSet
-	for i := 0; i < size; i++ {
-		var _elem24 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem24 = v
-		}
-		p.HostNames[_elem24] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *Hosts) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Hosts"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Hosts) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("hostNames", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:hostNames: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRING, len(p.HostNames)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.HostNames {
-		if err := oprot.WriteString(string(v)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:hostNames: ", p), err)
-	}
-	return err
-}
-
-func (p *Hosts) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Hosts(%+v)", *p)
-}
-
-// Attributes:
-//  - TaskId
-//  - Reason
-type PendingReason struct {
-	TaskId string `thrift:"taskId,1" json:"taskId"`
-	Reason string `thrift:"reason,2" json:"reason"`
-}
-
-func NewPendingReason() *PendingReason {
-	return &PendingReason{}
-}
-
-func (p *PendingReason) GetTaskId() string {
-	return p.TaskId
-}
-
-func (p *PendingReason) GetReason() string {
-	return p.Reason
-}
-func (p *PendingReason) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *PendingReason) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.TaskId = v
-	}
-	return nil
-}
-
-func (p *PendingReason) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Reason = v
-	}
-	return nil
-}
-
-func (p *PendingReason) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("PendingReason"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *PendingReason) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("taskId", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:taskId: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.TaskId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.taskId (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:taskId: ", p), err)
-	}
-	return err
-}
-
-func (p *PendingReason) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("reason", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:reason: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Reason)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.reason (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:reason: ", p), err)
-	}
-	return err
-}
-
-func (p *PendingReason) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("PendingReason(%+v)", *p)
-}
-
-// Job update key.
-//
-// Attributes:
-//  - Job: Job being updated
-//  - ID: Update ID.
-type JobUpdateKey struct {
-	Job *JobKey `thrift:"job,1" json:"job"`
-	ID  string  `thrift:"id,2" json:"id"`
-}
-
-func NewJobUpdateKey() *JobUpdateKey {
-	return &JobUpdateKey{}
-}
-
-var JobUpdateKey_Job_DEFAULT *JobKey
-
-func (p *JobUpdateKey) GetJob() *JobKey {
-	if !p.IsSetJob() {
-		return JobUpdateKey_Job_DEFAULT
-	}
-	return p.Job
-}
-
-func (p *JobUpdateKey) GetID() string {
-	return p.ID
-}
-func (p *JobUpdateKey) IsSetJob() bool {
-	return p.Job != nil
-}
-
-func (p *JobUpdateKey) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateKey) readField1(iprot thrift.TProtocol) error {
-	p.Job = &JobKey{}
-	if err := p.Job.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Job), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateKey) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.ID = v
-	}
-	return nil
-}
-
-func (p *JobUpdateKey) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateKey"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateKey) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("job", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:job: ", p), err)
-	}
-	if err := p.Job.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Job), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:job: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateKey) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("id", thrift.STRING, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:id: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.ID)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.id (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:id: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateKey) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateKey(%+v)", *p)
-}
-
-// Job update thresholds and limits.
-//
-// Attributes:
-//  - UpdateGroupSize: Max number of instances being updated at any given moment.
-//  - MaxPerInstanceFailures: Max number of instance failures to tolerate before marking instance as FAILED.
-//  - MaxFailedInstances: Max number of FAILED instances to tolerate before terminating the update.
-//  - MinWaitInInstanceRunningMs: Min time to watch a RUNNING instance.
-//  - RollbackOnFailure: If true, enables failed update rollback.
-//  - UpdateOnlyTheseInstances: Instance IDs to act on. All instances will be affected if this is not set.
-//  - WaitForBatchCompletion: If true, use updateGroupSize as strict batching boundaries, and avoid proceeding to another
-// batch until the preceding batch finishes updating.
-//  - BlockIfNoPulsesAfterMs: If set, requires external calls to pulseJobUpdate RPC within the specified rate for the
-// update to make progress. If no pulses received within specified interval the update will
-// block. A blocked update is unable to continue but retains its current status. It may only get
-// unblocked by a fresh pulseJobUpdate call.
-//  - SlaAware: If true, updates will obey the SLA requirements of the tasks being updated. If the SLA policy
-// differs between the old and new task configurations, updates will use the newest configuration.
-type JobUpdateSettings struct {
-	UpdateGroupSize        int32 `thrift:"updateGroupSize,1" json:"updateGroupSize"`
-	MaxPerInstanceFailures int32 `thrift:"maxPerInstanceFailures,2" json:"maxPerInstanceFailures"`
-	MaxFailedInstances     int32 `thrift:"maxFailedInstances,3" json:"maxFailedInstances"`
-	// unused field # 4
-	MinWaitInInstanceRunningMs int32           `thrift:"minWaitInInstanceRunningMs,5" json:"minWaitInInstanceRunningMs"`
-	RollbackOnFailure          bool            `thrift:"rollbackOnFailure,6" json:"rollbackOnFailure"`
-	UpdateOnlyTheseInstances   map[*Range]bool `thrift:"updateOnlyTheseInstances,7" json:"updateOnlyTheseInstances"`
-	WaitForBatchCompletion     bool            `thrift:"waitForBatchCompletion,8" json:"waitForBatchCompletion"`
-	BlockIfNoPulsesAfterMs     *int32          `thrift:"blockIfNoPulsesAfterMs,9" json:"blockIfNoPulsesAfterMs,omitempty"`
-	SlaAware                   *bool           `thrift:"slaAware,10" json:"slaAware,omitempty"`
-}
-
-func NewJobUpdateSettings() *JobUpdateSettings {
-	return &JobUpdateSettings{}
-}
-
-func (p *JobUpdateSettings) GetUpdateGroupSize() int32 {
-	return p.UpdateGroupSize
-}
-
-func (p *JobUpdateSettings) GetMaxPerInstanceFailures() int32 {
-	return p.MaxPerInstanceFailures
-}
-
-func (p *JobUpdateSettings) GetMaxFailedInstances() int32 {
-	return p.MaxFailedInstances
-}
-
-func (p *JobUpdateSettings) GetMinWaitInInstanceRunningMs() int32 {
-	return p.MinWaitInInstanceRunningMs
-}
-
-func (p *JobUpdateSettings) GetRollbackOnFailure() bool {
-	return p.RollbackOnFailure
-}
-
-func (p *JobUpdateSettings) GetUpdateOnlyTheseInstances() map[*Range]bool {
-	return p.UpdateOnlyTheseInstances
-}
-
-func (p *JobUpdateSettings) GetWaitForBatchCompletion() bool {
-	return p.WaitForBatchCompletion
-}
-
-var JobUpdateSettings_BlockIfNoPulsesAfterMs_DEFAULT int32
-
-func (p *JobUpdateSettings) GetBlockIfNoPulsesAfterMs() int32 {
-	if !p.IsSetBlockIfNoPulsesAfterMs() {
-		return JobUpdateSettings_BlockIfNoPulsesAfterMs_DEFAULT
-	}
-	return *p.BlockIfNoPulsesAfterMs
-}
-
-var JobUpdateSettings_SlaAware_DEFAULT bool
-
-func (p *JobUpdateSettings) GetSlaAware() bool {
-	if !p.IsSetSlaAware() {
-		return JobUpdateSettings_SlaAware_DEFAULT
-	}
-	return *p.SlaAware
-}
-func (p *JobUpdateSettings) IsSetBlockIfNoPulsesAfterMs() bool {
-	return p.BlockIfNoPulsesAfterMs != nil
-}
-
-func (p *JobUpdateSettings) IsSetSlaAware() bool {
-	return p.SlaAware != nil
-}
-
-func (p *JobUpdateSettings) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		case 7:
-			if err := p.readField7(iprot); err != nil {
-				return err
-			}
-		case 8:
-			if err := p.readField8(iprot); err != nil {
-				return err
-			}
-		case 9:
-			if err := p.readField9(iprot); err != nil {
-				return err
-			}
-		case 10:
-			if err := p.readField10(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.UpdateGroupSize = v
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.MaxPerInstanceFailures = v
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.MaxFailedInstances = v
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField5(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 5: ", err)
-	} else {
-		p.MinWaitInInstanceRunningMs = v
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField6(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 6: ", err)
-	} else {
-		p.RollbackOnFailure = v
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField7(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Range]bool, size)
-	p.UpdateOnlyTheseInstances = tSet
-	for i := 0; i < size; i++ {
-		_elem25 := &Range{}
-		if err := _elem25.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem25), err)
-		}
-		p.UpdateOnlyTheseInstances[_elem25] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField8(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 8: ", err)
-	} else {
-		p.WaitForBatchCompletion = v
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField9(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 9: ", err)
-	} else {
-		p.BlockIfNoPulsesAfterMs = &v
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) readField10(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadBool(); err != nil {
-		return thrift.PrependError("error reading field 10: ", err)
-	} else {
-		p.SlaAware = &v
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateSettings"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField7(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField8(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField9(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField10(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateSettings) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("updateGroupSize", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:updateGroupSize: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.UpdateGroupSize)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.updateGroupSize (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:updateGroupSize: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("maxPerInstanceFailures", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:maxPerInstanceFailures: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.MaxPerInstanceFailures)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.maxPerInstanceFailures (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:maxPerInstanceFailures: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("maxFailedInstances", thrift.I32, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:maxFailedInstances: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.MaxFailedInstances)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.maxFailedInstances (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:maxFailedInstances: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("minWaitInInstanceRunningMs", thrift.I32, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:minWaitInInstanceRunningMs: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.MinWaitInInstanceRunningMs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.minWaitInInstanceRunningMs (5) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:minWaitInInstanceRunningMs: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) writeField6(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("rollbackOnFailure", thrift.BOOL, 6); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:rollbackOnFailure: ", p), err)
-	}
-	if err := oprot.WriteBool(bool(p.RollbackOnFailure)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.rollbackOnFailure (6) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:rollbackOnFailure: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) writeField7(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("updateOnlyTheseInstances", thrift.SET, 7); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:updateOnlyTheseInstances: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.UpdateOnlyTheseInstances)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.UpdateOnlyTheseInstances {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 7:updateOnlyTheseInstances: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) writeField8(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("waitForBatchCompletion", thrift.BOOL, 8); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:waitForBatchCompletion: ", p), err)
-	}
-	if err := oprot.WriteBool(bool(p.WaitForBatchCompletion)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.waitForBatchCompletion (8) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 8:waitForBatchCompletion: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) writeField9(oprot thrift.TProtocol) (err error) {
-	if p.IsSetBlockIfNoPulsesAfterMs() {
-		if err := oprot.WriteFieldBegin("blockIfNoPulsesAfterMs", thrift.I32, 9); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:blockIfNoPulsesAfterMs: ", p), err)
-		}
-		if err := oprot.WriteI32(int32(*p.BlockIfNoPulsesAfterMs)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.blockIfNoPulsesAfterMs (9) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 9:blockIfNoPulsesAfterMs: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) writeField10(oprot thrift.TProtocol) (err error) {
-	if p.IsSetSlaAware() {
-		if err := oprot.WriteFieldBegin("slaAware", thrift.BOOL, 10); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:slaAware: ", p), err)
-		}
-		if err := oprot.WriteBool(bool(*p.SlaAware)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.slaAware (10) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 10:slaAware: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateSettings) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateSettings(%+v)", *p)
-}
-
-// Event marking a state transition in job update lifecycle.
-//
-// Attributes:
-//  - Status: Update status.
-//  - TimestampMs: Epoch timestamp in milliseconds.
-//  - User: User who performed this event (if user-initiated).
-//  - Message: Message from the user (for user-initiated transitions) or the scheduler about why the state was
-// changed.
-type JobUpdateEvent struct {
-	Status      JobUpdateStatus `thrift:"status,1" json:"status"`
-	TimestampMs int64           `thrift:"timestampMs,2" json:"timestampMs"`
-	User        *string         `thrift:"user,3" json:"user,omitempty"`
-	Message     *string         `thrift:"message,4" json:"message,omitempty"`
-}
-
-func NewJobUpdateEvent() *JobUpdateEvent {
-	return &JobUpdateEvent{}
-}
-
-func (p *JobUpdateEvent) GetStatus() JobUpdateStatus {
-	return p.Status
-}
-
-func (p *JobUpdateEvent) GetTimestampMs() int64 {
-	return p.TimestampMs
-}
-
-var JobUpdateEvent_User_DEFAULT string
-
-func (p *JobUpdateEvent) GetUser() string {
-	if !p.IsSetUser() {
-		return JobUpdateEvent_User_DEFAULT
-	}
-	return *p.User
-}
-
-var JobUpdateEvent_Message_DEFAULT string
-
-func (p *JobUpdateEvent) GetMessage() string {
-	if !p.IsSetMessage() {
-		return JobUpdateEvent_Message_DEFAULT
-	}
-	return *p.Message
-}
-func (p *JobUpdateEvent) IsSetUser() bool {
-	return p.User != nil
-}
-
-func (p *JobUpdateEvent) IsSetMessage() bool {
-	return p.Message != nil
-}
-
-func (p *JobUpdateEvent) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateEvent) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		temp := JobUpdateStatus(v)
-		p.Status = temp
-	}
-	return nil
-}
-
-func (p *JobUpdateEvent) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.TimestampMs = v
-	}
-	return nil
-}
-
-func (p *JobUpdateEvent) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.User = &v
-	}
-	return nil
-}
-
-func (p *JobUpdateEvent) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.Message = &v
-	}
-	return nil
-}
-
-func (p *JobUpdateEvent) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateEvent"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateEvent) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("status", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:status: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Status)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.status (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:status: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateEvent) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("timestampMs", thrift.I64, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:timestampMs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.TimestampMs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.timestampMs (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:timestampMs: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateEvent) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetUser() {
-		if err := oprot.WriteFieldBegin("user", thrift.STRING, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:user: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.User)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.user (3) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:user: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateEvent) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMessage() {
-		if err := oprot.WriteFieldBegin("message", thrift.STRING, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:message: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Message)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.message (4) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:message: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateEvent) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateEvent(%+v)", *p)
-}
-
-// Event marking a state transition in job instance update lifecycle.
-//
-// Attributes:
-//  - InstanceId: Job instance ID.
-//  - TimestampMs: Epoch timestamp in milliseconds.
-//  - Action: Job update action taken on the instance.
-//  - Message: Optional message explaining the instance update event.
-type JobInstanceUpdateEvent struct {
-	InstanceId  int32           `thrift:"instanceId,1" json:"instanceId"`
-	TimestampMs int64           `thrift:"timestampMs,2" json:"timestampMs"`
-	Action      JobUpdateAction `thrift:"action,3" json:"action"`
-	Message     *string         `thrift:"message,4" json:"message,omitempty"`
-}
-
-func NewJobInstanceUpdateEvent() *JobInstanceUpdateEvent {
-	return &JobInstanceUpdateEvent{}
-}
-
-func (p *JobInstanceUpdateEvent) GetInstanceId() int32 {
-	return p.InstanceId
-}
-
-func (p *JobInstanceUpdateEvent) GetTimestampMs() int64 {
-	return p.TimestampMs
-}
-
-func (p *JobInstanceUpdateEvent) GetAction() JobUpdateAction {
-	return p.Action
-}
-
-var JobInstanceUpdateEvent_Message_DEFAULT string
-
-func (p *JobInstanceUpdateEvent) GetMessage() string {
-	if !p.IsSetMessage() {
-		return JobInstanceUpdateEvent_Message_DEFAULT
-	}
-	return *p.Message
-}
-func (p *JobInstanceUpdateEvent) IsSetMessage() bool {
-	return p.Message != nil
-}
-
-func (p *JobInstanceUpdateEvent) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobInstanceUpdateEvent) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.InstanceId = v
-	}
-	return nil
-}
-
-func (p *JobInstanceUpdateEvent) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.TimestampMs = v
-	}
-	return nil
-}
-
-func (p *JobInstanceUpdateEvent) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		temp := JobUpdateAction(v)
-		p.Action = temp
-	}
-	return nil
-}
-
-func (p *JobInstanceUpdateEvent) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.Message = &v
-	}
-	return nil
-}
-
-func (p *JobInstanceUpdateEvent) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobInstanceUpdateEvent"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobInstanceUpdateEvent) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instanceId", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:instanceId: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.InstanceId)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.instanceId (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:instanceId: ", p), err)
-	}
-	return err
-}
-
-func (p *JobInstanceUpdateEvent) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("timestampMs", thrift.I64, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:timestampMs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.TimestampMs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.timestampMs (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:timestampMs: ", p), err)
-	}
-	return err
-}
-
-func (p *JobInstanceUpdateEvent) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("action", thrift.I32, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:action: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Action)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.action (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:action: ", p), err)
-	}
-	return err
-}
-
-func (p *JobInstanceUpdateEvent) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMessage() {
-		if err := oprot.WriteFieldBegin("message", thrift.STRING, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:message: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Message)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.message (4) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:message: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobInstanceUpdateEvent) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobInstanceUpdateEvent(%+v)", *p)
-}
-
-// Maps instance IDs to TaskConfigs it.
-//
-// Attributes:
-//  - Task: A TaskConfig associated with instances.
-//  - Instances: Instances associated with the TaskConfig.
-type InstanceTaskConfig struct {
-	Task      *TaskConfig     `thrift:"task,1" json:"task"`
-	Instances map[*Range]bool `thrift:"instances,2" json:"instances"`
-}
-
-func NewInstanceTaskConfig() *InstanceTaskConfig {
-	return &InstanceTaskConfig{}
-}
-
-var InstanceTaskConfig_Task_DEFAULT *TaskConfig
-
-func (p *InstanceTaskConfig) GetTask() *TaskConfig {
-	if !p.IsSetTask() {
-		return InstanceTaskConfig_Task_DEFAULT
-	}
-	return p.Task
-}
-
-func (p *InstanceTaskConfig) GetInstances() map[*Range]bool {
-	return p.Instances
-}
-func (p *InstanceTaskConfig) IsSetTask() bool {
-	return p.Task != nil
-}
-
-func (p *InstanceTaskConfig) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *InstanceTaskConfig) readField1(iprot thrift.TProtocol) error {
-	p.Task = &TaskConfig{}
-	if err := p.Task.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Task), err)
-	}
-	return nil
-}
-
-func (p *InstanceTaskConfig) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Range]bool, size)
-	p.Instances = tSet
-	for i := 0; i < size; i++ {
-		_elem26 := &Range{}
-		if err := _elem26.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem26), err)
-		}
-		p.Instances[_elem26] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *InstanceTaskConfig) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("InstanceTaskConfig"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *InstanceTaskConfig) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("task", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:task: ", p), err)
-	}
-	if err := p.Task.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Task), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:task: ", p), err)
-	}
-	return err
-}
-
-func (p *InstanceTaskConfig) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instances", thrift.SET, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instances: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Instances)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Instances {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instances: ", p), err)
-	}
-	return err
-}
-
-func (p *InstanceTaskConfig) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("InstanceTaskConfig(%+v)", *p)
-}
-
-// Current job update state including status and created/modified timestamps.
-//
-// Attributes:
-//  - Status: Current status of the update.
-//  - CreatedTimestampMs: Created timestamp in milliseconds.
-//  - LastModifiedTimestampMs: Last modified timestamp in milliseconds.
-type JobUpdateState struct {
-	Status                  JobUpdateStatus `thrift:"status,1" json:"status"`
-	CreatedTimestampMs      int64           `thrift:"createdTimestampMs,2" json:"createdTimestampMs"`
-	LastModifiedTimestampMs int64           `thrift:"lastModifiedTimestampMs,3" json:"lastModifiedTimestampMs"`
-}
-
-func NewJobUpdateState() *JobUpdateState {
-	return &JobUpdateState{}
-}
-
-func (p *JobUpdateState) GetStatus() JobUpdateStatus {
-	return p.Status
-}
-
-func (p *JobUpdateState) GetCreatedTimestampMs() int64 {
-	return p.CreatedTimestampMs
-}
-
-func (p *JobUpdateState) GetLastModifiedTimestampMs() int64 {
-	return p.LastModifiedTimestampMs
-}
-func (p *JobUpdateState) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateState) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		temp := JobUpdateStatus(v)
-		p.Status = temp
-	}
-	return nil
-}
-
-func (p *JobUpdateState) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.CreatedTimestampMs = v
-	}
-	return nil
-}
-
-func (p *JobUpdateState) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.LastModifiedTimestampMs = v
-	}
-	return nil
-}
-
-func (p *JobUpdateState) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateState"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateState) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("status", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:status: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Status)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.status (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:status: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateState) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("createdTimestampMs", thrift.I64, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:createdTimestampMs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.CreatedTimestampMs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.createdTimestampMs (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:createdTimestampMs: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateState) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("lastModifiedTimestampMs", thrift.I64, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:lastModifiedTimestampMs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.LastModifiedTimestampMs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.lastModifiedTimestampMs (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:lastModifiedTimestampMs: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateState) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateState(%+v)", *p)
-}
-
-// Summary of the job update including job key, user and current state.
-//
-// Attributes:
-//  - Key: Unique identifier for the update.
-//  - User: User initiated an update.
-//  - State: Current job update state.
-//  - Metadata: Update metadata supplied by the client.
-type JobUpdateSummary struct {
-	// unused fields # 1 to 2
-	User     string             `thrift:"user,3" json:"user"`
-	State    *JobUpdateState    `thrift:"state,4" json:"state"`
-	Key      *JobUpdateKey      `thrift:"key,5" json:"key"`
-	Metadata map[*Metadata]bool `thrift:"metadata,6" json:"metadata,omitempty"`
-}
-
-func NewJobUpdateSummary() *JobUpdateSummary {
-	return &JobUpdateSummary{}
-}
-
-var JobUpdateSummary_Key_DEFAULT *JobUpdateKey
-
-func (p *JobUpdateSummary) GetKey() *JobUpdateKey {
-	if !p.IsSetKey() {
-		return JobUpdateSummary_Key_DEFAULT
-	}
-	return p.Key
-}
-
-func (p *JobUpdateSummary) GetUser() string {
-	return p.User
-}
-
-var JobUpdateSummary_State_DEFAULT *JobUpdateState
-
-func (p *JobUpdateSummary) GetState() *JobUpdateState {
-	if !p.IsSetState() {
-		return JobUpdateSummary_State_DEFAULT
-	}
-	return p.State
-}
-
-var JobUpdateSummary_Metadata_DEFAULT map[*Metadata]bool
-
-func (p *JobUpdateSummary) GetMetadata() map[*Metadata]bool {
-	return p.Metadata
-}
-func (p *JobUpdateSummary) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *JobUpdateSummary) IsSetState() bool {
-	return p.State != nil
-}
-
-func (p *JobUpdateSummary) IsSetMetadata() bool {
-	return p.Metadata != nil
-}
-
-func (p *JobUpdateSummary) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateSummary) readField5(iprot thrift.TProtocol) error {
-	p.Key = &JobUpdateKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateSummary) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.User = v
-	}
-	return nil
-}
-
-func (p *JobUpdateSummary) readField4(iprot thrift.TProtocol) error {
-	p.State = &JobUpdateState{}
-	if err := p.State.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.State), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateSummary) readField6(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Metadata]bool, size)
-	p.Metadata = tSet
-	for i := 0; i < size; i++ {
-		_elem27 := &Metadata{}
-		if err := _elem27.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem27), err)
-		}
-		p.Metadata[_elem27] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateSummary) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateSummary"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateSummary) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("user", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:user: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.User)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.user (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:user: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSummary) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("state", thrift.STRUCT, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:state: ", p), err)
-	}
-	if err := p.State.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.State), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:state: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSummary) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:key: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateSummary) writeField6(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMetadata() {
-		if err := oprot.WriteFieldBegin("metadata", thrift.SET, 6); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:metadata: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Metadata)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.Metadata {
-			if err := v.Write(oprot); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:metadata: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateSummary) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateSummary(%+v)", *p)
-}
-
-// Update configuration and setting details.
-//
-// Attributes:
-//  - InitialState: Actual InstanceId -> TaskConfig mapping when the update was requested.
-//  - DesiredState: Desired configuration when the update completes.
-//  - Settings: Update specific settings.
-type JobUpdateInstructions struct {
-	InitialState map[*InstanceTaskConfig]bool `thrift:"initialState,1" json:"initialState"`
-	DesiredState *InstanceTaskConfig          `thrift:"desiredState,2" json:"desiredState"`
-	Settings     *JobUpdateSettings           `thrift:"settings,3" json:"settings"`
-}
-
-func NewJobUpdateInstructions() *JobUpdateInstructions {
-	return &JobUpdateInstructions{}
-}
-
-func (p *JobUpdateInstructions) GetInitialState() map[*InstanceTaskConfig]bool {
-	return p.InitialState
-}
-
-var JobUpdateInstructions_DesiredState_DEFAULT *InstanceTaskConfig
-
-func (p *JobUpdateInstructions) GetDesiredState() *InstanceTaskConfig {
-	if !p.IsSetDesiredState() {
-		return JobUpdateInstructions_DesiredState_DEFAULT
-	}
-	return p.DesiredState
-}
-
-var JobUpdateInstructions_Settings_DEFAULT *JobUpdateSettings
-
-func (p *JobUpdateInstructions) GetSettings() *JobUpdateSettings {
-	if !p.IsSetSettings() {
-		return JobUpdateInstructions_Settings_DEFAULT
-	}
-	return p.Settings
-}
-func (p *JobUpdateInstructions) IsSetDesiredState() bool {
-	return p.DesiredState != nil
-}
-
-func (p *JobUpdateInstructions) IsSetSettings() bool {
-	return p.Settings != nil
-}
-
-func (p *JobUpdateInstructions) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateInstructions) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*InstanceTaskConfig]bool, size)
-	p.InitialState = tSet
-	for i := 0; i < size; i++ {
-		_elem28 := &InstanceTaskConfig{}
-		if err := _elem28.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem28), err)
-		}
-		p.InitialState[_elem28] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateInstructions) readField2(iprot thrift.TProtocol) error {
-	p.DesiredState = &InstanceTaskConfig{}
-	if err := p.DesiredState.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DesiredState), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateInstructions) readField3(iprot thrift.TProtocol) error {
-	p.Settings = &JobUpdateSettings{}
-	if err := p.Settings.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Settings), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateInstructions) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateInstructions"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateInstructions) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("initialState", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:initialState: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.InitialState)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.InitialState {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:initialState: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateInstructions) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("desiredState", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:desiredState: ", p), err)
-	}
-	if err := p.DesiredState.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DesiredState), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:desiredState: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateInstructions) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("settings", thrift.STRUCT, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:settings: ", p), err)
-	}
-	if err := p.Settings.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Settings), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:settings: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateInstructions) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateInstructions(%+v)", *p)
-}
-
-// Full definition of the job update.
-//
-// Attributes:
-//  - Summary: Update summary.
-//  - Instructions: Update configuration.
-type JobUpdate struct {
-	Summary      *JobUpdateSummary      `thrift:"summary,1" json:"summary"`
-	Instructions *JobUpdateInstructions `thrift:"instructions,2" json:"instructions"`
-}
-
-func NewJobUpdate() *JobUpdate {
-	return &JobUpdate{}
-}
-
-var JobUpdate_Summary_DEFAULT *JobUpdateSummary
-
-func (p *JobUpdate) GetSummary() *JobUpdateSummary {
-	if !p.IsSetSummary() {
-		return JobUpdate_Summary_DEFAULT
-	}
-	return p.Summary
-}
-
-var JobUpdate_Instructions_DEFAULT *JobUpdateInstructions
-
-func (p *JobUpdate) GetInstructions() *JobUpdateInstructions {
-	if !p.IsSetInstructions() {
-		return JobUpdate_Instructions_DEFAULT
-	}
-	return p.Instructions
-}
-func (p *JobUpdate) IsSetSummary() bool {
-	return p.Summary != nil
-}
-
-func (p *JobUpdate) IsSetInstructions() bool {
-	return p.Instructions != nil
-}
-
-func (p *JobUpdate) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdate) readField1(iprot thrift.TProtocol) error {
-	p.Summary = &JobUpdateSummary{}
-	if err := p.Summary.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Summary), err)
-	}
-	return nil
-}
-
-func (p *JobUpdate) readField2(iprot thrift.TProtocol) error {
-	p.Instructions = &JobUpdateInstructions{}
-	if err := p.Instructions.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Instructions), err)
-	}
-	return nil
-}
-
-func (p *JobUpdate) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdate"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdate) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("summary", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:summary: ", p), err)
-	}
-	if err := p.Summary.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Summary), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:summary: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdate) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instructions", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instructions: ", p), err)
-	}
-	if err := p.Instructions.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Instructions), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instructions: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdate) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdate(%+v)", *p)
-}
-
-// Attributes:
-//  - Update: Update definition.
-//  - UpdateEvents: History for this update.
-//  - InstanceEvents: History for the individual instances updated.
-type JobUpdateDetails struct {
-	Update         *JobUpdate                `thrift:"update,1" json:"update"`
-	UpdateEvents   []*JobUpdateEvent         `thrift:"updateEvents,2" json:"updateEvents"`
-	InstanceEvents []*JobInstanceUpdateEvent `thrift:"instanceEvents,3" json:"instanceEvents"`
-}
-
-func NewJobUpdateDetails() *JobUpdateDetails {
-	return &JobUpdateDetails{}
-}
-
-var JobUpdateDetails_Update_DEFAULT *JobUpdate
-
-func (p *JobUpdateDetails) GetUpdate() *JobUpdate {
-	if !p.IsSetUpdate() {
-		return JobUpdateDetails_Update_DEFAULT
-	}
-	return p.Update
-}
-
-func (p *JobUpdateDetails) GetUpdateEvents() []*JobUpdateEvent {
-	return p.UpdateEvents
-}
-
-func (p *JobUpdateDetails) GetInstanceEvents() []*JobInstanceUpdateEvent {
-	return p.InstanceEvents
-}
-func (p *JobUpdateDetails) IsSetUpdate() bool {
-	return p.Update != nil
-}
-
-func (p *JobUpdateDetails) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateDetails) readField1(iprot thrift.TProtocol) error {
-	p.Update = &JobUpdate{}
-	if err := p.Update.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Update), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateDetails) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*JobUpdateEvent, 0, size)
-	p.UpdateEvents = tSlice
-	for i := 0; i < size; i++ {
-		_elem29 := &JobUpdateEvent{}
-		if err := _elem29.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem29), err)
-		}
-		p.UpdateEvents = append(p.UpdateEvents, _elem29)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateDetails) readField3(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*JobInstanceUpdateEvent, 0, size)
-	p.InstanceEvents = tSlice
-	for i := 0; i < size; i++ {
-		_elem30 := &JobInstanceUpdateEvent{}
-		if err := _elem30.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem30), err)
-		}
-		p.InstanceEvents = append(p.InstanceEvents, _elem30)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateDetails) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateDetails"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateDetails) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("update", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:update: ", p), err)
-	}
-	if err := p.Update.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Update), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:update: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateDetails) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("updateEvents", thrift.LIST, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:updateEvents: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.UpdateEvents)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.UpdateEvents {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:updateEvents: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateDetails) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instanceEvents", thrift.LIST, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:instanceEvents: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.InstanceEvents)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.InstanceEvents {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:instanceEvents: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateDetails) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateDetails(%+v)", *p)
-}
-
-// A request to update the following instances of an existing job. Used by startUpdate.
-//
-// Attributes:
-//  - TaskConfig: Desired TaskConfig to apply.
-//  - InstanceCount: Desired number of instances of the task config.
-//  - Settings: Update settings and limits.
-//  - Metadata: Update metadata supplied by the client issuing the JobUpdateRequest.
-type JobUpdateRequest struct {
-	TaskConfig    *TaskConfig        `thrift:"taskConfig,1" json:"taskConfig"`
-	InstanceCount int32              `thrift:"instanceCount,2" json:"instanceCount"`
-	Settings      *JobUpdateSettings `thrift:"settings,3" json:"settings"`
-	Metadata      map[*Metadata]bool `thrift:"metadata,4" json:"metadata,omitempty"`
-}
-
-func NewJobUpdateRequest() *JobUpdateRequest {
-	return &JobUpdateRequest{}
-}
-
-var JobUpdateRequest_TaskConfig_DEFAULT *TaskConfig
-
-func (p *JobUpdateRequest) GetTaskConfig() *TaskConfig {
-	if !p.IsSetTaskConfig() {
-		return JobUpdateRequest_TaskConfig_DEFAULT
-	}
-	return p.TaskConfig
-}
-
-func (p *JobUpdateRequest) GetInstanceCount() int32 {
-	return p.InstanceCount
-}
-
-var JobUpdateRequest_Settings_DEFAULT *JobUpdateSettings
-
-func (p *JobUpdateRequest) GetSettings() *JobUpdateSettings {
-	if !p.IsSetSettings() {
-		return JobUpdateRequest_Settings_DEFAULT
-	}
-	return p.Settings
-}
-
-var JobUpdateRequest_Metadata_DEFAULT map[*Metadata]bool
-
-func (p *JobUpdateRequest) GetMetadata() map[*Metadata]bool {
-	return p.Metadata
-}
-func (p *JobUpdateRequest) IsSetTaskConfig() bool {
-	return p.TaskConfig != nil
-}
-
-func (p *JobUpdateRequest) IsSetSettings() bool {
-	return p.Settings != nil
-}
-
-func (p *JobUpdateRequest) IsSetMetadata() bool {
-	return p.Metadata != nil
-}
-
-func (p *JobUpdateRequest) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateRequest) readField1(iprot thrift.TProtocol) error {
-	p.TaskConfig = &TaskConfig{}
-	if err := p.TaskConfig.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TaskConfig), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateRequest) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.InstanceCount = v
-	}
-	return nil
-}
-
-func (p *JobUpdateRequest) readField3(iprot thrift.TProtocol) error {
-	p.Settings = &JobUpdateSettings{}
-	if err := p.Settings.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Settings), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateRequest) readField4(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*Metadata]bool, size)
-	p.Metadata = tSet
-	for i := 0; i < size; i++ {
-		_elem31 := &Metadata{}
-		if err := _elem31.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem31), err)
-		}
-		p.Metadata[_elem31] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateRequest) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateRequest"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateRequest) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("taskConfig", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:taskConfig: ", p), err)
-	}
-	if err := p.TaskConfig.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TaskConfig), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:taskConfig: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateRequest) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("instanceCount", thrift.I32, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instanceCount: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.InstanceCount)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.instanceCount (2) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instanceCount: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateRequest) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("settings", thrift.STRUCT, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:settings: ", p), err)
-	}
-	if err := p.Settings.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Settings), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:settings: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateRequest) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMetadata() {
-		if err := oprot.WriteFieldBegin("metadata", thrift.SET, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:metadata: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Metadata)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.Metadata {
-			if err := v.Write(oprot); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:metadata: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateRequest) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateRequest(%+v)", *p)
-}
-
-// Contains a set of restrictions on matching job updates where all restrictions must be met
-// (terms are AND'ed together).
-//
-// Attributes:
-//  - Role: Job role.
-//  - Key: Unique identifier for a job update.
-//  - JobKey: Job key.
-//  - User: User who created the update.
-//  - UpdateStatuses: Set of update statuses.
-//  - Offset: Offset to serve data from. Used by pagination.
-//  - Limit: Number or records to serve. Used by pagination.
-type JobUpdateQuery struct {
-	// unused field # 1
-	Role           *string                  `thrift:"role,2" json:"role,omitempty"`
-	JobKey         *JobKey                  `thrift:"jobKey,3" json:"jobKey,omitempty"`
-	User           *string                  `thrift:"user,4" json:"user,omitempty"`
-	UpdateStatuses map[JobUpdateStatus]bool `thrift:"updateStatuses,5" json:"updateStatuses,omitempty"`
-	Offset         int32                    `thrift:"offset,6" json:"offset"`
-	Limit          int32                    `thrift:"limit,7" json:"limit"`
-	Key            *JobUpdateKey            `thrift:"key,8" json:"key,omitempty"`
-}
-
-func NewJobUpdateQuery() *JobUpdateQuery {
-	return &JobUpdateQuery{}
-}
-
-var JobUpdateQuery_Role_DEFAULT string
-
-func (p *JobUpdateQuery) GetRole() string {
-	if !p.IsSetRole() {
-		return JobUpdateQuery_Role_DEFAULT
-	}
-	return *p.Role
-}
-
-var JobUpdateQuery_Key_DEFAULT *JobUpdateKey
-
-func (p *JobUpdateQuery) GetKey() *JobUpdateKey {
-	if !p.IsSetKey() {
-		return JobUpdateQuery_Key_DEFAULT
-	}
-	return p.Key
-}
-
-var JobUpdateQuery_JobKey_DEFAULT *JobKey
-
-func (p *JobUpdateQuery) GetJobKey() *JobKey {
-	if !p.IsSetJobKey() {
-		return JobUpdateQuery_JobKey_DEFAULT
-	}
-	return p.JobKey
-}
-
-var JobUpdateQuery_User_DEFAULT string
-
-func (p *JobUpdateQuery) GetUser() string {
-	if !p.IsSetUser() {
-		return JobUpdateQuery_User_DEFAULT
-	}
-	return *p.User
-}
-
-var JobUpdateQuery_UpdateStatuses_DEFAULT map[JobUpdateStatus]bool
-
-func (p *JobUpdateQuery) GetUpdateStatuses() map[JobUpdateStatus]bool {
-	return p.UpdateStatuses
-}
-
-func (p *JobUpdateQuery) GetOffset() int32 {
-	return p.Offset
-}
-
-func (p *JobUpdateQuery) GetLimit() int32 {
-	return p.Limit
-}
-func (p *JobUpdateQuery) IsSetRole() bool {
-	return p.Role != nil
-}
-
-func (p *JobUpdateQuery) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *JobUpdateQuery) IsSetJobKey() bool {
-	return p.JobKey != nil
-}
-
-func (p *JobUpdateQuery) IsSetUser() bool {
-	return p.User != nil
-}
-
-func (p *JobUpdateQuery) IsSetUpdateStatuses() bool {
-	return p.UpdateStatuses != nil
-}
-
-func (p *JobUpdateQuery) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 8:
-			if err := p.readField8(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		case 7:
-			if err := p.readField7(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) readField2(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 2: ", err)
-	} else {
-		p.Role = &v
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) readField8(iprot thrift.TProtocol) error {
-	p.Key = &JobUpdateKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) readField3(iprot thrift.TProtocol) error {
-	p.JobKey = &JobKey{}
-	if err := p.JobKey.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobKey), err)
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.User = &v
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) readField5(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[JobUpdateStatus]bool, size)
-	p.UpdateStatuses = tSet
-	for i := 0; i < size; i++ {
-		var _elem32 JobUpdateStatus
-		if v, err := iprot.ReadI32(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			temp := JobUpdateStatus(v)
-			_elem32 = temp
-		}
-		p.UpdateStatuses[_elem32] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) readField6(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 6: ", err)
-	} else {
-		p.Offset = v
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) readField7(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 7: ", err)
-	} else {
-		p.Limit = v
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobUpdateQuery"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField7(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField8(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobUpdateQuery) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetRole() {
-		if err := oprot.WriteFieldBegin("role", thrift.STRING, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:role: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.Role)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.role (2) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:role: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateQuery) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetJobKey() {
-		if err := oprot.WriteFieldBegin("jobKey", thrift.STRUCT, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:jobKey: ", p), err)
-		}
-		if err := p.JobKey.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobKey), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:jobKey: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateQuery) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetUser() {
-		if err := oprot.WriteFieldBegin("user", thrift.STRING, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:user: ", p), err)
-		}
-		if err := oprot.WriteString(string(*p.User)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.user (4) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:user: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateQuery) writeField5(oprot thrift.TProtocol) (err error) {
-	if p.IsSetUpdateStatuses() {
-		if err := oprot.WriteFieldBegin("updateStatuses", thrift.SET, 5); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:updateStatuses: ", p), err)
-		}
-		if err := oprot.WriteSetBegin(thrift.I32, len(p.UpdateStatuses)); err != nil {
-			return thrift.PrependError("error writing set begin: ", err)
-		}
-		for v, _ := range p.UpdateStatuses {
-			if err := oprot.WriteI32(int32(v)); err != nil {
-				return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-			}
-		}
-		if err := oprot.WriteSetEnd(); err != nil {
-			return thrift.PrependError("error writing set end: ", err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:updateStatuses: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateQuery) writeField6(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("offset", thrift.I32, 6); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:offset: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Offset)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.offset (6) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:offset: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateQuery) writeField7(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("limit", thrift.I32, 7); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:limit: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Limit)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.limit (7) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 7:limit: ", p), err)
-	}
-	return err
-}
-
-func (p *JobUpdateQuery) writeField8(oprot thrift.TProtocol) (err error) {
-	if p.IsSetKey() {
-		if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 8); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:key: ", p), err)
-		}
-		if err := p.Key.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:key: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *JobUpdateQuery) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobUpdateQuery(%+v)", *p)
-}
-
-// Attributes:
-//  - Host
-//  - DefaultSlaPolicy
-//  - TimeoutSecs
-//  - CreatedTimestampMs
-type HostMaintenanceRequest struct {
-	Host               string     `thrift:"host,1" json:"host"`
-	DefaultSlaPolicy   *SlaPolicy `thrift:"defaultSlaPolicy,2" json:"defaultSlaPolicy"`
-	TimeoutSecs        int64      `thrift:"timeoutSecs,3" json:"timeoutSecs"`
-	CreatedTimestampMs int64      `thrift:"createdTimestampMs,4" json:"createdTimestampMs"`
-}
-
-func NewHostMaintenanceRequest() *HostMaintenanceRequest {
-	return &HostMaintenanceRequest{}
-}
-
-func (p *HostMaintenanceRequest) GetHost() string {
-	return p.Host
-}
-
-var HostMaintenanceRequest_DefaultSlaPolicy_DEFAULT *SlaPolicy
-
-func (p *HostMaintenanceRequest) GetDefaultSlaPolicy() *SlaPolicy {
-	if !p.IsSetDefaultSlaPolicy() {
-		return HostMaintenanceRequest_DefaultSlaPolicy_DEFAULT
-	}
-	return p.DefaultSlaPolicy
-}
-
-func (p *HostMaintenanceRequest) GetTimeoutSecs() int64 {
-	return p.TimeoutSecs
-}
-
-func (p *HostMaintenanceRequest) GetCreatedTimestampMs() int64 {
-	return p.CreatedTimestampMs
-}
-func (p *HostMaintenanceRequest) IsSetDefaultSlaPolicy() bool {
-	return p.DefaultSlaPolicy != nil
-}
-
-func (p *HostMaintenanceRequest) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *HostMaintenanceRequest) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Host = v
-	}
-	return nil
-}
-
-func (p *HostMaintenanceRequest) readField2(iprot thrift.TProtocol) error {
-	p.DefaultSlaPolicy = &SlaPolicy{}
-	if err := p.DefaultSlaPolicy.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DefaultSlaPolicy), err)
-	}
-	return nil
-}
-
-func (p *HostMaintenanceRequest) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.TimeoutSecs = v
-	}
-	return nil
-}
-
-func (p *HostMaintenanceRequest) readField4(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI64(); err != nil {
-		return thrift.PrependError("error reading field 4: ", err)
-	} else {
-		p.CreatedTimestampMs = v
-	}
-	return nil
-}
-
-func (p *HostMaintenanceRequest) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("HostMaintenanceRequest"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *HostMaintenanceRequest) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("host", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:host: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Host)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.host (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:host: ", p), err)
-	}
-	return err
-}
-
-func (p *HostMaintenanceRequest) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("defaultSlaPolicy", thrift.STRUCT, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:defaultSlaPolicy: ", p), err)
-	}
-	if err := p.DefaultSlaPolicy.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DefaultSlaPolicy), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:defaultSlaPolicy: ", p), err)
-	}
-	return err
-}
-
-func (p *HostMaintenanceRequest) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("timeoutSecs", thrift.I64, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:timeoutSecs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.TimeoutSecs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.timeoutSecs (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:timeoutSecs: ", p), err)
-	}
-	return err
-}
-
-func (p *HostMaintenanceRequest) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("createdTimestampMs", thrift.I64, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:createdTimestampMs: ", p), err)
-	}
-	if err := oprot.WriteI64(int64(p.CreatedTimestampMs)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.createdTimestampMs (4) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:createdTimestampMs: ", p), err)
-	}
-	return err
-}
-
-func (p *HostMaintenanceRequest) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("HostMaintenanceRequest(%+v)", *p)
-}
-
-// Attributes:
-//  - Backups
-type ListBackupsResult_ struct {
-	Backups map[string]bool `thrift:"backups,1" json:"backups"`
-}
-
-func NewListBackupsResult_() *ListBackupsResult_ {
-	return &ListBackupsResult_{}
-}
-
-func (p *ListBackupsResult_) GetBackups() map[string]bool {
-	return p.Backups
-}
-func (p *ListBackupsResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ListBackupsResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[string]bool, size)
-	p.Backups = tSet
-	for i := 0; i < size; i++ {
-		var _elem33 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_elem33 = v
-		}
-		p.Backups[_elem33] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *ListBackupsResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ListBackupsResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ListBackupsResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("backups", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:backups: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRING, len(p.Backups)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Backups {
-		if err := oprot.WriteString(string(v)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:backups: ", p), err)
-	}
-	return err
-}
-
-func (p *ListBackupsResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ListBackupsResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Statuses
-type StartMaintenanceResult_ struct {
-	Statuses map[*HostStatus]bool `thrift:"statuses,1" json:"statuses"`
-}
-
-func NewStartMaintenanceResult_() *StartMaintenanceResult_ {
-	return &StartMaintenanceResult_{}
-}
-
-func (p *StartMaintenanceResult_) GetStatuses() map[*HostStatus]bool {
-	return p.Statuses
-}
-func (p *StartMaintenanceResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *StartMaintenanceResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*HostStatus]bool, size)
-	p.Statuses = tSet
-	for i := 0; i < size; i++ {
-		_elem34 := &HostStatus{}
-		if err := _elem34.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem34), err)
-		}
-		p.Statuses[_elem34] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *StartMaintenanceResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("StartMaintenanceResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *StartMaintenanceResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("statuses", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:statuses: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Statuses)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Statuses {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:statuses: ", p), err)
-	}
-	return err
-}
-
-func (p *StartMaintenanceResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("StartMaintenanceResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Statuses
-type DrainHostsResult_ struct {
-	Statuses map[*HostStatus]bool `thrift:"statuses,1" json:"statuses"`
-}
-
-func NewDrainHostsResult_() *DrainHostsResult_ {
-	return &DrainHostsResult_{}
-}
-
-func (p *DrainHostsResult_) GetStatuses() map[*HostStatus]bool {
-	return p.Statuses
-}
-func (p *DrainHostsResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *DrainHostsResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*HostStatus]bool, size)
-	p.Statuses = tSet
-	for i := 0; i < size; i++ {
-		_elem35 := &HostStatus{}
-		if err := _elem35.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem35), err)
-		}
-		p.Statuses[_elem35] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *DrainHostsResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("DrainHostsResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *DrainHostsResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("statuses", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:statuses: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Statuses)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Statuses {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:statuses: ", p), err)
-	}
-	return err
-}
-
-func (p *DrainHostsResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("DrainHostsResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Tasks
-type QueryRecoveryResult_ struct {
-	Tasks map[*ScheduledTask]bool `thrift:"tasks,1" json:"tasks"`
-}
-
-func NewQueryRecoveryResult_() *QueryRecoveryResult_ {
-	return &QueryRecoveryResult_{}
-}
-
-func (p *QueryRecoveryResult_) GetTasks() map[*ScheduledTask]bool {
-	return p.Tasks
-}
-func (p *QueryRecoveryResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *QueryRecoveryResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*ScheduledTask]bool, size)
-	p.Tasks = tSet
-	for i := 0; i < size; i++ {
-		_elem36 := &ScheduledTask{}
-		if err := _elem36.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem36), err)
-		}
-		p.Tasks[_elem36] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *QueryRecoveryResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("QueryRecoveryResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *QueryRecoveryResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("tasks", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:tasks: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Tasks)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Tasks {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:tasks: ", p), err)
-	}
-	return err
-}
-
-func (p *QueryRecoveryResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("QueryRecoveryResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Statuses
-type MaintenanceStatusResult_ struct {
-	Statuses map[*HostStatus]bool `thrift:"statuses,1" json:"statuses"`
-}
-
-func NewMaintenanceStatusResult_() *MaintenanceStatusResult_ {
-	return &MaintenanceStatusResult_{}
-}
-
-func (p *MaintenanceStatusResult_) GetStatuses() map[*HostStatus]bool {
-	return p.Statuses
-}
-func (p *MaintenanceStatusResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *MaintenanceStatusResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*HostStatus]bool, size)
-	p.Statuses = tSet
-	for i := 0; i < size; i++ {
-		_elem37 := &HostStatus{}
-		if err := _elem37.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem37), err)
-		}
-		p.Statuses[_elem37] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *MaintenanceStatusResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("MaintenanceStatusResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *MaintenanceStatusResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("statuses", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:statuses: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Statuses)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Statuses {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:statuses: ", p), err)
-	}
-	return err
-}
-
-func (p *MaintenanceStatusResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("MaintenanceStatusResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Statuses
-type EndMaintenanceResult_ struct {
-	Statuses map[*HostStatus]bool `thrift:"statuses,1" json:"statuses"`
-}
-
-func NewEndMaintenanceResult_() *EndMaintenanceResult_ {
-	return &EndMaintenanceResult_{}
-}
-
-func (p *EndMaintenanceResult_) GetStatuses() map[*HostStatus]bool {
-	return p.Statuses
-}
-func (p *EndMaintenanceResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *EndMaintenanceResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*HostStatus]bool, size)
-	p.Statuses = tSet
-	for i := 0; i < size; i++ {
-		_elem38 := &HostStatus{}
-		if err := _elem38.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem38), err)
-		}
-		p.Statuses[_elem38] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *EndMaintenanceResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("EndMaintenanceResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *EndMaintenanceResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("statuses", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:statuses: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Statuses)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Statuses {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:statuses: ", p), err)
-	}
-	return err
-}
-
-func (p *EndMaintenanceResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("EndMaintenanceResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Summaries
-type RoleSummaryResult_ struct {
-	Summaries map[*RoleSummary]bool `thrift:"summaries,1" json:"summaries"`
-}
-
-func NewRoleSummaryResult_() *RoleSummaryResult_ {
-	return &RoleSummaryResult_{}
-}
-
-func (p *RoleSummaryResult_) GetSummaries() map[*RoleSummary]bool {
-	return p.Summaries
-}
-func (p *RoleSummaryResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *RoleSummaryResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*RoleSummary]bool, size)
-	p.Summaries = tSet
-	for i := 0; i < size; i++ {
-		_elem39 := &RoleSummary{}
-		if err := _elem39.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem39), err)
-		}
-		p.Summaries[_elem39] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *RoleSummaryResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("RoleSummaryResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *RoleSummaryResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("summaries", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:summaries: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Summaries)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Summaries {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:summaries: ", p), err)
-	}
-	return err
-}
-
-func (p *RoleSummaryResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("RoleSummaryResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Summaries
-type JobSummaryResult_ struct {
-	Summaries map[*JobSummary]bool `thrift:"summaries,1" json:"summaries"`
-}
-
-func NewJobSummaryResult_() *JobSummaryResult_ {
-	return &JobSummaryResult_{}
-}
-
-func (p *JobSummaryResult_) GetSummaries() map[*JobSummary]bool {
-	return p.Summaries
-}
-func (p *JobSummaryResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *JobSummaryResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*JobSummary]bool, size)
-	p.Summaries = tSet
-	for i := 0; i < size; i++ {
-		_elem40 := &JobSummary{}
-		if err := _elem40.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem40), err)
-		}
-		p.Summaries[_elem40] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *JobSummaryResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("JobSummaryResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *JobSummaryResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("summaries", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:summaries: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Summaries)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Summaries {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:summaries: ", p), err)
-	}
-	return err
-}
-
-func (p *JobSummaryResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("JobSummaryResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Summary
-type ConfigSummaryResult_ struct {
-	Summary *ConfigSummary `thrift:"summary,1" json:"summary"`
-}
-
-func NewConfigSummaryResult_() *ConfigSummaryResult_ {
-	return &ConfigSummaryResult_{}
-}
-
-var ConfigSummaryResult__Summary_DEFAULT *ConfigSummary
-
-func (p *ConfigSummaryResult_) GetSummary() *ConfigSummary {
-	if !p.IsSetSummary() {
-		return ConfigSummaryResult__Summary_DEFAULT
-	}
-	return p.Summary
-}
-func (p *ConfigSummaryResult_) IsSetSummary() bool {
-	return p.Summary != nil
-}
-
-func (p *ConfigSummaryResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ConfigSummaryResult_) readField1(iprot thrift.TProtocol) error {
-	p.Summary = &ConfigSummary{}
-	if err := p.Summary.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Summary), err)
-	}
-	return nil
-}
-
-func (p *ConfigSummaryResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ConfigSummaryResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ConfigSummaryResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("summary", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:summary: ", p), err)
-	}
-	if err := p.Summary.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Summary), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:summary: ", p), err)
-	}
-	return err
-}
-
-func (p *ConfigSummaryResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ConfigSummaryResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Reasons
-type GetPendingReasonResult_ struct {
-	Reasons map[*PendingReason]bool `thrift:"reasons,1" json:"reasons"`
-}
-
-func NewGetPendingReasonResult_() *GetPendingReasonResult_ {
-	return &GetPendingReasonResult_{}
-}
-
-func (p *GetPendingReasonResult_) GetReasons() map[*PendingReason]bool {
-	return p.Reasons
-}
-func (p *GetPendingReasonResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *GetPendingReasonResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*PendingReason]bool, size)
-	p.Reasons = tSet
-	for i := 0; i < size; i++ {
-		_elem41 := &PendingReason{}
-		if err := _elem41.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem41), err)
-		}
-		p.Reasons[_elem41] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *GetPendingReasonResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("GetPendingReasonResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *GetPendingReasonResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("reasons", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:reasons: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Reasons)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Reasons {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:reasons: ", p), err)
-	}
-	return err
-}
-
-func (p *GetPendingReasonResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("GetPendingReasonResult_(%+v)", *p)
-}
-
-// Result of the startUpdate call.
-//
-// Attributes:
-//  - Key: Unique identifier for the job update.
-//  - UpdateSummary: Summary of the update that is in progress for the given JobKey.
-type StartJobUpdateResult_ struct {
-	Key           *JobUpdateKey     `thrift:"key,1" json:"key"`
-	UpdateSummary *JobUpdateSummary `thrift:"updateSummary,2" json:"updateSummary,omitempty"`
-}
-
-func NewStartJobUpdateResult_() *StartJobUpdateResult_ {
-	return &StartJobUpdateResult_{}
-}
-
-var StartJobUpdateResult__Key_DEFAULT *JobUpdateKey
-
-func (p *StartJobUpdateResult_) GetKey() *JobUpdateKey {
-	if !p.IsSetKey() {
-		return StartJobUpdateResult__Key_DEFAULT
-	}
-	return p.Key
-}
-
-var StartJobUpdateResult__UpdateSummary_DEFAULT *JobUpdateSummary
-
-func (p *StartJobUpdateResult_) GetUpdateSummary() *JobUpdateSummary {
-	if !p.IsSetUpdateSummary() {
-		return StartJobUpdateResult__UpdateSummary_DEFAULT
-	}
-	return p.UpdateSummary
-}
-func (p *StartJobUpdateResult_) IsSetKey() bool {
-	return p.Key != nil
-}
-
-func (p *StartJobUpdateResult_) IsSetUpdateSummary() bool {
-	return p.UpdateSummary != nil
-}
-
-func (p *StartJobUpdateResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *StartJobUpdateResult_) readField1(iprot thrift.TProtocol) error {
-	p.Key = &JobUpdateKey{}
-	if err := p.Key.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Key), err)
-	}
-	return nil
-}
-
-func (p *StartJobUpdateResult_) readField2(iprot thrift.TProtocol) error {
-	p.UpdateSummary = &JobUpdateSummary{}
-	if err := p.UpdateSummary.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.UpdateSummary), err)
-	}
-	return nil
-}
-
-func (p *StartJobUpdateResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("StartJobUpdateResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *StartJobUpdateResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("key", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
-	}
-	if err := p.Key.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Key), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
-	}
-	return err
-}
-
-func (p *StartJobUpdateResult_) writeField2(oprot thrift.TProtocol) (err error) {
-	if p.IsSetUpdateSummary() {
-		if err := oprot.WriteFieldBegin("updateSummary", thrift.STRUCT, 2); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:updateSummary: ", p), err)
-		}
-		if err := p.UpdateSummary.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.UpdateSummary), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:updateSummary: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *StartJobUpdateResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("StartJobUpdateResult_(%+v)", *p)
-}
-
-// Result of the getJobUpdateSummaries call.
-//
-// Attributes:
-//  - UpdateSummaries
-type GetJobUpdateSummariesResult_ struct {
-	UpdateSummaries []*JobUpdateSummary `thrift:"updateSummaries,1" json:"updateSummaries"`
-}
-
-func NewGetJobUpdateSummariesResult_() *GetJobUpdateSummariesResult_ {
-	return &GetJobUpdateSummariesResult_{}
-}
-
-func (p *GetJobUpdateSummariesResult_) GetUpdateSummaries() []*JobUpdateSummary {
-	return p.UpdateSummaries
-}
-func (p *GetJobUpdateSummariesResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateSummariesResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*JobUpdateSummary, 0, size)
-	p.UpdateSummaries = tSlice
-	for i := 0; i < size; i++ {
-		_elem42 := &JobUpdateSummary{}
-		if err := _elem42.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem42), err)
-		}
-		p.UpdateSummaries = append(p.UpdateSummaries, _elem42)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateSummariesResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("GetJobUpdateSummariesResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateSummariesResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("updateSummaries", thrift.LIST, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:updateSummaries: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.UpdateSummaries)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.UpdateSummaries {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:updateSummaries: ", p), err)
-	}
-	return err
-}
-
-func (p *GetJobUpdateSummariesResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("GetJobUpdateSummariesResult_(%+v)", *p)
-}
-
-// Result of the getJobUpdateDetails call.
-//
-// Attributes:
-//  - Details
-//  - DetailsList
-type GetJobUpdateDetailsResult_ struct {
-	Details     *JobUpdateDetails   `thrift:"details,1" json:"details"`
-	DetailsList []*JobUpdateDetails `thrift:"detailsList,2" json:"detailsList"`
-}
-
-func NewGetJobUpdateDetailsResult_() *GetJobUpdateDetailsResult_ {
-	return &GetJobUpdateDetailsResult_{}
-}
-
-var GetJobUpdateDetailsResult__Details_DEFAULT *JobUpdateDetails
-
-func (p *GetJobUpdateDetailsResult_) GetDetails() *JobUpdateDetails {
-	if !p.IsSetDetails() {
-		return GetJobUpdateDetailsResult__Details_DEFAULT
-	}
-	return p.Details
-}
-
-func (p *GetJobUpdateDetailsResult_) GetDetailsList() []*JobUpdateDetails {
-	return p.DetailsList
-}
-func (p *GetJobUpdateDetailsResult_) IsSetDetails() bool {
-	return p.Details != nil
-}
-
-func (p *GetJobUpdateDetailsResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDetailsResult_) readField1(iprot thrift.TProtocol) error {
-	p.Details = &JobUpdateDetails{}
-	if err := p.Details.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Details), err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDetailsResult_) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*JobUpdateDetails, 0, size)
-	p.DetailsList = tSlice
-	for i := 0; i < size; i++ {
-		_elem43 := &JobUpdateDetails{}
-		if err := _elem43.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem43), err)
-		}
-		p.DetailsList = append(p.DetailsList, _elem43)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDetailsResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("GetJobUpdateDetailsResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDetailsResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("details", thrift.STRUCT, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:details: ", p), err)
-	}
-	if err := p.Details.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Details), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:details: ", p), err)
-	}
-	return err
-}
-
-func (p *GetJobUpdateDetailsResult_) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("detailsList", thrift.LIST, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:detailsList: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.DetailsList)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.DetailsList {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:detailsList: ", p), err)
-	}
-	return err
-}
-
-func (p *GetJobUpdateDetailsResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("GetJobUpdateDetailsResult_(%+v)", *p)
-}
-
-// Result of the pulseJobUpdate call.
-//
-// Attributes:
-//  - Status
-type PulseJobUpdateResult_ struct {
-	Status JobUpdatePulseStatus `thrift:"status,1" json:"status"`
-}
-
-func NewPulseJobUpdateResult_() *PulseJobUpdateResult_ {
-	return &PulseJobUpdateResult_{}
-}
-
-func (p *PulseJobUpdateResult_) GetStatus() JobUpdatePulseStatus {
-	return p.Status
-}
-func (p *PulseJobUpdateResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *PulseJobUpdateResult_) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		temp := JobUpdatePulseStatus(v)
-		p.Status = temp
-	}
-	return nil
-}
-
-func (p *PulseJobUpdateResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("PulseJobUpdateResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *PulseJobUpdateResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("status", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:status: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.Status)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.status (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:status: ", p), err)
-	}
-	return err
-}
-
-func (p *PulseJobUpdateResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("PulseJobUpdateResult_(%+v)", *p)
-}
-
-// Attributes:
-//  - Add: Instance addition diff details.
-//  - Remove: Instance removal diff details.
-//  - Update: Instance update diff details.
-//  - Unchanged: Instances unchanged by the update.
-type GetJobUpdateDiffResult_ struct {
-	Add       map[*ConfigGroup]bool `thrift:"add,1" json:"add"`
-	Remove    map[*ConfigGroup]bool `thrift:"remove,2" json:"remove"`
-	Update    map[*ConfigGroup]bool `thrift:"update,3" json:"update"`
-	Unchanged map[*ConfigGroup]bool `thrift:"unchanged,4" json:"unchanged"`
-}
-
-func NewGetJobUpdateDiffResult_() *GetJobUpdateDiffResult_ {
-	return &GetJobUpdateDiffResult_{}
-}
-
-func (p *GetJobUpdateDiffResult_) GetAdd() map[*ConfigGroup]bool {
-	return p.Add
-}
-
-func (p *GetJobUpdateDiffResult_) GetRemove() map[*ConfigGroup]bool {
-	return p.Remove
-}
-
-func (p *GetJobUpdateDiffResult_) GetUpdate() map[*ConfigGroup]bool {
-	return p.Update
-}
-
-func (p *GetJobUpdateDiffResult_) GetUnchanged() map[*ConfigGroup]bool {
-	return p.Unchanged
-}
-func (p *GetJobUpdateDiffResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDiffResult_) readField1(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*ConfigGroup]bool, size)
-	p.Add = tSet
-	for i := 0; i < size; i++ {
-		_elem44 := &ConfigGroup{}
-		if err := _elem44.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem44), err)
-		}
-		p.Add[_elem44] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDiffResult_) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*ConfigGroup]bool, size)
-	p.Remove = tSet
-	for i := 0; i < size; i++ {
-		_elem45 := &ConfigGroup{}
-		if err := _elem45.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem45), err)
-		}
-		p.Remove[_elem45] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDiffResult_) readField3(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*ConfigGroup]bool, size)
-	p.Update = tSet
-	for i := 0; i < size; i++ {
-		_elem46 := &ConfigGroup{}
-		if err := _elem46.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem46), err)
-		}
-		p.Update[_elem46] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDiffResult_) readField4(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*ConfigGroup]bool, size)
-	p.Unchanged = tSet
-	for i := 0; i < size; i++ {
-		_elem47 := &ConfigGroup{}
-		if err := _elem47.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem47), err)
-		}
-		p.Unchanged[_elem47] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDiffResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("GetJobUpdateDiffResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *GetJobUpdateDiffResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("add", thrift.SET, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:add: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Add)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Add {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:add: ", p), err)
-	}
-	return err
-}
-
-func (p *GetJobUpdateDiffResult_) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("remove", thrift.SET, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:remove: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Remove)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Remove {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:remove: ", p), err)
-	}
-	return err
-}
-
-func (p *GetJobUpdateDiffResult_) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("update", thrift.SET, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:update: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Update)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Update {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:update: ", p), err)
-	}
-	return err
-}
-
-func (p *GetJobUpdateDiffResult_) writeField4(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("unchanged", thrift.SET, 4); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:unchanged: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Unchanged)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Unchanged {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:unchanged: ", p), err)
-	}
-	return err
-}
-
-func (p *GetJobUpdateDiffResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("GetJobUpdateDiffResult_(%+v)", *p)
-}
-
-// Tier information.
-//
-// Attributes:
-//  - Name: Name of tier.
-//  - Settings: Tier attributes.
-type TierConfig struct {
-	Name     string            `thrift:"name,1" json:"name"`
-	Settings map[string]string `thrift:"settings,2" json:"settings"`
-}
-
-func NewTierConfig() *TierConfig {
-	return &TierConfig{}
-}
-
-func (p *TierConfig) GetName() string {
-	return p.Name
-}
-
-func (p *TierConfig) GetSettings() map[string]string {
-	return p.Settings
-}
-func (p *TierConfig) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *TierConfig) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Name = v
-	}
-	return nil
-}
-
-func (p *TierConfig) readField2(iprot thrift.TProtocol) error {
-	_, _, size, err := iprot.ReadMapBegin()
-	if err != nil {
-		return thrift.PrependError("error reading map begin: ", err)
-	}
-	tMap := make(map[string]string, size)
-	p.Settings = tMap
-	for i := 0; i < size; i++ {
-		var _key48 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_key48 = v
-		}
-		var _val49 string
-		if v, err := iprot.ReadString(); err != nil {
-			return thrift.PrependError("error reading field 0: ", err)
-		} else {
-			_val49 = v
-		}
-		p.Settings[_key48] = _val49
-	}
-	if err := iprot.ReadMapEnd(); err != nil {
-		return thrift.PrependError("error reading map end: ", err)
-	}
-	return nil
-}
-
-func (p *TierConfig) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("TierConfig"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *TierConfig) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("name", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:name: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Name)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.name (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:name: ", p), err)
-	}
-	return err
-}
-
-func (p *TierConfig) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("settings", thrift.MAP, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:settings: ", p), err)
-	}
-	if err := oprot.WriteMapBegin(thrift.STRING, thrift.STRING, len(p.Settings)); err != nil {
-		return thrift.PrependError("error writing map begin: ", err)
-	}
-	for k, v := range p.Settings {
-		if err := oprot.WriteString(string(k)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-		if err := oprot.WriteString(string(v)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
-		}
-	}
-	if err := oprot.WriteMapEnd(); err != nil {
-		return thrift.PrependError("error writing map end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:settings: ", p), err)
-	}
-	return err
-}
-
-func (p *TierConfig) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("TierConfig(%+v)", *p)
-}
-
-// Result of the getTierConfigResult call.
-//
-// Attributes:
-//  - DefaultTierName: Name of the default tier.
-//  - Tiers: Set of tier configurations.
-type GetTierConfigResult_ struct {
-	DefaultTierName string               `thrift:"defaultTierName,1" json:"defaultTierName"`
-	Tiers           map[*TierConfig]bool `thrift:"tiers,2" json:"tiers"`
-}
-
-func NewGetTierConfigResult_() *GetTierConfigResult_ {
-	return &GetTierConfigResult_{}
-}
-
-func (p *GetTierConfigResult_) GetDefaultTierName() string {
-	return p.DefaultTierName
-}
-
-func (p *GetTierConfigResult_) GetTiers() map[*TierConfig]bool {
-	return p.Tiers
-}
-func (p *GetTierConfigResult_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 2:
-			if err := p.readField2(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *GetTierConfigResult_) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.DefaultTierName = v
-	}
-	return nil
-}
-
-func (p *GetTierConfigResult_) readField2(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadSetBegin()
-	if err != nil {
-		return thrift.PrependError("error reading set begin: ", err)
-	}
-	tSet := make(map[*TierConfig]bool, size)
-	p.Tiers = tSet
-	for i := 0; i < size; i++ {
-		_elem50 := &TierConfig{}
-		if err := _elem50.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem50), err)
-		}
-		p.Tiers[_elem50] = true
-	}
-	if err := iprot.ReadSetEnd(); err != nil {
-		return thrift.PrependError("error reading set end: ", err)
-	}
-	return nil
-}
-
-func (p *GetTierConfigResult_) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("GetTierConfigResult"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField2(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *GetTierConfigResult_) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("defaultTierName", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:defaultTierName: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.DefaultTierName)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.defaultTierName (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:defaultTierName: ", p), err)
-	}
-	return err
-}
-
-func (p *GetTierConfigResult_) writeField2(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("tiers", thrift.SET, 2); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:tiers: ", p), err)
-	}
-	if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.Tiers)); err != nil {
-		return thrift.PrependError("error writing set begin: ", err)
-	}
-	for v, _ := range p.Tiers {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteSetEnd(); err != nil {
-		return thrift.PrependError("error writing set end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:tiers: ", p), err)
-	}
-	return err
-}
-
-func (p *GetTierConfigResult_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("GetTierConfigResult_(%+v)", *p)
-}
-
-// Information about the scheduler.
-//
-// Attributes:
-//  - ClusterName
-//  - StatsUrlPrefix: A url prefix for job container stats.
-type ServerInfo struct {
-	ClusterName string `thrift:"clusterName,1" json:"clusterName"`
-	// unused field # 2
-	StatsUrlPrefix string `thrift:"statsUrlPrefix,3" json:"statsUrlPrefix"`
-}
-
-func NewServerInfo() *ServerInfo {
-	return &ServerInfo{}
-}
-
-func (p *ServerInfo) GetClusterName() string {
-	return p.ClusterName
-}
-
-func (p *ServerInfo) GetStatsUrlPrefix() string {
-	return p.StatsUrlPrefix
-}
-func (p *ServerInfo) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ServerInfo) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.ClusterName = v
-	}
-	return nil
-}
-
-func (p *ServerInfo) readField3(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 3: ", err)
-	} else {
-		p.StatsUrlPrefix = v
-	}
-	return nil
-}
-
-func (p *ServerInfo) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ServerInfo"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ServerInfo) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("clusterName", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:clusterName: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.ClusterName)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.clusterName (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:clusterName: ", p), err)
-	}
-	return err
-}
-
-func (p *ServerInfo) writeField3(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("statsUrlPrefix", thrift.STRING, 3); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:statsUrlPrefix: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.StatsUrlPrefix)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.statsUrlPrefix (3) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:statsUrlPrefix: ", p), err)
-	}
-	return err
-}
-
-func (p *ServerInfo) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ServerInfo(%+v)", *p)
-}
-
-// Attributes:
-//  - PopulateJobResult_
-//  - ScheduleStatusResult_
-//  - GetJobsResult_
-//  - GetQuotaResult_
-//  - ListBackupsResult_
-//  - StartMaintenanceResult_
-//  - DrainHostsResult_
-//  - QueryRecoveryResult_
-//  - MaintenanceStatusResult_
-//  - EndMaintenanceResult_
-//  - RoleSummaryResult_
-//  - JobSummaryResult_
-//  - ConfigSummaryResult_
-//  - GetPendingReasonResult_
-//  - StartJobUpdateResult_
-//  - GetJobUpdateSummariesResult_
-//  - GetJobUpdateDetailsResult_
-//  - PulseJobUpdateResult_
-//  - GetJobUpdateDiffResult_
-//  - GetTierConfigResult_
-type Result_ struct {
-	PopulateJobResult_ *PopulateJobResult_ `thrift:"populateJobResult,1" json:"populateJobResult,omitempty"`
-	// unused field # 2
-	ScheduleStatusResult_    *ScheduleStatusResult_    `thrift:"scheduleStatusResult,3" json:"scheduleStatusResult,omitempty"`
-	GetJobsResult_           *GetJobsResult_           `thrift:"getJobsResult,4" json:"getJobsResult,omitempty"`
-	GetQuotaResult_          *GetQuotaResult_          `thrift:"getQuotaResult,5" json:"getQuotaResult,omitempty"`
-	ListBackupsResult_       *ListBackupsResult_       `thrift:"listBackupsResult,6" json:"listBackupsResult,omitempty"`
-	StartMaintenanceResult_  *StartMaintenanceResult_  `thrift:"startMaintenanceResult,7" json:"startMaintenanceResult,omitempty"`
-	DrainHostsResult_        *DrainHostsResult_        `thrift:"drainHostsResult,8" json:"drainHostsResult,omitempty"`
-	QueryRecoveryResult_     *QueryRecoveryResult_     `thrift:"queryRecoveryResult,9" json:"queryRecoveryResult,omitempty"`
-	MaintenanceStatusResult_ *MaintenanceStatusResult_ `thrift:"maintenanceStatusResult,10" json:"maintenanceStatusResult,omitempty"`
-	EndMaintenanceResult_    *EndMaintenanceResult_    `thrift:"endMaintenanceResult,11" json:"endMaintenanceResult,omitempty"`
-	// unused fields # 12 to 16
-	RoleSummaryResult_ *RoleSummaryResult_ `thrift:"roleSummaryResult,17" json:"roleSummaryResult,omitempty"`
-	JobSummaryResult_  *JobSummaryResult_  `thrift:"jobSummaryResult,18" json:"jobSummaryResult,omitempty"`
-	// unused field # 19
-	ConfigSummaryResult_         *ConfigSummaryResult_         `thrift:"configSummaryResult,20" json:"configSummaryResult,omitempty"`
-	GetPendingReasonResult_      *GetPendingReasonResult_      `thrift:"getPendingReasonResult,21" json:"getPendingReasonResult,omitempty"`
-	StartJobUpdateResult_        *StartJobUpdateResult_        `thrift:"startJobUpdateResult,22" json:"startJobUpdateResult,omitempty"`
-	GetJobUpdateSummariesResult_ *GetJobUpdateSummariesResult_ `thrift:"getJobUpdateSummariesResult,23" json:"getJobUpdateSummariesResult,omitempty"`
-	GetJobUpdateDetailsResult_   *GetJobUpdateDetailsResult_   `thrift:"getJobUpdateDetailsResult,24" json:"getJobUpdateDetailsResult,omitempty"`
-	PulseJobUpdateResult_        *PulseJobUpdateResult_        `thrift:"pulseJobUpdateResult,25" json:"pulseJobUpdateResult,omitempty"`
-	GetJobUpdateDiffResult_      *GetJobUpdateDiffResult_      `thrift:"getJobUpdateDiffResult,26" json:"getJobUpdateDiffResult,omitempty"`
-	GetTierConfigResult_         *GetTierConfigResult_         `thrift:"getTierConfigResult,27" json:"getTierConfigResult,omitempty"`
-}
-
-func NewResult_() *Result_ {
-	return &Result_{}
-}
-
-var Result__PopulateJobResult__DEFAULT *PopulateJobResult_
-
-func (p *Result_) GetPopulateJobResult_() *PopulateJobResult_ {
-	if !p.IsSetPopulateJobResult_() {
-		return Result__PopulateJobResult__DEFAULT
-	}
-	return p.PopulateJobResult_
-}
-
-var Result__ScheduleStatusResult__DEFAULT *ScheduleStatusResult_
-
-func (p *Result_) GetScheduleStatusResult_() *ScheduleStatusResult_ {
-	if !p.IsSetScheduleStatusResult_() {
-		return Result__ScheduleStatusResult__DEFAULT
-	}
-	return p.ScheduleStatusResult_
-}
-
-var Result__GetJobsResult__DEFAULT *GetJobsResult_
-
-func (p *Result_) GetGetJobsResult_() *GetJobsResult_ {
-	if !p.IsSetGetJobsResult_() {
-		return Result__GetJobsResult__DEFAULT
-	}
-	return p.GetJobsResult_
-}
-
-var Result__GetQuotaResult__DEFAULT *GetQuotaResult_
-
-func (p *Result_) GetGetQuotaResult_() *GetQuotaResult_ {
-	if !p.IsSetGetQuotaResult_() {
-		return Result__GetQuotaResult__DEFAULT
-	}
-	return p.GetQuotaResult_
-}
-
-var Result__ListBackupsResult__DEFAULT *ListBackupsResult_
-
-func (p *Result_) GetListBackupsResult_() *ListBackupsResult_ {
-	if !p.IsSetListBackupsResult_() {
-		return Result__ListBackupsResult__DEFAULT
-	}
-	return p.ListBackupsResult_
-}
-
-var Result__StartMaintenanceResult__DEFAULT *StartMaintenanceResult_
-
-func (p *Result_) GetStartMaintenanceResult_() *StartMaintenanceResult_ {
-	if !p.IsSetStartMaintenanceResult_() {
-		return Result__StartMaintenanceResult__DEFAULT
-	}
-	return p.StartMaintenanceResult_
-}
-
-var Result__DrainHostsResult__DEFAULT *DrainHostsResult_
-
-func (p *Result_) GetDrainHostsResult_() *DrainHostsResult_ {
-	if !p.IsSetDrainHostsResult_() {
-		return Result__DrainHostsResult__DEFAULT
-	}
-	return p.DrainHostsResult_
-}
-
-var Result__QueryRecoveryResult__DEFAULT *QueryRecoveryResult_
-
-func (p *Result_) GetQueryRecoveryResult_() *QueryRecoveryResult_ {
-	if !p.IsSetQueryRecoveryResult_() {
-		return Result__QueryRecoveryResult__DEFAULT
-	}
-	return p.QueryRecoveryResult_
-}
-
-var Result__MaintenanceStatusResult__DEFAULT *MaintenanceStatusResult_
-
-func (p *Result_) GetMaintenanceStatusResult_() *MaintenanceStatusResult_ {
-	if !p.IsSetMaintenanceStatusResult_() {
-		return Result__MaintenanceStatusResult__DEFAULT
-	}
-	return p.MaintenanceStatusResult_
-}
-
-var Result__EndMaintenanceResult__DEFAULT *EndMaintenanceResult_
-
-func (p *Result_) GetEndMaintenanceResult_() *EndMaintenanceResult_ {
-	if !p.IsSetEndMaintenanceResult_() {
-		return Result__EndMaintenanceResult__DEFAULT
-	}
-	return p.EndMaintenanceResult_
-}
-
-var Result__RoleSummaryResult__DEFAULT *RoleSummaryResult_
-
-func (p *Result_) GetRoleSummaryResult_() *RoleSummaryResult_ {
-	if !p.IsSetRoleSummaryResult_() {
-		return Result__RoleSummaryResult__DEFAULT
-	}
-	return p.RoleSummaryResult_
-}
-
-var Result__JobSummaryResult__DEFAULT *JobSummaryResult_
-
-func (p *Result_) GetJobSummaryResult_() *JobSummaryResult_ {
-	if !p.IsSetJobSummaryResult_() {
-		return Result__JobSummaryResult__DEFAULT
-	}
-	return p.JobSummaryResult_
-}
-
-var Result__ConfigSummaryResult__DEFAULT *ConfigSummaryResult_
-
-func (p *Result_) GetConfigSummaryResult_() *ConfigSummaryResult_ {
-	if !p.IsSetConfigSummaryResult_() {
-		return Result__ConfigSummaryResult__DEFAULT
-	}
-	return p.ConfigSummaryResult_
-}
-
-var Result__GetPendingReasonResult__DEFAULT *GetPendingReasonResult_
-
-func (p *Result_) GetGetPendingReasonResult_() *GetPendingReasonResult_ {
-	if !p.IsSetGetPendingReasonResult_() {
-		return Result__GetPendingReasonResult__DEFAULT
-	}
-	return p.GetPendingReasonResult_
-}
-
-var Result__StartJobUpdateResult__DEFAULT *StartJobUpdateResult_
-
-func (p *Result_) GetStartJobUpdateResult_() *StartJobUpdateResult_ {
-	if !p.IsSetStartJobUpdateResult_() {
-		return Result__StartJobUpdateResult__DEFAULT
-	}
-	return p.StartJobUpdateResult_
-}
-
-var Result__GetJobUpdateSummariesResult__DEFAULT *GetJobUpdateSummariesResult_
-
-func (p *Result_) GetGetJobUpdateSummariesResult_() *GetJobUpdateSummariesResult_ {
-	if !p.IsSetGetJobUpdateSummariesResult_() {
-		return Result__GetJobUpdateSummariesResult__DEFAULT
-	}
-	return p.GetJobUpdateSummariesResult_
-}
-
-var Result__GetJobUpdateDetailsResult__DEFAULT *GetJobUpdateDetailsResult_
-
-func (p *Result_) GetGetJobUpdateDetailsResult_() *GetJobUpdateDetailsResult_ {
-	if !p.IsSetGetJobUpdateDetailsResult_() {
-		return Result__GetJobUpdateDetailsResult__DEFAULT
-	}
-	return p.GetJobUpdateDetailsResult_
-}
-
-var Result__PulseJobUpdateResult__DEFAULT *PulseJobUpdateResult_
-
-func (p *Result_) GetPulseJobUpdateResult_() *PulseJobUpdateResult_ {
-	if !p.IsSetPulseJobUpdateResult_() {
-		return Result__PulseJobUpdateResult__DEFAULT
-	}
-	return p.PulseJobUpdateResult_
-}
-
-var Result__GetJobUpdateDiffResult__DEFAULT *GetJobUpdateDiffResult_
-
-func (p *Result_) GetGetJobUpdateDiffResult_() *GetJobUpdateDiffResult_ {
-	if !p.IsSetGetJobUpdateDiffResult_() {
-		return Result__GetJobUpdateDiffResult__DEFAULT
-	}
-	return p.GetJobUpdateDiffResult_
-}
-
-var Result__GetTierConfigResult__DEFAULT *GetTierConfigResult_
-
-func (p *Result_) GetGetTierConfigResult_() *GetTierConfigResult_ {
-	if !p.IsSetGetTierConfigResult_() {
-		return Result__GetTierConfigResult__DEFAULT
-	}
-	return p.GetTierConfigResult_
-}
-func (p *Result_) CountSetFieldsResult_() int {
-	count := 0
-	if p.IsSetPopulateJobResult_() {
-		count++
-	}
-	if p.IsSetScheduleStatusResult_() {
-		count++
-	}
-	if p.IsSetGetJobsResult_() {
-		count++
-	}
-	if p.IsSetGetQuotaResult_() {
-		count++
-	}
-	if p.IsSetListBackupsResult_() {
-		count++
-	}
-	if p.IsSetStartMaintenanceResult_() {
-		count++
-	}
-	if p.IsSetDrainHostsResult_() {
-		count++
-	}
-	if p.IsSetQueryRecoveryResult_() {
-		count++
-	}
-	if p.IsSetMaintenanceStatusResult_() {
-		count++
-	}
-	if p.IsSetEndMaintenanceResult_() {
-		count++
-	}
-	if p.IsSetRoleSummaryResult_() {
-		count++
-	}
-	if p.IsSetJobSummaryResult_() {
-		count++
-	}
-	if p.IsSetConfigSummaryResult_() {
-		count++
-	}
-	if p.IsSetGetPendingReasonResult_() {
-		count++
-	}
-	if p.IsSetStartJobUpdateResult_() {
-		count++
-	}
-	if p.IsSetGetJobUpdateSummariesResult_() {
-		count++
-	}
-	if p.IsSetGetJobUpdateDetailsResult_() {
-		count++
-	}
-	if p.IsSetPulseJobUpdateResult_() {
-		count++
-	}
-	if p.IsSetGetJobUpdateDiffResult_() {
-		count++
-	}
-	if p.IsSetGetTierConfigResult_() {
-		count++
-	}
-	return count
-
-}
-
-func (p *Result_) IsSetPopulateJobResult_() bool {
-	return p.PopulateJobResult_ != nil
-}
-
-func (p *Result_) IsSetScheduleStatusResult_() bool {
-	return p.ScheduleStatusResult_ != nil
-}
-
-func (p *Result_) IsSetGetJobsResult_() bool {
-	return p.GetJobsResult_ != nil
-}
-
-func (p *Result_) IsSetGetQuotaResult_() bool {
-	return p.GetQuotaResult_ != nil
-}
-
-func (p *Result_) IsSetListBackupsResult_() bool {
-	return p.ListBackupsResult_ != nil
-}
-
-func (p *Result_) IsSetStartMaintenanceResult_() bool {
-	return p.StartMaintenanceResult_ != nil
-}
-
-func (p *Result_) IsSetDrainHostsResult_() bool {
-	return p.DrainHostsResult_ != nil
-}
-
-func (p *Result_) IsSetQueryRecoveryResult_() bool {
-	return p.QueryRecoveryResult_ != nil
-}
-
-func (p *Result_) IsSetMaintenanceStatusResult_() bool {
-	return p.MaintenanceStatusResult_ != nil
-}
-
-func (p *Result_) IsSetEndMaintenanceResult_() bool {
-	return p.EndMaintenanceResult_ != nil
-}
-
-func (p *Result_) IsSetRoleSummaryResult_() bool {
-	return p.RoleSummaryResult_ != nil
-}
-
-func (p *Result_) IsSetJobSummaryResult_() bool {
-	return p.JobSummaryResult_ != nil
-}
-
-func (p *Result_) IsSetConfigSummaryResult_() bool {
-	return p.ConfigSummaryResult_ != nil
-}
-
-func (p *Result_) IsSetGetPendingReasonResult_() bool {
-	return p.GetPendingReasonResult_ != nil
-}
-
-func (p *Result_) IsSetStartJobUpdateResult_() bool {
-	return p.StartJobUpdateResult_ != nil
-}
-
-func (p *Result_) IsSetGetJobUpdateSummariesResult_() bool {
-	return p.GetJobUpdateSummariesResult_ != nil
-}
-
-func (p *Result_) IsSetGetJobUpdateDetailsResult_() bool {
-	return p.GetJobUpdateDetailsResult_ != nil
-}
-
-func (p *Result_) IsSetPulseJobUpdateResult_() bool {
-	return p.PulseJobUpdateResult_ != nil
-}
-
-func (p *Result_) IsSetGetJobUpdateDiffResult_() bool {
-	return p.GetJobUpdateDiffResult_ != nil
-}
-
-func (p *Result_) IsSetGetTierConfigResult_() bool {
-	return p.GetTierConfigResult_ != nil
-}
-
-func (p *Result_) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 4:
-			if err := p.readField4(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		case 7:
-			if err := p.readField7(iprot); err != nil {
-				return err
-			}
-		case 8:
-			if err := p.readField8(iprot); err != nil {
-				return err
-			}
-		case 9:
-			if err := p.readField9(iprot); err != nil {
-				return err
-			}
-		case 10:
-			if err := p.readField10(iprot); err != nil {
-				return err
-			}
-		case 11:
-			if err := p.readField11(iprot); err != nil {
-				return err
-			}
-		case 17:
-			if err := p.readField17(iprot); err != nil {
-				return err
-			}
-		case 18:
-			if err := p.readField18(iprot); err != nil {
-				return err
-			}
-		case 20:
-			if err := p.readField20(iprot); err != nil {
-				return err
-			}
-		case 21:
-			if err := p.readField21(iprot); err != nil {
-				return err
-			}
-		case 22:
-			if err := p.readField22(iprot); err != nil {
-				return err
-			}
-		case 23:
-			if err := p.readField23(iprot); err != nil {
-				return err
-			}
-		case 24:
-			if err := p.readField24(iprot); err != nil {
-				return err
-			}
-		case 25:
-			if err := p.readField25(iprot); err != nil {
-				return err
-			}
-		case 26:
-			if err := p.readField26(iprot); err != nil {
-				return err
-			}
-		case 27:
-			if err := p.readField27(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField1(iprot thrift.TProtocol) error {
-	p.PopulateJobResult_ = &PopulateJobResult_{}
-	if err := p.PopulateJobResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.PopulateJobResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField3(iprot thrift.TProtocol) error {
-	p.ScheduleStatusResult_ = &ScheduleStatusResult_{}
-	if err := p.ScheduleStatusResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ScheduleStatusResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField4(iprot thrift.TProtocol) error {
-	p.GetJobsResult_ = &GetJobsResult_{}
-	if err := p.GetJobsResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetJobsResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField5(iprot thrift.TProtocol) error {
-	p.GetQuotaResult_ = &GetQuotaResult_{}
-	if err := p.GetQuotaResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetQuotaResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField6(iprot thrift.TProtocol) error {
-	p.ListBackupsResult_ = &ListBackupsResult_{}
-	if err := p.ListBackupsResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ListBackupsResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField7(iprot thrift.TProtocol) error {
-	p.StartMaintenanceResult_ = &StartMaintenanceResult_{}
-	if err := p.StartMaintenanceResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.StartMaintenanceResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField8(iprot thrift.TProtocol) error {
-	p.DrainHostsResult_ = &DrainHostsResult_{}
-	if err := p.DrainHostsResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DrainHostsResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField9(iprot thrift.TProtocol) error {
-	p.QueryRecoveryResult_ = &QueryRecoveryResult_{}
-	if err := p.QueryRecoveryResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.QueryRecoveryResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField10(iprot thrift.TProtocol) error {
-	p.MaintenanceStatusResult_ = &MaintenanceStatusResult_{}
-	if err := p.MaintenanceStatusResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MaintenanceStatusResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField11(iprot thrift.TProtocol) error {
-	p.EndMaintenanceResult_ = &EndMaintenanceResult_{}
-	if err := p.EndMaintenanceResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.EndMaintenanceResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField17(iprot thrift.TProtocol) error {
-	p.RoleSummaryResult_ = &RoleSummaryResult_{}
-	if err := p.RoleSummaryResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.RoleSummaryResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField18(iprot thrift.TProtocol) error {
-	p.JobSummaryResult_ = &JobSummaryResult_{}
-	if err := p.JobSummaryResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobSummaryResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField20(iprot thrift.TProtocol) error {
-	p.ConfigSummaryResult_ = &ConfigSummaryResult_{}
-	if err := p.ConfigSummaryResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ConfigSummaryResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField21(iprot thrift.TProtocol) error {
-	p.GetPendingReasonResult_ = &GetPendingReasonResult_{}
-	if err := p.GetPendingReasonResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetPendingReasonResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField22(iprot thrift.TProtocol) error {
-	p.StartJobUpdateResult_ = &StartJobUpdateResult_{}
-	if err := p.StartJobUpdateResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.StartJobUpdateResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField23(iprot thrift.TProtocol) error {
-	p.GetJobUpdateSummariesResult_ = &GetJobUpdateSummariesResult_{}
-	if err := p.GetJobUpdateSummariesResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetJobUpdateSummariesResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField24(iprot thrift.TProtocol) error {
-	p.GetJobUpdateDetailsResult_ = &GetJobUpdateDetailsResult_{}
-	if err := p.GetJobUpdateDetailsResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetJobUpdateDetailsResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField25(iprot thrift.TProtocol) error {
-	p.PulseJobUpdateResult_ = &PulseJobUpdateResult_{}
-	if err := p.PulseJobUpdateResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.PulseJobUpdateResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField26(iprot thrift.TProtocol) error {
-	p.GetJobUpdateDiffResult_ = &GetJobUpdateDiffResult_{}
-	if err := p.GetJobUpdateDiffResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetJobUpdateDiffResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) readField27(iprot thrift.TProtocol) error {
-	p.GetTierConfigResult_ = &GetTierConfigResult_{}
-	if err := p.GetTierConfigResult_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.GetTierConfigResult_), err)
-	}
-	return nil
-}
-
-func (p *Result_) Write(oprot thrift.TProtocol) error {
-	if c := p.CountSetFieldsResult_(); c != 1 {
-		return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c)
-	}
-	if err := oprot.WriteStructBegin("Result"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField4(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField7(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField8(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField9(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField10(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField11(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField17(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField18(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField20(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField21(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField22(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField23(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField24(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField25(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField26(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField27(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Result_) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetPopulateJobResult_() {
-		if err := oprot.WriteFieldBegin("populateJobResult", thrift.STRUCT, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:populateJobResult: ", p), err)
-		}
-		if err := p.PopulateJobResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.PopulateJobResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:populateJobResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetScheduleStatusResult_() {
-		if err := oprot.WriteFieldBegin("scheduleStatusResult", thrift.STRUCT, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:scheduleStatusResult: ", p), err)
-		}
-		if err := p.ScheduleStatusResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ScheduleStatusResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:scheduleStatusResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField4(oprot thrift.TProtocol) (err error) {
-	if p.IsSetGetJobsResult_() {
-		if err := oprot.WriteFieldBegin("getJobsResult", thrift.STRUCT, 4); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:getJobsResult: ", p), err)
-		}
-		if err := p.GetJobsResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetJobsResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:getJobsResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField5(oprot thrift.TProtocol) (err error) {
-	if p.IsSetGetQuotaResult_() {
-		if err := oprot.WriteFieldBegin("getQuotaResult", thrift.STRUCT, 5); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:getQuotaResult: ", p), err)
-		}
-		if err := p.GetQuotaResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetQuotaResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:getQuotaResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField6(oprot thrift.TProtocol) (err error) {
-	if p.IsSetListBackupsResult_() {
-		if err := oprot.WriteFieldBegin("listBackupsResult", thrift.STRUCT, 6); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:listBackupsResult: ", p), err)
-		}
-		if err := p.ListBackupsResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ListBackupsResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:listBackupsResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField7(oprot thrift.TProtocol) (err error) {
-	if p.IsSetStartMaintenanceResult_() {
-		if err := oprot.WriteFieldBegin("startMaintenanceResult", thrift.STRUCT, 7); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:startMaintenanceResult: ", p), err)
-		}
-		if err := p.StartMaintenanceResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.StartMaintenanceResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:startMaintenanceResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField8(oprot thrift.TProtocol) (err error) {
-	if p.IsSetDrainHostsResult_() {
-		if err := oprot.WriteFieldBegin("drainHostsResult", thrift.STRUCT, 8); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:drainHostsResult: ", p), err)
-		}
-		if err := p.DrainHostsResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DrainHostsResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:drainHostsResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField9(oprot thrift.TProtocol) (err error) {
-	if p.IsSetQueryRecoveryResult_() {
-		if err := oprot.WriteFieldBegin("queryRecoveryResult", thrift.STRUCT, 9); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:queryRecoveryResult: ", p), err)
-		}
-		if err := p.QueryRecoveryResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.QueryRecoveryResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 9:queryRecoveryResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField10(oprot thrift.TProtocol) (err error) {
-	if p.IsSetMaintenanceStatusResult_() {
-		if err := oprot.WriteFieldBegin("maintenanceStatusResult", thrift.STRUCT, 10); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:maintenanceStatusResult: ", p), err)
-		}
-		if err := p.MaintenanceStatusResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MaintenanceStatusResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 10:maintenanceStatusResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField11(oprot thrift.TProtocol) (err error) {
-	if p.IsSetEndMaintenanceResult_() {
-		if err := oprot.WriteFieldBegin("endMaintenanceResult", thrift.STRUCT, 11); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:endMaintenanceResult: ", p), err)
-		}
-		if err := p.EndMaintenanceResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.EndMaintenanceResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 11:endMaintenanceResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField17(oprot thrift.TProtocol) (err error) {
-	if p.IsSetRoleSummaryResult_() {
-		if err := oprot.WriteFieldBegin("roleSummaryResult", thrift.STRUCT, 17); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 17:roleSummaryResult: ", p), err)
-		}
-		if err := p.RoleSummaryResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.RoleSummaryResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 17:roleSummaryResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField18(oprot thrift.TProtocol) (err error) {
-	if p.IsSetJobSummaryResult_() {
-		if err := oprot.WriteFieldBegin("jobSummaryResult", thrift.STRUCT, 18); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 18:jobSummaryResult: ", p), err)
-		}
-		if err := p.JobSummaryResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobSummaryResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 18:jobSummaryResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField20(oprot thrift.TProtocol) (err error) {
-	if p.IsSetConfigSummaryResult_() {
-		if err := oprot.WriteFieldBegin("configSummaryResult", thrift.STRUCT, 20); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 20:configSummaryResult: ", p), err)
-		}
-		if err := p.ConfigSummaryResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ConfigSummaryResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 20:configSummaryResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField21(oprot thrift.TProtocol) (err error) {
-	if p.IsSetGetPendingReasonResult_() {
-		if err := oprot.WriteFieldBegin("getPendingReasonResult", thrift.STRUCT, 21); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 21:getPendingReasonResult: ", p), err)
-		}
-		if err := p.GetPendingReasonResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetPendingReasonResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 21:getPendingReasonResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField22(oprot thrift.TProtocol) (err error) {
-	if p.IsSetStartJobUpdateResult_() {
-		if err := oprot.WriteFieldBegin("startJobUpdateResult", thrift.STRUCT, 22); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 22:startJobUpdateResult: ", p), err)
-		}
-		if err := p.StartJobUpdateResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.StartJobUpdateResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 22:startJobUpdateResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField23(oprot thrift.TProtocol) (err error) {
-	if p.IsSetGetJobUpdateSummariesResult_() {
-		if err := oprot.WriteFieldBegin("getJobUpdateSummariesResult", thrift.STRUCT, 23); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 23:getJobUpdateSummariesResult: ", p), err)
-		}
-		if err := p.GetJobUpdateSummariesResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetJobUpdateSummariesResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 23:getJobUpdateSummariesResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField24(oprot thrift.TProtocol) (err error) {
-	if p.IsSetGetJobUpdateDetailsResult_() {
-		if err := oprot.WriteFieldBegin("getJobUpdateDetailsResult", thrift.STRUCT, 24); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 24:getJobUpdateDetailsResult: ", p), err)
-		}
-		if err := p.GetJobUpdateDetailsResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetJobUpdateDetailsResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 24:getJobUpdateDetailsResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField25(oprot thrift.TProtocol) (err error) {
-	if p.IsSetPulseJobUpdateResult_() {
-		if err := oprot.WriteFieldBegin("pulseJobUpdateResult", thrift.STRUCT, 25); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 25:pulseJobUpdateResult: ", p), err)
-		}
-		if err := p.PulseJobUpdateResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.PulseJobUpdateResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 25:pulseJobUpdateResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField26(oprot thrift.TProtocol) (err error) {
-	if p.IsSetGetJobUpdateDiffResult_() {
-		if err := oprot.WriteFieldBegin("getJobUpdateDiffResult", thrift.STRUCT, 26); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 26:getJobUpdateDiffResult: ", p), err)
-		}
-		if err := p.GetJobUpdateDiffResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetJobUpdateDiffResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 26:getJobUpdateDiffResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) writeField27(oprot thrift.TProtocol) (err error) {
-	if p.IsSetGetTierConfigResult_() {
-		if err := oprot.WriteFieldBegin("getTierConfigResult", thrift.STRUCT, 27); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 27:getTierConfigResult: ", p), err)
-		}
-		if err := p.GetTierConfigResult_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.GetTierConfigResult_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 27:getTierConfigResult: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Result_) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Result_(%+v)", *p)
-}
-
-// Attributes:
-//  - Message
-type ResponseDetail struct {
-	Message string `thrift:"message,1" json:"message"`
-}
-
-func NewResponseDetail() *ResponseDetail {
-	return &ResponseDetail{}
-}
-
-func (p *ResponseDetail) GetMessage() string {
-	return p.Message
-}
-func (p *ResponseDetail) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ResponseDetail) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadString(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.Message = v
-	}
-	return nil
-}
-
-func (p *ResponseDetail) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ResponseDetail"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ResponseDetail) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("message", thrift.STRING, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:message: ", p), err)
-	}
-	if err := oprot.WriteString(string(p.Message)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.message (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:message: ", p), err)
-	}
-	return err
-}
-
-func (p *ResponseDetail) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ResponseDetail(%+v)", *p)
-}
-
-// Attributes:
-//  - ResponseCode
-//  - ServerInfo
-//  - Result_: Payload from the invoked RPC.
-//  - Details: Messages from the server relevant to the request, such as warnings or use of deprecated
-// features.
-type Response struct {
-	ResponseCode ResponseCode `thrift:"responseCode,1" json:"responseCode"`
-	// unused field # 2
-	Result_ *Result_ `thrift:"result,3" json:"result,omitempty"`
-	// unused field # 4
-	ServerInfo *ServerInfo       `thrift:"serverInfo,5" json:"serverInfo"`
-	Details    []*ResponseDetail `thrift:"details,6" json:"details"`
-}
-
-func NewResponse() *Response {
-	return &Response{}
-}
-
-func (p *Response) GetResponseCode() ResponseCode {
-	return p.ResponseCode
-}
-
-var Response_ServerInfo_DEFAULT *ServerInfo
-
-func (p *Response) GetServerInfo() *ServerInfo {
-	if !p.IsSetServerInfo() {
-		return Response_ServerInfo_DEFAULT
-	}
-	return p.ServerInfo
-}
-
-var Response_Result__DEFAULT *Result_
-
-func (p *Response) GetResult_() *Result_ {
-	if !p.IsSetResult_() {
-		return Response_Result__DEFAULT
-	}
-	return p.Result_
-}
-
-func (p *Response) GetDetails() []*ResponseDetail {
-	return p.Details
-}
-func (p *Response) IsSetServerInfo() bool {
-	return p.ServerInfo != nil
-}
-
-func (p *Response) IsSetResult_() bool {
-	return p.Result_ != nil
-}
-
-func (p *Response) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		case 5:
-			if err := p.readField5(iprot); err != nil {
-				return err
-			}
-		case 3:
-			if err := p.readField3(iprot); err != nil {
-				return err
-			}
-		case 6:
-			if err := p.readField6(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *Response) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		temp := ResponseCode(v)
-		p.ResponseCode = temp
-	}
-	return nil
-}
-
-func (p *Response) readField5(iprot thrift.TProtocol) error {
-	p.ServerInfo = &ServerInfo{}
-	if err := p.ServerInfo.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ServerInfo), err)
-	}
-	return nil
-}
-
-func (p *Response) readField3(iprot thrift.TProtocol) error {
-	p.Result_ = &Result_{}
-	if err := p.Result_.Read(iprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Result_), err)
-	}
-	return nil
-}
-
-func (p *Response) readField6(iprot thrift.TProtocol) error {
-	_, size, err := iprot.ReadListBegin()
-	if err != nil {
-		return thrift.PrependError("error reading list begin: ", err)
-	}
-	tSlice := make([]*ResponseDetail, 0, size)
-	p.Details = tSlice
-	for i := 0; i < size; i++ {
-		_elem51 := &ResponseDetail{}
-		if err := _elem51.Read(iprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem51), err)
-		}
-		p.Details = append(p.Details, _elem51)
-	}
-	if err := iprot.ReadListEnd(); err != nil {
-		return thrift.PrependError("error reading list end: ", err)
-	}
-	return nil
-}
-
-func (p *Response) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("Response"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField3(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField5(oprot); err != nil {
-		return err
-	}
-	if err := p.writeField6(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *Response) writeField1(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("responseCode", thrift.I32, 1); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:responseCode: ", p), err)
-	}
-	if err := oprot.WriteI32(int32(p.ResponseCode)); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T.responseCode (1) field write error: ", p), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:responseCode: ", p), err)
-	}
-	return err
-}
-
-func (p *Response) writeField3(oprot thrift.TProtocol) (err error) {
-	if p.IsSetResult_() {
-		if err := oprot.WriteFieldBegin("result", thrift.STRUCT, 3); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:result: ", p), err)
-		}
-		if err := p.Result_.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Result_), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:result: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *Response) writeField5(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("serverInfo", thrift.STRUCT, 5); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:serverInfo: ", p), err)
-	}
-	if err := p.ServerInfo.Write(oprot); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ServerInfo), err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:serverInfo: ", p), err)
-	}
-	return err
-}
-
-func (p *Response) writeField6(oprot thrift.TProtocol) (err error) {
-	if err := oprot.WriteFieldBegin("details", thrift.LIST, 6); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:details: ", p), err)
-	}
-	if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Details)); err != nil {
-		return thrift.PrependError("error writing list begin: ", err)
-	}
-	for _, v := range p.Details {
-		if err := v.Write(oprot); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-		}
-	}
-	if err := oprot.WriteListEnd(); err != nil {
-		return thrift.PrependError("error writing list end: ", err)
-	}
-	if err := oprot.WriteFieldEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:details: ", p), err)
-	}
-	return err
-}
-
-func (p *Response) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("Response(%+v)", *p)
-}
-
-// Attributes:
-//  - BatchSize
-type ExplicitReconciliationSettings struct {
-	BatchSize *int32 `thrift:"batchSize,1" json:"batchSize,omitempty"`
-}
-
-func NewExplicitReconciliationSettings() *ExplicitReconciliationSettings {
-	return &ExplicitReconciliationSettings{}
-}
-
-var ExplicitReconciliationSettings_BatchSize_DEFAULT int32
-
-func (p *ExplicitReconciliationSettings) GetBatchSize() int32 {
-	if !p.IsSetBatchSize() {
-		return ExplicitReconciliationSettings_BatchSize_DEFAULT
-	}
-	return *p.BatchSize
-}
-func (p *ExplicitReconciliationSettings) IsSetBatchSize() bool {
-	return p.BatchSize != nil
-}
-
-func (p *ExplicitReconciliationSettings) Read(iprot thrift.TProtocol) error {
-	if _, err := iprot.ReadStructBegin(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-	}
-
-	for {
-		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
-		if err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-		}
-		if fieldTypeId == thrift.STOP {
-			break
-		}
-		switch fieldId {
-		case 1:
-			if err := p.readField1(iprot); err != nil {
-				return err
-			}
-		default:
-			if err := iprot.Skip(fieldTypeId); err != nil {
-				return err
-			}
-		}
-		if err := iprot.ReadFieldEnd(); err != nil {
-			return err
-		}
-	}
-	if err := iprot.ReadStructEnd(); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-	}
-	return nil
-}
-
-func (p *ExplicitReconciliationSettings) readField1(iprot thrift.TProtocol) error {
-	if v, err := iprot.ReadI32(); err != nil {
-		return thrift.PrependError("error reading field 1: ", err)
-	} else {
-		p.BatchSize = &v
-	}
-	return nil
-}
-
-func (p *ExplicitReconciliationSettings) Write(oprot thrift.TProtocol) error {
-	if err := oprot.WriteStructBegin("ExplicitReconciliationSettings"); err != nil {
-		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
-	}
-	if err := p.writeField1(oprot); err != nil {
-		return err
-	}
-	if err := oprot.WriteFieldStop(); err != nil {
-		return thrift.PrependError("write field stop error: ", err)
-	}
-	if err := oprot.WriteStructEnd(); err != nil {
-		return thrift.PrependError("write struct stop error: ", err)
-	}
-	return nil
-}
-
-func (p *ExplicitReconciliationSettings) writeField1(oprot thrift.TProtocol) (err error) {
-	if p.IsSetBatchSize() {
-		if err := oprot.WriteFieldBegin("batchSize", thrift.I32, 1); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:batchSize: ", p), err)
-		}
-		if err := oprot.WriteI32(int32(*p.BatchSize)); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T.batchSize (1) field write error: ", p), err)
-		}
-		if err := oprot.WriteFieldEnd(); err != nil {
-			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:batchSize: ", p), err)
-		}
-	}
-	return err
-}
-
-func (p *ExplicitReconciliationSettings) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ExplicitReconciliationSettings(%+v)", *p)
-}
diff --git a/job.go b/job.go
index 86849a2..9edf40a 100644
--- a/job.go
+++ b/job.go
@@ -88,9 +88,6 @@ func NewJob() Job {
 	taskConfig.Job = jobKey
 	taskConfig.Container = aurora.NewContainer()
 	taskConfig.Container.Mesos = aurora.NewMesosContainer()
-	taskConfig.MesosFetcherUris = make(map[*aurora.MesosFetcherURI]bool)
-	taskConfig.Metadata = make(map[*aurora.Metadata]bool)
-	taskConfig.Constraints = make(map[*aurora.Constraint]bool)
 
 	// Resources
 	numCpus := aurora.NewResource()
@@ -98,7 +95,7 @@ func NewJob() Job {
 	diskMb := aurora.NewResource()
 
 	resources := map[ResourceType]*aurora.Resource{CPU: numCpus, RAM: ramMb, DISK: diskMb}
-	taskConfig.Resources = map[*aurora.Resource]bool{numCpus: true, ramMb: true, diskMb: true}
+	taskConfig.Resources = []*aurora.Resource{numCpus, ramMb, diskMb}
 
 	numCpus.NumCpus = new(float64)
 	ramMb.RamMb = new(int64)
@@ -171,14 +168,15 @@ func (j *AuroraJob) Disk(disk int64) Job {
 	return j
 }
 
-func (j *AuroraJob) GPU(gpus int64) Job {
+func (j *AuroraJob) GPU(gpu int64) Job {
+	// GPU resource must be set explicitly since the scheduler by default
+	// rejects jobs with GPU resources attached to it.
 	if _, ok := j.resources[GPU]; !ok {
-		numGPUs := &aurora.Resource{NumGpus: new(int64)}
-		j.resources[GPU] = numGPUs
-		j.TaskConfig().Resources[numGPUs] = true
+		j.resources[GPU] = &aurora.Resource{}
+		j.JobConfig().GetTaskConfig().Resources = append(j.JobConfig().GetTaskConfig().Resources, j.resources[GPU])
 	}
 
-	*j.resources[GPU].NumGpus = gpus
+	j.resources[GPU].NumGpus = &gpu
 	return j
 }
 
@@ -233,11 +231,8 @@ func (j *AuroraJob) TaskConfig() *aurora.TaskConfig {
 // --enable_mesos_fetcher flag enabled. Currently there is no duplicate detection.
 func (j *AuroraJob) AddURIs(extract bool, cache bool, values ...string) Job {
 	for _, value := range values {
-		j.jobConfig.TaskConfig.MesosFetcherUris[&aurora.MesosFetcherURI{
-			Value:   value,
-			Extract: &extract,
-			Cache:   &cache,
-		}] = true
+		j.jobConfig.TaskConfig.MesosFetcherUris = append(j.jobConfig.TaskConfig.MesosFetcherUris,
+			&aurora.MesosFetcherURI{Value: value, Extract: &extract, Cache: &cache})
 	}
 	return j
 }
@@ -245,7 +240,7 @@ func (j *AuroraJob) AddURIs(extract bool, cache bool, values ...string) Job {
 // Adds a Mesos label to the job. Note that Aurora will add the
 // prefix "org.apache.aurora.metadata." to the beginning of each key.
 func (j *AuroraJob) AddLabel(key string, value string) Job {
-	j.jobConfig.TaskConfig.Metadata[&aurora.Metadata{Key: key, Value: value}] = true
+	j.jobConfig.TaskConfig.Metadata = append(j.jobConfig.TaskConfig.Metadata, &aurora.Metadata{Key: key, Value: value})
 	return j
 }
 
@@ -254,7 +249,7 @@ func (j *AuroraJob) AddLabel(key string, value string) Job {
 func (j *AuroraJob) AddNamedPorts(names ...string) Job {
 	j.portCount += len(names)
 	for _, name := range names {
-		j.jobConfig.TaskConfig.Resources[&aurora.Resource{NamedPort: &name}] = true
+		j.jobConfig.TaskConfig.Resources = append(j.jobConfig.TaskConfig.Resources, &aurora.Resource{NamedPort: &name})
 	}
 
 	return j
@@ -269,7 +264,7 @@ func (j *AuroraJob) AddPorts(num int) Job {
 	j.portCount += num
 	for i := start; i < j.portCount; i++ {
 		portName := "org.apache.aurora.port." + strconv.Itoa(i)
-		j.jobConfig.TaskConfig.Resources[&aurora.Resource{NamedPort: &portName}] = true
+		j.jobConfig.TaskConfig.Resources = append(j.jobConfig.TaskConfig.Resources, &aurora.Resource{NamedPort: &portName})
 	}
 
 	return j
@@ -281,20 +276,17 @@ func (j *AuroraJob) AddPorts(num int) Job {
 // If negated = true , treat this as a 'not' - to avoid specific values.
 // Values - list of values we look for in attribute name
 func (j *AuroraJob) AddValueConstraint(name string, negated bool, values ...string) Job {
-	constraintValues := make(map[string]bool)
-	for _, value := range values {
-		constraintValues[value] = true
-	}
-	j.jobConfig.TaskConfig.Constraints[&aurora.Constraint{
-		Name: name,
-		Constraint: &aurora.TaskConstraint{
-			Value: &aurora.ValueConstraint{
-				Negated: negated,
-				Values:  constraintValues,
+	j.jobConfig.TaskConfig.Constraints = append(j.jobConfig.TaskConfig.Constraints,
+		&aurora.Constraint{
+			Name: name,
+			Constraint: &aurora.TaskConstraint{
+				Value: &aurora.ValueConstraint{
+					Negated: negated,
+					Values:  values,
+				},
+				Limit: nil,
 			},
-			Limit: nil,
-		},
-	}] = true
+		})
 
 	return j
 }
@@ -303,13 +295,14 @@ func (j *AuroraJob) AddValueConstraint(name string, negated bool, values ...stri
 // A constraint that specifies the maximum number of active tasks on a host with
 // a matching attribute that may be scheduled simultaneously.
 func (j *AuroraJob) AddLimitConstraint(name string, limit int32) Job {
-	j.jobConfig.TaskConfig.Constraints[&aurora.Constraint{
-		Name: name,
-		Constraint: &aurora.TaskConstraint{
-			Value: nil,
-			Limit: &aurora.LimitConstraint{Limit: limit},
-		},
-	}] = true
+	j.jobConfig.TaskConfig.Constraints = append(j.jobConfig.TaskConfig.Constraints,
+		&aurora.Constraint{
+			Name: name,
+			Constraint: &aurora.TaskConstraint{
+				Value: nil,
+				Limit: &aurora.LimitConstraint{Limit: limit},
+			},
+		})
 
 	return j
 }
diff --git a/monitors.go b/monitors.go
index 3106cc6..6ef7c1a 100644
--- a/monitors.go
+++ b/monitors.go
@@ -103,7 +103,7 @@ func (m *Monitor) JobUpdateStatus(updateKey aurora.JobUpdateKey,
 
 // Monitor a Job until all instances enter one of the LIVE_STATES
 func (m *Monitor) Instances(key *aurora.JobKey, instances int32, interval, timeout int) (bool, error) {
-	return m.ScheduleStatus(key, instances, aurora.LIVE_STATES, interval, timeout)
+	return m.ScheduleStatus(key, instances, LiveStates, interval, timeout)
 }
 
 // Monitor a Job until all instances enter a desired status.
@@ -116,12 +116,18 @@ func (m *Monitor) ScheduleStatus(key *aurora.JobKey, instanceCount int32, desire
 	timer := time.NewTimer(time.Second * time.Duration(timeout))
 	defer timer.Stop()
 
+	wantedStatuses := make([]aurora.ScheduleStatus, 0)
+
+	for status := range desiredStatuses {
+		wantedStatuses = append(wantedStatuses, status)
+	}
+
 	for {
 		select {
 		case <-ticker.C:
 
 			// Query Aurora for the state of the job key ever interval
-			instCount, cliErr := m.Client.GetInstanceIds(key, desiredStatuses)
+			instCount, cliErr := m.Client.GetInstanceIds(key, wantedStatuses)
 			if cliErr != nil {
 				return false, errors.Wrap(cliErr, "Unable to communicate with Aurora")
 			}
@@ -174,7 +180,7 @@ func (m *Monitor) HostMaintenance(hosts []string, modes []aurora.MaintenanceMode
 				return hostResult, errors.Wrap(err, "client error in monitor")
 			}
 
-			for status := range result.GetStatuses() {
+			for _, status := range result.GetStatuses() {
 
 				if _, ok := desiredMode[status.GetMode()]; ok {
 					hostResult[status.GetHost()] = true
diff --git a/realis.go b/realis.go
index f12f922..1e568f3 100644
--- a/realis.go
+++ b/realis.go
@@ -26,17 +26,18 @@ import (
 	"net/http/cookiejar"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"sync"
 	"time"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/paypal/gorealis/gen-go/apache/aurora"
 	"github.com/paypal/gorealis/response"
 	"github.com/pkg/errors"
 )
 
-const VERSION = "1.3.1"
+const VERSION = "1.4.0"
 
 // TODO(rdelvalle): Move documentation to interface in order to make godoc look better/more accessible
 type Realis interface {
@@ -46,7 +47,7 @@ type Realis interface {
 	CreateService(auroraJob Job, settings *aurora.JobUpdateSettings) (*aurora.Response, *aurora.StartJobUpdateResult_, error)
 	DescheduleCronJob(key *aurora.JobKey) (*aurora.Response, error)
 	FetchTaskConfig(instKey aurora.InstanceKey) (*aurora.TaskConfig, error)
-	GetInstanceIds(key *aurora.JobKey, states map[aurora.ScheduleStatus]bool) (map[int32]bool, error)
+	GetInstanceIds(key *aurora.JobKey, states []aurora.ScheduleStatus) ([]int32, error)
 	GetJobUpdateSummaries(jobUpdateQuery *aurora.JobUpdateQuery) (*aurora.Response, error)
 	GetTaskStatus(query *aurora.TaskQuery) ([]*aurora.ScheduledTask, error)
 	GetTasksWithoutConfigs(query *aurora.TaskQuery) ([]*aurora.ScheduledTask, error)
@@ -95,6 +96,7 @@ type realisClient struct {
 	logger         LevelLogger
 	lock           *sync.Mutex
 	debug          bool
+	transport      thrift.TTransport
 }
 
 type RealisConfig struct {
@@ -366,7 +368,8 @@ func NewRealisClient(options ...ClientOption) (Realis, error) {
 		readonlyClient: aurora.NewReadOnlySchedulerClientFactory(config.transport, config.protoFactory),
 		adminClient:    aurora.NewAuroraAdminClientFactory(config.transport, config.protoFactory),
 		logger:         LevelLogger{Logger: config.logger, debug: config.debug, trace: config.trace},
-		lock:           &sync.Mutex{}}, nil
+		lock:           &sync.Mutex{},
+		transport:      config.transport}, nil
 }
 
 func GetDefaultClusterFromZKUrl(zkurl string) *Cluster {
@@ -525,13 +528,11 @@ func (r *realisClient) Close() {
 	r.lock.Lock()
 	defer r.lock.Unlock()
 
-	r.client.Transport.Close()
-	r.readonlyClient.Transport.Close()
-	r.adminClient.Transport.Close()
+	r.transport.Close()
 }
 
 // Uses predefined set of states to retrieve a set of active jobs in Apache Aurora.
-func (r *realisClient) GetInstanceIds(key *aurora.JobKey, states map[aurora.ScheduleStatus]bool) (map[int32]bool, error) {
+func (r *realisClient) GetInstanceIds(key *aurora.JobKey, states []aurora.ScheduleStatus) ([]int32, error) {
 	taskQ := &aurora.TaskQuery{
 		Role:        &key.Role,
 		Environment: &key.Environment,
@@ -542,7 +543,7 @@ func (r *realisClient) GetInstanceIds(key *aurora.JobKey, states map[aurora.Sche
 	r.logger.DebugPrintf("GetTasksWithoutConfigs Thrift Payload: %+v\n", taskQ)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.GetTasksWithoutConfigs(taskQ)
+		return r.client.GetTasksWithoutConfigs(nil, taskQ)
 	})
 
 	// If we encountered an error we couldn't recover from by retrying, return an error to the user
@@ -552,9 +553,9 @@ func (r *realisClient) GetInstanceIds(key *aurora.JobKey, states map[aurora.Sche
 
 	// Construct instance id map to stay in line with thrift's representation of sets
 	tasks := response.ScheduleStatusResult(resp).GetTasks()
-	jobInstanceIds := make(map[int32]bool)
+	jobInstanceIds := make([]int32, 0, len(tasks))
 	for _, task := range tasks {
-		jobInstanceIds[task.GetAssignedTask().GetInstanceId()] = true
+		jobInstanceIds = append(jobInstanceIds, task.GetAssignedTask().GetInstanceId())
 	}
 	return jobInstanceIds, nil
 
@@ -565,7 +566,7 @@ func (r *realisClient) GetJobUpdateSummaries(jobUpdateQuery *aurora.JobUpdateQue
 	r.logger.DebugPrintf("GetJobUpdateSummaries Thrift Payload: %+v\n", jobUpdateQuery)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.readonlyClient.GetJobUpdateSummaries(jobUpdateQuery)
+		return r.readonlyClient.GetJobUpdateSummaries(nil, jobUpdateQuery)
 	})
 
 	if retryErr != nil {
@@ -580,7 +581,7 @@ func (r *realisClient) GetJobs(role string) (*aurora.Response, *aurora.GetJobsRe
 	var result *aurora.GetJobsResult_
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.readonlyClient.GetJobs(role)
+		return r.readonlyClient.GetJobs(nil, role)
 	})
 
 	if retryErr != nil {
@@ -598,14 +599,8 @@ func (r *realisClient) GetJobs(role string) (*aurora.Response, *aurora.GetJobsRe
 func (r *realisClient) KillInstances(key *aurora.JobKey, instances ...int32) (*aurora.Response, error) {
 	r.logger.DebugPrintf("KillTasks Thrift Payload: %+v %v\n", key, instances)
 
-	instanceIds := make(map[int32]bool)
-
-	for _, instId := range instances {
-		instanceIds[instId] = true
-	}
-
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.KillTasks(key, instanceIds, "")
+		return r.client.KillTasks(nil, key, instances, "")
 	})
 
 	if retryErr != nil {
@@ -625,7 +620,7 @@ func (r *realisClient) KillJob(key *aurora.JobKey) (*aurora.Response, error) {
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
 		// Giving the KillTasks thrift call an empty set tells the Aurora scheduler to kill all active shards
-		return r.client.KillTasks(key, nil, "")
+		return r.client.KillTasks(nil, key, nil, "")
 	})
 
 	if retryErr != nil {
@@ -643,7 +638,7 @@ func (r *realisClient) CreateJob(auroraJob Job) (*aurora.Response, error) {
 	r.logger.DebugPrintf("CreateJob Thrift Payload: %+v\n", auroraJob.JobConfig())
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.CreateJob(auroraJob.JobConfig())
+		return r.client.CreateJob(nil, auroraJob.JobConfig())
 	})
 
 	if retryErr != nil {
@@ -674,7 +669,7 @@ func (r *realisClient) ScheduleCronJob(auroraJob Job) (*aurora.Response, error)
 	r.logger.DebugPrintf("ScheduleCronJob Thrift Payload: %+v\n", auroraJob.JobConfig())
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.ScheduleCronJob(auroraJob.JobConfig())
+		return r.client.ScheduleCronJob(nil, auroraJob.JobConfig())
 	})
 
 	if retryErr != nil {
@@ -688,7 +683,7 @@ func (r *realisClient) DescheduleCronJob(key *aurora.JobKey) (*aurora.Response,
 	r.logger.DebugPrintf("DescheduleCronJob Thrift Payload: %+v\n", key)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.DescheduleCronJob(key)
+		return r.client.DescheduleCronJob(nil, key)
 	})
 
 	if retryErr != nil {
@@ -704,7 +699,7 @@ func (r *realisClient) StartCronJob(key *aurora.JobKey) (*aurora.Response, error
 	r.logger.DebugPrintf("StartCronJob Thrift Payload: %+v\n", key)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.StartCronJob(key)
+		return r.client.StartCronJob(nil, key)
 	})
 
 	if retryErr != nil {
@@ -718,14 +713,8 @@ func (r *realisClient) StartCronJob(key *aurora.JobKey) (*aurora.Response, error
 func (r *realisClient) RestartInstances(key *aurora.JobKey, instances ...int32) (*aurora.Response, error) {
 	r.logger.DebugPrintf("RestartShards Thrift Payload: %+v %v\n", key, instances)
 
-	instanceIds := make(map[int32]bool)
-
-	for _, instId := range instances {
-		instanceIds[instId] = true
-	}
-
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.RestartShards(key, instanceIds)
+		return r.client.RestartShards(nil, key, instances)
 	})
 
 	if retryErr != nil {
@@ -746,7 +735,7 @@ func (r *realisClient) RestartJob(key *aurora.JobKey) (*aurora.Response, error)
 
 	if len(instanceIds) > 0 {
 		resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-			return r.client.RestartShards(key, instanceIds)
+			return r.client.RestartShards(nil, key, instanceIds)
 		})
 
 		if retryErr != nil {
@@ -765,7 +754,7 @@ func (r *realisClient) StartJobUpdate(updateJob *UpdateJob, message string) (*au
 	r.logger.DebugPrintf("StartJobUpdate Thrift Payload: %+v %v\n", updateJob, message)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.StartJobUpdate(updateJob.req, message)
+		return r.client.StartJobUpdate(nil, updateJob.req, message)
 	})
 
 	if retryErr != nil {
@@ -782,7 +771,7 @@ func (r *realisClient) AbortJobUpdate(updateKey aurora.JobUpdateKey, message str
 	r.logger.DebugPrintf("AbortJobUpdate Thrift Payload: %+v %v\n", updateKey, message)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.AbortJobUpdate(&updateKey, message)
+		return r.client.AbortJobUpdate(nil, &updateKey, message)
 	})
 
 	if retryErr != nil {
@@ -802,7 +791,7 @@ func (r *realisClient) PauseJobUpdate(updateKey *aurora.JobUpdateKey, message st
 	r.logger.DebugPrintf("PauseJobUpdate Thrift Payload: %+v %v\n", updateKey, message)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.PauseJobUpdate(updateKey, message)
+		return r.client.PauseJobUpdate(nil, updateKey, message)
 	})
 
 	if retryErr != nil {
@@ -818,7 +807,7 @@ func (r *realisClient) ResumeJobUpdate(updateKey *aurora.JobUpdateKey, message s
 	r.logger.DebugPrintf("ResumeJobUpdate Thrift Payload: %+v %v\n", updateKey, message)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.ResumeJobUpdate(updateKey, message)
+		return r.client.ResumeJobUpdate(nil, updateKey, message)
 	})
 
 	if retryErr != nil {
@@ -834,7 +823,7 @@ func (r *realisClient) PulseJobUpdate(updateKey *aurora.JobUpdateKey) (*aurora.R
 	r.logger.DebugPrintf("PulseJobUpdate Thrift Payload: %+v\n", updateKey)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.PulseJobUpdate(updateKey)
+		return r.client.PulseJobUpdate(nil, updateKey)
 	})
 
 	if retryErr != nil {
@@ -851,7 +840,7 @@ func (r *realisClient) AddInstances(instKey aurora.InstanceKey, count int32) (*a
 	r.logger.DebugPrintf("AddInstances Thrift Payload: %+v %v\n", instKey, count)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.AddInstances(&instKey, count)
+		return r.client.AddInstances(nil, &instKey, count)
 	})
 
 	if retryErr != nil {
@@ -861,35 +850,34 @@ func (r *realisClient) AddInstances(instKey aurora.InstanceKey, count int32) (*a
 
 }
 
-//Scale down the number of instances under a job configuration using the configuration of a specific instance
+// Scale down the number of instances under a job configuration using the configuration of a specific instance
 func (r *realisClient) RemoveInstances(key *aurora.JobKey, count int32) (*aurora.Response, error) {
 	instanceIds, err := r.GetInstanceIds(key, aurora.ACTIVE_STATES)
 	if err != nil {
 		return nil, errors.Wrap(err, "RemoveInstances: Could not retrieve relevant instance IDs")
 	}
+
 	if len(instanceIds) < int(count) {
-		return nil, errors.New(fmt.Sprintf("RemoveInstances: No sufficient instances to Kill - "+
-			"Instances to kill %d Total Instances %d", count, len(instanceIds)))
+		return nil, errors.Errorf("Insufficient active instances available for killing: "+
+			" Instances to be killed %d Active instances %d", count, len(instanceIds))
 	}
-	instanceList := make([]int32, count)
-	i := 0
-	for k := range instanceIds {
-		instanceList[i] = k
-		i += 1
-		if i == int(count) {
-			break
-		}
-	}
-	return r.KillInstances(key, instanceList...)
+
+	// Sort instanceIds in ** decreasing ** order
+	sort.Slice(instanceIds, func(i, j int) bool {
+		return instanceIds[i] > instanceIds[j]
+	})
+
+	// Kill the instances with the highest ID number first
+	return r.KillInstances(key, instanceIds[:count]...)
 }
 
 // Get information about task including a fully hydrated task configuration object
-func (r *realisClient) GetTaskStatus(query *aurora.TaskQuery) (tasks []*aurora.ScheduledTask, e error) {
+func (r *realisClient) GetTaskStatus(query *aurora.TaskQuery) ([]*aurora.ScheduledTask, error) {
 
 	r.logger.DebugPrintf("GetTasksStatus Thrift Payload: %+v\n", query)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.GetTasksStatus(query)
+		return r.client.GetTasksStatus(nil, query)
 	})
 
 	if retryErr != nil {
@@ -900,36 +888,34 @@ func (r *realisClient) GetTaskStatus(query *aurora.TaskQuery) (tasks []*aurora.S
 }
 
 // Get pending reason
-func (r *realisClient) GetPendingReason(query *aurora.TaskQuery) (pendingReasons []*aurora.PendingReason, e error) {
+func (r *realisClient) GetPendingReason(query *aurora.TaskQuery) ([]*aurora.PendingReason, error) {
 
 	r.logger.DebugPrintf("GetPendingReason Thrift Payload: %+v\n", query)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.GetPendingReason(query)
+		return r.client.GetPendingReason(nil, query)
 	})
 
 	if retryErr != nil {
 		return nil, errors.Wrap(retryErr, "Error querying Aurora Scheduler for pending Reasons")
 	}
 
-	var result map[*aurora.PendingReason]bool
+	var pendingReasons []*aurora.PendingReason
 
 	if resp.GetResult_() != nil {
-		result = resp.GetResult_().GetGetPendingReasonResult_().GetReasons()
-	}
-	for reason := range result {
-		pendingReasons = append(pendingReasons, reason)
+		pendingReasons = resp.GetResult_().GetGetPendingReasonResult_().GetReasons()
 	}
+
 	return pendingReasons, nil
 }
 
 // Get information about task including without a task configuration object
-func (r *realisClient) GetTasksWithoutConfigs(query *aurora.TaskQuery) (tasks []*aurora.ScheduledTask, e error) {
+func (r *realisClient) GetTasksWithoutConfigs(query *aurora.TaskQuery) ([]*aurora.ScheduledTask, error) {
 
 	r.logger.DebugPrintf("GetTasksWithoutConfigs Thrift Payload: %+v\n", query)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.GetTasksWithoutConfigs(query)
+		return r.client.GetTasksWithoutConfigs(nil, query)
 	})
 
 	if retryErr != nil {
@@ -942,22 +928,18 @@ func (r *realisClient) GetTasksWithoutConfigs(query *aurora.TaskQuery) (tasks []
 
 // Get the task configuration from the aurora scheduler for a job
 func (r *realisClient) FetchTaskConfig(instKey aurora.InstanceKey) (*aurora.TaskConfig, error) {
-
-	ids := make(map[int32]bool)
-
-	ids[instKey.InstanceId] = true
 	taskQ := &aurora.TaskQuery{
 		Role:        &instKey.JobKey.Role,
 		Environment: &instKey.JobKey.Environment,
 		JobName:     &instKey.JobKey.Name,
-		InstanceIds: ids,
+		InstanceIds: []int32{instKey.InstanceId},
 		Statuses:    aurora.ACTIVE_STATES,
 	}
 
 	r.logger.DebugPrintf("GetTasksStatus Thrift Payload: %+v\n", taskQ)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.GetTasksStatus(taskQ)
+		return r.client.GetTasksStatus(nil, taskQ)
 	})
 
 	if retryErr != nil {
@@ -983,7 +965,7 @@ func (r *realisClient) JobUpdateDetails(updateQuery aurora.JobUpdateQuery) (*aur
 	r.logger.DebugPrintf("GetJobUpdateDetails Thrift Payload: %+v\n", updateQuery)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.GetJobUpdateDetails(&updateQuery)
+		return r.client.GetJobUpdateDetails(nil, &updateQuery)
 	})
 
 	if retryErr != nil {
@@ -998,7 +980,7 @@ func (r *realisClient) RollbackJobUpdate(key aurora.JobUpdateKey, message string
 	r.logger.DebugPrintf("RollbackJobUpdate Thrift Payload: %+v %v\n", key, message)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.client.RollbackJobUpdate(&key, message)
+		return r.client.RollbackJobUpdate(nil, &key, message)
 	})
 
 	if retryErr != nil {
@@ -1023,15 +1005,12 @@ func (r *realisClient) DrainHosts(hosts ...string) (*aurora.Response, *aurora.Dr
 	}
 
 	drainList := aurora.NewHosts()
-	drainList.HostNames = make(map[string]bool)
-	for _, host := range hosts {
-		drainList.HostNames[host] = true
-	}
+	drainList.HostNames = hosts
 
 	r.logger.DebugPrintf("DrainHosts Thrift Payload: %v\n", drainList)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.DrainHosts(drainList)
+		return r.adminClient.DrainHosts(nil, drainList)
 	})
 
 	if retryErr != nil {
@@ -1056,15 +1035,12 @@ func (r *realisClient) SLADrainHosts(policy *aurora.SlaPolicy, timeout int64, ho
 	}
 
 	drainList := aurora.NewHosts()
-	drainList.HostNames = make(map[string]bool)
-	for _, host := range hosts {
-		drainList.HostNames[host] = true
-	}
+	drainList.HostNames = hosts
 
 	r.logger.DebugPrintf("SLADrainHosts Thrift Payload: %v\n", drainList)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.SlaDrainHosts(drainList, policy, timeout)
+		return r.adminClient.SlaDrainHosts(nil, drainList, policy, timeout)
 	})
 
 	if retryErr != nil {
@@ -1087,15 +1063,12 @@ func (r *realisClient) StartMaintenance(hosts ...string) (*aurora.Response, *aur
 	}
 
 	hostList := aurora.NewHosts()
-	hostList.HostNames = make(map[string]bool)
-	for _, host := range hosts {
-		hostList.HostNames[host] = true
-	}
+	hostList.HostNames = hosts
 
 	r.logger.DebugPrintf("StartMaintenance Thrift Payload: %v\n", hostList)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.StartMaintenance(hostList)
+		return r.adminClient.StartMaintenance(nil, hostList)
 	})
 
 	if retryErr != nil {
@@ -1118,15 +1091,12 @@ func (r *realisClient) EndMaintenance(hosts ...string) (*aurora.Response, *auror
 	}
 
 	hostList := aurora.NewHosts()
-	hostList.HostNames = make(map[string]bool)
-	for _, host := range hosts {
-		hostList.HostNames[host] = true
-	}
+	hostList.HostNames = hosts
 
 	r.logger.DebugPrintf("EndMaintenance Thrift Payload: %v\n", hostList)
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.EndMaintenance(hostList)
+		return r.adminClient.EndMaintenance(nil, hostList)
 	})
 
 	if retryErr != nil {
@@ -1149,17 +1119,14 @@ func (r *realisClient) MaintenanceStatus(hosts ...string) (*aurora.Response, *au
 	}
 
 	hostList := aurora.NewHosts()
-	hostList.HostNames = make(map[string]bool)
-	for _, host := range hosts {
-		hostList.HostNames[host] = true
-	}
+	hostList.HostNames = hosts
 
 	r.logger.DebugPrintf("MaintenanceStatus Thrift Payload: %v\n", hostList)
 
 	// Make thrift call. If we encounter an error sending the call, attempt to reconnect
 	// and continue trying to resend command until we run out of retries.
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.MaintenanceStatus(hostList)
+		return r.adminClient.MaintenanceStatus(nil, hostList)
 	})
 
 	if retryErr != nil {
@@ -1176,19 +1143,16 @@ func (r *realisClient) MaintenanceStatus(hosts ...string) (*aurora.Response, *au
 // SetQuota sets a quota aggregate for the given role
 // TODO(zircote) Currently investigating an error that is returned from thrift calls that include resources for `NamedPort` and `NumGpu`
 func (r *realisClient) SetQuota(role string, cpu *float64, ramMb *int64, diskMb *int64) (*aurora.Response, error) {
-	ram := aurora.NewResource()
-	ram.RamMb = ramMb
-	c := aurora.NewResource()
-	c.NumCpus = cpu
-	d := aurora.NewResource()
-	d.DiskMb = diskMb
+	ramRes := aurora.NewResource()
+	ramRes.RamMb = ramMb
+	cpuRes := aurora.NewResource()
+	cpuRes.NumCpus = cpu
+	diskRes := aurora.NewResource()
+	diskRes.DiskMb = diskMb
 	quota := aurora.NewResourceAggregate()
-	quota.Resources = make(map[*aurora.Resource]bool)
-	quota.Resources[ram] = true
-	quota.Resources[c] = true
-	quota.Resources[d] = true
+	quota.Resources = []*aurora.Resource{cpuRes, ramRes, diskRes}
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.SetQuota(role, quota)
+		return r.adminClient.SetQuota(nil, role, quota)
 	})
 
 	if retryErr != nil {
@@ -1202,7 +1166,7 @@ func (r *realisClient) SetQuota(role string, cpu *float64, ramMb *int64, diskMb
 func (r *realisClient) GetQuota(role string) (*aurora.Response, error) {
 
 	resp, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.GetQuota(role)
+		return r.adminClient.GetQuota(nil, role)
 	})
 
 	if retryErr != nil {
@@ -1215,7 +1179,7 @@ func (r *realisClient) GetQuota(role string) (*aurora.Response, error) {
 func (r *realisClient) Snapshot() error {
 
 	_, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.Snapshot()
+		return r.adminClient.Snapshot(nil)
 	})
 
 	if retryErr != nil {
@@ -1229,7 +1193,7 @@ func (r *realisClient) Snapshot() error {
 func (r *realisClient) PerformBackup() error {
 
 	_, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.PerformBackup()
+		return r.adminClient.PerformBackup(nil)
 	})
 
 	if retryErr != nil {
@@ -1242,7 +1206,7 @@ func (r *realisClient) PerformBackup() error {
 func (r *realisClient) ForceImplicitTaskReconciliation() error {
 
 	_, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.TriggerImplicitTaskReconciliation()
+		return r.adminClient.TriggerImplicitTaskReconciliation(nil)
 	})
 
 	if retryErr != nil {
@@ -1262,7 +1226,7 @@ func (r *realisClient) ForceExplicitTaskReconciliation(batchSize *int32) error {
 	settings.BatchSize = batchSize
 
 	_, retryErr := r.thriftCallWithRetries(func() (*aurora.Response, error) {
-		return r.adminClient.TriggerExplicitTaskReconciliation(settings)
+		return r.adminClient.TriggerExplicitTaskReconciliation(nil, settings)
 	})
 
 	if retryErr != nil {
diff --git a/realis_e2e_test.go b/realis_e2e_test.go
index 163e67c..1781132 100644
--- a/realis_e2e_test.go
+++ b/realis_e2e_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 	realis "github.com/paypal/gorealis"
 	"github.com/paypal/gorealis/gen-go/apache/aurora"
 	"github.com/paypal/gorealis/response"
@@ -188,48 +188,85 @@ func TestRealisClient_CreateJob_Thermos(t *testing.T) {
 		Name("create_thermos_job_test").
 		ExecutorName(aurora.AURORA_EXECUTOR_NAME).
 		ExecutorData(string(thermosPayload)).
-		CPU(.5).
-		RAM(64).
-		Disk(100).
+		CPU(.1).
+		RAM(16).
+		Disk(50).
 		IsService(true).
 		InstanceCount(2).
 		AddPorts(1)
 
-	resp, err := r.CreateJob(job)
+	_, err := r.CreateJob(job)
 	assert.NoError(t, err)
 
-	assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
-
 	// Test Instances Monitor
 	success, err := monitor.Instances(job.JobKey(), job.GetInstanceCount(), 1, 50)
 	assert.True(t, success)
 	assert.NoError(t, err)
 
-	//Fetch all Jobs
+	// Fetch all Jobs
 	_, result, err := r.GetJobs(role)
-	fmt.Printf("GetJobs length: %+v \n", len(result.Configs))
 	assert.Len(t, result.Configs, 1)
 	assert.NoError(t, err)
 
 	// Test asking the scheduler to perform a Snpshot
-	t.Run("TestRealisClient_Snapshot", func(t *testing.T) {
+	t.Run("Snapshot", func(t *testing.T) {
 		err := r.Snapshot()
 		assert.NoError(t, err)
 	})
 
 	// Test asking the scheduler to backup a Snapshot
-	t.Run("TestRealisClient_PerformBackup", func(t *testing.T) {
+	t.Run("PerformBackup", func(t *testing.T) {
 		err := r.PerformBackup()
 		assert.NoError(t, err)
 	})
 
-	// Tasks must exist for it to, be killed
-	t.Run("TestRealisClient_KillJob_Thermos", func(t *testing.T) {
-		resp, err := r.KillJob(job.JobKey())
+	t.Run("GetTaskStatus", func(t *testing.T) {
+		status, err := r.GetTaskStatus(&aurora.TaskQuery{
+			JobKeys:  []*aurora.JobKey{job.JobKey()},
+			Statuses: []aurora.ScheduleStatus{aurora.ScheduleStatus_RUNNING}})
 		assert.NoError(t, err)
+		assert.NotNil(t, status)
+		assert.Len(t, status, 2)
 
-		assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
+		// TODO: Assert that assigned task matches the configuration of the task scheduled
+	})
 
+	t.Run("AddInstances", func(t *testing.T) {
+		_, err := r.AddInstances(aurora.InstanceKey{JobKey: job.JobKey(), InstanceId: 0}, 2)
+		assert.NoError(t, err)
+		success, err := monitor.Instances(job.JobKey(), 4, 1, 50)
+		assert.True(t, success)
+		assert.NoError(t, err)
+	})
+
+	t.Run("KillInstances", func(t *testing.T) {
+		_, err := r.KillInstances(job.JobKey(), 2, 3)
+		assert.NoError(t, err)
+		success, err := monitor.Instances(job.JobKey(), 2, 1, 50)
+		assert.True(t, success)
+		assert.NoError(t, err)
+	})
+
+	t.Run("RestartInstances", func(t *testing.T) {
+		_, err := r.RestartInstances(job.JobKey(), 0)
+		assert.NoError(t, err)
+		success, err := monitor.Instances(job.JobKey(), 2, 1, 50)
+		assert.True(t, success)
+		assert.NoError(t, err)
+	})
+
+	t.Run("RestartJobs", func(t *testing.T) {
+		_, err := r.RestartJob(job.JobKey())
+		assert.NoError(t, err)
+		success, err := monitor.Instances(job.JobKey(), 2, 1, 50)
+		assert.True(t, success)
+		assert.NoError(t, err)
+	})
+
+	// Tasks must exist for it to, be killed
+	t.Run("KillJob", func(t *testing.T) {
+		_, err := r.KillJob(job.JobKey())
+		assert.NoError(t, err)
 		success, err := monitor.Instances(job.JobKey(), 0, 1, 50)
 		assert.True(t, success)
 		assert.NoError(t, err)
@@ -312,15 +349,14 @@ func TestRealisClient_CreateService_WithPulse_Thermos(t *testing.T) {
 		AddLabel("currentTime", time.Now().String())
 
 	settings := realis.NewUpdateSettings()
-	settings.BlockIfNoPulsesAfterMs = thrift.Int32Ptr(30)
+	settings.BlockIfNoPulsesAfterMs = thrift.Int32Ptr(500)
 	settings.UpdateGroupSize = 1
+	settings.MinWaitInInstanceRunningMs = 5000
 	settings.WaitForBatchCompletion = true
 	job.InstanceCount(2)
-	resp, result, err := r.CreateService(job, settings)
-	fmt.Println(result.String())
 
+	_, result, err := r.CreateService(job, settings)
 	assert.NoError(t, err)
-	assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
 
 	updateQ := aurora.JobUpdateQuery{
 		Key:   result.GetKey(),
@@ -329,7 +365,7 @@ func TestRealisClient_CreateService_WithPulse_Thermos(t *testing.T) {
 
 	var updateDetails []*aurora.JobUpdateDetails
 
-	ticker := time.NewTicker(time.Second * 3)
+	ticker := time.NewTicker(time.Second * 1)
 	timer := time.NewTimer(time.Minute * 6)
 	defer ticker.Stop()
 	defer timer.Stop()
@@ -339,35 +375,28 @@ pulseLoop:
 		select {
 		case <-ticker.C:
 
-			fmt.Println("sending PulseJobUpdate....")
-			resp, err = r.PulseJobUpdate(result.GetKey())
-			require.NotNil(t, resp, "received a nil response from Aurora")
-			assert.Nil(t, err)
+			_, err = r.PulseJobUpdate(result.GetKey())
+			assert.Nil(t, err, "unable to pulse job update")
 
 			respDetail, err := r.JobUpdateDetails(updateQ)
 			assert.Nil(t, err)
 
 			updateDetails = response.JobUpdateDetails(respDetail)
-			if len(updateDetails) == 0 {
-				fmt.Println("No update found")
-				assert.NotEqual(t, len(updateDetails), 0)
-			}
-			status := updateDetails[0].Update.Summary.State.Status
+			assert.Len(t, updateDetails, 1, "No update found")
 
-			if _, ok := aurora.ACTIVE_JOB_UPDATE_STATES[status]; !ok {
+			status := updateDetails[0].Update.Summary.State.Status
+			if _, ok := realis.ActiveJobUpdateStates[status]; !ok {
 
 				// Rolled forward is the only state in which an update has been successfully updated
 				// if we encounter an inactive state and it is not at rolled forward, update failed
 				if status == aurora.JobUpdateStatus_ROLLED_FORWARD {
-					fmt.Println("Update succeded")
+					fmt.Println("update succeed")
 					break pulseLoop
 				} else {
-					fmt.Println("Update failed")
+					fmt.Println("update failed")
 					break pulseLoop
 				}
 			}
-
-			fmt.Println("Polling, update still active...")
 		case <-timer.C:
 			_, err := r.AbortJobUpdate(*updateDetails[0].GetUpdate().GetSummary().GetKey(), "")
 			assert.NoError(t, err)
@@ -376,9 +405,8 @@ pulseLoop:
 		}
 	}
 
-	resp, err = r.KillJob(job.JobKey())
+	_, err = r.KillJob(job.JobKey())
 	assert.NoError(t, err)
-	assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
 }
 
 // Test configuring an executor that doesn't exist for CreateJob API
@@ -399,12 +427,23 @@ func TestRealisClient_CreateService(t *testing.T) {
 
 	settings := realis.NewUpdateSettings()
 	settings.UpdateGroupSize = 2
+	settings.MinWaitInInstanceRunningMs = 5000
 	job.InstanceCount(3)
-	resp, result, err := r.CreateService(job, settings)
 
+	_, result, err := r.CreateService(job, settings)
 	assert.NoError(t, err)
 	assert.NotNil(t, result)
-	assert.Equal(t, aurora.ResponseCode_OK, resp.GetResponseCode())
+
+	// Test asking the scheduler to backup a Snapshot
+	t.Run("PauseJobUpdate", func(t *testing.T) {
+		_, err = r.PauseJobUpdate(result.GetKey(), "")
+		assert.NoError(t, err)
+	})
+
+	t.Run("ResumeJobUpdate", func(t *testing.T) {
+		_, err = r.ResumeJobUpdate(result.GetKey(), "")
+		assert.NoError(t, err)
+	})
 
 	var ok bool
 	var mErr error
@@ -412,9 +451,7 @@ func TestRealisClient_CreateService(t *testing.T) {
 	if ok, mErr = monitor.JobUpdate(*result.GetKey(), 5, 240); !ok || mErr != nil {
 		// Update may already be in a terminal state so don't check for error
 		_, err := r.AbortJobUpdate(*result.GetKey(), "Monitor timed out.")
-
 		_, err = r.KillJob(job.JobKey())
-
 		assert.NoError(t, err)
 	}
 
@@ -423,7 +460,6 @@ func TestRealisClient_CreateService(t *testing.T) {
 
 	// Kill task test task after confirming it came up fine
 	_, err = r.KillJob(job.JobKey())
-
 	assert.NoError(t, err)
 }
 
@@ -444,8 +480,8 @@ func TestRealisClient_CreateService_ExecutorDoesNotExist(t *testing.T) {
 
 	settings := realis.NewUpdateSettings()
 	job.InstanceCount(3)
-	resp, result, err := r.CreateService(job, settings)
 
+	resp, result, err := r.CreateService(job, settings)
 	assert.Error(t, err)
 	assert.Nil(t, result)
 	assert.Equal(t, aurora.ResponseCode_INVALID_REQUEST, resp.GetResponseCode())
@@ -471,41 +507,24 @@ func TestRealisClient_ScheduleCronJob_Thermos(t *testing.T) {
 		CronSchedule("* * * * *").
 		IsService(false)
 
-	resp, err := r.ScheduleCronJob(job)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-
-	assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
-
-	t.Run("TestRealisClient_StartCronJob_Thermos", func(t *testing.T) {
-		start := time.Now()
-		resp, err := r.StartCronJob(job.JobKey())
-		end := time.Now()
+	_, err = r.ScheduleCronJob(job)
+	assert.NoError(t, err)
 
+	t.Run("Start", func(t *testing.T) {
+		_, err := r.StartCronJob(job.JobKey())
 		assert.NoError(t, err)
-		assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
-		fmt.Printf("Schedule cron call took %d ns\n", (end.UnixNano() - start.UnixNano()))
 	})
 
-	t.Run("TestRealisClient_DeschedulerCronJob_Thermos", func(t *testing.T) {
-		start := time.Now()
-		resp, err := r.DescheduleCronJob(job.JobKey())
-		end := time.Now()
-
+	t.Run("Deschedule", func(t *testing.T) {
+		_, err := r.DescheduleCronJob(job.JobKey())
 		assert.NoError(t, err)
-		assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
-		fmt.Printf("Deschedule cron call took %d ns\n", (end.UnixNano() - start.UnixNano()))
 	})
 }
 func TestRealisClient_StartMaintenance(t *testing.T) {
 	hosts := []string{"localhost"}
+
 	_, _, err := r.StartMaintenance(hosts...)
-	if err != nil {
-		fmt.Printf("error: %+v\n", err.Error())
-		os.Exit(1)
-	}
+	assert.NoError(t, err, "unable to start maintenance")
 
 	// Monitor change to DRAINING and DRAINED mode
 	hostResults, err := monitor.HostMaintenance(
@@ -530,22 +549,24 @@ func TestRealisClient_StartMaintenance(t *testing.T) {
 
 func TestRealisClient_DrainHosts(t *testing.T) {
 	hosts := []string{"localhost"}
-	_, _, err := r.DrainHosts(hosts...)
-	if err != nil {
-		fmt.Printf("error: %+v\n", err.Error())
-		os.Exit(1)
-	}
 
-	// Monitor change to DRAINING and DRAINED mode
-	hostResults, err := monitor.HostMaintenance(
-		hosts,
-		[]aurora.MaintenanceMode{aurora.MaintenanceMode_DRAINED, aurora.MaintenanceMode_DRAINING},
-		1,
-		50)
-	assert.Equal(t, map[string]bool{"localhost": true}, hostResults)
-	assert.NoError(t, err)
+	t.Run("DrainHosts", func(t *testing.T) {
+		_, _, err := r.DrainHosts(hosts...)
+		assert.NoError(t, err, "unable to drain host")
+	})
 
-	t.Run("TestRealisClient_MonitorNontransitioned", func(t *testing.T) {
+	t.Run("MonitorTransitionToDrained", func(t *testing.T) {
+		// Monitor change to DRAINING and DRAINED mode
+		hostResults, err := monitor.HostMaintenance(
+			hosts,
+			[]aurora.MaintenanceMode{aurora.MaintenanceMode_DRAINED, aurora.MaintenanceMode_DRAINING},
+			1,
+			50)
+		assert.Equal(t, map[string]bool{"localhost": true}, hostResults)
+		assert.NoError(t, err)
+	})
+
+	t.Run("MonitorNonExistentHost", func(t *testing.T) {
 		// Monitor change to DRAINING and DRAINED mode
 		hostResults, err := monitor.HostMaintenance(
 			append(hosts, "IMAGINARY_HOST"),
@@ -558,7 +579,7 @@ func TestRealisClient_DrainHosts(t *testing.T) {
 		assert.Equal(t, map[string]bool{"localhost": true, "IMAGINARY_HOST": false}, hostResults)
 	})
 
-	t.Run("TestRealisClient_EndMaintenance", func(t *testing.T) {
+	t.Run("EndMaintenance", func(t *testing.T) {
 		_, _, err := r.EndMaintenance(hosts...)
 		assert.NoError(t, err)
 
@@ -578,10 +599,7 @@ func TestRealisClient_SLADrainHosts(t *testing.T) {
 	policy := aurora.SlaPolicy{PercentageSlaPolicy: &aurora.PercentageSlaPolicy{Percentage: 50.0}}
 
 	_, err := r.SLADrainHosts(&policy, 30, hosts...)
-	if err != nil {
-		fmt.Printf("error: %+v\n", err.Error())
-		os.Exit(1)
-	}
+	assert.NoError(t, err, "unable to drain host with SLA policy")
 
 	// Monitor change to DRAINING and DRAINED mode
 	hostResults, err := monitor.HostMaintenance(
@@ -619,30 +637,25 @@ func TestRealisClient_SessionThreadSafety(t *testing.T) {
 		Disk(10).
 		InstanceCount(1000) // Impossible amount to go live in any sane machine
 
-	resp, err := r.CreateJob(job)
+	_, err := r.CreateJob(job)
 	assert.NoError(t, err)
 
-	assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
-
 	wg := sync.WaitGroup{}
-	for i := 0; i < 20; i++ {
-
-		wg.Add(1)
+	threadCount := 20
+	wg.Add(threadCount)
+	for i := 0; i < threadCount; i++ {
 
 		// Launch multiple monitors that will poll every second
 		go func() {
 			defer wg.Done()
 
 			// Test Schedule status monitor for terminal state and timing out after 30 seconds
-			success, err := monitor.ScheduleStatus(job.JobKey(), job.GetInstanceCount(), aurora.LIVE_STATES, 1, 30)
+			success, err := monitor.ScheduleStatus(job.JobKey(), job.GetInstanceCount(), realis.LiveStates, 1, 30)
 			assert.False(t, success)
 			assert.Error(t, err)
 
-			resp, err := r.KillJob(job.JobKey())
+			_, err = r.KillJob(job.JobKey())
 			assert.NoError(t, err)
-
-			assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
-
 		}()
 	}
 
@@ -650,14 +663,20 @@ func TestRealisClient_SessionThreadSafety(t *testing.T) {
 }
 
 // Test setting and getting the quota
-func TestRealisClient_SetQuota(t *testing.T) {
-	var cpu = 3.5
-	var ram int64 = 20480
-	var disk int64 = 10240
-	resp, err := r.SetQuota("vagrant", &cpu, &ram, &disk)
-	assert.NoError(t, err)
-	assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
-	t.Run("TestRealisClient_GetQuota", func(t *testing.T) {
+func TestRealisClient_Quota(t *testing.T) {
+	var resp *aurora.Response
+	var err error
+
+	cpu := 3.5
+	ram := int64(20480)
+	disk := int64(10240)
+
+	t.Run("Set", func(t *testing.T) {
+		resp, err = r.SetQuota("vagrant", &cpu, &ram, &disk)
+		assert.NoError(t, err)
+	})
+
+	t.Run("Get", func(t *testing.T) {
 		// Test GetQuota based on previously set values
 		var result *aurora.GetQuotaResult_
 		resp, err = r.GetQuota("vagrant")
@@ -665,8 +684,8 @@ func TestRealisClient_SetQuota(t *testing.T) {
 			result = resp.GetResult_().GetQuotaResult_
 		}
 		assert.NoError(t, err)
-		assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
-		for res := range result.Quota.GetResources() {
+
+		for _, res := range result.Quota.GetResources() {
 			switch true {
 			case res.DiskMb != nil:
 				assert.Equal(t, disk, *res.DiskMb)
@@ -679,7 +698,6 @@ func TestRealisClient_SetQuota(t *testing.T) {
 				break
 			}
 		}
-		fmt.Print("GetQuota Result", result.String())
 	})
 }
 
@@ -694,15 +712,13 @@ func TestRealisClient_ForceExplicitTaskReconciliation(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Custom batch value
-	var batchSize int32 = 32
-	err = r.ForceExplicitTaskReconciliation(&batchSize)
+	err = r.ForceExplicitTaskReconciliation(thrift.Int32Ptr(32))
 	assert.NoError(t, err)
 }
 
 func TestRealisClient_PartitionPolicy(t *testing.T) {
 
 	role := "vagrant"
-	var partitionDelay int64 = 30
 	job := realis.NewJob().
 		Environment("prod").
 		Role(role).
@@ -714,14 +730,13 @@ func TestRealisClient_PartitionPolicy(t *testing.T) {
 		Disk(100).
 		IsService(true).
 		InstanceCount(2).
-		PartitionPolicy(&aurora.PartitionPolicy{Reschedule: true, DelaySecs: &partitionDelay})
+		PartitionPolicy(&aurora.PartitionPolicy{Reschedule: true, DelaySecs: thrift.Int64Ptr(30)})
 
 	settings := realis.NewUpdateSettings()
 	settings.UpdateGroupSize = 2
-	resp, result, err := r.CreateService(job, settings)
-	assert.NoError(t, err)
 
-	assert.Equal(t, aurora.ResponseCode_OK, resp.ResponseCode)
+	_, result, err := r.CreateService(job, settings)
+	assert.NoError(t, err)
 
 	var ok bool
 	var mErr error
@@ -729,10 +744,9 @@ func TestRealisClient_PartitionPolicy(t *testing.T) {
 	if ok, mErr = monitor.JobUpdate(*result.GetKey(), 5, 180); !ok || mErr != nil {
 		// Update may already be in a terminal state so don't check for error
 		_, err := r.AbortJobUpdate(*result.GetKey(), "Monitor timed out.")
-
-		_, err = r.KillJob(job.JobKey())
-
 		assert.NoError(t, err)
 	}
 
+	// Clean up after finishing test
+	_, err = r.KillJob(job.JobKey())
 }
diff --git a/retry.go b/retry.go
index e442ee3..68b13cf 100644
--- a/retry.go
+++ b/retry.go
@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"time"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/paypal/gorealis/gen-go/apache/aurora"
 	"github.com/paypal/gorealis/response"
 	"github.com/pkg/errors"
diff --git a/runTestsMac.sh b/runTestsMac.sh
index fcc17b1..77977bd 100755
--- a/runTestsMac.sh
+++ b/runTestsMac.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Since we run our docker compose setup in bridge mode to be able to run on MacOS, we have to launch a Docker container within the bridge network in order to avoid any routing issues.
-docker run -t -v $(pwd):/go/src/github.com/paypal/gorealis --network gorealis_aurora_cluster golang:1.10.3-stretch  go test -v github.com/paypal/gorealis
+docker run -t -v $(pwd):/go/src/github.com/paypal/gorealis --network gorealis_aurora_cluster golang:1.10.3-stretch  go test -v github.com/paypal/gorealis $@
diff --git a/updatejob.go b/updatejob.go
index f7ef2fb..0319d8d 100644
--- a/updatejob.go
+++ b/updatejob.go
@@ -35,7 +35,7 @@ func NewDefaultUpdateJob(config *aurora.TaskConfig) *UpdateJob {
 	job.jobConfig.TaskConfig = config
 
 	// Rebuild resource map from TaskConfig
-	for ptr := range config.Resources {
+	for _, ptr := range config.Resources {
 		if ptr.NumCpus != nil {
 			job.resources[CPU].NumCpus = ptr.NumCpus
 			continue // Guard against Union violations that Go won't enforce
@@ -50,10 +50,14 @@ func NewDefaultUpdateJob(config *aurora.TaskConfig) *UpdateJob {
 			job.resources[DISK].DiskMb = ptr.DiskMb
 			continue
 		}
+
+		if ptr.NumGpus != nil {
+			job.resources[GPU] = &aurora.Resource{NumGpus: ptr.NumGpus}
+			continue
+		}
 	}
 
 	// Mirrors defaults set by Pystachio
-	req.Settings.UpdateOnlyTheseInstances = make(map[*aurora.Range]bool)
 	req.Settings.UpdateGroupSize = 1
 	req.Settings.WaitForBatchCompletion = false
 	req.Settings.MinWaitInInstanceRunningMs = 45000
@@ -75,7 +79,7 @@ func NewUpdateJob(config *aurora.TaskConfig, settings *aurora.JobUpdateSettings)
 	job.jobConfig.TaskConfig = config
 
 	// Rebuild resource map from TaskConfig
-	for ptr := range config.Resources {
+	for _, ptr := range config.Resources {
 		if ptr.NumCpus != nil {
 			job.resources[CPU].NumCpus = ptr.NumCpus
 			continue // Guard against Union violations that Go won't enforce
@@ -147,7 +151,6 @@ func NewUpdateSettings() *aurora.JobUpdateSettings {
 
 	us := new(aurora.JobUpdateSettings)
 	// Mirrors defaults set by Pystachio
-	us.UpdateOnlyTheseInstances = make(map[*aurora.Range]bool)
 	us.UpdateGroupSize = 1
 	us.WaitForBatchCompletion = false
 	us.MinWaitInInstanceRunningMs = 45000
diff --git a/util.go b/util.go
new file mode 100644
index 0000000..324b12f
--- /dev/null
+++ b/util.go
@@ -0,0 +1,75 @@
+package realis
+
+import (
+	"net/url"
+	"strings"
+
+	"github.com/paypal/gorealis/gen-go/apache/aurora"
+	"github.com/pkg/errors"
+)
+
+var ActiveStates = make(map[aurora.ScheduleStatus]bool)
+var SlaveAssignedStates = make(map[aurora.ScheduleStatus]bool)
+var LiveStates = make(map[aurora.ScheduleStatus]bool)
+var TerminalStates = make(map[aurora.ScheduleStatus]bool)
+var ActiveJobUpdateStates = make(map[aurora.JobUpdateStatus]bool)
+var AwaitingPulseJobUpdateStates = make(map[aurora.JobUpdateStatus]bool)
+
+func init() {
+	for _, status := range aurora.ACTIVE_STATES {
+		ActiveStates[status] = true
+	}
+
+	for _, status := range aurora.SLAVE_ASSIGNED_STATES {
+		SlaveAssignedStates[status] = true
+	}
+
+	for _, status := range aurora.LIVE_STATES {
+		LiveStates[status] = true
+	}
+
+	for _, status := range aurora.TERMINAL_STATES {
+		TerminalStates[status] = true
+	}
+
+	for _, status := range aurora.ACTIVE_JOB_UPDATE_STATES {
+		ActiveJobUpdateStates[status] = true
+	}
+	for _, status := range aurora.AWAITNG_PULSE_JOB_UPDATE_STATES {
+		AwaitingPulseJobUpdateStates[status] = true
+	}
+}
+
+func validateAndPopulateAuroraURL(urlStr string) (string, error) {
+
+	// If no protocol defined, assume http
+	if !strings.Contains(urlStr, "://") {
+		urlStr = "http://" + urlStr
+	}
+
+	u, err := url.Parse(urlStr)
+
+	if err != nil {
+		return "", errors.Wrap(err, "error parsing url")
+	}
+
+	// If no path provided assume /api
+	if u.Path == "" {
+		u.Path = "/api"
+	}
+
+	// If no port provided, assume default 8081
+	if u.Port() == "" {
+		u.Host = u.Host + ":8081"
+	}
+
+	if !(u.Scheme == "http" || u.Scheme == "https") {
+		return "", errors.Errorf("only protocols http and https are supported %v\n", u.Scheme)
+	}
+
+	if u.Path != "/api" {
+		return "", errors.Errorf("expected /api path %v\n", u.Path)
+	}
+
+	return u.String(), nil
+}
diff --git a/vendor/git.apache.org/thrift.git/.clang-format b/vendor/git.apache.org/thrift.git/.clang-format
deleted file mode 100644
index a62eef8..0000000
--- a/vendor/git.apache.org/thrift.git/.clang-format
+++ /dev/null
@@ -1,56 +0,0 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-ConstructorInitializerIndentWidth: 2
-AlignEscapedNewlinesLeft: false
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AlwaysBreakTemplateDeclarations: true
-AlwaysBreakBeforeMultilineStrings: true
-BreakBeforeBinaryOperators: true
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BinPackParameters: false
-ColumnLimit:     100
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-DerivePointerAlignment: false
-IndentCaseLabels: false
-IndentWrappedFunctionNames: false
-IndentFunctionDeclarationAfterType: false
-MaxEmptyLinesToKeep: 1
-KeepEmptyLinesAtTheStartOfBlocks: true
-NamespaceIndentation: None
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 190
-PenaltyBreakComment: 300
-PenaltyBreakString: 10000
-PenaltyBreakFirstLessLess: 120
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 1200
-PointerAlignment: Left
-SpacesBeforeTrailingComments: 1
-Cpp11BracedListStyle: true
-Standard:        Auto
-IndentWidth:     2
-TabWidth:        4
-UseTab:          Never
-BreakBeforeBraces: Attach
-SpacesInParentheses: false
-SpacesInAngles:  false
-SpaceInEmptyParentheses: false
-SpacesInCStyleCastParentheses: false
-SpacesInContainerLiterals: true
-SpaceBeforeAssignmentOperators: true
-ContinuationIndentWidth: 4
-CommentPragmas:  '^ IWYU pragma:'
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-SpaceBeforeParens: ControlStatements
-DisableFormat:   false
-...
-
diff --git a/vendor/git.apache.org/thrift.git/.dockerignore b/vendor/git.apache.org/thrift.git/.dockerignore
deleted file mode 100644
index 2d2ecd6..0000000
--- a/vendor/git.apache.org/thrift.git/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-.git/
diff --git a/vendor/git.apache.org/thrift.git/.editorconfig b/vendor/git.apache.org/thrift.git/.editorconfig
deleted file mode 100755
index 3611762..0000000
--- a/vendor/git.apache.org/thrift.git/.editorconfig
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements. See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership. The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License. You may obtain a copy of the License at
-##
-##   http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied. See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-#
-
-# EditorConfig: http://editorconfig.org
-# see doc/coding_standards.md
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-# ActionScript
-# [*.as]
-
-# C
-# [*.c]
-
-# C++
-[*.cpp]
-indent_style = space
-indent_size = 2
-
-# C-Sharp
-# [*.cs]
-
-# D
-# [*.d]
-
-# Erlang
-# [*.erl]
-
-# Go-lang
-[*.go]
-indent_style = tab
-indent_size = 8
-
-# C header files
-# [*.h]
-
-# Haskell
-# [*.hs]
-
-# Haxe
-# [*.hx]
-
-# Java
-# [*.java]
-
-# Javascript
-[*.js]
-indent_style = space
-indent_size = 2
-
-# JSON
-[*.json]
-indent_style = space
-indent_size = 2
-
-# Lua
-# [*.lua]
-
-[*.markdown]
-indent_style = space
-trim_trailing_whitespace = false
-
-[*.md]
-indent_style = space
-trim_trailing_whitespace = false
-
-# OCaml
-# [*.ml]
-
-# Delphi Pascal
-# [*.pas]
-
-# PHP
-# [*.php]
-
-# Perl
-# [*.pm]
-
-# Python
-# [*.py]
-
-# Ruby
-# [*.rb]
-
-# Typescript
-# [*.ts]
-
-# XML
-# [*.xml]
diff --git a/vendor/git.apache.org/thrift.git/.gitattributes b/vendor/git.apache.org/thrift.git/.gitattributes
deleted file mode 100644
index 176a458..0000000
--- a/vendor/git.apache.org/thrift.git/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* text=auto
diff --git a/vendor/git.apache.org/thrift.git/.gitignore b/vendor/git.apache.org/thrift.git/.gitignore
deleted file mode 100644
index 140c93b..0000000
--- a/vendor/git.apache.org/thrift.git/.gitignore
+++ /dev/null
@@ -1,326 +0,0 @@
-# generic ignores
-*.la
-*.lo
-*.o
-*.deps
-*.dirstamp
-*.libs
-*.log
-*.trs
-*.suo
-*.pyc
-*.cache
-*.user
-*.ipch
-*.sdf
-*.jar
-*.exe
-*.dll
-*_ReSharper*
-*.opensdf
-*.swp
-*.hi
-*~
-
-.*project
-junit*.properties
-.idea
-gen-*
-Makefile
-Makefile.in
-aclocal.m4
-acinclude.m4
-autom4te.cache
-cmake-*
-node_modules
-compile
-test-driver
-erl_crash.dump
-
-.sonar
-.DS_Store
-.svn
-.vagrant
-
-/contrib/.vagrant/
-/aclocal/libtool.m4
-/aclocal/lt*.m4
-/autoscan.log
-/autoscan-*.log
-/cmake_*
-/compiler/cpp/compiler.VC.db
-/compiler/cpp/compiler.VC.VC.opendb
-/compiler/cpp/test/plugin/t_cpp_generator.cc
-/compiler/cpp/src/thrift/plugin/plugin_constants.cpp
-/compiler/cpp/src/thrift/plugin/plugin_constants.h
-/compiler/cpp/src/thrift/plugin/plugin_types.cpp
-/compiler/cpp/src/thrift/plugin/plugin_types.h
-/compiler/cpp/test/*test
-/compiler/cpp/test/thrift-gen-*
-/compiler/cpp/src/thrift/thrift-bootstrap
-/compiler/cpp/src/thrift/plugin/gen.stamp
-/compiler/cpp/Debug
-/compiler/cpp/Release
-/compiler/cpp/src/thrift/libparse.a
-/compiler/cpp/src/thrift/thriftl.cc
-/compiler/cpp/src/thrift/thrifty.cc
-/compiler/cpp/src/thrift/thrifty.hh
-/compiler/cpp/src/thrift/windows/version.h
-/compiler/cpp/thrift
-/compiler/cpp/thriftl.cc
-/compiler/cpp/thrifty.cc
-/compiler/cpp/lex.yythriftl.cc
-/compiler/cpp/thrifty.h
-/compiler/cpp/thrifty.hh
-/compiler/cpp/src/thrift/version.h
-/config.*
-/configure
-/configure.lineno
-/configure.scan
-/contrib/fb303/config.cache
-/contrib/fb303/config.log
-/contrib/fb303/config.status
-/contrib/fb303/configure
-/contrib/fb303/cpp/libfb303.a
-/contrib/fb303/java/build/
-/contrib/fb303/py/build/
-/contrib/fb303/py/fb303/FacebookService-remote
-/contrib/fb303/py/fb303/FacebookService.py
-/contrib/fb303/py/fb303/__init__.py
-/contrib/fb303/py/fb303/constants.py
-/contrib/fb303/py/fb303/ttypes.py
-/depcomp
-/install-sh
-/lib/cpp/Debug/
-/lib/cpp/Debug-mt/
-/lib/cpp/Release/
-/lib/cpp/Release-mt/
-/lib/cpp/src/thrift/qt/moc_TQTcpServer.cpp
-/lib/cpp/src/thrift/qt/moc__TQTcpServer.cpp
-/lib/cpp/src/thrift/config.h
-/lib/cpp/src/thrift/stamp-h2
-/lib/cpp/test/Benchmark
-/lib/cpp/test/AllProtocolsTest
-/lib/cpp/test/DebugProtoTest
-/lib/cpp/test/DenseProtoTest
-/lib/cpp/test/EnumTest
-/lib/cpp/test/JSONProtoTest
-/lib/cpp/test/OptionalRequiredTest
-/lib/cpp/test/SecurityTest
-/lib/cpp/test/SpecializationTest
-/lib/cpp/test/ReflectionTest
-/lib/cpp/test/RecursiveTest
-/lib/cpp/test/TFDTransportTest
-/lib/cpp/test/TFileTransportTest
-/lib/cpp/test/TInterruptTest
-/lib/cpp/test/TNonblockingServerTest
-/lib/cpp/test/TPipedTransportTest
-/lib/cpp/test/TServerIntegrationTest
-/lib/cpp/test/TSocketInterruptTest
-/lib/cpp/test/TransportTest
-/lib/cpp/test/UnitTests
-/lib/cpp/test/ZlibTest
-/lib/cpp/test/OpenSSLManualInitTest
-/lib/cpp/test/concurrency_test
-/lib/cpp/test/link_test
-/lib/cpp/test/processor_test
-/lib/cpp/test/tests.xml
-/lib/cpp/concurrency_test
-/lib/cpp/*.pc
-/lib/cpp/x64/Debug/
-/lib/cpp/x64/Debug-mt/
-/lib/cpp/x64/Release
-/lib/cpp/x64/Release-mt
-/lib/c_glib/*.gcda
-/lib/c_glib/*.gcno
-/lib/c_glib/*.loT
-/lib/c_glib/src/thrift/config.h
-/lib/c_glib/src/thrift/stamp-h3
-/lib/c_glib/test/*.gcno
-/lib/c_glib/test/testwrapper.sh
-/lib/c_glib/test/testwrapper-test*
-/lib/c_glib/test/testapplicationexception
-/lib/c_glib/test/testbinaryprotocol
-/lib/c_glib/test/testcompactprotocol
-/lib/c_glib/test/testbufferedtransport
-/lib/c_glib/test/testcontainertest
-/lib/c_glib/test/testdebugproto
-/lib/c_glib/test/testfdtransport
-/lib/c_glib/test/testframedtransport
-/lib/c_glib/test/testmemorybuffer
-/lib/c_glib/test/testoptionalrequired
-/lib/c_glib/test/testsimpleserver
-/lib/c_glib/test/teststruct
-/lib/c_glib/test/testthrifttest
-/lib/c_glib/test/testthrifttestclient
-/lib/c_glib/test/testtransportsocket
-/lib/c_glib/test/testserialization
-/lib/c_glib/thriftc.pc
-/lib/c_glib/thrift_c_glib.pc
-/lib/csharp/**/bin/
-/lib/csharp/**/obj/
-/lib/csharp/src/packages
-/lib/d/test/*.pem
-/lib/d/libthriftd*.a
-/lib/d/test/async_test
-/lib/d/test/client_pool_test
-/lib/d/test/serialization_benchmark
-/lib/d/test/stress_test_server
-/lib/d/test/thrift_test_client
-/lib/d/test/thrift_test_server
-/lib/d/test/transport_test
-/lib/d/unittest/
-/lib/dart/coverage
-/lib/dart/**/.packages
-/lib/dart/**/packages
-/lib/dart/**/.pub/
-/lib/dart/**/pubspec.lock
-/lib/delphi/src/*.dcu
-/lib/delphi/test/*.identcache
-/lib/delphi/test/*.local
-/lib/delphi/test/*.dcu
-/lib/delphi/test/*.2007
-/lib/delphi/test/*.dproj
-/lib/delphi/test/*.dproj
-/lib/delphi/test/codegen/*.bat
-/lib/delphi/test/skip/*.local
-/lib/delphi/test/skip/*.identcache
-/lib/delphi/test/skip/*.identcache
-/lib/delphi/test/skip/*.dproj
-/lib/delphi/test/skip/*.dproj
-/lib/delphi/test/skip/*.2007
-/lib/delphi/test/serializer/*.identcache
-/lib/delphi/test/serializer/*.dproj
-/lib/delphi/test/serializer/*.local
-/lib/delphi/test/serializer/*.2007
-/lib/delphi/test/serializer/*.dcu
-/lib/delphi/test/multiplexed/*.dproj
-/lib/delphi/test/multiplexed/*.2007
-/lib/delphi/test/multiplexed/*.local
-/lib/delphi/test/multiplexed/*.identcache
-/lib/delphi/test/multiplexed/*.dcu
-/lib/delphi/test/typeregistry/*.2007
-/lib/delphi/test/typeregistry/*.dproj
-/lib/delphi/test/typeregistry/*.identcache
-/lib/delphi/test/typeregistry/*.local
-/lib/delphi/test/typeregistry/*.dcu
-/lib/erl/.generated
-/lib/erl/.eunit
-/lib/erl/ebin
-/lib/erl/deps/
-/lib/erl/src/thrift.app.src
-/lib/erl/test/*.hrl
-/lib/erl/test/*.beam
-/lib/haxe/test/bin
-/lib/hs/dist
-/lib/java/build
-/lib/js/test/build
-/lib/nodejs/coverage
-/lib/nodejs/node_modules/
-/lib/perl/MANIFEST
-/lib/perl/MYMETA.json
-/lib/perl/MYMETA.yml
-/lib/perl/Makefile-perl.mk
-/lib/perl/blib
-/lib/perl/pm_to_blib
-/lib/py/build
-/lib/py/thrift.egg-info/
-/lib/rb/Gemfile.lock
-/lib/rb/debug_proto_test
-/lib/rb/.config
-/lib/rb/ext/conftest.dSYM/
-/lib/rb/ext/mkmf.log
-/lib/rb/ext/thrift_native.bundle
-/lib/rb/ext/thrift_native.so
-/lib/rb/test/
-/lib/rb/thrift-*.gem
-/lib/php/src/ext/thrift_protocol/Makefile.*
-/lib/php/src/ext/thrift_protocol/build/
-/lib/php/src/ext/thrift_protocol/config.*
-/lib/php/src/ext/thrift_protocol/configure
-/lib/php/src/ext/thrift_protocol/configure.in
-/lib/php/src/ext/thrift_protocol/install-sh
-/lib/php/src/ext/thrift_protocol/libtool
-/lib/php/src/ext/thrift_protocol/ltmain.sh
-/lib/php/src/ext/thrift_protocol/missing
-/lib/php/src/ext/thrift_protocol/mkinstalldirs
-/lib/php/src/ext/thrift_protocol/modules/
-/lib/php/src/ext/thrift_protocol/php_thrift_protocol.lo
-/lib/php/src/ext/thrift_protocol/run-tests.php
-/lib/php/src/ext/thrift_protocol/thrift_protocol.la
-/lib/php/src/ext/thrift_protocol/tmp-php.ini
-/lib/php/src/packages/
-/lib/php/test/TEST-*.xml
-/lib/php/test/packages/
-/lib/py/dist/
-/lib/erl/logs/
-/lib/go/test/gopath/
-/lib/go/test/ThriftTest.thrift
-/libtool
-/ltmain.sh
-/missing
-/node_modules/
-/stamp-h1
-/test/features/results.json
-/test/results.json
-/test/c_glib/test_client
-/test/c_glib/test_server
-/test/cpp/StressTest
-/test/cpp/StressTestNonBlocking
-/test/cpp/TestClient
-/test/cpp/TestServer
-/test/dart/**/.packages
-/test/dart/**/packages
-/test/dart/**/.pub/
-/test/dart/**/pubspec.lock
-/test/log/
-/test/test.log
-/test/erl/.generated
-/test/erl/ebin
-/test/go/bin/
-/test/go/ThriftTest.thrift
-/test/go/gopath
-/test/go/pkg/
-/test/go/src/code.google.com/
-/test/go/src/github.com/golang/
-/test/go/src/gen/
-/test/go/src/thrift
-/test/haxe/bin
-/test/hs/TestClient
-/test/hs/TestServer
-/test/py.twisted/_trial_temp/
-/test/rb/Gemfile.lock
-/tutorial/cpp/TutorialClient
-/tutorial/cpp/TutorialServer
-/tutorial/c_glib/tutorial_client
-/tutorial/c_glib/tutorial_server
-/tutorial/csharp/CsharpServer/obj
-/tutorial/csharp/CsharpServer/bin
-/tutorial/csharp/CsharpClient/obj
-/tutorial/csharp/CsharpClient/bin
-/tutorial/d/async_client
-/tutorial/d/client
-/tutorial/d/server
-/tutorial/dart/**/.packages
-/tutorial/dart/**/packages
-/tutorial/dart/**/.pub/
-/tutorial/dart/**/pubspec.lock
-/tutorial/delphi/*.dsk
-/tutorial/delphi/*.local
-/tutorial/delphi/*.tvsconfig
-/tutorial/delphi/DelphiClient/dcu
-/tutorial/delphi/DelphiServer/dcu
-/tutorial/delphi/DelphiClient/*.local
-/tutorial/delphi/DelphiClient/*.identcache
-/tutorial/delphi/DelphiServer/*.identcache
-/tutorial/delphi/DelphiServer/*.local
-/tutorial/go/go-tutorial
-/tutorial/go/calculator-remote
-/tutorial/go/src/shared
-/tutorial/go/src/tutorial
-/tutorial/go/src/git.apache.org
-/tutorial/haxe/bin
-/tutorial/hs/dist/
-/tutorial/java/build/
-/tutorial/js/build/
-/ylwrap
diff --git a/vendor/git.apache.org/thrift.git/.travis.yml b/vendor/git.apache.org/thrift.git/.travis.yml
deleted file mode 100644
index 81a88c3..0000000
--- a/vendor/git.apache.org/thrift.git/.travis.yml
+++ /dev/null
@@ -1,199 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# build Apache Thrift on Travis CI - https://travis-ci.org/
-
-sudo: required
-dist: trusty
-
-services:
-  - docker
-
-install:
-  - (travis_wait ./build/docker/check_unmodified.sh $DISTRO && touch .unmodified) || true
-  - if [ ! -f .unmodified ]; then travis_retry travis_wait docker build -q -t thrift-build:$DISTRO build/docker/$DISTRO; fi
-
-script:
-  - docker run --net=host -e BUILD_LIBS="$BUILD_LIBS" $BUILD_ENV -v $(pwd):/thrift/src -it thrift-build:$DISTRO build/docker/scripts/$SCRIPT $BUILD_ARG
-
-env:
-  global:
-    - TEST_NAME=""
-    - SCRIPT="cmake.sh"
-    - BUILD_ARG=""
-    - BUILD_ENV="-e CC=clang -e CXX=clang++"
-    - DISTRO=ubuntu
-    - BUILD_LIBS="CPP C_GLIB HASKELL JAVA PYTHON TESTING TUTORIALS"  # only meaningful for CMake builds
-
-  matrix:
-    - TEST_NAME="Cross Language Tests (Binary and Header Protocols)"
-      SCRIPT="cross-test.sh"
-      BUILD_ARG="-'(binary|header)'"
-      BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4"
-
-    - TEST_NAME="Cross Language Tests (Debian) (Binary and Header Protocols)"
-      SCRIPT="cross-test.sh"
-      BUILD_ARG="-'(binary|header)'"
-      BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4"
-      DISTRO=debian
-
-    - TEST_NAME="Cross Language Tests (Compact and JSON Protocols)"
-      SCRIPT="cross-test.sh"
-      BUILD_ARG="-'(compact|json)'"
-      BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4"
-
-    - TEST_NAME="Cross Language Tests (Debian) (Compact and JSON Protocols)"
-      SCRIPT="cross-test.sh"
-      BUILD_ARG="-'(compact|json)'"
-      BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4"
-      DISTRO=debian
-
-    # TODO: Remove them once migrated to CMake
-    # Autotools builds
-    - TEST_NAME="C C++ C# D Erlang Haxe Go (automake)"
-      SCRIPT="autotools.sh"
-      BUILD_ARG="--without-dart --without-haskell --without-java --without-lua --without-nodejs --without-perl --without-php --without-php_extension --without-python --without-ruby"
-
-    - TEST_NAME="C C++ - GCC (automake)"
-      SCRIPT="autotools.sh"
-      BUILD_ARG="--without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php_extension --without-dart --without-ruby --without-haskell --without-go --without-haxe --without-d"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-
-    - TEST_NAME="Java Lua PHP Ruby Dart (automake)"
-      SCRIPT="autotools.sh"
-      BUILD_ARG="--without-cpp --without-haskell --without-c_glib --without-csharp --without-d --without-erlang --without-go --without-haxe --without-nodejs --without-python --without-perl"
-
-    # These are flaky (due to cabal and npm network/server failures) and also have lengthy output
-    - TEST_NAME="Haskell Node.js Python Perl (automake)"
-      SCRIPT="autotools.sh"
-      BUILD_ARG="--without-cpp --without-c_glib --without-csharp --without-d --without-dart --without-erlang --without-go --without-haxe --without-java --without-lua --without-php --without-php_extension --without-ruby"
-
-    # CMake build
-    - TEST_NAME="All"
-
-    - TEST_NAME="All (Debian)"
-      DISTRO=debian
-
-    - TEST_NAME="C C++ - GCC"
-      BUILD_LIBS="CPP C_GLIB TESTING TUTORIALS"
-      BUILD_ARG="-DWITH_PYTHON=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-
-    - TEST_NAME="C++ (Boost Thread)"
-      BUILD_LIBS="CPP TESTING TUTORIALS"
-      BUILD_ARG="-DWITH_BOOSTTHREADS=ON -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
-
-    - TEST_NAME="C++ (Boost Thread - GCC)"
-      BUILD_LIBS="CPP TESTING TUTORIALS"
-      BUILD_ARG="-DWITH_BOOSTTHREADS=ON -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-
-    - TEST_NAME="C++ (Std Thread)"
-      BUILD_LIBS="CPP TESTING TUTORIALS"
-      BUILD_ARG="-DWITH_STDTHREADS=ON -DCMAKE_CXX_FLAGS='-std=c++11' -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
-
-    - TEST_NAME="C++ (Std Thread - GCC)"
-      BUILD_LIBS="CPP TESTING TUTORIALS"
-      BUILD_ARG="-DWITH_STDTHREADS=ON -DCMAKE_CXX_FLAGS='-std=c++11' -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-
-    - TEST_NAME="Compiler (mingw)"
-      BUILD_LIBS=""
-      BUILD_ARG="-DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF"
-      BUILD_ENV=""
-
-    - TEST_NAME="All - GCC (CentOS)"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-      DISTRO=centos
-
-    - TEST_NAME="C C++ - Clang (CentOS)"
-      BUILD_LIBS="CPP C_GLIB TESTING TUTORIALS"
-      BUILD_ARG="-DWITH_PYTHON=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
-      DISTRO=centos
-
-    - TEST_NAME="Python 2.6 (CentOS 6)"
-      BUILD_LIBS="PYTHON TESTING TUTORIALS"
-      BUILD_ARG="-DWITH_PYTHON=ON -DWITH_CPP=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-      DISTRO=centos6
-
-    # Distribution
-    - TEST_NAME="make dist"
-      SCRIPT="make-dist.sh"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-
-    - TEST_NAME="Debian Packages"
-      SCRIPT="dpkg.sh"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-
-    - TEST_NAME="make dist (Debian)"
-      SCRIPT="make-dist.sh"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-      DISTRO=debian
-
-    - TEST_NAME="Debian Packages (Debian)"
-      SCRIPT="dpkg.sh"
-      BUILD_ENV="-e CC=gcc -e CXX=g++"
-      DISTRO=debian
-
-matrix:
-  include:
-    # QA jobs for code analytics and metrics
-    #
-    # C/C++ static code analysis with cppcheck
-    # add --error-exitcode=1 to --enable=all as soon as everything is fixed
-    #
-    # Python code style check with flake8
-    #
-    # search for TODO etc within source tree
-    # some statistics about the code base
-    # some info about the build machine
-    - env: TEST_NAME="cppcheck, flake8, TODO FIXME HACK, LoC and system info"
-      install:
-        - travis_retry sudo apt-get update
-        - travis_retry sudo apt-get install -ym cppcheck sloccount python-flake8
-      script:
-        # Compiler cppcheck (All)
-        - cppcheck --force --quiet --inline-suppr --enable=all -j2 compiler/cpp/src
-        # C++ cppcheck (All)
-        - cppcheck --force --quiet --inline-suppr --enable=all -j2 lib/cpp/src lib/cpp/test test/cpp tutorial/cpp
-        # C Glib cppcheck (All)
-        - cppcheck --force --quiet --inline-suppr --enable=all -j2 lib/c_glib/src lib/c_glib/test test/c_glib/src tutorial/c_glib
-        # Silent error checks
-        - cppcheck --force --quiet --inline-suppr --error-exitcode=1 -j2 compiler/cpp/src
-        - cppcheck --force --quiet --inline-suppr --error-exitcode=1 -j2 lib/cpp/src lib/cpp/test test/cpp tutorial/cpp
-        - cppcheck --force --quiet --inline-suppr --error-exitcode=1 -j2 lib/c_glib/src lib/c_glib/test test/c_glib/src tutorial/c_glib
-        # Python code style
-        - flake8 --ignore=E501 lib/py
-        - flake8 tutorial/py
-        - flake8 --ignore=E501 test/py
-        - flake8 test/py.twisted
-        - flake8 test/py.tornado
-        - flake8 --ignore=E501 test/test.py
-        - flake8 --ignore=E501 test/crossrunner
-        - flake8 test/features
-        # TODO etc
-        - grep -r TODO *
-        - grep -r FIXME *
-        - grep -r HACK *
-        # LoC
-        - sloccount .
-        # System Info
-        - dpkg -l
-        - uname -a
diff --git a/vendor/git.apache.org/thrift.git/CHANGES b/vendor/git.apache.org/thrift.git/CHANGES
deleted file mode 100644
index 7b674d6..0000000
--- a/vendor/git.apache.org/thrift.git/CHANGES
+++ /dev/null
@@ -1,2366 +0,0 @@
-Apache Thrift Changelog
-
-Thrift 0.10.0
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-1840] - Thrift Generated Code Causes Global Variable Leaks
-    * [THRIFT-1828] - moc_TQTcpServer.cpp was removed from source tree but is in thrift-0.9.0.tar.gz
-    * [THRIFT-1790] - cocoa: Duplicate interface definition error
-    * [THRIFT-1776] - TPipeServer should implement "listen", so that TServerEventHandler preServe will work right
-    * [THRIFT-1351] - Compiler does not care about binary strings
-    * [THRIFT-1229] - Python fastbinary.c can not handle unicode as generated python code
-    * [THRIFT-749] - C++ TBufferedTransports do not flush their buffers on delete
-    * [THRIFT-747] - C++ TSocket->close calls shutdown breaking forked parent process
-    * [THRIFT-732] - server exits abnormally when client calls send_xxx function without calling recv_xxx function
-    * [THRIFT-3942] - TSSLSocket does not honor send and receive timeouts
-    * [THRIFT-3941] - WinXP version of thrift_poll() relies on undefined behavior by passing a destructed variable to select()
-    * [THRIFT-3940] - Visual Studio project file for compiler is broken
-    * [THRIFT-3943] - Coverity Scan identified some high severity defects
-    * [THRIFT-3929] - PHP "nsglobal" Option Results in Syntax Error in Generated Code (Trailing Backslash)
-    * [THRIFT-3936] - Cannot compile 0.10.0 development tip with VS2013 and earlier (snprintf, uint32_t)
-    * [THRIFT-3935] - Incorrect skipping of map and set
-    * [THRIFT-3920] - Ruby: Ensuring that HTTP failures will clear the http transport outbuf var
-    * [THRIFT-3919] - C# TTLSServerSocket does not use clientTimeout
-    * [THRIFT-3917] - Check backports.ssl_match_hostname module version
-    * [THRIFT-3909] - Fix c_glib static lib CMake build
-    * [THRIFT-3904] - Typo in node tutorial leads to wrong transport being used
-    * [THRIFT-3848] - As an implementer of a perl socket server, I do not want to have to remember to ignore SIGCHLD for it to work properly
-    * [THRIFT-3844] - thrift_protocol cannot compile in 7.0.7
-    * [THRIFT-3843] - integer issues with Haxe PHP targets cause ZigZag encoding to fail
-    * [THRIFT-3842] - Dart generates incorrect code for a const struct
-    * [THRIFT-3841] - dart compact protocol incorrectly serializes/deserialized doubles
-    * [THRIFT-3708] - NameError: global name 'TProtocol' is not defined
-    * [THRIFT-3704] - "TConnectedClient died: Could not refill buffer" message shown when using HTTP Server
-    * [THRIFT-3678] - Fix javadoc errors on JDK 8
-    * [THRIFT-3014] - AppVeyor support
-    * [THRIFT-2994] - Node.js TJSONProtocol cannot be used for object serialization.
-    * [THRIFT-2974] - writeToParcel throws NPE for optional enum fields
-    * [THRIFT-2948] - Python TJSONProtocol doesn't handle structs with binary fields containing invalid unicode.
-    * [THRIFT-2845] - ChildService.Plo: No such file or directory
-    * [THRIFT-3276] - Binary data does not decode correctly using the TJSONProtocol when the base64 encoded data is padded.
-    * [THRIFT-3253] - Using latest version of D gives deprecation notices
-    * [THRIFT-2883] - TTwisted.py, during ConnectionLost processing: exceptions.RuntimeError: dictionary changed size during iteration
-    * [THRIFT-2019] - Writing on a disconnected socket on Mac causes SIG PIPE
-    * [THRIFT-2020] - Thrift library has some empty files that haven't really been deleted
-    * [THRIFT-2049] - Go compiler doesn't build on native Windows
-    * [THRIFT-2024] - TServer.cpp warns on 64-bit platforms about truncating an rlim_t into an int
-    * [THRIFT-2023] - gettimeofday implementation on Windows errors when no time zone is passed in.
-    * [THRIFT-2022] - CoB and dense code generation still uses TR1 bind, even though that doesn't work with clang
-    * [THRIFT-2027] - Minor 64-bit and NOMINMAX issues in C++ library
-    * [THRIFT-2156] - TServerSocket::listen() is throwing exceptions with misleading information
-    * [THRIFT-2154] - Missing <operator body
-    * [THRIFT-2148] - TNonblockingMultiFetchClient imports log4j
-    * [THRIFT-2103] - [python] Support for SSL certificates with Subject Alternative Names
-    * [THRIFT-1931] - Sending a frame size of zero to a TNonblockingServer causes an assertion failure
-    * [THRIFT-1751] - definition of increase_max_fds doesn't compile when HAVE_SYS_RESOURCE_H is not defined
-    * [THRIFT-1522] - TServerSocket potential memory leak with addrinfo *res0
-    * [THRIFT-1547] - Problems building against static libevent
-    * [THRIFT-1545] - Generated javascript code uses "for in" for looping over arrays
-    * [THRIFT-1487] - Namespace problem, compile fails on generated code
-    * [THRIFT-1472] - Configuration conflicts with boost platform include header
-    * [THRIFT-6] - Thrift libraries and compiler lack version number
-    * [THRIFT-1680] - make install requires GNU make
-    * [THRIFT-3869] - Dart Tutorial build fails with Error 65 at "pub get"
-    * [THRIFT-3861] - Travis CI builds are timing out - C++TServerIntegrationTest appears to be hanging
-    * [THRIFT-3855] - In the go simple server, if Stop() is called multiple times it hangs
-    * [THRIFT-3885] - PHP: Error when readI64 in TCompactProtocol
-    * [THRIFT-3883] - Go TestAllConnection can fail with port 9090 collision
-    * [THRIFT-3884] - Fix Erlang compact protocol double endianess and boolean list
-    * [THRIFT-3880] - Erlang Compact protocol - boolean values inverted
-    * [THRIFT-3879] - Undefined evaluation order causes incorrect processing in the C++ library JSON protocol
-    * [THRIFT-3851] - Golang thrift continually adds the x/thrift content type 
-    * [THRIFT-3850] - All apache builds are failing when initiated from a github pull request
-    * [THRIFT-3837] - Thift 0.9.3 can't be build with QuickCheck 2.8.2 and unordered-containers 0.2.6
-    * [THRIFT-3831] - build of test/cpp/src/TestClient.cpp fails with newer gcc on platforms with unsigned char due to narrowing conversions
-    * [THRIFT-3827] - php CompactProtocol readI64 function has bug, when value has 32bit ~64bit, Example：value=1461563457000 
-    * [THRIFT-3825] - Javascript test dependency is no longer available
-    * [THRIFT-3814] - Fix contention in TNonblockingServerTest
-    * [THRIFT-3793] - Appveyor builds reference an ant version that is no longer there
-    * [THRIFT-3786] - Node.js TLS emits 'connect' before connection is ready
-    * [THRIFT-3780] - Fix dart int64 usage when compiled to js
-    * [THRIFT-3789] - Node.js lacks ability to destroy connection
-    * [THRIFT-3796] - There's no --dbg for dh_strip, maybe someone has mistaken this for --dbg-package.
-    * [THRIFT-3795] - Generated hashValue method in Swift will overflow
-    * [THRIFT-3790] - Fix Delphi named pipe client to use timeout even when pipe doesn't yet exist
-    * [THRIFT-3787] - Node.js Connection object doesn't handle errors correctly
-    * [THRIFT-3791] - Delphi pipe client may fail even in a non-error condition
-    * [THRIFT-3771] - TBufferedTransport gets in invalid state on read/write errors
-    * [THRIFT-3764] - PHP "make install" does not install TMultiplexedProtocol.php nor TSimpleJSONProtocol.php
-    * [THRIFT-3768] - TThreadedServer may crash if it is destroyed immediately after it returns from serve(); TThreadedServer disconnects clients
-    * [THRIFT-3765] - memory leak in python compact protocol extension
-    * [THRIFT-3758] - TApplicationException::getType and TProtocolException::getType should be const
-    * [THRIFT-3763] - Fix serialization of i64 larger than 2^53 for browserify
-    * [THRIFT-3759] - required fields that are nil are silently ignored on write
-    * [THRIFT-3753] - TServerFramework::stop may fail to interrupt connected clients
-    * [THRIFT-3755] - TDebugProtocol::writeString hits assert in isprint on Windows with debug CRT
-    * [THRIFT-3751] - Compiler allows field ids that are too large for generated code
-    * [THRIFT-3748] - Node.js Deserialization of lists of lists is broken
-    * [THRIFT-3760] - Fix install paths etc of debian packages for py and perl
-    * [THRIFT-3757] - Fix various build warnings on Windows with VS2015 compiler
-    * [THRIFT-3750] - NSCopying copyWithZone: implementation does not check isSet
-    * [THRIFT-3747] - Duplicate node.js build on Travis-CI
-    * [THRIFT-3744] - The precision should be 17 (16 bits need after dot) after dot for double type.
-    * [THRIFT-3741] - haxe test is broken
-    * [THRIFT-3739] - Deprecation warning in codegen/base.d
-    * [THRIFT-3735] - JSON protocol left in incorrect state when an exception is thrown during read or write operations
-    * [THRIFT-3734] - To compare two string as lowercase.
-    * [THRIFT-3743] - Java JSON protocol left in incorrect state when an exception is thrown during read or write operations
-    * [THRIFT-3731] - Perl multiplex test is flaky
-    * [THRIFT-3729] - Restrict rake version
-    * [THRIFT-3727] - Incorrect require paths in Node.js tutorial
-    * [THRIFT-3723] - Fix Lua include path
-    * [THRIFT-3722] - Fix cert path in C++ cross tests for non-Linux platform
-    * [THRIFT-3726] - Fix incorrect conditional in TMultiplexedProcessor.py
-    * [THRIFT-3725] - Skip a flaky cross test entry (d-dart compact framed-ip)
-    * [THRIFT-3724] - Fix incorrect timeval conversion in libevent.d
-    * [THRIFT-3721] - CLONE - why not add unicode strings support to python directly?
-    * [THRIFT-3720] - TTcpSocketStreamImpl.Read() returns 0 if not all requested bytes could be read
-    * [THRIFT-3719] - Dart generator should use lowerCamelCase for service names
-    * [THRIFT-3902] - TSocket.open throws NullPointerException
-    * [THRIFT-3901] - TFramedTransport.open throws NullPointerException
-    * [THRIFT-3893] - Command injection in format_go_output
-    * [THRIFT-3807] - Swift compiler does not escape reserved words
-    * [THRIFT-3798] - THttpClient does not use proxy from http_proxy, https_proxy environment variables
-    * [THRIFT-3809] - wrong/unused BINARY type code
-    * [THRIFT-3806] - Swift generator does not handle self-referring structs
-    * [THRIFT-3805] - Golang server susceptible to memory spike from malformed message
-    * [THRIFT-3797] - Generated Delphi processor shouldn't error out on timed out exceptions
-    * [THRIFT-3813] - Appveyor builds reference an openssl version that is no longer there
-    * [THRIFT-3658] - Missing file in THRIFT-3599
-    * [THRIFT-3649] - Python TSaslClientTransport initializes TTransportException incorrectly
-    * [THRIFT-3650] - incorrect union serialization 
-    * [THRIFT-3713] - lib/d/test/thrift_test_runner.sh is flaky on Jenkins
-    * [THRIFT-3668] - range check error in compact protocol
-    * [THRIFT-3663] - CMake cpp test fails to build on system without zlib
-    * [THRIFT-3712] - TTornadoServer cannot handle IPv6 address
-    * [THRIFT-3710] - Dart generator does not camel case Constants class names
-    * [THRIFT-3697] - Dart generator does not name imports
-    * [THRIFT-3690] - Work around docker image build failures on Travis-CI
-    * [THRIFT-3689] - thrift_reconnecting_client start failed when server is not available
-    * [THRIFT-3695] - Fix D test scripts
-    * [THRIFT-3675] - Union is not serialized correctly by Thrift C Glib
-    * [THRIFT-3673] - API fails with std::exception after a timeout occured in earlier any API call
-    * [THRIFT-3709] - Comment syntax can produce broken code
-    * [THRIFT-3705] - Go map has incorrect types when used with forward-defined types
-    * [THRIFT-3702] - Fix cross tests for Dart compact protocol (3 failing)
-    * [THRIFT-3683] - BadYieldError in thrift py:tornado server
-    * [THRIFT-3682] - Do not reuse refused sockets in test scripts
-    * [THRIFT-3681] - Fix Dart tutorial build
-    * [THRIFT-3680] - Java async processor fails to notify errors to clients
-    * [THRIFT-3714] - Thrift.TProtocolException is not defined in js/src/thrift.js
-    * [THRIFT-3688] - Fix socket bind failure detection of cross test
-    * [THRIFT-3641] - Ruby client should try to connect to every result of getaddrinfo
-    * [THRIFT-3635] - D transport_test is flaky on Jenkins and Travis
-    * [THRIFT-3618] - Python TSSLSocket deprecation message should print caller's location
-    * [THRIFT-3145] - JSON protocol does not handle bool and empty containers correctly
-    * [THRIFT-3158] - TBase<T,F>#deepCopy should return T
-    * [THRIFT-3157] - TBase signature should be TBase<T extends TBase<T,F>, F extends TFieldIdEnum>
-    * [THRIFT-3156] - Node TLS: server executes processing logic two full times
-    * [THRIFT-3154] - tutorial/py.tornado throw EOF exception
-    * [THRIFT-3063] - C++ build -Wunused-parameter warnings on processor_test, TransportTest
-    * [THRIFT-3056] - Add string/collection length limits for Python protocol readers
-    * [THRIFT-3237] - Fix TNamedPipeServer::createNamedPipe memory leak
-    * [THRIFT-3233] - Fix C++ ThreadManager::Impl::removeWorker worker join
-    * [THRIFT-3232] - Cannot deserialize json messages created with fieldNamesAsString 
-    * [THRIFT-3206] - Fix Visual Studio build failure due 'pthread_self': identifier not found
-    * [THRIFT-3200] - JS and nodejs do not encode JSON protocol binary fields as base64
-    * [THRIFT-3199] - Exception field has basic metadata
-    * [THRIFT-3182] - TFramedTransport is in an invalid state after frame size exception
-    * [THRIFT-2536] - new TSocket, uninitialised value reported by valgrind
-    * [THRIFT-2527] - Apache Thrift IDL Compiler code generated for Node.js should be jshint clean
-    * [THRIFT-2519] - "processor" class is not being generated
-    * [THRIFT-2431] - TFileTransportTest fails with "check delta < XXX failed"
-    * [THRIFT-2708] - Erlang library does not support "oneway" message type
-    * [THRIFT-3377] - Deep copy is actually shallow when using typedef members
-    * [THRIFT-3376] - C# and Python JSON protocol double values lose precision
-    * [THRIFT-3373] - Various fixes for cross test servers and clients
-    * [THRIFT-3370] - errno extern variable redefined. Not compiling for Android
-    * [THRIFT-3379] -  Potential out of range panic in Go JSON protocols
-    * [THRIFT-3371] - Abstract namespace Unix domain sockets broken in C++
-    * [THRIFT-3380] - nodejs: 0.9.2 -> 0.9.3 upgrade breaks Protocol and Transport requires
-    * [THRIFT-3367] - Fix bad links to coding_standards.md #634 
-    * [THRIFT-3401] - Nested collections emit Objective-C code that cannot compile
-    * [THRIFT-3403] - JSON String reader doesn't recognize UTF-16 surrogate pairs
-    * [THRIFT-3362] - make check fails for C++ at the SecurityTest
-    * [THRIFT-3395] - Cocoa compiler produces corrupt code when boxing enums inside map.
-    * [THRIFT-3394] - compiler generates uncompilable code
-    * [THRIFT-3388] - hash doesn't work on set/list
-    * [THRIFT-3391] - Wrong bool formatting in test server
-    * [THRIFT-3390] - TTornado server doesn't handle closed connections properly
-    * [THRIFT-3382] - TBase class for C++ Library
-    * [THRIFT-3392] - Java TZlibTransport does not close its wrapper streams upon close()
-    * [THRIFT-3383] - i64 related warnings 
-    * [THRIFT-3386] - misc. warnings with make check
-    * [THRIFT-3385] - warning: format ‘%lu’ expects ‘long unsigned int’, but has type ‘std::basic_string<char>::size_type {aka unsigned int}
-    * [THRIFT-3355] - npm WARN package.json thrift@1.0.0-dev No license field.
-    * [THRIFT-3360] - Improve cross test servers and clients further
-    * [THRIFT-3359] - Binary field incompatibilities
-    * [THRIFT-3354] - Fix word-extraction substr bug in initialism code
-    * [THRIFT-3350] - Python JSON protocol does not encode binary as Base64
-    * [THRIFT-3577] - assertion failed at line 512 of testcontainertest.c
-    * [THRIFT-3576] - Boost test --log_format arg does not accept lowercase
-    * [THRIFT-3575] - Go compiler tries to use unexported library methods when using read_write_private
-    * [THRIFT-3574] - Cocoa generator makes uncompilable imports
-    * [THRIFT-3570] - Remove duplicate instances that are added by upstream
-    * [THRIFT-3571] - Make feature test result browsable
-    * [THRIFT-3569] - c_glib protocols do not check number of bytes read by transport
-    * [THRIFT-3568] - THeader server crashes on readSlow
-    * [THRIFT-3567] - GLib-GObject-CRITICAL **: g_object_unref: assertion 'G_IS_OBJECT (object)' failed
-    * [THRIFT-3566] - C++/Qt: TQTcpServerTest::test_communicate() is never executed
-    * [THRIFT-3564] - C++/Qt: potential core dump in TQTcpServer in case an exception occurs in TAsyncProcessor::process()
-    * [THRIFT-3558] - typos in c_glib tests
-    * [THRIFT-3559] - Fix awkward extra semi-colons with Cocoa container literals
-    * [THRIFT-3555] - 'configure' script does not honor --with-openssl=<path> for libcrypto for BN_init
-    * [THRIFT-3554] - Constant decls may lead to "Error: internal error: prepare_member_name_mapping() already active for different struct"
-    * [THRIFT-3552] - glib_c Memory Leak
-    * [THRIFT-3551] - Thrift perl library missing package declaration
-    * [THRIFT-3549] - Exceptions are not properly stringified in Perl library
-    * [THRIFT-3546] - NodeJS code should not be namespaced (and is currently not strict-mode compliant)
-    * [THRIFT-3545] - Container type literals do not compile
-    * [THRIFT-3538] - Remove UnboundMethodType in TProtocolDecorator
-    * [THRIFT-3536] - Error 'char' does not contain a definition for 'IsLowSurrogate' for WP7 target
-    * [THRIFT-3534] - Link error when building with Qt5
-    * [THRIFT-3533] - Can not send nil pointer as service method argument
-    * [THRIFT-3507] - THttpClient does not use proxy from http_proxy, https_proxy environment variables
-    * [THRIFT-3502] - C++ TServerSocket passes small buffer to getsockname
-    * [THRIFT-3501] - Forward slash in comment causes compiler error
-    * [THRIFT-3498] - C++ library assumes optional function pthread_attr_setschedpolicy is available
-    * [THRIFT-3497] - Build fails with "invalid use of incomplete type"
-    * [THRIFT-3496] - C++: Cob style client fails when sending a consecutive request
-    * [THRIFT-3493] - libthrift does not compile on windows using visual studio
-    * [THRIFT-3488] - warning: unused variable 'program'
-    * [THRIFT-3489] - warning: deprecated conversion from string constant to 'char*' [-Wwrite-strings]
-    * [THRIFT-3487] - Full support for newer Delphi versions
-    * [THRIFT-3528] - Fix warnings in thrift.ll
-    * [THRIFT-3527] - -gen py:dynamic,utf8strings ignores utf8strings option
-    * [THRIFT-3526] - Code generated by py:utf8strings does not work for Python3
-    * [THRIFT-3524] - dcc32 warning "W1000 Symbol 'IsLowSurrogate' is deprecated: 'Use TCharHelper'" in Thrift.Protocol.JSON.pas
-    * [THRIFT-3525] - py:dynamic fails to handle binary list/set/map element
-    * [THRIFT-3521] - TSimpleJSONProtocolTest is not deterministic (fails when run on JDK 8)
-    * [THRIFT-3520] - Dart TSocket onError stream should be typed as Object
-    * [THRIFT-3519] - fastbinary does not work with -gen py:utf8strings
-    * [THRIFT-3518] - TConcurrentClientSyncInfo files were missing for Visual Studio
-    * [THRIFT-3512] - c_glib: Build fails due to missing features.h
-    * [THRIFT-3483] - Incorrect empty binary handling introduced by THRIFT-3359
-    * [THRIFT-3479] - Oneway calls should not return exceptions to clients
-    * [THRIFT-3478] - Restore dropped method to THsHaServer.java
-    * [THRIFT-3477] - Parser fails on enum item that starts with 'E' letter and continues with number 
-    * [THRIFT-3476] - Missing include in ./src/thrift/protocol/TJSONProtocol.cpp
-    * [THRIFT-3474] - Docker: thrift-compiler
-    * [THRIFT-3473] - When "optional' is used with a struct member, C++ server seems to not return it correctly
-    * [THRIFT-3468] - Dart TSocketTransport onError handler is too restrictive
-    * [THRIFT-3451] - thrift_protocol PHP extension missing config.m4 file
-    * [THRIFT-3456] - rounding issue in static assert
-    * [THRIFT-3455] - struct write method's return value is incorrect
-    * [THRIFT-3454] - Python Tornado tutorial is broken
-    * [THRIFT-3463] - Java can't be disabled in CMake build
-    * [THRIFT-3450] - NPE when using SSL
-    * [THRIFT-3449] - TBaseAsyncProcessor fb.responseReady() never called for oneway functions
-    * [THRIFT-3471] - Dart generator does not handle uppercase argument names
-    * [THRIFT-3470] - Sporadic timeouts with pipes
-    * [THRIFT-3465] - Go Code With Complex Const Initializer Compilation Depends On Struct Order
-    * [THRIFT-3464] - Fix several defects in c_glib code generator
-    * [THRIFT-3462] - Cocoa generates Incorrect #import header names
-    * [THRIFT-3453] - remove rat_exclude
-    * [THRIFT-3418] - Use of ciphers in ssl.wrap_socket() breaks python 2.6 compatibility
-    * [THRIFT-3417] - "namespace xsd" is not really working
-    * [THRIFT-3413] - Thrift code generation bug in Go when extending service
-    * [THRIFT-3420] - C++: TSSLSockets are not interruptable
-    * [THRIFT-3415] - include unistd.h conditionally
-    * [THRIFT-3414] - #include <pwd.h> in THeaderTransport.h breaks windows build
-    * [THRIFT-3411] - Go generates remotes with wrong package qualifiers when including
-    * [THRIFT-3430] - Go THttpClient does not read HTTP response body to completion when closing
-    * [THRIFT-3423] - First call to thrift_transport:read_exact fails to dispatch correct function
-    * [THRIFT-3422] - Go TServerSocket doesn't close on Interrupt
-    * [THRIFT-3421] - rebar as dependency instead of bundling (was:  rebar fails if PWD contains Unicode)
-    * [THRIFT-3428] - Go test fails when running make check
-    * [THRIFT-3445] - Throwable messages are hidden from JVM stack trace output
-    * [THRIFT-3443] - Thrift include can generate uncompilable code
-    * [THRIFT-3444] - Large 64 bit Integer does not preserve value through Node.js JSONProtocol 
-    * [THRIFT-3436] - misc. cross test issues with UTF-8 path names
-    * [THRIFT-3435] - Put generated Java code for fullcamel tests in a separate package/namespace
-    * [THRIFT-3433] - Doubles aren't interpreted correctly
-    * [THRIFT-3437] - Mingw-w64 build fail
-    * [THRIFT-3434] - Dart generator produces empty name in pubspec.yaml for includes without namespaces
-    * [THRIFT-3408] - JSON generator emits incorrect types
-    * [THRIFT-3406] - Cocoa client should not schedule streams on main runloop
-    * [THRIFT-3404] - JSON String reader doesn't recognize UTF-16 surrogate pair
-    * [THRIFT-3636] - Double precision is not fully preserved in C++ TJSONProtocol
-    * [THRIFT-3632] - c_glib testserialization fails with glib assertion
-    * [THRIFT-3619] - Using Thrift 0.9.3 with googletest on Linux gcc 4.9 / C++11
-    * [THRIFT-3617] - CMake does not build gv/xml generators
-    * [THRIFT-3615] - Fix Python SSL client resource leak on connection failure
-    * [THRIFT-3616] - lib/py/test/test_sslsocket.py is flaky
-    * [THRIFT-3643] - Perl SSL server crushes if a client disconnect without handshake
-    * [THRIFT-3639] - C# Thrift library forces TLS 1.0, thwarting TLS 1.2 usage
-    * [THRIFT-3633] - Travis "C C++ - GCC" build was using clang
-    * [THRIFT-3634] - Fix Python TSocket resource leak on connection failure
-    * [THRIFT-3630] - Debian/Ubuntu install docs need an update
-    * [THRIFT-3629] - Parser sets exitcode on errors, but generator does not
-    * [THRIFT-3608] - lib/cpp/test/SecurityTest is flaky in jenkins Thrift-precommit build.
-    * [THRIFT-3601] - Better conformance to PEP8 for generated code
-    * [THRIFT-3599] - Validate client IP address against cert's SubjectAltName
-    * [THRIFT-3598] - TBufferedTransport doesn't instantiate client connection
-    * [THRIFT-3597] - `make check` hangs in go tests
-    * [THRIFT-3589] - Dart generator uses wrong name in constructor for uppercase arguments with defaults
-    * [THRIFT-3588] - Using TypeScript with --noImplicitAny fails
-    * [THRIFT-3584] - boolean false value cannot be transferred
-    * [THRIFT-3578] - Make THeaderTransport detect TCompact framed and unframed
-    * [THRIFT-3323] - Python library does not handle escaped forward slash ("/") in JSON
-    * [THRIFT-3322] - CMake generated "make check" failes on python_test
-    * [THRIFT-3321] - Thrift can't be added as a subdirectory of another CMake-based project
-    * [THRIFT-3314] - Dots in file names of includes causes dots in javascript variable names
-    * [THRIFT-3307] - Segfault in Ruby serializer
-    * [THRIFT-3309] - Missing TConstant.php in /lib/php/Makefile.am
-    * [THRIFT-3810] - unresolved external symbol public: virtual void __cdecl apache::thrift::server::TServerFramework::serve(void)
-    * [THRIFT-3736] - C++ library build fails if OpenSSL does not surrpot SSLv3
-    * [THRIFT-3878] - Compile error in TSSLSocket.cpp with new OpenSSL [CRYPTO_num_locks]
-    * [THRIFT-3949] - missing make dist entry for compiler/cpp/test
-    * [THRIFT-449] - The wire format of the JSON Protocol may not always be valid JSON if it contains non-UTF8 encoded strings
-    * [THRIFT-162] - Thrift structures are unhashable, preventing them from being used as set elements
-    * [THRIFT-3961] - TConnectedClient does not terminate the connection to the client if an exception while processing the received message occures.
-    * [THRIFT-3881] - Travis CI builds are failing due to docker failures (three retries, and gives up)
-    * [THRIFT-3937] - Cannot compile 0.10.0 development tip with gcc-4.6.x
-    * [THRIFT-3964] - Unsupported mechanism type ????? due to dependency on default OS-dependent charset
-    * [THRIFT-3038] - Use of volatile in cpp library
-    * [THRIFT-3301] - Java generated code uses imports that can lead to class name collisions with IDL defined types
-    * [THRIFT-3348] - PHP TCompactProtocol bool&int64 readvalue bug
-    * [THRIFT-3955] - TThreadedServer Memory Leak
-    * [THRIFT-3829] - Thrift does not install Python Libraries if Twisted is not installed
-    * [THRIFT-3932] - C++ ThreadManager has a rare termination race
-    * [THRIFT-3828] - cmake fails when Boost_INCLUDE_DIRS (and other variables passed to include_directories()) is empty 
-    * [THRIFT-3958] - CMake WITH_MT option for windows static runtime linking does not support the cmake build type RelWithDebInfo
-    * [THRIFT-3957] - TConnectedClient does not disconnect from clients when their timeout is reached.
-    * [THRIFT-3953] - TSSLSocket::close should handle exceptions from waitForEvent because it is called by the destructor.
-    * [THRIFT-3977] - PHP extension creates undefined values when deserializing sets
-    * [THRIFT-3947] - sockaddr type isn't always large enough for the return of getsockname
-    * [THRIFT-2755] - ThreadSanitizer reports data race in ThreadManager::Impl::addWorker
-    * [THRIFT-3948] - errno is not the correct method of getting the error in windows
-    * [THRIFT-4008] - broken ci due to upstream dependency versioning break
-    * [THRIFT-3999] - Fix Debian & Ubuntu package dependencies
-    * [THRIFT-3886] - PHP cross test client returns 0 even when failing
-    * [THRIFT-3997] - building thrift libs does not support new openssl
-
-## Documentation
-    * [THRIFT-3867] - Specify BinaryProtocol and CompactProtocol
-
-## Epic
-    * [THRIFT-3049] - As an iOS developer, I want a generator and library that produces Swift code
-    * [THRIFT-2336] - UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-
-## Improvement
-    * [THRIFT-1867] - Python client/server should support client-side certificates.
-    * [THRIFT-1313] - c_glib compact support
-    * [THRIFT-1385] - make install doesn't install java library in the setted folder
-    * [THRIFT-1437] - Update RPM spec
-    * [THRIFT-847] - Test Framework harmonization across all languages
-    * [THRIFT-819] - add Enumeration for protocol, transport and server types
-    * [THRIFT-3927] - Emit an error instead of throw an error in the async callback
-    * [THRIFT-3931] - TSimpleServer: If process request encounter UNKNOWN_METHOD, don't close transport.
-    * [THRIFT-3934] - Automatically resolve OpenSSL binary version on Windows CI
-    * [THRIFT-3918] - Run subset of make cross
-    * [THRIFT-3908] - Remove redundant dependencies from Dockerfile
-    * [THRIFT-3907] - Skip Docker image build on CI when unchanged
-    * [THRIFT-3868] - Java struct equals should do identity check before field comparison
-    * [THRIFT-3849] - Port Go serializer and deserializer to dart
-    * [THRIFT-2989] - Complete CMake build for Apache Thrift
-    * [THRIFT-2980] - ThriftMemoryBuffer doesn't have a constructor option to take an existing buffer
-    * [THRIFT-2856] - refactor erlang basic transports and unify interfaces
-    * [THRIFT-2877] - Optimize generated hashCode
-    * [THRIFT-2869] - JSON: run schema validation from tests
-    * [THRIFT-3112] - [Java] AsyncMethodCallback should be typed in generated AsyncIface
-    * [THRIFT-3263] - PHP jsonSerialize() should cast scalar types
-    * [THRIFT-2905] - Cocoa compiler should have option to produce "modern" Objective-C
-    * [THRIFT-2821] - Enable the use of custom HTTP-Header in the Transport
-    * [THRIFT-2093] - added the ability to set compression level in C++ zlib transport
-    * [THRIFT-2089] - Compiler ignores duplicate typenames
-    * [THRIFT-2056] - Moved all #include config.h statements to #include <thrift/config.h>
-    * [THRIFT-2031] - Make SO_KEEPALIVE configurable for C++ lib
-    * [THRIFT-2021] - Improve large binary protocol string performance
-    * [THRIFT-2028] - Cleanup threading headers / libraries
-    * [THRIFT-2014] - Change C++ lib includes to use <namespace/> style throughout
-    * [THRIFT-2312] - travis.yml: build everything
-    * [THRIFT-1915] - Multiplexing Services
-    * [THRIFT-1736] - Visual Studio top level project files within msvc
-    * [THRIFT-1735] - integrate tutorial into regular build
-    * [THRIFT-1533] - Make TTransport should be Closeable
-    * [THRIFT-35] - Move language tests into their appropriate library directory
-    * [THRIFT-1079] - Support i64 in AS3
-    * [THRIFT-1108] - SSL support for the Ruby library 
-    * [THRIFT-3856] - update debian package deependencies
-    * [THRIFT-3833] - haxe http server implementation (by embeding into php web server)
-    * [THRIFT-3839] - Performance issue with big message deserialization using php extension
-    * [THRIFT-3820] - Erlang: Detect OTP >= 18 to use new time correction
-    * [THRIFT-3816] - Reduce docker build duration on Travis-CI
-    * [THRIFT-3815] - Put appveyor dependency versions to one place
-    * [THRIFT-3788] - Compatibility improvements and Win64 support
-    * [THRIFT-3792] - Timeouts for anonymous pipes should be configurable
-    * [THRIFT-3794] - Split Delphi application, protocol and transport exception subtypes into separate exceptions
-    * [THRIFT-3774] - The generated code should have exception_names meta info
-    * [THRIFT-3762] - Fix build warnings for deprecated Thrift "byte" fields
-    * [THRIFT-3756] - Improve requiredness documentation
-    * [THRIFT-3761] - Add debian package for Python3
-    * [THRIFT-3742] - haxe php cli support
-    * [THRIFT-3733] - Socket timeout improvements
-    * [THRIFT-3728] - http transport for thrift-lua
-    * [THRIFT-3905] - Dart compiler does not initialize bool, int, and double properties
-    * [THRIFT-3911] - Loosen Ruby dev dependency version requirements
-    * [THRIFT-3906] - Run C# tests with make check
-    * [THRIFT-3900] - Add Python SSL flags
-    * [THRIFT-3897] - Provide meaningful exception type based on WebExceptionStatus in case of timeout
-    * [THRIFT-3808] - Missing `DOUBLE` in thrift type enumeration
-    * [THRIFT-3803] - Remove "file" attribute from XML generator
-    * [THRIFT-3660] - Add V4 mapped address to test client cert's altname
-    * [THRIFT-3661] - Use https to download meck in erlang test build
-    * [THRIFT-3659] - Check configure result of CMake on CI
-    * [THRIFT-3667] - Add TLS SNI support to clients
-    * [THRIFT-3651] - Make backports.match_hostname and ipaddress optional
-    * [THRIFT-3666] - Build D tutorial as part of Autotools build
-    * [THRIFT-3665] - Add D libevent and OpenSSL to docker images
-    * [THRIFT-3664] - Remove md5.c
-    * [THRIFT-3662] - Add Haskell to debian docker image
-    * [THRIFT-3711] - Add D to cross language test
-    * [THRIFT-3691] - Run flake8 Python style check on Travis-CI
-    * [THRIFT-3692] - (Re)enable Appveyor C++ and Python build
-    * [THRIFT-3677] - Improve CMake Java build
-    * [THRIFT-3679] - Add stdout log to testBinary in Java test server
-    * [THRIFT-3718] - Reduce size of docker image for build environment
-    * [THRIFT-3698] - [Travis-CI] Introduce retry to apt commands
-    * [THRIFT-3127] - switch -recurse to --recurse and reserve -r
-    * [THRIFT-3087] - Pass on errors like "connection closed"
-    * [THRIFT-3240] - Thrift Python client should support subjectAltName and wildcard certs in TSSLSocket
-    * [THRIFT-3213] - make cross should indicate when it skips a known failing test
-    * [THRIFT-3208] - Fix Visual Studio solution build failure due to missing source
-    * [THRIFT-3186] - Add TServerHTTP to Go library
-    * [THRIFT-2342] - Add __FILE__ and __LINE__ to Thrift C++ excpetions
-    * [THRIFT-3372] - Add dart generator to Visual Studio project
-    * [THRIFT-3366] - ThriftTest to implement standard return values 
-    * [THRIFT-3402] - Provide a perl Unix Socket implementation
-    * [THRIFT-3361] - Improve C# library
-    * [THRIFT-3393] - Introduce i8 to provide consistent set of Thrift IDL integer types
-    * [THRIFT-3339] - Support for database/sql
-    * [THRIFT-3565] - C++: T[Async]Processor::getEventHandler() should be declared as const member functions
-    * [THRIFT-3563] - C++/Qt: removed usage of macro QT_PREPEND_NAMESPACE as it isn't consequently used for all references to Qt types.
-    * [THRIFT-3562] - Removed unused TAsyncProcessor::getAsyncServer()
-    * [THRIFT-3561] - C++/Qt: make use of Q_DISABLE_COPY() to get rid of copy ctor and assignment operator
-    * [THRIFT-3556] - c_glib file descriptor transport
-    * [THRIFT-3544] - Make cross test fail when server process died unexpectedly
-    * [THRIFT-3540] - Make python tutorial more in line with PEP8
-    * [THRIFT-3535] - Dart generator argument to produce a file structure usable in parent library
-    * [THRIFT-3505] - Enhance Python TSSLSocket
-    * [THRIFT-3506] - Eliminate old style classes from library code
-    * [THRIFT-3503] - Enable py:utf8string by default
-    * [THRIFT-3499] - Add package_prefix to python generator
-    * [THRIFT-3495] - Minor enhancements and fixes for cross test
-    * [THRIFT-3486] - Java generated `getFieldValue` is incompatible with `setFieldValue` for binary values.
-    * [THRIFT-3484] - Consolidate temporary buffers in Java's TCompactProtocol
-    * [THRIFT-3516] - Add feature test for THeader TBinaryProtocol interop
-    * [THRIFT-3515] - Python 2.6 compatibility and test on CI
-    * [THRIFT-3514] - PHP 7 compatible version of binary protocol
-    * [THRIFT-3469] - Docker: Debian support
-    * [THRIFT-3416] - Retire old "xxx_namespace" declarations from the IDL
-    * [THRIFT-3426] - Align autogen comment in XSD
-    * [THRIFT-3424] - Add CMake android build option
-    * [THRIFT-3439] - Run make cross using Python3 when available
-    * [THRIFT-3440] - Python make check takes too much time
-    * [THRIFT-3441] - Stabilize Travis-CI builds
-    * [THRIFT-3431] - Avoid "schemes" HashMap lookups during struct reads/writes
-    * [THRIFT-3432] - Add a TByteBuffer transport to the Java library
-    * [THRIFT-3438] - Enable py:new_style by default
-    * [THRIFT-3405] - Go THttpClient misuses http.Client objects
-    * [THRIFT-3614] - Improve logging of test_sslsocket.py
-    * [THRIFT-3647] - Fix php extension build warnings
-    * [THRIFT-3642] - Speed up cross test runner
-    * [THRIFT-3637] - Implement compact protocol for dart
-    * [THRIFT-3613] - Port Python C extension to Python 3
-    * [THRIFT-3612] - Add Python C extension for compact protocol
-    * [THRIFT-3611] - Add --regex filter to cross test runner
-    * [THRIFT-3631] - JSON protocol implementation for Lua
-    * [THRIFT-3609] - Remove or replace TestPortFixture.h
-    * [THRIFT-3605] - Have the compiler complain about invalid arguments and options
-    * [THRIFT-3596] - Better conformance to PEP8
-    * [THRIFT-3585] - Compact protocol implementation for Lua
-    * [THRIFT-3582] - Erlang libraries should have service metadata
-    * [THRIFT-3579] - Introduce retry to make cross
-    * [THRIFT-3306] - Java: TBinaryProtocol: Use 1 temp buffer instead of allocating 8
-    * [THRIFT-3910] - Do not invoke pip as part of build process
-    * [THRIFT-1857] - Python 3.X Support
-    * [THRIFT-1944] - Binding to zero port
-    * [THRIFT-3954] - Enable the usage of structs called "Object" in Java
-    * [THRIFT-3981] - Enable analyzer strong mode in Dart library
-    * [THRIFT-3998] - Document ability to add custom tags to thrift structs
-    * [THRIFT-4006] - Add a removeEventListener method on TSocket
-
-## New Feature
-    * [THRIFT-640] - Support deprecation
-    * [THRIFT-948] - SSL socket support for PHP
-    * [THRIFT-764] - add Support for Vala language
-    * [THRIFT-3046] - Allow PSR4 class loading for generated classes (PHP)
-    * [THRIFT-2113] - Erlang SSL Socket Support
-    * [THRIFT-1482] - Unix domain socket support under PHP
-    * [THRIFT-519] - Support collections of types without having to explicitly define it
-    * [THRIFT-468] - Rack Middleware Application for Rails
-    * [THRIFT-1708] - Add event handlers for processor events
-    * [THRIFT-3834] - Erlang namespacing and exception metadata
-    * [THRIFT-2510] - Implement TNonblockingServer's ability to listen on unix domain sockets
-    * [THRIFT-3397] - Implement TProcessorFactory in C# to enable per-client processors
-    * [THRIFT-3523] - XML Generator
-    * [THRIFT-3510] - Add HttpTaskAsyncHandler implementation
-    * [THRIFT-3318] - PHP: SimpleJSONProtocol Implementation
-    * [THRIFT-3299] - Dart language bindings in Thrift
-    * [THRIFT-2835] - Add possibility to distribute generators separately from thrift core, and load them dynamically
-    * [THRIFT-184] - Add OSGi Manifest headers to the libthrift java library to be able to use Thrift in the OSGi runtime
-    * [THRIFT-141] - If a required field is not present on serialization, throw an exception
-    * [THRIFT-1891] - Add Windows ALPC transport which is right counterpart of Unix domain sockets
-
-## Question
-    * [THRIFT-1808] - The Thrift struct should be considered self-contained?
-    * [THRIFT-2895] - Tutorial cpp
-    * [THRIFT-3860] - Elephant-bird application Test fails for Thrift
-    * [THRIFT-3811] - HTTPS Support for C++ applications
-    * [THRIFT-3509] - "make check" error
-
-## Story
-    * [THRIFT-3452] - .travis.yml: Migrating from legacy to container-based infrastructure
-
-## Sub-task
-    * [THRIFT-1811] - ruby tutorial as part of the regular build
-    * [THRIFT-2779] - PHP TJSONProtocol encode unicode into UCS-4LE which can't be parsed by other language bindings
-    * [THRIFT-2110] - Erlang: Support for Multiplexing Services on any Transport, Protocol and Server
-    * [THRIFT-3852] - A Travis-CI job fails with "write error"
-    * [THRIFT-3740] - Fix haxelib.json classpath 
-    * [THRIFT-3653] - incorrect union serialization
-    * [THRIFT-3652] - incorrect serialization of optionals
-    * [THRIFT-3655] - incorrect union serialization
-    * [THRIFT-3654] - incorrect serialization of optionals
-    * [THRIFT-3656] - incorrect serialization of optionals
-    * [THRIFT-3699] - Fix integer limit symbol includes in Python C extension
-    * [THRIFT-3693] - Fix include issue in C++ TSSLSocketInterruptTest on Windows
-    * [THRIFT-3694] - [Windows] Disable tests of a few servers that are not supported
-    * [THRIFT-3696] - Install pip to CentOS Docker images to fix Python builds
-    * [THRIFT-3638] - Fix haxelib.json
-    * [THRIFT-3251] - Add http transport for server to Go lib
-    * [THRIFT-2424] - Recursive Types
-    * [THRIFT-2423] - THeader
-    * [THRIFT-2413] - Python: UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-    * [THRIFT-2409] - Java: UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-    * [THRIFT-2412] - D: UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-    * [THRIFT-2411] - C++: UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-    * [THRIFT-2410] - JavaMe: UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-    * [THRIFT-2668] - TestSuite: detailed result on passed tests by feature
-    * [THRIFT-2659] - python Test Server fails when throwing TException
-    * [THRIFT-3398] - Add CMake build  for Haskell library and tests
-    * [THRIFT-3396] - DART: UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-    * [THRIFT-3364] -   Fix ruby binary field encoding in TJSONProtocol
-    * [THRIFT-3381] - Fix for misc. codegen issues with THRIFT-2905
-    * [THRIFT-3573] - No rule to make target `../../../test/c_glib/src/.deps/testthrifttest-thrift_test_handler.Po'.
-    * [THRIFT-3572] - "Unable to determine the behavior of a signed right shift"
-    * [THRIFT-3542] - Add length limit support to Java test server
-    * [THRIFT-3537] - Remove the (now obsolete) csharp:asyncctp flag 
-    * [THRIFT-3532] - Add configurable string and container read size limit to Python protocols
-    * [THRIFT-3531] - Create cross lang feature test for string and container read length limit
-    * [THRIFT-3482] - Haskell JSON protocol does not encode binary field as Base64
-    * [THRIFT-3425] - Minor fixes + simplification for CentOS Dockerfile
-    * [THRIFT-3442] - Run CMake tests on Appveyor
-    * [THRIFT-3409] - NodeJS binary field issues
-    * [THRIFT-3621] - Fix lib/cpp/test/SecurityTest.cpp to use ephemeral ports
-    * [THRIFT-3628] - Fix lib/cpp/test/TServerIntegrationTest.cpp to use ephemeral ports
-    * [THRIFT-3625] - Kill unused #include "TestPortFixture.h" in lib/cpp/test/TServerTransportTest.cpp.
-    * [THRIFT-3646] - Fix Python extension build warnings
-    * [THRIFT-3626] - Fix lib/cpp/test/TSocketInterruptTest.cpp to use ephemeral ports.
-    * [THRIFT-3624] - Fix lib/cpp/test/TServerSocketTest.cpp to use ephemeral ports
-    * [THRIFT-3623] - Fix Fix cpp/lib/test/TSSLSocketInterruptTest.cpp to use ephemeral ports
-    * [THRIFT-3592] - Add basic test client
-    * [THRIFT-3980] - add TExtendedBinaryProtocol.java
-
-## Task
-    * [THRIFT-1801] - Sync up TApplicationException codes across languages and thrift implementations
-    * [THRIFT-1259] - Automate versioning 
-
-## Test
-    * [THRIFT-3400] - Add Erlang to cross test
-    * [THRIFT-3504] - Fix FastbinaryTest.py
-
-## Wish
-    * [THRIFT-3923] - Maybe remove Aereo from the "Powered by" list
-    * [THRIFT-2149] - Add an option to disable the generation of default operators
-
-
-
-Thrift 0.9.3
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-2441] - Cannot shutdown TThreadedServer when clients are still connected
-    * [THRIFT-2465] - TBinaryProtocolT breaks if copied/moved
-    * [THRIFT-2474] - thrift.h causes a compile failure
-    * [THRIFT-2540] - Running configure from outside the source directory fails
-    * [THRIFT-2598] - Add check for minimum Go version to configure.ac
-    * [THRIFT-2647] - compiler-hs: don't decapitalize field names, do decapitalize argument bindings
-    * [THRIFT-2773] - Generated Java code for 'oneway' methods is incorrect.
-    * [THRIFT-2789] - TNonblockingServer leaks socket FD's under load
-    * [THRIFT-2682] - TThreadedServer leaks per-thread memory
-    * [THRIFT-2674] - JavaScript: declare Accept: and Content-Type: in request
-    * [THRIFT-3078] - TNonblockingServerSocket's logger is not named after TNonblockingServerSocket
-    * [THRIFT-3077] - C++ TFileTransport ignores return code from ftruncate
-    * [THRIFT-3067] - C++ cppcheck performance related warnings
-    * [THRIFT-3066] - C++ TDenseProtocol assert modifies instead of checks
-    * [THRIFT-3071] - bootstrap.sh on Ubuntu 12.04 (Precise) automake error
-    * [THRIFT-3069] - C++ TServerSocket leaks socket on fcntl get or set flags error
-    * [THRIFT-3079] - TNonblockingServerSocket's logger is not named after TNonblockingServerSocket
-    * [THRIFT-3080] - C++ TNonblockingServer connection leak while accept huge number connections.
-    * [THRIFT-3086] - C++ Valgrind Error Cleanup
-    * [THRIFT-3085] - thrift_reconnecting_client never try to reconnect
-    * [THRIFT-3123] - Missing include in compiler/cpp/src/main.h breaks build in some environments
-    * [THRIFT-3125] - Fix the list of exported headers in automake input
-    * [THRIFT-3126] - PHP JSON serializer converts empty or int-indexed maps to lists
-    * [THRIFT-3132] - Properly format date in Java @Generated annotations
-    * [THRIFT-3137] - Travis build hangs after failure
-    * [THRIFT-3138] - "make check" parallel execution is underministic
-    * [THRIFT-3139] - JS library test is flaky
-    * [THRIFT-3140] - ConcurrentModificationException is thrown by JavaScript test server
-    * [THRIFT-3124] - Some signed/unsigned warnings while building compiler
-    * [THRIFT-3128] - Go generated code produces name collisions between services
-    * [THRIFT-3146] - Graphviz generates function name collisions between services
-    * [THRIFT-3147] - Segfault while receiving data
-    * [THRIFT-3148] - Markdown links to coding_standards are dead
-    * [THRIFT-3090] - cmake build is broken on MacOSX
-    * [THRIFT-3097] - cmake targets unconditionally depend on optional libraries
-    * [THRIFT-3094] - master as of 2015-APR-13 fails -DBOOST_THREADS cmake build
-    * [THRIFT-3099] - cmake build is broken on FreeBSD
-    * [THRIFT-3089] - Assigning default ENUM values results in non-compilable java code if java namespace is not defined
-    * [THRIFT-3093] - mingw compile fixes for c++ library 0.9.2
-    * [THRIFT-3098] - Thrift does not pretty print binary typedefs the way it does binary fields
-    * [THRIFT-3091] - c_glib service method should return result from handler method
-    * [THRIFT-3088] - TThreadPoolServer with Sasl auth may leak CLOSE_WAIT socket
-    * [THRIFT-3109] - Cross test log file cannot be browsed when served in HTTP server
-    * [THRIFT-3113] - m4 C++11 macro issue
-    * [THRIFT-3105] - C++ libthriftnb library on Windows build failure
-    * [THRIFT-3115] - Uncompileable code due to name collision with predefined used types
-    * [THRIFT-3117] - Java TSSLTransportFactory can't load certificates within JAR archive
-    * [THRIFT-3102] - could not make check for Go Library
-    * [THRIFT-3120] - Minor spelling errors and an outdated URL
-    * [THRIFT-3121] - Librt does not exist on OS X
-    * [THRIFT-3152] - Compiler error on Mac OSX (missing #include <cstdlib>)
-    * [THRIFT-3162] - make fails for dmd 2.067
-    * [THRIFT-3164] - Thrift C++ library SSL socket by default allows for unsecure SSLv3 negotiation
-    * [THRIFT-3168] - Fix Maven POM
-    * [THRIFT-3170] - Initialism code in the Go compiler causes chaos
-    * [THRIFT-3169] - Do not export thrift.TestStruct and thrift.TestEnum in thrift Go library 
-    * [THRIFT-3191] - Perl compiler does not add support for unexpected exception handling
-    * [THRIFT-3178] - glib C does not compile
-    * [THRIFT-3189] - Perl ServerSocket should allow a specific interface to be listened to
-    * [THRIFT-3252] - Missing TConcurrentClientSyncInfo.h in cpp Makefile, so doesn't install
-    * [THRIFT-3255] - Thrift generator doesn't exclude 'package' keyword for thrift property names breaking java builds
-    * [THRIFT-3260] - multiple warnings in c_glib tutorial
-    * [THRIFT-3256] - Some D test timings are too aggressive for slow machines
-    * [THRIFT-3257] - warning: extra tokens at end of #endif directive
-    * [THRIFT-3184] - Thrift Go leaves file descriptors open
-    * [THRIFT-3203] - DOAP - please fix "Ocaml" => "OCaml"
-    * [THRIFT-3210] - (uncompileable) code generated for server events while are events not enabled
-    * [THRIFT-3215] - TJSONProtocol '(c++) uses "throw new" to throw exceptions instead of "throw"
-    * [THRIFT-3202] - Allow HSHAServer to configure min and max worker threads separately.
-    * [THRIFT-3205] - TCompactProtocol return a wrong error when the io.EOF happens
-    * [THRIFT-3209] - LGPL mentioned in license file
-    * [THRIFT-3197] - keepAliveTime is hard coded as 60 sec in TThreadPoolServer
-    * [THRIFT-3196] - Misspelling in lua TBinaryProtocol (stirctWrite => strictWrite)
-    * [THRIFT-3198] - Allow construction of TTransportFactory with a specified maxLength
-    * [THRIFT-3192] - Go import paths changed in 1.4, and expired June 1
-    * [THRIFT-3271] - Could not find or load main class configtest_ax_javac_and_java on some non-english systems
-    * [THRIFT-3273] - c_glib: Generated code tries to convert between function and void pointers
-    * [THRIFT-3264] - Fix Erlang 16 namespaced types
-    * [THRIFT-3270] - reusing TNonblockingServer::TConnection cause dirty TSocket
-    * [THRIFT-3267] - c_glib: "Critical" failure during unit tests
-    * [THRIFT-3277] - THttpClient leaks connections if it's used for multiple requests
-    * [THRIFT-3278] - NodeJS: Fix exception stack traces and names
-    * [THRIFT-3279] - Fix a bug in retry_max_delay (NodeJS)
-    * [THRIFT-3280] - Initialize retry variables on construction
-    * [THRIFT-3283] - c_glib: Tutorial server always exits with warning
-    * [THRIFT-3284] - c_glib: Empty service produces unused-variable warning
-    * [THRIFT-1925] - c_glib generated code does not compile
-    * [THRIFT-1849] - after transport->open() opens isOpen returns true and next open() goes thru when it shall not
-    * [THRIFT-1866] - java compiler generates non-compiling code with const's defined in a thrift when name includes non-identifier chars
-    * [THRIFT-1938] - FunctionRunner.h -- uses wrong path for Thread.h when installed
-    * [THRIFT-1844] - Password string not cleared
-    * [THRIFT-2004] - Thrift::Union violates :== method contract and crashes
-    * [THRIFT-2073] - Thrift C++ THttpClient error: cannot refill buffer
-    * [THRIFT-2127] - Autoconf scripting does not properly account for cross-compile
-    * [THRIFT-2180] - Integer types issues in Cocoa lib on ARM64
-    * [THRIFT-2189] - Go needs "isset" to fully support "union" type (and optionals)
-    * [THRIFT-2192] - autotools on Redhat based systems
-    * [THRIFT-2546] - cross language tests fails at 'TestMultiException' when using nodejs server
-    * [THRIFT-2547] - nodejs servers and clients fails to connect with cpp using compact protocol
-    * [THRIFT-2548] - Nodejs servers and clients does not work properly with  -ssl
-    * [THRIFT-1471] - toString() does not print ByteBuffer values when nested in a List
-    * [THRIFT-1201] - getaddrinfo resource leak
-    * [THRIFT-615] - TThreadPoolServer doesn't call task_done after pulling tasks from it's clients queue
-    * [THRIFT-162] - Thrift structures are unhashable, preventing them from being used as set elements
-    * [THRIFT-810] - Crashed client on TSocket::close under loads
-    * [THRIFT-557] - charset problem with file Autogenerated by Thrift
-    * [THRIFT-233] - IDL doesn't support negative hex literals
-    * [THRIFT-1649] - contrib/zeromq does not build in 0.8.0
-    * [THRIFT-1642] - Miscalculation lead to throw unexpected "TTransportException::TIMED_OUT"(or called "EAGAIN (timed out)") exception
-    * [THRIFT-1587] - TSocket::setRecvTimeout error
-    * [THRIFT-1248] - pointer subtraction in TMemoryBuffer relies on undefined behavior
-    * [THRIFT-1774] - Sasl Transport client would hang when trying to connect non-sasl transport server
-    * [THRIFT-1754] - RangeError in buffer handling
-    * [THRIFT-1618] - static structMap in FieldMetaData is not thread safe and can lead to deadlocks
-    * [THRIFT-2335] - thrift incompatibility with py:tornado as server, java as client
-    * [THRIFT-2803] - TCP_DEFER_ACCEPT not supported with domain sockets
-    * [THRIFT-2799] - Build Problem(s): ld: library not found for -l:libboost_unit_test_framework.a
-    * [THRIFT-2801] - C++ test suite compilation warnings
-    * [THRIFT-2802] - C++ tutorial compilation warnings
-    * [THRIFT-2795] - thrift_binary_protocol.c: 'dereferencing type-punned pointer will break strict-aliasing rules'
-    * [THRIFT-2817] - TSimpleJSONProtocol reads beyond end of message
-    * [THRIFT-2826] - html:standalone sometimes ignored
-    * [THRIFT-2829] - Support haxelib installation via github
-    * [THRIFT-2828] - slightly wrong help screen indent
-    * [THRIFT-2831] - Removes dead code in web_server.js introduced in THRIFT-2819
-    * [THRIFT-2823] - All JS-tests are failing when run with grunt test
-    * [THRIFT-2827] - Thrift 0.9.2 fails to compile on Yosemite due to tr1/functional include in ProcessorTest.cpp
-    * [THRIFT-2843] - Automake configure.ac has possible typo related to Java
-    * [THRIFT-2813] - multiple haxe library fixes/improvements
-    * [THRIFT-2825] - Supplying unicode to python Thrift client can cause next request arguments to get overwritten
-    * [THRIFT-2840] - Cabal file points to LICENSE file outside the path of the Haskell project.
-    * [THRIFT-2818] - Trailing commas in array
-    * [THRIFT-2830] - Clean up ant warnings in tutorial dir
-    * [THRIFT-2842] - Erlang thrift client has infinite timeout
-    * [THRIFT-2810] - Do not leave the underlying ServerSocket open if construction of TServerSocket fails
-    * [THRIFT-2812] - Go server adding redundant buffering layer
-    * [THRIFT-2839] - TFramedTransport read bug
-    * [THRIFT-2844] - Nodejs support broken when running under Browserify
-    * [THRIFT-2814] - args/result classes not found when no namespace is set
-    * [THRIFT-2847] - function IfValue() is a duplicate of System.StrUtils.IfThen
-    * [THRIFT-2848] - certain Delphi tests do not build if TypeRegistry is used
-    * [THRIFT-2854] - Go Struct writer and reader looses important error information
-    * [THRIFT-2858] - Enable header field case insensitive match in THttpServer
-    * [THRIFT-2857] - C# generator creates uncompilable code for struct constants
-    * [THRIFT-2860] - Delphi server closes connection on unexpected exceptions
-    * [THRIFT-2868] - Enhance error handling in the Go client 
-    * [THRIFT-2879] - TMemoryBuffer: using lua string in wrong way
-    * [THRIFT-2851] - Remove strange public Peek() from Go transports
-    * [THRIFT-2852] - Better Open/IsOpen/Close behavior for StreamTransport.
-    * [THRIFT-2871] - Missing semicolon in thrift.js
-    * [THRIFT-2872] - ThreadManager deadlock for task expiration
-    * [THRIFT-2881] - Handle errors from Accept() correctly
-    * [THRIFT-2849] - Spell errors reported by codespell tool
-    * [THRIFT-2870] - C++ TJSONProtocol using locale dependent formatting
-    * [THRIFT-2882] - Lua Generator: using string.len funtion to get struct(map,list,set) size
-    * [THRIFT-2864] - JSON generator missing from Visual Studio build project 
-    * [THRIFT-2878] - Go validation support of required fields
-    * [THRIFT-2873] - TPipe and TPipeServer don't compile on Windows with UNICODE enabled
-    * [THRIFT-2888] - import of <limits> is missing in JSON generator
-    * [THRIFT-2900] - Python THttpClient does not reset socket timeout on exception
-    * [THRIFT-2907] - 'ntohll' macro redefined
-    * [THRIFT-2884] - Map does not serialize correctly for JSON protocol in Go library
-    * [THRIFT-2887] - --with-openssl configure flag is ignored
-    * [THRIFT-2894] - PHP json serializer skips maps with int/bool keys
-    * [THRIFT-2904] - json_protocol_test.go fails
-    * [THRIFT-2906] - library not found for -l:libboost_unit_test_framework.a
-    * [THRIFT-2890] - binary data may lose bytes with JSON transport under specific circumstances
-    * [THRIFT-2891] - binary data may cause a failure with JSON transport under specific circumstances
-    * [THRIFT-2901] - Fix for generated TypeScript functions + indentation of JavaScript maps
-    * [THRIFT-2916] - make check fails for D language
-    * [THRIFT-2918] - Race condition in Python TProcessPoolServer test
-    * [THRIFT-2920] - Erlang Thrift test uses wrong IDL file
-    * [THRIFT-2922] - $TRIAL is used with Python tests but not tested accordingly
-    * [THRIFT-2912] - Autotool build for C++ Qt library is invalid
-    * [THRIFT-2914] - explicit dependency to Lua5.2 fails on some systems
-    * [THRIFT-2910] - libevent is not really optional
-    * [THRIFT-2911] - fix c++ version zeromq transport, the old version cannot work
-    * [THRIFT-2915] - Lua generator missing from Visual Studio build project
-    * [THRIFT-2917] - "make clean" breaks test/c_glib
-    * [THRIFT-2919] - Haxe test server timeout too large
-    * [THRIFT-2923] - JavaScript client assumes a message being written
-    * [THRIFT-2924] - TNonblockingServer crashes when user-provided event_base is used
-    * [THRIFT-2925] - CMake build does not work with OpenSSL nor anything installed in non-system location
-    * [THRIFT-2931] - Access to undeclared static property: Thrift\Protocol\TProtocol::$TBINARYPROTOCOLACCELERATED
-    * [THRIFT-2893] - CMake build fails with boost thread or std thread
-    * [THRIFT-2902] - Generated c_glib code does not compile with clang
-    * [THRIFT-2903] - Qt4 library built with CMake does not work
-    * [THRIFT-2942] - CSharp generate invalid code for property named read or write
-    * [THRIFT-2932] - Node.js Thrift connection libraries throw Exceptions into event emitter
-    * [THRIFT-2933] - v0.9.2: doubles encoded in node with compact protocol cannot be decoded by python
-    * [THRIFT-2934] - createServer signature mismatch
-    * [THRIFT-2981] - IDL with no namespace produces unparsable PHP
-    * [THRIFT-2999] - Addition of .gitattributes text auto in THRIFT-2724 causes modified files on checkout
-    * [THRIFT-2949] - typo in compiler/cpp/README.md
-    * [THRIFT-2957] - warning: source file %s is in a subdirectory, but option 'subdir-objects' is disabled
-    * [THRIFT-2953] - TNamedPipeServerTransport is not Stop()able
-    * [THRIFT-2962] - Docker Thrift env for development and testing
-    * [THRIFT-2971] - C++ test and tutorial parallel build is unstable
-    * [THRIFT-2972] - Missing backslash in lib/cpp/test/Makefile.am
-    * [THRIFT-2951] - Fix Erlang name conflict test
-    * [THRIFT-2955] - Using list of typedefs does not compile on Go
-    * [THRIFT-2960] - namespace regression for Ruby
-    * [THRIFT-2959] - nodejs: fix binary unit tests
-    * [THRIFT-2966] - nodejs: Fix bad references to TProtocolException and TProtocolExceptionType
-    * [THRIFT-2970] - grunt-jsdoc fails due to dependency issues
-    * [THRIFT-3001] - C# Equals fails for binary fields (byte[])
-    * [THRIFT-3003] - Missing LICENSE file prevents package from being installed
-    * [THRIFT-3008] - Node.js server does not fully support exception
-    * [THRIFT-3007] - Travis build is broken because of directory conflict
-    * [THRIFT-3009] - TSSLSocket does not use the correct hostname (breaks certificate checks)
-    * [THRIFT-3011] - C# test server testException() not implemented according to specs
-    * [THRIFT-3012] - Timing problems in NamedPipe implementation due to unnecessary open/close
-    * [THRIFT-3019] - Golang generator missing docstring for structs
-    * [THRIFT-3021] - Service remote tool does not import stub package with package prefix
-    * [THRIFT-3026] - TMultiplexedProcessor does not have a constructor
-    * [THRIFT-3028] - Regression caused by THRIFT-2180
-    * [THRIFT-3017] - order of map key/value types incorrect for one CTOR
-    * [THRIFT-3020] - Cannot compile thrift as C++03
-    * [THRIFT-3024] - User-Agent "BattleNet" used in some Thrift library files
-    * [THRIFT-3047] - Uneven calls to indent_up and indent_down in Cocoa generator
-    * [THRIFT-3048] - NodeJS decoding of I64 is inconsistent across protocols
-    * [THRIFT-3043] - go compiler generator uses non C++98 code
-    * [THRIFT-3044] - Docker README.md paths to Dockerfiles are incorrect
-    * [THRIFT-3040] - bower.json wrong "main" path
-    * [THRIFT-3051] - Go Thrift generator creates bad go code
-    * [THRIFT-3057] - Java compiler build is broken
-    * [THRIFT-3061] - C++ TSSLSocket shutdown delay/vulnerability
-    * [THRIFT-3062] - C++ TServerSocket invalid port number (over 999999) causes stack corruption
-    * [THRIFT-3065] - Update libthrift dependencies (slf4j, httpcore, httpclient)
-    * [THRIFT-3244] - TypeScript: fix namespace of included types
-    * [THRIFT-3246] - Reduce the number of trivial warnings in Windows C++ CMake builds
-    * [THRIFT-3224] - Fix TNamedPipeServer unpredictable behavior on accept
-    * [THRIFT-3230] - Python compiler generates wrong code if there is function throwing a typedef of exception with another namespace
-    * [THRIFT-3236] - MaxSkipDepth never checked
-    * [THRIFT-3239] - Limit recursion depth
-    * [THRIFT-3241] - fatal error: runtime: cannot map pages in arena address space
-    * [THRIFT-3242] - OSGi Import-Package directive is missing the Apache HTTP packages
-    * [THRIFT-3234] - Limit recursion depth
-    * [THRIFT-3222] - TypeScript: Generated Enums are quoted
-    * [THRIFT-3229] - unexpected Timeout exception when desired bytes are only partially available
-    * [THRIFT-3231] - CPP: Limit recursion depth to 64
-    * [THRIFT-3235] - Limit recursion depth
-    * [THRIFT-3175] - fastbinary.c python deserialize can cause huge allocations from garbage
-    * [THRIFT-3176] - Union incorrectly implements ==
-    * [THRIFT-3177] - Fails to run rake test
-    * [THRIFT-3180] - lua plugin: framed transport do not work
-    * [THRIFT-3179] - lua plugin cant connect to remote server because function l_socket_create_and_connect always bind socket to localhost
-    * [THRIFT-3248] - TypeScript: additional comma in method signature without parameters
-    * [THRIFT-3302] - Go JSON protocol should encode Thrift byte type as signed integer string
-    * [THRIFT-3297] - c_glib: an abstract base class is not generated
-    * [THRIFT-3294] - TZlibTransport for Java does not write data correctly
-    * [THRIFT-3296] - Go cross test does not conform to spec
-    * [THRIFT-3295] - C# library does not build on Mono 4.0.2.5 or later
-    * [THRIFT-3293] - JavaScript: null values turn into empty structs in constructor
-    * [THRIFT-3310] - lib/erl/README.md has incorrect formatting
-    * [THRIFT-3319] - CSharp tutorial will not build using the *.sln
-    * [THRIFT-3335] - Ruby server does not handle processor exception
-    * [THRIFT-3338] - Stray underscore in generated go when service name starts with "New"
-    * [THRIFT-3324] - Update Go Docs for pulling all packages
-    * [THRIFT-3345] - Clients blocked indefinitely when a java.lang.Error is thrown
-    * [THRIFT-3332] - make dist fails on clean build
-    * [THRIFT-3326] - Tests do not compile under *BSD
-    * [THRIFT-3334] - Markdown notation of protocol spec is malformed
-    * [THRIFT-3331] - warning: ‘etype’ may be used uninitialized in this function
-    * [THRIFT-3349] - Python server does not handle processor exception
-    * [THRIFT-3343] - Fix haskell README
-    * [THRIFT-3340] - Python: enable json tests again
-    * [THRIFT-3311] - Top level README.md has incorrect formmating
-    * [THRIFT-2936] - Minor memory leak in SSL
-    * [THRIFT-3290] - Using from in variable names causes the generated Python code to have errors
-    * [THRIFT-3225] - Fix TPipeServer unpredictable behavior on interrupt()
-    * [THRIFT-3354] - Fix word-extraction substr bug in initialism code
-    * [THRIFT-2006] - TBinaryProtocol message header call name length is not validated and can be used to core the server
-    * [THRIFT-3329] - C++ library unit tests don't compile against the new boost-1.59 unit test framework
-    * [THRIFT-2630] - windows7 64bit pc. ipv4 and ipv6 pc.can't use
-    * [THRIFT-3336] - Thrift generated streaming operators added in 0.9.2 cannot be overridden
-    * [THRIFT-2681] - Core of unwind_cleanup
-    * [THRIFT-3317] - cpp namespace org.apache issue appears in 0.9
-
-## Documentation
-    * [THRIFT-3286] - Apache Ant is a necessary dependency
-
-## Improvement
-    * [THRIFT-227] - Byte[] in collections aren't pretty printed like regular binary fields
-    * [THRIFT-2744] - Vagrantfile for Centos 6.5
-    * [THRIFT-2644] - Haxe support
-    * [THRIFT-2756] - register Media Type @ IANA
-    * [THRIFT-3076] - Compatibility with Haxe 3.2.0
-    * [THRIFT-3081] - C++ Consolidate client processing loops in TServers
-    * [THRIFT-3083] - C++ Consolidate server processing loops in TSimpleServer, TThreadedServer, TThreadPoolServer
-    * [THRIFT-3084] - C++ add concurrent client limit to threaded servers
-    * [THRIFT-3074] -     Add compiler/cpp/lex.yythriftl.cc to gitignore.
-    * [THRIFT-3134] - Remove use of deprecated "phantom.args"
-    * [THRIFT-3133] - Allow "make cross" and "make precross" to run without building all languages
-    * [THRIFT-3142] - Make JavaScript use downloaded libraries
-    * [THRIFT-3141] - Improve logging of JavaScript test
-    * [THRIFT-3144] - Proposal: make String representation of enums in generated go code less verbose
-    * [THRIFT-3130] - Remove the last vestiges of THRIFT_OVERLOAD_IF from THRIFT-1316
-    * [THRIFT-3131] - Consolidate suggested import path for go thrift library to git.apache.org in docs and code
-    * [THRIFT-3092] - Generated Haskell types should derive Generic
-    * [THRIFT-3110] -  Print error log after cross test failures on Travis
-    * [THRIFT-3114] - Using local temp variables to not pollute the global table
-    * [THRIFT-3106] - CMake summary should give more information why a library is set to off
-    * [THRIFT-3119] - Java's TThreadedSelectorServer has indistinguishable log messages in run()
-    * [THRIFT-3122] - Javascript struct constructor should properly initialize struct and container members from plain js arguments
-    * [THRIFT-3151] - Fix links to git-wip* - should be git.apache.org
-    * [THRIFT-3167] - Windows build from source instructions need to be revised
-    * [THRIFT-3155] - move contrib/mingw32-toolchain.cmake to build/cmake/
-    * [THRIFT-3160] - Make generated go enums implement TextMarshaller and TextUnmarshaller interfaces
-    * [THRIFT-3150] - Add an option to thrift go generator to make Read and Write methods private
-    * [THRIFT-3149] - Make ReadFieldN methods in generated Go code private
-    * [THRIFT-3172] - Add tutorial to Thrift web site
-    * [THRIFT-3214] - Add Erlang option for using maps instead of dicts
-    * [THRIFT-3201] - Capture github test artifacts for failed builds
-    * [THRIFT-3266] - c_glib: Multiple compiler warnings building unit tests
-    * [THRIFT-3285] - c_glib: Build library with all warnings enabled, no warnings generated
-    * [THRIFT-1954] - Allow for a separate connection timeout value 
-    * [THRIFT-2098] - Add support for Qt5+
-    * [THRIFT-2199] - Remove Dense protocol (was: move to Contrib)
-    * [THRIFT-406] - C++ Test suite cleanup
-    * [THRIFT-902] - socket and connect timeout in TSocket should be distinguished
-    * [THRIFT-388] - Use a separate wire format for async calls
-    * [THRIFT-727] - support native C++ language specific exception message
-    * [THRIFT-1784] - pep-3110 compliance for exception handling 
-    * [THRIFT-1025] - C++ ServerSocket should inherit from Socket with the necessary Ctor to listen on connections from a specific host
-    * [THRIFT-2269] - Can deploy libthrift-source.jar to maven center repository
-    * [THRIFT-2804] - Pull an interface out of TBaseAsyncProcessor
-    * [THRIFT-2806] - more whitespace fixups
-    * [THRIFT-2811] - Make remote socket address accessible
-    * [THRIFT-2809] - .gitignore update for compiler's visual project
-    * [THRIFT-2846] - Expose ciphers parameter from ssl.wrap_socket()
-    * [THRIFT-2859] - JSON generator: output complete descriptors
-    * [THRIFT-2861] - add buffered transport
-    * [THRIFT-2865] - Test case for Go: SeqId out of sequence
-    * [THRIFT-2866] - Go generator source code is hard to read and maintain
-    * [THRIFT-2880] - Read the network address from the listener if available.
-    * [THRIFT-2875] - Typo in TDenseProtocol.h comment
-    * [THRIFT-2874] - TBinaryProtocol  member variable "string_buf_" is never used.
-    * [THRIFT-2855] - Move contributing.md to the root of the repository
-    * [THRIFT-2862] - Enable RTTI and/or build macros for generated code
-    * [THRIFT-2876] -  Add test for THRIFT-2526 Assignment operators and copy constructors in c++ don't copy the __isset struct
-    * [THRIFT-2897] - Generate -isEqual: and -hash methods
-    * [THRIFT-2909] - Improve travis build
-    * [THRIFT-2921] - Make Erlang impl ready for OTP 18 release (dict/0 and set/0 are deprecated)
-    * [THRIFT-2928] - Rename the erlang test_server module
-    * [THRIFT-2940] - Allow installing Thrift from git as NPM module by providing package.json in top level directory
-    * [THRIFT-2937] - Allow setting a maximum frame size in TFramedTransport
-    * [THRIFT-2976] - nodejs: xhr and websocket support for browserify
-    * [THRIFT-2996] - Test for Haxe 3.1.3 or better 
-    * [THRIFT-2969] - nodejs: DRY up library tests
-    * [THRIFT-2973] - Update Haxe lib readme regarding Haxe 3.1.3
-    * [THRIFT-2952] - Improve handling of Server.Stop() 
-    * [THRIFT-2964] - nodejs: move protocols and transports into separate files
-    * [THRIFT-2963] - nodejs - add test coverage
-    * [THRIFT-3006] - Attach 'omitempty' json tag for optional fields in Go
-    * [THRIFT-3027] - Go compiler does not ensure common initialisms have consistent case
-    * [THRIFT-3030] - TThreadedServer: Property for number of clientThreads
-    * [THRIFT-3023] - Go compiler is a little overly conservative with names of attributes
-    * [THRIFT-3018] - Compact protocol for Delphi
-    * [THRIFT-3025] - Change pure Int constants into @enums (where possible)
-    * [THRIFT-3031] - migrate "shouldStop" flag to TServer
-    * [THRIFT-3022] - Compact protocol for Haxe
-    * [THRIFT-3041] - Generate asynchronous clients for Cocoa
-    * [THRIFT-3053] - Perl SSL Socket Support (Encryption)
-    * [THRIFT-3247] - Generate a C++ thread-safe client
-    * [THRIFT-3217] - Provide a little endian variant of the binary protocol in C++
-    * [THRIFT-3223] - TypeScript: Add initial support for Enum Maps
-    * [THRIFT-3220] - Option to suppress @Generated Annotation entirely
-    * [THRIFT-3300] - Reimplement TZlibTransport in Java using streams
-    * [THRIFT-3288] - c_glib: Build unit tests with all warnings enabled, no warnings generated
-    * [THRIFT-3347] - Improve cross test servers and clients
-    * [THRIFT-3342] - Improve ruby cross test client and server compatibility
-    * [THRIFT-2296] - Add C++ Base class for service
-    * [THRIFT-3337] - Add testBool method to cross tests
-    * [THRIFT-3303] - Disable concurrent cabal jobs on Travis to avoid GHC crash
-    * [THRIFT-2623] - Docker container for Thrift
-    * [THRIFT-3298] - thrift endian converters may conflict with other libraries
-    * [THRIFT-1559] - Provide memory pool for TBinaryProtocol to eliminate memory fragmentation
-    * [THRIFT-424] - Steal ProtocolBuffers' VarInt implementation for C++
-
-## New Feature
-    * [THRIFT-3070] - Add ability to set the LocalCertificateSelectionCallback
-    * [THRIFT-1909] - Java: Add compiler flag to use the "option pattern" for optional fields
-    * [THRIFT-2099] - Stop TThreadPoolServer with alive connections.
-    * [THRIFT-123] - implement TZlibTransport in Java
-    * [THRIFT-2368] - New option: reuse-objects for Java generator
-    * [THRIFT-2836] - Optionally generate C++11 MoveConstructible types
-    * [THRIFT-2824] - Flag to disable html escaping doctext
-    * [THRIFT-2819] - Add WebsSocket client to node.js
-    * [THRIFT-3050] - Client certificate authentication for non-http TLS in C#
-    * [THRIFT-3292] - Implement TZlibTransport in Go
-
-## Question
-    * [THRIFT-2583] - Thrift on xPC target (SpeedGoat)
-    * [THRIFT-2592] - thrift server using c_glib
-    * [THRIFT-2832] - c_glib: Handle string lists correctly
-    * [THRIFT-3136] - thrift installation problem on mac
-    * [THRIFT-3346] - c_glib: Tutorials example crashes saying Calculator.ping implementation returned FALSE but did not set an error
-
-## Sub-task
-    * [THRIFT-2578] - Moving 'make cross' from test.sh to test.py
-    * [THRIFT-2734] - Go coding standards
-    * [THRIFT-2748] - Add Vagrantfile for Centos 6.5
-    * [THRIFT-2753] - Misc. Haxe improvements
-    * [THRIFT-2640] - Compact Protocol in Cocoa
-    * [THRIFT-3262] - warning: overflow in implicit constant conversion in DenseProtoTest.cpp
-    * [THRIFT-3194] - Can't build with go enabled.  gomock SCC path incorrect.
-    * [THRIFT-3275] - c_glib tutorial warnings in generated code
-    * [THRIFT-1125] - Multiplexing support for the Ruby Library
-    * [THRIFT-2807] - PHP Code Style
-    * [THRIFT-2841] - Add comprehensive integration tests for the whole Go stack
-    * [THRIFT-2815] - Haxe: Support for Multiplexing Services on any Transport, Protocol and Server
-    * [THRIFT-2886] - Integrate binary type in standard Thrift cross test
-    * [THRIFT-2946] - Enhance usability of cross test framework
-    * [THRIFT-2967] - Add .editorconfig to root
-    * [THRIFT-3033] - Perl: Support for Multiplexing Services on any Transport, Protocol and Server
-    * [THRIFT-3174] - Initialism code in the Go compiler doesn't check first word
-    * [THRIFT-3193] - Option to supress date value in @Generated annotation
-    * [THRIFT-3305] - Missing dist files for 0.9.3 release candidate
-    * [THRIFT-3341] - Add testBool methods
-    * [THRIFT-3308] - Fix broken test cases for 0.9.3 release candidate
-
-## Task
-    * [THRIFT-2834] - Remove semi-colons from python code generator
-    * [THRIFT-2853] - Adjust comments not applying anymore after THRIFT-2852
-
-## Test
-    * [THRIFT-3211] - Add make cross support for php TCompactProtocol
-
-## Wish
-    * [THRIFT-2838] - TNonblockingServer can bind to port 0 (i.e., get an OS-assigned port) but there is no way to get the port number
-
-
-
-Thrift 0.9.2
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-2793] - Go compiler produces uncompilable code
-    * [THRIFT-1481] - Unix domain sockets in C++ do not support the abstract namespace
-    * [THRIFT-1455] - TBinaryProtocolT<Transport_>::writeString casts from size_t to uint32_t, which is not safe on 64-bit platforms
-    * [THRIFT-1579] - PHP Extention - function thrift_protocol_read_binary not working from TBinarySerializer::deserialize
-    * [THRIFT-1584] - Error: could not SetMinThreads in ThreadPool on single-core machines
-    * [THRIFT-1614] - Thrift build from svn repo sources fails with automake-1.12
-    * [THRIFT-1047] - rb_thrift_memory_buffer_write treats arg as string without check, segfaults if you pass non-string
-    * [THRIFT-1639] - Java/Python: Serialization/Deserialization of double type using CompactProtocol
-    * [THRIFT-1647] - NodeJS BufferedTransport does not work beyond the hello-world example
-    * [THRIFT-2130] - Thrift's D library/test: parts of "make check" code do not compile with recent dmd-2.062 through dmd-2.064alpha
-    * [THRIFT-2140] - Error compiling cpp tutorials
-    * [THRIFT-2139] - MSVC 2012 Error - Cannot compile due to BoostThreadFactory
-    * [THRIFT-2138] - pkgconfig file created with wrong include path
-    * [THRIFT-2160] - Warning in thrift.h when compiling with -Wunused and NDEBUG
-    * [THRIFT-2158] - Compact, JSON, and SimpleJSON protocols are not working correctly
-    * [THRIFT-2167] - nodejs lib throws error if options argument isn't passed
-    * [THRIFT-2288] - Go impl of Thrift JSON protocol wrongly writes/expects true/false for bools
-    * [THRIFT-2147] - Thrift IDL grammar allows for dotted identifier names
-    * [THRIFT-2145] - Rack and Thin are not just development dependencies
-    * [THRIFT-2267] - Should be able to choose socket family in Python TSocket
-    * [THRIFT-2276] - java path in spec file needs updating
-    * [THRIFT-2281] - Generated send/recv code ignores errors returned by the underlying protocol
-    * [THRIFT-2280] - TJSONProtocol.Flush() does not really flush the transport
-    * [THRIFT-2274] - TNonblockingServer and TThreadedSelectorServer do not close their channel selectors on exit and leak file descriptors
-    * [THRIFT-2265] - php library doesn't build
-    * [THRIFT-2232] - IsSet* broken in Go
-    * [THRIFT-2246] - Unset enum value is printed by ToString()
-    * [THRIFT-2240] - thrift.vim (contrib) does not correctly handle 'union'
-    * [THRIFT-2243] - TNonblockingServer in thrift crashes when TFramedTransport opens
-    * [THRIFT-2230] - Cannot Build on RHEL/Centos/Amazon Linux 6.x
-    * [THRIFT-2247] - Go generator doesn't deal well with map keys of type binary
-    * [THRIFT-2253] - Python Tornado TTornadoServer base class change
-    * [THRIFT-2261] - java: error: unmappable character for encoding ASCII
-    * [THRIFT-2259] - C#: unexpected null logDelegate() pointer causes AV in TServer.serve()
-    * [THRIFT-2225] - SSLContext destroy before cleanupOpenSSL
-    * [THRIFT-2224] - TSSLSocket.h and TSSLServerSocket.h should use the platfromsocket too
-    * [THRIFT-2229] - thrift failed to build on OSX 10.9 GM
-    * [THRIFT-2227] - Thrift compiler generates spurious warnings with Xlint
-    * [THRIFT-2219] - Thrift gem fails to build on OS X Mavericks with 1.9.3 rubies
-    * [THRIFT-2226] - TServerSocket - keepAlive wrong initialization order
-    * [THRIFT-2285] - TJsonProtocol implementation for Java doesn't allow a slash (/) to be escaped (\/)
-    * [THRIFT-2216] - Extraneous semicolon in TProtocolUtil.h makes clang mad
-    * [THRIFT-2215] - Generated HTML/Graphviz lists referenced enum identifiers as UNKNOWN.
-    * [THRIFT-2211] - Exception constructor does not contain namespace prefix.
-    * [THRIFT-2210] - lib/java TSimpleJSONProtocol can emit invalid JSON
-    * [THRIFT-2209] - Ruby generator -- please namespace classes
-    * [THRIFT-2202] - Delphi TServerImpl.DefaultLogDelegate may stop the server with I/O-Error 105
-    * [THRIFT-2201] - Ternary operator returns different types (build error for some compilers)
-    * [THRIFT-2200] - nested structs cause generate_fingerprint() to slow down at excessive CPU load
-    * [THRIFT-2197] - fix jar output directory in rpm spec file
-    * [THRIFT-2196] - Fix invalid dependency in Makefile.am
-    * [THRIFT-2194] - Node: Not actually prepending residual data in TFramedTransport.receiver
-    * [THRIFT-2193] - Java code generator emits spurious semicolon when deep copying binary data
-    * [THRIFT-2191] - Fix charp JSONProtocol.ReadJSONDouble (specify InvariantCulture)
-    * [THRIFT-2214] - System header sys/param.h is included inside the Thrift namespace
-    * [THRIFT-2178] - Thrift generator returns error exit code on --version
-    * [THRIFT-2171] - NodeJS implementation has extremely low test coverage
-    * [THRIFT-2183] - gem install fails on zsh
-    * [THRIFT-2182] - segfault in regression tests (GC bug in rb_thrift_memory_buffer_write)
-    * [THRIFT-2181] - oneway calls don't work in NodeJS
-    * [THRIFT-2169] - JavaME Thrift Library causes "java.io.IOException: No Response Entries Available" after using the Thrift client for some time
-    * [THRIFT-2168] - Node.js appears broken (at least, examples don't work as intended)
-    * [THRIFT-2293] - TSSLTransportFactory.createSSLContext() leaves files open
-    * [THRIFT-2279] - TSerializer only returns the first 1024 bytes serialized
-    * [THRIFT-2278] - Buffered transport doesn't support writes > buffer size
-    * [THRIFT-2275] - Fix memory leak in golang compact_protocol.
-    * [THRIFT-2282] - Incorect code generated for some typedefs
-    * [THRIFT-2009] - Go redeclaration error
-    * [THRIFT-1964] - 'Isset' causes problems with C#/.NET serializers
-    * [THRIFT-2026] - Fix TCompactProtocol 64 bit builds
-    * [THRIFT-2108] - Fix TAsyncClientManager timeout race
-    * [THRIFT-2068] - Multiple calls from same connection are not processed in node
-    * [THRIFT-1750] - Make compiler build cleanly under visual studio 10
-    * [THRIFT-1755] - Comment parsing bug
-    * [THRIFT-1771] - "make check" fails on x64 for libboost_unit_test_framework.a
-    * [THRIFT-1841] - NodeJS Thrift incorrectly parses non-UTF8-string types
-    * [THRIFT-1908] - Using php thrift_protocol accelerated transfer causes core dump
-    * [THRIFT-1892] - Socket timeouts are declared in milli-seconds, but are actually set in micro-seconds
-    * [THRIFT-2303] - TBufferredTransport not properly closing underlying transport
-    * [THRIFT-2313] - nodejs server crash after processing the first request when using MultiplexedProcessor/FramedBuffer/BinaryProtocol
-    * [THRIFT-2311] - Go: invalid code generated when exception name is a go keyword
-    * [THRIFT-2308] - node: TJSONProtocol parse error when reading from buffered message
-    * [THRIFT-2316] - ccp: TFileTransportTest
-    * [THRIFT-2352] - msvc failed to compile thrift tests
-    * [THRIFT-2337] - Golang does not report TIMED_OUT exceptions
-    * [THRIFT-2340] - Generated server implementation does not send response type EXCEPTION on the Thrift.TApplicationExceptionType.UNKNOWN_METHOD exception
-    * [THRIFT-2354] - Connection errors can lead to case_clause exceptions
-    * [THRIFT-2339] - Uncaught exception in thrift c# driver
-    * [THRIFT-2356] - c++ thrift client not working with ssl (SSL_connect hangs)
-    * [THRIFT-2331] - Missing call to ReadStructBegin() in TApplicationException.Read()
-    * [THRIFT-2323] - Uncompileable Delphi code generated for typedef'd structs
-    * [THRIFT-2322] - Correctly show the number of times ExecutorService (java) has rejected the client.
-    * [THRIFT-2389] - namespaces handled wrongly in acrionscript 3.0 implementation
-    * [THRIFT-2388] - GoLang - Fix data races in simple_server and server_socket
-    * [THRIFT-2386] - Thrift refuses to link yylex
-    * [THRIFT-2375] - Excessive <br>'s in generated HTML
-    * [THRIFT-2373] - warning CS0414 in THttpClient.cs: private field 'Thrift.Transport.THttpClient.connection' assigned but never used
-    * [THRIFT-2372] - thrift/json_protocol.go:160: function ends without a return statement
-    * [THRIFT-2371] - ruby bundler version fails on ~1.3.1, remove and take latest avail
-    * [THRIFT-2370] - Compiler SEGFAULTs generating HTML documentation for complex strucre
-    * [THRIFT-2384] - Binary map keys produce uncompilable code in go
-    * [THRIFT-2380] - unreachable code (CID 1174546, CID 1174679)
-    * [THRIFT-2378] - service method arguments of binary type lead to uncompileable Go code
-    * [THRIFT-2363] - Issue with character encoding of Success returned from Login using Thrift Proxy and NodeJS
-    * [THRIFT-2359] - TBufferedTransport doesn't clear it's buffer on a failed flush call
-    * [THRIFT-2428] - Python 3 setup.py support
-    * [THRIFT-2367] - Build failure: stdlib and boost both define uint64_t
-    * [THRIFT-2365] - C# decodes too many binary bytes from JSON
-    * [THRIFT-2402] - byte count of FrameBuffer in AWAITING_CLOSE state is not subtracted from readBufferBytesAllocated
-    * [THRIFT-2396] - Build Error on MacOSX
-    * [THRIFT-2395] - thrift Ruby gem requires development dependency 'thin' regardless of environment
-    * [THRIFT-2414] - c_glib fix several bug.
-    * [THRIFT-2420] - Go argument parser for methods without arguments does not skip fields
-    * [THRIFT-2439] - Bug in TProtocolDecorator Class causes parsing errors
-    * [THRIFT-2419] - golang - Fix fmt.Errorf in generated code
-    * [THRIFT-2418] - Go handler function panics on internal error
-    * [THRIFT-2405] - Node.js Multiplexer tests fail (silently)
-    * [THRIFT-2581] - TFDTransport destructor should not throw
-    * [THRIFT-2575] - Thrift includes siginfo_t within apache::thrift::protocol namespace
-    * [THRIFT-2577] - TFileTransport  missuse of closesocket on windows platform
-    * [THRIFT-2576] - Implement Thrift.Protocol.prototype.skip method in JavaScript library
-    * [THRIFT-2588] - Thrift compiler is not buildable in Visual Studio 2010
-    * [THRIFT-2594] - JS Compiler: Single quotes are not being escaped in constants.
-    * [THRIFT-2591] - TFramedTransport does not handle payloads split across packets correctly
-    * [THRIFT-2599] - Uncompileable Delphi code due to naming conflicts with IDL
-    * [THRIFT-2590] - C++ Visual Studio solution doesn't include Multiplexing support
-    * [THRIFT-2595] - Node.js: Fix global leaks and copy-paste errors
-    * [THRIFT-2565] - autoconf fails to find mingw-g++ cross compiler on travis CI
-    * [THRIFT-2555] - excessive "unused field" comments
-    * [THRIFT-2554] - double initialization in generated Read() method
-    * [THRIFT-2551] - OutOfMemoryError "unable to create new native thread" kills serve thread
-    * [THRIFT-2543] - Generated enum type in haskell should be qualified
-    * [THRIFT-2560] - Thrift compiler generator tries to concat ints with strings using +
-    * [THRIFT-2559] - Centos 6.5 unable to "make" with Thrift 0.9.1
-    * [THRIFT-2526] - Assignment operators and copy constructors in c++ don't copy the __isset struct
-    * [THRIFT-2454] - c_glib: There is no gethostbyname_r() in some OS.
-    * [THRIFT-2451] - Do not use pointers for optional fields with defaults. Do not write such fields if its value set to default. Also, do not use pointers for any optional fields mapped to go map or slice. generate Get accessors
-    * [THRIFT-2450] - include HowToContribute in the src repo
-    * [THRIFT-2448] - thrift/test/test.sh has incorrect Node.js test path
-    * [THRIFT-2460] - unopened socket fd must be less than zero.
-    * [THRIFT-2459] - --version should not exit 1
-    * [THRIFT-2468] - Timestamp handling
-    * [THRIFT-2467] - Unable to build contrib/fb303 on OSX 10.9.2
-    * [THRIFT-2466] - Improper error handling for SSL/TLS connections that don't complete a handshake
-    * [THRIFT-2463] - test/py/RunClientServer.py fails sometimes
-    * [THRIFT-2458] - Generated golang server code for "oneway" methods is incorrect
-    * [THRIFT-2456] - THttpClient fails when using async support outside Silverlight
-    * [THRIFT-2524] - Visual Studio project is missing TThreadedServer files
-    * [THRIFT-2523] - Visual Studio project is missing OverlappedSubmissionThread files
-    * [THRIFT-2520] - cpp:cob_style generates incorrect .tcc file
-    * [THRIFT-2508] - Uncompileable C# code due to language keywords in IDL
-    * [THRIFT-2506] - Update TProtocolException error codes to be used consistently throughout the library
-    * [THRIFT-2505] - go: struct should always be a pointer to avoid copying of potentially size-unbounded structs
-    * [THRIFT-2515] - TLS Method error during make
-    * [THRIFT-2503] - C++: Fix name collision when a struct has a member named "val"
-    * [THRIFT-2477] - thrift --help text with misplaced comma
-    * [THRIFT-2492] - test/cpp does not compile on mac
-    * [THRIFT-2500] - sending random data crashes thrift(golang) service
-    * [THRIFT-2475] - c_glib: buffered_transport_write function return always TRUE.
-    * [THRIFT-2495] - JavaScript/Node string constants lack proper escaping
-    * [THRIFT-2491] - unable to import generated ThriftTest service
-    * [THRIFT-2490] - c_glib: if fail to read a exception from server, client may be occurred double free
-    * [THRIFT-2470] - THttpHandler swallows exceptions from processor
-    * [THRIFT-2533] - Boost version in requirements should be updated
-    * [THRIFT-2532] - Java version in installation requirements should be updated
-    * [THRIFT-2529] - TBufferedTransport split  Tcp data bug in nodeJs
-    * [THRIFT-2537] - Path for "go get" does not work (pull request 115)
-    * [THRIFT-2443] - Node fails cross lang tests
-    * [THRIFT-2437] - Author fields in Python setup.py must be strings not lists.
-    * [THRIFT-2435] - Java compiler doesn't like struct member names that are identical to an existing enum or struct type
-    * [THRIFT-2434] - Missing namespace import for php TMultiplexedProcessor implementation
-    * [THRIFT-2432] - Flaky parallel build
-    * [THRIFT-2430] - Crash during TThreadPoolServer shutdown
-    * [THRIFT-667] - Period should not be allowed in identifier names
-    * [THRIFT-1212] - Members capital case conflict
-    * [THRIFT-2584] - Error handler not listened on javascript client
-    * [THRIFT-2294] - Incorrect Makefile generation
-    * [THRIFT-2601] - Fix vagrant to work again for builds again
-    * [THRIFT-2092] - TNonblocking server should release handler as soon as connection closes
-    * [THRIFT-2557] - CS0542 member names cannot be the same as their enclosing type
-    * [THRIFT-2605] - TSocket warning on gcc 4.8.3
-    * [THRIFT-2607] - ThreadManager.cpp warning on clang++ 3.4
-    * [THRIFT-1998] - TCompactProtocol.tcc - one more warning on Visual 2010
-    * [THRIFT-2610] - MSVC warning in TSocket.cpp
-    * [THRIFT-2614] - TNonblockingServer.cpp warnings on MSVC
-    * [THRIFT-2608] - TNonblockingServer.cpp warnings on clang 3.4
-    * [THRIFT-2606] - ThreadManager.h warning in clang++ 3.4
-    * [THRIFT-2609] - TFileTransport.h unused field warning (clang 3.4)
-    * [THRIFT-2416] - Cannot use TCompactProtocol with MSVC
-    * [THRIFT-1803] - Ruby Thrift 0.9.0 tries to encode UUID to UTF8 and crashes
-    * [THRIFT-2385] - Problem with gethostbyname2 during make check
-    * [THRIFT-2262] - thrift server 'MutateRow' operation gives no indication of success / failure
-    * [THRIFT-2048] - Prefer boolean context to nullptr_t conversion
-    * [THRIFT-2528] - Thrift Erlang Library: Multiple thrift applications in one bundle
-    * [THRIFT-1999] - warning on gcc 4.7 while compiling BoostMutex.cpp
-    * [THRIFT-2104] - Structs lose binary data when transferred from server to client in Java
-    * [THRIFT-2184] - undefined method rspec_verify for Thrift::MemoryBufferTransport
-    * [THRIFT-2351] - PHP TCompactProtocol has fails to decode messages
-    * [THRIFT-2016] - Resource Leak in thrift struct under compiler/cpp/src/parse/t_function.h
-    * [THRIFT-2273] - Please delete old releases from mirroring system
-    * [THRIFT-2270] - Faulty library version numbering at build or documentation
-    * [THRIFT-2203] - Tests keeping failing on Jenkins and Travis CI
-    * [THRIFT-2399] - thrift.el: recognize "//"-style comments in emacs thrift-mode
-    * [THRIFT-2582] - "FileTransport error" exception is raised when trying to use Java's TFileTransport
-    * [THRIFT-1682] - Multiple thread calling a Service function unsafely causes message corruption and terminates with Broken Pipe
-    * [THRIFT-2357] - recurse option has no effect when generating php
-    * [THRIFT-2248] - Go generator doesn't deal well with map keys of type binary
-    * [THRIFT-2426] - clarify IP rights and contributions from fbthrift
-    * [THRIFT-2041] - TNonblocking server compilation on windows (ARITHMETIC_RIGHT_SHIFT)
-    * [THRIFT-2400] - thrift.el: recognize "//"-style comments in emacs thrift-mode
-    * [THRIFT-1717] - Fix deb build in jenkins
-    * [THRIFT-2266] - ThreadManager.h:24:10: fatal error: 'tr1/functional' file not found on Mac 10.9 (Mavericks)
-    * [THRIFT-1300] - Test failures with parallel builds (make -j)
-    * [THRIFT-2487] - Tutorial requires two IDL files but only one is linked from the Thrift web site
-    * [THRIFT-2329] - missing release tags within git
-    * [THRIFT-2306] - concurent client calls with nodejs
-    * [THRIFT-2222] - ruby gem cannot be compiled on OS X mavericks
-    * [THRIFT-2381] - code which generated by thrift2/hbase.thrift compile error
-    * [THRIFT-2390] - no close event when connection lost
-    * [THRIFT-2146] - Unable to pass multiple "--gen" options to the thrift compiler
-    * [THRIFT-2438] - Unexpected readFieldEnd call causes JSON Parsing errors
-    * [THRIFT-2498] - Error message "Invalid method name" while trying to call HBase Thrift API
-    * [THRIFT-841] - Build cruft
-    * [THRIFT-2570] - Wrong URL given in http://thrift.apache.org/developers
-    * [THRIFT-2604] - Fix debian packaging
-    * [THRIFT-2618] - Unignore /aclocal files required for build
-    * [THRIFT-2562] - ./configure create MakeFile in lib/d with errors
-    * [THRIFT-2593] - Unable to build thrift on ubuntu-12.04 (Precise)
-    * [THRIFT-2461] - Can't install thrift-0.8.0 on OS X 10.9.2
-    * [THRIFT-2602] - Fix missing dist files
-    * [THRIFT-2620] - Fix python packaging
-    * [THRIFT-2545] - Test CPP fails to build (possibly typo)
-
-## Documentation
-    * [THRIFT-2155] - Adding one liner guide to rename the version.h.in and rename thrifty.cc.h
-    * [THRIFT-1991] - Add exceptions to examples
-    * [THRIFT-2334] - add a tutorial for node JS
-    * [THRIFT-2392] - Actionscript tutorial
-    * [THRIFT-2383] - contrib: sample for connecting Thrift with Rebus
-    * [THRIFT-2382] - contrib: sample for connecting Thrift with STOMP
-
-## Improvement
-    * [THRIFT-1457] - Capacity of TframedTransport write buffer is never reset
-    * [THRIFT-1135] - Node.js tutorial
-    * [THRIFT-1371] - Socket timeouts (SO_RCVTIMEO and SO_SNDTIMEO) not supported on Solaris
-    * [THRIFT-2142] - Minor tweaks to thrift.el for better emacs package compatibility
-    * [THRIFT-2268] - Modify TSaslTransport to ignore TCP health checks from loadbalancers
-    * [THRIFT-2264] - GitHub page incorrectly states that Thrift is still incubating
-    * [THRIFT-2263] - Always generate good hashCode for Java
-    * [THRIFT-2233] - Java compiler should defensively copy its binary inputs
-    * [THRIFT-2239] - Address FindBugs errors
-    * [THRIFT-2249] - Add SMP Build option to thrift.spec (and three config defines)
-    * [THRIFT-2254] - Exceptions generated by Go compiler should implement error interface
-    * [THRIFT-2260] - Thrift imposes unneeded dependency on commons-lang3
-    * [THRIFT-2258] - Add TLS v1.1/1.2 support to TSSLSocket.cpp
-    * [THRIFT-2205] - Node.js Test Server to support test.js JavaScript Browser test and sundry fixes
-    * [THRIFT-2204] - SSL client for the cocoa client
-    * [THRIFT-2172] - Java compiler allocates optionals array for every struct with an optional field
-    * [THRIFT-2185] - use cabal instead of runhaskell in haskell library
-    * [THRIFT-1926] - PHP Constant Generation Refactoring
-    * [THRIFT-2029] - Port C++ tests to Windows
-    * [THRIFT-2054] - TSimpleFileTransport - Java Lib has no straight forward TTransport based file transport
-    * [THRIFT-2040] - "uninitialized variable" warnings on MSVC/windows
-    * [THRIFT-2034] - Give developers' C++ code direct access to socket FDs on server side
-    * [THRIFT-2095] - Use print function for Python 3 compatiblity
-    * [THRIFT-1868] - Make the TPC backlog configurable in the Java servers
-    * [THRIFT-1813] - Add @Generated annotation to generated classes
-    * [THRIFT-1815] - Code generators line buffer output
-    * [THRIFT-2305] - TFramedTransport empty constructor should probably be private
-    * [THRIFT-2304] - Move client assignments from construtor in method
-    * [THRIFT-2309] - Ruby (gem) & PHP RPM subpackages
-    * [THRIFT-2318] - perl: dependency Class::Accessor not checked
-    * [THRIFT-2317] - exclude tutorial from build
-    * [THRIFT-2320] - Program level doctext does not get attached by parser
-    * [THRIFT-2349] - Golang - improve tutorial
-    * [THRIFT-2348] - PHP Generator: add array typehint to functions
-    * [THRIFT-2344] - configure.ac: compiler-only option
-    * [THRIFT-2343] - Golang - Return a single error for all exceptions instead of multiple return values
-    * [THRIFT-2341] - Enable generation of Delphi XMLDoc comments (a.k.a. "Help Insight")
-    * [THRIFT-2355] - Add SSL and Web Socket Support to Node and JavaScript
-    * [THRIFT-2350] - Add async calls to normal JavaScript
-    * [THRIFT-2330] - Generate PHPDoc comments
-    * [THRIFT-2332] - RPMBUILD: run bootstrap (if needed)
-    * [THRIFT-2391] - simple socket transport for actionscript 3.0
-    * [THRIFT-2376] - nodejs: allow Promise style calls for client and server
-    * [THRIFT-2369] - Add ssl support for nodejs implementation
-    * [THRIFT-2401] - Haskell tutorial compiles
-    * [THRIFT-2417] - C# Union classes are not partial
-    * [THRIFT-2415] - Named pipes server performance & message mode
-    * [THRIFT-2404] - emit warning on (typically inefficient) list<byte>
-    * [THRIFT-2398] - Improve Node Server Library
-    * [THRIFT-2397] - Add CORS and CSP support for JavaScript and Node.js libraries
-    * [THRIFT-2407] - use markdown (rename README => README.md)
-    * [THRIFT-2300] - D configure info output should follow same format as other languages
-    * [THRIFT-2579] - Windows CE support
-    * [THRIFT-2574] - Compiler option to generate namespace directories for Ruby
-    * [THRIFT-2571] - Simplify cross compilation using CMake
-    * [THRIFT-2569] - Introduce file to specify third party library locations on Windows
-    * [THRIFT-2568] - Implement own certificate handler
-    * [THRIFT-2552] - eliminate warning from configure.ac
-    * [THRIFT-2549] - Generate json tag for struct members. use go.tag annotation to override the default generated tag.
-    * [THRIFT-2544] - Add support for socket transport for c# library when using Windows Phone projects
-    * [THRIFT-2453] - haskell tutorial: fix up division by 0 example
-    * [THRIFT-2449] - Enhance typedef structure to distinguish between forwards and real typedefs
-    * [THRIFT-2446] - There is no way to handle server stream errors
-    * [THRIFT-2455] - Allow client certificates to be used with THttpClient
-    * [THRIFT-2511] - Node.js needs the compact protocol
-    * [THRIFT-2493] - Node.js lib needs HTTP client
-    * [THRIFT-2502] - Optimize go implementations of binary and compact protocols for speed
-    * [THRIFT-2494] - Add enum toString helper function in c_glib
-    * [THRIFT-2471] - Make cpp.ref annotation language agnostic
-    * [THRIFT-2497] - server and client for test/go, also several fixes and improvements
-    * [THRIFT-2535] - TJSONProtocol when serialized yields TField ids rather than names
-    * [THRIFT-2220] - Add a new struct structv?
-    * [THRIFT-1352] - Thrift server
-    * [THRIFT-989] - Push boost m4 macros upstream
-    * [THRIFT-1349] - Remove unnecessary print outs
-    * [THRIFT-2496] - server and client for test/go, also several fixes and improvements
-    * [THRIFT-1114] - Maven publish shouldn't require passwords hardcoded in settings.xml
-    * [THRIFT-2043] - visual 2010 warnings - unreachable code
-    * [THRIFT-1683] - Implement alternatives to Javascript Client side Transport protocol, just as NPAPI and WebSocket.
-    * [THRIFT-1746] - provide a SPDX file
-    * [THRIFT-1772] - Serialization does not check types of embedded structures.
-    * [THRIFT-2387] - nodejs: external imports should be centralized in index.js
-    * [THRIFT-2037] - More general macro THRIFT_UNUSED_VARIABLE
-
-## New Feature
-    * [THRIFT-1012] - Transport for DataInput DataOutput interface
-    * [THRIFT-2256] - Using c++11/c++0x std library  replace boost library
-    * [THRIFT-2250] - JSON and MemoryBuffer for JavaME
-    * [THRIFT-2114] - Python Service Remote SSL Option
-    * [THRIFT-1719] - SASL client support for Python
-    * [THRIFT-1894] - Thrift multi-threaded async Java Server using Java 7 AsynchronousChannelGroup
-    * [THRIFT-1893] - HTTP/JSON server/client for node js
-    * [THRIFT-2347] - C# TLS Transport based on THRIFT-181
-    * [THRIFT-2377] - Allow addition of custom HTTP Headers to an HTTP Transport
-    * [THRIFT-2408] - Named Pipe Transport Option for C#
-    * [THRIFT-2572] - Add string/collection length limit checks (from C++) to java protocol readers
-    * [THRIFT-2469] - "java:fullcamel" option to automatically camel-case underscored attribute names
-    * [THRIFT-795] - Importing service functions (simulation multiple inheritance)
-    * [THRIFT-2164] - Add a Get/Post Http Server to Node along with examples
-    * [THRIFT-2255] - add Parent Class for generated Struct class
-
-## Question
-    * [THRIFT-2539] - Tsocket.cpp addrinfo ai_flags = AI_ADDRCONFIG
-    * [THRIFT-2440] - how to connect as3 to java by thrift ,
-    * [THRIFT-2379] - Memmory leaking while using multithreading in C++ server.
-    * [THRIFT-2277] - Thrift: installing fb303 error
-    * [THRIFT-2567] - Csharp slow ?
-    * [THRIFT-2573] - thrift 0.9.2 release
-
-## Sub-task
-    * [THRIFT-981] - cocoa: add version Info to the library
-    * [THRIFT-2132] - Go: Support for Multiplexing Services on any Transport, Protocol and Server
-    * [THRIFT-2299] - TJsonProtocol implementation for Ruby does not allow for both possible slash (solidus) encodings
-    * [THRIFT-2298] - TJsonProtocol implementation for C# does not allow for both possible slash (solidus) encodings
-    * [THRIFT-2297] - TJsonProtocol implementation for Delphi does not allow for both possible slash (solidus) encodings
-    * [THRIFT-2271] - JavaScript: Support for Multiplexing Services
-    * [THRIFT-2251] - go test for compact protocol is not running
-    * [THRIFT-2195] - Delphi: Add event handlers for server and processing events
-    * [THRIFT-2176] - TSimpleJSONProtocol.ReadFieldBegin() does not return field type and ID
-    * [THRIFT-2175] - Wrong field type set for binary
-    * [THRIFT-2174] - Deserializing JSON fails in specific cases
-    * [THRIFT-2053] - NodeJS: Support for Multiplexing Services
-    * [THRIFT-1914] - Python: Support for Multiplexing Services on any Transport, Protocol and Server
-    * [THRIFT-1810] - add ruby to test/test.sh
-    * [THRIFT-2310] - PHP: Client-side support for Multiplexing Services
-    * [THRIFT-2346] - C#: UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-    * [THRIFT-2345] - Delphi: UTF-8 sent by PHP as JSON is not understood by TJsonProtocol
-    * [THRIFT-2338] - First doctext wrongly interpreted as program doctext in some cases
-    * [THRIFT-2325] - SSL test certificates
-    * [THRIFT-2358] - C++: add compact protocol to cross language test suite
-    * [THRIFT-2425] - PHP: Server-side support for Multiplexing Services
-    * [THRIFT-2421] - Tree/Recursive struct support in thrift
-    * [THRIFT-2290] - Update Go tutorial to align with THRIFT-2232
-    * [THRIFT-2558] - CSharp compiler generator tries to concat ints with strings using +
-    * [THRIFT-2507] - Additional LUA TProtocolException error code needed?
-    * [THRIFT-2499] - Compiler: allow annotations without "= value"
-    * [THRIFT-2534] - Cross language test results should recorded to a status.md or status.html file automatically
-    * [THRIFT-66] - Java: Allow multiplexing multiple services over a single TCP connection
-    * [THRIFT-1681] - Add Lua Support
-    * [THRIFT-1727] - Ruby-1.9: data loss: "binary" fields are re-encoded
-    * [THRIFT-1726] - Ruby-1.9: "binary" fields are represented by string whose encoding is "UTF-8"
-    * [THRIFT-988] - perl: add version Info to the library via configure
-    * [THRIFT-334] - Compact Protocol for PHP
-    * [THRIFT-2444] - pull request 88: thrift: clean up enum value assignment
-
-## Task
-    * [THRIFT-2223] - Spam links on wiki
-    * [THRIFT-2566] - Please create a DOAP file for your TLP
-    * [THRIFT-2237] - Update archive to contain all versions
-    * [THRIFT-962] - Tutorial page on our website is really unhelpful
-
-## Test
-    * [THRIFT-2327] - nodejs: nodejs test suite should be bundled with the library
-    * [THRIFT-2445] - THRIFT-2384 (code generation for go maps with binary keys) should be tested
-    * [THRIFT-2501] - C# The test parameters from the TestServer and TestClient are different from the http://thrift.apache.org/test/
-
-## Wish
-    * [THRIFT-2190] - Add the JavaScript thrift.js lib to the Bower registry
-    * [THRIFT-2076] - boost::optional instead of __isset
-
-
-
-Thrift 0.9.1
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-1440] - debian packaging: minor-ish policy problems
-    * [THRIFT-1402] - Generated Y_types.js does not require() X_types.js when an include in the IDL file was used
-    * [THRIFT-1551] - 2 thrift file define only struct (no service), one include another, the gen nodejs file didn't have "requires" at the top
-    * [THRIFT-1264] - TSocketClient is queried by run loop after deallocation in Cocoa
-    * [THRIFT-1600] - Thrift Go Compiler and Library out of date with Go 1 Release.
-    * [THRIFT-1603] - Thrift IDL allows for multiple exceptions, args or struct member names to be the same
-    * [THRIFT-1062] - Problems with python tutorials
-    * [THRIFT-864] - default value fails if identifier is a struct
-    * [THRIFT-930] - Ruby and Haskell bindings don't properly support DESTDIR (makes packaging painful)
-    * [THRIFT-820] - The readLength attribute of TBinaryProtocol is used as an instance variable and is decremented on each call of checkReadLength
-    * [THRIFT-1640] - None of the tutorials linked on the website contain content
-    * [THRIFT-1637] - NPM registry does not include version 0.8
-    * [THRIFT-1648] - NodeJS clients always receive 0 for 'double' values.
-    * [THRIFT-1660] - Python Thrift library can be installed with pip but not easy_install
-    * [THRIFT-1657] - Chrome browser sending OPTIONS method before POST in xmlHttpRequest
-    * [THRIFT-2118] - Certificate error handling still incorrect
-    * [THRIFT-2137] - Ruby test lib fails jenkins build #864
-    * [THRIFT-2136] - Vagrant build not compiling java, ruby, php, go libs due to missing dependencies
-    * [THRIFT-2135] - GO lib leaves behind test files that are auto generated
-    * [THRIFT-2134] - mingw-cross-compile script failing with strip errors
-    * [THRIFT-2133] - java TestTBinaryProtocol.java test failing
-    * [THRIFT-2126] - lib/cpp/src/thrift/concurrency/STD* files missing from DIST
-    * [THRIFT-2125] - debian missing from DIST
-    * [THRIFT-2124] - .o, .so, .la, .deps, .libs, gen-* files left tutorials, test and lib/cpp when making DIST
-    * [THRIFT-2123] - GO lib missing files in DIST build
-    * [THRIFT-2121] - Compilation bug for Node.js
-    * [THRIFT-2129] - php ext missing from dist
-    * [THRIFT-2128] - lib GO tests fail with funct ends without a return statement
-    * [THRIFT-2286] - Failed to compile Thrift0.9.1 with boost1.55 by VS2010 if select Debug-mt&x64 mode.
-    * [THRIFT-1973] - TCompactProtocol in C# lib does not serialize and deserialize negative int32 and int64 number correctly
-    * [THRIFT-1992] - casts in TCompactProtocol.tcc causing "dereferencing type-punned pointer will break strict-aliasing rules" warnings from gcc
-    * [THRIFT-1930] - C# generates unsigned byte for Thrift "byte" type
-    * [THRIFT-1929] - Update website to use Mirrors for downloads
-    * [THRIFT-1928] - Race may still exist in TFileTransport::flush()
-    * [THRIFT-1934] - Tabs in Example section on main page are not working
-    * [THRIFT-1933] - Delphi generator crashes when a typedef references another typedef from an included file
-    * [THRIFT-1942] - Binary accelerated cpp extension does not use Thrift namespaces for Exceptions
-    * [THRIFT-1959] - C#: Add Union TMemoryBuffer support
-    * [THRIFT-1958] - C#: Use static Object.Equals instead of .Equals() calls in equals
-    * [THRIFT-1957] - NodeJS TFramedTransport and TBufferedTransport read bytes as unsigned
-    * [THRIFT-1955] - Union Type writer generated in C# does not WriteStructBegin
-    * [THRIFT-1952] - Travis CI
-    * [THRIFT-1949] - WP7 build broken
-    * [THRIFT-1943] - docstrings for enum values are ignored
-    * [THRIFT-2070] - Improper `HexChar' and 'HexVal' implementation in TJSONProtocol.cs
-    * [THRIFT-2017] - Resource Leak in thrift struct under compiler/cpp/src/parse/t_program.h
-    * [THRIFT-2032] - C# client leaks sockets/handles
-    * [THRIFT-1996] - JavaME Constants generation is broken / inconsistent with regular Java generation
-    * [THRIFT-2002] - Haskell: Test use Data.Maybe instead of Maybe
-    * [THRIFT-2051] - Vagrant fails to build erlang
-    * [THRIFT-2050] - Vagrant C# lib compile fails with TException missing
-    * [THRIFT-1978] - Ruby: Thrift should allow for the SSL verify mode to be set
-    * [THRIFT-1984] - namespace collision in python bindings
-    * [THRIFT-1988] - When trying to build a debian package it fails as the file NEWS doesn't exist
-    * [THRIFT-1975] - TBinaryProtocol CheckLength can't be used for a client
-    * [THRIFT-1995] - '.' allowed at end of identifier generates non-compilable code
-    * [THRIFT-2112] - Error in Go generator when using typedefs in map keys
-    * [THRIFT-2088] - Typos in Thrift compiler help text
-    * [THRIFT-2080] - C# multiplex processor does not catch IOException
-    * [THRIFT-2082] - Executing "gmake clean" is broken
-    * [THRIFT-2102] - constants are not referencing to correct type when included from another thrift file
-    * [THRIFT-2100] - typedefs are not correctly referenced when including from other thrift files
-    * [THRIFT-2066] - 'make install' does not install two headers required for C++ bindings
-    * [THRIFT-2065] - Not valid constants filename in Java
-    * [THRIFT-2047] - Thrift.Protocol.TCompactProtocol, intToZigZag data lost (TCompactProtocol.cs)
-    * [THRIFT-2036] - Thrift gem warns about class variable access from top level
-    * [THRIFT-2057] - Vagrant fails on php tests
-    * [THRIFT-2105] - Generated code for default values of collections ignores t_field::T_REQUIRED
-    * [THRIFT-2091] - Unnecessary 'friend' declaration causes warning in TWinsockSingleton
-    * [THRIFT-2090] - Go generator, fix including of other thrift files
-    * [THRIFT-2106] - Fix support for namespaces in GO generator
-    * [THRIFT-1783] - C# doesn't handle required fields correctly
-    * [THRIFT-1782] - async only defined in silverlight
-    * [THRIFT-1779] - Missing process_XXXX method in generated TProcessor implementation for all 'oneway' service functions
-    * [THRIFT-1692] - SO_REUSEADDR allows for socket hijacking on Windows
-    * [THRIFT-1720] - JRuby times out on successful connection
-    * [THRIFT-1713] - Named and Anonymous Pipe transport (Delphi)
-    * [THRIFT-1699] - Native Union#read has extra read_field_end call
-    * [THRIFT-1749] - Python TSSLSocket error handling obscures actual error
-    * [THRIFT-1748] - Guard and RWGuard macros defined in global namespace
-    * [THRIFT-1734] - Front webpage is still advertising v0.8 as current release
-    * [THRIFT-1729] - C glib refactor left empty folders in svn
-    * [THRIFT-1767] - unions can't have required fields (Delphi)
-    * [THRIFT-1765] - Incorrect error message printed for null or negative keys
-    * [THRIFT-1778] - Configure requires manual intervention due to tar failure
-    * [THRIFT-1777] - TPipeServer is UNSTOPPABLE
-    * [THRIFT-1753] - Multiple C++ Windows, OSX, and iOS portability issues
-    * [THRIFT-1756] - 'make -j 8' fails with "unterminated #ifdef" error
-    * [THRIFT-1773] - Python library should run on python 2.4
-    * [THRIFT-1769] - unions can't have required fields (C++)
-    * [THRIFT-1768] - unions can't have required fields (Compiler)
-    * [THRIFT-1666] - htonll usage in TBinaryProtocol.tcc generates warning with MSVC2010
-    * [THRIFT-1919] - libthrift depends on httpcore-4.1.3 (directly) and httpcore-4.1.4 (transitively)
-    * [THRIFT-1864] - implement event handler for non-blocking server
-    * [THRIFT-1859] - Generated error c++ code with -out and include_prefix param
-    * [THRIFT-1869] - TThreadPoolServer (java) dies when threadpool is consumed
-    * [THRIFT-1842] - Memory leak with Pipes
-    * [THRIFT-1838] - Can't build compiler on OS X because of missing thrifty.h
-    * [THRIFT-1846] - Restore socket.h header to support builds with Android NDK
-    * [THRIFT-1850] - make check hangs on TSocket tests in TransportTest.cpp
-    * [THRIFT-1873] - Binary protocol factory ignores struct read/write flags
-    * [THRIFT-1872] - issues with TBufferedTransport buffer
-    * [THRIFT-1904] - Incorrect code is generated for typedefs which use included types
-    * [THRIFT-1903] - PHP namespaces cause binary protocols to not be used
-    * [THRIFT-1895] - Delphi: reserved variable name "result" not detected properly
-    * [THRIFT-1881] - TNonblockingServer does not release open connections or threads on shutdown
-    * [THRIFT-1888] - Java Thrift client can't connect to Python Thrift server on same host
-    * [THRIFT-1831] - Bug in list deserializer
-    * [THRIFT-1824] - many compile warning, becase Thread.h includes config.h
-    * [THRIFT-1823] - Missing parenthesis breaks "IS_..." macro in generated code
-    * [THRIFT-1806] - Python generation always truncates __init__.py files
-    * [THRIFT-1795] - Race condition in TThreadedServerPool java implementation
-    * [THRIFT-1794] - C# asyncctp broken
-    * [THRIFT-1804] - Binary+compact protocol single byte error in Ruby library (ARM architecture): caused by different char signedness
-    * [THRIFT-1800] - Documentation text not always escaped correctly when rendered to HTML
-    * [THRIFT-1788] - C#: Constants static constructor does not compile
-    * [THRIFT-1816] - Need "require" included thrift files in "xxx_types.js"
-    * [THRIFT-1907] - Compiling namespace and sub-namespace directives for unrecognized generators should only be a warning
-    * [THRIFT-1913] - skipping unknown fields in java unions
-    * [THRIFT-2553] - C++ linker error - transport/TSocket
-    * [THRIFT-274] - Towards a working release/versioning process
-
-## Documentation
-    * [THRIFT-1971] - [Graphviz] Adds tutorial/general description documentation
-    * [THRIFT-2001] - http://thrift.apache.org/ Example "C++ Server" tab is broken
-
-## Improvement
-    * [THRIFT-1574] - Apache project branding requirements: DOAP file [PATCH]
-    * [THRIFT-1347] - Unify the exceptions returned in generated Go code
-    * [THRIFT-1353] - Switch to performance branch, get rid of BinaryParser
-    * [THRIFT-1629] - Ruby 1.9 Compatibility during Thrift configure, make, install
-    * [THRIFT-991] - Refactor Haskell code and generator
-    * [THRIFT-990] - Sanify gettimeofday usage codebase-wide
-    * [THRIFT-791] - Let C++ TSimpleServer be driven by an external main loop
-    * [THRIFT-2117] - Cocoa TBinaryProtocol strictWrite should be set to true by default
-    * [THRIFT-2014] - Change C++ lib includes to use <namespace/> style throughout
-    * [THRIFT-1972] - Add support for async processors
-    * [THRIFT-1970] - [Graphviz] Adds option to render exceptions relationships
-    * [THRIFT-1966] - Support different files for SSL certificates and keys
-    * [THRIFT-1965] - Adds Graphviz (graph description language) generator
-    * [THRIFT-1956] - Switch to Apache Commons Lang 3
-    * [THRIFT-1962] - Multiplex processor should send any TApplicationException back to client
-    * [THRIFT-1960] - main() declares 22 unused gen bools
-    * [THRIFT-1951] - libthrift.jar has source files in it
-    * [THRIFT-1997] - Add accept backlog configuration method to  TServerSocket
-    * [THRIFT-2003] - Deprecate senum
-    * [THRIFT-2052] - Vagrant machine image defaults to only 384MB of RAM
-    * [THRIFT-1980] - Modernize Go tooling, fix go client libary.
-    * [THRIFT-1977] - C# compiler should generate constant files prefixed with thrift file name
-    * [THRIFT-1985] - add a Vagrantfile to build and test Apache Thrift fully reproducable
-    * [THRIFT-1994] - Deprecate slist
-    * [THRIFT-1993] - Factory to create instances from known (generated) interface types with Delphi
-    * [THRIFT-2081] - Specified timeout should be used in TSocket.Open()
-    * [THRIFT-2084] - Delphi: Ability to create entity Thrift-generated instances based on TypeInfo
-    * [THRIFT-2083] - Improve the go lib: buffered Transport, save memory allocation, handle concurrent request
-    * [THRIFT-2109] - Secure connections should be supported in Go
-    * [THRIFT-2107] - minor Go generator fixes
-    * [THRIFT-1695] - allow warning-free compilation in VS 2012 and GNU 4.6
-    * [THRIFT-1735] - integrate tutorial into regular build
-    * [THRIFT-1716] - max allowed connections should be PIPE_UNLIMITED_INSTANCES
-    * [THRIFT-1715] - Allow excluding python parts when building contrib/fb303
-    * [THRIFT-1733] - Fix RPM build issues on RHEL6/OL6 systems
-    * [THRIFT-1728] - Upgradation of httpcomponents
-    * [THRIFT-1876] - Use enum names instead of casted integers in assignments
-    * [THRIFT-1874] - timeout for the server-side end of a named pipe
-    * [THRIFT-1897] - Support validation of required fields
-    * [THRIFT-1896] - Add TBase protocol for Cocoa
-    * [THRIFT-1880] - Make named pipes server work asynchronously (overlapped) to allow for clean server stops
-    * [THRIFT-1878] - Add the possibility to send custom headers
-    * [THRIFT-1882] - Use single include
-    * [THRIFT-1793] - C#: Use static read instead of instance read
-    * [THRIFT-1799] - Option to generate HTML in "standalone mode"
-    * [THRIFT-1815] - Code generators line buffer output
-    * [THRIFT-1890] - C++: Make named pipes server work asynchronously
-    * [THRIFT-474] - Generating Ruby on Rails friendly code
-
-## New Feature
-    * [THRIFT-801] - Provide an interactive shell (irb) when generating ruby bindings
-    * [THRIFT-2292] - Android Library Project
-    * [THRIFT-2012] - Modernizing Go
-    * [THRIFT-1969] - C#: Tests not properly linked from the solution
-    * [THRIFT-1785] - C#: Add TMemoryBuffer serializer/deserializer
-    * [THRIFT-1780] - Add option to generate nullable values
-    * [THRIFT-1786] - C# Union Typing
-    * [THRIFT-591] - Make the C++ runtime library be compatible with Windows and Visual Studio
-    * [THRIFT-514] - Add option to configure compiler output directory
-
-## Question
-    * [THRIFT-1764] - how to get the context of client when on a rpc call in server side?
-    * [THRIFT-1791] - thrift's namespace directive when generating haskell code
-
-## Sub-task
-    * [THRIFT-1594] - Java test clients should have a return codes that reflect whether it succeeds or not.
-    * [THRIFT-1595] - Java test server should follow the documented behavior as of THRIFT-1590
-    * [THRIFT-986] - st: add version Info to the library
-    * [THRIFT-985] - php: add version Info to the library
-    * [THRIFT-984] - ocaml: add version Info to the library
-    * [THRIFT-1924] - Delphi: Inconsistency in serialization of optional fields
-    * [THRIFT-1922] - C#: Inconsistency in serialization of optional fields
-    * [THRIFT-1961] - C# tests should be in lib/csharp/test/...
-    * [THRIFT-1822] - PHP unit test does not work
-    * [THRIFT-1902] - C++: Support for Multiplexing Services on any Transport, Protocol and Server
-    * [THRIFT-1901] - C#: Support for Multiplexing Services on any Transport, Protocol and Server
-    * [THRIFT-1899] - Delphi: Support for Multiplexing Services on any Transport, Protocol and Server
-    * [THRIFT-563] - Support for Multiplexing Services on any Transport, Protocol and Server
-
-
-
-Thrift 0.9
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-1438] - lib/cpp/src/windows/config.h should read version from configure.ac rather than a #define
-    * [THRIFT-1446] - Compile error with Delphi 2009 in constant initializer
-    * [THRIFT-1450] - Problems building thrift 0.8.0 for Python and Ruby
-    * [THRIFT-1449] - Ruby client does not work on solaris (?)
-    * [THRIFT-1447] - NullpointerException in ProcessFunction.class :in "oneway" method
-    * [THRIFT-1433] - TServerSocket fix for MSVC
-    * [THRIFT-1429] - The nonblocking servers is supposed to use TransportFactory to read the data
-    * [THRIFT-1427] - PHP library uses non-multibyte safe functions with mbstring function overloading
-    * [THRIFT-1421] - Debian Packages can not be built
-    * [THRIFT-1394] - Treatment of optional fields is not consistent between C++ and Java
-    * [THRIFT-1511] - Server with oneway support ( JAVA )
-    * [THRIFT-1496] - PHP compiler not namespacing enums
-    * [THRIFT-1495] - PHP TestClient fatals on missing class
-    * [THRIFT-1508] - TServerSocket does not allow for the user to specify the IP address to bind to
-    * [THRIFT-1504] - Cocoa Generator should use local file imports for base Thrift headers
-    * [THRIFT-1512] - Thrift socket support for Windows XP
-    * [THRIFT-1502] - TSimpleServer::serve(): Do not print out error message if server was stopped.
-    * [THRIFT-1501] - PHP old namespaces not generated for enums
-    * [THRIFT-1483] - java compiler does not generate type parameters for services in extended clauses
-    * [THRIFT-1479] - Compiled PHP process functions missing writeMessageEnd()
-    * [THRIFT-1492] - enabling c_glib render thrift unusable (even for C++ code)
-    * [THRIFT-1491] - Uninitialize processorFactory_ member in TServer.h
-    * [THRIFT-1475] - Incomplete records generation for Erlang
-    * [THRIFT-1486] - Javascript manual testserver not returning content types
-    * [THRIFT-1488] - src/concurrency/Thread.h:91:58: error: invalid conversion from 'pthread_t {aka _opaque_pthread_t*}' to 'apache::thrift::concurrency::Thread::id_t {aka long long unsigned int}' [-fpermissive]
-    * [THRIFT-1490] - Windows-specific header files - fixes & tweaks
-    * [THRIFT-1526] - Union TupleSchemeFactory returns StandardSchemes
-    * [THRIFT-1527] - Generated implementation of tupleReadStruct in unions return null when the setfield is unrecognized
-    * [THRIFT-1524] - TNonBlockingServer does not compile in Visual Studio 2010
-    * [THRIFT-1529] - TupleProtocol can unintentionally include an extra byte in bit vectors when number of optional fields is an integral of 8
-    * [THRIFT-1473] - JSON context stack may be left in an incorrect state when an exception is thrown during read or write operations
-    * [THRIFT-1456] - System.Net.HttpWebRequest' does not contain a definition for 'Proxy'
-    * [THRIFT-1468] - Memory leak in TSaslServerTransport
-    * [THRIFT-1461] - Recent TNonblockingServer changes broke --enable-boostthreads=yes, Windows
-    * [THRIFT-1460] - why not add unicode strings support to python directly?
-    * [THRIFT-1464] - AbstractNonblockingServer.FrameBuffer TNonblockingTransport accessor changed from public to private
-    * [THRIFT-1467] - Possible AV with empty strings when using JSON protocol
-    * [THRIFT-1523] - clientTimeout not worked as expected in TServerSocket created by TSSLTransportFactory
-    * [THRIFT-1537] - TFramedTransport issues
-    * [THRIFT-1519] - Thirft Build Failure referencing rb_intern2 symbol
-    * [THRIFT-1518] - Generated C++ code only sends the first optional field in the write() function for a struct.
-    * [THRIFT-1515] - NameError: global name 'TApplicationException' is not defined
-    * [THRIFT-1554] - Inherited service methods are not resolved in derived service implementations
-    * [THRIFT-1553] - thrift nodejs service side can't read map structure, key as enum, value as Object
-    * [THRIFT-1575] - Typo in server/TThreadPoolServer.h
-    * [THRIFT-1327] - Fix Spec Suite under Ruby-1.8.7 (works for MRI Ruby-1.9.2)
-    * [THRIFT-1326] - on some platforms, #include <stdint.h> is necessary to be included in Thrift.h
-    * [THRIFT-1159] - THttpClient->Flush() issue (connection thru proxy)
-    * [THRIFT-1277] - Node.js serializes false booleans as null
-    * [THRIFT-1224] - Cannot insert UTF-8 text
-    * [THRIFT-1267] - Node.js can't throw exceptions.
-    * [THRIFT-1338] - Do not use an unpatched autoconf 2.65 to generate release tarball
-    * [THRIFT-1128] - MAC OS X: thrift.h incompatibility with Thrift.h
-    * [THRIFT-1631] - Fix C++ server constructor typos
-    * [THRIFT-1602] - PHP C Extension is not Compatible with PHP 5.4
-    * [THRIFT-1610] - IWebProxy not available on WP7 platform
-    * [THRIFT-1606] - Race condition in BoostThreadFactory.cpp
-    * [THRIFT-1604] - Python exception handeling for changes from PEP 3110
-    * [THRIFT-1607] - Incorrect file modes for several source files
-    * [THRIFT-1583] - c_glib leaks memory
-    * [THRIFT-1582] - Bad includes of nested thrift files in c_glib
-    * [THRIFT-1578] - C_GLib generated code does not compile
-    * [THRIFT-1597] - TJSONProtocol.php is missing from Makefile.am
-    * [THRIFT-1591] - Enable TCP_NODELAY for ruby gem
-    * [THRIFT-1624] - Isset Generated differently on different platforms
-    * [THRIFT-1622] - Incorrect size returned on read
-    * [THRIFT-1621] - Memory leaks
-    * [THRIFT-1612] - Base64 encoding is broken
-    * [THRIFT-1627] - compiler built using compilers.vcxproj cannot be used to build some test .thrift files
-    * [THRIFT-1571] - Update Ruby HTTP transport for recent Ruby versions
-    * [THRIFT-1023] - Thrift encoding  (UTF-8) issue with Ruby 1.9.2
-    * [THRIFT-1090] - Document the generation of a file called "Constants.java"
-    * [THRIFT-1082] - Thrift::FramedTransport sometimes calls close() on an undefined value
-    * [THRIFT-956] - Python module's version meta-data should be updated
-    * [THRIFT-973] - Cocoa library won't compile using clang
-    * [THRIFT-1632] - ruby: data corruption in thrift_native implementation of MemoryBufferTransport
-    * [THRIFT-1665] - TBinaryProtocol: exceeded message length raises generic TException
-    * [THRIFT-1664] - Reference to non-existing variable in build script
-    * [THRIFT-1663] - Java Thrift server is not throwing exceptions
-    * [THRIFT-1662] - "removeObject:" should be "removeObserver:" in [-TSocketServer dealloc]?
-    * [THRIFT-1643] - Denial of Service attack in TBinaryProtocol.readString
-    * [THRIFT-1674] - Update Thrift D library to be compatible with 2.060
-    * [THRIFT-1673] - Ruby compile flags for extension for multi arch builds (os x)
-    * [THRIFT-1655] - Configure still trying to use thrift_generators in output
-    * [THRIFT-1654] - c_glib thrift_socket_read() returns corrupted data
-    * [THRIFT-1653] - TThreadedSelectorServer leaks CLOSE_WAIT sockets
-    * [THRIFT-1658] - Java thrift server is not throwing TApplicationException
-    * [THRIFT-1656] - Setting proper headers in THttpServer.cpp so that "Cross-Origin Resource Sharing" on js client can work.
-    * [THRIFT-1652] - TSaslTransport does not log the error when kerberos auth fails
-    * [THRIFT-2272] - CLONE - Denial of Service attack in TBinaryProtocol.readString
-    * [THRIFT-2086] - Invalid generated code for Node.JS when using namespaces
-    * [THRIFT-1686] - t_php_generator.cc uses "and" instead of "&&", and causes compiler errors with Visual Studio
-    * [THRIFT-1693] - libthrift has dependency on two different versions of httpcore
-    * [THRIFT-1689] - don't exit(-1) in TNonblockingServer
-    * [THRIFT-1679] - NodeJS: protocol readString() should treat string as utf8, not binary
-    * [THRIFT-1721] - Dist broken due to 0.8.0 to 0.9.0 changes
-    * [THRIFT-1710] - Minor issues in test case code
-    * [THRIFT-1709] - Warning "Bitwise-or operator used on a sign-extended operand; consider casting to a smaller unsigned type first" in TBinaryProtocol.cs at ReadInt64()
-    * [THRIFT-1707] - [ruby] Adjust server_spec.rb for RSpec 2.11.x and Ruby 1.9.3
-    * [THRIFT-1671] - Cocoa code generator does not put keywords into generated method calls
-    * [THRIFT-1670] - Incompatibilities between different versions of a Thrift interface
-    * [THRIFT-1669] - NameError: global name 'TApplicationException' is not defined
-    * [THRIFT-1668] - Compile error in contrib/fb303, thrift/TDispatchProcessor.h: No such file or directory
-    * [THRIFT-1845] - Fix compiler warning caused by implicit string conversion with Xcode 4.6
-    * [THRIFT-304] - Building the Python library requires development headers
-    * [THRIFT-369] - sets and maps break equality
-    * [THRIFT-556] - Ruby compiler does not correctly referred to top-level modules when a submodule masks the top-level name
-    * [THRIFT-481] - indentation of ruby classes is off by a few
-
-## Improvement
-    * [THRIFT-1498] - Allow TThreadedPoolServer.Args to pass a ExecutorService
-    * [THRIFT-1444] - FunctionRunner - add syntactic sugar to create shared_ptrs
-    * [THRIFT-1443] - define a TProcessor helper class to implement process()
-    * [THRIFT-1441] - Generate constructor with parameters for exception class to let it update message property automatically.
-    * [THRIFT-1520] - Embed version number in erlang .app file
-    * [THRIFT-1480] - python: remove tabs, adjust whitespace and address PEP8 warnings
-    * [THRIFT-1485] - Performance: pass large and/or refcounted arguments as "const"
-    * [THRIFT-1484] - Introduce phpunit test suite
-    * [THRIFT-1532] - The type specifications in the generated Erlang code should include "undefined" where it's used as a default value
-    * [THRIFT-1534] - Required fields in the Delphi code generator.
-    * [THRIFT-1469] - Java isset space optimization
-    * [THRIFT-1465] - Visibility of methods in generated java code
-    * [THRIFT-1453] - Don't change types of arguments when serializing with thrift php extension
-    * [THRIFT-1452] - generate a swap() method for all generated structs
-    * [THRIFT-1451] - FramedTransport: Prevent infinite loop when writing
-    * [THRIFT-1521] - Two patches for more Performance
-    * [THRIFT-1555] - Delphi version of the tutorial code
-    * [THRIFT-1535] - Why thrift don't use wrapped class for optional fields ?
-    * [THRIFT-1204] - Ruby autogenerated files should require 'thrift' gem
-    * [THRIFT-1344] - Using the httpc module directly rather than the deprecated http layer
-    * [THRIFT-1343] - no_auto_import min/2 to avoid compile warning
-    * [THRIFT-1340] - Add support of ARC to Objective-C
-    * [THRIFT-1611] - Improved code generation for typedefs
-    * [THRIFT-1593] - Pass on errors like "connection closed" to the handler module
-    * [THRIFT-1615] - PHP Namespace
-    * [THRIFT-1567] - Thrift/cpp: Allow alternate classes to be used for
-    * [THRIFT-1072] - Missing - (id) initWithSharedProcessor in TSharedProcessorFactory.h
-    * [THRIFT-1650] - [ruby] Update clean items and svn:ignore entries for OS X artifacts
-    * [THRIFT-1661] - [PATCH] Add --with-qt4 configure option
-    * [THRIFT-1675] - Do we have any plan to support scala?
-    * [THRIFT-1645] - Replace Object#tee with more conventional Object#tap in specs
-    * [THRIFT-1644] - Upgrade RSpec to 2.10.x and refactor specs as needed
-    * [THRIFT-1672] - MonoTouch (and Mono for Android) compatibility
-    * [THRIFT-1702] - a thrift manual
-    * [THRIFT-1694] - Re-Enable serialization for WP7 Silverlight
-    * [THRIFT-1691] - Serializer/deserializer support for Delphi
-    * [THRIFT-1688] - Update IDL page markup
-    * [THRIFT-1725] - Tutorial web pages for Delphi and C#
-    * [THRIFT-1714] - [ruby] Explicitly add CWD to Ruby test_suites.rb
-    * [THRIFT-317] - Issues with Java struct validation
-    * [THRIFT-164] - Build web tutorial on Incubator web site
-    * [THRIFT-541] - Cocoa code generator doesn't put keywords before all arguments.
-    * [THRIFT-681] - The HTML generator does not handle JavaDoc style comments very well
-
-## New Feature
-    * [THRIFT-1500] - D programming language support
-    * [THRIFT-1510] - There should be an implementation of the JsonProtocol for ruby
-    * [THRIFT-1115] - python TBase class for dynamic (de)serialization, and __slots__ option for memory savings
-    * [THRIFT-1953] - support for asp.net mvc 3
-
-## Question
-    * [THRIFT-1235] - How could I use THttpServerTransportFactory withTNonBlockingServer
-    * [THRIFT-1368] - TNonblockingServer usage
-    * [THRIFT-1061] - Read an invalid frame size of 0. Are you using TFramedTransport on the client side?
-    * [THRIFT-491] - Ripping raw pthreads out of TFileTransport and associated test issues
-
-## Sub-task
-    * [THRIFT-1596] - Delphi: Test clients should have a return codes that reflect whether they succeeded or not
-    * [THRIFT-982] - javame: add version Info to the library
-    * [THRIFT-1722] - C# WP7 Assembly addition beaks mono build
-    * [THRIFT-336] - Compact Protocol in C#
-
-## Test
-    * [THRIFT-1613] - Add code back into empty source file ToStringTest.java
-    * [THRIFT-1718] - Incorrect check in TFileTransportTest
-
-## Wish
-    * [THRIFT-1463] - Decouple Thrift IDL from generators
-    * [THRIFT-1466] - Proper Documentation for Thrift C Glib
-    * [THRIFT-1539] - Build and distribute the fb303 python libraries along with thrift
-    * [THRIFT-1685] - Please add "aereo.com" to "Powered by Apache Thrift" list in about page
-    * [THRIFT-330] - TProcessor - additional method to called when connection is broken
-
-
-
-Thrift 0.8
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-1436] - pip install thrift fails on Windows with "Unable to find vcvarsall.bat"
-    * [THRIFT-1432] - Javascript struct constants declared in the same file as their struct definition will cause an error
-    * [THRIFT-1428] - shared.thrft does not include namespace for php, so thrift compiler generate incorrect name
-    * [THRIFT-1426] - Dist package missing files for release 0.8
-    * [THRIFT-1425] - The Node package is incompatible with latest node (0.6) & npm (1.0.27)
-    * [THRIFT-1416] - Python Unit test is broken on ci
-    * [THRIFT-1419] - AbstractNonBlockingServer does not catch errors when invoking the processor
-    * [THRIFT-1424] - Ruby specs fail when run with rake
-    * [THRIFT-1420] - Nonblocking and HsHa server should make sure to close all their socket connections when the selector exits
-    * [THRIFT-1413] - Generated code does not read MapEnd / ListEnd / SetEnd
-    * [THRIFT-1409] - Name conflict check does not work properly for exception object(Delphi).
-    * [THRIFT-1408] - Delphi Test Server: Exception test case fails due to naming conflict with e.message
-    * [THRIFT-1407] - Typo in Python socket server causes Thrift to fail when we enable a global socket timout
-    * [THRIFT-1397] - CI server fails during build due to unused parameters in delphi generator
-    * [THRIFT-1404] - Delphi compiler generates struct reader code with problem.
-    * [THRIFT-1400] - Ruby native extension aborts with __stack_chk_fail in OSX
-    * [THRIFT-1399] - One of the TServerImpl.Create CTORs lacks implementation
-    * [THRIFT-1390] - Debian packages build fix for Squeeze (build from the official  0.7.0 tarball)
-    * [THRIFT-1393] - TTransportException's thrown from THttpClient contain superfluous slashes in the Exception message
-    * [THRIFT-1392] - Enabling both namespaces and autoloading in generated PHP code won't work.
-    * [THRIFT-1406] - Build error after applying THRIFT-1395
-    * [THRIFT-1405] - Delphi compiler does not generates container serializer properly.
-    * [THRIFT-1411] - java generator does not provide type parameter for TBaseProcessor
-    * [THRIFT-1473] - JSON context stack may be left in an incorrect state when an exception is thrown during read or write operations
-    * [THRIFT-1331] - Ruby library deserializes an empty map to nil
-    * [THRIFT-1330] - PHP Namespaces no longer generated
-    * [THRIFT-1328] - TBaseHelper.toString(...) appends ByteBuffer data outside of valid buffer range
-    * [THRIFT-1322] - OCaml lib fail to compile: Thrift.ml line 305, int vs int32 mismatch
-    * [THRIFT-1143] - Build doesn't detect correct architecture type on 64bit osx
-    * [THRIFT-1205] - port server unduly fragile with arbitrary input
-    * [THRIFT-1279] - type set is handled incorrectly when writing object
-    * [THRIFT-1298] - Standard scheme doesn't read or write metadata along with field values
-    * [THRIFT-1265] - C++ container deserialize
-    * [THRIFT-1263] - publish ruby client to rubygems
-    * [THRIFT-1384] - Java help menu missing newline near javame flag
-    * [THRIFT-1382] - Bundle install doesnot work because thrift crashes
-    * [THRIFT-1381] - Thrift C++ libs have incorrectly versioned names
-    * [THRIFT-1350] - Go library code does not build as of r60 (most recent release)
-    * [THRIFT-1365] - TupleProtocol#writeBitSet unintentionally writes a variable length byte array
-    * [THRIFT-1359] - --gen-cob cpp:cob_style does not compile anymore
-    * [THRIFT-1319] - Mismatch between how a union reads and writes a container
-    * [THRIFT-1309] - libfb303-0.7.0.jar missing in maven repository
-    * [THRIFT-1238] - Thrift JS client cannot read map of structures
-    * [THRIFT-1254] - Code can't be compiled against a regular JRE: Object.clone() override has a different return type
-    * [THRIFT-1367] - Mac OSX build fails with "no such file to load -- spec/rake/spectask"
-    * [THRIFT-1355] - Running make in lib/rb doesn't build the native extensions
-    * [THRIFT-1370] - Debian packaging should Build-Depend on libglib2.0-dev
-    * [THRIFT-1342] - Compilation problem on Windows of fastbinary.c
-    * [THRIFT-1341] - TProtocol.h endian detection wrong with boost
-    * [THRIFT-1583] - c_glib leaks memory
-    * [THRIFT-1582] - Bad includes of nested thrift files in c_glib
-    * [THRIFT-1578] - C_GLib generated code does not compile
-    * [THRIFT-1027] - 'make -j 16' fails with "unterminated #ifdef" error
-    * [THRIFT-1121] - Java server performance regression in 0.6
-    * [THRIFT-857] - tests run by "make install" fail if generators are disabled
-    * [THRIFT-380] - Use setuptools for python build
-
-## Dependency upgrade
-    * [THRIFT-1257] - thrift's dependency scope on javax.servlet:servlet-api should be 'provided'
-
-## Improvement
-    * [THRIFT-1445] - minor C++ generator variable cleanup
-    * [THRIFT-1435] - make TException.Message property conformant to the usual expectations
-    * [THRIFT-1431] - Rename 'sys' module to 'util'
-    * [THRIFT-1396] - Dephi generator has dependacy on boost 1.42 later.
-    * [THRIFT-1395] - Patch to prevent warnings for integer types in some cases
-    * [THRIFT-1275] -  thrift: always prefix namespaces with " ::"
-    * [THRIFT-1274] -  thrift: fail compilation if an unexpected token is
-    * [THRIFT-1271] -  thrift: fix missing namespace in generated local
-    * [THRIFT-1270] -  thrift: add --allow-neg-keys argument to allow
-    * [THRIFT-1345] - Allow building without tests
-    * [THRIFT-1286] - Modernize the Thrift Ruby Library Dev Environment
-    * [THRIFT-1284] -  thrift: fix processor inheritance
-    * [THRIFT-1283] -  thrift: wrap t_cpp_generator::generate_process_function() to 80
-    * [THRIFT-1282] - Upgrade httpclient to 4.1.2 (from 4.0.1)
-    * [THRIFT-1281] -  add @generated to the docblock
-    * [THRIFT-1280] -  Thrift: Improve Monitor exception-free interfaces
-    * [THRIFT-1278] - javadoc warnings - compilation
-    * [THRIFT-1227] - Erlang implementation of thrift JSON protocol
-    * [THRIFT-1295] - Duplicate include in TSocket.cpp
-    * [THRIFT-1294] -  thrift: fix log message typos in TSimpleServer
-    * [THRIFT-1293] -  thrift: improve handling of exceptions thrown by
-    * [THRIFT-1292] -  thrift: silence log spew from TThreadedServer
-    * [THRIFT-1288] -  Allow typedefed exceptions in throws clauses
-    * [THRIFT-1290] -  thrift: TNonblockingServer: clean up state in the
-    * [THRIFT-1287] -  thrift: start refactoring some of the C++ processor
-    * [THRIFT-1289] -  thrift: implement TNonblockingServer::stop()
-    * [THRIFT-1305] -  thrift: make TConnection a private inner class of
-    * [THRIFT-1304] -  TNonblockingServer: pass in the connection context to
-    * [THRIFT-1302] -  thrift: raise an exception if send() times out in
-    * [THRIFT-1301] -  thrift: consolidate common code in TNonblockingServer
-    * [THRIFT-1377] - abort PHP deserialization on unknown field type
-    * [THRIFT-1379] - fix uninitialized enum values in thrift C++ objects
-    * [THRIFT-1376] - Make port specification option in thrift remote
-    * [THRIFT-1375] - fixed a hex char conversion bug in TJSONProtocol
-    * [THRIFT-1373] - Fix user-defined exception generation in thrift (python)
-    * [THRIFT-1361] - Optional replacement of pthread by boost::thread
-    * [THRIFT-1320] - Consistency of configure generated config.h
-    * [THRIFT-1317] -  Remove copy constructibility from
-    * [THRIFT-1316] -  thrift: update server classes to accept
-    * [THRIFT-1315] -  thrift: generate server interface factory classes
-    * [THRIFT-1314] -  thrift: add TProcessorFactory
-    * [THRIFT-1335] -  Add accept timeout to TServerSocket
-    * [THRIFT-1334] -  Add more info to IllegalStateException
-    * [THRIFT-1333] -  Make RWGuard not copyable
-    * [THRIFT-1332] - TSSLTransportParameters class uses hard coded value keyManagerType: SunX509
-    * [THRIFT-1251] - Generated java code should indicate which fields are required and which are optional
-    * [THRIFT-1387] - Build MSVC libraries with Boost Threads instead of Pthreads
-    * [THRIFT-1339] - Extend Tuple Protocol to TUnions
-    * [THRIFT-1031] - Patch to compile Thrift for vc++ 9.0 and 10.0
-    * [THRIFT-1130] - Add the ability to specify symbolic default value for optional boolean
-    * [THRIFT-1123] - Patch to compile Thrift server and client for vc++ 9.0 and 10.0
-    * [THRIFT-386] - Make it possible to build the Python library without the extension
-
-## New Feature
-    * [THRIFT-1401] - JSON-protocol for Delphi XE Libraries
-    * [THRIFT-1167] - Java nonblocking server with more than one thread for select and handling IO
-    * [THRIFT-1366] - Delphi generator, lirbrary and unit test.
-    * [THRIFT-1354] - Add rake task to build just the gem file
-    * [THRIFT-769] - Pluggable Serializers
-
-## Sub-task
-    * [THRIFT-1415] - delphi: add version Info to the library
-    * [THRIFT-1391] - Improved Delphi XE test cases
-
-
-
-Thrift 0.7
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-1140] - Framed Transport Client using C (Glib) Library hangs when connecting to Ruby Server
-    * [THRIFT-1154] - HttpClient does not specify the connection close parameter
-    * [THRIFT-1153] - HttpClient does not specify the connection close parameter
-    * [THRIFT-1149] - Nonblocking server fails when client connection is reset
-    * [THRIFT-1146] - Android Incompatibility : in Android < 2.3 java.io.IOException doesn't support for Throwable parameter in constructor
-    * [THRIFT-1133] - Java and JavaScript tutorial is broken since we have Java maven deployment
-    * [THRIFT-1132] - Deserialization error in TApplicationException C#
-    * [THRIFT-1131] - C# JSON Protocol is unable to decode escaped characters in string
-    * [THRIFT-1208] - python TCompactProtocol.py writeBool and readBool not follow the compact-proto-spec-2.txt spec for CONTAINER_WRITE, CONTAINER_READ
-    * [THRIFT-1200] - JS compiler generates code that clobbers existing namespaces
-    * [THRIFT-1183] - Pure-ruby CompactProtocol raises ArgumentError when deserializing under Ruby 1.9
-    * [THRIFT-1182] - Native deserializer segfaults on incorrect list element type
-    * [THRIFT-1181] - AS3 compiler generates incorrect code for setting default values in constructor
-    * [THRIFT-1234] - thrift --help is missing doc on py:utf8strings
-    * [THRIFT-1180] - AS3 compiler generates uncompilable code for binary types.
-    * [THRIFT-1194] - Java lib does not install artifacts to local dir correctly
-    * [THRIFT-1193] - Potential infinite loop in nonblocking_server
-    * [THRIFT-1192] - Typo: TProtocol.h tests for HAVE_SYS_PARAM_H_
-    * [THRIFT-1190] - readBufferBytesAllocated in TNonblockingServer.java should be AtomicLong to fix FD leakage and general server malfunction
-    * [THRIFT-1187] - nonblocking_server shutdown race under Ruby 1.9
-    * [THRIFT-1178] - Java: TBase signature should be T extends TBase<?,?>
-    * [THRIFT-1164] - Segmentation fault on NULL pointer in t_js_generator::generate_const
-    * [THRIFT-1171] - Perl write/readDouble assumes little-endian platform
-    * [THRIFT-1222] - Unhandled exception for TEvhttpServer request
-    * [THRIFT-1220] - TProcessor::process never returns false
-    * [THRIFT-1285] - Stable 0.7.0 Windows compiler exe available on the webside is not the good one
-    * [THRIFT-1218] - c_glib uses wrong name in pkg-config
-    * [THRIFT-1215] - Undefined property Thirft in lib/js/thrift.js
-    * [THRIFT-1211] - When using THttpClient, non 200 responses leave the connection open
-    * [THRIFT-1228] - The php accelerator module calls flush incorrectly
-    * [THRIFT-1308] - libfb303-0.7.0.jar missing in maven repository
-    * [THRIFT-1255] - Mismatch of method name between JavaME's lib and generated code (compareTo/compareObjects)
-    * [THRIFT-1253] - Code generated for maps is not compiling
-    * [THRIFT-1252] - Segfault in Ruby deserializer
-    * [THRIFT-1094] - bug in TCompactProto python readMessageEnd method and updated test cases
-    * [THRIFT-1093] - several bugs in python TCompactProtocol
-    * [THRIFT-1092] - generated validate() method has wrong indentation
-    * [THRIFT-1011] - Error generating package imports when using classes from other packages
-    * [THRIFT-1050] - Declaring an argument named "manager" to a service method produces code that fails compile due to name conflicts with protected ivars in TAsyncClient
-    * [THRIFT-1074] - .keystore and .truststore are missing from the 0.6.0 distribution
-    * [THRIFT-1067] - Tons of bugs in php implementation
-    * [THRIFT-1065] - Unexpected exceptions not proper handled on JS
-    * [THRIFT-1076] - Erlang Thrift socket server has a bug that causes java thrift client of framed binary client to throw "out of sequence" exception
-    * [THRIFT-1057] - casts in TBinaryProtocol.tcc causing "dereferencing type-punned pointer will break strict-aliasing rules" warnings from gcc
-    * [THRIFT-1055] - csharp TServerSocket and TSocket do not disable Nagle via Socket.NoDelay = true like cpp and java do
-    * [THRIFT-1054] - explicit call to PKG_PROG_PKG_CONFIG is missing and first use of PKG_CHECK_MODULES may not happen, causes mono detection to fail
-    * [THRIFT-1117] - JavaScript Unit Test does not work anymore because libthrift*.jar where moved by Maven Deployment
-    * [THRIFT-1111] - The HTML generator does not distinguish between string and binary types
-    * [THRIFT-1032] - "make dist" fails due to c_glib problem
-    * [THRIFT-1036] - Auto-generated C++ code fails to compile with "-Werror -Wextra -Wall" g++ compiler flags
-    * [THRIFT-1041] - TDeserializer holds onto a reference of the array it reads after it is done deserializing
-    * [THRIFT-1106] - C++ code TAsyncProtocolProcessor.h & TAsyncBufferProcessor.h dont have virtual functions but no virtual destructor. Causes warnings on -Wall
-    * [THRIFT-1105] - OCaml generator does not prefix methods of included structs with their type
-    * [THRIFT-1104] - INSTALLDIRS should be included in configure script
-    * [THRIFT-1102] - typo in configure.ac: "==" operator in 'test' (instead of"'=")
-    * [THRIFT-1101] - bytebuffer length calculation in TBinaryProtocol writeBinary
-    * [THRIFT-1098] - Undefined properties in TBinaryProtocolFactory
-    * [THRIFT-1081] - PHP tests broken and somewhat incomplete
-    * [THRIFT-1080] - erlang test's 'make' fails on Mac OSX
-    * [THRIFT-1078] - ThriftTest.thrift generates invalid PHP library
-    * [THRIFT-1120] - proto.WriteListEnd being called in the wrong place
-    * [THRIFT-1119] - TJSONProtocol fails to UTF8 decode strings
-    * [THRIFT-867] - PHP accelerator module's output transport is incompatible with TFramedTransport
-    * [THRIFT-826] - PHP TSocket Write Timeout
-    * [THRIFT-835] - Bad AS3 syntax in constructors that set default values
-    * [THRIFT-788] - thrift_protocol.so: multiget/multiget_slice does not handle more than 17 keys correctly
-    * [THRIFT-125] - OCaml libraries don't compile with 32-bit ocaml
-    * [THRIFT-342] - PHP: can't have sets of complex types
-    * [THRIFT-731] - configure doesn't check for ant >= 1.7
-    * [THRIFT-690] - Update TApplicationException codes
-    * [THRIFT-638] - BufferedTransport + C extensions block until recv timeout is reached on last fread call
-
-## Dependency upgrade
-    * [THRIFT-1177] - Update thrift to reflect changes in Go's networking libraries
-
-## Improvement
-    * [THRIFT-1155] - Remove log4j dependency from java client
-    * [THRIFT-1151] - Produce more informative runtime error in case of schema and data mismatch during serialization
-    * [THRIFT-1207] - Support DESTDIR on "make install" of ruby libs
-    * [THRIFT-1199] - Union structs should have generated methods to test whether a specific field is currently set
-    * [THRIFT-1233] - Remove unused include in generated C++ code
-    * [THRIFT-1189] - Ruby deserializer speed improvements
-    * [THRIFT-1170] - Thrift Generated Code and Java 5
-    * [THRIFT-1174] - Publish as3 client implementation via Maven for use by flex-mojos users
-    * [THRIFT-1225] - TCompactProtocol for PHP
-    * [THRIFT-1221] - Remove SimpleCallback.h
-    * [THRIFT-1217] - Use evutil_socketpair instead of pipe (Windows port)
-    * [THRIFT-1216] - build Java Library behind a proxy
-    * [THRIFT-1231] - Remove bogus include
-    * [THRIFT-1213] - Membuffer should provide a way to get back the buffer
-    * [THRIFT-1237] - Java fb303 missing some methods
-    * [THRIFT-1063] - Fix Erlang Tutorial Files
-    * [THRIFT-1053] - Make remote client's IP address available for all socket related transports
-    * [THRIFT-1109] - Deploy fb303 along side libthrift to maven repo
-    * [THRIFT-1107] - improvement for compiler-generated python for 'None' object comparisons
-    * [THRIFT-1069] - Add command line option to prevent thrift from inserting gen-* directories
-    * [THRIFT-1049] - Allow for TServerSocket python library to bind to a specific host
-    * [THRIFT-1126] - Extending struct_info for erlang bindings
-    * [THRIFT-1100] - python TSSLSocket improvements, including certificate validation
-    * [THRIFT-994] - Don't try to invoke phpize if we don't have it
-    * [THRIFT-993] - Some improvements in C++ stubs for oneway operations
-    * [THRIFT-997] - Using valueOf for base types in getFieldValue
-    * [THRIFT-418] - Don't do runtime sorting of struct fields
-    * [THRIFT-151] - TSSLServerSocket and TSSLSocket implementation
-    * [THRIFT-27] - Generated erlang types don't contain default values for records
-    * [THRIFT-113] - to-string methods should omit optional null fields from output
-    * [THRIFT-363] - Maven Deploy
-    * [THRIFT-447] - Make an abstract base Client class so we can generate less code
-    * [THRIFT-627] - should c++ have setters for optional fields?
-
-## New Feature
-    * [THRIFT-1236] - Erlang Reconnecting Thrift Client
-    * [THRIFT-1021] - Framed transport support for OCaml
-    * [THRIFT-1068] - Python SSL Socket Support
-    * [THRIFT-1103] - TZlibTransport for python, a zlib compressed transport
-    * [THRIFT-1083] - Preforking python process pool server
-    * [THRIFT-999] - Add TForkingServer
-
-## Sub-task
-    * [THRIFT-1152] - Attributes from private to protected
-    * [THRIFT-1038] - Generated Java code for structures containing binary fields (or collections thereof) are not serializable (in the Java sense) even though they implement java.io.Serializable
-
-## Task
-    * [THRIFT-892] - Refactor erlang build system with rebar
-
-## Wish
-    * [THRIFT-625] - Add support for 'Go'
-
-
-
-Thrift 0.6.1
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-1133] - Java and JavaScript tutorial is broken since we have Java maven deployment
-    * [THRIFT-1131] - C# JSON Protocol is unable to decode escaped characters in string
-    * [THRIFT-1074] - .keystore and .truststore are missing from the 0.6.0 distribution
-
-## Improvement
-    * [THRIFT-1109] - Deploy fb303 along side libthrift to maven repo
-    * [THRIFT-363] - Maven Deploy
-
-## Question
-    * [THRIFT-1206] - did the THRIFT 0.6.1 merge THRIFT-563 ?
-
-## Sub-task
-    * [THRIFT-1163] - How can i use multi service in one program?
-
-## Task
-    * [THRIFT-1112] - Apply THRIFT-363 to 0.6 branch
-    * [THRIFT-1113] - Apply THRIFT-1074 to 0.6 branch
-
-
-
-Thrift 0.6
---------------------------------------------------------------------------------
-## Bug
-    * [THRIFT-1020] - OCaml compiler generates invalid OCaml
-    * [THRIFT-1015] - TUnion does not handle ByteBuffer in toString
-    * [THRIFT-1013] - generated java code may have name clashes with thrift library
-    * [THRIFT-1009] - TUnion does not correctly deep copy a ByteBuffer
-    * [THRIFT-1032] - "make dist" fails due to c_glib problem
-    * [THRIFT-868] - Referencing constant values doesn't work with with typedef types
-    * [THRIFT-971] - java module can't be compiled without ivy and network connection
-    * [THRIFT-970] - Under heavy load, THttpClient may fail with "too many open files"
-    * [THRIFT-969] - Java Tutorial broken, move CalculatorHandler to a separate file
-    * [THRIFT-807] - JavaScript: Initialization of Base Types with 0 instead of null
-    * [THRIFT-955] - Thrift compiler for Windows uses lowercase names and directories which is inconsistent with compiling on other platforms
-    * [THRIFT-992] - Naming convention in C# constructor is not consistent with other fields causes compile errors
-    * [THRIFT-1008] - byte[] accessors throw NPE on unset field
-    * [THRIFT-1006] - Impossible to correctly qualify an enum constant in an external thrift file
-    * [THRIFT-950] - Haskell bindings treat 'byte' as unsigned 8-bit int (Data.Word.Word8), java/cpp as signed (byte/int8_t).
-    * [THRIFT-975] - lib/c_glib/README is missing => breaks make dist
-    * [THRIFT-944] - Support all version-4s of base
-    * [THRIFT-939] - optional binary fields throw NPE on default byte[] getters
-    * [THRIFT-935] - PHP Extension aborts the build if php-config is not installed
-    * [THRIFT-933] - Haskell's Thrift.cabal has warnings
-    * [THRIFT-932] - Haskell tests need to be run through 'make check' (and probably 'cabal check') too
-    * [THRIFT-904] - C# TSocket should disable nagle and linger
-    * [THRIFT-941] - Make PHP C Extension use the defined Protocol writeMessageBegin function
-    * [THRIFT-940] - 'make check' fails if boost is not in the std include and link paths
-    * [THRIFT-924] - Fix generated php structure constants
-    * [THRIFT-979] - ruby bindings used to work on jruby
-    * [THRIFT-977] - Hex Conversion Bug in C++ TJSONProtocol
-    * [THRIFT-347] - PHP TSocket Timeout Issues
-    * [THRIFT-517] - TExceptions thrown by server result in cryptic error message on client - Tried to read 4 bytes, but only got 0 bytes
-
-## Improvement
-    * [THRIFT-1024] - Add Python Twisted example to the Tutorial
-    * [THRIFT-958] - Change accessmodifer on trans_ field in the FrameBuffer class to public.
-    * [THRIFT-957] - THsHaServer: Change access modifier of the invoker field.
-    * [THRIFT-1002] - CodeStyle: t_c_glib_generator.cc
-    * [THRIFT-1005] - Give unions byte[] signature methods to go along with their ByteBuffer counterparts
-    * [THRIFT-951] - Add a new isServing() method to TServer
-    * [THRIFT-943] - Silly readme typo fix.
-    * [THRIFT-961] - JavaScript TestSuite using ant/ivy and Java's ServerTestBase Handler
-    * [THRIFT-960] - add TestServer, TestNonblockingServer and TestClient again
-    * [THRIFT-949] - Modify the TEnum interface so it defines a method similar to findByValue
-    * [THRIFT-946] - Augment FieldValueMetaData so it differentiates 'string' and 'binary' fields.
-    * [THRIFT-903] - custom ThreadFactory in THsHaServer
-    * [THRIFT-913] - Test Case for Url encoded strings + simple enhancement to lib/js/test/RunTestServer.sh
-    * [THRIFT-926] - Miscellaneous C++ improvements
-    * [THRIFT-929] - Improvements to the C++ test suite
-    * [THRIFT-893] - add JavaScript to the tutorial examples
-    * [THRIFT-1003] - Polishing c_glib code
-    * [THRIFT-71] - Debian packaging for thrift
-
-## New Feature
-    * [THRIFT-1033] - Node.js language target
-    * [THRIFT-947] - Provide a helper method to determine the TProtocol used to serialize some data.
-    * [THRIFT-928] - Make more statistics available in C++ servers
-    * [THRIFT-922] - Templatized [de]serialization code for C++
-    * [THRIFT-923] - Event-driven client and server support for C++
-    * [THRIFT-925] - Provide name<->value map for enums in C++
-    * [THRIFT-927] - Add option to modify the PHP include path
-    * [THRIFT-377] - TFileTransport port in Java
-    * [THRIFT-106] - TSSLServerSocket
-    * [THRIFT-582] - C implementation of Thrift
-    * [THRIFT-745] - Make it easier to instantiate servers
-
-## Sub-task
-    * [THRIFT-1038] - Generated Java code for structures containing binary fields (or collections thereof) are not serializable (in the Java sense) even though they implement java.io.Serializable
-
-## Task
-    * [THRIFT-862] - Async client issues / improvements
-
-## Test
-    * [THRIFT-581] - Add a testsuite for txThrift (Twisted)
-
-
-
-Thrift 0.5.0 - Incubating
---------------------------------------------------------------------------------
-THRIFT-505   Build                Make configure give a summary of the enabled components (David Reiss)
-THRIFT-506   Build                Allow Thrift to be built without the C++ library (David Reiss)
-THRIFT-844   Build                Build Requirements state autoconf 2.59+ is required, but 2.60+ is needed (Harlan Lieberman-Berg)
-THRIFT-850   Build                Perl runtime requires Bit::Vector which may not be installed by default, but configure does not fail (Michael Lum)
-THRIFT-854   Build                Provide configure option and make rules to build/install php extension (Anthony Molinaro)
-THRIFT-858   Build                Have bootstrap.sh check for a suitable autoconf version before running (David Reiss)
-THRIFT-871   Build                Thrift compiler for WIndows (binary distribution) (David Reiss)
-THRIFT-323   C#                   TJSONProtocol (Roger Meier)
-THRIFT-634   C#                   C# Compiler Generates Incorrect Code For Fields which begin with an uppercase letter (Jon S Akhtar)
-THRIFT-881   C#                   add csharp to the tutorial (Roger Meier)
-THRIFT-856   C++                  Building cpp library fails on OS X with malloc and free not being declared in scope (James Clarke)
-THRIFT-865   C++                  C++ compiler build depends on libfl even when flex/lex not detected (David Reiss)
-THRIFT-900   C++                  Unix domain socket (Roger Meier)
-THRIFT-920   C++                  C++ Test and Tutorial does not compile anymore due to the change within Enum handling (Roger Meier)
-THRIFT-567   C++                  Can't immediately stop a TSimpleServer thread that is idle (Rush Manbert)
-THRIFT-756   C++                  Exposing TSocket(int) constructor to public (Rajat Goel)
-THRIFT-798   C++                  TNonblockingServer leaks resources when destroyed (David Reiss)
-THRIFT-812   C++, Python          Demo of Thrift over ZeroMQ (David Reiss)
-THRIFT-629   Cocoa                Unused Field In TSocketServer Appears To Break iPhone Build (Jon S Akhtar)
-THRIFT-838   Cocoa                Generated Cocoa classes have useless @dynamic declarations (Kevin Ballard)
-THRIFT-805   Cocoa                Don't generate process_XXXX methods for oneway methods (Brad Taylor)
-THRIFT-507   Compiler             Remove the compiler's dependency on Boost (David Reiss)
-THRIFT-895   Compiler (General)   Thrift compiler does not allow two different enumerations to have the same key name for one of the enum values (David Reiss)
-THRIFT-852   Compiler (General)   Missing newline causes many compiler warnings (Anthony Molinaro)
-THRIFT-877   Compiler (General)   smalltalk namespace doesn't work (Bruce Lowekamp)
-THRIFT-897   Compiler (General)   Don't allow unqualified constant access to enum values (Bryan Duxbury)
-THRIFT-9     Compiler (General)   Add a default namespace declaration for all languages (David Reiss)
-THRIFT-599   Erlang               Don't use unnecessary processes in the Erlang transports and clients (David Reiss)
-THRIFT-646   Erlang               Erlang library is missing install target (David Reiss)
-THRIFT-698   Erlang               Generated module list should contain atoms, not strings (Anthony Molinaro)
-THRIFT-866   Erlang               term() in spec definitions seems to not work in erlang R12 (Anthony Molinaro)
-THRIFT-886   Erlang               Dialyzer warning (Anthony Molinaro)
-THRIFT-785   Erlang               Framed transport server problems (Anthony Molinaro)
-THRIFT-884   HTML                 HTML Generator: add Key attribute to the Data Types Tables (Roger Meier)
-THRIFT-652   Haskell              Generated field name for strut is not capitalized correctly (Christian Lavoie)
-THRIFT-743   Haskell              compile error with GHC 6.12.1 (Christian Lavoie)
-THRIFT-901   Haskell              Allow the bindings to compile without -fglasgow-exts and with -Wall -Werror (Christian Lavoie)
-THRIFT-905   Haskell              Make haskell thrift bindings use automake to compile and install (Christian Lavoie)
-THRIFT-906   Haskell              Improve type mappings (Christian Lavoie)
-THRIFT-914   Haskell              Make haskell bindings 'easily' compilable (Christian Lavoie)
-THRIFT-918   Haskell              Make haskell tests run again (Christian Lavoie)
-THRIFT-919   Haskell              Update Haskell bindings README (Christian Lavoie)
-THRIFT-787   Haskell              Enums are not read correctly (Christian Lavoie)
-THRIFT-250   Java                 ExecutorService as a constructor parameter for TServer (Ed Ceaser)
-THRIFT-693   Java                 Thrift compiler generated java code that throws compiler warnings about deprecated methods. (Bryan Duxbury)
-THRIFT-843   Java                 TNonblockingSocket connects without a timeout (Bryan Duxbury)
-THRIFT-845   Java                 async client does not respect timeout (Ning Liang)
-THRIFT-870   Java                 Java constants don't get Javadoc comments (Bryan Duxbury)
-THRIFT-873   Java                 Java tests fail due to Too many open files (Todd Lipcon)
-THRIFT-876   Java                 Add SASL support (Aaron T. Myers)
-THRIFT-879   Java                 Remove @Override from TUnion.clear (Dave Engberg)
-THRIFT-882   Java                 deep copy of binary fields does not copy ByteBuffer characteristics (arrayOffset, position) (Bryan Duxbury)
-THRIFT-888   Java                 async client should also have nonblocking connect (Eric Jensen)
-THRIFT-890   Java                 Java tutorial doesn't work (Todd Lipcon)
-THRIFT-894   Java                 Make default accessors for binary fields return byte[]; provide new accessors to get ByteBuffer version (Bryan Duxbury)
-THRIFT-896   Java                 TNonblockingSocket.isOpen() returns true even after close() (Eric Jensen)
-THRIFT-907   Java                 libfb303 doesn't compile in 0.4.0 (Todd Lipcon)
-THRIFT-912   Java                 Improvements and bug fixes to SASL implementation (Todd Lipcon)
-THRIFT-917   Java                 THsHaServer should not accept an ExecutorService without catching RejectedExecutionException (Ed Ceaser)
-THRIFT-931   Java                 Use log4j for Java tests (Todd Lipcon)
-THRIFT-880   JavaME               JavaME code generator and runtime library (Dave Engberg)
-THRIFT-846   JavaScript           JavaScript Test Framwork: extended Testcases (Roger Meier)
-THRIFT-885   JavaScript           Url encoded strings never get decoded? How do we fix this? (T Jake Luciani)
-THRIFT-911   JavaScript           (JavaScript compiler) Const structs, maps, sets, and lists generate a trailing comma (T Jake Luciani)
-THRIFT-860   OCaml                copy method and reset method (Lev Walkin)
-THRIFT-682   PHP                  PHP extension doesn't compile on Mac OS X (Bryan Duxbury)
-THRIFT-851   PHP                  php extension fails to compile on centos 5.x (Todd Lipcon)
-THRIFT-840   Perl                 Perl protocol handler could be more robust against unrecognised types (Conrad Hughes)
-THRIFT-758   Perl                 incorrect deference in exception handling (Yann Kerherve)
-THRIFT-257   Python               Support validation of required fields (Esteve Fernandez)
-THRIFT-335   Python               Compact Protocol for Python (David Reiss)
-THRIFT-596   Python               Make Python's TBufferedTransport use a configurable input buffer (David Reiss)
-THRIFT-597   Python               Python THttpServer performance improvements (David Reiss)
-THRIFT-598   Python               Allow Python's threading servers to use daemon threads (David Reiss)
-THRIFT-666   Python               Allow the handler to override HTTP responses in THttpServer (David Reiss)
-THRIFT-673   Python               Generated Python code has whitespace issues (Ian Eure)
-THRIFT-721   Python               THttpClient ignores url parameters (Thomas Kho)
-THRIFT-824   Python               TApplicationException.__str__() refers to class constants as globals (Peter Schuller)
-THRIFT-855   Python               Include optimized compiled python objects in install (Anthony Molinaro)
-THRIFT-859   Python               Allow py:twisted to be generated in different namespace than py (Bruce Lowekamp)
-THRIFT-869   Python               TSocket.py on Mac (and FreeBSD) doesn't handle ECONNRESET from recv() (Steven Knight)
-THRIFT-875   Python               Include python setup.cfg in dist (Anthony Molinaro)
-THRIFT-610   Ruby                 binary_protocol.rb segfaults [line 86] (Unassigned)
-THRIFT-899   Ruby                 Ruby read timeouts can sometimes be 2x what they should be (Ryan King)
-THRIFT-909   Ruby                 allow block argument to struct constructor (Michael Stockton)
-THRIFT-456   Test Suite           Bad IP address string in test/cpp/src/main.cpp (Rush Manbert)
-
-
-Thrift 0.4.0 - Incubating
---------------------------------------------------------------------------------
-THRIFT-650   Build        Make Check fails on Centos/OSX with 0.2.0 tarball (Anthony Molinaro)
-THRIFT-770   Build        Get 'make dist' to work without first compiling source code (Anthony Molinaro)
-THRIFT-160   C#           Created THttpTransport for the C# library based on WebHttpRequest (Michael Greene)
-THRIFT-834   C#           THttpClient resends contents of message after transport errors (Anatoly Fayngelerin)
-THRIFT-247   C++          THttpServer Transport (Unassigned)
-THRIFT-676   C++          Change C++ code generator so that generated classes can be wrapped with SWIG (Unassigned)
-THRIFT-570   Compiler     Thrift compiler does not error when duplicate method names are present (Bruce Simpson)
-THRIFT-808   Compiler     Segfault when constant declaration references a struct field that doesn't exist (Bryan Duxbury)
-THRIFT-646   Erlang       Erlang library is missing install target (Anthony Molinaro)
-THRIFT-544   General      multiple enums with the same key generate invalid code (Ben Taitelbaum)
-THRIFT-434   General      ruby compiler should warn when a reserved word is used (Michael Stockton)
-THRIFT-799   General      Files missing proper Apache license header (Bryan Duxbury)
-THRIFT-832   HTML         HTML generator shows unspecified struct fields as 'required' (Bryan Duxbury)
-THRIFT-226   Java         Collections with binary keys or values break equals() (Bryan Duxbury)
-THRIFT-484   Java         Ability to use a slice of a buffer instead of a direct byte[] for binary fields (Bryan Duxbury)
-THRIFT-714   Java         maxWorkerThreads parameter to THsHaServer has no effect (Bryan Duxbury)
-THRIFT-751   Java         Add clear() method to TBase (Bryan Duxbury)
-THRIFT-765   Java         Improved string encoding and decoding performance (Bryan Duxbury)
-THRIFT-768   Java         Async client for Java (Bryan Duxbury)
-THRIFT-774   Java         TDeserializer should provide a partialDeserialize method for primitive types (Piotr Kozikowski)
-THRIFT-783   Java         .equals java method is broken on structs containing binary-type fields (Unassigned)
-THRIFT-804   Java         CompareTo is broken for unions set to map, set, or list (Bryan Duxbury)
-THRIFT-814   Java         Include a TServlet in the standard Thrift distribution (Mathias Herberts)
-THRIFT-818   Java         Async client doesn't send method args (Bryan Duxbury)
-THRIFT-830   Java         Switch binary field implementation from byte[] to ByteBuffer (Bryan Duxbury)
-THRIFT-831   Java         FramedTransport implementation that reuses its buffers (Bryan Duxbury)
-THRIFT-833   Java         build.xml in lib/java is missing a classpathref attribute for the javadoc task (Bryan Duxbury)
-THRIFT-836   Java         Race condition causes CancelledKeyException in TAsyncClientManager (Bryan Duxbury)
-THRIFT-842   Java         Upgrade to current version of commons-lang (2.5 instead of 2.4) and/or change dependency in ivy.xml to not be exact (Bryan Duxbury)
-THRIFT-815   JavaScript   Deserialization of lists is critically broken. (T Jake Luciani)
-THRIFT-827   OCaml        OCaml generator to take default values into account (Lev Walkin)
-THRIFT-647   PHP          PHP library is missing install target (Anthony Molinaro)
-THRIFT-682   PHP          PHP extension doesn't compile on Mac OS X (Bryan Duxbury)
-THRIFT-718   PHP          Thrift PHP library includes closing tags and extraneous whitespace (Nicholas Telford)
-THRIFT-778   PHP          PHP socket listening server (Nick Jones)
-THRIFT-780   PHP          PHP extension sometimes causes an abort with two exceptions at the same time (David Reiss)
-THRIFT-837   PHP          PHP accelerator bug for writes > 8k (Thomas Kho)
-THRIFT-782   Perl         Perl code for writing containers doesn't count length of write*Begin or write*End (Conrad Hughes)
-THRIFT-395   Python       Python library + compiler does not support unicode strings (Unassigned)
-THRIFT-133   Ruby         'namespace ruby' should error out, or be an alias to 'namespace rb' (Bryan Duxbury)
-THRIFT-664   Ruby         Ruby extension fails to build with Ruby 1.9.1 (Rajesh Malepati)
-THRIFT-699   Ruby         Excise unused "native protocol method table" stuff from thrift_native (Bryan Duxbury)
-THRIFT-767   Ruby         ruby compiler does not keep comments for enum values (Bryan Duxbury)
-THRIFT-811   Ruby         http_client_transport.rb: allow custom http headers (Tony Kamenick)
-THRIFT-459   Ruby         Ruby installation always tries to write to /Library/Ruby/site (Matthieu Imbert)
-
-
-Thrift 0.1.0 - Incubating (not released)
---------------------------------------------------------------------------------
-Compatibility Breaking Changes:
-  C++:
-    * It's quite possible that regenerating code and rebuilding will be
-      required.  Make sure your headers match your libs!
-
-  Java:
-
-  Python:
-
-  Ruby:
-    * Generated files now have underscored names [THRIFT-421]
-    * The library has been rearranged to be more Ruby-like [THRIFT-276]
-
-  Erlang:
-    * Generated code will have to be regenerated, and the new code will
-      have to be deployed atomically with the new library code [THRIFT-136]
-
-New Features and Bug Fixes:
-  C++:
-    * Support for TCompactProtocol [THRIFT-333]
-
-  Java:
-    * Support for TCompactProtocol [THRIFT-110]
-
-  Python:
-    * Support for Twisted [THRIFT-148]
-
-  Ruby:
-    * Support for TCompactProtocol [THRIFT-332]
-
diff --git a/vendor/git.apache.org/thrift.git/CMakeLists.txt b/vendor/git.apache.org/thrift.git/CMakeLists.txt
deleted file mode 100644
index 93ed8d2..0000000
--- a/vendor/git.apache.org/thrift.git/CMakeLists.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-cmake_minimum_required(VERSION 2.8.12)
-
-project("Apache Thrift")
-
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
-
-# TODO: add `git rev-parse --short HEAD`
-# Read the version information from the Autoconf file
-file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC REGEX "AC_INIT\\(.*\\)" )
-
-# The following variable is used in the version.h.in file
-string(REGEX REPLACE "AC_INIT\\(\\[.*\\], \\[([0-9]+\\.[0-9]+\\.[0-9]+(-dev)?)\\]\\)" "\\1" PACKAGE_VERSION ${CONFIGURE_AC})
-message(STATUS "Parsed Thrift package version: ${PACKAGE_VERSION}")
-
-# These are internal to CMake
-string(REGEX REPLACE "([0-9]+\\.[0-9]+\\.[0-9]+)(-dev)?" "\\1" thrift_VERSION ${PACKAGE_VERSION})
-string(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" thrift_VERSION_MAJOR ${thrift_VERSION})
-string(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" thrift_VERSION_MINOR ${thrift_VERSION})
-string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" thrift_VERSION_PATCH ${thrift_VERSION})
-message(STATUS "Parsed Thrift version: ${thrift_VERSION} (${thrift_VERSION_MAJOR}.${thrift_VERSION_MINOR}.${thrift_VERSION_PATCH})")
-
-# Some default settings
-include(DefineCMakeDefaults)
-
-# Build time options are defined here
-include(DefineOptions)
-include(DefineInstallationPaths)
-
-# Based on the options set some platform specifics
-include(DefinePlatformSpecifc)
-
-# Generate the config.h file
-include(ConfigureChecks)
-
-# Package it
-include(CPackConfig)
-
-
-find_package(Threads)
-
-include(CTest)
-if(BUILD_TESTING)
-  message(STATUS "Building with unittests")
-
-  enable_testing()
-  # Define "make check" as alias for "make test"
-  add_custom_target(check COMMAND ctest)
-else ()
-  message(STATUS "Building without tests")
-endif ()
-
-if(BUILD_COMPILER)
-    if(NOT EXISTS ${THRIFT_COMPILER})
-        set(THRIFT_COMPILER $<TARGET_FILE:thrift-compiler>)
-    endif()
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/compiler/cpp)
-elseif(EXISTS ${THRIFT_COMPILER})
-    add_executable(thrift-compiler IMPORTED)
-    set_property(TARGET thrift-compiler PROPERTY IMPORTED_LOCATION ${THRIFT_COMPILER})
-endif()
-
-if(BUILD_CPP)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/cpp)
-    if(BUILD_TUTORIALS)
-        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tutorial/cpp)
-    endif()
-    if(BUILD_TESTING)
-        if(WITH_LIBEVENT AND WITH_ZLIB AND WITH_OPENSSL)
-            add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test/cpp)
-        else()
-            message(WARNING "libevent and/or ZLIB and/or OpenSSL not found or disabled; will not build some tests")
-        endif()
-    endif()
-endif()
-
-if(BUILD_C_GLIB)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/c_glib)
-endif()
-
-if(BUILD_JAVA)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/java)
-endif()
-
-if(BUILD_PYTHON)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/py)
-    if(BUILD_TESTING)
-        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test/py)
-    endif()
-endif()
-
-if(BUILD_HASKELL)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/hs)
-    if(BUILD_TESTING)
-        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test/hs)
-    endif()
-endif()
-
-PRINT_CONFIG_SUMMARY()
diff --git a/vendor/git.apache.org/thrift.git/CONTRIBUTING.md b/vendor/git.apache.org/thrift.git/CONTRIBUTING.md
deleted file mode 100644
index 316da9a..0000000
--- a/vendor/git.apache.org/thrift.git/CONTRIBUTING.md
+++ /dev/null
@@ -1,49 +0,0 @@
-## How to contribute
- 1. Help to review and verify existing patches
- 1. Make sure your issue is not all ready in the [Jira issue tracker](http://issues.apache.org/jira/browse/THRIFT)
- 1. If not, create a ticket describing the change you're proposing in the [Jira issue tracker](http://issues.apache.org/jira/browse/THRIFT)
- 1. Contribute your patch using one of the two methods below
-
-### Contributing via a patch
-
-1. Check out the latest version of the source code
-
-  * git clone https://git-wip-us.apache.org/repos/asf/thrift.git thrift
-
-1. Modify the source to include the improvement/bugfix
-
-  * Remember to provide *tests* for all submited changes
-  * When bugfixing: add test that will isolate bug *before* applying change that fixes it
-  * Verify that you follow [Thrift Coding Standards](/docs/coding_standards) (you can run 'make style', which ensures proper format for some languages)
-
-1. Create a patch from project root directory (e.g. you@dev:~/thrift $ ):
-
-  * git diff > ../thrift-XXX-my-new-feature.patch
-
-1. Attach the newly generated patch to the issue
-1. Wait for other contributors or committers to review your new addition
-1. Wait for a committer to commit your patch
-
-### Contributing via GitHub pull requests
-
-1. Create a fork for http://github.com/apache/thrift
-1. Create a branch for your changes(best practice is issue as branch name, e.g. THRIFT-9999)
-1. Modify the source to include the improvement/bugfix
-
-  * Remember to provide *tests* for all submited changes
-  * When bugfixing: add test that will isolate bug *before* applying change that fixes it
-  * Verify that you follow [Thrift Coding Standards](/docs/coding_standards) (you can run 'make style', which ensures proper format for some languages)
-  * Verify that your change works on other platforms by adding a GitHub service hook to [Travis CI](http://docs.travis-ci.com/user/getting-started/#Step-one%3A-Sign-in) and [AppVeyor](http://www.appveyor.com/docs)
-
-1. Commit and push changes to your branch (please use issue name and description as commit title, e.g. THRIFT-9999 make it perfect)
-1. Issue a pull request with the jira ticket number you are working on in it's name
-1. Wait for other contributors or committers to review your new addition
-1. Wait for a committer to commit your patch
-
-### More info
-
- Plenty of information on why and how to contribute is available on the Apache Software Foundation (ASF) web site. In particular, we recommend the following:
-
- * [Contributors Tech Guide](http://www.apache.org/dev/contributors)
- * [Get involved!](http://www.apache.org/foundation/getinvolved.html)
- * [Legal aspects on Submission of Contributions (Patches)](http://www.apache.org/licenses/LICENSE-2.0.html#contributions)
diff --git a/vendor/git.apache.org/thrift.git/Dockerfile b/vendor/git.apache.org/thrift.git/Dockerfile
deleted file mode 100644
index 0d7ad21..0000000
--- a/vendor/git.apache.org/thrift.git/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Goal: provide a thrift-compiler Docker image
-#
-# Usage:
-#   docker run -v "${PWD}:/data" thrift/thrift-compiler  -gen cpp -o /data/ /data/test/ThriftTest.thrift
-#
-# further details on docker for thrift is here build/docker/
-#
-# TODO: push to apache/thrift-compiler instead of thrift/thrift-compiler
-
-FROM debian:jessie
-MAINTAINER Apache Thrift <dev@thrift.apache.org>
-
-ENV DEBIAN_FRONTEND noninteractive
-
-ADD . /thrift
-
-RUN buildDeps=" \
-        flex \
-        bison \
-        g++ \
-        make \
-        cmake \
-        curl \
-        "; \
-    apt-get update && apt-get install -y --no-install-recommends $buildDeps \
-    && mkdir /tmp/cmake-build && cd /tmp/cmake-build \
-    && cmake \
-       -DBUILD_COMPILER=ON \
-       -DBUILD_LIBRARIES=OFF \
-       -DBUILD_TESTING=OFF \
-       -DBUILD_EXAMPLES=OFF \
-       /thrift \
-    && cmake --build . --config Release \
-    && make install \
-    && curl -k -sSL "https://storage.googleapis.com/golang/go1.5.2.linux-amd64.tar.gz" -o /tmp/go.tar.gz \
-    && tar xzf /tmp/go.tar.gz -C /tmp \
-    && cp /tmp/go/bin/gofmt /usr/bin/gofmt \
-    && apt-get purge -y --auto-remove $buildDeps \
-    && apt-get clean \
-    && rm -rf /tmp/* \
-    && rm -rf /var/lib/apt/lists/*
-
-ENTRYPOINT ["thrift"]
diff --git a/vendor/git.apache.org/thrift.git/LICENSE b/vendor/git.apache.org/thrift.git/LICENSE
deleted file mode 100644
index 3b6d7d7..0000000
--- a/vendor/git.apache.org/thrift.git/LICENSE
+++ /dev/null
@@ -1,239 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---------------------------------------------------
-SOFTWARE DISTRIBUTED WITH THRIFT:
-
-The Apache Thrift software includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
---------------------------------------------------
-Portions of the following files are licensed under the MIT License:
-
-  lib/erl/src/Makefile.am
-
-Please see doc/otp-base-license.txt for the full terms of this license.
-
---------------------------------------------------
-For the aclocal/ax_boost_base.m4 and contrib/fb303/aclocal/ax_boost_base.m4 components:
-
-#   Copyright (c) 2007 Thomas Porschberg <thomas@randspringer.de>
-#
-#   Copying and distribution of this file, with or without
-#   modification, are permitted in any medium without royalty provided
-#   the copyright notice and this notice are preserved.
-
---------------------------------------------------
-For the lib/nodejs/lib/thrift/json_parse.js:
-
-/*
-    json_parse.js
-    2015-05-02
-    Public Domain.
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-*/
-(By Douglas Crockford <douglas@crockford.com>)
---------------------------------------------------
diff --git a/vendor/git.apache.org/thrift.git/Makefile.am b/vendor/git.apache.org/thrift.git/Makefile.am
deleted file mode 100755
index ed58265..0000000
--- a/vendor/git.apache.org/thrift.git/Makefile.am
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-ACLOCAL_AMFLAGS = -I ./aclocal
-
-if WITH_PLUGIN
-# To enable bootstrap, build order is lib/cpp -> compiler -> others
-SUBDIRS = lib/cpp compiler/cpp lib
-if WITH_TESTS
-SUBDIRS += lib/cpp/test
-endif
-else
-SUBDIRS = compiler/cpp lib
-endif
-
-if WITH_TESTS
-SUBDIRS += test
-endif
-
-if WITH_TUTORIAL
-SUBDIRS += tutorial
-endif
-
-dist-hook:
-	find $(distdir) -type f \( -iname ".DS_Store" -or -iname "._*" -or -iname ".gitignore" \) | xargs rm -rf
-	find $(distdir) -type d \( -iname ".deps" -or -iname ".libs" \) | xargs rm -rf
-	find $(distdir) -type d \( -iname ".svn" -or -iname ".git" \) | xargs rm -rf
-
-print-version:
-	@echo $(VERSION)
-
-.PHONY: precross cross
-precross-%: all
-	$(MAKE) -C $* precross
-precross: all precross-test precross-lib
-
-empty :=
-space := $(empty) $(empty)
-comma := ,
-
-CROSS_LANGS = @MAYBE_CPP@ @MAYBE_C_GLIB@ @MAYBE_D@ @MAYBE_JAVA@ @MAYBE_CSHARP@ @MAYBE_PYTHON@ @MAYBE_PY3@ @MAYBE_RUBY@ @MAYBE_HASKELL@ @MAYBE_PERL@ @MAYBE_PHP@ @MAYBE_GO@ @MAYBE_NODEJS@ @MAYBE_DART@ @MAYBE_ERLANG@ @MAYBE_LUA@
-CROSS_LANGS_COMMA_SEPARATED = $(subst $(space),$(comma),$(CROSS_LANGS))
-
-if WITH_PY3
-CROSS_PY=$(PYTHON3)
-else
-CROSS_PY=$(PYTHON)
-endif
-
-if WITH_PYTHON
-crossfeature: precross
-	$(CROSS_PY) test/test.py --retry-count 3 --features .* --skip-known-failures --server $(CROSS_LANGS_COMMA_SEPARATED)
-else
-# feature test needs python build
-crossfeature:
-endif
-
-cross-%: precross crossfeature
-	$(CROSS_PY) test/test.py --retry-count 3 --skip-known-failures --server $(CROSS_LANGS_COMMA_SEPARATED) --client $(CROSS_LANGS_COMMA_SEPARATED) --regex "$*"
-
-cross: cross-.*
-
-TIMES = 1 2 3
-fail: precross
-	$(CROSS_PY) test/test.py || true
-	$(CROSS_PY) test/test.py --update-expected-failures=overwrite
-	$(foreach var,$(TIMES),test/test.py -s || true;test/test.py --update-expected-failures=merge;)
-
-codespell_skip_files = \
-	*.jar \
-	*.class \
-	*.so \
-	*.a \
-	*.la \
-	*.o \
-	*.p12 \
-	*OCamlMakefile \
-	.keystore \
-	.truststore \
-	CHANGES \
-	config.sub \
-	configure \
-	depcomp \
-	libtool.m4 \
-	output.* \
-	rebar \
-	thrift
-
-skipped_files = $(subst $(space),$(comma),$(codespell_skip_files))
-
-style-local:
-	codespell --write-changes --skip=$(skipped_files) --disable-colors
-
-EXTRA_DIST = \
-	.clang-format \
-	.editorconfig \
-	.travis.yml \
-	appveyor.yml \
-	bower.json \
-	build \
-	CMakeLists.txt \
-	composer.json \
-	contrib \
-	CONTRIBUTING.md \
-	debian \
-	doc \
-	doap.rdf \
-	package.json \
-	sonar-project.properties \
-	Dockerfile \
-	LICENSE \
-	CHANGES \
-	NOTICE \
-	README.md \
-	Thrift.podspec
diff --git a/vendor/git.apache.org/thrift.git/NOTICE b/vendor/git.apache.org/thrift.git/NOTICE
deleted file mode 100644
index c23995a..0000000
--- a/vendor/git.apache.org/thrift.git/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/README.md b/vendor/git.apache.org/thrift.git/README.md
deleted file mode 100644
index 07cd32f..0000000
--- a/vendor/git.apache.org/thrift.git/README.md
+++ /dev/null
@@ -1,166 +0,0 @@
-Apache Thrift
-=============
-
-+[![Build Status](https://travis-ci.org/apache/thrift.svg?branch=master)](https://travis-ci.org/apache/thrift)
--		+[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/e2qks7enyp9gw7ma?svg=true)](https://ci.appveyor.com/project/apache/thrift)
-
-
-Introduction
-============
-
-Thrift is a lightweight, language-independent software stack with an
-associated code generation mechanism for RPC. Thrift provides clean
-abstractions for data transport, data serialization, and application
-level processing. The code generation system takes a simple definition
-language as its input and generates code across programming languages that
-uses the abstracted stack to build interoperable RPC clients and servers.
-
-Thrift is specifically designed to support non-atomic version changes
-across client and server code.
-
-For more details on Thrift's design and implementation, take a gander at
-the Thrift whitepaper included in this distribution or at the README.md files
-in your particular subdirectory of interest.
-
-Hierarchy
-=========
-
-thrift/
-
-  compiler/
-
-    Contains the Thrift compiler, implemented in C++.
-
-  lib/
-
-    Contains the Thrift software library implementation, subdivided by
-    language of implementation.
-
-    cpp/
-    go/
-    java/
-    php/
-    py/
-    rb/
-
-  test/
-
-    Contains sample Thrift files and test code across the target programming
-    languages.
-
-  tutorial/
-
-    Contains a basic tutorial that will teach you how to develop software
-    using Thrift.
-
-Requirements
-============
-
-See http://thrift.apache.org/docs/install for an up-to-date list of build requirements.
-
-Resources
-=========
-
-More information about Thrift can be obtained on the Thrift webpage at:
-
-     http://thrift.apache.org
-
-Acknowledgments
-===============
-
-Thrift was inspired by pillar, a lightweight RPC tool written by Adam D'Angelo,
-and also by Google's protocol buffers.
-
-Installation
-============
-
-If you are building from the first time out of the source repository, you will
-need to generate the configure scripts.  (This is not necessary if you
-downloaded a tarball.)  From the top directory, do:
-
-    ./bootstrap.sh
-
-Once the configure scripts are generated, thrift can be configured.
-From the top directory, do:
-
-    ./configure
-
-You may need to specify the location of the boost files explicitly.
-If you installed boost in /usr/local, you would run configure as follows:
-
-    ./configure --with-boost=/usr/local
-
-Note that by default the thrift C++ library is typically built with debugging
-symbols included. If you want to customize these options you should use the
-CXXFLAGS option in configure, as such:
-
-    ./configure CXXFLAGS='-g -O2'
-    ./configure CFLAGS='-g -O2'
-    ./configure CPPFLAGS='-DDEBUG_MY_FEATURE'
-
-To enable gcov required options -fprofile-arcs -ftest-coverage enable them:
-
-    ./configure  --enable-coverage
-
-Run ./configure --help to see other configuration options
-
-Please be aware that the Python library will ignore the --prefix option
-and just install wherever Python's distutils puts it (usually along
-the lines of /usr/lib/pythonX.Y/site-packages/).  If you need to control
-where the Python modules are installed, set the PY_PREFIX variable.
-(DESTDIR is respected for Python and C++.)
-
-Make thrift:
-
-	make
-
-From the top directory, become superuser and do:
-
-	make install
-
-Note that some language packages must be installed manually using build tools
-better suited to those languages (at the time of this writing, this applies
-to Java, Ruby, PHP).
-
-Look for the README.md file in the lib/<language>/ folder for more details on the
-installation of each language library package.
-
-Testing
-=======
-
-There are a large number of client library tests that can all be run
-from the top-level directory.
-
-          make -k check
-
-This will make all of the libraries (as necessary), and run through
-the unit tests defined in each of the client libraries. If a single
-language fails, the make check will continue on and provide a synopsis
-at the end.
-
-To run the cross-language test suite, please run:
-
-          make cross
-
-This will run a set of tests that use different language clients and
-servers.
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
diff --git a/vendor/git.apache.org/thrift.git/Thrift.podspec b/vendor/git.apache.org/thrift.git/Thrift.podspec
deleted file mode 100644
index 2ead0e9..0000000
--- a/vendor/git.apache.org/thrift.git/Thrift.podspec
+++ /dev/null
@@ -1,18 +0,0 @@
-Pod::Spec.new do |s|
-  s.name          = "Thrift"
-  s.version       = "0.10.0"
-  s.summary       = "Apache Thrift is a lightweight, language-independent software stack with an associated code generation mechanism for RPC."
-  s.description   = <<-DESC
-The Apache Thrift software framework, for scalable cross-language services development, combines a software stack with a code generation engine to build services that work efficiently and seamlessly between C++, Java, Python, PHP, Ruby, Erlang, Perl, Haskell, C#, Cocoa, JavaScript, Node.js, Smalltalk, OCaml and Delphi and other languages.
-                    DESC
-  s.homepage      = "http://thrift.apache.org"
-  s.license       = { :type => 'Apache License, Version 2.0', :url => 'https://raw.github.com/apache/thrift/thrift-0.9.0/LICENSE' }
-  s.author        = { "The Apache Software Foundation" => "apache@apache.org" }
-  s.requires_arc  = true
-  s.ios.deployment_target = '7.0'
-  s.osx.deployment_target = '10.8'
-  s.ios.framework = 'CFNetwork'
-  s.osx.framework = 'CoreServices'
-  s.source        = { :git => "https://github.com/apache/thrift.git", :tag => "thrift-0.10.0" }
-  s.source_files  = 'lib/cocoa/src/**/*.{h,m,swift}'
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ac_prog_bison.m4 b/vendor/git.apache.org/thrift.git/aclocal/ac_prog_bison.m4
deleted file mode 100644
index 4d1198b..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ac_prog_bison.m4
+++ /dev/null
@@ -1,54 +0,0 @@
-dnl
-dnl Check Bison version
-dnl AC_PROG_BISON([MIN_VERSION=2.4])
-dnl
-dnl Will define BISON_USE_PARSER_H_EXTENSION if Automake is < 1.11
-dnl for use with .h includes.
-dnl
-
-AC_DEFUN([AC_PROG_BISON], [
-if test "x$1" = "x" ; then
-  bison_required_version="2.4"
-else
-  bison_required_version="$1"
-fi
-
-AC_CHECK_PROG(have_prog_bison, [bison], [yes],[no])
-
-AC_DEFINE_UNQUOTED([BISON_VERSION], [0.0], [Bison version if bison is not available])
-
-#Do not use *.h extension for parser header files, use newer *.hh
-bison_use_parser_h_extension=false
-
-if test "$have_prog_bison" = "yes" ; then
-  AC_MSG_CHECKING([for bison version >= $bison_required_version])
-  bison_version=`bison --version | head -n 1 | cut '-d ' -f 4`
-  AC_DEFINE_UNQUOTED([BISON_VERSION], [$bison_version], [Defines bison version])
-  if test "$bison_version" \< "$bison_required_version" ; then
-    BISON=:
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([Bison version $bison_required_version or higher must be installed on the system!])
-  else
-    AC_MSG_RESULT([yes])
-    BISON=bison
-    AC_SUBST(BISON)
-
-    #Verify automake version 1.11 headers for yy files are .h, > 1.12 uses .hh
-    automake_version=`automake --version | head -n 1 | cut '-d ' -f 4`
-    AC_DEFINE_UNQUOTED([AUTOMAKE_VERSION], [$automake_version], [Defines automake version])
-
-    if test "$automake_version" \< "1.12" ; then
-      #Use *.h extension for parser header file
-      bison_use_parser_h_extension=true
-      echo "Automake version < 1.12"
-      AC_DEFINE([BISON_USE_PARSER_H_EXTENSION], [1], [Use *.h extension for parser header file])
-    fi
-  fi
-else
-  BISON=:
-  AC_MSG_RESULT([NO])
-fi
-
-AM_CONDITIONAL([BISON_USE_PARSER_H_EXTENSION], [test x$bison_use_parser_h_extension = xtrue])
-AC_SUBST(BISON)
-])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_boost_base.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_boost_base.m4
deleted file mode 100644
index b496020..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_boost_base.m4
+++ /dev/null
@@ -1,272 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2009 Peter Adolphs
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 23
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
-  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
-    [use Boost library from a standard location (ARG=yes),
-     from the specified location (ARG=<path>),
-     or disable it (ARG=no)
-     @<:@ARG=yes@:>@ ])],
-    [
-    if test "$withval" = "no"; then
-        want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-        want_boost="yes"
-        ac_boost_path="$withval"
-    fi
-    ],
-    [want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
-        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
-        [
-        if test -d "$withval"
-        then
-                ac_boost_lib_path="$withval"
-        else
-                AC_MSG_ERROR(--with-boost-libdir expected directory name)
-        fi
-        ],
-        [ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
-    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
-    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-    if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-        boost_lib_version_req_sub_minor="0"
-        fi
-    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-    succeeded=no
-
-    dnl On 64-bit systems check for system libraries in both lib64 and lib.
-    dnl The former is specified by FHS, but e.g. Debian does not adhere to
-    dnl this (as it rises problems for generic multi-arch support).
-    dnl The last entry in the list is chosen by default when no libraries
-    dnl are found, e.g. when only header-only libraries are installed!
-    libsubdirs="lib"
-    ax_arch=`uname -m`
-    case $ax_arch in
-      x86_64|ppc64|s390x|sparc64|aarch64)
-        libsubdirs="lib64 lib lib64"
-        ;;
-    esac
-
-    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-    dnl them priority over the other paths since, if libs are found there, they
-    dnl are almost assuredly the ones desired.
-    AC_REQUIRE([AC_CANONICAL_HOST])
-    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
-    case ${host_cpu} in
-      i?86)
-        libsubdirs="lib/i386-${host_os} $libsubdirs"
-        ;;
-    esac
-
-    dnl first we check the system location for boost libraries
-    dnl this location ist chosen if boost libraries are installed with the --layout=system option
-    dnl or if you install boost with RPM
-    if test "$ac_boost_path" != ""; then
-        BOOST_CPPFLAGS="-I$ac_boost_path/include"
-        for ac_boost_path_tmp in $libsubdirs; do
-                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-                        break
-                fi
-        done
-    elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local ; do
-            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-                break;
-            fi
-        done
-    fi
-
-    dnl overwrite ld flags if we have required special directory with
-    dnl --with-boost-libdir parameter
-    if test "$ac_boost_lib_path" != ""; then
-       BOOST_LDFLAGS="-L$ac_boost_lib_path"
-    fi
-
-    CPPFLAGS_SAVED="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-    export CPPFLAGS
-
-    LDFLAGS_SAVED="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-    export LDFLAGS
-
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-    @%:@include <boost/version.hpp>
-    ]], [[
-    #if BOOST_VERSION >= $WANT_BOOST_VERSION
-    // Everything is okay
-    #else
-    #  error Boost version is too old
-    #endif
-    ]])],[
-        AC_MSG_RESULT(yes)
-    succeeded=yes
-    found_system=yes
-        ],[
-        ])
-    AC_LANG_POP([C++])
-
-
-
-    dnl if we found no boost with system layout we search for boost libraries
-    dnl built and installed without the --layout=system option or for a staged(not installed) version
-    if test "x$succeeded" != "xyes"; then
-        _version=0
-        if test "$ac_boost_path" != ""; then
-            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                    V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "$V_CHECK" = "1" ; then
-                        _version=$_version_tmp
-                    fi
-                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-                done
-            fi
-        else
-            if test "$cross_compiling" != yes; then
-                for ac_boost_path in $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local ; do
-                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-                            V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "$V_CHECK" = "1" ; then
-                                _version=$_version_tmp
-                                best_path=$ac_boost_path
-                            fi
-                        done
-                    fi
-                done
-
-                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-                if test "$ac_boost_lib_path" = ""; then
-                    for libsubdir in $libsubdirs ; do
-                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                    done
-                    BOOST_LDFLAGS="-L$best_path/$libsubdir"
-                fi
-            fi
-
-            if test "x$BOOST_ROOT" != "x"; then
-                for libsubdir in $libsubdirs ; do
-                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-                done
-                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
-                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
-                    V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
-                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
-                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-                    fi
-                fi
-            fi
-        fi
-
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
-
-        AC_LANG_PUSH(C++)
-            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        @%:@include <boost/version.hpp>
-        ]], [[
-        #if BOOST_VERSION >= $WANT_BOOST_VERSION
-        // Everything is okay
-        #else
-        #  error Boost version is too old
-        #endif
-        ]])],[
-            AC_MSG_RESULT(yes)
-        succeeded=yes
-        found_system=yes
-            ],[
-            ])
-        AC_LANG_POP([C++])
-    fi
-
-    if test "$succeeded" != "yes" ; then
-        if test "$_version" = "0" ; then
-            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
-        else
-            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
-        fi
-        # execute ACTION-IF-NOT-FOUND (if present):
-        ifelse([$3], , :, [$3])
-    else
-        AC_SUBST(BOOST_CPPFLAGS)
-        AC_SUBST(BOOST_LDFLAGS)
-        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
-        # execute ACTION-IF-FOUND (if present):
-        ifelse([$2], , :, [$2])
-    fi
-
-    CPPFLAGS="$CPPFLAGS_SAVED"
-    LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_check_openssl.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_check_openssl.m4
deleted file mode 100644
index a87c5a6..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_check_openssl.m4
+++ /dev/null
@@ -1,124 +0,0 @@
-# ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]])
-#
-# DESCRIPTION
-#
-#   Look for OpenSSL in a number of default spots, or in a user-selected
-#   spot (via --with-openssl).  Sets
-#
-#     OPENSSL_INCLUDES to the include directives required
-#     OPENSSL_LIBS to the -l directives required
-#     OPENSSL_LDFLAGS to the -L or -R flags required
-#
-#   and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately
-#
-#   This macro sets OPENSSL_INCLUDES such that source files should use the
-#   openssl/ directory in include directives:
-#
-#     #include <openssl/hmac.h>
-#
-# LICENSE
-#
-#   Copyright (c) 2009,2010 Zmanda Inc. <http://www.zmanda.com/>
-#   Copyright (c) 2009,2010 Dustin J. Mitchell <dustin@zmanda.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
-AC_DEFUN([AX_CHECK_OPENSSL], [
-    found=false
-    AC_ARG_WITH([openssl],
-        [AS_HELP_STRING([--with-openssl=DIR],
-            [root of the OpenSSL directory])],
-        [
-            case "$withval" in
-            "" | y | ye | yes | n | no)
-            AC_MSG_ERROR([Invalid --with-openssl value])
-              ;;
-            *) ssldirs="$withval"
-              ;;
-            esac
-        ], [
-            # if pkg-config is installed and openssl has installed a .pc file,
-            # then use that information and don't search ssldirs
-            AC_PATH_PROG([PKG_CONFIG], [pkg-config])
-            if test x"$PKG_CONFIG" != x""; then
-                OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
-                if test $? = 0; then
-                    OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
-                    OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
-                    found=true
-                fi
-            fi
-
-            # no such luck; use some default ssldirs
-            if ! $found; then
-                ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
-            fi
-        ]
-        )
-
-
-    # note that we #include <openssl/foo.h>, so the OpenSSL headers have to be in
-    # an 'openssl' subdirectory
-
-    if ! $found; then
-        OPENSSL_INCLUDES=
-        for ssldir in $ssldirs; do
-            AC_MSG_CHECKING([for openssl/ssl.h in $ssldir])
-            if test -f "$ssldir/include/openssl/ssl.h"; then
-                OPENSSL_INCLUDES="-I$ssldir/include"
-                OPENSSL_LDFLAGS="-L$ssldir/lib"
-                OPENSSL_LIBS="-lssl -lcrypto"
-                found=true
-                AC_MSG_RESULT([yes])
-                break
-            else
-                AC_MSG_RESULT([no])
-            fi
-        done
-
-        # if the file wasn't found, well, go ahead and try the link anyway -- maybe
-        # it will just work!
-    fi
-
-    # try the preprocessor and linker with our new flags,
-    # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
-
-    AC_MSG_CHECKING([whether compiling and linking against OpenSSL works])
-    echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
-        "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
-
-    save_LIBS="$LIBS"
-    save_LDFLAGS="$LDFLAGS"
-    save_CPPFLAGS="$CPPFLAGS"
-    LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
-    LIBS="$OPENSSL_LIBS $LIBS"
-    CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([#include <openssl/ssl.h>], [SSL_new(NULL)])],
-        [
-            AC_MSG_RESULT([yes])
-            $1
-        ], [
-            AC_MSG_RESULT([no])
-            $2
-        ])
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-
-    AC_SUBST([OPENSSL_INCLUDES])
-    AC_SUBST([OPENSSL_LIBS])
-    AC_SUBST([OPENSSL_LDFLAGS])
-])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_cxx_compile_stdcxx_11.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100644
index a9a8f58..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_cxx_compile_stdcxx_11.m4
+++ /dev/null
@@ -1,165 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXXFLAGS to enable support.
-#
-#   The first argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The second argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline C++11 support is required and that the macro
-#   should error out if no mode with that support is found.  If specified
-#   'optional', then configuration proceeds regardless, after defining
-#   HAVE_CXX11 if and only if a supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 10
-
-m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    struct Base {
-    virtual void f() {}
-    };
-    struct Child : public Base {
-    virtual void f() override {}
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);
-
-    auto d = a;
-    auto l = [](){};
-    // Prevent Clang error: unused variable 'l' [-Werror,-Wunused-variable]
-    struct use_l { use_l() { l(); } };
-
-    // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-    // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this
-    namespace test_template_alias_sfinae {
-        struct foo {};
-
-        template<typename T>
-        using member = typename T::member_type;
-
-        template<typename T>
-        void func(...) {}
-
-        template<typename T>
-        void func(member<T>*) {}
-
-        void test();
-
-        void test() {
-            func<foo>(0);
-        }
-    }
-]])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
-  m4_if([$1], [], [],
-        [$1], [ext], [],
-        [$1], [noext], [],
-        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
-        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
-        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
-  ax_cv_cxx_compile_cxx11,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-    [ax_cv_cxx_compile_cxx11=yes],
-    [ax_cv_cxx_compile_cxx11=no])])
-  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$1], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++11 -std=gnu++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$1], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=c++11 -std=c++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx11_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-    fi
-  else
-    if test x$ac_success = xno; then
-      HAVE_CXX11=0
-      AC_MSG_NOTICE([No compiler with C++11 support was found])
-    else
-      HAVE_CXX11=1
-      AC_DEFINE(HAVE_CXX11,1,
-                [define if the compiler supports basic C++11 syntax])
-    fi
-
-    AC_SUBST(HAVE_CXX11)
-  fi
-])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_dmd.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_dmd.m4
deleted file mode 100644
index 13b84b0..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_dmd.m4
+++ /dev/null
@@ -1,107 +0,0 @@
-dnl @synopsis AX_DMD
-dnl
-dnl Test for the presence of a DMD-compatible D2 compiler, and (optionally)
-dnl specified modules on the import path.
-dnl
-dnl If "DMD" is defined in the environment, that will be the only
-dnl dmd command tested. Otherwise, a hard-coded list will be used.
-dnl
-dnl After AX_DMD runs, the shell variables "success" and "ax_dmd" are set to
-dnl "yes" or "no", and "DMD" is set to the appropriate command. Furthermore,
-dnl "dmd_optlink" will be set to "yes" or "no" depending on whether OPTLINK is
-dnl used as the linker (DMD/Windows), and "dmd_of_dirsep" will be set to the
-dnl directory separator to use when passing -of to DMD (OPTLINK requires a
-dnl backslash).
-dnl
-dnl AX_CHECK_D_MODULE must be run after AX_DMD. It tests for the presence of a
-dnl module in the import path of the chosen compiler, and sets the shell
-dnl variable "success" to "yes" or "no".
-dnl
-dnl @category D
-dnl @version 2011-05-31
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copyright (C) 2011 David Nadlinger
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-
-AC_DEFUN([AX_DMD],
-         [
-          dnl Hard-coded default commands to test.
-          DMD_PROGS="dmd,gdmd,ldmd"
-
-          dnl Allow the user to specify an alternative.
-          if test -n "$DMD" ; then
-            DMD_PROGS="$DMD"
-          fi
-
-          AC_MSG_CHECKING(for DMD)
-
-          # std.algorithm as a quick way to check for D2/Phobos.
-          echo "import std.algorithm; void main() {}" > configtest_ax_dmd.d
-          success=no
-          oIFS="$IFS"
-
-          IFS=","
-          for DMD in $DMD_PROGS ; do
-            IFS="$oIFS"
-
-            echo "Running \"$DMD configtest_ax_dmd.d\"" >&AS_MESSAGE_LOG_FD
-            if $DMD configtest_ax_dmd.d >&AS_MESSAGE_LOG_FD 2>&1 ; then
-              success=yes
-              break
-            fi
-          done
-
-          if test "$success" != "yes" ; then
-            AC_MSG_RESULT(no)
-            DMD=""
-          else
-            AC_MSG_RESULT(yes)
-          fi
-
-          ax_dmd="$success"
-
-          # Test whether OPTLINK is used by trying if DMD accepts -L/? without
-          # erroring out.
-          if test "$success" == "yes" ; then
-            AC_MSG_CHECKING(whether DMD uses OPTLINK)
-            echo "Running \”$DMD -L/? configtest_ax_dmd.d\"" >&AS_MESSAGE_LOG_FD
-            if $DMD -L/? configtest_ax_dmd.d >&AS_MESSAGE_LOG_FD 2>&1 ; then
-              AC_MSG_RESULT(yes)
-              dmd_optlink="yes"
-
-              # This actually produces double slashes in the final configure
-              # output, but at least it works.
-              dmd_of_dirsep="\\\\"
-            else
-              AC_MSG_RESULT(no)
-              dmd_optlink="no"
-              dmd_of_dirsep="/"
-            fi
-          fi
-
-          rm -f configtest_ax_dmd*
-         ])
-
-
-AC_DEFUN([AX_CHECK_D_MODULE],
-         [
-          AC_MSG_CHECKING(for D module [$1])
-
-          echo "import $1; void main() {}" > configtest_ax_dmd.d
-
-          echo "Running \"$DMD configtest_ax_dmd.d\"" >&AS_MESSAGE_LOG_FD
-          if $DMD -c configtest_ax_dmd.d >&AS_MESSAGE_LOG_FD 2>&1 ; then
-            AC_MSG_RESULT(yes)
-            success=yes
-          else
-            AC_MSG_RESULT(no)
-            success=no
-          fi
-
-          rm -f configtest_ax_dmd*
-         ])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_javac_and_java.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_javac_and_java.m4
deleted file mode 100644
index f341f50..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_javac_and_java.m4
+++ /dev/null
@@ -1,129 +0,0 @@
-dnl @synopsis AX_JAVAC_AND_JAVA
-dnl @synopsis AX_CHECK_JAVA_CLASS(CLASSNAME)
-dnl
-dnl Test for the presence of a JDK, and (optionally) specific classes.
-dnl
-dnl If "JAVA" is defined in the environment, that will be the only
-dnl java command tested.  Otherwise, a hard-coded list will be used.
-dnl Similarly for "JAVAC".
-dnl
-dnl AX_JAVAC_AND_JAVA does not currently support testing for a particular
-dnl Java version, testing for only one of "java" and "javac", or
-dnl compiling or running user-provided Java code.
-dnl
-dnl After AX_JAVAC_AND_JAVA runs, the shell variables "success" and
-dnl "ax_javac_and_java" are set to "yes" or "no", and "JAVAC" and
-dnl "JAVA" are set to the appropriate commands.
-dnl
-dnl AX_CHECK_JAVA_CLASS must be run after AX_JAVAC_AND_JAVA.
-dnl It tests for the presence of a class based on a fully-qualified name.
-dnl It sets the shell variable "success" to "yes" or "no".
-dnl
-dnl @category Java
-dnl @version 2009-02-09
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-
-AC_DEFUN([AX_JAVAC_AND_JAVA],
-         [
-
-          dnl Hard-coded default commands to test.
-          JAVAC_PROGS="javac,jikes,gcj -C"
-          JAVA_PROGS="java,kaffe"
-
-          dnl Allow the user to specify an alternative.
-          if test -n "$JAVAC" ; then
-            JAVAC_PROGS="$JAVAC"
-          fi
-          if test -n "$JAVA" ; then
-            JAVA_PROGS="$JAVA"
-          fi
-
-          AC_MSG_CHECKING(for javac and java)
-
-          echo "public class configtest_ax_javac_and_java { public static void main(String args@<:@@:>@) { } }" > configtest_ax_javac_and_java.java
-          success=no
-          oIFS="$IFS"
-
-          IFS=","
-          for JAVAC in $JAVAC_PROGS ; do
-            IFS="$oIFS"
-
-            echo "Running \"$JAVAC configtest_ax_javac_and_java.java\"" >&AS_MESSAGE_LOG_FD
-            if $JAVAC configtest_ax_javac_and_java.java >&AS_MESSAGE_LOG_FD 2>&1 ; then
-
-              # prevent $JAVA VM issues with UTF-8 path names (THRIFT-3271)
-              oLC_ALL="$LC_ALL"
-              LC_ALL=""
-
-              IFS=","
-              for JAVA in $JAVA_PROGS ; do
-                IFS="$oIFS"
-
-                echo "Running \"$JAVA configtest_ax_javac_and_java\"" >&AS_MESSAGE_LOG_FD
-                if $JAVA configtest_ax_javac_and_java >&AS_MESSAGE_LOG_FD 2>&1 ; then
-                  success=yes
-                  break 2
-                fi
-
-              done
-
-              # restore LC_ALL
-              LC_ALL="$oLC_ALL"
-              oLC_ALL=""
-
-            fi
-
-          done
-
-          rm -f configtest_ax_javac_and_java.java configtest_ax_javac_and_java.class
-
-          if test "$success" != "yes" ; then
-            AC_MSG_RESULT(no)
-            JAVAC=""
-            JAVA=""
-          else
-            AC_MSG_RESULT(yes)
-          fi
-
-          ax_javac_and_java="$success"
-
-          ])
-
-
-AC_DEFUN([AX_CHECK_JAVA_CLASS],
-         [
-          AC_MSG_CHECKING(for Java class [$1])
-
-          echo "import $1; public class configtest_ax_javac_and_java { public static void main(String args@<:@@:>@) { } }" > configtest_ax_javac_and_java.java
-
-          echo "Running \"$JAVAC configtest_ax_javac_and_java.java\"" >&AS_MESSAGE_LOG_FD
-          if $JAVAC configtest_ax_javac_and_java.java >&AS_MESSAGE_LOG_FD 2>&1 ; then
-            AC_MSG_RESULT(yes)
-            success=yes
-          else
-            AC_MSG_RESULT(no)
-            success=no
-          fi
-
-          rm -f configtest_ax_javac_and_java.java configtest_ax_javac_and_java.class
-          ])
-
-
-AC_DEFUN([AX_CHECK_ANT_VERSION],
-         [
-          AC_MSG_CHECKING(for ant version > $2)
-          ANT_VALID=`expr $($1 -version 2>/dev/null | sed -n 's/.*version \(@<:@0-9\.@:>@*\).*/\1/p') \>= $2`
-          if test "x$ANT_VALID" = "x1" ; then
-            AC_MSG_RESULT(yes)
-          else
-            AC_MSG_RESULT(no)
-            ANT=""
-          fi
-          ])
-
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_lib_event.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_lib_event.m4
deleted file mode 100644
index d4dcdc9..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_lib_event.m4
+++ /dev/null
@@ -1,194 +0,0 @@
-dnl @synopsis AX_LIB_EVENT([MINIMUM-VERSION])
-dnl
-dnl Test for the libevent library of a particular version (or newer).
-dnl
-dnl If no path to the installed libevent is given, the macro will first try
-dnl using no -I or -L flags, then searches under /usr, /usr/local, /opt,
-dnl and /opt/libevent.
-dnl If these all fail, it will try the $LIBEVENT_ROOT environment variable.
-dnl
-dnl This macro requires that #include <sys/types.h> works and defines u_char.
-dnl
-dnl This macro calls:
-dnl   AC_SUBST(LIBEVENT_CPPFLAGS)
-dnl   AC_SUBST(LIBEVENT_LDFLAGS)
-dnl   AC_SUBST(LIBEVENT_LIBS)
-dnl
-dnl And (if libevent is found):
-dnl   AC_DEFINE(HAVE_LIBEVENT)
-dnl
-dnl It also leaves the shell variables "success" and "ax_have_libevent"
-dnl set to "yes" or "no".
-dnl
-dnl NOTE: This macro does not currently work for cross-compiling,
-dnl       but it can be easily modified to allow it.  (grep "cross").
-dnl
-dnl @category InstalledPackages
-dnl @category C
-dnl @version 2007-09-12
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-dnl Input: ax_libevent_path, WANT_LIBEVENT_VERSION
-dnl Output: success=yes/no
-AC_DEFUN([AX_LIB_EVENT_DO_CHECK],
-         [
-          # Save our flags.
-          CPPFLAGS_SAVED="$CPPFLAGS"
-          LDFLAGS_SAVED="$LDFLAGS"
-          LIBS_SAVED="$LIBS"
-          LD_LIBRARY_PATH_SAVED="$LD_LIBRARY_PATH"
-
-          # Set our flags if we are checking a specific directory.
-          if test -n "$ax_libevent_path" ; then
-            LIBEVENT_CPPFLAGS="-I$ax_libevent_path/include"
-            LIBEVENT_LDFLAGS="-L$ax_libevent_path/lib"
-            LD_LIBRARY_PATH="$ax_libevent_path/lib:$LD_LIBRARY_PATH"
-          else
-            LIBEVENT_CPPFLAGS=""
-            LIBEVENT_LDFLAGS=""
-          fi
-
-          # Required flag for libevent.
-          LIBEVENT_LIBS="-levent"
-
-          # Prepare the environment for compilation.
-          CPPFLAGS="$CPPFLAGS $LIBEVENT_CPPFLAGS"
-          LDFLAGS="$LDFLAGS $LIBEVENT_LDFLAGS"
-          LIBS="$LIBS $LIBEVENT_LIBS"
-          export CPPFLAGS
-          export LDFLAGS
-          export LIBS
-          export LD_LIBRARY_PATH
-
-          success=no
-
-          # Compile, link, and run the program.  This checks:
-          # - event.h is available for including.
-          # - event_get_version() is available for linking.
-          # - The event version string is lexicographically greater
-          #   than the required version.
-          AC_LANG_PUSH([C])
-          dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling,
-          dnl but then the version cannot be checked.
-          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-          #include <sys/types.h>
-          #include <event.h>
-          ]], [[
-          const char* lib_version = event_get_version();
-          const char* wnt_version = "$WANT_LIBEVENT_VERSION";
-          int lib_digits;
-          int wnt_digits;
-          for (;;) {
-            /* If we reached the end of the want version.  We have it. */
-            if (*wnt_version == '\0' || *wnt_version == '-') {
-              return 0;
-            }
-            /* If the want version continues but the lib version does not, */
-            /* we are missing a letter.  We don't have it. */
-            if (*lib_version == '\0' || *lib_version == '-') {
-              return 1;
-            }
-            /* In the 1.4 version numbering style, if there are more digits */
-            /* in one version than the other, that one is higher. */
-            for (lib_digits = 0;
-                lib_version[lib_digits] >= '0' &&
-                lib_version[lib_digits] <= '9';
-                lib_digits++)
-              ;
-            for (wnt_digits = 0;
-                wnt_version[wnt_digits] >= '0' &&
-                wnt_version[wnt_digits] <= '9';
-                wnt_digits++)
-              ;
-            if (lib_digits > wnt_digits) {
-              return 0;
-            }
-            if (lib_digits < wnt_digits) {
-              return 1;
-            }
-            /* If we have greater than what we want.  We have it. */
-            if (*lib_version > *wnt_version) {
-              return 0;
-            }
-            /* If we have less, we don't. */
-            if (*lib_version < *wnt_version) {
-              return 1;
-            }
-            lib_version++;
-            wnt_version++;
-          }
-          return 0;
-          ]])], [
-          success=yes
-          ])
-          AC_LANG_POP([C])
-
-          # Restore flags.
-          CPPFLAGS="$CPPFLAGS_SAVED"
-          LDFLAGS="$LDFLAGS_SAVED"
-          LIBS="$LIBS_SAVED"
-          LD_LIBRARY_PATH="$LD_LIBRARY_PATH_SAVED"
-         ])
-
-
-AC_DEFUN([AX_LIB_EVENT],
-         [
-
-          dnl Allow search path to be overridden on the command line.
-          AC_ARG_WITH([libevent],
-                      AS_HELP_STRING([--with-libevent@<:@=DIR@:>@], [use libevent [default=yes]. Optionally specify the root prefix dir where libevent is installed]),
-                      [
-                       if test "x$withval" = "xno"; then
-                         want_libevent="no"
-                       elif test "x$withval" = "xyes"; then
-                         want_libevent="yes"
-                         ax_libevent_path=""
-                       else
-                         want_libevent="yes"
-                         ax_libevent_path="$withval"
-                       fi
-                       ],
-                       [ want_libevent="yes" ; ax_libevent_path="" ])
-
-
-          if test "$want_libevent" = "yes"; then
-            WANT_LIBEVENT_VERSION=ifelse([$1], ,1.2,$1)
-
-            AC_MSG_CHECKING(for libevent >= $WANT_LIBEVENT_VERSION)
-
-            # Run tests.
-            if test -n "$ax_libevent_path"; then
-              AX_LIB_EVENT_DO_CHECK
-            else
-              for ax_libevent_path in "" $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local $lt_sysroot/opt/libevent "$LIBEVENT_ROOT" ; do
-                AX_LIB_EVENT_DO_CHECK
-                if test "$success" = "yes"; then
-                  break;
-                fi
-              done
-            fi
-
-            if test "$success" != "yes" ; then
-              AC_MSG_RESULT(no)
-              LIBEVENT_CPPFLAGS=""
-              LIBEVENT_LDFLAGS=""
-              LIBEVENT_LIBS=""
-            else
-              AC_MSG_RESULT(yes)
-              AC_DEFINE(HAVE_LIBEVENT,,[define if libevent is available])
-              ax_have_libevent_[]m4_translit([$1], [.], [_])="yes"
-            fi
-
-            ax_have_libevent="$success"
-
-            AC_SUBST(LIBEVENT_CPPFLAGS)
-            AC_SUBST(LIBEVENT_LDFLAGS)
-            AC_SUBST(LIBEVENT_LIBS)
-          fi
-
-          ])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_lib_zlib.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_lib_zlib.m4
deleted file mode 100644
index bdb9e11..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_lib_zlib.m4
+++ /dev/null
@@ -1,173 +0,0 @@
-dnl @synopsis AX_LIB_ZLIB([MINIMUM-VERSION])
-dnl
-dnl Test for the libz library of a particular version (or newer).
-dnl
-dnl If no path to the installed zlib is given, the macro will first try
-dnl using no -I or -L flags, then searches under /usr, /usr/local, /opt,
-dnl and /opt/zlib.
-dnl If these all fail, it will try the $ZLIB_ROOT environment variable.
-dnl
-dnl This macro calls:
-dnl   AC_SUBST(ZLIB_CPPFLAGS)
-dnl   AC_SUBST(ZLIB_LDFLAGS)
-dnl   AC_SUBST(ZLIB_LIBS)
-dnl
-dnl And (if zlib is found):
-dnl   AC_DEFINE(HAVE_ZLIB)
-dnl
-dnl It also leaves the shell variables "success" and "ax_have_zlib"
-dnl set to "yes" or "no".
-dnl
-dnl NOTE: This macro does not currently work for cross-compiling,
-dnl       but it can be easily modified to allow it.  (grep "cross").
-dnl
-dnl @category InstalledPackages
-dnl @category C
-dnl @version 2007-09-12
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-dnl Input: ax_zlib_path, WANT_ZLIB_VERSION
-dnl Output: success=yes/no
-AC_DEFUN([AX_LIB_ZLIB_DO_CHECK],
-         [
-          # Save our flags.
-          CPPFLAGS_SAVED="$CPPFLAGS"
-          LDFLAGS_SAVED="$LDFLAGS"
-          LIBS_SAVED="$LIBS"
-          LD_LIBRARY_PATH_SAVED="$LD_LIBRARY_PATH"
-
-          # Set our flags if we are checking a specific directory.
-          if test -n "$ax_zlib_path" ; then
-            ZLIB_CPPFLAGS="-I$ax_zlib_path/include"
-            ZLIB_LDFLAGS="-L$ax_zlib_path/lib"
-            LD_LIBRARY_PATH="$ax_zlib_path/lib:$LD_LIBRARY_PATH"
-          else
-            ZLIB_CPPFLAGS=""
-            ZLIB_LDFLAGS=""
-          fi
-
-          # Required flag for zlib.
-          ZLIB_LIBS="-lz"
-
-          # Prepare the environment for compilation.
-          CPPFLAGS="$CPPFLAGS $ZLIB_CPPFLAGS"
-          LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
-          LIBS="$LIBS $ZLIB_LIBS"
-          export CPPFLAGS
-          export LDFLAGS
-          export LIBS
-          export LD_LIBRARY_PATH
-
-          success=no
-
-          # Compile, link, and run the program.  This checks:
-          # - zlib.h is available for including.
-          # - zlibVersion() is available for linking.
-          # - ZLIB_VERNUM is greater than or equal to the desired version.
-          # - ZLIB_VERSION (defined in zlib.h) matches zlibVersion()
-          #   (defined in the library).
-          AC_LANG_PUSH([C])
-          dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling.
-          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-          #include <zlib.h>
-          #if ZLIB_VERNUM >= 0x$WANT_ZLIB_VERSION
-          #else
-          # error zlib is too old
-          #endif
-          ]], [[
-          const char* lib_version = zlibVersion();
-          const char* hdr_version = ZLIB_VERSION;
-          for (;;) {
-            if (*lib_version != *hdr_version) {
-              /* If this happens, your zlib header doesn't match your zlib */
-              /* library.  That is really bad. */
-              return 1;
-            }
-            if (*lib_version == '\0') {
-              break;
-            }
-            lib_version++;
-            hdr_version++;
-          }
-          return 0;
-          ]])], [
-          success=yes
-          ])
-          AC_LANG_POP([C])
-
-          # Restore flags.
-          CPPFLAGS="$CPPFLAGS_SAVED"
-          LDFLAGS="$LDFLAGS_SAVED"
-          LIBS="$LIBS_SAVED"
-          LD_LIBRARY_PATH="$LD_LIBRARY_PATH_SAVED"
-         ])
-
-
-AC_DEFUN([AX_LIB_ZLIB],
-         [
-
-          dnl Allow search path to be overridden on the command line.
-          AC_ARG_WITH([zlib],
-                      AS_HELP_STRING([--with-zlib@<:@=DIR@:>@], [use zlib (default is yes) - it is possible to specify an alternate root directory for zlib]),
-                      [
-                       if test "x$withval" = "xno"; then
-                         want_zlib="no"
-                       elif test "x$withval" = "xyes"; then
-                         want_zlib="yes"
-                         ax_zlib_path=""
-                       else
-                         want_zlib="yes"
-                         ax_zlib_path="$withval"
-                       fi
-                       ],
-                       [want_zlib="yes" ; ax_zlib_path="" ])
-
-
-          if test "$want_zlib" = "yes"; then
-            # Parse out the version.
-            zlib_version_req=ifelse([$1], ,1.2.3,$1)
-            zlib_version_req_major=`expr $zlib_version_req : '\([[0-9]]*\)'`
-            zlib_version_req_minor=`expr $zlib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-            zlib_version_req_patch=`expr $zlib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-            if test -z "$zlib_version_req_patch" ; then
-              zlib_version_req_patch="0"
-            fi
-            WANT_ZLIB_VERSION=`expr $zlib_version_req_major \* 1000 \+  $zlib_version_req_minor \* 100 \+ $zlib_version_req_patch \* 10`
-
-            AC_MSG_CHECKING(for zlib >= $zlib_version_req)
-
-            # Run tests.
-            if test -n "$ax_zlib_path"; then
-              AX_LIB_ZLIB_DO_CHECK
-            else
-              for ax_zlib_path in "" /usr /usr/local /opt /opt/zlib "$ZLIB_ROOT" ; do
-                AX_LIB_ZLIB_DO_CHECK
-                if test "$success" = "yes"; then
-                  break;
-                fi
-              done
-            fi
-
-            if test "$success" != "yes" ; then
-              AC_MSG_RESULT(no)
-              ZLIB_CPPFLAGS=""
-              ZLIB_LDFLAGS=""
-              ZLIB_LIBS=""
-            else
-              AC_MSG_RESULT(yes)
-              AC_DEFINE(HAVE_ZLIB,,[define if zlib is available])
-            fi
-
-            ax_have_zlib="$success"
-
-            AC_SUBST(ZLIB_CPPFLAGS)
-            AC_SUBST(ZLIB_LDFLAGS)
-            AC_SUBST(ZLIB_LIBS)
-          fi
-
-          ])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_lua.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_lua.m4
deleted file mode 100644
index 9feb352..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_lua.m4
+++ /dev/null
@@ -1,664 +0,0 @@
-# ===========================================================================
-#          http://www.gnu.org/software/autoconf-archive/ax_lua.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_LUA[([MINIMUM-VERSION], [TOO-BIG-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])]
-#   AX_LUA_HEADERS[([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])]
-#   AX_LUA_LIBS[([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])]
-#   AX_LUA_READLINE[([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])]
-#
-# DESCRIPTION
-#
-#   Detect a Lua interpreter, optionally specifying a minimum and maximum
-#   version number. Set up important Lua paths, such as the directories in
-#   which to install scripts and modules (shared libraries).
-#
-#   Also detect Lua headers and libraries. The Lua version contained in the
-#   header is checked to match the Lua interpreter version exactly. When
-#   searching for Lua libraries, the version number is used as a suffix.
-#   This is done with the goal of supporting multiple Lua installs (5.1,
-#   5.2, and 5.3 side-by-side).
-#
-#   A note on compatibility with previous versions: This file has been
-#   mostly rewritten for serial 18. Most developers should be able to use
-#   these macros without needing to modify configure.ac. Care has been taken
-#   to preserve each macro's behavior, but there are some differences:
-#
-#   1) AX_WITH_LUA is deprecated; it now expands to the exact same thing as
-#   AX_PROG_LUA with no arguments.
-#
-#   2) AX_LUA_HEADERS now checks that the version number defined in lua.h
-#   matches the interpreter version. AX_LUA_HEADERS_VERSION is therefore
-#   unnecessary, so it is deprecated and does not expand to anything.
-#
-#   3) The configure flag --with-lua-suffix no longer exists; the user
-#   should instead specify the LUA precious variable on the command line.
-#   See the AX_PROG_LUA description for details.
-#
-#   Please read the macro descriptions below for more information.
-#
-#   This file was inspired by Andrew Dalke's and James Henstridge's
-#   python.m4 and Tom Payne's, Matthieu Moy's, and Reuben Thomas's ax_lua.m4
-#   (serial 17). Basically, this file is a mash-up of those two files. I
-#   like to think it combines the best of the two!
-#
-#   AX_PROG_LUA: Search for the Lua interpreter, and set up important Lua
-#   paths. Adds precious variable LUA, which may contain the path of the Lua
-#   interpreter. If LUA is blank, the user's path is searched for an
-#   suitable interpreter.
-#
-#   If MINIMUM-VERSION is supplied, then only Lua interpreters with a
-#   version number greater or equal to MINIMUM-VERSION will be accepted. If
-#   TOO-BIG-VERSION is also supplied, then only Lua interpreters with a
-#   version number greater or equal to MINIMUM-VERSION and less than
-#   TOO-BIG-VERSION will be accepted.
-#
-#   The Lua version number, LUA_VERSION, is found from the interpreter, and
-#   substituted. LUA_PLATFORM is also found, but not currently supported (no
-#   standard representation).
-#
-#   Finally, the macro finds four paths:
-#
-#     luadir             Directory to install Lua scripts.
-#     pkgluadir          $luadir/$PACKAGE
-#     luaexecdir         Directory to install Lua modules.
-#     pkgluaexecdir      $luaexecdir/$PACKAGE
-#
-#   These paths are found based on $prefix, $exec_prefix, Lua's
-#   package.path, and package.cpath. The first path of package.path
-#   beginning with $prefix is selected as luadir. The first path of
-#   package.cpath beginning with $exec_prefix is used as luaexecdir. This
-#   should work on all reasonable Lua installations. If a path cannot be
-#   determined, a default path is used. Of course, the user can override
-#   these later when invoking make.
-#
-#     luadir             Default: $prefix/share/lua/$LUA_VERSION
-#     luaexecdir         Default: $exec_prefix/lib/lua/$LUA_VERSION
-#
-#   These directories can be used by Automake as install destinations. The
-#   variable name minus 'dir' needs to be used as a prefix to the
-#   appropriate Automake primary, e.g. lua_SCRIPS or luaexec_LIBRARIES.
-#
-#   If an acceptable Lua interpreter is found, then ACTION-IF-FOUND is
-#   performed, otherwise ACTION-IF-NOT-FOUND is preformed. If ACTION-IF-NOT-
-#   FOUND is blank, then it will default to printing an error. To prevent
-#   the default behavior, give ':' as an action.
-#
-#   AX_LUA_HEADERS: Search for Lua headers. Requires that AX_PROG_LUA be
-#   expanded before this macro. Adds precious variable LUA_INCLUDE, which
-#   may contain Lua specific include flags, e.g. -I/usr/include/lua5.1. If
-#   LUA_INCLUDE is blank, then this macro will attempt to find suitable
-#   flags.
-#
-#   LUA_INCLUDE can be used by Automake to compile Lua modules or
-#   executables with embedded interpreters. The *_CPPFLAGS variables should
-#   be used for this purpose, e.g. myprog_CPPFLAGS = $(LUA_INCLUDE).
-#
-#   This macro searches for the header lua.h (and others). The search is
-#   performed with a combination of CPPFLAGS, CPATH, etc, and LUA_INCLUDE.
-#   If the search is unsuccessful, then some common directories are tried.
-#   If the headers are then found, then LUA_INCLUDE is set accordingly.
-#
-#   The paths automatically searched are:
-#
-#     * /usr/include/luaX.Y
-#     * /usr/include/lua/X.Y
-#     * /usr/include/luaXY
-#     * /usr/local/include/luaX.Y
-#     * /usr/local/include/lua-X.Y
-#     * /usr/local/include/lua/X.Y
-#     * /usr/local/include/luaXY
-#
-#   (Where X.Y is the Lua version number, e.g. 5.1.)
-#
-#   The Lua version number found in the headers is always checked to match
-#   the Lua interpreter's version number. Lua headers with mismatched
-#   version numbers are not accepted.
-#
-#   If headers are found, then ACTION-IF-FOUND is performed, otherwise
-#   ACTION-IF-NOT-FOUND is performed. If ACTION-IF-NOT-FOUND is blank, then
-#   it will default to printing an error. To prevent the default behavior,
-#   set the action to ':'.
-#
-#   AX_LUA_LIBS: Search for Lua libraries. Requires that AX_PROG_LUA be
-#   expanded before this macro. Adds precious variable LUA_LIB, which may
-#   contain Lua specific linker flags, e.g. -llua5.1. If LUA_LIB is blank,
-#   then this macro will attempt to find suitable flags.
-#
-#   LUA_LIB can be used by Automake to link Lua modules or executables with
-#   embedded interpreters. The *_LIBADD and *_LDADD variables should be used
-#   for this purpose, e.g. mymod_LIBADD = $(LUA_LIB).
-#
-#   This macro searches for the Lua library. More technically, it searches
-#   for a library containing the function lua_load. The search is performed
-#   with a combination of LIBS, LIBRARY_PATH, and LUA_LIB.
-#
-#   If the search determines that some linker flags are missing, then those
-#   flags will be added to LUA_LIB.
-#
-#   If libraries are found, then ACTION-IF-FOUND is performed, otherwise
-#   ACTION-IF-NOT-FOUND is performed. If ACTION-IF-NOT-FOUND is blank, then
-#   it will default to printing an error. To prevent the default behavior,
-#   set the action to ':'.
-#
-#   AX_LUA_READLINE: Search for readline headers and libraries. Requires the
-#   AX_LIB_READLINE macro, which is provided by ax_lib_readline.m4 from the
-#   Autoconf Archive.
-#
-#   If a readline compatible library is found, then ACTION-IF-FOUND is
-#   performed, otherwise ACTION-IF-NOT-FOUND is performed.
-#
-# LICENSE
-#
-#   Copyright (c) 2015 Reuben Thomas <rrt@sc3d.org>
-#   Copyright (c) 2014 Tim Perkins <tprk77@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program 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 General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 39
-
-dnl =========================================================================
-dnl AX_PROG_LUA([MINIMUM-VERSION], [TOO-BIG-VERSION],
-dnl             [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl =========================================================================
-AC_DEFUN([AX_PROG_LUA],
-[
-  dnl Check for required tools.
-  AC_REQUIRE([AC_PROG_GREP])
-  AC_REQUIRE([AC_PROG_SED])
-
-  dnl Make LUA a precious variable.
-  AC_ARG_VAR([LUA], [The Lua interpreter, e.g. /usr/bin/lua5.1])
-
-  dnl Find a Lua interpreter.
-  m4_define_default([_AX_LUA_INTERPRETER_LIST],
-    [lua lua5.3 lua53 lua5.2 lua52 lua5.1 lua51 lua50])
-
-  m4_if([$1], [],
-  [ dnl No version check is needed. Find any Lua interpreter.
-    AS_IF([test "x$LUA" = 'x'],
-      [AC_PATH_PROGS([LUA], [_AX_LUA_INTERPRETER_LIST], [:])])
-    ax_display_LUA='lua'
-
-    AS_IF([test "x$LUA" != 'x:'],
-      [ dnl At least check if this is a Lua interpreter.
-        AC_MSG_CHECKING([if $LUA is a Lua interpreter])
-        _AX_LUA_CHK_IS_INTRP([$LUA],
-          [AC_MSG_RESULT([yes])],
-          [ AC_MSG_RESULT([no])
-            AC_MSG_ERROR([not a Lua interpreter])
-          ])
-      ])
-  ],
-  [ dnl A version check is needed.
-    AS_IF([test "x$LUA" != 'x'],
-    [ dnl Check if this is a Lua interpreter.
-      AC_MSG_CHECKING([if $LUA is a Lua interpreter])
-      _AX_LUA_CHK_IS_INTRP([$LUA],
-        [AC_MSG_RESULT([yes])],
-        [ AC_MSG_RESULT([no])
-          AC_MSG_ERROR([not a Lua interpreter])
-        ])
-      dnl Check the version.
-      m4_if([$2], [],
-        [_ax_check_text="whether $LUA version >= $1"],
-        [_ax_check_text="whether $LUA version >= $1, < $2"])
-      AC_MSG_CHECKING([$_ax_check_text])
-      _AX_LUA_CHK_VER([$LUA], [$1], [$2],
-        [AC_MSG_RESULT([yes])],
-        [ AC_MSG_RESULT([no])
-          AC_MSG_ERROR([version is out of range for specified LUA])])
-      ax_display_LUA=$LUA
-    ],
-    [ dnl Try each interpreter until we find one that satisfies VERSION.
-      m4_if([$2], [],
-        [_ax_check_text="for a Lua interpreter with version >= $1"],
-        [_ax_check_text="for a Lua interpreter with version >= $1, < $2"])
-      AC_CACHE_CHECK([$_ax_check_text],
-        [ax_cv_pathless_LUA],
-        [ for ax_cv_pathless_LUA in _AX_LUA_INTERPRETER_LIST none; do
-            test "x$ax_cv_pathless_LUA" = 'xnone' && break
-            _AX_LUA_CHK_IS_INTRP([$ax_cv_pathless_LUA], [], [continue])
-            _AX_LUA_CHK_VER([$ax_cv_pathless_LUA], [$1], [$2], [break])
-          done
-        ])
-      dnl Set $LUA to the absolute path of $ax_cv_pathless_LUA.
-      AS_IF([test "x$ax_cv_pathless_LUA" = 'xnone'],
-        [LUA=':'],
-        [AC_PATH_PROG([LUA], [$ax_cv_pathless_LUA])])
-      ax_display_LUA=$ax_cv_pathless_LUA
-    ])
-  ])
-
-  AS_IF([test "x$LUA" = 'x:'],
-  [ dnl Run any user-specified action, or abort.
-    m4_default([$4], [AC_MSG_ERROR([cannot find suitable Lua interpreter])])
-  ],
-  [ dnl Query Lua for its version number.
-    AC_CACHE_CHECK([for $ax_display_LUA version],
-      [ax_cv_lua_version],
-      [ dnl Get the interpreter version in X.Y format. This should work for
-        dnl interpreters version 5.0 and beyond.
-        ax_cv_lua_version=[`$LUA -e '
-          -- return a version number in X.Y format
-          local _, _, ver = string.find(_VERSION, "^Lua (%d+%.%d+)")
-          print(ver)'`]
-      ])
-    AS_IF([test "x$ax_cv_lua_version" = 'x'],
-      [AC_MSG_ERROR([invalid Lua version number])])
-    AC_SUBST([LUA_VERSION], [$ax_cv_lua_version])
-    AC_SUBST([LUA_SHORT_VERSION], [`echo "$LUA_VERSION" | $SED 's|\.||'`])
-
-    dnl The following check is not supported:
-    dnl At times (like when building shared libraries) you may want to know
-    dnl which OS platform Lua thinks this is.
-    AC_CACHE_CHECK([for $ax_display_LUA platform],
-      [ax_cv_lua_platform],
-      [ax_cv_lua_platform=[`$LUA -e 'print("unknown")'`]])
-    AC_SUBST([LUA_PLATFORM], [$ax_cv_lua_platform])
-
-    dnl Use the values of $prefix and $exec_prefix for the corresponding
-    dnl values of LUA_PREFIX and LUA_EXEC_PREFIX. These are made distinct
-    dnl variables so they can be overridden if need be. However, the general
-    dnl consensus is that you shouldn't need this ability.
-    AC_SUBST([LUA_PREFIX], ['${prefix}'])
-    AC_SUBST([LUA_EXEC_PREFIX], ['${exec_prefix}'])
-
-    dnl Lua provides no way to query the script directory, and instead
-    dnl provides LUA_PATH. However, we should be able to make a safe educated
-    dnl guess. If the built-in search path contains a directory which is
-    dnl prefixed by $prefix, then we can store scripts there. The first
-    dnl matching path will be used.
-    AC_CACHE_CHECK([for $ax_display_LUA script directory],
-      [ax_cv_lua_luadir],
-      [ AS_IF([test "x$prefix" = 'xNONE'],
-          [ax_lua_prefix=$ac_default_prefix],
-          [ax_lua_prefix=$prefix])
-
-        dnl Initialize to the default path.
-        ax_cv_lua_luadir="$LUA_PREFIX/share/lua/$LUA_VERSION"
-
-        dnl Try to find a path with the prefix.
-        _AX_LUA_FND_PRFX_PTH([$LUA], [$ax_lua_prefix], [script])
-        AS_IF([test "x$ax_lua_prefixed_path" != 'x'],
-        [ dnl Fix the prefix.
-          _ax_strip_prefix=`echo "$ax_lua_prefix" | $SED 's|.|.|g'`
-          ax_cv_lua_luadir=`echo "$ax_lua_prefixed_path" | \
-            $SED "s|^$_ax_strip_prefix|$LUA_PREFIX|"`
-        ])
-      ])
-    AC_SUBST([luadir], [$ax_cv_lua_luadir])
-    AC_SUBST([pkgluadir], [\${luadir}/$PACKAGE])
-
-    dnl Lua provides no way to query the module directory, and instead
-    dnl provides LUA_PATH. However, we should be able to make a safe educated
-    dnl guess. If the built-in search path contains a directory which is
-    dnl prefixed by $exec_prefix, then we can store modules there. The first
-    dnl matching path will be used.
-    AC_CACHE_CHECK([for $ax_display_LUA module directory],
-      [ax_cv_lua_luaexecdir],
-      [ AS_IF([test "x$exec_prefix" = 'xNONE'],
-          [ax_lua_exec_prefix=$ax_lua_prefix],
-          [ax_lua_exec_prefix=$exec_prefix])
-
-        dnl Initialize to the default path.
-        ax_cv_lua_luaexecdir="$LUA_EXEC_PREFIX/lib/lua/$LUA_VERSION"
-
-        dnl Try to find a path with the prefix.
-        _AX_LUA_FND_PRFX_PTH([$LUA],
-          [$ax_lua_exec_prefix], [module])
-        AS_IF([test "x$ax_lua_prefixed_path" != 'x'],
-        [ dnl Fix the prefix.
-          _ax_strip_prefix=`echo "$ax_lua_exec_prefix" | $SED 's|.|.|g'`
-          ax_cv_lua_luaexecdir=`echo "$ax_lua_prefixed_path" | \
-            $SED "s|^$_ax_strip_prefix|$LUA_EXEC_PREFIX|"`
-        ])
-      ])
-    AC_SUBST([luaexecdir], [$ax_cv_lua_luaexecdir])
-    AC_SUBST([pkgluaexecdir], [\${luaexecdir}/$PACKAGE])
-
-    dnl Run any user specified action.
-    $3
-  ])
-])
-
-dnl AX_WITH_LUA is now the same thing as AX_PROG_LUA.
-AC_DEFUN([AX_WITH_LUA],
-[
-  AC_MSG_WARN([[$0 is deprecated, please use AX_PROG_LUA instead]])
-  AX_PROG_LUA
-])
-
-
-dnl =========================================================================
-dnl _AX_LUA_CHK_IS_INTRP(PROG, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-dnl =========================================================================
-AC_DEFUN([_AX_LUA_CHK_IS_INTRP],
-[
-  dnl A minimal Lua factorial to prove this is an interpreter. This should work
-  dnl for Lua interpreters version 5.0 and beyond.
-  _ax_lua_factorial=[`$1 2>/dev/null -e '
-    -- a simple factorial
-    function fact (n)
-      if n == 0 then
-        return 1
-      else
-        return n * fact(n-1)
-      end
-    end
-    print("fact(5) is " .. fact(5))'`]
-  AS_IF([test "$_ax_lua_factorial" = 'fact(5) is 120'],
-    [$2], [$3])
-])
-
-
-dnl =========================================================================
-dnl _AX_LUA_CHK_VER(PROG, MINIMUM-VERSION, [TOO-BIG-VERSION],
-dnl                 [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-dnl =========================================================================
-AC_DEFUN([_AX_LUA_CHK_VER],
-[
-  dnl Check that the Lua version is within the bounds. Only the major and minor
-  dnl version numbers are considered. This should work for Lua interpreters
-  dnl version 5.0 and beyond.
-  _ax_lua_good_version=[`$1 -e '
-    -- a script to compare versions
-    function verstr2num(verstr)
-      local _, _, majorver, minorver = string.find(verstr, "^(%d+)%.(%d+)")
-      if majorver and minorver then
-        return tonumber(majorver) * 100 + tonumber(minorver)
-      end
-    end
-    local minver = verstr2num("$2")
-    local _, _, trimver = string.find(_VERSION, "^Lua (.*)")
-    local ver = verstr2num(trimver)
-    local maxver = verstr2num("$3") or 1e9
-    if minver <= ver and ver < maxver then
-      print("yes")
-    else
-      print("no")
-    end'`]
-    AS_IF([test "x$_ax_lua_good_version" = "xyes"],
-      [$4], [$5])
-])
-
-
-dnl =========================================================================
-dnl _AX_LUA_FND_PRFX_PTH(PROG, PREFIX, SCRIPT-OR-MODULE-DIR)
-dnl =========================================================================
-AC_DEFUN([_AX_LUA_FND_PRFX_PTH],
-[
-  dnl Get the script or module directory by querying the Lua interpreter,
-  dnl filtering on the given prefix, and selecting the shallowest path. If no
-  dnl path is found matching the prefix, the result will be an empty string.
-  dnl The third argument determines the type of search, it can be 'script' or
-  dnl 'module'. Supplying 'script' will perform the search with package.path
-  dnl and LUA_PATH, and supplying 'module' will search with package.cpath and
-  dnl LUA_CPATH. This is done for compatibility with Lua 5.0.
-
-  ax_lua_prefixed_path=[`$1 -e '
-    -- get the path based on search type
-    local searchtype = "$3"
-    local paths = ""
-    if searchtype == "script" then
-      paths = (package and package.path) or LUA_PATH
-    elseif searchtype == "module" then
-      paths = (package and package.cpath) or LUA_CPATH
-    end
-    -- search for the prefix
-    local prefix = "'$2'"
-    local minpath = ""
-    local mindepth = 1e9
-    string.gsub(paths, "(@<:@^;@:>@+)",
-      function (path)
-        path = string.gsub(path, "%?.*$", "")
-        path = string.gsub(path, "/@<:@^/@:>@*$", "")
-        if string.find(path, prefix) then
-          local depth = string.len(string.gsub(path, "@<:@^/@:>@", ""))
-          if depth < mindepth then
-            minpath = path
-            mindepth = depth
-          end
-        end
-      end)
-    print(minpath)'`]
-])
-
-
-dnl =========================================================================
-dnl AX_LUA_HEADERS([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl =========================================================================
-AC_DEFUN([AX_LUA_HEADERS],
-[
-  dnl Check for LUA_VERSION.
-  AC_MSG_CHECKING([if LUA_VERSION is defined])
-  AS_IF([test "x$LUA_VERSION" != 'x'],
-    [AC_MSG_RESULT([yes])],
-    [ AC_MSG_RESULT([no])
-      AC_MSG_ERROR([cannot check Lua headers without knowing LUA_VERSION])
-    ])
-
-  dnl Make LUA_INCLUDE a precious variable.
-  AC_ARG_VAR([LUA_INCLUDE], [The Lua includes, e.g. -I/usr/include/lua5.1])
-
-  dnl Some default directories to search.
-  LUA_SHORT_VERSION=`echo "$LUA_VERSION" | $SED 's|\.||'`
-  m4_define_default([_AX_LUA_INCLUDE_LIST],
-    [ /usr/include/lua$LUA_VERSION \
-      /usr/include/lua-$LUA_VERSION \
-      /usr/include/lua/$LUA_VERSION \
-      /usr/include/lua$LUA_SHORT_VERSION \
-      /usr/local/include/lua$LUA_VERSION \
-      /usr/local/include/lua-$LUA_VERSION \
-      /usr/local/include/lua/$LUA_VERSION \
-      /usr/local/include/lua$LUA_SHORT_VERSION \
-    ])
-
-  dnl Try to find the headers.
-  _ax_lua_saved_cppflags=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $LUA_INCLUDE"
-  AC_CHECK_HEADERS([lua.h lualib.h lauxlib.h luaconf.h])
-  CPPFLAGS=$_ax_lua_saved_cppflags
-
-  dnl Try some other directories if LUA_INCLUDE was not set.
-  AS_IF([test "x$LUA_INCLUDE" = 'x' &&
-         test "x$ac_cv_header_lua_h" != 'xyes'],
-    [ dnl Try some common include paths.
-      for _ax_include_path in _AX_LUA_INCLUDE_LIST; do
-        test ! -d "$_ax_include_path" && continue
-
-        AC_MSG_CHECKING([for Lua headers in])
-        AC_MSG_RESULT([$_ax_include_path])
-
-        AS_UNSET([ac_cv_header_lua_h])
-        AS_UNSET([ac_cv_header_lualib_h])
-        AS_UNSET([ac_cv_header_lauxlib_h])
-        AS_UNSET([ac_cv_header_luaconf_h])
-
-        _ax_lua_saved_cppflags=$CPPFLAGS
-        CPPFLAGS="$CPPFLAGS -I$_ax_include_path"
-        AC_CHECK_HEADERS([lua.h lualib.h lauxlib.h luaconf.h])
-        CPPFLAGS=$_ax_lua_saved_cppflags
-
-        AS_IF([test "x$ac_cv_header_lua_h" = 'xyes'],
-          [ LUA_INCLUDE="-I$_ax_include_path"
-            break
-          ])
-      done
-    ])
-
-  AS_IF([test "x$ac_cv_header_lua_h" = 'xyes'],
-    [ dnl Make a program to print LUA_VERSION defined in the header.
-      dnl TODO It would be really nice if we could do this without compiling a
-      dnl program, then it would work when cross compiling. But I'm not sure how
-      dnl to do this reliably. For now, assume versions match when cross compiling.
-
-      AS_IF([test "x$cross_compiling" != 'xyes'],
-        [ AC_CACHE_CHECK([for Lua header version],
-            [ax_cv_lua_header_version],
-            [ _ax_lua_saved_cppflags=$CPPFLAGS
-              CPPFLAGS="$CPPFLAGS $LUA_INCLUDE"
-              AC_RUN_IFELSE(
-                [ AC_LANG_SOURCE([[
-#include <lua.h>
-#include <stdlib.h>
-#include <stdio.h>
-int main(int argc, char ** argv)
-{
-  if(argc > 1) printf("%s", LUA_VERSION);
-  exit(EXIT_SUCCESS);
-}
-]])
-                ],
-                [ ax_cv_lua_header_version=`./conftest$EXEEXT p | \
-                    $SED -n "s|^Lua \(@<:@0-9@:>@\{1,\}\.@<:@0-9@:>@\{1,\}\).\{0,\}|\1|p"`
-                ],
-                [ax_cv_lua_header_version='unknown'])
-              CPPFLAGS=$_ax_lua_saved_cppflags
-            ])
-
-          dnl Compare this to the previously found LUA_VERSION.
-          AC_MSG_CHECKING([if Lua header version matches $LUA_VERSION])
-          AS_IF([test "x$ax_cv_lua_header_version" = "x$LUA_VERSION"],
-            [ AC_MSG_RESULT([yes])
-              ax_header_version_match='yes'
-            ],
-            [ AC_MSG_RESULT([no])
-              ax_header_version_match='no'
-            ])
-        ],
-        [ AC_MSG_WARN([cross compiling so assuming header version number matches])
-          ax_header_version_match='yes'
-        ])
-    ])
-
-  dnl Was LUA_INCLUDE specified?
-  AS_IF([test "x$ax_header_version_match" != 'xyes' &&
-         test "x$LUA_INCLUDE" != 'x'],
-    [AC_MSG_ERROR([cannot find headers for specified LUA_INCLUDE])])
-
-  dnl Test the final result and run user code.
-  AS_IF([test "x$ax_header_version_match" = 'xyes'], [$1],
-    [m4_default([$2], [AC_MSG_ERROR([cannot find Lua includes])])])
-])
-
-dnl AX_LUA_HEADERS_VERSION no longer exists, use AX_LUA_HEADERS.
-AC_DEFUN([AX_LUA_HEADERS_VERSION],
-[
-  AC_MSG_WARN([[$0 is deprecated, please use AX_LUA_HEADERS instead]])
-])
-
-
-dnl =========================================================================
-dnl AX_LUA_LIBS([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl =========================================================================
-AC_DEFUN([AX_LUA_LIBS],
-[
-  dnl TODO Should this macro also check various -L flags?
-
-  dnl Check for LUA_VERSION.
-  AC_MSG_CHECKING([if LUA_VERSION is defined])
-  AS_IF([test "x$LUA_VERSION" != 'x'],
-    [AC_MSG_RESULT([yes])],
-    [ AC_MSG_RESULT([no])
-      AC_MSG_ERROR([cannot check Lua libs without knowing LUA_VERSION])
-    ])
-
-  dnl Make LUA_LIB a precious variable.
-  AC_ARG_VAR([LUA_LIB], [The Lua library, e.g. -llua5.1])
-
-  AS_IF([test "x$LUA_LIB" != 'x'],
-  [ dnl Check that LUA_LIBS works.
-    _ax_lua_saved_libs=$LIBS
-    LIBS="$LIBS $LUA_LIB"
-    AC_SEARCH_LIBS([lua_load], [],
-      [_ax_found_lua_libs='yes'],
-      [_ax_found_lua_libs='no'])
-    LIBS=$_ax_lua_saved_libs
-
-    dnl Check the result.
-    AS_IF([test "x$_ax_found_lua_libs" != 'xyes'],
-      [AC_MSG_ERROR([cannot find libs for specified LUA_LIB])])
-  ],
-  [ dnl First search for extra libs.
-    _ax_lua_extra_libs=''
-
-    _ax_lua_saved_libs=$LIBS
-    LIBS="$LIBS $LUA_LIB"
-    AC_SEARCH_LIBS([exp], [m])
-    AC_SEARCH_LIBS([dlopen], [dl])
-    LIBS=$_ax_lua_saved_libs
-
-    AS_IF([test "x$ac_cv_search_exp" != 'xno' &&
-           test "x$ac_cv_search_exp" != 'xnone required'],
-      [_ax_lua_extra_libs="$_ax_lua_extra_libs $ac_cv_search_exp"])
-
-    AS_IF([test "x$ac_cv_search_dlopen" != 'xno' &&
-           test "x$ac_cv_search_dlopen" != 'xnone required'],
-      [_ax_lua_extra_libs="$_ax_lua_extra_libs $ac_cv_search_dlopen"])
-
-    dnl Try to find the Lua libs.
-    _ax_lua_saved_libs=$LIBS
-    LIBS="$LIBS $LUA_LIB"
-    AC_SEARCH_LIBS([lua_load],
-      [ lua$LUA_VERSION \
-        lua$LUA_SHORT_VERSION \
-        lua-$LUA_VERSION \
-        lua-$LUA_SHORT_VERSION \
-        lua \
-      ],
-      [_ax_found_lua_libs='yes'],
-      [_ax_found_lua_libs='no'],
-      [$_ax_lua_extra_libs])
-    LIBS=$_ax_lua_saved_libs
-
-    AS_IF([test "x$ac_cv_search_lua_load" != 'xno' &&
-           test "x$ac_cv_search_lua_load" != 'xnone required'],
-      [LUA_LIB="$ac_cv_search_lua_load $_ax_lua_extra_libs"])
-  ])
-
-  dnl Test the result and run user code.
-  AS_IF([test "x$_ax_found_lua_libs" = 'xyes'], [$1],
-    [m4_default([$2], [AC_MSG_ERROR([cannot find Lua libs])])])
-])
-
-
-dnl =========================================================================
-dnl AX_LUA_READLINE([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl =========================================================================
-AC_DEFUN([AX_LUA_READLINE],
-[
-  AX_LIB_READLINE
-  AS_IF([test "x$ac_cv_header_readline_readline_h" != 'x' &&
-         test "x$ac_cv_header_readline_history_h" != 'x'],
-    [ LUA_LIBS_CFLAGS="-DLUA_USE_READLINE $LUA_LIBS_CFLAGS"
-      $1
-    ],
-    [$2])
-])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_prog_haxe_version.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_prog_haxe_version.m4
deleted file mode 100644
index 3dee430..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_prog_haxe_version.m4
+++ /dev/null
@@ -1,60 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_prog_haxe_version.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_HAXE_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE])
-#
-# DESCRIPTION
-#
-#   Makes sure that haxe supports the version indicated. If true the shell
-#   commands in ACTION-IF-TRUE are executed. If not the shell commands in
-#   ACTION-IF-FALSE are run. The $HAXE_VERSION variable will be filled with
-#   the detected version.
-#
-#   This macro uses the $HAXE variable to perform the check. If $HAXE is not
-#   set prior to calling this macro, the macro will fail.
-#
-#   Example:
-#
-#     AC_PATH_PROG([HAXE],[haxe])
-#     AC_PROG_HAXE_VERSION([3.1.3],[ ... ],[ ... ])
-#
-#   Searches for Haxe, then checks if at least version 3.1.3 is present.
-#
-# LICENSE
-#
-#   Copyright (c) 2015 Jens Geyer <jensg@apache.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_PROG_HAXE_VERSION],[
-    AC_REQUIRE([AC_PROG_SED])
-
-    AS_IF([test -n "$HAXE"],[
-        ax_haxe_version="$1"
-
-        AC_MSG_CHECKING([for haxe version])
-        haxe_version=`$HAXE -version 2>&1 | $SED -e 's/^.* \( @<:@0-9@:>@*\.@<:@0-9@:>@*\.@<:@0-9@:>@*\) .*/\1/'`
-        AC_MSG_RESULT($haxe_version)
-
-	    AC_SUBST([HAXE_VERSION],[$haxe_version])
-
-        AX_COMPARE_VERSION([$ax_haxe_version],[le],[$haxe_version],[
-	    :
-            $2
-        ],[
-	    :
-            $3
-        ])
-    ],[
-        AC_MSG_WARN([could not find Haxe])
-        $3
-    ])
-])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_prog_perl_modules.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_prog_perl_modules.m4
deleted file mode 100644
index 11a326c..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_prog_perl_modules.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_prog_perl_modules.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_PERL_MODULES([MODULES], [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-#
-# DESCRIPTION
-#
-#   Checks to see if the given perl modules are available. If true the shell
-#   commands in ACTION-IF-TRUE are executed. If not the shell commands in
-#   ACTION-IF-FALSE are run. Note if $PERL is not set (for example by
-#   calling AC_CHECK_PROG, or AC_PATH_PROG), AC_CHECK_PROG(PERL, perl, perl)
-#   will be run.
-#
-#   MODULES is a space separated list of module names. To check for a
-#   minimum version of a module, append the version number to the module
-#   name, separated by an equals sign.
-#
-#   Example:
-#
-#     AX_PROG_PERL_MODULES( Text::Wrap Net::LDAP=1.0.3, ,
-#                           AC_MSG_WARN(Need some Perl modules)
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Dean Povey <povey@wedgetail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 7
-
-AU_ALIAS([AC_PROG_PERL_MODULES], [AX_PROG_PERL_MODULES])
-AC_DEFUN([AX_PROG_PERL_MODULES],[dnl
-
-m4_define([ax_perl_modules])
-m4_foreach([ax_perl_module], m4_split(m4_normalize([$1])),
-	  [
-	   m4_append([ax_perl_modules],
-		     [']m4_bpatsubst(ax_perl_module,=,[ ])[' ])
-          ])
-
-# Make sure we have perl
-if test -z "$PERL"; then
-AC_CHECK_PROG(PERL,perl,perl)
-fi
-
-if test "x$PERL" != x; then
-  ax_perl_modules_failed=0
-  for ax_perl_module in ax_perl_modules; do
-    AC_MSG_CHECKING(for perl module $ax_perl_module)
-
-    # Would be nice to log result here, but can't rely on autoconf internals
-    $PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1
-    if test $? -ne 0; then
-      AC_MSG_RESULT(no);
-      ax_perl_modules_failed=1
-   else
-      AC_MSG_RESULT(ok);
-    fi
-  done
-
-  # Run optional shell commands
-  if test "$ax_perl_modules_failed" = 0; then
-    :
-    $2
-  else
-    :
-    $3
-  fi
-else
-  AC_MSG_WARN(could not find perl)
-fi])dnl
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_signed_right_shift.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_signed_right_shift.m4
deleted file mode 100644
index 9c3ceb7..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_signed_right_shift.m4
+++ /dev/null
@@ -1,127 +0,0 @@
-dnl @synopsis AX_SIGNED_RIGHT_SHIFT
-dnl
-dnl Tests the behavior of a right shift on a negative signed int.
-dnl
-dnl This macro calls:
-dnl   AC_DEFINE(SIGNED_RIGHT_SHIFT_IS)
-dnl   AC_DEFINE(ARITHMETIC_RIGHT_SHIFT)
-dnl   AC_DEFINE(LOGICAL_RIGHT_SHIFT)
-dnl   AC_DEFINE(UNKNOWN_RIGHT_SHIFT)
-dnl
-dnl SIGNED_RIGHT_SHIFT_IS will be equal to one of the other macros.
-dnl It also leaves the shell variables "ax_signed_right_shift"
-dnl set to "arithmetic", "logical", or "unknown".
-dnl
-dnl NOTE: This macro does not work for cross-compiling.
-dnl
-dnl @category C
-dnl @version 2009-03-25
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-AC_DEFUN([AX_SIGNED_RIGHT_SHIFT],
-         [
-
-          AC_MSG_CHECKING(the behavior of a signed right shift)
-
-          success_arithmetic=no
-          AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[
-          return
-            /* 0xffffffff */
-            -1 >>  1 != -1 ||
-            -1 >>  2 != -1 ||
-            -1 >>  3 != -1 ||
-            -1 >>  4 != -1 ||
-            -1 >>  8 != -1 ||
-            -1 >> 16 != -1 ||
-            -1 >> 24 != -1 ||
-            -1 >> 31 != -1 ||
-            /* 0x80000000 */
-            (-2147483647 - 1) >>  1 != -1073741824 ||
-            (-2147483647 - 1) >>  2 != -536870912  ||
-            (-2147483647 - 1) >>  3 != -268435456  ||
-            (-2147483647 - 1) >>  4 != -134217728  ||
-            (-2147483647 - 1) >>  8 != -8388608    ||
-            (-2147483647 - 1) >> 16 != -32768      ||
-            (-2147483647 - 1) >> 24 != -128        ||
-            (-2147483647 - 1) >> 31 != -1          ||
-            /* 0x90800000 */
-            -1870659584 >>  1 != -935329792 ||
-            -1870659584 >>  2 != -467664896 ||
-            -1870659584 >>  3 != -233832448 ||
-            -1870659584 >>  4 != -116916224 ||
-            -1870659584 >>  8 != -7307264   ||
-            -1870659584 >> 16 != -28544     ||
-            -1870659584 >> 24 != -112       ||
-            -1870659584 >> 31 != -1         ||
-            0;
-          ]])], [
-          success_arithmetic=yes
-          ])
-
-
-          success_logical=no
-          AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[
-          return
-            /* 0xffffffff */
-            -1 >>  1 != (signed)((unsigned)-1 >>  1) ||
-            -1 >>  2 != (signed)((unsigned)-1 >>  2) ||
-            -1 >>  3 != (signed)((unsigned)-1 >>  3) ||
-            -1 >>  4 != (signed)((unsigned)-1 >>  4) ||
-            -1 >>  8 != (signed)((unsigned)-1 >>  8) ||
-            -1 >> 16 != (signed)((unsigned)-1 >> 16) ||
-            -1 >> 24 != (signed)((unsigned)-1 >> 24) ||
-            -1 >> 31 != (signed)((unsigned)-1 >> 31) ||
-            /* 0x80000000 */
-            (-2147483647 - 1) >>  1 != (signed)((unsigned)(-2147483647 - 1) >>  1) ||
-            (-2147483647 - 1) >>  2 != (signed)((unsigned)(-2147483647 - 1) >>  2) ||
-            (-2147483647 - 1) >>  3 != (signed)((unsigned)(-2147483647 - 1) >>  3) ||
-            (-2147483647 - 1) >>  4 != (signed)((unsigned)(-2147483647 - 1) >>  4) ||
-            (-2147483647 - 1) >>  8 != (signed)((unsigned)(-2147483647 - 1) >>  8) ||
-            (-2147483647 - 1) >> 16 != (signed)((unsigned)(-2147483647 - 1) >> 16) ||
-            (-2147483647 - 1) >> 24 != (signed)((unsigned)(-2147483647 - 1) >> 24) ||
-            (-2147483647 - 1) >> 31 != (signed)((unsigned)(-2147483647 - 1) >> 31) ||
-            /* 0x90800000 */
-            -1870659584 >>  1 != (signed)((unsigned)-1870659584 >>  1) ||
-            -1870659584 >>  2 != (signed)((unsigned)-1870659584 >>  2) ||
-            -1870659584 >>  3 != (signed)((unsigned)-1870659584 >>  3) ||
-            -1870659584 >>  4 != (signed)((unsigned)-1870659584 >>  4) ||
-            -1870659584 >>  8 != (signed)((unsigned)-1870659584 >>  8) ||
-            -1870659584 >> 16 != (signed)((unsigned)-1870659584 >> 16) ||
-            -1870659584 >> 24 != (signed)((unsigned)-1870659584 >> 24) ||
-            -1870659584 >> 31 != (signed)((unsigned)-1870659584 >> 31) ||
-            0;
-          ]])], [
-          success_logical=yes
-          ])
-
-
-          AC_DEFINE([ARITHMETIC_RIGHT_SHIFT], 1, [Possible value for SIGNED_RIGHT_SHIFT_IS])
-          AC_DEFINE([LOGICAL_RIGHT_SHIFT], 2, [Possible value for SIGNED_RIGHT_SHIFT_IS])
-          AC_DEFINE([UNKNOWN_RIGHT_SHIFT], 3, [Possible value for SIGNED_RIGHT_SHIFT_IS])
-
-          if test "$success_arithmetic" = "yes" && test "$success_logical" = "yes" ; then
-            AC_MSG_ERROR("Right shift appears to be both arithmetic and logical!")
-          elif test "$success_arithmetic" = "yes" ; then
-            ax_signed_right_shift=arithmetic
-            AC_DEFINE([SIGNED_RIGHT_SHIFT_IS], 1,
-                      [Indicates the effect of the right shift operator
-                       on negative signed integers])
-          elif test "$success_logical" = "yes" ; then
-            ax_signed_right_shift=logical
-            AC_DEFINE([SIGNED_RIGHT_SHIFT_IS], 2,
-                      [Indicates the effect of the right shift operator
-                       on negative signed integers])
-          else
-            ax_signed_right_shift=unknown
-            AC_DEFINE([SIGNED_RIGHT_SHIFT_IS], 3,
-                      [Indicates the effect of the right shift operator
-                       on negative signed integers])
-          fi
-
-          AC_MSG_RESULT($ax_signed_right_shift)
-         ])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/ax_thrift_internal.m4 b/vendor/git.apache.org/thrift.git/aclocal/ax_thrift_internal.m4
deleted file mode 100644
index 8c0e3cb..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/ax_thrift_internal.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl @synopsis AX_THRIFT_GEN(SHORT_LANGUAGE, LONG_LANGUAGE, DEFAULT)
-dnl @synopsis AX_THRIFT_LIB(SHORT_LANGUAGE, LONG_LANGUAGE, DEFAULT)
-dnl
-dnl Allow a particular language generator to be disabled.
-dnl Allow a particular language library to be disabled.
-dnl
-dnl These macros have poor error handling and are poorly documented.
-dnl They are intended only for internal use by the Thrift compiler.
-dnl
-dnl @version 2008-02-20
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-AC_DEFUN([AX_THRIFT_LIB],
-         [
-          AC_ARG_WITH($1,
-                      AC_HELP_STRING([--with-$1], [build the $2 library @<:@default=$3@:>@]),
-                      [with_$1="$withval"],
-                      [with_$1=$3]
-                      )
-          have_$1=no
-          dnl What we do here is going to vary from library to library,
-          dnl so we can't really generalize (yet!).
-         ])
diff --git a/vendor/git.apache.org/thrift.git/aclocal/m4_ax_compare_version.m4 b/vendor/git.apache.org/thrift.git/aclocal/m4_ax_compare_version.m4
deleted file mode 100644
index 74dc0fd..0000000
--- a/vendor/git.apache.org/thrift.git/aclocal/m4_ax_compare_version.m4
+++ /dev/null
@@ -1,177 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-#
-# DESCRIPTION
-#
-#   This macro compares two version strings. Due to the various number of
-#   minor-version numbers that can exist, and the fact that string
-#   comparisons are not compatible with numeric comparisons, this is not
-#   necessarily trivial to do in a autoconf script. This macro makes doing
-#   these comparisons easy.
-#
-#   The six basic comparisons are available, as well as checking equality
-#   limited to a certain number of minor-version levels.
-#
-#   The operator OP determines what type of comparison to do, and can be one
-#   of:
-#
-#    eq  - equal (test A == B)
-#    ne  - not equal (test A != B)
-#    le  - less than or equal (test A <= B)
-#    ge  - greater than or equal (test A >= B)
-#    lt  - less than (test A < B)
-#    gt  - greater than (test A > B)
-#
-#   Additionally, the eq and ne operator can have a number after it to limit
-#   the test to that number of minor versions.
-#
-#    eq0 - equal up to the length of the shorter version
-#    ne0 - not equal up to the length of the shorter version
-#    eqN - equal up to N sub-version levels
-#    neN - not equal up to N sub-version levels
-#
-#   When the condition is true, shell commands ACTION-IF-TRUE are run,
-#   otherwise shell commands ACTION-IF-FALSE are run. The environment
-#   variable 'ax_compare_version' is always set to either 'true' or 'false'
-#   as well.
-#
-#   Examples:
-#
-#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
-#
-#   would both be true.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
-#
-#   would both be false.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
-#
-#   would be true because it is only comparing two minor versions.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
-#
-#   would be true because it is only comparing the lesser number of minor
-#   versions of the two values.
-#
-#   Note: The characters that separate the version numbers do not matter. An
-#   empty string is the same as version 0. OP is evaluated by autoconf, not
-#   configure, so must be a string, not a variable.
-#
-#   The author would like to acknowledge Guido Draheim whose advice about
-#   the m4_case and m4_ifvaln functions make this macro only include the
-#   portions necessary to perform the specific comparison specified by the
-#   OP argument in the final configure script.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 11
-
-dnl #########################################################################
-AC_DEFUN([AX_COMPARE_VERSION], [
-  AC_REQUIRE([AC_PROG_AWK])
-
-  # Used to indicate true or false condition
-  ax_compare_version=false
-
-  # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version
-  # string of the form 1.12.5-r617 will be converted to the form
-  # 0001001200050617.  In other words, each number is zero padded to four
-  # digits, and non digits are removed.
-  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
-  A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
-  B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
-  dnl # then the first line is used to determine if the condition is true.
-  dnl # The sed right after the echo is to remove any indented white space.
-  m4_case(m4_tolower($2),
-  [lt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [gt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [le],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],
-  [ge],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],[
-    dnl Split the operator from the subversion count if present.
-    m4_bmatch(m4_substr($2,2),
-    [0],[
-      # A count of zero means use the length of the shorter version.
-      # Determine the number of characters in A and B.
-      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
-      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
-
-      # Set A to no more than B's length and B to no more than A's length.
-      A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
-    ],
-    [[0-9]+],[
-      # A count greater than zero means use only that many subversions
-      A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-    ],
-    [.+],[
-      AC_WARNING(
-        [illegal OP numeric parameter: $2])
-    ],[])
-
-    # Pad zeros at end of numbers to make same length.
-    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
-    B="$B`echo $A | sed 's/./0/g'`"
-    A="$ax_compare_version_tmp_A"
-
-    # Check for equality or inequality as necessary.
-    m4_case(m4_tolower(m4_substr($2,0,2)),
-    [eq],[
-      test "x$A" = "x$B" && ax_compare_version=true
-    ],
-    [ne],[
-      test "x$A" != "x$B" && ax_compare_version=true
-    ],[
-      AC_WARNING([illegal OP parameter: $2])
-    ])
-  ])
-
-  AS_VAR_POPDEF([A])dnl
-  AS_VAR_POPDEF([B])dnl
-
-  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
-  if test "$ax_compare_version" = "true" ; then
-    m4_ifvaln([$4],[$4],[:])dnl
-    m4_ifvaln([$5],[else $5])dnl
-  fi
-]) dnl AX_COMPARE_VERSION
diff --git a/vendor/git.apache.org/thrift.git/appveyor.yml b/vendor/git.apache.org/thrift.git/appveyor.yml
deleted file mode 100755
index 03ee295..0000000
--- a/vendor/git.apache.org/thrift.git/appveyor.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# build Apache Thrift on AppVeyor - https://ci.appveyor.com
-
-shallow_clone: true
-clone_depth: 10
-
-version: '{build}'
-os:
-# - Windows Server 2012 R2
-- Visual Studio 2015
-
-environment:
-  BOOST_ROOT: C:\Libraries\boost_1_59_0
-  BOOST_LIBRARYDIR: C:\Libraries\boost_1_59_0\lib64-msvc-14.0
-  # Unfurtunately, this version needs manual update because old versions are quickly deleted.
-  ANT_VERSION: 1.9.7
-
-install:
-- '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64'
-- cd \
-  # Zlib
-- appveyor DownloadFile https://github.com/madler/zlib/archive/v1.2.8.tar.gz
-- 7z x v1.2.8.tar.gz -so | 7z x -si -ttar > nul
-- cd zlib-1.2.8
-- cmake -G "Visual Studio 14 2015 Win64" .
-- cmake --build . --config release
-- cd ..
-  # OpenSSL
-- C:\Python35-x64\python %APPVEYOR_BUILD_FOLDER%\build\appveyor\download_openssl.py
-- ps: Start-Process "Win64OpenSSL.exe" -ArgumentList "/silent /verysilent /sp- /suppressmsgboxes" -Wait
-  # Libevent
-- appveyor DownloadFile https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz
-- 7z x libevent-2.0.22-stable.tar.gz -so | 7z x -si -ttar > nul
-- cd libevent-2.0.22-stable
-- nmake -f Makefile.nmake
-- mkdir lib
-- move *.lib lib\
-- move WIN32-Code\event2\* include\event2\
-- move *.h include\
-- cd ..
-- appveyor-retry cinst -y winflexbison
-- appveyor DownloadFile http://www.us.apache.org/dist/ant/binaries/apache-ant-%ANT_VERSION%-bin.zip
-- 7z x apache-ant-%ANT_VERSION%-bin.zip > nul
-- cd %APPVEYOR_BUILD_FOLDER%
-# TODO: Enable Haskell build
-# - cinst HaskellPlatform -version 2014.2.0.0
-
-
-build_script:
-- set PATH=C:\ProgramData\chocolatey\bin;C:\apache-ant-%ANT_VERSION%\bin;%PATH%
-- set JAVA_HOME=C:\Program Files\Java\jdk1.7.0
-- set PATH=%JAVA_HOME%\bin;%PATH%
-# - set PATH=%PATH%;C:\Program Files (x86)\Haskell Platform\2014.2.0.0\bin
-# - set PATH=%PATH%;C:\Program Files (x86)\Haskell Platform\2014.2.0.0\lib\extralibs\bin
-- set PATH=C:\Python27-x64\scripts;C:\Python27-x64;%PATH%
-- pip install ipaddress backports.ssl_match_hostname tornado twisted
-- mkdir cmake-build
-- cd cmake-build
-- cmake -G "Visual Studio 14 2015 Win64" -DWITH_SHARED_LIB=OFF -DLIBEVENT_ROOT=C:\libevent-2.0.22-stable -DZLIB_INCLUDE_DIR=C:\zlib-1.2.8 -DZLIB_LIBRARY=C:\zlib-1.2.8\release\zlibstatic.lib -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" ..
-- findstr /b /e BUILD_COMPILER:BOOL=ON CMakeCache.txt
-- findstr /b /e BUILD_CPP:BOOL=ON CMakeCache.txt
-- findstr /b /e BUILD_JAVA:BOOL=ON CMakeCache.txt
-- findstr /b /e BUILD_PYTHON:BOOL=ON CMakeCache.txt
-# - findstr /b /e BUILD_C_GLIB:BOOL=ON CMakeCache.txt
-# - findstr /b /e BUILD_HASKELL:BOOL=ON CMakeCache.txt
-- findstr /b /e BUILD_TESTING:BOOL=ON CMakeCache.txt
-# - cmake --build .
-- cmake --build . --config Release
-# TODO: Fix cpack
-# - cpack
-# TODO: Run more tests
-# CTest fails to invoke ant seemingly due to "ant.bat" v.s. "ant" (shell script) conflict.
-# Currently, everything that involves OpenSSL seems to hang forever on our Appveyor setup.
-# Also a few C++ tests hang (on Appveyor or on Windows in general).
-- ctest -C Release --timeout 600 -VV -E "(StressTestNonBlocking|PythonTestSSLSocket|python_test$|^Java)"
-# TODO make it perfect ;-r
diff --git a/vendor/git.apache.org/thrift.git/bootstrap.sh b/vendor/git.apache.org/thrift.git/bootstrap.sh
deleted file mode 100755
index 52ecda4..0000000
--- a/vendor/git.apache.org/thrift.git/bootstrap.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-./cleanup.sh
-if test -d lib/php/src/ext/thrift_protocol ; then
-    if phpize -v >/dev/null 2>/dev/null ; then
-        (cd lib/php/src/ext/thrift_protocol && phpize)
-    fi
-fi
-
-set -e
-
-# libtoolize is called "glibtoolize" on OSX.
-if libtoolize --version 1 >/dev/null 2>/dev/null; then
-  LIBTOOLIZE=libtoolize
-elif glibtoolize --version 1 >/dev/null 2>/dev/null; then
-  LIBTOOLIZE=glibtoolize
-else
-  echo >&2 "Couldn't find libtoolize!"
-  exit 1
-fi
-
-# we require automake 1.13 or later
-# check must happen externally due to use of newer macro
-AUTOMAKE_VERSION=`automake --version | grep automake | egrep -o '([0-9]{1,}\.)+[0-9]{1,}'`
-if [ "$AUTOMAKE_VERSION" \< "1.13" ]; then
-  echo >&2 "automake version $AUTOMAKE_VERSION is too old (need 1.13 or later)"
-  exit 1
-fi
-
-autoscan
-$LIBTOOLIZE --copy --automake
-aclocal -I ./aclocal
-autoheader
-autoconf
-automake --copy --add-missing --foreign
diff --git a/vendor/git.apache.org/thrift.git/bower.json b/vendor/git.apache.org/thrift.git/bower.json
deleted file mode 100644
index 9ec59fc..0000000
--- a/vendor/git.apache.org/thrift.git/bower.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "thrift",
-  "version": "0.10.0",
-  "homepage": "https://git-wip-us.apache.org/repos/asf/thrift.git",
-  "authors": [
-    "Apache Thrift <dev@thrift.apache.org>"
-  ],
-  "description": "Apache Thrift",
-  "main": "lib/js/src/thrift.js",
-  "keywords": [
-    "thrift"
-  ],
-  "license": "Apache v2",
-  "ignore": [
-  ]
-}
diff --git a/vendor/git.apache.org/thrift.git/build/appveyor/download_openssl.py b/vendor/git.apache.org/thrift.git/build/appveyor/download_openssl.py
deleted file mode 100644
index fcb72e5..0000000
--- a/vendor/git.apache.org/thrift.git/build/appveyor/download_openssl.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import urllib.request
-import sys
-
-OUT = 'Win64OpenSSL.exe'
-
-URL_STR = 'https://slproweb.com/download/Win64OpenSSL-%s.exe'
-
-VERSION_MAJOR = 1
-VERSION_MINOR = 0
-VERSION_PATCH = 2
-VERSION_SUFFIX = 'j'
-VERSION_STR = '%d_%d_%d%s'
-
-TRY_COUNT = 4
-
-
-def main():
-    for patch in range(VERSION_PATCH, TRY_COUNT):
-        for suffix in range(TRY_COUNT):
-            if patch == VERSION_PATCH:
-                s = VERSION_SUFFIX
-            else:
-                s = 'a'
-            s = chr(ord(s) + suffix)
-            ver = VERSION_STR % (VERSION_MAJOR, VERSION_MINOR, patch, s)
-            url = URL_STR % ver
-            try:
-                with urllib.request.urlopen(url) as res:
-                    if res.getcode() == 200:
-                        with open(OUT, 'wb') as out:
-                            out.write(res.read())
-                            print('successfully downloaded from ' + url)
-                            return 0
-            except urllib.error.HTTPError:
-                pass
-            print('failed to download from ' + url, file=sys.stderr)
-    print('could not download openssl', file=sys.stderr)
-    return 1
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/CPackConfig.cmake b/vendor/git.apache.org/thrift.git/build/cmake/CPackConfig.cmake
deleted file mode 100644
index fdc1b4e..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/CPackConfig.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-#TODO: Should we bundle system libraries for DLLs?
-#include(InstallRequiredSystemLibraries)
-
-# For help take a look at:
-# http://www.cmake.org/Wiki/CMake:CPackConfiguration
-
-### general settings
-set(CPACK_PACKAGE_NAME "thrift")
-set(CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache Thrift")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-set(CPACK_PACKAGE_VENDOR "Apache Software Foundation")
-set(CPACK_PACKAGE_CONTACT "dev@thrift.apache.org")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
-set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
-
-### versions
-set(CPACK_PACKAGE_VERSION_MAJOR ${thrift_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${thrift_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${thrift_VERSION_PATCH})
-
-### source generator
-set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;tags;cscope.*")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-
-### zip generator
-set(CPACK_GENERATOR "ZIP")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "thrift")
-
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    set(CPACK_GENERATOR "NSIS")
-    set(CPACK_NSIS_HELP_LINK "http://thrift.apache.org")
-    set(CPACK_NSIS_MENU_LINKS
-        "http://thrift.apache.org" "Apache Thrift - Web Site"
-        "https://issues.apache.org/jira/browse/THRIFT" "Apache Thrift - Issues")
-    set(CPACK_NSIS_CONTACT ${CPACK_PACKAGE_CONTACT})
-    set(CPACK_NSIS_MODIFY_PATH "ON")
-    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
-else()
-    set(CPACK_GENERATOR "DEB" )
-    set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
-endif()
-
-
-include(CPack)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/ConfigureChecks.cmake b/vendor/git.apache.org/thrift.git/build/cmake/ConfigureChecks.cmake
deleted file mode 100644
index f650544..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/ConfigureChecks.cmake
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-include(CheckSymbolExists)
-include(CheckIncludeFile)
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-
-# If AI_ADDRCONFIG is not defined we define it as 0
-check_symbol_exists(AI_ADDRCONFIG "sys/types.h;sys/socket.h;netdb.h" HAVE_AI_ADDRCONFIG)
-if(NOT HAVE_AI_ADDRCONFIG)
-set(AI_ADDRCONFIG 1)
-endif(NOT HAVE_AI_ADDRCONFIG)
-
-check_include_file(arpa/inet.h HAVE_ARPA_INET_H)
-check_include_file(fcntl.h HAVE_FCNTL_H)
-check_include_file(getopt.h HAVE_GETOPT_H)
-check_include_file(inttypes.h HAVE_INTTYPES_H)
-check_include_file(netdb.h HAVE_NETDB_H)
-check_include_file(netinet/in.h HAVE_NETINET_IN_H)
-check_include_file(stdint.h HAVE_STDINT_H)
-check_include_file(unistd.h HAVE_UNISTD_H)
-check_include_file(pthread.h HAVE_PTHREAD_H)
-check_include_file(sys/time.h HAVE_SYS_TIME_H)
-check_include_file(sys/param.h HAVE_SYS_PARAM_H)
-check_include_file(sys/resource.h HAVE_SYS_RESOURCE_H)
-check_include_file(sys/socket.h HAVE_SYS_SOCKET_H)
-check_include_file(sys/stat.h HAVE_SYS_STAT_H)
-check_include_file(sys/un.h HAVE_SYS_UN_H)
-check_include_file(sys/poll.h HAVE_SYS_POLL_H)
-check_include_file(sys/select.h HAVE_SYS_SELECT_H)
-check_include_file(sched.h HAVE_SCHED_H)
-check_include_file(strings.h HAVE_STRINGS_H)
-
-check_function_exists(gethostbyname HAVE_GETHOSTBYNAME)
-check_function_exists(gethostbyname_r HAVE_GETHOSTBYNAME_R)
-check_function_exists(strerror_r HAVE_STRERROR_R)
-check_function_exists(sched_get_priority_max HAVE_SCHED_GET_PRIORITY_MAX)
-check_function_exists(sched_get_priority_min HAVE_SCHED_GET_PRIORITY_MIN)
-
-include(CheckCSourceCompiles)
-include(CheckCXXSourceCompiles)
-
-check_cxx_source_compiles(
-  "
-  #include <string.h>
-  int main(){char b;char *a = strerror_r(0, &b, 0); return(0);}
-  "
-  STRERROR_R_CHAR_P)
-
-
-set(PACKAGE ${PACKAGE_NAME})
-set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-set(VERSION ${thrift_VERSION})
-
-# generate a config.h file
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/thrift/config.h")
-# HACK: Some files include thrift/config.h and some config.h so we include both. This should be cleaned up.
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/thrift" "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/DefineCMakeDefaults.cmake b/vendor/git.apache.org/thrift.git/build/cmake/DefineCMakeDefaults.cmake
deleted file mode 100644
index 8125de9..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/DefineCMakeDefaults.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-# Always include srcdir and builddir in include path
-# This saves typing ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY} in
-# about every subdir
-# since cmake 2.4.0
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-# Put the include dirs which are in the source or build tree
-# before all other include dirs, so the headers in the sources
-# are preferred over the already installed ones
-# since cmake 2.4.1
-set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
-
-# Use colored output
-# since cmake 2.4.0
-set(CMAKE_COLOR_MAKEFILE ON)
-
-# Define the generic version of the libraries here
-set(GENERIC_LIB_VERSION "0.10.0")
-set(GENERIC_LIB_SOVERSION "0")
-
-# Set the default build type to release with debug info
-if (NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo
-    CACHE STRING
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
-  )
-endif (NOT CMAKE_BUILD_TYPE)
-
-# Create the compile command database for clang by default
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# Put the libraries and binaries that get built into directories at the
-# top of the build tree rather than in hard-to-find leaf
-# directories. This simplifies manual testing and the use of the build
-# tree rather than installed thrift libraries.
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-#
-# "rpath" support.
-# See http://www.itk.org/Wiki/index.php?title=CMake_RPATH_handling
-#
-# On MacOSX, for shared libraries, enable rpath support.
-set(CMAKE_MACOSX_RPATH TRUE)
-#
-# On any OS, for executables, allow linking with shared libraries in non-system
-# locations and running the executables without LD_PRELOAD or similar.
-# This requires the library to be built with rpath support.
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/DefineInstallationPaths.cmake b/vendor/git.apache.org/thrift.git/build/cmake/DefineInstallationPaths.cmake
deleted file mode 100644
index 122f0f6..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/DefineInstallationPaths.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-# Define the default install paths
-set(BIN_INSTALL_DIR "bin" CACHE PATH "The binary install dir (default: bin)")
-set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The library install dir (default: lib${LIB_SUFFIX})")
-set(INCLUDE_INSTALL_DIR "include" CACHE PATH "The library install dir (default: include)")
-set(CMAKE_INSTALL_DIR "cmake" CACHE PATH "The subdirectory to install cmake config files (default: cmake)")
-set(DOC_INSTALL_DIR "share/doc" CACHE PATH "The subdirectory to install documentation files (default: share/doc)")
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/DefineOptions.cmake b/vendor/git.apache.org/thrift.git/build/cmake/DefineOptions.cmake
deleted file mode 100644
index 0c853b1..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/DefineOptions.cmake
+++ /dev/null
@@ -1,210 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-include(CMakeDependentOption)
-
-set(THRIFT_COMPILER "" CACHE FILEPATH "External Thrift compiler to use during build")
-
-# Additional components
-option(BUILD_COMPILER "Build Thrift compiler" ON)
-
-if(BUILD_COMPILER OR EXISTS ${THRIFT_COMPILER})
-    set(HAVE_COMPILER ON)
-endif()
-CMAKE_DEPENDENT_OPTION(BUILD_TESTING "Build with unit tests" ON "HAVE_COMPILER" OFF)
-CMAKE_DEPENDENT_OPTION(BUILD_EXAMPLES "Build examples" ON "HAVE_COMPILER" OFF)
-CMAKE_DEPENDENT_OPTION(BUILD_TUTORIALS "Build Thrift tutorials" ON "HAVE_COMPILER" OFF)
-option(BUILD_LIBRARIES "Build Thrift libraries" ON)
-
-# Libraries to build
-
-# Each language library can be enabled or disabled using the WITH_<LANG> flag.
-# By default CMake checks if the required dependencies for a language are present
-# and enables the library if all are found. This means the default is to build as
-# much as possible but leaving out libraries if their dependencies are not met.
-
-CMAKE_DEPENDENT_OPTION(WITH_BOOST_STATIC "Build with Boost static link library" OFF "NOT MSVC" ON)
-set(Boost_USE_STATIC_LIBS ${WITH_BOOST_STATIC})
-if (NOT WITH_BOOST_STATIC)
-    add_definitions(-DBOOST_ALL_DYN_LINK)
-    add_definitions(-DBOOST_TEST_DYN_LINK)
-endif()
-
-# C++
-option(WITH_CPP "Build C++ Thrift library" ON)
-if(WITH_CPP)
-    find_package(Boost 1.53 QUIET)
-    # NOTE: Currently the following options are C++ specific,
-    # but in future other libraries might reuse them.
-    # So they are not dependent on WITH_CPP but setting them without WITH_CPP currently
-    # has no effect.
-    if(ZLIB_LIBRARY)
-        # FindZLIB.cmake does not normalize path so we need to do it ourselves.
-        file(TO_CMAKE_PATH ${ZLIB_LIBRARY} ZLIB_LIBRARY)
-    endif()
-    find_package(ZLIB QUIET)
-    CMAKE_DEPENDENT_OPTION(WITH_ZLIB "Build with ZLIB support" ON
-                           "ZLIB_FOUND" OFF)
-    find_package(Libevent QUIET)
-    CMAKE_DEPENDENT_OPTION(WITH_LIBEVENT "Build with libevent support" ON
-                           "Libevent_FOUND" OFF)
-    find_package(Qt4 QUIET COMPONENTS QtCore QtNetwork)
-    CMAKE_DEPENDENT_OPTION(WITH_QT4 "Build with Qt4 support" ON
-                           "QT4_FOUND" OFF)
-    find_package(Qt5 QUIET COMPONENTS Core Network)
-    CMAKE_DEPENDENT_OPTION(WITH_QT5 "Build with Qt5 support" ON
-                           "Qt5_FOUND" OFF)
-    if(${WITH_QT4} AND ${WITH_QT5} AND ${CMAKE_MAJOR_VERSION} LESS 3)
-      # cmake < 3.0.0 causes conflict when building both Qt4 and Qt5
-      set(WITH_QT4 OFF)
-    endif()
-    find_package(OpenSSL QUIET)
-    CMAKE_DEPENDENT_OPTION(WITH_OPENSSL "Build with OpenSSL support" ON
-                           "OPENSSL_FOUND" OFF)
-    option(WITH_STDTHREADS "Build with C++ std::thread support" OFF)
-    CMAKE_DEPENDENT_OPTION(WITH_BOOSTTHREADS "Build with Boost threads support" OFF
-        "NOT WITH_STDTHREADS;Boost_FOUND" OFF)
-endif()
-CMAKE_DEPENDENT_OPTION(BUILD_CPP "Build C++ library" ON
-                       "BUILD_LIBRARIES;WITH_CPP;Boost_FOUND" OFF)
-CMAKE_DEPENDENT_OPTION(WITH_PLUGIN "Build compiler plugin support" ON
-                       "BUILD_COMPILER;BUILD_CPP" OFF)
-
-# C GLib
-option(WITH_C_GLIB "Build C (GLib) Thrift library" ON)
-if(WITH_C_GLIB)
-    find_package(GLIB QUIET COMPONENTS gobject)
-endif()
-CMAKE_DEPENDENT_OPTION(BUILD_C_GLIB "Build C (GLib) library" ON
-                       "BUILD_LIBRARIES;WITH_C_GLIB;GLIB_FOUND" OFF)
-
-if(BUILD_CPP)
-    set(boost_components)
-    if(WITH_BOOSTTHREADS OR BUILD_TESTING)
-        list(APPEND boost_components system thread)
-    endif()
-    if(BUILD_TESTING)
-        list(APPEND boost_components unit_test_framework filesystem chrono program_options)
-    endif()
-    if(boost_components)
-        find_package(Boost 1.53 REQUIRED COMPONENTS ${boost_components})
-    endif()
-elseif(BUILD_C_GLIB AND BUILD_TESTING)
-    find_package(Boost 1.53 REQUIRED)
-endif()
-
-# Java
-option(WITH_JAVA "Build Java Thrift library" ON)
-if(ANDROID)
-    find_package(Gradle QUIET)
-    CMAKE_DEPENDENT_OPTION(BUILD_JAVA "Build Java library" ON
-                           "BUILD_LIBRARIES;WITH_JAVA;GRADLE_FOUND" OFF)
-else()
-    find_package(Java QUIET)
-    find_package(Ant QUIET)
-    CMAKE_DEPENDENT_OPTION(BUILD_JAVA "Build Java library" ON
-                           "BUILD_LIBRARIES;WITH_JAVA;JAVA_FOUND;ANT_FOUND" OFF)
-endif()
-
-# Python
-option(WITH_PYTHON "Build Python Thrift library" ON)
-find_package(PythonInterp QUIET) # for Python executable
-find_package(PythonLibs QUIET) # for Python.h
-CMAKE_DEPENDENT_OPTION(BUILD_PYTHON "Build Python library" ON
-                       "BUILD_LIBRARIES;WITH_PYTHON;PYTHONLIBS_FOUND" OFF)
-
-# Haskell
-option(WITH_HASKELL "Build Haskell Thrift library" ON)
-find_package(GHC QUIET)
-find_package(Cabal QUIET)
-CMAKE_DEPENDENT_OPTION(BUILD_HASKELL "Build GHC library" ON
-                       "BUILD_LIBRARIES;WITH_HASKELL;GHC_FOUND;CABAL_FOUND" OFF)
-
-# Common library options
-option(WITH_SHARED_LIB "Build shared libraries" ON)
-option(WITH_STATIC_LIB "Build static libraries" ON)
-if (NOT WITH_SHARED_LIB AND NOT WITH_STATIC_LIB)
-    message(FATAL_ERROR "Cannot build with both shared and static outputs disabled!")
-endif()
-
-#NOTE: C++ compiler options are defined in the lib/cpp/CMakeLists.txt
-
-# Visual Studio only options
-if(MSVC)
-option(WITH_MT "Build using MT instead of MD (MSVC only)" OFF)
-endif(MSVC)
-
-macro(MESSAGE_DEP flag summary)
-if(NOT ${flag})
-  message(STATUS "   - ${summary}")
-endif()
-endmacro(MESSAGE_DEP flag summary)
-
-macro(PRINT_CONFIG_SUMMARY)
-message(STATUS "----------------------------------------------------------")
-message(STATUS "Thrift version:                               ${thrift_VERSION} (${thrift_VERSION_MAJOR}.${thrift_VERSION_MINOR}.${thrift_VERSION_PATCH})")
-message(STATUS "Thrift package version:                       ${PACKAGE_VERSION}")
-message(STATUS "Build configuration Summary")
-message(STATUS "  Build Thrift compiler:                      ${BUILD_COMPILER}")
-message(STATUS "  Build compiler plugin support:              ${WITH_PLUGIN}")
-MESSAGE_DEP(PLUGIN_COMPILER_NOT_TOO_OLD "Disabled due to older compiler")
-message(STATUS "  Build with unit tests:                      ${BUILD_TESTING}")
-MESSAGE_DEP(HAVE_COMPILER "Disabled because BUILD_THRIFT=OFF and no valid THRIFT_COMPILER is given")
-message(STATUS "  Build examples:                             ${BUILD_EXAMPLES}")
-MESSAGE_DEP(HAVE_COMPILER "Disabled because BUILD_THRIFT=OFF and no valid THRIFT_COMPILER is given")
-message(STATUS "  Build Thrift libraries:                     ${BUILD_LIBRARIES}")
-message(STATUS " Language libraries:")
-message(STATUS "  Build C++ library:                          ${BUILD_CPP}")
-MESSAGE_DEP(WITH_CPP "Disabled by WITH_CPP=OFF")
-MESSAGE_DEP(Boost_FOUND "Boost headers missing")
-message(STATUS "  Build C (GLib) library:                     ${BUILD_C_GLIB}")
-MESSAGE_DEP(WITH_C_GLIB "Disabled by WITH_C_GLIB=OFF")
-MESSAGE_DEP(GLIB_FOUND "GLib missing")
-message(STATUS "  Build Java library:                         ${BUILD_JAVA}")
-MESSAGE_DEP(WITH_JAVA "Disabled by WITH_JAVA=OFF")
-if(ANDROID)
-    MESSAGE_DEP(GRADLE_FOUND "Gradle missing")
-else()
-    MESSAGE_DEP(JAVA_FOUND "Java Runtime missing")
-    MESSAGE_DEP(ANT_FOUND "Ant missing")
-endif()
-message(STATUS "  Build Python library:                       ${BUILD_PYTHON}")
-MESSAGE_DEP(WITH_PYTHON "Disabled by WITH_PYTHON=OFF")
-MESSAGE_DEP(PYTHONLIBS_FOUND "Python libraries missing")
-message(STATUS "  Build Haskell library:                      ${BUILD_HASKELL}")
-MESSAGE_DEP(WITH_HASKELL "Disabled by WITH_HASKELL=OFF")
-MESSAGE_DEP(GHC_FOUND "GHC missing")
-MESSAGE_DEP(CABAL_FOUND "Cabal missing")
-message(STATUS " Library features:")
-message(STATUS "  Build shared libraries:                     ${WITH_SHARED_LIB}")
-message(STATUS "  Build static libraries:                     ${WITH_STATIC_LIB}")
-message(STATUS "  Build with ZLIB support:                    ${WITH_ZLIB}")
-message(STATUS "  Build with libevent support:                ${WITH_LIBEVENT}")
-message(STATUS "  Build with Qt4 support:                     ${WITH_QT4}")
-message(STATUS "  Build with Qt5 support:                     ${WITH_QT5}")
-message(STATUS "  Build with OpenSSL support:                 ${WITH_OPENSSL}")
-message(STATUS "  Build with Boost thread support:            ${WITH_BOOSTTHREADS}")
-message(STATUS "  Build with C++ std::thread support:         ${WITH_STDTHREADS}")
-message(STATUS "  Build with Boost static link library:       ${WITH_BOOST_STATIC}")
-if(MSVC)
-    message(STATUS "    - Enabled for Visual C++")
-endif()
-message(STATUS "----------------------------------------------------------")
-endmacro(PRINT_CONFIG_SUMMARY)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/DefinePlatformSpecifc.cmake b/vendor/git.apache.org/thrift.git/build/cmake/DefinePlatformSpecifc.cmake
deleted file mode 100644
index e57ecc2..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/DefinePlatformSpecifc.cmake
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-# Visual Studio specific options
-if(MSVC)
-    #For visual studio the library naming is as following:
-    # Dynamic libraries:
-    #  - thrift.dll  for release library
-    #  - thriftd.dll for debug library
-    #
-    # Static libraries:
-    #  - thriftmd.lib for /MD release build
-    #  - thriftmt.lib for /MT release build
-    #
-    #  - thriftmdd.lib for /MD debug build
-    #  - thriftmtd.lib for /MT debug build
-    #
-    # the same holds for other libraries like libthriftz etc.
-
-    # For Debug build types, append a "d" to the library names.
-    set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Set debug library postfix" FORCE)
-    set(CMAKE_RELEASE_POSTFIX "" CACHE STRING "Set release library postfix" FORCE)
-    set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "Set release library postfix" FORCE)
-
-    # Build using /MT option instead of /MD if the WITH_MT options is set
-    if(WITH_MT)
-        set(CompilerFlags
-                CMAKE_CXX_FLAGS
-                CMAKE_CXX_FLAGS_DEBUG
-                CMAKE_CXX_FLAGS_RELEASE
-                CMAKE_CXX_FLAGS_RELWITHDEBINFO
-                CMAKE_C_FLAGS
-                CMAKE_C_FLAGS_DEBUG
-                CMAKE_C_FLAGS_RELEASE
-                CMAKE_C_FLAGS_RELWITHDEBINFO
-                )
-        foreach(CompilerFlag ${CompilerFlags})
-          string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-        endforeach()
-        set(STATIC_POSTFIX "mt" CACHE STRING "Set static library postfix" FORCE)
-    else(WITH_MT)
-        set(STATIC_POSTFIX "md" CACHE STRING "Set static library postfix" FORCE)
-    endif(WITH_MT)
-
-    # Disable Windows.h definition of macros for min and max
-    add_definitions("-DNOMINMAX")
-
-    # Disable boost auto linking pragmas - cmake includes the right files
-    add_definitions("-DBOOST_ALL_NO_LIB")
-
-    # Windows build does not know how to make a shared library yet
-    # as there are no __declspec(dllexport) or exports files in the project.
-    if (WITH_SHARED_LIB)
-      message (FATAL_ERROR "Windows build does not support shared library output yet, please set -DWITH_SHARED_LIB=off")
-    endif()
-
-elseif(UNIX)
-  find_program( MEMORYCHECK_COMMAND valgrind )
-  set( MEMORYCHECK_COMMAND_OPTIONS "--gen-suppressions=all --leak-check=full" )
-  set( MEMORYCHECK_SUPPRESSIONS_FILE "${PROJECT_SOURCE_DIR}/test/valgrind.suppress" )
-endif()
-
-# WITH_*THREADS selects which threading library to use
-if(WITH_BOOSTTHREADS)
-  add_definitions("-DUSE_BOOST_THREAD=1")
-elseif(WITH_STDTHREADS)
-  add_definitions("-DUSE_STD_THREAD=1")
-endif()
-
-# GCC and Clang.
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  # FIXME -pedantic can not be used at the moment because of: https://issues.apache.org/jira/browse/THRIFT-2784
-  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -Wall -Wextra -pedantic")
-  # FIXME enabling c++11 breaks some Linux builds on Travis by triggering a g++ bug, see
-  # https://travis-ci.org/apache/thrift/jobs/58017022
-  # on the other hand, both MacOSX and FreeBSD need c++11
-  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -Wall -Wextra")
-  endif()
-endif()
-
-# If gcc older than 4.8 is detected, disable new compiler plug-in support (see THRIFT-3937)
-set(PLUGIN_COMPILER_NOT_TOO_OLD ON) # simplifies messaging in DefineOptions summary
-if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8" AND WITH_PLUGIN)
-  message(STATUS "Disabling compiler plug-in support to work with older gcc compiler")
-  set(WITH_PLUGIN OFF)
-  set(PLUGIN_COMPILER_NOT_TOO_OLD OFF)
-endif()
-
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/FindAnt.cmake b/vendor/git.apache.org/thrift.git/build/cmake/FindAnt.cmake
deleted file mode 100644
index 8b0371d..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/FindAnt.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-#  ANT_FOUND - system has Ant
-#  Ant_EXECUTABLE - the Ant executable
-#
-# It will search the environment variable ANT_HOME if it is set
-
-include(FindPackageHandleStandardArgs)
-
-find_program(Ant_EXECUTABLE NAMES ant PATHS $ENV{ANT_HOME}/bin)
-find_package_handle_standard_args(Ant DEFAULT_MSG Ant_EXECUTABLE)
-mark_as_advanced(Ant_EXECUTABLE)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/FindCabal.cmake b/vendor/git.apache.org/thrift.git/build/cmake/FindCabal.cmake
deleted file mode 100644
index fed337b..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/FindCabal.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-#  Cabal_FOUND - system has Cabal
-#  Cabal - the Cabal executable
-#
-# It will search the environment variable CABAL_HOME if it is set
-
-include(FindPackageHandleStandardArgs)
-
-find_program(CABAL NAMES cabal PATHS $ENV{HOME}/.cabal/bin $ENV{CABAL_HOME}/bin)
-find_package_handle_standard_args(CABAL DEFAULT_MSG CABAL)
-mark_as_advanced(CABAL)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/FindGHC.cmake b/vendor/git.apache.org/thrift.git/build/cmake/FindGHC.cmake
deleted file mode 100644
index 4873847..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/FindGHC.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-#  GHC_FOUND - system has GHC
-#  GHC - the GHC executable
-#  RUN_HASKELL_FOUND - system has runhaskell
-#  RUN_HASKELL - the runhaskell executable
-#
-# It will search the environment variable GHC_HOME if it is set
-
-include(FindPackageHandleStandardArgs)
-
-find_program(GHC NAMES ghc PATHS $ENV{GHC_HOME}/bin)
-find_package_handle_standard_args(GHC DEFAULT_MSG GHC)
-mark_as_advanced(GHC)
-
-find_program(RUN_HASKELL NAMES runhaskell PATHS $ENV{GHC_HOME}/bin)
-find_package_handle_standard_args(RUN_HASKELL DEFAULT_MSG RUN_HASKELL)
-mark_as_advanced(RUN_HASKELL)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/FindGLIB.cmake b/vendor/git.apache.org/thrift.git/build/cmake/FindGLIB.cmake
deleted file mode 100644
index acbe433..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/FindGLIB.cmake
+++ /dev/null
@@ -1,122 +0,0 @@
-# - Try to find Glib and its components (gio, gobject etc)
-# Once done, this will define
-#
-#  GLIB_FOUND - system has Glib
-#  GLIB_INCLUDE_DIRS - the Glib include directories
-#  GLIB_LIBRARIES - link these to use Glib
-#
-# Optionally, the COMPONENTS keyword can be passed to find_package()
-# and Glib components can be looked for.  Currently, the following
-# components can be used, and they define the following variables if
-# found:
-#
-#  gio:             GLIB_GIO_LIBRARIES
-#  gobject:         GLIB_GOBJECT_LIBRARIES
-#  gmodule:         GLIB_GMODULE_LIBRARIES
-#  gthread:         GLIB_GTHREAD_LIBRARIES
-#
-# Note that the respective _INCLUDE_DIR variables are not set, since
-# all headers are in the same directory as GLIB_INCLUDE_DIRS.
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig)
-pkg_check_modules(PC_GLIB QUIET glib-2.0)
-
-find_library(GLIB_LIBRARIES
-    NAMES glib-2.0
-    HINTS ${PC_GLIB_LIBDIR}
-          ${PC_GLIB_LIBRARY_DIRS}
-)
-
-# Files in glib's main include path may include glibconfig.h, which,
-# for some odd reason, is normally in $LIBDIR/glib-2.0/include.
-get_filename_component(_GLIB_LIBRARY_DIR ${GLIB_LIBRARIES} PATH)
-find_path(GLIBCONFIG_INCLUDE_DIR
-    NAMES glibconfig.h
-    HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${_GLIB_LIBRARY_DIR}
-          ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS}
-    PATH_SUFFIXES glib-2.0/include
-)
-
-find_path(GLIB_INCLUDE_DIR
-    NAMES glib.h
-    HINTS ${PC_GLIB_INCLUDEDIR}
-          ${PC_GLIB_INCLUDE_DIRS}
-    PATH_SUFFIXES glib-2.0
-)
-
-set(GLIB_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR})
-
-if(GLIBCONFIG_INCLUDE_DIR)
-    # Version detection
-    file(READ "${GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" GLIBCONFIG_H_CONTENTS)
-    string(REGEX MATCH "#define GLIB_MAJOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-    set(GLIB_VERSION_MAJOR "${CMAKE_MATCH_1}")
-    string(REGEX MATCH "#define GLIB_MINOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-    set(GLIB_VERSION_MINOR "${CMAKE_MATCH_1}")
-    string(REGEX MATCH "#define GLIB_MICRO_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-    set(GLIB_VERSION_MICRO "${CMAKE_MATCH_1}")
-    set(GLIB_VERSION "${GLIB_VERSION_MAJOR}.${GLIB_VERSION_MINOR}.${GLIB_VERSION_MICRO}")
-endif()
-
-# Additional Glib components.  We only look for libraries, as not all of them
-# have corresponding headers and all headers are installed alongside the main
-# glib ones.
-foreach (_component ${GLIB_FIND_COMPONENTS})
-    if (${_component} STREQUAL "gio")
-        find_library(GLIB_GIO_LIBRARIES NAMES gio-2.0 HINTS ${_GLIB_LIBRARY_DIR})
-        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GIO_LIBRARIES)
-    elseif (${_component} STREQUAL "gobject")
-        find_library(GLIB_GOBJECT_LIBRARIES NAMES gobject-2.0 HINTS ${_GLIB_LIBRARY_DIR})
-        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GOBJECT_LIBRARIES)
-    elseif (${_component} STREQUAL "gmodule")
-        find_library(GLIB_GMODULE_LIBRARIES NAMES gmodule-2.0 HINTS ${_GLIB_LIBRARY_DIR})
-        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GMODULE_LIBRARIES)
-    elseif (${_component} STREQUAL "gthread")
-        find_library(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR})
-        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES)
-    elseif (${_component} STREQUAL "gio-unix")
-        # gio-unix is compiled as part of the gio library, but the include paths
-        # are separate from the shared glib ones. Since this is currently only used
-        # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config.
-        pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
-    endif ()
-endforeach ()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLIB REQUIRED_VARS GLIB_INCLUDE_DIRS GLIB_LIBRARIES ${ADDITIONAL_REQUIRED_VARS}
-                                       VERSION_VAR   GLIB_VERSION)
-
-mark_as_advanced(
-    GLIBCONFIG_INCLUDE_DIR
-    GLIB_GIO_LIBRARIES
-    GLIB_GIO_UNIX_LIBRARIES
-    GLIB_GMODULE_LIBRARIES
-    GLIB_GOBJECT_LIBRARIES
-    GLIB_GTHREAD_LIBRARIES
-    GLIB_INCLUDE_DIR
-    GLIB_INCLUDE_DIRS
-    GLIB_LIBRARIES
-)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/FindGradle.cmake b/vendor/git.apache.org/thrift.git/build/cmake/FindGradle.cmake
deleted file mode 100644
index 8845d69..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/FindGradle.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-#  GRADLE_FOUND - system has Gradle
-#  GRADLE_EXECUTABLE - the Gradle executable
-#
-# It will search the environment variable ANT_HOME if it is set
-
-include(FindPackageHandleStandardArgs)
-
-find_program(GRADLE_EXECUTABLE NAMES gradle PATHS $ENV{GRADLE_HOME}/bin NO_CMAKE_FIND_ROOT_PATH)
-find_package_handle_standard_args(Gradle DEFAULT_MSG GRADLE_EXECUTABLE)
-mark_as_advanced(GRADLE_EXECUTABLE)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/FindLibevent.cmake b/vendor/git.apache.org/thrift.git/build/cmake/FindLibevent.cmake
deleted file mode 100644
index 2bcd709..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/FindLibevent.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-# find LibEvent
-# an event notification library (http://libevent.org/)
-#
-# Usage: 
-# LIBEVENT_INCLUDE_DIRS, where to find LibEvent headers
-# LIBEVENT_LIBRARIES, LibEvent libraries
-# Libevent_FOUND, If false, do not try to use libevent
-
-set(LIBEVENT_ROOT CACHE PATH "Root directory of libevent installation")
-set(LibEvent_EXTRA_PREFIXES /usr/local /opt/local "$ENV{HOME}" ${LIBEVENT_ROOT})
-foreach(prefix ${LibEvent_EXTRA_PREFIXES})
-  list(APPEND LibEvent_INCLUDE_PATHS "${prefix}/include")
-  list(APPEND LibEvent_LIBRARIES_PATHS "${prefix}/lib")
-endforeach()
-
-find_path(LIBEVENT_INCLUDE_DIRS event.h PATHS ${LibEvent_INCLUDE_PATHS})
-# "lib" prefix is needed on Windows
-find_library(LIBEVENT_LIBRARIES NAMES event libevent PATHS ${LibEvent_LIBRARIES_PATHS})
-
-if (LIBEVENT_LIBRARIES AND LIBEVENT_INCLUDE_DIRS)
-  set(Libevent_FOUND TRUE)
-  set(LIBEVENT_LIBRARIES ${LIBEVENT_LIBRARIES})
-else ()
-  set(Libevent_FOUND FALSE)
-endif ()
-
-if (Libevent_FOUND)
-  if (NOT Libevent_FIND_QUIETLY)
-    message(STATUS "Found libevent: ${LIBEVENT_LIBRARIES}")
-  endif ()
-else ()
-  if (LibEvent_FIND_REQUIRED)
-    message(FATAL_ERROR "Could NOT find libevent.")
-  endif ()
-  message(STATUS "libevent NOT found.")
-endif ()
-
-mark_as_advanced(
-    LIBEVENT_LIBRARIES
-    LIBEVENT_INCLUDE_DIRS
-  )
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/README.md b/vendor/git.apache.org/thrift.git/build/cmake/README.md
deleted file mode 100644
index ebc4f7d..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Apache Thrift - CMake build
-
-## Goal
-Extend Apache Thrift's *make cross* approach to the build system.
-
-Due to growing the field of operating system support, a proper executable
-and library detection mechanism running on as much platforms as possible
-becomes required. The other aspect to simplify the release process and
-package generation process.
-
-As nice side benefit of CMake is the generation of development environment
-specific soultion files. => No solution files within source tree.
-
-
-## Usage
-just do this:
-
-    mkdir cmake-build && cd cmake-build
-    cmake ..
-
-if you use a specific toolchain pass it to cmake, the same for options:
-
-    cmake -DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake ..
-    cmake -DCMAKE_C_COMPILER=clang-3.5 -DCMAKE_CXX_COMPILER=clang++-3.5 ..
-    cmake -DTHRIFT_COMPILER_HS=OFF ..
-    cmake -DWITH_ZLIB=ON ..
-
-or on Windows
-
-    cmake -G "Visual Studio 12 2013 Win64" \
-    -DBOOST_ROOT=C:/3rdparty/boost_1_58_0 \
-    -DZLIB_ROOT=C:/3rdparty/zlib128-dll \
-    -DWITH_SHARED_LIB=off -DWITH_BOOSTTHREADS=ON ..
-
-and open the development environment you like with the solution or do this:
-
-    make
-    make check
-    make cross
-    make dist
-
-to generate an installer and distribution package do this:
-
-    cpack
-
-## TODO
-* git hash or tag based versioning depending on source state
-* build tutorial
-* build test
-* with/without language lib/<lang>/
-* enable/disable
-* make cross
-* make dist (create an alias to make package_source)
-* make doc
-* cpack (C++ and make dist only ?)
-  * thrift-compiler
-  * libthrift
-  * tutorial
-  * test
-* merge into /README.md
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/ThriftMacros.cmake b/vendor/git.apache.org/thrift.git/build/cmake/ThriftMacros.cmake
deleted file mode 100644
index f837f94..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/ThriftMacros.cmake
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Set debug library postfix" FORCE)
-
-
-macro(ADD_LIBRARY_THRIFT name)
-
-if(WITH_SHARED_LIB)
-    add_library(${name} SHARED ${ARGN})
-    set_target_properties(${name} PROPERTIES
-        OUTPUT_NAME ${name}
-        VERSION ${thrift_VERSION}
-        SOVERSION ${thrift_VERSION} )
-    #set_target_properties(${name} PROPERTIES PUBLIC_HEADER "${thriftcpp_HEADERS}")
-    install(TARGETS ${name}
-        RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
-        LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
-        ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
-        PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}")
-endif()
-
-if(WITH_STATIC_LIB)
-    add_library(${name}_static STATIC ${ARGN})
-    set_target_properties(${name}_static PROPERTIES
-        OUTPUT_NAME ${name}${STATIC_POSTFIX}
-        VERSION ${thrift_VERSION}
-        SOVERSION ${thrift_VERSION} )
-    install(TARGETS ${name}_static
-        RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
-        LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
-        ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
-        PUBLIC_HEADER DESTINATION "${INCLUDE_INSTALL_DIR}")
-endif()
-
-endmacro(ADD_LIBRARY_THRIFT)
-
-
-macro(TARGET_INCLUDE_DIRECTORIES_THRIFT name)
-
-if(WITH_SHARED_LIB)
-    target_include_directories(${name} ${ARGN})
-endif()
-
-if(WITH_STATIC_LIB)
-    target_include_directories(${name}_static ${ARGN})
-endif()
-
-endmacro(TARGET_INCLUDE_DIRECTORIES_THRIFT)
-
-
-macro(TARGET_LINK_LIBRARIES_THRIFT name)
-
-if(WITH_SHARED_LIB)
-    target_link_libraries(${name} ${ARGN})
-endif()
-
-if(WITH_STATIC_LIB)
-    target_link_libraries(${name}_static ${ARGN})
-endif()
-
-endmacro(TARGET_LINK_LIBRARIES_THRIFT)
-
-
-macro(LINK_AGAINST_THRIFT_LIBRARY target libname)
-
-if (WITH_SHARED_LIB)
-    target_link_libraries(${target} ${libname})
-elseif (WITH_STATIC_LIB)
-    target_link_libraries(${target} ${libname}_static)
-else()
-    message(FATAL "Not linking with shared or static libraries?")
-endif()
-
-endmacro(LINK_AGAINST_THRIFT_LIBRARY)
-
-
-macro(TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY target libname)
-
-if(WITH_SHARED_LIB)
-    target_link_libraries(${target} ${ARGN} ${libname})
-endif()
-
-if(WITH_STATIC_LIB)
-    target_link_libraries(${target}_static ${ARGN} ${libname}_static)
-endif()
-
-endmacro(TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/android-toolchain.cmake b/vendor/git.apache.org/thrift.git/build/cmake/android-toolchain.cmake
deleted file mode 100644
index 15f3d00..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/android-toolchain.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-set(ANDROID_NDK "/opt/android-ndk" CACHE)
-set(ANDROID_PLATFORM "android-15" CACHE)
-set(ANDROID_ARCH "arch-arm" CACHE)
-set(ANDROID_TOOL_ARCH "android-arm" CACHE)
-set(ANDROID_CPU "armeabi-v7a" CACHE)
-set(ANDROID_GCC_VERSION 4.9 CACHE)
-set(HOST_ARCH linux-x86_64 CACHE)
-
-set(CMAKE_SYSTEM_NAME Android)
-set(ANDROID_SYSROOT "${ANDROID_NDK}/platforms/${ANDROID_PLATFORM}/${ANDROID_ARCH}")
-set(ANDROID_TRIPLET arm-linux-androideabi)
-set(ANDROID_STL "${ANDROID_NDK}/sources/cxx-stl/gnu-libstd++/${ANDROID_GCC_VERSION}")
-
-set(_COMPILER_ROOT ${ANDROID_NDK}/prebuilt/${ANDROID_TRIPLET}-${ANDROID_GCC_VERSION}/prebuilt/${HOST_ARCH})
-set(CMAKE_C_COMPILER ${_COMPILER_ROOT}/bin/${ANDROID_TRIPLET}-gcc)
-set(CMAKE_CXCX_COMPILER ${_COMPILER_ROOT}/bin/${ANDROID_TRIPLET}-g++)
-
-include_directories(
-    ${ANDROID_STL}/include
-    ${ANDROID_STL}/libs/${ANDROID_CPU}/include)
-
-set(CMAKE_FIND_ROOT_PATH ${ANDROID_SYSROOT})
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/config.h.in b/vendor/git.apache.org/thrift.git/build/cmake/config.h.in
deleted file mode 100644
index 181ea18..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/config.h.in
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* config.h generated by CMake from config.h.in */
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-
-/* Name of package */
-#cmakedefine PACKAGE "${PACKAGE}"
-
-/* Define to the address where bug reports for this package should be sent. */
-#cmakedefine PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}"
-
-/* Define to the full name of this package. */
-#cmakedefine PACKAGE_NAME "${PACKAGE_NAME}"
-
-/* Define to the one symbol short name of this package. */
-#cmakedefine PACKAGE_TARNAME "${PACKAGE_TARNAME}"
-
-/* Define to the home page for this package. */
-#cmakedefine PACKAGE_URL "${PACKAGE_URL}"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "${PACKAGE_VERSION}"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "${PACKAGE_STRING}"
-
-/* Version number of package */
-#define VERSION "${VERSION}"
-
-/************************** DEFINES *************************/
-
-/* Define if the AI_ADDRCONFIG symbol is unavailable */
-#cmakedefine AI_ADDRCONFIG 0
-
-/* Possible value for SIGNED_RIGHT_SHIFT_IS */
-/* TODO: This is just set to 1 for the moment
-   port the macro aclocal/ax_signed_right_shift.m4 to CMake to make this work */
-#define ARITHMETIC_RIGHT_SHIFT 1
-
-/* Indicates the effect of the right shift operator on negative signed
-   integers */
-/* TODO: This is just set to 1 for the moment */
-#define SIGNED_RIGHT_SHIFT_IS 1
-
-/* Use *.h extension for parser header file */
-/* TODO: This might now be necessary anymore as it is set only for automake < 1.11
-   see: aclocal/ac_prog_bison.m4 */
-#cmakedefine BISON_USE_PARSER_H_EXTENSION 1
-
-/* replaces POSIX pthread by boost::thread */
-#cmakedefine USE_BOOST_THREAD 1
-
-/* replaces POSIX pthread by std::thread */
-#cmakedefine USE_STD_THREAD 1
-
-/* Define to 1 if strerror_r returns char *. */
-#cmakedefine STRERROR_R_CHAR_P 1
-
-
-/************************** HEADER FILES *************************/
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#cmakedefine HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#cmakedefine HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#cmakedefine HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#cmakedefine HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#cmakedefine HAVE_PTHREAD_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#cmakedefine HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#cmakedefine HAVE_SYS_RESOURCE_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/un.h> header file. */
-#cmakedefine HAVE_SYS_UN_H 1
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#cmakedefine HAVE_SYS_POLL_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#cmakedefine HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sched.h> header file. */
-#cmakedefine HAVE_SCHED_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/*************************** FUNCTIONS ***************************/
-
-/* Define to 1 if you have the `gethostbyname' function. */
-#cmakedefine HAVE_GETHOSTBYNAME 1
-
-/* Define to 1 if you have the `gethostbyname_r' function. */
-#cmakedefine HAVE_GETHOSTBYNAME_R 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-#cmakedefine HAVE_STRERROR_R 1
-
-/* Define to 1 if you have the `sched_get_priority_max' function. */
-#cmakedefine HAVE_SCHED_GET_PRIORITY_MAX 1
-
-/* Define to 1 if you have the `sched_get_priority_min' function. */
-#cmakedefine HAVE_SCHED_GET_PRIORITY_MIN 1
-
-
-/* Define to 1 if strerror_r returns char *. */
-#cmakedefine STRERROR_R_CHAR_P 1
-
-#endif
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/build/cmake/mingw32-toolchain.cmake b/vendor/git.apache.org/thrift.git/build/cmake/mingw32-toolchain.cmake
deleted file mode 100644
index 864c0eb..0000000
--- a/vendor/git.apache.org/thrift.git/build/cmake/mingw32-toolchain.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-# CMake mingw32 cross compile toolchain file
-
-# the name of the target operating system
-SET(CMAKE_SYSTEM_NAME Windows)
-
-# which compilers to use for C and C++
-SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc)
-SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++)
-SET(CMAKE_RC_COMPILER i586-mingw32msvc-windres)
-
-# here is the target environment located
-SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc)
-
-# adjust the default behaviour of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search
-# programs in the host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(BUILD_SHARED_LIBS OFF)
-SET(CMAKE_EXE_LINKER_FLAGS "-static")
-set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-static-libgcc")
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-static-libstdc++")
diff --git a/vendor/git.apache.org/thrift.git/build/docker/README.md b/vendor/git.apache.org/thrift.git/build/docker/README.md
deleted file mode 100644
index 85cb3b2..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Apache Thrift Docker containers
-A set of docker containers used to build and test Apache Thrift
-
-### Available Containers
-
-* Ubuntu - based on ubuntu:trusty (14.04)
-* Centos - based on centos:6.6
-
-## Dependencies
-
-* A working Docker environment. A Vagrantfile is provided which will setup an Ubuntu host and working Docker environment as well as build the Apache Thrift Docker container for testing and development
-
-## Usage
-From the Apache Thrift code base root
-
-* Build
-
-	docker build -t thrift build/docker/ubuntu
-
-	or
-
-	docker build -t thrift build/docker/centos
-
-* Run
-
-	docker run -v $(pwd):/thrift/src -it thrift /bin/bash
-
diff --git a/vendor/git.apache.org/thrift.git/build/docker/Vagrantfile b/vendor/git.apache.org/thrift.git/build/docker/Vagrantfile
deleted file mode 100644
index 5eac6e6..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/Vagrantfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Base system bootstrap script
-$bootstrap_script = <<__BOOTSTRAP__
-echo "Provisioning defaults"
-
-sudo apt-get update -y
-sudo apt-get upgrade -y
-
-# Install default packages
-sudo apt-get install -y build-essential curl git
-
-# Install latest Docker version
-sudo curl -sSL https://get.docker.io/gpg | sudo apt-key add -
-sudo echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
-sudo apt-get update -y
-sudo apt-get install -y linux-image-extra-`uname -r` aufs-tools
-sudo apt-get install -y lxc-docker
-
-echo "Finished provisioning defaults"
-__BOOTSTRAP__
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "trusty64"
-  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
-  config.ssh.forward_agent = true
-
-  config.vm.provider :virtualbox do |vbox|
-    vbox.customize ["modifyvm", :id, "--memory", "1024"]
-    vbox.customize ["modifyvm", :id, "--cpus", "2"]
-  end
-
-  # Setup the default bootstrap script for our ubuntu base box image
-  config.vm.provision "shell", inline: $bootstrap_script
-
-  # Setup the custom docker image from our Ubuntu Dockerfile
-  config.vm.provision "docker" do |d|
-    d.build_image "/vagrant/ubuntu", args: "-t thrift"
-  end
-
-  # Setup the custom docker image from our Centos Dockerfile
-  #config.vm.provision "docker" do |d|
-  #  d.build_image "/vagrant/centos", args: "-t thrift-centos"
-  #end
-
-end
diff --git a/vendor/git.apache.org/thrift.git/build/docker/centos/Dockerfile b/vendor/git.apache.org/thrift.git/build/docker/centos/Dockerfile
deleted file mode 100644
index 59bbfd6..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/centos/Dockerfile
+++ /dev/null
@@ -1,142 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Apache Thrift Docker build environment for Centos
-#
-# Known missing client libraries:
-#  - D
-#  - Haxe
-#  - Lua
-#
-
-FROM centos:7
-MAINTAINER Apache Thrift <dev@thrift.apache.org>
-
-RUN yum install -y epel-release
-
-# General dependencies
-RUN yum install -y \
-      tar \
-      m4 \
-      perl \
-      clang \
-      gcc \
-      gcc-c++ \
-      git \
-      libtool \
-      autoconf \
-      make \
-      bison \
-      bison-devel \
-      flex
-
-# C++ dependencies
-RUN yum install -y \
-      boost-devel-static \
-      zlib-devel \
-      openssl-devel \
-      libevent-devel
-
-# Java Dependencies
-RUN yum install -y \
-      ant \
-      junit \
-      ant-junit \
-      java-1.7.0-openjdk-devel
-
-# Python Dependencies
-RUN yum install -y \
-      python-devel \
-      python-pip \
-      python-setuptools \
-      python-six \
-      python-twisted-web && \
-    pip install -U backports.ssl_match_hostname ipaddress tornado
-
-# Ruby Dependencies
-RUN yum install -y \
-      ruby \
-      ruby-devel \
-      rubygems && \
-    gem install bundler rake
-
-# Perl Dependencies
-RUN yum install -y \
-      perl-Bit-Vector \
-      perl-Class-Accessor \
-      perl-ExtUtils-MakeMaker \
-      perl-Test-Simple \
-      perl-IO-Socket-SSL \
-      perl-Net-SSLeay \
-      perl-Crypt-SSLeay
-
-# PHP Dependencies
-RUN yum install -y \
-      php \
-      php-devel \
-      php-pear \
-      re2c \
-      php-phpunit-PHPUnit \
-      bzip2
-
-# GLibC Dependencies
-RUN yum install -y glib2-devel
-
-# Erlang Dependencies
-RUN curl -sSL http://packages.erlang-solutions.com/rpm/centos/erlang_solutions.repo -o /etc/yum.repos.d/erlang_solutions.repo && \
-    yum install -y \
-      erlang-kernel \
-      erlang-erts \
-      erlang-stdlib \
-      erlang-eunit \
-      erlang-rebar \
-      erlang-tools
-
-# Go Dependencies
-RUN curl -sSL https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz | tar -C /usr/local/ -xz
-ENV PATH /usr/local/go/bin:$PATH
-
-# Haskell Dependencies
-RUN yum -y install haskell-platform
-
-# Node.js Dependencies
-RUN yum install -y \
-      nodejs \
-      nodejs-devel \
-      npm
-
-# C# Dependencies
-RUN yum install -y \
-      mono-core \
-      mono-devel \
-      mono-web-devel \
-      mono-extras \
-
-# MinGW Dependencies
-RUN yum install -y \
-      mingw32-binutils \
-      mingw32-crt \
-      mingw32-nsis
-
-# CMake
-RUN curl -sSL https://cmake.org/files/v3.4/cmake-3.4.0.tar.gz | tar -xz && \
-    cd cmake-3.4.0 && ./bootstrap && make -j4 && make install && \
-    cd .. && rm -rf cmake-3.4.0
-
-# Clean up
-RUN rm -rf /tmp/* && \
-    yum clean all
-
-ENV THRIFT_ROOT /thrift
-RUN mkdir -p $THRIFT_ROOT/src
-COPY Dockerfile $THRIFT_ROOT/
-WORKDIR $THRIFT_ROOT/src
diff --git a/vendor/git.apache.org/thrift.git/build/docker/centos6/Dockerfile b/vendor/git.apache.org/thrift.git/build/docker/centos6/Dockerfile
deleted file mode 100644
index aa19731..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/centos6/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Apache Thrift Docker build environment for Centos 6
-#
-# This file is intended for testing old packages that are not available for
-# latest Ubuntu LTS/Debian/CentOS. Currently, it is only used for Python 2.6.
-#
-
-FROM centos:6
-MAINTAINER Apache Thrift <dev@thrift.apache.org>
-
-RUN yum install -y epel-release && \
-    yum install -y \
-      autoconf \
-      bison \
-      bison-devel \
-      clang \
-      flex \
-      gcc \
-      gcc-c++ \
-      git \
-      libtool \
-      m4 \
-      make \
-      perl \
-      tar \
-      python-devel \
-      python-setuptools \
-      python-twisted-web \
-      python-pip \
-    && yum clean all
-
-# optional dependencies
-RUN pip install ipaddress backports.ssl_match_hostname tornado
-
-# CMake
-RUN curl -sSL https://cmake.org/files/v3.4/cmake-3.4.1.tar.gz | tar -xz && \
-    cd cmake-3.4.1 && ./bootstrap && make -j4 && make install && \
-    cd .. && rm -rf cmake-3.4.1
-
-ENV THRIFT_ROOT /thrift
-RUN mkdir -p $THRIFT_ROOT/src
-COPY Dockerfile $THRIFT_ROOT/
-WORKDIR $THRIFT_ROOT/src
diff --git a/vendor/git.apache.org/thrift.git/build/docker/check_unmodified.sh b/vendor/git.apache.org/thrift.git/build/docker/check_unmodified.sh
deleted file mode 100755
index 9d5fa26..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/check_unmodified.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Download prebuilt docker image and compare Dockerfile hash values
-
-set -ex
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-DISTRO=$1
-SRC_IMG=thrift/thrift-build:$DISTRO
-
-function try_pull {
-  docker pull $SRC_IMG
-  cd ${SCRIPT_DIR}/$DISTRO
-  docker run $SRC_IMG bash -c 'cd .. && sha512sum Dockerfile' > .Dockerfile.sha512
-  sha512sum -c .Dockerfile.sha512
-}
-
-if try_pull; then
-  echo Dockerfile seems identical. No need to rebuild from scratch.
-  docker tag thrift/thrift-build:$DISTRO thrift-build:$DISTRO
-else
-  echo Either Dockerfile has changed or pull failure. Need to build brand new one.
-  exit 1
-fi
diff --git a/vendor/git.apache.org/thrift.git/build/docker/debian/Dockerfile b/vendor/git.apache.org/thrift.git/build/docker/debian/Dockerfile
deleted file mode 100644
index 29b7804..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/debian/Dockerfile
+++ /dev/null
@@ -1,192 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Apache Thrift Docker build environment for Centos
-#
-# Known missing client libraries:
-#  - None
-
-FROM buildpack-deps:jessie-scm
-MAINTAINER Apache Thrift <dev@thrift.apache.org>
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Add apt sources
-# Dart
-RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
-    curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list && \
-    sed -i /etc/apt/sources.list.d/dart_stable.list -e 's/https:/http:/g'
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# General dependencies` \
-      bison \
-      build-essential \
-      clang \
-      cmake \
-      debhelper \
-      flex \
-      pkg-config
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# C++ dependencies` \
-      libboost-dev \
-      libboost-filesystem-dev \
-      libboost-program-options-dev \
-      libboost-system-dev \
-      libboost-test-dev \
-      libboost-thread-dev \
-      libevent-dev \
-      libssl-dev \
-      qt5-default \
-      qtbase5-dev \
-      qtbase5-dev-tools
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Java dependencies` \
-      ant \
-      ant-optional \
-      openjdk-7-jdk \
-      maven
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Python dependencies` \
-      python-all \
-      python-all-dbg \
-      python-all-dev \
-      python-pip \
-      python-setuptools \
-      python-twisted \
-      python-zope.interface \
-      python3-all \
-      python3-all-dbg \
-      python3-all-dev \
-      python3-setuptools \
-      python3-pip
-
-RUN echo 'deb http://deb.debian.org/debian jessie-backports main' >> /etc/apt/sources.list \
-      && apt-get update && apt-get install -y --no-install-recommends \
-`# Ruby dependencies` \
-      ruby \
-      ruby-bundler \
-      ruby-dev \
-`# Perl dependencies` \
-      libbit-vector-perl \
-      libclass-accessor-class-perl \
-      libcrypt-ssleay-perl \
-      libio-socket-ssl-perl \
-      libnet-ssleay-perl
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Php dependencies` \
-      php5 \
-      php5-dev \
-      php5-cli \
-      php-pear \
-      re2c \
-      phpunit \
-`# GlibC dependencies` \
-      libglib2.0-dev
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Erlang dependencies` \
-      erlang-base \
-      erlang-eunit \
-      erlang-dev \
-      erlang-tools \
-      rebar
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Haskell dependencies` \
-      ghc \
-      cabal-install \
-`# Haxe dependencies` \
-      neko \
-      neko-dev \
-      libneko0
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Node.js dependencies` \
-      nodejs \
-      nodejs-dev \
-      nodejs-legacy \
-      npm
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# CSharp dependencies` \
-      libmono-system-web2.0-cil \
-      mono-devel
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# D dependencies` \
-      xdg-utils \
-`# Dart dependencies` \
-      dart \
-`# Lua dependencies` \
-      lua5.2 \
-      lua5.2-dev \
-`# MinGW dependencies` \
-      mingw32 \
-      mingw32-binutils \
-`#      mingw32-runtime` \
-      nsis \
-`# Clean up` \
-    && rm -rf /var/cache/apt/* && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /tmp/* && \
-    rm -rf /var/tmp/*
-
-# Ruby
-RUN gem install bundler --no-ri --no-rdoc
-
-# Python optional dependencies
-RUN pip2 install -U ipaddress backports.ssl_match_hostname tornado
-RUN pip3 install -U backports.ssl_match_hostname tornado
-
-# Go
-RUN curl -sSL https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz | tar -C /usr/local/ -xz
-ENV PATH /usr/local/go/bin:$PATH
-
-# Haxe
-RUN mkdir -p /usr/lib/haxe && \
-    curl http://haxe.org/website-content/downloads/3.2.0/downloads/haxe-3.2.0-linux64.tar.gz | \
-    tar -C /usr/lib/haxe --strip-components=1 -xz && \
-    ln -s /usr/lib/haxe/haxe /usr/bin/haxe && \
-    ln -s /usr/lib/haxe/haxelib /usr/bin/haxelib && \
-    mkdir -p /usr/lib/haxe/lib  && \
-    chmod -R 777 /usr/lib/haxe/lib && \
-    haxelib setup /usr/lib/haxe/lib && \
-    haxelib install hxcpp
-
-# D
-RUN curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
-    dpkg -i /tmp/dmd_2.070.0-0_amd64.deb && \
-    rm /tmp/dmd_2.070.0-0_amd64.deb && \
-    curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
-    curl -sSL https://github.com/D-Programming-Deimos/libevent/archive/master.tar.gz| tar xz && \
-    mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
-    mv libevent-master/deimos/* openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
-    mv libevent-master/C/* openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
-    rm -rf libevent-master openssl-master && \
-    echo 'gcc -Wl,--no-as-needed $*' > /usr/local/bin/gcc-dmd && \
-    chmod 755 /usr/local/bin/gcc-dmd && \
-    echo 'CC=/usr/local/bin/gcc-dmd' >> /etc/dmd.conf
-
-# Dart
-ENV PATH /usr/lib/dart/bin:$PATH
-
-# Force utf8 locale to successfully build Haskell tf-random
-ENV LC_ALL C.UTF-8
-
-ENV THRIFT_ROOT /thrift
-RUN mkdir -p $THRIFT_ROOT/src
-COPY Dockerfile $THRIFT_ROOT/
-WORKDIR $THRIFT_ROOT/src
diff --git a/vendor/git.apache.org/thrift.git/build/docker/scripts/autotools.sh b/vendor/git.apache.org/thrift.git/build/docker/scripts/autotools.sh
deleted file mode 100755
index 8388f72..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/scripts/autotools.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -ev
-
-./bootstrap.sh
-./configure $*
-make check -j3
diff --git a/vendor/git.apache.org/thrift.git/build/docker/scripts/cmake.sh b/vendor/git.apache.org/thrift.git/build/docker/scripts/cmake.sh
deleted file mode 100755
index 6508e71..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/scripts/cmake.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -ev
-
-CMAKE_FLAGS=$*
-MAKEPROG=make
-
-if ninja --version  >/dev/null 2>&1; then
-  MAKEPROG=ninja
-  CMAKE_FLAGS="-GNinja $CMAKE_FLAGS"
-fi
-
-mkdir -p cmake_build && cd cmake_build
-cmake $CMAKE_FLAGS ..
-for LIB in $BUILD_LIBS; do
-  if ! grep "^BUILD_${LIB}:BOOL=ON$" CMakeCache.txt ; then
-    echo "failed to configure $LIB"
-    exit 1
-  fi
-done
-$MAKEPROG -j3
-cpack
-ctest -VV 
-# was: -E "(concurrency_test|processor_test)"
diff --git a/vendor/git.apache.org/thrift.git/build/docker/scripts/cross-test.sh b/vendor/git.apache.org/thrift.git/build/docker/scripts/cross-test.sh
deleted file mode 100755
index 43581a5..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/scripts/cross-test.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -ev
-
-./bootstrap.sh
-./configure --enable-tutorial=no
-make -j3 precross
-
-set +e
-make cross$1
-
-RET=$?
-if [ $RET -ne 0 ]; then
-  cat test/log/unexpected_failures.log
-fi
-
-exit $RET
diff --git a/vendor/git.apache.org/thrift.git/build/docker/scripts/dpkg.sh b/vendor/git.apache.org/thrift.git/build/docker/scripts/dpkg.sh
deleted file mode 100755
index 3ba0cd4..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/scripts/dpkg.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -ev
-
-dpkg-buildpackage -tc -us -uc
-ls -al ..
diff --git a/vendor/git.apache.org/thrift.git/build/docker/scripts/make-dist.sh b/vendor/git.apache.org/thrift.git/build/docker/scripts/make-dist.sh
deleted file mode 100755
index 5a3681e..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/scripts/make-dist.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -ev
-
-./bootstrap.sh
-./configure $*
-make dist
-tar xvf thrift-*.tar.gz
-cd thrift-*
-./build/docker/scripts/cmake.sh
diff --git a/vendor/git.apache.org/thrift.git/build/docker/ubuntu/Dockerfile b/vendor/git.apache.org/thrift.git/build/docker/ubuntu/Dockerfile
deleted file mode 100644
index 7d245e8..0000000
--- a/vendor/git.apache.org/thrift.git/build/docker/ubuntu/Dockerfile
+++ /dev/null
@@ -1,209 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Apache Thrift Docker build environment for Centos
-#
-# Known missing client libraries:
-#  - None
-
-FROM buildpack-deps:trusty-scm
-MAINTAINER Apache Thrift <dev@thrift.apache.org>
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Add apt sources
-# Erlang
-RUN echo 'deb http://packages.erlang-solutions.com/debian trusty contrib' > /etc/apt/sources.list.d/erlang_solutions.list && \
-    curl -sSL https://packages.erlang-solutions.com/debian/erlang_solutions.asc | apt-key add -
-# Dart
-RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
-    curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list && \
-    sed -i /etc/apt/sources.list.d/dart_stable.list -e 's/https:/http:/g'
-
-# Consider using mirror nearby when building locally
-# TODO: Provide option via --build-arg=...
-# RUN sed -i /etc/apt/sources.list -e 's!http://archive.ubuntu.com/ubuntu/!http://your/mirror/!g'
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# General dependencies` \
-      bison \
-      build-essential \
-      clang \
-      cmake \
-      debhelper \
-      flex \
-      ninja-build \
-      pkg-config \
-`# Included in buildpack-deps` \
-`#      autoconf` \
-`#      automake` \
-`#      g++` \
-`#      git` \
-`#      libtool` \
-`#      make`
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# C++ dependencies` \
-`# libevent and OpenSSL are needed by D too` \
-      libboost-dev \
-      libboost-filesystem-dev \
-      libboost-program-options-dev \
-      libboost-system-dev \
-      libboost-test-dev \
-      libboost-thread-dev \
-      libevent-dev \
-      libssl-dev \
-      qt5-default \
-      qtbase5-dev \
-      qtbase5-dev-tools
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Java dependencies` \
-      ant \
-      ant-optional \
-      openjdk-7-jdk \
-      maven
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Python dependencies` \
-`# TODO:` \
-`# Install twisted and zope.interface via pip. we need twisted at ./configure time, otherwise` \
-`# py.twisted tests are skipped.` \
-      python-all \
-      python-all-dbg \
-      python-all-dev \
-      python-pip \
-      python-setuptools \
-      python-twisted \
-      python-zope.interface \
-      python3-all \
-      python3-all-dbg \
-      python3-all-dev \
-      python3-setuptools \
-      python3-pip
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Ruby dependencies` \
-      ruby \
-      ruby-bundler \
-      ruby-dev \
-`# Perl dependencies` \
-      libbit-vector-perl \
-      libclass-accessor-class-perl \
-      libcrypt-ssleay-perl \
-      libio-socket-ssl-perl \
-      libnet-ssleay-perl
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Php dependencies` \
-      php5 \
-      php5-dev \
-      php5-cli \
-      php-pear \
-      re2c \
-      phpunit \
-`# GlibC dependencies` \
-      libglib2.0-dev
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Erlang dependencies` \
-      erlang-base \
-      erlang-eunit \
-      erlang-dev \
-      erlang-tools \
-      rebar
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Haskell dependencies` \
-      ghc \
-      cabal-install \
-`# Haxe dependencies` \
-      neko \
-      neko-dev \
-      libneko0
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# Node.js dependencies` \
-      nodejs \
-      nodejs-dev \
-      nodejs-legacy
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# CSharp dependencies` \
-      libmono-system-web2.0-cil \
-      mono-devel
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-`# D dependencies` \
-      xdg-utils \
-`# Dart dependencies` \
-      dart \
-`# Lua dependencies` \
-      lua5.2 \
-      lua5.2-dev \
-`# MinGW dependencies` \
-      mingw32 \
-      mingw32-binutils \
-      mingw32-runtime \
-      nsis \
-`# Clean up` \
-    && rm -rf /var/cache/apt/* && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /tmp/* && \
-    rm -rf /var/tmp/*
-
-# Ruby
-RUN gem install bundler --no-ri --no-rdoc
-
-# Python optional dependencies
-RUN pip2 install -U ipaddress backports.ssl_match_hostname tornado
-RUN pip3 install -U backports.ssl_match_hostname tornado
-
-# Go
-RUN curl -sSL https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz | tar -C /usr/local/ -xz
-ENV PATH /usr/local/go/bin:$PATH
-
-# Haxe
-RUN mkdir -p /usr/lib/haxe && \
-    curl http://haxe.org/website-content/downloads/3.2.0/downloads/haxe-3.2.0-linux64.tar.gz | \
-    tar -C /usr/lib/haxe --strip-components=1 -xz && \
-    ln -s /usr/lib/haxe/haxe /usr/bin/haxe && \
-    ln -s /usr/lib/haxe/haxelib /usr/bin/haxelib && \
-    mkdir -p /usr/lib/haxe/lib  && \
-    chmod -R 777 /usr/lib/haxe/lib && \
-    haxelib setup /usr/lib/haxe/lib && \
-    haxelib install hxcpp
-
-# Node.js
-RUN curl -sSL https://www.npmjs.com/install.sh | sh
-
-# D
-RUN curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
-    dpkg -i /tmp/dmd_2.070.0-0_amd64.deb && \
-    rm /tmp/dmd_2.070.0-0_amd64.deb && \
-    curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
-    curl -sSL https://github.com/D-Programming-Deimos/libevent/archive/master.tar.gz| tar xz && \
-    mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
-    mv libevent-master/deimos/* openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
-    mv libevent-master/C/* openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
-    rm -rf libevent-master openssl-master && \
-    echo 'gcc -Wl,--no-as-needed $*' > /usr/local/bin/gcc-dmd && \
-    chmod 755 /usr/local/bin/gcc-dmd && \
-    echo 'CC=/usr/local/bin/gcc-dmd' >> /etc/dmd.conf
-
-# Dart
-ENV PATH /usr/lib/dart/bin:$PATH
-
-ENV THRIFT_ROOT /thrift
-RUN mkdir -p $THRIFT_ROOT/src
-COPY Dockerfile $THRIFT_ROOT/
-WORKDIR $THRIFT_ROOT/src
diff --git a/vendor/git.apache.org/thrift.git/build/travis/installCXXDependencies.sh b/vendor/git.apache.org/thrift.git/build/travis/installCXXDependencies.sh
deleted file mode 100755
index ac3edf3..0000000
--- a/vendor/git.apache.org/thrift.git/build/travis/installCXXDependencies.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-# Mainly aiming Travis CI's Ubuntu machines for now
-# see what we need: http://thrift.apache.org/docs/install/ubuntu
-
-# General dependencies
-sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu/ trusty main restricted" -y
-sudo apt-get update -qq
-
-sudo apt-get install -qq libpango-1.0-0 libqt4-dev qtbase5-dev qtbase5-dev-tools qt5-default libboost-dev libboost-test-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make cmake git debhelper bc nsis ninja-build
-dpkg -S /usr/include/boost/version.hpp
diff --git a/vendor/git.apache.org/thrift.git/build/travis/installDependencies.sh b/vendor/git.apache.org/thrift.git/build/travis/installDependencies.sh
deleted file mode 100755
index eab8c6b..0000000
--- a/vendor/git.apache.org/thrift.git/build/travis/installDependencies.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-SCRIPTPATH=$( cd $(dirname $0) ; pwd -P )
-
-# Mainly aiming Travis CI's Ubuntu machines for now
-# see what we need: http://thrift.apache.org/docs/install/ubuntu
-
-# Java dependencies
-sudo apt-get install -qq ant openjdk-7-jdk
-sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
-
-# Python dependencies
-sudo apt-get install -qq python-all python-all-dev python-all-dbg python-setuptools python-support python-twisted python-six python3-six
-
-# Ruby dependencies
-sudo apt-get install -qq ruby ruby-dev
-sudo gem install bundler rake
-
-# Perl dependencies
-sudo apt-get install -qq libbit-vector-perl libclass-accessor-class-perl libio-socket-ssl-perl libnet-ssleay-perl libcrypt-ssleay-perl
-
-# Php dependencies
-sudo apt-get install -qq php5 php5-dev php5-cli php-pear re2c
-
-# GlibC dependencies
-sudo apt-get install -qq libglib2.0-dev
-
-# Erlang dependencies
-sudo apt-get install -qq erlang-base erlang-eunit erlang-dev erlang-tools rebar
-
-# GO dependencies
-echo "golang-go golang-go/dashboard boolean false" | debconf-set-selections
-sudo apt-get -y install -qq golang golang-go
-
-# Haskell dependencies
-sudo add-apt-repository -y ppa:hvr/ghc
-sudo apt-get update
-sudo apt-get install cabal-install-1.20 ghc-$GHCVER
-
-# Lua dependencies
-sudo apt-get install -qq lua5.2 lua5.2-dev
-
-# Node.js dependencies
-sudo apt-get install -qq nodejs nodejs-dev npm
-sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10
-
-# CSharp
-sudo apt-get install -qq mono-gmcs mono-devel libmono-system-web2.0-cil
-sudo apt-get install -qq mingw32 mingw32-binutils mingw32-runtime nsis
diff --git a/vendor/git.apache.org/thrift.git/cleanup.sh b/vendor/git.apache.org/thrift.git/cleanup.sh
deleted file mode 100755
index f110721..0000000
--- a/vendor/git.apache.org/thrift.git/cleanup.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-topsrcdir="`dirname $0`"
-cd "$topsrcdir"
-
-make -k clean >/dev/null 2>&1
-make -k distclean >/dev/null 2>&1
-find . -name Makefile.in -exec rm -f {} \;
-rm -rf \
-AUTHORS \
-ChangeLog \
-INSTALL \
-Makefile \
-Makefile.in \
-Makefile.orig \
-aclocal/libtool.m4 \
-aclocal/ltoptions.m4 \
-aclocal/ltsugar.m4 \
-aclocal/ltversion.m4 \
-aclocal/lt~obsolete.m4 \
-aclocal.m4 \
-autom4te.cache \
-autoscan.log \
-config.guess \
-config.h \
-config.hin \
-config.hin~ \
-config.log \
-config.status \
-config.status.lineno \
-config.sub \
-configure \
-configure.lineno \
-configure.scan \
-depcomp \
-.deps \
-install-sh \
-.libs \
-libtool \
-ltmain.sh \
-missing \
-ylwrap \
-if/gen-* \
-test/gen-* \
-lib/php/src/ext/thrift_protocol/.deps \
-lib/php/src/ext/thrift_protocol/Makefile \
-lib/php/src/ext/thrift_protocol/Makefile.fragments \
-lib/php/src/ext/thrift_protocol/Makefile.global \
-lib/php/src/ext/thrift_protocol/Makefile.objects \
-lib/php/src/ext/thrift_protocol/acinclude.m4 \
-lib/php/src/ext/thrift_protocol/aclocal.m4 \
-lib/php/src/ext/thrift_protocol/autom4te.cache \
-lib/php/src/ext/thrift_protocol/build \
-lib/php/src/ext/thrift_protocol/config.guess \
-lib/php/src/ext/thrift_protocol/config.h \
-lib/php/src/ext/thrift_protocol/config.h.in \
-lib/php/src/ext/thrift_protocol/config.log \
-lib/php/src/ext/thrift_protocol/config.nice \
-lib/php/src/ext/thrift_protocol/config.status \
-lib/php/src/ext/thrift_protocol/config.sub \
-lib/php/src/ext/thrift_protocol/configure \
-lib/php/src/ext/thrift_protocol/configure.in \
-lib/php/src/ext/thrift_protocol/include \
-lib/php/src/ext/thrift_protocol/install-sh \
-lib/php/src/ext/thrift_protocol/libtool \
-lib/php/src/ext/thrift_protocol/ltmain.sh \
-lib/php/src/ext/thrift_protocol/missing \
-lib/php/src/ext/thrift_protocol/mkinstalldirs \
-lib/php/src/ext/thrift_protocol/modules \
-lib/php/src/ext/thrift_protocol/run-tests.php
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/CMakeLists.txt b/vendor/git.apache.org/thrift.git/compiler/cpp/CMakeLists.txt
deleted file mode 100644
index 02ed78c..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/CMakeLists.txt
+++ /dev/null
@@ -1,206 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/thrift/version.h)
-
-find_package(FLEX REQUIRED)
-find_package(BISON REQUIRED)
-
-# Create flex and bison files and build the lib parse static library
-BISON_TARGET(thrifty ${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/thrifty.yy ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc)
-FLEX_TARGET(thriftl ${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/thriftl.ll ${CMAKE_CURRENT_BINARY_DIR}/thrift/thriftl.cc)
-ADD_FLEX_BISON_DEPENDENCY(thriftl thrifty)
-
-# HACK: Work around the fact that bison crates a .hh file but we need a .h file
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.h
-                   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.hh ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.h
-                   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.hh
-                   )
-
-set(libparse_SOURCES
-    ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc
-    ${CMAKE_CURRENT_BINARY_DIR}/thrift/thriftl.cc
-    ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.h
-)
-
-add_library(libparse STATIC ${libparse_SOURCES})
-
-# Create the thrift compiler
-set(compiler_core
-    src/thrift/common.cc
-    src/thrift/generate/t_generator.cc
-    src/thrift/parse/t_typedef.cc
-    src/thrift/parse/parse.cc
-    ${CMAKE_CURRENT_BINARY_DIR}/thrift/version.h
-)
-
-set(thrift-compiler_SOURCES
-    src/thrift/main.cc
-    src/thrift/audit/t_audit.cpp
-)
-
-# This macro adds an option THRIFT_COMPILER_${NAME}
-# that allows enabling or disabling certain languages
-macro(THRIFT_ADD_COMPILER name description initial)
-    string(TOUPPER "THRIFT_COMPILER_${name}" enabler)
-    set(src "src/thrift/generate/t_${name}_generator.cc")
-    option(${enabler} ${description} ${initial})
-    if(${enabler})
-        list(APPEND thrift-compiler_SOURCES ${src})
-    endif()
-endmacro()
-
-# The following compiler can be enabled or disabled
-THRIFT_ADD_COMPILER(c_glib  "Enable compiler for C with Glib" ON)
-THRIFT_ADD_COMPILER(cpp     "Enable compiler for C++" ON)
-THRIFT_ADD_COMPILER(java    "Enable compiler for Java"   ON)
-THRIFT_ADD_COMPILER(as3     "Enable compiler for ActionScript 3" ON)
-THRIFT_ADD_COMPILER(dart    "Enable compiler for Dart" ON)
-THRIFT_ADD_COMPILER(haxe    "Enable compiler for Haxe" ON)
-THRIFT_ADD_COMPILER(csharp  "Enable compiler for C#" ON)
-THRIFT_ADD_COMPILER(py      "Enable compiler for Python 2.0" ON)
-THRIFT_ADD_COMPILER(rb      "Enable compiler for Ruby" ON)
-THRIFT_ADD_COMPILER(perl    "Enable compiler for Perl" ON)
-THRIFT_ADD_COMPILER(php     "Enable compiler for PHP" ON)
-THRIFT_ADD_COMPILER(erl     "Enable compiler for Erlang" ON)
-THRIFT_ADD_COMPILER(cocoa   "Enable compiler for Cocoa Objective-C" ON)
-THRIFT_ADD_COMPILER(swift   "Enable compiler for Cocoa Swift" ON)
-THRIFT_ADD_COMPILER(st      "Enable compiler for Smalltalk" ON)
-THRIFT_ADD_COMPILER(ocaml   "Enable compiler for OCaml" ON)
-THRIFT_ADD_COMPILER(hs      "Enable compiler for Haskell" ON)
-THRIFT_ADD_COMPILER(xsd     "Enable compiler for XSD" ON)
-THRIFT_ADD_COMPILER(html    "Enable compiler for HTML Documentation" ON)
-THRIFT_ADD_COMPILER(js      "Enable compiler for JavaScript" ON)
-THRIFT_ADD_COMPILER(json    "Enable compiler for JSON" ON)
-THRIFT_ADD_COMPILER(javame  "Enable compiler for Java ME" ON)
-THRIFT_ADD_COMPILER(delphi  "Enable compiler for Delphi" ON)
-THRIFT_ADD_COMPILER(go      "Enable compiler for Go" ON)
-THRIFT_ADD_COMPILER(d       "Enable compiler for D" ON)
-THRIFT_ADD_COMPILER(lua     "Enable compiler for Lua" ON)
-THRIFT_ADD_COMPILER(gv      "Enable compiler for GraphViz" ON)
-THRIFT_ADD_COMPILER(xml     "Enable compiler for XML" ON)
-
-# Thrift is looking for include files in the src directory
-# we also add the current binary directory for generated files
-include_directories(${CMAKE_CURRENT_BINARY_DIR} src)
-
-if(NOT ${WITH_PLUGIN})
-    list(APPEND thrift-compiler_SOURCES ${compiler_core})
-endif()
-add_executable(thrift-compiler ${thrift-compiler_SOURCES})
-
-if(${WITH_PLUGIN})
-    add_executable(thrift-bootstrap ${compiler_core}
-        src/thrift/main.cc
-        src/thrift/audit/t_audit.cpp
-        src/thrift/generate/t_cpp_generator.cc
-    )
-    target_link_libraries(thrift-bootstrap libparse)
-
-    set(PLUGIN_GEN_SOURCES
-        ${CMAKE_CURRENT_BINARY_DIR}/thrift/plugin/plugin_types.h
-        ${CMAKE_CURRENT_BINARY_DIR}/thrift/plugin/plugin_types.cpp
-        ${CMAKE_CURRENT_BINARY_DIR}/thrift/plugin/plugin_constants.h
-        ${CMAKE_CURRENT_BINARY_DIR}/thrift/plugin/plugin_constants.cpp
-    )
-
-    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/thrift/plugin)
-    add_custom_command(OUTPUT ${PLUGIN_GEN_SOURCES}
-        DEPENDS thrift-bootstrap src/thrift/plugin/plugin.thrift
-        COMMAND thrift-bootstrap -gen cpp
-        -out ${CMAKE_CURRENT_BINARY_DIR}/thrift/plugin
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/plugin/plugin.thrift
-    )
-
-    include_directories(../../lib/cpp/src)
-
-    include(ThriftMacros)
-    ADD_LIBRARY_THRIFT(thriftc
-        ${compiler_core}
-        ${PLUGIN_GEN_SOURCES}
-        src/thrift/logging.cc
-        src/thrift/plugin/plugin_output.cc
-        src/thrift/plugin/plugin.cc
-    )
-    TARGET_INCLUDE_DIRECTORIES_THRIFT(thriftc PUBLIC ${Boost_INCLUDE_DIRS})
-    TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftc thrift PUBLIC)
-    target_compile_definitions(thrift-compiler PUBLIC THRIFT_ENABLE_PLUGIN)
-    LINK_AGAINST_THRIFT_LIBRARY(thrift-compiler thriftc)
-endif()
-
-set_target_properties(thrift-compiler PROPERTIES OUTPUT_NAME thrift)
-
-target_link_libraries(thrift-compiler libparse)
-
-install(TARGETS thrift-compiler DESTINATION "${BIN_INSTALL_DIR}")
-
-if(${WITH_PLUGIN})
-  # Install the headers
-  install(FILES
-      "src/thrift/common.h"
-      "src/thrift/globals.h"
-      "src/thrift/logging.h"
-      "src/thrift/main.h"
-      "src/thrift/platform.h"
-      "${CMAKE_BINARY_DIR}/compiler/cpp/thrift/version.h"
-      DESTINATION "${INCLUDE_INSTALL_DIR}/thrift")
-  install(FILES
-      "src/thrift/audit/t_audit.h"
-      DESTINATION "${INCLUDE_INSTALL_DIR}/thrift/audit")
-  install(FILES
-      "src/thrift/generate/t_generator.h"
-      "src/thrift/generate/t_generator_registry.h"
-      "src/thrift/generate/t_html_generator.h"
-      "src/thrift/generate/t_oop_generator.h"
-      DESTINATION "${INCLUDE_INSTALL_DIR}/thrift/generate")
-  install(FILES
-      "src/thrift/parse/t_base_type.h"
-      "src/thrift/parse/t_const.h"
-      "src/thrift/parse/t_const_value.h"
-      "src/thrift/parse/t_container.h"
-      "src/thrift/parse/t_doc.h"
-      "src/thrift/parse/t_enum.h"
-      "src/thrift/parse/t_enum_value.h"
-      "src/thrift/parse/t_field.h"
-      "src/thrift/parse/t_function.h"
-      "src/thrift/parse/t_list.h"
-      "src/thrift/parse/t_map.h"
-      "src/thrift/parse/t_program.h"
-      "src/thrift/parse/t_scope.h"
-      "src/thrift/parse/t_service.h"
-      "src/thrift/parse/t_set.h"
-      "src/thrift/parse/t_struct.h"
-      "src/thrift/parse/t_typedef.h"
-      "src/thrift/parse/t_type.h"
-      DESTINATION "${INCLUDE_INSTALL_DIR}/thrift/parse")
-  install(FILES
-      "src/thrift/plugin/plugin.h"
-      "src/thrift/plugin/plugin_output.h"
-      "src/thrift/plugin/type_util.h"
-      DESTINATION "${INCLUDE_INSTALL_DIR}/thrift/plugin")
-if(MSVC)
-  install(FILES
-      "src/thrift/windows/config.h"
-      DESTINATION "${INCLUDE_INSTALL_DIR}/thrift/windows")
-endif()
-endif()
-
-if(BUILD_TESTING)
-    add_subdirectory(test)
-endif()
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/Makefile.am b/vendor/git.apache.org/thrift.git/compiler/cpp/Makefile.am
deleted file mode 100644
index a239391..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/Makefile.am
+++ /dev/null
@@ -1,203 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-# Contains some contributions under the Thrift Software License.
-# Please see doc/old-thrift-license.txt in the Thrift distribution for
-# details.
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-# Note on why we have src/thrift and src/thrift/plugin directories:
-# Since Automake supports only one set of BUILT_SOURCES per file and does not allow
-# SUBDIRS built before BUILT_SOURCES, we end up separate Makefile.am for each source
-# code generation, i.e. lex-yacc and Thrift, to achieve stable parallel make.
-
-SUBDIRS = src src/thrift/plugin .
-if WITH_TESTS
-SUBDIRS += test
-endif
-
-bin_PROGRAMS = thrift
-
-thrift_OBJDIR = obj
-
-plugin_gen = src/thrift/plugin/plugin_types.h \
-             src/thrift/plugin/plugin_types.cpp \
-             src/thrift/plugin/plugin_constants.h \
-             src/thrift/plugin/plugin_constants.cpp
-
-compiler_core =  src/thrift/common.h \
-                 src/thrift/common.cc \
-                 src/thrift/generate/t_generator.cc \
-                 src/thrift/generate/t_generator_registry.h \
-                 src/thrift/globals.h \
-                 src/thrift/platform.h \
-                 src/thrift/logging.h \
-                 src/thrift/parse/t_doc.h \
-                 src/thrift/parse/t_type.h \
-                 src/thrift/parse/t_base_type.h \
-                 src/thrift/parse/t_enum.h \
-                 src/thrift/parse/t_enum_value.h \
-                 src/thrift/parse/t_typedef.h \
-                 src/thrift/parse/t_typedef.cc \
-                 src/thrift/parse/t_container.h \
-                 src/thrift/parse/t_list.h \
-                 src/thrift/parse/t_set.h \
-                 src/thrift/parse/t_map.h \
-                 src/thrift/parse/t_struct.h \
-                 src/thrift/parse/t_field.h \
-                 src/thrift/parse/t_service.h \
-                 src/thrift/parse/t_function.h \
-                 src/thrift/parse/t_program.h \
-                 src/thrift/parse/t_scope.h \
-                 src/thrift/parse/t_const.h \
-                 src/thrift/parse/t_const_value.h \
-                 src/thrift/parse/parse.cc \
-                 src/thrift/generate/t_generator.h \
-                 src/thrift/generate/t_oop_generator.h \
-                 src/thrift/generate/t_html_generator.h
-
-thrift_SOURCES = src/thrift/main.h \
-                 src/thrift/main.cc \
-                 src/thrift/audit/t_audit.cpp \
-                 src/thrift/audit/t_audit.h
-
-# Specific client generator source
-thrift_SOURCES += src/thrift/generate/t_c_glib_generator.cc \
-                  src/thrift/generate/t_cpp_generator.cc \
-                  src/thrift/generate/t_java_generator.cc \
-                  src/thrift/generate/t_json_generator.cc \
-                  src/thrift/generate/t_as3_generator.cc \
-                  src/thrift/generate/t_dart_generator.cc \
-                  src/thrift/generate/t_haxe_generator.cc \
-                  src/thrift/generate/t_csharp_generator.cc \
-                  src/thrift/generate/t_py_generator.cc \
-                  src/thrift/generate/t_rb_generator.cc \
-                  src/thrift/generate/t_perl_generator.cc \
-                  src/thrift/generate/t_php_generator.cc \
-                  src/thrift/generate/t_erl_generator.cc \
-                  src/thrift/generate/t_cocoa_generator.cc \
-                  src/thrift/generate/t_swift_generator.cc \
-                  src/thrift/generate/t_st_generator.cc \
-                  src/thrift/generate/t_ocaml_generator.cc \
-                  src/thrift/generate/t_hs_generator.cc \
-                  src/thrift/generate/t_xsd_generator.cc \
-                  src/thrift/generate/t_xml_generator.cc \
-                  src/thrift/generate/t_html_generator.cc \
-                  src/thrift/generate/t_js_generator.cc \
-                  src/thrift/generate/t_javame_generator.cc \
-                  src/thrift/generate/t_delphi_generator.cc \
-                  src/thrift/generate/t_go_generator.cc \
-                  src/thrift/generate/t_gv_generator.cc \
-                  src/thrift/generate/t_d_generator.cc \
-                  src/thrift/generate/t_lua_generator.cc
-
-thrift_CPPFLAGS = -I$(srcdir)/src
-thrift_CXXFLAGS = -Wall -Wextra -pedantic
-thrift_LDADD = @LEXLIB@ src/thrift/libparse.a
-
-if !WITH_PLUGIN
-thrift_SOURCES += $(compiler_core)
-else
-
-lib_LTLIBRARIES = libthriftc.la
-
-thrift_CPPFLAGS += -DTHRIFT_ENABLE_PLUGIN=1
-thrift_LDADD += libthriftc.la
-
-nodist_libthriftc_la_SOURCES = $(plugin_gen)
-libthriftc_la_SOURCES = $(compiler_core) \
-                        src/thrift/plugin/type_util.h \
-                        src/thrift/plugin/plugin.h \
-                        src/thrift/plugin/plugin.cc \
-                        src/thrift/plugin/plugin_output.h \
-                        src/thrift/plugin/plugin_output.cc \
-                        src/thrift/plugin/plugin.thrift \
-                        src/thrift/logging.cc
-
-
-libthriftc_la_CPPFLAGS = -I$(srcdir)/src -Isrc -I$(top_builddir)/lib/cpp/src -DTHRIFT_ENABLE_PLUGIN=1
-libthriftc_la_CXXFLAGS = -Wall -Wextra -pedantic
-libthriftc_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
-
-include_thriftdir = $(includedir)/thrift
-include_thrift_HEADERS = src/thrift/common.h \
-                         src/thrift/globals.h \
-                         src/thrift/logging.h \
-                         src/thrift/main.h \
-                         src/thrift/platform.h \
-                         src/thrift/version.h
-
-include_auditdir = $(include_thriftdir)/windows
-include_audit_HEADERS = src/thrift/audit/t_audit.h
-
-include_generatedir = $(include_thriftdir)/generate
-include_generate_HEADERS = src/thrift/generate/t_generator.h \
-                           src/thrift/generate/t_generator_registry.h \
-                           src/thrift/generate/t_oop_generator.h \
-                           src/thrift/generate/t_html_generator.h
-
-include_parsedir = $(include_thriftdir)/parse
-include_parse_HEADERS = src/thrift/parse/t_service.h \
-                        src/thrift/parse/t_program.h \
-                        src/thrift/parse/t_field.h \
-                        src/thrift/parse/t_scope.h \
-                        src/thrift/parse/t_typedef.h \
-                        src/thrift/parse/t_set.h \
-                        src/thrift/parse/t_const_value.h \
-                        src/thrift/parse/t_enum_value.h \
-                        src/thrift/parse/t_const.h \
-                        src/thrift/parse/t_list.h \
-                        src/thrift/parse/t_map.h \
-                        src/thrift/parse/t_container.h \
-                        src/thrift/parse/t_base_type.h \
-                        src/thrift/parse/t_enum.h \
-                        src/thrift/parse/t_function.h \
-                        src/thrift/parse/t_type.h \
-                        src/thrift/parse/t_doc.h \
-                        src/thrift/parse/t_struct.h
-
-include_plugindir = $(include_thriftdir)/plugin
-include_plugin_HEADERS = src/thrift/plugin/plugin.h \
-                         src/thrift/plugin/type_util.h \
-                         src/thrift/plugin/plugin_output.h
-
-include_windowsdir = $(include_thriftdir)/windows
-include_windows_HEADERS = src/thrift/windows/config.h
-endif
-
-WINDOWS_DIST = \
-             compiler.sln \
-             compiler.vcxproj \
-             compiler.vcxproj.filters
-
-EXTRA_DIST = \
-             coding_standards.md \
-             README.md \
-             CMakeLists.txt \
-             test \
-             $(WINDOWS_DIST)
-
-clean-local:
-	$(RM) version.h $(plugin_gen)
-
-src/thrift/main.cc: src/thrift/version.h
-
-style-local:
-  $(CPPSTYLE_CMD)
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/README.md b/vendor/git.apache.org/thrift.git/compiler/cpp/README.md
deleted file mode 100644
index 90300ac..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Build compiler using CMake
-
-Use the following steps to build using cmake:
-
-    mkdir cmake-build
-    cd cmake-build
-    cmake ..
-    make
-
-
-### Create an eclipse project
-
-    mkdir cmake-ec && cd cmake-ec
-    cmake -G "Eclipse CDT4 - Unix Makefiles" ..
-    make
-
-Now open the folder cmake-ec using eclipse.
-
-
-### Cross compile using mingw32 and generate a Windows Installer with CPack
-
-    mkdir cmake-mingw32 && cd cmake-mingw32
-    cmake -DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF ..
-    cpack
-
-## Build on windows
-
-### using Git Bash
-Git Bash provides flex and bison, so you just need to do this:
-
-    mkdir cmake-vs && cd cmake-vs
-    cmake -DWITH_SHARED_LIB=off ..
-
-### using Win flex-bison
-
-In order to build on windows with winflexbison a few additional steps are necessary:
-
-1. Download winflexbison from http://sourceforge.net/projects/winflexbison/
-2. Extract the winflex bison files to for e.g. C:\winflexbison
-3. Make the CMake variables point to the correct binaries.
-  * FLEX_EXECUTABLE = C:/winbuild/win_flex.exe
-  * BISON_EXECUTABLE = C:/winbuild/win_bison.exe
-4. Generate a Visual Studio project:
-```
-mkdir cmake-vs && cd cmake-vs
-cmake -G "Visual Studio 12" -DWITH_SHARED_LIB=off ..
-```
-5. Now open the folder build_vs using Visual Studio 2013.
-
-# Building the Thrift IDL compiler in Windows
-
-If you don't want to use CMake you can use the already available Visual Studio
-2010 solution.
-The Visual Studio project contains pre-build commands to generate the
-thriftl.cc, thrifty.cc and thrifty.hh files which are necessary to build
-the compiler. These depend on bison, flex and their dependencies to
-work properly.
-Download flex & bison as described above.
-Place these binaries somewhere in the path and
-rename win_flex.exe and win_bison.exe to flex.exe and bison.exe respectively.
-
-If this doesn't work on a system, try these manual pre-build steps.
-
-Open compiler.sln and remove the Pre-build commands under the project's
- Properties -> Build Events -> Pre-Build Events.
-
-From a command prompt:
-> cd thrift/compiler/cpp
-> flex -osrc\thrift\thriftl.cc src\thrift\thriftl.ll
-In the generated thriftl.cc, comment out #include <unistd.h>
-
-Place a copy of bison.simple in thrift/compiler/cpp
-> bison -y -o "src/thrift/thrifty.cc" --defines src/thrift/thrifty.yy
-> move src\thrift\thrifty.cc.hh  src\thrift\thrifty.hh
-
-Bison might generate the yacc header file "thrifty.cc.h" with just one h ".h" extension; in this case you'll have to rename to "thrifty.h".
-
-> move src\thrift\version.h.in src\thrift\version.h
-
-Download inttypes.h from the interwebs and place it in an include path
-location (e.g. thrift/compiler/cpp/src).
-
-Build the compiler in Visual Studio.
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/coding_standards.md b/vendor/git.apache.org/thrift.git/compiler/cpp/coding_standards.md
deleted file mode 100644
index ea08946..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/coding_standards.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## Compiler Coding Standards
-
- * When making small change / bugfix - follow style as seen in nearby code.
- * When making major refactor and / or adding new feature - follow style for C++ library
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.sln b/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.sln
deleted file mode 100644
index 94961aa..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compiler", "compiler.vcxproj", "{89975A1A-F799-4556-98B8-64E30AB39A90}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{89975A1A-F799-4556-98B8-64E30AB39A90}.Debug|Win32.ActiveCfg = Debug|Win32
-		{89975A1A-F799-4556-98B8-64E30AB39A90}.Debug|Win32.Build.0 = Debug|Win32
-		{89975A1A-F799-4556-98B8-64E30AB39A90}.Release|Win32.ActiveCfg = Release|Win32
-		{89975A1A-F799-4556-98B8-64E30AB39A90}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.vcxproj b/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.vcxproj
deleted file mode 100644
index 878e219..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.vcxproj
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\thrift\audit\t_audit.h" />
-    <ClInclude Include="src\thrift\common.h" />
-    <ClInclude Include="src\thrift\generate\t_generator.h" />
-    <ClInclude Include="src\thrift\generate\t_generator_registry.h" />
-    <ClInclude Include="src\thrift\generate\t_oop_generator.h" />
-    <ClInclude Include="src\thrift\generate\t_html_generator.h" />
-    <ClInclude Include="src\thrift\globals.h" />
-    <ClInclude Include="src\thrift\main.h" />
-    <ClInclude Include="src\thrift\parse\t_base_type.h" />
-    <ClInclude Include="src\thrift\parse\t_const.h" />
-    <ClInclude Include="src\thrift\parse\t_const_value.h" />
-    <ClInclude Include="src\thrift\parse\t_container.h" />
-    <ClInclude Include="src\thrift\parse\t_doc.h" />
-    <ClInclude Include="src\thrift\parse\t_enum.h" />
-    <ClInclude Include="src\thrift\parse\t_enum_value.h" />
-    <ClInclude Include="src\thrift\parse\t_field.h" />
-    <ClInclude Include="src\thrift\parse\t_function.h" />
-    <ClInclude Include="src\thrift\parse\t_list.h" />
-    <ClInclude Include="src\thrift\parse\t_map.h" />
-    <ClInclude Include="src\thrift\parse\t_program.h" />
-    <ClInclude Include="src\thrift\parse\t_scope.h" />
-    <ClInclude Include="src\thrift\parse\t_service.h" />
-    <ClInclude Include="src\thrift\parse\t_set.h" />
-    <ClInclude Include="src\thrift\parse\t_struct.h" />
-    <ClInclude Include="src\thrift\parse\t_type.h" />
-    <ClInclude Include="src\thrift\parse\t_typedef.h" />
-    <ClInclude Include="src\thrift\platform.h" />
-    <ClInclude Include="src\thrift\thrifty.hh" />
-    <ClInclude Include="src\thrift\windows\config.h" />
-    <ClInclude Include="src\thrift\version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\thrift\audit\t_audit.cpp"/>
-    <ClCompile Include="src\thrift\common.cc" />
-    <ClCompile Include="src\thrift\generate\t_as3_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_cocoa_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_cpp_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_csharp_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_c_glib_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_d_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_dart_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_delphi_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_erl_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_go_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_gv_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_haxe_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_hs_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_html_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_javame_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_java_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_js_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_json_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_lua_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_ocaml_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_perl_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_php_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_py_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_rb_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_st_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_swift_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_xml_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_xsd_generator.cc" />
-    <ClCompile Include="src\thrift\main.cc" />
-    <ClCompile Include="src\thrift\parse\parse.cc" />
-    <ClCompile Include="src\thrift\parse\t_typedef.cc" />
-    <ClCompile Include="src\thrift\thriftl.cc" />
-    <ClCompile Include="src\thrift\thrifty.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="src\thrift\thriftl.ll" />
-    <None Include="src\thrift\thrifty.yy" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{89975A1A-F799-4556-98B8-64E30AB39A90}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>compiler</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
-    <TargetName>thrift</TargetName>
-    <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
-    <TargetName>thrift</TargetName>
-    <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
-    <TargetName>thrift</TargetName>
-    <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
-    <TargetName>thrift</TargetName>
-    <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;MINGW;YY_NO_UNISTD_H;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>thrift\windows\config.h</ForcedIncludeFiles>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>flex -o "src\\thrift\\thriftl.cc" src/thrift/thriftl.ll &amp;&amp; bison -y -o "src\\thrift\\thrifty.cc" --defines="src\\thrift\\thrifty.hh" src/thrift/thrifty.yy</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;MINGW;YY_NO_UNISTD_H;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>thrift\windows\config.h</ForcedIncludeFiles>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>flex -o "src\\thrift\\thriftl.cc" src/thrift/thriftl.ll &amp;&amp; bison -y -o "src\\thrift\\thrifty.cc" --defines="src\\thrift\\thrifty.hh" src/thrift/thrifty.yy</Command>
-
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;MINGW;YY_NO_UNISTD_H;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>thrift\windows\config.h</ForcedIncludeFiles>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PreBuildEvent>
-      <Command>flex -o "src\\thrift\\thriftl.cc" src/thrift/thriftl.ll &amp;&amp; bison -y -o "src\\thrift\\thrifty.cc" --defines="src\\thrift\\thrifty.hh" src/thrift/thrifty.yy</Command>
-
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;MINGW;YY_NO_UNISTD_H;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>thrift\windows\config.h</ForcedIncludeFiles>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PreBuildEvent>
-      <Command>flex -o "src\\thrift\\thriftl.cc" src/thrift/thriftl.ll &amp;&amp; bison -y -o "src\\thrift\\thrifty.cc" --defines="src\\thrift\\thrifty.hh" src/thrift/thrifty.yy</Command>
-
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.vcxproj.filters b/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.vcxproj.filters
deleted file mode 100644
index 9b14bbf..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/compiler.vcxproj.filters
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="src\audit\t_audit.h" />
-    <ClInclude Include="src\generate\t_generator.h">
-      <Filter>generate</Filter>
-    </ClInclude>
-    <ClInclude Include="src\generate\t_generator_registry.h">
-      <Filter>generate</Filter>
-    </ClInclude>
-    <ClInclude Include="src\generate\t_oop_generator.h">
-      <Filter>generate</Filter>
-    </ClInclude>
-    <ClInclude Include="src\generate\t_html_generator.h">
-      <Filter>generate</Filter>
-    </ClInclude>
-    <ClInclude Include="src\globals.h" />
-    <ClInclude Include="src\main.h" />
-    <ClInclude Include="src\parse\t_base_type.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_const.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_const_value.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_container.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_doc.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_enum.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_enum_value.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_field.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_function.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_list.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_map.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_program.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_scope.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_service.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_set.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_struct.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_type.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\parse\t_typedef.h">
-      <Filter>parse</Filter>
-    </ClInclude>
-    <ClInclude Include="src\platform.h" />
-    <ClInclude Include="src\thrifty.hh" />
-    <ClInclude Include="src\windows\config.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\windows\version.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="windows">
-      <UniqueIdentifier>{ae9d0a15-57ae-4f01-87a4-81f790249b83}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="parse">
-      <UniqueIdentifier>{5df016bb-591b-420a-a535-4330d9187fbf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="generate">
-      <UniqueIdentifier>{b5c626af-afa5-433c-8e10-ee734533cb68}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\audit\t_audit.cpp"/>
-    <ClCompile Include="src\generate\t_as3_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_cocoa_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_cpp_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_csharp_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_c_glib_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_d_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_dart_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_delphi_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_erl_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_go_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_gv_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_haxe_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_hs_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_html_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_javame_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_java_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_js_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_ocaml_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_perl_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_php_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_py_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_rb_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_st_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_swift_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_xsd_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_xml_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\main.cc" />
-    <ClCompile Include="src\parse\parse.cc">
-      <Filter>parse</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thriftl.cc" />
-    <ClCompile Include="src\thrifty.cc" />
-    <ClCompile Include="src\parse\t_typedef.cc">
-      <Filter>parse</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_json_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_lua_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="src\thriftl.ll" />
-    <None Include="src\thrifty.yy" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/Makefile.am b/vendor/git.apache.org/thrift.git/compiler/cpp/src/Makefile.am
deleted file mode 100644
index bc2c5cb..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/Makefile.am
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-# Contains some contributions under the Thrift Software License.
-# Please see doc/old-thrift-license.txt in the Thrift distribution for
-# details.
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-AM_YFLAGS = -d
-
-BUILT_SOURCES = thrift/thrifty.cc
-
-noinst_LIBRARIES = thrift/libparse.a
-
-thrift_libparse_a_CPPFLAGS = -I$(srcdir)
-thrift_libparse_a_CXXFLAGS = -Wall -Wno-sign-compare -Wno-unused
-
-thrift_libparse_a_SOURCES = thrift/thrifty.yy \
-                     thrift/thriftl.ll
-
-clean-local:
-	$(RM) thrift/thriftl.cc thrift/thrifty.cc thrift/thrifty.h thrift/thrifty.hh
-
-if WITH_PLUGIN
-noinst_PROGRAMS = thrift/thrift-bootstrap
-
-thrift_thrift_bootstrap_SOURCES = \
-                 thrift/common.h \
-                 thrift/common.cc \
-                 thrift/audit/t_audit.h \
-                 thrift/audit/t_audit.cpp \
-                 thrift/generate/t_generator.cc \
-                 thrift/generate/t_generator_registry.h \
-                 thrift/globals.h \
-                 thrift/platform.h \
-                 thrift/logging.h \
-                 thrift/parse/t_doc.h \
-                 thrift/parse/t_type.h \
-                 thrift/parse/t_base_type.h \
-                 thrift/parse/t_enum.h \
-                 thrift/parse/t_enum_value.h \
-                 thrift/parse/t_typedef.h \
-                 thrift/parse/t_typedef.cc \
-                 thrift/parse/t_container.h \
-                 thrift/parse/t_list.h \
-                 thrift/parse/t_set.h \
-                 thrift/parse/t_map.h \
-                 thrift/parse/t_struct.h \
-                 thrift/parse/t_field.h \
-                 thrift/parse/t_service.h \
-                 thrift/parse/t_function.h \
-                 thrift/parse/t_program.h \
-                 thrift/parse/t_scope.h \
-                 thrift/parse/t_const.h \
-                 thrift/parse/t_const_value.h \
-                 thrift/parse/parse.cc \
-                 thrift/generate/t_generator.h \
-                 thrift/generate/t_oop_generator.h \
-                 thrift/generate/t_html_generator.h \
-                 thrift/windows/config.h \
-                 thrift/version.h \
-                 thrift/generate/t_cpp_generator.cc \
-                 thrift/main.h \
-                 thrift/main.cc
-
-main.cc: version.h
-
-thrift_thrift_bootstrap_CXXFLAGS = -Wall -Wextra -pedantic
-thrift_thrift_bootstrap_LDADD = @LEXLIB@ thrift/libparse.a
-endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/audit/t_audit.cpp b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/audit/t_audit.cpp
deleted file mode 100644
index 1386f3b..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/audit/t_audit.cpp
+++ /dev/null
@@ -1,464 +0,0 @@
-
-#include <cassert>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
-#include <string>
-#include <algorithm>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <limits.h>
-
-// Careful: must include globals first for extern definitions
-#include "thrift/globals.h"
-
-#include "thrift/parse/t_program.h"
-#include "thrift/parse/t_scope.h"
-#include "thrift/parse/t_const.h"
-#include "thrift/parse/t_field.h"
-
-#include "thrift/version.h"
-
-#include "thrift/audit/t_audit.h"
-
-extern int g_warn;
-extern std::string g_curpath;
-extern bool g_return_failure;
-
-void thrift_audit_warning(int level, const char* fmt, ...) {
-   if (g_warn < level) {
-      return;
-   }
-   va_list args;
-   printf("[Thrift Audit Warning:%s] ", g_curpath.c_str());
-   va_start(args, fmt);
-   vprintf(fmt, args);
-   va_end(args);
-   printf("\n");
-}
-
-void thrift_audit_failure(const char* fmt, ...) {
-  va_list args;
-  fprintf(stderr, "[Thrift Audit Failure:%s] ", g_curpath.c_str());
-  va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
-  va_end(args);
-  fprintf(stderr, "\n");
-  g_return_failure = true;
-}
-
-void compare_namespace(t_program* newProgram, t_program* oldProgram)
-{
-   const std::map<std::string, std::string>& newNamespaceMap = newProgram->get_all_namespaces();
-   const std::map<std::string, std::string>& oldNamespaceMap = oldProgram->get_all_namespaces();
-
-   for(std::map<std::string, std::string>::const_iterator oldNamespaceMapIt = oldNamespaceMap.begin();
-         oldNamespaceMapIt != oldNamespaceMap.end();
-         oldNamespaceMapIt++)
-   {
-      std::map<std::string, std::string>::const_iterator newNamespaceMapIt = newNamespaceMap.find(oldNamespaceMapIt->first);
-      if(newNamespaceMapIt == newNamespaceMap.end())
-      {
-         thrift_audit_warning(1, "Language %s not found in new thrift file\n", (oldNamespaceMapIt->first).c_str());
-      }
-      else if((newNamespaceMapIt->second) != oldNamespaceMapIt->second)
-      {
-         thrift_audit_warning(1, "Namespace %s changed in new thrift file\n", (oldNamespaceMapIt->second).c_str());
-      }
-   }
-}
-
-void compare_enum_values(t_enum* newEnum,t_enum* oldEnum)
-{
-   const std::vector<t_enum_value*>& oldEnumValues = oldEnum->get_constants();
-   for(std::vector<t_enum_value*>::const_iterator oldEnumValuesIt = oldEnumValues.begin();
-         oldEnumValuesIt != oldEnumValues.end();
-         oldEnumValuesIt++)
-   {
-      int enumValue = (*oldEnumValuesIt)->get_value();
-      t_enum_value* newEnumValue = newEnum->get_constant_by_value(enumValue);
-      if(newEnumValue != NULL)
-      {
-         std::string enumName = (*oldEnumValuesIt)->get_name();
-         if(enumName != newEnumValue->get_name())
-         {
-            thrift_audit_warning(1, "Name of the value %d changed in enum %s\n", enumValue, oldEnum->get_name().c_str());
-         }
-      }
-      else
-      {
-         thrift_audit_failure("Enum value %d missing in %s\n", enumValue, oldEnum->get_name().c_str());
-      }
-
-   }
-}
-
-void compare_enums(const std::vector<t_enum*>& newEnumList, const std::vector<t_enum*>& oldEnumList)
-{
-   std::map<std::string,t_enum*> newEnumMap;
-   std::vector<t_enum*>::const_iterator newEnumIt;
-   for(newEnumIt = newEnumList.begin(); newEnumIt != newEnumList.end(); newEnumIt++)
-   {
-      newEnumMap[(*newEnumIt)->get_name()] = *newEnumIt;
-   }
-   std::vector<t_enum*>::const_iterator oldEnumIt;
-   for(oldEnumIt = oldEnumList.begin(); oldEnumIt != oldEnumList.end(); oldEnumIt++)
-   {
-      std::map<std::string,t_enum*>::iterator newEnumMapIt;
-      newEnumMapIt = newEnumMap.find((*oldEnumIt)->get_name());
-
-      if(newEnumMapIt == newEnumMap.end())
-      {
-         thrift_audit_warning(1, "Enum %s not found in new thrift file\n",(*oldEnumIt)->get_name().c_str());
-      }
-      else
-      {
-         compare_enum_values(newEnumMapIt->second, *oldEnumIt);
-      }
-   }
-}
-
-//This function returns 'true' if the two arguements are of same types.
-//Returns false if they are of different type
-bool compare_type(t_type* newType, t_type* oldType)
-{
-   //Comparing names of two types will work when the newType and oldType are basic types or structs or enums.
-   //However, when they are containers, get_name() returns empty for which we have to compare the type of
-   //their elements as well.
-   if((newType->get_name()).empty() && (oldType->get_name()).empty())
-   {
-
-      if(newType->is_list() && oldType->is_list())
-      {
-         t_type* newElementType = ((t_list*)newType)->get_elem_type();
-         t_type* oldElementType = ((t_list*)oldType)->get_elem_type();
-         return compare_type(newElementType, oldElementType);
-      }
-      else if(newType->is_map() && oldType->is_map())
-      {
-         t_type* newKeyType = ((t_map*)newType)->get_key_type();
-         t_type* oldKeyType = ((t_map*)oldType)->get_key_type();
-
-         t_type* newValType = ((t_map*)newType)->get_val_type();
-         t_type* oldValType = ((t_map*)oldType)->get_val_type();
-
-         return (compare_type(newKeyType, oldKeyType) && compare_type(newValType, oldValType));
-      }
-      else if(newType->is_set() && oldType->is_set())
-      {
-         t_type* newElementType = ((t_set*)newType)->get_elem_type();
-         t_type* oldElementType = ((t_set*)oldType)->get_elem_type();
-         return compare_type(newElementType, oldElementType);
-      }
-      else
-      {
-         return false;
-      }
-   }
-   else if(newType->get_name() == oldType->get_name())
-   {
-      return true;
-   }
-   else
-   {
-      return false;
-   }
-}
-
-bool compare_pair(std::pair<t_const_value*, t_const_value*> newMapPair, std::pair<t_const_value*, t_const_value*> oldMapPair)
-{
-   return compare_defaults(newMapPair.first, oldMapPair.first) && compare_defaults(newMapPair.second, oldMapPair.second);
-}
-
-// This function returns 'true' if the default values are same. Returns false if they are different.
-bool compare_defaults(t_const_value* newStructDefault, t_const_value* oldStructDefault)
-{
-   if(newStructDefault == NULL && oldStructDefault == NULL) return true;
-   else if(newStructDefault == NULL && oldStructDefault != NULL) return false;
-   else if (newStructDefault != NULL && oldStructDefault == NULL) return false;
-
-   if(newStructDefault->get_type() != oldStructDefault->get_type())
-   {
-      return false;
-   }
-
-   switch(newStructDefault->get_type())
-   {
-      case t_const_value::CV_INTEGER:
-         return (newStructDefault->get_integer() == oldStructDefault->get_integer());
-      case t_const_value::CV_DOUBLE:
-         return (newStructDefault->get_double() == oldStructDefault->get_double());
-      case t_const_value::CV_STRING:
-         return (newStructDefault->get_string() == oldStructDefault->get_string());
-      case t_const_value::CV_LIST:
-         {
-            const std::vector<t_const_value*>& oldDefaultList = oldStructDefault->get_list();
-            const std::vector<t_const_value*>& newDefaultList = newStructDefault->get_list();
-            bool defaultValuesCompare = (oldDefaultList.size() == newDefaultList.size());
-
-            return defaultValuesCompare && std::equal(newDefaultList.begin(), newDefaultList.end(), oldDefaultList.begin(), compare_defaults);
-         }
-      case t_const_value::CV_MAP:
-         {
-            const std::map<t_const_value*, t_const_value*> newMap = newStructDefault->get_map();
-            const std::map<t_const_value*, t_const_value*> oldMap = oldStructDefault->get_map();
-
-            bool defaultValuesCompare = (oldMap.size() == newMap.size());
-
-            return defaultValuesCompare && std::equal(newMap.begin(), newMap.end(), oldMap.begin(), compare_pair);
-         }
-      case t_const_value::CV_IDENTIFIER:
-         return (newStructDefault->get_identifier() == oldStructDefault->get_identifier());
-      default:
-         return false;
-   }
-
-}
-
-void compare_struct_field(t_field* newField, t_field* oldField, std::string oldStructName)
-{
-   t_type* newFieldType = newField->get_type();
-   t_type* oldFieldType = oldField->get_type();
-   if(!compare_type(newFieldType, oldFieldType))
-   {
-      thrift_audit_failure("Struct Field Type Changed for Id = %d in %s \n", newField->get_key(), oldStructName.c_str());
-   }
-
-   // A Struct member can be optional if it is mentioned explicitly, or if it is assigned with default values.
-   bool newStructFieldOptional = (newField->get_req() != t_field::T_REQUIRED);
-   bool oldStructFieldOptional = (oldField->get_req() != t_field::T_REQUIRED);
-
-   if(newStructFieldOptional != oldStructFieldOptional)
-   {
-      thrift_audit_failure("Struct Field Requiredness Changed for Id = %d in %s \n", newField->get_key(), oldStructName.c_str());
-   }
-   if(newStructFieldOptional || oldStructFieldOptional)
-   {
-      if(!compare_defaults(newField->get_value(), oldField->get_value()))
-      {
-         thrift_audit_warning(1, "Default value changed for Id = %d in %s \n", newField->get_key(), oldStructName.c_str());
-      }
-   }
-
-   std::string fieldName = newField->get_name();
-   if(fieldName != oldField->get_name())
-   {
-      thrift_audit_warning(1, "Struct field name changed for Id = %d in %s\n", newField->get_key(), oldStructName.c_str());
-   }
-
-}
-
-void compare_single_struct(t_struct* newStruct, t_struct* oldStruct, const std::string& oldStructName = std::string())
-{
-   std::string structName = oldStructName.empty() ? oldStruct->get_name() : oldStructName;
-   const std::vector<t_field*>& oldStructMembersInIdOrder = oldStruct->get_sorted_members();
-   const std::vector<t_field*>& newStructMembersInIdOrder = newStruct->get_sorted_members();
-   std::vector<t_field*>::const_iterator oldStructMemberIt = oldStructMembersInIdOrder.begin();
-   std::vector<t_field*>::const_iterator newStructMemberIt = newStructMembersInIdOrder.begin();
-
-   // Since we have the struct members in their ID order, comparing their IDs can be done by traversing the two member
-   // lists together.
-   while(!(oldStructMemberIt == oldStructMembersInIdOrder.end() && newStructMemberIt == newStructMembersInIdOrder.end()))
-   {
-      if(newStructMemberIt == newStructMembersInIdOrder.end() && oldStructMemberIt != oldStructMembersInIdOrder.end())
-      {
-         // A field ID has been removed from the end.
-         thrift_audit_failure("Struct Field removed for Id = %d in %s \n", (*oldStructMemberIt)->get_key(), structName.c_str());
-         oldStructMemberIt++;
-      }
-      else if(newStructMemberIt != newStructMembersInIdOrder.end() && oldStructMemberIt == oldStructMembersInIdOrder.end())
-      {
-         //New field ID has been added to the end.
-         if((*newStructMemberIt)->get_req() == t_field::T_REQUIRED)
-         {
-            thrift_audit_failure("Required Struct Field Added for Id = %d in %s \n", (*newStructMemberIt)->get_key(), structName.c_str());
-         }
-         newStructMemberIt++;
-      }
-      else if((*newStructMemberIt)->get_key() == (*oldStructMemberIt)->get_key())
-      {
-         //Field ID found in both structs. Compare field types, default values.
-         compare_struct_field(*newStructMemberIt, *oldStructMemberIt, structName);
-
-         newStructMemberIt++;
-         oldStructMemberIt++;
-      }
-      else if((*newStructMemberIt)->get_key() < (*oldStructMemberIt)->get_key())
-      {
-         //New Field Id is inserted in between
-         //Adding fields to struct is fine, but adding them in the middle is suspicious. Error!!
-         thrift_audit_failure("Struct field is added in the middle with Id = %d in %s\n",  (*newStructMemberIt)->get_key(),  structName.c_str());
-         newStructMemberIt++;
-      }
-      else if((*newStructMemberIt)->get_key() > (*oldStructMemberIt)->get_key())
-      {
-         //A field is deleted in newStruct.
-         thrift_audit_failure("Struct Field removed for Id = %d in %s \n",  (*oldStructMemberIt)->get_key(), structName.c_str());
-         oldStructMemberIt++;
-      }
-
-   }
-}
-
-void compare_structs(const std::vector<t_struct*>& newStructList, const std::vector<t_struct*>& oldStructList)
-{
-   std::map<std::string,t_struct*> newStructMap;
-   std::vector<t_struct*>::const_iterator newStructListIt;
-   for(newStructListIt = newStructList.begin(); newStructListIt != newStructList.end(); newStructListIt++)
-   {
-      newStructMap[(*newStructListIt)->get_name()] = *newStructListIt;
-   }
-
-   std::vector<t_struct*>::const_iterator oldStructListIt;
-   for(oldStructListIt = oldStructList.begin(); oldStructListIt != oldStructList.end(); oldStructListIt++)
-   {
-      std::map<std::string, t_struct*>::iterator newStructMapIt;
-      newStructMapIt = newStructMap.find((*oldStructListIt)->get_name());
-      if(newStructMapIt == newStructMap.end())
-      {
-         thrift_audit_failure("Struct %s not found in new thrift file\n", (*oldStructListIt)->get_name().c_str());
-      }
-      else
-      {
-         compare_single_struct(newStructMapIt->second, *oldStructListIt);
-      }
-   }
-
-}
-
-void compare_single_function(t_function* newFunction, t_function* oldFunction)
-{
-   t_type* newFunctionReturnType = newFunction->get_returntype();
-
-   if(newFunction->is_oneway() != oldFunction->is_oneway())
-   {
-      thrift_audit_failure("Oneway attribute changed for function %s\n",oldFunction->get_name().c_str());
-   }
-   if(!compare_type(newFunctionReturnType, oldFunction->get_returntype()))
-   {
-      thrift_audit_failure("Return type changed for function %s\n",oldFunction->get_name().c_str());
-   }
-
-   //Compare function arguments.
-   compare_single_struct(newFunction->get_arglist(), oldFunction->get_arglist());
-   std::string exceptionName = oldFunction->get_name();
-   exceptionName += "_exception";
-   compare_single_struct(newFunction->get_xceptions(), oldFunction->get_xceptions(), exceptionName);
-}
-
-void compare_functions(const std::vector<t_function*>& newFunctionList, const std::vector<t_function*>& oldFunctionList)
-{
-   std::map<std::string, t_function*> newFunctionMap;
-   std::map<std::string, t_function*>::iterator newFunctionMapIt;
-   for(std::vector<t_function*>::const_iterator newFunctionIt = newFunctionList.begin();
-         newFunctionIt != newFunctionList.end();
-         newFunctionIt++)
-   {
-      newFunctionMap[(*newFunctionIt)->get_name()] = *newFunctionIt;
-   }
-
-   for(std::vector<t_function*>::const_iterator oldFunctionIt = oldFunctionList.begin();
-         oldFunctionIt != oldFunctionList.end();
-         oldFunctionIt++)
-   {
-      newFunctionMapIt = newFunctionMap.find((*oldFunctionIt)->get_name());
-      if(newFunctionMapIt == newFunctionMap.end())
-      {
-         thrift_audit_failure("New Thrift File has missing function %s\n",(*oldFunctionIt)->get_name().c_str());
-         continue;
-      }
-      else
-      {
-         //Function is found in both thrift files. Compare return type and argument list
-         compare_single_function(newFunctionMapIt->second, *oldFunctionIt);
-      }
-   }
-
-}
-
-void compare_services(const std::vector<t_service*>& newServices, const std::vector<t_service*>& oldServices)
-{
-   std::vector<t_service*>::const_iterator oldServiceIt;
-
-   std::map<std::string, t_service*> newServiceMap;
-   for(std::vector<t_service*>::const_iterator newServiceIt = newServices.begin();
-         newServiceIt != newServices.end();
-         newServiceIt++)
-   {
-      newServiceMap[(*newServiceIt)->get_name()] = *newServiceIt;
-   }
-
-
-   for(oldServiceIt = oldServices.begin(); oldServiceIt != oldServices.end(); oldServiceIt++)
-   {
-      const std::string oldServiceName = (*oldServiceIt)->get_name();
-      std::map<std::string, t_service*>::iterator newServiceMapIt = newServiceMap.find(oldServiceName);
-
-      if(newServiceMapIt == newServiceMap.end())
-      {
-         thrift_audit_failure("New Thrift file is missing a service %s\n", oldServiceName.c_str());
-      }
-      else
-      {
-         t_service* oldServiceExtends = (*oldServiceIt)->get_extends();
-         t_service* newServiceExtends = (newServiceMapIt->second)->get_extends();
-
-         if(oldServiceExtends == NULL)
-         {
-            // It is fine to add extends. So if service in older thrift did not have any extends, we are fine.
-            // DO Nothing
-         }
-         else if(oldServiceExtends != NULL && newServiceExtends == NULL)
-         {
-            thrift_audit_failure("Change in Service inheritance for %s\n", oldServiceName.c_str());
-         }
-         else
-         {
-            std::string oldExtendsName = oldServiceExtends->get_name();
-            std::string newExtendsName = newServiceExtends->get_name();
-
-            if( newExtendsName != oldExtendsName)
-            {
-               thrift_audit_failure("Change in Service inheritance for %s\n", oldServiceName.c_str());
-            }
-         }
-
-         compare_functions((newServiceMapIt->second)->get_functions(), (*oldServiceIt)->get_functions());
-      }
-
-   }
-
-}
-
-void compare_consts(const std::vector<t_const*>& newConst, const std::vector<t_const*>& oldConst)
-{
-   std::vector<t_const*>::const_iterator newConstIt;
-   std::vector<t_const*>::const_iterator oldConstIt;
-
-   std::map<std::string, t_const*> newConstMap;
-
-   for(newConstIt = newConst.begin(); newConstIt != newConst.end(); newConstIt++)
-   {
-      newConstMap[(*newConstIt)->get_name()] = *newConstIt;
-   }
-
-   std::map<std::string, t_const*>::const_iterator newConstMapIt;
-   for(oldConstIt = oldConst.begin(); oldConstIt != oldConst.end(); oldConstIt++)
-   {
-      newConstMapIt = newConstMap.find((*oldConstIt)->get_name());
-      if(newConstMapIt == newConstMap.end())
-      {
-         thrift_audit_warning(1, "Constants Missing %s \n", ((*oldConstIt)->get_name()).c_str());
-      }
-      else if(!compare_type((newConstMapIt->second)->get_type(), (*oldConstIt)->get_type()))
-      {
-         thrift_audit_warning(1, "Constant %s is of different type \n", ((*oldConstIt)->get_name()).c_str());
-      }
-      else if(!compare_defaults((newConstMapIt->second)->get_value(), (*oldConstIt)->get_value()))
-      {
-         thrift_audit_warning(1, "Constant %s has different value\n", ((*oldConstIt)->get_name()).c_str());
-      }
-   }
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/audit/t_audit.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/audit/t_audit.h
deleted file mode 100644
index be79e31..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/audit/t_audit.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef T_AUDIT_H
-#define T_AUDIT_H
-
-void compare_namespace(t_program* newProgram, t_program* oldProgram);
-void compare_enums(const std::vector<t_enum*>& newEnumList,
-                   const std::vector<t_enum*>& oldEnumList);
-bool compare_defaults(t_const_value* newStructDefault, t_const_value* oldStructDefault);
-void compare_structs(const std::vector<t_struct*>& newStructList,
-                     const std::vector<t_struct*>& oldStructList);
-void compare_services(const std::vector<t_service*>& newServices,
-                      const std::vector<t_service*>& oldServices);
-void compare_consts(const std::vector<t_const*>& newConst, const std::vector<t_const*>& oldConst);
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/common.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/common.cc
deleted file mode 100644
index 3a2b9d3..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/common.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "thrift/common.h"
-#include "thrift/parse/t_base_type.h"
-
-t_type* g_type_void;
-t_type* g_type_string;
-t_type* g_type_binary;
-t_type* g_type_slist;
-t_type* g_type_bool;
-t_type* g_type_i8;
-t_type* g_type_i16;
-t_type* g_type_i32;
-t_type* g_type_i64;
-t_type* g_type_double;
-
-void initGlobals() {
-  g_type_void = new t_base_type("void", t_base_type::TYPE_VOID);
-  g_type_string = new t_base_type("string", t_base_type::TYPE_STRING);
-  g_type_binary = new t_base_type("string", t_base_type::TYPE_STRING);
-  ((t_base_type*)g_type_binary)->set_binary(true);
-  g_type_slist = new t_base_type("string", t_base_type::TYPE_STRING);
-  ((t_base_type*)g_type_slist)->set_string_list(true);
-  g_type_bool = new t_base_type("bool", t_base_type::TYPE_BOOL);
-  g_type_i8 = new t_base_type("i8", t_base_type::TYPE_I8);
-  g_type_i16 = new t_base_type("i16", t_base_type::TYPE_I16);
-  g_type_i32 = new t_base_type("i32", t_base_type::TYPE_I32);
-  g_type_i64 = new t_base_type("i64", t_base_type::TYPE_I64);
-  g_type_double = new t_base_type("double", t_base_type::TYPE_DOUBLE);
-}
-
-void clearGlobals() {
-  delete g_type_void;
-  delete g_type_string;
-  delete g_type_bool;
-  delete g_type_i8;
-  delete g_type_i16;
-  delete g_type_i32;
-  delete g_type_i64;
-  delete g_type_double;
-}
-
-/**
- * Those are not really needed for plugins but causes link errors without
- */
-
-/**
- * The location of the last parsed doctext comment.
- */
-int g_doctext_lineno;
-int g_program_doctext_lineno = 0;
-PROGDOCTEXT_STATUS g_program_doctext_status = INVALID;
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/common.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/common.h
deleted file mode 100644
index 6948846..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/common.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_COMMON_H
-#define T_COMMON_H
-
-#include "thrift/parse/t_type.h"
-
-/**
- * Global types for the parser to be able to reference
- */
-
-extern t_type* g_type_void;
-extern t_type* g_type_string;
-extern t_type* g_type_binary;
-extern t_type* g_type_slist;
-extern t_type* g_type_bool;
-extern t_type* g_type_i8;
-extern t_type* g_type_i16;
-extern t_type* g_type_i32;
-extern t_type* g_type_i64;
-extern t_type* g_type_double;
-
-void initGlobals();
-void clearGlobals();
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_as3_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_as3_generator.cc
deleted file mode 100644
index 5ae3f91..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_as3_generator.cc
+++ /dev/null
@@ -1,2594 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <sstream>
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <cctype>
-
-#include <sys/stat.h>
-#include <stdexcept>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * AS3 code generator.
- *
- */
-class t_as3_generator : public t_oop_generator {
-public:
-  t_as3_generator(t_program* program,
-                  const std::map<std::string, std::string>& parsed_options,
-                  const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    bindable_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("bindable") == 0) {
-        bindable_ = true;
-      } else {
-        throw "unknown option as3:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-as3";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  void print_const_value(std::ofstream& out,
-                         std::string name,
-                         t_type* type,
-                         t_const_value* value,
-                         bool in_static,
-                         bool defval = false);
-  std::string render_const_value(ofstream& out,
-                                 std::string name,
-                                 t_type* type,
-                                 t_const_value* value);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_as3_struct(t_struct* tstruct, bool is_exception);
-
-  void generate_as3_struct_definition(std::ofstream& out,
-                                      t_struct* tstruct,
-                                      bool is_xception = false,
-                                      bool in_class = false,
-                                      bool is_result = false);
-  // removed -- equality,compare_to
-  void generate_as3_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_as3_validator(std::ofstream& out, t_struct* tstruct);
-  void generate_as3_struct_result_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_as3_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_as3_struct_tostring(std::ofstream& out, t_struct* tstruct, bool bindable);
-  void generate_as3_meta_data_map(std::ofstream& out, t_struct* tstruct);
-  void generate_field_value_meta_data(std::ofstream& out, t_type* type);
-  std::string get_as3_type_string(t_type* type);
-  void generate_reflection_setters(std::ostringstream& out,
-                                   t_type* type,
-                                   std::string field_name,
-                                   std::string cap_name);
-  void generate_reflection_getters(std::ostringstream& out,
-                                   t_type* type,
-                                   std::string field_name,
-                                   std::string cap_name);
-  void generate_generic_field_getters_setters(std::ofstream& out, t_struct* tstruct);
-  void generate_generic_isset_method(std::ofstream& out, t_struct* tstruct);
-  void generate_as3_bean_boilerplate(std::ofstream& out, t_struct* tstruct, bool bindable);
-
-  void generate_function_helpers(t_function* tfunction);
-  std::string get_cap_name(std::string name);
-  std::string generate_isset_check(t_field* field);
-  std::string generate_isset_check(std::string field);
-  void generate_isset_set(ofstream& out, t_field* field);
-  // removed std::string isset_field_id(t_field* field);
-
-  void generate_service_interface(t_service* tservice);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string iter,
-                                      std::string map);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_as3_doc(std::ofstream& out, t_doc* tdoc);
-
-  void generate_as3_doc(std::ofstream& out, t_function* tdoc);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string as3_package();
-  std::string as3_type_imports();
-  std::string as3_thrift_imports();
-  std::string as3_thrift_gen_imports(t_struct* tstruct, string& imports);
-  std::string as3_thrift_gen_imports(t_service* tservice);
-  std::string type_name(t_type* ttype, bool in_container = false, bool in_init = false);
-  std::string base_type_name(t_base_type* tbase, bool in_container = false);
-  std::string declare_field(t_field* tfield, bool init = false);
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-  std::string get_enum_class_name(t_type* type);
-
-  bool type_can_be_null(t_type* ttype) {
-    ttype = get_true_type(ttype);
-
-    return ttype->is_container() || ttype->is_struct() || ttype->is_xception()
-           || ttype->is_string();
-  }
-
-  std::string constant_name(std::string name);
-
-private:
-  /**
-   * File streams
-   */
-
-  std::string package_name_;
-  std::ofstream f_service_;
-  std::string package_dir_;
-
-  bool bindable_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_as3_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-  package_name_ = program_->get_namespace("as3");
-
-  string dir = package_name_;
-  string subdir = get_out_dir();
-  string::size_type loc;
-  while ((loc = dir.find(".")) != string::npos) {
-    subdir = subdir + "/" + dir.substr(0, loc);
-    MKDIR(subdir.c_str());
-    dir = dir.substr(loc + 1);
-  }
-  if (dir.size() > 0) {
-    subdir = subdir + "/" + dir;
-    MKDIR(subdir.c_str());
-  }
-
-  package_dir_ = subdir;
-}
-
-/**
- * Packages the generated file
- *
- * @return String of the package, i.e. "package org.apache.thriftdemo;"
- */
-string t_as3_generator::as3_package() {
-  if (!package_name_.empty()) {
-    return string("package ") + package_name_ + " ";
-  }
-  return "package ";
-}
-
-/**
- * Prints standard as3 imports
- *
- * @return List of imports for As3 types that are used in here
- */
-string t_as3_generator::as3_type_imports() {
-  return string() + "import org.apache.thrift.Set;\n" + "import flash.utils.ByteArray;\n"
-         + "import flash.utils.Dictionary;\n\n";
-}
-
-/**
- * Prints standard as3 imports
- *
- * @return List of imports necessary for thrift
- */
-string t_as3_generator::as3_thrift_imports() {
-  return string() + "import org.apache.thrift.*;\n" + "import org.apache.thrift.meta_data.*;\n"
-         + "import org.apache.thrift.protocol.*;\n\n";
-}
-
-/**
- * Prints imports needed for a given type
- *
- * @return List of imports necessary for a given t_struct
- */
-string t_as3_generator::as3_thrift_gen_imports(t_struct* tstruct, string& imports) {
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  // For each type check if it is from a differnet namespace
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_program* program = (*m_iter)->get_type()->get_program();
-    if (program != NULL && program != program_) {
-      string package = program->get_namespace("as3");
-      if (!package.empty()) {
-        if (imports.find(package + "." + (*m_iter)->get_type()->get_name()) == string::npos) {
-          imports.append("import " + package + "." + (*m_iter)->get_type()->get_name() + ";\n");
-        }
-      }
-    }
-  }
-  return imports;
-}
-
-/**
- * Prints imports needed for a given type
- *
- * @return List of imports necessary for a given t_service
- */
-string t_as3_generator::as3_thrift_gen_imports(t_service* tservice) {
-  string imports;
-  const vector<t_function*>& functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-
-  // For each type check if it is from a differnet namespace
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_program* program = (*f_iter)->get_returntype()->get_program();
-    if (program != NULL && program != program_) {
-      string package = program->get_namespace("as3");
-      if (!package.empty()) {
-        if (imports.find(package + "." + (*f_iter)->get_returntype()->get_name()) == string::npos) {
-          imports.append("import " + package + "." + (*f_iter)->get_returntype()->get_name()
-                         + ";\n");
-        }
-      }
-    }
-
-    as3_thrift_gen_imports((*f_iter)->get_arglist(), imports);
-    as3_thrift_gen_imports((*f_iter)->get_xceptions(), imports);
-  }
-
-  return imports;
-}
-
-/**
- * Nothing in As3
- */
-void t_as3_generator::close_generator() {
-}
-
-/**
- * Generates a typedef. This is not done in As3, since it does
- * not support arbitrary name replacements, and it'd be a wacky waste
- * of overhead to make wrapper classes.
- *
- * @param ttypedef The type definition
- */
-void t_as3_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Enums are a class with a set of static constants.
- *
- * @param tenum The enumeration
- */
-void t_as3_generator::generate_enum(t_enum* tenum) {
-  // Make output file
-  string f_enum_name = package_dir_ + "/" + (tenum->get_name()) + ".as";
-  ofstream f_enum;
-  f_enum.open(f_enum_name.c_str());
-
-  // Comment and package it
-  f_enum << autogen_comment() << as3_package() << endl;
-
-  scope_up(f_enum);
-  // Add as3 imports
-  f_enum << string() + "import org.apache.thrift.Set;" << endl << "import flash.utils.Dictionary;"
-         << endl;
-
-  indent(f_enum) << "public class " << tenum->get_name() << " ";
-  scope_up(f_enum);
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    indent(f_enum) << "public static const " << (*c_iter)->get_name() << ":int = " << value << ";"
-                   << endl;
-  }
-
-  // Create a static Set with all valid values for this enum
-  f_enum << endl;
-
-  indent(f_enum) << "public static const VALID_VALUES:Set = new Set(";
-  indent_up();
-  bool firstValue = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    // populate set
-    f_enum << (firstValue ? "" : ", ") << (*c_iter)->get_name();
-    firstValue = false;
-  }
-  indent_down();
-  f_enum << ");" << endl;
-
-  indent(f_enum) << "public static const VALUES_TO_NAMES:Dictionary = new Dictionary();" << endl;
-
-  scope_up(f_enum);
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    indent(f_enum) << "VALUES_TO_NAMES[" << (*c_iter)->get_name() << "] = \""
-                   << (*c_iter)->get_name() << "\";" << endl;
-  }
-  f_enum << endl;
-
-  scope_down(f_enum);
-
-  scope_down(f_enum); // end class
-
-  scope_down(f_enum); // end package
-
-  f_enum.close();
-}
-
-/**
- * Generates a class that holds all the constants.
- */
-void t_as3_generator::generate_consts(std::vector<t_const*> consts) {
-  if (consts.empty()) {
-    return;
-  }
-
-  string f_consts_name = package_dir_ + "/" + program_name_ + "Constants.as";
-  ofstream f_consts;
-  f_consts.open(f_consts_name.c_str());
-
-  // Print header
-  f_consts << autogen_comment() << as3_package();
-
-  scope_up(f_consts);
-  f_consts << endl;
-
-  f_consts << as3_type_imports();
-
-  indent(f_consts) << "public class " << program_name_ << "Constants {" << endl << endl;
-  indent_up();
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    print_const_value(f_consts,
-                      (*c_iter)->get_name(),
-                      (*c_iter)->get_type(),
-                      (*c_iter)->get_value(),
-                      false);
-  }
-  indent_down();
-  indent(f_consts) << "}" << endl;
-  scope_down(f_consts);
-  f_consts.close();
-}
-
-void t_as3_generator::print_const_value(std::ofstream& out,
-                                        string name,
-                                        t_type* type,
-                                        t_const_value* value,
-                                        bool in_static,
-                                        bool defval) {
-  type = get_true_type(type);
-
-  indent(out);
-  if (!defval) {
-    out << (in_static ? "var " : "public static const ");
-  }
-  if (type->is_base_type()) {
-    string v2 = render_const_value(out, name, type, value);
-    out << name;
-    if (!defval) {
-      out << ":" << type_name(type);
-    }
-    out << " = " << v2 << ";" << endl << endl;
-  } else if (type->is_enum()) {
-    out << name;
-    if (!defval) {
-      out << ":" << type_name(type);
-    }
-    out << " = " << value->get_integer() << ";" << endl << endl;
-  } else if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    out << name << ":" << type_name(type) << " = new " << type_name(type, false, true) << "();"
-        << endl;
-    if (!in_static) {
-      indent(out) << "{" << endl;
-      indent_up();
-      indent(out) << "new function():void {" << endl;
-      indent_up();
-    }
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string val = render_const_value(out, name, field_type, v_iter->second);
-      indent(out) << name << ".";
-      out << v_iter->first->get_string() << " = " << val << ";" << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}();" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else if (type->is_map()) {
-    out << name;
-    if (!defval) {
-      out << ":" << type_name(type);
-    }
-    out << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "{" << endl;
-      indent_up();
-      indent(out) << "new function():void {" << endl;
-      indent_up();
-    }
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(out, name, ktype, v_iter->first);
-      string val = render_const_value(out, name, vtype, v_iter->second);
-      indent(out) << name << "[" << key << "] = " << val << ";" << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}();" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else if (type->is_list() || type->is_set()) {
-    out << name;
-    if (!defval) {
-      out << ":" << type_name(type);
-    }
-    out << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "{" << endl;
-      indent_up();
-      indent(out) << "new function():void {" << endl;
-      indent_up();
-    }
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(out, name, etype, *v_iter);
-      indent(out) << name << "." << (type->is_list() ? "push" : "add") << "(" << val << ");"
-                  << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}();" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else {
-    throw "compiler error: no const of type " + type->get_name();
-  }
-}
-
-string t_as3_generator::render_const_value(ofstream& out,
-                                           string name,
-                                           t_type* type,
-                                           t_const_value* value) {
-  (void)name;
-  type = get_true_type(type);
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-      render << "(byte)" << value->get_integer();
-      break;
-    case t_base_type::TYPE_I16:
-      render << "(short)" << value->get_integer();
-      break;
-    case t_base_type::TYPE_I32:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_I64:
-      render << value->get_integer() << "L";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << "(double)" << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << value->get_integer();
-  } else {
-    string t = tmp("tmp");
-    print_const_value(out, t, type, value, true);
-    render << t;
-  }
-
-  return render.str();
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is a class
- * with data members, read(), write(), and an inner Isset class.
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_struct(t_struct* tstruct) {
-  generate_as3_struct(tstruct, false);
-}
-
-/**
- * Exceptions are structs, but they inherit from Exception
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_xception(t_struct* txception) {
-  generate_as3_struct(txception, true);
-}
-
-/**
- * As3 struct definition.
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_as3_struct(t_struct* tstruct, bool is_exception) {
-  // Make output file
-  string f_struct_name = package_dir_ + "/" + (tstruct->get_name()) + ".as";
-  ofstream f_struct;
-  f_struct.open(f_struct_name.c_str());
-
-  f_struct << autogen_comment() << as3_package();
-
-  scope_up(f_struct);
-  f_struct << endl;
-
-  string imports;
-
-  f_struct << as3_type_imports() << as3_thrift_imports() << as3_thrift_gen_imports(tstruct, imports)
-           << endl;
-
-  if (bindable_ && !is_exception) {
-    f_struct << "import flash.events.Event;" << endl << "import flash.events.EventDispatcher;"
-             << endl << "import mx.events.PropertyChangeEvent;" << endl;
-  }
-
-  generate_as3_struct_definition(f_struct, tstruct, is_exception);
-
-  scope_down(f_struct); // end of package
-  f_struct.close();
-}
-
-/**
- * As3 struct definition. This has various parameters, as it could be
- * generated standalone or inside another class as a helper. If it
- * is a helper than it is a static class.
- *
- * @param tstruct      The struct definition
- * @param is_exception Is this an exception?
- * @param in_class     If inside a class, needs to be static class
- * @param is_result    If this is a result it needs a different writer
- */
-void t_as3_generator::generate_as3_struct_definition(ofstream& out,
-                                                     t_struct* tstruct,
-                                                     bool is_exception,
-                                                     bool in_class,
-                                                     bool is_result) {
-  generate_as3_doc(out, tstruct);
-
-  bool is_final = (tstruct->annotations_.find("final") != tstruct->annotations_.end());
-  bool bindable = !is_exception && !in_class && bindable_;
-
-  indent(out) << (in_class ? "" : "public ") << (is_final ? "final " : "") << "class "
-              << tstruct->get_name() << " ";
-
-  if (is_exception) {
-    out << "extends Error ";
-  } else if (bindable) {
-    out << "extends EventDispatcher ";
-  }
-  out << "implements TBase ";
-
-  scope_up(out);
-
-  indent(out) << "private static const STRUCT_DESC:TStruct = new TStruct(\"" << tstruct->get_name()
-              << "\");" << endl;
-
-  // Members are public for -as3, private for -as3bean
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "private static const " << constant_name((*m_iter)->get_name())
-                << "_FIELD_DESC:TField = new TField(\"" << (*m_iter)->get_name() << "\", "
-                << type_to_enum((*m_iter)->get_type()) << ", " << (*m_iter)->get_key() << ");"
-                << endl;
-  }
-
-  out << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    generate_as3_doc(out, *m_iter);
-    indent(out) << "private var _" << (*m_iter)->get_name() + ":" + type_name((*m_iter)->get_type())
-                << ";" << endl;
-
-    indent(out) << "public static const " << upcase_string((*m_iter)->get_name())
-                << ":int = " << (*m_iter)->get_key() << ";" << endl;
-  }
-
-  out << endl;
-
-  // Inner Isset class
-  if (members.size() > 0) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (!type_can_be_null((*m_iter)->get_type())) {
-        indent(out) << "private var __isset_" << (*m_iter)->get_name() << ":Boolean = false;"
-                    << endl;
-      }
-    }
-  }
-
-  out << endl;
-
-  generate_as3_meta_data_map(out, tstruct);
-
-  // Static initializer to populate global class to struct metadata map
-  indent(out) << "{" << endl;
-  indent_up();
-  indent(out) << "FieldMetaData.addStructMetaDataMap(" << type_name(tstruct) << ", metaDataMap);"
-              << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  // Default constructor
-  indent(out) << "public function " << tstruct->get_name() << "() {" << endl;
-  indent_up();
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if ((*m_iter)->get_value() != NULL) {
-      indent(out) << "this._" << (*m_iter)->get_name() << " = "
-                  << (*m_iter)->get_value()->get_integer() << ";" << endl;
-    }
-  }
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  generate_as3_bean_boilerplate(out, tstruct, bindable);
-  generate_generic_field_getters_setters(out, tstruct);
-  generate_generic_isset_method(out, tstruct);
-
-  generate_as3_struct_reader(out, tstruct);
-  if (is_result) {
-    generate_as3_struct_result_writer(out, tstruct);
-  } else {
-    generate_as3_struct_writer(out, tstruct);
-  }
-  generate_as3_struct_tostring(out, tstruct, bindable);
-  generate_as3_validator(out, tstruct);
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generates a function to read all the fields of the struct.
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_as3_struct_reader(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public function read(iprot:TProtocol):void {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Declare stack tmp variables and read struct header
-  out << indent() << "var field:TField;" << endl << indent() << "iprot.readStructBegin();" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (true)" << endl;
-  scope_up(out);
-
-  // Read beginning field marker
-  indent(out) << "field = iprot.readFieldBegin();" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if (field.type == TType.STOP) { " << endl;
-  indent_up();
-  indent(out) << "break;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  // Switch statement on the field we are reading
-  indent(out) << "switch (field.id)" << endl;
-
-  scope_up(out);
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << upcase_string((*f_iter)->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << "if (field.type == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-    indent_up();
-
-    generate_deserialize_field(out, *f_iter, "this.");
-    generate_isset_set(out, *f_iter);
-    indent_down();
-    out << indent() << "} else { " << endl << indent() << "  TProtocolUtil.skip(iprot, field.type);"
-        << endl << indent() << "}" << endl << indent() << "break;" << endl;
-    indent_down();
-  }
-
-  // In the default case we skip the field
-  out << indent() << "default:" << endl << indent() << "  TProtocolUtil.skip(iprot, field.type);"
-      << endl << indent() << "  break;" << endl;
-
-  scope_down(out);
-
-  // Read field end marker
-  indent(out) << "iprot.readFieldEnd();" << endl;
-
-  scope_down(out);
-
-  out << indent() << "iprot.readStructEnd();" << endl << endl;
-
-  // in non-beans style, check for required fields of primitive type
-  // (which can be checked here but not in the general validate method)
-  out << endl << indent() << "// check for required fields of primitive type, which can't be "
-                             "checked in the validate method" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED && !type_can_be_null((*f_iter)->get_type())) {
-      out << indent() << "if (!__isset_" << (*f_iter)->get_name() << ") {" << endl << indent()
-          << "  throw new TProtocolError(TProtocolError.UNKNOWN, \"Required field '"
-          << (*f_iter)->get_name()
-          << "' was not found in serialized data! Struct: \" + toString());" << endl << indent()
-          << "}" << endl;
-    }
-  }
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "validate();" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-// generates as3 method to perform various checks
-// (e.g. check that all required fields are set)
-void t_as3_generator::generate_as3_validator(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public function validate():void {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << indent() << "// check for required fields" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      if (type_can_be_null((*f_iter)->get_type())) {
-        indent(out) << "if (" << (*f_iter)->get_name() << " == null) {" << endl;
-        indent(out) << "  throw new TProtocolError(TProtocolError.UNKNOWN, \"Required field '"
-                    << (*f_iter)->get_name() << "' was not present! Struct: \" + toString());"
-                    << endl;
-        indent(out) << "}" << endl;
-      } else {
-        indent(out) << "// alas, we cannot check '" << (*f_iter)->get_name()
-                    << "' because it's a primitive and you chose the non-beans generator." << endl;
-      }
-    }
-  }
-
-  // check that fields of type enum have valid values
-  out << indent() << "// check that fields of type enum have valid values" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = (*f_iter);
-    t_type* type = field->get_type();
-    // if field is an enum, check that its value is valid
-    if (type->is_enum()) {
-      indent(out) << "if (" << generate_isset_check(field) << " && !" << get_enum_class_name(type)
-                  << ".VALID_VALUES.contains(" << field->get_name() << ")){" << endl;
-      indent_up();
-      indent(out) << "throw new TProtocolError(TProtocolError.UNKNOWN, \"The field '"
-                  << field->get_name() << "' has been assigned the invalid value \" + "
-                  << field->get_name() << ");" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_as3_struct_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public function write(oprot:TProtocol):void {" << endl;
-  indent_up();
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "validate();" << endl << endl;
-
-  indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool could_be_unset = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (could_be_unset) {
-      indent(out) << "if (" << generate_isset_check(*f_iter) << ") {" << endl;
-      indent_up();
-    }
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    if (null_allowed) {
-      out << indent() << "if (this." << (*f_iter)->get_name() << " != null) {" << endl;
-      indent_up();
-    }
-
-    indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    if (null_allowed) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    if (could_be_unset) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-  // Write the struct map
-  out << indent() << "oprot.writeFieldStop();" << endl << indent() << "oprot.writeStructEnd();"
-      << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct,
- * which is a function result. These fields are only written
- * if they are set in the Isset array, and only one of them
- * can be set at a time.
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_as3_struct_result_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public function write(oprot:TProtocol):void {" << endl;
-  indent_up();
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      out << endl << indent() << "if ";
-    } else {
-      out << " else if ";
-    }
-
-    out << "(this." << generate_isset_check(*f_iter) << ") {" << endl;
-
-    indent_up();
-
-    indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    indent_down();
-    indent(out) << "}";
-  }
-  // Write the struct map
-  out << endl << indent() << "oprot.writeFieldStop();" << endl << indent()
-      << "oprot.writeStructEnd();" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-void t_as3_generator::generate_reflection_getters(ostringstream& out,
-                                                  t_type* type,
-                                                  string field_name,
-                                                  string cap_name) {
-  (void)type;
-  (void)cap_name;
-  indent(out) << "case " << upcase_string(field_name) << ":" << endl;
-  indent_up();
-  indent(out) << "return this." << field_name << ";" << endl;
-  indent_down();
-}
-
-void t_as3_generator::generate_reflection_setters(ostringstream& out,
-                                                  t_type* type,
-                                                  string field_name,
-                                                  string cap_name) {
-  (void)type;
-  (void)cap_name;
-  indent(out) << "case " << upcase_string(field_name) << ":" << endl;
-  indent_up();
-  indent(out) << "if (value == null) {" << endl;
-  indent(out) << "  unset" << get_cap_name(field_name) << "();" << endl;
-  indent(out) << "} else {" << endl;
-  indent(out) << "  this." << field_name << " = value;" << endl;
-  indent(out) << "}" << endl;
-  indent(out) << "break;" << endl << endl;
-
-  indent_down();
-}
-
-void t_as3_generator::generate_generic_field_getters_setters(std::ofstream& out,
-                                                             t_struct* tstruct) {
-
-  std::ostringstream getter_stream;
-  std::ostringstream setter_stream;
-
-  // build up the bodies of both the getter and setter at once
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = get_cap_name(field_name);
-
-    indent_up();
-    generate_reflection_setters(setter_stream, type, field_name, cap_name);
-    generate_reflection_getters(getter_stream, type, field_name, cap_name);
-    indent_down();
-  }
-
-  // create the setter
-  indent(out) << "public function setFieldValue(fieldID:int, value:*):void {" << endl;
-  indent_up();
-
-  indent(out) << "switch (fieldID) {" << endl;
-
-  out << setter_stream.str();
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  // create the getter
-  indent(out) << "public function getFieldValue(fieldID:int):* {" << endl;
-  indent_up();
-
-  indent(out) << "switch (fieldID) {" << endl;
-
-  out << getter_stream.str();
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-
-  indent(out) << "}" << endl;
-
-  indent_down();
-
-  indent(out) << "}" << endl << endl;
-}
-
-// Creates a generic isSet method that takes the field number as argument
-void t_as3_generator::generate_generic_isset_method(std::ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // create the isSet method
-  indent(out) << "// Returns true if field corresponding to fieldID is set (has been assigned a "
-                 "value) and false otherwise" << endl;
-  indent(out) << "public function isSet(fieldID:int):Boolean {" << endl;
-  indent_up();
-  indent(out) << "switch (fieldID) {" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    indent(out) << "case " << upcase_string(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << "return " << generate_isset_check(field) << ";" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a set of As3 Bean boilerplate functions (setters, getters, etc.)
- * for the given struct.
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_as3_bean_boilerplate(ofstream& out,
-                                                    t_struct* tstruct,
-                                                    bool bindable) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = get_cap_name(field_name);
-
-    // Simple getter
-    generate_as3_doc(out, field);
-    indent(out) << "public function get " << field_name << "():" << type_name(type) << " {" << endl;
-    indent_up();
-    indent(out) << "return this._" << field_name << ";" << endl;
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // Simple setter
-    generate_as3_doc(out, field);
-    std::string propName = tmp("thriftPropertyChange");
-    if (bindable) {
-      indent(out) << "[Bindable(event=\"" << propName << "\")]" << endl;
-    }
-    indent(out) << "public function set " << field_name << "(" << field_name << ":"
-                << type_name(type) << "):void {" << endl;
-    indent_up();
-    indent(out) << "this._" << field_name << " = " << field_name << ";" << endl;
-    generate_isset_set(out, field);
-
-    if (bindable) {
-      // We have to use a custom event rather than the default, because if you use the default,
-      // the setter only gets called if the value has changed - this means calling
-      // foo.setIntValue(0)
-      // will not cause foo.isIntValueSet() to return true since the value of foo._intValue wasn't
-      // changed
-      // so the setter was never called.
-      indent(out) << "dispatchEvent(new Event(\"" << propName << "\"));" << endl;
-
-      // However, if you just use a custom event, then collections won't be able to detect when
-      // elements
-      // in the collections have changed since they listed for PropertyChangeEvents.  So, we
-      // dispatch both.
-      indent(out) << "dispatchEvent(new PropertyChangeEvent(PropertyChangeEvent.PROPERTY_CHANGE));"
-                  << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // Unsetter
-    indent(out) << "public function unset" << cap_name << "():void {" << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "this." << field_name << " = null;" << endl;
-    } else {
-      indent(out) << "this.__isset_" << field_name << " = false;" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // isSet method
-    indent(out) << "// Returns true if field " << field_name
-                << " is set (has been assigned a value) and false otherwise" << endl;
-    indent(out) << "public function is" << get_cap_name("set") << cap_name << "():Boolean {"
-                << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "return this." << field_name << " != null;" << endl;
-    } else {
-      indent(out) << "return this.__isset_" << field_name << ";" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-}
-
-/**
- * Generates a toString() method for the given struct
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_as3_struct_tostring(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   bool bindable) {
-  // If it's bindable, it extends EventDispatcher so toString is an override.
-  out << indent() << "public " << (bindable ? "override " : "") << "function toString():String {"
-      << endl;
-  indent_up();
-
-  out << indent() << "var ret:String = new String(\"" << tstruct->get_name() << "(\");" << endl;
-  out << indent() << "var first:Boolean = true;" << endl << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool could_be_unset = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (could_be_unset) {
-      indent(out) << "if (" << generate_isset_check(*f_iter) << ") {" << endl;
-      indent_up();
-    }
-
-    t_field* field = (*f_iter);
-
-    if (!first) {
-      indent(out) << "if (!first) ret +=  \", \";" << endl;
-    }
-    indent(out) << "ret += \"" << (*f_iter)->get_name() << ":\";" << endl;
-    bool can_be_null = type_can_be_null(field->get_type());
-    if (can_be_null) {
-      indent(out) << "if (this." << (*f_iter)->get_name() << " == null) {" << endl;
-      indent(out) << "  ret += \"null\";" << endl;
-      indent(out) << "} else {" << endl;
-      indent_up();
-    }
-
-    if (field->get_type()->is_base_type() && ((t_base_type*)(field->get_type()))->is_binary()) {
-      indent(out) << "  ret += \"BINARY\";" << endl;
-    } else if (field->get_type()->is_enum()) {
-      indent(out) << "var " << field->get_name()
-                  << "_name:String = " << get_enum_class_name(field->get_type())
-                  << ".VALUES_TO_NAMES[this." << (*f_iter)->get_name() << "];" << endl;
-      indent(out) << "if (" << field->get_name() << "_name != null) {" << endl;
-      indent(out) << "  ret += " << field->get_name() << "_name;" << endl;
-      indent(out) << "  ret += \" (\";" << endl;
-      indent(out) << "}" << endl;
-      indent(out) << "ret += this." << field->get_name() << ";" << endl;
-      indent(out) << "if (" << field->get_name() << "_name != null) {" << endl;
-      indent(out) << "  ret += \")\";" << endl;
-      indent(out) << "}" << endl;
-    } else {
-      indent(out) << "ret += this." << (*f_iter)->get_name() << ";" << endl;
-    }
-
-    if (can_be_null) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    indent(out) << "first = false;" << endl;
-
-    if (could_be_unset) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    first = false;
-  }
-  out << indent() << "ret += \")\";" << endl << indent() << "return ret;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a static map with meta data to store information such as fieldID to
- * fieldName mapping
- *
- * @param tstruct The struct definition
- */
-void t_as3_generator::generate_as3_meta_data_map(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Static Map with fieldID -> FieldMetaData mappings
-  indent(out) << "public static const metaDataMap:Dictionary = new Dictionary();" << endl;
-
-  if (fields.size() > 0) {
-    // Populate map
-    scope_up(out);
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      t_field* field = *f_iter;
-      std::string field_name = field->get_name();
-      indent(out) << "metaDataMap[" << upcase_string(field_name) << "] = new FieldMetaData(\""
-                  << field_name << "\", ";
-
-      // Set field requirement type (required, optional, etc.)
-      if (field->get_req() == t_field::T_REQUIRED) {
-        out << "TFieldRequirementType.REQUIRED, ";
-      } else if (field->get_req() == t_field::T_OPTIONAL) {
-        out << "TFieldRequirementType.OPTIONAL, ";
-      } else {
-        out << "TFieldRequirementType.DEFAULT, ";
-      }
-
-      // Create value meta data
-      generate_field_value_meta_data(out, field->get_type());
-      out << ");" << endl;
-    }
-    scope_down(out);
-  }
-}
-
-/**
- * Returns a string with the as3 representation of the given thrift type
- * (e.g. for the type struct it returns "TType.STRUCT")
- */
-std::string t_as3_generator::get_as3_type_string(t_type* type) {
-  if (type->is_list()) {
-    return "TType.LIST";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_typedef()) {
-    return get_as3_type_string(((t_typedef*)type)->get_type());
-  } else if (type->is_base_type()) {
-    switch (((t_base_type*)type)->get_base()) {
-    case t_base_type::TYPE_VOID:
-      return "TType.VOID";
-      break;
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-      break;
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-      break;
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-      break;
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-      break;
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-      break;
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-      break;
-    default:
-      throw std::runtime_error("Unknown thrift type \"" + type->get_name()
-                               + "\" passed to t_as3_generator::get_as3_type_string!");
-      break; // This should never happen!
-    }
-  } else {
-    throw std::runtime_error(
-        "Unknown thrift type \"" + type->get_name()
-        + "\" passed to t_as3_generator::get_as3_type_string!"); // This should never happen!
-  }
-}
-
-void t_as3_generator::generate_field_value_meta_data(std::ofstream& out, t_type* type) {
-  out << endl;
-  indent_up();
-  indent_up();
-  if (type->is_struct() || type->is_xception()) {
-    indent(out) << "new StructMetaData(TType.STRUCT, " << type_name(type);
-  } else if (type->is_container()) {
-    if (type->is_list()) {
-      indent(out) << "new ListMetaData(TType.LIST, ";
-      t_type* elem_type = ((t_list*)type)->get_elem_type();
-      generate_field_value_meta_data(out, elem_type);
-    } else if (type->is_set()) {
-      indent(out) << "new SetMetaData(TType.SET, ";
-      t_type* elem_type = ((t_list*)type)->get_elem_type();
-      generate_field_value_meta_data(out, elem_type);
-    } else { // map
-      indent(out) << "new MapMetaData(TType.MAP, ";
-      t_type* key_type = ((t_map*)type)->get_key_type();
-      t_type* val_type = ((t_map*)type)->get_val_type();
-      generate_field_value_meta_data(out, key_type);
-      out << ", ";
-      generate_field_value_meta_data(out, val_type);
-    }
-  } else {
-    indent(out) << "new FieldValueMetaData(" << get_as3_type_string(type);
-  }
-  out << ")";
-  indent_down();
-  indent_down();
-}
-
-/**
- * Generates a thrift service. In C++, this comprises an entirely separate
- * header and source file. The header file defines the methods and includes
- * the data types defined in the main header file, and the implementation
- * file contains implementations of the basic printer and default interfaces.
- *
- * @param tservice The service definition
- */
-void t_as3_generator::generate_service(t_service* tservice) {
-  // Make interface file
-  string f_service_name = package_dir_ + "/" + service_name_ + ".as";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << as3_package();
-
-  scope_up(f_service_);
-
-  f_service_ << endl << as3_type_imports() << as3_thrift_imports()
-             << as3_thrift_gen_imports(tservice);
-
-  if (tservice->get_extends() != NULL) {
-    t_type* parent = tservice->get_extends();
-    string parent_namespace = parent->get_program()->get_namespace("as3");
-    if (!parent_namespace.empty() && parent_namespace != package_name_) {
-      f_service_ << "import " << type_name(parent) << ";" << endl;
-    }
-  }
-
-  f_service_ << endl;
-
-  generate_service_interface(tservice);
-
-  scope_down(f_service_);
-  f_service_.close();
-
-  // Now make the implementation/client file
-  f_service_name = package_dir_ + "/" + service_name_ + "Impl.as";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << as3_package();
-
-  scope_up(f_service_);
-
-  f_service_ << endl << as3_type_imports() << as3_thrift_imports()
-             << as3_thrift_gen_imports(tservice);
-
-  if (tservice->get_extends() != NULL) {
-    t_type* parent = tservice->get_extends();
-    string parent_namespace = parent->get_program()->get_namespace("as3");
-    if (!parent_namespace.empty() && parent_namespace != package_name_) {
-      f_service_ << "import " << type_name(parent) << "Impl;" << endl;
-    }
-  }
-
-  f_service_ << endl;
-
-  generate_service_client(tservice);
-  scope_down(f_service_);
-
-  f_service_ << as3_type_imports();
-  f_service_ << as3_thrift_imports();
-  f_service_ << as3_thrift_gen_imports(tservice);
-  if (!package_name_.empty()) {
-    f_service_ << "import " << package_name_ << ".*;" << endl;
-  }
-
-  generate_service_helpers(tservice);
-
-  f_service_.close();
-
-  // Now make the processor/server file
-  f_service_name = package_dir_ + "/" + service_name_ + "Processor.as";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << as3_package();
-
-  scope_up(f_service_);
-
-  f_service_ << endl << as3_type_imports() << as3_thrift_imports()
-             << as3_thrift_gen_imports(tservice) << endl;
-
-  generate_service_server(tservice);
-  scope_down(f_service_);
-
-  f_service_ << as3_type_imports();
-  f_service_ << as3_thrift_imports();
-  f_service_ << as3_thrift_gen_imports(tservice) << endl;
-  if (!package_name_.empty()) {
-    f_service_ << "import " << package_name_ << ".*;" << endl;
-  }
-
-  generate_service_helpers(tservice);
-
-  f_service_.close();
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_as3_generator::generate_service_interface(t_service* tservice) {
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends_iface = " extends " + tservice->get_extends()->get_name();
-  }
-
-  generate_as3_doc(f_service_, tservice);
-  f_service_ << indent() << "public interface " << service_name_ << extends_iface << " {" << endl
-             << endl;
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_as3_doc(f_service_, *f_iter);
-    if (!(*f_iter)->is_oneway()) {
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "//function onError(Error):void;" << endl;
-        indent(f_service_) << "//function onSuccess():void;" << endl;
-      } else {
-        indent(f_service_) << "//function onError(Error):void;" << endl;
-        indent(f_service_) << "//function onSuccess(" << type_name((*f_iter)->get_returntype())
-                           << "):void;" << endl;
-      }
-    }
-    indent(f_service_) << function_signature(*f_iter) << ";" << endl << endl;
-  }
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates structs for all the service args and return types
- *
- * @param tservice The service
- */
-void t_as3_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_as3_struct_definition(f_service_, ts, false, true);
-    generate_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_as3_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = tservice->get_extends()->get_name();
-    extends_client = " extends " + extends + "Impl";
-  }
-
-  indent(f_service_) << "public class " << service_name_ << "Impl" << extends_client
-                     << " implements " << service_name_ << " {" << endl;
-  indent_up();
-
-  indent(f_service_) << "public function " << service_name_ << "Impl"
-                     << "(iprot:TProtocol, oprot:TProtocol=null)" << endl;
-  scope_up(f_service_);
-  if (extends.empty()) {
-    f_service_ << indent() << "iprot_ = iprot;" << endl;
-    f_service_ << indent() << "if (oprot == null) {" << endl;
-    indent_up();
-    f_service_ << indent() << "oprot_ = iprot;" << endl;
-    indent_down();
-    f_service_ << indent() << "} else {" << endl;
-    indent_up();
-    f_service_ << indent() << "oprot_ = oprot;" << endl;
-    indent_down();
-    f_service_ << indent() << "}";
-  } else {
-    f_service_ << indent() << "super(iprot, oprot);" << endl;
-  }
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent() << "protected var iprot_:TProtocol;" << endl << indent()
-               << "protected var oprot_:TProtocol;" << endl << endl << indent()
-               << "protected var seqid_:int;" << endl << endl;
-
-    indent(f_service_) << "public function getInputProtocol():TProtocol" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "return this.iprot_;" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    indent(f_service_) << "public function getOutputProtocol():TProtocol" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "return this.oprot_;" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-  }
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-
-    // Open function
-    if (!(*f_iter)->is_oneway()) {
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "//function onError(Error):void;" << endl;
-        indent(f_service_) << "//function onSuccess():void;" << endl;
-      } else {
-        indent(f_service_) << "//function onError(Error):void;" << endl;
-        indent(f_service_) << "//function onSuccess(" << type_name((*f_iter)->get_returntype())
-                           << "):void;" << endl;
-      }
-    }
-    indent(f_service_) << "public " << function_signature(*f_iter) << endl;
-    scope_up(f_service_);
-
-    // Get the struct of function call params
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-
-    string argsname = (*f_iter)->get_name() + "_args";
-    vector<t_field*>::const_iterator fld_iter;
-    const vector<t_field*>& fields = arg_struct->get_members();
-
-    // Serialize the request
-    f_service_ << indent() << "oprot_.writeMessageBegin(new TMessage(\"" << funname << "\", "
-               << ((*f_iter)->is_oneway() ? "TMessageType.ONEWAY" : "TMessageType.CALL")
-               << ", seqid_));" << endl << indent() << "var args:" << argsname << " = new "
-               << argsname << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "args." << (*fld_iter)->get_name() << " = "
-                 << (*fld_iter)->get_name() << ";" << endl;
-    }
-
-    f_service_ << indent() << "args.write(oprot_);" << endl << indent()
-               << "oprot_.writeMessageEnd();" << endl;
-
-    if ((*f_iter)->is_oneway()) {
-      f_service_ << indent() << "oprot_.getTransport().flush();" << endl;
-    } else {
-      f_service_ << indent() << "oprot_.getTransport().flush(function(error:Error):void {" << endl;
-      indent_up();
-      f_service_ << indent() << "try {" << endl;
-      indent_up();
-      string resultname = (*f_iter)->get_name() + "_result";
-      f_service_ << indent() << "if (error != null) {" << endl << indent()
-                 << "  if (onError != null) onError(error);" << endl << indent() << "  return;"
-                 << endl << indent() << "}" << endl << indent()
-                 << "var msg:TMessage = iprot_.readMessageBegin();" << endl << indent()
-                 << "if (msg.type == TMessageType.EXCEPTION) {" << endl << indent()
-                 << "  var x:TApplicationError = TApplicationError.read(iprot_);" << endl
-                 << indent() << "  iprot_.readMessageEnd();" << endl << indent()
-                 << "  if (onError != null) onError(x);" << endl << indent() << "  return;" << endl
-                 << indent() << "}" << endl << indent() << "var result :" << resultname << " = new "
-                 << resultname << "();" << endl << indent() << "result.read(iprot_);" << endl
-                 << indent() << "iprot_.readMessageEnd();" << endl;
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << indent() << "if (result." << generate_isset_check("success") << ") {" << endl
-                   << indent() << "  if (onSuccess != null) onSuccess(result.success);" << endl
-                   << indent() << "  return;" << endl << indent() << "}" << endl;
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "if (result." << (*x_iter)->get_name() << " != null) {" << endl
-                   << indent() << "  if (onError != null) onError(result." << (*x_iter)->get_name()
-                   << ");" << endl << indent() << "  return;" << endl << indent() << "}" << endl;
-      }
-
-      // If you get here it's an exception, unless a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        f_service_ << indent() << "if (onSuccess != null) onSuccess();" << endl << indent()
-                   << "return;" << endl;
-      } else {
-
-        f_service_ << indent() << "if (onError != null) onError(new "
-                                  "TApplicationError(TApplicationError.MISSING_RESULT, \""
-                   << (*f_iter)->get_name() << " failed: unknown result\"));" << endl;
-      }
-      indent_down();
-      f_service_ << indent() << "} catch (e:TError) {" << endl << indent()
-                 << "  if (onError != null) onError(e);" << endl << indent() << "}" << endl;
-
-      indent_down();
-      indent(f_service_) << "});" << endl;
-    }
-    // Close function
-    scope_down(f_service_);
-    f_service_ << endl;
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl;
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_as3_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  // Extends stuff
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_processor = " extends " + extends + "Processor";
-  }
-
-  // Generate the header portion
-  indent(f_service_) << "public class " << service_name_ << "Processor" << extends_processor
-                     << " implements TProcessor {" << endl;
-  indent_up();
-
-  indent(f_service_) << "public function " << service_name_ << "Processor(iface:" << service_name_
-                     << ")" << endl;
-  scope_up(f_service_);
-  if (!extends.empty()) {
-    f_service_ << indent() << "super(iface);" << endl;
-  }
-  f_service_ << indent() << "iface_ = iface;" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << indent() << "PROCESS_MAP[\"" << (*f_iter)->get_name()
-               << "\"] = " << (*f_iter)->get_name() << "();" << endl;
-  }
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  f_service_ << indent() << "private var iface_:" << service_name_ << ";" << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent() << "protected const PROCESS_MAP:Dictionary = new Dictionary();" << endl;
-  }
-
-  f_service_ << endl;
-
-  // Generate the server implementation
-  string override = "";
-  if (tservice->get_extends() != NULL) {
-    override = "override ";
-  }
-  indent(f_service_) << override
-                     << "public function process(iprot:TProtocol, oprot:TProtocol):Boolean" << endl;
-  scope_up(f_service_);
-
-  f_service_ << indent() << "var msg:TMessage = iprot.readMessageBegin();" << endl;
-
-  // TODO(mcslee): validate message, was the seqid etc. legit?
-  // AS- If all method is oneway:
-  // do you have an oprot?
-  // do you you need nullcheck?
-  f_service_
-      << indent() << "var fn:Function = PROCESS_MAP[msg.name];" << endl << indent()
-      << "if (fn == null) {" << endl << indent() << "  TProtocolUtil.skip(iprot, TType.STRUCT);"
-      << endl << indent() << "  iprot.readMessageEnd();" << endl << indent()
-      << "  var x:TApplicationError = new TApplicationError(TApplicationError.UNKNOWN_METHOD, "
-         "\"Invalid method name: '\"+msg.name+\"'\");" << endl << indent()
-      << "  oprot.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));"
-      << endl << indent() << "  x.write(oprot);" << endl << indent() << "  oprot.writeMessageEnd();"
-      << endl << indent() << "  oprot.getTransport().flush();" << endl << indent()
-      << "  return true;" << endl << indent() << "}" << endl << indent()
-      << "fn.call(this,msg.seqid, iprot, oprot);" << endl;
-
-  f_service_ << indent() << "return true;" << endl;
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_as3_generator::generate_function_helpers(t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  t_struct result(program_, tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_as3_struct_definition(f_service_, &result, false, true, true);
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_as3_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  // Open class
-  indent(f_service_) << "private function " << tfunction->get_name() << "():Function {" << endl;
-  indent_up();
-
-  // Open function
-  indent(f_service_) << "return function(seqid:int, iprot:TProtocol, oprot:TProtocol):void" << endl;
-  scope_up(f_service_);
-
-  string argsname = tfunction->get_name() + "_args";
-  string resultname = tfunction->get_name() + "_result";
-
-  f_service_ << indent() << "var args:" << argsname << " = new " << argsname << "();" << endl
-             << indent() << "args.read(iprot);" << endl << indent() << "iprot.readMessageEnd();"
-             << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Declare result for non oneway function
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << "var result:" << resultname << " = new " << resultname << "();"
-               << endl;
-  }
-
-  // Try block for a function with exceptions
-  if (xceptions.size() > 0) {
-    f_service_ << indent() << "try {" << endl;
-    indent_up();
-  }
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  f_service_ << indent();
-  if (tfunction->is_oneway()) {
-    f_service_ << "iface_." << tfunction->get_name() << "(";
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << "args." << (*f_iter)->get_name();
-    }
-    f_service_ << ");" << endl;
-  } else {
-    f_service_ << "// sorry this operation is not supported yet" << endl;
-    f_service_ << indent() << "throw new Error(\"This is not yet supported\");" << endl;
-  }
-
-  // Set isset on success field
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()
-      && !type_can_be_null(tfunction->get_returntype())) {
-    f_service_ << indent() << "result.set" << get_cap_name("success") << get_cap_name("isSet")
-               << "(true);" << endl;
-  }
-
-  if (!tfunction->is_oneway() && xceptions.size() > 0) {
-    indent_down();
-    f_service_ << indent() << "}";
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << " catch (" << (*x_iter)->get_name() << ":"
-                 << type_name((*x_iter)->get_type(), false, false) << ") {" << endl;
-      if (!tfunction->is_oneway()) {
-        indent_up();
-        f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
-                   << (*x_iter)->get_name() << ";" << endl;
-        indent_down();
-        f_service_ << indent() << "}";
-      } else {
-        f_service_ << "}";
-      }
-    }
-    f_service_ << " catch (th:Error) {" << endl;
-    indent_up();
-    f_service_ << indent() << "trace(\"Internal error processing " << tfunction->get_name()
-               << "\", th);" << endl << indent()
-               << "var x:TApplicationError = new "
-                  "TApplicationError(TApplicationError.INTERNAL_ERROR, \"Internal error processing "
-               << tfunction->get_name() << "\");" << endl << indent()
-               << "oprot.writeMessageBegin(new TMessage(\"" << tfunction->get_name()
-               << "\", TMessageType.EXCEPTION, seqid));" << endl << indent() << "x.write(oprot);"
-               << endl << indent() << "oprot.writeMessageEnd();" << endl << indent()
-               << "oprot.getTransport().flush();" << endl << indent() << "return;" << endl;
-    indent_down();
-    f_service_ << indent() << "}" << endl;
-  }
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    f_service_ << indent() << "return;" << endl;
-    scope_down(f_service_);
-
-    // Close class
-    indent_down();
-    f_service_ << indent() << "}" << endl << endl;
-    return;
-  }
-
-  f_service_ << indent() << "oprot.writeMessageBegin(new TMessage(\"" << tfunction->get_name()
-             << "\", TMessageType.REPLY, seqid));" << endl << indent() << "result.write(oprot);"
-             << endl << indent() << "oprot.writeMessageEnd();" << endl << indent()
-             << "oprot.getTransport().flush();" << endl;
-
-  // Close function
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Close class
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Deserializes a field of any type.
- *
- * @param tfield The field
- * @param prefix The variable name or container for this field
- */
-void t_as3_generator::generate_deserialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name();
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    indent(out) << name << " = iprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "readBinary();";
-        } else {
-          out << "readString();";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "readBool();";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "readByte();";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "readI16();";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "readI32();";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "readI64();";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "readDouble();";
-        break;
-      default:
-        throw "compiler error: no As3 name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "readI32();";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a struct, invokes read()
- */
-void t_as3_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  out << indent() << prefix << " = new " << type_name(tstruct) << "();" << endl << indent()
-      << prefix << ".read(iprot);" << endl;
-}
-
-/**
- * Deserializes a container by reading its size and then iterating
- */
-void t_as3_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  string obj;
-
-  if (ttype->is_map()) {
-    obj = tmp("_map");
-  } else if (ttype->is_set()) {
-    obj = tmp("_set");
-  } else if (ttype->is_list()) {
-    obj = tmp("_list");
-  }
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    indent(out) << "var " << obj << ":TMap = iprot.readMapBegin();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "var " << obj << ":TSet = iprot.readSetBegin();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "var " << obj << ":TList = iprot.readListBegin();" << endl;
-  }
-
-  indent(out) << prefix << " = new " << type_name(ttype, false, true)
-              // size the collection correctly
-              << "("
-              << ");" << endl;
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for (var " << i << ":int = 0; " << i << " < " << obj << ".size"
-              << "; "
-              << "++" << i << ")" << endl;
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  scope_down(out);
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "iprot.readMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "iprot.readSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "iprot.readListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_as3_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey) << endl;
-  indent(out) << declare_field(&fval) << endl;
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << prefix << "[" << key << "] = " << val << ";" << endl;
-}
-
-/**
- * Deserializes a set element
- */
-void t_as3_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".add(" << elem << ");" << endl;
-}
-
-/**
- * Deserializes a list element
- */
-void t_as3_generator::generate_deserialize_list_element(ofstream& out,
-                                                        t_list* tlist,
-                                                        string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".push(" << elem << ");" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_as3_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + tfield->get_name());
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + tfield->get_name());
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    string name = prefix + tfield->get_name();
-    indent(out) << "oprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "writeBinary(" << name << ");";
-        } else {
-          out << "writeString(" << name << ");";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ");";
-        break;
-      default:
-        throw "compiler error: no As3 name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32(" << name << ");";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_as3_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  out << indent() << prefix << ".write(oprot);" << endl;
-}
-
-/**
- * Serializes a container by writing its size then the elements.
- *
- * @param ttype  The type of container
- * @param prefix String prefix for fields
- */
-void t_as3_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    string iter = tmp("_key");
-    string counter = tmp("_sizeCounter");
-    indent(out) << "var " << counter << ":int = 0;" << endl;
-    indent(out) << "for (var " << iter << ":* in " << prefix << ") {" << endl;
-    indent(out) << "  " << counter << +"++;" << endl;
-    indent(out) << "}" << endl;
-
-    indent(out) << "oprot.writeMapBegin(new TMap(" << type_to_enum(((t_map*)ttype)->get_key_type())
-                << ", " << type_to_enum(((t_map*)ttype)->get_val_type()) << ", " << counter << "));"
-                << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetBegin(new TSet(" << type_to_enum(((t_set*)ttype)->get_elem_type())
-                << ", " << prefix << ".size));" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListBegin(new TList("
-                << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " << prefix << ".length));"
-                << endl;
-  }
-
-  string iter = tmp("elem");
-  if (ttype->is_map()) {
-    indent(out) << "for (var " << iter << ":* in " << prefix << ")";
-  } else if (ttype->is_set()) {
-    indent(out) << "for each (var " << iter << ":* in " << prefix << ".toArray())";
-  } else if (ttype->is_list()) {
-    indent(out) << "for each (var " << iter << ":* in " << prefix << ")";
-  }
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, (t_map*)ttype, iter, prefix);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-  }
-
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot.writeMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- */
-void t_as3_generator::generate_serialize_map_element(ofstream& out,
-                                                     t_map* tmap,
-                                                     string iter,
-                                                     string map) {
-  t_field kfield(tmap->get_key_type(), iter);
-  generate_serialize_field(out, &kfield, "");
-  t_field vfield(tmap->get_val_type(), map + "[" + iter + "]");
-  generate_serialize_field(out, &vfield, "");
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_as3_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_as3_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Returns a As3 type name
- *
- * @param ttype The type
- * @param container Is the type going inside a container?
- * @return As3 type name, i.e. HashMap<Key,Value>
- */
-string t_as3_generator::type_name(t_type* ttype, bool in_container, bool in_init) {
-  (void)in_init;
-  // In As3 typedefs are just resolved to their real type
-  ttype = get_true_type(ttype);
-  string prefix;
-
-  if (ttype->is_base_type()) {
-    return base_type_name((t_base_type*)ttype, in_container);
-  } else if (ttype->is_enum()) {
-    return "int";
-  } else if (ttype->is_map()) {
-    return "Dictionary";
-  } else if (ttype->is_set()) {
-    return "Set";
-  } else if (ttype->is_list()) {
-    return "Array";
-  }
-
-  // Check for namespacing
-  t_program* program = ttype->get_program();
-  if (program != NULL && program != program_) {
-    string package = program->get_namespace("as3");
-    if (!package.empty()) {
-      return package + "." + ttype->get_name();
-    }
-  }
-
-  return ttype->get_name();
-}
-
-/**
- * Returns the AS3 type that corresponds to the thrift type.
- *
- * @param tbase The base type
- * @param container Is it going in a As3 container?
- */
-string t_as3_generator::base_type_name(t_base_type* type, bool in_container) {
-  (void)in_container;
-  t_base_type::t_base tbase = type->get_base();
-
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "void";
-  case t_base_type::TYPE_STRING:
-    if (type->is_binary()) {
-      return "ByteArray";
-    } else {
-      return "String";
-    }
-  case t_base_type::TYPE_BOOL:
-    return "Boolean";
-  case t_base_type::TYPE_I8:
-  case t_base_type::TYPE_I16:
-  case t_base_type::TYPE_I32:
-    return "int";
-  case t_base_type::TYPE_I64:
-    throw "i64 is not yet supported in as3";
-  case t_base_type::TYPE_DOUBLE:
-    return "Number";
-  default:
-    throw "compiler error: no As3 name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param ttype The type
- */
-string t_as3_generator::declare_field(t_field* tfield, bool init) {
-  // TODO(mcslee): do we ever need to initialize the field?
-  string result = "var " + tfield->get_name() + ":" + type_name(tfield->get_type());
-  if (init) {
-    t_type* ttype = get_true_type(tfield->get_type());
-    if (ttype->is_base_type() && tfield->get_value() != NULL) {
-      ofstream dummy;
-      result += " = " + render_const_value(dummy, tfield->get_name(), ttype, tfield->get_value());
-    } else if (ttype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "NO T_VOID CONSTRUCT";
-      case t_base_type::TYPE_STRING:
-        result += " = null";
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = false";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = (double)0";
-        break;
-      }
-
-    } else if (ttype->is_enum()) {
-      result += " = 0";
-    } else if (ttype->is_container()) {
-      result += " = new " + type_name(ttype, false, true) + "()";
-    } else {
-      result += " = new " + type_name(ttype, false, true) + "()";
-      ;
-    }
-  }
-  return result + ";";
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_as3_generator::function_signature(t_function* tfunction, string prefix) {
-  std::string arguments = argument_list(tfunction->get_arglist());
-  if (!tfunction->is_oneway()) {
-    if (arguments != "") {
-      arguments += ", ";
-    }
-    arguments += "onError:Function, onSuccess:Function";
-  }
-
-  std::string result = "function " + prefix + tfunction->get_name() + "(" + arguments + "):void";
-  return result;
-}
-
-/**
- * Renders a comma separated field list, with type names
- */
-string t_as3_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += (*f_iter)->get_name() + ":" + type_name((*f_iter)->get_type());
-  }
-  return result;
-}
-
-/**
- * Converts the parse type to a C++ enum string for the given type.
- */
-string t_as3_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_list()) {
-    return "TType.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Applies the correct style to a string based on the value of nocamel_style_
- */
-std::string t_as3_generator::get_cap_name(std::string name) {
-  name[0] = toupper(name[0]);
-  return name;
-}
-
-string t_as3_generator::constant_name(string name) {
-  string constant_name;
-
-  bool is_first = true;
-  bool was_previous_char_upper = false;
-  for (string::iterator iter = name.begin(); iter != name.end(); ++iter) {
-    string::value_type character = (*iter);
-
-    bool is_upper = isupper(character);
-
-    if (is_upper && !is_first && !was_previous_char_upper) {
-      constant_name += '_';
-    }
-    constant_name += toupper(character);
-
-    is_first = false;
-    was_previous_char_upper = is_upper;
-  }
-
-  return constant_name;
-}
-
-/**
- * Emits a As3Doc comment if the provided object has a doc in Thrift
- */
-void t_as3_generator::generate_as3_doc(ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    generate_docstring_comment(out, "/**\n", " * ", tdoc->get_doc(), " */\n");
-  }
-}
-
-/**
- * Emits a As3Doc comment if the provided function object has a doc in Thrift
- */
-void t_as3_generator::generate_as3_doc(ofstream& out, t_function* tfunction) {
-  if (tfunction->has_doc()) {
-    stringstream ss;
-    ss << tfunction->get_doc();
-    const vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-    vector<t_field*>::const_iterator p_iter;
-    for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-      t_field* p = *p_iter;
-      ss << "\n@param " << p->get_name();
-      if (p->has_doc()) {
-        ss << " " << p->get_doc();
-      }
-    }
-    generate_docstring_comment(out, "/**\n", " * ", ss.str(), " */\n");
-  }
-}
-
-std::string t_as3_generator::generate_isset_check(t_field* field) {
-  return generate_isset_check(field->get_name());
-}
-
-std::string t_as3_generator::generate_isset_check(std::string field_name) {
-  return "is" + get_cap_name("set") + get_cap_name(field_name) + "()";
-}
-
-void t_as3_generator::generate_isset_set(ofstream& out, t_field* field) {
-  if (!type_can_be_null(field->get_type())) {
-    indent(out) << "this.__isset_" << field->get_name() << " = true;" << endl;
-  }
-}
-
-std::string t_as3_generator::get_enum_class_name(t_type* type) {
-  string package = "";
-  t_program* program = type->get_program();
-  if (program != NULL && program != program_) {
-    package = program->get_namespace("as3") + ".";
-  }
-  return package + type->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(
-    as3,
-    "AS3",
-    "    bindable:        Add [bindable] metadata to all the struct classes.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_c_glib_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_c_glib_generator.cc
deleted file mode 100644
index 7d4e4f0..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_c_glib_generator.cc
+++ /dev/null
@@ -1,4562 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <fstream>
-#include <iostream>
-#include <stdexcept>
-#include <string>
-#include <vector>
-
-#include <ctype.h>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/* forward declarations */
-string initial_caps_to_underscores(string name);
-string underscores_to_initial_caps(string name);
-string to_upper_case(string name);
-string to_lower_case(string name);
-
-/**
- * C code generator, using glib for C typing.
- */
-class t_c_glib_generator : public t_oop_generator {
-public:
-  /* constructor */
-  t_c_glib_generator(t_program* program,
-                     const map<string, string>& parsed_options,
-                     const string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    /* set the output directory */
-    this->out_dir_base_ = "gen-c_glib";
-
-    /* no options yet */
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      throw "unknown option c_glib:" + iter->first;
-    }
-
-    /* set the namespace */
-    this->nspace = program_->get_namespace("c_glib");
-
-    if (this->nspace.empty()) {
-      this->nspace = "";
-      this->nspace_u = "";
-      this->nspace_uc = "";
-      this->nspace_lc = "";
-    } else {
-      /* replace dots with underscores */
-      char* tmp = strdup(this->nspace.c_str());
-      for (unsigned int i = 0; i < strlen(tmp); i++) {
-        if (tmp[i] == '.') {
-          tmp[i] = '_';
-        }
-      }
-      this->nspace = string(tmp, strlen(tmp));
-      free(tmp);
-
-      /* clean up the namespace for C.
-       * An input of 'namespace foo' should result in:
-       *  - nspace = foo       - for thrift objects and typedefs
-       *  - nspace_u = Foo     - for internal GObject prefixes
-       *  - nspace_uc = FOO_   - for macro prefixes
-       *  - nspace_lc = foo_   - for filename and method prefixes
-       * The underscores are there since uc and lc strings are used as file and
-       * variable prefixes.
-       */
-      this->nspace_u = initial_caps_to_underscores(this->nspace);
-      this->nspace_uc = to_upper_case(this->nspace_u) + "_";
-      this->nspace_lc = to_lower_case(this->nspace_u) + "_";
-    }
-  }
-
-  /* initialization and destruction */
-  void init_generator();
-  void close_generator();
-
-  /* generation functions */
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_consts(vector<t_const*> consts);
-  void generate_struct(t_struct* tstruct);
-  void generate_service(t_service* tservice);
-  void generate_xception(t_struct* tstruct);
-
-private:
-  /* file streams */
-  ofstream f_types_;
-  ofstream f_types_impl_;
-  ofstream f_header_;
-  ofstream f_service_;
-
-  /* namespace variables */
-  string nspace;
-  string nspace_u;
-  string nspace_uc;
-  string nspace_lc;
-
-  /* helper functions */
-  bool is_complex_type(t_type* ttype);
-  bool is_numeric(t_type* ttype);
-  string type_name(t_type* ttype, bool in_typedef = false, bool is_const = false);
-  string property_type_name(t_type* ttype, bool in_typedef = false, bool is_const = false);
-  string base_type_name(t_type* type);
-  string type_to_enum(t_type* type);
-  string constant_literal(t_type* type, t_const_value* value);
-  string constant_value(string name, t_type* type, t_const_value* value);
-  string constant_value_with_storage(string name, t_type* type, t_const_value* value);
-  string function_signature(t_function* tfunction);
-  string argument_list(t_struct* tstruct);
-  string xception_list(t_struct* tstruct);
-  string declare_field(t_field* tfield,
-                       bool init = false,
-                       bool pointer = false,
-                       bool constant = false,
-                       bool reference = false);
-  void declare_local_variable(ofstream& out, t_type* ttype, string& base_name, bool for_hash_table);
-  void declore_local_variable_for_write(ofstream& out, t_type* ttype, string& base_name);
-
-  /* generation functions */
-  void generate_const_initializer(string name,
-                                  t_type* type,
-                                  t_const_value* value,
-                                  bool top_level = false);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_handler(t_service* tservice);
-  void generate_service_processor(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_object(t_struct* tstruct);
-  void generate_struct_writer(ofstream& out,
-                              t_struct* tstruct,
-                              string this_name,
-                              string this_get = "",
-                              bool is_function = true);
-  void generate_struct_reader(ofstream& out,
-                              t_struct* tstruct,
-                              string this_name,
-                              string this_get = "",
-                              bool is_function = true);
-
-  void generate_serialize_field(ofstream& out,
-                                t_field* tfield,
-                                string prefix,
-                                string suffix,
-                                int error_ret);
-  void generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix, int error_ret);
-  void generate_serialize_container(ofstream& out, t_type* ttype, string prefix, int error_ret);
-  void generate_serialize_map_element(ofstream& out,
-                                      t_map* tmap,
-                                      string key,
-                                      string value,
-                                      int error_ret);
-  void generate_serialize_set_element(ofstream& out, t_set* tset, string element, int error_ret);
-  void generate_serialize_list_element(ofstream& out,
-                                       t_list* tlist,
-                                       string list,
-                                       string index,
-                                       int error_ret);
-
-  void generate_deserialize_field(ofstream& out,
-                                  t_field* tfield,
-                                  string prefix,
-                                  string suffix,
-                                  int error_ret,
-                                  bool allocate = true);
-  void generate_deserialize_struct(ofstream& out,
-                                   t_struct* tstruct,
-                                   string prefix,
-                                   int error_ret,
-                                   bool allocate = true);
-  void generate_deserialize_container(ofstream& out, t_type* ttype, string prefix, int error_ret);
-  void generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix, int error_ret);
-  void generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix, int error_ret);
-  void generate_deserialize_list_element(ofstream& out,
-                                         t_list* tlist,
-                                         string prefix,
-                                         string index,
-                                         int error_ret);
-
-  string generate_new_hash_from_type(t_type* key, t_type* value);
-  string generate_new_array_from_type(t_type* ttype);
-
-  string generate_free_func_from_type(t_type* ttype);
-  string generate_hash_func_from_type(t_type* ttype);
-  string generate_cmp_func_from_type(t_type* ttype);
-};
-
-/**
- * Prepare for file generation by opening up the necessary file
- * output streams.
- */
-void t_c_glib_generator::init_generator() {
-  /* create output directory */
-  MKDIR(get_out_dir().c_str());
-
-  string program_name_u = initial_caps_to_underscores(program_name_);
-  string program_name_uc = to_upper_case(program_name_u);
-  string program_name_lc = to_lower_case(program_name_u);
-
-  /* create output files */
-  string f_types_name = get_out_dir() + this->nspace_lc + program_name_lc + "_types.h";
-  f_types_.open(f_types_name.c_str());
-  string f_types_impl_name = get_out_dir() + this->nspace_lc + program_name_lc + "_types.c";
-  f_types_impl_.open(f_types_impl_name.c_str());
-
-  /* add thrift boilerplate headers */
-  f_types_ << autogen_comment();
-  f_types_impl_ << autogen_comment();
-
-  /* include inclusion guard */
-  f_types_ << "#ifndef " << this->nspace_uc << program_name_uc << "_TYPES_H" << endl << "#define "
-           << this->nspace_uc << program_name_uc << "_TYPES_H" << endl << endl;
-
-  /* include base types */
-  f_types_ << "/* base includes */" << endl << "#include <glib-object.h>" << endl
-           << "#include <thrift/c_glib/thrift_struct.h>" << endl
-           << "#include <thrift/c_glib/protocol/thrift_protocol.h>" << endl;
-
-  /* include other thrift includes */
-  const vector<t_program*>& includes = program_->get_includes();
-  for (size_t i = 0; i < includes.size(); ++i) {
-    f_types_ << "/* other thrift includes */" << endl << "#include \"" << this->nspace_lc
-             << initial_caps_to_underscores(includes[i]->get_name()) << "_types.h\"" << endl;
-  }
-  f_types_ << endl;
-
-  /* include custom headers */
-  const vector<string>& c_includes = program_->get_c_includes();
-  f_types_ << "/* custom thrift includes */" << endl;
-  for (size_t i = 0; i < c_includes.size(); ++i) {
-    if (c_includes[i][0] == '<') {
-      f_types_ << "#include " << c_includes[i] << endl;
-    } else {
-      f_types_ << "#include \"" << c_includes[i] << "\"" << endl;
-    }
-  }
-  f_types_ << endl;
-
-  /* include math.h (for "INFINITY") in the implementation file, in case we
-     encounter a struct with a member of type double */
-  f_types_impl_ << endl << "#include <math.h>" << endl;
-
-  // include the types file
-  f_types_impl_ << endl << "#include \"" << this->nspace_lc << program_name_u << "_types.h\""
-                << endl << "#include <thrift/c_glib/thrift.h>" << endl << endl;
-
-  f_types_ << "/* begin types */" << endl << endl;
-}
-
-/**
- *  Finish up generation and close all file streams.
- */
-void t_c_glib_generator::close_generator() {
-  string program_name_uc = to_upper_case(initial_caps_to_underscores(program_name_));
-
-  /* end the header inclusion guard */
-  f_types_ << "#endif /* " << this->nspace_uc << program_name_uc << "_TYPES_H */" << endl;
-
-  /* close output file */
-  f_types_.close();
-  f_types_impl_.close();
-}
-
-/**
- * Generates a Thrift typedef in C code.  For example:
- *
- * Thrift:
- * typedef map<i32,i32> SomeMap
- *
- * C:
- * typedef GHashTable * ThriftSomeMap;
- */
-void t_c_glib_generator::generate_typedef(t_typedef* ttypedef) {
-  f_types_ << indent() << "typedef " << type_name(ttypedef->get_type(), true) << " " << this->nspace
-           << ttypedef->get_symbolic() << ";" << endl << endl;
-}
-
-/**
- * Generates a C enumeration.  For example:
- *
- * Thrift:
- * enum MyEnum {
- *   ONE = 1,
- *   TWO
- * }
- *
- * C:
- * enum _ThriftMyEnum {
- *   THRIFT_MY_ENUM_ONE = 1,
- *   THRIFT_MY_ENUM_TWO
- * };
- * typedef enum _ThriftMyEnum ThriftMyEnum;
- */
-void t_c_glib_generator::generate_enum(t_enum* tenum) {
-  string name = tenum->get_name();
-  string name_uc = to_upper_case(initial_caps_to_underscores(name));
-
-  f_types_ << indent() << "enum _" << this->nspace << name << " {" << endl;
-
-  indent_up();
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  bool first = true;
-
-  /* output each of the enumeration elements */
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_types_ << "," << endl;
-    }
-
-    f_types_ << indent() << this->nspace_uc << name_uc << "_" << (*c_iter)->get_name();
-    f_types_ << " = " << (*c_iter)->get_value();
-  }
-
-  indent_down();
-  f_types_ << endl << "};" << endl << "typedef enum _" << this->nspace << name << " "
-           << this->nspace << name << ";" << endl << endl;
-
-  f_types_ << "/* return the name of the constant */" << endl;
-  f_types_ << "const char *" << endl;
-  f_types_ << "toString_" << name << "(int value); " << endl << endl;
-  ;
-  f_types_impl_ << "/* return the name of the constant */" << endl;
-  f_types_impl_ << "const char *" << endl;
-  f_types_impl_ << "toString_" << name << "(int value) " << endl;
-  f_types_impl_ << "{" << endl;
-  f_types_impl_ << "  static __thread char buf[16] = {0};" << endl;
-  f_types_impl_ << "  switch(value) {" << endl;
-  std::set<int> done;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    // Skipping duplicate value
-    if (done.find(value) == done.end()) {
-      done.insert(value);
-      f_types_impl_ << "  case " << this->nspace_uc << name_uc << "_" << (*c_iter)->get_name()
-                    << ":"
-                    << "return \"" << this->nspace_uc << name_uc << "_" << (*c_iter)->get_name()
-                    << "\";" << endl;
-    }
-  }
-  f_types_impl_ << "  default: g_snprintf(buf, 16, \"%d\", value); return buf;" << endl;
-  f_types_impl_ << "  }" << endl;
-  f_types_impl_ << "}" << endl << endl;
-}
-
-/**
- * Generates Thrift constants in C code.
- */
-void t_c_glib_generator::generate_consts(vector<t_const*> consts) {
-  f_types_ << "/* constants */" << endl;
-  f_types_impl_ << "/* constants */" << endl;
-
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    string name = (*c_iter)->get_name();
-    string name_uc = to_upper_case(name);
-    string name_lc = to_lower_case(name);
-    t_type* type = (*c_iter)->get_type();
-    t_const_value* value = (*c_iter)->get_value();
-
-    if (is_complex_type(type)) {
-      f_types_ << type_name(type) << indent() << this->nspace_lc << name_lc
-               << "_constant();" << endl;
-    }
-
-    f_types_ << indent() << "#define " << this->nspace_uc << name_uc << " "
-             << constant_value(name_lc, type, value) << endl;
-
-    generate_const_initializer(name_lc, type, value, true);
-  }
-
-  f_types_ << endl;
-  f_types_impl_ << endl;
-}
-
-/**
- * Generate Thrift structs in C code, as GObjects.  Example:
- *
- * Thrift:
- * struct Bonk
- * {
- *   1: string message,
- *   2: i32 type
- * }
- *
- * C GObject instance header:
- * struct _ThriftBonk
- * {
- *   GObject parent;
- *
- *   gchar * message;
- *   gint32 type;
- * };
- * typedef struct _ThriftBonk ThriftBonk
- * // ... additional GObject boilerplate ...
- */
-void t_c_glib_generator::generate_struct(t_struct* tstruct) {
-  f_types_ << "/* struct " << tstruct->get_name() << " */" << endl;
-  generate_object(tstruct);
-}
-
-/**
- * Generate C code to represent Thrift services.  Creates a new GObject
- * which can be used to access the service.
- */
-void t_c_glib_generator::generate_service(t_service* tservice) {
-  string svcname_u = initial_caps_to_underscores(tservice->get_name());
-  string svcname_uc = this->nspace_uc + to_upper_case(svcname_u);
-  string filename = this->nspace_lc + to_lower_case(svcname_u);
-
-  // make output files
-  string f_header_name = get_out_dir() + filename + ".h";
-  f_header_.open(f_header_name.c_str());
-
-  string program_name_u = initial_caps_to_underscores(program_name_);
-  string program_name_lc = to_lower_case(program_name_u);
-
-  // add header file boilerplate
-  f_header_ << autogen_comment();
-
-  // add an inclusion guard
-  f_header_ << "#ifndef " << svcname_uc << "_H" << endl << "#define " << svcname_uc << "_H" << endl
-            << endl;
-
-  // add standard includes
-  f_header_ << "#include <thrift/c_glib/processor/thrift_dispatch_processor.h>" << endl << endl;
-  f_header_ << "#include \"" << this->nspace_lc << program_name_lc << "_types.h\"" << endl;
-
-  // if we are inheriting from another service, include its header
-  t_service* extends_service = tservice->get_extends();
-  if (extends_service != NULL) {
-    f_header_ << "#include \"" << this->nspace_lc
-              << to_lower_case(initial_caps_to_underscores(extends_service->get_name())) << ".h\""
-              << endl;
-  }
-  f_header_ << endl;
-
-  // create the service implementation
-  string f_service_name = get_out_dir() + filename + ".c";
-  f_service_.open(f_service_name.c_str());
-
-  // add the boilerplace header
-  f_service_ << autogen_comment();
-
-  // include the headers
-  f_service_ << "#include <string.h>" << endl << "#include <thrift/c_glib/thrift.h>" << endl
-             << "#include <thrift/c_glib/thrift_application_exception.h>" << endl << "#include \""
-             << filename << ".h\"" << endl << endl;
-
-  // generate the service-helper classes
-  generate_service_helpers(tservice);
-
-  // generate the client objects
-  generate_service_client(tservice);
-
-  // generate the server objects
-  generate_service_server(tservice);
-
-  // end the header inclusion guard
-  f_header_ << "#endif /* " << svcname_uc << "_H */" << endl;
-
-  // close the files
-  f_service_.close();
-  f_header_.close();
-}
-
-/**
- *
- */
-void t_c_glib_generator::generate_xception(t_struct* tstruct) {
-  string name = tstruct->get_name();
-  string name_u = initial_caps_to_underscores(name);
-  string name_lc = to_lower_case(name_u);
-  string name_uc = to_upper_case(name_u);
-
-  generate_object(tstruct);
-
-  f_types_ << "/* exception */" << endl
-           << "typedef enum" << endl
-           << "{" << endl;
-  indent_up();
-  f_types_ << indent() << this->nspace_uc << name_uc << "_ERROR_CODE" << endl;
-  indent_down();
-  f_types_ << "} " << this->nspace << name << "Error;" << endl
-           << endl
-           << "GQuark " << this->nspace_lc << name_lc
-           << "_error_quark (void);" << endl
-           << "#define " << this->nspace_uc << name_uc << "_ERROR ("
-           << this->nspace_lc << name_lc << "_error_quark())" << endl
-           << endl
-           << endl;
-
-  f_types_impl_ << "/* define the GError domain for exceptions */" << endl << "#define "
-                << this->nspace_uc << name_uc << "_ERROR_DOMAIN \"" << this->nspace_lc << name_lc
-                << "_error_quark\"" << endl << "GQuark" << endl << this->nspace_lc << name_lc
-                << "_error_quark (void)" << endl << "{" << endl
-                << "  return g_quark_from_static_string (" << this->nspace_uc << name_uc
-                << "_ERROR_DOMAIN);" << endl << "}" << endl << endl;
-}
-
-/********************
- * HELPER FUNCTIONS *
- ********************/
-
-/**
- * Returns true if ttype is not a primitive.
- */
-bool t_c_glib_generator::is_complex_type(t_type* ttype) {
-  ttype = get_true_type(ttype);
-
-  return ttype->is_container() || ttype->is_struct() || ttype->is_xception();
-}
-
-bool t_c_glib_generator::is_numeric(t_type* ttype) {
-  return ttype->is_enum() || (ttype->is_base_type() && !ttype->is_string());
-}
-
-/**
- * Maps a Thrift t_type to a C type.
- */
-string t_c_glib_generator::type_name(t_type* ttype, bool in_typedef, bool is_const) {
-  if (ttype->is_base_type()) {
-    string bname = base_type_name(ttype);
-
-    if (is_const) {
-      return "const " + bname;
-    } else {
-      return bname;
-    }
-  }
-
-  if (ttype->is_container()) {
-    string cname;
-
-    t_container* tcontainer = (t_container*)ttype;
-    if (tcontainer->has_cpp_name()) {
-      cname = tcontainer->get_cpp_name();
-    } else if (ttype->is_map()) {
-      cname = "GHashTable";
-    } else if (ttype->is_set()) {
-      // since a set requires unique elements, use a GHashTable, and
-      // populate the keys and values with the same data, using keys for
-      // the actual writes and reads.
-      // TODO: discuss whether or not to implement TSet, THashSet or GHashSet
-      cname = "GHashTable";
-    } else if (ttype->is_list()) {
-      t_type* etype = ((t_list*)ttype)->get_elem_type();
-      if (etype->is_void()) {
-        throw std::runtime_error("compiler error: list element type cannot be void");
-      }
-      // TODO: investigate other implementations besides GPtrArray
-      cname = is_numeric(etype) ? "GArray" : "GPtrArray";
-    }
-
-    /* Omit the dereference operator if we are aliasing this type within a
-       typedef, to allow the type to be used more naturally in client code;
-       otherwise, include it */
-    if (!in_typedef) {
-      cname += " *";
-    }
-
-    if (is_const) {
-      return "const " + cname;
-    } else {
-      return cname;
-    }
-  }
-
-  // check for a namespace
-  string pname = this->nspace + ttype->get_name();
-
-  if (is_complex_type(ttype)) {
-    pname += " *";
-  }
-
-  if (is_const) {
-    return "const " + pname;
-  } else {
-    return pname;
-  }
-}
-
-/**
- * Maps a Thrift primitive to the type needed to hold its value when used as an
- * object property.
- *
- * This method is needed because all integer properties of width less than 64
- * bits map to the same type, gint, as opposed to their width-specific type
- * (gint8, gint16 or gint32).
- */
-string t_c_glib_generator::property_type_name(t_type* ttype, bool in_typedef, bool is_const) {
-  string result;
-
-  if (ttype->is_base_type()) {
-    switch (((t_base_type*)ttype)->get_base()) {
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-      if (is_const) {
-        result = "const gint";
-      } else {
-        result = "gint";
-      }
-      break;
-
-    default:
-      result = type_name(ttype, in_typedef, is_const);
-    }
-  } else {
-    result = type_name(ttype, in_typedef, is_const);
-  }
-
-  return result;
-}
-
-/**
- * Maps a Thrift primitive to a C primitive.
- */
-string t_c_glib_generator::base_type_name(t_type* type) {
-  if (type->is_enum()) {
-    return type_name(type);
-  }
-  if (!type->is_base_type()) {
-    throw std::invalid_argument("Only base types are suppported.");
-  }
-  t_base_type* base_type = reinterpret_cast<t_base_type*>(type);
-  t_base_type::t_base tbase = base_type->get_base();
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "void";
-  case t_base_type::TYPE_STRING:
-    if (base_type->is_binary()) {
-      return "GByteArray *";
-    } else {
-      return "gchar *";
-    }
-  case t_base_type::TYPE_BOOL:
-    return "gboolean";
-  case t_base_type::TYPE_I8:
-    return "gint8";
-  case t_base_type::TYPE_I16:
-    return "gint16";
-  case t_base_type::TYPE_I32:
-    return "gint32";
-  case t_base_type::TYPE_I64:
-    return "gint64";
-  case t_base_type::TYPE_DOUBLE:
-    return "gdouble";
-  default:
-    throw std::logic_error("compiler error: no C base type name for base type "
-                           + t_base_type::t_base_name(tbase));
-  }
-}
-
-/**
- * Returns a member of the ThriftType C enumeration in thrift_protocol.h
- * for a Thrift type.
- */
-string t_c_glib_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "T_STRING";
-    case t_base_type::TYPE_BOOL:
-      return "T_BOOL";
-    case t_base_type::TYPE_I8:
-      return "T_BYTE";
-    case t_base_type::TYPE_I16:
-      return "T_I16";
-    case t_base_type::TYPE_I32:
-      return "T_I32";
-    case t_base_type::TYPE_I64:
-      return "T_I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "T_DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "T_I32";
-  } else if (type->is_struct()) {
-    return "T_STRUCT";
-  } else if (type->is_xception()) {
-    return "T_STRUCT";
-  } else if (type->is_map()) {
-    return "T_MAP";
-  } else if (type->is_set()) {
-    return "T_SET";
-  } else if (type->is_list()) {
-    return "T_LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Returns a Thrift constant formatted as a literal for inclusion in C code.
- */
-string t_c_glib_generator::constant_literal(t_type* type, t_const_value* value) {
-  ostringstream render;
-
-  if (type->is_base_type()) {
-    /* primitives */
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << "\"" + value->get_string() + "\"";
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() != 0) ? "TRUE" : "FALSE");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      render << value->get_double();
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else {
-    t_const_value::t_const_value_type value_type = value->get_type();
-
-    switch (value_type) {
-    case t_const_value::CV_IDENTIFIER:
-      render << value->get_integer();
-      break;
-    case t_const_value::CV_LIST:
-      render << "{ ";
-      {
-        t_type* elem_type = ((t_list*)type)->get_elem_type();
-        const vector<t_const_value*>& list = value->get_list();
-        vector<t_const_value*>::const_iterator list_iter;
-
-        if (list.size() > 0) {
-          list_iter = list.begin();
-          render << constant_literal(elem_type, *list_iter);
-
-          while (++list_iter != list.end()) {
-            render << ", " << constant_literal(elem_type, *list_iter);
-          }
-        }
-      }
-      render << " }";
-      break;
-    case t_const_value::CV_MAP:
-    default:
-      render << "NULL /* not supported */";
-    }
-  }
-
-  return render.str();
-}
-
-/**
- * Returns C code that represents a Thrift constant.
- */
-string t_c_glib_generator::constant_value(string name, t_type* type, t_const_value* value) {
-  ostringstream render;
-
-  if (type->is_base_type()) {
-    /* primitives */
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << "g_strdup (\"" + value->get_string() + "\")";
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() != 0) ? 1 : 0);
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_I64:
-      render << "G_GINT64_CONSTANT (" << value->get_integer() << ")";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << "(" << type_name(type) << ")" << value->get_integer();
-  } else if (is_complex_type(type)) {
-    render << "(" << this->nspace_lc << to_lower_case(name) << "_constant())";
-  } else {
-    render << "NULL /* not supported */";
-  }
-
-  return render.str();
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_c_glib_generator::function_signature(t_function* tfunction) {
-  t_type* ttype = tfunction->get_returntype();
-  t_struct* arglist = tfunction->get_arglist();
-  t_struct* xlist = tfunction->get_xceptions();
-  string fname = initial_caps_to_underscores(tfunction->get_name());
-
-  bool has_return = !ttype->is_void();
-  bool has_args = arglist->get_members().size() == 0;
-  bool has_xceptions = xlist->get_members().size() == 0;
-  return "gboolean " + this->nspace_lc + fname + " (" + this->nspace + service_name_ + "If * iface"
-         + (has_return ? ", " + type_name(ttype) + "* _return" : "")
-         + (has_args ? "" : (", " + argument_list(arglist)))
-         + (has_xceptions ? "" : (", " + xception_list(xlist))) + ", GError ** error)";
-}
-
-/**
- * Renders a field list
- *
- * @param tstruct The struct definition
- * @return Comma sepearated list of all field names in that struct
- */
-string t_c_glib_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += type_name((*f_iter)->get_type(), false, true) + " " + (*f_iter)->get_name();
-  }
-  return result;
-}
-
-/**
- * Renders mutable exception lists
- *
- * @param tstruct The struct definition
- * @return Comma sepearated list of all field names in that struct
- */
-string t_c_glib_generator::xception_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += type_name((*f_iter)->get_type(), false, false) + "* " + (*f_iter)->get_name();
-  }
-  return result;
-}
-
-/**
- * Declares a field, including any necessary initialization.
- */
-string t_c_glib_generator::declare_field(t_field* tfield,
-                                         bool init,
-                                         bool pointer,
-                                         bool constant,
-                                         bool reference) {
-  string result = "";
-  if (constant) {
-    result += "const ";
-  }
-  result += type_name(tfield->get_type());
-  if (pointer) {
-    result += "*";
-  }
-  if (reference) {
-    result += "*";
-  }
-  result += " " + tfield->get_name();
-  if (init) {
-    t_type* type = get_true_type(tfield->get_type());
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        break;
-      case t_base_type::TYPE_BOOL:
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = (gdouble) 0";
-        break;
-      case t_base_type::TYPE_STRING:
-        result += " = NULL";
-        break;
-      default:
-        throw "compiler error: no C intializer for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      result += " = (" + type_name(type) + ") 0";
-    } else if (type->is_struct() || type->is_container()) {
-      result += " = NULL";
-    }
-  }
-
-  if (!reference) {
-    result += ";";
-  }
-
-  return result;
-}
-
-string t_c_glib_generator::constant_value_with_storage(string fname,
-                                                       t_type* etype,
-                                                       t_const_value* value) {
-  ostringstream render;
-  if (is_numeric(etype)) {
-    render << "    " << type_name(etype) << " *" << fname << " = "
-           << "g_new (" << base_type_name(etype) << ", 1);" << endl
-           << "    *" << fname << " = " << constant_value(fname, (t_type*)etype, value) << ";"
-           << endl;
-  } else {
-    render << "    " << type_name(etype) << " " << fname << " = "
-           << constant_value(fname, (t_type*)etype, value) << ";" << endl;
-  }
-  return render.str();
-}
-
-/**
- * Generates C code that initializes complex constants.
- */
-void t_c_glib_generator::generate_const_initializer(string name,
-                                                    t_type* type,
-                                                    t_const_value* value,
-                                                    bool top_level) {
-  string name_u = initial_caps_to_underscores(name);
-  string name_lc = to_lower_case(name_u);
-  string type_u = initial_caps_to_underscores(type->get_name());
-  string type_uc = to_upper_case(type_u);
-  string maybe_static = top_level ? "" : "static ";
-
-  if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    ostringstream initializers;
-
-    // initialize any constants that may be referenced by this initializer
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      string field_name = "";
-
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-          field_name = (*f_iter)->get_name();
-          break;
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field "
-          + v_iter->first->get_string();
-      }
-      field_name = tmp(field_name);
-
-      generate_const_initializer(name + "_constant_" + field_name,
-                                 field_type,
-                                 v_iter->second);
-      initializers << "    constant->" << v_iter->first->get_string() << " = "
-                   << constant_value(name + "_constant_" + field_name,
-                                     field_type,
-                                     v_iter->second) << ";" << endl
-                   << "    constant->__isset_" << v_iter->first->get_string()
-                   << " = TRUE;" << endl;
-    }
-
-    // implement the initializer
-    f_types_impl_ << maybe_static << this->nspace << type->get_name() << " *"
-                  << endl
-                  << this->nspace_lc << name_lc << "_constant (void)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << indent() << "static " << this->nspace << type->get_name()
-                  << " *constant = NULL;" << endl
-                  << indent() << "if (constant == NULL)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << indent() << "constant = g_object_new (" << this->nspace_uc
-                  << "TYPE_" << type_uc << ", NULL);" << endl
-                  << initializers.str();
-    scope_down(f_types_impl_);
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      string field_name = "";
-
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-          field_name = (*f_iter)->get_name();
-          break;
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field "
-          + v_iter->first->get_string();
-      }
-      field_name = tmp(field_name);
-    }
-
-    f_types_impl_ << indent() << "return constant;" << endl;
-    scope_down(f_types_impl_);
-    f_types_impl_ << endl;
-  } else if (type->is_list()) {
-    string list_type = "GPtrArray *";
-    string free_func
-        = generate_free_func_from_type(reinterpret_cast<t_list*>(type)->get_elem_type());
-    string list_initializer = "g_ptr_array_new_with_free_func (" + free_func + ");";
-    string list_appender = "g_ptr_array_add";
-    bool list_variable = false;
-
-    t_type* etype = ((t_list*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    ostringstream initializers;
-    ostringstream appenders;
-
-    list_initializer = generate_new_array_from_type(etype);
-    if (etype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)etype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot determine array type";
-      case t_base_type::TYPE_BOOL:
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-      case t_base_type::TYPE_DOUBLE:
-        list_type = "GArray *";
-        list_appender = "g_array_append_val";
-        list_variable = true;
-        break;
-      case t_base_type::TYPE_STRING:
-        break;
-      default:
-        throw "compiler error: no array info for type";
-      }
-    } else if (etype->is_enum()) {
-      list_type = "GArray *";
-      list_appender = "g_array_append_val";
-      list_variable = true;
-    }
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string fname = tmp(name);
-
-      generate_const_initializer(fname, etype, (*v_iter));
-      if (list_variable) {
-        initializers << "    " << type_name(etype) << " " << fname << " = "
-                     << constant_value(fname, (t_type*)etype, (*v_iter)) << ";"
-                     << endl;
-        appenders << "    " << list_appender << "(constant, " << fname << ");"
-                  << endl;
-      } else {
-        appenders << "    " << list_appender << "(constant, "
-                  << constant_value(fname, (t_type*)etype, (*v_iter)) << ");"
-                  << endl;
-      }
-    }
-
-    f_types_impl_ << maybe_static << list_type << endl
-                  << this->nspace_lc << name_lc << "_constant (void)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << indent() << "static " << list_type << " constant = NULL;"
-                  << endl
-                  << indent() << "if (constant == NULL)" << endl;
-    scope_up(f_types_impl_);
-    if (!initializers.str().empty()) {
-      f_types_impl_ << initializers.str()
-                    << endl;
-    }
-    f_types_impl_ << indent() << "constant = " << list_initializer << endl
-                  << appenders.str();
-    scope_down(f_types_impl_);
-    f_types_impl_ << indent() << "return constant;" << endl;
-    scope_down(f_types_impl_);
-    f_types_impl_ << endl;
-  } else if (type->is_set()) {
-    t_type* etype = ((t_set*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    ostringstream initializers;
-    ostringstream appenders;
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string fname = tmp(name);
-      string ptr = is_numeric(etype) ? "*" : "";
-      generate_const_initializer(fname, etype, (*v_iter));
-      initializers << constant_value_with_storage(fname, (t_type*)etype, *v_iter);
-      appenders << "    g_hash_table_insert (constant, " << fname << ", 0);" << endl;
-    }
-
-    f_types_impl_ << maybe_static << "GHashTable *" << endl
-                  << this->nspace_lc << name_lc << "_constant (void)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << indent() << "static GHashTable *constant = NULL;" << endl
-                  << indent() << "if (constant == NULL)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << initializers.str() << endl
-                  << indent() << "constant = " << generate_new_hash_from_type(etype, NULL) << endl
-                  << appenders.str();
-    scope_down(f_types_impl_);
-    f_types_impl_ << indent() << "return constant;" << endl;
-    scope_down(f_types_impl_);
-    f_types_impl_ << endl;
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    ostringstream initializers;
-    ostringstream appenders;
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string fname = tmp(name);
-      string kname = fname + "key";
-      string vname = fname + "val";
-      generate_const_initializer(kname, ktype, v_iter->first);
-      generate_const_initializer(vname, vtype, v_iter->second);
-
-      initializers << constant_value_with_storage(kname, (t_type*)ktype, v_iter->first);
-      initializers << constant_value_with_storage(vname, (t_type*)vtype, v_iter->second);
-      appenders << "    g_hash_table_insert (constant, " << kname << ", " << vname << ");" << endl;
-    }
-
-    f_types_impl_ << maybe_static << "GHashTable *" << endl
-                  << this->nspace_lc << name_lc << "_constant (void)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << indent() << "static GHashTable *constant = NULL;" << endl
-                  << indent() << "if (constant == NULL)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << initializers.str() << endl
-                  << indent() << "constant = " << generate_new_hash_from_type(ktype, vtype) << endl
-                  << appenders.str();
-    scope_down(f_types_impl_);
-    f_types_impl_ << indent() << "return constant;" << endl;
-    scope_down(f_types_impl_);
-    f_types_impl_ << endl;
-  }
-}
-
-/**
- * Generates helper classes for a service, consisting of a ThriftStruct subclass
- * for the arguments to and the result from each method.
- *
- * @param tservice The service for which to generate helper classes
- */
-void t_c_glib_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator function_iter;
-
-  // Iterate through the service's methods
-  for (function_iter = functions.begin(); function_iter != functions.end(); ++function_iter) {
-    string function_name = (*function_iter)->get_name();
-    t_struct* arg_list = (*function_iter)->get_arglist();
-    string arg_list_name_orig = arg_list->get_name();
-
-    // Generate the arguments class
-    arg_list->set_name(tservice->get_name() + underscores_to_initial_caps(function_name) + "Args");
-    generate_struct(arg_list);
-
-    arg_list->set_name(arg_list_name_orig);
-
-    // Generate the result class
-    if (!(*function_iter)->is_oneway()) {
-      t_struct result(program_,
-                      tservice->get_name() + underscores_to_initial_caps(function_name) + "Result");
-      t_field success((*function_iter)->get_returntype(), "success", 0);
-      success.set_req(t_field::T_OPTIONAL);
-      if (!(*function_iter)->get_returntype()->is_void()) {
-        result.append(&success);
-      }
-
-      t_struct* xs = (*function_iter)->get_xceptions();
-      const vector<t_field*>& fields = xs->get_members();
-      vector<t_field*>::const_iterator field_iter;
-      for (field_iter = fields.begin(); field_iter != fields.end(); ++field_iter) {
-        (*field_iter)->set_req(t_field::T_OPTIONAL);
-        result.append(*field_iter);
-      }
-
-      generate_struct(&result);
-    }
-  }
-}
-
-/**
- * Generates C code that represents a Thrift service client.
- */
-void t_c_glib_generator::generate_service_client(t_service* tservice) {
-  /* get some C friendly service names */
-  string service_name_lc = to_lower_case(initial_caps_to_underscores(service_name_));
-  string service_name_uc = to_upper_case(service_name_lc);
-
-  string parent_service_name;
-  string parent_service_name_lc;
-  string parent_service_name_uc;
-
-  string parent_class_name = "GObject";
-  string parent_type_name = "G_TYPE_OBJECT";
-
-  // The service this service extends, or NULL if it extends no
-  // service
-  t_service* extends_service = tservice->get_extends();
-  if (extends_service) {
-    // The name of the parent service
-    parent_service_name = extends_service->get_name();
-    parent_service_name_lc = to_lower_case(initial_caps_to_underscores(parent_service_name));
-    parent_service_name_uc = to_upper_case(parent_service_name_lc);
-
-    // The names of the client class' parent class and type
-    parent_class_name = this->nspace + parent_service_name + "Client";
-    parent_type_name = this->nspace_uc + "TYPE_" + parent_service_name_uc + "_CLIENT";
-  }
-
-  // The base service (the topmost in the "extends" hierarchy), on
-  // whose client class the "input_protocol" and "output_protocol"
-  // properties are defined
-  t_service* base_service = tservice;
-  while (base_service->get_extends()) {
-    base_service = base_service->get_extends();
-  }
-
-  string base_service_name = base_service->get_name();
-  string base_service_name_lc = to_lower_case(initial_caps_to_underscores(base_service_name));
-  string base_service_name_uc = to_upper_case(base_service_name_lc);
-
-  // Generate the client interface dummy object in the header.
-  f_header_ << "/* " << service_name_ << " service interface */" << endl << "typedef struct _"
-            << this->nspace << service_name_ << "If " << this->nspace << service_name_ << "If; "
-            << " /* dummy object */" << endl << endl;
-
-  // Generate the client interface object in the header.
-  f_header_ << "struct _" << this->nspace << service_name_ << "IfInterface" << endl << "{" << endl
-            << "  GTypeInterface parent;" << endl << endl;
-
-  /* write out the functions for this interface */
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    /* make the function name C friendly */
-    string funname = initial_caps_to_underscores((*f_iter)->get_name());
-    t_type* ttype = (*f_iter)->get_returntype();
-    t_struct* arglist = (*f_iter)->get_arglist();
-    t_struct* xlist = (*f_iter)->get_xceptions();
-    bool has_return = !ttype->is_void();
-    bool has_args = arglist->get_members().size() == 0;
-    bool has_xceptions = xlist->get_members().size() == 0;
-
-    string params = "(" + this->nspace + service_name_ + "If *iface"
-                    + (has_return ? ", " + type_name(ttype) + "* _return" : "")
-                    + (has_args ? "" : (", " + argument_list(arglist)))
-                    + (has_xceptions ? "" : (", " + xception_list(xlist))) + ", GError **error)";
-
-    indent(f_header_) << "gboolean (*" << funname << ") " << params << ";" << endl;
-  }
-  indent_down();
-
-  f_header_ << "};" << endl << "typedef struct _" << this->nspace << service_name_ << "IfInterface "
-            << this->nspace << service_name_ << "IfInterface;" << endl << endl;
-
-  // generate all the interface boilerplate
-  f_header_ << "GType " << this->nspace_lc << service_name_lc << "_if_get_type (void);" << endl
-            << "#define " << this->nspace_uc << "TYPE_" << service_name_uc << "_IF "
-            << "(" << this->nspace_lc << service_name_lc << "_if_get_type())" << endl << "#define "
-            << this->nspace_uc << service_name_uc << "_IF(obj) "
-            << "(G_TYPE_CHECK_INSTANCE_CAST ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_IF, " << this->nspace << service_name_ << "If))" << endl
-            << "#define " << this->nspace_uc << "IS_" << service_name_uc << "_IF(obj) "
-            << "(G_TYPE_CHECK_INSTANCE_TYPE ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_IF))" << endl << "#define " << this->nspace_uc
-            << service_name_uc << "_IF_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), "
-            << this->nspace_uc << "TYPE_" << service_name_uc << "_IF, " << this->nspace
-            << service_name_ << "IfInterface))" << endl << endl;
-
-  // write out all the interface function prototypes
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    /* make the function name C friendly */
-    string funname = initial_caps_to_underscores((*f_iter)->get_name());
-    t_type* ttype = (*f_iter)->get_returntype();
-    t_struct* arglist = (*f_iter)->get_arglist();
-    t_struct* xlist = (*f_iter)->get_xceptions();
-    bool has_return = !ttype->is_void();
-    bool has_args = arglist->get_members().size() == 0;
-    bool has_xceptions = xlist->get_members().size() == 0;
-
-    string params = "(" + this->nspace + service_name_ + "If *iface"
-                    + (has_return ? ", " + type_name(ttype) + "* _return" : "")
-                    + (has_args ? "" : (", " + argument_list(arglist)))
-                    + (has_xceptions ? "" : (", " + xception_list(xlist))) + ", GError **error)";
-
-    f_header_ << "gboolean " << this->nspace_lc << service_name_lc << "_if_" << funname << " "
-              << params << ";" << endl;
-  }
-  f_header_ << endl;
-
-  // Generate the client object instance definition in the header.
-  f_header_ << "/* " << service_name_ << " service client */" << endl << "struct _" << this->nspace
-            << service_name_ << "Client" << endl << "{" << endl << "  " << parent_class_name
-            << " parent;" << endl;
-  if (!extends_service) {
-    // Define "input_protocol" and "output_protocol" properties only
-    // for base services; child service-client classes will inherit
-    // these
-    f_header_ << endl << "  ThriftProtocol *input_protocol;" << endl
-              << "  ThriftProtocol *output_protocol;" << endl;
-  }
-  f_header_ << "};" << endl << "typedef struct _" << this->nspace << service_name_ << "Client "
-            << this->nspace << service_name_ << "Client;" << endl << endl;
-
-  // Generate the class definition in the header.
-  f_header_ << "struct _" << this->nspace << service_name_ << "ClientClass" << endl << "{" << endl
-            << "  " << parent_class_name << "Class parent;" << endl << "};" << endl
-            << "typedef struct _" << this->nspace << service_name_ << "ClientClass " << this->nspace
-            << service_name_ << "ClientClass;" << endl << endl;
-
-  // Create all the GObject boilerplate
-  f_header_ << "GType " << this->nspace_lc << service_name_lc << "_client_get_type (void);" << endl
-            << "#define " << this->nspace_uc << "TYPE_" << service_name_uc << "_CLIENT "
-            << "(" << this->nspace_lc << service_name_lc << "_client_get_type())" << endl
-            << "#define " << this->nspace_uc << service_name_uc << "_CLIENT(obj) "
-            << "(G_TYPE_CHECK_INSTANCE_CAST ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_CLIENT, " << this->nspace << service_name_ << "Client))" << endl
-            << "#define " << this->nspace_uc << service_name_uc << "_CLIENT_CLASS(c) "
-            << "(G_TYPE_CHECK_CLASS_CAST ((c), " << this->nspace_uc << "TYPE_" << service_name_uc
-            << "_CLIENT, " << this->nspace << service_name_ << "ClientClass))" << endl << "#define "
-            << this->nspace_uc << service_name_uc << "_IS_CLIENT(obj) "
-            << "(G_TYPE_CHECK_INSTANCE_TYPE ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_CLIENT))" << endl << "#define " << this->nspace_uc
-            << service_name_uc << "_IS_CLIENT_CLASS(c) "
-            << "(G_TYPE_CHECK_CLASS_TYPE ((c), " << this->nspace_uc << "TYPE_" << service_name_uc
-            << "_CLIENT))" << endl << "#define " << this->nspace_uc << service_name_uc
-            << "_CLIENT_GET_CLASS(obj) "
-            << "(G_TYPE_INSTANCE_GET_CLASS ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_CLIENT, " << this->nspace << service_name_ << "ClientClass))"
-            << endl << endl;
-
-  /* write out the function prototypes */
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    /* make the function name C friendly */
-    string funname = to_lower_case(initial_caps_to_underscores((*f_iter)->get_name()));
-
-    t_function service_function((*f_iter)->get_returntype(),
-                                service_name_lc + string("_client_") + funname,
-                                (*f_iter)->get_arglist(),
-                                (*f_iter)->get_xceptions());
-    indent(f_header_) << function_signature(&service_function) << ";" << endl;
-
-    t_function send_function(g_type_void,
-                             service_name_lc + string("_client_send_") + funname,
-                             (*f_iter)->get_arglist());
-    indent(f_header_) << function_signature(&send_function) << ";" << endl;
-
-    // implement recv if not a oneway service
-    if (!(*f_iter)->is_oneway()) {
-      t_struct noargs(program_);
-      t_function recv_function((*f_iter)->get_returntype(),
-                               service_name_lc + string("_client_recv_") + funname,
-                               &noargs,
-                               (*f_iter)->get_xceptions());
-      indent(f_header_) << function_signature(&recv_function) << ";" << endl;
-    }
-  }
-
-  /* write out the get/set function prototypes */
-  f_header_ << "void " + service_name_lc + "_client_set_property (GObject *object, guint "
-                                           "property_id, const GValue *value, GParamSpec *pspec);"
-            << endl;
-  f_header_ << "void " + service_name_lc + "_client_get_property (GObject *object, guint "
-                                           "property_id, GValue *value, GParamSpec *pspec);"
-            << endl;
-
-  f_header_ << endl;
-  // end of header code
-
-  // Generate interface method implementations
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    /* make the function name C friendly */
-    string funname = initial_caps_to_underscores((*f_iter)->get_name());
-    t_type* ttype = (*f_iter)->get_returntype();
-    t_struct* arglist = (*f_iter)->get_arglist();
-    t_struct* xlist = (*f_iter)->get_xceptions();
-    bool has_return = !ttype->is_void();
-    bool has_args = arglist->get_members().size() == 0;
-    bool has_xceptions = xlist->get_members().size() == 0;
-
-    string params = "(" + this->nspace + service_name_ + "If *iface"
-                    + (has_return ? ", " + type_name(ttype) + "* _return" : "")
-                    + (has_args ? "" : (", " + argument_list(arglist)))
-                    + (has_xceptions ? "" : (", " + xception_list(xlist))) + ", GError **error)";
-
-    string params_without_type = string("iface, ") + (has_return ? "_return, " : "");
-
-    const vector<t_field*>& fields = arglist->get_members();
-    vector<t_field*>::const_iterator f_iter_field;
-    for (f_iter_field = fields.begin(); f_iter_field != fields.end(); ++f_iter_field) {
-      params_without_type += (*f_iter_field)->get_name();
-      params_without_type += ", ";
-    }
-
-    const vector<t_field*>& xceptions = xlist->get_members();
-    vector<t_field*>::const_iterator x_iter;
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      params_without_type += (*x_iter)->get_name();
-      params_without_type += ", ";
-    }
-
-    f_service_ << "gboolean" << endl << this->nspace_lc << service_name_lc << "_if_" << funname
-               << " " << params << endl << "{" << endl << "  return " << this->nspace_uc
-               << service_name_uc << "_IF_GET_INTERFACE (iface)->" << funname << " ("
-               << params_without_type << "error);" << endl << "}" << endl << endl;
-  }
-
-  // Generate interface boilerplate
-  f_service_ << "GType" << endl << this->nspace_lc << service_name_lc << "_if_get_type (void)"
-             << endl << "{" << endl << "  static GType type = 0;" << endl << "  if (type == 0)"
-             << endl << "  {" << endl << "    static const GTypeInfo type_info =" << endl << "    {"
-             << endl << "      sizeof (" << this->nspace << service_name_ << "IfInterface)," << endl
-             << "      NULL,  /* base_init */" << endl << "      NULL,  /* base_finalize */" << endl
-             << "      NULL,  /* class_init */" << endl << "      NULL,  /* class_finalize */"
-             << endl << "      NULL,  /* class_data */" << endl
-             << "      0,     /* instance_size */" << endl << "      0,     /* n_preallocs */"
-             << endl << "      NULL,  /* instance_init */" << endl
-             << "      NULL   /* value_table */" << endl << "    };" << endl
-             << "    type = g_type_register_static (G_TYPE_INTERFACE," << endl
-             << "                                   \"" << this->nspace << service_name_ << "If\","
-             << endl << "                                   &type_info, 0);" << endl << "  }"
-             << endl << "  return type;" << endl << "}" << endl << endl;
-
-  // Generate client boilerplate
-  f_service_ << "static void " << endl << this->nspace_lc << service_name_lc
-             << "_if_interface_init (" << this->nspace << service_name_ << "IfInterface *iface);"
-             << endl << endl << "G_DEFINE_TYPE_WITH_CODE (" << this->nspace << service_name_
-             << "Client, " << this->nspace_lc << service_name_lc << "_client," << endl
-             << "                         " << parent_type_name << ", " << endl
-             << "                         G_IMPLEMENT_INTERFACE (" << this->nspace_uc << "TYPE_"
-             << service_name_uc << "_IF," << endl
-             << "                                                " << this->nspace_lc
-             << service_name_lc << "_if_interface_init))" << endl << endl;
-
-  // Generate property-related code only for base services---child
-  // service-client classes have only properties inherited from their
-  // parent class
-  if (!extends_service) {
-    // Generate client properties
-    f_service_ << "enum _" << this->nspace << service_name_ << "ClientProperties" << endl << "{"
-               << endl << "  PROP_0," << endl << "  PROP_" << this->nspace_uc << service_name_uc
-               << "_CLIENT_INPUT_PROTOCOL," << endl << "  PROP_" << this->nspace_uc
-               << service_name_uc << "_CLIENT_OUTPUT_PROTOCOL" << endl << "};" << endl << endl;
-
-    // generate property setter
-    f_service_ << "void" << endl << this->nspace_lc << service_name_lc << "_client_set_property ("
-               << "GObject *object, guint property_id, const GValue *value, "
-               << "GParamSpec *pspec)" << endl << "{" << endl << "  " << this->nspace
-               << service_name_ << "Client *client = " << this->nspace_uc << service_name_uc
-               << "_CLIENT (object);" << endl << endl << "  THRIFT_UNUSED_VAR (pspec);" << endl
-               << endl << "  switch (property_id)" << endl << "  {" << endl << "    case PROP_"
-               << this->nspace_uc << service_name_uc << "_CLIENT_INPUT_PROTOCOL:" << endl
-               << "      client->input_protocol = g_value_get_object (value);" << endl
-               << "      break;" << endl << "    case PROP_" << this->nspace_uc << service_name_uc
-               << "_CLIENT_OUTPUT_PROTOCOL:" << endl
-               << "      client->output_protocol = g_value_get_object (value);" << endl
-               << "      break;" << endl << "  }" << endl << "}" << endl << endl;
-
-    // generate property getter
-    f_service_ << "void" << endl << this->nspace_lc << service_name_lc << "_client_get_property ("
-               << "GObject *object, guint property_id, GValue *value, "
-               << "GParamSpec *pspec)" << endl << "{" << endl << "  " << this->nspace
-               << service_name_ << "Client *client = " << this->nspace_uc << service_name_uc
-               << "_CLIENT (object);" << endl << endl << "  THRIFT_UNUSED_VAR (pspec);" << endl
-               << endl << "  switch (property_id)" << endl << "  {" << endl << "    case PROP_"
-               << this->nspace_uc << service_name_uc << "_CLIENT_INPUT_PROTOCOL:" << endl
-               << "      g_value_set_object (value, client->input_protocol);" << endl
-               << "      break;" << endl << "    case PROP_" << this->nspace_uc << service_name_uc
-               << "_CLIENT_OUTPUT_PROTOCOL:" << endl
-               << "      g_value_set_object (value, client->output_protocol);" << endl
-               << "      break;" << endl << "  }" << endl << "}" << endl << endl;
-  }
-
-  // Generate client method implementations
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string name = (*f_iter)->get_name();
-    string funname = initial_caps_to_underscores(name);
-
-    // Get the struct of function call params and exceptions
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-
-    // Function for sending
-    t_function send_function(g_type_void,
-                             service_name_lc + string("_client_send_") + funname,
-                             (*f_iter)->get_arglist());
-
-    // Open the send function
-    indent(f_service_) << function_signature(&send_function) << endl;
-    scope_up(f_service_);
-
-    string reqType = (*f_iter)->is_oneway() ? "T_ONEWAY" : "T_CALL";
-
-    // Serialize the request
-    f_service_ << indent() << "gint32 cseqid = 0;" << endl << indent()
-               << "ThriftProtocol * protocol = " << this->nspace_uc << base_service_name_uc
-               << "_CLIENT (iface)->output_protocol;" << endl << endl << indent()
-               << "if (thrift_protocol_write_message_begin (protocol, \"" << name << "\", "
-               << reqType << ", cseqid, error) < 0)" << endl << indent() << "  return FALSE;"
-               << endl << endl;
-
-    generate_struct_writer(f_service_, arg_struct, "", "", false);
-
-    f_service_ << indent() << "if (thrift_protocol_write_message_end (protocol, error) < 0)" << endl
-               << indent() << "  return FALSE;" << endl << indent()
-               << "if (!thrift_transport_flush (protocol->transport, error))" << endl << indent()
-               << "  return FALSE;" << endl << indent()
-               << "if (!thrift_transport_write_end (protocol->transport, error))" << endl
-               << indent() << "  return FALSE;" << endl << endl << indent() << "return TRUE;"
-               << endl;
-
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    // Generate recv function only if not an async function
-    if (!(*f_iter)->is_oneway()) {
-      t_struct noargs(program_);
-      t_function recv_function((*f_iter)->get_returntype(),
-                               service_name_lc + string("_client_recv_") + funname,
-                               &noargs,
-                               (*f_iter)->get_xceptions());
-      // Open function
-      indent(f_service_) << function_signature(&recv_function) << endl;
-      scope_up(f_service_);
-
-      f_service_ << indent() << "gint32 rseqid;" << endl
-                 << indent() << "gchar * fname = NULL;" << endl
-                 << indent() << "ThriftMessageType mtype;" << endl
-                 << indent() << "ThriftProtocol * protocol = "
-                 << this->nspace_uc << base_service_name_uc
-                 << "_CLIENT (iface)->input_protocol;" << endl
-                 << indent() << "ThriftApplicationException *xception;" << endl
-                 << endl
-                 << indent() << "if (thrift_protocol_read_message_begin "
-                    "(protocol, &fname, &mtype, &rseqid, error) < 0) {" << endl;
-      indent_up();
-      f_service_ << indent() << "if (fname) g_free (fname);" << endl
-                 << indent() << "return FALSE;" << endl;
-      indent_down();
-      f_service_ << indent() << "}" << endl
-                 << endl
-                 << indent() << "if (mtype == T_EXCEPTION) {" << endl;
-      indent_up();
-      f_service_ << indent() << "if (fname) g_free (fname);" << endl
-                 << indent() << "xception = g_object_new "
-                    "(THRIFT_TYPE_APPLICATION_EXCEPTION, NULL);" << endl
-                 << indent() << "thrift_struct_read (THRIFT_STRUCT (xception), "
-                    "protocol, NULL);" << endl
-                 << indent() << "thrift_protocol_read_message_end "
-                    "(protocol, NULL);" << endl
-                 << indent() << "thrift_transport_read_end "
-                    "(protocol->transport, NULL);" << endl
-                 << indent() << "g_set_error (error, "
-                    "THRIFT_APPLICATION_EXCEPTION_ERROR,xception->type, "
-                    "\"application error: %s\", xception->message);" << endl
-                 << indent() << "g_object_unref (xception);" << endl
-                 << indent() << "return FALSE;" << endl;
-      indent_down();
-      f_service_ << indent() << "} else if (mtype != T_REPLY) {" << endl;
-      indent_up();
-      f_service_ << indent() << "if (fname) g_free (fname);" << endl
-                 << indent() << "thrift_protocol_skip (protocol, T_STRUCT, "
-                    "NULL);" << endl
-                 << indent() << "thrift_protocol_read_message_end (protocol, "
-                    "NULL);" << endl
-                 << indent() << "thrift_transport_read_end ("
-                    "protocol->transport, NULL);" << endl
-                 << indent() << "g_set_error (error, "
-                    "THRIFT_APPLICATION_EXCEPTION_ERROR, "
-                    "THRIFT_APPLICATION_EXCEPTION_ERROR_INVALID_MESSAGE_TYPE, "
-                    "\"invalid message type %d, expected T_REPLY\", mtype);"
-                 << endl
-                 << indent() << "return FALSE;" << endl;
-      indent_down();
-      f_service_ << indent() << "} else if (strncmp (fname, \"" << name
-                 << "\", " << name.length() << ") != 0) {" << endl;
-      indent_up();
-      f_service_ << indent() << "thrift_protocol_skip (protocol, T_STRUCT, "
-                    "NULL);" << endl
-                 << indent() << "thrift_protocol_read_message_end (protocol,"
-                    "error);" << endl
-                 << indent() << "thrift_transport_read_end ("
-                    "protocol->transport, error);" << endl
-                 << indent() << "g_set_error (error, "
-                    "THRIFT_APPLICATION_EXCEPTION_ERROR, "
-                    "THRIFT_APPLICATION_EXCEPTION_ERROR_WRONG_METHOD_NAME, "
-                    "\"wrong method name %s, expected " << name
-                    << "\", fname);" << endl
-                 << indent() << "if (fname) g_free (fname);" << endl
-                 << indent() << "return FALSE;" << endl;
-      indent_down();
-      f_service_ << indent() << "}" << endl
-                 << indent() << "if (fname) g_free (fname);" << endl
-                 << endl;
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-
-      {
-        t_struct result(program_, tservice->get_name() + "_" + (*f_iter)->get_name() + "_result");
-        t_field success((*f_iter)->get_returntype(), "*_return", 0);
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          result.append(&success);
-        }
-
-        // add readers for exceptions, dereferencing the pointer.
-        for (x_iter = xceptions.begin(); x_iter != xceptions.end(); x_iter++) {
-          t_field* xception = new t_field((*x_iter)->get_type(),
-                                          "*" + (*x_iter)->get_name(),
-                                          (*x_iter)->get_key());
-          result.append(xception);
-        }
-
-        generate_struct_reader(f_service_, &result, "", "", false);
-      }
-
-      f_service_ << indent() << "if (thrift_protocol_read_message_end (protocol, error) < 0)"
-                 << endl << indent() << "  return FALSE;" << endl << endl << indent()
-                 << "if (!thrift_transport_read_end (protocol->transport, error))" << endl
-                 << indent() << "  return FALSE;" << endl << endl;
-
-      // copy over any throw exceptions and return failure
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); x_iter++) {
-        f_service_ << indent() << "if (*" << (*x_iter)->get_name() << " != NULL)" << endl
-                   << indent() << "{" << endl << indent() << "    g_set_error (error, "
-                   << this->nspace_uc
-                   << to_upper_case(initial_caps_to_underscores((*x_iter)->get_type()->get_name()))
-                   << "_ERROR, " << this->nspace_uc
-                   << to_upper_case(initial_caps_to_underscores((*x_iter)->get_type()->get_name()))
-                   << "_ERROR_CODE, \"" << (*x_iter)->get_type()->get_name() << "\");" << endl
-                   << indent() << "    return FALSE;" << endl << indent() << "}" << endl;
-      }
-      // Close function
-      indent(f_service_) << "return TRUE;" << endl;
-      scope_down(f_service_);
-      f_service_ << endl;
-    }
-
-    // Open function
-    t_function service_function((*f_iter)->get_returntype(),
-                                service_name_lc + string("_client_") + funname,
-                                (*f_iter)->get_arglist(),
-                                (*f_iter)->get_xceptions());
-    indent(f_service_) << function_signature(&service_function) << endl;
-    scope_up(f_service_);
-
-    // wrap each function
-    f_service_ << indent() << "if (!" << this->nspace_lc << service_name_lc << "_client_send_"
-               << funname << " (iface";
-
-    // Declare the function arguments
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << ", " << (*fld_iter)->get_name();
-    }
-    f_service_ << ", error))" << endl << indent() << "  return FALSE;" << endl;
-
-    // if not oneway, implement recv
-    if (!(*f_iter)->is_oneway()) {
-      string ret = (*f_iter)->get_returntype()->is_void() ? "" : "_return, ";
-
-      const vector<t_field*>& xceptions = (*f_iter)->get_xceptions()->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        ret += (*x_iter)->get_name();
-        ret += ", ";
-      }
-
-      f_service_ << indent() << "if (!" << this->nspace_lc << service_name_lc << "_client_recv_"
-                 << funname << " (iface, " << ret << "error))" << endl << indent()
-                 << "  return FALSE;" << endl;
-    }
-
-    // return TRUE which means all functions were called OK
-    indent(f_service_) << "return TRUE;" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-  }
-
-  // create the interface initializer
-  f_service_ << "static void" << endl
-             << this->nspace_lc << service_name_lc << "_if_interface_init ("
-             << this->nspace << service_name_ << "IfInterface *iface)" << endl;
-  scope_up(f_service_);
-  if (functions.size() > 0) {
-    for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-      /* make the function name C friendly */
-      string funname = initial_caps_to_underscores((*f_iter)->get_name());
-
-      f_service_ << indent() << "iface->" << funname << " = " << this->nspace_lc
-                 << service_name_lc << "_client_" << funname << ";" << endl;
-    }
-  }
-  else {
-    f_service_ << indent() << "THRIFT_UNUSED_VAR (iface);" << endl;
-  }
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // create the client instance initializer
-  f_service_ << "static void" << endl
-             << this->nspace_lc << service_name_lc << "_client_init ("
-             << this->nspace << service_name_ << "Client *client)" << endl;
-  scope_up(f_service_);
-  if (!extends_service) {
-    f_service_ << indent() << "client->input_protocol = NULL;" << endl
-               << indent() << "client->output_protocol = NULL;" << endl;
-  }
-  else {
-    f_service_ << indent() << "THRIFT_UNUSED_VAR (client);" << endl;
-  }
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // create the client class initializer
-  f_service_ << "static void" << endl << this->nspace_lc << service_name_lc
-             << "_client_class_init (" << this->nspace << service_name_ << "ClientClass *cls)"
-             << endl << "{" << endl;
-  if (!extends_service) {
-    f_service_ << "  GObjectClass *gobject_class = G_OBJECT_CLASS (cls);" << endl
-               << "  GParamSpec *param_spec;" << endl << endl
-               << "  gobject_class->set_property = " << this->nspace_lc << service_name_lc
-               << "_client_set_property;" << endl
-               << "  gobject_class->get_property = " << this->nspace_lc << service_name_lc
-               << "_client_get_property;" << endl << endl
-               << "  param_spec = g_param_spec_object (\"input_protocol\"," << endl
-               << "                                    \"input protocol (construct)\"," << endl
-               << "                                    \"Set the client input protocol\"," << endl
-               << "                                    THRIFT_TYPE_PROTOCOL," << endl
-               << "                                    G_PARAM_READWRITE);" << endl
-               << "  g_object_class_install_property (gobject_class," << endl
-               << "                                   PROP_" << this->nspace_uc << service_name_uc
-               << "_CLIENT_INPUT_PROTOCOL, param_spec);" << endl << endl
-               << "  param_spec = g_param_spec_object (\"output_protocol\"," << endl
-               << "                                    \"output protocol (construct)\"," << endl
-               << "                                    \"Set the client output protocol\"," << endl
-               << "                                    THRIFT_TYPE_PROTOCOL," << endl
-               << "                                    G_PARAM_READWRITE);" << endl
-               << "  g_object_class_install_property (gobject_class," << endl
-               << "                                   PROP_" << this->nspace_uc << service_name_uc
-               << "_CLIENT_OUTPUT_PROTOCOL, param_spec);" << endl;
-  }
-  else {
-    f_service_ << "  THRIFT_UNUSED_VAR (cls);" << endl;
-  }
-  f_service_ << "}" << endl << endl;
-}
-
-/**
- * Generates C code that represents a Thrift service handler.
- *
- * @param tservice The service for which to generate a handler.
- */
-void t_c_glib_generator::generate_service_handler(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator function_iter;
-
-  string service_name_lc = to_lower_case(initial_caps_to_underscores(service_name_));
-  string service_name_uc = to_upper_case(service_name_lc);
-
-  string class_name = this->nspace + service_name_ + "Handler";
-  string class_name_lc = to_lower_case(initial_caps_to_underscores(class_name));
-  string class_name_uc = to_upper_case(class_name_lc);
-
-  string parent_class_name;
-  string parent_type_name;
-
-  string args_indent;
-
-  // The service this service extends, or NULL if it extends no service
-  t_service* extends_service = tservice->get_extends();
-
-  // Determine the name of our parent service (if any) and the handler class'
-  // parent class name and type
-  if (extends_service) {
-    string parent_service_name = extends_service->get_name();
-    string parent_service_name_lc = to_lower_case(initial_caps_to_underscores(parent_service_name));
-    string parent_service_name_uc = to_upper_case(parent_service_name_lc);
-
-    parent_class_name = this->nspace + parent_service_name + "Handler";
-    parent_type_name = this->nspace_uc + "TYPE_" + parent_service_name_uc + "_HANDLER";
-  } else {
-    parent_class_name = "GObject";
-    parent_type_name = "G_TYPE_OBJECT";
-  }
-
-  // Generate the handler class' definition in the header file
-
-  // Generate the handler instance definition
-  f_header_ << "/* " << service_name_ << " handler (abstract base class) */" << endl << "struct _"
-            << class_name << endl << "{" << endl;
-  indent_up();
-  f_header_ << indent() << parent_class_name << " parent;" << endl;
-  indent_down();
-  f_header_ << "};" << endl << "typedef struct _" << class_name << " " << class_name << ";" << endl
-            << endl;
-
-  // Generate the handler class definition, including its class members
-  // (methods)
-  f_header_ << "struct _" << class_name << "Class" << endl << "{" << endl;
-  indent_up();
-  f_header_ << indent() << parent_class_name << "Class parent;" << endl << endl;
-
-  for (function_iter = functions.begin(); function_iter != functions.end(); ++function_iter) {
-    string method_name = initial_caps_to_underscores((*function_iter)->get_name());
-    t_type* return_type = (*function_iter)->get_returntype();
-    t_struct* arg_list = (*function_iter)->get_arglist();
-    t_struct* x_list = (*function_iter)->get_xceptions();
-    bool has_return = !return_type->is_void();
-    bool has_args = arg_list->get_members().size() == 0;
-    bool has_xceptions = x_list->get_members().size() == 0;
-
-    string params = "(" + this->nspace + service_name_ + "If *iface"
-                    + (has_return ? ", " + type_name(return_type) + "* _return" : "")
-                    + (has_args ? "" : (", " + argument_list(arg_list)))
-                    + (has_xceptions ? "" : (", " + xception_list(x_list))) + ", GError **error)";
-
-    indent(f_header_) << "gboolean (*" << method_name << ") " << params << ";" << endl;
-  }
-  indent_down();
-
-  f_header_ << "};" << endl << "typedef struct _" << class_name << "Class " << class_name
-            << "Class;" << endl << endl;
-
-  // Generate the remaining header boilerplate
-  f_header_ << "GType " << class_name_lc << "_get_type (void);" << endl << "#define "
-            << this->nspace_uc << "TYPE_" << service_name_uc << "_HANDLER "
-            << "(" << class_name_lc << "_get_type())" << endl << "#define " << class_name_uc
-            << "(obj) "
-            << "(G_TYPE_CHECK_INSTANCE_CAST ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_HANDLER, " << class_name << "))" << endl << "#define "
-            << this->nspace_uc << "IS_" << service_name_uc << "_HANDLER(obj) "
-            << "(G_TYPE_CHECK_INSTANCE_TYPE ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_HANDLER))" << endl << "#define " << class_name_uc
-            << "_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_HANDLER, " << class_name << "Class))" << endl << "#define "
-            << this->nspace_uc << "IS_" << service_name_uc << "_HANDLER_CLASS(c) "
-            << "(G_TYPE_CHECK_CLASS_TYPE ((c), " << this->nspace_uc << "TYPE_" << service_name_uc
-            << "_HANDLER))" << endl << "#define " << this->nspace_uc << service_name_uc
-            << "_HANDLER_GET_CLASS(obj) "
-            << "(G_TYPE_INSTANCE_GET_CLASS ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_HANDLER, " << class_name << "Class))" << endl << endl;
-
-  // Generate the handler class' method definitions
-  for (function_iter = functions.begin(); function_iter != functions.end(); ++function_iter) {
-    string method_name = initial_caps_to_underscores((*function_iter)->get_name());
-    t_type* return_type = (*function_iter)->get_returntype();
-    t_struct* arg_list = (*function_iter)->get_arglist();
-    t_struct* x_list = (*function_iter)->get_xceptions();
-    bool has_return = !return_type->is_void();
-    bool has_args = arg_list->get_members().size() == 0;
-    bool has_xceptions = x_list->get_members().size() == 0;
-
-    string params = "(" + this->nspace + service_name_ + "If *iface"
-                    + (has_return ? ", " + type_name(return_type) + "* _return" : "")
-                    + (has_args ? "" : (", " + argument_list(arg_list)))
-                    + (has_xceptions ? "" : (", " + xception_list(x_list))) + ", GError **error)";
-
-    f_header_ << "gboolean " << class_name_lc << "_" << method_name << " " << params << ";" << endl;
-  }
-  f_header_ << endl;
-
-  // Generate the handler's implementation in the implementation file
-
-  // Generate the implementation boilerplate
-  f_service_ << "static void" << endl << class_name_lc << "_" << service_name_lc
-             << "_if_interface_init (" << this->nspace << service_name_ << "IfInterface *iface);"
-             << endl << endl;
-
-  args_indent = string(25, ' ');
-  f_service_ << "G_DEFINE_TYPE_WITH_CODE (" << class_name << ", " << endl << args_indent
-             << class_name_lc << "," << endl << args_indent << parent_type_name << "," << endl
-             << args_indent << "G_IMPLEMENT_INTERFACE (" << this->nspace_uc << "TYPE_"
-             << service_name_uc << "_IF," << endl;
-  args_indent += string(23, ' ');
-  f_service_ << args_indent << class_name_lc << "_" << service_name_lc << "_if_interface_init))"
-             << endl << endl;
-
-  // Generate the handler method implementations
-  for (function_iter = functions.begin(); function_iter != functions.end(); ++function_iter) {
-    string function_name = (*function_iter)->get_name();
-    string method_name = initial_caps_to_underscores(function_name);
-    t_type* return_type = (*function_iter)->get_returntype();
-    t_struct* arg_list = (*function_iter)->get_arglist();
-    t_struct* x_list = (*function_iter)->get_xceptions();
-
-    const vector<t_field*>& args = arg_list->get_members();
-    const vector<t_field*>& xceptions = x_list->get_members();
-
-    vector<t_field*>::const_iterator field_iter;
-
-    t_function implementing_function(return_type,
-                                     service_name_lc + "_handler_" + method_name,
-                                     arg_list,
-                                     x_list,
-                                     (*function_iter)->is_oneway());
-
-    indent(f_service_) << function_signature(&implementing_function) << endl;
-    scope_up(f_service_);
-    f_service_ << indent() << "g_return_val_if_fail (" << this->nspace_uc << "IS_"
-               << service_name_uc << "_HANDLER (iface), FALSE);" << endl << endl << indent()
-               << "return " << class_name_uc << "_GET_CLASS (iface)"
-               << "->" << method_name << " (iface, ";
-
-    if (!return_type->is_void()) {
-      f_service_ << "_return, ";
-    }
-    for (field_iter = args.begin(); field_iter != args.end(); ++field_iter) {
-      f_service_ << (*field_iter)->get_name() << ", ";
-    }
-    for (field_iter = xceptions.begin(); field_iter != xceptions.end(); ++field_iter) {
-      f_service_ << (*field_iter)->get_name() << ", ";
-    }
-    f_service_ << "error);" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-  }
-
-  // Generate the handler interface initializer
-  f_service_ << "static void" << endl << class_name_lc << "_" << service_name_lc
-             << "_if_interface_init (" << this->nspace << service_name_ << "IfInterface *iface)"
-             << endl;
-  scope_up(f_service_);
-  if (functions.size() > 0) {
-    for (function_iter = functions.begin(); function_iter != functions.end(); ++function_iter) {
-      string method_name = initial_caps_to_underscores((*function_iter)->get_name());
-
-      f_service_ << indent() << "iface->" << method_name << " = " << class_name_lc << "_"
-                 << method_name << ";" << endl;
-    }
-  }
-  else {
-    f_service_ << "THRIFT_UNUSED_VAR (iface);" << endl;
-  }
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate the handler instance initializer
-  f_service_ << "static void" << endl << class_name_lc << "_init (" << class_name << " *self)"
-             << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "THRIFT_UNUSED_VAR (self);" << endl;
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate the handler class initializer
-  f_service_ << "static void" << endl
-             << class_name_lc << "_class_init (" << class_name << "Class *cls)"
-             << endl;
-  scope_up(f_service_);
-  if (functions.size() > 0) {
-    for (function_iter = functions.begin();
-         function_iter != functions.end();
-         ++function_iter) {
-      string function_name = (*function_iter)->get_name();
-      string method_name = initial_caps_to_underscores(function_name);
-
-      // All methods are pure virtual and must be implemented by subclasses
-      f_service_ << indent() << "cls->" << method_name << " = NULL;" << endl;
-    }
-  }
-  else {
-    f_service_ << indent() << "THRIFT_UNUSED_VAR (cls);" << endl;
-  }
-  scope_down(f_service_);
-  f_service_ << endl;
-}
-
-/**
- * Generates C code that represents a Thrift service processor.
- *
- * @param tservice The service for which to generate a processor
- */
-void t_c_glib_generator::generate_service_processor(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator function_iter;
-
-  string service_name_lc = to_lower_case(initial_caps_to_underscores(service_name_));
-  string service_name_uc = to_upper_case(service_name_lc);
-
-  string class_name = this->nspace + service_name_ + "Processor";
-  string class_name_lc = to_lower_case(initial_caps_to_underscores(class_name));
-  string class_name_uc = to_upper_case(class_name_lc);
-
-  string parent_class_name;
-  string parent_type_name;
-
-  string handler_class_name = this->nspace + service_name_ + "Handler";
-  string handler_class_name_lc = initial_caps_to_underscores(handler_class_name);
-
-  string process_function_type_name = class_name + "ProcessFunction";
-  string process_function_def_type_name =
-    class_name_lc + "_process_function_def";
-
-  string function_name;
-  string args_indent;
-
-  // The service this service extends, or NULL if it extends no service
-  t_service* extends_service = tservice->get_extends();
-
-  // Determine the name of our parent service (if any) and the
-  // processor class' parent class name and type
-  if (extends_service) {
-    string parent_service_name = extends_service->get_name();
-    string parent_service_name_lc = to_lower_case(initial_caps_to_underscores(parent_service_name));
-    string parent_service_name_uc = to_upper_case(parent_service_name_lc);
-
-    parent_class_name = this->nspace + parent_service_name + "Processor";
-    parent_type_name = this->nspace_uc + "TYPE_" + parent_service_name_uc + "_PROCESSOR";
-  } else {
-    parent_class_name = "ThriftDispatchProcessor";
-    parent_type_name = "THRIFT_TYPE_DISPATCH_PROCESSOR";
-  }
-
-  // Generate the processor class' definition in the header file
-
-  // Generate the processor instance definition
-  f_header_ << "/* " << service_name_ << " processor */" << endl << "struct _" << class_name << endl
-            << "{" << endl;
-  indent_up();
-  f_header_ << indent() << parent_class_name << " parent;" << endl << endl << indent()
-            << "/* protected */" << endl << indent()
-            << this->nspace + service_name_ + "Handler *handler;" << endl << indent()
-            << "GHashTable *process_map;" << endl;
-  indent_down();
-  f_header_ << "};" << endl << "typedef struct _" << class_name << " " << class_name << ";" << endl
-            << endl;
-
-  // Generate the processor class definition
-  f_header_ << "struct _" << class_name << "Class" << endl << "{" << endl;
-  indent_up();
-  f_header_ << indent() << parent_class_name << "Class parent;" << endl << endl << indent()
-            << "/* protected */" << endl << indent()
-            << "gboolean (*dispatch_call) (ThriftDispatchProcessor *processor," << endl;
-  args_indent = indent() + string(27, ' ');
-  f_header_ << args_indent << "ThriftProtocol *in," << endl << args_indent << "ThriftProtocol *out,"
-            << endl << args_indent << "gchar *fname," << endl << args_indent << "gint32 seqid,"
-            << endl << args_indent << "GError **error);" << endl;
-  indent_down();
-  f_header_ << "};" << endl << "typedef struct _" << class_name << "Class " << class_name
-            << "Class;" << endl << endl;
-
-  // Generate the remaining header boilerplate
-  f_header_ << "GType " << class_name_lc << "_get_type (void);" << endl << "#define "
-            << this->nspace_uc << "TYPE_" << service_name_uc << "_PROCESSOR "
-            << "(" << class_name_lc << "_get_type())" << endl << "#define " << class_name_uc
-            << "(obj) "
-            << "(G_TYPE_CHECK_INSTANCE_CAST ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_PROCESSOR, " << class_name << "))" << endl << "#define "
-            << this->nspace_uc << "IS_" << service_name_uc << "_PROCESSOR(obj) "
-            << "(G_TYPE_CHECK_INSTANCE_TYPE ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_PROCESSOR))" << endl << "#define " << class_name_uc
-            << "_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_PROCESSOR, " << class_name << "Class))" << endl << "#define "
-            << this->nspace_uc << "IS_" << service_name_uc << "_PROCESSOR_CLASS(c) "
-            << "(G_TYPE_CHECK_CLASS_TYPE ((c), " << this->nspace_uc << "TYPE_" << service_name_uc
-            << "_PROCESSOR))" << endl << "#define " << this->nspace_uc << service_name_uc
-            << "_PROCESSOR_GET_CLASS(obj) "
-            << "(G_TYPE_INSTANCE_GET_CLASS ((obj), " << this->nspace_uc << "TYPE_"
-            << service_name_uc << "_PROCESSOR, " << class_name << "Class))" << endl << endl;
-
-  // Generate the processor's implementation in the implementation file
-
-  // Generate the processor's properties enum
-  f_service_ << "enum _" << class_name << "Properties" << endl << "{" << endl;
-  indent_up();
-  f_service_ << indent() << "PROP_" << class_name_uc << "_0," << endl << indent() << "PROP_"
-             << class_name_uc << "_HANDLER" << endl;
-  indent_down();
-  f_service_ << "};" << endl << endl;
-
-  // Generate the implementation boilerplate
-  args_indent = string(15, ' ');
-  f_service_ << "G_DEFINE_TYPE (" << class_name << "," << endl << args_indent << class_name_lc
-             << "," << endl << args_indent << parent_type_name << ")" << endl << endl;
-
-  // Generate the processor's processing-function type
-  args_indent = string(process_function_type_name.length() + 23, ' ');
-  f_service_ << "typedef gboolean (* " << process_function_type_name << ") ("
-             << class_name << " *, " << endl
-             << args_indent << "gint32," << endl
-             << args_indent << "ThriftProtocol *," << endl
-             << args_indent << "ThriftProtocol *," << endl
-             << args_indent << "GError **);" << endl
-             << endl;
-
-  // Generate the processor's processing-function-definition type
-  f_service_ << "typedef struct" << endl
-             << "{" << endl;
-  indent_up();
-  f_service_ << indent() << "gchar *name;" << endl
-             << indent() << process_function_type_name << " function;" << endl;
-  indent_down();
-  f_service_ << "} " << process_function_def_type_name << ";" << endl
-             << endl;
-
-  // Generate forward declarations of the processor's processing functions so we
-  // can refer to them in the processing-function-definition struct below and
-  // keep all of the processor's declarations in one place
-  for (function_iter = functions.begin();
-       function_iter != functions.end();
-       ++function_iter) {
-    function_name = class_name_lc + "_process_"
-      + initial_caps_to_underscores((*function_iter)->get_name());
-
-    args_indent = string(function_name.length() + 2, ' ');
-    f_service_ << "static gboolean" << endl
-               << function_name << " ("
-               << class_name << " *," << endl
-               << args_indent << "gint32," << endl
-               << args_indent << "ThriftProtocol *," << endl
-               << args_indent << "ThriftProtocol *," << endl
-               << args_indent << "GError **);" << endl;
-  }
-  f_service_ << endl;
-
-  // Generate the processor's processing-function definitions, if the service
-  // defines any methods
-  if (functions.size() > 0) {
-    f_service_ << indent() << "static " << process_function_def_type_name
-               << endl
-               << indent() << class_name_lc << "_process_function_defs["
-               << functions.size() << "] = {" << endl;
-    indent_up();
-    for (function_iter = functions.begin();
-         function_iter != functions.end();
-         ++function_iter) {
-      string service_function_name = (*function_iter)->get_name();
-      string process_function_name = class_name_lc + "_process_"
-        + initial_caps_to_underscores(service_function_name);
-
-      f_service_ << indent() << "{" << endl;
-      indent_up();
-      f_service_ << indent() << "\"" << service_function_name << "\"," << endl
-                 << indent() << process_function_name << endl;
-      indent_down();
-      f_service_ << indent() << "}"
-                 << (function_iter == --functions.end() ? "" : ",") << endl;
-    }
-    indent_down();
-    f_service_ << indent() << "};" << endl
-               << endl;
-  }
-
-  // Generate the processor's processing functions
-  for (function_iter = functions.begin(); function_iter != functions.end(); ++function_iter) {
-    string service_function_name = (*function_iter)->get_name();
-    string service_function_name_ic = underscores_to_initial_caps(service_function_name);
-    string service_function_name_lc = initial_caps_to_underscores(service_function_name);
-    string service_function_name_uc = to_upper_case(service_function_name_lc);
-
-    t_type* return_type = (*function_iter)->get_returntype();
-    bool has_return_value = !return_type->is_void();
-
-    t_struct* arg_list = (*function_iter)->get_arglist();
-    const vector<t_field*>& args = arg_list->get_members();
-    vector<t_field*>::const_iterator arg_iter;
-
-    const vector<t_field*>& xceptions = (*function_iter)->get_xceptions()->get_members();
-    vector<t_field*>::const_iterator xception_iter;
-
-    string args_class_name = this->nspace + service_name_ + service_function_name_ic + "Args";
-    string args_class_type = this->nspace_uc + "TYPE_" + service_name_uc + "_"
-                             + service_function_name_uc + "_ARGS";
-
-    string result_class_name = this->nspace + service_name_ + service_function_name_ic + "Result";
-    string result_class_type = this->nspace_uc + "TYPE_" + service_name_uc + "_"
-                               + service_function_name_uc + "_RESULT";
-
-    string handler_function_name = handler_class_name_lc + "_" + service_function_name_lc;
-
-    function_name = class_name_lc + "_process_"
-                    + initial_caps_to_underscores(service_function_name);
-
-    args_indent = string(function_name.length() + 2, ' ');
-    f_service_ << "static gboolean" << endl << function_name << " (" << class_name << " *self,"
-               << endl << args_indent << "gint32 sequence_id," << endl << args_indent
-               << "ThriftProtocol *input_protocol," << endl << args_indent
-               << "ThriftProtocol *output_protocol," << endl << args_indent << "GError **error)"
-               << endl;
-    scope_up(f_service_);
-    f_service_ << indent() << "gboolean result = TRUE;" << endl
-               << indent() << "ThriftTransport * transport;" << endl
-               << indent() << "ThriftApplicationException *xception;" << endl
-               << indent() << args_class_name + " * args =" << endl;
-    indent_up();
-    f_service_ << indent() << "g_object_new (" << args_class_type << ", NULL);" << endl << endl;
-    indent_down();
-    if ((*function_iter)->is_oneway()) {
-      f_service_ << indent() << "THRIFT_UNUSED_VAR (sequence_id);" << endl << indent()
-                 << "THRIFT_UNUSED_VAR (output_protocol);" << endl << endl;
-    }
-    f_service_ << indent() << "g_object_get (input_protocol, \"transport\", "
-               << "&transport, NULL);" << endl << endl;
-
-    // Read the method's arguments from the caller
-    f_service_ << indent() << "if ((thrift_struct_read (THRIFT_STRUCT (args), "
-               << "input_protocol, error) != -1) &&" << endl << indent()
-               << "    (thrift_protocol_read_message_end (input_protocol, "
-               << "error) != -1) &&" << endl << indent()
-               << "    (thrift_transport_read_end (transport, error) != FALSE))" << endl;
-    scope_up(f_service_);
-
-    for (arg_iter = args.begin(); arg_iter != args.end(); ++arg_iter) {
-      f_service_ << indent() << property_type_name((*arg_iter)->get_type()) << " "
-                 << (*arg_iter)->get_name() << ";" << endl;
-    }
-    for (xception_iter = xceptions.begin(); xception_iter != xceptions.end(); ++xception_iter) {
-      f_service_ << indent() << type_name((*xception_iter)->get_type()) << " "
-                 << initial_caps_to_underscores((*xception_iter)->get_name()) << " = NULL;" << endl;
-    }
-    if (has_return_value) {
-      f_service_ << indent() << property_type_name(return_type) << " return_value;" << endl;
-    }
-    if (!(*function_iter)->is_oneway()) {
-      f_service_ << indent() << result_class_name << " * result_struct;" << endl;
-    }
-    f_service_ << endl;
-
-    if (args.size() > 0) {
-      f_service_ << indent() << "g_object_get (args," << endl;
-      args_indent = indent() + string(14, ' ');
-      for (arg_iter = args.begin(); arg_iter != args.end(); ++arg_iter) {
-        string arg_name = (*arg_iter)->get_name();
-
-        f_service_ << args_indent << "\"" << arg_name << "\", &" << arg_name << "," << endl;
-      }
-      f_service_ << args_indent << "NULL);" << endl << endl;
-    }
-
-    if (!(*function_iter)->is_oneway()) {
-      f_service_ << indent() << "g_object_unref (transport);" << endl << indent()
-                 << "g_object_get (output_protocol, \"transport\", "
-                 << "&transport, NULL);" << endl << endl << indent()
-                 << "result_struct = g_object_new (" << result_class_type << ", NULL);" << endl;
-      if (has_return_value) {
-        f_service_ << indent() << "g_object_get (result_struct, "
-                                  "\"success\", &return_value, NULL);" << endl;
-      }
-      f_service_ << endl;
-    }
-
-    // Pass the arguments to the corresponding method in the handler
-    f_service_ << indent() << "if (" << handler_function_name << " (" << this->nspace_uc
-               << service_name_uc << "_IF (self->handler)," << endl;
-    args_indent = indent() + string(handler_function_name.length() + 6, ' ');
-    if (has_return_value) {
-      string return_type_name = type_name(return_type);
-
-      f_service_ << args_indent;
-
-      // Cast return_value if it was declared as a type other than the return
-      // value's actual type---this is true for integer values 32 bits or fewer
-      // in width, for which GLib requires a plain gint type be used when
-      // storing or retrieving as an object property
-      if (return_type_name != property_type_name(return_type)) {
-        if (return_type_name[return_type_name.length() - 1] != '*') {
-          return_type_name += ' ';
-        }
-        return_type_name += '*';
-
-        f_service_ << "(" << return_type_name << ")";
-      }
-
-      f_service_ << "&return_value," << endl;
-    }
-    for (arg_iter = args.begin(); arg_iter != args.end(); ++arg_iter) {
-      f_service_ << args_indent << (*arg_iter)->get_name() << "," << endl;
-    }
-    for (xception_iter = xceptions.begin(); xception_iter != xceptions.end(); ++xception_iter) {
-      f_service_ << args_indent << "&" << initial_caps_to_underscores((*xception_iter)->get_name())
-                 << "," << endl;
-    }
-    f_service_ << args_indent << "error) == TRUE)" << endl;
-    scope_up(f_service_);
-
-    // The handler reported success; return the result, if any, to the caller
-    if (!(*function_iter)->is_oneway()) {
-      if (has_return_value) {
-        f_service_ << indent() << "g_object_set (result_struct, \"success\", ";
-        if (type_name(return_type) != property_type_name(return_type)) {
-          // Roundtrip cast to fix the position of sign bit.
-          f_service_ << "(" << property_type_name(return_type) << ")"
-                     << "(" << type_name(return_type) << ")";
-        }
-        f_service_ << "return_value, "
-                   << "NULL);" << endl;
-
-        // Deallocate (or unref) return_value
-        return_type = get_true_type(return_type);
-        if (return_type->is_base_type()) {
-          t_base_type* base_type = ((t_base_type*)return_type);
-
-          if (base_type->get_base() == t_base_type::TYPE_STRING) {
-            f_service_ << indent() << "if (return_value != NULL)" << endl;
-            indent_up();
-            if (base_type->is_binary()) {
-              f_service_ << indent() << "g_byte_array_unref (return_value);" << endl;
-            } else {
-              f_service_ << indent() << "g_free (return_value);" << endl;
-            }
-            indent_down();
-          }
-        } else if (return_type->is_container()) {
-          f_service_ << indent() << "if (return_value != NULL)" << endl;
-          indent_up();
-
-          if (return_type->is_list()) {
-            t_type* elem_type = ((t_list*)return_type)->get_elem_type();
-
-            f_service_ << indent();
-            if (is_numeric(elem_type)) {
-              f_service_ << "g_array_unref";
-            } else {
-              f_service_ << "g_ptr_array_unref";
-            }
-            f_service_ << " (return_value);" << endl;
-          } else if (return_type->is_map() || return_type->is_set()) {
-            f_service_ << indent() << "g_hash_table_unref (return_value);" << endl;
-          }
-
-          indent_down();
-        } else if (return_type->is_struct()) {
-          f_service_ << indent() << "if (return_value != NULL)" << endl;
-          indent_up();
-          f_service_ << indent() << "g_object_unref (return_value);" << endl;
-          indent_down();
-        }
-
-        f_service_ << endl;
-      }
-      f_service_ << indent() << "result =" << endl;
-      indent_up();
-      f_service_ << indent() << "((thrift_protocol_write_message_begin (output_protocol," << endl;
-      args_indent = indent() + string(39, ' ');
-      f_service_ << args_indent << "\"" << service_function_name << "\"," << endl << args_indent
-                 << "T_REPLY," << endl << args_indent << "sequence_id," << endl << args_indent
-                 << "error) != -1) &&" << endl << indent()
-                 << " (thrift_struct_write (THRIFT_STRUCT (result_struct)," << endl;
-      args_indent = indent() + string(23, ' ');
-      f_service_ << args_indent << "output_protocol," << endl << args_indent << "error) != -1));"
-                 << endl;
-      indent_down();
-    }
-    scope_down(f_service_);
-    f_service_ << indent() << "else" << endl;
-    scope_up(f_service_);
-
-    // The handler reported failure; check to see if an application-defined
-    // exception was raised and if so, return it to the caller
-    f_service_ << indent();
-    if (xceptions.size() > 0) {
-      for (xception_iter = xceptions.begin(); xception_iter != xceptions.end(); ++xception_iter) {
-        f_service_ << "if (" << initial_caps_to_underscores((*xception_iter)->get_name())
-                   << " != NULL)" << endl;
-        scope_up(f_service_);
-        f_service_ << indent() << "g_object_set (result_struct," << endl;
-        args_indent = indent() + string(14, ' ');
-        f_service_ << args_indent << "\"" << (*xception_iter)->get_name() << "\", "
-                   << (*xception_iter)->get_name() << "," << endl << args_indent << "NULL);" << endl
-                   << endl;
-        f_service_ << indent() << "result =" << endl;
-        indent_up();
-        f_service_ << indent() << "((thrift_protocol_write_message_begin (output_protocol," << endl;
-        args_indent = indent() + string(39, ' ');
-        f_service_ << args_indent << "\"" << service_function_name << "\"," << endl << args_indent
-                   << "T_REPLY," << endl << args_indent << "sequence_id," << endl << args_indent
-                   << "error) != -1) &&" << endl << indent()
-                   << " (thrift_struct_write (THRIFT_STRUCT (result_struct)," << endl;
-        args_indent = indent() + string(23, ' ');
-        f_service_ << args_indent << "output_protocol," << endl << args_indent << "error) != -1));"
-                   << endl;
-        indent_down();
-        scope_down(f_service_);
-        f_service_ << indent() << "else" << endl;
-      }
-
-      scope_up(f_service_);
-      f_service_ << indent();
-    }
-
-    // If the handler reported failure but raised no application-defined
-    // exception, return a Thrift application exception with the information
-    // returned via GLib's own error-reporting mechanism
-    f_service_ << "if (*error == NULL)" << endl;
-    indent_up();
-    f_service_ << indent() << "g_warning (\"" << service_name_ << "."
-               << (*function_iter)->get_name() << " implementation returned FALSE \"" << endl
-               << indent() << string(11, ' ') << "\"but did not set an error\");" << endl << endl;
-    indent_down();
-    f_service_ << indent() << "xception =" << endl;
-    indent_up();
-    f_service_ << indent() << "g_object_new (THRIFT_TYPE_APPLICATION_EXCEPTION," << endl;
-    args_indent = indent() + string(14, ' ');
-    f_service_ << args_indent << "\"type\",    *error != NULL ? (*error)->code :" << endl
-               << args_indent << string(11, ' ') << "THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN,"
-               << endl << args_indent << "\"message\", *error != NULL ? (*error)->message : NULL,"
-               << endl << args_indent << "NULL);" << endl;
-    indent_down();
-    f_service_ << indent() << "g_clear_error (error);" << endl << endl << indent()
-               << "result =" << endl;
-    indent_up();
-    f_service_ << indent() << "((thrift_protocol_write_message_begin (output_protocol," << endl;
-    args_indent = indent() + string(39, ' ');
-    f_service_ << args_indent << "\"" << service_function_name << "\"," << endl << args_indent
-               << "T_EXCEPTION," << endl << args_indent << "sequence_id," << endl << args_indent
-               << "error) != -1) &&" << endl << indent()
-               << " (thrift_struct_write (THRIFT_STRUCT (xception)," << endl;
-    args_indent = indent() + string(23, ' ');
-    f_service_ << args_indent << "output_protocol," << endl << args_indent << "error) != -1));"
-               << endl;
-    indent_down();
-    f_service_ << endl << indent() << "g_object_unref (xception);" << endl;
-
-    if (xceptions.size() > 0) {
-      scope_down(f_service_);
-    }
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    // Dellocate or unref retrieved argument values as necessary
-    for (arg_iter = args.begin(); arg_iter != args.end(); ++arg_iter) {
-      string arg_name = (*arg_iter)->get_name();
-      t_type* arg_type = get_true_type((*arg_iter)->get_type());
-
-      if (arg_type->is_base_type()) {
-        t_base_type* base_type = ((t_base_type*)arg_type);
-
-        if (base_type->get_base() == t_base_type::TYPE_STRING) {
-          f_service_ << indent() << "if (" << arg_name << " != NULL)" << endl;
-          indent_up();
-          if (base_type->is_binary()) {
-            f_service_ << indent() << "g_byte_array_unref (" << arg_name << ");" << endl;
-          } else {
-            f_service_ << indent() << "g_free (" << arg_name << ");" << endl;
-          }
-          indent_down();
-        }
-      } else if (arg_type->is_container()) {
-        f_service_ << indent() << "if (" << arg_name << " != NULL)" << endl;
-        indent_up();
-
-        if (arg_type->is_list()) {
-          t_type* elem_type = ((t_list*)arg_type)->get_elem_type();
-
-          f_service_ << indent();
-          if (is_numeric(elem_type)) {
-            f_service_ << "g_array_unref";
-          } else {
-            f_service_ << "g_ptr_array_unref";
-          }
-          f_service_ << " (" << arg_name << ");" << endl;
-        } else if (arg_type->is_map() || arg_type->is_set()) {
-          f_service_ << indent() << "g_hash_table_unref (" << arg_name << ");" << endl;
-        }
-
-        indent_down();
-      } else if (arg_type->is_struct()) {
-        f_service_ << indent() << "if (" << arg_name << " != NULL)" << endl;
-        indent_up();
-        f_service_ << indent() << "g_object_unref (" << arg_name << ");" << endl;
-        indent_down();
-      }
-    }
-
-    if (!(*function_iter)->is_oneway()) {
-      f_service_ << indent() << "g_object_unref (result_struct);" << endl << endl << indent()
-                 << "if (result == TRUE)" << endl;
-      indent_up();
-      f_service_ << indent() << "result =" << endl;
-      indent_up();
-      f_service_ << indent() << "((thrift_protocol_write_message_end "
-                 << "(output_protocol, error) != -1) &&" << endl << indent()
-                 << " (thrift_transport_write_end (transport, error) "
-                 << "!= FALSE) &&" << endl << indent()
-                 << " (thrift_transport_flush (transport, error) "
-                 << "!= FALSE));" << endl;
-      indent_down();
-      indent_down();
-    }
-    scope_down(f_service_);
-    f_service_ << indent() << "else" << endl;
-    indent_up();
-    f_service_ << indent() << "result = FALSE;" << endl;
-    indent_down();
-
-    f_service_ << endl << indent() << "g_object_unref (transport);" << endl << indent()
-               << "g_object_unref (args);" << endl << endl << indent() << "return result;" << endl;
-    scope_down(f_service_);
-
-    f_service_ << endl;
-  }
-
-  // Generate the processor's dispatch_call implementation
-  function_name = class_name_lc + "_dispatch_call";
-  args_indent = indent() + string(function_name.length() + 2, ' ');
-  f_service_ << "static gboolean" << endl << function_name
-             << " (ThriftDispatchProcessor *dispatch_processor," << endl << args_indent
-             << "ThriftProtocol *input_protocol," << endl << args_indent
-             << "ThriftProtocol *output_protocol," << endl << args_indent << "gchar *method_name,"
-             << endl << args_indent << "gint32 sequence_id," << endl << args_indent
-             << "GError **error)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << class_name_lc << "_process_function_def *"
-             << "process_function_def;" << endl;
-  f_service_ << indent() << "gboolean dispatch_result = FALSE;" << endl << endl << indent()
-             << class_name << " *self = " << class_name_uc << " (dispatch_processor);" << endl;
-  f_service_ << indent() << parent_class_name << "Class "
-                                                 "*parent_class =" << endl;
-  indent_up();
-  f_service_ << indent() << "g_type_class_peek_parent (" << class_name_uc << "_GET_CLASS (self));"
-             << endl;
-  indent_down();
-  f_service_ << endl
-             << indent() << "process_function_def = "
-             << "g_hash_table_lookup (self->process_map, method_name);" << endl
-             << indent() << "if (process_function_def != NULL)" << endl;
-  scope_up(f_service_);
-  args_indent = indent() + string(53, ' ');
-  f_service_ << indent() << "g_free (method_name);" << endl
-             << indent() << "dispatch_result = "
-             << "(*process_function_def->function) (self," << endl
-             << args_indent << "sequence_id," << endl
-             << args_indent << "input_protocol," << endl
-             << args_indent << "output_protocol," << endl
-             << args_indent << "error);" << endl;
-  scope_down(f_service_);
-  f_service_ << indent() << "else" << endl;
-  scope_up(f_service_);
-
-  // Method name not recognized; chain up to our parent processor---note the
-  // top-most implementation of this method, in ThriftDispatchProcessor itself,
-  // will return an application exception to the caller if no class in the
-  // hierarchy recognizes the method name
-  f_service_ << indent() << "dispatch_result = parent_class->dispatch_call "
-                            "(dispatch_processor," << endl;
-  args_indent = indent() + string(47, ' ');
-  f_service_ << args_indent << "input_protocol," << endl << args_indent << "output_protocol,"
-             << endl << args_indent << "method_name," << endl << args_indent << "sequence_id,"
-             << endl << args_indent << "error);" << endl;
-  scope_down(f_service_);
-  f_service_ << endl << indent() << "return dispatch_result;" << endl;
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate the processor's property setter
-  function_name = class_name_lc + "_set_property";
-  args_indent = string(function_name.length() + 2, ' ');
-  f_service_ << "static void" << endl << function_name << " (GObject *object," << endl
-             << args_indent << "guint property_id," << endl << args_indent << "const GValue *value,"
-             << endl << args_indent << "GParamSpec *pspec)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << class_name << " *self = " << class_name_uc << " (object);" << endl
-             << endl << indent() << "switch (property_id)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "case PROP_" << class_name_uc << "_HANDLER:" << endl;
-  indent_up();
-  f_service_ << indent() << "if (self->handler != NULL)" << endl;
-  indent_up();
-  f_service_ << indent() << "g_object_unref (self->handler);" << endl;
-  indent_down();
-  f_service_ << indent() << "self->handler = g_value_get_object (value);" << endl << indent()
-             << "g_object_ref (self->handler);" << endl;
-  if (extends_service) {
-    // Chain up to set the handler in every superclass as well
-    f_service_ << endl << indent() << "G_OBJECT_CLASS (" << class_name_lc << "_parent_class)->"
-               << endl;
-    indent_up();
-    f_service_ << indent() << "set_property (object, property_id, value, pspec);" << endl;
-    indent_down();
-  }
-  f_service_ << indent() << "break;" << endl;
-  indent_down();
-  f_service_ << indent() << "default:" << endl;
-  indent_up();
-  f_service_ << indent() << "G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);"
-             << endl << indent() << "break;" << endl;
-  indent_down();
-  scope_down(f_service_);
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate processor's property getter
-  function_name = class_name_lc + "_get_property";
-  args_indent = string(function_name.length() + 2, ' ');
-  f_service_ << "static void" << endl << function_name << " (GObject *object," << endl
-             << args_indent << "guint property_id," << endl << args_indent << "GValue *value,"
-             << endl << args_indent << "GParamSpec *pspec)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << class_name << " *self = " << class_name_uc << " (object);" << endl
-             << endl << indent() << "switch (property_id)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "case PROP_" << class_name_uc << "_HANDLER:" << endl;
-  indent_up();
-  f_service_ << indent() << "g_value_set_object (value, self->handler);" << endl << indent()
-             << "break;" << endl;
-  indent_down();
-  f_service_ << indent() << "default:" << endl;
-  indent_up();
-  f_service_ << indent() << "G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);"
-             << endl << indent() << "break;" << endl;
-  indent_down();
-  scope_down(f_service_);
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generator the processor's dispose function
-  f_service_ << "static void" << endl << class_name_lc << "_dispose (GObject *gobject)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << class_name << " *self = " << class_name_uc << " (gobject);" << endl
-             << endl << indent() << "if (self->handler != NULL)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "g_object_unref (self->handler);" << endl << indent()
-             << "self->handler = NULL;" << endl;
-  scope_down(f_service_);
-  f_service_ << endl << indent() << "G_OBJECT_CLASS (" << class_name_lc << "_parent_class)"
-                                                                           "->dispose (gobject);"
-             << endl;
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate processor finalize function
-  f_service_ << "static void" << endl << class_name_lc << "_finalize (GObject *gobject)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << this->nspace << service_name_ << "Processor *self = " << this->nspace_uc
-             << service_name_uc << "_PROCESSOR (gobject);" << endl << endl << indent()
-             << "thrift_safe_hash_table_destroy (self->process_map);" << endl << endl << indent()
-             << "G_OBJECT_CLASS (" << class_name_lc << "_parent_class)"
-                                                       "->finalize (gobject);" << endl;
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate processor instance initializer
-  f_service_ << "static void" << endl << class_name_lc << "_init (" << class_name << " *self)"
-             << endl;
-  scope_up(f_service_);
-  if (functions.size() > 0) {
-    f_service_ << indent() << "guint index;" << endl
-               << endl;
-  }
-  f_service_ << indent() << "self->handler = NULL;" << endl << indent()
-             << "self->process_map = "
-                "g_hash_table_new (g_str_hash, g_str_equal);" << endl;
-  if (functions.size() > 0) {
-    args_indent = string(21, ' ');
-    f_service_ << endl
-               << indent() << "for (index = 0; index < "
-               << functions.size() << "; index += 1)" << endl;
-    indent_up();
-    f_service_ << indent() << "g_hash_table_insert (self->process_map," << endl
-               << indent() << args_indent
-               << class_name_lc << "_process_function_defs[index].name," << endl
-               << indent() << args_indent
-               << "&" << class_name_lc << "_process_function_defs[index]" << ");"
-               << endl;
-    indent_down();
-  }
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate processor class initializer
-  f_service_ << "static void" << endl << class_name_lc << "_class_init (" << class_name
-             << "Class *cls)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "GObjectClass *gobject_class = G_OBJECT_CLASS (cls);" << endl
-             << indent() << "ThriftDispatchProcessorClass *dispatch_processor_class =" << endl;
-  indent_up();
-  f_service_ << indent() << "THRIFT_DISPATCH_PROCESSOR_CLASS (cls);" << endl;
-  indent_down();
-  f_service_ << indent() << "GParamSpec *param_spec;" << endl << endl << indent()
-             << "gobject_class->dispose = " << class_name_lc << "_dispose;" << endl << indent()
-             << "gobject_class->finalize = " << class_name_lc << "_finalize;" << endl << indent()
-             << "gobject_class->set_property = " << class_name_lc << "_set_property;" << endl
-             << indent() << "gobject_class->get_property = " << class_name_lc << "_get_property;"
-             << endl << endl << indent()
-             << "dispatch_processor_class->dispatch_call = " << class_name_lc << "_dispatch_call;"
-             << endl << indent() << "cls->dispatch_call = " << class_name_lc << "_dispatch_call;"
-             << endl << endl << indent() << "param_spec = g_param_spec_object (\"handler\","
-             << endl;
-  args_indent = indent() + string(34, ' ');
-  f_service_ << args_indent << "\"Service handler implementation\"," << endl << args_indent
-             << "\"The service handler implementation \"" << endl << args_indent
-             << "\"to which method calls are dispatched.\"," << endl << args_indent
-             << this->nspace_uc + "TYPE_" + service_name_uc + "_HANDLER," << endl << args_indent
-             << "G_PARAM_READWRITE);" << endl;
-  f_service_ << indent() << "g_object_class_install_property (gobject_class," << endl;
-  args_indent = indent() + string(33, ' ');
-  f_service_ << args_indent << "PROP_" << class_name_uc << "_HANDLER," << endl << args_indent
-             << "param_spec);" << endl;
-  scope_down(f_service_);
-}
-
-/**
- * Generates C code that represents a Thrift service server.
- */
-void t_c_glib_generator::generate_service_server(t_service* tservice) {
-  (void)tservice;
-  // Generate the service's handler class
-  generate_service_handler(tservice);
-
-  // Generate the service's processor class
-  generate_service_processor(tservice);
-}
-
-/**
- * Generates C code to represent a THrift structure as a GObject.
- */
-void t_c_glib_generator::generate_object(t_struct* tstruct) {
-  string name = tstruct->get_name();
-  string name_u = initial_caps_to_underscores(name);
-  string name_uc = to_upper_case(name_u);
-
-  string class_name = this->nspace + name;
-  string class_name_lc = to_lower_case(initial_caps_to_underscores(class_name));
-  string class_name_uc = to_upper_case(class_name_lc);
-
-  string function_name;
-  string args_indent;
-
-  // write the instance definition
-  f_types_ << "struct _" << this->nspace << name << endl << "{ " << endl
-           << "  ThriftStruct parent; " << endl << endl << "  /* public */" << endl;
-
-  // for each field, add a member variable
-  vector<t_field*>::const_iterator m_iter;
-  const vector<t_field*>& members = tstruct->get_members();
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    f_types_ << "  " << type_name(t) << " " << (*m_iter)->get_name() << ";" << endl;
-    if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-      f_types_ << "  gboolean __isset_" << (*m_iter)->get_name() << ";" << endl;
-    }
-  }
-
-  // close the structure definition and create a typedef
-  f_types_ << "};" << endl << "typedef struct _" << this->nspace << name << " " << this->nspace
-           << name << ";" << endl << endl;
-
-  // write the class definition
-  f_types_ << "struct _" << this->nspace << name << "Class" << endl << "{" << endl
-           << "  ThriftStructClass parent;" << endl << "};" << endl << "typedef struct _"
-           << this->nspace << name << "Class " << this->nspace << name << "Class;" << endl << endl;
-
-  // write the standard GObject boilerplate
-  f_types_ << "GType " << this->nspace_lc << name_u << "_get_type (void);" << endl << "#define "
-           << this->nspace_uc << "TYPE_" << name_uc << " (" << this->nspace_lc << name_u
-           << "_get_type())" << endl << "#define " << this->nspace_uc << name_uc
-           << "(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), " << this->nspace_uc << "TYPE_" << name_uc
-           << ", " << this->nspace << name << "))" << endl << "#define " << this->nspace_uc
-           << name_uc << "_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), " << this->nspace_uc << "_TYPE_"
-           << name_uc << ", " << this->nspace << name << "Class))" << endl << "#define "
-           << this->nspace_uc << "IS_" << name_uc << "(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), "
-           << this->nspace_uc << "TYPE_" << name_uc << "))" << endl << "#define " << this->nspace_uc
-           << "IS_" << name_uc << "_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), " << this->nspace_uc
-           << "TYPE_" << name_uc << "))" << endl << "#define " << this->nspace_uc << name_uc
-           << "_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), " << this->nspace_uc << "TYPE_"
-           << name_uc << ", " << this->nspace << name << "Class))" << endl << endl;
-
-  // start writing the object implementation .c file
-
-  // generate properties enum
-  if (members.size() > 0) {
-    f_types_impl_ << "enum _" << class_name << "Properties" << endl << "{" << endl;
-    indent_up();
-    f_types_impl_ << indent() << "PROP_" << class_name_uc << "_0";
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      string member_name_uc
-          = to_upper_case(to_lower_case(initial_caps_to_underscores((*m_iter)->get_name())));
-
-      f_types_impl_ << "," << endl << indent() << "PROP_" << class_name_uc << "_" << member_name_uc;
-    }
-    f_types_impl_ << endl;
-    indent_down();
-    f_types_impl_ << "};" << endl << endl;
-  }
-
-  // generate struct I/O methods
-  string this_get = this->nspace + name + " * this_object = " + this->nspace_uc + name_uc
-                    + "(object);";
-  generate_struct_reader(f_types_impl_, tstruct, "this_object->", this_get);
-  generate_struct_writer(f_types_impl_, tstruct, "this_object->", this_get);
-
-  // generate property setter and getter
-  if (members.size() > 0) {
-    // generate property setter
-    function_name = class_name_lc + "_set_property";
-    args_indent = string(function_name.length() + 2, ' ');
-    f_types_impl_ << "static void" << endl << function_name << " (GObject *object," << endl
-                  << args_indent << "guint property_id," << endl << args_indent
-                  << "const GValue *value," << endl << args_indent << "GParamSpec *pspec)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << indent() << class_name << " *self = " << class_name_uc << " (object);" << endl
-                  << endl << indent() << "switch (property_id)" << endl;
-    scope_up(f_types_impl_);
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_field* member = (*m_iter);
-      string member_name = member->get_name();
-      string member_name_uc
-          = to_upper_case(to_lower_case(initial_caps_to_underscores(member_name)));
-      t_type* member_type = get_true_type(member->get_type());
-
-      string property_identifier = "PROP_" + class_name_uc + "_" + member_name_uc;
-
-      f_types_impl_ << indent() << "case " << property_identifier + ":" << endl;
-      indent_up();
-
-      if (member_type->is_base_type()) {
-        t_base_type* base_type = ((t_base_type*)member_type);
-        string assign_function_name;
-
-        if (base_type->get_base() == t_base_type::TYPE_STRING) {
-          string release_function_name;
-
-          f_types_impl_ << indent() << "if (self->" << member_name << " != NULL)" << endl;
-          indent_up();
-
-          if (base_type->is_binary()) {
-            release_function_name = "g_byte_array_unref";
-            assign_function_name = "g_value_dup_boxed";
-          } else {
-            release_function_name = "g_free";
-            assign_function_name = "g_value_dup_string";
-          }
-
-          f_types_impl_ << indent() << release_function_name << " (self->" << member_name << ");"
-                        << endl;
-          indent_down();
-        } else {
-          switch (base_type->get_base()) {
-          case t_base_type::TYPE_BOOL:
-            assign_function_name = "g_value_get_boolean";
-            break;
-
-          case t_base_type::TYPE_I8:
-          case t_base_type::TYPE_I16:
-          case t_base_type::TYPE_I32:
-            assign_function_name = "g_value_get_int";
-            break;
-
-          case t_base_type::TYPE_I64:
-            assign_function_name = "g_value_get_int64";
-            break;
-
-          case t_base_type::TYPE_DOUBLE:
-            assign_function_name = "g_value_get_double";
-            break;
-
-          default:
-            throw "compiler error: "
-                  "unrecognized base type \"" + base_type->get_name() + "\" "
-                                                                        "for struct member \""
-                + member_name + "\"";
-            break;
-          }
-        }
-
-        f_types_impl_ << indent() << "self->" << member_name << " = " << assign_function_name
-                      << " (value);" << endl;
-      } else if (member_type->is_enum()) {
-        f_types_impl_ << indent() << "self->" << member_name << " = g_value_get_int (value);"
-                      << endl;
-      } else if (member_type->is_container()) {
-        string release_function_name;
-        string assign_function_name;
-
-        if (member_type->is_list()) {
-          t_type* elem_type = ((t_list*)member_type)->get_elem_type();
-
-          // Lists of base types other than strings are represented as GArrays;
-          // all others as GPtrArrays
-          if (is_numeric(elem_type)) {
-            release_function_name = "g_array_unref";
-          } else {
-            release_function_name = "g_ptr_array_unref";
-          }
-
-          assign_function_name = "g_value_dup_boxed";
-        } else if (member_type->is_set() || member_type->is_map()) {
-          release_function_name = "g_hash_table_unref";
-          assign_function_name = "g_value_dup_boxed";
-        }
-
-        f_types_impl_ << indent() << "if (self->" << member_name << " != NULL)" << endl;
-        indent_up();
-        f_types_impl_ << indent() << release_function_name << " (self->" << member_name << ");"
-                      << endl;
-        indent_down();
-        f_types_impl_ << indent() << "self->" << member_name << " = " << assign_function_name
-                      << " (value);" << endl;
-      } else if (member_type->is_struct() || member_type->is_xception()) {
-        f_types_impl_ << indent() << "if (self->" << member_name << " != NULL)" << endl;
-        indent_up();
-        f_types_impl_ << indent() << "g_object_unref (self->" << member_name << ");" << endl;
-        indent_down();
-        f_types_impl_ << indent() << "self->" << member_name << " = g_value_dup_object (value);"
-                      << endl;
-      }
-
-      if (member->get_req() != t_field::T_REQUIRED) {
-        f_types_impl_ << indent() << "self->__isset_" << member_name << " = TRUE;" << endl;
-      }
-
-      f_types_impl_ << indent() << "break;" << endl << endl;
-      indent_down();
-    }
-    f_types_impl_ << indent() << "default:" << endl;
-    indent_up();
-    f_types_impl_ << indent() << "G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);"
-                  << endl << indent() << "break;" << endl;
-    indent_down();
-    scope_down(f_types_impl_);
-    scope_down(f_types_impl_);
-    f_types_impl_ << endl;
-
-    // generate property getter
-    function_name = class_name_lc + "_get_property";
-    args_indent = string(function_name.length() + 2, ' ');
-    f_types_impl_ << "static void" << endl << function_name << " (GObject *object," << endl
-                  << args_indent << "guint property_id," << endl << args_indent << "GValue *value,"
-                  << endl << args_indent << "GParamSpec *pspec)" << endl;
-    scope_up(f_types_impl_);
-    f_types_impl_ << indent() << class_name << " *self = " << class_name_uc << " (object);" << endl
-                  << endl << indent() << "switch (property_id)" << endl;
-    scope_up(f_types_impl_);
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_field* member = (*m_iter);
-      string member_name = (*m_iter)->get_name();
-      string member_name_uc
-          = to_upper_case(to_lower_case(initial_caps_to_underscores(member_name)));
-      t_type* member_type = get_true_type(member->get_type());
-
-      string property_identifier = "PROP_" + class_name_uc + "_" + member_name_uc;
-
-      string setter_function_name;
-
-      if (member_type->is_base_type()) {
-        t_base_type* base_type = ((t_base_type*)member_type);
-
-        switch (base_type->get_base()) {
-        case t_base_type::TYPE_BOOL:
-          setter_function_name = "g_value_set_boolean";
-          break;
-
-        case t_base_type::TYPE_I8:
-        case t_base_type::TYPE_I16:
-        case t_base_type::TYPE_I32:
-          setter_function_name = "g_value_set_int";
-          break;
-
-        case t_base_type::TYPE_I64:
-          setter_function_name = "g_value_set_int64";
-          break;
-
-        case t_base_type::TYPE_DOUBLE:
-          setter_function_name = "g_value_set_double";
-          break;
-
-        case t_base_type::TYPE_STRING:
-          if (base_type->is_binary()) {
-            setter_function_name = "g_value_set_boxed";
-          } else {
-            setter_function_name = "g_value_set_string";
-          }
-          break;
-
-        default:
-          throw "compiler error: "
-                "unrecognized base type \"" + base_type->get_name() + "\" "
-                                                                      "for struct member \""
-              + member_name + "\"";
-          break;
-        }
-      } else if (member_type->is_enum()) {
-        setter_function_name = "g_value_set_int";
-      } else if (member_type->is_struct() || member_type->is_xception()) {
-        setter_function_name = "g_value_set_object";
-      } else if (member_type->is_container()) {
-        setter_function_name = "g_value_set_boxed";
-      } else {
-        throw "compiler error: "
-              "unrecognized type for struct member \"" + member_name + "\"";
-      }
-
-      f_types_impl_ << indent() << "case " << property_identifier + ":" << endl;
-      indent_up();
-      f_types_impl_ << indent() << setter_function_name << " (value, self->" << member_name << ");"
-                    << endl << indent() << "break;" << endl << endl;
-      indent_down();
-    }
-    f_types_impl_ << indent() << "default:" << endl;
-    indent_up();
-    f_types_impl_ << indent() << "G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);"
-                  << endl << indent() << "break;" << endl;
-    indent_down();
-    scope_down(f_types_impl_);
-    scope_down(f_types_impl_);
-    f_types_impl_ << endl;
-  }
-
-  // generate the instance init function
-
-  f_types_impl_ << "static void " << endl << this->nspace_lc << name_u << "_instance_init ("
-                << this->nspace << name << " * object)" << endl << "{" << endl;
-  indent_up();
-
-  // generate default-value structures for container-type members
-  bool constant_declaration_output = false;
-  bool string_list_constant_output = false;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* member = *m_iter;
-    t_const_value* member_value = member->get_value();
-
-    if (member_value != NULL) {
-      string member_name = member->get_name();
-      t_type* member_type = get_true_type(member->get_type());
-
-      if (member_type->is_list()) {
-        const vector<t_const_value*>& list = member_value->get_list();
-        t_type* elem_type = ((t_list*)member_type)->get_elem_type();
-
-        // Generate an array with the list literal
-        indent(f_types_impl_) << "static " << type_name(elem_type, false, true) << " __default_"
-                              << member_name << "[" << list.size() << "] = " << endl;
-        indent_up();
-        f_types_impl_ << indent() << constant_literal(member_type, member_value) << ";" << endl;
-        indent_down();
-
-        constant_declaration_output = true;
-
-        // If we are generating values for a pointer array (i.e. a list of
-        // strings), set a flag so we know to also declare an index variable to
-        // use in pre-populating the array
-        if (elem_type->is_string()) {
-          string_list_constant_output = true;
-        }
-      }
-
-      // TODO: Handle container types other than list
-    }
-  }
-  if (constant_declaration_output) {
-    if (string_list_constant_output) {
-      indent(f_types_impl_) << "unsigned int list_index;" << endl;
-    }
-
-    f_types_impl_ << endl;
-  }
-
-  // satisfy compilers with -Wall turned on
-  indent(f_types_impl_) << "/* satisfy -Wall */" << endl << indent()
-                        << "THRIFT_UNUSED_VAR (object);" << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if (t->is_base_type()) {
-      string dval = " = ";
-      if (t->is_enum()) {
-        dval += "(" + type_name(t) + ")";
-      }
-      t_const_value* cv = (*m_iter)->get_value();
-      if (cv != NULL) {
-        dval += constant_value("", t, cv);
-      } else {
-        dval += t->is_string() ? "NULL" : "0";
-      }
-      indent(f_types_impl_) << "object->" << (*m_iter)->get_name() << dval << ";" << endl;
-    } else if (t->is_struct()) {
-      string name = (*m_iter)->get_name();
-      string type_name_uc
-          = to_upper_case(initial_caps_to_underscores((*m_iter)->get_type()->get_name()));
-      indent(f_types_impl_) << "object->" << name << " = g_object_new (" << this->nspace_uc
-                            << "TYPE_" << type_name_uc << ", NULL);" << endl;
-    } else if (t->is_xception()) {
-      string name = (*m_iter)->get_name();
-      indent(f_types_impl_) << "object->" << name << " = NULL;" << endl;
-    } else if (t->is_container()) {
-      string name = (*m_iter)->get_name();
-      string init_function;
-      t_type* etype = NULL;
-
-      if (t->is_map()) {
-        t_type* key = ((t_map*)t)->get_key_type();
-        t_type* value = ((t_map*)t)->get_val_type();
-        init_function = generate_new_hash_from_type(key, value);
-      } else if (t->is_set()) {
-        etype = ((t_set*)t)->get_elem_type();
-        init_function = generate_new_hash_from_type(etype, NULL);
-      } else if (t->is_list()) {
-        etype = ((t_list*)t)->get_elem_type();
-        init_function = generate_new_array_from_type(etype);
-      }
-
-      indent(f_types_impl_) << "object->" << name << " = " << init_function << endl;
-
-      // Pre-populate the container with the specified default values, if any
-      if ((*m_iter)->get_value()) {
-        t_const_value* member_value = (*m_iter)->get_value();
-
-        if (t->is_list()) {
-          const vector<t_const_value*>& list = member_value->get_list();
-
-          if (is_numeric(etype)) {
-            indent(f_types_impl_) <<
-              "g_array_append_vals (object->" << name << ", &__default_" <<
-              name << ", " << list.size() << ");" << endl;
-          }
-          else {
-            indent(f_types_impl_) <<
-              "for (list_index = 0; list_index < " << list.size() << "; " <<
-              "list_index += 1)" << endl;
-            indent_up();
-            indent(f_types_impl_) <<
-              "g_ptr_array_add (object->" << name << "," << endl <<
-              indent() << string(17, ' ') << "g_strdup (__default_" <<
-              name << "[list_index]));" << endl;
-            indent_down();
-          }
-        }
-
-        // TODO: Handle container types other than list
-      }
-    }
-
-    /* if not required, initialize the __isset variable */
-    if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-      indent(f_types_impl_) << "object->__isset_" << (*m_iter)->get_name() << " = FALSE;" << endl;
-    }
-  }
-
-  indent_down();
-  f_types_impl_ << "}" << endl << endl;
-
-  /* create the destructor */
-  f_types_impl_ << "static void " << endl << this->nspace_lc << name_u
-                << "_finalize (GObject *object)" << endl << "{" << endl;
-  indent_up();
-
-  f_types_impl_ << indent() << this->nspace << name << " *tobject = " << this->nspace_uc << name_uc
-                << " (object);" << endl << endl;
-
-  f_types_impl_ << indent() << "/* satisfy -Wall in case we don't use tobject */" << endl
-                << indent() << "THRIFT_UNUSED_VAR (tobject);" << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if (t->is_container()) {
-      string name = (*m_iter)->get_name();
-      if (t->is_map() || t->is_set()) {
-        f_types_impl_ << indent() << "if (tobject->" << name << " != NULL)" << endl;
-        f_types_impl_ << indent() << "{" << endl;
-        indent_up();
-        f_types_impl_ << indent() << "g_hash_table_destroy (tobject->" << name << ");" << endl;
-        f_types_impl_ << indent() << "tobject->" << name << " = NULL;" << endl;
-        indent_down();
-        f_types_impl_ << indent() << "}" << endl;
-      } else if (t->is_list()) {
-        t_type* etype = ((t_list*)t)->get_elem_type();
-        string destructor_function = "g_ptr_array_unref";
-
-        if (etype->is_base_type()) {
-          t_base_type::t_base tbase = ((t_base_type*)etype)->get_base();
-          switch (tbase) {
-          case t_base_type::TYPE_VOID:
-            throw "compiler error: cannot determine array type";
-          case t_base_type::TYPE_BOOL:
-          case t_base_type::TYPE_I8:
-          case t_base_type::TYPE_I16:
-          case t_base_type::TYPE_I32:
-          case t_base_type::TYPE_I64:
-          case t_base_type::TYPE_DOUBLE:
-            destructor_function = "g_array_unref";
-            break;
-          case t_base_type::TYPE_STRING:
-            break;
-          default:
-            throw "compiler error: no array info for type";
-          }
-        } else if (etype->is_enum()) {
-          destructor_function = "g_array_unref";
-        }
-
-        f_types_impl_ << indent() << "if (tobject->" << name << " != NULL)" << endl;
-        f_types_impl_ << indent() << "{" << endl;
-        indent_up();
-        f_types_impl_ << indent() << destructor_function << " (tobject->" << name << ");" << endl;
-        f_types_impl_ << indent() << "tobject->" << name << " = NULL;" << endl;
-        indent_down();
-        f_types_impl_ << indent() << "}" << endl;
-      }
-    } else if (t->is_struct() || t->is_xception()) {
-      string name = (*m_iter)->get_name();
-      // TODO: g_clear_object needs glib >= 2.28
-      // f_types_impl_ << indent() << "g_clear_object (&(tobject->" << name << "));" << endl;
-      // does g_object_unref the trick?
-      f_types_impl_ << indent() << "if (tobject->" << name << " != NULL)" << endl;
-      f_types_impl_ << indent() << "{" << endl;
-      indent_up();
-      f_types_impl_ << indent() << "g_object_unref(tobject->" << name << ");" << endl;
-      f_types_impl_ << indent() << "tobject->" << name << " = NULL;" << endl;
-      indent_down();
-      f_types_impl_ << indent() << "}" << endl;
-    } else if (t->is_string()) {
-      string name = (*m_iter)->get_name();
-      f_types_impl_ << indent() << "if (tobject->" << name << " != NULL)" << endl;
-      f_types_impl_ << indent() << "{" << endl;
-      indent_up();
-      f_types_impl_ << indent() << generate_free_func_from_type(t) << "(tobject->" << name << ");"
-                    << endl;
-      f_types_impl_ << indent() << "tobject->" << name << " = NULL;" << endl;
-      indent_down();
-      f_types_impl_ << indent() << "}" << endl;
-    }
-  }
-
-  indent_down();
-  f_types_impl_ << "}" << endl << endl;
-
-  // generate the class init function
-
-  f_types_impl_ << "static void" << endl << class_name_lc << "_class_init (" << class_name
-                << "Class * cls)" << endl;
-  scope_up(f_types_impl_);
-
-  f_types_impl_ << indent() << "GObjectClass *gobject_class = G_OBJECT_CLASS (cls);" << endl
-                << indent() << "ThriftStructClass *struct_class = "
-                << "THRIFT_STRUCT_CLASS (cls);" << endl << endl << indent()
-                << "struct_class->read = " << class_name_lc << "_read;" << endl << indent()
-                << "struct_class->write = " << class_name_lc << "_write;" << endl << endl
-                << indent() << "gobject_class->finalize = " << class_name_lc << "_finalize;"
-                << endl;
-  if (members.size() > 0) {
-    f_types_impl_ << indent() << "gobject_class->get_property = " << class_name_lc
-                  << "_get_property;" << endl << indent()
-                  << "gobject_class->set_property = " << class_name_lc << "_set_property;" << endl;
-
-    // install a property for each member
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_field* member = (*m_iter);
-      string member_name = member->get_name();
-      string member_name_uc
-          = to_upper_case(to_lower_case(initial_caps_to_underscores(member_name)));
-      t_type* member_type = get_true_type(member->get_type());
-      t_const_value* member_value = member->get_value();
-
-      string property_identifier = "PROP_" + class_name_uc + "_" + member_name_uc;
-
-      f_types_impl_ << endl << indent() << "g_object_class_install_property" << endl;
-      indent_up();
-      args_indent = indent() + ' ';
-      f_types_impl_ << indent() << "(gobject_class," << endl << args_indent << property_identifier
-                    << "," << endl << args_indent;
-
-      if (member_type->is_base_type()) {
-        t_base_type::t_base base_type = ((t_base_type*)member_type)->get_base();
-
-        if (base_type == t_base_type::TYPE_STRING) {
-          if (((t_base_type*)member_type)->is_binary()) {
-            args_indent += string(20, ' ');
-            f_types_impl_ << "g_param_spec_boxed (\"" << member_name << "\"," << endl << args_indent
-                          << "NULL," << endl << args_indent << "NULL," << endl << args_indent
-                          << "G_TYPE_BYTE_ARRAY," << endl << args_indent << "G_PARAM_READWRITE));"
-                          << endl;
-          } else {
-            args_indent += string(21, ' ');
-            f_types_impl_ << "g_param_spec_string (\"" << member_name << "\"," << endl
-                          << args_indent << "NULL," << endl << args_indent << "NULL," << endl
-                          << args_indent
-                          << ((member_value != NULL) ? "\"" + member_value->get_string() + "\""
-                                                     : "NULL") << "," << endl << args_indent
-                          << "G_PARAM_READWRITE));" << endl;
-          }
-        } else if (base_type == t_base_type::TYPE_BOOL) {
-          args_indent += string(22, ' ');
-          f_types_impl_ << "g_param_spec_boolean (\"" << member_name << "\"," << endl << args_indent
-                        << "NULL," << endl << args_indent << "NULL," << endl << args_indent
-                        << (((member_value != NULL) && (member_value->get_integer() != 0))
-                                ? "TRUE"
-                                : "FALSE") << "," << endl << args_indent << "G_PARAM_READWRITE));"
-                        << endl;
-        } else if ((base_type == t_base_type::TYPE_I8) || (base_type == t_base_type::TYPE_I16)
-                   || (base_type == t_base_type::TYPE_I32) || (base_type == t_base_type::TYPE_I64)
-                   || (base_type == t_base_type::TYPE_DOUBLE)) {
-          string param_spec_function_name = "g_param_spec_int";
-          string min_value;
-          string max_value;
-          ostringstream default_value;
-
-          switch (base_type) {
-          case t_base_type::TYPE_I8:
-            min_value = "G_MININT8";
-            max_value = "G_MAXINT8";
-            break;
-
-          case t_base_type::TYPE_I16:
-            min_value = "G_MININT16";
-            max_value = "G_MAXINT16";
-            break;
-
-          case t_base_type::TYPE_I32:
-            min_value = "G_MININT32";
-            max_value = "G_MAXINT32";
-            break;
-
-          case t_base_type::TYPE_I64:
-            param_spec_function_name = "g_param_spec_int64";
-            min_value = "G_MININT64";
-            max_value = "G_MAXINT64";
-            break;
-
-          case t_base_type::TYPE_DOUBLE:
-            param_spec_function_name = "g_param_spec_double";
-            min_value = "-INFINITY";
-            max_value = "INFINITY";
-            break;
-
-          default:
-            throw "compiler error: "
-                  "unrecognized base type \"" + member_type->get_name() + "\" "
-                                                                          "for struct member \""
-                + member_name + "\"";
-            break;
-          }
-
-          if (member_value != NULL) {
-            default_value << (base_type == t_base_type::TYPE_DOUBLE ? member_value->get_double()
-                                                                    : member_value->get_integer());
-          } else {
-            default_value << "0";
-          }
-
-          args_indent += string(param_spec_function_name.length() + 2, ' ');
-          f_types_impl_ << param_spec_function_name << " (\"" << member_name << "\"," << endl
-                        << args_indent << "NULL," << endl << args_indent << "NULL," << endl
-                        << args_indent << min_value << "," << endl << args_indent << max_value
-                        << "," << endl << args_indent << default_value.str() << "," << endl
-                        << args_indent << "G_PARAM_READWRITE));" << endl;
-        }
-
-        indent_down();
-      } else if (member_type->is_enum()) {
-        t_enum_value* enum_min_value = ((t_enum*)member_type)->get_min_value();
-        t_enum_value* enum_max_value = ((t_enum*)member_type)->get_max_value();
-        int min_value = (enum_min_value != NULL) ? enum_min_value->get_value() : 0;
-        int max_value = (enum_max_value != NULL) ? enum_max_value->get_value() : 0;
-
-        args_indent += string(18, ' ');
-        f_types_impl_ << "g_param_spec_int (\"" << member_name << "\"," << endl << args_indent
-                      << "NULL," << endl << args_indent << "NULL," << endl << args_indent
-                      << min_value << "," << endl << args_indent << max_value << "," << endl
-                      << args_indent << min_value << "," << endl << args_indent
-                      << "G_PARAM_READWRITE));" << endl;
-        indent_down();
-      } else if (member_type->is_struct() || member_type->is_xception()) {
-        string param_type = this->nspace_uc + "TYPE_"
-                            + to_upper_case(initial_caps_to_underscores(member_type->get_name()));
-
-        args_indent += string(20, ' ');
-        f_types_impl_ << "g_param_spec_object (\"" << member_name << "\"," << endl << args_indent
-                      << "NULL," << endl << args_indent << "NULL," << endl << args_indent
-                      << param_type << "," << endl << args_indent << "G_PARAM_READWRITE));" << endl;
-        indent_down();
-      } else if (member_type->is_list()) {
-        t_type* elem_type = ((t_list*)member_type)->get_elem_type();
-        string param_type;
-
-        if (elem_type->is_base_type() && !elem_type->is_string()) {
-          param_type = "G_TYPE_ARRAY";
-        } else {
-          param_type = "G_TYPE_PTR_ARRAY";
-        }
-
-        args_indent += string(20, ' ');
-        f_types_impl_ << "g_param_spec_boxed (\"" << member_name << "\"," << endl << args_indent
-                      << "NULL," << endl << args_indent << "NULL," << endl << args_indent
-                      << param_type << "," << endl << args_indent << "G_PARAM_READWRITE));" << endl;
-        indent_down();
-      } else if (member_type->is_set() || member_type->is_map()) {
-        args_indent += string(20, ' ');
-        f_types_impl_ << "g_param_spec_boxed (\"" << member_name << "\"," << endl << args_indent
-                      << "NULL," << endl << args_indent << "NULL," << endl << args_indent
-                      << "G_TYPE_HASH_TABLE," << endl << args_indent << "G_PARAM_READWRITE));"
-                      << endl;
-        indent_down();
-      }
-    }
-  }
-  scope_down(f_types_impl_);
-  f_types_impl_ << endl;
-
-  f_types_impl_ << "GType" << endl << this->nspace_lc << name_u << "_get_type (void)" << endl << "{"
-                << endl << "  static GType type = 0;" << endl << endl << "  if (type == 0) " << endl
-                << "  {" << endl << "    static const GTypeInfo type_info = " << endl << "    {"
-                << endl << "      sizeof (" << this->nspace << name << "Class)," << endl
-                << "      NULL, /* base_init */" << endl << "      NULL, /* base_finalize */"
-                << endl << "      (GClassInitFunc) " << this->nspace_lc << name_u << "_class_init,"
-                << endl << "      NULL, /* class_finalize */" << endl
-                << "      NULL, /* class_data */" << endl << "      sizeof (" << this->nspace
-                << name << ")," << endl << "      0, /* n_preallocs */" << endl
-                << "      (GInstanceInitFunc) " << this->nspace_lc << name_u << "_instance_init,"
-                << endl << "      NULL, /* value_table */" << endl << "    };" << endl << endl
-                << "    type = g_type_register_static (THRIFT_TYPE_STRUCT, " << endl
-                << "                                   \"" << this->nspace << name << "Type\","
-                << endl << "                                   &type_info, 0);" << endl << "  }"
-                << endl << endl << "  return type;" << endl << "}" << endl << endl;
-}
-
-/**
- * Generates functions to write Thrift structures to a stream.
- */
-void t_c_glib_generator::generate_struct_writer(ofstream& out,
-                                                t_struct* tstruct,
-                                                string this_name,
-                                                string this_get,
-                                                bool is_function) {
-  string name = tstruct->get_name();
-  string name_u = initial_caps_to_underscores(name);
-  string name_uc = to_upper_case(name_u);
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  int error_ret = 0;
-
-  if (is_function) {
-    error_ret = -1;
-    indent(out) << "static gint32" << endl << this->nspace_lc << name_u
-                << "_write (ThriftStruct *object, ThriftProtocol *protocol, GError **error)"
-                << endl;
-  }
-  indent(out) << "{" << endl;
-  indent_up();
-
-  out << indent() << "gint32 ret;" << endl << indent() << "gint32 xfer = 0;" << endl << endl;
-
-  indent(out) << this_get << endl;
-  // satisfy -Wall in the case of an empty struct
-  if (!this_get.empty()) {
-    indent(out) << "THRIFT_UNUSED_VAR (this_object);" << endl;
-  }
-
-  out << indent() << "if ((ret = thrift_protocol_write_struct_begin (protocol, \"" << name
-      << "\", error)) < 0)" << endl << indent() << "  return " << error_ret << ";" << endl
-      << indent() << "xfer += ret;" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_OPTIONAL) {
-      indent(out) << "if (this_object->__isset_" << (*f_iter)->get_name() << " == TRUE) {" << endl;
-      indent_up();
-    }
-
-    out << indent() << "if ((ret = thrift_protocol_write_field_begin (protocol, "
-        << "\"" << (*f_iter)->get_name() << "\", " << type_to_enum((*f_iter)->get_type()) << ", "
-        << (*f_iter)->get_key() << ", error)) < 0)" << endl << indent() << "  return " << error_ret
-        << ";" << endl << indent() << "xfer += ret;" << endl;
-    generate_serialize_field(out, *f_iter, this_name, "", error_ret);
-    out << indent() << "if ((ret = thrift_protocol_write_field_end (protocol, error)) < 0)" << endl
-        << indent() << "  return " << error_ret << ";" << endl << indent() << "xfer += ret;"
-        << endl;
-
-    if ((*f_iter)->get_req() == t_field::T_OPTIONAL) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-
-  // write the struct map
-  out << indent() << "if ((ret = thrift_protocol_write_field_stop (protocol, error)) < 0)" << endl
-      << indent() << "  return " << error_ret << ";" << endl << indent() << "xfer += ret;" << endl
-      << indent() << "if ((ret = thrift_protocol_write_struct_end (protocol, error)) < 0)" << endl
-      << indent() << "  return " << error_ret << ";" << endl << indent() << "xfer += ret;" << endl
-      << endl;
-
-  if (is_function) {
-    indent(out) << "return xfer;" << endl;
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates code to read Thrift structures from a stream.
- */
-void t_c_glib_generator::generate_struct_reader(ofstream& out,
-                                                t_struct* tstruct,
-                                                string this_name,
-                                                string this_get,
-                                                bool is_function) {
-  string name = tstruct->get_name();
-  string name_u = initial_caps_to_underscores(name);
-  string name_uc = to_upper_case(name_u);
-  int error_ret = 0;
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  if (is_function) {
-    error_ret = -1;
-    indent(out) << "/* reads a " << name_u << " object */" << endl << "static gint32" << endl
-                << this->nspace_lc << name_u
-                << "_read (ThriftStruct *object, ThriftProtocol *protocol, GError **error)" << endl;
-  }
-
-  indent(out) << "{" << endl;
-  indent_up();
-
-  // declare stack temp variables
-  out << indent() << "gint32 ret;" << endl << indent() << "gint32 xfer = 0;" << endl << indent()
-      << "gchar *name = NULL;" << endl << indent() << "ThriftType ftype;" << endl << indent()
-      << "gint16 fid;" << endl << indent() << "guint32 len = 0;" << endl << indent()
-      << "gpointer data = NULL;" << endl << indent() << this_get << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      indent(out) << "gboolean isset_" << (*f_iter)->get_name() << " = FALSE;" << endl;
-    }
-  }
-
-  out << endl;
-
-  // satisfy -Wall in case we don't use some variables
-  out << indent() << "/* satisfy -Wall in case these aren't used */" << endl << indent()
-      << "THRIFT_UNUSED_VAR (len);" << endl << indent() << "THRIFT_UNUSED_VAR (data);" << endl;
-
-  if (!this_get.empty()) {
-    out << indent() << "THRIFT_UNUSED_VAR (this_object);" << endl;
-  }
-  out << endl;
-
-  // read the beginning of the structure marker
-  out << indent() << "/* read the struct begin marker */" << endl << indent()
-      << "if ((ret = thrift_protocol_read_struct_begin (protocol, &name, error)) < 0)" << endl
-      << indent() << "{" << endl << indent() << "  if (name) g_free (name);" << endl << indent()
-      << "  return " << error_ret << ";" << endl << indent() << "}" << endl << indent()
-      << "xfer += ret;" << endl << indent() << "if (name) g_free (name);" << endl << indent()
-      << "name = NULL;" << endl << endl;
-
-  // read the struct fields
-  out << indent() << "/* read the struct fields */" << endl << indent() << "while (1)" << endl;
-  scope_up(out);
-
-  // read beginning field marker
-  out << indent() << "/* read the beginning of a field */" << endl << indent()
-      << "if ((ret = thrift_protocol_read_field_begin (protocol, &name, &ftype, &fid, error)) < 0)"
-      << endl << indent() << "{" << endl << indent() << "  if (name) g_free (name);" << endl
-      << indent() << "  return " << error_ret << ";" << endl << indent() << "}" << endl << indent()
-      << "xfer += ret;" << endl << indent() << "if (name) g_free (name);" << endl << indent()
-      << "name = NULL;" << endl << endl;
-
-  // check for field STOP marker
-  out << indent() << "/* break if we get a STOP field */" << endl << indent()
-      << "if (ftype == T_STOP)" << endl << indent() << "{" << endl << indent() << "  break;" << endl
-      << indent() << "}" << endl << endl;
-
-  // switch depending on the field type
-  indent(out) << "switch (fid)" << endl;
-
-  // start switch
-  scope_up(out);
-
-  // generate deserialization code for known types
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << (*f_iter)->get_key() << ":" << endl;
-    indent_up();
-    indent(out) << "if (ftype == " << type_to_enum((*f_iter)->get_type()) << ")" << endl;
-    indent(out) << "{" << endl;
-
-    indent_up();
-    // generate deserialize field
-    generate_deserialize_field(out, *f_iter, this_name, "", error_ret, false);
-    indent_down();
-
-    out << indent() << "} else {" << endl << indent()
-        << "  if ((ret = thrift_protocol_skip (protocol, ftype, error)) < 0)" << endl << indent()
-        << "    return " << error_ret << ";" << endl << indent() << "  xfer += ret;" << endl
-        << indent() << "}" << endl << indent() << "break;" << endl;
-    indent_down();
-  }
-
-  // create the default case
-  out << indent() << "default:" << endl << indent()
-      << "  if ((ret = thrift_protocol_skip (protocol, ftype, error)) < 0)" << endl << indent()
-      << "    return " << error_ret << ";" << endl << indent() << "  xfer += ret;" << endl
-      << indent() << "  break;" << endl;
-
-  // end switch
-  scope_down(out);
-
-  // read field end marker
-  out << indent() << "if ((ret = thrift_protocol_read_field_end (protocol, error)) < 0)" << endl
-      << indent() << "  return " << error_ret << ";" << endl << indent() << "xfer += ret;" << endl;
-
-  // end while loop
-  scope_down(out);
-  out << endl;
-
-  // read the end of the structure
-  out << indent() << "if ((ret = thrift_protocol_read_struct_end (protocol, error)) < 0)" << endl
-      << indent() << "  return " << error_ret << ";" << endl << indent() << "xfer += ret;" << endl
-      << endl;
-
-  // if a required field is missing, throw an error
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      out << indent() << "if (!isset_" << (*f_iter)->get_name() << ")" << endl << indent() << "{"
-          << endl << indent() << "  g_set_error (error, THRIFT_PROTOCOL_ERROR," << endl << indent()
-          << "               THRIFT_PROTOCOL_ERROR_INVALID_DATA," << endl << indent()
-          << "               \"missing field\");" << endl << indent() << "  return -1;" << endl
-          << indent() << "}" << endl << endl;
-    }
-  }
-
-  if (is_function) {
-    indent(out) << "return xfer;" << endl;
-  }
-
-  // end the function/structure
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-void t_c_glib_generator::generate_serialize_field(ofstream& out,
-                                                  t_field* tfield,
-                                                  string prefix,
-                                                  string suffix,
-                                                  int error_ret) {
-  t_type* type = get_true_type(tfield->get_type());
-  string name = prefix + tfield->get_name() + suffix;
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + name;
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, name, error_ret);
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, name, error_ret);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << "if ((ret = thrift_protocol_write_";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "bool (protocol, " << name;
-        break;
-      case t_base_type::TYPE_I8:
-        out << "byte (protocol, " << name;
-        break;
-      case t_base_type::TYPE_I16:
-        out << "i16 (protocol, " << name;
-        break;
-      case t_base_type::TYPE_I32:
-        out << "i32 (protocol, " << name;
-        break;
-      case t_base_type::TYPE_I64:
-        out << "i64 (protocol, " << name;
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "double (protocol, " << name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "binary (protocol, " << name << " ? ((GByteArray *) " << name << ")->data : NULL, "
-              << name << " ? ((GByteArray *) " << name << ")->len : 0";
-        } else {
-          out << "string (protocol, " << name;
-        }
-        break;
-      default:
-        throw "compiler error: no C writer for base type " + t_base_type::t_base_name(tbase) + name;
-      }
-    } else {
-      out << "i32 (protocol, (gint32) " << name;
-    }
-    out << ", error)) < 0)" << endl
-        << indent() << "  return " << error_ret << ";" << endl
-        << indent() << "xfer += ret;" << endl << endl;
-  } else {
-    throw std::logic_error("DO NOT KNOW HOW TO SERIALIZE FIELD '" + name + "' TYPE '"
-                           + type_name(type));
-  }
-}
-
-void t_c_glib_generator::generate_serialize_struct(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   string prefix,
-                                                   int error_ret) {
-  (void)tstruct;
-  out << indent() << "if ((ret = thrift_struct_write (THRIFT_STRUCT (" << prefix
-      << "), protocol, error)) < 0)" << endl << indent() << "  return " << error_ret << ";" << endl
-      << indent() << "xfer += ret;" << endl << endl;
-}
-
-void t_c_glib_generator::generate_serialize_container(ofstream& out,
-                                                      t_type* ttype,
-                                                      string prefix,
-                                                      int error_ret) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    t_type* tkey = ((t_map*)ttype)->get_key_type();
-    t_type* tval = ((t_map*)ttype)->get_val_type();
-    string tkey_name = type_name(tkey);
-    string tval_name = type_name(tval);
-    string tkey_ptr;
-    string tval_ptr;
-    string keyname = tmp("key");
-    string valname = tmp("val");
-
-    declore_local_variable_for_write(out, tkey, keyname);
-    declore_local_variable_for_write(out, tval, valname);
-
-    /* If either the key or value type is a typedef, find its underlying type so
-       we can correctly determine how to generate a pointer to it */
-    tkey = get_true_type(tkey);
-    tval = get_true_type(tval);
-
-    tkey_ptr = tkey->is_string() || !tkey->is_base_type() ? "" : "*";
-    tval_ptr = tval->is_string() || !tval->is_base_type() ? "" : "*";
-
-    /*
-     * Some ugliness here.  To maximize backwards compatibility, we
-     * avoid using GHashTableIter and instead get a GList of all keys,
-     * then copy it into a array on the stack, and free it.
-     * This is because we may exit early before we get a chance to free the
-     * GList.
-     */
-    out << indent() << "GList *key_list = NULL, *iter = NULL;" << endl
-        << indent() << tkey_name << tkey_ptr << "* keys;" << endl
-        << indent() << "int i = 0, key_count;" << endl
-        << endl
-        << indent() << "if ((ret = thrift_protocol_write_map_begin (protocol, "
-        << type_to_enum(tkey) << ", " << type_to_enum(tval) << ", " << prefix << " ? "
-        << "(gint32) g_hash_table_size ((GHashTable *) " << prefix << ") : 0"
-        << ", error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl
-        << indent() << "if (" << prefix << ")" << endl
-        << indent() << "  g_hash_table_foreach ((GHashTable *) " << prefix
-        << ", thrift_hash_table_get_keys, &key_list);" << endl
-        << indent() << "key_count = g_list_length (key_list);" << endl
-        << indent() << "keys = g_newa (" << tkey_name << tkey_ptr
-        << ", key_count);" << endl
-        << indent() << "for (iter = g_list_first (key_list); iter; "
-           "iter = iter->next)" << endl;
-    indent_up();
-    out << indent() << "keys[i++] = (" << tkey_name << tkey_ptr
-        << ") iter->data;" << endl;
-    indent_down();
-    out << indent() << "g_list_free (key_list);" << endl
-        << endl
-        << indent() << "for (i = 0; i < key_count; ++i)" << endl;
-    scope_up(out);
-    out << indent() << keyname << " = keys[i];" << endl
-        << indent() << valname << " = (" << tval_name << tval_ptr
-        << ") g_hash_table_lookup (((GHashTable *) " << prefix
-        << "), (gpointer) " << keyname << ");" << endl
-        << endl;
-    generate_serialize_map_element(out,
-                                   (t_map*)ttype,
-                                   tkey_ptr + " " + keyname,
-                                   tval_ptr + " " + valname,
-                                   error_ret);
-    scope_down(out);
-    out << indent() << "if ((ret = thrift_protocol_write_map_end (protocol, "
-           "error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl;
-  } else if (ttype->is_set()) {
-    t_type* telem = ((t_set*)ttype)->get_elem_type();
-    string telem_name = type_name(telem);
-    string telem_ptr = telem->is_string() || !telem->is_base_type() ? "" : "*";
-    out << indent() << "GList *key_list = NULL, *iter = NULL;" << endl
-        << indent() << telem_name << telem_ptr << "* keys;" << endl
-        << indent() << "int i = 0, key_count;" << endl
-        << indent() << telem_name << telem_ptr << " elem;" << endl
-        << indent() << "gpointer value;" << endl
-        << indent() << "THRIFT_UNUSED_VAR (value);" << endl
-        << endl
-        << indent() << "if ((ret = thrift_protocol_write_set_begin (protocol, "
-        << type_to_enum(telem) << ", " << prefix << " ? "
-        << "(gint32) g_hash_table_size ((GHashTable *) " << prefix << ") : 0"
-        << ", error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl
-        << indent() << "if (" << prefix << ")" << endl
-        << indent() << "  g_hash_table_foreach ((GHashTable *) " << prefix
-        << ", thrift_hash_table_get_keys, &key_list);" << endl
-        << indent() << "key_count = g_list_length (key_list);" << endl
-        << indent() << "keys = g_newa (" << telem_name << telem_ptr
-        << ", key_count);" << endl
-        << indent() << "for (iter = g_list_first (key_list); iter; "
-           "iter = iter->next)" << endl;
-    indent_up();
-    out << indent() << "keys[i++] = (" << telem_name << telem_ptr
-        << ") iter->data;" << endl;
-    indent_down();
-    out << indent() << "g_list_free (key_list);" << endl
-        << endl
-        << indent() << "for (i = 0; i < key_count; ++i)" << endl;
-    scope_up(out);
-    out << indent() << "elem = keys[i];" << endl
-        << indent() << "value = (gpointer) g_hash_table_lookup "
-           "(((GHashTable *) " << prefix << "), (gpointer) elem);" << endl
-        << endl;
-    generate_serialize_set_element(out,
-                                   (t_set*)ttype,
-                                   telem_ptr + "elem",
-                                   error_ret);
-    scope_down(out);
-    out << indent() << "if ((ret = thrift_protocol_write_set_end (protocol, "
-           "error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl;
-  } else if (ttype->is_list()) {
-    string length = "(" + prefix + " ? " + prefix + "->len : 0)";
-    string i = tmp("i");
-    out << indent() << "guint " << i << ";" << endl
-        << endl
-        << indent() << "if ((ret = thrift_protocol_write_list_begin (protocol, "
-        << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", (gint32) "
-        << length << ", error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl
-        << indent() << "for (" << i << " = 0; " << i << " < " << length << "; "
-        << i << "++)" << endl;
-    scope_up(out);
-    generate_serialize_list_element(out, (t_list*)ttype, prefix, i, error_ret);
-    scope_down(out);
-    out << indent() << "if ((ret = thrift_protocol_write_list_end (protocol, "
-           "error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl;
-  }
-
-  scope_down(out);
-}
-
-void t_c_glib_generator::generate_serialize_map_element(ofstream& out,
-                                                        t_map* tmap,
-                                                        string key,
-                                                        string value,
-                                                        int error_ret) {
-  t_field kfield(tmap->get_key_type(), key);
-  generate_serialize_field(out, &kfield, "", "", error_ret);
-
-  t_field vfield(tmap->get_val_type(), value);
-  generate_serialize_field(out, &vfield, "", "", error_ret);
-}
-
-void t_c_glib_generator::generate_serialize_set_element(ofstream& out,
-                                                        t_set* tset,
-                                                        string element,
-                                                        int error_ret) {
-  t_field efield(tset->get_elem_type(), element);
-  generate_serialize_field(out, &efield, "", "", error_ret);
-}
-
-void t_c_glib_generator::generate_serialize_list_element(ofstream& out,
-                                                         t_list* tlist,
-                                                         string list,
-                                                         string index,
-                                                         int error_ret) {
-  t_type* ttype = get_true_type(tlist->get_elem_type());
-
-  // cast to non-const
-  string cast = "";
-  string name = "g_ptr_array_index ((GPtrArray *) " + list + ", " + index + ")";
-
-  if (ttype->is_void()) {
-    throw std::runtime_error("compiler error: list element type cannot be void");
-  } else if (is_numeric(ttype)) {
-    name = "g_array_index (" + list + ", " + base_type_name(ttype) + ", " + index + ")";
-  } else if (ttype->is_string()) {
-    cast = "(gchar*)";
-  } else if (ttype->is_map() || ttype->is_set()) {
-    cast = "(GHashTable*)";
-  } else if (ttype->is_list()) {
-    t_type* etype = ((t_list*)ttype)->get_elem_type();
-    if (etype->is_void()) {
-      throw std::runtime_error("compiler error: list element type cannot be void");
-    }
-    cast = is_numeric(etype) ? "(GArray*)" : "(GPtrArray*)";
-  }
-
-  t_field efield(ttype, "(" + cast + name + ")");
-  generate_serialize_field(out, &efield, "", "", error_ret);
-}
-
-/* deserializes a field of any type. */
-void t_c_glib_generator::generate_deserialize_field(ofstream& out,
-                                                    t_field* tfield,
-                                                    string prefix,
-                                                    string suffix,
-                                                    int error_ret,
-                                                    bool allocate) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw std::runtime_error("CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix
-                             + tfield->get_name());
-  }
-
-  string name = prefix + tfield->get_name() + suffix;
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name, error_ret, allocate);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name, error_ret);
-  } else if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    if (tbase == t_base_type::TYPE_STRING) {
-      indent(out) << "if (" << name << " != NULL)" << endl << indent() << "{" << endl;
-      indent_up();
-      indent(out) << "g_free(" << name << ");" << endl << indent() << name << " = NULL;" << endl;
-      indent_down();
-      indent(out) << "}" << endl << endl;
-    }
-    indent(out) << "if ((ret = thrift_protocol_read_";
-
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "compiler error: cannot serialize void field in a struct: " + name;
-      break;
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)type)->is_binary()) {
-        out << "binary (protocol, &data, &len";
-      } else {
-        out << "string (protocol, &" << name;
-      }
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << "bool (protocol, &" << name;
-      break;
-    case t_base_type::TYPE_I8:
-      out << "byte (protocol, &" << name;
-      break;
-    case t_base_type::TYPE_I16:
-      out << "i16 (protocol, &" << name;
-      break;
-    case t_base_type::TYPE_I32:
-      out << "i32 (protocol, &" << name;
-      break;
-    case t_base_type::TYPE_I64:
-      out << "i64 (protocol, &" << name;
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      out << "double (protocol, &" << name;
-      break;
-    default:
-      throw "compiler error: no C reader for base type " + t_base_type::t_base_name(tbase) + name;
-    }
-    out << ", error)) < 0)" << endl;
-    out << indent() << "  return " << error_ret << ";" << endl << indent() << "xfer += ret;"
-        << endl;
-
-    // load the byte array with the data
-    if (tbase == t_base_type::TYPE_STRING && ((t_base_type*)type)->is_binary()) {
-      indent(out) << name << " = g_byte_array_new();" << endl;
-      indent(out) << "g_byte_array_append (" << name << ", (guint8 *) data, (guint) len);" << endl;
-      indent(out) << "g_free (data);" << endl;
-    }
-  } else if (type->is_enum()) {
-    string t = tmp("ecast");
-    out << indent() << "gint32 " << t << ";" << endl << indent()
-        << "if ((ret = thrift_protocol_read_i32 (protocol, &" << t << ", error)) < 0)" << endl
-        << indent() << "  return " << error_ret << ";" << endl << indent() << "xfer += ret;" << endl
-        << indent() << name << " = (" << type_name(type) << ")" << t << ";" << endl;
-  } else {
-    throw std::logic_error("DO NOT KNOW HOW TO SERIALIZE FIELD '" + tfield->get_name() + "' TYPE '"
-                           + type_name(type));
-  }
-
-  // if the type is not required and this is a thrift struct (no prefix),
-  // set the isset variable.  if the type is required, then set the
-  // local variable indicating the value was set, so that we can do    // validation later.
-  if (tfield->get_req() != t_field::T_REQUIRED && prefix != "") {
-    indent(out) << prefix << "__isset_" << tfield->get_name() << suffix << " = TRUE;" << endl;
-  } else if (tfield->get_req() == t_field::T_REQUIRED && prefix != "") {
-    indent(out) << "isset_" << tfield->get_name() << " = TRUE;" << endl;
-  }
-}
-
-void t_c_glib_generator::generate_deserialize_struct(ofstream& out,
-                                                     t_struct* tstruct,
-                                                     string prefix,
-                                                     int error_ret,
-                                                     bool allocate) {
-  string name_uc = to_upper_case(initial_caps_to_underscores(tstruct->get_name()));
-  if (tstruct->is_xception()) {
-    out << indent() << "/* This struct is an exception */" << endl;
-    allocate = true;
-  }
-
-  if (allocate) {
-    out << indent() << "if ( " << prefix << " != NULL)" << endl << indent() << "{" << endl;
-    indent_up();
-    out << indent() << "g_object_unref (" << prefix << ");" << endl;
-    indent_down();
-    out << indent() << "}" << endl << indent() << prefix << " = g_object_new (" << this->nspace_uc
-        << "TYPE_" << name_uc << ", NULL);" << endl;
-  }
-  out << indent() << "if ((ret = thrift_struct_read (THRIFT_STRUCT (" << prefix
-      << "), protocol, error)) < 0)" << endl << indent() << "{" << endl;
-  indent_up();
-  if (allocate) {
-    indent(out) << "g_object_unref (" << prefix << ");" << endl;
-    if (tstruct->is_xception()) {
-      indent(out) << prefix << " = NULL;" << endl;
-    }
-  }
-  out << indent() << "return " << error_ret << ";" << endl;
-  indent_down();
-  out << indent() << "}" << endl << indent() << "xfer += ret;" << endl;
-}
-
-void t_c_glib_generator::generate_deserialize_container(ofstream& out,
-                                                        t_type* ttype,
-                                                        string prefix,
-                                                        int error_ret) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    out << indent() << "guint32 size;" << endl
-        << indent() << "guint32 i;" << endl
-        << indent() << "ThriftType key_type;" << endl
-        << indent() << "ThriftType value_type;" << endl
-        << endl
-        << indent() << "/* read the map begin marker */" << endl
-        << indent() << "if ((ret = thrift_protocol_read_map_begin (protocol, "
-           "&key_type, &value_type, &size, error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl
-        << endl;
-
-    // iterate over map elements
-    out << indent() << "/* iterate through each of the map's fields */" << endl
-        << indent() << "for (i = 0; i < size; i++)" << endl;
-    scope_up(out);
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix, error_ret);
-    scope_down(out);
-    out << endl;
-
-    // read map end
-    out << indent() << "/* read the map end marker */" << endl
-        << indent() << "if ((ret = thrift_protocol_read_map_end (protocol, "
-           "error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl;
-  } else if (ttype->is_set()) {
-    out << indent() << "guint32 size;" << endl
-        << indent() << "guint32 i;" << endl
-        << indent() << "ThriftType element_type;" << endl
-        << endl
-        << indent() << "if ((ret = thrift_protocol_read_set_begin (protocol, "
-           "&element_type, &size, error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl
-        << endl;
-
-    // iterate over the elements
-    out << indent() << "/* iterate through the set elements */" << endl
-        << indent() << "for (i = 0; i < size; ++i)" << endl;
-    scope_up(out);
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix, error_ret);
-    scope_down(out);
-
-    // read set end
-    out << indent() << "if ((ret = thrift_protocol_read_set_end (protocol, "
-           "error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl
-        << endl;
-  } else if (ttype->is_list()) {
-    out << indent() << "guint32 size;" << endl
-        << indent() << "guint32 i;" << endl
-        << indent() << "ThriftType element_type;" << endl
-        << endl
-        << indent() << "if ((ret = thrift_protocol_read_list_begin (protocol, "
-           "&element_type,&size, error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl
-        << endl;
-
-    // iterate over the elements
-    out << indent() << "/* iterate through list elements */" << endl
-        << indent() << "for (i = 0; i < size; i++)" << endl;
-    scope_up(out);
-    generate_deserialize_list_element(out,
-                                      (t_list*)ttype,
-                                      prefix,
-                                      "i",
-                                      error_ret);
-    scope_down(out);
-
-    // read list end
-    out << indent() << "if ((ret = thrift_protocol_read_list_end (protocol, "
-           "error)) < 0)" << endl;
-    indent_up();
-    out << indent() << "return " << error_ret << ";" << endl;
-    indent_down();
-    out << indent() << "xfer += ret;" << endl;
-  }
-
-  scope_down(out);
-}
-
-void t_c_glib_generator::declare_local_variable(ofstream& out, t_type* ttype, string& name, bool for_hash_table) {
-  string tname = type_name(ttype);
-
-  /* If the given type is a typedef, find its underlying type so we
-     can correctly determine how to generate a pointer to it */
-  ttype = get_true_type(ttype);
-  string ptr = !is_numeric(ttype) ? "" : "*";
-
-  if (ttype->is_map()) {
-    t_map* tmap = (t_map*)ttype;
-    out << indent() << tname << ptr << " " << name << " = "
-        << generate_new_hash_from_type(tmap->get_key_type(), tmap->get_val_type()) << endl;
-  } else if (ttype->is_list()) {
-    t_list* tlist = (t_list*)ttype;
-    out << indent() << tname << ptr << " " << name << " = "
-        << generate_new_array_from_type(tlist->get_elem_type()) << endl;
-  } else if (for_hash_table && ttype->is_enum()) {
-    out << indent() << tname << " " << name << ";" << endl;
-  } else {
-    out << indent() << tname << ptr << " " << name
-        << (ptr != "" ? " = g_new (" + tname + ", 1)" : " = NULL") << ";" << endl;
-  }
-}
-
-void t_c_glib_generator::declore_local_variable_for_write(ofstream& out,
-                                                          t_type* ttype,
-                                                          string& name) {
-  string tname = type_name(ttype);
-  ttype = get_true_type(ttype);
-  string ptr = ttype->is_string() || !ttype->is_base_type() ? " " : "* ";
-  string init_val = ttype->is_enum() ? "" : " = NULL";
-  out << indent() << tname << ptr << name << init_val << ";" << endl;
-}
-
-void t_c_glib_generator::generate_deserialize_map_element(ofstream& out,
-                                                          t_map* tmap,
-                                                          string prefix,
-                                                          int error_ret) {
-  t_type* tkey = tmap->get_key_type();
-  t_type* tval = tmap->get_val_type();
-  string keyname = tmp("key");
-  string valname = tmp("val");
-
-  declare_local_variable(out, tkey, keyname, true);
-  declare_local_variable(out, tval, valname, true);
-
-  /* If either the key or value type is a typedef, find its underlying
-     type so we can correctly determine how to generate a pointer to
-     it */
-  tkey = get_true_type(tkey);
-  tval = get_true_type(tval);
-
-  string tkey_ptr = tkey->is_string() || !tkey->is_base_type() ? "" : "*";
-  string tval_ptr = tval->is_string() || !tval->is_base_type() ? "" : "*";
-
-  // deserialize the fields of the map element
-  t_field fkey(tkey, tkey_ptr + keyname);
-  generate_deserialize_field(out, &fkey, "", "", error_ret);
-  t_field fval(tval, tval_ptr + valname);
-  generate_deserialize_field(out, &fval, "", "", error_ret);
-
-  indent(out) << "if (" << prefix << " && " << keyname << ")" << endl;
-  indent_up();
-  indent(out) << "g_hash_table_insert ((GHashTable *)" << prefix << ", (gpointer) " << keyname
-              << ", (gpointer) " << valname << ");" << endl;
-  indent_down();
-}
-
-void t_c_glib_generator::generate_deserialize_set_element(ofstream& out,
-                                                          t_set* tset,
-                                                          string prefix,
-                                                          int error_ret) {
-  t_type* telem = tset->get_elem_type();
-  string elem = tmp("_elem");
-  string telem_ptr = telem->is_string() || !telem->is_base_type() ? "" : "*";
-
-  declare_local_variable(out, telem, elem, true);
-
-  t_field felem(telem, telem_ptr + elem);
-  generate_deserialize_field(out, &felem, "", "", error_ret);
-
-  indent(out) << "if (" << prefix << " && " << elem << ")" << endl;
-  indent_up();
-  indent(out) << "g_hash_table_insert ((GHashTable *) " << prefix << ", (gpointer) " << elem
-              << ", (gpointer) " << elem << ");" << endl;
-  indent_down();
-}
-
-void t_c_glib_generator::generate_deserialize_list_element(ofstream& out,
-                                                           t_list* tlist,
-                                                           string prefix,
-                                                           string index,
-                                                           int error_ret) {
-  (void)index;
-  t_type* ttype = get_true_type(tlist->get_elem_type());
-  string elem = tmp("_elem");
-  string telem_ptr = !is_numeric(ttype) ? "" : "*";
-
-  declare_local_variable(out, ttype, elem, false);
-
-  t_field felem(ttype, telem_ptr + elem);
-  generate_deserialize_field(out, &felem, "", "", error_ret);
-
-  if (ttype->is_void()) {
-    throw std::runtime_error("compiler error: list element type cannot be void");
-  } else if (is_numeric(ttype)) {
-    indent(out) << "g_array_append_vals (" << prefix << ", " << elem << ", 1);" << endl;
-  } else {
-    indent(out) << "g_ptr_array_add (" << prefix << ", " << elem << ");" << endl;
-  }
-}
-
-string t_c_glib_generator::generate_free_func_from_type(t_type* ttype) {
-  if (ttype == NULL)
-    return "NULL";
-
-  if (ttype->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "compiler error: cannot determine hash type";
-      break;
-    case t_base_type::TYPE_BOOL:
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-    case t_base_type::TYPE_DOUBLE:
-      return "g_free";
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)ttype)->is_binary()) {
-        return "thrift_string_free";
-      }
-      return "g_free";
-    default:
-      throw "compiler error: no hash table info for type";
-    }
-  } else if (ttype->is_enum()) {
-    return "NULL";
-  } else if (ttype->is_map() || ttype->is_set()) {
-    return "(GDestroyNotify) thrift_safe_hash_table_destroy";
-  } else if (ttype->is_struct()) {
-    return "g_object_unref";
-  } else if (ttype->is_list()) {
-    t_type* etype = ((t_list*)ttype)->get_elem_type();
-    if (etype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)etype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot determine array type";
-        break;
-      case t_base_type::TYPE_BOOL:
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-      case t_base_type::TYPE_DOUBLE:
-        return "(GDestroyNotify) g_array_unref";
-      case t_base_type::TYPE_STRING:
-        return "(GDestroyNotify) g_ptr_array_unref";
-      default:
-        throw "compiler error: no array info for type";
-      }
-    } else if (etype->is_container() || etype->is_struct()) {
-      return "(GDestroyNotify) g_ptr_array_unref";
-      ;
-    } else if (etype->is_enum()) {
-      return "(GDestroyNotify) g_array_unref";
-    }
-    printf("Type not expected inside the array: %s\n", etype->get_name().c_str());
-    throw "Type not expected inside array";
-  } else if (ttype->is_typedef()) {
-    return generate_free_func_from_type(((t_typedef*)ttype)->get_type());
-  }
-  printf("Type not expected: %s\n", ttype->get_name().c_str());
-  throw "Type not expected";
-}
-
-string t_c_glib_generator::generate_hash_func_from_type(t_type* ttype) {
-  if (ttype == NULL)
-    return "NULL";
-
-  if (ttype->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "compiler error: cannot determine hash type";
-      break;
-    case t_base_type::TYPE_BOOL:
-      return "thrift_boolean_hash";
-    case t_base_type::TYPE_I8:
-      return "thrift_int8_hash";
-    case t_base_type::TYPE_I16:
-      return "thrift_int16_hash";
-    case t_base_type::TYPE_I32:
-      return "g_int_hash";
-    case t_base_type::TYPE_I64:
-      return "g_int64_hash";
-    case t_base_type::TYPE_DOUBLE:
-      return "g_double_hash";
-    case t_base_type::TYPE_STRING:
-      return "g_str_hash";
-    default:
-      throw "compiler error: no hash table info for type";
-    }
-  } else if (ttype->is_enum()) {
-    return "g_direct_hash";
-  } else if (ttype->is_container() || ttype->is_struct()) {
-    return "g_direct_hash";
-  } else if (ttype->is_typedef()) {
-    return generate_hash_func_from_type(((t_typedef*)ttype)->get_type());
-  }
-  printf("Type not expected: %s\n", ttype->get_name().c_str());
-  throw "Type not expected";
-}
-
-string t_c_glib_generator::generate_cmp_func_from_type(t_type* ttype) {
-  if (ttype == NULL)
-    return "NULL";
-
-  if (ttype->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "compiler error: cannot determine hash type";
-      break;
-    case t_base_type::TYPE_BOOL:
-      return "thrift_boolean_equal";
-    case t_base_type::TYPE_I8:
-      return "thrift_int8_equal";
-    case t_base_type::TYPE_I16:
-      return "thrift_int16_equal";
-    case t_base_type::TYPE_I32:
-      return "g_int_equal";
-    case t_base_type::TYPE_I64:
-      return "g_int64_equal";
-    case t_base_type::TYPE_DOUBLE:
-      return "g_double_equal";
-    case t_base_type::TYPE_STRING:
-      return "g_str_equal";
-    default:
-      throw "compiler error: no hash table info for type";
-    }
-  } else if (ttype->is_enum()) {
-    return "g_direct_equal";
-  } else if (ttype->is_container() || ttype->is_struct()) {
-    return "g_direct_equal";
-  } else if (ttype->is_typedef()) {
-    return generate_cmp_func_from_type(((t_typedef*)ttype)->get_type());
-  }
-  printf("Type not expected: %s\n", ttype->get_name().c_str());
-  throw "Type not expected";
-}
-
-string t_c_glib_generator::generate_new_hash_from_type(t_type* key, t_type* value) {
-  string hash_func = generate_hash_func_from_type(key);
-  string cmp_func = generate_cmp_func_from_type(key);
-  string key_free_func = generate_free_func_from_type(key);
-  string value_free_func = generate_free_func_from_type(value);
-
-  return "g_hash_table_new_full (" + hash_func + ", " + cmp_func + ", " + key_free_func + ", "
-         + value_free_func + ");";
-}
-
-string t_c_glib_generator::generate_new_array_from_type(t_type* ttype) {
-  if (ttype->is_void()) {
-    throw std::runtime_error("compiler error: cannot determine array type");
-  } else if (is_numeric(ttype)) {
-    return "g_array_new (0, 1, sizeof (" + base_type_name(ttype) + "));";
-  } else {
-    string free_func = generate_free_func_from_type(ttype);
-    return "g_ptr_array_new_with_free_func (" + free_func + ");";
-  }
-}
-
-/***************************************
- * UTILITY FUNCTIONS                   *
- ***************************************/
-
-/**
- * Upper case a string.  Wraps boost's string utility.
- */
-string to_upper_case(string name) {
-  string s(name);
-  std::transform(s.begin(), s.end(), s.begin(), ::toupper);
-  return s;
-  //  return boost::to_upper_copy (name);
-}
-
-/**
- * Lower case a string.  Wraps boost's string utility.
- */
-string to_lower_case(string name) {
-  string s(name);
-  std::transform(s.begin(), s.end(), s.begin(), ::tolower);
-  return s;
-  //  return boost::to_lower_copy (name);
-}
-
-/**
- * Makes a string friendly to C code standards by lowercasing and adding
- * underscores, with the exception of the first character.  For example:
- *
- * Input: "ZomgCamelCase"
- * Output: "zomg_camel_case"
- */
-string initial_caps_to_underscores(string name) {
-  string ret;
-  const char* tmp = name.c_str();
-  int pos = 0;
-
-  /* the first character isn't underscored if uppercase, just lowercased */
-  ret += tolower(tmp[pos]);
-  pos++;
-  for (unsigned int i = pos; i < name.length(); i++) {
-    char lc = tolower(tmp[i]);
-    if (lc != tmp[i]) {
-      ret += '_';
-    }
-    ret += lc;
-  }
-
-  return ret;
-}
-
-/**
- * Performs the reverse operation of initial_caps_to_underscores: The first
- * character of the string is made uppercase, along with each character that
- * follows an underscore (which is removed). Useful for converting Thrift
- * service-method names into GObject-style class names.
- *
- * Input: "zomg_camel_case"
- * Output: "ZomgCamelCase"
- */
-string underscores_to_initial_caps(string name) {
-  string ret;
-  const char* tmp = name.c_str();
-  bool uppercase_next = true;
-
-  for (unsigned int i = 0; i < name.length(); i++) {
-    char c = tmp[i];
-    if (c == '_') {
-      uppercase_next = true;
-    } else {
-      if (uppercase_next) {
-        ret += toupper(c);
-        uppercase_next = false;
-      } else {
-        ret += c;
-      }
-    }
-  }
-
-  return ret;
-}
-
-/* register this generator with the main program */
-THRIFT_REGISTER_GENERATOR(c_glib, "C, using GLib", "")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_cocoa_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_cocoa_generator.cc
deleted file mode 100644
index eba94c0..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_cocoa_generator.cc
+++ /dev/null
@@ -1,3301 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ostream;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Objective-C code generator.
- *
- * mostly copy/pasting/tweaking from mcslee's work.
- */
-class t_cocoa_generator : public t_oop_generator {
-public:
-  t_cocoa_generator(t_program* program,
-                    const std::map<std::string, std::string>& parsed_options,
-                    const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    log_unexpected_ = false;
-    validate_required_ = false;
-    async_clients_ = false;
-    promise_kit_ = false;
-    debug_descriptions_ = false;
-    pods_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("log_unexpected") == 0) {
-        log_unexpected_ = true;
-      } else if( iter->first.compare("validate_required") == 0) {
-        validate_required_ = true;
-      } else if( iter->first.compare("async_clients") == 0) {
-        async_clients_ = true;
-      } else if( iter->first.compare("promise_kit") == 0) {
-        promise_kit_ = true;
-      } else if( iter->first.compare("debug_descriptions") == 0) {
-        debug_descriptions_ = true;
-      } else if( iter->first.compare("pods") == 0) {
-        pods_ = true;
-      } else {
-        throw "unknown option cocoa:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-cocoa";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  void print_const_value(ostream& out,
-                         string name,
-                         t_type* type,
-                         t_const_value* value,
-                         bool defval = false);
-  std::string render_const_value(ostream& out,
-                                 t_type* type,
-                                 t_const_value* value,
-                                 bool box_it = false);
-
-  void generate_cocoa_struct(t_struct* tstruct, bool is_exception);
-  void generate_cocoa_struct_interface(std::ofstream& out,
-                                       t_struct* tstruct,
-                                       bool is_xception = false);
-  void generate_cocoa_struct_implementation(std::ofstream& out,
-                                            t_struct* tstruct,
-                                            bool is_xception = false,
-                                            bool is_result = false);
-  void generate_cocoa_struct_initializer_signature(std::ofstream& out, t_struct* tstruct);
-  void generate_cocoa_struct_init_with_coder_method(ofstream& out,
-                                                    t_struct* tstruct,
-                                                    bool is_exception);
-  void generate_cocoa_struct_encode_with_coder_method(ofstream& out,
-                                                      t_struct* tstruct,
-                                                      bool is_exception);
-  void generate_cocoa_struct_copy_method(ofstream& out,
-                                         t_struct* tstruct,
-                                         bool is_exception);
-  void generate_cocoa_struct_hash_method(ofstream& out, t_struct* tstruct);
-  void generate_cocoa_struct_is_equal_method(ofstream& out,
-                                             t_struct* tstruct,
-                                             bool is_exception);
-  void generate_cocoa_struct_field_accessor_implementations(std::ofstream& out,
-                                                            t_struct* tstruct,
-                                                            bool is_exception);
-  void generate_cocoa_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_cocoa_struct_result_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_cocoa_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_cocoa_struct_validator(std::ofstream& out, t_struct* tstruct);
-  void generate_cocoa_struct_description(std::ofstream& out, t_struct* tstruct);
-
-  std::string function_result_helper_struct_type(t_service *tservice, t_function* tfunction);
-  std::string function_args_helper_struct_type(t_service* tservice, t_function* tfunction);
-  void generate_function_helpers(t_service *tservice, t_function* tfunction);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_cocoa_service_protocol(std::ofstream& out, t_service* tservice);
-  void generate_cocoa_service_async_protocol(std::ofstream& out, t_service* tservice);
-
-  void generate_cocoa_service_client_interface(std::ofstream& out, t_service* tservice);
-  void generate_cocoa_service_client_async_interface(std::ofstream& out, t_service* tservice);
-
-  void generate_cocoa_service_client_send_function_implementation(ofstream& out,
-                                                                  t_service* tservice,
-                                                                  t_function* tfunction,
-                                                                  bool needs_protocol);
-  void generate_cocoa_service_client_send_function_invocation(ofstream& out, t_function* tfunction);
-  void generate_cocoa_service_client_send_async_function_invocation(ofstream& out,
-                                                                    t_function* tfunction,
-                                                                    string failureBlockName);
-  void generate_cocoa_service_client_recv_function_implementation(ofstream& out,
-                                                                  t_service* tservice,
-                                                                  t_function* tfunction,
-                                                                  bool needs_protocol);
-  void generate_cocoa_service_client_implementation(std::ofstream& out, t_service* tservice);
-  void generate_cocoa_service_client_async_implementation(std::ofstream& out, t_service* tservice);
-
-  void generate_cocoa_service_server_interface(std::ofstream& out, t_service* tservice);
-  void generate_cocoa_service_server_implementation(std::ofstream& out, t_service* tservice);
-  void generate_cocoa_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out, t_field* tfield, std::string fieldName);
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string fieldName = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string iter,
-                                      std::string map);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out,
-                                       t_list* tlist,
-                                       std::string index,
-                                       std::string listName);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string cocoa_prefix();
-  std::string cocoa_imports();
-  std::string cocoa_thrift_imports();
-  std::string type_name(t_type* ttype, bool class_ref = false, bool needs_mutable = false);
-  std::string element_type_name(t_type* ttype);
-  std::string base_type_name(t_base_type* tbase);
-  std::string declare_property(t_field* tfield);
-  std::string declare_property_isset(t_field* tfield);
-  std::string declare_property_unset(t_field* tfield);
-  std::string invalid_return_statement(t_function* tfunction);
-  std::string function_signature(t_function* tfunction, bool include_error);
-  std::string async_function_signature(t_function* tfunction, bool include_error);
-  std::string promise_function_signature(t_function* tfunction);
-  std::string argument_list(t_struct* tstruct, string protocol_name, bool include_error);
-  std::string type_to_enum(t_type* ttype);
-  std::string format_string_for_type(t_type* type);
-  std::string format_cast_for_type(t_type* type);
-  std::string call_field_setter(t_field* tfield, std::string fieldName);
-  std::string box(t_type *ttype, std::string field_name);
-  std::string unbox(t_type* ttype, std::string field_name);
-  std::string getter_name(string field_name);
-  std::string setter_name(string field_name);
-
-  bool type_can_be_null(t_type* ttype) {
-    ttype = get_true_type(ttype);
-
-    return ttype->is_container() || ttype->is_struct() || ttype->is_xception()
-           || ttype->is_string();
-  }
-
-private:
-  std::string cocoa_prefix_;
-  std::string constants_declarations_;
-  int error_constant_;
-
-  /**
-   * File streams
-   */
-
-  std::ofstream f_header_;
-  std::ofstream f_impl_;
-
-  bool log_unexpected_;
-  bool validate_required_;
-  bool async_clients_;
-  bool promise_kit_;
-  bool debug_descriptions_;
-  bool pods_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- */
-void t_cocoa_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-  cocoa_prefix_ = program_->get_namespace("cocoa");
-
-  // we have a .h header file...
-  string f_header_name = cocoa_prefix_ + capitalize(program_name_) + ".h";
-  string f_header_fullname = get_out_dir() + f_header_name;
-  f_header_.open(f_header_fullname.c_str());
-
-  f_header_ << autogen_comment() << endl;
-
-  f_header_ << cocoa_imports() << cocoa_thrift_imports();
-
-  // ...and a .m implementation file
-  string f_impl_name = cocoa_prefix_ + capitalize(program_name_) + ".m";
-  string f_impl_fullname = get_out_dir() + f_impl_name;
-  f_impl_.open(f_impl_fullname.c_str());
-
-  f_impl_ << autogen_comment() << endl;
-
-  f_impl_ << cocoa_imports() << cocoa_thrift_imports() << "#import \"" << f_header_name << "\""
-          << endl << endl;
-
-  error_constant_ = 60000;
-}
-
-/**
- * Prints standard Cocoa imports
- *
- * @return List of imports for Cocoa libraries
- */
-string t_cocoa_generator::cocoa_imports() {
-  return string() + "#import <Foundation/Foundation.h>\n" + "\n";
-}
-
-/**
- * Prints thrift runtime imports
- *
- * @return List of imports necessary for thrift runtime
- */
-string t_cocoa_generator::cocoa_thrift_imports() {
-
-  vector<string> includes_list;
-  includes_list.push_back("TProtocol.h");
-  includes_list.push_back("TProtocolFactory.h");
-  includes_list.push_back("TApplicationError.h");
-  includes_list.push_back("TProtocolError.h");
-  includes_list.push_back("TProtocolUtil.h");
-  includes_list.push_back("TProcessor.h");
-  includes_list.push_back("TBase.h");
-  includes_list.push_back("TAsyncTransport.h");
-  includes_list.push_back("TBaseClient.h");
-
-  std::ostringstream includes;
-
-  vector<string>::const_iterator i_iter;
-  for (i_iter=includes_list.begin(); i_iter!=includes_list.end(); ++i_iter) {
-    includes << "#import ";
-    if (pods_) {
-      includes << "<Thrift/" << *i_iter << ">";
-    } else {
-      includes << "\"" << *i_iter << "\"";
-    }
-    includes << endl;
-  }
-
-  includes << endl;
-
-  if (promise_kit_) {
-    includes << "#import ";
-    if (pods_) {
-      includes << "<PromiseKit/PromiseKit.h>";
-    } else {
-      includes << "\"PromiseKit.h\"";
-    }
-    includes << endl;
-  }
-
-  // Include other Thrift includes
-  const vector<t_program*>& other_includes = program_->get_includes();
-  for (size_t i = 0; i < other_includes.size(); ++i) {
-    includes << "#import \""
-             << other_includes[i]->get_namespace("cocoa")
-             << capitalize(other_includes[i]->get_name())
-             << ".h\"" << endl;
-  }
-
-  includes << endl;
-
-  return includes.str();
-}
-
-/**
- * Finish up generation.
- */
-void t_cocoa_generator::close_generator() {
-  // stick our constants declarations at the end of the header file
-  // since they refer to things we are defining.
-  f_header_ << constants_declarations_ << endl;
-}
-
-/**
- * Generates a typedef. This is just a simple 1-liner in objective-c
- *
- * @param ttypedef The type definition
- */
-void t_cocoa_generator::generate_typedef(t_typedef* ttypedef) {
-  if (ttypedef->get_type()->is_map()) {
-    t_map *map = (t_map *)ttypedef->get_type();
-    if (map->get_key_type()->is_struct()) {
-      f_header_ << indent() << "@class " << type_name(map->get_key_type(), true) << ";" << endl;
-    }
-    if (map->get_val_type()->is_struct()) {
-      f_header_ << indent() << "@class " << type_name(map->get_val_type(), true) << ";" << endl;
-    }
-  }
-  else if (ttypedef->get_type()->is_set()) {
-    t_set *set = (t_set *)ttypedef->get_type();
-    if (set->get_elem_type()->is_struct()) {
-      f_header_ << indent() << "@class " << type_name(set->get_elem_type(), true) << ";" << endl;
-    }
-  }
-  else if (ttypedef->get_type()->is_list()) {
-    t_list *list = (t_list *)ttypedef->get_type();
-    if (list->get_elem_type()->is_struct()) {
-      f_header_ << indent() << "@class " << type_name(list->get_elem_type(), true) << ";" << endl;
-    }
-  }
-  f_header_ << indent() << "typedef " << type_name(ttypedef->get_type()) << " " << cocoa_prefix_
-            << ttypedef->get_symbolic() << ";" << endl << endl;
-  if (ttypedef->get_type()->is_container()) {
-    f_header_ << indent() << "typedef " << type_name(ttypedef->get_type(), false, true) << " " << cocoa_prefix_
-              << "Mutable" << ttypedef->get_symbolic() << ";" << endl << endl;
-  }
-}
-
-/**
- * Generates code for an enumerated type. In Objective-C, this is
- * essentially the same as the thrift definition itself, instead using
- * NS_ENUM keyword in Objective-C.  For namespace purposes, the name of
- * the enum is prefixed to each element in keeping with Cocoa & Swift
- * standards.
- *
- * @param tenum The enumeration
- */
-void t_cocoa_generator::generate_enum(t_enum* tenum) {
-  f_header_ << indent() << "typedef NS_ENUM(SInt32, " << cocoa_prefix_ << tenum->get_name() << ") {" << endl;
-  indent_up();
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  bool first = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_header_ << "," << endl;
-    }
-    f_header_ << indent() << cocoa_prefix_ << tenum->get_name() << (*c_iter)->get_name();
-    f_header_ << " = " << (*c_iter)->get_value();
-  }
-
-  indent_down();
-  f_header_ << endl << "};" << endl << endl;
-}
-
-/**
- * Generates a class that holds all the constants.
- */
-void t_cocoa_generator::generate_consts(std::vector<t_const*> consts) {
-  std::ostringstream const_interface;
-
-  const_interface << "FOUNDATION_EXPORT NSString *" << cocoa_prefix_ << capitalize(program_name_) << "ErrorDomain;" << endl
-                  << endl;
-
-
-  bool needs_class = false;
-
-  // Public constants for base types & strings
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    t_type* type = (*c_iter)->get_type()->get_true_type();
-    if (!type->is_container() && !type->is_struct()) {
-      const_interface << "FOUNDATION_EXPORT " << type_name(type) << " "
-                      << cocoa_prefix_ << capitalize((*c_iter)->get_name()) << ";" << endl;
-    }
-    else {
-      needs_class = true;
-    }
-  }
-
-
-  string constants_class_name = cocoa_prefix_ + capitalize(program_name_) + "Constants";
-
-  if (needs_class) {
-
-    const_interface << endl;
-
-    const_interface << "@interface " << constants_class_name << " : NSObject ";
-    scope_up(const_interface);
-    scope_down(const_interface);
-
-    // getter method for each constant defined.
-    for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-      string name = (*c_iter)->get_name();
-      t_type* type = (*c_iter)->get_type()->get_true_type();
-      if (type->is_container() || type->is_struct()) {
-        t_type* type = (*c_iter)->get_type();
-        const_interface << endl << "+ (" << type_name(type) << ") " << name << ";" << endl;
-      }
-    }
-
-    const_interface << endl << "@end";
-  }
-
-  // this gets spit into the header file in ::close_generator
-  constants_declarations_ = const_interface.str();
-
-  f_impl_ << "NSString *" << cocoa_prefix_ << capitalize(program_name_) << "ErrorDomain = "
-          << "@\"" << cocoa_prefix_ << capitalize(program_name_) << "ErrorDomain\";" << endl << endl;
-
-  // variables in the .m hold all simple constant values
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    string name = (*c_iter)->get_name();
-    t_type* type = (*c_iter)->get_type();
-    f_impl_ << type_name(type) << " " << cocoa_prefix_ << name;
-    t_type* ttype = type->get_true_type();
-    if (!ttype->is_container() && !ttype->is_struct()) {
-      f_impl_ << " = " << render_const_value(f_impl_, type, (*c_iter)->get_value());
-    }
-    f_impl_ << ";" << endl;
-  }
-  f_impl_ << endl;
-
-  if (needs_class) {
-
-    f_impl_ << "@implementation " << constants_class_name << endl << endl;
-
-    // initialize complex constants when the class is loaded
-    f_impl_ << "+ (void) initialize ";
-    scope_up(f_impl_);
-
-    for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-      t_type* ttype = (*c_iter)->get_type()->get_true_type();
-      if (ttype->is_container() || ttype->is_struct()) {
-        f_impl_ << endl;
-        print_const_value(f_impl_,
-                          cocoa_prefix_ + (*c_iter)->get_name(),
-                          (*c_iter)->get_type(),
-                          (*c_iter)->get_value(),
-                          false);
-        f_impl_ << ";" << endl;
-      }
-    }
-    scope_down(f_impl_);
-
-    // getter method for each constant
-    for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-      string name = (*c_iter)->get_name();
-      t_type* type = (*c_iter)->get_type()->get_true_type();
-      if (type->is_container() || type->is_struct()) {
-        f_impl_ << endl << "+ (" << type_name(type) << ") " << name << " ";
-        scope_up(f_impl_);
-        indent(f_impl_) << "return " << cocoa_prefix_ << name << ";" << endl;
-        scope_down(f_impl_);
-      }
-    }
-
-    f_impl_ << "@end" << endl << endl;
-  }
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is a class
- * with protected data members, read(), write(), and getters and setters.
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_struct(t_struct* tstruct) {
-  generate_cocoa_struct_interface(f_header_, tstruct, false);
-  generate_cocoa_struct_implementation(f_impl_, tstruct, false);
-}
-
-/**
- * Exceptions are structs, but they inherit from NSException
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_xception(t_struct* txception) {
-  generate_cocoa_struct_interface(f_header_, txception, true);
-  generate_cocoa_struct_implementation(f_impl_, txception, true);
-}
-
-/**
- * Generate the interface for a struct
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_cocoa_struct_interface(ofstream& out,
-                                                        t_struct* tstruct,
-                                                        bool is_exception) {
-
-  if (is_exception) {
-    out << "enum {" << endl
-        << "  " << cocoa_prefix_ << capitalize(program_name_) << "Error" << tstruct->get_name() <<  " = -" << error_constant_++ << endl
-        << "};" << endl
-        << endl;
-  }
-
-  out << "@interface " << cocoa_prefix_ << tstruct->get_name() << " : ";
-
-  if (is_exception) {
-    out << "NSError ";
-  } else {
-    out << "NSObject ";
-  }
-  out << "<TBase, NSCoding, NSCopying> " << endl;
-
-  out << endl;
-
-  // properties
-  const vector<t_field*>& members = tstruct->get_members();
-  if (members.size() > 0) {
-    vector<t_field*>::const_iterator m_iter;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      out << indent() << declare_property(*m_iter) << endl;
-      out << indent() << declare_property_isset(*m_iter) << endl;
-      out << indent() << declare_property_unset(*m_iter) << endl;
-      out << endl;
-    }
-  }
-
-  out << endl;
-
-  // initializer for all fields
-  if (!members.empty()) {
-    generate_cocoa_struct_initializer_signature(out, tstruct);
-    out << ";" << endl;
-  }
-  out << endl;
-
-  out << "@end" << endl << endl;
-}
-
-/**
- * Generate signature for initializer of struct with a parameter for
- * each field.
- */
-void t_cocoa_generator::generate_cocoa_struct_initializer_signature(ofstream& out,
-                                                                    t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  indent(out) << "- (instancetype) initWith";
-  for (m_iter = members.begin(); m_iter != members.end();) {
-    if (m_iter == members.begin()) {
-      out << capitalize((*m_iter)->get_name());
-    } else {
-      out << (*m_iter)->get_name();
-    }
-    out << ": (" << type_name((*m_iter)->get_type()) << ") " << (*m_iter)->get_name();
-    ++m_iter;
-    if (m_iter != members.end()) {
-      out << " ";
-    }
-  }
-}
-
-/**
- * Generate the initWithCoder method for this struct so it's compatible with
- * the NSCoding protocol
- */
-void t_cocoa_generator::generate_cocoa_struct_init_with_coder_method(ofstream& out,
-                                                                     t_struct* tstruct,
-                                                                     bool is_exception) {
-
-  indent(out) << "- (instancetype) initWithCoder: (NSCoder *) decoder" << endl;
-  scope_up(out);
-
-  if (is_exception) {
-    // NSExceptions conform to NSCoding, so we can call super
-    indent(out) << "self = [super initWithCoder: decoder];" << endl;
-  } else {
-    indent(out) << "self = [super init];" << endl;
-  }
-
-  indent(out) << "if (self) ";
-  scope_up(out);
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    out << indent() << "if ([decoder containsValueForKey: @\"" << (*m_iter)->get_name() << "\"])"
-        << endl;
-    scope_up(out);
-    out << indent() << "_" << (*m_iter)->get_name() << " = ";
-    if (type_can_be_null(t)) {
-      out << "[decoder decodeObjectForKey: @\"" << (*m_iter)->get_name() << "\"];"
-          << endl;
-    } else if (t->is_enum()) {
-      out << "[decoder decodeIntForKey: @\"" << (*m_iter)->get_name() << "\"];" << endl;
-    } else {
-      t_base_type::t_base tbase = ((t_base_type*)t)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_BOOL:
-        out << "[decoder decodeBoolForKey: @\"" << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_I8:
-        out << "[decoder decodeIntForKey: @\"" << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_I16:
-        out << "[decoder decodeIntForKey: @\"" << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_I32:
-        out << "[decoder decodeInt32ForKey: @\"" << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_I64:
-        out << "[decoder decodeInt64ForKey: @\"" << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "[decoder decodeDoubleForKey: @\"" << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      default:
-        throw "compiler error: don't know how to decode thrift type: "
-            + t_base_type::t_base_name(tbase);
-      }
-    }
-    out << indent() << "_" << (*m_iter)->get_name() << "IsSet = YES;" << endl;
-    scope_down(out);
-  }
-
-  scope_down(out);
-
-  out << indent() << "return self;" << endl;
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generate the encodeWithCoder method for this struct so it's compatible with
- * the NSCoding protocol
- */
-void t_cocoa_generator::generate_cocoa_struct_encode_with_coder_method(ofstream& out,
-                                                                       t_struct* tstruct,
-                                                                       bool is_exception) {
-
-  indent(out) << "- (void) encodeWithCoder: (NSCoder *) encoder" << endl;
-  scope_up(out);
-
-  if (is_exception) {
-    // NSExceptions conform to NSCoding, so we can call super
-    out << indent() << "[super encodeWithCoder: encoder];" << endl;
-  }
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    out << indent() << "if (_" << (*m_iter)->get_name() << "IsSet)" << endl;
-    scope_up(out);
-    if (type_can_be_null(t)) {
-      out << indent() << "[encoder encodeObject: _" << (*m_iter)->get_name() << " forKey: @\""
-          << (*m_iter)->get_name() << "\"];" << endl;
-    } else if (t->is_enum()) {
-      out << indent() << "[encoder encodeInt: _" << (*m_iter)->get_name() << " forKey: @\""
-          << (*m_iter)->get_name() << "\"];" << endl;
-    } else {
-      t_base_type::t_base tbase = ((t_base_type*)t)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_BOOL:
-        out << indent() << "[encoder encodeBool: _" << (*m_iter)->get_name() << " forKey: @\""
-            << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_I8:
-        out << indent() << "[encoder encodeInt: _" << (*m_iter)->get_name() << " forKey: @\""
-            << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_I16:
-        out << indent() << "[encoder encodeInt: _" << (*m_iter)->get_name() << " forKey: @\""
-            << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_I32:
-        out << indent() << "[encoder encodeInt32: _" << (*m_iter)->get_name() << " forKey: @\""
-            << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_I64:
-        out << indent() << "[encoder encodeInt64: _" << (*m_iter)->get_name() << " forKey: @\""
-            << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << indent() << "[encoder encodeDouble: _" << (*m_iter)->get_name() << " forKey: @\""
-            << (*m_iter)->get_name() << "\"];" << endl;
-        break;
-      default:
-        throw "compiler error: don't know how to encode thrift type: "
-            + t_base_type::t_base_name(tbase);
-      }
-    }
-    scope_down(out);
-  }
-
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generate the copy method for this struct
- */
-void t_cocoa_generator::generate_cocoa_struct_copy_method(ofstream& out, t_struct* tstruct, bool is_exception) {
-  out << indent() << "- (instancetype) copyWithZone:(NSZone *)zone" << endl;
-  scope_up(out);
-
-  if (is_exception) {
-    out << indent() << type_name(tstruct) << " val = [" << cocoa_prefix_ << tstruct->get_name() << " errorWithDomain: self.domain code: self.code userInfo: self.userInfo];" << endl;
-  } else {
-    out << indent() << type_name(tstruct) << " val = [" << cocoa_prefix_ << tstruct->get_name() << " new];" << endl;
-  }
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    out << indent() << "if (_" << (*m_iter)->get_name() << "IsSet)" << endl;
-    scope_up(out);
-    if (type_can_be_null(t)) {
-      out << indent() << "val." << (*m_iter)->get_name() << " = [self." << (*m_iter)->get_name() << " copy];";
-    } else {
-      out << indent() << "val." << (*m_iter)->get_name() << " = self." << (*m_iter)->get_name() << ";";
-    }
-    out << endl;
-    scope_down(out);
-  }
-
-  out << indent() << "return val;" << endl;
-
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generate the hash method for this struct
- */
-void t_cocoa_generator::generate_cocoa_struct_hash_method(ofstream& out, t_struct* tstruct) {
-  indent(out) << "- (NSUInteger) hash" << endl;
-  scope_up(out);
-  out << indent() << "NSUInteger hash = 17;" << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    out << indent() << "hash = (hash * 31) ^ _" << (*m_iter)->get_name()
-        << "IsSet ? 2654435761 : 0;" << endl;
-    out << indent() << "if (_" << (*m_iter)->get_name() << "IsSet)" << endl;
-    scope_up(out);
-    if (type_can_be_null(t)) {
-      out << indent() << "hash = (hash * 31) ^ [_" << (*m_iter)->get_name() << " hash];" << endl;
-    } else {
-      out << indent() << "hash = (hash * 31) ^ [@(_" << (*m_iter)->get_name() << ") hash];"
-          << endl;
-    }
-    scope_down(out);
-  }
-
-  out << indent() << "return hash;" << endl;
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generate the isEqual method for this struct
- */
-void t_cocoa_generator::generate_cocoa_struct_is_equal_method(ofstream& out, t_struct* tstruct, bool is_exception) {
-  indent(out) << "- (BOOL) isEqual: (id) anObject" << endl;
-  scope_up(out);
-
-  indent(out) << "if (self == anObject) {" << endl;
-  indent_up();
-  indent(out) << "return YES;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  string class_name = cocoa_prefix_ + tstruct->get_name();
-
-  if (is_exception) {
-    indent(out) << "if (![super isEqual:anObject]) {" << endl;
-    indent_up();
-    indent(out) << "return NO;" << endl;
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-  else {
-    indent(out) << "if (![anObject isKindOfClass:[" << class_name << " class]]) {" << endl;
-    indent_up();
-    indent(out) << "return NO;" << endl;
-    indent_down();
-    indent(out) << "}" << endl;
-  }
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  if (!members.empty()) {
-    indent(out) << class_name << " *other = (" << class_name << " *)anObject;" << endl;
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-      string name = (*m_iter)->get_name();
-      if (type_can_be_null(t)) {
-        out << indent() << "if ((_" << name << "IsSet != other->_" << name << "IsSet) ||" << endl
-            << indent() << "    "
-            << "(_" << name << "IsSet && "
-            << "((_" << name << " || other->_" << name << ") && "
-            << "![_" << name << " isEqual:other->_" << name << "]))) {" << endl;
-      } else {
-        out << indent() << "if ((_" << name << "IsSet != other->_" << name << "IsSet) ||" << endl
-            << indent() << "    "
-            << "(_" << name << "IsSet && "
-            << "(_" << name << " != other->_" << name << "))) {" << endl;
-      }
-      indent_up();
-      indent(out) << "return NO;" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-
-  out << indent() << "return YES;" << endl;
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generate struct implementation.
- *
- * @param tstruct      The struct definition
- * @param is_exception Is this an exception?
- * @param is_result    If this is a result it needs a different writer
- */
-void t_cocoa_generator::generate_cocoa_struct_implementation(ofstream& out,
-                                                             t_struct* tstruct,
-                                                             bool is_exception,
-                                                             bool is_result) {
-  indent(out) << "@implementation " << cocoa_prefix_ << tstruct->get_name() << endl << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  // exceptions need to call the designated initializer on NSException
-  if (is_exception) {
-    out << indent() << "- (instancetype) init" << endl;
-    scope_up(out);
-    out << indent() << "return [super initWithDomain: " << cocoa_prefix_ << capitalize(program_name_) << "ErrorDomain" << endl
-        << indent() << "                        code: " << cocoa_prefix_ << capitalize(program_name_) << "Error" << tstruct->get_name() << endl
-        << indent() << "                    userInfo: nil];" << endl;
-    scope_down(out);
-    out << endl;
-  } else {
-    // struct
-
-    // default initializer
-    // setup instance variables with default values
-    indent(out) << "- (instancetype) init" << endl;
-    scope_up(out);
-    indent(out) << "self = [super init];" << endl;
-    indent(out) << "if (self)";
-    scope_up(out);
-    if (members.size() > 0) {
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        t_type* t = get_true_type((*m_iter)->get_type());
-        if ((*m_iter)->get_value() != NULL) {
-          print_const_value(out,
-                            "self." + (*m_iter)->get_name(),
-                            t,
-                            (*m_iter)->get_value(),
-                            false);
-        }
-      }
-    }
-    scope_down(out);
-    indent(out) << "return self;" << endl;
-    scope_down(out);
-    out << endl;
-  }
-
-  // initializer with all fields as params
-  if (!members.empty()) {
-    generate_cocoa_struct_initializer_signature(out, tstruct);
-    out << endl;
-    scope_up(out);
-    if (is_exception) {
-      out << indent() << "self = [self init];" << endl;
-    } else {
-      out << indent() << "self = [super init];" << endl;
-    }
-
-    indent(out) << "if (self)";
-    scope_up(out);
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      out << indent() << "_" << (*m_iter)->get_name() << " = ";
-      if (get_true_type((*m_iter)->get_type())->is_container()) {
-        out << "[" << (*m_iter)->get_name() << " mutableCopy];" << endl;
-      } else {
-        out << (*m_iter)->get_name() << ";" << endl;
-      }
-      out << indent() << "_" << (*m_iter)->get_name() << "IsSet = YES;" << endl;
-    }
-    scope_down(out);
-
-    out << indent() << "return self;" << endl;
-    scope_down(out);
-    out << endl;
-  }
-
-  // initWithCoder for NSCoding
-  generate_cocoa_struct_init_with_coder_method(out, tstruct, is_exception);
-  // encodeWithCoder for NSCoding
-  generate_cocoa_struct_encode_with_coder_method(out, tstruct, is_exception);
-  // hash and isEqual for NSObject
-  generate_cocoa_struct_hash_method(out, tstruct);
-  generate_cocoa_struct_is_equal_method(out, tstruct, is_exception);
-  // copy for NSObject
-  generate_cocoa_struct_copy_method(out, tstruct, is_exception);
-
-  // the rest of the methods
-  generate_cocoa_struct_field_accessor_implementations(out, tstruct, is_exception);
-  generate_cocoa_struct_reader(out, tstruct);
-  if (is_result) {
-    generate_cocoa_struct_result_writer(out, tstruct);
-  } else {
-    generate_cocoa_struct_writer(out, tstruct);
-  }
-  generate_cocoa_struct_validator(out, tstruct);
-  generate_cocoa_struct_description(out, tstruct);
-
-  out << "@end" << endl << endl;
-}
-
-/**
- * Generates a function to read all the fields of the struct.
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_cocoa_struct_reader(ofstream& out, t_struct* tstruct) {
-  out << "- (BOOL) read: (id <TProtocol>) inProtocol error: (NSError *__autoreleasing *)__thriftError" << endl;
-  scope_up(out);
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Declare stack tmp variables
-  indent(out) << "NSString * fieldName;" << endl;
-  indent(out) << "SInt32 fieldType;" << endl;
-  indent(out) << "SInt32 fieldID;" << endl;
-  out << endl;
-
-  indent(out) << "if (![inProtocol readStructBeginReturningName: NULL error: __thriftError]) return NO;" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (true)" << endl;
-  scope_up(out);
-
-  // Read beginning field marker
-  indent(out)
-      << "if (![inProtocol readFieldBeginReturningName: &fieldName type: &fieldType fieldID: &fieldID error: __thriftError]) return NO;"
-      << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if (fieldType == TTypeSTOP) { " << endl;
-  indent_up();
-  indent(out) << "break;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  // Switch statement on the field we are reading
-  indent(out) << "switch (fieldID)" << endl;
-
-  scope_up(out);
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << (*f_iter)->get_key() << ":" << endl;
-    indent_up();
-    indent(out) << "if (fieldType == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-    indent_up();
-
-    generate_deserialize_field(out, *f_iter, "fieldValue");
-    indent(out) << call_field_setter(*f_iter, "fieldValue") << endl;
-
-    indent_down();
-    out << indent() << "} else { " << endl;
-    if (log_unexpected_) {
-      out << indent() << "  NSLog(@\"%s: field ID %i has unexpected type %i.  Skipping.\", "
-                         "__PRETTY_FUNCTION__, (int)fieldID, (int)fieldType);" << endl;
-    }
-
-    out << indent() << "  if (![TProtocolUtil skipType: fieldType onProtocol: inProtocol error: __thriftError]) return NO;" << endl;
-    out << indent() << "}" << endl << indent() << "break;" << endl;
-    indent_down();
-  }
-
-  // In the default case we skip the field
-  out << indent() << "default:" << endl;
-  if (log_unexpected_) {
-    out << indent() << "  NSLog(@\"%s: unexpected field ID %i with type %i.  Skipping.\", "
-                       "__PRETTY_FUNCTION__, (int)fieldID, (int)fieldType);" << endl;
-  }
-
-  out << indent() << "  if (![TProtocolUtil skipType: fieldType onProtocol: inProtocol error: __thriftError]) return NO;" << endl;
-
-  out << indent() << "  break;" << endl;
-
-  scope_down(out);
-
-  // Read field end marker
-  indent(out) << "if (![inProtocol readFieldEnd: __thriftError]) return NO;" << endl;
-
-  scope_down(out);
-
-  out << indent() << "if (![inProtocol readStructEnd: __thriftError]) return NO;" << endl;
-
-  // performs various checks (e.g. check that all required fields are set)
-  if (validate_required_) {
-    out << indent() << "if (![self validate: __thriftError]) return NO;" << endl;
-  }
-
-  indent(out) << "return YES;" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_cocoa_struct_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "- (BOOL) write: (id <TProtocol>) outProtocol error: (NSError *__autoreleasing *)__thriftError {" << endl;
-  indent_up();
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << indent() << "if (![outProtocol writeStructBeginWithName: @\"" << name << "\" error: __thriftError]) return NO;" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    out << indent() << "if (_" << (*f_iter)->get_name() << "IsSet) {" << endl;
-    indent_up();
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    if (null_allowed) {
-      out << indent() << "if (_" << (*f_iter)->get_name() << " != nil) {" << endl;
-      indent_up();
-    }
-
-    indent(out) << "if (![outProtocol writeFieldBeginWithName: @\"" << (*f_iter)->get_name()
-                << "\" type: " << type_to_enum((*f_iter)->get_type())
-                << " fieldID: " << (*f_iter)->get_key() << " error: __thriftError]) return NO;" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "_" + (*f_iter)->get_name());
-
-    // Write field closer
-    indent(out) << "if (![outProtocol writeFieldEnd: __thriftError]) return NO;" << endl;
-
-    if (null_allowed) {
-      scope_down(out);
-    }
-    scope_down(out);
-  }
-  // Write the struct map
-  out << indent() << "if (![outProtocol writeFieldStop: __thriftError]) return NO;" << endl
-      << indent() << "if (![outProtocol writeStructEnd: __thriftError]) return NO;" << endl;
-
-  indent(out) << "return YES;" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct, which
- * is a function result. These fields are only written if they are
- * set, and only one of them can be set at a time.
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_cocoa_struct_result_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "- (BOOL) write: (id <TProtocol>) outProtocol error: (NSError *__autoreleasing *)__thriftError {" << endl;
-  indent_up();
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << indent() << "if (![outProtocol writeStructBeginWithName: @\"" << name << "\" error: __thriftError]) return NO;" << endl;
-
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      out << endl << indent() << "if ";
-    } else {
-      out << " else if ";
-    }
-
-    out << "(_" << (*f_iter)->get_name() << "IsSet) {" << endl;
-    indent_up();
-
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    if (null_allowed) {
-      out << indent() << "if (_" << (*f_iter)->get_name() << " != nil) {" << endl;
-      indent_up();
-    }
-
-    indent(out) << "if (![outProtocol writeFieldBeginWithName: @\"" << (*f_iter)->get_name()
-                << "\" type: " << type_to_enum((*f_iter)->get_type())
-                << " fieldID: " << (*f_iter)->get_key() << " error: __thriftError]) return NO;" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "_" + (*f_iter)->get_name());
-
-    // Write field closer
-    indent(out) << "if (![outProtocol writeFieldEnd: __thriftError]) return NO;" << endl;
-
-    if (null_allowed) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-
-    indent_down();
-    indent(out) << "}";
-  }
-  // Write the struct map
-  out << endl << indent() << "if (![outProtocol writeFieldStop: __thriftError]) return NO;"
-      << endl << indent() << "if (![outProtocol writeStructEnd: __thriftError]) return NO;"
-      << endl;
-
-  indent(out) << "return YES;" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a function to perform various checks
- * (e.g. check that all required fields are set)
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_cocoa_struct_validator(ofstream& out, t_struct* tstruct) {
-  out << indent() << "- (BOOL) validate: (NSError *__autoreleasing *)__thriftError {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << indent() << "// check for required fields" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = (*f_iter);
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      out << indent() << "if (!_" << field->get_name() << "IsSet) ";
-      scope_up(out);
-      indent(out) << "if (__thriftError) ";
-      scope_up(out);
-      out << indent() << "*__thriftError = [NSError errorWithDomain: TProtocolErrorDomain" << endl
-          << indent() << "                                     code: TProtocolErrorUnknown" << endl
-          << indent() << "                                 userInfo: @{TProtocolErrorExtendedErrorKey: @(TProtocolExtendedErrorMissingRequiredField)," << endl
-          << indent() << "                                             TProtocolErrorFieldNameKey: @\"" << (*f_iter)->get_name() << "\"}];" << endl;
-      scope_down(out);
-      scope_down(out);
-    }
-  }
-  indent(out) << "return YES;" << endl;
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generate property accessor methods for all fields in the struct.
- * getter, setter, isset getter.
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_cocoa_struct_field_accessor_implementations(ofstream& out,
-                                                                             t_struct* tstruct,
-                                                                             bool is_exception) {
-  (void)is_exception;
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = field_name;
-    cap_name[0] = toupper(cap_name[0]);
-
-    // Simple setter
-    indent(out) << "- (void) set" << cap_name << ": (" << type_name(type, false, true) << ") " << field_name
-                << " {" << endl;
-    indent_up();
-    indent(out) << "_" << field_name << " = " << field_name << ";" << endl;
-    indent(out) << "_" << field_name << "IsSet = YES;" << endl;
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // Unsetter - do we need this?
-    indent(out) << "- (void) unset" << cap_name << " {" << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "_" << field_name << " = nil;" << endl;
-    }
-    indent(out) << "_" << field_name << "IsSet = NO;" << endl;
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-}
-
-/**
- * Generates a description method for the given struct
- *
- * @param tstruct The struct definition
- */
-void t_cocoa_generator::generate_cocoa_struct_description(ofstream& out, t_struct* tstruct) {
-
-  // Allow use of debugDescription so the app can add description via a cateogory/extension
-  if (debug_descriptions_) {
-    out << indent() << "- (NSString *) debugDescription {" << endl;
-  }
-  else {
-    out << indent() << "- (NSString *) description {" << endl;
-  }
-  indent_up();
-
-  out << indent() << "NSMutableString * ms = [NSMutableString stringWithString: @\""
-      << cocoa_prefix_ << tstruct->get_name() << "(\"];" << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      indent(out) << "[ms appendString: @\"" << (*f_iter)->get_name() << ":\"];" << endl;
-    } else {
-      indent(out) << "[ms appendString: @\"," << (*f_iter)->get_name() << ":\"];" << endl;
-    }
-    t_type* ttype = (*f_iter)->get_type();
-    indent(out) << "[ms appendFormat: @\"" << format_string_for_type(ttype) << "\", "
-                << format_cast_for_type(ttype) << "_" << (*f_iter)->get_name() << "];" << endl;
-  }
-  out << indent() << "[ms appendString: @\")\"];" << endl << indent()
-      << "return [NSString stringWithString: ms];" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a thrift service.  In Objective-C this consists of a
- * protocol definition, a client interface and a client implementation.
- *
- * @param tservice The service definition
- */
-void t_cocoa_generator::generate_service(t_service* tservice) {
-  generate_cocoa_service_protocol(f_header_, tservice);
-  generate_cocoa_service_client_interface(f_header_, tservice);
-  generate_cocoa_service_server_interface(f_header_, tservice);
-  generate_cocoa_service_helpers(tservice);
-  generate_cocoa_service_client_implementation(f_impl_, tservice);
-  generate_cocoa_service_server_implementation(f_impl_, tservice);
-  if (async_clients_) {
-    generate_cocoa_service_async_protocol(f_header_, tservice);
-    generate_cocoa_service_client_async_interface(f_header_, tservice);
-    generate_cocoa_service_client_async_implementation(f_impl_, tservice);
-  }
-}
-
-/**
- * Generates structs for all the service return types
- *
- * @param tservice The service
- */
-void t_cocoa_generator::generate_cocoa_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-
-    t_struct* ts = (*f_iter)->get_arglist();
-
-    string qname = function_args_helper_struct_type(tservice, *f_iter);
-
-    t_struct qname_ts = t_struct(ts->get_program(), qname);
-
-    const vector<t_field*>& members = ts->get_members();
-    vector<t_field*>::const_iterator m_iter;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      qname_ts.append(*m_iter);
-    }
-
-    generate_cocoa_struct_interface(f_impl_, &qname_ts, false);
-    generate_cocoa_struct_implementation(f_impl_, &qname_ts, false, false);
-    generate_function_helpers(tservice, *f_iter);
-  }
-}
-
-string t_cocoa_generator::function_result_helper_struct_type(t_service *tservice, t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return tservice->get_name() + "_" + tfunction->get_name();
-  } else {
-    return tservice->get_name() + "_" + tfunction->get_name() + "_result";
-  }
-}
-
-string t_cocoa_generator::function_args_helper_struct_type(t_service *tservice, t_function* tfunction) {
-  return tservice->get_name() + "_" + tfunction->get_name() + "_args";
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_cocoa_generator::generate_function_helpers(t_service *tservice, t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  // create a result struct with a success field of the return type,
-  // and a field for each type of exception thrown
-  t_struct result(program_, function_result_helper_struct_type(tservice, tfunction));
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  // generate the result struct
-  generate_cocoa_struct_interface(f_impl_, &result, false);
-  generate_cocoa_struct_implementation(f_impl_, &result, false, true);
-}
-
-/**
- * Generates a service protocol definition.
- *
- * @param tservice The service to generate a protocol definition for
- */
-void t_cocoa_generator::generate_cocoa_service_protocol(ofstream& out, t_service* tservice) {
-  out << "@protocol " << cocoa_prefix_ << tservice->get_name() << " <NSObject>" << endl;
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    out << "- " << function_signature(*f_iter, true) << ";"
-        << "  // throws ";
-    t_struct* xs = (*f_iter)->get_xceptions();
-    const std::vector<t_field*>& xceptions = xs->get_members();
-    vector<t_field*>::const_iterator x_iter;
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      out << type_name((*x_iter)->get_type()) + ", ";
-    }
-    out << "TException" << endl;
-  }
-  out << "@end" << endl << endl;
-}
-
-/**
- * Generates an asynchronous service protocol definition.
- *
- * @param tservice The service to generate a protocol definition for
- */
-void t_cocoa_generator::generate_cocoa_service_async_protocol(ofstream& out, t_service* tservice) {
-  out << "@protocol " << cocoa_prefix_ << tservice->get_name() << "Async"
-      << " <NSObject>" << endl;
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    out << "- " << async_function_signature(*f_iter, false) << ";" << endl;
-    if (promise_kit_) {
-      out << "- " << promise_function_signature(*f_iter) << ";" << endl;
-    }
-  }
-  out << "@end" << endl << endl;
-}
-
-/**
- * Generates a service client interface definition.
- *
- * @param tservice The service to generate a client interface definition for
- */
-void t_cocoa_generator::generate_cocoa_service_client_interface(ofstream& out,
-                                                                t_service* tservice) {
-  out << "@interface " << cocoa_prefix_ << tservice->get_name() << "Client : TBaseClient <"
-      << cocoa_prefix_ << tservice->get_name() << "> " << endl;
-
-  out << "- (id) initWithProtocol: (id <TProtocol>) protocol;" << endl;
-  out << "- (id) initWithInProtocol: (id <TProtocol>) inProtocol outProtocol: (id <TProtocol>) "
-         "outProtocol;" << endl;
-  out << "@end" << endl << endl;
-}
-
-/**
- * Generates a service client interface definition.
- *
- * @param tservice The service to generate a client interface definition for
- */
-void t_cocoa_generator::generate_cocoa_service_client_async_interface(ofstream& out,
-                                                                      t_service* tservice) {
-  out << "@interface " << cocoa_prefix_ << tservice->get_name() << "ClientAsync : TBaseClient <"
-      << cocoa_prefix_ << tservice->get_name() << "Async> " << endl
-      << endl;
-
-  out << "- (id) initWithProtocolFactory: (id <TProtocolFactory>) protocolFactory "
-      << "transportFactory: (id <TAsyncTransportFactory>) transportFactory;" << endl;
-  out << "@end" << endl << endl;
-}
-
-/**
- * Generates a service server interface definition. In other words, the TProcess implementation for
- *the
- * service definition.
- *
- * @param tservice The service to generate a client interface definition for
- */
-void t_cocoa_generator::generate_cocoa_service_server_interface(ofstream& out,
-                                                                t_service* tservice) {
-  out << "@interface " << cocoa_prefix_ << tservice->get_name()
-      << "Processor : NSObject <TProcessor> " << endl;
-
-  out << "- (id) initWith" << tservice->get_name() << ": (id <" << cocoa_prefix_
-      << tservice->get_name() << ">) service;" << endl;
-  out << "- (id<" << cocoa_prefix_ << tservice->get_name() << ">) service;" << endl;
-
-  out << "@end" << endl << endl;
-}
-
-void t_cocoa_generator::generate_cocoa_service_client_send_function_implementation(
-    ofstream& out,
-    t_service *tservice,
-    t_function* tfunction,
-    bool needs_protocol) {
-  string funname = tfunction->get_name();
-
-  t_function send_function(g_type_bool,
-                           string("send_") + tfunction->get_name(),
-                           tfunction->get_arglist());
-
-  string argsname = function_args_helper_struct_type(tservice, tfunction);
-
-  // Open function
-  indent(out) << "- (BOOL) send_" << tfunction->get_name() << argument_list(tfunction->get_arglist(), needs_protocol ? "outProtocol" : "", true) << endl;
-  scope_up(out);
-
-  // Serialize the request
-  out << indent() << "if (![outProtocol writeMessageBeginWithName: @\"" << funname << "\""
-      << (tfunction->is_oneway() ? " type: TMessageTypeONEWAY" : " type: TMessageTypeCALL")
-      << " sequenceID: 0 error: __thriftError]) return NO;" << endl;
-
-  out << indent() << "if (![outProtocol writeStructBeginWithName: @\"" << argsname
-                  << "\" error: __thriftError]) return NO;" << endl;
-
-  // write out function parameters
-  t_struct* arg_struct = tfunction->get_arglist();
-  const vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator fld_iter;
-  for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-    string fieldName = (*fld_iter)->get_name();
-    if (type_can_be_null((*fld_iter)->get_type())) {
-      out << indent() << "if (" << fieldName << " != nil)";
-      scope_up(out);
-    }
-    out << indent() << "if (![outProtocol writeFieldBeginWithName: @\"" << fieldName
-        << "\""
-           " type: " << type_to_enum((*fld_iter)->get_type())
-        << " fieldID: " << (*fld_iter)->get_key() << " error: __thriftError]) return NO;" << endl;
-
-    generate_serialize_field(out, *fld_iter, fieldName);
-
-    out << indent() << "if (![outProtocol writeFieldEnd: __thriftError]) return NO;" << endl;
-
-    if (type_can_be_null((*fld_iter)->get_type())) {
-      indent_down();
-      out << indent() << "}" << endl;
-    }
-  }
-
-  out << indent() << "if (![outProtocol writeFieldStop: __thriftError]) return NO;" << endl;
-  out << indent() << "if (![outProtocol writeStructEnd: __thriftError]) return NO;" << endl;
-  out << indent() << "if (![outProtocol writeMessageEnd: __thriftError]) return NO;" << endl;
-  out << indent() << "return YES;" << endl;
-  scope_down(out);
-  out << endl;
-}
-
-void t_cocoa_generator::generate_cocoa_service_client_recv_function_implementation(
-    ofstream& out,
-    t_service* tservice,
-    t_function* tfunction,
-    bool needs_protocol) {
-
-
-  // Open function
-  indent(out) << "- (BOOL) recv_" << tfunction->get_name();
-  if (!tfunction->get_returntype()->is_void()) {
-    out << ": (" << type_name(tfunction->get_returntype(), false, true) << " *) result ";
-    if (needs_protocol) {
-      out << "protocol";
-    } else {
-      out << "error";
-    }
-  }
-  if (needs_protocol) {
-    out << ": (id<TProtocol>) inProtocol error";
-  }
-  out << ": (NSError *__autoreleasing *)__thriftError" << endl;
-  scope_up(out);
-
-  // TODO(mcslee): Message validation here, was the seqid etc ok?
-
-  // check for an exception
-  out << indent() << "NSError *incomingException = [self checkIncomingMessageException: inProtocol];" << endl
-      << indent() << "if (incomingException)";
-  scope_up(out);
-  out << indent() << "if (__thriftError)";
-  scope_up(out);
-  out << indent() << "*__thriftError = incomingException;" << endl;
-  scope_down(out);
-  out << indent() << "return NO;" << endl;
-  scope_down(out);
-
-  // FIXME - could optimize here to reduce creation of temporary objects.
-  string resultname = function_result_helper_struct_type(tservice, tfunction);
-  out << indent() << cocoa_prefix_ << resultname << " * resulter = [" << cocoa_prefix_ << resultname << " new];" << endl;
-  indent(out) << "if (![resulter read: inProtocol error: __thriftError]) return NO;" << endl;
-  indent(out) << "if (![inProtocol readMessageEnd: __thriftError]) return NO;" << endl;
-
-  // Careful, only return _result if not a void function
-  if (!tfunction->get_returntype()->is_void()) {
-    out << indent() << "if (resulter.successIsSet)";
-    scope_up(out);
-    out << indent() << "*result = resulter.success;" << endl;
-    out << indent() << "return YES;" << endl;
-    scope_down(out);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-  for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-    out << indent() << "if (resulter." << (*x_iter)->get_name() << "IsSet)";
-    scope_up(out);
-    out << indent() << "if (__thriftError)";
-    scope_up(out);
-    out << indent() << "*__thriftError = [resulter " << (*x_iter)->get_name() << "];" << endl;
-    scope_down(out);
-    out << indent() << "return NO;" << endl;
-    scope_down(out);
-  }
-
-  // If you get here it's an exception, unless a void function
-  if (tfunction->get_returntype()->is_void()) {
-    indent(out) << "return YES;" << endl;
-  } else {
-    out << indent() << "if (__thriftError)";
-    scope_up(out);
-    out << indent() << "*__thriftError = [NSError errorWithDomain: TApplicationErrorDomain" << endl
-        << indent() << "                                     code: TApplicationErrorMissingResult" << endl
-        << indent() << "                                 userInfo: @{TApplicationErrorMethodKey: @\""
-        << tfunction->get_name() << "\"}];" << endl;
-    scope_down(out);
-    out << indent() << "return NO;" << endl;
-  }
-
-  // Close function
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generates an invocation of a given 'send_' function.
- *
- * @param tfunction The service to generate an implementation for
- */
-void t_cocoa_generator::generate_cocoa_service_client_send_function_invocation(
-                                                                               ofstream& out,
-                                                                               t_function* tfunction) {
-
-  t_struct* arg_struct = tfunction->get_arglist();
-  const vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator fld_iter;
-  out << indent() << "if (![self send_" << tfunction->get_name();
-  bool first = true;
-  for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-    string fieldName = (*fld_iter)->get_name();
-    out << " ";
-    if (first) {
-      first = false;
-      out << ": " << fieldName;
-    } else {
-      out << fieldName << ": " << fieldName;
-    }
-  }
-  if (!fields.empty()) {
-    out << " error";
-  }
-  out << ": __thriftError]) " << invalid_return_statement(tfunction) << endl;
-}
-
-/**
- * Generates an invocation of a given 'send_' function.
- *
- * @param tfunction The service to generate an implementation for
- */
-void t_cocoa_generator::generate_cocoa_service_client_send_async_function_invocation(
-                                                                                     ofstream& out,
-                                                                                     t_function* tfunction,
-                                                                                     string failureBlockName) {
-
-  t_struct* arg_struct = tfunction->get_arglist();
-  const vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator fld_iter;
-  out << indent() << "if (![self send_" << tfunction->get_name();
-  bool first = true;
-  for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-    string fieldName = (*fld_iter)->get_name();
-    out << " ";
-    if (first) {
-      first = false;
-      out << ": " << fieldName;
-    } else {
-      out << fieldName << ": " << fieldName;
-    }
-  }
-  if (!fields.empty()) {
-    out << " protocol";
-  }
-  out << ": protocol error: &thriftError]) ";
-  scope_up(out);
-  out << indent() << failureBlockName << "(thriftError);" << endl
-      << indent() << "return;" << endl;
-  scope_down(out);
-}
-
-/**
- * Generates a service client implementation.
- *
- * @param tservice The service to generate an implementation for
- */
-void t_cocoa_generator::generate_cocoa_service_client_implementation(ofstream& out,
-                                                                     t_service* tservice) {
-
-  string name = cocoa_prefix_ + tservice->get_name() + "Client";
-
-  out << "@interface " << name << " () ";
-  scope_up(out);
-  out << endl;
-  out << indent() << "id<TProtocol> inProtocol;" << endl;
-  out << indent() << "id<TProtocol> outProtocol;" << endl;
-  out << endl;
-  scope_down(out);
-  out << endl;
-  out << "@end" << endl << endl;
-
-  out << "@implementation " << name << endl;
-
-  // initializers
-  out << "- (id) initWithProtocol: (id <TProtocol>) protocol" << endl;
-  scope_up(out);
-  out << indent() << "return [self initWithInProtocol: protocol outProtocol: protocol];" << endl;
-  scope_down(out);
-  out << endl;
-
-  out << "- (id) initWithInProtocol: (id <TProtocol>) anInProtocol outProtocol: (id <TProtocol>) "
-         "anOutProtocol" << endl;
-  scope_up(out);
-  out << indent() << "self = [super init];" << endl;
-  out << indent() << "if (self) ";
-  scope_up(out);
-  out << indent() << "inProtocol = anInProtocol;" << endl;
-  out << indent() << "outProtocol = anOutProtocol;" << endl;
-  scope_down(out);
-  out << indent() << "return self;" << endl;
-  scope_down(out);
-  out << endl;
-
-  // generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-
-    generate_cocoa_service_client_send_function_implementation(out, tservice, *f_iter, false);
-
-    if (!(*f_iter)->is_oneway()) {
-      generate_cocoa_service_client_recv_function_implementation(out, tservice, *f_iter, false);
-    }
-
-    // Open function
-    indent(out) << "- " << function_signature(*f_iter, true) << endl;
-    scope_up(out);
-    generate_cocoa_service_client_send_function_invocation(out, *f_iter);
-
-    out << indent() << "if (![[outProtocol transport] flush: __thriftError]) " << invalid_return_statement(*f_iter) << endl;
-    if (!(*f_iter)->is_oneway()) {
-      if ((*f_iter)->get_returntype()->is_void()) {
-        out << indent() << "if (![self recv_" << (*f_iter)->get_name() << ": __thriftError]) return NO;" << endl;
-        out << indent() << "return YES;" << endl;
-      } else {
-        out << indent() << type_name((*f_iter)->get_returntype(), false, true) << " __result;" << endl
-            << indent() << "if (![self recv_" << (*f_iter)->get_name() << ": &__result error: __thriftError]) "
-            << invalid_return_statement(*f_iter) << endl;
-        if (type_can_be_null((*f_iter)->get_returntype())) {
-          out << indent() << "return __result;" << endl;
-        } else {
-          out << indent() << "return @(__result);" << endl;
-        }
-      }
-    }
-    else {
-      out << indent() << "return YES;" << endl;
-    }
-    scope_down(out);
-    out << endl;
-  }
-
-  out << "@end" << endl << endl;
-}
-
-/**
- * Generates a service client implementation for its asynchronous interface.
- *
- * @param tservice The service to generate an implementation for
- */
-void t_cocoa_generator::generate_cocoa_service_client_async_implementation(ofstream& out,
-                                                                           t_service* tservice) {
-
-  string name = cocoa_prefix_ + tservice->get_name() + "ClientAsync";
-
-  out << "@interface " << name << " () ";
-  scope_up(out);
-  out << endl;
-  out << indent() << "id<TProtocolFactory> protocolFactory;" << endl;
-  out << indent() << "id<TAsyncTransportFactory> transportFactory;" << endl;
-  out << endl;
-  scope_down(out);
-  out << endl;
-  out << "@end" << endl << endl;
-
-
-  out << "@implementation " << name << endl
-      << endl << "- (id) initWithProtocolFactory: (id <TProtocolFactory>) aProtocolFactory "
-                 "transportFactory: (id <TAsyncTransportFactory>) aTransportFactory;" << endl;
-
-  scope_up(out);
-  out << indent() << "self = [super init];" << endl;
-  out << indent() << "if (self) {" << endl;
-  out << indent() << "  protocolFactory = aProtocolFactory;" << endl;
-  out << indent() << "  transportFactory = aTransportFactory;" << endl;
-  out << indent() << "}" << endl;
-  out << indent() << "return self;" << endl;
-  scope_down(out);
-  out << endl;
-
-  // generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-
-    generate_cocoa_service_client_send_function_implementation(out, tservice, *f_iter, true);
-
-    if (!(*f_iter)->is_oneway()) {
-      generate_cocoa_service_client_recv_function_implementation(out, tservice, *f_iter, true);
-    }
-
-    // Open function
-    indent(out) << "- " << async_function_signature(*f_iter, false) << endl;
-    scope_up(out);
-
-    out << indent() << "NSError *thriftError;" << endl
-        << indent() << "id<TAsyncTransport> transport = [transportFactory newTransport];" << endl
-        << indent() << "id<TProtocol> protocol = [protocolFactory newProtocolOnTransport:transport];" << endl
-        << endl;
-
-    generate_cocoa_service_client_send_async_function_invocation(out, *f_iter, "failureBlock");
-
-    out << indent() << "[transport flushWithCompletion:^{" << endl;
-    indent_up();
-
-    if (!(*f_iter)->is_oneway()) {
-      out << indent() << "NSError *thriftError;" << endl;
-
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        out << indent() << type_name((*f_iter)->get_returntype()) << " result;" << endl;
-      }
-      out << indent() << "if (![self recv_" << (*f_iter)->get_name();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        out << ": &result protocol";
-      }
-      out << ": protocol error: &thriftError]) ";
-      scope_up(out);
-      out << indent() << "failureBlock(thriftError);" << endl
-          << indent() << "return;" << endl;
-      scope_down(out);
-    }
-
-    out << indent() << "responseBlock(";
-    if (!(*f_iter)->is_oneway() && !(*f_iter)->get_returntype()->is_void()) {
-      out << "result";
-    }
-    out << ");" << endl;
-
-    indent_down();
-
-    out << indent() << "} failure:failureBlock];" << endl;
-
-    scope_down(out);
-
-    out << endl;
-
-    // Promise function
-    if (promise_kit_) {
-
-      indent(out) << "- " << promise_function_signature(*f_iter) << endl;
-      scope_up(out);
-
-      out << indent() << "return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolver) {" << endl;
-      indent_up();
-
-      out << indent() << "NSError *thriftError;" << endl
-          << indent() << "id<TAsyncTransport> transport = [transportFactory newTransport];" << endl
-          << indent() << "id<TProtocol> protocol = [protocolFactory newProtocolOnTransport:transport];" << endl
-          << endl;
-
-      generate_cocoa_service_client_send_async_function_invocation(out, *f_iter, "resolver");
-
-      out << indent() << "[transport flushWithCompletion:^{" << endl;
-      indent_up();
-
-      if (!(*f_iter)->is_oneway()) {
-        out << indent() << "NSError *thriftError;" << endl;
-
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          out << indent() << type_name((*f_iter)->get_returntype()) << " result;" << endl;
-        }
-        out << indent() << "if (![self recv_" << (*f_iter)->get_name();
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          out << ": &result protocol";
-        }
-        out << ": protocol error: &thriftError]) ";
-        scope_up(out);
-        out << indent() << "resolver(thriftError);" << endl
-            << indent() << "return;" << endl;
-        scope_down(out);
-      }
-
-      out << indent() << "resolver(";
-      if ((*f_iter)->is_oneway() || (*f_iter)->get_returntype()->is_void()) {
-        out << "@YES";
-      } else if (type_can_be_null((*f_iter)->get_returntype())) {
-        out << "result";
-      } else {
-        out << "@(result)";
-      }
-      out << ");" << endl;
-
-      indent_down();
-
-      out << indent() << "} failure:^(NSError *error) {" << endl;
-      indent_up();
-      out << indent() << "resolver(error);" << endl;
-      indent_down();
-      out << indent() << "}];" << endl;
-
-      indent_down();
-      out << indent() << "}];" << endl;
-
-      scope_down(out);
-
-      out << endl;
-
-    }
-
-  }
-
-  out << "@end" << endl << endl;
-}
-
-/**
- * Generates a service server implementation.  In other words the actual TProcessor implementation
- * for the service.
- *
- * @param tservice The service to generate an implementation for
- */
-void t_cocoa_generator::generate_cocoa_service_server_implementation(ofstream& out,
-                                                                     t_service* tservice) {
-
-  string name = cocoa_prefix_ + tservice->get_name() + "Processor";
-
-  out << "@interface " << name << " () ";
-
-  scope_up(out);
-  out << indent() << "id <" << cocoa_prefix_ << tservice->get_name() << "> service;" << endl;
-  out << indent() << "NSDictionary * methodMap;" << endl;
-  scope_down(out);
-
-  out << "@end" << endl << endl;
-
-  out << "@implementation " << name << endl;
-
-  // initializer
-  out << endl;
-  out << "- (id) initWith" << tservice->get_name() << ": (id <" << cocoa_prefix_ << tservice->get_name() << ">) aService" << endl;
-  scope_up(out);
-  out << indent() << "self = [super init];" << endl;
-  out << indent() << "if (self) ";
-  scope_up(out);
-  out << indent() << "service = aService;" << endl;
-  out << indent() << "methodMap = [NSMutableDictionary dictionary];" << endl;
-
-  // generate method map for routing incoming calls
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-    scope_up(out);
-    out << indent() << "SEL s = @selector(process_" << funname << "_withSequenceID:inProtocol:outProtocol:error:);" << endl;
-    out << indent() << "NSMethodSignature * sig = [self methodSignatureForSelector: s];" << endl;
-    out << indent() << "NSInvocation * invocation = [NSInvocation invocationWithMethodSignature: sig];" << endl;
-    out << indent() << "[invocation setSelector: s];" << endl;
-    out << indent() << "[invocation retainArguments];" << endl;
-    out << indent() << "[methodMap setValue: invocation forKey: @\"" << funname << "\"];" << endl;
-    scope_down(out);
-  }
-  scope_down(out);
-  out << indent() << "return self;" << endl;
-  scope_down(out);
-
-  // implementation of the 'service' method which returns the service associated with this
-  // processor
-  out << endl;
-  out << indent() << "- (id<" << cocoa_prefix_ << tservice->get_name() << ">) service" << endl;
-  out << indent() << "{" << endl;
-  out << indent() << "  return service;" << endl;
-  out << indent() << "}" << endl;
-
-  // implementation of the TProcess method, which dispatches the incoming call using the method map
-  out << endl;
-  out << indent() << "- (BOOL) processOnInputProtocol: (id <TProtocol>) inProtocol" << endl;
-  out << indent() << "                 outputProtocol: (id <TProtocol>) outProtocol" << endl;
-  out << indent() << "                          error: (NSError *__autoreleasing *)__thriftError" << endl;
-  out << indent() << "{" << endl;
-  out << indent() << "  NSString * messageName;" << endl;
-  out << indent() << "  SInt32 messageType;" << endl;
-  out << indent() << "  SInt32 seqID;" << endl;
-  out << indent() << "  if (![inProtocol readMessageBeginReturningName: &messageName" << endl;
-  out << indent() << "                                       type: &messageType" << endl;
-  out << indent() << "                                 sequenceID: &seqID" << endl;
-  out << indent() << "                                      error: __thriftError]) return NO;" << endl;
-  out << indent() << "  NSInvocation * invocation = [methodMap valueForKey: messageName];" << endl;
-  out << indent() << "  if (invocation == nil) {" << endl;
-  out << indent() << "    if (![TProtocolUtil skipType: TTypeSTRUCT onProtocol: inProtocol error: __thriftError]) return NO;" << endl;
-  out << indent() << "    if (![inProtocol readMessageEnd: __thriftError]) return NO;" << endl;
-  out << indent() << "    NSError * x = [NSError errorWithDomain: TApplicationErrorDomain" << endl;
-  out << indent() << "                                      code: TApplicationErrorUnknownMethod" << endl;
-  out << indent() << "                                  userInfo: @{TApplicationErrorMethodKey: messageName}];" << endl;
-  out << indent() << "    if (![outProtocol writeMessageBeginWithName: messageName" << endl;
-  out << indent() << "                                           type: TMessageTypeEXCEPTION" << endl;
-  out << indent() << "                                     sequenceID: seqID" << endl;
-  out << indent() << "                                          error: __thriftError]) return NO;" << endl;
-  out << indent() << "    if (![x write: outProtocol error: __thriftError]) return NO;" << endl;
-  out << indent() << "    if (![outProtocol writeMessageEnd: __thriftError]) return NO;" << endl;
-  out << indent() << "    if (![[outProtocol transport] flush: __thriftError]) return NO;" << endl;
-  out << indent() << "    return YES;" << endl;
-  out << indent() << "  }" << endl;
-  out << indent() << "  // NSInvocation does not conform to NSCopying protocol" << endl;
-  out << indent() << "  NSInvocation * i = [NSInvocation invocationWithMethodSignature: "
-                     "[invocation methodSignature]];" << endl;
-  out << indent() << "  [i setSelector: [invocation selector]];" << endl;
-  out << indent() << "  [i setArgument: &seqID atIndex: 2];" << endl;
-  out << indent() << "  [i setArgument: &inProtocol atIndex: 3];" << endl;
-  out << indent() << "  [i setArgument: &outProtocol atIndex: 4];" << endl;
-  out << indent() << "  [i setArgument: &__thriftError atIndex: 5];" << endl;
-  out << indent() << "  [i setTarget: self];" << endl;
-  out << indent() << "  [i invoke];" << endl;
-  out << indent() << "  return YES;" << endl;
-  out << indent() << "}" << endl;
-
-  // generate a process_XXXX method for each service function, which reads args, calls the service,
-  // and writes results
-  functions = tservice->get_functions();
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    out << endl;
-    string funname = (*f_iter)->get_name();
-    out << indent() << "- (BOOL) process_" << funname
-        << "_withSequenceID: (SInt32) seqID inProtocol: (id<TProtocol>) inProtocol outProtocol: "
-           "(id<TProtocol>) outProtocol error:(NSError *__autoreleasing *)__thriftError" << endl;
-    scope_up(out);
-    string argstype = cocoa_prefix_ + function_args_helper_struct_type(tservice, *f_iter);
-    out << indent() << argstype << " * args = [" << argstype << " new];" << endl;
-    out << indent() << "if (![args read: inProtocol error: __thriftError]) return NO;" << endl;
-    out << indent() << "if (![inProtocol readMessageEnd: __thriftError]) return NO;" << endl;
-
-    // prepare the result if not oneway
-    if (!(*f_iter)->is_oneway()) {
-      string resulttype = cocoa_prefix_ + function_result_helper_struct_type(tservice, *f_iter);
-      out << indent() << resulttype << " * result = [" << resulttype << " new];" << endl;
-    }
-
-    // make the call to the actual service object
-    out << indent();
-    if ((*f_iter)->get_returntype()->is_void()) {
-      out << "BOOL";
-    } else if (type_can_be_null((*f_iter)->get_returntype())) {
-      out << type_name((*f_iter)->get_returntype(), false, true);
-    } else {
-      out << "NSNumber *";
-    }
-    out << " serviceResult = ";
-    if ((*f_iter)->get_returntype()->get_true_type()->is_container()) {
-      out << "(" << type_name((*f_iter)->get_returntype(), false, true) << ")";
-    }
-    out << "[service " << funname;
-    // supplying arguments
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    bool first = true;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      string fieldName = (*fld_iter)->get_name();
-      if (first) {
-        first = false;
-        out << ": [args " << fieldName << "]";
-      } else {
-        out << " " << fieldName << ": [args " << fieldName << "]";
-      }
-    }
-    if (!fields.empty()) {
-      out << " error";
-    }
-    out << ": __thriftError];" << endl;
-    out << indent() << "if (!serviceResult) return NO;" << endl;
-    if (!(*f_iter)->get_returntype()->is_void()) {
-      out << indent() << "[result setSuccess: " << unbox((*f_iter)->get_returntype(), "serviceResult") << "];" << endl;
-    }
-
-    // write out the result if not oneway
-    if (!(*f_iter)->is_oneway()) {
-      out << indent() << "if (![outProtocol writeMessageBeginWithName: @\"" << funname << "\"" << endl;
-      out << indent() << "                                       type: TMessageTypeREPLY" << endl;
-      out << indent() << "                                 sequenceID: seqID" << endl;
-      out << indent() << "                                      error: __thriftError]) return NO;" << endl;
-      out << indent() << "if (![result write: outProtocol error: __thriftError]) return NO;" << endl;
-      out << indent() << "if (![outProtocol writeMessageEnd: __thriftError]) return NO;" << endl;
-      out << indent() << "if (![[outProtocol transport] flush: __thriftError]) return NO;" << endl;
-    }
-    out << indent() << "return YES;" << endl;
-
-    scope_down(out);
-  }
-
-  out << "@end" << endl << endl;
-}
-
-/**
- * Deserializes a field of any type.
- *
- * @param tfield The field
- * @param fieldName The variable name for this field
- */
-void t_cocoa_generator::generate_deserialize_field(ofstream& out,
-                                                   t_field* tfield,
-                                                   string fieldName) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, fieldName);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, fieldName);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << type_name(type) << " " << fieldName << ";" << endl;
-    indent(out) << "if (![inProtocol ";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + tfield->get_name();
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "readBinary:&" << fieldName << " error: __thriftError]";
-        } else {
-          out << "readString:&" << fieldName << " error: __thriftError]";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "readBool:&" << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "readByte:(UInt8 *)&" << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "readI16:&" << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "readI32:&" << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "readI64:&" << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "readDouble:&" << fieldName << " error: __thriftError]";
-        break;
-      default:
-        throw "compiler error: no Objective-C name for base type "
-            + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "readI32:&" << fieldName << " error: __thriftError]";
-    }
-    out << ") return NO;" << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a struct, allocates the struct and invokes read:
- */
-void t_cocoa_generator::generate_deserialize_struct(ofstream& out,
-                                                    t_struct* tstruct,
-                                                    string fieldName) {
-  indent(out) << type_name(tstruct) << fieldName << " = [[" << type_name(tstruct, true)
-              << " alloc] init];" << endl;
-  indent(out) << "if (![" << fieldName << " read: inProtocol error: __thriftError]) return NO;" << endl;
-}
-
-/**
- * Deserializes a container by reading its size and then iterating
- */
-void t_cocoa_generator::generate_deserialize_container(ofstream& out,
-                                                       t_type* ttype,
-                                                       string fieldName) {
-  string size = tmp("_size");
-  indent(out) << "SInt32 " << size << ";" << endl;
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    indent(out) << "if (![inProtocol readMapBeginReturningKeyType: NULL valueType: NULL size: &" << size << " error: __thriftError]) return NO;" << endl;
-    indent(out) << "NSMutableDictionary * " << fieldName
-                << " = [[NSMutableDictionary alloc] initWithCapacity: " << size << "];" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "if (![inProtocol readSetBeginReturningElementType: NULL size: &" << size << " error: __thriftError]) return NO;"
-                << endl;
-    indent(out) << "NSMutableSet * " << fieldName
-                << " = [[NSMutableSet alloc] initWithCapacity: " << size << "];" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "if (![inProtocol readListBeginReturningElementType: NULL size: &" << size << " error: __thriftError]) return NO;"
-                << endl;
-    indent(out) << "NSMutableArray * " << fieldName
-                << " = [[NSMutableArray alloc] initWithCapacity: " << size << "];" << endl;
-  }
-  // FIXME - the code above does not verify that the element types of
-  // the containers being read match the element types of the
-  // containers we are reading into.  Does that matter?
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "int " << i << ";" << endl << indent() << "for (" << i << " = 0; " << i << " < "
-              << size << "; "
-              << "++" << i << ")" << endl;
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, fieldName);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, fieldName);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, fieldName);
-  }
-
-  scope_down(out);
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "if (![inProtocol readMapEnd: __thriftError]) return NO;" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "if (![inProtocol readSetEnd: __thriftError]) return NO;" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "if (![inProtocol readListEnd: __thriftError]) return NO;" << endl;
-  }
-}
-
-/**
- * Take a variable of a given type and wrap it in code to make it
- * suitable for putting into a container, if necessary.  Basically,
- * wrap scaler primitives in NSNumber objects.
- */
-string t_cocoa_generator::box(t_type* ttype, string field_name) {
-
-  ttype = get_true_type(ttype);
-  if (ttype->is_enum()) {
-    return "@(" + field_name + ")";
-  } else if (ttype->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-    switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "can't box void";
-      case t_base_type::TYPE_BOOL:
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-      case t_base_type::TYPE_DOUBLE:
-        return "@(" + field_name + ")";
-      default:
-        break;
-    }
-  }
-
-  // do nothing
-  return field_name;
-}
-
-/**
- * Extracts the actual value from a boxed value
- */
-string t_cocoa_generator::unbox(t_type* ttype, string field_name) {
-  ttype = get_true_type(ttype);
-  if (ttype->is_enum()) {
-    return "[" + field_name + " intValue]";
-  } else if (ttype->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-    switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "can't unbox void";
-      case t_base_type::TYPE_BOOL:
-        return "[" + field_name + " boolValue]";
-      case t_base_type::TYPE_I8:
-        return "((SInt8)[" + field_name + " charValue])";
-      case t_base_type::TYPE_I16:
-        return "((SInt16)[" + field_name + " shortValue])";
-      case t_base_type::TYPE_I32:
-        return "((SInt32)[" + field_name + " longValue])";
-      case t_base_type::TYPE_I64:
-        return "((SInt64)[" + field_name + " longLongValue])";
-      case t_base_type::TYPE_DOUBLE:
-        return "[" + field_name + " doubleValue]";
-      default:
-        break;
-    }
-  }
-
-  // do nothing
-  return field_name;
-}
-
-/**
- * Generates code to deserialize a map element
- */
-void t_cocoa_generator::generate_deserialize_map_element(ofstream& out,
-                                                         t_map* tmap,
-                                                         string fieldName) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_type* keyType = tmap->get_key_type();
-  t_type* valType = tmap->get_val_type();
-  t_field fkey(keyType, key);
-  t_field fval(valType, val);
-
-  generate_deserialize_field(out, &fkey, key);
-  generate_deserialize_field(out, &fval, val);
-
-  indent(out) << "[" << fieldName << " setObject: " << box(valType, val)
-              << " forKey: " << box(keyType, key) << "];" << endl;
-}
-
-/**
- * Deserializes a set element
- */
-void t_cocoa_generator::generate_deserialize_set_element(ofstream& out,
-                                                         t_set* tset,
-                                                         string fieldName) {
-  string elem = tmp("_elem");
-  t_type* type = tset->get_elem_type();
-  t_field felem(type, elem);
-
-  generate_deserialize_field(out, &felem, elem);
-
-  indent(out) << "[" << fieldName << " addObject: " << box(type, elem) << "];" << endl;
-}
-
-/**
- * Deserializes a list element
- */
-void t_cocoa_generator::generate_deserialize_list_element(ofstream& out,
-                                                          t_list* tlist,
-                                                          string fieldName) {
-  string elem = tmp("_elem");
-  t_type* type = tlist->get_elem_type();
-  t_field felem(type, elem);
-
-  generate_deserialize_field(out, &felem, elem);
-
-  indent(out) << "[" << fieldName << " addObject: " << box(type, elem) << "];" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param fieldName Name to of the variable holding the field
- */
-void t_cocoa_generator::generate_serialize_field(ofstream& out, t_field* tfield, string fieldName) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, fieldName);
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, fieldName);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << "if (![outProtocol ";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + fieldName;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "writeBinary: " << fieldName << " error: __thriftError]";
-        } else {
-          out << "writeString: " << fieldName << " error: __thriftError]";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool: " << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte: (UInt8)" << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16: " << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32: " << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64: " << fieldName << " error: __thriftError]";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble: " << fieldName << " error: __thriftError]";
-        break;
-      default:
-        throw "compiler error: no Objective-C name for base type "
-            + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32: " << fieldName << " error: __thriftError]";
-    }
-    out << ") return NO;" << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Serialize a struct.
- *
- * @param tstruct The struct to serialize
- * @param fieldName Name of variable holding struct
- */
-void t_cocoa_generator::generate_serialize_struct(ofstream& out,
-                                                  t_struct* tstruct,
-                                                  string fieldName) {
-  (void)tstruct;
-  out << indent() << "if (![" << fieldName << " write: outProtocol error: __thriftError]) return NO;" << endl;
-}
-
-/**
- * Serializes a container by writing its size then the elements.
- *
- * @param ttype  The type of container
- * @param fieldName Name of variable holding container
- */
-void t_cocoa_generator::generate_serialize_container(ofstream& out,
-                                                     t_type* ttype,
-                                                     string fieldName) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "if (![outProtocol writeMapBeginWithKeyType: "
-                << type_to_enum(((t_map*)ttype)->get_key_type())
-                << " valueType: " << type_to_enum(((t_map*)ttype)->get_val_type()) << " size: (SInt32)["
-                << fieldName << " count] error: __thriftError]) return NO;" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "if (![outProtocol writeSetBeginWithElementType: "
-                << type_to_enum(((t_set*)ttype)->get_elem_type()) << " size: (SInt32)[" << fieldName
-                << " count] error: __thriftError]) return NO;" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "if (![outProtocol writeListBeginWithElementType: "
-                << type_to_enum(((t_list*)ttype)->get_elem_type()) << " size: (SInt32)[" << fieldName
-                << " count] error: __thriftError]) return NO;" << endl;
-  }
-
-  string iter = tmp("_iter");
-  string key;
-  if (ttype->is_map()) {
-    key = tmp("key");
-    indent(out) << "NSEnumerator * " << iter << " = [" << fieldName << " keyEnumerator];" << endl;
-    indent(out) << "id " << key << ";" << endl;
-    indent(out) << "while ((" << key << " = [" << iter << " nextObject]))" << endl;
-  } else if (ttype->is_set()) {
-    key = tmp("obj");
-    indent(out) << "NSEnumerator * " << iter << " = [" << fieldName << " objectEnumerator];"
-                << endl;
-    indent(out) << "id " << key << ";" << endl;
-    indent(out) << "while ((" << key << " = [" << iter << " nextObject]))" << endl;
-  } else if (ttype->is_list()) {
-    key = tmp("idx");
-    indent(out) << "int " << key << ";" << endl;
-    indent(out) << "for (" << key << " = 0; " << key << " < [" << fieldName << " count]; " << key
-                << "++)" << endl;
-  }
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, (t_map*)ttype, key, fieldName);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, (t_set*)ttype, key);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, (t_list*)ttype, key, fieldName);
-  }
-
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "if (![outProtocol writeMapEnd: __thriftError]) return NO;" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "if (![outProtocol writeSetEnd: __thriftError]) return NO;" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "if (![outProtocol writeListEnd: __thriftError]) return NO;" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- */
-void t_cocoa_generator::generate_serialize_map_element(ofstream& out,
-                                                       t_map* tmap,
-                                                       string key,
-                                                       string mapName) {
-  t_field kfield(tmap->get_key_type(), key);
-  generate_serialize_field(out, &kfield, unbox(kfield.get_type(), key));
-  t_field vfield(tmap->get_val_type(), "[" + mapName + " objectForKey: " + key + "]");
-  generate_serialize_field(out, &vfield, unbox(vfield.get_type(), vfield.get_name()));
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_cocoa_generator::generate_serialize_set_element(ofstream& out,
-                                                       t_set* tset,
-                                                       string elementName) {
-  t_field efield(tset->get_elem_type(), elementName);
-  generate_serialize_field(out, &efield, unbox(efield.get_type(), elementName));
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_cocoa_generator::generate_serialize_list_element(ofstream& out,
-                                                        t_list* tlist,
-                                                        string index,
-                                                        string listName) {
-  t_field efield(tlist->get_elem_type(), "[" + listName + " objectAtIndex: " + index + "]");
-  generate_serialize_field(out, &efield, unbox(efield.get_type(), efield.get_name()));
-}
-
-/**
- * Returns an Objective-C name
- *
- * @param ttype The type
- * @param class_ref Do we want a Class reference istead of a type reference?
- * @return Objective-C type name, i.e. NSDictionary<Key,Value> *
- */
-string t_cocoa_generator::type_name(t_type* ttype, bool class_ref, bool needs_mutable) {
-  if (ttype->is_typedef()) {
-    string name = (needs_mutable && ttype->get_true_type()->is_container()) ? "Mutable" + ttype->get_name() : ttype->get_name();
-    t_program* program = ttype->get_program();
-    return program ? (program->get_namespace("cocoa") + name) : name;
-  }
-
-  string result;
-  if (ttype->is_base_type()) {
-    return base_type_name((t_base_type*)ttype);
-  } else if (ttype->is_enum()) {
-    return cocoa_prefix_ + ttype->get_name();
-  } else if (ttype->is_map()) {
-    t_map *map = (t_map *)ttype;
-    result = needs_mutable ? "NSMutableDictionary" : "NSDictionary";
-    result += "<" + element_type_name(map->get_key_type()) + ", " + element_type_name(map->get_val_type()) + ">";
-  } else if (ttype->is_set()) {
-    t_set *set = (t_set *)ttype;
-    result = needs_mutable ? "NSMutableSet" : "NSSet";
-    result += "<" + element_type_name(set->get_elem_type()) + ">";
-  } else if (ttype->is_list()) {
-    t_list *list = (t_list *)ttype;
-    result = needs_mutable ? "NSMutableArray" : "NSArray";
-    result += "<" + element_type_name(list->get_elem_type()) + ">";
-  } else {
-    // Check for prefix
-    t_program* program = ttype->get_program();
-    if (program != NULL) {
-      result = program->get_namespace("cocoa") + ttype->get_name();
-    } else {
-      result = ttype->get_name();
-    }
-  }
-
-  if (!class_ref) {
-    result += " *";
-  }
-  return result;
-}
-
-/**
- * Returns an Objective-C type name for container types
- *
- * @param ttype the type
- */
-string t_cocoa_generator::element_type_name(t_type* etype) {
-
-  t_type* ttype = etype->get_true_type();
-
-  if (etype->is_typedef() && type_can_be_null(ttype)) {
-    return type_name(etype);
-  }
-
-  string result;
-  if (ttype->is_base_type()) {
-    t_base_type* tbase = (t_base_type*)ttype;
-    switch (tbase->get_base()) {
-    case t_base_type::TYPE_STRING:
-      if (tbase->is_binary()) {
-        result = "NSData *";
-      }
-      else {
-        result = "NSString *";
-      }
-      break;
-    default:
-      result = "NSNumber *";
-      break;
-    }
-  } else if (ttype->is_enum()) {
-      result = "NSNumber *";
-  } else if (ttype->is_map()) {
-    t_map *map = (t_map *)ttype;
-    result = "NSDictionary<" + element_type_name(map->get_key_type()) + ", " + element_type_name(map->get_val_type()) + "> *";
-  } else if (ttype->is_set()) {
-    t_set *set = (t_set *)ttype;
-    result = "NSSet<" + element_type_name(set->get_elem_type()) + "> *";
-  } else if (ttype->is_list()) {
-    t_list *list = (t_list *)ttype;
-    result = "NSArray<" + element_type_name(list->get_elem_type()) + "> *";
-  } else if (ttype->is_struct() || ttype->is_xception()) {
-    result = cocoa_prefix_ + ttype->get_name() + " *";
-  }
-
-  return result;
-}
-
-/**
- * Returns the Objective-C type that corresponds to the thrift type.
- *
- * @param tbase The base type
- */
-string t_cocoa_generator::base_type_name(t_base_type* type) {
-  t_base_type::t_base tbase = type->get_base();
-
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "void";
-  case t_base_type::TYPE_STRING:
-    if (type->is_binary()) {
-      return "NSData *";
-    } else {
-      return "NSString *";
-    }
-  case t_base_type::TYPE_BOOL:
-    return "BOOL";
-  case t_base_type::TYPE_I8:
-    return "SInt8";
-  case t_base_type::TYPE_I16:
-    return "SInt16";
-  case t_base_type::TYPE_I32:
-    return "SInt32";
-  case t_base_type::TYPE_I64:
-    return "SInt64";
-  case t_base_type::TYPE_DOUBLE:
-    return "double";
-  default:
-    throw "compiler error: no Objective-C name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-void t_cocoa_generator::print_const_value(ostream& out,
-                                          string name,
-                                          t_type* type,
-                                          t_const_value* value,
-                                          bool defval) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    string v2 = render_const_value(out, type, value);
-    indent(out);
-    if (defval)
-      out << type_name(type) << " ";
-    out << name << " = " << v2 << ";" << endl << endl;
-  } else if (type->is_enum()) {
-    indent(out);
-    if (defval)
-      out << type_name(type) << " ";
-    out << name << " = " << render_const_value(out, type, value) << ";" << endl << endl;
-  } else if (type->is_struct() || type->is_xception()) {
-    indent(out);
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    if (defval)
-      out << type_name(type) << " ";
-    out << name << " = [" << type_name(type, true) << " new];"
-        << endl;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string val = render_const_value(out, field_type, v_iter->second);
-      std::string cap_name = capitalize(v_iter->first->get_string());
-      indent(out) << "[" << name << " set" << cap_name << ":" << val << "];" << endl;
-    }
-  } else if (type->is_map()) {
-    ostringstream mapout;
-    indent(mapout);
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    if (defval)
-      mapout << type_name(type) << " ";
-    mapout << name << " = @{";
-    for (v_iter = val.begin(); v_iter != val.end();) {
-      mapout << render_const_value(out, ktype, v_iter->first, true) << ": "
-          << render_const_value(out, vtype, v_iter->second, true);
-      if (++v_iter != val.end()) {
-        mapout << ", ";
-      }
-    }
-    mapout << "}";
-    out << mapout.str();
-  } else if (type->is_list()) {
-    ostringstream listout;
-    indent(listout);
-    t_type* etype = ((t_list*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    if (defval)
-      listout << type_name(type) << " ";
-    listout << name << " = @[";
-    for (v_iter = val.begin(); v_iter != val.end();) {
-      listout << render_const_value(out, etype, *v_iter, true);
-      if (++v_iter != val.end()) {
-        listout << ", ";
-      }
-    }
-    listout << "]";
-    out << listout.str();
-  } else if (type->is_set()) {
-    ostringstream setout;
-    indent(setout);
-    t_type* etype = ((t_set*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    if (defval)
-      setout << type_name(type) << " ";
-    setout << name << " = [NSSet setWithArray:@[";
-    for (v_iter = val.begin(); v_iter != val.end();) {
-      setout << render_const_value(out, etype, *v_iter, true);
-      if (++v_iter != val.end()) {
-        setout << ", ";
-      }
-    }
-    setout << "]]";
-    out << setout.str();
-  } else {
-    throw "compiler error: no const of type " + type->get_name();
-  }
-}
-
-string t_cocoa_generator::render_const_value(ostream& out,
-                                             t_type* type,
-                                             t_const_value* value,
-                                             bool box_it) {
-  type = get_true_type(type);
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      // We must handle binary constant but the syntax of IDL defines
-      // nothing about binary constant.
-      //   if ((t_base_type*)type)->is_binary())
-      //      // binary code
-      render << "@\"" << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "YES" : "NO");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << value->get_integer();
-  } else {
-    string t = tmp("tmp");
-    print_const_value(out, t, type, value, true);
-    out << ";" << endl;
-    render << t;
-  }
-
-  if (box_it) {
-    return box(type, render.str());
-  }
-  return render.str();
-}
-
-#if 0
-/**
-ORIGINAL
- * Spit out code that evaluates to the specified constant value.
- */
-string t_cocoa_generator::render_const_value(string name,
-                                             t_type* type,
-                                             t_const_value* value,
-                                             bool box_it) {
-  type = get_true_type(type);
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << "@\"" << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "YES" : "NO");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    if (val.size() > 0)
-      render << "[[" << type_name(type, true) << " alloc] initWith";
-    else
-      render << "[[" << type_name(type, true) << " alloc] init";
-    bool first = true;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      // FIXME The generated code does not match with initWithXXX
-      //       initializer and causes compile error.
-      //       Try: test/DebugProtoTest.thrift and test/SmallTest.thrift
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      if (first) {
-        render << capitalize(v_iter->first->get_string());
-        first = false;
-      } else {
-        render << " " << v_iter->first->get_string();
-      }
-      render << ": " << render_const_value(name, field_type, v_iter->second);
-    }
-    render << "]";
-  } else if (type->is_map()) {
-    render << "[[NSDictionary alloc] initWithObjectsAndKeys: ";
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    bool first = true;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(name, ktype, v_iter->first, true);
-      string val = render_const_value(name, vtype, v_iter->second, true);
-      if (first) {
-        first = false;
-      } else {
-        render << ", ";
-      }
-      render << val << ", " << key;
-    }
-    if (first)
-      render << " nil]";
-    else
-      render << ", nil]";
-  } else if (type->is_list()) {
-    render << "[[NSArray alloc] initWithObjects: ";
-    t_type * etype = ((t_list*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    bool first = true;
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      if (first) {
-        first = false;
-      } else {
-        render << ", ";
-      }
-      render << render_const_value(name, etype, *v_iter, true);
-    }
-    if (first)
-      render << " nil]";
-    else
-      render << ", nil]";
-  } else if (type->is_set()) {
-    render << "[[NSSet alloc] initWithObjects: ";
-    t_type * etype = ((t_set*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    bool first = true;
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      if (first) {
-        first = false;
-      } else {
-        render << ", ";
-      }
-      render << render_const_value(name, etype, *v_iter, true);
-    }
-    if (first)
-      render << " nil]";
-    else
-      render << ", nil]";
-  } else {
-    throw "don't know how to render constant for type: " + type->get_name();
-  }
-
-  if (box_it) {
-    return box(type, render.str());
-  }
-
-  return render.str();
-}
-#endif
-
-/**
- * Declares an Objective-C 2.0 property.
- *
- * @param tfield The field to declare a property for
- */
-string t_cocoa_generator::declare_property(t_field* tfield) {
-  std::ostringstream render;
-  render << "@property (";
-
-  if (type_can_be_null(tfield->get_type())) {
-    render << "strong, ";
-  } else {
-    render << "assign, ";
-  }
-
-  render << "nonatomic) " << type_name(tfield->get_type(), false, true) << " "
-  << tfield->get_name() << ";";
-
-  // Check if the property name is an Objective-C return +1 count signal
-  if ((tfield->get_name().length() >= 3 && tfield->get_name().substr(0,3) == "new") ||
-      (tfield->get_name().length() >= 6 && tfield->get_name().substr(0,6) == "create") ||
-      (tfield->get_name().length() >= 5 && tfield->get_name().substr(0,5) == "alloc")) {
-    // Let Objective-C know not to return +1 for object pointers
-    if (type_can_be_null(tfield->get_type())) {
-      render << endl;
-      render << "- (" + type_name(tfield->get_type()) + ") " + decapitalize(tfield->get_name()) + " __attribute__((objc_method_family(none)));";
-    }
-  }
-
-  return render.str();
-}
-
-/**
- * Declares an Objective-C 2.0 property.
- *
- * @param tfield The field to declare a property for
- */
-string t_cocoa_generator::declare_property_isset(t_field* tfield) {
-  return "@property (assign, nonatomic) BOOL " + decapitalize(tfield->get_name()) + "IsSet;";
-}
-
-/**
- * Declares property unset method.
- *
- * @param tfield The field to declare a property for
- */
-string t_cocoa_generator::declare_property_unset(t_field* tfield) {
-  return "- (void) unset" + capitalize(tfield->get_name()) + ";";
-}
-
-/**
- * Renders the early out return statement
- *
- * @param tfunction Function definition
- * @return String of rendered invalid return statment
- */
-string t_cocoa_generator::invalid_return_statement(t_function *tfunction) {
-  if ((tfunction->get_returntype()->is_void())) {
-    return "return NO;";
-  }
-  return "return nil;";
-}
-
-/**
- * Renders a function signature
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_cocoa_generator::function_signature(t_function* tfunction, bool include_error) {
-  t_type* ttype = tfunction->get_returntype();
-  string result;
-  if (ttype->is_void()) {
-    result = "(BOOL)";
-  }
-  else if (type_can_be_null(ttype)) {
-    result = "(" + type_name(ttype) + ")";
-  }
-  else {
-    result = "(NSNumber *)";
-  }
-  result += " " + tfunction->get_name() + argument_list(tfunction->get_arglist(), "", include_error);
-  return result;
-}
-
-/**
- * Renders a function signature that returns asynchronously instead of
- * literally returning.
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_cocoa_generator::async_function_signature(t_function* tfunction, bool include_error) {
-  t_type* ttype = tfunction->get_returntype();
-  t_struct* targlist = tfunction->get_arglist();
-  string response_param = "void (^)(" + ((ttype->is_void()) ? "" : type_name(ttype)) + ")";
-  std::string result = "(void) " + tfunction->get_name() + argument_list(tfunction->get_arglist(), "", include_error)
-  + (targlist->get_members().size() ? " response" : "") + ": ("
-  + response_param + ") responseBlock "
-  + "failure : (TAsyncFailureBlock) failureBlock";
-  return result;
-}
-
-/**
- * Renders a function signature that returns a promise instead of
- * literally returning.
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_cocoa_generator::promise_function_signature(t_function* tfunction) {
-  return "(AnyPromise *) " + tfunction->get_name() + argument_list(tfunction->get_arglist(), "", false);
-}
-
-/**
- * Renders a colon separated list of types and names, suitable for an
- * objective-c parameter list
- */
-string t_cocoa_generator::argument_list(t_struct* tstruct, string protocol_name, bool include_error) {
-  string result = "";
-  bool include_protocol = !protocol_name.empty();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    string argPrefix = "";
-    if (first) {
-      first = false;
-    } else {
-      argPrefix = (*f_iter)->get_name();
-      result += " ";
-    }
-    result += argPrefix + ": (" + type_name((*f_iter)->get_type()) + ") " + (*f_iter)->get_name();
-  }
-  if (include_protocol) {
-    if (!first) {
-      result += " protocol";
-    }
-    result += ": (id<TProtocol>) " + protocol_name;
-    first = false;
-  }
-  if (include_error) {
-    if (!first) {
-      result += " error";
-    }
-    result += ": (NSError *__autoreleasing *)__thriftError";
-    first = false;
-  }
-  return result;
-}
-
-/**
- * Converts the parse type to an Objective-C enum string for the given type.
- */
-string t_cocoa_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TTypeSTRING";
-    case t_base_type::TYPE_BOOL:
-      return "TTypeBOOL";
-    case t_base_type::TYPE_I8:
-      return "TTypeBYTE";
-    case t_base_type::TYPE_I16:
-      return "TTypeI16";
-    case t_base_type::TYPE_I32:
-      return "TTypeI32";
-    case t_base_type::TYPE_I64:
-      return "TTypeI64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TTypeDOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TTypeI32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TTypeSTRUCT";
-  } else if (type->is_map()) {
-    return "TTypeMAP";
-  } else if (type->is_set()) {
-    return "TTypeSET";
-  } else if (type->is_list()) {
-    return "TTypeLIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Returns a format string specifier for the supplied parse type.
- */
-string t_cocoa_generator::format_string_for_type(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "\\\"%@\\\"";
-    case t_base_type::TYPE_BOOL:
-      return "%i";
-    case t_base_type::TYPE_I8:
-      return "%i";
-    case t_base_type::TYPE_I16:
-      return "%hi";
-    case t_base_type::TYPE_I32:
-      return "%i";
-    case t_base_type::TYPE_I64:
-      return "%qi";
-    case t_base_type::TYPE_DOUBLE:
-      return "%f";
-    }
-  } else if (type->is_enum()) {
-    return "%i";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "%@";
-  } else if (type->is_map()) {
-    return "%@";
-  } else if (type->is_set()) {
-    return "%@";
-  } else if (type->is_list()) {
-    return "%@";
-  }
-
-  throw "INVALID TYPE IN format_string_for_type: " + type->get_name();
-}
-
-/**
- * Returns a format cast for the supplied parse type.
- */
-string t_cocoa_generator::format_cast_for_type(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return ""; // "\\\"%@\\\"";
-    case t_base_type::TYPE_BOOL:
-      return ""; // "%i";
-    case t_base_type::TYPE_I8:
-      return ""; // "%i";
-    case t_base_type::TYPE_I16:
-      return ""; // "%hi";
-    case t_base_type::TYPE_I32:
-      return "(int)"; // "%i";
-    case t_base_type::TYPE_I64:
-      return ""; // "%qi";
-    case t_base_type::TYPE_DOUBLE:
-      return ""; // "%f";
-    }
-  } else if (type->is_enum()) {
-    return "(int)"; // "%i";
-  } else if (type->is_struct() || type->is_xception()) {
-    return ""; // "%@";
-  } else if (type->is_map()) {
-    return ""; // "%@";
-  } else if (type->is_set()) {
-    return ""; // "%@";
-  } else if (type->is_list()) {
-    return ""; // "%@";
-  }
-
-  throw "INVALID TYPE IN format_cast_for_type: " + type->get_name();
-}
-
-/**
- * Generate a call to a field's setter.
- *
- * @param tfield Field the setter is being called on
- * @param fieldName Name of variable to pass to setter
- */
-
-string t_cocoa_generator::call_field_setter(t_field* tfield, string fieldName) {
-  return "self." + tfield->get_name() + " = " + fieldName + ";";
-}
-
-THRIFT_REGISTER_GENERATOR(
-    cocoa,
-    "Cocoa",
-    "    log_unexpected:  Log every time an unexpected field ID or type is encountered.\n"
-    "    debug_descriptions:\n"
-    "                     Allow use of debugDescription so the app can add description via a cateogory/extension\n"
-    "    validate_required:\n"
-    "                     Throws exception if any required field is not set.\n"
-    "    async_clients:   Generate clients which invoke asynchronously via block syntax.\n"
-    "    pods:            Generate imports in Cocopods framework format.\n"
-    "    promise_kit:     Generate clients which invoke asynchronously via promises.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_cpp_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_cpp_generator.cc
deleted file mode 100644
index cbe8da2..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_cpp_generator.cc
+++ /dev/null
@@ -1,4374 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <cassert>
-
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <sys/stat.h>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostream;
-using std::string;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * C++ code generator. This is legitimacy incarnate.
- *
- */
-class t_cpp_generator : public t_oop_generator {
-public:
-  t_cpp_generator(t_program* program,
-                  const std::map<std::string, std::string>& parsed_options,
-                  const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-
-    gen_pure_enums_ = false;
-    use_include_prefix_ = false;
-    gen_cob_style_ = false;
-    gen_no_client_completion_ = false;
-    gen_no_default_operators_ = false;
-    gen_templates_ = false;
-    gen_templates_only_ = false;
-    gen_moveable_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("pure_enums") == 0) {
-        gen_pure_enums_ = true;
-      } else if( iter->first.compare("include_prefix") == 0) {
-        use_include_prefix_ = true;
-      } else if( iter->first.compare("cob_style") == 0) {
-        gen_cob_style_ = true;
-      } else if( iter->first.compare("no_client_completion") == 0) {
-        gen_no_client_completion_ = true;
-      } else if( iter->first.compare("no_default_operators") == 0) {
-        gen_no_default_operators_ = true;
-      } else if( iter->first.compare("templates") == 0) {
-        gen_templates_ = true;
-        gen_templates_only_ = (iter->second == "only");
-      } else if( iter->first.compare("moveable_types") == 0) {
-        gen_moveable_ = true;
-      } else {
-        throw "unknown option cpp:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-cpp";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_forward_declaration(t_struct* tstruct);
-  void generate_struct(t_struct* tstruct) { generate_cpp_struct(tstruct, false); }
-  void generate_xception(t_struct* txception) { generate_cpp_struct(txception, true); }
-  void generate_cpp_struct(t_struct* tstruct, bool is_exception);
-
-  void generate_service(t_service* tservice);
-
-  void print_const_value(std::ofstream& out, std::string name, t_type* type, t_const_value* value);
-  std::string render_const_value(std::ofstream& out,
-                                 std::string name,
-                                 t_type* type,
-                                 t_const_value* value);
-
-  void generate_struct_declaration(std::ofstream& out,
-                                   t_struct* tstruct,
-                                   bool is_exception = false,
-                                   bool pointers = false,
-                                   bool read = true,
-                                   bool write = true,
-                                   bool swap = false,
-                                   bool is_user_struct = false);
-  void generate_struct_definition(std::ofstream& out,
-                                  std::ofstream& force_cpp_out,
-                                  t_struct* tstruct,
-                                  bool setters = true);
-  void generate_copy_constructor(std::ofstream& out, t_struct* tstruct, bool is_exception);
-  void generate_move_constructor(std::ofstream& out, t_struct* tstruct, bool is_exception);
-  void generate_constructor_helper(std::ofstream& out,
-                                   t_struct* tstruct,
-                                   bool is_excpetion,
-                                   bool is_move);
-  void generate_assignment_operator(std::ofstream& out, t_struct* tstruct);
-  void generate_move_assignment_operator(std::ofstream& out, t_struct* tstruct);
-  void generate_assignment_helper(std::ofstream& out, t_struct* tstruct, bool is_move);
-  void generate_struct_reader(std::ofstream& out, t_struct* tstruct, bool pointers = false);
-  void generate_struct_writer(std::ofstream& out, t_struct* tstruct, bool pointers = false);
-  void generate_struct_result_writer(std::ofstream& out, t_struct* tstruct, bool pointers = false);
-  void generate_struct_swap(std::ofstream& out, t_struct* tstruct);
-  void generate_struct_print_method(std::ofstream& out, t_struct* tstruct);
-  void generate_exception_what_method(std::ofstream& out, t_struct* tstruct);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_interface(t_service* tservice, string style);
-  void generate_service_interface_factory(t_service* tservice, string style);
-  void generate_service_null(t_service* tservice, string style);
-  void generate_service_multiface(t_service* tservice);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice, string style);
-  void generate_service_processor(t_service* tservice, string style);
-  void generate_service_skeleton(t_service* tservice);
-  void generate_process_function(t_service* tservice,
-                                 t_function* tfunction,
-                                 string style,
-                                 bool specialized = false);
-  void generate_function_helpers(t_service* tservice, t_function* tfunction);
-  void generate_service_async_skeleton(t_service* tservice);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  std::string prefix = "",
-                                  std::string suffix = "");
-
-  void generate_deserialize_struct(std::ofstream& out,
-                                   t_struct* tstruct,
-                                   std::string prefix = "",
-                                   bool pointer = false);
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix,
-                                         bool push_back,
-                                         std::string index);
-
-  void generate_serialize_field(std::ofstream& out,
-                                t_field* tfield,
-                                std::string prefix = "",
-                                std::string suffix = "");
-
-  void generate_serialize_struct(std::ofstream& out,
-                                 t_struct* tstruct,
-                                 std::string prefix = "",
-                                 bool pointer = false);
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out, t_map* tmap, std::string iter);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_function_call(ostream& out,
-                              t_function* tfunction,
-                              string target,
-                              string iface,
-                              string arg_prefix);
-  /*
-   * Helper rendering functions
-   */
-
-  std::string namespace_prefix(std::string ns);
-  std::string namespace_open(std::string ns);
-  std::string namespace_close(std::string ns);
-  std::string type_name(t_type* ttype, bool in_typedef = false, bool arg = false);
-  std::string base_type_name(t_base_type::t_base tbase);
-  std::string declare_field(t_field* tfield,
-                            bool init = false,
-                            bool pointer = false,
-                            bool constant = false,
-                            bool reference = false);
-  std::string function_signature(t_function* tfunction,
-                                 std::string style,
-                                 std::string prefix = "",
-                                 bool name_params = true);
-  std::string cob_function_signature(t_function* tfunction,
-                                     std::string prefix = "",
-                                     bool name_params = true);
-  std::string argument_list(t_struct* tstruct, bool name_params = true, bool start_comma = false);
-  std::string type_to_enum(t_type* ttype);
-
-  void generate_enum_constant_list(std::ofstream& f,
-                                   const vector<t_enum_value*>& constants,
-                                   const char* prefix,
-                                   const char* suffix,
-                                   bool include_values);
-
-  void generate_struct_ostream_operator(std::ofstream& f, t_struct* tstruct);
-  void generate_struct_print_method_decl(std::ofstream& f, t_struct* tstruct);
-  void generate_exception_what_method_decl(std::ofstream& f,
-                                           t_struct* tstruct,
-                                           bool external = false);
-
-  bool is_reference(t_field* tfield) { return tfield->get_reference(); }
-
-  bool is_complex_type(t_type* ttype) {
-    ttype = get_true_type(ttype);
-
-    return ttype->is_container() || ttype->is_struct() || ttype->is_xception()
-           || (ttype->is_base_type()
-               && (((t_base_type*)ttype)->get_base() == t_base_type::TYPE_STRING));
-  }
-
-  void set_use_include_prefix(bool use_include_prefix) { use_include_prefix_ = use_include_prefix; }
-
-private:
-  /**
-   * Returns the include prefix to use for a file generated by program, or the
-   * empty string if no include prefix should be used.
-   */
-  std::string get_include_prefix(const t_program& program) const;
-
-  /**
-   * True if we should generate pure enums for Thrift enums, instead of wrapper classes.
-   */
-  bool gen_pure_enums_;
-
-  /**
-   * True if we should generate templatized reader/writer methods.
-   */
-  bool gen_templates_;
-
-  /**
-   * True iff we should generate process function pointers for only templatized
-   * reader/writer methods.
-   */
-  bool gen_templates_only_;
-
-  /**
-   * True if we should generate move constructors & assignment operators.
-   */
-  bool gen_moveable_;
-
-  /**
-   * True iff we should use a path prefix in our #include statements for other
-   * thrift-generated header files.
-   */
-  bool use_include_prefix_;
-
-  /**
-   * True if we should generate "Continuation OBject"-style classes as well.
-   */
-  bool gen_cob_style_;
-
-  /**
-   * True if we should omit calls to completion__() in CobClient class.
-   */
-  bool gen_no_client_completion_;
-
-  /**
-   * True if we should omit generating the default opeartors ==, != and <.
-   */
-  bool gen_no_default_operators_;
-
-  /**
-   * Strings for namespace, computed once up front then used directly
-   */
-
-  std::string ns_open_;
-  std::string ns_close_;
-
-  /**
-   * File streams, stored here to avoid passing them as parameters to every
-   * function.
-   */
-
-  std::ofstream f_types_;
-  std::ofstream f_types_impl_;
-  std::ofstream f_types_tcc_;
-  std::ofstream f_header_;
-  std::ofstream f_service_;
-  std::ofstream f_service_tcc_;
-
-  // The ProcessorGenerator is used to generate parts of the code,
-  // so it needs access to many of our protected members and methods.
-  //
-  // TODO: The code really should be cleaned up so that helper methods for
-  // writing to the output files are separate from the generator classes
-  // themselves.
-  friend class ProcessorGenerator;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- */
-void t_cpp_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  // Make output file
-  string f_types_name = get_out_dir() + program_name_ + "_types.h";
-  f_types_.open(f_types_name.c_str());
-
-  string f_types_impl_name = get_out_dir() + program_name_ + "_types.cpp";
-  f_types_impl_.open(f_types_impl_name.c_str());
-
-  if (gen_templates_) {
-    // If we don't open the stream, it appears to just discard data,
-    // which is fine.
-    string f_types_tcc_name = get_out_dir() + program_name_ + "_types.tcc";
-    f_types_tcc_.open(f_types_tcc_name.c_str());
-  }
-
-  // Print header
-  f_types_ << autogen_comment();
-  f_types_impl_ << autogen_comment();
-  f_types_tcc_ << autogen_comment();
-
-  // Start ifndef
-  f_types_ << "#ifndef " << program_name_ << "_TYPES_H" << endl << "#define " << program_name_
-           << "_TYPES_H" << endl << endl;
-  f_types_tcc_ << "#ifndef " << program_name_ << "_TYPES_TCC" << endl << "#define " << program_name_
-               << "_TYPES_TCC" << endl << endl;
-
-  // Include base types
-  f_types_ << "#include <iosfwd>" << endl
-           << endl
-           << "#include <thrift/Thrift.h>" << endl
-           << "#include <thrift/TApplicationException.h>" << endl
-           << "#include <thrift/TBase.h>" << endl
-           << "#include <thrift/protocol/TProtocol.h>" << endl
-           << "#include <thrift/transport/TTransport.h>" << endl
-           << endl;
-  // Include C++xx compatibility header
-  f_types_ << "#include <thrift/cxxfunctional.h>" << endl;
-
-  // Include other Thrift includes
-  const vector<t_program*>& includes = program_->get_includes();
-  for (size_t i = 0; i < includes.size(); ++i) {
-    f_types_ << "#include \"" << get_include_prefix(*(includes[i])) << includes[i]->get_name()
-             << "_types.h\"" << endl;
-
-    // XXX(simpkins): If gen_templates_ is enabled, we currently assume all
-    // included files were also generated with templates enabled.
-    f_types_tcc_ << "#include \"" << get_include_prefix(*(includes[i])) << includes[i]->get_name()
-                 << "_types.tcc\"" << endl;
-  }
-  f_types_ << endl;
-
-  // Include custom headers
-  const vector<string>& cpp_includes = program_->get_cpp_includes();
-  for (size_t i = 0; i < cpp_includes.size(); ++i) {
-    if (cpp_includes[i][0] == '<') {
-      f_types_ << "#include " << cpp_includes[i] << endl;
-    } else {
-      f_types_ << "#include \"" << cpp_includes[i] << "\"" << endl;
-    }
-  }
-  f_types_ << endl;
-
-  // Include the types file
-  f_types_impl_ << "#include \"" << get_include_prefix(*get_program()) << program_name_
-                << "_types.h\"" << endl << endl;
-  f_types_tcc_ << "#include \"" << get_include_prefix(*get_program()) << program_name_
-               << "_types.h\"" << endl << endl;
-
-  // The swap() code needs <algorithm> for std::swap()
-  f_types_impl_ << "#include <algorithm>" << endl;
-  // for operator<<
-  f_types_impl_ << "#include <ostream>" << endl << endl;
-  f_types_impl_ << "#include <thrift/TToString.h>" << endl << endl;
-
-  // Open namespace
-  ns_open_ = namespace_open(program_->get_namespace("cpp"));
-  ns_close_ = namespace_close(program_->get_namespace("cpp"));
-
-  f_types_ << ns_open_ << endl << endl;
-
-  f_types_impl_ << ns_open_ << endl << endl;
-
-  f_types_tcc_ << ns_open_ << endl << endl;
-}
-
-/**
- * Closes the output files.
- */
-void t_cpp_generator::close_generator() {
-  // Close namespace
-  f_types_ << ns_close_ << endl << endl;
-  f_types_impl_ << ns_close_ << endl;
-  f_types_tcc_ << ns_close_ << endl << endl;
-
-  // Include the types.tcc file from the types header file,
-  // so clients don't have to explicitly include the tcc file.
-  // TODO(simpkins): Make this a separate option.
-  if (gen_templates_) {
-    f_types_ << "#include \"" << get_include_prefix(*get_program()) << program_name_
-             << "_types.tcc\"" << endl << endl;
-  }
-
-  // Close ifndef
-  f_types_ << "#endif" << endl;
-  f_types_tcc_ << "#endif" << endl;
-
-  // Close output file
-  f_types_.close();
-  f_types_impl_.close();
-  f_types_tcc_.close();
-}
-
-/**
- * Generates a typedef. This is just a simple 1-liner in C++
- *
- * @param ttypedef The type definition
- */
-void t_cpp_generator::generate_typedef(t_typedef* ttypedef) {
-  f_types_ << indent() << "typedef " << type_name(ttypedef->get_type(), true) << " "
-           << ttypedef->get_symbolic() << ";" << endl << endl;
-}
-
-void t_cpp_generator::generate_enum_constant_list(std::ofstream& f,
-                                                  const vector<t_enum_value*>& constants,
-                                                  const char* prefix,
-                                                  const char* suffix,
-                                                  bool include_values) {
-  f << " {" << endl;
-  indent_up();
-
-  vector<t_enum_value*>::const_iterator c_iter;
-  bool first = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f << "," << endl;
-    }
-    indent(f) << prefix << (*c_iter)->get_name() << suffix;
-    if (include_values) {
-      f << " = " << (*c_iter)->get_value();
-    }
-  }
-
-  f << endl;
-  indent_down();
-  indent(f) << "};" << endl;
-}
-
-/**
- * Generates code for an enumerated type. In C++, this is essentially the same
- * as the thrift definition itself, using the enum keyword in C++.
- *
- * @param tenum The enumeration
- */
-void t_cpp_generator::generate_enum(t_enum* tenum) {
-  vector<t_enum_value*> constants = tenum->get_constants();
-
-  std::string enum_name = tenum->get_name();
-  if (!gen_pure_enums_) {
-    enum_name = "type";
-    f_types_ << indent() << "struct " << tenum->get_name() << " {" << endl;
-    indent_up();
-  }
-  f_types_ << indent() << "enum " << enum_name;
-
-  generate_enum_constant_list(f_types_, constants, "", "", true);
-
-  if (!gen_pure_enums_) {
-    indent_down();
-    f_types_ << "};" << endl;
-  }
-
-  f_types_ << endl;
-
-  /**
-     Generate a character array of enum names for debugging purposes.
-  */
-  std::string prefix = "";
-  if (!gen_pure_enums_) {
-    prefix = tenum->get_name() + "::";
-  }
-
-  f_types_impl_ << indent() << "int _k" << tenum->get_name() << "Values[] =";
-  generate_enum_constant_list(f_types_impl_, constants, prefix.c_str(), "", false);
-
-  f_types_impl_ << indent() << "const char* _k" << tenum->get_name() << "Names[] =";
-  generate_enum_constant_list(f_types_impl_, constants, "\"", "\"", false);
-
-  f_types_ << indent() << "extern const std::map<int, const char*> _" << tenum->get_name()
-           << "_VALUES_TO_NAMES;" << endl << endl;
-
-  f_types_impl_ << indent() << "const std::map<int, const char*> _" << tenum->get_name()
-                << "_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(" << constants.size() << ", _k"
-                << tenum->get_name() << "Values"
-                << ", _k" << tenum->get_name() << "Names), "
-                << "::apache::thrift::TEnumIterator(-1, NULL, NULL));" << endl << endl;
-}
-
-/**
- * Generates a class that holds all the constants.
- */
-void t_cpp_generator::generate_consts(std::vector<t_const*> consts) {
-  string f_consts_name = get_out_dir() + program_name_ + "_constants.h";
-  ofstream f_consts;
-  f_consts.open(f_consts_name.c_str());
-
-  string f_consts_impl_name = get_out_dir() + program_name_ + "_constants.cpp";
-  ofstream f_consts_impl;
-  f_consts_impl.open(f_consts_impl_name.c_str());
-
-  // Print header
-  f_consts << autogen_comment();
-  f_consts_impl << autogen_comment();
-
-  // Start ifndef
-  f_consts << "#ifndef " << program_name_ << "_CONSTANTS_H" << endl << "#define " << program_name_
-           << "_CONSTANTS_H" << endl << endl << "#include \"" << get_include_prefix(*get_program())
-           << program_name_ << "_types.h\"" << endl << endl << ns_open_ << endl << endl;
-
-  f_consts_impl << "#include \"" << get_include_prefix(*get_program()) << program_name_
-                << "_constants.h\"" << endl << endl << ns_open_ << endl << endl;
-
-  f_consts << "class " << program_name_ << "Constants {" << endl << " public:" << endl << "  "
-           << program_name_ << "Constants();" << endl << endl;
-  indent_up();
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    string name = (*c_iter)->get_name();
-    t_type* type = (*c_iter)->get_type();
-    f_consts << indent() << type_name(type) << " " << name << ";" << endl;
-  }
-  indent_down();
-  f_consts << "};" << endl;
-
-  f_consts_impl << "const " << program_name_ << "Constants g_" << program_name_ << "_constants;"
-                << endl << endl << program_name_ << "Constants::" << program_name_
-                << "Constants() {" << endl;
-  indent_up();
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    print_const_value(f_consts_impl,
-                      (*c_iter)->get_name(),
-                      (*c_iter)->get_type(),
-                      (*c_iter)->get_value());
-  }
-  indent_down();
-  indent(f_consts_impl) << "}" << endl;
-
-  f_consts << endl << "extern const " << program_name_ << "Constants g_" << program_name_
-           << "_constants;" << endl << endl << ns_close_ << endl << endl << "#endif" << endl;
-  f_consts.close();
-
-  f_consts_impl << endl << ns_close_ << endl << endl;
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-void t_cpp_generator::print_const_value(ofstream& out,
-                                        string name,
-                                        t_type* type,
-                                        t_const_value* value) {
-  type = get_true_type(type);
-  if (type->is_base_type()) {
-    string v2 = render_const_value(out, name, type, value);
-    indent(out) << name << " = " << v2 << ";" << endl << endl;
-  } else if (type->is_enum()) {
-    indent(out) << name << " = (" << type_name(type) << ")" << value->get_integer() << ";" << endl
-                << endl;
-  } else if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    bool is_nonrequired_field = false;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      is_nonrequired_field = false;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-          is_nonrequired_field = (*f_iter)->get_req() != t_field::T_REQUIRED;
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string val = render_const_value(out, name, field_type, v_iter->second);
-      indent(out) << name << "." << v_iter->first->get_string() << " = " << val << ";" << endl;
-      if (is_nonrequired_field) {
-        indent(out) << name << ".__isset." << v_iter->first->get_string() << " = true;" << endl;
-      }
-    }
-    out << endl;
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(out, name, ktype, v_iter->first);
-      string val = render_const_value(out, name, vtype, v_iter->second);
-      indent(out) << name << ".insert(std::make_pair(" << key << ", " << val << "));" << endl;
-    }
-    out << endl;
-  } else if (type->is_list()) {
-    t_type* etype = ((t_list*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(out, name, etype, *v_iter);
-      indent(out) << name << ".push_back(" << val << ");" << endl;
-    }
-    out << endl;
-  } else if (type->is_set()) {
-    t_type* etype = ((t_set*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(out, name, etype, *v_iter);
-      indent(out) << name << ".insert(" << val << ");" << endl;
-    }
-    out << endl;
-  } else {
-    throw "INVALID TYPE IN print_const_value: " + type->get_name();
-  }
-}
-
-/**
- *
- */
-string t_cpp_generator::render_const_value(ofstream& out,
-                                           string name,
-                                           t_type* type,
-                                           t_const_value* value) {
-  (void)name;
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_I64:
-      render << value->get_integer() << "LL";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << "(" << type_name(type) << ")" << value->get_integer();
-  } else {
-    string t = tmp("tmp");
-    indent(out) << type_name(type) << " " << t << ";" << endl;
-    print_const_value(out, t, type, value);
-    render << t;
-  }
-
-  return render.str();
-}
-
-void t_cpp_generator::generate_forward_declaration(t_struct* tstruct) {
-  // Forward declare struct def
-  f_types_ << indent() << "class " << tstruct->get_name() << ";" << endl << endl;
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is a class
- * with data members and a read/write() function, plus a mirroring isset
- * inner class.
- *
- * @param tstruct The struct definition
- */
-void t_cpp_generator::generate_cpp_struct(t_struct* tstruct, bool is_exception) {
-  generate_struct_declaration(f_types_, tstruct, is_exception, false, true, true, true, true);
-  generate_struct_definition(f_types_impl_, f_types_impl_, tstruct);
-
-  std::ofstream& out = (gen_templates_ ? f_types_tcc_ : f_types_impl_);
-  generate_struct_reader(out, tstruct);
-  generate_struct_writer(out, tstruct);
-  generate_struct_swap(f_types_impl_, tstruct);
-  generate_copy_constructor(f_types_impl_, tstruct, is_exception);
-  if (gen_moveable_) {
-    generate_move_constructor(f_types_impl_, tstruct, is_exception);
-  }
-  generate_assignment_operator(f_types_impl_, tstruct);
-  if (gen_moveable_) {
-    generate_move_assignment_operator(f_types_impl_, tstruct);
-  }
-  generate_struct_print_method(f_types_impl_, tstruct);
-  if (is_exception) {
-    generate_exception_what_method(f_types_impl_, tstruct);
-  }
-}
-
-void t_cpp_generator::generate_copy_constructor(ofstream& out,
-                                                t_struct* tstruct,
-                                                bool is_exception) {
-  generate_constructor_helper(out, tstruct, is_exception, /*is_move=*/false);
-}
-
-void t_cpp_generator::generate_move_constructor(ofstream& out,
-                                                t_struct* tstruct,
-                                                bool is_exception) {
-  generate_constructor_helper(out, tstruct, is_exception, /*is_move=*/true);
-}
-
-namespace {
-// Helper to convert a variable to rvalue, if move is enabled
-std::string maybeMove(std::string const& other, bool move) {
-  if (move) {
-    return "std::move(" + other + ")";
-  }
-  return other;
-}
-}
-
-void t_cpp_generator::generate_constructor_helper(ofstream& out,
-                                                  t_struct* tstruct,
-                                                  bool is_exception,
-                                                  bool is_move) {
-
-  std::string tmp_name = tmp("other");
-
-  indent(out) << tstruct->get_name() << "::" << tstruct->get_name();
-
-  if (is_move) {
-    out << "( " << tstruct->get_name() << "&& ";
-  } else {
-    out << "(const " << tstruct->get_name() << "& ";
-  }
-  out << tmp_name << ") ";
-  if (is_exception)
-    out << ": TException() ";
-  out << "{" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-
-  // eliminate compiler unused warning
-  if (members.empty())
-    indent(out) << "(void) " << tmp_name << ";" << endl;
-
-  vector<t_field*>::const_iterator f_iter;
-  bool has_nonrequired_fields = false;
-  for (f_iter = members.begin(); f_iter != members.end(); ++f_iter) {
-    if ((*f_iter)->get_req() != t_field::T_REQUIRED)
-      has_nonrequired_fields = true;
-    indent(out) << (*f_iter)->get_name() << " = "
-                << maybeMove(tmp_name + "." + (*f_iter)->get_name(), is_move) << ";" << endl;
-  }
-
-  if (has_nonrequired_fields) {
-    indent(out) << "__isset = " << maybeMove(tmp_name + ".__isset", is_move) << ";" << endl;
-  }
-
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_cpp_generator::generate_assignment_operator(ofstream& out, t_struct* tstruct) {
-  generate_assignment_helper(out, tstruct, /*is_move=*/false);
-}
-
-void t_cpp_generator::generate_move_assignment_operator(ofstream& out, t_struct* tstruct) {
-  generate_assignment_helper(out, tstruct, /*is_move=*/true);
-}
-
-void t_cpp_generator::generate_assignment_helper(ofstream& out, t_struct* tstruct, bool is_move) {
-  std::string tmp_name = tmp("other");
-
-  indent(out) << tstruct->get_name() << "& " << tstruct->get_name() << "::operator=(";
-
-  if (is_move) {
-    out << tstruct->get_name() << "&& ";
-  } else {
-    out << "const " << tstruct->get_name() << "& ";
-  }
-  out << tmp_name << ") {" << endl;
-
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-
-  // eliminate compiler unused warning
-  if (members.empty())
-    indent(out) << "(void) " << tmp_name << ";" << endl;
-
-  vector<t_field*>::const_iterator f_iter;
-  bool has_nonrequired_fields = false;
-  for (f_iter = members.begin(); f_iter != members.end(); ++f_iter) {
-    if ((*f_iter)->get_req() != t_field::T_REQUIRED)
-      has_nonrequired_fields = true;
-    indent(out) << (*f_iter)->get_name() << " = "
-                << maybeMove(tmp_name + "." + (*f_iter)->get_name(), is_move) << ";" << endl;
-  }
-  if (has_nonrequired_fields) {
-    indent(out) << "__isset = " << maybeMove(tmp_name + ".__isset", is_move) << ";" << endl;
-  }
-
-  indent(out) << "return *this;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-/**
- * Writes the struct declaration into the header file
- *
- * @param out Output stream
- * @param tstruct The struct
- */
-void t_cpp_generator::generate_struct_declaration(ofstream& out,
-                                                  t_struct* tstruct,
-                                                  bool is_exception,
-                                                  bool pointers,
-                                                  bool read,
-                                                  bool write,
-                                                  bool swap,
-                                                  bool is_user_struct) {
-  string extends = "";
-  if (is_exception) {
-    extends = " : public ::apache::thrift::TException";
-  } else {
-    if (is_user_struct && !gen_templates_) {
-      extends = " : public virtual ::apache::thrift::TBase";
-    }
-  }
-
-  // Get members
-  vector<t_field*>::const_iterator m_iter;
-  const vector<t_field*>& members = tstruct->get_members();
-
-  // Write the isset structure declaration outside the class. This makes
-  // the generated code amenable to processing by SWIG.
-  // We only declare the struct if it gets used in the class.
-
-  // Isset struct has boolean fields, but only for non-required fields.
-  bool has_nonrequired_fields = false;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if ((*m_iter)->get_req() != t_field::T_REQUIRED)
-      has_nonrequired_fields = true;
-  }
-
-  if (has_nonrequired_fields && (!pointers || read)) {
-
-    out << indent() << "typedef struct _" << tstruct->get_name() << "__isset {" << endl;
-    indent_up();
-
-    indent(out) << "_" << tstruct->get_name() << "__isset() ";
-    bool first = true;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() == t_field::T_REQUIRED) {
-        continue;
-      }
-      string isSet = ((*m_iter)->get_value() != NULL) ? "true" : "false";
-      if (first) {
-        first = false;
-        out << ": " << (*m_iter)->get_name() << "(" << isSet << ")";
-      } else {
-        out << ", " << (*m_iter)->get_name() << "(" << isSet << ")";
-      }
-    }
-    out << " {}" << endl;
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-        indent(out) << "bool " << (*m_iter)->get_name() << " :1;" << endl;
-      }
-    }
-
-    indent_down();
-    indent(out) << "} _" << tstruct->get_name() << "__isset;" << endl;
-  }
-
-  out << endl;
-
-  // Open struct def
-  out << indent() << "class " << tstruct->get_name() << extends << " {" << endl << indent()
-      << " public:" << endl << endl;
-  indent_up();
-
-  if (!pointers) {
-    // Copy constructor
-    indent(out) << tstruct->get_name() << "(const " << tstruct->get_name() << "&);" << endl;
-
-    // Move constructor
-    if (gen_moveable_) {
-      indent(out) << tstruct->get_name() << "(" << tstruct->get_name() << "&&);" << endl;
-    }
-
-    // Assignment Operator
-    indent(out) << tstruct->get_name() << "& operator=(const " << tstruct->get_name() << "&);"
-                << endl;
-
-    // Move assignment operator
-    if (gen_moveable_) {
-      indent(out) << tstruct->get_name() << "& operator=(" << tstruct->get_name() << "&&);" << endl;
-    }
-
-    // Default constructor
-    indent(out) << tstruct->get_name() << "()";
-
-    bool init_ctor = false;
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-      if (t->is_base_type() || t->is_enum() || is_reference(*m_iter)) {
-        string dval;
-        if (t->is_enum()) {
-          dval += "(" + type_name(t) + ")";
-        }
-        dval += (t->is_string() || is_reference(*m_iter)) ? "" : "0";
-        t_const_value* cv = (*m_iter)->get_value();
-        if (cv != NULL) {
-          dval = render_const_value(out, (*m_iter)->get_name(), t, cv);
-        }
-        if (!init_ctor) {
-          init_ctor = true;
-          out << " : ";
-          out << (*m_iter)->get_name() << "(" << dval << ")";
-        } else {
-          out << ", " << (*m_iter)->get_name() << "(" << dval << ")";
-        }
-      }
-    }
-    out << " {" << endl;
-    indent_up();
-    // TODO(dreiss): When everything else in Thrift is perfect,
-    // do more of these in the initializer list.
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-
-      if (!t->is_base_type()) {
-        t_const_value* cv = (*m_iter)->get_value();
-        if (cv != NULL) {
-          print_const_value(out, (*m_iter)->get_name(), t, cv);
-        }
-      }
-    }
-    scope_down(out);
-  }
-
-  if (tstruct->annotations_.find("final") == tstruct->annotations_.end()) {
-    out << endl << indent() << "virtual ~" << tstruct->get_name() << "() throw();" << endl;
-  }
-
-  // Declare all fields
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << declare_field(*m_iter,
-                                 false,
-                                 (pointers && !(*m_iter)->get_type()->is_xception()),
-                                 !read) << endl;
-  }
-
-  // Add the __isset data member if we need it, using the definition from above
-  if (has_nonrequired_fields && (!pointers || read)) {
-    out << endl << indent() << "_" << tstruct->get_name() << "__isset __isset;" << endl;
-  }
-
-  // Create a setter function for each field
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (pointers) {
-      continue;
-    }
-    if (is_reference((*m_iter))) {
-      out << endl << indent() << "void __set_" << (*m_iter)->get_name() << "(boost::shared_ptr<"
-          << type_name((*m_iter)->get_type(), false, false) << ">";
-      out << " val);" << endl;
-    } else {
-      out << endl << indent() << "void __set_" << (*m_iter)->get_name() << "("
-          << type_name((*m_iter)->get_type(), false, true);
-      out << " val);" << endl;
-    }
-  }
-  out << endl;
-
-  if (!pointers) {
-    // Should we generate default operators?
-    if (!gen_no_default_operators_) {
-      // Generate an equality testing operator.  Make it inline since the compiler
-      // will do a better job than we would when deciding whether to inline it.
-      out << indent() << "bool operator == (const " << tstruct->get_name() << " & "
-          << (members.size() > 0 ? "rhs" : "/* rhs */") << ") const" << endl;
-      scope_up(out);
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        // Most existing Thrift code does not use isset or optional/required,
-        // so we treat "default" fields as required.
-        if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
-          out << indent() << "if (!(" << (*m_iter)->get_name() << " == rhs."
-              << (*m_iter)->get_name() << "))" << endl << indent() << "  return false;" << endl;
-        } else {
-          out << indent() << "if (__isset." << (*m_iter)->get_name() << " != rhs.__isset."
-              << (*m_iter)->get_name() << ")" << endl << indent() << "  return false;" << endl
-              << indent() << "else if (__isset." << (*m_iter)->get_name() << " && !("
-              << (*m_iter)->get_name() << " == rhs." << (*m_iter)->get_name() << "))" << endl
-              << indent() << "  return false;" << endl;
-        }
-      }
-      indent(out) << "return true;" << endl;
-      scope_down(out);
-      out << indent() << "bool operator != (const " << tstruct->get_name() << " &rhs) const {"
-          << endl << indent() << "  return !(*this == rhs);" << endl << indent() << "}" << endl
-          << endl;
-
-      // Generate the declaration of a less-than operator.  This must be
-      // implemented by the application developer if they wish to use it.  (They
-      // will get a link error if they try to use it without an implementation.)
-      out << indent() << "bool operator < (const " << tstruct->get_name() << " & ) const;" << endl
-          << endl;
-    }
-  }
-
-  if (read) {
-    if (gen_templates_) {
-      out << indent() << "template <class Protocol_>" << endl << indent()
-          << "uint32_t read(Protocol_* iprot);" << endl;
-    } else {
-      out << indent() << "uint32_t read("
-          << "::apache::thrift::protocol::TProtocol* iprot);" << endl;
-    }
-  }
-  if (write) {
-    if (gen_templates_) {
-      out << indent() << "template <class Protocol_>" << endl << indent()
-          << "uint32_t write(Protocol_* oprot) const;" << endl;
-    } else {
-      out << indent() << "uint32_t write("
-          << "::apache::thrift::protocol::TProtocol* oprot) const;" << endl;
-    }
-  }
-  out << endl;
-
-  if (is_user_struct) {
-    out << indent() << "virtual ";
-    generate_struct_print_method_decl(out, NULL);
-    out << ";" << endl;
-  }
-
-  // std::exception::what()
-  if (is_exception) {
-    out << indent() << "mutable std::string thriftTExceptionMessageHolder_;" << endl;
-    out << indent();
-    generate_exception_what_method_decl(out, tstruct, false);
-    out << ";" << endl;
-  }
-
-  indent_down();
-  indent(out) << "};" << endl << endl;
-
-  if (swap) {
-    // Generate a namespace-scope swap() function
-    out << indent() << "void swap(" << tstruct->get_name() << " &a, " << tstruct->get_name()
-        << " &b);" << endl << endl;
-  }
-
-  if (is_user_struct) {
-    generate_struct_ostream_operator(out, tstruct);
-  }
-}
-
-void t_cpp_generator::generate_struct_definition(ofstream& out,
-                                                 ofstream& force_cpp_out,
-                                                 t_struct* tstruct,
-                                                 bool setters) {
-  // Get members
-  vector<t_field*>::const_iterator m_iter;
-  const vector<t_field*>& members = tstruct->get_members();
-
-  // Destructor
-  if (tstruct->annotations_.find("final") == tstruct->annotations_.end()) {
-    force_cpp_out << endl << indent() << tstruct->get_name() << "::~" << tstruct->get_name()
-                  << "() throw() {" << endl;
-    indent_up();
-
-    indent_down();
-    force_cpp_out << indent() << "}" << endl << endl;
-  }
-
-  // Create a setter function for each field
-  if (setters) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (is_reference((*m_iter))) {
-        std::string type = type_name((*m_iter)->get_type());
-        out << endl << indent() << "void " << tstruct->get_name() << "::__set_"
-            << (*m_iter)->get_name() << "(boost::shared_ptr<"
-            << type_name((*m_iter)->get_type(), false, false) << ">";
-        out << " val) {" << endl;
-      } else {
-        out << endl << indent() << "void " << tstruct->get_name() << "::__set_"
-            << (*m_iter)->get_name() << "(" << type_name((*m_iter)->get_type(), false, true);
-        out << " val) {" << endl;
-      }
-      indent_up();
-      out << indent() << "this->" << (*m_iter)->get_name() << " = val;" << endl;
-      indent_down();
-
-      // assume all fields are required except optional fields.
-      // for optional fields change __isset.name to true
-      bool is_optional = (*m_iter)->get_req() == t_field::T_OPTIONAL;
-      if (is_optional) {
-        out << indent() << indent() << "__isset." << (*m_iter)->get_name() << " = true;" << endl;
-      }
-      out << indent() << "}" << endl;
-    }
-  }
-  out << endl;
-}
-
-/**
- * Makes a helper function to gen a struct reader.
- *
- * @param out Stream to write to
- * @param tstruct The struct
- */
-void t_cpp_generator::generate_struct_reader(ofstream& out, t_struct* tstruct, bool pointers) {
-  if (gen_templates_) {
-    out << indent() << "template <class Protocol_>" << endl << indent() << "uint32_t "
-        << tstruct->get_name() << "::read(Protocol_* iprot) {" << endl;
-  } else {
-    indent(out) << "uint32_t " << tstruct->get_name()
-                << "::read(::apache::thrift::protocol::TProtocol* iprot) {" << endl;
-  }
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Declare stack tmp variables
-  out << endl
-      << indent() << "apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);" << endl
-      << indent() << "uint32_t xfer = 0;" << endl
-      << indent() << "std::string fname;" << endl
-      << indent() << "::apache::thrift::protocol::TType ftype;" << endl
-      << indent() << "int16_t fid;" << endl
-      << endl
-      << indent() << "xfer += iprot->readStructBegin(fname);" << endl
-      << endl
-      << indent() << "using ::apache::thrift::protocol::TProtocolException;" << endl
-      << endl;
-
-  // Required variables aren't in __isset, so we need tmp vars to check them.
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED)
-      indent(out) << "bool isset_" << (*f_iter)->get_name() << " = false;" << endl;
-  }
-  out << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (true)" << endl;
-  scope_up(out);
-
-  // Read beginning field marker
-  indent(out) << "xfer += iprot->readFieldBegin(fname, ftype, fid);" << endl;
-
-  // Check for field STOP marker
-  out << indent() << "if (ftype == ::apache::thrift::protocol::T_STOP) {" << endl << indent()
-      << "  break;" << endl << indent() << "}" << endl;
-
-  if (fields.empty()) {
-    out << indent() << "xfer += iprot->skip(ftype);" << endl;
-  } else {
-    // Switch statement on the field we are reading
-    indent(out) << "switch (fid)" << endl;
-
-    scope_up(out);
-
-    // Generate deserialization code for known cases
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      indent(out) << "case " << (*f_iter)->get_key() << ":" << endl;
-      indent_up();
-      indent(out) << "if (ftype == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-      indent_up();
-
-      const char* isset_prefix = ((*f_iter)->get_req() != t_field::T_REQUIRED) ? "this->__isset."
-                                                                               : "isset_";
-
-#if 0
-          // This code throws an exception if the same field is encountered twice.
-          // We've decided to leave it out for performance reasons.
-          // TODO(dreiss): Generate this code and "if" it out to make it easier
-          // for people recompiling thrift to include it.
-          out <<
-            indent() << "if (" << isset_prefix << (*f_iter)->get_name() << ")" << endl <<
-            indent() << "  throw TProtocolException(TProtocolException::INVALID_DATA);" << endl;
-#endif
-
-      if (pointers && !(*f_iter)->get_type()->is_xception()) {
-        generate_deserialize_field(out, *f_iter, "(*(this->", "))");
-      } else {
-        generate_deserialize_field(out, *f_iter, "this->");
-      }
-      out << indent() << isset_prefix << (*f_iter)->get_name() << " = true;" << endl;
-      indent_down();
-      out << indent() << "} else {" << endl << indent() << "  xfer += iprot->skip(ftype);" << endl
-          <<
-          // TODO(dreiss): Make this an option when thrift structs
-          // have a common base class.
-          // indent() << "  throw TProtocolException(TProtocolException::INVALID_DATA);" << endl <<
-          indent() << "}" << endl << indent() << "break;" << endl;
-      indent_down();
-    }
-
-    // In the default case we skip the field
-    out << indent() << "default:" << endl << indent() << "  xfer += iprot->skip(ftype);" << endl
-        << indent() << "  break;" << endl;
-
-    scope_down(out);
-  } //!fields.empty()
-  // Read field end marker
-  indent(out) << "xfer += iprot->readFieldEnd();" << endl;
-
-  scope_down(out);
-
-  out << endl << indent() << "xfer += iprot->readStructEnd();" << endl;
-
-  // Throw if any required fields are missing.
-  // We do this after reading the struct end so that
-  // there might possibly be a chance of continuing.
-  out << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED)
-      out << indent() << "if (!isset_" << (*f_iter)->get_name() << ')' << endl << indent()
-          << "  throw TProtocolException(TProtocolException::INVALID_DATA);" << endl;
-  }
-
-  indent(out) << "return xfer;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates the write function.
- *
- * @param out Stream to write to
- * @param tstruct The struct
- */
-void t_cpp_generator::generate_struct_writer(ofstream& out, t_struct* tstruct, bool pointers) {
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  if (gen_templates_) {
-    out << indent() << "template <class Protocol_>" << endl << indent() << "uint32_t "
-        << tstruct->get_name() << "::write(Protocol_* oprot) const {" << endl;
-  } else {
-    indent(out) << "uint32_t " << tstruct->get_name()
-                << "::write(::apache::thrift::protocol::TProtocol* oprot) const {" << endl;
-  }
-  indent_up();
-
-  out << indent() << "uint32_t xfer = 0;" << endl;
-
-  indent(out) << "apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);" << endl;
-  indent(out) << "xfer += oprot->writeStructBegin(\"" << name << "\");" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool check_if_set = (*f_iter)->get_req() == t_field::T_OPTIONAL
-                        || (*f_iter)->get_type()->is_xception();
-    if (check_if_set) {
-      out << endl << indent() << "if (this->__isset." << (*f_iter)->get_name() << ") {" << endl;
-      indent_up();
-    } else {
-      out << endl;
-    }
-
-    // Write field header
-    out << indent() << "xfer += oprot->writeFieldBegin("
-        << "\"" << (*f_iter)->get_name() << "\", " << type_to_enum((*f_iter)->get_type()) << ", "
-        << (*f_iter)->get_key() << ");" << endl;
-    // Write field contents
-    if (pointers && !(*f_iter)->get_type()->is_xception()) {
-      generate_serialize_field(out, *f_iter, "(*(this->", "))");
-    } else {
-      generate_serialize_field(out, *f_iter, "this->");
-    }
-    // Write field closer
-    indent(out) << "xfer += oprot->writeFieldEnd();" << endl;
-    if (check_if_set) {
-      indent_down();
-      indent(out) << '}';
-    }
-  }
-
-  out << endl;
-
-  // Write the struct map
-  out << indent() << "xfer += oprot->writeFieldStop();" << endl << indent()
-      << "xfer += oprot->writeStructEnd();" << endl << indent()
-      << "return xfer;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Struct writer for result of a function, which can have only one of its
- * fields set and does a conditional if else look up into the __isset field
- * of the struct.
- *
- * @param out Output stream
- * @param tstruct The result struct
- */
-void t_cpp_generator::generate_struct_result_writer(ofstream& out,
-                                                    t_struct* tstruct,
-                                                    bool pointers) {
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  if (gen_templates_) {
-    out << indent() << "template <class Protocol_>" << endl << indent() << "uint32_t "
-        << tstruct->get_name() << "::write(Protocol_* oprot) const {" << endl;
-  } else {
-    indent(out) << "uint32_t " << tstruct->get_name()
-                << "::write(::apache::thrift::protocol::TProtocol* oprot) const {" << endl;
-  }
-  indent_up();
-
-  out << endl << indent() << "uint32_t xfer = 0;" << endl << endl;
-
-  indent(out) << "xfer += oprot->writeStructBegin(\"" << name << "\");" << endl;
-
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      out << endl << indent() << "if ";
-    } else {
-      out << " else if ";
-    }
-
-    out << "(this->__isset." << (*f_iter)->get_name() << ") {" << endl;
-
-    indent_up();
-
-    // Write field header
-    out << indent() << "xfer += oprot->writeFieldBegin("
-        << "\"" << (*f_iter)->get_name() << "\", " << type_to_enum((*f_iter)->get_type()) << ", "
-        << (*f_iter)->get_key() << ");" << endl;
-    // Write field contents
-    if (pointers) {
-      generate_serialize_field(out, *f_iter, "(*(this->", "))");
-    } else {
-      generate_serialize_field(out, *f_iter, "this->");
-    }
-    // Write field closer
-    indent(out) << "xfer += oprot->writeFieldEnd();" << endl;
-
-    indent_down();
-    indent(out) << "}";
-  }
-
-  // Write the struct map
-  out << endl << indent() << "xfer += oprot->writeFieldStop();" << endl << indent()
-      << "xfer += oprot->writeStructEnd();" << endl << indent() << "return xfer;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates the swap function.
- *
- * @param out Stream to write to
- * @param tstruct The struct
- */
-void t_cpp_generator::generate_struct_swap(ofstream& out, t_struct* tstruct) {
-  out << indent() << "void swap(" << tstruct->get_name() << " &a, " << tstruct->get_name()
-      << " &b) {" << endl;
-  indent_up();
-
-  // Let argument-dependent name lookup find the correct swap() function to
-  // use based on the argument types.  If none is found in the arguments'
-  // namespaces, fall back to ::std::swap().
-  out << indent() << "using ::std::swap;" << endl;
-
-  bool has_nonrequired_fields = false;
-  const vector<t_field*>& fields = tstruct->get_members();
-  for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* tfield = *f_iter;
-
-    if (tfield->get_req() != t_field::T_REQUIRED) {
-      has_nonrequired_fields = true;
-    }
-
-    out << indent() << "swap(a." << tfield->get_name() << ", b." << tfield->get_name() << ");"
-        << endl;
-  }
-
-  if (has_nonrequired_fields) {
-    out << indent() << "swap(a.__isset, b.__isset);" << endl;
-  }
-
-  // handle empty structs
-  if (fields.size() == 0) {
-    out << indent() << "(void) a;" << endl;
-    out << indent() << "(void) b;" << endl;
-  }
-
-  scope_down(out);
-  out << endl;
-}
-
-void t_cpp_generator::generate_struct_ostream_operator(std::ofstream& out, t_struct* tstruct) {
-  out << "inline std::ostream& operator<<(std::ostream& out, const "
-      << tstruct->get_name()
-      << "& obj)" << endl;
-  scope_up(out);
-  out << indent() << "obj.printTo(out);" << endl
-      << indent() << "return out;" << endl;
-  scope_down(out);
-  out << endl;
-}
-
-void t_cpp_generator::generate_struct_print_method_decl(std::ofstream& out, t_struct* tstruct) {
-  out << "void ";
-  if (tstruct) {
-    out << tstruct->get_name() << "::";
-  }
-  out << "printTo(std::ostream& out) const";
-}
-
-void t_cpp_generator::generate_exception_what_method_decl(std::ofstream& out,
-                                                          t_struct* tstruct,
-                                                          bool external) {
-  out << "const char* ";
-  if (external) {
-    out << tstruct->get_name() << "::";
-  }
-  out << "what() const throw()";
-}
-
-namespace struct_ostream_operator_generator {
-void generate_required_field_value(std::ofstream& out, const t_field* field) {
-  out << " << to_string(" << field->get_name() << ")";
-}
-
-void generate_optional_field_value(std::ofstream& out, const t_field* field) {
-  out << "; (__isset." << field->get_name() << " ? (out";
-  generate_required_field_value(out, field);
-  out << ") : (out << \"<null>\"))";
-}
-
-void generate_field_value(std::ofstream& out, const t_field* field) {
-  if (field->get_req() == t_field::T_OPTIONAL)
-    generate_optional_field_value(out, field);
-  else
-    generate_required_field_value(out, field);
-}
-
-void generate_field_name(std::ofstream& out, const t_field* field) {
-  out << "\"" << field->get_name() << "=\"";
-}
-
-void generate_field(std::ofstream& out, const t_field* field) {
-  generate_field_name(out, field);
-  generate_field_value(out, field);
-}
-
-void generate_fields(std::ofstream& out,
-                     const vector<t_field*>& fields,
-                     const std::string& indent) {
-  const vector<t_field*>::const_iterator beg = fields.begin();
-  const vector<t_field*>::const_iterator end = fields.end();
-
-  for (vector<t_field*>::const_iterator it = beg; it != end; ++it) {
-    out << indent << "out << ";
-
-    if (it != beg) {
-      out << "\", \" << ";
-    }
-
-    generate_field(out, *it);
-    out << ";" << endl;
-  }
-}
-}
-
-/**
- * Generates operator<<
- */
-void t_cpp_generator::generate_struct_print_method(std::ofstream& out, t_struct* tstruct) {
-  out << indent();
-  generate_struct_print_method_decl(out, tstruct);
-  out << " {" << endl;
-
-  indent_up();
-
-  out << indent() << "using ::apache::thrift::to_string;" << endl;
-  out << indent() << "out << \"" << tstruct->get_name() << "(\";" << endl;
-  struct_ostream_operator_generator::generate_fields(out, tstruct->get_members(), indent());
-  out << indent() << "out << \")\";" << endl;
-
-  indent_down();
-  out << "}" << endl << endl;
-}
-
-/**
- * Generates what() method for exceptions
- */
-void t_cpp_generator::generate_exception_what_method(std::ofstream& out, t_struct* tstruct) {
-  out << indent();
-  generate_exception_what_method_decl(out, tstruct, true);
-  out << " {" << endl;
-
-  indent_up();
-  out << indent() << "try {" << endl;
-
-  indent_up();
-  out << indent() << "std::stringstream ss;" << endl;
-  out << indent() << "ss << \"TException - service has thrown: \" << *this;" << endl;
-  out << indent() << "this->thriftTExceptionMessageHolder_ = ss.str();" << endl;
-  out << indent() << "return this->thriftTExceptionMessageHolder_.c_str();" << endl;
-  indent_down();
-
-  out << indent() << "} catch (const std::exception&) {" << endl;
-
-  indent_up();
-  out << indent() << "return \"TException - service has thrown: " << tstruct->get_name() << "\";"
-      << endl;
-  indent_down();
-
-  out << indent() << "}" << endl;
-
-  indent_down();
-  out << "}" << endl << endl;
-}
-
-/**
- * Generates a thrift service. In C++, this comprises an entirely separate
- * header and source file. The header file defines the methods and includes
- * the data types defined in the main header file, and the implementation
- * file contains implementations of the basic printer and default interfaces.
- *
- * @param tservice The service definition
- */
-void t_cpp_generator::generate_service(t_service* tservice) {
-  string svcname = tservice->get_name();
-
-  // Make output files
-  string f_header_name = get_out_dir() + svcname + ".h";
-  f_header_.open(f_header_name.c_str());
-
-  // Print header file includes
-  f_header_ << autogen_comment();
-  f_header_ << "#ifndef " << svcname << "_H" << endl << "#define " << svcname << "_H" << endl
-            << endl;
-  if (gen_cob_style_) {
-    f_header_ << "#include <thrift/transport/TBufferTransports.h>" << endl << // TMemoryBuffer
-        "#include <thrift/cxxfunctional.h>" << endl
-              << "namespace apache { namespace thrift { namespace async {" << endl
-              << "class TAsyncChannel;" << endl << "}}}" << endl;
-  }
-  f_header_ << "#include <thrift/TDispatchProcessor.h>" << endl;
-  if (gen_cob_style_) {
-    f_header_ << "#include <thrift/async/TAsyncDispatchProcessor.h>" << endl;
-  }
-  f_header_ << "#include <thrift/async/TConcurrentClientSyncInfo.h>" << endl;
-  f_header_ << "#include \"" << get_include_prefix(*get_program()) << program_name_ << "_types.h\""
-            << endl;
-
-  t_service* extends_service = tservice->get_extends();
-  if (extends_service != NULL) {
-    f_header_ << "#include \"" << get_include_prefix(*(extends_service->get_program()))
-              << extends_service->get_name() << ".h\"" << endl;
-  }
-
-  f_header_ << endl << ns_open_ << endl << endl;
-
-  f_header_ << "#ifdef _WIN32\n"
-               "  #pragma warning( push )\n"
-               "  #pragma warning (disable : 4250 ) //inheriting methods via dominance \n"
-               "#endif\n\n";
-
-  // Service implementation file includes
-  string f_service_name = get_out_dir() + svcname + ".cpp";
-  f_service_.open(f_service_name.c_str());
-  f_service_ << autogen_comment();
-  f_service_ << "#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl;
-  if (gen_cob_style_) {
-    f_service_ << "#include \"thrift/async/TAsyncChannel.h\"" << endl;
-  }
-  if (gen_templates_) {
-    f_service_ << "#include \"" << get_include_prefix(*get_program()) << svcname << ".tcc\""
-               << endl;
-
-    string f_service_tcc_name = get_out_dir() + svcname + ".tcc";
-    f_service_tcc_.open(f_service_tcc_name.c_str());
-    f_service_tcc_ << autogen_comment();
-    f_service_tcc_ << "#include \"" << get_include_prefix(*get_program()) << svcname << ".h\""
-                   << endl;
-
-    f_service_tcc_ << "#ifndef " << svcname << "_TCC" << endl << "#define " << svcname << "_TCC"
-                   << endl << endl;
-
-    if (gen_cob_style_) {
-      f_service_tcc_ << "#include \"thrift/async/TAsyncChannel.h\"" << endl;
-    }
-  }
-
-  f_service_ << endl << ns_open_ << endl << endl;
-  f_service_tcc_ << endl << ns_open_ << endl << endl;
-
-  // Generate all the components
-  generate_service_interface(tservice, "");
-  generate_service_interface_factory(tservice, "");
-  generate_service_null(tservice, "");
-  generate_service_helpers(tservice);
-  generate_service_client(tservice, "");
-  generate_service_processor(tservice, "");
-  generate_service_multiface(tservice);
-  generate_service_skeleton(tservice);
-  generate_service_client(tservice, "Concurrent");
-
-  // Generate all the cob components
-  if (gen_cob_style_) {
-    generate_service_interface(tservice, "CobCl");
-    generate_service_interface(tservice, "CobSv");
-    generate_service_interface_factory(tservice, "CobSv");
-    generate_service_null(tservice, "CobSv");
-    generate_service_client(tservice, "Cob");
-    generate_service_processor(tservice, "Cob");
-    generate_service_async_skeleton(tservice);
-  }
-
-  f_header_ << "#ifdef _WIN32\n"
-               "  #pragma warning( pop )\n"
-               "#endif\n\n";
-
-  // Close the namespace
-  f_service_ << ns_close_ << endl << endl;
-  f_service_tcc_ << ns_close_ << endl << endl;
-  f_header_ << ns_close_ << endl << endl;
-
-  // TODO(simpkins): Make this a separate option
-  if (gen_templates_) {
-    f_header_ << "#include \"" << get_include_prefix(*get_program()) << svcname << ".tcc\"" << endl
-              << "#include \"" << get_include_prefix(*get_program()) << program_name_
-              << "_types.tcc\"" << endl << endl;
-  }
-
-  f_header_ << "#endif" << endl;
-  f_service_tcc_ << "#endif" << endl;
-
-  // Close the files
-  f_service_tcc_.close();
-  f_service_.close();
-  f_header_.close();
-}
-
-/**
- * Generates helper functions for a service. Basically, this generates types
- * for all the arguments and results to functions.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_cpp_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  std::ofstream& out = (gen_templates_ ? f_service_tcc_ : f_service_);
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    string name_orig = ts->get_name();
-
-    // TODO(dreiss): Why is this stuff not in generate_function_helpers?
-    ts->set_name(tservice->get_name() + "_" + (*f_iter)->get_name() + "_args");
-    generate_struct_declaration(f_header_, ts, false);
-    generate_struct_definition(out, f_service_, ts, false);
-    generate_struct_reader(out, ts);
-    generate_struct_writer(out, ts);
-    ts->set_name(tservice->get_name() + "_" + (*f_iter)->get_name() + "_pargs");
-    generate_struct_declaration(f_header_, ts, false, true, false, true);
-    generate_struct_definition(out, f_service_, ts, false);
-    generate_struct_writer(out, ts, true);
-    ts->set_name(name_orig);
-
-    generate_function_helpers(tservice, *f_iter);
-  }
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_cpp_generator::generate_service_interface(t_service* tservice, string style) {
-
-  string service_if_name = service_name_ + style + "If";
-  if (style == "CobCl") {
-    // Forward declare the client.
-    string client_name = service_name_ + "CobClient";
-    if (gen_templates_) {
-      client_name += "T";
-      service_if_name += "T";
-      indent(f_header_) << "template <class Protocol_>" << endl;
-    }
-    indent(f_header_) << "class " << client_name << ";" << endl << endl;
-  }
-
-  string extends = "";
-  if (tservice->get_extends() != NULL) {
-    extends = " : virtual public " + type_name(tservice->get_extends()) + style + "If";
-    if (style == "CobCl" && gen_templates_) {
-      // TODO(simpkins): If gen_templates_ is enabled, we currently assume all
-      // parent services were also generated with templates enabled.
-      extends += "T<Protocol_>";
-    }
-  }
-
-  if (style == "CobCl" && gen_templates_) {
-    f_header_ << "template <class Protocol_>" << endl;
-  }
-  f_header_ << "class " << service_if_name << extends << " {" << endl << " public:" << endl;
-  indent_up();
-  f_header_ << indent() << "virtual ~" << service_if_name << "() {}" << endl;
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    if ((*f_iter)->has_doc())
-      f_header_ << endl;
-    generate_java_doc(f_header_, *f_iter);
-    f_header_ << indent() << "virtual " << function_signature(*f_iter, style) << " = 0;" << endl;
-  }
-  indent_down();
-  f_header_ << "};" << endl << endl;
-
-  if (style == "CobCl" && gen_templates_) {
-    // generate a backwards-compatible typedef for clients that do not
-    // know about the new template-style code
-    f_header_ << "typedef " << service_if_name << "< ::apache::thrift::protocol::TProtocol> "
-              << service_name_ << style << "If;" << endl << endl;
-  }
-}
-
-/**
- * Generates a service interface factory.
- *
- * @param tservice The service to generate an interface factory for.
- */
-void t_cpp_generator::generate_service_interface_factory(t_service* tservice, string style) {
-  string service_if_name = service_name_ + style + "If";
-
-  // Figure out the name of the upper-most parent class.
-  // Getting everything to work out properly with inheritance is annoying.
-  // Here's what we're doing for now:
-  //
-  // - All handlers implement getHandler(), but subclasses use covariant return
-  //   types to return their specific service interface class type.  We have to
-  //   use raw pointers because of this; shared_ptr<> can't be used for
-  //   covariant return types.
-  //
-  // - Since we're not using shared_ptr<>, we also provide a releaseHandler()
-  //   function that must be called to release a pointer to a handler obtained
-  //   via getHandler().
-  //
-  //   releaseHandler() always accepts a pointer to the upper-most parent class
-  //   type.  This is necessary since the parent versions of releaseHandler()
-  //   may accept any of the parent types, not just the most specific subclass
-  //   type.  Implementations can use dynamic_cast to cast the pointer to the
-  //   subclass type if desired.
-  t_service* base_service = tservice;
-  while (base_service->get_extends() != NULL) {
-    base_service = base_service->get_extends();
-  }
-  string base_if_name = type_name(base_service) + style + "If";
-
-  // Generate the abstract factory class
-  string factory_name = service_if_name + "Factory";
-  string extends;
-  if (tservice->get_extends() != NULL) {
-    extends = " : virtual public " + type_name(tservice->get_extends()) + style + "IfFactory";
-  }
-
-  f_header_ << "class " << factory_name << extends << " {" << endl << " public:" << endl;
-  indent_up();
-  f_header_ << indent() << "typedef " << service_if_name << " Handler;" << endl << endl << indent()
-            << "virtual ~" << factory_name << "() {}" << endl << endl << indent() << "virtual "
-            << service_if_name << "* getHandler("
-            << "const ::apache::thrift::TConnectionInfo& connInfo) = 0;" << endl << indent()
-            << "virtual void releaseHandler(" << base_if_name << "* /* handler */) = 0;" << endl;
-
-  indent_down();
-  f_header_ << "};" << endl << endl;
-
-  // Generate the singleton factory class
-  string singleton_factory_name = service_if_name + "SingletonFactory";
-  f_header_ << "class " << singleton_factory_name << " : virtual public " << factory_name << " {"
-            << endl << " public:" << endl;
-  indent_up();
-  f_header_ << indent() << singleton_factory_name << "(const boost::shared_ptr<" << service_if_name
-            << ">& iface) : iface_(iface) {}" << endl << indent() << "virtual ~"
-            << singleton_factory_name << "() {}" << endl << endl << indent() << "virtual "
-            << service_if_name << "* getHandler("
-            << "const ::apache::thrift::TConnectionInfo&) {" << endl << indent()
-            << "  return iface_.get();" << endl << indent() << "}" << endl << indent()
-            << "virtual void releaseHandler(" << base_if_name << "* /* handler */) {}" << endl;
-
-  f_header_ << endl << " protected:" << endl << indent() << "boost::shared_ptr<" << service_if_name
-            << "> iface_;" << endl;
-
-  indent_down();
-  f_header_ << "};" << endl << endl;
-}
-
-/**
- * Generates a null implementation of the service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_cpp_generator::generate_service_null(t_service* tservice, string style) {
-  string extends = "";
-  if (tservice->get_extends() != NULL) {
-    extends = " , virtual public " + type_name(tservice->get_extends()) + style + "Null";
-  }
-  f_header_ << "class " << service_name_ << style << "Null : virtual public " << service_name_
-            << style << "If" << extends << " {" << endl << " public:" << endl;
-  indent_up();
-  f_header_ << indent() << "virtual ~" << service_name_ << style << "Null() {}" << endl;
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_header_ << indent() << function_signature(*f_iter, style, "", false) << " {" << endl;
-    indent_up();
-
-    t_type* returntype = (*f_iter)->get_returntype();
-    t_field returnfield(returntype, "_return");
-
-    if (style == "") {
-      if (returntype->is_void() || is_complex_type(returntype)) {
-        f_header_ << indent() << "return;" << endl;
-      } else {
-        f_header_ << indent() << declare_field(&returnfield, true) << endl << indent()
-                  << "return _return;" << endl;
-      }
-    } else if (style == "CobSv") {
-      if (returntype->is_void()) {
-        f_header_ << indent() << "return cob();" << endl;
-      } else {
-        t_field returnfield(returntype, "_return");
-        f_header_ << indent() << declare_field(&returnfield, true) << endl << indent()
-                  << "return cob(_return);" << endl;
-      }
-
-    } else {
-      throw "UNKNOWN STYLE";
-    }
-
-    indent_down();
-    f_header_ << indent() << "}" << endl;
-  }
-  indent_down();
-  f_header_ << "};" << endl << endl;
-}
-
-void t_cpp_generator::generate_function_call(ostream& out,
-                                             t_function* tfunction,
-                                             string target,
-                                             string iface,
-                                             string arg_prefix) {
-  bool first = true;
-  t_type* ret_type = get_true_type(tfunction->get_returntype());
-  out << indent();
-  if (!tfunction->is_oneway() && !ret_type->is_void()) {
-    if (is_complex_type(ret_type)) {
-      first = false;
-      out << iface << "->" << tfunction->get_name() << "(" << target;
-    } else {
-      out << target << " = " << iface << "->" << tfunction->get_name() << "(";
-    }
-  } else {
-    out << iface << "->" << tfunction->get_name() << "(";
-  }
-  const std::vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      out << ", ";
-    }
-    out << arg_prefix << (*f_iter)->get_name();
-  }
-  out << ");" << endl;
-}
-
-void t_cpp_generator::generate_service_async_skeleton(t_service* tservice) {
-  string svcname = tservice->get_name();
-
-  // Service implementation file includes
-  string f_skeleton_name = get_out_dir() + svcname + "_async_server.skeleton.cpp";
-
-  string ns = namespace_prefix(tservice->get_program()->get_namespace("cpp"));
-
-  ofstream f_skeleton;
-  f_skeleton.open(f_skeleton_name.c_str());
-  f_skeleton << "// This autogenerated skeleton file illustrates one way to adapt a synchronous"
-             << endl << "// interface into an asynchronous interface. You should copy it to another"
-             << endl
-             << "// filename to avoid overwriting it and rewrite as asynchronous any functions"
-             << endl << "// that would otherwise introduce unwanted latency." << endl << endl
-             << "#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl
-             << "#include <thrift/protocol/TBinaryProtocol.h>" << endl << endl
-             << "using namespace ::apache::thrift;" << endl
-             << "using namespace ::apache::thrift::protocol;" << endl
-             << "using namespace ::apache::thrift::transport;" << endl
-             << "using namespace ::apache::thrift::async;" << endl << endl
-             << "using boost::shared_ptr;" << endl << endl;
-
-  // the following code would not compile:
-  // using namespace ;
-  // using namespace ::;
-  if ((!ns.empty()) && (ns.compare(" ::") != 0)) {
-    f_skeleton << "using namespace " << string(ns, 0, ns.size() - 2) << ";" << endl << endl;
-  }
-
-  f_skeleton << "class " << svcname << "AsyncHandler : "
-             << "public " << svcname << "CobSvIf {" << endl << " public:" << endl;
-  indent_up();
-  f_skeleton << indent() << svcname << "AsyncHandler() {" << endl << indent()
-             << "  syncHandler_ = std::auto_ptr<" << svcname << "Handler>(new " << svcname
-             << "Handler);" << endl << indent() << "  // Your initialization goes here" << endl
-             << indent() << "}" << endl;
-  f_skeleton << indent() << "virtual ~" << service_name_ << "AsyncHandler();" << endl;
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_skeleton << endl << indent() << function_signature(*f_iter, "CobSv", "", true) << " {"
-               << endl;
-    indent_up();
-
-    t_type* returntype = (*f_iter)->get_returntype();
-    t_field returnfield(returntype, "_return");
-
-    string target = returntype->is_void() ? "" : "_return";
-    if (!returntype->is_void()) {
-      f_skeleton << indent() << declare_field(&returnfield, true) << endl;
-    }
-    generate_function_call(f_skeleton, *f_iter, target, "syncHandler_", "");
-    f_skeleton << indent() << "return cob(" << target << ");" << endl;
-
-    scope_down(f_skeleton);
-  }
-  f_skeleton << endl << " protected:" << endl << indent() << "std::auto_ptr<" << svcname
-             << "Handler> syncHandler_;" << endl;
-  indent_down();
-  f_skeleton << "};" << endl << endl;
-}
-
-/**
- * Generates a multiface, which is a single server that just takes a set
- * of objects implementing the interface and calls them all, returning the
- * value of the last one to be called.
- *
- * @param tservice The service to generate a multiserver for.
- */
-void t_cpp_generator::generate_service_multiface(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string extends = "";
-  string extends_multiface = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_multiface = ", public " + extends + "Multiface";
-  }
-
-  string list_type = string("std::vector<boost::shared_ptr<") + service_name_ + "If> >";
-
-  // Generate the header portion
-  f_header_ << "class " << service_name_ << "Multiface : "
-            << "virtual public " << service_name_ << "If" << extends_multiface << " {" << endl
-            << " public:" << endl;
-  indent_up();
-  f_header_ << indent() << service_name_ << "Multiface(" << list_type
-            << "& ifaces) : ifaces_(ifaces) {" << endl;
-  if (!extends.empty()) {
-    f_header_ << indent()
-              << "  std::vector<boost::shared_ptr<" + service_name_ + "If> >::iterator iter;"
-              << endl << indent() << "  for (iter = ifaces.begin(); iter != ifaces.end(); ++iter) {"
-              << endl << indent() << "    " << extends << "Multiface::add(*iter);" << endl
-              << indent() << "  }" << endl;
-  }
-  f_header_ << indent() << "}" << endl << indent() << "virtual ~" << service_name_
-            << "Multiface() {}" << endl;
-  indent_down();
-
-  // Protected data members
-  f_header_ << " protected:" << endl;
-  indent_up();
-  f_header_ << indent() << list_type << " ifaces_;" << endl << indent() << service_name_
-            << "Multiface() {}" << endl << indent() << "void add(boost::shared_ptr<"
-            << service_name_ << "If> iface) {" << endl;
-  if (!extends.empty()) {
-    f_header_ << indent() << "  " << extends << "Multiface::add(iface);" << endl;
-  }
-  f_header_ << indent() << "  ifaces_.push_back(iface);" << endl << indent() << "}" << endl;
-  indent_down();
-
-  f_header_ << indent() << " public:" << endl;
-  indent_up();
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arglist = (*f_iter)->get_arglist();
-    const vector<t_field*>& args = arglist->get_members();
-    vector<t_field*>::const_iterator a_iter;
-
-    string call = string("ifaces_[i]->") + (*f_iter)->get_name() + "(";
-    bool first = true;
-    if (is_complex_type((*f_iter)->get_returntype())) {
-      call += "_return";
-      first = false;
-    }
-    for (a_iter = args.begin(); a_iter != args.end(); ++a_iter) {
-      if (first) {
-        first = false;
-      } else {
-        call += ", ";
-      }
-      call += (*a_iter)->get_name();
-    }
-    call += ")";
-
-    f_header_ << indent() << function_signature(*f_iter, "") << " {" << endl;
-    indent_up();
-    f_header_ << indent() << "size_t sz = ifaces_.size();" << endl << indent() << "size_t i = 0;"
-              << endl << indent() << "for (; i < (sz - 1); ++i) {" << endl;
-    indent_up();
-    f_header_ << indent() << call << ";" << endl;
-    indent_down();
-    f_header_ << indent() << "}" << endl;
-
-    if (!(*f_iter)->get_returntype()->is_void()) {
-      if (is_complex_type((*f_iter)->get_returntype())) {
-        f_header_ << indent() << call << ";" << endl << indent() << "return;" << endl;
-      } else {
-        f_header_ << indent() << "return " << call << ";" << endl;
-      }
-    } else {
-      f_header_ << indent() << call << ";" << endl;
-    }
-
-    indent_down();
-    f_header_ << indent() << "}" << endl << endl;
-  }
-
-  indent_down();
-  f_header_ << indent() << "};" << endl << endl;
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_cpp_generator::generate_service_client(t_service* tservice, string style) {
-  string ifstyle;
-  if (style == "Cob") {
-    ifstyle = "CobCl";
-  }
-
-  std::ofstream& out = (gen_templates_ ? f_service_tcc_ : f_service_);
-  string template_header, template_suffix, short_suffix, protocol_type, _this;
-  string const prot_factory_type = "::apache::thrift::protocol::TProtocolFactory";
-  if (gen_templates_) {
-    template_header = "template <class Protocol_>\n";
-    short_suffix = "T";
-    template_suffix = "T<Protocol_>";
-    protocol_type = "Protocol_";
-    _this = "this->";
-  } else {
-    protocol_type = "::apache::thrift::protocol::TProtocol";
-  }
-  string prot_ptr = "boost::shared_ptr< " + protocol_type + ">";
-  string client_suffix = "Client" + template_suffix;
-  string if_suffix = "If";
-  if (style == "Cob") {
-    if_suffix += template_suffix;
-  }
-
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    // TODO(simpkins): If gen_templates_ is enabled, we currently assume all
-    // parent services were also generated with templates enabled.
-    extends = type_name(tservice->get_extends());
-    extends_client = ", public " + extends + style + client_suffix;
-  }
-
-  // Generate the header portion
-  if (style == "Concurrent") {
-    f_header_ << "// The \'concurrent\' client is a thread safe client that correctly handles\n"
-                 "// out of order responses.  It is slower than the regular client, so should\n"
-                 "// only be used when you need to share a connection among multiple threads\n";
-  }
-  f_header_ << template_header << "class " << service_name_ << style << "Client" << short_suffix
-            << " : "
-            << "virtual public " << service_name_ << ifstyle << if_suffix << extends_client << " {"
-            << endl << " public:" << endl;
-
-  indent_up();
-  if (style != "Cob") {
-    f_header_ << indent() << service_name_ << style << "Client" << short_suffix << "(" << prot_ptr
-              << " prot) ";
-
-    if (extends.empty()) {
-      f_header_ << "{" << endl;
-      f_header_ << indent() << "  setProtocol" << short_suffix << "(prot);" << endl << indent()
-                << "}" << endl;
-    } else {
-      f_header_ << ":" << endl;
-      f_header_ << indent() << "  " << extends << style << client_suffix << "(prot, prot) {}"
-                << endl;
-    }
-
-    f_header_ << indent() << service_name_ << style << "Client" << short_suffix << "(" << prot_ptr
-              << " iprot, " << prot_ptr << " oprot) ";
-    if (extends.empty()) {
-      f_header_ << "{" << endl;
-      f_header_ << indent() << "  setProtocol" << short_suffix << "(iprot,oprot);" << endl
-                << indent() << "}" << endl;
-    } else {
-      f_header_ << ":" << indent() << "  " << extends << style << client_suffix
-                << "(iprot, oprot) {}" << endl;
-    }
-
-    // create the setProtocol methods
-    if (extends.empty()) {
-      f_header_ << " private:" << endl;
-      // 1: one parameter
-      f_header_ << indent() << "void setProtocol" << short_suffix << "(" << prot_ptr << " prot) {"
-                << endl;
-      f_header_ << indent() << "setProtocol" << short_suffix << "(prot,prot);" << endl;
-      f_header_ << indent() << "}" << endl;
-      // 2: two parameter
-      f_header_ << indent() << "void setProtocol" << short_suffix << "(" << prot_ptr << " iprot, "
-                << prot_ptr << " oprot) {" << endl;
-
-      f_header_ << indent() << "  piprot_=iprot;" << endl << indent() << "  poprot_=oprot;" << endl
-                << indent() << "  iprot_ = iprot.get();" << endl << indent()
-                << "  oprot_ = oprot.get();" << endl;
-
-      f_header_ << indent() << "}" << endl;
-      f_header_ << " public:" << endl;
-    }
-
-    // Generate getters for the protocols.
-    // Note that these are not currently templated for simplicity.
-    // TODO(simpkins): should they be templated?
-    f_header_ << indent()
-              << "boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {"
-              << endl << indent() << "  return " << _this << "piprot_;" << endl << indent() << "}"
-              << endl;
-
-    f_header_ << indent()
-              << "boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {"
-              << endl << indent() << "  return " << _this << "poprot_;" << endl << indent() << "}"
-              << endl;
-
-  } else /* if (style == "Cob") */ {
-    f_header_ << indent() << service_name_ << style << "Client" << short_suffix << "("
-              << "boost::shared_ptr< ::apache::thrift::async::TAsyncChannel> channel, "
-              << "::apache::thrift::protocol::TProtocolFactory* protocolFactory) :" << endl;
-    if (extends.empty()) {
-      f_header_ << indent() << "  channel_(channel)," << endl << indent()
-                << "  itrans_(new ::apache::thrift::transport::TMemoryBuffer())," << endl
-                << indent() << "  otrans_(new ::apache::thrift::transport::TMemoryBuffer()),"
-                << endl;
-      if (gen_templates_) {
-        // TProtocolFactory classes return generic TProtocol pointers.
-        // We have to dynamic cast to the Protocol_ type we are expecting.
-        f_header_ << indent() << "  piprot_(boost::dynamic_pointer_cast<Protocol_>("
-                  << "protocolFactory->getProtocol(itrans_)))," << endl << indent()
-                  << "  poprot_(boost::dynamic_pointer_cast<Protocol_>("
-                  << "protocolFactory->getProtocol(otrans_))) {" << endl;
-        // Throw a TException if either dynamic cast failed.
-        f_header_ << indent() << "  if (!piprot_ || !poprot_) {" << endl << indent()
-                  << "    throw ::apache::thrift::TException(\""
-                  << "TProtocolFactory returned unexpected protocol type in " << service_name_
-                  << style << "Client" << short_suffix << " constructor\");" << endl << indent()
-                  << "  }" << endl;
-      } else {
-        f_header_ << indent() << "  piprot_(protocolFactory->getProtocol(itrans_))," << endl
-                  << indent() << "  poprot_(protocolFactory->getProtocol(otrans_)) {" << endl;
-      }
-      f_header_ << indent() << "  iprot_ = piprot_.get();" << endl << indent()
-                << "  oprot_ = poprot_.get();" << endl << indent() << "}" << endl;
-    } else {
-      f_header_ << indent() << "  " << extends << style << client_suffix
-                << "(channel, protocolFactory) {}" << endl;
-    }
-  }
-
-  if (style == "Cob") {
-    f_header_ << indent()
-              << "boost::shared_ptr< ::apache::thrift::async::TAsyncChannel> getChannel() {" << endl
-              << indent() << "  return " << _this << "channel_;" << endl << indent() << "}" << endl;
-    if (!gen_no_client_completion_) {
-      f_header_ << indent() << "virtual void completed__(bool /* success */) {}" << endl;
-    }
-  }
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    indent(f_header_) << function_signature(*f_iter, ifstyle) << ";" << endl;
-    // TODO(dreiss): Use private inheritance to avoid generating thise in cob-style.
-    if (style == "Concurrent" && !(*f_iter)->is_oneway()) {
-      // concurrent clients need to move the seqid from the send function to the
-      // recv function.  Oneway methods don't have a recv function, so we don't need to
-      // move the seqid for them.  Attempting to do so would result in a seqid leak.
-      t_function send_function(g_type_i32, /*returning seqid*/
-                               string("send_") + (*f_iter)->get_name(),
-                               (*f_iter)->get_arglist());
-      indent(f_header_) << function_signature(&send_function, "") << ";" << endl;
-    } else {
-      t_function send_function(g_type_void,
-                               string("send_") + (*f_iter)->get_name(),
-                               (*f_iter)->get_arglist());
-      indent(f_header_) << function_signature(&send_function, "") << ";" << endl;
-    }
-    if (!(*f_iter)->is_oneway()) {
-      if (style == "Concurrent") {
-        t_field seqIdArg(g_type_i32, "seqid");
-        t_struct seqIdArgStruct(program_);
-        seqIdArgStruct.append(&seqIdArg);
-        t_function recv_function((*f_iter)->get_returntype(),
-                                 string("recv_") + (*f_iter)->get_name(),
-                                 &seqIdArgStruct);
-        indent(f_header_) << function_signature(&recv_function, "") << ";" << endl;
-      } else {
-        t_struct noargs(program_);
-        t_function recv_function((*f_iter)->get_returntype(),
-                                 string("recv_") + (*f_iter)->get_name(),
-                                 &noargs);
-        indent(f_header_) << function_signature(&recv_function, "") << ";" << endl;
-      }
-    }
-  }
-  indent_down();
-
-  if (extends.empty()) {
-    f_header_ << " protected:" << endl;
-    indent_up();
-
-    if (style == "Cob") {
-      f_header_ << indent()
-                << "boost::shared_ptr< ::apache::thrift::async::TAsyncChannel> channel_;" << endl
-                << indent()
-                << "boost::shared_ptr< ::apache::thrift::transport::TMemoryBuffer> itrans_;" << endl
-                << indent()
-                << "boost::shared_ptr< ::apache::thrift::transport::TMemoryBuffer> otrans_;"
-                << endl;
-    }
-    f_header_ <<
-      indent() << prot_ptr << " piprot_;" << endl <<
-      indent() << prot_ptr << " poprot_;" << endl <<
-      indent() << protocol_type << "* iprot_;" << endl <<
-      indent() << protocol_type << "* oprot_;" << endl;
-
-    if (style == "Concurrent") {
-      f_header_ <<
-        indent() << "::apache::thrift::async::TConcurrentClientSyncInfo sync_;"<<endl;
-    }
-    indent_down();
-  }
-
-  f_header_ << "};" << endl << endl;
-
-  if (gen_templates_) {
-    // Output a backwards compatibility typedef using
-    // TProtocol as the template parameter.
-    f_header_ << "typedef " << service_name_ << style
-              << "ClientT< ::apache::thrift::protocol::TProtocol> " << service_name_ << style
-              << "Client;" << endl << endl;
-  }
-
-  string scope = service_name_ + style + client_suffix + "::";
-
-  // Generate client method implementations
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string seqIdCapture;
-    string seqIdUse;
-    string seqIdCommaUse;
-    if (style == "Concurrent" && !(*f_iter)->is_oneway()) {
-      seqIdCapture = "int32_t seqid = ";
-      seqIdUse = "seqid";
-      seqIdCommaUse = ", seqid";
-    }
-
-    string funname = (*f_iter)->get_name();
-
-    // Open function
-    if (gen_templates_) {
-      indent(out) << template_header;
-    }
-    indent(out) << function_signature(*f_iter, ifstyle, scope) << endl;
-    scope_up(out);
-    indent(out) << seqIdCapture << "send_" << funname << "(";
-
-    // Get the struct of function call params
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-
-    // Declare the function arguments
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    bool first = true;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        out << ", ";
-      }
-      out << (*fld_iter)->get_name();
-    }
-    out << ");" << endl;
-
-    if (style != "Cob") {
-      if (!(*f_iter)->is_oneway()) {
-        out << indent();
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          if (is_complex_type((*f_iter)->get_returntype())) {
-            out << "recv_" << funname << "(_return" << seqIdCommaUse << ");" << endl;
-          } else {
-            out << "return recv_" << funname << "(" << seqIdUse << ");" << endl;
-          }
-        } else {
-          out << "recv_" << funname << "(" << seqIdUse << ");" << endl;
-        }
-      }
-    } else {
-      if (!(*f_iter)->is_oneway()) {
-        out << indent() << _this << "channel_->sendAndRecvMessage("
-            << "tcxx::bind(cob, this), " << _this << "otrans_.get(), " << _this << "itrans_.get());"
-            << endl;
-      } else {
-        out << indent() << _this << "channel_->sendMessage("
-            << "tcxx::bind(cob, this), " << _this << "otrans_.get());" << endl;
-      }
-    }
-    scope_down(out);
-    out << endl;
-
-    // if (style != "Cob") // TODO(dreiss): Libify the client and don't generate this for cob-style
-    if (true) {
-      t_type* send_func_return_type = g_type_void;
-      if (style == "Concurrent" && !(*f_iter)->is_oneway()) {
-        send_func_return_type = g_type_i32;
-      }
-      // Function for sending
-      t_function send_function(send_func_return_type,
-                               string("send_") + (*f_iter)->get_name(),
-                               (*f_iter)->get_arglist());
-
-      // Open the send function
-      if (gen_templates_) {
-        indent(out) << template_header;
-      }
-      indent(out) << function_signature(&send_function, "", scope) << endl;
-      scope_up(out);
-
-      // Function arguments and results
-      string argsname = tservice->get_name() + "_" + (*f_iter)->get_name() + "_pargs";
-      string resultname = tservice->get_name() + "_" + (*f_iter)->get_name() + "_presult";
-
-      string cseqidVal = "0";
-      if (style == "Concurrent") {
-        if (!(*f_iter)->is_oneway()) {
-          cseqidVal = "this->sync_.generateSeqId()";
-        }
-      }
-      // Serialize the request
-      out <<
-        indent() << "int32_t cseqid = " << cseqidVal << ";" << endl;
-      if(style == "Concurrent") {
-        out <<
-          indent() << "::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);" << endl;
-      }
-      if (style == "Cob") {
-        out <<
-          indent() << _this << "otrans_->resetBuffer();" << endl;
-      }
-      out <<
-        indent() << _this << "oprot_->writeMessageBegin(\"" <<
-        (*f_iter)->get_name() <<
-        "\", ::apache::thrift::protocol::" << ((*f_iter)->is_oneway() ? "T_ONEWAY" : "T_CALL") <<
-        ", cseqid);" << endl << endl <<
-        indent() << argsname << " args;" << endl;
-
-      for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-        out << indent() << "args." << (*fld_iter)->get_name() << " = &" << (*fld_iter)->get_name()
-            << ";" << endl;
-      }
-
-      out << indent() << "args.write(" << _this << "oprot_);" << endl << endl << indent() << _this
-          << "oprot_->writeMessageEnd();" << endl << indent() << _this
-          << "oprot_->getTransport()->writeEnd();" << endl << indent() << _this
-          << "oprot_->getTransport()->flush();" << endl;
-
-      if (style == "Concurrent") {
-        out << endl << indent() << "sentry.commit();" << endl;
-
-        if (!(*f_iter)->is_oneway()) {
-          out << indent() << "return cseqid;" << endl;
-        }
-      }
-      scope_down(out);
-      out << endl;
-
-      // Generate recv function only if not an oneway function
-      if (!(*f_iter)->is_oneway()) {
-        t_struct noargs(program_);
-
-        t_field seqIdArg(g_type_i32, "seqid");
-        t_struct seqIdArgStruct(program_);
-        seqIdArgStruct.append(&seqIdArg);
-
-        t_struct* recv_function_args = &noargs;
-        if (style == "Concurrent") {
-          recv_function_args = &seqIdArgStruct;
-        }
-
-        t_function recv_function((*f_iter)->get_returntype(),
-                                 string("recv_") + (*f_iter)->get_name(),
-                                 recv_function_args);
-        // Open the recv function
-        if (gen_templates_) {
-          indent(out) << template_header;
-        }
-        indent(out) << function_signature(&recv_function, "", scope) << endl;
-        scope_up(out);
-
-        out << endl <<
-          indent() << "int32_t rseqid = 0;" << endl <<
-          indent() << "std::string fname;" << endl <<
-          indent() << "::apache::thrift::protocol::TMessageType mtype;" << endl;
-        if(style == "Concurrent") {
-          out <<
-            endl <<
-            indent() << "// the read mutex gets dropped and reacquired as part of waitForWork()" << endl <<
-            indent() << "// The destructor of this sentry wakes up other clients" << endl <<
-            indent() << "::apache::thrift::async::TConcurrentRecvSentry sentry(&this->sync_, seqid);" << endl;
-        }
-        if (style == "Cob" && !gen_no_client_completion_) {
-          out << indent() << "bool completed = false;" << endl << endl << indent() << "try {";
-          indent_up();
-        }
-        out << endl;
-        if (style == "Concurrent") {
-          out <<
-            indent() << "while(true) {" << endl <<
-            indent() << "  if(!this->sync_.getPending(fname, mtype, rseqid)) {" << endl;
-          indent_up();
-          indent_up();
-        }
-        out <<
-          indent() << _this << "iprot_->readMessageBegin(fname, mtype, rseqid);" << endl;
-        if (style == "Concurrent") {
-          scope_down(out);
-          out << indent() << "if(seqid == rseqid) {" << endl;
-          indent_up();
-        }
-        out <<
-          indent() << "if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {" << endl <<
-          indent() << "  ::apache::thrift::TApplicationException x;" << endl <<
-          indent() << "  x.read(" << _this << "iprot_);" << endl <<
-          indent() << "  " << _this << "iprot_->readMessageEnd();" << endl <<
-          indent() << "  " << _this << "iprot_->getTransport()->readEnd();" << endl;
-        if (style == "Cob" && !gen_no_client_completion_) {
-          out << indent() << "  completed = true;" << endl << indent() << "  completed__(true);"
-              << endl;
-        }
-        if (style == "Concurrent") {
-          out << indent() << "  sentry.commit();" << endl;
-        }
-        out <<
-          indent() << "  throw x;" << endl <<
-          indent() << "}" << endl <<
-          indent() << "if (mtype != ::apache::thrift::protocol::T_REPLY) {" << endl <<
-          indent() << "  " << _this << "iprot_->skip(" << "::apache::thrift::protocol::T_STRUCT);" << endl <<
-          indent() << "  " << _this << "iprot_->readMessageEnd();" << endl <<
-          indent() << "  " << _this << "iprot_->getTransport()->readEnd();" << endl;
-        if (style == "Cob" && !gen_no_client_completion_) {
-          out << indent() << "  completed = true;" << endl << indent() << "  completed__(false);"
-              << endl;
-        }
-        out <<
-          indent() << "}" << endl <<
-          indent() << "if (fname.compare(\"" << (*f_iter)->get_name() << "\") != 0) {" << endl <<
-          indent() << "  " << _this << "iprot_->skip(" << "::apache::thrift::protocol::T_STRUCT);" << endl <<
-          indent() << "  " << _this << "iprot_->readMessageEnd();" << endl <<
-          indent() << "  " << _this << "iprot_->getTransport()->readEnd();" << endl;
-        if (style == "Cob" && !gen_no_client_completion_) {
-          out << indent() << "  completed = true;" << endl << indent() << "  completed__(false);"
-              << endl;
-        }
-        if (style == "Concurrent") {
-          out << endl <<
-            indent() << "  // in a bad state, don't commit" << endl <<
-            indent() << "  using ::apache::thrift::protocol::TProtocolException;" << endl <<
-            indent() << "  throw TProtocolException(TProtocolException::INVALID_DATA);" << endl;
-        }
-        out << indent() << "}" << endl;
-
-        if (!(*f_iter)->get_returntype()->is_void()
-            && !is_complex_type((*f_iter)->get_returntype())) {
-          t_field returnfield((*f_iter)->get_returntype(), "_return");
-          out << indent() << declare_field(&returnfield) << endl;
-        }
-
-        out << indent() << resultname << " result;" << endl;
-
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          out << indent() << "result.success = &_return;" << endl;
-        }
-
-        out << indent() << "result.read(" << _this << "iprot_);" << endl << indent() << _this
-            << "iprot_->readMessageEnd();" << endl << indent() << _this
-            << "iprot_->getTransport()->readEnd();" << endl << endl;
-
-        // Careful, only look for _result if not a void function
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          if (is_complex_type((*f_iter)->get_returntype())) {
-            out <<
-              indent() << "if (result.__isset.success) {" << endl;
-            out <<
-              indent() << "  // _return pointer has now been filled" << endl;
-            if (style == "Cob" && !gen_no_client_completion_) {
-              out << indent() << "  completed = true;" << endl << indent() << "  completed__(true);"
-                  << endl;
-            }
-            if (style == "Concurrent") {
-              out << indent() << "  sentry.commit();" << endl;
-            }
-            out <<
-              indent() << "  return;" << endl <<
-              indent() << "}" << endl;
-          } else {
-            out << indent() << "if (result.__isset.success) {" << endl;
-            if (style == "Cob" && !gen_no_client_completion_) {
-              out << indent() << "  completed = true;" << endl << indent() << "  completed__(true);"
-                  << endl;
-            }
-            if (style == "Concurrent") {
-              out << indent() << "  sentry.commit();" << endl;
-            }
-            out << indent() << "  return _return;" << endl << indent() << "}" << endl;
-          }
-        }
-
-        t_struct* xs = (*f_iter)->get_xceptions();
-        const std::vector<t_field*>& xceptions = xs->get_members();
-        vector<t_field*>::const_iterator x_iter;
-        for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-          out << indent() << "if (result.__isset." << (*x_iter)->get_name() << ") {" << endl;
-          if (style == "Cob" && !gen_no_client_completion_) {
-            out << indent() << "  completed = true;" << endl << indent() << "  completed__(true);"
-                << endl;
-          }
-          if (style == "Concurrent") {
-            out << indent() << "  sentry.commit();" << endl;
-          }
-          out << indent() << "  throw result." << (*x_iter)->get_name() << ";" << endl << indent()
-              << "}" << endl;
-        }
-
-        // We only get here if we are a void function
-        if ((*f_iter)->get_returntype()->is_void()) {
-          if (style == "Cob" && !gen_no_client_completion_) {
-            out << indent() << "completed = true;" << endl << indent() << "completed__(true);"
-                << endl;
-          }
-          if (style == "Concurrent") {
-            out << indent() << "sentry.commit();" << endl;
-          }
-          indent(out) << "return;" << endl;
-        } else {
-          if (style == "Cob" && !gen_no_client_completion_) {
-            out << indent() << "completed = true;" << endl << indent() << "completed__(true);"
-                << endl;
-          }
-          if (style == "Concurrent") {
-            out << indent() << "// in a bad state, don't commit" << endl;
-          }
-          out << indent() << "throw "
-                             "::apache::thrift::TApplicationException(::apache::thrift::"
-                             "TApplicationException::MISSING_RESULT, \"" << (*f_iter)->get_name()
-              << " failed: unknown result\");" << endl;
-        }
-        if (style == "Concurrent") {
-          indent_down();
-          indent_down();
-          out <<
-            indent() << "  }" << endl <<
-            indent() << "  // seqid != rseqid" << endl <<
-            indent() << "  this->sync_.updatePending(fname, mtype, rseqid);" << endl <<
-            endl <<
-            indent() << "  // this will temporarily unlock the readMutex, and let other clients get work done" << endl <<
-            indent() << "  this->sync_.waitForWork(seqid);" << endl <<
-            indent() << "} // end while(true)" << endl;
-        }
-        if (style == "Cob" && !gen_no_client_completion_) {
-          indent_down();
-          out << indent() << "} catch (...) {" << endl << indent() << "  if (!completed) {" << endl
-              << indent() << "    completed__(false);" << endl << indent() << "  }" << endl
-              << indent() << "  throw;" << endl << indent() << "}" << endl;
-        }
-        // Close function
-        scope_down(out);
-        out << endl;
-      }
-    }
-  }
-}
-
-class ProcessorGenerator {
-public:
-  ProcessorGenerator(t_cpp_generator* generator, t_service* service, const string& style);
-
-  void run() {
-    generate_class_definition();
-
-    // Generate the dispatchCall() function
-    generate_dispatch_call(false);
-    if (generator_->gen_templates_) {
-      generate_dispatch_call(true);
-    }
-
-    // Generate all of the process subfunctions
-    generate_process_functions();
-
-    generate_factory();
-  }
-
-  void generate_class_definition();
-  void generate_dispatch_call(bool template_protocol);
-  void generate_process_functions();
-  void generate_factory();
-
-protected:
-  std::string type_name(t_type* ttype, bool in_typedef = false, bool arg = false) {
-    return generator_->type_name(ttype, in_typedef, arg);
-  }
-
-  std::string indent() { return generator_->indent(); }
-  std::ostream& indent(std::ostream& os) { return generator_->indent(os); }
-
-  void indent_up() { generator_->indent_up(); }
-  void indent_down() { generator_->indent_down(); }
-
-  t_cpp_generator* generator_;
-  t_service* service_;
-  std::ofstream& f_header_;
-  std::ofstream& f_out_;
-  string service_name_;
-  string style_;
-  string pstyle_;
-  string class_name_;
-  string if_name_;
-  string factory_class_name_;
-  string finish_cob_;
-  string finish_cob_decl_;
-  string ret_type_;
-  string call_context_;
-  string cob_arg_;
-  string call_context_arg_;
-  string call_context_decl_;
-  string template_header_;
-  string template_suffix_;
-  string typename_str_;
-  string class_suffix_;
-  string extends_;
-};
-
-ProcessorGenerator::ProcessorGenerator(t_cpp_generator* generator,
-                                       t_service* service,
-                                       const string& style)
-  : generator_(generator),
-    service_(service),
-    f_header_(generator->f_header_),
-    f_out_(generator->gen_templates_ ? generator->f_service_tcc_ : generator->f_service_),
-    service_name_(generator->service_name_),
-    style_(style) {
-  if (style_ == "Cob") {
-    pstyle_ = "Async";
-    class_name_ = service_name_ + pstyle_ + "Processor";
-    if_name_ = service_name_ + "CobSvIf";
-
-    finish_cob_ = "tcxx::function<void(bool ok)> cob, ";
-    finish_cob_decl_ = "tcxx::function<void(bool ok)>, ";
-    cob_arg_ = "cob, ";
-    ret_type_ = "void ";
-  } else {
-    class_name_ = service_name_ + "Processor";
-    if_name_ = service_name_ + "If";
-
-    ret_type_ = "bool ";
-    // TODO(edhall) callContext should eventually be added to TAsyncProcessor
-    call_context_ = ", void* callContext";
-    call_context_arg_ = ", callContext";
-    call_context_decl_ = ", void*";
-  }
-
-  factory_class_name_ = class_name_ + "Factory";
-
-  if (generator->gen_templates_) {
-    template_header_ = "template <class Protocol_>\n";
-    template_suffix_ = "<Protocol_>";
-    typename_str_ = "typename ";
-    class_name_ += "T";
-    factory_class_name_ += "T";
-  }
-
-  if (service_->get_extends() != NULL) {
-    extends_ = type_name(service_->get_extends()) + pstyle_ + "Processor";
-    if (generator_->gen_templates_) {
-      // TODO(simpkins): If gen_templates_ is enabled, we currently assume all
-      // parent services were also generated with templates enabled.
-      extends_ += "T<Protocol_>";
-    }
-  }
-}
-
-void ProcessorGenerator::generate_class_definition() {
-  // Generate the dispatch methods
-  vector<t_function*> functions = service_->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string parent_class;
-  if (service_->get_extends() != NULL) {
-    parent_class = extends_;
-  } else {
-    if (style_ == "Cob") {
-      parent_class = "::apache::thrift::async::TAsyncDispatchProcessor";
-    } else {
-      parent_class = "::apache::thrift::TDispatchProcessor";
-    }
-
-    if (generator_->gen_templates_) {
-      parent_class += "T<Protocol_>";
-    }
-  }
-
-  // Generate the header portion
-  f_header_ << template_header_ << "class " << class_name_ << " : public " << parent_class << " {"
-            << endl;
-
-  // Protected data members
-  f_header_ << " protected:" << endl;
-  indent_up();
-  f_header_ << indent() << "boost::shared_ptr<" << if_name_ << "> iface_;" << endl;
-  f_header_ << indent() << "virtual " << ret_type_ << "dispatchCall(" << finish_cob_
-            << "::apache::thrift::protocol::TProtocol* iprot, "
-            << "::apache::thrift::protocol::TProtocol* oprot, "
-            << "const std::string& fname, int32_t seqid" << call_context_ << ");" << endl;
-  if (generator_->gen_templates_) {
-    f_header_ << indent() << "virtual " << ret_type_ << "dispatchCallTemplated(" << finish_cob_
-              << "Protocol_* iprot, Protocol_* oprot, "
-              << "const std::string& fname, int32_t seqid" << call_context_ << ");" << endl;
-  }
-  indent_down();
-
-  // Process function declarations
-  f_header_ << " private:" << endl;
-  indent_up();
-
-  // Declare processMap_
-  f_header_ << indent() << "typedef  void (" << class_name_ << "::*"
-            << "ProcessFunction)(" << finish_cob_decl_ << "int32_t, "
-            << "::apache::thrift::protocol::TProtocol*, "
-            << "::apache::thrift::protocol::TProtocol*" << call_context_decl_ << ");" << endl;
-  if (generator_->gen_templates_) {
-    f_header_ << indent() << "typedef void (" << class_name_ << "::*"
-              << "SpecializedProcessFunction)(" << finish_cob_decl_ << "int32_t, "
-              << "Protocol_*, Protocol_*" << call_context_decl_ << ");" << endl << indent()
-              << "struct ProcessFunctions {" << endl << indent() << "  ProcessFunction generic;"
-              << endl << indent() << "  SpecializedProcessFunction specialized;" << endl << indent()
-              << "  ProcessFunctions(ProcessFunction g, "
-              << "SpecializedProcessFunction s) :" << endl << indent() << "    generic(g)," << endl
-              << indent() << "    specialized(s) {}" << endl << indent()
-              << "  ProcessFunctions() : generic(NULL), specialized(NULL) "
-              << "{}" << endl << indent() << "};" << endl << indent()
-              << "typedef std::map<std::string, ProcessFunctions> "
-              << "ProcessMap;" << endl;
-  } else {
-    f_header_ << indent() << "typedef std::map<std::string, ProcessFunction> "
-              << "ProcessMap;" << endl;
-  }
-  f_header_ << indent() << "ProcessMap processMap_;" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    indent(f_header_) << "void process_" << (*f_iter)->get_name() << "(" << finish_cob_
-                      << "int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, "
-                         "::apache::thrift::protocol::TProtocol* oprot" << call_context_ << ");"
-                      << endl;
-    if (generator_->gen_templates_) {
-      indent(f_header_) << "void process_" << (*f_iter)->get_name() << "(" << finish_cob_
-                        << "int32_t seqid, Protocol_* iprot, Protocol_* oprot" << call_context_
-                        << ");" << endl;
-    }
-    if (style_ == "Cob") {
-      // XXX Factor this out, even if it is a pain.
-      string ret_arg = ((*f_iter)->get_returntype()->is_void()
-                            ? ""
-                            : ", const " + type_name((*f_iter)->get_returntype()) + "& _return");
-      f_header_ << indent() << "void return_" << (*f_iter)->get_name()
-                << "(tcxx::function<void(bool ok)> cob, int32_t seqid, "
-                << "::apache::thrift::protocol::TProtocol* oprot, "
-                << "void* ctx" << ret_arg << ");" << endl;
-      if (generator_->gen_templates_) {
-        f_header_ << indent() << "void return_" << (*f_iter)->get_name()
-                  << "(tcxx::function<void(bool ok)> cob, int32_t seqid, "
-                  << "Protocol_* oprot, void* ctx" << ret_arg << ");" << endl;
-      }
-      // XXX Don't declare throw if it doesn't exist
-      f_header_ << indent() << "void throw_" << (*f_iter)->get_name()
-                << "(tcxx::function<void(bool ok)> cob, int32_t seqid, "
-                << "::apache::thrift::protocol::TProtocol* oprot, void* ctx, "
-                << "::apache::thrift::TDelayedException* _throw);" << endl;
-      if (generator_->gen_templates_) {
-        f_header_ << indent() << "void throw_" << (*f_iter)->get_name()
-                  << "(tcxx::function<void(bool ok)> cob, int32_t seqid, "
-                  << "Protocol_* oprot, void* ctx, "
-                  << "::apache::thrift::TDelayedException* _throw);" << endl;
-      }
-    }
-  }
-
-  f_header_ << " public:" << endl << indent() << class_name_ << "(boost::shared_ptr<" << if_name_
-            << "> iface) :" << endl;
-  if (!extends_.empty()) {
-    f_header_ << indent() << "  " << extends_ << "(iface)," << endl;
-  }
-  f_header_ << indent() << "  iface_(iface) {" << endl;
-  indent_up();
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_header_ << indent() << "processMap_[\"" << (*f_iter)->get_name() << "\"] = ";
-    if (generator_->gen_templates_) {
-      f_header_ << "ProcessFunctions(" << endl;
-      if (generator_->gen_templates_only_) {
-        indent(f_header_) << "  NULL," << endl;
-      } else {
-        indent(f_header_) << "  &" << class_name_ << "::process_" << (*f_iter)->get_name() << ","
-                          << endl;
-      }
-      indent(f_header_) << "  &" << class_name_ << "::process_" << (*f_iter)->get_name() << ")";
-    } else {
-      f_header_ << "&" << class_name_ << "::process_" << (*f_iter)->get_name();
-    }
-    f_header_ << ";" << endl;
-  }
-
-  indent_down();
-  f_header_ << indent() << "}" << endl << endl << indent() << "virtual ~" << class_name_ << "() {}"
-            << endl;
-  indent_down();
-  f_header_ << "};" << endl << endl;
-
-  if (generator_->gen_templates_) {
-    // Generate a backwards compatible typedef, for callers who don't know
-    // about the new template-style code.
-    //
-    // We can't use TProtocol as the template parameter, since ProcessorT
-    // provides overloaded versions of most methods, one of which accepts
-    // TProtocol pointers, and one which accepts Protocol_ pointers.  This
-    // results in a compile error if instantiated with Protocol_ == TProtocol.
-    // Therefore, we define TDummyProtocol solely so we can use it as the
-    // template parameter here.
-    f_header_ << "typedef " << class_name_ << "< ::apache::thrift::protocol::TDummyProtocol > "
-              << service_name_ << pstyle_ << "Processor;" << endl << endl;
-  }
-}
-
-void ProcessorGenerator::generate_dispatch_call(bool template_protocol) {
-  string protocol = "::apache::thrift::protocol::TProtocol";
-  string function_suffix;
-  if (template_protocol) {
-    protocol = "Protocol_";
-    // We call the generic version dispatchCall(), and the specialized
-    // version dispatchCallTemplated().  We can't call them both
-    // dispatchCall(), since this will cause the compiler to issue a warning if
-    // a service that doesn't use templates inherits from a service that does
-    // use templates: the compiler complains that the subclass only implements
-    // the generic version of dispatchCall(), and hides the templated version.
-    // Using different names for the two functions prevents this.
-    function_suffix = "Templated";
-  }
-
-  f_out_ << template_header_ << ret_type_ << class_name_ << template_suffix_ << "::dispatchCall"
-         << function_suffix << "(" << finish_cob_ << protocol << "* iprot, " << protocol
-         << "* oprot, "
-         << "const std::string& fname, int32_t seqid" << call_context_ << ") {" << endl;
-  indent_up();
-
-  // HOT: member function pointer map
-  f_out_ << indent() << typename_str_ << "ProcessMap::iterator pfn;" << endl << indent()
-         << "pfn = processMap_.find(fname);" << endl << indent()
-         << "if (pfn == processMap_.end()) {" << endl;
-  if (extends_.empty()) {
-    f_out_ << indent() << "  iprot->skip(::apache::thrift::protocol::T_STRUCT);" << endl << indent()
-           << "  iprot->readMessageEnd();" << endl << indent()
-           << "  iprot->getTransport()->readEnd();" << endl << indent()
-           << "  ::apache::thrift::TApplicationException "
-              "x(::apache::thrift::TApplicationException::UNKNOWN_METHOD, \"Invalid method name: "
-              "'\"+fname+\"'\");" << endl << indent()
-           << "  oprot->writeMessageBegin(fname, ::apache::thrift::protocol::T_EXCEPTION, seqid);"
-           << endl << indent() << "  x.write(oprot);" << endl << indent()
-           << "  oprot->writeMessageEnd();" << endl << indent()
-           << "  oprot->getTransport()->writeEnd();" << endl << indent()
-           << "  oprot->getTransport()->flush();" << endl << indent()
-           << (style_ == "Cob" ? "  return cob(true);" : "  return true;") << endl;
-  } else {
-    f_out_ << indent() << "  return " << extends_ << "::dispatchCall("
-           << (style_ == "Cob" ? "cob, " : "") << "iprot, oprot, fname, seqid" << call_context_arg_
-           << ");" << endl;
-  }
-  f_out_ << indent() << "}" << endl;
-  if (template_protocol) {
-    f_out_ << indent() << "(this->*(pfn->second.specialized))";
-  } else {
-    if (generator_->gen_templates_only_) {
-      // TODO: This is a null pointer, so nothing good will come from calling
-      // it.  Throw an exception instead.
-      f_out_ << indent() << "(this->*(pfn->second.generic))";
-    } else if (generator_->gen_templates_) {
-      f_out_ << indent() << "(this->*(pfn->second.generic))";
-    } else {
-      f_out_ << indent() << "(this->*(pfn->second))";
-    }
-  }
-  f_out_ << "(" << cob_arg_ << "seqid, iprot, oprot" << call_context_arg_ << ");" << endl;
-
-  // TODO(dreiss): return pfn ret?
-  if (style_ == "Cob") {
-    f_out_ << indent() << "return;" << endl;
-  } else {
-    f_out_ << indent() << "return true;" << endl;
-  }
-
-  indent_down();
-  f_out_ << "}" << endl << endl;
-}
-
-void ProcessorGenerator::generate_process_functions() {
-  vector<t_function*> functions = service_->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    if (generator_->gen_templates_) {
-      generator_->generate_process_function(service_, *f_iter, style_, false);
-      generator_->generate_process_function(service_, *f_iter, style_, true);
-    } else {
-      generator_->generate_process_function(service_, *f_iter, style_, false);
-    }
-  }
-}
-
-void ProcessorGenerator::generate_factory() {
-  string if_factory_name = if_name_ + "Factory";
-
-  // Generate the factory class definition
-  f_header_ << template_header_ << "class " << factory_class_name_ << " : public ::apache::thrift::"
-            << (style_ == "Cob" ? "async::TAsyncProcessorFactory" : "TProcessorFactory") << " {"
-            << endl << " public:" << endl;
-  indent_up();
-
-  f_header_ << indent() << factory_class_name_ << "(const ::boost::shared_ptr< " << if_factory_name
-            << " >& handlerFactory) :" << endl << indent()
-            << "    handlerFactory_(handlerFactory) {}" << endl << endl << indent()
-            << "::boost::shared_ptr< ::apache::thrift::"
-            << (style_ == "Cob" ? "async::TAsyncProcessor" : "TProcessor") << " > "
-            << "getProcessor(const ::apache::thrift::TConnectionInfo& connInfo);" << endl;
-
-  f_header_ << endl << " protected:" << endl << indent() << "::boost::shared_ptr< "
-            << if_factory_name << " > handlerFactory_;" << endl;
-
-  indent_down();
-  f_header_ << "};" << endl << endl;
-
-  // If we are generating templates, output a typedef for the plain
-  // factory name.
-  if (generator_->gen_templates_) {
-    f_header_ << "typedef " << factory_class_name_
-              << "< ::apache::thrift::protocol::TDummyProtocol > " << service_name_ << pstyle_
-              << "ProcessorFactory;" << endl << endl;
-  }
-
-  // Generate the getProcessor() method
-  f_out_ << template_header_ << indent() << "::boost::shared_ptr< ::apache::thrift::"
-         << (style_ == "Cob" ? "async::TAsyncProcessor" : "TProcessor") << " > "
-         << factory_class_name_ << template_suffix_ << "::getProcessor("
-         << "const ::apache::thrift::TConnectionInfo& connInfo) {" << endl;
-  indent_up();
-
-  f_out_ << indent() << "::apache::thrift::ReleaseHandler< " << if_factory_name
-         << " > cleanup(handlerFactory_);" << endl << indent() << "::boost::shared_ptr< "
-         << if_name_ << " > handler("
-         << "handlerFactory_->getHandler(connInfo), cleanup);" << endl << indent()
-         << "::boost::shared_ptr< ::apache::thrift::"
-         << (style_ == "Cob" ? "async::TAsyncProcessor" : "TProcessor") << " > "
-         << "processor(new " << class_name_ << template_suffix_ << "(handler));" << endl << indent()
-         << "return processor;" << endl;
-
-  indent_down();
-  f_out_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a service processor definition.
- *
- * @param tservice The service to generate a processor for.
- */
-void t_cpp_generator::generate_service_processor(t_service* tservice, string style) {
-  ProcessorGenerator generator(this, tservice, style);
-  generator.run();
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_cpp_generator::generate_function_helpers(t_service* tservice, t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  std::ofstream& out = (gen_templates_ ? f_service_tcc_ : f_service_);
-
-  t_struct result(program_, tservice->get_name() + "_" + tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_struct_declaration(f_header_, &result, false);
-  generate_struct_definition(out, f_service_, &result, false);
-  generate_struct_reader(out, &result);
-  generate_struct_result_writer(out, &result);
-
-  result.set_name(tservice->get_name() + "_" + tfunction->get_name() + "_presult");
-  generate_struct_declaration(f_header_, &result, false, true, true, gen_cob_style_);
-  generate_struct_definition(out, f_service_, &result, false);
-  generate_struct_reader(out, &result, true);
-  if (gen_cob_style_) {
-    generate_struct_writer(out, &result, true);
-  }
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_cpp_generator::generate_process_function(t_service* tservice,
-                                                t_function* tfunction,
-                                                string style,
-                                                bool specialized) {
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-  string service_func_name = "\"" + tservice->get_name() + "." + tfunction->get_name() + "\"";
-
-  std::ofstream& out = (gen_templates_ ? f_service_tcc_ : f_service_);
-
-  string prot_type = (specialized ? "Protocol_" : "::apache::thrift::protocol::TProtocol");
-  string class_suffix;
-  if (gen_templates_) {
-    class_suffix = "T<Protocol_>";
-  }
-
-  // I tried to do this as one function.  I really did.  But it was too hard.
-  if (style != "Cob") {
-    // Open function
-    if (gen_templates_) {
-      out << indent() << "template <class Protocol_>" << endl;
-    }
-    const bool unnamed_oprot_seqid = tfunction->is_oneway() && !(gen_templates_ && !specialized);
-    out << "void " << tservice->get_name() << "Processor" << class_suffix << "::"
-        << "process_" << tfunction->get_name() << "("
-        << "int32_t" << (unnamed_oprot_seqid ? ", " : " seqid, ") << prot_type << "* iprot, "
-        << prot_type << "*" << (unnamed_oprot_seqid ? ", " : " oprot, ") << "void* callContext)"
-        << endl;
-    scope_up(out);
-
-    string argsname = tservice->get_name() + "_" + tfunction->get_name() + "_args";
-    string resultname = tservice->get_name() + "_" + tfunction->get_name() + "_result";
-
-    if (tfunction->is_oneway() && !unnamed_oprot_seqid) {
-      out << indent() << "(void) seqid;" << endl << indent() << "(void) oprot;" << endl;
-    }
-
-    out << indent() << "void* ctx = NULL;" << endl << indent()
-        << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  ctx = this->eventHandler_->getContext(" << service_func_name << ", callContext);"
-        << endl << indent() << "}" << endl << indent()
-        << "::apache::thrift::TProcessorContextFreer freer("
-        << "this->eventHandler_.get(), ctx, " << service_func_name << ");" << endl << endl
-        << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  this->eventHandler_->preRead(ctx, " << service_func_name << ");" << endl << indent()
-        << "}" << endl << endl << indent() << argsname << " args;" << endl << indent()
-        << "args.read(iprot);" << endl << indent() << "iprot->readMessageEnd();" << endl << indent()
-        << "uint32_t bytes = iprot->getTransport()->readEnd();" << endl << endl << indent()
-        << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  this->eventHandler_->postRead(ctx, " << service_func_name << ", bytes);" << endl
-        << indent() << "}" << endl << endl;
-
-    // Declare result
-    if (!tfunction->is_oneway()) {
-      out << indent() << resultname << " result;" << endl;
-    }
-
-    // Try block for functions with exceptions
-    out << indent() << "try {" << endl;
-    indent_up();
-
-    // Generate the function call
-    bool first = true;
-    out << indent();
-    if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-      if (is_complex_type(tfunction->get_returntype())) {
-        first = false;
-        out << "iface_->" << tfunction->get_name() << "(result.success";
-      } else {
-        out << "result.success = iface_->" << tfunction->get_name() << "(";
-      }
-    } else {
-      out << "iface_->" << tfunction->get_name() << "(";
-    }
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        out << ", ";
-      }
-      out << "args." << (*f_iter)->get_name();
-    }
-    out << ");" << endl;
-
-    // Set isset on success field
-    if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-      out << indent() << "result.__isset.success = true;" << endl;
-    }
-
-    indent_down();
-    out << indent() << "}";
-
-    if (!tfunction->is_oneway()) {
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        out << " catch (" << type_name((*x_iter)->get_type()) << " &" << (*x_iter)->get_name()
-            << ") {" << endl;
-        if (!tfunction->is_oneway()) {
-          indent_up();
-          out << indent() << "result." << (*x_iter)->get_name() << " = " << (*x_iter)->get_name()
-              << ";" << endl << indent() << "result.__isset." << (*x_iter)->get_name() << " = true;"
-              << endl;
-          indent_down();
-          out << indent() << "}";
-        } else {
-          out << "}";
-        }
-      }
-    }
-
-    if (!tfunction->is_oneway()) {
-      out << " catch (const std::exception& e) {" << endl;
-    } else {
-      out << " catch (const std::exception&) {" << endl;
-    }
-
-    indent_up();
-    out << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  this->eventHandler_->handlerError(ctx, " << service_func_name << ");" << endl
-        << indent() << "}" << endl;
-
-    if (!tfunction->is_oneway()) {
-      out << endl << indent() << "::apache::thrift::TApplicationException x(e.what());" << endl
-          << indent() << "oprot->writeMessageBegin(\"" << tfunction->get_name()
-          << "\", ::apache::thrift::protocol::T_EXCEPTION, seqid);" << endl << indent()
-          << "x.write(oprot);" << endl << indent() << "oprot->writeMessageEnd();" << endl
-          << indent() << "oprot->getTransport()->writeEnd();" << endl << indent()
-          << "oprot->getTransport()->flush();" << endl;
-    }
-    out << indent() << "return;" << endl;
-    indent_down();
-    out << indent() << "}" << endl << endl;
-
-    // Shortcut out here for oneway functions
-    if (tfunction->is_oneway()) {
-      out << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  this->eventHandler_->asyncComplete(ctx, " << service_func_name << ");" << endl
-          << indent() << "}" << endl << endl << indent() << "return;" << endl;
-      indent_down();
-      out << "}" << endl << endl;
-      return;
-    }
-
-    // Serialize the result into a struct
-    out << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  this->eventHandler_->preWrite(ctx, " << service_func_name << ");" << endl << indent()
-        << "}" << endl << endl << indent() << "oprot->writeMessageBegin(\"" << tfunction->get_name()
-        << "\", ::apache::thrift::protocol::T_REPLY, seqid);" << endl << indent()
-        << "result.write(oprot);" << endl << indent() << "oprot->writeMessageEnd();" << endl
-        << indent() << "bytes = oprot->getTransport()->writeEnd();" << endl << indent()
-        << "oprot->getTransport()->flush();" << endl << endl << indent()
-        << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  this->eventHandler_->postWrite(ctx, " << service_func_name << ", bytes);" << endl
-        << indent() << "}" << endl;
-
-    // Close function
-    scope_down(out);
-    out << endl;
-  }
-
-  // Cob style.
-  else {
-    // Processor entry point.
-    // TODO(edhall) update for callContext when TEventServer is ready
-    if (gen_templates_) {
-      out << indent() << "template <class Protocol_>" << endl;
-    }
-    out << "void " << tservice->get_name() << "AsyncProcessor" << class_suffix << "::process_"
-        << tfunction->get_name() << "(tcxx::function<void(bool ok)> cob, int32_t seqid, "
-        << prot_type << "* iprot, " << prot_type << "* oprot)" << endl;
-    scope_up(out);
-
-    // TODO(simpkins): we could try to consoldate this
-    // with the non-cob code above
-    if (gen_templates_ && !specialized) {
-      // If these are instances of Protocol_, instead of any old TProtocol,
-      // use the specialized process function instead.
-      out << indent() << "Protocol_* _iprot = dynamic_cast<Protocol_*>(iprot);" << endl << indent()
-          << "Protocol_* _oprot = dynamic_cast<Protocol_*>(oprot);" << endl << indent()
-          << "if (_iprot && _oprot) {" << endl << indent() << "  return process_"
-          << tfunction->get_name() << "(cob, seqid, _iprot, _oprot);" << endl << indent() << "}"
-          << endl << indent() << "T_GENERIC_PROTOCOL(this, iprot, _iprot);" << endl << indent()
-          << "T_GENERIC_PROTOCOL(this, oprot, _oprot);" << endl << endl;
-    }
-
-    if (tfunction->is_oneway()) {
-      out << indent() << "(void) seqid;" << endl << indent() << "(void) oprot;" << endl;
-    }
-
-    out << indent() << tservice->get_name() + "_" + tfunction->get_name() << "_args args;" << endl
-        << indent() << "void* ctx = NULL;" << endl << indent()
-        << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  ctx = this->eventHandler_->getContext(" << service_func_name << ", NULL);" << endl
-        << indent() << "}" << endl << indent() << "::apache::thrift::TProcessorContextFreer freer("
-        << "this->eventHandler_.get(), ctx, " << service_func_name << ");" << endl << endl
-        << indent() << "try {" << endl;
-    indent_up();
-    out << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  this->eventHandler_->preRead(ctx, " << service_func_name << ");" << endl << indent()
-        << "}" << endl << indent() << "args.read(iprot);" << endl << indent()
-        << "iprot->readMessageEnd();" << endl << indent()
-        << "uint32_t bytes = iprot->getTransport()->readEnd();" << endl << indent()
-        << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "  this->eventHandler_->postRead(ctx, " << service_func_name << ", bytes);" << endl
-        << indent() << "}" << endl;
-    scope_down(out);
-
-    // TODO(dreiss): Handle TExceptions?  Expose to server?
-    out << indent() << "catch (const std::exception&) {" << endl << indent()
-        << "  if (this->eventHandler_.get() != NULL) {" << endl << indent()
-        << "    this->eventHandler_->handlerError(ctx, " << service_func_name << ");" << endl
-        << indent() << "  }" << endl << indent() << "  return cob(false);" << endl << indent()
-        << "}" << endl;
-
-    if (tfunction->is_oneway()) {
-      out << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  this->eventHandler_->asyncComplete(ctx, " << service_func_name << ");" << endl
-          << indent() << "}" << endl;
-    }
-    // TODO(dreiss): Figure out a strategy for exceptions in async handlers.
-    out << indent() << "freer.unregister();" << endl;
-    if (tfunction->is_oneway()) {
-      // No return.  Just hand off our cob.
-      // TODO(dreiss): Call the cob immediately?
-      out << indent() << "iface_->" << tfunction->get_name() << "("
-          << "tcxx::bind(cob, true)" << endl;
-      indent_up();
-      indent_up();
-    } else {
-      string ret_arg, ret_placeholder;
-      if (!tfunction->get_returntype()->is_void()) {
-        ret_arg = ", const " + type_name(tfunction->get_returntype()) + "& _return";
-        ret_placeholder = ", tcxx::placeholders::_1";
-      }
-
-      // When gen_templates_ is true, the return_ and throw_ functions are
-      // overloaded.  We have to declare pointers to them so that the compiler
-      // can resolve the correct overloaded version.
-      out << indent() << "void (" << tservice->get_name() << "AsyncProcessor" << class_suffix
-          << "::*return_fn)(tcxx::function<void(bool ok)> "
-          << "cob, int32_t seqid, " << prot_type << "* oprot, void* ctx" << ret_arg
-          << ") =" << endl;
-      out << indent() << "  &" << tservice->get_name() << "AsyncProcessor" << class_suffix
-          << "::return_" << tfunction->get_name() << ";" << endl;
-      if (!xceptions.empty()) {
-        out << indent() << "void (" << tservice->get_name() << "AsyncProcessor" << class_suffix
-            << "::*throw_fn)(tcxx::function<void(bool ok)> "
-            << "cob, int32_t seqid, " << prot_type << "* oprot, void* ctx, "
-            << "::apache::thrift::TDelayedException* _throw) =" << endl;
-        out << indent() << "  &" << tservice->get_name() << "AsyncProcessor" << class_suffix
-            << "::throw_" << tfunction->get_name() << ";" << endl;
-      }
-
-      out << indent() << "iface_->" << tfunction->get_name() << "(" << endl;
-      indent_up();
-      indent_up();
-      out << indent() << "tcxx::bind(return_fn, this, cob, seqid, oprot, ctx" << ret_placeholder
-          << ")";
-      if (!xceptions.empty()) {
-        out << ',' << endl << indent() << "tcxx::bind(throw_fn, this, cob, seqid, oprot, "
-            << "ctx, tcxx::placeholders::_1)";
-      }
-    }
-
-    // XXX Whitespace cleanup.
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      out << ',' << endl << indent() << "args." << (*f_iter)->get_name();
-    }
-    out << ");" << endl;
-    indent_down();
-    indent_down();
-    scope_down(out);
-    out << endl;
-
-    // Normal return.
-    if (!tfunction->is_oneway()) {
-      string ret_arg_decl, ret_arg_name;
-      if (!tfunction->get_returntype()->is_void()) {
-        ret_arg_decl = ", const " + type_name(tfunction->get_returntype()) + "& _return";
-        ret_arg_name = ", _return";
-      }
-      if (gen_templates_) {
-        out << indent() << "template <class Protocol_>" << endl;
-      }
-      out << "void " << tservice->get_name() << "AsyncProcessor" << class_suffix << "::return_"
-          << tfunction->get_name() << "(tcxx::function<void(bool ok)> cob, int32_t seqid, "
-          << prot_type << "* oprot, void* ctx" << ret_arg_decl << ')' << endl;
-      scope_up(out);
-
-      if (gen_templates_ && !specialized) {
-        // If oprot is a Protocol_ instance,
-        // use the specialized return function instead.
-        out << indent() << "Protocol_* _oprot = dynamic_cast<Protocol_*>(oprot);" << endl
-            << indent() << "if (_oprot) {" << endl << indent() << "  return return_"
-            << tfunction->get_name() << "(cob, seqid, _oprot, ctx" << ret_arg_name << ");" << endl
-            << indent() << "}" << endl << indent() << "T_GENERIC_PROTOCOL(this, oprot, _oprot);"
-            << endl << endl;
-      }
-
-      out << indent() << tservice->get_name() << "_" << tfunction->get_name() << "_presult result;"
-          << endl;
-      if (!tfunction->get_returntype()->is_void()) {
-        // The const_cast here is unfortunate, but it would be a pain to avoid,
-        // and we only do a write with this struct, which is const-safe.
-        out << indent() << "result.success = const_cast<" << type_name(tfunction->get_returntype())
-            << "*>(&_return);" << endl << indent() << "result.__isset.success = true;" << endl;
-      }
-      // Serialize the result into a struct
-      out << endl << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  ctx = this->eventHandler_->getContext(" << service_func_name << ", NULL);" << endl
-          << indent() << "}" << endl << indent()
-          << "::apache::thrift::TProcessorContextFreer freer("
-          << "this->eventHandler_.get(), ctx, " << service_func_name << ");" << endl << endl
-          << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  this->eventHandler_->preWrite(ctx, " << service_func_name << ");" << endl
-          << indent() << "}" << endl << endl << indent() << "oprot->writeMessageBegin(\""
-          << tfunction->get_name() << "\", ::apache::thrift::protocol::T_REPLY, seqid);" << endl
-          << indent() << "result.write(oprot);" << endl << indent() << "oprot->writeMessageEnd();"
-          << endl << indent() << "uint32_t bytes = oprot->getTransport()->writeEnd();" << endl
-          << indent() << "oprot->getTransport()->flush();" << endl << indent()
-          << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  this->eventHandler_->postWrite(ctx, " << service_func_name << ", bytes);" << endl
-          << indent() << "}" << endl << indent() << "return cob(true);" << endl;
-      scope_down(out);
-      out << endl;
-    }
-
-    // Exception return.
-    if (!tfunction->is_oneway() && !xceptions.empty()) {
-      if (gen_templates_) {
-        out << indent() << "template <class Protocol_>" << endl;
-      }
-      out << "void " << tservice->get_name() << "AsyncProcessor" << class_suffix << "::throw_"
-          << tfunction->get_name() << "(tcxx::function<void(bool ok)> cob, int32_t seqid, "
-          << prot_type << "* oprot, void* ctx, "
-          << "::apache::thrift::TDelayedException* _throw)" << endl;
-      scope_up(out);
-
-      if (gen_templates_ && !specialized) {
-        // If oprot is a Protocol_ instance,
-        // use the specialized throw function instead.
-        out << indent() << "Protocol_* _oprot = dynamic_cast<Protocol_*>(oprot);" << endl
-            << indent() << "if (_oprot) {" << endl << indent() << "  return throw_"
-            << tfunction->get_name() << "(cob, seqid, _oprot, ctx, _throw);" << endl << indent()
-            << "}" << endl << indent() << "T_GENERIC_PROTOCOL(this, oprot, _oprot);" << endl
-            << endl;
-      }
-
-      // Get the event handler context
-      out << endl << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  ctx = this->eventHandler_->getContext(" << service_func_name << ", NULL);" << endl
-          << indent() << "}" << endl << indent()
-          << "::apache::thrift::TProcessorContextFreer freer("
-          << "this->eventHandler_.get(), ctx, " << service_func_name << ");" << endl << endl;
-
-      // Throw the TDelayedException, and catch the result
-      out << indent() << tservice->get_name() << "_" << tfunction->get_name() << "_result result;"
-          << endl << endl << indent() << "try {" << endl;
-      indent_up();
-      out << indent() << "_throw->throw_it();" << endl << indent() << "return cob(false);"
-          << endl; // Is this possible?  TBD.
-      indent_down();
-      out << indent() << '}';
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        out << "  catch (" << type_name((*x_iter)->get_type()) << " &" << (*x_iter)->get_name()
-            << ") {" << endl;
-        indent_up();
-        out << indent() << "result." << (*x_iter)->get_name() << " = " << (*x_iter)->get_name()
-            << ";" << endl << indent() << "result.__isset." << (*x_iter)->get_name() << " = true;"
-            << endl;
-        scope_down(out);
-      }
-
-      // Handle the case where an undeclared exception is thrown
-      out << " catch (std::exception& e) {" << endl;
-      indent_up();
-      out << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  this->eventHandler_->handlerError(ctx, " << service_func_name << ");" << endl
-          << indent() << "}" << endl << endl << indent()
-          << "::apache::thrift::TApplicationException x(e.what());" << endl << indent()
-          << "oprot->writeMessageBegin(\"" << tfunction->get_name()
-          << "\", ::apache::thrift::protocol::T_EXCEPTION, seqid);" << endl << indent()
-          << "x.write(oprot);" << endl << indent() << "oprot->writeMessageEnd();" << endl
-          << indent() << "oprot->getTransport()->writeEnd();" << endl << indent()
-          << "oprot->getTransport()->flush();" << endl <<
-          // We pass true to the cob here, since we did successfully write a
-          // response, even though it is an exception response.
-          // It looks like the argument is currently ignored, anyway.
-          indent() << "return cob(true);" << endl;
-      scope_down(out);
-
-      // Serialize the result into a struct
-      out << indent() << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  this->eventHandler_->preWrite(ctx, " << service_func_name << ");" << endl
-          << indent() << "}" << endl << endl << indent() << "oprot->writeMessageBegin(\""
-          << tfunction->get_name() << "\", ::apache::thrift::protocol::T_REPLY, seqid);" << endl
-          << indent() << "result.write(oprot);" << endl << indent() << "oprot->writeMessageEnd();"
-          << endl << indent() << "uint32_t bytes = oprot->getTransport()->writeEnd();" << endl
-          << indent() << "oprot->getTransport()->flush();" << endl << indent()
-          << "if (this->eventHandler_.get() != NULL) {" << endl << indent()
-          << "  this->eventHandler_->postWrite(ctx, " << service_func_name << ", bytes);" << endl
-          << indent() << "}" << endl << indent() << "return cob(true);" << endl;
-      scope_down(out);
-      out << endl;
-    } // for each function
-  }   // cob style
-}
-
-/**
- * Generates a skeleton file of a server
- *
- * @param tservice The service to generate a server for.
- */
-void t_cpp_generator::generate_service_skeleton(t_service* tservice) {
-  string svcname = tservice->get_name();
-
-  // Service implementation file includes
-  string f_skeleton_name = get_out_dir() + svcname + "_server.skeleton.cpp";
-
-  string ns = namespace_prefix(tservice->get_program()->get_namespace("cpp"));
-
-  ofstream f_skeleton;
-  f_skeleton.open(f_skeleton_name.c_str());
-  f_skeleton << "// This autogenerated skeleton file illustrates how to build a server." << endl
-             << "// You should copy it to another filename to avoid overwriting it." << endl << endl
-             << "#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl
-             << "#include <thrift/protocol/TBinaryProtocol.h>" << endl
-             << "#include <thrift/server/TSimpleServer.h>" << endl
-             << "#include <thrift/transport/TServerSocket.h>" << endl
-             << "#include <thrift/transport/TBufferTransports.h>" << endl << endl
-             << "using namespace ::apache::thrift;" << endl
-             << "using namespace ::apache::thrift::protocol;" << endl
-             << "using namespace ::apache::thrift::transport;" << endl
-             << "using namespace ::apache::thrift::server;" << endl << endl
-             << "using boost::shared_ptr;" << endl << endl;
-
-  // the following code would not compile:
-  // using namespace ;
-  // using namespace ::;
-  if ((!ns.empty()) && (ns.compare(" ::") != 0)) {
-    f_skeleton << "using namespace " << string(ns, 0, ns.size() - 2) << ";" << endl << endl;
-  }
-
-  f_skeleton << "class " << svcname << "Handler : virtual public " << svcname << "If {" << endl
-             << " public:" << endl;
-  indent_up();
-  f_skeleton << indent() << svcname << "Handler() {" << endl << indent()
-             << "  // Your initialization goes here" << endl << indent() << "}" << endl << endl;
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_java_doc(f_skeleton, *f_iter);
-    f_skeleton << indent() << function_signature(*f_iter, "") << " {" << endl << indent()
-               << "  // Your implementation goes here" << endl << indent() << "  printf(\""
-               << (*f_iter)->get_name() << "\\n\");" << endl << indent() << "}" << endl << endl;
-  }
-
-  indent_down();
-  f_skeleton << "};" << endl << endl;
-
-  f_skeleton << indent() << "int main(int argc, char **argv) {" << endl;
-  indent_up();
-  f_skeleton
-      << indent() << "int port = 9090;" << endl << indent() << "shared_ptr<" << svcname
-      << "Handler> handler(new " << svcname << "Handler());" << endl << indent()
-      << "shared_ptr<TProcessor> processor(new " << svcname << "Processor(handler));" << endl
-      << indent() << "shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));"
-      << endl << indent()
-      << "shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());" << endl
-      << indent() << "shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());"
-      << endl << endl << indent()
-      << "TSimpleServer server(processor, serverTransport, transportFactory, protocolFactory);"
-      << endl << indent() << "server.serve();" << endl << indent() << "return 0;" << endl;
-  indent_down();
-  f_skeleton << "}" << endl << endl;
-
-  // Close the files
-  f_skeleton.close();
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_cpp_generator::generate_deserialize_field(ofstream& out,
-                                                 t_field* tfield,
-                                                 string prefix,
-                                                 string suffix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name() + suffix;
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name, is_reference(tfield));
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type()) {
-    indent(out) << "xfer += iprot->";
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "compiler error: cannot serialize void field in a struct: " + name;
-      break;
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)type)->is_binary()) {
-        out << "readBinary(" << name << ");";
-      } else {
-        out << "readString(" << name << ");";
-      }
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << "readBool(" << name << ");";
-      break;
-    case t_base_type::TYPE_I8:
-      out << "readByte(" << name << ");";
-      break;
-    case t_base_type::TYPE_I16:
-      out << "readI16(" << name << ");";
-      break;
-    case t_base_type::TYPE_I32:
-      out << "readI32(" << name << ");";
-      break;
-    case t_base_type::TYPE_I64:
-      out << "readI64(" << name << ");";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      out << "readDouble(" << name << ");";
-      break;
-    default:
-      throw "compiler error: no C++ reader for base type " + t_base_type::t_base_name(tbase) + name;
-    }
-    out << endl;
-  } else if (type->is_enum()) {
-    string t = tmp("ecast");
-    out << indent() << "int32_t " << t << ";" << endl << indent() << "xfer += iprot->readI32(" << t
-        << ");" << endl << indent() << name << " = (" << type_name(type) << ")" << t << ";" << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a variable. This makes two key assumptions,
- * first that there is a const char* variable named data that points to the
- * buffer for deserialization, and that there is a variable protocol which
- * is a reference to a TProtocol serialization object.
- */
-void t_cpp_generator::generate_deserialize_struct(ofstream& out,
-                                                  t_struct* tstruct,
-                                                  string prefix,
-                                                  bool pointer) {
-  if (pointer) {
-    indent(out) << "if (!" << prefix << ") { " << endl;
-    indent(out) << "  " << prefix << " = boost::shared_ptr<" << type_name(tstruct) << ">(new "
-                << type_name(tstruct) << ");" << endl;
-    indent(out) << "}" << endl;
-    indent(out) << "xfer += " << prefix << "->read(iprot);" << endl;
-    indent(out) << "bool wasSet = false;" << endl;
-    const vector<t_field*>& members = tstruct->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    for (f_iter = members.begin(); f_iter != members.end(); ++f_iter) {
-
-      indent(out) << "if (" << prefix << "->__isset." << (*f_iter)->get_name()
-                  << ") { wasSet = true; }" << endl;
-    }
-    indent(out) << "if (!wasSet) { " << prefix << ".reset(); }" << endl;
-  } else {
-    indent(out) << "xfer += " << prefix << ".read(iprot);" << endl;
-  }
-}
-
-void t_cpp_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  string size = tmp("_size");
-  string ktype = tmp("_ktype");
-  string vtype = tmp("_vtype");
-  string etype = tmp("_etype");
-
-  t_container* tcontainer = (t_container*)ttype;
-  bool use_push = tcontainer->has_cpp_name();
-
-  indent(out) << prefix << ".clear();" << endl << indent() << "uint32_t " << size << ";" << endl;
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    out << indent() << "::apache::thrift::protocol::TType " << ktype << ";" << endl << indent()
-        << "::apache::thrift::protocol::TType " << vtype << ";" << endl << indent()
-        << "xfer += iprot->readMapBegin(" << ktype << ", " << vtype << ", " << size << ");" << endl;
-  } else if (ttype->is_set()) {
-    out << indent() << "::apache::thrift::protocol::TType " << etype << ";" << endl << indent()
-        << "xfer += iprot->readSetBegin(" << etype << ", " << size << ");" << endl;
-  } else if (ttype->is_list()) {
-    out << indent() << "::apache::thrift::protocol::TType " << etype << ";" << endl << indent()
-        << "xfer += iprot->readListBegin(" << etype << ", " << size << ");" << endl;
-    if (!use_push) {
-      indent(out) << prefix << ".resize(" << size << ");" << endl;
-    }
-  }
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  out << indent() << "uint32_t " << i << ";" << endl << indent() << "for (" << i << " = 0; " << i
-      << " < " << size << "; ++" << i << ")" << endl;
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix, use_push, i);
-  }
-
-  scope_down(out);
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "xfer += iprot->readMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "xfer += iprot->readSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "xfer += iprot->readListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_cpp_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  out << indent() << declare_field(&fkey) << endl;
-
-  generate_deserialize_field(out, &fkey);
-  indent(out) << declare_field(&fval, false, false, false, true) << " = " << prefix << "[" << key
-              << "];" << endl;
-
-  generate_deserialize_field(out, &fval);
-}
-
-void t_cpp_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".insert(" << elem << ");" << endl;
-}
-
-void t_cpp_generator::generate_deserialize_list_element(ofstream& out,
-                                                        t_list* tlist,
-                                                        string prefix,
-                                                        bool use_push,
-                                                        string index) {
-  if (use_push) {
-    string elem = tmp("_elem");
-    t_field felem(tlist->get_elem_type(), elem);
-    indent(out) << declare_field(&felem) << endl;
-    generate_deserialize_field(out, &felem);
-    indent(out) << prefix << ".push_back(" << elem << ");" << endl;
-  } else {
-    t_field felem(tlist->get_elem_type(), prefix + "[" + index + "]");
-    generate_deserialize_field(out, &felem);
-  }
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_cpp_generator::generate_serialize_field(ofstream& out,
-                                               t_field* tfield,
-                                               string prefix,
-                                               string suffix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  string name = prefix + tfield->get_name() + suffix;
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + name;
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, name, is_reference(tfield));
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    indent(out) << "xfer += oprot->";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "writeBinary(" << name << ");";
-        } else {
-          out << "writeString(" << name << ");";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ");";
-        break;
-      default:
-        throw "compiler error: no C++ writer for base type " + t_base_type::t_base_name(tbase)
-            + name;
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32((int32_t)" << name << ");";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s' TYPE '%s'\n",
-           name.c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_cpp_generator::generate_serialize_struct(ofstream& out,
-                                                t_struct* tstruct,
-                                                string prefix,
-                                                bool pointer) {
-  if (pointer) {
-    indent(out) << "if (" << prefix << ") {" << endl;
-    indent(out) << "  xfer += " << prefix << "->write(oprot); " << endl;
-    indent(out) << "} else {"
-                << "oprot->writeStructBegin(\"" << tstruct->get_name() << "\"); " << endl;
-    indent(out) << "  oprot->writeStructEnd();" << endl;
-    indent(out) << "  oprot->writeFieldStop();" << endl;
-    indent(out) << "}" << endl;
-  } else {
-    indent(out) << "xfer += " << prefix << ".write(oprot);" << endl;
-  }
-}
-
-void t_cpp_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "xfer += oprot->writeMapBegin(" << type_to_enum(((t_map*)ttype)->get_key_type())
-                << ", " << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
-                << "static_cast<uint32_t>(" << prefix << ".size()));" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "xfer += oprot->writeSetBegin(" << type_to_enum(((t_set*)ttype)->get_elem_type())
-                << ", "
-                << "static_cast<uint32_t>(" << prefix << ".size()));" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "xfer += oprot->writeListBegin("
-                << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", "
-                << "static_cast<uint32_t>(" << prefix << ".size()));" << endl;
-  }
-
-  string iter = tmp("_iter");
-  out << indent() << type_name(ttype) << "::const_iterator " << iter << ";" << endl << indent()
-      << "for (" << iter << " = " << prefix << ".begin(); " << iter << " != " << prefix
-      << ".end(); ++" << iter << ")" << endl;
-  scope_up(out);
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, (t_map*)ttype, iter);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-  }
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "xfer += oprot->writeMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "xfer += oprot->writeSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "xfer += oprot->writeListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- *
- */
-void t_cpp_generator::generate_serialize_map_element(ofstream& out, t_map* tmap, string iter) {
-  t_field kfield(tmap->get_key_type(), iter + "->first");
-  generate_serialize_field(out, &kfield, "");
-
-  t_field vfield(tmap->get_val_type(), iter + "->second");
-  generate_serialize_field(out, &vfield, "");
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_cpp_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), "(*" + iter + ")");
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_cpp_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), "(*" + iter + ")");
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Makes a :: prefix for a namespace
- *
- * @param ns The namespace, w/ periods in it
- * @return Namespaces
- */
-string t_cpp_generator::namespace_prefix(string ns) {
-  // Always start with "::", to avoid possible name collisions with
-  // other names in one of the current namespaces.
-  //
-  // We also need a leading space, in case the name is used inside of a
-  // template parameter.  "MyTemplate<::foo::Bar>" is not valid C++,
-  // since "<:" is an alternative token for "[".
-  string result = " ::";
-
-  if (ns.size() == 0) {
-    return result;
-  }
-  string::size_type loc;
-  while ((loc = ns.find(".")) != string::npos) {
-    result += ns.substr(0, loc);
-    result += "::";
-    ns = ns.substr(loc + 1);
-  }
-  if (ns.size() > 0) {
-    result += ns + "::";
-  }
-  return result;
-}
-
-/**
- * Opens namespace.
- *
- * @param ns The namespace, w/ periods in it
- * @return Namespaces
- */
-string t_cpp_generator::namespace_open(string ns) {
-  if (ns.size() == 0) {
-    return "";
-  }
-  string result = "";
-  string separator = "";
-  string::size_type loc;
-  while ((loc = ns.find(".")) != string::npos) {
-    result += separator;
-    result += "namespace ";
-    result += ns.substr(0, loc);
-    result += " {";
-    separator = " ";
-    ns = ns.substr(loc + 1);
-  }
-  if (ns.size() > 0) {
-    result += separator + "namespace " + ns + " {";
-  }
-  return result;
-}
-
-/**
- * Closes namespace.
- *
- * @param ns The namespace, w/ periods in it
- * @return Namespaces
- */
-string t_cpp_generator::namespace_close(string ns) {
-  if (ns.size() == 0) {
-    return "";
-  }
-  string result = "}";
-  string::size_type loc;
-  while ((loc = ns.find(".")) != string::npos) {
-    result += "}";
-    ns = ns.substr(loc + 1);
-  }
-  result += " // namespace";
-  return result;
-}
-
-/**
- * Returns a C++ type name
- *
- * @param ttype The type
- * @return String of the type name, i.e. std::set<type>
- */
-string t_cpp_generator::type_name(t_type* ttype, bool in_typedef, bool arg) {
-  if (ttype->is_base_type()) {
-    string bname = base_type_name(((t_base_type*)ttype)->get_base());
-    std::map<string, string>::iterator it = ttype->annotations_.find("cpp.type");
-    if (it != ttype->annotations_.end()) {
-      bname = it->second;
-    }
-
-    if (!arg) {
-      return bname;
-    }
-
-    if (((t_base_type*)ttype)->get_base() == t_base_type::TYPE_STRING) {
-      return "const " + bname + "&";
-    } else {
-      return "const " + bname;
-    }
-  }
-
-  // Check for a custom overloaded C++ name
-  if (ttype->is_container()) {
-    string cname;
-
-    t_container* tcontainer = (t_container*)ttype;
-    if (tcontainer->has_cpp_name()) {
-      cname = tcontainer->get_cpp_name();
-    } else if (ttype->is_map()) {
-      t_map* tmap = (t_map*)ttype;
-      cname = "std::map<" + type_name(tmap->get_key_type(), in_typedef) + ", "
-              + type_name(tmap->get_val_type(), in_typedef) + "> ";
-    } else if (ttype->is_set()) {
-      t_set* tset = (t_set*)ttype;
-      cname = "std::set<" + type_name(tset->get_elem_type(), in_typedef) + "> ";
-    } else if (ttype->is_list()) {
-      t_list* tlist = (t_list*)ttype;
-      cname = "std::vector<" + type_name(tlist->get_elem_type(), in_typedef) + "> ";
-    }
-
-    if (arg) {
-      return "const " + cname + "&";
-    } else {
-      return cname;
-    }
-  }
-
-  string class_prefix;
-  if (in_typedef && (ttype->is_struct() || ttype->is_xception())) {
-    class_prefix = "class ";
-  }
-
-  // Check if it needs to be namespaced
-  string pname;
-  t_program* program = ttype->get_program();
-  if (program != NULL && program != program_) {
-    pname = class_prefix + namespace_prefix(program->get_namespace("cpp")) + ttype->get_name();
-  } else {
-    pname = class_prefix + ttype->get_name();
-  }
-
-  if (ttype->is_enum() && !gen_pure_enums_) {
-    pname += "::type";
-  }
-
-  if (arg) {
-    if (is_complex_type(ttype)) {
-      return "const " + pname + "&";
-    } else {
-      return "const " + pname;
-    }
-  } else {
-    return pname;
-  }
-}
-
-/**
- * Returns the C++ type that corresponds to the thrift type.
- *
- * @param tbase The base type
- * @return Explicit C++ type, i.e. "int32_t"
- */
-string t_cpp_generator::base_type_name(t_base_type::t_base tbase) {
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "void";
-  case t_base_type::TYPE_STRING:
-    return "std::string";
-  case t_base_type::TYPE_BOOL:
-    return "bool";
-  case t_base_type::TYPE_I8:
-    return "int8_t";
-  case t_base_type::TYPE_I16:
-    return "int16_t";
-  case t_base_type::TYPE_I32:
-    return "int32_t";
-  case t_base_type::TYPE_I64:
-    return "int64_t";
-  case t_base_type::TYPE_DOUBLE:
-    return "double";
-  default:
-    throw "compiler error: no C++ base type name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param ttype The type
- * @return Field declaration, i.e. int x = 0;
- */
-string t_cpp_generator::declare_field(t_field* tfield,
-                                      bool init,
-                                      bool pointer,
-                                      bool constant,
-                                      bool reference) {
-  // TODO(mcslee): do we ever need to initialize the field?
-  string result = "";
-  if (constant) {
-    result += "const ";
-  }
-  result += type_name(tfield->get_type());
-  if (is_reference(tfield)) {
-    result = "boost::shared_ptr<" + result + ">";
-  }
-  if (pointer) {
-    result += "*";
-  }
-  if (reference) {
-    result += "&";
-  }
-  result += " " + tfield->get_name();
-  if (init) {
-    t_type* type = get_true_type(tfield->get_type());
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-      case t_base_type::TYPE_STRING:
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = false";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = (double)0";
-        break;
-      default:
-        throw "compiler error: no C++ initializer for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      result += " = (" + type_name(type) + ")0";
-    }
-  }
-  if (!reference) {
-    result += ";";
-  }
-  return result;
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_cpp_generator::function_signature(t_function* tfunction,
-                                           string style,
-                                           string prefix,
-                                           bool name_params) {
-  t_type* ttype = tfunction->get_returntype();
-  t_struct* arglist = tfunction->get_arglist();
-  bool has_xceptions = !tfunction->get_xceptions()->get_members().empty();
-
-  if (style == "") {
-    if (is_complex_type(ttype)) {
-      return "void " + prefix + tfunction->get_name() + "(" + type_name(ttype)
-             + (name_params ? "& _return" : "& /* _return */")
-             + argument_list(arglist, name_params, true) + ")";
-    } else {
-      return type_name(ttype) + " " + prefix + tfunction->get_name() + "("
-             + argument_list(arglist, name_params) + ")";
-    }
-  } else if (style.substr(0, 3) == "Cob") {
-    string cob_type;
-    string exn_cob;
-    if (style == "CobCl") {
-      cob_type = "(" + service_name_ + "CobClient";
-      if (gen_templates_) {
-        cob_type += "T<Protocol_>";
-      }
-      cob_type += "* client)";
-    } else if (style == "CobSv") {
-      cob_type = (ttype->is_void() ? "()" : ("(" + type_name(ttype) + " const& _return)"));
-      if (has_xceptions) {
-        exn_cob
-            = ", tcxx::function<void(::apache::thrift::TDelayedException* _throw)> /* exn_cob */";
-      }
-    } else {
-      throw "UNKNOWN STYLE";
-    }
-
-    return "void " + prefix + tfunction->get_name() + "(tcxx::function<void" + cob_type + "> cob"
-           + exn_cob + argument_list(arglist, name_params, true) + ")";
-  } else {
-    throw "UNKNOWN STYLE";
-  }
-}
-
-/**
- * Renders a field list
- *
- * @param tstruct The struct definition
- * @return Comma sepearated list of all field names in that struct
- */
-string t_cpp_generator::argument_list(t_struct* tstruct, bool name_params, bool start_comma) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = !start_comma;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += type_name((*f_iter)->get_type(), false, true) + " "
-              + (name_params ? (*f_iter)->get_name() : "/* " + (*f_iter)->get_name() + " */");
-  }
-  return result;
-}
-
-/**
- * Converts the parse type to a C++ enum string for the given type.
- *
- * @param type Thrift Type
- * @return String of C++ code to definition of that type constant
- */
-string t_cpp_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "::apache::thrift::protocol::T_STRING";
-    case t_base_type::TYPE_BOOL:
-      return "::apache::thrift::protocol::T_BOOL";
-    case t_base_type::TYPE_I8:
-      return "::apache::thrift::protocol::T_BYTE";
-    case t_base_type::TYPE_I16:
-      return "::apache::thrift::protocol::T_I16";
-    case t_base_type::TYPE_I32:
-      return "::apache::thrift::protocol::T_I32";
-    case t_base_type::TYPE_I64:
-      return "::apache::thrift::protocol::T_I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "::apache::thrift::protocol::T_DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "::apache::thrift::protocol::T_I32";
-  } else if (type->is_struct()) {
-    return "::apache::thrift::protocol::T_STRUCT";
-  } else if (type->is_xception()) {
-    return "::apache::thrift::protocol::T_STRUCT";
-  } else if (type->is_map()) {
-    return "::apache::thrift::protocol::T_MAP";
-  } else if (type->is_set()) {
-    return "::apache::thrift::protocol::T_SET";
-  } else if (type->is_list()) {
-    return "::apache::thrift::protocol::T_LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-string t_cpp_generator::get_include_prefix(const t_program& program) const {
-  string include_prefix = program.get_include_prefix();
-  if (!use_include_prefix_ || (include_prefix.size() > 0 && include_prefix[0] == '/')) {
-    // if flag is turned off or this is absolute path, return empty prefix
-    return "";
-  }
-
-  string::size_type last_slash = string::npos;
-  if ((last_slash = include_prefix.rfind("/")) != string::npos) {
-    return include_prefix.substr(0, last_slash)
-           + (get_program()->is_out_path_absolute() ? "/" : "/" + out_dir_base_ + "/");
-  }
-
-  return "";
-}
-
-THRIFT_REGISTER_GENERATOR(
-    cpp,
-    "C++",
-    "    cob_style:       Generate \"Continuation OBject\"-style classes.\n"
-    "    no_client_completion:\n"
-    "                     Omit calls to completion__() in CobClient class.\n"
-    "    no_default_operators:\n"
-    "                     Omits generation of default operators ==, != and <\n"
-    "    templates:       Generate templatized reader/writer methods.\n"
-    "    pure_enums:      Generate pure enums instead of wrapper classes.\n"
-    "    include_prefix:  Use full include paths in generated files.\n"
-    "    moveable_types:  Generate move constructors and assignment operators.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_csharp_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_csharp_generator.cc
deleted file mode 100644
index ae3c48b..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_csharp_generator.cc
+++ /dev/null
@@ -1,3202 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <cassert>
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <cctype>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-struct member_mapping_scope {
-  void* scope_member;
-  std::map<std::string, std::string> mapping_table;
-};
-
-class t_csharp_generator : public t_oop_generator {
-public:
-  t_csharp_generator(t_program* program,
-                     const std::map<std::string, std::string>& parsed_options,
-                     const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-
-    std::map<std::string, std::string>::const_iterator iter;
-
-    async_ = false;
-    nullable_ = false;
-    hashcode_ = false;
-    union_ = false;
-    serialize_ = false;
-    wcf_ = false;
-    wcf_namespace_.clear();
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("async") == 0) {
-        async_ = true;
-      } else if( iter->first.compare("nullable") == 0) {
-        nullable_ = true;
-      } else if( iter->first.compare("hashcode") == 0) {
-        hashcode_ = true;
-      } else if( iter->first.compare("union") == 0) {
-        union_ = true;
-      } else if( iter->first.compare("serial") == 0) {
-        serialize_ = true;
-        wcf_namespace_ = iter->second; // since there can be only one namespace
-      } else if( iter->first.compare("wcf") == 0) {
-        wcf_ = true;
-        wcf_namespace_ = iter->second;
-      } else {
-        throw "unknown option csharp:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-csharp";
-  }
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_struct(t_struct* tstruct);
-  void generate_union(t_struct* tunion);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-  void generate_property(ofstream& out, t_field* tfield, bool isPublic, bool generateIsset);
-  void generate_csharp_property(ofstream& out,
-                                t_field* tfield,
-                                bool isPublic,
-                                bool includeIsset = true,
-                                std::string fieldPrefix = "");
-  bool print_const_value(std::ofstream& out,
-                         std::string name,
-                         t_type* type,
-                         t_const_value* value,
-                         bool in_static,
-                         bool defval = false,
-                         bool needtype = false);
-  std::string render_const_value(std::ofstream& out,
-                                 std::string name,
-                                 t_type* type,
-                                 t_const_value* value);
-  void print_const_constructor(std::ofstream& out, std::vector<t_const*> consts);
-  void print_const_def_value(std::ofstream& out,
-                             std::string name,
-                             t_type* type,
-                             t_const_value* value);
-
-  void generate_csharp_struct(t_struct* tstruct, bool is_exception);
-  void generate_csharp_union(t_struct* tunion);
-  void generate_csharp_struct_definition(std::ofstream& out,
-                                         t_struct* tstruct,
-                                         bool is_xception = false,
-                                         bool in_class = false,
-                                         bool is_result = false);
-  void generate_csharp_union_definition(std::ofstream& out, t_struct* tunion);
-  void generate_csharp_union_class(std::ofstream& out, t_struct* tunion, t_field* tfield);
-  void generate_csharp_wcffault(std::ofstream& out, t_struct* tstruct);
-  void generate_csharp_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_csharp_struct_result_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_csharp_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_csharp_struct_tostring(std::ofstream& out, t_struct* tstruct);
-  void generate_csharp_struct_equals(std::ofstream& out, t_struct* tstruct);
-  void generate_csharp_struct_hashcode(std::ofstream& out, t_struct* tstruct);
-  void generate_csharp_union_reader(std::ofstream& out, t_struct* tunion);
-
-  void generate_function_helpers(t_function* tfunction);
-  void generate_service_interface(t_service* tservice);
-  void generate_separate_service_interfaces(t_service* tservice);
-  void generate_sync_service_interface(t_service* tservice);
-  void generate_async_service_interface(t_service* tservice);
-  void generate_combined_service_interface(t_service* tservice);
-  void generate_silverlight_async_methods(t_service* tservice);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_service_server_sync(t_service* tservice);
-  void generate_service_server_async(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* function);
-  void generate_process_function_async(t_service* tservice, t_function* function);
-
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  std::string prefix = "",
-                                  bool is_propertyless = false);
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-  void generate_deserialize_list_element(std::ofstream& out, t_list* list, std::string prefix = "");
-  void generate_serialize_field(std::ofstream& out,
-                                t_field* tfield,
-                                std::string prefix = "",
-                                bool is_element = false,
-                                bool is_propertyless = false);
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string iter,
-                                      std::string map);
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_csharp_doc(std::ofstream& out, t_field* field);
-  void generate_csharp_doc(std::ofstream& out, t_doc* tdoc);
-  void generate_csharp_doc(std::ofstream& out, t_function* tdoc);
-  void generate_csharp_docstring_comment(std::ofstream& out, string contents);
-
-  void start_csharp_namespace(std::ofstream& out);
-  void end_csharp_namespace(std::ofstream& out);
-
-  std::string csharp_type_usings();
-  std::string csharp_thrift_usings();
-
-  std::string type_name(t_type* ttype,
-                        bool in_countainer = false,
-                        bool in_init = false,
-                        bool in_param = false,
-                        bool is_required = false);
-  std::string base_type_name(t_base_type* tbase,
-                             bool in_container = false,
-                             bool in_param = false,
-                             bool is_required = false);
-  std::string declare_field(t_field* tfield, bool init = false, std::string prefix = "");
-  std::string function_signature_async_begin(t_function* tfunction, std::string prefix = "");
-  std::string function_signature_async_end(t_function* tfunction, std::string prefix = "");
-  std::string function_signature_async(t_function* tfunction, std::string prefix = "");
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-  std::string prop_name(t_field* tfield, bool suppress_mapping = false);
-  std::string get_enum_class_name(t_type* type);
-
-  bool field_has_default(t_field* tfield) { return tfield->get_value() != NULL; }
-
-  bool field_is_required(t_field* tfield) { return tfield->get_req() == t_field::T_REQUIRED; }
-
-  bool type_can_be_null(t_type* ttype) {
-    while (ttype->is_typedef()) {
-      ttype = ((t_typedef*)ttype)->get_type();
-    }
-
-    return ttype->is_container() || ttype->is_struct() || ttype->is_xception()
-           || ttype->is_string();
-  }
-
-private:
-  std::string namespace_name_;
-  std::ofstream f_service_;
-  std::string namespace_dir_;
-  bool async_;
-  bool nullable_;
-  bool union_;
-  bool hashcode_;
-  bool serialize_;
-  bool wcf_;
-  std::string wcf_namespace_;
-
-  std::map<std::string, int> csharp_keywords;
-  std::vector<member_mapping_scope>  member_mapping_scopes;
-
-  void init_keywords();
-  std::string normalize_name(std::string name);
-  std::string make_valid_csharp_identifier(std::string const& fromName);
-  void prepare_member_name_mapping(t_struct* tstruct);
-  void prepare_member_name_mapping(void* scope,
-                                   const vector<t_field*>& members,
-                                   const string& structname);
-  void cleanup_member_name_mapping(void* scope);
-  string get_mapped_member_name(string oldname);
-};
-
-void t_csharp_generator::init_generator() {
-  MKDIR(get_out_dir().c_str());
-  namespace_name_ = program_->get_namespace("csharp");
-
-  string dir = namespace_name_;
-  string subdir = get_out_dir().c_str();
-  string::size_type loc;
-
-  while ((loc = dir.find(".")) != string::npos) {
-    subdir = subdir + "/" + dir.substr(0, loc);
-    MKDIR(subdir.c_str());
-    dir = dir.substr(loc + 1);
-  }
-  if (dir.size() > 0) {
-    subdir = subdir + "/" + dir;
-    MKDIR(subdir.c_str());
-  }
-
-  namespace_dir_ = subdir;
-  init_keywords();
-
-  while( ! member_mapping_scopes.empty()) {
-    cleanup_member_name_mapping( member_mapping_scopes.back().scope_member);
-  }
-
-  pverbose("C# options:\n");
-  pverbose("- async ...... %s\n", (async_ ? "ON" : "off"));
-  pverbose("- nullable ... %s\n", (nullable_ ? "ON" : "off"));
-  pverbose("- union ...... %s\n", (union_ ? "ON" : "off"));
-  pverbose("- hashcode ... %s\n", (hashcode_ ? "ON" : "off"));
-  pverbose("- serialize .. %s\n", (serialize_ ? "ON" : "off"));
-  pverbose("- wcf ........ %s\n", (wcf_ ? "ON" : "off"));
-}
-
-std::string t_csharp_generator::normalize_name(std::string name) {
-  string tmp(name);
-  std::transform(tmp.begin(), tmp.end(), tmp.begin(), static_cast<int (*)(int)>(std::tolower));
-
-  // un-conflict keywords by prefixing with "@"
-  if (csharp_keywords.find(tmp) != csharp_keywords.end()) {
-    return "@" + name;
-  }
-
-  // no changes necessary
-  return name;
-}
-
-void t_csharp_generator::init_keywords() {
-  csharp_keywords.clear();
-
-  // C# keywords
-  csharp_keywords["abstract"] = 1;
-  csharp_keywords["as"] = 1;
-  csharp_keywords["base"] = 1;
-  csharp_keywords["bool"] = 1;
-  csharp_keywords["break"] = 1;
-  csharp_keywords["byte"] = 1;
-  csharp_keywords["case"] = 1;
-  csharp_keywords["catch"] = 1;
-  csharp_keywords["char"] = 1;
-  csharp_keywords["checked"] = 1;
-  csharp_keywords["class"] = 1;
-  csharp_keywords["const"] = 1;
-  csharp_keywords["continue"] = 1;
-  csharp_keywords["decimal"] = 1;
-  csharp_keywords["default"] = 1;
-  csharp_keywords["delegate"] = 1;
-  csharp_keywords["do"] = 1;
-  csharp_keywords["double"] = 1;
-  csharp_keywords["else"] = 1;
-  csharp_keywords["enum"] = 1;
-  csharp_keywords["event"] = 1;
-  csharp_keywords["explicit"] = 1;
-  csharp_keywords["extern"] = 1;
-  csharp_keywords["false"] = 1;
-  csharp_keywords["finally"] = 1;
-  csharp_keywords["fixed"] = 1;
-  csharp_keywords["float"] = 1;
-  csharp_keywords["for"] = 1;
-  csharp_keywords["foreach"] = 1;
-  csharp_keywords["goto"] = 1;
-  csharp_keywords["if"] = 1;
-  csharp_keywords["implicit"] = 1;
-  csharp_keywords["in"] = 1;
-  csharp_keywords["int"] = 1;
-  csharp_keywords["interface"] = 1;
-  csharp_keywords["internal"] = 1;
-  csharp_keywords["is"] = 1;
-  csharp_keywords["lock"] = 1;
-  csharp_keywords["long"] = 1;
-  csharp_keywords["namespace"] = 1;
-  csharp_keywords["new"] = 1;
-  csharp_keywords["null"] = 1;
-  csharp_keywords["object"] = 1;
-  csharp_keywords["operator"] = 1;
-  csharp_keywords["out"] = 1;
-  csharp_keywords["override"] = 1;
-  csharp_keywords["params"] = 1;
-  csharp_keywords["private"] = 1;
-  csharp_keywords["protected"] = 1;
-  csharp_keywords["public"] = 1;
-  csharp_keywords["readonly"] = 1;
-  csharp_keywords["ref"] = 1;
-  csharp_keywords["return"] = 1;
-  csharp_keywords["sbyte"] = 1;
-  csharp_keywords["sealed"] = 1;
-  csharp_keywords["short"] = 1;
-  csharp_keywords["sizeof"] = 1;
-  csharp_keywords["stackalloc"] = 1;
-  csharp_keywords["static"] = 1;
-  csharp_keywords["string"] = 1;
-  csharp_keywords["struct"] = 1;
-  csharp_keywords["switch"] = 1;
-  csharp_keywords["this"] = 1;
-  csharp_keywords["throw"] = 1;
-  csharp_keywords["true"] = 1;
-  csharp_keywords["try"] = 1;
-  csharp_keywords["typeof"] = 1;
-  csharp_keywords["uint"] = 1;
-  csharp_keywords["ulong"] = 1;
-  csharp_keywords["unchecked"] = 1;
-  csharp_keywords["unsafe"] = 1;
-  csharp_keywords["ushort"] = 1;
-  csharp_keywords["using"] = 1;
-  csharp_keywords["virtual"] = 1;
-  csharp_keywords["void"] = 1;
-  csharp_keywords["volatile"] = 1;
-  csharp_keywords["while"] = 1;
-
-  // C# contextual keywords
-  csharp_keywords["add"] = 1;
-  csharp_keywords["alias"] = 1;
-  csharp_keywords["ascending"] = 1;
-  csharp_keywords["async"] = 1;
-  csharp_keywords["await"] = 1;
-  csharp_keywords["descending"] = 1;
-  csharp_keywords["dynamic"] = 1;
-  csharp_keywords["from"] = 1;
-  csharp_keywords["get"] = 1;
-  csharp_keywords["global"] = 1;
-  csharp_keywords["group"] = 1;
-  csharp_keywords["into"] = 1;
-  csharp_keywords["join"] = 1;
-  csharp_keywords["let"] = 1;
-  csharp_keywords["orderby"] = 1;
-  csharp_keywords["partial"] = 1;
-  csharp_keywords["remove"] = 1;
-  csharp_keywords["select"] = 1;
-  csharp_keywords["set"] = 1;
-  csharp_keywords["value"] = 1;
-  csharp_keywords["var"] = 1;
-  csharp_keywords["where"] = 1;
-  csharp_keywords["yield"] = 1;
-}
-
-void t_csharp_generator::start_csharp_namespace(ofstream& out) {
-  if (!namespace_name_.empty()) {
-    out << "namespace " << namespace_name_ << "\n";
-    scope_up(out);
-  }
-}
-
-void t_csharp_generator::end_csharp_namespace(ofstream& out) {
-  if (!namespace_name_.empty()) {
-    scope_down(out);
-  }
-}
-
-string t_csharp_generator::csharp_type_usings() {
-  return string() + "using System;\n" + "using System.Collections;\n"
-         + "using System.Collections.Generic;\n" + "using System.Text;\n" + "using System.IO;\n"
-         + ((async_) ? "using System.Threading.Tasks;\n" : "") + "using Thrift;\n"
-         + "using Thrift.Collections;\n" + ((serialize_ || wcf_) ? "#if !SILVERLIGHT\n" : "")
-         + ((serialize_ || wcf_) ? "using System.Xml.Serialization;\n" : "")
-         + ((serialize_ || wcf_) ? "#endif\n" : "") + (wcf_ ? "//using System.ServiceModel;\n" : "")
-         + "using System.Runtime.Serialization;\n";
-}
-
-string t_csharp_generator::csharp_thrift_usings() {
-  return string() + "using Thrift.Protocol;\n" + "using Thrift.Transport;\n";
-}
-
-void t_csharp_generator::close_generator() {
-}
-void t_csharp_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-void t_csharp_generator::generate_enum(t_enum* tenum) {
-  string f_enum_name = namespace_dir_ + "/" + (tenum->get_name()) + ".cs";
-  ofstream f_enum;
-  f_enum.open(f_enum_name.c_str());
-
-  f_enum << autogen_comment() << endl;
-
-  start_csharp_namespace(f_enum);
-
-  generate_csharp_doc(f_enum, tenum);
-
-  indent(f_enum) << "public enum " << tenum->get_name() << "\n";
-  scope_up(f_enum);
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    generate_csharp_doc(f_enum, *c_iter);
-
-    int value = (*c_iter)->get_value();
-    indent(f_enum) << (*c_iter)->get_name() << " = " << value << "," << endl;
-  }
-
-  scope_down(f_enum);
-
-  end_csharp_namespace(f_enum);
-
-  f_enum.close();
-}
-
-void t_csharp_generator::generate_consts(std::vector<t_const*> consts) {
-  if (consts.empty()) {
-    return;
-  }
-  string f_consts_name = namespace_dir_ + '/' + program_name_ + ".Constants.cs";
-  ofstream f_consts;
-  f_consts.open(f_consts_name.c_str());
-
-  f_consts << autogen_comment() << csharp_type_usings() << endl;
-
-  start_csharp_namespace(f_consts);
-
-  indent(f_consts) << "public static class " << make_valid_csharp_identifier(program_name_)
-                   << "Constants" << endl;
-  scope_up(f_consts);
-
-  vector<t_const*>::iterator c_iter;
-  bool need_static_constructor = false;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    generate_csharp_doc(f_consts, (*c_iter));
-    if (print_const_value(f_consts,
-                          (*c_iter)->get_name(),
-                          (*c_iter)->get_type(),
-                          (*c_iter)->get_value(),
-                          false)) {
-      need_static_constructor = true;
-    }
-  }
-
-  if (need_static_constructor) {
-    print_const_constructor(f_consts, consts);
-  }
-
-  scope_down(f_consts);
-  end_csharp_namespace(f_consts);
-  f_consts.close();
-}
-
-void t_csharp_generator::print_const_def_value(std::ofstream& out,
-                                               string name,
-                                               t_type* type,
-                                               t_const_value* value) {
-  if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    prepare_member_name_mapping((t_struct*)type);
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_field* field = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field = (*f_iter);
-        }
-      }
-      if (field == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      t_type* field_type = field->get_type();
-      string val = render_const_value(out, name, field_type, v_iter->second);
-      indent(out) << name << "." << prop_name(field) << " = " << val << ";" << endl;
-    }
-    cleanup_member_name_mapping((t_struct*)type);
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(out, name, ktype, v_iter->first);
-      string val = render_const_value(out, name, vtype, v_iter->second);
-      indent(out) << name << "[" << key << "]"
-                  << " = " << val << ";" << endl;
-    }
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(out, name, etype, *v_iter);
-      indent(out) << name << ".Add(" << val << ");" << endl;
-    }
-  }
-}
-
-void t_csharp_generator::print_const_constructor(std::ofstream& out, std::vector<t_const*> consts) {
-  indent(out) << "static " << make_valid_csharp_identifier(program_name_).c_str() << "Constants()"
-              << endl;
-  scope_up(out);
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    string name = (*c_iter)->get_name();
-    t_type* type = (*c_iter)->get_type();
-    t_const_value* value = (*c_iter)->get_value();
-
-    print_const_def_value(out, name, type, value);
-  }
-  scope_down(out);
-}
-
-// it seems like all that methods that call this are using in_static to be the opposite of what it
-// would imply
-bool t_csharp_generator::print_const_value(std::ofstream& out,
-                                           string name,
-                                           t_type* type,
-                                           t_const_value* value,
-                                           bool in_static,
-                                           bool defval,
-                                           bool needtype) {
-  indent(out);
-  bool need_static_construction = !in_static;
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  if (!defval || needtype) {
-    out << (in_static ? "" : type->is_base_type() ? "public const " : "public static ")
-        << type_name(type) << " ";
-  }
-  if (type->is_base_type()) {
-    string v2 = render_const_value(out, name, type, value);
-    out << name << " = " << v2 << ";" << endl;
-    need_static_construction = false;
-  } else if (type->is_enum()) {
-    out << name << " = " << type_name(type, false, true) << "." << value->get_identifier_name()
-        << ";" << endl;
-    need_static_construction = false;
-  } else if (type->is_struct() || type->is_xception()) {
-    out << name << " = new " << type_name(type) << "();" << endl;
-  } else if (type->is_map()) {
-    out << name << " = new " << type_name(type, true, true) << "();" << endl;
-  } else if (type->is_list() || type->is_set()) {
-    out << name << " = new " << type_name(type) << "();" << endl;
-  }
-
-  if (defval && !type->is_base_type() && !type->is_enum()) {
-    print_const_def_value(out, name, type, value);
-  }
-
-  return need_static_construction;
-}
-
-std::string t_csharp_generator::render_const_value(ofstream& out,
-                                                   string name,
-                                                   t_type* type,
-                                                   t_const_value* value) {
-  (void)name;
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << type->get_name() << "." << value->get_identifier_name();
-  } else {
-    string t = tmp("tmp");
-    print_const_value(out, t, type, value, true, true, true);
-    render << t;
-  }
-
-  return render.str();
-}
-
-void t_csharp_generator::generate_struct(t_struct* tstruct) {
-  if (union_ && tstruct->is_union()) {
-    generate_csharp_union(tstruct);
-  } else {
-    generate_csharp_struct(tstruct, false);
-  }
-}
-
-void t_csharp_generator::generate_xception(t_struct* txception) {
-  generate_csharp_struct(txception, true);
-}
-
-void t_csharp_generator::generate_csharp_struct(t_struct* tstruct, bool is_exception) {
-  string f_struct_name = namespace_dir_ + "/" + (tstruct->get_name()) + ".cs";
-  ofstream f_struct;
-
-  f_struct.open(f_struct_name.c_str());
-
-  f_struct << autogen_comment() << csharp_type_usings() << csharp_thrift_usings() << endl;
-
-  generate_csharp_struct_definition(f_struct, tstruct, is_exception);
-
-  f_struct.close();
-}
-
-void t_csharp_generator::generate_csharp_struct_definition(ofstream& out,
-                                                           t_struct* tstruct,
-                                                           bool is_exception,
-                                                           bool in_class,
-                                                           bool is_result) {
-
-  if (!in_class) {
-    start_csharp_namespace(out);
-  }
-
-  out << endl;
-
-  generate_csharp_doc(out, tstruct);
-  prepare_member_name_mapping(tstruct);
-
-  indent(out) << "#if !SILVERLIGHT" << endl;
-  indent(out) << "[Serializable]" << endl;
-  indent(out) << "#endif" << endl;
-  if ((serialize_ || wcf_) && !is_exception) {
-    indent(out) << "[DataContract(Namespace=\"" << wcf_namespace_ << "\")]"
-                << endl; // do not make exception classes directly WCF serializable, we provide a
-                         // separate "fault" for that
-  }
-  bool is_final = (tstruct->annotations_.find("final") != tstruct->annotations_.end());
-
-  indent(out) << "public " << (is_final ? "sealed " : "") << "partial class "
-              << normalize_name(tstruct->get_name()) << " : ";
-
-  if (is_exception) {
-    out << "TException, ";
-  }
-  out << "TBase";
-
-  out << endl;
-
-  scope_up(out);
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  // make private members with public Properties
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    // if the field is requied, then we use auto-properties
-    if (!field_is_required((*m_iter)) && (!nullable_ || field_has_default((*m_iter)))) {
-      indent(out) << "private " << declare_field(*m_iter, false, "_") << endl;
-    }
-  }
-  out << endl;
-
-  bool has_non_required_fields = false;
-  bool has_non_required_default_value_fields = false;
-  bool has_required_fields = false;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    generate_csharp_doc(out, *m_iter);
-    generate_property(out, *m_iter, true, true);
-    bool is_required = field_is_required((*m_iter));
-    bool has_default = field_has_default((*m_iter));
-    if (is_required) {
-      has_required_fields = true;
-    } else {
-      if (has_default) {
-        has_non_required_default_value_fields = true;
-      }
-      has_non_required_fields = true;
-    }
-  }
-
-  bool generate_isset = (nullable_ && has_non_required_default_value_fields)
-                        || (!nullable_ && has_non_required_fields);
-  if (generate_isset) {
-    out << endl;
-    if (serialize_ || wcf_) {
-      out << indent() << "[XmlIgnore] // XmlSerializer" << endl << indent()
-          << "[DataMember(Order = 1)]  // XmlObjectSerializer, DataContractJsonSerializer, etc."
-          << endl;
-    }
-    out << indent() << "public Isset __isset;" << endl << indent() << "#if !SILVERLIGHT" << endl
-        << indent() << "[Serializable]" << endl << indent() << "#endif" << endl;
-    if (serialize_ || wcf_) {
-      indent(out) << "[DataContract]" << endl;
-    }
-    indent(out) << "public struct Isset {" << endl;
-    indent_up();
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      bool is_required = field_is_required((*m_iter));
-      bool has_default = field_has_default((*m_iter));
-      // if it is required, don't need Isset for that variable
-      // if it is not required, if it has a default value, we need to generate Isset
-      // if we are not nullable, then we generate Isset
-      if (!is_required && (!nullable_ || has_default)) {
-        if (serialize_ || wcf_) {
-          indent(out) << "[DataMember]" << endl;
-        }
-        indent(out) << "public bool " << normalize_name((*m_iter)->get_name()) << ";" << endl;
-      }
-    }
-
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    if (generate_isset && (serialize_ || wcf_)) {
-      indent(out) << "#region XmlSerializer support" << endl << endl;
-
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        bool is_required = field_is_required((*m_iter));
-        bool has_default = field_has_default((*m_iter));
-        // if it is required, don't need Isset for that variable
-        // if it is not required, if it has a default value, we need to generate Isset
-        // if we are not nullable, then we generate Isset
-        if (!is_required && (!nullable_ || has_default)) {
-          indent(out) << "public bool ShouldSerialize" << prop_name((*m_iter)) << "()" << endl;
-          indent(out) << "{" << endl;
-          indent_up();
-          indent(out) << "return __isset." << normalize_name((*m_iter)->get_name()) << ";" << endl;
-          indent_down();
-          indent(out) << "}" << endl << endl;
-        }
-      }
-
-      indent(out) << "#endregion XmlSerializer support" << endl << endl;
-    }
-  }
-
-  // We always want a default, no argument constructor for Reading
-  indent(out) << "public " << normalize_name(tstruct->get_name()) << "() {" << endl;
-  indent_up();
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = (*m_iter)->get_type();
-    while (t->is_typedef()) {
-      t = ((t_typedef*)t)->get_type();
-    }
-    if ((*m_iter)->get_value() != NULL) {
-      if (field_is_required((*m_iter))) {
-        print_const_value(out, "this." + prop_name(*m_iter), t, (*m_iter)->get_value(), true, true);
-      } else {
-        print_const_value(out,
-                          "this._" + (*m_iter)->get_name(),
-                          t,
-                          (*m_iter)->get_value(),
-                          true,
-                          true);
-        // Optionals with defaults are marked set
-        indent(out) << "this.__isset." << normalize_name((*m_iter)->get_name()) << " = true;"
-                    << endl;
-      }
-    }
-  }
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  if (has_required_fields) {
-    indent(out) << "public " << tstruct->get_name() << "(";
-    bool first = true;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (field_is_required((*m_iter))) {
-        if (first) {
-          first = false;
-        } else {
-          out << ", ";
-        }
-        out << type_name((*m_iter)->get_type()) << " " << (*m_iter)->get_name();
-      }
-    }
-    out << ") : this() {" << endl;
-    indent_up();
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (field_is_required((*m_iter))) {
-        indent(out) << "this." << prop_name((*m_iter)) << " = " << (*m_iter)->get_name() << ";"
-                    << endl;
-      }
-    }
-
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-
-  generate_csharp_struct_reader(out, tstruct);
-  if (is_result) {
-    generate_csharp_struct_result_writer(out, tstruct);
-  } else {
-    generate_csharp_struct_writer(out, tstruct);
-  }
-  if (hashcode_) {
-    generate_csharp_struct_equals(out, tstruct);
-    generate_csharp_struct_hashcode(out, tstruct);
-  }
-  generate_csharp_struct_tostring(out, tstruct);
-  scope_down(out);
-  out << endl;
-
-  // generate a corresponding WCF fault to wrap the exception
-  if ((serialize_ || wcf_) && is_exception) {
-    generate_csharp_wcffault(out, tstruct);
-  }
-
-  cleanup_member_name_mapping(tstruct);
-  if (!in_class) {
-    end_csharp_namespace(out);
-  }
-}
-
-void t_csharp_generator::generate_csharp_wcffault(ofstream& out, t_struct* tstruct) {
-  out << endl;
-  indent(out) << "#if !SILVERLIGHT" << endl;
-  indent(out) << "[Serializable]" << endl;
-  indent(out) << "#endif" << endl;
-  indent(out) << "[DataContract]" << endl;
-  bool is_final = (tstruct->annotations_.find("final") != tstruct->annotations_.end());
-
-  indent(out) << "public " << (is_final ? "sealed " : "") << "partial class " << tstruct->get_name()
-              << "Fault" << endl;
-
-  scope_up(out);
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  // make private members with public Properties
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "private " << declare_field(*m_iter, false, "_") << endl;
-  }
-  out << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    generate_property(out, *m_iter, true, false);
-  }
-
-  scope_down(out);
-  out << endl;
-}
-
-void t_csharp_generator::generate_csharp_struct_reader(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public void Read (TProtocol iprot)" << endl;
-  scope_up(out);
-
-  out << indent() << "iprot.IncrementRecursionDepth();" << endl;
-  out << indent() << "try" << endl;
-  scope_up(out);
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Required variables aren't in __isset, so we need tmp vars to check them
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (field_is_required((*f_iter))) {
-      indent(out) << "bool isset_" << (*f_iter)->get_name() << " = false;" << endl;
-    }
-  }
-
-  indent(out) << "TField field;" << endl << indent() << "iprot.ReadStructBegin();" << endl;
-
-  indent(out) << "while (true)" << endl;
-  scope_up(out);
-
-  indent(out) << "field = iprot.ReadFieldBegin();" << endl;
-
-  indent(out) << "if (field.Type == TType.Stop) { " << endl;
-  indent_up();
-  indent(out) << "break;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent(out) << "switch (field.ID)" << endl;
-
-  scope_up(out);
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool is_required = field_is_required((*f_iter));
-    indent(out) << "case " << (*f_iter)->get_key() << ":" << endl;
-    indent_up();
-    indent(out) << "if (field.Type == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-    indent_up();
-
-    generate_deserialize_field(out, *f_iter);
-    if (is_required) {
-      indent(out) << "isset_" << (*f_iter)->get_name() << " = true;" << endl;
-    }
-
-    indent_down();
-    out << indent() << "} else { " << endl << indent() << "  TProtocolUtil.Skip(iprot, field.Type);"
-        << endl << indent() << "}" << endl << indent() << "break;" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default: " << endl;
-  indent_up();
-  indent(out) << "TProtocolUtil.Skip(iprot, field.Type);" << endl;
-  indent(out) << "break;" << endl;
-  indent_down();
-
-  scope_down(out);
-
-  indent(out) << "iprot.ReadFieldEnd();" << endl;
-
-  scope_down(out);
-
-  indent(out) << "iprot.ReadStructEnd();" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (field_is_required((*f_iter))) {
-      indent(out) << "if (!isset_" << (*f_iter)->get_name() << ")" << endl;
-      indent_up();
-      indent(out) << "throw new TProtocolException(TProtocolException.INVALID_DATA);" << endl;
-      indent_down();
-    }
-  }
-
-  scope_down(out);
-  out << indent() << "finally" << endl;
-  scope_up(out);
-  out << indent() << "iprot.DecrementRecursionDepth();" << endl;
-  scope_down(out);
-
-  indent_down();
-
-  indent(out) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_csharp_struct_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public void Write(TProtocol oprot) {" << endl;
-  indent_up();
-
-  out << indent() << "oprot.IncrementRecursionDepth();" << endl;
-  out << indent() << "try" << endl;
-  scope_up(out);
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "TStruct struc = new TStruct(\"" << name << "\");" << endl;
-  indent(out) << "oprot.WriteStructBegin(struc);" << endl;
-
-  if (fields.size() > 0) {
-    indent(out) << "TField field = new TField();" << endl;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      bool is_required = field_is_required((*f_iter));
-      bool has_default = field_has_default((*f_iter));
-      if (nullable_ && !has_default && !is_required) {
-        indent(out) << "if (" << prop_name((*f_iter)) << " != null) {" << endl;
-        indent_up();
-      } else if (!is_required) {
-        bool null_allowed = type_can_be_null((*f_iter)->get_type());
-        if (null_allowed) {
-          indent(out) << "if (" << prop_name((*f_iter)) << " != null && __isset."
-                      << normalize_name((*f_iter)->get_name()) << ") {" << endl;
-          indent_up();
-        } else {
-          indent(out) << "if (__isset." << normalize_name((*f_iter)->get_name()) << ") {" << endl;
-          indent_up();
-        }
-      }
-      indent(out) << "field.Name = \"" << (*f_iter)->get_name() << "\";" << endl;
-      indent(out) << "field.Type = " << type_to_enum((*f_iter)->get_type()) << ";" << endl;
-      indent(out) << "field.ID = " << (*f_iter)->get_key() << ";" << endl;
-      indent(out) << "oprot.WriteFieldBegin(field);" << endl;
-
-      generate_serialize_field(out, *f_iter);
-
-      indent(out) << "oprot.WriteFieldEnd();" << endl;
-      if (!is_required) {
-        indent_down();
-        indent(out) << "}" << endl;
-      }
-    }
-  }
-
-  indent(out) << "oprot.WriteFieldStop();" << endl;
-  indent(out) << "oprot.WriteStructEnd();" << endl;
-
-  scope_down(out);
-  out << indent() << "finally" << endl;
-  scope_up(out);
-  out << indent() << "oprot.DecrementRecursionDepth();" << endl;
-  scope_down(out);
-
-  indent_down();
-
-  indent(out) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_csharp_struct_result_writer(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public void Write(TProtocol oprot) {" << endl;
-  indent_up();
-
-  out << indent() << "oprot.IncrementRecursionDepth();" << endl;
-  out << indent() << "try" << endl;
-  scope_up(out);
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "TStruct struc = new TStruct(\"" << name << "\");" << endl;
-  indent(out) << "oprot.WriteStructBegin(struc);" << endl;
-
-  if (fields.size() > 0) {
-    indent(out) << "TField field = new TField();" << endl;
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-        out << endl << indent() << "if ";
-      } else {
-        out << " else if ";
-      }
-
-      if (nullable_) {
-        out << "(this." << prop_name((*f_iter)) << " != null) {" << endl;
-      } else {
-        out << "(this.__isset." << normalize_name((*f_iter)->get_name()) << ") {" << endl;
-      }
-      indent_up();
-
-      bool null_allowed = !nullable_ && type_can_be_null((*f_iter)->get_type());
-      if (null_allowed) {
-        indent(out) << "if (" << prop_name(*f_iter) << " != null) {" << endl;
-        indent_up();
-      }
-
-      indent(out) << "field.Name = \"" << prop_name(*f_iter) << "\";" << endl;
-      indent(out) << "field.Type = " << type_to_enum((*f_iter)->get_type()) << ";" << endl;
-      indent(out) << "field.ID = " << (*f_iter)->get_key() << ";" << endl;
-      indent(out) << "oprot.WriteFieldBegin(field);" << endl;
-
-      generate_serialize_field(out, *f_iter);
-
-      indent(out) << "oprot.WriteFieldEnd();" << endl;
-
-      if (null_allowed) {
-        indent_down();
-        indent(out) << "}" << endl;
-      }
-
-      indent_down();
-      indent(out) << "}";
-    }
-  }
-
-  out << endl << indent() << "oprot.WriteFieldStop();" << endl << indent()
-      << "oprot.WriteStructEnd();" << endl;
-
-  scope_down(out);
-  out << indent() << "finally" << endl;
-  scope_up(out);
-  out << indent() << "oprot.DecrementRecursionDepth();" << endl;
-  scope_down(out);
-
-  indent_down();
-
-  indent(out) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_csharp_struct_tostring(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public override string ToString() {" << endl;
-  indent_up();
-
-  indent(out) << "StringBuilder __sb = new StringBuilder(\"" << tstruct->get_name() << "(\");"
-              << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  bool useFirstFlag = false;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (!field_is_required((*f_iter))) {
-      indent(out) << "bool __first = true;" << endl;
-      useFirstFlag = true;
-    }
-    break;
-  }
-
-  bool had_required = false; // set to true after first required field has been processed
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool is_required = field_is_required((*f_iter));
-    bool has_default = field_has_default((*f_iter));
-    if (nullable_ && !has_default && !is_required) {
-      indent(out) << "if (" << prop_name((*f_iter)) << " != null) {" << endl;
-      indent_up();
-    } else if (!is_required) {
-      bool null_allowed = type_can_be_null((*f_iter)->get_type());
-      if (null_allowed) {
-        indent(out) << "if (" << prop_name((*f_iter)) << " != null && __isset."
-                    << normalize_name((*f_iter)->get_name()) << ") {" << endl;
-        indent_up();
-      } else {
-        indent(out) << "if (__isset." << normalize_name((*f_iter)->get_name()) << ") {" << endl;
-        indent_up();
-      }
-    }
-
-    if (useFirstFlag && (!had_required)) {
-      indent(out) << "if(!__first) { __sb.Append(\", \"); }" << endl;
-      if (!is_required) {
-        indent(out) << "__first = false;" << endl;
-      }
-      indent(out) << "__sb.Append(\"" << prop_name((*f_iter)) << ": \");" << endl;
-    } else {
-      indent(out) << "__sb.Append(\", " << prop_name((*f_iter)) << ": \");" << endl;
-    }
-
-    t_type* ttype = (*f_iter)->get_type();
-    if (ttype->is_xception() || ttype->is_struct()) {
-      indent(out) << "__sb.Append(" << prop_name((*f_iter))
-                  << "== null ? \"<null>\" : " << prop_name((*f_iter)) << ".ToString());" << endl;
-    } else {
-      indent(out) << "__sb.Append(" << prop_name((*f_iter)) << ");" << endl;
-    }
-
-    if (!is_required) {
-      indent_down();
-      indent(out) << "}" << endl;
-    } else {
-      had_required = true; // now __first must be false, so we don't need to check it anymore
-    }
-  }
-
-  indent(out) << "__sb.Append(\")\");" << endl;
-  indent(out) << "return __sb.ToString();" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_csharp_union(t_struct* tunion) {
-  string f_union_name = namespace_dir_ + "/" + (tunion->get_name()) + ".cs";
-  ofstream f_union;
-
-  f_union.open(f_union_name.c_str());
-
-  f_union << autogen_comment() << csharp_type_usings() << csharp_thrift_usings() << endl;
-
-  generate_csharp_union_definition(f_union, tunion);
-
-  f_union.close();
-}
-
-void t_csharp_generator::generate_csharp_union_definition(std::ofstream& out, t_struct* tunion) {
-  // Let's define the class first
-  start_csharp_namespace(out);
-
-  indent(out) << "public abstract partial class " << tunion->get_name() << " : TAbstractBase {"
-              << endl;
-
-  indent_up();
-
-  indent(out) << "public abstract void Write(TProtocol protocol);" << endl;
-  indent(out) << "public readonly bool Isset;" << endl;
-  indent(out) << "public abstract object Data { get; }" << endl;
-
-  indent(out) << "protected " << tunion->get_name() << "(bool isset) {" << endl;
-  indent_up();
-  indent(out) << "Isset = isset;" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "public class ___undefined : " << tunion->get_name() << " {" << endl;
-  indent_up();
-
-  indent(out) << "public override object Data { get { return null; } }" << endl;
-
-  indent(out) << "public ___undefined() : base(false) {}" << endl << endl;
-
-  indent(out) << "public override void Write(TProtocol protocol) {" << endl;
-  indent_up();
-  indent(out) << "throw new TProtocolException( TProtocolException.INVALID_DATA, \"Cannot persist "
-                 "an union type which is not set.\");" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  const vector<t_field*>& fields = tunion->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    generate_csharp_union_class(out, tunion, (*f_iter));
-  }
-
-  generate_csharp_union_reader(out, tunion);
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  end_csharp_namespace(out);
-}
-
-void t_csharp_generator::generate_csharp_union_class(std::ofstream& out,
-                                                     t_struct* tunion,
-                                                     t_field* tfield) {
-  indent(out) << "public class " << tfield->get_name() << " : " << tunion->get_name() << " {"
-              << endl;
-  indent_up();
-  indent(out) << "private " << type_name(tfield->get_type()) << " _data;" << endl;
-  indent(out) << "public override object Data { get { return _data; } }" << endl;
-  indent(out) << "public " << tfield->get_name() << "(" << type_name(tfield->get_type())
-              << " data) : base(true) {" << endl;
-  indent_up();
-  indent(out) << "this._data = data;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-  indent(out) << "public override void Write(TProtocol oprot) {" << endl;
-  indent_up();
-
-  out << indent() << "oprot.IncrementRecursionDepth();" << endl;
-  out << indent() << "try" << endl;
-  scope_up(out);
-
-  indent(out) << "TStruct struc = new TStruct(\"" << tunion->get_name() << "\");" << endl;
-  indent(out) << "oprot.WriteStructBegin(struc);" << endl;
-
-  indent(out) << "TField field = new TField();" << endl;
-  indent(out) << "field.Name = \"" << tfield->get_name() << "\";" << endl;
-  indent(out) << "field.Type = " << type_to_enum(tfield->get_type()) << ";" << endl;
-  indent(out) << "field.ID = " << tfield->get_key() << ";" << endl;
-  indent(out) << "oprot.WriteFieldBegin(field);" << endl;
-
-  generate_serialize_field(out, tfield, "_data", true, true);
-
-  indent(out) << "oprot.WriteFieldEnd();" << endl;
-  indent(out) << "oprot.WriteFieldStop();" << endl;
-  indent(out) << "oprot.WriteStructEnd();" << endl;
-  indent_down();
-
-  scope_down(out);
-  out << indent() << "finally" << endl;
-  scope_up(out);
-  out << indent() << "oprot.DecrementRecursionDepth();" << endl;
-  scope_down(out);
-
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_csharp_struct_equals(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public override bool Equals(object that) {" << endl;
-  indent_up();
-
-  indent(out) << "var other = that as " << type_name(tstruct) << ";" << endl;
-  indent(out) << "if (other == null) return false;" << endl;
-  indent(out) << "if (ReferenceEquals(this, other)) return true;" << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  bool first = true;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      indent(out) << "return ";
-      indent_up();
-    } else {
-      out << endl;
-      indent(out) << "&& ";
-    }
-    if (!field_is_required((*f_iter)) && !(nullable_ && !field_has_default((*f_iter)))) {
-      out << "((__isset." << normalize_name((*f_iter)->get_name()) << " == other.__isset."
-          << normalize_name((*f_iter)->get_name()) << ") && ((!__isset."
-          << normalize_name((*f_iter)->get_name()) << ") || (";
-    }
-    t_type* ttype = (*f_iter)->get_type();
-    if (ttype->is_container() || (ttype->is_base_type() && (((t_base_type*)ttype)->is_binary()))) {
-      out << "TCollections.Equals(";
-    } else {
-      out << "System.Object.Equals(";
-    }
-    out << prop_name((*f_iter)) << ", other." << prop_name((*f_iter)) << ")";
-    if (!field_is_required((*f_iter)) && !(nullable_ && !field_has_default((*f_iter)))) {
-      out << ")))";
-    }
-  }
-  if (first) {
-    indent(out) << "return true;" << endl;
-  } else {
-    out << ";" << endl;
-    indent_down();
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_csharp_struct_hashcode(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public override int GetHashCode() {" << endl;
-  indent_up();
-
-  indent(out) << "int hashcode = 0;" << endl;
-  indent(out) << "unchecked {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_type* ttype = (*f_iter)->get_type();
-    indent(out) << "hashcode = (hashcode * 397) ^ ";
-    if (field_is_required((*f_iter))) {
-      out << "(";
-    } else if (nullable_) {
-      out << "(" << prop_name((*f_iter)) << " == null ? 0 : ";
-    } else {
-      out << "(!__isset." << normalize_name((*f_iter)->get_name()) << " ? 0 : ";
-    }
-    if (ttype->is_container()) {
-      out << "(TCollections.GetHashCode(" << prop_name((*f_iter)) << "))";
-    } else {
-      out << "(" << prop_name((*f_iter)) << ".GetHashCode())";
-    }
-    out << ");" << endl;
-  }
-
-  indent_down();
-  indent(out) << "}" << endl;
-  indent(out) << "return hashcode;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_service(t_service* tservice) {
-  string f_service_name = namespace_dir_ + "/" + service_name_ + ".cs";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << csharp_type_usings() << csharp_thrift_usings() << endl;
-
-  start_csharp_namespace(f_service_);
-
-  indent(f_service_) << "public partial class " << normalize_name(service_name_) << " {" << endl;
-  indent_up();
-
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-  generate_service_helpers(tservice);
-
-  indent_down();
-
-  indent(f_service_) << "}" << endl;
-  end_csharp_namespace(f_service_);
-  f_service_.close();
-}
-
-void t_csharp_generator::generate_service_interface(t_service* tservice) {
-  generate_separate_service_interfaces(tservice);
-}
-
-void t_csharp_generator::generate_separate_service_interfaces(t_service* tservice) {
-  generate_sync_service_interface(tservice);
-
-  if (async_) {
-    generate_async_service_interface(tservice);
-  }
-
-  generate_combined_service_interface(tservice);
-}
-
-void t_csharp_generator::generate_sync_service_interface(t_service* tservice) {
-  string extends = "";
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_iface = " : " + extends + ".ISync";
-  }
-
-  generate_csharp_doc(f_service_, tservice);
-
-  if (wcf_) {
-    indent(f_service_) << "[ServiceContract(Namespace=\"" << wcf_namespace_ << "\")]" << endl;
-  }
-  indent(f_service_) << "public interface ISync" << extends_iface << " {" << endl;
-
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_csharp_doc(f_service_, *f_iter);
-
-    // if we're using WCF, add the corresponding attributes
-    if (wcf_) {
-      indent(f_service_) << "[OperationContract]" << endl;
-
-      const std::vector<t_field*>& xceptions = (*f_iter)->get_xceptions()->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        indent(f_service_) << "[FaultContract(typeof("
-          + type_name((*x_iter)->get_type(), false, false) + "Fault))]" << endl;
-      }
-    }
-
-    indent(f_service_) << function_signature(*f_iter) << ";" << endl;
-  }
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_async_service_interface(t_service* tservice) {
-  string extends = "";
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_iface = " : " + extends + ".IAsync";
-  }
-
-  generate_csharp_doc(f_service_, tservice);
-
-  if (wcf_) {
-    indent(f_service_) << "[ServiceContract(Namespace=\"" << wcf_namespace_ << "\")]" << endl;
-  }
-  indent(f_service_) << "public interface IAsync" << extends_iface << " {" << endl;
-
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_csharp_doc(f_service_, *f_iter);
-
-    // if we're using WCF, add the corresponding attributes
-    if (wcf_) {
-      indent(f_service_) << "[OperationContract]" << endl;
-
-      const std::vector<t_field*>& xceptions = (*f_iter)->get_xceptions()->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        indent(f_service_) << "[FaultContract(typeof("
-          + type_name((*x_iter)->get_type(), false, false) + "Fault))]" << endl;
-      }
-    }
-
-    indent(f_service_) << function_signature_async(*f_iter) << ";" << endl;
-  }
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_combined_service_interface(t_service* tservice) {
-  string extends_iface = " : ISync";
-
-  if (async_) {
-    extends_iface += ", IAsync";
-  }
-
-  generate_csharp_doc(f_service_, tservice);
-
-  if (wcf_) {
-    indent(f_service_) << "[ServiceContract(Namespace=\"" << wcf_namespace_ << "\")]" << endl;
-  }
-
-  indent(f_service_) << "public interface Iface" << extends_iface << " {" << endl;
-
-  indent_up();
-
-  // We need to generate extra old style async methods for silverlight. Since
-  // this isn't something you'd want to implement server-side, just put them into
-  // the main Iface interface.
-  generate_silverlight_async_methods(tservice);
-
-  indent_down();
-
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_silverlight_async_methods(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_csharp_doc(f_service_, *f_iter);
-
-    // For backwards compatibility, include the Begin_, End_ methods if we're generating
-    // with the async flag. I'm not sure this is necessary, so someone with more knowledge
-    // can maybe remove these checks if they know it's safe.
-    if (!async_) {
-      indent(f_service_) << "#if SILVERLIGHT" << endl;
-    }
-
-    indent(f_service_) << function_signature_async_begin(*f_iter, "Begin_") << ";" << endl;
-    indent(f_service_) << function_signature_async_end(*f_iter, "End_") << ";" << endl;
-
-    if (!async_) {
-      indent(f_service_) << "#endif" << endl;
-    }
-  }
-}
-
-void t_csharp_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_csharp_struct_definition(f_service_, ts, false, true);
-    generate_function_helpers(*f_iter);
-  }
-}
-
-void t_csharp_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_client = extends + ".Client, ";
-  } else {
-    extends_client = "IDisposable, ";
-  }
-
-  generate_csharp_doc(f_service_, tservice);
-
-  indent(f_service_) << "public class Client : " << extends_client << "Iface {" << endl;
-  indent_up();
-  indent(f_service_) << "public Client(TProtocol prot) : this(prot, prot)" << endl;
-  scope_up(f_service_);
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  indent(f_service_) << "public Client(TProtocol iprot, TProtocol oprot)";
-  if (!extends.empty()) {
-    f_service_ << " : base(iprot, oprot)";
-  }
-  f_service_ << endl;
-
-  scope_up(f_service_);
-  if (extends.empty()) {
-    f_service_ << indent() << "iprot_ = iprot;" << endl << indent() << "oprot_ = oprot;" << endl;
-  }
-  scope_down(f_service_);
-
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent() << "protected TProtocol iprot_;" << endl << indent()
-               << "protected TProtocol oprot_;" << endl << indent() << "protected int seqid_;"
-               << endl << endl;
-
-    f_service_ << indent() << "public TProtocol InputProtocol" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "get { return iprot_; }" << endl;
-    scope_down(f_service_);
-
-    f_service_ << indent() << "public TProtocol OutputProtocol" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "get { return oprot_; }" << endl;
-    scope_down(f_service_);
-    f_service_ << endl << endl;
-
-    indent(f_service_) << "#region \" IDisposable Support \"" << endl;
-    indent(f_service_) << "private bool _IsDisposed;" << endl << endl;
-    indent(f_service_) << "// IDisposable" << endl;
-    indent(f_service_) << "public void Dispose()" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "Dispose(true);" << endl;
-    scope_down(f_service_);
-    indent(f_service_) << endl << endl;
-    indent(f_service_) << "protected virtual void Dispose(bool disposing)" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "if (!_IsDisposed)" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "if (disposing)" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "if (iprot_ != null)" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "((IDisposable)iprot_).Dispose();" << endl;
-    scope_down(f_service_);
-    indent(f_service_) << "if (oprot_ != null)" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "((IDisposable)oprot_).Dispose();" << endl;
-    scope_down(f_service_);
-    scope_down(f_service_);
-    scope_down(f_service_);
-    indent(f_service_) << "_IsDisposed = true;" << endl;
-    scope_down(f_service_);
-    indent(f_service_) << "#endregion" << endl;
-    f_service_ << endl << endl;
-  }
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-
-    indent(f_service_) << endl;
-
-    if (!async_) {
-      indent(f_service_) << "#if SILVERLIGHT" << endl;
-    }
-    // Begin_
-    indent(f_service_) << "public " << function_signature_async_begin(*f_iter, "Begin_") << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "return "
-                       << "send_" << funname << "(callback, state";
-
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    prepare_member_name_mapping(arg_struct);
-
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << ", ";
-      f_service_ << normalize_name((*fld_iter)->get_name());
-    }
-    f_service_ << ");" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    // End
-    indent(f_service_) << "public " << function_signature_async_end(*f_iter, "End_") << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "oprot_.Transport.EndFlush(asyncResult);" << endl;
-    if (!(*f_iter)->is_oneway()) {
-      f_service_ << indent();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << "return ";
-      }
-      f_service_ << "recv_" << funname << "();" << endl;
-    }
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    // async
-    bool first;
-    if (async_) {
-      indent(f_service_) << "public async " << function_signature_async(*f_iter, "") << endl;
-      scope_up(f_service_);
-
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << type_name((*f_iter)->get_returntype()) << " retval;" << endl;
-        indent(f_service_) << "retval = ";
-      } else {
-        indent(f_service_);
-      }
-      f_service_ << "await Task.Run(() =>" << endl;
-      scope_up(f_service_);
-      indent(f_service_);
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << "return ";
-      }
-      f_service_ << funname << "(";
-      first = true;
-      for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-        if (first) {
-          first = false;
-        } else {
-          f_service_ << ", ";
-        }
-        f_service_ << (*fld_iter)->get_name();
-      }
-      f_service_ << ");" << endl;
-      indent_down();
-      indent(f_service_) << "});" << endl;
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "return retval;" << endl;
-      }
-      scope_down(f_service_);
-      f_service_ << endl;
-    }
-
-    if (!async_) {
-      indent(f_service_) << "#endif" << endl << endl;
-    }
-
-    // "Normal" Synchronous invoke
-    generate_csharp_doc(f_service_, *f_iter);
-    indent(f_service_) << "public " << function_signature(*f_iter) << endl;
-    scope_up(f_service_);
-
-    if (!async_) {
-      indent(f_service_) << "#if !SILVERLIGHT" << endl;
-      indent(f_service_) << "send_" << funname << "(";
-
-      first = true;
-      for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-        if (first) {
-          first = false;
-        } else {
-          f_service_ << ", ";
-        }
-        f_service_ << normalize_name((*fld_iter)->get_name());
-      }
-      f_service_ << ");" << endl;
-
-      if (!(*f_iter)->is_oneway()) {
-        f_service_ << indent();
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          f_service_ << "return ";
-        }
-        f_service_ << "recv_" << funname << "();" << endl;
-      }
-      f_service_ << endl;
-
-      indent(f_service_) << "#else" << endl;
-    }
-
-    // Silverlight synchronous invoke
-    indent(f_service_) << "var asyncResult = Begin_" << funname << "(null, null";
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << ", " << normalize_name((*fld_iter)->get_name());
-    }
-    f_service_ << ");" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_service_ << indent();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << "return ";
-      }
-      f_service_ << "End_" << funname << "(asyncResult);" << endl;
-    }
-    f_service_ << endl;
-
-    if (!async_) {
-      indent(f_service_) << "#endif" << endl;
-    }
-    scope_down(f_service_);
-
-    // Send
-    t_function send_function(g_type_void,
-                             string("send_") + (*f_iter)->get_name(),
-                             (*f_iter)->get_arglist());
-
-    string argsname = (*f_iter)->get_name() + "_args";
-
-    if (!async_) {
-      indent(f_service_) << "#if SILVERLIGHT" << endl;
-    }
-    indent(f_service_) << "public " << function_signature_async_begin(&send_function) << endl;
-    if (!async_) {
-      indent(f_service_) << "#else" << endl;
-      indent(f_service_) << "public " << function_signature(&send_function) << endl;
-      indent(f_service_) << "#endif" << endl;
-    }
-    scope_up(f_service_);
-
-    f_service_ << indent() << "oprot_.WriteMessageBegin(new TMessage(\"" << funname << "\", "
-               << ((*f_iter)->is_oneway() ? "TMessageType.Oneway" : "TMessageType.Call")
-               << ", seqid_));" << endl << indent() << argsname << " args = new " << argsname
-               << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "args." << prop_name(*fld_iter) << " = "
-                 << normalize_name((*fld_iter)->get_name()) << ";" << endl;
-    }
-
-    f_service_ << indent() << "args.Write(oprot_);" << endl << indent()
-               << "oprot_.WriteMessageEnd();" << endl;
-    ;
-
-    if (!async_) {
-      indent(f_service_) << "#if SILVERLIGHT" << endl;
-    }
-    indent(f_service_) << "return oprot_.Transport.BeginFlush(callback, state);" << endl;
-    if (!async_) {
-      indent(f_service_) << "#else" << endl;
-      indent(f_service_) << "oprot_.Transport.Flush();" << endl;
-      indent(f_service_) << "#endif" << endl;
-    }
-
-    cleanup_member_name_mapping(arg_struct);
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      string resultname = (*f_iter)->get_name() + "_result";
-
-      t_struct noargs(program_);
-      t_function recv_function((*f_iter)->get_returntype(),
-                               string("recv_") + (*f_iter)->get_name(),
-                               &noargs,
-                               (*f_iter)->get_xceptions());
-      indent(f_service_) << "public " << function_signature(&recv_function) << endl;
-      scope_up(f_service_);
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      prepare_member_name_mapping(xs, xs->get_members(), resultname);
-
-      f_service_ << indent() << "TMessage msg = iprot_.ReadMessageBegin();" << endl << indent()
-                 << "if (msg.Type == TMessageType.Exception) {" << endl;
-      indent_up();
-      f_service_ << indent() << "TApplicationException x = TApplicationException.Read(iprot_);"
-                 << endl << indent() << "iprot_.ReadMessageEnd();" << endl << indent() << "throw x;"
-                 << endl;
-      indent_down();
-      f_service_ << indent() << "}" << endl << indent() << resultname << " result = new "
-                 << resultname << "();" << endl << indent() << "result.Read(iprot_);" << endl
-                 << indent() << "iprot_.ReadMessageEnd();" << endl;
-
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        if (nullable_) {
-          if (type_can_be_null((*f_iter)->get_returntype())) {
-            f_service_ << indent() << "if (result.Success != null) {" << endl << indent()
-                       << "  return result.Success;" << endl << indent() << "}" << endl;
-          } else {
-            f_service_ << indent() << "if (result.Success.HasValue) {" << endl << indent()
-                       << "  return result.Success.Value;" << endl << indent() << "}" << endl;
-          }
-        } else {
-          f_service_ << indent() << "if (result.__isset.success) {" << endl << indent()
-                     << "  return result.Success;" << endl << indent() << "}" << endl;
-        }
-      }
-
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        if (nullable_) {
-          f_service_ << indent() << "if (result." << prop_name(*x_iter) << " != null) {" << endl
-                     << indent() << "  throw result." << prop_name(*x_iter) << ";" << endl
-                     << indent() << "}" << endl;
-        } else {
-          f_service_ << indent() << "if (result.__isset." << normalize_name((*x_iter)->get_name())
-                     << ") {" << endl << indent() << "  throw result." << prop_name(*x_iter) << ";"
-                     << endl << indent() << "}" << endl;
-        }
-      }
-
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "return;" << endl;
-      } else {
-        f_service_ << indent()
-                   << "throw new "
-                      "TApplicationException(TApplicationException.ExceptionType.MissingResult, \""
-                   << (*f_iter)->get_name() << " failed: unknown result\");" << endl;
-      }
-
-      cleanup_member_name_mapping((*f_iter)->get_xceptions());
-      scope_down(f_service_);
-      f_service_ << endl;
-    }
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl;
-}
-
-void t_csharp_generator::generate_service_server(t_service* tservice) {
-  if (async_) {
-    generate_service_server_async(tservice);
-    generate_service_server_sync(tservice);
-  }
-  else {
-    generate_service_server_sync(tservice);
-  }
-}
-
-void t_csharp_generator::generate_service_server_sync(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_processor = extends + ".Processor, ";
-  }
-
-  indent(f_service_) << "public class Processor : " << extends_processor << "TProcessor {" << endl;
-  indent_up();
-
-  indent(f_service_) << "public Processor(ISync iface)";
-
-  if (!extends.empty()) {
-    f_service_ << " : base(iface)";
-  }
-  f_service_ << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "iface_ = iface;" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << indent() << "processMap_[\"" << (*f_iter)->get_name()
-      << "\"] = " << (*f_iter)->get_name() << "_Process;" << endl;
-  }
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    f_service_
-      << indent()
-      << "protected delegate void ProcessFunction(int seqid, TProtocol iprot, TProtocol oprot);"
-      << endl;
-  }
-
-  f_service_ << indent() << "private ISync iface_;" << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent() << "protected Dictionary<string, ProcessFunction> processMap_ = new "
-      "Dictionary<string, ProcessFunction>();" << endl;
-  }
-
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    indent(f_service_) << "public bool Process(TProtocol iprot, TProtocol oprot)" << endl;
-  }
-  else {
-    indent(f_service_) << "public new bool Process(TProtocol iprot, TProtocol oprot)" << endl;
-  }
-  scope_up(f_service_);
-
-  f_service_ << indent() << "try" << endl;
-  scope_up(f_service_);
-
-  f_service_ << indent() << "TMessage msg = iprot.ReadMessageBegin();" << endl;
-
-  f_service_
-    << indent() << "ProcessFunction fn;" << endl << indent()
-    << "processMap_.TryGetValue(msg.Name, out fn);" << endl << indent() << "if (fn == null) {"
-    << endl << indent() << "  TProtocolUtil.Skip(iprot, TType.Struct);" << endl << indent()
-    << "  iprot.ReadMessageEnd();" << endl << indent()
-    << "  TApplicationException x = new TApplicationException "
-    "(TApplicationException.ExceptionType.UnknownMethod, \"Invalid method name: '\" + "
-    "msg.Name + \"'\");" << endl << indent()
-    << "  oprot.WriteMessageBegin(new TMessage(msg.Name, TMessageType.Exception, msg.SeqID));"
-    << endl << indent() << "  x.Write(oprot);" << endl << indent() << "  oprot.WriteMessageEnd();"
-    << endl << indent() << "  oprot.Transport.Flush();" << endl << indent() << "  return true;"
-    << endl << indent() << "}" << endl << indent() << "fn(msg.SeqID, iprot, oprot);" << endl;
-
-  scope_down(f_service_);
-
-  f_service_ << indent() << "catch (IOException)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "return false;" << endl;
-  scope_down(f_service_);
-
-  f_service_ << indent() << "return true;" << endl;
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_service_server_async(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_processor = extends + ".Processor, ";
-  }
-
-  indent(f_service_) << "public class AsyncProcessor : " << extends_processor << "TAsyncProcessor {" << endl;
-  indent_up();
-
-  indent(f_service_) << "public AsyncProcessor(IAsync iface)";
-  if (!extends.empty()) {
-    f_service_ << " : base(iface)";
-  }
-  f_service_ << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "iface_ = iface;" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << indent() << "processMap_[\"" << (*f_iter)->get_name()
-      << "\"] = " << (*f_iter)->get_name() << "_ProcessAsync;" << endl;
-  }
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    f_service_
-      << indent()
-      << "protected delegate Task ProcessFunction(int seqid, TProtocol iprot, TProtocol oprot);"
-      << endl;
-  }
-
-  f_service_ << indent() << "private IAsync iface_;" << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent() << "protected Dictionary<string, ProcessFunction> processMap_ = new "
-      "Dictionary<string, ProcessFunction>();" << endl;
-  }
-
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    indent(f_service_) << "public async Task<bool> ProcessAsync(TProtocol iprot, TProtocol oprot)" << endl;
-  }
-  else {
-    indent(f_service_) << "public new async Task<bool> ProcessAsync(TProtocol iprot, TProtocol oprot)" << endl;
-  }
-  scope_up(f_service_);
-
-  f_service_ << indent() << "try" << endl;
-  scope_up(f_service_);
-
-  f_service_ << indent() << "TMessage msg = iprot.ReadMessageBegin();" << endl;
-
-  f_service_
-    << indent() << "ProcessFunction fn;" << endl << indent()
-    << "processMap_.TryGetValue(msg.Name, out fn);" << endl << indent() << "if (fn == null) {"
-    << endl << indent() << "  TProtocolUtil.Skip(iprot, TType.Struct);" << endl << indent()
-    << "  iprot.ReadMessageEnd();" << endl << indent()
-    << "  TApplicationException x = new TApplicationException "
-    "(TApplicationException.ExceptionType.UnknownMethod, \"Invalid method name: '\" + "
-    "msg.Name + \"'\");" << endl << indent()
-    << "  oprot.WriteMessageBegin(new TMessage(msg.Name, TMessageType.Exception, msg.SeqID));"
-    << endl << indent() << "  x.Write(oprot);" << endl << indent() << "  oprot.WriteMessageEnd();"
-    << endl << indent() << "  oprot.Transport.Flush();" << endl << indent() << "  return true;"
-    << endl << indent() << "}" << endl << indent() << "await fn(msg.SeqID, iprot, oprot);" << endl;
-
-  scope_down(f_service_);
-
-  f_service_ << indent() << "catch (IOException)" << endl;
-  scope_up(f_service_);
-  f_service_ << indent() << "return false;" << endl;
-  scope_down(f_service_);
-
-  f_service_ << indent() << "return true;" << endl;
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function_async(tservice, *f_iter);
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_function_helpers(t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  t_struct result(program_, tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_csharp_struct_definition(f_service_, &result, false, true, true);
-}
-
-void t_csharp_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  indent(f_service_) << "public void " << tfunction->get_name()
-                     << "_Process(int seqid, TProtocol iprot, TProtocol oprot)" << endl;
-  scope_up(f_service_);
-
-  string argsname = tfunction->get_name() + "_args";
-  string resultname = tfunction->get_name() + "_result";
-
-  f_service_ << indent() << argsname << " args = new " << argsname << "();" << endl
-             << indent() << "args.Read(iprot);" << endl
-             << indent() << "iprot.ReadMessageEnd();" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << resultname << " result = new " << resultname << "();" << endl;
-  }
-
-  f_service_ << indent() << "try" << endl
-             << indent() << "{" << endl;
-  indent_up();
-
-  if (xceptions.size() > 0) {
-    f_service_ << indent() << "try" << endl
-               << indent() << "{" << endl;
-    indent_up();
-  }
-
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  f_service_ << indent();
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_service_ << "result.Success = ";
-  }
-  f_service_ << "iface_." << normalize_name(tfunction->get_name()) << "(";
-  bool first = true;
-  prepare_member_name_mapping(arg_struct);
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_service_ << ", ";
-    }
-    f_service_ << "args." << prop_name(*f_iter);
-    if (nullable_ && !type_can_be_null((*f_iter)->get_type())) {
-      f_service_ << ".Value";
-    }
-  }
-  cleanup_member_name_mapping(arg_struct);
-  f_service_ << ");" << endl;
-
-  prepare_member_name_mapping(xs, xs->get_members(), resultname);
-  if (xceptions.size() > 0) {
-    indent_down();
-    f_service_ << indent() << "}" << endl;
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << indent() << "catch (" << type_name((*x_iter)->get_type(), false, false) << " "
-                 << (*x_iter)->get_name() << ")" << endl
-                 << indent() << "{" << endl;
-      if (!tfunction->is_oneway()) {
-        indent_up();
-        f_service_ << indent() << "result." << prop_name(*x_iter) << " = " << (*x_iter)->get_name()
-                   << ";" << endl;
-        indent_down();
-      }
-      f_service_ << indent() << "}" << endl;
-    }
-  }
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << "oprot.WriteMessageBegin(new TMessage(\"" << tfunction->get_name()
-               << "\", TMessageType.Reply, seqid)); " << endl;
-    f_service_ << indent() << "result.Write(oprot);" << endl;
-  }
-  indent_down();
-
-  cleanup_member_name_mapping(xs);
-
-  f_service_ << indent() << "}" << endl
-             << indent() << "catch (TTransportException)" << endl
-             << indent() << "{" << endl
-             << indent() << "  throw;" << endl
-             << indent() << "}" << endl
-             << indent() << "catch (Exception ex)" << endl
-             << indent() << "{" << endl
-             << indent() << "  Console.Error.WriteLine(\"Error occurred in processor:\");" << endl
-             << indent() << "  Console.Error.WriteLine(ex.ToString());" << endl;
-
-  if (tfunction->is_oneway()) {
-    f_service_ << indent() << "}" << endl;
-  } else {
-    f_service_ << indent() << "  TApplicationException x = new TApplicationException" << indent()
-               << "(TApplicationException.ExceptionType.InternalError,\" Internal error.\");"
-               << endl
-               << indent() << "  oprot.WriteMessageBegin(new TMessage(\"" << tfunction->get_name()
-               << "\", TMessageType.Exception, seqid));" << endl
-               << indent() << "  x.Write(oprot);" << endl
-               << indent() << "}" << endl;
-    f_service_ << indent() << "oprot.WriteMessageEnd();" << endl
-               << indent() << "oprot.Transport.Flush();" << endl;
-  }
-
-  scope_down(f_service_);
-
-  f_service_ << endl;
-}
-
-void t_csharp_generator::generate_process_function_async(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  indent(f_service_) << "public async Task " << tfunction->get_name()
-    << "_ProcessAsync(int seqid, TProtocol iprot, TProtocol oprot)" << endl;
-  scope_up(f_service_);
-
-  string argsname = tfunction->get_name() + "_args";
-  string resultname = tfunction->get_name() + "_result";
-
-  f_service_ << indent() << argsname << " args = new " << argsname << "();" << endl
-    << indent() << "args.Read(iprot);" << endl
-    << indent() << "iprot.ReadMessageEnd();" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << resultname << " result = new " << resultname << "();" << endl;
-  }
-
-  f_service_ << indent() << "try" << endl
-    << indent() << "{" << endl;
-  indent_up();
-
-  if (xceptions.size() > 0) {
-    f_service_ << indent() << "try" << endl
-      << indent() << "{" << endl;
-    indent_up();
-  }
-
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  f_service_ << indent();
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_service_ << "result.Success = ";
-  }
-  f_service_ << "await iface_." << normalize_name(tfunction->get_name()) << "Async(";
-  bool first = true;
-  prepare_member_name_mapping(arg_struct);
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    }
-    else {
-      f_service_ << ", ";
-    }
-    f_service_ << "args." << prop_name(*f_iter);
-    if (nullable_ && !type_can_be_null((*f_iter)->get_type())) {
-      f_service_ << ".Value";
-    }
-  }
-  cleanup_member_name_mapping(arg_struct);
-  f_service_ << ");" << endl;
-
-  prepare_member_name_mapping(xs, xs->get_members(), resultname);
-  if (xceptions.size() > 0) {
-    indent_down();
-    f_service_ << indent() << "}" << endl;
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << indent() << "catch (" << type_name((*x_iter)->get_type(), false, false) << " "
-        << (*x_iter)->get_name() << ")" << endl
-        << indent() << "{" << endl;
-      if (!tfunction->is_oneway()) {
-        indent_up();
-        f_service_ << indent() << "result." << prop_name(*x_iter) << " = " << (*x_iter)->get_name()
-          << ";" << endl;
-        indent_down();
-      }
-      f_service_ << indent() << "}" << endl;
-    }
-  }
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << "oprot.WriteMessageBegin(new TMessage(\"" << tfunction->get_name()
-      << "\", TMessageType.Reply, seqid)); " << endl;
-    f_service_ << indent() << "result.Write(oprot);" << endl;
-  }
-  indent_down();
-
-  cleanup_member_name_mapping(xs);
-
-  f_service_ << indent() << "}" << endl
-    << indent() << "catch (TTransportException)" << endl
-    << indent() << "{" << endl
-    << indent() << "  throw;" << endl
-    << indent() << "}" << endl
-    << indent() << "catch (Exception ex)" << endl
-    << indent() << "{" << endl
-    << indent() << "  Console.Error.WriteLine(\"Error occurred in processor:\");" << endl
-    << indent() << "  Console.Error.WriteLine(ex.ToString());" << endl;
-
-  if (tfunction->is_oneway()) {
-    f_service_ << indent() << "}" << endl;
-  }
-  else {
-    f_service_ << indent() << "  TApplicationException x = new TApplicationException" << indent()
-      << "(TApplicationException.ExceptionType.InternalError,\" Internal error.\");"
-      << endl
-      << indent() << "  oprot.WriteMessageBegin(new TMessage(\"" << tfunction->get_name()
-      << "\", TMessageType.Exception, seqid));" << endl
-      << indent() << "  x.Write(oprot);" << endl
-      << indent() << "}" << endl;
-    f_service_ << indent() << "oprot.WriteMessageEnd();" << endl
-      << indent() << "oprot.Transport.Flush();" << endl;
-  }
-
-  scope_down(f_service_);
-
-  f_service_ << endl;
-}
-
-void t_csharp_generator::generate_csharp_union_reader(std::ofstream& out, t_struct* tunion) {
-  // Thanks to THRIFT-1768, we don't need to check for required fields in the union
-  const vector<t_field*>& fields = tunion->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "public static " << tunion->get_name() << " Read(TProtocol iprot)" << endl;
-  scope_up(out);
-
-  out << indent() << "iprot.IncrementRecursionDepth();" << endl;
-  out << indent() << "try" << endl;
-  scope_up(out);
-
-  indent(out) << tunion->get_name() << " retval;" << endl;
-  indent(out) << "iprot.ReadStructBegin();" << endl;
-  indent(out) << "TField field = iprot.ReadFieldBegin();" << endl;
-  // we cannot have the first field be a stop -- we must have a single field defined
-  indent(out) << "if (field.Type == TType.Stop)" << endl;
-  scope_up(out);
-  indent(out) << "iprot.ReadFieldEnd();" << endl;
-  indent(out) << "retval = new ___undefined();" << endl;
-  scope_down(out);
-  indent(out) << "else" << endl;
-  scope_up(out);
-  indent(out) << "switch (field.ID)" << endl;
-  scope_up(out);
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << (*f_iter)->get_key() << ":" << endl;
-    indent_up();
-    indent(out) << "if (field.Type == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-    indent_up();
-
-    indent(out) << type_name((*f_iter)->get_type()) << " temp;" << endl;
-    generate_deserialize_field(out, (*f_iter), "temp", true);
-    indent(out) << "retval = new " << (*f_iter)->get_name() << "(temp);" << endl;
-
-    indent_down();
-    out << indent() << "} else { " << endl << indent() << "  TProtocolUtil.Skip(iprot, field.Type);"
-        << endl << indent() << "  retval = new ___undefined();" << endl << indent() << "}" << endl
-        << indent() << "break;" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default: " << endl;
-  indent_up();
-  indent(out) << "TProtocolUtil.Skip(iprot, field.Type);" << endl << indent()
-              << "retval = new ___undefined();" << endl;
-  indent(out) << "break;" << endl;
-  indent_down();
-
-  scope_down(out);
-
-  indent(out) << "iprot.ReadFieldEnd();" << endl;
-
-  indent(out) << "if (iprot.ReadFieldBegin().Type != TType.Stop)" << endl;
-  scope_up(out);
-  indent(out) << "throw new TProtocolException(TProtocolException.INVALID_DATA);" << endl;
-  scope_down(out);
-
-  // end of else for TStop
-  scope_down(out);
-  indent(out) << "iprot.ReadStructEnd();" << endl;
-  indent(out) << "return retval;" << endl;
-  indent_down();
-
-  scope_down(out);
-  out << indent() << "finally" << endl;
-  scope_up(out);
-  out << indent() << "iprot.DecrementRecursionDepth();" << endl;
-  scope_down(out);
-
-  indent(out) << "}" << endl << endl;
-}
-
-void t_csharp_generator::generate_deserialize_field(ofstream& out,
-                                                    t_field* tfield,
-                                                    string prefix,
-                                                    bool is_propertyless) {
-  t_type* type = tfield->get_type();
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + (is_propertyless ? "" : prop_name(tfield));
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << name << " = ";
-
-    if (type->is_enum()) {
-      out << "(" << type_name(type, false, true) << ")";
-    }
-
-    out << "iprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "ReadBinary();";
-        } else {
-          out << "ReadString();";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "ReadBool();";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "ReadByte();";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "ReadI16();";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "ReadI32();";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "ReadI64();";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "ReadDouble();";
-        break;
-      default:
-        throw "compiler error: no C# name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "ReadI32();";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-void t_csharp_generator::generate_deserialize_struct(ofstream& out,
-                                                     t_struct* tstruct,
-                                                     string prefix) {
-  if (union_ && tstruct->is_union()) {
-    out << indent() << prefix << " = " << type_name(tstruct) << ".Read(iprot);" << endl;
-  } else {
-    out << indent() << prefix << " = new " << type_name(tstruct) << "();" << endl << indent()
-        << prefix << ".Read(iprot);" << endl;
-  }
-}
-
-void t_csharp_generator::generate_deserialize_container(ofstream& out,
-                                                        t_type* ttype,
-                                                        string prefix) {
-  scope_up(out);
-
-  string obj;
-
-  if (ttype->is_map()) {
-    obj = tmp("_map");
-  } else if (ttype->is_set()) {
-    obj = tmp("_set");
-  } else if (ttype->is_list()) {
-    obj = tmp("_list");
-  }
-
-  indent(out) << prefix << " = new " << type_name(ttype, false, true) << "();" << endl;
-  if (ttype->is_map()) {
-    out << indent() << "TMap " << obj << " = iprot.ReadMapBegin();" << endl;
-  } else if (ttype->is_set()) {
-    out << indent() << "TSet " << obj << " = iprot.ReadSetBegin();" << endl;
-  } else if (ttype->is_list()) {
-    out << indent() << "TList " << obj << " = iprot.ReadListBegin();" << endl;
-  }
-
-  string i = tmp("_i");
-  indent(out) << "for( int " << i << " = 0; " << i << " < " << obj << ".Count"
-              << "; "
-              << "++" << i << ")" << endl;
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "iprot.ReadMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "iprot.ReadSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "iprot.ReadListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-void t_csharp_generator::generate_deserialize_map_element(ofstream& out,
-                                                          t_map* tmap,
-                                                          string prefix) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey) << endl;
-  indent(out) << declare_field(&fval) << endl;
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << prefix << "[" << key << "] = " << val << ";" << endl;
-}
-
-void t_csharp_generator::generate_deserialize_set_element(ofstream& out,
-                                                          t_set* tset,
-                                                          string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".Add(" << elem << ");" << endl;
-}
-
-void t_csharp_generator::generate_deserialize_list_element(ofstream& out,
-                                                           t_list* tlist,
-                                                           string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".Add(" << elem << ");" << endl;
-}
-
-void t_csharp_generator::generate_serialize_field(ofstream& out,
-                                                  t_field* tfield,
-                                                  string prefix,
-                                                  bool is_element,
-                                                  bool is_propertyless) {
-  t_type* type = tfield->get_type();
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  string name = prefix + (is_propertyless ? "" : prop_name(tfield));
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + name;
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << "oprot.";
-
-    string nullable_name = nullable_ && !is_element && !field_is_required(tfield) ? name + ".Value"
-                                                                                  : name;
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "WriteBinary(";
-        } else {
-          out << "WriteString(";
-        }
-        out << name << ");";
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "WriteBool(" << nullable_name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "WriteByte(" << nullable_name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "WriteI16(" << nullable_name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "WriteI32(" << nullable_name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "WriteI64(" << nullable_name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "WriteDouble(" << nullable_name << ");";
-        break;
-      default:
-        throw "compiler error: no C# name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "WriteI32((int)" << nullable_name << ");";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-void t_csharp_generator::generate_serialize_struct(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   string prefix) {
-  (void)tstruct;
-  out << indent() << prefix << ".Write(oprot);" << endl;
-}
-
-void t_csharp_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot.WriteMapBegin(new TMap(" << type_to_enum(((t_map*)ttype)->get_key_type())
-                << ", " << type_to_enum(((t_map*)ttype)->get_val_type()) << ", " << prefix
-                << ".Count));" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.WriteSetBegin(new TSet(" << type_to_enum(((t_set*)ttype)->get_elem_type())
-                << ", " << prefix << ".Count));" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.WriteListBegin(new TList("
-                << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " << prefix << ".Count));"
-                << endl;
-  }
-
-  string iter = tmp("_iter");
-  if (ttype->is_map()) {
-    indent(out) << "foreach (" << type_name(((t_map*)ttype)->get_key_type()) << " " << iter
-                << " in " << prefix << ".Keys)";
-  } else if (ttype->is_set()) {
-    indent(out) << "foreach (" << type_name(((t_set*)ttype)->get_elem_type()) << " " << iter
-                << " in " << prefix << ")";
-  } else if (ttype->is_list()) {
-    indent(out) << "foreach (" << type_name(((t_list*)ttype)->get_elem_type()) << " " << iter
-                << " in " << prefix << ")";
-  }
-
-  out << endl;
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, (t_map*)ttype, iter, prefix);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-  }
-
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot.WriteMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.WriteSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.WriteListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-void t_csharp_generator::generate_serialize_map_element(ofstream& out,
-                                                        t_map* tmap,
-                                                        string iter,
-                                                        string map) {
-  t_field kfield(tmap->get_key_type(), iter);
-  generate_serialize_field(out, &kfield, "", true);
-  t_field vfield(tmap->get_val_type(), map + "[" + iter + "]");
-  generate_serialize_field(out, &vfield, "", true);
-}
-
-void t_csharp_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "", true);
-}
-
-void t_csharp_generator::generate_serialize_list_element(ofstream& out,
-                                                         t_list* tlist,
-                                                         string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "", true);
-}
-
-void t_csharp_generator::generate_property(ofstream& out,
-                                           t_field* tfield,
-                                           bool isPublic,
-                                           bool generateIsset) {
-  generate_csharp_property(out, tfield, isPublic, generateIsset, "_");
-}
-void t_csharp_generator::generate_csharp_property(ofstream& out,
-                                                  t_field* tfield,
-                                                  bool isPublic,
-                                                  bool generateIsset,
-                                                  std::string fieldPrefix) {
-  if ((serialize_ || wcf_) && isPublic) {
-    indent(out) << "[DataMember(Order = 0)]" << endl;
-  }
-  bool has_default = field_has_default(tfield);
-  bool is_required = field_is_required(tfield);
-  if ((nullable_ && !has_default) || (is_required)) {
-    indent(out) << (isPublic ? "public " : "private ")
-                << type_name(tfield->get_type(), false, false, true, is_required) << " "
-                << prop_name(tfield) << " { get; set; }" << endl;
-  } else {
-    indent(out) << (isPublic ? "public " : "private ")
-                << type_name(tfield->get_type(), false, false, true) << " " << prop_name(tfield)
-                << endl;
-    scope_up(out);
-    indent(out) << "get" << endl;
-    scope_up(out);
-    bool use_nullable = false;
-    if (nullable_) {
-      t_type* ttype = tfield->get_type();
-      while (ttype->is_typedef()) {
-        ttype = ((t_typedef*)ttype)->get_type();
-      }
-      if (ttype->is_base_type()) {
-        use_nullable = ((t_base_type*)ttype)->get_base() != t_base_type::TYPE_STRING;
-      }
-    }
-    indent(out) << "return " << fieldPrefix + tfield->get_name() << ";" << endl;
-    scope_down(out);
-    indent(out) << "set" << endl;
-    scope_up(out);
-    if (use_nullable) {
-      if (generateIsset) {
-        indent(out) << "__isset." << normalize_name(tfield->get_name()) << " = value.HasValue;"
-                    << endl;
-      }
-      indent(out) << "if (value.HasValue) this." << fieldPrefix + tfield->get_name()
-                  << " = value.Value;" << endl;
-    } else {
-      if (generateIsset) {
-        indent(out) << "__isset." << normalize_name(tfield->get_name()) << " = true;" << endl;
-      }
-      indent(out) << "this." << fieldPrefix + tfield->get_name() << " = value;" << endl;
-    }
-    scope_down(out);
-    scope_down(out);
-  }
-  out << endl;
-}
-
-std::string t_csharp_generator::make_valid_csharp_identifier(std::string const& fromName) {
-  std::string str = fromName;
-  if (str.empty()) {
-    return str;
-  }
-
-  // tests rely on this
-  assert(('A' < 'Z') && ('a' < 'z') && ('0' < '9'));
-
-  // if the first letter is a number, we add an additional underscore in front of it
-  char c = str.at(0);
-  if (('0' <= c) && (c <= '9')) {
-    str = "_" + str;
-  }
-
-  // following chars: letter, number or underscore
-  for (size_t i = 0; i < str.size(); ++i) {
-    c = str.at(i);
-    if ((('A' > c) || (c > 'Z')) && (('a' > c) || (c > 'z')) && (('0' > c) || (c > '9'))
-        && ('_' != c)) {
-      str.replace(i, 1, "_");
-    }
-  }
-
-  return str;
-}
-
-void t_csharp_generator::cleanup_member_name_mapping(void* scope) {
-  if( member_mapping_scopes.empty()) {
-    throw "internal error: cleanup_member_name_mapping() no scope active";
-  }
-
-  member_mapping_scope& active = member_mapping_scopes.back();
-  if (active.scope_member != scope) {
-    throw "internal error: cleanup_member_name_mapping() called for wrong struct";
-  }
-
-  member_mapping_scopes.pop_back();
-}
-
-string t_csharp_generator::get_mapped_member_name(string name) {
-  if( ! member_mapping_scopes.empty()) {
-    member_mapping_scope& active = member_mapping_scopes.back();
-    map<string, string>::iterator iter = active.mapping_table.find(name);
-    if (active.mapping_table.end() != iter) {
-      return iter->second;
-    }
-  }
-
-  pverbose("no mapping for member %s\n", name.c_str());
-  return name;
-}
-
-void t_csharp_generator::prepare_member_name_mapping(t_struct* tstruct) {
-  prepare_member_name_mapping(tstruct, tstruct->get_members(), tstruct->get_name());
-}
-
-void t_csharp_generator::prepare_member_name_mapping(void* scope,
-                                                     const vector<t_field*>& members,
-                                                     const string& structname) {
-  // begin new scope
-  member_mapping_scope dummy;
-  member_mapping_scopes.push_back(dummy);
-  member_mapping_scope& active = member_mapping_scopes.back();
-  active.scope_member = scope;
-
-  // current C# generator policy:
-  // - prop names are always rendered with an Uppercase first letter
-  // - struct names are used as given
-  std::set<std::string> used_member_names;
-  vector<t_field*>::const_iterator iter;
-
-  // prevent name conflicts with struct (CS0542 error)
-  used_member_names.insert(structname);
-
-  // prevent name conflicts with known methods (THRIFT-2942)
-  used_member_names.insert("Read");
-  used_member_names.insert("Write");
-
-  for (iter = members.begin(); iter != members.end(); ++iter) {
-    string oldname = (*iter)->get_name();
-    string newname = prop_name(*iter, true);
-    while (true) {
-
-      // new name conflicts with another member
-      if (used_member_names.find(newname) != used_member_names.end()) {
-        pverbose("struct %s: member %s conflicts with another member\n",
-                 structname.c_str(),
-                 newname.c_str());
-        newname += '_';
-        continue;
-      }
-
-      // add always, this helps us to detect edge cases like
-      // different spellings ("foo" and "Foo") within the same struct
-      pverbose("struct %s: member mapping %s => %s\n",
-               structname.c_str(),
-               oldname.c_str(),
-               newname.c_str());
-      active.mapping_table[oldname] = newname;
-      used_member_names.insert(newname);
-      break;
-    }
-  }
-}
-
-std::string t_csharp_generator::prop_name(t_field* tfield, bool suppress_mapping) {
-  string name(tfield->get_name());
-  if (suppress_mapping) {
-    name[0] = toupper(name[0]);
-  } else {
-    name = get_mapped_member_name(name);
-  }
-  return name;
-}
-
-string t_csharp_generator::type_name(t_type* ttype,
-                                     bool in_container,
-                                     bool in_init,
-                                     bool in_param,
-                                     bool is_required) {
-  (void)in_init;
-  while (ttype->is_typedef()) {
-    ttype = ((t_typedef*)ttype)->get_type();
-  }
-
-  if (ttype->is_base_type()) {
-    return base_type_name((t_base_type*)ttype, in_container, in_param, is_required);
-  } else if (ttype->is_map()) {
-    t_map* tmap = (t_map*)ttype;
-    return "Dictionary<" + type_name(tmap->get_key_type(), true) + ", "
-           + type_name(tmap->get_val_type(), true) + ">";
-  } else if (ttype->is_set()) {
-    t_set* tset = (t_set*)ttype;
-    return "THashSet<" + type_name(tset->get_elem_type(), true) + ">";
-  } else if (ttype->is_list()) {
-    t_list* tlist = (t_list*)ttype;
-    return "List<" + type_name(tlist->get_elem_type(), true) + ">";
-  }
-
-  t_program* program = ttype->get_program();
-  string postfix = (!is_required && nullable_ && in_param && ttype->is_enum()) ? "?" : "";
-  if (program != NULL && program != program_) {
-    string ns = program->get_namespace("csharp");
-    if (!ns.empty()) {
-      return ns + "." + normalize_name(ttype->get_name()) + postfix;
-    }
-  }
-
-  return normalize_name(ttype->get_name()) + postfix;
-}
-
-string t_csharp_generator::base_type_name(t_base_type* tbase,
-                                          bool in_container,
-                                          bool in_param,
-                                          bool is_required) {
-  (void)in_container;
-  string postfix = (!is_required && nullable_ && in_param) ? "?" : "";
-  switch (tbase->get_base()) {
-  case t_base_type::TYPE_VOID:
-    return "void";
-  case t_base_type::TYPE_STRING:
-    if (tbase->is_binary()) {
-      return "byte[]";
-    } else {
-      return "string";
-    }
-  case t_base_type::TYPE_BOOL:
-    return "bool" + postfix;
-  case t_base_type::TYPE_I8:
-    return "sbyte" + postfix;
-  case t_base_type::TYPE_I16:
-    return "short" + postfix;
-  case t_base_type::TYPE_I32:
-    return "int" + postfix;
-  case t_base_type::TYPE_I64:
-    return "long" + postfix;
-  case t_base_type::TYPE_DOUBLE:
-    return "double" + postfix;
-  default:
-    throw "compiler error: no C# name for base type " + t_base_type::t_base_name(tbase->get_base());
-  }
-}
-
-string t_csharp_generator::declare_field(t_field* tfield, bool init, std::string prefix) {
-  string result = type_name(tfield->get_type()) + " " + prefix + tfield->get_name();
-  if (init) {
-    t_type* ttype = tfield->get_type();
-    while (ttype->is_typedef()) {
-      ttype = ((t_typedef*)ttype)->get_type();
-    }
-    if (ttype->is_base_type() && field_has_default(tfield)) {
-      ofstream dummy;
-      result += " = " + render_const_value(dummy, tfield->get_name(), ttype, tfield->get_value());
-    } else if (ttype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "NO T_VOID CONSTRUCT";
-      case t_base_type::TYPE_STRING:
-        result += " = null";
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = false";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = (double)0";
-        break;
-      }
-    } else if (ttype->is_enum()) {
-      result += " = (" + type_name(ttype, false, true) + ")0";
-    } else if (ttype->is_container()) {
-      result += " = new " + type_name(ttype, false, true) + "()";
-    } else {
-      result += " = new " + type_name(ttype, false, true) + "()";
-    }
-  }
-  return result + ";";
-}
-
-string t_csharp_generator::function_signature(t_function* tfunction, string prefix) {
-  t_type* ttype = tfunction->get_returntype();
-  return type_name(ttype) + " " + normalize_name(prefix + tfunction->get_name()) + "("
-         + argument_list(tfunction->get_arglist()) + ")";
-}
-
-string t_csharp_generator::function_signature_async_begin(t_function* tfunction, string prefix) {
-  string comma = (tfunction->get_arglist()->get_members().size() > 0 ? ", " : "");
-  return "IAsyncResult " + normalize_name(prefix + tfunction->get_name())
-         + "(AsyncCallback callback, object state" + comma + argument_list(tfunction->get_arglist())
-         + ")";
-}
-
-string t_csharp_generator::function_signature_async_end(t_function* tfunction, string prefix) {
-  t_type* ttype = tfunction->get_returntype();
-  return type_name(ttype) + " " + normalize_name(prefix + tfunction->get_name())
-         + "(IAsyncResult asyncResult)";
-}
-
-string t_csharp_generator::function_signature_async(t_function* tfunction, string prefix) {
-  t_type* ttype = tfunction->get_returntype();
-  string task = "Task";
-  if (!ttype->is_void())
-    task += "<" + type_name(ttype) + ">";
-  return task + " " + normalize_name(prefix + tfunction->get_name()) + "Async("
-         + argument_list(tfunction->get_arglist()) + ")";
-}
-
-string t_csharp_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += type_name((*f_iter)->get_type()) + " " + normalize_name((*f_iter)->get_name());
-  }
-  return result;
-}
-
-string t_csharp_generator::type_to_enum(t_type* type) {
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType.String";
-    case t_base_type::TYPE_BOOL:
-      return "TType.Bool";
-    case t_base_type::TYPE_I8:
-      return "TType.Byte";
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.Double";
-    }
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.Struct";
-  } else if (type->is_map()) {
-    return "TType.Map";
-  } else if (type->is_set()) {
-    return "TType.Set";
-  } else if (type->is_list()) {
-    return "TType.List";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-void t_csharp_generator::generate_csharp_docstring_comment(ofstream& out, string contents) {
-  generate_docstring_comment(out, "/// <summary>\n", "/// ", contents, "/// </summary>\n");
-}
-
-void t_csharp_generator::generate_csharp_doc(ofstream& out, t_field* field) {
-  if (field->get_type()->is_enum()) {
-    string combined_message = field->get_doc() + "\n<seealso cref=\""
-                              + get_enum_class_name(field->get_type()) + "\"/>";
-    generate_csharp_docstring_comment(out, combined_message);
-  } else {
-    generate_csharp_doc(out, (t_doc*)field);
-  }
-}
-
-void t_csharp_generator::generate_csharp_doc(ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    generate_csharp_docstring_comment(out, tdoc->get_doc());
-  }
-}
-
-void t_csharp_generator::generate_csharp_doc(ofstream& out, t_function* tfunction) {
-  if (tfunction->has_doc()) {
-    stringstream ps;
-    const vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-    vector<t_field*>::const_iterator p_iter;
-    for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-      t_field* p = *p_iter;
-      ps << "\n<param name=\"" << p->get_name() << "\">";
-      if (p->has_doc()) {
-        std::string str = p->get_doc();
-        str.erase(std::remove(str.begin(), str.end(), '\n'),
-                  str.end()); // remove the newlines that appear from the parser
-        ps << str;
-      }
-      ps << "</param>";
-    }
-    generate_docstring_comment(out,
-                               "",
-                               "/// ",
-                               "<summary>\n" + tfunction->get_doc() + "</summary>" + ps.str(),
-                               "");
-  }
-}
-
-std::string t_csharp_generator::get_enum_class_name(t_type* type) {
-  string package = "";
-  t_program* program = type->get_program();
-  if (program != NULL && program != program_) {
-    package = program->get_namespace("csharp") + ".";
-  }
-  return package + type->get_name();
-}
-
-
-THRIFT_REGISTER_GENERATOR(
-    csharp,
-    "C#",
-    "    async:           Adds Async support using Task.Run.\n"
-    "    wcf:             Adds bindings for WCF to generated classes.\n"
-    "    serial:          Add serialization support to generated classes.\n"
-    "    nullable:        Use nullable types for properties.\n"
-    "    hashcode:        Generate a hashcode and equals implementation for classes.\n"
-    "    union:           Use new union typing, which includes a static read function for union "
-    "types.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_d_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_d_generator.cc
deleted file mode 100644
index 4816681..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_d_generator.cc
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <cassert>
-
-#include <fstream>
-#include <iostream>
-#include <set>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <sys/stat.h>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostream;
-using std::ostringstream;
-using std::set;
-using std::string;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * D code generator.
- *
- * generate_*() functions are called by the base class to emit code for the
- * given entity, print_*() functions write a piece of code to the passed
- * stream, and render_*() return a string containing the D representation of
- * the passed entity.
- */
-class t_d_generator : public t_oop_generator {
-public:
-  t_d_generator(t_program* program,
-                const std::map<string, string>& parsed_options,
-                const string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    /* no options yet */
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      throw "unknown option d:" + iter->first;
-    }
-
-    out_dir_base_ = "gen-d";
-  }
-
-protected:
-  virtual void init_generator() {
-    // Make output directory
-    MKDIR(get_out_dir().c_str());
-
-    string dir = program_->get_namespace("d");
-    string subdir = get_out_dir();
-    string::size_type loc;
-    while ((loc = dir.find(".")) != string::npos) {
-      subdir = subdir + "/" + dir.substr(0, loc);
-      MKDIR(subdir.c_str());
-      dir = dir.substr(loc + 1);
-    }
-    if (!dir.empty()) {
-      subdir = subdir + "/" + dir;
-      MKDIR(subdir.c_str());
-    }
-
-    package_dir_ = subdir + "/";
-
-    // Make output file
-    string f_types_name = package_dir_ + program_name_ + "_types.d";
-    f_types_.open(f_types_name.c_str());
-
-    // Print header
-    f_types_ << autogen_comment() << "module " << render_package(*program_) << program_name_
-             << "_types;" << endl << endl;
-
-    print_default_imports(f_types_);
-
-    // Include type modules from other imported programs.
-    const vector<t_program*>& includes = program_->get_includes();
-    for (size_t i = 0; i < includes.size(); ++i) {
-      f_types_ << "import " << render_package(*(includes[i])) << includes[i]->get_name()
-               << "_types;" << endl;
-    }
-    if (!includes.empty())
-      f_types_ << endl;
-  }
-
-  virtual void close_generator() {
-    // Close output file
-    f_types_.close();
-  }
-
-  virtual void generate_consts(std::vector<t_const*> consts) {
-    if (!consts.empty()) {
-      string f_consts_name = package_dir_ + program_name_ + "_constants.d";
-      ofstream f_consts;
-      f_consts.open(f_consts_name.c_str());
-
-      f_consts << autogen_comment() << "module " << render_package(*program_) << program_name_
-               << "_constants;" << endl << endl;
-
-      print_default_imports(f_consts);
-
-      f_consts << "import " << render_package(*get_program()) << program_name_ << "_types;" << endl
-               << endl;
-
-      vector<t_const*>::iterator c_iter;
-      for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-        string name = (*c_iter)->get_name();
-        t_type* type = (*c_iter)->get_type();
-        indent(f_consts) << "immutable(" << render_type_name(type) << ") " << name << ";" << endl;
-      }
-
-      f_consts << endl << "static this() {" << endl;
-      indent_up();
-
-      bool first = true;
-      for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-        if (first) {
-          first = false;
-        } else {
-          f_consts << endl;
-        }
-        t_type* type = (*c_iter)->get_type();
-        indent(f_consts) << (*c_iter)->get_name() << " = ";
-        if (!is_immutable_type(type)) {
-          f_consts << "cast(immutable(" << render_type_name(type) << ")) ";
-        }
-        f_consts << render_const_value(type, (*c_iter)->get_value()) << ";" << endl;
-      }
-      indent_down();
-      indent(f_consts) << "}" << endl;
-    }
-  }
-
-  virtual void generate_typedef(t_typedef* ttypedef) {
-    f_types_ << indent() << "alias " << render_type_name(ttypedef->get_type()) << " "
-             << ttypedef->get_symbolic() << ";" << endl << endl;
-  }
-
-  virtual void generate_enum(t_enum* tenum) {
-    vector<t_enum_value*> constants = tenum->get_constants();
-
-    string enum_name = tenum->get_name();
-    f_types_ << indent() << "enum " << enum_name << " {" << endl;
-
-    indent_up();
-
-    vector<t_enum_value*>::const_iterator c_iter;
-    bool first = true;
-    for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_types_ << "," << endl;
-      }
-      indent(f_types_) << (*c_iter)->get_name();
-      f_types_ << " = " << (*c_iter)->get_value();
-    }
-
-    f_types_ << endl;
-    indent_down();
-    indent(f_types_) << "}" << endl;
-
-    f_types_ << endl;
-  }
-
-  virtual void generate_struct(t_struct* tstruct) {
-    print_struct_definition(f_types_, tstruct, false);
-  }
-
-  virtual void generate_xception(t_struct* txception) {
-    print_struct_definition(f_types_, txception, true);
-  }
-
-  virtual void generate_service(t_service* tservice) {
-    string svc_name = tservice->get_name();
-
-    // Service implementation file includes
-    string f_servicename = package_dir_ + svc_name + ".d";
-    std::ofstream f_service;
-    f_service.open(f_servicename.c_str());
-    f_service << autogen_comment() << "module " << render_package(*program_) << svc_name << ";"
-              << endl << endl;
-
-    print_default_imports(f_service);
-
-    f_service << "import " << render_package(*get_program()) << program_name_ << "_types;" << endl;
-
-    t_service* extends_service = tservice->get_extends();
-    if (extends_service != NULL) {
-      f_service << "import " << render_package(*(extends_service->get_program()))
-                << extends_service->get_name() << ";" << endl;
-    }
-
-    f_service << endl;
-
-    string extends = "";
-    if (tservice->get_extends() != NULL) {
-      extends = " : " + render_type_name(tservice->get_extends());
-    }
-
-    f_service << indent() << "interface " << svc_name << extends << " {" << endl;
-    indent_up();
-
-    // Collect all the exception types service methods can throw so we can
-    // emit the necessary aliases later.
-    set<t_type*> exception_types;
-
-    // Print the method signatures.
-    vector<t_function*> functions = tservice->get_functions();
-    vector<t_function*>::iterator fn_iter;
-    for (fn_iter = functions.begin(); fn_iter != functions.end(); ++fn_iter) {
-      f_service << indent();
-      print_function_signature(f_service, *fn_iter);
-      f_service << ";" << endl;
-
-      const vector<t_field*>& exceptions = (*fn_iter)->get_xceptions()->get_members();
-      vector<t_field*>::const_iterator ex_iter;
-      for (ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter) {
-        exception_types.insert((*ex_iter)->get_type());
-      }
-    }
-
-    // Alias the exception types into the current scope.
-    if (!exception_types.empty())
-      f_service << endl;
-    set<t_type*>::const_iterator et_iter;
-    for (et_iter = exception_types.begin(); et_iter != exception_types.end(); ++et_iter) {
-      indent(f_service) << "alias " << render_package(*(*et_iter)->get_program())
-                        << (*et_iter)->get_program()->get_name() << "_types"
-                        << "." << (*et_iter)->get_name() << " " << (*et_iter)->get_name() << ";"
-                        << endl;
-    }
-
-    // Write the method metadata.
-    ostringstream meta;
-    indent_up();
-    bool first = true;
-    for (fn_iter = functions.begin(); fn_iter != functions.end(); ++fn_iter) {
-      if ((*fn_iter)->get_arglist()->get_members().empty()
-          && (*fn_iter)->get_xceptions()->get_members().empty() && !(*fn_iter)->is_oneway()) {
-        continue;
-      }
-
-      if (first) {
-        first = false;
-      } else {
-        meta << ",";
-      }
-
-      meta << endl << indent() << "TMethodMeta(`" << (*fn_iter)->get_name() << "`, " << endl;
-      indent_up();
-      indent(meta) << "[";
-
-      bool first = true;
-      const vector<t_field*>& params = (*fn_iter)->get_arglist()->get_members();
-      vector<t_field*>::const_iterator p_iter;
-      for (p_iter = params.begin(); p_iter != params.end(); ++p_iter) {
-        if (first) {
-          first = false;
-        } else {
-          meta << ", ";
-        }
-
-        meta << "TParamMeta(`" << (*p_iter)->get_name() << "`, " << (*p_iter)->get_key();
-
-        t_const_value* cv = (*p_iter)->get_value();
-        if (cv != NULL) {
-          meta << ", q{" << render_const_value((*p_iter)->get_type(), cv) << "}";
-        }
-        meta << ")";
-      }
-
-      meta << "]";
-
-      if (!(*fn_iter)->get_xceptions()->get_members().empty() || (*fn_iter)->is_oneway()) {
-        meta << "," << endl << indent() << "[";
-
-        bool first = true;
-        const vector<t_field*>& exceptions = (*fn_iter)->get_xceptions()->get_members();
-        vector<t_field*>::const_iterator ex_iter;
-        for (ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter) {
-          if (first) {
-            first = false;
-          } else {
-            meta << ", ";
-          }
-
-          meta << "TExceptionMeta(`" << (*ex_iter)->get_name() << "`, " << (*ex_iter)->get_key()
-               << ", `" << (*ex_iter)->get_type()->get_name() << "`)";
-        }
-
-        meta << "]";
-      }
-
-      if ((*fn_iter)->is_oneway()) {
-        meta << "," << endl << indent() << "TMethodType.ONEWAY";
-      }
-
-      indent_down();
-      meta << endl << indent() << ")";
-    }
-    indent_down();
-
-    string meta_str(meta.str());
-    if (!meta_str.empty()) {
-      f_service << endl << indent() << "enum methodMeta = [" << meta_str << endl << indent() << "];"
-                << endl;
-    }
-
-    indent_down();
-    indent(f_service) << "}" << endl;
-
-    // Server skeleton generation.
-    string f_skeletonname = package_dir_ + svc_name + "_server.skeleton.d";
-    std::ofstream f_skeleton;
-    f_skeleton.open(f_skeletonname.c_str());
-    print_server_skeleton(f_skeleton, tservice);
-    f_skeleton.close();
-  }
-
-private:
-  /**
-   * Writes a server skeleton for the passed service to out.
-   */
-  void print_server_skeleton(ostream& out, t_service* tservice) {
-    string svc_name = tservice->get_name();
-
-    out << "/*" << endl
-        << " * This auto-generated skeleton file illustrates how to build a server. If you" << endl
-        << " * intend to customize it, you should edit a copy with another file name to " << endl
-        << " * avoid overwriting it when running the generator again." << endl << " */" << endl
-        << "module " << render_package(*tservice->get_program()) << svc_name << "_server;" << endl
-        << endl << "import std.stdio;" << endl << "import thrift.codegen.processor;" << endl
-        << "import thrift.protocol.binary;" << endl << "import thrift.server.simple;" << endl
-        << "import thrift.server.transport.socket;" << endl << "import thrift.transport.buffered;"
-        << endl << "import thrift.util.hashset;" << endl << endl << "import "
-        << render_package(*tservice->get_program()) << svc_name << ";" << endl << "import "
-        << render_package(*get_program()) << program_name_ << "_types;" << endl << endl << endl
-        << "class " << svc_name << "Handler : " << svc_name << " {" << endl;
-
-    indent_up();
-    out << indent() << "this() {" << endl << indent() << "  // Your initialization goes here."
-        << endl << indent() << "}" << endl << endl;
-
-    vector<t_function*> functions = tservice->get_functions();
-    vector<t_function*>::iterator f_iter;
-    for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-      out << indent();
-      print_function_signature(out, *f_iter);
-      out << " {" << endl;
-
-      indent_up();
-
-      out << indent() << "// Your implementation goes here." << endl << indent() << "writeln(\""
-          << (*f_iter)->get_name() << " called\");" << endl;
-
-      t_base_type* rt = (t_base_type*)(*f_iter)->get_returntype();
-      if (rt->get_base() != t_base_type::TYPE_VOID) {
-        indent(out) << "return typeof(return).init;" << endl;
-      }
-
-      indent_down();
-
-      out << indent() << "}" << endl << endl;
-    }
-
-    indent_down();
-    out << "}" << endl << endl;
-
-    out << indent() << "void main() {" << endl;
-    indent_up();
-    out << indent() << "auto protocolFactory = new TBinaryProtocolFactory!();" << endl << indent()
-        << "auto processor = new TServiceProcessor!" << svc_name << "(new " << svc_name
-        << "Handler);" << endl << indent() << "auto serverTransport = new TServerSocket(9090);"
-        << endl << indent() << "auto transportFactory = new TBufferedTransportFactory;" << endl
-        << indent() << "auto server = new TSimpleServer(" << endl << indent()
-        << "  processor, serverTransport, transportFactory, protocolFactory);" << endl << indent()
-        << "server.serve();" << endl;
-    indent_down();
-    out << "}" << endl;
-  }
-
-  /**
-   * Writes the definition of a struct or an exception type to out.
-   */
-  void print_struct_definition(ostream& out, t_struct* tstruct, bool is_exception) {
-    const vector<t_field*>& members = tstruct->get_members();
-
-    if (is_exception) {
-      indent(out) << "class " << tstruct->get_name() << " : TException {" << endl;
-    } else {
-      indent(out) << "struct " << tstruct->get_name() << " {" << endl;
-    }
-    indent_up();
-
-    // Declare all fields.
-    vector<t_field*>::const_iterator m_iter;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      indent(out) << render_type_name((*m_iter)->get_type()) << " " << (*m_iter)->get_name() << ";"
-                  << endl;
-    }
-
-    if (!members.empty())
-      indent(out) << endl;
-    indent(out) << "mixin TStructHelpers!(";
-
-    if (!members.empty()) {
-      // If there are any fields, construct the TFieldMeta array to pass to
-      // TStructHelpers. We can't just pass an empty array if not because []
-      // doesn't pass the TFieldMeta[] constraint.
-      out << "[";
-      indent_up();
-
-      bool first = true;
-      vector<t_field*>::const_iterator m_iter;
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        if (first) {
-          first = false;
-        } else {
-          out << ",";
-        }
-        out << endl;
-
-        indent(out) << "TFieldMeta(`" << (*m_iter)->get_name() << "`, " << (*m_iter)->get_key();
-
-        t_const_value* cv = (*m_iter)->get_value();
-        t_field::e_req req = (*m_iter)->get_req();
-        out << ", " << render_req(req);
-        if (cv != NULL) {
-          out << ", q{" << render_const_value((*m_iter)->get_type(), cv) << "}";
-        }
-        out << ")";
-      }
-
-      indent_down();
-      out << endl << indent() << "]";
-    }
-
-    out << ");" << endl;
-
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-
-  /**
-   * Prints the D function signature (including return type) for the given
-   * method.
-   */
-  void print_function_signature(ostream& out, t_function* fn) {
-    out << render_type_name(fn->get_returntype()) << " " << fn->get_name() << "(";
-
-    const vector<t_field*>& fields = fn->get_arglist()->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        out << ", ";
-      }
-      out << render_type_name((*f_iter)->get_type(), true) << " " << (*f_iter)->get_name();
-    }
-
-    out << ")";
-  }
-
-  /**
-   * Returns the D representation of value. The result is guaranteed to be a
-   * single expression; for complex types, immediately called delegate
-   * literals are used to achieve this.
-   */
-  string render_const_value(t_type* type, t_const_value* value) {
-    // Resolve any typedefs.
-    type = get_true_type(type);
-
-    ostringstream out;
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_STRING:
-        out << '"' << get_escaped_string(value) << '"';
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << ((value->get_integer() > 0) ? "true" : "false");
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-        out << "cast(" << render_type_name(type) << ")" << value->get_integer();
-        break;
-      case t_base_type::TYPE_I32:
-        out << value->get_integer();
-        break;
-      case t_base_type::TYPE_I64:
-        out << value->get_integer() << "L";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        if (value->get_type() == t_const_value::CV_INTEGER) {
-          out << value->get_integer();
-        } else {
-          out << value->get_double();
-        }
-        break;
-      default:
-        throw "Compiler error: No const of base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "cast(" << render_type_name(type) << ")" << value->get_integer();
-    } else {
-      out << "{" << endl;
-      indent_up();
-
-      indent(out) << render_type_name(type) << " v;" << endl;
-      if (type->is_struct() || type->is_xception()) {
-        indent(out) << "v = " << (type->is_xception() ? "new " : "") << render_type_name(type)
-                    << "();" << endl;
-
-        const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-        vector<t_field*>::const_iterator f_iter;
-        const map<t_const_value*, t_const_value*>& val = value->get_map();
-        map<t_const_value*, t_const_value*>::const_iterator v_iter;
-        for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-          t_type* field_type = NULL;
-          for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-            if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-              field_type = (*f_iter)->get_type();
-            }
-          }
-          if (field_type == NULL) {
-            throw "Type error: " + type->get_name() + " has no field "
-                + v_iter->first->get_string();
-          }
-          string val = render_const_value(field_type, v_iter->second);
-          indent(out) << "v.set!`" << v_iter->first->get_string() << "`(" << val << ");" << endl;
-        }
-      } else if (type->is_map()) {
-        t_type* ktype = ((t_map*)type)->get_key_type();
-        t_type* vtype = ((t_map*)type)->get_val_type();
-        const map<t_const_value*, t_const_value*>& val = value->get_map();
-        map<t_const_value*, t_const_value*>::const_iterator v_iter;
-        for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-          string key = render_const_value(ktype, v_iter->first);
-          string val = render_const_value(vtype, v_iter->second);
-          indent(out) << "v[";
-          if (!is_immutable_type(ktype)) {
-            out << "cast(immutable(" << render_type_name(ktype) << "))";
-          }
-          out << key << "] = " << val << ";" << endl;
-        }
-      } else if (type->is_list()) {
-        t_type* etype = ((t_list*)type)->get_elem_type();
-        const vector<t_const_value*>& val = value->get_list();
-        vector<t_const_value*>::const_iterator v_iter;
-        for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-          string val = render_const_value(etype, *v_iter);
-          indent(out) << "v ~= " << val << ";" << endl;
-        }
-      } else if (type->is_set()) {
-        t_type* etype = ((t_set*)type)->get_elem_type();
-        const vector<t_const_value*>& val = value->get_list();
-        vector<t_const_value*>::const_iterator v_iter;
-        for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-          string val = render_const_value(etype, *v_iter);
-          indent(out) << "v ~= " << val << ";" << endl;
-        }
-      } else {
-        throw "Compiler error: Invalid type in render_const_value: " + type->get_name();
-      }
-      indent(out) << "return v;" << endl;
-
-      indent_down();
-      indent(out) << "}()";
-    }
-
-    return out.str();
-  }
-
-  /**
-   * Returns the D package to which modules for program are written (with a
-   * trailing dot, if not empty).
-   */
-  string render_package(const t_program& program) const {
-    string package = program.get_namespace("d");
-    if (package.size() == 0)
-      return "";
-    return package + ".";
-  }
-
-  /**
-   * Returns the name of the D repesentation of ttype.
-   *
-   * If isArg is true, a const reference to the type will be returned for
-   * structs.
-   */
-  string render_type_name(const t_type* ttype, bool isArg = false) const {
-    if (ttype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        return "void";
-      case t_base_type::TYPE_STRING:
-        return "string";
-      case t_base_type::TYPE_BOOL:
-        return "bool";
-      case t_base_type::TYPE_I8:
-        return "byte";
-      case t_base_type::TYPE_I16:
-        return "short";
-      case t_base_type::TYPE_I32:
-        return "int";
-      case t_base_type::TYPE_I64:
-        return "long";
-      case t_base_type::TYPE_DOUBLE:
-        return "double";
-      default:
-        throw "Compiler error: No D type name for base type " + t_base_type::t_base_name(tbase);
-      }
-    }
-
-    if (ttype->is_container()) {
-      t_container* tcontainer = (t_container*)ttype;
-      if (tcontainer->has_cpp_name()) {
-        return tcontainer->get_cpp_name();
-      } else if (ttype->is_map()) {
-        t_map* tmap = (t_map*)ttype;
-        t_type* ktype = tmap->get_key_type();
-
-        string name = render_type_name(tmap->get_val_type()) + "[";
-        if (!is_immutable_type(ktype)) {
-          name += "immutable(";
-        }
-        name += render_type_name(ktype);
-        if (!is_immutable_type(ktype)) {
-          name += ")";
-        }
-        name += "]";
-        return name;
-      } else if (ttype->is_set()) {
-        t_set* tset = (t_set*)ttype;
-        return "HashSet!(" + render_type_name(tset->get_elem_type()) + ")";
-      } else if (ttype->is_list()) {
-        t_list* tlist = (t_list*)ttype;
-        return render_type_name(tlist->get_elem_type()) + "[]";
-      }
-    }
-
-    if (ttype->is_struct() && isArg) {
-      return "ref const(" + ttype->get_name() + ")";
-    } else {
-      return ttype->get_name();
-    }
-  }
-
-  /**
-   * Returns the D TReq enum member corresponding to req.
-   */
-  string render_req(t_field::e_req req) const {
-    switch (req) {
-    case t_field::T_OPT_IN_REQ_OUT:
-      return "TReq.OPT_IN_REQ_OUT";
-    case t_field::T_OPTIONAL:
-      return "TReq.OPTIONAL";
-    case t_field::T_REQUIRED:
-      return "TReq.REQUIRED";
-    default: {
-      std::stringstream ss;
-      ss << "Compiler error: Invalid requirement level " << req;
-      throw ss.str();
-    }
-    }
-  }
-
-  /**
-   * Writes the default list of imports (which are written to every generated
-   * module) to f.
-   */
-  void print_default_imports(ostream& out) {
-    indent(out) << "import thrift.base;" << endl << "import thrift.codegen.base;" << endl
-                << "import thrift.util.hashset;" << endl << endl;
-  }
-
-  /**
-   * Returns whether type is »intrinsically immutable«, in the sense that
-   * a value of that type is implicitly castable to immutable(type), and it is
-   * allowed for AA keys without an immutable() qualifier.
-   */
-  bool is_immutable_type(t_type* type) const {
-    t_type* ttype = get_true_type(type);
-    return ttype->is_base_type() || ttype->is_enum();
-  }
-
-  /*
-   * File streams, stored here to avoid passing them as parameters to every
-   * function.
-   */
-  ofstream f_types_;
-  ofstream f_header_;
-
-  string package_dir_;
-};
-
-THRIFT_REGISTER_GENERATOR(d, "D", "")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_dart_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_dart_generator.cc
deleted file mode 100644
index 19bbb7b..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_dart_generator.cc
+++ /dev/null
@@ -1,2516 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <sstream>
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <cctype>
-
-#include <sys/stat.h>
-#include <stdexcept>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-static const string endl2 = "\n\n";
-
-/**
- * Use the current Thrift version for static libraries.  When releasing, update
- * the version in these files.
- * - lib/dart/pubspec.yaml
- * - test/dart/test_client/pubspec.yaml
- * - tutorial/dart/client/pubspec.yaml
- * - tutorial/dart/console_client/pubspec.yaml
- * - tutorial/dart/server/pubspec.yaml
- * See https://thrift.apache.org/docs/committers/HowToVersion
- */
-static const string dart_thrift_version = THRIFT_VERSION;
-
-/* forward declarations */
-string initial_caps_to_underscores(string name);
-
-/**
- * Dart code generator
- *
- */
-class t_dart_generator : public t_oop_generator {
-public:
-  t_dart_generator(t_program* program,
-                  const std::map<std::string, std::string>& parsed_options,
-                  const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    library_name_ = "";
-    library_prefix_ = "";
-    package_prefix_ = "";
-    pubspec_lib_ = "";
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("library_name") == 0) {
-        library_name_ = (iter->second);
-      } else if( iter->first.compare("library_prefix") == 0) {
-        library_prefix_ = (iter->second) + ".";
-        package_prefix_ = replace_all(library_prefix_, ".", "/");
-      } else if( iter->first.compare("pubspec_lib") == 0) {
-        pubspec_lib_ = (iter->second);
-      } else {
-        throw "unknown option dart:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-dart";
-  }
-
-  void scope_up(std::ostream& out, std::string prefix=" ") {
-    out << prefix << "{" << endl;
-    indent_up();
-  }
-
-  void scope_down(std::ostream& out, std::string postfix=endl) {
-    indent_down();
-    indent(out) << "}" << postfix;
-  }
-
-  string replace_all(string contents, string search, string repl) {
-    string str(contents);
-
-    size_t slen = search.length();
-    size_t rlen = repl.length();
-    size_t incr = (rlen > 0) ? rlen : 1;
-
-    if (slen > 0) {
-      size_t found = str.find(search);
-      while ((found != string::npos) && (found < str.length())) {
-        str.replace(found, slen, repl);
-        found = str.find(search, found + incr);
-      }
-    }
-
-    return str;
-  }
-
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  void export_class_to_library(string file_name, string class_name);
-
-  void generate_dart_library();
-  void generate_dart_pubspec();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  void print_const_value(std::ofstream& out,
-                         std::string name,
-                         t_type* type,
-                         t_const_value* value,
-                         bool in_static,
-                         bool defval = false);
-  std::string render_const_value(ofstream& out,
-                                 std::string name,
-                                 t_type* type,
-                                 t_const_value* value);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_dart_struct(t_struct* tstruct, bool is_exception);
-
-  void generate_dart_struct_definition(std::ofstream& out,
-                                       t_struct* tstruct,
-                                       bool is_xception = false,
-                                       bool is_result = false,
-                                       string export_file_name = "");
-  void generate_dart_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_dart_validator(std::ofstream& out, t_struct* tstruct);
-  void generate_dart_struct_result_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_dart_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_dart_struct_tostring(std::ofstream& out, t_struct* tstruct);
-  std::string get_dart_type_string(t_type* type);
-  void generate_generic_field_getters(std::ofstream& out, t_struct* tstruct);
-  void generate_generic_field_setters(std::ofstream& out, t_struct* tstruct);
-  void generate_generic_isset_method(std::ofstream& out, t_struct* tstruct);
-  void generate_dart_bean_boilerplate(std::ofstream& out, t_struct* tstruct);
-
-  void generate_function_helpers(t_function* tfunction);
-  std::string init_value(t_field* tfield);
-  std::string get_cap_name(std::string name);
-  std::string get_member_name(std::string name);
-  std::string get_args_class_name(std::string name);
-  std::string get_result_class_name(std::string name);
-  std::string get_file_name(std::string name);
-  std::string get_constants_class_name(std::string name);
-  std::string generate_isset_check(t_field* field);
-  std::string generate_isset_check(std::string field);
-  void generate_isset_set(ofstream& out, t_field* field);
-
-  void generate_service_interface(t_service* tservice);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string iter,
-                                      std::string map);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_dart_doc(std::ofstream& out, t_doc* tdoc);
-
-  void generate_dart_doc(std::ofstream& out, t_function* tdoc);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string find_library_name(t_program* program);
-  std::string dart_library(string file_name);
-  std::string service_imports();
-  std::string dart_thrift_imports();
-  std::string type_name(t_type* ttype);
-  std::string base_type_name(t_base_type* tbase);
-  std::string declare_field(t_field* tfield, bool init = false);
-  std::string function_signature(t_function* tfunction);
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-  std::string get_ttype_class_name(t_type* ttype);
-
-  bool type_can_be_null(t_type* ttype) {
-    ttype = get_true_type(ttype);
-
-    return ttype->is_container() || ttype->is_struct() || ttype->is_xception()
-           || ttype->is_string();
-  }
-
-  vector<std::string> split(const string& s, char delim) {
-    vector<std::string> elems;
-    stringstream ss(s);
-    string item;
-    while (getline(ss, item, delim)) {
-      elems.push_back(item);
-    }
-    return elems;
-  }
-
-  std::string constant_name(std::string name);
-
-private:
-  std::ofstream f_service_;
-
-  std::string library_name_;
-  std::string library_prefix_;
-  std::string package_prefix_;
-  std::string pubspec_lib_;
-
-  std::string base_dir_;
-  std::string src_dir_;
-  std::string library_exports_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_dart_generator::init_generator() {
-  MKDIR(get_out_dir().c_str());
-
-  if (library_name_.empty()) {
-    library_name_ = find_library_name(program_);
-  }
-
-  string subdir = get_out_dir() + "/" + library_name_;
-  MKDIR(subdir.c_str());
-  base_dir_ = subdir;
-
-  if (library_prefix_.empty()) {
-    subdir += "/lib";
-    MKDIR(subdir.c_str());
-    subdir += "/src";
-    MKDIR(subdir.c_str());
-    src_dir_ = subdir;
-  } else {
-    src_dir_ = base_dir_;
-  }
-}
-
-string t_dart_generator::find_library_name(t_program* program) {
-  string name = program->get_namespace("dart");
-  if (name.empty()) {
-    name = program->get_name();
-  }
-  name = replace_all(name, ".", "_");
-  name = replace_all(name, "-", "_");
-  return name;
-}
-
-/**
- * The Dart library
- *
- * @return String of the library, e.g. "library myservice;"
- */
-string t_dart_generator::dart_library(string file_name) {
-  string out = "library " + library_prefix_ + library_name_;
-  if (!file_name.empty()) {
-    if (library_prefix_.empty()) {
-      out += ".src." + file_name;
-    } else {
-      out += "." + file_name;
-    }
-  }
-  return out + ";\n";
-}
-
-/**
- * Prints imports for services
- *
- * @return List of imports for services
- */
-string t_dart_generator::service_imports() {
-  return "import 'dart:async';" + endl;
-}
-
-/**
- * Prints standard dart imports
- *
- * @return List of imports necessary for thrift
- */
-string t_dart_generator::dart_thrift_imports() {
-  string imports = "import 'dart:typed_data' show Uint8List;" + endl +
-                   "import 'package:thrift/thrift.dart';" + endl;
-
-  // add import for this library
-  if (package_prefix_.empty()) {
-    imports += "import 'package:" + library_name_ + "/" + library_name_ + ".dart';" + endl;
-  } else {
-    imports += "import 'package:" + package_prefix_ + library_name_ + ".dart';" + endl;
-  }
-
-  // add imports for included thrift files
-  const vector<t_program*>& includes = program_->get_includes();
-  for (size_t i = 0; i < includes.size(); ++i) {
-    string include_name = find_library_name(includes[i]);
-    string named_import = "t_" + include_name;
-    if (package_prefix_.empty()) {
-      imports += "import 'package:" + include_name + "/" + include_name + ".dart' as " + named_import + ";" + endl;
-    } else {
-      imports += "import 'package:" + package_prefix_ + include_name + ".dart' as " + named_import + ";" + endl;
-    }
-  }
-
-  return imports;
-}
-
-/**
- * Not used
- */
-void t_dart_generator::close_generator() {
-  generate_dart_library();
-
-  if (library_prefix_.empty()) {
-    generate_dart_pubspec();
-  }
-}
-
-void t_dart_generator::generate_dart_library() {
-  string f_library_name;
-  if (library_prefix_.empty()) {
-    f_library_name = base_dir_ + "/lib/" + library_name_ + ".dart";
-  } else {
-    f_library_name = get_out_dir() + "/" + library_name_ + ".dart";
-  }
-
-  ofstream f_library;
-  f_library.open(f_library_name.c_str());
-
-  f_library << autogen_comment() << endl;
-  f_library << "library " << library_prefix_ << library_name_ << ";" << endl2;
-  f_library << library_exports_;
-
-  f_library.close();
-}
-
-void t_dart_generator::export_class_to_library(string file_name, string class_name) {
-  string subdir;
-  if (library_prefix_.empty()) {
-    subdir = "src";
-  } else {
-    subdir = library_name_;
-  }
-  library_exports_ += "export '" + subdir + "/" + file_name + ".dart' show " + class_name + ";" + endl;
-}
-
-void t_dart_generator::generate_dart_pubspec() {
-  string f_pubspec_name = base_dir_ + "/pubspec.yaml";
-  ofstream f_pubspec;
-  f_pubspec.open(f_pubspec_name.c_str());
-
-  indent(f_pubspec) << "name: " << library_name_ << endl;
-  indent(f_pubspec) << "version: 0.0.1" << endl;
-  indent(f_pubspec) << "description: Autogenerated by Thrift Compiler" << endl;
-  f_pubspec << endl;
-
-  indent(f_pubspec) << "environment:" << endl;
-  indent_up();
-  indent(f_pubspec) << "sdk: ^1.12.0" << endl;
-  indent_down();
-  f_pubspec << endl;
-
-  indent(f_pubspec) << "dependencies:" << endl;
-  indent_up();
-
-  if (pubspec_lib_.empty()) {
-    // default to relative path within working directory, which works for tests
-    indent(f_pubspec) << "thrift:  # ^" << dart_thrift_version << endl;
-    indent_up();
-    indent(f_pubspec) << "path: ../../../../lib/dart" << endl;
-    indent_down();
-  } else {
-    const vector<std::string> lines = split(pubspec_lib_, '|');
-    for (size_t line_index = 0; line_index < lines.size(); line_index++) {
-      indent(f_pubspec) << lines[line_index] << endl;
-    }
-  }
-
-  // add included thrift files as dependencies
-  const vector<t_program*>& includes = program_->get_includes();
-  for (size_t i = 0; i < includes.size(); ++i) {
-    string include_name = find_library_name(includes[i]);
-    indent(f_pubspec) << include_name << ":" << endl;
-    indent_up();
-    indent(f_pubspec) << "path: ../" << include_name << endl;
-    indent_down();
-  }
-
-  indent_down();
-  f_pubspec << endl;
-
-  f_pubspec.close();
-}
-
-/**
- * Not used
- *
- * @param ttypedef The type definition
- */
-void t_dart_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Enums are a class with a set of static constants.
- *
- * @param tenum The enumeration
- */
-void t_dart_generator::generate_enum(t_enum* tenum) {
-  // Make output file
-  string file_name = get_file_name(tenum->get_name());
-
-  string f_enum_name = src_dir_ + "/" + file_name + ".dart";
-  ofstream f_enum;
-  f_enum.open(f_enum_name.c_str());
-
-  // Comment and add library
-  f_enum << autogen_comment() << dart_library(file_name) << endl;
-
-  string class_name = tenum->get_name();
-  export_class_to_library(file_name, class_name);
-  f_enum << "class " << class_name;
-  scope_up(f_enum);
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    indent(f_enum) << "static const int " << (*c_iter)->get_name() << " = " << value << ";"
-                   << endl;
-  }
-
-  // Create a static Set with all valid values for this enum
-  f_enum << endl;
-
-  indent(f_enum) << "static final Set<int> VALID_VALUES = new Set.from([" << endl;
-  indent_up();
-  bool firstValue = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    // populate set
-    indent(f_enum) << (firstValue ? "" : ", ");
-    f_enum << (*c_iter)->get_name() << endl;
-    firstValue = false;
-  }
-  indent_down();
-  indent(f_enum) << "]);" << endl;
-
-  indent(f_enum) << "static final Map<int, String> VALUES_TO_NAMES = {" << endl;
-  indent_up();
-  firstValue = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    indent(f_enum) << (firstValue ? "" : ", ");
-    f_enum  << (*c_iter)->get_name() << ": '" << (*c_iter)->get_name() << "'" << endl;
-    firstValue = false;
-  }
-  indent_down();
-  indent(f_enum) << "};" << endl;
-
-  scope_down(f_enum); // end class
-
-  f_enum.close();
-}
-
-/**
- * Generates a class that holds all the constants.
- */
-void t_dart_generator::generate_consts(std::vector<t_const*> consts) {
-  if (consts.empty()) {
-    return;
-  }
-
-  string class_name = get_constants_class_name(program_name_);
-  string file_name = get_file_name(class_name);
-
-  string f_consts_name = src_dir_ + "/" + file_name + ".dart";
-  ofstream f_consts;
-  f_consts.open(f_consts_name.c_str());
-
-  // Print header
-  f_consts << autogen_comment() << dart_library(file_name) << endl;
-  f_consts << dart_thrift_imports() << endl;
-
-  export_class_to_library(file_name, class_name);
-  indent(f_consts) << "class " << class_name;
-  scope_up(f_consts);
-
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    print_const_value(f_consts,
-                      (*c_iter)->get_name(),
-                      (*c_iter)->get_type(),
-                      (*c_iter)->get_value(),
-                      false);
-    f_consts << endl;
-  }
-
-  scope_down(f_consts);
-
-  f_consts.close();
-}
-
-void t_dart_generator::print_const_value(std::ofstream& out,
-                                        string name,
-                                        t_type* type,
-                                        t_const_value* value,
-                                        bool in_static,
-                                        bool defval) {
-  type = get_true_type(type);
-
-  indent(out);
-  if (!defval) {
-    out << (in_static ? "var " : "static final ");
-  }
-  if (type->is_base_type()) {
-    if (!defval) {
-      out << type_name(type) << " ";
-    }
-    string v2 = render_const_value(out, name, type, value);
-    out << name;
-    out << " = " << v2 << ";" << endl << endl;
-  } else if (type->is_enum()) {
-    if (!defval) {
-      out << type_name(type) << " ";
-    }
-    out << name;
-    out << " = " << value->get_integer() << ";" << endl << endl;
-  } else if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    out << type_name(type) << " " << name << " = new " << type_name(type) << "()";
-    indent_up();
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string val = render_const_value(out, name, field_type, v_iter->second);
-      out << endl;
-      indent(out) << ".." << v_iter->first->get_string() << " = " << val;
-    }
-    indent_down();
-    out << ";" << endl;
-  } else if (type->is_map()) {
-    if (!defval) {
-      out << type_name(type) << " ";
-    }
-    out << name << " =";
-    scope_up(out);
-
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(out, name, ktype, v_iter->first);
-      string val = render_const_value(out, name, vtype, v_iter->second);
-      indent(out) << key << ": " << val << "," << endl;
-    }
-    scope_down(out, ";" + endl);
-
-    out << endl;
-  } else if (type->is_list() || type->is_set()) {
-    if (!defval) {
-      out << type_name(type) << " ";
-    }
-    out << name << " = ";
-    t_type* etype;
-    if (type->is_list()) {
-      out << "[" << endl;
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      out << "new " << type_name(type) << ".from([" << endl;
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-
-    indent_up();
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(out, name, etype, *v_iter);
-      indent(out) << val << "," << endl;
-    }
-    indent_down();
-
-    if (type->is_list()) {
-      indent(out) << "];" << endl;
-    } else {
-      indent(out) << "]);" << endl;
-    }
-
-  } else {
-    throw "compiler error: no const of type " + type->get_name();
-  }
-}
-
-string t_dart_generator::render_const_value(ofstream& out,
-                                           string name,
-                                           t_type* type,
-                                           t_const_value* value) {
-  (void)name;
-  type = get_true_type(type);
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << "'" << get_escaped_string(value) << "'";
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << value->get_integer();
-  } else {
-    string t = tmp("tmp");
-    print_const_value(out, t, type, value, true);
-    out << endl;
-    render << t;
-  }
-
-  return render.str();
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is a class
- * with data members, read(), write(), and an inner Isset class.
- *
- * @param tstruct The struct definition
- */
-void t_dart_generator::generate_struct(t_struct* tstruct) {
-  generate_dart_struct(tstruct, false);
-}
-
-/**
- * Exceptions are structs, but they inherit from Exception
- *
- * @param tstruct The struct definition
- */
-void t_dart_generator::generate_xception(t_struct* txception) {
-  generate_dart_struct(txception, true);
-}
-
-/**
- * Dart struct definition.
- *
- * @param tstruct The struct definition
- */
-void t_dart_generator::generate_dart_struct(t_struct* tstruct, bool is_exception) {
-  string file_name = get_file_name(tstruct->get_name());
-  string f_struct_name = src_dir_ + "/" + file_name + ".dart";
-  ofstream f_struct;
-  f_struct.open(f_struct_name.c_str());
-
-  f_struct << autogen_comment() << dart_library(file_name) << endl;
-
-  string imports;
-
-  f_struct << dart_thrift_imports() << endl;
-
-  generate_dart_struct_definition(f_struct, tstruct, is_exception, false, file_name);
-
-  f_struct.close();
-}
-
-/**
- * Dart struct definition. This has various parameters, as it could be
- * generated standalone or inside another class as a helper. If it
- * is a helper than it is a static class.
- *
- * @param tstruct      The struct definition
- * @param is_exception Is this an exception?
- * @param in_class     If inside a class, needs to be static class
- * @param is_result    If this is a result it needs a different writer
- */
-void t_dart_generator::generate_dart_struct_definition(ofstream& out,
-                                                       t_struct* tstruct,
-                                                       bool is_exception,
-                                                       bool is_result,
-                                                       string export_file_name) {
-  generate_dart_doc(out, tstruct);
-
-  string class_name = tstruct->get_name();
-  if (!export_file_name.empty()) {
-    export_class_to_library(export_file_name, class_name);
-  }
-  indent(out) << "class " << class_name << " ";
-
-  if (is_exception) {
-    out << "extends Error ";
-  }
-  out << "implements TBase";
-  scope_up(out);
-
-  indent(out) << "static final TStruct _STRUCT_DESC = new TStruct(\"" << class_name
-              << "\");" << endl;
-
-  // Members are public for -dart, private for -dartbean
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "static final TField _" << constant_name((*m_iter)->get_name())
-                << "_FIELD_DESC = new TField(\"" << (*m_iter)->get_name() << "\", "
-                << type_to_enum((*m_iter)->get_type()) << ", " << (*m_iter)->get_key() << ");"
-                << endl;
-  }
-
-  out << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    generate_dart_doc(out, *m_iter);
-    indent(out) << type_name((*m_iter)->get_type()) + " _"
-                << get_member_name((*m_iter)->get_name()) << init_value(*m_iter) << ";" << endl;
-
-    indent(out) << "static const int " << upcase_string((*m_iter)->get_name())
-                << " = " << (*m_iter)->get_key() << ";" << endl;
-  }
-
-  out << endl;
-
-  // Inner Isset class
-  if (members.size() > 0) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (!type_can_be_null((*m_iter)->get_type())) {
-        string field_name = get_member_name((*m_iter)->get_name());
-        indent(out) << "bool __isset_" << field_name << " = false;" << endl;
-      }
-    }
-  }
-
-  out << endl;
-
-  // Default constructor
-  indent(out) << tstruct->get_name() << "()";
-  scope_up(out);
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if ((*m_iter)->get_value() != NULL) {
-      print_const_value(out,
-                        "this." + get_member_name((*m_iter)->get_name()),
-                        t,
-                        (*m_iter)->get_value(),
-                        true,
-                        true);
-    }
-  }
-  scope_down(out);
-  out << endl;
-
-  generate_dart_bean_boilerplate(out, tstruct);
-  generate_generic_field_getters(out, tstruct);
-  generate_generic_field_setters(out, tstruct);
-  generate_generic_isset_method(out, tstruct);
-
-  generate_dart_struct_reader(out, tstruct);
-  if (is_result) {
-    generate_dart_struct_result_writer(out, tstruct);
-  } else {
-    generate_dart_struct_writer(out, tstruct);
-  }
-  generate_dart_struct_tostring(out, tstruct);
-  generate_dart_validator(out, tstruct);
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generates a function to read all the fields of the struct.
- *
- * @param tstruct The struct definition
- */
-void t_dart_generator::generate_dart_struct_reader(ofstream& out, t_struct* tstruct) {
-  indent(out) << "read(TProtocol iprot)";
-  scope_up(out);
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Declare stack tmp variables and read struct header
-  indent(out) << "TField field;" << endl;
-  indent(out) << "iprot.readStructBegin();" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (true)";
-  scope_up(out);
-
-  // Read beginning field marker
-  indent(out) << "field = iprot.readFieldBegin();" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if (field.type == TType.STOP)";
-  scope_up(out);
-  indent(out) << "break;" << endl;
-  scope_down(out);
-
-  // Switch statement on the field we are reading
-  indent(out) << "switch (field.id)";
-  scope_up(out);
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << upcase_string((*f_iter)->get_name()) << ":" << endl;
-    indent_up();
-
-    indent(out) << "if (field.type == " << type_to_enum((*f_iter)->get_type()) << ")";
-    scope_up(out);
-
-    generate_deserialize_field(out, *f_iter, "this.");
-    generate_isset_set(out, *f_iter);
-
-    scope_down(out, " else");
-    scope_up(out);
-    indent(out) << "TProtocolUtil.skip(iprot, field.type);" << endl;
-    scope_down(out);
-
-    indent(out) << "break;" << endl;
-    indent_down();
-  }
-
-  // In the default case we skip the field
-  indent(out) << "default:" << endl;
-  indent_up();
-  indent(out) << "TProtocolUtil.skip(iprot, field.type);" << endl;
-  indent(out) << "break;" << endl;
-  indent_down();
-
-  scope_down(out);
-
-  // Read field end marker
-  indent(out) << "iprot.readFieldEnd();" << endl;
-
-  scope_down(out);
-
-  indent(out) << "iprot.readStructEnd();" << endl2;
-
-  // in non-beans style, check for required fields of primitive type
-  // (which can be checked here but not in the general validate method)
-  indent(out) << "// check for required fields of primitive type, which can't be "
-                 "checked in the validate method" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED && !type_can_be_null((*f_iter)->get_type())) {
-      string field_name = get_member_name((*f_iter)->get_name());
-      indent(out) << "if (!__isset_" << field_name << ")";
-      scope_up(out);
-      indent(out) << "  throw new TProtocolError(TProtocolErrorType.UNKNOWN, \"Required field '"
-          << field_name
-          << "' was not found in serialized data! Struct: \" + toString());" << endl;
-      scope_down(out, endl2);
-    }
-  }
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "validate();" << endl;
-
-  scope_down(out, endl2);
-}
-
-// generates dart method to perform various checks
-// (e.g. check that all required fields are set)
-void t_dart_generator::generate_dart_validator(ofstream& out, t_struct* tstruct) {
-  indent(out) << "validate()";
-  scope_up(out);
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "// check for required fields" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      string field_name = get_member_name((*f_iter)->get_name());
-      if (type_can_be_null((*f_iter)->get_type())) {
-        indent(out) << "if (" << field_name << " == null)";
-        scope_up(out);
-        indent(out) << "throw new TProtocolError(TProtocolErrorType.UNKNOWN, \"Required field '"
-                    << field_name << "' was not present! Struct: \" + toString());"
-                    << endl;
-        scope_down(out);
-      } else {
-        indent(out) << "// alas, we cannot check '" << field_name
-                    << "' because it's a primitive and you chose the non-beans generator." << endl;
-      }
-    }
-  }
-
-  // check that fields of type enum have valid values
-  indent(out) << "// check that fields of type enum have valid values" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = (*f_iter);
-    t_type* type = field->get_type();
-    // if field is an enum, check that its value is valid
-    if (type->is_enum()) {
-      string field_name = get_member_name(field->get_name());
-      indent(out) << "if (" << generate_isset_check(field) << " && !" << get_ttype_class_name(type)
-                  << ".VALID_VALUES.contains(" << field_name << "))";
-      scope_up(out);
-      indent(out) << "throw new TProtocolError(TProtocolErrorType.UNKNOWN, \"The field '"
-                  << field_name << "' has been assigned the invalid value "
-                  << "$" << field_name << "\");" << endl;
-      scope_down(out);
-    }
-  }
-
-  scope_down(out, endl2);
-}
-
-/**
- * Generates a function to write all the fields of the struct
- *
- * @param tstruct The struct definition
- */
-void t_dart_generator::generate_dart_struct_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "write(TProtocol oprot)";
-  scope_up(out);
-
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "validate();" << endl2;
-
-  indent(out) << "oprot.writeStructBegin(_STRUCT_DESC);" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    string field_name = get_member_name((*f_iter)->get_name());
-    bool could_be_unset = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (could_be_unset) {
-      indent(out) << "if (" << generate_isset_check(*f_iter) << ")";
-      scope_up(out);
-    }
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    if (null_allowed) {
-      indent(out) << "if (this." << field_name << " != null)";
-      scope_up(out);
-    }
-
-    indent(out) << "oprot.writeFieldBegin(_" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    if (null_allowed) {
-      scope_down(out);
-    }
-    if (could_be_unset) {
-      scope_down(out);
-    }
-  }
-  // Write the struct map
-  indent(out) << "oprot.writeFieldStop();" << endl << indent() << "oprot.writeStructEnd();"
-      << endl;
-
-  scope_down(out, endl2);
-}
-
-/**
- * Generates a function to write all the fields of the struct,
- * which is a function result. These fields are only written
- * if they are set in the Isset array, and only one of them
- * can be set at a time.
- *
- * @param tstruct The struct definition
- */
-void t_dart_generator::generate_dart_struct_result_writer(ofstream& out, t_struct* tstruct) {
-  indent(out) << "write(TProtocol oprot)";
-  scope_up(out);
-
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "oprot.writeStructBegin(_STRUCT_DESC);" << endl2;
-
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      indent(out) << "if ";
-    } else {
-      out << " else if ";
-    }
-
-    out << "(this." << generate_isset_check(*f_iter) << ")";
-    scope_up(out);
-
-    indent(out) << "oprot.writeFieldBegin(_" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    scope_down(out, "");
-  }
-  out << endl;
-
-  // Write the struct map
-  indent(out) << "oprot.writeFieldStop();" << endl << indent()
-      << "oprot.writeStructEnd();" << endl;
-
-  scope_down(out, endl2);
-}
-
-void t_dart_generator::generate_generic_field_getters(std::ofstream& out,
-                                                      t_struct* tstruct) {
-  // create the getter
-  indent(out) << "getFieldValue(int fieldID)";
-  scope_up(out);
-
-  indent(out) << "switch (fieldID)";
-  scope_up(out);
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    std::string field_name = get_member_name(field->get_name());
-
-    indent(out) << "case " << upcase_string(field_name) << ":" << endl;
-    indent_up();
-    indent(out) << "return this." << field_name << ";" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent_up();
-  indent(out) << "throw new ArgumentError(\"Field $fieldID doesn't exist!\");" << endl;
-  indent_down();
-
-  scope_down(out);  // switch
-  scope_down(out, endl2);  // method
-}
-
-void t_dart_generator::generate_generic_field_setters(std::ofstream& out,
-                                                      t_struct* tstruct) {
-
-  // create the setter
-  indent(out) << "setFieldValue(int fieldID, Object value)";
-  scope_up(out);
-
-  indent(out) << "switch (fieldID)";
-  scope_up(out);
-
-  // build up the bodies of both the getter and setter at once
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    std::string field_name = get_member_name(field->get_name());
-
-    indent(out) << "case " << upcase_string(field_name) << ":" << endl;
-    indent_up();
-
-    indent(out) << "if (value == null)";
-    scope_up(out);
-    indent(out) << "unset" << get_cap_name(field_name) << "();" << endl;
-
-    scope_down(out, " else");
-    scope_up(out);
-    indent(out) << "this." << field_name << " = value;" << endl;
-    scope_down(out);
-
-    indent(out) << "break;" << endl;
-
-    indent_down();
-    out << endl;
-  }
-
-  indent(out) << "default:" << endl;
-  indent_up();
-  indent(out) << "throw new ArgumentError(\"Field $fieldID doesn't exist!\");" << endl;
-  indent_down();
-
-  scope_down(out);  // switch
-  scope_down(out, endl2);  // method
-}
-
-// Creates a generic isSet method that takes the field number as argument
-void t_dart_generator::generate_generic_isset_method(std::ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // create the isSet method
-  indent(out) << "// Returns true if field corresponding to fieldID is set (has been assigned a "
-                 "value) and false otherwise" << endl;
-  indent(out) << "bool isSet(int fieldID)";
-  scope_up(out);
-
-  indent(out) << "switch (fieldID)";
-  scope_up(out);
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    indent(out) << "case " << upcase_string(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << "return " << generate_isset_check(field) << ";" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent_up();
-  indent(out) << "throw new ArgumentError(\"Field $fieldID doesn't exist!\");" << endl;
-  indent_down();
-
-  scope_down(out);  // switch
-  scope_down(out, endl2);  // method
-}
-
-/**
- * Generates a set of Dart Bean boilerplate functions (setters, getters, etc.)
- * for the given struct.
- *
- * @param tstruct The struct definition
- */
-void t_dart_generator::generate_dart_bean_boilerplate(ofstream& out,
-                                                    t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = get_member_name(field->get_name());
-    std::string cap_name = get_cap_name(field_name);
-
-    indent(out) << "// " << field_name << endl;
-
-    // Simple getter
-    generate_dart_doc(out, field);
-    indent(out) << type_name(type) << " get " << field_name << " => this._" << field_name << ";" << endl2;
-
-    // Simple setter
-    generate_dart_doc(out, field);
-    indent(out) << "set " << field_name << "(" << type_name(type) << " " << field_name << ")";
-    scope_up(out);
-    indent(out) << "this._" << field_name << " = " << field_name << ";" << endl;
-    generate_isset_set(out, field);
-    scope_down(out, endl2);
-
-    // isSet method
-    indent(out) << "bool is" << get_cap_name("set") << cap_name << "()";
-    if (type_can_be_null(type)) {
-      out << " => this." << field_name << " != null;" << endl2;
-    } else {
-      out << " => this.__isset_" << field_name << ";" << endl2;
-    }
-
-    // Unsetter
-    indent(out) << "unset" << cap_name << "()";
-    scope_up(out);
-    if (type_can_be_null(type)) {
-      indent(out) << "this." << field_name << " = null;" << endl;
-    } else {
-      indent(out) << "this.__isset_" << field_name << " = false;" << endl;
-    }
-    scope_down(out, endl2);
-  }
-}
-
-/**
- * Generates a toString() method for the given struct
- *
- * @param tstruct The struct definition
- */
-void t_dart_generator::generate_dart_struct_tostring(ofstream& out,
-                                                   t_struct* tstruct) {
-  indent(out) << "String toString()";
-  scope_up(out);
-
-  indent(out) << "StringBuffer ret = new StringBuffer(\""
-              << tstruct->get_name() << "(\");" << endl2;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool could_be_unset = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (could_be_unset) {
-      indent(out) << "if (" << generate_isset_check(*f_iter) << ")";
-      scope_up(out);
-    }
-
-    t_field* field = (*f_iter);
-    std::string field_name = get_member_name(field->get_name());
-
-    if (!first) {
-      indent(out) << "ret.write(\", \");" << endl;
-    }
-    indent(out) << "ret.write(\"" << field_name << ":\");" << endl;
-    bool can_be_null = type_can_be_null(field->get_type());
-    if (can_be_null) {
-      indent(out) << "if (this." << field_name << " == null)";
-      scope_up(out);
-      indent(out) << "ret.write(\"null\");" << endl;
-      scope_down(out, " else");
-      scope_up(out);
-    }
-
-    if (field->get_type()->is_base_type() && ((t_base_type*)(field->get_type()))->is_binary()) {
-      indent(out) << "ret.write(\"BINARY\");" << endl;
-    } else if (field->get_type()->is_enum()) {
-      indent(out) << "String " << field_name << "_name = "
-                  << get_ttype_class_name(field->get_type())
-                  << ".VALUES_TO_NAMES[this." << field_name << "];" << endl;
-      indent(out) << "if (" << field_name << "_name != null)";
-      scope_up(out);
-      indent(out) << "ret.write(" << field_name << "_name);" << endl;
-      indent(out) << "ret.write(\" (\");" << endl;
-      scope_down(out);
-      indent(out) << "ret.write(this." << field_name << ");" << endl;
-      indent(out) << "if (" << field_name << "_name != null)";
-      scope_up(out);
-      indent(out) << "ret.write(\")\");" << endl;
-      scope_down(out);
-    } else {
-      indent(out) << "ret.write(this." << field_name << ");" << endl;
-    }
-
-    if (can_be_null) {
-      scope_down(out);
-    }
-    if (could_be_unset) {
-      scope_down(out);
-    }
-
-    out << endl;
-    first = false;
-  }
-
-  indent(out) << "ret.write(\")\");" << endl2;
-
-  indent(out) << "return ret.toString();" << endl;
-
-  scope_down(out, endl2);
-}
-
-/**
- * Returns a string with the dart representation of the given thrift type
- * (e.g. for the type struct it returns "TType.STRUCT")
- */
-std::string t_dart_generator::get_dart_type_string(t_type* type) {
-  if (type->is_list()) {
-    return "TType.LIST";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_typedef()) {
-    return get_dart_type_string(((t_typedef*)type)->get_type());
-  } else if (type->is_base_type()) {
-    switch (((t_base_type*)type)->get_base()) {
-    case t_base_type::TYPE_VOID:
-      return "TType.VOID";
-      break;
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-      break;
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-      break;
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-      break;
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-      break;
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-      break;
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-      break;
-    default:
-      throw std::runtime_error("Unknown thrift type \"" + type->get_name()
-                               + "\" passed to t_dart_generator::get_dart_type_string!");
-      break; // This should never happen!
-    }
-  } else {
-    throw std::runtime_error(
-        "Unknown thrift type \"" + type->get_name()
-        + "\" passed to t_dart_generator::get_dart_type_string!"); // This should never happen!
-  }
-}
-
-void t_dart_generator::generate_service(t_service* tservice) {
-  string file_name = get_file_name(service_name_);
-  string f_service_name = src_dir_ + "/" + file_name + ".dart";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << dart_library(file_name) << endl;
-  f_service_ << service_imports() << dart_thrift_imports() << endl;
-  f_service_ << endl;
-
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-  generate_service_helpers(tservice);
-
-  f_service_.close();
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_dart_generator::generate_service_interface(t_service* tservice) {
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends_iface = " extends " + get_ttype_class_name(tservice->get_extends());
-  }
-
-  generate_dart_doc(f_service_, tservice);
-
-  string class_name = service_name_;
-  export_class_to_library(get_file_name(service_name_), class_name);
-  indent(f_service_) << "abstract class " << class_name << extends_iface;
-  scope_up(f_service_);
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << endl;
-    generate_dart_doc(f_service_, *f_iter);
-    indent(f_service_) << function_signature(*f_iter) << ";" << endl;
-  }
-
-  scope_down(f_service_, endl2);
-}
-
-/**
- * Generates structs for all the service args and return types
- *
- * @param tservice The service
- */
-void t_dart_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_dart_struct_definition(f_service_, ts, false, false);
-    generate_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_dart_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = get_ttype_class_name(tservice->get_extends());
-    extends_client = " extends " + extends + "Client";
-  }
-
-  string class_name = service_name_ + "Client";
-  export_class_to_library(get_file_name(service_name_), class_name);
-  indent(f_service_) << "class " << class_name << extends_client
-                     << " implements " << service_name_;
-  scope_up(f_service_);
-  f_service_ << endl;
-
-  indent(f_service_) << class_name << "(TProtocol iprot, [TProtocol oprot = null])";
-
-  if (!extends.empty()) {
-    indent_up();
-    f_service_ << endl;
-    indent(f_service_) << ": super(iprot, oprot);" << endl;
-    indent_down();
-  } else {
-    scope_up(f_service_);
-    indent(f_service_) << "_iprot = iprot;" << endl;
-    indent(f_service_) << "_oprot = (oprot == null) ? iprot : oprot;" << endl;
-    scope_down(f_service_);
-  }
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    indent(f_service_) << "TProtocol _iprot;" << endl2;
-    indent(f_service_) << "TProtocol get iprot => _iprot;" << endl2;
-    indent(f_service_) << "TProtocol _oprot;" << endl2;
-    indent(f_service_) << "TProtocol get oprot => _oprot;" << endl2;
-    indent(f_service_) << "int _seqid = 0;" << endl2;
-    indent(f_service_) << "int get seqid => _seqid;" << endl2;
-    indent(f_service_) << "int nextSeqid() => ++_seqid;" << endl2;
-  }
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    // Open function
-    indent(f_service_) << function_signature(*f_iter) << " async";
-    scope_up(f_service_);
-
-    // Get the struct of function call params
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-
-    string argsname = get_args_class_name((*f_iter)->get_name());
-    vector<t_field*>::const_iterator fld_iter;
-    const vector<t_field*>& fields = arg_struct->get_members();
-
-    // Serialize the request
-    indent(f_service_) << "oprot.writeMessageBegin(new TMessage(\"" << (*f_iter)->get_name() << "\", "
-               << ((*f_iter)->is_oneway() ? "TMessageType.ONEWAY" : "TMessageType.CALL")
-               << ", nextSeqid()));" << endl;
-    indent(f_service_) << argsname << " args = new " << argsname << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      string arg_field_name = get_member_name((*fld_iter)->get_name());
-      indent(f_service_) << "args." << arg_field_name << " = "
-                 << arg_field_name << ";" << endl;
-    }
-
-    indent(f_service_) << "args.write(oprot);" << endl;
-    indent(f_service_) << "oprot.writeMessageEnd();" << endl2;
-
-    indent(f_service_) << "await oprot.transport.flush();" << endl2;
-
-    if (!(*f_iter)->is_oneway()) {
-      indent(f_service_) << "TMessage msg = iprot.readMessageBegin();" << endl;
-      indent(f_service_) << "if (msg.type == TMessageType.EXCEPTION)";
-      scope_up(f_service_);
-      indent(f_service_) << "TApplicationError error = TApplicationError.read(iprot);" << endl;
-      indent(f_service_) << "iprot.readMessageEnd();" << endl;
-      indent(f_service_) << "throw error;" << endl;
-      scope_down(f_service_, endl2);
-
-      string result_class = get_result_class_name((*f_iter)->get_name());
-      indent(f_service_) << result_class << " result = new " << result_class << "();" << endl;
-      indent(f_service_) << "result.read(iprot);" << endl;
-      indent(f_service_) << "iprot.readMessageEnd();" << endl;
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "if (result." << generate_isset_check("success") << ")";
-        scope_up(f_service_);
-        indent(f_service_) << "return result.success;" << endl;
-        scope_down(f_service_, endl2);
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        string result_field_name = get_member_name((*x_iter)->get_name());
-        indent(f_service_) << "if (result." << result_field_name << " != null)";
-        scope_up(f_service_);
-        indent(f_service_) << "throw result." << result_field_name << ";" << endl;
-        scope_down(f_service_);
-      }
-
-      // If you get here it's an exception, unless a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "return;" << endl;
-      } else {
-        indent(f_service_) << "throw new TApplicationError(TApplicationErrorType.MISSING_RESULT, \""
-                   << (*f_iter)->get_name() << " failed: unknown result\");" << endl;
-      }
-    }
-
-    scope_down(f_service_, endl2);
-  }
-
-  scope_down(f_service_, endl2);
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_dart_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  // typedef
-  indent(f_service_) << "typedef void ProcessFunction(int seqid, TProtocol iprot, TProtocol oprot);" << endl2;
-
-  // Extends stuff
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = get_ttype_class_name(tservice->get_extends());
-    extends_processor = " extends " + extends + "Processor";
-  }
-
-  // Generate the header portion
-  string class_name =  service_name_ + "Processor";
-  export_class_to_library(get_file_name(service_name_), class_name);
-  indent(f_service_) << "class " << class_name << extends_processor << " implements TProcessor";
-  scope_up(f_service_);
-
-  indent(f_service_) << class_name << "(" << service_name_ << " iface)";
-  if (!extends.empty()) {
-    indent_up();
-    f_service_ << endl;
-    indent(f_service_) << ": super(iface)";
-    indent_down();
-  }
-  scope_up(f_service_);
-
-  if (extends.empty()) {
-    indent(f_service_) << "iface_ = iface;" << endl;
-  }
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    indent(f_service_) << "PROCESS_MAP[\"" << (*f_iter)->get_name()
-               << "\"] = " << get_member_name((*f_iter)->get_name()) << ";" << endl;
-  }
-  scope_down(f_service_, endl2);
-
-  indent(f_service_) << service_name_ << " iface_;" << endl;
-
-  if (extends.empty()) {
-    indent(f_service_) << "final Map<String, ProcessFunction> PROCESS_MAP = {};" << endl;
-  }
-
-  f_service_ << endl;
-
-  // Generate the server implementation
-  indent(f_service_) << "bool process(TProtocol iprot, TProtocol oprot)";
-  scope_up(f_service_);
-  indent(f_service_) << "TMessage msg = iprot.readMessageBegin();" << endl;
-  indent(f_service_) << "ProcessFunction fn = PROCESS_MAP[msg.name];" << endl;
-  indent(f_service_) << "if (fn == null)";
-  scope_up(f_service_);
-  indent(f_service_) << "TProtocolUtil.skip(iprot, TType.STRUCT);" << endl;
-  indent(f_service_) << "iprot.readMessageEnd();" << endl;
-  indent(f_service_) << "TApplicationError x = new TApplicationError(TApplicationErrorType.UNKNOWN_METHOD, "
-         "\"Invalid method name: '\"+msg.name+\"'\");" << endl;
-  indent(f_service_) << "oprot.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));" << endl;
-  indent(f_service_) << "x.write(oprot);" << endl;
-  indent(f_service_) << "oprot.writeMessageEnd();" << endl;
-  indent(f_service_) << "oprot.transport.flush();" << endl;
-  indent(f_service_) << "return true;" << endl;
-  scope_down(f_service_);
-  indent(f_service_) << "fn(msg.seqid, iprot, oprot);" << endl;
-  indent(f_service_) << "return true;" << endl;
-  scope_down(f_service_, endl2); // process function
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  scope_down(f_service_, endl2); // class
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_dart_generator::generate_function_helpers(t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  t_struct result(program_, get_result_class_name(tfunction->get_name()));
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_dart_struct_definition(f_service_, &result, false, true);
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_dart_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-
-  bool await_result = (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void());
-
-  indent(f_service_) << get_member_name(tfunction->get_name()) << "(int seqid, TProtocol iprot, TProtocol oprot)";
-  if (await_result) {
-    f_service_ << " async";
-  }
-  scope_up(f_service_);
-
-  string argsname = get_args_class_name(tfunction->get_name());
-  string resultname = get_result_class_name(tfunction->get_name());
-
-  indent(f_service_) << argsname << " args = new " << argsname << "();" << endl;
-  indent(f_service_) << "args.read(iprot);" << endl;
-  indent(f_service_) << "iprot.readMessageEnd();" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  if (!tfunction->is_oneway()) {
-    indent(f_service_) << resultname << " result = new " << resultname << "();" << endl;
-  }
-
-  if (!tfunction->is_oneway() && xceptions.size() > 0) {
-    indent(f_service_) << "try";
-    scope_up(f_service_);
-  }
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  f_service_ << indent();
-  if (await_result) {
-    f_service_ << "result.success = await ";
-  }
-  f_service_ << "iface_." << get_member_name(tfunction->get_name()) << "(";
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_service_ << ", ";
-    }
-    f_service_ << "args." << get_member_name((*f_iter)->get_name());
-  }
-  f_service_ << ");" << endl;
-
-  if (!tfunction->is_oneway() && xceptions.size() > 0) {
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      string result_field_name = get_member_name((*x_iter)->get_name());
-      scope_down(f_service_, "");
-      f_service_ << " on " << type_name((*x_iter)->get_type())
-              << " catch(" << result_field_name << ")";
-      scope_up(f_service_);
-      if (!tfunction->is_oneway()) {
-        indent(f_service_) << "result." << result_field_name << " = "
-                   << result_field_name << ";" << endl;
-      }
-    }
-    scope_down(f_service_, " ");
-    f_service_ << "catch (th)";
-    scope_up(f_service_);
-    indent(f_service_) << "// Internal error" << endl;
-    indent(f_service_) << "TApplicationError x = new "
-               "TApplicationError(TApplicationErrorType.INTERNAL_ERROR, \"Internal error processing "
-               << tfunction->get_name() << "\");" << endl;
-    indent(f_service_) << "oprot.writeMessageBegin(new TMessage(\"" << tfunction->get_name()
-               << "\", TMessageType.EXCEPTION, seqid));" << endl;
-    indent(f_service_) << "x.write(oprot);" << endl;
-    indent(f_service_) << "oprot.writeMessageEnd();" << endl;
-    indent(f_service_) << "oprot.transport.flush();" << endl;
-    indent(f_service_) << "return;" << endl;
-    scope_down(f_service_);
-  }
-
-  if (tfunction->is_oneway()) {
-    indent(f_service_) << "return;" << endl;
-  } else {
-    indent(f_service_) << "oprot.writeMessageBegin(new TMessage(\"" << tfunction->get_name()
-               << "\", TMessageType.REPLY, seqid));" << endl;
-    indent(f_service_) << "result.write(oprot);" << endl;
-    indent(f_service_) << "oprot.writeMessageEnd();" << endl;
-    indent(f_service_) << "oprot.transport.flush();" << endl;
-  }
-
-  scope_down(f_service_, endl2);
-}
-
-/**
- * Deserializes a field of any type.
- *
- * @param tfield The field
- * @param prefix The variable name or container for this field
- */
-void t_dart_generator::generate_deserialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-  string field_name = get_member_name(tfield->get_name());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + field_name;
-  }
-
-  string name = prefix + field_name;
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    indent(out) << name << " = iprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "readBinary();";
-        } else {
-          out << "readString();";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "readBool();";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "readByte();";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "readI16();";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "readI32();";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "readI64();";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "readDouble();";
-        break;
-      default:
-        throw "compiler error: no Dart name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "readI32();";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           field_name.c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a struct, invokes read()
- */
-void t_dart_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  indent(out) << prefix << " = new " << type_name(tstruct) << "();" << endl;
-  indent(out) << prefix << ".read(iprot);" << endl;
-}
-
-/**
- * Deserializes a container by reading its size and then iterating
- */
-void t_dart_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
-  indent(out);
-  scope_up(out, "");
-
-  string obj;
-
-  if (ttype->is_map()) {
-    obj = tmp("_map");
-  } else if (ttype->is_set()) {
-    obj = tmp("_set");
-  } else if (ttype->is_list()) {
-    obj = tmp("_list");
-  }
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    indent(out) << "TMap " << obj << " = iprot.readMapBegin();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "TSet " << obj << " = iprot.readSetBegin();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "TList " << obj << " = iprot.readListBegin();" << endl;
-  }
-
-  indent(out) << prefix << " = new " << type_name(ttype) << "();" << endl;
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for (int " << i << " = 0; " << i << " < " << obj << ".length"
-              << "; "
-              << "++" << i << ")";
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  scope_down(out);
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "iprot.readMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "iprot.readSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "iprot.readListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_dart_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey) << endl;
-  indent(out) << declare_field(&fval) << endl;
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << prefix << "[" << key << "] = " << val << ";" << endl;
-}
-
-/**
- * Deserializes a set element
- */
-void t_dart_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".add(" << elem << ");" << endl;
-}
-
-/**
- * Deserializes a list element
- */
-void t_dart_generator::generate_deserialize_list_element(ofstream& out,
-                                                        t_list* tlist,
-                                                        string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".add(" << elem << ");" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_dart_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-  string field_name = get_member_name(tfield->get_name());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + field_name;
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + field_name);
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + field_name);
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    string name = prefix + field_name;
-    indent(out) << "oprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "writeBinary(" << name << ");";
-        } else {
-          out << "writeString(" << name << ");";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ");";
-        break;
-      default:
-        throw "compiler error: no Dart name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32(" << name << ");";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           field_name.c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_dart_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  indent(out) << prefix << ".write(oprot);" << endl;
-}
-
-/**
- * Serializes a container by writing its size then the elements.
- *
- * @param ttype  The type of container
- * @param prefix String prefix for fields
- */
-void t_dart_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  indent(out);
-  scope_up(out, "");
-
-  if (ttype->is_map()) {
-    string iter = tmp("_key");
-    indent(out) << "oprot.writeMapBegin(new TMap(" << type_to_enum(((t_map*)ttype)->get_key_type())
-                << ", " << type_to_enum(((t_map*)ttype)->get_val_type()) << ", " << prefix << ".length));"
-                << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetBegin(new TSet(" << type_to_enum(((t_set*)ttype)->get_elem_type())
-                << ", " << prefix << ".length));" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListBegin(new TList("
-                << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " << prefix << ".length));"
-                << endl;
-  }
-
-  string iter = tmp("elem");
-  if (ttype->is_map()) {
-    indent(out) << "for (var " << iter << " in " << prefix << ".keys)";
-  } else if (ttype->is_set() || ttype->is_list()) {
-    indent(out) << "for (var " << iter << " in " << prefix << ")";
-  }
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, (t_map*)ttype, iter, prefix);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-  }
-
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot.writeMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- */
-void t_dart_generator::generate_serialize_map_element(ofstream& out,
-                                                     t_map* tmap,
-                                                     string iter,
-                                                     string map) {
-  t_field kfield(tmap->get_key_type(), iter);
-  generate_serialize_field(out, &kfield, "");
-  t_field vfield(tmap->get_val_type(), map + "[" + iter + "]");
-  generate_serialize_field(out, &vfield, "");
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_dart_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_dart_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Returns a Dart type name
- *
- * @param ttype The type
- * @return Dart type name, i.e. Map<Key, Value>
- */
-string t_dart_generator::type_name(t_type* ttype) {
-  ttype = get_true_type(ttype);
-
-  if (ttype->is_base_type()) {
-    return base_type_name((t_base_type*)ttype);
-  } else if (ttype->is_enum()) {
-    return "int";
-  } else if (ttype->is_map()) {
-    t_map* tmap = (t_map*)ttype;
-    return "Map<" + type_name(tmap->get_key_type()) + ", "
-                  + type_name(tmap->get_val_type()) + ">";
-  } else if (ttype->is_set()) {
-    t_set* tset = (t_set*)ttype;
-    return "Set<" + type_name(tset->get_elem_type()) + ">";
-  } else if (ttype->is_list()) {
-    t_list* tlist = (t_list*)ttype;
-    return "List<" + type_name(tlist->get_elem_type()) + ">";
-  }
-
-  return get_ttype_class_name(ttype);
-}
-
-/**
- * Returns the Dart type that corresponds to the thrift type.
- *
- * @param tbase The base type
- */
-string t_dart_generator::base_type_name(t_base_type* type) {
-  t_base_type::t_base tbase = type->get_base();
-
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "void";
-  case t_base_type::TYPE_STRING:
-    if (type->is_binary()) {
-      return "Uint8List";
-    } else {
-      return "String";
-    }
-  case t_base_type::TYPE_BOOL:
-    return "bool";
-  case t_base_type::TYPE_I8:
-  case t_base_type::TYPE_I16:
-  case t_base_type::TYPE_I32:
-  case t_base_type::TYPE_I64:
-    return "int";
-  case t_base_type::TYPE_DOUBLE:
-    return "double";
-  default:
-    throw "compiler error: no Dart name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param ttype The type
- */
-string t_dart_generator::declare_field(t_field* tfield, bool init) {
-  string field_name = get_member_name(tfield->get_name());
-  string result = type_name(tfield->get_type()) + " " + field_name;
-  if (init) {
-    t_type* ttype = get_true_type(tfield->get_type());
-    if (ttype->is_base_type() && tfield->get_value() != NULL) {
-      ofstream dummy;
-      result += " = " + render_const_value(dummy, field_name, ttype, tfield->get_value());
-    } else if (ttype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "NO T_VOID CONSTRUCT";
-      case t_base_type::TYPE_STRING:
-        result += " = null";
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = false";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = 0.0";
-        break;
-      }
-
-    } else if (ttype->is_enum()) {
-      result += " = 0";
-    } else if (ttype->is_container()) {
-      result += " = new " + type_name(ttype) + "()";
-    } else {
-      result += " = new " + type_name(ttype) + "()";
-      ;
-    }
-  }
-  return result + ";";
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_dart_generator::function_signature(t_function* tfunction) {
-  std::string arguments = argument_list(tfunction->get_arglist());
-
-  std::string returntype;
-  if (tfunction->get_returntype()->is_void()) {
-    returntype = "Future";
-  } else {
-    returntype = "Future<" + type_name(tfunction->get_returntype()) + ">";
-  }
-
-  std::string result = returntype + " " + get_member_name(tfunction->get_name()) +
-                       "(" + arguments + ")";
-  return result;
-}
-
-/**
- * Renders a comma separated field list, with type names
- */
-string t_dart_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    string field_name = get_member_name((*f_iter)->get_name());
-    result += type_name((*f_iter)->get_type()) + " " + field_name;
-  }
-  return result;
-}
-
-/**
- * Converts the parse type to a C++ enum string for the given type.
- */
-string t_dart_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_list()) {
-    return "TType.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-std::string t_dart_generator::init_value(t_field* field) {
-  // Do not initialize optional fields
-  if (field->get_req() == t_field::T_OPTIONAL) {
-    return "";
-  }
-
-  t_type* ttype = field->get_type();
-
-  // Get the actual type for a typedef
-  if (ttype->is_typedef()) {
-    ttype = ((t_typedef*)ttype)->get_type();
-  }
-
-  // Only consider base types for default initialization
-  if (!ttype->is_base_type()) {
-    return "";
-  }
-  t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-
-  // Initialize bools, ints, and doubles with sane defaults
-  string result;
-  switch (tbase) {
-  case t_base_type::TYPE_BOOL:
-    result = " = false";
-    break;
-  case t_base_type::TYPE_I8:
-  case t_base_type::TYPE_I16:
-  case t_base_type::TYPE_I32:
-  case t_base_type::TYPE_I64:
-    result = " = 0";
-    break;
-  case t_base_type::TYPE_DOUBLE:
-    result = " = 0.0";
-    break;
-  case t_base_type::TYPE_VOID:
-  case t_base_type::TYPE_STRING:
-    result = "";
-    break;
-  }
-
-  return result;
-}
-
-std::string t_dart_generator::get_cap_name(std::string name) {
-  name[0] = toupper(name[0]);
-  return name;
-}
-
-std::string t_dart_generator::get_member_name(std::string name) {
-  name[0] = tolower(name[0]);
-  return name;
-}
-
-std::string t_dart_generator::get_args_class_name(std::string name) {
-  return name + "_args";
-}
-
-std::string t_dart_generator::get_result_class_name(std::string name) {
-  return name + "_result";
-}
-
-std::string t_dart_generator::get_file_name(std::string name) {
-  // e.g. change APIForFileIO to api_for_file_io
-
-  string ret;
-  const char* tmp = name.c_str();
-  bool is_prev_lc = true;
-  bool is_current_lc = tmp[0] == tolower(tmp[0]);
-  bool is_next_lc = false;
-
-  for (unsigned int i = 0; i < name.length(); i++) {
-    char lc = tolower(tmp[i]);
-
-    if (i == name.length() - 1) {
-      is_next_lc = false;
-    } else {
-      is_next_lc = (tmp[i+1] == tolower(tmp[i+1]));
-    }
-
-    if (i != 0 && !is_current_lc && (is_prev_lc || is_next_lc)) {
-      ret += "_";
-    }
-    ret += lc;
-
-    is_prev_lc = is_current_lc;
-    is_current_lc = is_next_lc;
-  }
-
-  return ret;
-}
-
-std::string t_dart_generator::get_constants_class_name(std::string name) {
-  // e.g. change my_great_model to MyGreatModelConstants
-  string ret;
-  const char* tmp = name.c_str();
-  bool is_prev_underscore = true;
-
-  for (unsigned int i = 0; i < name.length(); i++) {
-    if (tmp[i] == '_') {
-      is_prev_underscore = true;
-    } else {
-      if (is_prev_underscore) {
-        ret += toupper(tmp[i]);
-      } else {
-        ret += tmp[i];
-      }
-
-      is_prev_underscore = false;
-    }
-  }
-
-  return ret + "Constants";
-}
-
-string t_dart_generator::constant_name(string name) {
-  string constant_name;
-
-  bool is_first = true;
-  bool was_previous_char_upper = false;
-  for (string::iterator iter = name.begin(); iter != name.end(); ++iter) {
-    string::value_type character = (*iter);
-
-    bool is_upper = isupper(character);
-
-    if (is_upper && !is_first && !was_previous_char_upper) {
-      constant_name += '_';
-    }
-    constant_name += toupper(character);
-
-    is_first = false;
-    was_previous_char_upper = is_upper;
-  }
-
-  return constant_name;
-}
-
-/**
- * Emits a doc comment if the provided object has a doc in Thrift
- */
-void t_dart_generator::generate_dart_doc(ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    generate_docstring_comment(out, "", "/// ", tdoc->get_doc(), "");
-  }
-}
-
-/**
- * Emits a doc comment if the provided function object has a doc in Thrift
- */
-void t_dart_generator::generate_dart_doc(ofstream& out, t_function* tfunction) {
-  if (tfunction->has_doc()) {
-    stringstream ss;
-    ss << tfunction->get_doc();
-    const vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-    vector<t_field*>::const_iterator p_iter;
-    for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-      t_field* p = *p_iter;
-      string field_name = get_member_name(p->get_name());
-      ss << "\n@param " << field_name;
-      if (p->has_doc()) {
-        ss << " " << p->get_doc();
-      }
-    }
-    generate_docstring_comment(out, "", "/// ", ss.str(), "");
-  }
-}
-
-std::string t_dart_generator::generate_isset_check(t_field* field) {
-  string field_name = get_member_name(field->get_name());
-  return generate_isset_check(field_name);
-}
-
-std::string t_dart_generator::generate_isset_check(std::string field_name) {
-  return "is" + get_cap_name("set") + get_cap_name(field_name) + "()";
-}
-
-void t_dart_generator::generate_isset_set(ofstream& out, t_field* field) {
-  if (!type_can_be_null(field->get_type())) {
-    string field_name = get_member_name(field->get_name());
-    indent(out) << "this.__isset_" << field_name << " = true;" << endl;
-  }
-}
-
-std::string t_dart_generator::get_ttype_class_name(t_type* ttype) {
-  if (program_ == ttype->get_program()) {
-    return ttype->get_name();
-  } else {
-    string named_import = "t_" + find_library_name(ttype->get_program());
-    return named_import + "." + ttype->get_name();
-  }
-}
-
-THRIFT_REGISTER_GENERATOR(
-    dart,
-    "Dart",
-    "    library_name:    Optional override for library name.\n"
-    "    library_prefix:  Generate code that can be used within an existing library.\n"
-    "                     Use a dot-separated string, e.g. \"my_parent_lib.src.gen\"\n"
-    "    pubspec_lib:     Optional override for thrift lib dependency in pubspec.yaml,\n"
-    "                     e.g. \"thrift: 0.x.x\".  Use a pipe delimiter to separate lines,\n"
-    "                     e.g. \"thrift:|  git:|    url: git@foo.com\"\n"
-)
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_delphi_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
deleted file mode 100644
index 8b1a445..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
+++ /dev/null
@@ -1,3920 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <cassert>
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <list>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include <cctype>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-class t_delphi_generator : public t_oop_generator {
-public:
-  t_delphi_generator(t_program* program,
-                     const std::map<std::string, std::string>& parsed_options,
-                     const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    indent_impl_ = 0;
-    has_forward = false;
-    has_enum = false;
-    has_const = false;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    ansistr_binary_ = false;
-    register_types_ = false;
-    constprefix_ = false;
-    events_ = false;
-    xmldoc_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("ansistr_binary") == 0) {
-        ansistr_binary_ = true;
-      } else if( iter->first.compare("register_types") == 0) {
-        register_types_ = true;
-      } else if( iter->first.compare("constprefix") == 0) {
-        constprefix_ = true;
-      } else if( iter->first.compare("events") == 0) {
-        events_ = true;
-      } else if( iter->first.compare("xmldoc") == 0) {
-        xmldoc_ = true;
-      } else {
-        throw "unknown option delphi:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-delphi";
-    escape_.clear();
-    escape_['\''] = "''";
-  }
-
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_forward_declaration(t_struct* tstruct);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-  void generate_property(ostream& out, t_field* tfield, bool isPublic, bool is_xception);
-  void generate_property_writer_(ostream& out, t_field* tfield, bool isPublic);
-
-  void generate_delphi_property(ostream& out,
-                                bool struct_is_exception,
-                                t_field* tfield,
-                                bool isPublic,
-                                std::string fieldPrefix = "");
-  void generate_delphi_isset_reader_definition(ostream& out, t_field* tfield, bool is_xception);
-  void generate_delphi_property_reader_definition(ostream& out,
-                                                  t_field* tfield,
-                                                  bool is_xception_class);
-  void generate_delphi_property_writer_definition(ostream& out,
-                                                  t_field* tfield,
-                                                  bool is_xception_class);
-  void generate_delphi_property_reader_impl(ostream& out,
-                                            std::string cls_prefix,
-                                            std::string name,
-                                            t_type* type,
-                                            t_field* tfield,
-                                            std::string fieldPrefix,
-                                            bool is_xception_class);
-  void generate_delphi_property_writer_impl(ostream& out,
-                                            std::string cls_prefix,
-                                            std::string name,
-                                            t_type* type,
-                                            t_field* tfield,
-                                            std::string fieldPrefix,
-                                            bool is_xception_class,
-                                            bool is_union,
-                                            bool is_xception_factory,
-                                            std::string xception_factroy_name);
-  void generate_delphi_clear_union_value(ostream& out,
-                                         std::string cls_prefix,
-                                         std::string name,
-                                         t_type* type,
-                                         t_field* tfield,
-                                         std::string fieldPrefix,
-                                         bool is_xception_class,
-                                         bool is_union,
-                                         bool is_xception_factory,
-                                         std::string xception_factroy_name);
-  void generate_delphi_isset_reader_impl(ostream& out,
-                                         std::string cls_prefix,
-                                         std::string name,
-                                         t_type* type,
-                                         t_field* tfield,
-                                         std::string fieldPrefix,
-                                         bool is_xception);
-  void generate_delphi_struct_writer_impl(ostream& out,
-                                          std::string cls_prefix,
-                                          t_struct* tstruct,
-                                          bool is_exception);
-  void generate_delphi_struct_result_writer_impl(ostream& out,
-                                                 std::string cls_prefix,
-                                                 t_struct* tstruct,
-                                                 bool is_exception);
-
-  void generate_delphi_struct_tostring_impl(ostream& out,
-                                            std::string cls_prefix,
-                                            t_struct* tstruct,
-                                            bool is_exception,
-                                            bool is_x_factory);
-
-  void add_delphi_uses_list(string unitname);
-
-  void generate_delphi_struct_reader_impl(ostream& out,
-                                          std::string cls_prefix,
-                                          t_struct* tstruct,
-                                          bool is_exception);
-  void generate_delphi_create_exception_impl(ostream& out,
-                                             string cls_prefix,
-                                             t_struct* tstruct,
-                                             bool is_exception);
-
-  bool const_needs_var(t_type* type);
-  void print_const_prop(std::ostream& out, string name, t_type* type, t_const_value* value);
-  void print_private_field(std::ostream& out, string name, t_type* type, t_const_value* value);
-  void print_const_value(std::ostream& vars,
-                         std::ostream& out,
-                         std::string name,
-                         t_type* type,
-                         t_const_value* value);
-  void initialize_field(std::ostream& vars,
-                        std::ostream& out,
-                        std::string name,
-                        t_type* type,
-                        t_const_value* value);
-  void finalize_field(std::ostream& out,
-                      std::string name,
-                      t_type* type,
-                      t_const_value* value,
-                      std::string cls_nm = "");
-  std::string render_const_value(std::ostream& local_vars,
-                                 std::ostream& out,
-                                 std::string name,
-                                 t_type* type,
-                                 t_const_value* value);
-  void print_const_def_value(std::ostream& vars,
-                             std::ostream& out,
-                             std::string name,
-                             t_type* type,
-                             t_const_value* value,
-                             std::string cls_nm = "");
-  std::string make_constants_classname();
-
-  void generate_delphi_struct(t_struct* tstruct, bool is_exception);
-  void generate_delphi_struct_impl(ostream& out,
-                                   std::string cls_prefix,
-                                   t_struct* tstruct,
-                                   bool is_exception,
-                                   bool is_result = false,
-                                   bool is_x_factory = false);
-  void print_delphi_struct_type_factory_func(ostream& out, t_struct* tstruct);
-  void generate_delphi_struct_type_factory(ostream& out,
-                                           std::string cls_prefix,
-                                           t_struct* tstruct,
-                                           bool is_exception,
-                                           bool is_result = false,
-                                           bool is_x_factory = false);
-  void generate_delphi_struct_type_factory_registration(ostream& out,
-                                                        std::string cls_prefix,
-                                                        t_struct* tstruct,
-                                                        bool is_exception,
-                                                        bool is_result = false,
-                                                        bool is_x_factory = false);
-  void generate_delphi_struct_definition(std::ostream& out,
-                                         t_struct* tstruct,
-                                         bool is_xception = false,
-                                         bool in_class = false,
-                                         bool is_result = false,
-                                         bool is_x_factory = false);
-  void generate_delphi_struct_reader(std::ostream& out, t_struct* tstruct);
-  void generate_delphi_struct_result_writer(std::ostream& out, t_struct* tstruct);
-  void generate_delphi_struct_writer(std::ostream& out, t_struct* tstruct);
-  void generate_delphi_struct_tostring(std::ostream& out, t_struct* tstruct);
-
-  void generate_function_helpers(t_function* tfunction);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* function);
-
-  void generate_deserialize_field(std::ostream& out,
-                                  bool is_xception,
-                                  t_field* tfield,
-                                  std::string prefix,
-                                  std::ostream& local_vars);
-  void generate_deserialize_struct(std::ostream& out,
-                                   t_struct* tstruct,
-                                   std::string name,
-                                   std::string prefix);
-  void generate_deserialize_container(ostream& out,
-                                      bool is_xception,
-                                      t_type* ttype,
-                                      string name,
-                                      std::ostream& local_vars);
-
-  void generate_deserialize_set_element(std::ostream& out,
-                                        bool is_xception,
-                                        t_set* tset,
-                                        std::string prefix,
-                                        std::ostream& local_vars);
-  void generate_deserialize_map_element(std::ostream& out,
-                                        bool is_xception,
-                                        t_map* tmap,
-                                        std::string prefix,
-                                        std::ostream& local_vars);
-  void generate_deserialize_list_element(std::ostream& out,
-                                         bool is_xception,
-                                         t_list* list,
-                                         std::string prefix,
-                                         std::ostream& local_vars);
-
-  void generate_serialize_field(std::ostream& out,
-                                bool is_xception,
-                                t_field* tfield,
-                                std::string prefix,
-                                std::ostream& local_vars);
-  void generate_serialize_struct(std::ostream& out,
-                                 t_struct* tstruct,
-                                 std::string prefix,
-                                 std::ostream& local_vars);
-  void generate_serialize_container(std::ostream& out,
-                                    bool is_xception,
-                                    t_type* ttype,
-                                    std::string prefix,
-                                    std::ostream& local_vars);
-  void generate_serialize_map_element(std::ostream& out,
-                                      bool is_xception,
-                                      t_map* tmap,
-                                      std::string iter,
-                                      std::string map,
-                                      std::ostream& local_vars);
-  void generate_serialize_set_element(std::ostream& out,
-                                      bool is_xception,
-                                      t_set* tmap,
-                                      std::string iter,
-                                      std::ostream& local_vars);
-  void generate_serialize_list_element(std::ostream& out,
-                                       bool is_xception,
-                                       t_list* tlist,
-                                       std::string iter,
-                                       std::ostream& local_vars);
-
-  void delphi_type_usings(std::ostream& out);
-  std::string delphi_thrift_usings();
-
-  std::string type_name(t_type* ttype,
-                        bool b_cls = false,
-                        bool b_no_postfix = false,
-                        bool b_exception_factory = false,
-                        bool b_full_exception_factory = false);
-  std::string normalize_clsnm(std::string name,
-                              std::string prefix,
-                              bool b_no_check_keyword = false);
-  std::string make_valid_delphi_identifier(std::string const& fromName);
-  std::string input_arg_prefix(t_type* ttype);
-
-  std::string base_type_name(t_base_type* tbase);
-  std::string declare_field(t_field* tfield,
-                            bool init = false,
-                            std::string prefix = "",
-                            bool is_xception_class = false);
-  std::string function_signature(t_function* tfunction,
-                                 std::string full_cls = "",
-                                 bool is_xception = false);
-  std::string argument_list(t_struct* tstruct);
-  std::string constructor_argument_list(t_struct* tstruct, std::string current_indent);
-  std::string type_to_enum(t_type* ttype);
-  std::string prop_name(t_field* tfield, bool is_xception = false);
-  std::string prop_name(std::string name, bool is_xception = false);
-  std::string constructor_param_name(string name);
-
-  void write_enum(std::string line);
-  void write_forward_decr(std::string line);
-  void write_const(std::string line);
-  void write_struct(std::string line);
-  void write_service(std::string line);
-
-  virtual std::string autogen_comment() {
-    return std::string("(**\n") + " * Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-           + " *\n" + " * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n"
-           + " *)\n";
-  }
-
-  string replace_all(string contents, string search, string replace);
-  string xml_encode(string contents);
-  string xmldoc_encode(string contents);
-  string xmlattrib_encode(string contents);
-  void generate_delphi_doc(std::ostream& out, t_field* field);
-  void generate_delphi_doc(std::ostream& out, t_doc* tdoc);
-  void generate_delphi_doc(std::ostream& out, t_function* tdoc);
-  void generate_delphi_docstring_comment(std::ostream& out, string contents);
-
-  bool type_can_be_null(t_type* ttype) {
-    while (ttype->is_typedef()) {
-      ttype = ((t_typedef*)ttype)->get_type();
-    }
-
-    return ttype->is_container() || ttype->is_struct() || ttype->is_xception();
-  }
-
-private:
-  std::string namespace_name_;
-  std::ostringstream s_forward_decr;
-  std::ostringstream s_enum;
-  std::ostringstream s_const;
-  std::ostringstream s_struct;
-  std::ostringstream s_service;
-  std::ostringstream s_const_impl;
-  std::ostringstream s_struct_impl;
-  std::ostringstream s_service_impl;
-  std::ostringstream s_type_factory_registration;
-  std::ostringstream s_type_factory_funcs;
-  bool has_forward;
-  bool has_enum;
-  bool has_const;
-  std::string namespace_dir_;
-  std::map<std::string, int> delphi_keywords;
-  std::map<std::string, int> delphi_reserved_method;
-  std::map<std::string, int> delphi_reserved_method_exception;
-  std::map<std::string, int> types_known;
-  std::list<t_typedef*> typedefs_pending;
-  std::vector<std::string> uses_list;
-  void create_keywords();
-  bool find_keyword(std::map<std::string, int>& keyword_map, std::string name);
-  std::string normalize_name(std::string name,
-                             bool b_method = false,
-                             bool b_exception_method = false);
-  std::string empty_value(t_type* type);
-  bool is_fully_defined_type(t_type* ttype);
-  void add_defined_type(t_type* ttype);
-  void init_known_types_list();
-  bool is_void(t_type* type);
-  int indent_impl_;
-  bool ansistr_binary_;
-  bool register_types_;
-  bool constprefix_;
-  bool events_;
-  bool xmldoc_;
-  void indent_up_impl() { ++indent_impl_; };
-  void indent_down_impl() { --indent_impl_; };
-  std::string indent_impl() {
-    std::string ind = "";
-    int i;
-    for (i = 0; i < indent_impl_; ++i) {
-      ind += "  ";
-    }
-    return ind;
-  };
-  std::ostream& indent_impl(std::ostream& os) { return os << indent_impl(); };
-};
-
-string t_delphi_generator::replace_all(string contents, string search, string repl) {
-  string str(contents);
-
-  size_t slen = search.length();
-  size_t rlen = repl.length();
-  size_t incr = (rlen > 0) ? rlen : 1;
-
-  if (slen > 0) {
-    size_t found = str.find(search);
-    while ((found != string::npos) && (found < str.length())) {
-      str.replace(found, slen, repl);
-      found = str.find(search, found + incr);
-    }
-  }
-
-  return str;
-}
-
-// XML encoding
-string t_delphi_generator::xml_encode(string contents) {
-  string str(contents);
-
-  // escape the escape
-  str = replace_all(str, "&", "&amp;");
-
-  // other standard XML entities
-  str = replace_all(str, "<", "&lt;");
-  str = replace_all(str, ">", "&gt;");
-
-  return str;
-}
-
-// XML attribute encoding
-string t_delphi_generator::xmlattrib_encode(string contents) {
-  string str(xml_encode(contents));
-
-  // our attribs are enclosed in "
-  str = replace_all(str, "\"", "\\\"");
-
-  return str;
-}
-
-// XML encoding for doc comments
-string t_delphi_generator::xmldoc_encode(string contents) {
-  string str(xml_encode(contents));
-
-  // XMLDoc specific: convert linebreaks into <para>graphs</para>
-  str = replace_all(str, "\r\n", "\r");
-  str = replace_all(str, "\n", "\r");
-  str = replace_all(str, "\r", "</para>\n<para>");
-
-  return str;
-}
-
-void t_delphi_generator::generate_delphi_docstring_comment(ostream& out, string contents) {
-  if (xmldoc_) {
-    generate_docstring_comment(out,
-                               "{$REGION 'XMLDoc'}/// <summary>\n",
-                               "/// ",
-                               "<para>" + contents + "</para>",
-                               "/// </summary>\n{$ENDREGION}\n");
-  }
-}
-
-void t_delphi_generator::generate_delphi_doc(ostream& out, t_field* field) {
-  if (xmldoc_) {
-    if (field->get_type()->is_enum()) {
-      string combined_message = xmldoc_encode(field->get_doc()) + "\n<seealso cref=\""
-                                + xmldoc_encode(type_name(field->get_type())) + "\"/>";
-      generate_delphi_docstring_comment(out, combined_message);
-    } else {
-      generate_delphi_doc(out, (t_doc*)field);
-    }
-  }
-}
-
-void t_delphi_generator::generate_delphi_doc(ostream& out, t_doc* tdoc) {
-  if (tdoc->has_doc() && xmldoc_) {
-    generate_delphi_docstring_comment(out, xmldoc_encode(tdoc->get_doc()));
-  }
-}
-
-void t_delphi_generator::generate_delphi_doc(ostream& out, t_function* tfunction) {
-  if (tfunction->has_doc() && xmldoc_) {
-    stringstream ps;
-    const vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-    vector<t_field*>::const_iterator p_iter;
-    for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-      t_field* p = *p_iter;
-      ps << "\n<param name=\"" << xmlattrib_encode(p->get_name()) << "\">";
-      if (p->has_doc()) {
-        std::string str = p->get_doc();
-        str.erase(std::remove(str.begin(), str.end(), '\n'),
-                  str.end()); // remove the newlines that appear from the parser
-        ps << xmldoc_encode(str);
-      }
-      ps << "</param>";
-    }
-    generate_docstring_comment(out,
-                               "{$REGION 'XMLDoc'}",
-                               "/// ",
-                               "<summary><para>" + xmldoc_encode(tfunction->get_doc())
-                               + "</para></summary>" + ps.str(),
-                               "{$ENDREGION}\n");
-  }
-}
-
-bool t_delphi_generator::find_keyword(std::map<std::string, int>& keyword_map, std::string name) {
-  std::string::size_type len = name.length();
-
-  if (len <= 0) {
-    return false;
-  }
-
-  std::string::size_type nlast = name.find_last_of('_');
-
-  if (nlast >= 1) {
-    if (nlast == (len - 1)) {
-      string new_name(name, 0, nlast);
-      return find_keyword(keyword_map, new_name);
-    }
-  }
-  return (keyword_map[name] == 1);
-}
-
-std::string t_delphi_generator::normalize_name(std::string name,
-                                               bool b_method,
-                                               bool b_exception_method) {
-  string tmp(name);
-  std::transform(tmp.begin(), tmp.end(), tmp.begin(), static_cast<int (*)(int)>(std::tolower));
-
-  bool b_found = false;
-
-  if (find_keyword(delphi_keywords, tmp)) {
-    b_found = true;
-  } else if (b_method && find_keyword(delphi_reserved_method, tmp)) {
-    b_found = true;
-  } else if (b_exception_method && find_keyword(delphi_reserved_method_exception, tmp)) {
-    b_found = true;
-  }
-
-  if (b_found) {
-    return name + "_";
-  } else {
-    return name;
-  }
-}
-
-void t_delphi_generator::create_keywords() {
-  delphi_keywords["and"] = 1;
-  delphi_keywords["end"] = 1;
-  delphi_keywords["interface"] = 1;
-  delphi_keywords["raise"] = 1;
-  delphi_keywords["uses"] = 1;
-  delphi_keywords["array"] = 1;
-  delphi_keywords["except"] = 1;
-  delphi_keywords["is"] = 1;
-  delphi_keywords["record"] = 1;
-  delphi_keywords["var"] = 1;
-  delphi_keywords["as"] = 1;
-  delphi_keywords["exports"] = 1;
-  delphi_keywords["label"] = 1;
-  delphi_keywords["repeat"] = 1;
-  delphi_keywords["while"] = 1;
-  delphi_keywords["asm"] = 1;
-  delphi_keywords["file"] = 1;
-  delphi_keywords["library"] = 1;
-  delphi_keywords["resourcestring"] = 1;
-  delphi_keywords["with"] = 1;
-  delphi_keywords["begin"] = 1;
-  delphi_keywords["finalization"] = 1;
-  delphi_keywords["mod"] = 1;
-  delphi_keywords["set"] = 1;
-  delphi_keywords["xor"] = 1;
-  delphi_keywords["case"] = 1;
-  delphi_keywords["finally"] = 1;
-  delphi_keywords["nil"] = 1;
-  delphi_keywords["shl"] = 1;
-  delphi_keywords["class"] = 1;
-  delphi_keywords["for"] = 1;
-  delphi_keywords["not"] = 1;
-  delphi_keywords["shr"] = 1;
-  delphi_keywords["const"] = 1;
-  delphi_keywords["function"] = 1;
-  delphi_keywords["object"] = 1;
-  delphi_keywords["string"] = 1;
-  delphi_keywords["constructor"] = 1;
-  delphi_keywords["goto"] = 1;
-  delphi_keywords["of"] = 1;
-  delphi_keywords["then"] = 1;
-  delphi_keywords["destructor"] = 1;
-  delphi_keywords["if"] = 1;
-  delphi_keywords["or"] = 1;
-  delphi_keywords["threadvar"] = 1;
-  delphi_keywords["dispinterface"] = 1;
-  delphi_keywords["implementation"] = 1;
-  delphi_keywords["out"] = 1;
-  delphi_keywords["to"] = 1;
-  delphi_keywords["div"] = 1;
-  delphi_keywords["in"] = 1;
-  delphi_keywords["packed"] = 1;
-  delphi_keywords["try"] = 1;
-  delphi_keywords["do"] = 1;
-  delphi_keywords["inherited"] = 1;
-  delphi_keywords["procedure"] = 1;
-  delphi_keywords["type"] = 1;
-  delphi_keywords["downto"] = 1;
-  delphi_keywords["initialization"] = 1;
-  delphi_keywords["program"] = 1;
-  delphi_keywords["unit"] = 1;
-  delphi_keywords["else"] = 1;
-  delphi_keywords["inline"] = 1;
-  delphi_keywords["property"] = 1;
-  delphi_keywords["until"] = 1;
-  delphi_keywords["private"] = 1;
-  delphi_keywords["protected"] = 1;
-  delphi_keywords["public"] = 1;
-  delphi_keywords["published"] = 1;
-  delphi_keywords["automated"] = 1;
-  delphi_keywords["at"] = 1;
-  delphi_keywords["on"] = 1;
-
-  // reserved/predefined variables and types (lowercase!)
-  delphi_keywords["result"] = 1;
-  delphi_keywords["tbytes"] = 1;
-  delphi_keywords["tobject"] = 1;
-  delphi_keywords["tclass"] = 1;
-  delphi_keywords["tinterfacedobject"] = 1;
-
-  delphi_reserved_method["create"] = 1;
-  delphi_reserved_method["free"] = 1;
-  delphi_reserved_method["initinstance"] = 1;
-  delphi_reserved_method["cleanupinstance"] = 1;
-  delphi_reserved_method["classtype"] = 1;
-  delphi_reserved_method["classname"] = 1;
-  delphi_reserved_method["classnameis"] = 1;
-  delphi_reserved_method["classparent"] = 1;
-  delphi_reserved_method["classinfo"] = 1;
-  delphi_reserved_method["instancesize"] = 1;
-  delphi_reserved_method["inheritsfrom"] = 1;
-  delphi_reserved_method["methodaddress"] = 1;
-  delphi_reserved_method["methodaddress"] = 1;
-  delphi_reserved_method["methodname"] = 1;
-  delphi_reserved_method["fieldaddress"] = 1;
-  delphi_reserved_method["fieldaddress"] = 1;
-  delphi_reserved_method["getinterface"] = 1;
-  delphi_reserved_method["getinterfaceentry"] = 1;
-  delphi_reserved_method["getinterfacetable"] = 1;
-  delphi_reserved_method["unitname"] = 1;
-  delphi_reserved_method["equals"] = 1;
-  delphi_reserved_method["gethashcode"] = 1;
-  delphi_reserved_method["tostring"] = 1;
-  delphi_reserved_method["safecallexception"] = 1;
-  delphi_reserved_method["afterconstruction"] = 1;
-  delphi_reserved_method["beforedestruction"] = 1;
-  delphi_reserved_method["dispatch"] = 1;
-  delphi_reserved_method["defaulthandler"] = 1;
-  delphi_reserved_method["newinstance"] = 1;
-  delphi_reserved_method["freeinstance"] = 1;
-  delphi_reserved_method["destroy"] = 1;
-  delphi_reserved_method["read"] = 1;
-  delphi_reserved_method["write"] = 1;
-
-  delphi_reserved_method_exception["setinnerexception"] = 1;
-  delphi_reserved_method_exception["setstackinfo"] = 1;
-  delphi_reserved_method_exception["getstacktrace"] = 1;
-  delphi_reserved_method_exception["raisingexception"] = 1;
-  delphi_reserved_method_exception["createfmt"] = 1;
-  delphi_reserved_method_exception["createres"] = 1;
-  delphi_reserved_method_exception["createresfmt"] = 1;
-  delphi_reserved_method_exception["createhelp"] = 1;
-  delphi_reserved_method_exception["createfmthelp"] = 1;
-  delphi_reserved_method_exception["createreshelp"] = 1;
-  delphi_reserved_method_exception["createresfmthelp"] = 1;
-  delphi_reserved_method_exception["getbaseexception"] = 1;
-  delphi_reserved_method_exception["baseexception"] = 1;
-  delphi_reserved_method_exception["helpcontext"] = 1;
-  delphi_reserved_method_exception["innerexception"] = 1;
-  delphi_reserved_method_exception["message"] = 1;
-  delphi_reserved_method_exception["stacktrace"] = 1;
-  delphi_reserved_method_exception["stackinfo"] = 1;
-  delphi_reserved_method_exception["getexceptionstackinfoproc"] = 1;
-  delphi_reserved_method_exception["getstackinfostringproc"] = 1;
-  delphi_reserved_method_exception["cleanupstackinfoproc"] = 1;
-  delphi_reserved_method_exception["raiseouterexception"] = 1;
-  delphi_reserved_method_exception["throwouterexception"] = 1;
-}
-
-void t_delphi_generator::add_delphi_uses_list(string unitname) {
-  vector<std::string>::const_iterator s_iter;
-  bool found = false;
-  for (s_iter = uses_list.begin(); s_iter != uses_list.end(); ++s_iter) {
-    if ((*s_iter) == unitname) {
-      found = true;
-      break;
-    }
-  }
-  if (!found) {
-    uses_list.push_back(unitname);
-  }
-}
-
-void t_delphi_generator::init_generator() {
-  indent_impl_ = 0;
-  namespace_name_ = program_->get_namespace("delphi");
-  has_forward = false;
-  has_enum = false;
-  has_const = false;
-  create_keywords();
-  add_delphi_uses_list("Classes");
-  add_delphi_uses_list("SysUtils");
-  add_delphi_uses_list("Generics.Collections");
-  add_delphi_uses_list("Thrift");
-  add_delphi_uses_list("Thrift.Utils");
-  add_delphi_uses_list("Thrift.Collections");
-  add_delphi_uses_list("Thrift.Protocol");
-  add_delphi_uses_list("Thrift.Transport");
-
-  if (register_types_) {
-    add_delphi_uses_list("Thrift.TypeRegistry");
-  }
-
-  init_known_types_list();
-
-  string unitname, nsname;
-  const vector<t_program*>& includes = program_->get_includes();
-  for (size_t i = 0; i < includes.size(); ++i) {
-    unitname = includes[i]->get_name();
-    nsname = includes[i]->get_namespace("delphi");
-    if ("" != nsname) {
-      unitname = nsname;
-    }
-    add_delphi_uses_list(unitname);
-  }
-
-  MKDIR(get_out_dir().c_str());
-}
-
-void t_delphi_generator::close_generator() {
-  std::string unitname = program_name_;
-  if ("" != namespace_name_) {
-    unitname = namespace_name_;
-  }
-
-  for (int i = 0; i < (int)unitname.size(); i++) {
-    if (unitname[i] == ' ') {
-      unitname.replace(i, 1, "_");
-    }
-  }
-
-  std::string f_name = get_out_dir() + "/" + unitname + ".pas";
-  std::ofstream f_all;
-
-  f_all.open(f_name.c_str());
-
-  f_all << autogen_comment() << endl;
-  generate_delphi_doc(f_all, program_);
-  f_all << "unit " << unitname << ";" << endl << endl;
-  f_all << "interface" << endl << endl;
-  f_all << "uses" << endl;
-
-  indent_up();
-
-  vector<std::string>::const_iterator s_iter;
-  for (s_iter = uses_list.begin(); s_iter != uses_list.end(); ++s_iter) {
-    if (s_iter != uses_list.begin()) {
-      f_all << ",";
-      f_all << endl;
-    }
-    indent(f_all) << *s_iter;
-  }
-
-  f_all << ";" << endl << endl;
-
-  indent_down();
-
-  string tmp_unit(unitname);
-  for (int i = 0; i < (int)tmp_unit.size(); i++) {
-    if (tmp_unit[i] == '.') {
-      tmp_unit.replace(i, 1, "_");
-    }
-  }
-
-  f_all << "const" << endl;
-  indent_up();
-  indent(f_all) << "c" << tmp_unit
-                << "_Option_AnsiStr_Binary = " << (ansistr_binary_ ? "True" : "False") << ";"
-                << endl;
-  indent(f_all) << "c" << tmp_unit
-                << "_Option_Register_Types = " << (register_types_ ? "True" : "False") << ";"
-                << endl;
-  indent(f_all) << "c" << tmp_unit
-                << "_Option_ConstPrefix    = " << (constprefix_ ? "True" : "False") << ";" << endl;
-  indent(f_all) << "c" << tmp_unit << "_Option_Events         = " << (events_ ? "True" : "False")
-                << ";" << endl;
-  indent(f_all) << "c" << tmp_unit << "_Option_XmlDoc         = " << (xmldoc_ ? "True" : "False")
-                << ";" << endl;
-  indent_down();
-
-  f_all << endl;
-  f_all << "type" << endl;
-  if (has_forward) {
-    f_all << s_forward_decr.str() << endl;
-  }
-  if (has_enum) {
-    indent(f_all) << endl;
-    indent(f_all) << "{$SCOPEDENUMS ON}" << endl << endl;
-    f_all << s_enum.str();
-    indent(f_all) << "{$SCOPEDENUMS OFF}" << endl << endl;
-  }
-  f_all << s_struct.str();
-  f_all << s_service.str();
-  f_all << s_const.str();
-  f_all << "implementation" << endl << endl;
-  f_all << s_struct_impl.str();
-  f_all << s_service_impl.str();
-  f_all << s_const_impl.str();
-
-  if (register_types_) {
-    f_all << endl;
-    f_all << "// Type factory methods and registration" << endl;
-    f_all << s_type_factory_funcs.str();
-    f_all << "procedure RegisterTypeFactories;" << endl;
-    f_all << "begin" << endl;
-    f_all << s_type_factory_registration.str();
-    f_all << "end;" << endl;
-  }
-  f_all << endl;
-
-  string constants_class = make_constants_classname();
-
-  f_all << "initialization" << endl;
-  if (has_const) {
-    f_all << "{$IF CompilerVersion < 21.0}  // D2010" << endl;
-    f_all << "  " << constants_class.c_str() << "_Initialize;" << endl;
-    f_all << "{$IFEND}" << endl;
-  }
-  if (register_types_) {
-    f_all << "  RegisterTypeFactories;" << endl;
-  }
-  f_all << endl;
-
-  f_all << "finalization" << endl;
-  if (has_const) {
-    f_all << "{$IF CompilerVersion < 21.0}  // D2010" << endl;
-    f_all << "  " << constants_class.c_str() << "_Finalize;" << endl;
-    f_all << "{$IFEND}" << endl;
-  }
-  f_all << endl << endl;
-
-  f_all << "end." << endl;
-  f_all.close();
-
-  if (!typedefs_pending.empty()) {
-    pwarning(0, "%d typedefs with unresolved type references left:\n", typedefs_pending.size());
-    for (std::list<t_typedef*>::iterator iter = typedefs_pending.begin();
-         typedefs_pending.end() != iter;
-         ++iter) {
-      pwarning(0, "- %s\n", (*iter)->get_symbolic().c_str());
-    }
-  }
-}
-
-void t_delphi_generator::delphi_type_usings(ostream& out) {
-  indent_up();
-  indent(out) << "Classes, SysUtils, Generics.Collections, Thrift.Collections, Thrift.Protocol,"
-              << endl;
-  indent(out) << "Thrift.Transport;" << endl << endl;
-  indent_down();
-}
-
-void t_delphi_generator::generate_forward_declaration(t_struct* tstruct) {
-  // Forward declare struct def
-  has_forward = true;
-  pverbose("forward declaration of %s\n", type_name(tstruct).c_str());
-
-  string what = tstruct->is_xception() ? "class" : "interface";
-
-  indent_up();
-  indent(s_forward_decr) << type_name(tstruct, tstruct->is_xception(), true) << " = " << what << ";"
-                         << endl;
-  indent_down();
-
-  add_defined_type(tstruct);
-}
-
-void t_delphi_generator::generate_typedef(t_typedef* ttypedef) {
-  t_type* type = ttypedef->get_type();
-
-  // write now or save for later?
-  if (!is_fully_defined_type(type)) {
-    pverbose("typedef %s: unresolved dependencies found\n", type_name(ttypedef).c_str());
-    typedefs_pending.push_back(ttypedef);
-    return;
-  }
-
-  indent_up();
-  generate_delphi_doc(s_struct, ttypedef);
-  indent(s_struct) << type_name(ttypedef) << " = ";
-
-  // commented out: the benefit is not big enough to risk breaking existing code
-  // bool container = type->is_list() || type->is_map() || type->is_set();
-  // if( ! container)
-  //  s_struct << "type ";  //the "type A = type B" syntax leads to E2574 with generics
-
-  s_struct << type_name(ttypedef->get_type()) << ";" << endl << endl;
-  indent_down();
-
-  add_defined_type(ttypedef);
-}
-
-bool t_delphi_generator::is_fully_defined_type(t_type* ttype) {
-  if ((NULL != ttype->get_program()) && (ttype->get_program() != program_)) {
-    t_scope* scope = ttype->get_program()->scope();
-    if (NULL != scope->get_type(ttype->get_name())) {
-      // printf("type %s found in included scope %s\n", ttype->get_name().c_str(),
-      // ttype->get_program()->get_name().c_str());
-      return true;
-    }
-  }
-
-  if (ttype->is_typedef()) {
-    return (1 == types_known[type_name(ttype)]);
-  }
-
-  if (ttype->is_base_type()) {
-    return (1 == types_known[base_type_name((t_base_type*)ttype)]);
-  } else if (ttype->is_enum()) {
-    return true; // enums are written first, before all other types
-  } else if (ttype->is_map()) {
-    t_map* tmap = (t_map*)ttype;
-    return is_fully_defined_type(tmap->get_key_type())
-           && is_fully_defined_type(tmap->get_val_type());
-  } else if (ttype->is_set()) {
-    t_set* tset = (t_set*)ttype;
-    return is_fully_defined_type(tset->get_elem_type());
-  } else if (ttype->is_list()) {
-    t_list* tlist = (t_list*)ttype;
-    return is_fully_defined_type(tlist->get_elem_type());
-  }
-
-  return (1 == types_known[type_name(ttype)]);
-}
-
-void t_delphi_generator::add_defined_type(t_type* ttype) {
-  // mark as known type
-  types_known[type_name(ttype)] = 1;
-
-  // check all pending typedefs
-  std::list<t_typedef*>::iterator iter;
-  bool more = true;
-  while (more && (!typedefs_pending.empty())) {
-    more = false;
-
-    for (iter = typedefs_pending.begin(); typedefs_pending.end() != iter; ++iter) {
-      t_typedef* ttypedef = (*iter);
-      if (is_fully_defined_type(ttypedef->get_type())) {
-        pverbose("typedef %s: all pending references are now resolved\n",
-                 type_name(ttypedef).c_str());
-        typedefs_pending.erase(iter);
-        generate_typedef(ttypedef);
-        more = true;
-        break;
-      }
-    }
-  }
-}
-
-void t_delphi_generator::init_known_types_list() {
-  // known base types
-  types_known[type_name(g_type_string)] = 1;
-  types_known[type_name(g_type_binary)] = 1;
-  types_known[type_name(g_type_bool)] = 1;
-  types_known[type_name(g_type_i8)] = 1;
-  types_known[type_name(g_type_i16)] = 1;
-  types_known[type_name(g_type_i32)] = 1;
-  types_known[type_name(g_type_i64)] = 1;
-  types_known[type_name(g_type_double)] = 1;
-}
-
-void t_delphi_generator::generate_enum(t_enum* tenum) {
-  has_enum = true;
-  indent_up();
-  generate_delphi_doc(s_enum, tenum);
-  indent(s_enum) << type_name(tenum, true, true) << " = "
-                 << "(" << endl;
-  indent_up();
-  vector<t_enum_value*> constants = tenum->get_constants();
-  if (constants.empty()) {
-    indent(s_enum) << "dummy = 0  // empty enums are not allowed";
-  } else {
-    vector<t_enum_value*>::iterator c_iter;
-    for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-      int value = (*c_iter)->get_value();
-      if (c_iter != constants.begin()) {
-        s_enum << ",";
-        s_enum << endl;
-      }
-      generate_delphi_doc(s_enum, *c_iter);
-      indent(s_enum) << normalize_name((*c_iter)->get_name()) << " = " << value;
-    }
-  }
-  s_enum << endl;
-  indent_down();
-  indent(s_enum) << ");" << endl << endl;
-  indent_down();
-}
-
-std::string t_delphi_generator::make_valid_delphi_identifier(std::string const& fromName) {
-  std::string str = fromName;
-  if (str.empty()) {
-    return str;
-  }
-
-  // tests rely on this
-  assert(('A' < 'Z') && ('a' < 'z') && ('0' < '9'));
-
-  // if the first letter is a number, we add an additional underscore in front of it
-  char c = str.at(0);
-  if (('0' <= c) && (c <= '9')) {
-    str = "_" + str;
-  }
-
-  // following chars: letter, number or underscore
-  for (size_t i = 0; i < str.size(); ++i) {
-    c = str.at(i);
-    if ((('A' > c) || (c > 'Z')) && (('a' > c) || (c > 'z')) && (('0' > c) || (c > '9'))
-        && ('_' != c)) {
-      str.replace(i, 1, "_");
-    }
-  }
-
-  return str;
-}
-
-std::string t_delphi_generator::make_constants_classname() {
-  if (constprefix_) {
-    return make_valid_delphi_identifier("T" + program_name_ + "Constants");
-  } else {
-    return "TConstants"; // compatibility
-  }
-}
-
-void t_delphi_generator::generate_consts(std::vector<t_const*> consts) {
-  if (consts.empty()) {
-    return;
-  }
-
-  has_const = true;
-  string constants_class = make_constants_classname();
-
-  indent_up();
-  indent(s_const) << constants_class.c_str() << " = class" << endl;
-  indent(s_const) << "private" << endl;
-  indent_up();
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    if (const_needs_var((*c_iter)->get_type())) {
-      print_private_field(s_const,
-                          normalize_name((*c_iter)->get_name()),
-                          (*c_iter)->get_type(),
-                          (*c_iter)->get_value());
-    }
-  }
-  indent_down();
-  indent(s_const) << "public" << endl;
-  indent_up();
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    generate_delphi_doc(s_const, *c_iter);
-    print_const_prop(s_const,
-                     normalize_name((*c_iter)->get_name()),
-                     (*c_iter)->get_type(),
-                     (*c_iter)->get_value());
-  }
-  indent(s_const) << "{$IF CompilerVersion >= 21.0}" << endl;
-  indent(s_const) << "class constructor Create;" << endl;
-  indent(s_const) << "class destructor Destroy;" << endl;
-  indent(s_const) << "{$IFEND}" << endl;
-  indent_down();
-  indent(s_const) << "end;" << endl << endl;
-  indent_down();
-
-  std::ostringstream vars, code;
-
-  indent_up_impl();
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    initialize_field(vars,
-                     code,
-                     "F" + prop_name((*c_iter)->get_name()),
-                     (*c_iter)->get_type(),
-                     (*c_iter)->get_value());
-  }
-  indent_down_impl();
-
-  indent_impl(s_const_impl) << "{$IF CompilerVersion >= 21.0}" << endl;
-  indent_impl(s_const_impl) << "class constructor " << constants_class.c_str() << ".Create;"
-                            << endl;
-
-  if (!vars.str().empty()) {
-    indent_impl(s_const_impl) << "var" << endl;
-    s_const_impl << vars.str();
-  }
-  indent_impl(s_const_impl) << "begin" << endl;
-  if (!code.str().empty()) {
-    s_const_impl << code.str();
-  }
-  indent_impl(s_const_impl) << "end;" << endl << endl;
-  indent_impl(s_const_impl) << "class destructor " << constants_class.c_str() << ".Destroy;"
-                            << endl;
-  indent_impl(s_const_impl) << "begin" << endl;
-  indent_up_impl();
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    if (const_needs_var((*c_iter)->get_type())) {
-      finalize_field(s_const_impl,
-                     normalize_name((*c_iter)->get_name()),
-                     (*c_iter)->get_type(),
-                     (*c_iter)->get_value());
-    }
-  }
-  indent_impl(s_const_impl) << "inherited;" << endl;
-  indent_down_impl();
-  indent_impl(s_const_impl) << "end;" << endl;
-  indent_impl(s_const_impl) << "{$ELSE}" << endl;
-
-  vars.str("");
-  code.str("");
-
-  indent_up_impl();
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    if (const_needs_var((*c_iter)->get_type())) {
-      initialize_field(vars,
-                       code,
-                       constants_class + ".F" + prop_name((*c_iter)->get_name()),
-                       (*c_iter)->get_type(),
-                       (*c_iter)->get_value());
-    }
-  }
-  indent_down_impl();
-
-  indent_impl(s_const_impl) << "procedure " << constants_class.c_str() << "_Initialize;" << endl;
-  if (!vars.str().empty()) {
-    indent_impl(s_const_impl) << "var" << endl;
-    s_const_impl << vars.str();
-  }
-  indent_impl(s_const_impl) << "begin" << endl;
-  if (!code.str().empty()) {
-    s_const_impl << code.str();
-  }
-  indent_impl(s_const_impl) << "end;" << endl << endl;
-
-  indent_impl(s_const_impl) << "procedure " << constants_class.c_str() << "_Finalize;" << endl;
-  indent_impl(s_const_impl) << "begin" << endl;
-  indent_up_impl();
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    finalize_field(s_const_impl,
-                   normalize_name((*c_iter)->get_name()),
-                   (*c_iter)->get_type(),
-                   (*c_iter)->get_value(),
-                   constants_class);
-  }
-  indent_down_impl();
-  indent_impl(s_const_impl) << "end;" << endl;
-  indent_impl(s_const_impl) << "{$IFEND}" << endl << endl;
-}
-
-void t_delphi_generator::print_const_def_value(std::ostream& vars,
-                                               std::ostream& out,
-                                               string name,
-                                               t_type* type,
-                                               t_const_value* value,
-                                               string cls_nm) {
-
-  string cls_prefix;
-
-  if (cls_nm == "") {
-    cls_prefix = "";
-  } else {
-    cls_prefix = cls_nm + ".";
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string val = render_const_value(vars, out, name, field_type, v_iter->second);
-      indent_impl(out) << cls_prefix << normalize_name(name) << "."
-                       << prop_name(v_iter->first->get_string(), type->is_xception())
-                       << " := " << val << ";" << endl;
-    }
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(vars, out, name, ktype, v_iter->first);
-      string val = render_const_value(vars, out, name, vtype, v_iter->second);
-      indent_impl(out) << cls_prefix << normalize_name(name) << "[" << key << "]"
-                       << " := " << val << ";" << endl;
-    }
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(vars, out, name, etype, *v_iter);
-      indent_impl(out) << cls_prefix << normalize_name(name) << ".Add(" << val << ");" << endl;
-    }
-  }
-}
-
-void t_delphi_generator::print_private_field(std::ostream& out,
-                                             string name,
-                                             t_type* type,
-                                             t_const_value* value) {
-  (void)value;
-  indent(out) << "class var F" << name << ": " << type_name(type) << ";" << endl;
-}
-
-bool t_delphi_generator::const_needs_var(t_type* type) {
-  t_type* truetype = type;
-  while (truetype->is_typedef()) {
-    truetype = ((t_typedef*)truetype)->get_type();
-  }
-  return (!truetype->is_base_type());
-}
-
-void t_delphi_generator::print_const_prop(std::ostream& out,
-                                          string name,
-                                          t_type* type,
-                                          t_const_value* value) {
-  (void)value;
-  if (const_needs_var(type)) {
-    indent(out) << "class property " << name << ": " << type_name(type) << " read F" << name << ";"
-                << endl;
-  } else {
-    std::ostringstream vars; // dummy
-    string v2 = render_const_value(vars, out, name, type, value);
-    indent(out) << "const " << name << " = " << v2 << ";" << endl;
-  }
-}
-
-void t_delphi_generator::print_const_value(std::ostream& vars,
-                                           std::ostream& out,
-                                           string name,
-                                           t_type* type,
-                                           t_const_value* value) {
-  t_type* truetype = type;
-  while (truetype->is_typedef()) {
-    truetype = ((t_typedef*)truetype)->get_type();
-  }
-
-  if (truetype->is_base_type()) {
-    // already done
-    // string v2 = render_const_value( vars, out, name, type, value);
-    // indent_impl(out) << name << " := " << v2 << ";" << endl;
-  } else if (truetype->is_enum()) {
-    indent_impl(out) << name << " := " << type_name(type) << "." << value->get_identifier_name()
-                     << ";" << endl;
-  } else {
-    string typname;
-    typname = type_name(truetype, true, false, type->is_xception(), type->is_xception());
-    indent_impl(out) << name << " := " << typname << ".Create;" << endl;
-    print_const_def_value(vars, out, name, truetype, value);
-  }
-}
-
-void t_delphi_generator::initialize_field(std::ostream& vars,
-                                          std::ostream& out,
-                                          string name,
-                                          t_type* type,
-                                          t_const_value* value) {
-  print_const_value(vars, out, name, type, value);
-}
-
-void t_delphi_generator::finalize_field(std::ostream& out,
-                                        string name,
-                                        t_type* type,
-                                        t_const_value* value,
-                                        string cls_nm) {
-  (void)out;
-  (void)name;
-  (void)type;
-  (void)value;
-  (void)cls_nm;
-}
-
-string t_delphi_generator::render_const_value(ostream& vars,
-                                              ostream& out,
-                                              string name,
-                                              t_type* type,
-                                              t_const_value* value) {
-  (void)name;
-
-  t_type* truetype = type;
-  while (truetype->is_typedef()) {
-    truetype = ((t_typedef*)truetype)->get_type();
-  }
-
-  std::ostringstream render;
-
-  if (truetype->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)truetype)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << "'" << get_escaped_string(value) << "'";
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "True" : "False");
-      break;
-    case t_base_type::TYPE_I8:
-      render << "ShortInt( " << value->get_integer() << ")";
-      break;
-    case t_base_type::TYPE_I16:
-      render << "SmallInt( " << value->get_integer() << ")";
-      break;
-    case t_base_type::TYPE_I32:
-      render << "LongInt( " << value->get_integer() << ")";
-      break;
-    case t_base_type::TYPE_I64:
-      render << "Int64( " << value->get_integer() << ")";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << value->get_integer() << ".0"; // make it a double constant by adding ".0"
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (truetype->is_enum()) {
-    render << type_name(type, false) << "." << value->get_identifier_name();
-  } else {
-    string t = tmp("tmp");
-    vars << "  " << t << " : " << type_name(type) << ";" << endl;
-    print_const_value(vars, out, t, type, value);
-    render << t;
-  }
-
-  return render.str();
-}
-
-void t_delphi_generator::generate_struct(t_struct* tstruct) {
-  generate_delphi_struct(tstruct, false);
-}
-
-void t_delphi_generator::generate_xception(t_struct* txception) {
-  generate_delphi_struct(txception, true);
-}
-
-void t_delphi_generator::generate_delphi_struct(t_struct* tstruct, bool is_exception) {
-  indent_up();
-  generate_delphi_struct_definition(s_struct, tstruct, is_exception);
-  indent_down();
-
-  add_defined_type(tstruct);
-
-  generate_delphi_struct_impl(s_struct_impl, "", tstruct, is_exception);
-  if (register_types_) {
-    generate_delphi_struct_type_factory(s_type_factory_funcs, "", tstruct, is_exception);
-    generate_delphi_struct_type_factory_registration(s_type_factory_registration,
-                                                     "",
-                                                     tstruct,
-                                                     is_exception);
-  }
-}
-
-void t_delphi_generator::generate_delphi_struct_impl(ostream& out,
-                                                     string cls_prefix,
-                                                     t_struct* tstruct,
-                                                     bool is_exception,
-                                                     bool is_result,
-                                                     bool is_x_factory) {
-
-  if (is_exception && (!is_x_factory)) {
-    generate_delphi_struct_impl(out, cls_prefix, tstruct, is_exception, is_result, true);
-  }
-
-  string cls_nm;
-
-  string exception_factory_name;
-
-  if (is_exception) {
-    exception_factory_name = normalize_clsnm(tstruct->get_name(), "", true) + "Factory";
-  }
-
-  if (is_exception) {
-    cls_nm = type_name(tstruct, true, (!is_x_factory), is_x_factory, true);
-  } else {
-    cls_nm = type_name(tstruct, true, false);
-  }
-
-  std::ostringstream vars, code;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  indent_up_impl();
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = (*m_iter)->get_type();
-    while (t->is_typedef()) {
-      t = ((t_typedef*)t)->get_type();
-    }
-    if ((*m_iter)->get_value() != NULL) {
-      initialize_field(vars,
-                       code,
-                       "F" + prop_name((*m_iter)->get_name(), is_exception),
-                       t,
-                       (*m_iter)->get_value());
-      if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-        indent_impl(code) << "F__isset_" << prop_name((*m_iter), is_exception) << " := True;"
-                          << endl;
-      }
-    }
-  }
-  indent_down_impl();
-
-  indent_impl(out) << "constructor " << cls_prefix << cls_nm << "."
-                   << "Create;" << endl;
-
-  if (!vars.str().empty()) {
-    out << "var" << endl;
-    out << vars.str();
-  }
-
-  indent_impl(out) << "begin" << endl;
-  indent_up_impl();
-  if (is_exception && (!is_x_factory)) {
-    indent_impl(out) << "inherited Create('');" << endl;
-    indent_impl(out) << "F" << exception_factory_name << " := T" << exception_factory_name
-                     << "Impl.Create;" << endl;
-  } else {
-    indent_impl(out) << "inherited;" << endl;
-  }
-
-  if (!code.str().empty()) {
-    out << code.str();
-  }
-
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl << endl;
-
-  if ((members.size() > 0) && is_exception && (!is_x_factory)) {
-    indent_impl(out) << "constructor " << cls_prefix << cls_nm << "."
-                     << "Create(" << constructor_argument_list(tstruct, indent_impl()) << ");"
-                     << endl;
-    indent_impl(out) << "begin" << endl;
-    indent_up_impl();
-    indent_impl(out) << "Create;" << endl;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      string propname = prop_name((*m_iter)->get_name(), is_exception);
-      string param_name = constructor_param_name((*m_iter)->get_name());
-      indent_impl(out) << propname << " := " << param_name << ";" << endl;
-    }
-    indent_impl(out) << "UpdateMessageProperty;" << endl;
-    indent_down_impl();
-    indent_impl(out) << "end;" << endl << endl;
-  }
-
-  indent_impl(out) << "destructor " << cls_prefix << cls_nm << "."
-                   << "Destroy;" << endl;
-  indent_impl(out) << "begin" << endl;
-  indent_up_impl();
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = (*m_iter)->get_type();
-    while (t->is_typedef()) {
-      t = ((t_typedef*)t)->get_type();
-    }
-    finalize_field(out, prop_name(*m_iter, is_exception), t, (*m_iter)->get_value());
-  }
-
-  indent_impl(out) << "inherited;" << endl;
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl << endl;
-
-  if (tstruct->is_union()) {
-    indent_impl(out) << "procedure " << cls_prefix << cls_nm << "."
-                     << "ClearUnionValues;" << endl;
-    indent_impl(out) << "begin" << endl;
-    indent_up_impl();
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = (*m_iter)->get_type();
-      while (t->is_typedef()) {
-        t = ((t_typedef*)t)->get_type();
-      }
-
-      generate_delphi_clear_union_value(out,
-                                        cls_prefix,
-                                        cls_nm,
-                                        t,
-                                        *m_iter,
-                                        "F",
-                                        is_exception,
-                                        tstruct->is_union(),
-                                        is_x_factory,
-                                        exception_factory_name);
-    }
-    indent_down_impl();
-    indent_impl(out) << "end;" << endl << endl;
-  }
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = (*m_iter)->get_type();
-    while (t->is_typedef()) {
-      t = ((t_typedef*)t)->get_type();
-    }
-    generate_delphi_property_reader_impl(out, cls_prefix, cls_nm, t, *m_iter, "F", is_exception);
-    generate_delphi_property_writer_impl(out,
-                                         cls_prefix,
-                                         cls_nm,
-                                         t,
-                                         *m_iter,
-                                         "F",
-                                         is_exception,
-                                         tstruct->is_union(),
-                                         is_x_factory,
-                                         exception_factory_name);
-    if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-      generate_delphi_isset_reader_impl(out, cls_prefix, cls_nm, t, *m_iter, "F", is_exception);
-    }
-  }
-
-  if ((!is_exception) || is_x_factory) {
-    generate_delphi_struct_reader_impl(out, cls_prefix, tstruct, is_exception);
-    if (is_result) {
-      generate_delphi_struct_result_writer_impl(out, cls_prefix, tstruct, is_exception);
-    } else {
-      generate_delphi_struct_writer_impl(out, cls_prefix, tstruct, is_exception);
-    }
-  }
-  generate_delphi_struct_tostring_impl(out, cls_prefix, tstruct, is_exception, is_x_factory);
-
-  if (is_exception && is_x_factory) {
-    generate_delphi_create_exception_impl(out, cls_prefix, tstruct, is_exception);
-  }
-}
-
-void t_delphi_generator::print_delphi_struct_type_factory_func(ostream& out, t_struct* tstruct) {
-  string struct_intf_name = type_name(tstruct);
-  out << "Create_";
-  out << struct_intf_name;
-  out << "_Impl";
-}
-
-void t_delphi_generator::generate_delphi_struct_type_factory(ostream& out,
-                                                             string cls_prefix,
-                                                             t_struct* tstruct,
-                                                             bool is_exception,
-                                                             bool is_result,
-                                                             bool is_x_factory) {
-  (void)cls_prefix;
-  if (is_exception)
-    return;
-  if (is_result)
-    return;
-  if (is_x_factory)
-    return;
-
-  string struct_intf_name = type_name(tstruct);
-  string cls_nm = type_name(tstruct, true, false);
-
-  out << "function ";
-  print_delphi_struct_type_factory_func(out, tstruct);
-  out << ": ";
-  out << struct_intf_name;
-  out << ";" << endl;
-  out << "begin" << endl;
-  indent_up();
-  indent(out) << "Result := " << cls_nm << ".Create;" << endl;
-  indent_down();
-  out << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_delphi_struct_type_factory_registration(ostream& out,
-                                                                          string cls_prefix,
-                                                                          t_struct* tstruct,
-                                                                          bool is_exception,
-                                                                          bool is_result,
-                                                                          bool is_x_factory) {
-  (void)cls_prefix;
-  if (is_exception)
-    return;
-  if (is_result)
-    return;
-  if (is_x_factory)
-    return;
-
-  string struct_intf_name = type_name(tstruct);
-
-  indent(out) << "  TypeRegistry.RegisterTypeFactory<" << struct_intf_name << ">(";
-  print_delphi_struct_type_factory_func(out, tstruct);
-  out << ");";
-  out << endl;
-}
-
-void t_delphi_generator::generate_delphi_struct_definition(ostream& out,
-                                                           t_struct* tstruct,
-                                                           bool is_exception,
-                                                           bool in_class,
-                                                           bool is_result,
-                                                           bool is_x_factory) {
-  bool is_final = (tstruct->annotations_.find("final") != tstruct->annotations_.end());
-  string struct_intf_name;
-  string struct_name;
-  string isset_name;
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  string exception_factory_name = normalize_clsnm(tstruct->get_name(), "", true) + "Factory";
-
-  if (is_exception) {
-    struct_intf_name = type_name(tstruct, false, false, true);
-  } else {
-    struct_intf_name = type_name(tstruct);
-  }
-
-  if (is_exception) {
-    struct_name = type_name(tstruct, true, (!is_x_factory), is_x_factory);
-  } else {
-    struct_name = type_name(tstruct, true);
-  }
-
-  if ((!is_exception) || is_x_factory) {
-
-    generate_delphi_doc(out, tstruct);
-    indent(out) << struct_intf_name << " = interface(IBase)" << endl;
-    indent_up();
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      generate_delphi_property_reader_definition(out, *m_iter, is_exception);
-      generate_delphi_property_writer_definition(out, *m_iter, is_exception);
-    }
-
-    if (is_x_factory) {
-      out << endl;
-      indent(out) << "// Create Exception Object" << endl;
-      indent(out) << "function CreateException: " << type_name(tstruct, true, true) << ";" << endl;
-    }
-
-    if (members.size() > 0) {
-      out << endl;
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        generate_property(out, *m_iter, true, is_exception);
-      }
-    }
-
-    if (members.size() > 0) {
-      out << endl;
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-          generate_delphi_isset_reader_definition(out, *m_iter, is_exception);
-        }
-      }
-    }
-
-    if (members.size() > 0) {
-      out << endl;
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-          isset_name = "__isset_" + prop_name(*m_iter, is_exception);
-          indent(out) << "property " << isset_name << ": Boolean read Get" << isset_name << ";"
-                      << endl;
-        }
-      }
-    }
-
-    indent_down();
-    indent(out) << "end;" << endl << endl;
-  }
-
-  generate_delphi_doc(out, tstruct);
-  indent(out) << struct_name << " = ";
-  if (is_final) {
-    out << "sealed ";
-  }
-  out << "class(";
-  if (is_exception && (!is_x_factory)) {
-    out << "TException";
-  } else {
-    out << "TInterfacedObject, IBase, " << struct_intf_name;
-  }
-  out << ")" << endl;
-
-  if (is_exception && (!is_x_factory)) {
-    indent(out) << "public" << endl;
-    indent_up();
-    indent(out) << "type" << endl;
-    indent_up();
-    generate_delphi_struct_definition(out, tstruct, is_exception, in_class, is_result, true);
-    indent_down();
-    indent_down();
-  }
-
-  indent(out) << "private" << endl;
-  indent_up();
-
-  if (is_exception && (!is_x_factory)) {
-    indent(out) << "F" << exception_factory_name << " :" << struct_intf_name << ";" << endl << endl;
-  }
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << declare_field(*m_iter, false, "F", is_exception) << endl;
-  }
-
-  if (members.size() > 0) {
-    indent(out) << endl;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-        isset_name = "F__isset_" + prop_name(*m_iter, is_exception);
-        indent(out) << isset_name << ": Boolean;" << endl;
-      }
-    }
-  }
-
-  indent(out) << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    generate_delphi_property_reader_definition(out, *m_iter, is_exception);
-    generate_delphi_property_writer_definition(out, *m_iter, is_exception);
-  }
-
-  if (tstruct->is_union()) {
-    out << endl;
-    indent(out) << "// Clear values(for union's property setter)" << endl;
-    indent(out) << "procedure ClearUnionValues;" << endl;
-  }
-
-  if (members.size() > 0) {
-    out << endl;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-        isset_name = "__isset_" + prop_name(*m_iter, is_exception);
-        indent(out) << "function Get" << isset_name << ": Boolean;" << endl;
-      }
-    }
-  }
-
-  indent_down();
-
-  indent(out) << "public" << endl;
-  indent_up();
-
-  if ((members.size() > 0) && is_exception && (!is_x_factory)) {
-    indent(out) << "constructor Create; overload;" << endl;
-    indent(out) << "constructor Create(" << constructor_argument_list(tstruct, indent())
-                << "); overload;" << endl;
-  } else {
-    indent(out) << "constructor Create;" << endl;
-  }
-
-  indent(out) << "destructor Destroy; override;" << endl;
-
-  out << endl;
-  indent(out) << "function ToString: string; override;" << endl;
-
-  if (is_exception && (!is_x_factory)) {
-    out << endl;
-    indent(out) << "// Exception Factory" << endl;
-    indent(out) << "property " << exception_factory_name << ": " << struct_intf_name << " read F"
-                << exception_factory_name << " write F" << exception_factory_name << ";" << endl;
-  }
-
-  if ((!is_exception) || is_x_factory) {
-    out << endl;
-    indent(out) << "// IBase" << endl;
-    indent(out) << "procedure Read( const iprot: IProtocol);" << endl;
-    indent(out) << "procedure Write( const oprot: IProtocol);" << endl;
-  }
-
-  if (is_exception && is_x_factory) {
-    out << endl;
-    indent(out) << "// Create Exception Object" << endl;
-    indent(out) << "function CreateException: " << type_name(tstruct, true, true) << ";" << endl;
-  }
-
-  if (members.size() > 0) {
-    out << endl;
-    indent(out) << "// Properties" << endl;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      generate_property(out, *m_iter, true, is_exception);
-    }
-  }
-
-  if (members.size() > 0) {
-    out << endl;
-    indent(out) << "// isset" << endl;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() != t_field::T_REQUIRED) {
-        isset_name = "__isset_" + prop_name(*m_iter, is_exception);
-        indent(out) << "property " << isset_name << ": Boolean read Get" << isset_name << ";"
-                    << endl;
-      }
-    }
-  }
-
-  indent_down();
-  indent(out) << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_service(t_service* tservice) {
-  indent_up();
-  generate_delphi_doc(s_service, tservice);
-  indent(s_service) << normalize_clsnm(service_name_, "T") << " = class" << endl;
-  indent(s_service) << "public" << endl;
-  indent_up();
-  indent(s_service) << "type" << endl;
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-  generate_service_helpers(tservice);
-  indent_down();
-  indent_down();
-  indent(s_service) << "end;" << endl;
-  indent(s_service) << endl;
-  indent_down();
-}
-
-void t_delphi_generator::generate_service_interface(t_service* tservice) {
-  string extends = "";
-  string extends_iface = "";
-
-  indent_up();
-
-  generate_delphi_doc(s_service, tservice);
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends(), true, true);
-    extends_iface = extends + ".Iface";
-    generate_delphi_doc(s_service, tservice);
-    indent(s_service) << "Iface = interface(" << extends_iface << ")" << endl;
-  } else {
-    indent(s_service) << "Iface = interface" << endl;
-  }
-
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_delphi_doc(s_service, *f_iter);
-    indent(s_service) << function_signature(*f_iter) << endl;
-  }
-  indent_down();
-  indent(s_service) << "end;" << endl << endl;
-
-  indent_down();
-}
-
-void t_delphi_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_delphi_struct_definition(s_service, ts, false, true);
-    generate_delphi_struct_impl(s_service_impl,
-                                normalize_clsnm(service_name_, "T") + ".",
-                                ts,
-                                false);
-    generate_function_helpers(*f_iter);
-  }
-}
-
-void t_delphi_generator::generate_service_client(t_service* tservice) {
-  indent_up();
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_client = extends + ".Client, ";
-  }
-
-  generate_delphi_doc(s_service, tservice);
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends(), true, true);
-    extends_client = extends + ".TClient";
-    indent(s_service) << "TClient = class(" << extends_client << ", Iface)" << endl;
-  } else {
-    indent(s_service) << "TClient = class( TInterfacedObject, Iface)" << endl;
-  }
-
-  indent(s_service) << "public" << endl;
-  indent_up();
-
-  indent(s_service) << "constructor Create( prot: IProtocol); overload;" << endl;
-
-  indent_impl(s_service_impl) << "constructor " << normalize_clsnm(service_name_, "T")
-                              << ".TClient.Create( prot: IProtocol);" << endl;
-  indent_impl(s_service_impl) << "begin" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "Create( prot, prot );" << endl;
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl << endl;
-
-  indent(s_service)
-      << "constructor Create( const iprot: IProtocol; const oprot: IProtocol); overload;" << endl;
-
-  indent_impl(s_service_impl) << "constructor " << normalize_clsnm(service_name_, "T")
-                              << ".TClient.Create( const iprot: IProtocol; const oprot: IProtocol);"
-                              << endl;
-  indent_impl(s_service_impl) << "begin" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "inherited Create;" << endl;
-  indent_impl(s_service_impl) << "iprot_ := iprot;" << endl;
-  indent_impl(s_service_impl) << "oprot_ := oprot;" << endl;
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl << endl;
-
-  indent_down();
-
-  if (extends.empty()) {
-    indent(s_service) << "protected" << endl;
-    indent_up();
-    indent(s_service) << "iprot_: IProtocol;" << endl;
-    indent(s_service) << "oprot_: IProtocol;" << endl;
-    indent(s_service) << "seqid_: Integer;" << endl;
-    indent_down();
-
-    indent(s_service) << "public" << endl;
-    indent_up();
-    indent(s_service) << "property InputProtocol: IProtocol read iprot_;" << endl;
-    indent(s_service) << "property OutputProtocol: IProtocol read oprot_;" << endl;
-    indent_down();
-  }
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-
-  indent(s_service) << "protected" << endl;
-  indent_up();
-  indent(s_service) << "// Iface" << endl;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-    generate_delphi_doc(s_service, *f_iter);
-    indent(s_service) << function_signature(*f_iter) << endl;
-  }
-  indent_down();
-
-  indent(s_service) << "public" << endl;
-  indent_up();
-
-  string full_cls = normalize_clsnm(service_name_, "T") + ".TClient";
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-
-    indent_impl(s_service_impl) << function_signature(*f_iter, full_cls) << endl;
-    indent_impl(s_service_impl) << "begin" << endl;
-    indent_up_impl();
-    indent_impl(s_service_impl) << "send_" << funname << "(";
-
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    bool first = true;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        s_service_impl << ", ";
-      }
-      s_service_impl << normalize_name((*fld_iter)->get_name());
-    }
-    s_service_impl << ");" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      s_service_impl << indent_impl();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        s_service_impl << "Result := ";
-      }
-      s_service_impl << "recv_" << funname << "();" << endl;
-    }
-
-    indent_down_impl();
-    indent_impl(s_service_impl) << "end;" << endl << endl;
-
-    t_function send_function(g_type_void,
-                             string("send_") + (*f_iter)->get_name(),
-                             (*f_iter)->get_arglist());
-
-    string argsname = (*f_iter)->get_name() + "_args";
-    string args_clsnm = normalize_clsnm(argsname, "T");
-    string args_intfnm = normalize_clsnm(argsname, "I");
-
-    string argsvar = tmp("_args");
-    string msgvar = tmp("_msg");
-
-    indent(s_service) << function_signature(&send_function) << endl;
-    indent_impl(s_service_impl) << function_signature(&send_function, full_cls) << endl;
-    indent_impl(s_service_impl) << "var" << endl;
-    indent_up_impl();
-    indent_impl(s_service_impl) << argsvar << " : " << args_intfnm << ";" << endl;
-    indent_impl(s_service_impl) << msgvar << " : Thrift.Protocol.IMessage;" << endl;
-    indent_down_impl();
-    indent_impl(s_service_impl) << "begin" << endl;
-    indent_up_impl();
-
-    indent_impl(s_service_impl) << "seqid_ := seqid_ + 1;" << endl;
-    indent_impl(s_service_impl) << msgvar << " := Thrift.Protocol.TMessageImpl.Create('" << funname
-                                << "', " << ((*f_iter)->is_oneway() ? "TMessageType.Oneway"
-                                                                    : "TMessageType.Call")
-                                << ", seqid_);" << endl;
-
-    indent_impl(s_service_impl) << "oprot_.WriteMessageBegin( " << msgvar << " );" << endl;
-    indent_impl(s_service_impl) << argsvar << " := " << args_clsnm << "Impl.Create();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      indent_impl(s_service_impl) << argsvar << "." << prop_name(*fld_iter)
-                                  << " := " << normalize_name((*fld_iter)->get_name()) << ";"
-                                  << endl;
-    }
-    indent_impl(s_service_impl) << argsvar << ".Write(oprot_);" << endl;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      indent_impl(s_service_impl) << argsvar << "." << prop_name(*fld_iter)
-                                  << " := " << empty_value((*fld_iter)->get_type()) << ";" << endl;
-    }
-
-    indent_impl(s_service_impl) << "oprot_.WriteMessageEnd();" << endl;
-    indent_impl(s_service_impl) << "oprot_.Transport.Flush();" << endl;
-
-    indent_down_impl();
-    indent_impl(s_service_impl) << "end;" << endl << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      string org_resultname = (*f_iter)->get_name() + "_result";
-      string result_clsnm = normalize_clsnm(org_resultname, "T");
-      string result_intfnm = normalize_clsnm(org_resultname, "I");
-
-      t_struct noargs(program_);
-      t_function recv_function((*f_iter)->get_returntype(),
-                               string("recv_") + (*f_iter)->get_name(),
-                               &noargs,
-                               (*f_iter)->get_xceptions());
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-
-      string exceptvar = tmp("_ex");
-      string appexvar = tmp("_ax");
-      string retvar = tmp("_ret");
-
-      indent(s_service) << function_signature(&recv_function) << endl;
-      indent_impl(s_service_impl) << function_signature(&recv_function, full_cls) << endl;
-      indent_impl(s_service_impl) << "var" << endl;
-      indent_up_impl();
-      indent_impl(s_service_impl) << msgvar << " : Thrift.Protocol.IMessage;" << endl;
-      if (xceptions.size() > 0) {
-        indent_impl(s_service_impl) << exceptvar << " : Exception;" << endl;
-      }
-      indent_impl(s_service_impl) << appexvar << " : TApplicationException;" << endl;
-      indent_impl(s_service_impl) << retvar << " : " << result_intfnm << ";" << endl;
-
-      indent_down_impl();
-      indent_impl(s_service_impl) << "begin" << endl;
-      indent_up_impl();
-      indent_impl(s_service_impl) << msgvar << " := iprot_.ReadMessageBegin();" << endl;
-      indent_impl(s_service_impl) << "if (" << msgvar << ".Type_ = TMessageType.Exception) then"
-                                  << endl;
-      indent_impl(s_service_impl) << "begin" << endl;
-      indent_up_impl();
-      indent_impl(s_service_impl) << appexvar << " := TApplicationException.Read(iprot_);" << endl;
-      indent_impl(s_service_impl) << "iprot_.ReadMessageEnd();" << endl;
-      indent_impl(s_service_impl) << "raise " << appexvar << ";" << endl;
-      indent_down_impl();
-      indent_impl(s_service_impl) << "end;" << endl;
-
-      indent_impl(s_service_impl) << retvar << " := " << result_clsnm << "Impl.Create();" << endl;
-      indent_impl(s_service_impl) << retvar << ".Read(iprot_);" << endl;
-      indent_impl(s_service_impl) << "iprot_.ReadMessageEnd();" << endl;
-
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        indent_impl(s_service_impl) << "if (" << retvar << ".__isset_success) then" << endl;
-        indent_impl(s_service_impl) << "begin" << endl;
-        indent_up_impl();
-        indent_impl(s_service_impl) << "Result := " << retvar << ".Success;" << endl;
-        t_type* type = (*f_iter)->get_returntype();
-        if (type->is_struct() || type->is_xception() || type->is_map() || type->is_list()
-            || type->is_set()) {
-          indent_impl(s_service_impl) << retvar << ".Success := nil;" << endl;
-        }
-        indent_impl(s_service_impl) << "Exit;" << endl;
-        indent_down_impl();
-        indent_impl(s_service_impl) << "end;" << endl;
-      }
-
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        indent_impl(s_service_impl) << "if (" << retvar << ".__isset_" << prop_name(*x_iter)
-                                    << ") then" << endl;
-        indent_impl(s_service_impl) << "begin" << endl;
-        indent_up_impl();
-        indent_impl(s_service_impl) << exceptvar << " := " << retvar << "." << prop_name(*x_iter)
-                                    << ".CreateException;" << endl;
-        indent_impl(s_service_impl) << "raise " << exceptvar << ";" << endl;
-        indent_down_impl();
-        indent_impl(s_service_impl) << "end;" << endl;
-      }
-
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        indent_impl(s_service_impl)
-			<< "raise TApplicationExceptionMissingResult.Create('"
-            << (*f_iter)->get_name() << " failed: unknown result');" << endl;
-      }
-
-      indent_down_impl();
-      indent_impl(s_service_impl) << "end;" << endl << endl;
-    }
-  }
-
-  indent_down();
-  indent(s_service) << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_service_server(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string extends = "";
-  string extends_processor = "";
-
-  string full_cls = normalize_clsnm(service_name_, "T") + ".TProcessorImpl";
-
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends(), true, true);
-    extends_processor = extends + ".TProcessorImpl";
-    indent(s_service) << "TProcessorImpl = class(" << extends_processor << ", IProcessor)" << endl;
-  } else {
-    indent(s_service) << "TProcessorImpl = class( TInterfacedObject, IProcessor)" << endl;
-  }
-
-  indent(s_service) << "public" << endl;
-  indent_up();
-  indent(s_service) << "constructor Create( iface_: Iface );" << endl;
-  indent(s_service) << "destructor Destroy; override;" << endl;
-  indent_down();
-
-  indent_impl(s_service_impl) << "constructor " << full_cls << ".Create( iface_: Iface );" << endl;
-  indent_impl(s_service_impl) << "begin" << endl;
-  indent_up_impl();
-  if (tservice->get_extends() != NULL) {
-    indent_impl(s_service_impl) << "inherited Create( iface_);" << endl;
-  } else {
-    indent_impl(s_service_impl) << "inherited Create;" << endl;
-  }
-  indent_impl(s_service_impl) << "Self.iface_ := iface_;" << endl;
-  if (tservice->get_extends() != NULL) {
-    indent_impl(s_service_impl) << "ASSERT( processMap_ <> nil);  // inherited" << endl;
-  } else {
-    indent_impl(s_service_impl)
-        << "processMap_ := TThriftDictionaryImpl<string, TProcessFunction>.Create;" << endl;
-  }
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    indent_impl(s_service_impl) << "processMap_.AddOrSetValue( '" << (*f_iter)->get_name() << "', "
-                                << (*f_iter)->get_name() << "_Process);" << endl;
-  }
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl << endl;
-
-  indent_impl(s_service_impl) << "destructor " << full_cls << ".Destroy;" << endl;
-  indent_impl(s_service_impl) << "begin" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "inherited;" << endl;
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl << endl;
-
-  indent(s_service) << "private" << endl;
-  indent_up();
-  indent(s_service) << "iface_: Iface;" << endl;
-  indent_down();
-
-  if (tservice->get_extends() == NULL) {
-    indent(s_service) << "protected" << endl;
-    indent_up();
-    indent(s_service) << "type" << endl;
-    indent_up();
-    indent(s_service) << "TProcessFunction = reference to procedure( seqid: Integer; const iprot: "
-                         "IProtocol; const oprot: IProtocol"
-                      << (events_ ? "; const events : IRequestEvents" : "") << ");" << endl;
-    indent_down();
-    indent_down();
-    indent(s_service) << "protected" << endl;
-    indent_up();
-    indent(s_service) << "processMap_: IThriftDictionary<string, TProcessFunction>;" << endl;
-    indent_down();
-  }
-
-  indent(s_service) << "public" << endl;
-  indent_up();
-  if (extends.empty()) {
-    indent(s_service) << "function Process( const iprot: IProtocol; const oprot: IProtocol; const "
-                         "events : IProcessorEvents): Boolean;" << endl;
-  } else {
-    indent(s_service) << "function Process( const iprot: IProtocol; const oprot: IProtocol; const "
-                         "events : IProcessorEvents): Boolean; reintroduce;" << endl;
-  }
-
-  indent_impl(s_service_impl) << "function " << full_cls << ".Process( const iprot: IProtocol; "
-                                                            "const oprot: IProtocol; const events "
-                                                            ": IProcessorEvents): Boolean;" << endl;
-  ;
-  indent_impl(s_service_impl) << "var" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "msg : Thrift.Protocol.IMessage;" << endl;
-  indent_impl(s_service_impl) << "fn : TProcessFunction;" << endl;
-  indent_impl(s_service_impl) << "x : TApplicationException;" << endl;
-  if (events_) {
-    indent_impl(s_service_impl) << "context : IRequestEvents;" << endl;
-  }
-  indent_down_impl();
-  indent_impl(s_service_impl) << "begin" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "try" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "msg := iprot.ReadMessageBegin();" << endl;
-  indent_impl(s_service_impl) << "fn := nil;" << endl;
-  indent_impl(s_service_impl) << "if not processMap_.TryGetValue(msg.Name, fn)" << endl;
-  indent_impl(s_service_impl) << "or not Assigned(fn) then" << endl;
-  indent_impl(s_service_impl) << "begin" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "TProtocolUtil.Skip(iprot, TType.Struct);" << endl;
-  indent_impl(s_service_impl) << "iprot.ReadMessageEnd();" << endl;
-  indent_impl(s_service_impl) << "x := "
-								 "TApplicationExceptionUnknownMethod.Create("
-								 "'Invalid method name: ''' + msg.Name + '''');" << endl;
-  indent_impl(s_service_impl)
-      << "msg := Thrift.Protocol.TMessageImpl.Create(msg.Name, TMessageType.Exception, msg.SeqID);"
-      << endl;
-  indent_impl(s_service_impl) << "oprot.WriteMessageBegin( msg);" << endl;
-  indent_impl(s_service_impl) << "x.Write(oprot);" << endl;
-  indent_impl(s_service_impl) << "oprot.WriteMessageEnd();" << endl;
-  indent_impl(s_service_impl) << "oprot.Transport.Flush();" << endl;
-  indent_impl(s_service_impl) << "Result := True;" << endl;
-  indent_impl(s_service_impl) << "Exit;" << endl;
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl;
-  if (events_) {
-    indent_impl(s_service_impl) << "if events <> nil" << endl;
-    indent_impl(s_service_impl) << "then context := events.CreateRequestContext(msg.Name)" << endl;
-    indent_impl(s_service_impl) << "else context := nil;" << endl;
-    indent_impl(s_service_impl) << "try" << endl;
-    indent_up_impl();
-    indent_impl(s_service_impl) << "fn(msg.SeqID, iprot, oprot, context);" << endl;
-    indent_down_impl();
-    indent_impl(s_service_impl) << "finally" << endl;
-    indent_up_impl();
-    indent_impl(s_service_impl) << "if context <> nil then begin" << endl;
-    indent_up_impl();
-    indent_impl(s_service_impl) << "context.CleanupContext;" << endl;
-    indent_impl(s_service_impl) << "context := nil;" << endl;
-    indent_down_impl();
-    indent_impl(s_service_impl) << "end;" << endl;
-    indent_down_impl();
-    indent_impl(s_service_impl) << "end;" << endl;
-  } else {
-    indent_impl(s_service_impl) << "fn(msg.SeqID, iprot, oprot);" << endl;
-  }
-  indent_down_impl();
-  indent_impl(s_service_impl) << "except" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "on TTransportExceptionTimedOut do begin" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "Result := True;" << endl;
-  indent_impl(s_service_impl) << "Exit;" << endl;
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl;
-  indent_impl(s_service_impl) << "else begin" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "Result := False;" << endl;
-  indent_impl(s_service_impl) << "Exit;" << endl;
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl;
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl;
-  indent_impl(s_service_impl) << "Result := True;" << endl;
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  indent_down();
-  indent(s_service) << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_function_helpers(t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  t_struct result(program_, tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "Success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_delphi_struct_definition(s_service, &result, false, true, true);
-  generate_delphi_struct_impl(s_service_impl,
-                              normalize_clsnm(service_name_, "T") + ".",
-                              &result,
-                              false);
-}
-
-void t_delphi_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  string funcname = tfunction->get_name();
-  string full_cls = normalize_clsnm(service_name_, "T") + ".TProcessorImpl";
-
-  string org_argsname = funcname + "_args";
-  string args_clsnm = normalize_clsnm(org_argsname, "T");
-  string args_intfnm = normalize_clsnm(org_argsname, "I");
-
-  string org_resultname = funcname + "_result";
-  string result_clsnm = normalize_clsnm(org_resultname, "T");
-  string result_intfnm = normalize_clsnm(org_resultname, "I");
-
-  indent(s_service) << "procedure " << funcname
-                    << "_Process( seqid: Integer; const iprot: IProtocol; const oprot: IProtocol"
-                    << (events_ ? "; const events : IRequestEvents" : "") << ");" << endl;
-
-  if (tfunction->is_oneway()) {
-    indent_impl(s_service_impl) << "// one way processor" << endl;
-  } else {
-    indent_impl(s_service_impl) << "// both way processor" << endl;
-  }
-
-  indent_impl(s_service_impl)
-      << "procedure " << full_cls << "." << funcname
-      << "_Process( seqid: Integer; const iprot: IProtocol; const oprot: IProtocol"
-      << (events_ ? "; const events : IRequestEvents" : "") << ");" << endl;
-  indent_impl(s_service_impl) << "var" << endl;
-  indent_up_impl();
-  indent_impl(s_service_impl) << "args: " << args_intfnm << ";" << endl;
-  if (!tfunction->is_oneway()) {
-    indent_impl(s_service_impl) << "msg: Thrift.Protocol.IMessage;" << endl;
-    indent_impl(s_service_impl) << "ret: " << result_intfnm << ";" << endl;
-    indent_impl(s_service_impl) << "appx : TApplicationException;" << endl;
-  }
-
-  indent_down_impl();
-  indent_impl(s_service_impl) << "begin" << endl;
-  indent_up_impl();
-
-  if (events_) {
-    indent_impl(s_service_impl) << "if events <> nil then events.PreRead;" << endl;
-  }
-  indent_impl(s_service_impl) << "args := " << args_clsnm << "Impl.Create;" << endl;
-  indent_impl(s_service_impl) << "args.Read(iprot);" << endl;
-  indent_impl(s_service_impl) << "iprot.ReadMessageEnd();" << endl;
-  if (events_) {
-    indent_impl(s_service_impl) << "if events <> nil then events.PostRead;" << endl;
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  if (!tfunction->is_oneway()) {
-    indent_impl(s_service_impl) << "ret := " << result_clsnm << "Impl.Create;" << endl;
-  }
-
-  indent_impl(s_service_impl) << "try" << endl;
-  indent_up_impl();
-
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  s_service_impl << indent_impl();
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    s_service_impl << "ret.Success := ";
-  }
-  s_service_impl << "iface_." << normalize_name(tfunction->get_name(), true) << "(";
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      s_service_impl << ", ";
-    }
-    s_service_impl << "args." << prop_name(*f_iter);
-  }
-  s_service_impl << ");" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent_impl(s_service_impl) << "args." << prop_name(*f_iter)
-                                << " := " << empty_value((*f_iter)->get_type()) << ";" << endl;
-  }
-
-  indent_down_impl();
-  indent_impl(s_service_impl) << "except" << endl;
-  indent_up_impl();
-
-  for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-    indent_impl(s_service_impl) << "on E: " << type_name((*x_iter)->get_type(), true, true)
-                                << " do begin" << endl;
-    indent_up_impl();
-    if (!tfunction->is_oneway()) {
-      string factory_name = normalize_clsnm((*x_iter)->get_type()->get_name(), "", true)
-                            + "Factory";
-      indent_impl(s_service_impl) << "ret." << prop_name(*x_iter) << " := E." << factory_name << ";"
-                                  << endl;
-    }
-    indent_down_impl();
-    indent_impl(s_service_impl) << "end;" << endl;
-  }
-
-  indent_impl(s_service_impl) << "on E: Exception do begin" << endl;
-  indent_up_impl();
-  if(events_) {
-    indent_impl(s_service_impl) << "if events <> nil then events.UnhandledError(E);" << endl;
-  }
-  if (!tfunction->is_oneway()) {
-	indent_impl(s_service_impl) << "appx := TApplicationExceptionInternalError.Create(E.Message);"
-                                << endl;
-    indent_impl(s_service_impl) << "try" << endl;
-    indent_up_impl();
-    if(events_) {
-      indent_impl(s_service_impl) << "if events <> nil then events.PreWrite;" << endl;
-    }
-    indent_impl(s_service_impl) << "msg := Thrift.Protocol.TMessageImpl.Create('"
-                                << tfunction->get_name() << "', TMessageType.Exception, seqid);"
-                                << endl;
-    indent_impl(s_service_impl) << "oprot.WriteMessageBegin( msg);" << endl;
-    indent_impl(s_service_impl) << "appx.Write(oprot);" << endl;
-    indent_impl(s_service_impl) << "oprot.WriteMessageEnd();" << endl;
-    indent_impl(s_service_impl) << "oprot.Transport.Flush();" << endl;
-    if(events_) {
-      indent_impl(s_service_impl) << "if events <> nil then events.PostWrite;" << endl;
-    }
-    indent_impl(s_service_impl) << "Exit;" << endl;
-    indent_down_impl();
-    indent_impl(s_service_impl) << "finally" << endl;
-    indent_up_impl();
-    indent_impl(s_service_impl) << "appx.Free;" << endl;
-    indent_down_impl();
-    indent_impl(s_service_impl) << "end;" << endl;
-  }
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl;
-
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl;
-
-  if (!tfunction->is_oneway()) {
-    if (events_) {
-      indent_impl(s_service_impl) << "if events <> nil then events.PreWrite;" << endl;
-    }
-    indent_impl(s_service_impl) << "msg := Thrift.Protocol.TMessageImpl.Create('"
-                                << tfunction->get_name() << "', TMessageType.Reply, seqid); "
-                                << endl;
-    indent_impl(s_service_impl) << "oprot.WriteMessageBegin( msg); " << endl;
-    indent_impl(s_service_impl) << "ret.Write(oprot);" << endl;
-    indent_impl(s_service_impl) << "oprot.WriteMessageEnd();" << endl;
-    indent_impl(s_service_impl) << "oprot.Transport.Flush();" << endl;
-    if (events_) {
-      indent_impl(s_service_impl) << "if events <> nil then events.PostWrite;" << endl;
-    }
-  } else if (events_) {
-    indent_impl(s_service_impl) << "if events <> nil then events.OnewayComplete;" << endl;
-  }
-
-  indent_down_impl();
-  indent_impl(s_service_impl) << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_deserialize_field(ostream& out,
-                                                    bool is_xception,
-                                                    t_field* tfield,
-                                                    string prefix,
-                                                    ostream& local_vars) {
-  t_type* type = tfield->get_type();
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + prop_name(tfield, is_xception);
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name, "");
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, is_xception, type, name, local_vars);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent_impl(out) << name << " := ";
-
-    if (type->is_enum()) {
-      out << type_name(type, false) << "(";
-    }
-
-    out << "iprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          if (ansistr_binary_) {
-            out << "ReadAnsiString();";
-          } else {
-            out << "ReadBinary();";
-          }
-        } else {
-          out << "ReadString();";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "ReadBool();";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "ReadByte();";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "ReadI16();";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "ReadI32();";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "ReadI64();";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "ReadDouble();";
-        break;
-      default:
-        throw "compiler error: no Delphi name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "ReadI32()";
-      out << ");";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-void t_delphi_generator::generate_deserialize_struct(ostream& out,
-                                                     t_struct* tstruct,
-                                                     string name,
-                                                     string prefix) {
-  string typ_name;
-
-  if (tstruct->is_xception()) {
-    typ_name = type_name(tstruct, true, false, true, true);
-  } else {
-    typ_name = type_name(tstruct, true, false);
-  }
-
-  indent_impl(out) << prefix << name << " := " << typ_name << ".Create;" << endl;
-  indent_impl(out) << prefix << name << ".Read(iprot);" << endl;
-}
-
-void t_delphi_generator::generate_deserialize_container(ostream& out,
-                                                        bool is_xception,
-                                                        t_type* ttype,
-                                                        string name,
-                                                        std::ostream& local_vars) {
-
-  string obj;
-  string counter;
-  string local_var;
-
-  if (ttype->is_map()) {
-    obj = tmp("_map");
-  } else if (ttype->is_set()) {
-    obj = tmp("_set");
-  } else if (ttype->is_list()) {
-    obj = tmp("_list");
-  }
-
-  if (ttype->is_map()) {
-    local_var = obj + ": IMap;";
-  } else if (ttype->is_set()) {
-    local_var = obj + ": ISet;";
-  } else if (ttype->is_list()) {
-    local_var = obj + ": IList;";
-  }
-  local_vars << "  " << local_var << endl;
-  counter = tmp("_i");
-  local_var = counter + ": Integer;";
-  local_vars << "  " << local_var << endl;
-
-  indent_impl(out) << name << " := " << type_name(ttype, true) << ".Create;" << endl;
-
-  if (ttype->is_map()) {
-    indent_impl(out) << obj << " := iprot.ReadMapBegin();" << endl;
-  } else if (ttype->is_set()) {
-    indent_impl(out) << obj << " := iprot.ReadSetBegin();" << endl;
-  } else if (ttype->is_list()) {
-    indent_impl(out) << obj << " := iprot.ReadListBegin();" << endl;
-  }
-
-  indent_impl(out) << "for " << counter << " := 0 to " << obj << ".Count - 1 do" << endl;
-  indent_impl(out) << "begin" << endl;
-  indent_up_impl();
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, is_xception, (t_map*)ttype, name, local_vars);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, is_xception, (t_set*)ttype, name, local_vars);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, is_xception, (t_list*)ttype, name, local_vars);
-  }
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl;
-
-  if (ttype->is_map()) {
-    indent_impl(out) << "iprot.ReadMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent_impl(out) << "iprot.ReadSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent_impl(out) << "iprot.ReadListEnd();" << endl;
-  }
-}
-
-void t_delphi_generator::generate_deserialize_map_element(ostream& out,
-                                                          bool is_xception,
-                                                          t_map* tmap,
-                                                          string prefix,
-                                                          ostream& local_vars) {
-
-  string key = tmp("_key");
-  string val = tmp("_val");
-  string local_var;
-
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  local_vars << "  " << declare_field(&fkey) << endl;
-  local_vars << "  " << declare_field(&fval) << endl;
-
-  generate_deserialize_field(out, is_xception, &fkey, "", local_vars);
-  generate_deserialize_field(out, is_xception, &fval, "", local_vars);
-
-  indent_impl(out) << prefix << ".AddOrSetValue( " << key << ", " << val << ");" << endl;
-}
-
-void t_delphi_generator::generate_deserialize_set_element(ostream& out,
-                                                          bool is_xception,
-                                                          t_set* tset,
-                                                          string prefix,
-                                                          ostream& local_vars) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-  local_vars << "  " << declare_field(&felem) << endl;
-  generate_deserialize_field(out, is_xception, &felem, "", local_vars);
-  indent_impl(out) << prefix << ".Add(" << elem << ");" << endl;
-}
-
-void t_delphi_generator::generate_deserialize_list_element(ostream& out,
-                                                           bool is_xception,
-                                                           t_list* tlist,
-                                                           string prefix,
-                                                           ostream& local_vars) {
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-  local_vars << "  " << declare_field(&felem) << endl;
-  generate_deserialize_field(out, is_xception, &felem, "", local_vars);
-  indent_impl(out) << prefix << ".Add(" << elem << ");" << endl;
-}
-
-void t_delphi_generator::generate_serialize_field(ostream& out,
-                                                  bool is_xception,
-                                                  t_field* tfield,
-                                                  string prefix,
-                                                  ostream& local_vars) {
-  (void)local_vars;
-
-  t_type* type = tfield->get_type();
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  string name = prefix + prop_name(tfield, is_xception);
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + name;
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, name, local_vars);
-  } else if (type->is_container()) {
-    generate_serialize_container(out, is_xception, type, name, local_vars);
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    indent_impl(out) << "oprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          if (ansistr_binary_) {
-            out << "WriteAnsiString(";
-          } else {
-            out << "WriteBinary(";
-          }
-        } else {
-          out << "WriteString(";
-        }
-        out << name << ");";
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "WriteBool(" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "WriteByte(" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "WriteI16(" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "WriteI32(" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "WriteI64(" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "WriteDouble(" << name << ");";
-        break;
-      default:
-        throw "compiler error: no Delphi name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "WriteI32(Integer(" << name << "));";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-void t_delphi_generator::generate_serialize_struct(ostream& out,
-                                                   t_struct* tstruct,
-                                                   string prefix,
-                                                   ostream& local_vars) {
-  (void)local_vars;
-  (void)tstruct;
-  out << indent_impl() << prefix << ".Write(oprot);" << endl;
-}
-
-void t_delphi_generator::generate_serialize_container(ostream& out,
-                                                      bool is_xception,
-                                                      t_type* ttype,
-                                                      string prefix,
-                                                      ostream& local_vars) {
-  string obj;
-  if (ttype->is_map()) {
-    obj = tmp("map");
-    local_vars << "  " << obj << " : IMap;" << endl;
-    indent_impl(out) << obj << " := TMapImpl.Create( "
-                     << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
-                     << type_to_enum(((t_map*)ttype)->get_val_type()) << ", " << prefix
-                     << ".Count);" << endl;
-    indent_impl(out) << "oprot.WriteMapBegin( " << obj << ");" << endl;
-  } else if (ttype->is_set()) {
-    obj = tmp("set_");
-    local_vars << "  " << obj << " : ISet;" << endl;
-    indent_impl(out) << obj << " := TSetImpl.Create("
-                     << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", " << prefix
-                     << ".Count);" << endl;
-    indent_impl(out) << "oprot.WriteSetBegin( " << obj << ");" << endl;
-  } else if (ttype->is_list()) {
-    obj = tmp("list_");
-    local_vars << "  " << obj << " : IList;" << endl;
-    indent_impl(out) << obj << " := TListImpl.Create("
-                     << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " << prefix
-                     << ".Count);" << endl;
-    indent_impl(out) << "oprot.WriteListBegin( " << obj << ");" << endl;
-  }
-
-  string iter = tmp("_iter");
-  if (ttype->is_map()) {
-    local_vars << "  " << iter << ": " << type_name(((t_map*)ttype)->get_key_type()) << ";" << endl;
-    indent_impl(out) << "for " << iter << " in " << prefix << ".Keys do" << endl;
-    indent_impl(out) << "begin" << endl;
-    indent_up_impl();
-  } else if (ttype->is_set()) {
-    local_vars << "  " << iter << ": " << type_name(((t_set*)ttype)->get_elem_type()) << ";"
-               << endl;
-    indent_impl(out) << "for " << iter << " in " << prefix << " do" << endl;
-    indent_impl(out) << "begin" << endl;
-    indent_up_impl();
-  } else if (ttype->is_list()) {
-    local_vars << "  " << iter << ": " << type_name(((t_list*)ttype)->get_elem_type()) << ";"
-               << endl;
-    indent_impl(out) << "for " << iter << " in " << prefix << " do" << endl;
-    indent_impl(out) << "begin" << endl;
-    indent_up_impl();
-  }
-
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, is_xception, (t_map*)ttype, iter, prefix, local_vars);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, is_xception, (t_set*)ttype, iter, local_vars);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, is_xception, (t_list*)ttype, iter, local_vars);
-  }
-
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl;
-
-  if (ttype->is_map()) {
-    indent_impl(out) << "oprot.WriteMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent_impl(out) << "oprot.WriteSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent_impl(out) << "oprot.WriteListEnd();" << endl;
-  }
-}
-
-void t_delphi_generator::generate_serialize_map_element(ostream& out,
-                                                        bool is_xception,
-                                                        t_map* tmap,
-                                                        string iter,
-                                                        string map,
-                                                        ostream& local_vars) {
-  t_field kfield(tmap->get_key_type(), iter);
-  generate_serialize_field(out, is_xception, &kfield, "", local_vars);
-  t_field vfield(tmap->get_val_type(), map + "[" + iter + "]");
-  generate_serialize_field(out, is_xception, &vfield, "", local_vars);
-}
-
-void t_delphi_generator::generate_serialize_set_element(ostream& out,
-                                                        bool is_xception,
-                                                        t_set* tset,
-                                                        string iter,
-                                                        ostream& local_vars) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, is_xception, &efield, "", local_vars);
-}
-
-void t_delphi_generator::generate_serialize_list_element(ostream& out,
-                                                         bool is_xception,
-                                                         t_list* tlist,
-                                                         string iter,
-                                                         ostream& local_vars) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, is_xception, &efield, "", local_vars);
-}
-
-void t_delphi_generator::generate_property(ostream& out,
-                                           t_field* tfield,
-                                           bool isPublic,
-                                           bool is_xception) {
-  generate_delphi_property(out, is_xception, tfield, isPublic, "Get");
-}
-
-void t_delphi_generator::generate_delphi_property(ostream& out,
-                                                  bool struct_is_xception,
-                                                  t_field* tfield,
-                                                  bool isPublic,
-                                                  std::string fieldPrefix) {
-  (void)isPublic;
-
-  t_type* ftype = tfield->get_type();
-  bool is_xception = ftype->is_xception();
-  generate_delphi_doc(out, tfield);
-  indent(out) << "property " << prop_name(tfield, struct_is_xception) << ": "
-              << type_name(ftype, false, true, is_xception, true) << " read "
-              << fieldPrefix + prop_name(tfield, struct_is_xception) << " write Set"
-              << prop_name(tfield, struct_is_xception) << ";" << endl;
-}
-
-std::string t_delphi_generator::prop_name(t_field* tfield, bool is_xception) {
-  return prop_name(tfield->get_name(), is_xception);
-}
-
-std::string t_delphi_generator::prop_name(string name, bool is_xception) {
-  string ret = name;
-  ret[0] = toupper(ret[0]);
-  return normalize_name(ret, true, is_xception);
-}
-
-std::string t_delphi_generator::constructor_param_name(string name) {
-  string ret = name;
-  ret[0] = toupper(ret[0]);
-  ret = "A" + ret;
-  return normalize_name(ret, false, false);
-}
-
-string t_delphi_generator::normalize_clsnm(string clsnm, string prefix, bool b_no_check_keyword) {
-  if (clsnm.size() > 0) {
-    clsnm[0] = toupper(clsnm[0]);
-  }
-  if (b_no_check_keyword) {
-    return prefix + clsnm;
-  } else {
-    return normalize_name(prefix + clsnm);
-  }
-}
-
-string t_delphi_generator::type_name(t_type* ttype,
-                                     bool b_cls,
-                                     bool b_no_postfix,
-                                     bool b_exception_factory,
-                                     bool b_full_exception_factory) {
-
-  if (ttype->is_typedef()) {
-    t_typedef* tdef = (t_typedef*)ttype;
-    if (tdef->is_forward_typedef()) { // forward types according to THRIFT-2421
-      if (tdef->get_type() != NULL) {
-        return type_name(tdef->get_type(),
-                         b_cls,
-                         b_no_postfix,
-                         b_exception_factory,
-                         b_full_exception_factory);
-      } else {
-        throw "unresolved forward declaration: " + tdef->get_symbolic();
-      }
-    } else {
-      return normalize_name("T" + tdef->get_symbolic());
-    }
-  }
-
-  string typ_nm;
-
-  string s_factory;
-
-  if (ttype->is_base_type()) {
-    return base_type_name((t_base_type*)ttype);
-  } else if (ttype->is_enum()) {
-    b_cls = true;
-    b_no_postfix = true;
-  } else if (ttype->is_map()) {
-    t_map* tmap = (t_map*)ttype;
-    if (b_cls) {
-      typ_nm = "TThriftDictionaryImpl";
-    } else {
-      typ_nm = "IThriftDictionary";
-    }
-    return typ_nm + "<" + type_name(tmap->get_key_type()) + ", " + type_name(tmap->get_val_type())
-           + ">";
-  } else if (ttype->is_set()) {
-    t_set* tset = (t_set*)ttype;
-    if (b_cls) {
-      typ_nm = "THashSetImpl";
-    } else {
-      typ_nm = "IHashSet";
-    }
-    return typ_nm + "<" + type_name(tset->get_elem_type()) + ">";
-  } else if (ttype->is_list()) {
-    t_list* tlist = (t_list*)ttype;
-    if (b_cls) {
-      typ_nm = "TThriftListImpl";
-    } else {
-      typ_nm = "IThriftList";
-    }
-    return typ_nm + "<" + type_name(tlist->get_elem_type()) + ">";
-  }
-
-  string type_prefix;
-
-  if (b_cls) {
-    type_prefix = "T";
-  } else {
-    type_prefix = "I";
-  }
-
-  string nm = normalize_clsnm(ttype->get_name(), type_prefix);
-
-  if (b_exception_factory) {
-    nm = nm + "Factory";
-  }
-
-  if (b_cls) {
-    if (!b_no_postfix) {
-      nm = nm + "Impl";
-    }
-  }
-
-  if (b_exception_factory && b_full_exception_factory) {
-    return type_name(ttype, true, true, false, false) + "." + nm;
-  }
-
-  return nm;
-}
-
-// returns "const " for some argument types
-string t_delphi_generator::input_arg_prefix(t_type* ttype) {
-
-  // base types
-  if (ttype->is_base_type()) {
-    switch (((t_base_type*)ttype)->get_base()) {
-
-    // these should be const'ed for optimal performamce
-    case t_base_type::TYPE_STRING: // refcounted pointer
-    case t_base_type::TYPE_I64:    // larger than 32 bit
-    case t_base_type::TYPE_DOUBLE: // larger than 32 bit
-      return "const ";
-
-    // all others don't need to be
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_BOOL:
-    case t_base_type::TYPE_VOID:
-      return "";
-
-    // we better always report any unknown types
-    default:
-      throw "compiler error: no input_arg_prefix() for base type "
-          + t_base_type::t_base_name(((t_base_type*)ttype)->get_base());
-    }
-
-    // enums
-  } else if (ttype->is_enum()) {
-    return ""; // usually <= 32 bit
-
-    // containers
-  } else if (ttype->is_map()) {
-    return "const "; // refcounted pointer
-
-  } else if (ttype->is_set()) {
-    return "const "; // refcounted pointer
-
-  } else if (ttype->is_list()) {
-    return "const "; // refcounted pointer
-  }
-
-  // any other type, either TSomething or ISomething
-  return "const "; // possibly refcounted pointer
-}
-
-string t_delphi_generator::base_type_name(t_base_type* tbase) {
-  switch (tbase->get_base()) {
-  case t_base_type::TYPE_VOID:
-    // no "void" in Delphi language
-    return "";
-  case t_base_type::TYPE_STRING:
-    if (tbase->is_binary()) {
-      if (ansistr_binary_) {
-        return "AnsiString";
-      } else {
-        return "TBytes";
-      }
-    } else {
-      return "string";
-    }
-  case t_base_type::TYPE_BOOL:
-    return "Boolean";
-  case t_base_type::TYPE_I8:
-    return "ShortInt";
-  case t_base_type::TYPE_I16:
-    return "SmallInt";
-  case t_base_type::TYPE_I32:
-    return "Integer";
-  case t_base_type::TYPE_I64:
-    return "Int64";
-  case t_base_type::TYPE_DOUBLE:
-    return "Double";
-  default:
-    throw "compiler error: no Delphi name for base type "
-        + t_base_type::t_base_name(tbase->get_base());
-  }
-}
-
-string t_delphi_generator::declare_field(t_field* tfield,
-                                         bool init,
-                                         std::string prefix,
-                                         bool is_xception_class) {
-  (void)init;
-
-  t_type* ftype = tfield->get_type();
-  bool is_xception = ftype->is_xception();
-
-  string result = prefix + prop_name(tfield, is_xception_class) + ": "
-                  + type_name(ftype, false, true, is_xception, true) + ";";
-  return result;
-}
-
-string t_delphi_generator::function_signature(t_function* tfunction,
-                                              std::string full_cls,
-                                              bool is_xception) {
-  t_type* ttype = tfunction->get_returntype();
-  string prefix;
-  if (full_cls == "") {
-    prefix = "";
-  } else {
-    prefix = full_cls + ".";
-  }
-  if (is_void(ttype)) {
-    return "procedure " + prefix + normalize_name(tfunction->get_name(), true, is_xception) + "("
-           + argument_list(tfunction->get_arglist()) + ");";
-  } else {
-    return "function " + prefix + normalize_name(tfunction->get_name(), true, is_xception) + "("
-           + argument_list(tfunction->get_arglist()) + "): "
-           + type_name(ttype, false, true, is_xception, true) + ";";
-  }
-}
-
-string t_delphi_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  t_type* tt;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += "; ";
-    }
-
-    tt = (*f_iter)->get_type();
-    result += input_arg_prefix(tt); // const?
-    result += normalize_name((*f_iter)->get_name()) + ": "
-              + type_name(tt, false, true, tt->is_xception(), true);
-  }
-  return result;
-}
-
-string t_delphi_generator::constructor_argument_list(t_struct* tstruct, string current_indent) {
-  ostringstream result;
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  t_type* tt;
-  string line = "";
-  string newline_indent = current_indent + "  ";
-
-  bool firstline = true;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      line += ";";
-    }
-
-    if (line.size() > 80) {
-      if (firstline) {
-        result << endl << newline_indent;
-        firstline = false;
-      }
-      result << line << endl;
-      line = newline_indent;
-    } else if (line.size() > 0) {
-      line += " ";
-    }
-
-    tt = (*f_iter)->get_type();
-    line += input_arg_prefix(tt); // const?
-    line += constructor_param_name((*f_iter)->get_name()) + ": "
-            + type_name(tt, false, true, tt->is_xception(), true);
-  }
-
-  if (line.size() > 0) {
-    result << line;
-  }
-
-  string result_str;
-
-  if (firstline) {
-    result_str = " " + result.str();
-  } else {
-    result_str = result.str();
-  }
-
-  return result_str;
-}
-
-string t_delphi_generator::type_to_enum(t_type* type) {
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType.String_";
-    case t_base_type::TYPE_BOOL:
-      return "TType.Bool_";
-    case t_base_type::TYPE_I8:
-      return "TType.Byte_";
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.Double_";
-    }
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.Struct";
-  } else if (type->is_map()) {
-    return "TType.Map";
-  } else if (type->is_set()) {
-    return "TType.Set_";
-  } else if (type->is_list()) {
-    return "TType.List";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-string t_delphi_generator::empty_value(t_type* type) {
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      return "0";
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)type)->is_binary()) {
-        if (ansistr_binary_) {
-          return "''";
-        } else {
-          return "nil";
-        }
-      } else {
-        return "''";
-      }
-    case t_base_type::TYPE_BOOL:
-      return "False";
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      return "0";
-    case t_base_type::TYPE_DOUBLE:
-      return "0.0";
-    }
-  } else if (type->is_enum()) {
-    return "T" + type->get_name() + "(0)";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "nil";
-  } else if (type->is_map()) {
-    return "nil";
-  } else if (type->is_set()) {
-    return "nil";
-  } else if (type->is_list()) {
-    return "nil";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-void t_delphi_generator::generate_delphi_property_writer_definition(ostream& out,
-                                                                    t_field* tfield,
-                                                                    bool is_xception_class) {
-  t_type* ftype = tfield->get_type();
-  bool is_xception = ftype->is_xception();
-
-  indent(out) << "procedure Set" << prop_name(tfield, is_xception_class)
-              << "( const Value: " << type_name(ftype, false, true, is_xception, true) << ");"
-              << endl;
-}
-
-void t_delphi_generator::generate_delphi_property_reader_definition(ostream& out,
-                                                                    t_field* tfield,
-                                                                    bool is_xception_class) {
-  t_type* ftype = tfield->get_type();
-  bool is_xception = ftype->is_xception();
-
-  indent(out) << "function Get" << prop_name(tfield, is_xception_class) << ": "
-              << type_name(ftype, false, true, is_xception, true) << ";" << endl;
-}
-
-void t_delphi_generator::generate_delphi_isset_reader_definition(ostream& out,
-                                                                 t_field* tfield,
-                                                                 bool is_xception) {
-  indent(out) << "function Get__isset_" << prop_name(tfield, is_xception) << ": Boolean;" << endl;
-}
-
-void t_delphi_generator::generate_delphi_clear_union_value(ostream& out,
-                                                           std::string cls_prefix,
-                                                           std::string name,
-                                                           t_type* type,
-                                                           t_field* tfield,
-                                                           std::string fieldPrefix,
-                                                           bool is_xception_class,
-                                                           bool is_union,
-                                                           bool is_xception_factory,
-                                                           std::string xception_factory_name) {
-  (void)cls_prefix;
-  (void)name;
-  (void)type;
-  (void)is_union;
-  (void)is_xception_factory;
-  (void)xception_factory_name;
-
-  t_type* ftype = tfield->get_type();
-  bool is_xception = ftype->is_xception();
-
-  indent_impl(out) << "if F__isset_" << prop_name(tfield, is_xception_class) << " then begin"
-                   << endl;
-  indent_up_impl();
-  indent_impl(out) << "F__isset_" << prop_name(tfield, is_xception_class) << " := False;" << endl;
-  indent_impl(out) << fieldPrefix << prop_name(tfield, is_xception_class) << " := "
-                   << "Default( " << type_name(ftype, false, true, is_xception, true) << ");"
-                   << endl;
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl;
-}
-
-void t_delphi_generator::generate_delphi_property_writer_impl(ostream& out,
-                                                              std::string cls_prefix,
-                                                              std::string name,
-                                                              t_type* type,
-                                                              t_field* tfield,
-                                                              std::string fieldPrefix,
-                                                              bool is_xception_class,
-                                                              bool is_union,
-                                                              bool is_xception_factory,
-                                                              std::string xception_factroy_name) {
-  (void)type;
-
-  t_type* ftype = tfield->get_type();
-  bool is_xception = ftype->is_xception();
-
-  indent_impl(out) << "procedure " << cls_prefix << name << "."
-                   << "Set" << prop_name(tfield, is_xception_class)
-                   << "( const Value: " << type_name(ftype, false, true, is_xception, true) << ");"
-                   << endl;
-  indent_impl(out) << "begin" << endl;
-  indent_up_impl();
-  if (is_union) {
-    indent_impl(out) << "ClearUnionValues;" << endl;
-  }
-  if (tfield->get_req() != t_field::T_REQUIRED) {
-    indent_impl(out) << "F__isset_" << prop_name(tfield, is_xception_class) << " := True;" << endl;
-  }
-  indent_impl(out) << fieldPrefix << prop_name(tfield, is_xception_class) << " := Value;" << endl;
-
-  if (is_xception_class && (!is_xception_factory)) {
-    indent_impl(out) << "F" << xception_factroy_name << "." << prop_name(tfield, is_xception_class)
-                     << " := Value;" << endl;
-  }
-
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_delphi_property_reader_impl(ostream& out,
-                                                              std::string cls_prefix,
-                                                              std::string name,
-                                                              t_type* type,
-                                                              t_field* tfield,
-                                                              std::string fieldPrefix,
-                                                              bool is_xception_class) {
-  (void)type;
-
-  t_type* ftype = tfield->get_type();
-  bool is_xception = ftype->is_xception();
-
-  indent_impl(out) << "function " << cls_prefix << name << "."
-                   << "Get" << prop_name(tfield, is_xception_class) << ": "
-                   << type_name(ftype, false, true, is_xception, true) << ";" << endl;
-  indent_impl(out) << "begin" << endl;
-  indent_up_impl();
-  indent_impl(out) << "Result := " << fieldPrefix << prop_name(tfield, is_xception_class) << ";"
-                   << endl;
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_delphi_isset_reader_impl(ostream& out,
-                                                           std::string cls_prefix,
-                                                           std::string name,
-                                                           t_type* type,
-                                                           t_field* tfield,
-                                                           std::string fieldPrefix,
-                                                           bool is_xception) {
-  (void)type;
-
-  string isset_name = "__isset_" + prop_name(tfield, is_xception);
-  indent_impl(out) << "function " << cls_prefix << name << "."
-                   << "Get" << isset_name << ": Boolean;" << endl;
-  indent_impl(out) << "begin" << endl;
-  indent_up_impl();
-  indent_impl(out) << "Result := " << fieldPrefix << isset_name << ";" << endl;
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_delphi_create_exception_impl(ostream& out,
-                                                               string cls_prefix,
-                                                               t_struct* tstruct,
-                                                               bool is_exception) {
-  (void)cls_prefix;
-
-  string exception_cls_nm = type_name(tstruct, true, true);
-  string cls_nm = type_name(tstruct, true, false, is_exception, is_exception);
-
-  indent_impl(out) << "function " << cls_nm << ".CreateException: " << exception_cls_nm << ";"
-                   << endl;
-
-  indent_impl(out) << "begin" << endl;
-  indent_up_impl();
-
-  indent_impl(out) << "Result := " << exception_cls_nm << ".Create;" << endl;
-  string factory_name = normalize_clsnm(tstruct->get_name(), "", true) + "Factory";
-  indent_impl(out) << "Result." << factory_name << " := Self;" << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  string propname;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    propname = prop_name(*f_iter, is_exception);
-    if ((*f_iter)->get_req() != t_field::T_REQUIRED) {
-      indent_impl(out) << "if __isset_" << propname << " then" << endl;
-      indent_impl(out) << "begin" << endl;
-      indent_up_impl();
-    }
-    indent_impl(out) << "Result." << propname << " := " << propname << ";" << endl;
-    if ((*f_iter)->get_req() != t_field::T_REQUIRED) {
-      indent_down_impl();
-      indent_impl(out) << "end;" << endl;
-    }
-  }
-
-  indent_impl(out) << "Result.UpdateMessageProperty;" << endl;
-
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl << endl;
-}
-
-void t_delphi_generator::generate_delphi_struct_reader_impl(ostream& out,
-                                                            string cls_prefix,
-                                                            t_struct* tstruct,
-                                                            bool is_exception) {
-
-  ostringstream local_vars;
-  ostringstream code_block;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent_impl(code_block) << "begin" << endl;
-  indent_up_impl();
-
-  indent_impl(local_vars) << "tracker : IProtocolRecursionTracker;" << endl;
-  indent_impl(code_block) << "tracker := iprot.NextRecursionLevel;" << endl;
-
-  // local bools for required fields
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      indent_impl(local_vars) << "_req_isset_" << prop_name(*f_iter, is_exception) << " : Boolean;"
-                              << endl;
-      indent_impl(code_block) << "_req_isset_" << prop_name(*f_iter, is_exception) << " := FALSE;"
-                              << endl;
-    }
-  }
-
-  indent_impl(code_block) << "struc := iprot.ReadStructBegin;" << endl;
-
-  indent_impl(code_block) << "try" << endl;
-  indent_up_impl();
-
-  indent_impl(code_block) << "while (true) do" << endl;
-  indent_impl(code_block) << "begin" << endl;
-  indent_up_impl();
-
-  indent_impl(code_block) << "field_ := iprot.ReadFieldBegin();" << endl;
-
-  indent_impl(code_block) << "if (field_.Type_ = TType.Stop) then" << endl;
-  indent_impl(code_block) << "begin" << endl;
-  indent_up_impl();
-  indent_impl(code_block) << "Break;" << endl;
-  indent_down_impl();
-  indent_impl(code_block) << "end;" << endl;
-
-  bool first = true;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-
-    if (first) {
-      indent_impl(code_block) << "case field_.ID of" << endl;
-      indent_up_impl();
-    }
-
-    first = false;
-    if (f_iter != fields.begin()) {
-      code_block << ";" << endl;
-    }
-    indent_impl(code_block) << (*f_iter)->get_key() << ": begin" << endl;
-    indent_up_impl();
-    indent_impl(code_block) << "if (field_.Type_ = " << type_to_enum((*f_iter)->get_type())
-                            << ") then begin" << endl;
-    indent_up_impl();
-
-    generate_deserialize_field(code_block, is_exception, *f_iter, "", local_vars);
-
-    // required field?
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      indent_impl(code_block) << "_req_isset_" << prop_name(*f_iter, is_exception) << " := TRUE;"
-                              << endl;
-    }
-
-    indent_down_impl();
-
-    indent_impl(code_block) << "end else begin" << endl;
-    indent_up_impl();
-    indent_impl(code_block) << "TProtocolUtil.Skip(iprot, field_.Type_);" << endl;
-    indent_down_impl();
-    indent_impl(code_block) << "end;" << endl;
-    indent_down_impl();
-    indent_impl(code_block) << "end";
-  }
-
-  if (!first) {
-    code_block << endl;
-    indent_impl(code_block) << "else begin" << endl;
-    indent_up_impl();
-  }
-
-  indent_impl(code_block) << "TProtocolUtil.Skip(iprot, field_.Type_);" << endl;
-
-  if (!first) {
-    indent_down_impl();
-    indent_impl(code_block) << "end;" << endl;
-    indent_down_impl();
-    indent_impl(code_block) << "end;" << endl;
-  }
-
-  indent_impl(code_block) << "iprot.ReadFieldEnd;" << endl;
-
-  indent_down_impl();
-
-  indent_impl(code_block) << "end;" << endl;
-  indent_down_impl();
-
-  indent_impl(code_block) << "finally" << endl;
-  indent_up_impl();
-  indent_impl(code_block) << "iprot.ReadStructEnd;" << endl;
-  indent_down_impl();
-  indent_impl(code_block) << "end;" << endl;
-
-  // all required fields have been read?
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      indent_impl(code_block) << "if not _req_isset_" << prop_name(*f_iter, is_exception) << endl;
-      indent_impl(code_block)
-          << "then raise TProtocolExceptionInvalidData.Create("
-          << "'required field " << prop_name(*f_iter, is_exception) << " not set');"
-          << endl;
-    }
-  }
-
-  indent_down_impl();
-  indent_impl(code_block) << "end;" << endl << endl;
-
-  string cls_nm;
-
-  cls_nm = type_name(tstruct, true, false, is_exception, is_exception);
-
-  indent_impl(out) << "procedure " << cls_prefix << cls_nm << ".Read( const iprot: IProtocol);"
-                   << endl;
-  indent_impl(out) << "var" << endl;
-  indent_up_impl();
-  indent_impl(out) << "field_ : IField;" << endl;
-  indent_impl(out) << "struc : IStruct;" << endl;
-  indent_down_impl();
-  out << local_vars.str() << endl;
-  out << code_block.str();
-}
-
-void t_delphi_generator::generate_delphi_struct_result_writer_impl(ostream& out,
-                                                                   string cls_prefix,
-                                                                   t_struct* tstruct,
-                                                                   bool is_exception) {
-
-  ostringstream local_vars;
-  ostringstream code_block;
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent_impl(code_block) << "begin" << endl;
-  indent_up_impl();
-
-  indent_impl(local_vars) << "tracker : IProtocolRecursionTracker;" << endl;
-  indent_impl(code_block) << "tracker := oprot.NextRecursionLevel;" << endl;
-
-  indent_impl(code_block) << "struc := TStructImpl.Create('" << name << "');" << endl;
-  indent_impl(code_block) << "oprot.WriteStructBegin(struc);" << endl;
-
-  if (fields.size() > 0) {
-    indent_impl(code_block) << "field_ := TFieldImpl.Create;" << endl;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      indent_impl(code_block) << "if (__isset_" << prop_name(*f_iter, is_exception) << ") then"
-                              << endl;
-      indent_impl(code_block) << "begin" << endl;
-      indent_up_impl();
-      indent_impl(code_block) << "field_.Name := '" << (*f_iter)->get_name() << "';" << endl;
-      indent_impl(code_block) << "field_.Type_  := " << type_to_enum((*f_iter)->get_type()) << ";"
-                              << endl;
-      indent_impl(code_block) << "field_.ID := " << (*f_iter)->get_key() << ";" << endl;
-      indent_impl(code_block) << "oprot.WriteFieldBegin(field_);" << endl;
-      generate_serialize_field(code_block, is_exception, *f_iter, "", local_vars);
-      indent_impl(code_block) << "oprot.WriteFieldEnd();" << endl;
-      indent_down_impl();
-    }
-  }
-
-  indent_impl(code_block) << "oprot.WriteFieldStop();" << endl;
-  indent_impl(code_block) << "oprot.WriteStructEnd();" << endl;
-
-  indent_down_impl();
-  indent_impl(code_block) << "end;" << endl << endl;
-
-  string cls_nm;
-
-  cls_nm = type_name(tstruct, true, false, is_exception, is_exception);
-
-  indent_impl(out) << "procedure " << cls_prefix << cls_nm << ".Write( const oprot: IProtocol);"
-                   << endl;
-  indent_impl(out) << "var" << endl;
-  indent_up_impl();
-  indent_impl(out) << "struc : IStruct;" << endl;
-
-  if (fields.size() > 0) {
-    indent_impl(out) << "field_ : IField;" << endl;
-  }
-
-  out << local_vars.str();
-  indent_down_impl();
-  out << code_block.str();
-}
-
-void t_delphi_generator::generate_delphi_struct_writer_impl(ostream& out,
-                                                            string cls_prefix,
-                                                            t_struct* tstruct,
-                                                            bool is_exception) {
-
-  ostringstream local_vars;
-  ostringstream code_block;
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent_impl(code_block) << "begin" << endl;
-  indent_up_impl();
-
-  indent_impl(local_vars) << "tracker : IProtocolRecursionTracker;" << endl;
-  indent_impl(code_block) << "tracker := oprot.NextRecursionLevel;" << endl;
-
-  indent_impl(code_block) << "struc := TStructImpl.Create('" << name << "');" << endl;
-  indent_impl(code_block) << "oprot.WriteStructBegin(struc);" << endl;
-
-  if (fields.size() > 0) {
-    indent_impl(code_block) << "field_ := TFieldImpl.Create;" << endl;
-  }
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    string fieldname = prop_name((*f_iter), is_exception);
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    bool is_required = ((*f_iter)->get_req() == t_field::T_REQUIRED);
-    bool has_isset = (!is_required);
-    if (is_required && null_allowed) {
-      null_allowed = false;
-      indent_impl(code_block) << "if (" << fieldname << " = nil)" << endl;
-	  indent_impl(code_block) << "then raise TProtocolExceptionInvalidData.Create("
-                              << "'required field " << fieldname << " not set');"
-                              << endl;
-    }
-    if (null_allowed) {
-      indent_impl(code_block) << "if (" << fieldname << " <> nil)";
-      if (has_isset) {
-        code_block << " and __isset_" << fieldname;
-      }
-      code_block << " then begin" << endl;
-      indent_up_impl();
-    } else {
-      if (has_isset) {
-        indent_impl(code_block) << "if (__isset_" << fieldname << ") then begin" << endl;
-        indent_up_impl();
-      }
-    }
-    indent_impl(code_block) << "field_.Name := '" << (*f_iter)->get_name() << "';" << endl;
-    indent_impl(code_block) << "field_.Type_  := " << type_to_enum((*f_iter)->get_type()) << ";"
-                            << endl;
-    indent_impl(code_block) << "field_.ID := " << (*f_iter)->get_key() << ";" << endl;
-    indent_impl(code_block) << "oprot.WriteFieldBegin(field_);" << endl;
-    generate_serialize_field(code_block, is_exception, *f_iter, "", local_vars);
-    indent_impl(code_block) << "oprot.WriteFieldEnd();" << endl;
-    if (null_allowed || has_isset) {
-      indent_down_impl();
-      indent_impl(code_block) << "end;" << endl;
-    }
-  }
-
-  indent_impl(code_block) << "oprot.WriteFieldStop();" << endl;
-  indent_impl(code_block) << "oprot.WriteStructEnd();" << endl;
-
-  indent_down_impl();
-  indent_impl(code_block) << "end;" << endl << endl;
-
-  string cls_nm;
-
-  cls_nm = type_name(tstruct, true, false, is_exception, is_exception);
-
-  indent_impl(out) << "procedure " << cls_prefix << cls_nm << ".Write( const oprot: IProtocol);"
-                   << endl;
-  indent_impl(out) << "var" << endl;
-  indent_up_impl();
-  indent_impl(out) << "struc : IStruct;" << endl;
-  if (fields.size() > 0) {
-    indent_impl(out) << "field_ : IField;" << endl;
-  }
-  out << local_vars.str();
-  indent_down_impl();
-  out << code_block.str();
-}
-
-void t_delphi_generator::generate_delphi_struct_tostring_impl(ostream& out,
-                                                              string cls_prefix,
-                                                              t_struct* tstruct,
-                                                              bool is_exception,
-                                                              bool is_x_factory) {
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  string cls_nm;
-
-  if (is_exception) {
-    cls_nm = type_name(tstruct, true, (!is_x_factory), is_x_factory, true);
-  } else {
-    cls_nm = type_name(tstruct, true, false);
-  }
-
-  string tmp_sb = tmp("_sb");
-  string tmp_first = tmp("_first");
-  bool useFirstFlag = false;
-
-  indent_impl(out) << "function " << cls_prefix << cls_nm << ".ToString: string;" << endl;
-  indent_impl(out) << "var" << endl;
-  indent_up_impl();
-  indent_impl(out) << tmp_sb << " : TThriftStringBuilder;" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool is_optional = ((*f_iter)->get_req() != t_field::T_REQUIRED);
-    if (is_optional) {
-      indent_impl(out) << tmp_first << " : Boolean;" << endl;
-      useFirstFlag = true;
-    }
-    break;
-  }
-  indent_down_impl();
-  indent_impl(out) << "begin" << endl;
-  indent_up_impl();
-
-  indent_impl(out) << tmp_sb << " := TThriftStringBuilder.Create('(');" << endl;
-  indent_impl(out) << "try" << endl;
-  indent_up_impl();
-
-  if (useFirstFlag) {
-    indent_impl(out) << tmp_first << " := TRUE;" << endl;
-  }
-
-  bool had_required = false; // set to true after first required field has been processed
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    bool is_optional = ((*f_iter)->get_req() != t_field::T_REQUIRED);
-    if (null_allowed) {
-      indent_impl(out) << "if (" << prop_name((*f_iter), is_exception) << " <> nil)";
-      if (is_optional) {
-        out << " and __isset_" << prop_name(*f_iter, is_exception);
-      }
-      out << " then begin" << endl;
-      indent_up_impl();
-    } else {
-      if (is_optional) {
-        indent_impl(out) << "if (__isset_" << prop_name(*f_iter, is_exception) << ") then begin"
-                         << endl;
-        indent_up_impl();
-      }
-    }
-
-    if (useFirstFlag && (!had_required)) {
-      indent_impl(out) << "if not " << tmp_first << " then " << tmp_sb << ".Append(',');" << endl;
-      if (is_optional) {
-        indent_impl(out) << tmp_first << " := FALSE;" << endl;
-      }
-      indent_impl(out) << tmp_sb << ".Append('" << prop_name((*f_iter), is_exception) << ": ');"
-                       << endl;
-    } else {
-      indent_impl(out) << tmp_sb << ".Append(', " << prop_name((*f_iter), is_exception) << ": ');"
-                       << endl;
-    }
-
-    t_type* ttype = (*f_iter)->get_type();
-    while (ttype->is_typedef()) {
-      ttype = ((t_typedef*)ttype)->get_type();
-    }
-
-    if (ttype->is_xception() || ttype->is_struct()) {
-      indent_impl(out) << "if (" << prop_name((*f_iter), is_exception) << " = nil) then " << tmp_sb
-                       << ".Append('<null>') else " << tmp_sb << ".Append("
-                       << prop_name((*f_iter), is_exception) << ".ToString());" << endl;
-    } else if (ttype->is_enum()) {
-      indent_impl(out) << tmp_sb << ".Append(Integer(" << prop_name((*f_iter), is_exception)
-                       << "));" << endl;
-    } else {
-      indent_impl(out) << tmp_sb << ".Append(" << prop_name((*f_iter), is_exception) << ");"
-                       << endl;
-    }
-
-    if (null_allowed || is_optional) {
-      indent_down_impl();
-      indent_impl(out) << "end;" << endl;
-    }
-
-    if (!is_optional) {
-      had_required = true; // now __first must be false, so we don't need to check it anymore
-    }
-  }
-
-  indent_impl(out) << tmp_sb << ".Append(')');" << endl;
-  indent_impl(out) << "Result := " << tmp_sb << ".ToString;" << endl;
-  if (useFirstFlag) {
-    indent_impl(out) << "if " << tmp_first << " then {prevent warning};" << endl;
-  }
-
-  indent_down_impl();
-  indent_impl(out) << "finally" << endl;
-  indent_up_impl();
-  indent_impl(out) << tmp_sb << ".Free;" << endl;
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl;
-
-  indent_down_impl();
-  indent_impl(out) << "end;" << endl << endl;
-}
-
-bool t_delphi_generator::is_void(t_type* type) {
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    if (tbase == t_base_type::TYPE_VOID) {
-      return true;
-    }
-  }
-  return false;
-}
-
-THRIFT_REGISTER_GENERATOR(
-    delphi,
-    "delphi",
-    "    ansistr_binary:  Use AnsiString for binary datatype (default is TBytes).\n"
-    "    register_types:  Enable TypeRegistry, allows for creation of struct, union\n"
-    "                     and container instances by interface or TypeInfo()\n"
-    "    constprefix:     Name TConstants classes after IDL to reduce ambiguities\n"
-    "    events:          Enable and use processing events in the generated code.\n"
-    "    xmldoc:          Enable XMLDoc comments for Help Insight etc.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_erl_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_erl_generator.cc
deleted file mode 100644
index 4869414..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_erl_generator.cc
+++ /dev/null
@@ -1,1169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/version.h"
-#include "thrift/generate/t_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const std::string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Erlang code generator.
- *
- */
-class t_erl_generator : public t_generator {
-public:
-  t_erl_generator(t_program* program,
-                  const std::map<std::string, std::string>& parsed_options,
-                  const std::string& option_string)
-    : t_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    legacy_names_ = false;
-    maps_ = false;
-    otp16_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("legacynames") == 0) {
-        legacy_names_ = true;
-      } else if( iter->first.compare("maps") == 0) {
-        maps_ = true;
-      } else if( iter->first.compare("otp16") == 0) {
-        otp16_ = true;
-      } else {
-        throw "unknown option erl:" + iter->first;
-      }
-    }
-
-    if (maps_ && otp16_) {
-      throw "argument error: Cannot specify both maps and otp16; maps are not available for Erlang/OTP R16 or older";
-    }
-
-    out_dir_base_ = "gen-erl";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-  void generate_member_type(std::ostream& out, t_type* type);
-  void generate_member_value(std::ostream& out, t_type* type, t_const_value* value);
-
-  std::string render_member_type(t_field* field);
-  std::string render_member_value(t_field* field);
-  std::string render_member_requiredness(t_field* field);
-
-  //  std::string render_default_value(t_type* type);
-  std::string render_default_value(t_field* field);
-  std::string render_const_value(t_type* type, t_const_value* value);
-  std::string render_type_term(t_type* ttype, bool expand_structs, bool extended_info = false);
-
-  /**
-   * Struct generation code
-   */
-
-  void generate_erl_struct(t_struct* tstruct, bool is_exception);
-  void generate_erl_struct_definition(std::ostream& out, t_struct* tstruct);
-  void generate_erl_struct_member(std::ostream& out, t_field* tmember);
-  void generate_erl_struct_info(std::ostream& out, t_struct* tstruct);
-  void generate_erl_extended_struct_info(std::ostream& out, t_struct* tstruct);
-  void generate_erl_function_helpers(t_function* tfunction);
-  void generate_type_metadata(std::string function_name, vector<string> names);
-  void generate_enum_info(t_enum* tenum);
-  void generate_enum_metadata();
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_metadata(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_function_info(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string erl_autogen_comment();
-  std::string erl_imports();
-  std::string render_includes();
-  std::string type_name(t_type* ttype);
-
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-  std::string type_module(t_type* ttype);
-
-  std::string make_safe_for_module_name(std::string in) {
-    if (legacy_names_) {
-      return decapitalize(in);
-    } else {
-      return underscore(in);
-    }
-  }
-
-  std::string atomify(std::string in) {
-    if (legacy_names_) {
-      return "'" + decapitalize(in) + "'";
-    } else {
-      return "'" + in + "'";
-    }
-  }
-
-  std::string constify(std::string in) {
-    if (legacy_names_) {
-      return capitalize(in);
-    } else {
-      return uppercase(in);
-    }
-  }
-
-  static std::string comment(string in);
-
-private:
-  bool has_default_value(t_field*);
-
-  /* if true retain pre 0.9.2 naming scheme for functions, atoms and consts */
-  bool legacy_names_;
-
-  /* if true use maps instead of dicts in generated code */
-  bool maps_;
-
-  /* if true use non-namespaced dict and set instead of dict:dict and sets:set */
-  bool otp16_;
-
-  /**
-   * add function to export list
-   */
-
-  void export_function(t_function* tfunction, std::string prefix = "");
-  void export_string(std::string name, int num);
-
-  void export_types_function(t_function* tfunction, std::string prefix = "");
-  void export_types_string(std::string name, int num);
-
-  /**
-   * write out headers and footers for hrl files
-   */
-
-  void hrl_header(std::ostream& out, std::string name);
-  void hrl_footer(std::ostream& out, std::string name);
-
-  /**
-   * stuff to spit out at the top of generated files
-   */
-
-  bool export_lines_first_;
-  std::ostringstream export_lines_;
-
-  bool export_types_lines_first_;
-  std::ostringstream export_types_lines_;
-
-  /**
-   * File streams
-   */
-
-  std::ostringstream f_info_;
-  std::ostringstream f_info_ext_;
-
-  std::ofstream f_types_file_;
-  std::ofstream f_types_hrl_file_;
-
-  std::ofstream f_consts_;
-  std::ostringstream f_service_;
-  std::ofstream f_service_file_;
-  std::ofstream f_service_hrl_;
-
-  /**
-   * Metadata containers
-   */
-  std::vector<std::string> v_struct_names_;
-  std::vector<std::string> v_enum_names_;
-  std::vector<std::string> v_exception_names_;
-  std::vector<t_enum*> v_enums_;
-};
-
-/**
- * UI for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_erl_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  // setup export lines
-  export_lines_first_ = true;
-  export_types_lines_first_ = true;
-
-  // types files
-  string f_types_name = get_out_dir() + make_safe_for_module_name(program_name_) + "_types.erl";
-  string f_types_hrl_name = get_out_dir() + make_safe_for_module_name(program_name_) + "_types.hrl";
-
-  f_types_file_.open(f_types_name.c_str());
-  f_types_hrl_file_.open(f_types_hrl_name.c_str());
-
-  hrl_header(f_types_hrl_file_, make_safe_for_module_name(program_name_) + "_types");
-
-  f_types_file_ << erl_autogen_comment() << endl << "-module("
-                << make_safe_for_module_name(program_name_) << "_types)." << endl << erl_imports()
-                << endl;
-
-  f_types_file_ << "-include(\"" << make_safe_for_module_name(program_name_) << "_types.hrl\")."
-                << endl << endl;
-
-  f_types_hrl_file_ << render_includes() << endl;
-
-  // consts file
-  string f_consts_name = get_out_dir() + make_safe_for_module_name(program_name_)
-                         + "_constants.hrl";
-  f_consts_.open(f_consts_name.c_str());
-
-  f_consts_ << erl_autogen_comment() << endl << erl_imports() << endl << "-include(\""
-            << make_safe_for_module_name(program_name_) << "_types.hrl\")." << endl << endl;
-}
-
-/**
- * Boilerplate at beginning and end of header files
- */
-void t_erl_generator::hrl_header(ostream& out, string name) {
-  out << "-ifndef(_" << name << "_included)." << endl << "-define(_" << name << "_included, yeah)."
-      << endl;
-}
-
-void t_erl_generator::hrl_footer(ostream& out, string name) {
-  (void)name;
-  out << "-endif." << endl;
-}
-
-/**
- * Renders all the imports necessary for including another Thrift program
- */
-string t_erl_generator::render_includes() {
-  const vector<t_program*>& includes = program_->get_includes();
-  string result = "";
-  for (size_t i = 0; i < includes.size(); ++i) {
-    result += "-include(\"" + make_safe_for_module_name(includes[i]->get_name())
-              + "_types.hrl\").\n";
-  }
-  if (includes.size() > 0) {
-    result += "\n";
-  }
-  return result;
-}
-
-/**
- * Autogen'd comment
- */
-string t_erl_generator::erl_autogen_comment() {
-  return std::string("%%\n") + "%% Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-         + "%%\n" + "%% DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n"
-         + "%%\n";
-}
-
-/**
- * Comment out text
- */
-
-string t_erl_generator::comment(string in) {
-  size_t pos = 0;
-  in.insert(pos, "%% ");
-  while ((pos = in.find_first_of('\n', pos)) != string::npos) {
-    in.insert(++pos, "%% ");
-  }
-  return in;
-}
-
-/**
- * Prints standard thrift imports
- */
-string t_erl_generator::erl_imports() {
-  return "";
-}
-
-/**
- * Closes the type files
- */
-void t_erl_generator::close_generator() {
-
-  export_types_string("struct_info", 1);
-  export_types_string("struct_info_ext", 1);
-  export_types_string("enum_info", 1);
-  export_types_string("enum_names", 0);
-  export_types_string("struct_names", 0);
-  export_types_string("exception_names", 0);
-
-  f_types_file_ << "-export([" << export_types_lines_.str() << "])." << endl << endl;
-
-  f_types_file_ << f_info_.str();
-  f_types_file_ << "struct_info(_) -> erlang:error(function_clause)." << endl << endl;
-
-  f_types_file_ << f_info_ext_.str();
-  f_types_file_ << "struct_info_ext(_) -> erlang:error(function_clause)." << endl << endl;
-
-  generate_type_metadata("struct_names", v_struct_names_);
-  generate_enum_metadata();
-  generate_type_metadata("enum_names", v_enum_names_);
-  generate_type_metadata("exception_names", v_exception_names_);
-
-  hrl_footer(f_types_hrl_file_, string("BOGUS"));
-
-  f_types_file_.close();
-  f_types_hrl_file_.close();
-  f_consts_.close();
-}
-
-void t_erl_generator::generate_type_metadata(std::string function_name, vector<string> names) {
-  vector<string>::iterator s_iter;
-  size_t num_structs = names.size();
-
-  indent(f_types_file_) << function_name << "() ->\n";
-  indent_up();
-  indent(f_types_file_) << "[";
-
-
-  for(size_t i=0; i < num_structs; i++) {
-    f_types_file_ << names.at(i);
-
-    if (i < num_structs - 1) {
-      f_types_file_ << ", ";
-    }
-  }
-
-  f_types_file_ << "].\n\n";
-  indent_down();
-}
-
-/**
- * Generates a typedef. no op
- *
- * @param ttypedef The type definition
- */
-void t_erl_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Generates code for an enumerated type. Done using a class to scope
- * the values.
- *
- * @param tenum The enumeration
- */
-void t_erl_generator::generate_enum(t_enum* tenum) {
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-
-  v_enums_.push_back(tenum);
-  v_enum_names_.push_back(atomify(tenum->get_name()));
-
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    string name = (*c_iter)->get_name();
-    indent(f_types_hrl_file_) << "-define(" << constify(make_safe_for_module_name(program_name_))
-                              << "_" << constify(tenum->get_name()) << "_" << constify(name) << ", "
-                              << value << ")." << endl;
-  }
-
-  f_types_hrl_file_ << endl;
-}
-
-void t_erl_generator::generate_enum_info(t_enum* tenum){
-  vector<t_enum_value*> constants = tenum->get_constants();
-  size_t num_constants = constants.size();
-
-  indent(f_types_file_) << "enum_info(" << atomify(tenum->get_name()) << ") ->\n";
-  indent_up();
-  indent(f_types_file_) << "[\n";
-
-  for(size_t i=0; i < num_constants; i++) {
-    indent_up();
-    t_enum_value* value = constants.at(i);
-    indent(f_types_file_) << "{" << atomify(value->get_name()) << ", " << value->get_value() << "}";
-
-    if (i < num_constants - 1) {
-      f_types_file_ << ",\n";
-    }
-    indent_down();
-  }
-  f_types_file_ << "\n";
-  indent(f_types_file_) << "];\n\n";
-  indent_down();
-}
-
-void t_erl_generator::generate_enum_metadata() {
-  size_t enum_count = v_enums_.size();
-
-  for(size_t i=0; i < enum_count; i++) {
-    t_enum* tenum = v_enums_.at(i);
-    generate_enum_info(tenum);
-  }
-
-  indent(f_types_file_) << "enum_info(_) -> erlang:error(function_clause).\n\n";
-}
-
-/**
- * Generate a constant value
- */
-void t_erl_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = tconst->get_name();
-  t_const_value* value = tconst->get_value();
-
-  f_consts_ << "-define(" << constify(make_safe_for_module_name(program_name_)) << "_"
-            << constify(name) << ", " << render_const_value(type, value) << ")." << endl << endl;
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_erl_generator::render_const_value(t_type* type, t_const_value* value) {
-  type = get_true_type(type);
-  std::ostringstream out;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    indent(out) << value->get_integer();
-
-  } else if (type->is_struct() || type->is_xception()) {
-    out << "#" << type_name(type) << "{";
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    bool first = true;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-
-      if (first) {
-        first = false;
-      } else {
-        out << ",";
-      }
-      out << v_iter->first->get_string();
-      out << " = ";
-      out << render_const_value(field_type, v_iter->second);
-    }
-    indent_down();
-    indent(out) << "}";
-
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-
-    if (maps_) {
-      out << "maps:from_list([";
-    } else {
-      out << "dict:from_list([";
-    }
-    map<t_const_value*, t_const_value*>::const_iterator i, end = value->get_map().end();
-    for (i = value->get_map().begin(); i != end;) {
-      out << "{" << render_const_value(ktype, i->first) << ","
-          << render_const_value(vtype, i->second) << "}";
-      if (++i != end) {
-        out << ",";
-      }
-    }
-    out << "])";
-  } else if (type->is_set()) {
-    t_type* etype = ((t_set*)type)->get_elem_type();
-    out << "sets:from_list([";
-    vector<t_const_value*>::const_iterator i, end = value->get_list().end();
-    for (i = value->get_list().begin(); i != end;) {
-      out << render_const_value(etype, *i);
-      if (++i != end) {
-        out << ",";
-      }
-    }
-    out << "])";
-  } else if (type->is_list()) {
-    t_type* etype;
-    etype = ((t_list*)type)->get_elem_type();
-    out << "[";
-
-    bool first = true;
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      if (first) {
-        first = false;
-      } else {
-        out << ",";
-      }
-      out << render_const_value(etype, *v_iter);
-    }
-    out << "]";
-  } else {
-    throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
-  }
-  return out.str();
-}
-
-string t_erl_generator::render_default_value(t_field* field) {
-  t_type* type = field->get_type();
-  if (type->is_struct() || type->is_xception()) {
-    return "#" + type_name(type) + "{}";
-  } else if (type->is_map()) {
-    if (maps_) {
-      return "#{}";
-    } else {
-      return "dict:new()";
-    }
-  } else if (type->is_set()) {
-    return "sets:new()";
-  } else if (type->is_list()) {
-    return "[]";
-  } else {
-    return "undefined";
-  }
-}
-
-string t_erl_generator::render_member_type(t_field* field) {
-  t_type* type = get_true_type(field->get_type());
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      return "string() | binary()";
-    case t_base_type::TYPE_BOOL:
-      return "boolean()";
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      return "integer()";
-    case t_base_type::TYPE_DOUBLE:
-      return "float()";
-    default:
-      throw "compiler error: unsupported base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    return "integer()";
-  } else if (type->is_struct() || type->is_xception()) {
-    return type_name(type) + "()";
-  } else if (type->is_map()) {
-    if (maps_) {
-      return "#{}";
-    } else if (otp16_) {
-      return "dict()";
-    } else {
-      return "dict:dict()";
-    }
-  } else if (type->is_set()) {
-    if (otp16_) {
-      return "set()";
-    } else {
-      return "sets:set()";
-    }
-  } else if (type->is_list()) {
-    return "list()";
-  } else {
-    throw "compiler error: unsupported type " + type->get_name();
-  }
-}
-
-string t_erl_generator::render_member_requiredness(t_field* field) {
-  switch (field->get_req()) {
-  case t_field::T_REQUIRED:
-    return "required";
-  case t_field::T_OPTIONAL:
-    return "optional";
-  default:
-    return "undefined";
-  }
-}
-
-/**
- * Generates a struct
- */
-void t_erl_generator::generate_struct(t_struct* tstruct) {
-  v_struct_names_.push_back(type_name(tstruct));
-  generate_erl_struct(tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct but extends the Exception class.
- *
- * @param txception The struct definition
- */
-void t_erl_generator::generate_xception(t_struct* txception) {
-  v_exception_names_.push_back(type_name(txception));
-  generate_erl_struct(txception, true);
-}
-
-/**
- * Generates a struct
- */
-void t_erl_generator::generate_erl_struct(t_struct* tstruct, bool is_exception) {
-  (void)is_exception;
-  generate_erl_struct_definition(f_types_hrl_file_, tstruct);
-  generate_erl_struct_info(f_info_, tstruct);
-  generate_erl_extended_struct_info(f_info_ext_, tstruct);
-}
-
-/**
- * Generates a struct definition for a thrift data type.
- *
- * @param tstruct The struct definition
- */
-void t_erl_generator::generate_erl_struct_definition(ostream& out, t_struct* tstruct) {
-  indent(out) << "%% struct " << type_name(tstruct) << endl << endl;
-
-  std::stringstream buf;
-  buf << indent() << "-record(" << type_name(tstruct) << ", {";
-  string field_indent(buf.str().size(), ' ');
-
-  const vector<t_field*>& members = tstruct->get_members();
-  for (vector<t_field*>::const_iterator m_iter = members.begin(); m_iter != members.end();) {
-    generate_erl_struct_member(buf, *m_iter);
-    if (++m_iter != members.end()) {
-      buf << "," << endl << field_indent;
-    }
-  }
-  buf << "}).";
-
-  out << buf.str() << endl;
-  out << "-type " + type_name(tstruct) << "() :: #" + type_name(tstruct) + "{}." << endl << endl;
-}
-
-/**
- * Generates the record field definition
- */
-
-void t_erl_generator::generate_erl_struct_member(ostream& out, t_field* tmember) {
-  out << atomify(tmember->get_name());
-  if (has_default_value(tmember))
-    out << " = " << render_member_value(tmember);
-  out << " :: " << render_member_type(tmember);
-}
-
-bool t_erl_generator::has_default_value(t_field* field) {
-  t_type* type = field->get_type();
-  if (!field->get_value()) {
-    if (field->get_req() == t_field::T_REQUIRED) {
-      if (type->is_struct() || type->is_xception() || type->is_map() || type->is_set()
-          || type->is_list()) {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  } else {
-    return true;
-  }
-}
-
-string t_erl_generator::render_member_value(t_field* field) {
-  if (!field->get_value()) {
-    return render_default_value(field);
-  } else {
-    return render_const_value(field->get_type(), field->get_value());
-  }
-}
-
-/**
- * Generates the read method for a struct
- */
-void t_erl_generator::generate_erl_struct_info(ostream& out, t_struct* tstruct) {
-  indent(out) << "struct_info(" << type_name(tstruct) << ") ->" << endl;
-  indent_up();
-  out << indent() << render_type_term(tstruct, true) << ";" << endl;
-  indent_down();
-  out << endl;
-}
-
-void t_erl_generator::generate_erl_extended_struct_info(ostream& out, t_struct* tstruct) {
-  indent(out) << "struct_info_ext(" << type_name(tstruct) << ") ->" << endl;
-  indent_up();
-  out << indent() << render_type_term(tstruct, true, true) << ";" << endl;
-  indent_down();
-  out << endl;
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_erl_generator::generate_service(t_service* tservice) {
-  service_name_ = make_safe_for_module_name(service_name_);
-
-  string f_service_hrl_name = get_out_dir() + service_name_ + "_thrift.hrl";
-  string f_service_name = get_out_dir() + service_name_ + "_thrift.erl";
-  f_service_file_.open(f_service_name.c_str());
-  f_service_hrl_.open(f_service_hrl_name.c_str());
-
-  // Reset service text aggregating stream streams
-  f_service_.str("");
-  export_lines_.str("");
-  export_lines_first_ = true;
-
-  hrl_header(f_service_hrl_, service_name_);
-
-  if (tservice->get_extends() != NULL) {
-    f_service_hrl_ << "-include(\""
-                   << make_safe_for_module_name(tservice->get_extends()->get_name())
-                   << "_thrift.hrl\"). % inherit " << endl;
-  }
-
-  f_service_hrl_ << "-include(\"" << make_safe_for_module_name(program_name_) << "_types.hrl\")."
-                 << endl << endl;
-
-  // Generate the three main parts of the service (well, two for now in PHP)
-  generate_service_helpers(tservice); // cpiro: New Erlang Order
-
-  generate_service_interface(tservice);
-
-  generate_service_metadata(tservice);
-
-  // indent_down();
-
-  f_service_file_ << erl_autogen_comment() << endl << "-module(" << service_name_ << "_thrift)."
-                  << endl << "-behaviour(thrift_service)." << endl << endl << erl_imports() << endl;
-
-  f_service_file_ << "-include(\"" << make_safe_for_module_name(tservice->get_name())
-                  << "_thrift.hrl\")." << endl << endl;
-
-  f_service_file_ << "-export([" << export_lines_.str() << "])." << endl << endl;
-
-  f_service_file_ << f_service_.str();
-
-  hrl_footer(f_service_hrl_, f_service_name);
-
-  // Close service file
-  f_service_file_.close();
-  f_service_hrl_.close();
-}
-
-void t_erl_generator::generate_service_metadata(t_service* tservice) {
-  export_string("function_names", 0);
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  size_t num_functions = functions.size();
-
-  indent(f_service_) << "function_names() -> " << endl;
-  indent_up();
-  indent(f_service_) << "[";
-
-  for (size_t i=0; i < num_functions; i++) {
-    t_function* current = functions.at(i);
-    f_service_ << atomify(current->get_name());
-    if (i < num_functions - 1) {
-      f_service_ << ", ";
-    }
-  }
-
-  f_service_ << "].\n\n";
-  indent_down();
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_erl_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  //  indent(f_service_) <<
-  //  "% HELPER FUNCTIONS AND STRUCTURES" << endl << endl;
-
-  export_string("struct_info", 1);
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_erl_function_helpers(*f_iter);
-  }
-  f_service_ << "struct_info(_) -> erlang:error(function_clause)." << endl;
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_erl_generator::generate_erl_function_helpers(t_function* tfunction) {
-  (void)tfunction;
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_erl_generator::generate_service_interface(t_service* tservice) {
-
-  export_string("function_info", 2);
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  f_service_ << "%%% interface" << endl;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << indent() << "% " << function_signature(*f_iter) << endl;
-
-    generate_function_info(tservice, *f_iter);
-  }
-
-  // Inheritance - pass unknown functions to base class
-  if (tservice->get_extends() != NULL) {
-    indent(f_service_) << "function_info(Function, InfoType) ->" << endl;
-    indent_up();
-    indent(f_service_) << make_safe_for_module_name(tservice->get_extends()->get_name())
-                       << "_thrift:function_info(Function, InfoType)." << endl;
-    indent_down();
-  } else {
-    // return function_clause error for non-existent functions
-    indent(f_service_) << "function_info(_Func, _Info) -> erlang:error(function_clause)." << endl;
-  }
-
-  indent(f_service_) << endl;
-}
-
-/**
- * Generates a function_info(FunctionName, params_type) and
- * function_info(FunctionName, reply_type)
- */
-void t_erl_generator::generate_function_info(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  string name_atom = atomify(tfunction->get_name());
-
-  t_struct* xs = tfunction->get_xceptions();
-  t_struct* arg_struct = tfunction->get_arglist();
-
-  // function_info(Function, params_type):
-  indent(f_service_) << "function_info(" << name_atom << ", params_type) ->" << endl;
-  indent_up();
-
-  indent(f_service_) << render_type_term(arg_struct, true) << ";" << endl;
-
-  indent_down();
-
-  // function_info(Function, reply_type):
-  indent(f_service_) << "function_info(" << name_atom << ", reply_type) ->" << endl;
-  indent_up();
-
-  if (!tfunction->get_returntype()->is_void())
-    indent(f_service_) << render_type_term(tfunction->get_returntype(), false) << ";" << endl;
-  else if (tfunction->is_oneway())
-    indent(f_service_) << "oneway_void;" << endl;
-  else
-    indent(f_service_) << "{struct, []}"
-                       << ";" << endl;
-  indent_down();
-
-  // function_info(Function, exceptions):
-  indent(f_service_) << "function_info(" << name_atom << ", exceptions) ->" << endl;
-  indent_up();
-  indent(f_service_) << render_type_term(xs, true) << ";" << endl;
-  indent_down();
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_erl_generator::function_signature(t_function* tfunction, string prefix) {
-  return prefix + tfunction->get_name() + "(This"
-         + capitalize(argument_list(tfunction->get_arglist())) + ")";
-}
-
-/**
- * Add a function to the exports list
- */
-void t_erl_generator::export_string(string name, int num) {
-  if (export_lines_first_) {
-    export_lines_first_ = false;
-  } else {
-    export_lines_ << ", ";
-  }
-  export_lines_ << name << "/" << num;
-}
-
-void t_erl_generator::export_types_function(t_function* tfunction, string prefix) {
-
-  export_types_string(prefix + tfunction->get_name(),
-                      1 // This
-                      + ((tfunction->get_arglist())->get_members()).size());
-}
-
-void t_erl_generator::export_types_string(string name, int num) {
-  if (export_types_lines_first_) {
-    export_types_lines_first_ = false;
-  } else {
-    export_types_lines_ << ", ";
-  }
-  export_types_lines_ << name << "/" << num;
-}
-
-void t_erl_generator::export_function(t_function* tfunction, string prefix) {
-
-  export_string(prefix + tfunction->get_name(),
-                1 // This
-                + ((tfunction->get_arglist())->get_members()).size());
-}
-
-/**
- * Renders a field list
- */
-string t_erl_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      result += ", "; // initial comma to compensate for initial This
-    } else {
-      result += ", ";
-    }
-    result += capitalize((*f_iter)->get_name());
-  }
-  return result;
-}
-
-string t_erl_generator::type_name(t_type* ttype) {
-  string prefix = "";
-  string erl_namespace = ttype->get_program()->get_namespace("erl");
-
-  if (erl_namespace.length() > 0) {
-    prefix = erl_namespace + ".";
-  }
-
-  string name = ttype->get_name();
-
-  if (ttype->is_struct() || ttype->is_xception() || ttype->is_service()) {
-    name = ttype->get_name();
-  }
-
-  return atomify(prefix + name);
-}
-
-/**
- * Converts the parse type to a Erlang "type" (macro for int constants)
- */
-string t_erl_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "?tType_STRING";
-    case t_base_type::TYPE_BOOL:
-      return "?tType_BOOL";
-    case t_base_type::TYPE_I8:
-      return "?tType_I8";
-    case t_base_type::TYPE_I16:
-      return "?tType_I16";
-    case t_base_type::TYPE_I32:
-      return "?tType_I32";
-    case t_base_type::TYPE_I64:
-      return "?tType_I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "?tType_DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "?tType_I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "?tType_STRUCT";
-  } else if (type->is_map()) {
-    return "?tType_MAP";
-  } else if (type->is_set()) {
-    return "?tType_SET";
-  } else if (type->is_list()) {
-    return "?tType_LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Generate an Erlang term which represents a thrift type
- */
-std::string t_erl_generator::render_type_term(t_type* type,
-                                              bool expand_structs,
-                                              bool extended_info) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "string";
-    case t_base_type::TYPE_BOOL:
-      return "bool";
-    case t_base_type::TYPE_I8:
-      return "byte";
-    case t_base_type::TYPE_I16:
-      return "i16";
-    case t_base_type::TYPE_I32:
-      return "i32";
-    case t_base_type::TYPE_I64:
-      return "i64";
-    case t_base_type::TYPE_DOUBLE:
-      return "double";
-    }
-  } else if (type->is_enum()) {
-    return "i32";
-  } else if (type->is_struct() || type->is_xception()) {
-    if (expand_structs) {
-
-      std::stringstream buf;
-      buf << "{struct, [";
-      string field_indent(buf.str().size(), ' ');
-
-      t_struct::members_type const& fields = static_cast<t_struct*>(type)->get_members();
-      t_struct::members_type::const_iterator i, end = fields.end();
-      for (i = fields.begin(); i != end;) {
-        t_struct::members_type::value_type member = *i;
-        int32_t key = member->get_key();
-        string type = render_type_term(member->get_type(), false, false); // recursive call
-
-        if (!extended_info) {
-          // Convert to format: {struct, [{Fid, Type}|...]}
-          buf << "{" << key << ", " << type << "}";
-        } else {
-          // Convert to format: {struct, [{Fid, Req, Type, Name, Def}|...]}
-          string name = member->get_name();
-          string value = render_member_value(member);
-          string requiredness = render_member_requiredness(member);
-          buf << "{" << key << ", " << requiredness << ", " << type << ", " << atomify(name) << ", "
-              << value << "}";
-        }
-
-        if (++i != end) {
-          buf << "," << endl << field_indent;
-        }
-      }
-
-      buf << "]}" << endl;
-      return buf.str();
-    } else {
-      return "{struct, {" + atomify(type_module(type)) + ", " + type_name(type) + "}}";
-    }
-  } else if (type->is_map()) {
-    // {map, KeyType, ValType}
-    t_type* key_type = ((t_map*)type)->get_key_type();
-    t_type* val_type = ((t_map*)type)->get_val_type();
-
-    return "{map, " + render_type_term(key_type, false) + ", " + render_type_term(val_type, false)
-           + "}";
-
-  } else if (type->is_set()) {
-    t_type* elem_type = ((t_set*)type)->get_elem_type();
-
-    return "{set, " + render_type_term(elem_type, false) + "}";
-
-  } else if (type->is_list()) {
-    t_type* elem_type = ((t_list*)type)->get_elem_type();
-
-    return "{list, " + render_type_term(elem_type, false) + "}";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-std::string t_erl_generator::type_module(t_type* ttype) {
-  return make_safe_for_module_name(ttype->get_program()->get_name()) + "_types";
-}
-
-THRIFT_REGISTER_GENERATOR(
-    erl,
-    "Erlang",
-    "    legacynames: Output files retain naming conventions of Thrift 0.9.1 and earlier.\n"
-    "    maps:        Generate maps instead of dicts.\n"
-    "    otp16:       Generate non-namespaced dict and set instead of dict:dict and sets:set.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator.cc
deleted file mode 100644
index 0c1f49d..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator.cc
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "thrift/generate/t_generator.h"
-using namespace std;
-
-/**
- * Top level program generation function. Calls the generator subclass methods
- * for preparing file streams etc. then iterates over all the parts of the
- * program to perform the correct actions.
- *
- * @param program The thrift program to compile into C++ source
- */
-void t_generator::generate_program() {
-  // Initialize the generator
-  init_generator();
-
-  // Generate enums
-  vector<t_enum*> enums = program_->get_enums();
-  vector<t_enum*>::iterator en_iter;
-  for (en_iter = enums.begin(); en_iter != enums.end(); ++en_iter) {
-    generate_enum(*en_iter);
-  }
-
-  // Generate typedefs
-  vector<t_typedef*> typedefs = program_->get_typedefs();
-  vector<t_typedef*>::iterator td_iter;
-  for (td_iter = typedefs.begin(); td_iter != typedefs.end(); ++td_iter) {
-    generate_typedef(*td_iter);
-  }
-
-  // Generate structs, exceptions, and unions in declared order
-  vector<t_struct*> objects = program_->get_objects();
-
-  vector<t_struct*>::iterator o_iter;
-  for (o_iter = objects.begin(); o_iter != objects.end(); ++o_iter) {
-    generate_forward_declaration(*o_iter);
-  }
-  for (o_iter = objects.begin(); o_iter != objects.end(); ++o_iter) {
-    if ((*o_iter)->is_xception()) {
-      generate_xception(*o_iter);
-    } else {
-      generate_struct(*o_iter);
-    }
-  }
-
-  // Generate constants
-  vector<t_const*> consts = program_->get_consts();
-  generate_consts(consts);
-
-  // Generate services
-  vector<t_service*> services = program_->get_services();
-  vector<t_service*>::iterator sv_iter;
-  for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-    service_name_ = get_service_name(*sv_iter);
-    generate_service(*sv_iter);
-  }
-
-  // Close the generator
-  close_generator();
-}
-
-string t_generator::escape_string(const string& in) const {
-  string result = "";
-  for (string::const_iterator it = in.begin(); it < in.end(); it++) {
-    std::map<char, std::string>::const_iterator res = escape_.find(*it);
-    if (res != escape_.end()) {
-      result.append(res->second);
-    } else {
-      result.push_back(*it);
-    }
-  }
-  return result;
-}
-
-void t_generator::generate_consts(vector<t_const*> consts) {
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    generate_const(*c_iter);
-  }
-}
-
-void t_generator::generate_docstring_comment(ostream& out,
-                                             const string& comment_start,
-                                             const string& line_prefix,
-                                             const string& contents,
-                                             const string& comment_end) {
-  if (comment_start != "")
-    indent(out) << comment_start;
-  stringstream docs(contents, ios_base::in);
-  while (!(docs.eof() || docs.fail())) {
-    char line[1024];
-    docs.getline(line, 1024);
-
-    // Just prnt a newline when the line & prefix are empty.
-    if (strlen(line) == 0 && line_prefix == "" && !docs.eof()) {
-      out << std::endl;
-    } else if (strlen(line) > 0 || !docs.eof()) { // skip the empty last line
-      indent(out) << line_prefix << line << std::endl;
-    }
-  }
-  if (comment_end != "")
-    indent(out) << comment_end;
-}
-
-void t_generator_registry::register_generator(t_generator_factory* factory) {
-  gen_map_t& the_map = get_generator_map();
-  if (the_map.find(factory->get_short_name()) != the_map.end()) {
-    failure("Duplicate generators for language \"%s\"!\n", factory->get_short_name().c_str());
-  }
-  the_map[factory->get_short_name()] = factory;
-}
-
-void t_generator::parse_options(const string& options,
-                                string& language,
-                                map<string, string>& parsed_options) {
-  string::size_type colon = options.find(':');
-  language = options.substr(0, colon);
-
-  if (colon != string::npos) {
-    string::size_type pos = colon + 1;
-    while (pos != string::npos && pos < options.size()) {
-      string::size_type next_pos = options.find(',', pos);
-      string option = options.substr(pos, next_pos - pos);
-      pos = ((next_pos == string::npos) ? next_pos : next_pos + 1);
-
-      string::size_type separator = option.find('=');
-      string key, value;
-      if (separator == string::npos) {
-        key = option;
-        value = "";
-      } else {
-        key = option.substr(0, separator);
-        value = option.substr(separator + 1);
-      }
-
-      parsed_options[key] = value;
-    }
-  }
-}
-
-t_generator* t_generator_registry::get_generator(t_program* program,
-                                                 const string& language,
-                                                 const map<string, string>& parsed_options,
-                                                 const std::string& options) {
-  gen_map_t& the_map = get_generator_map();
-  gen_map_t::iterator iter = the_map.find(language);
-
-  if (iter == the_map.end()) {
-    return NULL;
-  }
-
-  return iter->second->get_generator(program, parsed_options, options);
-}
-
-t_generator* t_generator_registry::get_generator(t_program* program, const string& options) {
-  string language;
-  map<string, string> parsed_options;
-  t_generator::parse_options(options, language, parsed_options);
-  return get_generator(program, language, parsed_options, options);
-}
-
-t_generator_registry::gen_map_t& t_generator_registry::get_generator_map() {
-  // http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.12
-  static gen_map_t* the_map = new gen_map_t();
-  return *the_map;
-}
-
-t_generator_factory::t_generator_factory(const std::string& short_name,
-                                         const std::string& long_name,
-                                         const std::string& documentation)
-  : short_name_(short_name), long_name_(long_name), documentation_(documentation) {
-  t_generator_registry::register_generator(this);
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator.h
deleted file mode 100644
index 051bbc4..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_GENERATOR_H
-#define T_GENERATOR_H
-
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include "thrift/common.h"
-#include "thrift/version.h"
-#include "thrift/generate/t_generator_registry.h"
-#include "thrift/parse/t_program.h"
-
-/**
- * Base class for a thrift code generator. This class defines the basic
- * routines for code generation and contains the top level method that
- * dispatches code generation across various components.
- *
- */
-class t_generator {
-public:
-  t_generator(t_program* program) {
-    tmp_ = 0;
-    indent_ = 0;
-    program_ = program;
-    program_name_ = get_program_name(program);
-    escape_['\n'] = "\\n";
-    escape_['\r'] = "\\r";
-    escape_['\t'] = "\\t";
-    escape_['"'] = "\\\"";
-    escape_['\\'] = "\\\\";
-  }
-
-  virtual ~t_generator() {}
-
-  /**
-   * Framework generator method that iterates over all the parts of a program
-   * and performs general actions. This is implemented by the base class and
-   * should not normally be overwritten in the subclasses.
-   */
-  virtual void generate_program();
-
-  const t_program* get_program() const { return program_; }
-
-  void generate_docstring_comment(std::ostream& out,
-                                  const std::string& comment_start,
-                                  const std::string& line_prefix,
-                                  const std::string& contents,
-                                  const std::string& comment_end);
-
-  static void parse_options(const std::string& options, std::string& language,
-                     std::map<std::string, std::string>& parsed_options);
-
-  /**
-   * check whether sub-namespace declaraction is used by generator.
-   * e.g. allow
-   * namespace py.twisted bar
-   * to specify namespace to use when -gen py:twisted is specified.
-   * Will be called with subnamespace, i.e. is_valid_namespace("twisted")
-   * will be called for the above example.
-   */
-  static bool is_valid_namespace(const std::string& sub_namespace) {
-    (void)sub_namespace;
-    return false;
-  }
-
-  /**
-   * Escape string to use one in generated sources.
-   */
-  virtual std::string escape_string(const std::string& in) const;
-
-  std::string get_escaped_string(t_const_value* constval) {
-    return escape_string(constval->get_string());
-  }
-
-protected:
-  /**
-   * Optional methods that may be imlemented by subclasses to take necessary
-   * steps at the beginning or end of code generation.
-   */
-
-  virtual void init_generator() {}
-  virtual void close_generator() {}
-
-  virtual void generate_consts(std::vector<t_const*> consts);
-
-  /**
-   * Pure virtual methods implemented by the generator subclasses.
-   */
-
-  virtual void generate_typedef(t_typedef* ttypedef) = 0;
-  virtual void generate_enum(t_enum* tenum) = 0;
-  virtual void generate_const(t_const* tconst) { (void)tconst; }
-  virtual void generate_struct(t_struct* tstruct) = 0;
-  virtual void generate_service(t_service* tservice) = 0;
-  virtual void generate_forward_declaration(t_struct*) {}
-  virtual void generate_xception(t_struct* txception) {
-    // By default exceptions are the same as structs
-    generate_struct(txception);
-  }
-
-  /**
-   * Method to get the program name, may be overridden
-   */
-  virtual std::string get_program_name(t_program* tprogram) { return tprogram->get_name(); }
-
-  /**
-   * Method to get the service name, may be overridden
-   */
-  virtual std::string get_service_name(t_service* tservice) { return tservice->get_name(); }
-
-  /**
-   * Get the current output directory
-   */
-  virtual std::string get_out_dir() const {
-    if (program_->is_out_path_absolute()) {
-      return program_->get_out_path() + "/";
-    }
-
-    return program_->get_out_path() + out_dir_base_ + "/";
-  }
-
-  /**
-   * Creates a unique temporary variable name, which is just "name" with a
-   * number appended to it (i.e. name35)
-   */
-  std::string tmp(std::string name) {
-    std::ostringstream out;
-    out << name << tmp_++;
-    return out.str();
-  }
-
-  /**
-   * Generates a comment about this code being autogenerated, using C++ style
-   * comments, which are also fair game in Java / PHP, yay!
-   *
-   * @return C-style comment mentioning that this file is autogenerated.
-   */
-  virtual std::string autogen_comment() {
-    return std::string("/**\n") + " * " + autogen_summary() + "\n" + " *\n"
-           + " * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n"
-           + " *  @generated\n" + " */\n";
-  }
-
-  virtual std::string autogen_summary() {
-    return std::string("Autogenerated by Thrift Compiler (") + THRIFT_VERSION + ")";
-  }
-
-  /**
-   * Indentation level modifiers
-   */
-
-  void indent_up() { ++indent_; }
-
-  void indent_down() { --indent_; }
-
-  /**
-   * Indentation print function
-   */
-  std::string indent() {
-    std::string ind = "";
-    int i;
-    for (i = 0; i < indent_; ++i) {
-      ind += indent_str();
-    }
-    return ind;
-  }
-
-  /**
-   * Indentation utility wrapper
-   */
-  std::ostream& indent(std::ostream& os) { return os << indent(); }
-
-  /**
-   * Capitalization helpers
-   */
-  std::string capitalize(std::string in) {
-    in[0] = toupper(in[0]);
-    return in;
-  }
-  std::string decapitalize(std::string in) {
-    in[0] = tolower(in[0]);
-    return in;
-  }
-  static std::string lowercase(std::string in) {
-    for (size_t i = 0; i < in.size(); ++i) {
-      in[i] = tolower(in[i]);
-    }
-    return in;
-  }
-  static std::string uppercase(std::string in) {
-    for (size_t i = 0; i < in.size(); ++i) {
-      in[i] = toupper(in[i]);
-    }
-    return in;
-  }
-  /**
-   * Transforms a camel case string to an equivalent one separated by underscores
-   * e.g. aMultiWord -> a_multi_word
-   *      someName   -> some_name
-   *      CamelCase  -> camel_case
-   *      name       -> name
-   *      Name       -> name
-   */
-  std::string underscore(std::string in) {
-    in[0] = tolower(in[0]);
-    for (size_t i = 1; i < in.size(); ++i) {
-      if (isupper(in[i])) {
-        in[i] = tolower(in[i]);
-        in.insert(i, "_");
-      }
-    }
-    return in;
-  }
-  /**
-    * Transforms a string with words separated by underscores to a camel case equivalent
-    * e.g. a_multi_word -> aMultiWord
-    *      some_name    ->  someName
-    *      name         ->  name
-    */
-  std::string camelcase(std::string in) {
-    std::ostringstream out;
-    bool underscore = false;
-
-    for (size_t i = 0; i < in.size(); i++) {
-      if (in[i] == '_') {
-        underscore = true;
-        continue;
-      }
-      if (underscore) {
-        out << (char)toupper(in[i]);
-        underscore = false;
-        continue;
-      }
-      out << in[i];
-    }
-
-    return out.str();
-  }
-
-public:
-  /**
-   * Get the true type behind a series of typedefs.
-   */
-  static const t_type* get_true_type(const t_type* type) { return type->get_true_type(); }
-  static t_type* get_true_type(t_type* type) { return type->get_true_type(); }
-
-protected:
-  /**
-   * The program being generated
-   */
-  t_program* program_;
-
-  /**
-   * Quick accessor for formatted program name that is currently being
-   * generated.
-   */
-  std::string program_name_;
-
-  /**
-   * Quick accessor for formatted service name that is currently being
-   * generated.
-   */
-  std::string service_name_;
-
-  /**
-   * Output type-specifc directory name ("gen-*")
-   */
-  std::string out_dir_base_;
-
-  /**
-   * Map of characters to escape in string literals.
-   */
-  std::map<char, std::string> escape_;
-
-  virtual std::string indent_str() const {
-    return "  ";
-  }
-
-private:
-  /**
-   * Current code indentation level
-   */
-  int indent_;
-
-  /**
-   * Temporary variable counter, for making unique variable names
-   */
-  int tmp_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator_registry.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator_registry.h
deleted file mode 100644
index 1f02167..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_generator_registry.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_GENERATOR_REGISTRY_H
-#define T_GENERATOR_REGISTRY_H
-
-class t_generator;
-
-/**
- * A factory for producing generator classes of a particular language.
- *
- * This class is also responsible for:
- *  - Registering itself with the generator registry.
- *  - Providing documentation for the generators it produces.
- */
-class t_generator_factory {
-public:
-  t_generator_factory(const std::string& short_name,
-                      const std::string& long_name,
-                      const std::string& documentation);
-
-  virtual ~t_generator_factory() {}
-
-  virtual t_generator* get_generator(
-      // The program to generate.
-      t_program* program,
-      // Note: parsed_options will not exist beyond the call to get_generator.
-      const std::map<std::string, std::string>& parsed_options,
-      // Note: option_string might not exist beyond the call to get_generator.
-      const std::string& option_string) = 0;
-
-  virtual bool is_valid_namespace(const std::string& sub_namespace) = 0;
-
-  std::string get_short_name() { return short_name_; }
-  std::string get_long_name() { return long_name_; }
-  std::string get_documentation() { return documentation_; }
-
-private:
-  std::string short_name_;
-  std::string long_name_;
-  std::string documentation_;
-};
-
-template <typename generator>
-class t_generator_factory_impl : public t_generator_factory {
-public:
-  t_generator_factory_impl(const std::string& short_name,
-                           const std::string& long_name,
-                           const std::string& documentation)
-    : t_generator_factory(short_name, long_name, documentation) {}
-
-  virtual t_generator* get_generator(t_program* program,
-                                     const std::map<std::string, std::string>& parsed_options,
-                                     const std::string& option_string) {
-    return new generator(program, parsed_options, option_string);
-  }
-
-  virtual bool is_valid_namespace(const std::string& sub_namespace) {
-    return generator::is_valid_namespace(sub_namespace);
-  }
-};
-
-class t_generator_registry {
-public:
-  static void register_generator(t_generator_factory* factory);
-
-  static t_generator* get_generator(t_program* program, const std::string& options);
-  static t_generator* get_generator(t_program* program,
-                                    const std::string& laugnage,
-                                    const std::map<std::string, std::string>& parsed_options,
-                                    const std::string& options);
-
-  typedef std::map<std::string, t_generator_factory*> gen_map_t;
-  static gen_map_t& get_generator_map();
-
-private:
-  t_generator_registry();
-  t_generator_registry(const t_generator_registry&);
-};
-
-#define THRIFT_REGISTER_GENERATOR(language, long_name, doc)                                        \
-  class t_##language##_generator_factory_impl                                                      \
-      : public t_generator_factory_impl<t_##language##_generator> {                                \
-  public:                                                                                          \
-    t_##language##_generator_factory_impl()                                                        \
-      : t_generator_factory_impl<t_##language##_generator>(#language, long_name, doc) {}           \
-  };                                                                                               \
-  static t_##language##_generator_factory_impl _registerer;
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_go_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_go_generator.cc
deleted file mode 100644
index 9919cb1..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_go_generator.cc
+++ /dev/null
@@ -1,3685 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * This file is programmatically sanitized for style:
- * astyle --style=1tbs -f -p -H -j -U t_go_generator.cc
- *
- * The output of astyle should not be taken unquestioningly, but it is a good
- * guide for ensuring uniformity and readability.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sstream>
-#include <algorithm>
-#include <clocale>
-#include "thrift/platform.h"
-#include "thrift/version.h"
-#include "thrift/generate/t_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * A helper for automatically formatting the emitted Go code from the Thrift
- * IDL per the Go style guide.
- *
- * Returns:
- *  - true, if the formatting process succeeded.
- *  - false, if the formatting process failed, which means the basic output was
- *           still generated.
- */
-bool format_go_output(const string& file_path);
-
-const string DEFAULT_THRIFT_IMPORT = "git.apache.org/thrift.git/lib/go/thrift";
-static std::string package_flag;
-
-/**
- * Go code generator.
- */
-class t_go_generator : public t_generator {
-public:
-  t_go_generator(t_program* program,
-                 const std::map<std::string, std::string>& parsed_options,
-                 const std::string& option_string)
-    : t_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-
-    gen_thrift_import_ = DEFAULT_THRIFT_IMPORT;
-    gen_package_prefix_ = "";
-    package_flag = "";
-    read_write_private_ = false;
-    ignore_initialisms_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("package_prefix") == 0) {
-        gen_package_prefix_ = (iter->second);
-      } else if( iter->first.compare("thrift_import") == 0) {
-        gen_thrift_import_ = (iter->second);
-      } else if( iter->first.compare("package") == 0) {
-        package_flag = (iter->second);
-      } else if( iter->first.compare("read_write_private") == 0) {
-        read_write_private_ = true;
-      } else if( iter->first.compare("ignore_initialisms") == 0) {
-        ignore_initialisms_ =  true;
-      } else {
-        throw "unknown option go:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-go";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  std::string render_const_value(t_type* type, t_const_value* value, const string& name);
-
-  /**
-   * Struct generation code
-   */
-
-  void generate_go_struct(t_struct* tstruct, bool is_exception);
-  void generate_go_struct_definition(std::ofstream& out,
-                                     t_struct* tstruct,
-                                     bool is_xception = false,
-                                     bool is_result = false,
-                                     bool is_args = false);
-  void generate_go_struct_initializer(std::ofstream& out,
-                                      t_struct* tstruct,
-                                      bool is_args_or_result = false);
-  void generate_isset_helpers(std::ofstream& out,
-                              t_struct* tstruct,
-                              const string& tstruct_name,
-                              bool is_result = false);
-  void generate_countsetfields_helper(std::ofstream& out,
-                                      t_struct* tstruct,
-                                      const string& tstruct_name,
-                                      bool is_result = false);
-  void generate_go_struct_reader(std::ofstream& out,
-                                 t_struct* tstruct,
-                                 const string& tstruct_name,
-                                 bool is_result = false);
-  void generate_go_struct_writer(std::ofstream& out,
-                                 t_struct* tstruct,
-                                 const string& tstruct_name,
-                                 bool is_result = false,
-                                 bool uses_countsetfields = false);
-  void generate_go_function_helpers(t_function* tfunction);
-  void get_publicized_name_and_def_value(t_field* tfield,
-                                         string* OUT_pub_name,
-                                         t_const_value** OUT_def_value) const;
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_remote(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  bool declare,
-                                  std::string prefix = "",
-                                  bool inclass = false,
-                                  bool coerceData = false,
-                                  bool inkey = false,
-                                  bool in_container = false,
-                                  bool use_true_type = false);
-
-  void generate_deserialize_struct(std::ofstream& out,
-                                   t_struct* tstruct,
-                                   bool is_pointer_field,
-                                   bool declare,
-                                   std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out,
-                                      t_type* ttype,
-                                      bool pointer_field,
-                                      bool declare,
-                                      std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out,
-                                        t_set* tset,
-                                        bool declare,
-                                        std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out,
-                                        t_map* tmap,
-                                        bool declare,
-                                        std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         bool declare,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out,
-                                t_field* tfield,
-                                std::string prefix = "",
-                                bool inkey = false);
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out,
-                                    t_type* ttype,
-                                    bool pointer_field,
-                                    std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string kiter,
-                                      std::string viter);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_go_docstring(std::ofstream& out, t_struct* tstruct);
-
-  void generate_go_docstring(std::ofstream& out, t_function* tfunction);
-
-  void generate_go_docstring(std::ofstream& out,
-                             t_doc* tdoc,
-                             t_struct* tstruct,
-                             const char* subheader);
-
-  void generate_go_docstring(std::ofstream& out, t_doc* tdoc);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string go_autogen_comment();
-  std::string go_package();
-  std::string go_imports_begin(bool consts);
-  std::string go_imports_end();
-  std::string render_includes(bool consts);
-  std::string render_included_programs(string& unused_protection);
-  std::string render_import_protection();
-  std::string render_fastbinary_includes();
-  std::string declare_argument(t_field* tfield);
-  std::string render_field_initial_value(t_field* tfield, const string& name, bool optional_field);
-  std::string type_name(t_type* ttype);
-  std::string module_name(t_type* ttype);
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string function_signature_if(t_function* tfunction,
-                                    std::string prefix = "",
-                                    bool addError = false);
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-  std::string type_to_go_type(t_type* ttype);
-  std::string type_to_go_type_with_opt(t_type* ttype,
-                                       bool optional_field);
-  std::string type_to_go_key_type(t_type* ttype);
-  std::string type_to_spec_args(t_type* ttype);
-
-  static std::string get_real_go_module(const t_program* program) {
-
-    if (!package_flag.empty()) {
-      return package_flag;
-    }
-    std::string real_module = program->get_namespace("go");
-    if (!real_module.empty()) {
-      return real_module;
-    }
-
-    return lowercase(program->get_name());
-  }
-
-private:
-  std::string gen_package_prefix_;
-  std::string gen_thrift_import_;
-  bool read_write_private_;
-  bool ignore_initialisms_;
-
-  /**
-   * File streams
-   */
-
-  std::ofstream f_types_;
-  std::string f_types_name_;
-  std::ofstream f_consts_;
-  std::string f_consts_name_;
-  std::stringstream f_const_values_;
-
-  std::string package_name_;
-  std::string package_dir_;
-  std::string read_method_name_;
-  std::string write_method_name_;
-
-  std::set<std::string> commonInitialisms;
-
-  std::string camelcase(const std::string& value) const;
-  void fix_common_initialism(std::string& value, int i) const;
-  std::string publicize(const std::string& value, bool is_args_or_result = false) const;
-  std::string privatize(const std::string& value) const;
-  std::string new_prefix(const std::string& value) const;
-  static std::string variable_name_to_go_name(const std::string& value);
-  static bool is_pointer_field(t_field* tfield, bool in_container = false);
-  static bool omit_initialization(t_field* tfield);
-};
-
-// returns true if field initialization can be omitted since it has corresponding go type zero value
-// or default value is not set
-bool t_go_generator::omit_initialization(t_field* tfield) {
-  t_const_value* value = tfield->get_value();
-  if (!value) {
-    return true;
-  }
-  t_type* type = tfield->get_type()->get_true_type();
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "";
-
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)type)->is_binary()) {
-        //[]byte are always inline
-        return false;
-      }
-      // strings are pointers if has no default
-      return value->get_string().empty();
-
-    case t_base_type::TYPE_BOOL:
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      return value->get_integer() == 0;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        return value->get_integer() == 0;
-      } else {
-        return value->get_double() == 0.;
-      }
-    }
-  }
-  return false;
-}
-
-// Returns true if the type need a reference if used as optional without default
-static bool type_need_reference(t_type* type) {
-  type = type->get_true_type();
-  if (type->is_map() || type->is_set() || type->is_list() || type->is_struct()
-      || type->is_xception() || (type->is_string() && ((t_base_type*)type)->is_binary())) {
-    return false;
-  }
-  return true;
-}
-
-// returns false if field could not use comparison to default value as !IsSet*
-bool t_go_generator::is_pointer_field(t_field* tfield, bool in_container_value) {
-  (void)in_container_value;
-  if (tfield->annotations_.count("cpp.ref") != 0) {
-    return true;
-  }
-  t_type* type = tfield->get_type()->get_true_type();
-  // Structs in containers are pointers
-  if (type->is_struct() || type->is_xception()) {
-    return true;
-  }
-  if (!(tfield->get_req() == t_field::T_OPTIONAL)) {
-    return false;
-  }
-
-  bool has_default = tfield->get_value();
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "";
-
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)type)->is_binary()) {
-        //[]byte are always inline
-        return false;
-      }
-      // strings are pointers if has no default
-      return !has_default;
-
-    case t_base_type::TYPE_BOOL:
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-    case t_base_type::TYPE_DOUBLE:
-      return !has_default;
-    }
-  } else if (type->is_enum()) {
-    return !has_default;
-  } else if (type->is_struct() || type->is_xception()) {
-    return true;
-  } else if (type->is_map()) {
-    return has_default;
-  } else if (type->is_set()) {
-    return has_default;
-  } else if (type->is_list()) {
-    return has_default;
-  } else if (type->is_typedef()) {
-    return has_default;
-  }
-
-  throw "INVALID TYPE IN type_to_go_type: " + type->get_name();
-}
-
-std::string t_go_generator::camelcase(const std::string& value) const {
-  std::string value2(value);
-  std::setlocale(LC_ALL, "C"); // set locale to classic
-
-  // Fix common initialism in first word
-  fix_common_initialism(value2, 0);
-
-  // as long as we are changing things, let's change _ followed by lowercase to
-  // capital and fix common initialisms
-  for (std::string::size_type i = 1; i < value2.size() - 1; ++i) {
-    if (value2[i] == '_') {
-      if (islower(value2[i + 1])) {
-        value2.replace(i, 2, 1, toupper(value2[i + 1]));
-      }
-      fix_common_initialism(value2, i);
-    }
-  }
-
-  return value2;
-}
-
-// Checks to see if the word starting at i in value contains a common initialism
-// and if so replaces it with the upper case version of the word.
-void t_go_generator::fix_common_initialism(std::string& value, int i) const {
-  if (!ignore_initialisms_) {
-    size_t wordLen = value.find('_', i);
-    if (wordLen != std::string::npos) {
-      wordLen -= i;
-    }
-    std::string word = value.substr(i, wordLen);
-    std::transform(word.begin(), word.end(), word.begin(), ::toupper);
-    if (commonInitialisms.find(word) != commonInitialisms.end()) {
-      value.replace(i, word.length(), word);
-    }
-  }
-}
-
-std::string t_go_generator::publicize(const std::string& value, bool is_args_or_result) const {
-  if (value.size() <= 0) {
-    return value;
-  }
-
-  std::string value2(value), prefix;
-
-  string::size_type dot_pos = value.rfind('.');
-  if (dot_pos != string::npos) {
-    prefix = value.substr(0, dot_pos + 1) + prefix;
-    value2 = value.substr(dot_pos + 1);
-  }
-
-  if (!isupper(value2[0])) {
-    value2[0] = toupper(value2[0]);
-  }
-
-  value2 = camelcase(value2);
-
-  // final length before further checks, the string may become longer
-  size_t len_before = value2.length();
-
-  // IDL identifiers may start with "New" which interferes with the CTOR pattern
-  // Adding an extra underscore to all those identifiers solves this
-  if ((len_before >= 3) && (value2.substr(0, 3) == "New")) {
-    value2 += '_';
-  }
-
-  // IDL identifiers may end with "Args"/"Result" which interferes with the implicit service
-  // function structs
-  // Adding another extra underscore to all those identifiers solves this
-  // Suppress this check for the actual helper struct names
-  if (!is_args_or_result) {
-    bool ends_with_args = (len_before >= 4) && (value2.substr(len_before - 4, 4) == "Args");
-    bool ends_with_rslt = (len_before >= 6) && (value2.substr(len_before - 6, 6) == "Result");
-    if (ends_with_args || ends_with_rslt) {
-      value2 += '_';
-    }
-  }
-
-  // Avoid naming collisions with other services
-  if (is_args_or_result) {
-    prefix += publicize(service_name_);
-  }
-
-  return prefix + value2;
-}
-
-std::string t_go_generator::new_prefix(const std::string& value) const {
-  if (value.size() <= 0) {
-    return value;
-  }
-
-  string::size_type dot_pos = value.rfind('.');
-  if (dot_pos != string::npos) {
-    return value.substr(0, dot_pos + 1) + "New" + publicize(value.substr(dot_pos + 1));
-  }
-  return "New" + publicize(value);
-}
-
-std::string t_go_generator::privatize(const std::string& value) const {
-  if (value.size() <= 0) {
-    return value;
-  }
-
-  std::string value2(value);
-
-  if (!islower(value2[0])) {
-    value2[0] = tolower(value2[0]);
-  }
-
-  value2 = camelcase(value2);
-
-  return value2;
-}
-
-std::string t_go_generator::variable_name_to_go_name(const std::string& value) {
-  if (value.size() <= 0) {
-    return value;
-  }
-
-  std::string value2(value);
-  std::transform(value2.begin(), value2.end(), value2.begin(), ::tolower);
-
-  switch (value[0]) {
-  case 'b':
-  case 'B':
-    if (value2 != "break") {
-      return value;
-    }
-
-    break;
-
-  case 'c':
-  case 'C':
-    if (value2 != "case" && value2 != "chan" && value2 != "const" && value2 != "continue") {
-      return value;
-    }
-
-    break;
-
-  case 'd':
-  case 'D':
-    if (value2 != "default" && value2 != "defer") {
-      return value;
-    }
-
-    break;
-
-  case 'e':
-  case 'E':
-    if (value2 != "else" && value2 != "error") {
-      return value;
-    }
-
-    break;
-
-  case 'f':
-  case 'F':
-    if (value2 != "fallthrough" && value2 != "for" && value2 != "func") {
-      return value;
-    }
-
-    break;
-
-  case 'g':
-  case 'G':
-    if (value2 != "go" && value2 != "goto") {
-      return value;
-    }
-
-    break;
-
-  case 'i':
-  case 'I':
-    if (value2 != "if" && value2 != "import" && value2 != "interface") {
-      return value;
-    }
-
-    break;
-
-  case 'm':
-  case 'M':
-    if (value2 != "map") {
-      return value;
-    }
-
-    break;
-
-  case 'p':
-  case 'P':
-    if (value2 != "package") {
-      return value;
-    }
-
-    break;
-
-  case 'r':
-  case 'R':
-    if (value2 != "range" && value2 != "return") {
-      return value;
-    }
-
-    break;
-
-  case 's':
-  case 'S':
-    if (value2 != "select" && value2 != "struct" && value2 != "switch") {
-      return value;
-    }
-
-    break;
-
-  case 't':
-  case 'T':
-    if (value2 != "type") {
-      return value;
-    }
-
-    break;
-
-  case 'v':
-  case 'V':
-    if (value2 != "var") {
-      return value;
-    }
-
-    break;
-
-  default:
-    return value;
-  }
-
-  return value2 + "_a1";
-}
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_go_generator::init_generator() {
-  // Make output directory
-  string module = get_real_go_module(program_);
-  string target = module;
-  package_dir_ = get_out_dir();
-
-  // This set is taken from https://github.com/golang/lint/blob/master/lint.go#L692
-  commonInitialisms.insert("API");
-  commonInitialisms.insert("ASCII");
-  commonInitialisms.insert("CPU");
-  commonInitialisms.insert("CSS");
-  commonInitialisms.insert("DNS");
-  commonInitialisms.insert("EOF");
-  commonInitialisms.insert("GUID");
-  commonInitialisms.insert("HTML");
-  commonInitialisms.insert("HTTP");
-  commonInitialisms.insert("HTTPS");
-  commonInitialisms.insert("ID");
-  commonInitialisms.insert("IP");
-  commonInitialisms.insert("JSON");
-  commonInitialisms.insert("LHS");
-  commonInitialisms.insert("QPS");
-  commonInitialisms.insert("RAM");
-  commonInitialisms.insert("RHS");
-  commonInitialisms.insert("RPC");
-  commonInitialisms.insert("SLA");
-  commonInitialisms.insert("SMTP");
-  commonInitialisms.insert("SSH");
-  commonInitialisms.insert("TCP");
-  commonInitialisms.insert("TLS");
-  commonInitialisms.insert("TTL");
-  commonInitialisms.insert("UDP");
-  commonInitialisms.insert("UI");
-  commonInitialisms.insert("UID");
-  commonInitialisms.insert("UUID");
-  commonInitialisms.insert("URI");
-  commonInitialisms.insert("URL");
-  commonInitialisms.insert("UTF8");
-  commonInitialisms.insert("VM");
-  commonInitialisms.insert("XML");
-  commonInitialisms.insert("XSRF");
-  commonInitialisms.insert("XSS");
-
-  // names of read and write methods
-  if (read_write_private_) {
-    read_method_name_ = "read";
-    write_method_name_ = "write";
-  } else {
-    read_method_name_ = "Read";
-    write_method_name_ = "Write";
-  }
-
-  while (true) {
-    // TODO: Do better error checking here.
-    MKDIR(package_dir_.c_str());
-
-    if (module.empty()) {
-      break;
-    }
-
-    string::size_type pos = module.find('.');
-
-    if (pos == string::npos) {
-      package_dir_ += "/";
-      package_dir_ += module;
-      package_name_ = module;
-      module.clear();
-    } else {
-      package_dir_ += "/";
-      package_dir_ += module.substr(0, pos);
-      module.erase(0, pos + 1);
-    }
-  }
-
-  string::size_type loc;
-
-  while ((loc = target.find(".")) != string::npos) {
-    target.replace(loc, 1, 1, '/');
-  }
-
-  // Make output files
-  f_types_name_ = package_dir_ + "/" + program_name_ + ".go";
-  f_types_.open(f_types_name_.c_str());
-
-  f_consts_name_ = package_dir_ + "/" + program_name_ + "-consts.go";
-  f_consts_.open(f_consts_name_.c_str());
-
-  vector<t_service*> services = program_->get_services();
-  vector<t_service*>::iterator sv_iter;
-
-  for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-    string service_dir = package_dir_ + "/" + underscore((*sv_iter)->get_name()) + "-remote";
-    MKDIR(service_dir.c_str());
-  }
-
-  // Print header
-  f_types_ << go_autogen_comment() << go_package() << render_includes(false);
-
-  f_consts_ << go_autogen_comment() << go_package() << render_includes(true);
-
-  f_const_values_ << endl << "func init() {" << endl;
-
-  // Create file for the GoUnusedProtection__ variable
-  string f_unused_prot_name_ = package_dir_ + "/" + "GoUnusedProtection__.go";
-  ofstream f_unused_prot_;
-  f_unused_prot_.open(f_unused_prot_name_.c_str());
-  f_unused_prot_ << go_autogen_comment() << go_package() << render_import_protection();
-  f_unused_prot_.close();
-}
-
-
-string t_go_generator::render_included_programs(string& unused_protection) {
-  const vector<t_program*>& includes = program_->get_includes();
-  string result = "";
-
-  unused_protection = "";
-
-  string local_namespace = program_->get_namespace("go");
-  for (size_t i = 0; i < includes.size(); ++i) {
-    if (!local_namespace.empty() && local_namespace == includes[i]->get_namespace("go")) {
-      continue;
-    }
-
-    string go_module = get_real_go_module(includes[i]);
-    size_t found = 0;
-    for (size_t j = 0; j < go_module.size(); j++) {
-      // Import statement uses slashes ('/') in namespace
-      if (go_module[j] == '.') {
-        go_module[j] = '/';
-        found = j + 1;
-      }
-    }
-
-    result += "\t\"" + gen_package_prefix_ + go_module + "\"\n";
-    unused_protection += "var _ = " + go_module.substr(found) + ".GoUnusedProtection__\n";
-  }
-
-  return result;
-}
-
-/**
- * Renders all the imports necessary for including another Thrift program.
- * If consts include the additional imports.
- */
-string t_go_generator::render_includes(bool consts) {
-  const vector<t_program*>& includes = program_->get_includes();
-  string result = "";
-  string unused_prot = "";
-
-  string local_namespace = program_->get_namespace("go");
-  for (size_t i = 0; i < includes.size(); ++i) {
-    if (!local_namespace.empty() && local_namespace == includes[i]->get_namespace("go")) {
-      continue;
-    }
-
-    string go_module = get_real_go_module(includes[i]);
-    size_t found = 0;
-    for (size_t j = 0; j < go_module.size(); j++) {
-      // Import statement uses slashes ('/') in namespace
-      if (go_module[j] == '.') {
-        go_module[j] = '/';
-        found = j + 1;
-      }
-    }
-
-    result += "\t\"" + gen_package_prefix_ + go_module + "\"\n";
-    unused_prot += "var _ = " + go_module.substr(found) + ".GoUnusedProtection__\n";
-  }
-
-  if (includes.size() > 0) {
-    result += "\n";
-  }
-
-  return go_imports_begin(consts) + result + go_imports_end() + unused_prot;
-}
-
-string t_go_generator::render_import_protection() {
-  return string("var GoUnusedProtection__ int;\n\n");
-}
-
-/**
- * Renders all the imports necessary to use the accelerated TBinaryProtocol
- */
-string t_go_generator::render_fastbinary_includes() {
-  return "";
-}
-
-/**
- * Autogen'd comment
- */
-string t_go_generator::go_autogen_comment() {
-  return
-        std::string() +
-        "// Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-        "// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n\n";
-}
-
-/**
- * Prints standard thrift package
- */
-string t_go_generator::go_package() {
-  return string("package ") + package_name_ + "\n\n";
-}
-
-/**
- * Render the beginning of the import statement.
- * If consts include the additional imports.
- */
-string t_go_generator::go_imports_begin(bool consts) {
-  string extra;
-  // If not writing constants, and there are enums, need extra imports.
-  if (!consts && get_program()->get_enums().size() > 0) {
-    extra =
-      "\t\"database/sql/driver\"\n"
-      "\t\"errors\"\n";
-  }
-  return string(
-      "import (\n"
-      "\t\"bytes\"\n"
-      + extra +
-      "\t\"fmt\"\n"
-      "\t\"" + gen_thrift_import_ + "\"\n");
-}
-
-/**
- * End the import statement, include undscore-assignments
- *
- * These "_ =" prevent the go compiler complaining about used imports.
- * This will have to do in lieu of more intelligent import statement construction
- */
-string t_go_generator::go_imports_end() {
-  return string(
-      ")\n\n"
-      "// (needed to ensure safety because of naive import list construction.)\n"
-      "var _ = thrift.ZERO\n"
-      "var _ = fmt.Printf\n"
-      "var _ = bytes.Equal\n\n");
-}
-
-/**
- * Closes the type files
- */
-void t_go_generator::close_generator() {
-  f_const_values_ << "}" << endl << endl;
-  f_consts_ << f_const_values_.str();
-
-  // Close types and constants files
-  f_consts_.close();
-  f_types_.close();
-  format_go_output(f_types_name_);
-  format_go_output(f_consts_name_);
-}
-
-/**
- * Generates a typedef.
- *
- * @param ttypedef The type definition
- */
-void t_go_generator::generate_typedef(t_typedef* ttypedef) {
-  generate_go_docstring(f_types_, ttypedef);
-  string new_type_name(publicize(ttypedef->get_symbolic()));
-  string base_type(type_to_go_type(ttypedef->get_type()));
-
-  if (base_type == new_type_name) {
-    return;
-  }
-
-  f_types_ << "type " << new_type_name << " " << base_type << endl << endl;
-  // Generate a convenience function that converts an instance of a type
-  // (which may be a constant) into a pointer to an instance of a type.
-  f_types_ << "func " << new_type_name << "Ptr(v " << new_type_name << ") *" << new_type_name
-           << " { return &v }" << endl << endl;
-}
-
-/**
- * Generates code for an enumerated type. Done using a class to scope
- * the values.
- *
- * @param tenum The enumeration
- */
-void t_go_generator::generate_enum(t_enum* tenum) {
-  std::ostringstream to_string_mapping, from_string_mapping;
-  std::string tenum_name(publicize(tenum->get_name()));
-  generate_go_docstring(f_types_, tenum);
-  f_types_ << "type " << tenum_name << " int64" << endl << "const (" << endl;
-
-  to_string_mapping << indent() << "func (p " << tenum_name << ") String() string {" << endl;
-  to_string_mapping << indent() << "  switch p {" << endl;
-
-  from_string_mapping << indent() << "func " << tenum_name << "FromString(s string) (" << tenum_name
-                      << ", error) {" << endl;
-  from_string_mapping << indent() << "  switch s {" << endl;
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  int value = -1;
-
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    value = (*c_iter)->get_value();
-
-    string iter_std_name(escape_string((*c_iter)->get_name()));
-    string iter_name((*c_iter)->get_name());
-    f_types_ << indent() << "  " << tenum_name << "_" << iter_name << ' ' << tenum_name << " = "
-             << value << endl;
-    // Dictionaries to/from string names of enums
-    to_string_mapping << indent() << "  case " << tenum_name << "_" << iter_name << ": return \""
-                      << iter_std_name << "\"" << endl;
-
-    if (iter_std_name != escape_string(iter_name)) {
-      from_string_mapping << indent() << "  case \"" << iter_std_name << "\", \""
-                          << escape_string(iter_name) << "\": return " << tenum_name << "_"
-                          << iter_name << ", nil " << endl;
-    } else {
-      from_string_mapping << indent() << "  case \"" << iter_std_name << "\": return " << tenum_name
-                          << "_" << iter_name << ", nil " << endl;
-    }
-  }
-
-  to_string_mapping << indent() << "  }" << endl;
-  to_string_mapping << indent() << "  return \"<UNSET>\"" << endl;
-  to_string_mapping << indent() << "}" << endl;
-  from_string_mapping << indent() << "  }" << endl;
-  from_string_mapping << indent() << "  return " << tenum_name << "(0),"
-                      << " fmt.Errorf(\"not a valid " << tenum_name << " string\")" << endl;
-  from_string_mapping << indent() << "}" << endl;
-
-  f_types_ << ")" << endl << endl << to_string_mapping.str() << endl << from_string_mapping.str()
-           << endl << endl;
-
-  // Generate a convenience function that converts an instance of an enum
-  // (which may be a constant) into a pointer to an instance of that enum
-  // type.
-  f_types_ << "func " << tenum_name << "Ptr(v " << tenum_name << ") *" << tenum_name
-           << " { return &v }" << endl << endl;
-
-  // Generate MarshalText
-  f_types_ << "func (p " << tenum_name << ") MarshalText() ([]byte, error) {" << endl;
-  f_types_ << "return []byte(p.String()), nil" << endl;
-  f_types_ << "}" << endl << endl;
-
-  // Generate UnmarshalText
-  f_types_ << "func (p *" << tenum_name << ") UnmarshalText(text []byte) error {" << endl;
-  f_types_ << "q, err := " << tenum_name << "FromString(string(text))" << endl;
-  f_types_ << "if (err != nil) {" << endl << "return err" << endl << "}" << endl;
-  f_types_ << "*p = q" << endl;
-  f_types_ << "return nil" << endl;
-  f_types_ << "}" << endl << endl;
-
-  // Generate Scan for sql.Scanner interface
-  f_types_ << "func (p *" << tenum_name << ") Scan(value interface{}) error {" <<endl;
-  f_types_ << "v, ok := value.(int64)" <<endl;
-  f_types_ << "if !ok {" <<endl;
-  f_types_ << "return errors.New(\"Scan value is not int64\")" <<endl;
-  f_types_ << "}" <<endl;
-  f_types_ << "*p = " << tenum_name << "(v)" << endl;
-  f_types_ << "return nil" << endl;
-  f_types_ << "}" << endl << endl;
-
-  // Generate Value for driver.Valuer interface
-  f_types_ << "func (p * " << tenum_name << ") Value() (driver.Value, error) {" <<endl;
-  f_types_ << "  if p == nil {" << endl;
-  f_types_ << "    return nil, nil" << endl;
-  f_types_ << "  }" << endl;
-  f_types_ << "return int64(*p), nil" << endl;
-  f_types_ << "}" << endl;
-
-}
-
-/**
- * Generate a constant value
- */
-void t_go_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = publicize(tconst->get_name());
-  t_const_value* value = tconst->get_value();
-
-  if (type->is_base_type() || type->is_enum()) {
-    indent(f_consts_) << "const " << name << " = " << render_const_value(type, value, name) << endl;
-  } else {
-    f_const_values_ << indent() << name << " = " << render_const_value(type, value, name) << endl
-                    << endl;
-
-    f_consts_ << indent() << "var " << name << " " << type_to_go_type(type) << endl;
-  }
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_go_generator::render_const_value(t_type* type, t_const_value* value, const string& name) {
-  type = get_true_type(type);
-  std::ostringstream out;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)type)->is_binary()) {
-        out << "[]byte(\"" << get_escaped_string(value) << "\")";
-      } else {
-        out << '"' << get_escaped_string(value) << '"';
-      }
-
-      break;
-
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "true" : "false");
-      break;
-
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << value->get_integer();
-      break;
-
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-
-      break;
-
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    indent(out) << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    out << "&" << publicize(type_name(type)) << "{";
-    indent_up();
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-
-      out << endl << indent() << publicize(v_iter->first->get_string()) << ": "
-          << render_const_value(field_type, v_iter->second, name) << "," << endl;
-    }
-
-    indent_down();
-    out << "}";
-
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    out << "map[" << type_to_go_type(ktype) << "]" << type_to_go_type(vtype) << "{" << endl;
-    indent_up();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << indent() << render_const_value(ktype, v_iter->first, name) << ": "
-          << render_const_value(vtype, v_iter->second, name) << "," << endl;
-    }
-
-    indent_down();
-    out << indent() << "}";
-  } else if (type->is_list()) {
-    t_type* etype = ((t_list*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    out << "[]" << type_to_go_type(etype) << "{" << endl;
-    indent_up();
-    vector<t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << indent() << render_const_value(etype, *v_iter, name) << ", ";
-    }
-
-    indent_down();
-    out << indent() << "}";
-  } else if (type->is_set()) {
-    t_type* etype = ((t_set*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    out << "map[" << type_to_go_key_type(etype) << "]struct{}{" << endl;
-    indent_up();
-    vector<t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << indent() << render_const_value(etype, *v_iter, name) << ": struct{}{}," << endl;
-    }
-
-    indent_down();
-    out << indent() << "}";
-  } else {
-    throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
-  }
-
-  return out.str();
-}
-
-/**
- * Generates a go struct
- */
-void t_go_generator::generate_struct(t_struct* tstruct) {
-  generate_go_struct(tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct but extends the Exception class.
- *
- * @param txception The struct definition
- */
-void t_go_generator::generate_xception(t_struct* txception) {
-  generate_go_struct(txception, true);
-}
-
-/**
- * Generates a go struct
- */
-void t_go_generator::generate_go_struct(t_struct* tstruct, bool is_exception) {
-  generate_go_struct_definition(f_types_, tstruct, is_exception);
-}
-
-void t_go_generator::get_publicized_name_and_def_value(t_field* tfield,
-                                                       string* OUT_pub_name,
-                                                       t_const_value** OUT_def_value) const {
-  const string base_field_name = tfield->get_name();
-  const string escaped_field_name = escape_string(base_field_name);
-  *OUT_pub_name = publicize(escaped_field_name);
-  *OUT_def_value = tfield->get_value();
-}
-
-void t_go_generator::generate_go_struct_initializer(ofstream& out,
-                                                    t_struct* tstruct,
-                                                    bool is_args_or_result) {
-  out << publicize(type_name(tstruct), is_args_or_result) << "{";
-  const vector<t_field*>& members = tstruct->get_members();
-  for (vector<t_field*>::const_iterator m_iter = members.begin(); m_iter != members.end();
-       ++m_iter) {
-    bool pointer_field = is_pointer_field(*m_iter);
-    string publicized_name;
-    t_const_value* def_value;
-    get_publicized_name_and_def_value(*m_iter, &publicized_name, &def_value);
-    if (!pointer_field && def_value != NULL && !omit_initialization(*m_iter)) {
-      out << endl << indent() << publicized_name << ": "
-          << render_field_initial_value(*m_iter, (*m_iter)->get_name(), pointer_field) << ","
-          << endl;
-    }
-  }
-
-  out << "}" << endl;
-}
-
-/**
- * Generates a struct definition for a thrift data type.
- *
- * @param tstruct The struct definition
- */
-void t_go_generator::generate_go_struct_definition(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   bool is_exception,
-                                                   bool is_result,
-                                                   bool is_args) {
-  const vector<t_field*>& members = tstruct->get_members();
-  const vector<t_field*>& sorted_members = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  std::string tstruct_name(publicize(tstruct->get_name(), is_args || is_result));
-  generate_go_docstring(out, tstruct);
-  out << indent() << "type " << tstruct_name << " struct {" << endl;
-  /*
-     Here we generate the structure specification for the fastbinary codec.
-     These specifications have the following structure:
-     thrift_spec -> tuple of item_spec
-     item_spec -> nil | (tag, type_enum, name, spec_args, default)
-     tag -> integer
-     type_enum -> TType.I32 | TType.STRING | TType.STRUCT | ...
-     name -> string_literal
-     default -> nil  # Handled by __init__
-     spec_args -> nil  # For simple types
-                | (type_enum, spec_args)  # Value type for list/set
-                | (type_enum, spec_args, type_enum, spec_args)
-                  # Key and value for map
-                | (class_name, spec_args_ptr) # For struct/exception
-     class_name -> identifier  # Basically a pointer to the class
-     spec_args_ptr -> expression  # just class_name.spec_args
-
-     TODO(dreiss): Consider making this work for structs with negative tags.
-  */
-  // TODO(dreiss): Look into generating an empty tuple instead of nil
-  // for structures with no members.
-  // TODO(dreiss): Test encoding of structs where some inner structs
-  // don't have thrift_spec.
-  indent_up();
-
-  int num_setable = 0;
-  if (sorted_members.empty() || (sorted_members[0]->get_key() >= 0)) {
-    int sorted_keys_pos = 0;
-
-    for (m_iter = sorted_members.begin(); m_iter != sorted_members.end(); ++m_iter) {
-      // Set field to optional if field is union, this is so we can get a
-      // pointer to the field.
-      if (tstruct->is_union())
-        (*m_iter)->set_req(t_field::T_OPTIONAL);
-      if (sorted_keys_pos != (*m_iter)->get_key()) {
-        int first_unused = std::max(1, sorted_keys_pos++);
-        while (sorted_keys_pos != (*m_iter)->get_key()) {
-          ++sorted_keys_pos;
-        }
-        int last_unused = sorted_keys_pos - 1;
-        if (first_unused < last_unused) {
-          indent(out) << "// unused fields # " << first_unused << " to " << last_unused << endl;
-        } else if (first_unused == last_unused) {
-          indent(out) << "// unused field # " << first_unused << endl;
-        }
-      }
-
-      t_type* fieldType = (*m_iter)->get_type();
-      string goType = type_to_go_type_with_opt(fieldType, is_pointer_field(*m_iter));
-      string gotag = "db:\"" + escape_string((*m_iter)->get_name())  + "\" ";
-      if ((*m_iter)->get_req() == t_field::T_OPTIONAL) {
-        gotag += "json:\"" + escape_string((*m_iter)->get_name()) + ",omitempty\"";
-      } else {
-        gotag += "json:\"" + escape_string((*m_iter)->get_name()) + "\"";
-      }
-
-      // Check for user override of db and json tags using "go.tag"
-      std::map<string, string>::iterator it = (*m_iter)->annotations_.find("go.tag");
-      if (it != (*m_iter)->annotations_.end()) {
-        gotag = it->second;
-      }
-      indent(out) << publicize((*m_iter)->get_name()) << " " << goType << " `thrift:\""
-                  << escape_string((*m_iter)->get_name()) << "," << sorted_keys_pos;
-      if ((*m_iter)->get_req() == t_field::T_REQUIRED) {
-        out << ",required";
-      }
-
-      out << "\" " << gotag << "`" << endl;
-      sorted_keys_pos++;
-    }
-  } else {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      // This fills in default values, as opposed to nulls
-      out << indent() << publicize((*m_iter)->get_name()) << " "
-          << type_to_go_type((*m_iter)->get_type()) << endl;
-    }
-  }
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-  out << indent() << "func New" << tstruct_name << "() *" << tstruct_name << " {" << endl;
-  out << indent() << "  return &";
-  generate_go_struct_initializer(out, tstruct, is_result || is_args);
-  out << indent() << "}" << endl << endl;
-  // Default values for optional fields
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    string publicized_name;
-    t_const_value* def_value;
-    get_publicized_name_and_def_value(*m_iter, &publicized_name, &def_value);
-    t_type* fieldType = (*m_iter)->get_type();
-    string goType = type_to_go_type_with_opt(fieldType, false);
-    string def_var_name = tstruct_name + "_" + publicized_name + "_DEFAULT";
-    if ((*m_iter)->get_req() == t_field::T_OPTIONAL || is_pointer_field(*m_iter)) {
-      out << indent() << "var " << def_var_name << " " << goType;
-      if (def_value != NULL) {
-        out << " = " << render_const_value(fieldType, def_value, (*m_iter)->get_name());
-      }
-      out << endl;
-    }
-    if (is_pointer_field(*m_iter)) {
-      string goOptType = type_to_go_type_with_opt(fieldType, true);
-      string maybepointer = goOptType != goType ? "*" : "";
-      out << indent() << "func (p *" << tstruct_name << ") Get" << publicized_name << "() "
-          << goType << " {" << endl;
-      out << indent() << "  if !p.IsSet" << publicized_name << "() {" << endl;
-      out << indent() << "    return " << def_var_name << endl;
-      out << indent() << "  }" << endl;
-      out << indent() << "return " << maybepointer << "p." << publicized_name << endl;
-      out << indent() << "}" << endl;
-      num_setable += 1;
-    } else {
-      out << endl;
-      out << indent() << "func (p *" << tstruct_name << ") Get" << publicized_name << "() "
-          << goType << " {" << endl;
-      out << indent() << "  return p." << publicized_name << endl;
-      out << indent() << "}" << endl;
-    }
-  }
-
-  if (tstruct->is_union() && num_setable > 0) {
-    generate_countsetfields_helper(out, tstruct, tstruct_name, is_result);
-  }
-
-  generate_isset_helpers(out, tstruct, tstruct_name, is_result);
-  generate_go_struct_reader(out, tstruct, tstruct_name, is_result);
-  generate_go_struct_writer(out, tstruct, tstruct_name, is_result, num_setable > 0);
-
-  out << indent() << "func (p *" << tstruct_name << ") String() string {" << endl;
-  out << indent() << "  if p == nil {" << endl;
-  out << indent() << "    return \"<nil>\"" << endl;
-  out << indent() << "  }" << endl;
-  out << indent() << "  return fmt.Sprintf(\"" << escape_string(tstruct_name) << "(%+v)\", *p)"
-      << endl;
-  out << indent() << "}" << endl << endl;
-
-  if (is_exception) {
-    out << indent() << "func (p *" << tstruct_name << ") Error() string {" << endl;
-    out << indent() << "  return p.String()" << endl;
-    out << indent() << "}" << endl << endl;
-  }
-}
-
-/**
- * Generates the IsSet helper methods for a struct
- */
-void t_go_generator::generate_isset_helpers(ofstream& out,
-                                            t_struct* tstruct,
-                                            const string& tstruct_name,
-                                            bool is_result) {
-  (void)is_result;
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  const string escaped_tstruct_name(escape_string(tstruct->get_name()));
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    const string field_name(publicize(escape_string((*f_iter)->get_name())));
-    if ((*f_iter)->get_req() == t_field::T_OPTIONAL || is_pointer_field(*f_iter)) {
-      out << indent() << "func (p *" << tstruct_name << ") IsSet" << field_name << "() bool {"
-          << endl;
-      indent_up();
-      t_type* ttype = (*f_iter)->get_type()->get_true_type();
-      bool is_byteslice = ttype->is_base_type() && ((t_base_type*)ttype)->is_binary();
-      bool compare_to_nil_only = ttype->is_set() || ttype->is_list() || ttype->is_map()
-                                 || (is_byteslice && !(*f_iter)->get_value());
-      if (is_pointer_field(*f_iter) || compare_to_nil_only) {
-        out << indent() << "return p." << field_name << " != nil" << endl;
-      } else {
-        string def_var_name = tstruct_name + "_" + field_name + "_DEFAULT";
-        if (is_byteslice) {
-          out << indent() << "return !bytes.Equal(p." << field_name << ", " << def_var_name << ")"
-              << endl;
-        } else {
-          out << indent() << "return p." << field_name << " != " << def_var_name << endl;
-        }
-      }
-      indent_down();
-      out << indent() << "}" << endl << endl;
-    }
-  }
-}
-
-/**
- * Generates the CountSetFields helper method for a struct
- */
-void t_go_generator::generate_countsetfields_helper(ofstream& out,
-                                                    t_struct* tstruct,
-                                                    const string& tstruct_name,
-                                                    bool is_result) {
-  (void)is_result;
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  const string escaped_tstruct_name(escape_string(tstruct->get_name()));
-
-  out << indent() << "func (p *" << tstruct_name << ") CountSetFields" << tstruct_name << "() int {"
-      << endl;
-  indent_up();
-  out << indent() << "count := 0" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED)
-      continue;
-
-    if (!is_pointer_field(*f_iter))
-      continue;
-
-    const string field_name(publicize(escape_string((*f_iter)->get_name())));
-
-    out << indent() << "if (p.IsSet" << field_name << "()) {" << endl;
-    indent_up();
-    out << indent() << "count++" << endl;
-    indent_down();
-    out << indent() << "}" << endl;
-  }
-
-  out << indent() << "return count" << endl << endl;
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates the read method for a struct
- */
-void t_go_generator::generate_go_struct_reader(ofstream& out,
-                                               t_struct* tstruct,
-                                               const string& tstruct_name,
-                                               bool is_result) {
-  (void)is_result;
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  string escaped_tstruct_name(escape_string(tstruct->get_name()));
-  out << indent() << "func (p *" << tstruct_name << ") " << read_method_name_ << "(iprot thrift.TProtocol) error {"
-      << endl;
-  indent_up();
-  out << indent() << "if _, err := iprot.ReadStructBegin(); err != nil {" << endl;
-  out << indent() << "  return thrift.PrependError(fmt.Sprintf(\"%T read error: \", p), err)"
-      << endl;
-  out << indent() << "}" << endl << endl;
-
-  // Required variables does not have IsSet functions, so we need tmp vars to check them.
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      const string field_name(publicize(escape_string((*f_iter)->get_name())));
-      indent(out) << "var isset" << field_name << " bool = false;" << endl;
-    }
-  }
-  out << endl;
-
-  // Loop over reading in fields
-  indent(out) << "for {" << endl;
-  indent_up();
-  // Read beginning field marker
-  out << indent() << "_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()" << endl;
-  out << indent() << "if err != nil {" << endl;
-  out << indent() << "  return thrift.PrependError(fmt.Sprintf("
-                     "\"%T field %d read error: \", p, fieldId), err)" << endl;
-  out << indent() << "}" << endl;
-  // Check for field STOP marker and break
-  out << indent() << "if fieldTypeId == thrift.STOP { break; }" << endl;
-
-  string thriftFieldTypeId;
-  // Generate deserialization code for known cases
-  int32_t field_id = -1;
-
-  // Switch statement on the field we are reading, false if no fields present
-  bool have_switch = !fields.empty();
-  if (have_switch) {
-    indent(out) << "switch fieldId {" << endl;
-  }
-
-  // All the fields we know
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    field_id = (*f_iter)->get_key();
-
-    // if negative id, ensure we generate a valid method name
-    string field_method_prefix("ReadField");
-    int32_t field_method_suffix = field_id;
-
-    if (field_method_suffix < 0) {
-      field_method_prefix += "_";
-      field_method_suffix *= -1;
-    }
-
-    out << indent() << "case " << field_id << ":" << endl;
-    indent_up();
-    thriftFieldTypeId = type_to_enum((*f_iter)->get_type());
-
-    if (thriftFieldTypeId == "thrift.BINARY") {
-      thriftFieldTypeId = "thrift.STRING";
-    }
-
-    out << indent() << "if err := p." << field_method_prefix << field_method_suffix << "(iprot); err != nil {"
-        << endl;
-    out << indent() << "  return err" << endl;
-    out << indent() << "}" << endl;
-
-    // Mark required field as read
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      const string field_name(publicize(escape_string((*f_iter)->get_name())));
-      out << indent() << "isset" << field_name << " = true" << endl;
-    }
-
-    indent_down();
-  }
-
-  // Begin switch default case
-  if (have_switch) {
-    out << indent() << "default:" << endl;
-    indent_up();
-  }
-
-  // Skip unknown fields in either case
-  out << indent() << "if err := iprot.Skip(fieldTypeId); err != nil {" << endl;
-  out << indent() << "  return err" << endl;
-  out << indent() << "}" << endl;
-
-  // End switch default case
-  if (have_switch) {
-    indent_down();
-    out << indent() << "}" << endl;
-  }
-
-  // Read field end marker
-  out << indent() << "if err := iprot.ReadFieldEnd(); err != nil {" << endl;
-  out << indent() << "  return err" << endl;
-  out << indent() << "}" << endl;
-  indent_down();
-  out << indent() << "}" << endl;
-  out << indent() << "if err := iprot.ReadStructEnd(); err != nil {" << endl;
-  out << indent() << "  return thrift.PrependError(fmt.Sprintf("
-                     "\"%T read struct end error: \", p), err)" << endl;
-  out << indent() << "}" << endl;
-
-  // Return error if any required fields are missing.
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      const string field_name(publicize(escape_string((*f_iter)->get_name())));
-      out << indent() << "if !isset" << field_name << "{" << endl;
-      out << indent() << "  return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, "
-                         "fmt.Errorf(\"Required field " << field_name << " is not set\"));" << endl;
-      out << indent() << "}" << endl;
-    }
-  }
-
-  out << indent() << "return nil" << endl;
-  indent_down();
-  out << indent() << "}" << endl << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    string field_type_name(publicize((*f_iter)->get_type()->get_name()));
-    string field_name(publicize((*f_iter)->get_name()));
-    string field_method_prefix("ReadField");
-    int32_t field_id = (*f_iter)->get_key();
-    int32_t field_method_suffix = field_id;
-
-    if (field_method_suffix < 0) {
-      field_method_prefix += "_";
-      field_method_suffix *= -1;
-    }
-
-    out << indent() << "func (p *" << tstruct_name << ")  " << field_method_prefix << field_method_suffix
-        << "(iprot thrift.TProtocol) error {" << endl;
-    indent_up();
-    generate_deserialize_field(out, *f_iter, false, "p.");
-    indent_down();
-    out << indent() << "  return nil" << endl;
-    out << indent() << "}" << endl << endl;
-  }
-}
-
-void t_go_generator::generate_go_struct_writer(ofstream& out,
-                                               t_struct* tstruct,
-                                               const string& tstruct_name,
-                                               bool is_result,
-                                               bool uses_countsetfields) {
-  (void)is_result;
-  string name(tstruct->get_name());
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-  indent(out) << "func (p *" << tstruct_name << ") " << write_method_name_ << "(oprot thrift.TProtocol) error {" << endl;
-  indent_up();
-  if (tstruct->is_union() && uses_countsetfields) {
-    std::string tstruct_name(publicize(tstruct->get_name()));
-    out << indent() << "if c := p.CountSetFields" << tstruct_name << "(); c != 1 {" << endl
-        << indent()
-        << "  return fmt.Errorf(\"%T write union: exactly one field must be set (%d set).\", p, c)"
-        << endl << indent() << "}" << endl;
-  }
-  out << indent() << "if err := oprot.WriteStructBegin(\"" << name << "\"); err != nil {" << endl;
-  out << indent() << "  return thrift.PrependError(fmt.Sprintf("
-                     "\"%T write struct begin error: \", p), err) }" << endl;
-
-  string field_name;
-  string escape_field_name;
-  // t_const_value* field_default_value;
-  t_field::e_req field_required;
-  int32_t field_id = -1;
-
-  out << indent() << "if p != nil {" << endl;
-  indent_up();
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    string field_method_prefix("writeField");
-    field_name = (*f_iter)->get_name();
-    escape_field_name = escape_string(field_name);
-    field_id = (*f_iter)->get_key();
-    int32_t field_method_suffix = field_id;
-
-    if (field_method_suffix < 0) {
-      field_method_prefix += "_";
-      field_method_suffix *= -1;
-    }
-
-    out << indent() << "if err := p." << field_method_prefix << field_method_suffix
-        << "(oprot); err != nil { return err }" << endl;
-  }
-
-  indent_down();
-  out << indent() << "}" << endl;
-
-  // Write the struct map
-  out << indent() << "if err := oprot.WriteFieldStop(); err != nil {" << endl;
-  out << indent() << "  return thrift.PrependError(\"write field stop error: \", err) }" << endl;
-  out << indent() << "if err := oprot.WriteStructEnd(); err != nil {" << endl;
-  out << indent() << "  return thrift.PrependError(\"write struct stop error: \", err) }" << endl;
-  out << indent() << "return nil" << endl;
-  indent_down();
-  out << indent() << "}" << endl << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    string field_method_prefix("writeField");
-    field_id = (*f_iter)->get_key();
-    field_name = (*f_iter)->get_name();
-    escape_field_name = escape_string(field_name);
-    // field_default_value = (*f_iter)->get_value();
-    field_required = (*f_iter)->get_req();
-    int32_t field_method_suffix = field_id;
-
-    if (field_method_suffix < 0) {
-      field_method_prefix += "_";
-      field_method_suffix *= -1;
-    }
-
-    out << indent() << "func (p *" << tstruct_name << ") " << field_method_prefix << field_method_suffix
-        << "(oprot thrift.TProtocol) (err error) {" << endl;
-    indent_up();
-
-    if (field_required == t_field::T_OPTIONAL) {
-      out << indent() << "if p.IsSet" << publicize(field_name) << "() {" << endl;
-      indent_up();
-    }
-
-    out << indent() << "if err := oprot.WriteFieldBegin(\"" << escape_field_name << "\", "
-        << type_to_enum((*f_iter)->get_type()) << ", " << field_id << "); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(fmt.Sprintf(\"%T write field begin error "
-        << field_id << ":" << escape_field_name << ": \", p), err) }" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "p.");
-
-    // Write field closer
-    out << indent() << "if err := oprot.WriteFieldEnd(); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(fmt.Sprintf(\"%T write field end error "
-        << field_id << ":" << escape_field_name << ": \", p), err) }" << endl;
-
-    if (field_required == t_field::T_OPTIONAL) {
-      indent_down();
-      out << indent() << "}" << endl;
-    }
-
-    indent_down();
-    out << indent() << "  return err" << endl;
-    out << indent() << "}" << endl << endl;
-  }
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_go_generator::generate_service(t_service* tservice) {
-  string test_suffix("_test");
-  string filename = lowercase(service_name_);
-  string f_service_name;
-
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-  generate_service_helpers(tservice);
-  generate_service_remote(tservice);
-  f_types_ << endl;
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_go_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  f_types_ << "// HELPER FUNCTIONS AND STRUCTURES" << endl << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_go_struct_definition(f_types_, ts, false, false, true);
-    generate_go_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_go_generator::generate_go_function_helpers(t_function* tfunction) {
-  if (!tfunction->is_oneway()) {
-    t_struct result(program_, tfunction->get_name() + "_result");
-    t_field success(tfunction->get_returntype(), "success", 0);
-    success.set_req(t_field::T_OPTIONAL);
-
-    if (!tfunction->get_returntype()->is_void()) {
-      result.append(&success);
-    }
-
-    t_struct* xs = tfunction->get_xceptions();
-    const vector<t_field*>& fields = xs->get_members();
-    vector<t_field*>::const_iterator f_iter;
-
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      t_field* f = *f_iter;
-      f->set_req(t_field::T_OPTIONAL);
-      result.append(f);
-    }
-
-    generate_go_struct_definition(f_types_, &result, false, true);
-  }
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_go_generator::generate_service_interface(t_service* tservice) {
-  string extends = "";
-  string extends_if = "";
-  string serviceName(publicize(tservice->get_name()));
-  string interfaceName = serviceName;
-
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    size_t index = extends.rfind(".");
-
-    if (index != string::npos) {
-      extends_if = "\n" + indent() + "  " + extends.substr(0, index + 1)
-                   + publicize(extends.substr(index + 1)) + "\n";
-    } else {
-      extends_if = "\n" + indent() + publicize(extends) + "\n";
-    }
-  }
-
-  f_types_ << indent() << "type " << interfaceName << " interface {" << extends_if;
-  indent_up();
-  generate_go_docstring(f_types_, tservice);
-  vector<t_function*> functions = tservice->get_functions();
-
-  if (!functions.empty()) {
-    f_types_ << endl;
-    vector<t_function*>::iterator f_iter;
-
-    for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-      generate_go_docstring(f_types_, (*f_iter));
-      f_types_ << indent() << function_signature_if(*f_iter, "", true) << endl;
-    }
-  }
-
-  indent_down();
-  f_types_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_go_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_field = "";
-  string extends_client = "";
-  string extends_client_new = "";
-  string serviceName(publicize(tservice->get_name()));
-
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    size_t index = extends.rfind(".");
-
-    if (index != string::npos) {
-      extends_client = extends.substr(0, index + 1) + publicize(extends.substr(index + 1))
-                       + "Client";
-      extends_client_new = extends.substr(0, index + 1) + "New"
-                           + publicize(extends.substr(index + 1)) + "Client";
-    } else {
-      extends_client = publicize(extends) + "Client";
-      extends_client_new = "New" + extends_client;
-    }
-  }
-
-  extends_field = extends_client.substr(extends_client.find(".") + 1);
-
-  generate_go_docstring(f_types_, tservice);
-  f_types_ << indent() << "type " << serviceName << "Client struct {" << endl;
-  indent_up();
-
-  if (!extends_client.empty()) {
-    f_types_ << indent() << "*" << extends_client << endl;
-  } else {
-    f_types_ << indent() << "Transport thrift.TTransport" << endl;
-    f_types_ << indent() << "ProtocolFactory thrift.TProtocolFactory" << endl;
-    f_types_ << indent() << "InputProtocol thrift.TProtocol" << endl;
-    f_types_ << indent() << "OutputProtocol thrift.TProtocol" << endl;
-    f_types_ << indent() << "SeqId int32" << endl;
-    /*f_types_ << indent() << "reqs map[int32]Deferred" << endl*/;
-  }
-
-  indent_down();
-  f_types_ << indent() << "}" << endl << endl;
-  // Constructor function
-  f_types_ << indent() << "func New" << serviceName
-             << "ClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *" << serviceName
-             << "Client {" << endl;
-  indent_up();
-  f_types_ << indent() << "return &" << serviceName << "Client";
-
-  if (!extends.empty()) {
-    f_types_ << "{" << extends_field << ": " << extends_client_new << "Factory(t, f)}";
-  } else {
-    indent_up();
-    f_types_ << "{Transport: t," << endl;
-    f_types_ << indent() << "ProtocolFactory: f," << endl;
-    f_types_ << indent() << "InputProtocol: f.GetProtocol(t)," << endl;
-    f_types_ << indent() << "OutputProtocol: f.GetProtocol(t)," << endl;
-    f_types_ << indent() << "SeqId: 0," << endl;
-    /*f_types_ << indent() << "Reqs: make(map[int32]Deferred)" << endl*/;
-    indent_down();
-    f_types_ << indent() << "}" << endl;
-  }
-
-  indent_down();
-  f_types_ << indent() << "}" << endl << endl;
-  // Constructor function
-  f_types_
-      << indent() << "func New" << serviceName
-      << "ClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *"
-      << serviceName << "Client {" << endl;
-  indent_up();
-  f_types_ << indent() << "return &" << serviceName << "Client";
-
-  if (!extends.empty()) {
-    f_types_ << "{" << extends_field << ": " << extends_client_new << "Protocol(t, iprot, oprot)}"
-               << endl;
-  } else {
-    indent_up();
-    f_types_ << "{Transport: t," << endl;
-    f_types_ << indent() << "ProtocolFactory: nil," << endl;
-    f_types_ << indent() << "InputProtocol: iprot," << endl;
-    f_types_ << indent() << "OutputProtocol: oprot," << endl;
-    f_types_ << indent() << "SeqId: 0," << endl;
-    /*f_types_ << indent() << "Reqs: make(map[int32]interface{})" << endl*/;
-    indent_down();
-    f_types_ << indent() << "}" << endl;
-  }
-
-  indent_down();
-  f_types_ << indent() << "}" << endl << endl;
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string funname = publicize((*f_iter)->get_name());
-    // Open function
-    generate_go_docstring(f_types_, (*f_iter));
-    f_types_ << indent() << "func (p *" << serviceName << "Client) "
-               << function_signature_if(*f_iter, "", true) << " {" << endl;
-    indent_up();
-    /*
-    f_types_ <<
-      indent() << "p.SeqId += 1" << endl;
-    if (!(*f_iter)->is_oneway()) {
-      f_types_ <<
-        indent() << "d := defer.Deferred()" << endl <<
-        indent() << "p.Reqs[p.SeqId] = d" << endl;
-    }
-    */
-    f_types_ << indent() << "if err = p.send" << funname << "(";
-    bool first = true;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_types_ << ", ";
-      }
-
-      f_types_ << variable_name_to_go_name((*fld_iter)->get_name());
-    }
-
-    f_types_ << "); err != nil { return }" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_types_ << indent() << "return p.recv" << funname << "()" << endl;
-    } else {
-      f_types_ << indent() << "return" << endl;
-    }
-
-    indent_down();
-    f_types_ << indent() << "}" << endl << endl;
-    f_types_ << indent() << "func (p *" << serviceName << "Client) send"
-               << function_signature(*f_iter) << "(err error) {" << endl;
-    indent_up();
-    std::string argsname = publicize((*f_iter)->get_name() + "_args", true);
-    // Serialize the request header
-    f_types_ << indent() << "oprot := p.OutputProtocol" << endl;
-    f_types_ << indent() << "if oprot == nil {" << endl;
-    f_types_ << indent() << "  oprot = p.ProtocolFactory.GetProtocol(p.Transport)" << endl;
-    f_types_ << indent() << "  p.OutputProtocol = oprot" << endl;
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "p.SeqId++" << endl;
-    f_types_ << indent() << "if err = oprot.WriteMessageBegin(\"" << (*f_iter)->get_name()
-               << "\", " << ((*f_iter)->is_oneway() ? "thrift.ONEWAY" : "thrift.CALL")
-               << ", p.SeqId); err != nil {" << endl;
-    indent_up();
-    f_types_ << indent() << "  return" << endl;
-    indent_down();
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "args := " << argsname << "{" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_types_ << indent() << publicize((*fld_iter)->get_name()) << " : "
-                 << variable_name_to_go_name((*fld_iter)->get_name()) << "," << endl;
-    }
-    f_types_ << indent() << "}" << endl;
-
-    // Write to the stream
-    f_types_ << indent() << "if err = args." << write_method_name_ << "(oprot); err != nil {" << endl;
-    indent_up();
-    f_types_ << indent() << "  return" << endl;
-    indent_down();
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "if err = oprot.WriteMessageEnd(); err != nil {" << endl;
-    indent_up();
-    f_types_ << indent() << "  return" << endl;
-    indent_down();
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "return oprot.Flush()" << endl;
-    indent_down();
-    f_types_ << indent() << "}" << endl << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      std::string resultname = publicize((*f_iter)->get_name() + "_result", true);
-      // Open function
-      f_types_ << endl << indent() << "func (p *" << serviceName << "Client) recv"
-                 << publicize((*f_iter)->get_name()) << "() (";
-
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_types_ << "value " << type_to_go_type((*f_iter)->get_returntype()) << ", ";
-      }
-
-      f_types_ << "err error) {" << endl;
-      indent_up();
-      // TODO(mcslee): Validate message reply here, seq ids etc.
-      string error(tmp("error"));
-      string error2(tmp("error"));
-      f_types_ << indent() << "iprot := p.InputProtocol" << endl;
-      f_types_ << indent() << "if iprot == nil {" << endl;
-      f_types_ << indent() << "  iprot = p.ProtocolFactory.GetProtocol(p.Transport)" << endl;
-      f_types_ << indent() << "  p.InputProtocol = iprot" << endl;
-      f_types_ << indent() << "}" << endl;
-      f_types_ << indent() << "method, mTypeId, seqId, err := iprot.ReadMessageBegin()" << endl;
-      f_types_ << indent() << "if err != nil {" << endl;
-      f_types_ << indent() << "  return" << endl;
-      f_types_ << indent() << "}" << endl;
-      f_types_ << indent() << "if method != \"" << (*f_iter)->get_name() << "\" {" << endl;
-      f_types_ << indent() << "  err = thrift.NewTApplicationException("
-                 << "thrift.WRONG_METHOD_NAME, \"" << (*f_iter)->get_name()
-                 << " failed: wrong method name\")" << endl;
-      f_types_ << indent() << "  return" << endl;
-      f_types_ << indent() << "}" << endl;
-      f_types_ << indent() << "if p.SeqId != seqId {" << endl;
-      f_types_ << indent() << "  err = thrift.NewTApplicationException("
-                 << "thrift.BAD_SEQUENCE_ID, \"" << (*f_iter)->get_name()
-                 << " failed: out of sequence response\")" << endl;
-      f_types_ << indent() << "  return" << endl;
-      f_types_ << indent() << "}" << endl;
-      f_types_ << indent() << "if mTypeId == thrift.EXCEPTION {" << endl;
-      f_types_ << indent() << "  " << error
-                 << " := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "
-                    "\"Unknown Exception\")" << endl;
-      f_types_ << indent() << "  var " << error2 << " error" << endl;
-      f_types_ << indent() << "  " << error2 << ", err = " << error << ".Read(iprot)" << endl;
-      f_types_ << indent() << "  if err != nil {" << endl;
-      f_types_ << indent() << "    return" << endl;
-      f_types_ << indent() << "  }" << endl;
-      f_types_ << indent() << "  if err = iprot.ReadMessageEnd(); err != nil {" << endl;
-      f_types_ << indent() << "    return" << endl;
-      f_types_ << indent() << "  }" << endl;
-      f_types_ << indent() << "  err = " << error2 << endl;
-      f_types_ << indent() << "  return" << endl;
-      f_types_ << indent() << "}" << endl;
-      f_types_ << indent() << "if mTypeId != thrift.REPLY {" << endl;
-      f_types_ << indent() << "  err = thrift.NewTApplicationException("
-                 << "thrift.INVALID_MESSAGE_TYPE_EXCEPTION, \"" << (*f_iter)->get_name()
-                 << " failed: invalid message type\")" << endl;
-      f_types_ << indent() << "  return" << endl;
-      f_types_ << indent() << "}" << endl;
-      f_types_ << indent() << "result := " << resultname << "{}" << endl;
-      f_types_ << indent() << "if err = result." << read_method_name_ << "(iprot); err != nil {" << endl;
-      f_types_ << indent() << "  return" << endl;
-      f_types_ << indent() << "}" << endl;
-      f_types_ << indent() << "if err = iprot.ReadMessageEnd(); err != nil {" << endl;
-      f_types_ << indent() << "  return" << endl;
-      f_types_ << indent() << "}" << endl;
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        const std::string pubname = publicize((*x_iter)->get_name());
-
-        f_types_ << indent() << "if result." << pubname << " != nil {" << endl;
-        f_types_ << indent() << "  err = result." << pubname << endl;
-        f_types_ << indent() << "  return " << endl;
-        f_types_ << indent() << "}";
-
-        if ((x_iter + 1) != xceptions.end()) {
-          f_types_ << " else ";
-        } else {
-          f_types_ << endl;
-        }
-      }
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_types_ << indent() << "value = result.GetSuccess()" << endl;
-      }
-
-      f_types_ << indent() << "return" << endl;
-      // Close function
-      indent_down();
-      f_types_ << indent() << "}" << endl << endl;
-    }
-  }
-
-  // indent_down();
-  f_types_ << endl;
-}
-
-/**
- * Generates a command line tool for making remote requests
- *
- * @param tservice The service to generate a remote for.
- */
-void t_go_generator::generate_service_remote(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  t_service* parent = tservice->get_extends();
-
-  // collect inherited functions
-  while (parent != NULL) {
-    vector<t_function*> p_functions = parent->get_functions();
-    functions.insert(functions.end(), p_functions.begin(), p_functions.end());
-    parent = parent->get_extends();
-  }
-
-  vector<t_function*>::iterator f_iter;
-  string f_remote_name = package_dir_ + "/" + underscore(service_name_) + "-remote/"
-                         + underscore(service_name_) + "-remote.go";
-  ofstream f_remote;
-  f_remote.open(f_remote_name.c_str());
-  string service_module = get_real_go_module(program_);
-  string::size_type loc;
-
-  while ((loc = service_module.find(".")) != string::npos) {
-    service_module.replace(loc, 1, 1, '/');
-  }
-  if (!gen_package_prefix_.empty()) {
-    service_module = gen_package_prefix_ + service_module;
-  }
-
-  string unused_protection;
-
-  f_remote << go_autogen_comment();
-  f_remote << indent() << "package main" << endl << endl;
-  f_remote << indent() << "import (" << endl;
-  f_remote << indent() << "        \"flag\"" << endl;
-  f_remote << indent() << "        \"fmt\"" << endl;
-  f_remote << indent() << "        \"math\"" << endl;
-  f_remote << indent() << "        \"net\"" << endl;
-  f_remote << indent() << "        \"net/url\"" << endl;
-  f_remote << indent() << "        \"os\"" << endl;
-  f_remote << indent() << "        \"strconv\"" << endl;
-  f_remote << indent() << "        \"strings\"" << endl;
-  f_remote << indent() << "        \"" + gen_thrift_import_ + "\"" << endl;
-  f_remote << indent() << render_included_programs(unused_protection);
-  f_remote << indent() << "        \"" << service_module << "\"" << endl;
-  f_remote << indent() << ")" << endl;
-  f_remote << indent() << endl;
-  f_remote << indent() << unused_protection; // filled in render_included_programs()
-  f_remote << indent() << endl;
-  f_remote << indent() << "func Usage() {" << endl;
-  f_remote << indent() << "  fmt.Fprintln(os.Stderr, \"Usage of \", os.Args[0], \" "
-                          "[-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]:\")"
-           << endl;
-  f_remote << indent() << "  flag.PrintDefaults()" << endl;
-  f_remote << indent() << "  fmt.Fprintln(os.Stderr, \"\\nFunctions:\")" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_remote << "  fmt.Fprintln(os.Stderr, \"  " << (*f_iter)->get_returntype()->get_name() << " "
-             << (*f_iter)->get_name() << "(";
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const std::vector<t_field*>& args = arg_struct->get_members();
-    vector<t_field*>::const_iterator a_iter;
-    std::vector<t_field*>::size_type num_args = args.size();
-    bool first = true;
-
-    for (std::vector<t_field*>::size_type i = 0; i < num_args; ++i) {
-      if (first) {
-        first = false;
-      } else {
-        f_remote << ", ";
-      }
-
-      f_remote << args[i]->get_type()->get_name() << " " << args[i]->get_name();
-    }
-
-    f_remote << ")\")" << endl;
-  }
-
-  f_remote << indent() << "  fmt.Fprintln(os.Stderr)" << endl;
-  f_remote << indent() << "  os.Exit(0)" << endl;
-  f_remote << indent() << "}" << endl;
-  f_remote << indent() << endl;
-  f_remote << indent() << "func main() {" << endl;
-  indent_up();
-  f_remote << indent() << "flag.Usage = Usage" << endl;
-  f_remote << indent() << "var host string" << endl;
-  f_remote << indent() << "var port int" << endl;
-  f_remote << indent() << "var protocol string" << endl;
-  f_remote << indent() << "var urlString string" << endl;
-  f_remote << indent() << "var framed bool" << endl;
-  f_remote << indent() << "var useHttp bool" << endl;
-  f_remote << indent() << "var parsedUrl url.URL" << endl;
-  f_remote << indent() << "var trans thrift.TTransport" << endl;
-  f_remote << indent() << "_ = strconv.Atoi" << endl;
-  f_remote << indent() << "_ = math.Abs" << endl;
-  f_remote << indent() << "flag.Usage = Usage" << endl;
-  f_remote << indent() << "flag.StringVar(&host, \"h\", \"localhost\", \"Specify host and port\")"
-           << endl;
-  f_remote << indent() << "flag.IntVar(&port, \"p\", 9090, \"Specify port\")" << endl;
-  f_remote << indent() << "flag.StringVar(&protocol, \"P\", \"binary\", \""
-                          "Specify the protocol (binary, compact, simplejson, json)\")" << endl;
-  f_remote << indent() << "flag.StringVar(&urlString, \"u\", \"\", \"Specify the url\")" << endl;
-  f_remote << indent() << "flag.BoolVar(&framed, \"framed\", false, \"Use framed transport\")"
-           << endl;
-  f_remote << indent() << "flag.BoolVar(&useHttp, \"http\", false, \"Use http\")" << endl;
-  f_remote << indent() << "flag.Parse()" << endl;
-  f_remote << indent() << endl;
-  f_remote << indent() << "if len(urlString) > 0 {" << endl;
-  f_remote << indent() << "  parsedUrl, err := url.Parse(urlString)" << endl;
-  f_remote << indent() << "  if err != nil {" << endl;
-  f_remote << indent() << "    fmt.Fprintln(os.Stderr, \"Error parsing URL: \", err)" << endl;
-  f_remote << indent() << "    flag.Usage()" << endl;
-  f_remote << indent() << "  }" << endl;
-  f_remote << indent() << "  host = parsedUrl.Host" << endl;
-  f_remote << indent() << "  useHttp = len(parsedUrl.Scheme) <= 0 || parsedUrl.Scheme == \"http\""
-           << endl;
-  f_remote << indent() << "} else if useHttp {" << endl;
-  f_remote << indent() << "  _, err := url.Parse(fmt.Sprint(\"http://\", host, \":\", port))"
-           << endl;
-  f_remote << indent() << "  if err != nil {" << endl;
-  f_remote << indent() << "    fmt.Fprintln(os.Stderr, \"Error parsing URL: \", err)" << endl;
-  f_remote << indent() << "    flag.Usage()" << endl;
-  f_remote << indent() << "  }" << endl;
-  f_remote << indent() << "}" << endl;
-  f_remote << indent() << endl;
-  f_remote << indent() << "cmd := flag.Arg(0)" << endl;
-  f_remote << indent() << "var err error" << endl;
-  f_remote << indent() << "if useHttp {" << endl;
-  f_remote << indent() << "  trans, err = thrift.NewTHttpClient(parsedUrl.String())" << endl;
-  f_remote << indent() << "} else {" << endl;
-  f_remote << indent() << "  portStr := fmt.Sprint(port)" << endl;
-  f_remote << indent() << "  if strings.Contains(host, \":\") {" << endl;
-  f_remote << indent() << "         host, portStr, err = net.SplitHostPort(host)" << endl;
-  f_remote << indent() << "         if err != nil {" << endl;
-  f_remote << indent() << "                 fmt.Fprintln(os.Stderr, \"error with host:\", err)"
-           << endl;
-  f_remote << indent() << "                 os.Exit(1)" << endl;
-  f_remote << indent() << "         }" << endl;
-  f_remote << indent() << "  }" << endl;
-  f_remote << indent() << "  trans, err = thrift.NewTSocket(net.JoinHostPort(host, portStr))"
-           << endl;
-  f_remote << indent() << "  if err != nil {" << endl;
-  f_remote << indent() << "    fmt.Fprintln(os.Stderr, \"error resolving address:\", err)" << endl;
-  f_remote << indent() << "    os.Exit(1)" << endl;
-  f_remote << indent() << "  }" << endl;
-  f_remote << indent() << "  if framed {" << endl;
-  f_remote << indent() << "    trans = thrift.NewTFramedTransport(trans)" << endl;
-  f_remote << indent() << "  }" << endl;
-  f_remote << indent() << "}" << endl;
-  f_remote << indent() << "if err != nil {" << endl;
-  f_remote << indent() << "  fmt.Fprintln(os.Stderr, \"Error creating transport\", err)" << endl;
-  f_remote << indent() << "  os.Exit(1)" << endl;
-  f_remote << indent() << "}" << endl;
-  f_remote << indent() << "defer trans.Close()" << endl;
-  f_remote << indent() << "var protocolFactory thrift.TProtocolFactory" << endl;
-  f_remote << indent() << "switch protocol {" << endl;
-  f_remote << indent() << "case \"compact\":" << endl;
-  f_remote << indent() << "  protocolFactory = thrift.NewTCompactProtocolFactory()" << endl;
-  f_remote << indent() << "  break" << endl;
-  f_remote << indent() << "case \"simplejson\":" << endl;
-  f_remote << indent() << "  protocolFactory = thrift.NewTSimpleJSONProtocolFactory()" << endl;
-  f_remote << indent() << "  break" << endl;
-  f_remote << indent() << "case \"json\":" << endl;
-  f_remote << indent() << "  protocolFactory = thrift.NewTJSONProtocolFactory()" << endl;
-  f_remote << indent() << "  break" << endl;
-  f_remote << indent() << "case \"binary\", \"\":" << endl;
-  f_remote << indent() << "  protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()" << endl;
-  f_remote << indent() << "  break" << endl;
-  f_remote << indent() << "default:" << endl;
-  f_remote << indent() << "  fmt.Fprintln(os.Stderr, \"Invalid protocol specified: \", protocol)"
-           << endl;
-  f_remote << indent() << "  Usage()" << endl;
-  f_remote << indent() << "  os.Exit(1)" << endl;
-  f_remote << indent() << "}" << endl;
-  f_remote << indent() << "client := " << package_name_ << ".New" << publicize(service_name_)
-           << "ClientFactory(trans, protocolFactory)" << endl;
-  f_remote << indent() << "if err := trans.Open(); err != nil {" << endl;
-  f_remote << indent() << "  fmt.Fprintln(os.Stderr, \"Error opening socket to \", "
-                          "host, \":\", port, \" \", err)" << endl;
-  f_remote << indent() << "  os.Exit(1)" << endl;
-  f_remote << indent() << "}" << endl;
-  f_remote << indent() << endl;
-  f_remote << indent() << "switch cmd {" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const std::vector<t_field*>& args = arg_struct->get_members();
-    vector<t_field*>::const_iterator a_iter;
-    std::vector<t_field*>::size_type num_args = args.size();
-    string funcName((*f_iter)->get_name());
-    string pubName(publicize(funcName));
-    string argumentsName(publicize(funcName + "_args", true));
-    f_remote << indent() << "case \"" << escape_string(funcName) << "\":" << endl;
-    indent_up();
-    f_remote << indent() << "if flag.NArg() - 1 != " << num_args << " {" << endl;
-    f_remote << indent() << "  fmt.Fprintln(os.Stderr, \"" << escape_string(pubName) << " requires "
-             << num_args << " args\")" << endl;
-    f_remote << indent() << "  flag.Usage()" << endl;
-    f_remote << indent() << "}" << endl;
-
-    for (std::vector<t_field*>::size_type i = 0; i < num_args; ++i) {
-      int flagArg = i + 1;
-      t_type* the_type(args[i]->get_type());
-      t_type* the_type2(get_true_type(the_type));
-
-      if (the_type2->is_enum()) {
-        f_remote << indent() << "tmp" << i << ", err := (strconv.Atoi(flag.Arg(" << flagArg << ")))"
-                 << endl;
-        f_remote << indent() << "if err != nil {" << endl;
-        f_remote << indent() << "  Usage()" << endl;
-        f_remote << indent() << " return" << endl;
-        f_remote << indent() << "}" << endl;
-        f_remote << indent() << "argvalue" << i << " := " << package_name_ << "."
-                 << publicize(the_type->get_name()) << "(tmp" << i << ")" << endl;
-      } else if (the_type2->is_base_type()) {
-        t_base_type::t_base e = ((t_base_type*)the_type2)->get_base();
-        string err(tmp("err"));
-
-        switch (e) {
-        case t_base_type::TYPE_VOID:
-          break;
-
-        case t_base_type::TYPE_STRING:
-          if (((t_base_type*)the_type2)->is_binary()) {
-            f_remote << indent() << "argvalue" << i << " := []byte(flag.Arg(" << flagArg << "))"
-                     << endl;
-          } else {
-            f_remote << indent() << "argvalue" << i << " := flag.Arg(" << flagArg << ")" << endl;
-          }
-          break;
-
-        case t_base_type::TYPE_BOOL:
-          f_remote << indent() << "argvalue" << i << " := flag.Arg(" << flagArg << ") == \"true\""
-                   << endl;
-          break;
-
-        case t_base_type::TYPE_I8:
-          f_remote << indent() << "tmp" << i << ", " << err << " := (strconv.Atoi(flag.Arg("
-                   << flagArg << ")))" << endl;
-          f_remote << indent() << "if " << err << " != nil {" << endl;
-          f_remote << indent() << "  Usage()" << endl;
-          f_remote << indent() << "  return" << endl;
-          f_remote << indent() << "}" << endl;
-          f_remote << indent() << "argvalue" << i << " := int8(tmp" << i << ")" << endl;
-          break;
-
-        case t_base_type::TYPE_I16:
-          f_remote << indent() << "tmp" << i << ", " << err << " := (strconv.Atoi(flag.Arg("
-                   << flagArg << ")))" << endl;
-          f_remote << indent() << "if " << err << " != nil {" << endl;
-          f_remote << indent() << "  Usage()" << endl;
-          f_remote << indent() << "  return" << endl;
-          f_remote << indent() << "}" << endl;
-          f_remote << indent() << "argvalue" << i << " := int16(tmp" << i << ")" << endl;
-          break;
-
-        case t_base_type::TYPE_I32:
-          f_remote << indent() << "tmp" << i << ", " << err << " := (strconv.Atoi(flag.Arg("
-                   << flagArg << ")))" << endl;
-          f_remote << indent() << "if " << err << " != nil {" << endl;
-          f_remote << indent() << "  Usage()" << endl;
-          f_remote << indent() << "  return" << endl;
-          f_remote << indent() << "}" << endl;
-          f_remote << indent() << "argvalue" << i << " := int32(tmp" << i << ")" << endl;
-          break;
-
-        case t_base_type::TYPE_I64:
-          f_remote << indent() << "argvalue" << i << ", " << err
-                   << " := (strconv.ParseInt(flag.Arg(" << flagArg << "), 10, 64))" << endl;
-          f_remote << indent() << "if " << err << " != nil {" << endl;
-          f_remote << indent() << "  Usage()" << endl;
-          f_remote << indent() << "  return" << endl;
-          f_remote << indent() << "}" << endl;
-          break;
-
-        case t_base_type::TYPE_DOUBLE:
-          f_remote << indent() << "argvalue" << i << ", " << err
-                   << " := (strconv.ParseFloat(flag.Arg(" << flagArg << "), 64))" << endl;
-          f_remote << indent() << "if " << err << " != nil {" << endl;
-          f_remote << indent() << "  Usage()" << endl;
-          f_remote << indent() << "  return" << endl;
-          f_remote << indent() << "}" << endl;
-          break;
-
-        default:
-          throw("Invalid base type in generate_service_remote");
-        }
-
-        // f_remote << publicize(args[i]->get_name()) << "(strconv.Atoi(flag.Arg(" << flagArg <<
-        // ")))";
-      } else if (the_type2->is_struct()) {
-        string arg(tmp("arg"));
-        string mbTrans(tmp("mbTrans"));
-        string err1(tmp("err"));
-        string factory(tmp("factory"));
-        string jsProt(tmp("jsProt"));
-        string err2(tmp("err"));
-        std::string tstruct_name(publicize(the_type->get_name()));
-        std::string tstruct_module( module_name(the_type));
-        if(tstruct_module.empty()) {
-          tstruct_module = package_name_;
-        }
-
-        f_remote << indent() << arg << " := flag.Arg(" << flagArg << ")" << endl;
-        f_remote << indent() << mbTrans << " := thrift.NewTMemoryBufferLen(len(" << arg << "))"
-                 << endl;
-        f_remote << indent() << "defer " << mbTrans << ".Close()" << endl;
-        f_remote << indent() << "_, " << err1 << " := " << mbTrans << ".WriteString(" << arg << ")"
-                 << endl;
-        f_remote << indent() << "if " << err1 << " != nil {" << endl;
-        f_remote << indent() << "  Usage()" << endl;
-        f_remote << indent() << "  return" << endl;
-        f_remote << indent() << "}" << endl;
-        f_remote << indent() << factory << " := thrift.NewTSimpleJSONProtocolFactory()" << endl;
-        f_remote << indent() << jsProt << " := " << factory << ".GetProtocol(" << mbTrans << ")"
-                 << endl;
-        f_remote << indent() << "argvalue" << i << " := " << tstruct_module << ".New" << tstruct_name
-                 << "()" << endl;
-        f_remote << indent() << err2 << " := argvalue" << i << "." << read_method_name_ <<  "(" << jsProt << ")" << endl;
-        f_remote << indent() << "if " << err2 << " != nil {" << endl;
-        f_remote << indent() << "  Usage()" << endl;
-        f_remote << indent() << "  return" << endl;
-        f_remote << indent() << "}" << endl;
-      } else if (the_type2->is_container() || the_type2->is_xception()) {
-        string arg(tmp("arg"));
-        string mbTrans(tmp("mbTrans"));
-        string err1(tmp("err"));
-        string factory(tmp("factory"));
-        string jsProt(tmp("jsProt"));
-        string err2(tmp("err"));
-        std::string argName(publicize(args[i]->get_name()));
-        f_remote << indent() << arg << " := flag.Arg(" << flagArg << ")" << endl;
-        f_remote << indent() << mbTrans << " := thrift.NewTMemoryBufferLen(len(" << arg << "))"
-                 << endl;
-        f_remote << indent() << "defer " << mbTrans << ".Close()" << endl;
-        f_remote << indent() << "_, " << err1 << " := " << mbTrans << ".WriteString(" << arg << ")"
-                 << endl;
-        f_remote << indent() << "if " << err1 << " != nil { " << endl;
-        f_remote << indent() << "  Usage()" << endl;
-        f_remote << indent() << "  return" << endl;
-        f_remote << indent() << "}" << endl;
-        f_remote << indent() << factory << " := thrift.NewTSimpleJSONProtocolFactory()" << endl;
-        f_remote << indent() << jsProt << " := " << factory << ".GetProtocol(" << mbTrans << ")"
-                 << endl;
-        f_remote << indent() << "containerStruct" << i << " := " << package_name_ << ".New"
-                 << argumentsName << "()" << endl;
-        f_remote << indent() << err2 << " := containerStruct" << i << ".ReadField" << (i + 1) << "("
-                 << jsProt << ")" << endl;
-        f_remote << indent() << "if " << err2 << " != nil {" << endl;
-        f_remote << indent() << "  Usage()" << endl;
-        f_remote << indent() << "  return" << endl;
-        f_remote << indent() << "}" << endl;
-        f_remote << indent() << "argvalue" << i << " := containerStruct" << i << "." << argName
-                 << endl;
-      } else {
-        throw("Invalid argument type in generate_service_remote");
-      }
-
-      if (the_type->is_typedef()) {
-        std::string typedef_module( module_name(the_type));
-        if(typedef_module.empty()) {
-          typedef_module = package_name_;
-        }
-        f_remote << indent() << "value" << i << " := " << typedef_module << "."
-                 << publicize(the_type->get_name()) << "(argvalue" << i << ")" << endl;
-      } else {
-        f_remote << indent() << "value" << i << " := argvalue" << i << endl;
-      }
-    }
-
-    f_remote << indent() << "fmt.Print(client." << pubName << "(";
-    bool argFirst = true;
-
-    for (std::vector<t_field*>::size_type i = 0; i < num_args; ++i) {
-      if (argFirst) {
-        argFirst = false;
-      } else {
-        f_remote << ", ";
-      }
-
-      if (args[i]->get_type()->is_enum()) {
-        f_remote << "value" << i;
-      } else if (args[i]->get_type()->is_base_type()) {
-        t_base_type::t_base e = ((t_base_type*)(args[i]->get_type()))->get_base();
-
-        switch (e) {
-        case t_base_type::TYPE_VOID:
-          break;
-
-        case t_base_type::TYPE_STRING:
-        case t_base_type::TYPE_BOOL:
-        case t_base_type::TYPE_I8:
-        case t_base_type::TYPE_I16:
-        case t_base_type::TYPE_I32:
-        case t_base_type::TYPE_I64:
-        case t_base_type::TYPE_DOUBLE:
-          f_remote << "value" << i;
-          break;
-
-        default:
-          throw("Invalid base type in generate_service_remote");
-        }
-
-        // f_remote << publicize(args[i]->get_name()) << "(strconv.Atoi(flag.Arg(" << flagArg <<
-        // ")))";
-      } else {
-        f_remote << "value" << i;
-      }
-    }
-
-    f_remote << "))" << endl;
-    f_remote << indent() << "fmt.Print(\"\\n\")" << endl;
-    f_remote << indent() << "break" << endl;
-    indent_down();
-  }
-
-  f_remote << indent() << "case \"\":" << endl;
-  f_remote << indent() << "  Usage()" << endl;
-  f_remote << indent() << "  break" << endl;
-  f_remote << indent() << "default:" << endl;
-  f_remote << indent() << "  fmt.Fprintln(os.Stderr, \"Invalid function \", cmd)" << endl;
-  f_remote << indent() << "}" << endl;
-  indent_down();
-  f_remote << indent() << "}" << endl;
-  // Close service file
-  f_remote.close();
-  format_go_output(f_remote_name);
-#ifndef _MSC_VER
-  // Make file executable, love that bitwise OR action
-  chmod(f_remote_name.c_str(),
-        S_IRUSR | S_IWUSR | S_IXUSR
-#ifndef _WIN32
-        | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH
-#endif
-        );
-#endif
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_go_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  string extends = "";
-  string extends_processor = "";
-  string extends_processor_new = "";
-  string serviceName(publicize(tservice->get_name()));
-
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    size_t index = extends.rfind(".");
-
-    if (index != string::npos) {
-      extends_processor = extends.substr(0, index + 1) + publicize(extends.substr(index + 1))
-                          + "Processor";
-      extends_processor_new = extends.substr(0, index + 1) + "New"
-                              + publicize(extends.substr(index + 1)) + "Processor";
-    } else {
-      extends_processor = publicize(extends) + "Processor";
-      extends_processor_new = "New" + extends_processor;
-    }
-  }
-
-  string pServiceName(privatize(tservice->get_name()));
-  // Generate the header portion
-  string self(tmp("self"));
-
-  if (extends_processor.empty()) {
-    f_types_ << indent() << "type " << serviceName << "Processor struct {" << endl;
-    f_types_ << indent() << "  processorMap map[string]thrift.TProcessorFunction" << endl;
-    f_types_ << indent() << "  handler " << serviceName << endl;
-    f_types_ << indent() << "}" << endl << endl;
-    f_types_ << indent() << "func (p *" << serviceName
-               << "Processor) AddToProcessorMap(key string, processor thrift.TProcessorFunction) {"
-               << endl;
-    f_types_ << indent() << "  p.processorMap[key] = processor" << endl;
-    f_types_ << indent() << "}" << endl << endl;
-    f_types_ << indent() << "func (p *" << serviceName
-               << "Processor) GetProcessorFunction(key string) "
-                  "(processor thrift.TProcessorFunction, ok bool) {" << endl;
-    f_types_ << indent() << "  processor, ok = p.processorMap[key]" << endl;
-    f_types_ << indent() << "  return processor, ok" << endl;
-    f_types_ << indent() << "}" << endl << endl;
-    f_types_ << indent() << "func (p *" << serviceName
-               << "Processor) ProcessorMap() map[string]thrift.TProcessorFunction {" << endl;
-    f_types_ << indent() << "  return p.processorMap" << endl;
-    f_types_ << indent() << "}" << endl << endl;
-    f_types_ << indent() << "func New" << serviceName << "Processor(handler " << serviceName
-               << ") *" << serviceName << "Processor {" << endl << endl;
-    f_types_
-        << indent() << "  " << self << " := &" << serviceName
-        << "Processor{handler:handler, processorMap:make(map[string]thrift.TProcessorFunction)}"
-        << endl;
-
-    for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-      string escapedFuncName(escape_string((*f_iter)->get_name()));
-      f_types_ << indent() << "  " << self << ".processorMap[\"" << escapedFuncName << "\"] = &"
-                 << pServiceName << "Processor" << publicize((*f_iter)->get_name())
-                 << "{handler:handler}" << endl;
-    }
-
-    string x(tmp("x"));
-    f_types_ << indent() << "return " << self << endl;
-    f_types_ << indent() << "}" << endl << endl;
-    f_types_ << indent() << "func (p *" << serviceName
-               << "Processor) Process(iprot, oprot thrift.TProtocol) (success bool, err "
-                  "thrift.TException) {" << endl;
-    f_types_ << indent() << "  name, _, seqId, err := iprot.ReadMessageBegin()" << endl;
-    f_types_ << indent() << "  if err != nil { return false, err }" << endl;
-    f_types_ << indent() << "  if processor, ok := p.GetProcessorFunction(name); ok {" << endl;
-    f_types_ << indent() << "    return processor.Process(seqId, iprot, oprot)" << endl;
-    f_types_ << indent() << "  }" << endl;
-    f_types_ << indent() << "  iprot.Skip(thrift.STRUCT)" << endl;
-    f_types_ << indent() << "  iprot.ReadMessageEnd()" << endl;
-    f_types_ << indent() << "  " << x
-               << " := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, \"Unknown function "
-                  "\" + name)" << endl;
-    f_types_ << indent() << "  oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId)" << endl;
-    f_types_ << indent() << "  " << x << ".Write(oprot)" << endl;
-    f_types_ << indent() << "  oprot.WriteMessageEnd()" << endl;
-    f_types_ << indent() << "  oprot.Flush()" << endl;
-    f_types_ << indent() << "  return false, " << x << endl;
-    f_types_ << indent() << "" << endl;
-    f_types_ << indent() << "}" << endl << endl;
-  } else {
-    f_types_ << indent() << "type " << serviceName << "Processor struct {" << endl;
-    f_types_ << indent() << "  *" << extends_processor << endl;
-    f_types_ << indent() << "}" << endl << endl;
-    f_types_ << indent() << "func New" << serviceName << "Processor(handler " << serviceName
-               << ") *" << serviceName << "Processor {" << endl;
-    f_types_ << indent() << "  " << self << " := &" << serviceName << "Processor{"
-               << extends_processor_new << "(handler)}" << endl;
-
-    for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-      string escapedFuncName(escape_string((*f_iter)->get_name()));
-      f_types_ << indent() << "  " << self << ".AddToProcessorMap(\"" << escapedFuncName
-                 << "\", &" << pServiceName << "Processor" << publicize((*f_iter)->get_name())
-                 << "{handler:handler})" << endl;
-    }
-
-    f_types_ << indent() << "  return " << self << endl;
-    f_types_ << indent() << "}" << endl << endl;
-  }
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  f_types_ << endl;
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_go_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  // Open function
-  string processorName = privatize(tservice->get_name()) + "Processor"
-                         + publicize(tfunction->get_name());
-  string argsname = publicize(tfunction->get_name() + "_args", true);
-  string resultname = publicize(tfunction->get_name() + "_result", true);
-  // t_struct* xs = tfunction->get_xceptions();
-  // const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-  f_types_ << indent() << "type " << processorName << " struct {" << endl;
-  f_types_ << indent() << "  handler " << publicize(tservice->get_name()) << endl;
-  f_types_ << indent() << "}" << endl << endl;
-  f_types_ << indent() << "func (p *" << processorName
-             << ") Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err "
-                "thrift.TException) {" << endl;
-  indent_up();
-  f_types_ << indent() << "args := " << argsname << "{}" << endl;
-  f_types_ << indent() << "if err = args." << read_method_name_ <<  "(iprot); err != nil {" << endl;
-  f_types_ << indent() << "  iprot.ReadMessageEnd()" << endl;
-  if (!tfunction->is_oneway()) {
-    f_types_ << indent()
-               << "  x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error())"
-               << endl;
-    f_types_ << indent() << "  oprot.WriteMessageBegin(\"" << escape_string(tfunction->get_name())
-               << "\", thrift.EXCEPTION, seqId)" << endl;
-    f_types_ << indent() << "  x.Write(oprot)" << endl;
-    f_types_ << indent() << "  oprot.WriteMessageEnd()" << endl;
-    f_types_ << indent() << "  oprot.Flush()" << endl;
-  }
-  f_types_ << indent() << "  return false, err" << endl;
-  f_types_ << indent() << "}" << endl << endl;
-  f_types_ << indent() << "iprot.ReadMessageEnd()" << endl;
-
-  if (!tfunction->is_oneway()) {
-    f_types_ << indent() << "result := " << resultname << "{}" << endl;
-  }
-  bool need_reference = type_need_reference(tfunction->get_returntype());
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_types_ << "var retval " << type_to_go_type(tfunction->get_returntype()) << endl;
-  }
-
-  f_types_ << indent() << "var err2 error" << endl;
-  f_types_ << indent() << "if ";
-
-  if (!tfunction->is_oneway()) {
-    if (!tfunction->get_returntype()->is_void()) {
-      f_types_ << "retval, ";
-    }
-  }
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  f_types_ << "err2 = p.handler." << publicize(tfunction->get_name()) << "(";
-  bool first = true;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_types_ << ", ";
-    }
-
-    f_types_ << "args." << publicize((*f_iter)->get_name());
-  }
-
-  f_types_ << "); err2 != nil {" << endl;
-
-  t_struct* exceptions = tfunction->get_xceptions();
-  const vector<t_field*>& x_fields = exceptions->get_members();
-  if (!x_fields.empty()) {
-    f_types_ << indent() << "switch v := err2.(type) {" << endl;
-
-    vector<t_field*>::const_iterator xf_iter;
-
-    for (xf_iter = x_fields.begin(); xf_iter != x_fields.end(); ++xf_iter) {
-      f_types_ << indent() << "  case " << type_to_go_type(((*xf_iter)->get_type())) << ":"
-                 << endl;
-      f_types_ << indent() << "result." << publicize((*xf_iter)->get_name()) << " = v" << endl;
-    }
-
-    f_types_ << indent() << "  default:" << endl;
-  }
-
-  if (!tfunction->is_oneway()) {
-    f_types_ << indent() << "  x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "
-                              "\"Internal error processing " << escape_string(tfunction->get_name())
-               << ": \" + err2.Error())" << endl;
-    f_types_ << indent() << "  oprot.WriteMessageBegin(\"" << escape_string(tfunction->get_name())
-               << "\", thrift.EXCEPTION, seqId)" << endl;
-    f_types_ << indent() << "  x.Write(oprot)" << endl;
-    f_types_ << indent() << "  oprot.WriteMessageEnd()" << endl;
-    f_types_ << indent() << "  oprot.Flush()" << endl;
-  }
-
-  f_types_ << indent() << "  return true, err2" << endl;
-
-  if (!x_fields.empty()) {
-    f_types_ << indent() << "}" << endl;
-  }
-
-  f_types_ << indent() << "}"; // closes err2 != nil
-
-  if (!tfunction->is_oneway()) {
-    if (!tfunction->get_returntype()->is_void()) {
-      f_types_ << " else {" << endl; // make sure we set Success retval only on success
-      indent_up();
-      f_types_ << indent() << "result.Success = ";
-      if (need_reference) {
-        f_types_ << "&";
-      }
-      f_types_ << "retval" << endl;
-      indent_down();
-      f_types_ << "}" << endl;
-    } else {
-      f_types_ << endl;
-    }
-    f_types_ << indent() << "if err2 = oprot.WriteMessageBegin(\""
-               << escape_string(tfunction->get_name()) << "\", thrift.REPLY, seqId); err2 != nil {"
-               << endl;
-    f_types_ << indent() << "  err = err2" << endl;
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "if err2 = result." << write_method_name_ << "(oprot); err == nil && err2 != nil {" << endl;
-    f_types_ << indent() << "  err = err2" << endl;
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil {"
-               << endl;
-    f_types_ << indent() << "  err = err2" << endl;
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "if err2 = oprot.Flush(); err == nil && err2 != nil {" << endl;
-    f_types_ << indent() << "  err = err2" << endl;
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "if err != nil {" << endl;
-    f_types_ << indent() << "  return" << endl;
-    f_types_ << indent() << "}" << endl;
-    f_types_ << indent() << "return true, err" << endl;
-  } else {
-    f_types_ << endl;
-    f_types_ << indent() << "return true, nil" << endl;
-  }
-  indent_down();
-  f_types_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_go_generator::generate_deserialize_field(ofstream& out,
-                                                t_field* tfield,
-                                                bool declare,
-                                                string prefix,
-                                                bool inclass,
-                                                bool coerceData,
-                                                bool inkey,
-                                                bool in_container_value,
-                                                bool use_true_type) {
-  (void)inclass;
-  (void)coerceData;
-  t_type* orig_type = tfield->get_type();
-  t_type* type = get_true_type(orig_type);
-  string name(prefix + publicize(tfield->get_name()));
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + name;
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out,
-                                (t_struct*)type,
-                                is_pointer_field(tfield, in_container_value),
-                                declare,
-                                name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, orig_type, is_pointer_field(tfield), declare, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    if (declare) {
-      t_type* actual_type = use_true_type ? tfield->get_type()->get_true_type()
-                                          : tfield->get_type();
-
-      string type_name = inkey ? type_to_go_key_type(actual_type) : type_to_go_type(actual_type);
-
-      out << "var " << tfield->get_name() << " " << type_name << endl;
-    }
-
-    indent(out) << "if v, err := iprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary() && !inkey) {
-          out << "ReadBinary()";
-        } else {
-          out << "ReadString()";
-        }
-
-        break;
-
-      case t_base_type::TYPE_BOOL:
-        out << "ReadBool()";
-        break;
-
-      case t_base_type::TYPE_I8:
-        out << "ReadByte()";
-        break;
-
-      case t_base_type::TYPE_I16:
-        out << "ReadI16()";
-        break;
-
-      case t_base_type::TYPE_I32:
-        out << "ReadI32()";
-        break;
-
-      case t_base_type::TYPE_I64:
-        out << "ReadI64()";
-        break;
-
-      case t_base_type::TYPE_DOUBLE:
-        out << "ReadDouble()";
-        break;
-
-      default:
-        throw "compiler error: no Go name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "ReadI32()";
-    }
-
-    out << "; err != nil {" << endl;
-    out << indent() << "return thrift.PrependError(\"error reading field " << tfield->get_key()
-        << ": \", err)" << endl;
-
-    out << "} else {" << endl;
-    string wrap;
-
-    if (type->is_enum() || (orig_type->is_typedef() && !use_true_type)) {
-      wrap = publicize(type_name(orig_type));
-    } else if (((t_base_type*)type)->get_base() == t_base_type::TYPE_I8) {
-      wrap = "int8";
-    }
-
-    string maybe_address = (is_pointer_field(tfield) ? "&" : "");
-    if (wrap == "") {
-      indent(out) << name << " = " << maybe_address << "v" << endl;
-    } else {
-      indent(out) << "temp := " << wrap << "(v)" << endl;
-      indent(out) << name << " = " << maybe_address << "temp" << endl;
-    }
-
-    out << "}" << endl;
-  } else {
-    throw "INVALID TYPE IN generate_deserialize_field '" + type->get_name() + "' for field '"
-        + tfield->get_name() + "'";
-  }
-}
-
-/**
- * Generates an unserializer for a struct, calling read()
- */
-void t_go_generator::generate_deserialize_struct(ofstream& out,
-                                                 t_struct* tstruct,
-                                                 bool pointer_field,
-                                                 bool declare,
-                                                 string prefix) {
-  string eq(declare ? " := " : " = ");
-
-  out << indent() << prefix << eq << (pointer_field ? "&" : "");
-  generate_go_struct_initializer(out, tstruct);
-  out << indent() << "if err := " << prefix << "." << read_method_name_ <<  "(iprot); err != nil {" << endl;
-  out << indent() << "  return thrift.PrependError(fmt.Sprintf(\"%T error reading struct: \", "
-      << prefix << "), err)" << endl;
-  out << indent() << "}" << endl;
-}
-
-/**
- * Serialize a container by writing out the header followed by
- * data and then a footer.
- */
-void t_go_generator::generate_deserialize_container(ofstream& out,
-                                                    t_type* orig_type,
-                                                    bool pointer_field,
-                                                    bool declare,
-                                                    string prefix) {
-  t_type* ttype = get_true_type(orig_type);
-  string eq(" = ");
-
-  if (declare) {
-    eq = " := ";
-  }
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    out << indent() << "_, _, size, err := iprot.ReadMapBegin()" << endl;
-    out << indent() << "if err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error reading map begin: \", err)" << endl;
-    out << indent() << "}" << endl;
-    out << indent() << "tMap := make(" << type_to_go_type(orig_type) << ", size)" << endl;
-    out << indent() << prefix << eq << " " << (pointer_field ? "&" : "") << "tMap" << endl;
-  } else if (ttype->is_set()) {
-    t_set* t = (t_set*)ttype;
-    out << indent() << "_, size, err := iprot.ReadSetBegin()" << endl;
-    out << indent() << "if err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error reading set begin: \", err)" << endl;
-    out << indent() << "}" << endl;
-    out << indent() << "tSet := make(map["
-        << type_to_go_key_type(t->get_elem_type()->get_true_type()) << "]struct{}, size)" << endl;
-    out << indent() << prefix << eq << " " << (pointer_field ? "&" : "") << "tSet" << endl;
-  } else if (ttype->is_list()) {
-    out << indent() << "_, size, err := iprot.ReadListBegin()" << endl;
-    out << indent() << "if err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error reading list begin: \", err)" << endl;
-    out << indent() << "}" << endl;
-    out << indent() << "tSlice := make(" << type_to_go_type(orig_type) << ", 0, size)" << endl;
-    out << indent() << prefix << eq << " " << (pointer_field ? "&" : "") << "tSlice" << endl;
-  } else {
-    throw "INVALID TYPE IN generate_deserialize_container '" + ttype->get_name() + "' for prefix '"
-        + prefix + "'";
-  }
-
-  // For loop iterates over elements
-  out << indent() << "for i := 0; i < size; i ++ {" << endl;
-  indent_up();
-
-  if (pointer_field) {
-    prefix = "(*" + prefix + ")";
-  }
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, declare, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, declare, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, declare, prefix);
-  }
-
-  indent_down();
-  out << indent() << "}" << endl;
-
-  // Read container end
-  if (ttype->is_map()) {
-    out << indent() << "if err := iprot.ReadMapEnd(); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error reading map end: \", err)" << endl;
-    out << indent() << "}" << endl;
-  } else if (ttype->is_set()) {
-    out << indent() << "if err := iprot.ReadSetEnd(); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error reading set end: \", err)" << endl;
-    out << indent() << "}" << endl;
-  } else if (ttype->is_list()) {
-    out << indent() << "if err := iprot.ReadListEnd(); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error reading list end: \", err)" << endl;
-    out << indent() << "}" << endl;
-  }
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_go_generator::generate_deserialize_map_element(ofstream& out,
-                                                      t_map* tmap,
-                                                      bool declare,
-                                                      string prefix) {
-  (void)declare;
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-  fkey.set_req(t_field::T_OPT_IN_REQ_OUT);
-  fval.set_req(t_field::T_OPT_IN_REQ_OUT);
-  generate_deserialize_field(out, &fkey, true, "", false, false, true);
-  generate_deserialize_field(out, &fval, true, "", false, false, false, true);
-  indent(out) << prefix << "[" << key << "] = " << val << endl;
-}
-
-/**
- * Write a set element
- */
-void t_go_generator::generate_deserialize_set_element(ofstream& out,
-                                                      t_set* tset,
-                                                      bool declare,
-                                                      string prefix) {
-  (void)declare;
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-  felem.set_req(t_field::T_OPT_IN_REQ_OUT);
-  generate_deserialize_field(out, &felem, true, "", false, false, false, true, true);
-  indent(out) << prefix << "[" << elem << "] = struct{}{}" << endl;
-}
-
-/**
- * Write a list element
- */
-void t_go_generator::generate_deserialize_list_element(ofstream& out,
-                                                       t_list* tlist,
-                                                       bool declare,
-                                                       string prefix) {
-  (void)declare;
-  string elem = tmp("_elem");
-  t_field felem(((t_list*)tlist)->get_elem_type(), elem);
-  felem.set_req(t_field::T_OPT_IN_REQ_OUT);
-  generate_deserialize_field(out, &felem, true, "", false, false, false, true, true);
-  indent(out) << prefix << " = append(" << prefix << ", " << elem << ")" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_go_generator::generate_serialize_field(ofstream& out,
-                                              t_field* tfield,
-                                              string prefix,
-                                              bool inkey) {
-  t_type* type = get_true_type(tfield->get_type());
-  string name(prefix + publicize(tfield->get_name()));
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "compiler error: cannot generate serialize for void type: " + name;
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, is_pointer_field(tfield), name);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << "if err := oprot.";
-
-    if (is_pointer_field(tfield)) {
-      name = "*" + name;
-    }
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary() && !inkey) {
-          out << "WriteBinary(" << name << ")";
-        } else {
-          out << "WriteString(string(" << name << "))";
-        }
-
-        break;
-
-      case t_base_type::TYPE_BOOL:
-        out << "WriteBool(bool(" << name << "))";
-        break;
-
-      case t_base_type::TYPE_I8:
-        out << "WriteByte(int8(" << name << "))";
-        break;
-
-      case t_base_type::TYPE_I16:
-        out << "WriteI16(int16(" << name << "))";
-        break;
-
-      case t_base_type::TYPE_I32:
-        out << "WriteI32(int32(" << name << "))";
-        break;
-
-      case t_base_type::TYPE_I64:
-        out << "WriteI64(int64(" << name << "))";
-        break;
-
-      case t_base_type::TYPE_DOUBLE:
-        out << "WriteDouble(float64(" << name << "))";
-        break;
-
-      default:
-        throw "compiler error: no Go name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "WriteI32(int32(" << name << "))";
-    }
-
-    out << "; err != nil {" << endl;
-    out << indent() << "return thrift.PrependError(fmt.Sprintf(\"%T."
-        << escape_string(tfield->get_name()) << " (" << tfield->get_key()
-        << ") field write error: \", p), err) }" << endl;
-  } else {
-    throw "compiler error: Invalid type in generate_serialize_field '" + type->get_name()
-        + "' for field '" + name + "'";
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_go_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  out << indent() << "if err := " << prefix << "." << write_method_name_ << "(oprot); err != nil {" << endl;
-  out << indent() << "  return thrift.PrependError(fmt.Sprintf(\"%T error writing struct: \", "
-      << prefix << "), err)" << endl;
-  out << indent() << "}" << endl;
-}
-
-void t_go_generator::generate_serialize_container(ofstream& out,
-                                                  t_type* ttype,
-                                                  bool pointer_field,
-                                                  string prefix) {
-  if (pointer_field) {
-    prefix = "*" + prefix;
-  }
-  if (ttype->is_map()) {
-    out << indent() << "if err := oprot.WriteMapBegin("
-        << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
-        << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
-        << "len(" << prefix << ")); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error writing map begin: \", err)" << endl;
-    out << indent() << "}" << endl;
-  } else if (ttype->is_set()) {
-    out << indent() << "if err := oprot.WriteSetBegin("
-        << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", "
-        << "len(" << prefix << ")); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error writing set begin: \", err)" << endl;
-    out << indent() << "}" << endl;
-  } else if (ttype->is_list()) {
-    out << indent() << "if err := oprot.WriteListBegin("
-        << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", "
-        << "len(" << prefix << ")); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error writing list begin: \", err)" << endl;
-    out << indent() << "}" << endl;
-  } else {
-    throw "compiler error: Invalid type in generate_serialize_container '" + ttype->get_name()
-        + "' for prefix '" + prefix + "'";
-  }
-
-  if (ttype->is_map()) {
-    t_map* tmap = (t_map*)ttype;
-    out << indent() << "for k, v := range " << prefix << " {" << endl;
-    indent_up();
-    generate_serialize_map_element(out, tmap, "k", "v");
-    indent_down();
-    indent(out) << "}" << endl;
-  } else if (ttype->is_set()) {
-    t_set* tset = (t_set*)ttype;
-    out << indent() << "for v, _ := range " << prefix << " {" << endl;
-    indent_up();
-    generate_serialize_set_element(out, tset, "v");
-    indent_down();
-    indent(out) << "}" << endl;
-  } else if (ttype->is_list()) {
-    t_list* tlist = (t_list*)ttype;
-    out << indent() << "for _, v := range " << prefix << " {" << endl;
-
-    indent_up();
-    generate_serialize_list_element(out, tlist, "v");
-    indent_down();
-    indent(out) << "}" << endl;
-  }
-
-  if (ttype->is_map()) {
-    out << indent() << "if err := oprot.WriteMapEnd(); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error writing map end: \", err)" << endl;
-    out << indent() << "}" << endl;
-  } else if (ttype->is_set()) {
-    out << indent() << "if err := oprot.WriteSetEnd(); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error writing set end: \", err)" << endl;
-    out << indent() << "}" << endl;
-  } else if (ttype->is_list()) {
-    out << indent() << "if err := oprot.WriteListEnd(); err != nil {" << endl;
-    out << indent() << "  return thrift.PrependError(\"error writing list end: \", err)" << endl;
-    out << indent() << "}" << endl;
-  }
-}
-
-/**
- * Serializes the members of a map.
- *
- */
-void t_go_generator::generate_serialize_map_element(ofstream& out,
-                                                    t_map* tmap,
-                                                    string kiter,
-                                                    string viter) {
-  t_field kfield(tmap->get_key_type(), "");
-  t_field vfield(tmap->get_val_type(), "");
-  kfield.set_req(t_field::T_OPT_IN_REQ_OUT);
-  vfield.set_req(t_field::T_OPT_IN_REQ_OUT);
-  generate_serialize_field(out, &kfield, kiter, true);
-  generate_serialize_field(out, &vfield, viter);
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_go_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  t_field efield(tset->get_elem_type(), "");
-  efield.set_req(t_field::T_OPT_IN_REQ_OUT);
-  generate_serialize_field(out, &efield, prefix);
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_go_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string prefix) {
-  t_field efield(tlist->get_elem_type(), "");
-  efield.set_req(t_field::T_OPT_IN_REQ_OUT);
-  generate_serialize_field(out, &efield, prefix);
-}
-
-/**
- * Generates the docstring for a given struct.
- */
-void t_go_generator::generate_go_docstring(ofstream& out, t_struct* tstruct) {
-  generate_go_docstring(out, tstruct, tstruct, "Attributes");
-}
-
-/**
- * Generates the docstring for a given function.
- */
-void t_go_generator::generate_go_docstring(ofstream& out, t_function* tfunction) {
-  generate_go_docstring(out, tfunction, tfunction->get_arglist(), "Parameters");
-}
-
-/**
- * Generates the docstring for a struct or function.
- */
-void t_go_generator::generate_go_docstring(ofstream& out,
-                                           t_doc* tdoc,
-                                           t_struct* tstruct,
-                                           const char* subheader) {
-  bool has_doc = false;
-  stringstream ss;
-
-  if (tdoc->has_doc()) {
-    has_doc = true;
-    ss << tdoc->get_doc();
-  }
-
-  const vector<t_field*>& fields = tstruct->get_members();
-
-  if (fields.size() > 0) {
-    if (has_doc) {
-      ss << endl;
-    }
-
-    has_doc = true;
-    ss << subheader << ":\n";
-    vector<t_field*>::const_iterator p_iter;
-
-    for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-      t_field* p = *p_iter;
-      ss << " - " << publicize(p->get_name());
-
-      if (p->has_doc()) {
-        ss << ": " << p->get_doc();
-      } else {
-        ss << endl;
-      }
-    }
-  }
-
-  if (has_doc) {
-    generate_docstring_comment(out, "", "// ", ss.str(), "");
-  }
-}
-
-/**
- * Generates the docstring for a generic object.
- */
-void t_go_generator::generate_go_docstring(ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    generate_docstring_comment(out, "", "//", tdoc->get_doc(), "");
-  }
-}
-
-/**
- * Declares an argument, which may include initialization as necessary.
- *
- * @param tfield The field
- */
-string t_go_generator::declare_argument(t_field* tfield) {
-  std::ostringstream result;
-  result << publicize(tfield->get_name()) << "=";
-
-  if (tfield->get_value() != NULL) {
-    result << "thrift_spec[" << tfield->get_key() << "][4]";
-  } else {
-    result << "nil";
-  }
-
-  return result.str();
-}
-
-/**
- * Renders a struct field initial value.
- *
- * @param tfield The field, which must have `tfield->get_value() != NULL`
- */
-string t_go_generator::render_field_initial_value(t_field* tfield,
-                                                  const string& name,
-                                                  bool optional_field) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (optional_field) {
-    // The caller will make a second pass for optional fields,
-    // assigning the result of render_const_value to "*field_name". It
-    // is maddening that Go syntax does not allow for a type-agnostic
-    // way to initialize a pointer to a const value, but so it goes.
-    // The alternative would be to write type specific functions that
-    // convert from const values to pointer types, but given the lack
-    // of overloading it would be messy.
-    return "new(" + type_to_go_type(tfield->get_type()) + ")";
-  } else {
-    return render_const_value(type, tfield->get_value(), name);
-  }
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_go_generator::function_signature(t_function* tfunction, string prefix) {
-  // TODO(mcslee): Nitpicky, no ',' if argument_list is empty
-  return publicize(prefix + tfunction->get_name()) + "(" + argument_list(tfunction->get_arglist())
-         + ")";
-}
-
-/**
- * Renders an interface function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_go_generator::function_signature_if(t_function* tfunction, string prefix, bool addError) {
-  // TODO(mcslee): Nitpicky, no ',' if argument_list is empty
-  string signature = publicize(prefix + tfunction->get_name()) + "(";
-  signature += argument_list(tfunction->get_arglist()) + ") (";
-  t_type* ret = tfunction->get_returntype();
-  t_struct* exceptions = tfunction->get_xceptions();
-  string errs = argument_list(exceptions);
-
-  if (!ret->is_void()) {
-    signature += "r " + type_to_go_type(ret);
-
-    if (addError || errs.size() == 0) {
-      signature += ", ";
-    }
-  }
-
-  if (addError) {
-    signature += "err error";
-  }
-
-  signature += ")";
-  return signature;
-}
-
-/**
- * Renders a field list
- */
-string t_go_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-
-    result += variable_name_to_go_name((*f_iter)->get_name()) + " "
-              + type_to_go_type((*f_iter)->get_type());
-  }
-
-  return result;
-}
-
-string t_go_generator::type_name(t_type* ttype) {
-  string module( module_name(ttype));
-  if( ! module.empty()) {
-    return module + "." + ttype->get_name();
-  }
-
-  return ttype->get_name();
-}
-
-string t_go_generator::module_name(t_type* ttype) {
-  t_program* program = ttype->get_program();
-
-  if (program != NULL && program != program_) {
-    if (program->get_namespace("go").empty() ||
-        program_->get_namespace("go").empty() ||
-        program->get_namespace("go") != program_->get_namespace("go")) {
-      string module(get_real_go_module(program));
-      // for namespaced includes, only keep part after dot.
-      size_t dot = module.rfind('.');
-      if (dot != string::npos) {
-        module = module.substr(dot + 1);
-      }
-      return module;
-    }
-  }
-
-  return "";
-}
-
-/**
- * Converts the parse type to a go tyoe
- */
-string t_go_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-
-    case t_base_type::TYPE_STRING:
-      /* this is wrong, binary is still a string type internally
-      if (((t_base_type*)type)->is_binary()) {
-          return "thrift.BINARY";
-      }
-      */
-      return "thrift.STRING";
-
-    case t_base_type::TYPE_BOOL:
-      return "thrift.BOOL";
-
-    case t_base_type::TYPE_I8:
-      return "thrift.BYTE";
-
-    case t_base_type::TYPE_I16:
-      return "thrift.I16";
-
-    case t_base_type::TYPE_I32:
-      return "thrift.I32";
-
-    case t_base_type::TYPE_I64:
-      return "thrift.I64";
-
-    case t_base_type::TYPE_DOUBLE:
-      return "thrift.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "thrift.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "thrift.STRUCT";
-  } else if (type->is_map()) {
-    return "thrift.MAP";
-  } else if (type->is_set()) {
-    return "thrift.SET";
-  } else if (type->is_list()) {
-    return "thrift.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Converts the parse type to a go map type, will throw an exception if it will
- * not produce a valid go map type.
- */
-string t_go_generator::type_to_go_key_type(t_type* type) {
-  t_type* resolved_type = type;
-
-  while (resolved_type->is_typedef()) {
-    resolved_type = ((t_typedef*)resolved_type)->get_type()->get_true_type();
-  }
-
-  if (resolved_type->is_map() || resolved_type->is_list() || resolved_type->is_set()) {
-    throw "Cannot produce a valid type for a Go map key: " + type_to_go_type(type) + " - aborting.";
-  }
-
-  if (resolved_type->is_string() && ((t_base_type*)resolved_type)->is_binary())
-    return "string";
-
-  return type_to_go_type(type);
-}
-
-/**
- * Converts the parse type to a go type
- */
-string t_go_generator::type_to_go_type(t_type* type) {
-  return type_to_go_type_with_opt(type, false);
-}
-
-/**
- * Converts the parse type to a go type, taking into account whether the field
- * associated with the type is T_OPTIONAL.
- */
-string t_go_generator::type_to_go_type_with_opt(t_type* type,
-                                                bool optional_field) {
-  string maybe_pointer(optional_field ? "*" : "");
-
-  if (type->is_typedef() && ((t_typedef*)type)->is_forward_typedef()) {
-    type = ((t_typedef*)type)->get_true_type();
-  }
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "";
-
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)type)->is_binary()) {
-        return maybe_pointer + "[]byte";
-      }
-
-      return maybe_pointer + "string";
-
-    case t_base_type::TYPE_BOOL:
-      return maybe_pointer + "bool";
-
-    case t_base_type::TYPE_I8:
-      return maybe_pointer + "int8";
-
-    case t_base_type::TYPE_I16:
-      return maybe_pointer + "int16";
-
-    case t_base_type::TYPE_I32:
-      return maybe_pointer + "int32";
-
-    case t_base_type::TYPE_I64:
-      return maybe_pointer + "int64";
-
-    case t_base_type::TYPE_DOUBLE:
-      return maybe_pointer + "float64";
-    }
-  } else if (type->is_enum()) {
-    return maybe_pointer + publicize(type_name(type));
-  } else if (type->is_struct() || type->is_xception()) {
-    return "*" + publicize(type_name(type));
-  } else if (type->is_map()) {
-    t_map* t = (t_map*)type;
-    string keyType = type_to_go_key_type(t->get_key_type());
-    string valueType = type_to_go_type(t->get_val_type());
-    return maybe_pointer + string("map[") + keyType + "]" + valueType;
-  } else if (type->is_set()) {
-    t_set* t = (t_set*)type;
-    string elemType = type_to_go_key_type(t->get_elem_type());
-    return maybe_pointer + string("map[") + elemType + string("]struct{}");
-  } else if (type->is_list()) {
-    t_list* t = (t_list*)type;
-    string elemType = type_to_go_type(t->get_elem_type());
-    return maybe_pointer + string("[]") + elemType;
-  } else if (type->is_typedef()) {
-    return maybe_pointer + publicize(type_name(type));
-  }
-
-  throw "INVALID TYPE IN type_to_go_type: " + type->get_name();
-}
-
-/** See the comment inside generate_go_struct_definition for what this is. */
-string t_go_generator::type_to_spec_args(t_type* ttype) {
-  while (ttype->is_typedef()) {
-    ttype = ((t_typedef*)ttype)->get_type();
-  }
-
-  if (ttype->is_base_type() || ttype->is_enum()) {
-    return "nil";
-  } else if (ttype->is_struct() || ttype->is_xception()) {
-    return "(" + type_name(ttype) + ", " + type_name(ttype) + ".thrift_spec)";
-  } else if (ttype->is_map()) {
-    return "(" + type_to_enum(((t_map*)ttype)->get_key_type()) + ","
-           + type_to_spec_args(((t_map*)ttype)->get_key_type()) + ","
-           + type_to_enum(((t_map*)ttype)->get_val_type()) + ","
-           + type_to_spec_args(((t_map*)ttype)->get_val_type()) + ")";
-  } else if (ttype->is_set()) {
-    return "(" + type_to_enum(((t_set*)ttype)->get_elem_type()) + ","
-           + type_to_spec_args(((t_set*)ttype)->get_elem_type()) + ")";
-  } else if (ttype->is_list()) {
-    return "(" + type_to_enum(((t_list*)ttype)->get_elem_type()) + ","
-           + type_to_spec_args(((t_list*)ttype)->get_elem_type()) + ")";
-  }
-
-  throw "INVALID TYPE IN type_to_spec_args: " + ttype->get_name();
-}
-
-bool format_go_output(const string& file_path) {
-
-  // formatting via gofmt deactivated due to THRIFT-3893
-  // Please look at the ticket and make sure you fully understand all the implications
-  // before submitting a patch that enables this feature again. Thank you.
-  (void) file_path;
-  return false;
-  
-  /*
-  const string command = "gofmt -w " + file_path;
-
-  if (system(command.c_str()) == 0) {
-    return true;
-  }
-
-  fprintf(stderr, "WARNING - Running '%s' failed.\n", command.c_str());
-  return false;
-  */
- }
-
-THRIFT_REGISTER_GENERATOR(go, "Go",
-                          "    package_prefix=  Package prefix for generated files.\n" \
-                          "    thrift_import=   Override thrift package import path (default:" + DEFAULT_THRIFT_IMPORT + ")\n" \
-                          "    package=         Package name (default: inferred from thrift file name)\n" \
-                          "    ignore_initialisms\n"
-                          "                     Disable automatic spelling correction of initialisms (e.g. \"URL\")\n" \
-                          "    read_write_private\n"
-                          "                     Make read/write methods private, default is public Read/Write\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_gv_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_gv_generator.cc
deleted file mode 100644
index 72b7c82..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_gv_generator.cc
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <map>
-#include <list>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/generate/t_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::pair;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Graphviz code generator
- */
-class t_gv_generator : public t_generator {
-public:
-  t_gv_generator(t_program* program,
-                 const std::map<std::string, std::string>& parsed_options,
-                 const std::string& option_string)
-    : t_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    exception_arrows = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("exceptions") == 0) {
-        exception_arrows = true;
-      } else {
-        throw "unknown option gv:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-gv";
-  }
-
-  /**
-   * Init and end of generator
-   */
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_service(t_service* tservice);
-
-protected:
-  /**
-   * Helpers
-   */
-  void print_type(t_type* ttype, string struct_field_ref);
-  void print_const_value(t_type* type, t_const_value* tvalue);
-
-private:
-  std::ofstream f_out_;
-  std::list<string> edges;
-  bool exception_arrows;
-};
-
-/**
- * Init generator:
- * - Adds some escaping for the Graphviz domain.
- * - Create output directory and open file for writting.
- * - Write the file header.
- */
-void t_gv_generator::init_generator() {
-  escape_['{'] = "\\{";
-  escape_['}'] = "\\}";
-
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-  string fname = get_out_dir() + program_->get_name() + ".gv";
-  f_out_.open(fname.c_str());
-  f_out_ << "digraph \"" << escape_string(program_name_) << "\" {" << endl;
-  f_out_ << "node [style=filled, shape=record];" << endl;
-  f_out_ << "edge [arrowsize=0.5];" << endl;
-  f_out_ << "rankdir=LR" << endl;
-}
-
-/**
- * Closes generator:
- * - Print accumulated nodes connections.
- * - Print footnote.
- * - Closes file.
- */
-void t_gv_generator::close_generator() {
-  // Print edges
-  std::list<string>::iterator iter = edges.begin();
-  for (; iter != edges.end(); iter++) {
-    f_out_ << (*iter) << endl;
-  }
-
-  // Print graph end } and close file
-  f_out_ << "}" << endl;
-  f_out_.close();
-}
-
-void t_gv_generator::generate_typedef(t_typedef* ttypedef) {
-  string name = ttypedef->get_name();
-  f_out_ << "node [fillcolor=azure];" << endl;
-  f_out_ << name << " [label=\"";
-
-  f_out_ << escape_string(name);
-  f_out_ << " :: ";
-  print_type(ttypedef->get_type(), name);
-
-  f_out_ << "\"];" << endl;
-}
-
-void t_gv_generator::generate_enum(t_enum* tenum) {
-  string name = tenum->get_name();
-  f_out_ << "node [fillcolor=white];" << endl;
-  f_out_ << name << " [label=\"enum " << escape_string(name);
-
-  vector<t_enum_value*> values = tenum->get_constants();
-  vector<t_enum_value*>::iterator val_iter;
-  for (val_iter = values.begin(); val_iter != values.end(); ++val_iter) {
-    f_out_ << '|' << (*val_iter)->get_name();
-    f_out_ << " = ";
-    f_out_ << (*val_iter)->get_value();
-  }
-
-  f_out_ << "\"];" << endl;
-}
-
-void t_gv_generator::generate_const(t_const* tconst) {
-  string name = tconst->get_name();
-
-  f_out_ << "node [fillcolor=aliceblue];" << endl;
-  f_out_ << "const_" << name << " [label=\"";
-
-  f_out_ << escape_string(name);
-  f_out_ << " = ";
-  print_const_value(tconst->get_type(), tconst->get_value());
-  f_out_ << " :: ";
-  print_type(tconst->get_type(), "const_" + name);
-
-  f_out_ << "\"];" << endl;
-}
-
-void t_gv_generator::generate_struct(t_struct* tstruct) {
-  string name = tstruct->get_name();
-
-  if (tstruct->is_xception()) {
-    f_out_ << "node [fillcolor=lightpink];" << endl;
-    f_out_ << name << " [label=\"";
-    f_out_ << "exception " << escape_string(name);
-  } else if (tstruct->is_union()) {
-    f_out_ << "node [fillcolor=lightcyan];" << endl;
-    f_out_ << name << " [label=\"";
-    f_out_ << "union " << escape_string(name);
-  } else {
-    f_out_ << "node [fillcolor=beige];" << endl;
-    f_out_ << name << " [label=\"";
-    f_out_ << "struct " << escape_string(name);
-  }
-
-  vector<t_field*> members = tstruct->get_members();
-  vector<t_field*>::iterator mem_iter = members.begin();
-  for (; mem_iter != members.end(); mem_iter++) {
-    string field_name = (*mem_iter)->get_name();
-
-    // print port (anchor reference)
-    f_out_ << "|<field_" << field_name << '>';
-
-    // field name :: field type
-    f_out_ << (*mem_iter)->get_name();
-    f_out_ << " :: ";
-    print_type((*mem_iter)->get_type(), name + ":field_" + field_name);
-  }
-
-  f_out_ << "\"];" << endl;
-}
-
-void t_gv_generator::print_type(t_type* ttype, string struct_field_ref) {
-  if (ttype->is_container()) {
-    if (ttype->is_list()) {
-      f_out_ << "list\\<";
-      print_type(((t_list*)ttype)->get_elem_type(), struct_field_ref);
-      f_out_ << "\\>";
-    } else if (ttype->is_set()) {
-      f_out_ << "set\\<";
-      print_type(((t_set*)ttype)->get_elem_type(), struct_field_ref);
-      f_out_ << "\\>";
-    } else if (ttype->is_map()) {
-      f_out_ << "map\\<";
-      print_type(((t_map*)ttype)->get_key_type(), struct_field_ref);
-      f_out_ << ", ";
-      print_type(((t_map*)ttype)->get_val_type(), struct_field_ref);
-      f_out_ << "\\>";
-    }
-  } else if (ttype->is_base_type()) {
-    f_out_ << (((t_base_type*)ttype)->is_binary() ? "binary" : ttype->get_name());
-  } else {
-    f_out_ << ttype->get_name();
-    edges.push_back(struct_field_ref + " -> " + ttype->get_name());
-  }
-}
-
-/**
- * Prints out an string representation of the provided constant value
- */
-void t_gv_generator::print_const_value(t_type* type, t_const_value* tvalue) {
-  bool first = true;
-  switch (tvalue->get_type()) {
-  case t_const_value::CV_INTEGER:
-    f_out_ << tvalue->get_integer();
-    break;
-  case t_const_value::CV_DOUBLE:
-    f_out_ << tvalue->get_double();
-    break;
-  case t_const_value::CV_STRING:
-    f_out_ << "\\\"" << get_escaped_string(tvalue) << "\\\"";
-    break;
-  case t_const_value::CV_MAP: {
-    f_out_ << "\\{ ";
-    map<t_const_value*, t_const_value*> map_elems = tvalue->get_map();
-    map<t_const_value*, t_const_value*>::iterator map_iter;
-    for (map_iter = map_elems.begin(); map_iter != map_elems.end(); map_iter++) {
-      if (!first) {
-        f_out_ << ", ";
-      }
-      first = false;
-      print_const_value(((t_map*)type)->get_key_type(), map_iter->first);
-      f_out_ << " = ";
-      print_const_value(((t_map*)type)->get_val_type(), map_iter->second);
-    }
-    f_out_ << " \\}";
-  } break;
-  case t_const_value::CV_LIST: {
-    f_out_ << "\\{ ";
-    vector<t_const_value*> list_elems = tvalue->get_list();
-    ;
-    vector<t_const_value*>::iterator list_iter;
-    for (list_iter = list_elems.begin(); list_iter != list_elems.end(); list_iter++) {
-      if (!first) {
-        f_out_ << ", ";
-      }
-      first = false;
-      if (type->is_list()) {
-        print_const_value(((t_list*)type)->get_elem_type(), *list_iter);
-      } else {
-        print_const_value(((t_set*)type)->get_elem_type(), *list_iter);
-      }
-    }
-    f_out_ << " \\}";
-  } break;
-  case t_const_value::CV_IDENTIFIER:
-    f_out_ << escape_string(type->get_name()) << "."
-           << escape_string(tvalue->get_identifier_name());
-    break;
-  default:
-    f_out_ << "UNKNOWN";
-    break;
-  }
-}
-
-void t_gv_generator::generate_service(t_service* tservice) {
-  string service_name = get_service_name(tservice);
-  f_out_ << "subgraph cluster_" << service_name << " {" << endl;
-  f_out_ << "node [fillcolor=bisque];" << endl;
-  f_out_ << "style=dashed;" << endl;
-  f_out_ << "label = \"" << escape_string(service_name) << " service\";" << endl;
-
-  // TODO: service extends
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator fn_iter = functions.begin();
-  for (; fn_iter != functions.end(); fn_iter++) {
-    string fn_name = (*fn_iter)->get_name();
-
-    f_out_ << "function_" << service_name << fn_name;
-    f_out_ << "[label=\"<return_type>function " << escape_string(fn_name);
-    f_out_ << " :: ";
-    print_type((*fn_iter)->get_returntype(), "function_" + service_name + fn_name + ":return_type");
-
-    vector<t_field*> args = (*fn_iter)->get_arglist()->get_members();
-    vector<t_field*>::iterator arg_iter = args.begin();
-    for (; arg_iter != args.end(); arg_iter++) {
-      f_out_ << "|<param_" << (*arg_iter)->get_name() << ">";
-      f_out_ << (*arg_iter)->get_name();
-      if ((*arg_iter)->get_value() != NULL) {
-        f_out_ << " = ";
-        print_const_value((*arg_iter)->get_type(), (*arg_iter)->get_value());
-      }
-      f_out_ << " :: ";
-      print_type((*arg_iter)->get_type(),
-                 "function_" + service_name + fn_name + ":param_" + (*arg_iter)->get_name());
-    }
-    // end of node
-    f_out_ << "\"];" << endl;
-
-    // Exception edges
-    if (exception_arrows) {
-      vector<t_field*> excepts = (*fn_iter)->get_xceptions()->get_members();
-      vector<t_field*>::iterator ex_iter = excepts.begin();
-      for (; ex_iter != excepts.end(); ex_iter++) {
-        edges.push_back("function_" + service_name + fn_name + " -> "
-                        + (*ex_iter)->get_type()->get_name() + " [color=red]");
-      }
-    }
-  }
-
-  f_out_ << " }" << endl;
-}
-
-THRIFT_REGISTER_GENERATOR(
-    gv,
-    "Graphviz",
-    "    exceptions:      Whether to draw arrows from functions to exception.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_haxe_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_haxe_generator.cc
deleted file mode 100644
index e7be1a5..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_haxe_generator.cc
+++ /dev/null
@@ -1,2981 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <sstream>
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <cctype>
-
-#include <sys/stat.h>
-#include <stdexcept>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Haxe code generator.
- *
- */
-class t_haxe_generator : public t_oop_generator {
-public:
-  t_haxe_generator(t_program* program,
-                   const std::map<std::string, std::string>& parsed_options,
-                   const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    callbacks_ = false;
-    rtti_ = false;
-    buildmacro_ = "";
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("callbacks") == 0) {
-        callbacks_ = true;
-      } else if( iter->first.compare("rtti") == 0) {
-        rtti_ = true;
-      } else if( iter->first.compare("buildmacro") == 0) {
-        buildmacro_ = (iter->second);
-      } else {
-        throw "unknown option haxe:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-haxe";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  void print_const_value(std::ofstream& out,
-                         std::string name,
-                         t_type* type,
-                         t_const_value* value,
-                         bool in_static,
-                         bool defval = false);
-  std::string render_const_value(ofstream& out,
-                                 std::string name,
-                                 t_type* type,
-                                 t_const_value* value);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_haxe_struct(t_struct* tstruct, bool is_exception, bool is_result = false);
-
-  void generate_haxe_struct_definition(std::ofstream& out,
-                                       t_struct* tstruct,
-                                       bool is_xception = false,
-                                       bool is_result = false);
-  // removed -- equality,compare_to
-  void generate_haxe_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_haxe_validator(std::ofstream& out, t_struct* tstruct);
-  void generate_haxe_struct_result_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_haxe_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_haxe_struct_tostring(std::ofstream& out, t_struct* tstruct);
-  void generate_haxe_meta_data_map(std::ofstream& out, t_struct* tstruct);
-  void generate_field_value_meta_data(std::ofstream& out, t_type* type);
-  std::string get_haxe_type_string(t_type* type);
-  void generate_reflection_setters(std::ostringstream& out,
-                                   t_type* type,
-                                   std::string field_name,
-                                   std::string cap_name);
-  void generate_reflection_getters(std::ostringstream& out,
-                                   t_type* type,
-                                   std::string field_name,
-                                   std::string cap_name);
-  void generate_generic_field_getters_setters(std::ofstream& out, t_struct* tstruct);
-  void generate_generic_isset_method(std::ofstream& out, t_struct* tstruct);
-  void generate_property_getters_setters(std::ofstream& out, t_struct* tstruct);
-
-  void generate_function_helpers(t_function* tfunction);
-  std::string get_cap_name(std::string name);
-  std::string generate_isset_check(t_field* field);
-  std::string generate_isset_check(std::string field);
-  void generate_isset_set(ofstream& out, t_field* field);
-  // removed std::string isset_field_id(t_field* field);
-
-  void generate_service_interface(t_service* tservice);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-  void generate_service_method_signature(t_function* tfunction, bool is_interface);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string iter,
-                                      std::string map);
-
-  void generate_haxe_doc(std::ofstream& out, t_doc* tdoc);
-  void generate_haxe_doc(std::ofstream& out, t_function* tdoc);
-
-  void generate_rtti_decoration(std::ofstream& out);
-  void generate_macro_decoration(std::ofstream& out);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string haxe_package();
-  std::string haxe_type_imports();
-  std::string haxe_thrift_imports();
-  std::string haxe_thrift_gen_imports(t_struct* tstruct, string& imports);
-  std::string haxe_thrift_gen_imports(t_service* tservice);
-  std::string type_name(t_type* ttype, bool in_container = false, bool in_init = false);
-  std::string base_type_name(t_base_type* tbase, bool in_container = false);
-  std::string declare_field(t_field* tfield, bool init = false);
-  std::string function_signature_callback(t_function* tfunction);
-  std::string function_signature_normal(t_function* tfunction);
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-  std::string get_enum_class_name(t_type* type);
-  string generate_service_method_onsuccess(t_function* tfunction, bool as_type, bool omit_name);
-  void generate_service_method_signature_callback(t_function* tfunction, bool is_interface);
-  void generate_service_method_signature_normal(t_function* tfunction, bool is_interface);
-
-  bool type_can_be_null(t_type* ttype) {
-    ttype = get_true_type(ttype);
-
-    if (ttype->is_container() || ttype->is_struct() || ttype->is_xception() || ttype->is_string()) {
-      return true;
-    }
-
-    if (ttype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_STRING:
-        // case t_base_type::TYPE_I64:  - Int64 is not really nullable, even though it behaved that
-        // way before Haxe 3.2.0
-        return true;
-      default:
-        return false;
-      }
-    }
-
-    return false;
-  }
-
-  std::string constant_name(std::string name);
-
-private:
-  bool callbacks_;
-  bool rtti_;
-  string buildmacro_;
-
-  /**
-   * File streams
-   */
-
-  std::string package_name_;
-  std::ofstream f_service_;
-  std::string package_dir_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_haxe_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-  package_name_ = program_->get_namespace("haxe");
-
-  // Haxe package names are lowercase
-  if (package_name_.length() > 0) {
-    package_name_[0] = tolower(package_name_[0]);
-    size_t index = package_name_.find('.');
-    while (index != std::string::npos) {
-      if (++index < package_name_.length()) {
-        package_name_[index] = tolower(package_name_[index]);
-      }
-      index = package_name_.find('.', index);
-    }
-  }
-
-  string dir = package_name_;
-  string subdir = get_out_dir();
-  string::size_type loc;
-  while ((loc = dir.find(".")) != string::npos) {
-    subdir = subdir + "/" + dir.substr(0, loc);
-    MKDIR(subdir.c_str());
-    dir = dir.substr(loc + 1);
-  }
-  if (dir.size() > 0) {
-    subdir = subdir + "/" + dir;
-    MKDIR(subdir.c_str());
-  }
-
-  package_dir_ = subdir;
-}
-
-/**
- * Packages the generated file
- *
- * @return String of the package, i.e. "package org.apache.thriftdemo;"
- */
-string t_haxe_generator::haxe_package() {
-  if (!package_name_.empty()) {
-    return string("package ") + package_name_;
-  }
-  return "package";
-}
-
-/**
- * Prints standard haxe imports
- *
- * @return List of imports for haxe types that are used in here
- */
-string t_haxe_generator::haxe_type_imports() {
-  return string() + "import org.apache.thrift.helper.*;\n" + "import haxe.io.Bytes;\n"
-         + "import haxe.ds.IntMap;\n" + "import haxe.ds.StringMap;\n"
-         + "import haxe.ds.ObjectMap;\n" + "\n" + "#if flash\n"
-         + "import flash.errors.ArgumentError;\n" + "#end\n" + "\n";
-}
-
-/**
- * Prints standard haxe imports
- *
- * @return List of imports necessary for thrift
- */
-string t_haxe_generator::haxe_thrift_imports() {
-  return string() + "import org.apache.thrift.*;\n" + "import org.apache.thrift.meta_data.*;\n"
-         + "import org.apache.thrift.protocol.*;\n" + "\n";
-}
-
-/**
- * Prints imports needed for a given type
- *
- * @return List of imports necessary for a given t_struct
- */
-string t_haxe_generator::haxe_thrift_gen_imports(t_struct* tstruct, string& imports) {
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  // For each type check if it is from a different namespace
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_program* program = (*m_iter)->get_type()->get_program();
-    if (program != NULL && program != program_) {
-      string package = program->get_namespace("haxe");
-      if (!package.empty()) {
-        if (imports.find(package + "." + (*m_iter)->get_type()->get_name()) == string::npos) {
-          imports.append("import " + package + "." + (*m_iter)->get_type()->get_name() + ";\n");
-        }
-      }
-    }
-  }
-  return imports;
-}
-
-/**
- * Prints imports needed for a given type
- *
- * @return List of imports necessary for a given t_service
- */
-string t_haxe_generator::haxe_thrift_gen_imports(t_service* tservice) {
-  string imports;
-  const vector<t_function*>& functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-
-  // For each type check if it is from a different namespace
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_program* program = (*f_iter)->get_returntype()->get_program();
-    if (program != NULL && program != program_) {
-      string package = program->get_namespace("haxe");
-      if (!package.empty()) {
-        if (imports.find(package + "." + (*f_iter)->get_returntype()->get_name()) == string::npos) {
-          imports.append("import " + package + "." + (*f_iter)->get_returntype()->get_name()
-                         + ";\n");
-        }
-      }
-    }
-
-    haxe_thrift_gen_imports((*f_iter)->get_arglist(), imports);
-    haxe_thrift_gen_imports((*f_iter)->get_xceptions(), imports);
-  }
-
-  return imports;
-}
-
-/**
- * Nothing in haxe
- */
-void t_haxe_generator::close_generator() {
-}
-
-/**
- * Generates a typedef. This is not done in haxe, since it does
- * not support arbitrary name replacements, and it'd be a wacky waste
- * of overhead to make wrapper classes.
- *
- * @param ttypedef The type definition
- */
-void t_haxe_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Enums are a class with a set of static constants.
- *
- * @param tenum The enumeration
- */
-void t_haxe_generator::generate_enum(t_enum* tenum) {
-  // Make output file
-  string f_enum_name = package_dir_ + "/" + get_cap_name(tenum->get_name()) + ".hx";
-  ofstream f_enum;
-  f_enum.open(f_enum_name.c_str());
-
-  // Comment and package it
-  f_enum << autogen_comment() << haxe_package() << ";" << endl << endl;
-
-  // Add haxe imports
-  f_enum << string() + "import org.apache.thrift.helper.*;" << endl << endl;
-
-  generate_rtti_decoration(f_enum);
-  generate_macro_decoration(f_enum);
-  indent(f_enum) << "class " << get_cap_name(tenum->get_name()) << " ";
-  scope_up(f_enum);
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    indent(f_enum) << "public static inline var " << (*c_iter)->get_name() << " : Int = " << value
-                   << ";" << endl;
-  }
-
-  // Create a static Set with all valid values for this enum
-  f_enum << endl;
-
-  indent(f_enum) << "public static var VALID_VALUES = { new IntSet( [";
-  indent_up();
-  bool firstValue = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    // populate set
-    f_enum << (firstValue ? "" : ", ") << (*c_iter)->get_name();
-    firstValue = false;
-  }
-  indent_down();
-  f_enum << "]); };" << endl;
-
-  indent(f_enum) << "public static var VALUES_TO_NAMES = { [";
-  indent_up();
-  firstValue = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    f_enum << (firstValue ? "" : ",") << endl;
-    indent(f_enum) << (*c_iter)->get_name() << " => \"" << (*c_iter)->get_name() << "\"";
-    firstValue = false;
-  }
-  f_enum << endl;
-  indent_down();
-  indent(f_enum) << "]; };" << endl;
-
-  scope_down(f_enum); // end class
-
-  f_enum.close();
-}
-
-/**
- * Generates a class that holds all the constants.
- */
-void t_haxe_generator::generate_consts(std::vector<t_const*> consts) {
-  if (consts.empty()) {
-    return;
-  }
-
-  string f_consts_name = package_dir_ + "/" + get_cap_name(program_name_) + "Constants.hx";
-  ofstream f_consts;
-  f_consts.open(f_consts_name.c_str());
-
-  // Print header
-  f_consts << autogen_comment() << haxe_package() << ";" << endl << endl;
-
-  f_consts << endl;
-
-  f_consts << haxe_type_imports();
-
-  generate_rtti_decoration(f_consts);
-  generate_macro_decoration(f_consts);
-  indent(f_consts) << "class " << get_cap_name(program_name_) << "Constants {" << endl << endl;
-  indent_up();
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    print_const_value(f_consts,
-                      (*c_iter)->get_name(),
-                      (*c_iter)->get_type(),
-                      (*c_iter)->get_value(),
-                      false);
-  }
-  indent_down();
-  indent(f_consts) << "}" << endl;
-  f_consts.close();
-}
-
-void t_haxe_generator::print_const_value(std::ofstream& out,
-                                         string name,
-                                         t_type* type,
-                                         t_const_value* value,
-                                         bool in_static,
-                                         bool defval) {
-  type = get_true_type(type);
-
-  indent(out);
-  if (!defval) {
-    out << (in_static ? "var " : "public static inline var  ");
-  }
-  if (type->is_base_type()) {
-    string v2 = render_const_value(out, name, type, value);
-    out << name;
-    if (!defval) {
-      out << ":" << type_name(type);
-    }
-    out << " = " << v2 << ";" << endl << endl;
-  } else if (type->is_enum()) {
-    out << name;
-    if (!defval) {
-      out << ":" << type_name(type);
-    }
-    out << " = " << value->get_integer() << ";" << endl << endl;
-  } else if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    out << name << ":" << type_name(type) << " = new " << type_name(type, false, true) << "();"
-        << endl;
-    if (!in_static) {
-      indent(out) << "{" << endl;
-      indent_up();
-      indent(out) << "new function() : Void {" << endl;
-      indent_up();
-    }
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string val = render_const_value(out, name, field_type, v_iter->second);
-      indent(out) << name << ".";
-      out << v_iter->first->get_string() << " = " << val << ";" << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}();" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else if (type->is_map()) {
-    out << name;
-    if (!defval) {
-      out << ":" << type_name(type);
-    }
-    out << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "{" << endl;
-      indent_up();
-      indent(out) << "new function() : Void {" << endl;
-      indent_up();
-    }
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(out, name, ktype, v_iter->first);
-      string val = render_const_value(out, name, vtype, v_iter->second);
-      indent(out) << name << "[" << key << "] = " << val << ";" << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}();" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else if (type->is_list() || type->is_set()) {
-    out << name;
-    if (!defval) {
-      out << ":" << type_name(type);
-    }
-    out << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "{" << endl;
-      indent_up();
-      indent(out) << "new function() : Void {" << endl;
-      indent_up();
-    }
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(out, name, etype, *v_iter);
-      indent(out) << name << "." << (type->is_list() ? "push" : "add") << "(" << val << ");"
-                  << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}();" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else {
-    throw "compiler error: no const of type " + type->get_name();
-  }
-}
-
-string t_haxe_generator::render_const_value(ofstream& out,
-                                            string name,
-                                            t_type* type,
-                                            t_const_value* value) {
-  (void)name;
-  type = get_true_type(type);
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-      render << "(byte)" << value->get_integer();
-      break;
-    case t_base_type::TYPE_I16:
-      render << "(short)" << value->get_integer();
-      break;
-    case t_base_type::TYPE_I32:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_I64:
-      render << value->get_integer() << "L";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << "(double)" << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << value->get_integer();
-  } else {
-    string t = tmp("tmp");
-    print_const_value(out, t, type, value, true);
-    render << t;
-  }
-
-  return render.str();
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is a class
- * with data members, read(), write(), and an inner Isset class.
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_struct(t_struct* tstruct) {
-  generate_haxe_struct(tstruct, false);
-}
-
-/**
- * Exceptions are structs, but they inherit from Exception
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_xception(t_struct* txception) {
-  generate_haxe_struct(txception, true);
-}
-
-/**
- * Haxe struct definition.
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_haxe_struct(t_struct* tstruct, bool is_exception, bool is_result) {
-  // Make output file
-  string f_struct_name = package_dir_ + "/" + get_cap_name(tstruct->get_name()) + ".hx";
-  ofstream f_struct;
-  f_struct.open(f_struct_name.c_str());
-
-  f_struct << autogen_comment() << haxe_package() << ";" << endl;
-
-  f_struct << endl;
-
-  string imports;
-
-  f_struct << haxe_type_imports() << haxe_thrift_imports()
-           << haxe_thrift_gen_imports(tstruct, imports) << endl;
-
-  generate_haxe_struct_definition(f_struct, tstruct, is_exception, is_result);
-
-  f_struct.close();
-}
-
-/**
- * haxe struct definition. This has various parameters, as it could be
- * generated standalone or inside another class as a helper. If it
- * is a helper than it is a static class.
- *
- * @param tstruct      The struct definition
- * @param is_exception Is this an exception?
- * @param in_class     If inside a class, needs to be static class
- * @param is_result    If this is a result it needs a different writer
- */
-void t_haxe_generator::generate_haxe_struct_definition(ofstream& out,
-                                                       t_struct* tstruct,
-                                                       bool is_exception,
-                                                       bool is_result) {
-  generate_haxe_doc(out, tstruct);
-
-  string clsname = get_cap_name(tstruct->get_name());
-
-  generate_rtti_decoration(out);
-  generate_macro_decoration(out);
-  indent(out) << "class " << clsname << " ";
-
-  if (is_exception) {
-    out << "extends TException ";
-  }
-  out << "implements TBase ";
-
-  scope_up(out);
-  indent(out) << endl;
-
-  indent(out) << "static var STRUCT_DESC = { new TStruct(\"" << tstruct->get_name() << "\"); };"
-              << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "static var " << constant_name((*m_iter)->get_name())
-                << "_FIELD_DESC = { new TField(\"" << (*m_iter)->get_name() << "\", "
-                << type_to_enum((*m_iter)->get_type()) << ", " << (*m_iter)->get_key() << "); };"
-                << endl;
-  }
-  out << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    generate_haxe_doc(out, *m_iter);
-    // indent(out) << "private var _" << (*m_iter)->get_name() + " : " +
-    // type_name((*m_iter)->get_type()) << ";" << endl;
-    indent(out) << "@:isVar" << endl;
-    indent(out) << "public var "
-                << (*m_iter)->get_name() + "(get,set) : "
-                   + get_cap_name(type_name((*m_iter)->get_type())) << ";" << endl;
-  }
-
-  out << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "inline static var " << upcase_string((*m_iter)->get_name())
-                << "_FIELD_ID : Int = " << (*m_iter)->get_key() << ";" << endl;
-  }
-
-  out << endl;
-
-  // Inner Isset class
-  if (members.size() > 0) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (!type_can_be_null((*m_iter)->get_type())) {
-        indent(out) << "private var __isset_" << (*m_iter)->get_name() << " : Bool = false;"
-                    << endl;
-      }
-    }
-  }
-
-  out << endl;
-
-  // Static initializer to populate global class to struct metadata map
-  if (false) {
-    // TODO: reactivate when needed
-    generate_haxe_meta_data_map(out, tstruct);
-    indent(out) << "{" << endl;
-    indent_up();
-    indent(out) << "FieldMetaData.addStructMetaDataMap(" << type_name(tstruct) << ", metaDataMap);"
-                << endl;
-    indent_down();
-    indent(out) << "}" << endl;
-    indent(out) << "}" << endl;
-  }
-
-  // Default constructor
-  indent(out) << "public function new() {" << endl;
-  indent_up();
-  if (is_exception) {
-    indent(out) << "super();" << endl;
-  }
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if ((*m_iter)->get_value() != NULL) {
-      indent(out) << "this." << (*m_iter)->get_name() << " = "
-                  << (*m_iter)->get_value()->get_integer() << ";" << endl;
-    }
-  }
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  generate_property_getters_setters(out, tstruct);
-  generate_generic_field_getters_setters(out, tstruct);
-  generate_generic_isset_method(out, tstruct);
-
-  generate_haxe_struct_reader(out, tstruct);
-  if (is_result) {
-    generate_haxe_struct_result_writer(out, tstruct);
-  } else {
-    generate_haxe_struct_writer(out, tstruct);
-  }
-  generate_haxe_struct_tostring(out, tstruct);
-  generate_haxe_validator(out, tstruct);
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generates a function to read all the fields of the struct.
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_haxe_struct_reader(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public function read( iprot : TProtocol) : Void {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "iprot.IncrementRecursionDepth();" << endl;
-  indent(out) << "try" << endl;
-  scope_up(out);
-
-  // Declare stack tmp variables and read struct header
-  out << indent() << "var field : TField;" << endl << indent() << "iprot.readStructBegin();"
-      << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (true)" << endl;
-  scope_up(out);
-
-  // Read beginning field marker
-  indent(out) << "field = iprot.readFieldBegin();" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if (field.type == TType.STOP) { " << endl;
-  indent_up();
-  indent(out) << "break;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  // Switch statement on the field we are reading
-  indent(out) << "switch (field.id)" << endl;
-
-  scope_up(out);
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << upcase_string((*f_iter)->get_name()) << "_FIELD_ID:" << endl;
-    indent_up();
-    indent(out) << "if (field.type == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-    indent_up();
-
-    generate_deserialize_field(out, *f_iter, "this.");
-    generate_isset_set(out, *f_iter);
-    indent_down();
-    out << indent() << "} else { " << endl << indent() << "  TProtocolUtil.skip(iprot, field.type);"
-        << endl << indent() << "}" << endl;
-    indent_down();
-  }
-
-  // In the default case we skip the field
-  out << indent() << "default:" << endl << indent() << "  TProtocolUtil.skip(iprot, field.type);"
-      << endl;
-
-  scope_down(out);
-
-  // Read field end marker
-  indent(out) << "iprot.readFieldEnd();" << endl;
-
-  scope_down(out);
-
-  out << indent() << "iprot.readStructEnd();" << endl << endl;
-
-  indent(out) << "iprot.DecrementRecursionDepth();" << endl;
-  scope_down(out);
-  indent(out) << "catch(e:Dynamic)" << endl;
-  scope_up(out);
-  indent(out) << "iprot.DecrementRecursionDepth();" << endl;
-  indent(out) << "throw e;" << endl;
-  scope_down(out);
-
-  // check for required fields of primitive type
-  // (which can be checked here but not in the general validate method)
-  out << endl << indent() << "// check for required fields of primitive type, which can't be "
-                             "checked in the validate method" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED && !type_can_be_null((*f_iter)->get_type())) {
-      out << indent() << "if (!__isset_" << (*f_iter)->get_name() << ") {" << endl << indent()
-          << "  throw new TProtocolException(TProtocolException.UNKNOWN, \"Required field '"
-          << (*f_iter)->get_name()
-          << "' was not found in serialized data! Struct: \" + toString());" << endl << indent()
-          << "}" << endl;
-    }
-  }
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "validate();" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-// generates haxe method to perform various checks
-// (e.g. check that all required fields are set)
-void t_haxe_generator::generate_haxe_validator(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public function validate() : Void {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << indent() << "// check for required fields" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      if (type_can_be_null((*f_iter)->get_type())) {
-        indent(out) << "if (" << (*f_iter)->get_name() << " == null) {" << endl;
-        indent(out)
-            << "  throw new TProtocolException(TProtocolException.UNKNOWN, \"Required field '"
-            << (*f_iter)->get_name() << "' was not present! Struct: \" + toString());" << endl;
-        indent(out) << "}" << endl;
-      } else {
-        indent(out) << "// alas, we cannot check '" << (*f_iter)->get_name()
-                    << "' because it's a primitive." << endl;
-      }
-    }
-  }
-
-  // check that fields of type enum have valid values
-  out << indent() << "// check that fields of type enum have valid values" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = (*f_iter);
-    t_type* type = field->get_type();
-    // if field is an enum, check that its value is valid
-    if (type->is_enum()) {
-      indent(out) << "if (" << generate_isset_check(field) << " && !"
-                  << get_cap_name(get_enum_class_name(type)) << ".VALID_VALUES.contains("
-                  << field->get_name() << ")){" << endl;
-      indent_up();
-      indent(out) << "throw new TProtocolException(TProtocolException.UNKNOWN, \"The field '"
-                  << field->get_name() << "' has been assigned the invalid value \" + "
-                  << field->get_name() << ");" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_haxe_struct_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public function write(oprot:TProtocol) : Void {" << endl;
-  indent_up();
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "validate();" << endl;
-  indent(out) << "oprot.IncrementRecursionDepth();" << endl;
-  indent(out) << "try" << endl;
-  scope_up(out);
-
-  indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool could_be_unset = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (could_be_unset) {
-      indent(out) << "if (" << generate_isset_check(*f_iter) << ") {" << endl;
-      indent_up();
-    }
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    if (null_allowed) {
-      out << indent() << "if (this." << (*f_iter)->get_name() << " != null) {" << endl;
-      indent_up();
-    }
-
-    indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    if (null_allowed) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    if (could_be_unset) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-
-  indent(out) << "oprot.writeFieldStop();" << endl;
-  indent(out) << "oprot.writeStructEnd();" << endl;
-
-  indent(out) << "oprot.DecrementRecursionDepth();" << endl;
-  scope_down(out);
-  indent(out) << "catch(e:Dynamic)" << endl;
-  scope_up(out);
-  indent(out) << "oprot.DecrementRecursionDepth();" << endl;
-  indent(out) << "throw e;" << endl;
-  scope_down(out);
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct,
- * which is a function result. These fields are only written
- * if they are set in the Isset array, and only one of them
- * can be set at a time.
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_haxe_struct_result_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public function write(oprot:TProtocol) : Void {" << endl;
-  indent_up();
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "oprot.IncrementRecursionDepth();" << endl;
-  indent(out) << "try" << endl;
-  scope_up(out);
-
-  indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      out << endl << indent() << "if ";
-    } else {
-      out << " else if ";
-    }
-
-    out << "(this." << generate_isset_check(*f_iter) << ") {" << endl;
-
-    indent_up();
-
-    indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    indent_down();
-    indent(out) << "}";
-  }
-
-  indent(out) << endl;
-  indent(out) << "oprot.writeFieldStop();" << endl;
-  indent(out) << "oprot.writeStructEnd();" << endl;
-
-  indent(out) << "oprot.DecrementRecursionDepth();" << endl;
-  scope_down(out);
-  indent(out) << "catch(e:Dynamic)" << endl;
-  scope_up(out);
-  indent(out) << "oprot.DecrementRecursionDepth();" << endl;
-  indent(out) << "throw e;" << endl;
-  scope_down(out);
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-void t_haxe_generator::generate_reflection_getters(ostringstream& out,
-                                                   t_type* type,
-                                                   string field_name,
-                                                   string cap_name) {
-  (void)type;
-  (void)cap_name;
-  indent(out) << "case " << upcase_string(field_name) << "_FIELD_ID:" << endl;
-  indent_up();
-  indent(out) << "return this." << field_name << ";" << endl;
-  indent_down();
-}
-
-void t_haxe_generator::generate_reflection_setters(ostringstream& out,
-                                                   t_type* type,
-                                                   string field_name,
-                                                   string cap_name) {
-  (void)type;
-  (void)cap_name;
-  indent(out) << "case " << upcase_string(field_name) << "_FIELD_ID:" << endl;
-  indent_up();
-  indent(out) << "if (value == null) {" << endl;
-  indent(out) << "  unset" << get_cap_name(field_name) << "();" << endl;
-  indent(out) << "} else {" << endl;
-  indent(out) << "  this." << field_name << " = value;" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent_down();
-}
-
-void t_haxe_generator::generate_generic_field_getters_setters(std::ofstream& out,
-                                                              t_struct* tstruct) {
-
-  std::ostringstream getter_stream;
-  std::ostringstream setter_stream;
-
-  // build up the bodies of both the getter and setter at once
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = get_cap_name(field_name);
-
-    indent_up();
-    generate_reflection_setters(setter_stream, type, field_name, cap_name);
-    generate_reflection_getters(getter_stream, type, field_name, cap_name);
-    indent_down();
-  }
-
-  // create the setter
-  indent(out) << "public function setFieldValue(fieldID : Int, value : Dynamic) : Void {" << endl;
-  indent_up();
-
-  if (fields.size() > 0) {
-    indent(out) << "switch (fieldID) {" << endl;
-    out << setter_stream.str();
-    indent(out) << "default:" << endl;
-    indent(out) << "  throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-    indent(out) << "}" << endl;
-  } else {
-    indent(out) << "throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  // create the getter
-  indent(out) << "public function getFieldValue(fieldID : Int) : Dynamic {" << endl;
-  indent_up();
-
-  if (fields.size() > 0) {
-    indent(out) << "switch (fieldID) {" << endl;
-    out << getter_stream.str();
-    indent(out) << "default:" << endl;
-    indent(out) << "  throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-    indent(out) << "}" << endl;
-  } else {
-    indent(out) << "throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-  }
-
-  indent_down();
-
-  indent(out) << "}" << endl << endl;
-}
-
-// Creates a generic isSet method that takes the field number as argument
-void t_haxe_generator::generate_generic_isset_method(std::ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // create the isSet method
-  indent(out) << "// Returns true if field corresponding to fieldID is set (has been assigned a "
-                 "value) and false otherwise" << endl;
-  indent(out) << "public function isSet(fieldID : Int) : Bool {" << endl;
-  indent_up();
-  if (fields.size() > 0) {
-    indent(out) << "switch (fieldID) {" << endl;
-
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      t_field* field = *f_iter;
-      indent(out) << "case " << upcase_string(field->get_name()) << "_FIELD_ID:" << endl;
-      indent_up();
-      indent(out) << "return " << generate_isset_check(field) << ";" << endl;
-      indent_down();
-    }
-
-    indent(out) << "default:" << endl;
-    indent(out) << "  throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-    indent(out) << "}" << endl;
-  } else {
-    indent(out) << "throw new ArgumentError(\"Field \" + fieldID + \" doesn't exist!\");" << endl;
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a set of property setters/getters for the given struct.
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_property_getters_setters(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = get_cap_name(field_name);
-
-    // Simple getter
-    generate_haxe_doc(out, field);
-    indent(out) << "public function get_" << field_name << "() : " << get_cap_name(type_name(type))
-                << " {" << endl;
-    indent_up();
-    indent(out) << "return this." << field_name << ";" << endl;
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // Simple setter
-    generate_haxe_doc(out, field);
-    indent(out) << "public function set_" << field_name << "(" << field_name << ":"
-                << get_cap_name(type_name(type)) << ") : " << get_cap_name(type_name(type)) << " {"
-                << endl;
-    indent_up();
-    indent(out) << "this." << field_name << " = " << field_name << ";" << endl;
-    generate_isset_set(out, field);
-    indent(out) << "return this." << field_name << ";" << endl;
-
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // Unsetter
-    indent(out) << "public function unset" << cap_name << "() : Void {" << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "this." << field_name << " = null;" << endl;
-    } else {
-      indent(out) << "this.__isset_" << field_name << " = false;" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // isSet method
-    indent(out) << "// Returns true if field " << field_name
-                << " is set (has been assigned a value) and false otherwise" << endl;
-    indent(out) << "public function is" << get_cap_name("set") << cap_name << "() : Bool {" << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "return this." << field_name << " != null;" << endl;
-    } else {
-      indent(out) << "return this.__isset_" << field_name << ";" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-}
-
-/**
- * Generates a toString() method for the given struct
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_haxe_struct_tostring(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public "
-      << "function toString() : String {" << endl;
-  indent_up();
-
-  out << indent() << "var ret : String = \"" << tstruct->get_name() << "(\";" << endl;
-  out << indent() << "var first : Bool = true;" << endl << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool could_be_unset = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (could_be_unset) {
-      indent(out) << "if (" << generate_isset_check(*f_iter) << ") {" << endl;
-      indent_up();
-    }
-
-    t_field* field = (*f_iter);
-
-    if (!first) {
-      indent(out) << "if (!first) ret +=  \", \";" << endl;
-    }
-    indent(out) << "ret += \"" << (*f_iter)->get_name() << ":\";" << endl;
-    bool can_be_null = type_can_be_null(field->get_type());
-    if (can_be_null) {
-      indent(out) << "if (this." << (*f_iter)->get_name() << " == null) {" << endl;
-      indent(out) << "  ret += \"null\";" << endl;
-      indent(out) << "} else {" << endl;
-      indent_up();
-    }
-
-    if (field->get_type()->is_base_type() && ((t_base_type*)(field->get_type()))->is_binary()) {
-      indent(out) << "  ret += \"BINARY\";" << endl;
-    } else if (field->get_type()->is_enum()) {
-      indent(out) << "var " << field->get_name()
-                  << "_name : String = " << get_cap_name(get_enum_class_name(field->get_type()))
-                  << ".VALUES_TO_NAMES[this." << (*f_iter)->get_name() << "];" << endl;
-      indent(out) << "if (" << field->get_name() << "_name != null) {" << endl;
-      indent(out) << "  ret += " << field->get_name() << "_name;" << endl;
-      indent(out) << "  ret += \" (\";" << endl;
-      indent(out) << "}" << endl;
-      indent(out) << "ret += this." << field->get_name() << ";" << endl;
-      indent(out) << "if (" << field->get_name() << "_name != null) {" << endl;
-      indent(out) << "  ret += \")\";" << endl;
-      indent(out) << "}" << endl;
-    } else {
-      indent(out) << "ret += this." << (*f_iter)->get_name() << ";" << endl;
-    }
-
-    if (can_be_null) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    indent(out) << "first = false;" << endl;
-
-    if (could_be_unset) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    first = false;
-  }
-  out << indent() << "ret += \")\";" << endl << indent() << "return ret;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a static map with meta data to store information such as fieldID to
- * fieldName mapping
- *
- * @param tstruct The struct definition
- */
-void t_haxe_generator::generate_haxe_meta_data_map(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Static Map with fieldID -> FieldMetaData mappings
-  indent(out) << "inline static var metaDataMap : IntMap = new IntMap();" << endl;
-
-  if (fields.size() > 0) {
-    // Populate map
-    scope_up(out);
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      t_field* field = *f_iter;
-      std::string field_name = field->get_name();
-      indent(out) << "metaDataMap[" << upcase_string(field_name)
-                  << "_FIELD_ID] = new FieldMetaData(\"" << field_name << "\", ";
-
-      // Set field requirement type (required, optional, etc.)
-      if (field->get_req() == t_field::T_REQUIRED) {
-        out << "TFieldRequirementType.REQUIRED, ";
-      } else if (field->get_req() == t_field::T_OPTIONAL) {
-        out << "TFieldRequirementType.OPTIONAL, ";
-      } else {
-        out << "TFieldRequirementType.DEFAULT, ";
-      }
-
-      // Create value meta data
-      generate_field_value_meta_data(out, field->get_type());
-      out << ");" << endl;
-    }
-    scope_down(out);
-  }
-}
-
-/**
- * Returns a string with the haxe representation of the given thrift type
- * (e.g. for the type struct it returns "TType.STRUCT")
- */
-std::string t_haxe_generator::get_haxe_type_string(t_type* type) {
-  if (type->is_list()) {
-    return "TType.LIST";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_typedef()) {
-    return get_haxe_type_string(((t_typedef*)type)->get_type());
-  } else if (type->is_base_type()) {
-    switch (((t_base_type*)type)->get_base()) {
-    case t_base_type::TYPE_VOID:
-      return "TType.VOID";
-      break;
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-      break;
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-      break;
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-      break;
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-      break;
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-      break;
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-      break;
-    default:
-      throw std::runtime_error("Unknown thrift type \"" + type->get_name()
-                               + "\" passed to t_haxe_generator::get_haxe_type_string!");
-      break; // This should never happen!
-    }
-  } else {
-    throw std::runtime_error(
-        "Unknown thrift type \"" + type->get_name()
-        + "\" passed to t_haxe_generator::get_haxe_type_string!"); // This should never happen!
-  }
-}
-
-void t_haxe_generator::generate_field_value_meta_data(std::ofstream& out, t_type* type) {
-  out << endl;
-  indent_up();
-  indent_up();
-  if (type->is_struct()) {
-    indent(out) << "new StructMetaData(TType.STRUCT, " << type_name(type);
-  } else if (type->is_container()) {
-    if (type->is_list()) {
-      indent(out) << "new ListMetaData(TType.LIST, ";
-      t_type* elem_type = ((t_list*)type)->get_elem_type();
-      generate_field_value_meta_data(out, elem_type);
-    } else if (type->is_set()) {
-      indent(out) << "new SetMetaData(TType.SET, ";
-      t_type* elem_type = ((t_list*)type)->get_elem_type();
-      generate_field_value_meta_data(out, elem_type);
-    } else { // map
-      indent(out) << "new MapMetaData(TType.MAP, ";
-      t_type* key_type = ((t_map*)type)->get_key_type();
-      t_type* val_type = ((t_map*)type)->get_val_type();
-      generate_field_value_meta_data(out, key_type);
-      out << ", ";
-      generate_field_value_meta_data(out, val_type);
-    }
-  } else {
-    indent(out) << "new FieldValueMetaData(" << get_haxe_type_string(type);
-  }
-  out << ")";
-  indent_down();
-  indent_down();
-}
-
-/**
- * Generates a thrift service. In C++, this comprises an entirely separate
- * header and source file. The header file defines the methods and includes
- * the data types defined in the main header file, and the implementation
- * file contains implementations of the basic printer and default interfaces.
- *
- * @param tservice The service definition
- */
-void t_haxe_generator::generate_service(t_service* tservice) {
-  // Make interface file
-  string f_service_name = package_dir_ + "/" + get_cap_name(service_name_) + ".hx";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << haxe_package() << ";" << endl;
-
-  f_service_ << endl << haxe_type_imports() << haxe_thrift_imports()
-             << haxe_thrift_gen_imports(tservice);
-
-  if (tservice->get_extends() != NULL) {
-    t_type* parent = tservice->get_extends();
-    string parent_namespace = parent->get_program()->get_namespace("haxe");
-    if (!parent_namespace.empty() && parent_namespace != package_name_) {
-      f_service_ << "import " << type_name(parent) << ";" << endl;
-    }
-  }
-
-  f_service_ << endl;
-
-  generate_service_interface(tservice);
-
-  f_service_.close();
-
-  // Now make the implementation/client file
-  f_service_name = package_dir_ + "/" + get_cap_name(service_name_) + "Impl.hx";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << haxe_package() << ";" << endl << endl << haxe_type_imports()
-             << haxe_thrift_imports() << haxe_thrift_gen_imports(tservice) << endl;
-
-  if (tservice->get_extends() != NULL) {
-    t_type* parent = tservice->get_extends();
-    string parent_namespace = parent->get_program()->get_namespace("haxe");
-    if (!parent_namespace.empty() && parent_namespace != package_name_) {
-      f_service_ << "import " << type_name(parent) << "Impl;" << endl;
-    }
-  }
-
-  f_service_ << endl;
-
-  generate_service_client(tservice);
-
-  f_service_.close();
-
-  // Now make the helper class files
-  generate_service_helpers(tservice);
-
-  // Now make the processor/server file
-  f_service_name = package_dir_ + "/" + get_cap_name(service_name_) + "Processor.hx";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << haxe_package() << ";" << endl << endl << haxe_type_imports()
-             << haxe_thrift_imports() << haxe_thrift_gen_imports(tservice) << endl;
-
-  if (!package_name_.empty()) {
-    f_service_ << "import " << package_name_ << ".*;" << endl;
-    f_service_ << "import " << package_name_ << "." << get_cap_name(service_name_).c_str()
-               << "Impl;" << endl;
-    f_service_ << endl;
-  }
-
-  generate_service_server(tservice);
-
-  f_service_.close();
-}
-
-/**
- * Generates the code snippet for the onSuccess callbacks
- *
- * @param tfunction The service function to generate code for.
- */
-string t_haxe_generator::generate_service_method_onsuccess(t_function* tfunction,
-                                                           bool as_type,
-                                                           bool omit_name) {
-  if (tfunction->is_oneway()) {
-    return "";
-  }
-
-  string name = "";
-  if (!omit_name) {
-    name = "onSuccess";
-    if (as_type) {
-      name += " : ";
-    }
-  }
-
-  if (tfunction->get_returntype()->is_void()) {
-    if (as_type) {
-      return name + "Void->Void = null";
-    } else {
-      return name + "() : Void";
-    }
-  }
-
-  if (as_type) {
-    return name + type_name(tfunction->get_returntype()) + "->Void = null";
-  } else {
-    return name + "( retval : " + type_name(tfunction->get_returntype()) + ")";
-  }
-}
-
-/**
- * Generates a service method header
- *
- * @param tfunction The service function to generate code for.
- */
-void t_haxe_generator::generate_service_method_signature(t_function* tfunction, bool is_interface) {
-  if (callbacks_) {
-    generate_service_method_signature_callback(tfunction, is_interface);
-  } else {
-    generate_service_method_signature_normal(tfunction, is_interface);
-  }
-}
-
-/**
- * Generates a service method header in "normal" style
- *
- * @param tfunction The service function to generate code for.
- */
-void t_haxe_generator::generate_service_method_signature_normal(t_function* tfunction,
-                                                                bool is_interface) {
-  if (is_interface) {
-    indent(f_service_) << function_signature_normal(tfunction) << ";" << endl << endl;
-  } else {
-    indent(f_service_) << "public " << function_signature_normal(tfunction) << " {" << endl;
-  }
-}
-
-/**
- * Generates a service method header in "callback" style
- *
- * @param tfunction The service function to generate code for.
- */
-void t_haxe_generator::generate_service_method_signature_callback(t_function* tfunction,
-                                                                  bool is_interface) {
-  if (!tfunction->is_oneway()) {
-    std::string on_success_impl = generate_service_method_onsuccess(tfunction, false, false);
-    indent(f_service_) << "// function onError(Dynamic) : Void;" << endl;
-    indent(f_service_) << "// function " << on_success_impl.c_str() << ";" << endl;
-  }
-
-  if (is_interface) {
-    indent(f_service_) << function_signature_callback(tfunction) << ";" << endl << endl;
-  } else {
-    indent(f_service_) << "public " << function_signature_callback(tfunction) << " {" << endl;
-  }
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_haxe_generator::generate_service_interface(t_service* tservice) {
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends_iface = " extends " + tservice->get_extends()->get_name();
-  }
-
-  generate_haxe_doc(f_service_, tservice);
-  // generate_rtti_decoration(f_service_); - not yet, because of
-  // https://github.com/HaxeFoundation/haxe/issues/3626
-  generate_macro_decoration(f_service_);
-  f_service_ << indent() << "interface " << get_cap_name(service_name_) << extends_iface << " {"
-             << endl << endl;
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_haxe_doc(f_service_, *f_iter);
-    generate_service_method_signature(*f_iter, true);
-  }
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates structs for all the service args and return types
- *
- * @param tservice The service
- */
-void t_haxe_generator::generate_service_helpers(t_service* tservice) {
-  f_service_ << endl << endl;
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_haxe_struct(ts, false);
-    generate_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_haxe_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = get_cap_name(tservice->get_extends()->get_name());
-    extends_client = " extends " + extends + "Impl";
-  }
-
-  generate_rtti_decoration(f_service_);
-  // build macro is inherited from interface
-  indent(f_service_) << "class " << get_cap_name(service_name_) << "Impl" << extends_client
-                     << " implements " << get_cap_name(service_name_) << " {" << endl << endl;
-  indent_up();
-
-  indent(f_service_) << "public function new( iprot : TProtocol, oprot : TProtocol = null)" << endl;
-  scope_up(f_service_);
-  if (extends.empty()) {
-    f_service_ << indent() << "iprot_ = iprot;" << endl;
-    f_service_ << indent() << "if (oprot == null) {" << endl;
-    indent_up();
-    f_service_ << indent() << "oprot_ = iprot;" << endl;
-    indent_down();
-    f_service_ << indent() << "} else {" << endl;
-    indent_up();
-    f_service_ << indent() << "oprot_ = oprot;" << endl;
-    indent_down();
-    f_service_ << indent() << "}" << endl;
-  } else {
-    f_service_ << indent() << "super(iprot, oprot);" << endl;
-  }
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent() << "private var iprot_ : TProtocol;" << endl << indent()
-               << "private var oprot_ : TProtocol;" << endl << indent()
-               << "private var seqid_ : Int;" << endl << endl;
-
-    indent(f_service_) << "public function getInputProtocol() : TProtocol" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "return this.iprot_;" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    indent(f_service_) << "public function getOutputProtocol() : TProtocol" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "return this.oprot_;" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-  }
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-
-    // Open function
-    generate_service_method_signature(*f_iter, false);
-
-    indent_up();
-
-    // Get the struct of function call params
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-
-    string argsname = get_cap_name((*f_iter)->get_name() + "_args");
-    vector<t_field*>::const_iterator fld_iter;
-    const vector<t_field*>& fields = arg_struct->get_members();
-
-    // Serialize the request
-    string calltype = (*f_iter)->is_oneway() ? "ONEWAY" : "CALL";
-    f_service_ << indent() << "oprot_.writeMessageBegin(new TMessage(\"" << funname
-               << "\", TMessageType." << calltype << ", seqid_));" << endl << indent()
-               << "var args : " << argsname << " = new " << argsname << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "args." << (*fld_iter)->get_name() << " = "
-                 << (*fld_iter)->get_name() << ";" << endl;
-    }
-
-    f_service_ << indent() << "args.write(oprot_);" << endl << indent()
-               << "oprot_.writeMessageEnd();" << endl;
-
-    if (!((*f_iter)->is_oneway() || (*f_iter)->get_returntype()->is_void())) {
-      f_service_ << indent() << "var retval : " << type_name((*f_iter)->get_returntype()) << ";"
-                 << endl;
-    }
-
-    if ((*f_iter)->is_oneway()) {
-      f_service_ << indent() << "oprot_.getTransport().flush();" << endl;
-    } else {
-      indent(f_service_) << "oprot_.getTransport().flush(function(error:Dynamic) : Void {" << endl;
-      indent_up();
-      if (callbacks_) {
-        indent(f_service_) << "try {" << endl;
-        indent_up();
-      }
-      string resultname = get_cap_name((*f_iter)->get_name() + "_result");
-      indent(f_service_) << "if (error != null) {" << endl;
-      indent_up();
-      if (callbacks_) {
-        indent(f_service_) << "if (onError != null) onError(error);" << endl;
-        indent(f_service_) << "return;" << endl;
-      } else {
-        indent(f_service_) << "throw error;" << endl;
-      }
-      indent_down();
-      indent(f_service_) << "}" << endl;
-      indent(f_service_) << "var msg : TMessage = iprot_.readMessageBegin();" << endl;
-      indent(f_service_) << "if (msg.type == TMessageType.EXCEPTION) {" << endl;
-      indent_up();
-      indent(f_service_) << "var x = TApplicationException.read(iprot_);" << endl;
-      indent(f_service_) << "iprot_.readMessageEnd();" << endl;
-      if (callbacks_) {
-        indent(f_service_) << "if (onError != null) onError(x);" << endl;
-        indent(f_service_) << "return;" << endl;
-      } else {
-        indent(f_service_) << "throw x;" << endl;
-      }
-      indent_down();
-      indent(f_service_) << "}" << endl;
-      indent(f_service_) << "var result : " << resultname << " = new " << resultname << "();"
-                         << endl;
-      indent(f_service_) << "result.read(iprot_);" << endl;
-      indent(f_service_) << "iprot_.readMessageEnd();" << endl;
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "if (result." << generate_isset_check("success") << ") {" << endl;
-        indent_up();
-        if (callbacks_) {
-          indent(f_service_) << "if (onSuccess != null) onSuccess(result.success);" << endl;
-          indent(f_service_) << "return;" << endl;
-        } else {
-          indent(f_service_) << "retval = result.success;" << endl;
-          indent(f_service_) << "return;" << endl;
-        }
-        indent_down();
-        indent(f_service_) << "}" << endl;
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        indent(f_service_) << "if (result." << (*x_iter)->get_name() << " != null) {" << endl;
-        indent_up();
-        if (callbacks_) {
-          indent(f_service_) << "if (onError != null) onError(result." << (*x_iter)->get_name()
-                             << ");" << endl;
-          indent(f_service_) << "return;" << endl;
-        } else {
-          indent(f_service_) << "throw result." << (*x_iter)->get_name() << ";" << endl;
-        }
-        indent_down();
-        indent(f_service_) << "}" << endl;
-      }
-
-      // If you get here it's an exception, unless a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        if (callbacks_) {
-          indent(f_service_) << "if (onSuccess != null) onSuccess();" << endl;
-        }
-        indent(f_service_) << "return;" << endl;
-      } else {
-        if (callbacks_) {
-          indent(f_service_) << "if (onError != null)" << endl;
-          indent_up();
-          indent(f_service_)
-              << "onError( new TApplicationException(TApplicationException.MISSING_RESULT," << endl;
-          indent(f_service_) << "                               \"" << (*f_iter)->get_name()
-                             << " failed: unknown result\"));" << endl;
-          indent_down();
-        } else {
-          indent(f_service_)
-              << "throw new TApplicationException(TApplicationException.MISSING_RESULT," << endl;
-          indent(f_service_) << "                            \"" << (*f_iter)->get_name()
-                             << " failed: unknown result\");" << endl;
-        }
-      }
-
-      if (callbacks_) {
-        indent_down();
-        indent(f_service_) << "} catch( e : TException) {" << endl;
-        indent_up();
-        indent(f_service_) << "if (onError != null) onError(e);" << endl;
-        indent_down();
-        indent(f_service_) << "}" << endl;
-      }
-
-      indent_down();
-      indent(f_service_) << "});" << endl;
-    }
-
-    if (!((*f_iter)->is_oneway() || (*f_iter)->get_returntype()->is_void())) {
-      f_service_ << indent() << "return retval;" << endl;
-    }
-
-    // Close function
-    scope_down(f_service_);
-    f_service_ << endl;
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl;
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_haxe_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  // Extends stuff
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = get_cap_name(type_name(tservice->get_extends()));
-    extends_processor = " extends " + extends + "Processor";
-  }
-
-  // Generate the header portion
-  generate_rtti_decoration(f_service_);
-  generate_macro_decoration(f_service_);
-  indent(f_service_) << "class " << get_cap_name(service_name_) << "Processor" << extends_processor
-                     << " implements TProcessor {" << endl << endl;
-  indent_up();
-
-  f_service_ << indent() << "private var " << get_cap_name(service_name_)
-             << "_iface_ : " << get_cap_name(service_name_) << ";" << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent()
-               << "private var PROCESS_MAP = new StringMap< Int->TProtocol->TProtocol->Void >();"
-               << endl;
-  }
-
-  f_service_ << endl;
-
-  indent(f_service_) << "public function new( iface : " << get_cap_name(service_name_) << ")"
-                     << endl;
-  scope_up(f_service_);
-  if (!extends.empty()) {
-    f_service_ << indent() << "super(iface);" << endl;
-  }
-  f_service_ << indent() << get_cap_name(service_name_) << "_iface_ = iface;" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << indent() << "PROCESS_MAP.set(\"" << (*f_iter)->get_name() << "\", "
-               << (*f_iter)->get_name() << "());" << endl;
-  }
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate the server implementation
-  string override = "";
-  if (tservice->get_extends() != NULL) {
-    override = "override ";
-  }
-  indent(f_service_) << override
-                     << "public function process( iprot : TProtocol, oprot : TProtocol) : Bool"
-                     << endl;
-  scope_up(f_service_);
-
-  f_service_ << indent() << "var msg : TMessage = iprot.readMessageBegin();" << endl;
-
-  // TODO(mcslee): validate message, was the seqid etc. legit?
-  // AS- If all method is oneway:
-  // do you have an oprot?
-  // do you you need nullcheck?
-  f_service_
-      << indent() << "var fn  = PROCESS_MAP.get(msg.name);" << endl << indent()
-      << "if (fn == null) {" << endl << indent() << "  TProtocolUtil.skip(iprot, TType.STRUCT);"
-      << endl << indent() << "  iprot.readMessageEnd();" << endl << indent()
-      << "  var x = new TApplicationException(TApplicationException.UNKNOWN_METHOD, \"Invalid "
-         "method name: '\"+msg.name+\"'\");" << endl << indent()
-      << "  oprot.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));"
-      << endl << indent() << "  x.write(oprot);" << endl << indent() << "  oprot.writeMessageEnd();"
-      << endl << indent() << "  oprot.getTransport().flush();" << endl << indent()
-      << "  return true;" << endl << indent() << "}" << endl << indent()
-      << "fn( msg.seqid, iprot, oprot);" << endl;
-
-  f_service_ << indent() << "return true;" << endl;
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_haxe_generator::generate_function_helpers(t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  string resultname = get_cap_name(tfunction->get_name() + "_result");
-  t_struct result(program_, resultname);
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_haxe_struct(&result, false, true);
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_haxe_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  // Open class
-  indent(f_service_) << "private function " << tfunction->get_name()
-                     << "() : Int->TProtocol->TProtocol->Void {" << endl;
-  indent_up();
-
-  // Open function
-  indent(f_service_) << "return function( seqid : Int, iprot : TProtocol, oprot : TProtocol) : Void"
-                     << endl;
-  scope_up(f_service_);
-
-  string argsname = get_cap_name(tfunction->get_name() + "_args");
-  string resultname = get_cap_name(tfunction->get_name() + "_result");
-
-  f_service_ << indent() << "var args : " << argsname << " = new " << argsname << "();" << endl
-             << indent() << "args.read(iprot);" << endl << indent() << "iprot.readMessageEnd();"
-             << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Declare result for non oneway function
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << "var result : " << resultname << " = new " << resultname << "();"
-               << endl;
-  }
-
-  // Try block for any  function to catch (defined or undefined) exceptions
-  f_service_ << indent() << "try {" << endl;
-  indent_up();
-
-  if (callbacks_) {
-    // callback function style onError/onSuccess
-
-    // Generate the function call
-    t_struct* arg_struct = tfunction->get_arglist();
-    const std::vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator f_iter;
-
-    f_service_ << indent();
-    f_service_ << get_cap_name(service_name_) << "_iface_." << tfunction->get_name() << "(";
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << "args." << (*f_iter)->get_name();
-    }
-
-    if (tfunction->is_oneway()) {
-      f_service_ << ");" << endl;
-    } else {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      string on_success = generate_service_method_onsuccess(tfunction, false, true);
-      indent_up();
-      f_service_ << endl;
-      indent(f_service_) << "null,  // errors are thrown by the handler" << endl;
-      if (tfunction->get_returntype()->is_void()) {
-        indent(f_service_) << "null); // no retval" << endl;
-      } else {
-        indent(f_service_) << "function" << on_success.c_str() << " {" << endl;
-        if (!tfunction->get_returntype()->is_void()) {
-          indent_up();
-          indent(f_service_) << "result.success = retval;" << endl;
-          indent_down();
-        }
-        indent(f_service_) << "});" << endl;
-      }
-      indent_down();
-    }
-
-  } else {
-    // normal function():result style
-
-    // Generate the function call
-    t_struct* arg_struct = tfunction->get_arglist();
-    const std::vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator f_iter;
-
-    f_service_ << indent();
-    if (!(tfunction->is_oneway() || tfunction->get_returntype()->is_void())) {
-      f_service_ << "result.success = ";
-    }
-    f_service_ << get_cap_name(service_name_) << "_iface_." << tfunction->get_name() << "(";
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << "args." << (*f_iter)->get_name();
-    }
-    f_service_ << ");" << endl;
-  }
-
-  indent_down();
-  f_service_ << indent() << "}";
-  if (!tfunction->is_oneway()) {
-    // catch exceptions defined in the IDL
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << " catch (" << (*x_iter)->get_name() << ":"
-                 << get_cap_name(type_name((*x_iter)->get_type(), false, false)) << ") {" << endl;
-      if (!tfunction->is_oneway()) {
-        indent_up();
-        f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
-                   << (*x_iter)->get_name() << ";" << endl;
-        indent_down();
-        f_service_ << indent() << "}";
-      } else {
-        f_service_ << "}";
-      }
-    }
-  }
-
-  // always catch all exceptions to prevent from service denial
-  f_service_ << " catch (th : Dynamic) {" << endl;
-  indent_up();
-  indent(f_service_) << "trace(\"Internal error processing " << tfunction->get_name() << "\", th);"
-                     << endl;
-  if (!tfunction->is_oneway()) {
-    indent(f_service_) << "var x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "
-                          "\"Internal error processing " << tfunction->get_name() << "\");" << endl;
-    indent(f_service_) << "oprot.writeMessageBegin(new TMessage(\"" << tfunction->get_name()
-                       << "\", TMessageType.EXCEPTION, seqid));" << endl;
-    indent(f_service_) << "x.write(oprot);" << endl;
-    indent(f_service_) << "oprot.writeMessageEnd();" << endl;
-    indent(f_service_) << "oprot.getTransport().flush();" << endl;
-  }
-  indent(f_service_) << "return;" << endl;
-  indent_down();
-  f_service_ << indent() << "}" << endl;
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    f_service_ << indent() << "return;" << endl;
-    scope_down(f_service_);
-
-    // Close class
-    indent_down();
-    f_service_ << indent() << "}" << endl << endl;
-    return;
-  }
-
-  f_service_ << indent() << "oprot.writeMessageBegin(new TMessage(\"" << tfunction->get_name()
-             << "\", TMessageType.REPLY, seqid));" << endl << indent() << "result.write(oprot);"
-             << endl << indent() << "oprot.writeMessageEnd();" << endl << indent()
-             << "oprot.getTransport().flush();" << endl;
-
-  // Close function
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Close class
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Deserializes a field of any type.
- *
- * @param tfield The field
- * @param prefix The variable name or container for this field
- */
-void t_haxe_generator::generate_deserialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name();
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    indent(out) << name << " = iprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "readBinary();";
-        } else {
-          out << "readString();";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "readBool();";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "readByte();";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "readI16();";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "readI32();";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "readI64();";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "readDouble();";
-        break;
-      default:
-        throw "compiler error: no Haxe name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "readI32();";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a struct, invokes read()
- */
-void t_haxe_generator::generate_deserialize_struct(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   string prefix) {
-  out << indent() << prefix << " = new " << get_cap_name(type_name(tstruct)) << "();" << endl
-      << indent() << prefix << ".read(iprot);" << endl;
-}
-
-/**
- * Deserializes a container by reading its size and then iterating
- */
-void t_haxe_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  string obj;
-
-  if (ttype->is_map()) {
-    obj = tmp("_map");
-  } else if (ttype->is_set()) {
-    obj = tmp("_set");
-  } else if (ttype->is_list()) {
-    obj = tmp("_list");
-  }
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    indent(out) << "var " << obj << " = iprot.readMapBegin();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "var " << obj << " = iprot.readSetBegin();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "var " << obj << " = iprot.readListBegin();" << endl;
-  }
-
-  indent(out) << prefix << " = new " << type_name(ttype, false, true)
-              // size the collection correctly
-              << "("
-              << ");" << endl;
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for( " << i << " in 0 ... " << obj << ".size)" << endl;
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  scope_down(out);
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "iprot.readMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "iprot.readSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "iprot.readListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_haxe_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey) << endl;
-  indent(out) << declare_field(&fval) << endl;
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << prefix << ".set( " << key << ", " << val << ");" << endl;
-}
-
-/**
- * Deserializes a set element
- */
-void t_haxe_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".add(" << elem << ");" << endl;
-}
-
-/**
- * Deserializes a list element
- */
-void t_haxe_generator::generate_deserialize_list_element(ofstream& out,
-                                                         t_list* tlist,
-                                                         string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".add(" << elem << ");" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_haxe_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + tfield->get_name());
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + tfield->get_name());
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    string name = prefix + tfield->get_name();
-    indent(out) << "oprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "writeBinary(" << name << ");";
-        } else {
-          out << "writeString(" << name << ");";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ");";
-        break;
-      default:
-        throw "compiler error: no Haxe name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32(" << name << ");";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_haxe_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  out << indent() << prefix << ".write(oprot);" << endl;
-}
-
-/**
- * Serializes a container by writing its size then the elements.
- *
- * @param ttype  The type of container
- * @param prefix String prefix for fields
- */
-void t_haxe_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    string iter = tmp("_key");
-    string counter = tmp("_sizeCounter");
-    indent(out) << "var " << counter << " : Int = 0;" << endl;
-    indent(out) << "for( " << iter << " in " << prefix << ") {" << endl;
-    indent(out) << "  " << counter << +"++;" << endl;
-    indent(out) << "}" << endl;
-
-    indent(out) << "oprot.writeMapBegin(new TMap(" << type_to_enum(((t_map*)ttype)->get_key_type())
-                << ", " << type_to_enum(((t_map*)ttype)->get_val_type()) << ", " << counter << "));"
-                << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetBegin(new TSet(" << type_to_enum(((t_set*)ttype)->get_elem_type())
-                << ", " << prefix << ".size));" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListBegin(new TList("
-                << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " << prefix << ".length));"
-                << endl;
-  }
-
-  string iter = tmp("elem");
-  if (ttype->is_map()) {
-    indent(out) << "for( " << iter << " in " << prefix << ".keys())" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "for( " << iter << " in " << prefix << ".toArray())" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "for( " << iter << " in " << prefix << ")" << endl;
-  }
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, (t_map*)ttype, iter, prefix);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-  }
-
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot.writeMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- */
-void t_haxe_generator::generate_serialize_map_element(ofstream& out,
-                                                      t_map* tmap,
-                                                      string iter,
-                                                      string map) {
-  t_field kfield(tmap->get_key_type(), iter);
-  generate_serialize_field(out, &kfield, "");
-  t_field vfield(tmap->get_val_type(), map + ".get(" + iter + ")");
-  generate_serialize_field(out, &vfield, "");
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_haxe_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_haxe_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Returns a haxe type name
- *
- * @param ttype The type
- * @param container Is the type going inside a container?
- * @return haxe type name, i.e. HashMap<Key,Value>
- */
-string t_haxe_generator::type_name(t_type* ttype, bool in_container, bool in_init) {
-  (void)in_init;
-
-  // typedefs are just resolved to their real type
-  ttype = get_true_type(ttype);
-  string prefix;
-
-  if (ttype->is_base_type()) {
-    return base_type_name((t_base_type*)ttype, in_container);
-  }
-
-  if (ttype->is_enum()) {
-    return "Int";
-  }
-
-  if (ttype->is_map()) {
-    t_type* tkey = get_true_type(((t_map*)ttype)->get_key_type());
-    t_type* tval = get_true_type(((t_map*)ttype)->get_val_type());
-    if (tkey->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)tkey)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_STRING:
-        if (!(((t_base_type*)tkey)->is_binary())) {
-          return "StringMap< " + type_name(tval) + ">";
-        }
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-        return "IntMap< " + type_name(tval) + ">";
-      case t_base_type::TYPE_I64:
-        return "Int64Map< " + type_name(tval) + ">";
-      default:
-        break; // default to ObjectMap<>
-      }
-    }
-    if (tkey->is_enum()) {
-      return "IntMap< " + type_name(tval) + ">";
-    }
-    return "ObjectMap< " + type_name(tkey) + ", " + type_name(tval) + ">";
-  }
-
-  if (ttype->is_set()) {
-    t_type* tkey = get_true_type(((t_list*)ttype)->get_elem_type());
-    if (tkey->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)tkey)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_STRING:
-        if (!(((t_base_type*)tkey)->is_binary())) {
-          return "StringSet";
-        }
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-        return "IntSet";
-      case t_base_type::TYPE_I64:
-        return "Int64Set";
-      default:
-        break; // default to ObjectSet
-      }
-    }
-    if (tkey->is_enum()) {
-      return "IntSet";
-    }
-    return "ObjectSet< " + type_name(tkey) + ">";
-  }
-
-  if (ttype->is_list()) {
-    t_type* telm = ((t_list*)ttype)->get_elem_type();
-    return "List< " + type_name(telm) + ">";
-  }
-
-  // Check for namespacing
-  t_program* program = ttype->get_program();
-  if (program != NULL && program != program_) {
-    string package = program->get_namespace("haxe");
-    if (!package.empty()) {
-      return package + "." + ttype->get_name();
-    }
-  }
-
-  return ttype->get_name();
-}
-
-/**
- * Returns the haxe type that corresponds to the thrift type.
- *
- * @param tbase The base type
- * @param container Is it going in a haxe container?
- */
-string t_haxe_generator::base_type_name(t_base_type* type, bool in_container) {
-  (void)in_container;
-  t_base_type::t_base tbase = type->get_base();
-
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "Void";
-  case t_base_type::TYPE_STRING:
-    if (type->is_binary()) {
-      return "haxe.io.Bytes";
-    } else {
-      return "String";
-    }
-  case t_base_type::TYPE_BOOL:
-    return "Bool";
-  case t_base_type::TYPE_I8:
-  case t_base_type::TYPE_I16:
-  case t_base_type::TYPE_I32:
-    return "haxe.Int32";
-  case t_base_type::TYPE_I64:
-    return "haxe.Int64";
-  case t_base_type::TYPE_DOUBLE:
-    return "Float";
-  default:
-    throw "compiler error: no Haxe name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param ttype The type
- */
-string t_haxe_generator::declare_field(t_field* tfield, bool init) {
-  // TODO(mcslee): do we ever need to initialize the field?
-  string result = "var " + tfield->get_name() + " : " + type_name(tfield->get_type());
-  if (init) {
-    t_type* ttype = get_true_type(tfield->get_type());
-    if (ttype->is_base_type() && tfield->get_value() != NULL) {
-      ofstream dummy;
-      result += " = " + render_const_value(dummy, tfield->get_name(), ttype, tfield->get_value());
-    } else if (ttype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "NO T_VOID CONSTRUCT";
-      case t_base_type::TYPE_STRING:
-        result += " = null";
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = false";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = (double)0";
-        break;
-      }
-
-    } else if (ttype->is_enum()) {
-      result += " = 0";
-    } else if (ttype->is_container()) {
-      result += " = new " + type_name(ttype, false, true) + "()";
-    } else {
-      result += " = new " + type_name(ttype, false, true) + "()";
-    }
-  }
-  return result + ";";
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_haxe_generator::function_signature_callback(t_function* tfunction) {
-  std::string on_error_success = "onError : Dynamic->Void = null, "
-                                 + generate_service_method_onsuccess(tfunction, true, false);
-
-  std::string arguments = argument_list(tfunction->get_arglist());
-  if (!tfunction->is_oneway()) {
-    if (arguments != "") {
-      arguments += ", ";
-    }
-    arguments += on_error_success; //"onError : Function, onSuccess : Function";
-  }
-
-  std::string result = "function " + tfunction->get_name() + "(" + arguments + ") : Void";
-  return result;
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_haxe_generator::function_signature_normal(t_function* tfunction) {
-  std::string arguments = argument_list(tfunction->get_arglist());
-
-  std::string resulttype;
-  if (tfunction->is_oneway() || tfunction->get_returntype()->is_void()) {
-    resulttype = "Void";
-  } else {
-    resulttype = type_name(tfunction->get_returntype());
-  }
-
-  std::string result = "function " + tfunction->get_name() + "(" + arguments + ") : " + resulttype;
-  return result;
-}
-
-/**
- * Renders a comma separated field list, with type names
- */
-string t_haxe_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += (*f_iter)->get_name() + " : " + type_name((*f_iter)->get_type());
-  }
-  return result;
-}
-
-/**
- * Converts the parse type to a C++ enum string for the given type.
- */
-string t_haxe_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_list()) {
-    return "TType.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Haxe class names must start with uppercase letter, but Haxe namespaces must not.
- */
-std::string t_haxe_generator::get_cap_name(std::string name) {
-  if (name.length() == 0) {
-    return name;
-  }
-
-  // test.for.Generic< data.Type, or.the.Like> and handle it recursively
-  size_t generic_first = name.find('<');
-  size_t generic_last = name.rfind('>');
-  if ((generic_first != std::string::npos) && (generic_last != std::string::npos)) {
-    string outer_type = name.substr(0, generic_first);
-    string inner_types = name.substr(generic_first + 1, generic_last - generic_first - 1);
-
-    string new_inner = "";
-    size_t comma_start = 0;
-    while (comma_start < inner_types.length()) {
-      size_t comma_pos = comma_start;
-      int nested = 0;
-
-      while (comma_pos < inner_types.length()) {
-        bool found = false;
-        switch (inner_types[comma_pos]) {
-        case '<':
-          ++nested;
-          break;
-        case '>':
-          --nested;
-          break;
-        case ',':
-          found = (nested == 0);
-          break;
-        }
-        if (found) {
-          break;
-        }
-        ++comma_pos;
-      }
-
-      if (new_inner.length() > 0) {
-        new_inner += ",";
-      }
-
-      string inner = inner_types.substr(comma_start, comma_pos - comma_start);
-      new_inner += get_cap_name(inner);
-      comma_start = ++comma_pos;
-    }
-
-    return get_cap_name(outer_type) + "<" + new_inner + ">";
-  }
-
-  // package name
-  size_t index = name.find_first_not_of(" \n\r\t");
-  if (index < name.length()) {
-    name[index] = tolower(name[index]);
-    index = name.find('.');
-    while (index != std::string::npos) {
-      if (++index < name.length()) {
-        name[index] = tolower(name[index]);
-      }
-      index = name.find('.', index);
-    }
-  }
-
-  // class name
-  index = name.rfind('.');
-  if (index != std::string::npos) {
-    ++index;
-  } else {
-    index = name.find_first_not_of(" \n\r\t");
-  }
-
-  if (index < name.length()) {
-    name[index] = toupper(name[index]);
-  }
-
-  return name;
-}
-
-string t_haxe_generator::constant_name(string name) {
-  string constant_name;
-
-  bool is_first = true;
-  bool was_previous_char_upper = false;
-  for (string::iterator iter = name.begin(); iter != name.end(); ++iter) {
-    string::value_type character = (*iter);
-
-    bool is_upper = isupper(character);
-
-    if (is_upper && !is_first && !was_previous_char_upper) {
-      constant_name += '_';
-    }
-    constant_name += toupper(character);
-
-    is_first = false;
-    was_previous_char_upper = is_upper;
-  }
-
-  return constant_name;
-}
-
-/**
- * Enables RTTI for a class or interface
- */
-void t_haxe_generator::generate_rtti_decoration(ofstream& out) {
-  if (rtti_) {
-    out << "@:rtti" << endl;
-  }
-}
-
-/**
- * Adds build macros to a class or interface
- */
-void t_haxe_generator::generate_macro_decoration(ofstream& out) {
-  if (!buildmacro_.empty()) {
-    out << "#if ! macro" << endl;
-    out << "@:build( " << buildmacro_ << ")" << endl;     // current class/interface
-    out << "@:autoBuild( " << buildmacro_ << ")" << endl; // inherited classes/interfaces
-    out << "#end" << endl;
-  }
-}
-
-/**
- * Emits a haxeDoc comment if the provided object has a doc in Thrift
- */
-void t_haxe_generator::generate_haxe_doc(ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    generate_docstring_comment(out, "/**\n", " * ", tdoc->get_doc(), " */\n");
-  }
-}
-
-/**
- * Emits a haxeDoc comment if the provided function object has a doc in Thrift
- */
-void t_haxe_generator::generate_haxe_doc(ofstream& out, t_function* tfunction) {
-  if (tfunction->has_doc()) {
-    stringstream ss;
-    ss << tfunction->get_doc();
-    const vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-    vector<t_field*>::const_iterator p_iter;
-    for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-      t_field* p = *p_iter;
-      ss << "\n@param " << p->get_name();
-      if (p->has_doc()) {
-        ss << " " << p->get_doc();
-      }
-    }
-    generate_docstring_comment(out, "/**\n", " * ", ss.str(), " */\n");
-  }
-}
-
-std::string t_haxe_generator::generate_isset_check(t_field* field) {
-  return generate_isset_check(field->get_name());
-}
-
-std::string t_haxe_generator::generate_isset_check(std::string field_name) {
-  return "is" + get_cap_name("set") + get_cap_name(field_name) + "()";
-}
-
-void t_haxe_generator::generate_isset_set(ofstream& out, t_field* field) {
-  if (!type_can_be_null(field->get_type())) {
-    indent(out) << "this.__isset_" << field->get_name() << " = true;" << endl;
-  }
-}
-
-std::string t_haxe_generator::get_enum_class_name(t_type* type) {
-  string package = "";
-  t_program* program = type->get_program();
-  if (program != NULL /*&& program != program_*/) {
-    package = program->get_namespace("haxe") + ".";
-  }
-  return package + type->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(
-    haxe,
-    "Haxe",
-    "    callbacks        Use onError()/onSuccess() callbacks for service methods (like AS3)\n"
-    "    rtti             Enable @:rtti for generated classes and interfaces\n"
-    "    buildmacro=my.macros.Class.method(args)\n"
-    "                     Add @:build macro calls to generated classes and interfaces\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_hs_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_hs_generator.cc
deleted file mode 100644
index a3ccd8d..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_hs_generator.cc
+++ /dev/null
@@ -1,1734 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sstream>
-
-#include "thrift/platform.h"
-#include "thrift/version.h"
-
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Haskell code generator.
- *
- */
-class t_hs_generator : public t_oop_generator {
-public:
-  t_hs_generator(t_program* program,
-                 const map<string, string>& parsed_options,
-                 const string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    /* no options yet */
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      throw "unknown option hs:" + iter->first;
-    }
-
-    out_dir_base_ = "gen-hs";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  string render_const_value(t_type* type, t_const_value* value);
-
-  /**
-   * Struct generation code
-   */
-
-  void generate_hs_struct(t_struct* tstruct, bool is_exception);
-
-  void generate_hs_struct_definition(ofstream& out,
-                                     t_struct* tstruct,
-                                     bool is_xception = false,
-                                     bool helper = false);
-
-  void generate_hs_struct_reader(ofstream& out, t_struct* tstruct);
-
-  void generate_hs_struct_writer(ofstream& out, t_struct* tstruct);
-
-  void generate_hs_struct_arbitrary(ofstream& out, t_struct* tstruct);
-
-  void generate_hs_function_helpers(t_function* tfunction);
-
-  void generate_hs_typemap(ofstream& out, t_struct* tstruct);
-
-  void generate_hs_default(ofstream& out, t_struct* tstruct);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(ofstream& out, t_field* tfield, string prefix);
-
-  void generate_deserialize_struct(ofstream& out, t_struct* tstruct, string name = "");
-
-  void generate_deserialize_container(ofstream& out, t_type* ttype, string arg = "");
-
-  void generate_deserialize_set_element(ofstream& out, t_set* tset);
-
-  void generate_deserialize_list_element(ofstream& out, t_list* tlist, string prefix = "");
-
-  void generate_deserialize_type(ofstream& out, t_type* type, string arg = "");
-
-  void generate_serialize_type(ofstream& out, t_type* type, string name = "");
-
-  void generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix = "");
-
-  void generate_serialize_container(ofstream& out, t_type* ttype, string prefix = "");
-
-  void generate_serialize_map_element(ofstream& out, t_map* tmap, string kiter, string viter);
-
-  void generate_serialize_set_element(ofstream& out, t_set* tmap, string iter);
-
-  void generate_serialize_list_element(ofstream& out, t_list* tlist, string iter);
-
-  /**
-   * Helper rendering functions
-   */
-
-  string hs_autogen_comment();
-  string hs_language_pragma();
-  string hs_imports();
-
-  string type_name(t_type* ttype, string function_prefix = "");
-
-  string field_name(string tname, string fname);
-
-  string function_type(t_function* tfunc,
-                       bool options = false,
-                       bool io = false,
-                       bool method = false);
-
-  string type_to_enum(t_type* ttype);
-
-  string type_to_default(t_type* ttype);
-
-  string render_hs_type(t_type* type, bool needs_parens);
-
-  string type_to_constructor(t_type* ttype);
-
-  string render_hs_type_for_function_name(t_type* type);
-
-private:
-  ofstream f_types_;
-  ofstream f_consts_;
-  ofstream f_service_;
-  ofstream f_iface_;
-  ofstream f_client_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_hs_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  // Make output file
-  string pname = capitalize(program_name_);
-  string f_types_name = get_out_dir() + pname + "_Types.hs";
-  f_types_.open(f_types_name.c_str());
-
-  string f_consts_name = get_out_dir() + pname + "_Consts.hs";
-  f_consts_.open(f_consts_name.c_str());
-
-  // Print header
-  f_types_ << hs_language_pragma() << endl;
-  f_types_ << hs_autogen_comment() << endl;
-  f_types_ << "module " << pname << "_Types where" << endl;
-  f_types_ << hs_imports() << endl;
-
-  f_consts_ << hs_language_pragma() << endl;
-  f_consts_ << hs_autogen_comment() << endl;
-  f_consts_ << "module " << pname << "_Consts where" << endl;
-  f_consts_ << hs_imports() << endl;
-  f_consts_ << "import " << pname << "_Types" << endl;
-}
-
-string t_hs_generator::hs_language_pragma() {
-  return string(
-      "{-# LANGUAGE DeriveDataTypeable #-}\n"
-      "{-# LANGUAGE DeriveGeneric #-}\n"
-      "{-# LANGUAGE OverloadedStrings #-}\n"
-      "{-# OPTIONS_GHC -fno-warn-missing-fields #-}\n"
-      "{-# OPTIONS_GHC -fno-warn-missing-signatures #-}\n"
-      "{-# OPTIONS_GHC -fno-warn-name-shadowing #-}\n"
-      "{-# OPTIONS_GHC -fno-warn-unused-imports #-}\n"
-      "{-# OPTIONS_GHC -fno-warn-unused-matches #-}\n");
-}
-
-/**
- * Autogen'd comment
- */
-string t_hs_generator::hs_autogen_comment() {
-  return string("-----------------------------------------------------------------\n")
-         + "-- Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")                      --\n"
-         + "--                                                             --\n"
-         + "-- DO NOT EDIT UNLESS YOU ARE SURE YOU KNOW WHAT YOU ARE DOING --\n"
-         + "-----------------------------------------------------------------\n";
-}
-
-/**
- * Prints standard thrift imports
- */
-string t_hs_generator::hs_imports() {
-  const vector<t_program*>& includes = program_->get_includes();
-  string result = string(
-      "import Prelude (($), (.), (>>=), (==), (++))\n"
-      "import qualified Prelude as P\n"
-      "import qualified Control.Exception as X\n"
-      "import qualified Control.Monad as M ( liftM, ap, when )\n"
-      "import Data.Functor ( (<$>) )\n"
-      "import qualified Data.ByteString.Lazy as LBS\n"
-      "import qualified Data.Hashable as H\n"
-      "import qualified Data.Int as I\n"
-      "import qualified Data.Maybe as M (catMaybes)\n"
-      "import qualified Data.Text.Lazy.Encoding as E ( decodeUtf8, encodeUtf8 )\n"
-      "import qualified Data.Text.Lazy as LT\n"
-      "import qualified GHC.Generics as G (Generic)\n"
-      "import qualified Data.Typeable as TY ( Typeable )\n"
-      "import qualified Data.HashMap.Strict as Map\n"
-      "import qualified Data.HashSet as Set\n"
-      "import qualified Data.Vector as Vector\n"
-      "import qualified Test.QuickCheck.Arbitrary as QC ( Arbitrary(..) )\n"
-      "import qualified Test.QuickCheck as QC ( elements )\n"
-      "\n"
-      "import qualified Thrift as T\n"
-      "import qualified Thrift.Types as T\n"
-      "import qualified Thrift.Arbitraries as T\n"
-      "\n");
-
-  for (size_t i = 0; i < includes.size(); ++i)
-    result += "import qualified " + capitalize(includes[i]->get_name()) + "_Types\n";
-
-  if (includes.size() > 0)
-    result += "\n";
-
-  return result;
-}
-
-/**
- * Closes the type files
- */
-void t_hs_generator::close_generator() {
-  // Close types file
-  f_types_.close();
-  f_consts_.close();
-}
-
-/**
- * Generates a typedef. Ez.
- *
- * @param ttypedef The type definition
- */
-void t_hs_generator::generate_typedef(t_typedef* ttypedef) {
-  string tname = capitalize(ttypedef->get_symbolic());
-  string tdef = render_hs_type(ttypedef->get_type(), false);
-  indent(f_types_) << "type " << tname << " = " << tdef << endl;
-  f_types_ << endl;
-}
-
-/**
- * Generates code for an enumerated type.
- * the values.
- *
- * @param tenum The enumeration
- */
-void t_hs_generator::generate_enum(t_enum* tenum) {
-  indent(f_types_) << "data " << capitalize(tenum->get_name()) << " = ";
-  indent_up();
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-
-  bool first = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    string name = capitalize((*c_iter)->get_name());
-    f_types_ << (first ? "" : "|");
-    f_types_ << name;
-    first = false;
-  }
-  indent(f_types_) << "deriving (P.Show, P.Eq, G.Generic, TY.Typeable, P.Ord, P.Bounded)" << endl;
-  indent_down();
-
-  string ename = capitalize(tenum->get_name());
-
-  indent(f_types_) << "instance P.Enum " << ename << " where" << endl;
-  indent_up();
-  indent(f_types_) << "fromEnum t = case t of" << endl;
-  indent_up();
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    string name = capitalize((*c_iter)->get_name());
-    indent(f_types_) << name << " -> " << value << endl;
-  }
-  indent_down();
-  indent(f_types_) << "toEnum t = case t of" << endl;
-  indent_up();
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    string name = capitalize((*c_iter)->get_name());
-    indent(f_types_) << value << " -> " << name << endl;
-  }
-  indent(f_types_) << "_ -> X.throw T.ThriftException" << endl;
-  indent_down();
-  indent_down();
-
-  indent(f_types_) << "instance H.Hashable " << ename << " where" << endl;
-  indent_up();
-  indent(f_types_) << "hashWithSalt salt = H.hashWithSalt salt P.. P.fromEnum" << endl;
-  indent_down();
-
-  indent(f_types_) << "instance QC.Arbitrary " << ename << " where" << endl;
-  indent_up();
-  indent(f_types_) << "arbitrary = QC.elements (P.enumFromTo P.minBound P.maxBound)" << endl;
-  indent_down();
-}
-
-/**
- * Generate a constant value
- */
-void t_hs_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = decapitalize(tconst->get_name());
-
-  t_const_value* value = tconst->get_value();
-
-  indent(f_consts_) << name << " :: " << render_hs_type(type, false) << endl;
-  indent(f_consts_) << name << " = " << render_const_value(type, value) << endl;
-  f_consts_ << endl;
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_hs_generator::render_const_value(t_type* type, t_const_value* value) {
-  if (value == NULL)
-    return type_to_default(type);
-
-  type = get_true_type(type);
-  ostringstream out;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-
-    case t_base_type::TYPE_STRING:
-      out << '"' << get_escaped_string(value) << '"';
-      break;
-
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "P.True" : "P.False");
-      break;
-
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << "(" << value->get_integer() << ")";
-      break;
-
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << "(" << value->get_integer() << ")";
-      } else {
-        out << "(" << value->get_double() << ")";
-      }
-      break;
-
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-
-  } else if (type->is_enum()) {
-    t_enum* tenum = (t_enum*)type;
-    vector<t_enum_value*> constants = tenum->get_constants();
-    for (vector<t_enum_value*>::iterator c_iter = constants.begin(); c_iter != constants.end();
-         ++c_iter) {
-      int val = (*c_iter)->get_value();
-      if (val == value->get_integer()) {
-        t_program* prog = type->get_program();
-        if (prog != NULL && prog != program_)
-          out << capitalize(prog->get_name()) << "_Types.";
-        out << capitalize((*c_iter)->get_name());
-        break;
-      }
-    }
-
-  } else if (type->is_struct() || type->is_xception()) {
-    string cname = type_name(type);
-    out << "default_" << cname << "{";
-
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-
-    bool first = true;
-    for (map<t_const_value*, t_const_value*>::const_iterator v_iter = val.begin();
-         v_iter != val.end();
-         ++v_iter) {
-      t_field* field = NULL;
-
-      for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end();
-           ++f_iter)
-        if ((*f_iter)->get_name() == v_iter->first->get_string())
-          field = (*f_iter);
-
-      if (field == NULL)
-        throw "type error: " + cname + " has no field " + v_iter->first->get_string();
-
-      string fname = v_iter->first->get_string();
-      string const_value = render_const_value(field->get_type(), v_iter->second);
-
-      out << (first ? "" : ", ");
-      out << field_name(cname, fname) << " = ";
-      if (field->get_req() == t_field::T_OPTIONAL || ((t_type*)field->get_type())->is_xception()) {
-        out << "P.Just ";
-      }
-      out << const_value;
-      first = false;
-    }
-
-    out << "}";
-
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    out << "(Map.fromList [";
-
-    bool first = true;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(ktype, v_iter->first);
-      string val = render_const_value(vtype, v_iter->second);
-      out << (first ? "" : ",");
-      out << "(" << key << "," << val << ")";
-      first = false;
-    }
-    out << "])";
-
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype = type->is_list() ? ((t_list*)type)->get_elem_type()
-                                    : ((t_set*)type)->get_elem_type();
-
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-
-    if (type->is_set())
-      out << "(Set.fromList [";
-    else
-      out << "(Vector.fromList [";
-
-    bool first = true;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << (first ? "" : ",");
-      out << render_const_value(etype, *v_iter);
-      first = false;
-    }
-
-    out << "])";
-
-  } else {
-    throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
-  }
-
-  return out.str();
-}
-
-/**
- * Generates a "struct"
- */
-void t_hs_generator::generate_struct(t_struct* tstruct) {
-  generate_hs_struct(tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct, but also has an exception declaration.
- *
- * @param txception The struct definition
- */
-void t_hs_generator::generate_xception(t_struct* txception) {
-  generate_hs_struct(txception, true);
-}
-
-/**
- * Generates a Haskell struct
- */
-void t_hs_generator::generate_hs_struct(t_struct* tstruct, bool is_exception) {
-  generate_hs_struct_definition(f_types_, tstruct, is_exception, false);
-}
-
-/**
- * Generates a struct definition for a thrift data type.
- *
- * @param tstruct The struct definition
- */
-void t_hs_generator::generate_hs_struct_definition(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   bool is_exception,
-                                                   bool helper) {
-  (void)helper;
-  string tname = type_name(tstruct);
-  string name = tstruct->get_name();
-  const vector<t_field*>& members = tstruct->get_members();
-
-  indent(out) << "data " << tname << " = " << tname;
-  if (members.size() > 0) {
-    indent_up();
-    bool first = true;
-    for (vector<t_field*>::const_iterator m_iter = members.begin(); m_iter != members.end();
-         ++m_iter) {
-      if (first) {
-        indent(out) << "{ ";
-        first = false;
-      } else {
-        indent(out) << ", ";
-      }
-      string mname = (*m_iter)->get_name();
-      out << field_name(tname, mname) << " :: ";
-      if ((*m_iter)->get_req() == t_field::T_OPTIONAL
-          || ((t_type*)(*m_iter)->get_type())->is_xception()) {
-        out << "P.Maybe ";
-      }
-      out << render_hs_type((*m_iter)->get_type(), true) << endl;
-    }
-    indent(out) << "}";
-    indent_down();
-  }
-
-  out << " deriving (P.Show,P.Eq,G.Generic,TY.Typeable)" << endl;
-
-  if (is_exception)
-    out << "instance X.Exception " << tname << endl;
-
-  indent(out) << "instance H.Hashable " << tname << " where" << endl;
-  indent_up();
-  indent(out) << "hashWithSalt salt record = salt";
-  for (vector<t_field*>::const_iterator m_iter = members.begin(); m_iter != members.end();
-       ++m_iter) {
-    string mname = (*m_iter)->get_name();
-    indent(out) << " `H.hashWithSalt` " << field_name(tname, mname) << " record";
-  }
-  indent(out) << endl;
-  indent_down();
-
-  generate_hs_struct_arbitrary(out, tstruct);
-  generate_hs_struct_writer(out, tstruct);
-  generate_hs_struct_reader(out, tstruct);
-  generate_hs_typemap(out, tstruct);
-  generate_hs_default(out, tstruct);
-}
-
-void t_hs_generator::generate_hs_struct_arbitrary(ofstream& out, t_struct* tstruct) {
-  string tname = type_name(tstruct);
-  string name = tstruct->get_name();
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  indent(out) << "instance QC.Arbitrary " << tname << " where " << endl;
-  indent_up();
-  if (members.size() > 0) {
-    indent(out) << "arbitrary = M.liftM " << tname;
-    indent_up();
-    indent_up();
-    indent_up();
-    indent_up();
-    bool first = true;
-    for (vector<t_field*>::const_iterator m_iter = members.begin(); m_iter != members.end();
-         ++m_iter) {
-      if (first) {
-        first = false;
-        out << " ";
-      } else {
-        indent(out) << "`M.ap`";
-      }
-      out << "(";
-      if ((*m_iter)->get_req() == t_field::T_OPTIONAL
-          || ((t_type*)(*m_iter)->get_type())->is_xception()) {
-        out << "M.liftM P.Just ";
-      }
-      out << "QC.arbitrary)" << endl;
-    }
-    indent_down();
-    indent_down();
-    indent_down();
-    indent_down();
-
-    // Shrink
-    indent(out) << "shrink obj | obj == default_" << tname << " = []" << endl;
-    indent(out) << "           | P.otherwise = M.catMaybes" << endl;
-    indent_up();
-    first = true;
-    for (vector<t_field*>::const_iterator m_iter = members.begin(); m_iter != members.end();
-         ++m_iter) {
-      if (first) {
-        first = false;
-        indent(out) << "[ ";
-      } else {
-        indent(out) << ", ";
-      }
-      string fname = field_name(tname, (*m_iter)->get_name());
-      out << "if obj == default_" << tname;
-      out << "{" << fname << " = " << fname << " obj} ";
-      out << "then P.Nothing ";
-      out << "else P.Just $ default_" << tname;
-      out << "{" << fname << " = " << fname << " obj}" << endl;
-    }
-    indent(out) << "]" << endl;
-    indent_down();
-  } else { /* 0 == members.size() */
-    indent(out) << "arbitrary = QC.elements [" << tname << "]" << endl;
-  }
-  indent_down();
-}
-
-/**
- * Generates the read method for a struct
- */
-void t_hs_generator::generate_hs_struct_reader(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  string sname = type_name(tstruct);
-  string id = tmp("_id");
-  string val = tmp("_val");
-
-  indent(out) << "to_" << sname << " :: T.ThriftVal -> " << sname << endl;
-  indent(out) << "to_" << sname << " (T.TStruct fields) = " << sname << "{" << endl;
-  indent_up();
-
-  bool first = true;
-
-  // Generate deserialization code for known cases
-  for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    int32_t key = (*f_iter)->get_key();
-    string etype = type_to_enum((*f_iter)->get_type());
-    string fname = (*f_iter)->get_name();
-
-    if (first) {
-      first = false;
-    } else {
-      out << "," << endl;
-    }
-
-    // Fill in Field
-    indent(out) << field_name(sname, fname) << " = ";
-
-    out << "P.maybe (";
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      out << "P.error \"Missing required field: " << fname << "\"";
-    } else {
-      if (((*f_iter)->get_req() == t_field::T_OPTIONAL
-           || ((t_type*)(*f_iter)->get_type())->is_xception()) && (*f_iter)->get_value() == NULL) {
-        out << "P.Nothing";
-      } else {
-        out << field_name(sname, fname) << " default_" << sname;
-      }
-    }
-    out << ") ";
-
-    out << "(\\(_," << val << ") -> ";
-    if ((*f_iter)->get_req() == t_field::T_OPTIONAL
-        || ((t_type*)(*f_iter)->get_type())->is_xception())
-      out << "P.Just ";
-    generate_deserialize_field(out, *f_iter, val);
-    out << ")";
-    out << " (Map.lookup (" << key << ") fields)";
-  }
-
-  out << endl;
-  indent(out) << "}" << endl;
-  indent_down();
-
-  // read
-  string tmap = type_name(tstruct, "typemap_");
-  indent(out) << "to_" << sname << " _ = P.error \"not a struct\"" << endl;
-
-  indent(out) << "read_" << sname << " :: (T.Transport t, T.Protocol p) => p t -> P.IO " << sname
-              << endl;
-  indent(out) << "read_" << sname << " iprot = to_" << sname;
-  out << " <$> T.readVal iprot (T.T_STRUCT " << tmap << ")" << endl;
-
-  indent(out) << "decode_" << sname
-              << " :: (T.Protocol p, T.Transport t) => p t -> LBS.ByteString -> " << sname << endl;
-  indent(out) << "decode_" << sname << " iprot bs = to_" << sname << " $ ";
-  out << "T.deserializeVal iprot (T.T_STRUCT " << tmap << ") bs" << endl;
-}
-
-void t_hs_generator::generate_hs_struct_writer(ofstream& out, t_struct* tstruct) {
-  string name = type_name(tstruct);
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-  string str = tmp("_str");
-  string f = tmp("_f");
-  string v = tmp("_v");
-
-  indent(out) << "from_" << name << " :: " << name << " -> T.ThriftVal" << endl;
-  indent(out) << "from_" << name << " record = T.TStruct $ Map.fromList ";
-  indent_up();
-
-  // Get Exceptions
-  bool hasExn = false;
-  for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (((t_type*)(*f_iter)->get_type())->is_xception()) {
-      hasExn = true;
-      break;
-    }
-  }
-
-  bool isfirst = true;
-  if (hasExn) {
-    out << endl;
-    indent(out) << "(let exns = M.catMaybes ";
-    indent_up();
-    for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end();
-         ++f_iter) {
-      if (((t_type*)(*f_iter)->get_type())->is_xception()) {
-        if (isfirst) {
-          out << "[ ";
-          isfirst = false;
-        } else {
-          out << ", ";
-        }
-        string mname = (*f_iter)->get_name();
-        int32_t key = (*f_iter)->get_key();
-        out << "(\\" << v << " -> (" << key << ", (\"" << mname << "\",";
-        generate_serialize_type(out, (*f_iter)->get_type(), v);
-        out << "))) <$> " << field_name(name, mname) << " record";
-      }
-    }
-    if (!isfirst) {
-      out << "]" << endl;
-    }
-    indent_down();
-    indent(out) << "in if P.not (P.null exns) then exns else ";
-    indent_up();
-  } else {
-    out << "$ ";
-  }
-
-  out << "M.catMaybes" << endl;
-  // Get the Rest
-  isfirst = true;
-  for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    // Write field header
-    if (isfirst) {
-      indent(out) << "[ ";
-      isfirst = false;
-    } else {
-      indent(out) << ", ";
-    }
-    string mname = (*f_iter)->get_name();
-    int32_t key = (*f_iter)->get_key();
-    out << "(\\";
-    out << v << " -> ";
-    if ((*f_iter)->get_req() != t_field::T_OPTIONAL
-        && !((t_type*)(*f_iter)->get_type())->is_xception()) {
-      out << "P.Just ";
-    }
-    out << "(" << key << ", (\"" << mname << "\",";
-    generate_serialize_type(out, (*f_iter)->get_type(), v);
-    out << "))) ";
-    if ((*f_iter)->get_req() != t_field::T_OPTIONAL
-        && !((t_type*)(*f_iter)->get_type())->is_xception()) {
-      out << "$";
-    } else {
-      out << "<$>";
-    }
-    out << " " << field_name(name, mname) << " record" << endl;
-  }
-
-  // Write the struct map
-  if (isfirst) {
-    indent(out) << "[]" << endl;
-  } else {
-    indent(out) << "]" << endl;
-  }
-  if (hasExn) {
-    indent(out) << ")" << endl;
-    indent_down();
-  }
-  indent_down();
-
-  // write
-  indent(out) << "write_" << name << " :: (T.Protocol p, T.Transport t) => p t -> " << name
-              << " -> P.IO ()" << endl;
-  indent(out) << "write_" << name << " oprot record = T.writeVal oprot $ from_";
-  out << name << " record" << endl;
-
-  // encode
-  indent(out) << "encode_" << name << " :: (T.Protocol p, T.Transport t) => p t -> " << name
-              << " -> LBS.ByteString" << endl;
-  indent(out) << "encode_" << name << " oprot record = T.serializeVal oprot $ ";
-  out << "from_" << name << " record" << endl;
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_hs_generator::generate_service(t_service* tservice) {
-  string f_service_name = get_out_dir() + capitalize(service_name_) + ".hs";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << hs_language_pragma() << endl;
-  f_service_ << hs_autogen_comment() << endl;
-  f_service_ << "module " << capitalize(service_name_) << " where" << endl;
-  f_service_ << hs_imports() << endl;
-
-  if (tservice->get_extends()) {
-    f_service_ << "import qualified " << capitalize(tservice->get_extends()->get_name()) << endl;
-  }
-
-  f_service_ << "import " << capitalize(program_name_) << "_Types" << endl;
-  f_service_ << "import qualified " << capitalize(service_name_) << "_Iface as Iface" << endl;
-
-  // Generate the three main parts of the service
-  generate_service_helpers(tservice);
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-
-  // Close service file
-  f_service_.close();
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_hs_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  indent(f_service_) << "-- HELPER FUNCTIONS AND STRUCTURES --" << endl;
-  indent(f_service_) << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_hs_struct_definition(f_service_, ts, false);
-    generate_hs_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_hs_generator::generate_hs_function_helpers(t_function* tfunction) {
-  t_struct result(program_, field_name(tfunction->get_name(), "result"));
-  t_field success(tfunction->get_returntype(), "success", 0);
-
-  if (!tfunction->get_returntype()->is_void())
-    result.append(&success);
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter)
-    result.append(*f_iter);
-
-  generate_hs_struct_definition(f_service_, &result, false);
-}
-
-/**
- * Generate the map from field names to (type, id)
- * @param tstruct the Struct
- */
-void t_hs_generator::generate_hs_typemap(ofstream& out, t_struct* tstruct) {
-  string name = type_name(tstruct);
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "typemap_" << name << " :: T.TypeMap" << endl;
-  indent(out) << "typemap_" << name << " = Map.fromList [";
-  bool first = true;
-  for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    string mname = (*f_iter)->get_name();
-    if (!first) {
-      out << ",";
-    }
-
-    t_type* type = get_true_type((*f_iter)->get_type());
-    int32_t key = (*f_iter)->get_key();
-    out << "(" << key << ",(\"" << mname << "\"," << type_to_enum(type) << "))";
-    first = false;
-  }
-  out << "]" << endl;
-}
-
-/**
- * generate the struct with default values filled in
- * @param tstruct the Struct
- */
-void t_hs_generator::generate_hs_default(ofstream& out, t_struct* tstruct) {
-  string name = type_name(tstruct);
-  string fname = type_name(tstruct, "default_");
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-
-  indent(out) << fname << " :: " << name << endl;
-  indent(out) << fname << " = " << name << "{" << endl;
-  indent_up();
-  bool first = true;
-  for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    string mname = (*f_iter)->get_name();
-    if (first) {
-      first = false;
-    } else {
-      out << "," << endl;
-    }
-
-    t_type* type = get_true_type((*f_iter)->get_type());
-    t_const_value* value = (*f_iter)->get_value();
-    indent(out) << field_name(name, mname) << " = ";
-    if ((*f_iter)->get_req() == t_field::T_OPTIONAL
-        || ((t_type*)(*f_iter)->get_type())->is_xception()) {
-      if (value == NULL) {
-        out << "P.Nothing";
-      } else {
-        out << "P.Just " << render_const_value(type, value);
-      }
-    } else {
-      out << render_const_value(type, value);
-    }
-  }
-  out << "}" << endl;
-  indent_down();
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_hs_generator::generate_service_interface(t_service* tservice) {
-  string f_iface_name = get_out_dir() + capitalize(service_name_) + "_Iface.hs";
-  f_iface_.open(f_iface_name.c_str());
-
-  f_iface_ << hs_language_pragma() << endl;
-  f_iface_ << hs_autogen_comment() << endl;
-
-  f_iface_ << "module " << capitalize(service_name_) << "_Iface where" << endl;
-
-  f_iface_ << hs_imports() << endl;
-  f_iface_ << "import " << capitalize(program_name_) << "_Types" << endl;
-  f_iface_ << endl;
-
-  string sname = capitalize(service_name_);
-  if (tservice->get_extends() != NULL) {
-    string extends = type_name(tservice->get_extends());
-
-    indent(f_iface_) << "import " << extends << "_Iface" << endl;
-    indent(f_iface_) << "class " << extends << "_Iface a => " << sname << "_Iface a where" << endl;
-
-  } else {
-    indent(f_iface_) << "class " << sname << "_Iface a where" << endl;
-  }
-
-  indent_up();
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string ft = function_type(*f_iter, true, true, true);
-    indent(f_iface_) << decapitalize((*f_iter)->get_name()) << " :: a -> " << ft << endl;
-  }
-
-  indent_down();
-  f_iface_.close();
-}
-
-/**
- * Generates a service client definition. Note that in Haskell, the client doesn't implement iface.
- *This is because
- * The client does not (and should not have to) deal with arguments being Nothing.
- *
- * @param tservice The service to generate a server for.
- */
-void t_hs_generator::generate_service_client(t_service* tservice) {
-  string f_client_name = get_out_dir() + capitalize(service_name_) + "_Client.hs";
-  f_client_.open(f_client_name.c_str());
-  f_client_ << hs_language_pragma() << endl;
-  f_client_ << hs_autogen_comment() << endl;
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-
-  string extends = "";
-  string exports = "";
-
-  bool first = true;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    exports += (first ? "" : ",");
-    string funname = (*f_iter)->get_name();
-    exports += decapitalize(funname);
-    first = false;
-  }
-
-  string sname = capitalize(service_name_);
-  indent(f_client_) << "module " << sname << "_Client(" << exports << ") where" << endl;
-
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    indent(f_client_) << "import " << extends << "_Client" << endl;
-  }
-
-  indent(f_client_) << "import qualified Data.IORef as R" << endl;
-  indent(f_client_) << hs_imports() << endl;
-  indent(f_client_) << "import " << capitalize(program_name_) << "_Types" << endl;
-  indent(f_client_) << "import " << capitalize(service_name_) << endl;
-
-  // DATS RITE A GLOBAL VAR
-  indent(f_client_) << "seqid = R.newIORef 0" << endl;
-
-  // Generate client method implementations
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string funname = (*f_iter)->get_name();
-
-    string fargs = "";
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter)
-      fargs += " arg_" + (*fld_iter)->get_name();
-
-    // Open function
-    indent(f_client_) << decapitalize(funname) << " (ip,op)" << fargs << " = do" << endl;
-    indent_up();
-    indent(f_client_) << "send_" << funname << " op" << fargs;
-
-    f_client_ << endl;
-
-    if (!(*f_iter)->is_oneway())
-      indent(f_client_) << "recv_" << funname << " ip" << endl;
-
-    indent_down();
-
-    indent(f_client_) << "send_" << funname << " op" << fargs << " = do" << endl;
-    indent_up();
-
-    indent(f_client_) << "seq <- seqid" << endl;
-    indent(f_client_) << "seqn <- R.readIORef seq" << endl;
-    string argsname = capitalize((*f_iter)->get_name() + "_args");
-
-    // Serialize the request header
-    string fname = (*f_iter)->get_name();
-    string msgType = (*f_iter)->is_oneway() ? "T.M_ONEWAY" : "T.M_CALL";
-    indent(f_client_) << "T.writeMessageBegin op (\"" << fname << "\", " << msgType << ", seqn)"
-                      << endl;
-    indent(f_client_) << "write_" << argsname << " op (" << argsname << "{";
-
-    bool first = true;
-    for (vector<t_field*>::const_iterator fld_iter = fields.begin(); fld_iter != fields.end();
-         ++fld_iter) {
-      string fieldname = (*fld_iter)->get_name();
-      f_client_ << (first ? "" : ",");
-      f_client_ << field_name(argsname, fieldname) << "=";
-      if ((*fld_iter)->get_req() == t_field::T_OPTIONAL
-          || ((t_type*)(*fld_iter)->get_type())->is_xception())
-        f_client_ << "P.Just ";
-      f_client_ << "arg_" << fieldname;
-      first = false;
-    }
-    f_client_ << "})" << endl;
-    indent(f_client_) << "T.writeMessageEnd op" << endl;
-
-    // Write to the stream
-    indent(f_client_) << "T.tFlush (T.getTransport op)" << endl;
-    indent_down();
-
-    if (!(*f_iter)->is_oneway()) {
-      string resultname = capitalize((*f_iter)->get_name() + "_result");
-      t_struct noargs(program_);
-
-      string funname = string("recv_") + (*f_iter)->get_name();
-      t_function recv_function((*f_iter)->get_returntype(), funname, &noargs);
-
-      // Open function
-      indent(f_client_) << funname << " ip = do" << endl;
-      indent_up();
-
-      indent(f_client_) << "(fname, mtype, rseqid) <- T.readMessageBegin ip" << endl;
-      indent(f_client_) << "M.when (mtype == T.M_EXCEPTION) $ do { exn <- T.readAppExn ip ; "
-                           "T.readMessageEnd ip ; X.throw exn }" << endl;
-
-      indent(f_client_) << "res <- read_" << resultname << " ip" << endl;
-      indent(f_client_) << "T.readMessageEnd ip" << endl;
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const vector<t_field*>& xceptions = xs->get_members();
-
-      for (vector<t_field*>::const_iterator x_iter = xceptions.begin(); x_iter != xceptions.end();
-           ++x_iter) {
-        indent(f_client_) << "P.maybe (P.return ()) X.throw ("
-                          << field_name(resultname, (*x_iter)->get_name()) << " res)" << endl;
-      }
-
-      if (!(*f_iter)->get_returntype()->is_void())
-        indent(f_client_) << "P.return $ " << field_name(resultname, "success") << " res" << endl;
-      else
-        indent(f_client_) << "P.return ()" << endl;
-
-      // Close function
-      indent_down();
-    }
-  }
-
-  f_client_.close();
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_hs_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter)
-    generate_process_function(tservice, *f_iter);
-
-  indent(f_service_) << "proc_ handler (iprot,oprot) (name,typ,seqid) = case name of" << endl;
-  indent_up();
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string fname = (*f_iter)->get_name();
-    indent(f_service_) << "\"" << fname << "\" -> process_" << decapitalize(fname)
-                       << " (seqid,iprot,oprot,handler)" << endl;
-  }
-
-  indent(f_service_) << "_ -> ";
-  if (tservice->get_extends() != NULL) {
-    f_service_ << type_name(tservice->get_extends())
-               << ".proc_ handler (iprot,oprot) (name,typ,seqid)" << endl;
-
-  } else {
-    f_service_ << "do" << endl;
-    indent_up();
-    indent(f_service_) << "_ <- T.readVal iprot (T.T_STRUCT Map.empty)" << endl;
-    indent(f_service_) << "T.writeMessageBegin oprot (name,T.M_EXCEPTION,seqid)" << endl;
-    indent(f_service_) << "T.writeAppExn oprot (T.AppExn T.AE_UNKNOWN_METHOD (\"Unknown function "
-                          "\" ++ LT.unpack name))" << endl;
-    indent(f_service_) << "T.writeMessageEnd oprot" << endl;
-    indent(f_service_) << "T.tFlush (T.getTransport oprot)" << endl;
-    indent_down();
-  }
-
-  indent_down();
-
-  // Generate the server implementation
-  indent(f_service_) << "process handler (iprot, oprot) = do" << endl;
-  indent_up();
-
-  indent(f_service_) << "(name, typ, seqid) <- T.readMessageBegin iprot" << endl;
-  indent(f_service_) << "proc_ handler (iprot,oprot) (name,typ,seqid)" << endl;
-  indent(f_service_) << "T.readMessageEnd iprot" << endl;
-  indent(f_service_) << "P.return P.True" << endl;
-  indent_down();
-}
-
-bool hasNoArguments(t_function* func) {
-  return (func->get_arglist()->get_members().empty());
-}
-
-string t_hs_generator::render_hs_type_for_function_name(t_type* type) {
-  string type_str = render_hs_type(type, false);
-  std::string::size_type found = -1;
-
-  while (true) {
-    found = type_str.find_first_of("[]. ", found + 1);
-    if (string::npos == size_t(found)) {
-      break;
-    }
-
-    if (type_str[found] == '.')
-      type_str[found] = '_';
-    else
-      type_str[found] = 'Z';
-  }
-  return type_str;
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_hs_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  // Open function
-  string funname = decapitalize(tfunction->get_name());
-  indent(f_service_) << "process_" << funname << " (seqid, iprot, oprot, handler) = do" << endl;
-  indent_up();
-
-  string argsname = capitalize(tfunction->get_name()) + "_args";
-  string resultname = capitalize(tfunction->get_name()) + "_result";
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(f_service_) << "args <- read_" << argsname << " iprot" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  size_t n = xceptions.size() + 1;
-  // Try block for a function with exceptions
-  if (n > 0) {
-    for (size_t i = 0; i < n; i++) {
-      indent(f_service_) << "(X.catch" << endl;
-      indent_up();
-    }
-  }
-
-  if (n > 0) {
-    indent(f_service_) << "(do" << endl;
-    indent_up();
-  }
-  indent(f_service_);
-
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void())
-    f_service_ << "val <- ";
-
-  f_service_ << "Iface." << decapitalize(tfunction->get_name()) << " handler";
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter)
-    f_service_ << " (" << field_name(argsname, (*f_iter)->get_name()) << " args)";
-
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_service_ << endl;
-    indent(f_service_) << "let res = default_" << resultname << "{"
-                       << field_name(resultname, "success") << " = val}";
-
-  } else if (!tfunction->is_oneway()) {
-    f_service_ << endl;
-    indent(f_service_) << "let res = default_" << resultname;
-  }
-  f_service_ << endl;
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    indent(f_service_) << "P.return ()";
-  } else {
-    indent(f_service_) << "T.writeMessageBegin oprot (\"" << tfunction->get_name()
-                       << "\", T.M_REPLY, seqid)" << endl;
-    indent(f_service_) << "write_" << resultname << " oprot res" << endl;
-    indent(f_service_) << "T.writeMessageEnd oprot" << endl;
-    indent(f_service_) << "T.tFlush (T.getTransport oprot)";
-  }
-  if (n > 0) {
-    f_service_ << ")";
-    indent_down();
-  }
-  f_service_ << endl;
-
-  if (n > 0) {
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      indent(f_service_) << "(\\e  -> do" << endl;
-      indent_up();
-
-      if (!tfunction->is_oneway()) {
-        indent(f_service_) << "let res = default_" << resultname << "{"
-                           << field_name(resultname, (*x_iter)->get_name()) << " = P.Just e}"
-                           << endl;
-        indent(f_service_) << "T.writeMessageBegin oprot (\"" << tfunction->get_name()
-                           << "\", T.M_REPLY, seqid)" << endl;
-        indent(f_service_) << "write_" << resultname << " oprot res" << endl;
-        indent(f_service_) << "T.writeMessageEnd oprot" << endl;
-        indent(f_service_) << "T.tFlush (T.getTransport oprot)";
-      } else {
-        indent(f_service_) << "P.return ()";
-      }
-
-      f_service_ << "))" << endl;
-      indent_down();
-      indent_down();
-    }
-    indent(f_service_) << "((\\_ -> do" << endl;
-    indent_up();
-
-    if (!tfunction->is_oneway()) {
-      indent(f_service_) << "T.writeMessageBegin oprot (\"" << tfunction->get_name()
-                         << "\", T.M_EXCEPTION, seqid)" << endl;
-      indent(f_service_) << "T.writeAppExn oprot (T.AppExn T.AE_UNKNOWN \"\")" << endl;
-      indent(f_service_) << "T.writeMessageEnd oprot" << endl;
-      indent(f_service_) << "T.tFlush (T.getTransport oprot)";
-    } else {
-      indent(f_service_) << "P.return ()";
-    }
-
-    f_service_ << ") :: X.SomeException -> P.IO ()))" << endl;
-    indent_down();
-    indent_down();
-  }
-  // Close function
-  indent_down();
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_hs_generator::generate_deserialize_field(ofstream& out, t_field* tfield, string prefix) {
-  (void)prefix;
-  t_type* type = tfield->get_type();
-  generate_deserialize_type(out, type, prefix);
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_hs_generator::generate_deserialize_type(ofstream& out, t_type* type, string arg) {
-  type = get_true_type(type);
-  string val = tmp("_val");
-  out << "(case " << arg << " of {" << type_to_constructor(type) << " " << val << " -> ";
-
-  if (type->is_void())
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE";
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, val);
-
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, val);
-
-  } else if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    if (tbase == t_base_type::TYPE_STRING && !((t_base_type*)type)->is_binary()) {
-      out << "E.decodeUtf8 ";
-    }
-    out << val;
-    if (((t_base_type*)type)->is_binary()) {
-      // Since wire type of binary is the same as string, we actually receive T.TString not
-      // T.TBinary
-      out << "; T.TString " << val << " -> " << val;
-    }
-  } else if (type->is_enum()) {
-    out << "P.toEnum $ P.fromIntegral " << val;
-
-  } else {
-    throw "DO NOT KNOW HOW TO DESERIALIZE TYPE " + type->get_name();
-  }
-  out << "; _ -> P.error \"wrong type\"})";
-}
-
-/**
- * Generates an unserializer for a struct, calling read()
- */
-void t_hs_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string name) {
-
-  out << "(" << type_name(tstruct, "to_") << " (T.TStruct " << name << "))";
-}
-
-/**
- * Serialize a container by writing out the header followed by
- * data and then a footer.
- */
-void t_hs_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string arg) {
-
-  string val = tmp("_v");
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    string key = tmp("_k");
-    out << "(Map.fromList $ P.map (\\(" << key << "," << val << ") -> (";
-    generate_deserialize_type(out, ((t_map*)ttype)->get_key_type(), key);
-
-    out << ",";
-    generate_deserialize_type(out, ((t_map*)ttype)->get_val_type(), val);
-
-    out << ")) " << arg << ")";
-
-  } else if (ttype->is_set()) {
-    out << "(Set.fromList $ P.map (\\" << val << " -> ";
-    generate_deserialize_type(out, ((t_map*)ttype)->get_key_type(), val);
-    out << ") " << arg << ")";
-
-  } else if (ttype->is_list()) {
-    out << "(Vector.fromList $ P.map (\\" << val << " -> ";
-    generate_deserialize_type(out, ((t_map*)ttype)->get_key_type(), val);
-    out << ") " << arg << ")";
-  }
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_hs_generator::generate_serialize_type(ofstream& out, t_type* type, string name) {
-
-  type = get_true_type(type);
-  // Do nothing for void types
-  if (type->is_void())
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE";
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, name);
-
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, name);
-
-  } else if (type->is_base_type() || type->is_enum()) {
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      out << type_to_constructor(type) << " ";
-      if (tbase == t_base_type::TYPE_STRING && !((t_base_type*)type)->is_binary()) {
-        out << "$ E.encodeUtf8 ";
-      }
-      out << name;
-
-    } else if (type->is_enum()) {
-      string ename = capitalize(type->get_name());
-      out << "T.TI32 $ P.fromIntegral $ P.fromEnum " << name;
-    }
-
-  } else {
-    throw "DO NOT KNOW HOW TO SERIALIZE FIELD OF TYPE " + type->get_name();
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_hs_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  out << type_name(tstruct, "from_") << " " << prefix;
-}
-
-void t_hs_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  string k = tmp("_k");
-  string v = tmp("_v");
-
-  if (ttype->is_map()) {
-    t_type* ktype = ((t_map*)ttype)->get_key_type();
-    t_type* vtype = ((t_map*)ttype)->get_val_type();
-    out << "T.TMap " << type_to_enum(ktype) << " " << type_to_enum(vtype);
-    out << " $ P.map (\\(" << k << "," << v << ") -> (";
-    generate_serialize_type(out, ktype, k);
-    out << ", ";
-    generate_serialize_type(out, vtype, v);
-    out << ")) $ Map.toList " << prefix;
-
-  } else if (ttype->is_set()) {
-    out << "T.TSet " << type_to_enum(((t_list*)ttype)->get_elem_type());
-    out << " $ P.map (\\" << v << " -> ";
-    generate_serialize_type(out, ((t_list*)ttype)->get_elem_type(), v);
-    out << ") $ Set.toList " << prefix;
-
-  } else if (ttype->is_list()) {
-    out << "T.TList " << type_to_enum(((t_list*)ttype)->get_elem_type());
-    out << " $ P.map (\\" << v << " -> ";
-    generate_serialize_type(out, ((t_list*)ttype)->get_elem_type(), v);
-    out << ") $ Vector.toList " << prefix;
-  }
-}
-
-string t_hs_generator::function_type(t_function* tfunc, bool options, bool io, bool method) {
-  string result = "";
-
-  const vector<t_field*>& fields = tfunc->get_arglist()->get_members();
-  for (vector<t_field*>::const_iterator f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_OPTIONAL
-        || ((t_type*)(*f_iter)->get_type())->is_xception())
-      result += "P.Maybe ";
-    result += render_hs_type((*f_iter)->get_type(), options);
-    result += " -> ";
-  }
-
-  if (fields.empty() && !method)
-    result += "() -> ";
-
-  if (io)
-    result += "P.IO ";
-
-  result += render_hs_type(tfunc->get_returntype(), io);
-  return result;
-}
-
-string t_hs_generator::type_name(t_type* ttype, string function_prefix) {
-  string prefix = "";
-  t_program* program = ttype->get_program();
-
-  if (program != NULL && program != program_)
-    if (!ttype->is_service())
-      prefix = capitalize(program->get_name()) + "_Types.";
-
-  return prefix + function_prefix + capitalize(ttype->get_name());
-}
-
-string t_hs_generator::field_name(string tname, string fname) {
-  return decapitalize(tname) + "_" + fname;
-}
-
-/**
- * Converts the parse type to a Protocol.t_type enum
- */
-string t_hs_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      return "T.T_VOID";
-    case t_base_type::TYPE_STRING:
-      return ((t_base_type*)type)->is_binary() ? "T.T_BINARY" : "T.T_STRING";
-    case t_base_type::TYPE_BOOL:
-      return "T.T_BOOL";
-    case t_base_type::TYPE_I8:
-      return "T.T_BYTE";
-    case t_base_type::TYPE_I16:
-      return "T.T_I16";
-    case t_base_type::TYPE_I32:
-      return "T.T_I32";
-    case t_base_type::TYPE_I64:
-      return "T.T_I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "T.T_DOUBLE";
-    }
-
-  } else if (type->is_enum()) {
-    return "T.T_I32";
-
-  } else if (type->is_struct() || type->is_xception()) {
-    return "(T.T_STRUCT " + type_name((t_struct*)type, "typemap_") + ")";
-
-  } else if (type->is_map()) {
-    string ktype = type_to_enum(((t_map*)type)->get_key_type());
-    string vtype = type_to_enum(((t_map*)type)->get_val_type());
-    return "(T.T_MAP " + ktype + " " + vtype + ")";
-
-  } else if (type->is_set()) {
-    return "(T.T_SET " + type_to_enum(((t_list*)type)->get_elem_type()) + ")";
-
-  } else if (type->is_list()) {
-    return "(T.T_LIST " + type_to_enum(((t_list*)type)->get_elem_type()) + ")";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Converts the parse type to a default value
- */
-string t_hs_generator::type_to_default(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      return "P.error \"No default value for type T_VOID\"";
-    case t_base_type::TYPE_STRING:
-      return "\"\"";
-    case t_base_type::TYPE_BOOL:
-      return "P.False";
-    case t_base_type::TYPE_I8:
-      return "0";
-    case t_base_type::TYPE_I16:
-      return "0";
-    case t_base_type::TYPE_I32:
-      return "0";
-    case t_base_type::TYPE_I64:
-      return "0";
-    case t_base_type::TYPE_DOUBLE:
-      return "0";
-    }
-
-  } else if (type->is_enum()) {
-    return "(P.toEnum 0)";
-
-  } else if (type->is_struct() || type->is_xception()) {
-    return type_name((t_struct*)type, "default_");
-
-  } else if (type->is_map()) {
-    return "Map.empty";
-
-  } else if (type->is_set()) {
-    return "Set.empty";
-
-  } else if (type->is_list()) {
-    return "Vector.empty";
-  }
-
-  throw "INVALID TYPE IN type_to_default: " + type->get_name();
-}
-
-/**
- * Converts the parse type to an haskell type
- */
-string t_hs_generator::render_hs_type(t_type* type, bool needs_parens) {
-  type = get_true_type(type);
-  string type_repr;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      return "()";
-    case t_base_type::TYPE_STRING:
-      return (((t_base_type*)type)->is_binary() ? "LBS.ByteString" : "LT.Text");
-    case t_base_type::TYPE_BOOL:
-      return "P.Bool";
-    case t_base_type::TYPE_I8:
-      return "I.Int8";
-    case t_base_type::TYPE_I16:
-      return "I.Int16";
-    case t_base_type::TYPE_I32:
-      return "I.Int32";
-    case t_base_type::TYPE_I64:
-      return "I.Int64";
-    case t_base_type::TYPE_DOUBLE:
-      return "P.Double";
-    }
-
-  } else if (type->is_enum()) {
-    return type_name((t_enum*)type);
-
-  } else if (type->is_struct() || type->is_xception()) {
-    return type_name((t_struct*)type);
-
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    type_repr = "Map.HashMap " + render_hs_type(ktype, true) + " " + render_hs_type(vtype, true);
-
-  } else if (type->is_set()) {
-    t_type* etype = ((t_set*)type)->get_elem_type();
-    type_repr = "Set.HashSet " + render_hs_type(etype, true);
-
-  } else if (type->is_list()) {
-    t_type* etype = ((t_list*)type)->get_elem_type();
-    type_repr = "Vector.Vector " + render_hs_type(etype, true);
-
-  } else {
-    throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-  }
-
-  return needs_parens ? "(" + type_repr + ")" : type_repr;
-}
-
-/**
- * Converts the parse type to a haskell constructor
- */
-string t_hs_generator::type_to_constructor(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "invalid type: T_VOID";
-    case t_base_type::TYPE_STRING:
-      return ((t_base_type*)type)->is_binary() ? "T.TBinary" : "T.TString";
-    case t_base_type::TYPE_BOOL:
-      return "T.TBool";
-    case t_base_type::TYPE_I8:
-      return "T.TByte";
-    case t_base_type::TYPE_I16:
-      return "T.TI16";
-    case t_base_type::TYPE_I32:
-      return "T.TI32";
-    case t_base_type::TYPE_I64:
-      return "T.TI64";
-    case t_base_type::TYPE_DOUBLE:
-      return "T.TDouble";
-    }
-
-  } else if (type->is_enum()) {
-    return "T.TI32";
-
-  } else if (type->is_struct() || type->is_xception()) {
-    return "T.TStruct";
-
-  } else if (type->is_map()) {
-    return "T.TMap _ _";
-
-  } else if (type->is_set()) {
-    return "T.TSet _";
-
-  } else if (type->is_list()) {
-    return "T.TList _";
-  }
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(hs, "Haskell", "")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_html_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_html_generator.cc
deleted file mode 100644
index ec78e10..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_html_generator.cc
+++ /dev/null
@@ -1,1088 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <map>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/generate/t_generator.h"
-#include "thrift/generate/t_html_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::pair;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-enum input_type { INPUT_UNKNOWN, INPUT_UTF8, INPUT_PLAIN };
-
-/**
- * HTML code generator
- *
- * mostly copy/pasting/tweaking from mcslee's work.
- */
-class t_html_generator : public t_generator {
-public:
-  t_html_generator(t_program* program,
-                   const std::map<std::string, std::string>& parsed_options,
-                   const std::string& option_string)
-    : t_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    standalone_ = false;
-    unsafe_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("standalone") == 0) {
-        standalone_ = true;
-      } else if( iter->first.compare("noescape") == 0) {
-        unsafe_ = true;
-      } else {
-        throw "unknown option html:" + iter->first;
-      }
-    }
-
-
-    out_dir_base_ = "gen-html";
-    input_type_ = INPUT_UNKNOWN;
-
-    escape_.clear();
-    escape_['&'] = "&amp;";
-    escape_['<'] = "&lt;";
-    escape_['>'] = "&gt;";
-    escape_['"'] = "&quot;";
-    escape_['\''] = "&apos;";
-
-    init_allowed__markup();
-  }
-
-  void generate_program();
-  void generate_program_toc();
-  void generate_program_toc_row(t_program* tprog);
-  void generate_program_toc_rows(t_program* tprog, std::vector<t_program*>& finished);
-  void generate_index();
-  std::string escape_html(std::string const& str);
-  std::string escape_html_tags(std::string const& str);
-  void generate_css();
-  void generate_css_content(std::ofstream& f_target);
-  void generate_style_tag();
-  std::string make_file_link(std::string name);
-  bool is_utf8_sequence(std::string const& str, size_t firstpos);
-  void detect_input_encoding(std::string const& str, size_t firstpos);
-  void init_allowed__markup();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_service(t_service* tservice);
-  void generate_xception(t_struct* txception);
-
-  void print_doc(t_doc* tdoc);
-  int print_type(t_type* ttype);
-  void print_const_value(t_type* type, t_const_value* tvalue);
-  void print_fn_args_doc(t_function* tfunction);
-
-private:
-  std::ofstream f_out_;
-  std::string current_file_;
-  input_type input_type_;
-  std::map<std::string, int> allowed_markup;
-  bool standalone_;
-  bool unsafe_;
-};
-
-/**
- * Emits the Table of Contents links at the top of the module's page
- */
-void t_html_generator::generate_program_toc() {
-  f_out_ << "<table class=\"table-bordered table-striped "
-            "table-condensed\"><thead><th>Module</th><th>Services</th>"
-         << "<th>Data types</th><th>Constants</th></thead>" << endl;
-  generate_program_toc_row(program_);
-  f_out_ << "</table>" << endl;
-}
-
-/**
- * Recurses through from the provided program and generates a ToC row
- * for each discovered program exactly once by maintaining the list of
- * completed rows in 'finished'
- */
-void t_html_generator::generate_program_toc_rows(t_program* tprog,
-                                                 std::vector<t_program*>& finished) {
-  for (vector<t_program*>::iterator iter = finished.begin(); iter != finished.end(); iter++) {
-    if (tprog->get_path() == (*iter)->get_path()) {
-      return;
-    }
-  }
-  finished.push_back(tprog);
-  generate_program_toc_row(tprog);
-  vector<t_program*> includes = tprog->get_includes();
-  for (vector<t_program*>::iterator iter = includes.begin(); iter != includes.end(); iter++) {
-    generate_program_toc_rows(*iter, finished);
-  }
-}
-
-/**
- * Emits the Table of Contents links at the top of the module's page
- */
-void t_html_generator::generate_program_toc_row(t_program* tprog) {
-  string fname = tprog->get_name() + ".html";
-  f_out_ << "<tr>" << endl << "<td>" << tprog->get_name() << "</td><td>";
-  if (!tprog->get_services().empty()) {
-    vector<t_service*> services = tprog->get_services();
-    vector<t_service*>::iterator sv_iter;
-    for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-      string name = get_service_name(*sv_iter);
-      f_out_ << "<a href=\"" << make_file_link(fname) << "#Svc_" << name << "\">" << name
-             << "</a><br/>" << endl;
-      f_out_ << "<ul>" << endl;
-      map<string, string> fn_html;
-      vector<t_function*> functions = (*sv_iter)->get_functions();
-      vector<t_function*>::iterator fn_iter;
-      for (fn_iter = functions.begin(); fn_iter != functions.end(); ++fn_iter) {
-        string fn_name = (*fn_iter)->get_name();
-        string html = "<li><a href=\"" + make_file_link(fname) + "#Fn_" + name + "_" + fn_name
-                      + "\">" + fn_name + "</a></li>";
-        fn_html.insert(pair<string, string>(fn_name, html));
-      }
-      for (map<string, string>::iterator html_iter = fn_html.begin(); html_iter != fn_html.end();
-           html_iter++) {
-        f_out_ << html_iter->second << endl;
-      }
-      f_out_ << "</ul>" << endl;
-    }
-  }
-  f_out_ << "</td>" << endl << "<td>";
-  map<string, string> data_types;
-  if (!tprog->get_enums().empty()) {
-    vector<t_enum*> enums = tprog->get_enums();
-    vector<t_enum*>::iterator en_iter;
-    for (en_iter = enums.begin(); en_iter != enums.end(); ++en_iter) {
-      string name = (*en_iter)->get_name();
-      // f_out_ << "<a href=\"" << make_file_link(fname) << "#Enum_" << name << "\">" << name
-      // <<  "</a><br/>" << endl;
-      string html = "<a href=\"" + make_file_link(fname) + "#Enum_" + name + "\">" + name + "</a>";
-      data_types.insert(pair<string, string>(name, html));
-    }
-  }
-  if (!tprog->get_typedefs().empty()) {
-    vector<t_typedef*> typedefs = tprog->get_typedefs();
-    vector<t_typedef*>::iterator td_iter;
-    for (td_iter = typedefs.begin(); td_iter != typedefs.end(); ++td_iter) {
-      string name = (*td_iter)->get_symbolic();
-      // f_out_ << "<a href=\"" << make_file_link(fname) << "#Typedef_" << name << "\">" << name
-      // << "</a><br/>" << endl;
-      string html = "<a href=\"" + make_file_link(fname) + "#Typedef_" + name + "\">" + name
-                    + "</a>";
-      data_types.insert(pair<string, string>(name, html));
-    }
-  }
-  if (!tprog->get_objects().empty()) {
-    vector<t_struct*> objects = tprog->get_objects();
-    vector<t_struct*>::iterator o_iter;
-    for (o_iter = objects.begin(); o_iter != objects.end(); ++o_iter) {
-      string name = (*o_iter)->get_name();
-      // f_out_ << "<a href=\"" << make_file_link(fname) << "#Struct_" << name << "\">" << name
-      //<< "</a><br/>" << endl;
-      string html = "<a href=\"" + make_file_link(fname) + "#Struct_" + name + "\">" + name
-                    + "</a>";
-      data_types.insert(pair<string, string>(name, html));
-    }
-  }
-  for (map<string, string>::iterator dt_iter = data_types.begin(); dt_iter != data_types.end();
-       dt_iter++) {
-    f_out_ << dt_iter->second << "<br/>" << endl;
-  }
-  f_out_ << "</td>" << endl << "<td>";
-  if (!tprog->get_consts().empty()) {
-    map<string, string> const_html;
-    vector<t_const*> consts = tprog->get_consts();
-    vector<t_const*>::iterator con_iter;
-    for (con_iter = consts.begin(); con_iter != consts.end(); ++con_iter) {
-      string name = (*con_iter)->get_name();
-      string html = "<code><a href=\"" + make_file_link(fname) + "#Const_" + name + "\">" + name
-                    + "</a></code>";
-      const_html.insert(pair<string, string>(name, html));
-    }
-    for (map<string, string>::iterator con_iter = const_html.begin(); con_iter != const_html.end();
-         con_iter++) {
-      f_out_ << con_iter->second << "<br/>" << endl;
-    }
-  }
-  f_out_ << "</code></td>" << endl << "</tr>";
-}
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * stream.
- */
-void t_html_generator::generate_program() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-  current_file_ = program_->get_name() + ".html";
-  string fname = get_out_dir() + current_file_;
-  f_out_.open(fname.c_str());
-  f_out_ << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"" << endl;
-  f_out_ << "    \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">" << endl;
-  f_out_ << "<html xmlns=\"http://www.w3.org/1999/xhtml\">" << endl;
-  f_out_ << "<head>" << endl;
-  f_out_ << "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />" << endl;
-  generate_style_tag();
-  f_out_ << "<title>Thrift module: " << program_->get_name() << "</title></head><body>" << endl
-         << "<div class=\"container-fluid\">" << endl
-         << "<h1>Thrift module: " << program_->get_name() << "</h1>" << endl;
-
-  print_doc(program_);
-
-  generate_program_toc();
-
-  if (!program_->get_consts().empty()) {
-    f_out_ << "<hr/><h2 id=\"Constants\">Constants</h2>" << endl;
-    vector<t_const*> consts = program_->get_consts();
-    f_out_ << "<table class=\"table-bordered table-striped table-condensed\">";
-    f_out_ << "<thead><th>Constant</th><th>Type</th><th>Value</th></thead>" << endl;
-    generate_consts(consts);
-    f_out_ << "</table>";
-  }
-
-  if (!program_->get_enums().empty()) {
-    f_out_ << "<hr/><h2 id=\"Enumerations\">Enumerations</h2>" << endl;
-    // Generate enums
-    vector<t_enum*> enums = program_->get_enums();
-    vector<t_enum*>::iterator en_iter;
-    for (en_iter = enums.begin(); en_iter != enums.end(); ++en_iter) {
-      generate_enum(*en_iter);
-    }
-  }
-
-  if (!program_->get_typedefs().empty()) {
-    f_out_ << "<hr/><h2 id=\"Typedefs\">Type declarations</h2>" << endl;
-    // Generate typedefs
-    vector<t_typedef*> typedefs = program_->get_typedefs();
-    vector<t_typedef*>::iterator td_iter;
-    for (td_iter = typedefs.begin(); td_iter != typedefs.end(); ++td_iter) {
-      generate_typedef(*td_iter);
-    }
-  }
-
-  if (!program_->get_objects().empty()) {
-    f_out_ << "<hr/><h2 id=\"Structs\">Data structures</h2>" << endl;
-    // Generate structs and exceptions in declared order
-    vector<t_struct*> objects = program_->get_objects();
-    vector<t_struct*>::iterator o_iter;
-    for (o_iter = objects.begin(); o_iter != objects.end(); ++o_iter) {
-      if ((*o_iter)->is_xception()) {
-        generate_xception(*o_iter);
-      } else {
-        generate_struct(*o_iter);
-      }
-    }
-  }
-
-  if (!program_->get_services().empty()) {
-    f_out_ << "<hr/><h2 id=\"Services\">Services</h2>" << endl;
-    // Generate services
-    vector<t_service*> services = program_->get_services();
-    vector<t_service*>::iterator sv_iter;
-    for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-      service_name_ = get_service_name(*sv_iter);
-      generate_service(*sv_iter);
-    }
-  }
-
-  f_out_ << "</div></body></html>" << endl;
-  f_out_.close();
-
-  generate_index();
-  generate_css();
-}
-
-/**
- * Emits the index.html file for the recursive set of Thrift programs
- */
-void t_html_generator::generate_index() {
-  current_file_ = "index.html";
-  string index_fname = get_out_dir() + current_file_;
-  f_out_.open(index_fname.c_str());
-  f_out_ << "<html><head>" << endl;
-  generate_style_tag();
-  f_out_ << "<title>All Thrift declarations</title></head><body>" << endl
-         << "<div class=\"container-fluid\">" << endl << "<h1>All Thrift declarations</h1>" << endl;
-  f_out_ << "<table class=\"table-bordered table-striped "
-            "table-condensed\"><thead><th>Module</th><th>Services</th><th>Data types</th>"
-         << "<th>Constants</th></thead>" << endl;
-  vector<t_program*> programs;
-  generate_program_toc_rows(program_, programs);
-  f_out_ << "</table>" << endl;
-  f_out_ << "</div></body></html>" << endl;
-  f_out_.close();
-}
-
-void t_html_generator::generate_css() {
-  if (!standalone_) {
-    current_file_ = "style.css";
-    string css_fname = get_out_dir() + current_file_;
-    f_out_.open(css_fname.c_str());
-    generate_css_content(f_out_);
-    f_out_.close();
-  }
-}
-
-void t_html_generator::generate_css_content(std::ofstream& f_target) {
-  f_target << BOOTSTRAP_CSS() << endl;
-  f_target << "/* Auto-generated CSS for generated Thrift docs */" << endl;
-  f_target << "h3, h4 { margin-bottom: 6px; }" << endl;
-  f_target << "div.definition { border: 1px solid #CCC; margin-bottom: 10px; padding: 10px; }"
-           << endl;
-  f_target << "div.extends { margin: -0.5em 0 1em 5em }" << endl;
-  f_target << "td { vertical-align: top; }" << endl;
-  f_target << "table { empty-cells: show; }" << endl;
-  f_target << "code { line-height: 20px; }" << endl;
-  f_target << ".table-bordered th, .table-bordered td { border-bottom: 1px solid #DDDDDD; }"
-           << endl;
-}
-
-/**
- * Generates the CSS tag.
- * Depending on "standalone", either a CSS file link (default), or the entire CSS is embedded
- * inline.
- */
-void t_html_generator::generate_style_tag() {
-  if (!standalone_) {
-    f_out_ << "<link href=\"style.css\" rel=\"stylesheet\" type=\"text/css\"/>" << endl;
-  } else {
-    f_out_ << "<style type=\"text/css\"/><!--" << endl;
-    generate_css_content(f_out_);
-    f_out_ << "--></style>" << endl;
-  }
-}
-
-/**
- * Returns the target file for a <a href> link
- * The returned string is empty, whenever filename refers to the current file.
- */
-std::string t_html_generator::make_file_link(std::string filename) {
-  return (current_file_.compare(filename) != 0) ? filename : "";
-}
-
-/**
- * If the provided documentable object has documentation attached, this
- * will emit it to the output stream in HTML format.
- */
-void t_html_generator::print_doc(t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    if (unsafe_) {
-      f_out_ << tdoc->get_doc() << "<br/>";
-    } else {
-      f_out_ << escape_html(tdoc->get_doc()) << "<br/>";
-    }
-  }
-}
-
-bool t_html_generator::is_utf8_sequence(std::string const& str, size_t firstpos) {
-  // leading char determines the length of the sequence
-  unsigned char c = str.at(firstpos);
-  int count = 0;
-  if ((c & 0xE0) == 0xC0) {
-    count = 1;
-  } else if ((c & 0xF0) == 0xE0) {
-    count = 2;
-  } else if ((c & 0xF8) == 0xF0) {
-    count = 3;
-  } else if ((c & 0xFC) == 0xF8) {
-    count = 4;
-  } else if ((c & 0xFE) == 0xFC) {
-    count = 5;
-  } else {
-    // pdebug("UTF-8 test: char '%c' (%d) is not a valid UTF-8 leading byte", c, int(c));
-    return false; // no UTF-8
-  }
-
-  // following chars
-  size_t pos = firstpos + 1;
-  while ((pos < str.length()) && (0 < count)) {
-    c = str.at(pos);
-    if ((c & 0xC0) != 0x80) {
-      // pdebug("UTF-8 test: char '%c' (%d) is not a valid UTF-8 following byte", c, int(c));
-      return false; // no UTF-8
-    }
-    --count;
-    ++pos;
-  }
-
-  // true if the sequence is complete
-  return (0 == count);
-}
-
-void t_html_generator::detect_input_encoding(std::string const& str, size_t firstpos) {
-  if (is_utf8_sequence(str, firstpos)) {
-    pdebug("Input seems to be already UTF-8 encoded");
-    input_type_ = INPUT_UTF8;
-    return;
-  }
-
-  // fallback
-  pwarning(1, "Input is not UTF-8, treating as plain ANSI");
-  input_type_ = INPUT_PLAIN;
-}
-
-void t_html_generator::init_allowed__markup() {
-  allowed_markup.clear();
-  // standalone tags
-  allowed_markup["br"] = 1;
-  allowed_markup["br/"] = 1;
-  allowed_markup["img"] = 1;
-  // paired tags
-  allowed_markup["b"] = 1;
-  allowed_markup["/b"] = 1;
-  allowed_markup["u"] = 1;
-  allowed_markup["/u"] = 1;
-  allowed_markup["i"] = 1;
-  allowed_markup["/i"] = 1;
-  allowed_markup["s"] = 1;
-  allowed_markup["/s"] = 1;
-  allowed_markup["big"] = 1;
-  allowed_markup["/big"] = 1;
-  allowed_markup["small"] = 1;
-  allowed_markup["/small"] = 1;
-  allowed_markup["sup"] = 1;
-  allowed_markup["/sup"] = 1;
-  allowed_markup["sub"] = 1;
-  allowed_markup["/sub"] = 1;
-  allowed_markup["pre"] = 1;
-  allowed_markup["/pre"] = 1;
-  allowed_markup["tt"] = 1;
-  allowed_markup["/tt"] = 1;
-  allowed_markup["ul"] = 1;
-  allowed_markup["/ul"] = 1;
-  allowed_markup["ol"] = 1;
-  allowed_markup["/ol"] = 1;
-  allowed_markup["li"] = 1;
-  allowed_markup["/li"] = 1;
-  allowed_markup["a"] = 1;
-  allowed_markup["/a"] = 1;
-  allowed_markup["p"] = 1;
-  allowed_markup["/p"] = 1;
-  allowed_markup["code"] = 1;
-  allowed_markup["/code"] = 1;
-  allowed_markup["dl"] = 1;
-  allowed_markup["/dl"] = 1;
-  allowed_markup["dt"] = 1;
-  allowed_markup["/dt"] = 1;
-  allowed_markup["dd"] = 1;
-  allowed_markup["/dd"] = 1;
-  allowed_markup["h1"] = 1;
-  allowed_markup["/h1"] = 1;
-  allowed_markup["h2"] = 1;
-  allowed_markup["/h2"] = 1;
-  allowed_markup["h3"] = 1;
-  allowed_markup["/h3"] = 1;
-  allowed_markup["h4"] = 1;
-  allowed_markup["/h4"] = 1;
-  allowed_markup["h5"] = 1;
-  allowed_markup["/h5"] = 1;
-  allowed_markup["h6"] = 1;
-  allowed_markup["/h6"] = 1;
-}
-
-std::string t_html_generator::escape_html_tags(std::string const& str) {
-  std::ostringstream result;
-
-  unsigned char c = '?';
-  size_t lastpos;
-  size_t firstpos = 0;
-  while (firstpos < str.length()) {
-
-    // look for non-ASCII char
-    lastpos = firstpos;
-    while (lastpos < str.length()) {
-      c = str.at(lastpos);
-      if (('<' == c) || ('>' == c)) {
-        break;
-      }
-      ++lastpos;
-    }
-
-    // copy what we got so far
-    if (lastpos > firstpos) {
-      result << str.substr(firstpos, lastpos - firstpos);
-      firstpos = lastpos;
-    }
-
-    // reached the end?
-    if (firstpos >= str.length()) {
-      break;
-    }
-
-    // tag end without corresponding begin
-    ++firstpos;
-    if ('>' == c) {
-      result << "&gt;";
-      continue;
-    }
-
-    // extract the tag
-    std::ostringstream tagstream;
-    while (firstpos < str.length()) {
-      c = str.at(firstpos);
-      ++firstpos;
-      if ('<' == c) {
-        tagstream << "&lt;"; // nested begin?
-      } else if ('>' == c) {
-        break;
-      } else {
-        tagstream << c; // not very efficient, but tags should be quite short
-      }
-    }
-
-    // we allow for several markup in docstrings, all else will become escaped
-    string tag_content = tagstream.str();
-    string tag_key = tag_content;
-    size_t first_white = tag_key.find_first_of(" \t\f\v\n\r");
-    if (first_white != string::npos) {
-      tag_key.erase(first_white);
-    }
-    for (std::string::size_type i = 0; i < tag_key.length(); ++i) {
-      tag_key[i] = tolower(tag_key[i]);
-    }
-    if (allowed_markup.find(tag_key) != allowed_markup.end()) {
-      result << "<" << tag_content << ">";
-    } else {
-      result << "&lt;" << tagstream.str() << "&gt;";
-      pverbose("illegal markup <%s> in doc-comment\n", tag_key.c_str());
-    }
-  }
-
-  return result.str();
-}
-
-std::string t_html_generator::escape_html(std::string const& str) {
-  // the generated HTML header says it is UTF-8 encoded
-  // if UTF-8 input has been detected before, we don't need to change anything
-  if (input_type_ == INPUT_UTF8) {
-    return escape_html_tags(str);
-  }
-
-  // convert unsafe chars to their &#<num>; equivalent
-  std::ostringstream result;
-  unsigned char c = '?';
-  unsigned int ic = 0;
-  size_t lastpos;
-  size_t firstpos = 0;
-  while (firstpos < str.length()) {
-
-    // look for non-ASCII char
-    lastpos = firstpos;
-    while (lastpos < str.length()) {
-      c = str.at(lastpos);
-      ic = c;
-      if ((32 > ic) || (127 < ic)) {
-        break;
-      }
-      ++lastpos;
-    }
-
-    // copy what we got so far
-    if (lastpos > firstpos) {
-      result << str.substr(firstpos, lastpos - firstpos);
-      firstpos = lastpos;
-    }
-
-    // reached the end?
-    if (firstpos >= str.length()) {
-      break;
-    }
-
-    // some control code?
-    if (ic <= 31) {
-      switch (c) {
-      case '\r':
-      case '\n':
-      case '\t':
-        result << c;
-        break;
-      default: // silently consume all other ctrl chars
-        break;
-      }
-      ++firstpos;
-      continue;
-    }
-
-    // reached the end?
-    if (firstpos >= str.length()) {
-      break;
-    }
-
-    // try to detect input encoding
-    if (input_type_ == INPUT_UNKNOWN) {
-      detect_input_encoding(str, firstpos);
-      if (input_type_ == INPUT_UTF8) {
-        lastpos = str.length();
-        result << str.substr(firstpos, lastpos - firstpos);
-        break;
-      }
-    }
-
-    // convert the character to something useful based on the detected encoding
-    switch (input_type_) {
-    case INPUT_PLAIN:
-      result << "&#" << ic << ";";
-      ++firstpos;
-      break;
-    default:
-      throw "Unexpected or unrecognized input encoding";
-    }
-  }
-
-  return escape_html_tags(result.str());
-}
-
-/**
- * Prints out the provided type in HTML
- */
-int t_html_generator::print_type(t_type* ttype) {
-  std::string::size_type len = 0;
-  f_out_ << "<code>";
-  if (ttype->is_container()) {
-    if (ttype->is_list()) {
-      f_out_ << "list&lt;";
-      len = 6 + print_type(((t_list*)ttype)->get_elem_type());
-      f_out_ << "&gt;";
-    } else if (ttype->is_set()) {
-      f_out_ << "set&lt;";
-      len = 5 + print_type(((t_set*)ttype)->get_elem_type());
-      f_out_ << "&gt;";
-    } else if (ttype->is_map()) {
-      f_out_ << "map&lt;";
-      len = 5 + print_type(((t_map*)ttype)->get_key_type());
-      f_out_ << ", ";
-      len += print_type(((t_map*)ttype)->get_val_type());
-      f_out_ << "&gt;";
-    }
-  } else if (ttype->is_base_type()) {
-    f_out_ << (((t_base_type*)ttype)->is_binary() ? "binary" : ttype->get_name());
-    len = ttype->get_name().size();
-  } else {
-    string prog_name = ttype->get_program()->get_name();
-    string type_name = ttype->get_name();
-    f_out_ << "<a href=\"" << make_file_link(prog_name + ".html") << "#";
-    if (ttype->is_typedef()) {
-      f_out_ << "Typedef_";
-    } else if (ttype->is_struct() || ttype->is_xception()) {
-      f_out_ << "Struct_";
-    } else if (ttype->is_enum()) {
-      f_out_ << "Enum_";
-    } else if (ttype->is_service()) {
-      f_out_ << "Svc_";
-    }
-    f_out_ << type_name << "\">";
-    len = type_name.size();
-    if (ttype->get_program() != program_) {
-      f_out_ << prog_name << ".";
-      len += prog_name.size() + 1;
-    }
-    f_out_ << type_name << "</a>";
-  }
-  f_out_ << "</code>";
-  return (int)len;
-}
-
-/**
- * Prints out an HTML representation of the provided constant value
- */
-void t_html_generator::print_const_value(t_type* type, t_const_value* tvalue) {
-
-  // if tvalue is an identifier, the constant content is already shown elsewhere
-  if (tvalue->get_type() == t_const_value::CV_IDENTIFIER) {
-    string fname = program_->get_name() + ".html";
-    string name = escape_html(tvalue->get_identifier());
-    f_out_ << "<code><a href=\"" + make_file_link(fname) + "#Const_" + name + "\">" + name
-              + "</a></code>";
-    return;
-  }
-
-  t_type* truetype = type;
-  while (truetype->is_typedef()) {
-    truetype = ((t_typedef*)truetype)->get_type();
-  }
-
-  bool first = true;
-  if (truetype->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)truetype)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      f_out_ << '"' << escape_html(get_escaped_string(tvalue)) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      f_out_ << ((tvalue->get_integer() != 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-      f_out_ << tvalue->get_integer();
-      break;
-    case t_base_type::TYPE_I16:
-      f_out_ << tvalue->get_integer();
-      break;
-    case t_base_type::TYPE_I32:
-      f_out_ << tvalue->get_integer();
-      break;
-    case t_base_type::TYPE_I64:
-      f_out_ << tvalue->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (tvalue->get_type() == t_const_value::CV_INTEGER) {
-        f_out_ << tvalue->get_integer();
-      } else {
-        f_out_ << tvalue->get_double();
-      }
-      break;
-    default:
-      f_out_ << "UNKNOWN BASE TYPE";
-      break;
-    }
-  } else if (truetype->is_enum()) {
-    f_out_ << escape_html(truetype->get_name()) << "."
-           << escape_html(tvalue->get_identifier_name());
-  } else if (truetype->is_struct() || truetype->is_xception()) {
-    f_out_ << "{ ";
-    const vector<t_field*>& fields = ((t_struct*)truetype)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = tvalue->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + truetype->get_name() + " has no field "
-            + v_iter->first->get_string();
-      }
-      if (!first) {
-        f_out_ << ", ";
-      }
-      first = false;
-      f_out_ << escape_html(v_iter->first->get_string()) << " = ";
-      print_const_value(field_type, v_iter->second);
-    }
-    f_out_ << " }";
-  } else if (truetype->is_map()) {
-    f_out_ << "{ ";
-    map<t_const_value*, t_const_value*> map_elems = tvalue->get_map();
-    map<t_const_value*, t_const_value*>::iterator map_iter;
-    for (map_iter = map_elems.begin(); map_iter != map_elems.end(); map_iter++) {
-      if (!first) {
-        f_out_ << ", ";
-      }
-      first = false;
-      print_const_value(((t_map*)truetype)->get_key_type(), map_iter->first);
-      f_out_ << " = ";
-      print_const_value(((t_map*)truetype)->get_val_type(), map_iter->second);
-    }
-    f_out_ << " }";
-  } else if (truetype->is_list()) {
-    f_out_ << "{ ";
-    vector<t_const_value*> list_elems = tvalue->get_list();
-    ;
-    vector<t_const_value*>::iterator list_iter;
-    for (list_iter = list_elems.begin(); list_iter != list_elems.end(); list_iter++) {
-      if (!first) {
-        f_out_ << ", ";
-      }
-      first = false;
-      print_const_value(((t_list*)truetype)->get_elem_type(), *list_iter);
-    }
-    f_out_ << " }";
-  } else if (truetype->is_set()) {
-    f_out_ << "{ ";
-    vector<t_const_value*> list_elems = tvalue->get_list();
-    ;
-    vector<t_const_value*>::iterator list_iter;
-    for (list_iter = list_elems.begin(); list_iter != list_elems.end(); list_iter++) {
-      if (!first) {
-        f_out_ << ", ";
-      }
-      first = false;
-      print_const_value(((t_set*)truetype)->get_elem_type(), *list_iter);
-    }
-    f_out_ << " }";
-  } else {
-    f_out_ << "UNKNOWN TYPE";
-  }
-}
-
-/**
- * Prints out documentation for arguments/exceptions of a function, if any documentation has been
- * supplied.
- */
-void t_html_generator::print_fn_args_doc(t_function* tfunction) {
-  bool has_docs = false;
-  vector<t_field*> args = tfunction->get_arglist()->get_members();
-  vector<t_field*>::iterator arg_iter = args.begin();
-  if (arg_iter != args.end()) {
-    for (; arg_iter != args.end(); arg_iter++) {
-      if ((*arg_iter)->has_doc() && !(*arg_iter)->get_doc().empty())
-        has_docs = true;
-    }
-    if (has_docs) {
-      arg_iter = args.begin();
-      f_out_ << "<br/><h4 id=\"Parameters_" << service_name_ << "_" << tfunction->get_name()
-             << "\">Parameters</h4>" << endl;
-      f_out_ << "<table class=\"table-bordered table-striped table-condensed\">";
-      f_out_ << "<thead><th>Name</th><th>Description</th></thead>";
-      for (; arg_iter != args.end(); arg_iter++) {
-        f_out_ << "<tr><td>" << (*arg_iter)->get_name();
-        f_out_ << "</td><td>";
-        f_out_ << escape_html((*arg_iter)->get_doc());
-        f_out_ << "</td></tr>" << endl;
-      }
-      f_out_ << "</table>";
-    }
-  }
-
-  has_docs = false;
-  vector<t_field*> excepts = tfunction->get_xceptions()->get_members();
-  vector<t_field*>::iterator ex_iter = excepts.begin();
-  if (ex_iter != excepts.end()) {
-    for (; ex_iter != excepts.end(); ex_iter++) {
-      if ((*ex_iter)->has_doc() && !(*ex_iter)->get_doc().empty())
-        has_docs = true;
-    }
-    if (has_docs) {
-      ex_iter = excepts.begin();
-      f_out_ << "<br/><h4 id=\"Exceptions_" << service_name_ << "_" << tfunction->get_name()
-             << "\">Exceptions</h4>" << endl;
-      f_out_ << "<table class=\"table-bordered table-striped table-condensed\">";
-      f_out_ << "<thead><th>Type</th><th>Description</th></thead>";
-      for (; ex_iter != excepts.end(); ex_iter++) {
-        f_out_ << "<tr><td>" << (*ex_iter)->get_type()->get_name();
-        f_out_ << "</td><td>";
-        f_out_ << escape_html((*ex_iter)->get_doc());
-        f_out_ << "</td></tr>" << endl;
-      }
-      f_out_ << "</table>";
-    }
-  }
-}
-
-/**
- * Generates a typedef.
- *
- * @param ttypedef The type definition
- */
-void t_html_generator::generate_typedef(t_typedef* ttypedef) {
-  string name = ttypedef->get_name();
-  f_out_ << "<div class=\"definition\">";
-  f_out_ << "<h3 id=\"Typedef_" << name << "\">Typedef: " << name << "</h3>" << endl;
-  f_out_ << "<p><strong>Base type:</strong>&nbsp;";
-  print_type(ttypedef->get_type());
-  f_out_ << "</p>" << endl;
-  print_doc(ttypedef);
-  f_out_ << "</div>" << endl;
-}
-
-/**
- * Generates code for an enumerated type.
- *
- * @param tenum The enumeration
- */
-void t_html_generator::generate_enum(t_enum* tenum) {
-  string name = tenum->get_name();
-  f_out_ << "<div class=\"definition\">";
-  f_out_ << "<h3 id=\"Enum_" << name << "\">Enumeration: " << name << "</h3>" << endl;
-  print_doc(tenum);
-  vector<t_enum_value*> values = tenum->get_constants();
-  vector<t_enum_value*>::iterator val_iter;
-  f_out_ << "<br/><table class=\"table-bordered table-striped table-condensed\">" << endl;
-  for (val_iter = values.begin(); val_iter != values.end(); ++val_iter) {
-    f_out_ << "<tr><td><code>";
-    f_out_ << (*val_iter)->get_name();
-    f_out_ << "</code></td><td><code>";
-    f_out_ << (*val_iter)->get_value();
-    f_out_ << "</code></td><td>" << endl;
-    print_doc((*val_iter));
-    f_out_ << "</td></tr>" << endl;
-  }
-  f_out_ << "</table></div>" << endl;
-}
-
-/**
- * Generates a constant value
- */
-void t_html_generator::generate_const(t_const* tconst) {
-  string name = tconst->get_name();
-  f_out_ << "<tr id=\"Const_" << name << "\"><td><code>" << name << "</code></td><td>";
-  print_type(tconst->get_type());
-  f_out_ << "</td><td><code>";
-  print_const_value(tconst->get_type(), tconst->get_value());
-  f_out_ << "</code></td></tr>";
-  if (tconst->has_doc()) {
-    f_out_ << "<tr><td colspan=\"3\"><blockquote>";
-    print_doc(tconst);
-    f_out_ << "</blockquote></td></tr>";
-  }
-}
-
-/**
- * Generates a struct definition for a thrift data type.
- *
- * @param tstruct The struct definition
- */
-void t_html_generator::generate_struct(t_struct* tstruct) {
-  string name = tstruct->get_name();
-  f_out_ << "<div class=\"definition\">";
-  f_out_ << "<h3 id=\"Struct_" << name << "\">";
-  if (tstruct->is_xception()) {
-    f_out_ << "Exception: ";
-  } else if (tstruct->is_union()) {
-    f_out_ << "Union: ";
-  } else {
-    f_out_ << "Struct: ";
-  }
-  f_out_ << name << "</h3>" << endl;
-  vector<t_field*> members = tstruct->get_members();
-  vector<t_field*>::iterator mem_iter = members.begin();
-  f_out_ << "<table class=\"table-bordered table-striped table-condensed\">";
-  f_out_ << "<thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</"
-            "th><th>Default value</th></thead>" << endl;
-  for (; mem_iter != members.end(); mem_iter++) {
-    f_out_ << "<tr><td>" << (*mem_iter)->get_key() << "</td><td>";
-    f_out_ << (*mem_iter)->get_name();
-    f_out_ << "</td><td>";
-    print_type((*mem_iter)->get_type());
-    f_out_ << "</td><td>";
-    f_out_ << escape_html((*mem_iter)->get_doc());
-    f_out_ << "</td><td>";
-    if ((*mem_iter)->get_req() == t_field::T_OPTIONAL) {
-      f_out_ << "optional";
-    } else if ((*mem_iter)->get_req() == t_field::T_REQUIRED) {
-      f_out_ << "required";
-    } else {
-      f_out_ << "default";
-    }
-    f_out_ << "</td><td>";
-    t_const_value* default_val = (*mem_iter)->get_value();
-    if (default_val != NULL) {
-      f_out_ << "<code>";
-      print_const_value((*mem_iter)->get_type(), default_val);
-      f_out_ << "</code>";
-    }
-    f_out_ << "</td></tr>" << endl;
-  }
-  f_out_ << "</table><br/>";
-  print_doc(tstruct);
-  f_out_ << "</div>";
-}
-
-/**
- * Exceptions are special structs
- *
- * @param tstruct The struct definition
- */
-void t_html_generator::generate_xception(t_struct* txception) {
-  generate_struct(txception);
-}
-
-/**
- * Generates the HTML block for a Thrift service.
- *
- * @param tservice The service definition
- */
-void t_html_generator::generate_service(t_service* tservice) {
-  f_out_ << "<h3 id=\"Svc_" << service_name_ << "\">Service: " << service_name_ << "</h3>" << endl;
-
-  if (tservice->get_extends()) {
-    f_out_ << "<div class=\"extends\"><em>extends</em> ";
-    print_type(tservice->get_extends());
-    f_out_ << "</div>\n";
-  }
-  print_doc(tservice);
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator fn_iter = functions.begin();
-  for (; fn_iter != functions.end(); fn_iter++) {
-    string fn_name = (*fn_iter)->get_name();
-    f_out_ << "<div class=\"definition\">";
-    f_out_ << "<h4 id=\"Fn_" << service_name_ << "_" << fn_name << "\">Function: " << service_name_
-           << "." << fn_name << "</h4>" << endl;
-    f_out_ << "<pre>";
-    std::string::size_type offset = print_type((*fn_iter)->get_returntype());
-    bool first = true;
-    f_out_ << " " << fn_name << "(";
-    offset += fn_name.size() + 2;
-    vector<t_field*> args = (*fn_iter)->get_arglist()->get_members();
-    vector<t_field*>::iterator arg_iter = args.begin();
-    for (; arg_iter != args.end(); arg_iter++) {
-      if (!first) {
-        f_out_ << "," << endl;
-        for (std::string::size_type i = 0; i < offset; ++i) {
-          f_out_ << " ";
-        }
-      }
-      first = false;
-      print_type((*arg_iter)->get_type());
-      f_out_ << " " << (*arg_iter)->get_name();
-      if ((*arg_iter)->get_value() != NULL) {
-        f_out_ << " = ";
-        print_const_value((*arg_iter)->get_type(), (*arg_iter)->get_value());
-      }
-    }
-    f_out_ << ")" << endl;
-    first = true;
-    vector<t_field*> excepts = (*fn_iter)->get_xceptions()->get_members();
-    vector<t_field*>::iterator ex_iter = excepts.begin();
-    if (ex_iter != excepts.end()) {
-      f_out_ << "    throws ";
-      for (; ex_iter != excepts.end(); ex_iter++) {
-        if (!first) {
-          f_out_ << ", ";
-        }
-        first = false;
-        print_type((*ex_iter)->get_type());
-      }
-      f_out_ << endl;
-    }
-    f_out_ << "</pre>";
-    print_doc(*fn_iter);
-    print_fn_args_doc(*fn_iter);
-    f_out_ << "</div>";
-  }
-}
-
-THRIFT_REGISTER_GENERATOR(
-    html,
-    "HTML",
-    "    standalone:      Self-contained mode, includes all CSS in the HTML files.\n"
-    "                     Generates no style.css file, but HTML files will be larger.\n"
-    "    noescape:        Do not escape html in doc text.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_html_generator.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_html_generator.h
deleted file mode 100644
index 600b17f..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_html_generator.h
+++ /dev/null
@@ -1,240 +0,0 @@
-#define BOOTSTRAP_CSS()                                                                            \
-  "/*!\n"                                                                                          \
-  " * Bootstrap v2.0.3\n"                                                                          \
-  " *\n"                                                                                           \
-  " * Copyright 2012 Twitter, Inc\n"                                                               \
-  " * Licensed under the Apache License v2.0\n"                                                    \
-  " * http://www.apache.org/licenses/LICENSE-2.0\n"                                                \
-  " *\n"                                                                                           \
-  " * Designed and built with all the love in the world @twitter by @mdo and @fat.\n"              \
-  " */\n"                                                                                          \
-  ".clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:\"\";}\n"             \
-  ".clearfix:after{clear:both;}\n"                                                                 \
-  ".hide-text{font:0/0 "                                                                           \
-  "a;color:transparent;text-shadow:none;background-color:transparent;border:0;}\n"                 \
-  ".input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-"    \
-  "moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}\n"                  \
-  "article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}\n"     \
-  "audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}\n"                            \
-  "audio:not([controls]){display:none;}\n"                                                         \
-  "html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}\n"                \
-  "a:focus{outline:thin dotted #333;outline:5px auto "                                             \
-  "-webkit-focus-ring-color;outline-offset:-2px;}\n"                                               \
-  "a:hover,a:active{outline:0;}\n"                                                                 \
-  "sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}\n"              \
-  "sup{top:-0.5em;}\n"                                                                             \
-  "sub{bottom:-0.25em;}\n"                                                                         \
-  "img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;}\n"           \
-  "button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}\n"                 \
-  "button,input{*overflow:visible;line-height:normal;}\n"                                          \
-  "button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}\n"                        \
-  "button,input[type=\"button\"],input[type=\"reset\"],input[type=\"submit\"]{cursor:pointer;-"    \
-  "webkit-appearance:button;}\n"                                                                   \
-  "input[type=\"search\"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:"  \
-  "content-box;-webkit-appearance:textfield;}\n"                                                   \
-  "input[type=\"search\"]::-webkit-search-decoration,input[type=\"search\"]::-webkit-search-"      \
-  "cancel-button{-webkit-appearance:none;}\n"                                                      \
-  "textarea{overflow:auto;vertical-align:top;}\n"                                                  \
-  "body{margin:0;font-family:\"Helvetica "                                                         \
-  "Neue\",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-"    \
-  "color:#ffffff;}\n"                                                                              \
-  "a{color:#0088cc;text-decoration:none;}\n"                                                       \
-  "a:hover{color:#005580;text-decoration:underline;}\n"                                            \
-  ".row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:\"\";}\n"          \
-  ".row:after{clear:both;}\n"                                                                      \
-  "[class*=\"span\"]{float:left;margin-left:20px;}\n"                                              \
-  ".container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;}\n"        \
-  ".span12{width:940px;}\n"                                                                        \
-  ".span11{width:860px;}\n"                                                                        \
-  ".span10{width:780px;}\n"                                                                        \
-  ".span9{width:700px;}\n"                                                                         \
-  ".span8{width:620px;}\n"                                                                         \
-  ".span7{width:540px;}\n"                                                                         \
-  ".span6{width:460px;}\n"                                                                         \
-  ".span5{width:380px;}\n"                                                                         \
-  ".span4{width:300px;}\n"                                                                         \
-  ".span3{width:220px;}\n"                                                                         \
-  ".span2{width:140px;}\n"                                                                         \
-  ".span1{width:60px;}\n"                                                                          \
-  ".offset12{margin-left:980px;}\n"                                                                \
-  ".offset11{margin-left:900px;}\n"                                                                \
-  ".offset10{margin-left:820px;}\n"                                                                \
-  ".offset9{margin-left:740px;}\n"                                                                 \
-  ".offset8{margin-left:660px;}\n"                                                                 \
-  ".offset7{margin-left:580px;}\n"                                                                 \
-  ".offset6{margin-left:500px;}\n"                                                                 \
-  ".offset5{margin-left:420px;}\n"                                                                 \
-  ".offset4{margin-left:340px;}\n"                                                                 \
-  ".offset3{margin-left:260px;}\n"                                                                 \
-  ".offset2{margin-left:180px;}\n"                                                                 \
-  ".offset1{margin-left:100px;}\n"                                                                 \
-  ".row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:\"\";}" \
-  "\n"                                                                                             \
-  ".row-fluid:after{clear:both;}\n"                                                                \
-  ".row-fluid "                                                                                    \
-  "[class*=\"span\"]{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-" \
-  "box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:"  \
-  "2.127659574%;*margin-left:2.0744680846382977%;}\n"                                              \
-  ".row-fluid [class*=\"span\"]:first-child{margin-left:0;}\n"                                     \
-  ".row-fluid .span12{width:99.99999998999999%;*width:99.94680850063828%;}\n"                      \
-  ".row-fluid .span11{width:91.489361693%;*width:91.4361702036383%;}\n"                            \
-  ".row-fluid .span10{width:82.97872339599999%;*width:82.92553190663828%;}\n"                      \
-  ".row-fluid .span9{width:74.468085099%;*width:74.4148936096383%;}\n"                             \
-  ".row-fluid .span8{width:65.95744680199999%;*width:65.90425531263828%;}\n"                       \
-  ".row-fluid .span7{width:57.446808505%;*width:57.3936170156383%;}\n"                             \
-  ".row-fluid .span6{width:48.93617020799999%;*width:48.88297871863829%;}\n"                       \
-  ".row-fluid .span5{width:40.425531911%;*width:40.3723404216383%;}\n"                             \
-  ".row-fluid .span4{width:31.914893614%;*width:31.8617021246383%;}\n"                             \
-  ".row-fluid .span3{width:23.404255317%;*width:23.3510638276383%;}\n"                             \
-  ".row-fluid .span2{width:14.89361702%;*width:14.8404255306383%;}\n"                              \
-  ".row-fluid .span1{width:6.382978723%;*width:6.329787233638298%;}\n"                             \
-  ".container{margin-right:auto;margin-left:auto;*zoom:1;}.container:before,.container:after{"     \
-  "display:table;content:\"\";}\n"                                                                 \
-  ".container:after{clear:both;}\n"                                                                \
-  ".container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,."       \
-  "container-fluid:after{display:table;content:\"\";}\n"                                           \
-  ".container-fluid:after{clear:both;}\n"                                                          \
-  "p{margin:0 0 9px;font-family:\"Helvetica "                                                      \
-  "Neue\",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p "                          \
-  "small{font-size:11px;color:#999999;}\n"                                                         \
-  ".lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}\n"                   \
-  "h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:"  \
-  "optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 "                           \
-  "small{font-weight:normal;color:#999999;}\n"                                                     \
-  "h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}\n"                                \
-  "h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}\n"                                \
-  "h3{font-size:18px;line-height:27px;}h3 small{font-size:14px;}\n"                                \
-  "h4,h5,h6{line-height:18px;}\n"                                                                  \
-  "h4{font-size:14px;}h4 small{font-size:12px;}\n"                                                 \
-  "h5{font-size:12px;}\n"                                                                          \
-  "h6{font-size:11px;color:#999999;text-transform:uppercase;}\n"                                   \
-  ".page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;}\n"             \
-  ".page-header h1{line-height:1;}\n"                                                              \
-  "ul,ol{padding:0;margin:0 0 9px 25px;}\n"                                                        \
-  "ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}\n"                                                    \
-  "ul{list-style:disc;}\n"                                                                         \
-  "ol{list-style:decimal;}\n"                                                                      \
-  "li{line-height:18px;}\n"                                                                        \
-  "ul.unstyled,ol.unstyled{margin-left:0;list-style:none;}\n"                                      \
-  "dl{margin-bottom:18px;}\n"                                                                      \
-  "dt,dd{line-height:18px;}\n"                                                                     \
-  "dt{font-weight:bold;line-height:17px;}\n"                                                       \
-  "dd{margin-left:9px;}\n"                                                                         \
-  ".dl-horizontal "                                                                                \
-  "dt{float:left;width:120px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;"  \
-  "white-space:nowrap;}\n"                                                                         \
-  ".dl-horizontal dd{margin-left:130px;}\n"                                                        \
-  "hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;}\n"     \
-  "strong{font-weight:bold;}\n"                                                                    \
-  "em{font-style:italic;}\n"                                                                       \
-  ".muted{color:#999999;}\n"                                                                       \
-  "abbr[title]{cursor:help;border-bottom:1px dotted #ddd;}\n"                                      \
-  "abbr.initialism{font-size:90%;text-transform:uppercase;}\n"                                     \
-  "blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote "       \
-  "p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}\n"                        \
-  "blockquote small{display:block;line-height:18px;color:#999999;}blockquote "                     \
-  "small:before{content:'\\2014 \\00A0';}\n"                                                       \
-  "blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid "    \
-  "#eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right "                          \
-  "small{text-align:right;}\n"                                                                     \
-  "q:before,q:after,blockquote:before,blockquote:after{content:\"\";}\n"                           \
-  "address{display:block;margin-bottom:18px;font-style:normal;line-height:18px;}\n"                \
-  "small{font-size:100%;}\n"                                                                       \
-  "cite{font-style:normal;}\n"                                                                     \
-  "code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,\"Courier "                        \
-  "New\",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;" \
-  "border-radius:3px;}\n"                                                                          \
-  "code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}\n"          \
-  "pre{display:block;padding:8.5px;margin:0 0 "                                                    \
-  "9px;font-size:12.025px;line-height:18px;word-break:break-all;word-wrap:break-word;white-space:" \
-  "pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid "      \
-  "rgba(0, 0, 0, "                                                                                 \
-  "0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{"     \
-  "margin-bottom:18px;}\n"                                                                         \
-  "pre code{padding:0;color:inherit;background-color:transparent;border:0;}\n"                     \
-  ".pre-scrollable{max-height:340px;overflow-y:scroll;}\n"                                         \
-  ".label,.badge{font-size:10.998px;font-weight:bold;line-height:14px;color:#ffffff;vertical-"     \
-  "align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, "                          \
-  "0.25);background-color:#999999;}\n"                                                             \
-  ".label{padding:1px 4px "                                                                        \
-  "2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}\n"                     \
-  ".badge{padding:1px 9px "                                                                        \
-  "2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;}\n"                     \
-  "a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}\n"              \
-  ".label-important,.badge-important{background-color:#b94a48;}\n"                                 \
-  ".label-important[href],.badge-important[href]{background-color:#953b39;}\n"                     \
-  ".label-warning,.badge-warning{background-color:#f89406;}\n"                                     \
-  ".label-warning[href],.badge-warning[href]{background-color:#c67605;}\n"                         \
-  ".label-success,.badge-success{background-color:#468847;}\n"                                     \
-  ".label-success[href],.badge-success[href]{background-color:#356635;}\n"                         \
-  ".label-info,.badge-info{background-color:#3a87ad;}\n"                                           \
-  ".label-info[href],.badge-info[href]{background-color:#2d6987;}\n"                               \
-  ".label-inverse,.badge-inverse{background-color:#333333;}\n"                                     \
-  ".label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;}\n"                         \
-  "table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;}"  \
-  "\n"                                                                                             \
-  ".table{width:100%;margin-bottom:18px;}.table th,.table "                                        \
-  "td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid "       \
-  "#dddddd;}\n"                                                                                    \
-  ".table th{font-weight:bold;}\n"                                                                 \
-  ".table thead th{vertical-align:bottom;}\n"                                                      \
-  ".table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table "          \
-  "colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table "               \
-  "thead:first-child tr:first-child th,.table thead:first-child tr:first-child "                   \
-  "td{border-top:0;}\n"                                                                            \
-  ".table tbody+tbody{border-top:2px solid #dddddd;}\n"                                            \
-  ".table-condensed th,.table-condensed td{padding:4px 5px;}\n"                                    \
-  ".table-bordered{border:1px solid "                                                              \
-  "#dddddd;border-collapse:separate;*border-collapse:collapsed;border-left:0;-webkit-border-"      \
-  "radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered "       \
-  "td{border-left:1px solid #dddddd;}\n"                                                           \
-  ".table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child "  \
-  "th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead "             \
-  "tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered "            \
-  "colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child "             \
-  "th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child "      \
-  "tr:first-child td{border-top:0;}\n"                                                             \
-  ".table-bordered thead:first-child tr:first-child th:first-child,.table-bordered "               \
-  "tbody:first-child tr:first-child "                                                              \
-  "td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-"      \
-  "radius-topleft:4px;}\n"                                                                         \
-  ".table-bordered thead:first-child tr:first-child th:last-child,.table-bordered "                \
-  "tbody:first-child tr:first-child "                                                              \
-  "td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-"     \
-  "radius-topright:4px;}\n"                                                                        \
-  ".table-bordered thead:last-child tr:last-child th:first-child,.table-bordered "                 \
-  "tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 "                     \
-  "4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 "                                          \
-  "4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-"    \
-  "bottomleft:4px;}\n"                                                                             \
-  ".table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child " \
-  "tr:last-child "                                                                                 \
-  "td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-"      \
-  "border-radius-bottomright:4px;}\n"                                                              \
-  ".table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) "              \
-  "th{background-color:#f9f9f9;}\n"                                                                \
-  ".table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5;}\n"                 \
-  "table .span1{float:none;width:44px;margin-left:0;}\n"                                           \
-  "table .span2{float:none;width:124px;margin-left:0;}\n"                                          \
-  "table .span3{float:none;width:204px;margin-left:0;}\n"                                          \
-  "table .span4{float:none;width:284px;margin-left:0;}\n"                                          \
-  "table .span5{float:none;width:364px;margin-left:0;}\n"                                          \
-  "table .span6{float:none;width:444px;margin-left:0;}\n"                                          \
-  "table .span7{float:none;width:524px;margin-left:0;}\n"                                          \
-  "table .span8{float:none;width:604px;margin-left:0;}\n"                                          \
-  "table .span9{float:none;width:684px;margin-left:0;}\n"                                          \
-  "table .span10{float:none;width:764px;margin-left:0;}\n"                                         \
-  "table .span11{float:none;width:844px;margin-left:0;}\n"                                         \
-  "table .span12{float:none;width:924px;margin-left:0;}\n"                                         \
-  "table .span13{float:none;width:1004px;margin-left:0;}\n"                                        \
-  "table .span14{float:none;width:1084px;margin-left:0;}\n"                                        \
-  "table .span15{float:none;width:1164px;margin-left:0;}\n"                                        \
-  "table .span16{float:none;width:1244px;margin-left:0;}\n"                                        \
-  "table .span17{float:none;width:1324px;margin-left:0;}\n"                                        \
-  "table .span18{float:none;width:1404px;margin-left:0;}\n"                                        \
-  "table .span19{float:none;width:1484px;margin-left:0;}\n"                                        \
-  "table .span20{float:none;width:1564px;margin-left:0;}\n"                                        \
-  "table .span21{float:none;width:1644px;margin-left:0;}\n"                                        \
-  "table .span22{float:none;width:1724px;margin-left:0;}\n"                                        \
-  "table .span23{float:none;width:1804px;margin-left:0;}\n"                                        \
-  "table .span24{float:none;width:1884px;margin-left:0;}"
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_java_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_java_generator.cc
deleted file mode 100644
index fb581e4..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_java_generator.cc
+++ /dev/null
@@ -1,5280 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <cassert>
-#include <ctime>
-
-#include <sstream>
-#include <string>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <vector>
-#include <cctype>
-
-#include <sys/stat.h>
-#include <stdexcept>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::setfill;
-using std::setw;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Java code generator.
- *
- */
-class t_java_generator : public t_oop_generator {
-public:
-  t_java_generator(t_program* program,
-                   const std::map<std::string, std::string>& parsed_options,
-                   const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    bean_style_ = false;
-    android_style_ = false;
-    private_members_ = false;
-    nocamel_style_ = false;
-    fullcamel_style_ = false;
-    android_legacy_ = false;
-    sorted_containers_ = false;
-    java5_ = false;
-    reuse_objects_ = false;
-    use_option_type_ = false;
-    undated_generated_annotations_  = false;
-    suppress_generated_annotations_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("beans") == 0) {
-        bean_style_ = true;
-      } else if( iter->first.compare("android") == 0) {
-        android_style_ = true;
-      } else if( iter->first.compare("private-members") == 0) {
-        private_members_ = true;
-      } else if( iter->first.compare("nocamel") == 0) {
-        nocamel_style_ = true;
-      } else if( iter->first.compare("fullcamel") == 0) {
-        fullcamel_style_ = true;
-      } else if( iter->first.compare("android_legacy") == 0) {
-        android_legacy_ = true;
-      } else if( iter->first.compare("sorted_containers") == 0) {
-        sorted_containers_ = true;
-      } else if( iter->first.compare("java5") == 0) {
-        java5_ = true;
-      } else if( iter->first.compare("reuse-objects") == 0) {
-        reuse_objects_ = true;
-      } else if( iter->first.compare("option_type") == 0) {
-        use_option_type_ = true;
-      } else if( iter->first.compare("generated_annotations") == 0) {
-        if( iter->second.compare("undated") == 0) {
-          undated_generated_annotations_  = true;
-        } else if(iter->second.compare("suppress") == 0) {
-          suppress_generated_annotations_ = true;
-        } else {
-          throw "unknown option java:" + iter->first + "=" + iter->second;
-        }
-      } else {
-        throw "unknown option java:" + iter->first;
-      }
-    }
-
-    if (java5_) {
-      android_legacy_ = true;
-    }
-
-    out_dir_base_ = (bean_style_ ? "gen-javabean" : "gen-java");
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_struct(t_struct* tstruct);
-  void generate_union(t_struct* tunion);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  void print_const_value(std::ofstream& out,
-                         std::string name,
-                         t_type* type,
-                         t_const_value* value,
-                         bool in_static,
-                         bool defval = false);
-  std::string render_const_value(std::ofstream& out, t_type* type, t_const_value* value);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_java_struct(t_struct* tstruct, bool is_exception);
-
-  void generate_java_struct_definition(std::ofstream& out,
-                                       t_struct* tstruct,
-                                       bool is_xception = false,
-                                       bool in_class = false,
-                                       bool is_result = false);
-  void generate_java_struct_parcelable(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_equality(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_compare_to(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_java_validator(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_result_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_tostring(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_clear(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_write_object(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_read_object(std::ofstream& out, t_struct* tstruct);
-  void generate_java_meta_data_map(std::ofstream& out, t_struct* tstruct);
-  void generate_field_value_meta_data(std::ofstream& out, t_type* type);
-  std::string get_java_type_string(t_type* type);
-  void generate_java_struct_field_by_id(ofstream& out, t_struct* tstruct);
-  void generate_reflection_setters(std::ostringstream& out,
-                                   t_type* type,
-                                   std::string field_name,
-                                   std::string cap_name);
-  void generate_reflection_getters(std::ostringstream& out,
-                                   t_type* type,
-                                   std::string field_name,
-                                   std::string cap_name);
-  void generate_generic_field_getters_setters(std::ofstream& out, t_struct* tstruct);
-  void generate_generic_isset_method(std::ofstream& out, t_struct* tstruct);
-  void generate_java_bean_boilerplate(std::ofstream& out, t_struct* tstruct);
-
-  void generate_function_helpers(t_function* tfunction);
-  std::string as_camel_case(std::string name, bool ucfirst = true);
-  std::string get_rpc_method_name(std::string name);
-  std::string get_cap_name(std::string name);
-  std::string generate_isset_check(t_field* field);
-  std::string generate_isset_check(std::string field);
-  void generate_isset_set(ofstream& out, t_field* field, std::string prefix);
-  std::string isset_field_id(t_field* field);
-
-  void generate_service_interface(t_service* tservice);
-  void generate_service_async_interface(t_service* tservice);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_async_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_service_async_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-  void generate_process_async_function(t_service* tservice, t_function* tfunction);
-
-  void generate_java_union(t_struct* tstruct);
-  void generate_union_constructor(ofstream& out, t_struct* tstruct);
-  void generate_union_getters_and_setters(ofstream& out, t_struct* tstruct);
-  void generate_union_is_set_methods(ofstream& out, t_struct* tstruct);
-  void generate_union_abstract_methods(ofstream& out, t_struct* tstruct);
-  void generate_check_type(ofstream& out, t_struct* tstruct);
-  void generate_standard_scheme_read_value(ofstream& out, t_struct* tstruct);
-  void generate_standard_scheme_write_value(ofstream& out, t_struct* tstruct);
-  void generate_tuple_scheme_read_value(ofstream& out, t_struct* tstruct);
-  void generate_tuple_scheme_write_value(ofstream& out, t_struct* tstruct);
-  void generate_get_field_desc(ofstream& out, t_struct* tstruct);
-  void generate_get_struct_desc(ofstream& out, t_struct* tstruct);
-  void generate_get_field_name(ofstream& out, t_struct* tstruct);
-
-  void generate_union_comparisons(ofstream& out, t_struct* tstruct);
-  void generate_union_hashcode(ofstream& out, t_struct* tstruct);
-
-  void generate_scheme_map(ofstream& out, t_struct* tstruct);
-  void generate_standard_writer(ofstream& out, t_struct* tstruct, bool is_result);
-  void generate_standard_reader(ofstream& out, t_struct* tstruct);
-  void generate_java_struct_standard_scheme(ofstream& out, t_struct* tstruct, bool is_result);
-
-  void generate_java_struct_tuple_scheme(ofstream& out, t_struct* tstruct);
-  void generate_java_struct_tuple_reader(ofstream& out, t_struct* tstruct);
-  void generate_java_struct_tuple_writer(ofstream& out, t_struct* tstruct);
-
-  void generate_java_scheme_lookup(ofstream& out);
-
-  void generate_javax_generated_annotation(ofstream& out);
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  std::string prefix = "",
-                                  bool has_metadata = true);
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out,
-                                      t_type* ttype,
-                                      std::string prefix = "",
-                                      bool has_metadata = true);
-
-  void generate_deserialize_set_element(std::ofstream& out,
-                                        t_set* tset,
-                                        std::string prefix = "",
-                                        std::string obj = "",
-                                        bool has_metadata = true);
-
-  void generate_deserialize_map_element(std::ofstream& out,
-                                        t_map* tmap,
-                                        std::string prefix = "",
-                                        std::string obj = "",
-                                        bool has_metadata = true);
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "",
-                                         std::string obj = "",
-                                         bool has_metadata = true);
-
-  void generate_serialize_field(std::ofstream& out,
-                                t_field* tfield,
-                                std::string prefix = "",
-                                bool has_metadata = true);
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out,
-                                    t_type* ttype,
-                                    std::string prefix = "",
-                                    bool has_metadata = true);
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string iter,
-                                      std::string map,
-                                      bool has_metadata = true);
-
-  void generate_serialize_set_element(std::ofstream& out,
-                                      t_set* tmap,
-                                      std::string iter,
-                                      bool has_metadata = true);
-
-  void generate_serialize_list_element(std::ofstream& out,
-                                       t_list* tlist,
-                                       std::string iter,
-                                       bool has_metadata = true);
-
-  void generate_deep_copy_container(std::ofstream& out,
-                                    std::string source_name_p1,
-                                    std::string source_name_p2,
-                                    std::string result_name,
-                                    t_type* type);
-  void generate_deep_copy_non_container(std::ofstream& out,
-                                        std::string source_name,
-                                        std::string dest_name,
-                                        t_type* type);
-
-  enum isset_type { ISSET_NONE, ISSET_PRIMITIVE, ISSET_BITSET };
-  isset_type needs_isset(t_struct* tstruct, std::string* outPrimitiveType = NULL);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string java_package();
-  std::string java_suppressions();
-  std::string type_name(t_type* ttype,
-                        bool in_container = false,
-                        bool in_init = false,
-                        bool skip_generic = false,
-                        bool force_namespace = false);
-  std::string base_type_name(t_base_type* tbase, bool in_container = false);
-  std::string declare_field(t_field* tfield, bool init = false, bool comment = false);
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string function_signature_async(t_function* tfunction,
-                                       bool use_base_method = false,
-                                       std::string prefix = "");
-  std::string argument_list(t_struct* tstruct, bool include_types = true);
-  std::string async_function_call_arglist(t_function* tfunc,
-                                          bool use_base_method = true,
-                                          bool include_types = true);
-  std::string async_argument_list(t_function* tfunct,
-                                  t_struct* tstruct,
-                                  t_type* ttype,
-                                  bool include_types = false);
-  std::string type_to_enum(t_type* ttype);
-  void generate_struct_desc(ofstream& out, t_struct* tstruct);
-  void generate_field_descs(ofstream& out, t_struct* tstruct);
-  void generate_field_name_constants(ofstream& out, t_struct* tstruct);
-
-  std::string make_valid_java_filename(std::string const& fromName);
-  std::string make_valid_java_identifier(std::string const& fromName);
-
-  bool type_can_be_null(t_type* ttype) {
-    ttype = get_true_type(ttype);
-
-    return ttype->is_container() || ttype->is_struct() || ttype->is_xception() || ttype->is_string()
-           || ttype->is_enum();
-  }
-
-  bool is_deprecated(const std::map<std::string, std::string>& annotations) {
-    return annotations.find("deprecated") != annotations.end();
-  }
-
-  std::string constant_name(std::string name);
-
-private:
-  /**
-   * File streams
-   */
-
-  std::string package_name_;
-  std::ofstream f_service_;
-  std::string package_dir_;
-
-  bool bean_style_;
-  bool android_style_;
-  bool private_members_;
-  bool nocamel_style_;
-  bool fullcamel_style_;
-  bool android_legacy_;
-  bool java5_;
-  bool sorted_containers_;
-  bool reuse_objects_;
-  bool use_option_type_;
-  bool undated_generated_annotations_;
-  bool suppress_generated_annotations_;
-
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_java_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-  package_name_ = program_->get_namespace("java");
-
-  string dir = package_name_;
-  string subdir = get_out_dir();
-  string::size_type loc;
-  while ((loc = dir.find(".")) != string::npos) {
-    subdir = subdir + "/" + dir.substr(0, loc);
-    MKDIR(subdir.c_str());
-    dir = dir.substr(loc + 1);
-  }
-  if (dir.size() > 0) {
-    subdir = subdir + "/" + dir;
-    MKDIR(subdir.c_str());
-  }
-
-  package_dir_ = subdir;
-}
-
-/**
- * Packages the generated file
- *
- * @return String of the package, i.e. "package org.apache.thriftdemo;"
- */
-string t_java_generator::java_package() {
-  if (!package_name_.empty()) {
-    return string("package ") + package_name_ + ";\n\n";
-  }
-  return "";
-}
-
-string t_java_generator::java_suppressions() {
-  return "@SuppressWarnings({\"cast\", \"rawtypes\", \"serial\", \"unchecked\", \"unused\"})\n";
-}
-
-/**
- * Nothing in Java
- */
-void t_java_generator::close_generator() {
-}
-
-/**
- * Generates a typedef. This is not done in Java, since it does
- * not support arbitrary name replacements, and it'd be a wacky waste
- * of overhead to make wrapper classes.
- *
- * @param ttypedef The type definition
- */
-void t_java_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Enums are a class with a set of static constants.
- *
- * @param tenum The enumeration
- */
-void t_java_generator::generate_enum(t_enum* tenum) {
-  bool is_deprecated = this->is_deprecated(tenum->annotations_);
-  // Make output file
-  string f_enum_name = package_dir_ + "/" + make_valid_java_filename(tenum->get_name()) + ".java";
-  ofstream f_enum;
-  f_enum.open(f_enum_name.c_str());
-
-  // Comment and package it
-  f_enum << autogen_comment() << java_package() << endl;
-
-  // Add java imports
-  f_enum << string() + "import java.util.Map;\n" + "import java.util.HashMap;\n"
-            + "import org.apache.thrift.TEnum;" << endl << endl;
-
-  generate_java_doc(f_enum, tenum);
-  if (is_deprecated) {
-    indent(f_enum) << "@Deprecated" << endl;
-  }
-  indent(f_enum) << "public enum " << tenum->get_name() << " implements org.apache.thrift.TEnum ";
-  scope_up(f_enum);
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  bool first = true;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-
-    if (first) {
-      first = false;
-    } else {
-      f_enum << "," << endl;
-    }
-
-    generate_java_doc(f_enum, *c_iter);
-    if (this->is_deprecated((*c_iter)->annotations_)) {
-      indent(f_enum) << "@Deprecated" << endl;
-    }
-    indent(f_enum) << (*c_iter)->get_name() << "(" << value << ")";
-  }
-  f_enum << ";" << endl << endl;
-
-  // Field for thriftCode
-  indent(f_enum) << "private final int value;" << endl << endl;
-
-  indent(f_enum) << "private " << tenum->get_name() << "(int value) {" << endl;
-  indent(f_enum) << "  this.value = value;" << endl;
-  indent(f_enum) << "}" << endl << endl;
-
-  indent(f_enum) << "/**" << endl;
-  indent(f_enum) << " * Get the integer value of this enum value, as defined in the Thrift IDL."
-                 << endl;
-  indent(f_enum) << " */" << endl;
-  indent(f_enum) << "public int getValue() {" << endl;
-  indent(f_enum) << "  return value;" << endl;
-  indent(f_enum) << "}" << endl << endl;
-
-  indent(f_enum) << "/**" << endl;
-  indent(f_enum) << " * Find a the enum type by its integer value, as defined in the Thrift IDL."
-                 << endl;
-  indent(f_enum) << " * @return null if the value is not found." << endl;
-  indent(f_enum) << " */" << endl;
-  indent(f_enum) << "public static " + tenum->get_name() + " findByValue(int value) { " << endl;
-
-  indent_up();
-
-  indent(f_enum) << "switch (value) {" << endl;
-  indent_up();
-
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    indent(f_enum) << "case " << value << ":" << endl;
-    indent(f_enum) << "  return " << (*c_iter)->get_name() << ";" << endl;
-  }
-
-  indent(f_enum) << "default:" << endl;
-  indent(f_enum) << "  return null;" << endl;
-
-  indent_down();
-
-  indent(f_enum) << "}" << endl;
-
-  indent_down();
-
-  indent(f_enum) << "}" << endl;
-
-  scope_down(f_enum);
-
-  f_enum.close();
-}
-
-/**
- * Generates a class that holds all the constants.
- */
-void t_java_generator::generate_consts(std::vector<t_const*> consts) {
-  if (consts.empty()) {
-    return;
-  }
-
-  string f_consts_name = package_dir_ + '/' + make_valid_java_filename(program_name_)
-                         + "Constants.java";
-  ofstream f_consts;
-  f_consts.open(f_consts_name.c_str());
-
-  // Print header
-  f_consts << autogen_comment() << java_package() << java_suppressions();
-
-  f_consts << "public class " << make_valid_java_identifier(program_name_) << "Constants {" << endl
-           << endl;
-  indent_up();
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    generate_java_doc(f_consts, (*c_iter));
-    print_const_value(f_consts,
-                      (*c_iter)->get_name(),
-                      (*c_iter)->get_type(),
-                      (*c_iter)->get_value(),
-                      false);
-  }
-  indent_down();
-  indent(f_consts) << "}" << endl;
-  f_consts.close();
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-void t_java_generator::print_const_value(std::ofstream& out,
-                                         string name,
-                                         t_type* type,
-                                         t_const_value* value,
-                                         bool in_static,
-                                         bool defval) {
-  type = get_true_type(type);
-
-  indent(out);
-  if (!defval) {
-    out << (in_static ? "" : "public static final ") << type_name(type) << " ";
-  }
-  if (type->is_base_type()) {
-    string v2 = render_const_value(out, type, value);
-    out << name << " = " << v2 << ";" << endl << endl;
-  } else if (type->is_enum()) {
-    out << name << " = " << render_const_value(out, type, value) << ";" << endl << endl;
-  } else if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    out << name << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "static {" << endl;
-      indent_up();
-    }
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string val = render_const_value(out, field_type, v_iter->second);
-      indent(out) << name << ".";
-      std::string cap_name = get_cap_name(v_iter->first->get_string());
-      out << "set" << cap_name << "(" << val << ");" << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else if (type->is_map()) {
-    out << name << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "static {" << endl;
-      indent_up();
-    }
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(out, ktype, v_iter->first);
-      string val = render_const_value(out, vtype, v_iter->second);
-      indent(out) << name << ".put(" << key << ", " << val << ");" << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else if (type->is_list() || type->is_set()) {
-    out << name << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "static {" << endl;
-      indent_up();
-    }
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(out, etype, *v_iter);
-      indent(out) << name << ".add(" << val << ");" << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else {
-    throw "compiler error: no const of type " + type->get_name();
-  }
-}
-
-string t_java_generator::render_const_value(ofstream& out, t_type* type, t_const_value* value) {
-  type = get_true_type(type);
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-      render << "(byte)" << value->get_integer();
-      break;
-    case t_base_type::TYPE_I16:
-      render << "(short)" << value->get_integer();
-      break;
-    case t_base_type::TYPE_I32:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_I64:
-      render << value->get_integer() << "L";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << "(double)" << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    std::string namespace_prefix = type->get_program()->get_namespace("java");
-    if (namespace_prefix.length() > 0) {
-      namespace_prefix += ".";
-    }
-    render << namespace_prefix << value->get_identifier_with_parent();
-  } else {
-    string t = tmp("tmp");
-    print_const_value(out, t, type, value, true);
-    render << t;
-  }
-
-  return render.str();
-}
-
-/**
- * Generates a struct definition for a thrift data type. This will be a org.apache.thrift.TBase
- * implementor.
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_struct(t_struct* tstruct) {
-  if (tstruct->is_union()) {
-    generate_java_union(tstruct);
-  } else {
-    generate_java_struct(tstruct, false);
-  }
-}
-
-/**
- * Exceptions are structs, but they inherit from Exception
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_xception(t_struct* txception) {
-  generate_java_struct(txception, true);
-}
-
-/**
- * Java struct definition.
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_struct(t_struct* tstruct, bool is_exception) {
-  // Make output file
-  string f_struct_name = package_dir_ + "/" + make_valid_java_filename(tstruct->get_name())
-                         + ".java";
-  ofstream f_struct;
-  f_struct.open(f_struct_name.c_str());
-
-  f_struct << autogen_comment() << java_package() << java_suppressions();
-
-  generate_java_struct_definition(f_struct, tstruct, is_exception);
-  f_struct.close();
-}
-
-/**
- * Java union definition.
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_union(t_struct* tstruct) {
-  // Make output file
-  string f_struct_name = package_dir_ + "/" + make_valid_java_filename(tstruct->get_name())
-                         + ".java";
-  ofstream f_struct;
-  f_struct.open(f_struct_name.c_str());
-
-  f_struct << autogen_comment() << java_package() << java_suppressions();
-
-  generate_java_doc(f_struct, tstruct);
-
-  bool is_final = (tstruct->annotations_.find("final") != tstruct->annotations_.end());
-  bool is_deprecated = this->is_deprecated(tstruct->annotations_);
-
-  if (is_deprecated) {
-    indent(f_struct) << "@Deprecated" << endl;
-  }
-  indent(f_struct) << "public " << (is_final ? "final " : "") << "class " << tstruct->get_name()
-                   << " extends org.apache.thrift.TUnion<" << tstruct->get_name() << ", "
-                   << tstruct->get_name() << "._Fields> ";
-
-  scope_up(f_struct);
-
-  generate_struct_desc(f_struct, tstruct);
-  generate_field_descs(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_field_name_constants(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_java_meta_data_map(f_struct, tstruct);
-
-  generate_union_constructor(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_abstract_methods(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_java_struct_field_by_id(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_getters_and_setters(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_is_set_methods(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_comparisons(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_hashcode(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_java_struct_write_object(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_java_struct_read_object(f_struct, tstruct);
-
-  f_struct << endl;
-
-  scope_down(f_struct);
-
-  f_struct.close();
-}
-
-void t_java_generator::generate_union_constructor(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  indent(out) << "public " << type_name(tstruct) << "() {" << endl;
-  indent_up();
-  bool default_value = false;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* type = get_true_type((*m_iter)->get_type());
-    if ((*m_iter)->get_value() != NULL) {
-      indent(out) << "super(_Fields." << constant_name((*m_iter)->get_name()) << ", "
-                  << render_const_value(out, type, (*m_iter)->get_value()) << ");" << endl;
-      default_value = true;
-      break;
-    }
-  }
-  if (default_value == false) {
-    indent(out) << "super();" << endl;
-  }
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "public " << type_name(tstruct) << "(_Fields setField, java.lang.Object value) {" << endl;
-  indent(out) << "  super(setField, value);" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "public " << type_name(tstruct) << "(" << type_name(tstruct) << " other) {"
-              << endl;
-  indent(out) << "  super(other);" << endl;
-  indent(out) << "}" << endl;
-
-  indent(out) << "public " << tstruct->get_name() << " deepCopy() {" << endl;
-  indent(out) << "  return new " << tstruct->get_name() << "(this);" << endl;
-  indent(out) << "}" << endl << endl;
-
-  // generate "constructors" for each field
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* type = (*m_iter)->get_type();
-    indent(out) << "public static " << type_name(tstruct) << " " << (*m_iter)->get_name() << "("
-                << type_name(type) << " value) {" << endl;
-    indent(out) << "  " << type_name(tstruct) << " x = new " << type_name(tstruct) << "();" << endl;
-    indent(out) << "  x.set" << get_cap_name((*m_iter)->get_name()) << "(value);" << endl;
-    indent(out) << "  return x;" << endl;
-    indent(out) << "}" << endl << endl;
-
-    if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
-      indent(out) << "public static " << type_name(tstruct) << " " << (*m_iter)->get_name()
-                  << "(byte[] value) {" << endl;
-      indent(out) << "  " << type_name(tstruct) << " x = new " << type_name(tstruct) << "();"
-                  << endl;
-      indent(out) << "  x.set" << get_cap_name((*m_iter)->get_name())
-                  << "(java.nio.ByteBuffer.wrap(value.clone()));" << endl;
-      indent(out) << "  return x;" << endl;
-      indent(out) << "}" << endl << endl;
-    }
-  }
-}
-
-void t_java_generator::generate_union_getters_and_setters(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  bool first = true;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (first) {
-      first = false;
-    } else {
-      out << endl;
-    }
-
-    t_field* field = (*m_iter);
-    t_type* type = field->get_type();
-    std::string cap_name = get_cap_name(field->get_name());
-    bool is_deprecated = this->is_deprecated(field->annotations_);
-
-    generate_java_doc(out, field);
-    if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
-      if (is_deprecated) {
-        indent(out) << "@Deprecated" << endl;
-      }
-      indent(out) << "public byte[] get" << cap_name << "() {" << endl;
-      indent(out) << "  set" << cap_name << "(org.apache.thrift.TBaseHelper.rightSize(buffer"
-                  << get_cap_name("for") << cap_name << "()));" << endl;
-      indent(out) << "  java.nio.ByteBuffer b = buffer" << get_cap_name("for") << cap_name << "();" << endl;
-      indent(out) << "  return b == null ? null : b.array();" << endl;
-      indent(out) << "}" << endl;
-
-      out << endl;
-
-      indent(out) << "public java.nio.ByteBuffer buffer" << get_cap_name("for")
-                  << get_cap_name(field->get_name()) << "() {" << endl;
-      indent(out) << "  if (getSetField() == _Fields." << constant_name(field->get_name()) << ") {"
-                  << endl;
-      indent(out)
-          << "    return org.apache.thrift.TBaseHelper.copyBinary((java.nio.ByteBuffer)getFieldValue());"
-          << endl;
-      indent(out) << "  } else {" << endl;
-      indent(out) << "    throw new java.lang.RuntimeException(\"Cannot get field '" << field->get_name()
-                  << "' because union is currently set to \" + getFieldDesc(getSetField()).name);"
-                  << endl;
-      indent(out) << "  }" << endl;
-      indent(out) << "}" << endl;
-    } else {
-      if (is_deprecated) {
-        indent(out) << "@Deprecated" << endl;
-      }
-      indent(out) << "public " << type_name(field->get_type()) << " get"
-                  << get_cap_name(field->get_name()) << "() {" << endl;
-      indent(out) << "  if (getSetField() == _Fields." << constant_name(field->get_name()) << ") {"
-                  << endl;
-      indent(out) << "    return (" << type_name(field->get_type(), true) << ")getFieldValue();"
-                  << endl;
-      indent(out) << "  } else {" << endl;
-      indent(out) << "    throw new java.lang.RuntimeException(\"Cannot get field '" << field->get_name()
-                  << "' because union is currently set to \" + getFieldDesc(getSetField()).name);"
-                  << endl;
-      indent(out) << "  }" << endl;
-      indent(out) << "}" << endl;
-    }
-
-    out << endl;
-
-    generate_java_doc(out, field);
-    if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
-      if (is_deprecated) {
-        indent(out) << "@Deprecated" << endl;
-      }
-      indent(out) << "public void set" << get_cap_name(field->get_name()) << "(byte[] value) {"
-                  << endl;
-      indent(out) << "  set" << get_cap_name(field->get_name())
-                  << "(java.nio.ByteBuffer.wrap(value.clone()));" << endl;
-      indent(out) << "}" << endl;
-
-      out << endl;
-    }
-    if (is_deprecated) {
-      indent(out) << "@Deprecated" << endl;
-    }
-    indent(out) << "public void set" << get_cap_name(field->get_name()) << "("
-                << type_name(field->get_type()) << " value) {" << endl;
-    if (type_can_be_null(field->get_type())) {
-      indent(out) << "  if (value == null) throw new java.lang.NullPointerException();" << endl;
-    }
-    indent(out) << "  setField_ = _Fields." << constant_name(field->get_name()) << ";" << endl;
-    indent(out) << "  value_ = value;" << endl;
-    indent(out) << "}" << endl;
-  }
-}
-
-void t_java_generator::generate_union_is_set_methods(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  bool first = true;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (first) {
-      first = false;
-    } else {
-      out << endl;
-    }
-
-    std::string field_name = (*m_iter)->get_name();
-
-    indent(out) << "public boolean is" << get_cap_name("set") << get_cap_name(field_name) << "() {"
-                << endl;
-    indent_up();
-    indent(out) << "return setField_ == _Fields." << constant_name(field_name) << ";" << endl;
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-}
-
-void t_java_generator::generate_union_abstract_methods(ofstream& out, t_struct* tstruct) {
-  generate_check_type(out, tstruct);
-  out << endl;
-  generate_standard_scheme_read_value(out, tstruct);
-  out << endl;
-  generate_standard_scheme_write_value(out, tstruct);
-  out << endl;
-  generate_tuple_scheme_read_value(out, tstruct);
-  out << endl;
-  generate_tuple_scheme_write_value(out, tstruct);
-  out << endl;
-  generate_get_field_desc(out, tstruct);
-  out << endl;
-  generate_get_struct_desc(out, tstruct);
-  out << endl;
-  indent(out) << "@Override" << endl;
-  indent(out) << "protected _Fields enumForId(short id) {" << endl;
-  indent(out) << "  return _Fields.findByThriftIdOrThrow(id);" << endl;
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_check_type(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out)
-      << "protected void checkType(_Fields setField, java.lang.Object value) throws java.lang.ClassCastException {"
-      << endl;
-  indent_up();
-
-  indent(out) << "switch (setField) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent(out) << "  if (value instanceof " << type_name(field->get_type(), true, false, true)
-                << ") {" << endl;
-    indent(out) << "    break;" << endl;
-    indent(out) << "  }" << endl;
-    indent(out) << "  throw new java.lang.ClassCastException(\"Was expecting value of type "
-                << type_name(field->get_type(), true, false) << " for field '" << field->get_name()
-                << "', but got \" + value.getClass().getSimpleName());" << endl;
-    // do the real check here
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new java.lang.IllegalArgumentException(\"Unknown field id \" + setField);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_standard_scheme_read_value(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out) << "protected java.lang.Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol "
-                 "iprot, org.apache.thrift.protocol.TField field) throws "
-                 "org.apache.thrift.TException {" << endl;
-
-  indent_up();
-
-  indent(out) << "_Fields setField = _Fields.findByThriftId(field.id);" << endl;
-  indent(out) << "if (setField != null) {" << endl;
-  indent_up();
-  indent(out) << "switch (setField) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << "if (field.type == " << constant_name(field->get_name()) << "_FIELD_DESC.type) {"
-                << endl;
-    indent_up();
-    indent(out) << type_name(field->get_type(), true, false) << " " << field->get_name() << ";"
-                << endl;
-    generate_deserialize_field(out, field, "");
-    indent(out) << "return " << field->get_name() << ";" << endl;
-    indent_down();
-    indent(out) << "} else {" << endl;
-    indent(out) << "  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);" << endl;
-    indent(out) << "  return null;" << endl;
-    indent(out) << "}" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new java.lang.IllegalStateException(\"setField wasn't null, but didn't match any "
-                 "of the case statements!\");" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "} else {" << endl;
-  indent_up();
-  indent(out) << "org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);" << endl;
-  indent(out) << "return null;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_standard_scheme_write_value(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out) << "protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol "
-                 "oprot) throws org.apache.thrift.TException {" << endl;
-
-  indent_up();
-
-  indent(out) << "switch (setField_) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << type_name(field->get_type(), true, false) << " " << field->get_name() << " = ("
-                << type_name(field->get_type(), true, false) << ")value_;" << endl;
-    generate_serialize_field(out, field, "");
-    indent(out) << "return;" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new java.lang.IllegalStateException(\"Cannot write union with unknown field \" + "
-                 "setField_);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_tuple_scheme_read_value(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out) << "protected java.lang.Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol "
-                 "iprot, short fieldID) throws org.apache.thrift.TException {" << endl;
-
-  indent_up();
-
-  indent(out) << "_Fields setField = _Fields.findByThriftId(fieldID);" << endl;
-  indent(out) << "if (setField != null) {" << endl;
-  indent_up();
-  indent(out) << "switch (setField) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << type_name(field->get_type(), true, false) << " " << field->get_name() << ";"
-                << endl;
-    generate_deserialize_field(out, field, "");
-    indent(out) << "return " << field->get_name() << ";" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new java.lang.IllegalStateException(\"setField wasn't null, but didn't match any "
-                 "of the case statements!\");" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "} else {" << endl;
-  indent_up();
-  indent(out) << "throw new org.apache.thrift.protocol.TProtocolException(\"Couldn't find a field with field id \" + fieldID);"
-              << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_tuple_scheme_write_value(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out) << "protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) "
-                 "throws org.apache.thrift.TException {" << endl;
-
-  indent_up();
-
-  indent(out) << "switch (setField_) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << type_name(field->get_type(), true, false) << " " << field->get_name() << " = ("
-                << type_name(field->get_type(), true, false) << ")value_;" << endl;
-    generate_serialize_field(out, field, "");
-    indent(out) << "return;" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new java.lang.IllegalStateException(\"Cannot write union with unknown field \" + "
-                 "setField_);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_get_field_desc(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out) << "protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {"
-              << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  indent(out) << "switch (setField) {" << endl;
-  indent_up();
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent(out) << "  return " << constant_name(field->get_name()) << "_FIELD_DESC;" << endl;
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new java.lang.IllegalArgumentException(\"Unknown field id \" + setField);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_get_struct_desc(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out) << "@Override" << endl;
-  indent(out) << "protected org.apache.thrift.protocol.TStruct getStructDesc() {" << endl;
-  indent(out) << "  return STRUCT_DESC;" << endl;
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_union_comparisons(ofstream& out, t_struct* tstruct) {
-  // equality
-  indent(out) << "public boolean equals(java.lang.Object other) {" << endl;
-  indent(out) << "  if (other instanceof " << tstruct->get_name() << ") {" << endl;
-  indent(out) << "    return equals((" << tstruct->get_name() << ")other);" << endl;
-  indent(out) << "  } else {" << endl;
-  indent(out) << "    return false;" << endl;
-  indent(out) << "  }" << endl;
-  indent(out) << "}" << endl;
-
-  out << endl;
-
-  indent(out) << "public boolean equals(" << tstruct->get_name() << " other) {" << endl;
-  indent(out) << "  return other != null && getSetField() == other.getSetField() && "
-                 "getFieldValue().equals(other.getFieldValue());" << endl;
-  indent(out) << "}" << endl;
-  out << endl;
-
-  indent(out) << "@Override" << endl;
-  indent(out) << "public int compareTo(" << type_name(tstruct) << " other) {" << endl;
-  indent(out) << "  int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), "
-                 "other.getSetField());" << endl;
-  indent(out) << "  if (lastComparison == 0) {" << endl;
-  indent(out) << "    return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), "
-                 "other.getFieldValue());" << endl;
-  indent(out) << "  }" << endl;
-  indent(out) << "  return lastComparison;" << endl;
-  indent(out) << "}" << endl;
-  out << endl;
-}
-
-void t_java_generator::generate_union_hashcode(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out) << "@Override" << endl;
-  indent(out) << "public int hashCode() {" << endl;
-  indent(out) << "  java.util.List<java.lang.Object> list = new java.util.ArrayList<java.lang.Object>();" << endl;
-  indent(out) << "  list.add(this.getClass().getName());" << endl;
-  indent(out) << "  org.apache.thrift.TFieldIdEnum setField = getSetField();" << endl;
-  indent(out) << "  if (setField != null) {" << endl;
-  indent(out) << "    list.add(setField.getThriftFieldId());" << endl;
-  indent(out) << "    java.lang.Object value = getFieldValue();" << endl;
-  indent(out) << "    if (value instanceof org.apache.thrift.TEnum) {" << endl;
-  indent(out) << "      list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());" << endl;
-  indent(out) << "    } else {" << endl;
-  indent(out) << "      list.add(value);" << endl;
-  indent(out) << "    }" << endl;
-  indent(out) << "  }" << endl;
-  indent(out) << "  return list.hashCode();" << endl;
-  indent(out) << "}";
-}
-
-/**
- * Java struct definition. This has various parameters, as it could be
- * generated standalone or inside another class as a helper. If it
- * is a helper than it is a static class.
- *
- * @param tstruct      The struct definition
- * @param is_exception Is this an exception?
- * @param in_class     If inside a class, needs to be static class
- * @param is_result    If this is a result it needs a different writer
- */
-void t_java_generator::generate_java_struct_definition(ofstream& out,
-                                                       t_struct* tstruct,
-                                                       bool is_exception,
-                                                       bool in_class,
-                                                       bool is_result) {
-  generate_java_doc(out, tstruct);
-
-  bool is_final = (tstruct->annotations_.find("final") != tstruct->annotations_.end());
-  bool is_deprecated = this->is_deprecated(tstruct->annotations_);
-
-  if (!in_class && !suppress_generated_annotations_) {
-    generate_javax_generated_annotation(out);
-  }
-
-  if (is_deprecated) {
-    indent(out) << "@Deprecated" << endl;
-  }
-  indent(out) << "public " << (is_final ? "final " : "") << (in_class ? "static " : "") << "class "
-              << tstruct->get_name() << " ";
-
-  if (is_exception) {
-    out << "extends org.apache.thrift.TException ";
-  }
-  out << "implements org.apache.thrift.TBase<" << tstruct->get_name() << ", " << tstruct->get_name()
-      << "._Fields>, java.io.Serializable, Cloneable, Comparable<" << tstruct->get_name() << ">";
-
-  if (android_style_) {
-    out << ", android.os.Parcelable";
-  }
-
-  out << " ";
-
-  scope_up(out);
-
-  generate_struct_desc(out, tstruct);
-
-  // Members are public for -java, private for -javabean
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  out << endl;
-
-  generate_field_descs(out, tstruct);
-
-  out << endl;
-
-  generate_scheme_map(out, tstruct);
-
-  out << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (bean_style_ || private_members_) {
-      indent(out) << "private ";
-    } else {
-      generate_java_doc(out, *m_iter);
-      indent(out) << "public ";
-    }
-    out << declare_field(*m_iter, false, true) << endl;
-  }
-
-  out << endl;
-
-  if (android_style_) {
-    generate_java_struct_parcelable(out, tstruct);
-  }
-
-  generate_field_name_constants(out, tstruct);
-
-  // isset data
-  if (members.size() > 0) {
-    out << endl;
-
-    indent(out) << "// isset id assignments" << endl;
-
-    int i = 0;
-    int optionals = 0;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() == t_field::T_OPTIONAL) {
-        optionals++;
-      }
-      if (!type_can_be_null((*m_iter)->get_type())) {
-        indent(out) << "private static final int " << isset_field_id(*m_iter) << " = " << i << ";"
-                    << endl;
-        i++;
-      }
-    }
-
-    std::string primitiveType;
-    switch (needs_isset(tstruct, &primitiveType)) {
-    case ISSET_NONE:
-      break;
-    case ISSET_PRIMITIVE:
-      indent(out) << "private " << primitiveType << " __isset_bitfield = 0;" << endl;
-      break;
-    case ISSET_BITSET:
-      indent(out) << "private java.util.BitSet __isset_bit_vector = new java.util.BitSet(" << i << ");" << endl;
-      break;
-    }
-
-    if (optionals > 0) {
-      std::string output_string = "private static final _Fields optionals[] = {";
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        if ((*m_iter)->get_req() == t_field::T_OPTIONAL) {
-          output_string = output_string + "_Fields." + constant_name((*m_iter)->get_name()) + ",";
-        }
-      }
-      indent(out) << output_string.substr(0, output_string.length() - 1) << "};" << endl;
-    }
-  }
-
-  generate_java_meta_data_map(out, tstruct);
-
-  bool all_optional_members = true;
-
-  // Default constructor
-  indent(out) << "public " << tstruct->get_name() << "() {" << endl;
-  indent_up();
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if ((*m_iter)->get_value() != NULL) {
-      print_const_value(out,
-                        "this." + (*m_iter)->get_name(),
-                        t,
-                        (*m_iter)->get_value(),
-                        true,
-                        true);
-    }
-    if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
-      all_optional_members = false;
-    }
-  }
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  if (!members.empty() && !all_optional_members) {
-    // Full constructor for all fields
-    indent(out) << "public " << tstruct->get_name() << "(" << endl;
-    indent_up();
-    bool first = true;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
-        if (!first) {
-          out << "," << endl;
-        }
-        first = false;
-        indent(out) << type_name((*m_iter)->get_type()) << " " << (*m_iter)->get_name();
-      }
-    }
-    out << ")" << endl;
-    indent_down();
-    indent(out) << "{" << endl;
-    indent_up();
-    indent(out) << "this();" << endl;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
-        t_type* type = get_true_type((*m_iter)->get_type());
-        if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
-          indent(out) << "this." << (*m_iter)->get_name()
-                      << " = org.apache.thrift.TBaseHelper.copyBinary(" << (*m_iter)->get_name()
-                      << ");" << endl;
-        } else {
-          indent(out) << "this." << (*m_iter)->get_name() << " = " << (*m_iter)->get_name() << ";"
-                      << endl;
-        }
-        generate_isset_set(out, (*m_iter), "");
-      }
-    }
-
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-
-  // copy constructor
-  indent(out) << "/**" << endl;
-  indent(out) << " * Performs a deep copy on <i>other</i>." << endl;
-  indent(out) << " */" << endl;
-  indent(out) << "public " << tstruct->get_name() << "(" << tstruct->get_name() << " other) {"
-              << endl;
-  indent_up();
-
-  switch (needs_isset(tstruct)) {
-  case ISSET_NONE:
-    break;
-  case ISSET_PRIMITIVE:
-    indent(out) << "__isset_bitfield = other.__isset_bitfield;" << endl;
-    break;
-  case ISSET_BITSET:
-    indent(out) << "__isset_bit_vector.clear();" << endl;
-    indent(out) << "__isset_bit_vector.or(other.__isset_bit_vector);" << endl;
-    break;
-  }
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-    std::string field_name = field->get_name();
-    t_type* type = field->get_type()->get_true_type();
-    bool can_be_null = type_can_be_null(type);
-
-    if (can_be_null) {
-      indent(out) << "if (other." << generate_isset_check(field) << ") {" << endl;
-      indent_up();
-    }
-
-    if (type->is_container()) {
-      generate_deep_copy_container(out, "other", field_name, "__this__" + field_name, type);
-      indent(out) << "this." << field_name << " = __this__" << field_name << ";" << endl;
-    } else {
-      indent(out) << "this." << field_name << " = ";
-      generate_deep_copy_non_container(out, "other." + field_name, field_name, type);
-      out << ";" << endl;
-    }
-
-    if (can_be_null) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  // clone method, so that you can deep copy an object when you don't know its class.
-  indent(out) << "public " << tstruct->get_name() << " deepCopy() {" << endl;
-  indent(out) << "  return new " << tstruct->get_name() << "(this);" << endl;
-  indent(out) << "}" << endl << endl;
-
-  generate_java_struct_clear(out, tstruct);
-
-  generate_java_bean_boilerplate(out, tstruct);
-  generate_generic_field_getters_setters(out, tstruct);
-  generate_generic_isset_method(out, tstruct);
-
-  generate_java_struct_equality(out, tstruct);
-  generate_java_struct_compare_to(out, tstruct);
-  generate_java_struct_field_by_id(out, tstruct);
-
-  generate_java_struct_reader(out, tstruct);
-  if (is_result) {
-    generate_java_struct_result_writer(out, tstruct);
-  } else {
-    generate_java_struct_writer(out, tstruct);
-  }
-  generate_java_struct_tostring(out, tstruct);
-  generate_java_validator(out, tstruct);
-
-  generate_java_struct_write_object(out, tstruct);
-  generate_java_struct_read_object(out, tstruct);
-
-  generate_java_struct_standard_scheme(out, tstruct, is_result);
-  generate_java_struct_tuple_scheme(out, tstruct);
-  generate_java_scheme_lookup(out);
-
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * generates parcelable interface implementation
- */
-void t_java_generator::generate_java_struct_parcelable(ofstream& out, t_struct* tstruct) {
-  string tname = tstruct->get_name();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  out << indent() << "@Override" << endl << indent()
-      << "public void writeToParcel(android.os.Parcel out, int flags) {" << endl;
-  indent_up();
-  string bitsetPrimitiveType = "";
-  switch (needs_isset(tstruct, &bitsetPrimitiveType)) {
-  case ISSET_NONE:
-    break;
-  case ISSET_PRIMITIVE:
-    indent(out) << "//primitive bitfield of type: " << bitsetPrimitiveType << endl;
-    if (bitsetPrimitiveType == "byte") {
-      indent(out) << "out.writeByte(__isset_bitfield);" << endl;
-    } else if (bitsetPrimitiveType == "short") {
-      indent(out) << "out.writeInt(new Short(__isset_bitfield).intValue());" << endl;
-    } else if (bitsetPrimitiveType == "int") {
-      indent(out) << "out.writeInt(__isset_bitfield);" << endl;
-    } else if (bitsetPrimitiveType == "long") {
-      indent(out) << "out.writeLong(__isset_bitfield);" << endl;
-    }
-    out << endl;
-    break;
-  case ISSET_BITSET:
-    indent(out) << "//BitSet" << endl;
-    indent(out) << "out.writeSerializable(__isset_bit_vector);" << endl;
-    out << endl;
-    break;
-  }
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    string name = (*m_iter)->get_name();
-
-    if (t->is_struct()) {
-      indent(out) << "out.writeParcelable(" << name << ", flags);" << endl;
-    } else if (type_name(t) == "float") {
-      indent(out) << "out.writeFloat(" << name << ");" << endl;
-    } else if (t->is_enum()) {
-      indent(out) << "out.writeInt(" << name << " != null ? " << name << ".getValue() : -1);" << endl;
-    } else if (t->is_list()) {
-      if (((t_list*)t)->get_elem_type()->get_true_type()->is_struct()) {
-        indent(out) << "out.writeTypedList(" << name << ");" << endl;
-      } else {
-        indent(out) << "out.writeList(" << name << ");" << endl;
-      }
-    } else if (t->is_map()) {
-      indent(out) << "out.writeMap(" << name << ");" << endl;
-    } else if (t->is_base_type()) {
-      if (((t_base_type*)t)->is_binary()) {
-        indent(out) << "out.writeInt(" << name << "!=null ? 1 : 0);" << endl;
-        indent(out) << "if(" << name << " != null) { " << endl;
-        indent_up();
-        indent(out) << "out.writeByteArray(" << name << ".array(), " << name << ".position() + "
-                    << name << ".arrayOffset(), " << name << ".limit() - " << name
-                    << ".position() );" << endl;
-        scope_down(out);
-      } else {
-        switch (((t_base_type*)t)->get_base()) {
-        case t_base_type::TYPE_I16:
-          indent(out) << "out.writeInt(new Short(" << name << ").intValue());" << endl;
-          break;
-        case t_base_type::TYPE_I32:
-          indent(out) << "out.writeInt(" << name << ");" << endl;
-          break;
-        case t_base_type::TYPE_I64:
-          indent(out) << "out.writeLong(" << name << ");" << endl;
-          break;
-        case t_base_type::TYPE_BOOL:
-          indent(out) << "out.writeInt(" << name << " ? 1 : 0);" << endl;
-          break;
-        case t_base_type::TYPE_I8:
-          indent(out) << "out.writeByte(" << name << ");" << endl;
-          break;
-        case t_base_type::TYPE_DOUBLE:
-          indent(out) << "out.writeDouble(" << name << ");" << endl;
-          break;
-        case t_base_type::TYPE_STRING:
-          indent(out) << "out.writeString(" << name << ");" << endl;
-          break;
-        case t_base_type::TYPE_VOID:
-          break;
-        }
-      }
-    }
-  }
-  scope_down(out);
-  out << endl;
-
-  out << indent() << "@Override" << endl << indent() << "public int describeContents() {" << endl;
-  indent_up();
-  out << indent() << "return 0;" << endl;
-  scope_down(out);
-  out << endl;
-
-  indent(out) << "public " << tname << "(android.os.Parcel in) {" << endl;
-  indent_up();
-  // read in the required bitfield
-  switch (needs_isset(tstruct, &bitsetPrimitiveType)) {
-  case ISSET_NONE:
-    break;
-  case ISSET_PRIMITIVE:
-    indent(out) << "//primitive bitfield of type: " << bitsetPrimitiveType << endl;
-    if (bitsetPrimitiveType == "byte") {
-      indent(out) << "__isset_bitfield = in.readByte();" << endl;
-    } else if (bitsetPrimitiveType == "short") {
-      indent(out) << "__isset_bitfield = (short) in.readInt();" << endl;
-    } else if (bitsetPrimitiveType == "int") {
-      indent(out) << "__isset_bitfield = in.readInt();" << endl;
-    } else if (bitsetPrimitiveType == "long") {
-      indent(out) << "__isset_bitfield = in.readLong();" << endl;
-    }
-    out << endl;
-    break;
-  case ISSET_BITSET:
-    indent(out) << "//BitSet" << endl;
-    indent(out) << "__isset_bit_vector = (java.util.BitSet) in.readSerializable();" << endl;
-    out << endl;
-    break;
-  }
-  // read all the fields
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    string name = (*m_iter)->get_name();
-    string prefix = "this." + name;
-
-    if (t->is_struct()) {
-      indent(out) << prefix << "= in.readParcelable(" << tname << ".class.getClassLoader());"
-                  << endl;
-    } else if (t->is_enum()) {
-      indent(out) << prefix << " = " << type_name(t) << ".findByValue(in.readInt());" << endl;
-    } else if (t->is_list()) {
-      t_list* list = (t_list*)t;
-      indent(out) << prefix << " = new " << type_name(t, false, true) << "();" << endl;
-      if (list->get_elem_type()->get_true_type()->is_struct()) {
-        indent(out) << "in.readTypedList(" << prefix << ", " << type_name(list->get_elem_type())
-                    << ".CREATOR);" << endl;
-      } else {
-        indent(out) << "in.readList(" << prefix << ", " << tname << ".class.getClassLoader());"
-                    << endl;
-      }
-    } else if (t->is_map()) {
-      indent(out) << prefix << " = new " << type_name(t, false, true) << "();" << endl;
-      indent(out) << " in.readMap(" << prefix << ", " << tname << ".class.getClassLoader());"
-                  << endl;
-    } else if (type_name(t) == "float") {
-      indent(out) << prefix << " = in.readFloat();" << endl;
-    } else if (t->is_base_type()) {
-      t_base_type* bt = (t_base_type*)t;
-      if (bt->is_binary()) {
-        indent(out) << "if(in.readInt()==1) {" << endl;
-        indent_up();
-        indent(out) << prefix << " = java.nio.ByteBuffer.wrap(in.createByteArray());" << endl;
-        scope_down(out);
-      } else {
-        switch (bt->get_base()) {
-        case t_base_type::TYPE_I16:
-          indent(out) << prefix << " = (short) in.readInt();" << endl;
-          break;
-        case t_base_type::TYPE_I32:
-          indent(out) << prefix << " = in.readInt();" << endl;
-          break;
-        case t_base_type::TYPE_I64:
-          indent(out) << prefix << " = in.readLong();" << endl;
-          break;
-        case t_base_type::TYPE_BOOL:
-          indent(out) << prefix << " = (in.readInt()==1);" << endl;
-          break;
-        case t_base_type::TYPE_I8:
-          indent(out) << prefix << " = in.readByte();" << endl;
-          break;
-        case t_base_type::TYPE_DOUBLE:
-          indent(out) << prefix << " = in.readDouble();" << endl;
-          break;
-        case t_base_type::TYPE_STRING:
-          indent(out) << prefix << "= in.readString();" << endl;
-          break;
-        case t_base_type::TYPE_VOID:
-          break;
-        }
-      }
-    }
-  }
-
-  scope_down(out);
-  out << endl;
-
-  indent(out) << "public static final android.os.Parcelable.Creator<" << tname
-              << "> CREATOR = new android.os.Parcelable.Creator<" << tname << ">() {" << endl;
-  indent_up();
-
-  indent(out) << "@Override" << endl << indent() << "public " << tname << "[] newArray(int size) {"
-              << endl;
-  indent_up();
-  indent(out) << "return new " << tname << "[size];" << endl;
-  scope_down(out);
-  out << endl;
-
-  indent(out) << "@Override" << endl << indent() << "public " << tname
-              << " createFromParcel(android.os.Parcel in) {" << endl;
-  indent_up();
-  indent(out) << "return new " << tname << "(in);" << endl;
-  scope_down(out);
-
-  indent_down();
-  indent(out) << "};" << endl;
-  out << endl;
-}
-
-/**
- * Generates equals methods and a hashCode method for a structure.
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_struct_equality(ofstream& out, t_struct* tstruct) {
-  out << indent() << "@Override" << endl << indent() << "public boolean equals(java.lang.Object that) {"
-      << endl;
-  indent_up();
-  out << indent() << "if (that == null)" << endl << indent() << "  return false;" << endl
-      << indent() << "if (that instanceof " << tstruct->get_name() << ")" << endl << indent()
-      << "  return this.equals((" << tstruct->get_name() << ")that);" << endl << indent()
-      << "return false;" << endl;
-  scope_down(out);
-  out << endl;
-
-  out << indent() << "public boolean equals(" << tstruct->get_name() << " that) {" << endl;
-  indent_up();
-  out << indent() << "if (that == null)" << endl << indent() << "  return false;" << endl
-      << indent() << "if (this == that)" << endl << indent() << "  return true;"  << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    out << endl;
-
-    t_type* t = get_true_type((*m_iter)->get_type());
-    // Most existing Thrift code does not use isset or optional/required,
-    // so we treat "default" fields as required.
-    bool is_optional = (*m_iter)->get_req() == t_field::T_OPTIONAL;
-    bool can_be_null = type_can_be_null(t);
-    string name = (*m_iter)->get_name();
-
-    string this_present = "true";
-    string that_present = "true";
-    string unequal;
-
-    if (is_optional || can_be_null) {
-      this_present += " && this." + generate_isset_check(*m_iter);
-      that_present += " && that." + generate_isset_check(*m_iter);
-    }
-
-    out << indent() << "boolean this_present_" << name << " = " << this_present << ";" << endl
-        << indent() << "boolean that_present_" << name << " = " << that_present << ";" << endl
-        << indent() << "if ("
-        << "this_present_" << name << " || that_present_" << name << ") {" << endl;
-    indent_up();
-    out << indent() << "if (!("
-        << "this_present_" << name << " && that_present_" << name << "))" << endl << indent()
-        << "  return false;" << endl;
-
-    if (t->is_base_type() && ((t_base_type*)t)->is_binary()) {
-      unequal = "!this." + name + ".equals(that." + name + ")";
-    } else if (can_be_null) {
-      unequal = "!this." + name + ".equals(that." + name + ")";
-    } else {
-      unequal = "this." + name + " != that." + name;
-    }
-
-    out << indent() << "if (" << unequal << ")" << endl << indent() << "  return false;" << endl;
-
-    scope_down(out);
-  }
-  out << endl;
-  indent(out) << "return true;" << endl;
-  scope_down(out);
-  out << endl;
-
-  const int MUL = 8191; // HashCode multiplier
-  const int B_YES = 131071;
-  const int B_NO = 524287;
-  out << indent() << "@Override" << endl << indent() << "public int hashCode() {" << endl;
-  indent_up();
-  indent(out) << "int hashCode = 1;" << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    out << endl;
-
-    t_type* t = get_true_type((*m_iter)->get_type());
-    bool is_optional = (*m_iter)->get_req() == t_field::T_OPTIONAL;
-    bool can_be_null = type_can_be_null(t);
-    string name = (*m_iter)->get_name();
-
-    if (is_optional || can_be_null) {
-      indent(out) << "hashCode = hashCode * " << MUL << " + ((" << generate_isset_check(*m_iter)
-                  << ") ? " << B_YES << " : " << B_NO << ");" << endl;
-    }
-
-    if (is_optional || can_be_null) {
-      indent(out) << "if (" + generate_isset_check(*m_iter) + ")" << endl;
-      indent_up();
-    }
-
-    if (t->is_enum()) {
-      indent(out) << "hashCode = hashCode * " << MUL << " + " << name << ".getValue();" << endl;
-    } else if (t->is_base_type()) {
-      switch(((t_base_type*)t)->get_base()) {
-      case t_base_type::TYPE_STRING:
-        indent(out) << "hashCode = hashCode * " << MUL << " + " << name << ".hashCode();" << endl;
-        break;
-      case t_base_type::TYPE_BOOL:
-        indent(out) << "hashCode = hashCode * " << MUL << " + ((" << name << ") ? "
-                    << B_YES << " : " << B_NO << ");" << endl;
-        break;
-      case t_base_type::TYPE_I8:
-        indent(out) << "hashCode = hashCode * " << MUL << " + (int) (" << name << ");" << endl;
-        break;
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-        indent(out) << "hashCode = hashCode * " << MUL << " + " << name << ";" << endl;
-        break;
-      case t_base_type::TYPE_I64:
-      case t_base_type::TYPE_DOUBLE:
-        indent(out) << "hashCode = hashCode * " << MUL << " + org.apache.thrift.TBaseHelper.hashCode(" << name << ");" << endl;
-        break;
-      case t_base_type::TYPE_VOID:
-        throw std::logic_error("compiler error: a struct field cannot be void");
-      default:
-        throw std::logic_error("compiler error: the following base type has no hashcode generator: " +
-               t_base_type::t_base_name(((t_base_type*)t)->get_base()));
-      }
-    } else {
-      indent(out) << "hashCode = hashCode * " << MUL << " + " << name << ".hashCode();" << endl;
-    }
-
-    if (is_optional || can_be_null) {
-      indent_down();
-    }
-  }
-
-  out << endl;
-  indent(out) << "return hashCode;" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-void t_java_generator::generate_java_struct_compare_to(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out) << "public int compareTo(" << type_name(tstruct) << " other) {" << endl;
-  indent_up();
-
-  indent(out) << "if (!getClass().equals(other.getClass())) {" << endl;
-  indent(out) << "  return getClass().getName().compareTo(other.getClass().getName());" << endl;
-  indent(out) << "}" << endl;
-  out << endl;
-
-  indent(out) << "int lastComparison = 0;" << endl;
-  out << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = *m_iter;
-    indent(out) << "lastComparison = java.lang.Boolean.valueOf(" << generate_isset_check(field)
-                << ").compareTo(other." << generate_isset_check(field) << ");" << endl;
-    indent(out) << "if (lastComparison != 0) {" << endl;
-    indent(out) << "  return lastComparison;" << endl;
-    indent(out) << "}" << endl;
-
-    indent(out) << "if (" << generate_isset_check(field) << ") {" << endl;
-    indent(out) << "  lastComparison = org.apache.thrift.TBaseHelper.compareTo(this."
-                << field->get_name() << ", other." << field->get_name() << ");" << endl;
-    indent(out) << "  if (lastComparison != 0) {" << endl;
-    indent(out) << "    return lastComparison;" << endl;
-    indent(out) << "  }" << endl;
-    indent(out) << "}" << endl;
-  }
-
-  indent(out) << "return 0;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a function to read all the fields of the struct.
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_struct_reader(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out) << "public void read(org.apache.thrift.protocol.TProtocol iprot) throws "
-                 "org.apache.thrift.TException {" << endl;
-  indent_up();
-  indent(out) << "scheme(iprot).read(iprot, this);" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-// generates java method to perform various checks
-// (e.g. check that all required fields are set)
-void t_java_generator::generate_java_validator(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public void validate() throws org.apache.thrift.TException {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << indent() << "// check for required fields" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      if (bean_style_) {
-        out << indent() << "if (!" << generate_isset_check(*f_iter) << ") {" << endl << indent()
-            << "  throw new org.apache.thrift.protocol.TProtocolException(\"Required field '"
-            << (*f_iter)->get_name() << "' is unset! Struct:\" + toString());" << endl << indent()
-            << "}" << endl << endl;
-      } else {
-        if (type_can_be_null((*f_iter)->get_type())) {
-          indent(out) << "if (" << (*f_iter)->get_name() << " == null) {" << endl;
-          indent(out)
-              << "  throw new org.apache.thrift.protocol.TProtocolException(\"Required field '"
-              << (*f_iter)->get_name() << "' was not present! Struct: \" + toString());" << endl;
-          indent(out) << "}" << endl;
-        } else {
-          indent(out) << "// alas, we cannot check '" << (*f_iter)->get_name()
-                      << "' because it's a primitive and you chose the non-beans generator."
-                      << endl;
-        }
-      }
-    }
-  }
-
-  out << indent() << "// check for sub-struct validity" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_type* type = (*f_iter)->get_type();
-    if (type->is_struct() && !((t_struct*)type)->is_union()) {
-      out << indent() << "if (" << (*f_iter)->get_name() << " != null) {" << endl;
-      out << indent() << "  " << (*f_iter)->get_name() << ".validate();" << endl;
-      out << indent() << "}" << endl;
-    }
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_struct_writer(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out) << "public void write(org.apache.thrift.protocol.TProtocol oprot) throws "
-                 "org.apache.thrift.TException {" << endl;
-  indent_up();
-  indent(out) << "scheme(oprot).write(oprot, this);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct,
- * which is a function result. These fields are only written
- * if they are set in the Isset array, and only one of them
- * can be set at a time.
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_struct_result_writer(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out) << "public void write(org.apache.thrift.protocol.TProtocol oprot) throws "
-                 "org.apache.thrift.TException {" << endl;
-  indent_up();
-  indent(out) << "scheme(oprot).write(oprot, this);" << endl;
-
-  indent_down();
-  indent(out) << "  }" << endl << endl;
-}
-
-void t_java_generator::generate_java_struct_field_by_id(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out) << "public _Fields fieldForId(int fieldId) {" << endl;
-  indent(out) << "  return _Fields.findByThriftId(fieldId);" << endl;
-  indent(out) << "}" << endl << endl;
-}
-
-void t_java_generator::generate_reflection_getters(ostringstream& out,
-                                                   t_type* type,
-                                                   string field_name,
-                                                   string cap_name) {
-  indent(out) << "case " << constant_name(field_name) << ":" << endl;
-  indent_up();
-  indent(out) << "return " << (type->is_bool() ? "is" : "get") << cap_name << "();" << endl << endl;
-  indent_down();
-}
-
-void t_java_generator::generate_reflection_setters(ostringstream& out,
-                                                   t_type* type,
-                                                   string field_name,
-                                                   string cap_name) {
-  const bool is_binary = type->is_base_type() && ((t_base_type*)type)->is_binary();
-  indent(out) << "case " << constant_name(field_name) << ":" << endl;
-  indent_up();
-  indent(out) << "if (value == null) {" << endl;
-  indent(out) << "  unset" << get_cap_name(field_name) << "();" << endl;
-  indent(out) << "} else {" << endl;
-  if (is_binary) {
-    indent_up();
-    indent(out) << "if (value instanceof byte[]) {" << endl;
-    indent(out) << "  set" << cap_name << "((byte[])value);" << endl;
-    indent(out) << "} else {" << endl;
-  }
-  indent(out) << "  set" << cap_name << "((" << type_name(type, true, false) << ")value);" << endl;
-  if (is_binary) {
-    indent(out) << "}" << endl;
-    indent_down();
-  }
-  indent(out) << "}" << endl;
-  indent(out) << "break;" << endl << endl;
-
-  indent_down();
-}
-
-void t_java_generator::generate_generic_field_getters_setters(std::ofstream& out,
-                                                              t_struct* tstruct) {
-  std::ostringstream getter_stream;
-  std::ostringstream setter_stream;
-
-  // build up the bodies of both the getter and setter at once
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = get_cap_name(field_name);
-
-    indent_up();
-    generate_reflection_setters(setter_stream, type, field_name, cap_name);
-    generate_reflection_getters(getter_stream, type, field_name, cap_name);
-    indent_down();
-  }
-
-  // create the setter
-
-  indent(out) << "public void setFieldValue(_Fields field, java.lang.Object value) {" << endl;
-  indent(out) << "  switch (field) {" << endl;
-  out << setter_stream.str();
-  indent(out) << "  }" << endl;
-  indent(out) << "}" << endl << endl;
-
-  // create the getter
-  indent(out) << "public java.lang.Object getFieldValue(_Fields field) {" << endl;
-  indent_up();
-  indent(out) << "switch (field) {" << endl;
-  out << getter_stream.str();
-  indent(out) << "}" << endl;
-  indent(out) << "throw new java.lang.IllegalStateException();" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-// Creates a generic isSet method that takes the field number as argument
-void t_java_generator::generate_generic_isset_method(std::ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // create the isSet method
-  indent(out) << "/** Returns true if field corresponding to fieldID is set (has been assigned a "
-                 "value) and false otherwise */" << endl;
-  indent(out) << "public boolean isSet(_Fields field) {" << endl;
-  indent_up();
-  indent(out) << "if (field == null) {" << endl;
-  indent(out) << "  throw new java.lang.IllegalArgumentException();" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "switch (field) {" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << "return " << generate_isset_check(field) << ";" << endl;
-    indent_down();
-  }
-
-  indent(out) << "}" << endl;
-  indent(out) << "throw new java.lang.IllegalStateException();" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a set of Java Bean boilerplate functions (setters, getters, etc.)
- * for the given struct.
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_bean_boilerplate(ofstream& out, t_struct* tstruct) {
-  isset_type issetType = needs_isset(tstruct);
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = get_cap_name(field_name);
-    bool optional = use_option_type_ && field->get_req() == t_field::T_OPTIONAL;
-    bool is_deprecated = this->is_deprecated(field->annotations_);
-
-    if (type->is_container()) {
-      // Method to return the size of the collection
-      if (optional) {
-        if (is_deprecated) {
-          indent(out) << "@Deprecated" << endl;
-        }
-        indent(out) << "public org.apache.thrift.Option<Integer> get" << cap_name;
-        out << get_cap_name("size() {") << endl;
-
-        indent_up();
-        indent(out) << "if (this." << field_name << " == null) {" << endl;
-        indent_up();
-        indent(out) << "return org.apache.thrift.Option.none();" << endl;
-        indent_down();
-        indent(out) << "} else {" << endl;
-        indent_up();
-        indent(out) << "return org.apache.thrift.Option.some(this." << field_name << ".size());" << endl;
-        indent_down();
-        indent(out) << "}" << endl;
-        indent_down();
-        indent(out) << "}" << endl << endl;
-      } else {
-        if (is_deprecated) {
-          indent(out) << "@Deprecated" << endl;
-        }
-        indent(out) << "public int get" << cap_name;
-        out << get_cap_name("size() {") << endl;
-
-        indent_up();
-        indent(out) << "return (this." << field_name << " == null) ? 0 : "
-                    << "this." << field_name << ".size();" << endl;
-        indent_down();
-        indent(out) << "}" << endl << endl;
-      }
-    }
-
-    if (type->is_set() || type->is_list()) {
-      t_type* element_type;
-      if (type->is_set()) {
-        element_type = ((t_set*)type)->get_elem_type();
-      } else {
-        element_type = ((t_list*)type)->get_elem_type();
-      }
-
-      // Iterator getter for sets and lists
-      if (optional) {
-        if (is_deprecated) {
-          indent(out) << "@Deprecated" << endl;
-        }
-        indent(out) << "public org.apache.thrift.Option<java.util.Iterator<" << type_name(element_type, true, false)
-                    << ">> get" << cap_name;
-        out << get_cap_name("iterator() {") << endl;
-
-        indent_up();
-        indent(out) << "if (this." << field_name << " == null) {" << endl;
-        indent_up();
-        indent(out) << "return org.apache.thrift.Option.none();" << endl;
-        indent_down();
-        indent(out) << "} else {" << endl;
-        indent_up();
-        indent(out) << "return org.apache.thrift.Option.some(this." << field_name << ".iterator());" << endl;
-        indent_down();
-        indent(out) << "}" << endl;
-        indent_down();
-        indent(out) << "}" << endl << endl;
-      } else {
-        if (is_deprecated) {
-          indent(out) << "@Deprecated" << endl;
-        }
-        indent(out) << "public java.util.Iterator<" << type_name(element_type, true, false)
-                    << "> get" << cap_name;
-        out << get_cap_name("iterator() {") << endl;
-
-        indent_up();
-        indent(out) << "return (this." << field_name << " == null) ? null : "
-                    << "this." << field_name << ".iterator();" << endl;
-        indent_down();
-        indent(out) << "}" << endl << endl;
-      }
-
-      // Add to set or list, create if the set/list is null
-      if (is_deprecated) {
-        indent(out) << "@Deprecated" << endl;
-      }
-      indent(out) << "public void add" << get_cap_name("to");
-      out << cap_name << "(" << type_name(element_type) << " elem) {" << endl;
-
-      indent_up();
-      indent(out) << "if (this." << field_name << " == null) {" << endl;
-      indent_up();
-      indent(out) << "this." << field_name << " = new " << type_name(type, false, true) << "();"
-                  << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-      indent(out) << "this." << field_name << ".add(elem);" << endl;
-      indent_down();
-      indent(out) << "}" << endl << endl;
-    } else if (type->is_map()) {
-      // Put to map
-      t_type* key_type = ((t_map*)type)->get_key_type();
-      t_type* val_type = ((t_map*)type)->get_val_type();
-
-      if (is_deprecated) {
-        indent(out) << "@Deprecated" << endl;
-      }
-      indent(out) << "public void put" << get_cap_name("to");
-      out << cap_name << "(" << type_name(key_type) << " key, " << type_name(val_type) << " val) {"
-          << endl;
-
-      indent_up();
-      indent(out) << "if (this." << field_name << " == null) {" << endl;
-      indent_up();
-      indent(out) << "this." << field_name << " = new " << type_name(type, false, true) << "();"
-                  << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-      indent(out) << "this." << field_name << ".put(key, val);" << endl;
-      indent_down();
-      indent(out) << "}" << endl << endl;
-    }
-
-    // Simple getter
-    generate_java_doc(out, field);
-    if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
-      if (is_deprecated) {
-        indent(out) << "@Deprecated" << endl;
-      }
-      indent(out) << "public byte[] get" << cap_name << "() {" << endl;
-      indent(out) << "  set" << cap_name << "(org.apache.thrift.TBaseHelper.rightSize("
-                  << field_name << "));" << endl;
-      indent(out) << "  return " << field_name << " == null ? null : " << field_name << ".array();"
-                  << endl;
-      indent(out) << "}" << endl << endl;
-
-      indent(out) << "public java.nio.ByteBuffer buffer" << get_cap_name("for") << cap_name << "() {"
-                  << endl;
-      indent(out) << "  return org.apache.thrift.TBaseHelper.copyBinary(" << field_name << ");"
-                  << endl;
-      indent(out) << "}" << endl << endl;
-    } else {
-      if (optional) {
-        if (is_deprecated) {
-          indent(out) << "@Deprecated" << endl;
-        }
-        indent(out) << "public org.apache.thrift.Option<" << type_name(type, true) << ">";
-        if (type->is_base_type() && ((t_base_type*)type)->get_base() == t_base_type::TYPE_BOOL) {
-          out << " is";
-        } else {
-          out << " get";
-        }
-        out << cap_name << "() {" << endl;
-        indent_up();
-
-        indent(out) << "if (this.isSet" << cap_name << "()) {" << endl;
-        indent_up();
-        indent(out) << "return org.apache.thrift.Option.some(this." << field_name << ");" << endl;
-        indent_down();
-        indent(out) << "} else {" << endl;
-        indent_up();
-        indent(out) << "return org.apache.thrift.Option.none();" << endl;
-        indent_down();
-        indent(out) << "}" << endl;
-        indent_down();
-        indent(out) << "}" << endl << endl;
-      } else {
-        if (is_deprecated) {
-          indent(out) << "@Deprecated" << endl;
-        }
-        indent(out) << "public " << type_name(type);
-        if (type->is_base_type() && ((t_base_type*)type)->get_base() == t_base_type::TYPE_BOOL) {
-          out << " is";
-        } else {
-          out << " get";
-        }
-        out << cap_name << "() {" << endl;
-        indent_up();
-        indent(out) << "return this." << field_name << ";" << endl;
-        indent_down();
-        indent(out) << "}" << endl << endl;
-      }
-    }
-
-    // Simple setter
-    generate_java_doc(out, field);
-    if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
-      if (is_deprecated) {
-        indent(out) << "@Deprecated" << endl;
-      }
-      indent(out) << "public ";
-      if (bean_style_) {
-        out << "void";
-      } else {
-        out << type_name(tstruct);
-      }
-      out << " set" << cap_name << "(byte[] " << field_name << ") {" << endl;
-      indent(out) << "  this." << field_name << " = " << field_name << " == null ? (java.nio.ByteBuffer)null"
-                  << " : java.nio.ByteBuffer.wrap(" << field_name << ".clone());" << endl;
-      if (!bean_style_) {
-        indent(out) << "  return this;" << endl;
-      }
-      indent(out) << "}" << endl << endl;
-    }
-    if (is_deprecated) {
-      indent(out) << "@Deprecated" << endl;
-    }
-    indent(out) << "public ";
-    if (bean_style_) {
-      out << "void";
-    } else {
-      out << type_name(tstruct);
-    }
-    out << " set" << cap_name << "(" << type_name(type) << " " << field_name << ") {" << endl;
-    indent_up();
-    indent(out) << "this." << field_name << " = ";
-    if (type->is_base_type() && ((t_base_type*)type)->is_binary()) {
-      out << "org.apache.thrift.TBaseHelper.copyBinary(" << field_name << ")";
-    } else {
-      out << field_name;
-    }
-    out << ";" << endl;
-    generate_isset_set(out, field, "");
-    if (!bean_style_) {
-      indent(out) << "return this;" << endl;
-    }
-
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // Unsetter
-    if (is_deprecated) {
-      indent(out) << "@Deprecated" << endl;
-    }
-    indent(out) << "public void unset" << cap_name << "() {" << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "this." << field_name << " = null;" << endl;
-    } else if (issetType == ISSET_PRIMITIVE) {
-      indent(out) << "__isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, "
-                  << isset_field_id(field) << ");" << endl;
-    } else {
-      indent(out) << "__isset_bit_vector.clear(" << isset_field_id(field) << ");" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // isSet method
-    indent(out) << "/** Returns true if field " << field_name
-                << " is set (has been assigned a value) and false otherwise */" << endl;
-    if (is_deprecated) {
-      indent(out) << "@Deprecated" << endl;
-    }
-    indent(out) << "public boolean is" << get_cap_name("set") << cap_name << "() {" << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "return this." << field_name << " != null;" << endl;
-    } else if (issetType == ISSET_PRIMITIVE) {
-      indent(out) << "return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, " << isset_field_id(field)
-                  << ");" << endl;
-    } else {
-      indent(out) << "return __isset_bit_vector.get(" << isset_field_id(field) << ");" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    if (is_deprecated) {
-      indent(out) << "@Deprecated" << endl;
-    }
-    indent(out) << "public void set" << cap_name << get_cap_name("isSet") << "(boolean value) {"
-                << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "if (!value) {" << endl;
-      indent(out) << "  this." << field_name << " = null;" << endl;
-      indent(out) << "}" << endl;
-    } else if (issetType == ISSET_PRIMITIVE) {
-      indent(out) << "__isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, "
-                  << isset_field_id(field) << ", value);" << endl;
-    } else {
-      indent(out) << "__isset_bit_vector.set(" << isset_field_id(field) << ", value);" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-}
-
-/**
- * Generates a toString() method for the given struct
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_struct_tostring(ofstream& out, t_struct* tstruct) {
-  out << indent() << "@Override" << endl << indent() << "public java.lang.String toString() {" << endl;
-  indent_up();
-
-  out << indent() << "java.lang.StringBuilder sb = new java.lang.StringBuilder(\"" << tstruct->get_name() << "(\");"
-      << endl;
-  out << indent() << "boolean first = true;" << endl << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool could_be_unset = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (could_be_unset) {
-      indent(out) << "if (" << generate_isset_check(*f_iter) << ") {" << endl;
-      indent_up();
-    }
-
-    t_field* field = (*f_iter);
-
-    if (!first) {
-      indent(out) << "if (!first) sb.append(\", \");" << endl;
-    }
-    indent(out) << "sb.append(\"" << (*f_iter)->get_name() << ":\");" << endl;
-    bool can_be_null = type_can_be_null(field->get_type());
-    if (can_be_null) {
-      indent(out) << "if (this." << (*f_iter)->get_name() << " == null) {" << endl;
-      indent(out) << "  sb.append(\"null\");" << endl;
-      indent(out) << "} else {" << endl;
-      indent_up();
-    }
-
-    if (get_true_type(field->get_type())->is_base_type()
-        && ((t_base_type*)(get_true_type(field->get_type())))->is_binary()) {
-      indent(out) << "org.apache.thrift.TBaseHelper.toString(this." << field->get_name() << ", sb);"
-                  << endl;
-    } else if ((field->get_type()->is_set())
-               && (get_true_type(((t_set*)field->get_type())->get_elem_type())->is_base_type())
-               && (((t_base_type*)get_true_type(((t_set*)field->get_type())->get_elem_type()))
-                       ->is_binary())) {
-      indent(out) << "org.apache.thrift.TBaseHelper.toString(this." << field->get_name() << ", sb);"
-                  << endl;
-    } else if ((field->get_type()->is_list())
-               && (get_true_type(((t_list*)field->get_type())->get_elem_type())->is_base_type())
-               && (((t_base_type*)get_true_type(((t_list*)field->get_type())->get_elem_type()))
-                       ->is_binary())) {
-      indent(out) << "org.apache.thrift.TBaseHelper.toString(this." << field->get_name() << ", sb);"
-                  << endl;
-    } else {
-      indent(out) << "sb.append(this." << (*f_iter)->get_name() << ");" << endl;
-    }
-
-    if (can_be_null) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    indent(out) << "first = false;" << endl;
-
-    if (could_be_unset) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    first = false;
-  }
-  out << indent() << "sb.append(\")\");" << endl << indent() << "return sb.toString();" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a static map with meta data to store information such as fieldID to
- * fieldName mapping
- *
- * @param tstruct The struct definition
- */
-void t_java_generator::generate_java_meta_data_map(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Static Map with fieldID -> org.apache.thrift.meta_data.FieldMetaData mappings
-  indent(out)
-      << "public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;"
-      << endl;
-  indent(out) << "static {" << endl;
-  indent_up();
-
-  indent(out) << "java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new "
-                 "java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);"
-              << endl;
-
-  // Populate map
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    std::string field_name = field->get_name();
-    indent(out) << "tmpMap.put(_Fields." << constant_name(field_name)
-                << ", new org.apache.thrift.meta_data.FieldMetaData(\"" << field_name << "\", ";
-
-    // Set field requirement type (required, optional, etc.)
-    if (field->get_req() == t_field::T_REQUIRED) {
-      out << "org.apache.thrift.TFieldRequirementType.REQUIRED, ";
-    } else if (field->get_req() == t_field::T_OPTIONAL) {
-      out << "org.apache.thrift.TFieldRequirementType.OPTIONAL, ";
-    } else {
-      out << "org.apache.thrift.TFieldRequirementType.DEFAULT, ";
-    }
-
-    // Create value meta data
-    generate_field_value_meta_data(out, field->get_type());
-    out << "));" << endl;
-  }
-
-  indent(out) << "metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);" << endl;
-
-  indent(out) << "org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap("
-              << type_name(tstruct) << ".class, metaDataMap);" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Returns a string with the java representation of the given thrift type
- * (e.g. for the type struct it returns "org.apache.thrift.protocol.TType.STRUCT")
- */
-std::string t_java_generator::get_java_type_string(t_type* type) {
-  if (type->is_list()) {
-    return "org.apache.thrift.protocol.TType.LIST";
-  } else if (type->is_map()) {
-    return "org.apache.thrift.protocol.TType.MAP";
-  } else if (type->is_set()) {
-    return "org.apache.thrift.protocol.TType.SET";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "org.apache.thrift.protocol.TType.STRUCT";
-  } else if (type->is_enum()) {
-    return "org.apache.thrift.protocol.TType.ENUM";
-  } else if (type->is_typedef()) {
-    return get_java_type_string(((t_typedef*)type)->get_type());
-  } else if (type->is_base_type()) {
-    switch (((t_base_type*)type)->get_base()) {
-    case t_base_type::TYPE_VOID:
-      return "org.apache.thrift.protocol.TType.VOID";
-      break;
-    case t_base_type::TYPE_STRING:
-      return "org.apache.thrift.protocol.TType.STRING";
-      break;
-    case t_base_type::TYPE_BOOL:
-      return "org.apache.thrift.protocol.TType.BOOL";
-      break;
-    case t_base_type::TYPE_I8:
-      return "org.apache.thrift.protocol.TType.BYTE";
-      break;
-    case t_base_type::TYPE_I16:
-      return "org.apache.thrift.protocol.TType.I16";
-      break;
-    case t_base_type::TYPE_I32:
-      return "org.apache.thrift.protocol.TType.I32";
-      break;
-    case t_base_type::TYPE_I64:
-      return "org.apache.thrift.protocol.TType.I64";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      return "org.apache.thrift.protocol.TType.DOUBLE";
-      break;
-    default:
-      throw std::runtime_error("Unknown thrift type \"" + type->get_name()
-                               + "\" passed to t_java_generator::get_java_type_string!");
-      return "Unknown thrift type \"" + type->get_name()
-             + "\" passed to t_java_generator::get_java_type_string!";
-      break; // This should never happen!
-    }
-  } else {
-    throw std::runtime_error("Unknown thrift type \"" + type->get_name()
-                             + "\" passed to t_java_generator::get_java_type_string!");
-    return "Unknown thrift type \"" + type->get_name()
-           + "\" passed to t_java_generator::get_java_type_string!";
-    // This should never happen!
-  }
-}
-
-void t_java_generator::generate_field_value_meta_data(std::ofstream& out, t_type* type) {
-  out << endl;
-  indent_up();
-  indent_up();
-  if (type->is_struct() || type->is_xception()) {
-    indent(out) << "new "
-                   "org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType."
-                   "STRUCT, " << type_name(type) << ".class";
-  } else if (type->is_container()) {
-    if (type->is_list()) {
-      indent(out)
-          << "new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, ";
-      t_type* elem_type = ((t_list*)type)->get_elem_type();
-      generate_field_value_meta_data(out, elem_type);
-    } else if (type->is_set()) {
-      indent(out)
-          << "new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, ";
-      t_type* elem_type = ((t_list*)type)->get_elem_type();
-      generate_field_value_meta_data(out, elem_type);
-    } else { // map
-      indent(out)
-          << "new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, ";
-      t_type* key_type = ((t_map*)type)->get_key_type();
-      t_type* val_type = ((t_map*)type)->get_val_type();
-      generate_field_value_meta_data(out, key_type);
-      out << ", ";
-      generate_field_value_meta_data(out, val_type);
-    }
-  } else if (type->is_enum()) {
-    indent(out)
-        << "new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, "
-        << type_name(type) << ".class";
-  } else {
-    indent(out) << "new org.apache.thrift.meta_data.FieldValueMetaData("
-                << get_java_type_string(type);
-    if (type->is_typedef()) {
-      indent(out) << ", \"" << ((t_typedef*)type)->get_symbolic() << "\"";
-    } else if (((t_base_type*)type)->is_binary()) {
-      indent(out) << ", true";
-    }
-  }
-  out << ")";
-  indent_down();
-  indent_down();
-}
-
-/**
- * Generates a thrift service. In C++, this comprises an entirely separate
- * header and source file. The header file defines the methods and includes
- * the data types defined in the main header file, and the implementation
- * file contains implementations of the basic printer and default interfaces.
- *
- * @param tservice The service definition
- */
-void t_java_generator::generate_service(t_service* tservice) {
-  // Make output file
-  string f_service_name = package_dir_ + "/" + make_valid_java_filename(service_name_) + ".java";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << java_package() << java_suppressions();
-
-  if (!suppress_generated_annotations_) {
-    generate_javax_generated_annotation(f_service_);
-  }
-  f_service_ << "public class " << service_name_ << " {" << endl << endl;
-  indent_up();
-
-  // Generate the three main parts of the service
-  generate_service_interface(tservice);
-  generate_service_async_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_async_client(tservice);
-  generate_service_server(tservice);
-  generate_service_async_server(tservice);
-  generate_service_helpers(tservice);
-
-  indent_down();
-  f_service_ << "}" << endl;
-  f_service_.close();
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_java_generator::generate_service_interface(t_service* tservice) {
-  string extends = "";
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_iface = " extends " + extends + ".Iface";
-  }
-
-  generate_java_doc(f_service_, tservice);
-  f_service_ << indent() << "public interface Iface" << extends_iface << " {" << endl << endl;
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_java_doc(f_service_, *f_iter);
-    indent(f_service_) << "public " << function_signature(*f_iter) << ";" << endl << endl;
-  }
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-void t_java_generator::generate_service_async_interface(t_service* tservice) {
-  string extends = "";
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_iface = " extends " + extends + " .AsyncIface";
-  }
-
-  f_service_ << indent() << "public interface AsyncIface" << extends_iface << " {" << endl << endl;
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    indent(f_service_) << "public " << function_signature_async(*f_iter, true)
-                       << " throws org.apache.thrift.TException;" << endl << endl;
-  }
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates structs for all the service args and return types
- *
- * @param tservice The service
- */
-void t_java_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_java_struct_definition(f_service_, ts, false, true);
-    generate_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_java_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() == NULL) {
-    extends_client = "org.apache.thrift.TServiceClient";
-  } else {
-    extends = type_name(tservice->get_extends());
-    extends_client = extends + ".Client";
-  }
-
-  indent(f_service_) << "public static class Client extends " << extends_client
-                     << " implements Iface {" << endl;
-  indent_up();
-
-  indent(f_service_)
-      << "public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {"
-      << endl;
-  indent_up();
-  indent(f_service_) << "public Factory() {}" << endl;
-  indent(f_service_) << "public Client getClient(org.apache.thrift.protocol.TProtocol prot) {"
-                     << endl;
-  indent_up();
-  indent(f_service_) << "return new Client(prot);" << endl;
-  indent_down();
-  indent(f_service_) << "}" << endl;
-  indent(f_service_) << "public Client getClient(org.apache.thrift.protocol.TProtocol iprot, "
-                        "org.apache.thrift.protocol.TProtocol oprot) {" << endl;
-  indent_up();
-  indent(f_service_) << "return new Client(iprot, oprot);" << endl;
-  indent_down();
-  indent(f_service_) << "}" << endl;
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "public Client(org.apache.thrift.protocol.TProtocol prot)" << endl;
-  scope_up(f_service_);
-  indent(f_service_) << "super(prot, prot);" << endl;
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  indent(f_service_) << "public Client(org.apache.thrift.protocol.TProtocol iprot, "
-                        "org.apache.thrift.protocol.TProtocol oprot) {" << endl;
-  indent(f_service_) << "  super(iprot, oprot);" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-    string sep = "_";
-    string javaname = funname;
-    if (fullcamel_style_) {
-      sep = "";
-      javaname = as_camel_case(funname);
-    }
-
-    // Open function
-    indent(f_service_) << "public " << function_signature(*f_iter) << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "send" << sep << javaname << "(";
-
-    // Get the struct of function call params
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-
-    // Declare the function arguments
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    bool first = true;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << (*fld_iter)->get_name();
-    }
-    f_service_ << ");" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_service_ << indent();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << "return ";
-      }
-      f_service_ << "recv" << sep << javaname << "();" << endl;
-    }
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    t_function send_function(g_type_void,
-                             string("send") + sep + javaname,
-                             (*f_iter)->get_arglist());
-
-    string argsname = (*f_iter)->get_name() + "_args";
-
-    // Open function
-    indent(f_service_) << "public " << function_signature(&send_function) << endl;
-    scope_up(f_service_);
-
-    // Serialize the request
-    indent(f_service_) << argsname << " args = new " << argsname << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      indent(f_service_) << "args.set" << get_cap_name((*fld_iter)->get_name()) << "("
-                         << (*fld_iter)->get_name() << ");" << endl;
-    }
-
-    const string sendBaseName = (*f_iter)->is_oneway() ? "sendBaseOneway" : "sendBase";
-    indent(f_service_) << sendBaseName << "(\"" << funname << "\", args);" << endl;
-
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      string resultname = (*f_iter)->get_name() + "_result";
-
-      t_struct noargs(program_);
-      t_function recv_function((*f_iter)->get_returntype(),
-                               string("recv") + sep + javaname,
-                               &noargs,
-                               (*f_iter)->get_xceptions());
-      // Open function
-      indent(f_service_) << "public " << function_signature(&recv_function) << endl;
-      scope_up(f_service_);
-
-      f_service_ << indent() << resultname << " result = new " << resultname << "();" << endl
-                 << indent() << "receiveBase(result, \"" << funname << "\");" << endl;
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << indent() << "if (result." << generate_isset_check("success") << ") {" << endl
-                   << indent() << "  return result.success;" << endl << indent() << "}" << endl;
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "if (result." << (*x_iter)->get_name() << " != null) {" << endl
-                   << indent() << "  throw result." << (*x_iter)->get_name() << ";" << endl
-                   << indent() << "}" << endl;
-      }
-
-      // If you get here it's an exception, unless a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "return;" << endl;
-      } else {
-        f_service_ << indent() << "throw new "
-                                  "org.apache.thrift.TApplicationException(org.apache.thrift."
-                                  "TApplicationException.MISSING_RESULT, \""
-                   << (*f_iter)->get_name() << " failed: unknown result\");" << endl;
-      }
-
-      // Close function
-      scope_down(f_service_);
-      f_service_ << endl;
-    }
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl;
-}
-
-void t_java_generator::generate_service_async_client(t_service* tservice) {
-  string extends = "org.apache.thrift.async.TAsyncClient";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends()) + ".AsyncClient";
-  }
-
-  indent(f_service_) << "public static class AsyncClient extends " << extends
-                     << " implements AsyncIface {" << endl;
-  indent_up();
-
-  // Factory method
-  indent(f_service_) << "public static class Factory implements "
-                        "org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {" << endl;
-  indent(f_service_) << "  private org.apache.thrift.async.TAsyncClientManager clientManager;"
-                     << endl;
-  indent(f_service_) << "  private org.apache.thrift.protocol.TProtocolFactory protocolFactory;"
-                     << endl;
-  indent(f_service_) << "  public Factory(org.apache.thrift.async.TAsyncClientManager "
-                        "clientManager, org.apache.thrift.protocol.TProtocolFactory "
-                        "protocolFactory) {" << endl;
-  indent(f_service_) << "    this.clientManager = clientManager;" << endl;
-  indent(f_service_) << "    this.protocolFactory = protocolFactory;" << endl;
-  indent(f_service_) << "  }" << endl;
-  indent(f_service_) << "  public AsyncClient "
-                        "getAsyncClient(org.apache.thrift.transport.TNonblockingTransport "
-                        "transport) {" << endl;
-  indent(f_service_) << "    return new AsyncClient(protocolFactory, clientManager, transport);"
-                     << endl;
-  indent(f_service_) << "  }" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "public AsyncClient(org.apache.thrift.protocol.TProtocolFactory "
-                        "protocolFactory, org.apache.thrift.async.TAsyncClientManager "
-                        "clientManager, org.apache.thrift.transport.TNonblockingTransport "
-                        "transport) {" << endl;
-  indent(f_service_) << "  super(protocolFactory, clientManager, transport);" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-    string sep = "_";
-    string javaname = funname;
-    if (fullcamel_style_) {
-      sep = "";
-      javaname = as_camel_case(javaname);
-    }
-    t_type* ret_type = (*f_iter)->get_returntype();
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    string funclassname = funname + "_call";
-    const vector<t_field*>& fields = arg_struct->get_members();
-    const std::vector<t_field*>& xceptions = (*f_iter)->get_xceptions()->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string args_name = (*f_iter)->get_name() + "_args";
-    string result_name = (*f_iter)->get_name() + "_result";
-
-    // Main method body
-    indent(f_service_) << "public " << function_signature_async(*f_iter, false)
-                       << " throws org.apache.thrift.TException {" << endl;
-    indent(f_service_) << "  checkReady();" << endl;
-    indent(f_service_) << "  " << funclassname << " method_call = new " + funclassname + "("
-                       << async_argument_list(*f_iter, arg_struct, ret_type)
-                       << ", this, ___protocolFactory, ___transport);" << endl;
-    indent(f_service_) << "  this.___currentMethod = method_call;" << endl;
-    indent(f_service_) << "  ___manager.call(method_call);" << endl;
-    indent(f_service_) << "}" << endl;
-
-    f_service_ << endl;
-
-    // TAsyncMethod object for this function call
-    indent(f_service_) << "public static class " + funclassname
-                          + " extends org.apache.thrift.async.TAsyncMethodCall<"
-                          + type_name((*f_iter)->get_returntype(), true) + "> {" << endl;
-    indent_up();
-
-    // Member variables
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      indent(f_service_) << "private " + type_name((*fld_iter)->get_type()) + " "
-                            + (*fld_iter)->get_name() + ";" << endl;
-    }
-
-    // NOTE since we use a new Client instance to deserialize, let's keep seqid to 0 for now
-    // indent(f_service_) << "private int seqid;" << endl << endl;
-
-    // Constructor
-    indent(f_service_) << "public " + funclassname + "("
-                          + async_argument_list(*f_iter, arg_struct, ret_type, true)
-                       << ", org.apache.thrift.async.TAsyncClient client, "
-                          "org.apache.thrift.protocol.TProtocolFactory protocolFactory, "
-                          "org.apache.thrift.transport.TNonblockingTransport transport) throws "
-                          "org.apache.thrift.TException {" << endl;
-    indent(f_service_) << "  super(client, protocolFactory, transport, resultHandler, "
-                       << ((*f_iter)->is_oneway() ? "true" : "false") << ");" << endl;
-
-    // Assign member variables
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      indent(f_service_) << "  this." + (*fld_iter)->get_name() + " = " + (*fld_iter)->get_name()
-                            + ";" << endl;
-    }
-
-    indent(f_service_) << "}" << endl << endl;
-
-    indent(f_service_) << "public void write_args(org.apache.thrift.protocol.TProtocol prot) "
-                          "throws org.apache.thrift.TException {" << endl;
-    indent_up();
-
-    // Serialize request
-    // NOTE we are leaving seqid as 0, for now (see above)
-    f_service_ << indent() << "prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage(\""
-               << funname << "\", org.apache.thrift.protocol."
-               << ((*f_iter)->is_oneway() ? "TMessageType.ONEWAY" : "TMessageType.CALL") << ", 0));"
-               << endl << indent() << args_name << " args = new " << args_name << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "args.set" << get_cap_name((*fld_iter)->get_name()) << "("
-                 << (*fld_iter)->get_name() << ");" << endl;
-    }
-
-    f_service_ << indent() << "args.write(prot);" << endl << indent() << "prot.writeMessageEnd();"
-               << endl;
-
-    indent_down();
-    indent(f_service_) << "}" << endl << endl;
-
-    // Return method
-    indent(f_service_) << "public " + type_name(ret_type, true) + " getResult() throws ";
-    vector<t_field*>::const_iterator x_iter;
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << type_name((*x_iter)->get_type(), false, false) + ", ";
-    }
-    f_service_ << "org.apache.thrift.TException {" << endl;
-
-    indent_up();
-    f_service_
-        << indent()
-        << "if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {"
-        << endl << indent() << "  throw new java.lang.IllegalStateException(\"Method call not finished!\");"
-        << endl << indent() << "}" << endl << indent()
-        << "org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new "
-           "org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());" << endl
-        << indent() << "org.apache.thrift.protocol.TProtocol prot = "
-                       "client.getProtocolFactory().getProtocol(memoryTransport);" << endl;
-    indent(f_service_);
-    if (ret_type->is_void()) { // NB: Includes oneways which always return void.
-      f_service_ << "return null;" << endl;
-    } else {
-      f_service_ << "return (new Client(prot)).recv" + sep + javaname + "();" << endl;
-    }
-
-    // Close function
-    indent_down();
-    indent(f_service_) << "}" << endl;
-
-    // Close class
-    indent_down();
-    indent(f_service_) << "}" << endl << endl;
-  }
-
-  // Close AsyncClient
-  scope_down(f_service_);
-  f_service_ << endl;
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_java_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  // Extends stuff
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() == NULL) {
-    extends_processor = "org.apache.thrift.TBaseProcessor<I>";
-  } else {
-    extends = type_name(tservice->get_extends());
-    extends_processor = extends + ".Processor<I>";
-  }
-
-  // Generate the header portion
-  indent(f_service_) << "public static class Processor<I extends Iface> extends "
-                     << extends_processor << " implements org.apache.thrift.TProcessor {" << endl;
-  indent_up();
-
-  indent(f_service_)
-      << "private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());"
-      << endl;
-
-  indent(f_service_) << "public Processor(I iface) {" << endl;
-  indent(f_service_) << "  super(iface, getProcessMap(new java.util.HashMap<java.lang.String, "
-                        "org.apache.thrift.ProcessFunction<I, ? extends "
-                        "org.apache.thrift.TBase>>()));" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "protected Processor(I iface, java.util.Map<java.lang.String, "
-                        "org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> "
-                        "processMap) {" << endl;
-  indent(f_service_) << "  super(iface, getProcessMap(processMap));" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "private static <I extends Iface> java.util.Map<java.lang.String,  "
-                        "org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> "
-                        "getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends "
-                        " org.apache.thrift.TBase>> processMap) {" << endl;
-  indent_up();
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    indent(f_service_) << "processMap.put(\"" << (*f_iter)->get_name() << "\", new "
-                       << (*f_iter)->get_name() << "());" << endl;
-  }
-  indent(f_service_) << "return processMap;" << endl;
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_java_generator::generate_service_async_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  // Extends stuff
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() == NULL) {
-    extends_processor = "org.apache.thrift.TBaseAsyncProcessor<I>";
-  } else {
-    extends = type_name(tservice->get_extends());
-    extends_processor = extends + ".AsyncProcessor<I>";
-  }
-
-  // Generate the header portion
-  indent(f_service_) << "public static class AsyncProcessor<I extends AsyncIface> extends "
-                     << extends_processor << " {" << endl;
-  indent_up();
-
-  indent(f_service_) << "private static final org.slf4j.Logger _LOGGER = "
-                        "org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());" << endl;
-
-  indent(f_service_) << "public AsyncProcessor(I iface) {" << endl;
-  indent(f_service_) << "  super(iface, getProcessMap(new java.util.HashMap<java.lang.String, "
-                        "org.apache.thrift.AsyncProcessFunction<I, ? extends "
-                        "org.apache.thrift.TBase, ?>>()));" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  "
-                        "org.apache.thrift.AsyncProcessFunction<I, ? extends  "
-                        "org.apache.thrift.TBase, ?>> processMap) {" << endl;
-  indent(f_service_) << "  super(iface, getProcessMap(processMap));" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "private static <I extends AsyncIface> java.util.Map<java.lang.String,  "
-                        "org.apache.thrift.AsyncProcessFunction<I, ? extends  "
-                        "org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  "
-                        "org.apache.thrift.AsyncProcessFunction<I, ? extends  "
-                        "org.apache.thrift.TBase, ?>> processMap) {" << endl;
-  indent_up();
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    indent(f_service_) << "processMap.put(\"" << (*f_iter)->get_name() << "\", new "
-                       << (*f_iter)->get_name() << "());" << endl;
-  }
-  indent(f_service_) << "return processMap;" << endl;
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_async_function(tservice, *f_iter);
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_java_generator::generate_function_helpers(t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  t_struct result(program_, tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_java_struct_definition(f_service_, &result, false, true, true);
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_java_generator::generate_process_async_function(t_service* tservice, t_function* tfunction) {
-  string argsname = tfunction->get_name() + "_args";
-
-  string resultname = tfunction->get_name() + "_result";
-  if (tfunction->is_oneway()) {
-    resultname = "org.apache.thrift.TBase";
-  }
-
-  string resulttype = type_name(tfunction->get_returntype(), true);
-
-  (void)tservice;
-  // Open class
-  indent(f_service_) << "public static class " << tfunction->get_name()
-                     << "<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, "
-                     << argsname << ", " << resulttype << "> {" << endl;
-  indent_up();
-
-  indent(f_service_) << "public " << tfunction->get_name() << "() {" << endl;
-  indent(f_service_) << "  super(\"" << tfunction->get_name() << "\");" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "public " << argsname << " getEmptyArgsInstance() {" << endl;
-  indent(f_service_) << "  return new " << argsname << "();" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "public org.apache.thrift.async.AsyncMethodCallback<" << resulttype
-                     << "> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {" << endl;
-  indent_up();
-  indent(f_service_) << "final org.apache.thrift.AsyncProcessFunction fcall = this;" << endl;
-  indent(f_service_) << "return new org.apache.thrift.async.AsyncMethodCallback<" << resulttype
-                     << ">() { " << endl;
-  indent_up();
-  indent(f_service_) << "public void onComplete(" << resulttype << " o) {" << endl;
-
-  indent_up();
-  if (!tfunction->is_oneway()) {
-    indent(f_service_) << resultname << " result = new " << resultname << "();" << endl;
-
-    if (!tfunction->get_returntype()->is_void()) {
-      indent(f_service_) << "result.success = o;" << endl;
-      // Set isset on success field
-      if (!type_can_be_null(tfunction->get_returntype())) {
-        indent(f_service_) << "result.set" << get_cap_name("success") << get_cap_name("isSet")
-                           << "(true);" << endl;
-      }
-    }
-
-    indent(f_service_) << "try {" << endl;
-    indent(f_service_)
-        << "  fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);"
-        << endl;
-    indent(f_service_) << "} catch (org.apache.thrift.transport.TTransportException e) {" << endl;
-    indent_up();
-    f_service_ << indent()
-               << "_LOGGER.error(\"TTransportException writing to internal frame buffer\", e);"
-               << endl
-               << indent() << "fb.close();" << endl;
-    indent_down();
-    indent(f_service_) << "} catch (java.lang.Exception e) {" << endl;
-    indent_up();
-    f_service_ << indent() << "_LOGGER.error(\"Exception writing to internal frame buffer\", e);"
-               << endl
-               << indent() << "onError(e);" << endl;
-    indent_down();
-    indent(f_service_) << "}" << endl;
-  }
-  indent_down();
-  indent(f_service_) << "}" << endl;
-
-  indent(f_service_) << "public void onError(java.lang.Exception e) {" << endl;
-  indent_up();
-
-  if (tfunction->is_oneway()) {
-    indent(f_service_) << "if (e instanceof org.apache.thrift.transport.TTransportException) {"
-                       << endl;
-    indent_up();
-
-    f_service_ << indent() << "_LOGGER.error(\"TTransportException inside handler\", e);" << endl
-               << indent() << "fb.close();" << endl;
-
-    indent_down();
-    indent(f_service_) << "} else {" << endl;
-    indent_up();
-
-    f_service_ << indent() << "_LOGGER.error(\"Exception inside oneway handler\", e);" << endl;
-
-    indent_down();
-    indent(f_service_) << "}" << endl;
-  } else {
-    indent(f_service_) << "byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;" << endl;
-    indent(f_service_) << "org.apache.thrift.TSerializable msg;" << endl;
-    indent(f_service_) << resultname << " result = new " << resultname << "();" << endl;
-
-    t_struct* xs = tfunction->get_xceptions();
-    const std::vector<t_field*>& xceptions = xs->get_members();
-
-    vector<t_field*>::const_iterator x_iter;
-    if (xceptions.size() > 0) {
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        if (x_iter == xceptions.begin())
-          f_service_ << indent();
-        string type = type_name((*x_iter)->get_type(), false, false);
-        string name = (*x_iter)->get_name();
-        f_service_ << "if (e instanceof " << type << ") {" << endl;
-        indent_up();
-        f_service_ << indent() << "result." << name << " = (" << type << ") e;" << endl
-                   << indent() << "result.set" << get_cap_name(name) << get_cap_name("isSet")
-                   << "(true);" << endl
-                   << indent() << "msg = result;" << endl;
-        indent_down();
-        indent(f_service_) << "} else ";
-      }
-    } else {
-      indent(f_service_);
-    }
-    f_service_ << "if (e instanceof org.apache.thrift.transport.TTransportException) {" << endl;
-    indent_up();
-    f_service_ << indent() << "_LOGGER.error(\"TTransportException inside handler\", e);" << endl
-               << indent() << "fb.close();" << endl
-               << indent() << "return;" << endl;
-    indent_down();
-    indent(f_service_) << "} else if (e instanceof org.apache.thrift.TApplicationException) {"
-                       << endl;
-    indent_up();
-    f_service_ << indent() << "_LOGGER.error(\"TApplicationException inside handler\", e);" << endl
-               << indent() << "msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;" << endl
-               << indent() << "msg = (org.apache.thrift.TApplicationException)e;" << endl;
-    indent_down();
-    indent(f_service_) << "} else {" << endl;
-    indent_up();
-    f_service_ << indent() << "_LOGGER.error(\"Exception inside handler\", e);" << endl
-               << indent() << "msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;" << endl
-               << indent() << "msg = new "
-                              "org.apache.thrift.TApplicationException(org.apache.thrift."
-                              "TApplicationException.INTERNAL_ERROR, e.getMessage());"
-               << endl;
-    indent_down();
-    f_service_ << indent() << "}" << endl
-               << indent() << "try {" << endl
-               << indent() << "  fcall.sendResponse(fb,msg,msgType,seqid);" << endl
-               << indent() << "} catch (java.lang.Exception ex) {" << endl
-               << indent() << "  _LOGGER.error(\"Exception writing to internal frame buffer\", ex);"
-               << endl
-               << indent() << "  fb.close();" << endl
-               << indent() << "}" << endl;
-  }
-  indent_down();
-  indent(f_service_) << "}" << endl;
-  indent_down();
-  indent(f_service_) << "};" << endl;
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "protected boolean isOneway() {" << endl;
-  indent(f_service_) << "  return " << ((tfunction->is_oneway()) ? "true" : "false") << ";" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "public void start(I iface, " << argsname
-                     << " args, org.apache.thrift.async.AsyncMethodCallback<" << resulttype
-                     << "> resultHandler) throws org.apache.thrift.TException {" << endl;
-  indent_up();
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  f_service_ << indent();
-
-  f_service_ << "iface." << get_rpc_method_name(tfunction->get_name()) << "(";
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_service_ << ", ";
-    }
-    f_service_ << "args." << (*f_iter)->get_name();
-  }
-  if (!first)
-    f_service_ << ",";
-  f_service_ << "resultHandler";
-  f_service_ << ");" << endl;
-
-  indent_down();
-  indent(f_service_) << "}";
-
-  // Close function
-  f_service_ << endl;
-
-  // Close class
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_java_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  string argsname = tfunction->get_name() + "_args";
-  string resultname = tfunction->get_name() + "_result";
-  if (tfunction->is_oneway()) {
-    resultname = "org.apache.thrift.TBase";
-  }
-
-  (void)tservice;
-  // Open class
-  indent(f_service_) << "public static class " << tfunction->get_name()
-                     << "<I extends Iface> extends org.apache.thrift.ProcessFunction<I, "
-                     << argsname << "> {" << endl;
-  indent_up();
-
-  indent(f_service_) << "public " << tfunction->get_name() << "() {" << endl;
-  indent(f_service_) << "  super(\"" << tfunction->get_name() << "\");" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "public " << argsname << " getEmptyArgsInstance() {" << endl;
-  indent(f_service_) << "  return new " << argsname << "();" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "protected boolean isOneway() {" << endl;
-  indent(f_service_) << "  return " << ((tfunction->is_oneway()) ? "true" : "false") << ";" << endl;
-  indent(f_service_) << "}" << endl << endl;
-
-  indent(f_service_) << "public " << resultname << " getResult(I iface, " << argsname
-                     << " args) throws org.apache.thrift.TException {" << endl;
-  indent_up();
-  if (!tfunction->is_oneway()) {
-    indent(f_service_) << resultname << " result = new " << resultname << "();" << endl;
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Try block for a function with exceptions
-  if (xceptions.size() > 0) {
-    f_service_ << indent() << "try {" << endl;
-    indent_up();
-  }
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  f_service_ << indent();
-
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_service_ << "result.success = ";
-  }
-  f_service_ << "iface." << get_rpc_method_name(tfunction->get_name()) << "(";
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_service_ << ", ";
-    }
-    f_service_ << "args." << (*f_iter)->get_name();
-  }
-  f_service_ << ");" << endl;
-
-  // Set isset on success field
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()
-      && !type_can_be_null(tfunction->get_returntype())) {
-    indent(f_service_) << "result.set" << get_cap_name("success") << get_cap_name("isSet")
-                       << "(true);" << endl;
-  }
-
-  if (!tfunction->is_oneway() && xceptions.size() > 0) {
-    indent_down();
-    f_service_ << indent() << "}";
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << " catch (" << type_name((*x_iter)->get_type(), false, false) << " "
-                 << (*x_iter)->get_name() << ") {" << endl;
-      if (!tfunction->is_oneway()) {
-        indent_up();
-        f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
-                   << (*x_iter)->get_name() << ";" << endl;
-        indent_down();
-        f_service_ << indent() << "}";
-      } else {
-        f_service_ << "}";
-      }
-    }
-    f_service_ << endl;
-  }
-
-  if (tfunction->is_oneway()) {
-    indent(f_service_) << "return null;" << endl;
-  } else {
-    indent(f_service_) << "return result;" << endl;
-  }
-  indent_down();
-  indent(f_service_) << "}";
-
-  // Close function
-  f_service_ << endl;
-
-  // Close class
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Deserializes a field of any type.
- *
- * @param tfield The field
- * @param prefix The variable name or container for this field
- */
-void t_java_generator::generate_deserialize_field(ofstream& out,
-                                                  t_field* tfield,
-                                                  string prefix,
-                                                  bool has_metadata) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name();
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name, has_metadata);
-  } else if (type->is_base_type()) {
-    indent(out) << name << " = iprot.";
-
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "compiler error: cannot serialize void field in a struct: " + name;
-      break;
-    case t_base_type::TYPE_STRING:
-      if (((t_base_type*)type)->is_binary()) {
-        out << "readBinary();";
-      } else {
-        out << "readString();";
-      }
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << "readBool();";
-      break;
-    case t_base_type::TYPE_I8:
-      out << "readByte();";
-      break;
-    case t_base_type::TYPE_I16:
-      out << "readI16();";
-      break;
-    case t_base_type::TYPE_I32:
-      out << "readI32();";
-      break;
-    case t_base_type::TYPE_I64:
-      out << "readI64();";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      out << "readDouble();";
-      break;
-    default:
-      throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
-    }
-    out << endl;
-  } else if (type->is_enum()) {
-    indent(out) << name << " = "
-                << type_name(tfield->get_type(), true, false, false, true)
-                   + ".findByValue(iprot.readI32());" << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a struct, invokes read()
- */
-void t_java_generator::generate_deserialize_struct(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   string prefix) {
-
-  if (reuse_objects_) {
-    indent(out) << "if (" << prefix << " == null) {" << endl;
-    indent_up();
-  }
-  indent(out) << prefix << " = new " << type_name(tstruct) << "();" << endl;
-  if (reuse_objects_) {
-    indent_down();
-    indent(out) << "}" << endl;
-  }
-  indent(out) << prefix << ".read(iprot);" << endl;
-}
-
-/**
- * Deserializes a container by reading its size and then iterating
- */
-void t_java_generator::generate_deserialize_container(ofstream& out,
-                                                      t_type* ttype,
-                                                      string prefix,
-                                                      bool has_metadata) {
-
-  scope_up(out);
-
-  string obj;
-
-  if (ttype->is_map()) {
-    obj = tmp("_map");
-  } else if (ttype->is_set()) {
-    obj = tmp("_set");
-  } else if (ttype->is_list()) {
-    obj = tmp("_list");
-  }
-
-  if (has_metadata) {
-    // Declare variables, read header
-    if (ttype->is_map()) {
-      indent(out) << "org.apache.thrift.protocol.TMap " << obj << " = iprot.readMapBegin();"
-                  << endl;
-    } else if (ttype->is_set()) {
-      indent(out) << "org.apache.thrift.protocol.TSet " << obj << " = iprot.readSetBegin();"
-                  << endl;
-    } else if (ttype->is_list()) {
-      indent(out) << "org.apache.thrift.protocol.TList " << obj << " = iprot.readListBegin();"
-                  << endl;
-    }
-  } else {
-    // Declare variables, read header
-    if (ttype->is_map()) {
-      indent(out) << "org.apache.thrift.protocol.TMap " << obj
-                  << " = new org.apache.thrift.protocol.TMap("
-                  << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
-                  << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
-                  << "iprot.readI32());" << endl;
-    } else if (ttype->is_set()) {
-      indent(out) << "org.apache.thrift.protocol.TSet " << obj
-                  << " = new org.apache.thrift.protocol.TSet("
-                  << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", iprot.readI32());"
-                  << endl;
-    } else if (ttype->is_list()) {
-      indent(out) << "org.apache.thrift.protocol.TList " << obj
-                  << " = new org.apache.thrift.protocol.TList("
-                  << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", iprot.readI32());"
-                  << endl;
-    }
-  }
-
-  if (reuse_objects_) {
-    indent(out) << "if (" << prefix << " == null) {" << endl;
-    indent_up();
-  }
-
-  out << indent() << prefix << " = new " << type_name(ttype, false, true);
-
-  // size the collection correctly
-  if (sorted_containers_ && (ttype->is_map() || ttype->is_set())) {
-    // TreeSet and TreeMap don't have any constructor which takes a capactity as an argument
-    out << "();" << endl;
-  } else {
-    out << "(" << (ttype->is_list() ? "" : "2*") << obj << ".size"
-        << ");" << endl;
-  }
-
-  if (reuse_objects_) {
-    indent_down();
-    indent(out) << "}" << endl;
-  }
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix, obj, has_metadata);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix, obj, has_metadata);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix, obj, has_metadata);
-  }
-
-  scope_down(out);
-
-  if (has_metadata) {
-    // Read container end
-    if (ttype->is_map()) {
-      indent(out) << "iprot.readMapEnd();" << endl;
-    } else if (ttype->is_set()) {
-      indent(out) << "iprot.readSetEnd();" << endl;
-    } else if (ttype->is_list()) {
-      indent(out) << "iprot.readListEnd();" << endl;
-    }
-  }
-  scope_down(out);
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_java_generator::generate_deserialize_map_element(ofstream& out,
-                                                        t_map* tmap,
-                                                        string prefix,
-                                                        string obj,
-                                                        bool has_metadata) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey, reuse_objects_, false) << endl;
-  indent(out) << declare_field(&fval, reuse_objects_, false) << endl;
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for (int " << i << " = 0; " << i << " < " << obj << ".size"
-              << "; "
-              << "++" << i << ")" << endl;
-
-  scope_up(out);
-
-  generate_deserialize_field(out, &fkey, "", has_metadata);
-  generate_deserialize_field(out, &fval, "", has_metadata);
-
-  indent(out) << prefix << ".put(" << key << ", " << val << ");" << endl;
-
-  if (reuse_objects_ && !get_true_type(fkey.get_type())->is_base_type()) {
-    indent(out) << key << " = null;" << endl;
-  }
-
-  if (reuse_objects_ && !get_true_type(fval.get_type())->is_base_type()) {
-    indent(out) << val << " = null;" << endl;
-  }
-}
-
-/**
- * Deserializes a set element
- */
-void t_java_generator::generate_deserialize_set_element(ofstream& out,
-                                                        t_set* tset,
-                                                        string prefix,
-                                                        string obj,
-                                                        bool has_metadata) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem, reuse_objects_, false) << endl;
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for (int " << i << " = 0; " << i << " < " << obj << ".size"
-              << "; "
-              << "++" << i << ")" << endl;
-  scope_up(out);
-
-  generate_deserialize_field(out, &felem, "", has_metadata);
-
-  indent(out) << prefix << ".add(" << elem << ");" << endl;
-
-  if (reuse_objects_ && !get_true_type(felem.get_type())->is_base_type()) {
-    indent(out) << elem << " = null;" << endl;
-  }
-}
-
-/**
- * Deserializes a list element
- */
-void t_java_generator::generate_deserialize_list_element(ofstream& out,
-                                                         t_list* tlist,
-                                                         string prefix,
-                                                         string obj,
-                                                         bool has_metadata) {
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem, reuse_objects_, false) << endl;
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for (int " << i << " = 0; " << i << " < " << obj << ".size"
-              << "; "
-              << "++" << i << ")" << endl;
-  scope_up(out);
-
-  generate_deserialize_field(out, &felem, "", has_metadata);
-
-  indent(out) << prefix << ".add(" << elem << ");" << endl;
-
-  if (reuse_objects_ && !get_true_type(felem.get_type())->is_base_type()) {
-    indent(out) << elem << " = null;" << endl;
-  }
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_java_generator::generate_serialize_field(ofstream& out,
-                                                t_field* tfield,
-                                                string prefix,
-                                                bool has_metadata) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + tfield->get_name());
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + tfield->get_name(), has_metadata);
-  } else if (type->is_enum()) {
-    indent(out) << "oprot.writeI32(" << prefix + tfield->get_name() << ".getValue());" << endl;
-  } else if (type->is_base_type()) {
-    string name = prefix + tfield->get_name();
-    indent(out) << "oprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "writeBinary(" << name << ");";
-        } else {
-          out << "writeString(" << name << ");";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ");";
-        break;
-      default:
-        throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32(struct." << name << ");";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_java_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  out << indent() << prefix << ".write(oprot);" << endl;
-}
-
-/**
- * Serializes a container by writing its size then the elements.
- *
- * @param ttype  The type of container
- * @param prefix String prefix for fields
- */
-void t_java_generator::generate_serialize_container(ofstream& out,
-                                                    t_type* ttype,
-                                                    string prefix,
-                                                    bool has_metadata) {
-  scope_up(out);
-
-  if (has_metadata) {
-    if (ttype->is_map()) {
-      indent(out) << "oprot.writeMapBegin(new org.apache.thrift.protocol.TMap("
-                  << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
-                  << type_to_enum(((t_map*)ttype)->get_val_type()) << ", " << prefix << ".size()));"
-                  << endl;
-    } else if (ttype->is_set()) {
-      indent(out) << "oprot.writeSetBegin(new org.apache.thrift.protocol.TSet("
-                  << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", " << prefix
-                  << ".size()));" << endl;
-    } else if (ttype->is_list()) {
-      indent(out) << "oprot.writeListBegin(new org.apache.thrift.protocol.TList("
-                  << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " << prefix
-                  << ".size()));" << endl;
-    }
-  } else {
-    indent(out) << "oprot.writeI32(" << prefix << ".size());" << endl;
-  }
-
-  string iter = tmp("_iter");
-  if (ttype->is_map()) {
-    indent(out) << "for (java.util.Map.Entry<" << type_name(((t_map*)ttype)->get_key_type(), true, false)
-                << ", " << type_name(((t_map*)ttype)->get_val_type(), true, false) << "> " << iter
-                << " : " << prefix << ".entrySet())";
-  } else if (ttype->is_set()) {
-    indent(out) << "for (" << type_name(((t_set*)ttype)->get_elem_type()) << " " << iter << " : "
-                << prefix << ")";
-  } else if (ttype->is_list()) {
-    indent(out) << "for (" << type_name(((t_list*)ttype)->get_elem_type()) << " " << iter << " : "
-                << prefix << ")";
-  }
-
-  out << endl;
-  scope_up(out);
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, (t_map*)ttype, iter, prefix, has_metadata);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, (t_set*)ttype, iter, has_metadata);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, (t_list*)ttype, iter, has_metadata);
-  }
-  scope_down(out);
-
-  if (has_metadata) {
-    if (ttype->is_map()) {
-      indent(out) << "oprot.writeMapEnd();" << endl;
-    } else if (ttype->is_set()) {
-      indent(out) << "oprot.writeSetEnd();" << endl;
-    } else if (ttype->is_list()) {
-      indent(out) << "oprot.writeListEnd();" << endl;
-    }
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- */
-void t_java_generator::generate_serialize_map_element(ofstream& out,
-                                                      t_map* tmap,
-                                                      string iter,
-                                                      string map,
-                                                      bool has_metadata) {
-  (void)map;
-  t_field kfield(tmap->get_key_type(), iter + ".getKey()");
-  generate_serialize_field(out, &kfield, "", has_metadata);
-  t_field vfield(tmap->get_val_type(), iter + ".getValue()");
-  generate_serialize_field(out, &vfield, "", has_metadata);
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_java_generator::generate_serialize_set_element(ofstream& out,
-                                                      t_set* tset,
-                                                      string iter,
-                                                      bool has_metadata) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "", has_metadata);
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_java_generator::generate_serialize_list_element(ofstream& out,
-                                                       t_list* tlist,
-                                                       string iter,
-                                                       bool has_metadata) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "", has_metadata);
-}
-
-/**
- * Returns a Java type name
- *
- * @param ttype The type
- * @param container Is the type going inside a container?
- * @return Java type name, i.e. java.util.HashMap<Key,Value>
- */
-string t_java_generator::type_name(t_type* ttype,
-                                   bool in_container,
-                                   bool in_init,
-                                   bool skip_generic,
-                                   bool force_namespace) {
-  // In Java typedefs are just resolved to their real type
-  ttype = get_true_type(ttype);
-  string prefix;
-
-  if (ttype->is_base_type()) {
-    return base_type_name((t_base_type*)ttype, in_container);
-  } else if (ttype->is_map()) {
-    t_map* tmap = (t_map*)ttype;
-    if (in_init) {
-      if (sorted_containers_) {
-        prefix = "java.util.TreeMap";
-      } else {
-        prefix = "java.util.HashMap";
-      }
-    } else {
-      prefix = "java.util.Map";
-    }
-    return prefix + (skip_generic ? "" : "<" + type_name(tmap->get_key_type(), true) + ","
-                                         + type_name(tmap->get_val_type(), true) + ">");
-  } else if (ttype->is_set()) {
-    t_set* tset = (t_set*)ttype;
-    if (in_init) {
-      if (sorted_containers_) {
-        prefix = "java.util.TreeSet";
-      } else {
-        prefix = "java.util.HashSet";
-      }
-    } else {
-      prefix = "java.util.Set";
-    }
-    return prefix + (skip_generic ? "" : "<" + type_name(tset->get_elem_type(), true) + ">");
-  } else if (ttype->is_list()) {
-    t_list* tlist = (t_list*)ttype;
-    if (in_init) {
-      prefix = "java.util.ArrayList";
-    } else {
-      prefix = "java.util.List";
-    }
-    return prefix + (skip_generic ? "" : "<" + type_name(tlist->get_elem_type(), true) + ">");
-  }
-
-  // Check for namespacing
-  t_program* program = ttype->get_program();
-  if ((program != NULL) && ((program != program_) || force_namespace)) {
-    string package = program->get_namespace("java");
-    if (!package.empty()) {
-      return package + "." + ttype->get_name();
-    }
-  }
-
-  return ttype->get_name();
-}
-
-/**
- * Returns the Java type that corresponds to the thrift type.
- *
- * @param tbase The base type
- * @param container Is it going in a Java container?
- */
-string t_java_generator::base_type_name(t_base_type* type, bool in_container) {
-  t_base_type::t_base tbase = type->get_base();
-
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return (in_container ? "Void" : "void");
-  case t_base_type::TYPE_STRING:
-    if (type->is_binary()) {
-      return "java.nio.ByteBuffer";
-    } else {
-      return "java.lang.String";
-    }
-  case t_base_type::TYPE_BOOL:
-    return (in_container ? "java.lang.Boolean" : "boolean");
-  case t_base_type::TYPE_I8:
-    return (in_container ? "java.lang.Byte" : "byte");
-  case t_base_type::TYPE_I16:
-    return (in_container ? "java.lang.Short" : "short");
-  case t_base_type::TYPE_I32:
-    return (in_container ? "java.lang.Integer" : "int");
-  case t_base_type::TYPE_I64:
-    return (in_container ? "java.lang.Long" : "long");
-  case t_base_type::TYPE_DOUBLE:
-    return (in_container ? "java.lang.Double" : "double");
-  default:
-    throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param tfield The field
- * @param init Whether to initialize the field
- */
-string t_java_generator::declare_field(t_field* tfield, bool init, bool comment) {
-  // TODO(mcslee): do we ever need to initialize the field?
-  string result = type_name(tfield->get_type()) + " " + tfield->get_name();
-  if (init) {
-    t_type* ttype = get_true_type(tfield->get_type());
-    if (ttype->is_base_type() && tfield->get_value() != NULL) {
-      ofstream dummy;
-      result += " = " + render_const_value(dummy, ttype, tfield->get_value());
-    } else if (ttype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "NO T_VOID CONSTRUCT";
-      case t_base_type::TYPE_STRING:
-        result += " = null";
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = false";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = (double)0";
-        break;
-      }
-    } else if (ttype->is_enum()) {
-      result += " = null";
-    } else if (ttype->is_container()) {
-      result += " = new " + type_name(ttype, false, true) + "()";
-    } else {
-      result += " = new " + type_name(ttype, false, true) + "()";
-      ;
-    }
-  }
-  result += ";";
-  if (comment) {
-    result += " // ";
-    if (tfield->get_req() == t_field::T_OPTIONAL) {
-      result += "optional";
-    } else {
-      result += "required";
-    }
-  }
-  return result;
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_java_generator::function_signature(t_function* tfunction, string prefix) {
-  t_type* ttype = tfunction->get_returntype();
-  std::string fn_name = get_rpc_method_name(tfunction->get_name());
-  std::string result = type_name(ttype) + " " + prefix + fn_name + "("
-                       + argument_list(tfunction->get_arglist()) + ") throws ";
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-  for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-    result += type_name((*x_iter)->get_type(), false, false) + ", ";
-  }
-  result += "org.apache.thrift.TException";
-  return result;
-}
-
-/**
- * Renders a function signature of the form 'void name(args, resultHandler)'
- *
- * @params tfunction Function definition
- * @return String of rendered function definition
- */
-string t_java_generator::function_signature_async(t_function* tfunction,
-                                                  bool use_base_method,
-                                                  string prefix) {
-  std::string arglist = async_function_call_arglist(tfunction, use_base_method, true);
-
-  std::string ret_type = "";
-  if (use_base_method) {
-    ret_type += "AsyncClient.";
-  }
-  ret_type += tfunction->get_name() + "_call";
-
-  std::string fn_name = get_rpc_method_name(tfunction->get_name());
-
-  std::string result = prefix + "void " + fn_name + "(" + arglist + ")";
-  return result;
-}
-
-string t_java_generator::async_function_call_arglist(t_function* tfunc,
-                                                     bool use_base_method,
-                                                     bool include_types) {
-  (void)use_base_method;
-  std::string arglist = "";
-  if (tfunc->get_arglist()->get_members().size() > 0) {
-    arglist = argument_list(tfunc->get_arglist(), include_types) + ", ";
-  }
-
-  if (include_types) {
-    arglist += "org.apache.thrift.async.AsyncMethodCallback<";
-    arglist += type_name(tfunc->get_returntype(), true) + "> ";
-  }
-  arglist += "resultHandler";
-
-  return arglist;
-}
-
-/**
- * Renders a comma separated field list, with type names
- */
-string t_java_generator::argument_list(t_struct* tstruct, bool include_types) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    if (include_types) {
-      result += type_name((*f_iter)->get_type()) + " ";
-    }
-    result += (*f_iter)->get_name();
-  }
-  return result;
-}
-
-string t_java_generator::async_argument_list(t_function* tfunct,
-                                             t_struct* tstruct,
-                                             t_type* ttype,
-                                             bool include_types) {
-  (void)tfunct;
-  (void)ttype;
-  string result = "";
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    if (include_types) {
-      result += type_name((*f_iter)->get_type()) + " ";
-    }
-    result += (*f_iter)->get_name();
-  }
-  if (!first) {
-    result += ", ";
-  }
-  if (include_types) {
-    result += "org.apache.thrift.async.AsyncMethodCallback<";
-    result += type_name(tfunct->get_returntype(), true) + "> ";
-  }
-  result += "resultHandler";
-  return result;
-}
-
-/**
- * Converts the parse type to a Java enum string for the given type.
- */
-string t_java_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "org.apache.thrift.protocol.TType.STRING";
-    case t_base_type::TYPE_BOOL:
-      return "org.apache.thrift.protocol.TType.BOOL";
-    case t_base_type::TYPE_I8:
-      return "org.apache.thrift.protocol.TType.BYTE";
-    case t_base_type::TYPE_I16:
-      return "org.apache.thrift.protocol.TType.I16";
-    case t_base_type::TYPE_I32:
-      return "org.apache.thrift.protocol.TType.I32";
-    case t_base_type::TYPE_I64:
-      return "org.apache.thrift.protocol.TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "org.apache.thrift.protocol.TType.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "org.apache.thrift.protocol.TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "org.apache.thrift.protocol.TType.STRUCT";
-  } else if (type->is_map()) {
-    return "org.apache.thrift.protocol.TType.MAP";
-  } else if (type->is_set()) {
-    return "org.apache.thrift.protocol.TType.SET";
-  } else if (type->is_list()) {
-    return "org.apache.thrift.protocol.TType.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Takes a name and produes a valid Java source file name from it
- *
- * @param fromName The name which shall become a valid Java source file name
- * @return The produced identifier
- */
-std::string t_java_generator::make_valid_java_filename(std::string const& fromName) {
-  // if any further rules apply to source file names in Java, modify as necessary
-  return make_valid_java_identifier(fromName);
-}
-
-/**
- * Takes a name and produes a valid Java identifier from it
- *
- * @param fromName The name which shall become a valid Java identifier
- * @return The produced identifier
- */
-std::string t_java_generator::make_valid_java_identifier(std::string const& fromName) {
-  std::string str = fromName;
-  if (str.empty()) {
-    return str;
-  }
-
-  // tests rely on this
-  assert(('A' < 'Z') && ('a' < 'z') && ('0' < '9'));
-
-  // if the first letter is a number, we add an additional underscore in front of it
-  char c = str.at(0);
-  if (('0' <= c) && (c <= '9')) {
-    str = "_" + str;
-  }
-
-  // following chars: letter, number or underscore
-  for (size_t i = 0; i < str.size(); ++i) {
-    c = str.at(i);
-    if ((('A' > c) || (c > 'Z')) && (('a' > c) || (c > 'z')) && (('0' > c) || (c > '9'))
-        && ('_' != c)) {
-      str.replace(i, 1, "_");
-    }
-  }
-
-  return str;
-}
-
-std::string t_java_generator::as_camel_case(std::string name, bool ucfirst) {
-  std::string new_name;
-  size_t i = 0;
-  for (i = 0; i < name.size(); i++) {
-    if (name[i] != '_')
-      break;
-  }
-  if (ucfirst) {
-    new_name += toupper(name[i++]);
-  } else {
-    new_name += tolower(name[i++]);
-  }
-  for (; i < name.size(); i++) {
-    if (name[i] == '_') {
-      if (i < name.size() - 1) {
-        i++;
-        new_name += toupper(name[i]);
-      }
-    } else {
-      new_name += name[i];
-    }
-  }
-  return new_name;
-}
-
-std::string t_java_generator::get_rpc_method_name(std::string name) {
-  if (fullcamel_style_) {
-    return as_camel_case(name, false);
-  } else {
-    return name;
-  }
-}
-
-/**
- * Applies the correct style to a string based on the value of nocamel_style_
- * and/or fullcamel_style_
- */
-std::string t_java_generator::get_cap_name(std::string name) {
-  if (nocamel_style_) {
-    return "_" + name;
-  } else if (fullcamel_style_) {
-    return as_camel_case(name);
-  } else {
-    name[0] = toupper(name[0]);
-    return name;
-  }
-}
-
-string t_java_generator::constant_name(string name) {
-  string constant_name;
-
-  bool is_first = true;
-  bool was_previous_char_upper = false;
-  for (string::iterator iter = name.begin(); iter != name.end(); ++iter) {
-    string::value_type character = (*iter);
-
-    bool is_upper = isupper(character);
-
-    if (is_upper && !is_first && !was_previous_char_upper) {
-      constant_name += '_';
-    }
-    constant_name += toupper(character);
-
-    is_first = false;
-    was_previous_char_upper = is_upper;
-  }
-
-  return constant_name;
-}
-
-void t_java_generator::generate_deep_copy_container(ofstream& out,
-                                                    std::string source_name_p1,
-                                                    std::string source_name_p2,
-                                                    std::string result_name,
-                                                    t_type* type) {
-
-  t_container* container = (t_container*)type;
-  std::string source_name;
-  if (source_name_p2 == "")
-    source_name = source_name_p1;
-  else
-    source_name = source_name_p1 + "." + source_name_p2;
-
-  bool copy_construct_container;
-  if (container->is_map()) {
-    t_map* tmap = (t_map*)container;
-    copy_construct_container = tmap->get_key_type()->is_base_type()
-                               && tmap->get_val_type()->is_base_type();
-  } else {
-    t_type* elem_type = container->is_list() ? ((t_list*)container)->get_elem_type()
-                                             : ((t_set*)container)->get_elem_type();
-    copy_construct_container = elem_type->is_base_type();
-  }
-
-  if (copy_construct_container) {
-    // deep copy of base types can be done much more efficiently than iterating over all the
-    // elements manually
-    indent(out) << type_name(type, true, false) << " " << result_name << " = new "
-                << type_name(container, false, true) << "(" << source_name << ");" << endl;
-    return;
-  }
-
-  std::string capacity;
-  if (!(sorted_containers_ && (container->is_map() || container->is_set()))) {
-    // unsorted containers accept a capacity value
-    capacity = source_name + ".size()";
-  }
-  indent(out) << type_name(type, true, false) << " " << result_name << " = new "
-              << type_name(container, false, true) << "(" << capacity << ");" << endl;
-
-  std::string iterator_element_name = source_name_p1 + "_element";
-  std::string result_element_name = result_name + "_copy";
-
-  if (container->is_map()) {
-    t_type* key_type = ((t_map*)container)->get_key_type();
-    t_type* val_type = ((t_map*)container)->get_val_type();
-
-    indent(out) << "for (java.util.Map.Entry<" << type_name(key_type, true, false) << ", "
-                << type_name(val_type, true, false) << "> " << iterator_element_name << " : "
-                << source_name << ".entrySet()) {" << endl;
-    indent_up();
-
-    out << endl;
-
-    indent(out) << type_name(key_type, true, false) << " " << iterator_element_name
-                << "_key = " << iterator_element_name << ".getKey();" << endl;
-    indent(out) << type_name(val_type, true, false) << " " << iterator_element_name
-                << "_value = " << iterator_element_name << ".getValue();" << endl;
-
-    out << endl;
-
-    if (key_type->is_container()) {
-      generate_deep_copy_container(out,
-                                   iterator_element_name + "_key",
-                                   "",
-                                   result_element_name + "_key",
-                                   key_type);
-    } else {
-      indent(out) << type_name(key_type, true, false) << " " << result_element_name << "_key = ";
-      generate_deep_copy_non_container(out,
-                                       iterator_element_name + "_key",
-                                       result_element_name + "_key",
-                                       key_type);
-      out << ";" << endl;
-    }
-
-    out << endl;
-
-    if (val_type->is_container()) {
-      generate_deep_copy_container(out,
-                                   iterator_element_name + "_value",
-                                   "",
-                                   result_element_name + "_value",
-                                   val_type);
-    } else {
-      indent(out) << type_name(val_type, true, false) << " " << result_element_name << "_value = ";
-      generate_deep_copy_non_container(out,
-                                       iterator_element_name + "_value",
-                                       result_element_name + "_value",
-                                       val_type);
-      out << ";" << endl;
-    }
-
-    out << endl;
-
-    indent(out) << result_name << ".put(" << result_element_name << "_key, " << result_element_name
-                << "_value);" << endl;
-
-    indent_down();
-    indent(out) << "}" << endl;
-
-  } else {
-    t_type* elem_type;
-
-    if (container->is_set()) {
-      elem_type = ((t_set*)container)->get_elem_type();
-    } else {
-      elem_type = ((t_list*)container)->get_elem_type();
-    }
-
-    indent(out) << "for (" << type_name(elem_type, true, false) << " " << iterator_element_name
-                << " : " << source_name << ") {" << endl;
-
-    indent_up();
-
-    if (elem_type->is_container()) {
-      // recursive deep copy
-      generate_deep_copy_container(out, iterator_element_name, "", result_element_name, elem_type);
-      indent(out) << result_name << ".add(" << result_element_name << ");" << endl;
-    } else {
-      // iterative copy
-      if (((t_base_type*)elem_type)->is_binary()) {
-        indent(out) << "java.nio.ByteBuffer temp_binary_element = ";
-        generate_deep_copy_non_container(out,
-                                         iterator_element_name,
-                                         "temp_binary_element",
-                                         elem_type);
-        out << ";" << endl;
-        indent(out) << result_name << ".add(temp_binary_element);" << endl;
-      } else {
-        indent(out) << result_name << ".add(";
-        generate_deep_copy_non_container(out, iterator_element_name, result_name, elem_type);
-        out << ");" << endl;
-      }
-    }
-
-    indent_down();
-
-    indent(out) << "}" << endl;
-  }
-}
-
-void t_java_generator::generate_deep_copy_non_container(ofstream& out,
-                                                        std::string source_name,
-                                                        std::string dest_name,
-                                                        t_type* type) {
-  (void)dest_name;
-  if (type->is_base_type() || type->is_enum() || type->is_typedef()) {
-    if (((t_base_type*)type)->is_binary()) {
-      out << "org.apache.thrift.TBaseHelper.copyBinary(" << source_name << ")";
-    } else {
-      // everything else can be copied directly
-      out << source_name;
-    }
-  } else {
-    out << "new " << type_name(type, true, true) << "(" << source_name << ")";
-  }
-}
-
-std::string t_java_generator::generate_isset_check(t_field* field) {
-  return generate_isset_check(field->get_name());
-}
-
-std::string t_java_generator::isset_field_id(t_field* field) {
-  return "__" + upcase_string(field->get_name() + "_isset_id");
-}
-
-std::string t_java_generator::generate_isset_check(std::string field_name) {
-  return "is" + get_cap_name("set") + get_cap_name(field_name) + "()";
-}
-
-void t_java_generator::generate_isset_set(ofstream& out, t_field* field, string prefix) {
-  if (!type_can_be_null(field->get_type())) {
-    indent(out) << prefix << "set" << get_cap_name(field->get_name()) << get_cap_name("isSet")
-                << "(true);" << endl;
-  }
-}
-
-void t_java_generator::generate_struct_desc(ofstream& out, t_struct* tstruct) {
-  indent(out) << "private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new "
-                 "org.apache.thrift.protocol.TStruct(\"" << tstruct->get_name() << "\");" << endl;
-}
-
-void t_java_generator::generate_field_descs(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "private static final org.apache.thrift.protocol.TField "
-                << constant_name((*m_iter)->get_name())
-                << "_FIELD_DESC = new org.apache.thrift.protocol.TField(\"" << (*m_iter)->get_name()
-                << "\", " << type_to_enum((*m_iter)->get_type()) << ", "
-                << "(short)" << (*m_iter)->get_key() << ");" << endl;
-  }
-}
-
-void t_java_generator::generate_scheme_map(ofstream& out, t_struct* tstruct) {
-  indent(out) << "private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new "
-      << tstruct->get_name() << "StandardSchemeFactory();" << endl;
-  indent(out) << "private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new "
-      << tstruct->get_name() << "TupleSchemeFactory();" << endl;
-}
-
-void t_java_generator::generate_field_name_constants(ofstream& out, t_struct* tstruct) {
-  indent(out) << "/** The set of fields this struct contains, along with convenience methods for "
-                 "finding and manipulating them. */" << endl;
-  indent(out) << "public enum _Fields implements org.apache.thrift.TFieldIdEnum {" << endl;
-
-  indent_up();
-  bool first = true;
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (!first) {
-      out << "," << endl;
-    }
-    first = false;
-    generate_java_doc(out, *m_iter);
-    indent(out) << constant_name((*m_iter)->get_name()) << "((short)" << (*m_iter)->get_key()
-                << ", \"" << (*m_iter)->get_name() << "\")";
-  }
-
-  out << ";" << endl << endl;
-
-  indent(out)
-      << "private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();"
-      << endl;
-  out << endl;
-
-  indent(out) << "static {" << endl;
-  indent(out) << "  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {" << endl;
-  indent(out) << "    byName.put(field.getFieldName(), field);" << endl;
-  indent(out) << "  }" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "/**" << endl;
-  indent(out) << " * Find the _Fields constant that matches fieldId, or null if its not found."
-              << endl;
-  indent(out) << " */" << endl;
-  indent(out) << "public static _Fields findByThriftId(int fieldId) {" << endl;
-  indent_up();
-  indent(out) << "switch(fieldId) {" << endl;
-  indent_up();
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "case " << (*m_iter)->get_key() << ": // "
-                << constant_name((*m_iter)->get_name()) << endl;
-    indent(out) << "  return " << constant_name((*m_iter)->get_name()) << ";" << endl;
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  return null;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "/**" << endl;
-  indent(out) << " * Find the _Fields constant that matches fieldId, throwing an exception" << endl;
-  indent(out) << " * if it is not found." << endl;
-  indent(out) << " */" << endl;
-  indent(out) << "public static _Fields findByThriftIdOrThrow(int fieldId) {" << endl;
-  indent(out) << "  _Fields fields = findByThriftId(fieldId);" << endl;
-  indent(out) << "  if (fields == null) throw new java.lang.IllegalArgumentException(\"Field \" + fieldId + "
-                 "\" doesn't exist!\");" << endl;
-  indent(out) << "  return fields;" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "/**" << endl;
-  indent(out) << " * Find the _Fields constant that matches name, or null if its not found."
-              << endl;
-  indent(out) << " */" << endl;
-  indent(out) << "public static _Fields findByName(java.lang.String name) {" << endl;
-  indent(out) << "  return byName.get(name);" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "private final short _thriftId;" << endl;
-  indent(out) << "private final java.lang.String _fieldName;" << endl << endl;
-
-  indent(out) << "_Fields(short thriftId, java.lang.String fieldName) {" << endl;
-  indent(out) << "  _thriftId = thriftId;" << endl;
-  indent(out) << "  _fieldName = fieldName;" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "public short getThriftFieldId() {" << endl;
-  indent(out) << "  return _thriftId;" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "public java.lang.String getFieldName() {" << endl;
-  indent(out) << "  return _fieldName;" << endl;
-  indent(out) << "}" << endl;
-
-  indent_down();
-
-  indent(out) << "}" << endl;
-}
-
-t_java_generator::isset_type t_java_generator::needs_isset(t_struct* tstruct,
-                                                           std::string* outPrimitiveType) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  int count = 0;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (!type_can_be_null(get_true_type((*m_iter)->get_type()))) {
-      count++;
-    }
-  }
-  if (count == 0) {
-    return ISSET_NONE;
-  } else if (count <= 64) {
-    if (outPrimitiveType != NULL) {
-      if (count <= 8)
-        *outPrimitiveType = "byte";
-      else if (count <= 16)
-        *outPrimitiveType = "short";
-      else if (count <= 32)
-        *outPrimitiveType = "int";
-      else if (count <= 64)
-        *outPrimitiveType = "long";
-    }
-    return ISSET_PRIMITIVE;
-  } else {
-    return ISSET_BITSET;
-  }
-}
-
-void t_java_generator::generate_java_struct_clear(std::ofstream& out, t_struct* tstruct) {
-  if (!java5_) {
-    indent(out) << "@Override" << endl;
-  }
-  indent(out) << "public void clear() {" << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  indent_up();
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = *m_iter;
-    t_type* t = get_true_type(field->get_type());
-
-    if (field->get_value() != NULL) {
-      print_const_value(out, "this." + field->get_name(), t, field->get_value(), true, true);
-      continue;
-    }
-
-    if (type_can_be_null(t)) {
-
-      if (reuse_objects_ && (t->is_container() || t->is_struct())) {
-        indent(out) << "if (this." << field->get_name() << " != null) {" << endl;
-        indent_up();
-        indent(out) << "this." << field->get_name() << ".clear();" << endl;
-        indent_down();
-        indent(out) << "}" << endl;
-
-      } else {
-
-        indent(out) << "this." << field->get_name() << " = null;" << endl;
-      }
-      continue;
-    }
-
-    // must be a base type
-    // means it also needs to be explicitly unset
-    indent(out) << "set" << get_cap_name(field->get_name()) << get_cap_name("isSet") << "(false);"
-                << endl;
-    t_base_type* base_type = (t_base_type*)t;
-
-    switch (base_type->get_base()) {
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      indent(out) << "this." << field->get_name() << " = 0;" << endl;
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      indent(out) << "this." << field->get_name() << " = 0.0;" << endl;
-      break;
-    case t_base_type::TYPE_BOOL:
-      indent(out) << "this." << field->get_name() << " = false;" << endl;
-      break;
-    default:
-      throw "unsupported type: " + base_type->get_name() + " for field " + field->get_name();
-    }
-  }
-  indent_down();
-
-  indent(out) << "}" << endl << endl;
-}
-
-// generates java method to serialize (in the Java sense) the object
-void t_java_generator::generate_java_struct_write_object(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out)
-      << "private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {"
-      << endl;
-  indent(out) << "  try {" << endl;
-  indent(out) << "    write(new org.apache.thrift.protocol.TCompactProtocol(new "
-                 "org.apache.thrift.transport.TIOStreamTransport(out)));" << endl;
-  indent(out) << "  } catch (org.apache.thrift.TException te) {" << endl;
-  indent(out) << "    throw new java.io.IOException(te" << (android_legacy_ ? ".getMessage()" : "")
-              << ");" << endl;
-  indent(out) << "  }" << endl;
-  indent(out) << "}" << endl << endl;
-}
-
-// generates java method to serialize (in the Java sense) the object
-void t_java_generator::generate_java_struct_read_object(ofstream& out, t_struct* tstruct) {
-  indent(out) << "private void readObject(java.io.ObjectInputStream in) throws "
-                 "java.io.IOException, java.lang.ClassNotFoundException {" << endl;
-  indent(out) << "  try {" << endl;
-  if (!tstruct->is_union()) {
-    switch (needs_isset(tstruct)) {
-    case ISSET_NONE:
-      break;
-    case ISSET_PRIMITIVE:
-      indent(out) << "    // it doesn't seem like you should have to do this, but java "
-                     "serialization is wacky, and doesn't call the default constructor." << endl;
-      indent(out) << "    __isset_bitfield = 0;" << endl;
-      break;
-    case ISSET_BITSET:
-      indent(out) << "    // it doesn't seem like you should have to do this, but java "
-                     "serialization is wacky, and doesn't call the default constructor." << endl;
-      indent(out) << "    __isset_bit_vector = new java.util.BitSet(1);" << endl;
-      break;
-    }
-  }
-  indent(out) << "    read(new org.apache.thrift.protocol.TCompactProtocol(new "
-                 "org.apache.thrift.transport.TIOStreamTransport(in)));" << endl;
-  indent(out) << "  } catch (org.apache.thrift.TException te) {" << endl;
-  indent(out) << "    throw new java.io.IOException(te" << (android_legacy_ ? ".getMessage()" : "")
-              << ");" << endl;
-  indent(out) << "  }" << endl;
-  indent(out) << "}" << endl << endl;
-}
-
-void t_java_generator::generate_standard_reader(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public void read(org.apache.thrift.protocol.TProtocol iprot, "
-      << tstruct->get_name() << " struct) throws org.apache.thrift.TException {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Declare stack tmp variables and read struct header
-  out << indent() << "org.apache.thrift.protocol.TField schemeField;" << endl << indent()
-      << "iprot.readStructBegin();" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (true)" << endl;
-  scope_up(out);
-
-  // Read beginning field marker
-  indent(out) << "schemeField = iprot.readFieldBegin();" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { " << endl;
-  indent_up();
-  indent(out) << "break;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  // Switch statement on the field we are reading
-  indent(out) << "switch (schemeField.id) {" << endl;
-
-  indent_up();
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << (*f_iter)->get_key() << ": // "
-                << constant_name((*f_iter)->get_name()) << endl;
-    indent_up();
-    indent(out) << "if (schemeField.type == " << type_to_enum((*f_iter)->get_type()) << ") {"
-                << endl;
-    indent_up();
-
-    generate_deserialize_field(out, *f_iter, "struct.", true);
-    indent(out) << "struct."
-                << "set" << get_cap_name((*f_iter)->get_name()) << get_cap_name("isSet")
-                << "(true);" << endl;
-    indent_down();
-    out << indent() << "} else { " << endl << indent()
-        << "  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);" << endl
-        << indent() << "}" << endl << indent() << "break;" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);"
-              << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  // Read field end marker
-  indent(out) << "iprot.readFieldEnd();" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  out << indent() << "iprot.readStructEnd();" << endl;
-
-  // in non-beans style, check for required fields of primitive type
-  // (which can be checked here but not in the general validate method)
-  if (!bean_style_) {
-    out << endl << indent() << "// check for required fields of primitive type, which can't be "
-                               "checked in the validate method" << endl;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if ((*f_iter)->get_req() == t_field::T_REQUIRED && !type_can_be_null((*f_iter)->get_type())) {
-        out << indent() << "if (!struct." << generate_isset_check(*f_iter) << ") {" << endl
-            << indent()
-            << "  throw new org.apache.thrift.protocol.TProtocolException(\"Required field '"
-            << (*f_iter)->get_name()
-            << "' was not found in serialized data! Struct: \" + toString());" << endl << indent()
-            << "}" << endl;
-      }
-    }
-  }
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "struct.validate();" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl;
-}
-
-void t_java_generator::generate_standard_writer(ofstream& out, t_struct* tstruct, bool is_result) {
-  indent_up();
-  out << indent() << "public void write(org.apache.thrift.protocol.TProtocol oprot, "
-      << tstruct->get_name() << " struct) throws org.apache.thrift.TException {" << endl;
-  indent_up();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "struct.validate();" << endl << endl;
-
-  indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    if (null_allowed) {
-      out << indent() << "if (struct." << (*f_iter)->get_name() << " != null) {" << endl;
-      indent_up();
-    }
-    bool optional = ((*f_iter)->get_req() == t_field::T_OPTIONAL) || (is_result && !null_allowed);
-    if (optional) {
-      indent(out) << "if ("
-                  << "struct." << generate_isset_check((*f_iter)) << ") {" << endl;
-      indent_up();
-    }
-
-    indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "struct.", true);
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    if (optional) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    if (null_allowed) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-  // Write the struct map
-  out << indent() << "oprot.writeFieldStop();" << endl << indent() << "oprot.writeStructEnd();"
-      << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-  indent_down();
-}
-
-void t_java_generator::generate_java_struct_standard_scheme(ofstream& out,
-                                                            t_struct* tstruct,
-                                                            bool is_result) {
-  indent(out) << "private static class " << tstruct->get_name()
-              << "StandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {" << endl;
-  indent_up();
-  indent(out) << "public " << tstruct->get_name() << "StandardScheme getScheme() {" << endl;
-  indent_up();
-  indent(out) << "return new " << tstruct->get_name() << "StandardScheme();" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  out << indent() << "private static class " << tstruct->get_name()
-      << "StandardScheme extends org.apache.thrift.scheme.StandardScheme<" << tstruct->get_name() << "> {" << endl << endl;
-  indent_up();
-  generate_standard_reader(out, tstruct);
-  indent_down();
-  out << endl;
-  generate_standard_writer(out, tstruct, is_result);
-
-  out << indent() << "}" << endl << endl;
-}
-
-void t_java_generator::generate_java_struct_tuple_reader(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out) << "public void read(org.apache.thrift.protocol.TProtocol prot, "
-              << tstruct->get_name() << " struct) throws org.apache.thrift.TException {" << endl;
-  indent_up();
-  indent(out) << "org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;" << endl;
-  int optional_count = 0;
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_OPTIONAL
-        || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
-      optional_count++;
-    }
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      generate_deserialize_field(out, (*f_iter), "struct.", false);
-      indent(out) << "struct.set" << get_cap_name((*f_iter)->get_name()) << get_cap_name("isSet")
-                  << "(true);" << endl;
-    }
-  }
-  if (optional_count > 0) {
-    indent(out) << "java.util.BitSet incoming = iprot.readBitSet(" << optional_count << ");" << endl;
-    int i = 0;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if ((*f_iter)->get_req() == t_field::T_OPTIONAL
-          || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
-        indent(out) << "if (incoming.get(" << i << ")) {" << endl;
-        indent_up();
-        generate_deserialize_field(out, (*f_iter), "struct.", false);
-        indent(out) << "struct.set" << get_cap_name((*f_iter)->get_name()) << get_cap_name("isSet")
-                    << "(true);" << endl;
-        indent_down();
-        indent(out) << "}" << endl;
-        i++;
-      }
-    }
-  }
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_java_struct_tuple_writer(ofstream& out, t_struct* tstruct) {
-  indent(out) << "@Override" << endl;
-  indent(out) << "public void write(org.apache.thrift.protocol.TProtocol prot, "
-              << tstruct->get_name() << " struct) throws org.apache.thrift.TException {" << endl;
-  indent_up();
-  indent(out) << "org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;" << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool has_optional = false;
-  int optional_count = 0;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_OPTIONAL
-        || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
-      optional_count++;
-      has_optional = true;
-    }
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      generate_serialize_field(out, (*f_iter), "struct.", false);
-    }
-  }
-  if (has_optional) {
-    indent(out) << "java.util.BitSet optionals = new java.util.BitSet();" << endl;
-    int i = 0;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if ((*f_iter)->get_req() == t_field::T_OPTIONAL
-          || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
-        indent(out) << "if (struct." << generate_isset_check((*f_iter)) << ") {" << endl;
-        indent_up();
-        indent(out) << "optionals.set(" << i << ");" << endl;
-        indent_down();
-        indent(out) << "}" << endl;
-        i++;
-      }
-    }
-
-    indent(out) << "oprot.writeBitSet(optionals, " << optional_count << ");" << endl;
-    int j = 0;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if ((*f_iter)->get_req() == t_field::T_OPTIONAL
-          || (*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
-        indent(out) << "if (struct." << generate_isset_check(*f_iter) << ") {" << endl;
-        indent_up();
-        generate_serialize_field(out, (*f_iter), "struct.", false);
-        indent_down();
-        indent(out) << "}" << endl;
-        j++;
-      }
-    }
-  }
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_java_struct_tuple_scheme(ofstream& out, t_struct* tstruct) {
-  indent(out) << "private static class " << tstruct->get_name()
-              << "TupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {" << endl;
-  indent_up();
-  indent(out) << "public " << tstruct->get_name() << "TupleScheme getScheme() {" << endl;
-  indent_up();
-  indent(out) << "return new " << tstruct->get_name() << "TupleScheme();" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-  out << indent() << "private static class " << tstruct->get_name()
-      << "TupleScheme extends org.apache.thrift.scheme.TupleScheme<" << tstruct->get_name() << "> {" << endl << endl;
-  indent_up();
-  generate_java_struct_tuple_writer(out, tstruct);
-  out << endl;
-  generate_java_struct_tuple_reader(out, tstruct);
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-void t_java_generator::generate_java_scheme_lookup(ofstream& out) {
-  indent(out) << "private static <S extends org.apache.thrift.scheme.IScheme> S scheme("
-      << "org.apache.thrift.protocol.TProtocol proto) {" << endl;
-  indent_up();
-  indent(out) << "return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) "
-      << "? STANDARD_SCHEME_FACTORY "
-      << ": TUPLE_SCHEME_FACTORY"
-      << ").getScheme();" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_java_generator::generate_javax_generated_annotation(ofstream& out) {
-  time_t seconds = time(NULL);
-  struct tm* now = localtime(&seconds);
-  indent(out) << "@javax.annotation.Generated(value = \"" << autogen_summary() << "\"";
-  if (undated_generated_annotations_) {
-    out << ")" << endl;
-  } else {
-    indent(out) << ", date = \"" << (now->tm_year + 1900) << "-" << setfill('0') << setw(2)
-                << (now->tm_mon + 1) << "-" << setfill('0') << setw(2) << now->tm_mday
-                << "\")" << endl;
-  }
-}
-
-THRIFT_REGISTER_GENERATOR(
-    java,
-    "Java",
-    "    beans:           Members will be private, and setter methods will return void.\n"
-    "    private-members: Members will be private, but setter methods will return 'this' like "
-    "usual.\n"
-    "    nocamel:         Do not use CamelCase field accessors with beans.\n"
-    "    fullcamel:       Convert underscored_accessor_or_service_names to camelCase.\n"
-    "    android:         Generated structures are Parcelable.\n"
-    "    android_legacy:  Do not use java.io.IOException(throwable) (available for Android 2.3 and "
-    "above).\n"
-    "    option_type:     Wrap optional fields in an Option type.\n"
-    "    java5:           Generate Java 1.5 compliant code (includes android_legacy flag).\n"
-    "    reuse-objects:   Data objects will not be allocated, but existing instances will be used "
-    "(read and write).\n"
-    "    sorted_containers:\n"
-    "                     Use TreeSet/TreeMap instead of HashSet/HashMap as a implementation of "
-    "set/map.\n"
-    "    generated_annotations=[undated|suppress]:\n"
-    "                     undated: suppress the date at @Generated annotations\n"
-    "                     suppress: suppress @Generated annotations entirely\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_javame_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_javame_generator.cc
deleted file mode 100644
index 94d66fc..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_javame_generator.cc
+++ /dev/null
@@ -1,3296 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <sstream>
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <cctype>
-
-#include <sys/stat.h>
-#include <stdexcept>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Java code generator.
- *
- */
-class t_javame_generator : public t_oop_generator {
-public:
-  t_javame_generator(t_program* program,
-                     const std::map<std::string, std::string>& parsed_options,
-                     const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)parsed_options;
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    /* no options yet */
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      throw "unknown option javame:" + iter->first;
-    }
-
-    out_dir_base_ = "gen-javame";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(std::vector<t_const*> consts);
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_struct(t_struct* tstruct);
-  void generate_union(t_struct* tunion);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  void print_const_value(std::ofstream& out,
-                         std::string name,
-                         t_type* type,
-                         t_const_value* value,
-                         bool in_static,
-                         bool defval = false);
-  std::string render_const_value(std::ofstream& out,
-                                 std::string name,
-                                 t_type* type,
-                                 t_const_value* value);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_java_struct(t_struct* tstruct, bool is_exception);
-
-  void generate_java_struct_definition(std::ofstream& out,
-                                       t_struct* tstruct,
-                                       bool is_xception = false,
-                                       bool in_class = false,
-                                       bool is_result = false);
-  void generate_java_struct_equality(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_compare_to(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_java_validator(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_result_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_tostring(std::ofstream& out, t_struct* tstruct);
-  void generate_java_struct_clear(std::ofstream& out, t_struct* tstruct);
-  void generate_field_value_meta_data(std::ofstream& out, t_type* type);
-  std::string get_java_type_string(t_type* type);
-  void generate_reflection_setters(std::ostringstream& out,
-                                   t_type* type,
-                                   std::string field_name,
-                                   std::string cap_name);
-  void generate_reflection_getters(std::ostringstream& out,
-                                   t_type* type,
-                                   std::string field_name,
-                                   std::string cap_name);
-  void generate_generic_field_getters_setters(std::ofstream& out, t_struct* tstruct);
-  void generate_java_bean_boilerplate(std::ofstream& out, t_struct* tstruct);
-
-  void generate_function_helpers(t_function* tfunction);
-  std::string get_cap_name(std::string name);
-  std::string generate_isset_check(t_field* field);
-  std::string generate_isset_check(std::string field);
-  void generate_isset_set(ofstream& out, t_field* field);
-  std::string isset_field_id(t_field* field);
-
-  void generate_primitive_service_interface(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  void generate_java_union(t_struct* tstruct);
-  void generate_union_constructor(ofstream& out, t_struct* tstruct);
-  void generate_union_getters_and_setters(ofstream& out, t_struct* tstruct);
-  void generate_union_abstract_methods(ofstream& out, t_struct* tstruct);
-  void generate_check_type(ofstream& out, t_struct* tstruct);
-  void generate_read_value(ofstream& out, t_struct* tstruct);
-  void generate_write_value(ofstream& out, t_struct* tstruct);
-  void generate_get_field_desc(ofstream& out, t_struct* tstruct);
-  void generate_get_struct_desc(ofstream& out, t_struct* tstruct);
-  void generate_get_field_name(ofstream& out, t_struct* tstruct);
-
-  void generate_union_comparisons(ofstream& out, t_struct* tstruct);
-  void generate_union_hashcode(ofstream& out, t_struct* tstruct);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string iter,
-                                      std::string map);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_java_doc(std::ofstream& out, t_field* field);
-
-  void generate_java_doc(std::ofstream& out, t_doc* tdoc);
-
-  void generate_java_doc(std::ofstream& out, t_function* tdoc);
-
-  void generate_java_docstring_comment(std::ofstream& out, string contents);
-
-  void generate_deep_copy_container(std::ofstream& out,
-                                    std::string source_name_p1,
-                                    std::string source_name_p2,
-                                    std::string result_name,
-                                    t_type* type);
-  void generate_deep_copy_non_container(std::ofstream& out,
-                                        std::string source_name,
-                                        std::string dest_name,
-                                        t_type* type);
-
-  bool has_bit_vector(t_struct* tstruct);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string java_package();
-  std::string java_type_imports();
-  std::string java_thrift_imports();
-  std::string type_name(t_type* ttype,
-                        bool in_container = false,
-                        bool in_init = false,
-                        bool skip_generic = false);
-  std::string base_type_name(t_base_type* tbase, bool in_container = false);
-  std::string declare_field(t_field* tfield, bool init = false);
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string argument_list(t_struct* tstruct, bool include_types = true);
-  std::string type_to_enum(t_type* ttype);
-  std::string get_enum_class_name(t_type* type);
-  void generate_struct_desc(ofstream& out, t_struct* tstruct);
-  void generate_field_descs(ofstream& out, t_struct* tstruct);
-  std::string box_type(t_type* type, string value);
-
-  bool type_can_be_null(t_type* ttype) {
-    ttype = get_true_type(ttype);
-
-    return ttype->is_container() || ttype->is_struct() || ttype->is_xception() || ttype->is_string()
-           || ttype->is_enum();
-  }
-
-  std::string constant_name(std::string name);
-
-private:
-  /**
-   * File streams
-   */
-
-  std::string package_name_;
-  std::ofstream f_service_;
-  std::string package_dir_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_javame_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-  package_name_ = program_->get_namespace("java");
-
-  string dir = package_name_;
-  string subdir = get_out_dir();
-  string::size_type loc;
-  while ((loc = dir.find(".")) != string::npos) {
-    subdir = subdir + "/" + dir.substr(0, loc);
-    MKDIR(subdir.c_str());
-    dir = dir.substr(loc + 1);
-  }
-  if (dir.size() > 0) {
-    subdir = subdir + "/" + dir;
-    MKDIR(subdir.c_str());
-  }
-
-  package_dir_ = subdir;
-}
-
-/**
- * Packages the generated file
- *
- * @return String of the package, i.e. "package org.apache.thriftdemo;"
- */
-string t_javame_generator::java_package() {
-  if (!package_name_.empty()) {
-    return string("package ") + package_name_ + ";\n\n";
-  }
-  return "";
-}
-
-/**
- * Prints standard java imports
- *
- * @return List of imports for Java types that are used in here
- */
-string t_javame_generator::java_type_imports() {
-  return string() + "import java.util.Hashtable;\n" + "import java.util.Vector;\n"
-         + "import java.util.Enumeration;\n\n";
-}
-
-/**
- * Prints standard java imports
- *
- * @return List of imports necessary for thrift
- */
-string t_javame_generator::java_thrift_imports() {
-  return string() + "import org.apache.thrift.*;\n" + "import org.apache.thrift.meta_data.*;\n"
-         + "import org.apache.thrift.transport.*;\n" + "import org.apache.thrift.protocol.*;\n\n";
-}
-
-/**
- * Nothing in Java
- */
-void t_javame_generator::close_generator() {
-}
-
-/**
- * Generates a typedef. This is not done in Java, since it does
- * not support arbitrary name replacements, and it'd be a wacky waste
- * of overhead to make wrapper classes.
- *
- * @param ttypedef The type definition
- */
-void t_javame_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Enums are a class with a set of static constants.
- *
- * @param tenum The enumeration
- */
-void t_javame_generator::generate_enum(t_enum* tenum) {
-  // Make output file
-  string f_enum_name = package_dir_ + "/" + (tenum->get_name()) + ".java";
-  ofstream f_enum;
-  f_enum.open(f_enum_name.c_str());
-
-  // Comment and package it
-  f_enum << autogen_comment() << java_package();
-
-  generate_java_doc(f_enum, tenum);
-  indent(f_enum) << "public class " << tenum->get_name() << " implements org.apache.thrift.TEnum ";
-  scope_up(f_enum);
-  f_enum << endl;
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    generate_java_doc(f_enum, *c_iter);
-    indent(f_enum) << "public static final " << tenum->get_name() << " " << (*c_iter)->get_name()
-                   << " = new " << tenum->get_name() << "(" << value << ");" << endl;
-  }
-  f_enum << endl;
-
-  // Field for thriftCode
-  indent(f_enum) << "private final int value;" << endl << endl;
-
-  indent(f_enum) << "private " << tenum->get_name() << "(int value) {" << endl;
-  indent(f_enum) << "  this.value = value;" << endl;
-  indent(f_enum) << "}" << endl << endl;
-
-  indent(f_enum) << "/**" << endl;
-  indent(f_enum) << " * Get the integer value of this enum value, as defined in the Thrift IDL."
-                 << endl;
-  indent(f_enum) << " */" << endl;
-  indent(f_enum) << "public int getValue() {" << endl;
-  indent(f_enum) << "  return value;" << endl;
-  indent(f_enum) << "}" << endl << endl;
-
-  indent(f_enum) << "/**" << endl;
-  indent(f_enum) << " * Find a the enum type by its integer value, as defined in the Thrift IDL."
-                 << endl;
-  indent(f_enum) << " * @return null if the value is not found." << endl;
-  indent(f_enum) << " */" << endl;
-  indent(f_enum) << "public static " + tenum->get_name() + " findByValue(int value) { " << endl;
-
-  indent_up();
-
-  indent(f_enum) << "switch (value) {" << endl;
-  indent_up();
-
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    indent(f_enum) << "case " << value << ":" << endl;
-    indent(f_enum) << "  return " << (*c_iter)->get_name() << ";" << endl;
-  }
-
-  indent(f_enum) << "default:" << endl;
-  indent(f_enum) << "  return null;" << endl;
-
-  indent_down();
-
-  indent(f_enum) << "}" << endl;
-
-  indent_down();
-
-  indent(f_enum) << "}" << endl;
-
-  scope_down(f_enum);
-
-  f_enum.close();
-}
-
-/**
- * Generates a class that holds all the constants.
- */
-void t_javame_generator::generate_consts(std::vector<t_const*> consts) {
-  if (consts.empty()) {
-    return;
-  }
-
-  string f_consts_name = package_dir_ + "/" + program_name_ + "Constants.java";
-  ofstream f_consts;
-  f_consts.open(f_consts_name.c_str());
-
-  // Print header
-  f_consts << autogen_comment() << java_package() << java_type_imports();
-
-  f_consts << "public class " << program_name_ << "Constants {" << endl << endl;
-  indent_up();
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    print_const_value(f_consts,
-                      (*c_iter)->get_name(),
-                      (*c_iter)->get_type(),
-                      (*c_iter)->get_value(),
-                      false);
-  }
-  indent_down();
-  indent(f_consts) << "}" << endl;
-  f_consts.close();
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-void t_javame_generator::print_const_value(std::ofstream& out,
-                                           string name,
-                                           t_type* type,
-                                           t_const_value* value,
-                                           bool in_static,
-                                           bool defval) {
-  type = get_true_type(type);
-
-  indent(out);
-  if (!defval) {
-    out << (in_static ? "" : "public static final ") << type_name(type) << " ";
-  }
-  if (type->is_base_type()) {
-    string v2 = render_const_value(out, name, type, value);
-    out << name << " = " << v2 << ";" << endl << endl;
-  } else if (type->is_enum()) {
-    out << name << " = " << render_const_value(out, name, type, value) << ";" << endl << endl;
-  } else if (type->is_struct() || type->is_xception()) {
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    out << name << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "static {" << endl;
-      indent_up();
-    }
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string val = render_const_value(out, name, field_type, v_iter->second);
-      indent(out) << name << ".";
-      std::string cap_name = get_cap_name(v_iter->first->get_string());
-      out << "set" << cap_name << "(" << val << ");" << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else if (type->is_map()) {
-    out << name << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "static {" << endl;
-      indent_up();
-    }
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(out, name, ktype, v_iter->first);
-      string val = render_const_value(out, name, vtype, v_iter->second);
-      indent(out) << name << ".put(" << box_type(ktype, key) << ", " << box_type(vtype, val) << ");"
-                  << endl;
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else if (type->is_list() || type->is_set()) {
-    out << name << " = new " << type_name(type, false, true) << "();" << endl;
-    if (!in_static) {
-      indent(out) << "static {" << endl;
-      indent_up();
-    }
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(out, name, etype, *v_iter);
-      if (type->is_list()) {
-        indent(out) << name << ".addElement(" << box_type(etype, val) << ");" << endl;
-      } else {
-        indent(out) << name << ".put(" << box_type(etype, val) << ", " << box_type(etype, val)
-                    << ");" << endl;
-      }
-    }
-    if (!in_static) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    out << endl;
-  } else {
-    throw "compiler error: no const of type " + type->get_name();
-  }
-}
-
-string t_javame_generator::render_const_value(ofstream& out,
-                                              string name,
-                                              t_type* type,
-                                              t_const_value* value) {
-  (void)name;
-  type = get_true_type(type);
-  std::ostringstream render;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      render << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      render << ((value->get_integer() > 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-      render << "(byte)" << value->get_integer();
-      break;
-    case t_base_type::TYPE_I16:
-      render << "(short)" << value->get_integer();
-      break;
-    case t_base_type::TYPE_I32:
-      render << value->get_integer();
-      break;
-    case t_base_type::TYPE_I64:
-      render << value->get_integer() << "L";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        render << "(double)" << value->get_integer();
-      } else {
-        render << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    render << type_name(type, false, false) << "." << value->get_identifier();
-  } else {
-    string t = tmp("tmp");
-    print_const_value(out, t, type, value, true);
-    render << t;
-  }
-
-  return render.str();
-}
-
-string t_javame_generator::box_type(t_type* type, string value) {
-  if (type->is_base_type()) {
-    switch (((t_base_type*)type)->get_base()) {
-    case t_base_type::TYPE_BOOL:
-      return "new Boolean(" + value + ")";
-    case t_base_type::TYPE_I8:
-      return "new Byte(" + value + ")";
-    case t_base_type::TYPE_I16:
-      return "new Short(" + value + ")";
-    case t_base_type::TYPE_I32:
-      return "new Integer(" + value + ")";
-    case t_base_type::TYPE_I64:
-      return "new Long(" + value + ")";
-    case t_base_type::TYPE_DOUBLE:
-      return "new Double(" + value + ")";
-    default:
-      break;
-    }
-  }
-  return value;
-}
-
-/**
- * Generates a struct definition for a thrift data type. This will be a TBase
- * implementor.
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_struct(t_struct* tstruct) {
-  if (tstruct->is_union()) {
-    generate_java_union(tstruct);
-  } else {
-    generate_java_struct(tstruct, false);
-  }
-}
-
-/**
- * Exceptions are structs, but they inherit from Exception
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_xception(t_struct* txception) {
-  generate_java_struct(txception, true);
-}
-
-/**
- * Java struct definition.
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_java_struct(t_struct* tstruct, bool is_exception) {
-  // Make output file
-  string f_struct_name = package_dir_ + "/" + (tstruct->get_name()) + ".java";
-  ofstream f_struct;
-  f_struct.open(f_struct_name.c_str());
-
-  f_struct << autogen_comment() << java_package() << java_type_imports() << java_thrift_imports();
-
-  generate_java_struct_definition(f_struct, tstruct, is_exception);
-  f_struct.close();
-}
-
-/**
- * Java union definition.
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_java_union(t_struct* tstruct) {
-  // Make output file
-  string f_struct_name = package_dir_ + "/" + (tstruct->get_name()) + ".java";
-  ofstream f_struct;
-  f_struct.open(f_struct_name.c_str());
-
-  f_struct << autogen_comment() << java_package() << java_type_imports() << java_thrift_imports();
-
-  generate_java_doc(f_struct, tstruct);
-
-  bool is_final = (tstruct->annotations_.find("final") != tstruct->annotations_.end());
-
-  indent(f_struct) << "public " << (is_final ? "final " : "") << "class " << tstruct->get_name()
-                   << " extends TUnion ";
-
-  scope_up(f_struct);
-
-  generate_struct_desc(f_struct, tstruct);
-  generate_field_descs(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_constructor(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_abstract_methods(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_getters_and_setters(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_comparisons(f_struct, tstruct);
-
-  f_struct << endl;
-
-  generate_union_hashcode(f_struct, tstruct);
-
-  f_struct << endl;
-
-  scope_down(f_struct);
-
-  f_struct.close();
-}
-
-void t_javame_generator::generate_union_constructor(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public " << type_name(tstruct) << "() {" << endl;
-  indent(out) << "  super();" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "public " << type_name(tstruct) << "(_Fields setField, Object value) {" << endl;
-  indent(out) << "  super(setField, value);" << endl;
-  indent(out) << "}" << endl << endl;
-
-  indent(out) << "public " << type_name(tstruct) << "(" << type_name(tstruct) << " other) {"
-              << endl;
-  indent(out) << "  super(other);" << endl;
-  indent(out) << "}" << endl;
-
-  indent(out) << "public " << tstruct->get_name() << " deepCopy() {" << endl;
-  indent(out) << "  return new " << tstruct->get_name() << "(this);" << endl;
-  indent(out) << "}" << endl << endl;
-
-  // generate "constructors" for each field
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "public static " << type_name(tstruct) << " " << (*m_iter)->get_name() << "("
-                << type_name((*m_iter)->get_type()) << " value) {" << endl;
-    indent(out) << "  " << type_name(tstruct) << " x = new " << type_name(tstruct) << "();" << endl;
-    indent(out) << "  x.set" << get_cap_name((*m_iter)->get_name()) << "(value);" << endl;
-    indent(out) << "  return x;" << endl;
-    indent(out) << "}" << endl << endl;
-  }
-}
-
-void t_javame_generator::generate_union_getters_and_setters(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  bool first = true;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (first) {
-      first = false;
-    } else {
-      out << endl;
-    }
-
-    t_field* field = (*m_iter);
-
-    generate_java_doc(out, field);
-    indent(out) << "public " << type_name(field->get_type()) << " get"
-                << get_cap_name(field->get_name()) << "() {" << endl;
-    indent(out) << "  if (getSetField() == _Fields." << constant_name(field->get_name()) << ") {"
-                << endl;
-    indent(out) << "    return (" << type_name(field->get_type(), true) << ")getFieldValue();"
-                << endl;
-    indent(out) << "  } else {" << endl;
-    indent(out) << "    throw new RuntimeException(\"Cannot get field '" << field->get_name()
-                << "' because union is currently set to \" + getFieldDesc(getSetField()).name);"
-                << endl;
-    indent(out) << "  }" << endl;
-    indent(out) << "}" << endl;
-
-    out << endl;
-
-    generate_java_doc(out, field);
-    indent(out) << "public void set" << get_cap_name(field->get_name()) << "("
-                << type_name(field->get_type()) << " value) {" << endl;
-    if (type_can_be_null(field->get_type())) {
-      indent(out) << "  if (value == null) throw new NullPointerException();" << endl;
-    }
-    indent(out) << "  setField_ = _Fields." << constant_name(field->get_name()) << ";" << endl;
-    indent(out) << "  value_ = value;" << endl;
-    indent(out) << "}" << endl;
-  }
-}
-
-void t_javame_generator::generate_union_abstract_methods(ofstream& out, t_struct* tstruct) {
-  generate_check_type(out, tstruct);
-  out << endl;
-  generate_read_value(out, tstruct);
-  out << endl;
-  generate_write_value(out, tstruct);
-  out << endl;
-  generate_get_field_desc(out, tstruct);
-  out << endl;
-  generate_get_struct_desc(out, tstruct);
-  out << endl;
-}
-
-void t_javame_generator::generate_check_type(ofstream& out, t_struct* tstruct) {
-  indent(out)
-      << "protected void checkType(_Fields setField, Object value) throws ClassCastException {"
-      << endl;
-  indent_up();
-
-  indent(out) << "switch (setField) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent(out) << "  if (value instanceof " << type_name(field->get_type(), true, false, true)
-                << ") {" << endl;
-    indent(out) << "    break;" << endl;
-    indent(out) << "  }" << endl;
-    indent(out) << "  throw new ClassCastException(\"Was expecting value of type "
-                << type_name(field->get_type(), true, false) << " for field '" << field->get_name()
-                << "', but got \" + value.getClass().getSimpleName());" << endl;
-    // do the real check here
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new IllegalArgumentException(\"Unknown field id \" + setField);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_javame_generator::generate_read_value(ofstream& out, t_struct* tstruct) {
-  indent(out) << "protected Object readValue(TProtocol iprot, TField field) throws TException {"
-              << endl;
-
-  indent_up();
-
-  indent(out) << "_Fields setField = _Fields.findByThriftId(field.id);" << endl;
-  indent(out) << "if (setField != null) {" << endl;
-  indent_up();
-  indent(out) << "switch (setField) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << "if (field.type == " << constant_name(field->get_name()) << "_FIELD_DESC.type) {"
-                << endl;
-    indent_up();
-    indent(out) << type_name(field->get_type(), true, false) << " " << field->get_name() << ";"
-                << endl;
-    generate_deserialize_field(out, field, "");
-    indent(out) << "return " << field->get_name() << ";" << endl;
-    indent_down();
-    indent(out) << "} else {" << endl;
-    indent(out) << "  TProtocolUtil.skip(iprot, field.type);" << endl;
-    indent(out) << "  return null;" << endl;
-    indent(out) << "}" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new IllegalStateException(\"setField wasn't null, but didn't match any "
-                 "of the case statements!\");" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "} else {" << endl;
-  indent_up();
-  indent(out) << "TProtocolUtil.skip(iprot, field.type);" << endl;
-  indent(out) << "return null;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_javame_generator::generate_write_value(ofstream& out, t_struct* tstruct) {
-  indent(out) << "protected void writeValue(TProtocol oprot) throws TException {" << endl;
-
-  indent_up();
-
-  indent(out) << "switch (setField_) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent_up();
-    indent(out) << type_name(field->get_type(), true, false) << " " << field->get_name() << " = ("
-                << type_name(field->get_type(), true, false) << ")value_;" << endl;
-    generate_serialize_field(out, field, "");
-    indent(out) << "return;" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new IllegalStateException(\"Cannot write union with unknown field \" + "
-                 "setField_);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-
-  indent(out) << "}" << endl;
-}
-
-void t_javame_generator::generate_get_field_desc(ofstream& out, t_struct* tstruct) {
-  indent(out) << "protected TField getFieldDesc(_Fields setField) {" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  indent(out) << "switch (setField) {" << endl;
-  indent_up();
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-    indent(out) << "case " << constant_name(field->get_name()) << ":" << endl;
-    indent(out) << "  return " << constant_name(field->get_name()) << "_FIELD_DESC;" << endl;
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  throw new IllegalArgumentException(\"Unknown field id \" + setField);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-void t_javame_generator::generate_get_struct_desc(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out) << "protected TStruct getStructDesc() {" << endl;
-  indent(out) << "  return STRUCT_DESC;" << endl;
-  indent(out) << "}" << endl;
-}
-
-void t_javame_generator::generate_union_comparisons(ofstream& out, t_struct* tstruct) {
-  // equality
-  indent(out) << "public boolean equals(Object other) {" << endl;
-  indent(out) << "  if (other instanceof " << tstruct->get_name() << ") {" << endl;
-  indent(out) << "    return equals((" << tstruct->get_name() << ")other);" << endl;
-  indent(out) << "  } else {" << endl;
-  indent(out) << "    return false;" << endl;
-  indent(out) << "  }" << endl;
-  indent(out) << "}" << endl;
-
-  out << endl;
-
-  indent(out) << "public boolean equals(" << tstruct->get_name() << " other) {" << endl;
-  indent(out) << "  return other != null && getSetField() == other.getSetField() && "
-                 "getFieldValue().equals(other.getFieldValue());" << endl;
-  indent(out) << "}" << endl;
-  out << endl;
-
-  indent(out) << "public int compareTo(" << type_name(tstruct) << " other) {" << endl;
-  indent(out) << "  int lastComparison = TBaseHelper.compareTo(getSetField(), other.getSetField());"
-              << endl;
-  indent(out) << "  if (lastComparison == 0) {" << endl;
-  indent(out) << "    return TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());"
-              << endl;
-  indent(out) << "  }" << endl;
-  indent(out) << "  return lastComparison;" << endl;
-  indent(out) << "}" << endl;
-  out << endl;
-}
-
-void t_javame_generator::generate_union_hashcode(ofstream& out, t_struct* tstruct) {
-  (void)tstruct;
-  indent(out) << "/**" << endl;
-  indent(out)
-      << " * If you'd like this to perform more respectably, use the hashcode generator option."
-      << endl;
-  indent(out) << " */" << endl;
-  indent(out) << "public int hashCode() {" << endl;
-  indent(out) << "  return 0;" << endl;
-  indent(out) << "}" << endl;
-}
-
-/**
- * Java struct definition. This has various parameters, as it could be
- * generated standalone or inside another class as a helper. If it
- * is a helper than it is a static class.
- *
- * @param tstruct      The struct definition
- * @param is_exception Is this an exception?
- * @param in_class     If inside a class, needs to be static class
- * @param is_result    If this is a result it needs a different writer
- */
-void t_javame_generator::generate_java_struct_definition(ofstream& out,
-                                                         t_struct* tstruct,
-                                                         bool is_exception,
-                                                         bool in_class,
-                                                         bool is_result) {
-  generate_java_doc(out, tstruct);
-
-  bool is_final = (tstruct->annotations_.find("final") != tstruct->annotations_.end());
-
-  indent(out) << "public " << (is_final ? "final " : "") << (in_class ? "static " : "") << "class "
-              << tstruct->get_name() << " ";
-
-  if (is_exception) {
-    out << "extends Exception ";
-  }
-  out << "implements TBase ";
-
-  scope_up(out);
-
-  generate_struct_desc(out, tstruct);
-
-  // Members are public for -java, private for -javabean
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  out << endl;
-
-  generate_field_descs(out, tstruct);
-
-  out << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "private ";
-    out << declare_field(*m_iter, false) << endl;
-  }
-
-  // isset data
-  if (members.size() > 0) {
-    out << endl;
-
-    indent(out) << "// isset id assignments" << endl;
-
-    int i = 0;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (!type_can_be_null((*m_iter)->get_type())) {
-        indent(out) << "private static final int " << isset_field_id(*m_iter) << " = " << i << ";"
-                    << endl;
-        i++;
-      }
-    }
-
-    if (i > 0) {
-      indent(out) << "private boolean[] __isset_vector = new boolean[" << i << "];" << endl;
-    }
-
-    out << endl;
-  }
-
-  bool all_optional_members = true;
-
-  // Default constructor
-  indent(out) << "public " << tstruct->get_name() << "() {" << endl;
-  indent_up();
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if ((*m_iter)->get_value() != NULL) {
-      print_const_value(out,
-                        "this." + (*m_iter)->get_name(),
-                        t,
-                        (*m_iter)->get_value(),
-                        true,
-                        true);
-    }
-    if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
-      all_optional_members = false;
-    }
-  }
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  if (!members.empty() && !all_optional_members) {
-    // Full constructor for all fields
-    indent(out) << "public " << tstruct->get_name() << "(" << endl;
-    indent_up();
-    bool first = true;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
-        if (!first) {
-          out << "," << endl;
-        }
-        first = false;
-        indent(out) << type_name((*m_iter)->get_type()) << " " << (*m_iter)->get_name();
-      }
-    }
-    out << ")" << endl;
-    indent_down();
-    indent(out) << "{" << endl;
-    indent_up();
-    indent(out) << "this();" << endl;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if ((*m_iter)->get_req() != t_field::T_OPTIONAL) {
-        indent(out) << "this." << (*m_iter)->get_name() << " = " << (*m_iter)->get_name() << ";"
-                    << endl;
-        generate_isset_set(out, (*m_iter));
-      }
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-
-  // copy constructor
-  indent(out) << "/**" << endl;
-  indent(out) << " * Performs a deep copy on <i>other</i>." << endl;
-  indent(out) << " */" << endl;
-  indent(out) << "public " << tstruct->get_name() << "(" << tstruct->get_name() << " other) {"
-              << endl;
-  indent_up();
-
-  if (has_bit_vector(tstruct)) {
-    indent(out) << "System.arraycopy(other.__isset_vector, 0, __isset_vector, 0, "
-                   "other.__isset_vector.length);" << endl;
-  }
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = (*m_iter);
-    std::string field_name = field->get_name();
-    t_type* type = field->get_type();
-    bool can_be_null = type_can_be_null(type);
-
-    if (can_be_null) {
-      indent(out) << "if (other." << generate_isset_check(field) << ") {" << endl;
-      indent_up();
-    }
-
-    if (type->is_container()) {
-      generate_deep_copy_container(out, "other", field_name, "__this__" + field_name, type);
-      indent(out) << "this." << field_name << " = __this__" << field_name << ";" << endl;
-    } else {
-      indent(out) << "this." << field_name << " = ";
-      generate_deep_copy_non_container(out, "other." + field_name, field_name, type);
-      out << ";" << endl;
-    }
-
-    if (can_be_null) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-
-  // clone method, so that you can deep copy an object when you don't know its class.
-  indent(out) << "public " << tstruct->get_name() << " deepCopy() {" << endl;
-  indent(out) << "  return new " << tstruct->get_name() << "(this);" << endl;
-  indent(out) << "}" << endl << endl;
-
-  generate_java_struct_clear(out, tstruct);
-
-  generate_java_bean_boilerplate(out, tstruct);
-  generate_generic_field_getters_setters(out, tstruct);
-
-  generate_java_struct_equality(out, tstruct);
-  generate_java_struct_compare_to(out, tstruct);
-
-  generate_java_struct_reader(out, tstruct);
-  if (is_result) {
-    generate_java_struct_result_writer(out, tstruct);
-  } else {
-    generate_java_struct_writer(out, tstruct);
-  }
-  generate_java_struct_tostring(out, tstruct);
-  generate_java_validator(out, tstruct);
-  scope_down(out);
-  out << endl;
-}
-
-/**
- * Generates equals methods and a hashCode method for a structure.
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_java_struct_equality(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public boolean equals(Object that) {" << endl;
-  indent_up();
-  out << indent() << "if (that == null)" << endl << indent() << "  return false;" << endl
-      << indent() << "if (that instanceof " << tstruct->get_name() << ")" << endl << indent()
-      << "  return this.equals((" << tstruct->get_name() << ")that);" << endl << indent()
-      << "return false;" << endl;
-  scope_down(out);
-  out << endl;
-
-  out << indent() << "public boolean equals(" << tstruct->get_name() << " that) {" << endl;
-  indent_up();
-  out << indent() << "if (that == null)" << endl << indent() << "  return false;" << endl
-      << indent() << "if (this == that)" << endl << indent() << "  return true;"  << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    out << endl;
-
-    t_type* t = get_true_type((*m_iter)->get_type());
-    // Most existing Thrift code does not use isset or optional/required,
-    // so we treat "default" fields as required.
-    bool is_optional = (*m_iter)->get_req() == t_field::T_OPTIONAL;
-    bool can_be_null = type_can_be_null(t);
-    string name = (*m_iter)->get_name();
-
-    string this_present = "true";
-    string that_present = "true";
-    string unequal;
-
-    if (is_optional || can_be_null) {
-      this_present += " && this." + generate_isset_check(*m_iter);
-      that_present += " && that." + generate_isset_check(*m_iter);
-    }
-
-    out << indent() << "boolean this_present_" << name << " = " << this_present << ";" << endl
-        << indent() << "boolean that_present_" << name << " = " << that_present << ";" << endl
-        << indent() << "if ("
-        << "this_present_" << name << " || that_present_" << name << ") {" << endl;
-    indent_up();
-    out << indent() << "if (!("
-        << "this_present_" << name << " && that_present_" << name << "))" << endl << indent()
-        << "  return false;" << endl;
-
-    if (t->is_base_type() && ((t_base_type*)t)->is_binary()) {
-      unequal = "TBaseHelper.compareTo(this." + name + ", that." + name + ") != 0";
-    } else if (can_be_null) {
-      unequal = "!this." + name + ".equals(that." + name + ")";
-    } else {
-      unequal = "this." + name + " != that." + name;
-    }
-
-    out << indent() << "if (" << unequal << ")" << endl << indent() << "  return false;" << endl;
-
-    scope_down(out);
-  }
-  out << endl;
-  indent(out) << "return true;" << endl;
-  scope_down(out);
-  out << endl;
-
-  out << indent() << "public int hashCode() {" << endl;
-  indent_up();
-  indent(out) << "return 0;" << endl;
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-void t_javame_generator::generate_java_struct_compare_to(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public int compareTo(Object otherObject) {" << endl;
-  //  indent(out) << "public int compareTo(" << type_name(tstruct) << " other) {" << endl;
-  indent_up();
-
-  indent(out) << "if (!getClass().equals(otherObject.getClass())) {" << endl;
-  indent(out) << "  return getClass().getName().compareTo(otherObject.getClass().getName());"
-              << endl;
-  indent(out) << "}" << endl;
-  out << endl;
-  indent(out) << type_name(tstruct) << " other = (" << type_name(tstruct) << ")otherObject;";
-
-  indent(out) << "int lastComparison = 0;" << endl;
-  out << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_field* field = *m_iter;
-    indent(out) << "lastComparison = TBaseHelper.compareTo(" << generate_isset_check(field)
-                << ", other." << generate_isset_check(field) << ");" << endl;
-    indent(out) << "if (lastComparison != 0) {" << endl;
-    indent(out) << "  return lastComparison;" << endl;
-    indent(out) << "}" << endl;
-
-    indent(out) << "if (" << generate_isset_check(field) << ") {" << endl;
-    if (field->get_type()->is_struct() || field->get_type()->is_xception()) {
-      indent(out) << "  lastComparison = this." << field->get_name() << ".compareTo(other."
-                  << field->get_name() << ");" << endl;
-    } else {
-      indent(out) << "  lastComparison = TBaseHelper.compareTo(this." << field->get_name()
-                  << ", other." << field->get_name() << ");" << endl;
-    }
-
-    indent(out) << "  if (lastComparison != 0) {" << endl;
-    indent(out) << "    return lastComparison;" << endl;
-    indent(out) << "  }" << endl;
-    indent(out) << "}" << endl;
-  }
-
-  indent(out) << "return 0;" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a function to read all the fields of the struct.
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_java_struct_reader(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public void read(TProtocol iprot) throws TException {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Declare stack tmp variables and read struct header
-  out << indent() << "TField field;" << endl << indent() << "iprot.readStructBegin();" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (true)" << endl;
-  scope_up(out);
-
-  // Read beginning field marker
-  indent(out) << "field = iprot.readFieldBegin();" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if (field.type == TType.STOP) { " << endl;
-  indent_up();
-  indent(out) << "break;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  // Switch statement on the field we are reading
-  indent(out) << "switch (field.id) {" << endl;
-
-  indent_up();
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << (*f_iter)->get_key() << ": // "
-                << constant_name((*f_iter)->get_name()) << endl;
-    indent_up();
-    indent(out) << "if (field.type == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-    indent_up();
-
-    generate_deserialize_field(out, *f_iter, "this.");
-    generate_isset_set(out, *f_iter);
-    indent_down();
-    out << indent() << "} else { " << endl << indent() << "  TProtocolUtil.skip(iprot, field.type);"
-        << endl << indent() << "}" << endl << indent() << "break;" << endl;
-    indent_down();
-  }
-
-  indent(out) << "default:" << endl;
-  indent(out) << "  TProtocolUtil.skip(iprot, field.type);" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  // Read field end marker
-  indent(out) << "iprot.readFieldEnd();" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl;
-
-  out << indent() << "iprot.readStructEnd();" << endl;
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "validate();" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-// generates java method to perform various checks
-// (e.g. check that all required fields are set)
-void t_javame_generator::generate_java_validator(ofstream& out, t_struct* tstruct) {
-  indent(out) << "public void validate() throws TException {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << indent() << "// check for required fields" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
-      out << indent() << "if (!" << generate_isset_check(*f_iter) << ") {" << endl << indent()
-          << "  throw new TProtocolException(\"Required field '" << (*f_iter)->get_name()
-          << "' is unset! Struct:\" + toString());" << endl << indent() << "}" << endl << endl;
-    }
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_java_struct_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public void write(TProtocol oprot) throws TException {" << endl;
-  indent_up();
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // performs various checks (e.g. check that all required fields are set)
-  indent(out) << "validate();" << endl << endl;
-
-  indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool null_allowed = type_can_be_null((*f_iter)->get_type());
-    if (null_allowed) {
-      out << indent() << "if (this." << (*f_iter)->get_name() << " != null) {" << endl;
-      indent_up();
-    }
-    bool optional = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (optional) {
-      indent(out) << "if (" << generate_isset_check((*f_iter)) << ") {" << endl;
-      indent_up();
-    }
-
-    indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    if (optional) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    if (null_allowed) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-  // Write the struct map
-  out << indent() << "oprot.writeFieldStop();" << endl << indent() << "oprot.writeStructEnd();"
-      << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a function to write all the fields of the struct,
- * which is a function result. These fields are only written
- * if they are set in the Isset array, and only one of them
- * can be set at a time.
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_java_struct_result_writer(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public void write(TProtocol oprot) throws TException {" << endl;
-  indent_up();
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "oprot.writeStructBegin(STRUCT_DESC);" << endl;
-
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      out << endl << indent() << "if ";
-    } else {
-      out << " else if ";
-    }
-
-    out << "(this." << generate_isset_check(*f_iter) << ") {" << endl;
-
-    indent_up();
-
-    indent(out) << "oprot.writeFieldBegin(" << constant_name((*f_iter)->get_name())
-                << "_FIELD_DESC);" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd();" << endl;
-
-    indent_down();
-    indent(out) << "}";
-  }
-  // Write the struct map
-  out << endl << indent() << "oprot.writeFieldStop();" << endl << indent()
-      << "oprot.writeStructEnd();" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-void t_javame_generator::generate_reflection_getters(ostringstream& out,
-                                                     t_type* type,
-                                                     string field_name,
-                                                     string cap_name) {
-  indent(out) << "case " << constant_name(field_name) << ":" << endl;
-  indent_up();
-
-  if (type->is_base_type() && !type->is_string()) {
-    t_base_type* base_type = (t_base_type*)type;
-
-    indent(out) << "return new " << type_name(type, true, false) << "("
-                << (base_type->is_bool() ? "is" : "get") << cap_name << "());" << endl << endl;
-  } else {
-    indent(out) << "return get" << cap_name << "();" << endl << endl;
-  }
-
-  indent_down();
-}
-
-void t_javame_generator::generate_reflection_setters(ostringstream& out,
-                                                     t_type* type,
-                                                     string field_name,
-                                                     string cap_name) {
-  indent(out) << "case " << constant_name(field_name) << ":" << endl;
-  indent_up();
-  indent(out) << "if (value == null) {" << endl;
-  indent(out) << "  unset" << get_cap_name(field_name) << "();" << endl;
-  indent(out) << "} else {" << endl;
-  indent(out) << "  set" << cap_name << "((" << type_name(type, true, false) << ")value);" << endl;
-  indent(out) << "}" << endl;
-  indent(out) << "break;" << endl << endl;
-
-  indent_down();
-}
-
-void t_javame_generator::generate_generic_field_getters_setters(std::ofstream& out,
-                                                                t_struct* tstruct) {
-  (void)out;
-  std::ostringstream getter_stream;
-  std::ostringstream setter_stream;
-
-  // build up the bodies of both the getter and setter at once
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = get_cap_name(field_name);
-
-    indent_up();
-    generate_reflection_setters(setter_stream, type, field_name, cap_name);
-    generate_reflection_getters(getter_stream, type, field_name, cap_name);
-    indent_down();
-  }
-}
-
-/**
- * Generates a set of Java Bean boilerplate functions (setters, getters, etc.)
- * for the given struct.
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_java_bean_boilerplate(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = *f_iter;
-    t_type* type = get_true_type(field->get_type());
-    std::string field_name = field->get_name();
-    std::string cap_name = get_cap_name(field_name);
-
-    if (type->is_container()) {
-      // Method to return the size of the collection
-      indent(out) << "public int get" << cap_name;
-      out << get_cap_name("size() {") << endl;
-
-      indent_up();
-      indent(out) << "return (this." << field_name << " == null) ? 0 : "
-                  << "this." << field_name << ".size();" << endl;
-      indent_down();
-      indent(out) << "}" << endl << endl;
-    }
-
-    if (type->is_set() || type->is_list()) {
-
-      t_type* element_type;
-      if (type->is_set()) {
-        element_type = ((t_set*)type)->get_elem_type();
-      } else {
-        element_type = ((t_list*)type)->get_elem_type();
-      }
-
-      // Iterator getter for sets and lists
-      indent(out) << "public Enumeration get" << cap_name;
-      out << get_cap_name("Enumeration() {") << endl;
-
-      indent_up();
-      indent(out) << "return (this." << field_name << " == null) ? null : "
-                  << "this." << field_name << ".elements();" << endl;
-      indent_down();
-      indent(out) << "}" << endl << endl;
-
-      // Add to set or list, create if the set/list is null
-      indent(out);
-      out << "public void add" << get_cap_name("to");
-      out << cap_name << "(" << type_name(element_type) << " elem) {" << endl;
-
-      indent_up();
-      indent(out) << "if (this." << field_name << " == null) {" << endl;
-      indent_up();
-      indent(out) << "this." << field_name << " = new " << type_name(type, false, true) << "();"
-                  << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-      if (type->is_set()) {
-        indent(out) << "this." << field_name << ".put(" << box_type(element_type, "elem") << ", "
-                    << box_type(element_type, "elem") << ");" << endl;
-      } else {
-        indent(out) << "this." << field_name << ".addElement(" << box_type(element_type, "elem")
-                    << ");" << endl;
-      }
-      indent_down();
-      indent(out) << "}" << endl << endl;
-
-    } else if (type->is_map()) {
-      // Put to map
-      t_type* key_type = ((t_map*)type)->get_key_type();
-      t_type* val_type = ((t_map*)type)->get_val_type();
-
-      indent(out);
-      out << "public void putTo" << cap_name << "(" << type_name(key_type, true) << " key, "
-          << type_name(val_type, true) << " val) {" << endl;
-
-      indent_up();
-      indent(out) << "if (this." << field_name << " == null) {" << endl;
-      indent_up();
-      indent(out) << "this." << field_name << " = new " << type_name(type, false, true) << "();"
-                  << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-      indent(out) << "this." << field_name << ".put(key, val);" << endl;
-      indent_down();
-      indent(out) << "}" << endl << endl;
-    }
-
-    // Simple getter
-    generate_java_doc(out, field);
-    indent(out) << "public " << type_name(type);
-    if (type->is_base_type() && ((t_base_type*)type)->get_base() == t_base_type::TYPE_BOOL) {
-      out << " is";
-    } else {
-      out << " get";
-    }
-    out << cap_name << "() {" << endl;
-    indent_up();
-    indent(out) << "return this." << field_name << ";" << endl;
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // Simple setter
-    generate_java_doc(out, field);
-    indent(out) << "public ";
-    out << "void";
-    out << " set" << cap_name << "(" << type_name(type) << " " << field_name << ") {" << endl;
-    indent_up();
-    indent(out) << "this." << field_name << " = " << field_name << ";" << endl;
-    generate_isset_set(out, field);
-
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // Unsetter
-    indent(out) << "public void unset" << cap_name << "() {" << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "this." << field_name << " = null;" << endl;
-    } else {
-      indent(out) << "__isset_vector[" << isset_field_id(field) << "] = false;" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    // isSet method
-    indent(out) << "/** Returns true if field " << field_name
-                << " is set (has been assigned a value) and false otherwise */" << endl;
-    indent(out) << "public boolean is" << get_cap_name("set") << cap_name << "() {" << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "return this." << field_name << " != null;" << endl;
-    } else {
-      indent(out) << "return __isset_vector[" << isset_field_id(field) << "];" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-
-    indent(out) << "public void set" << cap_name << get_cap_name("isSet") << "(boolean value) {"
-                << endl;
-    indent_up();
-    if (type_can_be_null(type)) {
-      indent(out) << "if (!value) {" << endl;
-      indent(out) << "  this." << field_name << " = null;" << endl;
-      indent(out) << "}" << endl;
-    } else {
-      indent(out) << "__isset_vector[" << isset_field_id(field) << "] = value;" << endl;
-    }
-    indent_down();
-    indent(out) << "}" << endl << endl;
-  }
-}
-
-/**
- * Generates a toString() method for the given struct
- *
- * @param tstruct The struct definition
- */
-void t_javame_generator::generate_java_struct_tostring(ofstream& out, t_struct* tstruct) {
-  out << indent() << "public String toString() {" << endl;
-  indent_up();
-
-  out << indent() << "StringBuffer sb = new StringBuffer(\"" << tstruct->get_name() << "(\");"
-      << endl;
-  out << indent() << "boolean first = true;" << endl << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool could_be_unset = (*f_iter)->get_req() == t_field::T_OPTIONAL;
-    if (could_be_unset) {
-      indent(out) << "if (" << generate_isset_check(*f_iter) << ") {" << endl;
-      indent_up();
-    }
-
-    t_field* field = (*f_iter);
-
-    if (!first) {
-      indent(out) << "if (!first) sb.append(\", \");" << endl;
-    }
-    indent(out) << "sb.append(\"" << (*f_iter)->get_name() << ":\");" << endl;
-    bool can_be_null = type_can_be_null(field->get_type());
-    if (can_be_null) {
-      indent(out) << "if (this." << (*f_iter)->get_name() << " == null) {" << endl;
-      indent(out) << "  sb.append(\"null\");" << endl;
-      indent(out) << "} else {" << endl;
-      indent_up();
-    }
-
-    if (field->get_type()->is_base_type() && ((t_base_type*)(field->get_type()))->is_binary()) {
-      indent(out) << "TBaseHelper.toString(this." << field->get_name() << ", sb);" << endl;
-    } else {
-      indent(out) << "sb.append(this." << (*f_iter)->get_name() << ");" << endl;
-    }
-
-    if (can_be_null) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    indent(out) << "first = false;" << endl;
-
-    if (could_be_unset) {
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-    first = false;
-  }
-  out << indent() << "sb.append(\")\");" << endl << indent() << "return sb.toString();" << endl;
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-/**
- * Returns a string with the java representation of the given thrift type
- * (e.g. for the type struct it returns "TType.STRUCT")
- */
-std::string t_javame_generator::get_java_type_string(t_type* type) {
-  if (type->is_list()) {
-    return "TType.LIST";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_enum()) {
-    return "TType.ENUM";
-  } else if (type->is_typedef()) {
-    return get_java_type_string(((t_typedef*)type)->get_type());
-  } else if (type->is_base_type()) {
-    switch (((t_base_type*)type)->get_base()) {
-    case t_base_type::TYPE_VOID:
-      return "TType.VOID";
-      break;
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-      break;
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-      break;
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-      break;
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-      break;
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-      break;
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-      break;
-    default:
-      throw std::runtime_error("Unknown thrift type \"" + type->get_name()
-                               + "\" passed to t_javame_generator::get_java_type_string!");
-      break; // This should never happen!
-    }
-  } else {
-    throw std::runtime_error(
-        "Unknown thrift type \"" + type->get_name()
-        + "\" passed to t_javame_generator::get_java_type_string!"); // This should never happen!
-  }
-}
-
-void t_javame_generator::generate_field_value_meta_data(std::ofstream& out, t_type* type) {
-  out << endl;
-  indent_up();
-  indent_up();
-  if (type->is_struct() || type->is_xception()) {
-    indent(out) << "new StructMetaData(TType.STRUCT, " << type_name(type) << ".class";
-  } else if (type->is_container()) {
-    if (type->is_list()) {
-      indent(out) << "new ListMetaData(TType.LIST, ";
-      t_type* elem_type = ((t_list*)type)->get_elem_type();
-      generate_field_value_meta_data(out, elem_type);
-    } else if (type->is_set()) {
-      indent(out) << "new SetMetaData(TType.SET, ";
-      t_type* elem_type = ((t_list*)type)->get_elem_type();
-      generate_field_value_meta_data(out, elem_type);
-    } else { // map
-      indent(out) << "new MapMetaData(TType.MAP, ";
-      t_type* key_type = ((t_map*)type)->get_key_type();
-      t_type* val_type = ((t_map*)type)->get_val_type();
-      generate_field_value_meta_data(out, key_type);
-      out << ", ";
-      generate_field_value_meta_data(out, val_type);
-    }
-  } else if (type->is_enum()) {
-    indent(out) << "new EnumMetaData(TType.ENUM, " << type_name(type) << ".class";
-  } else {
-    indent(out) << "new FieldValueMetaData(" << get_java_type_string(type);
-    if (type->is_typedef()) {
-      indent(out) << ", \"" << ((t_typedef*)type)->get_symbolic() << "\"";
-    }
-  }
-  out << ")";
-  indent_down();
-  indent_down();
-}
-
-/**
- * Generates a thrift service. In C++, this comprises an entirely separate
- * header and source file. The header file defines the methods and includes
- * the data types defined in the main header file, and the implementation
- * file contains implementations of the basic printer and default interfaces.
- *
- * @param tservice The service definition
- */
-void t_javame_generator::generate_service(t_service* tservice) {
-  // Make output file
-  string f_service_name = package_dir_ + "/" + service_name_ + ".java";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << autogen_comment() << java_package() << java_type_imports() << java_thrift_imports();
-
-  f_service_ << "public class " << service_name_ << " {" << endl << endl;
-  indent_up();
-
-  // Generate the three main parts of the service
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-  generate_service_helpers(tservice);
-
-  indent_down();
-  f_service_ << "}" << endl;
-  f_service_.close();
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_javame_generator::generate_primitive_service_interface(t_service* tservice) {
-  f_service_ << indent() << "public interface Iface extends " << service_name_ << "Iface { }"
-             << endl << endl;
-
-  string f_interface_name = package_dir_ + "/" + service_name_ + "Iface.java";
-  std::ofstream f_iface;
-  f_iface.open(f_interface_name.c_str());
-
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends_iface = " extends " + type_name(tservice->get_extends()) + "Iface";
-  }
-
-  f_iface << autogen_comment() << java_package() << java_type_imports() << java_thrift_imports();
-  generate_java_doc(f_iface, tservice);
-  f_iface << "public interface " << service_name_ << "Iface" << extends_iface << " {" << endl
-          << endl;
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_java_doc(f_iface, *f_iter);
-    f_iface << "  public " << function_signature(*f_iter) << ";" << endl << endl;
-  }
-  f_iface << "}" << endl << endl;
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_javame_generator::generate_service_interface(t_service* tservice) {
-  string extends = "";
-  string extends_iface = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_iface = " extends " + extends + ".Iface";
-  }
-
-  generate_java_doc(f_service_, tservice);
-  f_service_ << indent() << "public interface Iface" << extends_iface << " {" << endl << endl;
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_java_doc(f_service_, *f_iter);
-    indent(f_service_) << "public " << function_signature(*f_iter) << ";" << endl << endl;
-  }
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates structs for all the service args and return types
- *
- * @param tservice The service
- */
-void t_javame_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_java_struct_definition(f_service_, ts, false, true);
-    generate_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_javame_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_client = " extends " + extends + ".Client";
-  }
-
-  indent(f_service_) << "public static class Client" << extends_client
-                     << " implements TServiceClient, Iface {" << endl;
-  indent_up();
-
-  indent(f_service_) << "public Client(TProtocol prot)" << endl;
-  scope_up(f_service_);
-  indent(f_service_) << "this(prot, prot);" << endl;
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  indent(f_service_) << "public Client(TProtocol iprot, TProtocol oprot)" << endl;
-  scope_up(f_service_);
-  if (extends.empty()) {
-    f_service_ << indent() << "iprot_ = iprot;" << endl << indent() << "oprot_ = oprot;" << endl;
-  } else {
-    f_service_ << indent() << "super(iprot, oprot);" << endl;
-  }
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent() << "protected TProtocol iprot_;" << endl << indent()
-               << "protected TProtocol oprot_;" << endl << endl << indent()
-               << "protected int seqid_;" << endl << endl;
-
-    indent(f_service_) << "public TProtocol getInputProtocol()" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "return this.iprot_;" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    indent(f_service_) << "public TProtocol getOutputProtocol()" << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "return this.oprot_;" << endl;
-    scope_down(f_service_);
-    f_service_ << endl;
-  }
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = (*f_iter)->get_name();
-
-    // Open function
-    indent(f_service_) << "public " << function_signature(*f_iter) << endl;
-    scope_up(f_service_);
-    indent(f_service_) << "send_" << funname << "(";
-
-    // Get the struct of function call params
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-
-    // Declare the function arguments
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    bool first = true;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << (*fld_iter)->get_name();
-    }
-    f_service_ << ");" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_service_ << indent();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << "return ";
-      }
-      f_service_ << "recv_" << funname << "();" << endl;
-    }
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    t_function send_function(g_type_void,
-                             string("send_") + (*f_iter)->get_name(),
-                             (*f_iter)->get_arglist());
-
-    string argsname = (*f_iter)->get_name() + "_args";
-
-    // Open function
-    indent(f_service_) << "public " << function_signature(&send_function) << endl;
-    scope_up(f_service_);
-
-    // Serialize the request
-    f_service_ << indent() << "oprot_.writeMessageBegin(new TMessage(\"" << funname << "\", "
-               << ((*f_iter)->is_oneway() ? "TMessageType.ONEWAY" : "TMessageType.CALL")
-               << ", ++seqid_));" << endl << indent() << argsname << " args = new " << argsname
-               << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "args.set" << get_cap_name((*fld_iter)->get_name()) << "("
-                 << (*fld_iter)->get_name() << ");" << endl;
-    }
-
-    f_service_ << indent() << "args.write(oprot_);" << endl << indent()
-               << "oprot_.writeMessageEnd();" << endl << indent()
-               << "oprot_.getTransport().flush();" << endl;
-
-    scope_down(f_service_);
-    f_service_ << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      string resultname = (*f_iter)->get_name() + "_result";
-
-      t_struct noargs(program_);
-      t_function recv_function((*f_iter)->get_returntype(),
-                               string("recv_") + (*f_iter)->get_name(),
-                               &noargs,
-                               (*f_iter)->get_xceptions());
-      // Open function
-      indent(f_service_) << "public " << function_signature(&recv_function) << endl;
-      scope_up(f_service_);
-
-      f_service_ << indent() << "TMessage msg = iprot_.readMessageBegin();" << endl << indent()
-                 << "if (msg.type == TMessageType.EXCEPTION) {" << endl << indent()
-                 << "  TApplicationException x = TApplicationException.read(iprot_);" << endl
-                 << indent() << "  iprot_.readMessageEnd();" << endl << indent() << "  throw x;"
-                 << endl << indent() << "}" << endl << indent() << "if (msg.seqid != seqid_) {"
-                 << endl << indent()
-                 << "  throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, \""
-                 << (*f_iter)->get_name() << " failed: out of sequence response\");" << endl
-                 << indent() << "}" << endl << indent() << resultname << " result = new "
-                 << resultname << "();" << endl << indent() << "result.read(iprot_);" << endl
-                 << indent() << "iprot_.readMessageEnd();" << endl;
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << indent() << "if (result." << generate_isset_check("success") << ") {" << endl
-                   << indent() << "  return result.success;" << endl << indent() << "}" << endl;
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "if (result." << (*x_iter)->get_name() << " != null) {" << endl
-                   << indent() << "  throw result." << (*x_iter)->get_name() << ";" << endl
-                   << indent() << "}" << endl;
-      }
-
-      // If you get here it's an exception, unless a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "return;" << endl;
-      } else {
-        f_service_ << indent()
-                   << "throw new TApplicationException(TApplicationException.MISSING_RESULT, \""
-                   << (*f_iter)->get_name() << " failed: unknown result\");" << endl;
-      }
-
-      // Close function
-      scope_down(f_service_);
-      f_service_ << endl;
-    }
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl;
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_javame_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  // Extends stuff
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_processor = " extends " + extends + ".Processor";
-  }
-
-  // Generate the header portion
-  indent(f_service_) << "public static class Processor" << extends_processor
-                     << " implements TProcessor {" << endl;
-  indent_up();
-
-  indent(f_service_) << "public Processor(Iface iface)" << endl;
-  scope_up(f_service_);
-  if (!extends.empty()) {
-    f_service_ << indent() << "super(iface);" << endl;
-  }
-  f_service_ << indent() << "iface_ = iface;" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << indent() << "processMap_.put(\"" << (*f_iter)->get_name() << "\", new "
-               << (*f_iter)->get_name() << "());" << endl;
-  }
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  if (extends.empty()) {
-    f_service_
-        << indent() << "protected static interface ProcessFunction {" << endl << indent()
-        << "  public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException;"
-        << endl << indent() << "}" << endl << endl;
-  }
-
-  f_service_ << indent() << "private Iface iface_;" << endl;
-
-  if (extends.empty()) {
-    f_service_ << indent() << "protected final Hashtable processMap_ = new Hashtable();" << endl;
-  }
-
-  f_service_ << endl;
-
-  // Generate the server implementation
-  indent(f_service_) << "public boolean process(TProtocol iprot, TProtocol oprot) throws TException"
-                     << endl;
-  scope_up(f_service_);
-
-  f_service_ << indent() << "TMessage msg = iprot.readMessageBegin();" << endl;
-
-  // TODO(mcslee): validate message, was the seqid etc. legit?
-
-  f_service_
-      << indent() << "ProcessFunction fn = (ProcessFunction)processMap_.get(msg.name);" << endl
-      << indent() << "if (fn == null) {" << endl << indent()
-      << "  TProtocolUtil.skip(iprot, TType.STRUCT);" << endl << indent()
-      << "  iprot.readMessageEnd();" << endl << indent()
-      << "  TApplicationException x = new "
-         "TApplicationException(TApplicationException.UNKNOWN_METHOD, \"Invalid method name: "
-         "'\"+msg.name+\"'\");" << endl << indent()
-      << "  oprot.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));"
-      << endl << indent() << "  x.write(oprot);" << endl << indent() << "  oprot.writeMessageEnd();"
-      << endl << indent() << "  oprot.getTransport().flush();" << endl << indent()
-      << "  return true;" << endl << indent() << "}" << endl << indent()
-      << "fn.process(msg.seqid, iprot, oprot);" << endl;
-
-  f_service_ << indent() << "return true;" << endl;
-
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  indent_down();
-  indent(f_service_) << "}" << endl << endl;
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_javame_generator::generate_function_helpers(t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  t_struct result(program_, tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_java_struct_definition(f_service_, &result, false, true, true);
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_javame_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  // Open class
-  indent(f_service_) << "private class " << tfunction->get_name() << " implements ProcessFunction {"
-                     << endl;
-  indent_up();
-
-  // Open function
-  indent(f_service_)
-      << "public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException"
-      << endl;
-  scope_up(f_service_);
-
-  string argsname = tfunction->get_name() + "_args";
-  string resultname = tfunction->get_name() + "_result";
-
-  f_service_ << indent() << argsname << " args = new " << argsname << "();" << endl << indent()
-             << "try {" << endl;
-  indent_up();
-  f_service_ << indent() << "args.read(iprot);" << endl;
-  indent_down();
-  f_service_ << indent() << "} catch (TProtocolException e) {" << endl;
-  indent_up();
-  f_service_ << indent() << "iprot.readMessageEnd();" << endl << indent()
-             << "TApplicationException x = new "
-                "TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage());"
-             << endl << indent() << "oprot.writeMessageBegin(new TMessage(\""
-             << tfunction->get_name() << "\", TMessageType.EXCEPTION, seqid));" << endl << indent()
-             << "x.write(oprot);" << endl << indent() << "oprot.writeMessageEnd();" << endl
-             << indent() << "oprot.getTransport().flush();" << endl << indent() << "return;"
-             << endl;
-  indent_down();
-  f_service_ << indent() << "}" << endl;
-  f_service_ << indent() << "iprot.readMessageEnd();" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Declare result for non oneway function
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << resultname << " result = new " << resultname << "();" << endl;
-  }
-
-  // Try block for a function with exceptions
-  if (xceptions.size() > 0) {
-    f_service_ << indent() << "try {" << endl;
-    indent_up();
-  }
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  f_service_ << indent();
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_service_ << "result.success = ";
-  }
-  f_service_ << "iface_." << tfunction->get_name() << "(";
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_service_ << ", ";
-    }
-    f_service_ << "args." << (*f_iter)->get_name();
-  }
-  f_service_ << ");" << endl;
-
-  // Set isset on success field
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()
-      && !type_can_be_null(tfunction->get_returntype())) {
-    f_service_ << indent() << "result.set" << get_cap_name("success") << get_cap_name("isSet")
-               << "(true);" << endl;
-  }
-
-  if (!tfunction->is_oneway() && xceptions.size() > 0) {
-    indent_down();
-    f_service_ << indent() << "}";
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << " catch (" << type_name((*x_iter)->get_type(), false, false) << " "
-                 << (*x_iter)->get_name() << ") {" << endl;
-      if (!tfunction->is_oneway()) {
-        indent_up();
-        f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
-                   << (*x_iter)->get_name() << ";" << endl;
-        indent_down();
-        f_service_ << indent() << "}";
-      } else {
-        f_service_ << "}";
-      }
-    }
-    f_service_ << " catch (Throwable th) {" << endl;
-    indent_up();
-    f_service_ << indent() << "TApplicationException x = new "
-                              "TApplicationException(TApplicationException.INTERNAL_ERROR, "
-                              "\"Internal error processing " << tfunction->get_name() << "\");"
-               << endl << indent() << "oprot.writeMessageBegin(new TMessage(\""
-               << tfunction->get_name() << "\", TMessageType.EXCEPTION, seqid));" << endl
-               << indent() << "x.write(oprot);" << endl << indent() << "oprot.writeMessageEnd();"
-               << endl << indent() << "oprot.getTransport().flush();" << endl << indent()
-               << "return;" << endl;
-    indent_down();
-    f_service_ << indent() << "}" << endl;
-  }
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    f_service_ << indent() << "return;" << endl;
-    scope_down(f_service_);
-
-    // Close class
-    indent_down();
-    f_service_ << indent() << "}" << endl << endl;
-    return;
-  }
-
-  f_service_ << indent() << "oprot.writeMessageBegin(new TMessage(\"" << tfunction->get_name()
-             << "\", TMessageType.REPLY, seqid));" << endl << indent() << "result.write(oprot);"
-             << endl << indent() << "oprot.writeMessageEnd();" << endl << indent()
-             << "oprot.getTransport().flush();" << endl;
-
-  // Close function
-  scope_down(f_service_);
-  f_service_ << endl;
-
-  // Close class
-  indent_down();
-  f_service_ << indent() << "}" << endl << endl;
-}
-
-/**
- * Deserializes a field of any type.
- *
- * @param tfield The field
- * @param prefix The variable name or container for this field
- */
-void t_javame_generator::generate_deserialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name();
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type()) {
-    indent(out) << name << " = iprot.";
-
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "compiler error: cannot serialize void field in a struct: " + name;
-      break;
-    case t_base_type::TYPE_STRING:
-      if (!((t_base_type*)type)->is_binary()) {
-        out << "readString();";
-      } else {
-        out << "readBinary();";
-      }
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << "readBool();";
-      break;
-    case t_base_type::TYPE_I8:
-      out << "readByte();";
-      break;
-    case t_base_type::TYPE_I16:
-      out << "readI16();";
-      break;
-    case t_base_type::TYPE_I32:
-      out << "readI32();";
-      break;
-    case t_base_type::TYPE_I64:
-      out << "readI64();";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      out << "readDouble();";
-      break;
-    default:
-      throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
-    }
-    out << endl;
-  } else if (type->is_enum()) {
-    indent(out) << name << " = "
-                << type_name(tfield->get_type(), true, false) + ".findByValue(iprot.readI32());"
-                << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a struct, invokes read()
- */
-void t_javame_generator::generate_deserialize_struct(ofstream& out,
-                                                     t_struct* tstruct,
-                                                     string prefix) {
-  out << indent() << prefix << " = new " << type_name(tstruct) << "();" << endl << indent()
-      << prefix << ".read(iprot);" << endl;
-}
-
-/**
- * Deserializes a container by reading its size and then iterating
- */
-void t_javame_generator::generate_deserialize_container(ofstream& out,
-                                                        t_type* ttype,
-                                                        string prefix) {
-  scope_up(out);
-
-  string obj;
-
-  if (ttype->is_map()) {
-    obj = tmp("_map");
-  } else if (ttype->is_set()) {
-    obj = tmp("_set");
-  } else if (ttype->is_list()) {
-    obj = tmp("_list");
-  }
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    indent(out) << "TMap " << obj << " = iprot.readMapBegin();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "TSet " << obj << " = iprot.readSetBegin();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "TList " << obj << " = iprot.readListBegin();" << endl;
-  }
-
-  indent(out) << prefix << " = new " << type_name(ttype, false, true)
-              // size the collection correctly
-              << "(" << (ttype->is_list() ? "" : "2*") << obj << ".size"
-              << ");" << endl;
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for (int " << i << " = 0; " << i << " < " << obj << ".size"
-              << "; "
-              << "++" << i << ")" << endl;
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  scope_down(out);
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "iprot.readMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "iprot.readSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "iprot.readListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_javame_generator::generate_deserialize_map_element(ofstream& out,
-                                                          t_map* tmap,
-                                                          string prefix) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey) << endl;
-  indent(out) << declare_field(&fval) << endl;
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << prefix << ".put(" << box_type(tmap->get_key_type(), key) << ", "
-              << box_type(tmap->get_val_type(), val) << ");" << endl;
-}
-
-/**
- * Deserializes a set element
- */
-void t_javame_generator::generate_deserialize_set_element(ofstream& out,
-                                                          t_set* tset,
-                                                          string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".put(" << box_type(tset->get_elem_type(), elem) << ", "
-              << box_type(tset->get_elem_type(), elem) << ");" << endl;
-}
-
-/**
- * Deserializes a list element
- */
-void t_javame_generator::generate_deserialize_list_element(ofstream& out,
-                                                           t_list* tlist,
-                                                           string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << declare_field(&felem) << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".addElement(" << box_type(tlist->get_elem_type(), elem) << ");" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_javame_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + tfield->get_name());
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + tfield->get_name());
-  } else if (type->is_enum()) {
-    indent(out) << "oprot.writeI32(" << prefix + tfield->get_name() << ".getValue());" << endl;
-  } else if (type->is_base_type()) {
-    string name = prefix + tfield->get_name();
-    indent(out) << "oprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "writeBinary(" << name << ");";
-        } else {
-          out << "writeString(" << name << ");";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ");";
-        break;
-      default:
-        throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32(" << name << ");";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type_name(type).c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_javame_generator::generate_serialize_struct(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   string prefix) {
-  (void)tstruct;
-  out << indent() << prefix << ".write(oprot);" << endl;
-}
-
-/**
- * Serializes a container by writing its size then the elements.
- *
- * @param ttype  The type of container
- * @param prefix String prefix for fields
- */
-void t_javame_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot.writeMapBegin(new TMap(" << type_to_enum(((t_map*)ttype)->get_key_type())
-                << ", " << type_to_enum(((t_map*)ttype)->get_val_type()) << ", " << prefix
-                << ".size()));" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetBegin(new TSet(" << type_to_enum(((t_set*)ttype)->get_elem_type())
-                << ", " << prefix << ".size()));" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListBegin(new TList("
-                << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " << prefix << ".size()));"
-                << endl;
-  }
-
-  string iter = tmp("_iter");
-  if (ttype->is_map()) {
-    string enumer = iter + "_enum";
-    string key_type = type_name(((t_map*)ttype)->get_key_type(), true, false);
-    indent(out) << "for (Enumeration " << enumer << " = " << prefix << ".keys(); " << enumer
-                << ".hasMoreElements(); ) ";
-    scope_up(out);
-    indent(out) << key_type << " " << iter << " = (" << key_type << ")" << enumer
-                << ".nextElement();" << endl;
-  } else if (ttype->is_set()) {
-    string enumer = iter + "_enum";
-    string ele_type = type_name(((t_list*)ttype)->get_elem_type(), true);
-    indent(out) << "for (Enumeration " << enumer << " = " << prefix << ".keys(); " << enumer
-                << ".hasMoreElements(); ) ";
-    scope_up(out);
-    indent(out) << ele_type << " " << iter << " = (" << ele_type << ")" << enumer
-                << ".nextElement();" << endl;
-  } else if (ttype->is_list()) {
-    string enumer = iter + "_enum";
-    indent(out) << "for (Enumeration " << enumer << " = " << prefix << ".elements(); " << enumer
-                << ".hasMoreElements(); ) ";
-    scope_up(out);
-    string ele_type = type_name(((t_list*)ttype)->get_elem_type(), true);
-    indent(out) << ele_type << " " << iter << " = (" << ele_type << ")" << enumer
-                << ".nextElement();" << endl;
-  }
-
-  if (ttype->is_map()) {
-    generate_serialize_map_element(out, (t_map*)ttype, iter, prefix);
-  } else if (ttype->is_set()) {
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-  } else if (ttype->is_list()) {
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-  }
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot.writeMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- */
-void t_javame_generator::generate_serialize_map_element(ofstream& out,
-                                                        t_map* tmap,
-                                                        string iter,
-                                                        string map) {
-  t_field kfield(tmap->get_key_type(), iter);
-  generate_serialize_field(out, &kfield, "");
-  string val_type = type_name(tmap->get_val_type(), true, false);
-  t_field vfield(tmap->get_val_type(), "((" + val_type + ")" + map + ".get(" + iter + "))");
-  generate_serialize_field(out, &vfield, "");
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_javame_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_javame_generator::generate_serialize_list_element(ofstream& out,
-                                                         t_list* tlist,
-                                                         string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Returns a Java type name
- *
- * @param ttype The type
- * @param container Is the type going inside a container?
- * @return Java type name, i.e. Vector
- */
-string t_javame_generator::type_name(t_type* ttype,
-                                     bool in_container,
-                                     bool in_init,
-                                     bool skip_generic) {
-  (void)in_init;
-  (void)skip_generic;
-  // In Java typedefs are just resolved to their real type
-  ttype = get_true_type(ttype);
-  string prefix;
-
-  if (ttype->is_base_type()) {
-    return base_type_name((t_base_type*)ttype, in_container);
-  } else if (ttype->is_map()) {
-    return "Hashtable";
-  } else if (ttype->is_set()) {
-    return "Hashtable";
-  } else if (ttype->is_list()) {
-    return "Vector";
-  }
-
-  // Check for namespacing
-  t_program* program = ttype->get_program();
-  if (program != NULL && program != program_) {
-    string package = program->get_namespace("java");
-    if (!package.empty()) {
-      return package + "." + ttype->get_name();
-    }
-  }
-
-  return ttype->get_name();
-}
-
-/**
- * Returns the C++ type that corresponds to the thrift type.
- *
- * @param tbase The base type
- * @param container Is it going in a Java container?
- */
-string t_javame_generator::base_type_name(t_base_type* type, bool in_container) {
-  t_base_type::t_base tbase = type->get_base();
-
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "void";
-  case t_base_type::TYPE_STRING:
-    if (!type->is_binary()) {
-      return "String";
-    } else {
-      return "byte[]";
-    }
-  case t_base_type::TYPE_BOOL:
-    return (in_container ? "Boolean" : "boolean");
-  case t_base_type::TYPE_I8:
-    return (in_container ? "Byte" : "byte");
-  case t_base_type::TYPE_I16:
-    return (in_container ? "Short" : "short");
-  case t_base_type::TYPE_I32:
-    return (in_container ? "Integer" : "int");
-  case t_base_type::TYPE_I64:
-    return (in_container ? "Long" : "long");
-  case t_base_type::TYPE_DOUBLE:
-    return (in_container ? "Double" : "double");
-  default:
-    throw "compiler error: no Java name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param ttype The type
- */
-string t_javame_generator::declare_field(t_field* tfield, bool init) {
-  // TODO(mcslee): do we ever need to initialize the field?
-  string result = type_name(tfield->get_type()) + " " + tfield->get_name();
-  if (init) {
-    t_type* ttype = get_true_type(tfield->get_type());
-    if (ttype->is_base_type() && tfield->get_value() != NULL) {
-      ofstream dummy;
-      result += " = " + render_const_value(dummy, tfield->get_name(), ttype, tfield->get_value());
-    } else if (ttype->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)ttype)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "NO T_VOID CONSTRUCT";
-      case t_base_type::TYPE_STRING:
-        result += " = null";
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = false";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = (double)0";
-        break;
-      }
-
-    } else if (ttype->is_enum()) {
-      result += " = 0";
-    } else if (ttype->is_container()) {
-      result += " = new " + type_name(ttype, false, true) + "()";
-    } else {
-      result += " = new " + type_name(ttype, false, true) + "()";
-      ;
-    }
-  }
-  return result + ";";
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_javame_generator::function_signature(t_function* tfunction, string prefix) {
-  t_type* ttype = tfunction->get_returntype();
-  std::string result = type_name(ttype) + " " + prefix + tfunction->get_name() + "("
-                       + argument_list(tfunction->get_arglist()) + ") throws ";
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-  for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-    result += type_name((*x_iter)->get_type(), false, false) + ", ";
-  }
-  result += "TException";
-  return result;
-}
-
-/**
- * Renders a comma separated field list, with type names
- */
-string t_javame_generator::argument_list(t_struct* tstruct, bool include_types) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    if (include_types) {
-      result += type_name((*f_iter)->get_type()) + " ";
-    }
-    result += (*f_iter)->get_name();
-  }
-  return result;
-}
-
-/**
- * Converts the parse type to a C++ enum string for the given type.
- */
-string t_javame_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_list()) {
-    return "TType.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Applies the correct style to a string based on the value of nocamel_style_
- */
-std::string t_javame_generator::get_cap_name(std::string name) {
-  name[0] = toupper(name[0]);
-  return name;
-}
-
-string t_javame_generator::constant_name(string name) {
-  string constant_name;
-
-  bool is_first = true;
-  bool was_previous_char_upper = false;
-  for (string::iterator iter = name.begin(); iter != name.end(); ++iter) {
-    string::value_type character = (*iter);
-
-    bool is_upper = isupper(character);
-
-    if (is_upper && !is_first && !was_previous_char_upper) {
-      constant_name += '_';
-    }
-    constant_name += toupper(character);
-
-    is_first = false;
-    was_previous_char_upper = is_upper;
-  }
-
-  return constant_name;
-}
-
-void t_javame_generator::generate_java_docstring_comment(ofstream& out, string contents) {
-  generate_docstring_comment(out, "/**\n", " * ", contents, " */\n");
-}
-
-void t_javame_generator::generate_java_doc(ofstream& out, t_field* field) {
-  if (field->get_type()->is_enum()) {
-    string combined_message = field->get_doc() + "\n@see " + get_enum_class_name(field->get_type());
-    generate_java_docstring_comment(out, combined_message);
-  } else {
-    generate_java_doc(out, (t_doc*)field);
-  }
-}
-
-/**
- * Emits a JavaDoc comment if the provided object has a doc in Thrift
- */
-void t_javame_generator::generate_java_doc(ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    generate_java_docstring_comment(out, tdoc->get_doc());
-  }
-}
-
-/**
- * Emits a JavaDoc comment if the provided function object has a doc in Thrift
- */
-void t_javame_generator::generate_java_doc(ofstream& out, t_function* tfunction) {
-  if (tfunction->has_doc()) {
-    stringstream ss;
-    ss << tfunction->get_doc();
-    const vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-    vector<t_field*>::const_iterator p_iter;
-    for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-      t_field* p = *p_iter;
-      ss << "\n@param " << p->get_name();
-      if (p->has_doc()) {
-        ss << " " << p->get_doc();
-      }
-    }
-    generate_docstring_comment(out, "/**\n", " * ", ss.str(), " */\n");
-  }
-}
-
-void t_javame_generator::generate_deep_copy_container(ofstream& out,
-                                                      std::string source_name_p1,
-                                                      std::string source_name_p2,
-                                                      std::string result_name,
-                                                      t_type* type) {
-
-  t_container* container = (t_container*)type;
-  std::string source_name;
-  if (source_name_p2 == "")
-    source_name = source_name_p1;
-  else
-    source_name = source_name_p1 + "." + source_name_p2;
-
-  indent(out) << type_name(type, true, false) << " " << result_name << " = new "
-              << type_name(container, false, true) << "();" << endl;
-
-  std::string iterator_element_name = source_name_p1 + "_element";
-  std::string enumeration_name = source_name_p1 + "_enum";
-  std::string result_element_name = result_name + "_copy";
-
-  if (container->is_map()) {
-    t_type* key_type = ((t_map*)container)->get_key_type();
-    t_type* val_type = ((t_map*)container)->get_val_type();
-
-    indent(out) << "for (Enumeration " << enumeration_name << " = " << source_name << ".keys(); "
-                << enumeration_name << ".hasMoreElements(); ) {" << endl;
-    indent_up();
-
-    out << endl;
-
-    indent(out) << type_name(key_type, true, false) << " " << iterator_element_name << "_key = ("
-                << type_name(key_type, true, false) << ")" << enumeration_name << ".nextElement();"
-                << endl;
-    indent(out) << type_name(val_type, true, false) << " " << iterator_element_name << "_value = ("
-                << type_name(val_type, true, false) << ")" << source_name << ".get("
-                << iterator_element_name << "_key);" << endl;
-
-    out << endl;
-
-    if (key_type->is_container()) {
-      generate_deep_copy_container(out,
-                                   iterator_element_name + "_key",
-                                   "",
-                                   result_element_name + "_key",
-                                   key_type);
-    } else {
-      indent(out) << type_name(key_type, true, false) << " " << result_element_name << "_key = ";
-      generate_deep_copy_non_container(out,
-                                       iterator_element_name + "_key",
-                                       result_element_name + "_key",
-                                       key_type);
-      out << ";" << endl;
-    }
-
-    out << endl;
-
-    if (val_type->is_container()) {
-      generate_deep_copy_container(out,
-                                   iterator_element_name + "_value",
-                                   "",
-                                   result_element_name + "_value",
-                                   val_type);
-    } else {
-      indent(out) << type_name(val_type, true, false) << " " << result_element_name << "_value = ";
-      generate_deep_copy_non_container(out,
-                                       iterator_element_name + "_value",
-                                       result_element_name + "_value",
-                                       val_type);
-      out << ";" << endl;
-    }
-
-    out << endl;
-
-    indent(out) << result_name << ".put(" << result_element_name << "_key, " << result_element_name
-                << "_value);" << endl;
-
-    indent_down();
-    indent(out) << "}" << endl;
-
-  } else {
-    t_type* elem_type;
-
-    if (container->is_set()) {
-      elem_type = ((t_set*)container)->get_elem_type();
-    } else {
-      elem_type = ((t_list*)container)->get_elem_type();
-    }
-
-    indent(out) << "for (Enumeration " << enumeration_name << " = " << source_name
-                << ".elements(); " << enumeration_name << ".hasMoreElements(); ) {" << endl;
-    indent_up();
-    indent(out) << type_name(elem_type, true, false) << " " << iterator_element_name << " = ("
-                << type_name(elem_type, true, false) << ")" << enumeration_name << ".nextElement();"
-                << endl;
-    if (elem_type->is_container()) {
-      // recursive deep copy
-      generate_deep_copy_container(out, iterator_element_name, "", result_element_name, elem_type);
-      if (elem_type->is_list()) {
-        indent(out) << result_name << ".addElement(" << result_element_name << ");" << endl;
-      } else {
-        indent(out) << result_name << ".put(" << result_element_name << ", " << result_element_name
-                    << ");" << endl;
-      }
-    } else {
-      // iterative copy
-      if (((t_base_type*)elem_type)->is_binary()) {
-        indent(out) << type_name(elem_type, true, false) << " temp_binary_element = ";
-        generate_deep_copy_non_container(out,
-                                         iterator_element_name,
-                                         "temp_binary_element",
-                                         elem_type);
-        out << ";" << endl;
-        if (elem_type->is_list()) {
-          indent(out) << result_name << ".addElement(temp_binary_element);" << endl;
-        } else {
-          indent(out) << result_name << ".put(temp_binary_element, temp_binary_element);" << endl;
-        }
-      } else {
-        indent(out) << result_name << ".addElement(";
-        generate_deep_copy_non_container(out, iterator_element_name, result_name, elem_type);
-        out << ");" << endl;
-      }
-    }
-
-    indent_down();
-
-    indent(out) << "}" << endl;
-  }
-}
-
-void t_javame_generator::generate_deep_copy_non_container(ofstream& out,
-                                                          std::string source_name,
-                                                          std::string dest_name,
-                                                          t_type* type) {
-  if (type->is_base_type() || type->is_enum() || type->is_typedef()) {
-    // binary fields need to be copied with System.arraycopy
-    if (((t_base_type*)type)->is_binary()) {
-      out << "new byte[" << source_name << ".length];" << endl;
-      indent(out) << "System.arraycopy(" << source_name << ", 0, " << dest_name << ", 0, "
-                  << source_name << ".length)";
-    }
-    // everything else can be copied directly
-    else
-      out << source_name;
-  } else {
-    out << "new " << type_name(type, true, true) << "(" << source_name << ")";
-  }
-}
-
-std::string t_javame_generator::generate_isset_check(t_field* field) {
-  return generate_isset_check(field->get_name());
-}
-
-std::string t_javame_generator::isset_field_id(t_field* field) {
-  return "__" + upcase_string(field->get_name() + "_isset_id");
-}
-
-std::string t_javame_generator::generate_isset_check(std::string field_name) {
-  return "is" + get_cap_name("set") + get_cap_name(field_name) + "()";
-}
-
-void t_javame_generator::generate_isset_set(ofstream& out, t_field* field) {
-  if (!type_can_be_null(field->get_type())) {
-    indent(out) << "set" << get_cap_name(field->get_name()) << get_cap_name("isSet") << "(true);"
-                << endl;
-  }
-}
-
-std::string t_javame_generator::get_enum_class_name(t_type* type) {
-  string package = "";
-  t_program* program = type->get_program();
-  if (program != NULL && program != program_) {
-    package = program->get_namespace("java") + ".";
-  }
-  return package + type->get_name();
-}
-
-void t_javame_generator::generate_struct_desc(ofstream& out, t_struct* tstruct) {
-  indent(out) << "private static final TStruct STRUCT_DESC = new TStruct(\"" << tstruct->get_name()
-              << "\");" << endl;
-}
-
-void t_javame_generator::generate_field_descs(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    indent(out) << "private static final TField " << constant_name((*m_iter)->get_name())
-                << "_FIELD_DESC = new TField(\"" << (*m_iter)->get_name() << "\", "
-                << type_to_enum((*m_iter)->get_type()) << ", "
-                << "(short)" << (*m_iter)->get_key() << ");" << endl;
-  }
-}
-
-bool t_javame_generator::has_bit_vector(t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (!type_can_be_null(get_true_type((*m_iter)->get_type()))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void t_javame_generator::generate_java_struct_clear(std::ofstream& out, t_struct* tstruct) {
-  indent(out) << "public void clear() {" << endl;
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  indent_up();
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if ((*m_iter)->get_value() != NULL) {
-      print_const_value(out,
-                        "this." + (*m_iter)->get_name(),
-                        t,
-                        (*m_iter)->get_value(),
-                        true,
-                        true);
-    } else {
-      if (type_can_be_null(t)) {
-        indent(out) << "this." << (*m_iter)->get_name() << " = null;" << endl;
-      } else {
-        // must be a base type
-        // means it also needs to be explicitly unset
-        indent(out) << "set" << get_cap_name((*m_iter)->get_name()) << get_cap_name("isSet")
-                    << "(false);" << endl;
-        switch (((t_base_type*)t)->get_base()) {
-        case t_base_type::TYPE_I8:
-        case t_base_type::TYPE_I16:
-        case t_base_type::TYPE_I32:
-        case t_base_type::TYPE_I64:
-          indent(out) << "this." << (*m_iter)->get_name() << " = 0;" << endl;
-          break;
-        case t_base_type::TYPE_DOUBLE:
-          indent(out) << "this." << (*m_iter)->get_name() << " = 0.0;" << endl;
-          break;
-        case t_base_type::TYPE_BOOL:
-          indent(out) << "this." << (*m_iter)->get_name() << " = false;" << endl;
-          break;
-        default: // prevent gcc compiler warning
-          break;
-        }
-      }
-    }
-  }
-  indent_down();
-
-  indent(out) << "}" << endl << endl;
-}
-
-THRIFT_REGISTER_GENERATOR(javame, "Java ME", "")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_js_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_js_generator.cc
deleted file mode 100644
index 3ccd248..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_js_generator.cc
+++ /dev/null
@@ -1,2273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <map>
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <list>
-#include <cassert>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/version.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-#include "thrift/generate/t_oop_generator.h"
-
-
-/**
- * JS code generator.
- */
-class t_js_generator : public t_oop_generator {
-public:
-  t_js_generator(t_program* program,
-                 const std::map<std::string, std::string>& parsed_options,
-                 const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    gen_node_ = false;
-    gen_jquery_ = false;
-    gen_ts_ = false;
-
-    bool with_ns_ = false;
-
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("node") == 0) {
-        gen_node_ = true;
-      } else if( iter->first.compare("jquery") == 0) {
-        gen_jquery_ = true;
-      } else if( iter->first.compare("ts") == 0) {
-        gen_ts_ = true;
-      } else if( iter->first.compare("with_ns") == 0) {
-        with_ns_ = true;
-      } else {
-        throw "unknown option js:" + iter->first;
-      }
-    }
-
-    if (gen_node_ && gen_ts_) {
-      throw "Invalid switch: [-gen js:node,ts] options not compatible";
-    }
-
-    if (gen_node_ && gen_jquery_) {
-      throw "Invalid switch: [-gen js:node,jquery] options not compatible, try: [-gen js:node -gen "
-            "js:jquery]";
-    }
-
-    if (!gen_node_ && with_ns_) {
-      throw "Invalid switch: [-gen js:with_ns] is only valid when using node.js";
-    }
-
-    if (gen_node_) {
-      out_dir_base_ = "gen-nodejs";
-      no_ns_ = !with_ns_;
-    } else {
-      out_dir_base_ = "gen-js";
-      no_ns_ = false;
-    }
-
-    escape_['\''] = "\\'";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  std::string render_recv_throw(std::string var);
-  std::string render_recv_return(std::string var);
-
-  std::string render_const_value(t_type* type, t_const_value* value);
-
-  /**
-   * Structs!
-   */
-  void generate_js_struct(t_struct* tstruct, bool is_exception);
-  void generate_js_struct_definition(std::ofstream& out,
-                                     t_struct* tstruct,
-                                     bool is_xception = false,
-                                     bool is_exported = true);
-  void generate_js_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_js_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_js_function_helpers(t_function* tfunction);
-
-  /**
-   * Service-level generation functions
-   */
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_rest(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_processor(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  std::string prefix = "",
-                                  bool inclass = false);
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string kiter,
-                                      std::string viter);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string js_includes();
-  std::string render_includes();
-  std::string declare_field(t_field* tfield, bool init = false, bool obj = false);
-  std::string function_signature(t_function* tfunction,
-                                 std::string prefix = "",
-                                 bool include_callback = false);
-  std::string argument_list(t_struct* tstruct, bool include_callback = false);
-  std::string type_to_enum(t_type* ttype);
-  std::string make_valid_nodeJs_identifier(std::string const& name);
-
-  std::string autogen_comment() {
-    return std::string("//\n") + "// Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-           + "//\n" + "// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n"
-           + "//\n";
-  }
-
-  t_type* get_contained_type(t_type* t);
-
-  std::vector<std::string> js_namespace_pieces(t_program* p) {
-    std::string ns = p->get_namespace("js");
-
-    std::string::size_type loc;
-    std::vector<std::string> pieces;
-
-    if (no_ns_) {
-      return pieces;
-    }
-
-    if (ns.size() > 0) {
-      while ((loc = ns.find(".")) != std::string::npos) {
-        pieces.push_back(ns.substr(0, loc));
-        ns = ns.substr(loc + 1);
-      }
-    }
-
-    if (ns.size() > 0) {
-      pieces.push_back(ns);
-    }
-
-    return pieces;
-  }
-
-  std::string js_type_namespace(t_program* p) {
-    if (gen_node_) {
-      if (p != NULL && p != program_) {
-        return make_valid_nodeJs_identifier(p->get_name()) + "_ttypes.";
-      }
-      return "ttypes.";
-    }
-    return js_namespace(p);
-  }
-
-  std::string js_export_namespace(t_program* p) {
-    if (gen_node_) {
-      return "exports.";
-    }
-    return js_namespace(p);
-  }
-
-  bool has_js_namespace(t_program* p) {
-    if (no_ns_) {
-      return false;
-    }
-    std::string ns = p->get_namespace("js");
-    return (ns.size() > 0);
-  }
-
-  std::string js_namespace(t_program* p) {
-    if (no_ns_) {
-      return "";
-    }
-    std::string ns = p->get_namespace("js");
-    if (ns.size() > 0) {
-      ns += ".";
-    }
-
-    return ns;
-  }
-
-  /**
-   * TypeScript Definition File helper functions
-   */
-
-  string ts_function_signature(t_function* tfunction, bool include_callback);
-  string ts_get_type(t_type* type);
-
-  /**
-   * Special indentation for TypeScript Definitions because of the module.
-   * Returns the normal indentation + "  " if a module was defined.
-   * @return string
-   */
-  string ts_indent() { return indent() + (!ts_module_.empty() ? "  " : ""); }
-
-  /**
-   * Returns "declare " if no module was defined.
-   * @return string
-   */
-  string ts_declare() { return (ts_module_.empty() ? "declare " : ""); }
-
-  /**
-   * Returns "?" if the given field is optional.
-   * @param t_field The field to check
-   * @return string
-   */
-  string ts_get_req(t_field* field) { return (field->get_req() == t_field::T_OPTIONAL ? "?" : ""); }
-
-  /**
-   * Returns the documentation, if the provided documentable object has one.
-   * @param t_doc The object to get the documentation from
-   * @return string The documentation
-   */
-  string ts_print_doc(t_doc* tdoc) {
-    string result = endl;
-
-    if (tdoc->has_doc()) {
-      std::stringstream doc(tdoc->get_doc());
-      string item;
-
-      result += ts_indent() + "/**" + endl;
-      while (std::getline(doc, item)) {
-        result += ts_indent() + " * " + item + endl;
-      }
-      result += ts_indent() + " */" + endl;
-    }
-    return result;
-  }
-
-private:
-  /**
-   * True if we should generate NodeJS-friendly RPC services.
-   */
-  bool gen_node_;
-
-  /**
-   * True if we should generate services that use jQuery ajax (async/sync).
-   */
-  bool gen_jquery_;
-
-  /**
-   * True if we should generate a TypeScript Definition File for each service.
-   */
-  bool gen_ts_;
-
-  /**
-   * The name of the defined module(s), for TypeScript Definition Files.
-   */
-  string ts_module_;
-
-  /**
-   * True if we should not generate namespace objects for node.
-   */
-  bool no_ns_;
-
-  /**
-   * File streams
-   */
-  std::ofstream f_types_;
-  std::ofstream f_service_;
-  std::ofstream f_types_ts_;
-  std::ofstream f_service_ts_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_js_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  string outdir = get_out_dir();
-
-  // Make output file(s)
-  string f_types_name = outdir + program_->get_name() + "_types.js";
-  f_types_.open(f_types_name.c_str());
-
-  if (gen_ts_) {
-    string f_types_ts_name = outdir + program_->get_name() + "_types.d.ts";
-    f_types_ts_.open(f_types_ts_name.c_str());
-  }
-
-  // Print header
-  f_types_ << autogen_comment();
-
-  if (gen_node_ && no_ns_) {
-    f_types_ << "\"use strict\";" << endl << endl;
-  }
-
-  f_types_ << js_includes() << endl << render_includes() << endl;
-
-  if (gen_ts_) {
-    f_types_ts_ << autogen_comment() << endl;
-  }
-
-  if (gen_node_) {
-    f_types_ << "var ttypes = module.exports = {};" << endl;
-  }
-
-  string pns;
-
-  // setup the namespace
-  // TODO should the namespace just be in the directory structure for node?
-  vector<string> ns_pieces = js_namespace_pieces(program_);
-  if (ns_pieces.size() > 0) {
-    for (size_t i = 0; i < ns_pieces.size(); ++i) {
-      pns += ((i == 0) ? "" : ".") + ns_pieces[i];
-      f_types_ << "if (typeof " << pns << " === 'undefined') {" << endl;
-      f_types_ << "  " << pns << " = {};" << endl;
-      f_types_ << "}" << endl;
-    }
-    if (gen_ts_) {
-      ts_module_ = pns;
-      f_types_ts_ << "declare module " << ts_module_ << " {";
-    }
-  }
-}
-
-/**
- * Prints standard js imports
- */
-string t_js_generator::js_includes() {
-  if (gen_node_) {
-    return string(
-        "var thrift = require('thrift');\n"
-        "var Thrift = thrift.Thrift;\n"
-        "var Q = thrift.Q;\n");
-  }
-
-  return "";
-}
-
-/**
- * Renders all the imports necessary for including another Thrift program
- */
-string t_js_generator::render_includes() {
-  string result = "";
-
-  if (gen_node_) {
-    const vector<t_program*>& includes = program_->get_includes();
-    for (size_t i = 0; i < includes.size(); ++i) {
-      result += "var " + make_valid_nodeJs_identifier(includes[i]->get_name()) + "_ttypes = require('./" + includes[i]->get_name()
-                + "_types');\n";
-    }
-    if (includes.size() > 0) {
-      result += "\n";
-    }
-  }
-
-  return result;
-}
-
-/**
- * Close up (or down) some filez.
- */
-void t_js_generator::close_generator() {
-  // Close types file(s)
-
-  f_types_.close();
-
-  if (gen_ts_) {
-    if (!ts_module_.empty()) {
-      f_types_ts_ << "}";
-    }
-    f_types_ts_.close();
-  }
-}
-
-/**
- * Generates a typedef. This is not done in JS, types are all implicit.
- *
- * @param ttypedef The type definition
- */
-void t_js_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Generates code for an enumerated type. Since define is expensive to lookup
- * in JS, we use a global array for this.
- *
- * @param tenum The enumeration
- */
-void t_js_generator::generate_enum(t_enum* tenum) {
-  f_types_ << js_type_namespace(tenum->get_program()) << tenum->get_name() << " = {" << endl;
-
-  if (gen_ts_) {
-    f_types_ts_ << ts_print_doc(tenum) << ts_indent() << ts_declare() << "enum "
-                << tenum->get_name() << " {" << endl;
-  }
-
-  indent_up();
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    if (gen_ts_) {
-      f_types_ts_ << ts_indent() << (*c_iter)->get_name() << " = " << value << "," << endl;
-      // add 'value: key' in addition to 'key: value' for TypeScript enums
-      f_types_ << indent() << "'" << value << "' : '" << (*c_iter)->get_name() << "'," << endl;
-    }
-    f_types_ << indent() << "'" << (*c_iter)->get_name() << "' : " << value;
-    if (c_iter != constants.end() - 1) {
-      f_types_ << ",";
-    }
-    f_types_ << endl;
-  }
-
-  indent_down();
-
-  f_types_ << "};" << endl;
-
-  if (gen_ts_) {
-    f_types_ts_ << ts_indent() << "}" << endl;
-  }
-}
-
-/**
- * Generate a constant value
- */
-void t_js_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = tconst->get_name();
-  t_const_value* value = tconst->get_value();
-
-  f_types_ << js_type_namespace(program_) << name << " = ";
-  f_types_ << render_const_value(type, value) << ";" << endl;
-
-  if (gen_ts_) {
-    f_types_ts_ << ts_print_doc(tconst) << ts_indent() << ts_declare() << "var " << name << ": "
-                << ts_get_type(type) << ";" << endl;
-  }
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_js_generator::render_const_value(t_type* type, t_const_value* value) {
-  std::ostringstream out;
-
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << "'" << get_escaped_string(value) << "'";
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    out << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    out << "new " << js_type_namespace(type->get_program()) << type->get_name() << "({" << endl;
-    indent_up();
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      if (v_iter != val.begin())
-        out << ",";
-      out << render_const_value(g_type_string, v_iter->first);
-      out << " : ";
-      out << render_const_value(field_type, v_iter->second);
-    }
-
-    out << "})";
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    out << "{" << endl;
-    indent_up();
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      if (v_iter != val.begin())
-        out << "," << endl;
-
-      out << indent() << render_const_value(ktype, v_iter->first);
-
-      out << " : ";
-      out << render_const_value(vtype, v_iter->second);
-    }
-
-    indent_down();
-    out << endl << "}";
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    out << "[";
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      if (v_iter != val.begin())
-        out << ",";
-      out << render_const_value(etype, *v_iter);
-    }
-    out << "]";
-  }
-  return out.str();
-}
-
-/**
- * Make a struct
- */
-void t_js_generator::generate_struct(t_struct* tstruct) {
-  generate_js_struct(tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct but extends the Exception class.
- *
- * @param txception The struct definition
- */
-void t_js_generator::generate_xception(t_struct* txception) {
-  generate_js_struct(txception, true);
-}
-
-/**
- * Structs can be normal or exceptions.
- */
-void t_js_generator::generate_js_struct(t_struct* tstruct, bool is_exception) {
-  generate_js_struct_definition(f_types_, tstruct, is_exception);
-}
-
-/**
- * Return type of contained elements for a container type. For maps
- * this is type of value (keys are always strings in js)
- */
-t_type* t_js_generator::get_contained_type(t_type* t) {
-  t_type* etype;
-  if (t->is_list()) {
-    etype = ((t_list*)t)->get_elem_type();
-  } else if (t->is_set()) {
-    etype = ((t_set*)t)->get_elem_type();
-  } else {
-    etype = ((t_map*)t)->get_val_type();
-  }
-  return etype;
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is nothing in JS
- * where the objects are all just associative arrays (unless of course we
- * decide to start using objects for them...)
- *
- * @param tstruct The struct definition
- */
-void t_js_generator::generate_js_struct_definition(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   bool is_exception,
-                                                   bool is_exported) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  if (gen_node_) {
-    string prefix = has_js_namespace(tstruct->get_program()) ? js_namespace(tstruct->get_program()) : "var ";
-    if (is_exported) {
-      out << prefix << tstruct->get_name() << " = "
-          << "module.exports." << tstruct->get_name() << " = function(args) {" << endl;
-    } else {
-      out << prefix << tstruct->get_name() << " = function(args) {"
-          << endl;
-    }
-  } else {
-    out << js_namespace(tstruct->get_program()) << tstruct->get_name() << " = function(args) {"
-        << endl;
-    if (gen_ts_) {
-      f_types_ts_ << ts_print_doc(tstruct) << ts_indent() << ts_declare() << "class "
-                  << tstruct->get_name() << (is_exception ? " extends Thrift.TException" : "")
-                  << " {" << endl;
-    }
-  }
-
-  indent_up();
-
-  if (gen_node_ && is_exception) {
-    out << indent() << "Thrift.TException.call(this, \"" << js_namespace(tstruct->get_program())
-        << tstruct->get_name() << "\");" << endl;
-    out << indent() << "this.name = \"" << js_namespace(tstruct->get_program())
-        << tstruct->get_name() << "\";" << endl;
-  }
-
-  // members with arguments
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    string dval = declare_field(*m_iter, false, true);
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if ((*m_iter)->get_value() != NULL && !(t->is_struct() || t->is_xception())) {
-      dval = render_const_value((*m_iter)->get_type(), (*m_iter)->get_value());
-      out << indent() << "this." << (*m_iter)->get_name() << " = " << dval << ";" << endl;
-    } else {
-      out << indent() << dval << ";" << endl;
-    }
-    if (gen_ts_) {
-      f_types_ts_ << ts_indent() << (*m_iter)->get_name() << ": "
-                  << ts_get_type((*m_iter)->get_type()) << ";" << endl;
-    }
-  }
-
-  // Generate constructor from array
-  if (members.size() > 0) {
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-      if ((*m_iter)->get_value() != NULL && (t->is_struct() || t->is_xception())) {
-        indent(out) << "this." << (*m_iter)->get_name() << " = "
-                    << render_const_value(t, (*m_iter)->get_value()) << ";" << endl;
-      }
-    }
-
-    // Early returns for exceptions
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-      if (t->is_xception()) {
-        out << indent() << "if (args instanceof " << js_type_namespace(t->get_program())
-            << t->get_name() << ") {" << endl << indent() << indent() << "this."
-            << (*m_iter)->get_name() << " = args;" << endl << indent() << indent() << "return;"
-            << endl << indent() << "}" << endl;
-      }
-    }
-
-    out << indent() << "if (args) {" << endl;
-    if (gen_ts_) {
-      f_types_ts_ << endl << ts_indent() << "constructor(args?: { ";
-    }
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-      out << indent() << indent() << "if (args." << (*m_iter)->get_name() << " !== undefined && args." << (*m_iter)->get_name() << " !== null) {"
-          << endl << indent() << indent() << indent() << "this." << (*m_iter)->get_name();
-
-      if (t->is_struct()) {
-        out << (" = new " + js_type_namespace(t->get_program()) + t->get_name() +
-                "(args."+(*m_iter)->get_name() +");");
-        out << endl;
-      } else if (t->is_container()) {
-        t_type* etype = get_contained_type(t);
-        string copyFunc = t->is_map() ? "Thrift.copyMap" : "Thrift.copyList";
-        string type_list = "";
-
-        while (etype->is_container()) {
-          if (type_list.length() > 0) {
-            type_list += ", ";
-          }
-          type_list += etype->is_map() ? "Thrift.copyMap" : "Thrift.copyList";
-          etype = get_contained_type(etype);
-        }
-
-        if (etype->is_struct()) {
-          if (type_list.length() > 0) {
-            type_list += ", ";
-          }
-          type_list += js_type_namespace(etype->get_program()) + etype->get_name();
-        }
-        else {
-          if (type_list.length() > 0) {
-            type_list += ", ";
-          }
-          type_list += "null";
-        }
-
-        out << (" = " + copyFunc + "(args." + (*m_iter)->get_name() +
-                ", [" + type_list + "]);");
-        out << endl;
-      } else {
-        out << " = args." << (*m_iter)->get_name() << ";" << endl;
-      }
-
-      if (!(*m_iter)->get_req()) {
-        out << indent() << indent() << "} else {" << endl << indent() << indent() << indent()
-            << "throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.UNKNOWN, "
-               "'Required field " << (*m_iter)->get_name() << " is unset!');" << endl;
-      }
-      out << indent() << indent() << "}" << endl;
-      if (gen_ts_) {
-        f_types_ts_ << (*m_iter)->get_name() << ts_get_req(*m_iter) << ": "
-                    << ts_get_type((*m_iter)->get_type()) << "; ";
-      }
-    }
-
-    out << indent() << "}" << endl;
-    if (gen_ts_) {
-      f_types_ts_ << "});" << endl;
-    }
-  }
-
-  indent_down();
-  out << "};" << endl;
-  if (gen_ts_) {
-    f_types_ts_ << ts_indent() << "}" << endl;
-  }
-
-  if (is_exception) {
-    out << "Thrift.inherits(" << js_namespace(tstruct->get_program()) << tstruct->get_name()
-        << ", Thrift.TException);" << endl;
-    out << js_namespace(tstruct->get_program()) << tstruct->get_name() << ".prototype.name = '"
-        << tstruct->get_name() << "';" << endl;
-  } else {
-    // init prototype
-    out << js_namespace(tstruct->get_program()) << tstruct->get_name() << ".prototype = {};"
-        << endl;
-  }
-
-  generate_js_struct_reader(out, tstruct);
-  generate_js_struct_writer(out, tstruct);
-}
-
-/**
- * Generates the read() method for a struct
- */
-void t_js_generator::generate_js_struct_reader(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << js_namespace(tstruct->get_program()) << tstruct->get_name()
-      << ".prototype.read = function(input) {" << endl;
-
-  indent_up();
-
-  indent(out) << "input.readStructBegin();" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (true)" << endl;
-
-  scope_up(out);
-
-  indent(out) << "var ret = input.readFieldBegin();" << endl;
-  indent(out) << "var fname = ret.fname;" << endl;
-  indent(out) << "var ftype = ret.ftype;" << endl;
-  indent(out) << "var fid = ret.fid;" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if (ftype == Thrift.Type.STOP) {" << endl;
-  indent_up();
-  indent(out) << "break;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-  if (!fields.empty()) {
-    // Switch statement on the field we are reading
-    indent(out) << "switch (fid)" << endl;
-
-    scope_up(out);
-
-    // Generate deserialization code for known cases
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-
-      indent(out) << "case " << (*f_iter)->get_key() << ":" << endl;
-      indent(out) << "if (ftype == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-
-      indent_up();
-      generate_deserialize_field(out, *f_iter, "this.");
-      indent_down();
-
-      indent(out) << "} else {" << endl;
-
-      indent(out) << "  input.skip(ftype);" << endl;
-
-      out << indent() << "}" << endl << indent() << "break;" << endl;
-    }
-    if (fields.size() == 1) {
-      // pseudo case to make jslint happy
-      indent(out) << "case 0:" << endl;
-      indent(out) << "  input.skip(ftype);" << endl;
-      indent(out) << "  break;" << endl;
-    }
-    // In the default case we skip the field
-    indent(out) << "default:" << endl;
-    indent(out) << "  input.skip(ftype);" << endl;
-
-    scope_down(out);
-  } else {
-    indent(out) << "input.skip(ftype);" << endl;
-  }
-
-  indent(out) << "input.readFieldEnd();" << endl;
-
-  scope_down(out);
-
-  indent(out) << "input.readStructEnd();" << endl;
-
-  indent(out) << "return;" << endl;
-
-  indent_down();
-  out << indent() << "};" << endl << endl;
-}
-
-/**
- * Generates the write() method for a struct
- */
-void t_js_generator::generate_js_struct_writer(ofstream& out, t_struct* tstruct) {
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << js_namespace(tstruct->get_program()) << tstruct->get_name()
-      << ".prototype.write = function(output) {" << endl;
-
-  indent_up();
-
-  indent(out) << "output.writeStructBegin('" << name << "');" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    out << indent() << "if (this." << (*f_iter)->get_name() << " !== null && this."
-        << (*f_iter)->get_name() << " !== undefined) {" << endl;
-    indent_up();
-
-    indent(out) << "output.writeFieldBegin("
-                << "'" << (*f_iter)->get_name() << "', " << type_to_enum((*f_iter)->get_type())
-                << ", " << (*f_iter)->get_key() << ");" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this.");
-
-    indent(out) << "output.writeFieldEnd();" << endl;
-
-    indent_down();
-    indent(out) << "}" << endl;
-  }
-
-  out << indent() << "output.writeFieldStop();" << endl << indent() << "output.writeStructEnd();"
-      << endl;
-
-  out << indent() << "return;" << endl;
-
-  indent_down();
-  out << indent() << "};" << endl << endl;
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_js_generator::generate_service(t_service* tservice) {
-  string f_service_name = get_out_dir() + service_name_ + ".js";
-  f_service_.open(f_service_name.c_str());
-
-  if (gen_ts_) {
-    string f_service_ts_name = get_out_dir() + service_name_ + ".d.ts";
-    f_service_ts_.open(f_service_ts_name.c_str());
-  }
-
-  f_service_ << autogen_comment();
-
-  if (gen_node_ && no_ns_) {
-    f_service_ << "\"use strict\";" << endl << endl;
-  }
-
-  f_service_ << js_includes() << endl << render_includes() << endl;
-
-  if (gen_ts_) {
-    if (tservice->get_extends() != NULL) {
-      f_service_ts_ << "/// <reference path=\"" << tservice->get_extends()->get_name()
-                    << ".d.ts\" />" << endl;
-    }
-    f_service_ts_ << autogen_comment() << endl;
-    if (!ts_module_.empty()) {
-      f_service_ts_ << "declare module " << ts_module_ << " {";
-    }
-  }
-
-  if (gen_node_) {
-    if (tservice->get_extends() != NULL) {
-      f_service_ << "var " << tservice->get_extends()->get_name() << " = require('./"
-                 << tservice->get_extends()->get_name() << "');" << endl << "var "
-                 << tservice->get_extends()->get_name()
-                 << "Client = " << tservice->get_extends()->get_name() << ".Client;" << endl
-                 << "var " << tservice->get_extends()->get_name()
-                 << "Processor = " << tservice->get_extends()->get_name() << ".Processor;" << endl;
-    }
-
-    f_service_ << "var ttypes = require('./" + program_->get_name() + "_types');" << endl;
-  }
-
-  generate_service_helpers(tservice);
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-
-  if (gen_node_) {
-    generate_service_processor(tservice);
-  }
-
-  f_service_.close();
-  if (gen_ts_) {
-    if (!ts_module_.empty()) {
-      f_service_ts_ << "}";
-    }
-    f_service_ts_.close();
-  }
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_js_generator::generate_service_processor(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  if (gen_node_) {
-    string prefix = has_js_namespace(tservice->get_program()) ? js_namespace(tservice->get_program()) : "var ";
-    f_service_ << prefix << service_name_ << "Processor = " << "exports.Processor = function(handler) ";
-  } else {
-    f_service_ << js_namespace(tservice->get_program()) << service_name_ << "Processor = "
-             << "exports.Processor = function(handler) ";
-  }
-
-  scope_up(f_service_);
-
-  f_service_ << indent() << "this._handler = handler;" << endl;
-
-  scope_down(f_service_);
-  f_service_ << ";" << endl;
-
-  if (tservice->get_extends() != NULL) {
-    indent(f_service_) << "Thrift.inherits(" << js_namespace(tservice->get_program())
-                       << service_name_ << "Processor, " << tservice->get_extends()->get_name()
-                       << "Processor);" << endl;
-  }
-
-  // Generate the server implementation
-  indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
-                     << "Processor.prototype.process = function(input, output) ";
-
-  scope_up(f_service_);
-
-  f_service_ << indent() << "var r = input.readMessageBegin();" << endl << indent()
-             << "if (this['process_' + r.fname]) {" << endl << indent()
-             << "  return this['process_' + r.fname].call(this, r.rseqid, input, output);" << endl
-             << indent() << "} else {" << endl << indent() << "  input.skip(Thrift.Type.STRUCT);"
-             << endl << indent() << "  input.readMessageEnd();" << endl << indent()
-             << "  var x = new "
-                "Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN_METHOD, "
-                "'Unknown function ' + r.fname);" << endl << indent()
-             << "  output.writeMessageBegin(r.fname, Thrift.MessageType.EXCEPTION, r.rseqid);"
-             << endl << indent() << "  x.write(output);" << endl << indent()
-             << "  output.writeMessageEnd();" << endl << indent() << "  output.flush();" << endl
-             << indent() << "}" << endl;
-
-  scope_down(f_service_);
-  f_service_ << ";" << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_js_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
-                     << "Processor.prototype.process_" + tfunction->get_name()
-                        + " = function(seqid, input, output) ";
-
-  scope_up(f_service_);
-
-  string argsname = js_namespace(program_) + service_name_ + "_" + tfunction->get_name() + "_args";
-  string resultname = js_namespace(program_) + service_name_ + "_" + tfunction->get_name()
-                      + "_result";
-
-  f_service_ << indent() << "var args = new " << argsname << "();" << endl << indent()
-             << "args.read(input);" << endl << indent() << "input.readMessageEnd();" << endl;
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    indent(f_service_) << "this._handler." << tfunction->get_name() << "(";
-
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << "args." << (*f_iter)->get_name();
-    }
-
-    f_service_ << ");" << endl;
-    scope_down(f_service_);
-    f_service_ << ";" << endl;
-    return;
-  }
-
-  f_service_ << indent() << "if (this._handler." << tfunction->get_name()
-             << ".length === " << fields.size() << ") {" << endl;
-  indent_up();
-  indent(f_service_) << "Q.fcall(this._handler." << tfunction->get_name();
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    f_service_ << ", args." << (*f_iter)->get_name();
-  }
-
-  f_service_ << ")" << endl;
-  indent_up();
-  indent(f_service_) << ".then(function(result) {" << endl;
-  indent_up();
-  f_service_ << indent() << "var result_obj = new " << resultname << "({success: result});" << endl
-             << indent() << "output.writeMessageBegin(\"" << tfunction->get_name()
-             << "\", Thrift.MessageType.REPLY, seqid);" << endl << indent()
-             << "result_obj.write(output);" << endl << indent() << "output.writeMessageEnd();" << endl
-             << indent() << "output.flush();" << endl;
-  indent_down();
-  indent(f_service_) << "}, function (err) {" << endl;
-  indent_up();
-  indent(f_service_) << "var result;" << endl;
-
-  bool has_exception = false;
-  t_struct* exceptions = tfunction->get_xceptions();
-  if (exceptions) {
-    const vector<t_field*>& members = exceptions->get_members();
-    for (vector<t_field*>::const_iterator it = members.begin(); it != members.end(); ++it) {
-      t_type* t = get_true_type((*it)->get_type());
-      if (t->is_xception()) {
-        if (!has_exception) {
-          has_exception = true;
-          indent(f_service_) << "if (err instanceof " << js_type_namespace(t->get_program())
-                             << t->get_name();
-        } else {
-          f_service_ << " || err instanceof " << js_type_namespace(t->get_program())
-                     << t->get_name();
-        }
-      }
-    }
-  }
-
-  if (has_exception) {
-    f_service_ << ") {" << endl;
-    indent_up();
-    f_service_ << indent() << "result = new " << resultname << "(err);" << endl << indent()
-               << "output.writeMessageBegin(\"" << tfunction->get_name()
-               << "\", Thrift.MessageType.REPLY, seqid);" << endl;
-
-    indent_down();
-    indent(f_service_) << "} else {" << endl;
-    indent_up();
-  }
-
-  f_service_ << indent() << "result = new "
-                            "Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN,"
-                            " err.message);" << endl << indent() << "output.writeMessageBegin(\""
-             << tfunction->get_name() << "\", Thrift.MessageType.EXCEPTION, seqid);" << endl;
-
-  if (has_exception) {
-    indent_down();
-    indent(f_service_) << "}" << endl;
-  }
-
-  f_service_ << indent() << "result.write(output);" << endl << indent()
-             << "output.writeMessageEnd();" << endl << indent() << "output.flush();" << endl;
-  indent_down();
-  indent(f_service_) << "});" << endl;
-  indent_down();
-  indent_down();
-  indent(f_service_) << "} else {" << endl;
-  indent_up();
-  indent(f_service_) << "this._handler." << tfunction->get_name() << "(";
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    f_service_ << "args." << (*f_iter)->get_name() << ", ";
-  }
-
-  f_service_ << "function (err, result) {" << endl;
-  indent_up();
-  indent(f_service_) << "var result_obj;" << endl;
-
-  indent(f_service_) << "if ((err === null || typeof err === 'undefined')";
-  if (has_exception) {
-    const vector<t_field*>& members = exceptions->get_members();
-    for (vector<t_field*>::const_iterator it = members.begin(); it != members.end(); ++it) {
-      t_type* t = get_true_type((*it)->get_type());
-      if (t->is_xception()) {
-        f_service_ << " || err instanceof " << js_type_namespace(t->get_program()) << t->get_name();
-      }
-    }
-  }
-  f_service_ << ") {" << endl;
-  indent_up();
-  f_service_ << indent() << "result_obj = new " << resultname
-             << "((err !== null || typeof err === 'undefined') ? err : {success: result});" << endl << indent()
-             << "output.writeMessageBegin(\"" << tfunction->get_name()
-             << "\", Thrift.MessageType.REPLY, seqid);" << endl;
-  indent_down();
-  indent(f_service_) << "} else {" << endl;
-  indent_up();
-  f_service_ << indent() << "result_obj = new "
-                            "Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN,"
-                            " err.message);" << endl << indent() << "output.writeMessageBegin(\""
-             << tfunction->get_name() << "\", Thrift.MessageType.EXCEPTION, seqid);" << endl;
-  indent_down();
-  f_service_ << indent() << "}" << endl << indent() << "result_obj.write(output);" << endl << indent()
-             << "output.writeMessageEnd();" << endl << indent() << "output.flush();" << endl;
-
-  indent_down();
-  indent(f_service_) << "});" << endl;
-  indent_down();
-  indent(f_service_) << "}" << endl;
-  indent_down();
-  indent(f_service_) << "};" << endl;
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_js_generator::generate_service_helpers(t_service* tservice) {
-  // Do not generate TS definitions for helper functions
-  bool gen_ts_tmp = gen_ts_;
-  gen_ts_ = false;
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  f_service_ << "//HELPER FUNCTIONS AND STRUCTURES" << endl << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    string name = ts->get_name();
-    ts->set_name(service_name_ + "_" + name);
-    generate_js_struct_definition(f_service_, ts, false, false);
-    generate_js_function_helpers(*f_iter);
-    ts->set_name(name);
-  }
-
-  gen_ts_ = gen_ts_tmp;
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_js_generator::generate_js_function_helpers(t_function* tfunction) {
-  t_struct result(program_, service_name_ + "_" + tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_js_struct_definition(f_service_, &result, false, false);
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_js_generator::generate_service_interface(t_service* tservice) {
-  (void)tservice;
-}
-
-/**
- * Generates a REST interface
- */
-void t_js_generator::generate_service_rest(t_service* tservice) {
-  (void)tservice;
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_js_generator::generate_service_client(t_service* tservice) {
-  if (gen_node_) {
-    string prefix = has_js_namespace(tservice->get_program()) ? js_namespace(tservice->get_program()) : "var ";
-    f_service_ << prefix << service_name_ << "Client = "
-               << "exports.Client = function(output, pClass) {" << endl;
-  } else {
-    f_service_ << js_namespace(tservice->get_program()) << service_name_
-               << "Client = function(input, output) {" << endl;
-    if (gen_ts_) {
-      f_service_ts_ << ts_print_doc(tservice) << ts_indent() << ts_declare() << "class "
-                    << service_name_ << "Client ";
-      if (tservice->get_extends() != NULL) {
-        f_service_ts_ << "extends " << tservice->get_extends()->get_name() << "Client ";
-      }
-      f_service_ts_ << "{" << endl;
-    }
-  }
-
-  indent_up();
-
-  if (gen_node_) {
-    f_service_ << indent() << "  this.output = output;" << endl << indent()
-               << "  this.pClass = pClass;" << endl << indent() << "  this._seqid = 0;" << endl
-               << indent() << "  this._reqs = {};" << endl;
-  } else {
-    f_service_ << indent() << "  this.input = input;" << endl << indent()
-               << "  this.output = (!output) ? input : output;" << endl << indent()
-               << "  this.seqid = 0;" << endl;
-    if (gen_ts_) {
-      f_service_ts_ << ts_indent() << "input: Thrift.TJSONProtocol;" << endl << ts_indent()
-                    << "output: Thrift.TJSONProtocol;" << endl << ts_indent() << "seqid: number;"
-                    << endl << endl << ts_indent()
-                    << "constructor(input: Thrift.TJSONProtocol, output?: Thrift.TJSONProtocol);"
-                    << endl;
-    }
-  }
-
-  indent_down();
-
-  f_service_ << indent() << "};" << endl;
-
-  if (tservice->get_extends() != NULL) {
-    indent(f_service_) << "Thrift.inherits(" << js_namespace(tservice->get_program())
-                       << service_name_ << "Client, "
-                       << js_namespace(tservice->get_extends()->get_program())
-                       << tservice->get_extends()->get_name() << "Client);" << endl;
-  } else {
-    // init prototype
-    indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
-                       << "Client.prototype = {};" << endl;
-  }
-
-  // utils for multiplexed services
-  if (gen_node_) {
-    indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
-                       << "Client.prototype.seqid = function() { return this._seqid; };" << endl
-                       << js_namespace(tservice->get_program()) << service_name_
-                       << "Client.prototype.new_seqid = function() { return this._seqid += 1; };"
-                       << endl;
-  }
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string funname = (*f_iter)->get_name();
-    string arglist = argument_list(arg_struct);
-
-    // Open function
-    f_service_ << js_namespace(tservice->get_program()) << service_name_ << "Client.prototype."
-               << function_signature(*f_iter, "", true) << " {" << endl;
-
-    indent_up();
-
-    if (gen_ts_) {
-      f_service_ts_ << ts_print_doc(*f_iter) <<
-          // function definition without callback
-          ts_indent() << ts_function_signature(*f_iter, false) << endl << ts_print_doc(*f_iter) <<
-          // overload with callback
-          ts_indent() << ts_function_signature(*f_iter, true) << endl;
-    }
-
-    if (gen_node_) { // Node.js output      ./gen-nodejs
-      f_service_ << indent() << "this._seqid = this.new_seqid();" << endl << indent()
-                 << "if (callback === undefined) {" << endl;
-      indent_up();
-      f_service_ << indent() << "var _defer = Q.defer();" << endl << indent()
-                 << "this._reqs[this.seqid()] = function(error, result) {" << endl;
-      indent_up();
-      indent(f_service_) << "if (error) {" << endl;
-      indent_up();
-      indent(f_service_) << "_defer.reject(error);" << endl;
-      indent_down();
-      indent(f_service_) << "} else {" << endl;
-      indent_up();
-      indent(f_service_) << "_defer.resolve(result);" << endl;
-      indent_down();
-      indent(f_service_) << "}" << endl;
-      indent_down();
-      indent(f_service_) << "};" << endl;
-      f_service_ << indent() << "this.send_" << funname << "(" << arglist << ");" << endl
-                 << indent() << "return _defer.promise;" << endl;
-      indent_down();
-      indent(f_service_) << "} else {" << endl;
-      indent_up();
-      f_service_ << indent() << "this._reqs[this.seqid()] = callback;" << endl << indent()
-                 << "this.send_" << funname << "(" << arglist << ");" << endl;
-      indent_down();
-      indent(f_service_) << "}" << endl;
-    } else if (gen_jquery_) { // jQuery output       ./gen-js
-      f_service_ << indent() << "if (callback === undefined) {" << endl;
-      indent_up();
-      f_service_ << indent() << "this.send_" << funname << "(" << arglist << ");" << endl;
-      if (!(*f_iter)->is_oneway()) {
-        f_service_ << indent();
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          f_service_ << "return ";
-        }
-        f_service_ << "this.recv_" << funname << "();" << endl;
-      }
-      indent_down();
-      f_service_ << indent() << "} else {" << endl;
-      indent_up();
-      f_service_ << indent() << "var postData = this.send_" << funname << "(" << arglist
-                 << (arglist.empty() ? "" : ", ") << "true);" << endl;
-      f_service_ << indent() << "return this.output.getTransport()" << endl;
-      indent_up();
-      f_service_ << indent() << ".jqRequest(this, postData, arguments, this.recv_" << funname
-                 << ");" << endl;
-      indent_down();
-      indent_down();
-      f_service_ << indent() << "}" << endl;
-    } else { // Standard JavaScript ./gen-js
-      f_service_ << indent() << "this.send_" << funname << "(" << arglist
-                 << (arglist.empty() ? "" : ", ") << "callback); " << endl;
-      if (!(*f_iter)->is_oneway()) {
-        f_service_ << indent() << "if (!callback) {" << endl;
-        f_service_ << indent();
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          f_service_ << "  return ";
-        }
-        f_service_ << "this.recv_" << funname << "();" << endl;
-        f_service_ << indent() << "}" << endl;
-      }
-    }
-
-    indent_down();
-
-    f_service_ << "};" << endl << endl;
-
-    // Send function
-    f_service_ << js_namespace(tservice->get_program()) << service_name_ << "Client.prototype.send_"
-               << function_signature(*f_iter, "", !gen_node_) << " {" << endl;
-
-    indent_up();
-
-    std::string outputVar;
-    if (gen_node_) {
-      f_service_ << indent() << "var output = new this.pClass(this.output);" << endl;
-      outputVar = "output";
-    } else {
-      outputVar = "this.output";
-    }
-
-    std::string argsname = js_namespace(program_) + service_name_ + "_" + (*f_iter)->get_name()
-                           + "_args";
-
-    std::string messageType = (*f_iter)->is_oneway() ? "Thrift.MessageType.ONEWAY"
-                                                     : "Thrift.MessageType.CALL";
-
-    // Serialize the request header
-    if (gen_node_) {
-      f_service_ << indent() << outputVar << ".writeMessageBegin('" << (*f_iter)->get_name()
-                 << "', " << messageType << ", this.seqid());" << endl;
-    } else {
-      f_service_ << indent() << outputVar << ".writeMessageBegin('" << (*f_iter)->get_name()
-                 << "', " << messageType << ", this.seqid);" << endl;
-    }
-
-    f_service_ << indent() << "var args = new " << argsname << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "args." << (*fld_iter)->get_name() << " = "
-                 << (*fld_iter)->get_name() << ";" << endl;
-    }
-
-    // Write to the stream
-    f_service_ << indent() << "args.write(" << outputVar << ");" << endl << indent() << outputVar
-               << ".writeMessageEnd();" << endl;
-
-    if (gen_node_) {
-      f_service_ << indent() << "return this.output.flush();" << endl;
-    } else {
-      if (gen_jquery_) {
-        f_service_ << indent() << "return this.output.getTransport().flush(callback);" << endl;
-      } else {
-        f_service_ << indent() << "if (callback) {" << endl;
-        f_service_ << indent() << "  var self = this;" << endl;
-        f_service_ << indent() << "  this.output.getTransport().flush(true, function() {" << endl;
-        f_service_ << indent() << "    var result = null;" << endl;
-        f_service_ << indent() << "    try {" << endl;
-        f_service_ << indent() << "      result = self.recv_" << funname << "();" << endl;
-        f_service_ << indent() << "    } catch (e) {" << endl;
-        f_service_ << indent() << "      result = e;" << endl;
-        f_service_ << indent() << "    }" << endl;
-        f_service_ << indent() << "    callback(result);" << endl;
-        f_service_ << indent() << "  });" << endl;
-        f_service_ << indent() << "} else {" << endl;
-        f_service_ << indent() << "  return this.output.getTransport().flush();" << endl;
-        f_service_ << indent() << "}" << endl;
-      }
-    }
-
-    indent_down();
-
-    f_service_ << "};" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      std::string resultname = js_namespace(tservice->get_program()) + service_name_ + "_"
-                               + (*f_iter)->get_name() + "_result";
-
-      if (gen_node_) {
-        // Open function
-        f_service_ << endl << js_namespace(tservice->get_program()) << service_name_
-                   << "Client.prototype.recv_" << (*f_iter)->get_name()
-                   << " = function(input,mtype,rseqid) {" << endl;
-      } else {
-        t_struct noargs(program_);
-
-        t_function recv_function((*f_iter)->get_returntype(),
-                                 string("recv_") + (*f_iter)->get_name(),
-                                 &noargs);
-        // Open function
-        f_service_ << endl << js_namespace(tservice->get_program()) << service_name_
-                   << "Client.prototype." << function_signature(&recv_function) << " {" << endl;
-      }
-
-      indent_up();
-
-      std::string inputVar;
-      if (gen_node_) {
-        inputVar = "input";
-      } else {
-        inputVar = "this.input";
-      }
-
-      if (gen_node_) {
-        f_service_ << indent() << "var callback = this._reqs[rseqid] || function() {};" << endl
-                   << indent() << "delete this._reqs[rseqid];" << endl;
-      } else {
-        f_service_ << indent() << "var ret = this.input.readMessageBegin();" << endl << indent()
-                   << "var fname = ret.fname;" << endl << indent() << "var mtype = ret.mtype;"
-                   << endl << indent() << "var rseqid = ret.rseqid;" << endl;
-      }
-
-      f_service_ << indent() << "if (mtype == Thrift.MessageType.EXCEPTION) {" << endl << indent()
-                 << "  var x = new Thrift.TApplicationException();" << endl << indent()
-                 << "  x.read(" << inputVar << ");" << endl << indent() << "  " << inputVar
-                 << ".readMessageEnd();" << endl << indent() << "  " << render_recv_throw("x")
-                 << endl << indent() << "}" << endl;
-
-      f_service_ << indent() << "var result = new " << resultname << "();" << endl << indent()
-                 << "result.read(" << inputVar << ");" << endl;
-
-      f_service_ << indent() << inputVar << ".readMessageEnd();" << endl << endl;
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "if (null !== result." << (*x_iter)->get_name() << ") {" << endl
-                   << indent() << "  " << render_recv_throw("result." + (*x_iter)->get_name())
-                   << endl << indent() << "}" << endl;
-      }
-
-      // Careful, only return result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << indent() << "if (null !== result.success) {" << endl << indent() << "  "
-                   << render_recv_return("result.success") << endl << indent() << "}" << endl;
-        f_service_ << indent()
-                   << render_recv_throw("'" + (*f_iter)->get_name() + " failed: unknown result'")
-                   << endl;
-      } else {
-        if (gen_node_) {
-          indent(f_service_) << "callback(null);" << endl;
-        } else {
-          indent(f_service_) << "return;" << endl;
-        }
-      }
-
-      // Close function
-      indent_down();
-      f_service_ << "};" << endl;
-    }
-  }
-
-  if (gen_ts_) {
-    f_service_ts_ << ts_indent() << "}" << endl;
-  }
-}
-
-std::string t_js_generator::render_recv_throw(std::string var) {
-  if (gen_node_) {
-    return "return callback(" + var + ");";
-  } else {
-    return "throw " + var + ";";
-  }
-}
-
-std::string t_js_generator::render_recv_return(std::string var) {
-  if (gen_node_) {
-    return "return callback(null, " + var + ");";
-  } else {
-    return "return " + var + ";";
-  }
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_js_generator::generate_deserialize_field(ofstream& out,
-                                                t_field* tfield,
-                                                string prefix,
-                                                bool inclass) {
-  (void)inclass;
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name();
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << name << " = input.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        out << (((t_base_type*)type)->is_binary() ? "readBinary()" : "readString()");
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "readBool()";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "readByte()";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "readI16()";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "readI32()";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "readI64()";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "readDouble()";
-        break;
-      default:
-        throw "compiler error: no JS name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "readI32()";
-    }
-
-    if (!gen_node_) {
-      out << ".value";
-    }
-
-    out << ";" << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a variable. This makes two key assumptions,
- * first that there is a const char* variable named data that points to the
- * buffer for deserialization, and that there is a variable protocol which
- * is a reference to a TProtocol serialization object.
- */
-void t_js_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  out << indent() << prefix << " = new " << js_type_namespace(tstruct->get_program())
-      << tstruct->get_name() << "();" << endl << indent() << prefix << ".read(input);" << endl;
-}
-
-void t_js_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
-  string size = tmp("_size");
-  string ktype = tmp("_ktype");
-  string vtype = tmp("_vtype");
-  string etype = tmp("_etype");
-  string rtmp3 = tmp("_rtmp3");
-
-  t_field fsize(g_type_i32, size);
-  t_field fktype(g_type_i8, ktype);
-  t_field fvtype(g_type_i8, vtype);
-  t_field fetype(g_type_i8, etype);
-
-  out << indent() << "var " << size << " = 0;" << endl;
-  out << indent() << "var " << rtmp3 << ";" << endl;
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    out << indent() << prefix << " = {};" << endl << indent() << "var " << ktype << " = 0;" << endl
-        << indent() << "var " << vtype << " = 0;" << endl;
-
-    out << indent() << rtmp3 << " = input.readMapBegin();" << endl;
-    out << indent() << ktype << " = " << rtmp3 << ".ktype;" << endl;
-    out << indent() << vtype << " = " << rtmp3 << ".vtype;" << endl;
-    out << indent() << size << " = " << rtmp3 << ".size;" << endl;
-
-  } else if (ttype->is_set()) {
-
-    out << indent() << prefix << " = [];" << endl << indent() << "var " << etype << " = 0;" << endl
-        << indent() << rtmp3 << " = input.readSetBegin();" << endl << indent() << etype << " = "
-        << rtmp3 << ".etype;" << endl << indent() << size << " = " << rtmp3 << ".size;" << endl;
-
-  } else if (ttype->is_list()) {
-
-    out << indent() << prefix << " = [];" << endl << indent() << "var " << etype << " = 0;" << endl
-        << indent() << rtmp3 << " = input.readListBegin();" << endl << indent() << etype << " = "
-        << rtmp3 << ".etype;" << endl << indent() << size << " = " << rtmp3 << ".size;" << endl;
-  }
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for (var " << i << " = 0; " << i << " < " << size << "; ++" << i << ")" << endl;
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    if (!gen_node_) {
-      out << indent() << "if (" << i << " > 0 ) {" << endl << indent()
-          << "  if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {" << endl
-          << indent() << "    input.rstack.pop();" << endl << indent() << "  }" << endl << indent()
-          << "}" << endl;
-    }
-
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  scope_down(out);
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "input.readMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "input.readSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "input.readListEnd();" << endl;
-  }
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_js_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  string key = tmp("key");
-  string val = tmp("val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey, false, false) << ";" << endl;
-  indent(out) << declare_field(&fval, false, false) << ";" << endl;
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << prefix << "[" << key << "] = " << val << ";" << endl;
-}
-
-void t_js_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  string elem = tmp("elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << "var " << elem << " = null;" << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".push(" << elem << ");" << endl;
-}
-
-void t_js_generator::generate_deserialize_list_element(ofstream& out,
-                                                       t_list* tlist,
-                                                       string prefix) {
-  string elem = tmp("elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << "var " << elem << " = null;" << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".push(" << elem << ");" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_js_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + tfield->get_name());
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + tfield->get_name());
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    string name = tfield->get_name();
-
-    // Hack for when prefix is defined (always a hash ref)
-    if (!prefix.empty())
-      name = prefix + tfield->get_name();
-
-    indent(out) << "output.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        out << (((t_base_type*)type)->is_binary() ? "writeBinary(" : "writeString(") << name << ")";
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ")";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ")";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ")";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ")";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ")";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ")";
-        break;
-      default:
-        throw "compiler error: no JS name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32(" << name << ")";
-    }
-    out << ";" << endl;
-
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_js_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  indent(out) << prefix << ".write(output);" << endl;
-}
-
-/**
- * Writes out a container
- */
-void t_js_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  if (ttype->is_map()) {
-    indent(out) << "output.writeMapBegin(" << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
-                << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
-                << "Thrift.objectLength(" << prefix << "));" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "output.writeSetBegin(" << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", "
-                << prefix << ".length);" << endl;
-
-  } else if (ttype->is_list()) {
-
-    indent(out) << "output.writeListBegin(" << type_to_enum(((t_list*)ttype)->get_elem_type())
-                << ", " << prefix << ".length);" << endl;
-  }
-
-  if (ttype->is_map()) {
-    string kiter = tmp("kiter");
-    string viter = tmp("viter");
-    indent(out) << "for (var " << kiter << " in " << prefix << ")" << endl;
-    scope_up(out);
-    indent(out) << "if (" << prefix << ".hasOwnProperty(" << kiter << "))" << endl;
-    scope_up(out);
-    indent(out) << "var " << viter << " = " << prefix << "[" << kiter << "];" << endl;
-    generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
-    scope_down(out);
-    scope_down(out);
-
-  } else if (ttype->is_set()) {
-    string iter = tmp("iter");
-    indent(out) << "for (var " << iter << " in " << prefix << ")" << endl;
-    scope_up(out);
-    indent(out) << "if (" << prefix << ".hasOwnProperty(" << iter << "))" << endl;
-    scope_up(out);
-    indent(out) << iter << " = " << prefix << "[" << iter << "];" << endl;
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-    scope_down(out);
-    scope_down(out);
-
-  } else if (ttype->is_list()) {
-    string iter = tmp("iter");
-    indent(out) << "for (var " << iter << " in " << prefix << ")" << endl;
-    scope_up(out);
-    indent(out) << "if (" << prefix << ".hasOwnProperty(" << iter << "))" << endl;
-    scope_up(out);
-    indent(out) << iter << " = " << prefix << "[" << iter << "];" << endl;
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-    scope_down(out);
-    scope_down(out);
-  }
-
-  if (ttype->is_map()) {
-    indent(out) << "output.writeMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "output.writeSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "output.writeListEnd();" << endl;
-  }
-}
-
-/**
- * Serializes the members of a map.
- *
- */
-void t_js_generator::generate_serialize_map_element(ofstream& out,
-                                                    t_map* tmap,
-                                                    string kiter,
-                                                    string viter) {
-  t_field kfield(tmap->get_key_type(), kiter);
-  generate_serialize_field(out, &kfield);
-
-  t_field vfield(tmap->get_val_type(), viter);
-  generate_serialize_field(out, &vfield);
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_js_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield);
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_js_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield);
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param ttype The type
- */
-string t_js_generator::declare_field(t_field* tfield, bool init, bool obj) {
-  string result = "this." + tfield->get_name();
-
-  if (!obj) {
-    result = "var " + tfield->get_name();
-  }
-
-  if (init) {
-    t_type* type = get_true_type(tfield->get_type());
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        break;
-      case t_base_type::TYPE_STRING:
-      case t_base_type::TYPE_BOOL:
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-      case t_base_type::TYPE_DOUBLE:
-        result += " = null";
-        break;
-      default:
-        throw "compiler error: no JS initializer for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      result += " = null";
-    } else if (type->is_map()) {
-      result += " = null";
-    } else if (type->is_container()) {
-      result += " = null";
-    } else if (type->is_struct() || type->is_xception()) {
-      if (obj) {
-        result += " = new " + js_type_namespace(type->get_program()) + type->get_name() + "()";
-      } else {
-        result += " = null";
-      }
-    }
-  } else {
-    result += " = null";
-  }
-  return result;
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_js_generator::function_signature(t_function* tfunction,
-                                          string prefix,
-                                          bool include_callback) {
-
-  string str;
-
-  str = prefix + tfunction->get_name() + " = function(";
-
-  str += argument_list(tfunction->get_arglist(), include_callback);
-
-  str += ")";
-  return str;
-}
-
-/**
- * Renders a field list
- */
-string t_js_generator::argument_list(t_struct* tstruct, bool include_callback) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += (*f_iter)->get_name();
-  }
-
-  if (include_callback) {
-    if (!fields.empty()) {
-      result += ", ";
-    }
-    result += "callback";
-  }
-
-  return result;
-}
-
-/**
- * Converts the parse type to a C++ enum string for the given type.
- */
-string t_js_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "Thrift.Type.STRING";
-    case t_base_type::TYPE_BOOL:
-      return "Thrift.Type.BOOL";
-    case t_base_type::TYPE_I8:
-      return "Thrift.Type.BYTE";
-    case t_base_type::TYPE_I16:
-      return "Thrift.Type.I16";
-    case t_base_type::TYPE_I32:
-      return "Thrift.Type.I32";
-    case t_base_type::TYPE_I64:
-      return "Thrift.Type.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "Thrift.Type.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "Thrift.Type.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "Thrift.Type.STRUCT";
-  } else if (type->is_map()) {
-    return "Thrift.Type.MAP";
-  } else if (type->is_set()) {
-    return "Thrift.Type.SET";
-  } else if (type->is_list()) {
-    return "Thrift.Type.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Converts a t_type to a TypeScript type (string).
- * @param t_type Type to convert to TypeScript
- * @return String TypeScript type
- */
-string t_js_generator::ts_get_type(t_type* type) {
-  std::string ts_type;
-
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      ts_type = "string";
-      break;
-    case t_base_type::TYPE_BOOL:
-      ts_type = "boolean";
-      break;
-    case t_base_type::TYPE_I8:
-      ts_type = "any";
-      break;
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-    case t_base_type::TYPE_DOUBLE:
-      ts_type = "number";
-      break;
-    case t_base_type::TYPE_VOID:
-      ts_type = "void";
-    }
-  } else if (type->is_enum() || type->is_struct() || type->is_xception()) {
-    std::string type_name;
-    if (type->get_program()) {
-      type_name = js_namespace(type->get_program());
-    }
-    type_name.append(type->get_name());
-    ts_type = type_name;
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-
-    ts_type = ts_get_type(etype) + "[]";
-  } else if (type->is_map()) {
-    string ktype = ts_get_type(((t_map*)type)->get_key_type());
-    string vtype = ts_get_type(((t_map*)type)->get_val_type());
-
-
-    if (ktype == "number" || ktype == "string" ) {
-      ts_type = "{ [k: " + ktype + "]: " + vtype + "; }";
-    } else if ((((t_map*)type)->get_key_type())->is_enum()) {
-      // Not yet supported (enum map): https://github.com/Microsoft/TypeScript/pull/2652
-      //ts_type = "{ [k: " + ktype + "]: " + vtype + "; }";
-      ts_type = "{ [k: number /*" + ktype + "*/]: " + vtype + "; }";
-    } else {
-      ts_type = "any";
-    }
-  }
-
-  return ts_type;
-}
-
-/**
- * Renders a TypeScript function signature of the form 'name(args: types): type;'
- *
- * @param t_function Function definition
- * @param bool in-/exclude the callback argument
- * @return String of rendered function definition
- */
-std::string t_js_generator::ts_function_signature(t_function* tfunction, bool include_callback) {
-  string str;
-  const vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  str = tfunction->get_name() + "(";
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    str += (*f_iter)->get_name() + ts_get_req(*f_iter) + ": " + ts_get_type((*f_iter)->get_type());
-
-    if (f_iter + 1 != fields.end() || (include_callback && fields.size() > 0)) {
-      str += ", ";
-    }
-  }
-
-  if (include_callback) {
-    str += "callback: Function): ";
-
-    if (gen_jquery_) {
-      str += "JQueryXHR;";
-    } else {
-      str += "void;";
-    }
-  } else {
-    str += "): " + ts_get_type(tfunction->get_returntype()) + ";";
-  }
-
-  return str;
-}
-
-/**
- * Takes a name and produces a valid NodeJS identifier from it
- *
- * @param name The name which shall become a valid NodeJS identifier
- * @return The modified name with the updated identifier
- */
-std::string t_js_generator::make_valid_nodeJs_identifier(std::string const& name) {
-  std::string str = name;
-  if (str.empty()) {
-    return str;
-  }
-
-  // tests rely on this
-  assert(('A' < 'Z') && ('a' < 'z') && ('0' < '9'));
-
-  // if the first letter is a number, we add an additional underscore in front of it
-  char c = str.at(0);
-  if (('0' <= c) && (c <= '9')) {
-    str = "_" + str;
-  }
-
-  // following chars: letter, number or underscore
-  for (size_t i = 0; i < str.size(); ++i) {
-    c = str.at(i);
-    if ((('A' > c) || (c > 'Z')) && (('a' > c) || (c > 'z')) && (('0' > c) || (c > '9'))
-        && ('_' != c) && ('$' != c)) {
-      str.replace(i, 1, "_");
-    }
-  }
-
-  return str;
-}
-
-THRIFT_REGISTER_GENERATOR(js,
-                          "Javascript",
-                          "    jquery:          Generate jQuery compatible code.\n"
-                          "    node:            Generate node.js compatible code.\n"
-                          "    ts:              Generate TypeScript definition files.\n"
-                          "    with_ns:         Create global namespace objects when using node.js\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_json_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_json_generator.cc
deleted file mode 100644
index 36e9216..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_json_generator.cc
+++ /dev/null
@@ -1,727 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <limits>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-using std::stack;
-
-static const string endl = "\n";
-static const string quot = "\"";
-static const bool NO_INDENT = false;
-static const bool FORCE_STRING = true;
-
-class t_json_generator : public t_generator {
-public:
-  t_json_generator(t_program* program,
-                   const std::map<std::string, std::string>& parsed_options,
-                   const std::string& option_string)
-    : t_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    should_merge_includes_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("merge") == 0) {
-        should_merge_includes_ = true;
-      } else {
-        throw "unknown option json:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-json";
-  }
-
-  virtual ~t_json_generator() {}
-
-  /**
-  * Init and close methods
-  */
-
-  void init_generator();
-  void close_generator();
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_program();
-  void generate_function(t_function* tfunc);
-  void generate_field(t_field* field);
-
-  void generate_service(t_service* tservice);
-  void generate_struct(t_struct* tstruct);
-
-private:
-  bool should_merge_includes_;
-
-  std::ofstream f_json_;
-  std::stack<bool> comma_needed_;
-
-  template <typename T>
-  string number_to_string(T t) {
-    std::ostringstream out;
-    out.imbue(std::locale::classic());
-    out.precision(std::numeric_limits<T>::digits10);
-    out << t;
-    return out.str();
-  }
-
-  template <typename T>
-  void write_number(T n) {
-    f_json_ << number_to_string(n);
-  }
-
-  string get_type_name(t_type* ttype);
-  string get_qualified_name(t_type* ttype);
-
-  void start_object(bool should_indent = true);
-  void start_array();
-  void end_object();
-  void end_array();
-  void write_comma_if_needed();
-  void indicate_comma_needed();
-  string escape_json_string(const string& input);
-  string json_str(const string& str);
-  void merge_includes(t_program*);
-
-  void generate_constant(t_const* con);
-
-  void write_type_spec_entry(const char* name, t_type* ttype);
-  void write_type_spec_object(const char* name, t_type* ttype);
-  void write_type_spec(t_type* ttype);
-  void write_string(const string& value);
-  void write_value(t_type* tvalue);
-  void write_const_value(t_const_value* value, bool force_string = false);
-  void write_key_and(string key);
-  void write_key_and_string(string key, string val);
-  void write_key_and_integer(string key, int val);
-  void write_key_and_bool(string key, bool val);
-};
-
-void t_json_generator::init_generator() {
-  MKDIR(get_out_dir().c_str());
-
-  string f_json_name = get_out_dir() + program_->get_name() + ".json";
-  f_json_.open(f_json_name.c_str());
-
-  // Merge all included programs into this one so we can output one big file.
-  if (should_merge_includes_) {
-    merge_includes(program_);
-  }
-}
-
-string t_json_generator::escape_json_string(const string& input) {
-  std::ostringstream ss;
-  for (std::string::const_iterator iter = input.begin(); iter != input.end(); iter++) {
-    switch (*iter) {
-    case '\\':
-      ss << "\\\\";
-      break;
-    case '"':
-      ss << "\\\"";
-      break;
-    case '/':
-      ss << "\\/";
-      break;
-    case '\b':
-      ss << "\\b";
-      break;
-    case '\f':
-      ss << "\\f";
-      break;
-    case '\n':
-      ss << "\\n";
-      break;
-    case '\r':
-      ss << "\\r";
-      break;
-    case '\t':
-      ss << "\\t";
-      break;
-    default:
-      ss << *iter;
-      break;
-    }
-  }
-  return ss.str();
-}
-
-void t_json_generator::start_object(bool should_indent) {
-  f_json_ << (should_indent ? indent() : "") << "{" << endl;
-  indent_up();
-  comma_needed_.push(false);
-}
-
-void t_json_generator::start_array() {
-  f_json_ << "[" << endl;
-  indent_up();
-  comma_needed_.push(false);
-}
-
-void t_json_generator::write_comma_if_needed() {
-  if (comma_needed_.top()) {
-    f_json_ << "," << endl;
-  }
-}
-
-void t_json_generator::indicate_comma_needed() {
-  comma_needed_.pop();
-  comma_needed_.push(true);
-}
-
-void t_json_generator::write_key_and(string key) {
-  write_comma_if_needed();
-  indent(f_json_) << json_str(key) << ": ";
-  indicate_comma_needed();
-}
-
-void t_json_generator::write_key_and_integer(string key, int val) {
-  write_comma_if_needed();
-  indent(f_json_) << json_str(key) << ": " << number_to_string(val);
-  indicate_comma_needed();
-}
-
-void t_json_generator::write_key_and_string(string key, string val) {
-  write_comma_if_needed();
-  indent(f_json_) << json_str(key) << ": " << json_str(val);
-  indicate_comma_needed();
-}
-
-void t_json_generator::write_key_and_bool(string key, bool val) {
-  write_comma_if_needed();
-  indent(f_json_) << json_str(key) << ": " << (val ? "true" : "false");
-  indicate_comma_needed();
-}
-
-void t_json_generator::end_object() {
-  indent_down();
-  f_json_ << endl << indent() << "}";
-  comma_needed_.pop();
-}
-
-void t_json_generator::end_array() {
-  indent_down();
-  if (comma_needed_.top()) {
-    f_json_ << endl;
-  }
-  indent(f_json_) << "]";
-  comma_needed_.pop();
-}
-
-void t_json_generator::write_type_spec_object(const char* name, t_type* ttype) {
-  ttype = ttype->get_true_type();
-  if (ttype->is_struct() || ttype->is_xception() || ttype->is_container()) {
-    write_key_and(name);
-    start_object(NO_INDENT);
-    write_key_and("typeId");
-    write_type_spec(ttype);
-    end_object();
-  }
-}
-
-void t_json_generator::write_type_spec_entry(const char* name, t_type* ttype) {
-  write_key_and(name);
-  write_type_spec(ttype);
-}
-
-void t_json_generator::write_type_spec(t_type* ttype) {
-  ttype = ttype->get_true_type();
-
-  write_string(get_type_name(ttype));
-
-  if (ttype->is_struct() || ttype->is_xception()) {
-    write_key_and_string("class", get_qualified_name(ttype));
-  } else if (ttype->is_map()) {
-    t_type* ktype = ((t_map*)ttype)->get_key_type();
-    t_type* vtype = ((t_map*)ttype)->get_val_type();
-    write_key_and_string("keyTypeId", get_type_name(ktype));
-    write_key_and_string("valueTypeId", get_type_name(vtype));
-    write_type_spec_object("keyType", ktype);
-    write_type_spec_object("valueType", vtype);
-  } else if (ttype->is_list() || ttype->is_set()) {
-    t_type* etype = ((t_list*)ttype)->get_elem_type();
-    write_key_and_string("elemTypeId", get_type_name(etype));
-    write_type_spec_object("elemType", etype);
-  }
-}
-
-void t_json_generator::close_generator() {
-  f_json_ << endl;
-  f_json_.close();
-}
-
-void t_json_generator::merge_includes(t_program* program) {
-  vector<t_program*> includes = program->get_includes();
-  vector<t_program*>::iterator inc_iter;
-  for (inc_iter = includes.begin(); inc_iter != includes.end(); ++inc_iter) {
-    t_program* include = *inc_iter;
-    // recurse in case we get crazy
-    merge_includes(include);
-    // merge enums
-    vector<t_enum*> enums = include->get_enums();
-    vector<t_enum*>::iterator en_iter;
-    for (en_iter = enums.begin(); en_iter != enums.end(); ++en_iter) {
-      program->add_enum(*en_iter);
-    }
-    // merge typedefs
-    vector<t_typedef*> typedefs = include->get_typedefs();
-    vector<t_typedef*>::iterator td_iter;
-    for (td_iter = typedefs.begin(); td_iter != typedefs.end(); ++td_iter) {
-      program->add_typedef(*td_iter);
-    }
-    // merge structs
-    vector<t_struct*> objects = include->get_objects();
-    vector<t_struct*>::iterator o_iter;
-    for (o_iter = objects.begin(); o_iter != objects.end(); ++o_iter) {
-      program->add_struct(*o_iter);
-    }
-    // merge constants
-    vector<t_const*> consts = include->get_consts();
-    vector<t_const*>::iterator c_iter;
-    for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-      program->add_const(*c_iter);
-    }
-
-    // merge services
-    vector<t_service*> services = include->get_services();
-    vector<t_service*>::iterator sv_iter;
-    for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-      program->add_service(*sv_iter);
-    }
-  }
-}
-
-void t_json_generator::generate_program() {
-
-  init_generator();
-
-  start_object();
-  write_key_and_string("name", program_->get_name());
-  if (program_->has_doc()) {
-    write_key_and_string("doc", program_->get_doc());
-  }
-
-  // When merging includes, the "namespaces" and "includes" sections
-  // become ambiguous, so just skip them.
-  if (!should_merge_includes_) {
-    // Generate namespaces
-    write_key_and("namespaces");
-    start_object(NO_INDENT);
-    const map<string, string>& namespaces = program_->get_namespaces();
-    map<string, string>::const_iterator ns_it;
-    for (ns_it = namespaces.begin(); ns_it != namespaces.end(); ++ns_it) {
-      write_key_and_string(ns_it->first, ns_it->second);
-      indicate_comma_needed();
-    }
-    end_object();
-
-    // Generate includes
-    write_key_and("includes");
-    start_array();
-    const vector<t_program*> includes = program_->get_includes();
-    vector<t_program*>::const_iterator inc_it;
-    for (inc_it = includes.begin(); inc_it != includes.end(); ++inc_it) {
-      write_comma_if_needed();
-      write_string((*inc_it)->get_name());
-      indicate_comma_needed();
-    }
-    end_array();
-  }
-
-  // Generate enums
-  write_key_and("enums");
-  start_array();
-  vector<t_enum*> enums = program_->get_enums();
-  vector<t_enum*>::iterator en_iter;
-  for (en_iter = enums.begin(); en_iter != enums.end(); ++en_iter) {
-    write_comma_if_needed();
-    generate_enum(*en_iter);
-    indicate_comma_needed();
-  }
-  end_array();
-
-  // Generate typedefs
-  write_key_and("typedefs");
-  start_array();
-  vector<t_typedef*> typedefs = program_->get_typedefs();
-  vector<t_typedef*>::iterator td_iter;
-  for (td_iter = typedefs.begin(); td_iter != typedefs.end(); ++td_iter) {
-    write_comma_if_needed();
-    generate_typedef(*td_iter);
-    indicate_comma_needed();
-  }
-  end_array();
-
-  // Generate structs, exceptions, and unions in declared order
-  write_key_and("structs");
-  start_array();
-  vector<t_struct*> objects = program_->get_objects();
-  vector<t_struct*>::iterator o_iter;
-  for (o_iter = objects.begin(); o_iter != objects.end(); ++o_iter) {
-    write_comma_if_needed();
-    if ((*o_iter)->is_xception()) {
-      generate_xception(*o_iter);
-    } else {
-      generate_struct(*o_iter);
-    }
-    indicate_comma_needed();
-  }
-  end_array();
-
-  // Generate constants
-  write_key_and("constants");
-  start_array();
-  vector<t_const*> consts = program_->get_consts();
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    write_comma_if_needed();
-    generate_constant(*c_iter);
-    indicate_comma_needed();
-  }
-  end_array();
-
-  // Generate services
-  write_key_and("services");
-  start_array();
-  vector<t_service*> services = program_->get_services();
-  vector<t_service*>::iterator sv_iter;
-  for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-    write_comma_if_needed();
-    generate_service(*sv_iter);
-    indicate_comma_needed();
-  }
-  end_array();
-
-  end_object();
-
-  // Close the generator
-  close_generator();
-}
-
-void t_json_generator::generate_typedef(t_typedef* ttypedef) {
-  start_object();
-  write_key_and_string("name", get_qualified_name(ttypedef));
-  write_key_and_string("typeId", get_type_name(ttypedef->get_true_type()));
-  write_type_spec_object("type", ttypedef->get_true_type());
-  if (ttypedef->has_doc()) {
-    write_key_and_string("doc", ttypedef->get_doc());
-  }
-  end_object();
-}
-
-void t_json_generator::write_string(const string& value) {
-  f_json_ << quot << escape_json_string(value) << quot;
-}
-
-void t_json_generator::write_const_value(t_const_value* value, bool should_force_string) {
-
-  switch (value->get_type()) {
-
-  case t_const_value::CV_IDENTIFIER:
-  case t_const_value::CV_INTEGER:
-    if (should_force_string) {
-      write_string(number_to_string(value->get_integer()));
-    } else {
-      write_number(value->get_integer());
-    }
-    break;
-
-  case t_const_value::CV_DOUBLE:
-    if (should_force_string) {
-      write_string(number_to_string(value->get_double()));
-    } else {
-      write_number(value->get_double());
-    }
-    break;
-
-  case t_const_value::CV_STRING:
-    write_string(value->get_string());
-    break;
-
-  case t_const_value::CV_LIST: {
-    start_array();
-    std::vector<t_const_value*> list = value->get_list();
-    std::vector<t_const_value*>::iterator lit;
-    for (lit = list.begin(); lit != list.end(); ++lit) {
-      write_comma_if_needed();
-      f_json_ << indent();
-      write_const_value(*lit);
-      indicate_comma_needed();
-    }
-    end_array();
-    break;
-  }
-
-  case t_const_value::CV_MAP: {
-    start_object(NO_INDENT);
-    std::map<t_const_value*, t_const_value*> map = value->get_map();
-    std::map<t_const_value*, t_const_value*>::iterator mit;
-    for (mit = map.begin(); mit != map.end(); ++mit) {
-      write_comma_if_needed();
-      f_json_ << indent();
-      // JSON objects only allow string keys
-      write_const_value(mit->first, FORCE_STRING);
-      f_json_ << ": ";
-      write_const_value(mit->second);
-      indicate_comma_needed();
-    }
-    end_object();
-    break;
-  }
-
-  default:
-    f_json_ << "null";
-    break;
-  }
-}
-
-string t_json_generator::json_str(const string& str) {
-  return quot + escape_json_string(str) + quot;
-}
-
-void t_json_generator::generate_constant(t_const* con) {
-  start_object();
-
-  write_key_and_string("name", con->get_name());
-  write_key_and_string("typeId", get_type_name(con->get_type()));
-  write_type_spec_object("type", con->get_type());
-
-  if (con->has_doc()) {
-    write_key_and_string("doc", con->get_doc());
-  }
-
-  write_key_and("value");
-  write_const_value(con->get_value());
-
-  end_object();
-}
-
-void t_json_generator::generate_enum(t_enum* tenum) {
-  start_object();
-
-  write_key_and_string("name", tenum->get_name());
-
-  if (tenum->has_doc()) {
-    write_key_and_string("doc", tenum->get_doc());
-  }
-
-  write_key_and("members");
-  start_array();
-  vector<t_enum_value*> values = tenum->get_constants();
-  vector<t_enum_value*>::iterator val_iter;
-  for (val_iter = values.begin(); val_iter != values.end(); ++val_iter) {
-    write_comma_if_needed();
-    t_enum_value* val = (*val_iter);
-    start_object();
-    write_key_and_string("name", val->get_name());
-    write_key_and_integer("value", val->get_value());
-    if (val->has_doc()) {
-      write_key_and_string("doc", val->get_doc());
-    }
-    end_object();
-    indicate_comma_needed();
-  }
-  end_array();
-
-  end_object();
-}
-
-void t_json_generator::generate_struct(t_struct* tstruct) {
-  start_object();
-
-  write_key_and_string("name", tstruct->get_name());
-
-  if (tstruct->has_doc()) {
-    write_key_and_string("doc", tstruct->get_doc());
-  }
-
-  write_key_and_bool("isException", tstruct->is_xception());
-
-  write_key_and_bool("isUnion", tstruct->is_union());
-
-  write_key_and("fields");
-  start_array();
-  vector<t_field*> members = tstruct->get_members();
-  vector<t_field*>::iterator mem_iter;
-  for (mem_iter = members.begin(); mem_iter != members.end(); mem_iter++) {
-    write_comma_if_needed();
-    generate_field(*mem_iter);
-    indicate_comma_needed();
-  }
-  end_array();
-
-  end_object();
-}
-
-void t_json_generator::generate_service(t_service* tservice) {
-  start_object();
-
-  write_key_and_string("name", get_qualified_name(tservice));
-
-  if (tservice->get_extends()) {
-    write_key_and_string("extends", get_qualified_name(tservice->get_extends()));
-  }
-
-  if (tservice->has_doc()) {
-    write_key_and_string("doc", tservice->get_doc());
-  }
-
-  write_key_and("functions");
-  start_array();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator fn_iter = functions.begin();
-  for (; fn_iter != functions.end(); fn_iter++) {
-    write_comma_if_needed();
-    generate_function(*fn_iter);
-    indicate_comma_needed();
-  }
-  end_array();
-
-  end_object();
-}
-
-void t_json_generator::generate_function(t_function* tfunc) {
-  start_object();
-
-  write_key_and_string("name", tfunc->get_name());
-
-  write_key_and_string("returnTypeId", get_type_name(tfunc->get_returntype()));
-  write_type_spec_object("returnType", tfunc->get_returntype());
-
-  write_key_and_bool("oneway", tfunc->is_oneway());
-
-  if (tfunc->has_doc()) {
-    write_key_and_string("doc", tfunc->get_doc());
-  }
-
-  write_key_and("arguments");
-  start_array();
-  vector<t_field*> members = tfunc->get_arglist()->get_members();
-  vector<t_field*>::iterator mem_iter = members.begin();
-  for (; mem_iter != members.end(); mem_iter++) {
-    write_comma_if_needed();
-    generate_field(*mem_iter);
-    indicate_comma_needed();
-  }
-  end_array();
-
-  write_key_and("exceptions");
-  start_array();
-  vector<t_field*> excepts = tfunc->get_xceptions()->get_members();
-  vector<t_field*>::iterator ex_iter = excepts.begin();
-  for (; ex_iter != excepts.end(); ex_iter++) {
-    write_comma_if_needed();
-    generate_field(*ex_iter);
-    indicate_comma_needed();
-  }
-  end_array();
-
-  end_object();
-}
-
-void t_json_generator::generate_field(t_field* field) {
-  start_object();
-
-  write_key_and_integer("key", field->get_key());
-  write_key_and_string("name", field->get_name());
-  write_key_and_string("typeId", get_type_name(field->get_type()));
-  write_type_spec_object("type", field->get_type());
-
-  if (field->has_doc()) {
-    write_key_and_string("doc", field->get_doc());
-  }
-
-  write_key_and("required");
-  switch (field->get_req()) {
-  case t_field::T_REQUIRED:
-    write_string("required");
-    break;
-  case t_field::T_OPT_IN_REQ_OUT:
-    write_string("req_out");
-    break;
-  default:
-    write_string("optional");
-    break;
-  }
-
-  if (field->get_value()) {
-    write_key_and("default");
-    write_const_value(field->get_value());
-  }
-
-  end_object();
-}
-
-string t_json_generator::get_type_name(t_type* ttype) {
-  ttype = ttype->get_true_type();
-  if (ttype->is_list()) {
-    return "list";
-  }
-  if (ttype->is_set()) {
-    return "set";
-  }
-  if (ttype->is_map()) {
-    return "map";
-  }
-  if (ttype->is_enum()) {
-    return "i32";
-  }
-  if (ttype->is_struct()) {
-    return ((t_struct*)ttype)->is_union() ? "union" : "struct";
-  }
-  if (ttype->is_xception()) {
-    return "exception";
-  }
-  if (ttype->is_base_type()) {
-    t_base_type* tbasetype = (t_base_type*)ttype;
-    return tbasetype->is_binary() ? "binary" : t_base_type::t_base_name(tbasetype->get_base());
-  }
-
-  return "(unknown)";
-}
-
-string t_json_generator::get_qualified_name(t_type* ttype) {
-  if (should_merge_includes_ || ttype->get_program() == program_) {
-    return ttype->get_name();
-  }
-  return ttype->get_program()->get_name() + "." + ttype->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(json,
-                          "JSON",
-                          "    merge:           Generate output with included files merged\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_lua_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_lua_generator.cc
deleted file mode 100644
index 97b8aa3..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_lua_generator.cc
+++ /dev/null
@@ -1,1138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::ofstream;
-using std::string;
-using std::vector;
-using std::map;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * LUA code generator.
- *
- */
-class t_lua_generator : public t_oop_generator {
-public:
-  t_lua_generator(t_program* program,
-                  const std::map<std::string, std::string>& parsed_options,
-                  const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    gen_requires_ = true;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("omit_requires") == 0) {
-        gen_requires_ = false;
-      } else {
-        throw "unknown option lua:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-lua";
-  }
-
-  /**
-   * Init and close methods
-   */
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  std::string render_const_value(t_type* type, t_const_value* value);
-
-private:
-  /**
-   * True iff we should generate lua require statements.
-   */
-  bool gen_requires_;
-
-  /**
-   * Struct-level generation functions
-   */
-  void generate_lua_struct_definition(std::ofstream& out,
-                                      t_struct* tstruct,
-                                      bool is_xception = false);
-  void generate_lua_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_lua_struct_writer(std::ofstream& out, t_struct* tstruct);
-
-  /**
-   * Service-level generation functions
-   */
-  void generate_service_client(std::ofstream& out, t_service* tservice);
-  void generate_service_interface(std::ofstream& out, t_service* tservice);
-  void generate_service_processor(std::ofstream& out, t_service* tservice);
-  void generate_process_function(std::ofstream& out, t_service* tservice, t_function* tfunction);
-  void generate_service_helpers(ofstream& out, t_service* tservice);
-  void generate_function_helpers(ofstream& out, t_function* tfunction);
-
-  /**
-   * Deserialization (Read)
-   */
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  bool local,
-                                  std::string prefix = "");
-
-  void generate_deserialize_struct(std::ofstream& out,
-                                   t_struct* tstruct,
-                                   bool local,
-                                   std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out,
-                                      t_type* ttype,
-                                      bool local,
-                                      std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  /**
-   * Serialization (Write)
-   */
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string kiter,
-                                      std::string viter);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  /**
-   * Helper rendering functions
-   */
-  std::string lua_includes();
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string argument_list(t_struct* tstruct, std::string prefix = "");
-  std::string type_to_enum(t_type* ttype);
-  static std::string get_namespace(const t_program* program);
-
-  std::string autogen_comment() {
-    return std::string("--\n") + "-- Autogenerated by Thrift\n" + "--\n"
-           + "-- DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" + "-- @"
-                                                                                       "generated\n"
-           + "--\n";
-  }
-
-  /**
-   * File streams
-   */
-  std::ofstream f_types_;
-  std::ofstream f_consts_;
-  std::ofstream f_service_;
-};
-
-/**
- * Init and close methods
- */
-void t_lua_generator::init_generator() {
-  // Make output directory
-  string outdir = get_out_dir();
-  MKDIR(outdir.c_str());
-
-  // Make output files
-  string cur_namespace = get_namespace(program_);
-  string f_consts_name = outdir + cur_namespace + "constants.lua";
-  f_consts_.open(f_consts_name.c_str());
-  string f_types_name = outdir + cur_namespace + "ttypes.lua";
-  f_types_.open(f_types_name.c_str());
-
-  // Add headers
-  f_consts_ << autogen_comment() << lua_includes();
-  f_types_ << autogen_comment() << lua_includes();
-  if (gen_requires_) {
-    f_types_ << endl << "require '" << cur_namespace << "constants'";
-  }
-}
-
-void t_lua_generator::close_generator() {
-  // Close types file
-  f_types_.close();
-  f_consts_.close();
-}
-
-/**
- * Generate a typedef (essentially a constant)
- */
-void t_lua_generator::generate_typedef(t_typedef* ttypedef) {
-  f_types_ << endl << endl << indent() << ttypedef->get_symbolic() << " = "
-           << ttypedef->get_type()->get_name();
-}
-
-/**
- * Generates code for an enumerated type (table)
- */
-void t_lua_generator::generate_enum(t_enum* tenum) {
-  f_types_ << endl << endl << tenum->get_name() << " = {" << endl;
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end();) {
-    int32_t value = (*c_iter)->get_value();
-
-    f_types_ << "  " << (*c_iter)->get_name() << " = " << value;
-    ++c_iter;
-    if (c_iter != constants.end()) {
-      f_types_ << ",";
-    }
-    f_types_ << endl;
-  }
-  f_types_ << "}";
-}
-
-/**
- * Generate a constant (non-local) value
- */
-void t_lua_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = tconst->get_name();
-  t_const_value* value = tconst->get_value();
-
-  f_consts_ << endl << endl << name << " = ";
-  f_consts_ << render_const_value(type, value);
-}
-
-/**
- * Prints the value of a constant with the given type.
- */
-string t_lua_generator::render_const_value(t_type* type, t_const_value* value) {
-  std::ostringstream out;
-
-  type = get_true_type(type);
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << "'" << value->get_string() << "'";
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_I64:
-      out << "lualongnumber.new('" << value->get_string() << "')";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    out << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    out << type->get_name() << " = {" << endl;
-    indent_up();
-
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end();) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-
-      indent(out);
-      out << render_const_value(g_type_string, v_iter->first);
-      out << " = ";
-      out << render_const_value(field_type, v_iter->second);
-      ++v_iter;
-      if (v_iter != val.end()) {
-        out << ",";
-      }
-    }
-
-    out << "}";
-    indent_down();
-  } else if (type->is_map()) {
-    out << type->get_name() << "{" << endl;
-    indent_up();
-
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end();) {
-      indent(out) << "[" << render_const_value(ktype, v_iter->first)
-                  << "] = " << render_const_value(vtype, v_iter->second);
-      ++v_iter;
-      if (v_iter != val.end()) {
-        out << ",";
-      }
-      out << endl;
-    }
-    indent_down();
-    indent(out) << "}";
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    out << type->get_name() << " = {" << endl;
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end();) {
-      indent(out);
-      out << "[" << render_const_value(etype, *v_iter) << "]";
-      if (type->is_set()) {
-        out << " = true";
-      } else {
-        out << " = false";
-      }
-      ++v_iter;
-      if (v_iter != val.end()) {
-        out << "," << endl;
-      }
-    }
-    out << "}";
-  }
-  return out.str();
-}
-
-/**
- * Generate a thrift struct
- */
-void t_lua_generator::generate_struct(t_struct* tstruct) {
-  generate_lua_struct_definition(f_types_, tstruct, false);
-}
-
-/**
- * Generate a thrift exception
- */
-void t_lua_generator::generate_xception(t_struct* txception) {
-  generate_lua_struct_definition(f_types_, txception, true);
-}
-
-/**
- * Generate a thrift struct or exception (lua table)
- */
-void t_lua_generator::generate_lua_struct_definition(ofstream& out,
-                                                     t_struct* tstruct,
-                                                     bool is_exception) {
-  vector<t_field*>::const_iterator m_iter;
-  const vector<t_field*>& members = tstruct->get_members();
-
-  indent(out) << endl << endl << tstruct->get_name();
-  if (is_exception) {
-    out << " = TException:new{" << endl << indent() << "  __type = '" << tstruct->get_name() << "'";
-    if (members.size() > 0) {
-      out << ",";
-    }
-    out << endl;
-  } else {
-    out << " = __TObject:new{" << endl;
-  }
-  indent_up();
-  for (m_iter = members.begin(); m_iter != members.end();) {
-    indent(out);
-    out << (*m_iter)->get_name();
-    ++m_iter;
-    if (m_iter != members.end()) {
-      out << "," << endl;
-    }
-  }
-  indent_down();
-  indent(out);
-  out << endl << "}";
-
-  generate_lua_struct_reader(out, tstruct);
-  generate_lua_struct_writer(out, tstruct);
-}
-
-/**
- * Generate a struct/exception reader
- */
-void t_lua_generator::generate_lua_struct_reader(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // function
-  indent(out) << endl << endl << "function " << tstruct->get_name() << ":read(iprot)" << endl;
-  indent_up();
-
-  indent(out) << "iprot:readStructBegin()" << endl;
-
-  // while: Read in fields
-  indent(out) << "while true do" << endl;
-  indent_up();
-
-  // if: Check what to read
-  indent(out) << "local fname, ftype, fid = iprot:readFieldBegin()" << endl;
-  indent(out) << "if ftype == TType.STOP then" << endl;
-  indent_up();
-  indent(out) << "break" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent_down();
-    indent(out) << "elseif fid == " << (*f_iter)->get_key() << " then" << endl;
-    indent_up();
-    indent(out) << "if ftype == " << type_to_enum((*f_iter)->get_type()) << " then" << endl;
-    indent_up();
-
-    // Read field contents
-    generate_deserialize_field(out, *f_iter, false, "self.");
-
-    indent_down();
-    indent(out) << "else" << endl;
-    indent(out) << "  iprot:skip(ftype)" << endl;
-    indent(out) << "end" << endl;
-  }
-
-  // end if
-  indent_down();
-  indent(out) << "else" << endl;
-  indent(out) << "  iprot:skip(ftype)" << endl;
-  indent(out) << "end" << endl;
-  indent(out) << "iprot:readFieldEnd()" << endl;
-
-  // end while
-  indent_down();
-  indent(out) << "end" << endl;
-  indent(out) << "iprot:readStructEnd()" << endl;
-
-  // end function
-  indent_down();
-  indent(out);
-  out << "end";
-}
-
-/**
- * Generate a struct/exception writer
- */
-void t_lua_generator::generate_lua_struct_writer(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  // function
-  indent(out) << endl << endl << "function " << tstruct->get_name() << ":write(oprot)" << endl;
-  indent_up();
-
-  indent(out) << "oprot:writeStructBegin('" << tstruct->get_name() << "')" << endl;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    // To check element of self whether nil or not.
-    // avoid the value(false) of BOOL is lost.
-    indent(out) << "if self." << (*f_iter)->get_name() << " ~= nil then" << endl;
-    indent_up();
-    indent(out) << "oprot:writeFieldBegin('" << (*f_iter)->get_name() << "', "
-                << type_to_enum((*f_iter)->get_type()) << ", " << (*f_iter)->get_key() << ")"
-                << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "self.");
-
-    indent(out) << "oprot:writeFieldEnd()" << endl;
-    indent_down();
-    indent(out) << "end" << endl;
-  }
-  indent(out) << "oprot:writeFieldStop()" << endl;
-  indent(out) << "oprot:writeStructEnd()" << endl;
-
-  // end function
-  indent_down();
-  indent(out);
-  out << "end";
-}
-
-/**
- * Generate a thrift service
- */
-void t_lua_generator::generate_service(t_service* tservice) {
-  // Get output directory
-  string outdir = get_out_dir();
-
-  // Open the file for writing
-  string cur_ns = get_namespace(program_);
-  string f_service_name = outdir + cur_ns + tservice->get_name() + ".lua";
-  f_service_.open(f_service_name.c_str());
-
-  // Headers
-  f_service_ << autogen_comment() << lua_includes();
-  if (gen_requires_) {
-    f_service_ << endl << "require '" << cur_ns << "ttypes'" << endl;
-
-    if (tservice->get_extends() != NULL) {
-      f_service_ << "require '" << get_namespace(tservice->get_extends()->get_program())
-                 << tservice->get_extends()->get_name() << "'" << endl;
-    }
-  }
-
-  f_service_ << endl;
-
-  generate_service_client(f_service_, tservice);
-  generate_service_interface(f_service_, tservice);
-  generate_service_processor(f_service_, tservice);
-  generate_service_helpers(f_service_, tservice);
-
-  // Close the file
-  f_service_.close();
-}
-
-void t_lua_generator::generate_service_interface(ofstream& out, t_service* tservice) {
-  string classname = tservice->get_name() + "Iface";
-  t_service* extends_s = tservice->get_extends();
-
-  // Interface object definition
-  out << classname << " = ";
-  if (extends_s) {
-    out << extends_s->get_name() << "Iface:new{" << endl;
-  } else {
-    out << "__TObject:new{" << endl;
-  }
-  out << "  __type = '" << classname << "'" << endl << "}" << endl << endl;
-}
-
-void t_lua_generator::generate_service_client(ofstream& out, t_service* tservice) {
-  string classname = tservice->get_name() + "Client";
-  t_service* extends_s = tservice->get_extends();
-
-  // Client object definition
-  out << classname << " = __TObject.new(";
-  if (extends_s != NULL) {
-    out << extends_s->get_name() << "Client";
-  } else {
-    out << "__TClient";
-  }
-  out << ", {" << endl << "  __type = '" << classname << "'" << endl << "})" << endl;
-
-  // Send/Recv functions
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string sig = function_signature(*f_iter);
-    string funcname = (*f_iter)->get_name();
-
-    // Wrapper function
-    indent(out) << endl << "function " << classname << ":" << sig << endl;
-    indent_up();
-
-    indent(out) << "self:send_" << sig << endl << indent();
-    if (!(*f_iter)->is_oneway()) {
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        out << "return ";
-      }
-      out << "self:recv_" << sig << endl;
-    }
-
-    indent_down();
-    indent(out) << "end" << endl;
-
-    // Send function
-    indent(out) << endl << "function " << classname << ":send_" << sig << endl;
-    indent_up();
-
-    indent(out) << "self.oprot:writeMessageBegin('" << funcname << "', "
-                << ((*f_iter)->is_oneway() ? "TMessageType.ONEWAY" : "TMessageType.CALL")
-                << ", self._seqid)" << endl;
-    indent(out) << "local args = " << funcname << "_args:new{}" << endl;
-
-    // Set the args
-    const vector<t_field*>& args = (*f_iter)->get_arglist()->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    for (fld_iter = args.begin(); fld_iter != args.end(); ++fld_iter) {
-      std::string argname = (*fld_iter)->get_name();
-      indent(out) << "args." << argname << " = " << argname << endl;
-    }
-
-    indent(out) << "args:write(self.oprot)" << endl;
-    indent(out) << "self.oprot:writeMessageEnd()" << endl;
-    indent(out) << "self.oprot.trans:flush()" << endl;
-
-    indent_down();
-    indent(out) << "end" << endl;
-
-    // Recv function
-    if (!(*f_iter)->is_oneway()) {
-      indent(out) << endl << "function " << classname << ":recv_" << sig << endl;
-      indent_up();
-
-      out << indent() << "local fname, mtype, rseqid = self.iprot:"
-          << "readMessageBegin()" << endl << indent() << "if mtype == TMessageType.EXCEPTION then"
-          << endl << indent() << "  local x = TApplicationException:new{}" << endl << indent()
-          << "  x:read(self.iprot)" << endl << indent() << "  self.iprot:readMessageEnd()" << endl
-          << indent() << "  error(x)" << endl << indent() << "end" << endl << indent()
-          << "local result = " << funcname << "_result:new{}" << endl << indent()
-          << "result:read(self.iprot)" << endl << indent() << "self.iprot:readMessageEnd()" << endl;
-
-      // Return the result if it's not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        out << indent() << "if result.success ~= nil then" << endl << indent() << "  return result.success"
-            << endl;
-
-        // Throw custom exceptions
-        const std::vector<t_field*>& xf = (*f_iter)->get_xceptions()->get_members();
-        vector<t_field*>::const_iterator x_iter;
-        for (x_iter = xf.begin(); x_iter != xf.end(); ++x_iter) {
-          out << indent() << "elseif result." << (*x_iter)->get_name() << " then" << endl
-              << indent() << "  error(result." << (*x_iter)->get_name() << ")" << endl;
-        }
-
-        out << indent() << "end" << endl << indent()
-            << "error(TApplicationException:new{errorCode = "
-            << "TApplicationException.MISSING_RESULT})" << endl;
-      }
-
-      indent_down();
-      indent(out) << "end" << endl;
-    }
-  }
-}
-
-void t_lua_generator::generate_service_processor(ofstream& out, t_service* tservice) {
-  string classname = tservice->get_name() + "Processor";
-  t_service* extends_s = tservice->get_extends();
-
-  // Define processor table
-  out << endl << classname << " = __TObject.new(";
-  if (extends_s != NULL) {
-    out << extends_s << "Processor" << endl;
-  } else {
-    out << "__TProcessor" << endl;
-  }
-  out << ", {" << endl << " __type = '" << classname << "'" << endl << "})" << endl;
-
-  // Process function
-  indent(out) << endl << "function " << classname << ":process(iprot, oprot, server_ctx)" << endl;
-  indent_up();
-
-  indent(out) << "local name, mtype, seqid = iprot:readMessageBegin()" << endl;
-  indent(out) << "local func_name = 'process_' .. name" << endl;
-  indent(out) << "if not self[func_name] or ttype(self[func_name]) ~= 'function' then";
-  indent_up();
-  out << endl << indent() << "iprot:skip(TType.STRUCT)" << endl << indent()
-      << "iprot:readMessageEnd()" << endl << indent() << "x = TApplicationException:new{" << endl
-      << indent() << "  errorCode = TApplicationException.UNKNOWN_METHOD" << endl << indent() << "}"
-      << endl << indent() << "oprot:writeMessageBegin(name, TMessageType.EXCEPTION, "
-      << "seqid)" << endl << indent() << "x:write(oprot)" << endl << indent()
-      << "oprot:writeMessageEnd()" << endl << indent() << "oprot.trans:flush()" << endl;
-  indent_down();
-  indent(out) << "else" << endl << indent()
-              << "  self[func_name](self, seqid, iprot, oprot, server_ctx)" << endl << indent()
-              << "end" << endl;
-
-  indent_down();
-  indent(out) << "end" << endl;
-
-  // Generate the process subfunctions
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(out, tservice, *f_iter);
-  }
-}
-
-void t_lua_generator::generate_process_function(ofstream& out,
-                                                t_service* tservice,
-                                                t_function* tfunction) {
-  string classname = tservice->get_name() + "Processor";
-  string argsname = tfunction->get_name() + "_args";
-  string resultname = tfunction->get_name() + "_result";
-  string fn_name = tfunction->get_name();
-
-  indent(out) << endl << "function " << classname << ":process_" << fn_name
-              << "(seqid, iprot, oprot, server_ctx)" << endl;
-  indent_up();
-
-  // Read the request
-  out << indent() << "local args = " << argsname << ":new{}" << endl << indent()
-      << "local reply_type = TMessageType.REPLY" << endl << indent() << "args:read(iprot)" << endl
-      << indent() << "iprot:readMessageEnd()" << endl << indent() << "local result = " << resultname
-      << ":new{}" << endl << indent() << "local status, res = pcall(self.handler." << fn_name
-      << ", self.handler";
-
-  // Print arguments
-  t_struct* args = tfunction->get_arglist();
-  if (args->get_members().size() > 0) {
-    out << ", " << argument_list(args, "args.");
-  }
-
-  // Check for errors
-  out << ")" << endl << indent() << "if not status then" << endl << indent()
-      << "  reply_type = TMessageType.EXCEPTION" << endl << indent()
-      << "  result = TApplicationException:new{message = res}" << endl;
-
-  // Handle custom exceptions
-  const std::vector<t_field*>& xf = tfunction->get_xceptions()->get_members();
-  if (xf.size() > 0) {
-    vector<t_field*>::const_iterator x_iter;
-    for (x_iter = xf.begin(); x_iter != xf.end(); ++x_iter) {
-      out << indent() << "elseif ttype(res) == '" << (*x_iter)->get_type()->get_name() << "' then"
-          << endl << indent() << "  result." << (*x_iter)->get_name() << " = res" << endl;
-    }
-  }
-
-  // Set the result and write the reply
-  out << indent() << "else" << endl << indent() << "  result.success = res" << endl << indent()
-      << "end" << endl << indent() << "oprot:writeMessageBegin('" << fn_name << "', reply_type, "
-      << "seqid)" << endl << indent() << "result:write(oprot)" << endl << indent()
-      << "oprot:writeMessageEnd()" << endl << indent() << "oprot.trans:flush()" << endl;
-
-  indent_down();
-  indent(out) << "end" << endl;
-}
-
-// Service helpers
-void t_lua_generator::generate_service_helpers(ofstream& out, t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  out << endl << "-- HELPER FUNCTIONS AND STRUCTURES";
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_lua_struct_definition(out, ts, false);
-    generate_function_helpers(out, *f_iter);
-  }
-}
-
-void t_lua_generator::generate_function_helpers(ofstream& out, t_function* tfunction) {
-  if (!tfunction->is_oneway()) {
-    t_struct result(program_, tfunction->get_name() + "_result");
-    t_field success(tfunction->get_returntype(), "success", 0);
-    if (!tfunction->get_returntype()->is_void()) {
-      result.append(&success);
-    }
-
-    t_struct* xs = tfunction->get_xceptions();
-    const vector<t_field*>& fields = xs->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      result.append(*f_iter);
-    }
-    generate_lua_struct_definition(out, &result, false);
-  }
-}
-
-/**
- * Deserialize (Read)
- */
-void t_lua_generator::generate_deserialize_field(ofstream& out,
-                                                 t_field* tfield,
-                                                 bool local,
-                                                 string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name();
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, local, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, local, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << (local ? "local " : "") << name << " = iprot:";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        out << "readString()";
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "readBool()";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "readByte()";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "readI16()";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "readI32()";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "readI64()";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "readDouble()";
-        break;
-      default:
-        throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "readI32()";
-    }
-    out << endl;
-
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-}
-
-void t_lua_generator::generate_deserialize_struct(ofstream& out,
-                                                  t_struct* tstruct,
-                                                  bool local,
-                                                  string prefix) {
-  indent(out) << (local ? "local " : "") << prefix << " = " << tstruct->get_name() << ":new{}"
-              << endl << indent() << prefix << ":read(iprot)" << endl;
-}
-
-void t_lua_generator::generate_deserialize_container(ofstream& out,
-                                                     t_type* ttype,
-                                                     bool local,
-                                                     string prefix) {
-  string size = tmp("_size");
-  string ktype = tmp("_ktype");
-  string vtype = tmp("_vtype");
-  string etype = tmp("_etype");
-
-  t_field fsize(g_type_i32, size);
-  t_field fktype(g_type_i8, ktype);
-  t_field fvtype(g_type_i8, vtype);
-  t_field fetype(g_type_i8, etype);
-
-  // Declare variables, read header
-  indent(out) << (local ? "local " : "") << prefix << " = {}" << endl;
-  if (ttype->is_map()) {
-    indent(out) << "local " << ktype << ", " << vtype << ", " << size << " = iprot:readMapBegin() "
-                << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "local " << etype << ", " << size << " = iprot:readSetBegin()" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "local " << etype << ", " << size << " = iprot:readListBegin()" << endl;
-  }
-
-  // Deserialize
-  indent(out) << "for _i=1," << size << " do" << endl;
-  indent_up();
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  indent_down();
-  indent(out) << "end" << endl;
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "iprot:readMapEnd()" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "iprot:readSetEnd()" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "iprot:readListEnd()" << endl;
-  }
-}
-
-void t_lua_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  // A map is represented by a table indexable by any lua type
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  generate_deserialize_field(out, &fkey, true);
-  generate_deserialize_field(out, &fval, true);
-
-  indent(out) << prefix << "[" << key << "] = " << val << endl;
-}
-
-void t_lua_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  // A set is represented by a table indexed by the value
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  generate_deserialize_field(out, &felem, true);
-
-  indent(out) << prefix << "[" << elem << "] = " << elem << endl;
-}
-
-void t_lua_generator::generate_deserialize_list_element(ofstream& out,
-                                                        t_list* tlist,
-                                                        string prefix) {
-  // A list is represented by a table indexed by integer values
-  // LUA natively provides all of the functions required to maintain a list
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  generate_deserialize_field(out, &felem, true);
-
-  indent(out) << "table.insert(" << prefix << ", " << elem << ")" << endl;
-}
-
-/**
- * Serialize (Write)
- */
-void t_lua_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-  string name = prefix + tfield->get_name();
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + name;
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << "oprot:";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        out << "writeString(" << name << ")";
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ")";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ")";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ")";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ")";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ")";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ")";
-        break;
-      default:
-        throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32(" << name << ")";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s' TYPE '%s'\n",
-           name.c_str(),
-           type->get_name().c_str());
-  }
-}
-
-void t_lua_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  indent(out) << prefix << ":write(oprot)" << endl;
-}
-
-void t_lua_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  // Begin writing
-  if (ttype->is_map()) {
-    indent(out) << "oprot:writeMapBegin(" << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
-                << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
-                << "ttable_size(" << prefix << "))" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot:writeSetBegin(" << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", "
-                << "ttable_size(" << prefix << "))" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot:writeListBegin(" << type_to_enum(((t_list*)ttype)->get_elem_type())
-                << ", "
-                << "#" << prefix << ")" << endl;
-  }
-
-  // Serialize
-  if (ttype->is_map()) {
-    string kiter = tmp("kiter");
-    string viter = tmp("viter");
-    indent(out) << "for " << kiter << "," << viter << " in pairs(" << prefix << ") do" << endl;
-    indent_up();
-    generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
-    indent_down();
-    indent(out) << "end" << endl;
-  } else if (ttype->is_set()) {
-    string iter = tmp("iter");
-    indent(out) << "for " << iter << ",_ in pairs(" << prefix << ") do" << endl;
-    indent_up();
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-    indent_down();
-    indent(out) << "end" << endl;
-  } else if (ttype->is_list()) {
-    string iter = tmp("iter");
-    indent(out) << "for _," << iter << " in ipairs(" << prefix << ") do" << endl;
-    indent_up();
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-    indent_down();
-    indent(out) << "end" << endl;
-  }
-
-  // Finish writing
-  if (ttype->is_map()) {
-    indent(out) << "oprot:writeMapEnd()" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot:writeSetEnd()" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot:writeListEnd()" << endl;
-  }
-}
-
-void t_lua_generator::generate_serialize_map_element(ofstream& out,
-                                                     t_map* tmap,
-                                                     string kiter,
-                                                     string viter) {
-  t_field kfield(tmap->get_key_type(), kiter);
-  generate_serialize_field(out, &kfield, "");
-
-  t_field vfield(tmap->get_val_type(), viter);
-  generate_serialize_field(out, &vfield, "");
-}
-
-void t_lua_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-void t_lua_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- *  Helper rendering functions
- */
-string t_lua_generator::lua_includes() {
-  if (gen_requires_) {
-    return "\n\nrequire 'Thrift'";
-  } else {
-    return "";
-  }
-}
-
-string t_lua_generator::get_namespace(const t_program* program) {
-  std::string real_module = program->get_namespace("lua");
-  if (real_module.empty()) {
-    return program->get_name() + "_";
-  }
-  return real_module + "_";
-}
-
-string t_lua_generator::function_signature(t_function* tfunction, string prefix) {
-  (void)prefix;
-  std::string ret = tfunction->get_name() + "(" + argument_list(tfunction->get_arglist()) + ")";
-  return ret;
-}
-
-string t_lua_generator::argument_list(t_struct* tstruct, string prefix) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator fld_iter;
-  std::string ret = "";
-  for (fld_iter = fields.begin(); fld_iter != fields.end();) {
-    ret += prefix + (*fld_iter)->get_name();
-    ++fld_iter;
-    if (fld_iter != fields.end()) {
-      ret += ", ";
-    }
-  }
-  return ret;
-}
-
-string t_lua_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_list()) {
-    return "TType.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(
-    lua,
-    "Lua",
-    "    omit_requires:   Suppress generation of require 'somefile'.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_ocaml_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_ocaml_generator.cc
deleted file mode 100644
index 594219a..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_ocaml_generator.cc
+++ /dev/null
@@ -1,1762 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/version.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::ios;
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * OCaml code generator.
- *
- */
-class t_ocaml_generator : public t_oop_generator {
-public:
-  t_ocaml_generator(t_program* program,
-                    const std::map<std::string, std::string>& parsed_options,
-                    const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    /* no options yet */
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      throw "unknown option ocaml:" + iter->first;
-    }
-
-    out_dir_base_ = "gen-ocaml";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-  void generate_program();
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  std::string render_const_value(t_type* type, t_const_value* value);
-  bool struct_member_persistent(t_field* tmember);
-  bool struct_member_omitable(t_field* tmember);
-  bool struct_member_default_cheaply_comparable(t_field* tmember);
-  std::string struct_member_copy_of(t_type* type, string what);
-
-  /**
-   * Struct generation code
-   */
-
-  void generate_ocaml_struct(t_struct* tstruct, bool is_exception);
-  void generate_ocaml_struct_definition(std::ofstream& out,
-                                        t_struct* tstruct,
-                                        bool is_xception = false);
-  void generate_ocaml_struct_member(std::ofstream& out, string tname, t_field* tmember);
-  void generate_ocaml_struct_sig(std::ofstream& out, t_struct* tstruct, bool is_exception);
-  void generate_ocaml_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_ocaml_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_ocaml_function_helpers(t_function* tfunction);
-  void generate_ocaml_method_copy(std::ofstream& out, const vector<t_field*>& members);
-  void generate_ocaml_member_copy(std::ofstream& out, t_field* member);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out, t_field* tfield, std::string prefix);
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct);
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype);
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset);
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-  void generate_deserialize_type(std::ofstream& out, t_type* type);
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string name = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string kiter,
-                                      std::string viter);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string ocaml_autogen_comment();
-  std::string ocaml_imports();
-  std::string type_name(t_type* ttype);
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string function_type(t_function* tfunc, bool method = false, bool options = false);
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-  std::string render_ocaml_type(t_type* type);
-
-private:
-  /**
-   * File streams
-   */
-
-  std::ofstream f_types_;
-  std::ofstream f_consts_;
-  std::ofstream f_service_;
-
-  std::ofstream f_types_i_;
-  std::ofstream f_service_i_;
-};
-
-/*
- * This is necessary because we want typedefs to appear later,
- * after all the types have been declared.
- */
-void t_ocaml_generator::generate_program() {
-  // Initialize the generator
-  init_generator();
-
-  // Generate enums
-  vector<t_enum*> enums = program_->get_enums();
-  vector<t_enum*>::iterator en_iter;
-  for (en_iter = enums.begin(); en_iter != enums.end(); ++en_iter) {
-    generate_enum(*en_iter);
-  }
-
-  // Generate structs
-  vector<t_struct*> structs = program_->get_structs();
-  vector<t_struct*>::iterator st_iter;
-  for (st_iter = structs.begin(); st_iter != structs.end(); ++st_iter) {
-    generate_struct(*st_iter);
-  }
-
-  // Generate xceptions
-  vector<t_struct*> xceptions = program_->get_xceptions();
-  vector<t_struct*>::iterator x_iter;
-  for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-    generate_xception(*x_iter);
-  }
-
-  // Generate typedefs
-  vector<t_typedef*> typedefs = program_->get_typedefs();
-  vector<t_typedef*>::iterator td_iter;
-  for (td_iter = typedefs.begin(); td_iter != typedefs.end(); ++td_iter) {
-    generate_typedef(*td_iter);
-  }
-
-  // Generate services
-  vector<t_service*> services = program_->get_services();
-  vector<t_service*>::iterator sv_iter;
-  for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-    service_name_ = get_service_name(*sv_iter);
-    generate_service(*sv_iter);
-  }
-
-  // Generate constants
-  vector<t_const*> consts = program_->get_consts();
-  generate_consts(consts);
-
-  // Close the generator
-  close_generator();
-}
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_ocaml_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  // Make output file
-  string f_types_name = get_out_dir() + program_name_ + "_types.ml";
-  f_types_.open(f_types_name.c_str());
-  string f_types_i_name = get_out_dir() + program_name_ + "_types.mli";
-  f_types_i_.open(f_types_i_name.c_str());
-
-  string f_consts_name = get_out_dir() + program_name_ + "_consts.ml";
-  f_consts_.open(f_consts_name.c_str());
-
-  // Print header
-  f_types_ << ocaml_autogen_comment() << endl << ocaml_imports() << endl;
-  f_types_i_ << ocaml_autogen_comment() << endl << ocaml_imports() << endl;
-  f_consts_ << ocaml_autogen_comment() << endl << ocaml_imports() << endl << "open "
-            << capitalize(program_name_) << "_types" << endl;
-}
-
-/**
- * Autogen'd comment
- */
-string t_ocaml_generator::ocaml_autogen_comment() {
-  return std::string("(*\n") + " Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n" + "\n"
-         + " DO NOT EDIT UNLESS YOU ARE SURE YOU KNOW WHAT YOU ARE DOING\n" + "*)\n";
-}
-
-/**
- * Prints standard thrift imports
- */
-string t_ocaml_generator::ocaml_imports() {
-  return "open Thrift";
-}
-
-/**
- * Closes the type files
- */
-void t_ocaml_generator::close_generator() {
-  // Close types file
-  f_types_.close();
-}
-
-/**
- * Generates a typedef. Ez.
- *
- * @param ttypedef The type definition
- */
-void t_ocaml_generator::generate_typedef(t_typedef* ttypedef) {
-  f_types_ << indent() << "type " << decapitalize(ttypedef->get_symbolic()) << " = "
-           << render_ocaml_type(ttypedef->get_type()) << endl << endl;
-  f_types_i_ << indent() << "type " << decapitalize(ttypedef->get_symbolic()) << " = "
-             << render_ocaml_type(ttypedef->get_type()) << endl << endl;
-}
-
-/**
- * Generates code for an enumerated type.
- * the values.
- *
- * @param tenum The enumeration
- */
-void t_ocaml_generator::generate_enum(t_enum* tenum) {
-  indent(f_types_) << "module " << capitalize(tenum->get_name()) << " = " << endl << "struct"
-                   << endl;
-  indent(f_types_i_) << "module " << capitalize(tenum->get_name()) << " : " << endl << "sig"
-                     << endl;
-  indent_up();
-  indent(f_types_) << "type t = " << endl;
-  indent(f_types_i_) << "type t = " << endl;
-  indent_up();
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    string name = capitalize((*c_iter)->get_name());
-    indent(f_types_) << "| " << name << endl;
-    indent(f_types_i_) << "| " << name << endl;
-  }
-  indent_down();
-
-  indent(f_types_) << "let to_i = function" << endl;
-  indent(f_types_i_) << "val to_i : t -> Int32.t" << endl;
-  indent_up();
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    string name = capitalize((*c_iter)->get_name());
-    indent(f_types_) << "| " << name << " -> " << value << "l" << endl;
-  }
-  indent_down();
-
-  indent(f_types_) << "let of_i = function" << endl;
-  indent(f_types_i_) << "val of_i : Int32.t -> t" << endl;
-  indent_up();
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    string name = capitalize((*c_iter)->get_name());
-    indent(f_types_) << "| " << value << "l -> " << name << endl;
-  }
-  indent(f_types_) << "| _ -> raise Thrift_error" << endl;
-  indent_down();
-  indent_down();
-  indent(f_types_) << "end" << endl;
-  indent(f_types_i_) << "end" << endl;
-}
-
-/**
- * Generate a constant value
- */
-void t_ocaml_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = decapitalize(tconst->get_name());
-  t_const_value* value = tconst->get_value();
-
-  indent(f_consts_) << "let " << name << " = " << render_const_value(type, value) << endl << endl;
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_ocaml_generator::render_const_value(t_type* type, t_const_value* value) {
-  type = get_true_type(type);
-  std::ostringstream out;
-  // OCaml requires all floating point numbers contain a decimal point
-  out.setf(ios::showpoint);
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_I32:
-      out << value->get_integer() << "l";
-      break;
-    case t_base_type::TYPE_I64:
-      out << value->get_integer() << "L";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer() << ".0";
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    t_enum* tenum = (t_enum*)type;
-    vector<t_enum_value*> constants = tenum->get_constants();
-    vector<t_enum_value*>::iterator c_iter;
-    for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-      int val = (*c_iter)->get_value();
-      if (val == value->get_integer()) {
-        indent(out) << capitalize(tenum->get_name()) << "." << capitalize((*c_iter)->get_name());
-        break;
-      }
-    }
-  } else if (type->is_struct() || type->is_xception()) {
-    string cname = type_name(type);
-    string ct = tmp("_c");
-    out << endl;
-    indent_up();
-    indent(out) << "(let " << ct << " = new " << cname << " in" << endl;
-    indent_up();
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      string fname = v_iter->first->get_string();
-      out << indent();
-      out << ct << "#set_" << fname << " ";
-      out << render_const_value(field_type, v_iter->second);
-      out << ";" << endl;
-    }
-    indent(out) << ct << ")";
-    indent_down();
-    indent_down();
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    string hm = tmp("_hm");
-    out << endl;
-    indent_up();
-    indent(out) << "(let " << hm << " = Hashtbl.create " << val.size() << " in" << endl;
-    indent_up();
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string key = render_const_value(ktype, v_iter->first);
-      string val = render_const_value(vtype, v_iter->second);
-      indent(out) << "Hashtbl.add " << hm << " " << key << " " << val << ";" << endl;
-    }
-    indent(out) << hm << ")";
-    indent_down();
-    indent_down();
-  } else if (type->is_list()) {
-    t_type* etype;
-    etype = ((t_list*)type)->get_elem_type();
-    out << "[" << endl;
-    indent_up();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << indent();
-      out << render_const_value(etype, *v_iter);
-      out << ";" << endl;
-    }
-    indent_down();
-    indent(out) << "]";
-  } else if (type->is_set()) {
-    t_type* etype = ((t_set*)type)->get_elem_type();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    string hm = tmp("_hm");
-    indent(out) << "(let " << hm << " = Hashtbl.create " << val.size() << " in" << endl;
-    indent_up();
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      string val = render_const_value(etype, *v_iter);
-      indent(out) << "Hashtbl.add " << hm << " " << val << " true;" << endl;
-    }
-    indent(out) << hm << ")" << endl;
-    indent_down();
-    out << endl;
-  } else {
-    throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
-  }
-  return out.str();
-}
-
-/**
- * Generates a "struct"
- */
-void t_ocaml_generator::generate_struct(t_struct* tstruct) {
-  generate_ocaml_struct(tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct, but also has an exception declaration.
- *
- * @param txception The struct definition
- */
-void t_ocaml_generator::generate_xception(t_struct* txception) {
-  generate_ocaml_struct(txception, true);
-}
-
-/**
- * Generates an OCaml struct
- */
-void t_ocaml_generator::generate_ocaml_struct(t_struct* tstruct, bool is_exception) {
-  generate_ocaml_struct_definition(f_types_, tstruct, is_exception);
-  generate_ocaml_struct_sig(f_types_i_, tstruct, is_exception);
-}
-
-void t_ocaml_generator::generate_ocaml_method_copy(ofstream& out, const vector<t_field*>& members) {
-  vector<t_field*>::const_iterator m_iter;
-
-  /* Create a copy of the current object */
-  indent(out) << "method copy =" << endl;
-  indent_up();
-  indent_up();
-  indent(out) << "let _new = Oo.copy self in" << endl;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter)
-    generate_ocaml_member_copy(out, *m_iter);
-
-  indent_down();
-  indent(out) << "_new" << endl;
-  indent_down();
-}
-
-string t_ocaml_generator::struct_member_copy_of(t_type* type, string what) {
-  if (type->is_struct() || type->is_xception()) {
-    return what + string("#copy");
-  }
-  if (type->is_map()) {
-    string copy_of_k = struct_member_copy_of(((t_map*)type)->get_key_type(), "k");
-    string copy_of_v = struct_member_copy_of(((t_map*)type)->get_val_type(), "v");
-
-    if (copy_of_k == "k" && copy_of_v == "v") {
-      return string("(Hashtbl.copy ") + what + string(")");
-    } else {
-      return string(
-                 "((fun oh -> let nh = Hashtbl.create (Hashtbl.length oh) in Hashtbl.iter (fun k v "
-                 "-> Hashtbl.add nh ") + copy_of_k + string(" ") + copy_of_v + string(") oh; nh) ")
-             + what + ")";
-    }
-  }
-  if (type->is_set()) {
-    string copy_of = struct_member_copy_of(((t_set*)type)->get_elem_type(), "k");
-
-    if (copy_of == "k") {
-      return string("(Hashtbl.copy ") + what + string(")");
-    } else {
-      return string(
-                 "((fun oh -> let nh = Hashtbl.create (Hashtbl.length oh) in Hashtbl.iter (fun k v "
-                 "-> Hashtbl.add nh ") + copy_of + string(" true") + string(") oh; nh) ") + what
-             + ")";
-    }
-  }
-  if (type->is_list()) {
-    string copy_of = struct_member_copy_of(((t_list*)type)->get_elem_type(), "x");
-    if (copy_of != "x") {
-      return string("(List.map (fun x -> ") + copy_of + string(") ") + what + string(")");
-    } else {
-      return what;
-    }
-  }
-  return what;
-}
-
-void t_ocaml_generator::generate_ocaml_member_copy(ofstream& out, t_field* tmember) {
-  string mname = decapitalize(tmember->get_name());
-  t_type* type = get_true_type(tmember->get_type());
-
-  string grab_field = string("self#grab_") + mname;
-  string copy_of = struct_member_copy_of(type, grab_field);
-  if (copy_of != grab_field) {
-    indent(out);
-    if (!struct_member_persistent(tmember)) {
-      out << "if _" << mname << " <> None then" << endl;
-      indent(out) << "  ";
-    }
-    out << "_new#set_" << mname << " " << copy_of << ";" << endl;
-  }
-}
-
-/**
- * Generates a struct definition for a thrift data type.
- *
- * @param tstruct The struct definition
- */
-void t_ocaml_generator::generate_ocaml_struct_definition(ofstream& out,
-                                                         t_struct* tstruct,
-                                                         bool is_exception) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  string tname = type_name(tstruct);
-  indent(out) << "class " << tname << " =" << endl;
-  indent(out) << "object (self)" << endl;
-
-  indent_up();
-
-  if (members.size() > 0) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      generate_ocaml_struct_member(out, tname, (*m_iter));
-      out << endl;
-    }
-  }
-  generate_ocaml_method_copy(out, members);
-  generate_ocaml_struct_writer(out, tstruct);
-  indent_down();
-  indent(out) << "end" << endl;
-
-  if (is_exception) {
-    indent(out) << "exception " << capitalize(tname) << " of " << tname << endl;
-  }
-
-  generate_ocaml_struct_reader(out, tstruct);
-}
-
-/**
- * Generates a structure member for a thrift data type.
- *
- * @param tname Name of the parent structure for the member
- * @param tmember Member definition
- */
-void t_ocaml_generator::generate_ocaml_struct_member(ofstream& out,
-                                                     string tname,
-                                                     t_field* tmember) {
-  string x = tmp("_x");
-  string mname = decapitalize(tmember->get_name());
-
-  indent(out) << "val mutable _" << mname << " : " << render_ocaml_type(tmember->get_type());
-  t_const_value* val = tmember->get_value();
-  if (val) {
-    if (struct_member_persistent(tmember))
-      out << " = " << render_const_value(tmember->get_type(), tmember->get_value()) << endl;
-    else
-      out << " option = Some " << render_const_value(tmember->get_type(), tmember->get_value())
-          << endl;
-  } else {
-    // assert(!struct_member_persistent(tmember))
-    out << " option = None" << endl;
-  }
-
-  if (struct_member_persistent(tmember)) {
-    indent(out) << "method get_" << mname << " = Some _" << mname << endl;
-    indent(out) << "method grab_" << mname << " = _" << mname << endl;
-    indent(out) << "method set_" << mname << " " << x << " = _" << mname << " <- " << x << endl;
-  } else {
-    indent(out) << "method get_" << mname << " = _" << mname << endl;
-    indent(out) << "method grab_" << mname << " = match _" << mname
-                << " with None->raise (Field_empty \"" << tname << "." << mname << "\") | Some "
-                << x << " -> " << x << endl;
-    indent(out) << "method set_" << mname << " " << x << " = _" << mname << " <- Some " << x
-                << endl;
-    indent(out) << "method unset_" << mname << " = _" << mname << " <- None" << endl;
-  }
-
-  indent(out) << "method reset_" << mname << " = _" << mname << " <- ";
-  if (val) {
-    if (struct_member_persistent(tmember))
-      out << render_const_value(tmember->get_type(), tmember->get_value()) << endl;
-    else
-      out << "Some " << render_const_value(tmember->get_type(), tmember->get_value()) << endl;
-  } else {
-    out << "None" << endl;
-  }
-}
-
-/**
- * Check whether a member of the structure can not have undefined value
- *
- * @param tmember Member definition
- */
-bool t_ocaml_generator::struct_member_persistent(t_field* tmember) {
-  t_const_value* val = tmember->get_value();
-  return (val ? true : false);
-}
-
-/**
- * Check whether a member of the structure can be skipped during encoding
- *
- * @param tmember Member definition
- */
-bool t_ocaml_generator::struct_member_omitable(t_field* tmember) {
-  return (tmember->get_req() != t_field::T_REQUIRED);
-}
-
-/**
- * Figure out whether a member of the structure has
- * a cheaply comparable default value.
- *
- * @param tmember Member definition
- */
-bool t_ocaml_generator::struct_member_default_cheaply_comparable(t_field* tmember) {
-  t_type* type = get_true_type(tmember->get_type());
-  t_const_value* val = tmember->get_value();
-  if (!val) {
-    return false;
-  } else if (type->is_base_type()) {
-    // Base types are generally cheaply compared for structural equivalence.
-    switch (((t_base_type*)type)->get_base()) {
-    case t_base_type::TYPE_DOUBLE:
-      if (val->get_double() == 0.0)
-        return true;
-      else
-        return false;
-    default:
-      return true;
-    }
-  } else if (type->is_list()) {
-    // Empty lists are cheaply compared for structural equivalence.
-    // Is empty list?
-    if (val->get_list().size() == 0)
-      return true;
-    else
-      return false;
-  } else {
-    return false;
-  }
-}
-
-/**
- * Generates a struct definition for a thrift data type.
- *
- * @param tstruct The struct definition
- */
-void t_ocaml_generator::generate_ocaml_struct_sig(ofstream& out,
-                                                  t_struct* tstruct,
-                                                  bool is_exception) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  string tname = type_name(tstruct);
-  indent(out) << "class " << tname << " :" << endl;
-  indent(out) << "object ('a)" << endl;
-
-  indent_up();
-
-  string x = tmp("_x");
-  if (members.size() > 0) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      string mname = decapitalize((*m_iter)->get_name());
-      string type = render_ocaml_type((*m_iter)->get_type());
-      indent(out) << "method get_" << mname << " : " << type << " option" << endl;
-      indent(out) << "method grab_" << mname << " : " << type << endl;
-      indent(out) << "method set_" << mname << " : " << type << " -> unit" << endl;
-      if (!struct_member_persistent(*m_iter))
-        indent(out) << "method unset_" << mname << " : unit" << endl;
-      indent(out) << "method reset_" << mname << " : unit" << endl;
-    }
-  }
-  indent(out) << "method copy : 'a" << endl;
-  indent(out) << "method write : Protocol.t -> unit" << endl;
-  indent_down();
-  indent(out) << "end" << endl;
-
-  if (is_exception) {
-    indent(out) << "exception " << capitalize(tname) << " of " << tname << endl;
-  }
-
-  indent(out) << "val read_" << tname << " : Protocol.t -> " << tname << endl;
-}
-
-/**
- * Generates the read method for a struct
- */
-void t_ocaml_generator::generate_ocaml_struct_reader(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  string sname = type_name(tstruct);
-  string str = tmp("_str");
-  string t = tmp("_t");
-  string id = tmp("_id");
-  indent(out) << "let rec read_" << sname << " (iprot : Protocol.t) =" << endl;
-  indent_up();
-  indent(out) << "let " << str << " = new " << sname << " in" << endl;
-  indent_up();
-  indent(out) << "ignore(iprot#readStructBegin);" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "(try while true do" << endl;
-  indent_up();
-  indent_up();
-
-  // Read beginning field marker
-  indent(out) << "let (_," << t << "," << id << ") = iprot#readFieldBegin in" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if " << t << " = Protocol.T_STOP then" << endl;
-  indent_up();
-  indent(out) << "raise Break" << endl;
-  indent_down();
-  indent(out) << "else ();" << endl;
-
-  indent(out) << "(match " << id << " with " << endl;
-  indent_up();
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "| " << (*f_iter)->get_key() << " -> (";
-    out << "if " << t << " = " << type_to_enum((*f_iter)->get_type()) << " then" << endl;
-    indent_up();
-    indent_up();
-    generate_deserialize_field(out, *f_iter, str);
-    indent_down();
-    out << indent() << "else" << endl << indent() << "  iprot#skip " << t << ")" << endl;
-    indent_down();
-  }
-
-  // In the default case we skip the field
-  out << indent() << "| _ -> "
-      << "iprot#skip " << t << ");" << endl;
-  indent_down();
-  // Read field end marker
-  indent(out) << "iprot#readFieldEnd;" << endl;
-  indent_down();
-  indent(out) << "done; ()" << endl;
-  indent_down();
-  indent(out) << "with Break -> ());" << endl;
-
-  indent(out) << "iprot#readStructEnd;" << endl;
-
-  indent(out) << str << endl << endl;
-  indent_down();
-  indent_down();
-}
-
-void t_ocaml_generator::generate_ocaml_struct_writer(ofstream& out, t_struct* tstruct) {
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-  string str = tmp("_str");
-  string f = tmp("_f");
-
-  indent(out) << "method write (oprot : Protocol.t) =" << endl;
-  indent_up();
-  indent(out) << "oprot#writeStructBegin \"" << name << "\";" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* tmember = (*f_iter);
-    string mname = "_" + decapitalize(tmember->get_name());
-    string _v;
-
-    if (struct_member_persistent(tmember)) {
-
-      if (struct_member_omitable(tmember) && struct_member_default_cheaply_comparable(tmember)) {
-        _v = "_v";
-        // Avoid redundant encoding of members having default values.
-        indent(out) << "(match " << mname << " with "
-                    << render_const_value(tmember->get_type(), tmember->get_value()) << " -> () | "
-                    << _v << " -> " << endl;
-      } else {
-        _v = mname;
-        indent(out) << "(" << endl;
-      }
-
-    } else {
-
-      indent(out) << "(match " << mname << " with ";
-
-      if (struct_member_omitable(tmember)) {
-        out << "None -> ()";
-
-        if (struct_member_default_cheaply_comparable(tmember)) {
-          // Avoid redundant encoding of members having default values.
-          out << " | Some " << render_const_value(tmember->get_type(), tmember->get_value())
-              << " -> ()";
-        }
-        out << " | Some _v -> " << endl;
-      } else {
-        out << endl;
-        indent(out) << "| None -> raise (Field_empty \"" << type_name(tstruct) << "." << mname
-                    << "\")" << endl;
-        indent(out) << "| Some _v -> " << endl;
-      }
-
-      _v = "_v";
-    }
-    indent_up();
-    // Write field header
-    indent(out) << "oprot#writeFieldBegin(\"" << tmember->get_name() << "\","
-                << type_to_enum(tmember->get_type()) << "," << tmember->get_key() << ");" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, tmember, _v);
-
-    // Write field closer
-    indent(out) << "oprot#writeFieldEnd" << endl;
-
-    indent_down();
-    indent(out) << ");" << endl;
-  }
-
-  // Write the struct map
-  out << indent() << "oprot#writeFieldStop;" << endl << indent() << "oprot#writeStructEnd" << endl;
-
-  indent_down();
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_ocaml_generator::generate_service(t_service* tservice) {
-  string f_service_name = get_out_dir() + capitalize(service_name_) + ".ml";
-  f_service_.open(f_service_name.c_str());
-  string f_service_i_name = get_out_dir() + capitalize(service_name_) + ".mli";
-  f_service_i_.open(f_service_i_name.c_str());
-
-  f_service_ << ocaml_autogen_comment() << endl << ocaml_imports() << endl;
-  f_service_i_ << ocaml_autogen_comment() << endl << ocaml_imports() << endl;
-
-  /* if (tservice->get_extends() != NULL) {
-    f_service_ <<
-      "open " << capitalize(tservice->get_extends()->get_name()) << endl;
-    f_service_i_ <<
-      "open " << capitalize(tservice->get_extends()->get_name()) << endl;
-  }
-  */
-  f_service_ << "open " << capitalize(program_name_) << "_types" << endl << endl;
-
-  f_service_i_ << "open " << capitalize(program_name_) << "_types" << endl << endl;
-
-  // Generate the three main parts of the service
-  generate_service_helpers(tservice);
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-
-  // Close service file
-  f_service_.close();
-  f_service_i_.close();
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_ocaml_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  indent(f_service_) << "(* HELPER FUNCTIONS AND STRUCTURES *)" << endl << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_ocaml_struct_definition(f_service_, ts, false);
-    generate_ocaml_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_ocaml_generator::generate_ocaml_function_helpers(t_function* tfunction) {
-  t_struct result(program_, decapitalize(tfunction->get_name()) + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-  generate_ocaml_struct_definition(f_service_, &result, false);
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_ocaml_generator::generate_service_interface(t_service* tservice) {
-  f_service_ << indent() << "class virtual iface =" << endl << "object (self)" << endl;
-  f_service_i_ << indent() << "class virtual iface :" << endl << "object" << endl;
-
-  indent_up();
-
-  if (tservice->get_extends() != NULL) {
-    string extends = type_name(tservice->get_extends());
-    indent(f_service_) << "inherit " << extends << ".iface" << endl;
-    indent(f_service_i_) << "inherit " << extends << ".iface" << endl;
-  }
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string ft = function_type(*f_iter, true, true);
-    f_service_ << indent() << "method virtual " << decapitalize((*f_iter)->get_name()) << " : "
-               << ft << endl;
-    f_service_i_ << indent() << "method virtual " << decapitalize((*f_iter)->get_name()) << " : "
-                 << ft << endl;
-  }
-  indent_down();
-  indent(f_service_) << "end" << endl << endl;
-  indent(f_service_i_) << "end" << endl << endl;
-}
-
-/**
- * Generates a service client definition. Note that in OCaml, the client doesn't implement iface.
- *This is because
- * The client does not (and should not have to) deal with arguments being None.
- *
- * @param tservice The service to generate a server for.
- */
-void t_ocaml_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  indent(f_service_) << "class client (iprot : Protocol.t) (oprot : Protocol.t) =" << endl
-                     << "object (self)" << endl;
-  indent(f_service_i_) << "class client : Protocol.t -> Protocol.t -> " << endl << "object" << endl;
-  indent_up();
-
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    indent(f_service_) << "inherit " << extends << ".client iprot oprot as super" << endl;
-    indent(f_service_i_) << "inherit " << extends << ".client" << endl;
-  }
-  indent(f_service_) << "val mutable seqid = 0" << endl;
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string funname = (*f_iter)->get_name();
-
-    // Open function
-    indent(f_service_) << "method " << function_signature(*f_iter) << " = " << endl;
-    indent(f_service_i_) << "method " << decapitalize((*f_iter)->get_name()) << " : "
-                         << function_type(*f_iter, true, false) << endl;
-    indent_up();
-    indent(f_service_) << "self#send_" << funname;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << " " << decapitalize((*fld_iter)->get_name());
-    }
-    f_service_ << ";" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_service_ << indent();
-      f_service_ << "self#recv_" << funname << endl;
-    }
-    indent_down();
-
-    indent(f_service_) << "method private send_" << function_signature(*f_iter) << " = " << endl;
-    indent_up();
-
-    std::string argsname = decapitalize((*f_iter)->get_name() + "_args");
-
-    // Serialize the request header
-    f_service_ << indent() << "oprot#writeMessageBegin (\"" << (*f_iter)->get_name() << "\", "
-               << ((*f_iter)->is_oneway() ? "Protocol.ONEWAY" : "Protocol.CALL") << ", seqid);"
-               << endl;
-
-    f_service_ << indent() << "let args = new " << argsname << " in" << endl;
-    indent_up();
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "args#set_" << (*fld_iter)->get_name() << " "
-                 << (*fld_iter)->get_name() << ";" << endl;
-    }
-
-    // Write to the stream
-    f_service_ << indent() << "args#write oprot;" << endl << indent() << "oprot#writeMessageEnd;"
-               << endl << indent() << "oprot#getTransport#flush" << endl;
-
-    indent_down();
-    indent_down();
-
-    if (!(*f_iter)->is_oneway()) {
-      std::string resultname = decapitalize((*f_iter)->get_name() + "_result");
-      t_struct noargs(program_);
-
-      t_function recv_function((*f_iter)->get_returntype(),
-                               string("recv_") + (*f_iter)->get_name(),
-                               &noargs);
-      // Open function
-      f_service_ << indent() << "method private " << function_signature(&recv_function) << " ="
-                 << endl;
-      indent_up();
-
-      // TODO(mcslee): Validate message reply here, seq ids etc.
-
-      f_service_ << indent() << "let (fname, mtype, rseqid) = iprot#readMessageBegin in" << endl;
-      indent_up();
-      f_service_ << indent() << "(if mtype = Protocol.EXCEPTION then" << endl << indent()
-                 << "  let x = Application_Exn.read iprot in" << endl;
-      indent_up();
-      f_service_ << indent() << "  (iprot#readMessageEnd;" << indent()
-                 << "   raise (Application_Exn.E x))" << endl;
-      indent_down();
-      f_service_ << indent() << "else ());" << endl;
-      string res = "_";
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-
-      if (!(*f_iter)->get_returntype()->is_void() || xceptions.size() > 0) {
-        res = "result";
-      }
-      f_service_ << indent() << "let " << res << " = read_" << resultname << " iprot in" << endl;
-      indent_up();
-      f_service_ << indent() << "iprot#readMessageEnd;" << endl;
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << indent() << "match result#get_success with Some v -> v | None -> (" << endl;
-        indent_up();
-      }
-
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "(match result#get_" << (*x_iter)->get_name()
-                   << " with None -> () | Some _v ->" << endl;
-        indent(f_service_) << "  raise (" << capitalize(type_name((*x_iter)->get_type()))
-                           << " _v));" << endl;
-      }
-
-      // Careful, only return _result if not a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "()" << endl;
-      } else {
-        f_service_
-            << indent()
-            << "raise (Application_Exn.E (Application_Exn.create Application_Exn.MISSING_RESULT \""
-            << (*f_iter)->get_name() << " failed: unknown result\")))" << endl;
-        indent_down();
-      }
-
-      // Close function
-      indent_down();
-      indent_down();
-      indent_down();
-    }
-  }
-
-  indent_down();
-  indent(f_service_) << "end" << endl << endl;
-  indent(f_service_i_) << "end" << endl << endl;
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_ocaml_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  // Generate the header portion
-  indent(f_service_) << "class processor (handler : iface) =" << endl << indent() << "object (self)"
-                     << endl;
-  indent(f_service_i_) << "class processor : iface ->" << endl << indent() << "object" << endl;
-  indent_up();
-
-  f_service_ << indent() << "inherit Processor.t" << endl << endl;
-  f_service_i_ << indent() << "inherit Processor.t" << endl << endl;
-  string extends = "";
-
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    indent(f_service_) << "inherit " + extends + ".processor (handler :> " + extends + ".iface)"
-                       << endl;
-    indent(f_service_i_) << "inherit " + extends + ".processor" << endl;
-  }
-
-  if (extends.empty()) {
-    indent(f_service_) << "val processMap = Hashtbl.create " << functions.size() << endl;
-  }
-  indent(f_service_i_)
-      << "val processMap : (string, int * Protocol.t * Protocol.t -> unit) Hashtbl.t" << endl;
-
-  // Generate the server implementation
-  indent(f_service_) << "method process iprot oprot =" << endl;
-  indent(f_service_i_) << "method process : Protocol.t -> Protocol.t -> bool" << endl;
-  indent_up();
-
-  f_service_ << indent() << "let (name, typ, seqid)  = iprot#readMessageBegin in" << endl;
-  indent_up();
-  // TODO(mcslee): validate message
-
-  // HOT: dictionary function lookup
-  f_service_ << indent() << "if Hashtbl.mem processMap name then" << endl << indent()
-             << "  (Hashtbl.find processMap name) (seqid, iprot, oprot)" << endl << indent()
-             << "else (" << endl << indent() << "  iprot#skip(Protocol.T_STRUCT);" << endl
-             << indent() << "  iprot#readMessageEnd;" << endl << indent()
-             << "  let x = Application_Exn.create Application_Exn.UNKNOWN_METHOD (\"Unknown "
-                "function \"^name) in" << endl << indent()
-             << "    oprot#writeMessageBegin(name, Protocol.EXCEPTION, seqid);" << endl << indent()
-             << "    x#write oprot;" << endl << indent() << "    oprot#writeMessageEnd;" << endl
-             << indent() << "    oprot#getTransport#flush" << endl << indent() << ");" << endl;
-
-  // Read end of args field, the T_STOP, and the struct close
-  f_service_ << indent() << "true" << endl;
-  indent_down();
-  indent_down();
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  indent(f_service_) << "initializer" << endl;
-  indent_up();
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << indent() << "Hashtbl.add processMap \"" << (*f_iter)->get_name()
-               << "\" self#process_" << (*f_iter)->get_name() << ";" << endl;
-  }
-  indent_down();
-
-  indent_down();
-  indent(f_service_) << "end" << endl << endl;
-  indent(f_service_i_) << "end" << endl << endl;
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_ocaml_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  // Open function
-  indent(f_service_) << "method private process_" << tfunction->get_name()
-                     << " (seqid, iprot, oprot) =" << endl;
-  indent_up();
-
-  string argsname = decapitalize(tfunction->get_name()) + "_args";
-  string resultname = decapitalize(tfunction->get_name()) + "_result";
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  string args = "args";
-  if (fields.size() == 0) {
-    args = "_";
-  }
-
-  f_service_ << indent() << "let " << args << " = read_" << argsname << " iprot in" << endl;
-  indent_up();
-  f_service_ << indent() << "iprot#readMessageEnd;" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Declare result for non oneway function
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << "let result = new " << resultname << " in" << endl;
-    indent_up();
-  }
-
-  // Try block for a function with exceptions
-  if (xceptions.size() > 0) {
-    f_service_ << indent() << "(try" << endl;
-    indent_up();
-  }
-
-  f_service_ << indent();
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_service_ << "result#set_success ";
-  }
-  f_service_ << "(handler#" << tfunction->get_name();
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    f_service_ << " args#get_" << (*f_iter)->get_name();
-  }
-  f_service_ << ");" << endl;
-
-  if (xceptions.size() > 0) {
-    indent_down();
-    indent(f_service_) << "with" << endl;
-    indent_up();
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << indent() << "| " << capitalize(type_name((*x_iter)->get_type())) << " "
-                 << (*x_iter)->get_name() << " -> " << endl;
-      indent_up();
-      indent_up();
-      if (!tfunction->is_oneway()) {
-        f_service_ << indent() << "result#set_" << (*x_iter)->get_name() << " "
-                   << (*x_iter)->get_name() << endl;
-      } else {
-        indent(f_service_) << "()";
-      }
-      indent_down();
-      indent_down();
-    }
-    indent_down();
-    f_service_ << indent() << ");" << endl;
-  }
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    f_service_ << indent() << "()" << endl;
-    indent_down();
-    indent_down();
-    return;
-  }
-
-  f_service_ << indent() << "oprot#writeMessageBegin (\"" << tfunction->get_name()
-             << "\", Protocol.REPLY, seqid);" << endl << indent() << "result#write oprot;" << endl
-             << indent() << "oprot#writeMessageEnd;" << endl << indent()
-             << "oprot#getTransport#flush" << endl;
-
-  // Close function
-  indent_down();
-  indent_down();
-  indent_down();
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_ocaml_generator::generate_deserialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = tfield->get_type();
-
-  string name = decapitalize(tfield->get_name());
-  indent(out) << prefix << "#set_" << name << " ";
-  generate_deserialize_type(out, type);
-  out << endl;
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_ocaml_generator::generate_deserialize_type(ofstream& out, t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE";
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type);
-  } else if (type->is_base_type()) {
-    out << "iprot#";
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "compiler error: cannot serialize void field in a struct";
-      break;
-    case t_base_type::TYPE_STRING:
-      out << "readString";
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << "readBool";
-      break;
-    case t_base_type::TYPE_I8:
-      out << "readByte";
-      break;
-    case t_base_type::TYPE_I16:
-      out << "readI16";
-      break;
-    case t_base_type::TYPE_I32:
-      out << "readI32";
-      break;
-    case t_base_type::TYPE_I64:
-      out << "readI64";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      out << "readDouble";
-      break;
-    default:
-      throw "compiler error: no ocaml name for base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    string ename = capitalize(type->get_name());
-    out << "(" << ename << ".of_i iprot#readI32)";
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE TYPE '%s'\n", type->get_name().c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a struct, calling read()
- */
-void t_ocaml_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct) {
-  string prefix = "";
-  t_program* program = tstruct->get_program();
-  if (program != NULL && program != program_) {
-    prefix = capitalize(program->get_name()) + "_types.";
-  }
-  string name = decapitalize(tstruct->get_name());
-  out << "(" << prefix << "read_" << name << " iprot)";
-}
-
-/**
- * Serialize a container by writing out the header followed by
- * data and then a footer.
- */
-void t_ocaml_generator::generate_deserialize_container(ofstream& out, t_type* ttype) {
-  string size = tmp("_size");
-  string ktype = tmp("_ktype");
-  string vtype = tmp("_vtype");
-  string etype = tmp("_etype");
-  string con = tmp("_con");
-
-  t_field fsize(g_type_i32, size);
-  t_field fktype(g_type_i8, ktype);
-  t_field fvtype(g_type_i8, vtype);
-  t_field fetype(g_type_i8, etype);
-
-  out << endl;
-  indent_up();
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    indent(out) << "(let (" << ktype << "," << vtype << "," << size << ") = iprot#readMapBegin in"
-                << endl;
-    indent(out) << "let " << con << " = Hashtbl.create " << size << " in" << endl;
-    indent_up();
-    indent(out) << "for i = 1 to " << size << " do" << endl;
-    indent_up();
-    indent(out) << "let _k = ";
-    generate_deserialize_type(out, ((t_map*)ttype)->get_key_type());
-    out << " in" << endl;
-    indent(out) << "let _v = ";
-    generate_deserialize_type(out, ((t_map*)ttype)->get_val_type());
-    out << " in" << endl;
-    indent_up();
-    indent(out) << "Hashtbl.add " << con << " _k _v" << endl;
-    indent_down();
-    indent_down();
-    indent(out) << "done; iprot#readMapEnd; " << con << ")";
-    indent_down();
-  } else if (ttype->is_set()) {
-    indent(out) << "(let (" << etype << "," << size << ") = iprot#readSetBegin in" << endl;
-    indent(out) << "let " << con << " = Hashtbl.create " << size << " in" << endl;
-    indent_up();
-    indent(out) << "for i = 1 to " << size << " do" << endl;
-    indent_up();
-    indent(out) << "Hashtbl.add " << con << " ";
-    generate_deserialize_type(out, ((t_set*)ttype)->get_elem_type());
-    out << " true" << endl;
-    indent_down();
-    indent(out) << "done; iprot#readSetEnd; " << con << ")";
-    indent_down();
-  } else if (ttype->is_list()) {
-    indent(out) << "(let (" << etype << "," << size << ") = iprot#readListBegin in" << endl;
-    indent_up();
-    indent(out) << "let " << con << " = (Array.to_list (Array.init " << size << " (fun _ -> ";
-    generate_deserialize_type(out, ((t_list*)ttype)->get_elem_type());
-    out << "))) in" << endl;
-    indent_up();
-    indent(out) << "iprot#readListEnd; " << con << ")";
-    indent_down();
-    indent_down();
-  }
-  indent_down();
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_ocaml_generator::generate_serialize_field(ofstream& out, t_field* tfield, string name) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + tfield->get_name();
-  }
-
-  if (name.length() == 0) {
-    name = decapitalize(tfield->get_name());
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    indent(out) << "oprot#";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        out << "writeString(" << name << ")";
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ")";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ")";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ")";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ")";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ")";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ")";
-        break;
-      default:
-        throw "compiler error: no ocaml name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      string ename = capitalize(type->get_name());
-      out << "writeI32(" << ename << ".to_i " << name << ")";
-    }
-
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-  out << ";" << endl;
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_ocaml_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  indent(out) << prefix << "#write(oprot)";
-}
-
-void t_ocaml_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  if (ttype->is_map()) {
-    indent(out) << "oprot#writeMapBegin(" << type_to_enum(((t_map*)ttype)->get_key_type()) << ",";
-    out << type_to_enum(((t_map*)ttype)->get_val_type()) << ",";
-    out << "Hashtbl.length " << prefix << ");" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot#writeSetBegin(" << type_to_enum(((t_set*)ttype)->get_elem_type()) << ",";
-    out << "Hashtbl.length " << prefix << ");" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot#writeListBegin(" << type_to_enum(((t_list*)ttype)->get_elem_type())
-                << ",";
-    out << "List.length " << prefix << ");" << endl;
-  }
-
-  if (ttype->is_map()) {
-    string kiter = tmp("_kiter");
-    string viter = tmp("_viter");
-    indent(out) << "Hashtbl.iter (fun " << kiter << " -> fun " << viter << " -> " << endl;
-    indent_up();
-    generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
-    indent_down();
-    indent(out) << ") " << prefix << ";" << endl;
-  } else if (ttype->is_set()) {
-    string iter = tmp("_iter");
-    indent(out) << "Hashtbl.iter (fun " << iter << " -> fun _ -> ";
-    indent_up();
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-    indent_down();
-    indent(out) << ") " << prefix << ";" << endl;
-  } else if (ttype->is_list()) {
-    string iter = tmp("_iter");
-    indent(out) << "List.iter (fun " << iter << " -> ";
-    indent_up();
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-    indent_down();
-    indent(out) << ") " << prefix << ";" << endl;
-  }
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot#writeMapEnd";
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot#writeSetEnd";
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot#writeListEnd";
-  }
-}
-
-/**
- * Serializes the members of a map.
- *
- */
-void t_ocaml_generator::generate_serialize_map_element(ofstream& out,
-                                                       t_map* tmap,
-                                                       string kiter,
-                                                       string viter) {
-  t_field kfield(tmap->get_key_type(), kiter);
-  generate_serialize_field(out, &kfield);
-
-  t_field vfield(tmap->get_val_type(), viter);
-  generate_serialize_field(out, &vfield);
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_ocaml_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield);
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_ocaml_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield);
-}
-
-/**
- * Renders a function signature of the form 'name args'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_ocaml_generator::function_signature(t_function* tfunction, string prefix) {
-  return prefix + decapitalize(tfunction->get_name()) + " "
-         + argument_list(tfunction->get_arglist());
-}
-
-string t_ocaml_generator::function_type(t_function* tfunc, bool method, bool options) {
-  string result = "";
-
-  const vector<t_field*>& fields = tfunc->get_arglist()->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result += render_ocaml_type((*f_iter)->get_type());
-    if (options)
-      result += " option";
-    result += " -> ";
-  }
-  if (fields.empty() && !method) {
-    result += "unit -> ";
-  }
-  result += render_ocaml_type(tfunc->get_returntype());
-  return result;
-}
-
-/**
- * Renders a field list
- */
-string t_ocaml_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += " ";
-    }
-    result += (*f_iter)->get_name();
-  }
-  return result;
-}
-
-string t_ocaml_generator::type_name(t_type* ttype) {
-  string prefix = "";
-  t_program* program = ttype->get_program();
-  if (program != NULL && program != program_) {
-    if (!ttype->is_service()) {
-      prefix = capitalize(program->get_name()) + "_types.";
-    }
-  }
-
-  string name = ttype->get_name();
-  if (ttype->is_service()) {
-    name = capitalize(name);
-  } else {
-    name = decapitalize(name);
-  }
-  return prefix + name;
-}
-
-/**
- * Converts the parse type to a Protocol.t_type enum
- */
-string t_ocaml_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      return "Protocol.T_VOID";
-    case t_base_type::TYPE_STRING:
-      return "Protocol.T_STRING";
-    case t_base_type::TYPE_BOOL:
-      return "Protocol.T_BOOL";
-    case t_base_type::TYPE_I8:
-      return "Protocol.T_BYTE";
-    case t_base_type::TYPE_I16:
-      return "Protocol.T_I16";
-    case t_base_type::TYPE_I32:
-      return "Protocol.T_I32";
-    case t_base_type::TYPE_I64:
-      return "Protocol.T_I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "Protocol.T_DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "Protocol.T_I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "Protocol.T_STRUCT";
-  } else if (type->is_map()) {
-    return "Protocol.T_MAP";
-  } else if (type->is_set()) {
-    return "Protocol.T_SET";
-  } else if (type->is_list()) {
-    return "Protocol.T_LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Converts the parse type to an ocaml type
- */
-string t_ocaml_generator::render_ocaml_type(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      return "unit";
-    case t_base_type::TYPE_STRING:
-      return "string";
-    case t_base_type::TYPE_BOOL:
-      return "bool";
-    case t_base_type::TYPE_I8:
-      return "int";
-    case t_base_type::TYPE_I16:
-      return "int";
-    case t_base_type::TYPE_I32:
-      return "Int32.t";
-    case t_base_type::TYPE_I64:
-      return "Int64.t";
-    case t_base_type::TYPE_DOUBLE:
-      return "float";
-    }
-  } else if (type->is_enum()) {
-    return capitalize(((t_enum*)type)->get_name()) + ".t";
-  } else if (type->is_struct() || type->is_xception()) {
-    return type_name((t_struct*)type);
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    return "(" + render_ocaml_type(ktype) + "," + render_ocaml_type(vtype) + ") Hashtbl.t";
-  } else if (type->is_set()) {
-    t_type* etype = ((t_set*)type)->get_elem_type();
-    return "(" + render_ocaml_type(etype) + ",bool) Hashtbl.t";
-  } else if (type->is_list()) {
-    t_type* etype = ((t_list*)type)->get_elem_type();
-    return render_ocaml_type(etype) + " list";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(ocaml, "OCaml", "")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_oop_generator.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_oop_generator.h
deleted file mode 100644
index 8fb580d..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_oop_generator.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_OOP_GENERATOR_H
-#define T_OOP_GENERATOR_H
-
-#include <string>
-#include <iostream>
-
-#include "thrift/common.h"
-#include "thrift/generate/t_generator.h"
-
-#include <algorithm>
-
-/**
- * Class with utility methods shared across common object oriented languages.
- * Specifically, most of this stuff is for C++/Java.
- *
- */
-class t_oop_generator : public t_generator {
-public:
-  t_oop_generator(t_program* program) : t_generator(program) {}
-
-  /**
-   * Scoping, using curly braces!
-   */
-
-  void scope_up(std::ostream& out) {
-    indent(out) << "{" << std::endl;
-    indent_up();
-  }
-
-  void scope_down(std::ostream& out) {
-    indent_down();
-    indent(out) << "}" << std::endl;
-  }
-
-  std::string upcase_string(std::string original) {
-    std::transform(original.begin(), original.end(), original.begin(), (int (*)(int))toupper);
-    return original;
-  }
-
-  virtual std::string get_enum_class_name(t_type* type) {
-    std::string package = "";
-    t_program* program = type->get_program();
-    if (program != NULL && program != program_) {
-      package = program->get_namespace("java") + ".";
-    }
-    return package + type->get_name();
-  }
-
-  virtual void generate_java_docstring_comment(std::ofstream& out, std::string contents) {
-    generate_docstring_comment(out, "/**\n", " * ", contents, " */\n");
-  }
-
-  virtual void generate_java_doc(std::ofstream& out, t_field* field) {
-    if (field->get_type()->is_enum()) {
-      std::string combined_message = field->get_doc() + "\n@see "
-                                     + get_enum_class_name(field->get_type());
-      generate_java_docstring_comment(out, combined_message);
-    } else {
-      generate_java_doc(out, (t_doc*)field);
-    }
-  }
-
-  /**
-   * Emits a JavaDoc comment if the provided object has a doc in Thrift
-   */
-  virtual void generate_java_doc(std::ofstream& out, t_doc* tdoc) {
-    if (tdoc->has_doc()) {
-      generate_java_docstring_comment(out, tdoc->get_doc());
-    }
-  }
-
-  /**
-   * Emits a JavaDoc comment if the provided function object has a doc in Thrift
-   */
-  virtual void generate_java_doc(std::ofstream& out, t_function* tfunction) {
-    if (tfunction->has_doc()) {
-      std::stringstream ss;
-      ss << tfunction->get_doc();
-      const std::vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-      std::vector<t_field*>::const_iterator p_iter;
-      for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-        t_field* p = *p_iter;
-        ss << "\n@param " << p->get_name();
-        if (p->has_doc()) {
-          ss << " " << p->get_doc();
-        }
-      }
-      generate_docstring_comment(out, "/**\n", " * ", ss.str(), " */\n");
-    }
-  }
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_perl_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_perl_generator.cc
deleted file mode 100644
index bfe08f9..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_perl_generator.cc
+++ /dev/null
@@ -1,1648 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <list>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/version.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * PERL code generator.
- *
- */
-class t_perl_generator : public t_oop_generator {
-public:
-  t_perl_generator(t_program* program,
-                   const std::map<std::string, std::string>& parsed_options,
-                   const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    /* no options yet */
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      throw "unknown option perl:" + iter->first;
-    }
-
-    out_dir_base_ = "gen-perl";
-    escape_['$'] = "\\$";
-    escape_['@'] = "\\@";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  std::string render_const_value(t_type* type, t_const_value* value);
-
-  /**
-   * Structs!
-   */
-
-  void generate_perl_struct(t_struct* tstruct, bool is_exception);
-  void generate_perl_struct_definition(std::ofstream& out,
-                                       t_struct* tstruct,
-                                       bool is_xception = false);
-  void generate_perl_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_perl_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_perl_function_helpers(t_function* tfunction);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_rest(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_processor(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  std::string prefix = "",
-                                  bool inclass = false);
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string kiter,
-                                      std::string viter);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string perl_includes();
-  std::string declare_field(t_field* tfield, bool init = false, bool obj = false);
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-
-  std::string autogen_comment() {
-    return std::string("#\n") + "# Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-           + "#\n" + "# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" + "#\n";
-  }
-
-  void perl_namespace_dirs(t_program* p, std::list<std::string>& dirs) {
-    std::string ns = p->get_namespace("perl");
-    std::string::size_type loc;
-
-    if (ns.size() > 0) {
-      while ((loc = ns.find(".")) != std::string::npos) {
-        dirs.push_back(ns.substr(0, loc));
-        ns = ns.substr(loc + 1);
-      }
-    }
-
-    if (ns.size() > 0) {
-      dirs.push_back(ns);
-    }
-  }
-
-  std::string perl_namespace(t_program* p) {
-    std::string ns = p->get_namespace("perl");
-    std::string result = "";
-    std::string::size_type loc;
-
-    if (ns.size() > 0) {
-      while ((loc = ns.find(".")) != std::string::npos) {
-        result += ns.substr(0, loc);
-        result += "::";
-        ns = ns.substr(loc + 1);
-      }
-
-      if (ns.size() > 0) {
-        result += ns + "::";
-      }
-    }
-
-    return result;
-  }
-
-  std::string get_namespace_out_dir() {
-    std::string outdir = get_out_dir();
-    std::list<std::string> dirs;
-    perl_namespace_dirs(program_, dirs);
-    std::list<std::string>::iterator it;
-    for (it = dirs.begin(); it != dirs.end(); it++) {
-      outdir += *it + "/";
-    }
-    return outdir;
-  }
-
-private:
-  /**
-   * File streams
-   */
-  std::ofstream f_types_;
-  std::ofstream f_consts_;
-  std::ofstream f_helpers_;
-  std::ofstream f_service_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_perl_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  string outdir = get_out_dir();
-  std::list<std::string> dirs;
-  perl_namespace_dirs(program_, dirs);
-  std::list<std::string>::iterator it;
-  for (it = dirs.begin(); it != dirs.end(); it++) {
-    outdir += *it + "/";
-    MKDIR(outdir.c_str());
-  }
-
-  // Make output file
-  string f_types_name = outdir + "Types.pm";
-  f_types_.open(f_types_name.c_str());
-  string f_consts_name = outdir + "Constants.pm";
-  f_consts_.open(f_consts_name.c_str());
-
-  // Print header
-  f_types_ << autogen_comment() << perl_includes();
-
-  // Print header
-  f_consts_ << autogen_comment() << "package " << perl_namespace(program_) << "Constants;" << endl
-            << perl_includes() << endl;
-}
-
-/**
- * Prints standard java imports
- */
-string t_perl_generator::perl_includes() {
-  string inc;
-
-  inc = "require 5.6.0;\n";
-  inc += "use strict;\n";
-  inc += "use warnings;\n";
-  inc += "use Thrift;\n\n";
-
-  return inc;
-}
-
-/**
- * Close up (or down) some filez.
- */
-void t_perl_generator::close_generator() {
-  // Close types file
-  f_types_ << "1;" << endl;
-  f_types_.close();
-
-  f_consts_ << "1;" << endl;
-  f_consts_.close();
-}
-
-/**
- * Generates a typedef. This is not done in PERL, types are all implicit.
- *
- * @param ttypedef The type definition
- */
-void t_perl_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Generates code for an enumerated type. Since define is expensive to lookup
- * in PERL, we use a global array for this.
- *
- * @param tenum The enumeration
- */
-void t_perl_generator::generate_enum(t_enum* tenum) {
-  f_types_ << "package " << perl_namespace(program_) << tenum->get_name() << ";" << endl;
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    f_types_ << "use constant " << (*c_iter)->get_name() << " => " << value << ";" << endl;
-  }
-}
-
-/**
- * Generate a constant value
- */
-void t_perl_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = tconst->get_name();
-  t_const_value* value = tconst->get_value();
-
-  f_consts_ << "use constant " << name << " => ";
-  f_consts_ << render_const_value(type, value);
-  f_consts_ << ";" << endl << endl;
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_perl_generator::render_const_value(t_type* type, t_const_value* value) {
-  std::ostringstream out;
-
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "1" : "0");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    out << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    out << "new " << perl_namespace(type->get_program()) << type->get_name() << "({" << endl;
-    indent_up();
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      out << render_const_value(g_type_string, v_iter->first);
-      out << " => ";
-      out << render_const_value(field_type, v_iter->second);
-      out << ",";
-      out << endl;
-    }
-
-    out << "})";
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    out << "{" << endl;
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << render_const_value(ktype, v_iter->first);
-      out << " => ";
-      out << render_const_value(vtype, v_iter->second);
-      out << "," << endl;
-    }
-
-    out << "}";
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    out << "[" << endl;
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-
-      out << render_const_value(etype, *v_iter);
-      if (type->is_set()) {
-        out << " => 1";
-      }
-      out << "," << endl;
-    }
-    out << "]";
-  }
-  return out.str();
-}
-
-/**
- * Make a struct
- */
-void t_perl_generator::generate_struct(t_struct* tstruct) {
-  generate_perl_struct(tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct but extends the Exception class.
- *
- * @param txception The struct definition
- */
-void t_perl_generator::generate_xception(t_struct* txception) {
-  generate_perl_struct(txception, true);
-}
-
-/**
- * Structs can be normal or exceptions.
- */
-void t_perl_generator::generate_perl_struct(t_struct* tstruct, bool is_exception) {
-  generate_perl_struct_definition(f_types_, tstruct, is_exception);
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is nothing in PERL
- * where the objects are all just associative arrays (unless of course we
- * decide to start using objects for them...)
- *
- * @param tstruct The struct definition
- */
-void t_perl_generator::generate_perl_struct_definition(ofstream& out,
-                                                       t_struct* tstruct,
-                                                       bool is_exception) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  out << "package " << perl_namespace(tstruct->get_program()) << tstruct->get_name() << ";\n";
-  if (is_exception) {
-    out << "use base qw(Thrift::TException);\n";
-  }
-
-  // Create simple acessor methods
-  out << "use base qw(Class::Accessor);\n";
-
-  if (members.size() > 0) {
-    out << perl_namespace(tstruct->get_program()) << tstruct->get_name() << "->mk_accessors( qw( ";
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-      if (!t->is_xception()) {
-        out << (*m_iter)->get_name() << " ";
-      }
-    }
-
-    out << ") );\n";
-  }
-
-  out << endl;
-
-  // new()
-  indent_up();
-  out << "sub new {" << endl << indent() << "my $classname = shift;" << endl << indent()
-      << "my $self      = {};" << endl << indent() << "my $vals      = shift || {};" << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    string dval = "undef";
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if ((*m_iter)->get_value() != NULL && !(t->is_struct() || t->is_xception())) {
-      dval = render_const_value((*m_iter)->get_type(), (*m_iter)->get_value());
-    }
-    out << indent() << "$self->{" << (*m_iter)->get_name() << "} = " << dval << ";" << endl;
-  }
-
-  // Generate constructor from array
-  if (members.size() > 0) {
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-      if ((*m_iter)->get_value() != NULL && (t->is_struct() || t->is_xception())) {
-        indent(out) << "$self->{" << (*m_iter)->get_name()
-                    << "} = " << render_const_value(t, (*m_iter)->get_value()) << ";" << endl;
-      }
-    }
-
-    out << indent() << "if (UNIVERSAL::isa($vals,'HASH')) {" << endl;
-    indent_up();
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      out << indent() << "if (defined $vals->{" << (*m_iter)->get_name() << "}) {" << endl
-          << indent() << "  $self->{" << (*m_iter)->get_name() << "} = $vals->{"
-          << (*m_iter)->get_name() << "};" << endl << indent() << "}" << endl;
-    }
-    indent_down();
-    out << indent() << "}" << endl;
-  }
-
-  out << indent() << "return bless ($self, $classname);" << endl;
-  indent_down();
-  out << "}\n\n";
-
-  out << "sub getName {" << endl << indent() << "  return '" << tstruct->get_name() << "';" << endl
-      << indent() << "}" << endl << endl;
-
-  generate_perl_struct_reader(out, tstruct);
-  generate_perl_struct_writer(out, tstruct);
-}
-
-/**
- * Generates the read() method for a struct
- */
-void t_perl_generator::generate_perl_struct_reader(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << "sub read {" << endl;
-
-  indent_up();
-
-  out << indent() << "my ($self, $input) = @_;" << endl << indent() << "my $xfer  = 0;" << endl
-      << indent() << "my $fname;" << endl << indent() << "my $ftype = 0;" << endl << indent()
-      << "my $fid   = 0;" << endl;
-
-  indent(out) << "$xfer += $input->readStructBegin(\\$fname);" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while (1) " << endl;
-
-  scope_up(out);
-
-  indent(out) << "$xfer += $input->readFieldBegin(\\$fname, \\$ftype, \\$fid);" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if ($ftype == TType::STOP) {" << endl;
-  indent_up();
-  indent(out) << "last;" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-
-  // Switch statement on the field we are reading
-  indent(out) << "SWITCH: for($fid)" << endl;
-
-  scope_up(out);
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-
-    indent(out) << "/^" << (*f_iter)->get_key() << "$/ && do{";
-    indent(out) << "if ($ftype == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-
-    indent_up();
-    generate_deserialize_field(out, *f_iter, "self->");
-    indent_down();
-
-    indent(out) << "} else {" << endl;
-
-    indent(out) << "  $xfer += $input->skip($ftype);" << endl;
-
-    out << indent() << "}" << endl << indent() << "last; };" << endl;
-  }
-  // In the default case we skip the field
-
-  indent(out) << "  $xfer += $input->skip($ftype);" << endl;
-
-  scope_down(out);
-
-  indent(out) << "$xfer += $input->readFieldEnd();" << endl;
-
-  scope_down(out);
-
-  indent(out) << "$xfer += $input->readStructEnd();" << endl;
-
-  indent(out) << "return $xfer;" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates the write() method for a struct
- */
-void t_perl_generator::generate_perl_struct_writer(ofstream& out, t_struct* tstruct) {
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << "sub write {" << endl;
-
-  indent_up();
-  indent(out) << "my ($self, $output) = @_;" << endl;
-  indent(out) << "my $xfer   = 0;" << endl;
-
-  indent(out) << "$xfer += $output->writeStructBegin('" << name << "');" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    out << indent() << "if (defined $self->{" << (*f_iter)->get_name() << "}) {" << endl;
-    indent_up();
-
-    indent(out) << "$xfer += $output->writeFieldBegin("
-                << "'" << (*f_iter)->get_name() << "', " << type_to_enum((*f_iter)->get_type())
-                << ", " << (*f_iter)->get_key() << ");" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "self->");
-
-    indent(out) << "$xfer += $output->writeFieldEnd();" << endl;
-
-    indent_down();
-    indent(out) << "}" << endl;
-  }
-
-  out << indent() << "$xfer += $output->writeFieldStop();" << endl << indent()
-      << "$xfer += $output->writeStructEnd();" << endl;
-
-  out << indent() << "return $xfer;" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_perl_generator::generate_service(t_service* tservice) {
-  string f_service_name = get_namespace_out_dir() + service_name_ + ".pm";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ <<
-      ///      "package "<<service_name_<<";"<<endl<<
-      autogen_comment() << perl_includes();
-
-  f_service_ << "use " << perl_namespace(tservice->get_program()) << "Types;" << endl;
-
-  t_service* extends_s = tservice->get_extends();
-  if (extends_s != NULL) {
-    f_service_ << "use " << perl_namespace(extends_s->get_program()) << extends_s->get_name() << ";"
-               << endl;
-  }
-
-  f_service_ << endl;
-
-  // Generate the three main parts of the service (well, two for now in PERL)
-  generate_service_helpers(tservice);
-  generate_service_interface(tservice);
-  generate_service_rest(tservice);
-  generate_service_client(tservice);
-  generate_service_processor(tservice);
-
-  // Close service file
-  f_service_ << "1;" << endl;
-  f_service_.close();
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_perl_generator::generate_service_processor(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string extends = "";
-  string extends_processor = "";
-  t_service* extends_s = tservice->get_extends();
-  if (extends_s != NULL) {
-    extends = perl_namespace(extends_s->get_program()) + extends_s->get_name();
-    extends_processor = "use base qw(" + extends + "Processor);";
-  }
-
-  indent_up();
-
-  // Generate the header portion
-  f_service_ << "package " << perl_namespace(program_) << service_name_ << "Processor;" << endl
-             << endl << "use strict;" << endl << extends_processor << endl << endl;
-
-  if (extends.empty()) {
-    f_service_ << "sub new {" << endl;
-
-    indent_up();
-
-    f_service_ << indent() << "my ($classname, $handler) = @_;" << endl << indent()
-               << "my $self      = {};" << endl;
-
-    f_service_ << indent() << "$self->{handler} = $handler;" << endl;
-
-    f_service_ << indent() << "return bless ($self, $classname);" << endl;
-
-    indent_down();
-
-    f_service_ << "}" << endl << endl;
-  }
-
-  // Generate the server implementation
-  f_service_ << "sub process {" << endl;
-  indent_up();
-
-  f_service_ << indent() << "my ($self, $input, $output) = @_;" << endl;
-
-  f_service_ << indent() << "my $rseqid = 0;" << endl << indent() << "my $fname  = undef;" << endl
-             << indent() << "my $mtype  = 0;" << endl << endl;
-
-  f_service_ << indent() << "$input->readMessageBegin(\\$fname, \\$mtype, \\$rseqid);" << endl;
-
-  // HOT: check for method implementation
-  f_service_ << indent() << "my $methodname = 'process_'.$fname;" << endl << indent()
-             << "if (!$self->can($methodname)) {" << endl;
-  indent_up();
-
-  f_service_ << indent() << "$input->skip(TType::STRUCT);" << endl << indent()
-             << "$input->readMessageEnd();" << endl << indent()
-             << "my $x = new TApplicationException('Function '.$fname.' not implemented.', "
-                "TApplicationException::UNKNOWN_METHOD);" << endl << indent()
-             << "$output->writeMessageBegin($fname, TMessageType::EXCEPTION, $rseqid);" << endl
-             << indent() << "$x->write($output);" << endl << indent()
-             << "$output->writeMessageEnd();" << endl << indent()
-             << "$output->getTransport()->flush();" << endl << indent() << "return;" << endl;
-
-  indent_down();
-  f_service_ << indent() << "}" << endl << indent()
-             << "$self->$methodname($rseqid, $input, $output);" << endl << indent() << "return 1;"
-             << endl;
-
-  indent_down();
-
-  f_service_ << "}" << endl << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_perl_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  // Open function
-  f_service_ << "sub process_" << tfunction->get_name() << " {" << endl;
-
-  indent_up();
-
-  f_service_ << indent() << "my ($self, $seqid, $input, $output) = @_;" << endl;
-
-  string argsname = perl_namespace(tservice->get_program()) + service_name_ + "_"
-                    + tfunction->get_name() + "_args";
-  string resultname = perl_namespace(tservice->get_program()) + service_name_ + "_"
-                      + tfunction->get_name() + "_result";
-
-  f_service_ << indent() << "my $args = new " << argsname << "();" << endl << indent()
-             << "$args->read($input);" << endl;
-
-  f_service_ << indent() << "$input->readMessageEnd();" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Declare result for non oneway function
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << "my $result = new " << resultname << "();" << endl;
-  }
-
-  // Try block for a function with exceptions
-  if (xceptions.size() > 0) {
-    f_service_ << indent() << "eval {" << endl;
-    indent_up();
-  }
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  f_service_ << indent();
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_service_ << "$result->{success} = ";
-  }
-  f_service_ << "$self->{handler}->" << tfunction->get_name() << "(";
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_service_ << ", ";
-    }
-    f_service_ << "$args->" << (*f_iter)->get_name();
-  }
-  f_service_ << ");" << endl;
-
-  if (!tfunction->is_oneway() && xceptions.size() > 0) {
-    indent_down();
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_ << indent() << "}; if( UNIVERSAL::isa($@,'"
-                 << perl_namespace((*x_iter)->get_type()->get_program())
-                 << (*x_iter)->get_type()->get_name() << "') ){ " << endl;
-
-      indent_up();
-      f_service_ << indent() << "$result->{" << (*x_iter)->get_name() << "} = $@;" << endl;
-      f_service_ << indent() << "$@ = undef;" << endl;
-      indent_down();
-      f_service_ << indent();
-    }
-    f_service_ << "}" << endl;
-
-    // catch-all for unexpected exceptions (THRIFT-3191)
-    f_service_ << indent() << "if ($@) {" << endl;
-    indent_up();
-    f_service_ << indent() << "$@ =~ s/^\\s+|\\s+$//g;" << endl
-               << indent() << "my $err = new TApplicationException(\"Unexpected Exception: \" . $@, TApplicationException::INTERNAL_ERROR);" << endl
-               << indent() << "$output->writeMessageBegin('" << tfunction->get_name() << "', TMessageType::EXCEPTION, $seqid);" << endl
-               << indent() << "$err->write($output);" << endl
-               << indent() << "$output->writeMessageEnd();" << endl
-               << indent() << "$output->getTransport()->flush();" << endl
-               << indent() << "$@ = undef;" << endl
-               << indent() << "return;" << endl;
-    indent_down();
-    f_service_ << indent() << "}" << endl;
-  }
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    f_service_ << indent() << "return;" << endl;
-    indent_down();
-    f_service_ << "}" << endl;
-    return;
-  }
-
-  // Serialize the reply
-  f_service_ << indent() << "$output->writeMessageBegin('" << tfunction->get_name() << "', TMessageType::REPLY, $seqid);" << endl
-             << indent() << "$result->write($output);" << endl
-             << indent() << "$output->writeMessageEnd();" << endl
-             << indent() << "$output->getTransport()->flush();" << endl;
-
-  // Close function
-  indent_down();
-  f_service_ << "}" << endl << endl;
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_perl_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  f_service_ << "# HELPER FUNCTIONS AND STRUCTURES" << endl << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    string name = ts->get_name();
-    ts->set_name(service_name_ + "_" + name);
-    generate_perl_struct_definition(f_service_, ts, false);
-    generate_perl_function_helpers(*f_iter);
-    ts->set_name(name);
-  }
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_perl_generator::generate_perl_function_helpers(t_function* tfunction) {
-  t_struct result(program_, service_name_ + "_" + tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-
-  generate_perl_struct_definition(f_service_, &result, false);
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_perl_generator::generate_service_interface(t_service* tservice) {
-  string extends_if = "";
-  t_service* extends_s = tservice->get_extends();
-  if (extends_s != NULL) {
-    extends_if = "use base qw(" + perl_namespace(extends_s->get_program()) + extends_s->get_name()
-                 + "If);";
-  }
-
-  f_service_ << "package " << perl_namespace(program_) << service_name_ << "If;" << endl << endl
-             << "use strict;" << endl << extends_if << endl << endl;
-
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << "sub " << function_signature(*f_iter) << endl << "  die 'implement interface';\n}"
-               << endl << endl;
-  }
-  indent_down();
-}
-
-/**
- * Generates a REST interface
- */
-void t_perl_generator::generate_service_rest(t_service* tservice) {
-  string extends = "";
-  string extends_if = "";
-  t_service* extends_s = tservice->get_extends();
-  if (extends_s != NULL) {
-    extends = extends_s->get_name();
-    extends_if = "use base qw(" + perl_namespace(extends_s->get_program()) + extends_s->get_name()
-                 + "Rest);";
-  }
-  f_service_ << "package " << perl_namespace(program_) << service_name_ << "Rest;" << endl << endl
-             << "use strict;" << endl << extends_if << endl << endl;
-
-  if (extends.empty()) {
-    f_service_ << "sub new {" << endl;
-
-    indent_up();
-
-    f_service_ << indent() << "my ($classname, $impl) = @_;" << endl << indent()
-               << "my $self     ={ impl => $impl };" << endl << endl << indent()
-               << "return bless($self,$classname);" << endl;
-
-    indent_down();
-
-    f_service_ << "}" << endl << endl;
-  }
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << "sub " << (*f_iter)->get_name() << "{" << endl;
-
-    indent_up();
-
-    f_service_ << indent() << "my ($self, $request) = @_;" << endl << endl;
-
-    const vector<t_field*>& args = (*f_iter)->get_arglist()->get_members();
-    vector<t_field*>::const_iterator a_iter;
-    for (a_iter = args.begin(); a_iter != args.end(); ++a_iter) {
-      t_type* atype = get_true_type((*a_iter)->get_type());
-      string req = "$request->{'" + (*a_iter)->get_name() + "'}";
-      f_service_ << indent() << "my $" << (*a_iter)->get_name() << " = (" << req << ") ? " << req
-                 << " : undef;" << endl;
-      if (atype->is_string() && ((t_base_type*)atype)->is_string_list()) {
-        f_service_ << indent() << "my @" << (*a_iter)->get_name() << " = split(/,/, $"
-                   << (*a_iter)->get_name() << ");" << endl << indent() << "$"
-                   << (*a_iter)->get_name() << " = \\@" << (*a_iter)->get_name() << endl;
-      }
-    }
-    f_service_ << indent() << "return $self->{impl}->" << (*f_iter)->get_name() << "("
-               << argument_list((*f_iter)->get_arglist()) << ");" << endl;
-    indent_down();
-    indent(f_service_) << "}" << endl << endl;
-  }
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_perl_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  t_service* extends_s = tservice->get_extends();
-  if (extends_s != NULL) {
-    extends = perl_namespace(extends_s->get_program()) + extends_s->get_name();
-    extends_client = "use base qw(" + extends + "Client);";
-  }
-
-  f_service_ << "package " << perl_namespace(program_) << service_name_ << "Client;" << endl << endl
-             << extends_client << endl << "use base qw(" << perl_namespace(program_)
-             << service_name_ << "If);" << endl;
-
-  // Constructor function
-  f_service_ << "sub new {" << endl;
-
-  indent_up();
-
-  f_service_ << indent() << "my ($classname, $input, $output) = @_;" << endl << indent()
-             << "my $self      = {};" << endl;
-
-  if (!extends.empty()) {
-    f_service_ << indent() << "$self = $classname->SUPER::new($input, $output);" << endl;
-  } else {
-    f_service_ << indent() << "$self->{input}  = $input;" << endl << indent()
-               << "$self->{output} = defined $output ? $output : $input;" << endl << indent()
-               << "$self->{seqid}  = 0;" << endl;
-  }
-
-  f_service_ << indent() << "return bless($self,$classname);" << endl;
-
-  indent_down();
-
-  f_service_ << "}" << endl << endl;
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string funname = (*f_iter)->get_name();
-
-    // Open function
-    f_service_ << "sub " << function_signature(*f_iter) << endl;
-
-    indent_up();
-
-    indent(f_service_) << indent() << "$self->send_" << funname << "(";
-
-    bool first = true;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << "$" << (*fld_iter)->get_name();
-    }
-    f_service_ << ");" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_service_ << indent();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << "return ";
-      }
-      f_service_ << "$self->recv_" << funname << "();" << endl;
-    }
-
-    indent_down();
-
-    f_service_ << "}" << endl << endl;
-
-    f_service_ << "sub send_" << function_signature(*f_iter) << endl;
-
-    indent_up();
-
-    std::string argsname = perl_namespace(tservice->get_program()) + service_name_ + "_"
-                           + (*f_iter)->get_name() + "_args";
-
-    // Serialize the request header
-    f_service_ << indent() << "$self->{output}->writeMessageBegin('" << (*f_iter)->get_name()
-               << "', " << ((*f_iter)->is_oneway() ? "TMessageType::ONEWAY" : "TMessageType::CALL")
-               << ", $self->{seqid});" << endl;
-
-    f_service_ << indent() << "my $args = new " << argsname << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "$args->{" << (*fld_iter)->get_name() << "} = $"
-                 << (*fld_iter)->get_name() << ";" << endl;
-    }
-
-    // Write to the stream
-    f_service_ << indent() << "$args->write($self->{output});" << endl << indent()
-               << "$self->{output}->writeMessageEnd();" << endl << indent()
-               << "$self->{output}->getTransport()->flush();" << endl;
-
-    indent_down();
-
-    f_service_ << "}" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      std::string resultname = perl_namespace(tservice->get_program()) + service_name_ + "_"
-                               + (*f_iter)->get_name() + "_result";
-      t_struct noargs(program_);
-
-      t_function recv_function((*f_iter)->get_returntype(),
-                               string("recv_") + (*f_iter)->get_name(),
-                               &noargs);
-      // Open function
-      f_service_ << endl << "sub " << function_signature(&recv_function) << endl;
-
-      indent_up();
-
-      f_service_ << indent() << "my $rseqid = 0;" << endl << indent() << "my $fname;" << endl
-                 << indent() << "my $mtype = 0;" << endl << endl;
-
-      f_service_ << indent() << "$self->{input}->readMessageBegin(\\$fname, \\$mtype, \\$rseqid);"
-                 << endl << indent() << "if ($mtype == TMessageType::EXCEPTION) {" << endl
-                 << indent() << "  my $x = new TApplicationException();" << endl << indent()
-                 << "  $x->read($self->{input});" << endl << indent()
-                 << "  $self->{input}->readMessageEnd();" << endl << indent() << "  die $x;" << endl
-                 << indent() << "}" << endl;
-
-      f_service_ << indent() << "my $result = new " << resultname << "();" << endl << indent()
-                 << "$result->read($self->{input});" << endl;
-
-      f_service_ << indent() << "$self->{input}->readMessageEnd();" << endl << endl;
-
-      // Careful, only return result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << indent() << "if (defined $result->{success} ) {" << endl << indent()
-                   << "  return $result->{success};" << endl << indent() << "}" << endl;
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "if (defined $result->{" << (*x_iter)->get_name() << "}) {"
-                   << endl << indent() << "  die $result->{" << (*x_iter)->get_name() << "};"
-                   << endl << indent() << "}" << endl;
-      }
-
-      // Careful, only return _result if not a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_) << "return;" << endl;
-      } else {
-        f_service_ << indent() << "die \"" << (*f_iter)->get_name() << " failed: unknown result\";"
-                   << endl;
-      }
-
-      // Close function
-      indent_down();
-      f_service_ << "}" << endl;
-    }
-  }
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_perl_generator::generate_deserialize_field(ofstream& out,
-                                                  t_field* tfield,
-                                                  string prefix,
-                                                  bool inclass) {
-  (void)inclass;
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = tfield->get_name();
-
-  // Hack for when prefix is defined (always a hash ref)
-  if (!prefix.empty()) {
-    name = prefix + "{" + tfield->get_name() + "}";
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << "$xfer += $input->";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        out << "readString(\\$" << name << ");";
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "readBool(\\$" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "readByte(\\$" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "readI16(\\$" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "readI32(\\$" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "readI64(\\$" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "readDouble(\\$" << name << ");";
-        break;
-      default:
-        throw "compiler error: no PERL name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "readI32(\\$" << name << ");";
-    }
-    out << endl;
-
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a variable. This makes two key assumptions,
- * first that there is a const char* variable named data that points to the
- * buffer for deserialization, and that there is a variable protocol which
- * is a reference to a TProtocol serialization object.
- */
-void t_perl_generator::generate_deserialize_struct(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   string prefix) {
-  out << indent() << "$" << prefix << " = new " << perl_namespace(tstruct->get_program())
-      << tstruct->get_name() << "();" << endl << indent() << "$xfer += $" << prefix
-      << "->read($input);" << endl;
-}
-
-void t_perl_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  string size = tmp("_size");
-  string ktype = tmp("_ktype");
-  string vtype = tmp("_vtype");
-  string etype = tmp("_etype");
-
-  t_field fsize(g_type_i32, size);
-  t_field fktype(g_type_i8, ktype);
-  t_field fvtype(g_type_i8, vtype);
-  t_field fetype(g_type_i8, etype);
-
-  out << indent() << "my $" << size << " = 0;" << endl;
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    out << indent() << "$" << prefix << " = {};" << endl << indent() << "my $" << ktype << " = 0;"
-        << endl << indent() << "my $" << vtype << " = 0;" << endl;
-
-    out << indent() << "$xfer += $input->readMapBegin("
-        << "\\$" << ktype << ", \\$" << vtype << ", \\$" << size << ");" << endl;
-
-  } else if (ttype->is_set()) {
-
-    out << indent() << "$" << prefix << " = {};" << endl << indent() << "my $" << etype << " = 0;"
-        << endl << indent() << "$xfer += $input->readSetBegin("
-        << "\\$" << etype << ", \\$" << size << ");" << endl;
-
-  } else if (ttype->is_list()) {
-
-    out << indent() << "$" << prefix << " = [];" << endl << indent() << "my $" << etype << " = 0;"
-        << endl << indent() << "$xfer += $input->readListBegin("
-        << "\\$" << etype << ", \\$" << size << ");" << endl;
-  }
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for (my $" << i << " = 0; $" << i << " < $" << size << "; ++$" << i << ")"
-              << endl;
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  scope_down(out);
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "$xfer += $input->readMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "$xfer += $input->readSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "$xfer += $input->readListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_perl_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  string key = tmp("key");
-  string val = tmp("val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey, true, true) << endl;
-  indent(out) << declare_field(&fval, true, true) << endl;
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << "$" << prefix << "->{$" << key << "} = $" << val << ";" << endl;
-}
-
-void t_perl_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  string elem = tmp("elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << "my $" << elem << " = undef;" << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << "$" << prefix << "->{$" << elem << "} = 1;" << endl;
-}
-
-void t_perl_generator::generate_deserialize_list_element(ofstream& out,
-                                                         t_list* tlist,
-                                                         string prefix) {
-  string elem = tmp("elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << "my $" << elem << " = undef;" << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << "push(@{$" << prefix << "},$" << elem << ");" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_perl_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + "{" + tfield->get_name() + "}");
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + "{" + tfield->get_name() + "}");
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    string name = tfield->get_name();
-
-    // Hack for when prefix is defined (always a hash ref)
-    if (!prefix.empty())
-      name = prefix + "{" + tfield->get_name() + "}";
-
-    indent(out) << "$xfer += $output->";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        out << "writeString($" << name << ");";
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool($" << name << ");";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte($" << name << ");";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16($" << name << ");";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32($" << name << ");";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64($" << name << ");";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble($" << name << ");";
-        break;
-      default:
-        throw "compiler error: no PERL name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32($" << name << ");";
-    }
-    out << endl;
-
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_perl_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  indent(out) << "$xfer += $" << prefix << "->write($output);" << endl;
-}
-
-/**
- * Writes out a container
- */
-void t_perl_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "$xfer += $output->writeMapBegin("
-                << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
-                << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
-                << "scalar(keys %{$" << prefix << "}));" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "$xfer += $output->writeSetBegin("
-                << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", "
-                << "scalar(@{$" << prefix << "}));" << endl;
-
-  } else if (ttype->is_list()) {
-
-    indent(out) << "$xfer += $output->writeListBegin("
-                << type_to_enum(((t_list*)ttype)->get_elem_type()) << ", "
-                << "scalar(@{$" << prefix << "}));" << endl;
-  }
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    string kiter = tmp("kiter");
-    string viter = tmp("viter");
-    indent(out) << "while( my ($" << kiter << ",$" << viter << ") = each %{$" << prefix << "}) "
-                << endl;
-
-    scope_up(out);
-    generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
-    scope_down(out);
-
-  } else if (ttype->is_set()) {
-    string iter = tmp("iter");
-    indent(out) << "foreach my $" << iter << " (@{$" << prefix << "})" << endl;
-    scope_up(out);
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-    scope_down(out);
-
-  } else if (ttype->is_list()) {
-    string iter = tmp("iter");
-    indent(out) << "foreach my $" << iter << " (@{$" << prefix << "}) " << endl;
-    scope_up(out);
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-    scope_down(out);
-  }
-
-  scope_down(out);
-
-  if (ttype->is_map()) {
-    indent(out) << "$xfer += $output->writeMapEnd();" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "$xfer += $output->writeSetEnd();" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "$xfer += $output->writeListEnd();" << endl;
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- *
- */
-void t_perl_generator::generate_serialize_map_element(ofstream& out,
-                                                      t_map* tmap,
-                                                      string kiter,
-                                                      string viter) {
-  t_field kfield(tmap->get_key_type(), kiter);
-  generate_serialize_field(out, &kfield);
-
-  t_field vfield(tmap->get_val_type(), viter);
-  generate_serialize_field(out, &vfield);
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_perl_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield);
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_perl_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield);
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param ttype The type
- */
-string t_perl_generator::declare_field(t_field* tfield, bool init, bool obj) {
-  string result = "my $" + tfield->get_name();
-  if (init) {
-    t_type* type = get_true_type(tfield->get_type());
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        break;
-      case t_base_type::TYPE_STRING:
-        result += " = ''";
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = 0.0";
-        break;
-      default:
-        throw "compiler error: no PERL initializer for base type "
-            + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      result += " = 0";
-    } else if (type->is_container()) {
-      result += " = []";
-    } else if (type->is_struct() || type->is_xception()) {
-      if (obj) {
-        result += " = new " + perl_namespace(type->get_program()) + type->get_name() + "()";
-      } else {
-        result += " = undef";
-      }
-    }
-  }
-  return result + ";";
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_perl_generator::function_signature(t_function* tfunction, string prefix) {
-
-  string str;
-
-  str = prefix + tfunction->get_name() + "{\n";
-  str += "  my $self = shift;\n";
-
-  // Need to create perl function arg inputs
-  const vector<t_field*>& fields = tfunction->get_arglist()->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    str += "  my $" + (*f_iter)->get_name() + " = shift;\n";
-  }
-
-  return str;
-}
-
-/**
- * Renders a field list
- */
-string t_perl_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += "$" + (*f_iter)->get_name();
-  }
-  return result;
-}
-
-/**
- * Converts the parse type to a C++ enum string for the given type.
- */
-string t_perl_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType::STRING";
-    case t_base_type::TYPE_BOOL:
-      return "TType::BOOL";
-    case t_base_type::TYPE_I8:
-      return "TType::BYTE";
-    case t_base_type::TYPE_I16:
-      return "TType::I16";
-    case t_base_type::TYPE_I32:
-      return "TType::I32";
-    case t_base_type::TYPE_I64:
-      return "TType::I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType::DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TType::I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType::STRUCT";
-  } else if (type->is_map()) {
-    return "TType::MAP";
-  } else if (type->is_set()) {
-    return "TType::SET";
-  } else if (type->is_list()) {
-    return "TType::LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(perl, "Perl", "")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_php_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_php_generator.cc
deleted file mode 100644
index 515e165..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_php_generator.cc
+++ /dev/null
@@ -1,2656 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-#define NSGLOBAL (nsglobal_.size() ? nsglobal_ : "")
-#define NSGLOBAL_A ("\\" + NSGLOBAL)
-#define NSGLOBAL_B (NSGLOBAL + "\\")
-#define NSGLOBAL_AB ("\\" + NSGLOBAL + "\\")
-
-/**
- * PHP code generator.
- *
- */
-class t_php_generator : public t_oop_generator {
-public:
-  t_php_generator(t_program* program,
-                  const std::map<std::string, std::string>& parsed_options,
-                  const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    binary_inline_ = false;
-    rest_ = false;
-    phps_ = false;
-    oop_ = false;
-    validate_ = false;
-    json_serializable_ = false;
-    nsglobal_ = ""; // by default global namespace is empty
-    psr4_ = false;
-    for (iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if (iter->first.compare("inlined") == 0) {
-        binary_inline_ = true;
-      } else if (iter->first.compare("rest") == 0) {
-        rest_ = true;
-      } else if (iter->first.compare("server") == 0) {
-        phps_ = true;
-      } else if (iter->first.compare("oop") == 0) {
-        oop_ = true;
-      } else if (iter->first.compare("validate") == 0) {
-        validate_ = true;
-      } else if (iter->first.compare("json") == 0) {
-        json_serializable_ = true;
-      } else if (iter->first.compare("nsglobal") == 0) {
-        nsglobal_ = iter->second;
-      } else if (iter->first.compare("psr4") == 0) {
-        psr4_ = true;
-      } else {
-        throw "unknown option php:" + iter->first;
-      }
-    }
-
-    if (oop_ && binary_inline_) {
-      throw "oop and inlined are mutually exclusive.";
-    }
-
-    out_dir_base_ = (binary_inline_ ? "gen-phpi" : "gen-php");
-    escape_['$'] = "\\$";
-  }
-
-  static bool is_valid_namespace(const std::string& sub_namespace);
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_consts(vector<t_const*> consts);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  std::string render_const_value(t_type* type, t_const_value* value);
-
-  /**
-   * Structs!
-   */
-
-  void generate_php_struct(t_struct* tstruct, bool is_exception);
-  void generate_php_struct_definition(std::ofstream& out,
-                                      t_struct* tstruct,
-                                      bool is_xception = false,
-                                      bool is_result = false);
-  void generate_php_struct_reader(std::ofstream& out, t_struct* tstruct, bool is_result);
-  void generate_php_struct_writer(std::ofstream& out, t_struct* tstruct, bool is_result);
-  void generate_php_function_helpers(t_service* tservice, t_function* tfunction);
-  void generate_php_struct_required_validator(ofstream& out,
-                                              t_struct* tstruct,
-                                              std::string method_name,
-                                              bool write_mode);
-  void generate_php_struct_read_validator(ofstream& out, t_struct* tstruct);
-  void generate_php_struct_write_validator(ofstream& out, t_struct* tstruct);
-  void generate_php_struct_json_serialize(ofstream& out, t_struct* tstruct, bool is_result);
-  bool needs_php_write_validator(t_struct* tstruct, bool is_result);
-  bool needs_php_read_validator(t_struct* tstruct, bool is_result);
-  int get_php_num_required_fields(const vector<t_field*>& fields, bool write_mode);
-
-  void generate_php_type_spec(std::ofstream& out, t_type* t);
-  void generate_php_struct_spec(std::ofstream& out, t_struct* tstruct);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_rest(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_processor(t_service* tservice);
-  void generate_process_function(std::ofstream& out, t_service* tservice, t_function* tfunction);
-  void generate_service_header(t_service* tservice, std::ofstream& file);
-  void generate_program_header(std::ofstream& file);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  std::string prefix = "",
-                                  bool inclass = false);
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string kiter,
-                                      std::string viter);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_php_doc(std::ofstream& out, t_doc* tdoc);
-
-  void generate_php_doc(std::ofstream& out, t_field* tfield);
-
-  void generate_php_doc(std::ofstream& out, t_function* tfunction);
-
-  void generate_php_docstring_comment(std::ofstream& out, string contents);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string php_includes();
-  std::string declare_field(t_field* tfield, bool init = false, bool obj = false);
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string argument_list(t_struct* tstruct, bool addTypeHints = true);
-  std::string type_to_cast(t_type* ttype);
-  std::string type_to_enum(t_type* ttype);
-  std::string type_to_phpdoc(t_type* ttype);
-
-  std::string php_namespace_base(const t_program* p) {
-    std::string ns = p->get_namespace("php");
-    const char* delimiter = "\\";
-    size_t position = ns.find('.');
-    while (position != string::npos) {
-      ns.replace(position, 1, delimiter);
-      position = ns.find('.', position + 1);
-    }
-    return ns;
-  }
-
-  // general use namespace prefixing: \my\namespace\ or my_namespace_
-  string php_namespace(const t_program* p) {
-    string ns = php_namespace_base(p);
-    return (nsglobal_.size() ? NSGLOBAL_AB : NSGLOBAL_B) + (ns.size() ? (ns + "\\") : "");
-  }
-
-  // return the namespace of a file:
-  // global\ns\sub\ns or global\ns or sub\ns
-  string php_namespace_suffix(const t_program* p) {
-    string ns = php_namespace_base(p);
-
-    return NSGLOBAL
-      + (ns.size() && NSGLOBAL.size() ? "\\" : "")
-      + ns;
-  }
-
-  // add a directory to already existing namespace
-  string php_namespace_directory(string directory, bool end = true) {
-    (void)directory;
-    if (end) {
-      return ";";
-    } else {
-      return "";
-    }
-  }
-
-  // writing an autload identifier into globa;ls: my\namespace\ or my_namespace_
-  string php_namespace_autoload(const t_program* p) {
-    std::string ns = php_namespace_base(p);
-    return (nsglobal_.size() ? NSGLOBAL_B : NSGLOBAL) + (ns.size() ? (ns + "\\") : "");
-  }
-
-  // declaring a type: typename or my_namespace_typename
-  string php_namespace_declaration(t_type* t) { return t->get_name(); }
-
-  std::string php_path(t_program* p) {
-    std::string ns = p->get_namespace("php.path");
-    if (ns.empty()) {
-      return p->get_name();
-    }
-
-    // Transform the java-style namespace into a path.
-    for (std::string::iterator it = ns.begin(); it != ns.end(); ++it) {
-      if (*it == '.') {
-        *it = '/';
-      }
-    }
-
-    return ns + '/';
-  }
-
-  /**
-   * Transform class_method into ClassMethod
-   *
-   * @param str
-   * @return stirng
-   */
-  string classify(string str) {
-    string classe = "";
-
-    vector<string> x = split(str, '_');
-
-    for (size_t i = 0; i < x.size(); ++i) {
-      classe = classe + capitalize(x[i]);
-    }
-
-    return classe;
-  }
-
-  /**
-   * Split method
-   * @param s
-   * @param delim
-   * @param elems
-   * @return
-   */
-  vector<string>& split(const string& s, char delim, vector<string>& elems) {
-    stringstream ss(s);
-    string item;
-
-    while (getline(ss, item, delim)) {
-      elems.push_back(item);
-    }
-
-    return elems;
-  }
-
-  vector<string> split(const string& s, char delim) {
-    vector<string> elems;
-
-    return split(s, delim, elems);
-  }
-
-  /**
-   * Capitalize method
-   * @param str
-   * @return
-   */
-  string capitalize(string str) {
-    string::iterator it(str.begin());
-
-    if (it != str.end())
-      str[0] = toupper((unsigned char)str[0]);
-
-    //    while(++it != str.end())
-    //    {
-    //      *it = tolower((unsigned char)*it);
-    //    }
-    return str;
-  }
-
-private:
-  /**
-   * File streams
-   */
-  std::ofstream f_types_;
-  std::ofstream f_service_;
-
-  std::string package_dir_;
-  /**
-   * Generate protocol-independent template? Or Binary inline code?
-   */
-  bool binary_inline_;
-
-  /**
-   * Generate a REST handler class
-   */
-  bool rest_;
-
-  /**
-   * Generate stubs for a PHP server
-   */
-  bool phps_;
-
-  /**
-   * Whether to use OOP base class TBase
-   */
-  bool oop_;
-
-  /**
-   * Whether to hold each class in separate file to allow PSR4-autoloading
-   */
-  bool psr4_;
-
-  /**
-   * Whether to generate validator code
-   */
-  bool validate_;
-
-  /**
-   * Whether to generate JsonSerializable classes
-   */
-  bool json_serializable_;
-
-  /**
-   * Global namespace for PHP 5.3
-   */
-  std::string nsglobal_;
-};
-
-bool t_php_generator::is_valid_namespace(const std::string& sub_namespace) {
-  return sub_namespace == "path";
-}
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_php_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  // Create Real directory Namespaces
-  vector<string> NSx = split(php_namespace_suffix(get_program()), '\\');
-  package_dir_ = get_out_dir();
-
-  for (size_t i = 0; i < NSx.size(); ++i) {
-    package_dir_ = package_dir_ + "/" + NSx[i] + "/";
-    MKDIR(package_dir_.c_str());
-  }
-
-  // Prepare output file for all the types in non-psr4 mode
-  if (!psr4_) {
-    // Make output file
-    string f_types_name = package_dir_ + "Types.php";
-    f_types_.open(f_types_name.c_str());
-    generate_program_header(f_types_);
-  }
-}
-
-/**
- * Prints standard php includes
- */
-string t_php_generator::php_includes() {
-  string includes = "use Thrift\\Base\\TBase;\n"
-                    "use Thrift\\Type\\TType;\n"
-                    "use Thrift\\Type\\TMessageType;\n"
-                    "use Thrift\\Exception\\TException;\n"
-                    "use Thrift\\Exception\\TProtocolException;\n"
-                    "use Thrift\\Protocol\\TProtocol;\n"
-                    "use Thrift\\Protocol\\TBinaryProtocolAccelerated;\n"
-                    "use Thrift\\Exception\\TApplicationException;\n";
-
-  if (json_serializable_) {
-    includes += "use JsonSerializable;\n"
-                "use stdClass;\n";
-  }
-
-  return includes + "\n";
-}
-
-/**
- * Close up (or down) some filez.
- */
-void t_php_generator::close_generator() {
-  if (!psr4_) {
-    // Close types file
-    f_types_ << endl;
-    f_types_.close();
-  }
-}
-
-/**
- * Generates a typedef. This is not done in PHP, types are all implicit.
- *
- * @param ttypedef The type definition
- */
-void t_php_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Generates service header contains namespace suffix and includes inside file specified
- */
-void t_php_generator::generate_service_header(t_service* tservice, std::ofstream& file) {
-  file << "<?php" << endl;
-  if (!php_namespace_suffix(tservice->get_program()).empty()) {
-    file << "namespace " << php_namespace_suffix(tservice->get_program()) << ";" << endl;
-  }
-  file << autogen_comment() << php_includes();
-
-  file << endl;
-}
-
-/**
- * Generates program header contains namespace suffix and includes inside file specified
- */
-void t_php_generator::generate_program_header(std::ofstream& file) {
-  file << "<?php" << endl;
-  if (!php_namespace_suffix(get_program()).empty()) {
-    file << "namespace " << php_namespace_suffix(get_program()) << ";" << endl << endl;
-  }
-  file << autogen_comment() << php_includes();
-
-  file << endl;
-}
-
-/**
- * Generates code for an enumerated type. Since define is expensive to lookup
- * in PHP, we use a global array for this.
- *
- * @param tenum The enumeration
- */
-void t_php_generator::generate_enum(t_enum* tenum) {
-  std::ofstream& f_enum = f_types_;
-  if (psr4_) {
-    string f_enum_name = package_dir_ + tenum->get_name() + ".php";
-    f_enum.open(f_enum_name.c_str());
-    generate_program_header(f_enum);
-  }
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-
-  // We're also doing it this way to see how it performs. It's more legible
-  // code but you can't do things like an 'extract' on it, which is a bit of
-  // a downer.
-  generate_php_doc(f_enum, tenum);
-  f_enum << "final class " << tenum->get_name() << " {" << endl;
-  indent_up();
-
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    generate_php_doc(f_enum, *c_iter);
-    indent(f_enum) << "const " << (*c_iter)->get_name() << " = " << value << ";" << endl;
-  }
-
-  indent(f_enum) << "static public $__names = array(" << endl;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    indent(f_enum) << "  " << value << " => '" << (*c_iter)->get_name() << "'," << endl;
-  }
-  indent(f_enum) << ");" << endl;
-
-  indent_down();
-
-  f_enum << "}" << endl << endl;
-  if (psr4_) {
-    f_enum.close();
-  }
-}
-
-/**
- * Generate constant class
- *
- * Override the one from t_generator
- */
-void t_php_generator::generate_consts(vector<t_const*> consts) {
-  vector<t_const*>::iterator c_iter;
-
-  // Create class only if needed
-  if (consts.size() > 0) {
-
-    std::ofstream& f_consts = f_types_;
-    if (psr4_) {
-      string f_consts_name = package_dir_ + "Constant.php";
-      f_consts.open(f_consts_name.c_str());
-      generate_program_header(f_consts);
-    }
-    f_consts << "final class Constant extends \\Thrift\\Type\\TConstant {" << endl;
-
-    indent_up();
-
-    // Create static property
-    for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-      string name = (*c_iter)->get_name();
-
-      indent(f_consts) << "static protected $" << name << ";" << endl;
-    }
-
-    // Create init function
-    for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-      string name = (*c_iter)->get_name();
-
-      f_consts << endl;
-
-      indent(f_consts) << "static protected function init_" << name << "() {" << endl;
-      indent_up();
-
-      indent(f_consts) << "return ";
-      generate_php_doc(f_consts, *c_iter);
-      f_consts << render_const_value((*c_iter)->get_type(), (*c_iter)->get_value());
-      f_consts << ";" << endl;
-
-      indent_down();
-      indent(f_consts) << "}" << endl;
-    }
-
-    indent_down();
-    f_consts << "}" << endl << endl;
-    if (psr4_) {
-      f_consts.close();
-    }
-  }
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_php_generator::render_const_value(t_type* type, t_const_value* value) {
-  std::ostringstream out;
-  type = get_true_type(type);
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    indent(out) << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    out << "new " << php_namespace(type->get_program()) << type->get_name() << "(array(" << endl;
-    indent_up();
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      out << indent();
-      out << render_const_value(g_type_string, v_iter->first);
-      out << " => ";
-      out << render_const_value(field_type, v_iter->second);
-      out << "," << endl;
-    }
-    indent_down();
-    indent(out) << "))";
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    out << "array(" << endl;
-    indent_up();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << indent();
-      out << render_const_value(ktype, v_iter->first);
-      out << " => ";
-      out << render_const_value(vtype, v_iter->second);
-      out << "," << endl;
-    }
-    indent_down();
-    indent(out) << ")";
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    out << "array(" << endl;
-    indent_up();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << indent();
-      out << render_const_value(etype, *v_iter);
-      if (type->is_set()) {
-        out << " => true";
-      }
-      out << "," << endl;
-    }
-    indent_down();
-    indent(out) << ")";
-  }
-  return out.str();
-}
-
-/**
- * Make a struct
- */
-void t_php_generator::generate_struct(t_struct* tstruct) {
-  generate_php_struct(tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct but extends the Exception class.
- *
- * @param txception The struct definition
- */
-void t_php_generator::generate_xception(t_struct* txception) {
-  generate_php_struct(txception, true);
-}
-
-/**
- * Structs can be normal or exceptions.
- */
-void t_php_generator::generate_php_struct(t_struct* tstruct, bool is_exception) {
-  std::ofstream& f_struct = f_types_;
-  if (psr4_) {
-    string f_struct_name = package_dir_ + tstruct->get_name() + ".php";
-    f_struct.open(f_struct_name.c_str());
-    generate_program_header(f_struct);
-  }
-  generate_php_struct_definition(f_struct, tstruct, is_exception);
-  if (psr4_) {
-    f_struct.close();
-  }
-}
-
-void t_php_generator::generate_php_type_spec(ofstream& out, t_type* t) {
-  t = get_true_type(t);
-  indent(out) << "'type' => " << type_to_enum(t) << "," << endl;
-
-  if (t->is_base_type() || t->is_enum()) {
-    // Noop, type is all we need
-  } else if (t->is_struct() || t->is_xception()) {
-    indent(out) << "'class' => '" << php_namespace(t->get_program()) << t->get_name() << "',"
-                << endl;
-  } else if (t->is_map()) {
-    t_type* ktype = get_true_type(((t_map*)t)->get_key_type());
-    t_type* vtype = get_true_type(((t_map*)t)->get_val_type());
-    indent(out) << "'ktype' => " << type_to_enum(ktype) << "," << endl;
-    indent(out) << "'vtype' => " << type_to_enum(vtype) << "," << endl;
-    indent(out) << "'key' => array(" << endl;
-    indent_up();
-    generate_php_type_spec(out, ktype);
-    indent_down();
-    indent(out) << ")," << endl;
-    indent(out) << "'val' => array(" << endl;
-    indent_up();
-    generate_php_type_spec(out, vtype);
-    indent(out) << ")," << endl;
-    indent_down();
-  } else if (t->is_list() || t->is_set()) {
-    t_type* etype;
-    if (t->is_list()) {
-      etype = get_true_type(((t_list*)t)->get_elem_type());
-    } else {
-      etype = get_true_type(((t_set*)t)->get_elem_type());
-    }
-    indent(out) << "'etype' => " << type_to_enum(etype) << "," << endl;
-    indent(out) << "'elem' => array(" << endl;
-    indent_up();
-    generate_php_type_spec(out, etype);
-    indent(out) << ")," << endl;
-    indent_down();
-  } else {
-    throw "compiler error: no type for php struct spec field";
-  }
-}
-
-/**
- * Generates the struct specification structure, which fully qualifies enough
- * type information to generalize serialization routines.
- */
-void t_php_generator::generate_php_struct_spec(ofstream& out, t_struct* tstruct) {
-  indent(out) << "if (!isset(self::$_TSPEC)) {" << endl;
-  indent_up();
-
-  indent(out) << "self::$_TSPEC = array(" << endl;
-  indent_up();
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    t_type* t = get_true_type((*m_iter)->get_type());
-    indent(out) << (*m_iter)->get_key() << " => array(" << endl;
-    indent_up();
-    out << indent() << "'var' => '" << (*m_iter)->get_name() << "'," << endl;
-    generate_php_type_spec(out, t);
-    indent(out) << ")," << endl;
-    indent_down();
-  }
-
-  indent_down();
-  indent(out) << "  );" << endl;
-  indent_down();
-  indent(out) << "}" << endl;
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is nothing in PHP
- * where the objects are all just associative arrays (unless of course we
- * decide to start using objects for them...)
- *
- * @param tstruct The struct definition
- */
-void t_php_generator::generate_php_struct_definition(ofstream& out,
-                                                     t_struct* tstruct,
-                                                     bool is_exception,
-                                                     bool is_result) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  generate_php_doc(out, tstruct);
-  out << "class " << php_namespace_declaration(tstruct);
-  if (is_exception) {
-    out << " extends "
-        << "TException";
-  } else if (oop_) {
-    out << " extends "
-        << "TBase";
-  }
-  if (json_serializable_) {
-    out << " implements JsonSerializable";
-  }
-  out << " {" << endl;
-  indent_up();
-
-  indent(out) << "static $_TSPEC;" << endl << endl;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    string dval = "null";
-    t_type* t = get_true_type((*m_iter)->get_type());
-    if ((*m_iter)->get_value() != NULL && !(t->is_struct() || t->is_xception())) {
-      dval = render_const_value((*m_iter)->get_type(), (*m_iter)->get_value());
-    }
-    generate_php_doc(out, *m_iter);
-    indent(out) << "public $" << (*m_iter)->get_name() << " = " << dval << ";" << endl;
-  }
-
-  out << endl;
-
-  // Generate constructor from array
-  string param = (members.size() > 0) ? "$vals=null" : "";
-  out << indent() << "public function __construct(" << param << ") {" << endl;
-  indent_up();
-
-  generate_php_struct_spec(out, tstruct);
-
-  if (members.size() > 0) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_type* t = get_true_type((*m_iter)->get_type());
-      if ((*m_iter)->get_value() != NULL && (t->is_struct() || t->is_xception())) {
-        indent(out) << "$this->" << (*m_iter)->get_name() << " = "
-                    << render_const_value(t, (*m_iter)->get_value()) << ";" << endl;
-      }
-    }
-    out << indent() << "if (is_array($vals)) {" << endl;
-    indent_up();
-    if (oop_) {
-      out << indent() << "parent::__construct(self::$_TSPEC, $vals);" << endl;
-    } else {
-      for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-        out << indent() << "if (isset($vals['" << (*m_iter)->get_name() << "'])) {" << endl
-            << indent() << "  $this->" << (*m_iter)->get_name() << " = $vals['"
-            << (*m_iter)->get_name() << "'];" << endl << indent() << "}" << endl;
-      }
-    }
-    indent_down();
-    out << indent() << "}" << endl;
-  }
-  scope_down(out);
-  out << endl;
-
-  out << indent() << "public function getName() {" << endl << indent() << "  return '"
-      << tstruct->get_name() << "';" << endl << indent() << "}" << endl << endl;
-
-  generate_php_struct_reader(out, tstruct, is_result);
-  generate_php_struct_writer(out, tstruct, is_result);
-  if (needs_php_read_validator(tstruct, is_result)) {
-    generate_php_struct_read_validator(out, tstruct);
-  }
-  if (needs_php_write_validator(tstruct, is_result)) {
-    generate_php_struct_write_validator(out, tstruct);
-  }
-  if (json_serializable_) {
-    generate_php_struct_json_serialize(out, tstruct, is_result);
-  }
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates the read() method for a struct
- */
-void t_php_generator::generate_php_struct_reader(ofstream& out, t_struct* tstruct, bool is_result) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "public function read($input)" << endl;
-  scope_up(out);
-
-  if (oop_) {
-    if (needs_php_read_validator(tstruct, is_result)) {
-      indent(out) << "$tmp = $this->_read('" << tstruct->get_name() << "', self::$_TSPEC, $input);"
-                  << endl;
-      indent(out) << "$this->_validateForRead();" << endl;
-      indent(out) << "return $tmp;" << endl;
-    } else {
-      indent(out) << "return $this->_read('" << tstruct->get_name() << "', self::$_TSPEC, $input);"
-                  << endl;
-    }
-    scope_down(out);
-    out << endl;
-    return;
-  }
-
-  out << indent() << "$xfer = 0;" << endl << indent() << "$fname = null;" << endl << indent()
-      << "$ftype = 0;" << endl << indent() << "$fid = 0;" << endl;
-
-  // Declare stack tmp variables
-  if (!binary_inline_) {
-    indent(out) << "$xfer += $input->readStructBegin($fname);" << endl;
-  }
-
-  // Loop over reading in fields
-  indent(out) << "while (true)" << endl;
-
-  scope_up(out);
-
-  // Read beginning field marker
-  if (binary_inline_) {
-    t_field fftype(g_type_i8, "ftype");
-    t_field ffid(g_type_i16, "fid");
-    generate_deserialize_field(out, &fftype);
-    out << indent() << "if ($ftype == "
-        << "TType::STOP) {" << endl << indent() << "  break;" << endl << indent() << "}" << endl;
-    generate_deserialize_field(out, &ffid);
-  } else {
-    indent(out) << "$xfer += $input->readFieldBegin($fname, $ftype, $fid);" << endl;
-    // Check for field STOP marker and break
-    indent(out) << "if ($ftype == "
-                << "TType::STOP) {" << endl;
-    indent_up();
-    indent(out) << "break;" << endl;
-    indent_down();
-    indent(out) << "}" << endl;
-  }
-
-  // Switch statement on the field we are reading
-  indent(out) << "switch ($fid)" << endl;
-
-  scope_up(out);
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    indent(out) << "case " << (*f_iter)->get_key() << ":" << endl;
-    indent_up();
-    indent(out) << "if ($ftype == " << type_to_enum((*f_iter)->get_type()) << ") {" << endl;
-    indent_up();
-    generate_deserialize_field(out, *f_iter, "this->");
-    indent_down();
-    out << indent() << "} else {" << endl;
-    if (binary_inline_) {
-      indent(out) << "  $xfer += "
-                  << "TProtocol::skipBinary($input, $ftype);" << endl;
-    } else {
-      indent(out) << "  $xfer += $input->skip($ftype);" << endl;
-    }
-    out << indent() << "}" << endl << indent() << "break;" << endl;
-    indent_down();
-  }
-
-  // In the default case we skip the field
-  indent(out) << "default:" << endl;
-  if (binary_inline_) {
-    indent(out) << "  $xfer += "
-                << "TProtocol::skipBinary($input, $ftype);" << endl;
-  } else {
-    indent(out) << "  $xfer += $input->skip($ftype);" << endl;
-  }
-  indent(out) << "  break;" << endl;
-
-  scope_down(out);
-
-  if (!binary_inline_) {
-    // Read field end marker
-    indent(out) << "$xfer += $input->readFieldEnd();" << endl;
-  }
-
-  scope_down(out);
-
-  if (!binary_inline_) {
-    indent(out) << "$xfer += $input->readStructEnd();" << endl;
-  }
-
-  if (needs_php_read_validator(tstruct, is_result)) {
-    indent(out) << "$this->_validateForRead();" << endl;
-  }
-
-  indent(out) << "return $xfer;" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-/**
- * Generates the write() method for a struct
- */
-void t_php_generator::generate_php_struct_writer(ofstream& out, t_struct* tstruct, bool is_result) {
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  if (binary_inline_) {
-    indent(out) << "public function write(&$output) {" << endl;
-  } else {
-    indent(out) << "public function write($output) {" << endl;
-  }
-  indent_up();
-
-  if (needs_php_write_validator(tstruct, is_result)) {
-    indent(out) << "$this->_validateForWrite();" << endl;
-  }
-
-  if (oop_) {
-    indent(out) << "return $this->_write('" << tstruct->get_name() << "', self::$_TSPEC, $output);"
-                << endl;
-    scope_down(out);
-    out << endl;
-    return;
-  }
-
-  indent(out) << "$xfer = 0;" << endl;
-
-  if (!binary_inline_) {
-    indent(out) << "$xfer += $output->writeStructBegin('" << name << "');" << endl;
-  }
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    out << indent() << "if ($this->" << (*f_iter)->get_name() << " !== null) {" << endl;
-    indent_up();
-
-    t_type* type = get_true_type((*f_iter)->get_type());
-    string expect;
-    if (type->is_container()) {
-      expect = "array";
-    } else if (type->is_struct()) {
-      expect = "object";
-    }
-    if (!expect.empty()) {
-      out << indent() << "if (!is_" << expect << "($this->" << (*f_iter)->get_name() << ")) {"
-          << endl;
-      indent_up();
-      out << indent() << "throw new "
-          << "TProtocolException('Bad type in structure.', "
-          << "TProtocolException::INVALID_DATA);" << endl;
-      scope_down(out);
-    }
-
-    // Write field header
-    if (binary_inline_) {
-      out << indent() << "$output .= pack('c', " << type_to_enum((*f_iter)->get_type()) << ");"
-          << endl << indent() << "$output .= pack('n', " << (*f_iter)->get_key() << ");" << endl;
-    } else {
-      indent(out) << "$xfer += $output->writeFieldBegin("
-                  << "'" << (*f_iter)->get_name() << "', " << type_to_enum((*f_iter)->get_type())
-                  << ", " << (*f_iter)->get_key() << ");" << endl;
-    }
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "this->");
-
-    // Write field closer
-    if (!binary_inline_) {
-      indent(out) << "$xfer += $output->writeFieldEnd();" << endl;
-    }
-
-    indent_down();
-    indent(out) << "}" << endl;
-  }
-
-  if (binary_inline_) {
-    out << indent() << "$output .= pack('c', "
-        << "TType::STOP);" << endl;
-  } else {
-    out << indent() << "$xfer += $output->writeFieldStop();" << endl << indent()
-        << "$xfer += $output->writeStructEnd();" << endl;
-  }
-
-  out << indent() << "return $xfer;" << endl;
-
-  indent_down();
-  out << indent() << "}" << endl << endl;
-}
-
-void t_php_generator::generate_php_struct_read_validator(ofstream& out, t_struct* tstruct) {
-  generate_php_struct_required_validator(out, tstruct, "_validateForRead", false);
-}
-
-void t_php_generator::generate_php_struct_write_validator(ofstream& out, t_struct* tstruct) {
-  generate_php_struct_required_validator(out, tstruct, "_validateForWrite", true);
-}
-
-void t_php_generator::generate_php_struct_required_validator(ofstream& out,
-                                                             t_struct* tstruct,
-                                                             std::string method_name,
-                                                             bool write_mode) {
-  indent(out) << "private function " << method_name << "() {" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-
-  if (fields.size() > 0) {
-    vector<t_field*>::const_iterator f_iter;
-
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      t_field* field = (*f_iter);
-      if (field->get_req() == t_field::T_REQUIRED
-          || (field->get_req() == t_field::T_OPT_IN_REQ_OUT && write_mode)) {
-        indent(out) << "if ($this->" << field->get_name() << " === null) {" << endl;
-        indent_up();
-        indent(out) << "throw new TProtocolException('Required field " << tstruct->get_name() << "."
-                    << field->get_name() << " is unset!');" << endl;
-        indent_down();
-        indent(out) << "}" << endl;
-      }
-    }
-  }
-
-  indent_down();
-  indent(out) << "}" << endl << endl;
-}
-
-void t_php_generator::generate_php_struct_json_serialize(ofstream& out,
-                                                         t_struct* tstruct,
-                                                         bool is_result) {
-  indent(out) << "public function jsonSerialize() {" << endl;
-  indent_up();
-
-  if (needs_php_write_validator(tstruct, is_result)) {
-    indent(out) << "$this->_validateForWrite();" << endl;
-  }
-
-  indent(out) << "$json = new stdClass;" << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-
-  if (fields.size() > 0) {
-    vector<t_field*>::const_iterator f_iter;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      t_field* field = (*f_iter);
-      t_type* type = field->get_type();
-      const string& name = field->get_name();
-      if (type->is_map()) {
-        t_type* key_type = ((t_map*)type)->get_key_type();
-        if (!(key_type->is_base_type() || key_type->is_enum())) {
-          // JSON object keys must be strings. PHP's json_encode()
-          // function will convert any scalar key to strings, but
-          // we skip thrift maps with non-scalar keys.
-          continue;
-        }
-      }
-      indent(out) << "if ($this->" << name << " !== null) {" << endl;
-      indent_up();
-      indent(out) << "$json->" << name << " = ";
-      if (type->is_map()) {
-        out << "(object)";
-      } else {
-        out << type_to_cast(type);
-      }
-      out << "$this->" << name << ";" << endl;
-      indent_down();
-      indent(out) << "}" << endl;
-    }
-  }
-
-  indent(out) << "return $json;" << endl;
-  indent_down();
-
-  indent(out) << "}" << endl << endl;
-}
-
-int t_php_generator::get_php_num_required_fields(const vector<t_field*>& fields, bool write_mode) {
-  int num_req = 0;
-
-  if (fields.size() > 0) {
-    vector<t_field*>::const_iterator f_iter;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if ((*f_iter)->get_req() == t_field::T_REQUIRED
-          || ((*f_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT && write_mode)) {
-        ++num_req;
-      }
-    }
-  }
-  return num_req;
-}
-
-bool t_php_generator::needs_php_write_validator(t_struct* tstruct, bool is_result) {
-  return (validate_ && !is_result && !tstruct->is_union()
-          && get_php_num_required_fields(tstruct->get_members(), true) > 0);
-}
-
-bool t_php_generator::needs_php_read_validator(t_struct* tstruct, bool is_result) {
-  return (validate_ && !is_result
-          && (get_php_num_required_fields(tstruct->get_members(), false) > 0));
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_php_generator::generate_service(t_service* tservice) {
-  if(!psr4_) {
-    string f_service_name = package_dir_ + service_name_ + ".php";
-    f_service_.open(f_service_name.c_str());
-    generate_service_header(tservice, f_service_);
-  }
-
-  // Generate the three main parts of the service (well, two for now in PHP)
-  generate_service_interface(tservice);
-  if (rest_) {
-    generate_service_rest(tservice);
-  }
-  generate_service_client(tservice);
-  generate_service_helpers(tservice);
-  if (phps_) {
-    generate_service_processor(tservice);
-  }
-
-  if(!psr4_) {
-    // Close service file
-    f_service_ << endl;
-    f_service_.close();
-  }
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_php_generator::generate_service_processor(t_service* tservice) {
-  std::ofstream& f_service_processor = f_service_;
-  if (psr4_) {
-    string f_service_processor_name = package_dir_ + service_name_ + "Processor.php";
-    f_service_processor.open(f_service_processor_name.c_str());
-    generate_service_header(tservice, f_service_processor);
-  }
-
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = tservice->get_extends()->get_name();
-    extends_processor = " extends " + php_namespace(tservice->get_extends()->get_program())
-                        + extends + "Processor";
-  }
-
-  // Generate the header portion
-  f_service_processor << "class " << service_name_ << "Processor" << extends_processor << " {" << endl;
-  indent_up();
-
-  if (extends.empty()) {
-    f_service_processor << indent() << "protected $handler_ = null;" << endl;
-  }
-
-  f_service_processor << indent() << "public function __construct($handler) {" << endl;
-  if (extends.empty()) {
-    f_service_processor << indent() << "  $this->handler_ = $handler;" << endl;
-  } else {
-    f_service_processor << indent() << "  parent::__construct($handler);" << endl;
-  }
-  f_service_processor << indent() << "}" << endl << endl;
-
-  // Generate the server implementation
-  indent(f_service_processor) << "public function process($input, $output) {" << endl;
-  indent_up();
-
-  f_service_processor << indent() << "$rseqid = 0;" << endl << indent() << "$fname = null;" << endl
-                      << indent() << "$mtype = 0;" << endl << endl;
-
-  if (binary_inline_) {
-    t_field ffname(g_type_string, "fname");
-    t_field fmtype(g_type_i8, "mtype");
-    t_field fseqid(g_type_i32, "rseqid");
-    generate_deserialize_field(f_service_processor, &ffname, "", true);
-    generate_deserialize_field(f_service_processor, &fmtype, "", true);
-    generate_deserialize_field(f_service_processor, &fseqid, "", true);
-  } else {
-    f_service_processor << indent() << "$input->readMessageBegin($fname, $mtype, $rseqid);" << endl;
-  }
-
-  // HOT: check for method implementation
-  f_service_processor << indent() << "$methodname = 'process_'.$fname;" << endl << indent()
-                      << "if (!method_exists($this, $methodname)) {" << endl;
-  if (binary_inline_) {
-    f_service_processor << indent() << "  throw new \\Exception('Function '.$fname.' not implemented.');"
-                        << endl;
-  } else {
-    f_service_processor << indent() << "  $input->skip("
-                        << "TType::STRUCT);" << endl << indent() << "  $input->readMessageEnd();" << endl
-                        << indent() << "  $x = new "
-                        << "TApplicationException('Function '.$fname.' not implemented.', "
-                        << "TApplicationException::UNKNOWN_METHOD);" << endl << indent()
-                        << "  $output->writeMessageBegin($fname, "
-                        << "TMessageType::EXCEPTION, $rseqid);" << endl << indent()
-                        << "  $x->write($output);" << endl << indent() << "  $output->writeMessageEnd();"
-                        << endl << indent() << "  $output->getTransport()->flush();" << endl << indent()
-                        << "  return;" << endl;
-  }
-  f_service_processor << indent() << "}" << endl << indent()
-                      << "$this->$methodname($rseqid, $input, $output);" << endl << indent()
-                      << "return true;" << endl;
-  indent_down();
-  f_service_processor << indent() << "}" << endl << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(f_service_processor, tservice, *f_iter);
-  }
-
-  indent_down();
-  f_service_processor << "}" << endl;
-
-  if (psr4_) {
-    f_service_processor.close();
-  }
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_php_generator::generate_process_function(std::ofstream& out, t_service* tservice, t_function* tfunction) {
-  // Open function
-  indent(out) << "protected function process_" << tfunction->get_name()
-                     << "($seqid, $input, $output) {" << endl;
-  indent_up();
-
-  string argsname = php_namespace(tservice->get_program()) + service_name_ + "_"
-                    + tfunction->get_name() + "_args";
-  string resultname = php_namespace(tservice->get_program()) + service_name_ + "_"
-                      + tfunction->get_name() + "_result";
-
-  out << indent() << "$args = new " << argsname << "();" << endl << indent()
-             << "$args->read($input);" << endl;
-  if (!binary_inline_) {
-    out << indent() << "$input->readMessageEnd();" << endl;
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Declare result for non oneway function
-  if (!tfunction->is_oneway()) {
-    out << indent() << "$result = new " << resultname << "();" << endl;
-  }
-
-  // Try block for a function with exceptions
-  if (xceptions.size() > 0) {
-    out << indent() << "try {" << endl;
-    indent_up();
-  }
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << indent();
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    out << "$result->success = ";
-  }
-  out << "$this->handler_->" << tfunction->get_name() << "(";
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      out << ", ";
-    }
-    out << "$args->" << (*f_iter)->get_name();
-  }
-  out << ");" << endl;
-
-  if (!tfunction->is_oneway() && xceptions.size() > 0) {
-    indent_down();
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      out << indent() << "} catch ("
-                 << php_namespace(get_true_type((*x_iter)->get_type())->get_program())
-                 << (*x_iter)->get_type()->get_name() << " $" << (*x_iter)->get_name() << ") {"
-                 << endl;
-      if (!tfunction->is_oneway()) {
-        indent_up();
-        out << indent() << "$result->" << (*x_iter)->get_name() << " = $"
-                   << (*x_iter)->get_name() << ";" << endl;
-        indent_down();
-        out << indent();
-      }
-    }
-    out << "}" << endl;
-  }
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    out << indent() << "return;" << endl;
-    indent_down();
-    out << indent() << "}" << endl;
-    return;
-  }
-
-  out << indent() << "$bin_accel = ($output instanceof "
-             << "TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');"
-             << endl;
-
-  out << indent() << "if ($bin_accel)" << endl;
-  scope_up(out);
-
-  out << indent() << "thrift_protocol_write_binary($output, '" << tfunction->get_name()
-             << "', "
-             << "TMessageType::REPLY, $result, $seqid, $output->isStrictWrite());" << endl;
-
-  scope_down(out);
-  out << indent() << "else" << endl;
-  scope_up(out);
-
-  // Serialize the request header
-  if (binary_inline_) {
-    out << indent() << "$buff = pack('N', (0x80010000 | "
-        << "TMessageType::REPLY)); " << endl << indent() << "$buff .= pack('N', strlen('"
-        << tfunction->get_name() << "'));" << endl << indent() << "$buff .= '"
-        << tfunction->get_name() << "';" << endl << indent() << "$buff .= pack('N', $seqid);"
-        << endl << indent() << "$result->write($buff);" << endl << indent()
-        << "$output->write($buff);" << endl << indent() << "$output->flush();" << endl;
-  } else {
-    out << indent() << "$output->writeMessageBegin('" << tfunction->get_name() << "', "
-        << "TMessageType::REPLY, $seqid);" << endl << indent() << "$result->write($output);"
-        << endl << indent() << "$output->writeMessageEnd();" << endl << indent()
-        << "$output->getTransport()->flush();" << endl;
-  }
-
-  scope_down(out);
-
-  // Close function
-  indent_down();
-  out << indent() << "}" << endl;
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_php_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  std::ofstream& f_struct_definition = f_service_;
-  if (!psr4_) {
-    f_struct_definition << "// HELPER FUNCTIONS AND STRUCTURES" << endl << endl;
-  }
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    string name = ts->get_name();
-    ts->set_name(service_name_ + "_" + name);
-
-    if (psr4_) {
-      string f_struct_definition_name = package_dir_ + service_name_ + "_" + name + ".php";
-      f_struct_definition.open(f_struct_definition_name.c_str());
-      generate_service_header(tservice, f_struct_definition);
-    }
-
-    generate_php_struct_definition(f_struct_definition, ts);
-    if (psr4_) {
-      f_struct_definition.close();
-    }
-
-    generate_php_function_helpers(tservice, *f_iter);
-    ts->set_name(name);
-  }
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_php_generator::generate_php_function_helpers(t_service* tservice, t_function* tfunction) {
-  if (!tfunction->is_oneway()) {
-    t_struct result(program_, service_name_ + "_" + tfunction->get_name() + "_result");
-    t_field success(tfunction->get_returntype(), "success", 0);
-    if (!tfunction->get_returntype()->is_void()) {
-      result.append(&success);
-    }
-
-    t_struct* xs = tfunction->get_xceptions();
-    const vector<t_field*>& fields = xs->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      result.append(*f_iter);
-    }
-
-    std::ofstream& f_struct_helper = f_service_;
-    if (psr4_) {
-      string f_struct_helper_name = package_dir_ + result.get_name() + ".php";
-      f_struct_helper.open(f_struct_helper_name.c_str());
-      generate_service_header(tservice, f_struct_helper);
-    }
-    generate_php_struct_definition(f_struct_helper, &result, false, true);
-    if (psr4_) {
-      f_struct_helper.close();
-    }
-  }
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_php_generator::generate_service_interface(t_service* tservice) {
-  std::ofstream& f_service_interface = f_service_;
-  if (psr4_) {
-    string f_service_interface_name = package_dir_ + service_name_ + "If.php";
-    f_service_interface.open(f_service_interface_name.c_str());
-    generate_service_header(tservice, f_service_interface);
-  }
-
-  string extends = "";
-  string extends_if = "";
-  if (tservice->get_extends() != NULL) {
-    extends = " extends " + php_namespace(tservice->get_extends()->get_program())
-              + tservice->get_extends()->get_name();
-    extends_if = " extends " + php_namespace(tservice->get_extends()->get_program())
-                 + tservice->get_extends()->get_name() + "If";
-  }
-  generate_php_doc(f_service_interface, tservice);
-  f_service_interface << "interface " << php_namespace_declaration(tservice) << "If" << extends_if << " {"
-             << endl;
-  indent_up();
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_php_doc(f_service_interface, *f_iter);
-    indent(f_service_interface) << "public function " << function_signature(*f_iter) << ";" << endl;
-  }
-  indent_down();
-  f_service_interface << "}" << endl << endl;
-
-  // Close service interface file
-  f_service_interface << endl;
-  if (psr4_) {
-    f_service_interface.close();
-  }
-}
-
-/**
- * Generates a REST interface
- */
-void t_php_generator::generate_service_rest(t_service* tservice) {
-  std::ofstream& f_service_rest = f_service_;
-  if (psr4_) {
-    string f_service_rest_name = package_dir_ + service_name_ + "Rest.php";
-    f_service_rest.open(f_service_rest_name.c_str());
-    generate_service_header(tservice, f_service_rest);
-  }
-
-  string extends = "";
-  string extends_if = "";
-  if (tservice->get_extends() != NULL) {
-    extends = " extends " + php_namespace(tservice->get_extends()->get_program())
-              + tservice->get_extends()->get_name();
-    extends_if = " extends " + php_namespace(tservice->get_extends()->get_program())
-                 + tservice->get_extends()->get_name() + "Rest";
-  }
-  f_service_rest << "class " << service_name_ << "Rest" << extends_if << " {" << endl;
-  indent_up();
-
-  if (extends.empty()) {
-    f_service_rest << indent() << "protected $impl_;" << endl << endl;
-  }
-
-  f_service_rest << indent() << "public function __construct($impl) {" << endl << indent()
-             << "  $this->impl_ = $impl;" << endl << indent() << "}" << endl << endl;
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    indent(f_service_rest) << "public function " << (*f_iter)->get_name() << "($request) {" << endl;
-    indent_up();
-    const vector<t_field*>& args = (*f_iter)->get_arglist()->get_members();
-    vector<t_field*>::const_iterator a_iter;
-    for (a_iter = args.begin(); a_iter != args.end(); ++a_iter) {
-      t_type* atype = get_true_type((*a_iter)->get_type());
-      string cast = type_to_cast(atype);
-      string req = "$request['" + (*a_iter)->get_name() + "']";
-      if (atype->is_bool()) {
-        f_service_rest << indent() << "$" << (*a_iter)->get_name() << " = " << cast << "(!empty(" << req
-                   << ") && (" << req << " !== 'false'));" << endl;
-      } else {
-        f_service_rest << indent() << "$" << (*a_iter)->get_name() << " = isset(" << req << ") ? "
-                   << cast << req << " : null;" << endl;
-      }
-      if (atype->is_string() && ((t_base_type*)atype)->is_string_list()) {
-        f_service_rest << indent() << "$" << (*a_iter)->get_name() << " = explode(',', $"
-                       << (*a_iter)->get_name() << ");" << endl;
-      } else if (atype->is_map() || atype->is_list()) {
-        f_service_rest << indent() << "$" << (*a_iter)->get_name() << " = json_decode($"
-                       << (*a_iter)->get_name() << ", true);" << endl;
-      } else if (atype->is_set()) {
-        f_service_rest << indent() << "$" << (*a_iter)->get_name() << " = array_fill_keys(json_decode($"
-                       << (*a_iter)->get_name() << ", true), 1);" << endl;
-      } else if (atype->is_struct() || atype->is_xception()) {
-        f_service_rest << indent() << "if ($" << (*a_iter)->get_name() << " !== null) {" << endl
-                       << indent() << "  $" << (*a_iter)->get_name() << " = new "
-                       << php_namespace(atype->get_program()) << atype->get_name() << "(json_decode($"
-                       << (*a_iter)->get_name() << ", true));" << endl << indent() << "}" << endl;
-      }
-    }
-    f_service_rest << indent() << "return $this->impl_->" << (*f_iter)->get_name() << "("
-               << argument_list((*f_iter)->get_arglist(), false) << ");" << endl;
-    indent_down();
-    indent(f_service_rest) << "}" << endl << endl;
-  }
-  indent_down();
-  f_service_rest << "}" << endl << endl;
-
-  // Close service rest file
-  f_service_rest << endl;
-  if (psr4_) {
-    f_service_rest.close();
-  }
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_php_generator::generate_service_client(t_service* tservice) {
-  std::ofstream& f_service_client = f_service_;
-  if (psr4_) {
-    string f_service_client_name = package_dir_ + service_name_ + "Client.php";
-    f_service_client.open(f_service_client_name.c_str());
-    generate_service_header(tservice, f_service_client);
-  }
-
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = tservice->get_extends()->get_name();
-    extends_client = " extends " + php_namespace(tservice->get_extends()->get_program()) + extends
-                     + "Client";
-  }
-
-  f_service_client << "class " << php_namespace_declaration(tservice) << "Client" << extends_client
-             << " implements " << php_namespace(tservice->get_program()) << service_name_ << "If {"
-             << endl;
-  indent_up();
-
-  // Private members
-  if (extends.empty()) {
-    f_service_client << indent() << "protected $input_ = null;" << endl << indent()
-               << "protected $output_ = null;" << endl << endl;
-    f_service_client << indent() << "protected $seqid_ = 0;" << endl << endl;
-  }
-
-  // Constructor function
-  f_service_client << indent() << "public function __construct($input, $output=null) {" << endl;
-  if (!extends.empty()) {
-    f_service_client << indent() << "  parent::__construct($input, $output);" << endl;
-  } else {
-    f_service_client << indent() << "  $this->input_ = $input;" << endl << indent()
-               << "  $this->output_ = $output ? $output : $input;" << endl;
-  }
-  f_service_client << indent() << "}" << endl << endl;
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string funname = (*f_iter)->get_name();
-
-    // Open function
-    indent(f_service_client) << "public function " << function_signature(*f_iter) << endl;
-    scope_up(f_service_client);
-    indent(f_service_client) << "$this->send_" << funname << "(";
-
-    bool first = true;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_client << ", ";
-      }
-      f_service_client << "$" << (*fld_iter)->get_name();
-    }
-    f_service_client << ");" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_service_client << indent();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_client << "return ";
-      }
-      f_service_client << "$this->recv_" << funname << "();" << endl;
-    }
-    scope_down(f_service_client);
-    f_service_client << endl;
-
-    indent(f_service_client) << "public function send_" << function_signature(*f_iter) << endl;
-    scope_up(f_service_client);
-
-    std::string argsname = php_namespace(tservice->get_program()) + service_name_ + "_"
-                           + (*f_iter)->get_name() + "_args";
-
-    f_service_client << indent() << "$args = new " << argsname << "();" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_client << indent() << "$args->" << (*fld_iter)->get_name() << " = $"
-                 << (*fld_iter)->get_name() << ";" << endl;
-    }
-
-    f_service_client << indent() << "$bin_accel = ($this->output_ instanceof "
-               << "TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');"
-               << endl;
-
-    f_service_client << indent() << "if ($bin_accel)" << endl;
-    scope_up(f_service_client);
-
-    string messageType = (*f_iter)->is_oneway() ? "TMessageType::ONEWAY" : "TMessageType::CALL";
-
-    f_service_client << indent() << "thrift_protocol_write_binary($this->output_, '"
-               << (*f_iter)->get_name() << "', " << messageType
-               << ", $args, $this->seqid_, $this->output_->isStrictWrite());" << endl;
-
-    scope_down(f_service_client);
-    f_service_client << indent() << "else" << endl;
-    scope_up(f_service_client);
-
-    // Serialize the request header
-    if (binary_inline_) {
-      f_service_client << indent() << "$buff = pack('N', (0x80010000 | " << messageType << "));" << endl
-                       << indent() << "$buff .= pack('N', strlen('" << funname << "'));" << endl
-                       << indent() << "$buff .= '" << funname << "';" << endl << indent()
-                       << "$buff .= pack('N', $this->seqid_);" << endl;
-    } else {
-      f_service_client << indent() << "$this->output_->writeMessageBegin('" << (*f_iter)->get_name()
-                       << "', " << messageType << ", $this->seqid_);" << endl;
-    }
-
-    // Write to the stream
-    if (binary_inline_) {
-      f_service_client << indent() << "$args->write($buff);" << endl << indent()
-                       << "$this->output_->write($buff);" << endl << indent()
-                       << "$this->output_->flush();" << endl;
-    } else {
-      f_service_client << indent() << "$args->write($this->output_);" << endl << indent()
-                       << "$this->output_->writeMessageEnd();" << endl << indent()
-                       << "$this->output_->getTransport()->flush();" << endl;
-    }
-
-    scope_down(f_service_client);
-
-    scope_down(f_service_client);
-
-    if (!(*f_iter)->is_oneway()) {
-      std::string resultname = php_namespace(tservice->get_program()) + service_name_ + "_"
-                               + (*f_iter)->get_name() + "_result";
-      t_struct noargs(program_);
-
-      t_function recv_function((*f_iter)->get_returntype(),
-                               string("recv_") + (*f_iter)->get_name(),
-                               &noargs);
-      // Open function
-      f_service_client << endl << indent() << "public function " << function_signature(&recv_function)
-                       << endl;
-      scope_up(f_service_client);
-
-      f_service_client << indent() << "$bin_accel = ($this->input_ instanceof "
-                       << "TBinaryProtocolAccelerated)"
-                       << " && function_exists('thrift_protocol_read_binary');" << endl;
-
-      f_service_client << indent()
-                       << "if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '"
-                       << resultname << "', $this->input_->isStrictRead());" << endl;
-      f_service_client << indent() << "else" << endl;
-      scope_up(f_service_client);
-
-      f_service_client << indent() << "$rseqid = 0;" << endl << indent() << "$fname = null;" << endl
-                 << indent() << "$mtype = 0;" << endl << endl;
-
-      if (binary_inline_) {
-        t_field ffname(g_type_string, "fname");
-        t_field fseqid(g_type_i32, "rseqid");
-        f_service_client << indent() << "$ver = unpack('N', $this->input_->readAll(4));" << endl
-                         << indent() << "$ver = $ver[1];" << endl << indent() << "$mtype = $ver & 0xff;"
-                         << endl << indent() << "$ver = $ver & 0xffff0000;" << endl << indent()
-                         << "if ($ver != 0x80010000) throw new "
-                         << "TProtocolException('Bad version identifier: '.$ver, "
-                         << "TProtocolException::BAD_VERSION);" << endl;
-        generate_deserialize_field(f_service_client, &ffname, "", true);
-        generate_deserialize_field(f_service_client, &fseqid, "", true);
-      } else {
-        f_service_client << indent() << "$this->input_->readMessageBegin($fname, $mtype, $rseqid);"
-                         << endl << indent() << "if ($mtype == "
-                         << "TMessageType::EXCEPTION) {" << endl << indent() << "  $x = new "
-                         << "TApplicationException();" << endl << indent() << "  $x->read($this->input_);"
-                         << endl << indent() << "  $this->input_->readMessageEnd();" << endl << indent()
-                         << "  throw $x;" << endl << indent() << "}" << endl;
-      }
-
-      f_service_client << indent() << "$result = new " << resultname << "();" << endl << indent()
-                       << "$result->read($this->input_);" << endl;
-
-      if (!binary_inline_) {
-        f_service_client << indent() << "$this->input_->readMessageEnd();" << endl;
-      }
-
-      scope_down(f_service_client);
-
-      // Careful, only return result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_client << indent() << "if ($result->success !== null) {" << endl << indent()
-                   << "  return $result->success;" << endl << indent() << "}" << endl;
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_client << indent() << "if ($result->" << (*x_iter)->get_name() << " !== null) {" << endl
-                         << indent() << "  throw $result->" << (*x_iter)->get_name() << ";" << endl
-                         << indent() << "}" << endl;
-      }
-
-      // Careful, only return _result if not a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(f_service_client) << "return;" << endl;
-      } else {
-        f_service_client << indent() << "throw new \\Exception(\"" << (*f_iter)->get_name()
-                         << " failed: unknown result\");" << endl;
-      }
-
-      // Close function
-      scope_down(f_service_client);
-      f_service_client << endl;
-    }
-  }
-
-  indent_down();
-  f_service_client << "}" << endl << endl;
-
-  // Close service client file
-  f_service_client << endl;
-  if (psr4_) {
-    f_service_client.close();
-  }
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_php_generator::generate_deserialize_field(ofstream& out,
-                                                 t_field* tfield,
-                                                 string prefix,
-                                                 bool inclass) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name();
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else {
-
-    if (type->is_container()) {
-      generate_deserialize_container(out, type, name);
-    } else if (type->is_base_type() || type->is_enum()) {
-
-      if (binary_inline_) {
-        std::string itrans = (inclass ? "$this->input_" : "$input");
-
-        if (type->is_base_type()) {
-          t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-          switch (tbase) {
-          case t_base_type::TYPE_VOID:
-            throw "compiler error: cannot serialize void field in a struct: " + name;
-            break;
-          case t_base_type::TYPE_STRING:
-            out << indent() << "$len = unpack('N', " << itrans << "->readAll(4));" << endl
-                << indent() << "$len = $len[1];" << endl << indent() << "if ($len > 0x7fffffff) {"
-                << endl << indent() << "  $len = 0 - (($len - 1) ^ 0xffffffff);" << endl << indent()
-                << "}" << endl << indent() << "$" << name << " = " << itrans << "->readAll($len);"
-                << endl;
-            break;
-          case t_base_type::TYPE_BOOL:
-            out << indent() << "$" << name << " = unpack('c', " << itrans << "->readAll(1));"
-                << endl << indent() << "$" << name << " = (bool)$" << name << "[1];" << endl;
-            break;
-          case t_base_type::TYPE_I8:
-            out << indent() << "$" << name << " = unpack('c', " << itrans << "->readAll(1));"
-                << endl << indent() << "$" << name << " = $" << name << "[1];" << endl;
-            break;
-          case t_base_type::TYPE_I16:
-            out << indent() << "$val = unpack('n', " << itrans << "->readAll(2));" << endl
-                << indent() << "$val = $val[1];" << endl << indent() << "if ($val > 0x7fff) {"
-                << endl << indent() << "  $val = 0 - (($val - 1) ^ 0xffff);" << endl << indent()
-                << "}" << endl << indent() << "$" << name << " = $val;" << endl;
-            break;
-          case t_base_type::TYPE_I32:
-            out << indent() << "$val = unpack('N', " << itrans << "->readAll(4));" << endl
-                << indent() << "$val = $val[1];" << endl << indent() << "if ($val > 0x7fffffff) {"
-                << endl << indent() << "  $val = 0 - (($val - 1) ^ 0xffffffff);" << endl << indent()
-                << "}" << endl << indent() << "$" << name << " = $val;" << endl;
-            break;
-          case t_base_type::TYPE_I64:
-            out << indent() << "$arr = unpack('N2', " << itrans << "->readAll(8));" << endl
-                << indent() << "if ($arr[1] & 0x80000000) {" << endl << indent()
-                << "  $arr[1] = $arr[1] ^ 0xFFFFFFFF;" << endl << indent()
-                << "  $arr[2] = $arr[2] ^ 0xFFFFFFFF;" << endl << indent() << "  $" << name
-                << " = 0 - $arr[1]*4294967296 - $arr[2] - 1;" << endl << indent() << "} else {"
-                << endl << indent() << "  $" << name << " = $arr[1]*4294967296 + $arr[2];" << endl
-                << indent() << "}" << endl;
-            break;
-          case t_base_type::TYPE_DOUBLE:
-            out << indent() << "$arr = unpack('d', strrev(" << itrans << "->readAll(8)));" << endl
-                << indent() << "$" << name << " = $arr[1];" << endl;
-            break;
-          default:
-            throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase)
-                + tfield->get_name();
-          }
-        } else if (type->is_enum()) {
-          out << indent() << "$val = unpack('N', " << itrans << "->readAll(4));" << endl << indent()
-              << "$val = $val[1];" << endl << indent() << "if ($val > 0x7fffffff) {" << endl
-              << indent() << "  $val = 0 - (($val - 1) ^ 0xffffffff);" << endl << indent() << "}"
-              << endl << indent() << "$" << name << " = $val;" << endl;
-        }
-      } else {
-
-        indent(out) << "$xfer += $input->";
-
-        if (type->is_base_type()) {
-          t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-          switch (tbase) {
-          case t_base_type::TYPE_VOID:
-            throw "compiler error: cannot serialize void field in a struct: " + name;
-            break;
-          case t_base_type::TYPE_STRING:
-            out << "readString($" << name << ");";
-            break;
-          case t_base_type::TYPE_BOOL:
-            out << "readBool($" << name << ");";
-            break;
-          case t_base_type::TYPE_I8:
-            out << "readByte($" << name << ");";
-            break;
-          case t_base_type::TYPE_I16:
-            out << "readI16($" << name << ");";
-            break;
-          case t_base_type::TYPE_I32:
-            out << "readI32($" << name << ");";
-            break;
-          case t_base_type::TYPE_I64:
-            out << "readI64($" << name << ");";
-            break;
-          case t_base_type::TYPE_DOUBLE:
-            out << "readDouble($" << name << ");";
-            break;
-          default:
-            throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase);
-          }
-        } else if (type->is_enum()) {
-          out << "readI32($" << name << ");";
-        }
-        out << endl;
-      }
-    } else {
-      printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-             tfield->get_name().c_str(),
-             type->get_name().c_str());
-    }
-  }
-}
-
-/**
- * Generates an unserializer for a variable. This makes two key assumptions,
- * first that there is a const char* variable named data that points to the
- * buffer for deserialization, and that there is a variable protocol which
- * is a reference to a TProtocol serialization object.
- */
-void t_php_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  out << indent() << "$" << prefix << " = new " << php_namespace(tstruct->get_program())
-      << tstruct->get_name() << "();" << endl << indent() << "$xfer += $" << prefix
-      << "->read($input);" << endl;
-}
-
-void t_php_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
-  string size = tmp("_size");
-  string ktype = tmp("_ktype");
-  string vtype = tmp("_vtype");
-  string etype = tmp("_etype");
-
-  t_field fsize(g_type_i32, size);
-  t_field fktype(g_type_i8, ktype);
-  t_field fvtype(g_type_i8, vtype);
-  t_field fetype(g_type_i8, etype);
-
-  out << indent() << "$" << prefix << " = array();" << endl << indent() << "$" << size << " = 0;"
-      << endl;
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    out << indent() << "$" << ktype << " = 0;" << endl << indent() << "$" << vtype << " = 0;"
-        << endl;
-    if (binary_inline_) {
-      generate_deserialize_field(out, &fktype);
-      generate_deserialize_field(out, &fvtype);
-      generate_deserialize_field(out, &fsize);
-    } else {
-      out << indent() << "$xfer += $input->readMapBegin("
-          << "$" << ktype << ", $" << vtype << ", $" << size << ");" << endl;
-    }
-  } else if (ttype->is_set()) {
-    if (binary_inline_) {
-      generate_deserialize_field(out, &fetype);
-      generate_deserialize_field(out, &fsize);
-    } else {
-      out << indent() << "$" << etype << " = 0;" << endl << indent()
-          << "$xfer += $input->readSetBegin("
-          << "$" << etype << ", $" << size << ");" << endl;
-    }
-  } else if (ttype->is_list()) {
-    if (binary_inline_) {
-      generate_deserialize_field(out, &fetype);
-      generate_deserialize_field(out, &fsize);
-    } else {
-      out << indent() << "$" << etype << " = 0;" << endl << indent()
-          << "$xfer += $input->readListBegin("
-          << "$" << etype << ", $" << size << ");" << endl;
-    }
-  }
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) << "for ($" << i << " = 0; $" << i << " < $" << size << "; ++$" << i << ")" << endl;
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  scope_down(out);
-
-  if (!binary_inline_) {
-    // Read container end
-    if (ttype->is_map()) {
-      indent(out) << "$xfer += $input->readMapEnd();" << endl;
-    } else if (ttype->is_set()) {
-      indent(out) << "$xfer += $input->readSetEnd();" << endl;
-    } else if (ttype->is_list()) {
-      indent(out) << "$xfer += $input->readListEnd();" << endl;
-    }
-  }
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_php_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  string key = tmp("key");
-  string val = tmp("val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  indent(out) << declare_field(&fkey, true, true) << endl;
-  indent(out) << declare_field(&fval, true, true) << endl;
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << "$" << prefix << "[$" << key << "] = $" << val << ";" << endl;
-}
-
-void t_php_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  string elem = tmp("elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  indent(out) << "$" << elem << " = null;" << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << "if (is_scalar($" << elem << ")) {" << endl;
-  indent(out) << "  $" << prefix << "[$" << elem << "] = true;" << endl;
-  indent(out) << "} else {" << endl;
-  indent(out) << "  $" << prefix << " []= $" << elem << ";" << endl;
-  indent(out) << "}" << endl;
-}
-
-void t_php_generator::generate_deserialize_list_element(ofstream& out,
-                                                        t_list* tlist,
-                                                        string prefix) {
-  string elem = tmp("elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  indent(out) << "$" << elem << " = null;" << endl;
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << "$" << prefix << " []= $" << elem << ";" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_php_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + tfield->get_name());
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + tfield->get_name());
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    string name = prefix + tfield->get_name();
-
-    if (binary_inline_) {
-      if (type->is_base_type()) {
-        t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-        switch (tbase) {
-        case t_base_type::TYPE_VOID:
-          throw "compiler error: cannot serialize void field in a struct: " + name;
-          break;
-        case t_base_type::TYPE_STRING:
-          out << indent() << "$output .= pack('N', strlen($" << name << "));" << endl << indent()
-              << "$output .= $" << name << ";" << endl;
-          break;
-        case t_base_type::TYPE_BOOL:
-          out << indent() << "$output .= pack('c', $" << name << " ? 1 : 0);" << endl;
-          break;
-        case t_base_type::TYPE_I8:
-          out << indent() << "$output .= pack('c', $" << name << ");" << endl;
-          break;
-        case t_base_type::TYPE_I16:
-          out << indent() << "$output .= pack('n', $" << name << ");" << endl;
-          break;
-        case t_base_type::TYPE_I32:
-          out << indent() << "$output .= pack('N', $" << name << ");" << endl;
-          break;
-        case t_base_type::TYPE_I64:
-          out << indent() << "$output .= pack('N2', $" << name << " >> 32, $" << name
-              << " & 0xFFFFFFFF);" << endl;
-          break;
-        case t_base_type::TYPE_DOUBLE:
-          out << indent() << "$output .= strrev(pack('d', $" << name << "));" << endl;
-          break;
-        default:
-          throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase);
-        }
-      } else if (type->is_enum()) {
-        out << indent() << "$output .= pack('N', $" << name << ");" << endl;
-      }
-    } else {
-
-      indent(out) << "$xfer += $output->";
-
-      if (type->is_base_type()) {
-        t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-        switch (tbase) {
-        case t_base_type::TYPE_VOID:
-          throw "compiler error: cannot serialize void field in a struct: " + name;
-          break;
-        case t_base_type::TYPE_STRING:
-          out << "writeString($" << name << ");";
-          break;
-        case t_base_type::TYPE_BOOL:
-          out << "writeBool($" << name << ");";
-          break;
-        case t_base_type::TYPE_I8:
-          out << "writeByte($" << name << ");";
-          break;
-        case t_base_type::TYPE_I16:
-          out << "writeI16($" << name << ");";
-          break;
-        case t_base_type::TYPE_I32:
-          out << "writeI32($" << name << ");";
-          break;
-        case t_base_type::TYPE_I64:
-          out << "writeI64($" << name << ");";
-          break;
-        case t_base_type::TYPE_DOUBLE:
-          out << "writeDouble($" << name << ");";
-          break;
-        default:
-          throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase);
-        }
-      } else if (type->is_enum()) {
-        out << "writeI32($" << name << ");";
-      }
-      out << endl;
-    }
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_php_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  indent(out) << "$xfer += $" << prefix << "->write($output);" << endl;
-}
-
-/**
- * Writes out a container
- */
-void t_php_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    if (binary_inline_) {
-      out << indent() << "$output .= pack('c', " << type_to_enum(((t_map*)ttype)->get_key_type())
-          << ");" << endl << indent() << "$output .= pack('c', "
-          << type_to_enum(((t_map*)ttype)->get_val_type()) << ");" << endl << indent()
-          << "$output .= strrev(pack('l', count($" << prefix << ")));" << endl;
-    } else {
-      indent(out) << "$output->writeMapBegin(" << type_to_enum(((t_map*)ttype)->get_key_type())
-                  << ", " << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
-                  << "count($" << prefix << "));" << endl;
-    }
-  } else if (ttype->is_set()) {
-    if (binary_inline_) {
-      out << indent() << "$output .= pack('c', " << type_to_enum(((t_set*)ttype)->get_elem_type())
-          << ");" << endl << indent() << "$output .= strrev(pack('l', count($" << prefix << ")));"
-          << endl;
-
-    } else {
-      indent(out) << "$output->writeSetBegin(" << type_to_enum(((t_set*)ttype)->get_elem_type())
-                  << ", "
-                  << "count($" << prefix << "));" << endl;
-    }
-  } else if (ttype->is_list()) {
-    if (binary_inline_) {
-      out << indent() << "$output .= pack('c', " << type_to_enum(((t_list*)ttype)->get_elem_type())
-          << ");" << endl << indent() << "$output .= strrev(pack('l', count($" << prefix << ")));"
-          << endl;
-
-    } else {
-      indent(out) << "$output->writeListBegin(" << type_to_enum(((t_list*)ttype)->get_elem_type())
-                  << ", "
-                  << "count($" << prefix << "));" << endl;
-    }
-  }
-
-  scope_up(out);
-
-  if (ttype->is_map()) {
-    string kiter = tmp("kiter");
-    string viter = tmp("viter");
-    indent(out) << "foreach ($" << prefix << " as "
-                << "$" << kiter << " => $" << viter << ")" << endl;
-    scope_up(out);
-    generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
-    scope_down(out);
-  } else if (ttype->is_set()) {
-    string iter = tmp("iter");
-    string iter_val = tmp("iter");
-    indent(out) << "foreach ($" << prefix << " as $" << iter << " => $" << iter_val << ")" << endl;
-    scope_up(out);
-    indent(out) << "if (is_scalar($" << iter_val << ")) {" << endl;
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-    indent(out) << "} else {" << endl;
-    generate_serialize_set_element(out, (t_set*)ttype, iter_val);
-    indent(out) << "}" << endl;
-    scope_down(out);
-  } else if (ttype->is_list()) {
-    string iter = tmp("iter");
-    indent(out) << "foreach ($" << prefix << " as $" << iter << ")" << endl;
-    scope_up(out);
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-    scope_down(out);
-  }
-
-  scope_down(out);
-
-  if (!binary_inline_) {
-    if (ttype->is_map()) {
-      indent(out) << "$output->writeMapEnd();" << endl;
-    } else if (ttype->is_set()) {
-      indent(out) << "$output->writeSetEnd();" << endl;
-    } else if (ttype->is_list()) {
-      indent(out) << "$output->writeListEnd();" << endl;
-    }
-  }
-
-  scope_down(out);
-}
-
-/**
- * Serializes the members of a map.
- *
- */
-void t_php_generator::generate_serialize_map_element(ofstream& out,
-                                                     t_map* tmap,
-                                                     string kiter,
-                                                     string viter) {
-  t_field kfield(tmap->get_key_type(), kiter);
-  generate_serialize_field(out, &kfield, "");
-
-  t_field vfield(tmap->get_val_type(), viter);
-  generate_serialize_field(out, &vfield, "");
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_php_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_php_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Emits a PHPDoc comment for the given contents
- */
-void t_php_generator::generate_php_docstring_comment(ofstream& out, string contents) {
-  generate_docstring_comment(out, "/**\n", " * ", contents, " */\n");
-}
-
-/**
- * Emits a PHPDoc comment if the provided object has a doc in Thrift
- */
-void t_php_generator::generate_php_doc(ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    generate_php_docstring_comment(out, tdoc->get_doc());
-  }
-}
-
-/**
- * Emits a PHPDoc comment for a field
- */
-void t_php_generator::generate_php_doc(ofstream& out, t_field* field) {
-  stringstream ss;
-
-  // prepend free-style doc if available
-  if (field->has_doc()) {
-    ss << field->get_doc() << endl;
-  }
-
-  // append @var tag
-  t_type* type = get_true_type(field->get_type());
-  ss << "@var " << type_to_phpdoc(type) << endl;
-
-  generate_php_docstring_comment(out, ss.str());
-}
-
-/**
- * Emits a PHPDoc comment for a function
- */
-void t_php_generator::generate_php_doc(ofstream& out, t_function* function) {
-  stringstream ss;
-  if (function->has_doc()) {
-    ss << function->get_doc() << endl;
-  }
-
-  // generate parameter types doc
-  const vector<t_field*>& args = function->get_arglist()->get_members();
-  vector<t_field*>::const_iterator a_iter;
-  for (a_iter = args.begin(); a_iter != args.end(); ++a_iter) {
-    t_field* arg = *a_iter;
-    ss << "@param " << type_to_phpdoc(arg->get_type()) << " $" << arg->get_name();
-    if (arg->has_doc()) {
-      ss << " " << arg->get_doc();
-    }
-    ss << endl;
-  }
-
-  // generate return type doc
-  t_type* ret_type = function->get_returntype();
-  if (!ret_type->is_void() || ret_type->has_doc()) {
-    ss << "@return " << type_to_phpdoc(ret_type);
-    if (ret_type->has_doc()) {
-      ss << " " << ret_type->get_doc();
-    }
-    ss << endl;
-  }
-
-  // generate exceptions doc
-  const vector<t_field*>& excs = function->get_xceptions()->get_members();
-  vector<t_field*>::const_iterator e_iter;
-  for (e_iter = excs.begin(); e_iter != excs.end(); ++e_iter) {
-    t_field* exc = *e_iter;
-    ss << "@throws " << type_to_phpdoc(exc->get_type());
-    if (exc->has_doc()) {
-      ss << " " << exc->get_doc();
-    }
-    ss << endl;
-  }
-
-  generate_docstring_comment(out, "/**\n", " * ", ss.str(), " */\n");
-}
-
-/**
- * Declares a field, which may include initialization as necessary.
- *
- * @param ttype The type
- */
-string t_php_generator::declare_field(t_field* tfield, bool init, bool obj) {
-  string result = "$" + tfield->get_name();
-  if (init) {
-    t_type* type = get_true_type(tfield->get_type());
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        break;
-      case t_base_type::TYPE_STRING:
-        result += " = ''";
-        break;
-      case t_base_type::TYPE_BOOL:
-        result += " = false";
-        break;
-      case t_base_type::TYPE_I8:
-      case t_base_type::TYPE_I16:
-      case t_base_type::TYPE_I32:
-      case t_base_type::TYPE_I64:
-        result += " = 0";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        result += " = 0.0";
-        break;
-      default:
-        throw "compiler error: no PHP initializer for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      result += " = 0";
-    } else if (type->is_container()) {
-      result += " = array()";
-    } else if (type->is_struct() || type->is_xception()) {
-      if (obj) {
-        result += " = new " + php_namespace(type->get_program()) + type->get_name() + "()";
-      } else {
-        result += " = null";
-      }
-    }
-  }
-  return result + ";";
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_php_generator::function_signature(t_function* tfunction, string prefix) {
-  return prefix + tfunction->get_name() + "(" + argument_list(tfunction->get_arglist()) + ")";
-}
-
-/**
- * Renders a field list
- */
-string t_php_generator::argument_list(t_struct* tstruct, bool addTypeHints) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-
-    t_type* type = (*f_iter)->get_type();
-
-    // Set type name
-    if (addTypeHints) {
-      if (type->is_struct()) {
-        string className = php_namespace(type->get_program())
-                           + php_namespace_directory("Definition", false)
-                           + classify(type->get_name());
-
-        result += className + " ";
-      } else if (type->is_container()) {
-        result += "array ";
-      }
-    }
-
-    result += "$" + (*f_iter)->get_name();
-  }
-  return result;
-}
-
-/**
- * Gets a typecast string for a particular type.
- */
-string t_php_generator::type_to_cast(t_type* type) {
-  if (type->is_base_type()) {
-    t_base_type* btype = (t_base_type*)type;
-    switch (btype->get_base()) {
-    case t_base_type::TYPE_BOOL:
-      return "(bool)";
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      return "(int)";
-    case t_base_type::TYPE_DOUBLE:
-      return "(double)";
-    case t_base_type::TYPE_STRING:
-      return "(string)";
-    default:
-      return "";
-    }
-  } else if (type->is_enum()) {
-    return "(int)";
-  }
-  return "";
-}
-
-/**
- * Converts the parse type to a C++ enum string for the given type.
- */
-string t_php_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType::STRING";
-    case t_base_type::TYPE_BOOL:
-      return "TType::BOOL";
-    case t_base_type::TYPE_I8:
-      return "TType::BYTE";
-    case t_base_type::TYPE_I16:
-      return "TType::I16";
-    case t_base_type::TYPE_I32:
-      return "TType::I32";
-    case t_base_type::TYPE_I64:
-      return "TType::I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType::DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TType::I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType::STRUCT";
-  } else if (type->is_map()) {
-    return "TType::MAP";
-  } else if (type->is_set()) {
-    return "TType::SET";
-  } else if (type->is_list()) {
-    return "TType::LST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/**
- * Converts the parse type to a PHPDoc string for the given type.
- */
-string t_php_generator::type_to_phpdoc(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      return "void";
-    case t_base_type::TYPE_STRING:
-      return "string";
-    case t_base_type::TYPE_BOOL:
-      return "bool";
-    case t_base_type::TYPE_I8:
-      return "int";
-    case t_base_type::TYPE_I16:
-      return "int";
-    case t_base_type::TYPE_I32:
-      return "int";
-    case t_base_type::TYPE_I64:
-      return "int";
-    case t_base_type::TYPE_DOUBLE:
-      return "double";
-    }
-  } else if (type->is_enum()) {
-    return "int";
-  } else if (type->is_struct() || type->is_xception()) {
-    return php_namespace(type->get_program()) + type->get_name();
-  } else if (type->is_map()) {
-    return "array";
-  } else if (type->is_set()) {
-    t_set* tset = static_cast<t_set*>(type);
-    t_type* t_elem = tset->get_elem_type();
-    if (t_elem->is_container()) {
-      return "(" + type_to_phpdoc(t_elem) + ")[]";
-    } else {
-      return type_to_phpdoc(t_elem) + "[]";
-    }
-  } else if (type->is_list()) {
-    t_list* tlist = static_cast<t_list*>(type);
-    t_type* t_elem = tlist->get_elem_type();
-    if (t_elem->is_container()) {
-      return "(" + type_to_phpdoc(t_elem) + ")[]";
-    } else {
-      return type_to_phpdoc(t_elem) + "[]";
-    }
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(
-    php,
-    "PHP",
-    "    inlined:         Generate PHP inlined files\n"
-    "    server:          Generate PHP server stubs\n"
-    "    oop:             Generate PHP with object oriented subclasses\n"
-    "    psr4:            Generate each PHP class in separate file (allows PSR4 autoloading)\n"
-    "    rest:            Generate PHP REST processors\n"
-    "    nsglobal=NAME:   Set global namespace\n"
-    "    validate:        Generate PHP validator methods\n"
-    "    json:            Generate JsonSerializable classes (requires PHP >= 5.4)\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_py_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_py_generator.cc
deleted file mode 100644
index 1d11144..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_py_generator.cc
+++ /dev/null
@@ -1,2648 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sstream>
-#include <algorithm>
-#include "thrift/platform.h"
-#include "thrift/version.h"
-#include "thrift/generate/t_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Python code generator.
- *
- */
-class t_py_generator : public t_generator {
-public:
-  t_py_generator(t_program* program,
-                 const std::map<std::string, std::string>& parsed_options,
-                 const std::string& option_string)
-    : t_generator(program) {
-    std::map<std::string, std::string>::const_iterator iter;
-
-
-    gen_newstyle_ = true;
-    gen_utf8strings_ = true;
-    gen_dynbase_ = false;
-    gen_slots_ = false;
-    gen_tornado_ = false;
-    gen_twisted_ = false;
-    gen_dynamic_ = false;
-    coding_ = "";
-    gen_dynbaseclass_ = "";
-    gen_dynbaseclass_exc_ = "";
-    gen_dynbaseclass_frozen_ = "";
-    import_dynbase_ = "";
-    package_prefix_ = "";
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("new_style") == 0) {
-        pwarning(0, "new_style is enabled by default, so the option will be removed in the near future.\n");
-      } else if( iter->first.compare("old_style") == 0) {
-        gen_newstyle_ = false;
-        pwarning(0, "old_style is deprecated and may be removed in the future.\n");
-      } else if( iter->first.compare("utf8strings") == 0) {
-        pwarning(0, "utf8strings is enabled by default, so the option will be removed in the near future.\n");
-      } else if( iter->first.compare("no_utf8strings") == 0) {
-        gen_utf8strings_ = false;
-      } else if( iter->first.compare("slots") == 0) {
-        gen_slots_ = true;
-      } else if( iter->first.compare("package_prefix") == 0) {
-        package_prefix_ = iter->second;
-      } else if( iter->first.compare("dynamic") == 0) {
-        gen_dynamic_ = true;
-        gen_newstyle_ = false; // dynamic is newstyle
-        if( gen_dynbaseclass_.empty()) {
-          gen_dynbaseclass_ = "TBase";
-        }
-        if( gen_dynbaseclass_frozen_.empty()) {
-          gen_dynbaseclass_frozen_ = "TFrozenBase";
-        }
-        if( gen_dynbaseclass_exc_.empty()) {
-          gen_dynbaseclass_exc_ = "TExceptionBase";
-        }
-        if( import_dynbase_.empty()) {
-          import_dynbase_ = "from thrift.protocol.TBase import TBase, TFrozenBase, TExceptionBase, TTransport\n";
-        }
-      } else if( iter->first.compare("dynbase") == 0) {
-        gen_dynbase_ = true;
-        gen_dynbaseclass_ = (iter->second);
-      } else if( iter->first.compare("dynfrozen") == 0) {
-        gen_dynbaseclass_frozen_ = (iter->second);
-      } else if( iter->first.compare("dynexc") == 0) {
-        gen_dynbaseclass_exc_ = (iter->second);
-      } else if( iter->first.compare("dynimport") == 0) {
-        gen_dynbase_ = true;
-        import_dynbase_ = (iter->second);
-      } else if( iter->first.compare("twisted") == 0) {
-        gen_twisted_ = true;
-      } else if( iter->first.compare("tornado") == 0) {
-        gen_tornado_ = true;
-      } else if( iter->first.compare("coding") == 0) {
-        coding_ = iter->second;
-      } else {
-        throw "unknown option py:" + iter->first;
-      }
-    }
-
-    if (gen_twisted_ && gen_tornado_) {
-      throw "at most one of 'twisted' and 'tornado' are allowed";
-    }
-
-    copy_options_ = option_string;
-
-    if (gen_twisted_) {
-      out_dir_base_ = "gen-py.twisted";
-    } else if (gen_tornado_) {
-      out_dir_base_ = "gen-py.tornado";
-    } else {
-      out_dir_base_ = "gen-py";
-    }
-  }
-
-  virtual std::string indent_str() const {
-    return "    ";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  std::string render_const_value(t_type* type, t_const_value* value);
-
-  /**
-   * Struct generation code
-   */
-
-  void generate_py_struct(t_struct* tstruct, bool is_exception);
-  void generate_py_struct_definition(std::ofstream& out,
-                                     t_struct* tstruct,
-                                     bool is_xception = false);
-  void generate_py_struct_reader(std::ofstream& out, t_struct* tstruct);
-  void generate_py_struct_writer(std::ofstream& out, t_struct* tstruct);
-  void generate_py_struct_required_validator(std::ofstream& out, t_struct* tstruct);
-  void generate_py_function_helpers(t_function* tfunction);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_remote(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(std::ofstream& out,
-                                  t_field* tfield,
-                                  std::string prefix = "");
-
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(std::ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(std::ofstream& out,
-                                      t_map* tmap,
-                                      std::string kiter,
-                                      std::string viter);
-
-  void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_python_docstring(std::ofstream& out, t_struct* tstruct);
-
-  void generate_python_docstring(std::ofstream& out, t_function* tfunction);
-
-  void generate_python_docstring(std::ofstream& out,
-                                 t_doc* tdoc,
-                                 t_struct* tstruct,
-                                 const char* subheader);
-
-  void generate_python_docstring(std::ofstream& out, t_doc* tdoc);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string py_autogen_comment();
-  std::string py_imports();
-  std::string render_includes();
-  std::string declare_argument(t_field* tfield);
-  std::string render_field_default_value(t_field* tfield);
-  std::string type_name(t_type* ttype);
-  std::string function_signature(t_function* tfunction, bool interface = false);
-  std::string argument_list(t_struct* tstruct,
-                            std::vector<std::string>* pre = NULL,
-                            std::vector<std::string>* post = NULL);
-  std::string type_to_enum(t_type* ttype);
-  std::string type_to_spec_args(t_type* ttype);
-
-  static bool is_valid_namespace(const std::string& sub_namespace) {
-    return sub_namespace == "twisted";
-  }
-
-  static std::string get_real_py_module(const t_program* program, bool gen_twisted, std::string package_dir="") {
-    if (gen_twisted) {
-      std::string twisted_module = program->get_namespace("py.twisted");
-      if (!twisted_module.empty()) {
-        return twisted_module;
-      }
-    }
-
-    std::string real_module = program->get_namespace("py");
-    if (real_module.empty()) {
-      return program->get_name();
-    }
-    return package_dir + real_module;
-  }
-
-  static bool is_immutable(t_type* ttype) {
-    return ttype->annotations_.find("python.immutable") != ttype->annotations_.end();
-  }
-
-private:
-
-  /**
-   * True if we should generate new-style classes.
-   */
-  bool gen_newstyle_;
-
-  /**
-  * True if we should generate dynamic style classes.
-  */
-  bool gen_dynamic_;
-
-  bool gen_dynbase_;
-  std::string gen_dynbaseclass_;
-  std::string gen_dynbaseclass_frozen_;
-  std::string gen_dynbaseclass_exc_;
-
-  std::string import_dynbase_;
-
-  bool gen_slots_;
-
-  std::string copy_options_;
-
-  /**
-   * True if we should generate Twisted-friendly RPC services.
-   */
-  bool gen_twisted_;
-
-  /**
-   * True if we should generate code for use with Tornado
-   */
-  bool gen_tornado_;
-
-  /**
-   * True if strings should be encoded using utf-8.
-   */
-  bool gen_utf8strings_;
-
-  /**
-   * specify generated file encoding
-   * eg. # -*- coding: utf-8 -*-
-   */
-  string coding_;
-
-  string package_prefix_;
-
-  /**
-   * File streams
-   */
-
-  std::ofstream f_types_;
-  std::ofstream f_consts_;
-  std::ofstream f_service_;
-
-  std::string package_dir_;
-  std::string module_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_py_generator::init_generator() {
-  // Make output directory
-  string module = get_real_py_module(program_, gen_twisted_);
-  package_dir_ = get_out_dir();
-  module_ = module;
-  while (true) {
-    // TODO: Do better error checking here.
-    MKDIR(package_dir_.c_str());
-    std::ofstream init_py((package_dir_ + "/__init__.py").c_str(), std::ios_base::app);
-    init_py.close();
-    if (module.empty()) {
-      break;
-    }
-    string::size_type pos = module.find('.');
-    if (pos == string::npos) {
-      package_dir_ += "/";
-      package_dir_ += module;
-      module.clear();
-    } else {
-      package_dir_ += "/";
-      package_dir_ += module.substr(0, pos);
-      module.erase(0, pos + 1);
-    }
-  }
-
-  // Make output file
-  string f_types_name = package_dir_ + "/" + "ttypes.py";
-  f_types_.open(f_types_name.c_str());
-
-  string f_consts_name = package_dir_ + "/" + "constants.py";
-  f_consts_.open(f_consts_name.c_str());
-
-  string f_init_name = package_dir_ + "/__init__.py";
-  ofstream f_init;
-  f_init.open(f_init_name.c_str());
-  f_init << "__all__ = ['ttypes', 'constants'";
-  vector<t_service*> services = program_->get_services();
-  vector<t_service*>::iterator sv_iter;
-  for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-    f_init << ", '" << (*sv_iter)->get_name() << "'";
-  }
-  f_init << "]" << endl;
-  f_init.close();
-
-  // Print header
-  f_types_ << py_autogen_comment() << endl
-           << py_imports() << endl
-           << render_includes() << endl
-           << "from thrift.transport import TTransport" << endl
-           << import_dynbase_;
-
-  f_consts_ <<
-    py_autogen_comment() << endl <<
-    py_imports() << endl <<
-    "from .ttypes import *" << endl;
-}
-
-/**
- * Renders all the imports necessary for including another Thrift program
- */
-string t_py_generator::render_includes() {
-  const vector<t_program*>& includes = program_->get_includes();
-  string result = "";
-  for (size_t i = 0; i < includes.size(); ++i) {
-    result += "import " + get_real_py_module(includes[i], gen_twisted_, package_prefix_) + ".ttypes\n";
-  }
-  return result;
-}
-
-/**
- * Autogen'd comment
- */
-string t_py_generator::py_autogen_comment() {
-  string coding;
-  if (!coding_.empty()) {
-      coding = "# -*- coding: " + coding_ + " -*-\n";
-  }
-  return coding + std::string("#\n") + "# Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-         + "#\n" + "# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" + "#\n"
-         + "#  options string: " + copy_options_ + "\n" + "#\n";
-}
-
-/**
- * Prints standard thrift imports
- */
-string t_py_generator::py_imports() {
-  ostringstream ss;
-  ss << "from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, "
-        "TApplicationException"
-     << endl
-     << "from thrift.protocol.TProtocol import TProtocolException";
-  if (gen_utf8strings_) {
-    ss << endl << "import sys";
-  }
-  return ss.str();
-}
-
-/**
- * Closes the type files
- */
-void t_py_generator::close_generator() {
-  // Close types file
-  f_types_.close();
-  f_consts_.close();
-}
-
-/**
- * Generates a typedef. This is not done in Python, types are all implicit.
- *
- * @param ttypedef The type definition
- */
-void t_py_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Generates code for an enumerated type. Done using a class to scope
- * the values.
- *
- * @param tenum The enumeration
- */
-void t_py_generator::generate_enum(t_enum* tenum) {
-  std::ostringstream to_string_mapping, from_string_mapping;
-
-  f_types_ << endl << endl << "class " << tenum->get_name() << (gen_newstyle_ ? "(object)" : "")
-           << (gen_dynamic_ ? "(" + gen_dynbaseclass_ + ")" : "") << ":" << endl;
-  indent_up();
-  generate_python_docstring(f_types_, tenum);
-
-  to_string_mapping << indent() << "_VALUES_TO_NAMES = {" << endl;
-  from_string_mapping << indent() << "_NAMES_TO_VALUES = {" << endl;
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    indent(f_types_) << (*c_iter)->get_name() << " = " << value << endl;
-
-    // Dictionaries to/from string names of enums
-    to_string_mapping << indent() << indent() << value << ": \""
-                      << escape_string((*c_iter)->get_name()) << "\"," << endl;
-    from_string_mapping << indent() << indent() << '"' << escape_string((*c_iter)->get_name())
-                        << "\": " << value << ',' << endl;
-  }
-  to_string_mapping << indent() << "}" << endl;
-  from_string_mapping << indent() << "}" << endl;
-
-  indent_down();
-  f_types_ << endl;
-  f_types_ << to_string_mapping.str() << endl << from_string_mapping.str();
-}
-
-/**
- * Generate a constant value
- */
-void t_py_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = tconst->get_name();
-  t_const_value* value = tconst->get_value();
-
-  indent(f_consts_) << name << " = " << render_const_value(type, value);
-  f_consts_ << endl;
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_py_generator::render_const_value(t_type* type, t_const_value* value) {
-  type = get_true_type(type);
-  std::ostringstream out;
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "True" : "False");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    out << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    out << type_name(type) << "(**{" << endl;
-    indent_up();
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      indent(out) << render_const_value(g_type_string, v_iter->first) << ": "
-          << render_const_value(field_type, v_iter->second) << "," << endl;
-    }
-    indent_down();
-    indent(out) << "})";
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    if (is_immutable(type)) {
-      out << "TFrozenDict(";
-    }
-    out << "{" << endl;
-    indent_up();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      indent(out) << render_const_value(ktype, v_iter->first) << ": "
-          << render_const_value(vtype, v_iter->second) << "," << endl;
-    }
-    indent_down();
-    indent(out) << "}";
-    if (is_immutable(type)) {
-      out << ")";
-    }
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    if (type->is_set()) {
-      if (is_immutable(type)) {
-        out << "frozen";
-      }
-      out << "set(";
-    }
-    if (is_immutable(type) || type->is_set()) {
-      out << "(" << endl;
-    } else {
-      out << "[" << endl;
-    }
-    indent_up();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      indent(out) << render_const_value(etype, *v_iter) << "," << endl;
-    }
-    indent_down();
-    if (is_immutable(type) || type->is_set()) {
-      indent(out) << ")";
-    } else {
-      indent(out) << "]";
-    }
-    if (type->is_set()) {
-      out << ")";
-    }
-  } else {
-    throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
-  }
-
-  return out.str();
-}
-
-/**
- * Generates a python struct
- */
-void t_py_generator::generate_struct(t_struct* tstruct) {
-  generate_py_struct(tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct but extends the Exception class.
- *
- * @param txception The struct definition
- */
-void t_py_generator::generate_xception(t_struct* txception) {
-  generate_py_struct(txception, true);
-}
-
-/**
- * Generates a python struct
- */
-void t_py_generator::generate_py_struct(t_struct* tstruct, bool is_exception) {
-  generate_py_struct_definition(f_types_, tstruct, is_exception);
-}
-
-/**
- * Generates a struct definition for a thrift data type.
- *
- * @param tstruct The struct definition
- */
-void t_py_generator::generate_py_struct_definition(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   bool is_exception) {
-  const vector<t_field*>& members = tstruct->get_members();
-  const vector<t_field*>& sorted_members = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  out << endl << endl << "class " << tstruct->get_name();
-  if (is_exception) {
-    if (gen_dynamic_) {
-      out << "(" << gen_dynbaseclass_exc_ << ")";
-    } else {
-      out << "(TException)";
-    }
-  } else if (gen_dynamic_) {
-    if (is_immutable(tstruct)) {
-      out << "(" << gen_dynbaseclass_frozen_ << ")";
-    } else  {
-      out << "(" << gen_dynbaseclass_ << ")";
-    }
-  } else if (gen_newstyle_) {
-    out << "(object)";
-  }
-  out << ":" << endl;
-  indent_up();
-  generate_python_docstring(out, tstruct);
-
-  out << endl;
-
-  /*
-     Here we generate the structure specification for the fastbinary codec.
-     These specifications have the following structure:
-     thrift_spec -> tuple of item_spec
-     item_spec -> None | (tag, type_enum, name, spec_args, default)
-     tag -> integer
-     type_enum -> TType.I32 | TType.STRING | TType.STRUCT | ...
-     name -> string_literal
-     default -> None  # Handled by __init__
-     spec_args -> None  # For simple types
-                | (type_enum, spec_args)  # Value type for list/set
-                | (type_enum, spec_args, type_enum, spec_args)
-                  # Key and value for map
-                | (class_name, spec_args_ptr) # For struct/exception
-     class_name -> identifier  # Basically a pointer to the class
-     spec_args_ptr -> expression  # just class_name.spec_args
-
-     TODO(dreiss): Consider making this work for structs with negative tags.
-  */
-
-  if (gen_slots_) {
-    indent(out) << "__slots__ = (" << endl;
-    indent_up();
-    for (m_iter = sorted_members.begin(); m_iter != sorted_members.end(); ++m_iter) {
-      indent(out) << "'" << (*m_iter)->get_name() << "'," << endl;
-    }
-    indent_down();
-    indent(out) << ")" << endl << endl;
-  }
-
-  // TODO(dreiss): Look into generating an empty tuple instead of None
-  // for structures with no members.
-  // TODO(dreiss): Test encoding of structs where some inner structs
-  // don't have thrift_spec.
-  if (sorted_members.empty() || (sorted_members[0]->get_key() >= 0)) {
-    indent(out) << "thrift_spec = (" << endl;
-    indent_up();
-
-    int sorted_keys_pos = 0;
-    for (m_iter = sorted_members.begin(); m_iter != sorted_members.end(); ++m_iter) {
-
-      for (; sorted_keys_pos != (*m_iter)->get_key(); sorted_keys_pos++) {
-        indent(out) << "None,  # " << sorted_keys_pos << endl;
-      }
-
-      indent(out) << "(" << (*m_iter)->get_key() << ", " << type_to_enum((*m_iter)->get_type())
-                  << ", "
-                  << "'" << (*m_iter)->get_name() << "'"
-                  << ", " << type_to_spec_args((*m_iter)->get_type()) << ", "
-                  << render_field_default_value(*m_iter) << ", "
-                  << "),"
-                  << "  # " << sorted_keys_pos << endl;
-
-      sorted_keys_pos++;
-    }
-
-    indent_down();
-    indent(out) << ")" << endl;
-  } else {
-    indent(out) << "thrift_spec = None" << endl;
-  }
-
-  if (members.size() > 0) {
-    out << endl;
-    out << indent() << "def __init__(self,";
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      // This fills in default values, as opposed to nulls
-      out << " " << declare_argument(*m_iter) << ",";
-    }
-
-    out << "):" << endl;
-
-    indent_up();
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      // Initialize fields
-      t_type* type = (*m_iter)->get_type();
-      if (!type->is_base_type() && !type->is_enum() && (*m_iter)->get_value() != NULL) {
-        indent(out) << "if " << (*m_iter)->get_name() << " is "
-                    << "self.thrift_spec[" << (*m_iter)->get_key() << "][4]:" << endl;
-        indent_up();
-        indent(out) << (*m_iter)->get_name() << " = " << render_field_default_value(*m_iter)
-                    << endl;
-        indent_down();
-      }
-
-      if (is_immutable(tstruct)) {
-        if (gen_newstyle_ || gen_dynamic_) {
-          indent(out) << "super(" << tstruct->get_name() << ", self).__setattr__('"
-                      << (*m_iter)->get_name() << "', " << (*m_iter)->get_name() << ")" << endl;
-        } else {
-          indent(out) << "self.__dict__['" << (*m_iter)->get_name()
-                      << "'] = " << (*m_iter)->get_name() << endl;
-        }
-      } else {
-        indent(out) << "self." << (*m_iter)->get_name() << " = " << (*m_iter)->get_name() << endl;
-      }
-    }
-
-    indent_down();
-  }
-
-  if (is_immutable(tstruct)) {
-    out << endl;
-    out << indent() << "def __setattr__(self, *args):" << endl
-        << indent() << indent_str() << "raise TypeError(\"can't modify immutable instance\")" << endl
-        << endl;
-    out << indent() << "def __delattr__(self, *args):" << endl
-        << indent() << indent_str() << "raise TypeError(\"can't modify immutable instance\")" << endl
-        << endl;
-
-    // Hash all of the members in order, and also hash in the class
-    // to avoid collisions for stuff like single-field structures.
-    out << indent() << "def __hash__(self):" << endl
-        << indent() << indent_str() << "return hash(self.__class__) ^ hash((";
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      out << "self." << (*m_iter)->get_name() << ", ";
-    }
-
-    out << "))" << endl;
-  }
-
-  if (!gen_dynamic_) {
-    out << endl;
-    generate_py_struct_reader(out, tstruct);
-    generate_py_struct_writer(out, tstruct);
-  }
-
-  // For exceptions only, generate a __str__ method. This is
-  // because when raised exceptions are printed to the console, __repr__
-  // isn't used. See python bug #5882
-  if (is_exception) {
-    out << endl;
-    out << indent() << "def __str__(self):" << endl
-        << indent() << indent_str() << "return repr(self)" << endl;
-  }
-
-  if (!gen_slots_) {
-    out << endl;
-    // Printing utilities so that on the command line thrift
-    // structs look pretty like dictionaries
-    indent(out) << "def __repr__(self):" << endl;
-    indent_up();
-    out << indent() << "L = ['%s=%r' % (key, value)" << endl
-        << indent() << "     for key, value in self.__dict__.items()]" << endl
-        << indent() << "return '%s(%s)' % (self.__class__.__name__, ', '.join(L))" << endl
-        << endl;
-    indent_down();
-
-    // Equality and inequality methods that compare by value
-    out << indent() << "def __eq__(self, other):" << endl;
-    indent_up();
-    out << indent() << "return isinstance(other, self.__class__) and "
-                       "self.__dict__ == other.__dict__" << endl;
-    indent_down();
-    out << endl;
-
-    out << indent() << "def __ne__(self, other):" << endl;
-    indent_up();
-
-    out << indent() << "return not (self == other)" << endl;
-    indent_down();
-  } else if (!gen_dynamic_) {
-    out << endl;
-    // no base class available to implement __eq__ and __repr__ and __ne__ for us
-    // so we must provide one that uses __slots__
-    indent(out) << "def __repr__(self):" << endl;
-    indent_up();
-    out << indent() << "L = ['%s=%r' % (key, getattr(self, key))" << endl
-        << indent() << "     for key in self.__slots__]" << endl
-        << indent() << "return '%s(%s)' % (self.__class__.__name__, ', '.join(L))" << endl
-        << endl;
-    indent_down();
-
-    // Equality method that compares each attribute by value and type, walking __slots__
-    out << indent() << "def __eq__(self, other):" << endl;
-    indent_up();
-    out << indent() << "if not isinstance(other, self.__class__):" << endl
-        << indent() << indent_str() << "return False" << endl
-        << indent() << "for attr in self.__slots__:" << endl
-        << indent() << indent_str() << "my_val = getattr(self, attr)" << endl
-        << indent() << indent_str() << "other_val = getattr(other, attr)" << endl
-        << indent() << indent_str() << "if my_val != other_val:" << endl
-        << indent() << indent_str() << indent_str() << "return False" << endl
-        << indent() << "return True" << endl
-        << endl;
-    indent_down();
-
-    out << indent() << "def __ne__(self, other):" << endl
-        << indent() << indent_str() << "return not (self == other)" << endl;
-  }
-  indent_down();
-}
-
-/**
- * Generates the read method for a struct
- */
-void t_py_generator::generate_py_struct_reader(ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  if (is_immutable(tstruct)) {
-    out << indent() << "@classmethod" << endl << indent() << "def read(cls, iprot):" << endl;
-  } else {
-    indent(out) << "def read(self, iprot):" << endl;
-  }
-  indent_up();
-
-  const char* id = is_immutable(tstruct) ? "cls" : "self";
-
-  indent(out) << "if iprot._fast_decode is not None "
-                 "and isinstance(iprot.trans, TTransport.CReadableTransport) "
-                 "and "
-              << id << ".thrift_spec is not None:" << endl;
-  indent_up();
-
-  if (is_immutable(tstruct)) {
-    indent(out) << "return iprot._fast_decode(None, iprot, (cls, cls.thrift_spec))" << endl;
-  } else {
-    indent(out) << "iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))" << endl;
-    indent(out) << "return" << endl;
-  }
-  indent_down();
-
-  indent(out) << "iprot.readStructBegin()" << endl;
-
-  // Loop over reading in fields
-  indent(out) << "while True:" << endl;
-  indent_up();
-
-  // Read beginning field marker
-  indent(out) << "(fname, ftype, fid) = iprot.readFieldBegin()" << endl;
-
-  // Check for field STOP marker and break
-  indent(out) << "if ftype == TType.STOP:" << endl;
-  indent_up();
-  indent(out) << "break" << endl;
-  indent_down();
-
-  // Switch statement on the field we are reading
-  bool first = true;
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-      out << indent() << "if ";
-    } else {
-      out << indent() << "elif ";
-    }
-    out << "fid == " << (*f_iter)->get_key() << ":" << endl;
-    indent_up();
-    indent(out) << "if ftype == " << type_to_enum((*f_iter)->get_type()) << ":" << endl;
-    indent_up();
-    if (is_immutable(tstruct)) {
-      generate_deserialize_field(out, *f_iter);
-    } else {
-      generate_deserialize_field(out, *f_iter, "self.");
-    }
-    indent_down();
-    out << indent() << "else:" << endl << indent() << indent_str() << "iprot.skip(ftype)" << endl;
-    indent_down();
-  }
-
-  // In the default case we skip the field
-  out << indent() << "else:" << endl << indent() << indent_str() << "iprot.skip(ftype)" << endl;
-
-  // Read field end marker
-  indent(out) << "iprot.readFieldEnd()" << endl;
-
-  indent_down();
-
-  indent(out) << "iprot.readStructEnd()" << endl;
-
-  if (is_immutable(tstruct)) {
-    indent(out) << "return cls(" << endl;
-    indent_up();
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      indent(out) << (*f_iter)->get_name() << "=" << (*f_iter)->get_name() << "," << endl;
-    }
-    indent_down();
-    indent(out) << ")" << endl;
-  }
-
-  indent_down();
-  out << endl;
-}
-
-void t_py_generator::generate_py_struct_writer(ofstream& out, t_struct* tstruct) {
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "def write(self, oprot):" << endl;
-  indent_up();
-
-  indent(out) << "if oprot._fast_encode is not None and self.thrift_spec is not None:" << endl;
-  indent_up();
-
-  indent(out)
-      << "oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))"
-      << endl;
-  indent(out) << "return" << endl;
-  indent_down();
-
-  indent(out) << "oprot.writeStructBegin('" << name << "')" << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    // Write field header
-    indent(out) << "if self." << (*f_iter)->get_name() << " is not None:" << endl;
-    indent_up();
-    indent(out) << "oprot.writeFieldBegin("
-                << "'" << (*f_iter)->get_name() << "', " << type_to_enum((*f_iter)->get_type())
-                << ", " << (*f_iter)->get_key() << ")" << endl;
-
-    // Write field contents
-    generate_serialize_field(out, *f_iter, "self.");
-
-    // Write field closer
-    indent(out) << "oprot.writeFieldEnd()" << endl;
-
-    indent_down();
-  }
-
-  // Write the struct map
-  out << indent() << "oprot.writeFieldStop()" << endl << indent() << "oprot.writeStructEnd()"
-      << endl;
-
-  out << endl;
-
-  indent_down();
-  generate_py_struct_required_validator(out, tstruct);
-}
-
-void t_py_generator::generate_py_struct_required_validator(ofstream& out, t_struct* tstruct) {
-  indent(out) << "def validate(self):" << endl;
-  indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-
-  if (fields.size() > 0) {
-    vector<t_field*>::const_iterator f_iter;
-
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      t_field* field = (*f_iter);
-      if (field->get_req() == t_field::T_REQUIRED) {
-        indent(out) << "if self." << field->get_name() << " is None:" << endl;
-        indent(out) << indent_str() << "raise TProtocolException(message='Required field "
-                    << field->get_name() << " is unset!')" << endl;
-      }
-    }
-  }
-
-  indent(out) << "return" << endl;
-  indent_down();
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_py_generator::generate_service(t_service* tservice) {
-  string f_service_name = package_dir_ + "/" + service_name_ + ".py";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << py_autogen_comment() << endl << py_imports() << endl;
-
-  if (tservice->get_extends() != NULL) {
-    f_service_ << "import "
-               << get_real_py_module(tservice->get_extends()->get_program(), gen_twisted_, package_prefix_) << "."
-               << tservice->get_extends()->get_name() << endl;
-  }
-
-  f_service_ << "import logging" << endl
-             << "from .ttypes import *" << endl
-             << "from thrift.Thrift import TProcessor" << endl
-             << "from thrift.transport import TTransport" << endl
-             << import_dynbase_;
-
-  if (gen_twisted_) {
-    f_service_ << "from zope.interface import Interface, implements" << endl
-               << "from twisted.internet import defer" << endl
-               << "from thrift.transport import TTwisted" << endl;
-  } else if (gen_tornado_) {
-    f_service_ << "from tornado import gen" << endl;
-    f_service_ << "from tornado import concurrent" << endl;
-  }
-
-  // Generate the three main parts of the service
-  generate_service_interface(tservice);
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-  generate_service_helpers(tservice);
-  generate_service_remote(tservice);
-
-  // Close service file
-  f_service_.close();
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_py_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  f_service_ << endl << "# HELPER FUNCTIONS AND STRUCTURES" << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_py_struct_definition(f_service_, ts, false);
-    generate_py_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_py_generator::generate_py_function_helpers(t_function* tfunction) {
-  if (!tfunction->is_oneway()) {
-    t_struct result(program_, tfunction->get_name() + "_result");
-    t_field success(tfunction->get_returntype(), "success", 0);
-    if (!tfunction->get_returntype()->is_void()) {
-      result.append(&success);
-    }
-
-    t_struct* xs = tfunction->get_xceptions();
-    const vector<t_field*>& fields = xs->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      result.append(*f_iter);
-    }
-    generate_py_struct_definition(f_service_, &result, false);
-  }
-}
-
-/**
- * Generates a service interface definition.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_py_generator::generate_service_interface(t_service* tservice) {
-  string extends = "";
-  string extends_if = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_if = "(" + extends + ".Iface)";
-  } else {
-    if (gen_twisted_) {
-      extends_if = "(Interface)";
-    } else if (gen_newstyle_ || gen_dynamic_ || gen_tornado_) {
-      extends_if = "(object)";
-    }
-  }
-
-  f_service_ << endl << endl << "class Iface" << extends_if << ":" << endl;
-  indent_up();
-  generate_python_docstring(f_service_, tservice);
-  vector<t_function*> functions = tservice->get_functions();
-  if (functions.empty()) {
-    f_service_ << indent() << "pass" << endl;
-  } else {
-    vector<t_function*>::iterator f_iter;
-    bool first = true;
-    for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << endl;
-      }
-      f_service_ << indent() << "def " << function_signature(*f_iter, true) << ":" << endl;
-      indent_up();
-      generate_python_docstring(f_service_, (*f_iter));
-      f_service_ << indent() << "pass" << endl;
-      indent_down();
-    }
-  }
-
-  indent_down();
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_py_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    if (gen_twisted_) {
-      extends_client = "(" + extends + ".Client)";
-    } else {
-      extends_client = extends + ".Client, ";
-    }
-  } else {
-    if (gen_twisted_ && (gen_newstyle_ || gen_dynamic_)) {
-      extends_client = "(object)";
-    }
-  }
-
-  f_service_ << endl << endl;
-
-  if (gen_twisted_) {
-    f_service_ << "class Client" << extends_client << ":" << endl
-               << indent_str() << "implements(Iface)" << endl
-               << endl;
-  } else {
-    f_service_ << "class Client(" << extends_client << "Iface):" << endl;
-  }
-  indent_up();
-  generate_python_docstring(f_service_, tservice);
-
-  // Constructor function
-  if (gen_twisted_) {
-    f_service_ << indent() << "def __init__(self, transport, oprot_factory):" << endl;
-  } else if (gen_tornado_) {
-    f_service_ << indent()
-               << "def __init__(self, transport, iprot_factory, oprot_factory=None):" << endl;
-  } else {
-    f_service_ << indent() << "def __init__(self, iprot, oprot=None):" << endl;
-  }
-  indent_up();
-  if (extends.empty()) {
-    if (gen_twisted_) {
-      f_service_ << indent() << "self._transport = transport" << endl
-                 << indent() << "self._oprot_factory = oprot_factory" << endl
-                 << indent() << "self._seqid = 0" << endl
-                 << indent() << "self._reqs = {}" << endl;
-    } else if (gen_tornado_) {
-      f_service_ << indent() << "self._transport = transport" << endl
-                 << indent() << "self._iprot_factory = iprot_factory" << endl
-                 << indent() << "self._oprot_factory = (oprot_factory if oprot_factory is not None"
-                 << endl
-                 << indent() << "                       else iprot_factory)" << endl
-                 << indent() << "self._seqid = 0" << endl
-                 << indent() << "self._reqs = {}" << endl
-                 << indent() << "self._transport.io_loop.spawn_callback(self._start_receiving)"
-                 << endl;
-    } else {
-      f_service_ << indent() << "self._iprot = self._oprot = iprot" << endl
-                 << indent() << "if oprot is not None:" << endl
-                 << indent() << indent_str() << "self._oprot = oprot" << endl
-                 << indent() << "self._seqid = 0" << endl;
-    }
-  } else {
-    if (gen_twisted_) {
-      f_service_ << indent() << extends
-                 << ".Client.__init__(self, transport, oprot_factory)" << endl;
-    } else if (gen_tornado_) {
-      f_service_ << indent() << extends
-                 << ".Client.__init__(self, transport, iprot_factory, oprot_factory)" << endl;
-    } else {
-      f_service_ << indent() << extends << ".Client.__init__(self, iprot, oprot)" << endl;
-    }
-  }
-  indent_down();
-
-  if (gen_tornado_ && extends.empty()) {
-    f_service_ << endl <<
-      indent() << "@gen.engine" << endl <<
-      indent() << "def _start_receiving(self):" << endl;
-    indent_up();
-    indent(f_service_) << "while True:" << endl;
-    indent_up();
-    f_service_ << indent() << "try:" << endl
-               << indent() << indent_str() << "frame = yield self._transport.readFrame()" << endl
-               << indent() << "except TTransport.TTransportException as e:" << endl
-               << indent() << indent_str() << "for future in self._reqs.values():" << endl
-               << indent() << indent_str() << indent_str() << "future.set_exception(e)" << endl
-               << indent() << indent_str() << "self._reqs = {}" << endl
-               << indent() << indent_str() << "return" << endl
-               << indent() << "tr = TTransport.TMemoryBuffer(frame)" << endl
-               << indent() << "iprot = self._iprot_factory.getProtocol(tr)" << endl
-               << indent() << "(fname, mtype, rseqid) = iprot.readMessageBegin()" << endl
-               << indent() << "method = getattr(self, 'recv_' + fname)" << endl
-               << indent() << "future = self._reqs.pop(rseqid, None)" << endl
-               << indent() << "if not future:" << endl
-               << indent() << indent_str() << "# future has already been discarded" << endl
-               << indent() << indent_str() << "continue" << endl
-               << indent() << "try:" << endl
-               << indent() << indent_str() << "result = method(iprot, mtype, rseqid)" << endl
-               << indent() << "except Exception as e:" << endl
-               << indent() << indent_str() << "future.set_exception(e)" << endl
-               << indent() << "else:" << endl
-               << indent() << indent_str() << "future.set_result(result)" << endl;
-    indent_down();
-    indent_down();
-  }
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string funname = (*f_iter)->get_name();
-
-    f_service_ << endl;
-    // Open function
-    indent(f_service_) << "def " << function_signature(*f_iter, false) << ":" << endl;
-    indent_up();
-    generate_python_docstring(f_service_, (*f_iter));
-    if (gen_twisted_) {
-      indent(f_service_) << "seqid = self._seqid = self._seqid + 1" << endl;
-      indent(f_service_) << "self._reqs[seqid] = defer.Deferred()" << endl << endl;
-      indent(f_service_) << "d = defer.maybeDeferred(self.send_" << funname;
-
-    } else if (gen_tornado_) {
-      indent(f_service_) << "self._seqid += 1" << endl;
-      if (!(*f_iter)->is_oneway()) {
-        indent(f_service_) << "future = self._reqs[self._seqid] = concurrent.Future()" << endl;
-      }
-      indent(f_service_) << "self.send_" << funname << "(";
-
-    } else {
-      indent(f_service_) << "self.send_" << funname << "(";
-    }
-
-    bool first = true;
-    if (gen_twisted_) {
-      // we need a leading comma if there are args, since it's called as maybeDeferred(funcname,
-      // arg)
-      first = false;
-    }
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << (*fld_iter)->get_name();
-    }
-
-    f_service_ << ")" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      if (gen_twisted_) {
-        // nothing. See the next block.
-      } else if (gen_tornado_) {
-        indent(f_service_) << "return future" << endl;
-      } else {
-        f_service_ << indent();
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          f_service_ << "return ";
-        }
-        f_service_ << "self.recv_" << funname << "()" << endl;
-      }
-    }
-    indent_down();
-
-    if (gen_twisted_) {
-      // This block injects the body of the send_<> method for twisted (and a cb/eb pair)
-      indent_up();
-      indent(f_service_) << "d.addCallbacks(" << endl;
-
-      indent_up();
-      f_service_ << indent() << "callback=self.cb_send_" << funname << "," << endl << indent()
-                 << "callbackArgs=(seqid,)," << endl << indent() << "errback=self.eb_send_"
-                 << funname << "," << endl << indent() << "errbackArgs=(seqid,))" << endl;
-      indent_down();
-
-      indent(f_service_) << "return d" << endl;
-      indent_down();
-      f_service_ << endl;
-
-      indent(f_service_) << "def cb_send_" << funname << "(self, _, seqid):" << endl;
-      indent_up();
-      if ((*f_iter)->is_oneway()) {
-        // if one-way, fire the deferred & remove it from _reqs
-        f_service_ << indent() << "d = self._reqs.pop(seqid)" << endl << indent()
-                   << "d.callback(None)" << endl << indent() << "return d" << endl;
-      } else {
-        f_service_ << indent() << "return self._reqs[seqid]" << endl;
-      }
-      indent_down();
-      f_service_ << endl;
-
-      // add an errback to fail the request if the call to send_<> raised an exception
-      indent(f_service_) << "def eb_send_" << funname << "(self, f, seqid):" << endl;
-      indent_up();
-      f_service_ << indent() << "d = self._reqs.pop(seqid)" << endl << indent() << "d.errback(f)"
-                 << endl << indent() << "return d" << endl;
-      indent_down();
-    }
-
-    f_service_ << endl;
-    indent(f_service_) << "def send_" << function_signature(*f_iter, false) << ":" << endl;
-    indent_up();
-
-    std::string argsname = (*f_iter)->get_name() + "_args";
-    std::string messageType = (*f_iter)->is_oneway() ? "TMessageType.ONEWAY" : "TMessageType.CALL";
-
-    // Serialize the request header
-    if (gen_twisted_ || gen_tornado_) {
-      f_service_ << indent() << "oprot = self._oprot_factory.getProtocol(self._transport)" << endl
-                 << indent() << "oprot.writeMessageBegin('" << (*f_iter)->get_name() << "', "
-                 << messageType << ", self._seqid)" << endl;
-    } else {
-      f_service_ << indent() << "self._oprot.writeMessageBegin('" << (*f_iter)->get_name() << "', "
-                 << messageType << ", self._seqid)" << endl;
-    }
-
-    f_service_ << indent() << "args = " << argsname << "()" << endl;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << indent() << "args." << (*fld_iter)->get_name() << " = "
-                 << (*fld_iter)->get_name() << endl;
-    }
-
-    // Write to the stream
-    if (gen_twisted_ || gen_tornado_) {
-      f_service_ << indent() << "args.write(oprot)" << endl << indent() << "oprot.writeMessageEnd()"
-                 << endl << indent() << "oprot.trans.flush()" << endl;
-    } else {
-      f_service_ << indent() << "args.write(self._oprot)" << endl << indent()
-                 << "self._oprot.writeMessageEnd()" << endl << indent()
-                 << "self._oprot.trans.flush()" << endl;
-    }
-
-    indent_down();
-
-    if (!(*f_iter)->is_oneway()) {
-      std::string resultname = (*f_iter)->get_name() + "_result";
-      // Open function
-      f_service_ << endl;
-      if (gen_twisted_ || gen_tornado_) {
-        f_service_ << indent() << "def recv_" << (*f_iter)->get_name()
-                   << "(self, iprot, mtype, rseqid):" << endl;
-      } else {
-        t_struct noargs(program_);
-        t_function recv_function((*f_iter)->get_returntype(),
-                                 string("recv_") + (*f_iter)->get_name(),
-                                 &noargs);
-        f_service_ << indent() << "def " << function_signature(&recv_function) << ":" << endl;
-      }
-      indent_up();
-
-      // TODO(mcslee): Validate message reply here, seq ids etc.
-
-      if (gen_twisted_) {
-        f_service_ << indent() << "d = self._reqs.pop(rseqid)" << endl;
-      } else if (gen_tornado_) {
-      } else {
-        f_service_ << indent() << "iprot = self._iprot" << endl << indent()
-                   << "(fname, mtype, rseqid) = iprot.readMessageBegin()" << endl;
-      }
-
-      f_service_ << indent() << "if mtype == TMessageType.EXCEPTION:" << endl
-                 << indent() << indent_str() << "x = TApplicationException()" << endl;
-
-      if (gen_twisted_) {
-        f_service_ << indent() << indent_str() << "x.read(iprot)" << endl << indent()
-                   << indent_str() << "iprot.readMessageEnd()" << endl << indent() << indent_str() << "return d.errback(x)"
-                   << endl << indent() << "result = " << resultname << "()" << endl << indent()
-                   << "result.read(iprot)" << endl << indent() << "iprot.readMessageEnd()" << endl;
-      } else {
-        f_service_ << indent() << indent_str() << "x.read(iprot)" << endl << indent()
-                   << indent_str() << "iprot.readMessageEnd()" << endl << indent() << indent_str() << "raise x" << endl
-                   << indent() << "result = " << resultname << "()" << endl << indent()
-                   << "result.read(iprot)" << endl << indent() << "iprot.readMessageEnd()" << endl;
-      }
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << indent() << "if result.success is not None:" << endl;
-        if (gen_twisted_) {
-          f_service_ << indent() << indent_str() << "return d.callback(result.success)" << endl;
-        } else {
-          f_service_ << indent() << indent_str() << "return result.success" << endl;
-        }
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "if result." << (*x_iter)->get_name() << " is not None:" << endl;
-        if (gen_twisted_) {
-          f_service_ << indent() << indent_str() << "return d.errback(result." << (*x_iter)->get_name() << ")"
-                     << endl;
-        } else {
-          f_service_ << indent() << indent_str() << "raise result." << (*x_iter)->get_name() << "" << endl;
-        }
-      }
-
-      // Careful, only return _result if not a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        if (gen_twisted_) {
-          f_service_ << indent() << "return d.callback(None)" << endl;
-        } else {
-          f_service_ << indent() << "return" << endl;
-        }
-      } else {
-        if (gen_twisted_) {
-          f_service_
-              << indent()
-              << "return d.errback(TApplicationException(TApplicationException.MISSING_RESULT, \""
-              << (*f_iter)->get_name() << " failed: unknown result\"))" << endl;
-        } else {
-          f_service_ << indent()
-                     << "raise TApplicationException(TApplicationException.MISSING_RESULT, \""
-                     << (*f_iter)->get_name() << " failed: unknown result\")" << endl;
-        }
-      }
-
-      // Close function
-      indent_down();
-    }
-  }
-
-  indent_down();
-}
-
-/**
- * Generates a command line tool for making remote requests
- *
- * @param tservice The service to generate a remote for.
- */
-void t_py_generator::generate_service_remote(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  // Get all function from parents
-  t_service* parent = tservice->get_extends();
-  while (parent != NULL) {
-    vector<t_function*> p_functions = parent->get_functions();
-    functions.insert(functions.end(), p_functions.begin(), p_functions.end());
-    parent = parent->get_extends();
-  }
-  vector<t_function*>::iterator f_iter;
-
-  string f_remote_name = package_dir_ + "/" + service_name_ + "-remote";
-  ofstream f_remote;
-  f_remote.open(f_remote_name.c_str());
-
-  f_remote <<
-    "#!/usr/bin/env python" << endl <<
-    py_autogen_comment() << endl <<
-    "import sys" << endl <<
-    "import pprint" << endl <<
-    "if sys.version_info[0] > 2:" << endl <<
-    indent_str() << "from urllib.parse import urlparse" << endl <<
-    "else:" << endl <<
-    indent_str() << "from urlparse import urlparse" << endl <<
-    "from thrift.transport import TTransport, TSocket, TSSLSocket, THttpClient" << endl <<
-    "from thrift.protocol.TBinaryProtocol import TBinaryProtocol" << endl <<
-    endl;
-
-  f_remote <<
-    "from " << module_ << " import " << service_name_ << endl <<
-    "from " << module_ << ".ttypes import *" << endl <<
-    endl;
-
-  f_remote <<
-    "if len(sys.argv) <= 1 or sys.argv[1] == '--help':" << endl <<
-    indent_str() << "print('')" << endl <<
-    indent_str() << "print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] [-novalidate] [-ca_certs certs] [-keyfile keyfile] [-certfile certfile] function [arg1 [arg2...]]')" << endl <<
-    indent_str() << "print('')" << endl <<
-    indent_str() << "print('Functions:')" << endl;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_remote << indent_str() << "print('  " << (*f_iter)->get_returntype()->get_name() << " "
-             << (*f_iter)->get_name() << "(";
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const std::vector<t_field*>& args = arg_struct->get_members();
-    vector<t_field*>::const_iterator a_iter;
-    std::vector<t_field*>::size_type num_args = args.size();
-    bool first = true;
-    for (std::vector<t_field*>::size_type i = 0; i < num_args; ++i) {
-      if (first) {
-        first = false;
-      } else {
-        f_remote << ", ";
-      }
-      f_remote << args[i]->get_type()->get_name() << " " << args[i]->get_name();
-    }
-    f_remote << ")')" << endl;
-  }
-  f_remote << indent_str() << "print('')" << endl << indent_str() << "sys.exit(0)" << endl << endl;
-
-  f_remote << "pp = pprint.PrettyPrinter(indent=2)" << endl
-           << "host = 'localhost'" << endl
-           << "port = 9090" << endl
-           << "uri = ''" << endl
-           << "framed = False" << endl
-           << "ssl = False" << endl
-           << "validate = True" << endl
-           << "ca_certs = None" << endl
-           << "keyfile = None" << endl
-           << "certfile = None" << endl
-           << "http = False" << endl
-           << "argi = 1" << endl
-           << endl
-           << "if sys.argv[argi] == '-h':" << endl
-           << indent_str() << "parts = sys.argv[argi + 1].split(':')" << endl
-           << indent_str() << "host = parts[0]" << endl
-           << indent_str() << "if len(parts) > 1:" << endl
-           << indent_str() << indent_str() << "port = int(parts[1])" << endl
-           << indent_str() << "argi += 2" << endl
-           << endl
-           << "if sys.argv[argi] == '-u':" << endl
-           << indent_str() << "url = urlparse(sys.argv[argi + 1])" << endl
-           << indent_str() << "parts = url[1].split(':')" << endl
-           << indent_str() << "host = parts[0]" << endl
-           << indent_str() << "if len(parts) > 1:" << endl
-           << indent_str() << indent_str() << "port = int(parts[1])" << endl
-           << indent_str() << "else:" << endl
-           << indent_str() << indent_str() << "port = 80" << endl
-           << indent_str() << "uri = url[2]" << endl
-           << indent_str() << "if url[4]:" << endl
-           << indent_str() << indent_str() << "uri += '?%s' % url[4]" << endl
-           << indent_str() << "http = True" << endl
-           << indent_str() << "argi += 2" << endl
-           << endl
-           << "if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':" << endl
-           << indent_str() << "framed = True" << endl
-           << indent_str() << "argi += 1" << endl
-           << endl
-           << "if sys.argv[argi] == '-s' or sys.argv[argi] == '-ssl':" << endl
-           << indent_str() << "ssl = True" << endl
-           << indent_str() << "argi += 1" << endl
-           << endl
-           << "if sys.argv[argi] == '-novalidate':" << endl
-           << indent_str() << "validate = False" << endl
-           << indent_str() << "argi += 1" << endl
-           << endl
-           << "if sys.argv[argi] == '-ca_certs':" << endl
-           << indent_str() << "ca_certs = sys.argv[argi+1]" << endl
-           << indent_str() << "argi += 2" << endl
-           << endl
-           << "if sys.argv[argi] == '-keyfile':" << endl
-           << indent_str() << "keyfile = sys.argv[argi+1]" << endl
-           << indent_str() << "argi += 2" << endl
-           << endl
-           << "if sys.argv[argi] == '-certfile':" << endl
-           << indent_str() << "certfile = sys.argv[argi+1]" << endl
-           << indent_str() << "argi += 2" << endl
-           << endl
-           << "cmd = sys.argv[argi]" << endl
-           << "args = sys.argv[argi + 1:]" << endl
-           << endl
-           << "if http:" << endl
-           << indent_str() << "transport = THttpClient.THttpClient(host, port, uri)" << endl
-           << "else:" << endl
-           << indent_str() << "if ssl:" << endl
-           << indent_str() << indent_str() << "socket = TSSLSocket.TSSLSocket(host, port, "
-              "validate=validate, ca_certs=ca_certs, keyfile=keyfile, certfile=certfile)"
-           << endl
-           << indent_str() << "else:" << endl
-           << indent_str() << indent_str() << "socket = TSocket.TSocket(host, port)" << endl
-           << indent_str() << "if framed:" << endl
-           << indent_str() << indent_str() << "transport = TTransport.TFramedTransport(socket)" << endl
-           << indent_str() << "else:" << endl
-           << indent_str() << indent_str() << "transport = TTransport.TBufferedTransport(socket)" << endl
-           << "protocol = TBinaryProtocol(transport)" << endl
-           << "client = " << service_name_ << ".Client(protocol)" << endl
-           << "transport.open()" << endl
-           << endl;
-
-  // Generate the dispatch methods
-  bool first = true;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_remote << "el";
-    }
-
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const std::vector<t_field*>& args = arg_struct->get_members();
-    vector<t_field*>::const_iterator a_iter;
-    std::vector<t_field*>::size_type num_args = args.size();
-
-    f_remote << "if cmd == '" << (*f_iter)->get_name() << "':" << endl;
-    indent_up();
-    f_remote << indent() << "if len(args) != " << num_args << ":" << endl
-             << indent() << indent_str() << "print('" << (*f_iter)->get_name() << " requires " << num_args
-             << " args')" << endl
-             << indent() << indent_str() << "sys.exit(1)" << endl
-             << indent() << "pp.pprint(client." << (*f_iter)->get_name() << "(";
-    indent_down();
-    bool first_arg = true;
-    for (std::vector<t_field*>::size_type i = 0; i < num_args; ++i) {
-      if (first_arg)
-        first_arg = false;
-      else
-        f_remote << " ";
-      if (args[i]->get_type()->is_string()) {
-        f_remote << "args[" << i << "],";
-      } else {
-        f_remote << "eval(args[" << i << "]),";
-      }
-    }
-    f_remote << "))" << endl;
-
-    f_remote << endl;
-  }
-
-  if (functions.size() > 0) {
-    f_remote << "else:" << endl;
-    f_remote << indent_str() << "print('Unrecognized method %s' % cmd)" << endl;
-    f_remote << indent_str() << "sys.exit(1)" << endl;
-    f_remote << endl;
-  }
-
-  f_remote << "transport.close()" << endl;
-
-  // Close service file
-  f_remote.close();
-
-#ifndef _MSC_VER
-
-  // Make file executable, love that bitwise OR action
-  chmod(f_remote_name.c_str(),
-        S_IRUSR | S_IWUSR | S_IXUSR
-#ifndef _WIN32
-        | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH
-#endif
-        );
-
-#endif // _MSC_VER
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_py_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_processor = extends + ".Processor, ";
-  }
-
-  f_service_ << endl << endl;
-
-  // Generate the header portion
-  if (gen_twisted_) {
-    f_service_ << "class Processor(" << extends_processor << "TProcessor):" << endl
-               << indent_str() << "implements(Iface)" << endl << endl;
-  } else {
-    f_service_ << "class Processor(" << extends_processor << "Iface, TProcessor):" << endl;
-  }
-
-  indent_up();
-
-  indent(f_service_) << "def __init__(self, handler):" << endl;
-  indent_up();
-  if (extends.empty()) {
-    if (gen_twisted_) {
-      f_service_ << indent() << "self._handler = Iface(handler)" << endl;
-    } else {
-      f_service_ << indent() << "self._handler = handler" << endl;
-    }
-
-    f_service_ << indent() << "self._processMap = {}" << endl;
-  } else {
-    if (gen_twisted_) {
-      f_service_ << indent() << extends << ".Processor.__init__(self, Iface(handler))" << endl;
-    } else {
-      f_service_ << indent() << extends << ".Processor.__init__(self, handler)" << endl;
-    }
-  }
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << indent() << "self._processMap[\"" << (*f_iter)->get_name()
-               << "\"] = Processor.process_" << (*f_iter)->get_name() << endl;
-  }
-  indent_down();
-  f_service_ << endl;
-
-  // Generate the server implementation
-  f_service_ << indent() << "def process(self, iprot, oprot):" << endl;
-  indent_up();
-
-  f_service_ << indent() << "(name, type, seqid) = iprot.readMessageBegin()" << endl;
-
-  // TODO(mcslee): validate message
-
-  // HOT: dictionary function lookup
-  f_service_ << indent() << "if name not in self._processMap:" << endl;
-  indent_up();
-  f_service_ << indent() << "iprot.skip(TType.STRUCT)" << endl
-             << indent() << "iprot.readMessageEnd()" << endl
-             << indent()
-             << "x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown "
-                "function %s' % (name))"
-             << endl
-             << indent() << "oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)" << endl
-             << indent() << "x.write(oprot)" << endl
-             << indent() << "oprot.writeMessageEnd()" << endl
-             << indent() << "oprot.trans.flush()" << endl;
-
-  if (gen_twisted_) {
-    f_service_ << indent() << "return defer.succeed(None)" << endl;
-  } else {
-    f_service_ << indent() << "return" << endl;
-  }
-  indent_down();
-
-  f_service_ << indent() << "else:" << endl;
-
-  if (gen_twisted_ || gen_tornado_) {
-    f_service_ << indent() << indent_str()
-               << "return self._processMap[name](self, seqid, iprot, oprot)" << endl;
-  } else {
-    f_service_ << indent() << indent_str() << "self._processMap[name](self, seqid, iprot, oprot)"
-               << endl;
-
-    // Read end of args field, the T_STOP, and the struct close
-    f_service_ << indent() << "return True" << endl;
-  }
-
-  indent_down();
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    f_service_ << endl;
-    generate_process_function(tservice, *f_iter);
-  }
-
-  indent_down();
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_py_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  // Open function
-  if (gen_tornado_) {
-    f_service_ << indent() << "@gen.coroutine" << endl << indent() << "def process_"
-               << tfunction->get_name() << "(self, seqid, iprot, oprot):" << endl;
-  } else {
-    f_service_ << indent() << "def process_" << tfunction->get_name()
-               << "(self, seqid, iprot, oprot):" << endl;
-  }
-
-  indent_up();
-
-  string argsname = tfunction->get_name() + "_args";
-  string resultname = tfunction->get_name() + "_result";
-
-  f_service_ << indent() << "args = " << argsname << "()" << endl << indent() << "args.read(iprot)"
-             << endl << indent() << "iprot.readMessageEnd()" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Declare result for non oneway function
-  if (!tfunction->is_oneway()) {
-    f_service_ << indent() << "result = " << resultname << "()" << endl;
-  }
-
-  if (gen_twisted_) {
-    // TODO: Propagate arbitrary exception raised by handler to client as does plain "py"
-
-    // Generate the function call
-    t_struct* arg_struct = tfunction->get_arglist();
-    const std::vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator f_iter;
-
-    f_service_ << indent() << "d = defer.maybeDeferred(self._handler." << tfunction->get_name()
-               << ", ";
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << "args." << (*f_iter)->get_name();
-    }
-    f_service_ << ")" << endl;
-
-    // Shortcut out here for oneway functions
-    if (tfunction->is_oneway()) {
-      f_service_ << indent() << "return d" << endl;
-      indent_down();
-      f_service_ << endl;
-      return;
-    }
-
-    f_service_ << indent() << "d.addCallback(self.write_results_success_" << tfunction->get_name()
-               << ", result, seqid, oprot)" << endl;
-
-    if (xceptions.size() > 0) {
-      f_service_ << indent() << "d.addErrback(self.write_results_exception_"
-                 << tfunction->get_name() << ", result, seqid, oprot)" << endl;
-    }
-
-    f_service_ << indent() << "return d" << endl;
-
-    indent_down();
-    f_service_ << endl;
-
-    indent(f_service_) << "def write_results_success_" << tfunction->get_name()
-                       << "(self, success, result, seqid, oprot):" << endl;
-    indent_up();
-    f_service_ << indent() << "result.success = success" << endl << indent()
-               << "oprot.writeMessageBegin(\"" << tfunction->get_name()
-               << "\", TMessageType.REPLY, seqid)" << endl << indent() << "result.write(oprot)"
-               << endl << indent() << "oprot.writeMessageEnd()" << endl << indent()
-               << "oprot.trans.flush()" << endl;
-    indent_down();
-
-    // Try block for a function with exceptions
-    if (!tfunction->is_oneway() && xceptions.size() > 0) {
-      f_service_ << endl;
-      indent(f_service_) << "def write_results_exception_" << tfunction->get_name()
-                         << "(self, error, result, seqid, oprot):" << endl;
-      indent_up();
-      f_service_ << indent() << "try:" << endl;
-
-      // Kinda absurd
-      f_service_ << indent() << indent_str() << "error.raiseException()" << endl;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ <<
-          indent() << "except " << type_name((*x_iter)->get_type()) << " as " << (*x_iter)->get_name() << ":" << endl;
-        if (!tfunction->is_oneway()) {
-          indent_up();
-          f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
-                     << (*x_iter)->get_name() << endl;
-          indent_down();
-        } else {
-          f_service_ << indent() << "pass" << endl;
-        }
-      }
-      f_service_ << indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name()
-                 << "\", TMessageType.REPLY, seqid)" << endl << indent() << "result.write(oprot)"
-                 << endl << indent() << "oprot.writeMessageEnd()" << endl << indent()
-                 << "oprot.trans.flush()" << endl;
-      indent_down();
-    }
-
-  } else if (gen_tornado_) {
-    // TODO: Propagate arbitrary exception raised by handler to client as does plain "py"
-
-    // Generate the function call
-    t_struct* arg_struct = tfunction->get_arglist();
-    const std::vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator f_iter;
-
-    if (xceptions.size() > 0) {
-      f_service_ << indent() << "try:" << endl;
-      indent_up();
-    }
-    f_service_ << indent();
-    if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-      f_service_ << "result.success = ";
-    }
-    f_service_ << "yield gen.maybe_future(self._handler." << tfunction->get_name() << "(";
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << "args." << (*f_iter)->get_name();
-    }
-    f_service_ << "))" << endl;
-
-    if (!tfunction->is_oneway() && xceptions.size() > 0) {
-      indent_down();
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << " as "
-                   << (*x_iter)->get_name() << ":" << endl;
-        if (!tfunction->is_oneway()) {
-          indent_up();
-          f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
-                     << (*x_iter)->get_name() << endl;
-          indent_down();
-        } else {
-          f_service_ << indent() << "pass" << endl;
-        }
-      }
-    }
-
-    if (!tfunction->is_oneway()) {
-      f_service_ << indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name()
-                 << "\", TMessageType.REPLY, seqid)" << endl << indent() << "result.write(oprot)"
-                 << endl << indent() << "oprot.writeMessageEnd()" << endl << indent()
-                 << "oprot.trans.flush()" << endl;
-    }
-
-    // Close function
-    indent_down();
-
-  } else { // py
-    // Try block for a function with exceptions
-    // It also catches arbitrary exceptions raised by handler method to propagate them to the client
-    f_service_ << indent() << "try:" << endl;
-    indent_up();
-
-    // Generate the function call
-    t_struct* arg_struct = tfunction->get_arglist();
-    const std::vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator f_iter;
-
-    f_service_ << indent();
-    if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-      f_service_ << "result.success = ";
-    }
-    f_service_ << "self._handler." << tfunction->get_name() << "(";
-    bool first = true;
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << "args." << (*f_iter)->get_name();
-    }
-    f_service_ << ")" << endl;
-    if (!tfunction->is_oneway()) {
-      f_service_  << indent() << "msg_type = TMessageType.REPLY" << endl;
-    }
-
-    indent_down();
-    f_service_ << indent()
-               << "except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):" << endl
-               << indent() << indent_str() << "raise" << endl;
-
-    if (!tfunction->is_oneway()) {
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_ << indent() << "except " << type_name((*x_iter)->get_type()) << " as "
-                   << (*x_iter)->get_name() << ":" << endl;
-        if (!tfunction->is_oneway()) {
-          indent_up();
-          f_service_ << indent() << "msg_type = TMessageType.REPLY" << endl;
-          f_service_ << indent() << "result." << (*x_iter)->get_name() << " = "
-                     << (*x_iter)->get_name() << endl;
-          indent_down();
-        } else {
-          f_service_ << indent() << "pass" << endl;
-        }
-      }
-
-      f_service_ << indent() << "except Exception as ex:" << endl
-                 << indent() << indent_str() << "msg_type = TMessageType.EXCEPTION" << endl
-                 << indent() << indent_str() << "logging.exception(ex)" << endl
-                 << indent()
-                 << indent_str() << "result = TApplicationException(TApplicationException.INTERNAL_ERROR, "
-                    "'Internal error')" << endl
-                 << indent() << "oprot.writeMessageBegin(\"" << tfunction->get_name()
-                 << "\", msg_type, seqid)" << endl
-                 << indent() << "result.write(oprot)" << endl
-                 << indent() << "oprot.writeMessageEnd()" << endl
-                 << indent() << "oprot.trans.flush()" << endl;
-    } else {
-      f_service_ << indent() << "except:" << endl
-                 << indent() << indent_str() << "pass" << endl;
-    }
-
-    // Close function
-    indent_down();
-  }
-}
-
-/**
- * Deserializes a field of any type.
- */
-void t_py_generator::generate_deserialize_field(ofstream& out,
-                                                t_field* tfield,
-                                                string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  if (type->is_void()) {
-    throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  string name = prefix + tfield->get_name();
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
-  } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
-  } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << name << " = iprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "readBinary()";
-        } else if(!gen_utf8strings_) {
-          out << "readString()";
-        } else {
-          out << "readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "readBool()";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "readByte()";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "readI16()";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "readI32()";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "readI64()";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "readDouble()";
-        break;
-      default:
-        throw "compiler error: no Python name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "readI32()";
-    }
-    out << endl;
-
-  } else {
-    printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-}
-
-/**
- * Generates an unserializer for a struct, calling read()
- */
-void t_py_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  if (is_immutable(tstruct)) {
-    out << indent() << prefix << " = " << type_name(tstruct) << ".read(iprot)" << endl;
-  } else {
-    out << indent() << prefix << " = " << type_name(tstruct) << "()" << endl
-        << indent() << prefix << ".read(iprot)" << endl;
-  }
-}
-
-/**
- * Serialize a container by writing out the header followed by
- * data and then a footer.
- */
-void t_py_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
-  string size = tmp("_size");
-  string ktype = tmp("_ktype");
-  string vtype = tmp("_vtype");
-  string etype = tmp("_etype");
-
-  t_field fsize(g_type_i32, size);
-  t_field fktype(g_type_i8, ktype);
-  t_field fvtype(g_type_i8, vtype);
-  t_field fetype(g_type_i8, etype);
-
-  // Declare variables, read header
-  if (ttype->is_map()) {
-    out << indent() << prefix << " = {}" << endl << indent() << "(" << ktype << ", " << vtype
-        << ", " << size << ") = iprot.readMapBegin()" << endl;
-  } else if (ttype->is_set()) {
-    out << indent() << prefix << " = set()" << endl << indent() << "(" << etype << ", " << size
-        << ") = iprot.readSetBegin()" << endl;
-  } else if (ttype->is_list()) {
-    out << indent() << prefix << " = []" << endl << indent() << "(" << etype << ", " << size
-        << ") = iprot.readListBegin()" << endl;
-  }
-
-  // For loop iterates over elements
-  string i = tmp("_i");
-  indent(out) <<
-    "for " << i << " in range(" << size << "):" << endl;
-
-  indent_up();
-
-  if (ttype->is_map()) {
-    generate_deserialize_map_element(out, (t_map*)ttype, prefix);
-  } else if (ttype->is_set()) {
-    generate_deserialize_set_element(out, (t_set*)ttype, prefix);
-  } else if (ttype->is_list()) {
-    generate_deserialize_list_element(out, (t_list*)ttype, prefix);
-  }
-
-  indent_down();
-
-  // Read container end
-  if (ttype->is_map()) {
-    indent(out) << "iprot.readMapEnd()" << endl;
-    if (is_immutable(ttype)) {
-      indent(out) << prefix << " = TFrozenDict(" << prefix << ")" << endl;
-    }
-  } else if (ttype->is_set()) {
-    indent(out) << "iprot.readSetEnd()" << endl;
-    if (is_immutable(ttype)) {
-      indent(out) << prefix << " = frozenset(" << prefix << ")" << endl;
-    }
-  } else if (ttype->is_list()) {
-    if (is_immutable(ttype)) {
-      indent(out) << prefix << " = tuple(" << prefix << ")" << endl;
-    }
-    indent(out) << "iprot.readListEnd()" << endl;
-  }
-}
-
-/**
- * Generates code to deserialize a map
- */
-void t_py_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
-  string key = tmp("_key");
-  string val = tmp("_val");
-  t_field fkey(tmap->get_key_type(), key);
-  t_field fval(tmap->get_val_type(), val);
-
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
-
-  indent(out) << prefix << "[" << key << "] = " << val << endl;
-}
-
-/**
- * Write a set element
- */
-void t_py_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tset->get_elem_type(), elem);
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".add(" << elem << ")" << endl;
-}
-
-/**
- * Write a list element
- */
-void t_py_generator::generate_deserialize_list_element(ofstream& out,
-                                                       t_list* tlist,
-                                                       string prefix) {
-  string elem = tmp("_elem");
-  t_field felem(tlist->get_elem_type(), elem);
-
-  generate_deserialize_field(out, &felem);
-
-  indent(out) << prefix << ".append(" << elem << ")" << endl;
-}
-
-/**
- * Serializes a field of any type.
- *
- * @param tfield The field to serialize
- * @param prefix Name to prepend to field name
- */
-void t_py_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
-  t_type* type = get_true_type(tfield->get_type());
-
-  // Do nothing for void types
-  if (type->is_void()) {
-    throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
-  }
-
-  if (type->is_struct() || type->is_xception()) {
-    generate_serialize_struct(out, (t_struct*)type, prefix + tfield->get_name());
-  } else if (type->is_container()) {
-    generate_serialize_container(out, type, prefix + tfield->get_name());
-  } else if (type->is_base_type() || type->is_enum()) {
-
-    string name = prefix + tfield->get_name();
-
-    indent(out) << "oprot.";
-
-    if (type->is_base_type()) {
-      t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-      switch (tbase) {
-      case t_base_type::TYPE_VOID:
-        throw "compiler error: cannot serialize void field in a struct: " + name;
-        break;
-      case t_base_type::TYPE_STRING:
-        if (((t_base_type*)type)->is_binary()) {
-          out << "writeBinary(" << name << ")";
-        } else if (!gen_utf8strings_) {
-          out << "writeString(" << name << ")";
-        } else {
-          out << "writeString(" << name << ".encode('utf-8') if sys.version_info[0] == 2 else " << name << ")";
-        }
-        break;
-      case t_base_type::TYPE_BOOL:
-        out << "writeBool(" << name << ")";
-        break;
-      case t_base_type::TYPE_I8:
-        out << "writeByte(" << name << ")";
-        break;
-      case t_base_type::TYPE_I16:
-        out << "writeI16(" << name << ")";
-        break;
-      case t_base_type::TYPE_I32:
-        out << "writeI32(" << name << ")";
-        break;
-      case t_base_type::TYPE_I64:
-        out << "writeI64(" << name << ")";
-        break;
-      case t_base_type::TYPE_DOUBLE:
-        out << "writeDouble(" << name << ")";
-        break;
-      default:
-        throw "compiler error: no Python name for base type " + t_base_type::t_base_name(tbase);
-      }
-    } else if (type->is_enum()) {
-      out << "writeI32(" << name << ")";
-    }
-    out << endl;
-  } else {
-    printf("DO NOT KNOW HOW TO SERIALIZE FIELD '%s%s' TYPE '%s'\n",
-           prefix.c_str(),
-           tfield->get_name().c_str(),
-           type->get_name().c_str());
-  }
-}
-
-/**
- * Serializes all the members of a struct.
- *
- * @param tstruct The struct to serialize
- * @param prefix  String prefix to attach to all fields
- */
-void t_py_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  (void)tstruct;
-  indent(out) << prefix << ".write(oprot)" << endl;
-}
-
-void t_py_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
-  if (ttype->is_map()) {
-    indent(out) << "oprot.writeMapBegin(" << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
-                << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
-                << "len(" << prefix << "))" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetBegin(" << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", "
-                << "len(" << prefix << "))" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListBegin(" << type_to_enum(((t_list*)ttype)->get_elem_type())
-                << ", "
-                << "len(" << prefix << "))" << endl;
-  }
-
-  if (ttype->is_map()) {
-    string kiter = tmp("kiter");
-    string viter = tmp("viter");
-    indent(out) << "for " << kiter << ", " << viter << " in " << prefix << ".items():" << endl;
-    indent_up();
-    generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
-    indent_down();
-  } else if (ttype->is_set()) {
-    string iter = tmp("iter");
-    indent(out) << "for " << iter << " in " << prefix << ":" << endl;
-    indent_up();
-    generate_serialize_set_element(out, (t_set*)ttype, iter);
-    indent_down();
-  } else if (ttype->is_list()) {
-    string iter = tmp("iter");
-    indent(out) << "for " << iter << " in " << prefix << ":" << endl;
-    indent_up();
-    generate_serialize_list_element(out, (t_list*)ttype, iter);
-    indent_down();
-  }
-
-  if (ttype->is_map()) {
-    indent(out) << "oprot.writeMapEnd()" << endl;
-  } else if (ttype->is_set()) {
-    indent(out) << "oprot.writeSetEnd()" << endl;
-  } else if (ttype->is_list()) {
-    indent(out) << "oprot.writeListEnd()" << endl;
-  }
-}
-
-/**
- * Serializes the members of a map.
- *
- */
-void t_py_generator::generate_serialize_map_element(ofstream& out,
-                                                    t_map* tmap,
-                                                    string kiter,
-                                                    string viter) {
-  t_field kfield(tmap->get_key_type(), kiter);
-  generate_serialize_field(out, &kfield, "");
-
-  t_field vfield(tmap->get_val_type(), viter);
-  generate_serialize_field(out, &vfield, "");
-}
-
-/**
- * Serializes the members of a set.
- */
-void t_py_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
-  t_field efield(tset->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Serializes the members of a list.
- */
-void t_py_generator::generate_serialize_list_element(ofstream& out, t_list* tlist, string iter) {
-  t_field efield(tlist->get_elem_type(), iter);
-  generate_serialize_field(out, &efield, "");
-}
-
-/**
- * Generates the docstring for a given struct.
- */
-void t_py_generator::generate_python_docstring(ofstream& out, t_struct* tstruct) {
-  generate_python_docstring(out, tstruct, tstruct, "Attributes");
-}
-
-/**
- * Generates the docstring for a given function.
- */
-void t_py_generator::generate_python_docstring(ofstream& out, t_function* tfunction) {
-  generate_python_docstring(out, tfunction, tfunction->get_arglist(), "Parameters");
-}
-
-/**
- * Generates the docstring for a struct or function.
- */
-void t_py_generator::generate_python_docstring(ofstream& out,
-                                               t_doc* tdoc,
-                                               t_struct* tstruct,
-                                               const char* subheader) {
-  bool has_doc = false;
-  stringstream ss;
-  if (tdoc->has_doc()) {
-    has_doc = true;
-    ss << tdoc->get_doc();
-  }
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  if (fields.size() > 0) {
-    if (has_doc) {
-      ss << endl;
-    }
-    has_doc = true;
-    ss << subheader << ":\n";
-    vector<t_field*>::const_iterator p_iter;
-    for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
-      t_field* p = *p_iter;
-      ss << " - " << p->get_name();
-      if (p->has_doc()) {
-        ss << ": " << p->get_doc();
-      } else {
-        ss << endl;
-      }
-    }
-  }
-
-  if (has_doc) {
-    generate_docstring_comment(out, "\"\"\"\n", "", ss.str(), "\"\"\"\n");
-  }
-}
-
-/**
- * Generates the docstring for a generic object.
- */
-void t_py_generator::generate_python_docstring(ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    generate_docstring_comment(out, "\"\"\"\n", "", tdoc->get_doc(), "\"\"\"\n");
-  }
-}
-
-/**
- * Declares an argument, which may include initialization as necessary.
- *
- * @param tfield The field
- */
-string t_py_generator::declare_argument(t_field* tfield) {
-  std::ostringstream result;
-  result << tfield->get_name() << "=";
-  if (tfield->get_value() != NULL) {
-    result << "thrift_spec[" << tfield->get_key() << "][4]";
-  } else {
-    result << "None";
-  }
-  return result.str();
-}
-
-/**
- * Renders a field default value, returns None otherwise.
- *
- * @param tfield The field
- */
-string t_py_generator::render_field_default_value(t_field* tfield) {
-  t_type* type = get_true_type(tfield->get_type());
-  if (tfield->get_value() != NULL) {
-    return render_const_value(type, tfield->get_value());
-  } else {
-    return "None";
-  }
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_py_generator::function_signature(t_function* tfunction, bool interface) {
-  vector<string> pre;
-  vector<string> post;
-  string signature = tfunction->get_name() + "(";
-
-  if (!(gen_twisted_ && interface)) {
-    pre.push_back("self");
-  }
-
-  signature += argument_list(tfunction->get_arglist(), &pre, &post) + ")";
-  return signature;
-}
-
-/**
- * Renders a field list
- */
-string t_py_generator::argument_list(t_struct* tstruct, vector<string>* pre, vector<string>* post) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  vector<string>::const_iterator s_iter;
-  bool first = true;
-  if (pre) {
-    for (s_iter = pre->begin(); s_iter != pre->end(); ++s_iter) {
-      if (first) {
-        first = false;
-      } else {
-        result += ", ";
-      }
-      result += *s_iter;
-    }
-  }
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += (*f_iter)->get_name();
-  }
-  if (post) {
-    for (s_iter = post->begin(); s_iter != post->end(); ++s_iter) {
-      if (first) {
-        first = false;
-      } else {
-        result += ", ";
-      }
-      result += *s_iter;
-    }
-  }
-  return result;
-}
-
-string t_py_generator::type_name(t_type* ttype) {
-  while (ttype->is_typedef()) {
-    ttype = ((t_typedef*)ttype)->get_type();
-  }
-
-  t_program* program = ttype->get_program();
-  if (ttype->is_service()) {
-    return get_real_py_module(program, gen_twisted_, package_prefix_) + "." + ttype->get_name();
-  }
-  if (program != NULL && program != program_) {
-    return get_real_py_module(program, gen_twisted_, package_prefix_) + ".ttypes." + ttype->get_name();
-  }
-  return ttype->get_name();
-}
-
-/**
- * Converts the parse type to a Python tyoe
- */
-string t_py_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType.STRING";
-    case t_base_type::TYPE_BOOL:
-      return "TType.BOOL";
-    case t_base_type::TYPE_I8:
-      return "TType.BYTE";
-    case t_base_type::TYPE_I16:
-      return "TType.I16";
-    case t_base_type::TYPE_I32:
-      return "TType.I32";
-    case t_base_type::TYPE_I64:
-      return "TType.I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType.DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "TType.I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType.STRUCT";
-  } else if (type->is_map()) {
-    return "TType.MAP";
-  } else if (type->is_set()) {
-    return "TType.SET";
-  } else if (type->is_list()) {
-    return "TType.LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-/** See the comment inside generate_py_struct_definition for what this is. */
-string t_py_generator::type_to_spec_args(t_type* ttype) {
-  while (ttype->is_typedef()) {
-    ttype = ((t_typedef*)ttype)->get_type();
-  }
-
-  if (ttype->is_base_type() && reinterpret_cast<t_base_type*>(ttype)->is_binary()) {
-    return  "'BINARY'";
-  } else if (gen_utf8strings_ && ttype->is_base_type()
-             && reinterpret_cast<t_base_type*>(ttype)->is_string()) {
-    return "'UTF8'";
-  } else if (ttype->is_base_type() || ttype->is_enum()) {
-    return  "None";
-  } else if (ttype->is_struct() || ttype->is_xception()) {
-    return "(" + type_name(ttype) + ", " + type_name(ttype) + ".thrift_spec)";
-  } else if (ttype->is_map()) {
-    return "(" + type_to_enum(((t_map*)ttype)->get_key_type()) + ", "
-           + type_to_spec_args(((t_map*)ttype)->get_key_type()) + ", "
-           + type_to_enum(((t_map*)ttype)->get_val_type()) + ", "
-           + type_to_spec_args(((t_map*)ttype)->get_val_type()) + ", "
-           + (is_immutable(ttype) ? "True" : "False") + ")";
-
-  } else if (ttype->is_set()) {
-    return "(" + type_to_enum(((t_set*)ttype)->get_elem_type()) + ", "
-           + type_to_spec_args(((t_set*)ttype)->get_elem_type()) + ", "
-           + (is_immutable(ttype) ? "True" : "False") + ")";
-
-  } else if (ttype->is_list()) {
-    return "(" + type_to_enum(((t_list*)ttype)->get_elem_type()) + ", "
-           + type_to_spec_args(((t_list*)ttype)->get_elem_type()) + ", "
-           + (is_immutable(ttype) ? "True" : "False") + ")";
-  }
-
-  throw "INVALID TYPE IN type_to_spec_args: " + ttype->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(
-    py,
-    "Python",
-    "    twisted:         Generate Twisted-friendly RPC services.\n"
-    "    tornado:         Generate code for use with Tornado.\n"
-    "    no_utf8strings:  Do not Encode/decode strings using utf8 in the generated code. Basically no effect for Python 3.\n"
-    "    coding=CODING:   Add file encoding declare in generated file.\n"
-    "    slots:           Generate code using slots for instance members.\n"
-    "    dynamic:         Generate dynamic code, less code generated but slower.\n"
-    "    dynbase=CLS      Derive generated classes from class CLS instead of TBase.\n"
-    "    dynfrozen=CLS    Derive generated immutable classes from class CLS instead of TFrozenBase.\n"
-    "    dynexc=CLS       Derive generated exceptions from CLS instead of TExceptionBase.\n"
-    "    dynimport='from foo.bar import CLS'\n"
-    "                     Add an import line to generated code to find the dynbase class.\n"
-    "    package_prefix='top.package.'\n"
-    "                     Package prefix for generated files.\n"
-    "    old_style:       Deprecated. Generate old-style classes.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_rb_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_rb_generator.cc
deleted file mode 100644
index 924f6f6..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_rb_generator.cc
+++ /dev/null
@@ -1,1263 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sstream>
-
-#include "thrift/platform.h"
-#include "thrift/version.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * A subclass of std::ofstream that includes indenting functionality.
- */
-class t_rb_ofstream : public std::ofstream {
-private:
-  int indent_;
-
-public:
-  t_rb_ofstream() : std::ofstream(), indent_(0) {}
-  explicit t_rb_ofstream(const char* filename,
-                         ios_base::openmode mode = ios_base::out,
-                         int indent = 0)
-    : std::ofstream(filename, mode), indent_(indent) {}
-
-  t_rb_ofstream& indent() {
-    for (int i = 0; i < indent_; ++i) {
-      *this << "  ";
-    }
-    return *this;
-  }
-
-  void indent_up() { indent_++; }
-  void indent_down() { indent_--; }
-};
-
-/**
- * Ruby code generator.
- *
- */
-class t_rb_generator : public t_oop_generator {
-public:
-  t_rb_generator(t_program* program,
-                 const std::map<std::string, std::string>& parsed_options,
-                 const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    require_rubygems_ = false;
-    namespaced_ = false;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("rubygems") == 0) {
-        require_rubygems_ = true;
-      } else if( iter->first.compare("namespaced") == 0) {
-        namespaced_ = true;
-      } else {
-        throw "unknown option ruby:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-rb";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_union(t_struct* tunion);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  t_rb_ofstream& render_const_value(t_rb_ofstream& out, t_type* type, t_const_value* value);
-
-  /**
-   * Struct generation code
-   */
-
-  void generate_rb_struct(t_rb_ofstream& out, t_struct* tstruct, bool is_exception);
-  void generate_rb_struct_required_validator(t_rb_ofstream& out, t_struct* tstruct);
-  void generate_rb_union(t_rb_ofstream& out, t_struct* tstruct, bool is_exception);
-  void generate_rb_union_validator(t_rb_ofstream& out, t_struct* tstruct);
-  void generate_rb_function_helpers(t_function* tfunction);
-  void generate_rb_simple_constructor(t_rb_ofstream& out, t_struct* tstruct);
-  void generate_rb_simple_exception_constructor(t_rb_ofstream& out, t_struct* tstruct);
-  void generate_field_constants(t_rb_ofstream& out, t_struct* tstruct);
-  void generate_field_constructors(t_rb_ofstream& out, t_struct* tstruct);
-  void generate_field_defns(t_rb_ofstream& out, t_struct* tstruct);
-  void generate_field_data(t_rb_ofstream& out,
-                           t_type* field_type,
-                           const std::string& field_name,
-                           t_const_value* field_value,
-                           bool optional);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_helpers(t_service* tservice);
-  void generate_service_interface(t_service* tservice);
-  void generate_service_client(t_service* tservice);
-  void generate_service_server(t_service* tservice);
-  void generate_process_function(t_service* tservice, t_function* tfunction);
-
-  /**
-   * Serialization constructs
-   */
-
-  void generate_deserialize_field(t_rb_ofstream& out,
-                                  t_field* tfield,
-                                  std::string prefix = "",
-                                  bool inclass = false);
-
-  void generate_deserialize_struct(t_rb_ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_deserialize_container(t_rb_ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_deserialize_set_element(t_rb_ofstream& out, t_set* tset, std::string prefix = "");
-
-  void generate_deserialize_map_element(t_rb_ofstream& out, t_map* tmap, std::string prefix = "");
-
-  void generate_deserialize_list_element(t_rb_ofstream& out,
-                                         t_list* tlist,
-                                         std::string prefix = "");
-
-  void generate_serialize_field(t_rb_ofstream& out, t_field* tfield, std::string prefix = "");
-
-  void generate_serialize_struct(t_rb_ofstream& out, t_struct* tstruct, std::string prefix = "");
-
-  void generate_serialize_container(t_rb_ofstream& out, t_type* ttype, std::string prefix = "");
-
-  void generate_serialize_map_element(t_rb_ofstream& out,
-                                      t_map* tmap,
-                                      std::string kiter,
-                                      std::string viter);
-
-  void generate_serialize_set_element(t_rb_ofstream& out, t_set* tmap, std::string iter);
-
-  void generate_serialize_list_element(t_rb_ofstream& out, t_list* tlist, std::string iter);
-
-  void generate_rdoc(t_rb_ofstream& out, t_doc* tdoc);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string rb_autogen_comment();
-  std::string render_require_thrift();
-  std::string render_includes();
-  std::string declare_field(t_field* tfield);
-  std::string type_name(const t_type* ttype);
-  std::string full_type_name(const t_type* ttype);
-  std::string function_signature(t_function* tfunction, std::string prefix = "");
-  std::string argument_list(t_struct* tstruct);
-  std::string type_to_enum(t_type* ttype);
-  std::string rb_namespace_to_path_prefix(std::string rb_namespace);
-
-  std::vector<std::string> ruby_modules(const t_program* p) {
-    std::string ns = p->get_namespace("rb");
-    std::vector<std::string> modules;
-    if (ns.empty()) {
-      return modules;
-    }
-
-    std::string::iterator pos = ns.begin();
-    while (true) {
-      std::string::iterator delim = std::find(pos, ns.end(), '.');
-      modules.push_back(capitalize(std::string(pos, delim)));
-      pos = delim;
-      if (pos == ns.end()) {
-        break;
-      }
-      ++pos;
-    }
-
-    return modules;
-  }
-
-  void begin_namespace(t_rb_ofstream&, std::vector<std::string>);
-  void end_namespace(t_rb_ofstream&, std::vector<std::string>);
-
-private:
-  /**
-   * File streams
-   */
-
-  t_rb_ofstream f_types_;
-  t_rb_ofstream f_consts_;
-  t_rb_ofstream f_service_;
-
-  std::string namespace_dir_;
-  std::string require_prefix_;
-
-  /** If true, add a "require 'rubygems'" line to the top of each gen-rb file. */
-  bool require_rubygems_;
-
-  /** If true, generate files in idiomatic namespaced directories. */
-  bool namespaced_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_rb_generator::init_generator() {
-  string subdir = get_out_dir();
-
-  // Make output directory
-  MKDIR(subdir.c_str());
-
-  if (namespaced_) {
-    require_prefix_ = rb_namespace_to_path_prefix(program_->get_namespace("rb"));
-
-    string dir = require_prefix_;
-    string::size_type loc;
-
-    while ((loc = dir.find("/")) != string::npos) {
-      subdir = subdir + dir.substr(0, loc) + "/";
-      MKDIR(subdir.c_str());
-      dir = dir.substr(loc + 1);
-    }
-  }
-
-  namespace_dir_ = subdir;
-
-  // Make output file
-  string f_types_name = namespace_dir_ + underscore(program_name_) + "_types.rb";
-  f_types_.open(f_types_name.c_str());
-
-  string f_consts_name = namespace_dir_ + underscore(program_name_) + "_constants.rb";
-  f_consts_.open(f_consts_name.c_str());
-
-  // Print header
-  f_types_ << rb_autogen_comment() << endl << render_require_thrift() << render_includes() << endl;
-  begin_namespace(f_types_, ruby_modules(program_));
-
-  f_consts_ << rb_autogen_comment() << endl << render_require_thrift() << "require '"
-            << require_prefix_ << underscore(program_name_) << "_types'" << endl << endl;
-  begin_namespace(f_consts_, ruby_modules(program_));
-}
-
-/**
- * Renders the require of thrift itself, and possibly of the rubygems dependency.
- */
-string t_rb_generator::render_require_thrift() {
-  if (require_rubygems_) {
-    return "require 'rubygems'\nrequire 'thrift'\n";
-  } else {
-    return "require 'thrift'\n";
-  }
-}
-
-/**
- * Renders all the imports necessary for including another Thrift program
- */
-string t_rb_generator::render_includes() {
-  const vector<t_program*>& includes = program_->get_includes();
-  string result = "";
-  for (size_t i = 0; i < includes.size(); ++i) {
-    if (namespaced_) {
-      t_program* included = includes[i];
-      std::string included_require_prefix
-          = rb_namespace_to_path_prefix(included->get_namespace("rb"));
-      std::string included_name = included->get_name();
-      result += "require '" + included_require_prefix + underscore(included_name) + "_types'\n";
-    } else {
-      result += "require '" + underscore(includes[i]->get_name()) + "_types'\n";
-    }
-  }
-  if (includes.size() > 0) {
-    result += "\n";
-  }
-  return result;
-}
-
-/**
- * Autogen'd comment
- */
-string t_rb_generator::rb_autogen_comment() {
-  return std::string("#\n") + "# Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-         + "#\n" + "# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" + "#\n";
-}
-
-/**
- * Closes the type files
- */
-void t_rb_generator::close_generator() {
-  // Close types file
-  end_namespace(f_types_, ruby_modules(program_));
-  end_namespace(f_consts_, ruby_modules(program_));
-  f_types_.close();
-  f_consts_.close();
-}
-
-/**
- * Generates a typedef. This is not done in Ruby, types are all implicit.
- *
- * @param ttypedef The type definition
- */
-void t_rb_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-/**
- * Generates code for an enumerated type. Done using a class to scope
- * the values.
- *
- * @param tenum The enumeration
- */
-void t_rb_generator::generate_enum(t_enum* tenum) {
-  f_types_.indent() << "module " << capitalize(tenum->get_name()) << endl;
-  f_types_.indent_up();
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-
-    // Ruby class constants have to be capitalized... omg i am so on the fence
-    // about languages strictly enforcing capitalization why can't we just all
-    // agree and play nice.
-    string name = capitalize((*c_iter)->get_name());
-
-    generate_rdoc(f_types_, *c_iter);
-    f_types_.indent() << name << " = " << value << endl;
-  }
-
-  // Create a hash mapping values back to their names (as strings) since ruby has no native enum
-  // type
-  f_types_.indent() << "VALUE_MAP = {";
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    // Populate the hash
-    int value = (*c_iter)->get_value();
-    if (c_iter != constants.begin())
-      f_types_ << ", ";
-    f_types_ << value << " => \"" << capitalize((*c_iter)->get_name()) << "\"";
-  }
-  f_types_ << "}" << endl;
-
-  // Create a set with valid values for this enum
-  f_types_.indent() << "VALID_VALUES = Set.new([";
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    // Populate the set
-    if (c_iter != constants.begin())
-      f_types_ << ", ";
-    f_types_ << capitalize((*c_iter)->get_name());
-  }
-  f_types_ << "]).freeze" << endl;
-
-  f_types_.indent_down();
-  f_types_.indent() << "end" << endl << endl;
-}
-
-/**
- * Generate a constant value
- */
-void t_rb_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = tconst->get_name();
-  t_const_value* value = tconst->get_value();
-
-  name[0] = toupper(name[0]);
-
-  f_consts_.indent() << name << " = ";
-  render_const_value(f_consts_, type, value) << endl << endl;
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-t_rb_ofstream& t_rb_generator::render_const_value(t_rb_ofstream& out,
-                                                  t_type* type,
-                                                  t_const_value* value) {
-  type = get_true_type(type);
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << "%q\"" << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    out.indent() << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    out << full_type_name(type) << ".new({" << endl;
-    out.indent_up();
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-      out.indent();
-      render_const_value(out, g_type_string, v_iter->first) << " => ";
-      render_const_value(out, field_type, v_iter->second) << "," << endl;
-    }
-    out.indent_down();
-    out.indent() << "})";
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    out << "{" << endl;
-    out.indent_up();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out.indent();
-      render_const_value(out, ktype, v_iter->first) << " => ";
-      render_const_value(out, vtype, v_iter->second) << "," << endl;
-    }
-    out.indent_down();
-    out.indent() << "}";
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    if (type->is_set()) {
-      out << "Set.new([" << endl;
-    } else {
-      out << "[" << endl;
-    }
-    out.indent_up();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out.indent();
-      render_const_value(out, etype, *v_iter) << "," << endl;
-    }
-    out.indent_down();
-    if (type->is_set()) {
-      out.indent() << "])";
-    } else {
-      out.indent() << "]";
-    }
-  } else {
-    throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
-  }
-  return out;
-}
-
-/**
- * Generates a ruby struct
- */
-void t_rb_generator::generate_struct(t_struct* tstruct) {
-  if (tstruct->is_union()) {
-    generate_rb_union(f_types_, tstruct, false);
-  } else {
-    generate_rb_struct(f_types_, tstruct, false);
-  }
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct but extends the Exception class.
- *
- * @param txception The struct definition
- */
-void t_rb_generator::generate_xception(t_struct* txception) {
-  generate_rb_struct(f_types_, txception, true);
-}
-
-/**
- * Generates a ruby struct
- */
-void t_rb_generator::generate_rb_struct(t_rb_ofstream& out,
-                                        t_struct* tstruct,
-                                        bool is_exception = false) {
-  generate_rdoc(out, tstruct);
-  out.indent() << "class " << type_name(tstruct);
-  if (is_exception) {
-    out << " < ::Thrift::Exception";
-  }
-  out << endl;
-
-  out.indent_up();
-  out.indent() << "include ::Thrift::Struct, ::Thrift::Struct_Union" << endl;
-
-  if (is_exception) {
-    generate_rb_simple_exception_constructor(out, tstruct);
-  }
-
-  generate_field_constants(out, tstruct);
-  generate_field_defns(out, tstruct);
-  generate_rb_struct_required_validator(out, tstruct);
-
-  out.indent() << "::Thrift::Struct.generate_accessors self" << endl;
-
-  out.indent_down();
-  out.indent() << "end" << endl << endl;
-}
-
-/**
- * Generates a ruby union
- */
-void t_rb_generator::generate_rb_union(t_rb_ofstream& out,
-                                       t_struct* tstruct,
-                                       bool is_exception = false) {
-  (void)is_exception;
-  generate_rdoc(out, tstruct);
-  out.indent() << "class " << type_name(tstruct) << " < ::Thrift::Union" << endl;
-
-  out.indent_up();
-  out.indent() << "include ::Thrift::Struct_Union" << endl;
-
-  generate_field_constructors(out, tstruct);
-
-  generate_field_constants(out, tstruct);
-  generate_field_defns(out, tstruct);
-  generate_rb_union_validator(out, tstruct);
-
-  out.indent() << "::Thrift::Union.generate_accessors self" << endl;
-
-  out.indent_down();
-  out.indent() << "end" << endl << endl;
-}
-
-void t_rb_generator::generate_field_constructors(t_rb_ofstream& out, t_struct* tstruct) {
-
-  out.indent() << "class << self" << endl;
-  out.indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (f_iter != fields.begin()) {
-      out << endl;
-    }
-    std::string field_name = (*f_iter)->get_name();
-
-    out.indent() << "def " << field_name << "(val)" << endl;
-    out.indent() << "  " << tstruct->get_name() << ".new(:" << field_name << ", val)" << endl;
-    out.indent() << "end" << endl;
-  }
-
-  out.indent_down();
-  out.indent() << "end" << endl;
-
-  out << endl;
-}
-
-void t_rb_generator::generate_rb_simple_exception_constructor(t_rb_ofstream& out,
-                                                              t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-
-  if (members.size() == 1) {
-    vector<t_field*>::const_iterator m_iter = members.begin();
-
-    if ((*m_iter)->get_type()->is_string()) {
-      string name = (*m_iter)->get_name();
-
-      out.indent() << "def initialize(message=nil)" << endl;
-      out.indent_up();
-      out.indent() << "super()" << endl;
-      out.indent() << "self." << name << " = message" << endl;
-      out.indent_down();
-      out.indent() << "end" << endl << endl;
-
-      if (name != "message") {
-        out.indent() << "def message; " << name << " end" << endl << endl;
-      }
-    }
-  }
-}
-
-void t_rb_generator::generate_field_constants(t_rb_ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    std::string field_name = (*f_iter)->get_name();
-    std::string cap_field_name = upcase_string(field_name);
-
-    out.indent() << cap_field_name << " = " << (*f_iter)->get_key() << endl;
-  }
-  out << endl;
-}
-
-void t_rb_generator::generate_field_defns(t_rb_ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out.indent() << "FIELDS = {" << endl;
-  out.indent_up();
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (f_iter != fields.begin()) {
-      out << "," << endl;
-    }
-
-    // generate the field docstrings within the FIELDS constant. no real better place...
-    generate_rdoc(out, *f_iter);
-
-    out.indent() << upcase_string((*f_iter)->get_name()) << " => ";
-
-    generate_field_data(out,
-                        (*f_iter)->get_type(),
-                        (*f_iter)->get_name(),
-                        (*f_iter)->get_value(),
-                        (*f_iter)->get_req() == t_field::T_OPTIONAL);
-  }
-  out.indent_down();
-  out << endl;
-  out.indent() << "}" << endl << endl;
-
-  out.indent() << "def struct_fields; FIELDS; end" << endl << endl;
-}
-
-void t_rb_generator::generate_field_data(t_rb_ofstream& out,
-                                         t_type* field_type,
-                                         const std::string& field_name = "",
-                                         t_const_value* field_value = NULL,
-                                         bool optional = false) {
-  field_type = get_true_type(field_type);
-
-  // Begin this field's defn
-  out << "{:type => " << type_to_enum(field_type);
-
-  if (!field_name.empty()) {
-    out << ", :name => '" << field_name << "'";
-  }
-
-  if (field_value != NULL) {
-    out << ", :default => ";
-    render_const_value(out, field_type, field_value);
-  }
-
-  if (!field_type->is_base_type()) {
-    if (field_type->is_struct() || field_type->is_xception()) {
-      out << ", :class => " << full_type_name((t_struct*)field_type);
-    } else if (field_type->is_list()) {
-      out << ", :element => ";
-      generate_field_data(out, ((t_list*)field_type)->get_elem_type());
-    } else if (field_type->is_map()) {
-      out << ", :key => ";
-      generate_field_data(out, ((t_map*)field_type)->get_key_type());
-      out << ", :value => ";
-      generate_field_data(out, ((t_map*)field_type)->get_val_type());
-    } else if (field_type->is_set()) {
-      out << ", :element => ";
-      generate_field_data(out, ((t_set*)field_type)->get_elem_type());
-    }
-  } else {
-    if (((t_base_type*)field_type)->is_binary()) {
-      out << ", :binary => true";
-    }
-  }
-
-  if (optional) {
-    out << ", :optional => true";
-  }
-
-  if (field_type->is_enum()) {
-    out << ", :enum_class => " << full_type_name(field_type);
-  }
-
-  // End of this field's defn
-  out << "}";
-}
-
-void t_rb_generator::begin_namespace(t_rb_ofstream& out, vector<std::string> modules) {
-  for (vector<std::string>::iterator m_iter = modules.begin(); m_iter != modules.end(); ++m_iter) {
-    out.indent() << "module " << *m_iter << endl;
-    out.indent_up();
-  }
-}
-
-void t_rb_generator::end_namespace(t_rb_ofstream& out, vector<std::string> modules) {
-  for (vector<std::string>::reverse_iterator m_iter = modules.rbegin(); m_iter != modules.rend();
-       ++m_iter) {
-    out.indent_down();
-    out.indent() << "end" << endl;
-  }
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_rb_generator::generate_service(t_service* tservice) {
-  string f_service_name = namespace_dir_ + underscore(service_name_) + ".rb";
-  f_service_.open(f_service_name.c_str());
-
-  f_service_ << rb_autogen_comment() << endl << render_require_thrift();
-
-  if (tservice->get_extends() != NULL) {
-    if (namespaced_) {
-      f_service_ << "require '" << rb_namespace_to_path_prefix(
-                                       tservice->get_extends()->get_program()->get_namespace("rb"))
-                 << underscore(tservice->get_extends()->get_name()) << "'" << endl;
-    } else {
-      f_service_ << "require '" << require_prefix_
-                 << underscore(tservice->get_extends()->get_name()) << "'" << endl;
-    }
-  }
-
-  f_service_ << "require '" << require_prefix_ << underscore(program_name_) << "_types'" << endl
-             << endl;
-
-  begin_namespace(f_service_, ruby_modules(tservice->get_program()));
-
-  f_service_.indent() << "module " << capitalize(tservice->get_name()) << endl;
-  f_service_.indent_up();
-
-  // Generate the three main parts of the service (well, two for now in PHP)
-  generate_service_client(tservice);
-  generate_service_server(tservice);
-  generate_service_helpers(tservice);
-
-  f_service_.indent_down();
-  f_service_.indent() << "end" << endl << endl;
-
-  end_namespace(f_service_, ruby_modules(tservice->get_program()));
-
-  // Close service file
-  f_service_.close();
-}
-
-/**
- * Generates helper functions for a service.
- *
- * @param tservice The service to generate a header definition for
- */
-void t_rb_generator::generate_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  f_service_.indent() << "# HELPER FUNCTIONS AND STRUCTURES" << endl << endl;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* ts = (*f_iter)->get_arglist();
-    generate_rb_struct(f_service_, ts);
-    generate_rb_function_helpers(*f_iter);
-  }
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_rb_generator::generate_rb_function_helpers(t_function* tfunction) {
-  t_struct result(program_, tfunction->get_name() + "_result");
-  t_field success(tfunction->get_returntype(), "success", 0);
-  if (!tfunction->get_returntype()->is_void()) {
-    result.append(&success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    result.append(*f_iter);
-  }
-  generate_rb_struct(f_service_, &result);
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_rb_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "";
-  if (tservice->get_extends() != NULL) {
-    extends = full_type_name(tservice->get_extends());
-    extends_client = " < " + extends + "::Client ";
-  }
-
-  f_service_.indent() << "class Client" << extends_client << endl;
-  f_service_.indent_up();
-
-  f_service_.indent() << "include ::Thrift::Client" << endl << endl;
-
-  // Generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    t_struct* arg_struct = (*f_iter)->get_arglist();
-    const vector<t_field*>& fields = arg_struct->get_members();
-    vector<t_field*>::const_iterator fld_iter;
-    string funname = (*f_iter)->get_name();
-
-    // Open function
-    f_service_.indent() << "def " << function_signature(*f_iter) << endl;
-    f_service_.indent_up();
-    f_service_.indent() << "send_" << funname << "(";
-
-    bool first = true;
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      if (first) {
-        first = false;
-      } else {
-        f_service_ << ", ";
-      }
-      f_service_ << (*fld_iter)->get_name();
-    }
-    f_service_ << ")" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_service_.indent();
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_ << "return ";
-      }
-      f_service_ << "recv_" << funname << "()" << endl;
-    }
-    f_service_.indent_down();
-    f_service_.indent() << "end" << endl;
-    f_service_ << endl;
-
-    f_service_.indent() << "def send_" << function_signature(*f_iter) << endl;
-    f_service_.indent_up();
-
-    std::string argsname = capitalize((*f_iter)->get_name() + "_args");
-    std::string messageSendProc = (*f_iter)->is_oneway() ? "send_oneway_message" : "send_message";
-
-    f_service_.indent() << messageSendProc << "('" << funname << "', " << argsname;
-
-    for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-      f_service_ << ", :" << (*fld_iter)->get_name() << " => " << (*fld_iter)->get_name();
-    }
-
-    f_service_ << ")" << endl;
-
-    f_service_.indent_down();
-    f_service_.indent() << "end" << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      std::string resultname = capitalize((*f_iter)->get_name() + "_result");
-      t_struct noargs(program_);
-
-      t_function recv_function((*f_iter)->get_returntype(),
-                               string("recv_") + (*f_iter)->get_name(),
-                               &noargs);
-      // Open function
-      f_service_ << endl;
-      f_service_.indent() << "def " << function_signature(&recv_function) << endl;
-      f_service_.indent_up();
-
-      // TODO(mcslee): Validate message reply here, seq ids etc.
-
-      f_service_.indent() << "result = receive_message(" << resultname << ")" << endl;
-
-      // Careful, only return _result if not a void function
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        f_service_.indent() << "return result.success unless result.success.nil?" << endl;
-      }
-
-      t_struct* xs = (*f_iter)->get_xceptions();
-      const std::vector<t_field*>& xceptions = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-      for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-        f_service_.indent() << "raise result." << (*x_iter)->get_name() << " unless result."
-                            << (*x_iter)->get_name() << ".nil?" << endl;
-      }
-
-      // Careful, only return _result if not a void function
-      if ((*f_iter)->get_returntype()->is_void()) {
-        f_service_.indent() << "return" << endl;
-      } else {
-        f_service_.indent() << "raise "
-                               "::Thrift::ApplicationException.new(::Thrift::ApplicationException::"
-                               "MISSING_RESULT, '" << (*f_iter)->get_name()
-                            << " failed: unknown result')" << endl;
-      }
-
-      // Close function
-      f_service_.indent_down();
-      f_service_.indent() << "end" << endl << endl;
-    }
-  }
-
-  f_service_.indent_down();
-  f_service_.indent() << "end" << endl << endl;
-}
-
-/**
- * Generates a service server definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_rb_generator::generate_service_server(t_service* tservice) {
-  // Generate the dispatch methods
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  string extends = "";
-  string extends_processor = "";
-  if (tservice->get_extends() != NULL) {
-    extends = full_type_name(tservice->get_extends());
-    extends_processor = " < " + extends + "::Processor ";
-  }
-
-  // Generate the header portion
-  f_service_.indent() << "class Processor" << extends_processor << endl;
-  f_service_.indent_up();
-
-  f_service_.indent() << "include ::Thrift::Processor" << endl << endl;
-
-  // Generate the process subfunctions
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    generate_process_function(tservice, *f_iter);
-  }
-
-  f_service_.indent_down();
-  f_service_.indent() << "end" << endl << endl;
-}
-
-/**
- * Generates a process function definition.
- *
- * @param tfunction The function to write a dispatcher for
- */
-void t_rb_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
-  (void)tservice;
-  // Open function
-  f_service_.indent() << "def process_" << tfunction->get_name() << "(seqid, iprot, oprot)" << endl;
-  f_service_.indent_up();
-
-  string argsname = capitalize(tfunction->get_name()) + "_args";
-  string resultname = capitalize(tfunction->get_name()) + "_result";
-
-  f_service_.indent() << "args = read_args(iprot, " << argsname << ")" << endl;
-
-  t_struct* xs = tfunction->get_xceptions();
-  const std::vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  // Declare result for non oneway function
-  if (!tfunction->is_oneway()) {
-    f_service_.indent() << "result = " << resultname << ".new()" << endl;
-  }
-
-  // Try block for a function with exceptions
-  if (xceptions.size() > 0) {
-    f_service_.indent() << "begin" << endl;
-    f_service_.indent_up();
-  }
-
-  // Generate the function call
-  t_struct* arg_struct = tfunction->get_arglist();
-  const std::vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  f_service_.indent();
-  if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
-    f_service_ << "result.success = ";
-  }
-  f_service_ << "@handler." << tfunction->get_name() << "(";
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      f_service_ << ", ";
-    }
-    f_service_ << "args." << (*f_iter)->get_name();
-  }
-  f_service_ << ")" << endl;
-
-  if (!tfunction->is_oneway() && xceptions.size() > 0) {
-    f_service_.indent_down();
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      f_service_.indent() << "rescue " << full_type_name((*x_iter)->get_type()) << " => "
-                          << (*x_iter)->get_name() << endl;
-      if (!tfunction->is_oneway()) {
-        f_service_.indent_up();
-        f_service_.indent() << "result." << (*x_iter)->get_name() << " = " << (*x_iter)->get_name()
-                            << endl;
-        f_service_.indent_down();
-      }
-    }
-    f_service_.indent() << "end" << endl;
-  }
-
-  // Shortcut out here for oneway functions
-  if (tfunction->is_oneway()) {
-    f_service_.indent() << "return" << endl;
-    f_service_.indent_down();
-    f_service_.indent() << "end" << endl << endl;
-    return;
-  }
-
-  f_service_.indent() << "write_result(result, oprot, '" << tfunction->get_name() << "', seqid)"
-                      << endl;
-
-  // Close function
-  f_service_.indent_down();
-  f_service_.indent() << "end" << endl << endl;
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_rb_generator::function_signature(t_function* tfunction, string prefix) {
-  // TODO(mcslee): Nitpicky, no ',' if argument_list is empty
-  return prefix + tfunction->get_name() + "(" + argument_list(tfunction->get_arglist()) + ")";
-}
-
-/**
- * Renders a field list
- */
-string t_rb_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += ", ";
-    }
-    result += (*f_iter)->get_name();
-  }
-  return result;
-}
-
-string t_rb_generator::type_name(const t_type* ttype) {
-  string prefix = "";
-
-  string name = ttype->get_name();
-  if (ttype->is_struct() || ttype->is_xception() || ttype->is_enum()) {
-    name = capitalize(ttype->get_name());
-  }
-
-  return prefix + name;
-}
-
-string t_rb_generator::full_type_name(const t_type* ttype) {
-  string prefix = "::";
-  vector<std::string> modules = ruby_modules(ttype->get_program());
-  for (vector<std::string>::iterator m_iter = modules.begin(); m_iter != modules.end(); ++m_iter) {
-    prefix += *m_iter + "::";
-  }
-  return prefix + type_name(ttype);
-}
-
-/**
- * Converts the parse type to a Ruby tyoe
- */
-string t_rb_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "::Thrift::Types::STRING";
-    case t_base_type::TYPE_BOOL:
-      return "::Thrift::Types::BOOL";
-    case t_base_type::TYPE_I8:
-      return "::Thrift::Types::BYTE";
-    case t_base_type::TYPE_I16:
-      return "::Thrift::Types::I16";
-    case t_base_type::TYPE_I32:
-      return "::Thrift::Types::I32";
-    case t_base_type::TYPE_I64:
-      return "::Thrift::Types::I64";
-    case t_base_type::TYPE_DOUBLE:
-      return "::Thrift::Types::DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return "::Thrift::Types::I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "::Thrift::Types::STRUCT";
-  } else if (type->is_map()) {
-    return "::Thrift::Types::MAP";
-  } else if (type->is_set()) {
-    return "::Thrift::Types::SET";
-  } else if (type->is_list()) {
-    return "::Thrift::Types::LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-string t_rb_generator::rb_namespace_to_path_prefix(string rb_namespace) {
-  string namespaces_left = rb_namespace;
-  string::size_type loc;
-
-  string path_prefix = "";
-
-  while ((loc = namespaces_left.find(".")) != string::npos) {
-    path_prefix = path_prefix + underscore(namespaces_left.substr(0, loc)) + "/";
-    namespaces_left = namespaces_left.substr(loc + 1);
-  }
-  if (namespaces_left.size() > 0) {
-    path_prefix = path_prefix + underscore(namespaces_left) + "/";
-  }
-  return path_prefix;
-}
-
-void t_rb_generator::generate_rdoc(t_rb_ofstream& out, t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    out.indent();
-    generate_docstring_comment(out, "", "# ", tdoc->get_doc(), "");
-  }
-}
-
-void t_rb_generator::generate_rb_struct_required_validator(t_rb_ofstream& out, t_struct* tstruct) {
-  out.indent() << "def validate" << endl;
-  out.indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = (*f_iter);
-    if (field->get_req() == t_field::T_REQUIRED) {
-      out.indent() << "raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, "
-                      "'Required field " << field->get_name() << " is unset!')";
-      if (field->get_type()->is_bool()) {
-        out << " if @" << field->get_name() << ".nil?";
-      } else {
-        out << " unless @" << field->get_name();
-      }
-      out << endl;
-    }
-  }
-
-  // if field is an enum, check that its value is valid
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field* field = (*f_iter);
-
-    if (field->get_type()->is_enum()) {
-      out.indent() << "unless @" << field->get_name() << ".nil? || "
-                   << full_type_name(field->get_type()) << "::VALID_VALUES.include?(@"
-                   << field->get_name() << ")" << endl;
-      out.indent_up();
-      out.indent() << "raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, "
-                      "'Invalid value of field " << field->get_name() << "!')" << endl;
-      out.indent_down();
-      out.indent() << "end" << endl;
-    }
-  }
-
-  out.indent_down();
-  out.indent() << "end" << endl << endl;
-}
-
-void t_rb_generator::generate_rb_union_validator(t_rb_ofstream& out, t_struct* tstruct) {
-  out.indent() << "def validate" << endl;
-  out.indent_up();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out.indent()
-      << "raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?"
-      << endl;
-
-  // if field is an enum, check that its value is valid
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    const t_field* field = (*f_iter);
-
-    if (field->get_type()->is_enum()) {
-      out.indent() << "if get_set_field == :" << field->get_name() << endl;
-      out.indent() << "  raise "
-                      "::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, "
-                      "'Invalid value of field " << field->get_name() << "!') unless "
-                   << full_type_name(field->get_type()) << "::VALID_VALUES.include?(get_value)"
-                   << endl;
-      out.indent() << "end" << endl;
-    }
-  }
-
-  out.indent_down();
-  out.indent() << "end" << endl << endl;
-}
-
-THRIFT_REGISTER_GENERATOR(
-    rb,
-    "Ruby",
-    "    rubygems:        Add a \"require 'rubygems'\" line to the top of each generated file.\n"
-    "    namespaced:      Generate files in idiomatic namespaced directories.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_st_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_st_generator.cc
deleted file mode 100644
index ffd7318..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_st_generator.cc
+++ /dev/null
@@ -1,1055 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-#include <stdlib.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sstream>
-
-#include "thrift/platform.h"
-#include "thrift/version.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Smalltalk code generator.
- *
- */
-class t_st_generator : public t_oop_generator {
-public:
-  t_st_generator(t_program* program,
-                 const std::map<std::string, std::string>& parsed_options,
-                 const std::string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    /* no options yet */
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      throw "unknown option st:" + iter->first;
-    }
-
-    out_dir_base_ = "gen-st";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_const(t_const* tconst);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-  void generate_class_side_definition();
-  void generate_force_consts();
-
-  std::string render_const_value(t_type* type, t_const_value* value);
-
-  /**
-   * Struct generation code
-   */
-
-  void generate_st_struct(std::ofstream& out, t_struct* tstruct, bool is_exception);
-  void generate_accessors(std::ofstream& out, t_struct* tstruct);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_service_client(t_service* tservice);
-
-  void generate_send_method(t_function* tfunction);
-  void generate_recv_method(t_function* tfunction);
-
-  std::string map_reader(t_map* tmap);
-  std::string list_reader(t_list* tlist);
-  std::string set_reader(t_set* tset);
-  std::string struct_reader(t_struct* tstruct, std::string clsName);
-
-  std::string map_writer(t_map* tmap, std::string name);
-  std::string list_writer(t_list* tlist, std::string name);
-  std::string set_writer(t_set* tset, std::string name);
-  std::string struct_writer(t_struct* tstruct, std::string fname);
-
-  std::string write_val(t_type* t, std::string fname);
-  std::string read_val(t_type* t);
-
-  /**
-   * Helper rendering functions
-   */
-
-  std::string st_autogen_comment();
-
-  void st_class_def(std::ofstream& out, std::string name);
-  void st_method(std::ofstream& out, std::string cls, std::string name);
-  void st_method(std::ofstream& out, std::string cls, std::string name, std::string category);
-  void st_close_method(std::ofstream& out);
-  void st_class_method(std::ofstream& out, std::string cls, std::string name);
-  void st_class_method(std::ofstream& out, std::string cls, std::string name, std::string category);
-  void st_setter(std::ofstream& out, std::string cls, std::string name, std::string type);
-  void st_getter(std::ofstream& out, std::string cls, std::string name);
-  void st_accessors(std::ofstream& out, std::string cls, std::string name, std::string type);
-
-  std::string class_name();
-  static bool is_valid_namespace(const std::string& sub_namespace);
-  std::string client_class_name();
-  std::string prefix(std::string name);
-  std::string declare_field(t_field* tfield);
-  std::string type_name(t_type* ttype);
-
-  std::string function_signature(t_function* tfunction);
-  std::string argument_list(t_struct* tstruct);
-  std::string function_types_comment(t_function* fn);
-
-  std::string type_to_enum(t_type* ttype);
-  std::string a_type(t_type* type);
-  bool is_vowel(char c);
-  std::string temp_name();
-  std::string generated_category();
-
-private:
-  /**
-   * File streams
-   */
-  int temporary_var;
-  std::ofstream f_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- *
- * @param tprogram The program to generate
- */
-void t_st_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  temporary_var = 0;
-
-  // Make output file
-  string f_name = get_out_dir() + "/" + program_name_ + ".st";
-  f_.open(f_name.c_str());
-
-  // Print header
-  f_ << st_autogen_comment() << endl;
-
-  st_class_def(f_, program_name_);
-  generate_class_side_definition();
-
-  // Generate enums
-  vector<t_enum*> enums = program_->get_enums();
-  vector<t_enum*>::iterator en_iter;
-  for (en_iter = enums.begin(); en_iter != enums.end(); ++en_iter) {
-    generate_enum(*en_iter);
-  }
-}
-
-string t_st_generator::class_name() {
-  return capitalize(program_name_);
-}
-
-bool t_st_generator::is_valid_namespace(const std::string& sub_namespace) {
-  return sub_namespace == "prefix" || sub_namespace == "category";
-}
-
-string t_st_generator::prefix(string class_name) {
-  string prefix = program_->get_namespace("smalltalk.prefix");
-  string name = capitalize(class_name);
-  name = prefix.empty() ? name : (prefix + name);
-  return name;
-}
-
-string t_st_generator::client_class_name() {
-  return capitalize(service_name_) + "Client";
-}
-
-/**
- * Autogen'd comment
- */
-string t_st_generator::st_autogen_comment() {
-  return std::string("'") + "Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n" + "\n"
-         + "DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" + "'!\n";
-}
-
-void t_st_generator::generate_force_consts() {
-  f_ << prefix(class_name()) << " enums keysAndValuesDo: [:k :v | " << prefix(class_name())
-     << " enums at: k put: v value].!" << endl;
-
-  f_ << prefix(class_name()) << " constants keysAndValuesDo: [:k :v | " << prefix(class_name())
-     << " constants at: k put: v value].!" << endl;
-}
-
-void t_st_generator::close_generator() {
-  generate_force_consts();
-  f_.close();
-}
-
-string t_st_generator::generated_category() {
-  string cat = program_->get_namespace("smalltalk.category");
-  // For compatibility with the Thrift grammar, the category must
-  // be punctuated by dots.  Replaces them with dashes here.
-  for (string::iterator iter = cat.begin(); iter != cat.end(); ++iter) {
-    if (*iter == '.') {
-      *iter = '-';
-    }
-  }
-  return cat.size() ? cat : "Generated-" + class_name();
-}
-
-/**
- * Generates a typedef. This is not done in Smalltalk, types are all implicit.
- *
- * @param ttypedef The type definition
- */
-void t_st_generator::generate_typedef(t_typedef* ttypedef) {
-  (void)ttypedef;
-}
-
-void t_st_generator::st_class_def(std::ofstream& out, string name) {
-  out << "Object subclass: #" << prefix(name) << endl;
-  indent_up();
-  out << indent() << "instanceVariableNames: ''" << endl << indent() << "classVariableNames: ''"
-      << endl << indent() << "poolDictionaries: ''" << endl << indent() << "category: '"
-      << generated_category() << "'!" << endl << endl;
-}
-
-void t_st_generator::st_method(std::ofstream& out, string cls, string name) {
-  st_method(out, cls, name, "as yet uncategorized");
-}
-
-void t_st_generator::st_class_method(std::ofstream& out, string cls, string name) {
-  st_method(out, cls + " class", name);
-}
-
-void t_st_generator::st_class_method(std::ofstream& out, string cls, string name, string category) {
-  st_method(out, cls, name, category);
-}
-
-void t_st_generator::st_method(std::ofstream& out, string cls, string name, string category) {
-  char timestr[50];
-  time_t rawtime;
-  struct tm* tinfo;
-
-  time(&rawtime);
-  tinfo = localtime(&rawtime);
-  strftime(timestr, 50, "%m/%d/%Y %H:%M", tinfo);
-
-  out << "!" << prefix(cls) << " methodsFor: '" + category + "' stamp: 'thrift " << timestr
-      << "'!\n" << name << endl;
-
-  indent_up();
-  out << indent();
-}
-
-void t_st_generator::st_close_method(std::ofstream& out) {
-  out << "! !" << endl << endl;
-  indent_down();
-}
-
-void t_st_generator::st_setter(std::ofstream& out,
-                               string cls,
-                               string name,
-                               string type = "anObject") {
-  st_method(out, cls, name + ": " + type);
-  out << name << " := " + type;
-  st_close_method(out);
-}
-
-void t_st_generator::st_getter(std::ofstream& out, string cls, string name) {
-  st_method(out, cls, name + "");
-  out << "^ " << name;
-  st_close_method(out);
-}
-
-void t_st_generator::st_accessors(std::ofstream& out,
-                                  string cls,
-                                  string name,
-                                  string type = "anObject") {
-  st_setter(out, cls, name, type);
-  st_getter(out, cls, name);
-}
-
-void t_st_generator::generate_class_side_definition() {
-  f_ << prefix(class_name()) << " class" << endl << "\tinstanceVariableNames: 'constants enums'!"
-     << endl << endl;
-
-  st_accessors(f_, class_name() + " class", "enums");
-  st_accessors(f_, class_name() + " class", "constants");
-
-  f_ << prefix(class_name()) << " enums: Dictionary new!" << endl;
-  f_ << prefix(class_name()) << " constants: Dictionary new!" << endl;
-
-  f_ << endl;
-}
-
-/**
- * Generates code for an enumerated type. Done using a class to scope
- * the values.
- *
- * @param tenum The enumeration
- */
-void t_st_generator::generate_enum(t_enum* tenum) {
-  string cls_name = program_name_ + capitalize(tenum->get_name());
-
-  f_ << prefix(class_name()) << " enums at: '" << tenum->get_name() << "' put: ["
-     << "(Dictionary new " << endl;
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    int value = (*c_iter)->get_value();
-    f_ << "\tat: '" << (*c_iter)->get_name() << "' put: " << value << ";" << endl;
-  }
-
-  f_ << "\tyourself)]!" << endl << endl;
-}
-
-/**
- * Generate a constant value
- */
-void t_st_generator::generate_const(t_const* tconst) {
-  t_type* type = tconst->get_type();
-  string name = tconst->get_name();
-  t_const_value* value = tconst->get_value();
-
-  f_ << prefix(class_name()) << " constants at: '" << name << "' put: ["
-     << render_const_value(type, value) << "]!" << endl << endl;
-}
-
-/**
- * Prints the value of a constant with the given type. Note that type checking
- * is NOT performed in this function as it is always run beforehand using the
- * validate_types method in main.cc
- */
-string t_st_generator::render_const_value(t_type* type, t_const_value* value) {
-  type = get_true_type(type);
-  std::ostringstream out;
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << '"' << get_escaped_string(value) << '"';
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << (value->get_integer() > 0 ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << value->get_integer();
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    indent(out) << value->get_integer();
-  } else if (type->is_struct() || type->is_xception()) {
-    out << "(" << capitalize(type->get_name()) << " new " << endl;
-    indent_up();
-
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-
-      out << indent() << v_iter->first->get_string() << ": "
-          << render_const_value(field_type, v_iter->second) << ";" << endl;
-    }
-    out << indent() << "yourself)";
-
-    indent_down();
-  } else if (type->is_map()) {
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-    out << "(Dictionary new" << endl;
-    indent_up();
-    indent_up();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << indent() << indent();
-      out << "at: " << render_const_value(ktype, v_iter->first);
-      out << " put: ";
-      out << render_const_value(vtype, v_iter->second);
-      out << ";" << endl;
-    }
-    out << indent() << indent() << "yourself)";
-    indent_down();
-    indent_down();
-  } else if (type->is_list() || type->is_set()) {
-    t_type* etype;
-    if (type->is_list()) {
-      etype = ((t_list*)type)->get_elem_type();
-    } else {
-      etype = ((t_set*)type)->get_elem_type();
-    }
-    if (type->is_set()) {
-      out << "(Set new" << endl;
-    } else {
-      out << "(OrderedCollection new" << endl;
-    }
-    indent_up();
-    indent_up();
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      out << indent() << indent();
-      out << "add: " << render_const_value(etype, *v_iter);
-      out << ";" << endl;
-    }
-    out << indent() << indent() << "yourself)";
-    indent_down();
-    indent_down();
-  } else {
-    throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
-  }
-  return out.str();
-}
-
-/**
- * Generates a Smalltalk struct
- */
-void t_st_generator::generate_struct(t_struct* tstruct) {
-  generate_st_struct(f_, tstruct, false);
-}
-
-/**
- * Generates a struct definition for a thrift exception. Basically the same
- * as a struct but extends the Exception class.
- *
- * @param txception The struct definition
- */
-void t_st_generator::generate_xception(t_struct* txception) {
-  generate_st_struct(f_, txception, true);
-}
-
-/**
- * Generates a smalltalk class to represent a struct
- */
-void t_st_generator::generate_st_struct(std::ofstream& out,
-                                        t_struct* tstruct,
-                                        bool is_exception = false) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  if (is_exception)
-    out << "Error";
-  else
-    out << "Object";
-
-  out << " subclass: #" << prefix(type_name(tstruct)) << endl << "\tinstanceVariableNames: '";
-
-  if (members.size() > 0) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (m_iter != members.begin())
-        out << " ";
-      out << camelcase((*m_iter)->get_name());
-    }
-  }
-
-  out << "'\n"
-      << "\tclassVariableNames: ''\n"
-      << "\tpoolDictionaries: ''\n"
-      << "\tcategory: '" << generated_category() << "'!\n\n";
-
-  generate_accessors(out, tstruct);
-}
-
-bool t_st_generator::is_vowel(char c) {
-  switch (tolower(c)) {
-  case 'a':
-  case 'e':
-  case 'i':
-  case 'o':
-  case 'u':
-    return true;
-  }
-  return false;
-}
-
-string t_st_generator::a_type(t_type* type) {
-  string prefix;
-
-  if (is_vowel(type_name(type)[0]))
-    prefix = "an";
-  else
-    prefix = "a";
-
-  return prefix + capitalize(type_name(type));
-}
-
-void t_st_generator::generate_accessors(std::ofstream& out, t_struct* tstruct) {
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  string type;
-  string prefix;
-
-  if (members.size() > 0) {
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      st_accessors(out,
-                   capitalize(type_name(tstruct)),
-                   camelcase((*m_iter)->get_name()),
-                   a_type((*m_iter)->get_type()));
-    }
-    out << endl;
-  }
-}
-
-/**
- * Generates a thrift service.
- *
- * @param tservice The service definition
- */
-void t_st_generator::generate_service(t_service* tservice) {
-  generate_service_client(tservice);
-  // generate_service_server(tservice);
-}
-
-string t_st_generator::temp_name() {
-  std::ostringstream out;
-  out << "temp" << temporary_var++;
-  return out.str();
-}
-
-string t_st_generator::map_writer(t_map* tmap, string fname) {
-  std::ostringstream out;
-  string key = temp_name();
-  string val = temp_name();
-
-  out << "[oprot writeMapBegin: (TMap new keyType: " << type_to_enum(tmap->get_key_type())
-      << "; valueType: " << type_to_enum(tmap->get_val_type()) << "; size: " << fname << " size)."
-      << endl;
-  indent_up();
-
-  out << indent() << fname << " keysAndValuesDo: [:" << key << " :" << val << " |" << endl;
-  indent_up();
-
-  out << indent() << write_val(tmap->get_key_type(), key) << "." << endl << indent()
-      << write_val(tmap->get_val_type(), val);
-  indent_down();
-
-  out << "]." << endl << indent() << "oprot writeMapEnd] value";
-  indent_down();
-
-  return out.str();
-}
-
-string t_st_generator::map_reader(t_map* tmap) {
-  std::ostringstream out;
-  string desc = temp_name();
-  string val = temp_name();
-
-  out << "[|" << desc << " " << val << "| " << endl;
-  indent_up();
-
-  out << indent() << desc << " := iprot readMapBegin." << endl << indent() << val
-      << " := Dictionary new." << endl << indent() << desc << " size timesRepeat: [" << endl;
-
-  indent_up();
-  out << indent() << val << " at: " << read_val(tmap->get_key_type())
-      << " put: " << read_val(tmap->get_val_type());
-  indent_down();
-
-  out << "]." << endl << indent() << "iprot readMapEnd." << endl << indent() << val << "] value";
-  indent_down();
-
-  return out.str();
-}
-
-string t_st_generator::list_writer(t_list* tlist, string fname) {
-  std::ostringstream out;
-  string val = temp_name();
-
-  out << "[oprot writeListBegin: (TList new elemType: " << type_to_enum(tlist->get_elem_type())
-      << "; size: " << fname << " size)." << endl;
-  indent_up();
-
-  out << indent() << fname << " do: [:" << val << "|" << endl;
-  indent_up();
-
-  out << indent() << write_val(tlist->get_elem_type(), val) << endl;
-  indent_down();
-
-  out << "]." << endl << indent() << "oprot writeListEnd] value";
-  indent_down();
-
-  return out.str();
-}
-
-string t_st_generator::list_reader(t_list* tlist) {
-  std::ostringstream out;
-  string desc = temp_name();
-  string val = temp_name();
-
-  out << "[|" << desc << " " << val << "| " << desc << " := iprot readListBegin." << endl;
-  indent_up();
-
-  out << indent() << val << " := OrderedCollection new." << endl << indent() << desc
-      << " size timesRepeat: [" << endl;
-
-  indent_up();
-  out << indent() << val << " add: " << read_val(tlist->get_elem_type());
-  indent_down();
-
-  out << "]." << endl << indent() << "iprot readListEnd." << endl << indent() << val << "] value";
-  indent_down();
-
-  return out.str();
-}
-
-string t_st_generator::set_writer(t_set* tset, string fname) {
-  std::ostringstream out;
-  string val = temp_name();
-
-  out << "[oprot writeSetBegin: (TSet new elemType: " << type_to_enum(tset->get_elem_type())
-      << "; size: " << fname << " size)." << endl;
-  indent_up();
-
-  out << indent() << fname << " do: [:" << val << "|" << endl;
-  indent_up();
-
-  out << indent() << write_val(tset->get_elem_type(), val) << endl;
-  indent_down();
-
-  out << "]." << endl << indent() << "oprot writeSetEnd] value";
-  indent_down();
-
-  return out.str();
-}
-
-string t_st_generator::set_reader(t_set* tset) {
-  std::ostringstream out;
-  string desc = temp_name();
-  string val = temp_name();
-
-  out << "[|" << desc << " " << val << "| " << desc << " := iprot readSetBegin." << endl;
-  indent_up();
-
-  out << indent() << val << " := Set new." << endl << indent() << desc << " size timesRepeat: ["
-      << endl;
-
-  indent_up();
-  out << indent() << val << " add: " << read_val(tset->get_elem_type());
-  indent_down();
-
-  out << "]." << endl << indent() << "iprot readSetEnd." << endl << indent() << val << "] value";
-  indent_down();
-
-  return out.str();
-}
-
-string t_st_generator::struct_writer(t_struct* tstruct, string sname) {
-  std::ostringstream out;
-  const vector<t_field*>& fields = tstruct->get_sorted_members();
-  vector<t_field*>::const_iterator fld_iter;
-
-  out << "[oprot writeStructBegin: "
-      << "(TStruct new name: '" + tstruct->get_name() + "')." << endl;
-  indent_up();
-
-  for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-    bool optional = (*fld_iter)->get_req() == t_field::T_OPTIONAL;
-    string fname = camelcase((*fld_iter)->get_name());
-    string accessor = sname + " " + camelcase(fname);
-
-    if (optional) {
-      out << indent() << accessor << " ifNotNil: [" << endl;
-      indent_up();
-    }
-
-    out << indent() << "oprot writeFieldBegin: (TField new name: '" << fname
-        << "'; type: " << type_to_enum((*fld_iter)->get_type())
-        << "; id: " << (*fld_iter)->get_key() << ")." << endl;
-
-    out << indent() << write_val((*fld_iter)->get_type(), accessor) << "." << endl << indent()
-        << "oprot writeFieldEnd";
-
-    if (optional) {
-      out << "]";
-      indent_down();
-    }
-
-    out << "." << endl;
-  }
-
-  out << indent() << "oprot writeFieldStop; writeStructEnd] value";
-  indent_down();
-
-  return out.str();
-}
-
-string t_st_generator::struct_reader(t_struct* tstruct, string clsName = "") {
-  std::ostringstream out;
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator fld_iter;
-  string val = temp_name();
-  string desc = temp_name();
-  string found = temp_name();
-
-  if (clsName.size() == 0) {
-    clsName = tstruct->get_name();
-  }
-
-  out << "[|" << desc << " " << val << "|" << endl;
-  indent_up();
-
-  // This is nasty, but without it we'll break things by prefixing TResult.
-  string name = ((capitalize(clsName) == "TResult") ? capitalize(clsName) : prefix(clsName));
-  out << indent() << val << " := " << name << " new." << endl;
-
-  out << indent() << "iprot readStructBegin." << endl << indent() << "[" << desc
-      << " := iprot readFieldBegin." << endl << indent() << desc
-      << " type = TType stop] whileFalse: [|" << found << "|" << endl;
-  indent_up();
-
-  for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-    out << indent() << desc << " id = " << (*fld_iter)->get_key() << " ifTrue: [" << endl;
-    indent_up();
-
-    out << indent() << found << " := true." << endl << indent() << val << " "
-        << camelcase((*fld_iter)->get_name()) << ": " << read_val((*fld_iter)->get_type());
-    indent_down();
-
-    out << "]." << endl;
-  }
-
-  out << indent() << found << " ifNil: [iprot skip: " << desc << " type]]." << endl;
-  indent_down();
-
-  out << indent() << "oprot readStructEnd." << endl << indent() << val << "] value";
-  indent_down();
-
-  return out.str();
-}
-
-string t_st_generator::write_val(t_type* t, string fname) {
-  t = get_true_type(t);
-
-  if (t->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)t)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_DOUBLE:
-      return "iprot writeDouble: " + fname + " asFloat";
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      return "iprot write" + capitalize(type_name(t)) + ": " + fname + " asInteger";
-    default:
-      return "iprot write" + capitalize(type_name(t)) + ": " + fname;
-    }
-  } else if (t->is_map()) {
-    return map_writer((t_map*)t, fname);
-  } else if (t->is_struct() || t->is_xception()) {
-    return struct_writer((t_struct*)t, fname);
-  } else if (t->is_list()) {
-    return list_writer((t_list*)t, fname);
-  } else if (t->is_set()) {
-    return set_writer((t_set*)t, fname);
-  } else if (t->is_enum()) {
-    return "iprot writeI32: " + fname;
-  } else {
-    throw "Sorry, I don't know how to write this: " + type_name(t);
-  }
-}
-
-string t_st_generator::read_val(t_type* t) {
-  t = get_true_type(t);
-
-  if (t->is_base_type()) {
-    return "iprot read" + capitalize(type_name(t));
-  } else if (t->is_map()) {
-    return map_reader((t_map*)t);
-  } else if (t->is_struct() || t->is_xception()) {
-    return struct_reader((t_struct*)t);
-  } else if (t->is_list()) {
-    return list_reader((t_list*)t);
-  } else if (t->is_set()) {
-    return set_reader((t_set*)t);
-  } else if (t->is_enum()) {
-    return "iprot readI32";
-  } else {
-    throw "Sorry, I don't know how to read this: " + type_name(t);
-  }
-}
-
-void t_st_generator::generate_send_method(t_function* function) {
-  string funname = function->get_name();
-  string signature = function_signature(function);
-  t_struct* arg_struct = function->get_arglist();
-  const vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator fld_iter;
-
-  st_method(f_, client_class_name(), "send" + capitalize(signature));
-  f_ << "oprot writeMessageBegin:" << endl;
-  indent_up();
-
-  f_ << indent() << "(TCallMessage new" << endl;
-  indent_up();
-
-  f_ << indent() << "name: '" << funname << "'; " << endl << indent() << "seqid: self nextSeqid)."
-     << endl;
-  indent_down();
-  indent_down();
-
-  f_ << indent() << "oprot writeStructBegin: "
-     << "(TStruct new name: '" + capitalize(camelcase(funname)) + "_args')." << endl;
-
-  for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
-    string fname = camelcase((*fld_iter)->get_name());
-
-    f_ << indent() << "oprot writeFieldBegin: (TField new name: '" << fname
-       << "'; type: " << type_to_enum((*fld_iter)->get_type()) << "; id: " << (*fld_iter)->get_key()
-       << ")." << endl;
-
-    f_ << indent() << write_val((*fld_iter)->get_type(), fname) << "." << endl << indent()
-       << "oprot writeFieldEnd." << endl;
-  }
-
-  f_ << indent() << "oprot writeFieldStop; writeStructEnd; writeMessageEnd." << endl;
-  f_ << indent() << "oprot transport flush";
-
-  st_close_method(f_);
-}
-
-// We only support receiving TResult structures (so this won't work on the server side)
-void t_st_generator::generate_recv_method(t_function* function) {
-  string funname = camelcase(function->get_name());
-  string signature = function_signature(function);
-
-  t_struct result(program_, "TResult");
-  t_field success(function->get_returntype(), "success", 0);
-  result.append(&success);
-
-  t_struct* xs = function->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    // duplicate the field, but call it "exception"... we don't need a dynamic name
-    t_field* exception = new t_field((*f_iter)->get_type(), "exception", (*f_iter)->get_key());
-    result.append(exception);
-  }
-
-  st_method(f_, client_class_name(), "recv" + capitalize(funname));
-  f_ << "| f msg res | " << endl << indent() << "msg := oprot readMessageBegin." << endl << indent()
-     << "self validateRemoteMessage: msg." << endl << indent()
-     << "res := " << struct_reader(&result) << "." << endl << indent() << "oprot readMessageEnd."
-     << endl << indent() << "oprot transport flush." << endl << indent()
-     << "res exception ifNotNil: [res exception signal]." << endl << indent() << "^ res";
-  st_close_method(f_);
-}
-
-string t_st_generator::function_types_comment(t_function* fn) {
-  std::ostringstream out;
-  const vector<t_field*>& fields = fn->get_arglist()->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  out << "\"";
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    out << camelcase((*f_iter)->get_name()) << ": " << type_name((*f_iter)->get_type());
-    if ((f_iter + 1) != fields.end()) {
-      out << ", ";
-    }
-  }
-
-  out << "\"";
-
-  return out.str();
-}
-
-/**
- * Generates a service client definition.
- *
- * @param tservice The service to generate a server for.
- */
-void t_st_generator::generate_service_client(t_service* tservice) {
-  string extends = "";
-  string extends_client = "TClient";
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  if (tservice->get_extends() != NULL) {
-    extends = type_name(tservice->get_extends());
-    extends_client = extends + "Client";
-  }
-
-  f_ << extends_client << " subclass: #" << prefix(client_class_name()) << endl
-     << "\tinstanceVariableNames: ''\n"
-     << "\tclassVariableNames: ''\n"
-     << "\tpoolDictionaries: ''\n"
-     << "\tcategory: '" << generated_category() << "'!\n\n";
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string funname = camelcase((*f_iter)->get_name());
-    string signature = function_signature(*f_iter);
-
-    st_method(f_, client_class_name(), signature);
-    f_ << function_types_comment(*f_iter) << endl << indent() << "self send"
-       << capitalize(signature) << "." << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      f_ << indent() << "^ self recv" << capitalize(funname) << " success " << endl;
-    }
-
-    st_close_method(f_);
-
-    generate_send_method(*f_iter);
-    if (!(*f_iter)->is_oneway()) {
-      generate_recv_method(*f_iter);
-    }
-  }
-}
-
-/**
- * Renders a function signature of the form 'type name(args)'
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_st_generator::function_signature(t_function* tfunction) {
-  return camelcase(tfunction->get_name()) + capitalize(argument_list(tfunction->get_arglist()));
-}
-
-/**
- * Renders a field list
- */
-string t_st_generator::argument_list(t_struct* tstruct) {
-  string result = "";
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  bool first = true;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    if (first) {
-      first = false;
-    } else {
-      result += " ";
-    }
-    string name = camelcase((*f_iter)->get_name());
-    result += name + ": " + name;
-  }
-  return result;
-}
-
-string t_st_generator::type_name(t_type* ttype) {
-  string prefix = "";
-  t_program* program = ttype->get_program();
-  if (program != NULL && program != program_) {
-    if (!ttype->is_service()) {
-      prefix = program->get_name() + "_types.";
-    }
-  }
-
-  string name = ttype->get_name();
-  if (ttype->is_struct() || ttype->is_xception()) {
-    name = capitalize(ttype->get_name());
-  }
-
-  return prefix + name;
-}
-
-/* Convert t_type to Smalltalk type code */
-string t_st_generator::type_to_enum(t_type* type) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return "TType string";
-    case t_base_type::TYPE_BOOL:
-      return "TType bool";
-    case t_base_type::TYPE_I8:
-      return "TType byte";
-    case t_base_type::TYPE_I16:
-      return "TType i16";
-    case t_base_type::TYPE_I32:
-      return "TType i32";
-    case t_base_type::TYPE_I64:
-      return "TType i64";
-    case t_base_type::TYPE_DOUBLE:
-      return "TType double";
-    }
-  } else if (type->is_enum()) {
-    return "TType i32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return "TType struct";
-  } else if (type->is_map()) {
-    return "TType map";
-  } else if (type->is_set()) {
-    return "TType set";
-  } else if (type->is_list()) {
-    return "TType list";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-THRIFT_REGISTER_GENERATOR(st, "Smalltalk", "")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_swift_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_swift_generator.cc
deleted file mode 100644
index 87dd2f0..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_swift_generator.cc
+++ /dev/null
@@ -1,2209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string>
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <set>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include "thrift/platform.h"
-#include "thrift/generate/t_oop_generator.h"
-
-using std::map;
-using std::ostream;
-using std::ofstream;
-using std::ostringstream;
-using std::set;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * Swift code generator.
- *
- * Designed from the Objective-C (aka Cocoa) generator.
- */
-class t_swift_generator : public t_oop_generator {
-public:
-  t_swift_generator(t_program* program,
-                    const map<string, string>& parsed_options,
-                    const string& option_string)
-    : t_oop_generator(program) {
-    (void)option_string;
-    map<string, string>::const_iterator iter;
-
-    log_unexpected_ = false;
-    async_clients_ = false;
-    promise_kit_ = false;
-    debug_descriptions_ = false;
-
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("log_unexpected") == 0) {
-        log_unexpected_ = true;
-      } else if( iter->first.compare("async_clients") == 0) {
-        async_clients_ = true;
-      } else if( iter->first.compare("promise_kit") == 0) {
-        promise_kit_ = true;
-      } else if( iter->first.compare("debug_descriptions") == 0) {
-        debug_descriptions_ = true;
-      } else {
-        throw "unknown option swift:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-swift";
-  }
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  void generate_consts(vector<t_const*> consts);
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_struct(t_struct* tstruct);
-  void generate_xception(t_struct* txception);
-  void generate_service(t_service* tservice);
-
-  void print_const_value(ostream& out,
-                         string name,
-                         t_type* type,
-                         t_const_value* value,
-                         bool defval = false,
-                         bool is_property = false);
-  void render_const_value(ostream& out,
-                          t_type* type,
-                          t_const_value* value);
-
-  void generate_swift_struct(ofstream& out,
-                             t_struct* tstruct,
-                             bool is_private);
-  void generate_swift_struct_init(ofstream& out,
-                                  t_struct* tstruct,
-                                  bool all,
-                                  bool is_private);
-
-  void generate_swift_struct_implementation(ofstream& out,
-                                            t_struct* tstruct,
-                                            bool is_result,
-                                            bool is_private);
-  void generate_swift_struct_hashable_extension(ofstream& out,
-                                                t_struct* tstruct,
-                                                bool is_private);
-  void generate_swift_struct_equatable_extension(ofstream& out,
-                                                 t_struct* tstruct,
-                                                 bool is_private);
-  void generate_swift_struct_thrift_extension(ofstream& out,
-                                              t_struct* tstruct,
-                                              bool is_result,
-                                              bool is_private);
-  void generate_swift_struct_reader(ofstream& out, t_struct* tstruct, bool is_private);
-  void generate_swift_struct_writer(ofstream& out,t_struct* tstruct, bool is_private);
-  void generate_swift_struct_result_writer(ofstream& out, t_struct* tstruct);
-  void generate_swift_struct_printable_extension(ofstream& out, t_struct* tstruct);
-
-  string function_result_helper_struct_type(t_service *tservice, t_function* tfunction);
-  string function_args_helper_struct_type(t_service* tservice, t_function* tfunction);
-  void generate_function_helpers(t_service *tservice, t_function* tfunction);
-
-  /**
-   * Service-level generation functions
-   */
-
-  void generate_swift_service_protocol(ofstream& out, t_service* tservice);
-  void generate_swift_service_protocol_async(ofstream& out, t_service* tservice);
-
-  void generate_swift_service_client(ofstream& out, t_service* tservice);
-  void generate_swift_service_client_async(ofstream& out, t_service* tservice);
-
-  void generate_swift_service_client_send_function_implementation(ofstream& out,
-                                                                  t_service* tservice,
-                                                                  t_function* tfunction,
-                                                                  bool needs_protocol);
-  void generate_swift_service_client_send_function_invocation(ofstream& out, t_function* tfunction);
-  void generate_swift_service_client_send_async_function_invocation(ofstream& out,
-                                                                    t_function* tfunction);
-  void generate_swift_service_client_recv_function_implementation(ofstream& out,
-                                                                  t_service* tservice,
-                                                                  t_function* tfunction,
-                                                                  bool needs_protocol);
-  void generate_swift_service_client_implementation(ofstream& out, t_service* tservice);
-  void generate_swift_service_client_async_implementation(ofstream& out, t_service* tservice);
-
-  void generate_swift_service_server(ofstream& out, t_service* tservice);
-  void generate_swift_service_server_implementation(ofstream& out, t_service* tservice);
-  void generate_swift_service_helpers(t_service* tservice);
-
-  /**
-   * Helper rendering functions
-   */
-
-  string swift_imports();
-  string swift_thrift_imports();
-  string type_name(t_type* ttype, bool is_optional=false, bool is_forced=false);
-  string base_type_name(t_base_type* tbase);
-  string declare_property(t_field* tfield, bool is_private);
-  string function_signature(t_function* tfunction);
-  string async_function_signature(t_function* tfunction);
-  string promise_function_signature(t_function* tfunction);
-  string function_name(t_function* tfunction);
-  string argument_list(t_struct* tstruct, string protocol_name, bool is_internal);
-  string type_to_enum(t_type* ttype, bool qualified=false);
-  string maybe_escape_identifier(const string& identifier);
-  void populate_reserved_words();
-
-private:
-
-  void block_open(ostream& out) {
-    out << " {" << endl;
-    indent_up();
-  }
-
-  void block_close(ostream& out, bool end_line=true) {
-    indent_down();
-    indent(out) << "}";
-    if (end_line) out << endl;
-  }
-
-
-  bool field_is_optional(t_field* tfield) {
-    return tfield->get_req() == t_field::T_OPTIONAL;
-  }
-
-  bool struct_has_required_fields(t_struct* tstruct) {
-    const vector<t_field*>& members = tstruct->get_members();
-    vector<t_field*>::const_iterator m_iter;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (!field_is_optional(*m_iter)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  bool struct_has_optional_fields(t_struct* tstruct) {
-    const vector<t_field*>& members = tstruct->get_members();
-    vector<t_field*>::const_iterator m_iter;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      if (field_is_optional(*m_iter)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  string constants_declarations_;
-
-  /**
-   * File streams
-   */
-
-  ofstream f_decl_;
-  ofstream f_impl_;
-
-  bool log_unexpected_;
-  bool async_clients_;
-  bool promise_kit_;
-  bool debug_descriptions_;
-
-  set<string> swift_reserved_words_;
-};
-
-/**
- * Prepares for file generation by opening up the necessary file output
- * streams.
- */
-void t_swift_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  populate_reserved_words();
-
-  // we have a .swift declarations file...
-  string f_decl_name = capitalize(program_name_) + ".swift";
-  string f_decl_fullname = get_out_dir() + f_decl_name;
-  f_decl_.open(f_decl_fullname.c_str());
-
-  f_decl_ << autogen_comment() << endl;
-
-  f_decl_ << swift_imports() << swift_thrift_imports() << endl;
-
-  // ...and a .swift implementation extensions file
-  string f_impl_name = capitalize(program_name_) + "+Exts.swift";
-  string f_impl_fullname = get_out_dir() + f_impl_name;
-  f_impl_.open(f_impl_fullname.c_str());
-
-  f_impl_ << autogen_comment() << endl;
-
-  f_impl_ << swift_imports() << swift_thrift_imports() << endl;
-
-}
-
-/**
- * Prints standard Cocoa imports
- *
- * @return List of imports for Cocoa libraries
- */
-string t_swift_generator::swift_imports() {
-
-  vector<string> includes_list;
-  includes_list.push_back("Foundation");
-
-  ostringstream includes;
-
-  vector<string>::const_iterator i_iter;
-  for (i_iter=includes_list.begin(); i_iter!=includes_list.end(); ++i_iter) {
-    includes << "import " << *i_iter << endl;
-  }
-
-  includes << endl;
-
-  return includes.str();
-}
-
-/**
- * Prints Thrift runtime imports
- *
- * @return List of imports necessary for Thrift runtime
- */
-string t_swift_generator::swift_thrift_imports() {
-
-  vector<string> includes_list;
-  includes_list.push_back("Thrift");
-
-  if (promise_kit_) {
-    includes_list.push_back("PromiseKit");
-  }
-
-  ostringstream includes;
-
-  vector<string>::const_iterator i_iter;
-  for (i_iter=includes_list.begin(); i_iter!=includes_list.end(); ++i_iter) {
-    includes << "import " << *i_iter << endl;
-  }
-
-  includes << endl;
-
-  return includes.str();
-}
-
-/**
- * Finish up generation.
- */
-void t_swift_generator::close_generator() {
-  // stick our constants declarations at the end of the header file
-  // since they refer to things we are defining.
-  f_decl_ << constants_declarations_ << endl;
-}
-
-/**
- * Generates a typedef. This is just a simple 1-liner in Swift
- *
- * @param ttypedef The type definition
- */
-void t_swift_generator::generate_typedef(t_typedef* ttypedef) {
-  f_decl_ << indent() << "public typealias " << ttypedef->get_symbolic()
-          << " = " << type_name(ttypedef->get_type()) << endl;
-  f_decl_ << endl;
-}
-
-/**
- * Generates code for an enumerated type. In Swift, this is
- * essentially the same as the thrift definition itself, using
- * Swift syntax.
- *
- * @param tenum The enumeration
- */
-void t_swift_generator::generate_enum(t_enum* tenum) {
-  f_decl_ << indent() << "public enum " << tenum->get_name() << " : Int32";
-  block_open(f_decl_);
-
-  vector<t_enum_value*> constants = tenum->get_constants();
-  vector<t_enum_value*>::iterator c_iter;
-
-  for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
-    f_decl_ << indent() << "case " << (*c_iter)->get_name()
-            << " = " << (*c_iter)->get_value() << endl;
-  }
-
-  f_decl_ << endl;
-  f_decl_ << indent() << "public init() { self.init(rawValue: " << constants.front()->get_value() << ")! }" << endl;
-
-  block_close(f_decl_);
-  f_decl_ << endl;
-
-  f_impl_ << indent() << "extension " << tenum->get_name() << " : TEnum";
-  block_open(f_impl_);
-
-  f_impl_ << endl;
-
-  f_impl_ << indent() << "public static func readValueFromProtocol(proto: TProtocol) throws -> " << tenum->get_name();
-  block_open(f_impl_);
-  f_impl_ << indent() << "var raw = Int32()" << endl
-          << indent() << "try proto.readI32(&raw)" << endl
-          << indent() << "return " << tenum->get_name() << "(rawValue: raw)!" << endl;
-  block_close(f_impl_);
-  f_impl_ << endl;
-
-  f_impl_ << indent() << "public static func writeValue(value: " << tenum->get_name() << ", toProtocol proto: TProtocol) throws";
-  block_open(f_impl_);
-  f_impl_ << indent() << "try proto.writeI32(value.rawValue)" << endl;
-  block_close(f_impl_);
-  f_impl_ << endl;
-
-  block_close(f_impl_);
-  f_impl_ << endl;
-}
-
-/**
- * Generates public constants for all Thrift constants.
- *
- * @param consts Constants to generate
- */
-void t_swift_generator::generate_consts(vector<t_const*> consts) {
-
-  ostringstream const_interface;
-
-  // Public constants for base types & strings
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    t_type* type = (*c_iter)->get_type();
-    const_interface << "public let " << capitalize((*c_iter)->get_name()) << " : " << type_name(type) << " = ";
-    render_const_value(const_interface, type, (*c_iter)->get_value());
-    const_interface << endl << endl;
-  }
-
-  // this gets spit into the header file in ::close_generator
-  constants_declarations_ = const_interface.str();
-
-}
-
-/**
- * Generates a struct definition for a thrift data type. This is a struct
- * with public members. Optional types are used for optional properties to
- * allow them to be tested for availability. Separate inits are included for
- * required properties & all properties.
- *
- * Generates extensions to provide conformance to TStruct, TSerializable,
- * Hashable & Equatable
- *
- * @param tstruct The struct definition
- */
-void t_swift_generator::generate_struct(t_struct* tstruct) {
-  generate_swift_struct(f_decl_, tstruct, false);
-  generate_swift_struct_implementation(f_impl_, tstruct, false, false);
-}
-
-/**
- * Exceptions are structs, but they conform to ErrorType
- *
- * @param tstruct The struct definition
- */
-void t_swift_generator::generate_xception(t_struct* txception) {
-  generate_swift_struct(f_decl_, txception, false);
-  generate_swift_struct_implementation(f_impl_, txception, false, false);
-}
-
-/**
- * Generate the interface for a struct. Only properties and
- * init methods are included.
- *
- * @param tstruct The struct definition
- * @param is_private
- *                Is the struct public or private
- */
-void t_swift_generator::generate_swift_struct(ofstream& out,
-                                              t_struct* tstruct,
-                                              bool is_private) {
-
-  string visibility = is_private ? "private" : "public";
-
-  out << indent() << visibility << " final class " << tstruct->get_name();
-
-  if (tstruct->is_xception()) {
-    out << " : ErrorType";
-  }
-
-  block_open(out);
-
-  // properties
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    out << endl;
-    out << indent() << declare_property(*m_iter, is_private) << endl;
-  }
-
-  out << endl;
-
-  // init
-
-  indent(out) << visibility << " init()";
-  block_open(out);
-  block_close(out);
-
-  out << endl;
-
-  if (struct_has_required_fields(tstruct)) {
-    generate_swift_struct_init(out, tstruct, false, is_private);
-  }
-  if (struct_has_optional_fields(tstruct)) {
-    generate_swift_struct_init(out, tstruct, true, is_private);
-  }
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generate struct init for properties
- *
- * @param tstruct The structure definition
- * @param all     Generate init with all or just required properties
- * @param is_private
- *                Is the initializer public or private
- */
-void t_swift_generator::generate_swift_struct_init(ofstream& out,
-                                                   t_struct* tstruct,
-                                                   bool all,
-                                                   bool is_private) {
-
-  string visibility = is_private ? "private" : "public";
-
-  indent(out) << visibility << " init(";
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  bool first=true;
-  for (m_iter = members.begin(); m_iter != members.end();) {
-    if (all || !field_is_optional(*m_iter)) {
-      if (first) {
-        first = false;
-      }
-      else {
-        out << ", ";
-      }
-      out << (*m_iter)->get_name() << ": "
-          << maybe_escape_identifier(type_name((*m_iter)->get_type(), field_is_optional(*m_iter)));
-    }
-    ++m_iter;
-  }
-  out << ")";
-
-  block_open(out);
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (all || (*m_iter)->get_req() == t_field::T_REQUIRED || (*m_iter)->get_req() == t_field::T_OPT_IN_REQ_OUT) {
-      out << indent() << "self." << maybe_escape_identifier((*m_iter)->get_name()) << " = "
-          << maybe_escape_identifier((*m_iter)->get_name()) << endl;
-    }
-  }
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generate the hashable protocol implmentation
- *
- * @param tstruct The structure definition
- * @param is_private
- *                Is the struct public or private
- */
-void t_swift_generator::generate_swift_struct_hashable_extension(ofstream& out,
-                                                                 t_struct* tstruct,
-                                                                 bool is_private) {
-
-  string visibility = is_private ? "private" : "public";
-
-  indent(out) << "extension " << tstruct->get_name() << " : Hashable";
-
-  block_open(out);
-
-  out << endl;
-
-  indent(out) << visibility << " var hashValue : Int";
-
-  block_open(out);
-
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  if (!members.empty()) {
-    indent(out) << "let prime = 31" << endl;
-    indent(out) << "var result = 1" << endl;
-
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      t_field* tfield = *m_iter;
-      string accessor = field_is_optional(tfield) ? "?." : ".";
-      string defaultor = field_is_optional(tfield) ? " ?? 0" : "";
-      indent(out) << "result = prime &* result &+ (" << maybe_escape_identifier(tfield->get_name()) << accessor
-                  <<  "hashValue" << defaultor << ")" << endl;
-    }
-
-    indent(out) << "return result" << endl;
-  }
-  else {
-    indent(out) << "return 31" << endl;
-  }
-
-  block_close(out);
-
-  out << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generate the equatable protocol implementation
- *
- * @param tstruct The structure definition
- * @param is_private
- *                Is the struct public or private
- */
-void t_swift_generator::generate_swift_struct_equatable_extension(ofstream& out,
-                                                                  t_struct* tstruct,
-                                                                  bool is_private) {
-
-  string visibility = is_private ? "private" : "public";
-
-  indent(out) << visibility << " func ==(lhs: " << type_name(tstruct) << ", rhs: " << type_name(tstruct) << ") -> Bool";
-
-  block_open(out);
-
-  indent(out) << "return";
-
-  const vector<t_field*>& members = tstruct->get_members();
-  vector<t_field*>::const_iterator m_iter;
-
-  if (members.size()) {
-
-    out << endl;
-
-    indent_up();
-
-    for (m_iter = members.begin(); m_iter != members.end();) {
-      t_field* tfield = *m_iter;
-      indent(out) << "(lhs." << maybe_escape_identifier(tfield->get_name())
-                  << " ?== rhs." << maybe_escape_identifier(tfield->get_name()) << ")";
-      if (++m_iter != members.end()) {
-        out << " &&";
-      }
-      out << endl;
-    }
-
-    indent_down();
-
-  }
-  else {
-    out << " true" << endl;
-  }
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generate struct implementation. Produces extensions that
- * fulfill the requisite protocols to complete the value.
- *
- * @param tstruct The struct definition
- * @param is_result
- *                If this is a result it needs a different writer
- * @param is_private
- *                Is the struct public or private
- */
-void t_swift_generator::generate_swift_struct_implementation(ofstream& out,
-                                                             t_struct* tstruct,
-                                                             bool is_result,
-                                                             bool is_private) {
-
-  generate_swift_struct_equatable_extension(out, tstruct, is_private);
-
-  if (!is_private && !is_result) {
-    generate_swift_struct_printable_extension(out, tstruct);
-  }
-
-  generate_swift_struct_hashable_extension(out, tstruct, is_private);
-  generate_swift_struct_thrift_extension(out, tstruct, is_result, is_private);
-
-  out << endl << endl;
-}
-
-/**
- * Generate the TStruct protocol implementation.
- *
- * @param tstruct The structure definition
- * @param is_result
- *                Is the struct a result value
- * @param is_private
- *                Is the struct public or private
- */
-void t_swift_generator::generate_swift_struct_thrift_extension(ofstream& out,
-                                                               t_struct* tstruct,
-                                                               bool is_result,
-                                                               bool is_private) {
-
-  indent(out) << "extension " << tstruct->get_name() << " : TStruct";
-
-  block_open(out);
-
-  out << endl;
-
-  generate_swift_struct_reader(out, tstruct, is_private);
-
-  if (is_result) {
-    generate_swift_struct_result_writer(out, tstruct);
-  }
-  else {
-    generate_swift_struct_writer(out, tstruct, is_private);
-  }
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a function to read a struct from
- * from a protocol. (TStruct compliance)
- *
- * @param tstruct The structure definition
- * @param is_private
- *                Is the struct public or private
- */
-void t_swift_generator::generate_swift_struct_reader(ofstream& out,
-                                                     t_struct* tstruct,
-                                                     bool is_private) {
-
-  string visibility = is_private ? "private" : "public";
-
-  indent(out) << visibility << " static func readValueFromProtocol(__proto: TProtocol) throws -> "
-              << tstruct->get_name();
-
-  block_open(out);
-
-  out << endl;
-
-  indent(out) << "try __proto.readStructBegin()" << endl << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    bool optional = field_is_optional(*f_iter);
-    indent(out) << "var " << maybe_escape_identifier((*f_iter)->get_name()) << " : "
-                << type_name((*f_iter)->get_type(), optional, !optional) << endl;
-  }
-
-  out << endl;
-
-  // Loop over reading in fields
-  indent(out) << "fields: while true";
-
-  block_open(out);
-
-  out << endl;
-
-  indent(out) << "let (_, fieldType, fieldID) = try __proto.readFieldBegin()" << endl << endl;
-  indent(out) << "switch (fieldID, fieldType)";
-
-  block_open(out);
-
-  indent(out) << "case (_, .STOP):" << endl;
-  indent_up();
-  indent(out) << "break fields" << endl << endl;
-  indent_down();
-
-  // Generate deserialization code for known cases
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-
-    indent(out) << "case (" << (*f_iter)->get_key() << ", " << type_to_enum((*f_iter)->get_type()) << "):" << endl;
-    indent_up();
-    indent(out) << maybe_escape_identifier((*f_iter)->get_name()) << " = try __proto.readValue() as "
-                << type_name((*f_iter)->get_type()) << endl << endl;
-    indent_down();
-
-  }
-
-  indent(out) << "case let (_, unknownType):" << endl;
-  indent_up();
-  indent(out) << "try __proto.skipType(unknownType)" << endl;
-  indent_down();
-
-  block_close(out);
-
-  out << endl;
-
-  // Read field end marker
-  indent(out) << "try __proto.readFieldEnd()" << endl;
-
-  block_close(out);
-
-  out << endl;
-
-  indent(out) << "try __proto.readStructEnd()" << endl;
-
-  out << endl;
-
-  if (struct_has_required_fields(tstruct)) {
-    // performs various checks (e.g. check that all required fields are set)
-    indent(out) << "// Required fields" << endl;
-
-    for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-      if (field_is_optional(*f_iter)) {
-        continue;
-      }
-      indent(out) << "try __proto.validateValue(" << (*f_iter)->get_name() << ", "
-                  << "named: \"" << (*f_iter)->get_name() << "\")" << endl;
-    }
-  }
-
-  out << endl;
-
-  indent(out) << "return " << tstruct->get_name() << "(";
-  for (f_iter = fields.begin(); f_iter != fields.end();) {
-    out << (*f_iter)->get_name() << ": " << maybe_escape_identifier((*f_iter)->get_name());
-    if (++f_iter != fields.end()) {
-      out << ", ";
-    }
-  }
-  out << ")" << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a function to write a struct to
- * a protocol. (TStruct compliance)
- *
- * @param tstruct The structure definition
- * @param is_private
- *                Is the struct public or private
- */
-void t_swift_generator::generate_swift_struct_writer(ofstream& out,
-                                                     t_struct* tstruct,
-                                                     bool is_private) {
-
-  string visibility = is_private ? "private" : "public";
-
-  indent(out) << visibility << " static func writeValue(__value: " << tstruct->get_name() << ", toProtocol __proto: TProtocol) throws";
-
-  block_open(out);
-
-  out << endl;
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "try __proto.writeStructBeginWithName(\"" << name << "\")" << endl;
-
-  out << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field *tfield = *f_iter;
-
-    bool optional = field_is_optional(tfield);
-    if (optional) {
-      indent(out) << "if let " << maybe_escape_identifier(tfield->get_name())
-                  << " = __value." << maybe_escape_identifier(tfield->get_name());
-      block_open(out);
-    }
-
-    indent(out) << "try __proto.writeFieldValue("
-                << (optional ? "" : "__value.") << maybe_escape_identifier(tfield->get_name()) << ", "
-                << "name: \"" << tfield->get_name() << "\", "
-                << "type: " << type_to_enum(tfield->get_type()) << ", "
-                << "id: " << tfield->get_key() << ")" << endl;
-
-    if (optional) {
-      block_close(out);
-    }
-
-    out << endl;
-  }
-
-  indent(out) << "try __proto.writeFieldStop()" << endl << endl;
-
-  indent(out) << "try __proto.writeStructEnd()" << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a function to read a struct from
- * from a protocol. (TStruct compliance)
- *
- * This is specifically a function result. Only
- * the first available field is written.
- *
- * @param tstruct The structure definition
- */
-void t_swift_generator::generate_swift_struct_result_writer(ofstream& out, t_struct* tstruct) {
-
-  indent(out) << "private static func writeValue(__value: " << tstruct->get_name() << ", toProtocol __proto: TProtocol) throws";
-
-  block_open(out);
-
-  out << endl;
-
-  string name = tstruct->get_name();
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "try __proto.writeStructBeginWithName(\"" << name << "\")" << endl;
-
-  out << endl;
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field *tfield = *f_iter;
-
-    indent(out) << "if let result = __value." << (*f_iter)->get_name();
-
-    block_open(out);
-
-    indent(out) << "try __proto.writeFieldValue(result, "
-                << "name: \"" << tfield->get_name() << "\", "
-                << "type: " << type_to_enum(tfield->get_type()) << ", "
-                << "id: " << tfield->get_key() << ")" << endl;
-
-    block_close(out);
-  }
-  // Write the struct map
-  indent(out) << "try __proto.writeFieldStop()" << endl << endl;
-
-  indent(out) << "try __proto.writeStructEnd()" << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a description method for the given struct
- *
- * @param tstruct The struct definition
- */
-void t_swift_generator::generate_swift_struct_printable_extension(ofstream& out, t_struct* tstruct) {
-
-  // Allow use of debugDescription so the app can add description via a cateogory/extension
-
-  indent(out) << "extension " << tstruct->get_name() << " : "
-              << (debug_descriptions_ ? "CustomDebugStringConvertible" : "CustomStringConvertible");
-
-  block_open(out);
-
-  out << endl;
-
-  indent(out) << "public var description : String";
-
-  block_open(out);
-
-  indent(out) << "var desc = \"" << tstruct->get_name() << "(\"" << endl;
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end();) {
-    indent(out) << "desc += \"" << (*f_iter)->get_name()
-                << "=\\(self." << maybe_escape_identifier((*f_iter)->get_name()) << ")";
-    if (++f_iter != fields.end()) {
-      out << ", ";
-    }
-    out << "\"" << endl;
-  }
-  indent(out) << "desc += \")\"" << endl;
-  indent(out) << "return desc" << endl;
-
-  block_close(out);
-
-  out << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a thrift service.  In Swift this consists of a
- * protocol definition and a client (with it's implementation
- * separated into exts file).
- *
- * @param tservice The service definition
- */
-void t_swift_generator::generate_service(t_service* tservice) {
-
-  generate_swift_service_protocol(f_decl_, tservice);
-  generate_swift_service_client(f_decl_, tservice);
-  if (async_clients_) {
-    generate_swift_service_protocol_async(f_decl_, tservice);
-    generate_swift_service_client_async(f_decl_, tservice);
-  }
-  generate_swift_service_server(f_decl_, tservice);
-
-  generate_swift_service_helpers(tservice);
-
-  generate_swift_service_client_implementation(f_impl_, tservice);
-  if (async_clients_) {
-    generate_swift_service_client_async_implementation(f_impl_, tservice);
-  }
-  generate_swift_service_server_implementation(f_impl_, tservice);
-}
-
-/**
- * Generates structs for all the service return types
- *
- * @param tservice The service
- */
-void t_swift_generator::generate_swift_service_helpers(t_service* tservice) {
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-
-    t_struct* ts = (*f_iter)->get_arglist();
-
-    string qname = function_args_helper_struct_type(tservice, *f_iter);
-
-    t_struct qname_ts = t_struct(ts->get_program(), qname);
-
-    const vector<t_field*>& members = ts->get_members();
-    vector<t_field*>::const_iterator m_iter;
-    for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-      qname_ts.append(*m_iter);
-    }
-
-    generate_swift_struct(f_impl_, &qname_ts, true);
-    generate_swift_struct_implementation(f_impl_, &qname_ts, false, true);
-    generate_function_helpers(tservice, *f_iter);
-  }
-}
-
-string t_swift_generator::function_result_helper_struct_type(t_service *tservice, t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return tservice->get_name() + "_" + tfunction->get_name();
-  } else {
-    return tservice->get_name() + "_" + tfunction->get_name() + "_result";
-  }
-}
-
-string t_swift_generator::function_args_helper_struct_type(t_service *tservice, t_function* tfunction) {
-  return tservice->get_name() + "_" + tfunction->get_name() + "_args";
-}
-
-/**
- * Generates a struct and helpers for a function.
- *
- * @param tfunction The function
- */
-void t_swift_generator::generate_function_helpers(t_service *tservice, t_function* tfunction) {
-  if (tfunction->is_oneway()) {
-    return;
-  }
-
-  // create a result struct with a success field of the return type,
-  // and a field for each type of exception thrown
-  t_struct result(program_, function_result_helper_struct_type(tservice, tfunction));
-  if (!tfunction->get_returntype()->is_void()) {
-    t_field* success = new t_field(tfunction->get_returntype(), "success", 0);
-    success->set_req(t_field::T_OPTIONAL);
-    result.append(success);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& fields = xs->get_members();
-  vector<t_field*>::const_iterator f_iter;
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    t_field *x = *f_iter;
-    t_field *ox = new t_field(x->get_type(), x->get_name(), x->get_key());
-    ox->set_req(t_field::T_OPTIONAL);
-    result.append(ox);
-  }
-
-  // generate the result struct
-  generate_swift_struct(f_impl_, &result, true);
-  generate_swift_struct_implementation(f_impl_, &result, true, true);
-
-  for (f_iter = result.get_members().begin(); f_iter != result.get_members().end(); ++f_iter) {
-    delete *f_iter;
-  }
-}
-
-/**
- * Generates a service protocol definition.
- *
- * @param tservice The service to generate a protocol definition for
- */
-void t_swift_generator::generate_swift_service_protocol(ofstream& out, t_service* tservice) {
-
-  indent(out) << "public protocol " << tservice->get_name();
-
-  block_open(out);
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    out << endl;
-    indent(out) << function_signature(*f_iter) << "  // exceptions: ";
-    t_struct* xs = (*f_iter)->get_xceptions();
-    const vector<t_field*>& xceptions = xs->get_members();
-    vector<t_field*>::const_iterator x_iter;
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      out << type_name((*x_iter)->get_type()) + ", ";
-    }
-    out << endl;
-  }
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates an asynchronous service protocol definition.
- *
- * @param tservice The service to generate a protocol definition for
- */
-void t_swift_generator::generate_swift_service_protocol_async(ofstream& out, t_service* tservice) {
-
-  indent(out) << "public protocol " << tservice->get_name() << "Async";
-
-  block_open(out);
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    out << endl;
-    indent(out) << async_function_signature(*f_iter) << endl;
-    if (promise_kit_) {
-      indent(out) << promise_function_signature(*f_iter) << endl;
-    }
-    out << endl;
-  }
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a service client interface definition.
- *
- * @param tservice The service to generate a client interface definition for
- */
-void t_swift_generator::generate_swift_service_client(ofstream& out,
-                                                                t_service* tservice) {
-
-  indent(out) << "public class " << tservice->get_name() << "Client /* : " << tservice->get_name() << " */";
-
-  block_open(out);
-
-  out << endl;
-
-  indent(out) << "let __inProtocol : TProtocol" << endl << endl;
-
-  indent(out) << "let __outProtocol : TProtocol" << endl << endl;
-
-  indent(out) << "public init(inoutProtocol: TProtocol)";
-
-  block_open(out);
-
-  indent(out) << "__inProtocol = inoutProtocol" << endl;
-
-  indent(out) << "__outProtocol = inoutProtocol" << endl;
-
-  block_close(out);
-
-  out << endl;
-
-  indent(out) << "public init(inProtocol: TProtocol, outProtocol: TProtocol)";
-
-  block_open(out);
-
-  indent(out) << "__inProtocol = inProtocol" << endl;
-
-  indent(out) << "__outProtocol = outProtocol" << endl;
-
-  block_close(out);
-
-  out << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a service client interface definition.
- *
- * @param tservice The service to generate a client interface definition for
- */
-void t_swift_generator::generate_swift_service_client_async(ofstream& out,
-                                                                      t_service* tservice) {
-
-  indent(out) << "public class " << tservice->get_name() << "AsyncClient /* : " << tservice->get_name() << " */";
-
-  block_open(out);
-
-  out << endl;
-
-  indent(out) << "let __protocolFactory : TProtocolFactory" << endl << endl;
-
-  indent(out) << "let __transportFactory : TAsyncTransportFactory" << endl << endl;
-
-  indent(out) << "public init(protocolFactory: TProtocolFactory, transportFactory: TAsyncTransportFactory)";
-
-  block_open(out);
-
-  indent(out) << "__protocolFactory = protocolFactory" << endl;
-
-  indent(out) << "__transportFactory = transportFactory" << endl;
-
-  block_close(out);
-
-  out << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a service server interface definition. In other words,
- * the TProcess implementation for the service definition.
- *
- * @param tservice The service to generate a client interface definition for
- */
-void t_swift_generator::generate_swift_service_server(ofstream& out,
-                                                                t_service* tservice) {
-
-  indent(out) << "public class " << tservice->get_name() << "Processor : NSObject /* " << tservice->get_name() << " */";
-
-  block_open(out);
-
-  out << endl;
-
-  out << indent() << "typealias ProcessorHandlerDictionary = "
-                  << "[String: (Int, TProtocol, TProtocol, " << tservice->get_name() << ") throws -> Void]" << endl
-      << endl
-      << indent() << "let service : " << tservice->get_name() << endl
-      << endl
-      << indent() << "public init(service: " << tservice->get_name() << ")";
-  block_open(out);
-  indent(out) << "self.service = service" << endl;
-  block_close(out);
-
-  out << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a function that will send the arguments
- * for a service function via a protocol.
- *
- * @param tservice  The service to generate
- * @param tfunction The function to generate
- * @param needs_protocol
- *                  Wether the first parameter must be a protocol or if
- *                  the protocol is to be assumed
- */
-void t_swift_generator::generate_swift_service_client_send_function_implementation(ofstream& out,
-                                                                                   t_service *tservice,
-                                                                                   t_function* tfunction,
-                                                                                   bool needs_protocol) {
-
-  string funname = tfunction->get_name();
-
-  t_function send_function(g_type_bool,
-                           "send_" + tfunction->get_name(),
-                           tfunction->get_arglist());
-
-  string argsname = function_args_helper_struct_type(tservice, tfunction);
-  t_struct* arg_struct = tfunction->get_arglist();
-
-  // Open function
-  indent(out) << "private func " << send_function.get_name() << "(" << argument_list(tfunction->get_arglist(), needs_protocol ? "__outProtocol" : "", true) << ") throws";
-  block_open(out);
-
-  out << endl;
-
-  // Serialize the request
-  indent(out) << "try __outProtocol.writeMessageBeginWithName(\"" << funname << "\", "
-              << "type: " << (tfunction->is_oneway() ? ".ONEWAY" : ".CALL") << ", "
-              << "sequenceID: 0)" << endl;
-
-  out << endl;
-
-  indent(out) << "let __args = " << argsname << "(";
-
-  // write out function parameters
-
-  const vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end();) {
-    t_field *tfield = (*f_iter);
-    out << tfield->get_name() << ": " << tfield->get_name();
-    if (++f_iter != fields.end()) {
-      out << ", ";
-    }
-  }
-  out << ")" << endl;
-  indent(out) << "try " << argsname << ".writeValue(__args, toProtocol: __outProtocol)" << endl << endl;
-
-  indent(out) << "try __outProtocol.writeMessageEnd()" << endl;
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a function that will recv the result for a
- * service function via a protocol.
- *
- * @param tservice  The service to generate
- * @param tfunction The function to generate
- * @param needs_protocol
- *                  Wether the first parameter must be a protocol or if
- *                  the protocol is to be assumed
- */
-void t_swift_generator::generate_swift_service_client_recv_function_implementation(ofstream& out,
-                                                                                   t_service* tservice,
-                                                                                   t_function* tfunction,
-                                                                                   bool needs_protocol) {
-
-  // Open function
-  indent(out) << "private func recv_" << tfunction->get_name() << "(";
-
-  if (needs_protocol) {
-    out << "__inProtocol: TProtocol";
-  }
-
-  out << ") throws";
-
-  if (!tfunction->get_returntype()->is_void()) {
-    out << " -> " << type_name(tfunction->get_returntype());
-  }
-
-  block_open(out);
-
-  // check for an exception
-
-  out << endl;
-
-  indent(out) << "try __inProtocol.readResultMessageBegin() " << endl << endl;
-
-  string resultname = function_result_helper_struct_type(tservice, tfunction);
-  indent(out);
-  if (!tfunction->get_returntype()->is_void() || !tfunction->get_xceptions()->get_members().empty()) {
-    out << "let __result = ";
-  }
-  out << "try " << resultname << ".readValueFromProtocol(__inProtocol)" << endl << endl;
-
-  indent(out) << "try __inProtocol.readMessageEnd()" << endl << endl;
-
-  // Careful, only return _result if not a void function
-  if (!tfunction->get_returntype()->is_void()) {
-    indent(out) << "if let __success = __result.success";
-    block_open(out);
-    indent(out) << "return __success" << endl;
-    block_close(out);
-  }
-
-  t_struct* xs = tfunction->get_xceptions();
-  const vector<t_field*>& xceptions = xs->get_members();
-  vector<t_field*>::const_iterator x_iter;
-
-  for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-    indent(out) << "if let " << (*x_iter)->get_name() << " = __result." << (*x_iter)->get_name();
-    block_open(out);
-    indent(out) << "throw " << (*x_iter)->get_name() << endl;
-    block_close(out);
-  }
-
-  // If you get here it's an exception, unless a void function
-  if (!tfunction->get_returntype()->is_void()) {
-    indent(out) << "throw NSError(" << endl;
-    indent_up();
-    indent(out) << "domain: TApplicationErrorDomain, " << endl;
-    indent(out) << "code: Int(TApplicationError.MissingResult.rawValue)," << endl;
-    indent(out) << "userInfo: [TApplicationErrorMethodKey: \"" << tfunction->get_name() << "\"])" << endl;
-    indent_down();
-  }
-
-  // Close function
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates an invocation of a given the send function for the
- * service function.
- *
- * @param tfunction The service to generate an implementation for
- */
-void t_swift_generator::generate_swift_service_client_send_function_invocation(ofstream& out,
-                                                                               t_function* tfunction) {
-
-  indent(out) << "try send_" << tfunction->get_name() << "(";
-
-  t_struct* arg_struct = tfunction->get_arglist();
-
-  const vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  for (f_iter = fields.begin(); f_iter != fields.end();) {
-    out << (*f_iter)->get_name() << ": " << (*f_iter)->get_name();
-    if (++f_iter != fields.end()) {
-      out << ", ";
-    }
-  }
-
-  out << ")" << endl;
-}
-
-/**
- * Generates an invocation of a given the send function for the
- * service function. This is for asynchronous protocols.
- *
- * @param tfunction The service to generate an implementation for
- */
-void t_swift_generator::generate_swift_service_client_send_async_function_invocation(ofstream& out,
-                                                                                     t_function* tfunction) {
-
-  t_struct* arg_struct = tfunction->get_arglist();
-  const vector<t_field*>& fields = arg_struct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  indent(out) << "try send_" << tfunction->get_name() << "(__protocol";
-
-  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-    out << ", " << (*f_iter)->get_name() << ": " << (*f_iter)->get_name();
-  }
-
-  out << ")" << endl;
-}
-
-/**
- * Generates a service client protocol implementation via extension.
- *
- * @param tservice The service to generate an implementation for
- */
-void t_swift_generator::generate_swift_service_client_implementation(ofstream& out,
-                                                                     t_service* tservice) {
-
-  string name = tservice->get_name() + "Client";
-
-  indent(out) << "extension " << name << " : " << tservice->get_name();
-
-  block_open(out);
-
-  out << endl;
-
-  // generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-
-    generate_swift_service_client_send_function_implementation(out, tservice, *f_iter, false);
-
-    if (!(*f_iter)->is_oneway()) {
-      generate_swift_service_client_recv_function_implementation(out, tservice, *f_iter, false);
-    }
-
-    // Open function
-    indent(out) << "public " << function_signature(*f_iter);
-
-    block_open(out);
-
-    out << endl;
-
-    generate_swift_service_client_send_function_invocation(out, *f_iter);
-
-    out << endl;
-
-    indent(out) << "try __outProtocol.transport().flush()" << endl << endl;
-
-    if (!(*f_iter)->is_oneway()) {
-      if ((*f_iter)->get_returntype()->is_void()) {
-        indent(out) << "try recv_" << (*f_iter)->get_name() << "()" << endl;
-      } else {
-        indent(out) << "return try recv_" << (*f_iter)->get_name() << "()" << endl;
-      }
-    }
-
-    block_close(out);
-
-    out << endl;
-  }
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a service asynchronous client protocol implementation via extension.
- *
- * @param tservice The service to generate an implementation for
- */
-void t_swift_generator::generate_swift_service_client_async_implementation(ofstream& out,
-                                                                           t_service* tservice) {
-
-  string name = tservice->get_name() + "AsyncClient";
-  string protocol_name = tservice->get_name() + "Async";
-
-  indent(out) << "extension " << name << " : " << protocol_name;
-
-  block_open(out);
-
-  out << endl;
-
-  // generate client method implementations
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-
-    generate_swift_service_client_send_function_implementation(out, tservice, *f_iter, true);
-
-    if (!(*f_iter)->is_oneway()) {
-      generate_swift_service_client_recv_function_implementation(out, tservice, *f_iter, true);
-    }
-
-    indent(out) << "public " << async_function_signature(*f_iter);
-    block_open(out);
-
-    out << endl;
-
-    out << indent() << "let __transport = __transportFactory.newTransport()" << endl
-        << indent() << "let __protocol = __protocolFactory.newProtocolOnTransport(__transport)" << endl
-        << endl;
-
-    generate_swift_service_client_send_async_function_invocation(out, *f_iter);
-
-    out << endl;
-
-    indent(out) << "__transport.flushWithCompletion(";
-
-    if ((*f_iter)->is_oneway()) {
-      out << "success, failure: failure)" << endl;
-    }
-    else {
-      block_open(out);
-      indent(out) << "do";
-      block_open(out);
-
-      indent(out);
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        out << "let result = ";
-      }
-      out << "try self.recv_" << (*f_iter)->get_name() << "(__protocol)" << endl;
-
-      out << indent() << "success(";
-      if (!(*f_iter)->get_returntype()->is_void()) {
-        out << "result";
-      }
-      out << ")" << endl;
-
-      block_close(out);
-      indent(out) << "catch let error";
-      block_open(out);
-      indent(out) << "failure(error as NSError)" << endl;
-      block_close(out);
-      block_close(out);
-      indent(out) << ", failure: failure)" << endl;
-    }
-
-
-    block_close(out);
-
-    out << endl;
-
-    // Promise function
-    if (promise_kit_) {
-
-      indent(out) << "public " << promise_function_signature(*f_iter);
-      block_open(out);
-
-      out << indent() << "let (__promise, __fulfill, __reject) = Promise<" << type_name((*f_iter)->get_returntype()) << ">.pendingPromise()" << endl << endl
-          << indent() << "let __transport = __transportFactory.newTransport()" << endl
-          << indent() << "let __protocol = __protocolFactory.newProtocolOnTransport(__transport)" << endl
-          << endl;
-
-      generate_swift_service_client_send_async_function_invocation(out, *f_iter);
-
-      out << endl;
-
-      indent(out) << "__transport.flushWithCompletion(";
-
-      if ((*f_iter)->is_oneway()) {
-        out << "{ __fulfill() }, failure: { __reject($0) })" << endl;
-      }
-      else {
-        block_open(out);
-        indent(out) << "do";
-        block_open(out);
-
-        indent(out);
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          out << "let result = ";
-        }
-        out << "try self.recv_" << (*f_iter)->get_name() << "(__protocol)" << endl;
-
-        out << indent() << "__fulfill(";
-        if (!(*f_iter)->get_returntype()->is_void()) {
-          out << "result";
-        }
-        out << ")" << endl;
-
-        block_close(out);
-        indent(out) << "catch let error";
-        block_open(out);
-        indent(out) << "__reject(error)" << endl;
-        block_close(out);
-        block_close(out);
-
-        indent(out) << ", failure: { error in " << endl;
-        indent_up();
-        indent(out) << "__reject(error)" << endl;
-        indent_down();
-        indent(out) << "})" << endl;
-      }
-
-      indent(out) << "return __promise" << endl;
-
-      block_close(out);
-
-      out << endl;
-
-    }
-
-  }
-
-  block_close(out);
-
-  out << endl;
-}
-
-/**
- * Generates a service server implementation.
- *
- * Implemented by generating a block for each service function that
- * handles the processing of that function. The blocks are stored in
- * a map and looked up via function/message name.
- *
- * @param tservice The service to generate an implementation for
- */
-void t_swift_generator::generate_swift_service_server_implementation(ofstream& out,
-                                                                     t_service* tservice) {
-
-  string name = tservice->get_name() + "Processor";
-
-  indent(out) << "extension " << name << " : TProcessor";
-  block_open(out);
-
-  out << endl;
-
-  indent(out) << "static let processorHandlers : ProcessorHandlerDictionary =";
-  block_open(out);
-
-  out << endl;
-
-  out << indent() << "var processorHandlers = ProcessorHandlerDictionary()" << endl << endl;
-
-  // generate method map for routing incoming calls
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::const_iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-
-    t_function* tfunction = *f_iter;
-
-    string args_type = function_args_helper_struct_type(tservice, *f_iter);
-
-    out << indent() << "processorHandlers[\"" << tfunction->get_name() << "\"] = { sequenceID, inProtocol, outProtocol, handler in" << endl
-        << endl;
-
-    indent_up();
-    out << indent() << "let args = try " << args_type << ".readValueFromProtocol(inProtocol)" << endl
-        << endl
-        << indent() << "try inProtocol.readMessageEnd()" << endl
-        << endl;
-
-    if (!tfunction->is_oneway() ) {
-      string result_type = function_result_helper_struct_type(tservice, tfunction);
-      indent(out) << "var result = " << result_type << "()" << endl;
-
-      indent(out) << "do";
-      block_open(out);
-
-      indent(out);
-      if (!tfunction->get_returntype()->is_void()) {
-        out << "result.success = ";
-      }
-      out << "try handler." << function_name(tfunction) << "(";
-
-      t_struct* arg_struct = tfunction->get_arglist();
-      const vector<t_field*>& fields = arg_struct->get_members();
-      vector<t_field*>::const_iterator f_iter;
-
-      for (f_iter = fields.begin(); f_iter != fields.end();) {
-        string fieldName = (*f_iter)->get_name();
-        if (f_iter != fields.begin()) {
-          out << fieldName << ": ";
-        }
-        out << "args." << fieldName;
-        if (++f_iter != fields.end()) {
-          out << ", ";
-        }
-      }
-
-      out << ")" << endl;
-
-      block_close(out);
-
-      t_struct* xs = tfunction->get_xceptions();
-      const vector<t_field*>& xfields = xs->get_members();
-      vector<t_field*>::const_iterator x_iter;
-
-      for (x_iter = xfields.begin(); x_iter != xfields.end(); ++x_iter) {
-        indent(out) << "catch let error as " << (*x_iter)->get_type()->get_name();
-        block_open(out);
-        indent(out) << "result." << (*x_iter)->get_name() << " = error" << endl;
-        block_close(out);
-      }
-
-      indent(out) << "catch let error";
-      block_open(out);
-      out << indent() << "throw error" << endl;
-      block_close(out);
-
-      out << endl;
-
-      if (!tfunction->is_oneway()) {
-        out << indent() << "try outProtocol.writeMessageBeginWithName(\"" << tfunction->get_name() << "\", type: .REPLY, sequenceID: sequenceID)" << endl
-            << indent() << "try " << result_type << ".writeValue(result, toProtocol: outProtocol)" << endl
-            << indent() << "try outProtocol.writeMessageEnd()" << endl;
-      }
-    }
-    block_close(out);
-
-  }
-
-  indent(out) << "return processorHandlers" << endl;
-
-  block_close(out,false);
-  out << "()" << endl;
-
-  out << endl;
-
-  indent(out) << "public func processOnInputProtocol(inProtocol: TProtocol, outputProtocol outProtocol: TProtocol) throws";
-  block_open(out);
-
-  out << endl;
-
-  out << indent() << "let (messageName, _, sequenceID) = try inProtocol.readMessageBegin()" << endl
-      << endl
-      << indent() << "if let processorHandler = " << name << ".processorHandlers[messageName]";
-  block_open(out);
-  out << indent() << "do";
-  block_open(out);
-  out << indent() << "try processorHandler(sequenceID, inProtocol, outProtocol, service)" << endl;
-  block_close(out);
-  out << indent() << "catch let error as NSError";
-  block_open(out);
-  out << indent() << "try outProtocol.writeExceptionForMessageName(messageName, sequenceID: sequenceID, ex: error)" << endl;
-  block_close(out);
-  block_close(out);
-  out << indent() << "else";
-  block_open(out);
-  out << indent() << "try inProtocol.skipType(.STRUCT)" << endl
-      << indent() << "try inProtocol.readMessageEnd()" << endl
-      << indent() << "try outProtocol.writeExceptionForMessageName(messageName," << endl;
-  indent_up();
-  out << indent() << "sequenceID: sequenceID," << endl
-      << indent() << "ex: NSError(" << endl;
-  indent_up();
-  out << indent() << "domain: TApplicationErrorDomain, " << endl
-      << indent() << "code: Int(TApplicationError.UnknownMethod.rawValue), " << endl
-      << indent() << "userInfo: [TApplicationErrorMethodKey: messageName]))" << endl;
-  indent_down();
-  indent_down();
-  block_close(out);
-
-  block_close(out);
-
-  block_close(out);
-  out << endl;
-}
-
-/**
- * Returns an Swift name
- *
- * @param ttype The type
- * @param class_ref Do we want a Class reference istead of a type reference?
- * @return Swift type name, i.e. Dictionary<Key,Value>
- */
-string t_swift_generator::type_name(t_type* ttype, bool is_optional, bool is_forced) {
-  string result;
-  if (ttype->is_base_type()) {
-    result = base_type_name((t_base_type*)ttype);
-  } else if (ttype->is_map()) {
-    t_map *map = (t_map *)ttype;
-    result = "TMap<" + type_name(map->get_key_type()) + ", " + type_name(map->get_val_type()) + ">";
-  } else if (ttype->is_set()) {
-    t_set *set = (t_set *)ttype;
-    result = "TSet<" + type_name(set->get_elem_type()) + ">";
-  } else if (ttype->is_list()) {
-    t_list *list = (t_list *)ttype;
-    result = "TList<" + type_name(list->get_elem_type()) + ">";
-  }
-  else {
-    result = ttype->get_name();
-  }
-
-  if (is_optional) {
-    result += "?";
-  }
-
-  if (is_forced) {
-    result += "!";
-  }
-
-  return result;
-}
-
-/**
- * Returns the Swift type that corresponds to the thrift type.
- *
- * @param tbase The base type
- */
-string t_swift_generator::base_type_name(t_base_type* type) {
-  t_base_type::t_base tbase = type->get_base();
-
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "Void";
-  case t_base_type::TYPE_STRING:
-    if (type->is_binary()) {
-      return "TBinary";
-    } else {
-      return "String";
-    }
-  case t_base_type::TYPE_BOOL:
-    return "Bool";
-  case t_base_type::TYPE_I8:
-    return "Int8";
-  case t_base_type::TYPE_I16:
-    return "Int16";
-  case t_base_type::TYPE_I32:
-    return "Int32";
-  case t_base_type::TYPE_I64:
-    return "Int64";
-  case t_base_type::TYPE_DOUBLE:
-    return "Double";
-  default:
-    throw "compiler error: no Swift name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-/**
- * Renders full constant value (as would be seen after an '=')
- *
- */
-void t_swift_generator::render_const_value(ostream& out,
-                                             t_type* type,
-                                             t_const_value* value) {
-  type = get_true_type(type);
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      out << "\"" << get_escaped_string(value) << "\"";
-      break;
-    case t_base_type::TYPE_BOOL:
-      out << ((value->get_integer() > 0) ? "true" : "false");
-      break;
-    case t_base_type::TYPE_I8:
-    case t_base_type::TYPE_I16:
-    case t_base_type::TYPE_I32:
-    case t_base_type::TYPE_I64:
-      out << type_name(type) << "(" << value->get_integer() << ")";
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      out << type_name(type) << "(";
-      if (value->get_type() == t_const_value::CV_INTEGER) {
-        out << value->get_integer();
-      } else {
-        out << value->get_double();
-      }
-      out << ")";
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
-    }
-  } else if (type->is_enum()) {
-    out << value->get_identifier();
-  } else if (type->is_struct() || type->is_xception()) {
-
-    out << type_name(type) << "(";
-
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    for (f_iter = fields.begin(); f_iter != fields.end();) {
-      t_field* tfield = *f_iter;
-      t_const_value* value = NULL;
-      for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-        if (tfield->get_name() == v_iter->first->get_string()) {
-          value = v_iter->second;
-        }
-      }
-
-      if (value) {
-        out << tfield->get_name() << ": ";
-        render_const_value(out, tfield->get_type(), value);
-      }
-      else if (!field_is_optional(tfield)) {
-        throw "constant error: required field " + type->get_name() + "." + tfield->get_name() + " has no value";
-      }
-
-      if (++f_iter != fields.end()) {
-        out << ", ";
-      }
-    }
-
-    out << ")";
-
-  } else if (type->is_map()) {
-
-    out << "[";
-
-    t_type* ktype = ((t_map*)type)->get_key_type();
-    t_type* vtype = ((t_map*)type)->get_val_type();
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end();) {
-
-      render_const_value(out, ktype, v_iter->first);
-      out << ": ";
-      render_const_value(out, vtype, v_iter->second);
-
-      if (++v_iter != val.end()) {
-        out << ", ";
-      }
-    }
-
-    out << "]";
-
-  } else if (type->is_list()) {
-
-    out << "[";
-
-    t_type* etype = ((t_list*)type)->get_elem_type();
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end();) {
-
-      render_const_value(out, etype, v_iter->first);
-
-      if (++v_iter != val.end()) {
-        out << ", ";
-      }
-    }
-
-    out << "]";
-
-  } else if (type->is_set()) {
-
-    out << "[";
-
-    t_type* etype = ((t_set*)type)->get_elem_type();
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-    for (v_iter = val.begin(); v_iter != val.end();) {
-
-      render_const_value(out, etype, v_iter->first);
-
-      if (++v_iter != val.end()) {
-        out << ", ";
-      }
-    }
-
-    out << "]";
-
-  } else {
-    throw "compiler error: no const of type " + type->get_name();
-  }
-
-}
-
-/**
- * Declares an Swift property.
- *
- * @param tfield The field to declare a property for
- */
-string t_swift_generator::declare_property(t_field* tfield, bool is_private) {
-
-  string visibility = is_private ? "private" : "public";
-
-  ostringstream render;
-
-  render << visibility << " var " << maybe_escape_identifier(tfield->get_name());
-
-  if (field_is_optional(tfield)) {
-    render << " : " << type_name(tfield->get_type(), true);
-  }
-  else {
-    render << " = " << type_name(tfield->get_type(), false) << "()";
-  }
-
-  return render.str();
-}
-
-/**
- * Renders a function signature
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_swift_generator::function_signature(t_function* tfunction) {
-
-  string result = "func " + function_name(tfunction);
-
-  result += "(" + argument_list(tfunction->get_arglist(), "", false) + ") throws";
-
-  t_type* ttype = tfunction->get_returntype();
-  if (!ttype->is_void()) {
-    result += " -> " + type_name(ttype);
-  }
-
-  return result;
-}
-
-/**
- * Renders a function signature that returns asynchronously via blocks.
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_swift_generator::async_function_signature(t_function* tfunction) {
-  t_type* ttype = tfunction->get_returntype();
-  t_struct* targlist = tfunction->get_arglist();
-  string response_param = "(" + ((ttype->is_void()) ? "" : type_name(ttype)) + ") -> Void";
-  string result = "func " + function_name(tfunction);
-  result += "(" + argument_list(tfunction->get_arglist(), "", false)
-          + (targlist->get_members().size() ? ", " : "")
-          + "success: " + response_param + ", "
-          + "failure: (NSError) -> Void) throws";
-  return result;
-}
-
-/**
- * Renders a function signature that returns asynchronously via promises.
- *
- * @param tfunction Function definition
- * @return String of rendered function definition
- */
-string t_swift_generator::promise_function_signature(t_function* tfunction) {
-  return "func " + function_name(tfunction) + "(" + argument_list(tfunction->get_arglist(), "", false) + ") throws "
-          + "-> Promise<" + type_name(tfunction->get_returntype()) + ">";
-}
-
-/**
- * Renders a verbose function name suitable for a Swift method
- */
-string t_swift_generator::function_name(t_function* tfunction) {
-  string name = tfunction->get_name();
-  if (!tfunction->get_arglist()->get_members().empty()) {
-    string first_arg = tfunction->get_arglist()->get_members().front()->get_name();
-    if (name.size() < first_arg.size() ||
-        lowercase(name.substr(name.size()-first_arg.size())) != lowercase(first_arg)) {
-      name += "With" + capitalize(tfunction->get_arglist()->get_members()[0]->get_name());
-    }
-  }
-  return name;
-}
-
-/**
- * Renders a Swift method argument list
- */
-string t_swift_generator::argument_list(t_struct* tstruct, string protocol_name, bool is_internal) {
-  string result = "";
-  bool include_protocol = !protocol_name.empty();
-
-  const vector<t_field*>& fields = tstruct->get_members();
-  vector<t_field*>::const_iterator f_iter;
-
-  if (include_protocol) {
-    result += protocol_name + ": TProtocol";
-    if (!fields.empty()) {
-      result += ", ";
-    }
-  }
-  else if (!fields.empty() && is_internal) {
-    // Force first argument to be named
-    result += fields.front()->get_name() + " ";
-  }
-
-  for (f_iter = fields.begin(); f_iter != fields.end();) {
-    t_field* arg = *f_iter;
-    result += arg->get_name() + ": " + type_name(arg->get_type());
-
-    if (++f_iter != fields.end()) {
-      result += ", ";
-    }
-  }
-  return result;
-}
-
-/**
- * https://developer.apple.com/library/ios/documentation/Swift/Conceptual/Swift_Programming_Language/LexicalStructure.html
- *
- */
-
-void t_swift_generator::populate_reserved_words() {
-  swift_reserved_words_.insert("Self");
-  swift_reserved_words_.insert("associatedtype");
-  swift_reserved_words_.insert("defer");
-  swift_reserved_words_.insert("deinit");
-  swift_reserved_words_.insert("dynamicType");
-  swift_reserved_words_.insert("enum");
-  swift_reserved_words_.insert("extension");
-  swift_reserved_words_.insert("fallthrough");
-  swift_reserved_words_.insert("false");
-  swift_reserved_words_.insert("func");
-  swift_reserved_words_.insert("guard");
-  swift_reserved_words_.insert("init");
-  swift_reserved_words_.insert("inout");
-  swift_reserved_words_.insert("internal");
-  swift_reserved_words_.insert("let");
-  swift_reserved_words_.insert("operator");
-  swift_reserved_words_.insert("protocol");
-  swift_reserved_words_.insert("repeat");
-  swift_reserved_words_.insert("rethrows");
-  swift_reserved_words_.insert("struct");
-  swift_reserved_words_.insert("subscript");
-  swift_reserved_words_.insert("throws");
-  swift_reserved_words_.insert("true");
-  swift_reserved_words_.insert("typealias");
-  swift_reserved_words_.insert("where");
-}
-
-string t_swift_generator::maybe_escape_identifier(const string& identifier) {
-  if (swift_reserved_words_.find(identifier) != swift_reserved_words_.end()) {
-    return "`" + identifier + "`";
-  }
-  return identifier;
-}
-
-/**
- * Converts the parse type to a Swift TType enumeration.
- */
-string t_swift_generator::type_to_enum(t_type* type, bool qualified) {
-  type = get_true_type(type);
-
-  string result = qualified ? "TType." : ".";
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_VOID:
-      throw "NO T_VOID CONSTRUCT";
-    case t_base_type::TYPE_STRING:
-      return result + "STRING";
-    case t_base_type::TYPE_BOOL:
-      return result + "BOOL";
-    case t_base_type::TYPE_I8:
-      return result + "BYTE";
-    case t_base_type::TYPE_I16:
-      return result + "I16";
-    case t_base_type::TYPE_I32:
-      return result + "I32";
-    case t_base_type::TYPE_I64:
-      return result + "I64";
-    case t_base_type::TYPE_DOUBLE:
-      return result + "DOUBLE";
-    }
-  } else if (type->is_enum()) {
-    return result + "I32";
-  } else if (type->is_struct() || type->is_xception()) {
-    return result + "STRUCT";
-  } else if (type->is_map()) {
-    return result + "MAP";
-  } else if (type->is_set()) {
-    return result + "SET";
-  } else if (type->is_list()) {
-    return result + "LIST";
-  }
-
-  throw "INVALID TYPE IN type_to_enum: " + type->get_name();
-}
-
-
-THRIFT_REGISTER_GENERATOR(
-    swift,
-    "Swift",
-    "    log_unexpected:  Log every time an unexpected field ID or type is encountered.\n"
-    "    debug_descriptions:\n"
-    "                     Allow use of debugDescription so the app can add description via a cateogory/extension\n"
-    "    async_clients:   Generate clients which invoke asynchronously via block syntax.\n"
-    "    promise_kit:     Generate clients which invoke asynchronously via promises.\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_xml_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_xml_generator.cc
deleted file mode 100644
index b35f351..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_xml_generator.cc
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <limits>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-
-#include "thrift/platform.h"
-#include "thrift/generate/t_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-using std::stack;
-using std::set;
-
-static const string endl = "\n";
-static const string quot = "\"";
-
-static const string default_ns_prefix = "http://thrift.apache.org/xml/ns/";
-
-/**
- * This generator creates an XML model of the parsed IDL tree, and is designed
- * to make it easy to use this file as the input for other template engines,
- * such as XSLT.  To this end, the generated XML is slightly more verbose than
- * you might expect... for example, references to "id" types (such as structs,
- * unions, etc) always specify the name of the IDL document, even if the type
- * is defined in the same document as the reference.
- */
-class t_xml_generator : public t_generator {
-public:
-  t_xml_generator( t_program* program,
-                   const std::map<std::string, std::string>& parsed_options,
-                   const std::string& option_string)
-    : t_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    should_merge_includes_ = false;
-    should_use_default_ns_ = true;
-    should_use_namespaces_ = true;
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      if( iter->first.compare("merge") == 0) {
-        should_merge_includes_ = true;
-      } else if( iter->first.compare("no_default_ns") == 0) {
-        should_use_default_ns_ = false;
-      } else if( iter->first.compare("no_namespaces") == 0) {
-        should_use_namespaces_ = false;
-      } else {
-        throw "unknown option xml:" + iter->first;
-      }
-    }
-
-    out_dir_base_ = "gen-xml";
-  }
-
-  virtual ~t_xml_generator() {}
-
-  void init_generator();
-  void close_generator();
-  void generate_program();
-
-  void iterate_program(t_program* program);
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum);
-  void generate_function(t_function* tfunc);
-  void generate_field(t_field* field);
-
-  void generate_service(t_service* tservice);
-  void generate_struct(t_struct* tstruct);
-
-  void generate_annotations(std::map<std::string, std::string> annotations);
-
-private:
-  bool should_merge_includes_;
-  bool should_use_default_ns_;
-  bool should_use_namespaces_;
-
-  std::ofstream f_xml_;
-
-  std::set<string> programs_;
-  std::stack<string> elements_;
-  bool top_element_is_empty;
-  bool top_element_is_open;
-
-  string target_namespace(t_program* program);
-  void write_element_start(const string name);
-  void close_top_element();
-  void write_element_end();
-  void write_attribute(string key, string val);
-  void write_int_attribute(string key, int val);
-  string escape_xml_string(const string& input);
-
-  void write_xml_comment(string msg);
-
-  void write_type(t_type* ttype);
-  void write_doc(t_doc* tdoc);
-
-  template <typename T>
-  string number_to_string(T t) {
-    std::ostringstream out;
-    out.imbue(std::locale::classic());
-    out.precision(std::numeric_limits<T>::digits10);
-    out << t;
-    return out.str();
-  }
-
-  template <typename T>
-  void write_number(T n) {
-    f_xml_ << number_to_string(n);
-  }
-
-  template <typename T>
-  void write_element_number(string name, T n) {
-    write_element_string(name, number_to_string(n));
-  }
-
-  string get_type_name(t_type* ttype);
-
-  void generate_constant(t_const* con);
-
-  void write_element_string(string name, string value);
-  void write_value(t_type* tvalue);
-  void write_const_value(t_const_value* value);
-  virtual std::string xml_autogen_comment() {
-    return std::string("\n") + " * Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-           + " *\n" + " * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n";
-  }
-};
-
-void t_xml_generator::init_generator() {
-  MKDIR(get_out_dir().c_str());
-
-  string f_xml_name = get_out_dir() + program_->get_name() + ".xml";
-  f_xml_.open(f_xml_name.c_str());
-
-  top_element_is_open = false;
-}
-
-string t_xml_generator::target_namespace(t_program* program) {
-  std::map<std::string, std::string> map;
-  std::map<std::string, std::string>::iterator iter;
-  map = program->get_namespace_annotations("xml");
-  if ((iter = map.find("targetNamespace")) != map.end()) {
-    return iter->second;
-  }
-  map = program->get_namespaces();
-  if ((iter = map.find("xml")) != map.end()) {
-    return default_ns_prefix + iter->second;
-  }
-  map = program->get_namespace_annotations("*");
-  if ((iter = map.find("xml.targetNamespace")) != map.end()) {
-    return iter->second;
-  }
-  map = program->get_namespaces();
-  if ((iter = map.find("*")) != map.end()) {
-    return default_ns_prefix + iter->second;
-  }
-  return default_ns_prefix + program->get_name();
-}
-
-void t_xml_generator::write_xml_comment(string msg) {
-  close_top_element();
-  // TODO: indent any EOLs that may occur with msg
-  // TODO: proper msg escaping needed?
-  f_xml_ << indent() << "<!-- " << msg << " -->"  << endl;
-  top_element_is_empty = false;
-}
-
-void t_xml_generator::close_top_element() {
-  if( top_element_is_open) {
-    top_element_is_open = false;
-    if (elements_.size() > 0 && top_element_is_empty) {
-      f_xml_ << ">" << endl;
-    }
-  }
-}
-
-void t_xml_generator::write_element_start(string name) {
-  if (should_use_namespaces_ && !should_use_default_ns_) {
-    name = "idl:" + name;
-  }
-  close_top_element();
-  f_xml_ << indent() << "<" << name;
-  elements_.push(name);
-  top_element_is_empty = true;
-  top_element_is_open = true;
-  indent_up();
-}
-
-void t_xml_generator::write_element_end() {
-  indent_down();
-  if (top_element_is_empty && top_element_is_open) {
-    f_xml_ << " />" << endl;
-  } else {
-    f_xml_ << indent() << "</" << elements_.top() << ">" << endl;
-  }
-  top_element_is_empty = false;
-  elements_.pop();
-}
-
-void t_xml_generator::write_attribute(string key, string val) {
-  f_xml_ << " " << key << "=\"" << escape_xml_string(val) << "\"";
-}
-
-void t_xml_generator::write_int_attribute(string key, int val) {
-  write_attribute(key, number_to_string(val));
-}
-
-void t_xml_generator::write_element_string(string name, string val) {
-  if (should_use_namespaces_ && !should_use_default_ns_) {
-    name = "idl:" + name;
-  }
-  close_top_element();
-  top_element_is_empty = false;
-  f_xml_ << indent()
-    << "<" << name << ">" << escape_xml_string(val) << "</" << name << ">"
-    << endl;
-}
-
-string t_xml_generator::escape_xml_string(const string& input) {
-  std::ostringstream ss;
-  for (std::string::const_iterator iter = input.begin(); iter != input.end(); iter++) {
-    switch (*iter) {
-    case '&':
-      ss << "&amp;";
-      break;
-    case '"':
-      ss << "&quot;";
-      break;
-    case '\'':
-      ss << "&apos;";
-      break;
-    case '<':
-      ss << "&lt;";
-      break;
-    case '>':
-      ss << "&gt;";
-      break;
-    default:
-      ss << *iter;
-      break;
-    }
-  }
-  return ss.str();
-}
-
-void t_xml_generator::close_generator() {
-  f_xml_.close();
-}
-
-void t_xml_generator::generate_program() {
-
-  init_generator();
-
-  write_element_start("idl");
-  if (should_use_namespaces_) {
-    if (should_use_default_ns_) {
-      write_attribute("xmlns", "http://thrift.apache.org/xml/idl");
-    }
-    write_attribute("xmlns:idl", "http://thrift.apache.org/xml/idl");
-  }
-
-  write_xml_comment( xml_autogen_comment());
-
-  iterate_program(program_);
-
-  write_element_end();
-
-  close_generator();
-
-}
-
-void t_xml_generator::iterate_program(t_program* program) {
-
-  write_element_start("document");
-  write_attribute("name", program->get_name());
-  if (should_use_namespaces_) {
-    const string targetNamespace = target_namespace(program);
-    write_attribute("targetNamespace", targetNamespace);
-    write_attribute("xmlns:" + program->get_name(), targetNamespace);
-  }
-  write_doc(program);
-
-  const vector<t_program*> includes = program->get_includes();
-  vector<t_program*>::const_iterator inc_it;
-  for (inc_it = includes.begin(); inc_it != includes.end(); ++inc_it) {
-    write_element_start("include");
-    write_attribute("name", (*inc_it)->get_name());
-    write_element_end();
-  }
-
-  const map<string, string>& namespaces = program->get_namespaces();
-  map<string, string>::const_iterator ns_it;
-  for (ns_it = namespaces.begin(); ns_it != namespaces.end(); ++ns_it) {
-    write_element_start("namespace");
-    write_attribute("name", ns_it->first);
-    write_attribute("value", ns_it->second);
-    generate_annotations(program->get_namespace_annotations(ns_it->first));
-    write_element_end();
-  }
-
-  // TODO: can constants have annotations?
-  vector<t_const*> consts = program->get_consts();
-  vector<t_const*>::iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    generate_constant(*c_iter);
-  }
-
-  vector<t_typedef*> typedefs = program->get_typedefs();
-  vector<t_typedef*>::iterator td_iter;
-  for (td_iter = typedefs.begin(); td_iter != typedefs.end(); ++td_iter) {
-    generate_typedef(*td_iter);
-  }
-
-  vector<t_enum*> enums = program->get_enums();
-  vector<t_enum*>::iterator en_iter;
-  for (en_iter = enums.begin(); en_iter != enums.end(); ++en_iter) {
-    generate_enum(*en_iter);
-  }
-
-  vector<t_struct*> objects = program->get_objects();
-  vector<t_struct*>::iterator o_iter;
-  for (o_iter = objects.begin(); o_iter != objects.end(); ++o_iter) {
-    if ((*o_iter)->is_xception()) {
-      generate_xception(*o_iter);
-    } else {
-      generate_struct(*o_iter);
-    }
-  }
-
-  vector<t_service*> services = program->get_services();
-  vector<t_service*>::iterator sv_iter;
-  for (sv_iter = services.begin(); sv_iter != services.end(); ++sv_iter) {
-    generate_service(*sv_iter);
-  }
-
-  write_element_end();
-
-  if (should_merge_includes_) {
-    programs_.insert(program->get_name());
-    const vector<t_program*> programs = program->get_includes();
-    vector<t_program*>::const_iterator prog_it;
-    for (prog_it = programs.begin(); prog_it != programs.end(); ++prog_it) {
-      if (!programs_.count((*prog_it)->get_name())) {
-        iterate_program(*prog_it);
-      }
-    }
-  }
-
-}
-
-void t_xml_generator::generate_typedef(t_typedef* ttypedef) {
-  write_element_start("typedef");
-  write_attribute("name", ttypedef->get_name());
-  write_doc(ttypedef);
-  write_type(ttypedef->get_true_type());
-  generate_annotations(ttypedef->annotations_);
-  write_element_end();
-  return;
-}
-
-void t_xml_generator::write_type(t_type* ttype) {
-  const string type = get_type_name(ttype);
-  write_attribute("type", type);
-  if (type == "id") {
-    write_attribute("type-module", ttype->get_program()->get_name());
-    write_attribute("type-id", ttype->get_name());
-  } else if (type == "list" || type == "set") {
-    t_type* etype = ((t_list*)ttype)->get_elem_type();
-    write_element_start("elemType");
-    write_type(etype);
-    write_element_end();
-  } else if (type == "map") {
-    t_type* ktype = ((t_map*)ttype)->get_key_type();
-    write_element_start("keyType");
-    write_type(ktype);
-    write_element_end();
-    t_type* vtype = ((t_map*)ttype)->get_val_type();
-    write_element_start("valueType");
-    write_type(vtype);
-    write_element_end();
-  }
-}
-
-void t_xml_generator::write_doc(t_doc* tdoc) {
-  if (tdoc->has_doc()) {
-    string doc = tdoc->get_doc();
-    // for some reason there always seems to be a trailing newline on doc
-    // comments; loop below naively tries to strip off trailing cr/lf
-    int n = 0;
-    for (string::reverse_iterator i = doc.rbegin(); i != doc.rend(); i++,n++) {
-      if (*i != '\n' || *i == '\r') {
-        if (n > 0) {
-          doc.erase(doc.length() - n);
-        }
-        break;
-      }
-    }
-    write_attribute("doc", doc);
-  }
-}
-
-void t_xml_generator::generate_annotations(
-    std::map<std::string, std::string> annotations) {
-  std::map<std::string, std::string>::iterator iter;
-  for (iter = annotations.begin(); iter != annotations.end(); ++iter) {
-    write_element_start("annotation");
-    write_attribute("key", iter->first);
-    write_attribute("value", iter->second);
-    write_element_end();
-  }
-}
-
-void t_xml_generator::generate_constant(t_const* con) {
-  write_element_start("const");
-  write_attribute("name", con->get_name());
-  write_doc(con);
-  write_type(con->get_type());
-  write_const_value(con->get_value());
-  write_element_end();
-}
-
-void t_xml_generator::write_const_value(t_const_value* value) {
-
-  switch (value->get_type()) {
-
-  case t_const_value::CV_IDENTIFIER:
-  case t_const_value::CV_INTEGER:
-    write_element_number("int", value->get_integer());
-    break;
-
-  case t_const_value::CV_DOUBLE:
-    write_element_number("double", value->get_double());
-    break;
-
-  case t_const_value::CV_STRING:
-    write_element_string("string", value->get_string());
-    break;
-
-  case t_const_value::CV_LIST: {
-    write_element_start("list");
-    std::vector<t_const_value*> list = value->get_list();
-    std::vector<t_const_value*>::iterator lit;
-    for (lit = list.begin(); lit != list.end(); ++lit) {
-      write_element_start("entry");
-      write_const_value(*lit);
-      write_element_end();
-    }
-    write_element_end();
-    break;
-  }
-
-  case t_const_value::CV_MAP: {
-    write_element_start("map");
-    std::map<t_const_value*, t_const_value*> map = value->get_map();
-    std::map<t_const_value*, t_const_value*>::iterator mit;
-    for (mit = map.begin(); mit != map.end(); ++mit) {
-      write_element_start("entry");
-      write_element_start("key");
-      write_const_value(mit->first);
-      write_element_end();
-      write_element_start("value");
-      write_const_value(mit->second);
-      write_element_end();
-      write_element_end();
-    }
-    write_element_end();
-    break;
-  }
-
-  default:
-    indent_up();
-    f_xml_ << indent() << "<null />" << endl;
-    indent_down();
-    break;
-  }
-
-}
-
-void t_xml_generator::generate_enum(t_enum* tenum) {
-
-  write_element_start("enum");
-  write_attribute("name", tenum->get_name());
-  write_doc(tenum);
-
-  vector<t_enum_value*> values = tenum->get_constants();
-  vector<t_enum_value*>::iterator val_iter;
-  for (val_iter = values.begin(); val_iter != values.end(); ++val_iter) {
-    t_enum_value* val = (*val_iter);
-    write_element_start("member");
-    write_attribute("name", val->get_name());
-    write_int_attribute("value", val->get_value());
-    write_doc(val);
-    generate_annotations(val->annotations_);
-    write_element_end();
-  }
-
-  generate_annotations(tenum->annotations_);
-
-  write_element_end();
-
-}
-
-void t_xml_generator::generate_struct(t_struct* tstruct) {
-
-  string tagname = "struct";
-  if (tstruct->is_union()) {
-    tagname = "union";
-  } else if (tstruct->is_xception()) {
-    tagname = "exception";
-  }
-
-  write_element_start(tagname);
-  write_attribute("name", tstruct->get_name());
-  write_doc(tstruct);
-  vector<t_field*> members = tstruct->get_members();
-  vector<t_field*>::iterator mem_iter;
-  for (mem_iter = members.begin(); mem_iter != members.end(); mem_iter++) {
-    write_element_start("field");
-    generate_field(*mem_iter);
-    write_element_end();
-  }
-
-  generate_annotations(tstruct->annotations_);
-
-  write_element_end();
-
-}
-
-void t_xml_generator::generate_field(t_field* field) {
-  write_attribute("name", field->get_name());
-  write_int_attribute("field-id", field->get_key());
-  write_doc(field);
-  string requiredness;
-  switch (field->get_req()) {
-  case t_field::T_REQUIRED:
-    requiredness = "required";
-    break;
-  case t_field::T_OPTIONAL:
-    requiredness = "optional";
-    break;
-  default:
-    requiredness = "";
-    break;
-  }
-  if (requiredness != "") {
-    write_attribute("required", requiredness);
-  }
-  write_type(field->get_type());
-  if (field->get_value()) {
-    write_element_start("default");
-    write_const_value(field->get_value());
-    write_element_end();
-  }
-  generate_annotations(field->annotations_);
-}
-
-void t_xml_generator::generate_service(t_service* tservice) {
-
-  write_element_start("service");
-  write_attribute("name", tservice->get_name());
-
-  if (should_use_namespaces_) {
-    string prog_ns = target_namespace(tservice->get_program());
-    if (*prog_ns.rbegin() != '/') {
-      prog_ns.push_back('/');
-    }
-    const string tns = prog_ns + tservice->get_name();
-    write_attribute("targetNamespace", tns);
-    write_attribute("xmlns:tns", tns);
-  }
-
-  if (tservice->get_extends()) {
-    const t_service* extends = tservice->get_extends();
-    write_attribute("parent-module", extends->get_program()->get_name());
-    write_attribute("parent-id", extends->get_name());
-  }
-
-  write_doc(tservice);
-
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator fn_iter = functions.begin();
-  for (; fn_iter != functions.end(); fn_iter++) {
-    generate_function(*fn_iter);
-  }
-
-  generate_annotations(tservice->annotations_);
-
-  write_element_end();
-
-}
-
-void t_xml_generator::generate_function(t_function* tfunc) {
-
-  write_element_start("method");
-
-  write_attribute("name", tfunc->get_name());
-  if (tfunc->is_oneway()) {
-    write_attribute("oneway", "true");
-  }
-
-  write_doc(tfunc);
-
-  write_element_start("returns");
-  write_type(tfunc->get_returntype());
-  write_element_end();
-
-  vector<t_field*> members = tfunc->get_arglist()->get_members();
-  vector<t_field*>::iterator mem_iter = members.begin();
-  for (; mem_iter != members.end(); mem_iter++) {
-    write_element_start("arg");
-    generate_field(*mem_iter);
-    write_element_end();
-  }
-
-  vector<t_field*> excepts = tfunc->get_xceptions()->get_members();
-  vector<t_field*>::iterator ex_iter = excepts.begin();
-  for (; ex_iter != excepts.end(); ex_iter++) {
-    write_element_start("throws");
-    generate_field(*ex_iter);
-    write_element_end();
-  }
-
-  generate_annotations(tfunc->annotations_);
-
-  write_element_end();
-
-}
-
-string t_xml_generator::get_type_name(t_type* ttype) {
-  if (ttype->is_list()) {
-    return "list";
-  }
-  if (ttype->is_set()) {
-    return "set";
-  }
-  if (ttype->is_map()) {
-    return "map";
-  }
-  if ((ttype->is_enum()    )||
-      (ttype->is_struct()  )||
-      (ttype->is_typedef() )||
-      (ttype->is_xception())){
-    return "id";
-  }
-  if (ttype->is_base_type()) {
-    t_base_type* tbasetype = (t_base_type*)ttype;
-    if (tbasetype->is_binary() ) {
-      return "binary";
-    }
-    return t_base_type::t_base_name(tbasetype->get_base());
-  }
-  return "(unknown)";
-}
-
-THRIFT_REGISTER_GENERATOR(
-  xml,
-  "XML",
-  "    merge:           Generate output with included files merged\n"
-  "    no_default_ns:   Omit default xmlns and add idl: prefix to all elements\n"
-  "    no_namespaces:   Do not add namespace definitions to the XML model\n")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_xsd_generator.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_xsd_generator.cc
deleted file mode 100644
index fa51ba0..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/generate/t_xsd_generator.cc
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <fstream>
-#include <iostream>
-#include <sstream>
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sstream>
-#include "thrift/version.h"
-#include "thrift/platform.h"
-#include "thrift/generate/t_generator.h"
-
-using std::map;
-using std::ofstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-using std::stringstream;
-using std::vector;
-
-static const string endl = "\n"; // avoid ostream << std::endl flushes
-
-/**
- * XSD generator, creates an XSD for the base types etc.
- *
- */
-class t_xsd_generator : public t_generator {
-public:
-  t_xsd_generator(t_program* program,
-                  const std::map<std::string, std::string>& parsed_options,
-                  const std::string& option_string)
-    : t_generator(program) {
-    (void)option_string;
-    std::map<std::string, std::string>::const_iterator iter;
-
-    /* no options yet */
-    for( iter = parsed_options.begin(); iter != parsed_options.end(); ++iter) {
-      throw "unknown option xsd:" + iter->first;
-    }
-
-    out_dir_base_ = "gen-xsd";
-  }
-
-  virtual ~t_xsd_generator() {}
-
-  /**
-   * Init and close methods
-   */
-
-  void init_generator();
-  void close_generator();
-
-  /**
-   * Program-level generation functions
-   */
-
-  void generate_typedef(t_typedef* ttypedef);
-  void generate_enum(t_enum* tenum) { (void)tenum; }
-
-  void generate_service(t_service* tservice);
-  void generate_struct(t_struct* tstruct);
-
-private:
-  void generate_element(std::ostream& out,
-                        std::string name,
-                        t_type* ttype,
-                        t_struct* attrs = NULL,
-                        bool optional = false,
-                        bool nillable = false,
-                        bool list_element = false);
-
-  std::string ns(std::string in, std::string ns) { return ns + ":" + in; }
-
-  std::string xsd(std::string in) { return ns(in, "xsd"); }
-
-  std::string type_name(t_type* ttype);
-  std::string base_type_name(t_base_type::t_base tbase);
-
-  virtual std::string xml_autogen_comment() {
-    return std::string("<!--\n") + " * Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
-           + " *\n" + " * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n"
-           + " -->\n";
-  }
-
-  /**
-   * Output xsd/php file
-   */
-  std::ofstream f_xsd_;
-  std::ofstream f_php_;
-
-  /**
-   * Output string stream
-   */
-  std::ostringstream s_xsd_types_;
-};
-
-void t_xsd_generator::init_generator() {
-  // Make output directory
-  MKDIR(get_out_dir().c_str());
-
-  // Make output file
-  string f_php_name = get_out_dir() + program_->get_name() + "_xsd.php";
-  f_php_.open(f_php_name.c_str());
-
-  f_php_ << "<?php" << endl
-         << autogen_comment() << endl;
-}
-
-void t_xsd_generator::close_generator() {
-  f_php_ << "?>" << endl;
-  f_php_.close();
-}
-
-void t_xsd_generator::generate_typedef(t_typedef* ttypedef) {
-  indent(s_xsd_types_) << "<xsd:simpleType name=\"" << ttypedef->get_name() << "\">" << endl;
-  indent_up();
-  if (ttypedef->get_type()->is_string() && ((t_base_type*)ttypedef->get_type())->is_string_enum()) {
-    indent(s_xsd_types_) << "<xsd:restriction base=\"" << type_name(ttypedef->get_type()) << "\">"
-                         << endl;
-    indent_up();
-    const vector<string>& values = ((t_base_type*)ttypedef->get_type())->get_string_enum_vals();
-    vector<string>::const_iterator v_iter;
-    for (v_iter = values.begin(); v_iter != values.end(); ++v_iter) {
-      indent(s_xsd_types_) << "<xsd:enumeration value=\"" << (*v_iter) << "\" />" << endl;
-    }
-    indent_down();
-    indent(s_xsd_types_) << "</xsd:restriction>" << endl;
-  } else {
-    indent(s_xsd_types_) << "<xsd:restriction base=\"" << type_name(ttypedef->get_type()) << "\" />"
-                         << endl;
-  }
-  indent_down();
-  indent(s_xsd_types_) << "</xsd:simpleType>" << endl << endl;
-}
-
-void t_xsd_generator::generate_struct(t_struct* tstruct) {
-  vector<t_field*>::const_iterator m_iter;
-  const vector<t_field*>& members = tstruct->get_members();
-  bool xsd_all = tstruct->get_xsd_all();
-
-  indent(s_xsd_types_) << "<xsd:complexType name=\"" << tstruct->get_name() << "\">" << endl;
-  indent_up();
-  if (xsd_all) {
-    indent(s_xsd_types_) << "<xsd:all>" << endl;
-  } else {
-    indent(s_xsd_types_) << "<xsd:sequence>" << endl;
-  }
-  indent_up();
-
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    generate_element(s_xsd_types_,
-                     (*m_iter)->get_name(),
-                     (*m_iter)->get_type(),
-                     (*m_iter)->get_xsd_attrs(),
-                     (*m_iter)->get_xsd_optional() || xsd_all,
-                     (*m_iter)->get_xsd_nillable());
-  }
-
-  indent_down();
-  if (xsd_all) {
-    indent(s_xsd_types_) << "</xsd:all>" << endl;
-  } else {
-    indent(s_xsd_types_) << "</xsd:sequence>" << endl;
-  }
-  indent_down();
-  indent(s_xsd_types_) << "</xsd:complexType>" << endl << endl;
-}
-
-void t_xsd_generator::generate_element(ostream& out,
-                                       string name,
-                                       t_type* ttype,
-                                       t_struct* attrs,
-                                       bool optional,
-                                       bool nillable,
-                                       bool list_element) {
-  string sminOccurs = (optional || list_element) ? " minOccurs=\"0\"" : "";
-  string smaxOccurs = list_element ? " maxOccurs=\"unbounded\"" : "";
-  string soptional = sminOccurs + smaxOccurs;
-  string snillable = nillable ? " nillable=\"true\"" : "";
-
-  if (ttype->is_void() || ttype->is_list()) {
-    indent(out) << "<xsd:element name=\"" << name << "\"" << soptional << snillable << ">" << endl;
-    indent_up();
-    if (attrs == NULL && ttype->is_void()) {
-      indent(out) << "<xsd:complexType />" << endl;
-    } else {
-      indent(out) << "<xsd:complexType>" << endl;
-      indent_up();
-      if (ttype->is_list()) {
-        indent(out) << "<xsd:sequence minOccurs=\"0\" maxOccurs=\"unbounded\">" << endl;
-        indent_up();
-        string subname;
-        t_type* subtype = ((t_list*)ttype)->get_elem_type();
-        if (subtype->is_base_type() || subtype->is_container()) {
-          subname = name + "_elt";
-        } else {
-          subname = type_name(subtype);
-        }
-        f_php_ << "$GLOBALS['" << program_->get_name() << "_xsd_elt_" << name << "'] = '" << subname
-               << "';" << endl;
-        generate_element(out, subname, subtype, NULL, false, false, true);
-        indent_down();
-        indent(out) << "</xsd:sequence>" << endl;
-        indent(out) << "<xsd:attribute name=\"list\" type=\"xsd:boolean\" />" << endl;
-      }
-      if (attrs != NULL) {
-        const vector<t_field*>& members = attrs->get_members();
-        vector<t_field*>::const_iterator a_iter;
-        for (a_iter = members.begin(); a_iter != members.end(); ++a_iter) {
-          indent(out) << "<xsd:attribute name=\"" << (*a_iter)->get_name() << "\" type=\""
-                      << type_name((*a_iter)->get_type()) << "\" />" << endl;
-        }
-      }
-      indent_down();
-      indent(out) << "</xsd:complexType>" << endl;
-    }
-    indent_down();
-    indent(out) << "</xsd:element>" << endl;
-  } else {
-    if (attrs == NULL) {
-      indent(out) << "<xsd:element name=\"" << name << "\""
-                  << " type=\"" << type_name(ttype) << "\"" << soptional << snillable << " />"
-                  << endl;
-    } else {
-      // Wow, all this work for a SIMPLE TYPE with attributes?!?!?!
-      indent(out) << "<xsd:element name=\"" << name << "\"" << soptional << snillable << ">"
-                  << endl;
-      indent_up();
-      indent(out) << "<xsd:complexType>" << endl;
-      indent_up();
-      indent(out) << "<xsd:complexContent>" << endl;
-      indent_up();
-      indent(out) << "<xsd:extension base=\"" << type_name(ttype) << "\">" << endl;
-      indent_up();
-      const vector<t_field*>& members = attrs->get_members();
-      vector<t_field*>::const_iterator a_iter;
-      for (a_iter = members.begin(); a_iter != members.end(); ++a_iter) {
-        indent(out) << "<xsd:attribute name=\"" << (*a_iter)->get_name() << "\" type=\""
-                    << type_name((*a_iter)->get_type()) << "\" />" << endl;
-      }
-      indent_down();
-      indent(out) << "</xsd:extension>" << endl;
-      indent_down();
-      indent(out) << "</xsd:complexContent>" << endl;
-      indent_down();
-      indent(out) << "</xsd:complexType>" << endl;
-      indent_down();
-      indent(out) << "</xsd:element>" << endl;
-    }
-  }
-}
-
-
-void t_xsd_generator::generate_service(t_service* tservice) {
-  // Make output file
-  string f_xsd_name = get_out_dir() + tservice->get_name() + ".xsd";
-  f_xsd_.open(f_xsd_name.c_str());
-
-  string ns = program_->get_namespace("xsd");
-  const std::map<std::string, std::string> annot = program_->get_namespace_annotations("xsd");
-  const std::map<std::string, std::string>::const_iterator uri = annot.find("uri");
-  if (uri != annot.end()) {
-    ns = uri->second;
-  }
-  if (ns.size() > 0) {
-    ns = " targetNamespace=\"" + ns + "\" xmlns=\"" + ns + "\" "
-         + "elementFormDefault=\"qualified\"";
-  }
-
-  // Print the XSD header
-  f_xsd_ << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" << endl
-         << "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"" << ns << ">" << endl
-         << xml_autogen_comment()
-         << endl;
-
-  // Print out the type definitions
-  indent(f_xsd_) << s_xsd_types_.str();
-
-  // Keep a list of all the possible exceptions that might get thrown
-  map<string, t_struct*> all_xceptions;
-
-  // List the elements that you might actually get
-  vector<t_function*> functions = tservice->get_functions();
-  vector<t_function*>::iterator f_iter;
-  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-    string elemname = (*f_iter)->get_name() + "_response";
-    t_type* returntype = (*f_iter)->get_returntype();
-    generate_element(f_xsd_, elemname, returntype);
-    f_xsd_ << endl;
-
-    t_struct* xs = (*f_iter)->get_xceptions();
-    const std::vector<t_field*>& xceptions = xs->get_members();
-    vector<t_field*>::const_iterator x_iter;
-    for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-      all_xceptions[(*x_iter)->get_name()] = (t_struct*)((*x_iter)->get_type());
-    }
-  }
-
-  map<string, t_struct*>::iterator ax_iter;
-  for (ax_iter = all_xceptions.begin(); ax_iter != all_xceptions.end(); ++ax_iter) {
-    generate_element(f_xsd_, ax_iter->first, ax_iter->second);
-  }
-
-  // Close the XSD document
-  f_xsd_ << endl << "</xsd:schema>" << endl;
-  f_xsd_.close();
-}
-
-string t_xsd_generator::type_name(t_type* ttype) {
-  if (ttype->is_typedef()) {
-    return ttype->get_name();
-  }
-
-  if (ttype->is_base_type()) {
-    return xsd(base_type_name(((t_base_type*)ttype)->get_base()));
-  }
-
-  if (ttype->is_enum()) {
-    return xsd("int");
-  }
-
-  if (ttype->is_struct() || ttype->is_xception()) {
-    return ttype->get_name();
-  }
-
-  return "container";
-}
-
-/**
- * Returns the XSD type that corresponds to the thrift type.
- *
- * @param tbase The base type
- * @return Explicit XSD type, i.e. xsd:string
- */
-string t_xsd_generator::base_type_name(t_base_type::t_base tbase) {
-  switch (tbase) {
-  case t_base_type::TYPE_VOID:
-    return "void";
-  case t_base_type::TYPE_STRING:
-    return "string";
-  case t_base_type::TYPE_BOOL:
-    return "boolean";
-  case t_base_type::TYPE_I8:
-    return "byte";
-  case t_base_type::TYPE_I16:
-    return "short";
-  case t_base_type::TYPE_I32:
-    return "int";
-  case t_base_type::TYPE_I64:
-    return "long";
-  case t_base_type::TYPE_DOUBLE:
-    return "decimal";
-  default:
-    throw "compiler error: no XSD base type name for base type " + t_base_type::t_base_name(tbase);
-  }
-}
-
-THRIFT_REGISTER_GENERATOR(xsd, "XSD", "")
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/globals.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/globals.h
deleted file mode 100644
index 961c6ef..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/globals.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_GLOBALS_H
-#define T_GLOBALS_H
-
-#include <set>
-#include <queue>
-#include <stack>
-#include <vector>
-#include <string>
-
-/**
- * This module contains all the global variables (slap on the wrist) that are
- * shared throughout the program. The reason for this is to facilitate simple
- * interaction between the parser and the rest of the program. Before calling
- * yyparse(), the main.cc program will make necessary adjustments to these
- * global variables such that the parser does the right thing and puts entries
- * into the right containers, etc.
- *
- */
-
-/**
- * Hooray for forward declaration of types!
- */
-
-class t_program;
-class t_scope;
-class t_type;
-
-/**
- * Parsing mode, two passes up in this gin rummy!
- */
-
-enum PARSE_MODE { INCLUDES = 1, PROGRAM = 2 };
-
-/**
- * Strictness level
- */
-extern int g_strict;
-
-/**
- * The master program parse tree. This is accessed from within the parser code
- * to build up the program elements.
- */
-extern t_program* g_program;
-
-/**
- * The scope that we are currently parsing into
- */
-extern t_scope* g_scope;
-
-/**
- * The parent scope to also load symbols into
- */
-extern t_scope* g_parent_scope;
-
-/**
- * The prefix for the parent scope entries
- */
-extern std::string g_parent_prefix;
-
-/**
- * The parsing pass that we are on. We do different things on each pass.
- */
-extern PARSE_MODE g_parse_mode;
-
-/**
- * Global time string, used in formatting error messages etc.
- */
-extern char* g_time_str;
-
-/**
- * The last parsed doctext comment.
- */
-extern char* g_doctext;
-
-/**
- * The location of the last parsed doctext comment.
- */
-extern int g_doctext_lineno;
-
-/**
- * Status of program level doctext candidate
- */
-enum PROGDOCTEXT_STATUS {
-  INVALID = 0,
-  STILL_CANDIDATE = 1,   // the text may or may not be the program doctext
-  ALREADY_PROCESSED = 2, // doctext has been used and is no longer available
-  ABSOLUTELY_SURE = 3,   // this is the program doctext
-  NO_PROGRAM_DOCTEXT = 4 // there is no program doctext
-};
-
-/**
- * The program level doctext. Stored separately to make parsing easier.
- */
-extern char* g_program_doctext_candidate;
-extern int g_program_doctext_lineno;
-extern PROGDOCTEXT_STATUS g_program_doctext_status;
-
-/**
- * Whether or not negative field keys are accepted.
- *
- * When a field does not have a user-specified key, thrift automatically
- * assigns a negative value.  However, this is fragile since changes to the
- * file may unintentionally change the key numbering, resulting in a new
- * protocol that is not backwards compatible.
- *
- * When g_allow_neg_field_keys is enabled, users can explicitly specify
- * negative keys.  This way they can write a .thrift file with explicitly
- * specified keys that is still backwards compatible with older .thrift files
- * that did not specify key values.
- */
-extern int g_allow_neg_field_keys;
-
-/**
- * Whether or not 64-bit constants will generate a warning.
- *
- * Some languages don't support 64-bit constants, but many do, so we can
- * suppress this warning for projects that don't use any non-64-bit-safe
- * languages.
- */
-extern int g_allow_64bit_consts;
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/logging.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/logging.cc
deleted file mode 100644
index f821f5f..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/logging.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Logging functions copied from main.cc to avoid link errors for plugins
- */
-
-#include "thrift/logging.h"
-#include "thrift/globals.h"
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-
-// TODO: make plugins accept log options from main compiler
-int g_debug = 0;
-int g_warn = 1;
-int g_verbose = 0;
-
-void pdebug(const char* fmt, ...) {
-  if (g_debug == 0) {
-    return;
-  }
-  va_list args;
-  // printf("[PARSE:%d] ", yylineno);
-  va_start(args, fmt);
-  vprintf(fmt, args);
-  va_end(args);
-  printf("\n");
-}
-
-void pverbose(const char* fmt, ...) {
-  if (g_verbose == 0) {
-    return;
-  }
-  va_list args;
-  va_start(args, fmt);
-  vprintf(fmt, args);
-  va_end(args);
-}
-
-void pwarning(int level, const char* fmt, ...) {
-  if (g_warn < level) {
-    return;
-  }
-  va_list args;
-  // printf("[WARNING:%s:%d] ", g_curpath.c_str(), yylineno);
-  va_start(args, fmt);
-  vprintf(fmt, args);
-  va_end(args);
-  printf("\n");
-}
-
-void failure(const char* fmt, ...) {
-  va_list args;
-  // fprintf(stderr, "[FAILURE:%s:%d] ", g_curpath.c_str(), yylineno);
-  va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
-  va_end(args);
-  printf("\n");
-  exit(1);
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/logging.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/logging.h
deleted file mode 100644
index ebefbf2..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/logging.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_LOGGING_H
-#define T_LOGGING_H
-
-extern int g_debug;
-extern int g_warn;
-extern int g_verbose;
-
-/**
- * Parse debugging output, used to print helpful info
- */
-void pdebug(const char* fmt, ...);
-
-/**
- * Parser warning
- */
-void pwarning(int level, const char* fmt, ...);
-
-/**
- * Print verbose output message
- */
-void pverbose(const char* fmt, ...);
-
-/**
- * Failure!
- */
-void failure(const char* fmt, ...);
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/main.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/main.cc
deleted file mode 100644
index 8421840..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/main.cc
+++ /dev/null
@@ -1,1307 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * thrift - a lightweight cross-language rpc/serialization tool
- *
- * This file contains the main compiler engine for Thrift, which invokes the
- * scanner/parser to build the thrift object tree. The interface generation
- * code for each language lives in a file by the language name under the
- * generate/ folder, and all parse structures live in parse/
- *
- */
-
-#include <cassert>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
-#include <string>
-#include <algorithm>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <limits.h>
-
-#ifdef _WIN32
-#include <windows.h> /* for GetFullPathName */
-#endif
-
-// Careful: must include globals first for extern definitions
-#include "thrift/common.h"
-#include "thrift/globals.h"
-
-#include "thrift/platform.h"
-#include "thrift/main.h"
-#include "thrift/parse/t_program.h"
-#include "thrift/parse/t_scope.h"
-#include "thrift/generate/t_generator.h"
-#include "thrift/audit/t_audit.h"
-#ifdef THRIFT_ENABLE_PLUGIN
-#include "thrift/plugin/plugin_output.h"
-#endif
-
-#include "thrift/version.h"
-
-using namespace std;
-
-/**
- * Global program tree
- */
-t_program* g_program;
-
-/**
- * Global scope
- */
-t_scope* g_scope;
-
-/**
- * Parent scope to also parse types
- */
-t_scope* g_parent_scope;
-
-/**
- * Prefix for putting types in parent scope
- */
-string g_parent_prefix;
-
-/**
- * Parsing pass
- */
-PARSE_MODE g_parse_mode;
-
-/**
- * Current directory of file being parsed
- */
-string g_curdir;
-
-/**
- * Current file being parsed
- */
-string g_curpath;
-
-/**
- * Search path for inclusions
- */
-vector<string> g_incl_searchpath;
-
-/**
- * Global debug state
- */
-int g_debug = 0;
-
-/**
- * Strictness level
- */
-int g_strict = 127;
-
-/**
- * Warning level
- */
-int g_warn = 1;
-
-/**
- * Verbose output
- */
-int g_verbose = 0;
-
-/**
- * Global time string
- */
-char* g_time_str;
-
-/**
- * The last parsed doctext comment.
- */
-char* g_doctext;
-
-/**
- * The First doctext comment
- */
-char* g_program_doctext_candidate;
-
-/**
- * Whether or not negative field keys are accepted.
- */
-int g_allow_neg_field_keys;
-
-/**
- * Whether or not 64-bit constants will generate a warning.
- */
-int g_allow_64bit_consts = 0;
-
-/**
- * Flags to control code generation
- */
-bool gen_recurse = false;
-
-/**
- * Flags to control thrift audit
- */
-bool g_audit = false;
-
-/**
- * Flag to control return status
- */
-bool g_return_failure = false;
-bool g_audit_fatal = true;
-bool g_generator_failure = false;
-
-/**
- * Win32 doesn't have realpath, so use fallback implementation in that case,
- * otherwise this just calls through to realpath
- */
-char* saferealpath(const char* path, char* resolved_path) {
-#ifdef _WIN32
-  char buf[MAX_PATH];
-  char* basename;
-  DWORD len = GetFullPathName(path, MAX_PATH, buf, &basename);
-  if (len == 0 || len > MAX_PATH - 1) {
-    strcpy(resolved_path, path);
-  } else {
-    strcpy(resolved_path, buf);
-  }
-
-  // Replace backslashes with forward slashes so the
-  // rest of the code behaves correctly.
-  size_t resolved_len = strlen(resolved_path);
-  for (size_t i = 0; i < resolved_len; i++) {
-    if (resolved_path[i] == '\\') {
-      resolved_path[i] = '/';
-    }
-  }
-  return resolved_path;
-#else
-  return realpath(path, resolved_path);
-#endif
-}
-
-bool check_is_directory(const char* dir_name) {
-#ifdef _WIN32
-  DWORD attributes = ::GetFileAttributesA(dir_name);
-  if (attributes == INVALID_FILE_ATTRIBUTES) {
-    fprintf(stderr,
-            "Output directory %s is unusable: GetLastError() = %ld\n",
-            dir_name,
-            GetLastError());
-    return false;
-  }
-  if ((attributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) {
-    fprintf(stderr, "Output directory %s exists but is not a directory\n", dir_name);
-    return false;
-  }
-  return true;
-#else
-  struct stat sb;
-  if (stat(dir_name, &sb) < 0) {
-    fprintf(stderr, "Output directory %s is unusable: %s\n", dir_name, strerror(errno));
-    return false;
-  }
-  if (!S_ISDIR(sb.st_mode)) {
-    fprintf(stderr, "Output directory %s exists but is not a directory\n", dir_name);
-    return false;
-  }
-  return true;
-#endif
-}
-
-/**
- * Report an error to the user. This is called yyerror for historical
- * reasons (lex and yacc expect the error reporting routine to be called
- * this). Call this function to report any errors to the user.
- * yyerror takes printf style arguments.
- *
- * @param fmt C format string followed by additional arguments
- */
-void yyerror(const char* fmt, ...) {
-  va_list args;
-  fprintf(stderr, "[ERROR:%s:%d] (last token was '%s')\n", g_curpath.c_str(), yylineno, yytext);
-
-  va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
-  va_end(args);
-
-  fprintf(stderr, "\n");
-}
-
-/**
- * Prints a debug message from the parser.
- *
- * @param fmt C format string followed by additional arguments
- */
-void pdebug(const char* fmt, ...) {
-  if (g_debug == 0) {
-    return;
-  }
-  va_list args;
-  printf("[PARSE:%d] ", yylineno);
-  va_start(args, fmt);
-  vprintf(fmt, args);
-  va_end(args);
-  printf("\n");
-}
-
-/**
- * Prints a verbose output mode message
- *
- * @param fmt C format string followed by additional arguments
- */
-void pverbose(const char* fmt, ...) {
-  if (g_verbose == 0) {
-    return;
-  }
-  va_list args;
-  va_start(args, fmt);
-  vprintf(fmt, args);
-  va_end(args);
-}
-
-/**
- * Prints a warning message
- *
- * @param fmt C format string followed by additional arguments
- */
-void pwarning(int level, const char* fmt, ...) {
-  if (g_warn < level) {
-    return;
-  }
-  va_list args;
-  printf("[WARNING:%s:%d] ", g_curpath.c_str(), yylineno);
-  va_start(args, fmt);
-  vprintf(fmt, args);
-  va_end(args);
-  printf("\n");
-}
-
-/**
- * Prints a failure message and exits
- *
- * @param fmt C format string followed by additional arguments
- */
-void failure(const char* fmt, ...) {
-  va_list args;
-  fprintf(stderr, "[FAILURE:%s:%d] ", g_curpath.c_str(), yylineno);
-  va_start(args, fmt);
-  vfprintf(stderr, fmt, args);
-  va_end(args);
-  printf("\n");
-  exit(1);
-}
-
-/**
- * Converts a string filename into a thrift program name
- */
-string program_name(string filename) {
-  string::size_type slash = filename.rfind("/");
-  if (slash != string::npos) {
-    filename = filename.substr(slash + 1);
-  }
-  string::size_type dot = filename.rfind(".");
-  if (dot != string::npos) {
-    filename = filename.substr(0, dot);
-  }
-  return filename;
-}
-
-/**
- * Gets the directory path of a filename
- */
-string directory_name(string filename) {
-  string::size_type slash = filename.rfind("/");
-  // No slash, just use the current directory
-  if (slash == string::npos) {
-    return ".";
-  }
-  return filename.substr(0, slash);
-}
-
-/**
- * Finds the appropriate file path for the given filename
- */
-string include_file(string filename) {
-  // Absolute path? Just try that
-  if (filename[0] == '/') {
-    // Realpath!
-    char rp[THRIFT_PATH_MAX];
-    // cppcheck-suppress uninitvar
-    if (saferealpath(filename.c_str(), rp) == NULL) {
-      pwarning(0, "Cannot open include file %s\n", filename.c_str());
-      return std::string();
-    }
-
-    // Stat this file
-    struct stat finfo;
-    if (stat(rp, &finfo) == 0) {
-      return rp;
-    }
-  } else { // relative path, start searching
-    // new search path with current dir global
-    vector<string> sp = g_incl_searchpath;
-    sp.insert(sp.begin(), g_curdir);
-
-    // iterate through paths
-    vector<string>::iterator it;
-    for (it = sp.begin(); it != sp.end(); it++) {
-      string sfilename = *(it) + "/" + filename;
-
-      // Realpath!
-      char rp[THRIFT_PATH_MAX];
-      // cppcheck-suppress uninitvar
-      if (saferealpath(sfilename.c_str(), rp) == NULL) {
-        continue;
-      }
-
-      // Stat this files
-      struct stat finfo;
-      if (stat(rp, &finfo) == 0) {
-        return rp;
-      }
-    }
-  }
-
-  // Uh oh
-  pwarning(0, "Could not find include file %s\n", filename.c_str());
-  return std::string();
-}
-
-/**
- * Clears any previously stored doctext string.
- * Also prints a warning if we are discarding information.
- */
-void clear_doctext() {
-  if (g_doctext != NULL) {
-    pwarning(2, "Uncaptured doctext at on line %d.", g_doctext_lineno);
-  }
-  free(g_doctext);
-  g_doctext = NULL;
-}
-
-/**
- * Reset program doctext information after processing a file
- */
-void reset_program_doctext_info() {
-  if (g_program_doctext_candidate != NULL) {
-    free(g_program_doctext_candidate);
-    g_program_doctext_candidate = NULL;
-  }
-  g_program_doctext_lineno = 0;
-  g_program_doctext_status = INVALID;
-  pdebug("%s", "program doctext set to INVALID");
-}
-
-/**
- * We are sure the program doctext candidate is really the program doctext.
- */
-void declare_valid_program_doctext() {
-  if ((g_program_doctext_candidate != NULL) && (g_program_doctext_status == STILL_CANDIDATE)) {
-    g_program_doctext_status = ABSOLUTELY_SURE;
-    pdebug("%s", "program doctext set to ABSOLUTELY_SURE");
-  } else {
-    g_program_doctext_status = NO_PROGRAM_DOCTEXT;
-    pdebug("%s", "program doctext set to NO_PROGRAM_DOCTEXT");
-  }
-}
-
-/**
- * Cleans up text commonly found in doxygen-like comments
- *
- * Warning: if you mix tabs and spaces in a non-uniform way,
- * you will get what you deserve.
- */
-char* clean_up_doctext(char* doctext) {
-  // Convert to C++ string, and remove Windows's carriage returns.
-  string docstring = doctext;
-  docstring.erase(remove(docstring.begin(), docstring.end(), '\r'), docstring.end());
-
-  // Separate into lines.
-  vector<string> lines;
-  string::size_type pos = string::npos;
-  string::size_type last;
-  while (true) {
-    last = (pos == string::npos) ? 0 : pos + 1;
-    pos = docstring.find('\n', last);
-    if (pos == string::npos) {
-      // First bit of cleaning.  If the last line is only whitespace, drop it.
-      string::size_type nonwhite = docstring.find_first_not_of(" \t", last);
-      if (nonwhite != string::npos) {
-        lines.push_back(docstring.substr(last));
-      }
-      break;
-    }
-    lines.push_back(docstring.substr(last, pos - last));
-  }
-
-  // A very profound docstring.
-  if (lines.empty()) {
-    return NULL;
-  }
-
-  // Clear leading whitespace from the first line.
-  pos = lines.front().find_first_not_of(" \t");
-  lines.front().erase(0, pos);
-
-  // If every nonblank line after the first has the same number of spaces/tabs,
-  // then a star, remove them.
-  bool have_prefix = true;
-  bool found_prefix = false;
-  string::size_type prefix_len = 0;
-  vector<string>::iterator l_iter;
-  for (l_iter = lines.begin() + 1; l_iter != lines.end(); ++l_iter) {
-    if (l_iter->empty()) {
-      continue;
-    }
-
-    pos = l_iter->find_first_not_of(" \t");
-    if (!found_prefix) {
-      if (pos != string::npos) {
-        if (l_iter->at(pos) == '*') {
-          found_prefix = true;
-          prefix_len = pos;
-        } else {
-          have_prefix = false;
-          break;
-        }
-      } else {
-        // Whitespace-only line.  Truncate it.
-        l_iter->clear();
-      }
-    } else if (l_iter->size() > pos && l_iter->at(pos) == '*' && pos == prefix_len) {
-      // Business as usual.
-    } else if (pos == string::npos) {
-      // Whitespace-only line.  Let's truncate it for them.
-      l_iter->clear();
-    } else {
-      // The pattern has been broken.
-      have_prefix = false;
-      break;
-    }
-  }
-
-  // If our prefix survived, delete it from every line.
-  if (have_prefix) {
-    // Get the star too.
-    prefix_len++;
-    for (l_iter = lines.begin() + 1; l_iter != lines.end(); ++l_iter) {
-      l_iter->erase(0, prefix_len);
-    }
-  }
-
-  // Now delete the minimum amount of leading whitespace from each line.
-  prefix_len = string::npos;
-  for (l_iter = lines.begin() + 1; l_iter != lines.end(); ++l_iter) {
-    if (l_iter->empty()) {
-      continue;
-    }
-    pos = l_iter->find_first_not_of(" \t");
-    if (pos != string::npos && (prefix_len == string::npos || pos < prefix_len)) {
-      prefix_len = pos;
-    }
-  }
-
-  // If our prefix survived, delete it from every line.
-  if (prefix_len != string::npos) {
-    for (l_iter = lines.begin() + 1; l_iter != lines.end(); ++l_iter) {
-      l_iter->erase(0, prefix_len);
-    }
-  }
-
-  // Remove trailing whitespace from every line.
-  for (l_iter = lines.begin(); l_iter != lines.end(); ++l_iter) {
-    pos = l_iter->find_last_not_of(" \t");
-    if (pos != string::npos && pos != l_iter->length() - 1) {
-      l_iter->erase(pos + 1);
-    }
-  }
-
-  // If the first line is empty, remove it.
-  // Don't do this earlier because a lot of steps skip the first line.
-  if (lines.front().empty()) {
-    lines.erase(lines.begin());
-  }
-
-  // Now rejoin the lines and copy them back into doctext.
-  docstring.clear();
-  for (l_iter = lines.begin(); l_iter != lines.end(); ++l_iter) {
-    docstring += *l_iter;
-    docstring += '\n';
-  }
-
-  // assert(docstring.length() <= strlen(doctext));  may happen, see THRIFT-1755
-  if (docstring.length() <= strlen(doctext)) {
-    strcpy(doctext, docstring.c_str());
-  } else {
-    free(doctext); // too short
-    doctext = strdup(docstring.c_str());
-  }
-  return doctext;
-}
-
-/** Set to true to debug docstring parsing */
-static bool dump_docs = false;
-
-/**
- * Dumps docstrings to stdout
- * Only works for top-level definitions and the whole program doc
- * (i.e., not enum constants, struct fields, or functions.
- */
-void dump_docstrings(t_program* program) {
-  string progdoc = program->get_doc();
-  if (!progdoc.empty()) {
-    printf("Whole program doc:\n%s\n", progdoc.c_str());
-  }
-  const vector<t_typedef*>& typedefs = program->get_typedefs();
-  vector<t_typedef*>::const_iterator t_iter;
-  for (t_iter = typedefs.begin(); t_iter != typedefs.end(); ++t_iter) {
-    t_typedef* td = *t_iter;
-    if (td->has_doc()) {
-      printf("typedef %s:\n%s\n", td->get_name().c_str(), td->get_doc().c_str());
-    }
-  }
-  const vector<t_enum*>& enums = program->get_enums();
-  vector<t_enum*>::const_iterator e_iter;
-  for (e_iter = enums.begin(); e_iter != enums.end(); ++e_iter) {
-    t_enum* en = *e_iter;
-    if (en->has_doc()) {
-      printf("enum %s:\n%s\n", en->get_name().c_str(), en->get_doc().c_str());
-    }
-  }
-  const vector<t_const*>& consts = program->get_consts();
-  vector<t_const*>::const_iterator c_iter;
-  for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter) {
-    t_const* co = *c_iter;
-    if (co->has_doc()) {
-      printf("const %s:\n%s\n", co->get_name().c_str(), co->get_doc().c_str());
-    }
-  }
-  const vector<t_struct*>& structs = program->get_structs();
-  vector<t_struct*>::const_iterator s_iter;
-  for (s_iter = structs.begin(); s_iter != structs.end(); ++s_iter) {
-    t_struct* st = *s_iter;
-    if (st->has_doc()) {
-      printf("struct %s:\n%s\n", st->get_name().c_str(), st->get_doc().c_str());
-    }
-  }
-  const vector<t_struct*>& xceptions = program->get_xceptions();
-  vector<t_struct*>::const_iterator x_iter;
-  for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
-    t_struct* xn = *x_iter;
-    if (xn->has_doc()) {
-      printf("xception %s:\n%s\n", xn->get_name().c_str(), xn->get_doc().c_str());
-    }
-  }
-  const vector<t_service*>& services = program->get_services();
-  vector<t_service*>::const_iterator v_iter;
-  for (v_iter = services.begin(); v_iter != services.end(); ++v_iter) {
-    t_service* sv = *v_iter;
-    if (sv->has_doc()) {
-      printf("service %s:\n%s\n", sv->get_name().c_str(), sv->get_doc().c_str());
-    }
-  }
-}
-
-/**
- * Emits a warning on list<byte>, binary type is typically a much better choice.
- */
-void check_for_list_of_bytes(t_type* list_elem_type) {
-  if ((g_parse_mode == PROGRAM) && (list_elem_type != NULL) && list_elem_type->is_base_type()) {
-    t_base_type* tbase = (t_base_type*)list_elem_type;
-    if (tbase->get_base() == t_base_type::TYPE_I8) {
-      pwarning(1, "Consider using the more efficient \"binary\" type instead of \"list<byte>\".");
-    }
-  }
-}
-
-static bool g_byte_warning_emitted = false;
-
-/**
- * Emits a one-time warning on byte type, promoting the new i8 type instead
- */
-void emit_byte_type_warning() {
-  if (!g_byte_warning_emitted) {
-    pwarning(1,
-             "The \"byte\" type is a compatibility alias for \"i8\". Use \"i8\" to emphasize the "
-             "signedness of this type.\n");
-    g_byte_warning_emitted = true;
-  }
-}
-
-/**
- * Prints deprecation notice for old NS declarations that are no longer supported
- * If new_form is NULL, old_form is assumed to be a language identifier, such as "cpp"
- * If new_form is not NULL, both arguments are used exactly as given
- */
-void error_unsupported_namespace_decl(const char* old_form, const char* new_form) {
-  const char* remainder = "";
-  if( new_form == NULL) {
-    new_form = old_form;
-    remainder = "_namespace";
-  }
-  failure("Unsupported declaration '%s%s'. Use 'namespace %s' instead.", old_form, remainder, new_form);
-}
-
-/**
- * Prints the version number
- */
-void version() {
-  printf("Thrift version %s\n", THRIFT_VERSION);
-}
-
-/**
- * Display the usage message and then exit with an error code.
- */
-void usage() {
-  fprintf(stderr, "Usage: thrift [options] file\n\n");
-  fprintf(stderr, "Use thrift -help for a list of options\n");
-  exit(1);
-}
-
-/**
- * Diplays the help message and then exits with an error code.
- */
-void help() {
-  fprintf(stderr, "Usage: thrift [options] file\n");
-  fprintf(stderr, "Options:\n");
-  fprintf(stderr, "  -version    Print the compiler version\n");
-  fprintf(stderr, "  -o dir      Set the output directory for gen-* packages\n");
-  fprintf(stderr, "               (default: current directory)\n");
-  fprintf(stderr, "  -out dir    Set the ouput location for generated files.\n");
-  fprintf(stderr, "               (no gen-* folder will be created)\n");
-  fprintf(stderr, "  -I dir      Add a directory to the list of directories\n");
-  fprintf(stderr, "                searched for include directives\n");
-  fprintf(stderr, "  -nowarn     Suppress all compiler warnings (BAD!)\n");
-  fprintf(stderr, "  -strict     Strict compiler warnings on\n");
-  fprintf(stderr, "  -v[erbose]  Verbose mode\n");
-  fprintf(stderr, "  -r[ecurse]  Also generate included files\n");
-  fprintf(stderr, "  -debug      Parse debug trace to stdout\n");
-  fprintf(stderr,
-          "  --allow-neg-keys  Allow negative field keys (Used to "
-          "preserve protocol\n");
-  fprintf(stderr, "                compatibility with older .thrift files)\n");
-  fprintf(stderr, "  --allow-64bit-consts  Do not print warnings about using 64-bit constants\n");
-  fprintf(stderr, "  --gen STR   Generate code with a dynamically-registered generator.\n");
-  fprintf(stderr, "                STR has the form language[:key1=val1[,key2[,key3=val3]]].\n");
-  fprintf(stderr, "                Keys and values are options passed to the generator.\n");
-  fprintf(stderr, "                Many options will not require values.\n");
-  fprintf(stderr, "\n");
-  fprintf(stderr, "Options related to audit operation\n");
-  fprintf(stderr, "   --audit OldFile   Old Thrift file to be audited with 'file'\n");
-  fprintf(stderr, "  -Iold dir    Add a directory to the list of directories\n");
-  fprintf(stderr, "                searched for include directives for old thrift file\n");
-  fprintf(stderr, "  -Inew dir    Add a directory to the list of directories\n");
-  fprintf(stderr, "                searched for include directives for new thrift file\n");
-  fprintf(stderr, "\n");
-  fprintf(stderr, "Available generators (and options):\n");
-
-  t_generator_registry::gen_map_t gen_map = t_generator_registry::get_generator_map();
-  t_generator_registry::gen_map_t::iterator iter;
-  for (iter = gen_map.begin(); iter != gen_map.end(); ++iter) {
-    fprintf(stderr,
-            "  %s (%s):\n",
-            iter->second->get_short_name().c_str(),
-            iter->second->get_long_name().c_str());
-    fprintf(stderr, "%s", iter->second->get_documentation().c_str());
-  }
-  exit(1);
-}
-
-/**
- * You know, when I started working on Thrift I really thought it wasn't going
- * to become a programming language because it was just a generator and it
- * wouldn't need runtime type information and all that jazz. But then we
- * decided to add constants, and all of a sudden that means runtime type
- * validation and inference, except the "runtime" is the code generator
- * runtime.
- */
-void validate_const_rec(std::string name, t_type* type, t_const_value* value) {
-  if (type->is_void()) {
-    throw "type error: cannot declare a void const: " + name;
-  }
-
-  if (type->is_base_type()) {
-    t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
-    switch (tbase) {
-    case t_base_type::TYPE_STRING:
-      if (value->get_type() != t_const_value::CV_STRING) {
-        throw "type error: const \"" + name + "\" was declared as string";
-      }
-      break;
-    case t_base_type::TYPE_BOOL:
-      if (value->get_type() != t_const_value::CV_INTEGER) {
-        throw "type error: const \"" + name + "\" was declared as bool";
-      }
-      break;
-    case t_base_type::TYPE_I8:
-      if (value->get_type() != t_const_value::CV_INTEGER) {
-        throw "type error: const \"" + name + "\" was declared as byte";
-      }
-      break;
-    case t_base_type::TYPE_I16:
-      if (value->get_type() != t_const_value::CV_INTEGER) {
-        throw "type error: const \"" + name + "\" was declared as i16";
-      }
-      break;
-    case t_base_type::TYPE_I32:
-      if (value->get_type() != t_const_value::CV_INTEGER) {
-        throw "type error: const \"" + name + "\" was declared as i32";
-      }
-      break;
-    case t_base_type::TYPE_I64:
-      if (value->get_type() != t_const_value::CV_INTEGER) {
-        throw "type error: const \"" + name + "\" was declared as i64";
-      }
-      break;
-    case t_base_type::TYPE_DOUBLE:
-      if (value->get_type() != t_const_value::CV_INTEGER
-          && value->get_type() != t_const_value::CV_DOUBLE) {
-        throw "type error: const \"" + name + "\" was declared as double";
-      }
-      break;
-    default:
-      throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase) + name;
-    }
-  } else if (type->is_enum()) {
-    if (value->get_type() != t_const_value::CV_IDENTIFIER) {
-      throw "type error: const \"" + name + "\" was declared as enum";
-    }
-
-    // see if there's a dot in the identifier
-    std::string name_portion = value->get_identifier_name();
-
-    const vector<t_enum_value*>& enum_values = ((t_enum*)type)->get_constants();
-    vector<t_enum_value*>::const_iterator c_iter;
-    bool found = false;
-
-    for (c_iter = enum_values.begin(); c_iter != enum_values.end(); ++c_iter) {
-      if ((*c_iter)->get_name() == name_portion) {
-        found = true;
-        break;
-      }
-    }
-    if (!found) {
-      throw "type error: const " + name + " was declared as type " + type->get_name()
-          + " which is an enum, but " + value->get_identifier()
-          + " is not a valid value for that enum";
-    }
-  } else if (type->is_struct() || type->is_xception()) {
-    if (value->get_type() != t_const_value::CV_MAP) {
-      throw "type error: const \"" + name + "\" was declared as struct/xception";
-    }
-    const vector<t_field*>& fields = ((t_struct*)type)->get_members();
-    vector<t_field*>::const_iterator f_iter;
-
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      if (v_iter->first->get_type() != t_const_value::CV_STRING) {
-        throw "type error: " + name + " struct key must be string";
-      }
-      t_type* field_type = NULL;
-      for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
-        if ((*f_iter)->get_name() == v_iter->first->get_string()) {
-          field_type = (*f_iter)->get_type();
-        }
-      }
-      if (field_type == NULL) {
-        throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
-      }
-
-      validate_const_rec(name + "." + v_iter->first->get_string(), field_type, v_iter->second);
-    }
-  } else if (type->is_map()) {
-    t_type* k_type = ((t_map*)type)->get_key_type();
-    t_type* v_type = ((t_map*)type)->get_val_type();
-    const map<t_const_value*, t_const_value*>& val = value->get_map();
-    map<t_const_value*, t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      validate_const_rec(name + "<key>", k_type, v_iter->first);
-      validate_const_rec(name + "<val>", v_type, v_iter->second);
-    }
-  } else if (type->is_list() || type->is_set()) {
-    t_type* e_type;
-    if (type->is_list()) {
-      e_type = ((t_list*)type)->get_elem_type();
-    } else {
-      e_type = ((t_set*)type)->get_elem_type();
-    }
-    const vector<t_const_value*>& val = value->get_list();
-    vector<t_const_value*>::const_iterator v_iter;
-    for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-      validate_const_rec(name + "<elem>", e_type, *v_iter);
-    }
-  }
-}
-
-/**
- * Check simple identifier names
- * It's easier to do it this way instead of rewriting the whole grammar etc.
- */
-void validate_simple_identifier(const char* identifier) {
-  string name(identifier);
-  if (name.find(".") != string::npos) {
-    yyerror("Identifier %s can't have a dot.", identifier);
-    exit(1);
-  }
-}
-
-/**
- * Check the type of the parsed const information against its declared type
- */
-void validate_const_type(t_const* c) {
-  validate_const_rec(c->get_name(), c->get_type(), c->get_value());
-}
-
-/**
- * Check the type of a default value assigned to a field.
- */
-void validate_field_value(t_field* field, t_const_value* cv) {
-  validate_const_rec(field->get_name(), field->get_type(), cv);
-}
-
-/**
- * Check that all the elements of a throws block are actually exceptions.
- */
-bool validate_throws(t_struct* throws) {
-  const vector<t_field*>& members = throws->get_members();
-  vector<t_field*>::const_iterator m_iter;
-  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
-    if (!t_generator::get_true_type((*m_iter)->get_type())->is_xception()) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * Skips UTF-8 BOM if there is one
- */
-bool skip_utf8_bom(FILE* f) {
-
-  // pretty straightforward, but works
-  if (fgetc(f) == 0xEF) {
-    if (fgetc(f) == 0xBB) {
-      if (fgetc(f) == 0xBF) {
-        return true;
-      }
-    }
-  }
-
-  rewind(f);
-  return false;
-}
-
-/**
- * Parses a program
- */
-void parse(t_program* program, t_program* parent_program) {
-  // Get scope file path
-  string path = program->get_path();
-
-  // Set current dir global, which is used in the include_file function
-  g_curdir = directory_name(path);
-  g_curpath = path;
-
-  // Open the file
-  // skip UTF-8 BOM if there is one
-  yyin = fopen(path.c_str(), "r");
-  if (yyin == 0) {
-    failure("Could not open input file: \"%s\"", path.c_str());
-  }
-  if (skip_utf8_bom(yyin))
-    pverbose("Skipped UTF-8 BOM at %s\n", path.c_str());
-
-  // Create new scope and scan for includes
-  pverbose("Scanning %s for includes\n", path.c_str());
-  g_parse_mode = INCLUDES;
-  g_program = program;
-  g_scope = program->scope();
-  try {
-    yylineno = 1;
-    if (yyparse() != 0) {
-      failure("Parser error during include pass.");
-    }
-  } catch (string x) {
-    failure(x.c_str());
-  }
-  fclose(yyin);
-
-  // Recursively parse all the include programs
-  vector<t_program*>& includes = program->get_includes();
-  vector<t_program*>::iterator iter;
-  for (iter = includes.begin(); iter != includes.end(); ++iter) {
-    parse(*iter, program);
-  }
-
-  // reset program doctext status before parsing a new file
-  reset_program_doctext_info();
-
-  // Parse the program file
-  g_parse_mode = PROGRAM;
-  g_program = program;
-  g_scope = program->scope();
-  g_parent_scope = (parent_program != NULL) ? parent_program->scope() : NULL;
-  g_parent_prefix = program->get_name() + ".";
-  g_curpath = path;
-
-  // Open the file
-  // skip UTF-8 BOM if there is one
-  yyin = fopen(path.c_str(), "r");
-  if (yyin == 0) {
-    failure("Could not open input file: \"%s\"", path.c_str());
-  }
-  if (skip_utf8_bom(yyin))
-    pverbose("Skipped UTF-8 BOM at %s\n", path.c_str());
-
-  pverbose("Parsing %s for types\n", path.c_str());
-  yylineno = 1;
-  try {
-    if (yyparse() != 0) {
-      failure("Parser error during types pass.");
-    }
-  } catch (string x) {
-    failure(x.c_str());
-  }
-  fclose(yyin);
-}
-
-/**
- * Generate code
- */
-void generate(t_program* program, const vector<string>& generator_strings) {
-  // Oooohh, recursive code generation, hot!!
-  if (gen_recurse) {
-    const vector<t_program*>& includes = program->get_includes();
-    for (size_t i = 0; i < includes.size(); ++i) {
-      // Propagate output path from parent to child programs
-      includes[i]->set_out_path(program->get_out_path(), program->is_out_path_absolute());
-
-      generate(includes[i], generator_strings);
-    }
-  }
-
-  // Generate code!
-  try {
-    pverbose("Program: %s\n", program->get_path().c_str());
-
-    if (dump_docs) {
-      dump_docstrings(program);
-    }
-
-    vector<string>::const_iterator iter;
-    for (iter = generator_strings.begin(); iter != generator_strings.end(); ++iter) {
-      t_generator* generator = t_generator_registry::get_generator(program, *iter);
-
-      if (generator == NULL) {
-#ifdef THRIFT_ENABLE_PLUGIN
-        switch (plugin_output::delegateToPlugin(program, *iter)) {
-          case plugin_output::PLUGIN_NOT_FOUND:
-            pwarning(1, "Unable to get a generator for \"%s\".\n", iter->c_str());
-            g_generator_failure = true;
-            break;
-          case plugin_output::PLUGIN_FAILURE:
-            pwarning(1, "Plugin generator for \"%s\" failed.\n", iter->c_str());
-            g_generator_failure = true;
-            break;
-          case plugin_output::PLUGIN_SUCCEESS:
-            break;
-          default:
-            assert(false);
-            break;
-        }
-#else
-        pwarning(1, "Unable to get a generator for \"%s\".\n", iter->c_str());
-        g_generator_failure = true;
-#endif
-      } else if (generator) {
-        pverbose("Generating \"%s\"\n", iter->c_str());
-        generator->generate_program();
-        delete generator;
-      }
-    }
-  } catch (string s) {
-    failure("Error: %s\n", s.c_str());
-  } catch (const char* exc) {
-    failure("Error: %s\n", exc);
-  }
-}
-
-void audit(t_program* new_program,
-           t_program* old_program,
-           string new_thrift_include_path,
-           string old_thrift_include_path) {
-  vector<string> temp_incl_searchpath = g_incl_searchpath;
-  if (!old_thrift_include_path.empty()) {
-    g_incl_searchpath.push_back(old_thrift_include_path);
-  }
-
-  parse(old_program, NULL);
-
-  g_incl_searchpath = temp_incl_searchpath;
-  if (!new_thrift_include_path.empty()) {
-    g_incl_searchpath.push_back(new_thrift_include_path);
-  }
-
-  parse(new_program, NULL);
-
-  compare_namespace(new_program, old_program);
-  compare_services(new_program->get_services(), old_program->get_services());
-  compare_enums(new_program->get_enums(), old_program->get_enums());
-  compare_structs(new_program->get_structs(), old_program->get_structs());
-  compare_structs(new_program->get_xceptions(), old_program->get_xceptions());
-  compare_consts(new_program->get_consts(), old_program->get_consts());
-}
-
-/**
- * Parse it up.. then spit it back out, in pretty much every language. Alright
- * not that many languages, but the cool ones that we care about.
- */
-int main(int argc, char** argv) {
-  int i;
-  std::string out_path;
-  bool out_path_is_absolute = false;
-
-  // Setup time string
-  time_t now = time(NULL);
-  g_time_str = ctime(&now);
-
-  // Check for necessary arguments, you gotta have at least a filename and
-  // an output language flag
-  if (argc < 2) {
-    usage();
-  }
-
-  vector<string> generator_strings;
-  string old_thrift_include_path;
-  string new_thrift_include_path;
-  string old_input_file;
-
-  // Set the current path to a dummy value to make warning messages clearer.
-  g_curpath = "arguments";
-
-  // Hacky parameter handling... I didn't feel like using a library sorry!
-  for (i = 1; i < argc - 1; i++) {
-    char* arg;
-
-    arg = strtok(argv[i], " ");
-    while (arg != NULL) {
-      // Treat double dashes as single dashes
-      if (arg[0] == '-' && arg[1] == '-') {
-        ++arg;
-      }
-
-      if (strcmp(arg, "-help") == 0) {
-        help();
-      } else if (strcmp(arg, "-version") == 0) {
-        version();
-        exit(0);
-      } else if (strcmp(arg, "-debug") == 0) {
-        g_debug = 1;
-      } else if (strcmp(arg, "-nowarn") == 0) {
-        g_warn = 0;
-      } else if (strcmp(arg, "-strict") == 0) {
-        g_strict = 255;
-        g_warn = 2;
-      } else if (strcmp(arg, "-v") == 0 || strcmp(arg, "-verbose") == 0) {
-        g_verbose = 1;
-      } else if (strcmp(arg, "-r") == 0 || strcmp(arg, "-recurse") == 0) {
-        gen_recurse = true;
-      } else if (strcmp(arg, "-allow-neg-keys") == 0) {
-        g_allow_neg_field_keys = true;
-      } else if (strcmp(arg, "-allow-64bit-consts") == 0) {
-        g_allow_64bit_consts = true;
-      } else if (strcmp(arg, "-gen") == 0) {
-        arg = argv[++i];
-        if (arg == NULL) {
-          fprintf(stderr, "Missing generator specification\n");
-          usage();
-        }
-        generator_strings.push_back(arg);
-      } else if (strcmp(arg, "-I") == 0) {
-        // An argument of "-I\ asdf" is invalid and has unknown results
-        arg = argv[++i];
-
-        if (arg == NULL) {
-          fprintf(stderr, "Missing Include directory\n");
-          usage();
-        }
-        g_incl_searchpath.push_back(arg);
-      } else if ((strcmp(arg, "-o") == 0) || (strcmp(arg, "-out") == 0)) {
-        out_path_is_absolute = (strcmp(arg, "-out") == 0) ? true : false;
-        arg = argv[++i];
-        if (arg == NULL) {
-          fprintf(stderr, "-o: missing output directory\n");
-          usage();
-        }
-        out_path = arg;
-
-#ifdef _WIN32
-        // strip out trailing \ on Windows
-        std::string::size_type last = out_path.length() - 1;
-        if (out_path[last] == '\\') {
-          out_path.erase(last);
-        }
-#endif
-        if (!check_is_directory(out_path.c_str()))
-          return -1;
-      } else if (strcmp(arg, "-audit") == 0) {
-        g_audit = true;
-        arg = argv[++i];
-        if (arg == NULL) {
-          fprintf(stderr, "Missing old thrift file name for audit operation\n");
-          usage();
-        }
-        char old_thrift_file_rp[THRIFT_PATH_MAX];
-
-        // cppcheck-suppress uninitvar
-        if (saferealpath(arg, old_thrift_file_rp) == NULL) {
-          failure("Could not open input file with realpath: %s", arg);
-        }
-        old_input_file = string(old_thrift_file_rp);
-      } else if (strcmp(arg, "-audit-nofatal") == 0) {
-        g_audit_fatal = false;
-      } else if (strcmp(arg, "-Iold") == 0) {
-        arg = argv[++i];
-        if (arg == NULL) {
-          fprintf(stderr, "Missing Include directory for old thrift file\n");
-          usage();
-        }
-        old_thrift_include_path = string(arg);
-      } else if (strcmp(arg, "-Inew") == 0) {
-        arg = argv[++i];
-        if (arg == NULL) {
-          fprintf(stderr, "Missing Include directory for new thrift file\n");
-          usage();
-        }
-        new_thrift_include_path = string(arg);
-      } else {
-        fprintf(stderr, "Unrecognized option: %s\n", arg);
-        usage();
-      }
-
-      // Tokenize more
-      arg = strtok(NULL, " ");
-    }
-  }
-
-  // display help
-  if ((strcmp(argv[argc - 1], "-help") == 0) || (strcmp(argv[argc - 1], "--help") == 0)) {
-    help();
-  }
-
-  // if you're asking for version, you have a right not to pass a file
-  if ((strcmp(argv[argc - 1], "-version") == 0) || (strcmp(argv[argc - 1], "--version") == 0)) {
-    version();
-    exit(0);
-  }
-
-  // Initialize global types
-  initGlobals();
-
-  if (g_audit) {
-    // Audit operation
-
-    if (old_input_file.empty()) {
-      fprintf(stderr, "Missing file name of old thrift file for audit\n");
-      usage();
-    }
-
-    char new_thrift_file_rp[THRIFT_PATH_MAX];
-    if (argv[i] == NULL) {
-      fprintf(stderr, "Missing file name of new thrift file for audit\n");
-      usage();
-    }
-    // cppcheck-suppress uninitvar
-    if (saferealpath(argv[i], new_thrift_file_rp) == NULL) {
-      failure("Could not open input file with realpath: %s", argv[i]);
-    }
-    string new_input_file(new_thrift_file_rp);
-
-    t_program new_program(new_input_file);
-    t_program old_program(old_input_file);
-
-    audit(&new_program, &old_program, new_thrift_include_path, old_thrift_include_path);
-
-  } else {
-    // Generate options
-
-    // You gotta generate something!
-    if (generator_strings.empty()) {
-      fprintf(stderr, "No output language(s) specified\n");
-      usage();
-    }
-
-    // Real-pathify it
-    char rp[THRIFT_PATH_MAX];
-    if (argv[i] == NULL) {
-      fprintf(stderr, "Missing file name\n");
-      usage();
-    }
-    // cppcheck-suppress uninitvar
-    if (saferealpath(argv[i], rp) == NULL) {
-      failure("Could not open input file with realpath: %s", argv[i]);
-    }
-    string input_file(rp);
-
-    // Instance of the global parse tree
-    t_program* program = new t_program(input_file);
-    if (out_path.size()) {
-      program->set_out_path(out_path, out_path_is_absolute);
-    }
-
-    // Compute the cpp include prefix.
-    // infer this from the filename passed in
-    string input_filename = argv[i];
-    string include_prefix;
-
-    string::size_type last_slash = string::npos;
-    if ((last_slash = input_filename.rfind("/")) != string::npos) {
-      include_prefix = input_filename.substr(0, last_slash);
-    }
-
-    program->set_include_prefix(include_prefix);
-
-    // Parse it!
-    parse(program, NULL);
-
-    // The current path is not really relevant when we are doing generation.
-    // Reset the variable to make warning messages clearer.
-    g_curpath = "generation";
-    // Reset yylineno for the heck of it.  Use 1 instead of 0 because
-    // That is what shows up during argument parsing.
-    yylineno = 1;
-
-    // Generate it!
-    generate(program, generator_strings);
-    delete program;
-  }
-
-  // Clean up. Who am I kidding... this program probably orphans heap memory
-  // all over the place, but who cares because it is about to exit and it is
-  // all referenced and used by this wacky parse tree up until now anyways.
-  clearGlobals();
-
-  // Finished
-  if (g_return_failure && g_audit_fatal) {
-    exit(2);
-  }
-  if (g_generator_failure) {
-    exit(3);
-  }
-  // Finished
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/main.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/main.h
deleted file mode 100644
index 54abb03..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/main.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_MAIN_H
-#define T_MAIN_H
-
-#include <string>
-#include <cstdio>
-
-#include "thrift/logging.h"
-
-#include "thrift/parse/t_const.h"
-#include "thrift/parse/t_field.h"
-
-/**
- * Defined in the flex library
- */
-
-extern "C" { int yylex(void); }
-
-int yyparse(void);
-
-/**
- * Expected to be defined by Flex/Bison
- */
-void yyerror(const char* fmt, ...);
-
-/**
- * Check simple identifier names
- */
-void validate_simple_identifier(const char* identifier);
-
-/**
- * Check constant types
- */
-void validate_const_type(t_const* c);
-
-/**
- * Check constant types
- */
-void validate_field_value(t_field* field, t_const_value* cv);
-
-/**
- * Check members of a throws block
- */
-bool validate_throws(t_struct* throws);
-
-/**
- * Converts a string filename into a thrift program name
- */
-std::string program_name(std::string filename);
-
-/**
- * Gets the directory path of a filename
- */
-std::string directory_name(std::string filename);
-
-/**
- * Get the absolute path for an include file
- */
-std::string include_file(std::string filename);
-
-/**
- * Clears any previously stored doctext string.
- */
-void clear_doctext();
-
-/**
- * Cleans up text commonly found in doxygen-like comments
- */
-char* clean_up_doctext(char* doctext);
-
-/**
- * We are sure the program doctext candidate is really the program doctext.
- */
-void declare_valid_program_doctext();
-
-/**
- * Emits a warning on list<byte>, binary type is typically a much better choice.
- */
-void check_for_list_of_bytes(t_type* list_elem_type);
-
-/**
- * Emits a one-time warning on byte type, promoting the new i8 type instead
- */
-void emit_byte_type_warning();
-
-/**
- * Prints deprecation notice for old NS declarations that are no longer supported
- * If new_form is NULL, old_form is assumed to be a language identifier, such as "cpp"
- * If new_form is not NULL, both arguments are used exactly as given
- */
-void error_unsupported_namespace_decl(const char* old_form, const char* new_form = NULL);
-
-/**
- * Flex utilities
- */
-
-extern int yylineno;
-extern char yytext[];
-extern std::FILE* yyin;
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/parse.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/parse.cc
deleted file mode 100644
index 01f7637..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/parse.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "thrift/parse/t_type.h"
-#include "thrift/parse/t_typedef.h"
-
-#include "thrift/main.h"
-
-t_type* t_type::get_true_type() {
-  t_type* type = this;
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-  return type;
-}
-
-const t_type* t_type::get_true_type() const {
-  const t_type* type = this;
-  while (type->is_typedef()) {
-    type = ((t_typedef*)type)->get_type();
-  }
-  return type;
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_base_type.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_base_type.h
deleted file mode 100644
index 32523cb..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_base_type.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_BASE_TYPE_H
-#define T_BASE_TYPE_H
-
-#include <cstdlib>
-#include "thrift/parse/t_type.h"
-
-/**
- * A thrift base type, which must be one of the defined enumerated types inside
- * this definition.
- *
- */
-class t_base_type : public t_type {
-public:
-  /**
-   * Enumeration of thrift base types
-   */
-  enum t_base {
-    TYPE_VOID,
-    TYPE_STRING,
-    TYPE_BOOL,
-    TYPE_I8,
-    TYPE_I16,
-    TYPE_I32,
-    TYPE_I64,
-    TYPE_DOUBLE
-  };
-
-  t_base_type(std::string name, t_base base)
-    : t_type(name), base_(base), string_list_(false), binary_(false), string_enum_(false) {}
-
-  t_base get_base() const { return base_; }
-
-  bool is_void() const { return base_ == TYPE_VOID; }
-
-  bool is_string() const { return base_ == TYPE_STRING; }
-
-  bool is_bool() const { return base_ == TYPE_BOOL; }
-
-  void set_string_list(bool val) { string_list_ = val; }
-
-  bool is_string_list() const { return (base_ == TYPE_STRING) && string_list_; }
-
-  void set_binary(bool val) { binary_ = val; }
-
-  bool is_binary() const { return (base_ == TYPE_STRING) && binary_; }
-
-  void set_string_enum(bool val) { string_enum_ = val; }
-
-  bool is_string_enum() const { return base_ == TYPE_STRING && string_enum_; }
-
-  void add_string_enum_val(std::string val) { string_enum_vals_.push_back(val); }
-
-  const std::vector<std::string>& get_string_enum_vals() const { return string_enum_vals_; }
-
-  bool is_base_type() const { return true; }
-
-  static std::string t_base_name(t_base tbase) {
-    switch (tbase) {
-    case TYPE_VOID:
-      return "void";
-      break;
-    case TYPE_STRING:
-      return "string";
-      break;
-    case TYPE_BOOL:
-      return "bool";
-      break;
-    case TYPE_I8:
-      return "i8";
-      break;
-    case TYPE_I16:
-      return "i16";
-      break;
-    case TYPE_I32:
-      return "i32";
-      break;
-    case TYPE_I64:
-      return "i64";
-      break;
-    case TYPE_DOUBLE:
-      return "double";
-      break;
-    default:
-      return "(unknown)";
-      break;
-    }
-  }
-
-private:
-  t_base base_;
-
-  bool string_list_;
-  bool binary_;
-  bool string_enum_;
-  std::vector<std::string> string_enum_vals_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_const.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_const.h
deleted file mode 100644
index 3c08e0d..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_const.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_CONST_H
-#define T_CONST_H
-
-#include "thrift/parse/t_type.h"
-#include "thrift/parse/t_const_value.h"
-
-/**
- * A const is a constant value defined across languages that has a type and
- * a value. The trick here is that the declared type might not match the type
- * of the value object, since that is not determined until after parsing the
- * whole thing out.
- *
- */
-class t_const : public t_doc {
-public:
-  t_const(t_type* type, std::string name, t_const_value* value)
-    : type_(type), name_(name), value_(value) {}
-
-  t_type* get_type() const { return type_; }
-
-  std::string get_name() const { return name_; }
-
-  t_const_value* get_value() const { return value_; }
-
-private:
-  t_type* type_;
-  std::string name_;
-  t_const_value* value_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_const_value.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_const_value.h
deleted file mode 100644
index 5507803..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_const_value.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_CONST_VALUE_H
-#define T_CONST_VALUE_H
-
-#include "thrift/parse/t_enum.h"
-#include <stdint.h>
-#include <map>
-#include <vector>
-#include <string>
-
-namespace plugin_output {
-template <typename From, typename To>
-void convert(From*, To&);
-}
-
-/**
- * A const value is something parsed that could be a map, set, list, struct
- * or whatever.
- *
- */
-class t_const_value {
-public:
-  enum t_const_value_type { CV_INTEGER, CV_DOUBLE, CV_STRING, CV_MAP, CV_LIST, CV_IDENTIFIER };
-
-  t_const_value() {}
-
-  t_const_value(int64_t val) { set_integer(val); }
-
-  t_const_value(std::string val) { set_string(val); }
-
-  void set_string(std::string val) {
-    valType_ = CV_STRING;
-    stringVal_ = val;
-  }
-
-  std::string get_string() const { return stringVal_; }
-
-  void set_integer(int64_t val) {
-    valType_ = CV_INTEGER;
-    intVal_ = val;
-  }
-
-  int64_t get_integer() const {
-    if (valType_ == CV_IDENTIFIER) {
-      if (enum_ == NULL) {
-        throw "have identifier \"" + get_identifier() + "\", but unset enum on line!";
-      }
-      std::string identifier = get_identifier();
-      std::string::size_type dot = identifier.rfind('.');
-      if (dot != std::string::npos) {
-        identifier = identifier.substr(dot + 1);
-      }
-      t_enum_value* val = enum_->get_constant_by_name(identifier);
-      if (val == NULL) {
-        throw "Unable to find enum value \"" + identifier + "\" in enum \"" + enum_->get_name()
-            + "\"";
-      }
-      return val->get_value();
-    } else {
-      return intVal_;
-    }
-  }
-
-  void set_double(double val) {
-    valType_ = CV_DOUBLE;
-    doubleVal_ = val;
-  }
-
-  double get_double() const { return doubleVal_; }
-
-  void set_map() { valType_ = CV_MAP; }
-
-  void add_map(t_const_value* key, t_const_value* val) { mapVal_[key] = val; }
-
-  const std::map<t_const_value*, t_const_value*>& get_map() const { return mapVal_; }
-
-  void set_list() { valType_ = CV_LIST; }
-
-  void add_list(t_const_value* val) { listVal_.push_back(val); }
-
-  const std::vector<t_const_value*>& get_list() const { return listVal_; }
-
-  void set_identifier(std::string val) {
-    valType_ = CV_IDENTIFIER;
-    identifierVal_ = val;
-  }
-
-  std::string get_identifier() const { return identifierVal_; }
-
-  std::string get_identifier_name() const {
-    std::string ret = get_identifier();
-    size_t s = ret.find('.');
-    if (s == std::string::npos) {
-      throw "error: identifier " + ret + " is unqualified!";
-    }
-    ret = ret.substr(s + 1);
-    s = ret.find('.');
-    if (s != std::string::npos) {
-      ret = ret.substr(s + 1);
-    }
-    return ret;
-  }
-
-  std::string get_identifier_with_parent() const {
-    std::string ret = get_identifier();
-    size_t s = ret.find('.');
-    if (s == std::string::npos) {
-      throw "error: identifier " + ret + " is unqualified!";
-    }
-    size_t s2 = ret.find('.', s + 1);
-    if (s2 != std::string::npos) {
-      ret = ret.substr(s + 1);
-    }
-    return ret;
-  }
-
-  void set_enum(t_enum* tenum) { enum_ = tenum; }
-
-  t_const_value_type get_type() const { return valType_; }
-
-private:
-  std::map<t_const_value*, t_const_value*> mapVal_;
-  std::vector<t_const_value*> listVal_;
-  std::string stringVal_;
-  int64_t intVal_;
-  double doubleVal_;
-  std::string identifierVal_;
-  t_enum* enum_;
-
-  t_const_value_type valType_;
-
-  // to read enum_
-  template <typename From, typename To>
-  friend void plugin_output::convert(From*, To&);
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_container.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_container.h
deleted file mode 100644
index 5bdab70..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_container.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_CONTAINER_H
-#define T_CONTAINER_H
-
-#include "thrift/parse/t_type.h"
-
-class t_container : public t_type {
-public:
-  t_container() : cpp_name_(), has_cpp_name_(false) {}
-
-  virtual ~t_container() {}
-
-  void set_cpp_name(std::string cpp_name) {
-    cpp_name_ = cpp_name;
-    has_cpp_name_ = true;
-  }
-
-  bool has_cpp_name() const { return has_cpp_name_; }
-
-  std::string get_cpp_name() const { return cpp_name_; }
-
-  bool is_container() const { return true; }
-
-private:
-  std::string cpp_name_;
-  bool has_cpp_name_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_doc.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_doc.h
deleted file mode 100644
index 7bcb8f5..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_doc.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_DOC_H
-#define T_DOC_H
-
-#include "thrift/globals.h"
-#include "thrift/logging.h"
-
-/**
- * Documentation stubs
- *
- */
-class t_doc {
-
-public:
-  t_doc() : has_doc_(false) {}
-  virtual ~t_doc() {}
-
-  void set_doc(const std::string& doc) {
-    doc_ = doc;
-    has_doc_ = true;
-    if ((g_program_doctext_lineno == g_doctext_lineno)
-        && (g_program_doctext_status == STILL_CANDIDATE)) {
-      g_program_doctext_status = ALREADY_PROCESSED;
-      pdebug("%s", "program doctext set to ALREADY_PROCESSED");
-    }
-  }
-
-  const std::string& get_doc() const { return doc_; }
-
-  bool has_doc() { return has_doc_; }
-
-private:
-  std::string doc_;
-  bool has_doc_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_enum.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_enum.h
deleted file mode 100644
index 9e23780..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_enum.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_ENUM_H
-#define T_ENUM_H
-
-#include <vector>
-
-#include "thrift/parse/t_enum_value.h"
-#include "thrift/parse/t_type.h"
-
-/**
- * An enumerated type. A list of constant objects with a name for the type.
- *
- */
-class t_enum : public t_type {
-public:
-  t_enum(t_program* program) : t_type(program) {}
-
-  void set_name(const std::string& name) { name_ = name; }
-
-  void append(t_enum_value* constant) { constants_.push_back(constant); }
-
-  const std::vector<t_enum_value*>& get_constants() const { return constants_; }
-
-  t_enum_value* get_constant_by_name(const std::string& name) {
-    const std::vector<t_enum_value*>& enum_values = get_constants();
-    std::vector<t_enum_value*>::const_iterator c_iter;
-    for (c_iter = enum_values.begin(); c_iter != enum_values.end(); ++c_iter) {
-      if ((*c_iter)->get_name() == name) {
-        return *c_iter;
-      }
-    }
-    return NULL;
-  }
-
-  t_enum_value* get_constant_by_value(int64_t value) {
-    const std::vector<t_enum_value*>& enum_values = get_constants();
-    std::vector<t_enum_value*>::const_iterator c_iter;
-    for (c_iter = enum_values.begin(); c_iter != enum_values.end(); ++c_iter) {
-      if ((*c_iter)->get_value() == value) {
-        return *c_iter;
-      }
-    }
-    return NULL;
-  }
-
-  t_enum_value* get_min_value() {
-    const std::vector<t_enum_value*>& enum_values = get_constants();
-    std::vector<t_enum_value*>::const_iterator c_iter;
-    t_enum_value* min_value;
-    if (enum_values.size() == 0) {
-      min_value = NULL;
-    } else {
-      int min_value_value;
-      min_value = enum_values.front();
-      min_value_value = min_value->get_value();
-      for (c_iter = enum_values.begin(); c_iter != enum_values.end(); ++c_iter) {
-        if ((*c_iter)->get_value() < min_value_value) {
-          min_value = (*c_iter);
-          min_value_value = min_value->get_value();
-        }
-      }
-    }
-    return min_value;
-  }
-
-  t_enum_value* get_max_value() {
-    const std::vector<t_enum_value*>& enum_values = get_constants();
-    std::vector<t_enum_value*>::const_iterator c_iter;
-    t_enum_value* max_value;
-    if (enum_values.size() == 0) {
-      max_value = NULL;
-    } else {
-      int max_value_value;
-      max_value = enum_values.back();
-      max_value_value = max_value->get_value();
-      for (c_iter = enum_values.begin(); c_iter != enum_values.end(); ++c_iter) {
-        if ((*c_iter)->get_value() > max_value_value) {
-          max_value = (*c_iter);
-          max_value_value = max_value->get_value();
-        }
-      }
-    }
-    return max_value;
-  }
-
-  bool is_enum() const { return true; }
-
-private:
-  std::vector<t_enum_value*> constants_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_enum_value.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_enum_value.h
deleted file mode 100644
index c0bf3ad..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_enum_value.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_ENUM_VALUE_H
-#define T_ENUM_VALUE_H
-
-#include <map>
-#include <string>
-#include "thrift/parse/t_doc.h"
-
-/**
- * A constant. These are used inside of enum definitions. Constants are just
- * symbol identifiers that may or may not have an explicit value associated
- * with them.
- *
- */
-class t_enum_value : public t_doc {
-public:
-  t_enum_value(std::string name, int value) : name_(name), value_(value) {}
-
-  ~t_enum_value() {}
-
-  const std::string& get_name() const { return name_; }
-
-  int get_value() const { return value_; }
-
-  std::map<std::string, std::string> annotations_;
-
-private:
-  std::string name_;
-  int value_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_field.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_field.h
deleted file mode 100644
index c5f1f80..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_field.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_FIELD_H
-#define T_FIELD_H
-
-#include <map>
-#include <string>
-#include <sstream>
-
-#include "thrift/parse/t_doc.h"
-#include "thrift/parse/t_type.h"
-
-// Forward declare for xsd_attrs
-class t_struct;
-
-/**
- * Class to represent a field in a thrift structure. A field has a data type,
- * a symbolic name, and a numeric identifier.
- *
- */
-class t_field : public t_doc {
-public:
-  t_field(t_type* type, std::string name)
-    : type_(type),
-      name_(name),
-      key_(0),
-      value_(NULL),
-      xsd_optional_(false),
-      xsd_nillable_(false),
-      xsd_attrs_(NULL),
-      reference_(false) {}
-
-  t_field(t_type* type, std::string name, int32_t key)
-    : type_(type),
-      name_(name),
-      key_(key),
-      req_(T_OPT_IN_REQ_OUT),
-      value_(NULL),
-      xsd_optional_(false),
-      xsd_nillable_(false),
-      xsd_attrs_(NULL),
-      reference_(false) {}
-
-  ~t_field() {}
-
-  t_type* get_type() { return type_; }
-
-  const t_type* get_type() const { return type_; }
-
-  const std::string& get_name() const { return name_; }
-
-  int32_t get_key() const { return key_; }
-
-  enum e_req { T_REQUIRED, T_OPTIONAL, T_OPT_IN_REQ_OUT };
-
-  void set_req(e_req req) { req_ = req; }
-
-  e_req get_req() const { return req_; }
-
-  void set_value(t_const_value* value) { value_ = value; }
-
-  t_const_value* get_value() { return value_; }
-
-  const t_const_value* get_value() const { return value_; }
-
-  void set_xsd_optional(bool xsd_optional) { xsd_optional_ = xsd_optional; }
-
-  bool get_xsd_optional() const { return xsd_optional_; }
-
-  void set_xsd_nillable(bool xsd_nillable) { xsd_nillable_ = xsd_nillable; }
-
-  bool get_xsd_nillable() const { return xsd_nillable_; }
-
-  void set_xsd_attrs(t_struct* xsd_attrs) { xsd_attrs_ = xsd_attrs; }
-
-  t_struct* get_xsd_attrs() { return xsd_attrs_; }
-
-  /**
-   * Comparator to sort fields in ascending order by key.
-   * Make this a functor instead of a function to help GCC inline it.
-   * The arguments are (const) references to const pointers to const t_fields.
-   */
-  struct key_compare {
-    bool operator()(t_field const* const& a, t_field const* const& b) {
-      return a->get_key() < b->get_key();
-    }
-  };
-
-  std::map<std::string, std::string> annotations_;
-
-  bool get_reference() { return reference_; }
-
-  void set_reference(bool reference) { reference_ = reference; }
-
-private:
-  t_type* type_;
-  std::string name_;
-  int32_t key_;
-  e_req req_;
-  t_const_value* value_;
-
-  bool xsd_optional_;
-  bool xsd_nillable_;
-  t_struct* xsd_attrs_;
-  bool reference_;
-};
-
-/**
- * A simple struct for the parser to use to store a field ID, and whether or
- * not it was specified by the user or automatically chosen.
- */
-struct t_field_id {
-  int32_t value;
-  bool auto_assigned;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_function.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_function.h
deleted file mode 100644
index 05dc930..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_function.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_FUNCTION_H
-#define T_FUNCTION_H
-
-#include <string>
-#include "thrift/parse/t_type.h"
-#include "thrift/parse/t_struct.h"
-#include "thrift/parse/t_doc.h"
-
-/**
- * Representation of a function. Key parts are return type, function name,
- * optional modifiers, and an argument list, which is implemented as a thrift
- * struct.
- *
- */
-class t_function : public t_doc {
-public:
-  t_function(t_type* returntype, std::string name, t_struct* arglist, bool oneway = false)
-    : returntype_(returntype), name_(name), arglist_(arglist), oneway_(oneway) {
-    xceptions_ = new t_struct(NULL);
-    if (oneway_ && (!returntype_->is_void())) {
-      pwarning(1, "Oneway methods should return void.\n");
-    }
-  }
-
-  t_function(t_type* returntype,
-             std::string name,
-             t_struct* arglist,
-             t_struct* xceptions,
-             bool oneway = false)
-    : returntype_(returntype),
-      name_(name),
-      arglist_(arglist),
-      xceptions_(xceptions),
-      oneway_(oneway) {
-    if (oneway_ && !xceptions_->get_members().empty()) {
-      throw std::string("Oneway methods can't throw exceptions.");
-    }
-    if (oneway_ && (!returntype_->is_void())) {
-      pwarning(1, "Oneway methods should return void.\n");
-    }
-  }
-
-  ~t_function() {}
-
-  t_type* get_returntype() const { return returntype_; }
-
-  const std::string& get_name() const { return name_; }
-
-  t_struct* get_arglist() const { return arglist_; }
-
-  t_struct* get_xceptions() const { return xceptions_; }
-
-  bool is_oneway() const { return oneway_; }
-
-  std::map<std::string, std::string> annotations_;
-
-private:
-  t_type* returntype_;
-  std::string name_;
-  t_struct* arglist_;
-  t_struct* xceptions_;
-  bool oneway_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_list.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_list.h
deleted file mode 100644
index acf6865..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_list.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_LIST_H
-#define T_LIST_H
-
-#include "thrift/parse/t_container.h"
-
-/**
- * A list is a lightweight container type that just wraps another data type.
- *
- */
-class t_list : public t_container {
-public:
-  t_list(t_type* elem_type) : elem_type_(elem_type) {}
-
-  t_type* get_elem_type() const { return elem_type_; }
-
-  bool is_list() const { return true; }
-
-private:
-  t_type* elem_type_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_map.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_map.h
deleted file mode 100644
index dd3f089..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_map.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_MAP_H
-#define T_MAP_H
-
-#include "thrift/parse/t_container.h"
-
-/**
- * A map is a lightweight container type that just wraps another two data
- * types.
- *
- */
-class t_map : public t_container {
-public:
-  t_map(t_type* key_type, t_type* val_type) : key_type_(key_type), val_type_(val_type) {}
-
-  t_type* get_key_type() const { return key_type_; }
-
-  t_type* get_val_type() const { return val_type_; }
-
-  bool is_map() const { return true; }
-
-private:
-  t_type* key_type_;
-  t_type* val_type_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_program.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_program.h
deleted file mode 100644
index 43dd45a..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_program.h
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_PROGRAM_H
-#define T_PROGRAM_H
-
-#include <map>
-#include <string>
-#include <vector>
-
-// For program_name()
-#include "thrift/main.h"
-
-#include "thrift/parse/t_doc.h"
-#include "thrift/parse/t_scope.h"
-#include "thrift/parse/t_base_type.h"
-#include "thrift/parse/t_typedef.h"
-#include "thrift/parse/t_enum.h"
-#include "thrift/parse/t_const.h"
-#include "thrift/parse/t_struct.h"
-#include "thrift/parse/t_service.h"
-#include "thrift/parse/t_list.h"
-#include "thrift/parse/t_map.h"
-#include "thrift/parse/t_set.h"
-#include "thrift/generate/t_generator_registry.h"
-//#include "thrift/parse/t_doc.h"
-
-/**
- * Top level class representing an entire thrift program. A program consists
- * fundamentally of the following:
- *
- *   Typedefs
- *   Enumerations
- *   Constants
- *   Structs
- *   Exceptions
- *   Services
- *
- * The program module also contains the definitions of the base types.
- *
- */
-class t_program : public t_doc {
-public:
-  t_program(std::string path, std::string name)
-    : path_(path), name_(name), out_path_("./"), out_path_is_absolute_(false), scope_(new t_scope) {}
-
-  t_program(std::string path) : path_(path), out_path_("./"), out_path_is_absolute_(false) {
-    name_ = program_name(path);
-    scope_ = new t_scope();
-  }
-
-  ~t_program() {
-    if (scope_) {
-      delete scope_;
-      scope_ = NULL;
-    }
-  }
-
-  // Path accessor
-  const std::string& get_path() const { return path_; }
-
-  // Output path accessor
-  const std::string& get_out_path() const { return out_path_; }
-
-  // Create gen-* dir accessor
-  bool is_out_path_absolute() const { return out_path_is_absolute_; }
-
-  // Name accessor
-  const std::string& get_name() const { return name_; }
-
-  // Namespace
-  const std::string& get_namespace() const { return namespace_; }
-
-  // Include prefix accessor
-  const std::string& get_include_prefix() const { return include_prefix_; }
-
-  // Accessors for program elements
-  const std::vector<t_typedef*>& get_typedefs() const { return typedefs_; }
-  const std::vector<t_enum*>& get_enums() const { return enums_; }
-  const std::vector<t_const*>& get_consts() const { return consts_; }
-  const std::vector<t_struct*>& get_structs() const { return structs_; }
-  const std::vector<t_struct*>& get_xceptions() const { return xceptions_; }
-  const std::vector<t_struct*>& get_objects() const { return objects_; }
-  const std::vector<t_service*>& get_services() const { return services_; }
-  const std::map<std::string, std::string>& get_namespaces() const { return namespaces_; }
-
-  // Program elements
-  void add_typedef(t_typedef* td) { typedefs_.push_back(td); }
-  void add_enum(t_enum* te) { enums_.push_back(te); }
-  void add_const(t_const* tc) { consts_.push_back(tc); }
-  void add_struct(t_struct* ts) {
-    objects_.push_back(ts);
-    structs_.push_back(ts);
-  }
-  void add_xception(t_struct* tx) {
-    objects_.push_back(tx);
-    xceptions_.push_back(tx);
-  }
-  void add_service(t_service* ts) { services_.push_back(ts); }
-
-  // Programs to include
-  const std::vector<t_program*>& get_includes() const { return includes_; }
-
-  void set_out_path(std::string out_path, bool out_path_is_absolute) {
-    out_path_ = out_path;
-    out_path_is_absolute_ = out_path_is_absolute;
-    // Ensure that it ends with a trailing '/' (or '\' for windows machines)
-    char c = out_path_.at(out_path_.size() - 1);
-    if (!(c == '/' || c == '\\')) {
-      out_path_.push_back('/');
-    }
-  }
-
-  // Typename collision detection
-  /**
-   * Search for typename collisions
-   * @param t    the type to test for collisions
-   * @return     true if a certain collision was found, otherwise false
-   */
-  bool is_unique_typename(t_type* t) {
-    int occurrences = program_typename_count(this, t);
-    for (std::vector<t_program*>::iterator it = includes_.begin(); it != includes_.end(); ++it) {
-      occurrences += program_typename_count(*it, t);
-    }
-    return 0 == occurrences;
-  }
-
-  /**
-   * Search all type collections for duplicate typenames
-   * @param prog the program to search
-   * @param t    the type to test for collisions
-   * @return     the number of certain typename collisions
-   */
-  int program_typename_count(t_program* prog, t_type* t) {
-    int occurrences = 0;
-    occurrences += collection_typename_count(prog, prog->typedefs_, t);
-    occurrences += collection_typename_count(prog, prog->enums_, t);
-    occurrences += collection_typename_count(prog, prog->objects_, t);
-    occurrences += collection_typename_count(prog, prog->services_, t);
-    return occurrences;
-  }
-
-  /**
-   * Search a type collection for duplicate typenames
-   * @param prog            the program to search
-   * @param type_collection the type collection to search
-   * @param t               the type to test for collisions
-   * @return                the number of certain typename collisions
-   */
-  template <class T>
-  int collection_typename_count(t_program* prog, T type_collection, t_type* t) {
-    int occurrences = 0;
-    for (typename T::iterator it = type_collection.begin(); it != type_collection.end(); ++it)
-      if (t != *it && 0 == t->get_name().compare((*it)->get_name()) && is_common_namespace(prog, t))
-        ++occurrences;
-    return occurrences;
-  }
-
-  /**
-   * Determine whether identical typenames will collide based on namespaces.
-   *
-   * Because we do not know which languages the user will generate code for,
-   * collisions within programs (IDL files) having namespace declarations can be
-   * difficult to determine. Only guaranteed collisions return true (cause an error).
-   * Possible collisions involving explicit namespace declarations produce a warning.
-   * Other possible collisions go unreported.
-   * @param prog the program containing the preexisting typename
-   * @param t    the type containing the typename match
-   * @return     true if a collision within namespaces is found, otherwise false
-   */
-  bool is_common_namespace(t_program* prog, t_type* t) {
-    // Case 1: Typenames are in the same program [collision]
-    if (prog == t->get_program()) {
-      pwarning(1,
-               "Duplicate typename %s found in %s",
-               t->get_name().c_str(),
-               t->get_program()->get_name().c_str());
-      return true;
-    }
-
-    // Case 2: Both programs have identical namespace scope/name declarations [collision]
-    bool match = true;
-    for (std::map<std::string, std::string>::iterator it = prog->namespaces_.begin();
-         it != prog->namespaces_.end();
-         ++it) {
-      if (0 == it->second.compare(t->get_program()->get_namespace(it->first))) {
-        pwarning(1,
-                 "Duplicate typename %s found in %s,%s,%s and %s,%s,%s [file,scope,ns]",
-                 t->get_name().c_str(),
-                 t->get_program()->get_name().c_str(),
-                 it->first.c_str(),
-                 it->second.c_str(),
-                 prog->get_name().c_str(),
-                 it->first.c_str(),
-                 it->second.c_str());
-      } else {
-        match = false;
-      }
-    }
-    for (std::map<std::string, std::string>::iterator it = t->get_program()->namespaces_.begin();
-         it != t->get_program()->namespaces_.end();
-         ++it) {
-      if (0 == it->second.compare(prog->get_namespace(it->first))) {
-        pwarning(1,
-                 "Duplicate typename %s found in %s,%s,%s and %s,%s,%s [file,scope,ns]",
-                 t->get_name().c_str(),
-                 t->get_program()->get_name().c_str(),
-                 it->first.c_str(),
-                 it->second.c_str(),
-                 prog->get_name().c_str(),
-                 it->first.c_str(),
-                 it->second.c_str());
-      } else {
-        match = false;
-      }
-    }
-    if (0 == prog->namespaces_.size() && 0 == t->get_program()->namespaces_.size()) {
-      pwarning(1,
-               "Duplicate typename %s found in %s and %s",
-               t->get_name().c_str(),
-               t->get_program()->get_name().c_str(),
-               prog->get_name().c_str());
-    }
-    return match;
-  }
-
-  // Scoping and namespacing
-  void set_namespace(std::string name) { namespace_ = name; }
-
-  // Scope accessor
-  t_scope* scope() const { return scope_; }
-
-  // Includes
-
-  void add_include(t_program* program) {
-    includes_.push_back(program);
-  }
-
-  void add_include(std::string path, std::string include_site) {
-    t_program* program = new t_program(path);
-
-    // include prefix for this program is the site at which it was included
-    // (minus the filename)
-    std::string include_prefix;
-    std::string::size_type last_slash = std::string::npos;
-    if ((last_slash = include_site.rfind("/")) != std::string::npos) {
-      include_prefix = include_site.substr(0, last_slash);
-    }
-
-    program->set_include_prefix(include_prefix);
-    includes_.push_back(program);
-  }
-
-  std::vector<t_program*>& get_includes() { return includes_; }
-
-  void set_include_prefix(std::string include_prefix) {
-    include_prefix_ = include_prefix;
-
-    // this is intended to be a directory; add a trailing slash if necessary
-    std::string::size_type len = include_prefix_.size();
-    if (len > 0 && include_prefix_[len - 1] != '/') {
-      include_prefix_ += '/';
-    }
-  }
-
-  // Language neutral namespace / packaging
-  void set_namespace(std::string language, std::string name_space) {
-    if (language != "*") {
-      size_t sub_index = language.find('.');
-      std::string base_language = language.substr(0, sub_index);
-      std::string sub_namespace;
-
-      if (base_language == "smalltalk") {
-        pwarning(1, "Namespace 'smalltalk' is deprecated. Use 'st' instead");
-        base_language = "st";
-      }
-
-      t_generator_registry::gen_map_t my_copy = t_generator_registry::get_generator_map();
-
-      t_generator_registry::gen_map_t::iterator it;
-      it = my_copy.find(base_language);
-
-      if (it == my_copy.end()) {
-        std::string warning = "No generator named '" + base_language + "' could be found!";
-        pwarning(1, warning.c_str());
-      } else {
-        if (sub_index != std::string::npos) {
-          std::string sub_namespace = language.substr(sub_index + 1);
-          if (!it->second->is_valid_namespace(sub_namespace)) {
-            std::string warning = base_language + " generator does not accept '" + sub_namespace
-                                  + "' as sub-namespace!";
-            pwarning(1, warning.c_str());
-          }
-        }
-      }
-    }
-
-    namespaces_[language] = name_space;
-  }
-
-  std::string get_namespace(std::string language) const {
-    std::map<std::string, std::string>::const_iterator iter;
-    if ((iter = namespaces_.find(language)) != namespaces_.end()
-        || (iter = namespaces_.find("*")) != namespaces_.end()) {
-      return iter->second;
-    }
-    return std::string();
-  }
-
-  const std::map<std::string, std::string>& get_all_namespaces(){
-     return namespaces_;
-  }
-
-  void set_namespace_annotations(std::string language, std::map<std::string, std::string> annotations) {
-    namespace_annotations_[language] = annotations;
-  }
-
-  const std::map<std::string, std::string>& get_namespace_annotations(std::string language) {
-    return namespace_annotations_[language];
-  }
-
-  // Language specific namespace / packaging
-
-  void add_cpp_include(std::string path) { cpp_includes_.push_back(path); }
-
-  const std::vector<std::string>& get_cpp_includes() { return cpp_includes_; }
-
-  void add_c_include(std::string path) { c_includes_.push_back(path); }
-
-  const std::vector<std::string>& get_c_includes() { return c_includes_; }
-
-private:
-  // File path
-  std::string path_;
-
-  // Name
-  std::string name_;
-
-  // Output directory
-  std::string out_path_;
-
-  // Output directory is absolute location for generated source (no gen-*)
-  bool out_path_is_absolute_;
-
-  // Namespace
-  std::string namespace_;
-
-  // Included programs
-  std::vector<t_program*> includes_;
-
-  // Include prefix for this program, if any
-  std::string include_prefix_;
-
-  // Identifier lookup scope
-  t_scope* scope_;
-
-  // Components to generate code for
-  std::vector<t_typedef*> typedefs_;
-  std::vector<t_enum*> enums_;
-  std::vector<t_const*> consts_;
-  std::vector<t_struct*> objects_;
-  std::vector<t_struct*> structs_;
-  std::vector<t_struct*> xceptions_;
-  std::vector<t_service*> services_;
-
-  // Dynamic namespaces
-  std::map<std::string, std::string> namespaces_;
-
-  // Annotations for dynamic namespaces
-  std::map<std::string, std::map<std::string, std::string> > namespace_annotations_;
-
-  // C++ extra includes
-  std::vector<std::string> cpp_includes_;
-
-  // C extra includes
-  std::vector<std::string> c_includes_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_scope.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_scope.h
deleted file mode 100644
index e196200..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_scope.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_SCOPE_H
-#define T_SCOPE_H
-
-#include <map>
-#include <string>
-#include <sstream>
-
-#include "thrift/parse/t_type.h"
-#include "thrift/parse/t_service.h"
-#include "thrift/parse/t_const.h"
-#include "thrift/parse/t_const_value.h"
-#include "thrift/parse/t_base_type.h"
-#include "thrift/parse/t_map.h"
-#include "thrift/parse/t_list.h"
-
-namespace plugin_output {
-template <typename From, typename To>
-void convert(From*, To&);
-}
-
-/**
- * This represents a variable scope used for looking up predefined types and
- * services. Typically, a scope is associated with a t_program. Scopes are not
- * used to determine code generation, but rather to resolve identifiers at
- * parse time.
- *
- */
-class t_scope {
-public:
-  t_scope() {}
-
-  void add_type(std::string name, t_type* type) { types_[name] = type; }
-
-  t_type* get_type(std::string name) { return types_[name]; }
-
-  void add_service(std::string name, t_service* service) { services_[name] = service; }
-
-  t_service* get_service(std::string name) { return services_[name]; }
-
-  void add_constant(std::string name, t_const* constant) {
-    if (constants_.find(name) != constants_.end()) {
-      throw "Enum " + name + " is already defined!";
-    } else {
-      constants_[name] = constant;
-    }
-  }
-
-  t_const* get_constant(std::string name) { return constants_[name]; }
-
-  void print() {
-    std::map<std::string, t_type*>::iterator iter;
-    for (iter = types_.begin(); iter != types_.end(); ++iter) {
-      printf("%s => %s\n", iter->first.c_str(), iter->second->get_name().c_str());
-    }
-  }
-
-  void resolve_const_value(t_const_value* const_val, t_type* ttype) {
-    if (ttype->is_map()) {
-      const std::map<t_const_value*, t_const_value*>& map = const_val->get_map();
-      std::map<t_const_value*, t_const_value*>::const_iterator v_iter;
-      for (v_iter = map.begin(); v_iter != map.end(); ++v_iter) {
-        resolve_const_value(v_iter->first, ((t_map*)ttype)->get_key_type());
-        resolve_const_value(v_iter->second, ((t_map*)ttype)->get_val_type());
-      }
-    } else if (ttype->is_list() || ttype->is_set()) {
-      const std::vector<t_const_value*>& val = const_val->get_list();
-      std::vector<t_const_value*>::const_iterator v_iter;
-      for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-        resolve_const_value((*v_iter), ((t_list*)ttype)->get_elem_type());
-      }
-    } else if (ttype->is_struct()) {
-      t_struct* tstruct = (t_struct*)ttype;
-      const std::map<t_const_value*, t_const_value*>& map = const_val->get_map();
-      std::map<t_const_value*, t_const_value*>::const_iterator v_iter;
-      for (v_iter = map.begin(); v_iter != map.end(); ++v_iter) {
-        t_field* field = tstruct->get_field_by_name(v_iter->first->get_string());
-        if (field == NULL) {
-          throw "No field named \"" + v_iter->first->get_string()
-              + "\" was found in struct of type \"" + tstruct->get_name() + "\"";
-        }
-        resolve_const_value(v_iter->second, field->get_type());
-      }
-    } else if (const_val->get_type() == t_const_value::CV_IDENTIFIER) {
-      if (ttype->is_enum()) {
-        const_val->set_enum((t_enum*)ttype);
-      } else {
-        t_const* constant = get_constant(const_val->get_identifier());
-        if (constant == NULL) {
-          throw "No enum value or constant found named \"" + const_val->get_identifier() + "\"!";
-        }
-
-        // Resolve typedefs to the underlying type
-        t_type* const_type = constant->get_type()->get_true_type();
-
-        if (const_type->is_base_type()) {
-          switch (((t_base_type*)const_type)->get_base()) {
-          case t_base_type::TYPE_I16:
-          case t_base_type::TYPE_I32:
-          case t_base_type::TYPE_I64:
-          case t_base_type::TYPE_BOOL:
-          case t_base_type::TYPE_I8:
-            const_val->set_integer(constant->get_value()->get_integer());
-            break;
-          case t_base_type::TYPE_STRING:
-            const_val->set_string(constant->get_value()->get_string());
-            break;
-          case t_base_type::TYPE_DOUBLE:
-            const_val->set_double(constant->get_value()->get_double());
-            break;
-          case t_base_type::TYPE_VOID:
-            throw "Constants cannot be of type VOID";
-          }
-        } else if (const_type->is_map()) {
-          const std::map<t_const_value*, t_const_value*>& map = constant->get_value()->get_map();
-          std::map<t_const_value*, t_const_value*>::const_iterator v_iter;
-
-          const_val->set_map();
-          for (v_iter = map.begin(); v_iter != map.end(); ++v_iter) {
-            const_val->add_map(v_iter->first, v_iter->second);
-          }
-        } else if (const_type->is_list()) {
-          const std::vector<t_const_value*>& val = constant->get_value()->get_list();
-          std::vector<t_const_value*>::const_iterator v_iter;
-
-          const_val->set_list();
-          for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
-            const_val->add_list(*v_iter);
-          }
-        }
-      }
-    } else if (ttype->is_enum()) {
-      // enum constant with non-identifier value. set the enum and find the
-      // value's name.
-      t_enum* tenum = (t_enum*)ttype;
-      t_enum_value* enum_value = tenum->get_constant_by_value(const_val->get_integer());
-      if (enum_value == NULL) {
-        std::ostringstream valstm;
-        valstm << const_val->get_integer();
-        throw "Couldn't find a named value in enum " + tenum->get_name() + " for value "
-            + valstm.str();
-      }
-      const_val->set_identifier(tenum->get_name() + "." + enum_value->get_name());
-      const_val->set_enum(tenum);
-    }
-  }
-
-private:
-  // Map of names to types
-  std::map<std::string, t_type*> types_;
-
-  // Map of names to constants
-  std::map<std::string, t_const*> constants_;
-
-  // Map of names to services
-  std::map<std::string, t_service*> services_;
-
-  // to list map entries
-  template <typename From, typename To>
-    friend void plugin_output::convert(From*, To&);
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_service.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_service.h
deleted file mode 100644
index e2204ca..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_service.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_SERVICE_H
-#define T_SERVICE_H
-
-#include "thrift/parse/t_function.h"
-#include <vector>
-
-class t_program;
-
-/**
- * A service consists of a set of functions.
- *
- */
-class t_service : public t_type {
-public:
-  t_service(t_program* program) : t_type(program), extends_(NULL) {}
-
-  bool is_service() const { return true; }
-
-  void set_extends(t_service* extends) { extends_ = extends; }
-
-  void add_function(t_function* func) {
-    std::vector<t_function*>::const_iterator iter;
-    for (iter = functions_.begin(); iter != functions_.end(); ++iter) {
-      if (func->get_name() == (*iter)->get_name()) {
-        throw "Function " + func->get_name() + " is already defined";
-      }
-    }
-    functions_.push_back(func);
-  }
-
-  const std::vector<t_function*>& get_functions() const { return functions_; }
-
-  t_service* get_extends() { return extends_; }
-
-  const t_service* get_extends() const { return extends_; }
-
-private:
-  std::vector<t_function*> functions_;
-  t_service* extends_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_set.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_set.h
deleted file mode 100644
index f913be4..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_set.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_SET_H
-#define T_SET_H
-
-#include "thrift/parse/t_container.h"
-
-/**
- * A set is a lightweight container type that just wraps another data type.
- *
- */
-class t_set : public t_container {
-public:
-  t_set(t_type* elem_type) : elem_type_(elem_type) {}
-
-  t_type* get_elem_type() const { return elem_type_; }
-
-  bool is_set() const { return true; }
-
-private:
-  t_type* elem_type_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_struct.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_struct.h
deleted file mode 100644
index 4102da7..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_struct.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_STRUCT_H
-#define T_STRUCT_H
-
-#include <algorithm>
-#include <vector>
-#include <utility>
-#include <string>
-
-#include "thrift/parse/t_type.h"
-#include "thrift/parse/t_field.h"
-
-// Forward declare that puppy
-class t_program;
-
-/**
- * A struct is a container for a set of member fields that has a name. Structs
- * are also used to implement exception types.
- *
- */
-class t_struct : public t_type {
-public:
-  typedef std::vector<t_field*> members_type;
-
-  t_struct(t_program* program)
-    : t_type(program),
-      is_xception_(false),
-      is_union_(false),
-      members_validated(false),
-      members_with_value(0),
-      xsd_all_(false) {}
-
-  t_struct(t_program* program, const std::string& name)
-    : t_type(program, name),
-      is_xception_(false),
-      is_union_(false),
-      members_validated(false),
-      members_with_value(0),
-      xsd_all_(false) {}
-
-  void set_name(const std::string& name) {
-    name_ = name;
-    validate_union_members();
-  }
-
-  void set_xception(bool is_xception) { is_xception_ = is_xception; }
-
-  void validate_union_member(t_field* field) {
-    if (is_union_ && (!name_.empty())) {
-
-      // 1) unions can't have required fields
-      // 2) union members are implicitly optional, otherwise bugs like THRIFT-3650 wait to happen
-      if (field->get_req() != t_field::T_OPTIONAL) {
-        // no warning on default requiredness, but do warn on anything else that is explicitly asked for
-        if(field->get_req() != t_field::T_OPT_IN_REQ_OUT) {
-          pwarning(1,
-                   "Union %s field %s: union members must be optional, ignoring specified requiredness.\n",
-                   name_.c_str(),
-                   field->get_name().c_str());
-        }
-        field->set_req(t_field::T_OPTIONAL);
-      }
-
-      // unions may have up to one member defaulted, but not more
-      if (field->get_value() != NULL) {
-        if (1 < ++members_with_value) {
-          throw "Error: Field " + field->get_name() + " provides another default value for union "
-              + name_;
-        }
-      }
-    }
-  }
-
-  void validate_union_members() {
-    if (is_union_ && (!name_.empty()) && (!members_validated)) {
-      members_type::const_iterator m_iter;
-      for (m_iter = members_in_id_order_.begin(); m_iter != members_in_id_order_.end(); ++m_iter) {
-        validate_union_member(*m_iter);
-      }
-      members_validated = true;
-    }
-  }
-
-  void set_union(bool is_union) {
-    is_union_ = is_union;
-    validate_union_members();
-  }
-
-  void set_xsd_all(bool xsd_all) { xsd_all_ = xsd_all; }
-
-  bool get_xsd_all() const { return xsd_all_; }
-
-  bool append(t_field* elem) {
-    typedef members_type::iterator iter_type;
-    std::pair<iter_type, iter_type> bounds = std::equal_range(members_in_id_order_.begin(),
-                                                              members_in_id_order_.end(),
-                                                              elem,
-                                                              t_field::key_compare());
-    if (bounds.first != bounds.second) {
-      return false;
-    }
-    // returns false when there is a conflict of field names
-    if (get_field_by_name(elem->get_name()) != NULL) {
-      return false;
-    }
-    members_.push_back(elem);
-    members_in_id_order_.insert(bounds.second, elem);
-    validate_union_member(elem);
-    return true;
-  }
-
-  const members_type& get_members() const { return members_; }
-
-  const members_type& get_sorted_members() { return members_in_id_order_; }
-
-  bool is_struct() const { return !is_xception_; }
-
-  bool is_xception() const { return is_xception_; }
-
-  bool is_union() const { return is_union_; }
-
-  t_field* get_field_by_name(std::string field_name) {
-    members_type::const_iterator m_iter;
-    for (m_iter = members_in_id_order_.begin(); m_iter != members_in_id_order_.end(); ++m_iter) {
-      if ((*m_iter)->get_name() == field_name) {
-        return *m_iter;
-      }
-    }
-    return NULL;
-  }
-
-  const t_field* get_field_by_name(std::string field_name) const {
-    members_type::const_iterator m_iter;
-    for (m_iter = members_in_id_order_.begin(); m_iter != members_in_id_order_.end(); ++m_iter) {
-      if ((*m_iter)->get_name() == field_name) {
-        return *m_iter;
-      }
-    }
-    return NULL;
-  }
-
-private:
-  members_type members_;
-  members_type members_in_id_order_;
-  bool is_xception_;
-  bool is_union_;
-  bool members_validated;
-  int members_with_value;
-
-  bool xsd_all_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_type.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_type.h
deleted file mode 100644
index 30f8c1f..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_type.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_TYPE_H
-#define T_TYPE_H
-
-#include <string>
-#include <map>
-#include <cstring>
-#include <stdint.h>
-#include "thrift/parse/t_doc.h"
-
-class t_program;
-
-/**
- * Generic representation of a thrift type. These objects are used by the
- * parser module to build up a tree of object that are all explicitly typed.
- * The generic t_type class exports a variety of useful methods that are
- * used by the code generator to branch based upon different handling for the
- * various types.
- *
- */
-class t_type : public t_doc {
-public:
-  virtual ~t_type() {}
-
-  virtual void set_name(const std::string& name) { name_ = name; }
-
-  virtual const std::string& get_name() const { return name_; }
-
-  virtual bool is_void() const { return false; }
-  virtual bool is_base_type() const { return false; }
-  virtual bool is_string() const { return false; }
-  virtual bool is_bool() const { return false; }
-  virtual bool is_typedef() const { return false; }
-  virtual bool is_enum() const { return false; }
-  virtual bool is_struct() const { return false; }
-  virtual bool is_xception() const { return false; }
-  virtual bool is_container() const { return false; }
-  virtual bool is_list() const { return false; }
-  virtual bool is_set() const { return false; }
-  virtual bool is_map() const { return false; }
-  virtual bool is_service() const { return false; }
-
-  t_program* get_program() { return program_; }
-
-  const t_program* get_program() const { return program_; }
-
-  t_type* get_true_type();
-  const t_type* get_true_type() const;
-
-  // This function will break (maybe badly) unless 0 <= num <= 16.
-  static char nybble_to_xdigit(int num) {
-    if (num < 10) {
-      return '0' + num;
-    } else {
-      return 'A' + num - 10;
-    }
-  }
-
-  static std::string byte_to_hex(uint8_t byte) {
-    std::string rv;
-    rv += nybble_to_xdigit(byte >> 4);
-    rv += nybble_to_xdigit(byte & 0x0f);
-    return rv;
-  }
-
-  std::map<std::string, std::string> annotations_;
-
-protected:
-  t_type() : program_(NULL) { ; }
-
-  t_type(t_program* program) : program_(program) { ; }
-
-  t_type(t_program* program, std::string name) : program_(program), name_(name) { ; }
-
-  t_type(std::string name) : program_(NULL), name_(name) { ; }
-
-  t_program* program_;
-  std::string name_;
-};
-
-/**
- * Placeholder struct for returning the key and value of an annotation
- * during parsing.
- */
-struct t_annotation {
-  std::string key;
-  std::string val;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_typedef.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_typedef.cc
deleted file mode 100644
index 99ffdb8..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_typedef.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#include <cstdio>
-
-#include "thrift/parse/t_typedef.h"
-#include "thrift/parse/t_program.h"
-
-t_type* t_typedef::get_type() const {
-  if (type_ == NULL) {
-    t_type* type = get_program()->scope()->get_type(symbolic_);
-    if (type == NULL) {
-      printf("Type \"%s\" not defined\n", symbolic_.c_str());
-      exit(1);
-    }
-    return type;
-  }
-  return type_;
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_typedef.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_typedef.h
deleted file mode 100644
index 0cccc26..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/parse/t_typedef.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_TYPEDEF_H
-#define T_TYPEDEF_H
-
-#include <string>
-#include "thrift/parse/t_type.h"
-
-/**
- * A typedef is a mapping from a symbolic name to another type. In dymanically
- * typed languages (i.e. php/python) the code generator can actually usually
- * ignore typedefs and just use the underlying type directly, though in C++
- * the symbolic naming can be quite useful for code clarity.
- *
- */
-class t_typedef : public t_type {
-public:
-  t_typedef(t_program* program, t_type* type, const std::string& symbolic)
-    : t_type(program, symbolic), type_(type), symbolic_(symbolic), forward_(false), seen_(false) {}
-
-  /**
-   * This constructor is used to refer to a type that is lazily
-   * resolved at a later time, like for forward declarations or
-   * recursive types.
-   */
-  t_typedef(t_program* program, const std::string& symbolic, bool forward)
-    : t_type(program, symbolic),
-      type_(NULL),
-      symbolic_(symbolic),
-      forward_(forward),
-      seen_(false) {}
-
-  ~t_typedef() {}
-
-  t_type* get_type() const;
-
-  const std::string& get_symbolic() const { return symbolic_; }
-
-  bool is_forward_typedef() const { return forward_; }
-
-  bool is_typedef() const { return true; }
-
-private:
-  t_type* type_;
-  std::string symbolic_;
-  bool forward_;
-  mutable bool seen_;
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/platform.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/platform.h
deleted file mode 100644
index 7a8edae..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/platform.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * define for mkdir,since the method signature
- * is different for the non-POSIX MinGW
- */
-
-#ifdef _MSC_VER
-#include "thrift/windows/config.h"
-#endif
-
-#ifdef _WIN32
-#include <direct.h>
-#include <io.h>
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-
-#ifdef _WIN32
-#define MKDIR(x) mkdir(x)
-#else
-#define MKDIR(x) mkdir(x, S_IRWXU | S_IRWXG | S_IRWXO)
-#endif
-
-#ifdef PATH_MAX
-#define THRIFT_PATH_MAX PATH_MAX
-#else
-#define THRIFT_PATH_MAX MAX_PATH
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/Makefile.am b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/Makefile.am
deleted file mode 100644
index e84cdbd..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-# Contains some contributions under the Thrift Software License.
-# Please see doc/old-thrift-license.txt in the Thrift distribution for
-# details.
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-if WITH_PLUGIN
-plugin_gen = plugin_types.h \
-             plugin_types.cpp \
-             plugin_constants.h \
-             plugin_constants.cpp
-
-BUILT_SOURCES = $(plugin_gen)
-gen.stamp: plugin.thrift $(top_builddir)/compiler/cpp/src/thrift/thrift-bootstrap
-	@$(RM) -f gen.tmp
-	@touch gen.tmp
-	$(top_builddir)/compiler/cpp/src/thrift/thrift-bootstrap -gen cpp -out . $<
-	@mv -f gen.tmp $@
-
-$(plugin_gen): gen.stamp
-	@if test -f $@; then :; else \
-	$(RM) -f gen.stamp; \
-	$(MAKE) $(AM_MAKEFLAGS) gen.stamp; \
-	fi
-
-clean-local:
-	$(RM) version.h windows/version.h $(plugin_gen)
-endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.cc
deleted file mode 100644
index 1d45d89..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.cc
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "thrift/plugin/plugin.h"
-
-#ifdef _WIN32
-#include <fcntl.h>
-#include <io.h>
-#endif
-
-#include <cassert>
-#include <iostream>
-
-#include <boost/bind.hpp>
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/algorithm/for_each.hpp>
-#include <boost/smart_ptr.hpp>
-
-#include "thrift/generate/t_generator.h"
-#include "thrift/plugin/type_util.h"
-#include "thrift/protocol/TBinaryProtocol.h"
-#include "thrift/transport/TBufferTransports.h"
-#include "thrift/transport/TFDTransport.h"
-
-#include "thrift/plugin/plugin_types.h"
-
-namespace apache {
-namespace thrift {
-namespace plugin {
-
-using apache::thrift::protocol::TBinaryProtocol;
-using apache::thrift::transport::TFDTransport;
-using apache::thrift::transport::TFramedTransport;
-
-#define THRIFT_CONVERT_FORWARD(from_type)                                                          \
-  template <>                                                                                      \
-  typename ToType<from_type>::type* convert_forward<from_type>(const from_type& from)
-
-#define THRIFT_CONVERT_COMPLETE_DECL(from_type)                                                    \
-  template <>                                                                                      \
-  void convert(const from_type& from, ToType<from_type>::type* to)
-
-#define THRIFT_CONVERT_UNARY_DECL(from_type)                                                       \
-  template <>                                                                                      \
-  typename ToType<from_type>::type* convert<from_type>(const from_type& from)
-
-#define THRIFT_CONVERSION_DECL(from_type)                                                          \
-  THRIFT_CONVERT_FORWARD(from_type);                                                               \
-  THRIFT_CONVERT_COMPLETE_DECL(from_type);                                                         \
-  THRIFT_CONVERT_UNARY_DECL(from_type)
-
-#define THRIFT_CONVERT_COMPLETE(from_type)                                                         \
-  THRIFT_CONVERSION_DECL(from_type) {                                                              \
-    ToType<from_type>::type* to = convert_forward(from);                                           \
-    convert(from, to);                                                                             \
-    return to;                                                                                     \
-  }                                                                                                \
-  THRIFT_CONVERT_COMPLETE_DECL(from_type)
-
-#define THRIFT_CONVERSION(from_type, ...)                                                          \
-  THRIFT_CONVERT_FORWARD(from_type) {                                                              \
-    (void)from;                                                                                    \
-    return new ToType<from_type>::type(__VA_ARGS__);                                               \
-  }                                                                                                \
-  THRIFT_CONVERT_COMPLETE(from_type)
-
-#define THRIFT_ASSIGN_DOC()                                                                        \
-  do {                                                                                             \
-    if (from.__isset.doc)                                                                          \
-      to->set_doc(from.doc);                                                                       \
-  } while (0)
-
-#define THRIFT_ASSIGN_ANNOTATIONS()                                                                \
-  THRIFT_ASSIGN_DOC();                                                                             \
-  do {                                                                                             \
-    if (from.__isset.annotations)                                                                  \
-      to->annotations_ = from.annotations;                                                         \
-  } while (0)
-
-#define THRIFT_ASSIGN_METADATA()                                                                   \
-  do {                                                                                             \
-    to->set_name(from.metadata.name);                                                              \
-    if (from.metadata.__isset.doc)                                                                 \
-      to->set_doc(from.metadata.doc);                                                              \
-    if (from.metadata.__isset.annotations)                                                         \
-      to->annotations_ = from.metadata.annotations;                                                \
-  } while (0)
-
-::t_program* g_program = 0;
-
-template <typename C, typename S>
-struct TypeCache {
-  C* operator[](const int64_t& k) {
-    typename std::map<int64_t, C*>::iterator it = cache.find(k);
-    if (it != cache.end()) {
-      return it->second;
-    } else {
-      typename std::map<int64_t, S>::const_iterator cit = source->find(k);
-      if (cit == source->end()) {
-        throw ThriftPluginError("Type not found");
-      }
-      return (cache)[k] = convert_forward(cit->second);
-    }
-  }
-
-  void compileAll() {
-    boost::for_each(*source | boost::adaptors::map_keys,
-                    boost::bind(&TypeCache::compile, this, _1));
-  }
-
-  std::map<int64_t, S> const* source;
-
-protected:
-  std::map<int64_t, C*> cache;
-
-private:
-  void compile(const int64_t& k) {
-    typename std::map<int64_t, S>::const_iterator cit = source->find(k);
-    if (cit == source->end()) {
-      throw ThriftPluginError("Type not found ");
-    }
-    convert(cit->second, (*this)[k]);
-  }
-};
-std::map<int64_t, ::t_program*> g_program_cache;
-TypeCache< ::t_type, t_type> g_type_cache;
-TypeCache< ::t_const, t_const> g_const_cache;
-TypeCache< ::t_service, t_service> g_service_cache;
-
-void set_global_cache(const TypeRegistry& from) {
-  g_type_cache.source = &from.types;
-  g_const_cache.source = &from.constants;
-  g_service_cache.source = &from.services;
-
-  g_type_cache.compileAll();
-  g_const_cache.compileAll();
-  g_service_cache.compileAll();
-}
-
-template <typename T>
-T* resolve_type(int64_t name) {
-  return reinterpret_cast<T*>(g_type_cache[name]);
-}
-
-::t_const* resolve_const(int64_t name) {
-  return g_const_cache[name];
-}
-
-::t_service* resolve_service(int64_t name) {
-  return g_service_cache[name];
-}
-
-THRIFT_CONVERT_FORWARD(t_base_type) {
-#define T_BASETYPE_CASE(type)                                                                      \
-  case t_base::TYPE_##type:                                                                        \
-    t = ::t_base_type::TYPE_##type;                                                                \
-    break
-
-  ::t_base_type::t_base t = ::t_base_type::TYPE_VOID;
-  bool is_binary = false;
-  switch (from.value) {
-    T_BASETYPE_CASE(VOID);
-    T_BASETYPE_CASE(STRING);
-    T_BASETYPE_CASE(BOOL);
-    T_BASETYPE_CASE(I8);
-    T_BASETYPE_CASE(I16);
-    T_BASETYPE_CASE(I32);
-    T_BASETYPE_CASE(I64);
-    T_BASETYPE_CASE(DOUBLE);
-  case t_base::TYPE_BINARY:
-    t = ::t_base_type::TYPE_STRING;
-    is_binary = true;
-    break;
-  }
-  ::t_base_type* to = new ::t_base_type(from.metadata.name, t);
-  to->set_binary(is_binary);
-  return to;
-#undef T_BASETYPE_CASE
-}
-THRIFT_CONVERT_COMPLETE(t_base_type) {
-  THRIFT_ASSIGN_METADATA();
-}
-
-THRIFT_CONVERT_FORWARD(t_typedef) {
-  ::t_typedef* to;
-  if (from.forward) {
-    to = new ::t_typedef(g_program_cache[from.metadata.program_id], from.symbolic, true);
-  } else {
-    to = new ::t_typedef(g_program_cache[from.metadata.program_id],
-                         resolve_type< ::t_type>(from.type), from.symbolic);
-  }
-  return to;
-}
-THRIFT_CONVERT_COMPLETE(t_typedef) {
-  THRIFT_ASSIGN_METADATA();
-}
-THRIFT_CONVERSION(t_enum_value, from.name, from.value) {
-  assert(to);
-  THRIFT_ASSIGN_ANNOTATIONS();
-}
-THRIFT_CONVERSION(t_enum, g_program_cache[from.metadata.program_id]) {
-  assert(to);
-  THRIFT_ASSIGN_METADATA();
-  boost::for_each(from.constants | boost::adaptors::transformed(convert<t_enum_value>),
-                  boost::bind(&::t_enum::append, to, _1));
-}
-THRIFT_CONVERSION(t_list, resolve_type< ::t_type>(from.elem_type)) {
-  assert(to);
-  THRIFT_ASSIGN_METADATA();
-  if (from.__isset.cpp_name)
-    to->set_cpp_name(from.cpp_name);
-}
-THRIFT_CONVERSION(t_set, resolve_type< ::t_type>(from.elem_type)) {
-  assert(to);
-  THRIFT_ASSIGN_METADATA();
-  if (from.__isset.cpp_name)
-    to->set_cpp_name(from.cpp_name);
-}
-THRIFT_CONVERSION(t_map,
-                  resolve_type< ::t_type>(from.key_type),
-                  resolve_type< ::t_type>(from.val_type)) {
-  assert(to);
-  THRIFT_ASSIGN_METADATA();
-  if (from.__isset.cpp_name)
-    to->set_cpp_name(from.cpp_name);
-}
-THRIFT_CONVERSION(t_const_value, ) {
-#define T_CONST_VALUE_CASE(type)                                                                   \
-  if (from.__isset.type##_val)                                                                     \
-  to->set_##type(from.type##_val)
-
-  assert(to);
-  if (from.__isset.map_val) {
-    to->set_map();
-    for (std::map<t_const_value, t_const_value>::const_iterator it = from.map_val.begin();
-         it != from.map_val.end(); it++) {
-      to->add_map(convert(it->first), convert(it->second));
-    }
-  } else if (from.__isset.list_val) {
-    to->set_list();
-    boost::for_each(from.list_val | boost::adaptors::transformed(&convert<t_const_value>),
-                    boost::bind(&::t_const_value::add_list, to, _1));
-  } else
-    T_CONST_VALUE_CASE(string);
-  else T_CONST_VALUE_CASE(integer);
-  else T_CONST_VALUE_CASE(double);
-  else {
-    T_CONST_VALUE_CASE(identifier);
-    if (from.__isset.enum_val)
-      to->set_enum(resolve_type< ::t_enum>(from.enum_val));
-  }
-#undef T_CONST_VALUE_CASE
-}
-THRIFT_CONVERSION(t_field, resolve_type< ::t_type>(from.type), from.name, from.key) {
-  assert(to);
-  THRIFT_ASSIGN_ANNOTATIONS();
-  to->set_reference(from.reference);
-  to->set_req(static_cast< ::t_field::e_req>(from.req));
-  if (from.__isset.value) {
-    to->set_value(convert(from.value));
-  }
-}
-THRIFT_CONVERSION(t_struct, g_program_cache[from.metadata.program_id]) {
-  assert(to);
-  THRIFT_ASSIGN_METADATA();
-  to->set_union(from.is_union);
-  to->set_xception(from.is_xception);
-  boost::for_each(from.members | boost::adaptors::transformed(convert<t_field>),
-                  boost::bind(&::t_struct::append, to, _1));
-}
-THRIFT_CONVERSION(t_const,
-                  resolve_type< ::t_type>(from.type),
-                  from.name,
-                  convert<t_const_value>(from.value)) {
-  assert(to);
-  THRIFT_ASSIGN_DOC();
-}
-
-THRIFT_CONVERSION(t_function,
-                  resolve_type< ::t_type>(from.returntype),
-                  from.name,
-                  resolve_type< ::t_struct>(from.arglist),
-                  resolve_type< ::t_struct>(from.xceptions),
-                  from.is_oneway) {
-  assert(to);
-  THRIFT_ASSIGN_DOC();
-}
-
-THRIFT_CONVERSION(t_service, g_program_cache[from.metadata.program_id]) {
-  assert(to);
-  assert(from.metadata.program_id);
-  assert(g_program_cache[from.metadata.program_id]);
-  THRIFT_ASSIGN_METADATA();
-
-  boost::for_each(from.functions | boost::adaptors::transformed(convert<t_function>),
-                  boost::bind(&::t_service::add_function, to, _1));
-
-  if (from.__isset.extends_)
-    to->set_extends(resolve_service(from.extends_));
-}
-
-THRIFT_CONVERT_FORWARD(t_type) {
-#define T_TYPE_CASE_FW_T(case, type)                                                               \
-  if (from.__isset.case##_val)                                                                     \
-  return convert_forward<type>(from.case##_val)
-#define T_TYPE_CASE_FW(case) T_TYPE_CASE_FW_T(case, t_##case)
-
-  T_TYPE_CASE_FW(base_type);
-  T_TYPE_CASE_FW(typedef);
-  T_TYPE_CASE_FW(enum);
-  T_TYPE_CASE_FW(struct);
-  T_TYPE_CASE_FW_T(xception, t_struct);
-  T_TYPE_CASE_FW(list);
-  T_TYPE_CASE_FW(set);
-  T_TYPE_CASE_FW(map);
-  T_TYPE_CASE_FW(service);
-  throw ThriftPluginError("Invalid data: Type union has no value.");
-#undef T_TYPE_CASE_FW_T
-#undef T_TYPE_CASE_FW
-}
-THRIFT_CONVERT_COMPLETE(t_type) {
-#define T_TYPE_CASE_T(case, type)                                                                  \
-  else if (from.__isset.case##_val)                                                                \
-      convert<type, ::type>(from.case##_val, reinterpret_cast< ::type*>(to))
-#define T_TYPE_CASE(case) T_TYPE_CASE_T(case, t_##case)
-
-  if (false) {
-  }
-  T_TYPE_CASE(base_type);
-  T_TYPE_CASE(typedef);
-  T_TYPE_CASE(enum);
-  T_TYPE_CASE(struct);
-  T_TYPE_CASE_T(xception, t_struct);
-  T_TYPE_CASE(list);
-  T_TYPE_CASE(set);
-  T_TYPE_CASE(map);
-  T_TYPE_CASE(service);
-  else {
-    throw ThriftPluginError("Invalid data: Type union has no value.");
-  }
-#undef T_TYPE_CASE_T
-#undef T_TYPE_CASE
-}
-
-THRIFT_CONVERSION(t_scope, ) {
-  assert(to);
-#define T_SCOPE_RESOLVE(type, name, a)                                                             \
-  for (std::vector<int64_t>::const_iterator it = from.name##s.begin(); it != from.name##s.end();   \
-       it++) {                                                                                     \
-    ::t_##type* t = resolve_##type a(*it);                                                         \
-    to->add_##name(t->get_name(), t);                                                              \
-  }
-  T_SCOPE_RESOLVE(type, type, < ::t_type>);
-  T_SCOPE_RESOLVE(const, constant, );
-  T_SCOPE_RESOLVE(service, service, );
-#undef T_SCOPE_RESOLVE
-}
-
-THRIFT_CONVERT_FORWARD(t_program) {
-  ::t_program* to = new ::t_program(from.path, from.name);
-  for (std::vector<t_program>::const_iterator it = from.includes.begin(); it != from.includes.end();
-       it++) {
-    to->add_include(convert_forward(*it));
-  }
-  g_program_cache[from.program_id] = to;
-  return to;
-}
-THRIFT_CONVERT_COMPLETE(t_program) {
-  assert(to);
-  g_program = to;
-  convert<t_scope, ::t_scope>(from.scope, to->scope());
-  THRIFT_ASSIGN_DOC();
-
-  to->set_out_path(from.out_path, from.out_path_is_absolute);
-
-  boost::for_each(from.typedefs | boost::adaptors::transformed(&resolve_type< ::t_typedef>),
-                  boost::bind(&::t_program::add_typedef, to, _1));
-  boost::for_each(from.enums | boost::adaptors::transformed(&resolve_type< ::t_enum>),
-                  boost::bind(&::t_program::add_enum, to, _1));
-  for (std::vector<int64_t>::const_iterator it = from.objects.begin(); it != from.objects.end();
-       it++) {
-    ::t_struct* t2 = resolve_type< ::t_struct>(*it);
-    if (t2->is_xception()) {
-      to->add_xception(t2);
-    } else {
-      to->add_struct(t2);
-    }
-  }
-  boost::for_each(from.consts | boost::adaptors::transformed(&resolve_const),
-                  boost::bind(&::t_program::add_const, to, _1));
-  boost::for_each(from.services | boost::adaptors::transformed(&resolve_service),
-                  boost::bind(&::t_program::add_service, to, _1));
-
-  for (std::vector<t_program>::const_iterator it = from.includes.begin(); it != from.includes.end();
-       it++) {
-    convert(*it, g_program_cache[it->program_id]);
-  }
-  std::for_each(from.c_includes.begin(), from.c_includes.end(),
-                boost::bind(&::t_program::add_c_include, to, _1));
-  std::for_each(from.cpp_includes.begin(), from.cpp_includes.end(),
-                boost::bind(&::t_program::add_cpp_include, to, _1));
-  for (std::map<std::string, std::string>::const_iterator it = from.namespaces.begin();
-       it != from.namespaces.end(); it++) {
-    to->set_namespace(it->first, it->second);
-  }
-
-  to->set_include_prefix(from.include_prefix);
-  to->set_namespace(from.namespace_);
-}
-
-int GeneratorPlugin::exec(int, char* []) {
-#ifdef _WIN32
-  _setmode(fileno(stdin), _O_BINARY);
-#endif
-  boost::shared_ptr<TFramedTransport> transport(
-      new TFramedTransport(boost::make_shared<TFDTransport>(fileno(stdin))));
-  TBinaryProtocol proto(transport);
-  GeneratorInput input;
-  try {
-    input.read(&proto);
-  } catch (std::exception& err) {
-    std::cerr << "Error while receiving plugin data: " << err.what() << std::endl;
-    return -1;
-  }
-  initGlobals();
-  ::t_program* p = g_program = convert_forward(input.program);
-  set_global_cache(input.type_registry);
-  convert(input.program, p);
-
-  int ret = generate(p, input.parsed_options);
-  clearGlobals();
-
-  return ret;
-}
-
-::t_const_value::t_const_value_type const_value_case(const t_const_value& v) {
-  if (v.__isset.map_val)
-    return ::t_const_value::CV_MAP;
-  if (v.__isset.list_val)
-    return ::t_const_value::CV_LIST;
-  if (v.__isset.string_val)
-    return ::t_const_value::CV_STRING;
-  if (v.__isset.integer_val)
-    return ::t_const_value::CV_INTEGER;
-  if (v.__isset.double_val)
-    return ::t_const_value::CV_DOUBLE;
-  if (v.__isset.identifier_val)
-    return ::t_const_value::CV_IDENTIFIER;
-  if (v.__isset.enum_val)
-    return ::t_const_value::CV_IDENTIFIER;
-  throw ThriftPluginError("Unknown const value type");
-}
-
-bool t_const_value::operator<(const t_const_value& that) const {
-  ::t_const_value::t_const_value_type t1 = const_value_case(*this);
-  ::t_const_value::t_const_value_type t2 = const_value_case(that);
-  if (t1 != t2)
-    return t1 < t2;
-  switch (t1) {
-  case ::t_const_value::CV_INTEGER:
-    return integer_val < that.integer_val;
-  case ::t_const_value::CV_DOUBLE:
-    return double_val < that.double_val;
-  case ::t_const_value::CV_STRING:
-    return string_val < that.string_val;
-  case ::t_const_value::CV_MAP:
-    if (that.map_val.empty())
-      return false;
-    else if (map_val.empty())
-      return true;
-    else
-      return map_val.begin()->first < that.map_val.begin()->first;
-  case ::t_const_value::CV_LIST:
-    if (that.list_val.empty())
-      return false;
-    else if (list_val.empty())
-      return true;
-    else
-      return list_val.front() < that.list_val.front();
-  case ::t_const_value::CV_IDENTIFIER:
-    return integer_val < that.integer_val;
-  }
-  throw ThriftPluginError("Unknown const value type");
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.h
deleted file mode 100644
index 705cd41..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_PLUGIN_PLUGIN_H
-#define T_PLUGIN_PLUGIN_H
-
-#include "thrift/Thrift.h"
-
-class t_program;
-
-namespace apache {
-namespace thrift {
-namespace plugin {
-
-struct ThriftPluginError : public apache::thrift::TException {
-  ThriftPluginError(const std::string& msg) : apache::thrift::TException(msg) {}
-};
-
-class GeneratorPlugin {
-public:
-  int exec(int argc, char* argv[]);
-  virtual int generate(::t_program*, const std::map<std::string, std::string>&) = 0;
-};
-}
-}
-}
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.thrift b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.thrift
deleted file mode 100644
index a93873d..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin.thrift
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace as3 org.apache.thrift.plugin
-namespace cpp apache.thrift.plugin
-namespace csharp Thrift.Plugin
-namespace d thrift.plugin
-namespace delphi Thrift.Plugin
-namespace erl thrift.plugin
-namespace go thrift
-namespace haxe org.apache.thrift.plugin
-namespace hs Thrift.Plugin
-namespace java org.apache.thrift.plugin
-namespace ocaml Thrift
-namespace perl Thrift.Plugin
-namespace php thrift.plugin
-namespace py thrift.plugin
-namespace rb Thrift
-
-typedef i64 t_program_id
-typedef i64 t_type_id
-typedef i64 t_const_id
-typedef i64 t_service_id
-
-enum t_base {
-    TYPE_VOID
-    TYPE_STRING
-    TYPE_BOOL
-    TYPE_I8
-    TYPE_I16
-    TYPE_I32
-    TYPE_I64
-    TYPE_DOUBLE
-    TYPE_BINARY
-}
-
-struct TypeMetadata {
-  1: required string name
-  2: required t_program_id program_id
-  99: optional map<string, string> annotations
-  100: optional string doc
-}
-
-struct t_base_type {
-  1: required TypeMetadata metadata
-  2: required t_base value
-}
-
-struct t_list {
-  1: required TypeMetadata metadata
-  2: optional string cpp_name
-  3: required t_type_id elem_type
-}
-
-struct t_set {
-  1: required TypeMetadata metadata
-  2: optional string cpp_name
-  3: required t_type_id elem_type
-}
-
-struct t_map {
-  1: required TypeMetadata metadata
-  2: optional string cpp_name
-  3: required t_type_id key_type
-  4: required t_type_id val_type
-}
-
-struct t_typedef {
-  1: required TypeMetadata metadata
-  2: required t_type_id type
-  3: required string symbolic
-  4: required bool forward
-}
-
-struct t_enum_value {
-  1: required string name
-  2: required i32 value
-  99: optional map<string, string> annotations
-  100: optional string doc
-}
-struct t_enum {
-  1: required TypeMetadata metadata
-  2: required list<t_enum_value> constants
-}
-
-enum Requiredness {
-  T_REQUIRED = 0
-  T_OPTIONAL = 1
-  T_OPT_IN_REQ_OUT = 2
-}
-
-union t_const_value {
-  1: optional map<t_const_value, t_const_value> map_val
-  2: optional list<t_const_value> list_val
-  3: optional string string_val
-  4: optional i64 integer_val
-  5: optional double double_val
-  6: optional string identifier_val
-  7: optional t_type_id enum_val
-}
-struct t_const {
-  1: required string name
-  2: required t_type_id type
-  3: required t_const_value value
-  100: optional string doc
-}
-struct t_struct {
-  1: required TypeMetadata metadata
-  2: required list<t_field> members
-  3: required bool is_union
-  4: required bool is_xception
-}
-struct t_field {
-  1: required string name
-  2: required t_type_id type
-  3: required i32 key
-  4: required Requiredness req
-  5: optional t_const_value value
-  10: required bool reference
-  99: optional map<string, string> annotations
-  100: optional string doc
-}
-struct t_function {
-  1: required string name
-  2: required t_type_id returntype
-  3: required t_type_id arglist
-  4: required t_type_id xceptions
-  5: required bool is_oneway
-  100: optional string doc
-}
-struct t_service {
-  1: required TypeMetadata metadata
-  2: required list<t_function> functions
-  3: optional t_service_id extends_
-}
-union t_type {
-  1: optional t_base_type base_type_val
-  2: optional t_typedef typedef_val
-  3: optional t_enum enum_val
-  4: optional t_struct struct_val
-  5: optional t_struct xception_val
-  6: optional t_list list_val
-  7: optional t_set set_val
-  8: optional t_map map_val
-  9: optional t_service service_val
-}
-struct t_scope {
-  1: required list<t_type_id> types
-  2: required list<t_const_id> constants
-  3: required list<t_service_id> services
-}
-
-struct TypeRegistry {
-  1: required map<t_type_id, t_type> types
-  2: required map<t_const_id, t_const> constants
-  3: required map<t_service_id, t_service> services
-}
-
-struct t_program {
-  1: required string name
-  2: required t_program_id program_id
-  3: required string path
-  4: required string namespace_
-  5: required string out_path
-  6: required bool out_path_is_absolute
-  8: required list<t_program> includes
-  9: required string include_prefix
-  10: required t_scope scope
-
-  11: required list<t_type_id> typedefs
-  12: required list<t_type_id> enums
-  13: required list<t_const_id> consts
-  14: required list<t_type_id> objects
-  15: required list<t_service_id> services
-
-  16: required map<string, string> namespaces
-  17: required list<string> cpp_includes
-  18: required list<string> c_includes
-  100: optional string doc
-}
-
-struct GeneratorInput {
-  1: required t_program program
-  2: required TypeRegistry type_registry
-  3: required map<string, string> parsed_options
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin_output.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin_output.cc
deleted file mode 100644
index 168a4a6..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin_output.cc
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifdef _WIN32
-#include <cstdio>
-#include <fcntl.h>
-#include <io.h>
-#include <iostream>
-#define THRIFT_POPEN(cmd) _popen(cmd, "wb")
-#define THRIFT_PCLOSE _pclose
-#else
-#define THRIFT_POPEN(cmd) popen(cmd, "w")
-#define THRIFT_PCLOSE pclose
-#endif
-
-#include "thrift/plugin/plugin_output.h"
-
-#include <boost/range/adaptor/map.hpp>
-#include <boost/range/algorithm/copy.hpp>
-#include <boost/range/algorithm/transform.hpp>
-#include <boost/smart_ptr.hpp>
-
-#include "thrift/generate/t_generator.h"
-#include "thrift/plugin/plugin.h"
-#include "thrift/plugin/type_util.h"
-#include "thrift/protocol/TBinaryProtocol.h"
-#include "thrift/transport/TBufferTransports.h"
-#include "thrift/transport/TFDTransport.h"
-
-#include "thrift/plugin/plugin_types.h"
-
-namespace plugin_output {
-
-template <typename From>
-typename apache::thrift::plugin::ToType<From>::type convert(From* from) {
-  typename apache::thrift::plugin::ToType<From>::type to;
-  convert(from, to);
-  return to;
-}
-
-using apache::thrift::protocol::TBinaryProtocol;
-using apache::thrift::transport::TFDTransport;
-using apache::thrift::transport::TFramedTransport;
-
-using namespace apache::thrift;
-
-#define THRIFT_CONVERSION_N(from_type, to_type)                                                    \
-  template <>                                                                                      \
-  void convert<from_type, to_type>(from_type * from, to_type & to)
-#define THRIFT_CONVERSION(type) THRIFT_CONVERSION_N(::type, plugin::type)
-
-#define THRIFT_ASSIGN_N(from_name, to_name, prefix)                                                \
-  do {                                                                                             \
-    if (from)                                                                                      \
-      to.__set_##to_name(prefix(from->from_name));                                                 \
-  } while (0)
-
-#define THRIFT_ASSIGN(name) THRIFT_ASSIGN_N(get_##name(), name, )
-#define THRIFT_ASSIGN_CONVERT(type, from_name, to_name)                                            \
-  do {                                                                                             \
-    if (from && from->from_name) {                                                                 \
-      to.__set_##to_name(convert(from->from_name));                                                \
-    }                                                                                              \
-  } while (0)
-
-#define THRIFT_ASSIGN_OPT(name)                                                                    \
-  do {                                                                                             \
-    if (from->has_##name())                                                                        \
-      THRIFT_ASSIGN(name);                                                                         \
-  } while (0)
-
-#define THRIFT_ASSIGN_LIST_N(type, from_name, to_name)                                             \
-  do {                                                                                             \
-    if (from && !from->from_name.empty()) {                                                        \
-      std::transform(from->from_name.begin(),                                                      \
-                     from->from_name.end(),                                                        \
-                     std::back_inserter(to.to_name),                                               \
-                     convert< ::type>);                                                            \
-    }                                                                                              \
-  } while (0)
-
-#define THRIFT_ASSIGN_METADATA() convert(reinterpret_cast<t_type*>(from), to.metadata)
-
-// To avoid multiple instances of same type, t_type, t_const and t_service are stored in one place
-// and referenced by ID.
-template <typename T>
-struct TypeCache {
-  typedef typename plugin::ToType<T>::type to_type;
-  std::map<int64_t, to_type> cache;
-
-  template <typename T2>
-  int64_t store(T2* t) {
-    intptr_t id = reinterpret_cast<intptr_t>(t);
-    if (id) {
-      typename std::map<int64_t, to_type>::iterator it = cache.find(id);
-      if (it == cache.end()) {
-        // HACK: fake resolve for recursive type
-        cache.insert(std::make_pair(id, to_type()));
-        // overwrite with true value
-        cache[id] = convert(t);
-      }
-    }
-    return static_cast<int64_t>(id);
-  }
-
-  void clear() { cache.clear(); }
-};
-
-template <typename T>
-int64_t store_type(T* t);
-
-#define T_STORE(type)                                                                              \
-  TypeCache<t_##type> type##_cache;                                                                \
-  template <>                                                                                      \
-  plugin::t_##type##_id store_type<t_##type>(t_##type * t) {                                       \
-    return type##_cache.store<t_##type>(t);                                                        \
-  }
-T_STORE(type)
-T_STORE(const)
-T_STORE(service)
-#undef T_STORE
-
-#define THRIFT_ASSIGN_ID_N(t, from_name, to_name)                                                  \
-  do {                                                                                             \
-    if (from && from->from_name)                                                                   \
-      to.__set_##to_name(store_type<t>(from->from_name));                                          \
-  } while (0)
-
-#define THRIFT_ASSIGN_ID(name) THRIFT_ASSIGN_ID_N(t_type, get_##name(), name)
-
-#define THRIFT_ASSIGN_LIST_ID(t, name)                                                             \
-  do {                                                                                             \
-    if (from && !from->get_##name##s().empty()) {                                                  \
-      std::transform(from->get_##name##s().begin(),                                                \
-                     from->get_##name##s().end(),                                                  \
-                     std::back_inserter(to.name##s),                                               \
-                     &store_type<t>);                                                              \
-    }                                                                                              \
-  } while (0)
-
-THRIFT_CONVERSION_N(::t_type, plugin::TypeMetadata) {
-  to.program_id = reinterpret_cast<int64_t>(from->get_program());
-  THRIFT_ASSIGN_N(annotations_, annotations, );
-  if (from->has_doc()) {
-    to.__set_doc(from->get_doc());
-  }
-  THRIFT_ASSIGN(name);
-}
-
-THRIFT_CONVERSION(t_typedef) {
-  THRIFT_ASSIGN_METADATA();
-  THRIFT_ASSIGN_ID(type);
-  THRIFT_ASSIGN(symbolic);
-  THRIFT_ASSIGN_N(is_forward_typedef(), forward, );
-}
-
-THRIFT_CONVERSION(t_enum_value) {
-  THRIFT_ASSIGN_OPT(doc);
-  THRIFT_ASSIGN(name);
-  THRIFT_ASSIGN(value);
-}
-
-THRIFT_CONVERSION(t_enum) {
-  THRIFT_ASSIGN_METADATA();
-  THRIFT_ASSIGN_LIST_N(t_enum_value, get_constants(), constants);
-}
-
-THRIFT_CONVERSION(t_const_value) {
-  switch (from->get_type()) {
-  case t_const_value::CV_INTEGER:
-    THRIFT_ASSIGN_N(get_integer(), integer_val, );
-    break;
-  case t_const_value::CV_DOUBLE:
-    THRIFT_ASSIGN_N(get_double(), double_val, );
-    break;
-  case t_const_value::CV_STRING:
-    THRIFT_ASSIGN_N(get_string(), string_val, );
-    break;
-  case t_const_value::CV_IDENTIFIER:
-    THRIFT_ASSIGN_ID_N(t_type, enum_, enum_val);
-    THRIFT_ASSIGN_N(get_identifier(), identifier_val, );
-    break;
-  case t_const_value::CV_MAP:
-    to.__isset.map_val = true;
-    if (from && !from->get_map().empty()) {
-      for (std::map< ::t_const_value*, ::t_const_value*>::const_iterator it
-           = from->get_map().begin();
-           it != from->get_map().end();
-           it++) {
-        to.map_val.insert(std::make_pair(convert(it->first), convert(it->second)));
-      }
-    }
-    break;
-  case t_const_value::CV_LIST:
-    to.__isset.list_val = true;
-    THRIFT_ASSIGN_LIST_N(t_const_value, get_list(), list_val);
-    break;
-  default:
-    throw plugin::ThriftPluginError("const value has no value");
-  }
-}
-THRIFT_CONVERSION(t_const) {
-  THRIFT_ASSIGN_OPT(doc);
-  THRIFT_ASSIGN(name);
-  THRIFT_ASSIGN_ID(type);
-  THRIFT_ASSIGN_CONVERT(t_const_value, get_value(), value);
-}
-THRIFT_CONVERSION(t_field) {
-  THRIFT_ASSIGN_OPT(doc);
-  THRIFT_ASSIGN(name);
-  THRIFT_ASSIGN(key);
-  THRIFT_ASSIGN_N(get_req(), req, (plugin::Requiredness::type));
-  THRIFT_ASSIGN(reference);
-  THRIFT_ASSIGN_ID(type);
-  THRIFT_ASSIGN_CONVERT(t_const_value, get_value(), value);
-}
-THRIFT_CONVERSION(t_struct) {
-  THRIFT_ASSIGN_METADATA();
-  THRIFT_ASSIGN_LIST_N(t_field, get_members(), members);
-  THRIFT_ASSIGN_N(is_union(), is_union, );
-  THRIFT_ASSIGN_N(is_xception(), is_xception, );
-}
-THRIFT_CONVERSION(t_function) {
-  THRIFT_ASSIGN_OPT(doc);
-  THRIFT_ASSIGN(name);
-  THRIFT_ASSIGN_ID(returntype);
-  THRIFT_ASSIGN_N(is_oneway(), is_oneway, );
-  THRIFT_ASSIGN_ID(arglist);
-  THRIFT_ASSIGN_ID(xceptions);
-}
-
-THRIFT_CONVERSION(t_list) {
-  THRIFT_ASSIGN_METADATA();
-  THRIFT_ASSIGN_OPT(cpp_name);
-  THRIFT_ASSIGN_ID(elem_type);
-}
-THRIFT_CONVERSION(t_set) {
-  THRIFT_ASSIGN_METADATA();
-  THRIFT_ASSIGN_OPT(cpp_name);
-  THRIFT_ASSIGN_ID(elem_type);
-}
-THRIFT_CONVERSION(t_map) {
-  THRIFT_ASSIGN_METADATA();
-  THRIFT_ASSIGN_OPT(cpp_name);
-  THRIFT_ASSIGN_ID(key_type);
-  THRIFT_ASSIGN_ID(val_type);
-}
-
-THRIFT_CONVERSION(t_service) {
-  THRIFT_ASSIGN_METADATA();
-  THRIFT_ASSIGN_LIST_N(t_function, get_functions(), functions);
-  THRIFT_ASSIGN_ID_N(t_service, get_extends(), extends_);
-}
-
-THRIFT_CONVERSION(t_base_type) {
-  THRIFT_ASSIGN_METADATA();
-  if (from->is_binary()) {
-    to.value = plugin::t_base::TYPE_BINARY;
-  } else {
-    switch (from->get_base()) {
-#define T_BASETYPE_CASE(name)                                                                      \
-  case t_base_type::TYPE_##name:                                                                   \
-    to.value = plugin::t_base::TYPE_##name;                                                        \
-    break
-      T_BASETYPE_CASE(VOID);
-      T_BASETYPE_CASE(STRING);
-      T_BASETYPE_CASE(BOOL);
-      T_BASETYPE_CASE(I8);
-      T_BASETYPE_CASE(I16);
-      T_BASETYPE_CASE(I32);
-      T_BASETYPE_CASE(I64);
-      T_BASETYPE_CASE(DOUBLE);
-    default:
-      throw plugin::ThriftPluginError("Base type union has no value");
-      break;
-#undef T_BASETYPE_CASE
-    }
-  }
-}
-THRIFT_CONVERSION(t_type) {
-#define T_CONVERT_UNION_N(name, type)                                                              \
-  else if (from->is_##name()) {                                                                    \
-    to.__isset.name##_val = true;                                                                  \
-    convert(reinterpret_cast< ::type*>(from), to.name##_val);                                      \
-  }
-#define T_CONVERT_UNION(name) T_CONVERT_UNION_N(name, t_##name)
-  if (false) {
-  }
-  T_CONVERT_UNION(base_type)
-  T_CONVERT_UNION(typedef)
-  T_CONVERT_UNION(enum)
-  T_CONVERT_UNION(struct)
-  T_CONVERT_UNION_N(xception, t_struct)
-  T_CONVERT_UNION(list)
-  T_CONVERT_UNION(set)
-  T_CONVERT_UNION(map)
-  T_CONVERT_UNION(service)
-  else {
-    throw plugin::ThriftPluginError("Type union has no value");
-  }
-#undef T_CONVERT_UNION_N
-#undef T_CONVERT_UNION
-}
-
-THRIFT_CONVERSION(t_scope) {
-#define T_SCOPE_ASSIGN(name, type)                                                                 \
-  boost::copy(from->name##s_ | boost::adaptors::map_values                                         \
-              | boost::adaptors::transformed(&store_type<type>),                                   \
-              std::back_inserter(to.name##s))
-  T_SCOPE_ASSIGN(type, t_type);
-  T_SCOPE_ASSIGN(constant, t_const);
-  T_SCOPE_ASSIGN(service, t_service);
-#undef T_SCOPE_ASSIGN
-}
-
-void get_global_cache(plugin::TypeRegistry& reg) {
-  reg.types = type_cache.cache;
-  reg.constants = const_cache.cache;
-  reg.services = service_cache.cache;
-}
-
-void clear_global_cache() {
-  type_cache.clear();
-  const_cache.clear();
-  service_cache.clear();
-}
-
-THRIFT_CONVERSION(t_program) {
-  THRIFT_ASSIGN_CONVERT(t_scope, scope(), scope);
-  THRIFT_ASSIGN(path);
-  THRIFT_ASSIGN(out_path);
-  THRIFT_ASSIGN(name);
-  THRIFT_ASSIGN(include_prefix);
-  THRIFT_ASSIGN(cpp_includes);
-  THRIFT_ASSIGN(c_includes);
-  THRIFT_ASSIGN(namespaces);
-  THRIFT_ASSIGN_N(is_out_path_absolute(), out_path_is_absolute, );
-  THRIFT_ASSIGN_N(get_namespace(), namespace_, );
-  THRIFT_ASSIGN_LIST_ID(t_type, typedef);
-  THRIFT_ASSIGN_LIST_ID(t_type, enum);
-  THRIFT_ASSIGN_LIST_ID(t_type, object);
-  THRIFT_ASSIGN_LIST_ID(t_const, const);
-  THRIFT_ASSIGN_LIST_ID(t_service, service);
-  THRIFT_ASSIGN_LIST_N(t_program, get_includes(), includes);
-  to.program_id = reinterpret_cast<plugin::t_program_id>(from);
-}
-
-PluginDelegateResult delegateToPlugin(t_program* program, const std::string& options) {
-  std::string language;
-  std::map<std::string, std::string> parsed_options;
-  t_generator::parse_options(options, language, parsed_options);
-  std::string cmd = "thrift-gen-";
-  if (language.find_first_not_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-0123456789")
-      != std::string::npos) {
-    std::cerr << "Invalid language name" << std::endl;
-    return PLUGIN_FAILURE;
-  }
-  cmd.append(language);
-  FILE* fd = THRIFT_POPEN(cmd.c_str());
-  if (fd) {
-#ifdef _WIN32
-    _setmode(fileno(fd), _O_BINARY);
-#endif
-    boost::shared_ptr<TFramedTransport> transport(
-        new TFramedTransport(boost::make_shared<TFDTransport>(fileno(fd))));
-    TBinaryProtocol proto(transport);
-
-    plugin::GeneratorInput input;
-    input.__set_parsed_options(parsed_options);
-    clear_global_cache();
-    convert(program, input.program);
-    get_global_cache(input.type_registry);
-    try {
-      input.write(&proto);
-      transport->flush();
-    } catch (std::exception& err) {
-      std::cerr << "Error while sending data to plugin: " << err.what() << std::endl;
-      THRIFT_PCLOSE(fd);
-      return PLUGIN_FAILURE;
-    }
-
-    // TODO: be prepared for hang or crash of child process
-    int ret = THRIFT_PCLOSE(fd);
-    if (!ret) {
-      return PLUGIN_SUCCEESS;
-    } else {
-      std::cerr << "plugin process returned non zero exit code: " << ret << std::endl;
-      return PLUGIN_FAILURE;
-    }
-  }
-  clear_global_cache();
-  return PLUGIN_NOT_FOUND;
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin_output.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin_output.h
deleted file mode 100644
index eab2d1b..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/plugin_output.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_PLUGIN_PLUGIN_OUTPUT_H
-#define T_PLUGIN_PLUGIN_OUTPUT_H
-
-#include <string>
-
-class t_program;
-
-namespace plugin_output {
-
-enum PluginDelegateResult {
-  PLUGIN_NOT_FOUND,
-  PLUGIN_FAILURE,
-  PLUGIN_SUCCEESS,
-};
-
-PluginDelegateResult delegateToPlugin(t_program* program, const std::string& options);
-}
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/type_util.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/type_util.h
deleted file mode 100644
index 508b741..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/plugin/type_util.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef T_PLUGIN_TYPE_UTIL_H
-#define T_PLUGIN_TYPE_UTIL_H
-
-namespace apache {
-namespace thrift {
-namespace plugin {
-
-template <typename From>
-struct ToType {};
-
-template <typename From>
-typename ToType<From>::type* convert_forward(const From&);
-
-template <typename From, typename To>
-void convert(const From&, To*);
-
-template <typename From>
-typename ToType<From>::type* convert(const From& from);
-
-class TypeRegistry;
-void set_global_cache(const TypeRegistry&);
-}
-}
-}
-
-// conversion from raw compiler types to plugin wire type
-namespace plugin_output {
-
-template <typename From, typename To>
-void convert(From* from, To& to);
-
-template <typename From>
-typename apache::thrift::plugin::ToType<From>::type convert(From* from);
-
-void get_global_cache(apache::thrift::plugin::TypeRegistry&);
-void clear_global_cache();
-}
-
-#define THRIFT_TYPE_MAPPING(TYPE)                                                                  \
-  class TYPE;                                                                                      \
-  namespace apache {                                                                               \
-  namespace thrift {                                                                               \
-  namespace plugin {                                                                               \
-  class TYPE;                                                                                      \
-  template <>                                                                                      \
-  struct ToType< ::TYPE> {                                                                         \
-    typedef TYPE type;                                                                             \
-  };                                                                                               \
-  template <>                                                                                      \
-  struct ToType<TYPE> {                                                                            \
-    typedef ::TYPE type;                                                                           \
-  };                                                                                               \
-  }                                                                                                \
-  }                                                                                                \
-  }
-THRIFT_TYPE_MAPPING(t_base_type)
-THRIFT_TYPE_MAPPING(t_const)
-THRIFT_TYPE_MAPPING(t_const_value)
-THRIFT_TYPE_MAPPING(t_container)
-THRIFT_TYPE_MAPPING(t_doc)
-THRIFT_TYPE_MAPPING(t_enum)
-THRIFT_TYPE_MAPPING(t_enum_value)
-THRIFT_TYPE_MAPPING(t_field)
-THRIFT_TYPE_MAPPING(t_function)
-THRIFT_TYPE_MAPPING(t_list)
-THRIFT_TYPE_MAPPING(t_map)
-THRIFT_TYPE_MAPPING(t_program)
-THRIFT_TYPE_MAPPING(t_scope)
-THRIFT_TYPE_MAPPING(t_service)
-THRIFT_TYPE_MAPPING(t_set)
-THRIFT_TYPE_MAPPING(t_struct)
-THRIFT_TYPE_MAPPING(t_type)
-THRIFT_TYPE_MAPPING(t_typedef)
-#undef THRIFT_TYPE_MAPPING
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/thriftl.ll b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/thriftl.ll
deleted file mode 100644
index bf7e8a5..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/thriftl.ll
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Thrift scanner.
- *
- * Tokenizes a thrift definition file.
- */
-
-%{
-
-/* This is redundant with some of the flags in Makefile.am, but it works
- * when people override CXXFLAGS without being careful. The pragmas are
- * the 'right' way to do it, but don't work on old-enough GCC (in particular
- * the GCC that ship on Mac OS X 10.6.5, *counter* to what the GNU docs say)
- *
- * We should revert the Makefile.am changes once Apple ships a reasonable
- * GCC.
- */
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wunused-label"
-#endif
-
-#ifdef _MSC_VER
-//warning C4102: 'find_rule' : unreferenced label
-#pragma warning(disable:4102)
-//avoid isatty redefinition
-#define YY_NEVER_INTERACTIVE 1
-
-#define YY_NO_UNISTD_H 1
-#endif
-
-#include <cassert>
-#include <string>
-#include <errno.h>
-#include <stdlib.h>
-
-#ifdef _MSC_VER
-#include "thrift/windows/config.h"
-#endif
-#include "thrift/main.h"
-#include "thrift/common.h"
-#include "thrift/globals.h"
-#include "thrift/parse/t_program.h"
-
-/**
- * Must be included AFTER parse/t_program.h, but I can't remember why anymore
- * because I wrote this a while ago.
- */
-#if defined(BISON_USE_PARSER_H_EXTENSION)
-#include "thrift/thrifty.h"
-#else
-#include "thrift/thrifty.hh"
-#endif
-
-void thrift_reserved_keyword(char* keyword) {
-  yyerror("Cannot use reserved language keyword: \"%s\"\n", keyword);
-  exit(1);
-}
-
-void integer_overflow(char* text) {
-  yyerror("This integer is too big: \"%s\"\n", text);
-  exit(1);
-}
-
-void unexpected_token(char* text) {
-  yyerror("Unexpected token in input: \"%s\"\n", text);
-  exit(1);
-}
-
-%}
-
-/**
- * Provides the yylineno global, useful for debugging output
- */
-%option lex-compat
-
-/**
- * Our inputs are all single files, so no need for yywrap
- */
-%option noyywrap
-
-/**
- * We don't use it, and it fires up warnings at -Wall
- */
-%option nounput
-
-/**
- * Helper definitions, comments, constants, and whatnot
- */
-
-intconstant   ([+-]?[0-9]+)
-hexconstant   ([+-]?"0x"[0-9A-Fa-f]+)
-dubconstant   ([+-]?[0-9]*(\.[0-9]+)?([eE][+-]?[0-9]+)?)
-identifier    ([a-zA-Z_](\.[a-zA-Z_0-9]|[a-zA-Z_0-9])*)
-whitespace    ([ \t\r\n]*)
-sillycomm     ("/*""*"*"*/")
-multicm_begin ("/*")
-doctext_begin ("/**")
-comment       ("//"[^\n]*)
-unixcomment   ("#"[^\n]*)
-symbol        ([:;\,\{\}\(\)\=<>\[\]])
-literal_begin (['\"])
-
-%%
-
-{whitespace}         { /* do nothing */                 }
-{sillycomm}          { /* do nothing */                 }
-
-{doctext_begin} {
-  std::string parsed("/**");
-  int state = 0;  // 0 = normal, 1 = "*" seen, "*/" seen
-  while(state < 2)
-  {
-    int ch = yyinput();
-    parsed.push_back(ch);
-    switch (ch) {
-      case EOF:
-        yyerror("Unexpected end of file in doc-comment at %d\n", yylineno);
-        exit(1);
-      case '*':
-        state = 1;
-        break;
-      case '/':
-        state = (state == 1) ? 2 : 0;
-        break;
-      default:
-        state = 0;
-        break;
-    }
-  }
-  pdebug("doctext = \"%s\"\n",parsed.c_str());
-
- /* This does not show up in the parse tree. */
- /* Rather, the parser will grab it out of the global. */
-  if (g_parse_mode == PROGRAM) {
-    clear_doctext();
-    g_doctext = strdup(parsed.c_str() + 3);
-    assert(strlen(g_doctext) >= 2);
-    g_doctext[strlen(g_doctext) - 2] = ' ';
-    g_doctext[strlen(g_doctext) - 1] = '\0';
-    g_doctext = clean_up_doctext(g_doctext);
-    g_doctext_lineno = yylineno;
-    if( (g_program_doctext_candidate == NULL) && (g_program_doctext_status == INVALID)){
-      g_program_doctext_candidate = strdup(g_doctext);
-      g_program_doctext_lineno = g_doctext_lineno;
-      g_program_doctext_status = STILL_CANDIDATE;
-      pdebug("%s","program doctext set to STILL_CANDIDATE");
-    }
-  }
-}
-
-{multicm_begin}  { /* parsed, but thrown away */
-  std::string parsed("/*");
-  int state = 0;  // 0 = normal, 1 = "*" seen, "*/" seen
-  while(state < 2)
-  {
-    int ch = yyinput();
-    parsed.push_back(ch);
-    switch (ch) {
-      case EOF:
-        yyerror("Unexpected end of file in multiline comment at %d\n", yylineno);
-        exit(1);
-      case '*':
-        state = 1;
-        break;
-      case '/':
-        state = (state == 1) ? 2 : 0;
-        break;
-      default:
-        state = 0;
-        break;
-    }
-  }
-  pdebug("multi_comm = \"%s\"\n",parsed.c_str());
-}
-
-{comment}            { /* do nothing */                 }
-{unixcomment}        { /* do nothing */                 }
-
-{symbol}             { return yytext[0];                }
-"*"                  { return yytext[0];                }
-
-"false"              { yylval.iconst=0; return tok_int_constant; }
-"true"               { yylval.iconst=1; return tok_int_constant; }
-
-"namespace"          { return tok_namespace;            }
-"cpp_namespace"      { error_unsupported_namespace_decl("cpp"); /* do nothing */ }
-"cpp_include"        { return tok_cpp_include;          }
-"cpp_type"           { return tok_cpp_type;             }
-"java_package"       { error_unsupported_namespace_decl("java_package", "java"); /* do nothing */ }
-"cocoa_prefix"       { error_unsupported_namespace_decl("cocoa_prefix", "cocoa"); /* do nothing */ }
-"csharp_namespace"   { error_unsupported_namespace_decl("csharp"); /* do nothing */ }
-"delphi_namespace"   { error_unsupported_namespace_decl("delphi"); /* do nothing */ }
-"php_namespace"      { error_unsupported_namespace_decl("php"); /* do nothing */ }
-"py_module"          { error_unsupported_namespace_decl("py_module", "py"); /* do nothing */ }
-"perl_package"       { error_unsupported_namespace_decl("perl_package", "perl"); /* do nothing */ }
-"ruby_namespace"     { error_unsupported_namespace_decl("ruby"); /* do nothing */ }
-"smalltalk_category" { error_unsupported_namespace_decl("smalltalk_category", "smalltalk.category"); /* do nothing */ }
-"smalltalk_prefix"   { error_unsupported_namespace_decl("smalltalk_category", "smalltalk.category"); /* do nothing */ }
-"xsd_all"            { return tok_xsd_all;              }
-"xsd_optional"       { return tok_xsd_optional;         }
-"xsd_nillable"       { return tok_xsd_nillable;         }
-"xsd_namespace"      { error_unsupported_namespace_decl("xsd"); /* do nothing */ }
-"xsd_attrs"          { return tok_xsd_attrs;            }
-"include"            { return tok_include;              }
-"void"               { return tok_void;                 }
-"bool"               { return tok_bool;                 }
-"byte"               {
-  emit_byte_type_warning();
-  return tok_i8;
-}
-"i8"                 { return tok_i8;                   }
-"i16"                { return tok_i16;                  }
-"i32"                { return tok_i32;                  }
-"i64"                { return tok_i64;                  }
-"double"             { return tok_double;               }
-"string"             { return tok_string;               }
-"binary"             { return tok_binary;               }
-"slist" {
-  pwarning(0, "\"slist\" is deprecated and will be removed in a future compiler version.  This type should be replaced with \"string\".\n");
-  return tok_slist;
-}
-"senum" {
-  pwarning(0, "\"senum\" is deprecated and will be removed in a future compiler version.  This type should be replaced with \"string\".\n");
-  return tok_senum;
-}
-"map"                { return tok_map;                  }
-"list"               { return tok_list;                 }
-"set"                { return tok_set;                  }
-"oneway"             { return tok_oneway;               }
-"typedef"            { return tok_typedef;              }
-"struct"             { return tok_struct;               }
-"union"              { return tok_union;                }
-"exception"          { return tok_xception;             }
-"extends"            { return tok_extends;              }
-"throws"             { return tok_throws;               }
-"service"            { return tok_service;              }
-"enum"               { return tok_enum;                 }
-"const"              { return tok_const;                }
-"required"           { return tok_required;             }
-"optional"           { return tok_optional;             }
-"async" {
-  pwarning(0, "\"async\" is deprecated.  It is called \"oneway\" now.\n");
-  return tok_oneway;
-}
-"&"                  { return tok_reference;            }
-
-
-"BEGIN"              { thrift_reserved_keyword(yytext); }
-"END"                { thrift_reserved_keyword(yytext); }
-"__CLASS__"          { thrift_reserved_keyword(yytext); }
-"__DIR__"            { thrift_reserved_keyword(yytext); }
-"__FILE__"           { thrift_reserved_keyword(yytext); }
-"__FUNCTION__"       { thrift_reserved_keyword(yytext); }
-"__LINE__"           { thrift_reserved_keyword(yytext); }
-"__METHOD__"         { thrift_reserved_keyword(yytext); }
-"__NAMESPACE__"      { thrift_reserved_keyword(yytext); }
-"abstract"           { thrift_reserved_keyword(yytext); }
-"alias"              { thrift_reserved_keyword(yytext); }
-"and"                { thrift_reserved_keyword(yytext); }
-"args"               { thrift_reserved_keyword(yytext); }
-"as"                 { thrift_reserved_keyword(yytext); }
-"assert"             { thrift_reserved_keyword(yytext); }
-"begin"              { thrift_reserved_keyword(yytext); }
-"break"              { thrift_reserved_keyword(yytext); }
-"case"               { thrift_reserved_keyword(yytext); }
-"catch"              { thrift_reserved_keyword(yytext); }
-"class"              { thrift_reserved_keyword(yytext); }
-"clone"              { thrift_reserved_keyword(yytext); }
-"continue"           { thrift_reserved_keyword(yytext); }
-"declare"            { thrift_reserved_keyword(yytext); }
-"def"                { thrift_reserved_keyword(yytext); }
-"default"            { thrift_reserved_keyword(yytext); }
-"del"                { thrift_reserved_keyword(yytext); }
-"delete"             { thrift_reserved_keyword(yytext); }
-"do"                 { thrift_reserved_keyword(yytext); }
-"dynamic"            { thrift_reserved_keyword(yytext); }
-"elif"               { thrift_reserved_keyword(yytext); }
-"else"               { thrift_reserved_keyword(yytext); }
-"elseif"             { thrift_reserved_keyword(yytext); }
-"elsif"              { thrift_reserved_keyword(yytext); }
-"end"                { thrift_reserved_keyword(yytext); }
-"enddeclare"         { thrift_reserved_keyword(yytext); }
-"endfor"             { thrift_reserved_keyword(yytext); }
-"endforeach"         { thrift_reserved_keyword(yytext); }
-"endif"              { thrift_reserved_keyword(yytext); }
-"endswitch"          { thrift_reserved_keyword(yytext); }
-"endwhile"           { thrift_reserved_keyword(yytext); }
-"ensure"             { thrift_reserved_keyword(yytext); }
-"except"             { thrift_reserved_keyword(yytext); }
-"exec"               { thrift_reserved_keyword(yytext); }
-"finally"            { thrift_reserved_keyword(yytext); }
-"float"              { thrift_reserved_keyword(yytext); }
-"for"                { thrift_reserved_keyword(yytext); }
-"foreach"            { thrift_reserved_keyword(yytext); }
-"from"               { thrift_reserved_keyword(yytext); }
-"function"           { thrift_reserved_keyword(yytext); }
-"global"             { thrift_reserved_keyword(yytext); }
-"goto"               { thrift_reserved_keyword(yytext); }
-"if"                 { thrift_reserved_keyword(yytext); }
-"implements"         { thrift_reserved_keyword(yytext); }
-"import"             { thrift_reserved_keyword(yytext); }
-"in"                 { thrift_reserved_keyword(yytext); }
-"inline"             { thrift_reserved_keyword(yytext); }
-"instanceof"         { thrift_reserved_keyword(yytext); }
-"interface"          { thrift_reserved_keyword(yytext); }
-"is"                 { thrift_reserved_keyword(yytext); }
-"lambda"             { thrift_reserved_keyword(yytext); }
-"module"             { thrift_reserved_keyword(yytext); }
-"native"             { thrift_reserved_keyword(yytext); }
-"new"                { thrift_reserved_keyword(yytext); }
-"next"               { thrift_reserved_keyword(yytext); }
-"nil"                { thrift_reserved_keyword(yytext); }
-"not"                { thrift_reserved_keyword(yytext); }
-"or"                 { thrift_reserved_keyword(yytext); }
-"package"            { thrift_reserved_keyword(yytext); }
-"pass"               { thrift_reserved_keyword(yytext); }
-"public"             { thrift_reserved_keyword(yytext); }
-"print"              { thrift_reserved_keyword(yytext); }
-"private"            { thrift_reserved_keyword(yytext); }
-"protected"          { thrift_reserved_keyword(yytext); }
-"raise"              { thrift_reserved_keyword(yytext); }
-"redo"               { thrift_reserved_keyword(yytext); }
-"rescue"             { thrift_reserved_keyword(yytext); }
-"retry"              { thrift_reserved_keyword(yytext); }
-"register"           { thrift_reserved_keyword(yytext); }
-"return"             { thrift_reserved_keyword(yytext); }
-"self"               { thrift_reserved_keyword(yytext); }
-"sizeof"             { thrift_reserved_keyword(yytext); }
-"static"             { thrift_reserved_keyword(yytext); }
-"super"              { thrift_reserved_keyword(yytext); }
-"switch"             { thrift_reserved_keyword(yytext); }
-"synchronized"       { thrift_reserved_keyword(yytext); }
-"then"               { thrift_reserved_keyword(yytext); }
-"this"               { thrift_reserved_keyword(yytext); }
-"throw"              { thrift_reserved_keyword(yytext); }
-"transient"          { thrift_reserved_keyword(yytext); }
-"try"                { thrift_reserved_keyword(yytext); }
-"undef"              { thrift_reserved_keyword(yytext); }
-"unless"             { thrift_reserved_keyword(yytext); }
-"unsigned"           { thrift_reserved_keyword(yytext); }
-"until"              { thrift_reserved_keyword(yytext); }
-"use"                { thrift_reserved_keyword(yytext); }
-"var"                { thrift_reserved_keyword(yytext); }
-"virtual"            { thrift_reserved_keyword(yytext); }
-"volatile"           { thrift_reserved_keyword(yytext); }
-"when"               { thrift_reserved_keyword(yytext); }
-"while"              { thrift_reserved_keyword(yytext); }
-"with"               { thrift_reserved_keyword(yytext); }
-"xor"                { thrift_reserved_keyword(yytext); }
-"yield"              { thrift_reserved_keyword(yytext); }
-
-{intconstant} {
-  errno = 0;
-  yylval.iconst = strtoll(yytext, NULL, 10);
-  if (errno == ERANGE) {
-    integer_overflow(yytext);
-  }
-  return tok_int_constant;
-}
-
-{hexconstant} {
-  errno = 0;
-  char sign = yytext[0];
-  int shift = sign == '0' ? 2 : 3;
-  yylval.iconst = strtoll(yytext+shift, NULL, 16);
-  if (sign == '-') {
-    yylval.iconst = -yylval.iconst;
-  }
-  if (errno == ERANGE) {
-    integer_overflow(yytext);
-  }
-  return tok_int_constant;
-}
-
-{identifier} {
-  yylval.id = strdup(yytext);
-  return tok_identifier;
-}
-
-{dubconstant} {
- /* Deliberately placed after identifier, since "e10" is NOT a double literal (THRIFT-3477) */
-  yylval.dconst = atof(yytext);
-  return tok_dub_constant;
-}
-
-{literal_begin} {
-  char mark = yytext[0];
-  std::string result;
-  for(;;)
-  {
-    int ch = yyinput();
-    switch (ch) {
-      case EOF:
-        yyerror("End of file while read string at %d\n", yylineno);
-        exit(1);
-      case '\n':
-        yyerror("End of line while read string at %d\n", yylineno - 1);
-        exit(1);
-      case '\\':
-        ch = yyinput();
-        switch (ch) {
-          case 'r':
-            result.push_back('\r');
-            continue;
-          case 'n':
-            result.push_back('\n');
-            continue;
-          case 't':
-            result.push_back('\t');
-            continue;
-          case '"':
-            result.push_back('"');
-            continue;
-          case '\'':
-            result.push_back('\'');
-            continue;
-          case '\\':
-            result.push_back('\\');
-            continue;
-          default:
-            yyerror("Bad escape character\n");
-            return -1;
-        }
-        break;
-      default:
-        if (ch == mark) {
-          yylval.id = strdup(result.c_str());
-          return tok_literal;
-        } else {
-          result.push_back(ch);
-        }
-    }
-  }
-}
-
-
-. {
-  unexpected_token(yytext);
-}
-
-%%
-
-/* vim: filetype=lex
-*/
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/thrifty.yy b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/thrifty.yy
deleted file mode 100644
index b7a7f72..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/thrifty.yy
+++ /dev/null
@@ -1,1193 +0,0 @@
-%{
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Thrift parser.
- *
- * This parser is used on a thrift definition file.
- *
- */
-
-#define __STDC_LIMIT_MACROS
-#define __STDC_FORMAT_MACROS
-#include <stdio.h>
-#ifndef _MSC_VER
-#include <inttypes.h>
-#else
-#include <stdint.h>
-#endif
-#include <limits.h>
-#ifdef _MSC_VER
-#include "thrift/windows/config.h"
-#endif
-#include "thrift/main.h"
-#include "thrift/common.h"
-#include "thrift/globals.h"
-#include "thrift/parse/t_program.h"
-#include "thrift/parse/t_scope.h"
-
-#ifdef _MSC_VER
-//warning C4065: switch statement contains 'default' but no 'case' labels
-#pragma warning(disable:4065)
-#endif
-
-/**
- * This global variable is used for automatic numbering of field indices etc.
- * when parsing the members of a struct. Field values are automatically
- * assigned starting from -1 and working their way down.
- */
-int y_field_val = -1;
-/**
- * This global variable is used for automatic numbering of enum values.
- * y_enum_val is the last value assigned; the next auto-assigned value will be
- * y_enum_val+1, and then it continues working upwards.  Explicitly specified
- * enum values reset y_enum_val to that value.
- */
-int32_t y_enum_val = -1;
-int g_arglist = 0;
-const int struct_is_struct = 0;
-const int struct_is_union = 1;
-
-%}
-
-/**
- * This structure is used by the parser to hold the data types associated with
- * various parse nodes.
- */
-%union {
-  char*          id;
-  int64_t        iconst;
-  double         dconst;
-  bool           tbool;
-  t_doc*         tdoc;
-  t_type*        ttype;
-  t_base_type*   tbase;
-  t_typedef*     ttypedef;
-  t_enum*        tenum;
-  t_enum_value*  tenumv;
-  t_const*       tconst;
-  t_const_value* tconstv;
-  t_struct*      tstruct;
-  t_service*     tservice;
-  t_function*    tfunction;
-  t_field*       tfield;
-  char*          dtext;
-  t_field::e_req ereq;
-  t_annotation*  tannot;
-  t_field_id     tfieldid;
-}
-
-/**
- * Strings identifier
- */
-%token<id>     tok_identifier
-%token<id>     tok_literal
-%token<dtext>  tok_doctext
-
-/**
- * Constant values
- */
-%token<iconst> tok_int_constant
-%token<dconst> tok_dub_constant
-
-/**
- * Header keywords
- */
-%token tok_include
-%token tok_namespace
-%token tok_cpp_include
-%token tok_cpp_type
-%token tok_xsd_all
-%token tok_xsd_optional
-%token tok_xsd_nillable
-%token tok_xsd_attrs
-
-/**
- * Base datatype keywords
- */
-%token tok_void
-%token tok_bool
-%token tok_string
-%token tok_binary
-%token tok_slist
-%token tok_senum
-%token tok_i8
-%token tok_i16
-%token tok_i32
-%token tok_i64
-%token tok_double
-
-/**
- * Complex type keywords
- */
-%token tok_map
-%token tok_list
-%token tok_set
-
-/**
- * Function modifiers
- */
-%token tok_oneway
-
-/**
- * Thrift language keywords
- */
-%token tok_typedef
-%token tok_struct
-%token tok_xception
-%token tok_throws
-%token tok_extends
-%token tok_service
-%token tok_enum
-%token tok_const
-%token tok_required
-%token tok_optional
-%token tok_union
-%token tok_reference
-
-/**
- * Grammar nodes
- */
-
-%type<ttype>     BaseType
-%type<ttype>     SimpleBaseType
-%type<ttype>     ContainerType
-%type<ttype>     SimpleContainerType
-%type<ttype>     MapType
-%type<ttype>     SetType
-%type<ttype>     ListType
-
-%type<tdoc>      Definition
-%type<ttype>     TypeDefinition
-
-%type<ttypedef>  Typedef
-
-%type<ttype>     TypeAnnotations
-%type<ttype>     TypeAnnotationList
-%type<tannot>    TypeAnnotation
-%type<id>        TypeAnnotationValue
-
-%type<tfield>    Field
-%type<tfieldid>  FieldIdentifier
-%type<ereq>      FieldRequiredness
-%type<ttype>     FieldType
-%type<tconstv>   FieldValue
-%type<tstruct>   FieldList
-%type<tbool>     FieldReference
-
-%type<tenum>     Enum
-%type<tenum>     EnumDefList
-%type<tenumv>    EnumDef
-%type<tenumv>    EnumValue
-
-%type<ttypedef>  Senum
-%type<tbase>     SenumDefList
-%type<id>        SenumDef
-
-%type<tconst>    Const
-%type<tconstv>   ConstValue
-%type<tconstv>   ConstList
-%type<tconstv>   ConstListContents
-%type<tconstv>   ConstMap
-%type<tconstv>   ConstMapContents
-
-%type<iconst>    StructHead
-%type<tstruct>   Struct
-%type<tstruct>   Xception
-%type<tservice>  Service
-
-%type<tfunction> Function
-%type<ttype>     FunctionType
-%type<tservice>  FunctionList
-
-%type<tstruct>   Throws
-%type<tservice>  Extends
-%type<tbool>     Oneway
-%type<tbool>     XsdAll
-%type<tbool>     XsdOptional
-%type<tbool>     XsdNillable
-%type<tstruct>   XsdAttributes
-%type<id>        CppType
-
-%type<dtext>     CaptureDocText
-
-%%
-
-/**
- * Thrift Grammar Implementation.
- *
- * For the most part this source file works its way top down from what you
- * might expect to find in a typical .thrift file, i.e. type definitions and
- * namespaces up top followed by service definitions using those types.
- */
-
-Program:
-  HeaderList DefinitionList
-    {
-      pdebug("Program -> Headers DefinitionList");
-      if((g_program_doctext_candidate != NULL) && (g_program_doctext_status != ALREADY_PROCESSED))
-      {
-        g_program->set_doc(g_program_doctext_candidate);
-        g_program_doctext_status = ALREADY_PROCESSED;
-      }
-      clear_doctext();
-    }
-
-CaptureDocText:
-    {
-      if (g_parse_mode == PROGRAM) {
-        $$ = g_doctext;
-        g_doctext = NULL;
-      } else {
-        $$ = NULL;
-      }
-    }
-
-/* TODO(dreiss): Try to DestroyDocText in all sorts or random places. */
-DestroyDocText:
-    {
-      if (g_parse_mode == PROGRAM) {
-        clear_doctext();
-      }
-    }
-
-/* We have to DestroyDocText here, otherwise it catches the doctext
-   on the first real element. */
-HeaderList:
-  HeaderList DestroyDocText Header
-    {
-      pdebug("HeaderList -> HeaderList Header");
-    }
-|
-    {
-      pdebug("HeaderList -> ");
-    }
-
-Header:
-  Include
-    {
-      pdebug("Header -> Include");
-    }
-| tok_namespace tok_identifier tok_identifier TypeAnnotations
-    {
-      pdebug("Header -> tok_namespace tok_identifier tok_identifier");
-      declare_valid_program_doctext();
-      if (g_parse_mode == PROGRAM) {
-        g_program->set_namespace($2, $3);
-      }
-      if ($4 != NULL) {
-        g_program->set_namespace_annotations($2, $4->annotations_);
-        delete $4;
-      }
-    }
-| tok_namespace '*' tok_identifier
-    {
-      pdebug("Header -> tok_namespace * tok_identifier");
-      declare_valid_program_doctext();
-      if (g_parse_mode == PROGRAM) {
-        g_program->set_namespace("*", $3);
-      }
-    }
-| tok_cpp_include tok_literal
-    {
-      pdebug("Header -> tok_cpp_include tok_literal");
-      declare_valid_program_doctext();
-      if (g_parse_mode == PROGRAM) {
-        g_program->add_cpp_include($2);
-      }
-    }
-
-Include:
-  tok_include tok_literal
-    {
-      pdebug("Include -> tok_include tok_literal");
-      declare_valid_program_doctext();
-      if (g_parse_mode == INCLUDES) {
-        std::string path = include_file(std::string($2));
-        if (!path.empty()) {
-          g_program->add_include(path, std::string($2));
-        }
-      }
-    }
-
-DefinitionList:
-  DefinitionList CaptureDocText Definition
-    {
-      pdebug("DefinitionList -> DefinitionList Definition");
-      if ($2 != NULL && $3 != NULL) {
-        $3->set_doc($2);
-      }
-    }
-|
-    {
-      pdebug("DefinitionList -> ");
-    }
-
-Definition:
-  Const
-    {
-      pdebug("Definition -> Const");
-      if (g_parse_mode == PROGRAM) {
-        g_program->add_const($1);
-      }
-      $$ = $1;
-    }
-| TypeDefinition
-    {
-      pdebug("Definition -> TypeDefinition");
-      if (g_parse_mode == PROGRAM) {
-        g_scope->add_type($1->get_name(), $1);
-        if (g_parent_scope != NULL) {
-          g_parent_scope->add_type(g_parent_prefix + $1->get_name(), $1);
-        }
-        if (! g_program->is_unique_typename($1)) {
-          yyerror("Type \"%s\" is already defined.", $1->get_name().c_str());
-          exit(1);
-        }
-      }
-      $$ = $1;
-    }
-| Service
-    {
-      pdebug("Definition -> Service");
-      if (g_parse_mode == PROGRAM) {
-        g_scope->add_service($1->get_name(), $1);
-        if (g_parent_scope != NULL) {
-          g_parent_scope->add_service(g_parent_prefix + $1->get_name(), $1);
-        }
-        g_program->add_service($1);
-        if (! g_program->is_unique_typename($1)) {
-          yyerror("Type \"%s\" is already defined.", $1->get_name().c_str());
-          exit(1);
-        }
-      }
-      $$ = $1;
-    }
-
-TypeDefinition:
-  Typedef
-    {
-      pdebug("TypeDefinition -> Typedef");
-      if (g_parse_mode == PROGRAM) {
-        g_program->add_typedef($1);
-      }
-    }
-| Enum
-    {
-      pdebug("TypeDefinition -> Enum");
-      if (g_parse_mode == PROGRAM) {
-        g_program->add_enum($1);
-      }
-    }
-| Senum
-    {
-      pdebug("TypeDefinition -> Senum");
-      if (g_parse_mode == PROGRAM) {
-        g_program->add_typedef($1);
-      }
-    }
-| Struct
-    {
-      pdebug("TypeDefinition -> Struct");
-      if (g_parse_mode == PROGRAM) {
-        g_program->add_struct($1);
-      }
-    }
-| Xception
-    {
-      pdebug("TypeDefinition -> Xception");
-      if (g_parse_mode == PROGRAM) {
-        g_program->add_xception($1);
-      }
-    }
-
-CommaOrSemicolonOptional:
-  ','
-    {}
-| ';'
-    {}
-|
-    {}
-
-Typedef:
-  tok_typedef FieldType tok_identifier TypeAnnotations CommaOrSemicolonOptional
-    {
-      pdebug("TypeDef -> tok_typedef FieldType tok_identifier");
-      validate_simple_identifier( $3);
-      t_typedef *td = new t_typedef(g_program, $2, $3);
-      $$ = td;
-      if ($4 != NULL) {
-        $$->annotations_ = $4->annotations_;
-        delete $4;
-      }
-    }
-
-Enum:
-  tok_enum tok_identifier '{' EnumDefList '}' TypeAnnotations
-    {
-      pdebug("Enum -> tok_enum tok_identifier { EnumDefList }");
-      $$ = $4;
-      validate_simple_identifier( $2);
-      $$->set_name($2);
-      if ($6 != NULL) {
-        $$->annotations_ = $6->annotations_;
-        delete $6;
-      }
-
-      // make constants for all the enum values
-      if (g_parse_mode == PROGRAM) {
-        const std::vector<t_enum_value*>& enum_values = $$->get_constants();
-        std::vector<t_enum_value*>::const_iterator c_iter;
-        for (c_iter = enum_values.begin(); c_iter != enum_values.end(); ++c_iter) {
-          std::string const_name = $$->get_name() + "." + (*c_iter)->get_name();
-          t_const_value* const_val = new t_const_value((*c_iter)->get_value());
-          const_val->set_enum($$);
-          g_scope->add_constant(const_name, new t_const(g_type_i32, (*c_iter)->get_name(), const_val));
-          if (g_parent_scope != NULL) {
-            g_parent_scope->add_constant(g_parent_prefix + const_name, new t_const(g_type_i32, (*c_iter)->get_name(), const_val));
-          }
-        }
-      }
-    }
-
-EnumDefList:
-  EnumDefList EnumDef
-    {
-      pdebug("EnumDefList -> EnumDefList EnumDef");
-      $$ = $1;
-      $$->append($2);
-    }
-|
-    {
-      pdebug("EnumDefList -> ");
-      $$ = new t_enum(g_program);
-      y_enum_val = -1;
-    }
-
-EnumDef:
-  CaptureDocText EnumValue TypeAnnotations CommaOrSemicolonOptional
-    {
-      pdebug("EnumDef -> EnumValue");
-      $$ = $2;
-      if ($1 != NULL) {
-        $$->set_doc($1);
-      }
-	  if ($3 != NULL) {
-        $$->annotations_ = $3->annotations_;
-        delete $3;
-      }
-    }
-
-EnumValue:
-  tok_identifier '=' tok_int_constant
-    {
-      pdebug("EnumValue -> tok_identifier = tok_int_constant");
-      if ($3 < INT32_MIN || $3 > INT32_MAX) {
-        // Note: this used to be just a warning.  However, since thrift always
-        // treats enums as i32 values, I'm changing it to a fatal error.
-        // I doubt this will affect many people, but users who run into this
-        // will have to update their thrift files to manually specify the
-        // truncated i32 value that thrift has always been using anyway.
-        failure("64-bit value supplied for enum %s will be truncated.", $1);
-      }
-      y_enum_val = static_cast<int32_t>($3);
-      $$ = new t_enum_value($1, y_enum_val);
-    }
- |
-  tok_identifier
-    {
-      pdebug("EnumValue -> tok_identifier");
-      validate_simple_identifier( $1);
-      if (y_enum_val == INT32_MAX) {
-        failure("enum value overflow at enum %s", $1);
-      }
-      ++y_enum_val;
-      $$ = new t_enum_value($1, y_enum_val);
-    }
-
-Senum:
-  tok_senum tok_identifier '{' SenumDefList '}' TypeAnnotations
-    {
-      pdebug("Senum -> tok_senum tok_identifier { SenumDefList }");
-      validate_simple_identifier( $2);
-      $$ = new t_typedef(g_program, $4, $2);
-      if ($6 != NULL) {
-        $$->annotations_ = $6->annotations_;
-        delete $6;
-      }
-    }
-
-SenumDefList:
-  SenumDefList SenumDef
-    {
-      pdebug("SenumDefList -> SenumDefList SenumDef");
-      $$ = $1;
-      $$->add_string_enum_val($2);
-    }
-|
-    {
-      pdebug("SenumDefList -> ");
-      $$ = new t_base_type("string", t_base_type::TYPE_STRING);
-      $$->set_string_enum(true);
-    }
-
-SenumDef:
-  tok_literal CommaOrSemicolonOptional
-    {
-      pdebug("SenumDef -> tok_literal");
-      $$ = $1;
-    }
-
-Const:
-  tok_const FieldType tok_identifier '=' ConstValue CommaOrSemicolonOptional
-    {
-      pdebug("Const -> tok_const FieldType tok_identifier = ConstValue");
-      if (g_parse_mode == PROGRAM) {
-        validate_simple_identifier( $3);
-        g_scope->resolve_const_value($5, $2);
-        $$ = new t_const($2, $3, $5);
-        validate_const_type($$);
-
-        g_scope->add_constant($3, $$);
-        if (g_parent_scope != NULL) {
-          g_parent_scope->add_constant(g_parent_prefix + $3, $$);
-        }
-      } else {
-        $$ = NULL;
-      }
-    }
-
-ConstValue:
-  tok_int_constant
-    {
-      pdebug("ConstValue => tok_int_constant");
-      $$ = new t_const_value();
-      $$->set_integer($1);
-      if (!g_allow_64bit_consts && ($1 < INT32_MIN || $1 > INT32_MAX)) {
-        pwarning(1, "64-bit constant \"%" PRIi64"\" may not work in all languages.\n", $1);
-      }
-    }
-| tok_dub_constant
-    {
-      pdebug("ConstValue => tok_dub_constant");
-      $$ = new t_const_value();
-      $$->set_double($1);
-    }
-| tok_literal
-    {
-      pdebug("ConstValue => tok_literal");
-      $$ = new t_const_value($1);
-    }
-| tok_identifier
-    {
-      pdebug("ConstValue => tok_identifier");
-      $$ = new t_const_value();
-      $$->set_identifier($1);
-    }
-| ConstList
-    {
-      pdebug("ConstValue => ConstList");
-      $$ = $1;
-    }
-| ConstMap
-    {
-      pdebug("ConstValue => ConstMap");
-      $$ = $1;
-    }
-
-ConstList:
-  '[' ConstListContents ']'
-    {
-      pdebug("ConstList => [ ConstListContents ]");
-      $$ = $2;
-    }
-
-ConstListContents:
-  ConstListContents ConstValue CommaOrSemicolonOptional
-    {
-      pdebug("ConstListContents => ConstListContents ConstValue CommaOrSemicolonOptional");
-      $$ = $1;
-      $$->add_list($2);
-    }
-|
-    {
-      pdebug("ConstListContents =>");
-      $$ = new t_const_value();
-      $$->set_list();
-    }
-
-ConstMap:
-  '{' ConstMapContents '}'
-    {
-      pdebug("ConstMap => { ConstMapContents }");
-      $$ = $2;
-    }
-
-ConstMapContents:
-  ConstMapContents ConstValue ':' ConstValue CommaOrSemicolonOptional
-    {
-      pdebug("ConstMapContents => ConstMapContents ConstValue CommaOrSemicolonOptional");
-      $$ = $1;
-      $$->add_map($2, $4);
-    }
-|
-    {
-      pdebug("ConstMapContents =>");
-      $$ = new t_const_value();
-      $$->set_map();
-    }
-
-StructHead:
-  tok_struct
-    {
-      $$ = struct_is_struct;
-    }
-| tok_union
-    {
-      $$ = struct_is_union;
-    }
-
-Struct:
-  StructHead tok_identifier XsdAll '{' FieldList '}' TypeAnnotations
-    {
-      pdebug("Struct -> tok_struct tok_identifier { FieldList }");
-      validate_simple_identifier( $2);
-      $5->set_xsd_all($3);
-      $5->set_union($1 == struct_is_union);
-      $$ = $5;
-      $$->set_name($2);
-      if ($7 != NULL) {
-        $$->annotations_ = $7->annotations_;
-        delete $7;
-      }
-    }
-
-XsdAll:
-  tok_xsd_all
-    {
-      $$ = true;
-    }
-|
-    {
-      $$ = false;
-    }
-
-XsdOptional:
-  tok_xsd_optional
-    {
-      $$ = true;
-    }
-|
-    {
-      $$ = false;
-    }
-
-XsdNillable:
-  tok_xsd_nillable
-    {
-      $$ = true;
-    }
-|
-    {
-      $$ = false;
-    }
-
-XsdAttributes:
-  tok_xsd_attrs '{' FieldList '}'
-    {
-      $$ = $3;
-    }
-|
-    {
-      $$ = NULL;
-    }
-
-Xception:
-  tok_xception tok_identifier '{' FieldList '}' TypeAnnotations
-    {
-      pdebug("Xception -> tok_xception tok_identifier { FieldList }");
-      validate_simple_identifier( $2);
-      $4->set_name($2);
-      $4->set_xception(true);
-      $$ = $4;
-      if ($6 != NULL) {
-        $$->annotations_ = $6->annotations_;
-        delete $6;
-      }
-    }
-
-Service:
-  tok_service tok_identifier Extends '{' FlagArgs FunctionList UnflagArgs '}' TypeAnnotations
-    {
-      pdebug("Service -> tok_service tok_identifier { FunctionList }");
-      validate_simple_identifier( $2);
-      $$ = $6;
-      $$->set_name($2);
-      $$->set_extends($3);
-      if ($9 != NULL) {
-        $$->annotations_ = $9->annotations_;
-        delete $9;
-      }
-    }
-
-FlagArgs:
-    {
-       g_arglist = 1;
-    }
-
-UnflagArgs:
-    {
-       g_arglist = 0;
-    }
-
-Extends:
-  tok_extends tok_identifier
-    {
-      pdebug("Extends -> tok_extends tok_identifier");
-      $$ = NULL;
-      if (g_parse_mode == PROGRAM) {
-        $$ = g_scope->get_service($2);
-        if ($$ == NULL) {
-          yyerror("Service \"%s\" has not been defined.", $2);
-          exit(1);
-        }
-      }
-    }
-|
-    {
-      $$ = NULL;
-    }
-
-FunctionList:
-  FunctionList Function
-    {
-      pdebug("FunctionList -> FunctionList Function");
-      $$ = $1;
-      $1->add_function($2);
-    }
-|
-    {
-      pdebug("FunctionList -> ");
-      $$ = new t_service(g_program);
-    }
-
-Function:
-  CaptureDocText Oneway FunctionType tok_identifier '(' FieldList ')' Throws TypeAnnotations CommaOrSemicolonOptional
-    {
-      validate_simple_identifier( $4);
-      $6->set_name(std::string($4) + "_args");
-      $$ = new t_function($3, $4, $6, $8, $2);
-      if ($1 != NULL) {
-        $$->set_doc($1);
-      }
-      if ($9 != NULL) {
-        $$->annotations_ = $9->annotations_;
-        delete $9;
-      }
-    }
-
-Oneway:
-  tok_oneway
-    {
-      $$ = true;
-    }
-|
-    {
-      $$ = false;
-    }
-
-Throws:
-  tok_throws '(' FieldList ')'
-    {
-      pdebug("Throws -> tok_throws ( FieldList )");
-      $$ = $3;
-      if (g_parse_mode == PROGRAM && !validate_throws($$)) {
-        yyerror("Throws clause may not contain non-exception types");
-        exit(1);
-      }
-    }
-|
-    {
-      $$ = new t_struct(g_program);
-    }
-
-FieldList:
-  FieldList Field
-    {
-      pdebug("FieldList -> FieldList , Field");
-      $$ = $1;
-      if (!($$->append($2))) {
-        yyerror("\"%d: %s\" - field identifier/name has already been used", $2->get_key(), $2->get_name().c_str());
-        exit(1);
-      }
-    }
-|
-    {
-      pdebug("FieldList -> ");
-      y_field_val = -1;
-      $$ = new t_struct(g_program);
-    }
-
-Field:
-  CaptureDocText FieldIdentifier FieldRequiredness FieldType FieldReference tok_identifier FieldValue XsdOptional XsdNillable XsdAttributes TypeAnnotations CommaOrSemicolonOptional
-    {
-      pdebug("tok_int_constant : Field -> FieldType tok_identifier");
-      if ($2.auto_assigned) {
-        pwarning(1, "No field key specified for %s, resulting protocol may have conflicts or not be backwards compatible!\n", $6);
-        if (g_strict >= 192) {
-          yyerror("Implicit field keys are deprecated and not allowed with -strict");
-          exit(1);
-        }
-      }
-      validate_simple_identifier($6);
-      $$ = new t_field($4, $6, $2.value);
-      $$->set_reference($5);
-      $$->set_req($3);
-      if ($7 != NULL) {
-        g_scope->resolve_const_value($7, $4);
-        validate_field_value($$, $7);
-        $$->set_value($7);
-      }
-      $$->set_xsd_optional($8);
-      $$->set_xsd_nillable($9);
-      if ($1 != NULL) {
-        $$->set_doc($1);
-      }
-      if ($10 != NULL) {
-        $$->set_xsd_attrs($10);
-      }
-      if ($11 != NULL) {
-        $$->annotations_ = $11->annotations_;
-        delete $11;
-      }
-    }
-
-FieldIdentifier:
-  tok_int_constant ':'
-    {
-      if ($1 <= 0) {
-        if (g_allow_neg_field_keys) {
-          /*
-           * g_allow_neg_field_keys exists to allow users to add explicitly
-           * specified key values to old .thrift files without breaking
-           * protocol compatibility.
-           */
-          if ($1 != y_field_val) {
-            /*
-             * warn if the user-specified negative value isn't what
-             * thrift would have auto-assigned.
-             */
-            pwarning(1, "Nonpositive field key (%" PRIi64") differs from what would be "
-                     "auto-assigned by thrift (%d).\n", $1, y_field_val);
-          }
-          /*
-           * Leave $1 as-is, and update y_field_val to be one less than $1.
-           * The FieldList parsing will catch any duplicate key values.
-           */
-          y_field_val = static_cast<int32_t>($1 - 1);
-          $$.value = static_cast<int32_t>($1);
-          $$.auto_assigned = false;
-        } else {
-          pwarning(1, "Nonpositive value (%d) not allowed as a field key.\n",
-                   $1);
-          $$.value = y_field_val--;
-          $$.auto_assigned = true;
-        }
-      } else {
-        $$.value = static_cast<int32_t>($1);
-        $$.auto_assigned = false;
-      }
-      if( (SHRT_MIN > $$.value) || ($$.value > SHRT_MAX)) {
-        pwarning(1, "Field key (%d) exceeds allowed range (%d..%d).\n",
-                 $$.value, SHRT_MIN, SHRT_MAX);
-      }
-    }
-|
-    {
-      $$.value = y_field_val--;
-      $$.auto_assigned = true;
-      if( (SHRT_MIN > $$.value) || ($$.value > SHRT_MAX)) {
-        pwarning(1, "Field key (%d) exceeds allowed range (%d..%d).\n",
-                 $$.value, SHRT_MIN, SHRT_MAX);
-      }
-    }
-
-FieldReference:
-  tok_reference
-    {
-      $$ = true;
-    }
-|
-   {
-     $$ = false;
-   }
-
-FieldRequiredness:
-  tok_required
-    {
-      $$ = t_field::T_REQUIRED;
-    }
-| tok_optional
-    {
-      if (g_arglist) {
-        if (g_parse_mode == PROGRAM) {
-          pwarning(1, "optional keyword is ignored in argument lists.\n");
-        }
-        $$ = t_field::T_OPT_IN_REQ_OUT;
-      } else {
-        $$ = t_field::T_OPTIONAL;
-      }
-    }
-|
-    {
-      $$ = t_field::T_OPT_IN_REQ_OUT;
-    }
-
-FieldValue:
-  '=' ConstValue
-    {
-      if (g_parse_mode == PROGRAM) {
-        $$ = $2;
-      } else {
-        $$ = NULL;
-      }
-    }
-|
-    {
-      $$ = NULL;
-    }
-
-FunctionType:
-  FieldType
-    {
-      pdebug("FunctionType -> FieldType");
-      $$ = $1;
-    }
-| tok_void
-    {
-      pdebug("FunctionType -> tok_void");
-      $$ = g_type_void;
-    }
-
-FieldType:
-  tok_identifier
-    {
-      pdebug("FieldType -> tok_identifier");
-      if (g_parse_mode == INCLUDES) {
-        // Ignore identifiers in include mode
-        $$ = NULL;
-      } else {
-        // Lookup the identifier in the current scope
-        $$ = g_scope->get_type($1);
-        if ($$ == NULL) {
-          /*
-           * Either this type isn't yet declared, or it's never
-             declared.  Either way allow it and we'll figure it out
-             during generation.
-           */
-          $$ = new t_typedef(g_program, $1, true);
-        }
-      }
-    }
-| BaseType
-    {
-      pdebug("FieldType -> BaseType");
-      $$ = $1;
-    }
-| ContainerType
-    {
-      pdebug("FieldType -> ContainerType");
-      $$ = $1;
-    }
-
-BaseType: SimpleBaseType TypeAnnotations
-    {
-      pdebug("BaseType -> SimpleBaseType TypeAnnotations");
-      if ($2 != NULL) {
-        $$ = new t_base_type(*static_cast<t_base_type*>($1));
-        $$->annotations_ = $2->annotations_;
-        delete $2;
-      } else {
-        $$ = $1;
-      }
-    }
-
-SimpleBaseType:
-  tok_string
-    {
-      pdebug("BaseType -> tok_string");
-      $$ = g_type_string;
-    }
-| tok_binary
-    {
-      pdebug("BaseType -> tok_binary");
-      $$ = g_type_binary;
-    }
-| tok_slist
-    {
-      pdebug("BaseType -> tok_slist");
-      $$ = g_type_slist;
-    }
-| tok_bool
-    {
-      pdebug("BaseType -> tok_bool");
-      $$ = g_type_bool;
-    }
-| tok_i8
-    {
-      pdebug("BaseType -> tok_i8");
-      $$ = g_type_i8;
-    }
-| tok_i16
-    {
-      pdebug("BaseType -> tok_i16");
-      $$ = g_type_i16;
-    }
-| tok_i32
-    {
-      pdebug("BaseType -> tok_i32");
-      $$ = g_type_i32;
-    }
-| tok_i64
-    {
-      pdebug("BaseType -> tok_i64");
-      $$ = g_type_i64;
-    }
-| tok_double
-    {
-      pdebug("BaseType -> tok_double");
-      $$ = g_type_double;
-    }
-
-ContainerType: SimpleContainerType TypeAnnotations
-    {
-      pdebug("ContainerType -> SimpleContainerType TypeAnnotations");
-      $$ = $1;
-      if ($2 != NULL) {
-        $$->annotations_ = $2->annotations_;
-        delete $2;
-      }
-    }
-
-SimpleContainerType:
-  MapType
-    {
-      pdebug("SimpleContainerType -> MapType");
-      $$ = $1;
-    }
-| SetType
-    {
-      pdebug("SimpleContainerType -> SetType");
-      $$ = $1;
-    }
-| ListType
-    {
-      pdebug("SimpleContainerType -> ListType");
-      $$ = $1;
-    }
-
-MapType:
-  tok_map CppType '<' FieldType ',' FieldType '>'
-    {
-      pdebug("MapType -> tok_map <FieldType, FieldType>");
-      $$ = new t_map($4, $6);
-      if ($2 != NULL) {
-        ((t_container*)$$)->set_cpp_name(std::string($2));
-      }
-    }
-
-SetType:
-  tok_set CppType '<' FieldType '>'
-    {
-      pdebug("SetType -> tok_set<FieldType>");
-      $$ = new t_set($4);
-      if ($2 != NULL) {
-        ((t_container*)$$)->set_cpp_name(std::string($2));
-      }
-    }
-
-ListType:
-  tok_list '<' FieldType '>' CppType
-    {
-      pdebug("ListType -> tok_list<FieldType>");
-      check_for_list_of_bytes($3);
-      $$ = new t_list($3);
-      if ($5 != NULL) {
-        ((t_container*)$$)->set_cpp_name(std::string($5));
-      }
-    }
-
-CppType:
-  tok_cpp_type tok_literal
-    {
-      $$ = $2;
-    }
-|
-    {
-      $$ = NULL;
-    }
-
-TypeAnnotations:
-  '(' TypeAnnotationList ')'
-    {
-      pdebug("TypeAnnotations -> ( TypeAnnotationList )");
-      $$ = $2;
-    }
-|
-    {
-      $$ = NULL;
-    }
-
-TypeAnnotationList:
-  TypeAnnotationList TypeAnnotation
-    {
-      pdebug("TypeAnnotationList -> TypeAnnotationList , TypeAnnotation");
-      $$ = $1;
-      $$->annotations_[$2->key] = $2->val;
-      delete $2;
-    }
-|
-    {
-      /* Just use a dummy structure to hold the annotations. */
-      $$ = new t_struct(g_program);
-    }
-
-TypeAnnotation:
-  tok_identifier TypeAnnotationValue CommaOrSemicolonOptional
-    {
-      pdebug("TypeAnnotation -> TypeAnnotationValue");
-      $$ = new t_annotation;
-      $$->key = $1;
-      $$->val = $2;
-    }
-
-TypeAnnotationValue:
-  '=' tok_literal
-    {
-      pdebug("TypeAnnotationValue -> = tok_literal");
-      $$ = $2;
-    }
-|
-    {
-      pdebug("TypeAnnotationValue ->");
-      $$ = strdup("1");
-    }
-
-%%
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/version.h.in b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/version.h.in
deleted file mode 100644
index aef076f..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/version.h.in
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_VERSION_H_
-#define _THRIFT_VERSION_H_ 1
-
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#pragma once
-#endif // _MSC_VER
-
-#define THRIFT_VERSION "@PACKAGE_VERSION@"
-
-#endif // _THRIFT_VERSION_H_
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/windows/config.h b/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/windows/config.h
deleted file mode 100644
index 5f057ca..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/src/thrift/windows/config.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_WINDOWS_CONFIG_H_
-#define _THRIFT_WINDOWS_CONFIG_H_ 1
-
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#pragma once
-#endif // _MSC_VER
-
-#ifndef _WIN32
-#error "This is a Windows header only"
-#endif
-
-#include <io.h>
-#include <stdlib.h>
-#include <direct.h>
-
-#define strtoll(begin_ptr, end_ptr, length) _strtoi64(begin_ptr, end_ptr, length)
-
-#define PRIu64 "I64d"
-#define PRIi64 "I64d"
-
-// squelch deprecation warnings
-#pragma warning(disable : 4996)
-// squelch bool conversion performance warning
-#pragma warning(disable : 4800)
-
-// MSVC10 (2010) or later has stdint.h
-#if _MSC_VER >= 1600
-#define HAVE_STDINT_H 1
-#endif
-
-// Must be using VS2010 or later, or boost, so that C99 types are defined in the global namespace
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <boost/cstdint.hpp>
-
-typedef boost::int64_t int64_t;
-typedef boost::uint64_t uint64_t;
-typedef boost::int32_t int32_t;
-typedef boost::uint32_t uint32_t;
-typedef boost::int16_t int16_t;
-typedef boost::uint16_t uint16_t;
-typedef boost::int8_t int8_t;
-typedef boost::uint8_t uint8_t;
-#endif
-
-#endif // _THRIFT_WINDOWS_CONFIG_H_
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/test/CMakeLists.txt b/vendor/git.apache.org/thrift.git/compiler/cpp/test/CMakeLists.txt
deleted file mode 100644
index c1fe914..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/test/CMakeLists.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-if(${WITH_PLUGIN})
-    include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
-
-    # Make sure gen-cpp files can be included
-    include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-
-    set(plugintest_SOURCES
-        plugin/conversion_test.cc
-    )
-    add_executable(plugintest ${plugintest_SOURCES})
-    if(WITH_SHARED_LIB AND NOT MSVC)
-        target_link_libraries(plugintest
-            thriftc
-            ${Boost_LIBRARIES}
-        )
-    else()
-        target_link_libraries(plugintest
-            thriftc_static
-            thrift_static
-            ${Boost_LIBRARIES}
-        )
-    endif()
-    add_test(NAME PluginUnitTest COMMAND plugintest)
-
-    set(thrift-gen-mycpp_SOURCES
-        ../src/thrift/generate/t_cpp_generator.cc
-        plugin/cpp_plugin.cc
-    )
-    add_executable(thrift-gen-mycpp ${thrift-gen-mycpp_SOURCES})
-    if(WITH_SHARED_LIB AND NOT MSVC)
-        target_link_libraries(thrift-gen-mycpp thriftc)
-    else()
-        target_link_libraries(thrift-gen-mycpp thriftc_static thrift_static)
-    endif()
-
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        set(BUILDTYPE "Debug")
-    else()
-        # RelWithDebInfo generates binaries in "Release" directory too
-        set(BUILDTYPE "Release")
-    endif()
-
-    set_directory_properties(PROPERTIES
-        ADDITIONAL_MAKE_CLEAN_FILES gen-cpp
-        ADDITIONAL_MAKE_CLEAN_FILES gen-mycpp)
-
-    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen-cpp)
-    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen-mycpp)
-    add_test(NAME PluginIntegrationTest
-             COMMAND ${CMAKE_COMMAND}
-                 -DTHRIFT_COMPILER=${THRIFT_COMPILER}
-                 -DBINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-                 -DBUILDTYPE=${BUILDTYPE}
-                 -DCURDIR=${CMAKE_CURRENT_BINARY_DIR}
-                 -DSRCDIR=${CMAKE_CURRENT_SOURCE_DIR}
-                 -P ${CMAKE_CURRENT_SOURCE_DIR}/cpp_plugin_test.cmake)
-endif()
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/test/Makefile.am b/vendor/git.apache.org/thrift.git/compiler/cpp/test/Makefile.am
deleted file mode 100644
index 5a23202..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/test/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-# Contains some contributions under the Thrift Software License.
-# Please see doc/old-thrift-license.txt in the Thrift distribution for
-# details.
-
-AUTOMAKE_OPTIONS = subdir-objects serial-tests
-
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/compiler/cpp/src
-AM_LDFLAGS = $(BOOST_LDFLAGS)
-AM_CXXFLAGS = -Wall -Wextra -pedantic
-
-if WITH_PLUGIN
-check_PROGRAMS = plugintest
-
-noinst_PROGRAMS = thrift-gen-mycpp
-
-AM_CPPFLAGS += -I$(top_srcdir)/lib/cpp/src -I$(top_builddir)/lib/cpp/src
-
-plugintest_SOURCES = plugin/conversion_test.cc
-plugintest_LDADD = $(top_builddir)/compiler/cpp/libthriftc.la
-
-thrift_gen_mycpp_SOURCES = plugin/cpp_plugin.cc \
-                           plugin/t_cpp_generator.cc
-thrift_gen_mycpp_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/compiler/cpp -I$(top_srcdir)/compiler/cpp/src/generate
-thrift_gen_mycpp_LDADD = $(top_builddir)/compiler/cpp/libthriftc.la
-
-cpp_plugin_test.sh: thrift-gen-mycpp
-TESTS = $(check_PROGRAMS) cpp_plugin_test.sh
-
-clean-local:
-	$(RM) -rf gen-cpp gen-mycpp
-
-endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/test/cpp_plugin_test.cmake b/vendor/git.apache.org/thrift.git/compiler/cpp/test/cpp_plugin_test.cmake
deleted file mode 100644
index fd18281..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/test/cpp_plugin_test.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-file(MAKE_DIRECTORY ${CURDIR}/gen-cpp)
-execute_process(COMMAND ${THRIFT_COMPILER} -r -out ${CURDIR}/gen-cpp -gen cpp ${SRCDIR}/../../../test/Include.thrift)
-if(EXITCODE)
-  message(FATAL_ERROR "FAILED: \"${ARGV}\": \"${EXITCODE}\"")
-endif()
-if(WIN32)
-    set(ENV{PATH} "${BINDIR}/${BUILDTYPE};${BINDIR};$ENV{PATH}")
-else()
-    set(ENV{PATH} "${BINDIR}:$ENV{PATH}")
-endif()
-
-file(MAKE_DIRECTORY ${CURDIR}/gen-mycpp)
-execute_process(COMMAND ${THRIFT_COMPILER} -r -out ${CURDIR}/gen-mycpp -gen mycpp ${SRCDIR}/../../../test/Include.thrift RESULT_VARIABLE EXITCODE)
-if(EXITCODE)
-  message(FATAL_ERROR "FAILED: \"${EXITCODE}\"")
-endif()
-
-find_program(DIFF diff)
-if(DIFF)
-  execute_process(COMMAND ${DIFF} -urN gen-cpp gen-mycpp RESULT_VARIABLE EXITCODE)
-  if(EXITCODE)
-    message(FATAL_ERROR "FAILED: \"${EXITCODE}\"")
-  endif()
-else()
-    message(WARNING "diff executable is not available. Not validating plugin-generated code.")
-endif()
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/test/cpp_plugin_test.sh b/vendor/git.apache.org/thrift.git/compiler/cpp/test/cpp_plugin_test.sh
deleted file mode 100755
index ddb2e0a..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/test/cpp_plugin_test.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# this file is intended to be invoked by make.
-set -e
-mkdir -p gen-cpp gen-mycpp
-PATH=.:"$PATH" ../thrift -r -out gen-cpp -gen cpp ../../../test/Include.thrift
-PATH=.:"$PATH" ../thrift -r -out gen-mycpp -gen mycpp ../../../test/Include.thrift
-diff -urN gen-cpp gen-mycpp
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/test/plugin/conversion_test.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/test/plugin/conversion_test.cc
deleted file mode 100644
index 5159ba4..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/test/plugin/conversion_test.cc
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "thrift/parse/t_program.h"
-#include "thrift/plugin/type_util.h"
-#include "thrift/plugin/plugin_types.h"
-
-#include <map>
-#include <vector>
-
-#include <boost/preprocessor.hpp>
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/parameterized_test.hpp>
-
-using namespace apache::thrift;
-using namespace boost::unit_test;
-
-namespace test_data {
-#define T_TEST_TYPES                                                                               \
-  BOOST_PP_TUPLE_TO_LIST(14,                                                                       \
-                         (program,                                                                 \
-                          base_type,                                                               \
-                          enum_value,                                                              \
-                          enum,                                                                    \
-                          const_value,                                                             \
-                          const,                                                                   \
-                          list,                                                                    \
-                          set,                                                                     \
-                          map,                                                                     \
-                          field,                                                                   \
-                          struct,                                                                  \
-                          typedef,                                                                 \
-                          function,                                                                \
-                          service))
-#define T_DELETE_TESTDATA(r, d, elem)                                                              \
-  for (std::vector<t_##elem*>::reverse_iterator it = elem##s.rbegin(); it != elem##s.rend(); it++) \
-    delete *it;
-#define T_DECL_TESTDATA(r, d, elem) static std::vector< ::t_##elem*> elem##s;
-BOOST_PP_LIST_FOR_EACH(T_DECL_TESTDATA, _, T_TEST_TYPES)
-#undef T_DECL_TESTDATA
-
-bool has_data = false;
-void cleanup() {
-  if (has_data) {
-    has_data = false;
-    BOOST_PP_LIST_FOR_EACH(T_DELETE_TESTDATA, _, T_TEST_TYPES)
-  }
-}
-
-void init_programs() {
-  programs.push_back(new t_program("prog path", "prog_name"));
-}
-
-void init_base_types() {
-  base_types.push_back(new ::t_base_type("name0", ::t_base_type::TYPE_VOID));
-  base_types.push_back(new ::t_base_type("name1", ::t_base_type::TYPE_STRING));
-  base_types.push_back(new ::t_base_type("name2", ::t_base_type::TYPE_BOOL));
-  base_types.push_back(new ::t_base_type("name3", ::t_base_type::TYPE_I8));
-  base_types.push_back(new ::t_base_type("name4", ::t_base_type::TYPE_I16));
-  base_types.push_back(new ::t_base_type("name5", ::t_base_type::TYPE_I32));
-  base_types.push_back(new ::t_base_type("name6", ::t_base_type::TYPE_I64));
-  base_types.push_back(new ::t_base_type("name7", ::t_base_type::TYPE_DOUBLE));
-}
-
-void init_const_values() {
-  const_values.push_back(new t_const_value(42));
-  const_values.push_back(new t_const_value("foo"));
-  {
-    t_const_value* x = new t_const_value;
-    x->set_double(3.1415);
-    const_values.push_back(x);
-  }
-  {
-    t_const_value* x = new t_const_value;
-    x->set_identifier("bar");
-    x->set_enum(enums[0]);
-    const_values.push_back(x);
-  }
-  {
-    t_const_value* x = new t_const_value;
-    x->set_map();
-    x->add_map(const_values[0], const_values[1]);
-    x->add_map(const_values[1], const_values[0]);
-    const_values.push_back(x);
-  }
-  {
-    t_const_value* x = new t_const_value;
-    x->set_list();
-    x->add_list(const_values[0]);
-    x->add_list(const_values[1]);
-    const_values.push_back(x);
-  }
-}
-
-void init_consts() {
-  // base_type/enum indexes for this and other tests are arbitrary
-  consts.push_back(new t_const(base_types[2], "aaa", const_values[0]));
-  consts.back()->set_doc("soem doc");
-  consts.push_back(new t_const(base_types[3], "bbb", const_values[1]));
-}
-
-void init_enum_values() {
-  enum_values.push_back(new t_enum_value("VAL1", 11));
-  enum_values.back()->set_doc("enum doc 1");
-  enum_values.back()->annotations_.insert(std::make_pair("anno1", "val1"));
-
-  enum_values.push_back(new t_enum_value("VAL2", 22));
-}
-
-void init_enums() {
-  enums.push_back(new t_enum(programs[0]));
-  enums.back()->set_doc("enum doc 1");
-  enums.back()->annotations_.insert(std::make_pair("anno1", "val1"));
-  enums.back()->set_name("fooo");
-  enums.back()->append(enum_values[0]);
-  enums.back()->append(enum_values[1]);
-}
-
-void init_lists() {
-  lists.push_back(new t_list(enums[0]));
-  lists.push_back(new t_list(base_types[5]));
-  lists.back()->set_cpp_name("list_cpp_name_1");
-}
-void init_sets() {
-  sets.push_back(new t_set(base_types[4]));
-  sets.push_back(new t_set(enums[0]));
-  sets.back()->set_cpp_name("set_cpp_name_1");
-}
-void init_maps() {
-  maps.push_back(new t_map(base_types[4], base_types[1]));
-  maps.push_back(new t_map(base_types[5], enums[0]));
-  maps.back()->set_cpp_name("map_cpp_name_1");
-}
-
-void init_typedefs() {
-  typedefs.push_back(new t_typedef(programs[0], base_types[3], "VAL1"));
-}
-void init_fields() {
-  fields.push_back(new t_field(base_types[1], "f1"));
-  fields.back()->set_reference(false);
-  fields.back()->set_req(t_field::T_OPTIONAL);
-  fields.push_back(new t_field(base_types[2], "f2", 9));
-  fields.back()->set_reference(true);
-  fields.push_back(new t_field(base_types[3], "f3", 11));
-  fields.back()->set_req(t_field::T_REQUIRED);
-  fields.back()->set_value(const_values[0]);
-}
-void init_structs() {
-  structs.push_back(new t_struct(programs[0], "struct1"));
-  structs.back()->append(fields[0]);
-  structs.back()->append(fields[1]);
-  structs.push_back(new t_struct(programs[0], "union1"));
-  structs.back()->append(fields[0]);
-  structs.back()->append(fields[1]);
-  structs.back()->set_union(true);
-  structs.push_back(new t_struct(programs[0], "xcept1"));
-  structs.back()->set_xception(true);
-}
-void init_functions() {
-  structs.push_back(new t_struct(programs[0], "errs1"));
-  t_struct* errors = structs.back();
-  structs.push_back(new t_struct(programs[0], "args1"));
-  t_struct* arglist = structs.back();
-  functions.push_back(new t_function(base_types[0], "func1", errors, arglist, false));
-  functions.push_back(new t_function(base_types[0], "func2", errors, arglist, true));
-}
-void init_services() {
-  services.push_back(new t_service(programs[0]));
-  services.back()->set_doc("srv1 doc");
-  services.back()->set_name("srv1");
-  services.back()->add_function(functions[0]);
-  services.back()->add_function(functions[1]);
-
-  services.push_back(new t_service(programs[0]));
-  services.back()->set_name("srv2");
-  services.back()->set_extends(services[0]);
-}
-
-std::vector<t_type*> types;
-void init_types() {
-#define T_COPY_TYPES(type) std::copy(type##s.begin(), type##s.end(), std::back_inserter(types))
-  T_COPY_TYPES(base_type);
-  T_COPY_TYPES(enum);
-  T_COPY_TYPES(typedef);
-  T_COPY_TYPES(struct);
-  T_COPY_TYPES(list);
-  T_COPY_TYPES(set);
-  T_COPY_TYPES(map);
-// T_COPY_TYPES(service);
-#undef T_COPY_TYPES
-}
-
-void init() {
-  if (!has_data) {
-    has_data = true;
-#define T_INIT_TESTDATA(r, d, elem) init_##elem##s();
-    BOOST_PP_LIST_FOR_EACH(T_INIT_TESTDATA, _, T_TEST_TYPES)
-    init_types();
-#undef T_INIT_TESTDATA
-  }
-}
-}
-struct GlobalFixture {
-  ~GlobalFixture() { test_data::cleanup(); }
-};
-#if (BOOST_VERSION >= 105900)
-BOOST_GLOBAL_FIXTURE(GlobalFixture);
-#else
-BOOST_GLOBAL_FIXTURE(GlobalFixture)
-#endif
-
-void migrate_global_cache() {
-  plugin::TypeRegistry reg;
-  plugin_output::get_global_cache(reg);
-  plugin::set_global_cache(reg);
-  plugin_output::clear_global_cache();
-}
-template <typename T>
-T* round_trip(T* t) {
-  typename plugin::ToType<T>::type p;
-  plugin_output::convert(t, p);
-  migrate_global_cache();
-  return plugin::convert(p);
-}
-
-void test_base_type(::t_base_type* sut) {
-  plugin::t_base_type p;
-  plugin_output::convert(sut, p);
-  boost::scoped_ptr< ::t_base_type> sut2(plugin::convert(p));
-
-#define THRIFT_CHECK(r, data, elem) BOOST_PP_EXPAND(BOOST_CHECK_EQUAL(data elem, sut2->elem));
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(7,
-                                                (is_void(),
-                                                 is_string(),
-                                                 is_bool(),
-                                                 is_string_list(),
-                                                 is_binary(),
-                                                 is_string_enum(),
-                                                 is_base_type())))
-}
-
-void test_const_value(t_const_value* sut) {
-  boost::scoped_ptr<t_const_value> sut2(round_trip(sut));
-
-  BOOST_CHECK_EQUAL(sut->get_type(), sut2->get_type());
-  switch (sut->get_type()) {
-#define T_CONST_VALUE_CASE(type, name)                                                             \
-  case t_const_value::type:                                                                        \
-    BOOST_CHECK_EQUAL(sut->get_##name(), sut2->get_##name());                                      \
-    break
-    T_CONST_VALUE_CASE(CV_INTEGER, integer);
-    T_CONST_VALUE_CASE(CV_DOUBLE, double);
-    T_CONST_VALUE_CASE(CV_STRING, string);
-    T_CONST_VALUE_CASE(CV_IDENTIFIER, identifier);
-#undef T_CONST_VALUE_CASE
-  case t_const_value::CV_MAP:
-    BOOST_CHECK_EQUAL(sut->get_map().size(), sut2->get_map().size());
-    {
-      std::map<t_const_value::t_const_value_type, t_const_value::t_const_value_type> sut_values;
-      for (std::map<t_const_value*, t_const_value*>::const_iterator it = sut->get_map().begin();
-           it != sut->get_map().end(); it++) {
-        sut_values[it->first->get_type()] = it->second->get_type();
-      }
-      std::map<t_const_value::t_const_value_type, t_const_value::t_const_value_type> sut2_values;
-      for (std::map<t_const_value*, t_const_value*>::const_iterator it = sut2->get_map().begin();
-           it != sut2->get_map().end(); it++) {
-        sut2_values[it->first->get_type()] = it->second->get_type();
-      }
-      BOOST_CHECK_EQUAL(sut_values.begin()->first, sut2_values.begin()->first);
-      BOOST_CHECK_EQUAL(sut_values.begin()->second, sut2_values.begin()->second);
-    }
-    break;
-  case t_const_value::CV_LIST:
-    BOOST_CHECK_EQUAL(sut->get_list().size(), sut2->get_list().size());
-    BOOST_CHECK_EQUAL(sut->get_list().front()->get_type(), sut2->get_list().front()->get_type());
-    break;
-  default:
-    BOOST_ASSERT(false);
-    break;
-  }
-}
-
-void test_const(t_const* sut) {
-  boost::scoped_ptr< ::t_const> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(4,
-                                                (get_type()->get_name(),
-                                                 get_name(),
-                                                 get_value()->get_type(),
-                                                 get_doc())))
-}
-
-void test_enum_value(t_enum_value* sut) {
-  boost::scoped_ptr<t_enum_value> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(3, (get_name(), get_value(), get_doc())))
-}
-
-void test_enum(t_enum* sut) {
-  boost::scoped_ptr< ::t_enum> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(6,
-                                                (get_name(),
-                                                 get_min_value()->get_value(),
-                                                 get_max_value()->get_value(),
-                                                 get_constant_by_value(11)->get_value(),
-                                                 get_constant_by_name("VAL1")->get_value(),
-                                                 get_doc())))
-}
-
-void test_list(t_list* sut) {
-  boost::scoped_ptr<t_list> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(4,
-                                                (get_elem_type()->get_name(),
-                                                 has_cpp_name(),
-                                                 get_doc(),
-                                                 get_name())))
-  if (sut->has_cpp_name())
-    BOOST_CHECK_EQUAL(sut->get_cpp_name(), sut2->get_cpp_name());
-}
-void test_set(t_set* sut) {
-  boost::scoped_ptr<t_set> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(4,
-                                                (get_elem_type()->get_name(),
-                                                 has_cpp_name(),
-                                                 get_doc(),
-                                                 get_name())))
-  if (sut->has_cpp_name())
-    BOOST_CHECK_EQUAL(sut->get_cpp_name(), sut2->get_cpp_name());
-}
-void test_map(t_map* sut) {
-  boost::scoped_ptr<t_map> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(5,
-                                                (get_key_type()->get_name(),
-                                                 get_val_type()->get_name(),
-                                                 has_cpp_name(),
-                                                 get_doc(),
-                                                 get_name())))
-  if (sut->has_cpp_name())
-    BOOST_CHECK_EQUAL(sut->get_cpp_name(), sut2->get_cpp_name());
-}
-
-void test_typedef(t_typedef* sut) {
-  boost::scoped_ptr<t_typedef> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(4,
-                                                (get_doc(),
-                                                 get_name(),
-                                                 get_symbolic(),
-                                                 is_forward_typedef())))
-}
-
-void test_type(t_type* sut) {
-  boost::scoped_ptr<t_type> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(15,
-                                                (is_void(),
-                                                 is_base_type(),
-                                                 is_string(),
-                                                 is_bool(),
-                                                 is_typedef(),
-                                                 is_enum(),
-                                                 is_struct(),
-                                                 is_xception(),
-                                                 is_container(),
-                                                 is_list(),
-                                                 is_set(),
-                                                 is_map(),
-                                                 is_service(),
-                                                 get_doc(),
-                                                 get_name())))
-}
-
-void test_field(t_field* sut) {
-  boost::scoped_ptr<t_field> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(5,
-                                                (get_req(),
-                                                 get_reference(),
-                                                 get_key(),
-                                                 get_doc(),
-                                                 get_name())))
-  if (sut->get_value()) {
-    THRIFT_CHECK(, sut->, get_value()->get_type());
-  } else {
-    BOOST_CHECK(!sut2->get_value());
-  }
-  if (sut->get_type()) {
-    THRIFT_CHECK(, sut->, get_type()->get_name());
-  } else {
-    BOOST_CHECK(!sut2->get_type());
-  }
-}
-void test_struct(t_struct* sut) {
-  boost::scoped_ptr<t_struct> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(5,
-                                                (is_union(),
-                                                 is_xception(),
-                                                 is_struct(),
-                                                 get_doc(),
-                                                 get_name())))
-}
-
-void test_function(t_function* sut) {
-  boost::scoped_ptr<t_function> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(
-      THRIFT_CHECK,
-      sut->,
-      BOOST_PP_TUPLE_TO_LIST(4, (get_doc(), get_name(), get_returntype()->get_name(), is_oneway())))
-}
-void test_service(t_service* sut) {
-  boost::scoped_ptr<t_service> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK,
-                         sut->,
-                         BOOST_PP_TUPLE_TO_LIST(3, (get_doc(), get_name(), get_functions().size())))
-  if (sut->get_extends()) {
-    THRIFT_CHECK(, sut->, get_extends()->get_name());
-  } else {
-    BOOST_CHECK(!sut2->get_extends());
-  }
-}
-
-void test_program(t_program* sut) {
-  boost::scoped_ptr<t_program> sut2(round_trip(sut));
-
-  BOOST_PP_LIST_FOR_EACH(THRIFT_CHECK, sut->, BOOST_PP_TUPLE_TO_LIST(2, (get_doc(), get_name())))
-}
-boost::unit_test::test_suite* do_init_unit_test_suite() {
-  test_data::init();
-  test_suite* ts = BOOST_TEST_SUITE("PluginConversionTest");
-
-#define T_TEST_CASE(r, d, type)                                                                    \
-  ts->add(BOOST_PARAM_TEST_CASE(test_##type, test_data::type##s.begin(), test_data::type##s.end()));
-  BOOST_PP_LIST_FOR_EACH(T_TEST_CASE, _, T_TEST_TYPES)
-  T_TEST_CASE(_, _, type)
-#undef T_TEST_CASE
-  return ts;
-}
-
-#ifdef BOOST_TEST_DYN_LINK
-bool init_unit_test_suite() {
-  framework::master_test_suite().add(do_init_unit_test_suite());
-  return true;
-}
-int main(int argc, char* argv[]) {
-  return ::boost::unit_test::unit_test_main(&init_unit_test_suite, argc, argv);
-}
-#else
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-  return do_init_unit_test_suite();
-}
-#endif
diff --git a/vendor/git.apache.org/thrift.git/compiler/cpp/test/plugin/cpp_plugin.cc b/vendor/git.apache.org/thrift.git/compiler/cpp/test/plugin/cpp_plugin.cc
deleted file mode 100644
index 6cc19f2..0000000
--- a/vendor/git.apache.org/thrift.git/compiler/cpp/test/plugin/cpp_plugin.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "thrift/plugin/plugin.h"
-#include "thrift/generate/t_generator.h"
-
-namespace apache {
-namespace thrift {
-namespace plugin {
-
-class MyCppGenerator : public GeneratorPlugin {
-  virtual int generate(::t_program* program,
-                       const std::map<std::string, std::string>& parsed_options) {
-    t_generator* gen = t_generator_registry::get_generator(program, "cpp", parsed_options, "");
-    gen->generate_program();
-    delete gen;
-    return 0;
-  }
-};
-}
-}
-}
-
-int main(int argc, char* argv[]) {
-  apache::thrift::plugin::MyCppGenerator p;
-  return p.exec(argc, argv);
-}
diff --git a/vendor/git.apache.org/thrift.git/composer.json b/vendor/git.apache.org/thrift.git/composer.json
deleted file mode 100644
index d937bc7..0000000
--- a/vendor/git.apache.org/thrift.git/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "apache/thrift",
-    "description": "Apache Thrift RPC system",
-    "homepage": "http://thrift.apache.org/",
-    "type": "library",
-    "license": "Apache-2.0",
-    "authors": [
-        {
-            "name": "Apache Thrift Developers",
-            "email": "dev@thrift.apache.org",
-            "homepage": "http://thrift.apache.org"
-        }
-    ],
-    "support": {
-        "email": "dev@thrift.apache.org",
-        "issues": "https://issues.apache.org/jira/browse/THRIFT"
-    },
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-0": {"Thrift": "lib/php/lib/"}
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.10.0"
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/configure.ac b/vendor/git.apache.org/thrift.git/configure.ac
deleted file mode 100755
index 0972abf..0000000
--- a/vendor/git.apache.org/thrift.git/configure.ac
+++ /dev/null
@@ -1,959 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-AC_PREREQ(2.65)
-AC_CONFIG_MACRO_DIR([./aclocal])
-
-AC_INIT([thrift], [0.10.0])
-
-AC_CONFIG_AUX_DIR([.])
-
-AM_INIT_AUTOMAKE([1.13 subdir-objects tar-ustar])
-PKG_PROG_PKG_CONFIG
-
-AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
-                         (Normal --prefix is ignored for Python because
-                         Python has different conventions.)
-                         Default = "/usr"])
-AS_IF([test "x$PY_PREFIX" = x], [PY_PREFIX="/usr"])
-
-AC_ARG_VAR([JAVA_PREFIX], [Prefix for installing the Java lib jar.
-                           Default = "/usr/local/lib"])
-AS_IF([test "x$JAVA_PREFIX" != x], [JAVA_PREFIX="$JAVA_PREFIX/usr/local/lib"],
-      [test "x$PREFIX" != x], [JAVA_PREFIX="$PREFIX/usr/local/lib"],
-      [JAVA_PREFIX="/usr/local/lib"])
-
-AC_ARG_VAR([RUBY_PREFIX], [Prefix for installing Ruby modules.
-                           (Normal --prefix is ignored for Ruby because
-                           Ruby has different conventions.)
-                           Default = none, let ruby setup decide])
-
-AC_ARG_VAR([PHP_PREFIX], [Prefix for installing PHP modules.
-                         (Normal --prefix is ignored for PHP because
-                         PHP has different conventions.)
-                         Default = "/usr/lib/php"])
-AS_IF([test "x$PHP_PREFIX" = x], [PHP_PREFIX="/usr/lib/php"])
-
-AC_ARG_VAR([PHP_CONFIG_PREFIX],
-           [Prefix for installing PHP extension module .ini file.
-            (Normal --prefix is ignored for PHP because PHP has
-             different conventions.)
-           Default = "/etc/php.d"])
-AS_IF([test "x$PHP_CONFIG_PREFIX" = x], [PHP_CONFIG_PREFIX="/etc/php.d"])
-
-AC_ARG_VAR([INSTALLDIRS], [When installing Perl modules, specifies which
-                           of the sets of installation directories
-                           to choose: perl, site or vendor.
-                           Default = "vendor"])
-AS_IF([test "x$INSTALLDIRS" = x], [INSTALLDIRS="vendor"])
-
-AC_ARG_VAR([PERL_PREFIX], [Prefix for installing Perl modules.
-                           (Normal --prefix is ignored for Perl because
-                           Perl has different conventions.)
-                           Ignored, when INSTALLDIRS set to site or vendor.
-                           Default = "/usr/local/lib"])
-AS_IF([test "x$PERL_PREFIX" = x], [PERL_PREFIX="/usr/local"])
-
-AC_ARG_VAR([CABAL_CONFIGURE_FLAGS],
-           [Extra flags to pass to cabal: "cabal Setup.lhs configure $CABAL_CONFIGURE_FLAGS".
-            (Typically used to set --user or force --global.)])
-
-AC_SUBST(CABAL_CONFIGURE_FLAGS)
-
-AC_ARG_VAR([D_IMPORT_PREFIX], [Prefix for installing D modules.
-                           [INCLUDEDIR/d2]])
-AS_IF([test "x$D_IMPORT_PREFIX" = x], [D_IMPORT_PREFIX="${includedir}/d2"])
-
-AC_ARG_VAR([DMD_LIBEVENT_FLAGS], [DMD flags for linking libevent (auto-detected if not set).])
-AC_ARG_VAR([DMD_OPENSSL_FLAGS], [DMD flags for linking OpenSSL (auto-detected if not set).])
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-AC_PROG_BISON(2.5)
-AC_PROG_YACC
-AC_PROG_LEX
-AM_PROG_LEX
-AC_PROG_LN_S
-AC_PROG_MKDIR_P
-AC_PROG_AWK
-AC_PROG_RANLIB
-
-AC_LANG([C++])
-AX_CXX_COMPILE_STDCXX_11([noext], [optional])
-
-AM_EXTRA_RECURSIVE_TARGETS([style])
-AC_SUBST(CPPSTYLE_CMD, 'find . -type f \( -iname "*.h" -or -iname "*.cpp" -or -iname "*.cc" -or -iname "*.tcc" \) -printf "Reformatting: %h/%f\n" -exec clang-format -i {} \;')
-
-AC_ARG_ENABLE([libs],
-  AS_HELP_STRING([--enable-libs], [build the Apache Thrift libraries [default=yes]]),
-  [], enable_libs=yes
-)
-have_libs=yes
-if test "$enable_libs" = "no"; then
-  have_libs="no"
-  with_cpp="no"
-  with_c_glib="no"
-  with_java="no"
-  with_csharp="no"
-  with_python="no"
-  with_ruby="no"
-  with_haskell="no"
-  with_haxe="no"
-  with_perl="no"
-  with_php="no"
-  with_php_extension="no"
-  with_dart="no"
-  with_erlang="no"
-  with_go="no"
-  with_d="no"
-  with_nodejs="no"
-  with_lua="no"
-fi
-
-
-AX_THRIFT_LIB(cpp, [C++], yes)
-have_cpp=no
-if test "$with_cpp" = "yes";  then
-  AX_BOOST_BASE([1.53.0])
-  if test "x$succeeded" = "xyes" ; then
-    AC_SUBST([BOOST_LIB_DIR], [$(echo "$BOOST_LDFLAGS" | sed -e 's/^\-L//')])
-    AC_SUBST([BOOST_CHRONO_LDADD], [$(echo "$BOOST_LIB_DIR/libboost_chrono.a")])
-    AC_SUBST([BOOST_FILESYSTEM_LDADD], [$(echo "$BOOST_LIB_DIR/libboost_filesystem.a")])
-    AC_SUBST([BOOST_SYSTEM_LDADD], [$(echo "$BOOST_LIB_DIR/libboost_system.a")])
-    AC_SUBST([BOOST_TEST_LDADD], [$(echo "$BOOST_LIB_DIR/libboost_unit_test_framework.a")])
-    AC_SUBST([BOOST_THREAD_LDADD], [$(echo "$BOOST_LIB_DIR/libboost_thread.a")])
-    have_cpp="yes"
-  fi
-
-  AX_CHECK_OPENSSL()
-
-  AX_LIB_EVENT([1.0])
-  have_libevent=$success
-
-  AX_LIB_ZLIB([1.2.3])
-  have_zlib=$success
-
-  AX_THRIFT_LIB(qt4, [Qt], yes)
-  have_qt=no
-  if test "$with_qt4" = "yes";  then
-    PKG_CHECK_MODULES([QT], [QtCore >= 4.3, QtNetwork >= 4.3], have_qt=yes, have_qt=no)
-  fi
-  if test "$have_qt" = "yes"; then
-    AC_PATH_PROGS([QT_MOC], [moc-qt4 moc], "fail")
-    if test "$QT_MOC" = "fail"; then
-      have_qt=no
-    fi
-  fi
-
-  AX_THRIFT_LIB(qt5, [Qt5], yes)
-  have_qt5=no
-  qt_reduce_reloc=""
-  if test "$with_qt5" = "yes";  then
-    PKG_CHECK_MODULES([QT5], [Qt5Core >= 5.0, Qt5Network >= 5.0],
-                      [have_qt5=yes;qt_reduce_reloc=`$PKG_CONFIG --variable=qt_config Qt5Core | grep "reduce_relocations"`],
-                      [have_qt5=no])
-  fi
-  if test "$have_qt5" = "yes"; then
-    AC_PATH_PROGS([QT5_MOC], [moc-qt5 moc], "fail")
-    if test "$QT5_MOC" = "fail"; then
-      have_qt5=no
-    fi
-  fi
-fi
-AM_CONDITIONAL([WITH_CPP], [test "$have_cpp" = "yes"])
-AM_CONDITIONAL([AMX_HAVE_LIBEVENT], [test "$have_libevent" = "yes"])
-AM_CONDITIONAL([AMX_HAVE_ZLIB], [test "$have_zlib" = "yes"])
-AM_CONDITIONAL([AMX_HAVE_QT], [test "$have_qt" = "yes"])
-AM_CONDITIONAL([AMX_HAVE_QT5], [test "$have_qt5" = "yes"])
-AM_CONDITIONAL([QT5_REDUCE_RELOCATIONS], [test "x$qt_reduce_reloc" != "x"])
-
-AX_THRIFT_LIB(c_glib, [C (GLib)], yes)
-if test "$with_c_glib" = "yes"; then
-  PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.0], have_glib2=yes, have_glib2=no)
-  PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.0], have_gobject2=yes, have_gobject2=no)
-  if test "$have_glib2" = "yes" -a "$have_gobject2" = "yes" ; then
-    have_c_glib="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_C_GLIB, [test "$have_glib2" = "yes" -a "$have_gobject2" = "yes"])
-
-AX_THRIFT_LIB(csharp, [C#], yes)
-if test "$with_csharp" = "yes";  then
-  PKG_CHECK_MODULES(MONO, mono >= 2.11.0, mono_2_11=yes, mono_2_11=no)
-  if test "$mono_2_11" == "yes"; then
-    AC_PATH_PROG([MCS], [mcs])
-    if test "x$MCS" != "x"; then
-      mono_mcs="yes"
-    fi
-  fi
-  PKG_CHECK_MODULES(MONO, mono >= 2.0.0, net_3_5=yes, net_3_5=no)
-  PKG_CHECK_MODULES(MONO, mono >= 1.2.4, have_mono=yes, have_mono=no)
-  if test "$have_mono" = "yes" ; then
-    have_csharp="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_MONO, [test "$have_csharp" = "yes"])
-AM_CONDITIONAL(NET_2_0, [test "$net_3_5" = "no"])
-AM_CONDITIONAL(MONO_MCS, [test "$mono_mcs" = "yes"])
-
-AX_THRIFT_LIB(java, [Java], yes)
-if test "$with_java" = "yes";  then
-  AX_JAVAC_AND_JAVA
-  AC_PATH_PROG([ANT], [ant])
-  AX_CHECK_ANT_VERSION($ANT, 1.7)
-  AC_SUBST(CLASSPATH)
-  AC_SUBST(ANT_FLAGS)
-  if test "x$JAVA" != "x" && test "x$JAVAC" != "x" && test "x$ANT" != "x" ; then
-    have_java="yes"
-  fi
-fi
-AM_CONDITIONAL([WITH_JAVA], [test "$have_java" = "yes"])
-
-AX_THRIFT_LIB(erlang, [Erlang], yes)
-if test "$with_erlang" = "yes";  then
-  AC_ERLANG_PATH_ERL
-  AC_ERLANG_PATH_ERLC
-  AC_PATH_PROG([REBAR], [rebar])
-  if test -n "$ERLC" ; then
-    AC_ERLANG_SUBST_LIB_DIR
-    # Install into the detected Erlang directory instead of $libdir/erlang/lib
-    ERLANG_INSTALL_LIB_DIR="$ERLANG_LIB_DIR"
-    AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-  fi
-  if test -n "$ERL" -a -n "$ERLC" && test "x$REBAR" != "x" ; then
-    have_erlang="yes"
-
-    # otp_release is simply a number (like "17") for OTP17+ while "R16..." for OTP16 or less.
-    # OTP version is currently only used for running tests.
-    if $ERL -eval 'erlang:display(erlang:system_info(otp_release)),halt().' -noshell | grep "^\"R" >/dev/null; then
-      erlang_otp16_or_less="yes"
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_ERLANG, [test "$have_erlang" = "yes"])
-AM_CONDITIONAL(ERLANG_OTP16, [test "$erlang_otp16_or_less" = "yes"])
-
-AX_THRIFT_LIB(nodejs, [Nodejs], yes)
-have_nodejs=no
-if test "$with_nodejs" = "yes"; then
-  AC_PATH_PROGS([NODEJS], [nodejs node])
-  AC_PATH_PROG([NPM], [npm])
-  if test "x$NODEJS" != "x" -a "x$NPM" != "x"; then
-    have_nodejs="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_NODEJS, [test "$have_nodejs" = "yes"])
-AM_CONDITIONAL(HAVE_NPM, [test "x$NPM" != "x"])
-
-AX_THRIFT_LIB(lua, [Lua], yes)
-have_lua=no
-if test "$with_lua" = "yes"; then
-  AX_PROG_LUA(5.2,, have_lua="yes", have_lua="no")
-  if test "$have_lua" = "yes"; then
-    AX_LUA_HEADERS(, have_lua="no")
-    AX_LUA_LIBS(, have_lua="no")
-  fi
-fi
-AM_CONDITIONAL(WITH_LUA, [test "$have_lua" = "yes"])
-
-# Find python regardless of with_python value, because it's needed by make cross
-AM_PATH_PYTHON(2.6,, :)
-AX_THRIFT_LIB(python, [Python], yes)
-if test "$with_python" = "yes";  then
-  if test -n "$PYTHON"; then
-    have_python="yes"
-  fi
-  AC_PATH_PROG([TRIAL], [trial])
-  if test -n "$TRIAL"; then
-    have_trial="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_PYTHON, [test "$have_python" = "yes"])
-AM_CONDITIONAL(WITH_TWISTED_TEST, [test "$have_trial" = "yes"])
-
-# Find "python3" executable.
-# It's distro specific and far from ideal but needed to cross test py2-3 at once.
-# TODO: find "python2" if it's 3.x
-if python --version 2>&1 | grep -q "Python 2"; then
-  AC_PATH_PROGS([PYTHON3], [python3 python3.5 python35 python3.4 python34])
-  if test -n "$PYTHON3"; then
-    have_py3="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_PY3, [test "$have_py3" = "yes"])
-
-AX_THRIFT_LIB(perl, [Perl], yes)
-if test "$with_perl" = "yes"; then
-  AC_PATH_PROG([PERL], [perl])
-  if test -n "$PERL" ; then
-    AC_PROG_PERL_MODULES([Bit::Vector], success="yes", success="no")
-    have_perl_bit_vector="$success"
-    AC_PROG_PERL_MODULES([Class::Accessor], success="yes", success="no")
-    have_perl_class_accessor="$success"
-  fi
-  if test -n "$PERL" -a "$have_perl_bit_vector" = "yes" ; then
-    if test -n "$PERL" -a "$have_perl_class_accessor" = "yes" ; then
-      have_perl="yes"
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_PERL, [test "$have_perl" = "yes"])
-
-AX_THRIFT_LIB(php, [PHP], yes)
-if test "$with_php" = "yes"; then
-  AC_PATH_PROG([PHP], [php])
-  if test -n "$PHP" ; then
-    have_php="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_PHP, [test "$have_php" = "yes"])
-
-AX_THRIFT_LIB(php_extension, [PHP_EXTENSION], yes)
-if test "$with_php_extension" = "yes"; then
-  if test -f "lib/php/src/ext/thrift_protocol/configure"; then
-    AC_PATH_PROG([PHP_CONFIG], [php-config])
-    if test -n "$PHP_CONFIG" ; then
-      AC_CONFIG_SUBDIRS([lib/php/src/ext/thrift_protocol])
-      have_php_extension="yes"
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_PHP_EXTENSION, [test "$have_php_extension" = "yes"])
-
-AC_PATH_PROG([PHPUNIT], [phpunit])
-AM_CONDITIONAL(HAVE_PHPUNIT, [test "x$PHPUNIT" != "x"])
-
-AX_THRIFT_LIB(dart, [DART], yes)
-if test "$with_dart" = "yes"; then
-  AC_PATH_PROG([DART], [dart])
-  AC_PATH_PROG([DARTPUB], [pub])
-  if test "x$DART" != "x" -a "x$DARTPUB" != "x"; then
-    have_dart="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_DART, [test "$have_dart" = "yes"])
-
-AX_THRIFT_LIB(ruby, [Ruby], yes)
-have_ruby=no
-if test "$with_ruby" = "yes"; then
-  AC_PATH_PROG([RUBY], [ruby])
-  AC_PATH_PROG([BUNDLER], [bundle])
-  if test "x$RUBY" != "x" -a "x$BUNDLER" != "x"; then
-    have_ruby="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_RUBY, [test "$have_ruby" = "yes"])
-AM_CONDITIONAL(HAVE_BUNDLER, [test "x$BUNDLER" != "x"])
-
-AX_THRIFT_LIB(haskell, [Haskell], yes)
-have_haskell=no
-RUNHASKELL=true
-CABAL=true
-if test "$with_haskell" = "yes"; then
-  AC_PATH_PROG([CABAL], [cabal])
-  AC_PATH_PROG([RUNHASKELL], [runhaskell])
-  if test "x$CABAL" != "x" -a "x$RUNHASKELL" != "x"; then
-    have_haskell="yes"
-  else
-    RUNHASKELL=true
-    CABAL=true
-  fi
-fi
-AC_SUBST(CABAL)
-AC_SUBST(RUNHASKELL)
-AM_CONDITIONAL(WITH_HASKELL, [test "$have_haskell" = "yes"])
-
-AX_THRIFT_LIB(go, [Go], yes)
-if test "$with_go" = "yes";  then
-  AC_PATH_PROG([GO], [go])
-  if [[ -x "$GO" ]] ; then
-    AS_IF([test -n "$GO"],[
-      ax_go_version="1.4"
-
-      AC_MSG_CHECKING([for Go version])
-      golang_version=`$GO version 2>&1 | $SED -e 's/\(go \)\(version \)\(go\)\(@<:@0-9@:>@.@<:@0-9@:>@.@<:@0-9@:>@\)\(@<:@\*@:>@*\).*/\4/'`
-      AC_MSG_RESULT($golang_version)
-      AC_SUBST([golang_version],[$golang_version])
-      AX_COMPARE_VERSION([$ax_go_version],[le],[$golang_version],[
-      :
-        have_go="yes"
-      ],[
-      :
-        have_go="no"
-      ])
-    ],[
-      AC_MSG_WARN([could not find Go ])
-      have_go="no"
-    ])
-  fi
-fi
-AM_CONDITIONAL(WITH_GO, [test "$have_go" = "yes"])
-
-
-AX_THRIFT_LIB(haxe, [Haxe], yes)
-if test "$with_haxe" = "yes";  then
-  AC_PATH_PROG([HAXE], [haxe])
-  if [[ -x "$HAXE" ]] ; then
-    AX_PROG_HAXE_VERSION( [3.1.3], have_haxe="yes", have_haxe="no")
-  fi
-fi
-AM_CONDITIONAL(WITH_HAXE, [test "$have_haxe" = "yes"])
-
-
-AX_THRIFT_LIB(d, [D], yes)
-if test "$with_d" = "yes";  then
-  AX_DMD
-  AC_SUBST(DMD)
-  if test "x$DMD" != "x"; then
-    have_d="yes"
-  fi
-fi
-
-# Determine actual name of the generated D library for use in the command line
-# when compiling tests. This is needed because the -l<lib> syntax doesn't work
-# with OPTLINK (Windows).
-lib_prefix=lib
-lib_suffix=a
-case "$host_os" in
-  cygwin* | mingw* | pw32* | cegcc*)
-    lib_prefix=""
-    lib_suffix=lib
-    ;;
-esac
-D_LIB_NAME="${lib_prefix}thriftd.${lib_suffix}"
-AC_SUBST(D_LIB_NAME)
-D_EVENT_LIB_NAME="${lib_prefix}thriftd-event.${lib_suffix}"
-AC_SUBST(D_EVENT_LIB_NAME)
-D_SSL_LIB_NAME="${lib_prefix}thriftd-ssl.${lib_suffix}"
-AC_SUBST(D_SSL_LIB_NAME)
-
-if test "$have_d" = "yes"; then
-  AX_CHECK_D_MODULE(deimos.event2.event)
-  have_deimos_event2=$success
-
-  with_d_event_tests="no"
-  if test "$have_deimos_event2" = "yes"; then
-    if test "x$DMD_LIBEVENT_FLAGS" = "x"; then
-      if test "$dmd_optlink" = "yes"; then
-        AC_MSG_WARN([D libevent interface found, but cannot auto-detect \
-linker flags for OPTLINK. Please set DMD_LIBEVENT_FLAGS manually.])
-      else
-        AX_LIB_EVENT([2.0])
-        if test "$success" = "yes"; then
-          DMD_LIBEVENT_FLAGS=$(echo "$LIBEVENT_LDFLAGS $LIBEVENT_LIBS" | \
-            sed -e 's/^ *//g;s/ *$//g;s/^\(.\)/-L\1/g;s/  */ -L/g')
-          with_d_event_tests="yes"
-        else
-          AC_MSG_WARN([D libevent interface present, but libevent library not found.])
-        fi
-      fi
-    else
-      with_d_event_tests="yes"
-    fi
-  fi
-
-  AX_CHECK_D_MODULE(deimos.openssl.ssl)
-  have_deimos_openssl=$success
-
-  with_d_ssl_tests="no"
-  if test "$have_deimos_openssl" = "yes"; then
-    if test "x$DMD_OPENSSL_FLAGS" = "x"; then
-      if test "$dmd_optlink" = "yes"; then
-        AC_MSG_WARN([D OpenSSL interface found, but cannot auto-detect \
-linker flags for OPTLINK. Please set DMD_OPENSSL_FLAGS manually.])
-      else
-        AX_CHECK_OPENSSL([with_d_ssl_tests="yes"])
-        if test "$with_d_ssl_tests" = "yes"; then
-          DMD_OPENSSL_FLAGS=$(echo "$OPENSSL_LDFLAGS $OPENSSL_LIBS" | \
-            sed -e 's/^ *//g;s/ *$//g;s/^\(.\)/-L\1/g;s/  */ -L/g')
-        else
-          AC_MSG_WARN([D OpenSSL interface present, but OpenSSL library not found.])
-        fi
-      fi
-    else
-      with_d_ssl_tests="yes"
-    fi
-  fi
-fi
-
-AM_CONDITIONAL(WITH_D, [test "$have_d" = "yes"])
-AM_CONDITIONAL(DMD_OPTLINK, [test "$dmd_optlink" = "yes"])
-AC_SUBST(DMD_OF_DIRSEP, "$dmd_of_dirsep")
-AM_CONDITIONAL(HAVE_DEIMOS_EVENT2, [test "$have_deimos_event2" = "yes"])
-AM_CONDITIONAL(WITH_D_EVENT_TESTS, [test "$with_d_event_tests" = "yes"])
-AC_SUBST(DMD_LIBEVENT_FLAGS)
-AM_CONDITIONAL(HAVE_DEIMOS_OPENSSL, [test "$have_deimos_openssl" = "yes"])
-AM_CONDITIONAL(WITH_D_SSL_TESTS, [test "$with_d_ssl_tests" = "yes"])
-AC_SUBST(DMD_OPENSSL_FLAGS)
-
-AC_ARG_ENABLE([tests],
-  AS_HELP_STRING([--enable-tests], [build tests [default=yes]]),
-  [], enable_tests=yes
-)
-have_tests=yes
-if test "$enable_tests" = "no"; then
-  have_tests="no"
-fi
-AM_CONDITIONAL(WITH_TESTS, [test "$have_tests" = "yes"])
-
-AC_ARG_ENABLE([plugin],
-  AS_HELP_STRING([--enable-plugin], [build compiler plugin support [default=yes]]),
-  [], enable_plugin=yes
-)
-have_plugin=yes
-if test "$have_cpp" = "no" ; then
-  have_plugin="no"
-fi
-if test "$enable_plugin" = "no"; then
-  have_plugin="no"
-fi
-if test "$have_plugin" = "yes" ; then
-  AC_CONFIG_LINKS([compiler/cpp/test/plugin/t_cpp_generator.cc:compiler/cpp/src/thrift/generate/t_cpp_generator.cc])
-fi
-AM_CONDITIONAL(WITH_PLUGIN, [test "$have_plugin" = "yes"])
-
-AC_ARG_ENABLE([tutorial],
-  AS_HELP_STRING([--enable-tutorial], [build tutorial [default=yes]]),
-  [], enable_tutorial=yes
-)
-have_tutorial=yes
-if test "$enable_tutorial" = "no"; then
-  have_tutorial="no"
-fi
-AM_CONDITIONAL(WITH_TUTORIAL, [test "$have_tutorial" = "yes"])
-
-AM_CONDITIONAL(MINGW, false)
-case "${host_os}" in
-*mingw*)
-  mingw32_support="yes"
-  AC_CHECK_HEADER(windows.h)
-  AM_CONDITIONAL(MINGW, true)
-  ;;
-*)
-  AC_ISC_POSIX
-  ;;
-esac
-
-AC_C_CONST
-AC_C_INLINE
-AC_C_VOLATILE
-
-AC_HEADER_STDBOOL
-AC_HEADER_STDC
-AC_HEADER_TIME
-AC_HEADER_SYS_WAIT
-AC_TYPE_SIGNAL
-AC_CHECK_HEADERS([arpa/inet.h])
-AC_CHECK_HEADERS([sys/param.h])
-AC_CHECK_HEADERS([fcntl.h])
-AC_CHECK_HEADERS([inttypes.h])
-AC_CHECK_HEADERS([limits.h])
-AC_CHECK_HEADERS([netdb.h])
-AC_CHECK_HEADERS([netinet/in.h])
-AC_CHECK_HEADERS([pthread.h])
-AC_CHECK_HEADERS([stddef.h])
-AC_CHECK_HEADERS([stdlib.h])
-AC_CHECK_HEADERS([sys/socket.h])
-AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_HEADERS([sys/un.h])
-AC_CHECK_HEADERS([sys/poll.h])
-AC_CHECK_HEADERS([sys/resource.h])
-AC_CHECK_HEADERS([unistd.h])
-AC_CHECK_HEADERS([libintl.h])
-AC_CHECK_HEADERS([malloc.h])
-AC_CHECK_HEADERS([openssl/ssl.h])
-AC_CHECK_HEADERS([openssl/rand.h])
-AC_CHECK_HEADERS([openssl/x509v3.h])
-AC_CHECK_HEADERS([sched.h])
-AC_CHECK_HEADERS([wchar.h])
-
-AC_CHECK_LIB(pthread, pthread_create)
-dnl NOTE(dreiss): I haven't been able to find any really solid docs
-dnl on what librt is and how it fits into various Unix systems.
-dnl My best guess is that it is where glibc stashes its implementation
-dnl of the POSIX Real-Time Extensions.  This seems necessary on Linux,
-dnl and we haven't yet found a system where this is a problem.
-AC_CHECK_LIB(rt, clock_gettime)
-AC_CHECK_LIB(socket, setsockopt)
-
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_UINT8_T
-AC_CHECK_TYPES([ptrdiff_t], [], [exit 1])
-
-AC_STRUCT_TM
-
-dnl NOTE(dreiss): AI_ADDRCONFIG is not defined on OpenBSD.
-AC_CHECK_DECL([AI_ADDRCONFIG], [],
-              [AC_DEFINE([AI_ADDRCONFIG], 0,
-                         [Define if the AI_ADDRCONFIG symbol is unavailable])],
-              [
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <netdb.h>
-])
-
-AC_FUNC_ALLOCA
-AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_FUNC_REALLOC
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_STAT
-AC_FUNC_STRERROR_R
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([strtoul])
-AC_CHECK_FUNCS([bzero])
-AC_CHECK_FUNCS([ftruncate])
-AC_CHECK_FUNCS([gethostbyname])
-AC_CHECK_FUNCS([gethostbyname_r])
-AC_CHECK_FUNCS([gettimeofday])
-AC_CHECK_FUNCS([memmove])
-AC_CHECK_FUNCS([memset])
-AC_CHECK_FUNCS([mkdir])
-AC_CHECK_FUNCS([realpath])
-AC_CHECK_FUNCS([select])
-AC_CHECK_FUNCS([setlocale])
-AC_CHECK_FUNCS([socket])
-AC_CHECK_FUNCS([strchr])
-AC_CHECK_FUNCS([strdup])
-AC_CHECK_FUNCS([strerror])
-AC_CHECK_FUNCS([strstr])
-AC_CHECK_FUNCS([strtol])
-AC_CHECK_FUNCS([sqrt])
-dnl The following functions are optional.
-AC_CHECK_FUNCS([alarm])
-AC_CHECK_FUNCS([clock_gettime])
-AC_CHECK_FUNCS([sched_get_priority_min])
-AC_CHECK_FUNCS([sched_get_priority_max])
-AC_CHECK_FUNCS([inet_ntoa])
-AC_CHECK_FUNCS([pow])
-
-if test "$cross_compiling" = "no" ; then
-  AX_SIGNED_RIGHT_SHIFT
-fi
-
-dnl autoscan thinks we need this macro because we have a member function
-dnl called "error".  Invoke the macro but don't run the check so autoscan
-dnl thinks we are in the clear.  It's highly unlikely that we will ever
-dnl actually use the function that this checks for.
-if false ; then
-  AC_FUNC_ERROR_AT_LINE
-fi
-
-# --- Coverage hooks ---
-
-AC_ARG_ENABLE(coverage,
-              [  --enable-coverage      turn on -fprofile-arcs -ftest-coverage],
-              [case "${enableval}" in
-                yes) ENABLE_COVERAGE=1 ;;
-                no) ENABLE_COVERAGE=0 ;;
-                *) AC_MSG_ERROR(bad value ${enableval} for --enable-cov) ;;
-              esac],
-              [ENABLE_COVERAGE=2])
-
-if test "x[$]ENABLE_COVERAGE" = "x1"; then
-  AC_MSG_WARN(enable coverage)
-  GCOV_CFLAGS="`echo \"[$]CFLAGS\" | perl -pe 's/-O\d+//g;'` -fprofile-arcs -ftest-coverage"
-  GCOV_CXXFLAGS="`echo \"[$]CXXFLAGS\" | perl -pe 's/-O\d+//g;'` -fprofile-arcs -ftest-coverage"
-  GCOV_LDFLAGS="-XCClinker -fprofile-arcs -XCClinker -ftest-coverage"
-fi
-
-AC_SUBST(ENABLE_COVERAGE)
-AC_SUBST(GCOV_CFLAGS)
-AC_SUBST(GCOV_CXXFLAGS)
-AC_SUBST(GCOV_LDFLAGS)
-
-AC_ARG_ENABLE(boostthreads,
-              [  --enable-boostthreads      use boost threads, instead of POSIX pthread (experimental) ],
-              [case "${enableval}" in
-                yes) ENABLE_BOOSTTHREADS=1 ;;
-                no) ENABLE_BOOSTTHREADS=0 ;;
-                *) AC_MSG_ERROR(bad value ${enableval} for --enable-cov) ;;
-              esac],
-              [ENABLE_BOOSTTHREADS=2])
-
-
-if test "x[$]ENABLE_BOOSTTHREADS" = "x1"; then
-  AC_MSG_WARN(enable boostthreads)
-  AC_DEFINE([USE_BOOST_THREAD], [1], [experimental --enable-boostthreads that replaces POSIX pthread by boost::thread])
-  LIBS="-lboost_thread $LIBS"
-fi
-
-AM_CONDITIONAL([WITH_BOOSTTHREADS], [test "x[$]ENABLE_BOOSTTHREADS" = "x1"])
-
-AC_CONFIG_HEADERS(config.h:config.hin)
-AC_CONFIG_HEADERS(lib/cpp/src/thrift/config.h:config.hin)
-AC_CONFIG_HEADERS(lib/c_glib/src/thrift/config.h:config.hin)
-# gruard against pre defined config.h
-AH_TOP([
-#ifndef CONFIG_H
-#define CONFIG_H
-])
-AH_BOTTOM([
-#endif
-])
-
-
-AC_CONFIG_FILES([
-  Makefile
-  compiler/cpp/Makefile
-  compiler/cpp/src/Makefile
-  compiler/cpp/src/thrift/plugin/Makefile
-  compiler/cpp/test/Makefile
-  compiler/cpp/src/thrift/version.h
-  lib/Makefile
-  lib/cpp/Makefile
-  lib/cpp/test/Makefile
-  lib/cpp/thrift-nb.pc
-  lib/cpp/thrift-z.pc
-  lib/cpp/thrift-qt.pc
-  lib/cpp/thrift-qt5.pc
-  lib/cpp/thrift.pc
-  lib/c_glib/Makefile
-  lib/c_glib/thrift_c_glib.pc
-  lib/c_glib/test/Makefile
-  lib/csharp/Makefile
-  lib/csharp/test/Multiplex/Makefile
-  lib/d/Makefile
-  lib/d/test/Makefile
-  lib/erl/Makefile
-  lib/go/Makefile
-  lib/go/test/Makefile
-  lib/haxe/test/Makefile
-  lib/hs/Makefile
-  lib/java/Makefile
-  lib/js/Makefile
-  lib/js/test/Makefile
-  lib/json/Makefile
-  lib/json/test/Makefile
-  lib/nodejs/Makefile
-  lib/perl/Makefile
-  lib/perl/test/Makefile
-  lib/php/Makefile
-  lib/php/test/Makefile
-  lib/dart/Makefile
-  lib/py/Makefile
-  lib/rb/Makefile
-  lib/lua/Makefile
-  lib/xml/Makefile
-  lib/xml/test/Makefile
-  test/Makefile
-  test/features/Makefile
-  test/c_glib/Makefile
-  test/cpp/Makefile
-  test/csharp/Makefile
-  test/erl/Makefile
-  test/go/Makefile
-  test/haxe/Makefile
-  test/hs/Makefile
-  test/lua/Makefile
-  test/php/Makefile
-  test/dart/Makefile
-  test/perl/Makefile
-  test/py/Makefile
-  test/py.twisted/Makefile
-  test/py.tornado/Makefile
-  test/rb/Makefile
-  tutorial/Makefile
-  tutorial/c_glib/Makefile
-  tutorial/cpp/Makefile
-  tutorial/d/Makefile
-  tutorial/go/Makefile
-  tutorial/haxe/Makefile
-  tutorial/hs/Makefile
-  tutorial/java/Makefile
-  tutorial/js/Makefile
-  tutorial/nodejs/Makefile
-  tutorial/dart/Makefile
-  tutorial/py/Makefile
-  tutorial/py.twisted/Makefile
-  tutorial/py.tornado/Makefile
-  tutorial/rb/Makefile
-])
-
-if test "$have_cpp" = "yes" ; then MAYBE_CPP="cpp" ; else MAYBE_CPP="" ; fi
-AC_SUBST([MAYBE_CPP])
-if test "$have_c_glib" = "yes" ; then MAYBE_C_GLIB="c_glib" ; else MAYBE_C_GLIB="" ; fi
-AC_SUBST([MAYBE_C_GLIB])
-if test "$have_d" = "yes" -a "$have_deimos_event2" = "yes" -a "$have_deimos_openssl" = "yes"; then MAYBE_D="d" ; else MAYBE_D="" ; fi
-AC_SUBST([MAYBE_D])
-if test "$have_java" = "yes" ; then MAYBE_JAVA="java" ; else MAYBE_JAVA="" ; fi
-AC_SUBST([MAYBE_JAVA])
-if test "$have_csharp" = "yes" ; then MAYBE_CSHARP="csharp" ; else MAYBE_CSHARP="" ; fi
-AC_SUBST([MAYBE_CSHARP])
-if test "$have_python" = "yes" ; then MAYBE_PYTHON="py" ; else MAYBE_PYTHON="" ; fi
-AC_SUBST([MAYBE_PYTHON])
-if test "$have_py3" = "yes" ; then MAYBE_PY3="py3" ; else MAYBE_PY3="" ; fi
-AC_SUBST([MAYBE_PY3])
-if test "$have_ruby" = "yes" ; then MAYBE_RUBY="rb" ; else MAYBE_RUBY="" ; fi
-AC_SUBST([MAYBE_RUBY])
-if test "$have_haskell" = "yes" ; then MAYBE_HASKELL="hs" ; else MAYBE_HASKELL="" ; fi
-AC_SUBST([MAYBE_HASKELL])
-if test "$have_perl" = "yes" ; then MAYBE_PERL="perl" ; else MAYBE_PERL="" ; fi
-AC_SUBST([MAYBE_PERL])
-if test "$have_php" = "yes" ; then MAYBE_PHP="php" ; else MAYBE_PHP="" ; fi
-AC_SUBST([MAYBE_PHP])
-if test "$have_dart" = "yes" ; then MAYBE_DART="dart" ; else MAYBE_DART="" ; fi
-AC_SUBST([MAYBE_DART])
-if test "$have_go" = "yes" ; then MAYBE_GO="go" ; else MAYBE_GO="" ; fi
-AC_SUBST([MAYBE_GO])
-if test "$have_nodejs" = "yes" ; then MAYBE_NODEJS="nodejs" ; else MAYBE_NODEJS="" ; fi
-AC_SUBST([MAYBE_NODEJS])
-if test "$have_erlang" = "yes" ; then MAYBE_ERLANG="erl" ; else MAYBE_ERLANG="" ; fi
-AC_SUBST([MAYBE_ERLANG])
-if test "$have_lua" = "yes" ; then MAYBE_LUA="lua" ; else MAYBE_LUA="" ; fi
-AC_SUBST([MAYBE_LUA])
-
-AC_OUTPUT
-
-
-echo
-echo "$PACKAGE $VERSION"
-echo
-echo "Building Plugin Support ...... : $have_plugin"
-echo "Building C++ Library ......... : $have_cpp"
-echo "Building C (GLib) Library .... : $have_c_glib"
-echo "Building Java Library ........ : $have_java"
-echo "Building C# Library .......... : $have_csharp"
-echo "Building Python Library ...... : $have_python"
-echo "Building Ruby Library ........ : $have_ruby"
-echo "Building Haxe Library ........ : $have_haxe"
-echo "Building Haskell Library ..... : $have_haskell"
-echo "Building Perl Library ........ : $have_perl"
-echo "Building PHP Library ......... : $have_php"
-echo "Building Dart Library ........ : $have_dart"
-echo "Building Erlang Library ...... : $have_erlang"
-echo "Building Go Library .......... : $have_go"
-echo "Building D Library ........... : $have_d"
-echo "Building NodeJS Library ...... : $have_nodejs"
-echo "Building Lua Library ......... : $have_lua"
-
-if test "$have_cpp" = "yes" ; then
-  echo
-  echo "C++ Library:"
-  echo "   Build TZlibTransport ...... : $have_zlib"
-  echo "   Build TNonblockingServer .. : $have_libevent"
-  echo "   Build TQTcpServer (Qt4) .... : $have_qt"
-  echo "   Build TQTcpServer (Qt5) .... : $have_qt5"
-fi
-if test "$have_java" = "yes" ; then
-  echo
-  echo "Java Library:"
-  echo "   Using javac ............... : $JAVAC"
-  echo "   Using java ................ : $JAVA"
-  echo "   Using ant ................. : $ANT"
-fi
-if test "$have_csharp" = "yes" ; then
-  echo
-  echo "C# Library:"
-  echo "   Using .NET 3.5 ............ : $net_3_5"
-fi
-if test "$have_python" = "yes" ; then
-  echo
-  echo "Python Library:"
-  echo "   Using Python .............. : $PYTHON"
-  if test "$have_py3" = "yes" ; then
-  echo "   Using Python3 ............. : $PYTHON3"
-  fi
-  if test "$have_trial" = "yes"; then
-  echo "   Using trial ............... : $TRIAL"
-  fi
-fi
-if test "$have_php" = "yes" ; then
-  echo
-  echo "PHP Library:"
-  echo "   Using php-config .......... : $PHP_CONFIG"
-fi
-if test "$have_dart" = "yes" ; then
-  echo
-  echo "Dart Library:"
-  echo "   Using Dart ................ : $DART"
-  echo "   Using Pub ................. : $DARTPUB"
-fi
-if test "$have_ruby" = "yes" ; then
-  echo
-  echo "Ruby Library:"
-  echo "   Using Ruby ................ : $RUBY"
-fi
-if test "$have_haskell" = "yes" ; then
-  echo
-  echo "Haskell Library:"
-  echo "   Using Haskell ............. : $RUNHASKELL"
-  echo "   Using Cabal ............... : $CABAL"
-fi
-if test "$have_haxe" = "yes" ; then
-  echo
-  echo "Haxe Library:"
-  echo "   Using Haxe ................ : $HAXE"
-  echo "   Using Haxe version ........ : $HAXE_VERSION"
-fi
-if test "$have_perl" = "yes" ; then
-  echo
-  echo "Perl Library:"
-  echo "   Using Perl ................ : $PERL"
-fi
-if test "$have_erlang" = "yes" ; then
-  echo
-  echo "Erlang Library:"
-  echo "   Using erlc ................ : $ERLC"
-  echo "   Using rebar ............... : $REBAR"
-fi
-if test "$have_go" = "yes" ; then
-  echo
-  echo "Go Library:"
-  echo "   Using Go................... : $GO"
-  echo "   Using Go version........... : $($GO version)"
-fi
-if test "$have_d" = "yes" ; then
-  echo
-  echo "D Library:"
-  echo "   Using D Compiler .......... : $DMD"
-  echo "   Building D libevent tests . : $with_d_event_tests"
-  echo "   Building D SSL tests ...... : $with_d_ssl_tests"
-fi
-if test "$have_nodejs" = "yes" ; then
-  echo
-  echo "NodeJS Library:"
-  echo "   Using NodeJS .............. : $NODEJS"
-  echo "   Using NodeJS version....... : $($NODEJS --version)"
-fi
-if test "$have_lua" = "yes" ; then
-  echo
-  echo "Lua Library:"
-  echo "   Using Lua .............. : $LUA"
-fi
-echo
-echo "If something is missing that you think should be present,"
-echo "please skim the output of configure to find the missing"
-echo "component.  Details are present in config.log."
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/App.config b/vendor/git.apache.org/thrift.git/contrib/Rebus/App.config
deleted file mode 100644
index 4208af6..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/App.config
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-  
-  <configSections>
-    <section name="rebus" type="Rebus.Configuration.RebusConfigurationSection, Rebus"/>
-  </configSections>
-
-  <rebus inputQueue="MyResponses" errorQueue="MyErrors" workers="1">
-    <endpoints>
-      <add messages="RebusSample.MathRequestCall, RebusSample" endpoint="MathRequests"/>
-      <add messages="RebusSample.MathResponseCall, RebusSample" endpoint="MathResponses"/>
-    </endpoints>
-  </rebus>
-
-  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/Program.cs b/vendor/git.apache.org/thrift.git/contrib/Rebus/Program.cs
deleted file mode 100644
index 563c62a..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/Program.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using Rebus.Configuration;
-using Rebus.RabbitMQ;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RebusSample.Client;
-using RebusSample.Server;
-
-namespace RebusSample
-{
-    class Program
-    {
-        static BuiltinContainerAdapter StartRequestServer(string server)
-        {
-            // client Rebus configuration
-            var adapter = new BuiltinContainerAdapter();
-            Configure.With(adapter)
-                .Transport(t => t.UseRabbitMq("amqp://" + server, "MathRequests", "MathRequestErrors"))
-                .MessageOwnership(o => o.FromRebusConfigurationSection())
-                .CreateBus().Start();
-
-            // register all relevant message handlers 
-            adapter.Register(typeof(MathRequestCallHandler));
-            return adapter;
-        }
-
-
-        static BuiltinContainerAdapter StartResponseServer(string server)
-        {
-            // client Rebus configuration
-            var adapter = new BuiltinContainerAdapter();
-            Configure.With(adapter)
-                .Transport(t => t.UseRabbitMq("amqp://" + server, "MathResponses", "MathResponseErrors"))
-                .MessageOwnership(o => o.FromRebusConfigurationSection())
-                .CreateBus().Start();
-
-            // register all relevant message handlers 
-            adapter.Register(typeof(MathResponseCallHandler));
-            return adapter;
-        }
-
-        static void Main(string[] args)
-        {
-            string server = "localhost";
-
-            // start all servers
-            var req = StartRequestServer(server);
-            var rsp = StartResponseServer(server);
-
-            // send the first message
-            var random = new Random();
-            var client = new MathRequestClient(server);
-            client.DoTheMath(random.Next(), random.Next());
-
-            // now what?
-            Console.Write("Hit <ENTER> to stop ... ");
-            Console.ReadLine();
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/contrib/Rebus/Properties/AssemblyInfo.cs
deleted file mode 100644
index e476eab..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("RebusSample")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RebusSample")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("0af10984-40d3-453d-b1e5-421529e8c7e2")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/README.md b/vendor/git.apache.org/thrift.git/contrib/Rebus/README.md
deleted file mode 100644
index bbb9c49..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Sample code for the combination of Thrift with Rebus.
-
-Rebus is a .NET service bus, similar to NServiceBus, but more lightweight. 
-It ihas been mainly written by Mogens Heller Grabe and is currently hosted 
-on GitHub (https://github.com/rebus-org/Rebus)
-
-As with all ServiceBus or MQ scenarios, due to the highly asynchronous 
-operations it is recommended to do all calls as "oneway void" calls.
-
-The configuration can be done via App.Config, via code or even mixed from 
-both locations. Refer to the Rebus documentation for further details. For 
-this example, since we are effectively implementing two queue listeners in 
-only one single process, we do configuration of incoming and error queues 
-in the code.
-
-If you want to communicate with non-NET languages, you may need a customized 
-serializer as well, in order to override Rebus' default wire format. Please 
-refer to the Rebus docs on how to do that (it's not that hard, really).
-
-Additional requirements:
-- RabbitMQ .NET client (see nuget)
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/RebusSample.csproj b/vendor/git.apache.org/thrift.git/contrib/Rebus/RebusSample.csproj
deleted file mode 100644
index 4058a6d..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/RebusSample.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{264E2126-EDE0-4B47-89C1-B397B25BB13D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RebusSample</RootNamespace>
-    <AssemblyName>RebusSample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="RabbitMQ.Client">
-      <HintPath>..\..\..\..\..\Toolbox\ServiceBus\3rdparty\rabbitmq-dotnet-client-3.2.1-dotnet-3.0\bin\RabbitMQ.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Rebus">
-      <HintPath>..\..\..\..\..\Toolbox\ServiceBus\3rdparty\Rebus-master\deploy\NET40\Rebus.dll</HintPath>
-    </Reference>
-    <Reference Include="Rebus.RabbitMQ">
-      <HintPath>..\..\..\..\..\Toolbox\ServiceBus\3rdparty\Rebus-master\deploy\NET40\Rebus.RabbitMQ.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="gen-csharp\BasicMathClient.cs" />
-    <Compile Include="gen-csharp\BasicMathServer.cs" />
-    <Compile Include="ServiceImpl\Both.cs" />
-    <Compile Include="ServiceImpl\Client.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ServiceImpl\Server.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <ProjectReference Include="..\..\lib\csharp\src\Thrift.csproj">
-      <Project>{499eb63c-d74c-47e8-ae48-a2fc94538e9d}</Project>
-      <Name>Thrift</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>cd $(ProjectDir)
-if not exist gen-csharp\*.cs   thrift  -gen csharp sample.thrift
-</PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/RebusSample.sln b/vendor/git.apache.org/thrift.git/contrib/Rebus/RebusSample.sln
deleted file mode 100644
index 284ef36..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/RebusSample.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RebusSample", "RebusSample.csproj", "{264E2126-EDE0-4B47-89C1-B397B25BB13D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thrift", "..\..\lib\csharp\src\Thrift.csproj", "{499EB63C-D74C-47E8-AE48-A2FC94538E9D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{264E2126-EDE0-4B47-89C1-B397B25BB13D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{264E2126-EDE0-4B47-89C1-B397B25BB13D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{264E2126-EDE0-4B47-89C1-B397B25BB13D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{264E2126-EDE0-4B47-89C1-B397B25BB13D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Both.cs b/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Both.cs
deleted file mode 100644
index fba67ec..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Both.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-
-
-namespace RebusSample
-{
-    // generic data container for serialized Thrift calls
-    public class GenericThriftServiceCall
-    {
-        public byte[] rawBytes;
-    }
-
-    // specific containers (one per Thrift service) to leverage Rebus' handler routing
-    public class MathRequestCall : GenericThriftServiceCall { }
-    public class MathResponseCall : GenericThriftServiceCall { }
-
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Client.cs b/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Client.cs
deleted file mode 100644
index 2408041..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Client.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using Rebus;
-using Rebus.Configuration;
-using Rebus.Messages;
-using Rebus.RabbitMQ;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Thrift.Protocol;
-using Thrift.Transport;
-
-/*
- * The client emits calls to BasicMathServers
- * 
- * The client implements the BasicMathClient service. 
- * If the server has processed our request, we get the results back through this service
- */
-
-namespace RebusSample.Client
-{
-
-    // handler to be registered with Rebus
-    class MathResponseCallHandler : IHandleMessages<MathResponseCall>
-    {
-        public void Handle(MathResponseCall message)
-        {
-            // Thrift protocol/transport stack
-            var stm = new MemoryStream(message.rawBytes);
-            var trns = new TStreamTransport(stm, null);
-            var prot = new TBinaryProtocol(trns);
-
-            // create a processor and let him handle the call
-            var hndl = new MathResponsesHandler();
-            var proc = new BasicMathClient.Processor(hndl);
-            proc.Process(prot, null);  // oneway only
-        }      
-    }
-
-
-    // serves incoming responses with calculation results
-    internal class MathResponsesHandler : BasicMathClient.Iface
-    {
-        public void FourResults(int added, int multiplied, int subtracted, int divided)
-        {
-            Console.WriteLine("added = {0}", added);
-            Console.WriteLine("multiplied= {0}", multiplied);
-            Console.WriteLine("subtracted = {0}", subtracted);
-            Console.WriteLine("divided = {0}", divided);
-
-            PingAndDoAnotherCalculation();
-        }
-
-
-        public void ThreeResults(int added, int multiplied, int subtracted)
-        {
-            Console.WriteLine("added = {0}", added);
-            Console.WriteLine("multiplied= {0}", multiplied);
-            Console.WriteLine("subtracted = {0}", subtracted);
-            Console.WriteLine("DIV/0 error during division");
-
-            PingAndDoAnotherCalculation();
-        }
-
-
-        public void Pong(long value)
-        {
-            var latency = DateTime.Now.Ticks - value;
-            Console.WriteLine("Ping took {0} ms", new DateTime(latency).Millisecond);
-        }
-
-
-        private void PingAndDoAnotherCalculation()
-        {
-            var random = new Random();
-            var client = new MathRequestClient("localhost");
-            client.Ping(DateTime.Now.Ticks);
-            client.DoTheMath(random.Next(), random.Next());
-        }
-    }
-
-
-    // provides the client-side interface for calculation requests
-    internal class MathRequestClient : BasicMathServer.Iface
-    {
-        private BuiltinContainerAdapter MQAdapter;
-
-
-        public MathRequestClient(string server)
-        {
-            MQAdapter = new BuiltinContainerAdapter();
-            Configure.With(MQAdapter)
-                .Transport(t => t.UseRabbitMqInOneWayMode("amqp://" + server))  // we need send only
-                .MessageOwnership(o => o.FromRebusConfigurationSection())
-                .CreateBus().Start();
-        }
-
-
-        public void SerializeThriftCall(Action<BasicMathServer.Iface> action)
-        {
-            // Thrift protocol/transport stack
-            var stm = new MemoryStream();
-            var trns = new TStreamTransport(null, stm);
-            var prot = new TBinaryProtocol(trns);
-            
-            // serialize the call into a bunch of bytes
-            var client = new BasicMathServer.Client(prot);
-            if( action != null)
-                action(client);
-            else
-                throw new ArgumentException("action must not be null");
-
-            // make sure everything is written to the MemoryStream
-            trns.Flush();
-
-            // send the message
-            var msg = new MathRequestCall() { rawBytes = stm.ToArray() };
-            MQAdapter.Bus.Send(msg);
-        }
-
-
-        public void Ping(long value)
-        {
-            SerializeThriftCall(client =>
-            {
-                client.Ping(value);
-            });
-        }
-
-
-        public void DoTheMath( int arg1, int arg2)
-        {
-            SerializeThriftCall(client =>
-            {
-                client.DoTheMath(arg1, arg2);
-            });
-        }
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Server.cs b/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Server.cs
deleted file mode 100644
index 149d513..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/ServiceImpl/Server.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using Rebus;
-using Rebus.Configuration;
-using Rebus.Messages;
-using Rebus.RabbitMQ;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Thrift.Protocol;
-using Thrift.Transport;
-
-/*
- * The server implements the BasicMathServer service .
- * All results are sent back to the client via the BasicMathClient service
- */
-
-
-namespace RebusSample.Server
-{
-    // handler to be registered with Rebus
-    class MathRequestCallHandler : IHandleMessages<MathRequestCall>
-    {
-        public void Handle(MathRequestCall message)
-        {
-            // Thrift protocol/transport stack
-            var stm = new MemoryStream(message.rawBytes);
-            var trns = new TStreamTransport(stm, null);
-            var prot = new TBinaryProtocol(trns);
-
-            // create a processor and let him handle the call
-            var hndl = new MathRequestsHandler();
-            var proc = new BasicMathServer.Processor(hndl);
-            proc.Process(prot, null);  // oneway only
-        }
-    }
-
-
-    // serves incoming calculation requests
-    internal class MathRequestsHandler : BasicMathServer.Iface
-    {
-        public void Ping(long value)
-        {
-            var client = new MathResponseClient("localhost");
-            client.Pong(value);
-        }
-
-
-        public void DoTheMath(int arg1, int arg2)
-        {
-            var client = new MathResponseClient("localhost");
-            if( arg2 != 0)
-                client.FourResults( arg1+arg2, arg1*arg2, arg1-arg2, arg1/arg2);
-            else
-                client.ThreeResults( arg1+arg2, arg1*arg2, arg1-arg2);
-        }
-    }
-
-
-    // provides the client-side interface for calculation responses
-    internal class MathResponseClient : BasicMathClient.Iface
-    {
-        private BuiltinContainerAdapter MQAdapter;
-
-
-        public MathResponseClient(string server)
-        {
-            MQAdapter = new BuiltinContainerAdapter();
-            Configure.With(MQAdapter)
-                .Transport(t => t.UseRabbitMqInOneWayMode("amqp://" + server))  // we need send only
-                .MessageOwnership(o => o.FromRebusConfigurationSection())
-                .CreateBus().Start();
-        }
-
-
-        public void SerializeThriftCall(Action<BasicMathClient.Iface> action)
-        {
-            // Thrift protocol/transport stack
-            var stm = new MemoryStream();
-            var trns = new TStreamTransport(null, stm);
-            var prot = new TBinaryProtocol(trns);
-
-            // serialize the call into a bunch of bytes
-            var client = new BasicMathClient.Client(prot);
-            if (action != null)
-                action(client);
-            else
-                throw new ArgumentException("action must not be null");
-
-            // make sure everything is written to the MemoryStream
-            trns.Flush();
-
-            // send the message
-            var msg = new MathResponseCall() { rawBytes = stm.ToArray() };
-            MQAdapter.Bus.Send(msg);
-        }
-
-
-        public void Pong(long value)
-        {
-            SerializeThriftCall(client =>
-            {
-                client.Pong(value);
-            });
-        }
-
-
-        public void ThreeResults(int added, int multiplied, int suctracted)
-        {
-            SerializeThriftCall(client =>
-            {
-                client.ThreeResults(added, multiplied, suctracted);
-            });
-        }
-
-
-        public void FourResults(int added, int multiplied, int suctracted, int divided)
-        {
-            SerializeThriftCall(client =>
-            {
-                client.FourResults(added, multiplied, suctracted, divided);
-            });
-        }
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/Rebus/sample.thrift b/vendor/git.apache.org/thrift.git/contrib/Rebus/sample.thrift
deleted file mode 100644
index 785e2d3..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Rebus/sample.thrift
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-service BasicMathServer {
-    oneway void DoTheMath( 1: i32 arg1,  2: i32 arg2)
-    oneway void Ping(1: i64 value)
-}
-
-service BasicMathClient {
-    oneway void ThreeResults( 1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted);
-    oneway void FourResults(  1 : i32 added, 2 : i32 multiplied, 3 : i32 subtracted, 4 : i32 divided);
-    oneway void Pong(1: i64 value)
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/Stomp/README.md b/vendor/git.apache.org/thrift.git/contrib/Stomp/README.md
deleted file mode 100644
index 2e5f21c..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Stomp/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Sample code for STOMP-based Thrift clients and/or servers.
-
-Although the sample Thrift STOMP Transport is written in 
-Delphi/Pascal, it can easily serve as a starting point for 
-similar implementations in other languages.
-
-STOMP is a protocol widely supported by many messaging systems,
-such as Apache ActiveMQ, RabbitMQ and many others. In particular,
-it can be used to communicate with Service-Bus products like Rebus
-or NServiceBus, when running against a STOMP-capable MQ system.
-
-A prerequisite for this sample is the Delphi STOMP Adapter written
-by Daniele Teti (http://www.danieleteti.it/stomp-client), currently
-hosted at Google Code (http://code.google.com/p/delphistompclient).
-
-At the time of writing, the STOMP adapter does not fully support 
-binary data. Please check whether this has been fixed, otherwise 
-you have to use the JSON protocol (or to fix it on your own).
diff --git a/vendor/git.apache.org/thrift.git/contrib/Stomp/Thrift.Transport.STOMP.pas b/vendor/git.apache.org/thrift.git/contrib/Stomp/Thrift.Transport.STOMP.pas
deleted file mode 100644
index 7dfb376..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Stomp/Thrift.Transport.STOMP.pas
+++ /dev/null
@@ -1,200 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.Transport.STOMP;
-
-interface
-
-uses
-  Classes,Windows, SysUtils,
-  Thrift,
-  Thrift.Transport,
-  Thrift.Protocol,
-  Thrift.Stream,
-  StompClient,
-  StompTypes;
-
-type
-  TStompTransportImpl = class( TStreamTransportImpl)
-  strict private
-    FData     : TStringStream;
-    FServer   : string;
-    FOutQueue : string;
-    FStompCli : IStompClient;
-  protected
-    function GetIsOpen: Boolean; override;
-    function Peek: Boolean; override;
-  public
-    constructor Create( const aServerAndPort, aOutQueue : string);
-    destructor Destroy;  override;
-
-    procedure Open();  override;
-    procedure Close();  override;
-    procedure Flush;  override;
-  end;
-
-
-  TStompServerTransportImpl = class( TServerTransportImpl)
-  strict private
-    FServer  : string;
-    FInQueue : string;
-    FClient  : IStompClient;
-  protected
-    procedure Listen; override;
-    procedure Close; override;
-    function Accept( const fnAccepting: TProc): ITransport; override;
-  public
-    constructor Create( const aServerAndPort, aInQueue : string);
-    destructor Destroy;  override;
-  end;
-
-
-const
-  QUEUE_PREFIX    = '/queue/';
-  TOPIC_PREFIX    = '/topic/';
-  EXCHANGE_PREFIX = '/exchange/';
-
-
-implementation
-
-
-
-constructor TStompTransportImpl.Create( const aServerAndPort, aOutQueue : string);
-var adapter : IThriftStream;
-begin
-  FData     := TStringStream.Create;
-  FServer   := aServerAndPort;
-  FOutQueue := aOutQueue;
-
-  adapter := TThriftStreamAdapterDelphi.Create( FData, FALSE);
-  inherited Create( nil, adapter);  // output only
-end;
-
-
-destructor TStompTransportImpl.Destroy;
-begin
-  inherited Destroy;
-  FreeAndNil( FData);
-  FStompCli := nil;
-end;
-
-
-function TStompTransportImpl.GetIsOpen: Boolean;
-begin
-  result := (FStompCli <> nil);
-end;
-
-
-function TStompTransportImpl.Peek: Boolean;
-begin
-  result := FALSE;  // output only
-end;
-
-
-procedure TStompTransportImpl.Open;
-begin
-  if FStompCli <> nil
-  then raise TTransportException.Create( TTransportException.TExceptionType.AlreadyOpen, 'already open')
-  else FStompCli := StompUtils.NewStomp( FServer);
-end;
-
-
-procedure TStompTransportImpl.Close;
-begin
-  FStompCli := nil;
-  FData.Clear;
-end;
-
-
-procedure TStompTransportImpl.Flush;
-begin
-  if FStompCli = nil
-  then raise TTransportException.Create( TTransportException.TExceptionType.NotOpen, 'not open');
-
-  FStompCli.Send( FOutQueue, FData.DataString);
-  FData.Clear;
-end;
-
-
-//--- TStompServerTransportImpl --------------------------------------------
-
-
-constructor TStompServerTransportImpl.Create( const aServerAndPort, aInQueue : string);
-begin
-  inherited Create;
-  FServer  := aServerAndPort;
-  FInQueue := aInQueue;
-end;
-
-
-destructor TStompServerTransportImpl.Destroy;
-begin
-  try
-    Close;
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-procedure TStompServerTransportImpl.Listen;
-begin
-  FClient := StompUtils.NewStomp(FServer);
-  FClient.Subscribe( FInQueue);
-end;
-
-
-procedure TStompServerTransportImpl.Close;
-begin
-  if FClient <> nil then begin
-    FClient.Unsubscribe( FInQueue);
-    FClient := nil;
-  end;
-end;
-
-
-function TStompServerTransportImpl.Accept( const fnAccepting: TProc): ITransport;
-var frame   : IStompFrame;
-    adapter : IThriftStream;
-    stream  : TStringStream;
-begin
-  if FClient = nil
-  then raise TTransportException.Create( TTransportException.TExceptionType.NotOpen,
-                                         'Not connected.');
-
-  if Assigned(fnAccepting)
-  then fnAccepting();
-
-  try
-    frame := FClient.Receive(MAXINT);
-    if frame = nil then Exit(nil);
-
-    stream  := TStringStream.Create( frame.GetBody);
-    adapter := TThriftStreamAdapterDelphi.Create( stream, TRUE);
-    result  := TStreamTransportImpl.Create( adapter, nil);
-
-  except
-    on E: Exception
-    do raise TTransportException.Create( E.ToString );
-  end;
-end;
-
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/Vagrantfile b/vendor/git.apache.org/thrift.git/contrib/Vagrantfile
deleted file mode 100644
index 3bcc46a..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/Vagrantfile
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$build_and_test = <<SCRIPT
-echo "Provisioning system to compile and test Apache Thrift."
-
-# Create swap space
-sudo fallocate -l 2G /swapfile
-sudo chmod 600 /swapfile
-sudo mkswap /swapfile
-sudo swapon /swapfile
-sudo swapon -s
-
-# Update the system
-sudo DEBIAN_FRONTEND=noninteractive apt-get update -qq -y
-sudo DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq -y
-
-# Install Dependencies
-# ---
-# General dependencies
-sudo apt-get install -qq automake libtool flex bison pkg-config g++ libssl-dev make libqt4-dev git debhelper
-
-# C++ dependencies
-sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libboost-filesystem-dev libboost-system-dev libevent-dev 
-
-# Java dependencies
-sudo apt-get install -qq ant openjdk-7-jdk maven
-
-# Python dependencies
-sudo apt-get install -qq python-all python-all-dev python-all-dbg python-setuptools python-support python-six python3-six
-
-# Ruby dependencies
-sudo apt-get install -qq ruby ruby-dev
-sudo gem install bundler rake
-
-# Perl dependencies
-sudo apt-get install -qq libbit-vector-perl libclass-accessor-class-perl
-
-# Php dependencies
-sudo apt-get install -qq php5 php5-dev php5-cli php-pear re2c
-
-# GlibC dependencies
-sudo apt-get install -qq libglib2.0-dev
-
-# Erlang dependencies
-sudo apt-get install -qq erlang-base erlang-eunit erlang-dev erlang-tools
-
-# GO dependencies
-echo "golang-go golang-go/dashboard boolean false" | debconf-set-selections
-sudo apt-get -y install -qq golang golang-go
-
-# Haskell dependencies
-sudo apt-get install -qq ghc cabal-install libghc-binary-dev libghc-network-dev libghc-http-dev libghc-hashable-dev libghc-unordered-containers-dev libghc-vector-dev
-sudo cabal update
-
-# Lua dependencies
-sudo apt-get install -qq lua5.2 lua5.2-dev
-
-# Node.js dependencies
-sudo apt-get install -qq nodejs nodejs-dev nodejs-legacy npm
-
-# CSharp
-sudo apt-get install -qq mono-gmcs mono-devel mono-xbuild mono-complete libmono-system-web2.0-cil
-sudo apt-get install -qq mingw32 mingw32-binutils mingw32-runtime nsis
-
-# D dependencies
-sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
-sudo apt-get update && sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring && sudo apt-get update
-sudo apt-get install -qq xdg-utils dmd-bin
-
-# Customize the system
-# ---
-# Default java to latest 1.7 version
-update-java-alternatives -s java-1.7.0-openjdk-amd64 
-
-# PHPUnit package broken in ubuntu. see https://bugs.launchpad.net/ubuntu/+source/phpunit/+bug/701544
-sudo apt-get upgrade pear
-sudo pear channel-discover pear.phpunit.de
-sudo pear channel-discover pear.symfony.com
-sudo pear channel-discover components.ez.no
-sudo pear update-channels
-sudo pear upgrade-all
-sudo pear install --alldeps phpunit/PHPUnit
-
-date > /etc/vagrant.provisioned
-
-# Start the source build
-# ---
-echo "Starting Apache Thrift build..."
-cd /thrift
-sh bootstrap.sh
-sh configure
-make
-make check
-echo "Finished building Apache Thrift."
-
-SCRIPT
-
-Vagrant.configure("2") do |config|
-  # Ubuntu 14.04 LTS (Trusty Tahr)
-  config.vm.box = "trusty64"
-  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
-
-  config.vm.synced_folder "../", "/thrift"
-
-  config.vm.provider :virtualbox do |vbox|
-    vbox.customize ["modifyvm", :id, "--memory", "1024"]
-    vbox.customize ["modifyvm", :id, "--cpus", "2"]
-    vbox.customize ["modifyvm", :id, "--rtcuseutc", "on"]
-  end
-
-  # Run the build script to configure the system
-  config.vm.provision :shell, :inline => $build_and_test
-end
diff --git a/vendor/git.apache.org/thrift.git/contrib/async-test/aggr.thrift b/vendor/git.apache.org/thrift.git/contrib/async-test/aggr.thrift
deleted file mode 100644
index c016a65..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/async-test/aggr.thrift
+++ /dev/null
@@ -1,8 +0,0 @@
-exception Error {
-  1: string desc;
-}
-
-service Aggr {
-  void addValue(1: i32 value);
-  list<i32> getValues() throws (1: Error err);
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/async-test/test-leaf.py b/vendor/git.apache.org/thrift.git/contrib/async-test/test-leaf.py
deleted file mode 100755
index 4ea4a9b..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/async-test/test-leaf.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-import sys
-import time
-from thrift.transport import TTransport
-from thrift.transport import TSocket
-from thrift.protocol import TBinaryProtocol
-from thrift.server import THttpServer
-from aggr import Aggr
-
-
-class AggrHandler(Aggr.Iface):
-    def __init__(self):
-        self.values = []
-
-    def addValue(self, value):
-        self.values.append(value)
-
-    def getValues(self, ):
-        time.sleep(1)
-        return self.values
-
-processor = Aggr.Processor(AggrHandler())
-pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-THttpServer.THttpServer(processor, ('', int(sys.argv[1])), pfactory).serve()
diff --git a/vendor/git.apache.org/thrift.git/contrib/async-test/test-server.cpp b/vendor/git.apache.org/thrift.git/contrib/async-test/test-server.cpp
deleted file mode 100644
index b304e1b..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/async-test/test-server.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <tr1/functional>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/async/TAsyncProtocolProcessor.h>
-#include <thrift/async/TEvhttpServer.h>
-#include <thrift/async/TEvhttpClientChannel.h>
-#include "Aggr.h"
-
-using std::tr1::bind;
-using std::tr1::placeholders::_1;
-
-using apache::thrift::TException;
-using apache::thrift::protocol::TBinaryProtocolFactory;
-using apache::thrift::protocol::TProtocolFactory;
-using apache::thrift::async::TEvhttpServer;
-using apache::thrift::async::TAsyncProcessor;
-using apache::thrift::async::TAsyncBufferProcessor;
-using apache::thrift::async::TAsyncProtocolProcessor;
-using apache::thrift::async::TAsyncChannel;
-using apache::thrift::async::TEvhttpClientChannel;
-
-class AggrAsyncHandler : public AggrCobSvIf {
- protected:
-  struct RequestContext {
-    std::tr1::function<void(std::vector<int32_t> const& _return)> cob;
-    std::vector<int32_t> ret;
-    int pending_calls;
-  };
-
- public:
-  AggrAsyncHandler()
-    : eb_(NULL)
-    , pfact_(new TBinaryProtocolFactory())
-  {
-    leaf_ports_.push_back(8081);
-    leaf_ports_.push_back(8082);
-  }
-
-  void addValue(std::tr1::function<void()> cob, const int32_t value) {
-    // Silently drop writes to the aggrgator.
-    return cob();
-  }
-
-  void getValues(std::tr1::function<void(
-        std::vector<int32_t> const& _return)> cob,
-      std::tr1::function<void(::apache::thrift::TDelayedException* _throw)> exn_cob) {
-    RequestContext* ctx = new RequestContext();
-    ctx->cob = cob;
-    ctx->pending_calls = leaf_ports_.size();
-    for (std::vector<int>::iterator it = leaf_ports_.begin();
-        it != leaf_ports_.end(); ++it) {
-      boost::shared_ptr<TAsyncChannel> channel(
-          new TEvhttpClientChannel(
-            "localhost", "/", "127.0.0.1", *it, eb_));
-      AggrCobClient* client = new AggrCobClient(channel, pfact_.get());
-      client->getValues(std::tr1::bind(&AggrAsyncHandler::clientReturn, this, ctx, _1));
-    }
-  }
-
-  void setEventBase(struct event_base* eb) {
-    eb_ = eb;
-  }
-
-  void clientReturn(RequestContext* ctx, AggrCobClient* client) {
-    ctx->pending_calls -= 1;
-
-    try {
-      std::vector<int32_t> subret;
-      client->recv_getValues(subret);
-      ctx->ret.insert(ctx->ret.end(), subret.begin(), subret.end());
-    } catch (TException& exn) {
-      // TODO: Log error
-    }
-
-    delete client;
-
-    if (ctx->pending_calls == 0) {
-      ctx->cob(ctx->ret);
-      delete ctx;
-    }
-  }
-
- protected:
-  struct event_base* eb_;
-  std::vector<int> leaf_ports_;
-  boost::shared_ptr<TProtocolFactory> pfact_;
-};
-
-
-int main() {
-  boost::shared_ptr<AggrAsyncHandler> handler(new AggrAsyncHandler());
-  boost::shared_ptr<TAsyncProcessor> proc(new AggrAsyncProcessor(handler));
-  boost::shared_ptr<TProtocolFactory> pfact(new TBinaryProtocolFactory());
-  boost::shared_ptr<TAsyncBufferProcessor> bufproc(new TAsyncProtocolProcessor(proc, pfact));
-  boost::shared_ptr<TEvhttpServer> server(new TEvhttpServer(bufproc, 8080));
-  handler->setEventBase(server->getEventBase());
-  server->serve();
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/LICENSE b/vendor/git.apache.org/thrift.git/contrib/fb303/LICENSE
deleted file mode 100644
index 4eacb64..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/Makefile.am b/vendor/git.apache.org/thrift.git/contrib/fb303/Makefile.am
deleted file mode 100644
index e773e52..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-@GLOBAL_HEADER_MK@
-
-@PRODUCT_MK@
-
-SUBDIRS = .
-
-if WITH_CPP
-SUBDIRS += cpp
-endif
-
-if WITH_JAVA
-SUBDIRS += java
-endif
-
-if WITH_PHP
-SUBDIRS += php
-endif
-
-if WITH_PYTHON
-SUBDIRS += py
-endif
-
-BUILT_SOURCES =
-
-clean-local: clean-common
-
-@GLOBAL_FOOTER_MK@
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/README.md b/vendor/git.apache.org/thrift.git/contrib/fb303/README.md
deleted file mode 100644
index 8ade560..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Project FB303: The Facebook Bassline
-------------------------------------
-
-* Curious about the 303? *
-http://en.wikipedia.org/wiki/Roland_TB-303
-
-* Why the name? *
-The TB303 makes bass lines.
-.Bass is what lies underneath any strong tune.
-..fb303 is the shared root of all thrift services.
-...fb303 => FacebookBase303.
-
-* How do I use this? *
-Take a look at the examples to see how your backend project can
-and should inherit from this service.
-
-* What does it provide? *
-A standard interface to monitoring, dynamic options and configuration,
-uptime reports, activity, etc.
-
-* I want more. *
-Think carefully first about whether the functionality you are going to add
-belongs here or in your application. If it can be abstracted and is generally
-useful, then it probably belongs somewhere in the fb303 tree. Keep in mind,
-not every product has to use ALL the functionality of fb303, but every product
-CANNOT use functionality that is NOT in fb303.
-
-* Is this open source? *
-Yes. fb303 is distributed under the Thrift Software License. See the
-LICENSE file for more details.
-
-* Installation *
-fb303 is configured/built/installed similar to Thrift.  See the README
-in the Thrift root directory for more information.
-
-* Who wrote this README? *
-mcslee@facebook.com
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/TClientInfo.cpp b/vendor/git.apache.org/thrift.git/contrib/fb303/TClientInfo.cpp
deleted file mode 100644
index 1fc6612..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/TClientInfo.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/server/TClientInfo.h>
-
-namespace apache { namespace thrift { namespace server {
-
-using namespace apache::thrift;
-using namespace apache::thrift::transport;
-
-TClientInfoConnection::TClientInfoConnection() {
-  call_[kNameLen - 1] = '\0';    // insure NUL terminator is there
-  eraseAddr();
-  eraseCall();
-}
-
-void TClientInfoConnection::recordAddr(const sockaddr* addr) {
-  eraseAddr();
-  initTime();
-  ncalls_ = 0;
-  if (addr != NULL) {
-    if (addr->sa_family == AF_INET) {
-      memcpy((void*)&addr_.ipv4, (const void *)addr, sizeof(sockaddr_in));
-    }
-    else if (addr->sa_family == AF_INET6) {
-      memcpy((void*)&addr_.ipv6, (const void *)addr, sizeof(sockaddr_in6));
-    }
-  }
-}
-
-void TClientInfoConnection::eraseAddr() {
-  addr_.ipv4.sin_family = AF_UNSPEC;
-}
-
-const char* TClientInfoConnection::getAddr(char* buf, int len) const {
-  switch (addr_.ipv4.sin_family) {
-  case AF_INET:
-    return inet_ntop(AF_INET, &addr_.ipv4.sin_addr, buf, len);
-  case AF_INET6:
-    return inet_ntop(AF_INET6, &addr_.ipv6.sin6_addr, buf, len);
-  default:
-    return NULL;
-  }
-}
-
-void TClientInfoConnection::recordCall(const char* name) {
-  strncpy(call_, name, kNameLen - 1);   // NUL terminator set in constructor
-  ncalls_++;
-}
-
-void TClientInfoConnection::eraseCall() {
-  call_[0] = '\0';
-}
-
-const char* TClientInfoConnection::getCall() const {
-  if (call_[0] == '\0') {
-      return NULL;
-  }
-  return call_;
-}
-
-void TClientInfoConnection::getTime(timespec* time) const {
-  *time = time_;
-}
-
-uint64_t TClientInfoConnection::getNCalls() const {
-  return ncalls_;
-}
-
-void TClientInfoConnection::initTime() {
-  clock_gettime(CLOCK_REALTIME, &time_);
-}
-
-
-TClientInfoConnection* TClientInfo::getConnection(int fd, bool grow) {
-  if (fd < 0 || (!grow && fd >= info_.size())) {
-    return NULL;
-  }
-  return &info_[fd];
-}
-
-size_t TClientInfo::size() const {
-    return info_.size();
-}
-
-void* TClientInfoServerHandler::createContext(boost::shared_ptr<TProtocol> input,
-                                              boost::shared_ptr<TProtocol> output) {
-  (void)input;
-  (void)output;
-  return (void*) new Connect(&clientInfo_);
-}
-
-void TClientInfoServerHandler::deleteContext(void* connectionContext,
-                                             boost::shared_ptr<TProtocol> input,
-                                             boost::shared_ptr<TProtocol> output) {
-  Connect* call = static_cast<Connect*>(connectionContext);
-  if (call->callInfo_) {
-    call->callInfo_->eraseCall();
-  }
-  delete call;
-}
-
-void TClientInfoServerHandler::processContext(void* connectionContext,
-                                              shared_ptr<TTransport> transport) {
-  Connect* call = static_cast<Connect*>(connectionContext);
-  if (call->callInfo_ == NULL) {
-    if (typeid(*(transport.get())) == typeid(TSocket)) {
-      TSocket* tsocket = static_cast<TSocket*>(transport.get());
-      int fd = tsocket->getSocketFD();
-      if (fd < 0) {
-        return;
-      }
-      call->callInfo_ = call->clientInfo_->getConnection(fd, true);
-      assert(call->callInfo_ != NULL);
-      socklen_t len;
-        call->callInfo_->recordAddr(tsocket->getCachedAddress(&len));
-    }
-  }
-}
-
-void TClientInfoServerHandler::getStatsStrings(vector<string>& result) {
-  result.clear();
-  timespec now;
-  clock_gettime(CLOCK_REALTIME, &now);
-
-  for (int i = 0; i < clientInfo_.size(); ++i) {
-    TClientInfoConnection* info = clientInfo_.getConnection(i, false);
-    const char* callStr = info->getCall();
-    if (callStr == NULL) {
-      continue;
-    }
-
-    char addrBuf[INET6_ADDRSTRLEN];
-    const char* addrStr = info->getAddr(addrBuf, sizeof addrBuf);
-    if (addrStr == NULL) {
-      // cerr << "no addr!" << endl;
-      continue;
-    }
-
-    timespec start;
-    info->getTime(&start);
-    double secs = (double)(now.tv_sec - start.tv_sec) + (now.tv_nsec - start.tv_nsec)*0.000000001;
-
-    char buf[256];
-    snprintf(buf, sizeof buf, "%d %s %s %.3f %llu", i, addrStr, callStr, secs,
-             (uint64_t)info->getNCalls());
-               
-    result.push_back(buf);
-  }
-}
-
-void* TClientInfoCallHandler::getContext(const char* fn_name, void* serverContext) {
-  if (serverContext) {
-    TClientInfoConnection* callInfo =  static_cast<TClientInfoServerHandler::Connect*>(serverContext)->callInfo_;
-    if (callInfo != NULL) {
-      callInfo->recordCall(fn_name);
-    }
-  }
-  return NULL;
-}
-
-} } } // namespace apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/TClientInfo.h b/vendor/git.apache.org/thrift.git/contrib/fb303/TClientInfo.h
deleted file mode 100644
index 6668c19..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/TClientInfo.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _FACEBOOK_THRIFT_SERVER_TCLIENTINFO_H_
-#define _FACEBOOK_THRIFT_SERVER_TCLIENTINFO_H_ 1
-
-// for inet_ntop --
-#include <arpa/inet.h>
-#include <thrift/server/TServer.h>
-#include <thrift/transport/TSocket.h>
-#include <thrift/concurrency/Mutex.h>
-
-namespace apache { namespace thrift { namespace server {
-
-using namespace apache::thrift;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::concurrency;
-using boost::shared_ptr;
-using std::string;
-using std::vector;
-
-/**
- * StableVector -- a minimal vector class where growth is automatic and
- * vector elements never move as the vector grows.  Allocates new space
- * as needed, but does not copy old values.
- *
- * A level vector stores a list of storage vectors containing the actual
- * elements.  Levels are added as needed, doubling in size each time.
- * Locking is only done when a level is added.  Access is amortized
- * constant time.
- */
-template <typename T>
-class StableVector {
-  /// The initial allocation as an exponent of 2
-  static const uint32_t kInitialSizePowOf2 = 10;
-  /// The initial allocation size
-  static const uint32_t kInitialVectorSize = 1 << kInitialSizePowOf2;
-  /// This bound is guaranteed not to be exceeded on 64-bit archs
-  static const int kMaxLevels = 64;
-
-  /// Values are kept in one or more of these
-  typedef vector<T> Vect;
-  /// One or more value vectors are kept in one of these
-  typedef vector<Vect*> LevelVector;
-
-  Mutex mutex_;
-  /// current size
-  size_t size_;
-  _Atomic_word vectLvl_;
-  LevelVector vects_;
-
- public:
-  /**
-   * Constructor -- initialize the level vector and allocate the
-   * initial storage vector
-   */
-  StableVector()
-    : size_(0) 
-    , vectLvl_(0) {
-    vects_.reserve(kMaxLevels);
-    Vect* storageVector(new Vect(1 << kInitialSizePowOf2));
-    vects_.push_back(storageVector);
-  }
-
- private:
-  /**
-   * make sure the requested number of storage levels have been allocated.
-   */
-  void expand(uint32_t level) {
-    // we need the guard to insure that we only allocate once.
-    Guard g(mutex_);
-    while (level > vectLvl_) {
-      Vect* levelVect(new Vect(1 << (vectLvl_ + kInitialSizePowOf2)));
-      vects_.push_back(levelVect);
-      // we need to make sure this is done after levelVect is inserted
-      // (what we want is effectively a memory barrier here).
-      __gnu_cxx::__atomic_add(&vectLvl_, 1);
-    }
-  }
-
-  /**
-   * Given an index, determine which level and element of that level is
-   * required.  Grows if needed.
-   */
-  void which(uint32_t n, uint32_t* vno, uint32_t* idx) {
-    if (n >= size_) {
-      size_ = n + 1;
-    }
-    if (n < kInitialVectorSize) {
-      *idx = n;
-      *vno = 0;
-    } else {
-      uint32_t upper = n >> kInitialSizePowOf2;
-      *vno = CHAR_BIT*sizeof(upper) - __builtin_clz(upper);
-      *idx = n - (1 << (*vno + kInitialSizePowOf2 - 1));
-      if (*vno > vectLvl_) {
-        expand(*vno);
-      }
-    }
-  }
-
- public:
-  /**
-   * Given an index, return a reference to that element, perhaps after
-   * allocating additional space.
-   *
-   * @param n a positive integer
-   */
-  T& operator[](uint32_t n) {
-    uint32_t vno;
-    uint32_t idx;
-    which(n, &vno, &idx);
-    return (*vects_[vno])[idx];
-  }
-
-  /**
-   * Return the present size of the vector.
-   */
-  size_t size() const { return size_; }
-};
-
-
-/**
- * This class embodies the representation of a single connection during
- * processing.  We'll keep one of these per file descriptor in TClientInfo.
- */
-class TClientInfoConnection {
- public:
-  const static int kNameLen = 32;
-
- private:
-  typedef union IPAddrUnion {
-    sockaddr_in ipv4;
-    sockaddr_in6 ipv6;
-  };
-
-  char call_[kNameLen];            ///< The name of the thrift call
-  IPAddrUnion addr_;               ///< The client's IP address
-  timespec time_;                  ///< Time processing started
-  uint64_t ncalls_;                ///< # of calls processed
-
- public:
-  /**
-   * Constructor; insure that no client address or thrift call name is
-   * represented.
-   */
-  TClientInfoConnection();
-
-  /**
-   * A connection has been made; record its address.  Since this is the
-   * first we'll know of a connection we start the timer here as well.
-   */
-  void recordAddr(const sockaddr* addr);
-
-  /**
-   * Mark the address as empty/unknown.
-   */
-  void eraseAddr();
-
-  /**
-   * Return a string representing the present address, or NULL if none.
-   * Copies the string into the buffer provided.
-   */
-  const char* getAddr(char* buf, int len) const;
-
-  /**
-   * A call has been made on this connection; record its name.  Since this is
-   * called for every thrift call processed, we also do our call count here.
-   */ 
-  void recordCall(const char* name);
-
-  /**
-   * Invoked when processing has ended to clear the call name.
-   */
-  void eraseCall();
-
-  /**
-   * Return as string the thrift call either currently being processed or
-   * most recently processed if the connection is still open for additional
-   * calls.  Returns NULL if a call hasn't been made yet or processing
-   * has ended.
-   */
-  const char* getCall() const;
-
-  /**
-   * Get the timespec for the start of this connection (specifically, when
-   * recordAddr() was first called).
-   */
-  void getTime(timespec* time) const;
-
-  /**
-   * Return the number of calls made on this connection.
-   */
-  uint64_t getNCalls() const;
-
- private:
-  void initTime();
-};
-
-
-/**
- * Store for info about a server's clients -- specifically, the client's IP
- * address and the call it is executing.  This information is indexed by
- * socket file descriptor and in the present implementation is updated
- * asynchronously, so it may only approximate reality.
- */
-class TClientInfo {
- private:
-  StableVector<TClientInfoConnection> info_;
-
- public:
-  /**
-   * Return the info object for a given file descriptor.  If "grow" is true
-   * extend the info vector if required (such as for a file descriptor not seen
-   * before).  If "grow" is false and the info vector isn't large enough,
-   * or if "fd" is negative, return NULL.
-   */
-  TClientInfoConnection* getConnection(int fd, bool grow);
-
-  size_t size() const;
-};
-
-/**
- * This derivation of TServerEventHandler encapsulates the main status vector
- * and provides context to the server's processing loop via overrides.
- * Together with TClientInfoCallHandler (derived from TProcessorEventHandler) 
- * it integrates client info collection into the server.
- */
-class TClientInfoServerHandler : public TServerEventHandler {
- private:
-  TClientInfo clientInfo_;
-
- public:
-  /**
-   * One of these is constructed for each open connection/descriptor and links
-   * to both the status vector (clientInfo_) and that descriptor's entry
-   * within it.
-   */
-  struct Connect {
-    TClientInfo* clientInfo_;
-    TClientInfoConnection* callInfo_;
-
-    explicit Connect(TClientInfo* clientInfo)
-      : clientInfo_(clientInfo)
-      , callInfo_(NULL) {
-    }
-  };
-
-  /**
-   * Generate processor context; we don't know what descriptor we belong to
-   * yet -- we'll get hooked up in contextProcess(). 
-   */
-  void* createContext(boost::shared_ptr<TProtocol> input,
-                      boost::shared_ptr<TProtocol> output);
-
-  /**
-   * Mark our slot as unused and delete the context created in createContext().
-   */
-  void deleteContext(void* processorContext,
-                     boost::shared_ptr<TProtocol> input,
-                     boost::shared_ptr<TProtocol> output);
-  
-  /**
-   * Called in the processing loop just before the server invokes the
-   * processor itself, on the first call we establish which descriptor
-   * we correspond to and set it to that socket's peer IP address.  This
-   * also has the side effect of initializing call counting and connection
-   * timing.  We won't know which call we're handling until the handler
-   * first gets called in TClientInfoCallHandler::getContext().
-   */
-  void processContext(void* processorContext,
-                      shared_ptr<TTransport> transport);
-
-  /**
-   * Get status report for server in the form of a vector of strings.
-   * Each active client appears as one string in the format:
-   *
-   *     FD IPADDR CALLNAME DURATION NCALLS
-   *
-   * where "FD" is the file descriptor for the client's socket, "IPADDR"
-   * is the IP address (as reported by accept()), "CALLNAME" is the
-   * current or most recent Thrift function name, "DURATION" is the
-   * duration of the connection, while NCALLS is the number of Thrift
-   * calls made since the connection was made.  A single space separates
-   * fields.
-   */
-  void getStatsStrings(vector<string>& result);
-};
-
-/**
- * This class derives from TProcessorEventHandler to gain access to the
- * function name for the current Thrift call.  We need two versions of
- * this -- TClientInfoCallStatsHandler is the other -- since in the latter
- * case we pass through to TFunctionStatHandler to perform Thrift call
- * stats.
- */
-class TClientInfoCallHandler : public TProcessorEventHandler {
- public:
-  virtual void* getContext(const char* fn_name, void* serverContext);
-};
-
-} } } // namespace apache::thrift::server
-
-#endif // !_FACEBOOK_THRIFT_SERVER_TCLIENTINFO_H_
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_boost_base.m4 b/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_boost_base.m4
deleted file mode 100644
index e56bb73..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_boost_base.m4
+++ /dev/null
@@ -1,198 +0,0 @@
-##### http://autoconf-archive.cryp.to/ax_boost_base.html
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro
-#   searchs under /usr, /usr/local, /opt and /opt/local and evaluates
-#   the $BOOST_ROOT environment variable. Further documentation is
-#   available at <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-#     HAVE_BOOST
-#
-# LAST MODIFICATION
-#
-#   2007-07-28
-#
-# COPYLEFT
-#
-#   Copyright (c) 2007 Thomas Porschberg <thomas@randspringer.de>
-#
-#   Copying and distribution of this file, with or without
-#   modification, are permitted in any medium without royalty provided
-#   the copyright notice and this notice are preserved.
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
-	AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) - it is possible to specify the root directory for boost (optional)]),
-	[
-    if test "$withval" = "no"; then
-		want_boost="no"
-    elif test "$withval" = "yes"; then
-        want_boost="yes"
-        ac_boost_path=""
-    else
-	    want_boost="yes"
-        ac_boost_path="$withval"
-	fi
-    ],
-    [want_boost="yes"])
-
-if test "x$want_boost" = "xyes"; then
-	boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-	boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
-	boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-	boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-	boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-	if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-		boost_lib_version_req_sub_minor="0"
-    	fi
-	WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-	AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-	succeeded=no
-
-	dnl first we check the system location for boost libraries
-	dnl this location ist chosen if boost libraries are installed with the --layout=system option
-	dnl or if you install boost with RPM
-	if test "$ac_boost_path" != ""; then
-		BOOST_LDFLAGS="-L$ac_boost_path/lib"
-		BOOST_CPPFLAGS="-I$ac_boost_path/include"
-	else
-		for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-			if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-				BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
-				BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-				break;
-			fi
-		done
-	fi
-
-	CPPFLAGS_SAVED="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-	export CPPFLAGS
-
-	LDFLAGS_SAVED="$LDFLAGS"
-	LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-	export LDFLAGS
-
-	AC_LANG_PUSH(C++)
-     	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-	@%:@include <boost/version.hpp>
-	]], [[
-	#if BOOST_VERSION >= $WANT_BOOST_VERSION
-	// Everything is okay
-	#else
-	#  error Boost version is too old
-	#endif
-	]])],[
-        AC_MSG_RESULT(yes)
-	succeeded=yes
-	found_system=yes
-       	],[
-       	])
-	AC_LANG_POP([C++])
-
-
-
-	dnl if we found no boost with system layout we search for boost libraries
-	dnl built and installed without the --layout=system option or for a staged(not installed) version
-	if test "x$succeeded" != "xyes"; then
-		_version=0
-		if test "$ac_boost_path" != ""; then
-               		BOOST_LDFLAGS="-L$ac_boost_path/lib"
-			if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-				for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-					_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-					V_CHECK=`expr $_version_tmp \> $_version`
-					if test "$V_CHECK" = "1" ; then
-						_version=$_version_tmp
-					fi
-					VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-					BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-				done
-			fi
-		else
-			for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-				if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-					for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-						_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-						V_CHECK=`expr $_version_tmp \> $_version`
-						if test "$V_CHECK" = "1" ; then
-							_version=$_version_tmp
-	               					best_path=$ac_boost_path
-						fi
-					done
-				fi
-			done
-
-			VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-			BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-			BOOST_LDFLAGS="-L$best_path/lib"
-
-	    		if test "x$BOOST_ROOT" != "x"; then
-				if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then
-					version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
-					stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-			        	stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
-					V_CHECK=`expr $stage_version_shorten \>\= $_version`
-				        if test "$V_CHECK" = "1" ; then
-						AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
-						BOOST_CPPFLAGS="-I$BOOST_ROOT"
-						BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
-					fi
-				fi
-	    		fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-		AC_LANG_PUSH(C++)
-	     	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-		@%:@include <boost/version.hpp>
-		]], [[
-		#if BOOST_VERSION >= $WANT_BOOST_VERSION
-		// Everything is okay
-		#else
-		#  error Boost version is too old
-		#endif
-		]])],[
-        	AC_MSG_RESULT(yes)
-		succeeded=yes
-		found_system=yes
-       		],[
-	       	])
-		AC_LANG_POP([C++])
-	fi
-
-	if test "$succeeded" != "yes" ; then
-		if test "$_version" = "0" ; then
-			AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
-		else
-			AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
-		fi
-	else
-		AC_SUBST(BOOST_CPPFLAGS)
-		AC_SUBST(BOOST_LDFLAGS)
-		AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
-	fi
-
-        CPPFLAGS="$CPPFLAGS_SAVED"
-       	LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-])
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_cxx_compile_stdcxx_11.m4 b/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100644
index a4c9189..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_cxx_compile_stdcxx_11.m4
+++ /dev/null
@@ -1,134 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXXFLAGS to enable support.
-#
-#   The first argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The second argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline C++11 support is required and that the macro
-#   should error out if no mode with that support is found.  If specified
-#   'optional', then configuration proceeds regardless, after defining
-#   HAVE_CXX11 if and only if a supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 3
-
-m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = static_cast<check_type&&>(c);
-
-    auto d = a;
-])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
-  m4_if([$1], [], [],
-        [$1], [ext], [],
-        [$1], [noext], [],
-        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
-        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
-        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
-  ax_cv_cxx_compile_cxx11,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-    [ax_cv_cxx_compile_cxx11=yes],
-    [ax_cv_cxx_compile_cxx11=no])])
-  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$1], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++11; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$1], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=c++11; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx11_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-    fi
-  else
-    if test x$ac_success = xno; then
-      HAVE_CXX11=0
-      AC_MSG_NOTICE([No compiler with C++11 support was found])
-    else
-      HAVE_CXX11=1
-      AC_DEFINE(HAVE_CXX11,1,
-                [define if the compiler supports basic C++11 syntax])
-    fi
-
-    AC_SUBST(HAVE_CXX11)
-  fi
-])
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_javac_and_java.m4 b/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_javac_and_java.m4
deleted file mode 100644
index 581b450..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_javac_and_java.m4
+++ /dev/null
@@ -1,121 +0,0 @@
-dnl @synopsis AX_JAVAC_AND_JAVA
-dnl @synopsis AX_CHECK_JAVA_CLASS(CLASSNAME)
-dnl
-dnl Test for the presence of a JDK, and (optionally) specific classes.
-dnl
-dnl If "JAVA" is defined in the environment, that will be the only
-dnl java command tested.  Otherwise, a hard-coded list will be used.
-dnl Similarly for "JAVAC".
-dnl
-dnl AX_JAVAC_AND_JAVA does not currently support testing for a particular
-dnl Java version, testing for only one of "java" and "javac", or
-dnl compiling or running user-provided Java code.
-dnl
-dnl After AX_JAVAC_AND_JAVA runs, the shell variables "success" and
-dnl "ax_javac_and_java" are set to "yes" or "no", and "JAVAC" and
-dnl "JAVA" are set to the appropriate commands.
-dnl
-dnl AX_CHECK_JAVA_CLASS must be run after AX_JAVAC_AND_JAVA.
-dnl It tests for the presence of a class based on a fully-qualified name.
-dnl It sets the shell variable "success" to "yes" or "no".
-dnl
-dnl @category Java
-dnl @version 2009-02-09
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-
-AC_DEFUN([AX_JAVAC_AND_JAVA],
-         [
-
-          dnl Hard-coded default commands to test.
-          JAVAC_PROGS="javac,jikes,gcj -C"
-          JAVA_PROGS="java,kaffe"
-
-          dnl Allow the user to specify an alternative.
-          if test -n "$JAVAC" ; then
-            JAVAC_PROGS="$JAVAC"
-          fi
-          if test -n "$JAVA" ; then
-            JAVA_PROGS="$JAVA"
-          fi
-
-          AC_MSG_CHECKING(for javac and java)
-
-          echo "public class configtest_ax_javac_and_java { public static void main(String args@<:@@:>@) { } }" > configtest_ax_javac_and_java.java
-          success=no
-          oIFS="$IFS"
-
-          IFS=","
-          for JAVAC in $JAVAC_PROGS ; do
-            IFS="$oIFS"
-
-            echo "Running \"$JAVAC configtest_ax_javac_and_java.java\"" >&AS_MESSAGE_LOG_FD
-            if $JAVAC configtest_ax_javac_and_java.java >&AS_MESSAGE_LOG_FD 2>&1 ; then
-
-              IFS=","
-              for JAVA in $JAVA_PROGS ; do
-                IFS="$oIFS"
-
-                echo "Running \"$JAVA configtest_ax_javac_and_java\"" >&AS_MESSAGE_LOG_FD
-                if $JAVA configtest_ax_javac_and_java >&AS_MESSAGE_LOG_FD 2>&1 ; then
-                  success=yes
-                  break 2
-                fi
-
-              done
-
-            fi
-
-          done
-
-          rm -f configtest_ax_javac_and_java.java configtest_ax_javac_and_java.class
-
-          if test "$success" != "yes" ; then
-            AC_MSG_RESULT(no)
-            JAVAC=""
-            JAVA=""
-          else
-            AC_MSG_RESULT(yes)
-          fi
-
-          ax_javac_and_java="$success"
-
-          ])
-
-
-AC_DEFUN([AX_CHECK_JAVA_CLASS],
-         [
-          AC_MSG_CHECKING(for Java class [$1])
-
-          echo "import $1; public class configtest_ax_javac_and_java { public static void main(String args@<:@@:>@) { } }" > configtest_ax_javac_and_java.java
-
-          echo "Running \"$JAVAC configtest_ax_javac_and_java.java\"" >&AS_MESSAGE_LOG_FD
-          if $JAVAC configtest_ax_javac_and_java.java >&AS_MESSAGE_LOG_FD 2>&1 ; then
-            AC_MSG_RESULT(yes)
-            success=yes
-          else
-            AC_MSG_RESULT(no)
-            success=no
-          fi
-
-          rm -f configtest_ax_javac_and_java.java configtest_ax_javac_and_java.class
-          ])
-
-
-AC_DEFUN([AX_CHECK_ANT_VERSION],
-         [
-          AC_MSG_CHECKING(for ant version > $2)
-          ANT_VALID=`expr $($1 -version 2>/dev/null | sed -n 's/.*version \(@<:@0-9\.@:>@*\).*/\1/p') \>= $2`
-          if test "x$ANT_VALID" = "x1" ; then
-            AC_MSG_RESULT(yes)
-          else
-            AC_MSG_RESULT(no)
-            ANT=""
-          fi
-          ])
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_thrift_internal.m4 b/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_thrift_internal.m4
deleted file mode 100644
index 8c0e3cb..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/aclocal/ax_thrift_internal.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl @synopsis AX_THRIFT_GEN(SHORT_LANGUAGE, LONG_LANGUAGE, DEFAULT)
-dnl @synopsis AX_THRIFT_LIB(SHORT_LANGUAGE, LONG_LANGUAGE, DEFAULT)
-dnl
-dnl Allow a particular language generator to be disabled.
-dnl Allow a particular language library to be disabled.
-dnl
-dnl These macros have poor error handling and are poorly documented.
-dnl They are intended only for internal use by the Thrift compiler.
-dnl
-dnl @version 2008-02-20
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-AC_DEFUN([AX_THRIFT_LIB],
-         [
-          AC_ARG_WITH($1,
-                      AC_HELP_STRING([--with-$1], [build the $2 library @<:@default=$3@:>@]),
-                      [with_$1="$withval"],
-                      [with_$1=$3]
-                      )
-          have_$1=no
-          dnl What we do here is going to vary from library to library,
-          dnl so we can't really generalize (yet!).
-         ])
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/bootstrap.sh b/vendor/git.apache.org/thrift.git/contrib/fb303/bootstrap.sh
deleted file mode 100755
index 3cbeddb..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/bootstrap.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# To be safe include -I flag
-aclocal -I ./aclocal
-automake -a
-autoconf
-./configure --config-cache $*
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/configure.ac b/vendor/git.apache.org/thrift.git/contrib/fb303/configure.ac
deleted file mode 100644
index 73b35ba..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/configure.ac
+++ /dev/null
@@ -1,164 +0,0 @@
-# Autoconf input file
-# $Id$
-
-# AC - autoconf
-# FB - facebook
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-#########################################################################
-# DO NOT TOUCH EXCEPT TO CHANGE REV# IN AC_INIT
-
-AC_PREREQ(2.52)
-AC_INIT([libfb303],[20080209])
-#AC_CONFIG_AUX_DIR([/usr/share/automake-1.9])
-# To install locally
-FB_INITIALIZE([localinstall])
-AC_PREFIX_DEFAULT([/usr/local])
-
-############################################################################
-# User Configurable. Change With CAUTION!
-# User can include custom makefile rules. Uncomment and update only <name> in PRODUCT_MK.
-# Include where appropriate in any Makefile.am as @PRODUCT_MK@
-
-#PRODUCT_MK="include ${EXTERNAL_PATH}/shared/build/<name>.mk"
-
-# Default path to external Facebook components and shared build toools I.e fb303 etc.
-# To point to other locations set  environment variable EXTERNAL_PATH.
-# To change the current default you must change bootstrap.sh.
-FB_WITH_EXTERNAL_PATH([`pwd`])
-
-AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
-                         (Normal --prefix is ignored for Python because
-                         Python has different conventions.)
-                         Default = "/usr"])
-AS_IF([test "x$PY_PREFIX" = x], [PY_PREFIX="/usr"])
-
-##########################################################################
-# User Configurable
-
-# Pre-defined macro to set opt build mode. Run with --disable-shared option to turn off optimization.
-FB_ENABLE_DEFAULT_OPT_BUILD
-
-# Predefined macro to set static library mode. Run with --disable-static option to turn off static lib mode.
-FB_ENABLE_DEFAULT_STATIC
-
-# Personalized feature generator. Creates defines/conditionals and --enable --disable command line options.
-# FB_ENABLE_FEATURE([FEATURE], [feature]) OR FB_ENABLE_FEATURE([FEATURE], [feature], [\"<value>\"])
-
-# Example: Macro supplies -DFACEBOOK at compile time and "if FACEBOOK endif" capabilities.
-
-# Personalized path generator Sets default paths. Provides --with-xx=DIR options.
-# FB_WITH_PATH([<var>_home], [<var>path], [<default location>]
-
-# Example: sets $(thrift_home) variable with default path set to /usr/local.
-FB_WITH_PATH([thrift_home], [thriftpath], [/usr/local])
-
-AX_CXX_COMPILE_STDCXX_11([noext])
-AX_THRIFT_LIB(cpp, [C++], yes)
-have_cpp=no
-if test "$with_cpp" = "yes"; then
-  # Require boost 1.40.0 or later
-  AX_BOOST_BASE([1.40.0])
-  if test "x$succeeded" = "xyes"; then
-    have_cpp="yes"
-  fi
-fi
-AM_CONDITIONAL([WITH_CPP], [test "$have_cpp" = "yes"])
-
-AX_THRIFT_LIB(java, [Java], yes)
-if test "$with_java" = "yes"; then
-  AX_JAVAC_AND_JAVA
-  AC_PATH_PROG([ANT], [ant])
-  AX_CHECK_ANT_VERSION($ANT, 1.7)
-  AC_SUBST(CLASSPATH)
-  AC_SUBST(ANT_FLAGS)
-  if test "x$JAVAC" != "x" && test "x$JAVAC" != "x" && test "x$ANT" != "x" ; then
-    have_java="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_JAVA, [test "$have_java" = "yes"])
-
-AX_THRIFT_LIB(php, [PHP], yes)
-if test "$with_php" = "yes"; then
-  AC_PATH_PROG([PHP], [php])
-  if test "x$PHP" != "x" && test "x$PHP" != "x:" ; then
-    have_php="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_PHP, [test "$have_php" = "yes"])
-
-AX_THRIFT_LIB(python, [Python], yes)
-if test "$with_python" = "yes"; then
-  AM_PATH_PYTHON(2.4,, :)
-  if test "x$PYTHON" != "x" && test "x$PYTHON" != "x:" ; then
-    have_python="yes"
-  fi
-fi
-AM_CONDITIONAL(WITH_PYTHON, [test "$have_python" = "yes"])
-
-# Generates Makefile from Makefile.am. Modify when new subdirs are added.
-# Change Makefile.am also to add subdirectly.
-AC_CONFIG_FILES(Makefile cpp/Makefile py/Makefile)
-
-# Check for headers
-AC_CHECK_HEADERS([inttypes.h])
-AC_CHECK_HEADERS([netinet/in.h])
-
-############################################################################
-# DO NOT TOUCH.
-
-AC_SUBST(PRODUCT_MK)
-AC_OUTPUT
-
-#############################################################################
-######### FINISH ############################################################
-
-echo "EXTERNAL_PATH $EXTERNAL_PATH"
-echo
-echo "Building C++ Library ......... : $have_cpp"
-echo "Building Java Library ........ : $have_java"
-echo "Building Python Library ...... : $have_python"
-echo "Building PHP Library ......... : $have_php"
-
-
-#
-# NOTES FOR USER
-# Short cut to create conditional flags.
-#enable_facebook="yes"
-#AM_CONDITIONAL([FACEBOOK], [test "$enable_facebook" = yes])
-#enable_hdfs="yes"
-#AM_CONDITIONAL([HDFS], [test "$enable_hdfs" = yes])
-
-# Enable options with --enable and --disable configurable.
-#AC_MSG_CHECKING([whether to enable FACEBOOK])
-#FACEBOOK=""
-#AC_ARG_ENABLE([facebook],
-#  [  --enable-facebook     Enable facebook.],
-#  [
-#     ENABLE_FACEBOOK=$enableval
-#  ],
-#  [
-#     ENABLE_FACEBOOK="no"
-#  ]
-#)
-#AM_CONDITIONAL([FACEBOOK], [test "$ENABLE_FACEBOOK" = yes])
-#AC_MSG_RESULT($ENABLE_FACEBOOK)
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/FacebookBase.cpp b/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/FacebookBase.cpp
deleted file mode 100644
index 3c56975..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/FacebookBase.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "FacebookBase.h"
-
-using namespace facebook::fb303;
-using apache::thrift::concurrency::Guard;
-
-FacebookBase::FacebookBase(std::string name) :
-  name_(name) {
-  aliveSince_ = (int64_t) time(NULL);
-}
-
-inline void FacebookBase::getName(std::string& _return) {
-  _return = name_;
-}
-
-void FacebookBase::setOption(const std::string& key, const std::string& value) {
-  Guard g(optionsLock_);
-  options_[key] = value;
-}
-
-void FacebookBase::getOption(std::string& _return, const std::string& key) {
-  Guard g(optionsLock_);
-  _return = options_[key];
-}
-
-void FacebookBase::getOptions(std::map<std::string, std::string> & _return) {
-  Guard g(optionsLock_);
-  _return = options_;
-}
-
-int64_t FacebookBase::incrementCounter(const std::string& key, int64_t amount) {
-  counters_.acquireRead();
-
-  // if we didn't find the key, we need to write lock the whole map to create it
-  ReadWriteCounterMap::iterator it = counters_.find(key);
-  if (it == counters_.end()) {
-    counters_.release();
-    counters_.acquireWrite();
-
-    // we need to check again to make sure someone didn't create this key
-    // already while we released the lock
-    it = counters_.find(key);
-    if(it == counters_.end()){
-      counters_[key].value = amount;
-      counters_.release();
-      return amount;
-    }
-  }
-
-  it->second.acquireWrite();
-  int64_t count = it->second.value + amount;
-  it->second.value = count;
-  it->second.release();
-  counters_.release();
-  return count;
-}
-
-int64_t FacebookBase::setCounter(const std::string& key, int64_t value) {
-  counters_.acquireRead();
-
-  // if we didn't find the key, we need to write lock the whole map to create it
-  ReadWriteCounterMap::iterator it = counters_.find(key);
-  if (it == counters_.end()) {
-    counters_.release();
-    counters_.acquireWrite();
-    counters_[key].value = value;
-    counters_.release();
-    return value;
-  }
-
-  it->second.acquireWrite();
-  it->second.value = value;
-  it->second.release();
-  counters_.release();
-  return value;
-}
-
-void FacebookBase::getCounters(std::map<std::string, int64_t>& _return) {
-  // we need to lock the whole thing and actually build the map since we don't
-  // want our read/write structure to go over the wire
-  counters_.acquireRead();
-  for(ReadWriteCounterMap::iterator it = counters_.begin();
-      it != counters_.end(); ++it)
-  {
-    _return[it->first] = it->second.value;
-  }
-  counters_.release();
-}
-
-int64_t FacebookBase::getCounter(const std::string& key) {
-  int64_t rv = 0;
-  counters_.acquireRead();
-  ReadWriteCounterMap::iterator it = counters_.find(key);
-  if (it != counters_.end()) {
-    it->second.acquireRead();
-    rv = it->second.value;
-    it->second.release();
-  }
-  counters_.release();
-  return rv;
-}
-
-inline int64_t FacebookBase::aliveSince() {
-  return aliveSince_;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/FacebookBase.h b/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/FacebookBase.h
deleted file mode 100644
index 2159c95..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/FacebookBase.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _FACEBOOK_TB303_FACEBOOKBASE_H_
-#define _FACEBOOK_TB303_FACEBOOKBASE_H_ 1
-
-#include "FacebookService.h"
-
-#include <thrift/server/TServer.h>
-#include <thrift/concurrency/Mutex.h>
-
-#include <time.h>
-#include <string>
-#include <map>
-
-namespace facebook { namespace fb303 {
-
-using apache::thrift::concurrency::Mutex;
-using apache::thrift::concurrency::ReadWriteMutex;
-using apache::thrift::server::TServer;
-
-struct ReadWriteInt : ReadWriteMutex {int64_t value;};
-struct ReadWriteCounterMap : ReadWriteMutex,
-                             std::map<std::string, ReadWriteInt> {};
-
-/**
- * Base Facebook service implementation in C++.
- *
- */
-class FacebookBase : virtual public FacebookServiceIf {
- protected:
-  FacebookBase(std::string name);
-  virtual ~FacebookBase() {}
-
- public:
-  void getName(std::string& _return);
-  virtual void getVersion(std::string& _return) { _return = ""; }
-
-  virtual fb_status getStatus() = 0;
-  virtual void getStatusDetails(std::string& _return) { _return = ""; }
-
-  void setOption(const std::string& key, const std::string& value);
-  void getOption(std::string& _return, const std::string& key);
-  void getOptions(std::map<std::string, std::string> & _return);
-
-  int64_t aliveSince();
-
-  virtual void reinitialize() {}
-
-  virtual void shutdown() {
-    if (server_.get() != NULL) {
-      server_->stop();
-    }
-  }
-
-  int64_t incrementCounter(const std::string& key, int64_t amount = 1);
-  int64_t setCounter(const std::string& key, int64_t value);
-
-  void getCounters(std::map<std::string, int64_t>& _return);
-  int64_t getCounter(const std::string& key);
-
-  /**
-   * Set server handle for shutdown method
-   */
-  void setServer(boost::shared_ptr<TServer> server) {
-    server_ = server;
-  }
-
-  void getCpuProfile(std::string& _return, int32_t durSecs) { _return = ""; }
-
- private:
-
-  std::string name_;
-  int64_t aliveSince_;
-
-  std::map<std::string, std::string> options_;
-  Mutex optionsLock_;
-
-  ReadWriteCounterMap counters_;
-
-  boost::shared_ptr<TServer> server_;
-
-};
-
-}} // facebook::tb303
-
-#endif // _FACEBOOK_TB303_FACEBOOKBASE_H_
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/Makefile.am b/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/Makefile.am
deleted file mode 100644
index 748d329..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-@GLOBAL_HEADER_MK@
-
-@PRODUCT_MK@
-
-
-# User specified path variables set in configure.ac.
-# thrift_home
-#
-THRIFT = $(thrift_home)/bin/thrift
-
-# User defined conditionals and conditonal statements set up in configure.ac.
-if DEBUG
-   DEBUG_CPPFLAGS = -DDEBUG_TIMING
-endif
-
-# Set common flags recognized by automake.
-# DO NOT USE CPPFLAGS, CXXFLAGS, CFLAGS, LDFLAGS here! Set in configure.ac and|or override on command line.
-# USE flags AM_CXXFLAGS, AM_CFLAGS, AM_CPPFLAGS, AM_LDFLAGS, LDADD in this section.
-
-AM_CPPFLAGS = -I..
-AM_CPPFLAGS += -Igen-cpp
-AM_CPPFLAGS += -I$(thrift_home)/include/thrift 
-AM_CPPFLAGS += $(BOOST_CPPFLAGS)
-AM_CPPFLAGS += $(FB_CPPFLAGS) $(DEBUG_CPPFLAGS)
-
-# GENERATE BUILD RULES
-# Set Program/library specific flags recognized by automake.
-# Use <progname|libname>_<FLAG> to set prog / lib specific flag s
-# foo_CXXFLAGS foo_CPPFLAGS foo_LDFLAGS foo_LDADD
-
-fb303_lib = gen-cpp/FacebookService.cpp gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp FacebookBase.cpp ServiceTracker.cpp
-
-# Static -- multiple libraries can be defined
-if STATIC
-lib_LIBRARIES = libfb303.a
-libfb303_a_SOURCES = $(fb303_lib)
-INTERNAL_LIBS = libfb303.a
-endif
-
-# Shared -- multiple libraries can be defined
-if SHARED
-shareddir = $(prefix)/lib
-shared_PROGRAMS = libfb303.so
-libfb303_so_SOURCES = $(fb303_lib)
-libfb303_so_CXXFLAGS = $(SHARED_CXXFLAGS)
-libfb303_so_LDFLAGS = $(SHARED_LDFLAGS)
-INTERNAL_LIBS =  libfb303.so
-endif
-
-# Set up Thrift specific activity here.
-# We assume that a <name>+types.cpp will always be built from <name>.thrift.
-$(eval $(call thrift_template,.,../if/fb303.thrift,-I $(thrift_home)/share  --gen cpp:pure_enums ))
-
-include_fb303dir = $(includedir)/thrift/fb303
-include_fb303_HEADERS = FacebookBase.h ServiceTracker.h gen-cpp/FacebookService.h gen-cpp/fb303_constants.h gen-cpp/fb303_types.h
-
-include_fb303ifdir = $(prefix)/share/fb303/if
-include_fb303if_HEADERS = ../if/fb303.thrift
-
-BUILT_SOURCES = thriftstyle
-
-# Add to pre-existing target clean
-clean-local: clean-common
-
-@GLOBAL_FOOTER_MK@
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/ServiceTracker.cpp b/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/ServiceTracker.cpp
deleted file mode 100644
index 7a61b21..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/ServiceTracker.cpp
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <sys/time.h>
-
-#include "FacebookBase.h"
-#include "ServiceTracker.h"
-#include <thrift/concurrency/ThreadManager.h>
-
-using namespace std;
-using namespace facebook::fb303;
-using namespace apache::thrift::concurrency;
-
-
-uint64_t ServiceTracker::CHECKPOINT_MINIMUM_INTERVAL_SECONDS = 60;
-int ServiceTracker::LOG_LEVEL = 5;
-
-
-ServiceTracker::ServiceTracker(facebook::fb303::FacebookBase *handler,
-                               void (*logMethod)(int, const string &),
-                               bool featureCheckpoint,
-                               bool featureStatusCheck,
-                               bool featureThreadCheck,
-                               Stopwatch::Unit stopwatchUnit)
-  : handler_(handler), logMethod_(logMethod),
-    featureCheckpoint_(featureCheckpoint),
-    featureStatusCheck_(featureStatusCheck),
-    featureThreadCheck_(featureThreadCheck),
-    stopwatchUnit_(stopwatchUnit),
-    checkpointServices_(0)
-{
-  if (featureCheckpoint_) {
-    time_t now = time(NULL);
-    checkpointTime_ = now;
-  } else {
-    checkpointTime_ = 0;
-  }
-}
-
-/**
- * Registers the beginning of a "service method": basically, any of
- * the implementations of Thrift remote procedure calls that a
- * FacebookBase handler is handling.  Controls concurrent
- * services and reports statistics (via log and via fb303 counters).
- * Throws an exception if the server is not ready to handle service
- * methods yet.
- *
- * note: The relationship between startService() and finishService()
- * is currently defined so that a call to finishService() should only
- * be matched to this call to startService() if this method returns
- * without exception.  It wouldn't be a problem to implement things
- * the other way, so that *every* start needed a finish, but this
- * convention was chosen to match the way an object's constructor and
- * destructor work together, i.e. to work well with ServiceMethod
- * objects.
- *
- * @param const ServiceMethod &serviceMethod A reference to the ServiceMethod
- *                                           object instantiated at the start
- *                                           of the service method.
- */
-void
-ServiceTracker::startService(const ServiceMethod &serviceMethod)
-{
-  // note: serviceMethod.timer_ automatically starts at construction.
-
-  // log service start
-  logMethod_(5, serviceMethod.signature_);
-
-  // check handler ready
-  if (featureStatusCheck_ && !serviceMethod.featureLogOnly_) {
-    // note: Throwing exceptions before counting statistics.  See note
-    // in method header.
-    // note: A STOPPING server is not accepting new connections, but it
-    // is still handling any already-connected threads -- so from the
-    // service method's point of view, a status of STOPPING is a green
-    // light.
-    facebook::fb303::fb_status status = handler_->getStatus();
-    if (status != facebook::fb303::ALIVE
-        && status != facebook::fb303::STOPPING) {
-      if (status == facebook::fb303::STARTING) {
-        throw ServiceException("Server starting up; please try again later");
-      } else {
-        throw ServiceException("Server not alive; please try again later");
-      }
-    }
-  }
-
-  // check server threads
-  if (featureThreadCheck_ && !serviceMethod.featureLogOnly_) {
-    // note: Might want to put these messages in reportCheckpoint() if
-    // log is getting spammed.
-    if (threadManager_ != NULL) {
-      size_t idle_count = threadManager_->idleWorkerCount();
-      if (idle_count == 0) {
-        stringstream message;
-        message << "service " << serviceMethod.signature_
-                << ": all threads (" << threadManager_->workerCount()
-                << ") in use";
-        logMethod_(3, message.str());
-      }
-    }
-  }
-}
-
-/**
- * Logs a significant step in the middle of a "service method"; see
- * startService.
- *
- * @param const ServiceMethod &serviceMethod A reference to the ServiceMethod
- *                                           object instantiated at the start
- *                                           of the service method.
- * @return int64_t Elapsed units (see stopwatchUnit_) since ServiceMethod
- *                 instantiation.
- */
-int64_t
-ServiceTracker::stepService(const ServiceMethod &serviceMethod,
-                            const string &stepName)
-{
-  stringstream message;
-  string elapsed_label;
-  int64_t elapsed = serviceMethod.timer_.elapsedUnits(stopwatchUnit_,
-                                                      &elapsed_label);
-  message << serviceMethod.signature_
-          << ' ' << stepName
-          << " [" << elapsed_label << ']';
-  logMethod_(5, message.str());
-  return elapsed;
-}
-
-/**
- * Registers the end of a "service method"; see startService().
- *
- * @param const ServiceMethod &serviceMethod A reference to the ServiceMethod
- *                                           object instantiated at the start
- *                                           of the service method.
- */
-void
-ServiceTracker::finishService(const ServiceMethod &serviceMethod)
-{
-  // log end of service
-  stringstream message;
-  string duration_label;
-  int64_t duration = serviceMethod.timer_.elapsedUnits(stopwatchUnit_,
-                                                       &duration_label);
-  message << serviceMethod.signature_
-          << " finish [" << duration_label << ']';
-  logMethod_(5, message.str());
-
-  // count, record, and maybe report service statistics
-  if (!serviceMethod.featureLogOnly_) {
-
-    if (!featureCheckpoint_) {
-
-      // lifetime counters
-      // (note: No need to lock statisticsMutex_ if not doing checkpoint;
-      // FacebookService::incrementCounter() is already thread-safe.)
-      handler_->incrementCounter("lifetime_services");
-
-    } else {
-
-      statisticsMutex_.lock();
-      // note: No exceptions expected from this code block.  Wrap in a try
-      // just to be safe.
-      try {
-
-        // lifetime counters
-        // note: Good to synchronize this with the increment of
-        // checkpoint services, even though incrementCounter() is
-        // already thread-safe, for the sake of checkpoint reporting
-        // consistency (i.e.  since the last checkpoint,
-        // lifetime_services has incremented by checkpointServices_).
-        handler_->incrementCounter("lifetime_services");
-
-        // checkpoint counters
-        checkpointServices_++;
-        checkpointDuration_ += duration;
-
-        // per-service timing
-        // note kjv: According to my tests it is very slightly faster to
-        // call insert() once (and detect not-found) than calling find()
-        // and then maybe insert (if not-found).  However, the difference
-        // is tiny for small maps like this one, and the code for the
-        // faster solution is slightly less readable.  Also, I wonder if
-        // the instantiation of the (often unused) pair to insert makes
-        // the first algorithm slower after all.
-        map<string, pair<uint64_t, uint64_t> >::iterator iter;
-        iter = checkpointServiceDuration_.find(serviceMethod.name_);
-        if (iter != checkpointServiceDuration_.end()) {
-          iter->second.first++;
-          iter->second.second += duration;
-        } else {
-          checkpointServiceDuration_.insert(make_pair(serviceMethod.name_,
-                                                      make_pair(1, duration)));
-        }
-
-        // maybe report checkpoint
-        // note: ...if it's been long enough since the last report.
-        time_t now = time(NULL);
-        uint64_t check_interval = now - checkpointTime_;
-        if (check_interval >= CHECKPOINT_MINIMUM_INTERVAL_SECONDS) {
-          reportCheckpoint();
-        }
-
-      } catch (...) {
-        statisticsMutex_.unlock();
-        throw;
-      }
-      statisticsMutex_.unlock();
-
-    }
-  }
-}
-
-/**
- * Logs some statistics gathered since the last call to this method.
- *
- * note: Thread race conditions on this method could cause
- * misreporting and/or undefined behavior; the caller must protect
- * uses of the object variables (and calls to this method) with a
- * mutex.
- *
- */
-void
-ServiceTracker::reportCheckpoint()
-{
-  time_t now = time(NULL);
-
-  uint64_t check_count = checkpointServices_;
-  uint64_t check_interval = now - checkpointTime_;
-  uint64_t check_duration = checkpointDuration_;
-
-  // export counters for timing of service methods (by service name)
-  handler_->setCounter("checkpoint_time", check_interval);
-  map<string, pair<uint64_t, uint64_t> >::iterator iter;
-  uint64_t count;
-  for (iter = checkpointServiceDuration_.begin();
-       iter != checkpointServiceDuration_.end();
-       ++iter) {
-    count = iter->second.first;
-    handler_->setCounter(string("checkpoint_count_") + iter->first, count);
-    if (count == 0) {
-      handler_->setCounter(string("checkpoint_speed_") + iter->first,
-                           0);
-    } else {
-      handler_->setCounter(string("checkpoint_speed_") + iter->first,
-                           iter->second.second / count);
-    }
-  }
-
-  // reset checkpoint variables
-  // note: Clearing the map while other threads are using it might
-  // cause undefined behavior.
-  checkpointServiceDuration_.clear();
-  checkpointTime_ = now;
-  checkpointServices_ = 0;
-  checkpointDuration_ = 0;
-
-  // get lifetime variables
-  uint64_t life_count = handler_->getCounter("lifetime_services");
-  uint64_t life_interval = now - handler_->aliveSince();
-
-  // log checkpoint
-  stringstream message;
-  message << "checkpoint_time:" << check_interval
-          << " checkpoint_services:" << check_count
-          << " checkpoint_speed_sum:" << check_duration
-          << " lifetime_time:" << life_interval
-          << " lifetime_services:" << life_count;
-  if (featureThreadCheck_ && threadManager_ != NULL) {
-    size_t worker_count = threadManager_->workerCount();
-    size_t idle_count = threadManager_->idleWorkerCount();
-    message << " total_workers:" << worker_count
-            << " active_workers:" << (worker_count - idle_count);
-  }
-  logMethod_(4, message.str());
-}
-
-/**
- * Remembers the thread manager used in the server, for monitoring thread
- * activity.
- *
- * @param shared_ptr<ThreadManager> threadManager The server's thread manager.
- */
-void
-ServiceTracker::setThreadManager(boost::shared_ptr<ThreadManager>
-                                 threadManager)
-{
-  threadManager_ = threadManager;
-}
-
-/**
- * Logs messages to stdout; the passed message will be logged if the
- * passed level is less than or equal to LOG_LEVEL.
- *
- * This is the default logging method used by the ServiceTracker.  An
- * alternate logging method (that accepts the same parameters) may be
- * specified to the constructor.
- *
- * @param int level A level associated with the message: higher levels
- *                  are used to indicate higher levels of detail.
- * @param string message The message to log.
- */
-void
-ServiceTracker::defaultLogMethod(int level, const string &message)
-{
-  if (level <= LOG_LEVEL) {
-    string level_string;
-    time_t now = time(NULL);
-    char now_pretty[26];
-    ctime_r(&now, now_pretty);
-    now_pretty[24] = '\0';
-    switch (level) {
-    case 1:
-      level_string = "CRITICAL";
-      break;
-    case 2:
-      level_string = "ERROR";
-      break;
-    case 3:
-      level_string = "WARNING";
-      break;
-    case 5:
-      level_string = "DEBUG";
-      break;
-    case 4:
-    default:
-      level_string = "INFO";
-      break;
-    }
-    cout << '[' << level_string << "] [" << now_pretty << "] "
-         << message << endl;
-  }
-}
-
-
-/**
- * Creates a Stopwatch, which can report the time elapsed since its
- * creation.
- *
- */
-Stopwatch::Stopwatch()
-{
-  gettimeofday(&startTime_, NULL);
-}
-
-void
-Stopwatch::reset()
-{
-  gettimeofday(&startTime_, NULL);
-}
-
-uint64_t
-Stopwatch::elapsedUnits(Stopwatch::Unit unit, string *label) const
-{
-  timeval now_time;
-  gettimeofday(&now_time, NULL);
-  time_t duration_secs = now_time.tv_sec - startTime_.tv_sec;
-
-  uint64_t duration_units;
-  switch (unit) {
-  case UNIT_SECONDS:
-    duration_units = duration_secs
-      + (now_time.tv_usec - startTime_.tv_usec + 500000) / 1000000;
-    if (NULL != label) {
-      stringstream ss_label;
-      ss_label << duration_units << " secs";
-      label->assign(ss_label.str());
-    }
-    break;
-  case UNIT_MICROSECONDS:
-    duration_units = duration_secs * 1000000
-      + now_time.tv_usec - startTime_.tv_usec;
-    if (NULL != label) {
-      stringstream ss_label;
-      ss_label << duration_units << " us";
-      label->assign(ss_label.str());
-    }
-    break;
-  case UNIT_MILLISECONDS:
-  default:
-    duration_units = duration_secs * 1000
-      + (now_time.tv_usec - startTime_.tv_usec + 500) / 1000;
-    if (NULL != label) {
-      stringstream ss_label;
-      ss_label << duration_units << " ms";
-      label->assign(ss_label.str());
-    }
-    break;
-  }
-  return duration_units;
-}
-
-/**
- * Creates a ServiceMethod, used for tracking a single service method
- * invocation (via the ServiceTracker).  The passed name of the
- * ServiceMethod is used to group statistics (e.g. counts and durations)
- * for similar invocations; the passed signature is used to uniquely
- * identify the particular invocation in the log.
- *
- * note: A version of this constructor is provided that automatically
- * forms a signature the name and a passed numeric id.  Silly, sure,
- * but commonly used, since it often saves the caller a line or two of
- * code.
- *
- * @param ServiceTracker *tracker The service tracker that will track this
- *                                ServiceMethod.
- * @param const string &name The service method name (usually independent
- *                           of service method parameters).
- * @param const string &signature A signature uniquely identifying the method
- *                                invocation (usually name plus parameters).
- */
-ServiceMethod::ServiceMethod(ServiceTracker *tracker,
-                             const string &name,
-                             const string &signature,
-                             bool featureLogOnly)
-  : tracker_(tracker), name_(name), signature_(signature),
-    featureLogOnly_(featureLogOnly)
-{
-  // note: timer_ automatically starts at construction.
-
-  // invoke tracker to start service
-  // note: Might throw.  If it throws, then this object's destructor
-  // won't be called, which is according to plan: finishService() is
-  // only supposed to be matched to startService() if startService()
-  // returns without error.
-  tracker_->startService(*this);
-}
-
-ServiceMethod::ServiceMethod(ServiceTracker *tracker,
-                             const string &name,
-                             uint64_t id,
-                             bool featureLogOnly)
-  : tracker_(tracker), name_(name), featureLogOnly_(featureLogOnly)
-{
-  // note: timer_ automatically starts at construction.
-  stringstream ss_signature;
-  ss_signature << name << " (" << id << ')';
-  signature_ = ss_signature.str();
-
-  // invoke tracker to start service
-  // note: Might throw.  If it throws, then this object's destructor
-  // won't be called, which is according to plan: finishService() is
-  // only supposed to be matched to startService() if startService()
-  // returns without error.
-  tracker_->startService(*this);
-}
-
-ServiceMethod::~ServiceMethod()
-{
-  // invoke tracker to finish service
-  // note: Not expecting an exception from this code, but
-  // finishService() might conceivably throw an out-of-memory
-  // exception.
-  try {
-    tracker_->finishService(*this);
-  } catch (...) {
-    // don't throw
-  }
-}
-
-uint64_t
-ServiceMethod::step(const std::string &stepName)
-{
-  return tracker_->stepService(*this, stepName);
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/ServiceTracker.h b/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/ServiceTracker.h
deleted file mode 100644
index 9a3edd8..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/cpp/ServiceTracker.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * ServiceTracker is a utility class for logging and timing service
- * calls to a fb303 Thrift server.  Currently, ServiceTracker offers
- * the following features:
- *
- *   . Logging of service method start, end (and duration), and
- *     optional steps in between.
- *
- *   . Automatic check of server status via fb303::getStatus()
- *     with a ServiceException thrown if server not alive
- *     (at method start).
- *
- *   . A periodic logged checkpoint reporting lifetime time, lifetime
- *     service count, and per-method statistics since the last checkpoint
- *     time (at method finish).
- *
- *   . Export of fb303 counters for lifetime and checkpoint statistics
- *     (at method finish).
- *
- *   . For TThreadPoolServers, a logged warning when all server threads
- *     are busy (at method start).  (Must call setThreadManager() after
- *     ServiceTracker instantiation for this feature to be enabled.)
- *
- * Individual features may be enabled or disabled by arguments to the
- * constructor.  The constructor also accepts a pointer to a logging
- * method -- if no pointer is passed, the tracker will log to stdout.
- *
- * ServiceTracker defines private methods for service start, finish,
- * and step, which are designed to be accessed by instantiating a
- * friend ServiceMethod object, as in the following example:
- *
- *    #include <ServiceTracker.h>
- *    class MyServiceHandler : virtual public MyServiceIf,
- *                             public facebook::fb303::FacebookBase
- *    {
- *    public:
- *      MyServiceHandler::MyServiceHandler() : mServiceTracker(this) {}
- *      void MyServiceHandler::myServiceMethod(int userId) {
- *        // note: Instantiating a ServiceMethod object starts a timer
- *        // and tells the ServiceTracker to log the start.  Might throw
- *        // a ServiceException.
- *        ServiceMethod serviceMethod(&mServiceTracker,
- *                                   "myServiceMethod",
- *                                   userId);
- *        ...
- *        // note: Calling the step method tells the ServiceTracker to
- *        // log the step, with a time elapsed since start.
- *        serviceMethod.step("post parsing, begin processing");
- *        ...
- *        // note: When the ServiceMethod object goes out of scope, the
- *        // ServiceTracker will log the total elapsed time of the method.
- *      }
- *      ...
- *    private:
- *      ServiceTracker mServiceTracker;
- *    }
- *
- * The step() method call is optional; the startService() and
- * finishService() methods are handled by the object's constructor and
- * destructor.
- *
- * The ServiceTracker is (intended to be) thread-safe.
- *
- * Future:
- *
- *   . Come up with something better for logging than passing a
- *     function pointer to the constructor.
- *
- *   . Add methods for tracking errors from service methods, e.g.
- *     ServiceTracker::reportService().
- */
-
-#ifndef SERVICETRACKER_H
-#define SERVICETRACKER_H
-
-
-#include <iostream>
-#include <string>
-#include <sstream>
-#include <exception>
-#include <map>
-#include <boost/shared_ptr.hpp>
-
-#include <thrift/concurrency/Mutex.h>
-
-
-namespace apache { namespace thrift { namespace concurrency {
-  class ThreadManager;
-}}}
-
-
-namespace facebook { namespace fb303 {
-
-
-class FacebookBase;
-class ServiceMethod;
-
-
-class Stopwatch
-{
-public:
-  enum Unit { UNIT_SECONDS, UNIT_MILLISECONDS, UNIT_MICROSECONDS };
-  Stopwatch();
-  uint64_t elapsedUnits(Unit unit, std::string *label = NULL) const;
-  void reset();
-private:
-  timeval startTime_;
-};
-
-
-class ServiceTracker
-{
-  friend class ServiceMethod;
-
-public:
-
-  static uint64_t CHECKPOINT_MINIMUM_INTERVAL_SECONDS;
-  static int LOG_LEVEL;
-
-  ServiceTracker(facebook::fb303::FacebookBase *handler,
-                 void (*logMethod)(int, const std::string &)
-                 = &ServiceTracker::defaultLogMethod,
-                 bool featureCheckpoint = true,
-                 bool featureStatusCheck = true,
-                 bool featureThreadCheck = true,
-                 Stopwatch::Unit stopwatchUnit
-                 = Stopwatch::UNIT_MILLISECONDS);
-
-  void setThreadManager(boost::shared_ptr<apache::thrift::concurrency::ThreadManager> threadManager);
-
-private:
-
-  facebook::fb303::FacebookBase *handler_;
-  void (*logMethod_)(int, const std::string &);
-  boost::shared_ptr<apache::thrift::concurrency::ThreadManager> threadManager_;
-
-  bool featureCheckpoint_;
-  bool featureStatusCheck_;
-  bool featureThreadCheck_;
-  Stopwatch::Unit stopwatchUnit_;
-
-  apache::thrift::concurrency::Mutex statisticsMutex_;
-  time_t checkpointTime_;
-  uint64_t checkpointServices_;
-  uint64_t checkpointDuration_;
-  std::map<std::string, std::pair<uint64_t, uint64_t> > checkpointServiceDuration_;
-
-  void startService(const ServiceMethod &serviceMethod);
-  int64_t stepService(const ServiceMethod &serviceMethod,
-                      const std::string &stepName);
-  void finishService(const ServiceMethod &serviceMethod);
-  void reportCheckpoint();
-  static void defaultLogMethod(int level, const std::string &message);
-};
-
-
-class ServiceMethod
-{
-  friend class ServiceTracker;
-public:
-  ServiceMethod(ServiceTracker *tracker,
-                const std::string &name,
-                const std::string &signature,
-                bool featureLogOnly = false);
-  ServiceMethod(ServiceTracker *tracker,
-                const std::string &name,
-                uint64_t id,
-                bool featureLogOnly = false);
-  ~ServiceMethod();
-  uint64_t step(const std::string &stepName);
-private:
-  ServiceTracker *tracker_;
-  std::string name_;
-  std::string signature_;
-  bool featureLogOnly_;
-  Stopwatch timer_;
-};
-
-
-class ServiceException : public std::exception
-{
-public:
-  explicit ServiceException(const std::string &message, int code = 0)
-    : message_(message), code_(code) {}
-  ~ServiceException() throw() {}
-  virtual const char *what() const throw() { return message_.c_str(); }
-  int code() const throw() { return code_; }
-private:
-  std::string message_;
-  int code_;
-};
-
-
-}} // facebook::fb303
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/global_footer.mk b/vendor/git.apache.org/thrift.git/contrib/fb303/global_footer.mk
deleted file mode 100644
index 96f82eb..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/global_footer.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-thriftstyle : $(XBUILT_SOURCES)
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/global_header.mk b/vendor/git.apache.org/thrift.git/contrib/fb303/global_header.mk
deleted file mode 100644
index 77c9455..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/global_header.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-#define thrift_template
-#  $(1) : $(2)
-#	$$(THRIFT) $(3) $(4) $(5) $(6) $(7) $(8) $$<
-#endef
-
-define thrift_template
-XTARGET := $(shell perl -e '@val = split("\/","$(2)"); $$last = pop(@val);split("\\.",$$last);print "$(1)/"."gen-cpp/"."@_[0]"."_types.cpp\n"' )
-
-ifneq ($$(XBUILT_SOURCES),) 
-    XBUILT_SOURCES := $$(XBUILT_SOURCES) $$(XTARGET)
-else
-    XBUILT_SOURCES := $$(XTARGET)
-endif
-$$(XTARGET) : $(2)
-	$$(THRIFT) -o $1 $3 $$<
-endef
-
-clean-common:
-	rm -rf gen-*
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/if/fb303.thrift b/vendor/git.apache.org/thrift.git/contrib/fb303/if/fb303.thrift
deleted file mode 100644
index 66c8315..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/if/fb303.thrift
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * fb303.thrift
- */
-
-namespace java com.facebook.fb303
-namespace cpp facebook.fb303
-namespace perl Facebook.FB303
-
-/**
- * Common status reporting mechanism across all services
- */
-enum fb_status {
-  DEAD = 0,
-  STARTING = 1,
-  ALIVE = 2,
-  STOPPING = 3,
-  STOPPED = 4,
-  WARNING = 5,
-}
-
-/**
- * Standard base service
- */
-service FacebookService {
-
-  /**
-   * Returns a descriptive name of the service
-   */
-  string getName(),
-
-  /**
-   * Returns the version of the service
-   */
-  string getVersion(),
-
-  /**
-   * Gets the status of this service
-   */
-  fb_status getStatus(),
-
-  /**
-   * User friendly description of status, such as why the service is in
-   * the dead or warning state, or what is being started or stopped.
-   */
-  string getStatusDetails(),
-
-  /**
-   * Gets the counters for this service
-   */
-  map<string, i64> getCounters(),
-
-  /**
-   * Gets the value of a single counter
-   */
-  i64 getCounter(1: string key),
-
-  /**
-   * Sets an option
-   */
-  void setOption(1: string key, 2: string value),
-
-  /**
-   * Gets an option
-   */
-  string getOption(1: string key),
-
-  /**
-   * Gets all options
-   */
-  map<string, string> getOptions(),
-
-  /**
-   * Returns a CPU profile over the given time interval (client and server
-   * must agree on the profile format).
-   */
-  string getCpuProfile(1: i32 profileDurationInSec),
-
-  /**
-   * Returns the unix time that the server has been running since
-   */
-  i64 aliveSince(),
-
-  /**
-   * Tell the server to reload its configuration, reopen log files, etc
-   */
-  oneway void reinitialize(),
-
-  /**
-   * Suggest a shutdown to the server
-   */
-  oneway void shutdown(),
-
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/java/build.xml b/vendor/git.apache.org/thrift.git/contrib/fb303/java/build.xml
deleted file mode 100755
index 8f2fa51..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/java/build.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<project name="libfb303" default="dist" basedir="."
-  xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <!-- project wide settings. All directories relative to basedir -->
-  <property name="thrift.root" location="${basedir}/../../../"/>
-  <property name="fb303.artifactid" value="libfb303"/>
-  <property name="interface.dir" value="${basedir}/../if"/>
-  <property name="thrift.java.dir" location="${thrift.root}/lib/java"/>
-  <property name="build.tools.dir" location="${thrift.java.dir}/build/tools/"/>
-  <property name="thrift_compiler" value="${thrift.root}/compiler/cpp/thrift"/> 
-
-  <!-- inherit from the java build file for version and other properties -->
-  <property file="${thrift.java.dir}/build.properties" />
-
-  <property environment="env"/>
-
-  <condition property="version" value="${thrift.version}">
-    <isset property="release"/>
-  </condition>
-  <property name="version" value="${thrift.version}-snapshot"/>
-
-  <property name="fb303.final.name" value="${fb303.artifactid}-${version}"/>
-  <property name="thrift.java.libthrift" value="${thrift.java.dir}/build/libthrift-${version}.jar"/>
-
-  <property name="src" value="${basedir}/src"/>
-  <property name="gen" value="${basedir}/gen-java"/>
-  <property name="build.dir" value="${basedir}/build"/>
-  <property name="build.lib.dir" value="${build.dir}/lib"/>
-  <property name="build.classes.dir" value="${build.dir}/classes"/>
-
-  <property name="fb303.jar.file" location="${build.dir}/${fb303.final.name}.jar"/>
-  <property name="fb303.pom.xml" location="${build.dir}/${fb303.final.name}.pom"/>
-
-  <target name="init" depends="setup.init,mvn.init" unless="init.finished">
-    <property name="init.finished" value="true"/>
-  </target>
-
-  <target name="setup.init">
-    <tstamp/>
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${build.classes.dir}"/>
-    <mkdir dir="${build.lib.dir}"/>
-  </target>
-
-  <!-- generate fb303 thrift code -->
-  <target name="generate">
-    <echo message="generating thrift fb303 files"/>
-    <exec executable="${thrift_compiler}" failonerror="true">
-      <arg line="--gen java -o ${basedir} ${interface.dir}/fb303.thrift"/>
-    </exec>
-  </target>
-
-  <!-- compile the base and thrift generated code and jar them -->
-  <target name="dist" depends="init,generate">
-    <echo message="Building ${fb303.final.name}.jar"/>
-    <javac destdir="${build.classes.dir}" debug="on">
-      <classpath>
-        <pathelement location="${thrift.java.libthrift}"/>
-        <fileset dir="${thrift.root}/lib/java/build/lib">
-          <include name="*.jar"/>
-        </fileset>
-      </classpath>
-      <src path="${src}"/>
-      <src path="${gen}"/>
-      <include name="**/*.java"/>
-    </javac>
-    <jar jarfile="${build.dir}/${fb303.final.name}.jar" basedir="${build.classes.dir}">
-    </jar>
-  </target>
-
-  <!-- copy the build jar to the distribution library directory -->
-  <target name="install" depends="dist">
-    <copy todir="${install.path}">
-      <fileset dir="${build.lib.dir}" includes="*.jar"/>
-      <fileset dir="${build.lib.dir}" includes="${fb303.final.name}.jar"/>
-    </copy>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build.dir}"/>
-    <delete dir="${gen}"/>
-  </target>
-
-  <target name="mvn.ant.tasks.download" depends="setup.init,mvn.ant.tasks.check" unless="mvn.ant.tasks.found">
-    <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}" dest="${build.tools.dir}/${mvn.ant.task.jar}" usetimestamp="true"/>
-  </target>
-
-  <target name="mvn.ant.tasks.check">
-    <condition property="mvn.ant.tasks.found">
-      <typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/>
-    </condition>
-  </target>
-
-  <target name="mvn.init" depends="mvn.ant.tasks.download" unless="mvn.finished">
-    <echo message="${mvn.ant.task.jar}"/>
-    <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
-    <typedef uri="antlib:org.apache.maven.artifact.ant" classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
-
-    <!-- remote repositories used to download dependencies from -->
-    <artifact:remoteRepository id="central" url="${mvn.repo}"/>
-    <artifact:remoteRepository id="apache" url="${apache.repo}"/>
-
-    <!-- Pom file information -->
-    <artifact:pom id="pom" 
-      groupId="${thrift.groupid}" 
-      artifactId="${fb303.artifactid}"
-      version="${version}" 
-      url="http://thrift.apache.org"
-      name="Apache Thrift"
-      description="Thrift is a software framework for scalable cross-language services development."
-      packaging="pom"
-    >
-      <remoteRepository refid="central"/>
-      <remoteRepository refid="apache"/>
-      <license name="The Apache Software License, Version 2.0" url="${license}"/>
-      <scm connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git" 
-      developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git"
-      url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
-    />
-      <!-- Thrift Developers -->
-      <developer id="mcslee" name="Mark Slee"/>
-      <developer id="dreiss" name="David Reiss"/>
-      <developer id="aditya" name="Aditya Agarwal"/>
-      <developer id="marck" name="Marc Kwiatkowski"/>
-      <developer id="jwang" name="James Wang"/>
-      <developer id="cpiro" name="Chris Piro"/>
-      <developer id="bmaurer" name="Ben Maurer"/>
-      <developer id="kclark" name="Kevin Clark"/>
-      <developer id="jake" name="Jake Luciani"/>
-      <developer id="bryanduxbury" name="Bryan Duxbury"/>
-      <developer id="esteve" name="Esteve Fernandez"/>
-      <developer id="todd" name="Todd Lipcon"/>
-      <developer id="geechorama" name="Andrew McGeachie"/>
-      <developer id="molinaro" name="Anthony Molinaro"/>
-      <developer id="roger" name="Roger Meier"/>
-      <developer id="jfarrell" name="Jake Farrell"/>
-      <developer id="jensg" name="Jens Geyer"/>
-      <developer id="carl" name="Carl Yeksigian"/>
-
-      <!-- Thrift dependencies list -->
-      <dependency groupId="org.apache.thrift" artifactId="libthrift" version="${version}"/>
-    </artifact:pom>
-
-    <!-- Generate the pom file -->
-    <artifact:writepom pomRefId="pom" file="${fb303.pom.xml}"/>
-
-    <property name="mvn.finished" value="true"/>
-  </target>
-
-  <macrodef name="signAndDeploy">
-    <!-- Sign and deploy jars to apache repo -->
-    <attribute name="file"/>
-    <attribute name="classifier" default=""/>
-    <attribute name="packaging" default="jar"/>
-    <attribute name="pom" default=""/>
-    <sequential>
-      <artifact:mvn fork="true">
-        <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
-        <arg value="-DrepositoryId=${maven-repository-id}"/>
-        <arg value="-Durl=${maven-repository-url}"/>
-        <arg value="-DpomFile=@{pom}"/>
-        <arg value="-Dfile=@{file}"/>
-        <arg value="-Dclassifier=@{classifier}"/>
-        <arg value="-Dpackaging=@{packaging}"/>
-        <arg value="-Pgpg"/>
-      </artifact:mvn>
-    </sequential>
-  </macrodef>
-
-  <target name="publish" depends="clean,dist">
-    <!-- Compile, packages and then send release to apache maven repo -->
-    <!-- run with: ant -Drelease=true publish-->
-    <signAndDeploy file="${fb303.pom.xml}" packaging="pom" classifier="" pom="${fb303.pom.xml}"/>
-    <signAndDeploy file="${fb303.jar.file}" packaging="jar" classifier="" pom="${fb303.pom.xml}"/>
-  </target>
-</project>
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/java/src/FacebookBase.java b/vendor/git.apache.org/thrift.git/contrib/fb303/java/src/FacebookBase.java
deleted file mode 100644
index f8f26a3..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/java/src/FacebookBase.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.facebook.fb303;
-
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-public abstract class FacebookBase implements FacebookService.Iface {
-
-  private String name_;
-
-  private long alive_;
-
-  private final ConcurrentHashMap<String,Long> counters_ =
-    new ConcurrentHashMap<String, Long>();
-
-  private final ConcurrentHashMap<String,String> options_ =
-    new ConcurrentHashMap<String, String>();
-
-  protected FacebookBase(String name) {
-    name_ = name;
-    alive_ = System.currentTimeMillis() / 1000;
-  }
-
-  public String getName() {
-    return name_;
-  }
-
-  public abstract fb_status getStatus();
-
-  public String getStatusDetails() {
-    return "";
-  }
-
-  public void deleteCounter(String key) {
-    counters_.remove(key);
-  }
-
-  public void resetCounter(String key) {
-    counters_.put(key, 0L);
-  }
-
-  public long incrementCounter(String key) {
-    long val = getCounter(key) + 1;
-    counters_.put(key, val);
-    return val;
-  }
-
-  public long incrementCounter(String key, long increment) {
-    long val = getCounter(key) + increment;
-    counters_.put(key, val);
-    return val;
-  }
-
-  public long setCounter(String key, long value) {
-    counters_.put(key, value);
-    return value;
-  }
-
-  public AbstractMap<String,Long> getCounters() {
-    return counters_;
-  }
-
-  public long getCounter(String key) {
-    Long val = counters_.get(key);
-    if (val == null) {
-      return 0;
-    }
-    return val.longValue();
-  }
-
-  public void setOption(String key, String value) {
-    options_.put(key, value);
-  }
-
-  public String getOption(String key) {
-    return options_.get(key);
-  }
-
-  public AbstractMap<String,String> getOptions() {
-    return options_;
-  }
-
-  public long aliveSince() {
-    return alive_;
-  }
-
-  public String getCpuProfile() {
-    return "";
-  }
-
-  public void reinitialize() {}
-
-  public void shutdown() {}
-
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/php/FacebookBase.php b/vendor/git.apache.org/thrift.git/contrib/fb303/php/FacebookBase.php
deleted file mode 100644
index 2ac318f..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/php/FacebookBase.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Abstract Class providing null implementation for FacebookService
- * methods.
- */
-class FacebookBase implements FacebookServiceIf {
-  protected $name_ = '';
-
-  public function __construct($name) {
-    $this->name_ = $name;
-  }
-
-  public function getName() {
-    return $this->name_;
-  }
-
-  public function getVersion() { 
-    return ''; 
-  }
-
-  public function getStatus() { 
-    return null; 
-  } 
-  
-  public function getStatusDetails() { 
-    return '';
-  }
- 
-  public function getCounters() { 
-    return array();
-  } 
-
-  public function getCounter($key) { 
-    return null;
-  } 
-
-  public function setOption($key, $value) { 
-    return;
-  } 
-
-  public function getOption($key) { 
-    return ''; 
-  } 
-
-  public function getOptions() { 
-    return array();
-  } 
-
-  public function aliveSince() { 
-    return 0;
-  } 
-
-  public function getCpuProfile($duration) { 
-    return ''; 
-  }
-
-  public function getLimitedReflection() { 
-    return array();
-  } 
-
-  public function reinitialize() { 
-    return;
-  }
-
-  public function shutdown() { 
-    return;
-  }
-
-}
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/py/Makefile.am b/vendor/git.apache.org/thrift.git/contrib/fb303/py/Makefile.am
deleted file mode 100644
index 060495e..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/py/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-DESTDIR ?= /
-EXTRA_DIST = setup.py src
-
-all:
-
-all-local:
-	$(thrift_home)/bin/thrift --gen py $(top_srcdir)/if/fb303.thrift
-	mv gen-py/fb303/* fb303
-	$(PYTHON) setup.py build
-
-# We're ignoring prefix here because site-packages seems to be
-# the equivalent of /usr/local/lib in Python land.
-# Old version (can't put inline because it's not portable).
-#$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS)
-install-exec-hook:
-	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
-
-
-
-clean:	clean-local
-
-clean-local:
-	$(RM) -r build
-
-check-local: all
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303/FacebookBase.py b/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303/FacebookBase.py
deleted file mode 100644
index 07db10c..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303/FacebookBase.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import time
-import FacebookService
-import thrift.reflection.limited
-from ttypes import fb_status
-
-
-class FacebookBase(FacebookService.Iface):
-
-    def __init__(self, name):
-        self.name = name
-        self.alive = int(time.time())
-        self.counters = {}
-
-    def getName(self, ):
-        return self.name
-
-    def getVersion(self, ):
-        return ''
-
-    def getStatus(self, ):
-        return fb_status.ALIVE
-
-    def getCounters(self):
-        return self.counters
-
-    def resetCounter(self, key):
-        self.counters[key] = 0
-
-    def getCounter(self, key):
-        if self.counters.has_key(key):
-            return self.counters[key]
-        return 0
-
-    def incrementCounter(self, key):
-        self.counters[key] = self.getCounter(key) + 1
-
-    def setOption(self, key, value):
-        pass
-
-    def getOption(self, key):
-        return ""
-
-    def getOptions(self):
-        return {}
-
-    def getOptions(self):
-        return {}
-
-    def aliveSince(self):
-        return self.alive
-
-    def getCpuProfile(self, duration):
-        return ""
-
-    def getLimitedReflection(self):
-        return thrift.reflection.limited.Service()
-
-    def reinitialize(self):
-        pass
-
-    def shutdown(self):
-        pass
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303_scripts/__init__.py b/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303_scripts/__init__.py
deleted file mode 100644
index f8e3a94..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303_scripts/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-__all__ = ['fb303_simple_mgmt']
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py b/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
deleted file mode 100644
index 4b1c257..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/py/fb303_scripts/fb303_simple_mgmt.py
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-import os
-from optparse import OptionParser
-
-from thrift.Thrift import *
-
-from thrift.transport import TSocket
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
-
-from fb303 import *
-from fb303.ttypes import *
-
-
-def service_ctrl(
-        command,
-        port,
-        trans_factory=None,
-        prot_factory=None):
-    """
-    service_ctrl is a generic function to execute standard fb303 functions
-
-    @param command: one of stop, start, reload, status, counters, name, alive
-    @param port: service's port
-    @param trans_factory: TTransportFactory to use for obtaining a TTransport. Default is
-                          TBufferedTransportFactory
-    @param prot_factory: TProtocolFactory to use for obtaining a TProtocol. Default is
-                         TBinaryProtocolFactory
-    """
-
-    if command in ["status"]:
-        try:
-            status = fb303_wrapper('status', port, trans_factory, prot_factory)
-            status_details = fb303_wrapper('get_status_details', port, trans_factory, prot_factory)
-
-            msg = fb_status_string(status)
-            if (len(status_details)):
-                msg += " - %s" % status_details
-            print msg
-
-            if (status == fb_status.ALIVE):
-                return 2
-            else:
-                return 3
-        except:
-            print "Failed to get status"
-            return 3
-
-    # scalar commands
-    if command in ["version", "alive", "name"]:
-        try:
-            result = fb303_wrapper(command, port, trans_factory, prot_factory)
-            print result
-            return 0
-        except:
-            print "failed to get ", command
-            return 3
-
-    # counters
-    if command in ["counters"]:
-        try:
-            counters = fb303_wrapper('counters', port, trans_factory, prot_factory)
-            for counter in counters:
-                print "%s: %d" % (counter, counters[counter])
-            return 0
-        except:
-            print "failed to get counters"
-            return 3
-
-    # Only root should be able to run the following commands
-    if os.getuid() == 0:
-        # async commands
-        if command in ["stop", "reload"]:
-            try:
-                fb303_wrapper(command, port, trans_factory, prot_factory)
-                return 0
-            except:
-                print "failed to tell the service to ", command
-                return 3
-    else:
-        if command in ["stop", "reload"]:
-            print "root privileges are required to stop or reload the service."
-            return 4
-
-    print "The following commands are available:"
-    for command in ["counters", "name", "version", "alive", "status"]:
-        print "\t%s" % command
-    print "The following commands are available for users with root privileges:"
-    for command in ["stop", "reload"]:
-        print "\t%s" % command
-
-    return 0
-
-
-def fb303_wrapper(command, port, trans_factory=None, prot_factory=None):
-    sock = TSocket.TSocket('localhost', port)
-
-    # use input transport factory if provided
-    if (trans_factory is None):
-        trans = TTransport.TBufferedTransport(sock)
-    else:
-        trans = trans_factory.getTransport(sock)
-
-    # use input protocol factory if provided
-    if (prot_factory is None):
-        prot = TBinaryProtocol.TBinaryProtocol(trans)
-    else:
-        prot = prot_factory.getProtocol(trans)
-
-    # initialize client and open transport
-    fb303_client = FacebookService.Client(prot, prot)
-    trans.open()
-
-    if (command == 'reload'):
-        fb303_client.reinitialize()
-
-    elif (command == 'stop'):
-        fb303_client.shutdown()
-
-    elif (command == 'status'):
-        return fb303_client.getStatus()
-
-    elif (command == 'version'):
-        return fb303_client.getVersion()
-
-    elif (command == 'get_status_details'):
-        return fb303_client.getStatusDetails()
-
-    elif (command == 'counters'):
-        return fb303_client.getCounters()
-
-    elif (command == 'name'):
-        return fb303_client.getName()
-
-    elif (command == 'alive'):
-        return fb303_client.aliveSince()
-
-    trans.close()
-
-
-def fb_status_string(status_enum):
-    if (status_enum == fb_status.DEAD):
-        return "DEAD"
-    if (status_enum == fb_status.STARTING):
-        return "STARTING"
-    if (status_enum == fb_status.ALIVE):
-        return "ALIVE"
-    if (status_enum == fb_status.STOPPING):
-        return "STOPPING"
-    if (status_enum == fb_status.STOPPED):
-        return "STOPPED"
-    if (status_enum == fb_status.WARNING):
-        return "WARNING"
-
-
-def main():
-
-    # parse command line options
-    parser = OptionParser()
-    commands = ["stop", "counters", "status", "reload", "version", "name", "alive"]
-
-    parser.add_option("-c", "--command", dest="command", help="execute this API",
-                      choices=commands, default="status")
-    parser.add_option("-p", "--port", dest="port", help="the service's port",
-                      default=9082)
-
-    (options, args) = parser.parse_args()
-    status = service_ctrl(options.command, options.port)
-    sys.exit(status)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/vendor/git.apache.org/thrift.git/contrib/fb303/py/setup.py b/vendor/git.apache.org/thrift.git/contrib/fb303/py/setup.py
deleted file mode 100644
index f5b9bb3..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/fb303/py/setup.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-try:
-    from setuptools import setup, Extension
-except:
-    from distutils.core import setup, Extension, Command
-
-setup(name='thrift_fb303',
-      version='0.10.0',
-      description='Python bindings for the Apache Thrift FB303',
-      author=['Thrift Developers'],
-      author_email=['dev@thrift.apache.org'],
-      url='http://thrift.apache.org',
-      license='Apache License 2.0',
-      packages=[
-          'fb303',
-          'fb303_scripts',
-      ],
-      classifiers=[
-          'Development Status :: 5 - Production/Stable',
-          'Environment :: Console',
-          'Intended Audience :: Developers',
-          'Programming Language :: Python',
-          'Programming Language :: Python :: 2',
-          'Topic :: Software Development :: Libraries',
-          'Topic :: System :: Networking'
-      ],
-      )
diff --git a/vendor/git.apache.org/thrift.git/contrib/mingw-cross-compile.sh b/vendor/git.apache.org/thrift.git/contrib/mingw-cross-compile.sh
deleted file mode 100755
index 7ed5d47..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/mingw-cross-compile.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-./configure \
-  --disable-libs \
-  --build=i686-pc-linux-gnu \
-  --host=i586-mingw32msvc \
-  CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++
-
-make
-
-# Check two locations to be compatible with libtool 1.5.26 or 2.2.6b.
-if test -f compiler/cpp/.libs/thrift.exe ; then
-  i586-mingw32msvc-strip compiler/cpp/.libs/thrift.exe -o ./thrift.exe
-else 
-  i586-mingw32msvc-strip compiler/cpp/thrift.exe -o ./thrift.exe
-fi
-echo "Finished compiling with resulting exe"
-ls -l ./thrift.exe
diff --git a/vendor/git.apache.org/thrift.git/contrib/parse_profiling.py b/vendor/git.apache.org/thrift.git/contrib/parse_profiling.py
deleted file mode 100755
index 0be5f29..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/parse_profiling.py
+++ /dev/null
@@ -1,312 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-"""
-This script can be used to make the output from
-apache::thrift::profile_print_info() more human-readable.
-
-It translates each executable file name and address into the corresponding
-source file name, line number, and function name.  By default, it also
-demangles C++ symbol names.
-"""
-
-import optparse
-import os
-import re
-import subprocess
-import sys
-
-
-class AddressInfo(object):
-    """
-    A class to store information about a particular address in an object file.
-    """
-    def __init__(self, obj_file, address):
-        self.objectFile = obj_file
-        self.address = address
-        self.sourceFile = None
-        self.sourceLine = None
-        self.function = None
-
-
-g_addrs_by_filename = {}
-
-
-def get_address(filename, address):
-    """
-    Retrieve an AddressInfo object for the specified object file and address.
-
-    Keeps a global list of AddressInfo objects.  Two calls to get_address()
-    with the same filename and address will always return the same AddressInfo
-    object.
-    """
-    global g_addrs_by_filename
-    try:
-        by_address = g_addrs_by_filename[filename]
-    except KeyError:
-        by_address = {}
-        g_addrs_by_filename[filename] = by_address
-
-    try:
-        addr_info = by_address[address]
-    except KeyError:
-        addr_info = AddressInfo(filename, address)
-        by_address[address] = addr_info
-    return addr_info
-
-
-def translate_file_addresses(filename, addresses, options):
-    """
-    Use addr2line to look up information for the specified addresses.
-    All of the addresses must belong to the same object file.
-    """
-    # Do nothing if we can't find the file
-    if not os.path.isfile(filename):
-        return
-
-    args = ['addr2line']
-    if options.printFunctions:
-        args.append('-f')
-    args.extend(['-e', filename])
-
-    proc = subprocess.Popen(args, stdin=subprocess.PIPE,
-                            stdout=subprocess.PIPE)
-    for address in addresses:
-        assert address.objectFile == filename
-        proc.stdin.write(address.address + '\n')
-
-        if options.printFunctions:
-            function = proc.stdout.readline()
-            function = function.strip()
-            if not function:
-                raise Exception('unexpected EOF from addr2line')
-            address.function = function
-
-        file_and_line = proc.stdout.readline()
-        file_and_line = file_and_line.strip()
-        if not file_and_line:
-            raise Exception('unexpected EOF from addr2line')
-        idx = file_and_line.rfind(':')
-        if idx < 0:
-            msg = 'expected file and line number from addr2line; got %r' % \
-                (file_and_line,)
-            msg += '\nfile=%r, address=%r' % (filename, address.address)
-            raise Exception(msg)
-
-        address.sourceFile = file_and_line[:idx]
-        address.sourceLine = file_and_line[idx + 1:]
-
-    (remaining_out, cmd_err) = proc.communicate()
-    retcode = proc.wait()
-    if retcode != 0:
-        raise subprocess.CalledProcessError(retcode, args)
-
-
-def lookup_addresses(options):
-    """
-    Look up source file information for all of the addresses currently stored
-    in the global list of AddressInfo objects.
-    """
-    global g_addrs_by_filename
-    for (file, addresses) in g_addrs_by_filename.items():
-        translate_file_addresses(file, addresses.values(), options)
-
-
-class Entry(object):
-    """
-    An entry in the thrift profile output.
-    Contains a header line, and a backtrace.
-    """
-    def __init__(self, header):
-        self.header = header
-        self.bt = []
-
-    def addFrame(self, filename, address):
-        # If libc was able to determine the symbols names, the filename
-        # argument will be of the form <filename>(<function>+<offset>)
-        # So, strip off anything after the last '('
-        idx = filename.rfind('(')
-        if idx >= 0:
-            filename = filename[:idx]
-
-        addr = get_address(filename, address)
-        self.bt.append(addr)
-
-    def write(self, f, options):
-        f.write(self.header)
-        f.write('\n')
-        n = 0
-        for address in self.bt:
-            f.write('  #%-2d %s:%s\n' % (n, address.sourceFile,
-                                         address.sourceLine))
-            n += 1
-            if options.printFunctions:
-                if address.function:
-                    f.write('      %s\n' % (address.function,))
-                else:
-                    f.write('      ??\n')
-
-
-def process_file(in_file, out_file, options):
-    """
-    Read thrift profile output from the specified input file, and print
-    prettier information on the output file.
-    """
-    #
-    # A naive approach would be to read the input line by line,
-    # and each time we come to a filename and address, pass it to addr2line
-    # and print the resulting information.  Unfortunately, addr2line can be
-    # quite slow, especially with large executables.
-    #
-    # This approach is much faster.  We read in all of the input, storing
-    # the addresses in each file that need to be resolved.  We then call
-    # addr2line just once for each file.  This is much faster than calling
-    # addr2line once per address.
-    #
-
-    virt_call_regex = re.compile(r'^\s*T_VIRTUAL_CALL: (\d+) calls on (.*):$')
-    gen_prot_regex = re.compile(
-        r'^\s*T_GENERIC_PROTOCOL: (\d+) calls to (.*) with a (.*):$')
-    bt_regex = re.compile(r'^\s*#(\d+)\s*(.*) \[(0x[0-9A-Za-z]+)\]$')
-
-    # Parse all of the input, and store it as Entry objects
-    entries = []
-    current_entry = None
-    while True:
-        line = in_file.readline()
-        if not line:
-            break
-
-        if line == '\n' or line.startswith('Thrift virtual call info:'):
-            continue
-
-        virt_call_match = virt_call_regex.match(line)
-        if virt_call_match:
-            num_calls = int(virt_call_match.group(1))
-            type_name = virt_call_match.group(2)
-            if options.cxxfilt:
-                # Type names reported by typeid() are internal names.
-                # By default, c++filt doesn't demangle internal type names.
-                # (Some versions of c++filt have a "-t" option to enable this.
-                # Other versions don't have this argument, but demangle type
-                # names passed as an argument, but not on stdin.)
-                #
-                # If the output is being filtered through c++filt, prepend
-                # "_Z" to the type name to make it look like an external name.
-                type_name = '_Z' + type_name
-            header = 'T_VIRTUAL_CALL: %d calls on "%s"' % \
-                (num_calls, type_name)
-            if current_entry is not None:
-                entries.append(current_entry)
-            current_entry = Entry(header)
-            continue
-
-        gen_prot_match = gen_prot_regex.match(line)
-        if gen_prot_match:
-            num_calls = int(gen_prot_match.group(1))
-            type_name1 = gen_prot_match.group(2)
-            type_name2 = gen_prot_match.group(3)
-            if options.cxxfilt:
-                type_name1 = '_Z' + type_name1
-                type_name2 = '_Z' + type_name2
-            header = 'T_GENERIC_PROTOCOL: %d calls to "%s" with a "%s"' % \
-                (num_calls, type_name1, type_name2)
-            if current_entry is not None:
-                entries.append(current_entry)
-            current_entry = Entry(header)
-            continue
-
-        bt_match = bt_regex.match(line)
-        if bt_match:
-            if current_entry is None:
-                raise Exception('found backtrace frame before entry header')
-            frame_num = int(bt_match.group(1))
-            filename = bt_match.group(2)
-            address = bt_match.group(3)
-            current_entry.addFrame(filename, address)
-            continue
-
-        raise Exception('unexpected line in input: %r' % (line,))
-
-    # Add the last entry we were processing to the list
-    if current_entry is not None:
-        entries.append(current_entry)
-        current_entry = None
-
-    # Look up all of the addresses
-    lookup_addresses(options)
-
-    # Print out the entries, now that the information has been translated
-    for entry in entries:
-        entry.write(out_file, options)
-        out_file.write('\n')
-
-
-def start_cppfilt():
-    (read_pipe, write_pipe) = os.pipe()
-
-    # Fork.  Run c++filt in the parent process,
-    # and then continue normal processing in the child.
-    pid = os.fork()
-    if pid == 0:
-        # child
-        os.dup2(write_pipe, sys.stdout.fileno())
-        os.close(read_pipe)
-        os.close(write_pipe)
-        return
-    else:
-        # parent
-        os.dup2(read_pipe, sys.stdin.fileno())
-        os.close(read_pipe)
-        os.close(write_pipe)
-
-        cmd = ['c++filt']
-        os.execvp(cmd[0], cmd)
-
-
-def main(argv):
-    parser = optparse.OptionParser(usage='%prog [options] [<file>]')
-    parser.add_option('--no-functions', help='Don\'t print function names',
-                      dest='printFunctions', action='store_false',
-                      default=True)
-    parser.add_option('--no-demangle',
-                      help='Don\'t demangle C++ symbol names',
-                      dest='cxxfilt', action='store_false',
-                      default=True)
-
-    (options, args) = parser.parse_args(argv[1:])
-    num_args = len(args)
-    if num_args == 0:
-        in_file = sys.stdin
-    elif num_args == 1:
-        in_file = open(argv[1], 'r')
-    else:
-        parser.print_usage(sys.stderr)
-        print >> sys.stderr, 'trailing arguments: %s' % (' '.join(args[1:],))
-        return 1
-
-    if options.cxxfilt:
-        start_cppfilt()
-
-    process_file(in_file, sys.stdout, options)
-
-
-if __name__ == '__main__':
-    rc = main(sys.argv)
-    sys.exit(rc)
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/pom.xml b/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/pom.xml
deleted file mode 100644
index 7973e69..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.thrift</groupId>
-  <artifactId>thrift-maven-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>thrift-maven-plugin</name>
-  <version>0.10.0</version>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.14.1</version>
-        <configuration>
-          <systemPropertyVariables>
-            <thriftExecutable>${thrift.compiler}</thriftExecutable>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-      <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>14.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.0.14</version>
-    </dependency>
-  </dependencies>
-  <properties>
-    <thrift.root>${basedir}/../..</thrift.root>
-    <thrift.compiler>${thrift.root}/compiler/cpp/thrift</thrift.compiler>
-    <thrift.test.home>${thrift.root}/test</thrift.test.home>
-  </properties>
-</project>
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/AbstractThriftMojo.java b/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/AbstractThriftMojo.java
deleted file mode 100644
index 0913c77..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/AbstractThriftMojo.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.maven;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectHelper;
-import org.codehaus.plexus.util.cli.CommandLineException;
-import org.codehaus.plexus.util.io.RawInputStreamFacade;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Sets.newHashSet;
-import static java.lang.String.format;
-import static java.util.Arrays.asList;
-import static java.util.Collections.list;
-import static org.codehaus.plexus.util.FileUtils.cleanDirectory;
-import static org.codehaus.plexus.util.FileUtils.copyStreamToFile;
-import static org.codehaus.plexus.util.FileUtils.getFiles;
-
-/**
- * Abstract Mojo implementation.
- * <p/>
- * This class is extended by {@link org.apache.thrift.maven.ThriftCompileMojo} and
- * {@link org.apache.thrift.maven.ThriftTestCompileMojo} in order to override the specific configuration for
- * compiling the main or test classes respectively.
- */
-abstract class AbstractThriftMojo extends AbstractMojo {
-
-    private static final String THRIFT_FILE_SUFFIX = ".thrift";
-
-    private static final String DEFAULT_INCLUDES = "**/*" + THRIFT_FILE_SUFFIX;
-
-    /**
-     * The current Maven project.
-     *
-     * @parameter default-value="${project}"
-     * @readonly
-     * @required
-     */
-    protected MavenProject project;
-
-    /**
-     * A helper used to add resources to the project.
-     *
-     * @component
-     * @required
-     */
-    protected MavenProjectHelper projectHelper;
-
-    /**
-     * This is the path to the {@code thrift} executable. By default it will search the {@code $PATH}.
-     *
-     * @parameter default-value="thrift"
-     * @required
-     */
-    private String thriftExecutable;
-
-    /**
-     * This string is passed to the {@code --gen} option of the {@code thrift} parameter. By default
-     * it will generate Java output. The main reason for this option is to be able to add options
-     * to the Java generator - if you generate something else, you're on your own.
-     *
-     * @parameter default-value="java"
-     */
-    private String generator;
-
-    /**
-     * @parameter
-     */
-    private File[] additionalThriftPathElements = new File[]{};
-
-    /**
-     * Since {@code thrift} cannot access jars, thrift files in dependencies are extracted to this location
-     * and deleted on exit. This directory is always cleaned during execution.
-     *
-     * @parameter default-value="${project.build.directory}/thrift-dependencies"
-     * @required
-     */
-    private File temporaryThriftFileDirectory;
-
-    /**
-     * This is the path to the local maven {@code repository}.
-     *
-     * @parameter default-value="${localRepository}"
-     * @required
-     */
-    private ArtifactRepository localRepository;
-
-    /**
-     * Set this to {@code false} to disable hashing of dependent jar paths.
-     * <p/>
-     * This plugin expands jars on the classpath looking for embedded .thrift files.
-     * Normally these paths are hashed (MD5) to avoid issues with long file names on windows.
-     * However if this property is set to {@code false} longer paths will be used.
-     *
-     * @parameter default-value="true"
-     * @required
-     */
-    private boolean hashDependentPaths;
-
-    /**
-     * @parameter
-     */
-    private Set<String> includes = ImmutableSet.of(DEFAULT_INCLUDES);
-
-    /**
-     * @parameter
-     */
-    private Set<String> excludes = ImmutableSet.of();
-
-    /**
-     * @parameter
-     */
-    private long staleMillis = 0;
-
-    /**
-     * @parameter
-     */
-    private boolean checkStaleness = false;
-
-    /**
-     * Executes the mojo.
-     */
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        checkParameters();
-        final File thriftSourceRoot = getThriftSourceRoot();
-        if (thriftSourceRoot.exists()) {
-            try {
-                ImmutableSet<File> thriftFiles = findThriftFilesInDirectory(thriftSourceRoot);
-                final File outputDirectory = getOutputDirectory();
-                ImmutableSet<File> outputFiles = findGeneratedFilesInDirectory(getOutputDirectory());
-
-                if (thriftFiles.isEmpty()) {
-                    getLog().info("No thrift files to compile.");
-                } else if (checkStaleness && ((lastModified(thriftFiles) + staleMillis) < lastModified(outputFiles))) {
-                    getLog().info("Skipping compilation because target directory newer than sources.");
-                    attachFiles();
-                } else {
-                    ImmutableSet<File> derivedThriftPathElements =
-                            makeThriftPathFromJars(temporaryThriftFileDirectory, getDependencyArtifactFiles());
-                    outputDirectory.mkdirs();
-
-                    // Quick fix to fix issues with two mvn installs in a row (ie no clean)
-                    // cleanDirectory(outputDirectory);
-
-                    Thrift thrift = new Thrift.Builder(thriftExecutable, outputDirectory)
-                            .setGenerator(generator)
-                            .addThriftPathElement(thriftSourceRoot)
-                            .addThriftPathElements(derivedThriftPathElements)
-                            .addThriftPathElements(asList(additionalThriftPathElements))
-                            .addThriftFiles(thriftFiles)
-                            .build();
-                    final int exitStatus = thrift.compile();
-                    if (exitStatus != 0) {
-                        getLog().error("thrift failed output: " + thrift.getOutput());
-                        getLog().error("thrift failed error: " + thrift.getError());
-                        throw new MojoFailureException(
-                                "thrift did not exit cleanly. Review output for more information.");
-                    }
-                    attachFiles();
-                }
-            } catch (IOException e) {
-                throw new MojoExecutionException("An IO error occurred", e);
-            } catch (IllegalArgumentException e) {
-                throw new MojoFailureException("thrift failed to execute because: " + e.getMessage(), e);
-            } catch (CommandLineException e) {
-                throw new MojoExecutionException("An error occurred while invoking thrift.", e);
-            }
-        } else {
-            getLog().info(format("%s does not exist. Review the configuration or consider disabling the plugin.",
-                    thriftSourceRoot));
-        }
-    }
-
-    ImmutableSet<File> findGeneratedFilesInDirectory(File directory) throws IOException {
-        if (directory == null || !directory.isDirectory())
-            return ImmutableSet.of();
-
-        List<File> javaFilesInDirectory = getFiles(directory, "**/*.java", null);
-        return ImmutableSet.copyOf(javaFilesInDirectory);
-    }
-
-    private long lastModified(ImmutableSet<File> files) {
-        long result = 0;
-        for (File file : files) {
-            if (file.lastModified() > result)
-                result = file.lastModified();
-        }
-        return result;
-    }
-
-    private void checkParameters() {
-        checkNotNull(project, "project");
-        checkNotNull(projectHelper, "projectHelper");
-        checkNotNull(thriftExecutable, "thriftExecutable");
-        checkNotNull(generator, "generator");
-        final File thriftSourceRoot = getThriftSourceRoot();
-        checkNotNull(thriftSourceRoot);
-        checkArgument(!thriftSourceRoot.isFile(), "thriftSourceRoot is a file, not a diretory");
-        checkNotNull(temporaryThriftFileDirectory, "temporaryThriftFileDirectory");
-        checkState(!temporaryThriftFileDirectory.isFile(), "temporaryThriftFileDirectory is a file, not a directory");
-        final File outputDirectory = getOutputDirectory();
-        checkNotNull(outputDirectory);
-        checkState(!outputDirectory.isFile(), "the outputDirectory is a file, not a directory");
-    }
-
-    protected abstract File getThriftSourceRoot();
-
-    protected abstract List<Artifact> getDependencyArtifacts();
-
-    protected abstract File getOutputDirectory();
-
-    protected abstract void attachFiles();
-
-    /**
-     * Gets the {@link File} for each dependency artifact.
-     *
-     * @return A set of all dependency artifacts.
-     */
-    private ImmutableSet<File> getDependencyArtifactFiles() {
-        Set<File> dependencyArtifactFiles = newHashSet();
-        for (Artifact artifact : getDependencyArtifacts()) {
-            dependencyArtifactFiles.add(artifact.getFile());
-        }
-        return ImmutableSet.copyOf(dependencyArtifactFiles);
-    }
-
-    /**
-     * @throws IOException
-     */
-    ImmutableSet<File> makeThriftPathFromJars(File temporaryThriftFileDirectory, Iterable<File> classpathElementFiles)
-            throws IOException, MojoExecutionException {
-        checkNotNull(classpathElementFiles, "classpathElementFiles");
-        // clean the temporary directory to ensure that stale files aren't used
-        if (temporaryThriftFileDirectory.exists()) {
-            cleanDirectory(temporaryThriftFileDirectory);
-        }
-        Set<File> thriftDirectories = newHashSet();
-        for (File classpathElementFile : classpathElementFiles) {
-            // for some reason under IAM, we receive poms as dependent files
-            // I am excluding .xml rather than including .jar as there may be other extensions in use (sar, har, zip)
-            if (classpathElementFile.isFile() && classpathElementFile.canRead() &&
-                    !classpathElementFile.getName().endsWith(".xml")) {
-
-                // create the jar file. the constructor validates.
-                JarFile classpathJar;
-                try {
-                    classpathJar = new JarFile(classpathElementFile);
-                } catch (IOException e) {
-                    throw new IllegalArgumentException(format(
-                            "%s was not a readable artifact", classpathElementFile));
-                }
-                for (JarEntry jarEntry : list(classpathJar.entries())) {
-                    final String jarEntryName = jarEntry.getName();
-                    if (jarEntry.getName().endsWith(THRIFT_FILE_SUFFIX)) {
-                        final File uncompressedCopy =
-                                new File(new File(temporaryThriftFileDirectory,
-                                        truncatePath(classpathJar.getName())), jarEntryName);
-                        uncompressedCopy.getParentFile().mkdirs();
-                        copyStreamToFile(new RawInputStreamFacade(classpathJar
-                                .getInputStream(jarEntry)), uncompressedCopy);
-                        thriftDirectories.add(uncompressedCopy.getParentFile());
-                    }
-                }
-            } else if (classpathElementFile.isDirectory()) {
-                File[] thriftFiles = classpathElementFile.listFiles(new FilenameFilter() {
-                    public boolean accept(File dir, String name) {
-                        return name.endsWith(THRIFT_FILE_SUFFIX);
-                    }
-                });
-
-                if (thriftFiles.length > 0) {
-                    thriftDirectories.add(classpathElementFile);
-                }
-            }
-        }
-        return ImmutableSet.copyOf(thriftDirectories);
-    }
-
-    ImmutableSet<File> findThriftFilesInDirectory(File directory) throws IOException {
-        checkNotNull(directory);
-        checkArgument(directory.isDirectory(), "%s is not a directory", directory);
-        List<File> thriftFilesInDirectory = getFiles(directory, 
-        		Joiner.on(",").join(includes),
-        		Joiner.on(",").join(excludes));
-        return ImmutableSet.copyOf(thriftFilesInDirectory);
-    }
-
-    ImmutableSet<File> findThriftFilesInDirectories(Iterable<File> directories) throws IOException {
-        checkNotNull(directories);
-        Set<File> thriftFiles = newHashSet();
-        for (File directory : directories) {
-            thriftFiles.addAll(findThriftFilesInDirectory(directory));
-        }
-        return ImmutableSet.copyOf(thriftFiles);
-    }
-
-    /**
-     * Truncates the path of jar files so that they are relative to the local repository.
-     *
-     * @param jarPath the full path of a jar file.
-     * @return the truncated path relative to the local repository or root of the drive.
-     */
-    String truncatePath(final String jarPath) throws MojoExecutionException {
-
-        if (hashDependentPaths) {
-            try {
-                return toHexString(MessageDigest.getInstance("MD5").digest(jarPath.getBytes()));
-            } catch (NoSuchAlgorithmException e) {
-                throw new MojoExecutionException("Failed to expand dependent jar", e);
-            }
-        }
-
-        String repository = localRepository.getBasedir().replace('\\', '/');
-        if (!repository.endsWith("/")) {
-            repository += "/";
-        }
-
-        String path = jarPath.replace('\\', '/');
-        int repositoryIndex = path.indexOf(repository);
-        if (repositoryIndex != -1) {
-            path = path.substring(repositoryIndex + repository.length());
-        }
-
-        // By now the path should be good, but do a final check to fix windows machines.
-        int colonIndex = path.indexOf(':');
-        if (colonIndex != -1) {
-            // 2 = :\ in C:\
-            path = path.substring(colonIndex + 2);
-        }
-
-        return path;
-    }
-
-    private static final char[] HEX_CHARS = "0123456789abcdef".toCharArray();
-
-    public static String toHexString(byte[] byteArray) {
-        final StringBuilder hexString = new StringBuilder(2 * byteArray.length);
-        for (final byte b : byteArray) {
-            hexString.append(HEX_CHARS[(b & 0xF0) >> 4]).append(HEX_CHARS[b & 0x0F]);
-        }
-        return hexString.toString();
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/Thrift.java b/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/Thrift.java
deleted file mode 100644
index 6eea954..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/Thrift.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.maven;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import org.codehaus.plexus.util.cli.CommandLineException;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.util.List;
-import java.util.Set;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Lists.newLinkedList;
-import static com.google.common.collect.Sets.newHashSet;
-
-/**
- * This class represents an invokable configuration of the {@code thrift}
- * compiler. The actual executable is invoked using the plexus
- * {@link Commandline}.
- * <p/>
- * This class currently only supports generating java source files.
- */
-final class Thrift {
-
-    final static String GENERATED_JAVA = "gen-java";
-
-    private final String executable;
-    private final String generator;
-    private final ImmutableSet<File> thriftPathElements;
-    private final ImmutableSet<File> thriftFiles;
-    private final File javaOutputDirectory;
-    private final CommandLineUtils.StringStreamConsumer output;
-    private final CommandLineUtils.StringStreamConsumer error;
-
-    /**
-     * Constructs a new instance. This should only be used by the {@link Builder}.
-     *
-     * @param executable          The path to the {@code thrift} executable.
-     * @param generator           The value for the {@code --gen} option.
-     * @param thriftPath          The directories in which to search for imports.
-     * @param thriftFiles         The thrift source files to compile.
-     * @param javaOutputDirectory The directory into which the java source files
-     *                            will be generated.
-     */
-    private Thrift(String executable, String generator, ImmutableSet<File> thriftPath,
-                   ImmutableSet<File> thriftFiles, File javaOutputDirectory) {
-        this.executable = checkNotNull(executable, "executable");
-        this.generator = checkNotNull(generator, "generator");
-        this.thriftPathElements = checkNotNull(thriftPath, "thriftPath");
-        this.thriftFiles = checkNotNull(thriftFiles, "thriftFiles");
-        this.javaOutputDirectory = checkNotNull(javaOutputDirectory, "javaOutputDirectory");
-        this.error = new CommandLineUtils.StringStreamConsumer();
-        this.output = new CommandLineUtils.StringStreamConsumer();
-    }
-
-    /**
-     * Invokes the {@code thrift} compiler using the configuration specified at
-     * construction.
-     *
-     * @return The exit status of {@code thrift}.
-     * @throws CommandLineException
-     */
-    public int compile() throws CommandLineException {
-
-        for (File thriftFile : thriftFiles) {
-            Commandline cl = new Commandline();
-            cl.setExecutable(executable);
-            cl.addArguments(buildThriftCommand(thriftFile).toArray(new String[]{}));
-            final int result = CommandLineUtils.executeCommandLine(cl, null, output, error);
-
-            if (result != 0) {
-                return result;
-            }
-        }
-
-        // result will always be 0 here.
-        return 0;
-    }
-
-    /**
-     * Creates the command line arguments.
-     * <p/>
-     * This method has been made visible for testing only.
-     *
-     * @param thriftFile
-     * @return A list consisting of the executable followed by any arguments.
-     */
-    ImmutableList<String> buildThriftCommand(final File thriftFile) {
-        final List<String> command = newLinkedList();
-        // add the executable
-        for (File thriftPathElement : thriftPathElements) {
-            command.add("-I");
-            command.add(thriftPathElement.toString());
-        }
-        command.add("-out");
-        command.add(javaOutputDirectory.toString());
-        command.add("--gen");
-        command.add(generator);
-        command.add(thriftFile.toString());
-        return ImmutableList.copyOf(command);
-    }
-
-    /**
-     * @return the output
-     */
-    public String getOutput() {
-        return output.getOutput();
-    }
-
-    /**
-     * @return the error
-     */
-    public String getError() {
-        return error.getOutput();
-    }
-
-    /**
-     * This class builds {@link Thrift} instances.
-     */
-    static final class Builder {
-        private final String executable;
-        private final File javaOutputDirectory;
-        private Set<File> thriftPathElements;
-        private Set<File> thriftFiles;
-        private String generator;
-
-        /**
-         * Constructs a new builder. The two parameters are present as they are
-         * required for all {@link Thrift} instances.
-         *
-         * @param executable          The path to the {@code thrift} executable.
-         * @param javaOutputDirectory The directory into which the java source files
-         *                            will be generated.
-         * @throws NullPointerException     If either of the arguments are {@code null}.
-         * @throws IllegalArgumentException If the {@code javaOutputDirectory} is
-         *                                  not a directory.
-         */
-        public Builder(String executable, File javaOutputDirectory) {
-            this.executable = checkNotNull(executable, "executable");
-            this.javaOutputDirectory = checkNotNull(javaOutputDirectory);
-            checkArgument(javaOutputDirectory.isDirectory());
-            this.thriftFiles = newHashSet();
-            this.thriftPathElements = newHashSet();
-        }
-
-        /**
-         * Adds a thrift file to be compiled. Thrift files must be on the thriftpath
-         * and this method will fail if a thrift file is added without first adding a
-         * parent directory to the thriftpath.
-         *
-         * @param thriftFile
-         * @return The builder.
-         * @throws IllegalStateException If a thrift file is added without first
-         *                               adding a parent directory to the thriftpath.
-         * @throws NullPointerException  If {@code thriftFile} is {@code null}.
-         */
-        public Builder addThriftFile(File thriftFile) {
-            checkNotNull(thriftFile);
-            checkArgument(thriftFile.isFile());
-            checkArgument(thriftFile.getName().endsWith(".thrift"));
-            checkThriftFileIsInThriftPath(thriftFile);
-            thriftFiles.add(thriftFile);
-            return this;
-        }
-
-        /**
-         * Adds the option string for the Thrift executable's {@code --gen} parameter.
-         *
-         * @param generator
-         * @return The builder
-         * @throws NullPointerException If {@code generator} is {@code null}.
-         */
-        public Builder setGenerator(String generator) {
-            checkNotNull(generator);
-            this.generator = generator;
-            return this;
-        }
-
-        private void checkThriftFileIsInThriftPath(File thriftFile) {
-            assert thriftFile.isFile();
-            checkState(checkThriftFileIsInThriftPathHelper(thriftFile.getParentFile()));
-        }
-
-        private boolean checkThriftFileIsInThriftPathHelper(File directory) {
-            assert directory.isDirectory();
-            if (thriftPathElements.contains(directory)) {
-                return true;
-            } else {
-                final File parentDirectory = directory.getParentFile();
-                return (parentDirectory == null) ? false
-                        : checkThriftFileIsInThriftPathHelper(parentDirectory);
-            }
-        }
-
-        /**
-         * @see #addThriftFile(File)
-         */
-        public Builder addThriftFiles(Iterable<File> thriftFiles) {
-            for (File thriftFile : thriftFiles) {
-                addThriftFile(thriftFile);
-            }
-            return this;
-        }
-
-        /**
-         * Adds the {@code thriftPathElement} to the thriftPath.
-         *
-         * @param thriftPathElement A directory to be searched for imported thrift message
-         *                          buffer definitions.
-         * @return The builder.
-         * @throws NullPointerException     If {@code thriftPathElement} is {@code null}.
-         * @throws IllegalArgumentException If {@code thriftPathElement} is not a
-         *                                  directory.
-         */
-        public Builder addThriftPathElement(File thriftPathElement) {
-            checkNotNull(thriftPathElement);
-            checkArgument(thriftPathElement.isDirectory());
-            thriftPathElements.add(thriftPathElement);
-            return this;
-        }
-
-        /**
-         * @see #addThriftPathElement(File)
-         */
-        public Builder addThriftPathElements(Iterable<File> thriftPathElements) {
-            for (File thriftPathElement : thriftPathElements) {
-                addThriftPathElement(thriftPathElement);
-            }
-            return this;
-        }
-
-        /**
-         * @return A configured {@link Thrift} instance.
-         * @throws IllegalStateException If no thrift files have been added.
-         */
-        public Thrift build() {
-            checkState(!thriftFiles.isEmpty());
-            return new Thrift(executable, generator, ImmutableSet.copyOf(thriftPathElements),
-                    ImmutableSet.copyOf(thriftFiles), javaOutputDirectory);
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/ThriftCompileMojo.java b/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/ThriftCompileMojo.java
deleted file mode 100644
index b4f7571..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/ThriftCompileMojo.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.maven;
-
-import java.io.File;
-import java.util.List;
-import org.apache.maven.artifact.Artifact;
-import com.google.common.collect.ImmutableList;
-
-/**
- * This mojo executes the {@code thrift} compiler for generating java sources
- * from thrift definitions. It also searches dependency artifacts for
- * thrift files and includes them in the thriftPath so that they can be
- * referenced. Finally, it adds the thrift files to the project as resources so
- * that they are included in the final artifact.
- *
- * @phase generate-sources
- * @goal compile
- * @requiresDependencyResolution compile
- */
-public final class ThriftCompileMojo extends AbstractThriftMojo {
-
-    /**
-     * The source directories containing the sources to be compiled.
-     *
-     * @parameter default-value="${basedir}/src/main/thrift"
-     * @required
-     */
-    private File thriftSourceRoot;
-
-    /**
-     * This is the directory into which the {@code .java} will be created.
-     *
-     * @parameter default-value="${project.build.directory}/generated-sources/thrift"
-     * @required
-     */
-    private File outputDirectory;
-
-    @Override
-    protected List<Artifact> getDependencyArtifacts() {
-        List<Artifact> compileArtifacts = project.getCompileArtifacts();
-        return compileArtifacts;
-    }
-
-    @Override
-    protected File getOutputDirectory() {
-        return outputDirectory;
-    }
-
-    @Override
-    protected File getThriftSourceRoot() {
-        return thriftSourceRoot;
-    }
-
-    @Override
-    protected void attachFiles() {
-        project.addCompileSourceRoot(outputDirectory.getAbsolutePath());
-        projectHelper.addResource(project, thriftSourceRoot.getAbsolutePath(),
-        		ImmutableList.of("**/*.thrift"), null);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/ThriftTestCompileMojo.java b/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/ThriftTestCompileMojo.java
deleted file mode 100644
index fb89d96..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/main/java/org/apache/thrift/maven/ThriftTestCompileMojo.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.maven;
-
-import java.io.File;
-import java.util.List;
-import org.apache.maven.artifact.Artifact;
-import com.google.common.collect.ImmutableList;
-
-/**
- * @phase generate-test-sources
- * @goal testCompile
- * @requiresDependencyResolution test
- */
-public final class ThriftTestCompileMojo extends AbstractThriftMojo {
-
-    /**
-     * The source directories containing the sources to be compiled.
-     *
-     * @parameter default-value="${basedir}/src/test/thrift"
-     * @required
-     */
-    private File thriftTestSourceRoot;
-
-    /**
-     * This is the directory into which the {@code .java} will be created.
-     *
-     * @parameter default-value="${project.build.directory}/generated-test-sources/thrift"
-     * @required
-     */
-    private File outputDirectory;
-
-    @Override
-    protected void attachFiles() {
-        project.addTestCompileSourceRoot(outputDirectory.getAbsolutePath());
-        projectHelper.addTestResource(project, thriftTestSourceRoot.getAbsolutePath(),
-        		ImmutableList.of("**/*.thrift"), null);
-    }
-
-    @Override
-    protected List<Artifact> getDependencyArtifacts() {
-        // TODO(gak): maven-project needs generics
-        @SuppressWarnings("unchecked")
-        List<Artifact> testArtifacts = project.getTestArtifacts();
-        return testArtifacts;
-    }
-
-    @Override
-    protected File getOutputDirectory() {
-        return outputDirectory;
-    }
-
-    @Override
-    protected File getThriftSourceRoot() {
-        return thriftTestSourceRoot;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/java/org/apache/thrift/maven/TestThrift.java b/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/java/org/apache/thrift/maven/TestThrift.java
deleted file mode 100644
index 7c7891e..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/java/org/apache/thrift/maven/TestThrift.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.maven;
-
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.cli.CommandLineException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.File;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class TestThrift {
-
-    private File testRootDir;
-    private File idlDir;
-    private File genJavaDir;
-    private Thrift.Builder builder;
-
-    @Before
-    public void setup() throws Exception {
-        final File tmpDir = new File(System.getProperty("java.io.tmpdir"));
-        testRootDir = new File(tmpDir, "thrift-test");
-
-        if (testRootDir.exists()) {
-            FileUtils.cleanDirectory(testRootDir);
-        } else {
-            assertTrue("Failed to create output directory for test: " + testRootDir.getPath(), testRootDir.mkdir());
-        }
-
-        File testResourceDir = new File("src/test/resources");
-        assertTrue("Unable to find test resources", testRootDir.exists());
-
-        String thriftExecutable = System.getProperty("thriftExecutable", "thrift");
-        if (!(new File(thriftExecutable).exists())) {
-            thriftExecutable = "thrift";
-        }
-        System.out.println("Thrift compiler: " + thriftExecutable);
-
-        idlDir = new File(testResourceDir, "idl");
-        genJavaDir = new File(testRootDir, Thrift.GENERATED_JAVA);
-        builder = new Thrift.Builder(thriftExecutable, testRootDir);
-        builder
-            .setGenerator("java")
-            .addThriftPathElement(idlDir);
-    }
-
-    @Test
-    public void testThriftCompile() throws Exception {
-        executeThriftCompile();
-    }
-
-    @Test
-    public void testThriftCompileWithGeneratorOption() throws Exception {
-        builder.setGenerator("java:private-members");
-        executeThriftCompile();
-    }
-
-    private void executeThriftCompile() throws CommandLineException {
-        final File thriftFile = new File(idlDir, "shared.thrift");
-
-        builder.addThriftFile(thriftFile);
-
-        final Thrift thrift = builder.build();
-
-        assertTrue("File not found: shared.thrift", thriftFile.exists());
-        assertFalse("gen-java directory should not exist", genJavaDir.exists());
-
-        // execute the compile
-        final int result = thrift.compile();
-        assertEquals(0, result);
-
-        assertFalse("gen-java directory was not removed", genJavaDir.exists());
-        assertTrue("generated java code doesn't exist",
-            new File(testRootDir, "shared/SharedService.java").exists());
-    }
-
-    @Test
-    public void testThriftMultipleFileCompile() throws Exception {
-        final File sharedThrift = new File(idlDir, "shared.thrift");
-        final File tutorialThrift = new File(idlDir, "tutorial.thrift");
-
-        builder.addThriftFile(sharedThrift);
-        builder.addThriftFile(tutorialThrift);
-
-        final Thrift thrift = builder.build();
-
-        assertTrue("File not found: shared.thrift", sharedThrift.exists());
-        assertFalse("gen-java directory should not exist", genJavaDir.exists());
-
-        // execute the compile
-        final int result = thrift.compile();
-        assertEquals(0, result);
-
-        assertFalse("gen-java directory was not removed", genJavaDir.exists());
-        assertTrue("generated java code doesn't exist",
-            new File(testRootDir, "shared/SharedService.java").exists());
-        assertTrue("generated java code doesn't exist",
-            new File(testRootDir, "tutorial/InvalidOperation.java").exists());
-    }
-
-    @Test
-    public void testBadCompile() throws Exception {
-        final File thriftFile = new File(testRootDir, "missing.thrift");
-        builder.addThriftPathElement(testRootDir);
-
-        // Hacking around checks in addThrift file.
-        assertTrue(thriftFile.createNewFile());
-        builder.addThriftFile(thriftFile);
-        assertTrue(thriftFile.delete());
-
-        final Thrift thrift = builder.build();
-
-        assertTrue(!thriftFile.exists());
-        assertFalse("gen-java directory should not exist", genJavaDir.exists());
-
-        // execute the compile
-        final int result = thrift.compile();
-        assertEquals(1, result);
-    }
-
-    @Test
-    public void testFileInPathPreCondition() throws Exception {
-        final File thriftFile = new File(testRootDir, "missing.thrift");
-
-        // Hacking around checks in addThrift file.
-        assertTrue(thriftFile.createNewFile());
-        try {
-            builder.addThriftFile(thriftFile);
-            fail("Expected IllegalStateException");
-        } catch (IllegalStateException e) {
-        }
-    }
-
-    @After
-    public void cleanup() throws Exception {
-        if (testRootDir.exists()) {
-            FileUtils.cleanDirectory(testRootDir);
-            assertTrue("Failed to delete output directory for test: " + testRootDir.getPath(), testRootDir.delete());
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/resources/idl/shared.thrift b/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/resources/idl/shared.thrift
deleted file mode 100644
index 475e7f8..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/resources/idl/shared.thrift
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * This Thrift file can be included by other Thrift files that want to share
- * these definitions.
- */
-
-namespace cpp shared
-namespace java shared
-namespace perl shared
-
-struct SharedStruct {
-  1: i32 key
-  2: string value
-}
-
-service SharedService {
-  SharedStruct getStruct(1: i32 key)
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/resources/idl/tutorial.thrift b/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/resources/idl/tutorial.thrift
deleted file mode 100644
index 86e433d..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift-maven-plugin/src/test/resources/idl/tutorial.thrift
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-# Thrift Tutorial
-# Mark Slee (mcslee@facebook.com)
-#
-# This file aims to teach you how to use Thrift, in a .thrift file. Neato. The
-# first thing to notice is that .thrift files support standard shell comments.
-# This lets you make your thrift file executable and include your Thrift build
-# step on the top line. And you can place comments like this anywhere you like.
-#
-# Before running this file, you will need to have installed the thrift compiler
-# into /usr/local/bin.
-
-/**
- * The first thing to know about are types. The available types in Thrift are:
- *
- *  bool        Boolean, one byte
- *  byte        Signed byte
- *  i16         Signed 16-bit integer
- *  i32         Signed 32-bit integer
- *  i64         Signed 64-bit integer
- *  double      64-bit floating point value
- *  string      String
- *  binary      Blob (byte array)
- *  map<t1,t2>  Map from one type to another
- *  list<t1>    Ordered list of one type
- *  set<t1>     Set of unique elements of one type
- *
- * Did you also notice that Thrift supports C style comments?
- */
-
-// Just in case you were wondering... yes. We support simple C comments too.
-
-/**
- * Thrift files can reference other Thrift files to include common struct
- * and service definitions. These are found using the current path, or by
- * searching relative to any paths specified with the -I compiler flag.
- *
- * Included objects are accessed using the name of the .thrift file as a
- * prefix. i.e. shared.SharedObject
- */
-include "shared.thrift"
-
-/**
- * Thrift files can namespace, package, or prefix their output in various
- * target languages.
- */
-namespace cpp tutorial
-namespace java tutorial
-namespace php tutorial
-namespace perl tutorial
-namespace smalltalk.category Thrift.Tutorial
-
-/**
- * Thrift lets you do typedefs to get pretty names for your types. Standard
- * C style here.
- */
-typedef i32 MyInteger
-
-/**
- * Thrift also lets you define constants for use across languages. Complex
- * types and structs are specified using JSON notation.
- */
-const i32 INT32CONSTANT = 9853
-const map<string,string> MAPCONSTANT = {'hello':'world', 'goodnight':'moon'}
-
-/**
- * You can define enums, which are just 32 bit integers. Values are optional
- * and start at 1 if not supplied, C style again.
- */
-enum Operation {
-  ADD = 1,
-  SUBTRACT = 2,
-  MULTIPLY = 3,
-  DIVIDE = 4
-}
-
-/**
- * Structs are the basic complex data structures. They are comprised of fields
- * which each have an integer identifier, a type, a symbolic name, and an
- * optional default value.
- *
- * Fields can be declared "optional", which ensures they will not be included
- * in the serialized output if they aren't set.  Note that this requires some
- * manual management in some languages.
- */
-struct Work {
-  1: i32 num1 = 0,
-  2: i32 num2,
-  3: Operation op,
-  4: optional string comment,
-}
-
-/**
- * Structs can also be exceptions, if they are nasty.
- */
-exception InvalidOperation {
-  1: i32 what,
-  2: string why
-}
-
-/**
- * Ahh, now onto the cool part, defining a service. Services just need a name
- * and can optionally inherit from another service using the extends keyword.
- */
-service Calculator extends shared.SharedService {
-
-  /**
-   * A method definition looks like C code. It has a return type, arguments,
-   * and optionally a list of exceptions that it may throw. Note that argument
-   * lists and exception lists are specified using the exact same syntax as
-   * field lists in struct or exception definitions.
-   */
-
-   void ping(),
-
-   i32 add(1:i32 num1, 2:i32 num2),
-
-   i32 calculate(1:i32 logid, 2:Work w) throws (1:InvalidOperation ouch),
-
-   /**
-    * This method has a oneway modifier. That means the client only makes
-    * a request and does not listen for any response at all. Oneway methods
-    * must be void.
-    */
-   oneway void zip()
-
-}
-
-/**
- * That just about covers the basics. Take a look in the test/ folder for more
- * detailed examples. After you run this file, your generated code shows up
- * in folders with names gen-<language>. The generated code isn't too scary
- * to look at. It even has pretty indentation.
- */
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift.el b/vendor/git.apache.org/thrift.git/contrib/thrift.el
deleted file mode 100644
index 941a99f..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift.el
+++ /dev/null
@@ -1,140 +0,0 @@
-;;; thrift.el --- Major mode for Apache Thrift files
-
-;; Keywords: files
-
-;; Licensed to the Apache Software Foundation (ASF) under one
-;; or more contributor license agreements. See the NOTICE file
-;; distributed with this work for additional information
-;; regarding copyright ownership. The ASF licenses this file
-;; to you under the Apache License, Version 2.0 (the
-;; "License"); you may not use this file except in compliance
-;; with the License. You may obtain a copy of the License at
-;;
-;;   http://www.apache.org/licenses/LICENSE-2.0
-;;
-;; Unless required by applicable law or agreed to in writing,
-;; software distributed under the License is distributed on an
-;; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-;; KIND, either express or implied. See the License for the
-;; specific language governing permissions and limitations
-;; under the License.
-;;
-
-;;; Commentary:
-
-;;
-
-;;; Code:
-
-(require 'font-lock)
-
-(defvar thrift-mode-hook nil)
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.thrift\\'" . thrift-mode))
-
-(defvar thrift-indent-level 2
-  "Defines 2 spaces for thrift indentation.")
-
-;; syntax coloring
-(defconst thrift-font-lock-keywords
-  (list
-   '("\\<\\(include\\|struct\\|exception\\|typedef\\|const\\|enum\\|service\\|extends\\|void\\|oneway\\|throws\\|optional\\|required\\)\\>" . font-lock-keyword-face)  ;; keywords
-   '("\\<\\(bool\\|byte\\|i16\\|i32\\|i64\\|double\\|string\\|binary\\|map\\|list\\|set\\)\\>" . font-lock-type-face)  ;; built-in types
-   '("\\<\\([0-9]+\\)\\>" . font-lock-variable-name-face)   ;; ordinals
-   '("\\<\\(\\w+\\)\\s-*(" (1 font-lock-function-name-face))  ;; functions
-   )
-  "Thrift Keywords.")
-
-;; indentation
-(defun thrift-indent-line ()
-  "Indent current line as Thrift code."
-  (interactive)
-  (beginning-of-line)
-  (if (bobp)
-      (indent-line-to 0)
-    (let ((not-indented t) cur-indent)
-      (if (looking-at "^[ \t]*\\(}\\|throws\\)")
-          (if (looking-at "^[ \t]*}")
-              (progn
-                (save-excursion
-                  (forward-line -1)
-                  (setq cur-indent (- (current-indentation) thrift-indent-level)))
-                (if (< cur-indent 0)
-                    (setq cur-indent 0)))
-            (progn
-              (save-excursion
-                (forward-line -1)
-                (if (looking-at "^[ \t]*[\\.<>[:word:]]+[ \t]+[\\.<>[:word:]]+[ \t]*(")
-                    (setq cur-indent (+ (current-indentation) thrift-indent-level))
-                  (setq cur-indent (current-indentation))))))
-        (save-excursion
-          (while not-indented
-            (forward-line -1)
-            (if (looking-at "^[ \t]*}")
-                (progn
-                  (setq cur-indent (current-indentation))
-                  (setq not-indented nil))
-              (if (looking-at "^.*{[^}]*$")
-                  (progn
-                    (setq cur-indent (+ (current-indentation) thrift-indent-level))
-                    (setq not-indented nil))
-                (if (bobp)
-                    (setq not-indented nil)))
-              (if (looking-at "^[ \t]*throws")
-                  (progn
-                    (setq cur-indent (- (current-indentation) thrift-indent-level))
-                    (if (< cur-indent 0)
-                        (setq cur-indent 0))
-                    (setq not-indented nil))
-                (if (bobp)
-                    (setq not-indented nil)))
-              (if (looking-at "^[ \t]*[\\.<>[:word:]]+[ \t]+[\\.<>[:word:]]+[ \t]*([^)]*$")
-                  (progn
-                    (setq cur-indent (+ (current-indentation) thrift-indent-level))
-                    (setq not-indented nil))
-                (if (bobp)
-                    (setq not-indented nil)))
-              (if (looking-at "^[ \t]*\\/\\*")
-                  (progn
-                    (setq cur-indent (+ (current-indentation) 1))
-                    (setq not-indented nil))
-                (if (bobp)
-                    (setq not-indented nil)))
-              (if (looking-at "^[ \t]*\\*\\/")
-                  (progn
-                    (setq cur-indent (- (current-indentation) 1))
-                    (setq not-indented nil))
-                (if (bobp)
-                    (setq not-indented nil)))
-              ))))
-      (if cur-indent
-          (indent-line-to cur-indent)
-        (indent-line-to 0)))))
-
-;; C/C++- and sh-style comments; also allowing underscore in words
-(defvar thrift-mode-syntax-table
-  (let ((thrift-mode-syntax-table (make-syntax-table)))
-    (modify-syntax-entry ?_ "w" thrift-mode-syntax-table)
-    (modify-syntax-entry ?# "<" thrift-mode-syntax-table) ; sh-style comments
-    (modify-syntax-entry ?/ ". 124" thrift-mode-syntax-table) ; c/c++-style comments
-    (modify-syntax-entry ?* ". 23b" thrift-mode-syntax-table)
-    (modify-syntax-entry ?\n ">" thrift-mode-syntax-table)
-    thrift-mode-syntax-table)
-  "Syntax table for thrift-mode")
-
-;;;###autoload
-(defun thrift-mode ()
-  "Mode for editing Thrift files."
-  (interactive)
-  (kill-all-local-variables)
-  (set-syntax-table thrift-mode-syntax-table)
-  (set (make-local-variable 'font-lock-defaults) '(thrift-font-lock-keywords))
-  (setq major-mode 'thrift-mode)
-  (setq mode-name "Thrift")
-  (run-hooks 'thrift-mode-hook)
-  (set (make-local-variable 'indent-line-function) 'thrift-indent-line)
-  )
-
-(provide 'thrift)
-;;; thrift.el ends here
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift.spec b/vendor/git.apache.org/thrift.git/contrib/thrift.spec
deleted file mode 100644
index ccd35a5..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift.spec
+++ /dev/null
@@ -1,238 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-%define without_java 1
-%define without_python 1
-%define without_tests 1
-
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-Name:           thrift
-License:        Apache License v2.0
-Group:          Development
-Summary:        RPC and serialization framework
-Version:        0.10.0
-Release:        0
-URL:            http://thrift.apache.org
-Packager:       Thrift Developers <dev@thrift.apache.org>
-Source0:        %{name}-%{version}.tar.gz
-
-BuildRequires:  gcc >= 3.4.6
-BuildRequires:  gcc-c++
-
-%if 0%{!?without_java:1}
-BuildRequires:  java-devel >= 0:1.5.0
-BuildRequires:  ant >= 0:1.6.5
-%endif
-
-%if 0%{!?without_python:1}
-BuildRequires:  python-devel
-%endif
-
-%if 0%{!?without_ruby:1}
-%define gem_name %{name}
-BuildRequires:  ruby-devel
-BuildRequires:  rubygems-devel
-%endif
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-Thrift is a software framework for scalable cross-language services
-development. It combines a powerful software stack with a code generation
-engine to build services that work efficiently and seamlessly between C++,
-Java, C#, Python, Ruby, Perl, PHP, Objective C/Cocoa, Smalltalk, Erlang,
-Objective Caml, and Haskell.
-
-%files
-%defattr(-,root,root)
-%{_bindir}/thrift
-
-
-%package lib-cpp
-Summary: Thrift C++ library
-Group:   Libraries
-
-%description lib-cpp
-C++ libraries for Thrift.
-
-%files lib-cpp
-%defattr(-,root,root)
-%{_libdir}/libthrift*.so.*
-%{_libdir}/libthrift*.so
-
-
-%package lib-cpp-devel
-Summary:   Thrift C++ library development files
-Group:     Libraries
-Requires:  %{name} = %{version}-%{release}
-Requires:  boost-devel
-%if 0%{!?without_libevent:1}
-Requires:  libevent-devel >= 1.2
-%endif
-%if 0%{!?without_zlib:1}
-Requires:  zlib-devel
-%endif
-
-%description lib-cpp-devel
-C++ static libraries and headers for Thrift.
-
-%files lib-cpp-devel
-%defattr(-,root,root)
-%{_includedir}/thrift/
-%{_libdir}/libthrift*.*a
-%{_libdir}/pkgconfig/thrift*.pc
-
-
-%if 0%{!?without_java:1}
-%package lib-java
-Summary:   Thrift Java library
-Group:     Libraries
-Requires:  java >= 0:1.5.0
-
-%description lib-java
-Java libraries for Thrift.
-
-%files lib-java
-%defattr(-,root,root)
-%{_javadir}/*
-%endif
-
-
-%if 0%{!?without_python:1}
-%package lib-python
-Summary: Thrift Python library
-Group:   Libraries
-
-%description lib-python
-Python libraries for Thrift.
-
-%files lib-python
-%defattr(-,root,root)
-%{python_sitearch}/*
-%endif
-
-
-%if 0%{!?without_ruby:1}
-%package -n rubygem-%{gem_name}
-Summary: Thrift Ruby library
-Group:   Libraries
-Obsoletes: %{name}-lib-ruby
-
-%description -n rubygem-%{gem_name}
-Ruby libraries for Thrift.
-
-%files -n rubygem-%{gem_name}
-%defattr(-,root,root)
-%{gem_dir}/*
-%endif
-
-
-%if 0%{!?without_php:1}
-%package lib-php
-Summary: Thrift PHP library
-Group:   Libraries
-
-%description lib-php
-PHP libraries for Thrift.
-
-%files lib-php
-%defattr(-,root,root)
-/usr/lib/php/*
-%endif
-
-
-%prep
-%setup -q
-
-%build
-[[ -e Makefile.in ]] || ./bootstrap.sh
-export GEM_HOME=${PWD}/.gem-home
-export RUBYLIB=${PWD}/lib/rb/lib
-%configure \
-  %{?without_libevent: --without-libevent } \
-  %{?without_zlib:     --without-zlib     } \
-  %{?without_tests:    --without-tests    } \
-  %{?without_java:     --without-java     } \
-  %{?without_python:   --without-python   } \
-  %{?without_ruby:     --without-ruby     } \
-  %{?without_php:      --without-php      } \
-  %{!?without_php:     PHP_PREFIX=${RPM_BUILD_ROOT}/usr/lib/php } \
-  --without-csharp \
-  --without-erlang \
-
-make %{?_smp_mflags}
-
-%if 0%{!?without_java:1}
-cd lib/java
-%ant
-cd ../..
-%endif
-
-%if 0%{!?without_python:1}
-cd lib/py
-CFLAGS="%{optflags}" %{__python} setup.py build
-cd ../..
-%endif
-
-%if 0%{!?without_ruby:1}
-%gem_install -n lib/rb/thrift*.gem
-%endif
-
-%install
-export GEM_HOME=${PWD}/.gem-home
-export RUBYLIB=${PWD}/lib/rb/lib
-%makeinstall
-ln -s libthrift-%{version}.so ${RPM_BUILD_ROOT}%{_libdir}/libthrift.so.0
-ln -s libthriftnb-%{version}.so ${RPM_BUILD_ROOT}%{_libdir}/libthriftnb.so.0
-ln -s libthriftz-%{version}.so ${RPM_BUILD_ROOT}%{_libdir}/libthriftz.so.0
-
-%if 0%{!?without_java:1}
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p lib/java/build/*.jar $RPM_BUILD_ROOT%{_javadir}
-%endif
-
-%if 0%{!?without_python:1}
-cd lib/py
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-cd ../..
-%endif
-
-%if 0%{!?without_ruby:1}
-mkdir -p %{buildroot}%{gem_dir}
-cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
-%endif
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
-%post
-umask 007
-/sbin/ldconfig > /dev/null 2>&1
-
-
-%postun
-umask 007
-/sbin/ldconfig > /dev/null 2>&1
-
-%changelog
-* Wed Oct 10 2012 Thrift Dev <dev@thrift.apache.org>
-- Thrift 0.9.0 release.
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift.vim b/vendor/git.apache.org/thrift.git/contrib/thrift.vim
deleted file mode 100644
index 6231955..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift.vim
+++ /dev/null
@@ -1,91 +0,0 @@
-" Vim syntax file
-" Language: Thrift
-" Maintainer: Martin Smith <martin@facebook.com>
-" Last Change: $Date: $
-" Copy to ~/.vim/
-" Add to ~/.vimrc
-"  au BufRead,BufNewFile *.thrift set filetype=thrift
-"  au! Syntax thrift source ~/.vim/thrift.vim
-"
-" $Id: $
-"
-" Licensed to the Apache Software Foundation (ASF) under one
-" or more contributor license agreements. See the NOTICE file
-" distributed with this work for additional information
-" regarding copyright ownership. The ASF licenses this file
-" to you under the Apache License, Version 2.0 (the
-" "License"); you may not use this file except in compliance
-" with the License. You may obtain a copy of the License at
-"
-"   http://www.apache.org/licenses/LICENSE-2.0
-"
-" Unless required by applicable law or agreed to in writing,
-" software distributed under the License is distributed on an
-" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-" KIND, either express or implied. See the License for the
-" specific language governing permissions and limitations
-" under the License.
-"
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-" Todo
-syn keyword thriftTodo TODO todo FIXME fixme XXX xxx contained
-
-" Comments
-syn match thriftComment "#.*" contains=thriftTodo
-syn region thriftComment start="/\*" end="\*/" contains=thriftTodo
-syn match thriftComment "//.\{-}\(?>\|$\)\@="
-
-" String
-syn region thriftStringDouble matchgroup=None start=+"+  end=+"+
-
-" Number
-syn match thriftNumber "-\=\<\d\+\>" contained
-
-" Keywords
-syn keyword thriftKeyword namespace
-syn keyword thriftKeyword xsd_all xsd_optional xsd_nillable xsd_attrs
-syn keyword thriftKeyword include cpp_include cpp_type const optional required
-syn keyword thriftBasicTypes void bool byte i8 i16 i32 i64 double string binary
-syn keyword thriftStructure map list set struct typedef exception enum throws union
-
-" Special
-syn match thriftSpecial "\d\+:"
-
-" Structure
-syn keyword thriftStructure service oneway extends
-"async"         { return tok_async;         }
-"exception"     { return tok_xception;      }
-"extends"       { return tok_extends;       }
-"throws"        { return tok_throws;        }
-"service"       { return tok_service;       }
-"enum"          { return tok_enum;          }
-"const"         { return tok_const;         }
-
-if version >= 508 || !exists("did_thrift_syn_inits")
-  if version < 508
-    let did_thrift_syn_inits = 1
-    command! -nargs=+ HiLink hi link <args>
-  else
-    command! -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink thriftComment Comment
-  HiLink thriftKeyword Special
-  HiLink thriftBasicTypes Type
-  HiLink thriftStructure StorageClass
-  HiLink thriftTodo Todo
-  HiLink thriftString String
-  HiLink thriftNumber Number
-  HiLink thriftSpecial Special
-  HiLink thriftStructure Structure
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "thrift"
diff --git a/vendor/git.apache.org/thrift.git/contrib/thrift_dump.cpp b/vendor/git.apache.org/thrift.git/contrib/thrift_dump.cpp
deleted file mode 100644
index 59c8ac8..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/thrift_dump.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <cstdlib>
-#include <iostream>
-
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TFDTransport.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TDebugProtocol.h>
-#include <thrift/protocol/TProtocolTap.h>
-
-using namespace std;
-using boost::shared_ptr;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::protocol;
-
-void usage() {
-  fprintf(stderr,
-      "usage: thrift_dump {-b|-f|-s} < input > ouput\n"
-      "  -b TBufferedTransport messages\n"
-      "  -f TFramedTransport messages\n"
-      "  -s Raw structures\n");
-  exit(EXIT_FAILURE);
-}
-
-int main(int argc, char *argv[]) {
-  if (argc != 2) {
-    usage();
-  }
-
-  shared_ptr<TTransport> stdin_trans(new TFDTransport(STDIN_FILENO));
-  shared_ptr<TTransport> itrans;
-
-  if (argv[1] == std::string("-b") || argv[1] == std::string("-s")) {
-    itrans.reset(new TBufferedTransport(stdin_trans));
-  } else if (argv[1] == std::string("-f")) {
-    itrans.reset(new TFramedTransport(stdin_trans));
-  } else {
-    usage();
-  }
-
-  shared_ptr<TProtocol> iprot(new TBinaryProtocol(itrans));
-  shared_ptr<TProtocol> oprot(
-      new TDebugProtocol(
-        shared_ptr<TTransport>(new TBufferedTransport(
-          shared_ptr<TTransport>(new TFDTransport(STDOUT_FILENO))))));
-
-  TProtocolTap tap(iprot, oprot);
-
-  try {
-    if (argv[1] == std::string("-s")) {
-      for (;;) {
-        tap.skip(T_STRUCT);
-      }
-    } else {
-      std::string name;
-      TMessageType messageType;
-      int32_t seqid;
-      for (;;) {
-        tap.readMessageBegin(name, messageType, seqid);
-        tap.skip(T_STRUCT);
-        tap.readMessageEnd();
-      }
-    }
-  } catch (TProtocolException exn) {
-    cout << "Protocol Exception: " << exn.what() << endl;
-  } catch (...) {
-    oprot->getTransport()->flush();
-  }
-
-  cout << endl;
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/README.md b/vendor/git.apache.org/thrift.git/contrib/transport-sample/README.md
deleted file mode 100644
index a1dfc0a..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Thrift transport sample project
--------------------------------
-
-This cross-platform project has been built with Windows Visual Studio 10 and 
-OSX 10.7.1's g++.  The client and server support socket and pipe transports 
-through command-line switches.
-
-Windows supports both named & anonymous pipes; *NIX gets only named 
-'pipes' at this time.
-
-Windows-only at this time:
-The client & server are double-ended. Both sides run a server and client to 
-enable full duplex bidirectional event signaling. They are simple command 
-line apps. The server runs until it's aborted (Ctl-C). The client connects to
-the server, informs the server of its listening pipe/port, runs some more RPCs 
-and exits. The server also makes RPC calls to the client to demonstrate 
-bidirectional operation.
-
-Prequisites:
-Boost -- tested with Boost 1.47, other versions may work.
-libthrift library -- build the library under "thrift/lib/cpp/"
-thrift IDL compiler -- download from http://thrift.apache.org/download/ 
-   or build from "thrift/compiler/cpp".  The IDL compiler version should
-   match the thrift source distribution's version. For instance, thrift-0.9.0
-   has a different directory structure than thrift-0.8.0 and the generated
-   files are not compatible.
-
-Note: Bulding the thrift IDL compiler and library are beyond the scope
-of this article. Please refer to the Thrift documentation in the respective
-directories and online.
-
-
-Microsoft Windows with Visual Studio 10
-----------------------------------------
-Copy the IDL compiler 'thrift.exe' to this project folder or to a location in the path.
-Run thriftme.bat to generate the interface source from the thrift files.
-
-Open transport-sample.sln and...
-Adapt the Boost paths for the client and server projects. Right-click on each project, select
-Properties, then:
-Configuration Properties -> C/C++ -> General -> Additional Include Directories
-Configuration Properties -> Linker -> General -> Additional Include Directories
-
-The stock path assumes that Boost is located at the same level as the thrift repo root.
-
-Run the following in separate command prompts from the Release or Debug 
-build folder:
- server.exe -np test
- client.exe -np test
-
-
-*NIX flavors
-------------
-Build the thrift cpp library.
-Build the IDL compiler and copy it to this project folder.
-Run thriftme.sh to generate the interface source from the thrift files.
-Run 'make'
-
-Run the following in separate shells:
- server/server -np /tmp/test
- client/client -np /tmp/test
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/Sample.thrift b/vendor/git.apache.org/thrift.git/contrib/transport-sample/Sample.thrift
deleted file mode 100644
index 3040e25..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/Sample.thrift
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- transport-sample thrift IDL file .
- Execute thriftme.bat under Windows to generate the cpp stubs from this IDL.
- */
-
-// See thrift/tutorial/tutorial.thrift and shared.thrift for more extensive examples.
-
-
-namespace cpp Sample
-namespace java Sample
-namespace perl Sample
-
-//This struct is not used in the sample. Shown here for illustrative purposes only.
-//
-struct SampleStruct
-{
-  1: i32 key
-  2: string value
-}
-
-
-//A service contains the RPC(s).
-//
-service SampleService
-{
-  string HelloThere(1:string HelloString),
-  void ServerDoSomething(),
-
-  //Client calls this to tell server which port to connect back on.
-  void ClientSideListenPort(1:i16 Port),
-  //Named pipe version
-  void ClientSidePipeName(1:string name),
-}
-
-//Sample RPC on the 'client' side that the master server can call.
-service SampleCallback
-{
-  void pingclient(),
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/ThriftCommon.cpp b/vendor/git.apache.org/thrift.git/contrib/transport-sample/ThriftCommon.cpp
deleted file mode 100644
index 60ebf7a..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/ThriftCommon.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// ThriftCommon.cpp : Common functions for sample Thrift client and server
-//
-
-#include "ThriftCommon.h"
-
-namespace thriftcommon
-{
-	//----------------------------------------------------------------------------
-	//Launch child process and pass R/W anonymous pipe handles on cmd line.
-	//This is a simple example and does not include elevation or other 
-	//advanced features.
-	//
-	bool LaunchAnonPipeChild(std::string app, boost::shared_ptr<TServerTransport> transport)
-	{
-#ifdef _WIN32
-		PROCESS_INFORMATION pi;
-		STARTUPINFOA si;
-		GetStartupInfoA(&si);  //set startupinfo for the spawned process
-		char handles[MAX_PATH];  //Stores pipe handles converted to text
-
-		sprintf(handles, "%s %d %d", app.c_str(),
-			(int)boost::shared_dynamic_cast<TPipeServer>(transport)->getClientRdPipeHandle(),
-			(int)boost::shared_dynamic_cast<TPipeServer>(transport)->getClientWrtPipeHandle());
-
-		//spawn the child process
-		if (!CreateProcessA(NULL, handles, NULL,NULL,TRUE,0,NULL,NULL,&si,&pi))
-		{
-			GlobalOutput.perror("TPipeServer CreateProcess failed, GLE=", GetLastError());
-			return false;
-		}
-
-		CloseHandle(pi.hThread);
-		CloseHandle(pi.hProcess);
-#endif
-		return true;
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/ThriftCommon.h b/vendor/git.apache.org/thrift.git/contrib/transport-sample/ThriftCommon.h
deleted file mode 100644
index d24d1a7..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/ThriftCommon.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// ThriftCommon.h : Common includes, namespaces and templates 
-// for sample Thrift client and server
-//
-// Add the following paths to the Project's properties:
-//
-// Configuration Properties -> C/C++ -> General-> Additional Include Directories --
-// ../;../../../lib/cpp/src;../../../../boost;../../../../boost/boost/tr1;
-//
-// Configuration Properties -> Linker -> General -> Additional Library Directories --
-// ../../../lib/cpp/$(Configuration);../../../../Boost/lib
-//
-// Configuration Properties -> Linker -> Input -> Additional Dependencies --
-// libthrift.lib
-//
-// ... adjust relative paths as necessary.
-//
-
-#ifdef _WIN32 //thrift is crashing when using boost threads on Mac OSX
-#  define USE_BOOST_THREAD 1
-#  include <boost/thread.hpp>
-#else
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#endif
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Required Includes
-//'server' side #includes
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/server/TThreadPoolServer.h>
-#include <thrift/server/TSimpleServer.h>
-//'client' side #includes
-#include <thrift/transport/TPipeServer.h>
-#include <thrift/transport/TPipe.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TSocket.h>
-#include <thrift/transport/TTransport.h>
-
-#include <thrift/protocol/TBinaryProtocol.h>
-
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Required Namespaces
-//'server' side namespaces
-using namespace apache::thrift::server;
-using namespace apache::thrift::concurrency;
-//common namespaces
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-//using namespace boost; //using ns boost can introduce type conflicts
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-namespace thriftcommon
-{
-	//----------------------------------------------------------------------------
-	//
-	//Start the thrift 'server' (both server & client side run one for bidir event signaling)
-	// *** This function template will block ***
-	//
-	template <class MyHandler, class MyProcessor>
-	void RunThriftServer (boost::shared_ptr<MyHandler> hndlr, 
-		                  int NumThreads, 
-						  boost::shared_ptr<TServerTransport> transport,
-						  boost::shared_ptr<TServer> &server)
-	{
-#ifdef _WIN32
-		if (!hndlr.get())
-			throw std::exception("RunThriftServer() invalid handler");
-		if (!transport.get())
-			throw std::exception("RunThriftServer() invalid transport");
-#else
-		if ( !hndlr.get() || !transport.get() )
-			throw std::exception();
-#endif
-
-		boost::shared_ptr<MyHandler> handler(hndlr);
-		boost::shared_ptr<TProcessor> processor(new MyProcessor(handler));
-		boost::shared_ptr<TTransportFactory> tfactory(new TBufferedTransportFactory());
-		boost::shared_ptr<TProtocolFactory> pfactory(new TBinaryProtocolFactory());
-
-		if(NumThreads <= 1)
-		{	//Single-threaded server
-			server.reset(new TSimpleServer(processor, transport, tfactory, pfactory));
-		}
-		else
-		{	//Multi-threaded server
-			boost::shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(NumThreads);
-			boost::shared_ptr<PlatformThreadFactory> threadFactory = boost::shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory());
-			threadManager->threadFactory(threadFactory);
-			threadManager->start();
-			server.reset(new TThreadPoolServer(processor, transport, tfactory, pfactory, threadManager));
-		}
-
-		printf("Starting the 'server'...\n");
-		server->serve();
-		printf("done.\n");
-	}
-
-	// Thrift server wrapper function that accepts a pipe name.
-	// A handler must be passed in to this version.
-	template <class MyHandler, class MyProcessor>
-	void RunThriftServer (boost::shared_ptr<MyHandler> hndlr, int NumThreads, std::string pipename, boost::shared_ptr<TServer> &svr)
-	{
-#ifndef _WIN32  //Mac, *nix
-		unlink(pipename.c_str());
-#endif
-		boost::shared_ptr<TServerTransport> transport(new TPipeServer(pipename, 1024, NumThreads)); //Named pipe
-		RunThriftServer<MyHandler, MyProcessor>(hndlr, NumThreads, transport, svr);
-	}
-
-	// Thrift server wrapper function that accepts a pipe name.
-	// This version instantiates its own handler.
-	template <class MyHandler, class MyProcessor>
-	void RunThriftServer (int NumThreads, std::string pipename)
-	{
-		boost::shared_ptr<MyHandler> handler(new MyHandler());
-		boost::shared_ptr<TServer> server;
-
-		RunThriftServer<MyHandler, MyProcessor>(handler, NumThreads, pipename, server);
-	}
-
-	// Thrift server wrapper function that accepts a socket port number.
-	// A handler must be passed in to this version.
-	template <class MyHandler, class MyProcessor>
-	void RunThriftServer (boost::shared_ptr<MyHandler> hndlr, int NumThreads, int Port)
-	{
-		boost::shared_ptr<TServerTransport> transport(new TServerSocket(Port));
-		boost::shared_ptr<TServer> server;
-		RunThriftServer<MyHandler, MyProcessor>(hndlr, NumThreads, transport, server);
-	}
-
-	// Thrift server wrapper function that accepts a socket port number.
-	// This version instantiates its own handler.
-	template <class MyHandler, class MyProcessor>
-	void RunThriftServer (int NumThreads, int Port)
-	{
-		boost::shared_ptr<MyHandler> handler(new MyHandler());
-
-		RunThriftServer<MyHandler, MyProcessor>(handler, NumThreads, Port);
-	}
-
-	//
-	template <class MyHandler, class MyProcessor>
-	void RunThriftServer (boost::shared_ptr<MyHandler> hndlr, int NumThreads, boost::shared_ptr<TServerTransport> transport)
-	{
-		boost::shared_ptr<TServer> server;
-		RunThriftServer<MyHandler, MyProcessor>(hndlr, NumThreads, transport, server);
-	}
-
-	//----------------------------------------------------------------------------
-	//Connect to thrift 'server' - Socket version
-	//(both server & client side run one for bidir event signaling)
-	//
-	template <class MyClient, class MyTransport>
-	void ConnectToServer (boost::shared_ptr<MyClient> &client, boost::shared_ptr<MyTransport> &transport, int Port)
-	{
-		//Client side connection using sockets transport.
-		boost::shared_ptr<TTransport> socket(new TSocket("localhost", Port));
-		transport.reset(new TBufferedTransport(socket));
-		boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-
-		client.reset(new MyClient(protocol));
-	}
-
-	//Connect to thrift 'server' - Named Pipe version
-	template <class MyClient, class MyTransport>
-	void ConnectToServer (boost::shared_ptr<MyClient> &client, boost::shared_ptr<MyTransport> &transport, std::string pipename)
-	{
-		//Client side connection using Named Pipe transport.
-		boost::shared_ptr<TTransport> pipe(new TPipe(pipename));
-		transport.reset(new TBufferedTransport(pipe));
-		boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-
-		client.reset(new MyClient(protocol));
-	}
-
-	//Connect to thrift 'server' - Anonymous Pipe version
-	//Currently only supported under Windows
-#ifdef _WIN32
-	template <class MyClient, class MyTransport>
-	void ConnectToServer (boost::shared_ptr<MyClient> &client, boost::shared_ptr<MyTransport> &transport, HANDLE RdPipe, HANDLE WrtPipe)
-	{
-		//Client side connection using sockets transport.
-#ifdef _WIN32
-		boost::shared_ptr<TTransport> pipe(new TPipe((int)RdPipe, (int)WrtPipe));
-		transport.reset(new TBufferedTransport(pipe));
-#else
-		boost::shared_ptr<TTransport> socket(new TSocket("localhost"));
-		transport.reset(new TBufferedTransport(socket));
-#endif
-		boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-
-		client.reset(new MyClient(protocol));
-	}
-#endif
-
-	//----------------------------------------------------------------------------
-	//Launch child process and pass R/W anonymous pipe handles on cmd line.
-	//Currently only supported under Windows
-#ifdef _WIN32
-	bool LaunchAnonPipeChild(std::string app, boost::shared_ptr<TServerTransport> transport);
-#endif
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/ReadMe.txt b/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/ReadMe.txt
deleted file mode 100644
index 6c49a96..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/ReadMe.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-========================================================================
-    CONSOLE APPLICATION : client Project Overview
-========================================================================
-
-AppWizard has created this client application for you.
-
-This file contains a summary of what you will find in each of the files that
-make up your client application.
-
-
-client.vcxproj
-    This is the main project file for VC++ projects generated using an Application Wizard.
-    It contains information about the version of Visual C++ that generated the file, and
-    information about the platforms, configurations, and project features selected with the
-    Application Wizard.
-
-client.vcxproj.filters
-    This is the filters file for VC++ projects generated using an Application Wizard. 
-    It contains information about the association between the files in your project 
-    and the filters. This association is used in the IDE to show grouping of files with
-    similar extensions under a specific node (for e.g. ".cpp" files are associated with the
-    "Source Files" filter).
-
-client.cpp
-    This is the main application source file.
-
-/////////////////////////////////////////////////////////////////////////////
-Other standard files:
-
-StdAfx.h, StdAfx.cpp
-    These files are used to build a precompiled header (PCH) file
-    named client.pch and a precompiled types file named StdAfx.obj.
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" comments to indicate parts of the source code you
-should add to or customize.
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.cpp b/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.cpp
deleted file mode 100644
index 45fbef1..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-// client->cpp : Defines the entry point for the console application.
-//
-// sample client command line app using Thrift IPC.
-// Quick n Dirty example, may not have very robust error handling
-// for the sake of simplicity.
-
-#ifdef _WIN32
-#  include "stdafx.h"
-#else
-#  include "config.h"
-#endif
-
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//Include this before the generated includes
-#include "ThriftCommon.h"
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//Tailor these to your generated files
-#include "../gen-cpp/SampleService.h"
-#include "../gen-cpp/SampleCallback.h"
-
-using namespace Sample; //declared in .thrift file
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-void ClientListenerThreadProc();
-bool bSocket = false;
-bool bAnonPipe = false;
-int srvPort;
-std::string pipename;
-std::string pipename_client;
-#ifdef _WIN32
- HANDLE hConsole;
-#endif
-
-//Customized version of printf that changes the text color
-//This depends on hConsole global being initialized
-void hlprintf(const char* _Format, ...)
-{
-#ifdef _WIN32
-	SetConsoleTextAttribute(hConsole, 0xE);
-#endif
-	va_list ap;
-	int r;
-	va_start (ap, _Format);
-	r = vprintf (_Format, ap);
-	va_end (ap);
-#ifdef _WIN32
-	SetConsoleTextAttribute(hConsole, 7);
-#endif
-}
-
-//-----------------------------------------------------------------------------
-// Client-side RPC implementations: Called by the server to the client for 
-// bidirectional eventing.
-//
-class SampleCallbackHandler : virtual public SampleCallbackIf {
- public:
-  SampleCallbackHandler() {
-    // initialization goes here
-  }
-
-  void pingclient()
-  {
-    hlprintf("<<<Ping received from server (server-to-client event).\n");
-  }
-
-};
-//-----------------------------------------------------------------------------
-
-
-#ifdef _WIN32
-int _tmain(int argc, _TCHAR* argv[])
-#else
-int main(int argc, char **argv)
-#endif
-{
-	//Process cmd line args to determine named vs anon pipes.
-	bool usage = false;
-#ifdef _WIN32
-	HANDLE ReadPipe, WritePipe;
-	hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-#endif
-
-	//Process command line params
-	if(argc > 1)
-	{
-		if(_tcscmp(argv[1], TEXT("-sp")) == 0)
-		{	//Socket Port specified
-			srvPort = _tstoi(argv[2]);
-			bSocket = true;
-		}
-		else if(_tcscmp(argv[1], TEXT("-np")) == 0)
-		{	//Named Pipe specified
-#ifdef _WIN32
-                        std::wstring wpipe(argv[2]);
-                        pipename.resize(wpipe.length());
-                        std::copy(wpipe.begin(), wpipe.end(), pipename.begin());
-#else
-                        pipename = argv[2];
-#endif
-			pipename_client = pipename + "_client";
-		}
-		else if(argc == 3)
-		{	//Anonymous Pipe specified
-#ifdef _WIN32
-			ReadPipe  = (HANDLE)_tstoi(argv[1]);
-			WritePipe = (HANDLE)_tstoi(argv[2]);
-			bAnonPipe = true;
-#else
-                        printf("Anonymous pipes not (yet) supported under *NIX\n");
-#endif
-		}
-		else
-			usage = true;
-	}
-	else
-		usage = true;
-
-	if(usage)
-	{
-		hlprintf("Thrift sample client usage:\n\n");
-		hlprintf("Socket Port to connect to: -sp <port#>\n");
-		hlprintf("Named Pipe to connect to:  -np <pipename> (e.g. affpipe)\n");
-		hlprintf("Anonymous Pipe (must be launched by anon pipe creator):\n");
-		hlprintf("                           <Read Handle> <Write Handle>\n");
-		return 0;
-	}
-
-	//Client side connection to server.
-	boost::shared_ptr<SampleServiceClient> client; //Client class from Thrift-generated code.
-	boost::shared_ptr<TTransport> transport;
-
-	if(bSocket)
-	{	//Socket transport
-#ifdef _WIN32
-		TWinsockSingleton::create();
-#endif
-		hlprintf("Using socket transport port %d\n", srvPort);
-		thriftcommon::ConnectToServer<SampleServiceClient, TTransport>(client, transport, srvPort);
-	}
-	else if(!bAnonPipe)
-	{
-		hlprintf("Using Named Pipe %s\n", pipename.c_str());
-		thriftcommon::ConnectToServer<SampleServiceClient, TTransport>(client, transport, pipename);
-	}
-	else
-	{
-#ifdef _WIN32
-		hlprintf("Using Anonymous Pipe transport\n");
-		thriftcommon::ConnectToServer<SampleServiceClient, TTransport>(client, transport, ReadPipe, WritePipe);
-#endif
-	}
-
-#ifdef _WIN32
-	//Start a thread to receive inbound connection from server for 2-way event signaling.
-	boost::thread ClientListenerThread(ClientListenerThreadProc);
-#endif
-
-	try {
-		transport->open();
-
-		//Notify server what to connect back on.
-		if(bSocket)
-			client->ClientSideListenPort(srvPort + 1); //Socket
-		else if(!bAnonPipe)
-			client->ClientSidePipeName(pipename_client); //Named Pipe
-
-		//Run some more RPCs
-		std::string hellostr = "Hello how are you?";
-		std::string returnstr;
-		client->HelloThere(returnstr, hellostr);
-		hlprintf("\n>>>Sent: %s\n", hellostr.c_str());
-		hlprintf("<<<Received: %s\n", returnstr.c_str());
-
-		hlprintf("\n>>>Calling ServerDoSomething() which delays for 5 seconds.\n");
-		client->ServerDoSomething();
-		hlprintf(">>>ServerDoSomething() done.\n\n");
-
-		transport->close();
-	} catch (TException &tx) {
-		hlprintf("ERROR: %s\n", tx.what());
-	}
-
-	return 0;
-}
-
-
-//Thread Routine
-void ClientListenerThreadProc()
-{
-	if(bSocket)
-		thriftcommon::RunThriftServer<SampleCallbackHandler, SampleCallbackProcessor>(1, srvPort + 1);
-	else if(!bAnonPipe)
-		thriftcommon::RunThriftServer<SampleCallbackHandler, SampleCallbackProcessor>(1, pipename_client);
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.vcxproj b/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.vcxproj
deleted file mode 100644
index 779c339..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.vcxproj
+++ /dev/null
@@ -1,105 +0,0 @@
-?<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{85FBFB54-530B-498F-9F38-44BA204FAE6A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>client</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../;../../../lib/cpp/src;../../../../boost;../../../../boost/boost/tr1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>../../../lib/cpp/$(Configuration);../../../../Boost/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libthrift.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../;../../../lib/cpp/src;../../../../boost;../../../../boost/boost/tr1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../lib/cpp/$(Configuration);../../../../Boost/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libthrift.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\gen-cpp\SampleCallback.h" />
-    <ClInclude Include="..\gen-cpp\SampleService.h" />
-    <ClInclude Include="..\gen-cpp\Sample_constants.h" />
-    <ClInclude Include="..\gen-cpp\Sample_types.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\ThriftCommon.cpp" />
-    <ClCompile Include="..\gen-cpp\SampleCallback.cpp" />
-    <ClCompile Include="..\gen-cpp\SampleService.cpp" />
-    <ClCompile Include="..\gen-cpp\Sample_constants.cpp" />
-    <ClCompile Include="..\gen-cpp\Sample_types.cpp" />
-    <ClCompile Include="client.cpp" />
-    <ClCompile Include="stdafx.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.vcxproj.filters b/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.vcxproj.filters
deleted file mode 100644
index 3ec7bde..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/client.vcxproj.filters
+++ /dev/null
@@ -1,66 +0,0 @@
-?<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\gen-cpp">
-      <UniqueIdentifier>{1265b3dc-91de-416f-aba6-7b750de4221e}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gen-cpp\Sample_types.h">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gen-cpp\SampleService.h">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gen-cpp\Sample_constants.h">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gen-cpp\SampleCallback.h">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="client.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\gen-cpp\SampleService.cpp">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\gen-cpp\Sample_constants.cpp">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\gen-cpp\Sample_types.cpp">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\gen-cpp\SampleCallback.cpp">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThriftCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/stdafx.cpp b/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/stdafx.cpp
deleted file mode 100644
index 4bd151e..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// client.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/stdafx.h b/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/stdafx.h
deleted file mode 100644
index b005a83..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/stdafx.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#include "targetver.h"
-
-#include <stdio.h>
-#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/targetver.h b/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/targetver.h
deleted file mode 100644
index 87c0086..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/client/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/config.h b/vendor/git.apache.org/thrift.git/contrib/transport-sample/config.h
deleted file mode 100644
index a20d785..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//Missing definitions for *NIX systems. This sample project
-//was initially created on Windows.
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define TEXT(str) str
-
-inline int Sleep(int ms)
-{
-	return sleep(ms/1000); //sleep() param is in seconds
-}
-
-inline int _tcscmp(const char* str1, const char* str2)
-{
-	return strcmp(str1, str2);
-}
-
-inline int _tstoi(const char* str)
-{
-	return atoi(str);
-}
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/ReadMe.txt b/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/ReadMe.txt
deleted file mode 100644
index 53c0ee5..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/ReadMe.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-========================================================================
-    CONSOLE APPLICATION : server Project Overview
-========================================================================
-
-AppWizard has created this server application for you.
-
-This file contains a summary of what you will find in each of the files that
-make up your server application.
-
-
-server.vcxproj
-    This is the main project file for VC++ projects generated using an Application Wizard.
-    It contains information about the version of Visual C++ that generated the file, and
-    information about the platforms, configurations, and project features selected with the
-    Application Wizard.
-
-server.vcxproj.filters
-    This is the filters file for VC++ projects generated using an Application Wizard. 
-    It contains information about the association between the files in your project 
-    and the filters. This association is used in the IDE to show grouping of files with
-    similar extensions under a specific node (for e.g. ".cpp" files are associated with the
-    "Source Files" filter).
-
-server.cpp
-    This is the main application source file.
-
-/////////////////////////////////////////////////////////////////////////////
-Other standard files:
-
-StdAfx.h, StdAfx.cpp
-    These files are used to build a precompiled header (PCH) file
-    named server.pch and a precompiled types file named StdAfx.obj.
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" comments to indicate parts of the source code you
-should add to or customize.
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.cpp b/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.cpp
deleted file mode 100644
index dba8368..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// server.cpp : Defines the entry point for the console application.
-//
-// sample server command line app using Thrift IPC.
-//
-// This is a simple demonstration of full duplex RPC. That is, each
-// side runs both a client and server to enable bidirectional event 
-// signaling.
-//
-
-#ifdef _WIN32
-#  include "stdafx.h"
-#else
-#  include "config.h"
-#endif
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//Include this before the generated includes
-#include "ThriftCommon.h"
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//Tailor these to your generated files
-#include "../gen-cpp/SampleService.h"
-#include "../gen-cpp/SampleCallback.h"
-
-using namespace Sample; //declared in .thrift file
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-int16_t ClientPort_;
-std::string ClientPipeName_;
-void S2CThreadProc();
-
-//-----------------------------------------------------------------------------
-// RPC implementations
-//
-class SampleServiceHandler : virtual public SampleServiceIf {
- public:
-  SampleServiceHandler() {
-    // Your initialization goes here
-  }
-
-  void HelloThere(std::string& _return, const std::string& HelloString) {
-    // Your implementation goes here
-    printf("<<<HelloThere() received string: %s\n", HelloString.c_str());
-	_return = "Good thank you.";
-  }
-
-  void ServerDoSomething() {
-    // Your implementation goes here
-    printf("ServerDoSomething(): Simulating work for 5 seconds\n");
-    Sleep(5000);
-    printf("ServerDoSomething(): Done\n");
-  }
-
-  void ClientSideListenPort(const int16_t ClientListenPort)
-  {
-	ClientPort_ = ClientListenPort;
-	ClientPipeName_ = "";
-#ifdef _WIN32
-	printf(">>>Connecting to client on port %d\n", ClientPort_);
-	boost::thread Connect2ClientThread(S2CThreadProc);
-#endif
-  }
-
-  void ClientSidePipeName(const std::string& ClientPipeName)
-  {
-	ClientPipeName_ = ClientPipeName;
-	ClientPort_ = 0;
-#ifdef _WIN32
-	printf(">>>Connecting to client pipe %s\n", ClientPipeName_.c_str());
-	boost::thread Connect2ClientThread(S2CThreadProc);
-#endif
-  }
-};
-//-----------------------------------------------------------------------------
-
-#ifdef _WIN32
-int _tmain(int argc, _TCHAR* argv[])
-#else
-int main(int argc, char **argv)
-#endif
-{
-	int port;
-	std::string pipename; //e.g. "affpipe"
-
-	bool usage = false;
-
-	//Process command line params
-	if(argc > 1)
-	{
-		if(_tcscmp(argv[1], TEXT("-sp")) == 0)
-		{	//Socket Port specified
-			port = _tstoi(argv[2]);
-#ifdef _WIN32
-			TWinsockSingleton::create();
-#endif
-			// Start the thrift server which is a blocking call.
-			thriftcommon::RunThriftServer<SampleServiceHandler, SampleServiceProcessor>(10, port);
-		}
-		else if(_tcscmp(argv[1], TEXT("-np")) == 0)
-		{	//Named Pipe specified
-#ifdef _WIN32
-			std::wstring wpipe(argv[2]);
-			pipename.resize(wpipe.length());
-			std::copy(wpipe.begin(), wpipe.end(), pipename.begin());
-#else
-			pipename = argv[2];
-#endif
-			printf("Using Named Pipe %s\n", pipename.c_str());
-
-			//Thrift over Named Pipe.
-			thriftcommon::RunThriftServer<SampleServiceHandler, SampleServiceProcessor>(10, pipename);
-		}
-		else if(_tcscmp(argv[1], TEXT("-ap")) == 0)
-		{	//Anonymous Pipe specified
-			//This is more involved because the child needs to be launched 
-			//after the transport is created but before the blocking server 
-			//call.
-#ifdef _WIN32
-			boost::shared_ptr<TServerTransport> transport(new TPipeServer()); //Anonymous pipe
-			thriftcommon::LaunchAnonPipeChild(".\\client.exe", transport);
-			boost::shared_ptr<SampleServiceHandler> handler(new SampleServiceHandler());
-			thriftcommon::RunThriftServer<SampleServiceHandler, SampleServiceProcessor>(handler, 10, transport);
-#else
-			printf("Anonymous pipes not (yet) supported under *NIX\n");
-#endif
-		}
-		else
-			usage = true;
-	}
-	else
-		usage = true;
-
-	if(usage)
-	{
-		printf("Thrift sample server usage:\n\n");
-		printf("Socket Port :   -sp <port#>\n");
-		printf("Named Pipe :    -np <pipename> (e.g. affpipe)\n");
-		printf("Anonymous Pipe: -ap\n");
-	}
-	return 0;
-}
-
-
-//Thread Routine that connects to the 'client'.
-void S2CThreadProc()
-{
-	//Master server's connection to client-side's server.
-	boost::shared_ptr<SampleCallbackClient> clientsrv; //Client class from Thrift-generated code.
-	boost::shared_ptr<TTransport> transport;
-	if(ClientPort_ != 0)
-		thriftcommon::ConnectToServer<SampleCallbackClient, TTransport>(clientsrv, transport, ClientPort_);
-	if(!ClientPipeName_.empty())
-		thriftcommon::ConnectToServer<SampleCallbackClient, TTransport>(clientsrv, transport, ClientPipeName_);
-
-	try {
-		transport->open();
-
-		clientsrv->pingclient();
-		Sleep(1500);
-		clientsrv->pingclient();
-		Sleep(1500);
-		clientsrv->pingclient();
-
-		transport->close();
-	} catch (TException &tx) {
-		printf("ERROR: %s\n", tx.what());
-	}
-}
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.vcxproj b/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.vcxproj
deleted file mode 100644
index 8e39b26..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.vcxproj
+++ /dev/null
@@ -1,106 +0,0 @@
-?<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{72FCAF29-506D-4164-9FA6-F54C5C28E79D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>server</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../;../../../lib/cpp/src;../../../../Boost/;../../../../Boost/boost/tr1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>../../../lib/cpp/$(Configuration);../../../../Boost/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libthrift.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../;../../../lib/cpp/src;../../../../Boost/;../../../../Boost/boost/tr1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../lib/cpp/$(Configuration);../../../../Boost/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libthrift.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\gen-cpp\SampleCallback.h" />
-    <ClInclude Include="..\gen-cpp\SampleService.h" />
-    <ClInclude Include="..\gen-cpp\Sample_constants.h" />
-    <ClInclude Include="..\gen-cpp\Sample_types.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\ThriftCommon.cpp" />
-    <ClCompile Include="..\gen-cpp\SampleCallback.cpp" />
-    <ClCompile Include="..\gen-cpp\SampleService.cpp" />
-    <ClCompile Include="..\gen-cpp\Sample_constants.cpp" />
-    <ClCompile Include="..\gen-cpp\Sample_types.cpp" />
-    <ClCompile Include="server.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.vcxproj.filters b/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.vcxproj.filters
deleted file mode 100644
index 8bb6dfb..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/server.vcxproj.filters
+++ /dev/null
@@ -1,66 +0,0 @@
-?<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\gen-cpp">
-      <UniqueIdentifier>{dab66db8-bc45-4518-aad2-7a75696226e3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gen-cpp\Sample_types.h">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gen-cpp\SampleService.h">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gen-cpp\Sample_constants.h">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\gen-cpp\SampleCallback.h">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="server.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\gen-cpp\Sample_types.cpp">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\gen-cpp\SampleService.cpp">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\gen-cpp\Sample_constants.cpp">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\gen-cpp\SampleCallback.cpp">
-      <Filter>Source Files\gen-cpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThriftCommon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/stdafx.cpp b/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/stdafx.cpp
deleted file mode 100644
index c25ff61..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// server.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/stdafx.h b/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/stdafx.h
deleted file mode 100644
index b005a83..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/stdafx.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#include "targetver.h"
-
-#include <stdio.h>
-#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/targetver.h b/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/targetver.h
deleted file mode 100644
index 87c0086..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/server/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/thriftme.bat b/vendor/git.apache.org/thrift.git/contrib/transport-sample/thriftme.bat
deleted file mode 100644
index 4b1ef78..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/thriftme.bat
+++ /dev/null
@@ -1 +0,0 @@
-thrift.exe --gen cpp Sample.thrift
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/thriftme.sh b/vendor/git.apache.org/thrift.git/contrib/transport-sample/thriftme.sh
deleted file mode 100644
index 3b18f90..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/thriftme.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-THRIFT_COMPILER=./thrift
-OUTPUT_FOLDER=$PWD
-
-if [ ! -e "${THRIFT_COMPILER}" ]
-then
-   THRIFT_COMPILER=thrift
-   command -v  ${THRIFT_COMPILER} >/dev/null 2>&1
-   if [ $? -eq 1 ]; then
-      echo
-      echo "thrift compiler not found."
-      echo
-      exit
-   fi
-fi
-
-${THRIFT_COMPILER} --gen cpp Sample.thrift
-
-echo
-echo "Files have been generated in gen-cpp."
-
-exit
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/transport-sample/transport-sample.sln b/vendor/git.apache.org/thrift.git/contrib/transport-sample/transport-sample.sln
deleted file mode 100644
index a9fa1ef..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/transport-sample/transport-sample.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-?
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server\server.vcxproj", "{72FCAF29-506D-4164-9FA6-F54C5C28E79D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client\client.vcxproj", "{85FBFB54-530B-498F-9F38-44BA204FAE6A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{72FCAF29-506D-4164-9FA6-F54C5C28E79D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72FCAF29-506D-4164-9FA6-F54C5C28E79D}.Debug|Win32.Build.0 = Debug|Win32
-		{72FCAF29-506D-4164-9FA6-F54C5C28E79D}.Release|Win32.ActiveCfg = Release|Win32
-		{72FCAF29-506D-4164-9FA6-F54C5C28E79D}.Release|Win32.Build.0 = Release|Win32
-		{85FBFB54-530B-498F-9F38-44BA204FAE6A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{85FBFB54-530B-498F-9F38-44BA204FAE6A}.Debug|Win32.Build.0 = Debug|Win32
-		{85FBFB54-530B-498F-9F38-44BA204FAE6A}.Release|Win32.ActiveCfg = Release|Win32
-		{85FBFB54-530B-498F-9F38-44BA204FAE6A}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/README.md b/vendor/git.apache.org/thrift.git/contrib/zeromq/README.md
deleted file mode 100644
index 9e0b5bd..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-This directory contains some glue code to allow Thrift RPCs to be sent over
-ZeroMQ.  Included are client and server implementations for Python and C++,
-along with a simple demo interface (with a working client and server for
-each language).
-
-Thrift was designed for stream-based interfaces like TCP, but ZeroMQ is
-message-based, so there is a small impedance mismatch.  Most of issues are
-hidden from developers, but one cannot be: oneway methods have to be handled
-differently from normal ones.  ZeroMQ requires the messaging pattern to be
-declared at socket creation time, so an application cannot decide on a
-message-by-message basis whether to send a reply.  Therefore, this
-implementation makes it the client's responsibility to ensure that ZMQ_REQ
-sockets are used for normal methods and ZMQ_DOWNSTREAM sockets are used for
-oneway methods.  In addition, services that expose both types of methods
-have to expose two servers (on two ports), but the TZmqMultiServer makes it
-easy to run the two together in the same thread.
-
-This code was tested with ZeroMQ 2.0.7 and pyzmq afabbb5b9bd3.
-
-To build, simply install Thrift and ZeroMQ, then run "make".  If you install
-in a non-standard location, make sure to set THRIFT to the location of the
-Thrift code generator on the make command line and PKG_CONFIG_PATH to a path
-that includes the pkgconfig files for both Thrift and ZeroMQ.  The test
-servers take no arguments.  Run the test clients with no arguments to
-retrieve the stored value or with an integer argument to increment it by
-that amount.
-
-This code is not quite what I would consider production-ready.  It doesn't
-support all of the normal hooks into Thrift, and its performance is
-sub-optimal because it does some unnecessary copying.
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.cpp b/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.cpp
deleted file mode 100644
index 56278f3..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "TZmqClient.h"
-#include <cstring>
-
-namespace apache { namespace thrift { namespace transport {
-
-uint32_t TZmqClient::read_virt(uint8_t* buf, uint32_t len) {
-  if (rbuf_.available_read() == 0) {
-    (void)sock_.recv(&msg_);
-    rbuf_.resetBuffer((uint8_t*)msg_.data(), msg_.size());
-  }
-  return rbuf_.read(buf, len);
-}
-
-void TZmqClient::write_virt(const uint8_t* buf, uint32_t len) {
-  return wbuf_.write(buf, len);
-}
-
-uint32_t TZmqClient::writeEnd() {
-  uint8_t* buf;
-  uint32_t size;
-  wbuf_.getBuffer(&buf, &size);
-  zmq::message_t msg(size);
-  std::memcpy(msg.data(), buf, size);
-  (void)sock_.send(msg);
-  wbuf_.resetBuffer(true);
-  return size;
-}
-
-}}} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.h b/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.h
deleted file mode 100644
index df16e03..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TZMQCLIENT_H_
-#define _THRIFT_TRANSPORT_TZMQCLIENT_H_ 1
-
-#include <zmq.hpp>
-#include <thrift/transport/TBufferTransports.h>
-
-namespace apache { namespace thrift { namespace transport {
-
-class TZmqClient : public TTransport {
- public:
-  TZmqClient(zmq::context_t& ctx, const std::string& endpoint, int type)
-    : sock_(ctx, type)
-    , endpoint_(endpoint)
-    , wbuf_()
-    , rbuf_()
-    , msg_()
-    , zmq_type_(type)
-  {}
-
-  void open() {
-    if(zmq_type_ == ZMQ_PUB) {
-      sock_.bind(endpoint_.c_str());
-    }
-    else {
-      sock_.connect(endpoint_.c_str());
-    }
-  }
-
-  uint32_t read_virt(uint8_t* buf, uint32_t len);
-
-  void write_virt(const uint8_t* buf, uint32_t len);
-
-  uint32_t writeEnd();
-
- protected:
-  zmq::socket_t sock_;
-  std::string endpoint_;
-  TMemoryBuffer wbuf_;
-  TMemoryBuffer rbuf_;
-  zmq::message_t msg_;
-  int zmq_type_;
-};
-
-}}} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TZMQCLIENT_H_
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.py b/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.py
deleted file mode 100644
index 1bd60a1..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqClient.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-import zmq
-from cStringIO import StringIO
-from thrift.transport.TTransport import TTransportBase, CReadableTransport
-
-
-class TZmqClient(TTransportBase, CReadableTransport):
-    def __init__(self, ctx, endpoint, sock_type):
-        self._sock = ctx.socket(sock_type)
-        self._endpoint = endpoint
-        self._wbuf = StringIO()
-        self._rbuf = StringIO()
-
-    def open(self):
-        self._sock.connect(self._endpoint)
-
-    def read(self, size):
-        ret = self._rbuf.read(size)
-        if len(ret) != 0:
-            return ret
-        self._read_message()
-        return self._rbuf.read(size)
-
-    def _read_message(self):
-        msg = self._sock.recv()
-        self._rbuf = StringIO(msg)
-
-    def write(self, buf):
-        self._wbuf.write(buf)
-
-    def flush(self):
-        msg = self._wbuf.getvalue()
-        self._wbuf = StringIO()
-        self._sock.send(msg)
-
-    # Implement the CReadableTransport interface.
-    @property
-    def cstringio_buf(self):
-        return self._rbuf
-
-    # NOTE: This will probably not actually work.
-    def cstringio_refill(self, prefix, reqlen):
-        while len(prefix) < reqlen:
-            self.read_message()
-            prefix += self._rbuf.getvalue()
-        self._rbuf = StringIO(prefix)
-        return self._rbuf
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.cpp b/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.cpp
deleted file mode 100644
index f031458..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "TZmqServer.h"
-#include <thrift/transport/TBufferTransports.h>
-#include <boost/scoped_ptr.hpp>
-
-using boost::shared_ptr;
-using apache::thrift::transport::TMemoryBuffer;
-using apache::thrift::protocol::TProtocol;
-
-namespace apache { namespace thrift { namespace server {
-
-bool TZmqServer::serveOne(int recv_flags) {
-  zmq::message_t msg;
-  bool received = sock_.recv(&msg, recv_flags);
-  if (!received) {
-    return false;
-  }
-  shared_ptr<TMemoryBuffer> inputTransport(new TMemoryBuffer((uint8_t*)msg.data(), msg.size()));
-  shared_ptr<TMemoryBuffer> outputTransport(new TMemoryBuffer());
-  shared_ptr<TProtocol> inputProtocol(
-      inputProtocolFactory_->getProtocol(inputTransport));
-  shared_ptr<TProtocol> outputProtocol(
-      outputProtocolFactory_->getProtocol(outputTransport));
-  shared_ptr<TMemoryBuffer> transport(new TMemoryBuffer);
-
-  processor_->process(inputProtocol, outputProtocol, NULL);
-
-  if (zmq_type_ == ZMQ_REP) {
-    uint8_t* buf;
-    uint32_t size;
-    outputTransport->getBuffer(&buf, &size);
-    msg.rebuild(size);
-    std::memcpy(msg.data(), buf, size);
-    (void)sock_.send(msg);
-  }
-
-  return true;
-}
-
-
-void TZmqMultiServer::serveOne(long timeout) {
-  boost::scoped_ptr<zmq::pollitem_t> items(setupPoll());
-  serveActive(items.get(), timeout);
-}
-
-
-void TZmqMultiServer::serveForever() {
-  boost::scoped_ptr<zmq::pollitem_t> items(setupPoll());
-  while (true) {
-    serveActive(items.get(), -1);
-  }
-}
-
-
-zmq::pollitem_t* TZmqMultiServer::setupPoll() {
-  zmq::pollitem_t* items = new zmq::pollitem_t[servers_.size()];
-  for (int i = 0; i < servers_.size(); ++i) {
-    items[i].socket = servers_[i]->getSocket();
-    items[i].events = ZMQ_POLLIN;
-  }
-  return items;
-}
-
-void TZmqMultiServer::serveActive(zmq::pollitem_t* items, long timeout) {
-  int rc = zmq::poll(items, servers_.size(), timeout);
-  if (rc == 0) {
-    return;
-  }
-  for (int i = 0; i < servers_.size(); ++i) {
-    if ((items[i].revents & ZMQ_POLLIN) != 0) {
-      // Should we pass ZMQ_NOBLOCK here to be safe?
-      servers_[i]->serveOne();
-    }
-  }
-}
-
-
-}}} // apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.h b/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.h
deleted file mode 100644
index a840c86..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TZMQSERVER_H_
-#define _THRIFT_SERVER_TZMQSERVER_H_ 1
-
-#include <zmq.hpp>
-#include <thrift/server/TServer.h>
-
-namespace apache { namespace thrift { namespace server {
-
-class TZmqServer : public TServer {
- public:
-  TZmqServer(
-      boost::shared_ptr<TProcessor> processor,
-      zmq::context_t& ctx, const std::string& endpoint, int type)
-    : TServer(processor)
-    , processor_(processor)
-    , zmq_type_(type)
-    , sock_(ctx, type)
-  {
-    if(zmq_type_ == ZMQ_SUB) {
-      sock_.setsockopt(ZMQ_SUBSCRIBE, "", 0) ; // listen to all messages
-      sock_.connect(endpoint.c_str()) ;
-    }
-    else {
-      sock_.bind(endpoint.c_str());
-    }
-  }
-
-  bool serveOne(int recv_flags = 0);
-  void serve() {
-    while (true) {
-      serveOne();
-    }
-  }
-
-  zmq::socket_t& getSocket() {
-    return sock_;
-  }
-
- private:
-  boost::shared_ptr<TProcessor> processor_;
-  int zmq_type_;
-  zmq::socket_t sock_;
-};
-
-
-class TZmqMultiServer {
- public:
-  void serveOne(long timeout = -1);
-  void serveForever();
-
-  std::vector<TZmqServer*>& servers() {
-    return servers_;
-  }
-
- private:
-  zmq::pollitem_t* setupPoll();
-  void serveActive(zmq::pollitem_t* items, long timeout);
-  std::vector<TZmqServer*> servers_;
-};
-
-
-}}} // apache::thrift::server
-
-#endif // #ifndef _THRIFT_SERVER_TZMQSERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.py b/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.py
deleted file mode 100644
index 15c1543..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/TZmqServer.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-import logging
-import zmq
-import thrift.server.TServer
-import thrift.transport.TTransport
-
-
-class TZmqServer(thrift.server.TServer.TServer):
-    def __init__(self, processor, ctx, endpoint, sock_type):
-        thrift.server.TServer.TServer.__init__(self, processor, None)
-        self.zmq_type = sock_type
-        self.socket = ctx.socket(sock_type)
-        self.socket.bind(endpoint)
-
-    def serveOne(self):
-        msg = self.socket.recv()
-        itrans = thrift.transport.TTransport.TMemoryBuffer(msg)
-        otrans = thrift.transport.TTransport.TMemoryBuffer()
-        iprot = self.inputProtocolFactory.getProtocol(itrans)
-        oprot = self.outputProtocolFactory.getProtocol(otrans)
-
-        try:
-            self.processor.process(iprot, oprot)
-        except Exception:
-            logging.exception("Exception while processing request")
-            # Fall through and send back a response, even if empty or incomplete.
-
-        if self.zmq_type == zmq.REP:
-            msg = otrans.getvalue()
-            self.socket.send(msg)
-
-    def serve(self):
-        while True:
-            self.serveOne()
-
-
-class TZmqMultiServer(object):
-    def __init__(self):
-        self.servers = []
-
-    def serveOne(self, timeout=-1):
-        self._serveActive(self._setupPoll(), timeout)
-
-    def serveForever(self):
-        poll_info = self._setupPoll()
-        while True:
-            self._serveActive(poll_info, -1)
-
-    def _setupPoll(self):
-        server_map = {}
-        poller = zmq.Poller()
-        for server in self.servers:
-            server_map[server.socket] = server
-            poller.register(server.socket, zmq.POLLIN)
-        return (server_map, poller)
-
-    def _serveActive(self, poll_info, timeout):
-        (server_map, poller) = poll_info
-        ready = dict(poller.poll())
-        for sock, state in ready.items():
-            assert (state & zmq.POLLIN) != 0
-            server_map[sock].serveOne()
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/AssemblyInfo.cs
deleted file mode 100644
index 12cd434..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/AssemblyInfo.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("ZmqServer")]
-[assembly: AssemblyDescription("Zmq Examples")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("The Apache Software Foundation")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/Main.cs b/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/Main.cs
deleted file mode 100644
index e66cfe0..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/Main.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Threading;
-using Thrift.Protocol;
-using ZMQ;
-using ZmqServer;
-using ZmqClient;
-
-namespace ZmqServer
-{
-	class MainClass
-	{
-		public static void Main (string[] args)
-		{
-			new Thread(Server.serve).Start();
-			Client.work();
-		}
-		
-		static class Server{
-			public static void serve(){
-				StorageHandler s=new StorageHandler();
-				Storage.Processor p=new Storage.Processor(s);
-				
-				ZMQ.Context c=new ZMQ.Context();
-				
-				TZmqServer tzs=new TZmqServer(p,c,"tcp://127.0.0.1:9090",ZMQ.SocketType.PAIR);
-				tzs.Serve();
-			}
-			
-			class StorageHandler:Storage.Iface{
-				int val=0;
-				
-				public void incr(int amount){
-					val+=amount;
-					Console.WriteLine("incr({0})",amount);
-				}
-				
-				public int get(){
-					return val;
-				} 
-			}
-		}
-		
-		static class Client{
-			public static void work()
-			{
-				Context ctx=new Context();
-				TZmqClient tzc=new TZmqClient(ctx,"tcp://127.0.0.1:9090",SocketType.PAIR);
-				TBinaryProtocol p=new TBinaryProtocol(tzc);
-				
-				Storage.Client client=new Storage.Client(p);
-				tzc.Open();
-				
-				Console.WriteLine(client.@get());
-				client.incr(1);
-				client.incr(41);
-				Console.WriteLine(client.@get());
-			}
-		}
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/TZmqClient.cs b/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/TZmqClient.cs
deleted file mode 100644
index e9ab516..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/TZmqClient.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using ZMQ;
-using System.IO;
-using Thrift.Transport;
-
-namespace ZmqClient
-{
-	public class TZmqClient : TTransport
-	{
-		Socket _sock;
-		String _endpoint;
-		MemoryStream _wbuf = new MemoryStream ();
-		MemoryStream _rbuf = new MemoryStream ();
-
-		void debug (string msg)
-		{
-			//Uncomment to enable debug
-//			Console.WriteLine (msg);
-		}
-
-		public TZmqClient (Context ctx, String endpoint, SocketType sockType)
-		{
-			_sock = ctx.Socket (sockType);
-			_endpoint = endpoint;
-		}
-
-		public override void Open ()
-		{
-			_sock.Connect (_endpoint);
-		}
-		
-		public override void Close ()
-		{
-			throw new NotImplementedException ();
-		}
-
-		public override bool IsOpen {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
-
-		public override int Read (byte[] buf, int off, int len)
-		{
-			debug ("Client_Read");
-			if (off != 0 || len != buf.Length)
-				throw new NotImplementedException ();
-
-			if (_rbuf.Length == 0) {
-				//Fill the Buffer with the complete ZMQ Message which needs to be(?!) the complete Thrift response
-				debug ("Client_Read Filling buffer..");
-				byte[] tmpBuf = _sock.Recv ();
-				debug (string.Format("Client_Read filled with {0}b",tmpBuf.Length));
-				_rbuf.Write (tmpBuf, 0, tmpBuf.Length);
-				_rbuf.Position = 0;	//For reading
-			}
-			int ret = _rbuf.Read (buf, 0, len);
-			if (_rbuf.Length == _rbuf.Position)	//Finished reading
-				_rbuf.SetLength (0);
-			debug (string.Format ("Client_Read return {0}b, remaining  {1}b", ret, _rbuf.Length - _rbuf.Position));
-			return ret;
-		}
-
-		public override void Write (byte[] buf, int off, int len)
-		{
-			debug ("Client_Write");
-			_wbuf.Write (buf, off, len);
-		}
-
-		public override void Flush ()
-		{
-			debug ("Client_Flush");
-			_sock.Send (_wbuf.GetBuffer ());
-			_wbuf = new MemoryStream ();
-		}
-	}
-}
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/TZmqServer.cs b/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/TZmqServer.cs
deleted file mode 100644
index 535c623..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/TZmqServer.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using Thrift;
-using Thrift.Server;
-using Thrift.Transport;
-using Thrift.Protocol;
-using ZMQ;
-using System.IO;
-
-using System.Collections.Generic;
-
-namespace ZmqServer
-{
-	public class TZmqServer
-	{
-		Socket _socket ;
-		TProcessor _processor;
-		
-		void debug (string msg)
-		{
-			//Uncomment to enable debug
-//			Console.WriteLine (msg);
-		}
-
-		public TZmqServer (TProcessor processor, Context ctx, String endpoint, SocketType sockType)
-		{
-			new TSimpleServer (processor,null);
-			_socket = ctx.Socket (sockType);
-			_socket.Bind (endpoint);
-			_processor = processor;
-		}
-
-		public void ServeOne ()
-		{
-			debug ("Server_ServeOne");
-			Byte[] msg = _socket.Recv ();
-			MemoryStream istream = new MemoryStream (msg);
-			MemoryStream ostream = new MemoryStream ();
-			TProtocol tProtocol = new TBinaryProtocol (new TStreamTransport (istream, ostream));
-			_processor.Process (tProtocol, tProtocol);
-
-			if (ostream.Length != 0) {
-				byte[] newBuf = new byte[ostream.Length];
-				Array.Copy (ostream.GetBuffer (), newBuf, ostream.Length);
-				debug (string.Format ("Server_ServeOne sending {0}b", ostream.Length));
-				_socket.Send (newBuf);
-			}
-		}
-
-		public void Serve ()
-		{
-			while (true)
-				ServeOne ();
-		}
-	}
-}
-
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/ThriftZMQ.csproj b/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/ThriftZMQ.csproj
deleted file mode 100755
index ef2dbc3..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/ThriftZMQ.csproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>0.10.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ZmqServer</RootNamespace>
-    <AssemblyName>ThriftZMQ</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.10.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <Externalconsole>true</Externalconsole>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <Externalconsole>true</Externalconsole>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="clrzmq, Version=2.1.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\clrzmq.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Thrift, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\csharp\Thrift.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="TZmqServer.cs" />
-    <Compile Include="TZmqClient.cs" />
-    <Compile Include="..\gen-csharp\Storage.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/ThriftZMQ.sln b/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/ThriftZMQ.sln
deleted file mode 100755
index 6af57b6..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/csharp/ThriftZMQ.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThriftZMQ", "ThriftZMQ.csproj", "{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thrift", "..\..\..\lib\csharp\src\Thrift.csproj", "{499EB63C-D74C-47E8-AE48-A2FC94538E9D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Debug|x86.ActiveCfg = Debug|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Debug|x86.Build.0 = Debug|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Release|Any CPU.ActiveCfg = Release|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Release|Mixed Platforms.Build.0 = Release|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Release|x86.ActiveCfg = Release|x86
-		{17C63B90-DFD7-42AC-A7B0-749E6876C0A1}.Release|x86.Build.0 = Release|x86
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|x86.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/storage.thrift b/vendor/git.apache.org/thrift.git/contrib/zeromq/storage.thrift
deleted file mode 100644
index a1ea967..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/storage.thrift
+++ /dev/null
@@ -1,4 +0,0 @@
-service Storage {
-  oneway void incr(1: i32 amount);
-  i32 get();
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-client.cpp b/vendor/git.apache.org/thrift.git/contrib/zeromq/test-client.cpp
deleted file mode 100644
index d2fc56c..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-client.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <iostream>
-#include <cstdlib>
-#include <thrift/protocol/TBinaryProtocol.h>
-
-#include "zmq.hpp"
-#include "TZmqClient.h"
-#include "Storage.h"
-
-using boost::shared_ptr;
-using apache::thrift::transport::TZmqClient;
-using apache::thrift::protocol::TBinaryProtocol;
-
-int main(int argc, char** argv) {
-  const char* endpoint = "tcp://127.0.0.1:9090";
-  int socktype = ZMQ_REQ;
-  int incr = 0;
-  if (argc > 1) {
-    incr = atoi(argv[1]);
-    if (incr) {
-      socktype = ZMQ_DOWNSTREAM;
-      endpoint = "tcp://127.0.0.1:9091";
-    }
-  }
-
-  zmq::context_t ctx(1);
-  shared_ptr<TZmqClient> transport(new TZmqClient(ctx, endpoint, socktype));
-  shared_ptr<TBinaryProtocol> protocol(new TBinaryProtocol(transport));
-  StorageClient client(protocol);
-  transport->open();
-
-  if (incr) {
-    client.incr(incr);
-    usleep(50000);
-  } else {
-    int value = client.get();
-    std::cout << value << std::endl;
-  }
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-client.py b/vendor/git.apache.org/thrift.git/contrib/zeromq/test-client.py
deleted file mode 100755
index 753b132..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-client.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-import sys
-import time
-import zmq
-import TZmqClient
-import thrift.protocol.TBinaryProtocol
-import storage.ttypes
-import storage.Storage
-
-
-def main(args):
-    endpoint = "tcp://127.0.0.1:9090"
-    socktype = zmq.REQ
-    incr = 0
-    if len(args) > 1:
-        incr = int(args[1])
-        if incr:
-            socktype = zmq.DOWNSTREAM
-            endpoint = "tcp://127.0.0.1:9091"
-
-    ctx = zmq.Context()
-    transport = TZmqClient.TZmqClient(ctx, endpoint, socktype)
-    protocol = thrift.protocol.TBinaryProtocol.TBinaryProtocolAccelerated(transport)
-    client = storage.Storage.Client(protocol)
-    transport.open()
-
-    if incr:
-        client.incr(incr)
-        time.sleep(0.05)
-    else:
-        value = client.get()
-        print value
-
-
-if __name__ == "__main__":
-    main(sys.argv)
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-receiver.cpp b/vendor/git.apache.org/thrift.git/contrib/zeromq/test-receiver.cpp
deleted file mode 100644
index 8fe69da..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-receiver.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "zmq.hpp"
-#include "TZmqServer.h"
-#include "Storage.h"
-
-using boost::shared_ptr;
-using apache::thrift::TProcessor;
-using apache::thrift::server::TZmqServer;
-using apache::thrift::server::TZmqMultiServer;
-
-class StorageHandler : virtual public StorageIf {
- public:
-  StorageHandler()
-    : value_(0)
-  {}
-
-  void incr(const int32_t amount) {
-    value_ += amount;
-    printf("value_: %i\n", value_) ;
-  }
-
-  int32_t get() {
-    return value_;
-  }
-
- private:
-  int32_t value_;
-
-};
-
-
-int main(int argc, char *argv[]) {
-  shared_ptr<StorageHandler> handler(new StorageHandler());
-  shared_ptr<TProcessor> processor(new StorageProcessor(handler));
-
-  zmq::context_t ctx(1);
-  TZmqServer oneway_server(processor, ctx, "epgm://eth0;239.192.1.1:5555", ZMQ_SUB);
-  oneway_server.serve();
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-sender.cpp b/vendor/git.apache.org/thrift.git/contrib/zeromq/test-sender.cpp
deleted file mode 100644
index 6b0eef1..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-sender.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <iostream>
-#include <cstdlib>
-#include <thrift/protocol/TBinaryProtocol.h>
-
-#include "zmq.hpp"
-#include "TZmqClient.h"
-#include "Storage.h"
-
-using boost::shared_ptr;
-using apache::thrift::transport::TZmqClient;
-using apache::thrift::protocol::TBinaryProtocol;
-
-int main(int argc, char** argv) {
-  const char* endpoint = "epgm://eth0;239.192.1.1:5555";
-  int socktype = ZMQ_PUB;
-  int incr = 1;
-  if (argc > 1) {
-    incr = atoi(argv[1]);
-  }
-
-  zmq::context_t ctx(1);
-  shared_ptr<TZmqClient> transport(new TZmqClient(ctx, endpoint, socktype));
-  shared_ptr<TBinaryProtocol> protocol(new TBinaryProtocol(transport));
-  StorageClient client(protocol);
-
-  transport->open();
-
-  client.incr(incr);
-  usleep(50000);
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-server.cpp b/vendor/git.apache.org/thrift.git/contrib/zeromq/test-server.cpp
deleted file mode 100644
index c624b0d..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-server.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "zmq.hpp"
-#include "TZmqServer.h"
-#include "Storage.h"
-
-using boost::shared_ptr;
-using apache::thrift::TProcessor;
-using apache::thrift::server::TZmqServer;
-using apache::thrift::server::TZmqMultiServer;
-
-class StorageHandler : virtual public StorageIf {
- public:
-  StorageHandler()
-    : value_(0)
-  {}
-
-  void incr(const int32_t amount) {
-    value_ += amount;
-  }
-
-  int32_t get() {
-    return value_;
-  }
-
- private:
-  int32_t value_;
-
-};
-
-
-int main(int argc, char *argv[]) {
-  shared_ptr<StorageHandler> handler(new StorageHandler());
-  shared_ptr<TProcessor> processor(new StorageProcessor(handler));
-
-  zmq::context_t ctx(1);
-  TZmqServer reqrep_server(processor, ctx, "tcp://0.0.0.0:9090", ZMQ_REP);
-  TZmqServer oneway_server(processor, ctx, "tcp://0.0.0.0:9091", ZMQ_UPSTREAM);
-  TZmqMultiServer multiserver;
-  multiserver.servers().push_back(&reqrep_server);
-  multiserver.servers().push_back(&oneway_server);
-  multiserver.serveForever();
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-server.py b/vendor/git.apache.org/thrift.git/contrib/zeromq/test-server.py
deleted file mode 100755
index c7804d3..0000000
--- a/vendor/git.apache.org/thrift.git/contrib/zeromq/test-server.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-import zmq
-import TZmqServer
-import storage.ttypes
-import storage.Storage
-
-
-class StorageHandler(storage.Storage.Iface):
-    def __init__(self):
-        self.value = 0
-
-    def incr(self, amount):
-        self.value += amount
-
-    def get(self):
-        return self.value
-
-
-def main():
-    handler = StorageHandler()
-    processor = storage.Storage.Processor(handler)
-
-    ctx = zmq.Context()
-    reqrep_server = TZmqServer.TZmqServer(processor, ctx, "tcp://0.0.0.0:9090", zmq.REP)
-    oneway_server = TZmqServer.TZmqServer(processor, ctx, "tcp://0.0.0.0:9091", zmq.UPSTREAM)
-    multiserver = TZmqServer.TZmqMultiServer()
-    multiserver.servers.append(reqrep_server)
-    multiserver.servers.append(oneway_server)
-    multiserver.serveForever()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/vendor/git.apache.org/thrift.git/debian/README.md b/vendor/git.apache.org/thrift.git/debian/README.md
deleted file mode 100644
index 8ebfeea..0000000
--- a/vendor/git.apache.org/thrift.git/debian/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-## Some tips on Debian Packaging
-
-- Debian New Maintainers' Guide [http://www.debian.org/doc/debian-policy/]
-- Debian Policy Manual [http://www.debian.org/doc/manuals/maint-guide/]
-- Machine-readable debian/copyright file [http://dep.debian.net/deps/dep5/]
-- DebSrc 3.0 guidelines [https://wiki.debian.org/Projects/DebSrc3.0]
-
-
-## Build using dpkg-buildpackage:
-
-```bash
-$ dpkg-buildpackage -d -tc
-  -d   # do not check build dependencies and conflicts.
-  -tc  # clean source tree when finished.
-```
-
-
-## Update changelog:
-
-```bash
-$ date -R
-```
-
-One can also install `devscripts` package and run:
-
-```bash
-$ dch -i
-```
-
-
-## Check packages:
-
-```bash
-$ dpkg -c *.deb
-$ lintian *.deb
-```
-
-
-## TODO
-
-Make it perfect!
diff --git a/vendor/git.apache.org/thrift.git/debian/changelog b/vendor/git.apache.org/thrift.git/debian/changelog
deleted file mode 100644
index 640480e..0000000
--- a/vendor/git.apache.org/thrift.git/debian/changelog
+++ /dev/null
@@ -1,65 +0,0 @@
-thrift (0.10.0) stable; urgency=low
-
-  * update to 0.10.0
-
- -- Jake Farrell <jfarrell@apache.org>  Mon, 12 Dec 2016 12:00:00 -0500
-
-thrift (0.9.0) stable; urgency=low
-
-  * update to 0.9.0
-
- -- Jake Farrell <jfarrell@apache.org>  Wed, 10 Oct 2012 12:00:00 -0500
-
-thrift (0.7.0) stable; urgency=low
-
-  * update to 0.7.0
-
- -- Jake Farrell <jfarrell@apache.org>  Tue, 10 Aug 2011 17:01:53 -0500
-
-thrift (0.7.0-dev1) stable; urgency=low
-  * added glib
-  * fix location of libthrift.jar
-
- -- Roger Meier <roger@apache.org>  Tue, 12 Apr 2011 21:41:18 +0200
-
-thrift (0.6.0-dev1) stable; urgency=low
-
-  * update version field
-  * added debian folder to thrift/contrib
-  * changed a few details in control file
-  * update copyright file
-
- -- Roger Meier <roger@apache.org>  Tue, 14 Dec 2010 12:12:33 -0800
-
-thrift (0.5.0+nmu2) stable; urgency=low
-
-  * Non-maintainer upload.
-  * Merged THRIFT-71_v9.patch to skip ./bootstrap.sh if not exists.
-    https://issues.apache.org/jira/secure/attachment/12465360/THRIFT-71_v9.patch
-
- -- Yamashita Yuu <yamashita@geishatokyo.com>  Tue, 07 Dec 2010 15:00:55 +0900
-
-thrift (0.5.0+nmu1) stable; urgency=low
-
-  * Non-maintainer upload.
-  * Imported package information for php5-thrift from https://github.com/simplegeo/thrift.
-
- -- Yamashita Yuu <yamashita@geishatokyo.com>  Tue, 07 Dec 2010 01:00:17 +0900
-
-thrift (0.5.0) stable; urgency=low
-
-  * update to 0.5.0
-
- -- Roger Meier <roger@apache.org>  Fri, 08 Oct 2010 11:23:53 +0200
-
-thrift (0.4.0) stable; urgency=low
-
-  * update to 0.4.0
-
- -- Roger Meier <roger@bufferoverflow.ch>  Sun, 22 Aug 2010 21:26:00 +0100
-
-thrift (0.2008.12.30~8.04) hardy; urgency=low
-
-  * Initial release.
-
- -- Esteve Fernandez <esteve@fluidinfo.com>  Thu, 15 Jan 2009 11:34:24 +0100
diff --git a/vendor/git.apache.org/thrift.git/debian/compat b/vendor/git.apache.org/thrift.git/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/vendor/git.apache.org/thrift.git/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/vendor/git.apache.org/thrift.git/debian/control b/vendor/git.apache.org/thrift.git/debian/control
deleted file mode 100644
index 43e7a0f..0000000
--- a/vendor/git.apache.org/thrift.git/debian/control
+++ /dev/null
@@ -1,191 +0,0 @@
-Source: thrift
-Section: devel
-Priority: extra
-Build-Depends: debhelper (>= 9), build-essential, mono-mcs, python-dev, ant,
-    mono-devel,  libmono-system-web4.0-cil, erlang-base, ruby-dev | ruby1.9.1-dev, ruby-bundler ,autoconf, automake,
-    pkg-config, libtool, bison, flex, libboost-dev | libboost1.53-dev,
-    python-all, python-setuptools, python-all-dev, python-all-dbg,
-    python3-all, python3-setuptools, python3-all-dev, python3-all-dbg,
-    openjdk-7-jdk | openjdk-8-jdk | default-jdk,
-    libboost-test-dev | libboost-test1.53-dev, libevent-dev, libssl-dev, perl (>= 5.8.0-7),
-    php5 | php7.0, php5-dev | php7.0-dev, libglib2.0-dev, qtchooser, qtbase5-dev-tools
-Maintainer: Thrift Developer's <dev@thrift.apache.org>
-Homepage: http://thrift.apache.org/
-Vcs-Git: https://git-wip-us.apache.org/repos/asf/thrift.git
-Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=thrift.git
-Standards-Version: 3.9.7
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.3
-
-Package: thrift-compiler
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Compiler for Thrift definition files
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the Thrift compiler that is used for translating
- from .thrift files (containing the definitions) to the language binding
- for the supported languages.
-
-Package: python-thrift
-Architecture: any
-Section: python
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-six
-Recommends: python-twisted-web, python-backports.ssl-match-hostname, python-ipaddress
-Provides: ${python:Provides}
-Description: Python bindings for Thrift (Python 2)
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the Python bindings for Thrift. You will need the thrift
- tool (in the thrift-compiler package) to compile your definition to Python
- classes, and then the modules in this package will allow you to use those
- classes in your programs.
- .
- This package installs the library for Python 2.
-
-Package: python-thrift-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-thrift (= ${binary:Version}), python-all-dbg
-Provides: ${python:Provides}
-Description: Python bindings for Thrift (debug version)
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the Python bindings for Thrift with debugging symbols.
- You will need the thrift tool (in the thrift-compiler package) to compile your
- definition to Python classes, and then the modules in this package will allow
- you to use those classes in your programs.
-
-Package: python3-thrift
-Architecture: any
-Section: python
-Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-six
-Recommends: python3-twisted-web
-Provides: ${python:Provides}
-Description: Python bindings for Thrift (Python 3)
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the Python bindings for Thrift. You will need the thrift
- tool (in the thrift-compiler package) to compile your definition to Python
- classes, and then the modules in this package will allow you to use those
- classes in your programs.
- .
- This package installs the library for Python 3.
-
-Package: python3-thrift-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, python3-thrift (= ${binary:Version}), python3-all-dbg
-Provides: ${python:Provides}
-Description: Python bindings for Thrift (debug version)
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the Python bindings for Thrift with debugging symbols.
- You will need the thrift tool (in the thrift-compiler package) to compile your
- definition to Python classes, and then the modules in this package will allow
- you to use those classes in your programs.
-
-Package: ruby-thrift
-Architecture: all
-Section: libs
-Depends: ruby | ruby-interpreter, ${shlibs:Depends}, ${misc:Depends}
-Provides: libthrift-ruby
-Replaces: libthrift-ruby
-Breaks: libthrift-ruby
-Description: Ruby bindings for Thrift
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the Ruby bindings for Thrift. You will need the thrift
- tool (in the thrift-compiler package) to compile your definition to Ruby
- classes, and then the modules in this package will allow you to use those
- classes in your programs.
-
-Package: libthrift-java
-Architecture: all
-Section: java
-Depends: ${misc:Depends}
-Description: Java bindings for Thrift
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the Java bindings for Thrift. You will need the thrift
- tool (in the thrift-compiler package) to compile your definition to Java
- classes, and then the modules in this package will allow you to use those
- classes in your programs.
-
-Package: libthrift-cil
-Architecture: all
-Section: cli-mono
-Depends: cli-common, libmono-corlib4.0-cil (>= 2.10) | libmono-corlib4.5-cil (>=3.2), libmono-system4.0-cil (>= 2.10),
-    libmono-system-web4.0-cil (>= 2.10), ${misc:Depends}
-Description: CLI bindings for Thrift
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the CLI bindings for Thrift. You will need the thrift
- tool (in the thrift-compiler package) to compile your definition to C#
- classes, and then the modules in this package will allow you to use those
- classes in your programs.
-
-Package: libthrift-perl
-Architecture: all
-Section: perl
-Depends: perl (>= 5.8.0-7), ${misc:Depends}
-Description: Perl bindings for Thrift
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the Perl bindings for Thrift. You will need the thrift
- tool (in the thrift-compiler package) to compile your definition to Perl
- classes, and then the modules in this package will allow you to use those
- classes in your programs.
-
-Package: libthrift0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Thrift C++ library
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the runtime libraries needed for C++ applications
- using Thrift.
-
-Package: libthrift-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libthrift0 (= ${binary:Version}), libglib2.0-dev
-Description: Thrift C++ library (development headers)
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the development libraries required for writing C++
- applications using Thrift.
-
-Package: php5-thrift
-Architecture: any
-Section: php
-Depends: ${php:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${php:Provides}
-Description: PHP bindings for Thrift
- Thrift is a software framework for scalable cross-language services
- development. It combines a software stack with a code generation engine to
- build services that work efficiently and seamlessly.
- .
- This package contains the PHP bindings for Thrift.
diff --git a/vendor/git.apache.org/thrift.git/debian/copyright b/vendor/git.apache.org/thrift.git/debian/copyright
deleted file mode 100644
index 850643c..0000000
--- a/vendor/git.apache.org/thrift.git/debian/copyright
+++ /dev/null
@@ -1,129 +0,0 @@
-This package was debianized by Thrift Developer's <dev@thrift.apache.org>.
-
-
-This package and the Debian packaging is licensed under the Apache License,
-see `/usr/share/common-licenses/Apache-2.0'.
-
-The following information was copied from Apache Thrift LICENSE file.
-
---------------------------------------------------
-SOFTWARE DISTRIBUTED WITH THRIFT:
-
-The Apache Thrift software includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
---------------------------------------------------
-Portions of the following files are licensed under the MIT License:
-
-  lib/erl/src/Makefile.am
-
-Please see doc/otp-base-license.txt for the full terms of this license.
-
-
---------------------------------------------------
-The following files contain some portions of code contributed under
-the Thrift Software License (see doc/old-thrift-license.txt), and relicensed
-under the Apache 2.0 License:
-
-  compiler/cpp/Makefile.am
-  compiler/cpp/src/generate/t_cocoa_generator.cc
-  compiler/cpp/src/generate/t_cpp_generator.cc
-  compiler/cpp/src/generate/t_csharp_generator.cc
-  compiler/cpp/src/generate/t_erl_generator.cc
-  compiler/cpp/src/generate/t_hs_generator.cc
-  compiler/cpp/src/generate/t_java_generator.cc
-  compiler/cpp/src/generate/t_ocaml_generator.cc
-  compiler/cpp/src/generate/t_perl_generator.cc
-  compiler/cpp/src/generate/t_php_generator.cc
-  compiler/cpp/src/generate/t_py_generator.cc
-  compiler/cpp/src/generate/t_rb_generator.cc
-  compiler/cpp/src/generate/t_st_generator.cc
-  compiler/cpp/src/generate/t_xsd_generator.cc
-  compiler/cpp/src/main.cc
-  compiler/cpp/src/parse/t_field.h
-  compiler/cpp/src/parse/t_program.h
-  compiler/cpp/src/platform.h
-  compiler/cpp/src/thriftl.ll
-  compiler/cpp/src/thrifty.yy
-  lib/csharp/src/Protocol/TBinaryProtocol.cs
-  lib/csharp/src/Protocol/TField.cs
-  lib/csharp/src/Protocol/TList.cs
-  lib/csharp/src/Protocol/TMap.cs
-  lib/csharp/src/Protocol/TMessage.cs
-  lib/csharp/src/Protocol/TMessageType.cs
-  lib/csharp/src/Protocol/TProtocol.cs
-  lib/csharp/src/Protocol/TProtocolException.cs
-  lib/csharp/src/Protocol/TProtocolFactory.cs
-  lib/csharp/src/Protocol/TProtocolUtil.cs
-  lib/csharp/src/Protocol/TSet.cs
-  lib/csharp/src/Protocol/TStruct.cs
-  lib/csharp/src/Protocol/TType.cs
-  lib/csharp/src/Server/TServer.cs
-  lib/csharp/src/Server/TSimpleServer.cs
-  lib/csharp/src/Server/TThreadPoolServer.cs
-  lib/csharp/src/TApplicationException.cs
-  lib/csharp/src/Thrift.csproj
-  lib/csharp/src/Thrift.sln
-  lib/csharp/src/TProcessor.cs
-  lib/csharp/src/Transport/TServerSocket.cs
-  lib/csharp/src/Transport/TServerTransport.cs
-  lib/csharp/src/Transport/TSocket.cs
-  lib/csharp/src/Transport/TStreamTransport.cs
-  lib/csharp/src/Transport/TTransport.cs
-  lib/csharp/src/Transport/TTransportException.cs
-  lib/csharp/src/Transport/TTransportFactory.cs
-  lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
-  lib/csharp/ThriftMSBuildTask/ThriftBuild.cs
-  lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
-  lib/rb/lib/thrift.rb
-  lib/st/README
-  lib/st/thrift.st
-  test/OptionalRequiredTest.cpp
-  test/OptionalRequiredTest.thrift
-  test/ThriftTest.thrift
-
---------------------------------------------------
-For the aclocal/ax_boost_base.m4 and contrib/fb303/aclocal/ax_boost_base.m4 components:
-
-#   Copyright (c) 2007 Thomas Porschberg <thomas@randspringer.de>
-#
-#   Copying and distribution of this file, with or without
-#   modification, are permitted in any medium without royalty provided
-#   the copyright notice and this notice are preserved.
-
---------------------------------------------------
-For the compiler/cpp/src/md5.[ch] components:
-
-/*
-  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-
----------------------------------------------------
-For the lib/rb/setup.rb: Copyright (c) 2000-2005 Minero Aoki,
-lib/ocaml/OCamlMakefile and lib/ocaml/README-OCamlMakefile components:
-     Copyright (C) 1999 - 2007  Markus Mottl
-
-Licensed under the terms of the GNU Lesser General Public License 2.1
-(see doc/lgpl-2.1.txt for the full terms of this license)
diff --git a/vendor/git.apache.org/thrift.git/debian/dirs b/vendor/git.apache.org/thrift.git/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/vendor/git.apache.org/thrift.git/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/vendor/git.apache.org/thrift.git/debian/docs b/vendor/git.apache.org/thrift.git/debian/docs
deleted file mode 100644
index b43bf86..0000000
--- a/vendor/git.apache.org/thrift.git/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/vendor/git.apache.org/thrift.git/debian/libthrift-dev.install b/vendor/git.apache.org/thrift.git/debian/libthrift-dev.install
deleted file mode 100644
index 58b5223..0000000
--- a/vendor/git.apache.org/thrift.git/debian/libthrift-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/pkgconfig
-usr/include
diff --git a/vendor/git.apache.org/thrift.git/debian/libthrift0.install b/vendor/git.apache.org/thrift.git/debian/libthrift0.install
deleted file mode 100644
index ec74efc..0000000
--- a/vendor/git.apache.org/thrift.git/debian/libthrift0.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/libthrift.so*
-usr/lib/libthrift-*.so*
-usr/lib/libthriftnb*.so*
-usr/lib/libthriftqt*.so*
-usr/lib/libthriftz*.so*
diff --git a/vendor/git.apache.org/thrift.git/debian/php5-thrift.dirs b/vendor/git.apache.org/thrift.git/debian/php5-thrift.dirs
deleted file mode 100644
index 8ca3a0f..0000000
--- a/vendor/git.apache.org/thrift.git/debian/php5-thrift.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/php5/conf.d
diff --git a/vendor/git.apache.org/thrift.git/debian/rules b/vendor/git.apache.org/thrift.git/debian/rules
deleted file mode 100755
index adecf07..0000000
--- a/vendor/git.apache.org/thrift.git/debian/rules
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-PYVERS := $(shell pyversions -r)
-
-export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	# Add here commands to configure the package.
-	if [ -f bootstrap.sh ]; then $(CURDIR)/bootstrap.sh; fi
-	$(CURDIR)/configure --prefix=/usr
-
-	touch configure-stamp
-
-
-#Architecture
-build: build-arch build-indep
-	# Tests disabled
-	# $(MAKE) -C test check
-
-build-arch: build-arch-stamp
-$(CURDIR)/compiler/cpp/thrift build-arch-stamp: configure-stamp
-
-	# Compile C++ library
-	$(MAKE) -C $(CURDIR)/lib/cpp
-
-	# Compile compiler
-	$(MAKE) -C $(CURDIR)/compiler/cpp
-
-	# Compile C (glib) library
-	$(MAKE) -C $(CURDIR)/lib/c_glib
-
-	# Python library
-	cd $(CURDIR)/lib/py && \
-    for py in $(PYVERS); do  \
-        $$py setup.py build; \
-        $$py-dbg setup.py build; \
-    done
-
-	# PHP
-	cd $(CURDIR)/lib/php/src/ext/thrift_protocol && \
-		phpize && \
-		./configure && $(MAKE)
-
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp $(CURDIR)/compiler/cpp/thrift
-
-	# Add here commands to compile the indep part of the package.
-	#$(MAKE) doc
-
-	# Java
-	cd $(CURDIR)/lib/java && \
-		ant
-
-	# C#
-	$(MAKE) -C $(CURDIR)/lib/csharp
-
-	# Ruby
-	$(MAKE) -C $(CURDIR)/lib/rb
-
-	# Perl
-	$(MAKE) -C $(CURDIR)/lib/perl INSTALLDIRS=vendor
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
-
-	cd $(CURDIR)/lib/py && python setup.py clean --all
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-
-	$(CURDIR)/cleanup.sh
-
-	dh_clean
-
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_prep -i
-	dh_installdirs -i
-
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
-
-	# Java
-	mkdir -p $(CURDIR)/debian/libthrift-java/usr/share/java/ && \
-	cp $(CURDIR)/lib/java/build/libthrift*.jar \
-		$(CURDIR)/debian/libthrift-java/usr/share/java/
-
-	# Ruby
-	mkdir -p $(CURDIR)/debian/ruby-thrift/usr/lib/ruby/1.9.1 && \
-	cp $(CURDIR)/lib/rb/lib/thrift.rb \
-		$(CURDIR)/debian/ruby-thrift/usr/lib/ruby/1.9.1
-	cp -r $(CURDIR)/lib/rb/lib/thrift \
-		$(CURDIR)/debian/ruby-thrift/usr/lib/ruby/1.9.1
-
-	# C#
-	mkdir -p $(CURDIR)/debian/libthrift-cil/usr/lib/cli/thrift/ && \
-	cp $(CURDIR)/lib/csharp/Thrift.dll \
-		$(CURDIR)/debian/libthrift-cil/usr/lib/cli/thrift/Thrift.dll
-
-	# Perl
-	$(MAKE) -C $(CURDIR)/lib/perl install DESTDIR=$(CURDIR)/debian/libthrift-perl
-	mv $(CURDIR)/debian/libthrift-perl/usr/local/lib/perl5 $(CURDIR)/debian/libthrift-perl/usr/lib
-	rmdir $(CURDIR)/debian/libthrift-perl/usr/local/lib
-	rmdir $(CURDIR)/debian/libthrift-perl/usr/local
-
-	dh_install -i
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-
-	# Add here commands to install the arch part of the package into
-	# debian/tmp.
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/thrift install
-
-	# Compiler
-	mkdir -p $(CURDIR)/debian/thrift-compiler/usr/bin && \
-	cp $(CURDIR)/compiler/cpp/thrift \
-		$(CURDIR)/debian/thrift-compiler/usr/bin/thrift && \
-	rmdir $(CURDIR)/debian/thrift-compiler/usr/sbin
-
-	# Python
-	cd $(CURDIR)/lib/py && \
-	python2 setup.py install --install-layout=deb --no-compile --root=$(CURDIR)/debian/python-thrift && \
-	python2-dbg setup.py install --install-layout=deb --no-compile --root=$(CURDIR)/debian/python-thrift-dbg && \
-	python3 setup.py install --install-layout=deb --no-compile --root=$(CURDIR)/debian/python3-thrift && \
-	python3-dbg setup.py install --install-layout=deb --no-compile --root=$(CURDIR)/debian/python3-thrift-dbg
-
-	find $(CURDIR)/debian/python-thrift -name "*.py[co]" -print0 | xargs -0 rm -f
-	find $(CURDIR)/debian/python-thrift -name "__pycache__" -print0 | xargs -0 rm -fr
-	find $(CURDIR)/debian/python-thrift-dbg -name "__pycache__" -print0 | xargs -0 rm -fr
-	find $(CURDIR)/debian/python-thrift-dbg -name "*.py[co]" -print0 | xargs -0 rm -f
-	find $(CURDIR)/debian/python-thrift-dbg -name "*.py" -print0 | xargs -0 rm -f
-	find $(CURDIR)/debian/python-thrift-dbg -name "*.egg-info" -print0 | xargs -0 rm -rf
-	find $(CURDIR)/debian/python-thrift-dbg -depth -type d -empty -exec rmdir {} \;
-
-	find $(CURDIR)/debian/python3-thrift -name "*.py[co]" -print0 | xargs -0 rm -f
-	find $(CURDIR)/debian/python3-thrift -name "__pycache__" -print0 | xargs -0 rm -fr
-	find $(CURDIR)/debian/python3-thrift-dbg -name "__pycache__" -print0 | xargs -0 rm -fr
-	find $(CURDIR)/debian/python3-thrift-dbg -name "*.py[co]" -print0 | xargs -0 rm -f
-	find $(CURDIR)/debian/python3-thrift-dbg -name "*.py" -print0 | xargs -0 rm -f
-	find $(CURDIR)/debian/python3-thrift-dbg -name "*.egg-info" -print0 | xargs -0 rm -rf
-	find $(CURDIR)/debian/python3-thrift-dbg -depth -type d -empty -exec rmdir {} \;
-
-	# PHP
-	mkdir -p $(CURDIR)/debian/php5-thrift
-	cd $(CURDIR)/lib/php && \
-		$(MAKE) DESTDIR=$(CURDIR)/debian/php5-thrift install
-
-	# C++ and C (glib)
-	mkdir -p $(CURDIR)/debian/tmp; \
-	cd $(CURDIR)/lib/cpp && \
-		$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	cd $(CURDIR)/lib/c_glib && \
-		$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-	dh_install --sourcedir=debian/tmp -s
-
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip -ppython-thrift --dbg-package=python-thrift-dbg
-	dh_strip -ppython3-thrift --dbg-package=python3-thrift-dbg
-	dh_strip -pthrift-compiler -plibthrift0
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independent packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependent packages using the common target.
-binary-arch: build-arch install-arch
-	echo "php:Depends=phpapi-$(shell php-config5 --phpapi)" > $(CURDIR)/debian/substvars
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/vendor/git.apache.org/thrift.git/debian/substvars b/vendor/git.apache.org/thrift.git/debian/substvars
deleted file mode 100644
index 9841f2d..0000000
--- a/vendor/git.apache.org/thrift.git/debian/substvars
+++ /dev/null
@@ -1 +0,0 @@
-php:Depends=phpapi-20121212
diff --git a/vendor/git.apache.org/thrift.git/debian/thrift-doc.docs b/vendor/git.apache.org/thrift.git/debian/thrift-doc.docs
deleted file mode 100644
index 299950c..0000000
--- a/vendor/git.apache.org/thrift.git/debian/thrift-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-#DOCS#
-
diff --git a/vendor/git.apache.org/thrift.git/debian/thrift-doc.install b/vendor/git.apache.org/thrift.git/debian/thrift-doc.install
deleted file mode 100644
index 299950c..0000000
--- a/vendor/git.apache.org/thrift.git/debian/thrift-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#DOCS#
-
diff --git a/vendor/git.apache.org/thrift.git/doap.rdf b/vendor/git.apache.org/thrift.git/doap.rdf
deleted file mode 100755
index 14a8d66..0000000
--- a/vendor/git.apache.org/thrift.git/doap.rdf
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl"?>
-<rdf:RDF xml:lang="en"
-         xmlns="http://usefulinc.com/ns/doap#"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:asfext="http://projects.apache.org/ns/asfext#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/">
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-  <Project rdf:about="http://thrift.apache.org">
-    <created>2012-04-14</created>
-    <license rdf:resource="http://usefulinc.com/doap/licenses/asl20" />
-    <name>Apache Thrift</name>
-    <homepage rdf:resource="http://thrift.apache.org" />
-    <asfext:pmc rdf:resource="http://thrift.apache.org" />
-    <shortdesc>Apache Thrift software provides a framework for scalable cross-language services development, combines a software stack with a code generation engine to build services that work efficiently and seamlessly between C++, Java, Python, PHP, Ruby, Erlang, Perl, Haskell, C#, Cocoa, JavaScript, Node.js, Smalltalk, OCaml and Delphi and other languages. </shortdesc>
-    <description>Apache Thrift allows you to define data types and service interfaces in a simple definition file. Taking that file as input, the compiler generates code to be used to easily build RPC clients and servers that communicate seamlessly across programming languages. Instead of writing a load of boilerplate code to serialize and transport your objects and invoke remote methods, you can get right down to business. </description>
-    <bug-database rdf:resource="https://issues.apache.org/jira/browse/THRIFT" />
-    <mailing-list rdf:resource="http://thrift.apache.org/mailing/" />
-    <download-page rdf:resource="http://thrift.apache.org/download/" />
-    <programming-language>ActionScript</programming-language>
-    <programming-language>C</programming-language>
-    <programming-language>C#</programming-language>
-    <programming-language>C++</programming-language>
-    <programming-language>Cocoa</programming-language>
-    <programming-language>D</programming-language>
-    <programming-language>Delphi</programming-language>
-    <programming-language>Erlang</programming-language>
-    <programming-language>Go</programming-language>
-    <programming-language>Haskell</programming-language>
-    <programming-language>Java</programming-language>
-    <programming-language>JavaScript</programming-language>
-    <programming-language>node.js</programming-language>
-    <programming-language>OCaml</programming-language>
-    <programming-language>Perl</programming-language>
-    <programming-language>PHP</programming-language>
-    <programming-language>Python</programming-language>
-    <programming-language>SmallTalk</programming-language>
-    <category rdf:resource="http://projects.apache.org/category/http" />
-    <category rdf:resource="http://projects.apache.org/category/library" />
-    <category rdf:resource="http://projects.apache.org/category/network-client" />
-    <category rdf:resource="http://projects.apache.org/category/network-server" />
-    <release rdf:parseType="Collection">
-      <Version>
-        <name>Apache Thrift</name>
-        <created>2015-09-25</created>
-        <revision>0.9.3</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift</name>
-        <created>2014-11-05</created>
-        <revision>0.9.2</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift</name>
-        <created>2013-08-22</created>
-        <revision>0.9.1</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift</name>
-        <created>2012-10-15</created>
-        <revision>0.9.0</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift</name>
-        <created>2011-11-29</created>
-        <revision>0.8.0</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift</name>
-        <created>2011-08-13</created>
-        <revision>0.7.0</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift</name>
-        <created>2011-04-25</created>
-        <revision>0.6.1</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift</name>
-        <created>2011-02-08</created>
-        <revision>0.6.0</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift (incubating)</name>
-        <created>2010-10-07</created>
-        <revision>0.5.0</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift (incubating)</name>
-        <created>2010-08-23</created>
-        <revision>0.4.0</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift (incubating)</name>
-        <created>2010-08-04</created>
-        <revision>0.3.0</revision>
-      </Version>
-      <Version>
-        <name>Apache Thrift (incubating)</name>
-        <created>2009-12-11</created>
-        <revision>0.2.0</revision>
-      </Version>
-    </release>
-    <repository>
-      <GitRepository>
-        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/thrift.git"/>
-        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=thrift.git"/>
-      </GitRepository>
-    </repository>
-    <maintainer>
-      <foaf:Person>
-        <foaf:name>Apache Thrift PMC</foaf:name>
-          <foaf:mbox rdf:resource="mailto:dev@thrift.apache.org"/>
-      </foaf:Person>
-    </maintainer>
-  </Project>
-</rdf:RDF>
diff --git a/vendor/git.apache.org/thrift.git/doc/coding_standards.md b/vendor/git.apache.org/thrift.git/doc/coding_standards.md
deleted file mode 100644
index 308100a..0000000
--- a/vendor/git.apache.org/thrift.git/doc/coding_standards.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Thrift Coding Standards
-
-   Any fool can write code that a computer can understand.
-   Good programmers write code that humans can understand.
-                                  -- Martin Fowler, 1999
-
-The purpose of this document is to make everyone's life easier.
-
-It's easier when you read good, well formatted, with clearly defined purpose, code.
-But the only way to read clean code is to write such.
-
-This document can help achieve that, but keep in mind that
-those are not silver-bullet, fix-all-at-once rules. Just think about readability while writing code.
-Write code like you would have to read it in ten years from now.
-
-## General Coding Standards
-
-Thrift has some history. Not all existing code follows those rules.
-But we want to improve over time.
-When making small change / bugfix - like single line fix - do *not* refactor whole function.
-That disturbs code repository history.
-Whenever adding something new and / or making bigger refactoring
- - follow those rules as strictly as you can.
-
-When in doubt - contact other developers (using dev@ mailing list or IRC).
-Code review is the best way to improve readability.
-
-### Basics
- * Use spaces not tabs
- * Use only ASCII characters in file and directory names
- * Commit to repository using Unix-style line endings (LF)
-     On Windows:
-       git config core.autocrlf true
- * Maximum line width - 100 characters
- * If not specified otherwise in language specific standard - use 2 spaces as indent/tab
-
-### Comments
- * Each file has to start with comment containing [Apache License](http://www.apache.org/licenses/LICENSE-2.0)
- * Public API of library should be documented, preferably using format native for language specific documentation generation tools (Javadoc, Doxygen etc.)
- * Other comments are discouraged - comments are lies. When one has to make comment it means one failed to write readable code. Instead of "I should write a comment here" think "I should clean it up"
- * Do not leave "TODO/FIXME" comments - file [Jira](http://issues.apache.org/jira/browse/THRIFT) issue instead
-
-### Naming
- Finding proper names is the most important and most difficult task in software development.
-
-## Language Specific Coding Standards
-
-For detailed information see `lib/LANG/coding_standards.md`
diff --git a/vendor/git.apache.org/thrift.git/doc/committers.md b/vendor/git.apache.org/thrift.git/doc/committers.md
deleted file mode 100644
index b02edbe..0000000
--- a/vendor/git.apache.org/thrift.git/doc/committers.md
+++ /dev/null
@@ -1,54 +0,0 @@
-## Process used by committers to review and submit patches
-
-1. Make sure that there is an issue for the patch(s) you are about to commit in our [Jira issue tracker](http://issues.apache.org/jira/browse/THRIFT)
-
-1. Check out the latest version of the source code
-
-  * git clone https://git-wip-us.apache.org/repos/asf/thrift.git thrift
-
-1. Apply the patch
-
-  * curl https://issues.apache.org/jira/... |git apply --ignore-space-change
-
-  or
-
-  * curl https://github.com/<GitHub User>/thrift/commit/<Commit ID>.patch |git apply --ignore-space-change
-
-
-1. Inspect the applied patch to ensure that all [Legal aspects on Submission of Contributions (Patches)](http://www.apache.org/licenses/LICENSE-2.0.html#contributions) are met
-
-1. Run the necessary unit tests and cross language test cases to verify the patch
-
-1. Commit the patch
-
-        git --config user.name "Your Name"
-        git --config user.email "YourApacheID@apache.org"
-        git add -A
-        git commit
-
-1. The commit message should be in the format:
-
-       THRIFT-###:<Jira description>
-       Client: <component>
-       Patch: <Name of person contributing the patch>
-
-       Description of what was fixed or addressed.
-
-       <%
-           if this is a github pull request then add below comment
-            to automaticaly close GitHub request.
-       %>
-       This closes #XX
-
-
-1. Double check the patch committed and that nothing was missed then push the patch
-
-       git status
-       git show HEAD
-       git push origin master
-
-
-1. Resolve the jira issue and set the following for the changelog
-
-  * Component the patch is for
-  * fixVersion to the current version on master
diff --git a/vendor/git.apache.org/thrift.git/doc/install/README.md b/vendor/git.apache.org/thrift.git/doc/install/README.md
deleted file mode 100644
index e37f4ff..0000000
--- a/vendor/git.apache.org/thrift.git/doc/install/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-
-## Basic requirements
-* A relatively POSIX-compliant *NIX system
-    * Cygwin or MinGW can be used on Windows (but there are better options, see below)
-* g++ 4.2
-* boost 1.53.0
-* Runtime libraries for lex and yacc might be needed for the compiler.
-
-## Requirements for building from source
-* GNU build tools: 
-    * autoconf 2.65
-    * automake 1.13
-    * libtool 1.5.24
-* pkg-config autoconf macros (pkg.m4)
-* lex and yacc (developed primarily with flex and bison)
-* libssl-dev
-
-## Requirements for building the compiler from source on Windows
-* Visual Studio C++
-* Flex and Bison (e.g. the WinFlexBison package)
-
-## Language requirements
-These are only required if you choose to build the libraries for the given language
-
-* C++
-    * Boost 1.53.0
-    * libevent (optional, to build the nonblocking server)
-    * zlib (optional)
-* Java
-    * Java 1.7
-    * Apache Ant
-* C#: Mono 1.2.4 (and pkg-config to detect it) or Visual Studio 2005+
-* Python 2.6 (including header files for extension modules)
-* PHP 5.0 (optionally including header files for extension modules)
-* Ruby 1.8
-    * bundler gem
-* Erlang R12 (R11 works but not recommended)
-* Perl 5
-    * Bit::Vector
-    * Class::Accessor
-* Haxe 3.1.3
-* Go 1.4
-* Delphi 2010
diff --git a/vendor/git.apache.org/thrift.git/doc/install/centos.md b/vendor/git.apache.org/thrift.git/doc/install/centos.md
deleted file mode 100644
index 609e118..0000000
--- a/vendor/git.apache.org/thrift.git/doc/install/centos.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Building Apache Thrift on CentOS 6.5
-
-Starting with a minimal installation, the following steps are required to build Apache Thrift on Centos 6.5. This example builds from source, using the current development master branch. These instructions should also work with Apache Thrift releases beginning with 0.9.2.
-
-## Update the System
-
-	sudo yum -y update
-
-## Install the Platform Development Tools
-
-	sudo yum -y groupinstall "Development Tools"
-
-## Upgrade autoconf/automake/bison
-
-	sudo yum install -y wget
-
-### Upgrade autoconf
-
-	wget http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
-	tar xvf autoconf-2.69.tar.gz
-	cd autoconf-2.69
-	./configure --prefix=/usr
-	make
-	sudo make install
-	cd ..
-
-### Upgrade automake
-
-	wget http://ftp.gnu.org/gnu/automake/automake-1.14.tar.gz
-	tar xvf automake-1.14.tar.gz
-	cd automake-1.14
-	./configure --prefix=/usr
-	make
-	sudo make install
-	cd ..
-
-### Upgrade bison
-
-	wget http://ftp.gnu.org/gnu/bison/bison-2.5.1.tar.gz
-	tar xvf bison-2.5.1.tar.gz
-	cd bison-2.5.1
-	./configure --prefix=/usr
-	make
-	sudo make install
-	cd ..
-
-## Add Optional C++ Language Library Dependencies
-
-All languages require the Apache Thrift IDL Compiler and at this point everything needed to make the IDL Compiler is installed (if you only need the compiler you can skip to the Build step). 
-
-If you will be developing Apache Thrift clients/servers in C++ you will also need additional packages to support the C++ shared library build.
-
-### Install C++ Lib Dependencies
-
-	sudo yum -y install libevent-devel zlib-devel openssl-devel
-
-### Upgrade Boost >= 1.53
-
-	wget http://sourceforge.net/projects/boost/files/boost/1.53.0/boost_1_53_0.tar.gz
-	tar xvf boost_1_53_0.tar.gz
-	cd boost_1_53_0
-	./bootstrap.sh
-	sudo ./b2 install
-
-## Build and Install the Apache Thrift IDL Compiler
-
-	git clone https://git-wip-us.apache.org/repos/asf/thrift.git
-	cd thrift
-	./bootstrap.sh
-	./configure --with-lua=no
-	make
-	sudo make install
-
-This will build the compiler (thrift/compiler/cpp/thrift --version) and any language libraries supported. The make install step installs the compiler on the path: /usr/local/bin/thrift
-You can use the ./configure --enable-libs=no switch to build the Apache Thrift IDL Compiler only without lib builds. To run tests use "make check".
diff --git a/vendor/git.apache.org/thrift.git/doc/install/debian.md b/vendor/git.apache.org/thrift.git/doc/install/debian.md
deleted file mode 100644
index 5e1ae4c..0000000
--- a/vendor/git.apache.org/thrift.git/doc/install/debian.md
+++ /dev/null
@@ -1,46 +0,0 @@
-## Debian/Ubuntu install
-The following command will install tools and libraries required to build and install the Apache Thrift compiler and C++ libraries on a Debian/Ubuntu Linux based system.
-
-	sudo apt-get install automake bison flex g++ git libboost1.55-all-dev libevent-dev libssl-dev libtool make pkg-config
-
-Debian 7/Ubuntu 12 users need to manually install a more recent version of automake and (for C++ library and test support) boost:
-
-    wget http://ftp.debian.org/debian/pool/main/a/automake-1.15/automake_1.15-3_all.deb
-    sudo dpkg -i automake_1.15-3_all.deb
-
-    wget http://sourceforge.net/projects/boost/files/boost/1.60.0/boost_1_60_0.tar.gz                                                                      tar xvf boost_1_60_0.tar.gz
-    cd boost_1_60_0
-    ./bootstrap.sh
-    sudo ./b2 install
-
-## Optional packages
-
-If you would like to build Apache Thrift libraries for other programming languages you may need to install additional packages. The following languages require the specified additional packages:
-
- * Java
-	* To build Apache Thrift support for Java you will need to install the ant package and Java JDK v1.7 or higher. Type **javac** to see a list of available packages, pick the one you prefer and **apt-get install** it (e.g. openjdk-7-jdk).
- * Ruby
-	* ruby-full ruby-dev ruby-rspec rake rubygems libdaemons-ruby libgemplugin-ruby mongrel
- * Python
-	* python-all python-all-dev python-all-dbg
- * Perl
-	* libbit-vector-perl libclass-accessor-class-perl
- * Php, install
-	* php5-dev php5-cli phpunit
- * C_glib
-	* libglib2.0-dev
- * Erlang
-	* erlang-base erlang-eunit erlang-dev
- * Csharp
-	* mono-gmcs mono-devel libmono-system-web2.0-cil nunit nunit-console
- * Haskell
-	* ghc6 cabal-install libghc6-binary-dev libghc6-network-dev libghc6-http-dev
- * Thrift Compiler for Windows
-	* mingw32 mingw32-binutils mingw32-runtime nsis
-
-
-## Additional reading
-
-For more information on the requirements see: [Apache Thrift Requirements](/docs/install)
-
-For more information on building and installing Thrift see: [Building from source](/docs/BuildingFromSource)
diff --git a/vendor/git.apache.org/thrift.git/doc/install/os_x.md b/vendor/git.apache.org/thrift.git/doc/install/os_x.md
deleted file mode 100644
index 2d99ef4..0000000
--- a/vendor/git.apache.org/thrift.git/doc/install/os_x.md
+++ /dev/null
@@ -1,27 +0,0 @@
-## OS X Setup
-The following command install all the required tools and libraries to build and install the Apache Thrift compiler on a OS X based system. 
-
-### Install Boost
-Download the boost library from [boost.org](http://www.boost.org) untar compile with
-
-	./bootstrap.sh
-	sudo ./b2 threading=multi address-model=64 variant=release stage install
-
-### Install libevent
-Download [libevent](http://monkey.org/~provos/libevent), untar and compile with
-
-	./configure --prefix=/usr/local 
-	make
-	sudo make install
-
-### Building Apache Thrift
-Download the latest version of [Apache Thrift](/download), untar and compile with
-
-	./configure --prefix=/usr/local/ --with-boost=/usr/local --with-libevent=/usr/local
-
-## Additional reading
-
-For more information on the requirements see: [Apache Thrift Requirements](/docs/install)
-
-For more information on building and installing Thrift see: [Building from source](/docs/BuildingFromSource)
-
diff --git a/vendor/git.apache.org/thrift.git/doc/install/windows.md b/vendor/git.apache.org/thrift.git/doc/install/windows.md
deleted file mode 100644
index 7b09840..0000000
--- a/vendor/git.apache.org/thrift.git/doc/install/windows.md
+++ /dev/null
@@ -1,186 +0,0 @@
-## Windows Setup
-
-The Thrift environment consists of two main parts: The Thrift compiler EXE and the language-dependent libraries. Most of these libraries will require some kind of build and/or installation. But regarding the Thrift compiler utility there are a number of different alternatives. 
-
-The first one of these alternatives is to download the **pre-built Thrift Compiler EXE** and only build the libraries needed from source, following one of the "Setup from source" methods outlined below.
-
-The other two options are to build the Thrift compiler from source. The most recommended way to achieve this is by means of the **Visual Studio C++ build project**. Alternatively, the Thrift compiler can also be built via **Cygwin** or **MinGW** build environments, however this method is not only less comfortable, but more time-consuming and requires much more manual effort. 
-
-
-## Prebuilt Thrift compiler
-
-The windows Thrift compiler is available as a prebuilt exe available [here](/download). Note that there is no installation tool, rather this EXE file *is* already the Thrift compiler utility. Download the file and put it into some suitable location of your choice.
-
-Now pick one of the "Build and install target libraries" below to continue.
-
- 
-## Setup from source via Visual Studio C++ (recommended)
-
-### Requirements
-
-Thrift's compiler is written in C++ and designed to be portable, but there are some system requirements. Thrift's runtime libraries are written in various languages, which are also required for the particular language interface.
-
- * Visual Studio C++, any recent version should do
- * Flex and Bison, e.g. the WinFlexBison package
- * [Apache Thrift Requirements](/docs/install)
-
-### Build and install the compiler
- 
-After all requirements are in place, use the `compiler/cpp/compiler.vcxproj` build project to build the Thrift compiler. Copy the resulting EXE file to a location of your choice. 
-
-### Build and install target libraries
-
-A few of the target language libraries also do provide Visual Studio project files, such as C++ and C#. These are located in the `lib/<language>/` folders. 
-
-Most of the language packages must be built and installed manually using build tools better suited to those languages. Typical examples are Java, Ruby, Delphi, or PHP. Look for the `README.md` file in the `lib/<language>/` folder for more details on how to build and install each language's library package.
- 
-
-## Setup from source via Cygwin
-
-### Requirements
-
-Thrift's compiler is written in C++ and designed to be portable, but there are some system requirements. Thrift's runtime libraries are written in various languages, which are also required for the particular language interface.
-
- * Cygwin or MinGW 
- * [Apache Thrift Requirements](/docs/install)
-
-### Installing from source
-
-If you are building from the first time out of the source repository, you will need to generate the configure scripts.  (This is not necessary if you downloaded a tarball.)  From the top directory, do:
-
-	./bootstrap.sh
-
-Once the configure scripts are generated, thrift can be configured. From the top directory, do:
-
-	export CXXFLAGS="-D PTHREAD_MUTEX_RECURSIVE_NP=PTHREAD_MUTEX_RECURSIVE"
-	./configure
-
-Setting the CXXFLAGS environmental variable works around compile errors with PTHREAD_MUTEX_RECURSIVE_NP being undeclared, by replacing it with the newer, portable PTHREAD_MUTEX_RECURSIVE. (Tested on cygwin 20100320, Thrift r760184, latest pthread.)
-
-**Optional:** You **may not** be able to make from the root  Thrift directory due to errors (see below to resolve). To make the compiler only, change to the compiler directory before running make:
-
-	cd compiler/cpp
-
-Now make the thrift compiler (& runtime libraries if make is run from the thrift root directory):
-
-	make
-	make install
-
-### Build and install target libraries
-
-Some language packages must be installed manually using build tools better suited to those languages. Typical examples are Java, Ruby, or PHP. Look for the README file in the `lib/<language>/` folder for more details on the installation of each language library package.
-
-### Possible issues with Cygwin install
-
-See also Possible issues with MinGW install.
-
-#### Syntax error in ./configure
-
-The following error occurs for some users when running ./configure:
-
-	./configure: line 21183: syntax error near unexpected token `MONO,'
-	./configure: line 21183: `  PKG_CHECK_MODULES(MONO, mono >= 1.2.6, have_mono=yes, have_mono=no)'
-
-To resolve this, you'll need to find your pkg.m4 (installed by the pkg-config package) file and copy it to the thrift/aclocal directory.  From the top-level thrift directory, you can copy the file by running
-
-	cp /usr/share/aclocal/pkg.m4 aclocal
-
-Finally, re-run ./bootstrap.sh and ./configure.  (Note that pkg.m4 is created by the pkg-config tool.  If your /usr/share/aclocal directory doesn't contain the pkg.m4 file, you may not have pkg-config installed.)
-
-#### Installing perl runtime libraries
-
-Sometimes, there will be an error during the install of the perl libraries with chmod.
-
-A workaround is to avoid installing the perl libraries if they are not needed.
-
-If you don't need perl, run configure with --without-perl.
-
-If you need perl, and are happy to manually install it, replace the contents of thrift/lib/perl/Makefile with the following, after building thrift:
-	
-	TODO
-
-#### Linking to installed C++ runtime libraries
-
-Sometimes, the installed libthrift.a will not link using g++, with linker errors about missing vtables and exceptions for Thrift classes.
-
-A workaround is to link the compiled object files directly from your Thrift build, corresponding to the missing classes.
-
-This can be implemented in a Makefile using the following lines:
-
-	THRIFT_O=<path to>/thrift/lib/cpp
-	LTHRIFT=$(THRIFT_O)/Thrift.o $(THRIFT_O)/TSocket.o $(THRIFT_O)/TBinaryProtocol.o $(THRIFT_O)/TBufferTransports.o
-
-Then linking using $(LTHRIFT) instead of -lthrift.
-
-	TODO - diagnose issue further
-
-#### C++ runtime segfault with cygwin 1.7.5-1, g++-4.3.4, fork() and throw
-
-If your thrift C++ programs segfault on throw after fork()ing, compile them with g++-3.
-
-The issue and patch are described on the Cygwin mailing list at http://cygwin.com/ml/cygwin/2010-05/msg00203.html
-
-This issue should be fixed in Cygwin versions after 1.7.5-1, or g++ 4.5.0.
-
-## Setup from source via MinGW
-
-### Requirements
-
-To compile the Thrift generator & runtime libraries (untested) without the cygwin.dll dependency you need to install MinGW (www.mingw.org). 
-
- * MinGW 
- * [Apache Thrift Requirements](/docs/install)
-
-In addition you need to add the following entry to your windows PATH variable.
-
-	C:\MINGW\BIN
-	
-Next, open compiler/cpp/Makefile.am and add the following line to thrift_CXXFLAGS
-
-	-DMINGW -mno-cygwin -lfl
-	
-Run bootstrap.sh:
-
-	./bootstrap.sh
-
-Make sure you have java in your $PATH variable, if not do(adjust path if necessary):
-
-	export PATH=$PATH:"/cygdrive/c/program files/java/jre1.6.0_05/bin"
-
-Run configure - using CXXFLAGS to work around an issue with an old pthreads define (untested on MinGW - works on Cygwin):
-
-	export CXXFLAGS="-D PTHREAD_MUTEX_RECURSIVE_NP=PTHREAD_MUTEX_RECURSIVE"
-	./configure
-
-''Optional:'' To make the compiler only, change to the compiler  directory before running make:
-
-	cd compiler/cpp
-	
-Run make:
-
-	mingw32-make.exe
-
-### Possible issues with MinGW install
-
-See also Possible issues with Cygwin install, including the discussion about PTHREAD_MUTEX_RECURSIVE_NP.
-
-#### yywrap is not found
-
-Make sure you add -lfl in your cxxflags in Makefile, also try adding -Lc:/cygwin/libs
-
-#### boost is not found
-
-Try and change the include dir to use the windows path from c like this: Edit compiler/cpp/Makefile, look for the declaration of BOOST_CPPFLAGS, change that line for
-
-	BOOST_CPPFLAGS = -Ic:/cygwin/usr/include/boost-1_53_0
-	
-#### realpath is not found
-
-add -DMINGW -mno-cygwin to the CXXDEFS variable in Makefile
-
-## Additional reading
-
-For more information on the requirements see: [Apache Thrift Requirements](/docs/install)
-
-For more information on building and installing Thrift see: [Building from source](/docs/BuildingFromSource)
-
diff --git a/vendor/git.apache.org/thrift.git/doc/licenses/lgpl-2.1.txt b/vendor/git.apache.org/thrift.git/doc/licenses/lgpl-2.1.txt
deleted file mode 100644
index 5ab7695..0000000
--- a/vendor/git.apache.org/thrift.git/doc/licenses/lgpl-2.1.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    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
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/vendor/git.apache.org/thrift.git/doc/licenses/otp-base-license.txt b/vendor/git.apache.org/thrift.git/doc/licenses/otp-base-license.txt
deleted file mode 100644
index 8ee2992..0000000
--- a/vendor/git.apache.org/thrift.git/doc/licenses/otp-base-license.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Tue Oct 24 12:28:44 CDT 2006
-
-Copyright (c) <2006> <Martin J. Logan, Erlware> 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software (OTP Base, fslib, G.A.S)  and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/git.apache.org/thrift.git/doc/specs/HeaderFormat.md b/vendor/git.apache.org/thrift.git/doc/specs/HeaderFormat.md
deleted file mode 100644
index 42ec7ae..0000000
--- a/vendor/git.apache.org/thrift.git/doc/specs/HeaderFormat.md
+++ /dev/null
@@ -1,82 +0,0 @@
-<link href="http://kevinburke.bitbucket.org/markdowncss/markdown.css" rel="stylesheet"></link>
-
-Header format for the THeader.h
-===============================
-
-      0 1 2 3 4 5 6 7 8 9 a b c d e f 0 1 2 3 4 5 6 7 8 9 a b c d e f
-    +----------------------------------------------------------------+
-    | 0|                          LENGTH                             |
-    +----------------------------------------------------------------+
-    | 0|       HEADER MAGIC          |            FLAGS              |
-    +----------------------------------------------------------------+
-    |                         SEQUENCE NUMBER                        |
-    +----------------------------------------------------------------+
-    | 0|     Header Size(/32)        | ...
-    +---------------------------------
-
-                      Header is of variable size:
-                       (and starts at offset 14)
-
-    +----------------------------------------------------------------+
-    |         PROTOCOL ID  (varint)  |   NUM TRANSFORMS (varint)     |
-    +----------------------------------------------------------------+
-    |      TRANSFORM 0 ID (varint)   |        TRANSFORM 0 DATA ...
-    +----------------------------------------------------------------+
-    |         ...                              ...                   |
-    +----------------------------------------------------------------+
-    |        INFO 0 ID (varint)      |       INFO 0  DATA ...
-    +----------------------------------------------------------------+
-    |         ...                              ...                   |
-    +----------------------------------------------------------------+
-    |                                                                |
-    |                              PAYLOAD                           |
-    |                                                                |
-    +----------------------------------------------------------------+
-
-The `LENGTH` field is 32 bits, and counts the remaining bytes in the
-packet, NOT including the length field.  The header size field is 16
-bits, and defines the size of the header remaining NOT including the
-`HEADER MAGIC`, `FLAGS`, `SEQUENCE NUMBER` and header size fields.  The
-Header size field is in bytes/4.
-
-The transform ID's are varints.  The data for each transform is
-defined by the transform ID in the code - no size is given in the
-header.  If a transform ID is specified from a client and the server
-doesn't know about the transform ID, an error MUST be returned as we
-don't know how to transform the data.
-
-Conversely, data in the info headers is ignorable.  This should only
-be things like timestamps, debuging tracing, etc.  Using the header
-size you should be able to skip this data and read the payload safely
-if you don't know the info ID.
-
-Info's should be oldest supported to newest supported order, so that
-if we read an info ID we don't support, none of the remaining info
-ID's will be supported either, and we can safely skip to the payload.
-
-Info ID's and transform ID's should share the same ID space.
-
-### PADDING:
-
-Header will be padded out to next 4-byte boundary with `0x00`.
-
-Max frame size is `0x3FFFFFFF`, which is slightly less than `HTTP_MAGIC`.
-This allows us to distingush between different (older) transports.
-
-### Transform IDs:
-
-    ZLIB_TRANSFORM 0x01 - No data for this.  Use zlib to (de)compress the
-                          data.
-
-    HMAC_TRANSFORM 0x02 - Variable amount of mac data.  One byte to specify
-                          size. Mac data is appended at the end of the packet.
-    SNAPPY_TRANSFORM  0x03  - No data for this.  Use snappy to (de)compress the
-                          data.
-
-
-###Info IDs:
-
-    INFO_KEYVALUE 0x01 - varint32 number of headers.
-                       - key/value pairs of varstrings (varint16 length plus
-                         no-trailing-null string).
-
diff --git a/vendor/git.apache.org/thrift.git/doc/specs/idl.md b/vendor/git.apache.org/thrift.git/doc/specs/idl.md
deleted file mode 100644
index b7eb23c..0000000
--- a/vendor/git.apache.org/thrift.git/doc/specs/idl.md
+++ /dev/null
@@ -1,272 +0,0 @@
-## Thrift interface description language
-The Thrift interface definition language (IDL) allows for the definition of [Thrift Types](/docs/types). A Thrift IDL file is processed by the Thrift code generator to produce code for the various target languages to support the defined structs and services in the IDL file.
-
-## Description
-
-*Under construction*
-
-Here is a description of the Thrift IDL.
-
-## Document
-
-Every Thrift document contains 0 or more headers followed by 0 or more definitions.
-
-    [1]  Document        ::=  Header* Definition*
-
-## Header
-
-A header is either a Thrift include, a C++ include, or a namespace declaration.
-
-    [2]  Header          ::=  Include | CppInclude | Namespace
-
-### Thrift Include
-
-An include makes all the symbols from another file visible (with a prefix) and adds corresponding include statements into the code generated for this Thrift document.
-
-    [3]  Include         ::=  'include' Literal
-
-### C++ Include
-
-A C++ include adds a custom C++ include to the output of the C++ code generator for this Thrift document. 
-
-    [4]  CppInclude      ::=  'cpp_include' Literal
-
-### Namespace
-
-A namespace declares which namespaces/package/module/etc. the type definitions in this file will be declared in for the target languages. The namespace scope indicates which language the namespace applies to; a scope of '*' indicates that the namespace applies to all target languages.
-
-    [5]  Namespace       ::=  ( 'namespace' ( NamespaceScope Identifier ) |
-                                            ( 'smalltalk.category' STIdentifier ) |
-                                            ( 'smalltalk.prefix' Identifier ) ) |
-                              ( 'php_namespace' Literal ) |
-                              ( 'xsd_namespace' Literal )
-
-    [6]  NamespaceScope  ::=  '*' | 'cpp' | 'java' | 'py' | 'perl' | 'rb' | 'cocoa' | 'csharp'
-
-N.B.: Smalltalk has two distinct types of namespace commands:
-
-- smalltalk.prefix: Prepended to generated classnames.
-  - Smalltalk does not have namespaces for classes, so prefixes
-    are used to avoid class-name collisions.
-    Often, the prefix is the author's initials, like "KB" or "JWS",
-    or an abbreviation of the package name, like "MC" for "Monticello".
-- smalltalk.category: Determines the category for generated classes.
-  Any dots in the identifier will be replaced with hyphens when generating
-  the category name.
-  If not provided, defaults to "Generated-" + the program name.
-  Methods will not be categorized beyond "as yet uncategorized".
-  - Smalltalk allows filing both classes and methods within classes into named
-    groups. These named groups of methods are called categories.
-
-N.B.: The `php_namespace` directive will be deprecated at some point in the future in favor of the scoped syntax, but the scoped syntax is not yet supported for PHP.
-
-N.B.: The `xsd_namespace` directive has some purpose internal to Facebook but serves no purpose in Thrift itself. Use of this feature is strongly discouraged
-
-## Definition
-
-    [7]  Definition      ::=  Const | Typedef | Enum | Senum | Struct | Union | Exception | Service
-
-### Const
-
-    [8]  Const           ::=  'const' FieldType Identifier '=' ConstValue ListSeparator?
-
-### Typedef
-
-A typedef creates an alternate name for a type.
-
-    [9]  Typedef         ::=  'typedef' DefinitionType Identifier
-
-### Enum
-
-An enum creates an enumerated type, with named values. If no constant value is supplied, the value is either 0 for the first element, or one greater than the preceding value for any subsequent element. Any constant value that is supplied must be non-negative.
-
-    [10] Enum            ::=  'enum' Identifier '{' (Identifier ('=' IntConstant)? ListSeparator?)* '}'
-
-### Senum
-
-Senum (and Slist) are now deprecated and should both be replaced with String.
-
-    [11] Senum           ::=  'senum' Identifier '{' (Literal ListSeparator?)* '}'
-
-### Struct
-
-Structs are the fundamental compositional type in Thrift. The name of each field must be unique within the struct.
-
-    [12] Struct          ::=  'struct' Identifier 'xsd_all'? '{' Field* '}'
-
-N.B.: The `xsd_all` keyword has some purpose internal to Facebook but serves no purpose in Thrift itself. Use of this feature is strongly discouraged
-
-### Union
-
-Unions are similar to structs, except that they provide a means to transport exactly one field of a possible set of fields, just like union {} in C++. Consequently, union members are implicitly considered optional (see requiredness).
-
-    [13] Union          ::=  'union' Identifier 'xsd_all'? '{' Field* '}'
-
-N.B.: The `xsd_all` keyword has some purpose internal to Facebook but serves no purpose in Thrift itself. Use of this feature is strongly discouraged
-
-### Exception
-
-Exceptions are similar to structs except that they are intended to integrate with the native exception handling mechanisms in the target languages. The name of each field must be unique within the exception.
-
-    [14] Exception       ::=  'exception' Identifier '{' Field* '}'
-
-### Service
-
-A service provides the interface for a set of functionality provided by a Thrift server. The interface is simply a list of functions. A service can extend another service, which simply means that it provides the functions of the extended service in addition to its own.
-
-    [15] Service         ::=  'service' Identifier ( 'extends' Identifier )? '{' Function* '}'
-
-## Field
-
-    [16] Field           ::=  FieldID? FieldReq? FieldType Identifier ('= ConstValue)? XsdFieldOptions ListSeparator?
-
-### Field ID
-
-    [17] FieldID         ::=  IntConstant ':'
-
-### Field Requiredness
-
-There are two explicit requiredness values, and a third one that is applied implicity if neither  *required* nor *optional* are given: *default* requiredness.
-
-    [18] FieldReq        ::=  'required' | 'optional' 
-
-The general rules for requiredness are as follows:
-
-#### required
-
-- Write: Required fields are always written and are expected to be set.
-- Read: Required fields are always read and are expected to be contained in the input stream.
-- Defaults values: are always written
-
-If a required field is missing during read, the expected behaviour is to indicate an unsuccessful read operation to the caller, e.g. by throwing an exception or returning an error. 
-
-Because of this behaviour, required fields drastically limit the options with regard to soft versioning. Because they must be present on read, the fields cannot be deprecated. If a required field would be removed (or changed to optional), the data are no longer compatible between versions.
-	
-#### optional
-
-- Write: Optional fields are only written when they are set
-- Read: Optional fields may, or may not be part of the input stream. 
-- Default values: are written when the isset flag is set
-
-Most language implementations use the recommended pratice of so-called "isset" flags to indicate whether a particular optional field is set or not. Only fields with this flag set are written, and conversely the flag is only set when a field value has been read from the input stream. 
-	
-#### default requiredness (implicit)
-
-- Write: In theory, the fields are always written. There are some exceptions to that rule, see below.
-- Read: Like optional, the field may, or may not be part of the input stream. 
-- Default values: may not be written (see next section)
-
-Default requiredess is a good starting point. The desired behaviour is a mix of optional and required, hence the internal name "opt-in, req-out". Although in theory these fields are supposed to be written ("req-out"), in reality unset fields are not always written. This is especially the case, when the field contains a <null> value, which by definition cannot be transported through thrift. The only way to achieve this is by not writing that field at all, and that's what most languages do.
-	
-#### Semantics of Default Values
-
-There are ongoing discussions about that topic, see JIRA for details. Not all implementations treat default values in the very same way, but the current status quo is more or less that default fields are typically set at initialization time. Therefore, a value that equals the default may not be written, because the read end will set the value implicitly. On the other hand, an implementation is free to write the default value anyways, as there is no hard restriction that prevents this. 
-
-The major point to keep in mind here is the fact, that any unwritten default value implicitly becomes part of the interface version. If that default is changed, the interface changes. If, in contrast, the default value is written into the output data, the default in the IDL can change at any time without affecting serialized data.
-
-### XSD Options
-
-N.B.: These have  some internal purpose at Facebook but serve no current purpose in Thrift. Use of these options is strongly discouraged.
-
-    [19] XsdFieldOptions ::=  'xsd_optional'? 'xsd_nillable'? XsdAttrs?
-
-    [20] XsdAttrs        ::=  'xsd_attrs' '{' Field* '}'
-
-## Functions
-
-    [21] Function        ::=  'oneway'? FunctionType Identifier '(' Field* ')' Throws? ListSeparator?
-
-    [22] FunctionType    ::=  FieldType | 'void'
-
-    [23] Throws          ::=  'throws' '(' Field* ')'
-
-## Types
-
-    [24] FieldType       ::=  Identifier | BaseType | ContainerType
-
-    [25] DefinitionType  ::=  BaseType | ContainerType
-
-    [26] BaseType        ::=  'bool' | 'byte' | 'i8' | 'i16' | 'i32' | 'i64' | 'double' | 'string' | 'binary' | 'slist'
-
-    [27] ContainerType   ::=  MapType | SetType | ListType
-
-    [28] MapType         ::=  'map' CppType? '<' FieldType ',' FieldType '>'
-
-    [29] SetType         ::=  'set' CppType? '<' FieldType '>'
-
-    [30] ListType        ::=  'list' '<' FieldType '>' CppType?
-
-    [31] CppType         ::=  'cpp_type' Literal
-
-## Constant Values
-
-    [32] ConstValue      ::=  IntConstant | DoubleConstant | Literal | Identifier | ConstList | ConstMap
-
-    [33] IntConstant     ::=  ('+' | '-')? Digit+
-
-    [34] DoubleConstant  ::=  ('+' | '-')? Digit* ('.' Digit+)? ( ('E' | 'e') IntConstant )?
-
-    [35] ConstList       ::=  '[' (ConstValue ListSeparator?)* ']'
-
-    [36] ConstMap        ::=  '{' (ConstValue ':' ConstValue ListSeparator?)* '}'
-
-## Basic Definitions
-
-### Literal
-
-    [37] Literal         ::=  ('"' [^"]* '"') | ("'" [^']* "'")
-
-### Identifier
-
-    [38] Identifier      ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' )*
-
-    [39] STIdentifier    ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' | '-' )*
-
-### List Separator
-
-    [40] ListSeparator   ::=  ',' | ';'
-
-### Letters and Digits
-
-    [41] Letter          ::=  ['A'-'Z'] | ['a'-'z']
-
-    [42] Digit           ::=  ['0'-'9']
-
-## Examples
-
-Here are some examples of Thrift definitions, using the Thrift IDL:
-
- * [ThriftTest.thrift][] used by the Thrift TestFramework
- * Thrift [tutorial][]
- * Facebook's [fb303.thrift][]
- * [Apache Cassandra's][] Thrift IDL: [cassandra.thrift][]
- * [Evernote API][]
-
- [ThriftTest.thrift]:  https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob_plain;f=test/ThriftTest.thrift;hb=HEAD
- [tutorial]:           /tutorial/
- [fb303.thrift]:       https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob_plain;f=contrib/fb303/if/fb303.thrift;hb=HEAD
- [Apache Cassandra's]: http://cassandra.apache.org/
- [cassandra.thrift]:   http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.thrift?view=co
- [Evernote API]:       http://www.evernote.com/about/developer/api/
-
-## To Do/Questions
-
-Initialization of Base Types for all Languages?
-
- * Do all Languages initialize them to 0, bool=false and string=""? or null, undefined?
-
-Why does position of `CppType` vary between `SetType` and `ListType`?
-
- * std::set does sort the elements automatically, that's the design. see [Thrift Types](/docs/types) or the [C++ std:set reference][] for further details
- * The question is, how other languages are doing that? What about custom objects, do they have a Compare function the set the order correctly?
-
- [C++ std:set reference]: http://www.cplusplus.com/reference/stl/set/
-
-Why can't `DefinitionType` be the same as `FieldType` (i.e. include `Identifier`)?
-
-Examine the `smalltalk.prefix` and `smalltalk.category` status (esp `smalltalk.category`, which takes `STIdentifier` as its argument)...
-
-What to do about `ListSeparator`? Do we really want to be as lax as we currently are?
-
-Should `Field*` really be `Field+` in `Struct`, `Enum`, etc.?
-
diff --git a/vendor/git.apache.org/thrift.git/doc/specs/thrift-binary-protocol.md b/vendor/git.apache.org/thrift.git/doc/specs/thrift-binary-protocol.md
deleted file mode 100644
index a852685..0000000
--- a/vendor/git.apache.org/thrift.git/doc/specs/thrift-binary-protocol.md
+++ /dev/null
@@ -1,254 +0,0 @@
-Thrift Binary protocol encoding 
-===============================
-
-<!--
---------------------------------------------------------------------
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
---------------------------------------------------------------------
--->
-
-This documents describes the wire encoding for RPC using the older Thrift *binary protocol*.
-
-The information here is _mostly_ based on the Java implementation in the Apache thrift library (version 0.9.1 and
-0.9.3). Other implementation however, should behave the same.
-
-For background on Thrift see the [Thrift whitepaper (pdf)](https://thrift.apache.org/static/files/thrift-20070401.pdf).
-
-# Contents
-
-* Binary protocol
-  * Base types
-  * Message
-  * Struct
-  * List and Set
-  * Map
-* BNF notation used in this document
-
-# Binary protocol
-
-## Base types
-
-### Integer encoding
-
-In the _binary protocol_ integers are encoded with the most significant byte first (big endian byte order, aka network
-order). An `int8` needs 1 byte, an `int16` 2, an `int32` 4 and an `int64` needs 8 bytes.
-
-The CPP version has the option to use the binary protocol with little endian order. Little endian gives a small but
-noticeable performance boost because contemporary CPUs use little endian when storing integers to RAM.
-
-### Enum encoding
-
-The generated code encodes `Enum`s by taking the ordinal value and then encoding that as an int32.
-
-### Binary encoding
-
-Binary is sent as follows:
-
-```
-Binary protocol, binary data, 4+ bytes:
-+--------+--------+--------+--------+--------+...+--------+
-| byte length                       | bytes                |
-+--------+--------+--------+--------+--------+...+--------+
-```
-
-Where:
-
-* `byte length` is the length of the byte array, a signed 32 bit integer encoded in network (big endian) order (must be >= 0).
-* `bytes` are the bytes of the byte array.
-
-### String encoding
-
-*String*s are first encoded to UTF-8, and then send as binary.
-
-### Double encoding
-
-Values of type `double` are first converted to an int64 according to the IEEE 754 floating-point "double format" bit
-layout. Most run-times provide a library to make this conversion. Both the binary protocol as the compact protocol then
-encode the int64 in 8 bytes in big endian order.
-
-### Boolean encoding
-
-Values of `bool` type are first converted to an int8. True is converted to `1`, false to `0`.
-
-## Message
-
-A `Message` can be encoded in two different ways:
-
-```
-Binary protocol Message, strict encoding, 12+ bytes:
-+--------+--------+--------+--------+--------+--------+--------+--------+--------+...+--------+--------+--------+--------+--------+
-|1vvvvvvv|vvvvvvvv|unused  |00000mmm| name length                       | name                | seq id                            |
-+--------+--------+--------+--------+--------+--------+--------+--------+--------+...+--------+--------+--------+--------+--------+
-```
-
-Where:
-
-* `vvvvvvvvvvvvvvv` is the version, an unsigned 15 bit number fixed to `1` (in binary: `000 0000 0000 0001`).
-  The leading bit is `1`.
-* `unused` is an ignored byte.
-* `mmm` is the message type, an unsigned 3 bit integer. The 5 leading bits must be `0` as some clients (checked for
-  java in 0.9.1) take the whole byte.
-* `name length` is the byte length of the name field, a signed 32 bit integer encoded in network (big endian) order (must be >= 0).
-* `name` is the method name, a UTF-8 encoded string.
-* `seq id` is the sequence id, a signed 32 bit integer encoded in network (big endian) order.
-
-The second, older encoding (aka non-strict) is:
-
-```
-Binary protocol Message, old encoding, 9+ bytes:
-+--------+--------+--------+--------+--------+...+--------+--------+--------+--------+--------+--------+
-| name length                       | name                |00000mmm| seq id                            |
-+--------+--------+--------+--------+--------+...+--------+--------+--------+--------+--------+--------+
-```
-
-Where `name length`, `name`, `mmm`, `seq id` are as above.
-
-Because `name length` must be positive (therefore the first bit is always `0`), the first bit allows the receiver to see
-whether the strict format or the old format is used. Therefore a server and client using the different variants of the
-binary protocol can transparently talk with each other. However, when strict mode is enforced, the old format is
-rejected.
-
-Message types are encoded with the following values:
-
-* _Call_: 1
-* _Reply_: 2
-* _Exception_: 3
-* _Oneway_: 4
-
-## Struct
-
-A *Struct* is a sequence of zero or more fields, followed by a stop field. Each field starts with a field header and
-is followed by the encoded field value. The encoding can be summarized by the following BNF:
-
-```
-struct        ::= ( field-header field-value )* stop-field
-field-header  ::= field-type field-id
-```
-
-Because each field header contains the field-id (as defined by the Thrift IDL file), the fields can be encoded in any
-order. Thrift's type system is not extensible; you can only encode the primitive types and structs. Therefore is also
-possible to handle unknown fields while decoding; these are simply ignored. While decoding the field type can be used to
-determine how to decode the field value.
-
-Note that the field name is not encoded so field renames in the IDL do not affect forward and backward compatibility.
-
-The default Java implementation (Apache Thrift 0.9.1) has undefined behavior when it tries to decode a field that has
-another field-type then what is expected. Theoretically this could be detected at the cost of some additional checking.
-Other implementation may perform this check and then either ignore the field, or return a protocol exception.
-
-A *Union* is encoded exactly the same as a struct with the additional restriction that at most 1 field may be encoded.
-
-An *Exception* is encoded exactly the same as a struct.
-
-### Struct encoding
-
-In the binary protocol field headers and the stop field are encoded as follows:
-
-```
-Binary protocol field header and field value:
-+--------+--------+--------+--------+...+--------+
-|tttttttt| field id        | field value         |
-+--------+--------+--------+--------+...+--------+
-
-Binary protocol stop field:
-+--------+
-|00000000|
-+--------+
-```
-
-Where:
-
-* `tttttttt` the field-type, a signed 8 bit integer.
-* `field id` the field-id, a signed 16 bit integer in big endian order.
-* `field-value` the encoded field value.
-
-The following field-types are used:
-
-* `BOOL`, encoded as `2`
-* `BYTE`, encoded as `3`
-* `DOUBLE`, encoded as `4`
-* `I16`, encoded as `6`
-* `I32`, encoded as `8`
-* `I64`, encoded as `10`
-* `STRING`, used for binary and string fields, encoded as `11`
-* `STRUCT`, used for structs and union fields, encoded as `12`
-* `MAP`, encoded as `13`
-* `SET`, encoded as `14`
-* `LIST`, encoded as `15`
-
-## List and Set
-
-List and sets are encoded the same: a header indicating the size and the element-type of the elements, followed by the
-encoded elements.
-
-```
-Binary protocol list (5+ bytes) and elements:
-+--------+--------+--------+--------+--------+--------+...+--------+
-|tttttttt| size                              | elements            |
-+--------+--------+--------+--------+--------+--------+...+--------+
-```
-
-Where:
-
-* `tttttttt` is the element-type, encoded as an int8
-* `size` is the size, encoded as an int32, positive values only
-* `elements` the element values
-
-The element-type values are the same as field-types. The full list is included in the struct section above.
-
-The maximum list/set size is configurable. By default there is no limit (meaning the limit is the maximum int32 value:
-2147483647).
-
-## Map
-
-Maps are encoded with a header indicating the size, the element-type of the keys and the element-type of the elements,
-followed by the encoded elements. The encoding follows this BNF:
-
-```
-map  ::=  key-element-type value-element-type size ( key value )*
-```
-
-```
-Binary protocol map (6+ bytes) and key value pairs:
-+--------+--------+--------+--------+--------+--------+--------+...+--------+
-|kkkkkkkk|vvvvvvvv| size                              | key value pairs     |
-+--------+--------+--------+--------+--------+--------+--------+...+--------+
-```
-
-Where:
-
-* `kkkkkkkk` is the key element-type, encoded as an int8
-* `vvvvvvvv` is the value element-type, encoded as an int8
-* `size` is the size of the map, encoded as an int32, positive values only
-* `key value pairs` are the encoded keys and values
-
-The element-type values are the same as field-types. The full list is included in the struct section above.
-
-The maximum map size is configurable. By default there is no limit (meaning the limit is the maximum int32 value:
-2147483647).
-
-# BNF notation used in this document
-
-The following BNF notation is used:
-
-* a plus `+` appended to an item represents repetition; the item is repeated 1 or more times
-* a star `*` appended to an item represents optional repetition; the item is repeated 0 or more times
-* a pipe `|` between items represents choice, the first matching item is selected
-* parenthesis `(` and `)` are used for grouping multiple items
diff --git a/vendor/git.apache.org/thrift.git/doc/specs/thrift-compact-protocol.md b/vendor/git.apache.org/thrift.git/doc/specs/thrift-compact-protocol.md
deleted file mode 100644
index d2e18a9..0000000
--- a/vendor/git.apache.org/thrift.git/doc/specs/thrift-compact-protocol.md
+++ /dev/null
@@ -1,294 +0,0 @@
-Thrift Compact protocol encoding 
-================================
-
-<!--
---------------------------------------------------------------------
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
---------------------------------------------------------------------
--->
-
-This documents describes the wire encoding for RPC using the Thrift *compact protocol*.
-
-The information here is _mostly_ based on the Java implementation in the Apache thrift library (version 0.9.1) and
-[THRIFT-110 A more compact format](https://issues.apache.org/jira/browse/THRIFT-110). Other implementation however,
-should behave the same.
-
-For background on Thrift see the [Thrift whitepaper (pdf)](https://thrift.apache.org/static/files/thrift-20070401.pdf).
-
-# Contents
-
-* Compact protocol
-  * Base types
-  * Message
-  * Struct
-  * List and Set
-  * Map
-* BNF notation used in this document
-
-# Compact protocol
-
-## Base types
-
-### Integer encoding
-
-The _compact protocol_ uses multiple encodings for ints: the _zigzag int_, and the _var int_.
-
-Values of type `int32` and `int64` are first transformed to a *zigzag int*. A zigzag int folds positive and negative
-numbers into the positive number space. When we read 0, 1, 2, 3, 4 or 5 from the wire, this is translated to 0, -1, 1,
--2 or 2 respectively. Here are the (Scala) formulas to convert from int32/int64 to a zigzag int and back:
-
-```scala
-def intToZigZag(n: Int): Int = (n << 1) ^ (n >> 31)
-def zigzagToInt(n: Int): Int = (n >>> 1) ^ - (n & 1)
-def longToZigZag(n: Long): Long = (n << 1) ^ (n >> 63)
-def zigzagToLong(n: Long): Long = (n >>> 1) ^ - (n & 1)
-```
-
-The zigzag int is then encoded as a *var int*. Var ints take 1 to 5 bytes (int32) or 1 to 10 bytes (int64). The most
-significant bit of each byte indicates if more bytes follow. The concatenation of the least significant 7 bits from each
-byte form the number, where the first byte has the most significant bits (so they are in big endian or network order).
-
-Var ints are sometimes used directly inside the compact protocol to represent positive numbers.
-
-To encode an `int16` as zigzag int, it is first converted to an `int32` and then encoded as such. The type `int8` simply
-uses a single byte as in the binary protocol.
-
-### Enum encoding
-
-The generated code encodes `Enum`s by taking the ordinal value and then encoding that as an int32.
-
-### Binary encoding
-
-Binary is sent as follows:
-
-```
-Binary protocol, binary data, 1+ bytes:
-+--------+...+--------+--------+...+--------+
-| byte length         | bytes               |
-+--------+...+--------+--------+...+--------+
-```
-
-Where:
-
-* `byte length` is the length of the byte array, using var int encoding (must be >= 0).
-* `bytes` are the bytes of the byte array.
-
-### String encoding
-
-*String*s are first encoded to UTF-8, and then send as binary.
-
-### Double encoding
-
-Values of type `double` are first converted to an int64 according to the IEEE 754 floating-point "double format" bit
-layout. Most run-times provide a library to make this conversion. Both the binary protocol as the compact protocol then
-encode the int64 in 8 bytes in big endian order.
-
-### Boolean encoding
-
-Booleans are encoded differently depending on whether it is a field value (in a struct) or an element value (in a set,
-list or map). Field values are encoded directly in the field header. Element values of type `bool` are sent as an int8;
-true as `1` and false as `0`.
-
-## Message
-
-A `Message` on the wire looks as follows:
-
-```
-Compact protocol Message (4+ bytes):
-+--------+--------+--------+...+--------+--------+...+--------+--------+...+--------+
-|pppppppp|mmmvvvvv| seq id              | name length         | name                |
-+--------+--------+--------+...+--------+--------+...+--------+--------+...+--------+
-```
-
-Where:
-
-* `pppppppp` is the protocol id, fixed to `1000 0010`, 0x82.
-* `mmm` is the message type, an unsigned 3 bit integer.
-* `vvvvv` is the version, an unsigned 5 bit integer, fixed to `00001`.
-* `seq id` is the sequence id, a signed 32 bit integer encoded as a var int.
-* `name length` is the byte length of the name field, a signed 32 bit integer encoded as a var int (must be >= 0).
-* `name` is the method name to invoke, a UTF-8 encoded string.
-
-Message types are encoded with the following values:
-
-* _Call_: 1
-* _Reply_: 2
-* _Exception_: 3
-* _Oneway_: 4
-
-### Struct
-
-A *Struct* is a sequence of zero or more fields, followed by a stop field. Each field starts with a field header and
-is followed by the encoded field value. The encoding can be summarized by the following BNF:
-
-```
-struct        ::= ( field-header field-value )* stop-field
-field-header  ::= field-type field-id
-```
-
-Because each field header contains the field-id (as defined by the Thrift IDL file), the fields can be encoded in any
-order. Thrift's type system is not extensible; you can only encode the primitive types and structs. Therefore is also
-possible to handle unknown fields while decoding; these are simply ignored. While decoding the field type can be used to
-determine how to decode the field value.
-
-Note that the field name is not encoded so field renames in the IDL do not affect forward and backward compatibility.
-
-The default Java implementation (Apache Thrift 0.9.1) has undefined behavior when it tries to decode a field that has
-another field-type then what is expected. Theoretically this could be detected at the cost of some additional checking.
-Other implementation may perform this check and then either ignore the field, or return a protocol exception.
-
-A *Union* is encoded exactly the same as a struct with the additional restriction that at most 1 field may be encoded.
-
-An *Exception* is encoded exactly the same as a struct.
-
-### Struct encoding
-
-```
-Compact protocol field header (short form) and field value:
-+--------+--------+...+--------+
-|ddddtttt| field value         |
-+--------+--------+...+--------+
-
-Compact protocol field header (1 to 3 bytes, long form) and field value:
-+--------+--------+...+--------+--------+...+--------+
-|0000tttt| field id            | field value         |
-+--------+--------+...+--------+--------+...+--------+
-
-Compact protocol stop field:
-+--------+
-|00000000|
-+--------+
-```
-
-Where:
-
-* `dddd` is the field id delta, an unsigned 4 bits integer, strictly positive.
-* `tttt` is field-type id, an unsigned 4 bit integer.
-* `field id` the field id, a signed 16 bit integer encoded as zigzag int.
-* `field-value` the encoded field value.
-
-The field id delta can be computed by `current-field-id - previous-field-id`, or just `current-field-id` if this is the
-first of the struct. The short form should be used when the field id delta is in the range 1 - 15 (inclusive).
-
-The following field-types can be encoded:
-
-* `BOOLEAN_TRUE`, encoded as `1`
-* `BOOLEAN_FALSE`, encoded as `2`
-* `BYTE`, encoded as `3`
-* `I16`, encoded as `4`
-* `I32`, encoded as `5`
-* `I64`, encoded as `6`
-* `DOUBLE`, encoded as `7`
-* `BINARY`, used for binary and string fields, encoded as `8`
-* `LIST`, encoded as `9`
-* `SET`, encoded as `10`
-* `MAP`, encoded as `11`
-* `STRUCT`, used for both structs and union fields, encoded as `12`
-
-Note that because there are 2 specific field types for the boolean values, the encoding of a boolean field value has no
-length (0 bytes).
-
-## List and Set
-
-List and sets are encoded the same: a header indicating the size and the element-type of the elements, followed by the
-encoded elements.
-
-```
-Compact protocol list header (1 byte, short form) and elements:
-+--------+--------+...+--------+
-|sssstttt| elements            |
-+--------+--------+...+--------+
-
-Compact protocol list header (2+ bytes, long form) and elements:
-+--------+--------+...+--------+--------+...+--------+
-|1111tttt| size                | elements            |
-+--------+--------+...+--------+--------+...+--------+
-```
-
-Where:
-
-* `ssss` is the size, 4 bit unsigned int, values `0` - `14`
-* `tttt` is the element-type, a 4 bit unsigned int
-* `size` is the size, a var int (int32), positive values `15` or higher
-* `elements` are the encoded elements
-
-The short form should be used when the length is in the range 0 - 14 (inclusive).
-
-The following element-types are used (note that these are _different_ from the field-types):
-
-* `BOOL`, encoded as `2`
-* `BYTE`, encoded as `3`
-* `DOUBLE`, encoded as `4`
-* `I16`, encoded as `6`
-* `I32`, encoded as `8`
-* `I64`, encoded as `10`
-* `STRING`, used for binary and string fields, encoded as `11`
-* `STRUCT`, used for structs and union fields, encoded as `12`
-* `MAP`, encoded as `13`
-* `SET`, encoded as `14`
-* `LIST`, encoded as `15`
-
-
-The maximum list/set size is configurable. By default there is no limit (meaning the limit is the maximum int32 value:
-2147483647).
-
-## Map
-
-Maps are encoded with a header indicating the size, the type of the keys and the element-type of the elements, followed
-by the encoded elements. The encoding follows this BNF:
-
-```
-map           ::= empty-map | non-empty-map
-empty-map     ::= `0`
-non-empty-map ::= size key-element-type value-element-type (key value)+
-```
-
-```
-Compact protocol map header (1 byte, empty map):
-+--------+
-|00000000|
-+--------+
-
-Compact protocol map header (2+ bytes, non empty map) and key value pairs:
-+--------+...+--------+--------+--------+...+--------+
-| size                |kkkkvvvv| key value pairs     |
-+--------+...+--------+--------+--------+...+--------+
-```
-
-Where:
-
-* `size` is the size, a var int (int32), strictly positive values
-* `kkkk` is the key element-type, a 4 bit unsigned int
-* `vvvv` is the value element-type, a 4 bit unsigned int
-* `key value pairs` are the encoded keys and values
-
-The element-types are the same as for lists. The full list is included in the 'List and set' section.
-
-The maximum map size is configurable. By default there is no limit (meaning the limit is the maximum int32 value:
-2147483647).
-
-# BNF notation used in this document
-
-The following BNF notation is used:
-
-* a plus `+` appended to an item represents repetition; the item is repeated 1 or more times
-* a star `*` appended to an item represents optional repetition; the item is repeated 0 or more times
-* a pipe `|` between items represents choice, the first matching item is selected
-* parenthesis `(` and `)` are used for grouping multiple items
diff --git a/vendor/git.apache.org/thrift.git/doc/specs/thrift-protocol-spec.md b/vendor/git.apache.org/thrift.git/doc/specs/thrift-protocol-spec.md
deleted file mode 100644
index 0c1a61c..0000000
--- a/vendor/git.apache.org/thrift.git/doc/specs/thrift-protocol-spec.md
+++ /dev/null
@@ -1,101 +0,0 @@
-Thrift Protocol Structure
-====================================================================
-
-Last Modified: 2007-Jun-29
-
-<!--
---------------------------------------------------------------------
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
---------------------------------------------------------------------
--->
-
-This document describes the structure of the Thrift protocol
-without specifying the encoding. Thus, the order of elements
-could in some cases be rearranged depending upon the TProtocol
-implementation, but this document specifies the minimum required
-structure. There are some "dumb" terminals like STRING and INT
-that take the place of an actual encoding specification.
-
-They key point to notice is that ALL messages are just one wrapped
-`<struct>`. Depending upon the message type, the `<struct>` can be
-interpreted as the argument list to a function, the return value
-of a function, or an exception.
-
---------------------------------------------------------------------
-
-```
-       <message> ::= <message-begin> <struct> <message-end>
-
- <message-begin> ::= <method-name> <message-type> <message-seqid>
-
-   <method-name> ::= STRING
-
-  <message-type> ::= T_CALL | T_REPLY | T_EXCEPTION | T_ONEWAY
-
- <message-seqid> ::= I32
-
-        <struct> ::= <struct-begin> <field>* <field-stop> <struct-end>
-
-  <struct-begin> ::= <struct-name>
-
-   <struct-name> ::= STRING
-
-    <field-stop> ::= T_STOP
-
-         <field> ::= <field-begin> <field-data> <field-end>
-
-   <field-begin> ::= <field-name> <field-type> <field-id>
-
-    <field-name> ::= STRING
-
-    <field-type> ::= T_BOOL | T_BYTE | T_I8 | T_I16 | T_I32 | T_I64 | T_DOUBLE
-                     | T_STRING | T_BINARY | T_STRUCT | T_MAP | T_SET | T_LIST
-
-      <field-id> ::= I16
-
-    <field-data> ::= I8 | I16 | I32 | I64 | DOUBLE | STRING | BINARY
-                     <struct> | <map> | <list> | <set>
-
-           <map> ::= <map-begin> <field-datum>* <map-end>
-
-     <map-begin> ::= <map-key-type> <map-value-type> <map-size>
-
-  <map-key-type> ::= <field-type>
-
-<map-value-type> ::= <field-type>
-
-      <map-size> ::= I32
-
-          <list> ::= <list-begin> <field-data>* <list-end>
-
-    <list-begin> ::= <list-elem-type> <list-size>
-
-<list-elem-type> ::= <field-type>
-
-     <list-size> ::= I32
-
-           <set> ::= <set-begin> <field-data>* <set-end>
-
-     <set-begin> ::= <set-elem-type> <set-size>
-
- <set-elem-type> ::= <field-type>
-
-      <set-size> ::= I32
-```
diff --git a/vendor/git.apache.org/thrift.git/doc/specs/thrift-rpc.md b/vendor/git.apache.org/thrift.git/doc/specs/thrift-rpc.md
deleted file mode 100644
index d45c06f..0000000
--- a/vendor/git.apache.org/thrift.git/doc/specs/thrift-rpc.md
+++ /dev/null
@@ -1,178 +0,0 @@
-Thrift Remote Procedure Call
-============================
-
-<!--
---------------------------------------------------------------------
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
---------------------------------------------------------------------
--->
-
-This document describes the high level message exchange between the Thrift RPC client and server.
-See [thrift-binary-protocol.md] and [thrift-compact-protocol.md] for a description of how the exchanges are encoded on
-the wire.
-
-In addition, this document compares the binary protocol with the compact protocol. Finally it describes the framed vs.
-unframed transport.
-
-The information here is _mostly_ based on the Java implementation in the Apache thrift library (version 0.9.1 and
-0.9.3). Other implementation however, should behave the same.
-
-For background on Thrift see the [Thrift whitepaper (pdf)](https://thrift.apache.org/static/files/thrift-20070401.pdf).
-
-# Contents
-
-* Thrift Message exchange for Remote Procedure Call
-  * Message
-  * Request struct
-  * Response struct
-* Protocol considerations
-  * Comparing binary and compact protocol
-  * Compatibility
-  * Framed vs unframed transport
-
-# Thrift Remote Procedure Call Message exchange
-
-Both the binary protocol and the compact protocol assume a transport layer that exposes a bi-directional byte stream,
-for example a TCP socket. Both use the following exchange:
-
-1. Client sends a `Message` (type `Call` or `Oneway`). The TMessage contains some metadata and the name of the method
-   to invoke.
-2. Client sends method arguments (a struct defined by the generate code).
-3. Server sends a `Message` (type `Reply` or `Exception`) to start the response.
-4. Server sends a struct containing the method result or exception.
-
-The pattern is a simple half duplex protocol where the parties alternate in sending a `Message` followed by a struct.
-What these are is described below.
-
-Although the standard Apache Thrift Java clients do not support pipelining (sending multiple requests without waiting
-for an response), the standard Apache Thrift Java servers do support it.
-
-## Message
-
-A *Message* contains:
-
-* _Name_, a string (can be empty).
-* _Message type_, a message types, one of `Call`, `Reply`, `Exception` and `Oneway`.
-* _Sequence id_, a signed int32 integer.
-
-The *sequence id* is a simple message id assigned by the client. The server will use the same sequence id in the
-message of the response. The client uses this number to detect out of order responses. Each client has an int32 field
-which is increased for each message. The sequence id simply wraps around when it overflows.
-
-The *name* indicates the service method name to invoke. The server copies the name in the response message.
-
-When the *multiplexed protocol* is used, the name contains the service name, a colon `:` and the method name. The
-multiplexed protocol is not compatible with other protocols.
-
-The *message type* indicates what kind of message is sent. Clients send requests with TMessages of type `Call` or
-`Oneway` (step 1 in the protocol exchange). Servers send responses with messages of type `Exception` or `Reply` (step
-3).
-
-Type `Reply` is used when the service method completes normally. That is, it returns a value or it throws one of the
-exceptions defined in the Thrift IDL file.
-
-Type `Exception` is used for other exceptions. That is: when the service method throws an exception that is not declared
-in the Thrift IDL file, or some other part of the Thrift stack throws an exception. For example when the server could
-not encode or decode a message or struct.
-
-In the Java implementation (0.9.3) there is different behavior for the synchronous and asynchronous server. In the async
-server all exceptions are send as a `TApplicationException` (see 'Response struct' below). In the synchronous Java
-implementation only (undeclared) exceptions that extend `TException` are send as a `TApplicationException`. Unchecked
-exceptions lead to an immediate close of the connection.
-
-Type `Oneway` is only used starting from Apache Thrift 0.9.3. Earlier versions do _not_ send TMessages of type `Oneway`,
-even for service methods defined with the `oneway` modifier.
-
-When client sends a request with type `Oneway`, the server must _not_ send a response (steps 3 and 4 are skipped). Note
-that the Thrift IDL enforces a return type of `void` and does not allow exceptions for oneway services.
-
-## Request struct
-
-The struct that follows the message of type `Call` or `Oneway` contains the arguments of the service method. The
-argument ids correspond to the field ids. The name of the struct is the name of the method with `_args` appended.
-For methods without arguments an struct is sent without fields.
-
-## Response struct
-
-The struct that follows the message of type `Reply` are structs in which exactly 1 of the following fields is encoded:
-
-* A field with name `success` and id `0`, used in case the method completed normally.
-* An exception field, name and id are as defined in the `throws` clause in the Thrift IDL's service method definition.
-
-When the message is of type `Exception` the struct is encoded as if it was declared by the following IDL:
-
-```
-exception TApplicationException {
-  1: string message,
-  2: i32 type
-}
-```
-
-The following exception types are defined in the java implementation (0.9.3):
-
-* _unknown_: 0, used in case the type from the peer is unknown.
-* _unknown method_: 1, used in case the method requested by the client is unknown by the server.
-* _invalid message type_: 2, no usage was found.
-* _wrong method name_: 3, no usage was found.
-* _bad sequence id_: 4, used internally by the client to indicate a wrong sequence id in the response.
-* _missing result_: 5, used internally by the client to indicate a response without any field (result nor exception).
-* _internal error_: 6, used when the server throws an exception that is not declared in the Thrift IDL file. 
-* _protocol error_: 7, used when something goes wrong during decoding. For example when a list is too long or a required
- field is missing. 
-* _invalid transform_: 8, no usage was found.
-* _invalid protocol_: 9, no usage was found.
-* _unsupported client type_: 10, no usage was found.
-
-# Protocol considerations
-
-## Comparing binary and compact protocol
-
-The binary protocol is fairly simple and therefore easy to process. The compact protocol needs less bytes to send the
-same data at the cost of additional processing. As bandwidth is usually the bottleneck, the compact protocol is almost
-always slightly faster.
-
-## Compatibility
-
-A server could automatically determine whether a client talks the binary protocol or the compact protocol by
-investigating the first byte. If the value is `1000 0001` or `0000 0000` (assuming a name shorter then ±16 MB) it is the
-binary protocol. When the value is `1000 0010` it is talking the compact protocol.
-
-## Framed vs. unframed transport
-
-The first thrift binary wire format was unframed. This means that information is sent out in a single stream of bytes.
-With unframed transport the (generated) processors will read directly from the socket (though Apache Thrift does try to
-grab all available bytes from the socket in a buffer when it can).
-
-Later, Thrift introduced the framed transport.
-
-With framed transport the full request and response (the TMessage and the following struct) are first written to a
-buffer. Then when the struct is complete (transport method `flush` is hijacked for this), the length of the buffer is
-written to the socket first, followed by the buffered bytes. The combination is called a _frame_. On the receiver side
-the complete frame is first read in a buffer before the message is passed to a processor.
-
-The length prefix is a 4 byte signed int, send in network (big endian) order.
-The following must be true: `0` <= length <= `16384000` (16M).
-
-Framed transport was introduced to ease the implementation of async processors. An async processor is only invoked when
-all data is received. Unfortunately, framed transport is not ideal for large messages as the entire frame stays in
-memory until the message has been processed. In addition, the java implementation merges the incoming data to a single,
-growing byte array. Every time the byte array is full it needs to be copied to a new larger byte array.
-
-Framed and unframed transports are not compatible with each other.
diff --git a/vendor/git.apache.org/thrift.git/doc/specs/thrift-sasl-spec.txt b/vendor/git.apache.org/thrift.git/doc/specs/thrift-sasl-spec.txt
deleted file mode 100644
index 02cf79e..0000000
--- a/vendor/git.apache.org/thrift.git/doc/specs/thrift-sasl-spec.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-A Thrift SASL message shall be a byte array of the following form:
-
-| 1-byte status code | 4-byte payload length | variable-length payload |
-
-The length fields shall be interpreted as integers, with the high byte sent
-first. This indicates the length of the field immediately following it, not
-including the status code or the length bytes.
-
-The possible status codes are:
-
-0x01 - START - Hello, let's go on a date.
-0x02 - OK - Everything's been going alright so far, let's see each other again.
-0x03 - BAD - I understand what you're saying. I really do. I just don't like it. We have to break up.
-0x04 - ERROR - We can't go on like this. It's like you're speaking another language.
-0x05 - COMPLETE - Will you marry me?
-
-The Thrift SASL communication will proceed as follows:
-
-1. The client is configured at instantiation of the transport with a single
-underlying SASL security mechanism that it supports.
-
-2. The server is configured with a mapping of underlying security mechanism
-name -> mechanism options.
-
-3. At connection time, the client will initiate communication by sending the
-server a START message. The payload of this message will be the name of the
-underlying security mechanism that the client would like to use.
-This mechanism name shall be 1-20 characters in length, and follow the
-specifications for SASL mechanism names specified in RFC 2222.
-
-4. The server receives this message and, if the mechanism name provided is
-among the set of mechanisms this server transport is configured to accept,
-appropriate initialization of the underlying security mechanism may take place.
-If the mechanism name is not one which the server is configured to support, the
-server shall return the BAD byte, followed by a 4-byte, potentially zero-value
-message length, followed by the potentially zero-length payload which may be a
-status code or message indicating failure. No further communication may take
-place via this transport. If the mechanism name is one which the server
-supports, then proceed to step 5.
-
-5. Following the START message, the client must send another message containing
-the "initial response" of the chosen SASL implementation. The client may send
-this message piggy-backed on the "START" message of step 3. The message type
-of this message must be either "OK" or "COMPLETE", depending on whether the
-SASL implementation indicates that this side of the authentication has been
-satisfied.
-
-6. The server then provides the byte array of the payload received to its
-underlying security mechanism. A challenge is generated by the underlying
-security mechanism on the server, and this is used as the payload for a message
-sent to the client. This message shall consist of an OK byte, followed by the
-non-zero message length word, followed by the payload.
-
-7. The client receives this message from the server and passes the payload to
-its underlying security mechanism to generate a response. The client then sends
-the server an OK byte, followed by the non-zero-value length of the response,
-followed by the bytes of the response as the payload.
-
-8. Steps 6 and 7 are repeated until both security mechanisms are satisfied with
-the challenge/response exchange. When either side has completed its security
-protocol, its next message shall be the COMPLETE byte, followed by a 4-byte
-potentially zero-value length word, followed by a potentially zero-length
-payload. This payload will be empty except for those underlying security
-mechanisms which provide additional data with success.
-
-If at any point in time either side is able to interpret the challenge or
-response sent by the other, but is dissatisfied with the contents thereof, this
-side should send the other a BAD byte, followed by a 4-byte potentially
-zero-value length word, followed by an optional, potentially zero-length
-message encoded in UTF-8 indicating failure. This message should be passed to
-the protocol above the thrift transport by whatever mechanism is appropriate
-and idiomatic for the particular language these thrift bindings are for.
-
-If at any point in time either side fails to interpret the challenge or
-response sent by the other, this side should send the other an ERROR byte,
-followed by a 4-byte potentially zero-value length word, followed by an
-optional, potentially zero-length message encoded in UTF-8. This message should
-be passed to the protocol above the thrift transport by whatever mechanism is
-appropriate and idiomatic for the particular language these thrift bindings are
-for.
-
-If step 8 completes successfully, then the communication is considered
-authenticated and subsequent communication may commence.
-
-If step 8 fails to complete successfully, then no further communication may
-take place via this transport.
-
-8. All writes to the underlying transport must be prefixed by the 4-byte length
-of the payload data, followed by the payload. All reads from this transport
-should read the 4-byte length word, then read the full quantity of bytes
-specified by this length word.
-
-If no SASL QOP (quality of protection) is negotiated during steps 6 and 7, then
-all subsequent writes to/reads from this transport are written/read unaltered,
-save for the length prefix, to the underlying transport.
-
-If a SASL QOP is negotiated, then this must be used by the Thrift transport for
-all subsequent communication. This is done by wrapping subsequent writes to the
-transport using the underlying security mechanism, and unwrapping subsequent
-reads from the underlying transport. Note that in this case, the length prefix
-of the write to the underlying transport is the length of the data after it has
-been wrapped by the underlying security mechanism. Note that the complete
-message must be read before giving this data to the underlying security
-mechanism for unwrapping.
-
-If at any point in time reading of a message fails either because of a
-malformed length word or failure to unwrap by the underlying security
-mechanism, then all further communication on this transport must cease.
diff --git a/vendor/git.apache.org/thrift.git/doc/specs/thrift.tex b/vendor/git.apache.org/thrift.git/doc/specs/thrift.tex
deleted file mode 100644
index a706fcb..0000000
--- a/vendor/git.apache.org/thrift.git/doc/specs/thrift.tex
+++ /dev/null
@@ -1,1057 +0,0 @@
-%-----------------------------------------------------------------------------
-%
-%               Thrift whitepaper
-%
-% Name:         thrift.tex
-%
-% Authors:      Mark Slee (mcslee@facebook.com)
-%
-% Created:      05 March 2007
-%
-% You will need a copy of sigplanconf.cls to format this document.
-% It is available at <http://www.sigplan.org/authorInformation.htm>.
-%
-%-----------------------------------------------------------------------------
-
-
-\documentclass[nocopyrightspace,blockstyle]{sigplanconf}
-
-\usepackage{amssymb}
-\usepackage{amsfonts}
-\usepackage{amsmath}
-\usepackage{url}
-
-\begin{document}
-
-% \conferenceinfo{WXYZ '05}{date, City.}
-% \copyrightyear{2007}
-% \copyrightdata{[to be supplied]}
-
-% \titlebanner{banner above paper title}        % These are ignored unless
-% \preprintfooter{short description of paper}   % 'preprint' option specified.
-
-\title{Thrift: Scalable Cross-Language Services Implementation}
-\subtitle{}
-
-\authorinfo{Mark Slee, Aditya Agarwal and Marc Kwiatkowski}
-           {Facebook, 156 University Ave, Palo Alto, CA}
-           {\{mcslee,aditya,marc\}@facebook.com}
-
-\maketitle
-
-\begin{abstract}
-Thrift is a software library and set of code-generation tools developed at
-Facebook to expedite development and implementation of efficient and scalable
-backend services. Its primary goal is to enable efficient and reliable
-communication across programming languages by abstracting the portions of each
-language that tend to require the most customization into a common library
-that is implemented in each language. Specifically, Thrift allows developers to
-define datatypes and service interfaces in a single language-neutral file
-and generate all the necessary code to build RPC clients and servers.
-
-This paper details the motivations and design choices we made in Thrift, as
-well as some of the more interesting implementation details. It is not
-intended to be taken as research, but rather it is an exposition on what we did
-and why.
-\end{abstract}
-
-% \category{D.3.3}{Programming Languages}{Language constructs and features}
-
-%\terms
-%Languages, serialization, remote procedure call
-
-%\keywords
-%Data description language, interface definition language, remote procedure call
-
-\section{Introduction}
-As Facebook's traffic and network structure have scaled, the resource
-demands of many operations on the site (i.e. search,
-ad selection and delivery, event logging) have presented technical requirements
-drastically outside the scope of the LAMP framework. In our implementation of
-these services, various programming languages have been selected to
-optimize for the right combination of performance, ease and speed of
-development, availability of existing libraries, etc. By and large,
-Facebook's engineering culture has tended towards choosing the best
-tools and implementations available over standardizing on any one
-programming language and begrudgingly accepting its inherent limitations.
-
-Given this design choice, we were presented with the challenge of building
-a transparent, high-performance bridge across many programming languages.
-We found that most available solutions were either too limited, did not offer
-sufficient datatype freedom, or suffered from subpar performance.
-\footnote{See Appendix A for a discussion of alternative systems.}
-
-The solution that we have implemented combines a language-neutral software
-stack implemented across numerous programming languages and an associated code
-generation engine that transforms a simple interface and data definition
-language into client and server remote procedure call libraries.
-Choosing static code generation over a dynamic system allows us to create
-validated code that can be run without the need for
-any advanced introspective run-time type checking. It is also designed to
-be as simple as possible for the developer, who can typically define all
-the necessary data structures and interfaces for a complex service in a single
-short file.
-
-Surprised that a robust open solution to these relatively common problems
-did not yet exist, we committed early on to making the Thrift implementation
-open source.
-
-In evaluating the challenges of cross-language interaction in a networked
-environment, some key components were identified:
-
-\textit{Types.} A common type system must exist across programming languages
-without requiring that the application developer use custom Thrift datatypes
-or write their own serialization code. That is,
-a C++ programmer should be able to transparently exchange a strongly typed
-STL map for a dynamic Python dictionary. Neither
-programmer should be forced to write any code below the application layer
-to achieve this. Section 2 details the Thrift type system.
-
-\textit{Transport.} Each language must have a common interface to
-bidirectional raw data transport. The specifics of how a given
-transport is implemented should not matter to the service developer.
-The same application code should be able to run against TCP stream sockets,
-raw data in memory, or files on disk. Section 3 details the Thrift Transport
-layer.
-
-\textit{Protocol.} Datatypes must have some way of using the Transport
-layer to encode and decode themselves. Again, the application
-developer need not be concerned by this layer. Whether the service uses
-an XML or binary protocol is immaterial to the application code.
-All that matters is that the data can be read and written in a consistent,
-deterministic matter. Section 4 details the Thrift Protocol layer.
-
-\textit{Versioning.} For robust services, the involved datatypes must
-provide a mechanism for versioning themselves. Specifically,
-it should be possible to add or remove fields in an object or alter the
-argument list of a function without any interruption in service (or,
-worse yet, nasty segmentation faults). Section 5 details Thrift's versioning
-system.
-
-\textit{Processors.} Finally, we generate code capable of processing data
-streams to accomplish remote procedure calls. Section 6 details the generated
-code and TProcessor paradigm.
-
-Section 7 discusses implementation details, and Section 8 describes
-our conclusions.
-
-\section{Types}
-
-The goal of the Thrift type system is to enable programmers to develop using
-completely natively defined types, no matter what programming language they
-use. By design, the Thrift type system does not introduce any special dynamic
-types or wrapper objects. It also does not require that the developer write
-any code for object serialization or transport. The Thrift IDL (Interface
-Definition Language) file is
-logically a way for developers to annotate their data structures with the
-minimal amount of extra information necessary to tell a code generator
-how to safely transport the objects across languages.
-
-\subsection{Base Types}
-
-The type system rests upon a few base types. In considering which types to
-support, we aimed for clarity and simplicity over abundance, focusing
-on the key types available in all programming languages, omitting any
-niche types available only in specific languages.
-
-The base types supported by Thrift are:
-\begin{itemize}
-\item \texttt{bool} A boolean value, true or false
-\item \texttt{byte} A signed byte
-\item \texttt{i16} A 16-bit signed integer
-\item \texttt{i32} A 32-bit signed integer
-\item \texttt{i64} A 64-bit signed integer
-\item \texttt{double} A 64-bit floating point number
-\item \texttt{string} An encoding-agnostic text or binary string
-\item \texttt{binary} A byte array representation for blobs
-\end{itemize}
-
-Of particular note is the absence of unsigned integer types. Because these
-types have no direct translation to native primitive types in many languages,
-the advantages they afford are lost. Further, there is no way to prevent the
-application developer in a language like Python from assigning a negative value
-to an integer variable, leading to unpredictable behavior. From a design
-standpoint, we observed that unsigned integers were very rarely, if ever, used
-for arithmetic purposes, but in practice were much more often used as keys or
-identifiers. In this case, the sign is irrelevant. Signed integers serve this
-same purpose and can be safely cast to their unsigned counterparts (most
-commonly in C++) when absolutely necessary.
-
-\subsection{Structs}
-
-A Thrift struct defines a common object to be used across languages. A struct
-is essentially equivalent to a class in object oriented programming
-languages. A struct has a set of strongly typed fields, each with a unique
-name identifier. The basic syntax for defining a Thrift struct looks very
-similar to a C struct definition. Fields may be annotated with an integer field
-identifier (unique to the scope of that struct) and optional default values.
-Field identifiers will be automatically assigned if omitted, though they are
-strongly encouraged for versioning reasons discussed later.
-
-\subsection{Containers}
-
-Thrift containers are strongly typed containers that map to the most commonly
-used containers in common programming languages. They are annotated using
-the C++ template (or Java Generics) style. There are three types available:
-\begin{itemize}
-\item \texttt{list<type>} An ordered list of elements. Translates directly into
-an STL \texttt{vector}, Java \texttt{ArrayList}, or native array in scripting languages. May
-contain duplicates.
-\item \texttt{set<type>} An unordered set of unique elements. Translates into
-an STL \texttt{set}, Java \texttt{HashSet}, \texttt{set} in Python, or native
-dictionary in PHP/Ruby.
-\item \texttt{map<type1,type2>} A map of strictly unique keys to values
-Translates into an STL \texttt{map}, Java \texttt{HashMap}, PHP associative
-array, or Python/Ruby dictionary.
-\end{itemize}
-
-While defaults are provided, the type mappings are not explicitly fixed. Custom
-code generator directives have been added to substitute custom types in
-destination languages (i.e.
-\texttt{hash\_map} or Google's sparse hash map can be used in C++). The
-only requirement is that the custom types support all the necessary iteration
-primitives. Container elements may be of any valid Thrift type, including other
-containers or structs.
-
-\begin{verbatim}
-struct Example {
-  1:i32 number=10,
-  2:i64 bigNumber,
-  3:double decimals,
-  4:string name="thrifty"
-}\end{verbatim}
-
-In the target language, each definition generates a type with two methods,
-\texttt{read} and \texttt{write}, which perform serialization and transport
-of the objects using a Thrift TProtocol object.
-
-\subsection{Exceptions}
-
-Exceptions are syntactically and functionally equivalent to structs except
-that they are declared using the \texttt{exception} keyword instead of the
-\texttt{struct} keyword.
-
-The generated objects inherit from an exception base class as appropriate
-in each target programming language, in order to seamlessly
-integrate with native exception handling in any given
-language. Again, the design emphasis is on making the code familiar to the
-application developer.
-
-\subsection{Services}
-
-Services are defined using Thrift types. Definition of a service is
-semantically equivalent to defining an interface (or a pure virtual abstract
-class) in object oriented
-programming. The Thrift compiler generates fully functional client and
-server stubs that implement the interface. Services are defined as follows:
-
-\begin{verbatim}
-service <name> {
-  <returntype> <name>(<arguments>)
-    [throws (<exceptions>)]
-  ...
-}\end{verbatim}
-
-An example:
-
-\begin{verbatim}
-service StringCache {
-  void set(1:i32 key, 2:string value),
-  string get(1:i32 key) throws (1:KeyNotFound knf),
-  void delete(1:i32 key)
-}
-\end{verbatim}
-
-Note that \texttt{void} is a valid type for a function return, in addition to
-all other defined Thrift types. Additionally, an \texttt{async} modifier
-keyword may be added to a \texttt{void} function, which will generate code that does
-not wait for a response from the server. Note that a pure \texttt{void}
-function will return a response to the client which guarantees that the
-operation has completed on the server side. With \texttt{async} method calls
-the client will only be guaranteed that the request succeeded at the
-transport layer. (In many transport scenarios this is inherently unreliable
-due to the Byzantine Generals' Problem. Therefore, application developers
-should take care only to use the async optimization in cases where dropped
-method calls are acceptable or the transport is known to be reliable.)
-
-Also of note is the fact that argument lists and exception lists for functions
-are implemented as Thrift structs. All three constructs are identical in both
-notation and behavior.
-
-\section{Transport}
-
-The transport layer is used by the generated code to facilitate data transfer.
-
-\subsection{Interface}
-
-A key design choice in the implementation of Thrift was to decouple the
-transport layer from the code generation layer. Though Thrift is typically
-used on top of the TCP/IP stack with streaming sockets as the base layer of
-communication, there was no compelling reason to build that constraint into
-the system. The performance tradeoff incurred by an abstracted I/O layer
-(roughly one virtual method lookup / function call per operation) was
-immaterial compared to the cost of actual I/O operations (typically invoking
-system calls).
-
-Fundamentally, generated Thrift code only needs to know how to read and
-write data. The origin and destination of the data are irrelevant; it may be a
-socket, a segment of shared memory, or a file on the local disk. The Thrift
-transport interface supports the following methods:
-
-\begin{itemize}
-\item \texttt{open} Opens the transport
-\item \texttt{close} Closes the transport
-\item \texttt{isOpen} Indicates whether the transport is open
-\item \texttt{read} Reads from the transport
-\item \texttt{write} Writes to the transport
-\item \texttt{flush} Forces any pending writes
-\end{itemize}
-
-There are a few additional methods not documented here which are used to aid
-in batching reads and optionally signaling the completion of a read or
-write operation from the generated code.
-
-In addition to the above
-\texttt{TTransport} interface, there is a\\
-\texttt{TServerTransport} interface
-used to accept or create primitive transport objects. Its interface is as
-follows:
-
-\begin{itemize}
-\item \texttt{open} Opens the transport
-\item \texttt{listen} Begins listening for connections
-\item \texttt{accept} Returns a new client transport
-\item \texttt{close} Closes the transport
-\end{itemize}
-
-\subsection{Implementation}
-
-The transport interface is designed for simple implementation in any
-programming language. New transport mechanisms can be easily defined as needed
-by application developers.
-
-\subsubsection{TSocket}
-
-The \texttt{TSocket} class is implemented across all target languages. It
-provides a common, simple interface to a TCP/IP stream socket.
-
-\subsubsection{TFileTransport}
-
-The \texttt{TFileTransport} is an abstraction of an on-disk file to a data
-stream. It can be used to write out a set of incoming Thrift requests to a file
-on disk. The on-disk data can then be replayed from the log, either for
-post-processing or for reproduction and/or simulation of past events.
-
-\subsubsection{Utilities}
-
-The Transport interface is designed to support easy extension using common
-OOP techniques, such as composition. Some simple utilities include the
-\texttt{TBufferedTransport}, which buffers the writes and reads on an
-underlying transport, the \texttt{TFramedTransport}, which transmits data with frame
-size headers for chunking optimization or nonblocking operation, and the
-\texttt{TMemoryBuffer}, which allows reading and writing directly from the heap
-or stack memory owned by the process.
-
-\section{Protocol}
-
-A second major abstraction in Thrift is the separation of data structure from
-transport representation. Thrift enforces a certain messaging structure when
-transporting data, but it is agnostic to the protocol encoding in use. That is,
-it does not matter whether data is encoded as XML, human-readable ASCII, or a
-dense binary format as long as the data supports a fixed set of operations
-that allow it to be deterministically read and written by generated code.
-
-\subsection{Interface}
-
-The Thrift Protocol interface is very straightforward. It fundamentally
-supports two things: 1) bidirectional sequenced messaging, and
-2) encoding of base types, containers, and structs.
-
-\begin{verbatim}
-writeMessageBegin(name, type, seq)
-writeMessageEnd()
-writeStructBegin(name)
-writeStructEnd()
-writeFieldBegin(name, type, id)
-writeFieldEnd()
-writeFieldStop()
-writeMapBegin(ktype, vtype, size)
-writeMapEnd()
-writeListBegin(etype, size)
-writeListEnd()
-writeSetBegin(etype, size)
-writeSetEnd()
-writeBool(bool)
-writeByte(byte)
-writeI16(i16)
-writeI32(i32)
-writeI64(i64)
-writeDouble(double)
-writeString(string)
-
-name, type, seq = readMessageBegin()
-                  readMessageEnd()
-name =            readStructBegin()
-                  readStructEnd()
-name, type, id =  readFieldBegin()
-                  readFieldEnd()
-k, v, size =      readMapBegin()
-                  readMapEnd()
-etype, size =     readListBegin()
-                  readListEnd()
-etype, size =     readSetBegin()
-                  readSetEnd()
-bool =            readBool()
-byte =            readByte()
-i16 =             readI16()
-i32 =             readI32()
-i64 =             readI64()
-double =          readDouble()
-string =          readString()
-\end{verbatim}
-
-Note that every \texttt{write} function has exactly one \texttt{read} counterpart, with
-the exception of \texttt{writeFieldStop()}. This is a special method
-that signals the end of a struct. The procedure for reading a struct is to
-\texttt{readFieldBegin()} until the stop field is encountered, and then to
-\texttt{readStructEnd()}.  The
-generated code relies upon this call sequence to ensure that everything written by
-a protocol encoder can be read by a matching protocol decoder. Further note
-that this set of functions is by design more robust than necessary.
-For example, \texttt{writeStructEnd()} is not strictly necessary, as the end of
-a struct may be implied by the stop field. This method is a convenience for
-verbose protocols in which it is cleaner to separate these calls (e.g. a closing
-\texttt{</struct>} tag in XML).
-
-\subsection{Structure}
-
-Thrift structures are designed to support encoding into a streaming
-protocol. The implementation should never need to frame or compute the
-entire data length of a structure prior to encoding it. This is critical to
-performance in many scenarios. Consider a long list of relatively large
-strings. If the protocol interface required reading or writing a list to be an
-atomic operation, then the implementation would need to perform a linear pass over the
-entire list before encoding any data. However, if the list can be written
-as iteration is performed, the corresponding read may begin in parallel,
-theoretically offering an end-to-end speedup of $(kN - C)$, where $N$ is the size
-of the list, $k$ the cost factor associated with serializing a single
-element, and $C$ is fixed offset for the delay between data being written
-and becoming available to read.
-
-Similarly, structs do not encode their data lengths a priori. Instead, they are
-encoded as a sequence of fields, with each field having a type specifier and a
-unique field identifier. Note that the inclusion of type specifiers allows
-the protocol to be safely parsed and decoded without any generated code
-or access to the original IDL file. Structs are terminated by a field header
-with a special \texttt{STOP} type. Because all the basic types can be read
-deterministically, all structs (even those containing other structs) can be
-read deterministically. The Thrift protocol is self-delimiting without any
-framing and regardless of the encoding format.
-
-In situations where streaming is unnecessary or framing is advantageous, it
-can be very simply added into the transport layer, using the
-\texttt{TFramedTransport} abstraction.
-
-\subsection{Implementation}
-
-Facebook has implemented and deployed a space-efficient binary protocol which
-is used by most backend services. Essentially, it writes all data
-in a flat binary format. Integer types are converted to network byte order,
-strings are prepended with their byte length, and all message and field headers
-are written using the primitive integer serialization constructs. String names
-for fields are omitted - when using generated code, field identifiers are
-sufficient.
-
-We decided against some extreme storage optimizations (i.e. packing
-small integers into ASCII or using a 7-bit continuation format) for the sake
-of simplicity and clarity in the code. These alterations can easily be made
-if and when we encounter a performance-critical use case that demands them.
-
-\section{Versioning}
-
-Thrift is robust in the face of versioning and data definition changes. This
-is critical to enable staged rollouts of changes to deployed services. The
-system must be able to support reading of old data from log files, as well as
-requests from out-of-date clients to new servers, and vice versa.
-
-\subsection{Field Identifiers}
-
-Versioning in Thrift is implemented via field identifiers. The field header
-for every member of a struct in Thrift is encoded with a unique field
-identifier. The combination of this field identifier and its type specifier
-is used to uniquely identify the field. The Thrift definition language
-supports automatic assignment of field identifiers, but it is good
-programming practice to always explicitly specify field identifiers.
-Identifiers are specified as follows:
-
-\begin{verbatim}
-struct Example {
-  1:i32 number=10,
-  2:i64 bigNumber,
-  3:double decimals,
-  4:string name="thrifty"
-}\end{verbatim}
-
-To avoid conflicts between manually and automatically assigned identifiers,
-fields with identifiers omitted are assigned identifiers
-decrementing from -1, and the language only supports the manual assignment of
-positive identifiers.
-
-When data is being deserialized, the generated code can use these identifiers
-to properly identify the field and determine whether it aligns with a field in
-its definition file. If a field identifier is not recognized, the generated
-code can use the type specifier to skip the unknown field without any error.
-Again, this is possible due to the fact that all datatypes are self
-delimiting.
-
-Field identifiers can (and should) also be specified in function argument
-lists. In fact, argument lists are not only represented as structs on the
-backend, but actually share the same code in the compiler frontend. This
-allows for version-safe modification of method parameters
-
-\begin{verbatim}
-service StringCache {
-  void set(1:i32 key, 2:string value),
-  string get(1:i32 key) throws (1:KeyNotFound knf),
-  void delete(1:i32 key)
-}
-\end{verbatim}
-
-The syntax for specifying field identifiers was chosen to echo their structure.
-Structs can be thought of as a dictionary where the identifiers are keys, and
-the values are strongly-typed named fields.
-
-Field identifiers internally use the \texttt{i16} Thrift type. Note, however,
-that the \texttt{TProtocol} abstraction may encode identifiers in any format.
-
-\subsection{Isset}
-
-When an unexpected field is encountered, it can be safely ignored and
-discarded. When an expected field is not found, there must be some way to
-signal to the developer that it was not present. This is implemented via an
-inner \texttt{isset} structure inside the defined objects. (Isset functionality
-is implicit with a \texttt{null} value in PHP, \texttt{None} in Python
-and \texttt{nil} in Ruby.) Essentially,
-the inner \texttt{isset} object of each Thrift struct contains a boolean value
-for each field which denotes whether or not that field is present in the
-struct. When a reader receives a struct, it should check for a field being set
-before operating directly on it.
-
-\begin{verbatim}
-class Example {
- public:
-  Example() :
-    number(10),
-    bigNumber(0),
-    decimals(0),
-    name("thrifty") {}
-
-  int32_t number;
-  int64_t bigNumber;
-  double decimals;
-  std::string name;
-
-  struct __isset {
-    __isset() :
-      number(false),
-      bigNumber(false),
-      decimals(false),
-      name(false) {}
-    bool number;
-    bool bigNumber;
-    bool decimals;
-    bool name;
-  } __isset;
-...
-}
-\end{verbatim}
-
-\subsection{Case Analysis}
-
-There are four cases in which version mismatches may occur.
-
-\begin{enumerate}
-\item \textit{Added field, old client, new server.} In this case, the old
-client does not send the new field. The new server recognizes that the field
-is not set, and implements default behavior for out-of-date requests.
-\item \textit{Removed field, old client, new server.} In this case, the old
-client sends the removed field. The new server simply ignores it.
-\item \textit{Added field, new client, old server.} The new client sends a
-field that the old server does not recognize. The old server simply ignores
-it and processes as normal.
-\item \textit{Removed field, new client, old server.} This is the most
-dangerous case, as the old server is unlikely to have suitable default
-behavior implemented for the missing field. It is recommended that in this
-situation the new server be rolled out prior to the new clients.
-\end{enumerate}
-
-\subsection{Protocol/Transport Versioning}
-The \texttt{TProtocol} abstractions are also designed to give protocol
-implementations the freedom to version themselves in whatever manner they
-see fit. Specifically, any protocol implementation is free to send whatever
-it likes in the \texttt{writeMessageBegin()} call. It is entirely up to the
-implementor how to handle versioning at the protocol level. The key point is
-that protocol encoding changes are safely isolated from interface definition
-version changes.
-
-Note that the exact same is true of the \texttt{TTransport} interface. For
-example, if we wished to add some new checksumming or error detection to the
-\texttt{TFileTransport}, we could simply add a version header into the
-data it writes to the file in such a way that it would still accept old
-log files without the given header.
-
-\section{RPC Implementation}
-
-\subsection{TProcessor}
-
-The last core interface in the Thrift design is the \texttt{TProcessor},
-perhaps the most simple of the constructs. The interface is as follows:
-
-\begin{verbatim}
-interface TProcessor {
-  bool process(TProtocol in, TProtocol out)
-    throws TException
-}
-\end{verbatim}
-
-The key design idea here is that the complex systems we build can fundamentally
-be broken down into agents or services that operate on inputs and outputs. In
-most cases, there is actually just one input and output (an RPC client) that
-needs handling.
-
-\subsection{Generated Code}
-
-When a service is defined, we generate a
-\texttt{TProcessor} instance capable of handling RPC requests to that service,
-using a few helpers. The fundamental structure (illustrated in pseudo-C++) is
-as follows:
-
-\begin{verbatim}
-Service.thrift
- => Service.cpp
-     interface ServiceIf
-     class ServiceClient : virtual ServiceIf
-       TProtocol in
-       TProtocol out
-     class ServiceProcessor : TProcessor
-       ServiceIf handler
-
-ServiceHandler.cpp
- class ServiceHandler : virtual ServiceIf
-
-TServer.cpp
- TServer(TProcessor processor,
-         TServerTransport transport,
-         TTransportFactory tfactory,
-         TProtocolFactory pfactory)
- serve()
-\end{verbatim}
-
-From the Thrift definition file, we generate the virtual service interface.
-A client class is generated, which implements the interface and
-uses two \texttt{TProtocol} instances to perform the I/O operations. The
-generated processor implements the \texttt{TProcessor} interface. The generated
-code has all the logic to handle RPC invocations via the \texttt{process()}
-call, and takes as a parameter an instance of the service interface, as
-implemented by the application developer.
-
-The user provides an implementation of the application interface in separate,
-non-generated source code.
-
-\subsection{TServer}
-
-Finally, the Thrift core libraries provide a \texttt{TServer} abstraction.
-The \texttt{TServer} object generally works as follows.
-
-\begin{itemize}
-\item Use the \texttt{TServerTransport} to get a \texttt{TTransport}
-\item Use the \texttt{TTransportFactory} to optionally convert the primitive
-transport into a suitable application transport (typically the
-\texttt{TBufferedTransportFactory} is used here)
-\item Use the \texttt{TProtocolFactory} to create an input and output protocol
-for the \texttt{TTransport}
-\item Invoke the \texttt{process()} method of the \texttt{TProcessor} object
-\end{itemize}
-
-The layers are appropriately separated such that the server code needs to know
-nothing about any of the transports, encodings, or applications in play. The
-server encapsulates the logic around connection handling, threading, etc.
-while the processor deals with RPC. The only code written by the application
-developer lives in the definitional Thrift file and the interface
-implementation.
-
-Facebook has deployed multiple \texttt{TServer} implementations, including
-the single-threaded \texttt{TSimpleServer}, thread-per-connection
-\texttt{TThreadedServer}, and thread-pooling \texttt{TThreadPoolServer}.
-
-The \texttt{TProcessor} interface is very general by design. There is no
-requirement that a \texttt{TServer} take a generated \texttt{TProcessor}
-object. Thrift allows the application developer to easily write any type of
-server that operates on \texttt{TProtocol} objects (for instance, a server
-could simply stream a certain type of object without any actual RPC method
-invocation).
-
-\section{Implementation Details}
-\subsection{Target Languages}
-Thrift currently supports five target languages: C++, Java, Python, Ruby, and
-PHP. At Facebook, we have deployed servers predominantly in C++, Java, and
-Python. Thrift services implemented in PHP have also been embedded into the
-Apache web server, providing transparent backend access to many of our
-frontend constructs using a \texttt{THttpClient} implementation of the
-\texttt{TTransport} interface.
-
-Though Thrift was explicitly designed to be much more efficient and robust
-than typical web technologies, as we were designing our XML-based REST web
-services API we noticed that Thrift could be easily used to define our
-service interface. Though we do not currently employ SOAP envelopes (in the
-authors' opinions there is already far too much repetitive enterprise Java
-software to do that sort of thing), we were able to quickly extend Thrift to
-generate XML Schema Definition files for our service, as well as a framework
-for versioning different implementations of our web service. Though public
-web services are admittedly tangential to Thrift's core use case and design,
-Thrift facilitated rapid iteration and affords us the ability to quickly
-migrate our entire XML-based web service onto a higher performance system
-should the need arise.
-
-\subsection{Generated Structs}
-We made a conscious decision to make our generated structs as transparent as
-possible. All fields are publicly accessible; there are no \texttt{set()} and
-\texttt{get()} methods. Similarly, use of the \texttt{isset} object is not
-enforced. We do not include any \texttt{FieldNotSetException} construct.
-Developers have the option to use these fields to write more robust code, but
-the system is robust to the developer ignoring the \texttt{isset} construct
-entirely and will provide suitable default behavior in all cases.
-
-This choice was motivated by the desire to ease application development. Our stated
-goal is not to make developers learn a rich new library in their language of
-choice, but rather to generate code that allow them to work with the constructs
-that are most familiar in each language.
-
-We also made the \texttt{read()} and \texttt{write()} methods of the generated
-objects public so that the objects can be used outside of the context
-of RPC clients and servers. Thrift is a useful tool simply for generating
-objects that are easily serializable across programming languages.
-
-\subsection{RPC Method Identification}
-Method calls in RPC are implemented by sending the method name as a string. One
-issue with this approach is that longer method names require more bandwidth.
-We experimented with using fixed-size hashes to identify methods, but in the
-end concluded that the savings were not worth the headaches incurred. Reliably
-dealing with conflicts across versions of an interface definition file is
-impossible without a meta-storage system (i.e. to generate non-conflicting
-hashes for the current version of a file, we would have to know about all
-conflicts that ever existed in any previous version of the file).
-
-We wanted to avoid too many unnecessary string comparisons upon
-method invocation. To deal with this, we generate maps from strings to function
-pointers, so that invocation is effectively accomplished via a constant-time
-hash lookup in the common case. This requires the use of a couple interesting
-code constructs. Because Java does not have function pointers, process
-functions are all private member classes implementing a common interface.
-
-\begin{verbatim}
-private class ping implements ProcessFunction {
-  public void process(int seqid,
-                      TProtocol iprot,
-                      TProtocol oprot)
-    throws TException
-  { ...}
-}
-
-HashMap<String,ProcessFunction> processMap_ =
-  new HashMap<String,ProcessFunction>();
-\end{verbatim}
-
-In C++, we use a relatively esoteric language construct: member function
-pointers.
-
-\begin{verbatim}
-std::map<std::string,
-  void (ExampleServiceProcessor::*)(int32_t,
-  facebook::thrift::protocol::TProtocol*,
-  facebook::thrift::protocol::TProtocol*)>
- processMap_;
-\end{verbatim}
-
-Using these techniques, the cost of string processing is minimized, and we
-reap the benefit of being able to easily debug corrupt or misunderstood data by
-inspecting it for known string method names.
-
-\subsection{Servers and Multithreading}
-Thrift services require basic multithreading to handle simultaneous
-requests from multiple clients. For the Python and Java implementations of
-Thrift server logic, the standard threading libraries distributed with the
-languages provide adequate support. For the C++ implementation, no standard multithread runtime
-library exists. Specifically, robust, lightweight, and portable
-thread manager and timer class implementations do not exist. We investigated
-existing implementations, namely \texttt{boost::thread},
-\texttt{boost::threadpool}, \texttt{ACE\_Thread\_Manager} and
-\texttt{ACE\_Timer}.
-
-While \texttt{boost::threads}\cite{boost.threads}  provides clean,
-lightweight and robust implementations of multi-thread primitives (mutexes,
-conditions, threads) it does not provide a thread manager or timer
-implementation.
-
-\texttt{boost::threadpool}\cite{boost.threadpool} also looked promising but
-was not far enough along for our purposes. We wanted to limit the dependency on
-third-party libraries as much as possible. Because\\
-\texttt{boost::threadpool} is
-not a pure template library and requires runtime libraries and because it is
-not yet part of the official Boost distribution we felt it was not ready for
-use in Thrift. As \texttt{boost::threadpool} evolves and especially if it is
-added to the Boost distribution we may reconsider our decision to not use it.
-
-ACE has both a thread manager and timer class in addition to multi-thread
-primitives. The biggest problem with ACE is that it is ACE. Unlike Boost, ACE
-API quality is poor. Everything in ACE has large numbers of dependencies on
-everything else in ACE - thus forcing developers to throw out standard
-classes, such as STL collections, in favor of ACE's homebrewed implementations. In
-addition, unlike Boost, ACE implementations demonstrate little understanding
-of the power and pitfalls of C++ programming and take no advantage of modern
-templating techniques to ensure compile time safety and reasonable compiler
-error messages. For all these reasons, ACE was rejected. Instead, we chose
-to implement our own library, described in the following sections.
-
-\subsection{Thread Primitives}
-
-The Thrift thread libraries are implemented in the namespace\\
-\texttt{facebook::thrift::concurrency} and have three components:
-\begin{itemize}
-\item primitives
-\item thread pool manager
-\item timer manager
-\end{itemize}
-
-As mentioned above, we were hesitant to introduce any additional dependencies
-on Thrift. We decided to use \texttt{boost::shared\_ptr} because it is so
-useful for multithreaded application, it requires no link-time or
-runtime libraries (i.e. it is a pure template library) and it is due
-to become part of the C++0x standard.
-
-We implement standard \texttt{Mutex} and \texttt{Condition} classes, and a
- \texttt{Monitor} class. The latter is simply a combination of a mutex and
-condition variable and is analogous to the \texttt{Monitor} implementation provided for
-the Java \texttt{Object} class. This is also sometimes referred to as a barrier. We
-provide a \texttt{Synchronized} guard class to allow Java-like synchronized blocks.
-This is just a bit of syntactic sugar, but, like its Java counterpart, clearly
-delimits critical sections of code. Unlike its Java counterpart, we still
-have the ability to programmatically lock, unlock, block, and signal monitors.
-
-\begin{verbatim}
-void run() {
- {Synchronized s(manager->monitor);
-  if (manager->state == TimerManager::STARTING) {
-    manager->state = TimerManager::STARTED;
-    manager->monitor.notifyAll();
-  }
- }
-}
-\end{verbatim}
-
-We again borrowed from Java the distinction between a thread and a runnable
-class. A \texttt{Thread} is the actual schedulable object. The
-\texttt{Runnable} is the logic to execute within the thread.
-The \texttt{Thread} implementation deals with all the platform-specific thread
-creation and destruction issues, while the \texttt{Runnable} implementation deals
-with the application-specific per-thread logic. The benefit of this approach
-is that developers can easily subclass the Runnable class without pulling in
-platform-specific super-classes.
-
-\subsection{Thread, Runnable, and shared\_ptr}
-We use \texttt{boost::shared\_ptr} throughout the \texttt{ThreadManager} and
-\texttt{TimerManager} implementations to guarantee cleanup of dead objects that can
-be accessed by multiple threads. For \texttt{Thread} class implementations,
-\texttt{boost::shared\_ptr} usage requires particular attention to make sure
-\texttt{Thread} objects are neither leaked nor dereferenced prematurely while
-creating and shutting down threads.
-
-Thread creation requires calling into a C library. (In our case the POSIX
-thread library, \texttt{libpthread}, but the same would be true for WIN32 threads).
-Typically, the OS makes few, if any, guarantees about when \texttt{ThreadMain}, a C thread's entry-point function, will be called. Therefore, it is
-possible that our thread create call,
-\texttt{ThreadFactory::newThread()} could return to the caller
-well before that time. To ensure that the returned \texttt{Thread} object is not
-prematurely cleaned up if the caller gives up its reference prior to the
-\texttt{ThreadMain} call, the \texttt{Thread} object makes a weak reference to
-itself in its \texttt{start} method.
-
-With the weak reference in hand the \texttt{ThreadMain} function can attempt to get
-a strong reference before entering the \texttt{Runnable::run} method of the
-\texttt{Runnable} object bound to the \texttt{Thread}. If no strong references to the
-thread are obtained between exiting \texttt{Thread::start} and entering \texttt{ThreadMain}, the weak reference returns \texttt{null} and the function
-exits immediately.
-
-The need for the \texttt{Thread} to make a weak reference to itself has a
-significant impact on the API. Since references are managed through the
-\texttt{boost::shared\_ptr} templates, the \texttt{Thread} object must have a reference
-to itself wrapped by the same \texttt{boost::shared\_ptr} envelope that is returned
-to the caller. This necessitated the use of the factory pattern.
-\texttt{ThreadFactory} creates the raw \texttt{Thread} object and a
-\texttt{boost::shared\_ptr} wrapper, and calls a private helper method of the class
-implementing the \texttt{Thread} interface (in this case, \texttt{PosixThread::weakRef})
- to allow it to make add weak reference to itself through the
- \texttt{boost::shared\_ptr} envelope.
-
-\texttt{Thread} and \texttt{Runnable} objects reference each other. A \texttt{Runnable}
-object may need to know about the thread in which it is executing, and a Thread, obviously,
-needs to know what \texttt{Runnable} object it is hosting. This interdependency is
-further complicated because the lifecycle of each object is independent of the
-other. An application may create a set of \texttt{Runnable} object to be reused in different threads, or it may create and forget a \texttt{Runnable} object
-once a thread has been created and started for it.
-
-The \texttt{Thread} class takes a \texttt{boost::shared\_ptr} reference to the hosted
-\texttt{Runnable} object in its constructor, while the \texttt{Runnable} class has an
-explicit \texttt{thread} method to allow explicit binding of the hosted thread.
-\texttt{ThreadFactory::newThread} binds the objects to each other.
-
-\subsection{ThreadManager}
-
-\texttt{ThreadManager} creates a pool of worker threads and
-allows applications to schedule tasks for execution as free worker threads
-become available. The \texttt{ThreadManager} does not implement dynamic
-thread pool resizing, but provides primitives so that applications can add
-and remove threads based on load. This approach was chosen because
-implementing load metrics and thread pool size is very application
-specific. For example some applications may want to adjust pool size based
-on running-average of work arrival rates that are measured via polled
-samples. Others may simply wish to react immediately to work-queue
-depth high and low water marks. Rather than trying to create a complex
-API abstract enough to capture these different approaches, we
-simply leave it up to the particular application and provide the
-primitives to enact the desired policy and sample current status.
-
-\subsection{TimerManager}
-
-\texttt{TimerManager} allows applications to schedule
- \texttt{Runnable} objects for execution at some point in the future. Its specific task
-is to allows applications to sample \texttt{ThreadManager} load at regular
-intervals and make changes to the thread pool size based on application policy.
-Of course, it can be used to generate any number of timer or alarm events.
-
-The default implementation of \texttt{TimerManager} uses a single thread to
-execute expired \texttt{Runnable} objects. Thus, if a timer operation needs to
-do a large amount of work and especially if it needs to do blocking I/O,
-that should be done in a separate thread.
-
-\subsection{Nonblocking Operation}
-Though the Thrift transport interfaces map more directly to a blocking I/O
-model, we have implemented a high performance \texttt{TNonBlockingServer}
-in C++ based on \texttt{libevent} and the \texttt{TFramedTransport}. We
-implemented this by moving all I/O into one tight event loop using a
-state machine. Essentially, the event loop reads framed requests into
-\texttt{TMemoryBuffer} objects. Once entire requests are ready, they are
-dispatched to the \texttt{TProcessor} object which can read directly from
-the data in memory.
-
-\subsection{Compiler}
-The Thrift compiler is implemented in C++ using standard \texttt{lex}/\texttt{yacc}
-lexing and parsing. Though it could have been implemented with fewer
-lines of code in another language (i.e. Python Lex-Yacc (PLY) or \texttt{ocamlyacc}), using C++
-forces explicit definition of the language constructs. Strongly typing the
-parse tree elements (debatably) makes the code more approachable for new
-developers.
-
-Code generation is done using two passes. The first pass looks only for
-include files and type definitions. Type definitions are not checked during
-this phase, since they may depend upon include files. All included files
-are sequentially scanned in a first pass. Once the include tree has been
-resolved, a second pass over all files is taken that inserts type definitions
-into the parse tree and raises an error on any undefined types. The program is
-then generated against the parse tree.
-
-Due to inherent complexities and potential for circular dependencies,
-we explicitly disallow forward declaration. Two Thrift structs cannot
-each contain an instance of the other. (Since we do not allow \texttt{null}
-struct instances in the generated C++ code, this would actually be impossible.)
-
-\subsection{TFileTransport}
-The \texttt{TFileTransport} logs Thrift requests/structs by
-framing incoming data with its length and writing it out to disk.
-Using a framed on-disk format allows for better error checking and
-helps with the processing of a finite number of discrete events. The\\
-\texttt{TFileWriterTransport} uses a system of swapping in-memory buffers
-to ensure good performance while logging large amounts of data.
-A Thrift log file is split up into chunks of a specified size; logged messages
-are not allowed to cross chunk boundaries. A message that would cross a chunk
-boundary will cause padding to be added until the end of the chunk and the
-first byte of the message are aligned to the beginning of the next chunk.
-Partitioning the file into chunks makes it possible to read and interpret data
-from a particular point in the file.
-
-\section{Facebook Thrift Services}
-Thrift has been employed in a large number of applications at Facebook, including
-search, logging, mobile, ads and the developer platform. Two specific usages are discussed below.
-
-\subsection{Search}
-Thrift is used as the underlying protocol and transport layer for the Facebook Search service.
-The multi-language code generation is well suited for search because it allows for application
-development in an efficient server side language (C++) and allows the Facebook PHP-based web application
-to make calls to the search service using Thrift PHP libraries. There is also a large
-variety of search stats, deployment and testing functionality that is built on top
-of generated Python code. Additionally, the Thrift log file format is
-used as a redo log for providing real-time search index updates. Thrift has allowed the
-search team to leverage each language for its strengths and to develop code at a rapid pace.
-
-\subsection{Logging}
-The Thrift \texttt{TFileTransport} functionality is used for structured logging. Each
-service function definition along with its parameters can be considered to be
-a structured log entry identified by the function name. This log can then be used for
-a variety of purposes, including inline and offline processing, stats aggregation and as a redo log.
-
-\section{Conclusions}
-Thrift has enabled Facebook to build scalable backend
-services efficiently by enabling engineers to divide and conquer. Application
-developers can focus on application code without worrying about the
-sockets layer. We avoid duplicated work by writing buffering and I/O logic
-in one place, rather than interspersing it in each application.
-
-Thrift has been employed in a wide variety of applications at Facebook,
-including search, logging, mobile, ads, and the developer platform. We have
-found that the marginal performance cost incurred by an extra layer of
-software abstraction is far eclipsed by the gains in developer efficiency and
-systems reliability.
-
-\appendix
-
-\section{Similar Systems}
-The following are software systems similar to Thrift. Each is (very!) briefly
-described:
-
-\begin{itemize}
-\item \textit{SOAP.} XML-based. Designed for web services via HTTP, excessive
-XML parsing overhead.
-\item \textit{CORBA.} Relatively comprehensive, debatably overdesigned and
-heavyweight. Comparably cumbersome software installation.
-\item \textit{COM.} Embraced mainly in Windows client software. Not an entirely
-open solution.
-\item \textit{Pillar.} Lightweight and high-performance, but missing versioning
-and abstraction.
-\item \textit{Protocol Buffers.} Closed-source, owned by Google. Described in
-Sawzall paper.
-\end{itemize}
-
-\acks
-
-Many thanks for feedback on Thrift (and extreme trial by fire) are due to
-Martin Smith, Karl Voskuil and Yishan Wong.
-
-Thrift is a successor to Pillar, a similar system developed
-by Adam D'Angelo, first while at Caltech and continued later at Facebook.
-Thrift simply would not have happened without Adam's insights.
-
-\begin{thebibliography}{}
-
-\bibitem{boost.threads}
-Kempf, William,
-``Boost.Threads'',
-\url{http://www.boost.org/doc/html/threads.html}
-
-\bibitem{boost.threadpool}
-Henkel, Philipp,
-``threadpool'',
-\url{http://threadpool.sourceforge.net}
-
-\end{thebibliography}
-
-\end{document}
diff --git a/vendor/git.apache.org/thrift.git/lib/Makefile.am b/vendor/git.apache.org/thrift.git/lib/Makefile.am
deleted file mode 100644
index 5f17fca..0000000
--- a/vendor/git.apache.org/thrift.git/lib/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SUBDIRS = json xml
-PRECROSS_TARGET =
-
-if WITH_CPP
-# cpp dir is picked directly by plugin build
-if !WITH_PLUGIN
-SUBDIRS += cpp
-endif
-endif
-
-if WITH_C_GLIB
-SUBDIRS += c_glib
-endif
-
-if WITH_MONO
-SUBDIRS += csharp
-endif
-
-if WITH_JAVA
-SUBDIRS += java
-PRECROSS_TARGET += precross-java
-# JavaScript unit test depends on java
-# so test only if java, ant & co is available
-SUBDIRS += js
-endif
-
-if WITH_PYTHON
-SUBDIRS += py
-endif
-
-if WITH_ERLANG
-SUBDIRS += erl
-endif
-
-if WITH_RUBY
-SUBDIRS += rb
-endif
-
-if WITH_HASKELL
-SUBDIRS += hs
-endif
-
-if WITH_PERL
-SUBDIRS += perl
-endif
-
-if WITH_PHP
-SUBDIRS += php
-endif
-
-if WITH_DART
-SUBDIRS += dart
-endif
-
-if WITH_GO
-SUBDIRS += go
-endif
-
-if WITH_D
-SUBDIRS += d
-PRECROSS_TARGET += precross-d
-endif
-
-if WITH_NODEJS
-SUBDIRS += nodejs
-PRECROSS_TARGET += precross-nodejs
-endif
-
-if WITH_LUA
-SUBDIRS += lua
-endif
-
-# All of the libs that don't use Automake need to go in here
-# so they will end up in our release tarballs.
-EXTRA_DIST = \
-	as3 \
-	cocoa \
-	d \
-	dart \
-	delphi \
-	haxe \
-	javame \
-	js \
-	ocaml \
-	st \
-	ts
-
-precross-%:
-	$(MAKE) -C $* precross
-precross: $(PRECROSS_TARGET)
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/build.xml b/vendor/git.apache.org/thrift.git/lib/as3/build.xml
deleted file mode 100755
index 604da42..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/build.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<project name="libthrift-as3" default="compile" basedir="."
-  xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-	
-  <property name="as3.artifactid" value="${ant.project.name}"/>
-	
-  <property name="thrift.root" location="${basedir}/../../"/>
-  <property name="thrift.java.dir" location="${thrift.root}/lib/java"/>
-  <property name="build.tools.dir" location="${thrift.java.dir}/build/tools/"/>
-  <property name="thrift_compiler" value="${thrift.root}/compiler/cpp/thrift"/> 
-
-  <!-- inherit from the java build file for version and other properties -->
-  <property file="${thrift.java.dir}/build.properties" />
-
-  <property environment="env"/>
-
-  <condition property="version" value="${thrift.version}">
-    <isset property="release"/>
-  </condition>
-  <property name="version" value="${thrift.version}-snapshot"/>
-
-  <property name="as3.final.name" value="${as3.artifactid}-${version}"/>
-
-  <property name="src" value="${basedir}/src"/>
-  <property name="build.dir" value="${basedir}/build"/>
-
-  <property name="as3.swc.file" location="${build.dir}/${as3.final.name}.swc"/>
-  <property name="as3.pom.xml" location="${build.dir}/${as3.final.name}.pom"/>
-
-  <target name="init" depends="setup.init,flex.init" unless="init.finished">
-    <property name="init.finished" value="true"/>
-  </target>
-
-  <target name="setup.init">
-    <tstamp/>
-    <mkdir dir="${build.dir}"/>
-  </target>
-
-  <target name="flex.check" unless="FLEX_HOME">
-    <fail message='You must set the FLEX_HOME property pointing to your flex SDK, eg. ant -DFLEX_HOME="/Applications/Adobe Flex Builder 3/sdks/3.2.0"'/>
-  </target>
-	
-  <target name="flex.init" depends="flex.check" unless="flex.finished">
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-    <property name="flex.finished" value="true"/>
-  </target>
-
-  <target name="compile" depends="init">
-    <path id="as.src.files">
-      <fileset dir="${src}/">
-        <include name="**/*.as"/>
-      </fileset>
-    </path>
-    <pathconvert 
-      property="as.src.classes" 
-      pathsep=" " 
-      dirsep="." 
-      refid="as.src.files"
-    >
-      <map from="${src}/" to=""/>
-      <mapper type="glob" from="*.as" to="*"/>
-    </pathconvert>
-
-    <compc output="${as3.swc.file}" include-classes="${as.src.classes}">
-      <source-path path-element="${src}"/>
-    </compc>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build.dir}" />
-  </target>
-
-  <target name="mvn.ant.tasks.download" depends="setup.init,mvn.ant.tasks.check" unless="mvn.ant.tasks.found">
-    <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}" dest="${build.tools.dir}/${mvn.ant.task.jar}" usetimestamp="true"/>
-  </target>
-
-  <target name="mvn.ant.tasks.check">
-    <condition property="mvn.ant.tasks.found">
-      <typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/>
-    </condition>
-  </target>
-
-  <target name="mvn.init" depends="mvn.ant.tasks.download" unless="mvn.finished">
-    <echo message="${mvn.ant.task.jar}"/>
-    <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
-    <typedef uri="antlib:org.apache.maven.artifact.ant" classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
-
-    <!-- remote repositories used to download dependencies from -->
-    <artifact:remoteRepository id="central" url="${mvn.repo}"/>
-    <artifact:remoteRepository id="apache" url="${apache.repo}"/>
-
-    <!-- Pom file information -->
-    <artifact:pom id="pom" 
-      groupId="${thrift.groupid}" 
-      artifactId="${as3.artifactid}"
-      version="${version}" 
-      url="http://thrift.apache.org"
-      name="Apache Thrift"
-      description="Thrift is a software framework for scalable cross-language services development."
-      packaging="pom"
-    >
-      <remoteRepository refid="central"/>
-      <remoteRepository refid="apache"/>
-      <license name="The Apache Software License, Version 2.0" url="${license}"/>
-      <scm connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git" 
-      developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git"
-      url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
-      />
-      <!-- Thrift Developers -->
-      <developer id="mcslee" name="Mark Slee"/>
-      <developer id="dreiss" name="David Reiss"/>
-      <developer id="aditya" name="Aditya Agarwal"/>
-      <developer id="marck" name="Marc Kwiatkowski"/>
-      <developer id="jwang" name="James Wang"/>
-      <developer id="cpiro" name="Chris Piro"/>
-      <developer id="bmaurer" name="Ben Maurer"/>
-      <developer id="kclark" name="Kevin Clark"/>
-      <developer id="jake" name="Jake Luciani"/>
-      <developer id="bryanduxbury" name="Bryan Duxbury"/>
-      <developer id="esteve" name="Esteve Fernandez"/>
-      <developer id="todd" name="Todd Lipcon"/>
-      <developer id="geechorama" name="Andrew McGeachie"/>
-      <developer id="molinaro" name="Anthony Molinaro"/>
-      <developer id="roger" name="Roger Meier"/>
-      <developer id="jfarrell" name="Jake Farrell"/>
-      <developer id="jensg" name="Jens Geyer"/>
-      <developer id="carl" name="Carl Yeksigian"/>
-    </artifact:pom>
-
-    <!-- Generate the pom file -->
-    <artifact:writepom pomRefId="pom" file="${as3.pom.xml}"/>
-
-    <property name="mvn.finished" value="true"/>
-  </target>
-
-  <macrodef name="signAndDeploy">
-    <!-- Sign and deploy jars to apache repo -->
-    <attribute name="file"/>
-    <attribute name="classifier" default=""/>
-    <attribute name="packaging" default="jar"/>
-    <attribute name="pom" default=""/>
-    <sequential>
-      <artifact:mvn fork="true">
-        <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
-        <arg value="-DrepositoryId=${maven-repository-id}"/>
-        <arg value="-Durl=${maven-repository-url}"/>
-        <arg value="-DpomFile=@{pom}"/>
-        <arg value="-Dfile=@{file}"/>
-        <arg value="-Dclassifier=@{classifier}"/>
-        <arg value="-Dpackaging=@{packaging}"/>
-        <arg value="-Pgpg"/>
-      </artifact:mvn>
-    </sequential>
-  </macrodef>
-
-  <target name="publish" depends="clean,compile,mvn.init">
-    <!-- Compile, packages and then send release to apache maven repo -->
-    <!-- run with: ant -Drelease=true publish -->
-    <signAndDeploy file="${as3.pom.xml}" packaging="pom" classifier="" pom="${as3.pom.xml}"/>
-    <signAndDeploy file="${as3.swc.file}" packaging="swc" classifier="" pom="${as3.pom.xml}"/>
-  </target>	
-</project>
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/as3/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/AbstractMethodError.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/AbstractMethodError.as
deleted file mode 100644
index a2082b8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/AbstractMethodError.as
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-package org.apache.thrift {
-
-  import flash.errors.IllegalOperationError;
-
-  public class AbstractMethodError extends IllegalOperationError {
-    
-    public function AbstractMethodError(message:String="") {
-      super("Attempt to call an abstract method");
-    }
-    
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/Set.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/Set.as
deleted file mode 100644
index ae5f428..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/Set.as
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift {
-  import flash.utils.Dictionary;
-  
-  
-  public class Set {
-    
-    private var _elements:Dictionary = new Dictionary();
-    private var _size:int = 0;
-    
-    public function Set(... values) {
-      for each (var value:* in values) {
-        add(value);
-      }
-    }
-
-    public function add(o:*):Boolean {
-      var alreadyPresent:Boolean = _elements.hasOwnProperty(o);
-      if (! alreadyPresent) {
-        _size++;
-        _elements[o] = true;
-      }
-     
-      return ! alreadyPresent;
-    }
-
-    public function clear():void {
-      for (var value:* in _elements) {
-        remove(value);
-      }
-    }
-    
-    public function contains(o:Object):Boolean {
-      return _elements.hasOwnProperty(o);
-    }
-    
-    public function isEmpty():Boolean {
-      return _size == 0;
-    }
-    
-    public function remove(o:*):Boolean {
-      if (contains(o)) {
-        delete _elements[o];
-        _size--;
-        return true;
-      }
-      else {
-        return false;
-      }
-    }
-    
-    public function toArray():Array {
-      var ret:Array = new Array();
-      for (var key:* in _elements) {
-        ret.push(key);
-      }
-      return ret;
-    }
-    
-    public function get size():int {
-      return _size;
-    }
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TApplicationError.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TApplicationError.as
deleted file mode 100644
index 3448fce..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TApplicationError.as
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift {
-
-  import org.apache.thrift.protocol.TField;
-  import org.apache.thrift.protocol.TProtocol;
-  import org.apache.thrift.protocol.TProtocolUtil;
-  import org.apache.thrift.protocol.TStruct;
-  import org.apache.thrift.protocol.TType;
-
-  /**
-   * Application level exception
-   */
-  public class TApplicationError extends TError {
-
-    private static const TAPPLICATION_EXCEPTION_STRUCT:TStruct = new TStruct("TApplicationException");
-    private static const MESSAGE_FIELD:TField = new TField("message", TType.STRING, 1);
-    private static const TYPE_FIELD:TField = new TField("type", TType.I32, 2);
-
-    public static const UNKNOWN:int = 0;
-    public static const UNKNOWN_METHOD:int = 1;
-    public static const INVALID_MESSAGE_TYPE:int = 2;
-    public static const WRONG_METHOD_NAME:int = 3;
-    public static const BAD_SEQUENCE_ID:int = 4;
-    public static const MISSING_RESULT:int = 5;
-    public static const INTERNAL_ERROR:int = 6;
-    public static const PROTOCOL_ERROR:int = 7;
-    public static const INVALID_TRANSFORM:int = 8;
-    public static const INVALID_PROTOCOL:int = 9;
-    public static const UNSUPPORTED_CLIENT_TYPE:int = 10;
-
-    public function TApplicationError(type:int = UNKNOWN, message:String = "") {
-      super(message, type);
-    }
-
-    public static function read(iprot:TProtocol):TApplicationError {
-      var field:TField;
-      iprot.readStructBegin();
-
-      var message:String = null;
-      var type:int = UNKNOWN;
-
-      while (true) {
-        field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) {
-          break;
-        }
-        switch (field.id) {
-          case 1:
-            if (field.type == TType.STRING) {
-              message = iprot.readString();
-            }
-            else {
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 2:
-            if (field.type == TType.I32) {
-              type = iprot.readI32();
-            }
-            else {
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
-            break;
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      return new TApplicationError(type, message);
-    }
-
-    public function write(oprot:TProtocol):void {
-        oprot.writeStructBegin(TAPPLICATION_EXCEPTION_STRUCT);
-        if (message != null) {
-          oprot.writeFieldBegin(MESSAGE_FIELD);
-          oprot.writeString(message);
-          oprot.writeFieldEnd();
-        }
-        oprot.writeFieldBegin(TYPE_FIELD);
-        oprot.writeI32(errorID);
-        oprot.writeFieldEnd();
-        oprot.writeFieldStop();
-        oprot.writeStructEnd();
-      }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TBase.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TBase.as
deleted file mode 100644
index 615db1d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TBase.as
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift {
-
-  import org.apache.thrift.protocol.TProtocol;
-
-  /**
-   * Generic base interface for generated Thrift objects.
-   *
-   */
-  public interface TBase {
-  
-    /**
-     * Reads the TObject from the given input protocol.
-     *
-     * @param iprot Input protocol
-     */
-    function read(iprot:TProtocol):void;
-  
-    /**
-     * Writes the objects out to the protocol
-     *
-     * @param oprot Output protocol
-     */
-    function write(oprot:TProtocol):void;
-  
-    /**
-     * Check if a field is currently set or unset.
-     *
-     * @param fieldId The field's id tag as found in the IDL.
-     */
-    function isSet(fieldId:int):Boolean;
-  
-    /**
-     * Get a field's value by id. Primitive types will be wrapped in the 
-     * appropriate "boxed" types.
-     *
-     * @param fieldId The field's id tag as found in the IDL.
-     */
-    function getFieldValue(fieldId:int):*;
-  
-    /**
-     * Set a field's value by id. Primitive types must be "boxed" in the 
-     * appropriate object wrapper type.
-     *
-     * @param fieldId The field's id tag as found in the IDL.
-     */
-    function setFieldValue(fieldId:int, value:*):void;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TError.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TError.as
deleted file mode 100644
index ccc13b5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TError.as
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-package org.apache.thrift {
-  
-  public class TError extends Error {
-    
-    public function TError(message:String = "", errorCode:int = 0) {
-      super(message, errorCode);
-    }
-    
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TFieldRequirementType.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TFieldRequirementType.as
deleted file mode 100644
index 6fb4e58..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TFieldRequirementType.as
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift {
-
-  /**
-   * Requirement type constants.
-   *
-   */
-  public class TFieldRequirementType {
-    public static const REQUIRED:int  = 1;
-    public static const OPTIONAL:int = 2;
-    public static const DEFAULT:int = 3;
-  }
-  
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TProcessor.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TProcessor.as
deleted file mode 100644
index 850acc9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/TProcessor.as
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.thrift {
-
-import org.apache.thrift.protocol.TProtocol;
-
-    /**
-     * A processor is a generic object which operates upon an input stream and
-     * writes to some output stream.
-     *
-     */
-    public interface TProcessor {
-      function process(input:TProtocol, output:TProtocol):Boolean;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/FieldMetaData.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/FieldMetaData.as
deleted file mode 100644
index cb18a14..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/FieldMetaData.as
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data {
-
-  import flash.utils.Dictionary;
-
-  /**
-   * This class is used to store meta data about thrift fields. Every field in a
-   * a struct should have a corresponding instance of this class describing it.
-   *
-   */
-  public class FieldMetaData {
-  
-    public var fieldName:String;
-    public var requirementType:int;
-    public var valueMetaData:FieldValueMetaData;
-  
-    private static var structMap:Dictionary = new Dictionary();
-  
-    public function FieldMetaData(name:String, req:int, vMetaData:FieldValueMetaData) {
-      this.fieldName = name;
-      this.requirementType = req;
-      this.valueMetaData = vMetaData;
-    }
-  
-    public static function addStructMetaDataMap(sClass:Class, map:Dictionary):void{
-      structMap[sClass] = map;
-    }
-
-    /**
-     * Returns a map with metadata (i.e. instances of FieldMetaData) that
-     * describe the fields of the given class.
-     *
-     * @param sClass The TBase class for which the metadata map is requested
-     */
-    public static function getStructMetaDataMap(sClass:Class):Dictionary {
-      return structMap[sClass];
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/FieldValueMetaData.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/FieldValueMetaData.as
deleted file mode 100644
index 07fe1be..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/FieldValueMetaData.as
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data {
-
-  import org.apache.thrift.protocol.TType;
-
-  /**
-   * FieldValueMetaData and collection of subclasses to store metadata about
-   * the value(s) of a field
-   */
-  public class FieldValueMetaData {
-  
-    public var type:int;  
- 
-    public function FieldValueMetaData(type:int) {
-      this.type = type;
-    }
-  
-    public function isStruct():Boolean {
-      return type == TType.STRUCT; 
-    }
-  
-    public function isContainer():Boolean {
-      return type == TType.LIST || type == TType.MAP || type == TType.SET;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/ListMetaData.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/ListMetaData.as
deleted file mode 100644
index a2cc732..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/ListMetaData.as
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data {
-  
-  public class ListMetaData extends FieldValueMetaData {
-    
-    public var elemMetaData:FieldValueMetaData;
-  
-    public function ListMetaData(type:int, eMetaData:FieldValueMetaData) {
-      super(type);
-      this.elemMetaData = eMetaData;
-    }    
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/MapMetaData.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/MapMetaData.as
deleted file mode 100644
index e7f1f9f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/MapMetaData.as
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data {
-
-  public class MapMetaData extends FieldValueMetaData {
-  
-    public var keyMetaData:FieldValueMetaData;
-    public var valueMetaData:FieldValueMetaData;
-  
-    public function MapMetaData(type:int, kMetaData:FieldValueMetaData, vMetaData:FieldValueMetaData) {
-      super(type);
-      this.keyMetaData = kMetaData;
-      this.valueMetaData = vMetaData;
-    }
-  }    
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/SetMetaData.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/SetMetaData.as
deleted file mode 100644
index 390f034..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/SetMetaData.as
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data {
-
-  public class SetMetaData extends FieldValueMetaData {
-  
-    public var elemMetaData:FieldValueMetaData;
-  
-    public function SetMetaData(type:int, eMetaData:FieldValueMetaData) {
-      super(type);
-      this.elemMetaData = eMetaData; 
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/StructMetaData.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/StructMetaData.as
deleted file mode 100644
index fc9b0be..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/meta_data/StructMetaData.as
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data {
-
-  public class StructMetaData extends FieldValueMetaData {
-    
-    public var structClass:Class;
-  
-    public function StructMetaData(type:int, sClass:Class) {
-      super(type);
-      this.structClass = sClass;
-    }
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TBinaryProtocol.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TBinaryProtocol.as
deleted file mode 100644
index b2ff9d8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TBinaryProtocol.as
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol {
-
-  import flash.utils.ByteArray;
-  
-  import org.apache.thrift.TError;
-  import org.apache.thrift.transport.THttpClient;
-  import org.apache.thrift.transport.TTransport;
-    
-  /**
-   * Binary protocol implementation for thrift.
-   */
-  public class TBinaryProtocol implements TProtocol {
-
-    private static var ANONYMOUS_STRUCT:TStruct = new TStruct();
-
-    protected static const VERSION_MASK:int = int(0xffff0000);
-    protected static const VERSION_1:int = int(0x80010000);
-
-    protected var strictRead_:Boolean = false;
-    protected var strictWrite_:Boolean = true;
-    
-  /**
-   * Factory
-   */
-   /*
-  public static class Factory implements TProtocolFactory {
-    protected boolean strictRead_ = false;
-    protected boolean strictWrite_ = true;
-
-    public Factory() {
-      this(false, true);
-    }
-
-    public Factory(boolean strictRead, boolean strictWrite) {
-      strictRead_ = strictRead;
-      strictWrite_ = strictWrite;
-    }
-
-    public TProtocol getProtocol(TTransport trans) {
-      return new TBinaryProtocol(trans, strictRead_, strictWrite_);
-    }
-  }
-  */
-  
-    private var trans_:TTransport;
-    
-    /**
-     * Constructor
-     */
-    public function TBinaryProtocol(trans:TTransport, strictRead:Boolean=false, strictWrite:Boolean=true) {
-      trans_ = trans;
-      strictRead_ = strictRead;
-      strictWrite_ = strictWrite;
-    }
-  
-    public function getTransport():TTransport {
-      return trans_;
-    }
-    
-    public function writeMessageBegin(message:TMessage):void {
-        if (strictWrite_) {
-          var version:int = VERSION_1 | message.type;
-          writeI32(version);
-          writeString(message.name);
-          writeI32(message.seqid);
-        } else {
-          writeString(message.name);
-          writeByte(message.type);
-          writeI32(message.seqid);
-        }
-    }
-    
-      public function writeMessageEnd():void {}
-  
-    public function writeStructBegin(struct:TStruct):void {}
-  
-    public function writeStructEnd():void {}
-  
-    public function writeFieldBegin(field:TField):void {
-      writeByte(field.type);
-      writeI16(field.id);
-    }
-    
-    public function writeFieldEnd():void {}
-    
-    public function writeFieldStop():void {
-      writeByte(TType.STOP);
-    }
-    
-    public function writeMapBegin(map:TMap):void {
-      writeByte(map.keyType);
-      writeByte(map.valueType);
-      writeI32(map.size);
-    }
-    
-    public function writeMapEnd():void {}
-    
-    public function writeListBegin(list:TList):void {
-        writeByte(list.elemType);
-        writeI32(list.size);
-    }
-    
-    public function writeListEnd():void {}
-    
-    public function writeSetBegin(set:TSet):void {
-        writeByte(set.elemType);
-        writeI32(set.size);
-      }
-      
-      public function writeSetEnd():void {}
-      
-      public function writeBool(b:Boolean):void {
-        writeByte(b ? 1 : 0);
-      }
-      
-      private var out:ByteArray = new ByteArray();
-      public function writeByte(b:int):void {
-        reset(out);
-        out.writeByte(b);
-        trans_.write(out, 0, 1);
-      }
-      
-      public function writeI16(i16:int):void {
-        reset(out);
-        out.writeShort(i16);
-        trans_.write(out, 0, 2);
-      }
-      
-      public function writeI32(i32:int):void {
-        reset(out);
-        out.writeInt(i32);
-        trans_.write(out, 0, 4);
-      }
-      
-      //private byte[] i64out = new byte[8];
-      //public function writeI64(i64:Number):void {
-        //i64out[0] = (byte)(0xff & (i64 >> 56));
-        //i64out[1] = (byte)(0xff & (i64 >> 48));
-        //i64out[2] = (byte)(0xff & (i64 >> 40));
-        //i64out[3] = (byte)(0xff & (i64 >> 32));
-        //i64out[4] = (byte)(0xff & (i64 >> 24));
-        //i64out[5] = (byte)(0xff & (i64 >> 16));
-        //i64out[6] = (byte)(0xff & (i64 >> 8));
-        //i64out[7] = (byte)(0xff & (i64));
-        //trans_.write(i64out, 0, 8);
-      //}
-      
-      public function writeDouble(dub:Number):void {
-        reset(out);
-        out.writeDouble(dub);
-        trans_.write(out, 0, 8);
-      }
-      
-      private var stringOut:ByteArray = new ByteArray();
-      
-      public function writeString(str:String):void {
-        reset(stringOut);
-        stringOut.writeUTFBytes(str);
-        
-        writeI32(stringOut.length);
-        trans_.write(stringOut, 0, stringOut.length);
-      }
-  
-    public function writeBinary(bin:ByteArray):void {
-      writeI32(bin.length);
-      trans_.write(bin, 0, bin.length);
-    }
-  
-    /**
-     * Reading methods.
-     */
-  
-    public function readMessageBegin():TMessage {
-      var size:int = readI32();
-      if (size < 0) {
-        var version:int = size & VERSION_MASK;
-        if (version != VERSION_1) {
-          throw new TProtocolError(TProtocolError.BAD_VERSION, "Bad version in readMessageBegin");
-        }
-        return new TMessage(readString(), size & 0x000000ff, readI32());
-      }
-      else {
-        if (strictRead_) {
-          throw new TProtocolError(TProtocolError.BAD_VERSION, "Missing version in readMessageBegin, old client?");
-        }
-            return new TMessage(readStringBody(size), readByte(), readI32());
-          }
-    }
-  
-    public function readMessageEnd():void {}
-  
-    public function readStructBegin():TStruct {
-        return ANONYMOUS_STRUCT;
-      }
-  
-    public function readStructEnd():void {}
-  
-    public function readFieldBegin():TField {
-        var type:int = readByte();
-        var id:int = type == TType.STOP ? 0 : readI16();
-        return new TField("", type, id);
-    }
-  
-    public function readFieldEnd():void {}
-  
-    public function readMapBegin():TMap {
-        return new TMap(readByte(), readByte(), readI32());
-    }
-  
-    public function readMapEnd():void {}
-  
-    public function readListBegin():TList {
-        return new TList(readByte(), readI32());
-    }
-  
-    public function readListEnd():void {}
-  
-    public function readSetBegin():TSet {
-      return new TSet(readByte(), readI32());
-    }
-  
-    public function readSetEnd():void {}
-  
-    public function readBool():Boolean {
-        return (readByte() == 1);
-    }
-  
-    private var bytes:ByteArray = new ByteArray();
-    
-    public function readByte():int {
-      readAll(1);
-        return bytes.readByte();
-      }
-  
-    public function readI16():int {
-        readAll(2);
-        return bytes.readShort();
-    }
-  
-    public function readI32():int {
-      readAll(4);
-      return bytes.readInt();
-    }
-  
-    //private byte[] i64rd = new byte[8];
-    /*
-    public function readI64() throws TException {
-      readAll(i64rd, 0, 8);
-      return
-        ((long)(i64rd[0] & 0xff) << 56) |
-        ((long)(i64rd[1] & 0xff) << 48) |
-        ((long)(i64rd[2] & 0xff) << 40) |
-        ((long)(i64rd[3] & 0xff) << 32) |
-        ((long)(i64rd[4] & 0xff) << 24) |
-        ((long)(i64rd[5] & 0xff) << 16) |
-        ((long)(i64rd[6] & 0xff) <<  8) |
-        ((long)(i64rd[7] & 0xff));
-    }
-    */
-  
-    public function readDouble():Number {
-      readAll(8);
-      return bytes.readDouble();
-    }
-  
-    public function readString():String {
-      var size:int = readI32();
-        readAll(size);
-        return bytes.readUTFBytes(size);
-      }
-  
-    public function readStringBody(size:int):String {
-        readAll(size);
-        return bytes.readUTFBytes(size);
-      }
-  
-    public function readBinary():ByteArray {
-        var size:int = readI32();
-        var buf:ByteArray = new ByteArray();
-        trans_.readAll(buf, 0, size);
-        return buf;
-    }
-  
-    private function readAll(len:int):void {
-      reset(bytes);
-      
-        trans_.readAll(bytes, 0, len);
-        
-        bytes.position = 0;
-      }
-    
-    private static function reset(arr:ByteArray):void {
-      arr.length = 0;
-      arr.position = 0;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TField.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TField.as
deleted file mode 100644
index 1277f3a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TField.as
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-package org.apache.thrift.protocol {
-    
-  public class TField {
-    
-    public var name:String;
-    public var type:int;
-    public var id:int;
-      
-    public function TField(n:String = "", t:int = 0, i:int = 0) {
-      name = n;
-      type = t;
-      id = i;
-    }
-    
-    public function toString():String {
-      return "<TField name:'" + name + "' type:" + type + " field-id:" + id + ">";
-    }
-    
-    public function equals(otherField:TField):Boolean {
-      return type == otherField.type && id == otherField.id;
-    }
-        
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TList.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TList.as
deleted file mode 100644
index f0bdbad..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TList.as
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-package org.apache.thrift.protocol {
-  
-  public class TList {
-
-    public var elemType:int;
-    public var size:int;
-  
-      public function TList(t:int = 0, s:int = 0) {
-        elemType = t;
-        size = s;
-      }
-      
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMap.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMap.as
deleted file mode 100644
index 2298804..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMap.as
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-package org.apache.thrift.protocol {
-  public class TMap {
-    
-    public var keyType:int;
-    public var valueType:int;
-    public var size:int;
-  
-    public function TMap(k:int = 0, v:int = 0, s:int = 0) {
-      keyType = k;
-      valueType = v;
-      size = s;
-    }
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMessage.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMessage.as
deleted file mode 100644
index 9817235..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMessage.as
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-package org.apache.thrift.protocol {
-  
-  public class TMessage {
-    
-    public var name:String;
-    public var type:int;
-    public var seqid:int;
-  
-    public function TMessage(n:String = "", t:int = 0, s:int = 0) {
-      name = n;
-      type = t;
-      seqid = s;
-    }
-    
-    public function toString():String {
-      return "<TMessage name:'" + name + "' type: " + type + " seqid:" + seqid + ">";
-    }
-    
-    public function equals(other:TMessage):Boolean {
-      return name == other.name && type == other.type && seqid == other.seqid;
-    }
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMessageType.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMessageType.as
deleted file mode 100644
index 56a9ba5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TMessageType.as
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-package org.apache.thrift.protocol {
-  
-  public class TMessageType {
-    public static const CALL:int  = 1;
-    public static const REPLY:int = 2;
-    public static const EXCEPTION:int = 3;
-    public static const ONEWAY:int = 4;
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocol.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocol.as
deleted file mode 100644
index bb9d744..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocol.as
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol {
-
-  import org.apache.thrift.TError;
-  import org.apache.thrift.transport.TTransport;
-
-  import flash.utils.ByteArray;
-  
-  /**
-   * Protocol interface definition
-   */
-  public interface TProtocol {
-  
-    function TProtocol(trans:TTransport);
-
-    function getTransport():TTransport;
-
-    /**
-     * Writing methods.
-     */
-    function writeMessageBegin(message:TMessage):void;
-  
-    function writeMessageEnd():void;
-    
-    function writeStructBegin(struct:TStruct):void;
-    
-    function writeStructEnd():void;
-    
-    function writeFieldBegin(field:TField):void;
-    
-    function writeFieldEnd():void;
-    
-    function writeFieldStop():void;
-    
-    function writeMapBegin(map:TMap):void;
-    
-    function writeMapEnd():void;
-    
-    function writeListBegin(list:TList):void;
-    
-    function writeListEnd():void;
-    
-    function writeSetBegin(set:TSet):void;
-    
-    function writeSetEnd():void;
-    
-    function writeBool(b:Boolean):void;
-    
-    function writeByte(b:int):void;
-    
-    function writeI16(i16:int):void;
-    
-    function writeI32(i32:int):void;
-    
-    //function writeI64(i64:Number):void;
-    
-    function writeDouble(dub:Number):void;
-    
-    function writeString(str:String):void;
-    
-    function writeBinary(bin:ByteArray):void;
-    
-    /**
-     * Reading methods.
-     */
-    function readMessageBegin():TMessage;
-    
-    function readMessageEnd():void;
-    
-    function readStructBegin():TStruct;
-    
-    function readStructEnd():void;
-    
-    function readFieldBegin():TField;
-    
-    function readFieldEnd():void;
-    
-    function readMapBegin():TMap;
-    
-    function readMapEnd():void;
-    
-    function readListBegin():TList;
-    
-    function readListEnd():void;
-    
-    function readSetBegin():TSet;
-    
-    function readSetEnd():void;
-    
-    function readBool():Boolean;
-    
-    function readByte():int;
-    
-    function readI16():int;
-    
-    function readI32():int;
-    
-    //function readI64():Number;
-    
-    function readDouble():Number;
-    
-    function readString():String;
-    
-    function readBinary():ByteArray;
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolError.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolError.as
deleted file mode 100644
index 9fff730..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolError.as
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol {
-  
-  import org.apache.thrift.TError;
-
-  public class TProtocolError extends TError {
-    
-    public static const UNKNOWN:int = 0;
-    public static const INVALID_DATA:int = 1;
-    public static const NEGATIVE_SIZE:int = 2;
-    public static const SIZE_LIMIT:int = 3;
-    public static const BAD_VERSION:int = 4;
-    public static const NOT_IMPLEMENTED:int = 5;
-    public static const DEPTH_LIMIT:int = 6;
-  
-    public function TProtocolError(error:int = UNKNOWN, message:String = "") {
-      super(message, error);
-    }
-    
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolFactory.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolFactory.as
deleted file mode 100644
index c7f5e29..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolFactory.as
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol {
-
-  import org.apache.thrift.transport.TTransport;
-  
-  public interface TProtocolFactory {
-     function getProtocol(trans:TTransport):TProtocol;
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolUtil.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolUtil.as
deleted file mode 100644
index 513df95..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TProtocolUtil.as
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol {
-
-  import org.apache.thrift.TError;
-
-  /**
-   * Utility class with static methods for interacting with protocol data
-   * streams.
-   *
-   */
-  public class TProtocolUtil {
-
-    /**
-     * The maximum recursive depth the skip() function will traverse before
-     * throwing a TException.
-     */
-    private static var maxSkipDepth:int = int.MAX_VALUE;
-
-    /**
-     * Specifies the maximum recursive depth that the skip function will
-     * traverse before throwing a TException.  This is a global setting, so
-     * any call to skip in this JVM will enforce this value.
-     *
-     * @param depth  the maximum recursive depth.  A value of 2 would allow
-     *    the skip function to skip a structure or collection with basic children,
-     *    but it would not permit skipping a struct that had a field containing
-     *    a child struct.  A value of 1 would only allow skipping of simple
-     *    types and empty structs/collections.
-     */
-    public function setMaxSkipDepth(depth:int):void {
-      maxSkipDepth = depth;
-    }
-
-    /**
-     * Skips over the next data element from the provided input TProtocol object.
-     *
-     * @param prot  the protocol object to read from
-     * @param type  the next value will be intepreted as this TType value.
-     */
-    public static function skip(prot:TProtocol, type:int):void {
-      skipMaxDepth(prot, type, maxSkipDepth);
-    }
-
-     /**
-     * Skips over the next data element from the provided input TProtocol object.
-     *
-     * @param prot  the protocol object to read from
-     * @param type  the next value will be intepreted as this TType value.
-     * @param maxDepth  this function will only skip complex objects to this
-     *   recursive depth, to prevent Java stack overflow.
-     */
-    public static function skipMaxDepth(prot:TProtocol, type:int, maxDepth:int):void {
-      if (maxDepth <= 0) {
-        throw new TError("Maximum skip depth exceeded");
-      }
-      switch (type) {
-        case TType.BOOL: {
-          prot.readBool();
-          break;
-        }
-        case TType.BYTE: {
-          prot.readByte();
-          break;
-        }
-        case TType.I16: {
-          prot.readI16();
-          break;
-        }
-        case TType.I32: {
-          prot.readI32();
-          break;
-        }
-        /*
-        case TType.I64: {
-          prot.readI64();
-          break;
-        }
-        */
-        case TType.DOUBLE: {
-          prot.readDouble();
-          break;
-        }
-        case TType.STRING: {
-          prot.readBinary();
-          break;
-        }
-        case TType.STRUCT: {
-          prot.readStructBegin();
-          while (true) {
-            var field:TField = prot.readFieldBegin();
-            if (field.type == TType.STOP) {
-              break;
-            }
-            skipMaxDepth(prot, field.type, maxDepth - 1);
-            prot.readFieldEnd();
-          }
-          prot.readStructEnd();
-          break;
-        }
-        case TType.MAP: {
-          var map:TMap = prot.readMapBegin();
-          for (var i:int = 0; i < map.size; i++) {
-            skipMaxDepth(prot, map.keyType, maxDepth - 1);
-            skipMaxDepth(prot, map.valueType, maxDepth - 1);
-          }
-          prot.readMapEnd();
-          break;
-        }
-        case TType.SET: {
-          var set:TSet = prot.readSetBegin();
-          for (var j:int = 0; j < set.size; j++) {
-            skipMaxDepth(prot, set.elemType, maxDepth - 1);
-          }
-          prot.readSetEnd();
-          break;
-        }
-        case TType.LIST: {
-          var list:TList = prot.readListBegin();
-          for (var k:int = 0; k < list.size; k++) {
-            skipMaxDepth(prot, list.elemType, maxDepth - 1);
-          }
-          prot.readListEnd();
-          break;
-        }
-        default:
-          break;
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TSet.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TSet.as
deleted file mode 100644
index 3f0e1a6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TSet.as
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol {
-  
-  public class TSet {
-
-    public var elemType:int;
-    public var size:int;
-  
-      public function TSet(t:int = 0, s:int = 0) {
-        elemType = t;
-        size = s;
-      }
-      
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TStruct.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TStruct.as
deleted file mode 100644
index dffad79..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TStruct.as
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol {
-  
-  public class TStruct {
-    
-    public var name:String;
-    
-    public function TStruct(n:String = "") {
-      name = n;
-    }
-    
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TType.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TType.as
deleted file mode 100644
index 69af208..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/protocol/TType.as
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol {
-  
-  public class TType {
-    
-    public static const STOP:int   = 0;
-    public static const VOID:int   = 1;
-    public static const BOOL:int   = 2;
-    public static const BYTE:int   = 3;
-    public static const DOUBLE:int = 4;
-    public static const I16:int    = 6;
-    public static const I32:int    = 8;
-    public static const I64:int    = 10;
-    public static const STRING:int = 11;
-    public static const STRUCT:int = 12;
-    public static const MAP:int    = 13;
-    public static const SET:int    = 14;
-    public static const LIST:int   = 15;
-
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TFullDuplexHttpClient.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TFullDuplexHttpClient.as
deleted file mode 100644
index 863c59b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TFullDuplexHttpClient.as
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport
-{
-
-    import flash.errors.EOFError;
-    import flash.events.Event;
-    import flash.events.IOErrorEvent;
-    import flash.events.ProgressEvent;
-    import flash.events.SecurityErrorEvent;
-    import flash.net.URLLoader;
-    import flash.net.URLLoaderDataFormat;
-    import flash.net.URLRequest;
-    import flash.net.URLRequestMethod;
-    import flash.utils.IDataInput;
-    import flash.utils.IDataOutput;
-    import flash.utils.ByteArray;
-    import flash.net.Socket;
-    import flash.events.EventDispatcher;
-
-
-    /**
-     * HTTP implementation of the TTransport interface. Used for working with a
-     * Thrift web services implementation.
-     * Unlike Http Client, it uses a single POST, and chunk-encoding to transfer all messages.
-     */
-
-    public class TFullDuplexHttpClient extends TTransport
-    {
-        private var socket:Socket = null;
-
-        private var host:String;
-
-        private var port:int;
-
-        private var resource:String;
-
-        private var stripped:Boolean = false;
-
-        private var obuffer:ByteArray = new ByteArray();
-
-        private var input:IDataInput;
-
-        private var output:IDataOutput;
-
-        private var bytesInChunk:int = 0;
-
-        private var CRLF:ByteArray = new ByteArray();
-
-        private var ioCallback:Function = null;
-
-        private var eventDispatcher:EventDispatcher = new EventDispatcher();
-
-        public function TFullDuplexHttpClient(host:String, port:int, resource:String):void
-        {
-            CRLF.writeByte(13);
-            CRLF.writeByte(10);
-            this.host = host;
-            this.port = port;
-            this.resource = resource;
-        }
-
-        public override function close():void
-        {
-            this.input = null;
-            this.output = null;
-            this.stripped = false;
-            socket.close()
-        }
-
-    	public override function peek():Boolean
-    	{
-			if(socket.connected)
-			{
-				trace("Bytes remained:" + socket.bytesAvailable);
-				return socket.bytesAvailable>0;
-			}
-			return false;
-		}
-
-        public override function read(buf:ByteArray, off:int, len:int):int
-        {
-            var n1:int = 0, n2:int = 0, n3:int = 0, n4:int = 0, cidx:int = 2;
-            var chunkSize:ByteArray = new ByteArray();
-
-            try
-            {
-                while (!stripped)
-                {
-                    n1 = n2;
-                    n2 = n3;
-                    n3 = n4;
-                    n4 = input.readByte();
-                    if ((n1 == 13) && (n2 == 10) && (n3 == 13) && (n4 == 10))
-                    {
-                        stripped = true;
-                    }
-                }
-
-                // read chunk size
-                if (bytesInChunk == 0)
-                {
-                    n1 = input.readByte();
-                    n2 = input.readByte();
-
-                    chunkSize.writeByte(n1);
-                    chunkSize.writeByte(n2);
-
-                    while (!((n1 == 13) && (n2 == 10)))
-                    {
-                        n1 = n2;
-                        n2 = input.readByte();
-                        chunkSize.writeByte(n2);
-                    }
-
-                    bytesInChunk = parseInt(chunkSize.toString(), 16);
-                }
-
-                input.readBytes(buf, off, len);
-                debugBuffer(buf);
-                bytesInChunk -= len;
-
-                if (bytesInChunk == 0)
-                {
-                    // advance the : "\r\n"
-                    input.readUTFBytes(2);
-                }
-                return len;
-            }
-            catch (e:EOFError)
-            {
-                trace(e);
-                throw new TTransportError(TTransportError.UNKNOWN, "No more data available.");
-            }
-            catch (e:Error)
-            {
-                trace(e);
-                // WTF??
-                throw new TTransportError(TTransportError.UNKNOWN, "Bad IO error:" + e);
-            }
-            return 0;
-        }
-
-        public function debugBuffer(buf:ByteArray):void
-        {
-            var debug:String = "BUFFER >>";
-            var i:int;
-            for (i = 0; i < buf.length; i++)
-            {
-                debug += buf[i] as int;
-                debug += " ";
-            }
-
-            trace(debug + "<<");
-        }
-
-        public override function write(buf:ByteArray, off:int, len:int):void
-        {
-            obuffer.writeBytes(buf, off, len);
-        }
-
-        public function addEventListener(type:String, listener:Function, useCapture:Boolean = false, priority:int = 0, useWeakReference:Boolean = false):void
-        {
-            this.eventDispatcher.addEventListener(type, listener, useCapture, priority, useWeakReference);
-        }
-
-        public override function open():void
-        {
-            this.socket = new Socket();
-            this.socket.addEventListener(Event.CONNECT, socketConnected);
-            this.socket.addEventListener(IOErrorEvent.IO_ERROR, socketError);
-            this.socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socketSecurityError);
-            this.socket.addEventListener(ProgressEvent.SOCKET_DATA, socketDataHandler);
-            this.socket.connect(host, port);
-        }
-
-        public function socketConnected(event:Event):void
-        {
-            this.output = this.socket;
-            this.input = this.socket;
-            this.output.writeUTF("CONNECT " + resource + " HTTP/1.1\n" + "Host: " + host + ":" + port + "\r\n" + "User-Agent: Thrift/AS3\r\n" + "Transfer-Encoding: chunked\r\n" + "content-type: application/x-thrift\r\n" + "Accept: */*\r\n\r\n");
-            this.eventDispatcher.dispatchEvent(event);
-        }
-
-        public function socketError(event:IOErrorEvent):void
-        {
-            trace("Error Connecting:" + event);
-            this.close();
-            if (ioCallback == null)
-            {
-                return;
-            }
-            ioCallback(new TTransportError(TTransportError.UNKNOWN, "IOError: " + event.text));
-            this.eventDispatcher.dispatchEvent(event);
-        }
-
-        public function socketSecurityError(event:SecurityErrorEvent):void
-        {
-            trace("Security Error Connecting:" + event);
-            this.close();
-            this.eventDispatcher.dispatchEvent(event);
-        }
-
-        public function socketDataHandler(event:ProgressEvent):void
-        {
-        	trace("Got Data call:" +ioCallback);
-            if (ioCallback != null)
-            {
-                ioCallback(null);
-            };
-            this.eventDispatcher.dispatchEvent(event);
-        }
-
-        public override function flush(callback:Function = null):void
-        {
-            trace("set callback:" + callback);
-            this.ioCallback = callback;
-            this.output.writeUTF(this.obuffer.length.toString(16));
-            this.output.writeBytes(CRLF);
-            this.output.writeBytes(this.obuffer);
-            this.output.writeBytes(CRLF);
-            this.socket.flush();
-            // waiting for  new Flex sdk 3.5
-            //this.obuffer.clear();
-            this.obuffer = new ByteArray();
-        }
-
-        public override function isOpen():Boolean
-        {
-            return (this.socket == null ? false : this.socket.connected);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/THttpClient.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/THttpClient.as
deleted file mode 100644
index 435f911..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/THttpClient.as
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport {
-
-  import flash.errors.EOFError;
-  import flash.events.Event;
-  import flash.events.IOErrorEvent;
-  import flash.events.SecurityErrorEvent;
-  import flash.net.URLLoader;
-  import flash.net.URLLoaderDataFormat;
-  import flash.net.URLRequest;
-  import flash.net.URLRequestMethod;
-  import flash.system.Capabilities;
-  import flash.utils.ByteArray;
-  
-  /**
-   * HTTP implementation of the TTransport interface. Used for working with a
-   * Thrift web services implementation.
-   */
-  public class THttpClient extends TTransport {
-
-    private var request_:URLRequest = null;
-    private var requestBuffer_:ByteArray = new ByteArray();
-    private var responseBuffer_:ByteArray = null;
-    private var traceBuffers_:Boolean = Capabilities.isDebugger;
-
-    
-    public function getBuffer():ByteArray {
-      return requestBuffer_;
-    }
-    
-    public function THttpClient(request:URLRequest, traceBuffers:Boolean=true):void {
-      request.contentType = "application/x-thrift";
-      request_ = request;
-      if(traceBuffers == false) {
-        traceBuffers_ = traceBuffers;
-      }
-    }
-    
-    public override function open():void {
-    }
-
-    public override function close():void {
-    }
- 
-    public override function isOpen():Boolean {
-      return true;
-    }
-    
-    public override function read(buf:ByteArray, off:int, len:int):int {
-      if (responseBuffer_ == null) {
-        throw new TTransportError(TTransportError.UNKNOWN, "Response buffer is empty, no request.");
-      }
-        try {
-            responseBuffer_.readBytes(buf, off, len);
-            if (traceBuffers_) {
-              dumpBuffer(buf, "READ");
-            }
-            return len;
-          }
-          catch (e:EOFError) {
-            if (traceBuffers_) {
-              dumpBuffer(requestBuffer_, "FAILED-RESPONSE-REQUEST");
-              dumpBuffer(responseBuffer_, "FAILED-RESPONSE");
-            }
-            throw new TTransportError(TTransportError.UNKNOWN, "No more data available.");
-        }
-        return 0;
-    }
-
-    public override function write(buf:ByteArray, off:int, len:int):void {
-      requestBuffer_.writeBytes(buf, off, len);
-    }
-
-    public override function flush(callback:Function=null):void {
-      var loader:URLLoader = new URLLoader();
-      if (callback != null) {
-        loader.addEventListener(Event.COMPLETE, function(event:Event):void {
-         responseBuffer_ = URLLoader(event.target).data;
-         if (traceBuffers_) {
-           dumpBuffer(responseBuffer_, "RESPONSE_BUFFER");
-         }
-         callback(null);
-         responseBuffer_ = null;
-        });
-        loader.addEventListener(IOErrorEvent.IO_ERROR, function(event:IOErrorEvent):void {
-          callback(new TTransportError(TTransportError.UNKNOWN, "IOError: " + event.text));
-          responseBuffer_ = null;
-        });
-        loader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function(event:SecurityErrorEvent):void {
-          callback(new TTransportError(TTransportError.UNKNOWN, "SecurityError: " + event.text));
-          responseBuffer_ = null;
-        });
-      }
-      request_.method = URLRequestMethod.POST;
-      loader.dataFormat = URLLoaderDataFormat.BINARY;
-      requestBuffer_.position = 0;
-      request_.data = requestBuffer_;
-      loader.load(request_);
-    }
-
-    private function dumpBuffer(buf:ByteArray, prefix:String):String {
-      var debugString : String = prefix + " BUFFER ";
-      if (buf != null) {
-        debugString += "length: " + buf.length + ", ";
-        for (var i : int = 0; i < buf.length; i++) {
-          debugString += "[" + buf[i].toString(16) + "]";
-        }
-      } else {
-        debugString = "null";
-      }
-      trace(debugString);
-      return debugString;
-    }
-
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TSocket.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TSocket.as
deleted file mode 100644
index c60d711..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TSocket.as
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport
-{
-
-  import flash.events.EventDispatcher;
-  import flash.events.Event;
-  import flash.events.IOErrorEvent;
-  import flash.events.ProgressEvent;
-  import flash.events.SecurityErrorEvent;
-  import flash.errors.EOFError;
-  import flash.errors.IOError;
-  import flash.net.URLLoader;
-  import flash.net.URLLoaderDataFormat;
-  import flash.net.URLRequest;
-  import flash.net.URLRequestMethod;
-  import flash.utils.IDataInput;
-  import flash.utils.IDataOutput;
-  import flash.utils.ByteArray;
-  import flash.net.Socket;
-
-
-  /**
-   * Socket implementation of the TTransport interface. Used for working with a
-   * Thrift Socket Server based implementations.
-   */
-
-  public class TSocket extends TTransport
-  {
-    private var socket:Socket = null;
-
-    private var host:String;
-
-    private var port:int;
-
-    private var obuffer:ByteArray = new ByteArray();
-
-    private var input:IDataInput;
-
-    private var output:IDataOutput;
-
-    private var ioCallback:Function = null;
-
-    private var eventDispatcher:EventDispatcher = new EventDispatcher();
-
-    public function TSocket(host:String, port:int):void
-    {
-      this.host = host;
-      this.port = port;
-    }
-
-    public override function close():void
-    {
-      this.input = null;
-      this.output = null;
-      socket.close()
-    }
-
-    public override function peek():Boolean
-    {
-      if(socket.connected)
-      {
-        trace("Bytes remained:" + socket.bytesAvailable);
-        return socket.bytesAvailable>0;
-      }
-      return false;
-    }
-
-    public override function read(buf:ByteArray, off:int, len:int):int
-    {
-      var n1:int = 0, n2:int = 0, n3:int = 0, n4:int = 0, cidx:int = 2;
-      var chunkSize:ByteArray = new ByteArray();
-
-      try
-      {
-        input.readBytes(buf, off, len);
-        return len;
-      }
-      catch (e:EOFError)
-      {
-        trace(e);
-        throw new TTransportError(TTransportError.END_OF_FILE, "No more data available.");
-      }
-      catch (e:IOError)
-      {
-        trace(e);
-        if(isOpen())
-        {
-          throw new TTransportError(TTransportError.UNKNOWN, "IO error while reading: " + e);
-        }
-        else
-        {
-          throw new TTransportError(TTransportError.NOT_OPEN, "Socket seem not to be opened: " + e);
-    	}
-      }
-      catch (e:Error)
-      {
-        trace(e);
-        throw new TTransportError(TTransportError.UNKNOWN, "Bad IO error: " + e);
-      }
-      return 0;
-    }
-
-    public override function write(buf:ByteArray, off:int, len:int):void
-    {
-      obuffer.writeBytes(buf, off, len);
-    }
-
-    public function addEventListener(type:String, listener:Function, useCapture:Boolean = false, priority:int = 0, useWeakReference:Boolean = false):void
-    {
-      this.eventDispatcher.addEventListener(type, listener, useCapture, priority, useWeakReference);
-    }
-    
-    public function removeEventListener(type:String, listener:Function, useCapture:Boolean = false):void
-    {
-      this.eventDispatcher.removeEventListener(type, listener, useCapture);
-    }
-
-    public override function open():void
-    {
-      this.socket = new Socket();
-      this.socket.addEventListener(Event.CONNECT, socketConnected);
-      this.socket.addEventListener(IOErrorEvent.IO_ERROR, socketError);
-      this.socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socketSecurityError);
-      this.socket.addEventListener(ProgressEvent.SOCKET_DATA, socketDataHandler);
-      this.socket.connect(host, port);
-    }
-
-    public function socketConnected(event:Event):void
-    {
-      this.output = this.socket;
-      this.input = this.socket;
-      this.eventDispatcher.dispatchEvent(event);
-    }
-
-    public function socketError(event:IOErrorEvent):void
-    {
-      trace("Error Connecting:" + event);
-      this.close();
-      if (ioCallback == null)
-      {
-        return;
-      }
-      ioCallback(new TTransportError(TTransportError.UNKNOWN, "IOError: " + event.text));
-      this.eventDispatcher.dispatchEvent(event);
-    }
-
-    public function socketSecurityError(event:SecurityErrorEvent):void
-    {
-      trace("Security Error Connecting:" + event);
-      this.close();
-      this.eventDispatcher.dispatchEvent(event);
-    }
-
-    public function socketDataHandler(event:ProgressEvent):void
-    {
-      if (ioCallback != null)
-      {
-        ioCallback(null);
-      }
-      this.eventDispatcher.dispatchEvent(event);
-    }
-
-    public override function flush(callback:Function = null):void
-    {
-      this.ioCallback = callback;
-      this.output.writeBytes(this.obuffer);
-      this.socket.flush();
-      this.obuffer.clear();
-    }
-
-    public override function isOpen():Boolean
-    {
-      return (this.socket == null ? false : this.socket.connected);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TTransport.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TTransport.as
deleted file mode 100644
index 83160af..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TTransport.as
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport {
-  
-  import flash.utils.ByteArray;
-  import org.apache.thrift.AbstractMethodError;
-  
-  public class TTransport {
-
-    /**
-     * Queries whether the transport is open.
-       *
-     * @return True if the transport is open.
-     */
-    public function isOpen():Boolean {
-      throw new AbstractMethodError();
-    }
-    
-    /**
-     * Is there more data to be read?
-     *
-     * @return True if the remote side is still alive and feeding us
-     */
-    public function peek():Boolean {
-      return isOpen();
-    }
-
-    /**
-     * Opens the transport for reading/writing.
-     *
-     * @throws TTransportException if the transport could not be opened
-     */
-    public function open():void {
-      throw new AbstractMethodError();
-    }
-
-    /**
-     * Closes the transport.
-     */
-    public function close():void {
-      throw new AbstractMethodError();
-    };
-
-    /**
-     * Reads up to len bytes into buffer buf, starting att offset off.
-     *
-     * @param buf Array to read into
-     * @param off Index to start reading at
-     * @param len Maximum number of bytes to read
-     * @return The number of bytes actually read
-     * @throws TTransportException if there was an error reading data
-     */
-     public function read(buf:ByteArray, off:int, len:int):int {
-      throw new AbstractMethodError();
-     }
-
-    /**
-     * Guarantees that all of len bytes are actually read off the transport.
-     *
-     * @param buf Array to read into
-     * @param off Index to start reading at
-     * @param len Maximum number of bytes to read
-     * @return The number of bytes actually read, which must be equal to len
-     * @throws TTransportException if there was an error reading data
-     */
-    public function readAll(buf:ByteArray, off:int, len:int):int {
-      var got:int = 0;
-        var ret:int = 0;
-        while (got < len) {
-            ret = read(buf, off+got, len-got);
-            if (ret <= 0) {
-              throw new TTransportError(TTransportError.UNKNOWN, "Cannot read. Remote side has closed. Tried to read " + len + " bytes, but only got " + got + " bytes.");
-            }
-            got += ret;
-          }
-        return got;
-      }
-
-    /**
-     * Writes the buffer to the output
-     *
-     * @param buf The output data buffer
-     * @throws TTransportException if an error occurs writing data
-     */
-    public function writeAll(buf:ByteArray):void {
-      write(buf, 0, buf.length);
-    }
-
-    /**
-     * Writes up to len bytes from the buffer.
-     *
-     * @param buf The output data buffer
-     * @param off The offset to start writing from
-     * @param len The number of bytes to write
-     * @throws TTransportException if there was an error writing data
-     */
-    public function write(buf:ByteArray, off:int, len:int):void {
-      throw new AbstractMethodError();
-    }
-
-    /**
-     * Flush any pending data out of a transport buffer.
-     *
-     * @throws TTransportException if there was an error writing out data.
-     */
-    public function flush(callback:Function=null):void {
-      throw new AbstractMethodError();
-    }
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TTransportError.as b/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TTransportError.as
deleted file mode 100644
index 10a6f62..0000000
--- a/vendor/git.apache.org/thrift.git/lib/as3/src/org/apache/thrift/transport/TTransportError.as
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-package org.apache.thrift.transport {
-  
-  import org.apache.thrift.TError;
-
-  public class TTransportError extends TError {
-    
-    public static const UNKNOWN:int = 0;
-    public static const NOT_OPEN:int = 1;
-    public static const ALREADY_OPEN:int = 2;
-    public static const TIMED_OUT:int = 3;
-    public static const END_OF_FILE:int = 4;
-  
-    public function TTransportError(error:int = UNKNOWN, message:String = "") {
-      super(message, error);
-    }
-    
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/c_glib/CMakeLists.txt
deleted file mode 100644
index dd9892c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Find required packages
-find_package(GLIB REQUIRED COMPONENTS gobject)
-include_directories(${GLIB_INCLUDE_DIRS})
-
-include_directories(src)
-
-# SYSLIBS contains libraries that need to be linked to all lib targets
-set(SYSLIBS ${GLIB_LIBRARIES} ${GLIB_GOBJECT_LIBRARIES})
-
-# Create the thrift C glib library
-set(thrift_c_glib_SOURCES
-    src/thrift/c_glib/thrift.c
-    src/thrift/c_glib/thrift_struct.c
-    src/thrift/c_glib/thrift_application_exception.c
-    src/thrift/c_glib/processor/thrift_processor.c
-    src/thrift/c_glib/processor/thrift_dispatch_processor.c
-    src/thrift/c_glib/protocol/thrift_protocol.c
-    src/thrift/c_glib/protocol/thrift_protocol_factory.c
-    src/thrift/c_glib/protocol/thrift_binary_protocol.c
-    src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c
-    src/thrift/c_glib/protocol/thrift_compact_protocol.c
-    src/thrift/c_glib/protocol/thrift_compact_protocol_factory.c
-    src/thrift/c_glib/transport/thrift_transport.c
-    src/thrift/c_glib/transport/thrift_transport_factory.c
-    src/thrift/c_glib/transport/thrift_buffered_transport_factory.c
-    src/thrift/c_glib/transport/thrift_framed_transport_factory.c
-    src/thrift/c_glib/transport/thrift_socket.c
-    src/thrift/c_glib/transport/thrift_server_transport.c
-    src/thrift/c_glib/transport/thrift_server_socket.c
-    src/thrift/c_glib/transport/thrift_buffered_transport.c
-    src/thrift/c_glib/transport/thrift_fd_transport.c
-    src/thrift/c_glib/transport/thrift_framed_transport.c
-    src/thrift/c_glib/transport/thrift_memory_buffer.c
-    src/thrift/c_glib/server/thrift_server.c
-    src/thrift/c_glib/server/thrift_simple_server.c
-)
-
-# Contains the thrift specific ADD_LIBRARY_THRIFT and TARGET_LINK_LIBRARIES_THRIFT
-include(ThriftMacros)
-
-ADD_LIBRARY_THRIFT(thrift_c_glib ${thrift_c_glib_SOURCES})
-TARGET_LINK_LIBRARIES_THRIFT(thrift_c_glib ${SYSLIBS})
-
-# Install the headers
-install(DIRECTORY "src/thrift" DESTINATION "${INCLUDE_INSTALL_DIR}"
-    FILES_MATCHING PATTERN "*.h")
-# Copy config.h file
-install(DIRECTORY "${CMAKE_BINARY_DIR}/thrift" DESTINATION "${INCLUDE_INSTALL_DIR}"
-    FILES_MATCHING PATTERN "*.h")
-
-if(BUILD_TESTING)
-    add_subdirectory(test)
-endif()
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/Makefile.am b/vendor/git.apache.org/thrift.git/lib/c_glib/Makefile.am
deleted file mode 100755
index 452f6a4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = serial-tests
-SUBDIRS = . test
-
-pkgconfigdir = $(libdir)/pkgconfig
-
-lib_LTLIBRARIES = libthrift_c_glib.la
-pkgconfig_DATA = thrift_c_glib.pc
-
-AM_CPPFLAGS = -Isrc -I src/thrift/c_glib
-AM_CFLAGS = -Wall -Wextra -pedantic
-
-# Define the source files for the module
-
-libthrift_c_glib_la_SOURCES = src/thrift/c_glib/thrift.c \
-                              src/thrift/c_glib/thrift_struct.c \
-                              src/thrift/c_glib/thrift_application_exception.c \
-                              src/thrift/c_glib/processor/thrift_processor.c \
-                              src/thrift/c_glib/processor/thrift_dispatch_processor.c \
-                              src/thrift/c_glib/protocol/thrift_protocol.c \
-                              src/thrift/c_glib/protocol/thrift_protocol_factory.c \
-                              src/thrift/c_glib/protocol/thrift_binary_protocol.c \
-                              src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c \
-                              src/thrift/c_glib/protocol/thrift_compact_protocol.c \
-                              src/thrift/c_glib/protocol/thrift_compact_protocol_factory.c \
-                              src/thrift/c_glib/transport/thrift_transport.c \
-                              src/thrift/c_glib/transport/thrift_transport_factory.c \
-                              src/thrift/c_glib/transport/thrift_buffered_transport_factory.c \
-                              src/thrift/c_glib/transport/thrift_framed_transport_factory.c \
-                              src/thrift/c_glib/transport/thrift_socket.c \
-                              src/thrift/c_glib/transport/thrift_server_transport.c \
-                              src/thrift/c_glib/transport/thrift_server_socket.c \
-                              src/thrift/c_glib/transport/thrift_buffered_transport.c \
-                              src/thrift/c_glib/transport/thrift_fd_transport.c \
-                              src/thrift/c_glib/transport/thrift_framed_transport.c \
-                              src/thrift/c_glib/transport/thrift_memory_buffer.c \
-                              src/thrift/c_glib/server/thrift_server.c \
-                              src/thrift/c_glib/server/thrift_simple_server.c
-
-libthrift_c_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
-
-include_thriftdir = $(includedir)/thrift/c_glib
-include_thrift_HEADERS = \
-                         $(top_builddir)/config.h \
-                         src/thrift/c_glib/thrift.h \
-                         src/thrift/c_glib/thrift_application_exception.h \
-                         src/thrift/c_glib/thrift_struct.h
-
-include_protocoldir = $(include_thriftdir)/protocol
-include_protocol_HEADERS = src/thrift/c_glib/protocol/thrift_protocol.h \
-                           src/thrift/c_glib/protocol/thrift_protocol_factory.h \
-                           src/thrift/c_glib/protocol/thrift_binary_protocol.h \
-                           src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h \
-                           src/thrift/c_glib/protocol/thrift_compact_protocol.h \
-                           src/thrift/c_glib/protocol/thrift_compact_protocol_factory.h
-
-include_transportdir = $(include_thriftdir)/transport
-include_transport_HEADERS = src/thrift/c_glib/transport/thrift_buffered_transport.h \
-                            src/thrift/c_glib/transport/thrift_fd_transport.h \
-                            src/thrift/c_glib/transport/thrift_framed_transport.h \
-                            src/thrift/c_glib/transport/thrift_memory_buffer.h \
-                            src/thrift/c_glib/transport/thrift_server_socket.h \
-                            src/thrift/c_glib/transport/thrift_server_transport.h \
-                            src/thrift/c_glib/transport/thrift_socket.h \
-                            src/thrift/c_glib/transport/thrift_transport.h \
-                            src/thrift/c_glib/transport/thrift_transport_factory.h \
-                            src/thrift/c_glib/transport/thrift_buffered_transport_factory.h \
-                            src/thrift/c_glib/transport/thrift_framed_transport_factory.h
-
-include_serverdir = $(include_thriftdir)/server
-include_server_HEADERS = src/thrift/c_glib/server/thrift_server.h \
-                         src/thrift/c_glib/server/thrift_simple_server.h
-
-include_processordir = $(include_thriftdir)/processor
-include_processor_HEADERS = src/thrift/c_glib/processor/thrift_processor.h \
-                            src/thrift/c_glib/processor/thrift_dispatch_processor.h
-
-
-EXTRA_DIST = \
-             CMakeLists.txt \
-             coding_standards.md \
-             README.md \
-             test/glib.suppress \
-             thrift_c_glib.pc.in
-
-CLEANFILES = \
-             *.gcno \
-             *.gcda
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/README.md b/vendor/git.apache.org/thrift.git/lib/c_glib/README.md
deleted file mode 100644
index fd70d08..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Thrift C Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with C
-===================
-
-The Thrift C libraries are built using the GNU tools.  Follow the instructions
-in the top-level README in order to generate the Makefiles.
-
-Dependencies
-============
-
-GLib
-http://www.gtk.org/
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/c_glib/coding_standards.md
deleted file mode 100644
index 24b3a00..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/coding_standards.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## C Glib Coding Standards
-
-Please follow:
- * [Thrift General Coding Standards](/doc/coding_standards.md)
- * [GNOME C Coding Style](https://help.gnome.org/users/programming-guidelines/stable/c-coding-style.html.en)
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_dispatch_processor.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_dispatch_processor.c
deleted file mode 100644
index 57d6217..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_dispatch_processor.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/thrift_application_exception.h>
-#include <thrift/c_glib/processor/thrift_dispatch_processor.h>
-
-G_DEFINE_ABSTRACT_TYPE (ThriftDispatchProcessor,
-                        thrift_dispatch_processor,
-                        THRIFT_TYPE_PROCESSOR)
-
-gboolean
-thrift_dispatch_processor_process (ThriftProcessor *processor,
-                                   ThriftProtocol *in,
-                                   ThriftProtocol *out,
-                                   GError **error)
-{
-  gchar *fname;
-  ThriftMessageType mtype;
-  gint32 seqid;
-  ThriftDispatchProcessor *dispatch_processor =
-    THRIFT_DISPATCH_PROCESSOR (processor);
-
-  /* Read the start of the message, which we expect to be a method call */
-  if (thrift_protocol_read_message_begin (in,
-                                          &fname,
-                                          &mtype,
-                                          &seqid,
-                                          error) < 0) {
-    g_warning ("error reading start of message: %s",
-               (error != NULL) ? (*error)->message : "(null)");
-    return FALSE;
-  }
-  else if (mtype != T_CALL && mtype != T_ONEWAY) {
-    g_warning ("received invalid message type %d from client", mtype);
-    return FALSE;
-  }
-
-  /* Dispatch the method call */
-  return THRIFT_DISPATCH_PROCESSOR_GET_CLASS (dispatch_processor)
-    ->dispatch_call (dispatch_processor,
-                     in,
-                     out,
-                     fname,
-                     seqid,
-                     error);
-}
-
-static gboolean
-thrift_dispatch_processor_real_dispatch_call (ThriftDispatchProcessor *self,
-                                              ThriftProtocol *in,
-                                              ThriftProtocol *out,
-                                              gchar *fname,
-                                              gint32 seqid,
-                                              GError **error)
-{
-  ThriftTransport *transport;
-  ThriftApplicationException *xception;
-  gchar *message;
-  gint32 result;
-  gboolean dispatch_result = FALSE;
-
-  THRIFT_UNUSED_VAR (self);
-
-  /* By default, return an application exception to the client indicating the
-     method name is not recognized. */
-
-  if ((thrift_protocol_skip (in, T_STRUCT, error) < 0) ||
-      (thrift_protocol_read_message_end (in, error) < 0))
-    return FALSE;
-
-  g_object_get (in, "transport", &transport, NULL);
-  result = thrift_transport_read_end (transport, error);
-  g_object_unref (transport);
-  if (result < 0)
-    return FALSE;
-
-  if (thrift_protocol_write_message_begin (out,
-                                           fname,
-                                           T_EXCEPTION,
-                                           seqid,
-                                           error) < 0)
-    return FALSE;
-  message = g_strconcat ("Invalid method name: '", fname, "'", NULL);
-  g_free (fname);
-  xception =
-    g_object_new (THRIFT_TYPE_APPLICATION_EXCEPTION,
-                  "type",    THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN_METHOD,
-                  "message", message,
-                  NULL);
-  g_free (message);
-  result = thrift_struct_write (THRIFT_STRUCT (xception),
-                                out,
-                                error);
-  g_object_unref (xception);
-  if ((result < 0) ||
-      (thrift_protocol_write_message_end (out, error) < 0))
-    return FALSE;
-
-  g_object_get (out, "transport", &transport, NULL);
-  dispatch_result =
-    ((thrift_transport_write_end (transport, error) >= 0) &&
-     (thrift_transport_flush (transport, error) >= 0));
-  g_object_unref (transport);
-
-  return dispatch_result;
-}
-
-static void
-thrift_dispatch_processor_init (ThriftDispatchProcessor *self)
-{
-  THRIFT_UNUSED_VAR (self);
-}
-
-static void
-thrift_dispatch_processor_class_init (ThriftDispatchProcessorClass *klass)
-{
-  ThriftProcessorClass *processor_class =
-    THRIFT_PROCESSOR_CLASS (klass);
-
-  /* Implement ThriftProcessor's process method */
-  processor_class->process = thrift_dispatch_processor_process;
-
-  /* Provide a default implement for dispatch_call, which returns an exception
-     to the client indicating the method name was not recognized */
-  klass->dispatch_call = thrift_dispatch_processor_real_dispatch_call;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_dispatch_processor.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_dispatch_processor.h
deleted file mode 100644
index 5afb85e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_dispatch_processor.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_DISPATCH_PROCESSOR_H
-#define _THRIFT_DISPATCH_PROCESSOR_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/processor/thrift_processor.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_dispatch_processor.h
- *  \brief Parses a method-call message header and invokes a function
- *         to dispatch the call by function name.
- *
- * ThriftDispatchProcessor is an abstract helper class that parses the
- * header of a method-call message and invokes a member function,
- * dispatch_call, with the method's name.
- *
- * Subclasses must implement dispatch_call to dispatch the method call
- * to the implementing function.
- */
-
-/* Type macros */
-#define THRIFT_TYPE_DISPATCH_PROCESSOR (thrift_dispatch_processor_get_type ())
-#define THRIFT_DISPATCH_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_DISPATCH_PROCESSOR, ThriftDispatchProcessor))
-#define THRIFT_IS_DISPATCH_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_DISPATCH_PROCESSOR))
-#define THRIFT_DISPATCH_PROCESSOR_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_DISPATCH_PROCESSOR, ThriftDispatchProcessorClass))
-#define THRIFT_IS_DISPATCH_PROCESSOR_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_DISPATCH_PROCESSOR))
-#define THRIFT_DISPATCH_PROCESSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_DISPATCH_PROCESSOR, ThriftDispatchProcessorClass))
-
-/*!
- * Thrift Dispatch Processor object
- */
-struct _ThriftDispatchProcessor
-{
-  ThriftProcessor parent;
-};
-typedef struct _ThriftDispatchProcessor ThriftDispatchProcessor;
-
-/*!
- * Thrift Dispatch Processor class
- */
-struct _ThriftDispatchProcessorClass
-{
-  ThriftProcessorClass parent;
-
-  /* public */
-  gboolean (*process) (ThriftProcessor *processor,
-                       ThriftProtocol *in,
-                       ThriftProtocol *out,
-                       GError **error);
-
-  /* protected */
-  gboolean (*dispatch_call) (ThriftDispatchProcessor *self,
-                             ThriftProtocol *in,
-                             ThriftProtocol *out,
-                             gchar *fname,
-                             gint32 seqid,
-                             GError **error);
-};
-typedef struct _ThriftDispatchProcessorClass ThriftDispatchProcessorClass;
-
-/* Used by THRIFT_TYPE_DISPATCH_PROCESSOR */
-GType thrift_dispatch_processor_get_type (void);
-
-/*!
- * Processes a request.
- * \public \memberof ThriftDispatchProcessorClass
- */
-gboolean thrift_dispatch_processor_process (ThriftProcessor *processor,
-                                            ThriftProtocol *in,
-                                            ThriftProtocol *out,
-                                            GError **error);
-
-G_END_DECLS
-
-#endif /* _THRIFT_DISPATCH_PROCESSOR_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.c
deleted file mode 100644
index c242c25..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/processor/thrift_processor.h>
-
-G_DEFINE_ABSTRACT_TYPE(ThriftProcessor, thrift_processor, G_TYPE_OBJECT)
-
-gboolean
-thrift_processor_process (ThriftProcessor *processor, ThriftProtocol *in,
-                          ThriftProtocol *out, GError **error)
-{
-  return
-    THRIFT_PROCESSOR_GET_CLASS (processor)->process (processor, in, out, error);
-}
-
-/* class initializer for ThriftProcessor */
-static void
-thrift_processor_class_init (ThriftProcessorClass *cls)
-{
-  /* set these as virtual methods to be implemented by a subclass */
-  cls->process = thrift_processor_process;
-}
-
-static void
-thrift_processor_init (ThriftProcessor *processor)
-{
-  THRIFT_UNUSED_VAR (processor);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.h
deleted file mode 100644
index ff2d2da..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROCESSOR_H
-#define _THRIFT_PROCESSOR_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_processor.h
- *  \brief Abstract class for Thrift processors.
- */
-
-/* type macros */
-#define THRIFT_TYPE_PROCESSOR (thrift_processor_get_type ())
-#define THRIFT_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_PROCESSOR, ThriftProcessor))
-#define THRIFT_IS_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_PROCESSOR))
-#define THRIFT_PROCESSOR_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_PROCESSOR, ThriftProcessorClass))
-#define THRIFT_IS_PROCESSOR_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_PROCESSOR))
-#define THRIFT_PROCESSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_PROCESSOR, ThriftProcessorClass))
-
-/*!
- * Thrift Processorobject
- */
-struct _ThriftProcessor
-{
-  GObject parent;
-};
-typedef struct _ThriftProcessor ThriftProcessor;
-
-/*!
- * Thrift Processor class
- */
-struct _ThriftProcessorClass
-{
-  GObjectClass parent;
-
-  /* vtable */
-  gboolean (*process) (ThriftProcessor *processor, ThriftProtocol *in,
-                       ThriftProtocol *out, GError **error);
-};
-typedef struct _ThriftProcessorClass ThriftProcessorClass;
-
-/* used by THRIFT_TYPE_PROCESSOR */
-GType thrift_processor_get_type (void);
-
-/*!
- * Processes the request.
- * \public \memberof ThriftProcessorClass
- */
-gboolean thrift_processor_process (ThriftProcessor *processor,
-                                   ThriftProtocol *in, ThriftProtocol *out,
-                                   GError **error);
-
-G_END_DECLS
-
-#endif /* _THRIFT_PROCESSOR_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
deleted file mode 100644
index 48a2c5c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
+++ /dev/null
@@ -1,904 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string.h>
-#include <stdio.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-
-G_DEFINE_TYPE(ThriftBinaryProtocol, thrift_binary_protocol, THRIFT_TYPE_PROTOCOL)
-
-static guint64
-thrift_bitwise_cast_guint64 (gdouble v)
-{
-  union {
-    gdouble from;
-    guint64 to;
-  } u;
-  u.from = v;
-  return u.to;
-}
-
-static gdouble
-thrift_bitwise_cast_gdouble (guint64 v)
-{
-  union {
-    guint64 from;
-    gdouble to;
-  } u;
-  u.from = v;
-  return u.to;
-}
-
-gint32
-thrift_binary_protocol_write_message_begin (ThriftProtocol *protocol,
-    const gchar *name, const ThriftMessageType message_type,
-    const gint32 seqid, GError **error)
-{
-  gint32 version = (THRIFT_BINARY_PROTOCOL_VERSION_1)
-                   | ((gint32) message_type);
-  gint32 ret;
-  gint32 xfer = 0;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret = thrift_protocol_write_i32 (protocol, version, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  if ((ret = thrift_protocol_write_string (protocol, name, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  if ((ret = thrift_protocol_write_i32 (protocol, seqid, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_write_message_end (ThriftProtocol *protocol,
-                                          GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_write_struct_begin (ThriftProtocol *protocol,
-                                           const gchar *name,
-                                           GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (name);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_write_struct_end (ThriftProtocol *protocol,
-                                         GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_write_field_begin (ThriftProtocol *protocol,
-                                          const gchar *name,
-                                          const ThriftType field_type,
-                                          const gint16 field_id,
-                                          GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  THRIFT_UNUSED_VAR (name);
-
-  if ((ret = thrift_protocol_write_byte (protocol, (gint8) field_type,
-                                         error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  if ((ret = thrift_protocol_write_i16 (protocol, field_id, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_write_field_end (ThriftProtocol *protocol,
-                                        GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_write_field_stop (ThriftProtocol *protocol,
-                                         GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-  return thrift_protocol_write_byte (protocol, (gint8) T_STOP, error);
-}
-
-gint32
-thrift_binary_protocol_write_map_begin (ThriftProtocol *protocol,
-                                        const ThriftType key_type,
-                                        const ThriftType value_type,
-                                        const guint32 size,
-                                        GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret = thrift_protocol_write_byte (protocol, (gint8) key_type,
-                                         error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  if ((ret = thrift_protocol_write_byte (protocol, (gint8) value_type,
-                                         error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  if ((ret = thrift_protocol_write_i32 (protocol, (gint32) size, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_write_map_end (ThriftProtocol *protocol,
-                                      GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_write_list_begin (ThriftProtocol *protocol,
-                                         const ThriftType element_type,
-                                         const guint32 size, 
-                                         GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret = thrift_protocol_write_byte (protocol, (gint8) element_type,
-                                         error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-
-  if ((ret = thrift_protocol_write_i32 (protocol, (gint32) size, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_write_list_end (ThriftProtocol *protocol,
-                                       GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_write_set_begin (ThriftProtocol *protocol,
-                                        const ThriftType element_type,
-                                        const guint32 size, 
-                                        GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  return thrift_protocol_write_list_begin (protocol, element_type,
-                                           size, error);
-}
-
-gint32
-thrift_binary_protocol_write_set_end (ThriftProtocol *protocol, GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_write_bool (ThriftProtocol *protocol,
-                                   const gboolean value, GError **error)
-{
-  guint8 tmp;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  tmp = value ? 1 : 0;
-  return thrift_protocol_write_byte (protocol, tmp, error);
-}
-
-gint32
-thrift_binary_protocol_write_byte (ThriftProtocol *protocol, const gint8 value,
-                                   GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-   
-  if (thrift_transport_write (protocol->transport,
-                              (const gpointer) &value, 1, error))
-  {
-    return 1;
-  } else {
-    return -1;
-  }
-}
-
-gint32
-thrift_binary_protocol_write_i16 (ThriftProtocol *protocol, const gint16 value,
-                                  GError **error)
-{
-  gint16 net;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  net = g_htons (value);
-  if (thrift_transport_write (protocol->transport,
-                              (const gpointer) &net, 2, error))
-  {
-    return 2;
-  } else {
-    return -1;
-  }
-}
-
-gint32
-thrift_binary_protocol_write_i32 (ThriftProtocol *protocol, const gint32 value,
-                                  GError **error)
-{
-  gint32 net;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  net = g_htonl (value);
-  if (thrift_transport_write (protocol->transport,
-                              (const gpointer) &net, 4, error))
-  {
-    return 4;
-  } else {
-    return -1;
-  }
-}
-
-gint32
-thrift_binary_protocol_write_i64 (ThriftProtocol *protocol, const gint64 value,
-                                  GError **error)
-{
-  gint64 net;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  net = GUINT64_TO_BE (value);
-  if (thrift_transport_write (protocol->transport,
-                              (const gpointer) &net, 8, error))
-  {
-    return 8;
-  } else {
-    return -1;
-  }
-}
-
-gint32
-thrift_binary_protocol_write_double (ThriftProtocol *protocol,
-                                     const gdouble value, GError **error)
-{
-  guint64 bits;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  bits = GUINT64_FROM_BE (thrift_bitwise_cast_guint64 (value));
-  if (thrift_transport_write (protocol->transport,
-                              (const gpointer) &bits, 8, error))
-  {
-    return 8;
-  } else {
-    return -1;
-  }
-}
-
-gint32
-thrift_binary_protocol_write_string (ThriftProtocol *protocol,
-                                     const gchar *str, GError **error)
-{
-  guint32 len;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  len = str != NULL ? strlen (str) : 0;
-  /* write the string length + 1 which includes the null terminator */
-  return thrift_protocol_write_binary (protocol, (const gpointer) str, 
-                                       len, error);
-}
-
-gint32
-thrift_binary_protocol_write_binary (ThriftProtocol *protocol,
-                                     const gpointer buf,
-                                     const guint32 len, GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret = thrift_protocol_write_i32 (protocol, len, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-
-  if (len > 0)
-  {
-    if (thrift_transport_write (protocol->transport,
-                                (const gpointer) buf, len, error) == FALSE)
-    {
-      return -1;
-    }
-    xfer += len;
-  }
-
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_read_message_begin (ThriftProtocol *protocol,
-                                           gchar **name,
-                                           ThriftMessageType *message_type,
-                                           gint32 *seqid, GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-  gint32 sz;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret = thrift_protocol_read_i32 (protocol, &sz, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-
-  if (sz < 0)
-  {
-    /* check for version */
-    guint32 version = sz & THRIFT_BINARY_PROTOCOL_VERSION_MASK;
-    if (version != THRIFT_BINARY_PROTOCOL_VERSION_1)
-    {
-      g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                   THRIFT_PROTOCOL_ERROR_BAD_VERSION,
-                   "expected version %d, got %d",
-                   THRIFT_BINARY_PROTOCOL_VERSION_1, version);
-      return -1;
-    }
-
-    *message_type = (ThriftMessageType) (sz & 0x000000ff);
-
-    if ((ret = thrift_protocol_read_string (protocol, name, error)) < 0)
-    {
-      return -1;
-    }
-    xfer += ret;
-
-    if ((ret = thrift_protocol_read_i32 (protocol, seqid, error)) < 0)
-    {
-      return -1;
-    }
-    xfer += ret;
-  }
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_read_message_end (ThriftProtocol *protocol,
-                                         GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_read_struct_begin (ThriftProtocol *protocol,
-                                          gchar **name,
-                                          GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  *name = NULL;
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_read_struct_end (ThriftProtocol *protocol,
-                                        GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_read_field_begin (ThriftProtocol *protocol,
-                                         gchar **name,
-                                         ThriftType *field_type,
-                                         gint16 *field_id,
-                                         GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-  gint8 type;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  THRIFT_UNUSED_VAR (name);
-
-  if ((ret = thrift_protocol_read_byte (protocol, &type, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  *field_type = (ThriftType) type;
-  if (*field_type == T_STOP)
-  {
-    *field_id = 0;
-    return xfer;
-  }
-  if ((ret = thrift_protocol_read_i16 (protocol, field_id, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_read_field_end (ThriftProtocol *protocol,
-                                       GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_read_map_begin (ThriftProtocol *protocol,
-                                       ThriftType *key_type,
-                                       ThriftType *value_type,
-                                       guint32 *size,
-                                       GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-  gint8 k, v;
-  gint32 sizei;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret = thrift_protocol_read_byte (protocol, &k, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  *key_type = (ThriftType) k;
-
-  if ((ret = thrift_protocol_read_byte (protocol, &v, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  *value_type = (ThriftType) v;
-
-  if ((ret = thrift_protocol_read_i32 (protocol, &sizei, error)) <0)
-  {
-    return -1;
-  }
-  xfer += ret;
-
-  if (sizei < 0)
-  {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_NEGATIVE_SIZE,
-                 "got negative size of %d", sizei);
-    return -1;
-  }
-
-  *size = (guint32) sizei;
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_read_map_end (ThriftProtocol *protocol,
-                                     GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_read_list_begin (ThriftProtocol *protocol,
-                                        ThriftType *element_type,
-                                        guint32 *size, GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-  gint8 e;
-  gint32 sizei;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret = thrift_protocol_read_byte (protocol, &e, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-  *element_type = (ThriftType) e;
-
-  if ((ret = thrift_protocol_read_i32 (protocol, &sizei, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-
-  if (sizei < 0)
-  {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_NEGATIVE_SIZE,
-                 "got negative size of %d", sizei);
-    return -1;
-  }
-
-  *size = (guint32) sizei;
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_read_list_end (ThriftProtocol *protocol,
-                                      GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_read_set_begin (ThriftProtocol *protocol,
-                                       ThriftType *element_type,
-                                       guint32 *size, GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  return thrift_protocol_read_list_begin (protocol, element_type, size, error);
-}
-
-gint32
-thrift_binary_protocol_read_set_end (ThriftProtocol *protocol,
-                                     GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_binary_protocol_read_bool (ThriftProtocol *protocol, gboolean *value,
-                                  GError **error)
-{
-  gint32 ret;
-  gpointer b[1];
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret = 
-       thrift_transport_read_all (protocol->transport,
-                                  b, 1, error)) < 0)
-  {
-    return -1;
-  }
-  *value = *(gint8 *) b != 0;
-  return ret;
-}
-
-gint32
-thrift_binary_protocol_read_byte (ThriftProtocol *protocol, gint8 *value,
-                                  GError **error)
-{
-  gint32 ret;
-  gpointer b[1];
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret =
-       thrift_transport_read_all (protocol->transport,
-                                  b, 1, error)) < 0)
-  {
-    return -1;
-  }
-  *value = *(gint8 *) b;
-  return ret;
-}
-
-gint32
-thrift_binary_protocol_read_i16 (ThriftProtocol *protocol, gint16 *value,
-                                 GError **error)
-{
-  gint32 ret;
-  union
-  {
-    gint8 byte_array[2];
-    gint16 int16;
-  } b;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret =
-       thrift_transport_read_all (protocol->transport,
-                                  b.byte_array, 2, error)) < 0)
-  {
-    return -1;
-  }
-  *value = g_ntohs (b.int16);
-  return ret;
-}
-
-gint32
-thrift_binary_protocol_read_i32 (ThriftProtocol *protocol, gint32 *value,
-                                 GError **error)
-{
-  gint32 ret;
-  union
-  {
-    gint8 byte_array[4];
-    gint32 int32;
-  } b;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret =
-       thrift_transport_read_all (protocol->transport,
-                                  b.byte_array, 4, error)) < 0)
-  {
-    return -1;
-  }
-  *value = g_ntohl (b.int32);
-  return ret;
-}
-
-gint32
-thrift_binary_protocol_read_i64 (ThriftProtocol *protocol, gint64 *value,
-                                 GError **error)
-{
-  gint32 ret;
-  union
-  {
-    gint8 byte_array[8];
-    gint64 int64;
-  } b;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret =
-       thrift_transport_read_all (protocol->transport,
-                                  b.byte_array, 8, error)) < 0)
-  {
-    return -1;
-  }
-  *value = GUINT64_FROM_BE (b.int64);
-  return ret;
-}
-
-gint32
-thrift_binary_protocol_read_double (ThriftProtocol *protocol,
-                                    gdouble *value, GError **error)
-{
-  gint32 ret;
-  union
-  {
-    gint8 byte_array[8];
-    guint64 uint64;
-  } b;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  if ((ret =
-       thrift_transport_read_all (protocol->transport,
-                                  b.byte_array, 8, error)) < 0)
-  {
-    return -1;
-  }
-  *value = thrift_bitwise_cast_gdouble (GUINT64_FROM_BE (b.uint64));
-  return ret;
-}
-
-gint32
-thrift_binary_protocol_read_string (ThriftProtocol *protocol,
-                                    gchar **str, GError **error)
-{
-  guint32 len;
-  gint32 ret;
-  gint32 xfer = 0;
-  gint32 read_len = 0;
-
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  /* read the length into read_len */
-  if ((ret =
-       thrift_protocol_read_i32 (protocol, &read_len, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-
-  if (read_len > 0)
-  {
-    /* allocate the memory for the string */
-    len = (guint32) read_len + 1; /* space for null terminator */
-    *str = g_new0 (gchar, len);
-    if ((ret =
-         thrift_transport_read_all (protocol->transport,
-                                    *str, read_len, error)) < 0)
-    {
-      g_free (*str);
-      *str = NULL;
-      len = 0;
-      return -1;
-    }
-    xfer += ret;
-  } else {
-    *str = NULL;
-  }
-
-  return xfer;
-}
-
-gint32
-thrift_binary_protocol_read_binary (ThriftProtocol *protocol,
-                                    gpointer *buf, guint32 *len,
-                                    GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-  gint32 read_len = 0;
- 
-  g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
-
-  /* read the length into read_len */
-  if ((ret =
-       thrift_protocol_read_i32 (protocol, &read_len, error)) < 0)
-  {
-    return -1;
-  }
-  xfer += ret;
-
-  if (read_len > 0)
-  {
-    /* allocate the memory as an array of unsigned char for binary data */
-    *len = (guint32) read_len;
-    *buf = g_new (guchar, *len);
-    if ((ret =
-         thrift_transport_read_all (protocol->transport,
-                                    *buf, *len, error)) < 0)
-    {
-      g_free (*buf);
-      *buf = NULL;
-      *len = 0;
-      return -1;
-    }
-    xfer += ret;
-  } else {
-    *len = (guint32) read_len;
-    *buf = NULL;
-  }
-
-  return xfer;
-}
-
-static void
-thrift_binary_protocol_init (ThriftBinaryProtocol *protocol)
-{
-  THRIFT_UNUSED_VAR (protocol);
-}
-
-/* initialize the class */
-static void
-thrift_binary_protocol_class_init (ThriftBinaryProtocolClass *klass)
-{
-  ThriftProtocolClass *cls = THRIFT_PROTOCOL_CLASS (klass);
-
-  cls->write_message_begin = thrift_binary_protocol_write_message_begin;
-  cls->write_message_end = thrift_binary_protocol_write_message_end;
-  cls->write_struct_begin = thrift_binary_protocol_write_struct_begin;
-  cls->write_struct_end = thrift_binary_protocol_write_struct_end;
-  cls->write_field_begin = thrift_binary_protocol_write_field_begin;
-  cls->write_field_end = thrift_binary_protocol_write_field_end;
-  cls->write_field_stop = thrift_binary_protocol_write_field_stop;
-  cls->write_map_begin = thrift_binary_protocol_write_map_begin;
-  cls->write_map_end = thrift_binary_protocol_write_map_end;
-  cls->write_list_begin = thrift_binary_protocol_write_list_begin;
-  cls->write_list_end = thrift_binary_protocol_write_list_end;
-  cls->write_set_begin = thrift_binary_protocol_write_set_begin;
-  cls->write_set_end = thrift_binary_protocol_write_set_end;
-  cls->write_bool = thrift_binary_protocol_write_bool;
-  cls->write_byte = thrift_binary_protocol_write_byte;
-  cls->write_i16 = thrift_binary_protocol_write_i16;
-  cls->write_i32 = thrift_binary_protocol_write_i32;
-  cls->write_i64 = thrift_binary_protocol_write_i64;
-  cls->write_double = thrift_binary_protocol_write_double;
-  cls->write_string = thrift_binary_protocol_write_string;
-  cls->write_binary = thrift_binary_protocol_write_binary;
-  cls->read_message_begin = thrift_binary_protocol_read_message_begin;
-  cls->read_message_end = thrift_binary_protocol_read_message_end;
-  cls->read_struct_begin = thrift_binary_protocol_read_struct_begin;
-  cls->read_struct_end = thrift_binary_protocol_read_struct_end;
-  cls->read_field_begin = thrift_binary_protocol_read_field_begin;
-  cls->read_field_end = thrift_binary_protocol_read_field_end;
-  cls->read_map_begin = thrift_binary_protocol_read_map_begin;
-  cls->read_map_end = thrift_binary_protocol_read_map_end;
-  cls->read_list_begin = thrift_binary_protocol_read_list_begin;
-  cls->read_list_end = thrift_binary_protocol_read_list_end;
-  cls->read_set_begin = thrift_binary_protocol_read_set_begin;
-  cls->read_set_end = thrift_binary_protocol_read_set_end;
-  cls->read_bool = thrift_binary_protocol_read_bool;
-  cls->read_byte = thrift_binary_protocol_read_byte;
-  cls->read_i16 = thrift_binary_protocol_read_i16;
-  cls->read_i32 = thrift_binary_protocol_read_i32;
-  cls->read_i64 = thrift_binary_protocol_read_i64;
-  cls->read_double = thrift_binary_protocol_read_double;
-  cls->read_string = thrift_binary_protocol_read_string;
-  cls->read_binary = thrift_binary_protocol_read_binary;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.h
deleted file mode 100644
index 5230bcc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_BINARY_PROTOCOL_H
-#define _THRIFT_BINARY_PROTOCOL_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_binary_protocol.h
- *  \brief Binary protocol implementation of a Thrift protocol.  Implements the
- *         ThriftProtocol interface.
- */
-
-/* type macros */
-#define THRIFT_TYPE_BINARY_PROTOCOL (thrift_binary_protocol_get_type ())
-#define THRIFT_BINARY_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_BINARY_PROTOCOL, ThriftBinaryProtocol))
-#define THRIFT_IS_BINARY_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_BINARY_PROTOCOL))
-#define THRIFT_BINARY_PROTOCOL_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_BINARY_PROTOCOL, ThriftBinaryProtocolClass))
-#define THRIFT_IS_BINARY_PROTOCOL_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_BINARY_PROTOCOL))
-#define THRIFT_BINARY_PROTOCOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_BINARY_PROTOCOL, ThriftBinaryProtocolClass))
-
-/* version numbers */
-#define THRIFT_BINARY_PROTOCOL_VERSION_1 0x80010000
-#define THRIFT_BINARY_PROTOCOL_VERSION_MASK 0xffff0000
-
-typedef struct _ThriftBinaryProtocol ThriftBinaryProtocol;
-
-/*!
- * Thrift Binary Protocol instance.
- */
-struct _ThriftBinaryProtocol
-{
-  ThriftProtocol parent;
-};
-
-typedef struct _ThriftBinaryProtocolClass ThriftBinaryProtocolClass;
-
-/*!
- * Thrift Binary Protocol class.
- */
-struct _ThriftBinaryProtocolClass
-{
-  ThriftProtocolClass parent;
-};
-
-/* used by THRIFT_TYPE_BINARY_PROTOCOL */
-GType thrift_binary_protocol_get_type (void);
-
-G_END_DECLS
-
-#endif /* _THRIFT_BINARY_PROTOCOL_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c
deleted file mode 100644
index 774e9ad..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol_factory.h>
-
-G_DEFINE_TYPE(ThriftBinaryProtocolFactory, thrift_binary_protocol_factory, THRIFT_TYPE_PROTOCOL_FACTORY)
-
-ThriftProtocol *
-thrift_binary_protocol_factory_get_protocol (ThriftProtocolFactory *factory,
-                                             ThriftTransport *transport)
-{
-  ThriftBinaryProtocol *tb = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL,
-                                           "transport", transport, NULL);
-
-  THRIFT_UNUSED_VAR (factory);
-
-  return THRIFT_PROTOCOL (tb);
-}
-
-static void
-thrift_binary_protocol_factory_class_init (ThriftBinaryProtocolFactoryClass *cls)
-{
-  ThriftProtocolFactoryClass *protocol_factory_class = THRIFT_PROTOCOL_FACTORY_CLASS (cls);
-
-  protocol_factory_class->get_protocol = thrift_binary_protocol_factory_get_protocol;
-}
-
-static void
-thrift_binary_protocol_factory_init (ThriftBinaryProtocolFactory *factory)
-{
-  THRIFT_UNUSED_VAR (factory);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
deleted file mode 100644
index eddc073..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_BINARY_PROTOCOL_FACTORY_H
-#define _THRIFT_BINARY_PROTOCOL_FACTORY_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
-
-G_BEGIN_DECLS
-
-/* type macros */
-#define THRIFT_TYPE_BINARY_PROTOCOL_FACTORY (thrift_binary_protocol_factory_get_type ())
-#define THRIFT_BINARY_PROTOCOL_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_BINARY_PROTOCOL_FACTORY, ThriftBinaryProtocolFactory))
-#define THRIFT_IS_BINARY_PROTOCOL_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_BINARY_PROTOCOL_FACTORY))
-#define THRIFT_BINARY_PROTOCOL_FACTORY_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_BINARY_PROTOCOL_FACTORY, ThriftBinaryProtocolFactoryClass))
-#define THRIFT_IS_BINARY_PROTOCOL_FACTORY_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_BINARY_PROTOCOL_FACTORY))
-#define THRIFT_BINARY_PROTOCOL_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_BINARY_PROTOCOL_FACTORY, ThriftBinaryProtocolFactoryClass))
-
-typedef struct _ThriftBinaryProtocolFactory ThriftBinaryProtocolFactory;
-
-struct _ThriftBinaryProtocolFactory
-{
-  ThriftProtocolFactory parent;
-};
-
-typedef struct _ThriftBinaryProtocolFactoryClass ThriftBinaryProtocolFactoryClass;
-
-struct _ThriftBinaryProtocolFactoryClass
-{
-  ThriftProtocolFactoryClass parent;
-};
-
-/* used by THRIFT_TYPE_BINARY_PROTOCOL_FACTORY */
-GType thrift_binary_protocol_factory_get_type (void);
-
-G_END_DECLS
-
-#endif /* _THRIFT_BINARY_PROTOCOL_FACTORY_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
deleted file mode 100644
index 87b6b30..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
+++ /dev/null
@@ -1,1609 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <string.h>
-#include <stdio.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/protocol/thrift_compact_protocol.h>
-
-#include <thrift/config.h>
-
-/*
- * *_to_zigzag depend on the fact that the right shift
- * operator on a signed integer is an arithmetic (sign-extending) shift.
- * If this is not the case, the current implementation will not work.
- */
-#if !defined(SIGNED_RIGHT_SHIFT_IS) || !defined(ARITHMETIC_RIGHT_SHIFT)
-# error "Unable to determine the behavior of a signed right shift"
-#endif
-#if SIGNED_RIGHT_SHIFT_IS != ARITHMETIC_RIGHT_SHIFT
-# error "thrift_compact_protocol only works if signed right shift is arithmetic"
-#endif
-
-/* object properties */
-enum _ThriftCompactProtocolProperties
-{
-    PROP_0,
-    PROP_THRIFT_COMPACT_PROTOCOL_STRING_LIMIT,
-    PROP_THRIFT_COMPACT_PROTOCOL_CONTAINER_LIMIT
-};
-
-G_DEFINE_TYPE (ThriftCompactProtocol, thrift_compact_protocol,
-               THRIFT_TYPE_PROTOCOL)
-
-static const gint8 PROTOCOL_ID = (gint8)0x82u;
-static const gint8 VERSION_N = 1;
-static const gint8 VERSION_MASK = 0x1f;       /* 0001 1111 */
-static const gint8 TYPE_MASK = (gint8)0xe0u;  /* 1110 0000 */
-static const gint8 TYPE_BITS = 0x07;          /* 0000 0111 */
-static const gint32 TYPE_SHIFT_AMOUNT = 5;
-
-enum Types {
-  CT_STOP           = 0x00,
-  CT_BOOLEAN_TRUE   = 0x01,
-  CT_BOOLEAN_FALSE  = 0x02,
-  CT_BYTE           = 0x03,
-  CT_I16            = 0x04,
-  CT_I32            = 0x05,
-  CT_I64            = 0x06,
-  CT_DOUBLE         = 0x07,
-  CT_BINARY         = 0x08,
-  CT_LIST           = 0x09,
-  CT_SET            = 0x0A,
-  CT_MAP            = 0x0B,
-  CT_STRUCT         = 0x0C
-};
-
-static const gint8 TTypeToCType[16] = {
-  CT_STOP, /* T_STOP */
-  0, /* unused */
-  CT_BOOLEAN_TRUE, /* T_BOOL */
-  CT_BYTE, /* T_BYTE */
-  CT_DOUBLE, /* T_DOUBLE */
-  0, /* unused */
-  CT_I16, /* T_I16 */
-  0, /* unused */
-  CT_I32, /* T_I32 */
-  0, /* unused */
-  CT_I64, /* T_I64 */
-  CT_BINARY, /* T_STRING */
-  CT_STRUCT, /* T_STRUCT */
-  CT_MAP, /* T_MAP */
-  CT_SET, /* T_SET */
-  CT_LIST, /* T_LIST */
-};
-
-static guint64
-thrift_bitwise_cast_guint64 (const gdouble v)
-{
-  union {
-    gdouble from;
-    guint64 to;
-  } u;
-  u.from = v;
-  return u.to;
-}
-
-static gdouble
-thrift_bitwise_cast_gdouble (const guint64 v)
-{
-  union {
-    guint64 from;
-    gdouble to;
-  } u;
-  u.from = v;
-  return u.to;
-}
-
-/**
- * Convert l into a zigzag long. This allows negative numbers to be
- * represented compactly as a varint.
- */
-static guint64
-i64_to_zigzag (const gint64 l)
-{
-  return (l << 1) ^ (l >> 63);
-}
-
-/**
- * Convert n into a zigzag int. This allows negative numbers to be
- * represented compactly as a varint.
- */
-static guint32
-i32_to_zigzag (const gint32 n)
-{
-  return (n << 1) ^ (n >> 31);
-}
-
-/**
- * Convert from zigzag int to int.
- */
-static gint32
-zigzag_to_i32 (guint32 n)
-{
-  return (n >> 1) ^ (guint32) (-(gint32) (n & 1));
-}
-
-/**
- * Convert from zigzag long to long.
- */
-static gint64
-zigzag_to_i64 (guint64 n)
-{
-  return (n >> 1) ^ (guint64) (-(gint64) (n & 1));
-}
-
-ThriftType thrift_compact_protocol_get_ttype (ThriftCompactProtocol *protocol,
-                                              const gint8 type, GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-
-  switch (type) {
-    case T_STOP:
-      return T_STOP;
-    case CT_BOOLEAN_FALSE:
-    case CT_BOOLEAN_TRUE:
-      return T_BOOL;
-    case CT_BYTE:
-      return T_BYTE;
-    case CT_I16:
-      return T_I16;
-    case CT_I32:
-      return T_I32;
-    case CT_I64:
-      return T_I64;
-    case CT_DOUBLE:
-      return T_DOUBLE;
-    case CT_BINARY:
-      return T_STRING;
-    case CT_LIST:
-      return T_LIST;
-    case CT_SET:
-      return T_SET;
-    case CT_MAP:
-      return T_MAP;
-    case CT_STRUCT:
-      return T_STRUCT;
-    default:
-      g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                   THRIFT_PROTOCOL_ERROR_INVALID_DATA,
-                   "unrecognized type");
-      return -1;
-  }
-}
-
-/**
- * Write an i32 as a varint. Results in 1-5 bytes on the wire.
- */
-gint32
-thrift_compact_protocol_write_varint32 (ThriftCompactProtocol *protocol,
-                                        const guint32 n,
-                                        GError **error)
-{
-  guint8 buf[5];
-  gint32 xfer;
-  guint32 m;
-
-  THRIFT_UNUSED_VAR (error);
-
-  xfer = 0;
-  m = n;
-
-  while (TRUE) {
-    if ((m & ~0x7F) == 0) {
-      buf[xfer++] = (gint8)m;
-      break;
-    } else {
-      buf[xfer++] = (gint8)((m & 0x7F) | 0x80);
-      m >>= 7;
-    }
-  }
-
-  if (thrift_transport_write (THRIFT_PROTOCOL (protocol)->transport,
-                              (const gpointer) buf, xfer, error)) {
-    return xfer;
-  } else {
-    return -1;
-  }
-}
-
-/**
- * Write an i64 as a varint. Results in 1-10 bytes on the wire.
- */
-gint32
-thrift_compact_protocol_write_varint64 (ThriftCompactProtocol *protocol,
-                                        const guint64 n,
-                                        GError **error)
-{
-  guint8 buf[10];
-  gint32 xfer;
-  guint64 m;
-
-  THRIFT_UNUSED_VAR (error);
-
-  xfer = 0;
-  m = n;
-
-  while (TRUE) {
-    if ((m & ~0x7FL) == 0) {
-      buf[xfer++] = (gint8)m;
-      break;
-    } else {
-      buf[xfer++] = (gint8)((m & 0x7F) | 0x80);
-      m >>= 7;
-    }
-  }
-
-  if (thrift_transport_write (THRIFT_PROTOCOL (protocol)->transport,
-                              (const gpointer) buf, xfer, error)) {
-    return xfer;
-  } else {
-    return -1;
-  }
-}
-
-/**
- * Read an i64 from the wire as a proper varint. The MSB of each byte is set
- * if there is another byte to follow. This can read up to 10 bytes.
- */
-gint32
-thrift_compact_protocol_read_varint64 (ThriftCompactProtocol *protocol,
-                                       gint64 *i64,
-                                       GError **error)
-{
-  ThriftProtocol *tp;
-  gint32 ret;
-  gint32 xfer;
-  guint64 val;
-  gint shift;
-  guint8 byte;
-
-  tp = THRIFT_PROTOCOL (protocol);
-  xfer = 0;
-  val = 0;
-  shift = 0;
-  byte = 0;
-
-  while (TRUE) {
-    if ((ret = thrift_transport_read_all (tp->transport,
-                                          (gpointer) &byte, 1, error)) < 0) {
-      return -1;
-    }
-    ++xfer;
-    val |= (guint64)(byte & 0x7f) << shift;
-    shift += 7;
-    if (!(byte & 0x80)) {
-      *i64 = (gint64) val;
-      return xfer;
-    }
-    if (G_UNLIKELY (xfer == 10)) { /* 7 * 9 < 64 < 7 * 10 */
-      g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                   THRIFT_PROTOCOL_ERROR_INVALID_DATA,
-                   "variable-length int over 10 bytes");
-      return -1;
-    }
-  }
-}
-
-/**
- * Read an i32 from the wire as a varint. The MSB of each byte is set
- * if there is another byte to follow. This can read up to 5 bytes.
- */
-gint32
-thrift_compact_protocol_read_varint32 (ThriftCompactProtocol *protocol,
-                                       gint32 *i32,
-                                       GError **error)
-{
-  gint64 val;
-  gint32 ret;
-  gint32 xfer;
-
-  xfer = 0;
-
-  if ((ret = thrift_compact_protocol_read_varint64 (protocol, &val,
-                                                    error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  *i32 = (gint32)val;
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_write_field_begin_internal (ThriftCompactProtocol
-                                                      *protocol,
-                                                    const gchar *name,
-                                                    const ThriftType field_type,
-                                                    const gint16 field_id,
-                                                    const gint8 type_override,
-                                                    GError **error)
-{
-  gint32 ret;
-  gint32 xfer;
-  gint8 type_to_write;
-
-  THRIFT_UNUSED_VAR (name);
-
-  xfer = 0;
-
-  /* if there's a type override, use that. */
-  type_to_write
-    = (type_override == -1 ? TTypeToCType[field_type] : type_override);
-
-  /* check if we can use delta encoding for the field id */
-  if (field_id > protocol->_last_field_id
-      && field_id - protocol->_last_field_id <= 15) {
-    /* write them together */
-    if ((ret = thrift_protocol_write_byte (THRIFT_PROTOCOL (protocol),
-                                           (gint8) ((field_id
-                                                     - protocol->_last_field_id)
-                                                    << 4 | type_to_write),
-                                           error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  } else {
-    /* write them separate */
-    if ((ret = thrift_protocol_write_byte (THRIFT_PROTOCOL (protocol),
-                                           type_to_write, error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-
-    if ((ret = thrift_protocol_write_i16 (THRIFT_PROTOCOL (protocol), field_id,
-                                          error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  }
-
-  protocol->_last_field_id = field_id;
-  return xfer;
-}
-
-/**
- * Method for writing the start of lists and sets. List and sets on
- * the wire differ only by the type indicator.
- */
-gint32
-thrift_compact_protocol_write_collection_begin (ThriftCompactProtocol *protocol,
-                                                const ThriftType elem_type,
-                                                guint32 size, GError **error)
-{
-  gint32 ret;
-  gint32 xfer;
-
-  xfer = 0;
-
-  if (size <= 14) {
-    if ((ret = thrift_protocol_write_byte (THRIFT_PROTOCOL (protocol),
-                                           (gint8) (size << 4
-                                                    | TTypeToCType[elem_type]),
-                                           error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  } else {
-    if ((ret = thrift_protocol_write_byte (THRIFT_PROTOCOL (protocol),
-                                           (gint8) (0xf0
-                                                    | TTypeToCType[elem_type]),
-                                           error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-
-    if ((ret = thrift_compact_protocol_write_varint32 (protocol,
-                                                       (guint32) size,
-                                                       error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  }
-
-  return xfer;
-}
-
-/*
- * public methods
- */
-
-gint32
-thrift_compact_protocol_write_message_begin (ThriftProtocol *protocol,
-                                             const gchar *name,
-                                             const ThriftMessageType
-                                               message_type,
-                                             const gint32 seqid, GError **error)
-{
-  gint8 version;
-  gint32 ret;
-  gint32 xfer;
-
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  version = (VERSION_N & VERSION_MASK)
-            | (((gint32) message_type << TYPE_SHIFT_AMOUNT) & TYPE_MASK);
-  xfer = 0;
-
-  if ((ret = thrift_protocol_write_byte (protocol, PROTOCOL_ID, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if ((ret = thrift_protocol_write_byte (protocol, version, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if ((ret = thrift_compact_protocol_write_varint32 (cp,
-                                                     (guint32) seqid,
-                                                     error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if ((ret = thrift_protocol_write_string (protocol, name, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_write_message_end (ThriftProtocol *protocol,
-                                           GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_write_struct_begin (ThriftProtocol *protocol,
-                                            const gchar *name,
-                                            GError **error)
-{
-  ThriftCompactProtocol *cp;
-  GQueue *q;
-
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (name);
-  THRIFT_UNUSED_VAR (error);
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-  q = &(cp->_last_field);
-
-  g_queue_push_tail (q, GINT_TO_POINTER ((gint) cp->_last_field_id));
-  cp->_last_field_id = 0;
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_write_struct_end (ThriftProtocol *protocol,
-                                          GError **error)
-{
-  ThriftCompactProtocol *cp;
-  GQueue *q;
-
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (error);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-  q = &(cp->_last_field);
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp->_last_field_id = (gint16) GPOINTER_TO_INT (g_queue_pop_tail (q));
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_write_field_begin (ThriftProtocol *protocol,
-                                           const gchar *name,
-                                           const ThriftType field_type,
-                                           const gint16 field_id,
-                                           GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  if (field_type == T_BOOL) {
-    cp->_bool_field_name = name;
-    cp->_bool_field_type = field_type;
-    cp->_bool_field_id = field_id;
-    return 0;
-  } else {
-    return thrift_compact_protocol_write_field_begin_internal (cp, name,
-                                                               field_type,
-                                                               field_id, -1,
-                                                               error);
-  }
-}
-
-gint32
-thrift_compact_protocol_write_field_end (ThriftProtocol *protocol,
-                                         GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_write_field_stop (ThriftProtocol *protocol,
-                                          GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-  return thrift_protocol_write_byte (protocol, (gint8) T_STOP, error);
-}
-
-gint32
-thrift_compact_protocol_write_map_begin (ThriftProtocol *protocol,
-                                         const ThriftType key_type,
-                                         const ThriftType value_type,
-                                         const guint32 size,
-                                         GError **error)
-{
-  gint32 ret;
-  gint32 xfer;
-
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-
-  if ((ret = thrift_compact_protocol_write_varint32 (cp, (guint32) size,
-                                                     error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if (size > 0) {
-    if ((ret = thrift_protocol_write_byte (protocol,
-                                           (gint8) (TTypeToCType[key_type] << 4
-                                                    | TTypeToCType[value_type]),
-                                           error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  }
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_write_map_end (ThriftProtocol *protocol,
-                                       GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_write_list_begin (ThriftProtocol *protocol,
-                                          const ThriftType element_type,
-                                          const guint32 size,
-                                          GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  return thrift_compact_protocol_write_collection_begin (cp, element_type,
-                                                         size, error);
-}
-
-gint32
-thrift_compact_protocol_write_list_end (ThriftProtocol *protocol,
-                                        GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_write_set_begin (ThriftProtocol *protocol,
-                                         const ThriftType element_type,
-                                         const guint32 size,
-                                         GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  return thrift_compact_protocol_write_collection_begin (cp, element_type,
-                                                         size, error);
-}
-
-gint32
-thrift_compact_protocol_write_set_end (ThriftProtocol *protocol, GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_write_bool (ThriftProtocol *protocol,
-                                    const gboolean value, GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 xfer;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-
-  if (cp->_bool_field_name != NULL) {
-    /* we haven't written the field header yet */
-    if ((ret = thrift_compact_protocol_write_field_begin_internal (cp,
-                                 cp->_bool_field_name,
-                                 cp->_bool_field_type,
-                                 cp->_bool_field_id,
-                                 (gint8) (value
-                                          ? CT_BOOLEAN_TRUE : CT_BOOLEAN_FALSE),
-                                 error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-
-    cp->_bool_field_name = NULL;
-  } else {
-    /* we're not part of a field, so just write the value */
-    if ((ret = thrift_protocol_write_byte (protocol,
-                                           (gint8) (value ? CT_BOOLEAN_TRUE
-                                                          : CT_BOOLEAN_FALSE),
-                                           error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  }
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_write_byte (ThriftProtocol *protocol, const gint8 value,
-                                    GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  if (thrift_transport_write (protocol->transport,
-                              (const gpointer) &value, 1, error)) {
-    return 1;
-  } else {
-    return -1;
-  }
-}
-
-gint32
-thrift_compact_protocol_write_i16 (ThriftProtocol *protocol, const gint16 value,
-                                   GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  return thrift_compact_protocol_write_varint32 (cp,
-                         i32_to_zigzag ((gint32) value),
-                         error);
-}
-
-gint32
-thrift_compact_protocol_write_i32 (ThriftProtocol *protocol, const gint32 value,
-                                   GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  return thrift_compact_protocol_write_varint32 (cp,
-                         i32_to_zigzag (value),
-                         error);
-}
-
-gint32
-thrift_compact_protocol_write_i64 (ThriftProtocol *protocol, const gint64 value,
-                                   GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  return thrift_compact_protocol_write_varint64 (cp,
-                         i64_to_zigzag (value),
-                         error);
-}
-
-gint32
-thrift_compact_protocol_write_double (ThriftProtocol *protocol,
-                                      const gdouble value, GError **error)
-{
-  guint64 bits;
-
-  g_assert (sizeof (gdouble) == sizeof (guint64));
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  bits = GUINT64_TO_LE (thrift_bitwise_cast_guint64 (value));
-  if (thrift_transport_write (protocol->transport,
-                              (const gpointer) &bits, 8, error)) {
-    return 8;
-  } else {
-    return -1;
-  }
-}
-
-gint32
-thrift_compact_protocol_write_string (ThriftProtocol *protocol,
-                                      const gchar *str, GError **error)
-{
-  size_t len;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  len = str != NULL ? strlen (str) : 0;
-  if (len > G_MAXINT32) {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_SIZE_LIMIT,
-                 "string size (guess: %lu) is too large", (unsigned long) len);
-    return -1;
-  }
-
-  /* write the string length + 1 which includes the null terminator */
-  return thrift_protocol_write_binary (protocol, (const gpointer) str,
-                                       (const guint32) len, error);
-}
-
-gint32
-thrift_compact_protocol_write_binary (ThriftProtocol *protocol,
-                                      const gpointer buf,
-                                      const guint32 len, GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 xfer;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-
-  if ((ret = thrift_compact_protocol_write_varint32 (cp, len, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if (len > 0) {
-    /* checking len + xfer > uint_max, but we don't want to overflow while
-     * checking for overflows. transforming to len > uint_max - xfer.
-     */
-    if (len > (guint32) (G_MAXINT32 - xfer)) {
-      g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                   THRIFT_PROTOCOL_ERROR_SIZE_LIMIT,
-                   "size %d + %d is too large", len, xfer);
-      return -1;
-    }
-
-    if (thrift_transport_write (protocol->transport,
-                                (const gpointer) buf, len, error) == FALSE) {
-      return -1;
-    }
-    xfer += len;
-  }
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_message_begin (ThriftProtocol *protocol,
-                                            gchar **name,
-                                            ThriftMessageType *message_type,
-                                            gint32 *seqid, GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 xfer;
-
-  gint8 protocol_id, version_and_type, version;
-
-  xfer = 0;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  if ((ret = thrift_protocol_read_byte (protocol, &protocol_id, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if (protocol_id != PROTOCOL_ID) {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_BAD_VERSION,
-                 "bad protocol id");
-    return -1;
-  }
-
-  if ((ret = thrift_protocol_read_byte (protocol, &version_and_type,
-                                        error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  version = (gint8)(version_and_type & VERSION_MASK);
-  if (version != VERSION_N) {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_BAD_VERSION,
-                 "bad version and/or type");
-    return -1;
-  }
-
-  *message_type
-    = (ThriftMessageType)((version_and_type >> TYPE_SHIFT_AMOUNT) & TYPE_BITS);
-
-  if ((ret = thrift_compact_protocol_read_varint32 (cp, seqid, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if ((ret = thrift_protocol_read_string (protocol, name, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_message_end (ThriftProtocol *protocol,
-                                          GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_read_struct_begin (ThriftProtocol *protocol,
-                                           gchar **name,
-                                           GError **error)
-{
-  ThriftCompactProtocol *cp;
-  GQueue *q;
-
-  THRIFT_UNUSED_VAR (error);
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-  q = &(cp->_last_field);
-
-  *name = NULL;
-
-  g_queue_push_tail (q, GINT_TO_POINTER ((gint) cp->_last_field_id));
-  cp->_last_field_id = 0;
-
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_read_struct_end (ThriftProtocol *protocol,
-                                         GError **error)
-{
-  ThriftCompactProtocol *cp;
-  GQueue *q;
-
-  THRIFT_UNUSED_VAR (error);
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-  q = &(cp->_last_field);
-
-  cp->_last_field_id = (gint16) GPOINTER_TO_INT (g_queue_pop_tail (q));
-
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_read_field_begin (ThriftProtocol *protocol,
-                                          gchar **name,
-                                          ThriftType *field_type,
-                                          gint16 *field_id,
-                                          GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 xfer;
-
-  gint16 modifier;
-  gint8 byte;
-  gint8 type;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  THRIFT_UNUSED_VAR (name);
-
-  xfer = 0;
-
-  if ((ret = thrift_protocol_read_byte (protocol, &byte, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  type = (byte & 0x0f);
-
-  /* if it's a stop, then we can return immediately, as the struct is over. */
-  if (type == T_STOP) {
-    *field_type = T_STOP;
-    *field_id = 0;
-    return xfer;
-  }
-
-  /* mask off the 4 MSB of the type header.
-   * it could contain a field id delta.
-   */
-  modifier = (gint16)(((guint8)byte & 0xf0) >> 4);
-  if (modifier == 0) {
-    /* not a delta, look ahead for the zigzag varint field id. */
-    if ((ret = thrift_protocol_read_i16 (protocol, field_id, error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  } else {
-    *field_id = (gint16)(cp->_last_field_id + modifier);
-  }
-  if ((ret = thrift_compact_protocol_get_ttype (cp, type, error)) < 0) {
-    return -1;
-  }
-  *field_type = ret;
-
-  /* if this happens to be a boolean field, the value is encoded in the type */
-  if (type == CT_BOOLEAN_TRUE || type == CT_BOOLEAN_FALSE) {
-    /* save the boolean value in a special instance variable. */
-    cp->_has_bool_value = TRUE;
-    cp->_bool_value =
-      (type == CT_BOOLEAN_TRUE ? TRUE : FALSE);
-  }
-
-  /* push the new field onto the field stack so we can keep the deltas going. */
-  cp->_last_field_id = *field_id;
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_field_end (ThriftProtocol *protocol,
-                                        GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_read_map_begin (ThriftProtocol *protocol,
-                                        ThriftType *key_type,
-                                        ThriftType *value_type,
-                                        guint32 *size,
-                                        GError **error)
-{
-  gint32 ret;
-  gint32 xfer;
-
-  gint8 kv_type;
-  gint32 msize;
-
-  ThriftCompactProtocol *cp;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  kv_type = 0;
-  msize = 0;
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-
-  if ((ret = thrift_compact_protocol_read_varint32 (cp, &msize, error)) <0) {
-    return -1;
-  }
-  xfer += ret;
-
-  /* still read the kv byte if negative size */
-  if (msize != 0) {
-    if ((ret = thrift_protocol_read_byte (protocol, &kv_type, error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  }
-
-  if (cp->container_limit > 0 && msize > cp->container_limit) {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_SIZE_LIMIT,
-                 "got size over limit (%d > %d)", msize, cp->container_limit);
-    return -1;
-  } else if (msize > 0) {
-    if ((ret = thrift_compact_protocol_get_ttype (cp,
-                                                  (gint8)((guint8)kv_type
-                                                          >> 4),
-                                                  error)) < 0) {
-      return -1;
-    }
-    *key_type = ret;
-    if ((ret = thrift_compact_protocol_get_ttype (cp,
-                                                  (gint8)((guint8)kv_type
-                                                          & 0xf),
-                                                  error)) < 0) {
-      return -1;
-    }
-    *value_type = ret;
-    *size = (guint32) msize;
-  } else if (msize == 0) {
-    *key_type = 0;
-    *value_type = 0;
-    *size = 0;
-  } else {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_NEGATIVE_SIZE,
-                 "got negative size of %d", msize);
-    return -1;
-  }
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_map_end (ThriftProtocol *protocol,
-                                      GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_read_list_begin (ThriftProtocol *protocol,
-                                         ThriftType *element_type,
-                                         guint32 *size, GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 xfer;
-
-  gint8 size_and_type;
-  gint32 lsize;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  size_and_type = 0;
-
-  xfer = 0;
-
-  if ((ret = thrift_protocol_read_byte (protocol, &size_and_type, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  lsize = ((guint8)size_and_type >> 4) & 0x0f;
-  if (lsize == 15) {
-    if ((ret = thrift_compact_protocol_read_varint32 (cp, &lsize, error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-  }
-
-  if (lsize < 0) {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_NEGATIVE_SIZE,
-                 "got negative size of %d", lsize);
-    return -1;
-  } else if (cp->container_limit > 0 && lsize > cp->container_limit) {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_SIZE_LIMIT,
-                 "got size over limit (%d > %d)", lsize, cp->container_limit);
-    return -1;
-  }
-
-  if ((ret = thrift_compact_protocol_get_ttype (cp,
-                                                (gint8)(size_and_type & 0x0f),
-                                                error)) < 0) {
-    return -1;
-  }
-  *element_type = ret;
-  *size = (guint32) lsize;
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_list_end (ThriftProtocol *protocol,
-                                       GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_read_set_begin (ThriftProtocol *protocol,
-                                        ThriftType *element_type,
-                                        guint32 *size, GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  return thrift_protocol_read_list_begin (protocol, element_type, size, error);
-}
-
-gint32
-thrift_compact_protocol_read_set_end (ThriftProtocol *protocol,
-                                      GError **error)
-{
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-  return 0;
-}
-
-gint32
-thrift_compact_protocol_read_bool (ThriftProtocol *protocol, gboolean *value,
-                                   GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 xfer;
-
-  gint8 val;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-
-  if (cp->_has_bool_value == TRUE) {
-    *value = cp->_bool_value;
-    cp->_has_bool_value = FALSE;
-    return 0;
-  } else {
-    if ((ret = thrift_protocol_read_byte (protocol, &val, error)) < 0) {
-      return -1;
-    }
-    xfer += ret;
-
-    *value = (val == CT_BOOLEAN_TRUE);
-    return xfer;
-  }
-}
-
-gint32
-thrift_compact_protocol_read_byte (ThriftProtocol *protocol, gint8 *value,
-                                   GError **error)
-{
-  gint32 ret;
-  gpointer b[1];
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  if ((ret =
-       thrift_transport_read_all (protocol->transport,
-                                  b, 1, error)) < 0) {
-    return -1;
-  }
-  *value = *(gint8 *) b;
-  return ret;
-}
-
-gint32
-thrift_compact_protocol_read_i16 (ThriftProtocol *protocol, gint16 *value,
-                                  GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 val;
-  gint32 xfer;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-
-  if ((ret = thrift_compact_protocol_read_varint32 (cp, &val, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  *value = (gint16) zigzag_to_i32 ((guint32) val);
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_i32 (ThriftProtocol *protocol, gint32 *value,
-                                  GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 val;
-  gint32 xfer;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-
-  if ((ret = thrift_compact_protocol_read_varint32 (cp, &val, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  *value = zigzag_to_i32 ((guint32) val);
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_i64 (ThriftProtocol *protocol, gint64 *value,
-                                  GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint64 val;
-  gint32 xfer;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-
-  if ((ret = thrift_compact_protocol_read_varint64 (cp, &val, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  *value = zigzag_to_i64 ((guint64) val);
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_double (ThriftProtocol *protocol,
-                                     gdouble *value, GError **error)
-{
-  gint32 ret;
-  union {
-    guint64 bits;
-    guint8 b[8];
-  } u;
-
-  g_assert (sizeof (gdouble) == sizeof (guint64));
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  if ((ret =
-       thrift_transport_read_all (protocol->transport,
-                                  u.b, 8, error)) < 0) {
-    return -1;
-  }
-  u.bits = GUINT64_FROM_LE (u.bits);
-  *value = thrift_bitwise_cast_gdouble (u.bits);
-  return ret;
-}
-
-gint32
-thrift_compact_protocol_read_string (ThriftProtocol *protocol,
-                                     gchar **str, GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 xfer;
-
-  gint32 read_len;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-  read_len = 0;
-
-  /* read the length into read_len */
-  if ((ret =
-       thrift_compact_protocol_read_varint32 (cp, &read_len, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if (cp->string_limit > 0 && read_len > cp->string_limit) {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_SIZE_LIMIT,
-                 "got size over limit (%d > %d)", read_len, cp->string_limit);
-    *str = NULL;
-    return -1;
-  }
-
-  if (read_len > 0) {
-    /* allocate the memory as an array of unsigned char for binary data */
-    *str = g_new0 (gchar, read_len + 1);
-    if ((ret =
-         thrift_transport_read_all (protocol->transport,
-                                    *str, read_len, error)) < 0) {
-      g_free (*str);
-      *str = NULL;
-      return -1;
-    }
-    xfer += ret;
-
-  } else if (read_len == 0) {
-    *str = NULL;
-
-  } else {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_NEGATIVE_SIZE,
-                 "got negative size of %d", read_len);
-    *str = NULL;
-    return -1;
-  }
-
-  return xfer;
-}
-
-gint32
-thrift_compact_protocol_read_binary (ThriftProtocol *protocol,
-                                     gpointer *buf, guint32 *len,
-                                     GError **error)
-{
-  ThriftCompactProtocol *cp;
-
-  gint32 ret;
-  gint32 xfer;
-
-  gint32 read_len;
-
-  g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
-
-  cp = THRIFT_COMPACT_PROTOCOL (protocol);
-
-  xfer = 0;
-  read_len = 0;
-
-  /* read the length into read_len */
-  if ((ret =
-       thrift_compact_protocol_read_varint32 (cp, &read_len, error)) < 0) {
-    return -1;
-  }
-  xfer += ret;
-
-  if (cp->string_limit > 0 && read_len > cp->string_limit) {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_SIZE_LIMIT,
-                 "got size over limit (%d > %d)", read_len, cp->string_limit);
-    *buf = NULL;
-    *len = 0;
-    return -1;
-  }
-
-  if (read_len > 0) {
-    /* allocate the memory as an array of unsigned char for binary data */
-    *len = (guint32) read_len;
-    *buf = g_new (guchar, *len);
-    if ((ret =
-         thrift_transport_read_all (protocol->transport,
-                                    *buf, *len, error)) < 0) {
-      g_free (*buf);
-      *buf = NULL;
-      *len = 0;
-      return -1;
-    }
-    xfer += ret;
-
-  } else if (read_len == 0) {
-    *len = (guint32) read_len;
-    *buf = NULL;
-
-  } else {
-    g_set_error (error, THRIFT_PROTOCOL_ERROR,
-                 THRIFT_PROTOCOL_ERROR_NEGATIVE_SIZE,
-                 "got negative size of %d", read_len);
-    *buf = NULL;
-    *len = 0;
-    return -1;
-  }
-
-  return xfer;
-}
-
-/* property accessor */
-void
-thrift_compact_protocol_get_property (GObject *object, guint property_id,
-                                      GValue *value, GParamSpec *pspec)
-{
-  ThriftCompactProtocol *tc;
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  tc = THRIFT_COMPACT_PROTOCOL (object);
-
-  switch (property_id) {
-    case PROP_THRIFT_COMPACT_PROTOCOL_STRING_LIMIT:
-      g_value_set_int (value, tc->string_limit);
-      break;
-    case PROP_THRIFT_COMPACT_PROTOCOL_CONTAINER_LIMIT:
-      g_value_set_int (value, tc->container_limit);
-      break;
-  }
-}
-
-/* property mutator */
-void
-thrift_compact_protocol_set_property (GObject *object, guint property_id,
-                                      const GValue *value, GParamSpec *pspec)
-{
-  ThriftCompactProtocol *tc;
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  tc = THRIFT_COMPACT_PROTOCOL (object);
-
-  switch (property_id) {
-    case PROP_THRIFT_COMPACT_PROTOCOL_STRING_LIMIT:
-      tc->string_limit = g_value_get_int (value);
-      break;
-    case PROP_THRIFT_COMPACT_PROTOCOL_CONTAINER_LIMIT:
-      tc->container_limit = g_value_get_int (value);
-      break;
-  }
-}
-
-/* initialize the class */
-static void
-thrift_compact_protocol_class_init (ThriftCompactProtocolClass *klass)
-{
-  ThriftProtocolClass *cls;
-  GObjectClass *gobject_class;
-  GParamSpec *param_spec;
-
-  cls = THRIFT_PROTOCOL_CLASS (klass);
-  gobject_class = G_OBJECT_CLASS (klass);
-  param_spec = NULL;
-
-  /* setup accessors and mutators */
-  gobject_class->get_property = thrift_compact_protocol_get_property;
-  gobject_class->set_property = thrift_compact_protocol_set_property;
-
-  param_spec = g_param_spec_int ("string_limit",
-                                 "Max allowed string size",
-                                 "Set the max string limit",
-                                 0, /* min */
-                                 G_MAXINT32, /* max */
-                                 0, /* default value */
-                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_COMPACT_PROTOCOL_STRING_LIMIT,
-                                   param_spec);
-
-  param_spec = g_param_spec_int ("container_limit",
-                                 "Max allowed container size",
-                                 "Set the max container limit",
-                                 0, /* min */
-                                 G_MAXINT32, /* max */
-                                 0, /* default value */
-                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_COMPACT_PROTOCOL_CONTAINER_LIMIT,
-                                   param_spec);
-
-  cls->write_message_begin = thrift_compact_protocol_write_message_begin;
-  cls->write_message_end = thrift_compact_protocol_write_message_end;
-  cls->write_struct_begin = thrift_compact_protocol_write_struct_begin;
-  cls->write_struct_end = thrift_compact_protocol_write_struct_end;
-  cls->write_field_begin = thrift_compact_protocol_write_field_begin;
-  cls->write_field_end = thrift_compact_protocol_write_field_end;
-  cls->write_field_stop = thrift_compact_protocol_write_field_stop;
-  cls->write_map_begin = thrift_compact_protocol_write_map_begin;
-  cls->write_map_end = thrift_compact_protocol_write_map_end;
-  cls->write_list_begin = thrift_compact_protocol_write_list_begin;
-  cls->write_list_end = thrift_compact_protocol_write_list_end;
-  cls->write_set_begin = thrift_compact_protocol_write_set_begin;
-  cls->write_set_end = thrift_compact_protocol_write_set_end;
-  cls->write_bool = thrift_compact_protocol_write_bool;
-  cls->write_byte = thrift_compact_protocol_write_byte;
-  cls->write_i16 = thrift_compact_protocol_write_i16;
-  cls->write_i32 = thrift_compact_protocol_write_i32;
-  cls->write_i64 = thrift_compact_protocol_write_i64;
-  cls->write_double = thrift_compact_protocol_write_double;
-  cls->write_string = thrift_compact_protocol_write_string;
-  cls->write_binary = thrift_compact_protocol_write_binary;
-  cls->read_message_begin = thrift_compact_protocol_read_message_begin;
-  cls->read_message_end = thrift_compact_protocol_read_message_end;
-  cls->read_struct_begin = thrift_compact_protocol_read_struct_begin;
-  cls->read_struct_end = thrift_compact_protocol_read_struct_end;
-  cls->read_field_begin = thrift_compact_protocol_read_field_begin;
-  cls->read_field_end = thrift_compact_protocol_read_field_end;
-  cls->read_map_begin = thrift_compact_protocol_read_map_begin;
-  cls->read_map_end = thrift_compact_protocol_read_map_end;
-  cls->read_list_begin = thrift_compact_protocol_read_list_begin;
-  cls->read_list_end = thrift_compact_protocol_read_list_end;
-  cls->read_set_begin = thrift_compact_protocol_read_set_begin;
-  cls->read_set_end = thrift_compact_protocol_read_set_end;
-  cls->read_bool = thrift_compact_protocol_read_bool;
-  cls->read_byte = thrift_compact_protocol_read_byte;
-  cls->read_i16 = thrift_compact_protocol_read_i16;
-  cls->read_i32 = thrift_compact_protocol_read_i32;
-  cls->read_i64 = thrift_compact_protocol_read_i64;
-  cls->read_double = thrift_compact_protocol_read_double;
-  cls->read_string = thrift_compact_protocol_read_string;
-  cls->read_binary = thrift_compact_protocol_read_binary;
-}
-
-static void
-thrift_compact_protocol_init (ThriftCompactProtocol *self)
-{
-  g_queue_init (&(self->_last_field));
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.h
deleted file mode 100644
index effcaad..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_COMPACT_PROTOCOL_H
-#define _THRIFT_COMPACT_PROTOCOL_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_compact_protocol.h
- *  \brief Compact protocol implementation of a Thrift protocol.  Implements the
- *         ThriftProtocol interface.
- */
-
-/* type macros */
-#define THRIFT_TYPE_COMPACT_PROTOCOL (thrift_compact_protocol_get_type ())
-#define THRIFT_COMPACT_PROTOCOL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_COMPACT_PROTOCOL, \
-   ThriftCompactProtocol))
-#define THRIFT_IS_COMPACT_PROTOCOL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_COMPACT_PROTOCOL))
-#define THRIFT_COMPACT_PROTOCOL_CLASS(c) \
-  (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_COMPACT_PROTOCOL, \
-   ThriftCompactProtocolClass))
-#define THRIFT_IS_COMPACT_PROTOCOL_CLASS(c) \
-  (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_COMPACT_PROTOCOL))
-#define THRIFT_COMPACT_PROTOCOL_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_COMPACT_PROTOCOL, \
-   ThriftCompactProtocolClass))
-
-
-typedef struct _ThriftCompactProtocol ThriftCompactProtocol;
-
-/*!
- * Thrift Compact Protocol instance.
- */
-struct _ThriftCompactProtocol
-{
-  ThriftProtocol parent;
-
-  /* protected */
-  gint32 string_limit;
-  gint32 container_limit;
-
-  /* private */
-
-  /**
-   * (Writing) If we encounter a boolean field begin, save the TField here
-   * so it can have the value incorporated.
-   */
-  const gchar* _bool_field_name;
-  ThriftType _bool_field_type;
-  gint16 _bool_field_id;
-
-  /**
-   * (Reading) If we read a field header, and it's a boolean field, save
-   * the boolean value here so that read_bool can use it.
-   */
-  gboolean _has_bool_value;
-  gboolean _bool_value;
-
-  /**
-   * Used to keep track of the last field for the current and previous structs,
-   * so we can do the delta stuff.
-   */
-
-  GQueue _last_field;
-  gint16 _last_field_id;
-};
-
-typedef struct _ThriftCompactProtocolClass ThriftCompactProtocolClass;
-
-/*!
- * Thrift Compact Protocol class.
- */
-struct _ThriftCompactProtocolClass
-{
-  ThriftProtocolClass parent;
-};
-
-/* used by THRIFT_TYPE_COMPACT_PROTOCOL */
-GType thrift_compact_protocol_get_type (void);
-
-G_END_DECLS
-
-#endif /* _THRIFT_COMPACT_PROTOCOL_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol_factory.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol_factory.c
deleted file mode 100644
index e725e1f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol_factory.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_compact_protocol.h>
-#include <thrift/c_glib/protocol/thrift_compact_protocol_factory.h>
-
-/* object properties */
-enum _ThriftCompactProtocolFactoryProperties
-{
-    PROP_0,
-    PROP_THRIFT_COMPACT_PROTOCOL_FACTORY_STRING_LIMIT,
-    PROP_THRIFT_COMPACT_PROTOCOL_FACTORY_CONTAINER_LIMIT
-};
-
-G_DEFINE_TYPE (ThriftCompactProtocolFactory, thrift_compact_protocol_factory,
-               THRIFT_TYPE_PROTOCOL_FACTORY)
-
-ThriftProtocol *
-thrift_compact_protocol_factory_get_protocol (ThriftProtocolFactory *factory,
-                                              ThriftTransport *transport)
-{
-  ThriftCompactProtocolFactory *tcf;
-  ThriftCompactProtocol *tc;
-
-  tcf = THRIFT_COMPACT_PROTOCOL_FACTORY (factory);
-
-  tc = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL,
-                     "transport", transport,
-                     "string_limit", tcf->string_limit,
-                     "container_limit", tcf->container_limit,
-                     NULL);
-
-  return THRIFT_PROTOCOL (tc);
-}
-
-/* property accessor */
-void
-thrift_compact_protocol_factory_get_property (GObject *object, guint property_id,
-                                              GValue *value, GParamSpec *pspec)
-{
-  ThriftCompactProtocolFactory *tcf;
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  tcf = THRIFT_COMPACT_PROTOCOL_FACTORY (object);
-
-  switch (property_id) {
-    case PROP_THRIFT_COMPACT_PROTOCOL_FACTORY_STRING_LIMIT:
-      g_value_set_int (value, tcf->string_limit);
-      break;
-    case PROP_THRIFT_COMPACT_PROTOCOL_FACTORY_CONTAINER_LIMIT:
-      g_value_set_int (value, tcf->container_limit);
-      break;
-  }
-}
-
-/* property mutator */
-void
-thrift_compact_protocol_factory_set_property (GObject *object, guint property_id,
-                                              const GValue *value, GParamSpec
-                                                *pspec)
-{
-  ThriftCompactProtocolFactory *tcf;
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  tcf = THRIFT_COMPACT_PROTOCOL_FACTORY (object);
-
-  switch (property_id) {
-    case PROP_THRIFT_COMPACT_PROTOCOL_FACTORY_STRING_LIMIT:
-      tcf->string_limit = g_value_get_int (value);
-      break;
-    case PROP_THRIFT_COMPACT_PROTOCOL_FACTORY_CONTAINER_LIMIT:
-      tcf->container_limit = g_value_get_int (value);
-      break;
-  }
-}
-
-static void
-thrift_compact_protocol_factory_class_init (ThriftCompactProtocolFactoryClass
-                                              *klass)
-{
-  ThriftProtocolFactoryClass *cls;
-  GObjectClass *gobject_class;
-  GParamSpec *param_spec;
-
-  cls = THRIFT_PROTOCOL_FACTORY_CLASS (klass);
-  gobject_class = G_OBJECT_CLASS (klass);
-  param_spec = NULL;
-
-  /* setup accessors and mutators */
-  gobject_class->get_property = thrift_compact_protocol_factory_get_property;
-  gobject_class->set_property = thrift_compact_protocol_factory_set_property;
-
-  param_spec = g_param_spec_int ("string_limit",
-                                 "Max allowed string size",
-                                 "Set the max string limit",
-                                 0, /* min */
-                                 G_MAXINT32, /* max */
-                                 0, /* default value */
-                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_COMPACT_PROTOCOL_FACTORY_STRING_LIMIT,
-                                   param_spec);
-
-  param_spec = g_param_spec_int ("container_limit",
-                                 "Max allowed container size",
-                                 "Set the max container limit",
-                                 0, /* min */
-                                 G_MAXINT32, /* max */
-                                 0, /* default value */
-                                 G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-    PROP_THRIFT_COMPACT_PROTOCOL_FACTORY_CONTAINER_LIMIT, param_spec);
-
-  cls->get_protocol = thrift_compact_protocol_factory_get_protocol;
-}
-
-static void
-thrift_compact_protocol_factory_init (ThriftCompactProtocolFactory *factory)
-{
-  THRIFT_UNUSED_VAR (factory);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol_factory.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol_factory.h
deleted file mode 100644
index 3bf953b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol_factory.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_COMPACT_PROTOCOL_FACTORY_H
-#define _THRIFT_COMPACT_PROTOCOL_FACTORY_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
-
-G_BEGIN_DECLS
-
-/* type macros */
-#define THRIFT_TYPE_COMPACT_PROTOCOL_FACTORY \
-  (thrift_compact_protocol_factory_get_type ())
-#define THRIFT_COMPACT_PROTOCOL_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_COMPACT_PROTOCOL_FACTORY, \
-   ThriftCompactProtocolFactory))
-#define THRIFT_IS_COMPACT_PROTOCOL_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_COMPACT_PROTOCOL_FACTORY))
-#define THRIFT_COMPACT_PROTOCOL_FACTORY_CLASS(c) \
-  (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_COMPACT_PROTOCOL_FACTORY, \
-   ThriftCompactProtocolFactoryClass))
-#define THRIFT_IS_COMPACT_PROTOCOL_FACTORY_CLASS(c) \
-  (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_COMPACT_PROTOCOL_FACTORY))
-#define THRIFT_COMPACT_PROTOCOL_FACTORY_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_COMPACT_PROTOCOL_FACTORY, \
-   ThriftCompactProtocolFactoryClass))
-
-typedef struct _ThriftCompactProtocolFactory ThriftCompactProtocolFactory;
-
-struct _ThriftCompactProtocolFactory
-{
-  ThriftProtocolFactory parent;
-
-  /* protected */
-  gint32 string_limit;
-  gint32 container_limit;
-};
-
-typedef struct _ThriftCompactProtocolFactoryClass
-  ThriftCompactProtocolFactoryClass;
-
-struct _ThriftCompactProtocolFactoryClass
-{
-  ThriftProtocolFactoryClass parent;
-};
-
-/* used by THRIFT_TYPE_COMPACT_PROTOCOL_FACTORY */
-GType thrift_compact_protocol_factory_get_type (void);
-
-G_END_DECLS
-
-#endif /* _THRIFT_COMPACT_PROTOCOL_FACTORY_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.c
deleted file mode 100644
index 8a560a9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-/* define the GError domain string */
-#define THRIFT_PROTOCOL_ERROR_DOMAIN "thrift-protocol-error-quark"
-
-/* object properties */
-enum _ThriftProtocolProperties
-{
-  PROP_0,
-  PROP_THRIFT_PROTOCOL_TRANSPORT
-};
-
-G_DEFINE_ABSTRACT_TYPE(ThriftProtocol, thrift_protocol, G_TYPE_OBJECT)
-
-void
-thrift_protocol_get_property (GObject *object, guint property_id,
-                              GValue *value, GParamSpec *pspec)
-{
-  ThriftProtocol *protocol = THRIFT_PROTOCOL (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_PROTOCOL_TRANSPORT:
-      g_value_set_object (value, protocol->transport);
-      break;
-  }
-}
-
-void
-thrift_protocol_set_property (GObject *object, guint property_id,
-                              const GValue *value, GParamSpec *pspec)
-{
-
-  ThriftProtocol *protocol = THRIFT_PROTOCOL (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_PROTOCOL_TRANSPORT:
-      protocol->transport = g_value_get_object (value);
-      break;
-  }
-}
-
-
-gint32
-thrift_protocol_write_message_begin (ThriftProtocol *protocol, 
-                                     const gchar *name, 
-                                     const ThriftMessageType message_type,
-                                     const gint32 seqid, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_message_begin
-                                                   (protocol, name,
-                                                    message_type, seqid,
-                                                    error);
-}
-
-gint32
-thrift_protocol_write_message_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_message_end (protocol,
-                                                                  error);
-}
-
-gint32
-thrift_protocol_write_struct_begin (ThriftProtocol *protocol, const gchar *name,
-                                    GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_struct_begin (protocol,
-                                                   name, error);
-}
-
-gint32
-thrift_protocol_write_struct_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_struct_end (protocol,
-                                                                 error);
-}
-
-gint32
-thrift_protocol_write_field_begin (ThriftProtocol *protocol,
-                                   const gchar *name,
-                                   const ThriftType field_type,
-                                   const gint16 field_id,
-                                   GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_field_begin (protocol,
-                                                   name, field_type,
-                                                   field_id, error);
-}
-
-gint32
-thrift_protocol_write_field_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_field_end (protocol,
-                                                                error);
-}
-
-gint32
-thrift_protocol_write_field_stop (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_field_stop (protocol,
-                                                                 error);
-}
-
-gint32
-thrift_protocol_write_map_begin (ThriftProtocol *protocol,
-                                 const ThriftType key_type,
-                                 const ThriftType value_type,
-                                 const guint32 size, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_map_begin (protocol,
-                                                   key_type, value_type,
-                                                   size, error);
-}
-
-gint32
-thrift_protocol_write_map_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_map_end (protocol,
-                                                              error);
-}
-
-gint32
-thrift_protocol_write_list_begin (ThriftProtocol *protocol,
-                                  const ThriftType element_type,
-                                  const guint32 size, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_list_begin (protocol,
-                                                   element_type, size,
-                                                   error);
-}
-
-gint32
-thrift_protocol_write_list_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_list_end (protocol,
-                                                               error);
-}
-
-gint32
-thrift_protocol_write_set_begin (ThriftProtocol *protocol,
-                                 const ThriftType element_type,
-                                 const guint32 size, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_set_begin (protocol,
-                                                   element_type, size,
-                                                   error);
-}
-
-gint32
-thrift_protocol_write_set_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_set_end (protocol,
-                                                              error);
-}
-
-gint32
-thrift_protocol_write_bool (ThriftProtocol *protocol,
-                            const gboolean value, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_bool (protocol, value,
-                                                           error);
-}
-
-gint32
-thrift_protocol_write_byte (ThriftProtocol *protocol, const gint8 value,
-                            GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_byte (protocol, value,
-                                                           error);
-}
-
-gint32
-thrift_protocol_write_i16 (ThriftProtocol *protocol, const gint16 value,
-                           GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_i16 (protocol, value,
-                                                          error);
-}
-
-gint32
-thrift_protocol_write_i32 (ThriftProtocol *protocol, const gint32 value,
-                           GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_i32 (protocol, value,
-                                                          error);
-}
-
-gint32
-thrift_protocol_write_i64 (ThriftProtocol *protocol, const gint64 value,
-                           GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_i64 (protocol, value,
-                                                          error);
-}
-
-gint32
-thrift_protocol_write_double (ThriftProtocol *protocol,
-                              const gdouble value, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_double (protocol,
-                                                             value, error);
-}
-
-gint32
-thrift_protocol_write_string (ThriftProtocol *protocol,
-                              const gchar *str, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_string (protocol, str,
-                                                             error);
-}
-
-gint32
-thrift_protocol_write_binary (ThriftProtocol *protocol, const gpointer buf,
-                              const guint32 len, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->write_binary (protocol, buf,
-                                                             len, error);
-}
-
-gint32 
-thrift_protocol_read_message_begin (ThriftProtocol *protocol,
-                                    gchar **name,
-                                    ThriftMessageType *message_type,
-                                    gint32 *seqid, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_message_begin (protocol,
-                                                   name, message_type,
-                                                   seqid, error);
-}
-
-gint32 
-thrift_protocol_read_message_end (ThriftProtocol *protocol,
-                                  GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_message_end (protocol,
-                                                                 error);
-}
-
-gint32 
-thrift_protocol_read_struct_begin (ThriftProtocol *protocol,
-                                   gchar **name,
-                                   GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_struct_begin (protocol,
-                                                                  name,
-                                                                  error);
-}
-
-gint32
-thrift_protocol_read_struct_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_struct_end (protocol,
-                                                                error);
-}
-
-gint32 
-thrift_protocol_read_field_begin (ThriftProtocol *protocol,
-                                  gchar **name,
-                                  ThriftType *field_type,
-                                  gint16 *field_id,
-                                  GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_field_begin (protocol,
-                                                                 name,
-                                                                 field_type,
-                                                                 field_id,
-                                                                 error);
-}
-
-gint32 
-thrift_protocol_read_field_end (ThriftProtocol *protocol,
-                                GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_field_end (protocol,
-                                                               error);
-}
-
-gint32 
-thrift_protocol_read_map_begin (ThriftProtocol *protocol,
-                                ThriftType *key_type,
-                                ThriftType *value_type, guint32 *size,
-                                GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_map_begin (protocol,
-                                                               key_type,
-                                                               value_type,
-                                                               size,
-                                                               error); 
-}
-
-gint32 
-thrift_protocol_read_map_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_map_end (protocol,
-                                                             error);
-}
-
-gint32 
-thrift_protocol_read_list_begin (ThriftProtocol *protocol,
-                                 ThriftType *element_type,
-                                 guint32 *size, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_list_begin (protocol,
-                                                                element_type,
-                                                                size, error);
-}
-
-gint32
-thrift_protocol_read_list_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_list_end (protocol,
-                                                              error);
-}
-
-gint32
-thrift_protocol_read_set_begin (ThriftProtocol *protocol,
-                                ThriftType *element_type,
-                                guint32 *size, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_set_begin (protocol,
-                                                               element_type,
-                                                               size, error);
-}
-
-gint32
-thrift_protocol_read_set_end (ThriftProtocol *protocol, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_set_end (protocol,
-                                                             error);
-}
-
-gint32
-thrift_protocol_read_bool (ThriftProtocol *protocol, gboolean *value,
-                           GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_bool (protocol, value,
-                                                          error);
-}
-
-gint32
-thrift_protocol_read_byte (ThriftProtocol *protocol, gint8 *value,
-                           GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_byte (protocol, value,
-                                                          error);
-}
-
-gint32
-thrift_protocol_read_i16 (ThriftProtocol *protocol, gint16 *value,
-                          GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_i16 (protocol, value,
-                                                         error);
-}
-
-gint32
-thrift_protocol_read_i32 (ThriftProtocol *protocol, gint32 *value,
-                          GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_i32 (protocol, value,
-                                                         error);
-}
-
-gint32
-thrift_protocol_read_i64 (ThriftProtocol *protocol, gint64 *value,
-                          GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_i64 (protocol, value,
-                                                         error);
-}
-
-gint32
-thrift_protocol_read_double (ThriftProtocol *protocol,
-                             gdouble *value, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_double (protocol, value,
-                                                            error);
-}
-
-gint32
-thrift_protocol_read_string (ThriftProtocol *protocol,
-                             gchar **str, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_string (protocol, str,
-                                                            error);
-}
-
-gint32
-thrift_protocol_read_binary (ThriftProtocol *protocol, gpointer *buf, 
-                             guint32 *len, GError **error)
-{
-  return THRIFT_PROTOCOL_GET_CLASS (protocol)->read_binary (protocol, buf,
-                                                            len, error);
-}
-
-gint32
-thrift_protocol_skip (ThriftProtocol *protocol, ThriftType type, GError **error)
-{
-  switch (type)
-  {
-    case T_BOOL:
-      {
-        gboolean boolv;
-        return thrift_protocol_read_bool (protocol, &boolv, error);
-      }
-    case T_BYTE:
-      {
-        gint8 bytev;
-        return thrift_protocol_read_byte (protocol, &bytev, error);
-      }
-
-    case T_I16:
-      {
-        gint16 i16;
-        return thrift_protocol_read_i16 (protocol, &i16, error);
-      }
-    case T_I32:
-      {
-        gint32 i32;
-        return thrift_protocol_read_i32 (protocol, &i32, error);
-      }
-    case T_I64:
-      {
-        gint64 i64;
-        return thrift_protocol_read_i64 (protocol, &i64, error);
-      }
-    case T_DOUBLE:
-      {
-        gdouble dub;
-        return thrift_protocol_read_double (protocol, &dub, error);
-      }
-    case T_STRING:
-      {
-        gpointer data;
-        guint32 len;
-        gint32 ret = thrift_protocol_read_binary (protocol, &data, &len, error);
-        g_free (data);
-        return ret;
-      }
-    case T_STRUCT:
-      {
-        guint32 result = 0;
-        gchar *name;
-        gint16 fid;
-        ThriftType ftype;
-        result += thrift_protocol_read_struct_begin (protocol, &name, error);
-
-        while (1)
-        {
-          result += thrift_protocol_read_field_begin (protocol, &name, &ftype,
-                                                      &fid, error);
-          if (ftype == T_STOP)
-          {
-            break;
-          }
-          result += thrift_protocol_skip (protocol, ftype, error);
-          result += thrift_protocol_read_field_end (protocol, error);
-        }
-        result += thrift_protocol_read_struct_end (protocol, error);
-        return result;
-      }
-    case T_SET:
-      {
-        guint32 result = 0;
-        ThriftType elem_type;
-        guint32 i, size;
-        result += thrift_protocol_read_set_begin (protocol, &elem_type, &size,
-                                                  error);
-        for (i = 0; i < size; i++)
-        {
-          result += thrift_protocol_skip (protocol, elem_type, error);
-        }
-        result += thrift_protocol_read_set_end (protocol, error);
-        return result;
-      }
-    case T_MAP:
-      {
-        guint32 result = 0;
-        ThriftType elem_type;
-        ThriftType key_type;
-        guint32 i, size;
-        result += thrift_protocol_read_map_begin (protocol, &key_type, &elem_type, &size,
-                                                  error);
-        for (i = 0; i < size; i++)
-        {
-          result += thrift_protocol_skip (protocol, key_type, error);
-          result += thrift_protocol_skip (protocol, elem_type, error);
-        }
-        result += thrift_protocol_read_map_end (protocol, error);
-        return result;
-      }
-    case T_LIST:
-      {
-        guint32 result = 0;
-        ThriftType elem_type;
-        guint32 i, size;
-        result += thrift_protocol_read_list_begin (protocol, &elem_type, &size,
-                                                   error);
-        for (i = 0; i < size; i++)
-        {
-          result += thrift_protocol_skip (protocol, elem_type, error);
-        }
-        result += thrift_protocol_read_list_end (protocol, error);
-        return result;
-      }
-    default:
-      return 0;
-  }
-}
-
-/* define the GError domain for Thrift protocols */
-GQuark
-thrift_protocol_error_quark (void)
-{
-  return g_quark_from_static_string (THRIFT_PROTOCOL_ERROR_DOMAIN);
-}
-
-
-static void
-thrift_protocol_init (ThriftProtocol *protocol)
-{
-  protocol->transport = NULL;
-}
-
-static void
-thrift_protocol_class_init (ThriftProtocolClass *cls)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (cls);
-
-  gobject_class->get_property = thrift_protocol_get_property;
-  gobject_class->set_property = thrift_protocol_set_property;
-
-  g_object_class_install_property (gobject_class,
-      PROP_THRIFT_PROTOCOL_TRANSPORT,
-      g_param_spec_object ("transport", "Transport", "Thrift Transport",
-                           THRIFT_TYPE_TRANSPORT,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  cls->write_message_begin = thrift_protocol_write_message_begin;
-  cls->write_message_end = thrift_protocol_write_message_end;
-  cls->write_struct_begin = thrift_protocol_write_struct_begin;
-  cls->write_struct_end = thrift_protocol_write_struct_end;
-  cls->write_field_begin = thrift_protocol_write_field_begin;
-  cls->write_field_end = thrift_protocol_write_field_end;
-  cls->write_field_stop = thrift_protocol_write_field_stop;
-  cls->write_map_begin = thrift_protocol_write_map_begin;
-  cls->write_map_end = thrift_protocol_write_map_end;
-  cls->write_list_begin = thrift_protocol_write_list_begin;
-  cls->write_list_end = thrift_protocol_write_list_end;
-  cls->write_set_begin = thrift_protocol_write_set_begin;
-  cls->write_set_end = thrift_protocol_write_set_end;
-  cls->write_bool = thrift_protocol_write_bool;
-  cls->write_byte = thrift_protocol_write_byte;
-  cls->write_i16 = thrift_protocol_write_i16;
-  cls->write_i32 = thrift_protocol_write_i32;
-  cls->write_i64 = thrift_protocol_write_i64;
-  cls->write_double = thrift_protocol_write_double;
-  cls->write_string = thrift_protocol_write_string;
-  cls->write_binary = thrift_protocol_write_binary;
-  cls->read_message_begin = thrift_protocol_read_message_begin;
-  cls->read_message_end = thrift_protocol_read_message_end;
-  cls->read_struct_begin = thrift_protocol_read_struct_begin;
-  cls->read_struct_end = thrift_protocol_read_struct_end;
-  cls->read_field_begin = thrift_protocol_read_field_begin;
-  cls->read_field_end = thrift_protocol_read_field_end;
-  cls->read_map_begin = thrift_protocol_read_map_begin;
-  cls->read_map_end = thrift_protocol_read_map_end;
-  cls->read_list_begin = thrift_protocol_read_list_begin;
-  cls->read_set_begin = thrift_protocol_read_set_begin;
-  cls->read_set_end = thrift_protocol_read_set_end;
-  cls->read_bool = thrift_protocol_read_bool;
-  cls->read_byte = thrift_protocol_read_byte;
-  cls->read_i16 = thrift_protocol_read_i16;
-  cls->read_i32 = thrift_protocol_read_i32;
-  cls->read_i64 = thrift_protocol_read_i64;
-  cls->read_double = thrift_protocol_read_double;
-  cls->read_string = thrift_protocol_read_string;
-  cls->read_binary = thrift_protocol_read_binary;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.h
deleted file mode 100644
index 58fe5e0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_H
-#define _THRIFT_PROTOCOL_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_protocol.h
- *  \brief Abstract class for Thrift protocol implementations.
- */
-
-/**
- * Enumerated definition of the types that the Thrift protocol supports.
- * Take special note of the T_END type which is used specifically to mark
- * the end of a sequence of fields.
- */
-typedef enum {
-  T_STOP   = 0,
-  T_VOID   = 1,
-  T_BOOL   = 2,
-  T_BYTE   = 3,
-  T_I08    = 3,
-  T_I16    = 6,
-  T_I32    = 8,
-  T_U64    = 9,
-  T_I64    = 10,
-  T_DOUBLE = 4,
-  T_STRING = 11,
-  T_UTF7   = 11,
-  T_STRUCT = 12,
-  T_MAP    = 13,
-  T_SET    = 14,
-  T_LIST   = 15,
-  T_UTF8   = 16,
-  T_UTF16  = 17
-} ThriftType;
-
-/**
- * Enumerated definition of the message types that the Thrift protocol
- * supports.
- */
-typedef enum {
-  T_CALL      = 1,
-  T_REPLY     = 2,
-  T_EXCEPTION = 3,
-  T_ONEWAY    = 4
-} ThriftMessageType;
-
-/* type macros */
-#define THRIFT_TYPE_PROTOCOL (thrift_protocol_get_type ())
-#define THRIFT_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_PROTOCOL, ThriftProtocol))
-#define THRIFT_IS_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_PROTOCOL))
-#define THRIFT_PROTOCOL_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_PROTOCOL, ThriftProtocolClass))
-#define THRIFT_IS_PROTOCOL_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_PROTOCOL))
-#define THRIFT_PROTOCOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_PROTOCOL, ThriftProtocolClass))
-
-typedef struct _ThriftProtocol ThriftProtocol;
-
-/*!
- * Thrift Protocol object
- */
-struct _ThriftProtocol
-{
-  GObject parent;
-
-  /* protected */
-  ThriftTransport *transport;
-};
-
-typedef struct _ThriftProtocolClass ThriftProtocolClass;
-
-/*!
- * Thrift Protocol class
- */
-struct _ThriftProtocolClass
-{
-  GObjectClass parent;
-
-  gint32 (*write_message_begin) (ThriftProtocol *protocol, const gchar *name,
-                                 const ThriftMessageType message_type,
-                                 const gint32 seqid, GError **error);
-  gint32 (*write_message_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*write_struct_begin) (ThriftProtocol *protocol, const gchar *name,
-                                GError **error);
-  gint32 (*write_struct_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*write_field_begin) (ThriftProtocol *protocol, const gchar *name,
-                               const ThriftType field_type,
-                               const gint16 field_id, GError **error);
-  gint32 (*write_field_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*write_field_stop) (ThriftProtocol *protocol, GError **error);
-  gint32 (*write_map_begin) (ThriftProtocol *protocol,
-                             const ThriftType key_type,
-                             const ThriftType value_type,
-                             const guint32 size, GError **error);
-  gint32 (*write_map_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*write_list_begin) (ThriftProtocol *protocol,
-                              const ThriftType element_type,
-                              const guint32 size, GError **error);
-  gint32 (*write_list_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*write_set_begin) (ThriftProtocol *protocol,
-                             const ThriftType element_type,
-                             const guint32 size, GError **error);
-  gint32 (*write_set_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*write_bool) (ThriftProtocol *protocol, const gboolean value,
-                        GError **error);
-  gint32 (*write_byte) (ThriftProtocol *protocol, const gint8 value,
-                        GError **error);
-  gint32 (*write_i16) (ThriftProtocol *protocol, const gint16 value,
-                       GError **error);
-  gint32 (*write_i32) (ThriftProtocol *protocol, const gint32 value,
-                       GError **error);
-  gint32 (*write_i64) (ThriftProtocol *protocol, const gint64 value,
-                       GError **error);
-  gint32 (*write_double) (ThriftProtocol *protocol, const gdouble value,
-                          GError **error);
-  gint32 (*write_string) (ThriftProtocol *protocol, const gchar *str,
-                          GError **error);
-  gint32 (*write_binary) (ThriftProtocol *protocol, const gpointer buf,
-                          const guint32 len, GError **error);
-
-  gint32 (*read_message_begin) (ThriftProtocol *thrift_protocol, gchar **name,
-                                ThriftMessageType *message_type,
-                                gint32 *seqid, GError **error);
-  gint32 (*read_message_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*read_struct_begin) (ThriftProtocol *protocol, gchar **name,
-                               GError **error);
-  gint32 (*read_struct_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*read_field_begin) (ThriftProtocol *protocol, gchar **name,
-                              ThriftType *field_type, gint16 *field_id,
-                              GError **error);
-  gint32 (*read_field_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*read_map_begin) (ThriftProtocol *protocol, ThriftType *key_type,
-                            ThriftType *value_type, guint32 *size,
-                            GError **error);
-  gint32 (*read_map_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*read_list_begin) (ThriftProtocol *protocol, ThriftType *element_type,
-                             guint32 *size, GError **error);
-  gint32 (*read_list_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*read_set_begin) (ThriftProtocol *protocol, ThriftType *element_type,
-                            guint32 *size, GError **error);
-  gint32 (*read_set_end) (ThriftProtocol *protocol, GError **error);
-  gint32 (*read_bool) (ThriftProtocol *protocol, gboolean *value,
-                       GError **error);
-  gint32 (*read_byte) (ThriftProtocol *protocol, gint8 *value, GError **error);
-  gint32 (*read_i16) (ThriftProtocol *protocol, gint16 *value, GError **error);
-  gint32 (*read_i32) (ThriftProtocol *protocol, gint32 *value, GError **error);
-  gint32 (*read_i64) (ThriftProtocol *protocol, gint64 *value, GError **error);
-  gint32 (*read_double) (ThriftProtocol *protocol, gdouble *value,
-                         GError **error);
-  gint32 (*read_string) (ThriftProtocol *protocol, gchar **str, GError **error);
-  gint32 (*read_binary) (ThriftProtocol *protocol, gpointer *buf,
-                         guint32 *len, GError **error);
-};
-
-/* used by THRIFT_TYPE_PROTOCOL */
-GType thrift_protocol_get_type (void);
-
-/* virtual public methods */
-gint32 thrift_protocol_write_message_begin (ThriftProtocol *protocol,
-           const gchar *name, const ThriftMessageType message_type,
-           const gint32 seqid, GError **error);
-
-gint32 thrift_protocol_write_message_end (ThriftProtocol *protocol,
-                                          GError **error);
-
-gint32 thrift_protocol_write_struct_begin (ThriftProtocol *protocol,
-                                           const gchar *name,
-                                           GError **error);
-
-gint32 thrift_protocol_write_struct_end (ThriftProtocol *protocol,
-                                         GError **error);
-
-gint32 thrift_protocol_write_field_begin (ThriftProtocol *protocol,
-                                          const gchar *name,
-                                          const ThriftType field_type,
-                                          const gint16 field_id,
-                                          GError **error);
-
-gint32 thrift_protocol_write_field_end (ThriftProtocol *protocol,
-                                        GError **error);
-
-gint32 thrift_protocol_write_field_stop (ThriftProtocol *protocol,
-                                         GError **error);
-
-gint32 thrift_protocol_write_map_begin (ThriftProtocol *protocol,
-                                        const ThriftType key_type,
-                                        const ThriftType value_type,
-                                        const guint32 size, GError **error);
-
-gint32 thrift_protocol_write_map_end (ThriftProtocol *protocol, GError **error);
-
-gint32 thrift_protocol_write_list_begin (ThriftProtocol *protocol,
-                                         const ThriftType element_type,
-                                         const guint32 size, GError **error);
-
-gint32 thrift_protocol_write_list_end (ThriftProtocol *protocol,
-                                       GError **error);
-
-gint32 thrift_protocol_write_set_begin (ThriftProtocol *protocol,
-                                        const ThriftType element_type,
-                                        const guint32 size, GError **error);
-
-gint32 thrift_protocol_write_set_end (ThriftProtocol *protocol,
-                                      GError **error);
-
-gint32 thrift_protocol_write_bool (ThriftProtocol *protocol,
-                                   const gboolean value, GError **error);
-
-gint32 thrift_protocol_write_byte (ThriftProtocol *protocol, const gint8 value,
-                                   GError **error);
-
-gint32 thrift_protocol_write_i16 (ThriftProtocol *protocol, const gint16 value,
-                                  GError **error);
-
-gint32 thrift_protocol_write_i32 (ThriftProtocol *protocol, const gint32 value,
-                                  GError **error);
-
-gint32 thrift_protocol_write_i64 (ThriftProtocol *protocol, const gint64 value,
-                                  GError **error);
-
-gint32 thrift_protocol_write_double (ThriftProtocol *protocol,
-                                     const gdouble value, GError **error);
-
-gint32 thrift_protocol_write_string (ThriftProtocol *protocol,
-                                     const gchar *str, GError **error);
-
-gint32 thrift_protocol_write_binary (ThriftProtocol *protocol,
-                                     const gpointer buf,
-                                     const guint32 len, GError **error);
-
-gint32 thrift_protocol_read_message_begin (ThriftProtocol *thrift_protocol,
-                                           gchar **name,
-                                           ThriftMessageType *message_type,
-                                           gint32 *seqid, GError **error);
-
-gint32 thrift_protocol_read_message_end (ThriftProtocol *protocol,
-                                         GError **error);
-
-gint32 thrift_protocol_read_struct_begin (ThriftProtocol *protocol,
-                                          gchar **name,
-                                          GError **error);
-
-gint32 thrift_protocol_read_struct_end (ThriftProtocol *protocol,
-                                        GError **error);
-
-gint32 thrift_protocol_read_field_begin (ThriftProtocol *protocol,
-                                         gchar **name,
-                                         ThriftType *field_type,
-                                         gint16 *field_id,
-                                         GError **error);
-
-gint32 thrift_protocol_read_field_end (ThriftProtocol *protocol,
-                                       GError **error);
-
-gint32 thrift_protocol_read_map_begin (ThriftProtocol *protocol,
-                                       ThriftType *key_type,
-                                       ThriftType *value_type, guint32 *size,
-                                       GError **error);
-
-gint32 thrift_protocol_read_map_end (ThriftProtocol *protocol, GError **error);
-
-gint32 thrift_protocol_read_list_begin (ThriftProtocol *protocol,
-                                        ThriftType *element_type,
-                                        guint32 *size, GError **error);
-
-gint32 thrift_protocol_read_list_end (ThriftProtocol *protocol, GError **error);
-
-gint32 thrift_protocol_read_set_begin (ThriftProtocol *protocol,
-                                       ThriftType *element_type,
-                                       guint32 *size, GError **error);
-
-gint32 thrift_protocol_read_set_end (ThriftProtocol *protocol, GError **error);
-
-gint32 thrift_protocol_read_bool (ThriftProtocol *protocol, gboolean *value,
-                                  GError **error);
-
-gint32 thrift_protocol_read_byte (ThriftProtocol *protocol, gint8 *value,
-                                  GError **error);
-
-gint32 thrift_protocol_read_i16 (ThriftProtocol *protocol, gint16 *value,
-                                 GError **error);
-
-gint32 thrift_protocol_read_i32 (ThriftProtocol *protocol, gint32 *value,
-                                 GError **error);
-
-gint32 thrift_protocol_read_i64 (ThriftProtocol *protocol, gint64 *value,
-                                 GError **error);
-
-gint32 thrift_protocol_read_double (ThriftProtocol *protocol,
-                                    gdouble *value, GError **error);
-
-gint32 thrift_protocol_read_string (ThriftProtocol *protocol,
-                                    gchar **str, GError **error);
-
-gint32 thrift_protocol_read_binary (ThriftProtocol *protocol,
-                                    gpointer *buf, guint32 *len,
-                                    GError **error);
-
-gint32 thrift_protocol_skip (ThriftProtocol *protocol, ThriftType type,
-                             GError **error);
-
-/* define error types */
-typedef enum
-{
-  THRIFT_PROTOCOL_ERROR_UNKNOWN,
-  THRIFT_PROTOCOL_ERROR_INVALID_DATA,
-  THRIFT_PROTOCOL_ERROR_NEGATIVE_SIZE,
-  THRIFT_PROTOCOL_ERROR_SIZE_LIMIT,
-  THRIFT_PROTOCOL_ERROR_BAD_VERSION,
-  THRIFT_PROTOCOL_ERROR_NOT_IMPLEMENTED,
-  THRIFT_PROTOCOL_ERROR_DEPTH_LIMIT
-} ThriftProtocolError;
-
-/* define an error domain for GError to use */
-GQuark thrift_protocol_error_quark (void);
-#define THRIFT_PROTOCOL_ERROR (thrift_protocol_error_quark ())
-
-G_END_DECLS
-
-#endif /* _THRIFT_PROTOCOL_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.c
deleted file mode 100644
index bef4087..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
-
-G_DEFINE_ABSTRACT_TYPE(ThriftProtocolFactory, thrift_protocol_factory, G_TYPE_OBJECT)
-
-ThriftProtocol *
-thrift_protocol_factory_get_protocol(ThriftProtocolFactory *factory,
-                                     ThriftTransport *transport)
-{
-  return THRIFT_PROTOCOL_FACTORY_GET_CLASS (factory)->get_protocol (factory,
-                                                                    transport);
-}
-
-static void
-thrift_protocol_factory_init (ThriftProtocolFactory *factory)
-{
-  THRIFT_UNUSED_VAR (factory);
-}
-
-static void
-thrift_protocol_factory_class_init (ThriftProtocolFactoryClass *cls)
-{
-  cls->get_protocol = thrift_protocol_factory_get_protocol;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.h
deleted file mode 100644
index 5f146dd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_FACTORY_H
-#define _THRIFT_PROTOCOL_FACTORY_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_protocol_factory.h
- *  \brief Abstract class for Thrift protocol factory implementations.
- */
-
-/* type macros */
-#define THRIFT_TYPE_PROTOCOL_FACTORY (thrift_protocol_factory_get_type ())
-#define THRIFT_PROTOCOL_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_PROTOCOL_FACTORY, ThriftProtocolFactory))
-#define THRIFT_IS_PROTOCOL_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_PROTOCOL_FACTORY))
-#define THRIFT_PROTOCOL_FACTORY_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_PROTOCOL_FACTORY, ThriftProtocolFactoryClass))
-#define THRIFT_IS_PROTOCOL_FACTORY_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_PROTOCOL_FACTORY))
-#define THRIFT_PROTOCOL_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_PROTOCOL_FACTORY, ThriftProtocolFactoryClass))
-
-typedef struct _ThriftProtocolFactory ThriftProtocolFactory;
-
-/*!
- * Thrift Protocol Factory object
- */
-struct _ThriftProtocolFactory
-{
-  GObject parent;
-};
-
-typedef struct _ThriftProtocolFactoryClass ThriftProtocolFactoryClass;
-
-/*!
- * Thrift Protocol Factory class
- */
-struct _ThriftProtocolFactoryClass
-{
-  GObjectClass parent;
-
-  ThriftProtocol *(*get_protocol) (ThriftProtocolFactory *factory,
-                                   ThriftTransport *transport);
-};
-
-/* used by THRIFT_TYPE_PROTOCOL_FACTORY */
-GType thrift_protocol_factory_get_type (void);
-
-/* virtual public methods */
-ThriftProtocol *thrift_protocol_factory_get_protocol(ThriftProtocolFactory *factory, ThriftTransport *transport);
-
-G_END_DECLS
-
-#endif /* _THRIFT_PROTOCOL_FACTORY_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_server.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_server.c
deleted file mode 100644
index e8aff45..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_server.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include "thrift_server.h"
-
-/* object properties */
-enum _ThriftServerProperties
-{
-  PROP_0,
-  PROP_THRIFT_SERVER_PROCESSOR,
-  PROP_THRIFT_SERVER_SERVER_TRANSPORT,
-  PROP_THRIFT_SERVER_INPUT_TRANSPORT_FACTORY,
-  PROP_THRIFT_SERVER_OUTPUT_TRANSPORT_FACTORY,
-  PROP_THRIFT_SERVER_INPUT_PROTOCOL_FACTORY,
-  PROP_THRIFT_SERVER_OUTPUT_PROTOCOL_FACTORY
-};
-
-G_DEFINE_ABSTRACT_TYPE(ThriftServer, thrift_server, G_TYPE_OBJECT)
-
-void
-thrift_server_get_property (GObject *object, guint property_id,
-                            GValue *value, GParamSpec *pspec)
-{
-  ThriftServer *server = THRIFT_SERVER (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_SERVER_PROCESSOR:
-      g_value_set_object (value, server->processor);
-      break;
-    case PROP_THRIFT_SERVER_SERVER_TRANSPORT:
-      g_value_set_object (value, server->server_transport);
-      break;
-    case PROP_THRIFT_SERVER_INPUT_TRANSPORT_FACTORY:
-      g_value_set_object (value, server->input_transport_factory);
-      break;
-    case PROP_THRIFT_SERVER_OUTPUT_TRANSPORT_FACTORY:
-      g_value_set_object (value, server->output_transport_factory);
-      break;
-    case PROP_THRIFT_SERVER_INPUT_PROTOCOL_FACTORY:
-      g_value_set_object (value, server->input_protocol_factory);
-      break;
-    case PROP_THRIFT_SERVER_OUTPUT_PROTOCOL_FACTORY:
-      g_value_set_object (value, server->output_protocol_factory);
-      break;
-  }
-}
-
-void
-thrift_server_set_property (GObject *object, guint property_id,
-                            const GValue *value, GParamSpec *pspec)
-{
-  ThriftServer *server = THRIFT_SERVER (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_SERVER_PROCESSOR:
-      server->processor = g_value_get_object (value);
-      break;
-    case PROP_THRIFT_SERVER_SERVER_TRANSPORT:
-      server->server_transport = g_value_get_object (value);
-      break;
-    case PROP_THRIFT_SERVER_INPUT_TRANSPORT_FACTORY:
-      server->input_transport_factory = g_value_get_object (value);
-      break;
-    case PROP_THRIFT_SERVER_OUTPUT_TRANSPORT_FACTORY:
-      server->output_transport_factory = g_value_get_object (value);
-      break;
-    case PROP_THRIFT_SERVER_INPUT_PROTOCOL_FACTORY:
-      server->input_protocol_factory = g_value_get_object (value);
-      break;
-    case PROP_THRIFT_SERVER_OUTPUT_PROTOCOL_FACTORY:
-      server->output_protocol_factory = g_value_get_object (value);
-      break;
-  }
-}
-
-gboolean
-thrift_server_serve (ThriftServer *server, GError **error)
-{
-  return THRIFT_SERVER_GET_CLASS (server)->serve (server, error);
-}
-
-void
-thrift_server_stop (ThriftServer *server)
-{
-  THRIFT_SERVER_GET_CLASS (server)->stop (server);
-}
-
-/* instance initializer for Thrift Server */
-static void
-thrift_server_init (ThriftServer *server)
-{
-  server->processor = NULL;
-  server->server_transport = NULL;
-  server->input_transport_factory = NULL;
-  server->output_transport_factory = NULL;
-  server->input_protocol_factory = NULL;
-  server->output_protocol_factory = NULL;
-}
-
-/* class initializer for ThriftServer
- * TODO: implement ServerEventHandler as a GClosure
- */
-static void
-thrift_server_class_init (ThriftServerClass *cls)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (cls);
-
-  gobject_class->get_property = thrift_server_get_property;
-  gobject_class->set_property = thrift_server_set_property;
-
-  g_object_class_install_property (gobject_class,
-      PROP_THRIFT_SERVER_PROCESSOR,
-      g_param_spec_object ("processor", "Processor", "Thrift Processor",
-                           THRIFT_TYPE_PROCESSOR,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-  g_object_class_install_property (gobject_class,
-      PROP_THRIFT_SERVER_SERVER_TRANSPORT,
-      g_param_spec_object ("server_transport", "Server Transport",
-                           "Thrift Server Transport",
-                           THRIFT_TYPE_SERVER_TRANSPORT,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-  g_object_class_install_property (gobject_class,
-      PROP_THRIFT_SERVER_INPUT_TRANSPORT_FACTORY,
-      g_param_spec_object ("input_transport_factory", "Input Transport Factory",
-                           "Thrift Server Input Transport Factory",
-                           THRIFT_TYPE_TRANSPORT_FACTORY,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-  g_object_class_install_property (gobject_class,
-      PROP_THRIFT_SERVER_OUTPUT_TRANSPORT_FACTORY,
-      g_param_spec_object ("output_transport_factory",
-                           "Output Transport Factory",
-                           "Thrift Server Output Transport Factory",
-                           THRIFT_TYPE_TRANSPORT_FACTORY,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-  g_object_class_install_property (gobject_class,
-      PROP_THRIFT_SERVER_INPUT_PROTOCOL_FACTORY,
-      g_param_spec_object ("input_protocol_factory", "Input Protocol Factory",
-                           "Thrift Server Input Protocol Factory",
-                           THRIFT_TYPE_PROTOCOL_FACTORY,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-  g_object_class_install_property (gobject_class,
-      PROP_THRIFT_SERVER_OUTPUT_PROTOCOL_FACTORY,
-      g_param_spec_object ("output_protocol_factory", "Output Protocol Factory",
-                           "Thrift Server Output Protocol Factory",
-                           THRIFT_TYPE_PROTOCOL_FACTORY,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  /* set these as virtual methods to be implemented by a subclass */
-  cls->serve = thrift_server_serve;
-  cls->stop = thrift_server_stop;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_server.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_server.h
deleted file mode 100644
index 49beddc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_server.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_H
-#define _THRIFT_SERVER_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/processor/thrift_processor.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_transport_factory.h>
-#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_server.h
- *  \brief Abstract class for Thrift servers.
- */
-
-/* type macros */
-#define THRIFT_TYPE_SERVER (thrift_server_get_type ())
-#define THRIFT_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_SERVER, ThriftServer))
-#define THRIFT_IS_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_SERVER))
-#define THRIFT_SERVER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_SERVER, ThriftServerClass))
-#define THRIFT_IS_SERVER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_SERVER))
-#define THRIFT_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_SERVER, ThriftServerClass))
-
-typedef struct _ThriftServer ThriftServer;
-
-/*!
- * Thrift Server object
- */
-struct _ThriftServer
-{
-  GObject parent;
-
-  /* protected */
-  ThriftProcessor *processor;
-  ThriftServerTransport *server_transport;
-  ThriftTransportFactory *input_transport_factory;
-  ThriftTransportFactory *output_transport_factory;
-  ThriftProtocolFactory *input_protocol_factory;
-  ThriftProtocolFactory *output_protocol_factory;
-};
-
-typedef struct _ThriftServerClass ThriftServerClass;
-
-/*!
- * Thrift Server class
- */
-struct _ThriftServerClass
-{
-  GObjectClass parent;
-
-  /* vtable */
-  gboolean (*serve) (ThriftServer *server, GError **error);
-  void (*stop) (ThriftServer *server);
-};
-
-/* used by THRIFT_TYPE_SERVER */
-GType thrift_server_get_type (void);
-
-/*!
- * Processes the request.
- * \public \memberof ThriftServerClass
- */
-gboolean thrift_server_serve (ThriftServer *server, GError **error);
-
-/*!
- * Stop handling requests.
- */
-void thrift_server_stop (ThriftServer *server);
-
-G_END_DECLS
-
-#endif /* _THRIFT_SERVER_H */
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.c
deleted file mode 100644
index 22a96c7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/server/thrift_simple_server.h>
-#include <thrift/c_glib/transport/thrift_transport_factory.h>
-#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol_factory.h>
-
-G_DEFINE_TYPE(ThriftSimpleServer, thrift_simple_server, THRIFT_TYPE_SERVER)
-
-gboolean
-thrift_simple_server_serve (ThriftServer *server, GError **error)
-{
-  ThriftTransport *t = NULL;
-  ThriftTransport *input_transport = NULL, *output_transport = NULL;
-  ThriftProtocol *input_protocol = NULL, *output_protocol = NULL;
-  ThriftSimpleServer *tss = THRIFT_SIMPLE_SERVER(server);
-  GError *process_error = NULL;
-
-  g_return_val_if_fail (THRIFT_IS_SIMPLE_SERVER (server), FALSE);
-
-  if (thrift_server_transport_listen (server->server_transport, error)) {
-    tss->running = TRUE;
-    while (tss->running == TRUE)
-    {
-      t = thrift_server_transport_accept (server->server_transport,
-                                          error);
-      if (t != NULL && tss->running) {
-        input_transport =
-          THRIFT_TRANSPORT_FACTORY_GET_CLASS (server->input_transport_factory)
-          ->get_transport (server->input_transport_factory, t);
-        output_transport =
-          THRIFT_TRANSPORT_FACTORY_GET_CLASS (server->output_transport_factory)
-          ->get_transport (server->output_transport_factory, t);
-        input_protocol =
-          THRIFT_PROTOCOL_FACTORY_GET_CLASS (server->input_protocol_factory)
-          ->get_protocol (server->input_protocol_factory, input_transport);
-        output_protocol =
-          THRIFT_PROTOCOL_FACTORY_GET_CLASS (server->output_protocol_factory)
-          ->get_protocol (server->output_protocol_factory, output_transport);
-
-        while (THRIFT_PROCESSOR_GET_CLASS (server->processor)
-               ->process (server->processor,
-                          input_protocol,
-                          output_protocol,
-                          &process_error) &&
-               thrift_transport_peek (input_transport, &process_error))
-        {
-        }
-
-        if (process_error != NULL)
-        {
-          g_message ("thrift_simple_server_serve: %s", process_error->message);
-          g_clear_error (&process_error);
-
-          /* Note we do not propagate processing errors to the caller as they
-           * normally are transient and not fatal to the server */
-        }
-
-        /* TODO: handle exceptions */
-        THRIFT_TRANSPORT_GET_CLASS (input_transport)->close (input_transport,
-                                                             NULL);
-        THRIFT_TRANSPORT_GET_CLASS (output_transport)->close (output_transport,
-                                                              NULL);
-      }
-    }
-
-    /* attempt to shutdown */
-    THRIFT_SERVER_TRANSPORT_GET_CLASS (server->server_transport)
-      ->close (server->server_transport, NULL);
-  }
-
-  /* Since this method is designed to run forever, it can only ever return on
-   * error */
-  return FALSE;
-}
-
-void
-thrift_simple_server_stop (ThriftServer *server)
-{
-  g_return_if_fail (THRIFT_IS_SIMPLE_SERVER (server));
-  (THRIFT_SIMPLE_SERVER (server))->running = FALSE;
-}
-
-static void
-thrift_simple_server_init (ThriftSimpleServer *tss)
-{
-  ThriftServer *server = THRIFT_SERVER(tss);
-
-  tss->running = FALSE;
-
-  if (server->input_transport_factory == NULL)
-  {
-    server->input_transport_factory =
-        g_object_new (THRIFT_TYPE_TRANSPORT_FACTORY, NULL);
-  }
-  if (server->output_transport_factory == NULL)
-  {
-    server->output_transport_factory =
-        g_object_new (THRIFT_TYPE_TRANSPORT_FACTORY, NULL);
-  }
-  if (server->input_protocol_factory == NULL)
-  {
-    server->input_protocol_factory =
-        g_object_new (THRIFT_TYPE_BINARY_PROTOCOL_FACTORY, NULL);
-  }
-  if (server->output_protocol_factory == NULL)
-  {
-    server->output_protocol_factory =
-        g_object_new (THRIFT_TYPE_BINARY_PROTOCOL_FACTORY, NULL);
-  }
-}
-
-/* initialize the class */
-static void
-thrift_simple_server_class_init (ThriftSimpleServerClass *class)
-{
-  ThriftServerClass *cls = THRIFT_SERVER_CLASS(class);
-
-  cls->serve = thrift_simple_server_serve;
-  cls->stop = thrift_simple_server_stop;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.h
deleted file mode 100644
index 86b538b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SIMPLE_SERVER_H
-#define _THRIFT_SIMPLE_SERVER_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/server/thrift_server.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_simple_server.h
- *  \brief A simple Thrift server, single-threaded.
- */
-
-/* type macros */
-#define THRIFT_TYPE_SIMPLE_SERVER (thrift_simple_server_get_type ())
-#define THRIFT_SIMPLE_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_SIMPLE_SERVER, ThriftSimpleServer))
-#define THRIFT_IS_SIMPLE_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_SIMPLE_SERVER))
-#define THRIFT_SIMPLE_SERVER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c) THRIFT_TYPE_SIMPLE_SERVER, ThriftSimpleServerClass))
-#define THRIFT_IS_SIMPLE_SERVER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_SIMPLE_SERVER))
-#define THRIFT_SIMPLE_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_SIMPLE_SERVER, ThriftSimpleServerClass))
-
-typedef struct _ThriftSimpleServer ThriftSimpleServer;
-
-/**
- * Thrift Simple Server instance.
- */
-struct _ThriftSimpleServer
-{
-  ThriftServer parent;
-
-  /* private */
-  volatile gboolean running;
-};
-
-typedef struct _ThriftSimpleServerClass ThriftSimpleServerClass;
-
-/**
- * Thrift Simple Server class.
- */
-struct _ThriftSimpleServerClass
-{
-  ThriftServerClass parent;
-};
-
-/* used by THRIFT_TYPE_SIMPLE_SERVER */
-GType thrift_simple_server_get_type (void);
-
-G_END_DECLS
-
-#endif /* _THRIFT_SIMPLE_SERVER_H */
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift.c
deleted file mode 100644
index 8de869f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-
-/**
- * GHashTable callback to add keys to a GList.
- */
-void
-thrift_hash_table_get_keys (gpointer key, gpointer value, gpointer user_data)
-{
-  GList **list = (GList **) user_data;
-
-  THRIFT_UNUSED_VAR (value);
-
-  *list = g_list_append (*list, key);
-}
-void thrift_safe_hash_table_destroy(GHashTable* hash_table)
-{
-  if (hash_table)
-  {
-    g_hash_table_destroy(hash_table);
-  }
-}
-
-guint thrift_boolean_hash(gconstpointer v)
-{
-  const gboolean* p = v;
-  return p && *p ? 1 : 0;
-}
-gboolean thrift_boolean_equal(gconstpointer a, gconstpointer b)
-{
-  if (a == b) {
-    return TRUE;
-  }
-  if (!a || !b) {
-    return FALSE;
-  }
-  const gboolean* pa = a;
-  const gboolean* pb = b;
-  return *pa == *pb;
-}
-
-guint thrift_int8_hash(gconstpointer v)
-{
-  const gint8* p = v;
-  return p ? *p : 0;
-}
-gboolean thrift_int8_equal(gconstpointer a, gconstpointer b)
-{
-  if (a == b) {
-    return TRUE;
-  }
-  if (!a || !b) {
-    return FALSE;
-  }
-  const gint8* pa = a;
-  const gint8* pb = b;
-  return *pa == *pb;
-}
-
-guint thrift_int16_hash(gconstpointer v)
-{
-  const gint16* p = v;
-  return p ? *p : 0;
-}
-gboolean thrift_int16_equal(gconstpointer a, gconstpointer b)
-{
-  if (a == b) {
-    return TRUE;
-  }
-  if (!a || !b) {
-    return FALSE;
-  }
-  const gint16* pa = a;
-  const gint16* pb = b;
-  return *pa == *pb;
-}
-
-void
-thrift_string_free (gpointer str)
-{
-	GByteArray* ptr = str;
-	g_byte_array_unref(ptr);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift.h
deleted file mode 100644
index 94a6478..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_H
-#define _THRIFT_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <glib.h>
-
-/* this macro is called to satisfy -Wall hardcore compilation */
-#ifndef THRIFT_UNUSED_VAR
-# define THRIFT_UNUSED_VAR(x) ((void) x)
-#endif
-
-void thrift_hash_table_get_keys (gpointer key, gpointer value,
-                                 gpointer user_data);
-void thrift_safe_hash_table_destroy(GHashTable* hash_table);
-
-guint thrift_boolean_hash(gconstpointer v);
-gboolean thrift_boolean_equal(gconstpointer a, gconstpointer b);
-
-guint thrift_int8_hash(gconstpointer v);
-gboolean thrift_int8_equal(gconstpointer a, gconstpointer b);
-
-guint thrift_int16_hash(gconstpointer v);
-gboolean thrift_int16_equal(gconstpointer a, gconstpointer b);
-
-void thrift_string_free (gpointer str);
-
-#endif /* #ifndef _THRIFT_THRIFT_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_application_exception.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_application_exception.c
deleted file mode 100644
index 1234cae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_application_exception.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "thrift_application_exception.h"
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-
-/* object properties */
-enum _ThriftApplicationExceptionProperties
-{
-  PROP_0,
-  PROP_THRIFT_APPLICATION_EXCEPTION_TYPE,
-  PROP_THRIFT_APPLICATION_EXCEPTION_MESSAGE
-};
-
-G_DEFINE_TYPE(ThriftApplicationException, thrift_application_exception, THRIFT_TYPE_STRUCT)
-
-gint32
-thrift_application_exception_read (ThriftStruct *object,
-                                   ThriftProtocol *protocol, GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-  gchar *name;
-  ThriftType ftype;
-  gint16 fid;
-  ThriftApplicationException *this = THRIFT_APPLICATION_EXCEPTION (object);
-
-  /* read the struct begin marker */
-  if ((ret = thrift_protocol_read_struct_begin (protocol, &name, error)) < 0)
-  {
-    if (name) g_free (name);
-    return -1;
-  }
-  xfer += ret;
-  if (name) g_free (name);
-
-  while (1)
-  {
-    if ((ret = thrift_protocol_read_field_begin (protocol, &name, &ftype,
-                                                 &fid, error)) < 0)
-    {
-      if (name) g_free (name);
-      return -1;
-    }
-    xfer += ret;
-    if (name) g_free (name);
-
-    /* break if we get a STOP field */
-    if (ftype == T_STOP)
-    {
-      break;
-    }
-
-    switch (fid)
-    {
-      case 1:
-        if (ftype == T_STRING)
-        {
-          if ((ret = thrift_protocol_read_string (protocol, &this->message,
-                                                  error)) < 0)
-            return -1;
-          xfer += ret;
-          this->__isset_message = TRUE;
-        } else {
-          if ((ret = thrift_protocol_skip (protocol, ftype, error)) < 0)
-            return -1;
-          xfer += ret;
-        }
-        break;
-      case 2:
-        if (ftype == T_I32)
-        {
-          if ((ret = thrift_protocol_read_i32 (protocol, &this->type,
-                                               error)) < 0)
-            return -1;
-          xfer += ret;
-          this->__isset_type = TRUE;
-        } else {
-          if ((ret = thrift_protocol_skip (protocol, ftype, error)) < 0)
-            return -1;
-          xfer += ret;
-        }
-        break;
-      default:
-        if ((ret = thrift_protocol_skip (protocol, ftype, error)) < 0)
-          return -1;
-        xfer += ret;
-        break;
-    }
-    if ((ret = thrift_protocol_read_field_end (protocol, error)) < 0)
-      return -1;
-    xfer += ret;
-  }
-
-  if ((ret = thrift_protocol_read_struct_end (protocol, error)) < 0)
-    return -1;
-  xfer += ret;
-
-  return xfer;
-}
-
-gint32
-thrift_application_exception_write (ThriftStruct *object,
-                                    ThriftProtocol *protocol, GError **error)
-{
-  gint32 ret;
-  gint32 xfer = 0;
-
-  ThriftApplicationException *this = THRIFT_APPLICATION_EXCEPTION (object);
-
-  if ((ret = thrift_protocol_write_struct_begin (protocol,
-                                                 "TApplicationException",
-                                                 error)) < 0)
-    return -1;
-  xfer += ret;
-  if ((ret = thrift_protocol_write_field_begin (protocol, "message",
-                                                T_STRING, 1, error)) < 0)
-    return -1;
-  xfer += ret;
-  if ((ret = thrift_protocol_write_string (protocol, this->message, error)) < 0)
-    return -1;
-  xfer += ret;
-  if ((ret = thrift_protocol_write_field_end (protocol, error)) < 0)
-    return -1;
-  xfer += ret;
-  if ((ret = thrift_protocol_write_field_begin (protocol, "type",
-                                                T_I32, 2, error)) < 0)
-    return -1;
-  xfer += ret;
-  if ((ret = thrift_protocol_write_i32 (protocol, this->type, error)) < 0)
-    return -1;
-  xfer += ret;
-  if ((ret = thrift_protocol_write_field_end (protocol, error)) < 0)
-    return -1;
-  xfer += ret;
-  if ((ret = thrift_protocol_write_field_stop (protocol, error)) < 0)
-    return -1;
-  xfer += ret;
-  if ((ret = thrift_protocol_write_struct_end (protocol, error)) < 0)
-    return -1;
-  xfer += ret;
-
-  return xfer;
-}
-
-
-/* GError domain */
-#define THRIFT_APPLICATION_EXCEPTION_ERROR_DOMAIN "thrift-application-exception-error-quark"
-
-GQuark
-thrift_application_exception_error_quark (void)
-{
-  return g_quark_from_static_string (THRIFT_APPLICATION_EXCEPTION_ERROR_DOMAIN);
-}
-
-static void
-thrift_application_exception_get_property (GObject *object,
-                                           guint property_id,
-                                           GValue *value,
-                                           GParamSpec *pspec)
-{
-  ThriftApplicationException *tae = THRIFT_APPLICATION_EXCEPTION (object);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_APPLICATION_EXCEPTION_TYPE:
-      g_value_set_int (value, tae->type);
-      break;
-    case PROP_THRIFT_APPLICATION_EXCEPTION_MESSAGE:
-      g_value_set_string (value, tae->message);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-static void
-thrift_application_exception_set_property (GObject *object,
-                                           guint property_id,
-                                           const GValue *value,
-                                           GParamSpec *pspec)
-{
-  ThriftApplicationException *tae = THRIFT_APPLICATION_EXCEPTION (object);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_APPLICATION_EXCEPTION_TYPE:
-      tae->type = g_value_get_int (value);
-      tae->__isset_type = TRUE;
-      break;
-    case PROP_THRIFT_APPLICATION_EXCEPTION_MESSAGE:
-      if (tae->message != NULL)
-        g_free (tae->message);
-
-      tae->message = g_value_dup_string (value);
-      tae->__isset_message = TRUE;
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-void
-thrift_application_exception_init (ThriftApplicationException *object)
-{
-  object->type = 0;
-  object->__isset_type = FALSE;
-  object->message = NULL;
-  object->__isset_message = FALSE;
-}
-
-void
-thrift_application_exception_finalize (GObject *object)
-{
-  ThriftApplicationException *tae = THRIFT_APPLICATION_EXCEPTION (object);
-
-  if (tae->__isset_message) {
-		g_free(tae->message);
-  }
-}
-
-void
-thrift_application_exception_class_init (ThriftApplicationExceptionClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS(class);
-  ThriftStructClass *cls = THRIFT_STRUCT_CLASS(class);
-  GParamSpec *param_spec;
-
-  cls->read = thrift_application_exception_read;
-  cls->write = thrift_application_exception_write;
-
-  gobject_class->finalize = thrift_application_exception_finalize;
-  gobject_class->get_property = thrift_application_exception_get_property;
-  gobject_class->set_property = thrift_application_exception_set_property;
-
-  param_spec = g_param_spec_int ("type",
-                                 "Exception type",
-                                 "The type of the exception, one of the "
-                                 "values defined by the "
-                                 "ThriftApplicationExceptionError "
-                                 "enumeration.",
-                                 0,
-                                 THRIFT_APPLICATION_EXCEPTION_ERROR_N - 1,
-                                 0,
-                                 G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_APPLICATION_EXCEPTION_TYPE,
-                                   param_spec);
-
-  param_spec = g_param_spec_string ("message",
-                                    "Exception message",
-                                    "A string describing the exception that "
-                                    "occurred.",
-                                    NULL,
-                                    G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_APPLICATION_EXCEPTION_MESSAGE,
-                                   param_spec);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_application_exception.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_application_exception.h
deleted file mode 100644
index 733f793..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_application_exception.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_APPLICATION_EXCEPTION_H
-#define _THRIFT_APPLICATION_EXCEPTION_H
-
-#include <glib-object.h>
-#include "thrift_struct.h"
-
-G_BEGIN_DECLS
-
-/*! \file thrift_application_exception.h
- *  \brief C Implementation of a TApplicationException.
- */
-
-/* type macros */
-#define THRIFT_TYPE_APPLICATION_EXCEPTION (thrift_application_exception_get_type ())
-#define THRIFT_APPLICATION_EXCEPTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_APPLICATION_EXCEPTION, ThriftApplicationException))
-#define THRIFT_IS_APPLICATION_EXCEPTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_APPLICATION_EXCEPTION))
-#define THRIFT_APPLICATION_EXCEPTION_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_APPLICATION_EXCEPTION, ThriftApplicationExceptionClass))
-#define THRIFT_IS_APPLICATION_EXCEPTION_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_APPLICATION_EXCEPTION))
-#define THRIFT_APPLICATION_EXCEPTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_APPLICATION_EXCEPTION, ThriftApplicationExceptionClass))
-
-typedef struct _ThriftApplicationException ThriftApplicationException;
-
-struct _ThriftApplicationException
-{
-  ThriftStruct parent;
-
-  /* private */
-  gint32 type;
-  gboolean __isset_type;
-  gchar *message;
-  gboolean __isset_message;
-};
-
-typedef struct _ThriftApplicationExceptionClass ThriftApplicationExceptionClass;
-
-struct _ThriftApplicationExceptionClass
-{
-  ThriftStructClass parent;
-};
-
-GType thrift_application_exception_get_type (void);
-
-/* gerror codes */
-typedef enum
-{
-  THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN_METHOD,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_INVALID_MESSAGE_TYPE,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_WRONG_METHOD_NAME,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_BAD_SEQUENCE_ID,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_MISSING_RESULT,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_INTERNAL_ERROR,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_PROTOCOL_ERROR,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_INVALID_TRANSFORM,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_INVALID_PROTOCOL,
-  THRIFT_APPLICATION_EXCEPTION_ERROR_UNSUPPORTED_CLIENT_TYPE,
-
-  THRIFT_APPLICATION_EXCEPTION_ERROR_N
-} ThriftApplicationExceptionError;
-
-/* define error domain for GError */
-GQuark thrift_application_exception_error_quark (void);
-#define THRIFT_APPLICATION_EXCEPTION_ERROR (thrift_application_exception_error_quark ())
-
-G_END_DECLS
-
-#endif /* _THRIFT_APPLICATION_EXCEPTION_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_struct.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_struct.c
deleted file mode 100644
index f24f2a1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_struct.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include "thrift_struct.h"
-
-G_DEFINE_ABSTRACT_TYPE(ThriftStruct, thrift_struct, G_TYPE_OBJECT)
-
-gint32
-thrift_struct_read (ThriftStruct *object, ThriftProtocol *protocol,
-                    GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_STRUCT (object), -1);
-  return THRIFT_STRUCT_GET_CLASS (object)->read (object, protocol, error);
-}
-
-gint32
-thrift_struct_write (ThriftStruct *object, ThriftProtocol *protocol,
-                     GError **error)
-{
-  g_return_val_if_fail (THRIFT_IS_STRUCT (object), -1);
-  return THRIFT_STRUCT_GET_CLASS (object)->write (object, protocol, error);
-}
-
-static void
-thrift_struct_class_init (ThriftStructClass *cls)
-{
-  cls->read = thrift_struct_read;
-  cls->write = thrift_struct_write;
-}
-
-static void
-thrift_struct_init (ThriftStruct *structure)
-{
-  THRIFT_UNUSED_VAR (structure);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_struct.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_struct.h
deleted file mode 100644
index f4cfcb2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/thrift_struct.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_STRUCT_H
-#define THRIFT_STRUCT_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-
-G_BEGIN_DECLS
-
-#define THRIFT_TYPE_STRUCT (thrift_struct_get_type ())
-#define THRIFT_STRUCT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_STRUCT, ThriftStruct))
-#define THRIFT_STRUCT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_STRUCT, ThriftStructClass))
-#define THRIFT_IS_STRUCT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_STRUCT))
-#define THRIFT_IS_STRUCT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_STRUCT))
-#define THRIFT_STRUCT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_STRUCT, ThriftStructClass))
-
-typedef struct _ThriftStruct ThriftStruct;
-
-/* struct */
-struct _ThriftStruct
-{
-  GObject parent;
-
-  /* private */
-};
-
-typedef struct _ThriftStructClass ThriftStructClass;
-
-struct _ThriftStructClass
-{
-  GObjectClass parent;
-
-  /* public */
-  gint32 (*read) (ThriftStruct *object, ThriftProtocol *protocol,
-                  GError **error);
-  gint32 (*write) (ThriftStruct *object, ThriftProtocol *protocol,
-                   GError **error);
-};
-
-GType thrift_struct_get_type (void);
-
-gint32 thrift_struct_read (ThriftStruct *object, ThriftProtocol *protocol,
-                           GError **error);
-
-gint32 thrift_struct_write (ThriftStruct *object, ThriftProtocol *protocol,
-                            GError **error);
-G_END_DECLS
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
deleted file mode 100644
index ede28cf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport.h>
-
-/* object properties */
-enum _ThriftBufferedTransportProperties
-{
-  PROP_0,
-  PROP_THRIFT_BUFFERED_TRANSPORT_TRANSPORT,
-  PROP_THRIFT_BUFFERED_TRANSPORT_READ_BUFFER_SIZE,
-  PROP_THRIFT_BUFFERED_TRANSPORT_WRITE_BUFFER_SIZE
-};
-
-G_DEFINE_TYPE(ThriftBufferedTransport, thrift_buffered_transport, THRIFT_TYPE_TRANSPORT)
-
-/* implements thrift_transport_is_open */
-gboolean
-thrift_buffered_transport_is_open (ThriftTransport *transport)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-  return THRIFT_TRANSPORT_GET_CLASS (t->transport)->is_open (t->transport);
-}
-
-/* overrides thrift_transport_peek */
-gboolean
-thrift_buffered_transport_peek (ThriftTransport *transport, GError **error)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-  return (t->r_buf->len > 0) || thrift_transport_peek (t->transport, error);
-}
-
-/* implements thrift_transport_open */
-gboolean
-thrift_buffered_transport_open (ThriftTransport *transport, GError **error)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-  return THRIFT_TRANSPORT_GET_CLASS (t->transport)->open (t->transport, error);
-}
-
-/* implements thrift_transport_close */
-gboolean
-thrift_buffered_transport_close (ThriftTransport *transport, GError **error)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-  return THRIFT_TRANSPORT_GET_CLASS (t->transport)->close (t->transport, error);
-}
-
-/* the actual read is "slow" because it calls the underlying transport */
-gint32
-thrift_buffered_transport_read_slow (ThriftTransport *transport, gpointer buf,
-                                     guint32 len, GError **error)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-  gint ret = 0;
-  guint32 want = len;
-  guint32 got = 0;
-  guchar *tmpdata = g_alloca (len);
-  guint32 have = t->r_buf->len;
-
-  /* we shouldn't hit this unless the buffer doesn't have enough to read */
-  assert (t->r_buf->len < want);
-
-  /* first copy what we have in our buffer. */
-  if (have > 0)
-  {
-    memcpy (buf, t->r_buf, t->r_buf->len);
-    want -= t->r_buf->len;
-    t->r_buf = g_byte_array_remove_range (t->r_buf, 0, t->r_buf->len);
-  }
-
-  /* if the buffer is still smaller than what we want to read, then just
-   * read it directly.  otherwise, fill the buffer and then give out
-   * enough to satisfy the read. */
-  if (t->r_buf_size < want)
-  {
-    if ((ret = THRIFT_TRANSPORT_GET_CLASS (t->transport)->read (t->transport,
-                                                                tmpdata,
-                                                                want,
-                                                                error)) < 0) {
-      return ret;
-    }
-    got += ret;
-
-    /* copy the data starting from where we left off */
-    memcpy ((guint8 *)buf + have, tmpdata, got);
-    return got + have; 
-  } else {
-    guint32 give;
-
-    if ((ret = THRIFT_TRANSPORT_GET_CLASS (t->transport)->read (t->transport,
-                                                                tmpdata,
-                                                                want,
-                                                                error)) < 0) {
-      return ret;
-    }
-    got += ret;
-    t->r_buf = g_byte_array_append (t->r_buf, tmpdata, got);
-    
-    /* hand over what we have up to what the caller wants */
-    give = want < t->r_buf->len ? want : t->r_buf->len;
-
-
-    memcpy ((guint8 *)buf + len - want, t->r_buf->data, give);
-    t->r_buf = g_byte_array_remove_range (t->r_buf, 0, give);
-    want -= give;
-
-    return (len - want);
-  }
-}
-
-/* implements thrift_transport_read */
-gint32
-thrift_buffered_transport_read (ThriftTransport *transport, gpointer buf,
-                                guint32 len, GError **error)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-
-  /* if we have enough buffer data to fulfill the read, just use
-   * a memcpy */
-  if (len <= t->r_buf->len)
-  {
-    memcpy (buf, t->r_buf->data, len);
-    g_byte_array_remove_range (t->r_buf, 0, len);
-    return len;
-  }
-
-  return thrift_buffered_transport_read_slow (transport, buf, len, error);
-}
-
-/* implements thrift_transport_read_end
- * called when write is complete.  nothing to do on our end. */
-gboolean
-thrift_buffered_transport_read_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-gboolean
-thrift_buffered_transport_write_slow (ThriftTransport *transport, gpointer buf,
-                                      guint32 len, GError **error)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-  guint32 have_bytes = t->w_buf->len;
-  guint32 space = t->w_buf_size - t->w_buf->len;
-
-  /* we need two syscalls because the buffered data plus the buffer itself
-   * is too big. */
-  if ((have_bytes + len >= 2*t->w_buf_size) || (have_bytes == 0))
-  {
-    if (have_bytes > 0)
-    {
-      if (!THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                             t->w_buf->data,
-                                                             have_bytes,
-                                                             error)) {
-        return FALSE;
-      }
-      t->w_buf = g_byte_array_remove_range (t->w_buf, 0, have_bytes);
-    }
-    if (!THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                           buf, len, error)) {
-      return FALSE;
-    }
-    return TRUE;
-  }
-
-  t->w_buf = g_byte_array_append (t->w_buf, buf, space);
-  if (!THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                         t->w_buf->data,
-                                                         t->w_buf->len,
-                                                         error)) {
-    return FALSE;
-  }
-
-  t->w_buf = g_byte_array_remove_range (t->w_buf, 0, t->w_buf->len);
-  t->w_buf = g_byte_array_append (t->w_buf, (guint8 *)buf + space, len-space);
-
-  return TRUE;
-}
-
-/* implements thrift_transport_write */
-gboolean
-thrift_buffered_transport_write (ThriftTransport *transport,
-                                 const gpointer buf,
-                                 const guint32 len, GError **error)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-
-  /* the length of the current buffer plus the length of the data being read */
-  if (t->w_buf->len + len <= t->w_buf_size)
-  {
-    t->w_buf = g_byte_array_append (t->w_buf, buf, len);
-    return len;
-  }
-
-  return thrift_buffered_transport_write_slow (transport, buf, len, error);
-}
-
-/* implements thrift_transport_write_end
- * called when write is complete.  nothing to do on our end. */
-gboolean
-thrift_buffered_transport_write_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_flush */
-gboolean
-thrift_buffered_transport_flush (ThriftTransport *transport, GError **error)
-{
-  ThriftBufferedTransport *t = THRIFT_BUFFERED_TRANSPORT (transport);
-
-  if (t->w_buf != NULL && t->w_buf->len > 0)
-  {
-    /* write the buffer and then empty it */
-    if (!THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                           t->w_buf->data,
-                                                           t->w_buf->len,
-                                                           error)) {
-      return FALSE;
-    }
-    t->w_buf = g_byte_array_remove_range (t->w_buf, 0, t->w_buf->len);
-  }
-  THRIFT_TRANSPORT_GET_CLASS (t->transport)->flush (t->transport,
-                                                    error);
-
-  return TRUE;
-}
-
-/* initializes the instance */
-static void
-thrift_buffered_transport_init (ThriftBufferedTransport *transport)
-{
-  transport->transport = NULL;
-  transport->r_buf = g_byte_array_new ();
-  transport->w_buf = g_byte_array_new ();
-}
-
-/* destructor */
-static void
-thrift_buffered_transport_finalize (GObject *object)
-{
-  ThriftBufferedTransport *transport = THRIFT_BUFFERED_TRANSPORT (object);
-
-  if (transport->r_buf != NULL)
-  {
-    g_byte_array_free (transport->r_buf, TRUE);
-  }
-  transport->r_buf = NULL;
-
-  if (transport->w_buf != NULL)
-  {
-    g_byte_array_free (transport->w_buf, TRUE);
-  }
-  transport->w_buf = NULL;
-}
-
-/* property accessor */
-void
-thrift_buffered_transport_get_property (GObject *object, guint property_id,
-                                        GValue *value, GParamSpec *pspec)
-{
-  ThriftBufferedTransport *transport = THRIFT_BUFFERED_TRANSPORT (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_BUFFERED_TRANSPORT_TRANSPORT:
-      g_value_set_object (value, transport->transport);
-      break;
-    case PROP_THRIFT_BUFFERED_TRANSPORT_READ_BUFFER_SIZE:
-      g_value_set_uint (value, transport->r_buf_size);
-      break;
-    case PROP_THRIFT_BUFFERED_TRANSPORT_WRITE_BUFFER_SIZE:
-      g_value_set_uint (value, transport->w_buf_size);
-      break;
-  }
-}
-
-/* property mutator */
-void
-thrift_buffered_transport_set_property (GObject *object, guint property_id,
-                                        const GValue *value, GParamSpec *pspec)
-{
-  ThriftBufferedTransport *transport = THRIFT_BUFFERED_TRANSPORT (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_BUFFERED_TRANSPORT_TRANSPORT:
-      transport->transport = g_value_get_object (value);
-      break;
-    case PROP_THRIFT_BUFFERED_TRANSPORT_READ_BUFFER_SIZE:
-      transport->r_buf_size = g_value_get_uint (value);
-      break;
-    case PROP_THRIFT_BUFFERED_TRANSPORT_WRITE_BUFFER_SIZE:
-      transport->w_buf_size = g_value_get_uint (value);
-      break;
-  }
-}
-
-/* initializes the class */
-static void
-thrift_buffered_transport_class_init (ThriftBufferedTransportClass *cls)
-{
-  ThriftTransportClass *ttc = THRIFT_TRANSPORT_CLASS (cls);
-  GObjectClass *gobject_class = G_OBJECT_CLASS (cls);
-  GParamSpec *param_spec = NULL;
-
-  /* setup accessors and mutators */
-  gobject_class->get_property = thrift_buffered_transport_get_property;
-  gobject_class->set_property = thrift_buffered_transport_set_property;
-
-  param_spec = g_param_spec_object ("transport", "transport (construct)",
-                                    "Thrift transport",
-                                    THRIFT_TYPE_TRANSPORT,
-                                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_BUFFERED_TRANSPORT_TRANSPORT,
-                                   param_spec);
-
-  param_spec = g_param_spec_uint ("r_buf_size",
-                                  "read buffer size (construct)",
-                                  "Set the read buffer size",
-                                  0, /* min */
-                                  1048576, /* max, 1024*1024 */
-                                  512, /* default value */
-                                  G_PARAM_CONSTRUCT_ONLY |
-                                  G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_BUFFERED_TRANSPORT_READ_BUFFER_SIZE,
-                                   param_spec);
-
-  param_spec = g_param_spec_uint ("w_buf_size",
-                                  "write buffer size (construct)",
-                                  "Set the write buffer size",
-                                  0, /* min */
-                                  1048576, /* max, 1024*1024 */
-                                  512, /* default value */
-                                  G_PARAM_CONSTRUCT_ONLY |
-                                  G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_BUFFERED_TRANSPORT_WRITE_BUFFER_SIZE,
-                                   param_spec);
-
-
-  gobject_class->finalize = thrift_buffered_transport_finalize;
-  ttc->is_open = thrift_buffered_transport_is_open;
-  ttc->peek = thrift_buffered_transport_peek;
-  ttc->open = thrift_buffered_transport_open;
-  ttc->close = thrift_buffered_transport_close;
-  ttc->read = thrift_buffered_transport_read;
-  ttc->read_end = thrift_buffered_transport_read_end;
-  ttc->write = thrift_buffered_transport_write;
-  ttc->write_end = thrift_buffered_transport_write_end;
-  ttc->flush = thrift_buffered_transport_flush;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.h
deleted file mode 100644
index 837f467..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_BUFFERED_TRANSPORT_H
-#define _THRIFT_BUFFERED_TRANSPORT_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_buffered_transport.h
- *  \brief Implementation of a Thrift buffered transport.  Subclasses
- *         the ThriftTransport class.
- */
-
-/* type macros */
-#define THRIFT_TYPE_BUFFERED_TRANSPORT (thrift_buffered_transport_get_type ())
-#define THRIFT_BUFFERED_TRANSPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_BUFFERED_TRANSPORT, ThriftBufferedTransport))
-#define THRIFT_IS_BUFFERED_TRANSPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_BUFFERED_TRANSPORT))
-#define THRIFT_BUFFERED_TRANSPORT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_BUFFERED_TRANSPORT, ThriftBufferedTransportClass))
-#define THRIFT_IS_BUFFERED_TRANSPORT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_BUFFERED_TRANSPORT)
-#define THRIFT_BUFFERED_TRANSPORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_BUFFERED_TRANSPORT, ThriftBufferedTransportClass))
-
-typedef struct _ThriftBufferedTransport ThriftBufferedTransport;
-
-/*!
- * ThriftBufferedTransport  instance.
- */
-struct _ThriftBufferedTransport
-{
-  ThriftTransport parent;
-
-  /* protected */
-  ThriftTransport *transport;
-
-  /* private */
-  GByteArray *r_buf;
-  GByteArray *w_buf;
-  guint32 r_buf_size;
-  guint32 w_buf_size;
-};
-
-typedef struct _ThriftBufferedTransportClass ThriftBufferedTransportClass;
-
-/*!
- * ThriftBufferedTransport class.
- */
-struct _ThriftBufferedTransportClass
-{
-  ThriftTransportClass parent;
-};
-
-/* used by THRIFT_TYPE_BUFFERED_TRANSPORT */
-GType thrift_buffered_transport_get_type (void);
-
-G_END_DECLS
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport_factory.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport_factory.c
deleted file mode 100644
index 86050b6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport_factory.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport_factory.h>
-
-G_DEFINE_TYPE (ThriftBufferedTransportFactory,
-               thrift_buffered_transport_factory,
-               THRIFT_TYPE_TRANSPORT_FACTORY)
-
-/* Wraps a transport with a ThriftBufferedTransport. */
-ThriftTransport *
-thrift_buffered_transport_factory_get_transport (ThriftTransportFactory *factory,
-                                                 ThriftTransport *transport)
-{
-  THRIFT_UNUSED_VAR (factory);
-
-  return THRIFT_TRANSPORT (g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT,
-                                         "transport", transport,
-                                         NULL));
-}
-
-static void
-thrift_buffered_transport_factory_init (ThriftBufferedTransportFactory *self)
-{
-  THRIFT_UNUSED_VAR (self);
-}
-
-static void
-thrift_buffered_transport_factory_class_init (ThriftBufferedTransportFactoryClass *klass)
-{
-  ThriftTransportFactoryClass *base_class =
-    THRIFT_TRANSPORT_FACTORY_CLASS (klass);
-
-  base_class->get_transport =
-    klass->get_transport =
-    thrift_buffered_transport_factory_get_transport;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport_factory.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport_factory.h
deleted file mode 100644
index d43f4e4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport_factory.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_BUFFERED_TRANSPORT_FACTORY_H
-#define _THRIFT_BUFFERED_TRANSPORT_FACTORY_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_transport_factory.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_buffered_transport_factory.h
- *  \brief Wraps a transport with a ThriftBufferedTransport.
- */
-
-/* type macros */
-#define THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY          \
-  (thrift_buffered_transport_factory_get_type ())
-#define THRIFT_BUFFERED_TRANSPORT_FACTORY(obj)                          \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                   \
-                               THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY,  \
-                               ThriftBufferedTransportFactory))
-#define THRIFT_IS_BUFFERED_TRANSPORT_FACTORY(obj)                       \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                                   \
-                               THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY))
-#define THRIFT_BUFFERED_TRANSPORT_FACTORY_CLASS(c)                      \
-  (G_TYPE_CHECK_CLASS_CAST ((c),                                        \
-                            THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY,     \
-                            ThriftBufferedTransportFactoryClass))
-#define THRIFT_IS_BUFFERED_TRANSPORT_FACTORY_CLASS(c)                   \
-  (G_TYPE_CHECK_CLASS_TYPE ((c),                                        \
-                            THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY))
-#define THRIFT_BUFFERED_TRANSPORT_FACTORY_GET_CLASS(obj)                \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                                    \
-                              THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY,   \
-                              ThriftBufferedTransportFactoryClass))
-
-typedef struct _ThriftBufferedTransportFactory ThriftBufferedTransportFactory;
-
-/* Thrift Buffered-Transport Factory instance */
-struct _ThriftBufferedTransportFactory
-{
-  ThriftTransportFactory parent;
-};
-
-typedef struct _ThriftBufferedTransportFactoryClass ThriftBufferedTransportFactoryClass;
-
-/* Thrift Buffered-Transport Factory class */
-struct _ThriftBufferedTransportFactoryClass
-{
-  ThriftTransportFactoryClass parent;
-
-  /* vtable */
-  ThriftTransport *(*get_transport) (ThriftTransportFactory *factory,
-                                     ThriftTransport *transport);
-};
-
-/* used by THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY */
-GType thrift_buffered_transport_factory_get_type (void);
-
-/* virtual public methods */
-ThriftTransport *
-thrift_buffered_transport_factory_get_transport (ThriftTransportFactory *factory,
-                                                 ThriftTransport *transport);
-
-G_END_DECLS
-
-#endif /* _THRIFT_BUFFERED_TRANSPORT_FACTORY_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_fd_transport.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_fd_transport.c
deleted file mode 100644
index 14abff7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_fd_transport.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_fd_transport.h>
-
-/* object properties */
-enum _ThriftFDTransportProperties
-{
-  PROP_0,
-  PROP_THRIFT_FD_TRANSPORT_FD
-};
-
-G_DEFINE_TYPE (ThriftFDTransport, thrift_fd_transport, THRIFT_TYPE_TRANSPORT)
-
-/* implements thrift_transport_is_open */
-gboolean
-thrift_fd_transport_is_open (ThriftTransport *transport)
-{
-  ThriftFDTransport *t;
-  t = THRIFT_FD_TRANSPORT (transport);
-  return t->fd >= 0 && ! (fcntl (t->fd, F_GETFL) == -1 && errno == EBADF);
-}
-
-/* implements thrift_transport_open */
-gboolean
-thrift_fd_transport_open (ThriftTransport *transport, GError **error)
-{
-  THRIFT_UNUSED_VAR (error);
-  return thrift_fd_transport_is_open (transport);
-}
-
-/* implements thrift_transport_close */
-gboolean
-thrift_fd_transport_close (ThriftTransport *transport, GError **error)
-{
-  ThriftFDTransport *t;
-  t = THRIFT_FD_TRANSPORT (transport);
-
-#if GLIB_CHECK_VERSION (2, 36, 0)
-  return g_close (t->fd, error);
-#else
-  if (close (t->fd) == 0) {
-    g_clear_error (error);
-    return TRUE;
-  } else {
-    g_set_error (error,
-                 THRIFT_TRANSPORT_ERROR,
-                 THRIFT_TRANSPORT_ERROR_CLOSE,
-                 strerror (errno));
-    return FALSE;
-  }
-#endif
-}
-
-/* implements thrift_transport_read */
-gint32
-thrift_fd_transport_read (ThriftTransport *transport, gpointer buf,
-                          guint32 len, GError **error)
-{
-  ThriftFDTransport *t;
-  ssize_t n;
-
-  t = THRIFT_FD_TRANSPORT (transport);
-  n = read (t->fd, (guint8 *) buf, len);
-  if (n == -1) {
-    g_set_error (error,
-                 THRIFT_TRANSPORT_ERROR,
-                 THRIFT_TRANSPORT_ERROR_RECEIVE,
-                 "Failed to read from fd: %s",
-                 strerror (errno));
-    return -1;
-  }
-  return n;
-}
-
-/* implements thrift_transport_read_end
- * called when write is complete.  nothing to do on our end. */
-gboolean
-thrift_fd_transport_read_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_write */
-gboolean
-thrift_fd_transport_write (ThriftTransport *transport,
-                           const gpointer buf,
-                           const guint32 len, GError **error)
-{
-  ThriftFDTransport *t;
-  guint8 *_buf;
-  guint32 _len;
-  ssize_t n;
-
-  t = THRIFT_FD_TRANSPORT (transport);
-  _buf = (guint8 *) buf;
-  _len = len;
-  while (_len > 0) {
-    n = write (t->fd, _buf, _len);
-    if (n == -1) {
-      g_set_error (error,
-                   THRIFT_TRANSPORT_ERROR,
-                   THRIFT_TRANSPORT_ERROR_SEND,
-                   "Failed to write from fd: %s",
-                   strerror (errno));
-      return FALSE;
-    } else {
-      _buf += n;
-      _len -= n;
-    }
-  }
-  return TRUE;
-}
-
-/* implements thrift_transport_write_end
- * called when write is complete.  nothing to do on our end. */
-gboolean
-thrift_fd_transport_write_end (ThriftTransport *transport, GError **error)
-{
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_flush */
-gboolean
-thrift_fd_transport_flush (ThriftTransport *transport, GError **error)
-{
-  ThriftFDTransport *t;
-  t = THRIFT_FD_TRANSPORT (transport);
-  if (fsync (t->fd) == -1) {
-    g_set_error (error,
-                 THRIFT_TRANSPORT_ERROR,
-                 THRIFT_TRANSPORT_ERROR_UNKNOWN,
-                 "Failed to flush fd: %s",
-                 strerror (errno));
-    return FALSE;
-  } else {
-    return TRUE;
-  }
-}
-
-/* initializes the instance */
-static void
-thrift_fd_transport_init (ThriftFDTransport *transport)
-{
-  transport->fd = -1;
-}
-
-/* destructor */
-static void
-thrift_fd_transport_finalize (GObject *object)
-{
-  THRIFT_UNUSED_VAR (object);
-}
-
-/* property accessor */
-void
-thrift_fd_transport_get_property (GObject *object, guint property_id,
-                                  GValue *value, GParamSpec *pspec)
-{
-  ThriftFDTransport *t;
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  t = THRIFT_FD_TRANSPORT (object);
-
-  switch (property_id) {
-    case PROP_THRIFT_FD_TRANSPORT_FD:
-      g_value_set_int (value, t->fd);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-/* property mutator */
-void
-thrift_fd_transport_set_property (GObject *object, guint property_id,
-                                  const GValue *value, GParamSpec *pspec)
-{
-  ThriftFDTransport *t;
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  t = THRIFT_FD_TRANSPORT (object);
-
-  switch (property_id) {
-    case PROP_THRIFT_FD_TRANSPORT_FD:
-      t->fd = g_value_get_int (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-/* initializes the class */
-static void
-thrift_fd_transport_class_init (ThriftFDTransportClass *cls)
-{
-  ThriftTransportClass *ttc;
-  GObjectClass *gobject_class;
-  GParamSpec *param_spec;
-
-  ttc = THRIFT_TRANSPORT_CLASS (cls);
-  gobject_class = G_OBJECT_CLASS (cls);
-  param_spec = NULL;
-
-  /* setup accessors and mutators */
-  gobject_class->get_property = thrift_fd_transport_get_property;
-  gobject_class->set_property = thrift_fd_transport_set_property;
-
-  param_spec = g_param_spec_int ("fd",
-                                 "file descriptor (construct)",
-                                 "Set the file descriptor",
-                                 INT_MIN, /* min */
-                                 INT_MAX, /* max, 1024*1024 */
-                                 -1, /* default value */
-                                 G_PARAM_CONSTRUCT_ONLY |
-                                 G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_FD_TRANSPORT_FD,
-                                   param_spec);
-
-  gobject_class->finalize = thrift_fd_transport_finalize;
-  ttc->is_open = thrift_fd_transport_is_open;
-  ttc->open = thrift_fd_transport_open;
-  ttc->close = thrift_fd_transport_close;
-  ttc->read = thrift_fd_transport_read;
-  ttc->read_end = thrift_fd_transport_read_end;
-  ttc->write = thrift_fd_transport_write;
-  ttc->write_end = thrift_fd_transport_write_end;
-  ttc->flush = thrift_fd_transport_flush;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_fd_transport.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_fd_transport.h
deleted file mode 100644
index 0e6d5c4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_fd_transport.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_FD_TRANSPORT_H
-#define _THRIFT_FD_TRANSPORT_H
-
-#include <glib-object.h>
-
-#include "thrift_transport.h"
-
-G_BEGIN_DECLS
-
-/*! \file thrift_fd_transport.h
- *  \brief Class for Thrift file descriptor transports.
- */
-
-/* type macros */
-#define THRIFT_TYPE_FD_TRANSPORT (thrift_fd_transport_get_type ())
-#define THRIFT_FD_TRANSPORT(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_FD_TRANSPORT, \
-                               ThriftFDTransport))
-#define THRIFT_IS_FD_TRANSPORT(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_FD_TRANSPORT))
-#define THRIFT_FD_TRANSPORT_CLASS(c) \
-  (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_FD_TRANSPORT, \
-                            ThriftFDTransportClass))
-#define THRIFT_IS_FD_TRANSPORT_CLASS(c) \
-  (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_FD_TRANSPORT))
-#define THRIFT_FD_TRANSPORT_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_FD_TRANSPORT, \
-                              ThriftFDTransportClass))
-
-typedef struct _ThriftFDTransport ThriftFDTransport;
-
-struct _ThriftFDTransport
-{
-  ThriftTransport parent;
-
-  /* protected */
-  gint fd;
-};
-
-typedef struct _ThriftFDTransportClass ThriftFDTransportClass;
-
-/*!
- * Thrift Transport class
- */
-struct _ThriftFDTransportClass
-{
-  ThriftTransportClass parent;
-};
-
-/* used by THRIFT_TYPE_FD_TRANSPORT */
-GType thrift_fd_transport_get_type (void);
-
-G_END_DECLS
-
-#endif /* _THRIFT_FD_TRANSPORT_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c
deleted file mode 100644
index 4c8b71f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_framed_transport.h>
-
-/* object properties */
-enum _ThriftFramedTransportProperties
-{
-  PROP_0,
-  PROP_THRIFT_FRAMED_TRANSPORT_TRANSPORT,
-  PROP_THRIFT_FRAMED_TRANSPORT_READ_BUFFER_SIZE,
-  PROP_THRIFT_FRAMED_TRANSPORT_WRITE_BUFFER_SIZE
-};
-
-G_DEFINE_TYPE(ThriftFramedTransport, thrift_framed_transport, THRIFT_TYPE_TRANSPORT)
-
-/* implements thrift_transport_is_open */
-gboolean
-thrift_framed_transport_is_open (ThriftTransport *transport)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-  return THRIFT_TRANSPORT_GET_CLASS (t->transport)->is_open (t->transport);
-}
-
-/* overrides thrift_transport_peek */
-gboolean
-thrift_framed_transport_peek (ThriftTransport *transport, GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-  return (t->r_buf->len > 0) || thrift_transport_peek (t->transport, error);
-}
-
-/* implements thrift_transport_open */
-gboolean
-thrift_framed_transport_open (ThriftTransport *transport, GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-  return THRIFT_TRANSPORT_GET_CLASS (t->transport)->open (t->transport, error);
-}
-
-/* implements thrift_transport_close */
-gboolean
-thrift_framed_transport_close (ThriftTransport *transport, GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-  return THRIFT_TRANSPORT_GET_CLASS (t->transport)->close (t->transport, error);
-}
-
-/* reads a frame and puts it into the buffer */
-gboolean
-thrift_framed_transport_read_frame (ThriftTransport *transport,
-                                    GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-  guint32 sz;
-  gint32 bytes;
-  gboolean result = FALSE;
-
-  /* read the size */
-  if (thrift_transport_read (t->transport,
-                             &sz,
-                             sizeof (sz),
-                             error) == sizeof (sz))
-  {
-    guchar *tmpdata;
-
-    sz = ntohl (sz);
-
-    /* create a buffer to hold the data and read that much data */
-    tmpdata = g_alloca (sz);
-    bytes = thrift_transport_read (t->transport, tmpdata, sz, error);
-
-    if (bytes > 0 && (error == NULL || *error == NULL))
-    {
-      /* add the data to the buffer */
-      g_byte_array_append (t->r_buf, tmpdata, bytes);
-
-      result = TRUE;
-    }
-  }
-
-  return result;
-}
-
-/* the actual read is "slow" because it calls the underlying transport */
-gint32
-thrift_framed_transport_read_slow (ThriftTransport *transport, gpointer buf,
-                                   guint32 len, GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-  guint32 want = len;
-  guint32 have = t->r_buf->len;
-  gint32 result = -1;
-
-  /* we shouldn't hit this unless the buffer doesn't have enough to read */
-  assert (t->r_buf->len < want);
-
-  /* first copy what we have in our buffer, if there is anything left */
-  if (have > 0)
-  {
-    memcpy (buf, t->r_buf, t->r_buf->len);
-    want -= t->r_buf->len;
-    t->r_buf = g_byte_array_remove_range (t->r_buf, 0, t->r_buf->len);
-  }
-
-  /* read a frame of input and buffer it */
-  if (thrift_framed_transport_read_frame (transport, error) == TRUE)
-  {
-    /* hand over what we have up to what the caller wants */
-    guint32 give = want < t->r_buf->len ? want : t->r_buf->len;
-
-    /* copy the data into the buffer */
-    memcpy ((guint8 *)buf + len - want, t->r_buf->data, give);
-    t->r_buf = g_byte_array_remove_range (t->r_buf, 0, give);
-    want -= give;
-
-    result = len - want;
-  }
-
-  return result;
-}
-
-/* implements thrift_transport_read */
-gint32
-thrift_framed_transport_read (ThriftTransport *transport, gpointer buf,
-                              guint32 len, GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-
-  /* if we have enough buffer data to fulfill the read, just use
-   * a memcpy from the buffer */
-  if (len <= t->r_buf->len)
-  {
-    memcpy (buf, t->r_buf->data, len);
-    g_byte_array_remove_range (t->r_buf, 0, len);
-    return len;
-  }
-
-  return thrift_framed_transport_read_slow (transport, buf, len, error);
-}
-
-/* implements thrift_transport_read_end
- * called when read is complete.  nothing to do on our end. */
-gboolean
-thrift_framed_transport_read_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-gboolean
-thrift_framed_transport_write_slow (ThriftTransport *transport, gpointer buf,
-                                    guint32 len, GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-
-  THRIFT_UNUSED_VAR (error);
-
-  /* append the data to the buffer and we're done */
-  g_byte_array_append (t->w_buf, buf, len);
-
-  return TRUE;
-}
-
-/* implements thrift_transport_write */
-gboolean
-thrift_framed_transport_write (ThriftTransport *transport,
-                               const gpointer buf,     
-                               const guint32 len, GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-
-  /* the length of the current buffer plus the length of the data being read */
-  if (t->w_buf->len + len <= t->w_buf_size)
-  {
-    t->w_buf = g_byte_array_append (t->w_buf, buf, len);
-    return TRUE;
-  }
-
-  return thrift_framed_transport_write_slow (transport, buf, len, error);
-}
-
-/* implements thrift_transport_write_end
- * called when write is complete.  nothing to do on our end. */
-gboolean
-thrift_framed_transport_write_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_flush */
-gboolean
-thrift_framed_transport_flush (ThriftTransport *transport, GError **error)
-{
-  ThriftFramedTransport *t = THRIFT_FRAMED_TRANSPORT (transport);
-  gint32 sz_hbo, sz_nbo;
-  guchar *tmpdata;
-
-  /* get the size of the frame in host and network byte order */
-  sz_hbo = t->w_buf->len + sizeof(sz_nbo);
-  sz_nbo = (gint32) htonl ((guint32) t->w_buf->len);
-
-  /* copy the size of the frame and then the frame itself */
-  tmpdata = g_alloca (sz_hbo);
-  memcpy (tmpdata, (guint8 *) &sz_nbo, sizeof (sz_nbo));
-
-  if (t->w_buf->len > 0)
-  {
-    memcpy (tmpdata + sizeof (sz_nbo), t->w_buf->data, t->w_buf->len);
-    t->w_buf = g_byte_array_remove_range (t->w_buf, 0, t->w_buf->len);
-  }
-    
-  /* write the buffer and then empty it */
-  THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                    tmpdata, sz_hbo,
-                                                    error);
-
-  THRIFT_TRANSPORT_GET_CLASS (t->transport)->flush (t->transport,
-                                                    error);
-
-  return TRUE;
-}
-
-/* initializes the instance */
-static void
-thrift_framed_transport_init (ThriftFramedTransport *transport)
-{
-  transport->transport = NULL;
-  transport->r_buf = g_byte_array_new ();
-  transport->w_buf = g_byte_array_new ();
-}
-
-/* destructor */
-static void
-thrift_framed_transport_finalize (GObject *object)
-{
-  ThriftFramedTransport *transport = THRIFT_FRAMED_TRANSPORT (object);
-
-  if (transport->r_buf != NULL)
-  {
-    g_byte_array_free (transport->r_buf, TRUE);
-  }
-  transport->r_buf = NULL;
-
-  if (transport->w_buf != NULL)
-  {
-    g_byte_array_free (transport->w_buf, TRUE);
-  }
-  transport->w_buf = NULL;
-}
-
-/* property accessor */
-void
-thrift_framed_transport_get_property (GObject *object, guint property_id,
-                                      GValue *value, GParamSpec *pspec)
-{
-  ThriftFramedTransport *transport = THRIFT_FRAMED_TRANSPORT (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_FRAMED_TRANSPORT_TRANSPORT:
-      g_value_set_object (value, transport->transport);
-      break;
-    case PROP_THRIFT_FRAMED_TRANSPORT_READ_BUFFER_SIZE:
-      g_value_set_uint (value, transport->r_buf_size);
-      break;
-    case PROP_THRIFT_FRAMED_TRANSPORT_WRITE_BUFFER_SIZE:
-      g_value_set_uint (value, transport->w_buf_size);
-      break;
-  }
-}
-
-/* property mutator */
-void
-thrift_framed_transport_set_property (GObject *object, guint property_id,
-                                      const GValue *value, GParamSpec *pspec)
-{
-  ThriftFramedTransport *transport = THRIFT_FRAMED_TRANSPORT (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_FRAMED_TRANSPORT_TRANSPORT:
-      transport->transport = g_value_get_object (value);
-      break;
-    case PROP_THRIFT_FRAMED_TRANSPORT_READ_BUFFER_SIZE:
-      transport->r_buf_size = g_value_get_uint (value);
-      break;
-    case PROP_THRIFT_FRAMED_TRANSPORT_WRITE_BUFFER_SIZE:
-      transport->w_buf_size = g_value_get_uint (value);
-      break;
-  }
-}
-
-/* initializes the class */
-static void
-thrift_framed_transport_class_init (ThriftFramedTransportClass *cls)
-{
-  ThriftTransportClass *ttc = THRIFT_TRANSPORT_CLASS (cls);
-  GObjectClass *gobject_class = G_OBJECT_CLASS (cls);
-  GParamSpec *param_spec = NULL;
-
-  /* setup accessors and mutators */
-  gobject_class->get_property = thrift_framed_transport_get_property;
-  gobject_class->set_property = thrift_framed_transport_set_property;
-
-  param_spec = g_param_spec_object ("transport", "transport (construct)",
-                                    "Thrift transport",
-                                    THRIFT_TYPE_TRANSPORT,
-                                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_FRAMED_TRANSPORT_TRANSPORT,
-                                   param_spec);
-
-  param_spec = g_param_spec_uint ("r_buf_size",
-                                  "read buffer size (construct)",
-                                  "Set the read buffer size",
-                                  0, /* min */
-                                  1048576, /* max, 1024*1024 */
-                                  512, /* default value */
-                                  G_PARAM_CONSTRUCT_ONLY |
-                                  G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_FRAMED_TRANSPORT_READ_BUFFER_SIZE,
-                                   param_spec);
-
-  param_spec = g_param_spec_uint ("w_buf_size",
-                                  "write buffer size (construct)",
-                                  "Set the write buffer size",
-                                  0, /* min */
-                                  1048576, /* max, 1024*1024 */
-                                  512, /* default value */
-                                  G_PARAM_CONSTRUCT_ONLY |
-                                  G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_FRAMED_TRANSPORT_WRITE_BUFFER_SIZE,
-                                   param_spec);
-
-  gobject_class->finalize = thrift_framed_transport_finalize;
-  ttc->is_open = thrift_framed_transport_is_open;
-  ttc->peek = thrift_framed_transport_peek;
-  ttc->open = thrift_framed_transport_open;
-  ttc->close = thrift_framed_transport_close;
-  ttc->read = thrift_framed_transport_read;
-  ttc->read_end = thrift_framed_transport_read_end;
-  ttc->write = thrift_framed_transport_write;
-  ttc->write_end = thrift_framed_transport_write_end;
-  ttc->flush = thrift_framed_transport_flush;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.h
deleted file mode 100644
index 95c0123..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_FRAMED_TRANSPORT_H
-#define _THRIFT_FRAMED_TRANSPORT_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_framed_transport.h
- *  \brief Implementation of a Thrift framed transport.  Subclasses
- *         the ThriftTransport class.
- */
-
-/* type macros */
-#define THRIFT_TYPE_FRAMED_TRANSPORT (thrift_framed_transport_get_type ())
-#define THRIFT_FRAMED_TRANSPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_FRAMED_TRANSPORT, ThriftFramedTransport))
-#define THRIFT_IS_FRAMED_TRANSPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_FRAMED_TRANSPORT))
-#define THRIFT_FRAMED_TRANSPORT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_FRAMED_TRANSPORT, ThriftFramedTransportClass))
-#define THRIFT_IS_FRAMED_TRANSPORT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_FRAMED_TRANSPORT)
-#define THRIFT_FRAMED_TRANSPORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_FRAMED_TRANSPORT, ThriftFramedTransportClass))
-
-typedef struct _ThriftFramedTransport ThriftFramedTransport;
-
-/*!
- * ThriftFramedTransport instance.
- */
-struct _ThriftFramedTransport
-{
-  ThriftTransport parent;
-
-  /* protected */
-  ThriftTransport *transport;
-
-  /* private */
-  GByteArray *r_buf;
-  GByteArray *w_buf;
-  guint32 r_buf_size;
-  guint32 w_buf_size;
-};
-
-typedef struct _ThriftFramedTransportClass ThriftFramedTransportClass;
-
-/*!
- * ThriftFramedTransport class.
- */
-struct _ThriftFramedTransportClass
-{
-  ThriftTransportClass parent;
-};
-
-/* used by THRIFT_TYPE_FRAMED_TRANSPORT */
-GType thrift_framed_transport_get_type (void);
-
-G_END_DECLS
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport_factory.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport_factory.c
deleted file mode 100644
index e68fe0a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport_factory.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_framed_transport.h>
-#include <thrift/c_glib/transport/thrift_framed_transport_factory.h>
-
-G_DEFINE_TYPE (ThriftFramedTransportFactory,
-               thrift_framed_transport_factory,
-               THRIFT_TYPE_TRANSPORT_FACTORY)
-
-/* Wraps a transport with a ThriftFramedTransport. */
-ThriftTransport *
-thrift_framed_transport_factory_get_transport (ThriftTransportFactory *factory,
-                                               ThriftTransport *transport)
-{
-  THRIFT_UNUSED_VAR (factory);
-
-  return THRIFT_TRANSPORT (g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT,
-                                         "transport", transport,
-                                         NULL));
-}
-
-static void
-thrift_framed_transport_factory_init (ThriftFramedTransportFactory *self)
-{
-  THRIFT_UNUSED_VAR (self);
-}
-
-static void
-thrift_framed_transport_factory_class_init (ThriftFramedTransportFactoryClass *klass)
-{
-  ThriftTransportFactoryClass *base_class =
-    THRIFT_TRANSPORT_FACTORY_CLASS (klass);
-
-  base_class->get_transport =
-    klass->get_transport =
-    thrift_framed_transport_factory_get_transport;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport_factory.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport_factory.h
deleted file mode 100644
index c3e9496..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport_factory.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_FRAMED_TRANSPORT_FACTORY_H
-#define _THRIFT_FRAMED_TRANSPORT_FACTORY_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_transport_factory.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_framed_transport_factory.h
- *  \brief Wraps a transport with a ThriftFramedTransport.
- */
-
-/* type macros */
-#define THRIFT_TYPE_FRAMED_TRANSPORT_FACTORY    \
-  (thrift_framed_transport_factory_get_type ())
-#define THRIFT_FRAMED_TRANSPORT_FACTORY(obj)                            \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                   \
-                               THRIFT_TYPE_FRAMED_TRANSPORT_FACTORY,    \
-                               ThriftFramedTransportFactory))
-#define THRIFT_IS_FRAMED_TRANSPORT_FACTORY(obj)                         \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                                   \
-                               THRIFT_TYPE_FRAMED_TRANSPORT_FACTORY))
-#define THRIFT_FRAMED_TRANSPORT_FACTORY_CLASS(c)                        \
-  (G_TYPE_CHECK_CLASS_CAST ((c),                                        \
-                            THRIFT_TYPE_FRAMED_TRANSPORT_FACTORY,       \
-                            ThriftFramedTransportFactoryClass))
-#define THRIFT_IS_FRAMED_TRANSPORT_FACTORY_CLASS(c)                     \
-  (G_TYPE_CHECK_CLASS_TYPE ((c),                                        \
-                            THRIFT_TYPE_FRAMED_TRANSPORT_FACTORY))
-#define THRIFT_FRAMED_TRANSPORT_FACTORY_GET_CLASS(obj)                  \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                                    \
-                              THRIFT_TYPE_FRAMED_TRANSPORT_FACTORY,     \
-                              ThriftFramedTransportFactoryClass))
-
-typedef struct _ThriftFramedTransportFactory ThriftFramedTransportFactory;
-
-/* Thrift Framed-Transport Factory instance */
-struct _ThriftFramedTransportFactory
-{
-  ThriftTransportFactory parent;
-};
-
-typedef struct _ThriftFramedTransportFactoryClass ThriftFramedTransportFactoryClass;
-
-/* Thrift Framed-Transport Factory class */
-struct _ThriftFramedTransportFactoryClass
-{
-  ThriftTransportFactoryClass parent;
-
-  /* vtable */
-  ThriftTransport *(*get_transport) (ThriftTransportFactory *factory,
-                                     ThriftTransport *transport);
-};
-
-/* used by THRIFT_TYPE_FRAMED_TRANSPORT_FACTORY */
-GType thrift_framed_transport_factory_get_type (void);
-
-/* virtual public methods */
-ThriftTransport *
-thrift_framed_transport_factory_get_transport (ThriftTransportFactory *factory,
-                                               ThriftTransport *transport);
-
-G_END_DECLS
-
-#endif /* _THRIFT_FRAMED_TRANSPORT_FACTORY_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.c
deleted file mode 100644
index b96db35..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_memory_buffer.h>
-
-/* object properties */
-enum _ThriftMemoryBufferProperties
-{
-  PROP_0,
-  PROP_THRIFT_MEMORY_BUFFER_BUFFER_SIZE,
-  PROP_THRIFT_MEMORY_BUFFER_BUFFER,
-  PROP_THRIFT_MEMORY_BUFFER_OWNER
-};
-
-G_DEFINE_TYPE(ThriftMemoryBuffer, thrift_memory_buffer, THRIFT_TYPE_TRANSPORT)
-
-/* implements thrift_transport_is_open */
-gboolean
-thrift_memory_buffer_is_open (ThriftTransport *transport)
-{
-  THRIFT_UNUSED_VAR (transport);
-  return TRUE;
-}
-
-/* implements thrift_transport_open */
-gboolean
-thrift_memory_buffer_open (ThriftTransport *transport, GError **error)
-{
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_close */
-gboolean
-thrift_memory_buffer_close (ThriftTransport *transport, GError **error)
-{
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_read */
-gint32
-thrift_memory_buffer_read (ThriftTransport *transport, gpointer buf,
-                           guint32 len, GError **error)
-{
-  ThriftMemoryBuffer *t = THRIFT_MEMORY_BUFFER (transport);
-  guint32 give = len; 
-
-  THRIFT_UNUSED_VAR (error);
-
-  /* if the requested bytes are more than what we have available,
-   * just give all that we have the buffer */
-  if (t->buf->len < len)
-  {
-    give = t->buf->len;
-  }
-
-  memcpy (buf, t->buf->data, give);
-  g_byte_array_remove_range (t->buf, 0, give);
-
-  return give;
-}
-
-/* implements thrift_transport_read_end
- * called when read is complete.  nothing to do on our end. */
-gboolean
-thrift_memory_buffer_read_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_write */
-gboolean
-thrift_memory_buffer_write (ThriftTransport *transport,
-                            const gpointer buf,     
-                            const guint32 len, GError **error)
-{
-  ThriftMemoryBuffer *t = THRIFT_MEMORY_BUFFER (transport);
-
-  THRIFT_UNUSED_VAR (error);
-
-  /* return an exception if the buffer doesn't have enough space. */
-  if (len > t->buf_size - t->buf->len)
-  {
-    g_set_error (error, THRIFT_TRANSPORT_ERROR, THRIFT_TRANSPORT_ERROR_SEND,
-                 "unable to write %d bytes to buffer of length %d",
-                 len, t->buf_size);
-    return FALSE;
-  } else {
-    t->buf = g_byte_array_append (t->buf, buf, len);
-    return TRUE;
-  }
-}
-
-/* implements thrift_transport_write_end
- * called when write is complete.  nothing to do on our end. */
-gboolean
-thrift_memory_buffer_write_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_flush */
-gboolean
-thrift_memory_buffer_flush (ThriftTransport *transport, GError **error)
-{
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-
-  return TRUE;
-}
-
-/* initializes class before constructor properties are set */
-static void
-thrift_memory_buffer_init (ThriftMemoryBuffer *t)
-{
-  THRIFT_UNUSED_VAR (t);
-}
-
-/* destructor */
-static void
-thrift_memory_buffer_finalize (GObject *object)
-{
-  ThriftMemoryBuffer *t = THRIFT_MEMORY_BUFFER (object);
-
-  if (t->owner && t->buf != NULL)
-  {
-    g_byte_array_unref (t->buf);
-  }
-  t->buf = NULL;
-}
-
-/* property accessor */
-void
-thrift_memory_buffer_get_property (GObject *object, guint property_id,
-                                   GValue *value, GParamSpec *pspec)
-{
-  ThriftMemoryBuffer *t = THRIFT_MEMORY_BUFFER (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_MEMORY_BUFFER_BUFFER_SIZE:
-      g_value_set_uint (value, t->buf_size);
-      break;
-    case PROP_THRIFT_MEMORY_BUFFER_BUFFER:
-      g_value_set_pointer (value, (gpointer) (t->buf));
-      break;
-    case PROP_THRIFT_MEMORY_BUFFER_OWNER:
-      g_value_set_boolean (value, t->owner);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-/* property mutator */
-void
-thrift_memory_buffer_set_property (GObject *object, guint property_id,
-                                   const GValue *value, GParamSpec *pspec)
-{
-  ThriftMemoryBuffer *t = THRIFT_MEMORY_BUFFER (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_MEMORY_BUFFER_BUFFER_SIZE:
-      t->buf_size = g_value_get_uint (value);
-      break;
-    case PROP_THRIFT_MEMORY_BUFFER_BUFFER:
-      t->buf = (GByteArray*) g_value_get_pointer (value);
-      break;
-    case PROP_THRIFT_MEMORY_BUFFER_OWNER:
-      t->owner = g_value_get_boolean (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-/* initializes class after constructor properties are set */
-static void
-thrift_memory_buffer_constructed (GObject *object)
-{
-  ThriftMemoryBuffer *t = THRIFT_MEMORY_BUFFER (object);
-
-  if (t->buf == NULL) {
-    t->buf = g_byte_array_new ();
-  }
-
-  G_OBJECT_CLASS (thrift_memory_buffer_parent_class)->constructed (object);
-}
-
-/* initializes the class */
-static void
-thrift_memory_buffer_class_init (ThriftMemoryBufferClass *cls)
-{
-  ThriftTransportClass *ttc = THRIFT_TRANSPORT_CLASS (cls);
-  GObjectClass *gobject_class = G_OBJECT_CLASS (cls);
-  GParamSpec *param_spec = NULL;
-
-  /* setup accessors and mutators */
-  gobject_class->get_property = thrift_memory_buffer_get_property;
-  gobject_class->set_property = thrift_memory_buffer_set_property;
-
-  param_spec = g_param_spec_uint ("buf_size",
-                                  "buffer size (construct)",
-                                  "Set the read/write buffer size limit",
-                                  0, /* min */
-                                  G_MAXUINT32, /* max */
-                                  G_MAXUINT32, /* default */
-                                  G_PARAM_CONSTRUCT_ONLY |
-                                  G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_MEMORY_BUFFER_BUFFER_SIZE,
-                                   param_spec);
-
-  param_spec = g_param_spec_pointer ("buf",
-                                     "internal buffer (GByteArray)",
-                                     "Set the internal buffer (GByteArray)",
-                                     G_PARAM_CONSTRUCT_ONLY |
-                                     G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_MEMORY_BUFFER_BUFFER,
-                                   param_spec);
-
-  param_spec = g_param_spec_boolean ("owner",
-                                     "internal buffer memory management policy",
-                                     "Set whether internal buffer should be"
-                                       " unreferenced when thrift_memory_buffer"
-                                       " is finalized",
-                                     TRUE,
-                                     G_PARAM_CONSTRUCT_ONLY |
-                                     G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_MEMORY_BUFFER_OWNER,
-                                   param_spec);
-
-  gobject_class->constructed = thrift_memory_buffer_constructed;
-  gobject_class->finalize = thrift_memory_buffer_finalize;
-  ttc->is_open = thrift_memory_buffer_is_open;
-  ttc->open = thrift_memory_buffer_open;
-  ttc->close = thrift_memory_buffer_close;
-  ttc->read = thrift_memory_buffer_read;
-  ttc->read_end = thrift_memory_buffer_read_end;
-  ttc->write = thrift_memory_buffer_write;
-  ttc->write_end = thrift_memory_buffer_write_end;
-  ttc->flush = thrift_memory_buffer_flush;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.h
deleted file mode 100644
index d5d47b3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_MEMORY_BUFFER_H
-#define _THRIFT_MEMORY_BUFFER_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_memory_buffer.h
- *  \brief Implementation of a Thrift memory buffer transport.
- */
-
-/* type macros */
-#define THRIFT_TYPE_MEMORY_BUFFER (thrift_memory_buffer_get_type ())
-#define THRIFT_MEMORY_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_MEMORY_BUFFER, ThriftMemoryBuffer))
-#define THRIFT_IS_MEMORY_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_MEMORY_BUFFER))
-#define THRIFT_MEMORY_BUFFER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_MEMORY_BUFFER, ThriftMemoryBufferClass))
-#define THRIFT_IS_MEMORY_BUFFER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_MEMORY_BUFFER)
-#define THRIFT_MEMORY_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_MEMORY_BUFFER, ThriftMemoryBufferClass))
-
-typedef struct _ThriftMemoryBuffer ThriftMemoryBuffer;
-
-/*!
- * ThriftMemoryBuffer instance.
- */
-struct _ThriftMemoryBuffer
-{
-  ThriftTransport parent;
-
-  /* private */
-  GByteArray *buf;
-  guint32 buf_size;
-  gboolean owner;
-};
-
-typedef struct _ThriftMemoryBufferClass ThriftMemoryBufferClass;
-
-/*!
- * ThriftMemoryBuffer class.
- */
-struct _ThriftMemoryBufferClass
-{
-  ThriftTransportClass parent;
-};
-
-/* used by THRIFT_TYPE_MEMORY_BUFFER */
-GType thrift_memory_buffer_get_type (void);
-
-G_END_DECLS
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
deleted file mode 100644
index 6fc6ab3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <errno.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-
-/* object properties */
-enum _ThriftServerSocketProperties
-{
-  PROP_0,
-  PROP_THRIFT_SERVER_SOCKET_PORT,
-  PROP_THRIFT_SERVER_SOCKET_BACKLOG
-};
-
-/* define the GError domain string */
-#define THRIFT_SERVER_SOCKET_ERROR_DOMAIN "thrift-server-socket-error-quark"
-
-G_DEFINE_TYPE(ThriftServerSocket, thrift_server_socket, THRIFT_TYPE_SERVER_TRANSPORT)
-
-gboolean
-thrift_server_socket_listen (ThriftServerTransport *transport, GError **error)
-{
-  int enabled = 1; /* for setsockopt() */
-  struct sockaddr_in pin;
-  ThriftServerSocket *tsocket = THRIFT_SERVER_SOCKET (transport);
-
-  /* create a address structure */
-  memset (&pin, 0, sizeof(pin));
-  pin.sin_family = AF_INET;
-  pin.sin_addr.s_addr = INADDR_ANY;
-  pin.sin_port = htons(tsocket->port);
-
-  /* create a socket */
-  if ((tsocket->sd = socket (AF_INET, SOCK_STREAM, 0)) == -1)
-  {
-    g_set_error (error, THRIFT_SERVER_SOCKET_ERROR,
-                 THRIFT_SERVER_SOCKET_ERROR_SOCKET,
-                 "failed to create socket - %s", strerror (errno));
-    return FALSE;
-  }
-
-  if (setsockopt(tsocket->sd, SOL_SOCKET, SO_REUSEADDR, &enabled,
-                 sizeof(enabled)) == -1)
-  {
-    g_set_error (error, THRIFT_SERVER_SOCKET_ERROR,
-                 THRIFT_SERVER_SOCKET_ERROR_SETSOCKOPT,
-                 "unable to set SO_REUSEADDR - %s", strerror(errno));
-    return FALSE;
-  }
-
-  /* bind to the socket */
-  if (bind(tsocket->sd, (struct sockaddr *) &pin, sizeof(pin)) == -1)
-  {
-    g_set_error (error, THRIFT_SERVER_SOCKET_ERROR,
-                 THRIFT_SERVER_SOCKET_ERROR_BIND,
-                 "failed to bind to port %d - %s",
-                 tsocket->port, strerror(errno));
-    return FALSE;
-  }
-
-  if (listen(tsocket->sd, tsocket->backlog) == -1)
-  {
-    g_set_error (error, THRIFT_SERVER_SOCKET_ERROR,
-                 THRIFT_SERVER_SOCKET_ERROR_LISTEN,
-                 "failed to listen to port %d - %s",
-                 tsocket->port, strerror(errno));
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-ThriftTransport *
-thrift_server_socket_accept (ThriftServerTransport *transport, GError **error)
-{
-  int sd = THRIFT_INVALID_SOCKET;
-  guint addrlen = 0;
-  struct sockaddr_in address;
-  ThriftSocket *socket = NULL;
-
-  ThriftServerSocket *tsocket = THRIFT_SERVER_SOCKET (transport);
-
-  if ((sd = accept(tsocket->sd, (struct sockaddr *) &address, &addrlen)) == -1)
-  {
-    g_set_error (error, THRIFT_SERVER_SOCKET_ERROR,
-                 THRIFT_SERVER_SOCKET_ERROR_ACCEPT,
-                 "failed to accept connection - %s",
-                 strerror(errno));
-    return FALSE;
-  }
-
-  socket = g_object_new (THRIFT_TYPE_SOCKET, NULL);
-  socket->sd = sd;
-
-  return THRIFT_TRANSPORT(socket);
-}
-
-gboolean
-thrift_server_socket_close (ThriftServerTransport *transport, GError **error)
-{
-  ThriftServerSocket *tsocket = THRIFT_SERVER_SOCKET (transport);
-
-  if (close (tsocket->sd) == -1)
-  {
-    g_set_error (error, THRIFT_SERVER_SOCKET_ERROR,
-                 THRIFT_SERVER_SOCKET_ERROR_CLOSE,
-                 "unable to close socket - %s", strerror(errno));
-    return FALSE;
-  }
-  tsocket->sd = THRIFT_INVALID_SOCKET;
-
-  return TRUE;
-}
-
-/* define the GError domain for this implementation */
-GQuark
-thrift_server_socket_error_quark (void)
-{
-  return g_quark_from_static_string(THRIFT_SERVER_SOCKET_ERROR_DOMAIN);
-}
-
-/* initializes the instance */
-static void
-thrift_server_socket_init (ThriftServerSocket *socket)
-{
-  socket->sd = THRIFT_INVALID_SOCKET;
-}
-
-/* destructor */
-static void
-thrift_server_socket_finalize (GObject *object)
-{
-  ThriftServerSocket *socket = THRIFT_SERVER_SOCKET (object);
-
-  if (socket->sd != THRIFT_INVALID_SOCKET)
-  {
-    close (socket->sd);
-  }
-  socket->sd = THRIFT_INVALID_SOCKET;
-}
-
-/* property accessor */
-void
-thrift_server_socket_get_property (GObject *object, guint property_id,
-                                   GValue *value, GParamSpec *pspec)
-{
-  ThriftServerSocket *socket = THRIFT_SERVER_SOCKET (object);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_SERVER_SOCKET_PORT:
-      g_value_set_uint (value, socket->port);
-      break;
-    case PROP_THRIFT_SERVER_SOCKET_BACKLOG:
-      g_value_set_uint (value, socket->backlog);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-/* property mutator */
-void
-thrift_server_socket_set_property (GObject *object, guint property_id,
-                                   const GValue *value, GParamSpec *pspec)
-{
-  ThriftServerSocket *socket = THRIFT_SERVER_SOCKET (object);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_SERVER_SOCKET_PORT:
-      socket->port = g_value_get_uint (value);
-      break;
-    case PROP_THRIFT_SERVER_SOCKET_BACKLOG:
-      socket->backlog = g_value_get_uint (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-/* initializes the class */
-static void
-thrift_server_socket_class_init (ThriftServerSocketClass *cls)
-{
-  ThriftServerTransportClass *tstc = THRIFT_SERVER_TRANSPORT_CLASS (cls);
-  GObjectClass *gobject_class = G_OBJECT_CLASS (cls);
-  GParamSpec *param_spec = NULL;
-
-  /* setup accessors and mutators */
-  gobject_class->get_property = thrift_server_socket_get_property;
-  gobject_class->set_property = thrift_server_socket_set_property;
-
-  param_spec = g_param_spec_uint ("port",
-                                  "port (construct)",
-                                  "Set the port to listen to",
-                                  0, /* min */
-                                  65534, /* max */
-                                  9090, /* default by convention */
-                                  G_PARAM_CONSTRUCT_ONLY |
-                                  G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_SERVER_SOCKET_PORT, 
-                                   param_spec);
-
-  param_spec = g_param_spec_uint ("backlog",
-                                  "backlog (construct)",
-                                  "Set the accept backlog",
-                                  0, /* max */
-                                  65534, /* max */
-                                  1024, /* default */
-                                  G_PARAM_CONSTRUCT_ONLY |
-                                  G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class,
-                                   PROP_THRIFT_SERVER_SOCKET_BACKLOG,
-                                   param_spec);
-
-  gobject_class->finalize = thrift_server_socket_finalize;
-
-  tstc->listen = thrift_server_socket_listen;
-  tstc->accept = thrift_server_socket_accept;
-  tstc->close = thrift_server_socket_close;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.h
deleted file mode 100644
index f072cb0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_SOCKET_H
-#define _THRIFT_SERVER_SOCKET_H
-
-#include <glib-object.h>
-
-#include "thrift_server_transport.h"
-
-G_BEGIN_DECLS
-
-/*! \file thrift_server_socket.h
- *  \brief Socket implementation of a Thrift server transport.  Implements the
- *         ThriftServerTransport class.
- */
-
-/* type macros */
-#define THRIFT_TYPE_SERVER_SOCKET (thrift_server_socket_get_type ())
-#define THRIFT_SERVER_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_SERVER_SOCKET, ThriftServerSocket))
-#define THRIFT_IS_SERVER_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_SERVER_SOCKET))
-#define THRIFT_SERVER_SOCKET_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_SERVER_SOCKET, ThriftServerSocketClass))
-#define THRIFT_IS_SERVER_SOCKET_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_SERVER_SOCKET))
-#define THRIFT_SERVER_SOCKET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_SERVER_SOCKET, ThriftServerSocketClass))
-
-typedef struct _ThriftServerSocket ThriftServerSocket;
-
-/*!
- * Thrift ServerSocket instance.
- */
-struct _ThriftServerSocket
-{
-  ThriftServerTransport parent;
-
-  /* private */
-  gshort port;
-  gshort backlog;
-  int sd;
-  guint8 *buf;
-  guint32 buf_size;
-  guint32 buf_len;
-};
-
-typedef struct _ThriftServerSocketClass ThriftServerSocketClass;
-
-/*!
- * Thrift ServerSocket class.
- */
-struct _ThriftServerSocketClass
-{
-  ThriftServerTransportClass parent;
-};
-
-/* used by THRIFT_TYPE_SERVER_SOCKET */
-GType thrift_server_socket_get_type (void);
-
-/* define error/exception types */
-typedef enum
-{
-  THRIFT_SERVER_SOCKET_ERROR_SOCKET,
-  THRIFT_SERVER_SOCKET_ERROR_SETSOCKOPT,
-  THRIFT_SERVER_SOCKET_ERROR_BIND,
-  THRIFT_SERVER_SOCKET_ERROR_LISTEN,
-  THRIFT_SERVER_SOCKET_ERROR_ACCEPT,
-  THRIFT_SERVER_SOCKET_ERROR_CLOSE
-} ThriftServerSocketError;
-
-/* define a error domain for GError to use */
-GQuark thrift_server_socket_error_quark (void);
-#define THRIFT_SERVER_SOCKET_ERROR (thrift_server_socket_error_quark ())
-
-G_END_DECLS
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.c
deleted file mode 100644
index c25d138..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-
-G_DEFINE_ABSTRACT_TYPE(ThriftServerTransport, thrift_server_transport, G_TYPE_OBJECT)
-
-/* base initializer for the server transport interface */
-static void
-thrift_server_transport_class_init (ThriftServerTransportClass *c)
-{
-  c->listen = thrift_server_transport_listen;
-  c->accept = thrift_server_transport_accept;
-  c->close = thrift_server_transport_close;
-}
-
-static void
-thrift_server_transport_init (ThriftServerTransport *transport)
-{
-  THRIFT_UNUSED_VAR (transport);
-}
-
-gboolean
-thrift_server_transport_listen (ThriftServerTransport *transport,
-                                GError **error)
-{
-  return THRIFT_SERVER_TRANSPORT_GET_CLASS (transport)->listen (transport,
-                                                                error);
-}
-
-ThriftTransport *
-thrift_server_transport_accept (ThriftServerTransport *transport,
-                                GError **error)
-{
-  return THRIFT_SERVER_TRANSPORT_GET_CLASS (transport)->accept (transport,
-                                                                error);
-}
-
-gboolean
-thrift_server_transport_close (ThriftServerTransport *transport, GError **error)
-{
-  return THRIFT_SERVER_TRANSPORT_GET_CLASS (transport)->close (transport,
-                                                               error);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.h
deleted file mode 100644
index 98a9191..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TRANSPORT_H
-#define _THRIFT_SERVER_TRANSPORT_H
-
-#include <glib-object.h>
-
-#include "thrift_transport.h"
-
-G_BEGIN_DECLS
-
-/*! \file thrift_server_transport.h
- *  \brief Abstract class for Thrift server transports.
- */
-
-/* type macros */
-#define THRIFT_TYPE_SERVER_TRANSPORT (thrift_server_transport_get_type ())
-#define THRIFT_SERVER_TRANSPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_SERVER_TRANSPORT, ThriftServerTransport))
-#define THRIFT_IS_SERVER_TRANSPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_SERVER_TRANSPORT))
-#define THRIFT_SERVER_TRANSPORT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_SERVER_TRANSPORT, ThriftServerTransportClass))
-#define THRIFT_IS_SERVER_TRANSPORT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_SERVER_TRANSPORT))
-#define THRIFT_SERVER_TRANSPORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_SERVER_TRANSPORT, ThriftServerTransportClass))
-
-typedef struct _ThriftServerTransport ThriftServerTransport;
-
-struct _ThriftServerTransport
-{
-  GObject parent;
-};
-
-typedef struct _ThriftServerTransportClass ThriftServerTransportClass;
-
-/*!
- * Thrift Transport class
- */
-struct _ThriftServerTransportClass
-{
-  GObjectClass parent;
-
-  /* vtable */
-  gboolean (*listen) (ThriftServerTransport *transport, GError **error);
-  ThriftTransport *(*accept) (ThriftServerTransport *transport, GError **error);
-  gboolean (*close) (ThriftServerTransport *transport, GError **error);
-};
-
-/* used by THRIFT_TYPE_SERVER_TRANSPORT */
-GType thrift_server_transport_get_type (void);
-
-/*!
- * Listen for new connections.
- * \public \memberof ThriftServerTransportClass
- */
-gboolean thrift_server_transport_listen (ThriftServerTransport *transport,
-                                         GError **error);
-
-/*!
- * Accept a connection.
- * \public \memberof ThriftServerTransportClass
- */
-ThriftTransport *thrift_server_transport_accept
-    (ThriftServerTransport *transport, GError **error);
-
-/*!
- * Close the transport.
- * \public \memberof ThriftServerTransportClass
- */
-gboolean thrift_server_transport_close (ThriftServerTransport *transport,
-                                        GError **error);
-
-G_END_DECLS
-
-#endif /* _THRIFT_SERVER_TRANSPORT_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.c
deleted file mode 100644
index 07ee2cb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <errno.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-
-/* object properties */
-enum _ThriftSocketProperties
-{
-  PROP_0,
-  PROP_THRIFT_SOCKET_HOSTNAME,
-  PROP_THRIFT_SOCKET_PORT
-};
-
-G_DEFINE_TYPE(ThriftSocket, thrift_socket, THRIFT_TYPE_TRANSPORT)
-
-/* implements thrift_transport_is_open */
-gboolean
-thrift_socket_is_open (ThriftTransport *transport)
-{
-  ThriftSocket *socket = THRIFT_SOCKET (transport);
-  return socket->sd != THRIFT_INVALID_SOCKET;
-}
-
-/* overrides thrift_transport_peek */
-gboolean
-thrift_socket_peek (ThriftTransport *transport, GError **error)
-{
-  gboolean result = FALSE;
-  guint8 buf;
-  int r;
-  int errno_copy;
-
-  ThriftSocket *socket = THRIFT_SOCKET (transport);
-
-  if (thrift_socket_is_open (transport))
-  {
-    r = recv (socket->sd, &buf, 1, MSG_PEEK);
-    if (r == -1)
-    {
-      errno_copy = errno;
-
-      #if defined __FreeBSD__ || defined __MACH__
-      /* FreeBSD returns -1 and ECONNRESET if the socket was closed by the other
-         side */
-      if (errno_copy == ECONNRESET)
-      {
-        thrift_socket_close (transport, error);
-      }
-      else
-      {
-      #endif
-
-      g_set_error (error,
-                   THRIFT_TRANSPORT_ERROR,
-                   THRIFT_TRANSPORT_ERROR_SOCKET,
-                   "failed to peek at socket - %s",
-                   strerror (errno_copy));
-
-      #if defined __FreeBSD__ || defined __MACH__
-      }
-      #endif
-    }
-    else if (r > 0)
-    {
-      result = TRUE;
-    }
-  }
-
-  return result;
-}
-
-/* implements thrift_transport_open */
-gboolean
-thrift_socket_open (ThriftTransport *transport, GError **error)
-{
-  struct hostent *hp = NULL;
-  struct sockaddr_in pin;
-  int err;
-#if defined(HAVE_GETHOSTBYNAME_R)
-  struct hostent he;
-  char buf[1024];
-#endif
-
-  ThriftSocket *tsocket = THRIFT_SOCKET (transport);
-  g_return_val_if_fail (tsocket->sd == THRIFT_INVALID_SOCKET, FALSE);
-
-  /* lookup the destination host */
-#if defined(HAVE_GETHOSTBYNAME_R)
-  if (gethostbyname_r (tsocket->hostname, &he, buf, 1024, &hp, &err) != 0 || hp == NULL)
-#else
-  if ((hp = gethostbyname (tsocket->hostname)) == NULL && (err = h_errno))
-#endif
-  {
-    /* host lookup failed, bail out with an error */
-    g_set_error (error, THRIFT_TRANSPORT_ERROR, THRIFT_TRANSPORT_ERROR_HOST,
-                 "host lookup failed for %s:%d - %s",
-                 tsocket->hostname, tsocket->port,
-                 hstrerror (err));
-    return FALSE;
-  }
-
-  /* create a socket structure */
-  memset (&pin, 0, sizeof(pin));
-  pin.sin_family = AF_INET;
-  pin.sin_addr.s_addr = ((struct in_addr *) (hp->h_addr))->s_addr;
-  pin.sin_port = htons (tsocket->port); 
-
-  /* create the socket */
-  if ((tsocket->sd = socket (AF_INET, SOCK_STREAM, 0)) == -1)
-  {
-    g_set_error (error, THRIFT_TRANSPORT_ERROR, THRIFT_TRANSPORT_ERROR_SOCKET,
-                 "failed to create socket for host %s:%d - %s",
-                 tsocket->hostname, tsocket->port,
-                 strerror(errno));
-    return FALSE;
-  }
-
-  /* open a connection */
-  if (connect (tsocket->sd, (struct sockaddr *) &pin, sizeof(pin)) == -1)
-  {
-    g_set_error (error, THRIFT_TRANSPORT_ERROR, THRIFT_TRANSPORT_ERROR_CONNECT,
-                 "failed to connect to host %s:%d - %s",
-                 tsocket->hostname, tsocket->port, strerror(errno));
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-/* implements thrift_transport_close */
-gboolean
-thrift_socket_close (ThriftTransport *transport, GError **error)
-{
-  ThriftSocket *socket = THRIFT_SOCKET (transport);
-
-  if (close (socket->sd) == -1)
-  {
-    g_set_error (error, THRIFT_TRANSPORT_ERROR, THRIFT_TRANSPORT_ERROR_CLOSE,
-                 "unable to close socket - %s",
-                 strerror(errno));
-    return FALSE;
-  }
-
-  socket->sd = THRIFT_INVALID_SOCKET;
-  return TRUE;
-}
-
-/* implements thrift_transport_read */
-gint32
-thrift_socket_read (ThriftTransport *transport, gpointer buf,
-                    guint32 len, GError **error)
-{
-  gint ret = 0;
-  guint got = 0;
-
-  ThriftSocket *socket = THRIFT_SOCKET (transport);
-
-  while (got < len)
-  {
-    ret = recv (socket->sd, (guint8 *)buf + got, len-got, 0);
-    if (ret <= 0)
-    {
-      g_set_error (error, THRIFT_TRANSPORT_ERROR,
-                   THRIFT_TRANSPORT_ERROR_RECEIVE,
-                   "failed to read %d bytes - %s", len, strerror(errno));
-      return -1;
-    }
-    got += ret;
-  }
-
-  return got;
-}
-
-/* implements thrift_transport_read_end
- * called when write is complete.  nothing to do on our end. */
-gboolean
-thrift_socket_read_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_write */
-gboolean
-thrift_socket_write (ThriftTransport *transport, const gpointer buf,     
-                     const guint32 len, GError **error)
-{
-  gint ret = 0;
-  guint sent = 0;
-
-  ThriftSocket *socket = THRIFT_SOCKET (transport);
-  g_return_val_if_fail (socket->sd != THRIFT_INVALID_SOCKET, FALSE);
-
-  while (sent < len)
-  {
-    ret = send (socket->sd, (guint8 *)buf + sent, len - sent, 0);
-    if (ret < 0)
-    {
-      g_set_error (error, THRIFT_TRANSPORT_ERROR,
-                   THRIFT_TRANSPORT_ERROR_SEND,
-                   "failed to send %d bytes - %s", len, strerror(errno));
-      return FALSE;
-    }
-    sent += ret;
-  }
-
-  return TRUE;
-}
-
-/* implements thrift_transport_write_end
- * called when write is complete.  nothing to do on our end. */
-gboolean
-thrift_socket_write_end (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* implements thrift_transport_flush
- * flush pending data.  since we are not buffered, this is a no-op */
-gboolean
-thrift_socket_flush (ThriftTransport *transport, GError **error)
-{
-  /* satisfy -Wall */
-  THRIFT_UNUSED_VAR (transport);
-  THRIFT_UNUSED_VAR (error);
-  return TRUE;
-}
-
-/* initializes the instance */
-static void
-thrift_socket_init (ThriftSocket *socket)
-{
-  socket->sd = THRIFT_INVALID_SOCKET;
-}
-
-/* destructor */
-static void
-thrift_socket_finalize (GObject *object)
-{
-  ThriftSocket *socket = THRIFT_SOCKET (object);
-
-  if (socket->hostname != NULL)
-  {
-    g_free (socket->hostname);
-  }
-  socket->hostname = NULL;
-
-  if (socket->sd != THRIFT_INVALID_SOCKET)
-  {
-    close (socket->sd);
-  }
-  socket->sd = THRIFT_INVALID_SOCKET;
-}
-
-/* property accessor */
-void
-thrift_socket_get_property (GObject *object, guint property_id,
-                            GValue *value, GParamSpec *pspec)
-{
-  ThriftSocket *socket = THRIFT_SOCKET (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_SOCKET_HOSTNAME:
-      g_value_set_string (value, socket->hostname);
-      break;
-    case PROP_THRIFT_SOCKET_PORT:
-      g_value_set_uint (value, socket->port);
-      break;
-  }
-}
-
-/* property mutator */
-void
-thrift_socket_set_property (GObject *object, guint property_id,
-                            const GValue *value, GParamSpec *pspec)
-{
-  ThriftSocket *socket = THRIFT_SOCKET (object);
-
-  THRIFT_UNUSED_VAR (pspec);
-
-  switch (property_id)
-  {
-    case PROP_THRIFT_SOCKET_HOSTNAME:
-      socket->hostname = g_strdup (g_value_get_string (value));
-      break;
-    case PROP_THRIFT_SOCKET_PORT:
-      socket->port = g_value_get_uint (value);
-      break;
-  }
-}
-
-/* initializes the class */
-static void
-thrift_socket_class_init (ThriftSocketClass *cls)
-{
-  ThriftTransportClass *ttc = THRIFT_TRANSPORT_CLASS (cls);
-  GObjectClass *gobject_class = G_OBJECT_CLASS (cls);
-  GParamSpec *param_spec = NULL;
-
-  /* setup accessors and mutators */
-  gobject_class->get_property = thrift_socket_get_property;
-  gobject_class->set_property = thrift_socket_set_property;
-
-  param_spec = g_param_spec_string ("hostname",
-                                    "hostname (construct)",
-                                    "Set the hostname of the remote host",
-                                    "localhost", /* default value */
-                                    G_PARAM_CONSTRUCT_ONLY |
-                                    G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_THRIFT_SOCKET_HOSTNAME,
-                                   param_spec);
-
-  param_spec = g_param_spec_uint ("port",
-                                  "port (construct)",
-                                  "Set the port of the remote host",
-                                  0, /* min */
-                                  65534, /* max */
-                                  9090, /* default by convention */
-                                  G_PARAM_CONSTRUCT_ONLY |
-                                  G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_THRIFT_SOCKET_PORT,
-                                   param_spec);
-
-  gobject_class->finalize = thrift_socket_finalize;
-  ttc->is_open = thrift_socket_is_open;
-  ttc->peek = thrift_socket_peek;
-  ttc->open = thrift_socket_open;
-  ttc->close = thrift_socket_close;
-  ttc->read = thrift_socket_read;
-  ttc->read_end = thrift_socket_read_end;
-  ttc->write = thrift_socket_write;
-  ttc->write_end = thrift_socket_write_end;
-  ttc->flush = thrift_socket_flush;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.h
deleted file mode 100644
index 981577d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SOCKET_H
-#define _THRIFT_SOCKET_H
-
-#include <glib-object.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_socket.h
- *  \brief Socket implementation of a Thrift transport.  Subclasses the
- *         ThriftTransport class.
- */
-
-/* type macros */
-#define THRIFT_TYPE_SOCKET (thrift_socket_get_type ())
-#define THRIFT_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_SOCKET, ThriftSocket))
-#define THRIFT_IS_SOCKET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_SOCKET))
-#define THRIFT_SOCKET_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_SOCKET, ThriftSocketClass))
-#define THRIFT_IS_SOCKET_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_SOCKET))
-#define THRIFT_SOCKET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_SOCKET, ThriftSocketClass))
-
-typedef struct _ThriftSocket ThriftSocket;
-
-/*!
- * Thrift Socket instance.
- */
-struct _ThriftSocket
-{
-  ThriftTransport parent;
-
-  /* private */
-  gchar *hostname;
-  gshort port;
-  int sd;
-  guint8 *buf;
-  guint32 buf_size;
-  guint32 buf_len;
-};
-
-typedef struct _ThriftSocketClass ThriftSocketClass;
-
-/*!
- * Thrift Socket class.
- */
-struct _ThriftSocketClass
-{
-  ThriftTransportClass parent;
-};
-
-/* used by THRIFT_TYPE_SOCKET */
-GType thrift_socket_get_type (void);
-
-G_END_DECLS
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
deleted file mode 100644
index 9dd2671..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-/* define the GError domain string */
-#define THRIFT_TRANSPORT_ERROR_DOMAIN "thrift-transport-error-quark"
-
-G_DEFINE_ABSTRACT_TYPE(ThriftTransport, thrift_transport, G_TYPE_OBJECT)
-
-gboolean 
-thrift_transport_is_open (ThriftTransport *transport)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->is_open (transport);
-}
-
-gboolean
-thrift_transport_peek (ThriftTransport *transport, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->peek (transport, error);
-}
-
-gboolean
-thrift_transport_open (ThriftTransport *transport, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->open (transport, error);
-}
-
-gboolean
-thrift_transport_close (ThriftTransport *transport, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->close (transport, error);
-}
-
-gint32
-thrift_transport_read (ThriftTransport *transport, gpointer buf,
-                       guint32 len, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->read (transport, buf,
-                                                       len, error);
-}
-
-gboolean
-thrift_transport_read_end (ThriftTransport *transport, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->read_end (transport,
-                                                           error);
-}
-
-gboolean
-thrift_transport_write (ThriftTransport *transport, const gpointer buf,
-                        const guint32 len, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->write (transport, buf,
-                                                        len, error);
-}
-
-gboolean
-thrift_transport_write_end (ThriftTransport *transport, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->write_end (transport,
-                                                            error);
-}
-
-gboolean
-thrift_transport_flush (ThriftTransport *transport, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->flush (transport, error);
-}
-
-gint32
-thrift_transport_read_all (ThriftTransport *transport, gpointer buf,
-                           guint32 len, GError **error)
-{
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->read_all (transport, buf,
-                                                           len, error);
-}
-
-/* by default, peek returns true if and only if the transport is open */
-static gboolean
-thrift_transport_real_peek (ThriftTransport *transport, GError **error)
-{
-  THRIFT_UNUSED_VAR (error);
-
-  return THRIFT_TRANSPORT_GET_CLASS (transport)->is_open (transport);
-}
-
-static gint32
-thrift_transport_real_read_all (ThriftTransport *transport, gpointer buf,
-                                guint32 len, GError **error)
-{
-  ThriftTransportClass *ttc;
-  guint32 have;
-  gint32 ret;
-  gint8 *bytes;
-
-  THRIFT_UNUSED_VAR (error);
-
-  ttc = THRIFT_TRANSPORT_GET_CLASS (transport);
-  have = 0;
-  ret = 0;
-  bytes = (gint8*) buf;
-
-  while (have < len) {
-    if ((ret = ttc->read (transport, (gpointer) (bytes + have), len - have,
-                          error)) < 0) {
-      return ret;
-    }
-    have += ret;
-  }
-
-  return have;
-}
-
-/* define the GError domain for Thrift transports */
-GQuark
-thrift_transport_error_quark (void)
-{
-  return g_quark_from_static_string (THRIFT_TRANSPORT_ERROR_DOMAIN);
-}
-
-/* class initializer for ThriftTransport */
-static void
-thrift_transport_class_init (ThriftTransportClass *cls)
-{
-  /* set these as virtual methods to be implemented by a subclass */
-  cls->is_open = thrift_transport_is_open;
-  cls->open = thrift_transport_open;
-  cls->close = thrift_transport_close;
-  cls->read = thrift_transport_read;
-  cls->read_end = thrift_transport_read_end;
-  cls->write = thrift_transport_write;
-  cls->write_end = thrift_transport_write_end;
-  cls->flush = thrift_transport_flush;
-
-  /* provide a default implementation for the peek and read_all methods */
-  cls->peek = thrift_transport_real_peek;
-  cls->read_all = thrift_transport_real_read_all;
-}
-
-static void
-thrift_transport_init (ThriftTransport *transport)
-{
-  THRIFT_UNUSED_VAR (transport);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
deleted file mode 100644
index 94bb6f5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_H
-#define _THRIFT_TRANSPORT_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/*! \file thrift_transport.h
- *  \brief Abstract class for Thrift transports.
- *
- * An abstract class is used instead of an interface because:
- *  - interfaces can't seem to be used as properties.  ThriftProtocol has
- *    a ThriftTransport as an object property.
- *  - if a method needs to be added that all subclasses can use, a class
- *    is necessary.
- */
-
-/* type macros */
-#define THRIFT_TYPE_TRANSPORT (thrift_transport_get_type ())
-#define THRIFT_TRANSPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_TRANSPORT, ThriftTransport))
-#define THRIFT_IS_TRANSPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_TRANSPORT))
-#define THRIFT_TRANSPORT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_TRANSPORT, ThriftTransportClass))
-#define THRIFT_IS_TRANSPORT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_TRANSPORT))
-#define THRIFT_TRANSPORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_TRANSPORT, ThriftTransportClass))
-
-typedef struct _ThriftTransport ThriftTransport;
-
-/*!
- * Thrift Protocol object
- */
-struct _ThriftTransport
-{
-  GObject parent;
-};
-
-typedef struct _ThriftTransportClass ThriftTransportClass;
-
-/*!
- * Thrift Transport class
- */
-struct _ThriftTransportClass
-{
-  GObjectClass parent;
-
-  /* vtable */
-  gboolean (*is_open) (ThriftTransport *transport);
-  gboolean (*peek) (ThriftTransport *transport, GError **error);
-  gboolean (*open) (ThriftTransport *transport, GError **error);
-  gboolean (*close) (ThriftTransport *transport, GError **error);
-  gint32 (*read) (ThriftTransport *transport, gpointer buf,
-                  guint32 len, GError **error);
-  gboolean (*read_end) (ThriftTransport *transport, GError **error);
-  gboolean (*write) (ThriftTransport *transport, const gpointer buf,
-                   const guint32 len, GError **error);
-  gboolean (*write_end) (ThriftTransport *transport, GError **error);
-  gboolean (*flush) (ThriftTransport *transport, GError **error);
-  gint32 (*read_all) (ThriftTransport *transport, gpointer buf,
-                      guint32 len, GError **error);
-};
-
-/* used by THRIFT_TYPE_TRANSPORT */
-GType thrift_transport_get_type (void);
-
-/* virtual public methods */
-
-/*!
- * Checks if this transport is opened.
- * \public \memberof ThriftTransportInterface
- */
-gboolean thrift_transport_is_open (ThriftTransport *transport);
-
-/*!
- * Open the transport for reading and writing.
- * \public \memberof ThriftTransportInterface
- */
-gboolean thrift_transport_open (ThriftTransport *transport, GError **error);
-
-/*!
- * Tests whether there is more data to read or if the remote side is still
- * open. By default this is true whenever the transport is open, but
- * implementations should add logic to test for this condition where possible
- * (i.e. on a socket).
- *
- * This is used by a server to check if it should listen for another request.
- * \public \memberof ThriftTransportInterface
- */
-gboolean thrift_transport_peek (ThriftTransport *transport, GError **error);
-
-/*!
- * Close the transport.
- * \public \memberof ThriftTransportInterface
- */
-gboolean thrift_transport_close (ThriftTransport *transport, GError **error);
-
-/*!
- * Read some data into the buffer buf.
- * \public \memberof ThriftTransportInterface
- */
-gint32 thrift_transport_read (ThriftTransport *transport, gpointer buf,
-                              guint32 len, GError **error);
-
-/*!
- * Called when read is completed.
- * \public \memberof ThriftTransportInterface
- */
-gboolean thrift_transport_read_end (ThriftTransport *transport, GError **error);
-
-/*!
- * Writes data from a buffer to the transport.
- * \public \memberof ThriftTransportInterface
- */
-gboolean thrift_transport_write (ThriftTransport *transport, const gpointer buf,
-                                 const guint32 len, GError **error);
-
-/*!
- * Called when write is completed.
- * \public \memberof ThriftTransportInterface
- */
-gboolean thrift_transport_write_end (ThriftTransport *transport,
-                                     GError **error);
-
-/*!
- * Flushes any pending data to be written.  Typically used with buffered
- * transport mechanisms.
- * \public \memberof ThriftTransportInterface
- */
-gboolean thrift_transport_flush (ThriftTransport *transport, GError **error);
-
-/*!
- * Read len bytes of data into the buffer buf.
- * \public \memberof ThriftTransportInterface
- */
-gint32 thrift_transport_read_all (ThriftTransport *transport, gpointer buf,
-                                  guint32 len, GError **error);
-
-/* define error/exception types */
-typedef enum
-{
-  THRIFT_TRANSPORT_ERROR_UNKNOWN,
-  THRIFT_TRANSPORT_ERROR_HOST,
-  THRIFT_TRANSPORT_ERROR_SOCKET,
-  THRIFT_TRANSPORT_ERROR_CONNECT,
-  THRIFT_TRANSPORT_ERROR_SEND,
-  THRIFT_TRANSPORT_ERROR_RECEIVE,
-  THRIFT_TRANSPORT_ERROR_CLOSE
-} ThriftTransportError;
-
-/* define an error domain for GError to use */
-GQuark thrift_transport_error_quark (void);
-#define THRIFT_TRANSPORT_ERROR (thrift_transport_error_quark ())
-
-/* define macro for invalid socket */
-#define THRIFT_INVALID_SOCKET (-1)
-
-G_END_DECLS
-
-#endif /* _THRIFT_TRANSPORT_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.c b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.c
deleted file mode 100644
index a2025cf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_transport_factory.h>
-
-G_DEFINE_TYPE(ThriftTransportFactory, thrift_transport_factory, G_TYPE_OBJECT)
-
-/* builds a transport from the base transport. */
-ThriftTransport *
-thrift_transport_factory_get_transport (ThriftTransportFactory *factory,
-                                        ThriftTransport *transport)
-{
-  THRIFT_UNUSED_VAR (factory);
-  return transport;
-}
-
-static void
-thrift_transport_factory_class_init (ThriftTransportFactoryClass *cls)
-{
-  cls->get_transport = thrift_transport_factory_get_transport;
-}
-
-static void
-thrift_transport_factory_init (ThriftTransportFactory *factory)
-{
-  THRIFT_UNUSED_VAR (factory);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.h b/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.h
deleted file mode 100644
index 0e3da30..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_FACTORY_H
-#define _THRIFT_TRANSPORT_FACTORY_H
-
-#include <glib-object.h>
-
-#include "thrift_transport.h"
-
-G_BEGIN_DECLS
-
-/*! \file thrift_transport_factory.h
- *  \brief Base class for Thrift Transport Factories.  Used by Thrift Servers
- *         to obtain a client transport from an existing transport.  The default
- *         implementation simply clones the provided transport.
- */
-
-/* type macros */
-#define THRIFT_TYPE_TRANSPORT_FACTORY (thrift_transport_factory_get_type ())
-#define THRIFT_TRANSPORT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_TRANSPORT_FACTORY, ThriftTransportFactory))
-#define THRIFT_IS_TRANSPORT_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_TRANSPORT_FACTORY))
-#define THRIFT_TRANSPORT_FACTORY_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_TRANSPORT_FACTORY, ThriftTransportFactoryClass))
-#define THRIFT_IS_TRANSPORT_FACTORY_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_TRANSPORT_FACTORY))
-#define THRIFT_TRANSPORT_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_TRANSPORT_FACTORY, ThriftTransportFactoryClass))
-
-typedef struct _ThriftTransportFactory ThriftTransportFactory;
-
-/* Thrift Transport Factory instance */
-struct _ThriftTransportFactory
-{
-  GObject parent;
-};
-
-typedef struct _ThriftTransportFactoryClass ThriftTransportFactoryClass;
-
-/* Thrift Transport Factory class */
-struct _ThriftTransportFactoryClass
-{
-  GObjectClass parent;
-
-  /* vtable */
-  ThriftTransport *(*get_transport) (ThriftTransportFactory *factory,
-                                     ThriftTransport *transport);
-};
-
-/* used by THRIFT_TYPE_TRANSPORT_FACTORY */
-GType thrift_transport_factory_get_type (void);
-
-/* virtual public methods */
-ThriftTransport *thrift_transport_factory_get_transport (ThriftTransportFactory *factory, ThriftTransport *transport);
-
-G_END_DECLS
-
-#endif /* _THRIFT_TRANSPORT_FACTORY_H */
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/c_glib/test/CMakeLists.txt
deleted file mode 100644
index 2c87dbc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/CMakeLists.txt
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-set(TEST_PREFIX "c_glib")
-
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-
-#Make sure gen-cpp and gen-c_glib files can be included
-include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-
-# Create the thrift C test library
-set(testgenc_SOURCES
-    gen-c_glib/t_test_debug_proto_test_types.c
-    gen-c_glib/t_test_enum_test_types.c
-    gen-c_glib/t_test_enum_test_service.c
-    gen-c_glib/t_test_empty_service.c
-    gen-c_glib/t_test_inherited.c
-    gen-c_glib/t_test_optional_required_test_types.c
-    gen-c_glib/t_test_reverse_order_service.c
-    gen-c_glib/t_test_second_service.c
-    gen-c_glib/t_test_service_for_exception_with_a_map.c
-    gen-c_glib/t_test_srv.c
-    gen-c_glib/t_test_thrift_test.c
-    gen-c_glib/t_test_thrift_test_types.c
-    gen-c_glib/t_test_debug_proto_test_types.h
-    gen-c_glib/t_test_enum_test_types.h
-    gen-c_glib/t_test_enum_test_service.h
-    gen-c_glib/t_test_empty_service.h
-    gen-c_glib/t_test_inherited.h
-    gen-c_glib/t_test_optional_required_test_types.h
-    gen-c_glib/t_test_reverse_order_service.h
-    gen-c_glib/t_test_second_service.h
-    gen-c_glib/t_test_service_for_exception_with_a_map.h
-    gen-c_glib/t_test_srv.h
-    gen-c_glib/t_test_thrift_test.h
-    gen-c_glib/t_test_thrift_test_types.h
-)
-
-add_library(testgenc STATIC ${testgenc_SOURCES})
-LINK_AGAINST_THRIFT_LIBRARY(testgenc thrift_c_glib)
-
-
-add_executable(testserialization testserialization.c)
-target_link_libraries(testserialization testgenc)
-LINK_AGAINST_THRIFT_LIBRARY(testserialization thrift_c_glib)
-add_test(NAME testserialization COMMAND testserialization)
-
-add_executable(testapplicationexception testapplicationexception.c)
-LINK_AGAINST_THRIFT_LIBRARY(testapplicationexception thrift_c_glib)
-add_test(NAME testapplicationexception COMMAND testapplicationexception)
-
-add_executable(testtransportsocket testtransportsocket.c)
-LINK_AGAINST_THRIFT_LIBRARY(testtransportsocket thrift_c_glib)
-add_test(NAME testtransportsocket COMMAND testtransportsocket)
-
-add_executable(testbinaryprotocol testbinaryprotocol.c)
-LINK_AGAINST_THRIFT_LIBRARY(testbinaryprotocol thrift_c_glib)
-add_test(NAME testbinaryprotocol COMMAND testbinaryprotocol)
-
-add_executable(testcompactprotocol testcompactprotocol.c)
-LINK_AGAINST_THRIFT_LIBRARY(testcompactprotocol thrift_c_glib)
-add_test(NAME testcompactprotocol COMMAND testcompactprotocol)
-
-add_executable(testbufferedtransport testbufferedtransport.c)
-LINK_AGAINST_THRIFT_LIBRARY(testbufferedtransport thrift_c_glib)
-add_test(NAME testbufferedtransport COMMAND testbufferedtransport)
-
-add_executable(testframedtransport testframedtransport.c)
-LINK_AGAINST_THRIFT_LIBRARY(testframedtransport thrift_c_glib)
-add_test(NAME testframedtransport COMMAND testframedtransport)
-
-add_executable(testfdtransport testfdtransport.c)
-LINK_AGAINST_THRIFT_LIBRARY(testfdtransport thrift_c_glib)
-add_test(NAME testfdtransport COMMAND testfdtransport)
-
-add_executable(testmemorybuffer testmemorybuffer.c)
-LINK_AGAINST_THRIFT_LIBRARY(testmemorybuffer thrift_c_glib)
-add_test(NAME testmemorybuffer COMMAND testmemorybuffer)
-
-add_executable(testsimpleserver testsimpleserver.c)
-LINK_AGAINST_THRIFT_LIBRARY(testsimpleserver thrift_c_glib)
-add_test(NAME testsimpleserver COMMAND testsimpleserver)
-
-add_executable(testdebugproto testdebugproto.c)
-target_link_libraries(testdebugproto testgenc)
-add_test(NAME testdebugproto COMMAND testdebugproto)
-
-add_executable(testoptionalrequired testoptionalrequired.c)
-target_link_libraries(testoptionalrequired testgenc)
-add_test(NAME testoptionalrequired COMMAND testoptionalrequired)
-
-include_directories("${PROJECT_SOURCE_DIR}/test/c_glib/src" "${CMAKE_CURRENT_BINARY_DIR}/gen-c_glib")
-
-add_executable(testthrifttest testthrifttest.c
-    ${PROJECT_SOURCE_DIR}/test/c_glib/src/thrift_test_handler.c
-    ${PROJECT_SOURCE_DIR}/test/c_glib/src/thrift_test_handler.h
-    gen-c_glib/t_test_thrift_test_types.h)
-target_link_libraries(testthrifttest testgenc)
-add_test(NAME testthrifttest COMMAND testthrifttest)
-
-
-if(BUILD_CPP)
-
-    include_directories("${PROJECT_SOURCE_DIR}/lib/cpp/src")
-
-    # Create the thrift C++ test library
-    set(testgenc_cpp_SOURCES
-        gen-cpp/ThriftTest.cpp
-        gen-cpp/ThriftTest_constants.cpp
-        gen-cpp/ThriftTest_types.cpp
-        gen-cpp/ThriftTest.h
-        gen-cpp/ThriftTest_constants.h
-        gen-cpp/ThriftTest_types.h
-    )
-
-    add_library(testgenc_cpp STATIC ${testgenc_cpp_SOURCES})
-    LINK_AGAINST_THRIFT_LIBRARY(testgenc_cpp thrift)
-
-    #HACK: testthrifttestclient.cpp includes ThriftTest.h without gen-*/ prefixes
-    # so we include it here
-    include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-cpp" "${CMAKE_CURRENT_BINARY_DIR}/gen-c_glib")
-
-    add_executable(testthrifttestclient testthrifttestclient.cpp)
-    target_link_libraries(testthrifttestclient testgenc testgenc_cpp ${ZLIB_LIBRARIES})
-    add_test(NAME testthrifttestclient COMMAND testthrifttestclient)
-
-endif(BUILD_CPP)
-
-#
-# Common thrift code generation rules
-#
-
-add_custom_command(OUTPUT
-    gen-c_glib/t_test_debug_proto_test_types.c
-    gen-c_glib/t_test_debug_proto_test_types.h
-    gen-c_glib/t_test_empty_service.c
-    gen-c_glib/t_test_empty_service.h
-    gen-c_glib/t_test_inherited.c
-    gen-c_glib/t_test_inherited.h
-    gen-c_glib/t_test_reverse_order_service.c
-    gen-c_glib/t_test_reverse_order_service.h
-    gen-c_glib/t_test_service_for_exception_with_a_map.c
-    gen-c_glib/t_test_service_for_exception_with_a_map.h
-    gen-c_glib/t_test_srv.c
-    gen-c_glib/t_test_srv.h
-    COMMAND ${THRIFT_COMPILER} --gen c_glib ${PROJECT_SOURCE_DIR}/test/DebugProtoTest.thrift
-)
-
-add_custom_command(OUTPUT
-    gen-c_glib/t_test_enum_test_types.c
-    gen-c_glib/t_test_enum_test_types.h
-    gen-c_glib/t_test_enum_test_service.c
-    gen-c_glib/t_test_enum_test_service.h
-    COMMAND ${THRIFT_COMPILER} --gen c_glib ${PROJECT_SOURCE_DIR}/test/EnumTest.thrift
-)
-
-add_custom_command(OUTPUT
-    gen-c_glib/t_test_optional_required_test_types.c
-    gen-c_glib/t_test_optional_required_test_types.h
-    COMMAND ${THRIFT_COMPILER} --gen c_glib ${PROJECT_SOURCE_DIR}/test/OptionalRequiredTest.thrift
-)
-
-add_custom_command(OUTPUT
-    gen-c_glib/t_test_second_service.c
-    gen-c_glib/t_test_thrift_test.c
-    gen-c_glib/t_test_thrift_test_types.c
-    gen-c_glib/t_test_second_service.h
-    gen-c_glib/t_test_thrift_test.h
-    gen-c_glib/t_test_thrift_test_types.h
-    COMMAND ${THRIFT_COMPILER} --gen c_glib ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift
-)
-
-add_custom_command(OUTPUT
-    gen-cpp/ThriftTest.cpp
-    gen-cpp/ThriftTest_constants.cpp
-    gen-cpp/ThriftTest_types.cpp
-    gen-cpp/ThriftTest.h
-    gen-cpp/ThriftTest_constants.h
-    gen-cpp/ThriftTest_types.h
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift
-)
-
-# TODO: Add memory checks using ctest_memcheck or similar
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/ContainerTest.thrift b/vendor/git.apache.org/thrift.git/lib/c_glib/test/ContainerTest.thrift
deleted file mode 100644
index a92a9a5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/ContainerTest.thrift
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace c_glib TTest
-
-typedef list<string> StringList
-typedef list<StringList> ListStringList
-
-struct ContainersWithDefaultValues {
-  1: list<string> StringList = [ "Apache", "Thrift" ];
-}
-
-service ContainerService {
-  void receiveStringList(1: list<string> stringList);
-  list<string> returnStringList();
-
-  list<list<string>> returnListStringList();
-  ListStringList returnTypedefdListStringList();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/c_glib/test/Makefile.am
deleted file mode 100755
index 3dc5418..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/Makefile.am
+++ /dev/null
@@ -1,315 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = subdir-objects serial-tests
-
-SUBDIRS =
-
-BUILT_SOURCES = \
-        gen-c_glib/t_test_container_test_types.c \
-        gen-c_glib/t_test_container_test_types.h \
-        gen-c_glib/t_test_debug_proto_test_types.h \
-        gen-c_glib/t_test_empty_service.h \
-        gen-c_glib/t_test_inherited.h \
-        gen-c_glib/t_test_optional_required_test_types.h \
-        gen-c_glib/t_test_reverse_order_service.h \
-        gen-c_glib/t_test_second_service.h \
-        gen-c_glib/t_test_service_for_exception_with_a_map.h \
-        gen-c_glib/t_test_container_service.c \
-        gen-c_glib/t_test_container_service.h \
-        gen-c_glib/t_test_srv.h \
-        gen-c_glib/t_test_thrift_test.h \
-        gen-c_glib/t_test_thrift_test_types.h
-
-AM_CPPFLAGS = -I../src -I./gen-c_glib
-AM_CFLAGS = -g -Wall -Wextra -pedantic $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) \
-	@GCOV_CFLAGS@
-AM_CXXFLAGS = $(AM_CFLAGS)
-AM_LDFLAGS = $(GLIB_LIBS) $(GOBJECT_LIBS) @GCOV_LDFLAGS@
-
-check_PROGRAMS = \
-  testserialization \
-  testapplicationexception \
-  testcontainertest \
-  testtransportsocket \
-  testbinaryprotocol \
-  testcompactprotocol \
-  testbufferedtransport \
-  testframedtransport \
-  testfdtransport \
-  testmemorybuffer \
-  teststruct \
-  testsimpleserver \
-  testdebugproto \
-  testoptionalrequired \
-  testthrifttest
-
-if WITH_CPP
-  BUILT_SOURCES += gen-cpp/ThriftTest_types.cpp
-  check_PROGRAMS += testthrifttestclient
-endif
-
-testserialization_SOURCES = testserialization.c
-testserialization_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    libtestgenc.la
-
-testapplicationexception_SOURCES = testapplicationexception.c
-testapplicationexception_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_application_exception.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_struct.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
-
-testcontainertest_SOURCES = testcontainertest.c
-testcontainertest_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/libthrift_c_glib_la-thrift_struct.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport_factory.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/processor/libthrift_c_glib_la-thrift_processor.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol_factory.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_binary_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_binary_protocol_factory.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/server/libthrift_c_glib_la-thrift_server.o \
-	  libtestgenc.la
-
-testtransportsocket_SOURCES = testtransportsocket.c
-testtransportsocket_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_buffered_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
-
-testbinaryprotocol_SOURCES = testbinaryprotocol.c
-testbinaryprotocol_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_framed_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
-
-testcompactprotocol_SOURCES = testcompactprotocol.c
-testcompactprotocol_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_framed_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
-
-testbufferedtransport_SOURCES = testbufferedtransport.c
-testbufferedtransport_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
-
-testframedtransport_SOURCES = testframedtransport.c
-testframedtransport_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
-
-testfdtransport_SOURCES = testfdtransport.c
-testfdtransport_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_fd_transport.o
-
-testmemorybuffer_SOURCES = testmemorybuffer.c
-testmemorybuffer_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
-
-teststruct_SOURCES = teststruct.c
-teststruct_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o
-
-testsimpleserver_SOURCES = testsimpleserver.c
-testsimpleserver_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport_factory.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/processor/libthrift_c_glib_la-thrift_processor.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol_factory.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_binary_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_binary_protocol_factory.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/server/libthrift_c_glib_la-thrift_server.o
-
-testdebugproto_SOURCES = testdebugproto.c
-testdebugproto_LDADD = libtestgenc.la
-
-testoptionalrequired_SOURCES = testoptionalrequired.c
-testoptionalrequired_LDADD = \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
-    $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
-    libtestgenc.la
-
-testthrifttest_SOURCES = testthrifttest.c
-testthrifttest_LDADD = libtestgenc.la \
-    $(top_builddir)/test/c_glib/src/thrift_test_handler.o
-testthrifttest_CFLAGS = -I$(top_srcdir)/test/c_glib/src -I./gen-c_glib $(GLIB_CFLAGS)
-
-testthrifttestclient_SOURCES = testthrifttestclient.cpp
-testthrifttestclient_CPPFLAGS = -I../../cpp/src $(BOOST_CPPFLAGS) -I./gen-cpp -I../src -I./gen-c_glib $(GLIB_CFLAGS)
-testthrifttestclient_LDADD = ../../cpp/.libs/libthrift.la ../libthrift_c_glib.la libtestgenc.la libtestgencpp.la
-testthrifttestclient_LDFLAGS = -L../.libs -L../../cpp/.libs $(GLIB_LIBS) $(GOBJECT_LIBS)
-
-check_LTLIBRARIES = libtestgenc.la
-
-if WITH_CPP
-  check_LTLIBRARIES += libtestgencpp.la
-endif
-
-nodist_libtestgenc_la_SOURCES = \
-        gen-c_glib/t_test_container_test_types.c \
-        gen-c_glib/t_test_debug_proto_test_types.c \
-        gen-c_glib/t_test_enum_test_types.c \
-        gen-c_glib/t_test_enum_test_service.c \
-        gen-c_glib/t_test_empty_service.c \
-        gen-c_glib/t_test_inherited.c \
-        gen-c_glib/t_test_optional_required_test_types.c \
-        gen-c_glib/t_test_reverse_order_service.c \
-        gen-c_glib/t_test_second_service.c \
-        gen-c_glib/t_test_service_for_exception_with_a_map.c \
-        gen-c_glib/t_test_srv.c \
-        gen-c_glib/t_test_container_service.c \
-        gen-c_glib/t_test_thrift_test.c \
-        gen-c_glib/t_test_thrift_test_types.c \
-        gen-c_glib/t_test_container_test_types.h \
-        gen-c_glib/t_test_debug_proto_test_types.h \
-        gen-c_glib/t_test_enum_test_types.h \
-        gen-c_glib/t_test_enum_test_service.h \
-        gen-c_glib/t_test_empty_service.h \
-        gen-c_glib/t_test_inherited.h \
-        gen-c_glib/t_test_optional_required_test_types.h \
-        gen-c_glib/t_test_reverse_order_service.h \
-        gen-c_glib/t_test_second_service.h \
-        gen-c_glib/t_test_service_for_exception_with_a_map.h \
-        gen-c_glib/t_test_srv.h \
-        gen-c_glib/t_test_container_service.h \
-        gen-c_glib/t_test_thrift_test.h \
-        gen-c_glib/t_test_thrift_test_types.h
-libtestgenc_la_LIBADD = $(top_builddir)/lib/c_glib/libthrift_c_glib.la
-libtestgenc_la_CPPFLAGS = $(AM_CPPFLAGS) -Wno-unused-function
-
-nodist_libtestgencpp_la_SOURCES = \
-        gen-cpp/ThriftTest.cpp \
-        gen-cpp/ThriftTest_constants.cpp \
-        gen-cpp/ThriftTest_types.cpp \
-        gen-cpp/ThriftTest.h \
-        gen-cpp/ThriftTest_constants.h \
-        gen-cpp/ThriftTest_types.h
-libtestgencpp_la_CPPFLAGS = -I../../cpp/src $(BOOST_CPPFLAGS) -I./gen-cpp
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-c_glib/t_test_container_test_types.c gen-c_glib/t_test_container_test_types.h gen-c_glib/t_test_container_service.c gen-c_glib/t_test_container_service.h: ContainerTest.thrift $(THRIFT)
-	$(THRIFT) --gen c_glib $<
-
-gen-c_glib/t_test_debug_proto_test_types.c gen-c_glib/t_test_debug_proto_test_types.h gen-c_glib/t_test_empty_service.c gen-c_glib/t_test_empty_service.h gen-c_glib/t_test_inherited.c gen-c_glib/t_test_inherited.h gen-c_glib/t_test_reverse_order_service.c gen-c_glib/t_test_reverse_order_service.h gen-c_glib/t_test_service_for_exception_with_a_map.c gen-c_glib/t_test_service_for_exception_with_a_map.h gen-c_glib/t_test_srv.c gen-c_glib/t_test_srv.h: ../../../test/DebugProtoTest.thrift $(THRIFT)
-	$(THRIFT) --gen c_glib $<
-
-gen-c_glib/t_test_enum_test_types.c gen-c_glib/t_test_enum_test_types.h gen-c_glib/t_test_enum_test_service.c gen-c_glib/t_test_enum_test_service.h : ../../../test/EnumTest.thrift $(THRIFT)
-	$(THRIFT) --gen c_glib $<
-
-gen-c_glib/t_test_optional_required_test_types.c gen-c_glib/t_test_optional_required_test_types.h: ../../../test/OptionalRequiredTest.thrift $(THRIFT)
-	$(THRIFT) --gen c_glib $<
-
-gen-c_glib/t_test_second_service.c gen-c_glib/t_test_thrift_test.c gen-c_glib/t_test_thrift_test_types.c gen-c_glib/t_test_second_service.h gen-c_glib/t_test_thrift_test.h gen-c_glib/t_test_thrift_test_types.h: ../../../test/ThriftTest.thrift $(THRIFT)
-	$(THRIFT) --gen c_glib $<
-
-gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest_types.cpp: ../../../test/ThriftTest.thrift $(THRIFT)
-	$(THRIFT) --gen cpp $<
-
-TESTS = \
-  $(check_PROGRAMS) \
-  $(check_SCRIPTS)
-
-# globally added to all instances of valgrind calls
-# VALGRIND_OPTS = --suppressions=glib.suppress
-VALGRIND_OPTS =
-
-# globally added to all memcheck calls
-VALGRIND_MEM_OPTS = --tool=memcheck \
-                    --num-callers=10 \
-                    ${myextravalgrindmemopts}
-
-# globally added to all leakcheck calls
-VALGRIND_LEAK_OPTS = --tool=memcheck \
-                     --num-callers=10 \
-                     --leak-check=full \
-                     --leak-resolution=high \
-                     ${myextravalgrindleakopts}
-
-memcheck: $(check_PROGRAMS)
-	@for x in $(check_PROGRAMS);                                     \
-	  do                                                             \
-	    $(MAKE) memcheck-$$x;                                        \
-	  done
-
-leakcheck: $(check_PROGRAMS)
-	@for x in $(check_PROGRAMS);                                     \
-	  do                                                             \
-	    $(MAKE) leakcheck-$$x;                                       \
-	done
-
-memcheck-%: %
-	@echo "*****************************************";               \
-	echo "MEMCHECK: $<";                                             \
-	echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_MEM_OPTS} ${$<_VALGRIND_MEM_OPTS}";                                                                      \
-	$(LIBTOOL) --mode=execute                                        \
-	  valgrind                                                       \
-	    ${VALGRIND_OPTS}                                             \
-	    ${VALGRIND_MEM_OPTS}                                         \
-	    ${$<_VALGRIND_MEM_OPTS} ./$<
-
-leakcheck-%: %
-	@echo "*****************************************";              \
-	echo "LEAKCHECK: $<";                                           \
-	echo "ARGS: ${VALGRIND_OPTS} ${VALGRIND_LEAK_OPTS} ${$<_VALGRIND_LEAK_OPTS}";                                                                   \
-	G_SLICE=always-malloc $(LIBTOOL) --mode=execute                 \
-	  valgrind                                                      \
-	    ${VALGRIND_OPTS}                                            \
-	    ${VALGRIND_LEAK_OPTS}                                       \
-	    ${$<_VALGRIND_LEAK_OPTS}  ./$<
-
-clean-local:
-	$(RM) gen-c_glib/* gen-cpp/*
-
-CLEANFILES =                            \
-    *.bb                                \
-    *.bbg                               \
-    *.da                                \
-    *.gcno                              \
-    *.gcda                              \
-    *.gcov
-
-EXTRA_DIST = \
-             CMakeLists.txt \
-             ContainerTest.thrift
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/glib.suppress b/vendor/git.apache.org/thrift.git/lib/c_glib/test/glib.suppress
deleted file mode 100644
index 0e0e9fe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/glib.suppress
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-   g_type_init_1
-   Memcheck:Leak
-   fun:malloc
-   ...
-   fun:g_type_init_with_debug_flags
-}
-
-{
-   g_type_init_2
-   Memcheck:Leak
-   fun:calloc
-   ...
-   fun:g_type_init_with_debug_flags
-}
-
-{
-   g_type_init_3
-   Memcheck:Leak
-   fun:realloc
-   ...
-   fun:g_type_init_with_debug_flags
-}
-
-{
-   g_type_register_static_1
-   Memcheck:Leak
-   fun:realloc
-   ...
-   fun:g_type_register_static
-}
-
-{
-   g_type_register_statuc_2
-   Memcheck:Leak
-   fun:malloc
-   fun:realloc
-   fun:g_realloc
-   ...
-   fun:g_type_register_static
-}
-
-{
-   type_class_init_Wm1
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:type_class_init_Wm
-   fun:g_type_class_ref
-   ...
-   fun:g_object_newv
-}
-
-{
-   type_class_init_Wm2
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:type_class_init_Wm
-   fun:g_type_class_ref
-   ...
-   fun:type_class_init_Wm
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testapplicationexception.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testapplicationexception.c
deleted file mode 100644
index 89e39e2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testapplicationexception.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <glib.h>
-#include <string.h>
-
-#include <thrift/c_glib/thrift_application_exception.h>
-
-static void
-test_create_and_destroy (void)
-{
-  GObject *object = NULL;
-
-  /* A ThriftApplicationException can be created... */
-  object = g_object_new (THRIFT_TYPE_APPLICATION_EXCEPTION, NULL);
-
-  g_assert (object != NULL);
-  g_assert (THRIFT_IS_APPLICATION_EXCEPTION (object));
-
-  /* ...and destroyed */
-  g_object_unref (object);
-}
-
-static void
-test_initialize (void)
-{
-  ThriftApplicationException *xception = NULL;
-  gint32 type = THRIFT_APPLICATION_EXCEPTION_ERROR_INTERNAL_ERROR;
-  gchar *message = "Exception message";
-  gint32 retrieved_type = 0;
-  gchar *retrieved_message = NULL;
-
-  /* A ThriftApplicationException has "type" and "message" properties that can
-     be initialized at object creation */
-  xception =
-    g_object_new (THRIFT_TYPE_APPLICATION_EXCEPTION,
-                  "type",    type,
-                  "message", message,
-                  NULL);
-
-  g_assert (xception != NULL);
-
-  /* A ThriftApplicationException's properties can be retrieved */
-  g_object_get (xception,
-                "type",    &retrieved_type,
-                "message", &retrieved_message,
-                NULL);
-
-  g_assert (retrieved_type == type);
-  g_assert (retrieved_message != NULL);
-  g_assert_cmpstr (retrieved_message, ==, message);
-
-  g_free (retrieved_message);
-  g_object_unref (xception);
-}
-
-static void
-test_properties_test (void)
-{
-  ThriftApplicationException *xception = NULL;
-  gint32 retrieved_type;
-
-  xception = g_object_new (THRIFT_TYPE_APPLICATION_EXCEPTION, NULL);
-
-#define TEST_TYPE_VALUE(_type)                                  \
-  retrieved_type = -1;                                          \
-  g_object_set (xception, "type", _type, NULL);                 \
-  g_object_get (xception, "type", &retrieved_type, NULL);       \
-  g_assert_cmpint (retrieved_type, ==, _type);
-
-  /* The "type" property can be set to any valid Thrift exception type */
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN_METHOD);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_INVALID_MESSAGE_TYPE);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_WRONG_METHOD_NAME);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_BAD_SEQUENCE_ID);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_MISSING_RESULT);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_INTERNAL_ERROR);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_PROTOCOL_ERROR);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_INVALID_TRANSFORM);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_INVALID_PROTOCOL);
-  TEST_TYPE_VALUE (THRIFT_APPLICATION_EXCEPTION_ERROR_UNSUPPORTED_CLIENT_TYPE);
-
-/* "g_test_expect_message" is required for the property range tests below but is
-   not present in GLib before version 2.34 */
-#if (GLIB_CHECK_VERSION (2, 34, 0))
-  g_object_set (xception,
-                "type", THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN,
-                NULL);
-
-  /* The "type" property cannot be set to a value too low (less than zero) */
-  g_test_expect_message ("GLib-GObject",
-                         G_LOG_LEVEL_WARNING,
-                         "value*out of range*type*");
-  g_object_set (xception, "type", -1, NULL);
-  g_test_assert_expected_messages ();
-
-  g_object_get (xception, "type", &retrieved_type, NULL);
-  g_assert_cmpint (retrieved_type, !=, -1);
-  g_assert_cmpint (retrieved_type,
-                   ==,
-                   THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN);
-
-  /* The "type" property cannot be set to a value too high (greater than the
-     highest defined exception-type value) */
-  g_test_expect_message ("GLib-GObject",
-                         G_LOG_LEVEL_WARNING,
-                         "value*out of range*type*");
-  g_object_set (xception, "type", THRIFT_APPLICATION_EXCEPTION_ERROR_N, NULL);
-  g_test_assert_expected_messages ();
-
-  g_object_get (xception, "type", &retrieved_type, NULL);
-  g_assert_cmpint (retrieved_type, !=, THRIFT_APPLICATION_EXCEPTION_ERROR_N);
-  g_assert_cmpint (retrieved_type,
-                   ==,
-                   THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN);
-#endif
-
-  g_object_unref (xception);
-}
-
-static void
-test_properties_message (void)
-{
-  ThriftApplicationException *xception = NULL;
-  gchar *message = "Exception message";
-  gchar *retrieved_message;
-
-  xception = g_object_new (THRIFT_TYPE_APPLICATION_EXCEPTION, NULL);
-
-  /* The "message" property can be set to NULL */
-  g_object_set (xception, "message", NULL, NULL);
-  g_object_get (xception, "message", &retrieved_message, NULL);
-  g_assert (retrieved_message == NULL);
-
-  /* The "message" property can be set to a valid string */
-  g_object_set (xception, "message", message, NULL);
-  g_object_get (xception, "message", &retrieved_message, NULL);
-  g_assert_cmpint (strcmp (retrieved_message, message), ==, 0);
-
-  g_free (retrieved_message);
-  g_object_unref (xception);
-}
-
-int
-main (int argc, char **argv)
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testapplicationexception/CreateAndDestroy",
-    test_create_and_destroy);
-  g_test_add_func ("/testapplicationexception/Initialize",
-    test_initialize);
-  g_test_add_func ("/testapplicationexception/Properties/test",
-    test_properties_test);
-  g_test_add_func ("/testapplicationexception/Properties/message",
-    test_properties_message);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testbinaryprotocol.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testbinaryprotocol.c
deleted file mode 100755
index 7ca5150..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testbinaryprotocol.c
+++ /dev/null
@@ -1,838 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* Disable string-function optimizations when glibc is used, as these produce
-   compiler warnings about string length when a string function is used inside
-   a call to assert () */
-#ifdef __GLIBC__
-#include <features.h>
-#define __NO_STRING_INLINES 1
-#endif
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <netdb.h>
-#include <string.h>
-#include <sys/wait.h>
-
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-#include <thrift/c_glib/transport/thrift_framed_transport.h>
-
-#define TEST_BOOL TRUE
-#define TEST_BYTE 123
-#define TEST_I16 12345
-#define TEST_I32 1234567890
-#define TEST_I64 G_GINT64_CONSTANT (123456789012345)
-#define TEST_DOUBLE 1234567890.123
-#define TEST_STRING "this is a test string 1234567890!@#$%^&*()"
-#define TEST_PORT 51199
-
-static int transport_read_count = 0;
-static int transport_read_error = 0;
-static int transport_read_error_at = -1;
-gint32
-my_thrift_transport_read_all (ThriftTransport *transport, gpointer buf,
-                              guint32 len, GError **error)
-{
-  if (transport_read_count != transport_read_error_at
-      && transport_read_error == 0)
-  {
-    transport_read_count++;
-    return thrift_transport_read_all (transport, buf, len, error);
-  }
-  return -1;
-}
-
-static int transport_write_count = 0;
-static int transport_write_error = 0;
-static int transport_write_error_at = -1;
-gboolean
-my_thrift_transport_write (ThriftTransport *transport, const gpointer buf,
-                           const guint32 len, GError **error)
-{
-  if (transport_write_count != transport_write_error_at
-      && transport_write_error == 0)
-  {
-    transport_write_count++;
-    return thrift_transport_write (transport, buf, len, error);
-  }
-  return FALSE;
-}
-
-#define thrift_transport_read_all my_thrift_transport_read_all
-#define thrift_transport_write my_thrift_transport_write
-#include "../src/thrift/c_glib/protocol/thrift_binary_protocol.c"
-#undef thrift_transport_read_all
-#undef thrift_transport_write
-
-static void thrift_server_primitives (const int port);
-static void thrift_server_complex_types (const int port);
-static void thrift_server_many_frames (const int port);
-
-static void
-test_create_and_destroy(void)
-{
-  GObject *object = NULL;
-
-  /* create an object and then destroy it */
-  object = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, NULL);
-  assert (object != NULL);
-  g_object_unref (object);
-}
-
-static void
-test_initialize(void)
-{
-  ThriftSocket *tsocket = NULL;
-  ThriftBinaryProtocol *protocol = NULL;
-  ThriftSocket *temp = NULL;
-
-  /* create a ThriftTransport */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                          "port", 51188, NULL);
-  assert (tsocket != NULL);
-  /* create a ThriftBinaryProtocol using the Transport */
-  protocol = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
-                           tsocket, NULL);
-  assert (protocol != NULL);
-  /* fetch the properties */
-  g_object_get (G_OBJECT(protocol), "transport", &temp, NULL);
-  g_object_unref (temp);
-
-  /* clean up memory */
-  g_object_unref (protocol);
-  g_object_unref (tsocket);
-}
-
-static void
-test_read_and_write_primitives(void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  ThriftBinaryProtocol *tb = NULL;
-  ThriftProtocol *protocol = NULL;
-  gpointer binary = (gpointer *) TEST_STRING;
-  guint32 len = strlen (TEST_STRING);
-  int port = TEST_PORT;
-
-  /* fork a server from the client */
-  pid = fork ();
-  assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    /* child listens */
-    thrift_server_primitives (port);
-    exit (0);
-  } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
-
-    /* create a ThriftSocket */
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    transport = THRIFT_TRANSPORT (tsocket);
-    thrift_transport_open (transport, NULL);
-    assert (thrift_transport_is_open (transport));
-
-    /* create a ThriftBinaryTransport */
-    tb = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
-                       tsocket, NULL);
-    protocol = THRIFT_PROTOCOL (tb);
-    assert (protocol != NULL);
-
-    /* write a bunch of primitives */
-    assert (thrift_binary_protocol_write_bool (protocol, TEST_BOOL, NULL) > 0);
-    assert (thrift_binary_protocol_write_byte (protocol, TEST_BYTE, NULL) > 0);
-    assert (thrift_binary_protocol_write_i16 (protocol, TEST_I16, NULL) > 0);
-    assert (thrift_binary_protocol_write_i32 (protocol, TEST_I32, NULL) > 0);
-    assert (thrift_binary_protocol_write_i64 (protocol, TEST_I64, NULL) > 0);
-    assert (thrift_binary_protocol_write_double (protocol, 
-                                                 TEST_DOUBLE, NULL) > 0);
-    assert (thrift_binary_protocol_write_string (protocol,
-                                                 TEST_STRING, NULL) > 0);
-    assert (thrift_binary_protocol_write_binary (protocol, binary, 
-                                                 len, NULL) > 0);
-    assert (thrift_binary_protocol_write_binary (protocol, NULL, 0, NULL) > 0);
-    assert (thrift_binary_protocol_write_binary (protocol, binary,
-                                                 len, NULL) > 0);
-
-    /* test write errors */
-    transport_write_error = 1;
-    assert (thrift_binary_protocol_write_byte (protocol, TEST_BYTE, 
-                                               NULL) == -1);
-    assert (thrift_binary_protocol_write_i16 (protocol, TEST_I16, NULL) == -1);
-    assert (thrift_binary_protocol_write_i32 (protocol, TEST_I32, NULL) == -1);
-    assert (thrift_binary_protocol_write_i64 (protocol, TEST_I64, NULL) == -1);
-    assert (thrift_binary_protocol_write_double (protocol, TEST_DOUBLE,
-                                                 NULL) == -1);
-    assert (thrift_binary_protocol_write_binary (protocol, binary, len,
-                                                 NULL) == -1);
-    transport_write_error = 0;
-
-    /* test binary partial failure */
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_binary_protocol_write_binary (protocol, binary,
-                                                 len, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* clean up */
-    thrift_transport_close (transport, NULL);
-    g_object_unref (tsocket);
-    g_object_unref (protocol);
-    assert (wait (&status) == pid);
-    assert (status == 0);
-  }
-}
-
-static void
-test_read_and_write_complex_types (void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  ThriftBinaryProtocol *tb = NULL;
-  ThriftProtocol *protocol = NULL;
-  int port = TEST_PORT;
-
-  /* fork a server from the client */
-  pid = fork ();
-  assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    /* child listens */
-    thrift_server_complex_types (port);
-    exit (0);
-  } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
-
-    /* create a ThriftSocket */
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    transport = THRIFT_TRANSPORT (tsocket);
-    thrift_transport_open (transport, NULL);
-    assert (thrift_transport_is_open (transport));
-
-    /* create a ThriftBinaryTransport */
-    tb = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
-                       tsocket, NULL);
-    protocol = THRIFT_PROTOCOL (tb);
-    assert (protocol != NULL);
-
-    /* test structures */
-    assert (thrift_binary_protocol_write_struct_begin (protocol, 
-                                                       NULL, NULL) == 0);
-    assert (thrift_binary_protocol_write_struct_end (protocol, NULL) == 0);
-
-    assert (thrift_binary_protocol_write_field_begin (protocol, "test", T_VOID,
-                                                      1, NULL) > 0);
-    assert (thrift_binary_protocol_write_field_end (protocol, NULL) == 0);
-
-    /* test write error */
-    transport_write_error = 1;
-    assert (thrift_binary_protocol_write_field_begin (protocol, "test", T_VOID, 
-                                                      1, NULL) == -1);
-    transport_write_error = 0;
-
-    /* test 2nd write error */
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_binary_protocol_write_field_begin (protocol, "test", T_VOID,
-                                                      1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* test 2nd read failure on a field */
-    thrift_binary_protocol_write_byte (protocol, T_VOID, NULL);
-
-    /* test write_field_stop */
-    assert (thrift_binary_protocol_write_field_stop (protocol, NULL) > 0);
-
-    /* write a map */
-    assert (thrift_binary_protocol_write_map_begin (protocol, T_VOID, T_VOID,
-                                                    1, NULL) > 0);
-    assert (thrift_binary_protocol_write_map_end (protocol, NULL) == 0);
-
-    /* test 2nd read failure on a map */
-    thrift_binary_protocol_write_byte (protocol, T_VOID, NULL);
-
-    /* test 3rd read failure on a map */
-    thrift_binary_protocol_write_byte (protocol, T_VOID, NULL);
-    thrift_binary_protocol_write_byte (protocol, T_VOID, NULL);
-
-    /* test 1st write failure on a map */
-    transport_write_error = 1;
-    assert (thrift_binary_protocol_write_map_begin (protocol, T_VOID, T_VOID,
-                                                    1, NULL) == -1);
-    transport_write_error = 0;
-
-    /* test 2nd write failure on a map */
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_binary_protocol_write_map_begin (protocol, T_VOID, T_VOID,
-                                                    1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* test 3rd write failure on a map */
-    transport_write_count = 0;
-    transport_write_error_at = 2;
-    assert (thrift_binary_protocol_write_map_begin (protocol, T_VOID, T_VOID,
-                                                    1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* test negative map size */
-    thrift_binary_protocol_write_byte (protocol, T_VOID, NULL);
-    thrift_binary_protocol_write_byte (protocol, T_VOID, NULL);
-    thrift_binary_protocol_write_i32 (protocol, -10, NULL);
-
-    /* test list operations */
-    assert (thrift_binary_protocol_write_list_begin (protocol, T_VOID,
-                                                     1, NULL) > 0);
-    assert (thrift_binary_protocol_write_list_end (protocol, NULL) == 0);
-
-    /* test 2nd read failure on a list */
-    thrift_binary_protocol_write_byte (protocol, T_VOID, NULL);
-
-    /* test negative list size */
-    thrift_binary_protocol_write_byte (protocol, T_VOID, NULL);
-    thrift_binary_protocol_write_i32 (protocol, -10, NULL);
-
-    /* test first write error on a list */
-    transport_write_error = 1;
-    assert (thrift_binary_protocol_write_list_begin (protocol, T_VOID,
-                                                     1, NULL) == -1);
-    transport_write_error = 0;
-
-    /* test 2nd write error on a list */
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_binary_protocol_write_list_begin (protocol, T_VOID,
-                                                     1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* test set operation s*/
-    assert (thrift_binary_protocol_write_set_begin (protocol, T_VOID,
-                                                    1, NULL) > 0);
-    assert (thrift_binary_protocol_write_set_end (protocol, NULL) == 0);
-
-    /* invalid version */
-    assert (thrift_binary_protocol_write_i32 (protocol, -1, NULL) > 0);
-
-    /* sz > 0 for a message */
-    assert (thrift_binary_protocol_write_i32 (protocol, 1, NULL) > 0);
-
-    /* send a valid message */
-    thrift_binary_protocol_write_i32 (protocol, 0x80010000, NULL);
-    thrift_binary_protocol_write_string (protocol, "test", NULL);
-    thrift_binary_protocol_write_i32 (protocol, 1, NULL);
-
-    /* broken 2nd read */
-    thrift_binary_protocol_write_i32 (protocol, 0x80010000, NULL);
-
-    /* send a broken 3rd read */
-    thrift_binary_protocol_write_i32 (protocol, 0x80010000, NULL);
-    thrift_binary_protocol_write_string (protocol, "test", NULL);
-
-    /* send a valid message */
-    assert (thrift_binary_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) > 0);
-
-    assert (thrift_binary_protocol_write_message_end (protocol, NULL) == 0);
-
-    /* send broken writes */
-    transport_write_error = 1;
-    assert (thrift_binary_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) == -1);
-    transport_write_error = 0;
-
-    transport_write_count = 0;
-    transport_write_error_at = 2;
-    assert (thrift_binary_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    transport_write_count = 0;
-    transport_write_error_at = 3;
-    assert (thrift_binary_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* clean up */
-    thrift_transport_close (transport, NULL);
-    g_object_unref (tsocket);
-    g_object_unref (protocol);
-    assert (wait (&status) == pid);
-    assert (status == 0);
-  }
-}
-
-static void
-test_read_and_write_many_frames (void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  ThriftFramedTransport *ft = NULL;
-  ThriftBinaryProtocol *tb = NULL;
-  ThriftProtocol *protocol = NULL;
-  gpointer binary = (gpointer *) TEST_STRING;
-  const guint32 len = strlen (TEST_STRING);
-  int port = TEST_PORT;
-
-  /* fork a server from the client */
-  pid = fork ();
-  assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    /* child listens */
-    thrift_server_many_frames (port);
-    exit (0);
-  } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
-
-    /* create a ThriftSocket */
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    assert (tsocket != NULL);
-    transport = THRIFT_TRANSPORT (tsocket);
-
-    /* wrap in a framed transport */
-    ft = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport", transport,
-                       "w_buf_size", 1, NULL);
-    assert (ft != NULL);
-    transport = THRIFT_TRANSPORT (ft);
-
-    thrift_transport_open (transport, NULL);
-    assert (thrift_transport_is_open (transport));
-
-    /* create a binary protocol */
-    tb = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
-                       transport, NULL);
-    protocol = THRIFT_PROTOCOL (tb);
-    assert (protocol != NULL);
-
-    /* write a bunch of primitives */
-    assert (thrift_binary_protocol_write_bool (protocol, TEST_BOOL, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_byte (protocol, TEST_BYTE, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_i16 (protocol, TEST_I16, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_i32 (protocol, TEST_I32, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_i64 (protocol, TEST_I64, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_double (protocol,
-                                                 TEST_DOUBLE, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_string (protocol,
-                                                 TEST_STRING, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_binary (protocol, binary,
-                                                 len, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_binary (protocol, NULL, 0, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_binary_protocol_write_binary (protocol, binary,
-                                                 len, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-
-    /* clean up */
-    thrift_transport_write_end (transport, NULL);
-    thrift_transport_close (transport, NULL);
-    g_object_unref (ft);
-    g_object_unref (tsocket);
-    g_object_unref (tb);
-    assert (wait (&status) == pid);
-    assert (status == 0);
-  }
-}
-
-
-static void
-thrift_server_primitives (const int port)
-{
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  ThriftBinaryProtocol *tbp = NULL;
-  ThriftProtocol *protocol = NULL;
-  gboolean value_boolean = FALSE;
-  gint8 value_byte = 0;
-  gint16 value_16 = 0;
-  gint32 value_32 = 0;
-  gint64 value_64 = 0;
-  gdouble value_double = 0;
-  gchar *string = NULL;
-  gpointer binary = NULL;
-  guint32 len = 0;
-  void *comparator = (void *) TEST_STRING;
-
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-  client = thrift_server_transport_accept (transport, NULL);
-  assert (client != NULL);
-
-  tbp = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
-                      client, NULL);
-  protocol = THRIFT_PROTOCOL (tbp);
-
-  assert (thrift_binary_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) > 0);
-  assert (thrift_binary_protocol_read_byte (protocol, &value_byte, NULL) > 0);
-  assert (thrift_binary_protocol_read_i16 (protocol, &value_16, NULL) > 0);
-  assert (thrift_binary_protocol_read_i32 (protocol, &value_32, NULL) > 0);
-  assert (thrift_binary_protocol_read_i64 (protocol, &value_64, NULL) > 0);
-  assert (thrift_binary_protocol_read_double (protocol,
-                                              &value_double, NULL) > 0);
-  assert (thrift_binary_protocol_read_string (protocol, &string, NULL) > 0);
-  assert (thrift_binary_protocol_read_binary (protocol, &binary,
-                                              &len, NULL) > 0);
-
-  assert (value_boolean == TEST_BOOL);
-  assert (value_byte == TEST_BYTE);
-  assert (value_16 == TEST_I16);
-  assert (value_32 == TEST_I32);
-  assert (value_64 == TEST_I64);
-  assert (value_double == TEST_DOUBLE);
-  assert (strcmp (TEST_STRING, string) == 0);
-  assert (memcmp (comparator, binary, len) == 0);
-
-  g_free (string);
-  g_free (binary);
-
-  thrift_binary_protocol_read_binary (protocol, &binary, &len, NULL);
-  g_free (binary);
-
-  transport_read_count = 0;
-  transport_read_error_at = 0;
-  assert (thrift_binary_protocol_read_binary (protocol, &binary,
-                                              &len, NULL) == -1);
-  transport_read_error_at = -1;
-
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  assert (thrift_binary_protocol_read_binary (protocol, &binary,
-                                              &len, NULL) == -1);
-  transport_read_error_at = -1;
-
-  transport_read_error = 1;
-  assert (thrift_binary_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) == -1);
-  assert (thrift_binary_protocol_read_byte (protocol,
-                                            &value_byte, NULL) == -1);
-  assert (thrift_binary_protocol_read_i16 (protocol,
-                                           &value_16, NULL) == -1);
-  assert (thrift_binary_protocol_read_i32 (protocol, &value_32, NULL) == -1);
-  assert (thrift_binary_protocol_read_i64 (protocol, &value_64, NULL) == -1);
-  assert (thrift_binary_protocol_read_double (protocol,
-                                              &value_double, NULL) == -1);
-  transport_read_error = 0;
-
-  /* test partial write failure */
-  thrift_protocol_read_i32 (protocol, &value_32, NULL);
-
-  thrift_transport_read_end (client, NULL);
-  thrift_transport_close (client, NULL);
-
-  g_object_unref (tbp);
-  g_object_unref (client);
-  g_object_unref (tsocket);
-}
-
-static void
-thrift_server_complex_types (const int port)
-{
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  ThriftBinaryProtocol *tbp = NULL;
-  ThriftProtocol *protocol = NULL;
-  gchar *struct_name = NULL;
-  gchar *field_name = NULL;
-  gchar *message_name = NULL;
-  ThriftType element_type, key_type, value_type, field_type;
-  ThriftMessageType message_type;
-  gint8 value = 0;
-  gint16 field_id = 0;
-  guint32 size = 0;
-  gint32 seqid = 0;
-  gint32 version = 0;
-
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-  client = thrift_server_transport_accept (transport, NULL);
-  assert (client != NULL);
-
-  tbp = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
-                      client, NULL);
-  protocol = THRIFT_PROTOCOL (tbp);
-
-  thrift_binary_protocol_read_struct_begin (protocol, &struct_name, NULL);
-  thrift_binary_protocol_read_struct_end (protocol, NULL);
-
-  thrift_binary_protocol_read_field_begin (protocol, &field_name, &field_type,
-                                           &field_id, NULL);
-  thrift_binary_protocol_read_field_end (protocol, NULL);
-
-  /* test first read error on a field */
-  transport_read_error = 1;
-  assert (thrift_binary_protocol_read_field_begin (protocol,
-                                                   &field_name, &field_type,
-                                                   &field_id, NULL) == -1);
-  transport_read_error = 0;
-
-  /* test 2nd write failure */
-  thrift_binary_protocol_read_byte (protocol, &value, NULL);
-
-  /* test 2nd read failure on a field */
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  assert (thrift_binary_protocol_read_field_begin (protocol,
-                                                   &field_name, &field_type,
-                                                   &field_id, NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* test field stop */
-  thrift_binary_protocol_read_field_begin (protocol, &field_name, &field_type,
-                                           &field_id, NULL);
-
-  thrift_binary_protocol_read_map_begin (protocol, &key_type, &value_type,
-                                         &size, NULL);
-  thrift_binary_protocol_read_map_end (protocol, NULL);
-
-  /* test read failure on a map */
-  transport_read_count = 0;
-  transport_read_error_at = 0;
-  assert (thrift_binary_protocol_read_map_begin (protocol,
-                                                 &key_type, &value_type,
-                                                 &size, NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* test 2nd read failure on a map */
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  assert (thrift_binary_protocol_read_map_begin (protocol,
-                                                 &key_type, &value_type,
-                                                 &size, NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* test 3rd read failure on a map */
-  transport_read_count = 0;
-  transport_read_error_at = 2;
-  assert (thrift_binary_protocol_read_map_begin (protocol,
-                                                 &key_type, &value_type,
-                                                 &size, NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* test 2nd write failure */
-  thrift_binary_protocol_read_byte (protocol, &value, NULL);
-
-  /* test 3rd write failure */
-  thrift_binary_protocol_read_byte (protocol, &value, NULL);
-  thrift_binary_protocol_read_byte (protocol, &value, NULL);
-
-  /* test negative map size */
-  assert (thrift_binary_protocol_read_map_begin (protocol,
-                                                 &key_type, &value_type,
-                                                 &size, NULL) == -1);
-
-  /* test list operations */
-  thrift_binary_protocol_read_list_begin (protocol, &element_type, &size, NULL);
-  thrift_binary_protocol_read_list_end (protocol, NULL);
-
-  /* test read failure */
-  transport_read_error = 1;
-  assert (thrift_binary_protocol_read_list_begin (protocol, &element_type,
-                                                  &size, NULL) == -1);
-  transport_read_error = 0;
-
-  /* test 2nd read failure */
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  thrift_binary_protocol_read_list_begin (protocol, &element_type, &size, NULL);
-  transport_read_error_at = -1;
-
-  /* test negative list size failure */
-  thrift_binary_protocol_read_list_begin (protocol, &element_type, &size, NULL);
-
-  /* test 2nd write failure */
-  thrift_binary_protocol_read_byte (protocol, &value, NULL);
-
-  /* test set operations */
-  thrift_binary_protocol_read_set_begin (protocol, &element_type, &size, NULL);
-  thrift_binary_protocol_read_set_end (protocol, NULL);
-
-  /* broken read */
-  transport_read_error = 1;
-  assert (thrift_binary_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-  transport_read_error = 0;
-
-  /* invalid protocol version */
-  assert (thrift_binary_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-
-  /* sz > 0 */
-  assert (thrift_binary_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) > 0);
-
-  /* read a valid message */
-  assert (thrift_binary_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) > 0);
-  g_free (message_name);
-
-  /* broken 2nd read on a message */
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  assert (thrift_binary_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* broken 3rd read on a message */
-  transport_read_count = 0;
-  transport_read_error_at = 3; /* read_string does two reads */
-  assert (thrift_binary_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-  g_free (message_name);
-  transport_read_error_at = -1;
-
-  /* read a valid message */
-  assert (thrift_binary_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid, 
-                                                     NULL) > 0);
-  g_free (message_name);
-
-  assert (thrift_binary_protocol_read_message_end (protocol, NULL) == 0);
-
-  /* handle 2nd write failure on a message */
-  thrift_binary_protocol_read_i32 (protocol, &version, NULL);
-
-  /* handle 2nd write failure on a message */
-  thrift_binary_protocol_read_i32 (protocol, &version, NULL);
-  thrift_binary_protocol_read_string (protocol, &message_name, NULL);
-
-  g_object_unref (client);
-  /* TODO: investigate g_object_unref (tbp); */
-  g_object_unref (tsocket);
-}
-
-static void
-thrift_server_many_frames (const int port)
-{
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  ThriftBinaryProtocol *tbp = NULL;
-  ThriftProtocol *protocol = NULL;
-  ThriftServerSocket *tsocket = NULL;
-  gboolean value_boolean = FALSE;
-  gint8 value_byte = 0;
-  gint16 value_16 = 0;
-  gint32 value_32 = 0;
-  gint64 value_64 = 0;
-  gdouble value_double = 0;
-  gchar *string = NULL;
-  gpointer binary = NULL;
-  guint32 len = 0;
-  void *comparator = (void *) TEST_STRING;
-
-  tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET, "port", port, NULL);
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-
-  /* wrap the client in a framed transport */
-  client = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport",
-                         thrift_server_transport_accept (transport, NULL),
-                         "r_buf_size", 1, NULL);
-  assert (client != NULL);
-
-  tbp = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
-                      client, NULL);
-  protocol = THRIFT_PROTOCOL (tbp);
-
-  assert (thrift_binary_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) > 0);
-  assert (thrift_binary_protocol_read_byte (protocol, &value_byte, NULL) > 0);
-  assert (thrift_binary_protocol_read_i16 (protocol, &value_16, NULL) > 0);
-  assert (thrift_binary_protocol_read_i32 (protocol, &value_32, NULL) > 0);
-  assert (thrift_binary_protocol_read_i64 (protocol, &value_64, NULL) > 0);
-  assert (thrift_binary_protocol_read_double (protocol,
-                                              &value_double, NULL) > 0);
-  assert (thrift_binary_protocol_read_string (protocol, &string, NULL) > 0);
-  assert (thrift_binary_protocol_read_binary (protocol, &binary,
-                                              &len, NULL) > 0);
-
-  assert (value_boolean == TEST_BOOL);
-  assert (value_byte == TEST_BYTE);
-  assert (value_16 == TEST_I16);
-  assert (value_32 == TEST_I32);
-  assert (value_64 == TEST_I64);
-  assert (value_double == TEST_DOUBLE);
-  assert (strcmp (TEST_STRING, string) == 0);
-  assert (memcmp (comparator, binary, len) == 0);
-
-  g_free (string);
-  g_free (binary);
-
-  thrift_transport_read_end (client, NULL);
-  thrift_transport_close (client, NULL);
-
-  g_object_unref (tbp);
-  g_object_unref (client);
-  g_object_unref (tsocket);
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testbinaryprotocol/CreateAndDestroy", test_create_and_destroy);
-  g_test_add_func ("/testbinaryprotocol/Initialize", test_initialize);
-  g_test_add_func ("/testbinaryprotocol/ReadAndWritePrimitives", test_read_and_write_primitives);
-  g_test_add_func ("/testbinaryprotocol/ReadAndWriteComplexTypes", test_read_and_write_complex_types);
-  g_test_add_func ("/testbinaryprotocol/ReadAndWriteManyFrames",
-                   test_read_and_write_many_frames);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testbufferedtransport.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testbufferedtransport.c
deleted file mode 100755
index 3203a66..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testbufferedtransport.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <netdb.h>
-#include <signal.h>
-#include <sys/wait.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-
-#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
-
-#include "../src/thrift/c_glib/transport/thrift_buffered_transport.c"
-
-static void thrift_server (const int port);
-
-/* test object creation and destruction */
-static void
-test_create_and_destroy(void)
-{
-  ThriftTransport *transport = NULL;
-  guint r_buf_size = 0;
-  guint w_buf_size = 0;
-
-  GObject *object = NULL;
-  object = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT, NULL);
-  assert (object != NULL);
-  g_object_get (G_OBJECT (object), "transport", &transport,
-                "r_buf_size", &r_buf_size,
-                "w_buf_size", &w_buf_size, NULL);
-  g_object_unref (object);
-}
-
-static void
-test_open_and_close(void)
-{
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  GError *err = NULL;
-
-  /* create a ThriftSocket */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                          "port", 51188, NULL); 
-
-  /* create a BufferedTransport wrapper of the Socket */
-  transport = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT,
-                            "transport", THRIFT_TRANSPORT (tsocket), NULL);
-
-  /* this shouldn't work */
-  assert (thrift_buffered_transport_open (transport, NULL) == FALSE);
-  assert (thrift_buffered_transport_is_open (transport) == TRUE);
-  assert (thrift_buffered_transport_close (transport, NULL) == TRUE);
-  g_object_unref (transport);
-  g_object_unref (tsocket);
-
-  /* try and underlying socket failure */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost.broken",
-                          NULL);
-
-  /* create a BufferedTransport wrapper of the Socket */
-  transport = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT,
-                            "transport", THRIFT_TRANSPORT (tsocket), NULL);
-
-  assert (thrift_buffered_transport_open (transport, &err) == FALSE);
-  g_object_unref (transport);
-  g_object_unref (tsocket);
-  g_error_free (err);
-  err = NULL;
-}
-
-static void
-test_read_and_write(void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  int port = 51199;
-  guchar buf[10] = TEST_DATA; /* a buffer */
-
-  pid = fork ();
-  assert ( pid >= 0 );
-
-  if ( pid == 0 )
-  {
-    /* child listens */
-    thrift_server (port);
-    exit (0);
-  } else {
-    /* parent connects, wait a bit for the socket to be created */
-    sleep (1);
-
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    transport = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT,
-                              "transport", THRIFT_TRANSPORT (tsocket),
-                              "w_buf_size", 4, NULL);
-
-    assert (thrift_buffered_transport_open (transport, NULL) == TRUE);
-    assert (thrift_buffered_transport_is_open (transport));
-
-    /* write 10 bytes */
-    thrift_buffered_transport_write (transport, buf, 10, NULL);
-
-    /* write 1 byte at a time */
-    thrift_buffered_transport_write (transport, buf, 1, NULL);
-    thrift_buffered_transport_write (transport, buf, 1, NULL);
-    thrift_buffered_transport_write (transport, buf, 1, NULL);
-
-    /* overflow the buffer */
-    thrift_buffered_transport_write (transport, buf, 2, NULL);
-    thrift_buffered_transport_write (transport, buf, 1, NULL);
-    thrift_buffered_transport_flush (transport, NULL);
-
-    /* write 1 byte and flush */
-    thrift_buffered_transport_write (transport, buf, 1, NULL);
-    thrift_buffered_transport_flush (transport, NULL);
-
-    /* write and overflow buffer with 2 system calls */
-    thrift_buffered_transport_write (transport, buf, 1, NULL);
-    thrift_buffered_transport_write (transport, buf, 3, NULL);
-
-    /* write 10 bytes */
-    thrift_buffered_transport_write (transport, buf, 10, NULL);
-
-    thrift_buffered_transport_write_end (transport, NULL);
-    thrift_buffered_transport_flush (transport, NULL);
-    thrift_buffered_transport_close (transport, NULL);
-
-    g_object_unref (transport);
-    g_object_unref (tsocket);
-
-    assert ( wait (&status) == pid );
-    assert ( status == 0 );
-  }
-}
-
-static void
-thrift_server (const int port)
-{
-  int bytes = 0;
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  guchar buf[10]; /* a buffer */
-  guchar match[10] = TEST_DATA;
-
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
-
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-
-  /* wrap the client in a BufferedTransport */
-  client = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT, "transport",
-                         thrift_server_transport_accept (transport, NULL),
-                         "r_buf_size", 5, NULL);
-  assert (client != NULL);
-
-  /* read 10 bytes */
-  bytes = thrift_buffered_transport_read (client, buf, 10, NULL);
-  assert (bytes == 10); /* make sure we've read 10 bytes */
-  assert ( memcmp (buf, match, 10) == 0 ); /* make sure what we got matches */
-
-  /* read 1 byte */
-  bytes = thrift_buffered_transport_read (client, buf, 1, NULL);
-
-  bytes = thrift_buffered_transport_read (client, buf, 6, NULL);
-  bytes = thrift_buffered_transport_read (client, buf, 2, NULL);
-  bytes = thrift_buffered_transport_read (client, buf, 1, NULL);
-
-  thrift_buffered_transport_read_end (client, NULL);
-  thrift_buffered_transport_close (client, NULL);
-  g_object_unref (client);
-  g_object_unref (tsocket);
-}
-
-static void
-test_write_fail(void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  int port = 51198;
-  guchar buf[10] = TEST_DATA; /* a buffer */
-
-  /* SIGPIPE when send to disconnected socket */
-  signal(SIGPIPE, SIG_IGN);
-
-  pid = fork ();
-  assert ( pid >= 0 );
-
-  if ( pid == 0 )
-  {
-    /* child listens */
-    ThriftServerTransport *transport = NULL;
-    ThriftTransport *client = NULL;
-
-    ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-        "port", port, NULL);
-
-    transport = THRIFT_SERVER_TRANSPORT (tsocket);
-    thrift_server_transport_listen (transport, NULL);
-
-    /* wrap the client in a BufferedTransport */
-    client = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT, "transport",
-        thrift_server_transport_accept (transport, NULL),
-        "r_buf_size", 5, NULL);
-    assert (client != NULL);
-
-    /* just close socket */
-    thrift_buffered_transport_close (client, NULL);
-    g_object_unref (client);
-    g_object_unref (tsocket);
-    exit (0);
-  } else {
-    /* parent connects, wait a bit for the socket to be created */
-    sleep (1);
-
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    transport = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT,
-                              "transport", THRIFT_TRANSPORT (tsocket),
-                              "w_buf_size", 4, NULL);
-
-
-    assert (thrift_buffered_transport_open (transport, NULL) == TRUE);
-    assert (thrift_buffered_transport_is_open (transport));
-
-    /* recognize disconnection */
-    sleep(1);
-    assert (thrift_buffered_transport_write (transport, buf, 10, NULL) == TRUE);
-    assert (thrift_buffered_transport_write (transport, buf, 10, NULL) == FALSE);
-
-    /* write and overflow buffer */
-    assert (thrift_buffered_transport_write (transport, buf, 10, NULL) == FALSE);
-
-    /* write 1 and flush */
-    assert (thrift_buffered_transport_write (transport, buf, 1, NULL) == TRUE);
-    assert (thrift_buffered_transport_flush (transport, NULL) == FALSE);
-
-    thrift_buffered_transport_close (transport, NULL);
-
-    g_object_unref (transport);
-    g_object_unref (tsocket);
-
-    assert ( wait (&status) == pid );
-    assert ( status == 0 );
-  }
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testbufferedtransport/CreateAndDestroy", test_create_and_destroy);
-  g_test_add_func ("/testbufferedtransport/OpenAndClose", test_open_and_close);
-  g_test_add_func ("/testbufferedtransport/ReadAndWrite", test_read_and_write);
-  g_test_add_func ("/testbufferedtransport/WriteFail", test_write_fail);
-
-  return g_test_run ();
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testcompactprotocol.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testcompactprotocol.c
deleted file mode 100755
index 9b57a8c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testcompactprotocol.c
+++ /dev/null
@@ -1,1272 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* Disable string-function optimizations when glibc is used, as these produce
-   compiler warnings about string length when a string function is used inside
-   a call to assert () */
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && \
-    !defined(__OpenBSD__) && !defined(__NetBSD__)
-#include <features.h>
-#endif
-
-#ifdef __GLIBC__
-#define __NO_STRING_INLINES 1
-#endif
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <netdb.h>
-#include <string.h>
-#include <sys/wait.h>
-
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-#include <thrift/c_glib/transport/thrift_framed_transport.h>
-
-#define TEST_BOOL TRUE
-#define TEST_BYTE 123
-#define TEST_I16 12345
-#define TEST_I32 1234567890
-#define TEST_I64 123456789012345
-#define TEST_NI16 (-12345)
-#define TEST_NI32 (-1234567890)
-#define TEST_NI64 (-123456789012345)
-#define TEST_DOUBLE 1234567890.123
-#define TEST_STRING "this is a test string 1234567890!@#$%^&*()"
-#define TEST_PORT 51199
-
-static int transport_read_count = 0;
-static int transport_read_error = 0;
-static int transport_read_error_at = -1;
-gint32
-my_thrift_transport_read_all (ThriftTransport *transport, gpointer buf,
-                              guint32 len, GError **error)
-{
-  if (transport_read_count != transport_read_error_at
-      && transport_read_error == 0)
-  {
-    transport_read_count++;
-    return thrift_transport_read_all (transport, buf, len, error);
-  }
-  return -1;
-}
-
-static int transport_write_count = 0;
-static int transport_write_error = 0;
-static int transport_write_error_at = -1;
-gboolean
-my_thrift_transport_write (ThriftTransport *transport, const gpointer buf,
-                           const guint32 len, GError **error)
-{
-  if (transport_write_count != transport_write_error_at
-      && transport_write_error == 0)
-  {
-    transport_write_count++;
-    return thrift_transport_write (transport, buf, len, error);
-  }
-  return FALSE;
-}
-
-#define thrift_transport_read_all my_thrift_transport_read_all
-#define thrift_transport_write my_thrift_transport_write
-#include "../src/thrift/c_glib/protocol/thrift_compact_protocol.c"
-#undef thrift_transport_read_all
-#undef thrift_transport_write
-
-static void thrift_server_primitives (const int port);
-static void thrift_server_complex_types (const int port);
-static void thrift_server_many_frames (const int port);
-
-static void
-test_create_and_destroy (void)
-{
-  GObject *object = NULL;
-
-  /* create an object and then destroy it */
-  object = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, NULL);
-  assert (object != NULL);
-  g_object_unref (object);
-}
-
-static void
-test_initialize (void)
-{
-  ThriftSocket *tsocket = NULL;
-  ThriftCompactProtocol *protocol = NULL;
-  ThriftSocket *temp = NULL;
-
-  /* create a ThriftTransport */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                          "port", 51188, NULL);
-  assert (tsocket != NULL);
-  /* create a ThriftCompactProtocol using the Transport */
-  protocol = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
-                           tsocket, NULL);
-  assert (protocol != NULL);
-  /* fetch the properties */
-  g_object_get (G_OBJECT (protocol), "transport", &temp, NULL);
-  g_object_unref (temp);
-
-  /* clean up memory */
-  g_object_unref (protocol);
-  g_object_unref (tsocket);
-}
-
-static void
-test_read_and_write_primitives (void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  ThriftCompactProtocol *tc = NULL;
-  ThriftProtocol *protocol = NULL;
-  gpointer binary = (gpointer *) TEST_STRING;
-  guint32 len = strlen (TEST_STRING);
-  int port = TEST_PORT;
-
-  /* fork a server from the client */
-  pid = fork ();
-  assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    /* child listens */
-    thrift_server_primitives (port);
-    exit (0);
-  } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
-
-    /* create a ThriftSocket */
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    transport = THRIFT_TRANSPORT (tsocket);
-    thrift_transport_open (transport, NULL);
-    assert (thrift_transport_is_open (transport));
-
-    /* create a ThriftCompactTransport */
-    tc = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
-                       tsocket, NULL);
-    protocol = THRIFT_PROTOCOL (tc);
-    assert (protocol != NULL);
-
-    /* write a bunch of primitives */
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL, NULL) > 0);
-    assert (thrift_compact_protocol_write_byte (protocol, TEST_BYTE, NULL) > 0);
-    assert (thrift_compact_protocol_write_i16 (protocol, TEST_I16, NULL) > 0);
-    assert (thrift_compact_protocol_write_i32 (protocol, TEST_I32, NULL) > 0);
-    assert (thrift_compact_protocol_write_i64 (protocol, TEST_I64, NULL) > 0);
-    assert (thrift_compact_protocol_write_i16 (protocol, TEST_NI16, NULL) > 0);
-    assert (thrift_compact_protocol_write_i32 (protocol, TEST_NI32, NULL) > 0);
-    assert (thrift_compact_protocol_write_i64 (protocol, TEST_NI64, NULL) > 0);
-    assert (thrift_compact_protocol_write_i16 (protocol, 2, NULL) > 0);
-    assert (thrift_compact_protocol_write_i32 (protocol, 2, NULL) > 0);
-    assert (thrift_compact_protocol_write_i64 (protocol, 2, NULL) > 0);
-    assert (thrift_compact_protocol_write_i16 (protocol, -2, NULL) > 0);
-    assert (thrift_compact_protocol_write_i32 (protocol, -2, NULL) > 0);
-    assert (thrift_compact_protocol_write_i64 (protocol, -2, NULL) > 0);
-    assert (thrift_compact_protocol_write_double (protocol,
-                                                 TEST_DOUBLE, NULL) > 0);
-    assert (thrift_compact_protocol_write_string (protocol,
-                                                 TEST_STRING, NULL) > 0);
-    assert (thrift_compact_protocol_write_binary (protocol, binary,
-                                                 len, NULL) > 0);
-    assert (thrift_compact_protocol_write_binary (protocol, NULL, 0, NULL) > 0);
-    assert (thrift_compact_protocol_write_binary (protocol, binary,
-                                                 len, NULL) > 0);
-
-    /* test write errors */
-    transport_write_error = 1;
-    assert (thrift_compact_protocol_write_byte (protocol, TEST_BYTE,
-                                               NULL) == -1);
-    assert (thrift_compact_protocol_write_i16 (protocol, TEST_I16, NULL) == -1);
-    assert (thrift_compact_protocol_write_i32 (protocol, TEST_I32, NULL) == -1);
-    assert (thrift_compact_protocol_write_i64 (protocol, TEST_I64, NULL) == -1);
-    assert (thrift_compact_protocol_write_i16 (protocol, TEST_NI16,
-                                               NULL) == -1);
-    assert (thrift_compact_protocol_write_i32 (protocol, TEST_NI32,
-                                               NULL) == -1);
-    assert (thrift_compact_protocol_write_i64 (protocol, TEST_NI64,
-                                               NULL) == -1);
-    assert (thrift_compact_protocol_write_double (protocol, TEST_DOUBLE,
-                                                 NULL) == -1);
-    assert (thrift_compact_protocol_write_binary (protocol, binary, len,
-                                                 NULL) == -1);
-    transport_write_error = 0;
-
-    /* test binary partial failure */
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_compact_protocol_write_binary (protocol, binary,
-                                                 len, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* clean up */
-    thrift_transport_close (transport, NULL);
-    g_object_unref (tsocket);
-    g_object_unref (protocol);
-    assert (wait (&status) == pid);
-    assert (status == 0);
-  }
-}
-
-static void
-test_read_and_write_complex_types (void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  ThriftCompactProtocol *tc = NULL;
-  ThriftProtocol *protocol = NULL;
-  int port = TEST_PORT;
-
-  /* fork a server from the client */
-  pid = fork ();
-  assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    /* child listens */
-    thrift_server_complex_types (port);
-    exit (0);
-  } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
-
-    /* create a ThriftSocket */
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    transport = THRIFT_TRANSPORT (tsocket);
-    thrift_transport_open (transport, NULL);
-    assert (thrift_transport_is_open (transport));
-
-    /* create a ThriftCompactTransport */
-    tc = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
-                       tsocket, NULL);
-    protocol = THRIFT_PROTOCOL (tc);
-    assert (protocol != NULL);
-
-    /* test structures */
-    assert (thrift_compact_protocol_write_struct_begin (protocol,
-                                                       NULL, NULL) == 0);
-    assert (thrift_compact_protocol_write_struct_end (protocol, NULL) == 0);
-
-    /* test field state w.r.t. deltas */
-
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE, 1, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       16, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       17, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       15, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       30, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       46, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       47, NULL) == 1);
-
-    /* test fields */
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       1, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-
-    /* test field state w.r.t. structs */
-
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       1, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       16, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-
-    assert (thrift_compact_protocol_write_struct_begin (protocol,
-                                                       NULL, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       17, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-
-    assert (thrift_compact_protocol_write_struct_begin (protocol,
-                                                       NULL, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       18, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       19, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_struct_end (protocol, NULL) == 0);
-
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       18, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       25, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_struct_end (protocol, NULL) == 0);
-
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       17, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-
-    /* test field state w.r.t. bools */
-
-    /* deltas */
-    /* non-bool field -> bool field -> non-bool field */
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       18, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test", T_BOOL,
-                                                       19, NULL) == 0);
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL,
-                                                NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       20, NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    /* bool -> bool field -> bool */
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL, NULL) > 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test", T_BOOL,
-                                                       21, NULL) == 0);
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL,
-                                                NULL) == 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL, NULL) > 0);
-
-    /* no deltas */
-    /* non-bool field -> bool field -> non-bool field */
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       1, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test", T_BOOL,
-                                                      1, NULL) == 0);
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       1, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    /* bool -> bool field -> bool */
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL, NULL) > 0);
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test", T_BOOL,
-                                                      1, NULL) == 0);
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL, NULL) > 1);
-    assert (thrift_compact_protocol_write_field_end (protocol, NULL) == 0);
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL, NULL) > 0);
-
-    /* test write error */
-    transport_write_error = 1;
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       1, NULL) == -1);
-    transport_write_error = 0;
-
-    /* test 2nd write error */
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_compact_protocol_write_field_begin (protocol, "test",
-                                                       T_DOUBLE,
-                                                       1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* test 2nd read failure on a field */
-    thrift_compact_protocol_write_byte (protocol, T_DOUBLE, NULL);
-
-    /* test write_field_stop */
-    assert (thrift_compact_protocol_write_field_stop (protocol, NULL) > 0);
-
-    /* write a map */
-    assert (thrift_compact_protocol_write_map_begin (protocol, T_DOUBLE,
-                                                     T_DOUBLE,
-                                                     1, NULL) > 0);
-    assert (thrift_compact_protocol_write_map_end (protocol, NULL) == 0);
-
-    /* test 1st read failure on map---nothing to do on our side */
-
-    /* test 2nd read failure on a map */
-    thrift_compact_protocol_write_byte (protocol, T_DOUBLE, NULL);
-
-    /* test 1st write failure on a map */
-    transport_write_error = 1;
-    assert (thrift_compact_protocol_write_map_begin (protocol, T_DOUBLE,
-                                                     T_DOUBLE,
-                                                     1, NULL) == -1);
-    transport_write_error = 0;
-
-    /* test 2nd write failure on a map */
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_compact_protocol_write_map_begin (protocol, T_DOUBLE,
-                                                     T_DOUBLE,
-                                                     1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* test negative map size */
-    thrift_compact_protocol_write_varint32 (tc, -10, NULL);
-    thrift_compact_protocol_write_byte (protocol, T_DOUBLE, NULL);
-
-    /* test list operations */
-    assert (thrift_compact_protocol_write_list_begin (protocol, T_DOUBLE,
-                                                     15, NULL) > 0);
-    assert (thrift_compact_protocol_write_list_end (protocol, NULL) == 0);
-
-    /* test 1st read failure on a small list---nothing to do on our end */
-
-    /* test 1st read failure on a big list---nothing to do on our end */
-
-    /* test 2nd read failure on a big list */
-    thrift_compact_protocol_write_byte (protocol, (gint8) 0xf0, NULL);
-
-    /* test negative list size */
-    thrift_compact_protocol_write_byte (protocol, (gint8) 0xf0, NULL);
-    thrift_compact_protocol_write_varint32 (tc, -10, NULL);
-
-    /* test first write error on a small list */
-    transport_write_error = 1;
-    assert (thrift_compact_protocol_write_list_begin (protocol, T_DOUBLE,
-                                                     14, NULL) == -1);
-    transport_write_error = 0;
-
-    /* test first write error on a big list */
-    transport_write_error = 1;
-    assert (thrift_compact_protocol_write_list_begin (protocol, T_DOUBLE,
-                                                     15, NULL) == -1);
-    transport_write_error = 0;
-
-    /* test 2nd write error on a big list */
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_compact_protocol_write_list_begin (protocol, T_DOUBLE,
-                                                     15, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* test set operation s*/
-    assert (thrift_compact_protocol_write_set_begin (protocol, T_DOUBLE,
-                                                    1, NULL) > 0);
-    assert (thrift_compact_protocol_write_set_end (protocol, NULL) == 0);
-
-    /* invalid protocol */
-    assert (thrift_compact_protocol_write_byte (protocol, 0, NULL) > 0);
-
-    /* invalid version */
-    assert (thrift_compact_protocol_write_byte (protocol, (gint8) 0x82u,
-                                                NULL) > 0);
-    assert (thrift_compact_protocol_write_byte (protocol, 0, NULL) > 0);
-
-    /* send a valid message */
-    assert (thrift_compact_protocol_write_byte (protocol, (gint8) 0x82u,
-                                                NULL) > 0);
-    assert (thrift_compact_protocol_write_byte (protocol, 0x01u, NULL) > 0);
-    thrift_compact_protocol_write_varint32 (tc, 1, NULL);
-    thrift_compact_protocol_write_string (protocol, "test", NULL);
-
-    /* broken 2nd read */
-    thrift_compact_protocol_write_byte (protocol, (gint8) 0x82u, NULL);
-
-    /* send a broken 3rd read */
-    thrift_compact_protocol_write_byte (protocol, (gint8) 0x82u, NULL);
-    thrift_compact_protocol_write_byte (protocol, 0x01u, NULL);
-
-    /* send a broken 4th read */
-    thrift_compact_protocol_write_byte (protocol, (gint8) 0x82u, NULL);
-    thrift_compact_protocol_write_byte (protocol, 0x01u, NULL);
-    thrift_compact_protocol_write_varint32 (tc, 1, NULL);
-
-    /* send a valid message */
-    assert (thrift_compact_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) > 0);
-
-    assert (thrift_compact_protocol_write_message_end (protocol, NULL) == 0);
-
-    /* send broken writes */
-    transport_write_error = 1;
-    assert (thrift_compact_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) == -1);
-    transport_write_error = 0;
-
-    transport_write_count = 0;
-    transport_write_error_at = 1;
-    assert (thrift_compact_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    transport_write_count = 0;
-    transport_write_error_at = 2;
-    assert (thrift_compact_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    transport_write_count = 0;
-    transport_write_error_at = 3;
-    assert (thrift_compact_protocol_write_message_begin (protocol, "test",
-                                                        T_CALL, 1, NULL) == -1);
-    transport_write_error_at = -1;
-
-    /* clean up */
-    thrift_transport_close (transport, NULL);
-    g_object_unref (tsocket);
-    g_object_unref (protocol);
-    assert (wait (&status) == pid);
-    assert (status == 0);
-  }
-}
-
-static void
-test_read_and_write_many_frames (void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  ThriftFramedTransport *ft = NULL;
-  ThriftCompactProtocol *tc = NULL;
-  ThriftProtocol *protocol = NULL;
-  gpointer binary = (gpointer *) TEST_STRING;
-  const guint32 len = strlen (TEST_STRING);
-  int port = TEST_PORT;
-
-  /* fork a server from the client */
-  pid = fork ();
-  assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    /* child listens */
-    thrift_server_many_frames (port);
-    exit (0);
-  } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
-
-    /* create a ThriftSocket */
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    assert (tsocket != NULL);
-    transport = THRIFT_TRANSPORT (tsocket);
-
-    /* wrap in a framed transport */
-    ft = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport", transport,
-                       "w_buf_size", 1, NULL);
-    assert (ft != NULL);
-    transport = THRIFT_TRANSPORT (ft);
-
-    thrift_transport_open (transport, NULL);
-    assert (thrift_transport_is_open (transport));
-
-    /* create a compact protocol */
-    tc = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
-                       transport, NULL);
-    protocol = THRIFT_PROTOCOL (tc);
-    assert (protocol != NULL);
-
-    /* write a bunch of primitives */
-    assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL,
-                                                NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_byte (protocol, TEST_BYTE,
-                                                NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i16 (protocol, TEST_I16, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i32 (protocol, TEST_I32, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i64 (protocol, TEST_I64, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i16 (protocol, TEST_NI16, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i32 (protocol, TEST_NI32, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i64 (protocol, TEST_NI64, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i16 (protocol, 2, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i32 (protocol, 2, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i64 (protocol, 2, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i16 (protocol, -2, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i32 (protocol, -2, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_i64 (protocol, -2, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_double (protocol,
-                                                 TEST_DOUBLE, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_string (protocol,
-                                                 TEST_STRING, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_binary (protocol, binary,
-                                                 len, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_binary (protocol, NULL,
-                                                  0, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-    assert (thrift_compact_protocol_write_binary (protocol, binary,
-                                                 len, NULL) > 0);
-    thrift_transport_flush (transport, NULL);
-
-    /* clean up */
-    thrift_transport_write_end (transport, NULL);
-    thrift_transport_close (transport, NULL);
-    g_object_unref (ft);
-    g_object_unref (tsocket);
-    g_object_unref (tc);
-    assert (wait (&status) == pid);
-    assert (status == 0);
-  }
-}
-
-
-static void
-thrift_server_primitives (const int port)
-{
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  ThriftCompactProtocol *tc = NULL;
-  ThriftProtocol *protocol = NULL;
-  gboolean value_boolean = FALSE;
-  gint8 value_byte = 0,
-    zigzag_p16 = 0, zigzag_p32 = 0, zigzag_p64 = 0,
-    zigzag_n16 = 0, zigzag_n32 = 0, zigzag_n64 = 0;
-  gint16 value_16 = 0;
-  gint32 value_32 = 0;
-  gint64 value_64 = 0;
-  gint16 value_n16 = 0;
-  gint32 value_n32 = 0;
-  gint64 value_n64 = 0;
-  gdouble value_double = 0;
-  gchar *string = NULL;
-  gpointer binary = NULL;
-  guint32 len = 0;
-  void *comparator = (void *) TEST_STRING;
-
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-  client = thrift_server_transport_accept (transport, NULL);
-  assert (client != NULL);
-
-  tc = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
-                      client, NULL);
-  protocol = THRIFT_PROTOCOL (tc);
-
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &value_byte, NULL) > 0);
-  assert (thrift_compact_protocol_read_i16 (protocol, &value_16, NULL) > 0);
-  assert (thrift_compact_protocol_read_i32 (protocol, &value_32, NULL) > 0);
-  assert (thrift_compact_protocol_read_i64 (protocol, &value_64, NULL) > 0);
-  assert (thrift_compact_protocol_read_i16 (protocol, &value_n16, NULL) > 0);
-  assert (thrift_compact_protocol_read_i32 (protocol, &value_n32, NULL) > 0);
-  assert (thrift_compact_protocol_read_i64 (protocol, &value_n64, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p16, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p32, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p64, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n16, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n32, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n64, NULL) > 0);
-  assert (thrift_compact_protocol_read_double (protocol,
-                                              &value_double, NULL) > 0);
-  assert (thrift_compact_protocol_read_string (protocol, &string, NULL) > 0);
-  assert (thrift_compact_protocol_read_binary (protocol, &binary,
-                                              &len, NULL) > 0);
-
-  assert (value_boolean == TEST_BOOL);
-  assert (value_byte == TEST_BYTE);
-  assert (value_16 == TEST_I16);
-  assert (value_32 == TEST_I32);
-  assert (value_64 == TEST_I64);
-  assert (value_n16 == TEST_NI16);
-  assert (value_n32 == TEST_NI32);
-  assert (value_n64 == TEST_NI64);
-  assert (zigzag_p16 == 4);
-  assert (zigzag_p32 == 4);
-  assert (zigzag_p64 == 4);
-  assert (zigzag_n16 == 3);
-  assert (zigzag_n32 == 3);
-  assert (zigzag_n64 == 3);
-  assert (value_double == TEST_DOUBLE);
-  assert (strcmp (TEST_STRING, string) == 0);
-  assert (memcmp (comparator, binary, len) == 0);
-
-  g_free (string);
-  g_free (binary);
-
-  thrift_compact_protocol_read_binary (protocol, &binary, &len, NULL);
-  g_free (binary);
-
-  transport_read_count = 0;
-  transport_read_error_at = 0;
-  assert (thrift_compact_protocol_read_binary (protocol, &binary,
-                                              &len, NULL) == -1);
-  transport_read_error_at = -1;
-
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  assert (thrift_compact_protocol_read_binary (protocol, &binary,
-                                              &len, NULL) == -1);
-  transport_read_error_at = -1;
-
-  transport_read_error = 1;
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) == -1);
-  assert (thrift_compact_protocol_read_byte (protocol,
-                                            &value_byte, NULL) == -1);
-  assert (thrift_compact_protocol_read_i16 (protocol,
-                                           &value_16, NULL) == -1);
-  assert (thrift_compact_protocol_read_i32 (protocol, &value_32, NULL) == -1);
-  assert (thrift_compact_protocol_read_i64 (protocol, &value_64, NULL) == -1);
-  assert (thrift_compact_protocol_read_i16 (protocol,
-                                           &value_n16, NULL) == -1);
-  assert (thrift_compact_protocol_read_i32 (protocol, &value_n32, NULL) == -1);
-  assert (thrift_compact_protocol_read_i64 (protocol, &value_n64, NULL) == -1);
-  assert (thrift_compact_protocol_read_double (protocol,
-                                              &value_double, NULL) == -1);
-  transport_read_error = 0;
-
-  /* test partial write failure */
-  thrift_protocol_read_i32 (protocol, &value_32, NULL);
-
-  thrift_transport_read_end (client, NULL);
-  thrift_transport_close (client, NULL);
-
-  g_object_unref (tc);
-  g_object_unref (client);
-  g_object_unref (tsocket);
-}
-
-static void
-thrift_server_complex_types (const int port)
-{
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  ThriftCompactProtocol *tc = NULL;
-  ThriftProtocol *protocol = NULL;
-  gchar *struct_name = NULL;
-  gchar *field_name = NULL;
-  gchar *message_name = NULL;
-  ThriftType element_type, key_type, value_type, field_type;
-  ThriftMessageType message_type;
-  gboolean value_boolean = ! TEST_BOOL;
-  gint8 value = 0;
-  gint16 field_id = 0;
-  guint32 size = 0;
-  gint32 seqid = 0;
-  gint8 version_and_type = 0;
-  gint8 protocol_id = 0;
-
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-  client = thrift_server_transport_accept (transport, NULL);
-  assert (client != NULL);
-
-  tc = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
-                      client, NULL);
-  protocol = THRIFT_PROTOCOL (tc);
-
-  /* test struct operations */
-
-  thrift_compact_protocol_read_struct_begin (protocol, &struct_name, NULL);
-  thrift_compact_protocol_read_struct_end (protocol, NULL);
-
-  /* test field state w.r.t. deltas */
-
-  field_id = 0;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  assert (field_id == 1);
-  field_id = 0;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  assert (field_id == 16);
-  field_id = 0;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  assert (field_id == 17);
-  field_id = 0;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) > 1);
-  assert (field_id == 15);
-  field_id = 0;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  assert (field_id == 30);
-  field_id = 0;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) > 1);
-  assert (field_id == 46);
-  field_id = 0;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  assert (field_id == 47);
-  field_id = 0;
-
-  /* test field operations */
-
-  thrift_compact_protocol_read_field_begin (protocol, &field_name, &field_type,
-                                           &field_id, NULL);
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-
-  /* test field state w.r.t. structs */
-
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                                    &field_id, NULL) > 1);
-  assert (field_id == 1);
-  field_id = 0;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                                    &field_id, NULL) == 1);
-  assert (field_id == 16);
-  field_id = 0;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-
-  assert (thrift_compact_protocol_read_struct_begin (protocol,
-                                                     &struct_name, NULL) == 0);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                                    &field_id, NULL) > 1);
-  assert (field_id == 17);
-  field_id = 0;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-
-  assert (thrift_compact_protocol_read_struct_begin (protocol,
-                                                     &struct_name, NULL) == 0);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                                    &field_id, NULL) > 1);
-  assert (field_id == 18);
-  field_id = 0;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                                    &field_id, NULL) == 1);
-  assert (field_id == 19);
-  field_id = 0;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_struct_end (protocol, NULL) == 0);
-
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                                    &field_id, NULL) == 1);
-  assert (field_id == 18);
-  field_id = 0;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                                    &field_id, NULL) == 1);
-  assert (field_id == 25);
-  field_id = 0;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_struct_end (protocol, NULL) == 0);
-
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                                    &field_id, NULL) == 1);
-  assert (field_id == 17);
-  field_id = 0;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-
-  /* test field state w.r.t. bools */
-
-  /* deltas */
-  /* non-bool field -> bool field -> non-bool field */
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  assert (field_type == T_BOOL);
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) == 0);
-  assert (value_boolean == TEST_BOOL);
-  value_boolean = ! TEST_BOOL;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  /* bool -> bool field -> bool */
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) > 0);
-  assert (value_boolean == TEST_BOOL);
-  value_boolean = ! TEST_BOOL;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) == 1);
-  assert (field_type == T_BOOL);
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) == 0);
-  assert (value_boolean == TEST_BOOL);
-  value_boolean = ! TEST_BOOL;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) > 0);
-  assert (value_boolean == TEST_BOOL);
-  value_boolean = ! TEST_BOOL;
-
-  /* no deltas */
-  /* non-bool field -> bool field -> non-bool field */
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) > 1);
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) > 1);
-  assert (field_type == T_BOOL);
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) == 0);
-  assert (value_boolean == TEST_BOOL);
-  value_boolean = ! TEST_BOOL;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) > 1);
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  /* bool -> bool field -> bool */
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) > 0);
-  assert (value_boolean == TEST_BOOL);
-  value_boolean = ! TEST_BOOL;
-  assert (thrift_compact_protocol_read_field_begin (protocol, &field_name,
-                                                    &field_type,
-                                           &field_id, NULL) > 1);
-  assert (field_type == T_BOOL);
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) == 0);
-  assert (value_boolean == TEST_BOOL);
-  value_boolean = ! TEST_BOOL;
-  thrift_compact_protocol_read_field_end (protocol, NULL);
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) > 0);
-  assert (value_boolean == TEST_BOOL);
-  value_boolean = ! TEST_BOOL;
-
-  /* test first read error on a field */
-  transport_read_error = 1;
-  assert (thrift_compact_protocol_read_field_begin (protocol,
-                                                   &field_name, &field_type,
-                                                   &field_id, NULL) == -1);
-  transport_read_error = 0;
-
-  /* test 2nd write failure */
-  thrift_compact_protocol_read_byte (protocol, &value, NULL);
-
-  /* test 2nd read failure on a field */
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  assert (thrift_compact_protocol_read_field_begin (protocol,
-                                                   &field_name, &field_type,
-                                                   &field_id, NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* test field stop */
-  thrift_compact_protocol_read_field_begin (protocol, &field_name, &field_type,
-                                           &field_id, NULL);
-
-  /* test map operations */
-
-  thrift_compact_protocol_read_map_begin (protocol, &key_type, &value_type,
-                                         &size, NULL);
-  thrift_compact_protocol_read_map_end (protocol, NULL);
-
-  /* test 1st read failure on a map */
-  transport_read_count = 0;
-  transport_read_error_at = 0;
-  assert (thrift_compact_protocol_read_map_begin (protocol,
-                                                 &key_type, &value_type,
-                                                 &size, NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* test 2nd read failure on a map */
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  assert (thrift_compact_protocol_read_map_begin (protocol,
-                                                 &key_type, &value_type,
-                                                 &size, NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* test 1st write failure on map---nothing to do on our side */
-
-  /* test 2nd write failure */
-  thrift_compact_protocol_read_byte (protocol, &value, NULL);
-
-  /* test negative map size */
-  assert (thrift_compact_protocol_read_map_begin (protocol,
-                                                 &key_type, &value_type,
-                                                 &size, NULL) == -1);
-
-  /* test list operations */
-  thrift_compact_protocol_read_list_begin (protocol, &element_type, &size,
-                                           NULL);
-  thrift_compact_protocol_read_list_end (protocol, NULL);
-
-  /* test small list 1st read failure */
-  transport_read_error = 1;
-  assert (thrift_compact_protocol_read_list_begin (protocol, &element_type,
-                                                  &size, NULL) == -1);
-  transport_read_error = 0;
-
-  /* test big list 1st read failure */
-  transport_read_error = 1;
-  assert (thrift_compact_protocol_read_list_begin (protocol, &element_type,
-                                                  &size, NULL) == -1);
-  transport_read_error = 0;
-
-  /* test big list 2nd read failure */
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  thrift_compact_protocol_read_list_begin (protocol, &element_type, &size,
-                                           NULL);
-  transport_read_error_at = -1;
-
-  /* test negative list size failure */
-  thrift_compact_protocol_read_list_begin (protocol, &element_type, &size,
-                                           NULL);
-
-  /* test small list 1st write failure---nothing to do on our end */
-
-  /* test big list 1st write failure---nothing to do on our end */
-
-  /* test big list 2nd write failure */
-  thrift_compact_protocol_read_byte (protocol, &value, NULL);
-
-  /* test set operations */
-  thrift_compact_protocol_read_set_begin (protocol, &element_type, &size, NULL);
-  thrift_compact_protocol_read_set_end (protocol, NULL);
-
-  /* broken read */
-  transport_read_error = 1;
-  assert (thrift_compact_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-  transport_read_error = 0;
-
-  /* invalid protocol */
-  assert (thrift_compact_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-
-  /* invalid version */
-  assert (thrift_compact_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-
-  /* read a valid message */
-  assert (thrift_compact_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) > 0);
-  g_free (message_name);
-
-  /* broken 2nd read on a message */
-  transport_read_count = 0;
-  transport_read_error_at = 1;
-  assert (thrift_compact_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* broken 3rd read on a message */
-  transport_read_count = 0;
-  transport_read_error_at = 2;
-  assert (thrift_compact_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* broken 4th read on a message */
-  transport_read_count = 0;
-  transport_read_error_at = 3;
-  assert (thrift_compact_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) == -1);
-  transport_read_error_at = -1;
-
-  /* read a valid message */
-  assert (thrift_compact_protocol_read_message_begin (protocol, &message_name,
-                                                     &message_type, &seqid,
-                                                     NULL) > 0);
-  g_free (message_name);
-
-  assert (thrift_compact_protocol_read_message_end (protocol, NULL) == 0);
-
-  /* handle 2nd write failure on a message */
-  thrift_compact_protocol_read_byte (protocol, &protocol_id, NULL);
-
-  /* handle 3rd write failure on a message */
-  thrift_compact_protocol_read_byte (protocol, &protocol_id, NULL);
-  thrift_compact_protocol_read_byte (protocol, &version_and_type, NULL);
-
-  /* handle 4th write failure on a message */
-  thrift_compact_protocol_read_byte (protocol, &protocol_id, NULL);
-  thrift_compact_protocol_read_byte (protocol, &version_and_type, NULL);
-  thrift_compact_protocol_read_varint32 (tc, &seqid, NULL);
-
-  g_object_unref (client);
-  g_object_unref (tsocket);
-}
-
-static void
-thrift_server_many_frames (const int port)
-{
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  ThriftCompactProtocol *tcp = NULL;
-  ThriftProtocol *protocol = NULL;
-  ThriftServerSocket *tsocket = NULL;
-  gboolean value_boolean = FALSE;
-  gint8 value_byte = 0,
-    zigzag_p16 = 0, zigzag_p32 = 0, zigzag_p64 = 0,
-    zigzag_n16 = 0, zigzag_n32 = 0, zigzag_n64 = 0;
-  gint16 value_16 = 0;
-  gint32 value_32 = 0;
-  gint64 value_64 = 0;
-  gint16 value_n16 = 0;
-  gint32 value_n32 = 0;
-  gint64 value_n64 = 0;
-  gdouble value_double = 0;
-  gchar *string = NULL;
-  gpointer binary = NULL;
-  guint32 len = 0;
-  void *comparator = (void *) TEST_STRING;
-
-  tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET, "port", port, NULL);
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-
-  /* wrap the client in a framed transport */
-  client = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport",
-                         thrift_server_transport_accept (transport, NULL),
-                         "r_buf_size", 1, NULL);
-  assert (client != NULL);
-
-  tcp = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
-                      client, NULL);
-  protocol = THRIFT_PROTOCOL (tcp);
-
-  assert (thrift_compact_protocol_read_bool (protocol,
-                                            &value_boolean, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &value_byte, NULL) > 0);
-  assert (thrift_compact_protocol_read_i16 (protocol, &value_16, NULL) > 0);
-  assert (thrift_compact_protocol_read_i32 (protocol, &value_32, NULL) > 0);
-  assert (thrift_compact_protocol_read_i64 (protocol, &value_64, NULL) > 0);
-  assert (thrift_compact_protocol_read_i16 (protocol, &value_n16, NULL) > 0);
-  assert (thrift_compact_protocol_read_i32 (protocol, &value_n32, NULL) > 0);
-  assert (thrift_compact_protocol_read_i64 (protocol, &value_n64, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p16, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p32, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p64, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n16, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n32, NULL) > 0);
-  assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n64, NULL) > 0);
-  assert (thrift_compact_protocol_read_double (protocol,
-                                              &value_double, NULL) > 0);
-  assert (thrift_compact_protocol_read_string (protocol, &string, NULL) > 0);
-  assert (thrift_compact_protocol_read_binary (protocol, &binary,
-                                              &len, NULL) > 0);
-
-  assert (value_boolean == TEST_BOOL);
-  assert (value_byte == TEST_BYTE);
-  assert (value_16 == TEST_I16);
-  assert (value_32 == TEST_I32);
-  assert (value_64 == TEST_I64);
-  assert (value_n16 == TEST_NI16);
-  assert (value_n32 == TEST_NI32);
-  assert (value_n64 == TEST_NI64);
-  assert (zigzag_p16 == 4);
-  assert (zigzag_p32 == 4);
-  assert (zigzag_p64 == 4);
-  assert (zigzag_n16 == 3);
-  assert (zigzag_n32 == 3);
-  assert (zigzag_n64 == 3);
-  assert (value_double == TEST_DOUBLE);
-  assert (strcmp (TEST_STRING, string) == 0);
-  assert (memcmp (comparator, binary, len) == 0);
-
-  g_free (string);
-  g_free (binary);
-
-  thrift_transport_read_end (client, NULL);
-  thrift_transport_close (client, NULL);
-
-  g_object_unref (tcp);
-  g_object_unref (client);
-  g_object_unref (tsocket);
-}
-
-int
-main (int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testcompactprotocol/CreateAndDestroy",
-                   test_create_and_destroy);
-  g_test_add_func ("/testcompactprotocol/Initialize", test_initialize);
-  g_test_add_func ("/testcompactprotocol/ReadAndWritePrimitives",
-                   test_read_and_write_primitives);
-  g_test_add_func ("/testcompactprotocol/ReadAndWriteComplexTypes",
-                   test_read_and_write_complex_types);
-  g_test_add_func ("/testcompactprotocol/ReadAndWriteManyFrames",
-                   test_read_and_write_many_frames);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testcontainertest.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testcontainertest.c
deleted file mode 100644
index 1cbc55c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testcontainertest.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "gen-c_glib/t_test_container_test_types.h"
-#include "gen-c_glib/t_test_container_service.h"
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol_factory.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
-#include <thrift/c_glib/server/thrift_server.h>
-#include <thrift/c_glib/server/thrift_simple_server.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport_factory.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-
-#include <glib-object.h>
-#include <glib.h>
-
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-
-#define TEST_SERVER_HOSTNAME "localhost"
-#define TEST_SERVER_PORT     9090
-
-/* --------------------------------------------------------------------------
-   The ContainerService handler we'll use for testing */
-
-G_BEGIN_DECLS
-
-GType test_container_service_handler_get_type (void);
-
-#define TYPE_TEST_CONTAINER_SERVICE_HANDLER \
-  (test_container_service_handler_get_type ())
-
-#define TEST_CONTAINER_SERVICE_HANDLER(obj)                             \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                   \
-                               TYPE_TEST_CONTAINER_SERVICE_HANDLER,     \
-                               TestContainerServiceHandler))
-#define TEST_CONTAINER_SERVICE_HANDLER_CLASS(c)                         \
-  (G_TYPE_CHECK_CLASS_CAST ((c),                                        \
-                            TYPE_TEST_CONTAINER_SERVICE_HANDLER,        \
-                            TestContainerServiceHandlerClass))
-#define IS_TEST_CONTAINER_SERVICE_HANDLER(obj)                          \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                                   \
-                               TYPE_TEST_CONTAINER_SERVICE_HANDLER))
-#define IS_TEST_CONTAINER_SERVICE_HANDLER_CLASS(c)                      \
-  (G_TYPE_CHECK_CLASS_TYPE ((c),                                        \
-                            TYPE_TEST_CONTAINER_SERVICE_HANDLER))
-#define TEST_CONTAINER_SERVICE_HANDLER_GET_CLASS(obj)                   \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                                    \
-                              TYPE_TEST_CONTAINER_SERVICE_HANDLER,      \
-                              TestContainerServiceHandlerClass))
-
-struct _TestContainerServiceHandler {
-  TTestContainerServiceHandler parent_instance;
-
-  /* private */
-  GPtrArray *string_list;
-};
-typedef struct _TestContainerServiceHandler TestContainerServiceHandler;
-
-struct _TestContainerServiceHandlerClass {
-  TTestContainerServiceHandlerClass parent_class;
-};
-typedef struct _TestContainerServiceHandlerClass
-  TestContainerServiceHandlerClass;
-
-G_END_DECLS
-
-/* -------------------------------------------------------------------------- */
-
-G_DEFINE_TYPE (TestContainerServiceHandler,
-               test_container_service_handler,
-               T_TEST_TYPE_CONTAINER_SERVICE_HANDLER)
-
-/* A helper function used to append copies of strings to a string list */
-static void append_string_to_ptr_array (gpointer element, gpointer ptr_array)
-{
-  g_ptr_array_add ((GPtrArray *)ptr_array, g_strdup ((gchar *)element));
-}
-
-/* Accept a string list from the client and append its contents to our internal
-   list */
-static gboolean
-test_container_service_handler_receive_string_list (TTestContainerServiceIf *iface,
-                                                    const GPtrArray *stringList,
-                                                    GError **error)
-{
-  TestContainerServiceHandler *self = TEST_CONTAINER_SERVICE_HANDLER (iface);
-
-  /* Append the client's strings to our own internal string list */
-  g_ptr_array_foreach ((GPtrArray *)stringList,
-                       append_string_to_ptr_array,
-                       self->string_list);
-
-  g_clear_error (error);
-  return TRUE;
-}
-
-/* Return the contents of our internal string list to the client */
-static gboolean
-test_container_service_handler_return_string_list (TTestContainerServiceIf *iface,
-                                                   GPtrArray **_return,
-                                                   GError **error)
-{
-  TestContainerServiceHandler *self = TEST_CONTAINER_SERVICE_HANDLER (iface);
-
-  /* Return (copies of) the strings contained in our list */
-  g_ptr_array_foreach (self->string_list,
-                       append_string_to_ptr_array,
-                       *_return);
-
-  g_clear_error (error);
-  return TRUE;
-}
-
-static gboolean
-test_container_service_handler_return_list_string_list (TTestContainerServiceIf *iface,
-                                                        GPtrArray **_return,
-                                                        GError **error)
-{
-  TestContainerServiceHandler *self = TEST_CONTAINER_SERVICE_HANDLER (iface);
-  GPtrArray *nested_list;
-
-  /* Return a list containing our list of strings */
-  nested_list
-    = g_ptr_array_new_with_free_func ((GDestroyNotify)g_ptr_array_unref);
-  g_ptr_array_add (nested_list, self->string_list);
-  g_ptr_array_ref (self->string_list);
-
-  g_ptr_array_add (*_return, nested_list);
-
-  g_clear_error (error);
-  return TRUE;
-}
-
-static gboolean
-test_container_service_handler_return_typedefd_list_string_list (TTestContainerServiceIf *iface,
-                                                                 TTestListStringList **_return,
-                                                                 GError **error)
-{
-  TestContainerServiceHandler *self = TEST_CONTAINER_SERVICE_HANDLER (iface);
-  TTestStringList *nested_list;
-
-  /* Return a list containing our list of strings */
-  nested_list
-    = g_ptr_array_new_with_free_func ((GDestroyNotify)g_ptr_array_unref);
-  g_ptr_array_add (nested_list, self->string_list);
-  g_ptr_array_ref (self->string_list);
-
-  g_ptr_array_add (*_return, nested_list);
-
-  g_clear_error (error);
-  return TRUE;
-}
-
-static void
-test_container_service_handler_finalize (GObject *object) {
-  TestContainerServiceHandler *self = TEST_CONTAINER_SERVICE_HANDLER (object);
-
-  /* Destroy our internal containers */
-  g_ptr_array_unref (self->string_list);
-  self->string_list = NULL;
-
-  G_OBJECT_CLASS (test_container_service_handler_parent_class)->
-    finalize (object);
-}
-
-static void
-test_container_service_handler_init (TestContainerServiceHandler *self)
-{
-  /* Create our internal containers */
-  self->string_list = g_ptr_array_new_with_free_func (g_free);
-}
-
-static void
-test_container_service_handler_class_init (TestContainerServiceHandlerClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  TTestContainerServiceHandlerClass *parent_class =
-    T_TEST_CONTAINER_SERVICE_HANDLER_CLASS (klass);
-
-  gobject_class->finalize = test_container_service_handler_finalize;
-
-  parent_class->receive_string_list =
-    test_container_service_handler_receive_string_list;
-  parent_class->return_string_list =
-    test_container_service_handler_return_string_list;
-  parent_class->return_list_string_list =
-    test_container_service_handler_return_list_string_list;
-  parent_class->return_typedefd_list_string_list =
-    test_container_service_handler_return_typedefd_list_string_list;
-}
-
-/* -------------------------------------------------------------------------- */
-
-/* Our test server, declared globally so we can access it within a signal
-   handler */
-ThriftServer *server = NULL;
-
-/* A signal handler used to detect when the child process (the test suite) has
-   exited so we know to shut down the server and terminate ourselves */
-static void
-sigchld_handler (int signal_number)
-{
-  THRIFT_UNUSED_VAR (signal_number);
-
-  /* The child process (the tests) has exited or been terminated; shut down the
-     server gracefully */
-  if (server != NULL)
-    thrift_server_stop (server);
-}
-
-/* A helper function that executes a test case against a newly constructed
-   service client */
-static void
-execute_with_service_client (void (*test_case)(TTestContainerServiceIf *,
-                                               GError **))
-{
-  ThriftSocket *socket;
-  ThriftTransport *transport;
-  ThriftProtocol *protocol;
-
-  TTestContainerServiceIf *client;
-
-  GError *error = NULL;
-
-  /* Create a client with which to access the server */
-  socket    = g_object_new (THRIFT_TYPE_SOCKET,
-                            "hostname", TEST_SERVER_HOSTNAME,
-                            "port",     TEST_SERVER_PORT,
-                            NULL);
-  transport = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT,
-                            "transport", socket,
-                            NULL);
-  protocol  = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL,
-                            "transport", transport,
-                            NULL);
-
-  thrift_transport_open (transport, &error);
-  g_assert_no_error (error);
-
-  client = g_object_new (T_TEST_TYPE_CONTAINER_SERVICE_CLIENT,
-                         "input_protocol",  protocol,
-                         "output_protocol", protocol,
-                         NULL);
-
-  /* Execute the test against this client */
-  (*test_case)(client, &error);
-  g_assert_no_error (error);
-
-  /* Clean up and exit */
-  thrift_transport_close (transport, NULL);
-
-  g_object_unref (client);
-  g_object_unref (protocol);
-  g_object_unref (transport);
-  g_object_unref (socket);
-}
-
-static void
-test_containers_with_default_values (void)
-{
-  TTestContainersWithDefaultValues *default_values;
-  GPtrArray *string_list;
-
-  /* Fetch a new ContainersWithDefaultValues struct and its StringList member */
-  default_values = g_object_new (T_TEST_TYPE_CONTAINERS_WITH_DEFAULT_VALUES,
-                                 NULL);
-  g_object_get (default_values,
-                "StringList", &string_list,
-                NULL);
-
-  /* Make sure the list has been populated with its default values */
-  g_assert_cmpint (string_list->len, ==, 2);
-  g_assert_cmpstr (((gchar **)string_list->pdata)[0], ==, "Apache");
-  g_assert_cmpstr (((gchar **)string_list->pdata)[1], ==, "Thrift");
-
-  g_ptr_array_unref (string_list);
-  g_object_unref (default_values);
-}
-
-static void
-test_container_service_string_list_inner (TTestContainerServiceIf *client,
-                                          GError **error)
-{
-  gchar *test_data[] = { "one", "two", "three" };
-
-  GPtrArray *outgoing_string_list;
-  GPtrArray *incoming_string_list;
-  guint index;
-
-  g_clear_error (error);
-
-  /* Prepare our test data (our string list to send) */
-  outgoing_string_list = g_ptr_array_new ();
-  for (index = 0; index < 3; index += 1)
-    g_ptr_array_add (outgoing_string_list, &test_data[index]);
-
-  /* Send our data to the server and make sure we get the same data back on
-     retrieve */
-  g_assert
-    (t_test_container_service_client_receive_string_list (client,
-                                                          outgoing_string_list,
-                                                          error) &&
-     *error == NULL);
-
-  incoming_string_list = g_ptr_array_new ();
-  g_assert
-    (t_test_container_service_client_return_string_list (client,
-                                                         &incoming_string_list,
-                                                         error) &&
-     *error == NULL);
-
-  /* Make sure the two lists are equivalent */
-  g_assert_cmpint (incoming_string_list->len, ==, outgoing_string_list->len);
-  for (index = 0; index < incoming_string_list->len; index += 1)
-    g_assert_cmpstr (((gchar **)incoming_string_list->pdata)[index],
-                     ==,
-                     ((gchar **)outgoing_string_list->pdata)[index]);
-
-  /* Clean up and exit */
-  g_ptr_array_unref (incoming_string_list);
-  g_ptr_array_unref (outgoing_string_list);
-}
-
-static void
-test_container_service_string_list (void)
-{
-    execute_with_service_client (test_container_service_string_list_inner);
-}
-
-static void
-test_container_service_list_string_list_inner (TTestContainerServiceIf *client,
-                                               GError **error)
-{
-  GPtrArray *incoming_list;
-  GPtrArray *nested_list;
-
-  g_clear_error (error);
-
-  /* Receive a list of string lists from the server */
-  incoming_list =
-    g_ptr_array_new_with_free_func ((GDestroyNotify)g_ptr_array_unref);
-  g_assert
-    (t_test_container_service_client_return_list_string_list (client,
-                                                              &incoming_list,
-                                                              error) &&
-     *error == NULL);
-
-  /* Make sure the list and its contents are valid */
-  g_assert_cmpint (incoming_list->len, >, 0);
-
-  nested_list = (GPtrArray *)g_ptr_array_index (incoming_list, 0);
-  g_assert (nested_list != NULL);
-  g_assert_cmpint (nested_list->len, >=, 0);
-
-  /* Clean up and exit */
-  g_ptr_array_unref (incoming_list);
-}
-
-static void
-test_container_service_list_string_list (void)
-{
-  execute_with_service_client (test_container_service_list_string_list_inner);
-}
-
-static void
-test_container_service_typedefd_list_string_list_inner (TTestContainerServiceIf *client,
-                                                        GError **error)
-{
-  TTestListStringList *incoming_list;
-  TTestStringList *nested_list;
-
-  g_clear_error (error);
-
-  /* Receive a list of string lists from the server */
-  incoming_list =
-    g_ptr_array_new_with_free_func ((GDestroyNotify)g_ptr_array_unref);
-  g_assert
-    (t_test_container_service_client_return_list_string_list (client,
-                                                              &incoming_list,
-                                                              error) &&
-     *error == NULL);
-
-  /* Make sure the list and its contents are valid */
-  g_assert_cmpint (incoming_list->len, >, 0);
-
-  nested_list = (TTestStringList *)g_ptr_array_index (incoming_list, 0);
-  g_assert (nested_list != NULL);
-  g_assert_cmpint (nested_list->len, >=, 0);
-
-  /* Clean up and exit */
-  g_ptr_array_unref (incoming_list);
-}
-
-static void
-test_container_service_typedefd_list_string_list (void)
-{
-  execute_with_service_client
-    (test_container_service_typedefd_list_string_list_inner);
-}
-
-int
-main(int argc, char *argv[])
-{
-  pid_t pid;
-  int status;
-
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  /* Fork to run our test suite in a child process */
-  pid = fork ();
-  g_assert_cmpint (pid, >=, 0);
-
-  if (pid == 0) {    /* The child process */
-    /* Wait a moment for the server to finish starting */
-    sleep (1);
-
-    g_test_init (&argc, &argv, NULL);
-
-    g_test_add_func
-      ("/testcontainertest/ContainerTest/Structs/ContainersWithDefaultValues",
-       test_containers_with_default_values);
-    g_test_add_func
-      ("/testcontainertest/ContainerTest/Services/ContainerService/StringList",
-       test_container_service_string_list);
-    g_test_add_func
-      ("/testcontainertest/ContainerTest/Services/ContainerService/ListStringList",
-       test_container_service_list_string_list);
-    g_test_add_func
-      ("/testcontainertest/ContainerTest/Services/ContainerService/TypedefdListStringList",
-       test_container_service_typedefd_list_string_list);
-
-    /* Run the tests and make the result available to our parent process */
-    _exit (g_test_run ());
-  }
-  else {
-    TTestContainerServiceHandler *handler;
-    TTestContainerServiceProcessor *processor;
-
-    ThriftServerTransport *server_transport;
-    ThriftTransportFactory *transport_factory;
-    ThriftProtocolFactory *protocol_factory;
-
-    struct sigaction sigchld_action;
-
-    GError *error = NULL;
-    int exit_status = 1;
-
-    /* Trap the event of the child process terminating so we know to stop the
-       server and exit */
-    memset (&sigchld_action, 0, sizeof (sigchld_action));
-    sigchld_action.sa_handler = sigchld_handler;
-    sigchld_action.sa_flags = SA_RESETHAND;
-    sigaction (SIGCHLD, &sigchld_action, NULL);
-
-    /* Create our test server */
-    handler = g_object_new (TYPE_TEST_CONTAINER_SERVICE_HANDLER,
-                            NULL);
-    processor = g_object_new (T_TEST_TYPE_CONTAINER_SERVICE_PROCESSOR,
-                              "handler", handler,
-                              NULL);
-    server_transport = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                     "port", TEST_SERVER_PORT,
-                                     NULL);
-    transport_factory = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY,
-                                      NULL);
-    protocol_factory = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL_FACTORY,
-                                     NULL);
-
-    server = g_object_new (THRIFT_TYPE_SIMPLE_SERVER,
-                           "processor",                processor,
-                           "server_transport",         server_transport,
-                           "input_transport_factory",  transport_factory,
-                           "output_transport_factory", transport_factory,
-                           "input_protocol_factory",   protocol_factory,
-                           "output_protocol_factory",  protocol_factory,
-                           NULL);
-
-    /* Start the server */
-    thrift_server_serve (server, &error);
-
-    /* Make sure the server stopped only because it was interrupted (by the
-       child process terminating) */
-    g_assert(!error || g_error_matches(error,
-                                       THRIFT_SERVER_SOCKET_ERROR,
-                                       THRIFT_SERVER_SOCKET_ERROR_ACCEPT));
-
-    /* Free our resources */
-    g_object_unref (server);
-    g_object_unref (transport_factory);
-    g_object_unref (protocol_factory);
-    g_object_unref (server_transport);
-
-    g_object_unref (processor);
-    g_object_unref (handler);
-
-    /* Wait for the child process to complete and return its exit status */
-    g_assert (wait (&status) == pid);
-    if (WIFEXITED (status))
-      exit_status = WEXITSTATUS (status);
-
-    return exit_status;
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testdebugproto.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testdebugproto.c
deleted file mode 100644
index 47ac588..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testdebugproto.c
+++ /dev/null
@@ -1,942 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <math.h>
-#include <string.h>
-#include <glib-object.h>
-
-#ifndef M_PI
-#define M_PI 3.1415926535897932385
-#endif
-
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-
-#include "gen-c_glib/t_test_debug_proto_test_types.h"
-#include "gen-c_glib/t_test_srv.h"
-#include "gen-c_glib/t_test_inherited.h"
-
-static void
-test_structs_doubles_create_and_destroy (void)
-{
-  GObject *object = NULL;
-
-  /* A Doubles structure can be created... */
-  object = g_object_new (T_TEST_TYPE_DOUBLES, NULL);
-
-  g_assert (object != NULL);
-  g_assert (T_TEST_IS_DOUBLES (object));
-
-  /* ...and destroyed */
-  g_object_unref (object);
-}
-
-static void
-test_structs_doubles_initialize (void)
-{
-  TTestDoubles *doubles = NULL;
-  gdouble nan;
-  gdouble inf;
-  gdouble neginf;
-  gdouble repeating;
-  gdouble big;
-  gdouble tiny;
-  gdouble zero;
-  gdouble negzero;
-
-  /* Note there seems to be no way to get not-a-number ("NAN") values past
-     GObject's range-checking, so that portion of the test has been commented
-     out below. */
-
-  /* A Doubles structure's members are available as GObject properties
-     that can be initialized at construction... */
-  doubles = g_object_new (T_TEST_TYPE_DOUBLES,
-                          /* "nan",      0 * INFINITY, */
-                          "inf",          INFINITY,
-                          "neginf",      -INFINITY,
-                          "repeating",     1.0 / 3,
-                          "big",       G_MAXDOUBLE,
-                          "tiny",          10E-101,
-                          "zero",          1.0 * 0,
-                          "negzero",      -1.0 * 0,
-                          NULL);
-
-  g_assert (doubles != NULL);
-
-  /* ...and later retrieved */
-  g_object_get (doubles,
-                "nan",       &nan,
-                "inf",       &inf,
-                "neginf",    &neginf,
-                "repeating", &repeating,
-                "big",       &big,
-                "tiny",      &tiny,
-                "zero",      &zero,
-                "negzero",   &negzero,
-                NULL);
-
-  /* g_assert_cmpint (isnan (nan),    !=,  0); */
-  g_assert_cmpint (isinf (inf),    ==,  1);
-  g_assert_cmpint (isinf (neginf), ==, -1);
-
-  g_assert_cmpfloat (repeating, ==,     1.0 / 3);
-  g_assert_cmpfloat (big,       ==, G_MAXDOUBLE);
-  g_assert_cmpfloat (tiny,      ==,     10E-101);
-  g_assert_cmpfloat (zero,      ==,     1.0 * 0);
-  g_assert_cmpfloat (negzero,   ==,    -1.0 * 0);
-
-  g_object_unref (doubles);
-}
-
-static void
-test_structs_one_of_each_create_and_destroy (void)
-{
-  GObject *object = NULL;
-
-  /* A OneOfEach structure can be created... */
-  object = g_object_new (T_TEST_TYPE_ONE_OF_EACH, NULL);
-
-  g_assert (object != NULL);
-  g_assert (T_TEST_IS_ONE_OF_EACH (object));
-
-  /* ...and destroyed */
-  g_object_unref (object);
-}
-
-static void
-test_structs_one_of_each_initialize_default_values (void)
-{
-  TTestOneOfEach *one_of_each = NULL;
-  gint   a_bite;
-  gint   integer16;
-  gint64 integer64;
-  GArray *byte_list;
-  GArray *i16_list;
-  GArray *i64_list;
-
-  /* A OneOfEach structure created with no explicit property values
-     will hold the default values specified in the .thrift file */
-  one_of_each = g_object_new (T_TEST_TYPE_ONE_OF_EACH, NULL);
-
-  g_object_get (one_of_each,
-                "a_bite",    &a_bite,
-                "integer16", &integer16,
-                "integer64", &integer64,
-                "byte_list", &byte_list,
-                "i16_list",  &i16_list,
-                "i64_list",  &i64_list,
-                NULL);
-
-  g_assert_cmpint (a_bite,    ==, 0x7f);
-  g_assert_cmpint (integer16, ==, 0x7fff);
-  g_assert_cmpint (integer64, ==, G_GINT64_CONSTANT (10000000000));
-
-  g_assert (byte_list != NULL);
-  g_assert_cmpint (byte_list->len, ==, 3);
-  g_assert_cmpint (g_array_index (byte_list, gint8, 0), ==, 1);
-  g_assert_cmpint (g_array_index (byte_list, gint8, 1), ==, 2);
-  g_assert_cmpint (g_array_index (byte_list, gint8, 2), ==, 3);
-
-  g_assert (i16_list != NULL);
-  g_assert_cmpint (i16_list->len, ==, 3);
-  g_assert_cmpint (g_array_index (i16_list, gint16, 0), ==, 1);
-  g_assert_cmpint (g_array_index (i16_list, gint16, 1), ==, 2);
-  g_assert_cmpint (g_array_index (i16_list, gint16, 2), ==, 3);
-
-  g_assert (i64_list != NULL);
-  g_assert_cmpint (i64_list->len, ==, 3);
-  g_assert_cmpint (g_array_index (i64_list, gint64, 0), ==, 1);
-  g_assert_cmpint (g_array_index (i64_list, gint64, 1), ==, 2);
-  g_assert_cmpint (g_array_index (i64_list, gint64, 2), ==, 3);
-
-  g_array_unref (i64_list);
-  g_array_unref (i16_list);
-  g_array_unref (byte_list);
-  g_object_unref (one_of_each);
-}
-
-static void
-test_structs_one_of_each_initialize_specified_values (void)
-{
-  static const gint8 initial_byte_list[5] = { 13, 21, 34, 55, 89 };
-  static const gint16 initial_i16_list[5] = { 4181, 6765, 10946, 17711, 28657 };
-  static const gint64 initial_i64_list[5] =
-    {
-      G_GINT64_CONSTANT (1100087778366101931),
-      G_GINT64_CONSTANT (1779979416004714189),
-      G_GINT64_CONSTANT (2880067194370816120),
-      G_GINT64_CONSTANT (4660046610375530309),
-      G_GINT64_CONSTANT (7540113804746346429)
-    };
-  static const guint8 initial_base64[8] =
-    {
-      0x56, 0x47, 0x68, 0x79, 0x61, 0x57, 0x5a, 0x30
-    };
-
-  TTestOneOfEach *one_of_each;
-  gboolean im_true;
-  gboolean im_false;
-  gint a_bite;
-  gint integer16;
-  gint integer32;
-  gint64 integer64;
-  double double_precision;
-  gchar *some_characters;
-  gchar *zomg_unicode;
-  gboolean what_who;
-  GByteArray *base64;
-  GArray *byte_list;
-  GArray *i16_list;
-  GArray *i64_list;
-
-  base64 = g_byte_array_new ();
-  g_byte_array_append (base64, initial_base64, 8);
-
-  byte_list = g_array_new (FALSE, FALSE, sizeof (gint8));
-  g_array_append_vals (byte_list, initial_byte_list, 5);
-
-  i16_list = g_array_new (FALSE, FALSE, sizeof (gint16));
-  g_array_append_vals (i16_list, initial_i16_list, 5);
-
-  i64_list = g_array_new (FALSE, FALSE, sizeof (gint64));
-  g_array_append_vals (i64_list, initial_i64_list, 5);
-
-  /* All of OneOfEach's properties can be set at construction... */
-  one_of_each =
-    g_object_new (T_TEST_TYPE_ONE_OF_EACH,
-                  "im_true",          TRUE,
-                  "im_false",         FALSE,
-                  "a_bite",           0x50,
-                  "integer16",        0x7e57,
-                  "integer32",        0xdeadbeef,
-                  "integer64",        G_GINT64_CONSTANT (0xfa15efacade15bad),
-                  "double_precision", M_PI,
-                  "some_characters",  "Debug THIS!",
-                  "zomg_unicode",     "\xd7\n\a\t",
-                  "what_who",         TRUE,
-                  "base64",           base64,
-                  "byte_list",        byte_list,
-                  "i16_list",         i16_list,
-                  "i64_list",         i64_list,
-                  NULL);
-  g_assert (one_of_each != NULL);
-
-  g_array_unref (i64_list);
-  i64_list = NULL;
-  g_array_unref (i16_list);
-  i16_list = NULL;
-  g_array_unref (byte_list);
-  byte_list = NULL;
-  g_byte_array_unref (base64);
-  base64 = NULL;
-
-  /* ...and later retrieved */
-  g_object_get (one_of_each,
-                "im_true",          &im_true,
-                "im_false",         &im_false,
-                "a_bite",           &a_bite,
-                "integer16",        &integer16,
-                "integer32",        &integer32,
-                "integer64",        &integer64,
-                "double_precision", &double_precision,
-                "some_characters",  &some_characters,
-                "zomg_unicode",     &zomg_unicode,
-                "what_who",         &what_who,
-                "base64",           &base64,
-                "byte_list",        &byte_list,
-                "i16_list",         &i16_list,
-                "i64_list",         &i64_list,
-                NULL);
-
-  g_assert (im_true  == TRUE);
-  g_assert (im_false == FALSE);
-
-  g_assert_cmphex (a_bite,    ==, 0x50);
-  g_assert_cmphex (integer16, ==, 0x7e57);
-  g_assert_cmphex (integer32, ==, (gint32)0xdeadbeef);
-  g_assert_cmphex (integer64, ==, G_GINT64_CONSTANT (0xfa15efacade15bad));
-
-  g_assert_cmpfloat (double_precision, ==, M_PI);
-
-  g_assert_cmpstr (some_characters, ==, "Debug THIS!");
-  g_assert_cmpstr (zomg_unicode,    ==, "\xd7\n\a\t");
-
-  g_assert (what_who == TRUE);
-
-  g_assert_cmpint (base64->len, ==, 8);
-  g_assert_cmpint (memcmp (base64->data,
-                           initial_base64,
-                           8 * sizeof (guint8)), ==, 0);
-
-  g_assert_cmpint (byte_list->len, ==, 5);
-  g_assert_cmpint (memcmp (byte_list->data,
-                           initial_byte_list,
-                           5 * sizeof (gint8)),  ==, 0);
-
-  g_assert_cmpint (i16_list->len, ==, 5);
-  g_assert_cmpint (memcmp (i16_list->data,
-                           initial_i16_list,
-                           5 * sizeof (gint16)), ==, 0);
-
-  g_assert_cmpint (i64_list->len, ==, 5);
-  g_assert_cmpint (memcmp (i64_list->data,
-                           initial_i64_list,
-                           5 * sizeof (gint64)), ==, 0);
-
-  g_array_unref (i64_list);
-  g_array_unref (i16_list);
-  g_array_unref (byte_list);
-  g_byte_array_unref (base64);
-
-  g_object_unref (one_of_each);
-}
-
-static void
-test_structs_one_of_each_properties_byte_list (void)
-{
-  TTestOneOfEach *one_of_each;
-  GArray *byte_list = NULL;
-
-  one_of_each = g_object_new (T_TEST_TYPE_ONE_OF_EACH, NULL);
-
-  /* OneOfEach's "byte_list" member is a list that holds eight-bit-wide integer
-     values */
-  g_object_get (one_of_each, "byte_list", &byte_list, NULL);
-
-  g_assert (byte_list != NULL);
-  g_assert_cmpint (g_array_get_element_size (byte_list), ==, sizeof (gint8));
-
-  g_array_unref (byte_list);
-  g_object_unref (one_of_each);
-}
-
-static void
-test_structs_one_of_each_properties_i16_list (void)
-{
-  TTestOneOfEach *one_of_each;
-  GArray *i16_list = NULL;
-
-  one_of_each = g_object_new (T_TEST_TYPE_ONE_OF_EACH, NULL);
-
-  /* OneOfEach's "i16_list" member is a list that holds sixteen-bit-wide integer
-     values */
-  g_object_get (one_of_each, "i16_list", &i16_list, NULL);
-
-  g_assert (i16_list != NULL);
-  g_assert_cmpint (g_array_get_element_size (i16_list), ==, sizeof (gint16));
-
-  g_array_unref (i16_list);
-  g_object_unref (one_of_each);
-}
-
-static void
-test_structs_one_of_each_properties_i64_list (void)
-{
-  TTestOneOfEach *one_of_each;
-  GArray *i64_list = NULL;
-
-  one_of_each = g_object_new (T_TEST_TYPE_ONE_OF_EACH, NULL);
-
-  /* OneOfEach's "i64_list" member is a list that holds sixty-four-bit-wide
-     integer values */
-  g_object_get (one_of_each, "i64_list", &i64_list, NULL);
-
-  g_assert (i64_list != NULL);
-  g_assert_cmpint (g_array_get_element_size (i64_list), ==, sizeof (gint64));
-
-  g_array_unref (i64_list);
-  g_object_unref (one_of_each);
-}
-
-static void
-test_structs_nesting_create_and_destroy (void)
-{
-  GObject *object = NULL;
-
-  /* A Nesting structure can be created... */
-  object = g_object_new (T_TEST_TYPE_NESTING, NULL);
-
-  g_assert (object != NULL);
-  g_assert (T_TEST_IS_NESTING (object));
-
-  /* ...and destroyed */
-  g_object_unref (object);
-}
-
-static void
-test_structs_nesting_properties_my_bonk (void)
-{
-  TTestNesting *nesting;
-  TTestBonk *bonk = NULL;
-  gint type;
-  gchar *message;
-
-  nesting = g_object_new (T_TEST_TYPE_NESTING, NULL);
-
-  /* Nesting's "my_bonk" member is initialized with a new, default Bonk object
-     during construction */
-  g_object_get (nesting, "my_bonk", &bonk, NULL);
-
-  g_assert (bonk != NULL);
-  g_assert (T_TEST_IS_BONK (bonk));
-
-  g_object_get (bonk,
-                "type",    &type,
-                "message", &message,
-                NULL);
-
-  g_assert_cmpint (type, ==, 0);
-  g_assert (message == NULL);
-
-  g_object_unref (bonk);
-  bonk = NULL;
-
-  /* It can be replaced... */
-  bonk = g_object_new (T_TEST_TYPE_BONK,
-                       "type",    100,
-                       "message", "Replacement Bonk",
-                       NULL);
-  g_object_set (nesting, "my_bonk", bonk, NULL);
-  g_object_unref (bonk);
-  bonk = NULL;
-
-  g_object_get (nesting, "my_bonk", &bonk, NULL);
-
-  g_assert (bonk != NULL);
-  g_assert (T_TEST_IS_BONK (bonk));
-
-  g_object_get (bonk,
-                "type",    &type,
-                "message", &message,
-                NULL);
-
-  g_assert_cmpint (type, ==, 100);
-  g_assert_cmpstr (message, ==, "Replacement Bonk");
-
-  g_free (message);
-  g_object_unref (bonk);
-  bonk = NULL;
-
-  /* ...or set to null */
-  g_object_set (nesting, "my_bonk", NULL, NULL);
-  g_object_get (nesting, "my_bonk", &bonk, NULL);
-
-  g_assert (bonk == NULL);
-
-  g_object_unref (nesting);
-}
-
-static void
-test_structs_nesting_properties_my_ooe (void)
-{
-  TTestNesting *nesting;
-  TTestOneOfEach *one_of_each = NULL;
-  gint a_bite;
-  gint integer16;
-
-  nesting = g_object_new (T_TEST_TYPE_NESTING, NULL);
-
-  /* Nesting's "my_ooe" member is initialized with a new, default OneOfEach
-     object during construction */
-  g_object_get (nesting, "my_ooe", &one_of_each, NULL);
-
-  g_assert (one_of_each != NULL);
-  g_assert (T_TEST_IS_ONE_OF_EACH (one_of_each));
-
-  g_object_get (one_of_each,
-                "a_bite",    &a_bite,
-                "integer16", &integer16,
-                NULL);
-
-  g_assert_cmphex (a_bite,    ==, 0x7f);
-  g_assert_cmphex (integer16, ==, 0x7fff);
-
-  g_object_unref (one_of_each);
-  one_of_each = NULL;
-
-  /* It can be replaced... */
-  one_of_each = g_object_new (T_TEST_TYPE_ONE_OF_EACH,
-                              "a_bite",    0x50,
-                              "integer16", 0x5050,
-                              NULL);
-  g_object_set (nesting, "my_ooe", one_of_each, NULL);
-  g_object_unref (one_of_each);
-  one_of_each = NULL;
-
-  g_object_get (nesting, "my_ooe", &one_of_each, NULL);
-
-  g_assert (one_of_each != NULL);
-  g_assert (T_TEST_IS_ONE_OF_EACH (one_of_each));
-
-  g_object_get (one_of_each,
-                "a_bite",    &a_bite,
-                "integer16", &integer16,
-                NULL);
-
-  g_assert_cmphex (a_bite,    ==, 0x50);
-  g_assert_cmphex (integer16, ==, 0x5050);
-
-  g_object_unref (one_of_each);
-  one_of_each = NULL;
-
-  /* ...or set to null */
-  g_object_set (nesting, "my_ooe", NULL, NULL);
-  g_object_get (nesting, "my_ooe", &one_of_each, NULL);
-
-  g_assert (one_of_each == NULL);
-
-  g_object_unref (nesting);
-}
-
-static void
-test_structs_holy_moley_create_and_destroy (void)
-{
-  GObject *object = NULL;
-
-  /* A HolyMoley structure can be created... */
-  object = g_object_new (T_TEST_TYPE_HOLY_MOLEY, NULL);
-
-  g_assert (object != NULL);
-  g_assert (T_TEST_IS_HOLY_MOLEY (object));
-
-  /* ...and destroyed */
-  g_object_unref (object);
-}
-
-static void
-test_structs_holy_moley_properties_big (void)
-{
-  TTestHolyMoley *holy_moley;
-  GPtrArray *big = NULL;
-  gint a_bite = 0;
-  gint integer16 = 0;
-
-  holy_moley = g_object_new (T_TEST_TYPE_HOLY_MOLEY, NULL);
-
-  /* A HolyMoley's "big" member is is initialized on construction */
-  g_object_get (holy_moley, "big", &big, NULL);
-
-  g_assert (big != NULL);
-  g_assert_cmpint (big->len, ==, 0);
-
-  /* It can be modified... */
-  g_ptr_array_add (big,
-                   g_object_new (T_TEST_TYPE_ONE_OF_EACH,
-                                 "a_bite",    0x50,
-                                 "integer16", 0x5050,
-                                 NULL));
-
-  g_ptr_array_unref (big);
-  big = NULL;
-
-  g_object_get (holy_moley, "big", &big, NULL);
-
-  g_assert_cmpint (big->len, ==, 1);
-  g_object_get (g_ptr_array_index (big, 0),
-                "a_bite",    &a_bite,
-                "integer16", &integer16,
-                NULL);
-
-  g_assert_cmphex (a_bite,    ==, 0x50);
-  g_assert_cmphex (integer16, ==, 0x5050);
-
-  g_ptr_array_unref (big);
-  big = NULL;
-
-  /* ...replaced... */
-  big = g_ptr_array_new_with_free_func (g_object_unref);
-  g_ptr_array_add (big,
-                   g_object_new (T_TEST_TYPE_ONE_OF_EACH,
-                                 "a_bite",    0x64,
-                                 "integer16", 0x1541,
-                                 NULL));
-
-  g_object_set (holy_moley, "big", big, NULL);
-
-  g_ptr_array_unref (big);
-  big = NULL;
-
-  g_object_get (holy_moley, "big", &big, NULL);
-
-  g_assert_cmpint (big->len, ==, 1);
-  g_object_get (g_ptr_array_index (big, 0),
-                "a_bite",    &a_bite,
-                "integer16", &integer16,
-                NULL);
-
-  g_assert_cmphex (a_bite,    ==, 0x64);
-  g_assert_cmphex (integer16, ==, 0x1541);
-
-  g_ptr_array_unref (big);
-  big = NULL;
-
-  /* ...or set to NULL */
-  g_object_set (holy_moley, "big", NULL, NULL);
-  g_object_get (holy_moley, "big", &big, NULL);
-
-  g_assert (big == NULL);
-
-  g_object_unref (holy_moley);
-}
-
-static void
-test_structs_holy_moley_properties_contain (void)
-{
-  static gchar *strings[2] = { "Apache", "Thrift" };
-
-  TTestHolyMoley *holy_moley;
-  GHashTable *contain = NULL;
-  GPtrArray *string_list;
-  GList *key_list;
-
-  holy_moley = g_object_new (T_TEST_TYPE_HOLY_MOLEY, NULL);
-
-  /* A HolyMoley's "contain" member is initialized on construction */
-  g_object_get (holy_moley, "contain", &contain, NULL);
-
-  g_assert (contain != NULL);
-  g_assert_cmpint (g_hash_table_size (contain), ==, 0);
-
-  /* It can be modified... */
-  string_list = g_ptr_array_new ();
-  g_ptr_array_add (string_list, strings[0]);
-  g_ptr_array_add (string_list, strings[1]);
-
-  g_hash_table_insert (contain, string_list, NULL);
-  string_list = NULL;
-
-  g_hash_table_unref (contain);
-  contain = NULL;
-
-  g_object_get (holy_moley, "contain", &contain, NULL);
-
-  g_assert_cmpint (g_hash_table_size (contain), ==, 1);
-
-  key_list = g_hash_table_get_keys (contain);
-  string_list = g_list_nth_data (key_list, 0);
-
-  g_assert_cmpint (string_list->len, ==, 2);
-  g_assert_cmpstr (g_ptr_array_index (string_list, 0), ==, "Apache");
-  g_assert_cmpstr (g_ptr_array_index (string_list, 1), ==, "Thrift");
-
-  g_list_free (key_list);
-  g_hash_table_unref (contain);
-  contain = NULL;
-
-  /* ...replaced... */
-  contain = g_hash_table_new_full (g_direct_hash,
-                                   g_direct_equal,
-                                   (GDestroyNotify) g_ptr_array_unref,
-                                   NULL);
-  g_object_set (holy_moley, "contain", contain, NULL);
-  g_hash_table_unref (contain);
-  contain = NULL;
-
-  g_object_get (holy_moley, "contain", &contain, NULL);
-
-  g_assert_cmpint (g_hash_table_size (contain), ==, 0);
-
-  g_hash_table_unref (contain);
-  contain = NULL;
-
-  /* ...or set to NULL */
-  g_object_set (holy_moley, "contain", NULL, NULL);
-  g_object_get (holy_moley, "contain", &contain, NULL);
-
-  g_assert (contain == NULL);
-
-  g_object_unref (holy_moley);
-}
-
-static void
-test_structs_holy_moley_properties_bonks (void)
-{
-  TTestHolyMoley *holy_moley;
-  GHashTable *bonks = NULL;
-  GPtrArray *bonk_list = NULL;
-  TTestBonk *bonk = NULL;
-  gint type;
-  gchar *message;
-  GList *key_list;
-
-  holy_moley = g_object_new (T_TEST_TYPE_HOLY_MOLEY, NULL);
-
-  /* A HolyMoley's "bonks" member is initialized on construction */
-  g_object_get (holy_moley, "bonks", &bonks, NULL);
-
-  g_assert (bonks != NULL);
-  g_assert_cmpint (g_hash_table_size (bonks), ==, 0);
-
-  /* It can be modified... */
-  bonk = g_object_new (T_TEST_TYPE_BONK,
-                       "type",    100,
-                       "message", "Sample Bonk",
-                       NULL);
-  bonk_list = g_ptr_array_new_with_free_func (g_object_unref);
-  g_ptr_array_add (bonk_list, bonk);
-  bonk = NULL;
-
-  g_hash_table_insert (bonks, g_strdup ("Sample Bonks"), bonk_list);
-  bonk_list = NULL;
-
-  g_hash_table_unref (bonks);
-  bonks = NULL;
-
-  g_object_get (holy_moley, "bonks", &bonks, NULL);
-
-  g_assert_cmpint (g_hash_table_size (bonks), ==, 1);
-
-  key_list = g_hash_table_get_keys (bonks);
-  bonk_list = g_hash_table_lookup (bonks, g_list_nth_data (key_list, 0));
-
-  g_assert_cmpint (bonk_list->len, ==, 1);
-
-  bonk = (g_ptr_array_index (bonk_list, 0));
-  g_object_get (bonk,
-                "type",    &type,
-                "message", &message,
-                NULL);
-
-  g_assert_cmpint (type, ==, 100);
-  g_assert_cmpstr (message, ==, "Sample Bonk");
-
-  bonk = NULL;
-  g_free (message);
-  g_list_free (key_list);
-  g_hash_table_unref (bonks);
-  bonks = NULL;
-
-  /* ...replaced... */
-  bonks = g_hash_table_new_full (g_str_hash,
-                                 g_str_equal,
-                                 g_free,
-                                 (GDestroyNotify) g_ptr_array_unref);
-  g_object_set (holy_moley, "bonks", bonks, NULL);
-  g_hash_table_unref (bonks);
-  bonks = NULL;
-
-  g_object_get (holy_moley, "bonks", &bonks, NULL);
-
-  g_assert_cmpint (g_hash_table_size (bonks), ==, 0);
-
-  g_hash_table_unref (bonks);
-  bonks = NULL;
-
-  /* ...or set to NULL */
-  g_object_set (holy_moley, "bonks", NULL, NULL);
-  g_object_get (holy_moley, "bonks", &bonks, NULL);
-
-  g_assert (bonks == NULL);
-
-  g_object_unref (holy_moley);
-}
-
-static void
-test_structs_empty (void)
-{
-  GObject *object = NULL;
-  GParamSpec **properties;
-  guint property_count;
-
-  /* An Empty structure can be created */
-  object = g_object_new (T_TEST_TYPE_EMPTY, NULL);
-
-  g_assert (object != NULL);
-  g_assert (T_TEST_IS_EMPTY (object));
-
-  /* An Empty structure has no members and thus no properties */
-  properties = g_object_class_list_properties (G_OBJECT_GET_CLASS (object),
-                                               &property_count);
-  g_assert_cmpint (property_count, ==, 0);
-  g_free (properties);
-
-  /* An Empty structure can be destroyed  */
-  g_object_unref (object);
-}
-
-static void
-test_structs_wrapper_create_and_destroy (void)
-{
-  GObject *object = NULL;
-
-  /* A Wrapper structure can be created... */
-  object = g_object_new (T_TEST_TYPE_EMPTY, NULL);
-
-  g_assert (object != NULL);
-  g_assert (T_TEST_IS_EMPTY (object));
-
-  /* ...and destroyed  */
-  g_object_unref (object);
-}
-
-static void
-test_structs_wrapper_properties_foo (void) {
-  TTestWrapper *wrapper;
-  TTestEmpty *foo;
-
-  wrapper = g_object_new (T_TEST_TYPE_WRAPPER, NULL);
-
-  /* A Wrapper structure has one member, "foo", which is an Empty
-     structure initialized during construction */
-  g_object_get (wrapper, "foo", &foo, NULL);
-
-  g_assert (foo != NULL);
-  g_assert (T_TEST_IS_EMPTY (foo));
-
-  g_object_unref (foo);
-  foo = NULL;
-
-  /* A Wrapper's foo property can be replaced... */
-  foo = g_object_new (T_TEST_TYPE_EMPTY, NULL);
-  g_object_set (wrapper, "foo", foo, NULL);
-
-  g_object_unref (foo);
-  foo = NULL;
-
-  g_object_get (wrapper, "foo", &foo, NULL);
-  g_assert (foo != NULL);
-  g_assert (T_TEST_IS_EMPTY (foo));
-
-  g_object_unref (foo);
-  foo = NULL;
-
-  /* ...or set to NULL */
-  g_object_set (wrapper, "foo", NULL, NULL);
-  g_object_get (wrapper, "foo", &foo, NULL);
-
-  g_assert (foo == NULL);
-
-  g_object_unref (wrapper);
-}
-
-static void
-test_services_inherited (void)
-{
-  ThriftProtocol *protocol;
-  TTestInheritedClient *inherited_client;
-  GObject *input_protocol, *output_protocol;
-
-  protocol = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, NULL);
-  inherited_client = g_object_new (T_TEST_TYPE_INHERITED_CLIENT,
-                                   NULL);
-
-  /* TTestInheritedClient inherits from TTestSrvClient */
-  assert (g_type_is_a (T_TEST_TYPE_INHERITED_CLIENT,
-                       T_TEST_TYPE_SRV_CLIENT));
-
-  /* TTestInheritedClient implements TTestSrvClient's interface */
-  assert (g_type_is_a (T_TEST_TYPE_INHERITED_CLIENT,
-                       T_TEST_TYPE_SRV_IF));
-
-  /* TTestInheritedClient's inherited properties can be set and retrieved */
-  g_object_set (inherited_client,
-                "input_protocol", protocol,
-                "output_protocol", protocol,
-                NULL);
-
-  g_object_get (inherited_client,
-                "input_protocol", &input_protocol,
-                "output_protocol", &output_protocol,
-                NULL);
-
-  assert (input_protocol == G_OBJECT(protocol));
-  assert (output_protocol == G_OBJECT(protocol));
-
-  g_object_unref (output_protocol);
-  g_object_unref (input_protocol);
-  g_object_unref (inherited_client);
-  g_object_unref (protocol);
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/Doubles/CreateAndDestroy",
-     test_structs_doubles_create_and_destroy);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/Doubles/Initialize",
-     test_structs_doubles_initialize);
-
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/OneOfEach/CreateAndDestroy",
-     test_structs_one_of_each_create_and_destroy);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/OneOfEach/Initialize/DefaultValues",
-     test_structs_one_of_each_initialize_default_values);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/OneOfEach/Initialize/SpecifiedValues",
-     test_structs_one_of_each_initialize_specified_values);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/OneOfEach/Properties/byte_list",
-     test_structs_one_of_each_properties_byte_list);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/OneOfEach/Properties/i16_list",
-     test_structs_one_of_each_properties_i16_list);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/OneOfEach/Properties/i64_list",
-     test_structs_one_of_each_properties_i64_list);
-
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/Nesting/CreateAndDestroy",
-     test_structs_nesting_create_and_destroy);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/Nesting/Properties/my_bonk",
-     test_structs_nesting_properties_my_bonk);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/Nesting/Properties/my_ooe",
-     test_structs_nesting_properties_my_ooe);
-
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/HolyMoley/CreateAndDestroy",
-     test_structs_holy_moley_create_and_destroy);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/HolyMoley/Properties/big",
-     test_structs_holy_moley_properties_big);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/HolyMoley/Properties/contain",
-     test_structs_holy_moley_properties_contain);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/HolyMoley/Properties/bonks",
-     test_structs_holy_moley_properties_bonks);
-
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/Empty",
-     test_structs_empty);
-
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/Wrapper/CreateAndDestroy",
-     test_structs_wrapper_create_and_destroy);
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Structs/Wrapper/Properties/foo",
-     test_structs_wrapper_properties_foo);
-
-  g_test_add_func
-    ("/testdebugproto/DebugProto/Services/Inherited",
-     test_services_inherited);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testfdtransport.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testfdtransport.c
deleted file mode 100755
index 40c1acf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testfdtransport.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_fd_transport.h>
-
-static const gchar TEST_DATA[12] = "abcde01234!";
-
-static void
-test_create_and_destroy (void)
-{
-  GObject *object;
-  object = g_object_new (THRIFT_TYPE_FD_TRANSPORT, "fd", -1, NULL);
-  assert (object != NULL);
-  g_object_unref (object);
-}
-
-static void
-test_open_and_close (void)
-{
-  ThriftTransport *transport;
-  ThriftTransportClass *klass;
-  GError *error;
-  gint fd;
-  gchar *filename;
-
-  error = NULL;
-  filename = NULL;
-
-  fd = g_file_open_tmp (NULL, &filename, &error);
-  assert (fd >= 0);
-
-  transport = THRIFT_TRANSPORT (g_object_new (THRIFT_TYPE_FD_TRANSPORT,
-                                              "fd", fd,
-                                              NULL));
-  klass = THRIFT_TRANSPORT_GET_CLASS (transport);
-
-  /* open is no-op */
-  assert (klass->is_open (transport));
-  assert (klass->peek (transport, &error));
-  assert (klass->open (transport, &error));
-  assert (klass->is_open (transport));
-  assert (klass->peek (transport, &error));
-
-  assert (klass->close (transport, &error));
-  assert (! klass->open (transport, &error));
-  assert (! klass->is_open (transport));
-  assert (! klass->peek (transport, &error));
-
-  /* already closed */
-  assert (close (fd) != 0);
-  assert (errno == EBADF);
-
-  g_object_unref (transport);
-
-  g_remove (filename);
-  g_free (filename);
-
-  /* test bad fd */
-  transport = THRIFT_TRANSPORT (g_object_new (THRIFT_TYPE_FD_TRANSPORT,
-                                              "fd", -1,
-                                              NULL));
-  klass = THRIFT_TRANSPORT_GET_CLASS (transport);
-
-  assert (! klass->is_open (transport));
-  error = NULL;
-  assert (! klass->peek (transport, &error));
-  error = NULL;
-  assert (! klass->open (transport, &error));
-  error = NULL;
-  assert (! klass->close (transport, &error));
-
-  g_object_unref (transport);
-}
-
-static void
-test_read_and_write (void)
-{
-  gchar out_buf[8];
-  gchar *b;
-  gint want, got;
-  ThriftTransport *transport;
-  ThriftTransportClass *klass;
-  GError *error;
-  gint fd;
-  gchar *filename;
-
-  error = NULL;
-  filename = NULL;
-
-  fd = g_file_open_tmp (NULL, &filename, &error);
-  assert (fd >= 0);
-
-  /* write */
-  transport = THRIFT_TRANSPORT (g_object_new (THRIFT_TYPE_FD_TRANSPORT,
-                                              "fd", fd,
-                                              NULL));
-  klass = THRIFT_TRANSPORT_GET_CLASS (transport);
-  assert (klass->is_open (transport));
-  assert (klass->write (transport, (gpointer) TEST_DATA, 11, &error));
-  assert (klass->flush (transport, &error));
-  assert (klass->close (transport, &error));
-  g_object_unref (transport);
-
-  /* read */
-  fd = open(filename, O_RDONLY, S_IRUSR | S_IWUSR);
-  assert (fd >= 0);
-
-  transport = THRIFT_TRANSPORT (g_object_new (THRIFT_TYPE_FD_TRANSPORT,
-                                              "fd", fd,
-                                              NULL));
-  klass = THRIFT_TRANSPORT_GET_CLASS (transport);
-
-  memset(out_buf, 0, 8);
-  b = out_buf;
-  want = 7;
-  while (want > 0) {
-    got = klass->read (transport, (gpointer) b, want, &error);
-    assert (got > 0 && got <= want);
-    b += got;
-    want -= got;
-  }
-  assert (memcmp (out_buf, TEST_DATA, 7) == 0);
-
-  memset(out_buf, 0, 8);
-  b = out_buf;
-  want = 4;
-  while (want > 0) {
-    got = klass->read (transport, (gpointer) b, want, &error);
-    assert (got > 0 && got <= want);
-    b += got;
-    want -= got;
-  }
-  assert (memcmp (out_buf, TEST_DATA + 7, 4) == 0);
-
-  assert (klass->close (transport, &error));
-  g_object_unref (transport);
-
-  /* clean up */
-
-  g_remove (filename);
-  g_free (filename);
-}
-
-int
-main (int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testfdtransport/CreateAndDestroy", test_create_and_destroy);
-  g_test_add_func ("/testfdtransport/OpenAndClose", test_open_and_close);
-  g_test_add_func ("/testfdtransport/ReadAndWrite", test_read_and_write);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testframedtransport.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testframedtransport.c
deleted file mode 100755
index d50ff23..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testframedtransport.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <netdb.h>
-#include <sys/wait.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-
-#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
-
-#include "../src/thrift/c_glib/transport/thrift_framed_transport.c"
-
-static void thrift_server (const int port);
-
-/* test object creation and destruction */
-static void
-test_create_and_destroy(void)
-{
-  ThriftTransport *transport = NULL;
-  guint r_buf_size = 0;
-  guint w_buf_size = 0;
-
-  GObject *object = NULL;
-  object = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, NULL);
-  assert (object != NULL);
-  g_object_get (G_OBJECT (object), "transport", &transport,
-                "r_buf_size", &r_buf_size,
-                "w_buf_size", &w_buf_size, NULL);
-  g_object_unref (object);
-}
-
-static void
-test_open_and_close(void)
-{
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  GError *err = NULL;
-
-  /* create a ThriftSocket */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                          "port", 51188, NULL); 
-
-  /* create a BufferedTransport wrapper of the Socket */
-  transport = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT,
-                            "transport", THRIFT_TRANSPORT (tsocket), NULL);
-
-  /* this shouldn't work */
-  assert (thrift_framed_transport_open (transport, NULL) == FALSE);
-  assert (thrift_framed_transport_is_open (transport) == TRUE);
-  assert (thrift_framed_transport_close (transport, NULL) == TRUE);
-  g_object_unref (transport);
-  g_object_unref (tsocket);
-
-  /* try and underlying socket failure */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost.broken",
-                          NULL);
-
-  /* create a BufferedTransport wrapper of the Socket */
-  transport = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT,
-                            "transport", THRIFT_TRANSPORT (tsocket), NULL);
-
-  assert (thrift_framed_transport_open (transport, &err) == FALSE);
-  g_object_unref (transport);
-  g_object_unref (tsocket);
-  g_error_free (err);
-  err = NULL;
-}
-
-static void
-test_read_and_write(void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  int port = 51199;
-  guchar buf[10] = TEST_DATA; /* a buffer */
-
-  pid = fork ();
-  assert ( pid >= 0 );
-
-  if ( pid == 0 )
-  {
-    /* child listens */
-    thrift_server (port);
-    exit (0);
-  } else {
-    /* parent connects, wait a bit for the socket to be created */
-    sleep (1);
-
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    transport = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT,
-                              "transport", THRIFT_TRANSPORT (tsocket),
-                              "w_buf_size", 4, NULL);
-
-    assert (thrift_framed_transport_open (transport, NULL) == TRUE);
-    assert (thrift_framed_transport_is_open (transport));
-
-    /* write 10 bytes */
-    thrift_framed_transport_write (transport, buf, 10, NULL);
-    thrift_framed_transport_flush (transport, NULL);
-
-    thrift_framed_transport_write (transport, buf, 1, NULL);
-    thrift_framed_transport_flush (transport, NULL);
-
-    thrift_framed_transport_write (transport, buf, 10, NULL);
-    thrift_framed_transport_flush (transport, NULL);
-
-    thrift_framed_transport_write (transport, buf, 10, NULL);
-    thrift_framed_transport_flush (transport, NULL);
-
-    thrift_framed_transport_write_end (transport, NULL);
-    thrift_framed_transport_flush (transport, NULL);
-    thrift_framed_transport_close (transport, NULL);
-
-    g_object_unref (transport);
-    g_object_unref (tsocket);
-
-    assert ( wait (&status) == pid );
-    assert ( status == 0 );
-  }
-}
-
-/* test reading from the transport after the peer has unexpectedly
-   closed the connection */
-static void
-test_read_after_peer_close(void)
-{
-  int status;
-  pid_t pid;
-  int port = 51199;
-  GError *err = NULL;
-
-  pid = fork ();
-  g_assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    ThriftServerTransport *server_transport = NULL;
-    ThriftTransport *client_transport = NULL;
-
-    /* child listens */
-    server_transport = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                     "port", port,
-                                     NULL);
-    g_assert (server_transport != NULL);
-
-    thrift_server_transport_listen (server_transport, &err);
-    g_assert (err == NULL);
-
-    /* wrap the client transport in a ThriftFramedTransport */
-    client_transport = g_object_new
-      (THRIFT_TYPE_FRAMED_TRANSPORT,
-       "transport",  thrift_server_transport_accept (server_transport, &err),
-       "r_buf_size", 0,
-       NULL);
-    g_assert (err == NULL);
-    g_assert (client_transport != NULL);
-
-    /* close the connection immediately after the client connects */
-    thrift_transport_close (client_transport, NULL);
-
-    g_object_unref (client_transport);
-    g_object_unref (server_transport);
-
-    exit (0);
-  } else {
-    ThriftSocket *tsocket = NULL;
-    ThriftTransport *transport = NULL;
-    guchar buf[10]; /* a buffer */
-
-    /* parent connects, wait a bit for the socket to be created */
-    sleep (1);
-
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET,
-                            "hostname", "localhost",
-                            "port",     port,
-                            NULL);
-    transport = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT,
-                              "transport",  THRIFT_TRANSPORT (tsocket),
-                              "w_buf_size", 0,
-                              NULL);
-
-    g_assert (thrift_transport_open (transport, NULL) == TRUE);
-    g_assert (thrift_transport_is_open (transport));
-
-    /* attempting to read from the transport after the peer has closed
-       the connection fails gracefully without generating a critical
-       warning or segmentation fault */
-    thrift_transport_read (transport, buf, 10, &err);
-    g_assert (err != NULL);
-
-    g_error_free (err);
-    err = NULL;
-
-    thrift_transport_read_end (transport, &err);
-    g_assert (err == NULL);
-
-    thrift_transport_close (transport, &err);
-    g_assert (err == NULL);
-
-    g_object_unref (transport);
-    g_object_unref (tsocket);
-
-    g_assert (wait (&status) == pid);
-    g_assert (status == 0);
-  }
-}
-
-static void
-thrift_server (const int port)
-{
-  int bytes = 0;
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  guchar buf[12]; /* a buffer */
-  guchar match[10] = TEST_DATA;
-
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
-
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-
-  /* wrap the client in a BufferedTransport */
-  client = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport",
-                         thrift_server_transport_accept (transport, NULL),
-                         "r_buf_size", 5, NULL);
-  assert (client != NULL);
-
-  /* read 10 bytes */
-  bytes = thrift_framed_transport_read (client, buf, 10, NULL);
-  assert (bytes == 10); /* make sure we've read 10 bytes */
-  assert ( memcmp (buf, match, 10) == 0 ); /* make sure what we got matches */
-
-  bytes = thrift_framed_transport_read (client, buf, 6, NULL);
-  bytes = thrift_framed_transport_read (client, buf, 5, NULL);
-  bytes = thrift_framed_transport_read (client, buf, 1, NULL);
-
-  bytes = thrift_framed_transport_read (client, buf, 12, NULL);
-
-  thrift_framed_transport_read_end (client, NULL);
-  thrift_framed_transport_close (client, NULL);
-  g_object_unref (client);
-  g_object_unref (tsocket);
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testframedtransport/CreateAndDestroy", test_create_and_destroy);
-  g_test_add_func ("/testframedtransport/OpenAndClose", test_open_and_close);
-  g_test_add_func ("/testframedtransport/ReadAndWrite", test_read_and_write);
-  g_test_add_func ("/testframedtransport/ReadAfterPeerClose", test_read_after_peer_close);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testmemorybuffer.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testmemorybuffer.c
deleted file mode 100755
index 2ad8c0f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testmemorybuffer.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <netdb.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-
-static const gchar TEST_DATA[11] = "abcdefghij";
-
-#include "../src/thrift/c_glib/transport/thrift_memory_buffer.c"
-
-/* test object creation and destruction */
-static void
-test_create_and_destroy (void)
-{
-  GObject *object = NULL;
-  object = g_object_new (THRIFT_TYPE_MEMORY_BUFFER,
-                         "buf_size", 10,
-                         NULL);
-  assert (object != NULL);
-  g_object_unref (object);
-}
-
-static void
-test_create_and_destroy_large (void)
-{
-  GObject *object = NULL;
-  object = g_object_new (THRIFT_TYPE_MEMORY_BUFFER,
-                         "buf_size", 10 * 1024 * 1024,
-                         NULL);
-  assert (object != NULL);
-  g_object_unref (object);
-}
-
-static void
-test_create_and_destroy_default (void)
-{
-  GObject *object = NULL;
-  object = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, NULL);
-  assert (object != NULL);
-  g_object_unref (object);
-}
-
-static void
-test_create_and_destroy_external (void)
-{
-  GObject *object = NULL;
-  GByteArray *buf = g_byte_array_new ();
-  assert (buf != NULL);
-  object = g_object_new (THRIFT_TYPE_MEMORY_BUFFER,
-                         "buf", buf,
-                         NULL);
-  assert (object != NULL);
-  g_object_unref (object);
-}
-
-static void
-test_create_and_destroy_unowned (void)
-{
-  GObject *object = NULL;
-  GValue val = G_VALUE_INIT;
-  GByteArray *buf;
-
-  object = g_object_new (THRIFT_TYPE_MEMORY_BUFFER,
-                         "owner", FALSE,
-                         NULL);
-  assert (object != NULL);
-
-  g_value_init (&val, G_TYPE_POINTER);
-  g_object_get_property (object, "buf", &val);
-  buf = (GByteArray*) g_value_get_pointer (&val);
-  assert (buf != NULL);
-
-  g_byte_array_unref (buf);
-  g_value_unset (&val);
-  g_object_unref (object);
-}
-
-static void
-test_open_and_close (void)
-{
-  ThriftMemoryBuffer *tbuffer = NULL;
-
-  /* create a ThriftMemoryBuffer */
-  tbuffer = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, NULL);
-
-  /* no-ops */
-  assert (thrift_memory_buffer_open (THRIFT_TRANSPORT (tbuffer), NULL) == TRUE);
-  assert (thrift_memory_buffer_is_open (THRIFT_TRANSPORT (tbuffer)) == TRUE);
-  assert (thrift_memory_buffer_close (THRIFT_TRANSPORT (tbuffer), NULL) == TRUE);
-
-  g_object_unref (tbuffer);
-}
-
-static void
-test_read_and_write (void)
-{
-  ThriftMemoryBuffer *tbuffer = NULL;
-  gint got, want;
-  gchar read[10];
-  gchar *b;
-  GError *error = NULL;
-
-  tbuffer = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, "buf_size", 5, NULL);
-  assert (thrift_memory_buffer_write (THRIFT_TRANSPORT (tbuffer),
-                                      (gpointer) TEST_DATA,
-                                      10, &error) == FALSE);
-  assert (error != NULL);
-  g_error_free (error);
-  error = NULL;
-  g_object_unref (tbuffer);
-
-  tbuffer = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, "buf_size", 15, NULL);
-  assert (thrift_memory_buffer_write (THRIFT_TRANSPORT (tbuffer),
-                                      (gpointer) TEST_DATA, 10, &error) == TRUE);
-  assert (error == NULL);
-
-  memset(read, 0, 10);
-  b = read;
-  want = 10;
-  while (want > 0) {
-    got = thrift_memory_buffer_read (THRIFT_TRANSPORT (tbuffer),
-                                     (gpointer) b, want, &error);
-    assert (got > 0 && got <= want);
-    assert (error == NULL);
-    b += got;
-    want -= got;
-  }
-  assert (memcmp (read, TEST_DATA, 10) == 0);
-  g_object_unref (tbuffer);
-}
-
-static void
-test_read_and_write_default (void)
-{
-  ThriftMemoryBuffer *tbuffer = NULL;
-  gint got, want, i;
-  gchar read[10];
-  gchar *b;
-  GError *error = NULL;
-
-  tbuffer = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, NULL);
-  for (i = 0; i < 100; ++i) {
-    assert (thrift_memory_buffer_write (THRIFT_TRANSPORT (tbuffer),
-                                        (gpointer) TEST_DATA, 10, &error) == TRUE);
-    assert (error == NULL);
-  }
-
-  for (i = 0; i < 100; ++i) {
-    memset(read, 0, 10);
-    b = read;
-    want = 10;
-    while (want > 0) {
-      got = thrift_memory_buffer_read (THRIFT_TRANSPORT (tbuffer),
-                                       (gpointer) b, want, &error);
-      assert (got > 0 && got <= want);
-      assert (error == NULL);
-      b += got;
-      want -= got;
-    }
-    assert (memcmp (read, TEST_DATA, 10) == 0);
-  }
-  g_object_unref (tbuffer);
-}
-
-static void
-test_read_and_write_external (void)
-{
-  ThriftMemoryBuffer *tbuffer = NULL;
-  gchar *b;
-  GError *error = NULL;
-  GByteArray *buf = g_byte_array_new ();
-  assert (buf != NULL);
-
-  tbuffer = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, "buf", buf, NULL);
-  assert (thrift_memory_buffer_write (THRIFT_TRANSPORT (tbuffer),
-                                      (gpointer) TEST_DATA, 10, &error) == TRUE);
-  assert (error == NULL);
-
-  assert (memcmp (buf->data, TEST_DATA, 10) == 0);
-  g_object_unref (tbuffer);
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testmemorybuffer/CreateAndDestroy", test_create_and_destroy);
-  g_test_add_func ("/testmemorybuffer/CreateAndDestroyLarge", test_create_and_destroy_large);
-  g_test_add_func ("/testmemorybuffer/CreateAndDestroyUnlimited", test_create_and_destroy_default);
-  g_test_add_func ("/testmemorybuffer/CreateAndDestroyExternal", test_create_and_destroy_external);
-  g_test_add_func ("/testmemorybuffer/CreateAndDestroyUnowned", test_create_and_destroy_unowned);
-  g_test_add_func ("/testmemorybuffer/OpenAndClose", test_open_and_close);
-  g_test_add_func ("/testmemorybuffer/ReadAndWrite", test_read_and_write);
-  g_test_add_func ("/testmemorybuffer/ReadAndWriteUnlimited", test_read_and_write_default);
-  g_test_add_func ("/testmemorybuffer/ReadAndWriteExternal", test_read_and_write_external);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testoptionalrequired.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testoptionalrequired.c
deleted file mode 100755
index 818343c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testoptionalrequired.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <glib.h>
-
-#include <thrift/c_glib/thrift_struct.h>
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-#include <thrift/c_glib/transport/thrift_memory_buffer.h>
-#include "gen-c_glib/t_test_optional_required_test_types.h"
-
-#include "gen-c_glib/t_test_optional_required_test_types.c"
-
-static void
-write_to_read (ThriftStruct *w, ThriftStruct *r, GError **write_error,
-               GError **read_error)
-{
-  ThriftMemoryBuffer *tbuffer = NULL;
-  ThriftProtocol *protocol = NULL;
-
-  tbuffer = g_object_new (THRIFT_TYPE_MEMORY_BUFFER, NULL);
-  protocol = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
-                           tbuffer, NULL);
-
-  thrift_struct_write (w, protocol, write_error);
-  thrift_struct_read (r, protocol, read_error);
-
-  g_object_unref (protocol);
-  g_object_unref (tbuffer);
-}
-
-static void
-test_old_school1 (void)
-{
-  TTestOldSchool *o = NULL;
-
-  o = g_object_new (T_TEST_TYPE_OLD_SCHOOL, NULL);
-  o->im_int = 10;
-  o->im_str = g_strdup ("test");
-  o->im_big = g_ptr_array_new ();
-  g_ptr_array_free (o->im_big, TRUE);
-  o->im_big = NULL;
-  g_free (o->im_str);
-  o->im_str = NULL;
-  g_object_unref (o);
-}
-
-/**
- * Write to read with optional fields
- */
-static void
-test_simple (void)
-{
-  TTestSimple *s1 = NULL, *s2 = NULL, *s3 = NULL;
-
-  s1 = g_object_new (T_TEST_TYPE_SIMPLE, NULL);
-  s2 = g_object_new (T_TEST_TYPE_SIMPLE, NULL);
-  s3 = g_object_new (T_TEST_TYPE_SIMPLE, NULL);
-
-  /* write-to-read with optional fields */
-  s1->im_optional = 10;
-  assert (s1->__isset_im_default == FALSE);
-  assert (s1->__isset_im_optional == FALSE);  
-  write_to_read (THRIFT_STRUCT (s1), THRIFT_STRUCT (s2), NULL, NULL);
-  assert (s2->__isset_im_default == TRUE);
-  assert (s2->__isset_im_optional == FALSE);
-  assert (s2->im_optional == 0);
-
-  s1->__isset_im_optional = TRUE;
-  write_to_read (THRIFT_STRUCT (s1), THRIFT_STRUCT (s3), NULL, NULL);
-  assert (s3->__isset_im_default == TRUE);
-  assert (s3->__isset_im_optional == TRUE);
-  assert (s3->im_optional == 10);
-
-  g_object_unref (s1);
-  g_object_unref (s2);
-}
-
-/**
- * Writing between optional and default
- */
-static void
-test_tricky1 (void)
-{
-  TTestTricky1 *t1 = NULL;
-  TTestTricky2 *t2 = NULL;
-
-  t1 = g_object_new (T_TEST_TYPE_TRICKY1, NULL);
-  t2 = g_object_new (T_TEST_TYPE_TRICKY2, NULL);
-
-  t2->im_optional = 10;
-  write_to_read (THRIFT_STRUCT (t2), THRIFT_STRUCT (t1), NULL, NULL);
-  write_to_read (THRIFT_STRUCT (t1), THRIFT_STRUCT (t2), NULL, NULL);
-
-  assert (t1->__isset_im_default == FALSE);
-  assert (t2->__isset_im_optional == TRUE);
-  assert (t1->im_default == t2->im_optional);
-  assert (t1->im_default == 0);
-
-  g_object_unref (t1);
-  g_object_unref (t2);
-}
-
-/**
- * Writing between default and required.
- */
-static void
-test_tricky2 (void)
-{
-  TTestTricky1 *t1 = NULL;
-  TTestTricky3 *t3 = NULL;
-
-  t1 = g_object_new (T_TEST_TYPE_TRICKY1, NULL);
-  t3 = g_object_new (T_TEST_TYPE_TRICKY3, NULL);
-
-  write_to_read (THRIFT_STRUCT (t1), THRIFT_STRUCT (t3), NULL, NULL);
-  write_to_read (THRIFT_STRUCT (t3), THRIFT_STRUCT (t1), NULL, NULL);
-
-  assert (t1->__isset_im_default == TRUE);
-
-  g_object_unref (t1);
-  g_object_unref (t3);
-}
-
-/**
- * Writing between optional and required.
- */
-static void
-test_tricky3 (void)
-{
-  TTestTricky2 *t2 = NULL;
-  TTestTricky3 *t3 = NULL;
-
-  t2 = g_object_new (T_TEST_TYPE_TRICKY2, NULL);
-  t3 = g_object_new (T_TEST_TYPE_TRICKY3, NULL);
-
-  t2->__isset_im_optional = TRUE;
-
-  write_to_read (THRIFT_STRUCT (t2), THRIFT_STRUCT (t3), NULL, NULL);
-  write_to_read (THRIFT_STRUCT (t3), THRIFT_STRUCT (t2), NULL, NULL);
-
-  g_object_unref (t2);
-  g_object_unref (t3);
-}
-
-/**
- * Catch an optional not set exception.  To quote the
- * C++ test, "Mu-hu-ha-ha-ha!"
- */
-static void
-test_tricky4 (void)
-{
-  TTestTricky2 *t2 = NULL;
-  TTestTricky3 *t3 = NULL;
-  GError *read_error = NULL;
-
-  t2 = g_object_new (T_TEST_TYPE_TRICKY2, NULL);
-  t3 = g_object_new (T_TEST_TYPE_TRICKY3, NULL);
-
-  /* throws protocol exception */
-  write_to_read (THRIFT_STRUCT (t2), THRIFT_STRUCT (t3), NULL, &read_error);
-  assert (read_error != NULL);
-  g_error_free (read_error);
-
-  write_to_read (THRIFT_STRUCT (t3), THRIFT_STRUCT (t2), NULL, NULL);
-
-  assert (t2->__isset_im_optional);
-
-  g_object_unref (t2);
-  g_object_unref (t3);
-}
-
-static void
-test_non_set_binary (void)
-{
-  TTestBinaries *b1 = NULL;
-  TTestBinaries *b2 = NULL;
-  GError *error = NULL;
-
-  b1 = g_object_new (T_TEST_TYPE_BINARIES, NULL);
-  b2 = g_object_new (T_TEST_TYPE_BINARIES, NULL);
-
-  write_to_read (THRIFT_STRUCT (b1), THRIFT_STRUCT (b2), NULL, &error);
-  g_assert(!error);
-  write_to_read (THRIFT_STRUCT (b2), THRIFT_STRUCT (b1), NULL, &error);
-  g_assert(!error);
-  /* OK. No segfault */
-
-  g_object_unref (b1);
-  g_object_unref (b2);
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testoptionalrequired/OldSchool", test_old_school1);
-  g_test_add_func ("/testoptionalrequired/Simple", test_simple);
-  g_test_add_func ("/testoptionalrequired/Tricky1", test_tricky1);
-  g_test_add_func ("/testoptionalrequired/Tricky2", test_tricky2);
-  g_test_add_func ("/testoptionalrequired/Tricky3", test_tricky3);
-  g_test_add_func ("/testoptionalrequired/Tricky4", test_tricky4);
-  g_test_add_func ("/testoptionalrequired/Binary", test_non_set_binary);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testserialization.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testserialization.c
deleted file mode 100644
index 67d411d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testserialization.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/transport/thrift_memory_buffer.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include "gen-c_glib/t_test_debug_proto_test_types.h"
-#include "gen-c_glib/t_test_enum_test_types.h"
-
-static void enum_constants_read_write() {
-  GError* error = NULL;
-  ThriftTransport* transport
-      = THRIFT_TRANSPORT(g_object_new(THRIFT_TYPE_MEMORY_BUFFER, "buf_size", 1024, NULL));
-  ThriftProtocol* protocol
-      = THRIFT_PROTOCOL(g_object_new(THRIFT_TYPE_BINARY_PROTOCOL, "transport", transport, NULL));
-  TTestEnumTestStruct* src = T_TEST_ENUM_TEST;
-  TTestEnumTestStruct* dst = g_object_new(T_TEST_TYPE_ENUM_TEST_STRUCT, NULL);
-  TTestEnumTestStructClass* cls = T_TEST_ENUM_TEST_STRUCT_GET_CLASS(src);
-  int write_len;
-  int read_len;
-
-  write_len = THRIFT_STRUCT_CLASS(cls)->write(THRIFT_STRUCT(src), protocol, &error);
-  g_assert(!error);
-  g_assert(write_len > 0);
-
-  read_len = THRIFT_STRUCT_CLASS(cls)->read(THRIFT_STRUCT(dst), protocol, &error);
-  g_assert(!error);
-  g_assert_cmpint(write_len, ==, read_len);
-
-  g_object_unref(dst);
-  g_object_unref(protocol);
-  g_object_unref(transport);
-}
-
-static void struct_constants_read_write() {
-  GError* error = NULL;
-  ThriftTransport* transport
-      = THRIFT_TRANSPORT(g_object_new(THRIFT_TYPE_MEMORY_BUFFER, "buf_size", 4096, NULL));
-  ThriftProtocol* protocol
-      = THRIFT_PROTOCOL(g_object_new(THRIFT_TYPE_BINARY_PROTOCOL, "transport", transport, NULL));
-  TTestCompactProtoTestStruct* src = T_TEST_COMPACT_TEST;
-  TTestCompactProtoTestStruct* dst = g_object_new(T_TEST_TYPE_COMPACT_PROTO_TEST_STRUCT, NULL);
-  TTestCompactProtoTestStructClass* cls = T_TEST_COMPACT_PROTO_TEST_STRUCT_GET_CLASS(src);
-  int write_len;
-  int read_len;
-
-  write_len = THRIFT_STRUCT_CLASS(cls)->write(THRIFT_STRUCT(src), protocol, &error);
-  g_assert(!error);
-  g_assert(write_len > 0);
-
-  read_len = THRIFT_STRUCT_CLASS(cls)->read(THRIFT_STRUCT(dst), protocol, &error);
-  g_assert(!error);
-  g_assert_cmpint(write_len, ==, read_len);
-
-  g_object_unref(dst);
-  g_object_unref(protocol);
-  g_object_unref(transport);
-}
-
-static void struct_read_write_length_should_equal() {
-  GError* error = NULL;
-  ThriftTransport* transport
-      = THRIFT_TRANSPORT(g_object_new(THRIFT_TYPE_MEMORY_BUFFER, "buf_size", 2048, NULL));
-  ThriftProtocol* protocol
-      = THRIFT_PROTOCOL(g_object_new(THRIFT_TYPE_BINARY_PROTOCOL, "transport", transport, NULL));
-  TTestBonk* src = g_object_new(T_TEST_TYPE_BONK, NULL);
-  TTestBonk* dst = g_object_new(T_TEST_TYPE_BONK, NULL);
-  TTestBonkClass* cls = T_TEST_BONK_GET_CLASS(src);
-  int write_len;
-  int read_len;
-
-  write_len = THRIFT_STRUCT_CLASS(cls)->write(THRIFT_STRUCT(src), protocol, &error);
-  g_assert(!error);
-  g_assert(write_len > 0);
-
-  read_len = THRIFT_STRUCT_CLASS(cls)->read(THRIFT_STRUCT(dst), protocol, &error);
-  g_assert(!error);
-  g_assert_cmpint(write_len, ==, read_len);
-
-  g_object_unref(dst);
-  g_object_unref(src);
-  g_object_unref(protocol);
-  g_object_unref(transport);
-}
-
-int main(int argc, char* argv[]) {
-#if (!GLIB_CHECK_VERSION(2, 36, 0))
-  g_type_init();
-#endif
-  g_test_init(&argc, &argv, NULL);
-
-  g_test_add_func("/testserialization/StructReadWriteLengthShouldEqual",
-                  struct_read_write_length_should_equal);
-  g_test_add_func("/testserialization/StructConstants", struct_constants_read_write);
-  g_test_add_func("/testserialization/EnumConstants", enum_constants_read_write);
-  return g_test_run();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testsimpleserver.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testsimpleserver.c
deleted file mode 100755
index 3af2eeb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testsimpleserver.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <glib.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/processor/thrift_processor.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-
-#define TEST_PORT 51199
-
-#include <thrift/c_glib/server/thrift_simple_server.c>
-
-/* create a rudimentary processor */
-#define TEST_PROCESSOR_TYPE (test_processor_get_type ())
-
-struct _TestProcessor
-{
-  ThriftProcessor parent;
-};
-typedef struct _TestProcessor TestProcessor;
-
-struct _TestProcessorClass
-{
-  ThriftProcessorClass parent;
-};
-typedef struct _TestProcessorClass TestProcessorClass;
-
-G_DEFINE_TYPE(TestProcessor, test_processor, THRIFT_TYPE_PROCESSOR)
-
-gboolean
-test_processor_process (ThriftProcessor *processor, ThriftProtocol *in,
-                        ThriftProtocol *out, GError **error)
-{
-  THRIFT_UNUSED_VAR (processor);
-  THRIFT_UNUSED_VAR (in);
-  THRIFT_UNUSED_VAR (out);
-  THRIFT_UNUSED_VAR (error);
-
-  return FALSE;
-}
-
-static void
-test_processor_init (TestProcessor *p)
-{
-  THRIFT_UNUSED_VAR (p);
-}
-
-static void
-test_processor_class_init (TestProcessorClass *proc)
-{
-  (THRIFT_PROCESSOR_CLASS(proc))->process = test_processor_process;
-}
-
-static void
-test_server (void)
-{
-  int status;
-  pid_t pid;
-  TestProcessor *p = NULL;
-  ThriftServerSocket *tss = NULL;
-  ThriftSimpleServer *ss = NULL;
-
-  p = g_object_new (TEST_PROCESSOR_TYPE, NULL);
-  tss = g_object_new (THRIFT_TYPE_SERVER_SOCKET, "port", TEST_PORT, NULL);
-  ss = g_object_new (THRIFT_TYPE_SIMPLE_SERVER, "processor", p,
-                     "server_transport", THRIFT_SERVER_TRANSPORT (tss), NULL);
-
-  /* run the server in a child process */
-  pid = fork ();
-  assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    THRIFT_SERVER_GET_CLASS (THRIFT_SERVER (ss))->serve (THRIFT_SERVER (ss),
-                                                         NULL);
-    exit (0);
-  } else {
-    sleep (5);
-    kill (pid, SIGINT);
-
-    g_object_unref (ss);
-    g_object_unref (tss);
-    g_object_unref (p);
-    assert (wait (&status) == pid);
-    assert (status == SIGINT);
-  }
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testsimpleserver/SimpleServer", test_server);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/teststruct.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/teststruct.c
deleted file mode 100755
index 5d4baf3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/teststruct.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <glib-object.h>
-
-#include "../src/thrift/c_glib/thrift_struct.c"
-
-/* tests to ensure we can extend a ThriftStruct */
-
-struct _ThriftTestStruct
-{
-  ThriftStruct parent;
-};
-typedef struct _ThriftTestStruct ThriftTestStruct;
-
-struct _ThriftTestStructClass
-{
-  ThriftStructClass parent;
-};
-typedef struct _ThriftTestStructClass ThriftTestStructClass;
-
-GType thrift_test_struct_get_type (void);
-
-#define THRIFT_TYPE_TEST_STRUCT (thrift_test_struct_get_type ())
-#define THRIFT_TEST_STRUCT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THRIFT_TYPE_TEST_STRUCT, ThriftTestStruct))
-#define THRIFT_TEST_STRUCT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), THRIFT_TYPE_TEST_STRUCT, ThriftTestStructClass))
-#define THRIFT_IS_TEST_STRUCT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THRIFT_TYPE_TEST_STRUCT))
-#define THRIFT_IS_TEST_STRUCT_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), THRIFT_TYPE_TEST_STRUCT))
-#define THRIFT_TEST_STRUCT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THRIFT_TYPE_TEST_STRUCT, ThriftTestStructClass))
-
-G_DEFINE_TYPE(ThriftTestStruct, thrift_test_struct, THRIFT_TYPE_STRUCT)
-
-gint32
-thrift_test_struct_read (ThriftStruct *object, ThriftProtocol *protocol,
-                         GError **error)
-{
-  THRIFT_UNUSED_VAR (object);
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-
-  return 0;
-}
-
-gint32
-thrift_test_struct_write (ThriftStruct *object, ThriftProtocol *protocol,
-                          GError **error)
-{
-  THRIFT_UNUSED_VAR (object);
-  THRIFT_UNUSED_VAR (protocol);
-  THRIFT_UNUSED_VAR (error);
-
-  return 0;
-}
-
-static void
-thrift_test_struct_class_init (ThriftTestStructClass *cls)
-{
-  ThriftStructClass *ts_cls = THRIFT_STRUCT_CLASS (cls);
-  ts_cls->read = thrift_test_struct_read;
-  ts_cls->write = thrift_test_struct_write;
-}
-
-static void
-thrift_test_struct_init (ThriftTestStruct *s)
-{
-  THRIFT_UNUSED_VAR (s);
-}
-
-static void
-test_initialize_object (void)
-{
-  ThriftTestStruct *t = NULL;
-
-  t = g_object_new (THRIFT_TYPE_TEST_STRUCT, NULL);
-  assert ( THRIFT_IS_STRUCT (t));
-  thrift_struct_read (THRIFT_STRUCT (t), NULL, NULL);
-  thrift_struct_write (THRIFT_STRUCT (t), NULL, NULL);
-  thrift_test_struct_read (THRIFT_STRUCT (t), NULL, NULL);
-  thrift_test_struct_write (THRIFT_STRUCT (t), NULL, NULL);
-  g_object_unref (t);
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/teststruct/InitializeObject", test_initialize_object);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testthrifttest.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testthrifttest.c
deleted file mode 100755
index 0211f53..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testthrifttest.c
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <assert.h>
-#include <netdb.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-
-#include "t_test_thrift_test_types.h"
-#include "thrift_test_handler.h"
-
-static const char TEST_ADDRESS[] = "localhost";
-static const int TEST_PORT = 64444;
-
-static void
-test_thrift_server (void)
-{
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", TEST_PORT, NULL);
-
-  g_object_unref (tsocket);
-}
-
-static void
-set_indicator (gpointer data, GObject *where_the_object_was) {
-  THRIFT_UNUSED_VAR(where_the_object_was);
-
-  *(gboolean *) data = TRUE;
-}
-
-static void
-test_thrift_handler (void)
-{
-  GError *error;
-  GHashTable *_return;
-  TTestInsanity *argument;
-  gboolean indicator;
-
-  TTestXtruct  *xtruct,  *xtruct2;
-  TTestNumberz numberz;
-  TTestNumberz numberz2;
-  TTestUserId user_id, *user_id_ptr, *user_id_ptr2;
-  GHashTable *user_map;
-  GPtrArray *xtructs;
-
-  error = NULL;
-  indicator = FALSE;
-
-  user_map = NULL;
-  xtructs = NULL;
-
-  argument = g_object_new (T_TEST_TYPE_INSANITY, NULL);
-  g_object_get (argument,
-                "userMap", &user_map,
-                "xtructs", &xtructs,
-                NULL);
-
-  numberz = T_TEST_NUMBERZ_FIVE;
-  numberz2 = T_TEST_NUMBERZ_EIGHT;
-  user_id_ptr = g_malloc (sizeof *user_id_ptr);
-  *user_id_ptr = 5;
-  user_id_ptr2 = g_malloc (sizeof *user_id_ptr);
-  *user_id_ptr2 = 8;
-  g_hash_table_insert (user_map, (gpointer)numberz, user_id_ptr);
-  g_hash_table_insert (user_map, (gpointer)numberz2, user_id_ptr2);
-  g_hash_table_unref (user_map);
-
-  xtruct = g_object_new (T_TEST_TYPE_XTRUCT,
-                         "string_thing", "Hello2",
-                         "byte_thing",   2,
-                         "i32_thing",    2,
-                         "i64_thing",    2LL,
-                         NULL);
-  xtruct2 = g_object_new (T_TEST_TYPE_XTRUCT,
-                          "string_thing", "Goodbye4",
-                          "byte_thing",   4,
-                          "i32_thing",    4,
-                          "i64_thing",    4LL,
-                          NULL);
-  g_ptr_array_add (xtructs, xtruct2);
-  g_ptr_array_add (xtructs, xtruct);
-  g_ptr_array_unref (xtructs);
-
-  _return = g_hash_table_new_full (g_int64_hash,
-                                   g_int64_equal,
-                                   g_free,
-                                   (GDestroyNotify)g_hash_table_unref);
-
-  g_object_weak_ref (G_OBJECT (argument), set_indicator, (gpointer) &indicator);
-
-  assert (thrift_test_handler_test_insanity (NULL, &_return, argument, &error));
-  assert (! indicator);
-
-  g_hash_table_unref (_return);
-  assert (! indicator);
-
-  g_object_unref (argument);
-  assert (indicator);
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testthrift/Server", test_thrift_server);
-  g_test_add_func ("/testthrift/Handler", test_thrift_handler);
-
-  return g_test_run ();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testthrifttestclient.cpp b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testthrifttestclient.cpp
deleted file mode 100755
index 7681cf5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testthrifttestclient.cpp
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* test a C client with a C++ server */
-
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TDebugProtocol.h>
-#include <thrift/server/TSimpleServer.h>
-#include <thrift/transport/TServerSocket.h>
-#include "ThriftTest.h"
-#include "ThriftTest_types.h"
-
-#include <iostream>
-
-using namespace std;
-using namespace boost;
-
-using namespace apache::thrift;
-using namespace apache::thrift::concurrency;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::server;
-
-using namespace thrift::test;
-
-#define TEST_PORT 9980
-
-// Extra functions required for ThriftTest_types to work
-namespace thrift { namespace test {
-
-bool Insanity::operator<(thrift::test::Insanity const& other) const {
-  using apache::thrift::ThriftDebugString;
-  return ThriftDebugString(*this) < ThriftDebugString(other);
-}
-
-}}
-
-class TestHandler : public ThriftTestIf {
-  public:
-  TestHandler() {}
-
-  void testVoid() {
-    cout << "[C -> C++] testVoid()" << endl;
-  }
-
-  void testString(string& out, const string &thing) {
-    cout << "[C -> C++] testString(\"" << thing << "\")" << endl;
-    out = thing;
-  }
-
-  bool testBool(const bool thing) {
-    cout << "[C -> C++] testBool(" << (thing ? "true" : "false") << ")" << endl;
-    return thing;
-  }
-  int8_t testByte(const int8_t thing) {
-    cout << "[C -> C++] testByte(" << (int)thing << ")" << endl;
-    return thing;
-  }
-  int32_t testI32(const int32_t thing) {
-    cout << "[C -> C++] testI32(" << thing << ")" << endl;
-    return thing;
-  }
-
-  int64_t testI64(const int64_t thing) {
-    cout << "[C -> C++] testI64(" << thing << ")" << endl;
-    return thing;
-  }
-
-  double testDouble(const double thing) {
-    cout.precision(6);
-    cout << "[C -> C++] testDouble(" << fixed << thing << ")" << endl;
-    return thing;
-  }
-
-  void testBinary(string& out, const string &thing) {
-    cout << "[C -> C++] testBinary(\"" << thing << "\")" << endl;
-    out = thing;
-  }
-
-  void testStruct(Xtruct& out, const Xtruct &thing) {
-    cout << "[C -> C++] testStruct({\"" << thing.string_thing << "\", " << (int)thing.byte_thing << ", " << thing.i32_thing << ", " << thing.i64_thing << "})" << endl;
-    out = thing;
-  }
-
-  void testNest(Xtruct2& out, const Xtruct2& nest) {
-    const Xtruct &thing = nest.struct_thing;
-    cout << "[C -> C++] testNest({" << (int)nest.byte_thing << ", {\"" << thing.string_thing << "\", " << (int)thing.byte_thing << ", " << thing.i32_thing << ", " << thing.i64_thing << "}, " << nest.i32_thing << "})" << endl;
-    out = nest;
-  }
-
-  void testMap(map<int32_t, int32_t> &out, const map<int32_t, int32_t> &thing) {
-    cout << "[C -> C++] testMap({";
-    map<int32_t, int32_t>::const_iterator m_iter;
-    bool first = true;
-    for (m_iter = thing.begin(); m_iter != thing.end(); ++m_iter) {
-      if (first) {
-        first = false;
-      } else {
-        cout << ", ";
-      }
-      cout << m_iter->first << " => " << m_iter->second;
-    }
-    cout << "})" << endl;
-    out = thing;
-  }
-
-  void testStringMap(map<std::string, std::string> &out, const map<std::string, std::string> &thing) {
-    cout << "[C -> C++] testStringMap({";
-    map<std::string, std::string>::const_iterator m_iter;
-    bool first = true;
-    for (m_iter = thing.begin(); m_iter != thing.end(); ++m_iter) {
-      if (first) {
-        first = false;
-      } else {
-        cout << ", ";
-      }
-      cout << "\"" << m_iter->first << "\" => \"" << m_iter->second << "\"";
-    }
-    cout << "})" << endl;
-    out = thing;
-  }
-
-
-  void testSet(set<int32_t> &out, const set<int32_t> &thing) {
-    cout << "[C -> C++] testSet({";
-    set<int32_t>::const_iterator s_iter;
-    bool first = true;
-    for (s_iter = thing.begin(); s_iter != thing.end(); ++s_iter) {
-      if (first) {
-        first = false;
-      } else {
-        cout << ", ";
-      }
-      cout << *s_iter;
-    }
-    cout << "})" << endl;
-    out = thing;
-  }
-
-  void testList(vector<int32_t> &out, const vector<int32_t> &thing) {
-    cout << "[C -> C++] testList({";
-    vector<int32_t>::const_iterator l_iter;
-    bool first = true;
-    for (l_iter = thing.begin(); l_iter != thing.end(); ++l_iter) {
-      if (first) {
-        first = false;
-      } else {
-        cout << ", ";
-      }
-      cout << *l_iter;
-    }
-    cout << "})" << endl;
-    out = thing;
-  }
-
-  Numberz::type testEnum(const Numberz::type thing) {
-    cout << "[C -> C++] testEnum(" << thing << ")" << endl;
-    return thing;
-  }
-
-  UserId testTypedef(const UserId thing) {
-    cout << "[C -> C++] testTypedef(" << thing << ")" << endl;
-    return thing;  }
-
-  void testMapMap(map<int32_t, map<int32_t,int32_t> > &mapmap, const int32_t hello) {
-    cout << "[C -> C++] testMapMap(" << hello << ")" << endl;
-
-    map<int32_t,int32_t> pos;
-    map<int32_t,int32_t> neg;
-    for (int i = 1; i < 5; i++) {
-      pos.insert(make_pair(i,i));
-      neg.insert(make_pair(-i,-i));
-    }
-
-    mapmap.insert(make_pair(4, pos));
-    mapmap.insert(make_pair(-4, neg));
-
-  }
-
-  void testInsanity(map<UserId, map<Numberz::type,Insanity> > &insane, const Insanity &argument) {
-    THRIFT_UNUSED_VARIABLE (argument);
-
-    cout << "[C -> C++] testInsanity()" << endl;
-
-    Xtruct hello;
-    hello.string_thing = "Hello2";
-    hello.byte_thing = 2;
-    hello.i32_thing = 2;
-    hello.i64_thing = 2;
-
-    Xtruct goodbye;
-    goodbye.string_thing = "Goodbye4";
-    goodbye.byte_thing = 4;
-    goodbye.i32_thing = 4;
-    goodbye.i64_thing = 4;
-
-    Insanity crazy;
-    crazy.userMap.insert(make_pair(Numberz::EIGHT, 8));
-    crazy.xtructs.push_back(goodbye);
-
-    Insanity looney;
-    crazy.userMap.insert(make_pair(Numberz::FIVE, 5));
-    crazy.xtructs.push_back(hello);
-
-    map<Numberz::type, Insanity> first_map;
-    map<Numberz::type, Insanity> second_map;
-
-    first_map.insert(make_pair(Numberz::TWO, crazy));
-    first_map.insert(make_pair(Numberz::THREE, crazy));
-
-    second_map.insert(make_pair(Numberz::SIX, looney));
-
-    insane.insert(make_pair(1, first_map));
-    insane.insert(make_pair(2, second_map));
-
-    cout << "return = {";
-    map<UserId, map<Numberz::type,Insanity> >::const_iterator i_iter;
-    for (i_iter = insane.begin(); i_iter != insane.end(); ++i_iter) {
-      cout << i_iter->first << " => {";
-      map<Numberz::type,Insanity>::const_iterator i2_iter;
-      for (i2_iter = i_iter->second.begin();
-           i2_iter != i_iter->second.end();
-           ++i2_iter) {
-        cout << i2_iter->first << " => {";
-        map<Numberz::type, UserId> userMap = i2_iter->second.userMap;
-        map<Numberz::type, UserId>::const_iterator um;
-        cout << "{";
-        for (um = userMap.begin(); um != userMap.end(); ++um) {
-          cout << um->first << " => " << um->second << ", ";
-        }
-        cout << "}, ";
-
-        vector<Xtruct> xtructs = i2_iter->second.xtructs;
-        vector<Xtruct>::const_iterator x;
-        cout << "{";
-        for (x = xtructs.begin(); x != xtructs.end(); ++x) {
-          cout << "{\"" << x->string_thing << "\", " << (int)x->byte_thing << ", " << x->i32_thing << ", " << x->i64_thing << "}, ";
-        }
-        cout << "}";
-
-        cout << "}, ";
-      }
-      cout << "}, ";
-    }
-    cout << "}" << endl;
-
-
-  }
-
-  void testMulti(Xtruct &hello, const int8_t arg0, const int32_t arg1, const int64_t arg2, const std::map<int16_t, std::string>  &arg3, const Numberz::type arg4, const UserId arg5) {
-    THRIFT_UNUSED_VARIABLE (arg3);
-    THRIFT_UNUSED_VARIABLE (arg4);
-    THRIFT_UNUSED_VARIABLE (arg5);
-
-    cout << "[C -> C++] testMulti()" << endl;
-
-    hello.string_thing = "Hello2";
-    hello.byte_thing = arg0;
-    hello.i32_thing = arg1;
-    hello.i64_thing = (int64_t)arg2;
-  }
-
-  void testException(const std::string &arg)
-    throw(Xception, apache::thrift::TException)
-  {
-    cout << "[C -> C++] testException(" << arg << ")" << endl;
-    if (arg.compare("Xception") == 0) {
-      Xception e;
-      e.errorCode = 1001;
-      e.message = arg;
-      throw e;
-    } else if (arg.compare("ApplicationException") == 0) {
-      apache::thrift::TException e;
-      throw e;
-    } else {
-      Xtruct result;
-      result.string_thing = arg;
-      return;
-    }
-  }
-
-  void testMultiException(Xtruct &result, const std::string &arg0, const std::string &arg1) throw(Xception, Xception2) {
-
-    cout << "[C -> C++] testMultiException(" << arg0 << ", " << arg1 << ")" << endl;
-
-    if (arg0.compare("Xception") == 0) {
-      Xception e;
-      e.errorCode = 1001;
-      e.message = "This is an Xception";
-      throw e;
-    } else if (arg0.compare("Xception2") == 0) {
-      Xception2 e;
-      e.errorCode = 2002;
-      e.struct_thing.string_thing = "This is an Xception2";
-      throw e;
-    } else {
-      result.string_thing = arg1;
-      return;
-    }
-  }
-
-  void testOneway(int sleepFor) {
-    cout << "testOneway(" << sleepFor << "): Sleeping..." << endl;
-    sleep(sleepFor);
-    cout << "testOneway(" << sleepFor << "): done sleeping!" << endl;
-  }
-};
-
-// C CLIENT
-extern "C" {
-
-#undef THRIFT_SOCKET /* from lib/cpp */
-
-#include "t_test_thrift_test.h"
-#include "t_test_thrift_test_types.h"
-#include <thrift/c_glib/transport/thrift_socket.h>
-#include <thrift/c_glib/protocol/thrift_protocol.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-
-static void
-test_thrift_client (void)
-{
-  ThriftSocket *tsocket = NULL;
-  ThriftBinaryProtocol *protocol = NULL;
-  TTestThriftTestClient *client = NULL;
-  TTestThriftTestIf *iface = NULL;
-  GError *error = NULL;
-  gchar *string = NULL;
-  gint8 byte = 0;
-  gint16 i16 = 0;
-  gint32 i32 = 0, another_i32 = 56789; 
-  gint64 i64 = 0;
-  double dbl = 0.0;
-  TTestXtruct *xtruct_in, *xtruct_out;
-  TTestXtruct2 *xtruct2_in, *xtruct2_out;
-  GHashTable *map_in = NULL, *map_out = NULL;
-  GHashTable *set_in = NULL, *set_out = NULL;
-  GArray *list_in = NULL, *list_out = NULL;
-  TTestNumberz enum_in, enum_out;
-  TTestUserId user_id_in, user_id_out; 
-  GHashTable *insanity_in = NULL;
-  TTestXtruct *xtruct1, *xtruct2;
-  TTestInsanity *insanity_out = NULL;
-  TTestXtruct *multi_in = NULL;
-  GHashTable *multi_map_out = NULL;
-  TTestXception *xception = NULL;
-  TTestXception2 *xception2 = NULL;
-
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  // initialize gobject
-  g_type_init ();
-#endif
-
-  // create a C client
-  tsocket = (ThriftSocket *) g_object_new (THRIFT_TYPE_SOCKET, 
-                          "hostname", "localhost",
-                          "port", TEST_PORT, NULL);
-  protocol = (ThriftBinaryProtocol *) g_object_new (THRIFT_TYPE_BINARY_PROTOCOL,
-                           "transport",
-                           tsocket, NULL);
-  client = (TTestThriftTestClient *) g_object_new (T_TEST_TYPE_THRIFT_TEST_CLIENT, "input_protocol", protocol, "output_protocol", protocol, NULL);
-  iface = T_TEST_THRIFT_TEST_IF (client);
-
-  // open and send
-  thrift_transport_open (THRIFT_TRANSPORT(tsocket), NULL);
-
-  assert (t_test_thrift_test_client_test_void (iface, &error) == TRUE);
-  assert (error == NULL);
-
-  assert (t_test_thrift_test_client_test_string (iface, &string, "test123", &error) == TRUE);
-  assert (strcmp (string, "test123") == 0);
-  g_free (string);
-  assert (error == NULL);
-
-  assert (t_test_thrift_test_client_test_byte (iface, &byte, (gint8) 5, &error) == TRUE);
-  assert (byte == 5);
-  assert (error == NULL);
-
-  assert (t_test_thrift_test_client_test_i32 (iface, &i32, 123, &error) == TRUE);
-  assert (i32 == 123);
-  assert (error == NULL);
-
-  assert (t_test_thrift_test_client_test_i64 (iface, &i64, 12345, &error) == TRUE);
-  assert (i64 == 12345);
-  assert (error == NULL);
-
-  assert (t_test_thrift_test_client_test_double (iface, &dbl, 5.6, &error) == TRUE);
-  assert (dbl == 5.6);
-  assert (error == NULL);
-
-  xtruct_out = (TTestXtruct *) g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-  xtruct_out->byte_thing = 1;
-  xtruct_out->__isset_byte_thing = TRUE;
-  xtruct_out->i32_thing = 15;
-  xtruct_out->__isset_i32_thing = TRUE;
-  xtruct_out->i64_thing = 151;
-  xtruct_out->__isset_i64_thing = TRUE;
-  xtruct_out->string_thing = g_strdup ("abc123");
-  xtruct_out->__isset_string_thing = TRUE;
-  xtruct_in = (TTestXtruct *) g_object_new(T_TEST_TYPE_XTRUCT, NULL);
-  assert (t_test_thrift_test_client_test_struct (iface, &xtruct_in, xtruct_out, &error) == TRUE);
-  assert (error == NULL);
-
-  xtruct2_out = (TTestXtruct2 *) g_object_new (T_TEST_TYPE_XTRUCT2, NULL);
-  xtruct2_out->byte_thing = 1;
-  xtruct2_out->__isset_byte_thing = TRUE;
-  if (xtruct2_out->struct_thing != NULL)
-    g_object_unref(xtruct2_out->struct_thing);
-  xtruct2_out->struct_thing = xtruct_out;
-  xtruct2_out->__isset_struct_thing = TRUE;
-  xtruct2_out->i32_thing = 123;
-  xtruct2_out->__isset_i32_thing = TRUE;
-  xtruct2_in = (TTestXtruct2 *) g_object_new (T_TEST_TYPE_XTRUCT2, NULL);
-  assert (t_test_thrift_test_client_test_nest (iface, &xtruct2_in, xtruct2_out, &error) == TRUE);
-  assert (error == NULL);
-
-  g_object_unref (xtruct2_out);
-  g_object_unref (xtruct2_in);
-  g_object_unref (xtruct_in);
-
-  map_out = g_hash_table_new (NULL, NULL);
-  map_in = g_hash_table_new (NULL, NULL);  g_hash_table_insert (map_out, &i32, &i32);
-  assert (t_test_thrift_test_client_test_map (iface, &map_in, map_out, &error) == TRUE);
-  assert (error == NULL);
-  g_hash_table_destroy (map_out);
-  g_hash_table_destroy (map_in);
-
-  map_out = g_hash_table_new (NULL, NULL);
-  map_in = g_hash_table_new (NULL, NULL);
-  g_hash_table_insert (map_out, g_strdup ("a"), g_strdup ("123"));
-  g_hash_table_insert (map_out, g_strdup ("a b"), g_strdup ("with spaces "));
-  g_hash_table_insert (map_out, g_strdup ("same"), g_strdup ("same"));
-  g_hash_table_insert (map_out, g_strdup ("0"), g_strdup ("numeric key"));
-  assert (t_test_thrift_test_client_test_string_map (iface, &map_in, map_out, &error) == TRUE);
-  assert (error == NULL);
-  g_hash_table_destroy (map_out);
-  g_hash_table_destroy (map_in);
-
-  set_out = g_hash_table_new (NULL, NULL);
-  set_in = g_hash_table_new (NULL, NULL);
-  g_hash_table_insert (set_out, &i32, &i32);
-  assert (t_test_thrift_test_client_test_set (iface, &set_in, set_out, &error) == TRUE);
-  assert (error == NULL);
-  g_hash_table_destroy (set_out);
-  g_hash_table_destroy (set_in);
-
-  list_out = g_array_new(TRUE, TRUE, sizeof(gint32));
-  list_in = g_array_new(TRUE, TRUE, sizeof(gint32));
-  another_i32 = 456;
-  g_array_append_val (list_out, i32);
-  g_array_append_val (list_out, another_i32);
-  assert (t_test_thrift_test_client_test_list (iface, &list_in, list_out, &error) == TRUE);
-  assert (error == NULL);
-  g_array_free (list_out, TRUE);
-  g_array_free (list_in, TRUE);
-
-  enum_out = T_TEST_NUMBERZ_ONE;
-  assert (t_test_thrift_test_client_test_enum (iface, &enum_in, enum_out, &error) == TRUE);
-  assert (enum_in == enum_out);
-  assert (error == NULL);
-
-  user_id_out = 12345;
-  assert (t_test_thrift_test_client_test_typedef (iface, &user_id_in, user_id_out, &error) == TRUE);
-  assert (user_id_in == user_id_out);
-  assert (error == NULL);
-
-  map_in = g_hash_table_new (NULL, NULL);
-  assert (t_test_thrift_test_client_test_map_map (iface, &map_in, i32, &error) == TRUE);
-  assert (error == NULL);
-  g_hash_table_destroy (map_in);
-
-  // insanity
-  insanity_out = (TTestInsanity *) g_object_new (T_TEST_TYPE_INSANITY, NULL);
-  insanity_out->userMap = g_hash_table_new (NULL, NULL);
-  g_hash_table_insert (insanity_out->userMap, GINT_TO_POINTER (enum_out), &user_id_out);
-
-  xtruct1 = (TTestXtruct *) g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-  xtruct1->byte_thing = 1;
-  xtruct1->__isset_byte_thing = TRUE;
-  xtruct1->i32_thing = 15;
-  xtruct1->__isset_i32_thing = TRUE;
-  xtruct1->i64_thing = 151;
-  xtruct1->__isset_i64_thing = TRUE;
-  xtruct1->string_thing = g_strdup ("abc123");
-  xtruct1->__isset_string_thing = TRUE;
-  xtruct2 = (TTestXtruct *) g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-  xtruct2->byte_thing = 1;
-  xtruct2->__isset_byte_thing = TRUE;
-  xtruct2->i32_thing = 15;
-  xtruct2->__isset_i32_thing = TRUE;
-  xtruct2->i64_thing = 151;
-  xtruct2->__isset_i64_thing = TRUE;
-  xtruct2->string_thing = g_strdup ("abc123");
-  xtruct2->__isset_string_thing = TRUE;
-
-  insanity_in = g_hash_table_new (NULL, NULL);
-  g_ptr_array_add (insanity_out->xtructs, xtruct1);
-  g_ptr_array_add (insanity_out->xtructs, xtruct2);
-  assert (t_test_thrift_test_client_test_insanity (iface, &insanity_in, insanity_out, &error) == TRUE);
-
-  g_hash_table_unref (insanity_in);
-  g_ptr_array_free (insanity_out->xtructs, TRUE);
-
-  multi_map_out = g_hash_table_new (NULL, NULL);
-  string = g_strdup ("abc123");
-  g_hash_table_insert (multi_map_out, &i16, string);
-  multi_in = (TTestXtruct *) g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-  assert (t_test_thrift_test_client_test_multi (iface, &multi_in, byte, i32, i64, multi_map_out, enum_out, user_id_out, &error) == TRUE);
-  assert (multi_in->i32_thing == i32);
-  assert (multi_in->i64_thing == i64);
-  g_object_unref (multi_in);
-  g_hash_table_unref (multi_map_out);
-  g_free (string);
-
-  assert (t_test_thrift_test_client_test_exception (iface, "Xception", &xception, &error) == FALSE);
-  assert (xception->errorCode == 1001);
-  g_error_free (error);
-  error = NULL;
-  g_object_unref (xception);
-  xception = NULL;
-
-  assert (t_test_thrift_test_client_test_exception (iface, "ApplicationException", &xception, &error) == FALSE);
-  g_error_free (error);
-  error = NULL;
-  assert (xception == NULL);
-
-  assert (t_test_thrift_test_client_test_exception (iface, "Test", &xception, &error) == TRUE);
-  assert (error == NULL);
-
-  multi_in = (TTestXtruct*) g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-  assert (t_test_thrift_test_client_test_multi_exception (iface, &multi_in, "Xception", NULL, &xception, &xception2, &error) == FALSE);
-  assert (xception->errorCode == 1001);
-  assert (xception2 == NULL);
-  g_error_free (error);
-  error = NULL;
-  g_object_unref (xception);
-  g_object_unref (multi_in);
-  xception = NULL;
-  multi_in = NULL;
-
-  multi_in = (TTestXtruct*) g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-  assert (t_test_thrift_test_client_test_multi_exception (iface, &multi_in, "Xception2", NULL, &xception, &xception2, &error) == FALSE);
-  assert (xception2->errorCode == 2002);
-  assert (xception == NULL);
-  g_error_free (error);
-  error = NULL;
-  g_object_unref (xception2);
-  g_object_unref (multi_in);
-  xception2 = NULL;
-  multi_in = NULL;
-
-  multi_in = (TTestXtruct*) g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-  assert (t_test_thrift_test_client_test_multi_exception (iface, &multi_in, NULL , NULL, &xception, &xception2, &error) == TRUE);
-  assert (error == NULL);
-  g_object_unref(multi_in);
-  multi_in = NULL;
-
-  assert (t_test_thrift_test_client_test_oneway (iface, 1, &error) == TRUE);
-  assert (error == NULL);
-
-  /* sleep to let the oneway call go through */
-  sleep (5);
-
-  thrift_transport_close (THRIFT_TRANSPORT(tsocket), NULL);
-  g_object_unref (client);
-  g_object_unref (protocol);
-  g_object_unref (tsocket);
-}
-
-
-} /* extern "C" */
-
-
-static void
-bailout (int signum)
-{
-  THRIFT_UNUSED_VARIABLE (signum);
-
-  exit (1);
-}
-
-int
-main (void)
-{
-  int status;
-  int pid = fork ();
-  assert (pid >= 0);
-
-  if (pid == 0) /* child */
-  {
-    boost::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
-    boost::shared_ptr<TestHandler> testHandler(new TestHandler());
-    boost::shared_ptr<ThriftTestProcessor> testProcessor(new ThriftTestProcessor(testHandler));
-    boost::shared_ptr<TServerSocket> serverSocket(new TServerSocket(TEST_PORT));
-    boost::shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
-    TSimpleServer simpleServer(testProcessor, serverSocket, transportFactory, protocolFactory);
-    signal (SIGALRM, bailout);
-    alarm (60);
-    simpleServer.serve();
-  } else {
-    sleep (1);
-    test_thrift_client ();
-    kill (pid, SIGINT);
-    assert (wait (&status) == pid);
-  }
-
-  return 0;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testtransportsocket.c b/vendor/git.apache.org/thrift.git/lib/c_glib/test/testtransportsocket.c
deleted file mode 100755
index d91507f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/test/testtransportsocket.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <netdb.h>
-#include <sys/wait.h>
-
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-
-#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
-
-/* substituted functions to test failures of system and library calls */
-static int socket_error = 0;
-int
-my_socket(int domain, int type, int protocol)
-{
-  if (socket_error == 0)
-  {
-    return socket (domain, type, protocol);
-  }
-  return -1;
-}
-
-static int recv_error = 0;
-ssize_t
-my_recv(int socket, void *buffer, size_t length, int flags)
-{
-  if (recv_error == 0)
-  {
-    return recv (socket, buffer, length, flags);
-  }
-  return -1;
-}
-
-static int send_error = 0;
-ssize_t
-my_send(int socket, const void *buffer, size_t length, int flags)
-{
-  if (send_error == 0)
-  {
-    return send (socket, buffer, length, flags);
-  }
-  return -1;
-}
-
-#define socket my_socket
-#define recv my_recv
-#define send my_send
-#include "../src/thrift/c_glib/transport/thrift_socket.c"
-#undef socket
-#undef recv
-#undef send
-
-static void thrift_socket_server (const int port);
-
-/* test object creation and destruction */
-static void
-test_create_and_destroy(void)
-{
-  gchar *hostname = NULL;
-  guint port = 0;
-
-  GObject *object = NULL;
-  object = g_object_new (THRIFT_TYPE_SOCKET, NULL);
-  assert (object != NULL);
-  g_object_get (G_OBJECT(object), "hostname", &hostname, "port", &port, NULL);
-  g_free (hostname);
-
-  g_object_unref (object);
-}
-
-static void
-test_open_and_close(void)
-{
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  GError *err = NULL;
-
-  /* open a connection and close it */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                          "port", 51188, NULL); 
-  transport = THRIFT_TRANSPORT (tsocket);
-  thrift_socket_open (transport, NULL);
-  assert (thrift_socket_is_open (transport) == TRUE);
-  thrift_socket_close (transport, NULL);
-  assert (thrift_socket_is_open (transport) == FALSE);
-
-  /* test close failure */
-  tsocket->sd = -1;
-  thrift_socket_close (transport, NULL);
-  g_object_unref (tsocket);
-
-  /* try a hostname lookup failure */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost.broken",
-                          NULL);
-  transport = THRIFT_TRANSPORT (tsocket);
-  assert (thrift_socket_open (transport, &err) == FALSE);
-  g_object_unref (tsocket);
-  g_error_free (err);
-  err = NULL;
-
-  /* try an error call to socket() */
-  tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost", NULL);
-  transport = THRIFT_TRANSPORT (tsocket);
-  socket_error = 1;
-  assert (thrift_socket_open (transport, &err) == FALSE);
-  socket_error = 0;
-  g_object_unref (tsocket);
-  g_error_free (err);
-}
-
-static void
-test_read_and_write(void)
-{
-  int status;
-  pid_t pid;
-  ThriftSocket *tsocket = NULL;
-  ThriftTransport *transport = NULL;
-  int port = 51199;
-  guchar buf[10] = TEST_DATA; /* a buffer */
-
-  pid = fork ();
-  assert ( pid >= 0 );
-
-  if ( pid == 0 )
-  {
-    /* child listens */
-    thrift_socket_server (port);
-    exit (0);
-  } else {
-    /* parent connects, wait a bit for the socket to be created */
-    sleep (1);
-
-    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
-                            "port", port, NULL);
-    transport = THRIFT_TRANSPORT (tsocket);
-    assert (thrift_socket_open (transport, NULL) == TRUE);
-    assert (thrift_socket_is_open (transport));
-    thrift_socket_write (transport, buf, 10, NULL);
-
-    /* write fail */
-    send_error = 1;
-    thrift_socket_write (transport, buf, 1, NULL);
-    send_error = 0;
-
-    thrift_socket_write_end (transport, NULL);
-    thrift_socket_flush (transport, NULL);
-    thrift_socket_close (transport, NULL);
-    g_object_unref (tsocket);
-
-    assert ( wait (&status) == pid );
-    assert ( status == 0 );
-  }
-}
-
-/* test ThriftSocket's peek() implementation */
-static void
-test_peek(void)
-{
-  gint status;
-  pid_t pid;
-  guint port = 51199;
-  gchar data = 'A';
-  ThriftTransport *client_transport;
-  GError *error = NULL;
-
-  client_transport = g_object_new (THRIFT_TYPE_SOCKET,
-                                   "hostname", "localhost",
-                                   "port",     port,
-                                   NULL);
-
-  /* thrift_transport_peek returns FALSE when the socket is closed */
-  g_assert (thrift_transport_is_open (client_transport) == FALSE);
-  g_assert (thrift_transport_peek (client_transport, &error) == FALSE);
-  g_assert (error == NULL);
-
-  pid = fork ();
-  g_assert (pid >= 0);
-
-  if (pid == 0)
-  {
-    ThriftServerTransport *server_transport = NULL;
-
-    g_object_unref (client_transport);
-
-    /* child listens */
-    server_transport = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                     "port", port,
-                                     NULL);
-    g_assert (server_transport != NULL);
-
-    thrift_server_transport_listen (server_transport, &error);
-    g_assert (error == NULL);
-
-    client_transport = g_object_new
-      (THRIFT_TYPE_BUFFERED_TRANSPORT,
-       "transport",  thrift_server_transport_accept (server_transport, &error),
-       "r_buf_size", 0,
-       "w_buf_size", sizeof data,
-       NULL);
-    g_assert (error == NULL);
-    g_assert (client_transport != NULL);
-
-    /* write exactly one character to the client */
-    g_assert (thrift_transport_write (client_transport,
-                                      &data,
-                                      sizeof data,
-                                      &error) == TRUE);
-
-    thrift_transport_flush (client_transport, &error);
-    thrift_transport_write_end (client_transport, &error);
-    thrift_transport_close (client_transport, &error);
-
-    g_object_unref (client_transport);
-    g_object_unref (server_transport);
-
-    exit (0);
-  }
-  else {
-    /* parent connects, wait a bit for the socket to be created */
-    sleep (1);
-
-    /* connect to the child */
-    thrift_transport_open (client_transport, &error);
-    g_assert (error == NULL);
-    g_assert (thrift_transport_is_open (client_transport) == TRUE);
-
-    /* thrift_transport_peek returns TRUE when the socket is open and there is
-       data available to be read */
-    g_assert (thrift_transport_peek (client_transport, &error) == TRUE);
-    g_assert (error == NULL);
-
-    /* read exactly one character from the server */
-    g_assert_cmpint (thrift_transport_read (client_transport,
-                                            &data,
-                                            sizeof data,
-                                            &error), ==, sizeof data);
-
-    /* thrift_transport_peek returns FALSE when the socket is open but there is
-       no (more) data available to be read */
-    g_assert (thrift_transport_is_open (client_transport) == TRUE);
-    g_assert (thrift_transport_peek (client_transport, &error) == FALSE);
-    g_assert (error == NULL);
-
-    thrift_transport_read_end (client_transport, &error);
-    thrift_transport_close (client_transport, &error);
-
-    g_object_unref (client_transport);
-
-    g_assert (wait (&status) == pid);
-    g_assert (status == 0);
-  }
-}
-
-static void
-thrift_socket_server (const int port)
-{
-  int bytes = 0;
-  ThriftServerTransport *transport = NULL;
-  ThriftTransport *client = NULL;
-  guchar buf[10]; /* a buffer */
-  guchar match[10] = TEST_DATA;
-
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
-
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-  client = thrift_server_transport_accept (transport, NULL);
-  assert (client != NULL);
-
-  /* read 10 bytes */
-  bytes = thrift_socket_read (client, buf, 10, NULL);
-  assert (bytes == 10); /* make sure we've read 10 bytes */
-  assert ( memcmp(buf, match, 10) == 0 ); /* make sure what we got matches */
-
-  /* failed read */
-  recv_error = 1;
-  thrift_socket_read (client, buf, 1, NULL);
-  recv_error = 0;
-
-  thrift_socket_read_end (client, NULL);
-  thrift_socket_close (client, NULL);
-  g_object_unref (tsocket);
-  g_object_unref (client);
-}
-
-int
-main(int argc, char *argv[])
-{
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init();
-#endif
-
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/testtransportsocket/CreateAndDestroy", test_create_and_destroy);
-  g_test_add_func ("/testtransportsocket/OpenAndClose", test_open_and_close);
-  g_test_add_func ("/testtransportsocket/ReadAndWrite", test_read_and_write);
-  g_test_add_func ("/testtransportsocket/Peek", test_peek);
-
-  return g_test_run ();
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/c_glib/thrift_c_glib.pc.in b/vendor/git.apache.org/thrift.git/lib/c_glib/thrift_c_glib.pc.in
deleted file mode 100644
index 568c7a2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/c_glib/thrift_c_glib.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Thrift
-Description: Thrift C API
-Version: @VERSION@
-Requires: glib-2.0 gobject-2.0
-Libs: -L${libdir} -lthrift_c_glib
-Cflags: -I${includedir}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/README.md b/vendor/git.apache.org/thrift.git/lib/cocoa/README.md
deleted file mode 100644
index bbe3c93..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Thrift Cocoa Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/cocoa/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TApplicationError.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TApplicationError.h
deleted file mode 100644
index 079881a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TApplicationError.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TProtocol.h"
-
-extern NSString *TApplicationErrorDomain;
-
-typedef NS_ENUM (int, TApplicationError) {
-  TApplicationErrorUnknown                = 0,
-  TApplicationErrorUnknownMethod          = 1,
-  TApplicationErrorInvalidMessageType     = 2,
-  TApplicationErrorWrongMethodName        = 3,
-  TApplicationErrorBadSequenceId          = 4,
-  TApplicationErrorMissingResult          = 5,
-  TApplicationErrorInternalError          = 6,
-  TApplicationErrorProtocolError          = 7,
-  TApplicationErrorInvalidTransform       = 8,
-  TApplicationErrorInvalidProtocol        = 9,
-  TApplicationErrorUnsupportedClientType  = 10,
-};
-
-
-extern NSString *TApplicationErrorNameKey;
-extern NSString *TApplicationErrorReasonKey;
-extern NSString *TApplicationErrorMethodKey;
-
-
-@interface NSError (TApplicationError)
-
-@property (readonly, copy) NSString *name;
-@property (readonly, copy) NSString *reason;
-
-+(instancetype) errorWithType:(TApplicationError)type reason:(NSString *)reason;
-
-+(instancetype) read:(id<TProtocol>)protocol;
-
--(BOOL) write:(id<TProtocol>)outProtocol error:(NSError *__autoreleasing *)error;
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TApplicationError.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TApplicationError.m
deleted file mode 100644
index 080bc0b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TApplicationError.m
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TApplicationError.h"
-#import "TProtocolUtil.h"
-
-
-NSString *TApplicationErrorDomain = @"TApplicationErrorDomain";
-
-
-NSString *TApplicationErrorNameKey = @"name";
-NSString *TApplicationErrorReasonKey = @"reason";
-NSString *TApplicationErrorMethodKey = @"method";
-
-
-@implementation NSError (TApplicationError)
-
--(NSString *) reason
-{
-  return self.userInfo[TApplicationErrorReasonKey];
-}
-
--(NSString *) name
-{
-  return self.userInfo[TApplicationErrorNameKey];
-}
-
-+(instancetype) errorWithType:(TApplicationError)type reason:(NSString *)reason
-{
-  NSString *name;
-  switch (type) {
-  case TApplicationErrorUnknownMethod:
-    name = @"Unknown Method";
-    break;
-
-  case TApplicationErrorInvalidMessageType:
-    name = @"Invalid Message Type";
-    break;
-
-  case TApplicationErrorWrongMethodName:
-    name = @"Wrong Method Name";
-    break;
-
-  case TApplicationErrorBadSequenceId:
-    name = @"Bad Sequence ID";
-    break;
-
-  case TApplicationErrorMissingResult:
-    name = @"Missing Result";
-    break;
-
-  case TApplicationErrorInternalError:
-    name = @"Internal Error";
-    break;
-
-  case TApplicationErrorProtocolError:
-    name = @"Protocol Error";
-    break;
-
-  case TApplicationErrorInvalidTransform:
-    name = @"Invalid Transform";
-    break;
-
-  case TApplicationErrorInvalidProtocol:
-    name = @"Invalid Protocol";
-    break;
-
-  case TApplicationErrorUnsupportedClientType:
-    name = @"Unsupported Client Type";
-    break;
-
-  default:
-    name = @"Unknown";
-    break;
-  }
-
-  NSDictionary *userInfo;
-  if (reason) {
-    userInfo = @{TApplicationErrorNameKey:name,
-                 TApplicationErrorReasonKey:reason};
-  }
-  else {
-    userInfo = @{TApplicationErrorNameKey:name};
-  }
-
-  return [NSError errorWithDomain:TApplicationErrorDomain
-                             code:type
-                         userInfo:userInfo];
-}
-
-
-+(instancetype) read:(id<TProtocol>)protocol
-{
-  NSString *reason = nil;
-  SInt32 type = TApplicationErrorUnknown;
-  SInt32 fieldType;
-  SInt32 fieldID;
-
-  NSError *error;
-  if (![protocol readStructBeginReturningName:NULL error:&error]) {
-    return error;
-  }
-
-  while (true) {
-
-    if (![protocol readFieldBeginReturningName:NULL
-                                          type:&fieldType
-                                       fieldID:&fieldID
-                                         error:&error])
-    {
-      return error;
-    }
-
-    if (fieldType == TTypeSTOP) {
-      break;
-    }
-
-    switch (fieldID) {
-    case 1:
-      if (fieldType == TTypeSTRING) {
-        if (![protocol readString:&reason error:&error]) {
-          return error;
-        }
-      }
-      else {
-        if (![TProtocolUtil skipType:fieldType onProtocol:protocol error:&error]) {
-          return error;
-        }
-      }
-      break;
-
-    case 2:
-      if (fieldType == TTypeI32) {
-        if (![protocol readI32:&type error:&error]) {
-          return error;
-        }
-      }
-      else {
-        if (![TProtocolUtil skipType:fieldType onProtocol:protocol error:&error]) {
-          return error;
-        }
-      }
-      break;
-
-    default:
-      if (![TProtocolUtil skipType:fieldType onProtocol:protocol error:&error]) {
-        return error;
-      }
-      break;
-    }
-    if (![protocol readFieldEnd:&error]) {
-      return error;
-    }
-
-  }
-
-  if (![protocol readStructEnd:&error]) {
-    return error;
-  }
-
-  return [NSError errorWithType:type reason:reason];
-}
-
-
--(BOOL) write:(id<TProtocol>)protocol error:(NSError *__autoreleasing *)error
-{
-  if (![protocol writeStructBeginWithName:@"TApplicationException" error:error]) {
-    return NO;
-  }
-
-  if (self.localizedDescription != nil) {
-    if (![protocol writeFieldBeginWithName:@"message"
-                                      type:TTypeSTRING
-                                   fieldID:1 error:error])
-    {
-      return NO;
-    }
-
-    if (![protocol writeString:self.localizedDescription error:error]) {
-      return NO;
-    }
-
-    if (![protocol writeFieldEnd:error]) {
-      return NO;
-    }
-  }
-
-  if (![protocol writeFieldBeginWithName:@"type"
-                                    type:TTypeI32
-                                 fieldID:2
-                                   error:error])
-  {
-    return NO;
-  }
-
-  if (![protocol writeI32:(SInt32)self.code error:error]) {
-    return NO;
-  }
-
-  if (![protocol writeFieldEnd:error]) {
-    return NO;
-  }
-
-  if (![protocol writeFieldStop:error]) {
-    return NO;
-  }
-
-  if (![protocol writeStructEnd:error]) {
-    return NO;
-  }
-
-  return YES;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBaseClient.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBaseClient.h
deleted file mode 100644
index 0f73aa0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBaseClient.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TProtocol.h"
-#import "TApplicationError.h"
-
-@interface TBaseClient : NSObject
-
--(NSError *) checkIncomingMessageException:(id<TProtocol>)protocol;
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBaseClient.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBaseClient.m
deleted file mode 100644
index 249cae0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBaseClient.m
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TBaseClient.h"
-#import "TApplicationError.h"
-
-
-@interface TBaseClient ()
-@end
-
-
-@implementation TBaseClient
-
--(NSError *) checkIncomingMessageException:(id<TProtocol>)inProtocol
-{
-  NSError *thriftError;
-
-  SInt32 msgType = 0;
-  if (![inProtocol readMessageBeginReturningName:nil type:&msgType sequenceID:NULL error:&thriftError]) {
-    return thriftError;
-  }
-
-  if (msgType == TMessageTypeEXCEPTION) {
-
-    thriftError = [NSError read:inProtocol];
-
-    [inProtocol readMessageEnd:NULL];
-
-    return thriftError;
-  }
-
-  return nil;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBinary.swift b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBinary.swift
deleted file mode 100644
index c8a3660..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TBinary.swift
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Foundation
-
-
-public struct TBinary : TSerializable {
-  
-  public static var thriftType : TType { return .STRING }
-  
-  private var storage : NSData
-  
-  public init() {
-    self.storage = NSData()
-  }
-  
-  public init(contentsOfFile file: String, options: NSDataReadingOptions = []) throws {
-    self.storage = try NSData(contentsOfFile: file, options: options)
-  }
-  
-  public init(contentsOfURL URL: NSURL, options: NSDataReadingOptions = []) throws {
-    self.storage = try NSData(contentsOfURL: URL, options: options)
-  }
-  
-  public init?(base64EncodedData base64Data: NSData, options: NSDataBase64DecodingOptions = []) {
-    guard let storage = NSData(base64EncodedData: base64Data, options: options) else {
-      return nil
-    }
-    self.storage = storage
-  }
-  
-  public init(data: NSData) {
-    self.storage = data
-  }
-  
-  public var length : Int {
-    return storage.length
-  }
-  
-  public var hashValue : Int {
-    return storage.hashValue
-  }
-  
-  public var bytes : UnsafePointer<Void> {
-    return storage.bytes
-  }
-  
-  public func getBytes(buffer: UnsafeMutablePointer<Void>, length: Int) {
-    storage.getBytes(buffer, length: length)
-  }
-  
-  public func getBytes(buffer: UnsafeMutablePointer<Void>, range: Range<Int>) {
-    storage.getBytes(buffer, range: NSRange(range))
-  }
-  
-  public func subBinaryWithRange(range: Range<Int>) -> TBinary {
-    return TBinary(data: storage.subdataWithRange(NSRange(range)))
-  }
-  
-  public func writeToFile(path: String, options: NSDataWritingOptions = []) throws {
-    try storage.writeToFile(path, options: options)
-  }
-  
-  public func writeToURL(url: NSURL, options: NSDataWritingOptions = []) throws {
-    try storage.writeToURL(url, options: options)
-  }
-  
-  public func rangeOfData(dataToFind data: NSData, options: NSDataSearchOptions, range: Range<Int>) -> Range<Int>? {
-    return storage.rangeOfData(data, options: options, range: NSRange(range)).toRange()
-  }
-  
-  public func enumerateByteRangesUsingBlock(block: (UnsafePointer<Void>, Range<Int>, inout Bool) -> Void) {
-    storage.enumerateByteRangesUsingBlock { bytes, range, stop in
-      var stopTmp = Bool(stop.memory)
-      block(bytes, range.toRange()!, &stopTmp)
-      stop.memory = ObjCBool(stopTmp)
-    }
-  }
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> TBinary {
-    var data : NSData?
-    try proto.readBinary(&data)
-    return TBinary(data: data!)
-  }
-  
-  public static func writeValue(value: TBinary, toProtocol proto: TProtocol) throws {
-    try proto.writeBinary(value.storage)
-  }
-  
-}
-
-extension TBinary : CustomStringConvertible, CustomDebugStringConvertible {
-  
-  public var description : String {
-    return storage.description
-  }
-  
-  public var debugDescription : String {
-    return storage.debugDescription
-  }
-  
-}
-
-public func ==(lhs: TBinary, rhs: TBinary) -> Bool {
-  return lhs.storage == rhs.storage
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TEnum.swift b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TEnum.swift
deleted file mode 100644
index 562a53a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TEnum.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Foundation
-
-
-public protocol TEnum : TSerializable {
-  
-}
-
-public extension TEnum {
-  
-  public static var thriftType : TType { return TType.I32 }
-  
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TError.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TError.h
deleted file mode 100644
index abb72c7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TError.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-
-extern NSString *TErrorDomain;
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TList.swift b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TList.swift
deleted file mode 100644
index 005bd81..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TList.swift
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Foundation
-
-
-
-public struct TList<Element : TSerializable> : MutableCollectionType, Hashable, ArrayLiteralConvertible, TSerializable {
-  
-  public static var thriftType : TType { return .LIST }
-  
-  typealias Storage = Array<Element>
-
-  public typealias Index = Storage.Index
-  
-  private var storage = Storage()
-  
-  public var startIndex : Index {
-    return storage.startIndex
-  }
-  
-  public var endIndex : Index {
-    return storage.endIndex
-  }
-
-  public subscript (position: Index) -> Element {
-    get {
-      return storage[position]
-    }
-    set {
-      storage[position] = newValue
-    }
-  }
-  
-  public var hashValue : Int {
-    let prime = 31
-    var result = 1
-    for element in storage {
-      result = prime * result + element.hashValue
-    }
-    return result
-  }
-  
-  public init(arrayLiteral elements: Element...) {
-    self.storage = Storage(storage)
-  }
-  
-  public init() {
-    self.storage = Storage()
-  }
-  
-  public mutating func append(newElement: Element) {
-    self.storage.append(newElement)
-  }
-  
-  public mutating func appendContentsOf<C : CollectionType where C.Generator.Element == Element>(newstorage: C) {
-    self.storage.appendContentsOf(newstorage)
-  }
-  
-  public mutating func insert(newElement: Element, atIndex index: Int) {
-    self.storage.insert(newElement, atIndex: index)
-  }
-  
-  public mutating func insertContentsOf<C : CollectionType where C.Generator.Element == Element>(newElements: C, at index: Int) {
-    self.storage.insertContentsOf(newElements, at: index)
-  }
-  
-  public mutating func removeAll(keepCapacity keepCapacity: Bool = true) {
-    self.storage.removeAll(keepCapacity: keepCapacity)
-  }
-  
-  public mutating func removeAtIndex(index: Index) {
-    self.storage.removeAtIndex(index)
-  }
-  
-  public mutating func removeFirst(n: Int = 0) {
-    self.storage.removeFirst(n)
-  }
-  
-  public mutating func removeLast() -> Element {
-    return self.storage.removeLast()
-  }
-  
-  public mutating func removeRange(subRange: Range<Index>) {
-    self.storage.removeRange(subRange)
-  }
-  
-  public mutating func reserveCapacity(minimumCapacity: Int) {
-    self.storage.reserveCapacity(minimumCapacity)
-  }
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> TList {
-    let (elementType, size) = try proto.readListBegin()
-    if elementType != Element.thriftType {
-      throw NSError(
-        domain: TProtocolErrorDomain,
-        code: Int(TProtocolError.InvalidData.rawValue),
-        userInfo: [TProtocolErrorExtendedErrorKey: NSNumber(int: TProtocolExtendedError.UnexpectedType.rawValue)])
-    }
-    var list = TList()
-    for _ in 0..<size {
-      let element = try Element.readValueFromProtocol(proto)
-      list.storage.append(element)
-    }
-    try proto.readListEnd()
-    return list
-  }
-  
-  public static func writeValue(value: TList, toProtocol proto: TProtocol) throws {
-    try proto.writeListBeginWithElementType(Element.thriftType, size: value.count)
-    for element in value.storage {
-      try Element.writeValue(element, toProtocol: proto)
-    }
-    try proto.writeListEnd()
-  }
-}
-
-extension TList : CustomStringConvertible, CustomDebugStringConvertible {
-  
-  public var description : String {
-    return storage.description
-  }
-  
-  public var debugDescription : String {
-    return storage.debugDescription
-  }
-  
-}
-
-public func ==<Element>(lhs: TList<Element>, rhs: TList<Element>) -> Bool {
-  return lhs.storage == rhs.storage
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TMap.swift b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TMap.swift
deleted file mode 100644
index e96e747..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TMap.swift
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Foundation
-
-
-public struct TMap<Key : TSerializable, Value : TSerializable> : CollectionType, DictionaryLiteralConvertible, TSerializable {
-  
-  public static var thriftType : TType { return .MAP }
-
-  typealias Storage = Dictionary<Key, Value>
-
-  public typealias Index = Storage.Index
-
-  public typealias Element = Storage.Element
-  
-  private var storage : Storage
-
-  public var startIndex : Index {
-    return storage.startIndex
-  }
-  
-  public var endIndex: Index {
-    return storage.endIndex
-  }
-
-  public var keys: LazyMapCollection<[Key : Value], Key> {
-    return storage.keys
-  }
-  
-  public var values: LazyMapCollection<[Key : Value], Value> {
-    return storage.values
-  }
-  
-  public init() {
-    storage = Storage()
-  }
-  
-  public init(dictionaryLiteral elements: (Key, Value)...) {
-    storage = Storage()
-    for (key, value) in elements {
-      storage[key] = value
-    }
-  }
-  
-  public init(minimumCapacity: Int) {
-    storage = Storage(minimumCapacity: minimumCapacity)
-  }
-  
-  public subscript (position: Index) -> Element {
-    get {
-      return storage[position]
-    }
-  }
-  
-  public func indexForKey(key: Key) -> Index? {
-    return storage.indexForKey(key)
-  }
-  
-  public subscript (key: Key) -> Value? {
-    get {
-      return storage[key]
-    }
-    set {
-      storage[key] = newValue
-    }
-  }
-
-  public mutating func updateValue(value: Value, forKey key: Key) -> Value? {
-    return updateValue(value, forKey: key)
-  }
-  
-  public mutating func removeAtIndex(index: DictionaryIndex<Key, Value>) -> (Key, Value) {
-    return removeAtIndex(index)
-  }
-  
-  public mutating func removeValueForKey(key: Key) -> Value? {
-    return storage.removeValueForKey(key)
-  }
-  
-  public mutating func removeAll(keepCapacity keepCapacity: Bool = false) {
-    storage.removeAll(keepCapacity: keepCapacity)
-  }
-
-  public var hashValue : Int {
-    let prime = 31
-    var result = 1
-    for (key, value) in storage {
-      result = prime * result + key.hashValue
-      result = prime * result + value.hashValue
-    }
-    return result
-  }
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> TMap {
-    let (keyType, valueType, size) = try proto.readMapBegin()
-    if keyType != Key.thriftType || valueType != Value.thriftType {
-      throw NSError(
-        domain: TProtocolErrorDomain,
-        code: Int(TProtocolError.InvalidData.rawValue),
-        userInfo: [TProtocolErrorExtendedErrorKey: NSNumber(int: TProtocolExtendedError.UnexpectedType.rawValue)])
-    }
-    var map = TMap()
-    for _ in 0..<size {
-      let key = try Key.readValueFromProtocol(proto)
-      let value = try Value.readValueFromProtocol(proto)
-      map.storage[key] = value
-    }
-    try proto.readMapEnd()
-    return map
-  }
-  
-  public static func writeValue(value: TMap, toProtocol proto: TProtocol) throws {
-    try proto.writeMapBeginWithKeyType(Key.thriftType, valueType: Value.thriftType, size: value.count)
-    for (key, value) in value.storage {
-      try Key.writeValue(key, toProtocol: proto)
-      try Value.writeValue(value, toProtocol: proto)
-    }
-    try proto.writeMapEnd()
-  }
-  
-}
-
-
-extension TMap : CustomStringConvertible, CustomDebugStringConvertible {
-  
-  public var description : String {
-    return storage.description
-  }
-  
-  public var debugDescription : String {
-    return storage.debugDescription
-  }
-  
-}
-
-public func ==<Key, Value>(lhs: TMap<Key,Value>, rhs: TMap<Key, Value>) -> Bool {
-  if lhs.count != rhs.count {
-    return false
-  }
-  return lhs.storage == rhs.storage
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProcessor.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProcessor.h
deleted file mode 100644
index 20c72e2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProcessor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TProtocol.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@protocol TProcessor <NSObject>
-
--(BOOL) processOnInputProtocol:(id <TProtocol>)inProtocol
-                outputProtocol:(id <TProtocol>)outProtocol
-                         error:(NSError **)error;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProcessorFactory.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProcessorFactory.h
deleted file mode 100644
index 85020a5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProcessorFactory.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TProcessor.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@protocol TProcessorFactory <NSObject>
-
--(id<TProcessor>) processorForTransport:(id<TTransport>)transport;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProtocol.swift b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProtocol.swift
deleted file mode 100644
index 1775849..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TProtocol.swift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Foundation
-
-
-public extension TProtocol {
-  
-  public func readMessageBegin() throws -> (String, TMessageType, Int) {
-    
-    var name : NSString?
-    var type : Int32 = -1
-    var sequenceID : Int32 = -1
-    
-    try readMessageBeginReturningName(&name, type: &type, sequenceID: &sequenceID)
-    
-    return (name as String!, TMessageType(rawValue: type)!, Int(sequenceID))
-  }
-  
-  public func writeMessageBeginWithName(name: String, type: TMessageType, sequenceID: Int) throws {
-    try writeMessageBeginWithName(name, type: type.rawValue, sequenceID: Int32(sequenceID))
-  }
-  
-  public func readStructBegin() throws -> (String?) {
-    
-    var name : NSString? = nil
-    
-    try readStructBeginReturningName(&name)
-    
-    return (name as String?)
-  }
-  
-  public func readFieldBegin() throws -> (String?, TType, Int) {
-    
-    var name : NSString? = nil
-    var type : Int32 = -1
-    var fieldID : Int32 = -1
-    
-    try readFieldBeginReturningName(&name, type: &type, fieldID: &fieldID)
-    
-    return (name as String?, TType(rawValue: type)!, Int(fieldID))
-  }
-  
-  public func writeFieldBeginWithName(name: String, type: TType, fieldID: Int) throws {
-    try writeFieldBeginWithName(name, type: type.rawValue, fieldID: Int32(fieldID))
-  }
-  
-  public func readMapBegin() throws -> (TType, TType, Int32) {
-    
-    var keyType : Int32 = -1
-    var valueType : Int32 = -1
-    var size : Int32 = 0
-    
-    try readMapBeginReturningKeyType(&keyType, valueType: &valueType, size: &size)
-    
-    return (TType(rawValue: keyType)!, TType(rawValue: valueType)!, size)
-  }
-  
-  public func writeMapBeginWithKeyType(keyType: TType, valueType: TType, size: Int) throws {
-    try writeMapBeginWithKeyType(keyType.rawValue, valueType: valueType.rawValue, size: Int32(size))
-  }
-  
-  public func readSetBegin() throws -> (TType, Int32) {
-    
-    var elementType : Int32 = -1
-    var size : Int32 = 0
-    
-    try readSetBeginReturningElementType(&elementType, size: &size)
-    
-    return (TType(rawValue: elementType)!, size)
-  }
-  
-  public func writeSetBeginWithElementType(elementType: TType, size: Int) throws {
-    try writeSetBeginWithElementType(elementType.rawValue, size: Int32(size))
-  }
-  
-  public func readListBegin() throws -> (TType, Int32) {
-    
-    var elementType : Int32 = -1
-    var size : Int32 = 0
-    
-    try readListBeginReturningElementType(&elementType, size: &size)
-    
-    return (TType(rawValue: elementType)!, size)
-  }
-  
-  public func writeListBeginWithElementType(elementType: TType, size: Int) throws {
-    try writeListBeginWithElementType(elementType.rawValue, size: Int32(size))
-  }
-  
-  public func writeFieldValue<T: TSerializable>(value: T, name: String, type: TType, id: Int32) throws {
-    try writeFieldBeginWithName(name, type: type.rawValue, fieldID: id)
-    try writeValue(value)
-    try writeFieldEnd()
-  }
-  
-  public func readValue<T: TSerializable>() throws -> T {
-    return try T.readValueFromProtocol(self)
-  }
-  
-  public func writeValue<T: TSerializable>(value: T) throws {
-    try T.writeValue(value, toProtocol: self)
-  }
-  
-  public func readResultMessageBegin() throws {
-    
-    let (_, type, _) = try readMessageBegin();
-    
-    if type == .EXCEPTION {
-      let x = try readException()
-      throw x
-    }
-    
-    return
-  }
-  
-  public func validateValue(value: Any?, named name: String) throws {
-    
-    if value == nil {
-      throw NSError(
-        domain: TProtocolErrorDomain,
-        code: Int(TProtocolError.Unknown.rawValue),
-        userInfo: [TProtocolErrorFieldNameKey: name])
-    }
-    
-  }
-  
-  public func readException() throws -> ErrorType {
-    
-    var reason : String?
-    var type = TApplicationError.Unknown
-    
-    try readStructBegin()
-    
-    fields: while (true) {
-      
-      let (_, fieldType, fieldID) = try readFieldBegin()
-      
-      switch (fieldID, fieldType) {
-      case (_, .STOP):
-        break fields
-        
-      case (1, .STRING):
-        reason = try readValue() as String
-        
-      case (2, .I32):
-        let typeVal = try readValue() as Int32
-        if let tmp = TApplicationError(rawValue: typeVal) {
-          type = tmp
-        }
-        
-      case let (_, unknownType):
-        try skipType(unknownType)
-      }
-      
-      try readFieldEnd()
-    }
-    
-    try readStructEnd()
-    
-    return NSError(type:type, reason:reason ?? "")
-  }
-  
-  public func writeExceptionForMessageName(name: String, sequenceID: Int, ex: NSError) throws {
-    try writeMessageBeginWithName(name, type: .EXCEPTION, sequenceID: sequenceID)
-    try ex.write(self)
-    try writeMessageEnd()
-  }
-  
-  public func skipType(type: TType) throws {
-    try TProtocolUtil.skipType(type.rawValue, onProtocol: self)
-  }
-  
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSerializable.swift b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSerializable.swift
deleted file mode 100644
index 3fdfd41..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSerializable.swift
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Foundation
-
-
-public protocol TSerializable : Hashable {
-  
-  static var thriftType : TType { get }
-  
-  init()
-  
-  static func readValueFromProtocol(proto: TProtocol) throws -> Self
-  
-  static func writeValue(value: Self, toProtocol proto: TProtocol) throws
-  
-}
-
-
-
-infix operator ?== {}
-
-public func ?==<T: TSerializable>(lhs: T?, rhs: T?) -> Bool {
-  if let l = lhs, r = rhs {
-    return l == r
-  }
-  return lhs == rhs
-}
-
-public func ?==<T: TSerializable>(lhs: T, rhs: T) -> Bool {
-  return lhs == rhs
-}
-
-
-
-extension Bool : TSerializable {
-  
-  public static let thriftType = TType.BOOL
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> Bool {
-    var value : ObjCBool = false
-    try proto.readBool(&value)
-    return value.boolValue
-  }
-  
-  public static func writeValue(value: Bool, toProtocol proto: TProtocol) throws {
-    try proto.writeBool(value)
-  }
-  
-}
-
-extension Int8 : TSerializable {
-  
-  public static let thriftType = TType.BYTE
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> Int8 {
-    var value = UInt8()
-    try proto.readByte(&value)
-    return Int8(value)
-  }
-  
-  public static func writeValue(value: Int8, toProtocol proto: TProtocol) throws {
-    try proto.writeByte(UInt8(value))
-  }
-  
-}
-
-extension Int16 : TSerializable {
-  
-  public static let thriftType = TType.I16
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> Int16 {
-    var value = Int16()
-    try proto.readI16(&value)
-    return value
-  }
-  
-  public static func writeValue(value: Int16, toProtocol proto: TProtocol) throws {
-    try proto.writeI16(value)
-  }
-  
-}
-
-extension Int : TSerializable {
-  
-  public static let thriftType = TType.I32
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> Int {
-    var value = Int32()
-    try proto.readI32(&value)
-    return Int(value)
-  }
-  
-  public static func writeValue(value: Int, toProtocol proto: TProtocol) throws {
-    try proto.writeI32(Int32(value))
-  }
-  
-}
-
-extension Int32 : TSerializable {
-  
-  public static let thriftType = TType.I32
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> Int32 {
-    var value = Int32()
-    try proto.readI32(&value)
-    return value
-  }
-  
-  public static func writeValue(value: Int32, toProtocol proto: TProtocol) throws {
-    try proto.writeI32(value)
-  }
-  
-}
-
-extension Int64 : TSerializable {
-  
-  public static let thriftType = TType.I64
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> Int64 {
-    var value = Int64()
-    try proto.readI64(&value)
-    return value
-  }
-  
-  public static func writeValue(value: Int64, toProtocol proto: TProtocol) throws {
-    try proto.writeI64(value)
-  }
-  
-}
-
-extension Double : TSerializable {
-  
-  public static let thriftType = TType.DOUBLE
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> Double {
-    var value = Double()
-    try proto.readDouble(&value)
-    return value
-  }
-  
-  public static func writeValue(value: Double, toProtocol proto: TProtocol) throws {
-    try proto.writeDouble(value)
-  }
-  
-}
-
-extension String : TSerializable {
-  
-  public static let thriftType = TType.STRING
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> String {
-    var value : NSString?
-    try proto.readString(&value)
-    return value as! String
-  }
-  
-  public static func writeValue(value: String, toProtocol proto: TProtocol) throws {
-    try proto.writeString(value)
-  }
-  
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSet.swift b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSet.swift
deleted file mode 100644
index 85833e5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSet.swift
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Foundation
-
-
-public struct TSet<Element : TSerializable> : CollectionType, ArrayLiteralConvertible, TSerializable {
-  
-  public static var thriftType : TType { return .SET }
-  
-  public typealias Index = Storage.Index
-  
-  typealias Storage = Set<Element>
-  
-  private var storage : Storage
-  
-  public init() {
-    storage = Storage()
-  }
-  
-  public init(arrayLiteral elements: Element...) {
-    storage = Storage(elements)
-  }
-  
-  public init<S : SequenceType where S.Generator.Element == Element>(_ sequence: S) {
-    storage = Storage(sequence)    
-  }
-  
-  public var startIndex : Index { return storage.startIndex }
-  
-  public var endIndex : Index { return storage.endIndex }
-  
-  public mutating func insert(member: Element) {
-    return storage.insert(member)
-  }
-  
-  public mutating func remove(element: Element) -> Element? {
-    return storage.remove(element)
-  }
-  
-  public mutating func removeAll(keepCapacity keepCapacity: Bool = false) {
-    return storage.removeAll(keepCapacity: keepCapacity)
-  }
-  
-  public mutating func removeAtIndex(index: SetIndex<Element>) -> Element {
-    return storage.removeAtIndex(index)
-  }
-  
-  public subscript (position: SetIndex<Element>) -> Element {
-    return storage[position]
-  }
-  
-  public func union(other: TSet) -> TSet {
-    return TSet(storage.union(other))
-  }
-  
-  public func intersect(other: TSet) -> TSet {
-    return TSet(storage.intersect(other))
-  }
-  
-  public func exclusiveOr(other: TSet) -> TSet {
-    return TSet(storage.exclusiveOr(other))
-  }
-  
-  public func subtract(other: TSet) -> TSet {
-    return TSet(storage.subtract(other))
-  }
-  
-  public mutating func intersectInPlace(other: TSet) {
-    storage.intersectInPlace(other)
-  }
-
-  public mutating func exclusiveOrInPlace(other: TSet) {
-    storage.exclusiveOrInPlace(other)
-  }
-
-  public mutating func subtractInPlace(other: TSet) {
-    storage.subtractInPlace(other)
-  }  
-
-  public func isSubsetOf(other: TSet) -> Bool {
-    return storage.isSubsetOf(other)
-  }
-
-  public func isDisjointWith(other: TSet) -> Bool {
-    return storage.isDisjointWith(other)
-  }
-  
-  public func isSupersetOf(other: TSet) -> Bool {
-    return storage.isSupersetOf(other)
-  }
-
-  public var isEmpty: Bool { return storage.isEmpty }
-
-  public var hashValue : Int {
-    let prime = 31
-    var result = 1
-    for element in storage {
-      result = prime * result + element.hashValue
-    }
-    return result
-  }
-  
-  public static func readValueFromProtocol(proto: TProtocol) throws -> TSet {
-    let (elementType, size) = try proto.readSetBegin()
-    if elementType != Element.thriftType {
-      throw NSError(
-        domain: TProtocolErrorDomain,
-        code: Int(TProtocolError.InvalidData.rawValue),
-        userInfo: [TProtocolErrorExtendedErrorKey: NSNumber(int: elementType.rawValue)])
-    }
-    var set = TSet()
-    for _ in 0..<size {
-      let element = try Element.readValueFromProtocol(proto)
-      set.storage.insert(element)
-    }
-    try proto.readSetEnd()
-    return set
-  }
-  
-  public static func writeValue(value: TSet, toProtocol proto: TProtocol) throws {
-    try proto.writeSetBeginWithElementType(Element.thriftType, size: value.count)
-    for element in value.storage {
-      try Element.writeValue(element, toProtocol: proto)
-    }
-    try proto.writeSetEnd()
-  }
-  
-}
-
-extension TSet : CustomStringConvertible, CustomDebugStringConvertible {
-  
-  public var description : String {
-    return storage.description
-  }
-  
-  public var debugDescription : String {
-    return storage.debugDescription
-  }
-  
-}
-
-public func ==<Element>(lhs: TSet<Element>, rhs: TSet<Element>) -> Bool {
-  return lhs.storage == rhs.storage
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSharedProcessorFactory.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSharedProcessorFactory.h
deleted file mode 100644
index c75fad1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSharedProcessorFactory.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TProcessorFactory.h"
-
-
-@interface TSharedProcessorFactory : NSObject <TProcessorFactory>
-
--(id) initWithSharedProcessor:(id<TProcessor>)sharedProcessor;
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSharedProcessorFactory.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSharedProcessorFactory.m
deleted file mode 100644
index 3d55f47..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TSharedProcessorFactory.m
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-#import "TSharedProcessorFactory.h"
-
-
-@interface TSharedProcessorFactory ()
-
-@property(strong, nonatomic) id<TProcessor> sharedProcessor;
-
-@end
-
-
-@implementation TSharedProcessorFactory
-
-
--(id) initWithSharedProcessor:(id<TProcessor>)sharedProcessor
-{
-  self = [super init];
-  if (self) {
-    _sharedProcessor = sharedProcessor;
-  }
-
-  return self;
-}
-
--(id<TProcessor>) processorForTransport:(id<TTransport>)transport
-{
-  return _sharedProcessor;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TStruct.swift b/vendor/git.apache.org/thrift.git/lib/cocoa/src/TStruct.swift
deleted file mode 100644
index cea72e7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TStruct.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Foundation
-
-
-public protocol TStruct : TSerializable {
-}
-
-
-public extension TStruct {
-  
-  public static var thriftType : TType { return TType.STRUCT }
-  
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/Thrift.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/Thrift.h
deleted file mode 100644
index 5c72a01..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/Thrift.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define ThriftVersion @"0.10.0"
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBase.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBase.h
deleted file mode 100644
index b31061e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBase.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "TProtocol.h"
-
-@protocol TBase <NSObject>
-
-/**
- * De-serialize object from the given input protocol
- *
- * @param input protocol used for reading
- */
--(BOOL) read:(id <TProtocol>)inProtocol error:(NSError **)error;
-
-/**
- * Serialize object to the given protocol
- *
- * @param buf output protocol used for writing
- */
--(BOOL) write:(id <TProtocol>)outProtocol error:(NSError **)error;
-
-
-/**
- * Validate required fields
- */
--(BOOL) validate:(NSError *__autoreleasing *)__thriftError;
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBinaryProtocol.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBinaryProtocol.h
deleted file mode 100644
index bb90fad..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBinaryProtocol.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TProtocol.h"
-#import "TTransport.h"
-#import "TProtocolFactory.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TBinaryProtocol : NSObject <TProtocol>
-
-@property (assign, nonatomic) UInt32 messageSizeLimit;
-
--(id) initWithTransport:(id <TTransport>)transport;
-
--(id) initWithTransport:(id <TTransport>)transport
-             strictRead:(BOOL)strictRead
-            strictWrite:(BOOL)strictWrite;
-
-@end;
-
-
-@interface TBinaryProtocolFactory : NSObject <TProtocolFactory>
-
-+(TBinaryProtocolFactory *) sharedFactory;
-
--(TBinaryProtocol *) newProtocolOnTransport:(id <TTransport>)transport;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBinaryProtocol.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBinaryProtocol.m
deleted file mode 100644
index 1f9e57a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TBinaryProtocol.m
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TBinaryProtocol.h"
-#import "TProtocolError.h"
-
-
-static SInt32 VERSION_1 = 0x80010000;
-static SInt32 VERSION_MASK = 0xffff0000;
-
-
-static TBinaryProtocolFactory *gSharedFactory = nil;
-
-
-@implementation TBinaryProtocolFactory
-
-+(TBinaryProtocolFactory *) sharedFactory
-{
-  if (gSharedFactory == nil) {
-    gSharedFactory = [[TBinaryProtocolFactory alloc] init];
-  }
-
-  return gSharedFactory;
-}
-
--(NSString *) protocolName
-{
-  return @"binary";
-}
-
--(TBinaryProtocol *) newProtocolOnTransport:(id <TTransport>)transport
-{
-  return [[TBinaryProtocol alloc] initWithTransport:transport];
-}
-
-@end
-
-
-@interface TBinaryProtocol ()
-
-@property(strong, nonatomic) id <TTransport> transport;
-
-@property(assign, nonatomic) BOOL strictRead;
-@property(assign, nonatomic) BOOL strictWrite;
-
-@property(strong, nonatomic) NSString *currentMessageName;
-@property(strong, nonatomic) NSString *currentFieldName;
-
-@end
-
-
-@implementation TBinaryProtocol
-
--(id) initWithTransport:(id <TTransport>)aTransport
-{
-  return [self initWithTransport:aTransport strictRead:NO strictWrite:YES];
-}
-
--(id) initWithTransport:(id <TTransport>)transport
-             strictRead:(BOOL)strictRead
-            strictWrite:(BOOL)strictWrite
-{
-  self = [super init];
-  if (self) {
-    _transport = transport;
-    _strictRead = strictRead;
-    _strictWrite = strictWrite;
-  }
-  return self;
-}
-
--(id <TTransport>) transport
-{
-  return _transport;
-}
-
--(NSString *) readStringBody:(int)size error:(NSError **)error
-{
-  NSMutableData *data = [NSMutableData dataWithLength:size];
-  if (!data) {
-    PROTOCOL_ERROR(nil, Unknown, @"Unable to allocate %d bytes", size);
-  }
-
-  if (![_transport readAll:data.mutableBytes offset:0 length:size error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(nil, error, @"Transport read failed");
-  }
-
-  return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-}
-
-
--(BOOL) readMessageBeginReturningName:(NSString **)name
-                                 type:(SInt32 *)type
-                           sequenceID:(SInt32 *)sequenceID
-                                error:(NSError *__autoreleasing *)error
-{
-  SInt32 size;
-  if (![self readI32:&size error:error]) {
-    return NO;
-  }
-  ;
-
-  if (size < 0) {
-    int version = size & VERSION_MASK;
-    if (version != VERSION_1) {
-      PROTOCOL_ERROR(NO, BadVersion, @"Bad message version");
-    }
-    if (type != NULL) {
-      *type = size & 0x00FF;
-    }
-    NSString *messageName;
-    if (![self readString:&messageName error:error]) {
-      return NO;
-    }
-    if (name != nil) {
-      *name = messageName;
-    }
-  }
-  else {
-
-    if (_strictRead) {
-      PROTOCOL_ERROR(NO, InvalidData, @"Missing message version, old client?");
-    }
-
-    if (_messageSizeLimit > 0 && size > _messageSizeLimit) {
-      PROTOCOL_ERROR(NO, SizeLimit, @"Message exceeeds size limit of %d", (int)size);
-    }
-
-    NSString *messageName = [self readStringBody:size error:error];
-    if (!messageName) {
-      return NO;
-    }
-
-    if (name != NULL) {
-      *name = messageName;
-    }
-
-    UInt8 messageType;
-    if (![self readByte:&messageType error:error]) {
-      return NO;
-    }
-
-    if (type != NULL) {
-      *type = messageType;
-    }
-  }
-
-  SInt32 seqID;
-  if (![self readI32:&seqID error:error]) {
-    return NO;
-  }
-  if (sequenceID != NULL) {
-    *sequenceID = seqID;
-  }
-
-  return YES;
-}
-
-
--(BOOL) readMessageEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) readStructBeginReturningName:(NSString *__autoreleasing *)name error:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) readStructEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) readFieldBeginReturningName:(NSString *__autoreleasing *)name
-                               type:(SInt32 *)fieldType
-                            fieldID:(SInt32 *)fieldID
-                              error:(NSError *__autoreleasing *)error
-{
-  if (name != nil) {
-    *name = nil;
-  }
-
-  UInt8 ft;
-  if (![self readByte:&ft error:error]) {
-    return NO;
-  }
-  if (fieldType != NULL) {
-    *fieldType = ft;
-  }
-  if (ft != TTypeSTOP) {
-    SInt16 fid;
-    if (![self readI16:&fid error:error]) {
-      return NO;
-    }
-    if (fieldID != NULL) {
-      *fieldID = fid;
-    }
-  }
-  return YES;
-}
-
-
--(BOOL) readFieldEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) readString:(NSString *__autoreleasing *)value error:(NSError *__autoreleasing *)error
-{
-  SInt32 size;
-  if (![self readI32:&size error:error]) {
-    return NO;
-  }
-
-  NSString *string = [self readStringBody:size error:error];
-  if (!string) {
-    return NO;
-  }
-
-  *value = string;
-
-  return YES;
-}
-
-
--(BOOL) readBool:(BOOL *)value error:(NSError *__autoreleasing *)error
-{
-  UInt8 byte;
-  if (![self readByte:&byte error:error]) {
-    return NO;
-  }
-
-  *value = byte == 1;
-
-  return YES;
-}
-
-
--(BOOL) readByte:(UInt8 *)value error:(NSError *__autoreleasing *)error
-{
-  UInt8 buff[1];
-  if (![_transport readAll:buff offset:0 length:1 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport read failed");
-  }
-
-  *value = buff[0];
-
-  return YES;
-}
-
-
--(BOOL) readI16:(SInt16 *)value error:(NSError *__autoreleasing *)error
-{
-  UInt8 buff[2];
-  if (![_transport readAll:buff offset:0 length:2 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport read failed");
-  }
-
-  *value =
-    ((SInt16)(buff[0] & 0xff) << 8) |
-    ((SInt16)(buff[1] & 0xff));
-
-  return YES;
-}
-
-
--(BOOL) readI32:(SInt32 *)value error:(NSError *__autoreleasing *)error
-{
-  UInt8 i32rd[4];
-  if (![_transport readAll:i32rd offset:0 length:4 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport read failed");
-  }
-
-  *value =
-    ((i32rd[0] & 0xff) << 24) |
-    ((i32rd[1] & 0xff) << 16) |
-    ((i32rd[2] & 0xff) <<  8) |
-    ((i32rd[3] & 0xff));
-
-  return YES;
-}
-
-
--(BOOL) readI64:(SInt64 *)value error:(NSError *__autoreleasing *)error
-{
-  UInt8 buff[8];
-  if (![_transport readAll:buff offset:0 length:8 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport read failed");
-  }
-
-  *value =
-    ((SInt64)(buff[0] & 0xff) << 56) |
-    ((SInt64)(buff[1] & 0xff) << 48) |
-    ((SInt64)(buff[2] & 0xff) << 40) |
-    ((SInt64)(buff[3] & 0xff) << 32) |
-    ((SInt64)(buff[4] & 0xff) << 24) |
-    ((SInt64)(buff[5] & 0xff) << 16) |
-    ((SInt64)(buff[6] & 0xff) <<  8) |
-    ((SInt64)(buff[7] & 0xff));
-
-  return YES;
-}
-
-
--(BOOL) readDouble:(double *)value error:(NSError *__autoreleasing *)error
-{
-  // FIXME - will this get us into trouble on PowerPC?
-  return [self readI64:(SInt64 *)value error:error];
-}
-
-
--(BOOL) readBinary:(NSData *__autoreleasing *)value error:(NSError *__autoreleasing *)error
-{
-  SInt32 size;
-  if (![self readI32:&size error:error]) {
-    return NO;
-  }
-
-  NSMutableData *data = [NSMutableData dataWithLength:size];
-  if (!data) {
-    PROTOCOL_ERROR(NO, Unknown, @"Unable to allocate %d bytes", (int)size);
-  }
-
-  if (![_transport readAll:data.mutableBytes offset:0 length:size error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport read failed");
-  }
-
-  *value = data;
-
-  return YES;
-}
-
-
--(BOOL) readMapBeginReturningKeyType:(SInt32 *)keyType
-                           valueType:(SInt32 *)valueType
-                                size:(SInt32 *)size
-                               error:(NSError *__autoreleasing *)error
-{
-  UInt8 kt;
-  if (![self readByte:&kt error:error]) {
-    return NO;
-  }
-
-  UInt8 vt;
-  if (![self readByte:&vt error:error]) {
-    return NO;
-  }
-
-  SInt32 s;
-  if (![self readI32:&s error:error]) {
-    return NO;
-  }
-
-  if (keyType != NULL) {
-    *keyType = kt;
-  }
-
-  if (valueType != NULL) {
-    *valueType = vt;
-  }
-
-  if (size != NULL) {
-    *size = s;
-  }
-
-  return YES;
-}
-
-
--(BOOL) readMapEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) readSetBeginReturningElementType:(SInt32 *)elementType
-                                    size:(SInt32 *)size
-                                   error:(NSError *__autoreleasing *)error
-{
-  UInt8 et;
-  if (![self readByte:&et error:error]) {
-    return NO;
-  }
-
-  SInt32 s;
-  if (![self readI32:&s error:error]) {
-    return NO;
-  }
-
-  if (elementType != NULL) {
-    *elementType = et;
-  }
-
-  if (size != NULL) {
-    *size = s;
-  }
-
-  return YES;
-}
-
-
--(BOOL) readSetEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) readListBeginReturningElementType:(SInt32 *)elementType
-                                     size:(SInt32 *)size
-                                    error:(NSError *__autoreleasing *)error
-{
-  UInt8 et;
-  if (![self readByte:&et error:error]) {
-    return NO;
-  }
-
-  SInt32 s;
-  if (![self readI32:&s error:error]) {
-    return NO;
-  }
-
-  if (elementType != NULL) {
-    *elementType = et;
-  }
-
-  if (size != NULL) {
-    *size = s;
-  }
-
-  return YES;
-}
-
-
--(BOOL) readListEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
-
--(BOOL) writeMessageBeginWithName:(NSString *)name
-                             type:(SInt32)messageType
-                       sequenceID:(SInt32)sequenceID
-                            error:(NSError *__autoreleasing *)error
-{
-  if (_strictWrite) {
-
-    int version = VERSION_1 | messageType;
-
-    if (![self writeI32:version error:error]) {
-      return NO;
-    }
-
-    if (![self writeString:name error:error]) {
-      return NO;
-    }
-
-    if (![self writeI32:sequenceID error:error]) {
-      return NO;
-    }
-  }
-  else {
-
-    if (![self writeString:name error:error]) {
-      return NO;
-    }
-
-    if (![self writeByte:messageType error:error]) {
-      return NO;
-    }
-
-    if (![self writeI32:sequenceID error:error]) {
-      return NO;
-    }
-  }
-
-  _currentMessageName = name;
-
-  return YES;
-}
-
-
--(BOOL) writeMessageEnd:(NSError *__autoreleasing *)error
-{
-  _currentMessageName = nil;
-  return YES;
-}
-
-
--(BOOL) writeStructBeginWithName:(NSString *)name
-                           error:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) writeStructEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) writeFieldBeginWithName:(NSString *)name
-                           type:(SInt32)fieldType
-                        fieldID:(SInt32)fieldID
-                          error:(NSError *__autoreleasing *)error
-{
-  if (![self writeByte:fieldType error:error]) {
-    return NO;
-  }
-
-  if (![self writeI16:fieldID error:error]) {
-    return NO;
-  }
-
-  return YES;
-}
-
-
--(BOOL) writeBool:(BOOL)value error:(NSError *__autoreleasing *)error
-{
-  return [self writeByte:(value ? 1 : 0) error:error];
-}
-
-
--(BOOL) writeByte:(UInt8)value error:(NSError *__autoreleasing *)error
-{
-  if (![_transport write:&value offset:0 length:1 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-  return YES;
-}
-
-
--(BOOL) writeI16:(short)value error:(NSError *__autoreleasing *)error
-{
-  UInt8 buff[2];
-  buff[0] = 0xff & (value >> 8);
-  buff[1] = 0xff & value;
-
-  if (![_transport write:buff offset:0 length:2 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-
-  return YES;
-}
-
-
--(BOOL) writeI32:(SInt32)value error:(NSError *__autoreleasing *)error
-{
-  UInt8 buff[4];
-  buff[0] = 0xFF & (value >> 24);
-  buff[1] = 0xFF & (value >> 16);
-  buff[2] = 0xFF & (value >> 8);
-  buff[3] = 0xFF & value;
-
-  if (![_transport write:buff offset:0 length:4 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-
-  return YES;
-}
-
-
--(BOOL) writeI64:(SInt64)value error:(NSError *__autoreleasing *)error
-{
-  UInt8 buff[8];
-  buff[0] = 0xFF & (value >> 56);
-  buff[1] = 0xFF & (value >> 48);
-  buff[2] = 0xFF & (value >> 40);
-  buff[3] = 0xFF & (value >> 32);
-  buff[4] = 0xFF & (value >> 24);
-  buff[5] = 0xFF & (value >> 16);
-  buff[6] = 0xFF & (value >> 8);
-  buff[7] = 0xFF & value;
-
-  if (![_transport write:buff offset:0 length:8 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-
-  return YES;
-}
-
-
--(BOOL) writeDouble:(double)value error:(NSError *__autoreleasing *)error
-{
-  // FIXME - will this get us in trouble on PowerPC?
-  if (![self writeI64:*(SInt64 *)&value error:error]) {
-    return NO;
-  }
-
-  return YES;
-}
-
-
--(BOOL) writeString:(NSString *)value error:(NSError *__autoreleasing *)error
-{
-  if (value != nil) {
-
-    const char *utf8Bytes = [value UTF8String];
-
-    SInt32 length = (SInt32)strlen(utf8Bytes);
-    if (![self writeI32:length error:error]) {
-      return NO;
-    }
-
-    if (![_transport write:(UInt8 *)utf8Bytes offset:0 length:(int)length error:error]) {
-      PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-    }
-
-  }
-  else {
-
-    // instead of crashing when we get null, let's write out a zero
-    // length string
-    if (![self writeI32:0 error:error]) {
-      return NO;
-    }
-
-  }
-
-  return YES;
-}
-
-
--(BOOL) writeBinary:(NSData *)data error:(NSError *__autoreleasing *)error
-{
-  if (![self writeI32:(SInt32)data.length error:error]) {
-    return NO;
-  }
-
-  if (![_transport write:data.bytes offset:0 length:(UInt32)data.length error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-
-  return YES;
-}
-
-
--(BOOL) writeFieldStop:(NSError *__autoreleasing *)error
-{
-  if (![self writeByte:TTypeSTOP error:error]) {
-    return NO;
-  }
-
-  return YES;
-}
-
-
--(BOOL) writeFieldEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) writeMapBeginWithKeyType:(SInt32)keyType
-                       valueType:(SInt32)valueType
-                            size:(SInt32)size
-                           error:(NSError *__autoreleasing *)error
-{
-  if (![self writeByte:keyType error:error]) {
-    return NO;
-  }
-  if (![self writeByte:valueType error:error]) {
-    return NO;
-  }
-  if (![self writeI32:(int)size error:error]) {
-    return NO;
-  }
-  return YES;
-}
-
-
--(BOOL) writeMapEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) writeSetBeginWithElementType:(SInt32)elementType
-                                size:(SInt32)size
-                               error:(NSError *__autoreleasing *)error
-{
-  if (![self writeByte:elementType error:error]) {
-    return NO;
-  }
-  if (![self writeI32:size error:error]) {
-    return NO;
-  }
-  return YES;
-}
-
-
--(BOOL) writeSetEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-
--(BOOL) writeListBeginWithElementType:(SInt32)elementType
-                                 size:(SInt32)size
-                                error:(NSError *__autoreleasing *)error
-{
-  if (![self writeByte:elementType error:error]) {
-    return NO;
-  }
-  if (![self writeI32:size error:error]) {
-    return NO;
-  }
-  return YES;
-}
-
-
--(BOOL) writeListEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TCompactProtocol.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TCompactProtocol.h
deleted file mode 100644
index 3f6accc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TCompactProtocol.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TProtocol.h"
-#import "TTransport.h"
-#import "TProtocolFactory.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TCompactProtocol : NSObject <TProtocol>
-
--(id) initWithTransport:(id <TTransport>)transport;
-
-@end
-
-@interface TCompactProtocolFactory : NSObject <TProtocolFactory>
-
-+(TCompactProtocolFactory *) sharedFactory;
-
--(TCompactProtocol *) newProtocolOnTransport:(id <TTransport>)transport;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TCompactProtocol.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TCompactProtocol.m
deleted file mode 100644
index 9b0ebb2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TCompactProtocol.m
+++ /dev/null
@@ -1,983 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TCompactProtocol.h"
-#import "TProtocolError.h"
-
-static const UInt8 COMPACT_PROTOCOL_ID = 0x82;
-static const UInt8 COMPACT_VERSION = 1;
-static const UInt8 COMPACT_VERSION_MASK = 0x1F; // 0001 1111
-static const UInt8 COMPACT_TYPE_MASK = 0xE0; // 1110 0000
-static const UInt8 COMPACT_TYPE_BITS = 0x07; // 0000 0111
-static const int COMPACT_TYPE_SHIFT_AMOUNT = 5;
-
-enum {
-  TCType_STOP = 0x00,
-  TCType_BOOLEAN_TRUE = 0x01,
-  TCType_BOOLEAN_FALSE = 0x02,
-  TCType_BYTE = 0x03,
-  TCType_I16 = 0x04,
-  TCType_I32 = 0x05,
-  TCType_I64 = 0x06,
-  TCType_DOUBLE = 0x07,
-  TCType_BINARY = 0x08,
-  TCType_LIST = 0x09,
-  TCType_SET = 0x0A,
-  TCType_MAP = 0x0B,
-  TCType_STRUCT = 0x0C,
-};
-
-@implementation TCompactProtocolFactory
-
-+(TCompactProtocolFactory *) sharedFactory
-{
-  static TCompactProtocolFactory *gSharedFactory = nil;
-  if (gSharedFactory == nil) {
-    gSharedFactory = [[TCompactProtocolFactory alloc] init];
-  }
-
-  return gSharedFactory;
-}
-
--(NSString *) protocolName
-{
-  return @"compact";
-}
-
--(TCompactProtocol *) newProtocolOnTransport:(id <TTransport>)transport
-{
-  return [[TCompactProtocol alloc] initWithTransport:transport];
-}
-
-@end
-
-
-@interface TCompactProtocol ()
-
-@property(strong, nonatomic) id <TTransport> transport;
-
-@property(strong, nonatomic) NSMutableArray *lastField;
-@property(assign, nonatomic) short lastFieldId;
-
-@property(strong, nonatomic) NSString *boolFieldName;
-@property(strong, nonatomic) NSNumber *boolFieldType;
-@property(strong, nonatomic) NSNumber *boolFieldId;
-@property(strong, nonatomic) NSNumber *booleanValue;
-
-@property(strong, nonatomic) NSString *currentMessageName;
-
-@end
-
-
-@implementation TCompactProtocol
-
--(id) init
-{
-  self = [super init];
-
-  if (self != nil) {
-    _lastField = [[NSMutableArray alloc] init];
-  }
-
-  return self;
-}
-
--(id) initWithTransport:(id <TTransport>)aTransport
-{
-  self = [self init];
-
-  if (self != nil) {
-    _transport = aTransport;
-  }
-
-  return self;
-}
-
--(id <TTransport>) transport
-{
-  return _transport;
-}
-
--(BOOL) writeByteDirect:(UInt8)n error:(NSError *__autoreleasing *)error
-{
-  if (![_transport write:(UInt8 *)&n offset:0 length:1 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-  return YES;
-}
-
--(BOOL) writeVarint32:(UInt32)n error:(NSError *__autoreleasing *)error
-{
-  UInt8 i32buf[5] = {0};
-  UInt32 idx = 0;
-
-  while (true) {
-    if ((n & ~0x7F) == 0) {
-      i32buf[idx++] = (UInt8)n;
-      break;
-    }
-    else {
-      i32buf[idx++] = (UInt8)((n & 0x7F) | 0x80);
-      n >>= 7;
-    }
-  }
-
-  if (![_transport write:i32buf offset:0 length:idx error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-
-  return YES;
-}
-
--(BOOL) writeMessageBeginWithName:(NSString *)name
-                             type:(SInt32)messageType
-                       sequenceID:(SInt32)sequenceID
-                            error:(NSError *__autoreleasing *)error
-{
-  if (![self writeByteDirect:COMPACT_PROTOCOL_ID error:error]) {
-    return NO;
-  }
-  if (![self writeByteDirect:(UInt8)((COMPACT_VERSION & COMPACT_VERSION_MASK) |
-                                     ((((UInt32)messageType) << COMPACT_TYPE_SHIFT_AMOUNT) & COMPACT_TYPE_MASK)) error:error])
-  {
-    return NO;
-  }
-  if (![self writeVarint32:(UInt32)sequenceID error:error]) {
-    return NO;
-  }
-  if (![self writeString:name error:error]) {
-    return NO;
-  }
-
-  _currentMessageName = name;
-
-  return YES;
-}
-
--(BOOL) writeStructBeginWithName:(NSString *)name error:(NSError *__autoreleasing *)error
-{
-  [_lastField addObject:@(_lastFieldId)];
-  _lastFieldId = 0;
-  return YES;
-}
-
--(BOOL) writeStructEnd:(NSError *__autoreleasing *)error
-{
-  _lastFieldId = [_lastField.lastObject shortValue];
-  [_lastField removeLastObject];
-  return YES;
-}
-
--(BOOL) writeFieldBeginWithName:(NSString *)name
-                           type:(SInt32)fieldType
-                        fieldID:(SInt32)fieldID
-                          error:(NSError *__autoreleasing *)error
-{
-  if (fieldType == TTypeBOOL) {
-    _boolFieldName = [name copy];
-    _boolFieldType = @(fieldType);
-    _boolFieldId = @(fieldID);
-    return YES;
-  }
-  else {
-    return [self writeFieldBeginInternalWithName:name
-                                            type:fieldType
-                                         fieldID:fieldID
-                                    typeOverride:0xFF
-                                           error:error];
-  }
-}
-
--(BOOL) writeFieldBeginInternalWithName:(NSString *)name
-                                   type:(SInt32)fieldType
-                                fieldID:(SInt32)fieldID
-                           typeOverride:(UInt8)typeOverride
-                                  error:(NSError *__autoreleasing *)error
-{
-  UInt8 typeToWrite = typeOverride == 0xFF ? [self compactTypeForTType:fieldType] : typeOverride;
-
-  // check if we can use delta encoding for the field id
-  if (fieldID > _lastFieldId && fieldID - _lastFieldId <= 15) {
-    // Write them together
-    if (![self writeByteDirect:(fieldID - _lastFieldId) << 4 | typeToWrite error:error]) {
-      return NO;
-    }
-  }
-  else {
-    // Write them separate
-    if (![self writeByteDirect:typeToWrite error:error]) {
-      return NO;
-    }
-    if (![self writeI16:fieldID error:error]) {
-      return NO;
-    }
-  }
-
-  _lastFieldId = fieldID;
-
-  return YES;
-}
-
--(BOOL) writeFieldStop:(NSError *__autoreleasing *)error
-{
-  return [self writeByteDirect:TCType_STOP error:error];
-}
-
--(BOOL) writeMapBeginWithKeyType:(SInt32)keyType
-                       valueType:(SInt32)valueType
-                            size:(SInt32)size
-                           error:(NSError *__autoreleasing *)error
-{
-  if (size == 0) {
-    if (![self writeByteDirect:0 error:error]) {
-      return NO;
-    }
-  }
-  else {
-    if (![self writeVarint32:(UInt32)size error:error]) {
-      return NO;
-    }
-    if (![self writeByteDirect:[self compactTypeForTType:keyType] << 4 | [self compactTypeForTType:valueType] error:error]) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
--(BOOL) writeListBeginWithElementType:(SInt32)elementType
-                                 size:(SInt32)size
-                                error:(NSError *__autoreleasing *)error
-{
-  return [self writeCollectionBeginWithElementType:elementType size:size error:error];
-}
-
--(BOOL) writeSetBeginWithElementType:(SInt32)elementType
-                                size:(SInt32)size
-                               error:(NSError *__autoreleasing *)error
-{
-  return [self writeCollectionBeginWithElementType:elementType size:size error:error];
-}
-
--(BOOL) writeBool:(BOOL)b error:(NSError *__autoreleasing *)error
-{
-  BOOL result;
-  if (_boolFieldId != nil && _boolFieldName != nil && _boolFieldType != nil) {
-    // we haven't written the field header yet
-    result = [self writeFieldBeginInternalWithName:_boolFieldName
-                                              type:_boolFieldType.intValue
-                                           fieldID:_boolFieldId.intValue
-                                      typeOverride:b ? TCType_BOOLEAN_TRUE : TCType_BOOLEAN_FALSE
-                                             error:error];
-    _boolFieldId = nil;
-    _boolFieldName = nil;
-    _boolFieldType = nil;
-  }
-  else {
-    // we're not part of a field, so just Write the value.
-    result = [self writeByteDirect:b ? TCType_BOOLEAN_TRUE : TCType_BOOLEAN_FALSE error:error];
-  }
-  return result;
-}
-
--(BOOL) writeByte:(UInt8)value error:(NSError *__autoreleasing *)error
-{
-  return [self writeByteDirect:value error:error];
-}
-
--(BOOL) writeI16:(SInt16)value error:(NSError *__autoreleasing *)error
-{
-  return [self writeVarint32:[self i32ToZigZag:value] error:error];
-}
-
--(BOOL) writeI32:(SInt32)value error:(NSError *__autoreleasing *)error
-{
-  return [self writeVarint32:[self i32ToZigZag:value] error:error];
-}
-
--(BOOL) writeI64:(SInt64)value error:(NSError *__autoreleasing *)error
-{
-  return [self writeVarint64:[self i64ToZigZag:value] error:error];
-}
-
--(BOOL) writeDouble:(double)value error:(NSError *__autoreleasing *)error
-{
-  // Safe bit-casting double->uint64
-
-  UInt64 bits = 0;
-  memcpy(&bits, &value, 8);
-
-  bits = OSSwapHostToLittleInt64(bits);
-
-  if (![_transport write:(UInt8 *)&bits offset:0 length:8 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-
-  return YES;
-}
-
--(BOOL) writeString:(NSString *)value error:(NSError *__autoreleasing *)error
-{
-  return [self writeBinary:[value dataUsingEncoding:NSUTF8StringEncoding] error:error];
-}
-
--(BOOL) writeBinary:(NSData *)data error:(NSError *__autoreleasing *)error
-{
-  if (![self writeVarint32:(UInt32)data.length error:error]) {
-    return NO;
-  }
-  if (![_transport write:data.bytes offset:0 length:(UInt32)data.length error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-  return YES;
-}
-
--(BOOL) writeMessageEnd:(NSError *__autoreleasing *)error
-{
-  _currentMessageName = nil;
-  return YES;
-}
-
--(BOOL) writeMapEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
--(BOOL) writeListEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
--(BOOL) writeSetEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
--(BOOL) writeFieldEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
--(BOOL) writeCollectionBeginWithElementType:(SInt32)elementType
-                                       size:(SInt32)size
-                                      error:(NSError *__autoreleasing *)error
-{
-  UInt8 ctypeElement = [self compactTypeForTType:elementType];
-
-  if (size <= 14) {
-    if (![self writeByteDirect:size << 4 | ctypeElement error:error]) {
-      return NO;
-    }
-  }
-  else {
-    if (![self writeByteDirect:0xf0 | ctypeElement error:error]) {
-      return NO;
-    }
-    if (![self writeVarint32:(UInt32)size error:error]) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
--(BOOL) writeVarint64:(UInt64)n error:(NSError *__autoreleasing *)error
-{
-  UInt8 varint64out[10] = {0};
-  int idx = 0;
-
-  while (true) {
-    if ((n & ~0x7FL) == 0) {
-      varint64out[idx++] = (UInt8)n;
-      break;
-    }
-    else {
-      varint64out[idx++] = (UInt8)((n & 0x7F) | 0x80);
-      n >>= 7;
-    }
-  }
-
-  if (![_transport write:varint64out offset:0 length:idx error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport write failed");
-  }
-
-  return YES;
-}
-
--(UInt32) i32ToZigZag:(SInt32)n
-{
-  /*
-     ZigZag encoding maps signed integers to unsigned integers so that
-     numbers with a small absolute value (for instance, -1) have
-     a small varint encoded value too. It does this in a way that
-     "zig-zags" back and forth through the positive and negative integers,
-     so that -1 is encoded as 1, 1 is encoded as 2, -2 is encoded as 3, and so
-         on
-   */
-  return (UInt32)(n << 1) ^ (UInt32)(n >> 31);
-}
-
--(UInt64) i64ToZigZag:(SInt64)n
-{
-  return (UInt64)(n << 1) ^ (UInt64)(n >> 63);
-}
-
--(BOOL) readMessageBeginReturningName:(NSString **)pname
-                                 type:(SInt32 *)ptype
-                           sequenceID:(SInt32 *)psequenceID
-                                error:(NSError *__autoreleasing *)error
-{
-  UInt8 protocolId;
-  if (![self readByte:&protocolId error:error]) {
-    return NO;
-  }
-
-  if (protocolId != COMPACT_PROTOCOL_ID) {
-    if (error) {
-      *error = [NSError errorWithDomain:TProtocolErrorDomain
-                                   code:TProtocolErrorUnknown
-                               userInfo:@{TProtocolErrorExtendedErrorKey: @(TProtocolExtendedErrorMismatchedProtocol),
-                                          TProtocolErrorExpectedIdKey: @(COMPACT_PROTOCOL_ID)}];
-    }
-    return NO;
-  }
-
-  UInt8 versionAndType;
-  if (![self readByte:&versionAndType error:error]) {
-    return NO;
-  }
-
-  UInt8 version = versionAndType & COMPACT_VERSION_MASK;
-  if (version != COMPACT_VERSION) {
-    if (error) {
-      *error = [NSError errorWithDomain:TProtocolErrorDomain
-                                   code:TProtocolErrorBadVersion
-                               userInfo:@{TProtocolErrorExpectedVersionKey: @(COMPACT_VERSION)}];
-    }
-    return NO;
-  }
-
-  int type = (versionAndType >> COMPACT_TYPE_SHIFT_AMOUNT) & COMPACT_TYPE_BITS;
-  UInt32 sequenceID;
-  if (![self readVarint32:&sequenceID error:error]) {
-    return NO;
-  }
-  NSString *name;
-  if (![self readString:&name error:error]) {
-    return NO;
-  }
-
-  if (ptype != NULL) {
-    *ptype = type;
-  }
-  if (psequenceID != NULL) {
-    *psequenceID = sequenceID;
-  }
-  if (pname != NULL) {
-    *pname = name;
-  }
-  return YES;
-}
-
--(BOOL) readStructBeginReturningName:(NSString **)pname error:(NSError *__autoreleasing *)error
-{
-  [_lastField addObject:@(_lastFieldId)];
-  _lastFieldId = 0;
-
-  if (pname != NULL) {
-    *pname = @"";
-  }
-
-  return YES;
-}
-
--(BOOL) readStructEnd:(NSError *__autoreleasing *)error
-{
-  _lastFieldId = [_lastField.lastObject shortValue];
-  [_lastField removeLastObject];
-  return YES;
-}
-
--(BOOL) readFieldBeginReturningName:(NSString **)pname
-                               type:(SInt32 *)pfieldType
-                            fieldID:(SInt32 *)pfieldID
-                              error:(NSError *__autoreleasing *)error
-{
-  UInt8 byte;
-  if (![self readByte:&byte error:error]) {
-    return NO;
-  }
-
-  UInt8 type = byte & 0x0f;
-
-  // if it's a stop, then we can return immediately, as the struct is over.
-  if (type == TCType_STOP) {
-    if (pname != NULL) {
-      *pname = @"";
-    }
-    if (pfieldType != NULL) {
-      *pfieldType = TTypeSTOP;
-    }
-    if (pfieldID != NULL) {
-      *pfieldID = 0;
-    }
-    return YES;
-  }
-
-  short fieldId = 0;
-
-  // mask off the 4 MSB of the type header. it could contain a field id delta.
-  short modifier = (byte & 0xf0) >> 4;
-  if (modifier == 0) {
-    // not a delta. look ahead for the zigzag varint field id.
-    if (![self readI16:&fieldId error:error]) {
-      return NO;
-    }
-  }
-  else {
-    // has a delta. add the delta to the last Read field id.
-    fieldId = _lastFieldId + modifier;
-  }
-
-  UInt8 fieldType;
-  if (![self ttype:&fieldType forCompactType:type error:error]) {
-    return NO;
-  }
-
-  if (pname != NULL) {
-    *pname = @"";
-  }
-  if (pfieldType != NULL) {
-    *pfieldType = fieldType;
-  }
-  if (pfieldID != NULL) {
-    *pfieldID = fieldId;
-  }
-
-  // if this happens to be a boolean field, the value is encoded in the type
-  if (type == TCType_BOOLEAN_TRUE ||
-      type == TCType_BOOLEAN_FALSE)
-  {
-    // save the boolean value in a special instance variable.
-    _booleanValue = [NSNumber numberWithBool:type == TCType_BOOLEAN_TRUE];
-  }
-
-  // push the new field onto the field stack so we can keep the deltas going.
-  _lastFieldId = fieldId;
-
-  return YES;
-}
-
--(BOOL) readMapBeginReturningKeyType:(SInt32 *)pkeyType
-                           valueType:(SInt32 *)pvalueType
-                                size:(SInt32 *)psize
-                               error:(NSError *__autoreleasing *)error
-{
-  UInt8 keyAndValueType = 0;
-  UInt32 size;
-  if (![self readVarint32:&size error:error]) {
-    return NO;
-  }
-  if (size != 0) {
-    if (![self readByte:&keyAndValueType error:error]) {
-      return NO;
-    }
-  }
-
-  UInt8 keyType;
-  if (![self ttype:&keyType forCompactType:keyAndValueType >> 4 error:error]) {
-    return NO;
-  }
-
-  UInt8 valueType;
-  if (![self ttype:&valueType forCompactType:keyAndValueType & 0xf error:error]) {
-    return NO;
-  }
-
-  if (pkeyType != NULL) {
-    *pkeyType = keyType;
-  }
-  if (pvalueType != NULL) {
-    *pvalueType = valueType;
-  }
-  if (psize != NULL) {
-    *psize = size;
-  }
-
-  return YES;
-}
-
--(BOOL) readListBeginReturningElementType:(SInt32 *)pelementType
-                                     size:(SInt32 *)psize
-                                    error:(NSError *__autoreleasing *)error
-{
-  UInt8 sizeAndType;
-  if (![self readByte:&sizeAndType error:error]) {
-    return NO;
-  }
-
-  UInt32 size = (sizeAndType >> 4) & 0x0f;
-  if (size == 15) {
-    if (![self readVarint32:&size error:error]) {
-      return NO;
-    }
-  }
-
-  UInt8 elementType;
-  if (![self ttype:&elementType forCompactType:sizeAndType & 0x0f error:error]) {
-    return NO;
-  }
-
-  if (pelementType != NULL) {
-    *pelementType = elementType;
-  }
-  if (psize != NULL) {
-    *psize = size;
-  }
-
-  return YES;
-}
-
--(BOOL) readSetBeginReturningElementType:(SInt32 *)pelementType
-                                    size:(SInt32 *)psize
-                                   error:(NSError *__autoreleasing *)error
-{
-  return [self readListBeginReturningElementType:pelementType size:psize error:error];
-}
-
--(BOOL) readBool:(BOOL *)value error:(NSError *__autoreleasing *)error
-{
-  if (_booleanValue != nil) {
-
-    BOOL result = _booleanValue.boolValue;
-    _booleanValue = nil;
-
-    *value = result;
-  }
-  else {
-
-    UInt8 result;
-    if (![self readByte:&result error:error]) {
-      return NO;
-    }
-
-    *value = result == TCType_BOOLEAN_TRUE;
-  }
-
-  return YES;
-}
-
--(BOOL) readByte:(UInt8 *)value error:(NSError *__autoreleasing *)error
-{
-  if (![_transport readAll:value offset:0 length:1 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport read failed");
-  }
-  return YES;
-}
-
--(BOOL) readI16:(SInt16 *)value error:(NSError *__autoreleasing *)error
-{
-  UInt32 v;
-  if (![self readVarint32:&v error:error]) {
-    return NO;
-  }
-
-  if (value) {
-    *value = (SInt16)[self zigZagToi32:v];
-  }
-
-  return YES;
-}
-
--(BOOL) readI32:(SInt32 *)value error:(NSError *__autoreleasing *)error
-{
-  UInt32 v;
-  if (![self readVarint32:&v error:error]) {
-    return NO;
-  }
-
-  if (value) {
-    *value = [self zigZagToi32:v];
-  }
-
-  return YES;
-}
-
--(BOOL) readI64:(SInt64 *)value error:(NSError *__autoreleasing *)error
-{
-  UInt64 v;
-  if (![self readVarint64:&v error:error]) {
-    return NO;
-  }
-
-  if (value) {
-    *value = [self zigZagToi64:v];
-  }
-
-  return YES;
-}
-
--(BOOL) readDouble:(double *)value error:(NSError *__autoreleasing *)error
-{
-  UInt64 bits;
-  if (![_transport readAll:(UInt8 *)&bits offset:0 length:8 error:error]) {
-    PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport read failed");
-  }
-
-  bits = OSSwapLittleToHostInt64(bits);
-
-  if (value) {
-    memcpy(value, &bits, sizeof(bits));
-  }
-
-  return YES;
-}
-
--(BOOL) readString:(NSString *__autoreleasing *)value error:(NSError *__autoreleasing *)error
-{
-  UInt32 length;
-  if (![self readVarint32:&length error:error]) {
-    return NO;
-  }
-
-  NSString *result;
-
-  if (length != 0) {
-
-    NSData *data;
-    if (![self readBinaryOfLength:length data:&data error:error]) {
-      return NO;
-    }
-
-    result = [[NSString alloc] initWithData:data
-                                   encoding:NSUTF8StringEncoding];
-  }
-  else {
-    result = @"";
-  }
-
-  if (value) {
-    *value = result;
-  }
-
-  return YES;
-}
-
--(BOOL) readBinary:(NSData *__autoreleasing *)value error:(NSError *__autoreleasing *)error
-{
-  UInt32 length;
-  if (![self readVarint32:&length error:error]) {
-    return NO;
-  }
-
-  return [self readBinaryOfLength:length data:value error:error];
-}
-
--(BOOL) readBinaryOfLength:(UInt32)length data:(NSData *__autoreleasing *)value error:(NSError *__autoreleasing *)error
-{
-  NSData *result;
-
-  if (length != 0) {
-
-    NSMutableData *buf = [NSMutableData dataWithLength:length];
-    if (![_transport readAll:buf.mutableBytes offset:0 length:length error:error]) {
-      PROTOCOL_TRANSPORT_ERROR(NO, error, @"Transport read failed");
-    }
-
-    result = buf;
-  }
-  else {
-
-    result = [NSData data];
-
-  }
-
-  if (value) {
-    *value = result;
-  }
-
-  return YES;
-}
-
--(BOOL) readMessageEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
--(BOOL) readFieldEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
--(BOOL) readMapEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
--(BOOL) readListEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
--(BOOL) readSetEnd:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
--(BOOL) readVarint32:(UInt32 *)value error:(NSError *__autoreleasing *)error
-{
-  UInt32 result = 0;
-  int shift = 0;
-
-  while (true) {
-
-    UInt8 byte;
-    if (![self readByte:&byte error:error]) {
-      return NO;
-    }
-
-    result |= (UInt32)(byte & 0x7f) << shift;
-    if (!(byte & 0x80)) {
-      break;
-    }
-
-    shift += 7;
-  }
-
-  if (value) {
-    *value = result;
-  }
-
-  return YES;
-}
-
--(BOOL) readVarint64:(UInt64 *)value error:(NSError *__autoreleasing *)error
-{
-  int shift = 0;
-  UInt64 result = 0;
-
-  while (true) {
-
-    UInt8 byte;
-    if (![self readByte:&byte error:error]) {
-      return NO;
-    }
-
-    result |= (UInt64)(byte & 0x7f) << shift;
-    if (!(byte & 0x80)) {
-      break;
-    }
-
-    shift += 7;
-  }
-
-  if (value) {
-    *value = result;
-  }
-
-  return YES;
-}
-
--(SInt32) zigZagToi32:(UInt32)n
-{
-  return (SInt32)(n >> 1) ^ (-(SInt32)(n & 1));
-}
-
--(SInt64) zigZagToi64:(UInt64)n
-{
-  return (SInt64)(n >> 1) ^ (-(SInt64)(n & 1));
-}
-
--(BOOL) ttype:(UInt8 *)ttype forCompactType:(UInt8)ctype error:(NSError *__autoreleasing *)error
-{
-  switch (ctype & 0x0f) {
-  case TCType_STOP:
-    *ttype = TTypeSTOP;
-    return YES;
-
-  case TCType_BOOLEAN_FALSE:
-  case TCType_BOOLEAN_TRUE:
-    *ttype = TTypeBOOL;
-    return YES;
-
-  case TCType_BYTE:
-    *ttype = TTypeBYTE;
-    return YES;
-
-  case TCType_I16:
-    *ttype = TTypeI16;
-    return YES;
-
-  case TCType_I32:
-    *ttype = TTypeI32;
-    return YES;
-
-  case TCType_I64:
-    *ttype = TTypeI64;
-    return YES;
-
-  case TCType_DOUBLE:
-    *ttype = TTypeDOUBLE;
-    return YES;
-
-  case TCType_BINARY:
-    *ttype = TTypeSTRING;
-    return YES;
-
-  case TCType_LIST:
-    *ttype = TTypeLIST;
-    return YES;
-
-  case TCType_SET:
-    *ttype = TTypeSET;
-    return YES;
-
-  case TCType_MAP:
-    *ttype = TTypeMAP;
-    return YES;
-
-  case TCType_STRUCT:
-    *ttype = TTypeSTRUCT;
-    return YES;
-
-  default:
-    if (error) {
-      *error = [NSError errorWithDomain:TProtocolErrorDomain
-                                   code:TProtocolErrorUnknown
-                               userInfo:@{TProtocolErrorTypeKey: @((UInt8)(ctype & 0x0F))}];
-    }
-    return NO;
-  }
-}
-
--(UInt8) compactTypeForTType:(UInt8)ttype
-{
-  static UInt8 ttypeToCompactType[] = {
-    [TTypeSTOP] = TCType_STOP,
-    [TTypeBOOL] = TCType_BOOLEAN_FALSE,
-    [TTypeBYTE] = TCType_BYTE,
-    [TTypeDOUBLE] = TCType_DOUBLE,
-    [TTypeI16] = TCType_I16,
-    [TTypeI32] = TCType_I32,
-    [TTypeI64] = TCType_I64,
-    [TTypeSTRING] = TCType_BINARY,
-    [TTypeSTRUCT] = TCType_STRUCT,
-    [TTypeMAP] = TCType_MAP,
-    [TTypeSET] = TCType_SET,
-    [TTypeLIST] = TCType_LIST
-  };
-
-  return ttypeToCompactType[ttype];
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TMultiplexedProtocol.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TMultiplexedProtocol.h
deleted file mode 100644
index b8ce361..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TMultiplexedProtocol.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "TProtocolDecorator.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-extern NSString *TMultiplexedProtocolSeperator;
-
-
-@interface TMultiplexedProtocol : TProtocolDecorator
-
--(id) initWithProtocol:(id <TProtocol>)protocol
-           serviceName:(NSString *)name;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TMultiplexedProtocol.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TMultiplexedProtocol.m
deleted file mode 100644
index 5838c57..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TMultiplexedProtocol.m
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TMultiplexedProtocol.h"
-
-#import "TProtocol.h"
-
-NSString *TMultiplexedProtocolSeperator = @":";
-
-
-@interface TMultiplexedProtocol ()
-
-@property(strong, nonatomic) NSString *serviceName;
-
-@end
-
-
-@implementation TMultiplexedProtocol
-
--(id) initWithProtocol:(id <TProtocol>)protocol
-           serviceName:(NSString *)name
-{
-  self = [super initWithProtocol:protocol];
-  if (self) {
-    _serviceName = name;
-  }
-  return self;
-}
-
--(BOOL) writeMessageBeginWithName:(NSString *)name
-                             type:(SInt32)messageType
-                       sequenceID:(SInt32)sequenceID
-                            error:(NSError *__autoreleasing *)error
-{
-  switch (messageType) {
-  case TMessageTypeCALL:
-  case TMessageTypeONEWAY: {
-    NSMutableString *serviceFunction = [[NSMutableString alloc] initWithString:_serviceName];
-    [serviceFunction appendString:TMultiplexedProtocolSeperator];
-    [serviceFunction appendString:name];
-    return [super writeMessageBeginWithName:serviceFunction type:messageType sequenceID:sequenceID error:error];
-  }
-  break;
-
-  default:
-    return [super writeMessageBeginWithName:name type:messageType sequenceID:sequenceID error:error];
-  }
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocol.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocol.h
deleted file mode 100644
index 841059f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocol.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "TTransport.h"
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-typedef NS_ENUM (int, TMessageType) {
-  TMessageTypeCALL = 1,
-  TMessageTypeREPLY = 2,
-  TMessageTypeEXCEPTION = 3,
-  TMessageTypeONEWAY = 4
-};
-
-typedef NS_ENUM (int, TType) {
-  TTypeSTOP   = 0,
-  TTypeVOID   = 1,
-  TTypeBOOL   = 2,
-  TTypeBYTE   = 3,
-  TTypeDOUBLE = 4,
-  TTypeI16    = 6,
-  TTypeI32    = 8,
-  TTypeI64    = 10,
-  TTypeSTRING = 11,
-  TTypeSTRUCT = 12,
-  TTypeMAP    = 13,
-  TTypeSET    = 14,
-  TTypeLIST   = 15
-};
-
-
-@protocol TProtocol <NSObject>
-
--(id <TTransport>) transport;
-
--(BOOL) readMessageBeginReturningName:(NSString *__nullable __autoreleasing *__nullable)name
-                                 type:(nullable SInt32 *)type
-                           sequenceID:(nullable SInt32 *)sequenceID
-                                error:(NSError *__autoreleasing *)error;
--(BOOL) readMessageEnd:(NSError *__autoreleasing *)error;
-
--(BOOL) readStructBeginReturningName:(NSString *__nullable __autoreleasing *__nullable)name
-                               error:(NSError *__autoreleasing *)error;
--(BOOL) readStructEnd:(NSError *__autoreleasing *)error;
-
--(BOOL) readFieldBeginReturningName:(NSString *__nullable __autoreleasing *__nullable)name
-                               type:(SInt32 *)fieldType
-                            fieldID:(nullable SInt32 *)fieldID
-                              error:(NSError *__autoreleasing *)error;
--(BOOL) readFieldEnd:(NSError *__autoreleasing *)error;
-
--(BOOL) readString:(NSString *__nonnull __autoreleasing *__nonnull)value error:(NSError **)error;
-
--(BOOL) readBool:(BOOL *)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) readByte:(UInt8 *)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) readI16:(SInt16 *)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) readI32:(SInt32 *)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) readI64:(SInt64 *)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) readDouble:(double *)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) readBinary:(NSData *__nonnull __autoreleasing *__nonnull)value error:(NSError **)error;
-
--(BOOL) readMapBeginReturningKeyType:(nullable SInt32 *)keyType
-                           valueType:(nullable SInt32 *)valueType
-                                size:(SInt32 *)size
-                               error:(NSError *__autoreleasing *)error;
--(BOOL) readMapEnd:(NSError *__autoreleasing *)error;
-
-
--(BOOL) readSetBeginReturningElementType:(nullable SInt32 *)elementType
-                                    size:(SInt32 *)size
-                                   error:(NSError *__autoreleasing *)error;
--(BOOL) readSetEnd:(NSError *__autoreleasing *)error;
-
-
--(BOOL) readListBeginReturningElementType:(nullable SInt32 *)elementType
-                                     size:(SInt32 *)size
-                                    error:(NSError *__autoreleasing *)error;
--(BOOL) readListEnd:(NSError *__autoreleasing *)error;
-
-
--(BOOL) writeMessageBeginWithName:(NSString *)name
-                             type:(SInt32)messageType
-                       sequenceID:(SInt32)sequenceID
-                            error:(NSError *__autoreleasing *)error;
--(BOOL) writeMessageEnd:(NSError *__autoreleasing *)error;
-
--(BOOL) writeStructBeginWithName:(NSString *)name error:(NSError **)error;
--(BOOL) writeStructEnd:(NSError *__autoreleasing *)error;
-
--(BOOL) writeFieldBeginWithName:(NSString *)name
-                           type:(SInt32)fieldType
-                        fieldID:(SInt32)fieldID
-                          error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeI32:(SInt32)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeI64:(SInt64)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeI16:(short)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeByte:(UInt8)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeString:(NSString *)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeDouble:(double)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeBool:(BOOL)value error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeBinary:(NSData *)data error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeFieldStop:(NSError *__autoreleasing *)error;
-
--(BOOL) writeFieldEnd:(NSError *__autoreleasing *)error;
-
--(BOOL) writeMapBeginWithKeyType:(SInt32)keyType
-                       valueType:(SInt32)valueType
-                            size:(SInt32)size
-                           error:(NSError *__autoreleasing *)error;
--(BOOL) writeMapEnd:(NSError *__autoreleasing *)error;
-
-
--(BOOL) writeSetBeginWithElementType:(SInt32)elementType
-                                size:(SInt32)size
-                               error:(NSError *__autoreleasing *)error;
--(BOOL) writeSetEnd:(NSError *__autoreleasing *)error;
-
-
--(BOOL) writeListBeginWithElementType:(SInt32)elementType
-                                 size:(SInt32)size
-                                error:(NSError *__autoreleasing *)error;
-
--(BOOL) writeListEnd:(NSError *__autoreleasing *)error;
-
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolDecorator.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolDecorator.h
deleted file mode 100644
index 369b6a2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolDecorator.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "TProtocol.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TProtocolDecorator : NSObject <TProtocol>
-
--(id) initWithProtocol:(id <TProtocol>)protocol;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolDecorator.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolDecorator.m
deleted file mode 100644
index 218f900..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolDecorator.m
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TProtocolDecorator.h"
-
-
-@interface TProtocolDecorator ()
-
-@property(strong, nonatomic) id<TProtocol> concreteProtocol;
-
-@end
-
-
-@implementation TProtocolDecorator
-
--(id) initWithProtocol:(id <TProtocol>)protocol
-{
-  self = [super init];
-  if (self) {
-    _concreteProtocol = protocol;
-  }
-  return self;
-}
-
--(id <TTransport>) transport
-{
-  return [_concreteProtocol transport];
-}
-
--(BOOL) readMessageBeginReturningName:(NSString **)name
-                                 type:(SInt32 *)type
-                           sequenceID:(SInt32 *)sequenceID
-                                error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readMessageBeginReturningName:name
-                                                     type:type
-                                               sequenceID:sequenceID
-                                                    error:error];
-}
-
--(BOOL) readMessageEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readMessageEnd:error];
-}
-
--(BOOL) readStructBeginReturningName:(NSString **)name
-                               error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readStructBeginReturningName:name error:error];
-}
-
--(BOOL) readStructEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readStructEnd:error];
-}
-
--(BOOL) readFieldBeginReturningName:(NSString **)name
-                               type:(SInt32 *)fieldType
-                            fieldID:(SInt32 *)fieldID
-                              error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readFieldBeginReturningName:name
-                                                   type:fieldType
-                                                fieldID:fieldID
-                                                  error:error];
-}
--(BOOL) readFieldEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readFieldEnd:error];
-}
-
--(BOOL) readString:(NSString *__autoreleasing *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readString:value error:error];
-}
-
--(BOOL) readBool:(BOOL *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readBool:value error:error];
-}
-
--(BOOL) readByte:(UInt8 *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readByte:value error:error];
-}
-
--(BOOL) readI16:(SInt16 *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readI16:value error:error];
-}
-
--(BOOL) readI32:(SInt32 *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readI32:value error:error];
-}
-
--(BOOL) readI64:(SInt64 *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readI64:value error:error];
-}
-
--(BOOL) readDouble:(double *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readDouble:value error:error];
-}
-
--(BOOL) readBinary:(NSData *__autoreleasing *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readBinary:value error:error];
-}
-
--(BOOL) readMapBeginReturningKeyType:(SInt32 *)keyType
-                           valueType:(SInt32 *)valueType
-                                size:(SInt32 *)size
-                               error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readMapBeginReturningKeyType:keyType
-                                               valueType:valueType
-                                                    size:size
-                                                   error:error];
-}
--(BOOL) readMapEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readMapEnd:error];
-}
-
-
--(BOOL) readSetBeginReturningElementType:(SInt32 *)elementType
-                                    size:(SInt32 *)size
-                                   error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readSetBeginReturningElementType:elementType
-                                                        size:size
-                                                       error:error];
-}
--(BOOL) readSetEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readSetEnd:error];
-}
-
--(BOOL) readListBeginReturningElementType:(SInt32 *)elementType
-                                     size:(SInt32 *)size
-                                    error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readListBeginReturningElementType:elementType
-                                                         size:size
-                                                        error:error];
-}
--(BOOL) readListEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol readListEnd:error];
-}
-
--(BOOL) writeMessageBeginWithName:(NSString *)name
-                             type:(SInt32)messageType
-                       sequenceID:(SInt32)sequenceID
-                            error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeMessageBeginWithName:name
-                                                 type:messageType
-                                           sequenceID:sequenceID
-                                                error:error];
-}
--(BOOL) writeMessageEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeMessageEnd:error];
-}
-
--(BOOL) writeStructBeginWithName:(NSString *)name error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeStructBeginWithName:name error:error];
-}
--(BOOL) writeStructEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeStructEnd:error];
-}
-
--(BOOL) writeFieldBeginWithName:(NSString *)name
-                           type:(SInt32)fieldType
-                        fieldID:(SInt32)fieldID
-                          error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeFieldBeginWithName:name
-                                               type:fieldType
-                                            fieldID:fieldID
-                                              error:error];
-}
-
--(BOOL) writeI32:(SInt32)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeI32:value error:error];
-}
-
--(BOOL) writeI64:(SInt64)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeI64:value error:error];
-}
-
--(BOOL) writeI16:(SInt16)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeI16:value error:error];
-}
-
--(BOOL) writeByte:(UInt8)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeByte:value error:error];
-}
-
--(BOOL) writeString:(NSString *)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeString:value error:error];
-}
-
--(BOOL) writeDouble:(double)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeDouble:value error:error];
-}
-
--(BOOL) writeBool:(BOOL)value error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeBool:value error:error];
-}
-
--(BOOL) writeBinary:(NSData *)data error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeBinary:data error:error];
-}
-
--(BOOL) writeFieldStop:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeFieldStop:error];
-}
-
--(BOOL) writeFieldEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeFieldEnd:error];
-}
-
--(BOOL) writeMapBeginWithKeyType:(SInt32)keyType
-                       valueType:(SInt32)valueType
-                            size:(SInt32)size
-                           error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeMapBeginWithKeyType:keyType
-                                           valueType:valueType
-                                                size:size
-                                               error:error];
-}
-
--(BOOL) writeMapEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeMapEnd:error];
-}
-
--(BOOL) writeSetBeginWithElementType:(SInt32)elementType
-                                size:(SInt32)size
-                               error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeSetBeginWithElementType:elementType size:size error:error];
-}
-
--(BOOL) writeSetEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeSetEnd:error];
-}
-
--(BOOL) writeListBeginWithElementType:(SInt32)elementType
-                                 size:(SInt32)size
-                                error:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeListBeginWithElementType:elementType size:size error:error];
-}
-
--(BOOL) writeListEnd:(NSError *__autoreleasing *)error
-{
-  return [_concreteProtocol writeListEnd:error];
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolError.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolError.h
deleted file mode 100644
index ab0bc40..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolError.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TError.h"
-
-
-extern NSString *TProtocolErrorDomain;
-
-typedef NS_ENUM (int, TProtocolError) {
-  TProtocolErrorUnknown                   = 0,
-  TProtocolErrorInvalidData               = 1,
-  TProtocolErrorNegativeSize              = 2,
-  TProtocolErrorSizeLimit                 = 3,
-  TProtocolErrorBadVersion                = 4,
-  TProtocolErrorNotImplemented            = 5,
-  TProtocolErrorDepthLimit                = 6,
-};
-
-
-typedef NS_ENUM(int, TProtocolExtendedError) {
-  TProtocolExtendedErrorMissingRequiredField  = 1001,
-  TProtocolExtendedErrorUnexpectedType        = 1002,
-  TProtocolExtendedErrorMismatchedProtocol    = 1003,
-};
-
-extern NSString *TProtocolErrorExtendedErrorKey;
-extern NSString *TProtocolErrorFieldNameKey;
-extern NSString *TProtocolErrorExpectedIdKey;
-extern NSString *TProtocolErrorExpectedVersionKey;
-extern NSString *TProtocolErrorTypeKey;
-extern NSString *TProtocolErrorSourceLineKey;
-extern NSString *TProtocolErrorSourceFileKey;
-extern NSString *TProtocolErrorSourceMethodKey;
-extern NSString *TProtocolErrorMessageNameKey;
-
-
-#define PROTOCOL_ERROR(ret, err, ...) \
-  if (error) {  \
-    *error = [NSError errorWithDomain:TProtocolErrorDomain \
-                                 code:TProtocolError ## err \
-                             userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:__VA_ARGS__], \
-                                        @"SourceFile": [NSString stringWithUTF8String:__FILE__], \
-                                        @"SourceLine": @(__LINE__), \
-                                        @"SourceFunction": [NSString stringWithUTF8String:__PRETTY_FUNCTION__], \
-                                        @"Message": self.currentMessageName ? self.currentMessageName : @""}]; \
-  } \
-  return ret
-
-#define PROTOCOL_TRANSPORT_ERROR(ret, errorPtr, ...) \
-  if (errorPtr) { \
-    *error = [NSError errorWithDomain:TProtocolErrorDomain \
-                                 code:TProtocolErrorUnknown \
-                             userInfo:@{NSLocalizedDescriptionKey: [[NSString stringWithFormat:__VA_ARGS__] stringByAppendingFormat:@": %@", [(*errorPtr) localizedDescription]], \
-                                        TProtocolErrorSourceFileKey: [NSString stringWithUTF8String:__FILE__], \
-                                        TProtocolErrorSourceLineKey: @(__LINE__), \
-                                        TProtocolErrorSourceMethodKey: [NSString stringWithUTF8String:__PRETTY_FUNCTION__], \
-                                        TProtocolErrorMessageNameKey: self.currentMessageName ? self.currentMessageName : @"", \
-                                        NSUnderlyingErrorKey: *errorPtr}]; \
-  } \
-  return ret
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolError.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolError.m
deleted file mode 100644
index 953673b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolError.m
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TProtocolError.h"
-
-
-NSString *TProtocolErrorDomain = @"TProtocolErrorDomain";
-
-NSString *TProtocolErrorExtendedErrorKey = @"extendedError";
-NSString *TProtocolErrorFieldNameKey = @"field";
-NSString *TProtocolErrorExpectedIdKey = @"expectedId";
-NSString *TProtocolErrorExpectedVersionKey = @"expectedVersion";
-NSString *TProtocolErrorTypeKey = @"type";
-NSString *TProtocolErrorSourceLineKey = @"sourceLine";
-NSString *TProtocolErrorSourceFileKey = @"sourceFile";
-NSString *TProtocolErrorSourceMethodKey = @"sourceMethod";
-NSString *TProtocolErrorMessageNameKey = @"messageName";
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolFactory.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolFactory.h
deleted file mode 100644
index a022a7f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TProtocol.h"
-#import "TTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@protocol TProtocolFactory <NSObject>
-
-@property (readonly, nonatomic) NSString *protocolName;
-
--(id<TProtocol>) newProtocolOnTransport:(id<TTransport>)transport;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolUtil.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolUtil.h
deleted file mode 100644
index 82510cf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolUtil.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TProtocol.h"
-#import "TTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TProtocolUtil : NSObject
-
-+(BOOL) skipType:(int)type onProtocol:(id <TProtocol>)protocol error:(NSError **)error;
-
-@end;
-
-
-NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolUtil.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolUtil.m
deleted file mode 100644
index c0d65ac..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/protocol/TProtocolUtil.m
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TProtocolUtil.h"
-
-@implementation TProtocolUtil
-
-+(BOOL) skipType:(int)type onProtocol:(id <TProtocol>)protocol error:(NSError **)error
-{
-  switch (type) {
-  case TTypeBOOL: {
-    BOOL val;
-    if (![protocol readBool:&val error:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeBYTE: {
-    UInt8 val;
-    if (![protocol readByte:&val error:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeI16: {
-    SInt16 val;
-    if (![protocol readI16:&val error:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeI32: {
-    SInt32 val;
-    if (![protocol readI32:&val error:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeI64: {
-    SInt64 val;
-    if (![protocol readI64:&val error:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeDOUBLE: {
-    double val;
-    if (![protocol readDouble:&val error:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeSTRING: {
-    NSString *val;
-    if (![protocol readString:&val error:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeSTRUCT: {
-    if (![protocol readStructBeginReturningName:NULL error:error]) {
-      return NO;
-    }
-    while (true) {
-      SInt32 fieldType;
-      if (![protocol readFieldBeginReturningName:nil type:&fieldType fieldID:nil error:error]) {
-        return NO;
-      }
-      if (fieldType == TTypeSTOP) {
-        break;
-      }
-      if (![self skipType:fieldType onProtocol:protocol error:error]) {
-        return NO;
-      }
-      if (![protocol readFieldEnd:error]) {
-        return NO;
-      }
-    }
-    if (![protocol readStructEnd:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeMAP: {
-    SInt32 keyType;
-    SInt32 valueType;
-    SInt32 size;
-    if (![protocol readMapBeginReturningKeyType:&keyType valueType:&valueType size:&size error:error]) {
-      return NO;
-    }
-    int i;
-    for (i = 0; i < size; i++) {
-      if (![TProtocolUtil skipType:keyType onProtocol:protocol error:error]) {
-        return NO;
-      }
-      if (![TProtocolUtil skipType:valueType onProtocol:protocol error:error]) {
-        return NO;
-      }
-    }
-    if (![protocol readMapEnd:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeSET: {
-    SInt32 elemType;
-    SInt32 size;
-    if (![protocol readSetBeginReturningElementType:&elemType size:&size error:error]) {
-      return NO;
-    }
-    int i;
-    for (i = 0; i < size; i++) {
-      if (![TProtocolUtil skipType:elemType onProtocol:protocol error:error]) {
-        return NO;
-      }
-    }
-    if (![protocol readSetEnd:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  case TTypeLIST: {
-    SInt32 elemType;
-    SInt32 size;
-    if (![protocol readListBeginReturningElementType:&elemType size:&size error:error]) {
-      return NO;
-    }
-    int i;
-    for (i = 0; i < size; i++) {
-      if (![TProtocolUtil skipType:elemType onProtocol:protocol error:error]) {
-        return NO;
-      }
-    }
-    if (![protocol readListEnd:error]) {
-      return NO;
-    }
-  }
-  break;
-
-  }
-
-  return YES;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/server/TSocketServer.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/server/TSocketServer.h
deleted file mode 100644
index fe657ea..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/server/TSocketServer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TProtocolFactory.h"
-#import "TProcessorFactory.h"
-
-#if !TARGET_OS_IPHONE
-#import <CoreServices/CoreServices.h>
-#else
-#import <CFNetwork/CFNetwork.h>
-#endif
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-extern NSString *const TSocketServerClientConnectionFinished;
-extern NSString *const TSocketServerProcessorKey;
-extern NSString *const TSockerServerTransportKey;
-
-
-@interface TSocketServer : NSObject
-
--(instancetype) initWithPort:(int)port
-             protocolFactory:(id <TProtocolFactory>)protocolFactory
-            processorFactory:(id <TProcessorFactory>)processorFactory;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/server/TSocketServer.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/server/TSocketServer.m
deleted file mode 100644
index ccbbba1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/server/TSocketServer.m
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TSocketServer.h"
-#import "TNSFileHandleTransport.h"
-#import "TProtocol.h"
-#import "TTransportError.h"
-
-#import <sys/socket.h>
-#include <netinet/in.h>
-
-
-
-NSString *const TSocketServerClientConnectionFinished = @"TSocketServerClientConnectionFinished";
-NSString *const TSocketServerProcessorKey = @"TSocketServerProcessor";
-NSString *const TSockerServerTransportKey = @"TSockerServerTransport";
-
-
-@interface TSocketServer ()
-
-@property(strong, nonatomic) id<TProtocolFactory> inputProtocolFactory;
-@property(strong, nonatomic) id<TProtocolFactory> outputProtocolFactory;
-@property(strong, nonatomic) id<TProcessorFactory> processorFactory;
-@property(strong, nonatomic) NSFileHandle *socketFileHandle;
-@property(strong, nonatomic) dispatch_queue_t processingQueue;
-
-@end
-
-
-@implementation TSocketServer
-
--(instancetype) initWithPort:(int)port
-             protocolFactory:(id <TProtocolFactory>)protocolFactory
-            processorFactory:(id <TProcessorFactory>)processorFactory;
-{
-  self = [super init];
-
-  _inputProtocolFactory = protocolFactory;
-  _outputProtocolFactory = protocolFactory;
-  _processorFactory = processorFactory;
-
-  dispatch_queue_attr_t processingQueueAttr =
-    dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_CONCURRENT, QOS_CLASS_BACKGROUND, 0);
-
-  _processingQueue = dispatch_queue_create("TSocketServer.processing", processingQueueAttr);
-
-  // create a socket.
-  int fd = -1;
-  CFSocketRef socket = CFSocketCreate(kCFAllocatorDefault, PF_INET, SOCK_STREAM, IPPROTO_TCP, 0, NULL, NULL);
-  if (socket) {
-    CFSocketSetSocketFlags(socket, CFSocketGetSocketFlags(socket) & ~kCFSocketCloseOnInvalidate);
-    fd = CFSocketGetNative(socket);
-    int yes = 1;
-    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&yes, sizeof(yes));
-
-    struct sockaddr_in addr;
-    memset(&addr, 0, sizeof(addr));
-    addr.sin_len = sizeof(addr);
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(port);
-    addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    NSData *address = [NSData dataWithBytes:&addr length:sizeof(addr)];
-    if (CFSocketSetAddress(socket, (__bridge CFDataRef)address) != kCFSocketSuccess) {
-      CFSocketInvalidate(socket);
-      CFRelease(socket);
-      NSLog(@"TSocketServer: Could not bind to address");
-      return nil;
-    }
-  }
-  else {
-    NSLog(@"TSocketServer: No server socket");
-    return nil;
-  }
-
-  // wrap it in a file handle so we can get messages from it
-  _socketFileHandle = [[NSFileHandle alloc] initWithFileDescriptor:fd
-                                                    closeOnDealloc:YES];
-
-  // throw away our socket
-  CFSocketInvalidate(socket);
-  CFRelease(socket);
-
-  // register for notifications of accepted incoming connections
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(connectionAccepted:)
-                                               name:NSFileHandleConnectionAcceptedNotification
-                                             object:_socketFileHandle];
-
-  // tell socket to listen
-  [_socketFileHandle acceptConnectionInBackgroundAndNotify];
-
-  NSLog(@"TSocketServer: Listening on TCP port %d", port);
-
-  return self;
-}
-
-
--(void) dealloc
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-
--(void) connectionAccepted:(NSNotification *)notification
-{
-  NSFileHandle *socket = [notification.userInfo objectForKey:NSFileHandleNotificationFileHandleItem];
-
-  // Now that we have a client connected, handle request on queue
-  dispatch_async(_processingQueue, ^{
-
-    [self handleClientConnection:socket];
-
-  });
-
-  // Continue accepting connections
-  [_socketFileHandle acceptConnectionInBackgroundAndNotify];
-}
-
-
--(void) handleClientConnection:(NSFileHandle *)clientSocket
-{
-  @autoreleasepool {
-
-    TNSFileHandleTransport *transport = [[TNSFileHandleTransport alloc] initWithFileHandle:clientSocket];
-    id<TProcessor> processor = [_processorFactory processorForTransport:transport];
-
-    id <TProtocol> inProtocol = [_inputProtocolFactory newProtocolOnTransport:transport];
-    id <TProtocol> outProtocol = [_outputProtocolFactory newProtocolOnTransport:transport];
-
-    NSError *error;
-    if (![processor processOnInputProtocol:inProtocol outputProtocol:outProtocol error:&error]) {
-      // Handle error
-      NSLog(@"Error processing request: %@", error);
-    }
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-
-      [NSNotificationCenter.defaultCenter postNotificationName:TSocketServerClientConnectionFinished
-                                                        object:self
-                                                      userInfo:@{TSocketServerProcessorKey: processor,
-                                                                 TSockerServerTransportKey: transport}];
-    });
-
-  }
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TAsyncTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TAsyncTransport.h
deleted file mode 100644
index bab4fbd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TAsyncTransport.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@protocol TAsyncTransport;
-
-
-@protocol TAsyncTransportFactory <NSObject>
-
--(id<TAsyncTransport>) newTransport;
-
-@end
-
-
-typedef void (^TAsyncCompletionBlock)();
-typedef void (^TAsyncFailureBlock)(NSError * __nonnull);
-
-
-@protocol TAsyncTransport <TTransport>
-
--(void) flushWithCompletion:(TAsyncCompletionBlock)completed failure:(TAsyncFailureBlock)failure;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TFramedTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TFramedTransport.h
deleted file mode 100644
index ea68ac4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TFramedTransport.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TFramedTransport : NSObject <TTransport>
-
--(id) initWithTransport:(id <TTransport>)transport;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TFramedTransport.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TFramedTransport.m
deleted file mode 100644
index 4db65c4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TFramedTransport.m
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TFramedTransport.h"
-#import "TTransportError.h"
-
-#define HEADER_SIZE 4
-#define INIT_FRAME_SIZE 1024
-
-
-@interface TFramedTransport ()
-
-@property(strong, nonatomic) id<TTransport> transport;
-@property(strong, nonatomic) NSMutableData *writeBuffer;
-@property(strong, nonatomic) NSMutableData *readBuffer;
-@property(assign, nonatomic) NSUInteger readOffset;
-
-@end
-
-
-@implementation TFramedTransport
-
--(id) initWithTransport:(id <TTransport>)aTransport
-{
-  if ((self = [self init])) {
-    _transport = aTransport;
-    _readBuffer = nil;
-    _readOffset = 0;
-    _writeBuffer = [NSMutableData dataWithLength:HEADER_SIZE];
-  }
-  return self;
-}
-
--(BOOL) flush:(NSError **)error
-{
-  int len = (int)[_writeBuffer length];
-  int data_len = len - HEADER_SIZE;
-  if (data_len < 0) {
-    if (error) {
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorUnknown
-                               userInfo:@{}];
-    }
-    return NO;
-  }
-
-  UInt8 i32rd[HEADER_SIZE];
-  i32rd[0] = (UInt8)(0xff & (data_len >> 24));
-  i32rd[1] = (UInt8)(0xff & (data_len >> 16));
-  i32rd[2] = (UInt8)(0xff & (data_len >> 8));
-  i32rd[3] = (UInt8)(0xff & (data_len));
-
-  // should we make a copy of the writeBuffer instead? Better for threaded
-  //  operations!
-  [_writeBuffer replaceBytesInRange:NSMakeRange(0, HEADER_SIZE)
-                          withBytes:i32rd length:HEADER_SIZE];
-
-  if (![_transport write:_writeBuffer.mutableBytes offset:0 length:len error:error]) {
-    return NO;
-  }
-
-  if (![_transport flush:error]) {
-    return NO;
-  }
-
-  _writeBuffer.length = HEADER_SIZE;
-
-  return YES;
-}
-
--(BOOL) write:(const UInt8 *)data offset:(UInt32)offset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  [_writeBuffer appendBytes:data+offset length:length];
-
-  return YES;
-}
-
--(BOOL) readAll:(UInt8 *)outBuffer offset:(UInt32)outBufferOffset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = [self readAvail:outBuffer offset:outBufferOffset maxLength:length error:error];
-  if (got != length) {
-
-    // Report underflow only if readAvail didn't report error already
-    if (error && !*error) {
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorEndOfFile
-                               userInfo:nil];
-    }
-
-    return NO;
-  }
-
-  return YES;
-}
-
--(UInt32) readAvail:(UInt8 *)outBuffer offset:(UInt32)outBufferOffset maxLength:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = 0;
-  while (got < length) {
-
-    NSUInteger avail = _readBuffer.length - _readOffset;
-    if (avail == 0) {
-      if (![self readFrame:error]) {
-        return 0;
-      }
-      avail = _readBuffer.length;
-    }
-
-    NSRange range;
-    range.location = _readOffset;
-    range.length = MIN(length - got, avail);
-
-    [_readBuffer getBytes:outBuffer+outBufferOffset+got range:range];
-    _readOffset += range.length;
-    got += range.length;
-  }
-
-  return got;
-}
-
--(BOOL) readFrame:(NSError **)error
-{
-  UInt8 i32rd[HEADER_SIZE];
-  if (![_transport readAll:i32rd offset:0 length:HEADER_SIZE error:error]) {
-    return NO;
-  }
-
-  SInt32 size =
-    ((i32rd[0] & 0xff) << 24) |
-    ((i32rd[1] & 0xff) << 16) |
-    ((i32rd[2] & 0xff) <<  8) |
-    ((i32rd[3] & 0xff));
-
-  if (_readBuffer == nil) {
-
-    _readBuffer = [NSMutableData dataWithLength:size];
-
-  }
-  else {
-
-    SInt32 len = (SInt32)_readBuffer.length;
-    if (len >= size) {
-
-      _readBuffer.length = size;
-
-    }
-    else {
-
-      // increase length of data buffer
-      [_readBuffer increaseLengthBy:size-len];
-
-    }
-
-  }
-
-  // copy into internal memory buffer
-  if (![_transport readAll:_readBuffer.mutableBytes offset:0 length:size error:error]) {
-    return NO;
-  }
-
-  return YES;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPSessionTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPSessionTransport.h
deleted file mode 100644
index 003499b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPSessionTransport.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TAsyncTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-typedef NSError *__nullable (^THTTPSessionTransportResponseValidateBlock) (NSHTTPURLResponse *response, NSData *responseData);
-
-
-@interface THTTPSessionTransportFactory : NSObject<TAsyncTransportFactory>
-
-@property (strong, nonatomic) THTTPSessionTransportResponseValidateBlock responseValidate;
-
-+(void) setupDefaultsForSessionConfiguration:(NSURLSessionConfiguration *)config
-                            withProtocolName:(NSString *)protocolName;
-
--(id) initWithSession:(NSURLSession *)session
-                  URL:(NSURL *)aURL;
-
-@end
-
-
-@interface THTTPSessionTransport : NSObject <TAsyncTransport>
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPSessionTransport.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPSessionTransport.m
deleted file mode 100644
index c10b7fc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPSessionTransport.m
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "THTTPSessionTransport.h"
-#import "TTransportError.h"
-
-
-@interface THTTPSessionTransportFactory ()
-
-@property (strong, nonatomic) NSURLSession *session;
-@property (strong, nonatomic) NSURL *url;
-
-@end
-
-
-@interface THTTPSessionTransport ()
-
-@property (strong, nonatomic) THTTPSessionTransportFactory *factory;
-@property (strong, nonatomic) NSMutableData *requestData;
-@property (strong, nonatomic) NSData *responseData;
-@property (assign, nonatomic) NSUInteger responseDataOffset;
-
--(instancetype) initWithFactory:(THTTPSessionTransportFactory *)factory;
-
-@end
-
-
-@implementation THTTPSessionTransportFactory
-
-+(void) setupDefaultsForSessionConfiguration:(NSURLSessionConfiguration *)config withProtocolName:(NSString *)protocolName
-{
-  NSString *thriftContentType = @"application/x-thrift";
-  if (protocolName.length) {
-    thriftContentType = [thriftContentType stringByAppendingFormat:@"; p=%@", protocolName];
-  }
-
-  config.requestCachePolicy = NSURLRequestReloadIgnoringCacheData;
-  config.HTTPShouldUsePipelining = YES;
-  config.HTTPShouldSetCookies = NO;
-  config.URLCache = nil;
-  config.HTTPAdditionalHeaders = @{@"Content-Type":thriftContentType,
-                                   @"Accept":thriftContentType,
-                                   @"User-Agent":@"Thrift/Cocoa (Session)"};
-}
-
-
--(id) initWithSession:(NSURLSession *)session URL:(NSURL *)url
-{
-  self = [super init];
-  if (self) {
-    _session = session;
-    _url = url;
-  }
-
-  return self;
-}
-
--(id<TAsyncTransport>) newTransport
-{
-  return [[THTTPSessionTransport alloc] initWithFactory:self];
-}
-
--(NSURLSessionDataTask *) taskWithRequest:(NSURLRequest *)request
-                        completionHandler:(void (^)(NSData *data, NSURLResponse *response, NSError *error))completionHandler
-                                    error:(NSError *__autoreleasing *)error
-{
-  NSURLSessionDataTask *newTask = [_session dataTaskWithRequest:request completionHandler:completionHandler];
-  if (!newTask) {
-    if (error) {
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorUnknown
-                               userInfo:@{NSLocalizedDescriptionKey:@"Failed to create session data task"}];
-    }
-    return nil;
-  }
-
-  return newTask;
-}
-
--(NSError *) validateResponse:(NSHTTPURLResponse *)response data:(NSData *)data
-{
-  if (_responseValidate) {
-    return _responseValidate(response, data);
-  }
-  return nil;
-}
-
-@end
-
-
-
-@implementation THTTPSessionTransport
-
--(instancetype) initWithFactory:(THTTPSessionTransportFactory *)factory
-{
-  self = [super init];
-  if (self) {
-    _factory = factory;
-  }
-  return self;
-}
-
--(BOOL) readAll:(UInt8 *)outBuffer offset:(UInt32)outBufferOffset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = [self readAvail:outBuffer offset:outBufferOffset maxLength:length error:error];
-  if (got != length) {
-
-    // Report underflow only if readAvail didn't report error already
-    if (error && !*error) {
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorEndOfFile
-                               userInfo:nil];
-    }
-
-    return NO;
-  }
-
-  return YES;
-}
-
--(UInt32) readAvail:(UInt8 *)outBuffer offset:(UInt32)outBufferOffset maxLength:(UInt32)maxLength error:(NSError *__autoreleasing *)error
-{
-  NSUInteger avail = _responseData.length - _responseDataOffset;
-
-  NSRange range;
-  range.location = _responseDataOffset;
-  range.length = MIN(maxLength, avail);
-
-  [_responseData getBytes:outBuffer+outBufferOffset range:range];
-  _responseDataOffset += range.length;
-
-  return (UInt32)range.length;
-}
-
--(BOOL) write:(const UInt8 *)data offset:(UInt32)offset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  if (!_requestData) {
-    _requestData = [NSMutableData dataWithCapacity:256];
-  }
-
-  [_requestData appendBytes:data+offset length:length];
-
-  return YES;
-}
-
--(void) flushWithCompletion:(TAsyncCompletionBlock)completed failure:(TAsyncFailureBlock)failure
-{
-  NSError *error;
-
-  NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:_factory.url];
-  request.HTTPMethod = @"POST";
-  request.HTTPBody = _requestData;
-
-  _requestData = nil;
-
-  NSURLSessionDataTask *task = [_factory taskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-
-    // Check response type
-    if (!error && ![response isKindOfClass:NSHTTPURLResponse.class]) {
-
-      error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorUnknown
-                               userInfo:@{TTransportErrorHttpErrorKey: @(THttpTransportErrorInvalidResponse)}];
-
-    }
-
-    // Check status code
-    NSHTTPURLResponse *httpResponse = (id)response;
-    if (!error && httpResponse.statusCode != 200) {
-
-      THttpTransportError code;
-      if (httpResponse.statusCode == 401) {
-        code = THttpTransportErrorAuthentication;
-      }
-      else {
-        code = THttpTransportErrorInvalidStatus;
-      }
-
-      error = [NSError errorWithDomain:TTransportErrorDomain
-                                  code:TTransportErrorUnknown
-                              userInfo:@{TTransportErrorHttpErrorKey: @(code),
-                                         @"statusCode":@(httpResponse.statusCode)}];
-    }
-
-    // Allow factory to check
-    if (!error) {
-      error = [_factory validateResponse:httpResponse data:data];
-    }
-
-    _responseDataOffset = 0;
-
-    if (error) {
-
-      _responseData = nil;
-
-      failure(error);
-
-    }
-    else {
-
-      if (data == nil) {
-        data = [NSData data];
-      }
-
-      _responseData = data;
-
-      completed(self);
-    }
-
-  } error:&error];
-
-  if (!task) {
-    failure(error);
-    return;
-  }
-
-  [task resume];
-}
-
--(BOOL) flush:(NSError *__autoreleasing *)error
-{
-  dispatch_semaphore_t completed = dispatch_semaphore_create(0);
-
-  __block BOOL result;
-  __block NSError *internalError;
-
-  [self flushWithCompletion:^(id < TAsyncTransport > transport) {
-
-    result = YES;
-
-    dispatch_semaphore_signal(completed);
-
-  } failure:^(NSError *error) {
-
-    internalError = error;
-
-    result = NO;
-
-    dispatch_semaphore_signal(completed);
-
-  }];
-
-  dispatch_semaphore_wait(completed, DISPATCH_TIME_FOREVER);
-
-  if (error) {
-    *error = internalError;
-  }
-
-  return result;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPTransport.h
deleted file mode 100644
index 3c35daf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPTransport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface THTTPTransport : NSObject <TTransport>
-
--(id) initWithURL:(NSURL *)aURL;
-
--(id) initWithURL:(NSURL *)aURL
-        userAgent:(nullable NSString *)userAgent
-          timeout:(int)timeout;
-
--(void) setURL:(NSURL *)aURL;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPTransport.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPTransport.m
deleted file mode 100644
index e4046c6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/THTTPTransport.m
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "THTTPTransport.h"
-#import "TTransportError.h"
-
-
-@interface THTTPTransport ()
-
-@property (strong, nonatomic) NSURL *url;
-@property (strong, nonatomic) NSMutableURLRequest *request;
-@property (strong, nonatomic) NSMutableData *requestData;
-@property (strong, nonatomic) NSData *responseData;
-@property (assign, nonatomic) NSUInteger responseDataOffset;
-@property (strong, nonatomic) NSString *userAgent;
-@property (assign, nonatomic) NSTimeInterval timeout;
-
-@end
-
-
-@implementation THTTPTransport
-
--(void) setupRequest
-{
-  // set up our request object that we'll use for each request
-  _request = [[NSMutableURLRequest alloc] initWithURL:_url];
-  [_request setHTTPMethod:@"POST"];
-  [_request setValue:@"application/x-thrift" forHTTPHeaderField:@"Content-Type"];
-  [_request setValue:@"application/x-thrift" forHTTPHeaderField:@"Accept"];
-
-  NSString *userAgent = _userAgent;
-  if (!userAgent) {
-    userAgent = @"Thrift/Cocoa";
-  }
-  [_request setValue:userAgent forHTTPHeaderField:@"User-Agent"];
-
-  [_request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
-  if (_timeout) {
-    [_request setTimeoutInterval:_timeout];
-  }
-}
-
-
--(id) initWithURL:(NSURL *)aURL
-{
-  return [self initWithURL:aURL
-                 userAgent:nil
-                   timeout:0];
-}
-
-
--(id) initWithURL:(NSURL *)aURL
-        userAgent:(NSString *)aUserAgent
-          timeout:(int)aTimeout
-{
-  self = [super init];
-  if (!self) {
-    return nil;
-  }
-
-  _timeout = aTimeout;
-  _userAgent = aUserAgent;
-  _url = aURL;
-
-  [self setupRequest];
-
-  // create our request data buffer
-  _requestData = [[NSMutableData alloc] initWithCapacity:1024];
-
-  return self;
-}
-
--(void) setURL:(NSURL *)aURL
-{
-  _url = aURL;
-
-  [self setupRequest];
-}
-
--(BOOL) readAll:(UInt8 *)outBuffer offset:(UInt32)outBufferOffset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = [self readAvail:outBuffer offset:outBufferOffset maxLength:length error:error];
-  if (got != length) {
-
-    // Report underflow only if readAvail didn't report error already
-    if (error && !*error) {
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorEndOfFile
-                               userInfo:nil];
-    }
-
-    return NO;
-  }
-
-  return YES;
-}
-
--(UInt32) readAvail:(UInt8 *)outBuffer offset:(UInt32)outBufferOffset maxLength:(UInt32)maxLength error:(NSError *__autoreleasing *)error
-{
-  NSUInteger avail = _responseData.length - _responseDataOffset;
-
-  NSRange range;
-  range.location = _responseDataOffset;
-  range.length = MIN(maxLength, avail);
-
-  [_responseData getBytes:outBuffer+outBufferOffset range:range];
-  _responseDataOffset += range.length;
-
-  return (UInt32)range.length;
-}
-
--(BOOL) write:(const UInt8 *)data offset:(UInt32)offset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  [_requestData appendBytes:data+offset length:length];
-
-  return YES;
-}
-
--(BOOL) flush:(NSError *__autoreleasing *)error
-{
-  [_request setHTTPBody:_requestData];
-
-  _responseDataOffset = 0;
-
-  // make the HTTP request
-  NSURLResponse *response;
-  _responseData = [NSURLConnection sendSynchronousRequest:_request returningResponse:&response error:error];
-  if (!_responseData) {
-    return NO;
-  }
-
-  [_requestData setLength:0];
-
-  if (![response isKindOfClass:NSHTTPURLResponse.class]) {
-    if (error) {
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorUnknown
-                               userInfo:@{TTransportErrorHttpErrorKey: @(THttpTransportErrorInvalidResponse)}];
-    }
-    return NO;
-  }
-
-  NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
-  if ([httpResponse statusCode] != 200) {
-    if (error) {
-
-      THttpTransportError code;
-      if (httpResponse.statusCode == 401) {
-        code = THttpTransportErrorAuthentication;
-      }
-      else {
-        code = THttpTransportErrorInvalidStatus;
-      }
-
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorUnknown
-                               userInfo:@{TTransportErrorHttpErrorKey: @(code),
-                                          @"statusCode":@(httpResponse.statusCode)}];
-    }
-    return NO;
-  }
-
-  return YES;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TMemoryBuffer.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TMemoryBuffer.h
deleted file mode 100644
index 6249d32..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TMemoryBuffer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TMemoryBuffer : NSObject <TTransport>
-
--(NSData *) buffer;
-
--(id) initWithData:(NSData *)data;
-
--(id) initWithDataNoCopy:(NSMutableData *)data;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TMemoryBuffer.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TMemoryBuffer.m
deleted file mode 100644
index ec19cc8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TMemoryBuffer.m
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TMemoryBuffer.h"
-#import "TTransportError.h"
-
-
-#define GARBAGE_BUFFER_SIZE 4096 // 4KiB
-
-
-@interface TMemoryBuffer ()
-
-@property(strong, nonatomic) NSMutableData *buffer;
-@property(assign, nonatomic) UInt32 bufferOffset;
-
-@end
-
-
-@implementation TMemoryBuffer
-
--(id) init
-{
-  if ((self = [super init])) {
-    _buffer = [NSMutableData new];
-    _bufferOffset = 0;
-  }
-  return self;
-}
-
--(id) initWithData:(NSData *)data
-{
-  if (self = [super init]) {
-    _buffer = [data mutableCopy];
-    _bufferOffset = 0;
-  }
-  return self;
-}
-
--(id) initWithDataNoCopy:(NSMutableData *)data
-{
-  if (self = [super init]) {
-    _buffer = data;
-    _bufferOffset = 0;
-  }
-  return self;
-}
-
--(BOOL) readAll:(UInt8 *)outBuffer offset:(UInt32)outBufferOffset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = [self readAvail:outBuffer offset:outBufferOffset maxLength:length error:error];
-  if (got != length) {
-
-    // Report underflow only if readAvail didn't report error already
-    if (error && !*error) {
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorEndOfFile
-                               userInfo:nil];
-    }
-
-    return NO;
-  }
-
-  return YES;
-}
-
--(UInt32) readAvail:(UInt8 *)outBuffer offset:(UInt32)outBufferOffset maxLength:(UInt32)maxLength error:(NSError *__autoreleasing *)error
-{
-  UInt32 avail = (UInt32)_buffer.length - _bufferOffset;
-  if (avail == 0) {
-    return 0;
-  }
-
-  NSRange range;
-  range.location = _bufferOffset;
-  range.length = MIN(maxLength, avail);
-
-  [_buffer getBytes:outBuffer + outBufferOffset range:range];
-  _bufferOffset += range.length;
-
-  if (_bufferOffset >= GARBAGE_BUFFER_SIZE) {
-    [_buffer replaceBytesInRange:NSMakeRange(0, _bufferOffset) withBytes:NULL length:0];
-    _bufferOffset = 0;
-  }
-
-  return (UInt32)range.length;
-}
-
--(BOOL) write:(const UInt8 *)inBuffer offset:(UInt32)inBufferOffset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  [_buffer appendBytes:inBuffer + inBufferOffset length:length];
-
-  return YES;
-}
-
--(NSData *) buffer
-{
-  return _buffer;
-}
-
--(BOOL) flush:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSFileHandleTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSFileHandleTransport.h
deleted file mode 100644
index db6edf3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSFileHandleTransport.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-#import <Foundation/Foundation.h>
-#import "TTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TNSFileHandleTransport : NSObject <TTransport>
-
--(id) initWithFileHandle:(NSFileHandle *)fileHandle;
-
--(id) initWithInputFileHandle:(NSFileHandle *)inputFileHandle
-             outputFileHandle:(NSFileHandle *)outputFileHandle;
-
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSFileHandleTransport.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSFileHandleTransport.m
deleted file mode 100644
index c907f87..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSFileHandleTransport.m
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-#import "TNSFileHandleTransport.h"
-#import "TTransportError.h"
-
-
-@interface TNSFileHandleTransport ()
-
-@property(strong, nonatomic) NSFileHandle *inputFileHandle;
-@property(strong, nonatomic) NSFileHandle *outputFileHandle;
-
-@end
-
-
-@implementation TNSFileHandleTransport
-
--(id) initWithFileHandle:(NSFileHandle *)fileHandle
-{
-  return [self initWithInputFileHandle:fileHandle
-                      outputFileHandle:fileHandle];
-}
-
-
--(id) initWithInputFileHandle:(NSFileHandle *)aInputFileHandle
-             outputFileHandle:(NSFileHandle *)aOutputFileHandle
-{
-  self = [super init];
-  if (self) {
-    _inputFileHandle = aInputFileHandle;
-    _outputFileHandle = aOutputFileHandle;
-  }
-  return self;
-}
-
-
--(BOOL) readAll:(UInt8 *)buf offset:(UInt32)off length:(UInt32)len error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = 0;
-  while (got < len) {
-
-    NSData *d = [_inputFileHandle readDataOfLength:len-got];
-    if (d.length == 0) {
-      if (error) {
-        *error = [NSError errorWithDomain:TTransportErrorDomain
-                                     code:TTransportErrorEndOfFile
-                                 userInfo:nil];
-      }
-      return NO;
-    }
-
-    [d getBytes:buf+got length:d.length];
-    got += d.length;
-  }
-  return YES;
-}
-
-
--(UInt32) readAvail:(UInt8 *)buf offset:(UInt32)off maxLength:(UInt32)len error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = 0;
-  while (got < len) {
-
-    NSData *d = [_inputFileHandle readDataOfLength:len-got];
-    if (d.length == 0) {
-      break;
-    }
-
-    [d getBytes:buf+got length:d.length];
-    got += d.length;
-  }
-  return got;
-}
-
-
--(BOOL) write:(const UInt8 *)data offset:(UInt32)offset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  void *pos = (void *)data + offset;
-
-  @try {
-    [_outputFileHandle writeData:[NSData dataWithBytesNoCopy:pos length:length freeWhenDone:NO]];
-  }
-  @catch (NSException *e) {
-    if (error) {
-      *error = [NSError errorWithDomain:TTransportErrorDomain
-                                   code:TTransportErrorNotOpen
-                               userInfo:@{}];
-    }
-    return NO;
-  }
-
-  return YES;
-}
-
-
--(BOOL) flush:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSStreamTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSStreamTransport.h
deleted file mode 100644
index 54c4884..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSStreamTransport.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TNSStreamTransport : NSObject <TTransport>
-
-@property (strong, nonatomic) NSInputStream *input;
-@property (strong, nonatomic) NSOutputStream *output;
-
--(id) initWithInputStream:(nullable NSInputStream *)input
-             outputStream:(nullable NSOutputStream *)output;
-
--(id) initWithInputStream:(NSInputStream *)input;
-
--(id) initWithOutputStream:(NSOutputStream *)output;
-
--(void) close;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSStreamTransport.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSStreamTransport.m
deleted file mode 100644
index c425043..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TNSStreamTransport.m
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TNSStreamTransport.h"
-#import "TTransportError.h"
-
-
-@interface TNSStreamTransport ()
-@end
-
-
-@implementation TNSStreamTransport
-
--(id) initWithInputStream:(NSInputStream *)input
-             outputStream:(NSOutputStream *)output
-{
-  self = [super init];
-  if (self) {
-    _input = input;
-    _output = output;
-  }
-  return self;
-}
-
--(id) initWithInputStream:(NSInputStream *)input
-{
-  return [self initWithInputStream:input outputStream:nil];
-}
-
--(id) initWithOutputStream:(NSOutputStream *)output
-{
-  return [self initWithInputStream:nil outputStream:output];
-}
-
--(void) dealloc
-{
-  [self close];
-}
-
--(BOOL) readAll:(UInt8 *)buf offset:(UInt32)off length:(UInt32)len error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = 0;
-  while (got < len) {
-
-    UInt32 read = (UInt32)[_input read:buf+off+got maxLength:len-got];
-    if (read <= 0) {
-      if (error) {
-        *error = [NSError errorWithDomain:TTransportErrorDomain
-                                     code:TTransportErrorNotOpen
-                                 userInfo:@{}];
-      }
-      return NO;
-    }
-
-    got += read;
-  }
-
-  return YES;
-}
-
-
--(UInt32) readAvail:(UInt8 *)buf offset:(UInt32)off maxLength:(UInt32)len error:(NSError *__autoreleasing *)error
-{
-  UInt32 got = 0;
-  while (got < len) {
-
-    UInt32 read = (UInt32)[_input read:buf+off+got maxLength:len-got];
-    if (read <= 0) {
-      break;
-    }
-
-    got += read;
-  }
-
-  return got;
-}
-
-
--(BOOL) write:(const UInt8 *)data offset:(UInt32)offset length:(UInt32)length error:(NSError *__autoreleasing *)error
-{
-  int got = 0;
-  NSInteger total = 0;
-  while (got < length) {
-
-    total = [_output write:data+offset+got maxLength:length-got];
-    if (total == -1) {
-      if (error) {
-        *error = [NSError errorWithDomain:TTransportErrorDomain
-                                     code:TTransportErrorNotOpen
-                                 userInfo:@{}];
-      }
-      return NO;
-    }
-    else if (total == 0) {
-      if (error) {
-        *error = [NSError errorWithDomain:TTransportErrorDomain
-                                     code:TTransportErrorEndOfFile
-                                 userInfo:@{}];
-      }
-      return NO;
-    }
-
-    got += total;
-  }
-
-  return YES;
-}
-
--(BOOL) flush:(NSError *__autoreleasing *)error
-{
-  return YES;
-}
-
--(void) close
-{
-  NSInputStream *input = self.input;
-  if (input) {
-    // Close and reset inputstream
-    CFReadStreamSetProperty((__bridge CFReadStreamRef)(input), kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanTrue);
-    [input setDelegate:nil];
-    [input close];
-    [input removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
-    input = nil;
-  }
-
-  NSOutputStream *output = self.output;
-  if (output) {
-    // Close and reset outputstream
-    CFWriteStreamSetProperty((__bridge CFWriteStreamRef)(output), kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanTrue);
-    [output setDelegate:nil];
-    [output close];
-    [output removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
-    output = nil;
-  }
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransport.h
deleted file mode 100644
index b606c4a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransport.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TNSStreamTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TSSLSocketTransport : TNSStreamTransport <NSStreamDelegate>
-
--(id) initWithHostname:(NSString *)hostname
-                  port:(int)port
-                 error:(NSError **)error;
-
--(BOOL) isOpen;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransport.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransport.m
deleted file mode 100644
index 1b1214f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransport.m
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#import <Foundation/Foundation.h>
-#import <CoreFoundation/CoreFoundation.h>
-#import "TSSLSocketTransport.h"
-#import "TSSLSocketTransportError.h"
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-#if !TARGET_OS_IPHONE
-#import <CoreServices/CoreServices.h>
-#else
-#import <CFNetwork/CFNetwork.h>
-#endif
-
-@interface TSSLSocketTransport ()
-
-@property(strong, nonatomic) NSString *sslHostname;
-@property(assign, nonatomic) int sd;
-
-@end
-
-
-@implementation TSSLSocketTransport
-
--(id) initWithHostname:(NSString *)hostname
-                  port:(int)port
-                 error:(NSError **)error
-{
-  _sslHostname = hostname;
-  CFReadStreamRef readStream = NULL;
-  CFWriteStreamRef writeStream = NULL;
-
-
-  /* create a socket structure */
-  struct sockaddr_in pin;
-  struct hostent *hp = NULL;
-  for (int i = 0; i < 10; i++) {
-
-
-
-    if ((hp = gethostbyname([hostname UTF8String])) == NULL) {
-      NSLog(@"failed to resolve hostname %@", hostname);
-      herror("resolv");
-      if (i == 9) {
-        if (error) {
-          *error = [NSError errorWithDomain:TSSLSocketTransportErrorDomain
-                                       code:TSSLSocketTransportErrorHostanameResolution
-                                   userInfo:nil];
-        }
-        return nil;
-      }
-      [NSThread sleepForTimeInterval:0.2];
-    }
-    else {
-      break;
-    }
-  }
-
-  memset(&pin, 0, sizeof(pin));
-  pin.sin_family = AF_INET;
-  memcpy(&pin.sin_addr, hp->h_addr, sizeof(struct in_addr));
-  pin.sin_port = htons(port);
-
-  /* create the socket */
-  if ((_sd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
-    NSLog(@"failed to create socket for host %@:%d", hostname, port);
-    if (error) {
-      *error = [NSError errorWithDomain:TSSLSocketTransportErrorDomain
-                                   code:TSSLSocketTransportErrorSocketCreate
-                               userInfo:nil];
-    }
-    return nil;
-  }
-
-  /* open a connection */
-  if (connect(_sd, (struct sockaddr *)&pin, sizeof(pin)) == -1) {
-    NSLog(@"failed to create conenct to host %@:%d", hostname, port);
-    if (error) {
-      *error = [NSError errorWithDomain:TSSLSocketTransportErrorDomain
-                                   code:TSSLSocketTransportErrorConnect
-                               userInfo:nil];
-    }
-    return nil;
-  }
-  CFStreamCreatePairWithSocket(kCFAllocatorDefault, _sd, &readStream, &writeStream);
-
-  CFReadStreamSetProperty(readStream, kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanTrue);
-  CFWriteStreamSetProperty(writeStream, kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanTrue);
-
-  NSInputStream *inputStream;
-  NSOutputStream *outputStream;
-
-  if (readStream && writeStream) {
-
-    CFReadStreamSetProperty(readStream,
-                            kCFStreamPropertySocketSecurityLevel,
-                            kCFStreamSocketSecurityLevelTLSv1);
-
-    NSDictionary *settings = @{(__bridge NSString *)kCFStreamSSLValidatesCertificateChain: @YES};
-
-    CFReadStreamSetProperty((CFReadStreamRef)readStream,
-                            kCFStreamPropertySSLSettings,
-                            (CFTypeRef)settings);
-
-    CFWriteStreamSetProperty((CFWriteStreamRef)writeStream,
-                             kCFStreamPropertySSLSettings,
-                             (CFTypeRef)settings);
-
-    inputStream = (__bridge NSInputStream *)readStream;
-    [inputStream setDelegate:self];
-    [inputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
-    [inputStream open];
-
-    outputStream = (__bridge NSOutputStream *)writeStream;
-    [outputStream setDelegate:self];
-    [outputStream scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
-    [outputStream open];
-
-    CFRelease(readStream);
-    CFRelease(writeStream);
-  }
-
-  self = [super initWithInputStream:inputStream outputStream:outputStream];
-
-  return self;
-}
-
--(void) dealloc
-{
-  [self close];
-}
-
-#pragma mark -
-#pragma mark NSStreamDelegate
-
--(void) stream:(NSStream *)aStream
-   handleEvent:(NSStreamEvent)eventCode
-{
-  switch (eventCode) {
-  case NSStreamEventNone:
-    break;
-
-  case NSStreamEventHasBytesAvailable:
-    break;
-
-  case NSStreamEventOpenCompleted:
-    break;
-
-  case NSStreamEventHasSpaceAvailable: {
-
-    BOOL proceed = NO;
-    SecTrustResultType trustResult = kSecTrustResultInvalid;
-    CFMutableArrayRef newPolicies = NULL;
-
-    do {
-
-      SecTrustRef trust = (__bridge SecTrustRef)[aStream propertyForKey:(NSString *)kCFStreamPropertySSLPeerTrust];
-
-      // Add new policy to current list of policies
-      SecPolicyRef policy = SecPolicyCreateSSL(NO, (__bridge CFStringRef)(_sslHostname));
-      if (!policy) {
-        break;
-      }
-
-      CFArrayRef policies;
-      if (SecTrustCopyPolicies(trust, &policies) != errSecSuccess) {
-        CFRelease(policy);
-        break;
-      }
-
-      newPolicies = CFArrayCreateMutableCopy(NULL, 0, policies);
-      CFArrayAppendValue(newPolicies, policy);
-
-      CFRelease(policies);
-      CFRelease(policy);
-
-      // Update trust policies
-      if (SecTrustSetPolicies(trust, newPolicies) != errSecSuccess) {
-        break;
-      }
-
-      // Evaluate the trust chain
-      if (SecTrustEvaluate(trust, &trustResult) != errSecSuccess) {
-        break;
-      }
-
-      switch (trustResult) {
-      case kSecTrustResultProceed:
-        // NSLog(@"Trusted by USER");
-        proceed = YES;
-        break;
-
-      case kSecTrustResultUnspecified:
-        // NSLog(@"Trusted by OS");
-        proceed = YES;
-        break;
-
-      case kSecTrustResultRecoverableTrustFailure:
-        proceed = recoverFromTrustFailure(trust, trustResult);
-        break;
-
-      case kSecTrustResultDeny:
-        // NSLog(@"Deny");
-        break;
-
-      case kSecTrustResultFatalTrustFailure:
-        // NSLog(@"FatalTrustFailure");
-        break;
-
-      case kSecTrustResultOtherError:
-        // NSLog(@"OtherError");
-        break;
-
-      case kSecTrustResultInvalid:
-        // NSLog(@"Invalid");
-        break;
-
-      default:
-        // NSLog(@"Default");
-        break;
-      }
-
-    }
-    while (NO);
-
-    if (!proceed) {
-      NSLog(@"TSSLSocketTransport: Cannot trust certificate. Result: %u", trustResult);
-      [aStream close];
-    }
-
-    if (newPolicies) {
-      CFRelease(newPolicies);
-    }
-
-  }
-  break;
-
-  case NSStreamEventErrorOccurred: {
-    NSLog(@"TSSLSocketTransport: Error occurred opening stream: %@", [aStream streamError]);
-    break;
-  }
-
-  case NSStreamEventEndEncountered:
-    break;
-  }
-}
-
-BOOL recoverFromTrustFailure(SecTrustRef myTrust, SecTrustResultType lastTrustResult)
-{
-  CFAbsoluteTime trustTime = SecTrustGetVerifyTime(myTrust);
-  CFAbsoluteTime currentTime = CFAbsoluteTimeGetCurrent();
-
-  CFAbsoluteTime timeIncrement = 31536000;
-  CFAbsoluteTime newTime = currentTime - timeIncrement;
-
-  if (trustTime - newTime) {
-
-    CFDateRef newDate = CFDateCreate(NULL, newTime);
-    SecTrustSetVerifyDate(myTrust, newDate);
-    CFRelease(newDate);
-
-    if (SecTrustEvaluate(myTrust, &lastTrustResult) != errSecSuccess) {
-      return NO;
-    }
-
-  }
-
-  if (lastTrustResult == kSecTrustResultProceed || lastTrustResult == kSecTrustResultUnspecified) {
-    return YES;
-  }
-
-  NSLog(@"TSSLSocketTransport: Unable to recover certificate trust failure");
-  return YES;
-}
-
--(BOOL) isOpen
-{
-  if (_sd > 0) {
-    return TRUE;
-  }
-  else {
-    return FALSE;
-  }
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransportError.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransportError.h
deleted file mode 100644
index e17f39e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransportError.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TTransportError.h"
-
-
-extern NSString *TSSLSocketTransportErrorDomain;
-
-
-typedef NS_ENUM (int, TSSLSocketTransportError) {
-  TSSLSocketTransportErrorHostanameResolution  = -10000,
-  TSSLSocketTransportErrorSocketCreate         = -10001,
-  TSSLSocketTransportErrorConnect              = -10002,
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransportError.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransportError.m
deleted file mode 100644
index bcf941c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSSLSocketTransportError.m
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TSSLSocketTransportError.h"
-
-
-NSString *TSSLSocketTransportErrorDomain = @"TSSLSocketTransportErrorDomain";
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSocketTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSocketTransport.h
deleted file mode 100644
index 4ea03cc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSocketTransport.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "TNSStreamTransport.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@interface TSocketTransport : TNSStreamTransport
-
--(id) initWithHostname:(NSString *)hostname
-                  port:(int)port;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSocketTransport.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSocketTransport.m
deleted file mode 100644
index 272baf6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TSocketTransport.m
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#import "TSocketTransport.h"
-
-#if !TARGET_OS_IPHONE
-#import <CoreServices/CoreServices.h>
-#else
-#import <CFNetwork/CFNetwork.h>
-#endif
-
-@interface TSocketTransport () <NSStreamDelegate>
-@end
-
-
-@implementation TSocketTransport
-
--(id) initWithHostname:(NSString *)hostname
-                  port:(int)port
-{
-  NSInputStream *inputStream = nil;
-  NSOutputStream *outputStream = nil;
-
-  CFReadStreamRef readStream = NULL;
-  CFWriteStreamRef writeStream = NULL;
-  CFStreamCreatePairWithSocketToHost(kCFAllocatorDefault, (__bridge CFStringRef)hostname, port, &readStream, &writeStream);
-  if (readStream && writeStream) {
-
-    CFReadStreamSetProperty(readStream, kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanTrue);
-    CFWriteStreamSetProperty(writeStream, kCFStreamPropertyShouldCloseNativeSocket, kCFBooleanTrue);
-
-    inputStream = (__bridge NSInputStream *)readStream;
-    [inputStream setDelegate:self];
-    [inputStream scheduleInRunLoop:NSRunLoop.currentRunLoop forMode:NSDefaultRunLoopMode];
-    [inputStream open];
-
-    outputStream = (__bridge NSOutputStream *)writeStream;
-    [outputStream setDelegate:self];
-    [outputStream scheduleInRunLoop:NSRunLoop.currentRunLoop forMode:NSDefaultRunLoopMode];
-    [outputStream open];
-  }
-  else {
-
-    if (readStream) {
-      CFRelease(readStream);
-    }
-
-    if (writeStream) {
-      CFRelease(writeStream);
-    }
-
-    return nil;
-  }
-
-  return [super initWithInputStream:inputStream outputStream:outputStream];
-}
-
-@end
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransport.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransport.h
deleted file mode 100644
index 558cf60..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransport.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-@protocol TTransport <NSObject>
-
-/**
- * Guarantees that all of len bytes are read
- *
- * @param buf Buffer to read into
- * @param off Index in buffer to start storing bytes at
- * @param len Maximum number of bytes to read
- * @return YES if succeeded, NO if failed
- * @throws TTransportError if there was an error reading data
- */
--(BOOL) readAll:(UInt8 *)buf offset:(UInt32)off length:(UInt32)len error:(NSError *__autoreleasing *)error;
-
--(UInt32) readAvail:(UInt8 *)buf offset:(UInt32)off maxLength:(UInt32)maxLen error:(NSError *__autoreleasing *)error;
-
--(BOOL) write:(const UInt8 *)data offset:(UInt32)offset length:(UInt32)length error:(NSError *__autoreleasing *)error;
-
--(BOOL) flush:(NSError *__autoreleasing *)error;
-
-@end
-
-
-NS_ASSUME_NONNULL_END
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransportError.h b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransportError.h
deleted file mode 100644
index c8c9f06..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransportError.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TError.h"
-
-
-extern NSString *TTransportErrorDomain;
-
-
-typedef NS_ENUM (int, TTransportError) {
-  TTransportErrorUnknown        = 0,
-  TTransportErrorNotOpen        = 1,
-  TTransportErrorAlreadyOpen    = 2,
-  TTransportErrorTimedOut       = 3,
-  TTransportErrorEndOfFile      = 4,
-};
-
-
-extern NSString *TTransportErrorExtendedErrorKey;
-extern NSString *TTransportErrorHttpErrorKey;
-
-
-typedef NS_ENUM(int, THttpTransportError) {
-  THttpTransportErrorInvalidResponse  = 1001,
-  THttpTransportErrorInvalidStatus    = 1002,
-  THttpTransportErrorAuthentication   = 1003,
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransportError.m b/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransportError.m
deleted file mode 100644
index b1af076..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/transport/TTransportError.m
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "TTransportError.h"
-
-
-NSString *TTransportErrorDomain = @"TTransportErrorDomain";
-
-
-NSString *TTransportErrorExtendedErrorKey = @"extendedError";
-NSString *TTransportErrorHttpErrorKey = @"httpError";
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/3rdparty.props b/vendor/git.apache.org/thrift.git/lib/cpp/3rdparty.props
deleted file mode 100644
index 528d40a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/3rdparty.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <BOOST_ROOT>$(THIRD_PARTY)\boost\boost_1_47_0</BOOST_ROOT>
-    <OPENSSL_ROOT_DIR>$(THIRD_PARTY)\openssl\OpenSSL-Win32</OPENSSL_ROOT_DIR>
-    <LIBEVENT_ROOT>$(THIRD_PARTY)\libevent-2.0.21-stable</LIBEVENT_ROOT>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="BOOST_ROOT">
-      <Value>$(BOOST_ROOT)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-    <BuildMacro Include="OPENSSL_ROOT_DIR">
-      <Value>$(OPENSSL_ROOT_DIR)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-    <BuildMacro Include="LIBEVENT_ROOT">
-      <Value>$(LIBEVENT_ROOT)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/cpp/CMakeLists.txt
deleted file mode 100755
index d07b400..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/CMakeLists.txt
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
-include_directories(src)
-
-# SYSLIBS contains libraries that need to be linked to all lib targets
-set(SYSLIBS "")
-
-# Create the thrift C++ library
-set( thriftcpp_SOURCES
-   src/thrift/TApplicationException.cpp
-   src/thrift/TOutput.cpp
-   src/thrift/async/TAsyncChannel.cpp
-   src/thrift/async/TConcurrentClientSyncInfo.h
-   src/thrift/async/TConcurrentClientSyncInfo.cpp
-   src/thrift/concurrency/ThreadManager.cpp
-   src/thrift/concurrency/TimerManager.cpp
-   src/thrift/concurrency/Util.cpp
-   src/thrift/processor/PeekProcessor.cpp
-   src/thrift/protocol/TBase64Utils.cpp
-   src/thrift/protocol/TDebugProtocol.cpp
-   src/thrift/protocol/TJSONProtocol.cpp
-   src/thrift/protocol/TMultiplexedProtocol.cpp
-   src/thrift/protocol/TProtocol.cpp
-   src/thrift/transport/TTransportException.cpp
-   src/thrift/transport/TFDTransport.cpp
-   src/thrift/transport/TSimpleFileTransport.cpp
-   src/thrift/transport/THttpTransport.cpp
-   src/thrift/transport/THttpClient.cpp
-   src/thrift/transport/THttpServer.cpp
-   src/thrift/transport/TSocket.cpp
-   src/thrift/transport/TSocketPool.cpp
-   src/thrift/transport/TServerSocket.cpp
-   src/thrift/transport/TTransportUtils.cpp
-   src/thrift/transport/TBufferTransports.cpp
-   src/thrift/server/TConnectedClient.cpp
-   src/thrift/server/TServerFramework.cpp
-   src/thrift/server/TSimpleServer.cpp
-   src/thrift/server/TThreadPoolServer.cpp
-   src/thrift/server/TThreadedServer.cpp
-)
-
-# This files don't work on Windows CE as there is no pipe support
-# TODO: These files won't work with UNICODE support on windows. If fixed this can be re-added.
-if (NOT WINCE)
-    list(APPEND thriftcpp_SOURCES
-       src/thrift/transport/TPipe.cpp
-       src/thrift/transport/TPipeServer.cpp
-       src/thrift/transport/TFileTransport.cpp
-    )
-endif()
-
-
-if (WIN32)
-    list(APPEND thriftcpp_SOURCES
-        src/thrift/windows/TWinsockSingleton.cpp
-        src/thrift/windows/SocketPair.cpp
-        src/thrift/windows/GetTimeOfDay.cpp
-        src/thrift/windows/WinFcntl.cpp
-    )
-    if(NOT WINCE)
-        # This file uses pipes so it currently won't work on Windows CE
-        list(APPEND thriftcpp_SOURCES
-            src/thrift/windows/OverlappedSubmissionThread.cpp
-        )
-    endif()
-else()
-    # These files evaluate to nothing on Windows, so omit them from the
-    # Windows build
-    list(APPEND thriftcpp_SOURCES
-        src/thrift/VirtualProfiling.cpp
-        src/thrift/server/TServer.cpp
-    )
-endif()
-
-# If OpenSSL is not found just ignore the OpenSSL stuff
-find_package(OpenSSL)
-if(OPENSSL_FOUND AND WITH_OPENSSL)
-    list( APPEND thriftcpp_SOURCES
-       src/thrift/transport/TSSLSocket.cpp
-       src/thrift/transport/TSSLServerSocket.cpp
-    )
-    include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-    list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}")
-endif()
-
-# WITH_*THREADS selects which threading library to use
-if(WITH_BOOSTTHREADS)
-    set( thriftcpp_threads_SOURCES
-        src/thrift/concurrency/BoostThreadFactory.cpp
-        src/thrift/concurrency/BoostMonitor.cpp
-        src/thrift/concurrency/BoostMutex.cpp
-    )
-    list(APPEND SYSLIBS "${Boost_LIBRARIES}")
-elseif(UNIX AND NOT WITH_STDTHREADS)
-    if(ANDROID)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-    else()
-        list(APPEND SYSLIBS pthread)
-    endif()
-    set( thriftcpp_threads_SOURCES
-        src/thrift/concurrency/PosixThreadFactory.cpp
-        src/thrift/concurrency/Mutex.cpp
-        src/thrift/concurrency/Monitor.cpp
-    )
-else()
-    if(UNIX)
-        if(ANDROID)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-        else()
-            list(APPEND SYSLIBS pthread)
-        endif()
-    endif()
-    set( thriftcpp_threads_SOURCES
-        src/thrift/concurrency/StdThreadFactory.cpp
-        src/thrift/concurrency/StdMutex.cpp
-        src/thrift/concurrency/StdMonitor.cpp
-    )
-endif()
-
-# Thrift non blocking server
-set( thriftcppnb_SOURCES
-    src/thrift/server/TNonblockingServer.cpp
-    src/thrift/async/TAsyncProtocolProcessor.cpp
-    src/thrift/async/TEvhttpServer.cpp
-    src/thrift/async/TEvhttpClientChannel.cpp
-)
-
-# Thrift zlib server
-set( thriftcppz_SOURCES
-    src/thrift/transport/TZlibTransport.cpp
-    src/thrift/protocol/THeaderProtocol.cpp
-    src/thrift/transport/THeaderTransport.cpp
-    src/thrift/protocol/THeaderProtocol.cpp
-    src/thrift/transport/THeaderTransport.cpp
-)
-
-# Thrift Qt4 server
-set( thriftcppqt_SOURCES
-    src/thrift/qt/TQIODeviceTransport.cpp
-    src/thrift/qt/TQTcpServer.cpp
-)
-
-# Contains the thrift specific ADD_LIBRARY_THRIFT and TARGET_LINK_LIBRARIES_THRIFT
-include(ThriftMacros)
-
-ADD_LIBRARY_THRIFT(thrift ${thriftcpp_SOURCES} ${thriftcpp_threads_SOURCES})
-if(WIN32)
-    TARGET_LINK_LIBRARIES_THRIFT(thrift ${SYSLIBS} ws2_32)
-else()
-    TARGET_LINK_LIBRARIES_THRIFT(thrift ${SYSLIBS})
-endif()
-
-if(WITH_LIBEVENT)
-    find_package(Libevent REQUIRED)  # Libevent comes with CMake support form upstream
-    include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS})
-
-    ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES})
-    TARGET_LINK_LIBRARIES_THRIFT(thriftnb ${SYSLIBS} ${LIBEVENT_LIBRARIES})
-    TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftnb thrift)
-endif()
-
-if(WITH_ZLIB)
-    find_package(ZLIB REQUIRED)
-    include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
-
-    ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES})
-    TARGET_LINK_LIBRARIES_THRIFT(thriftz ${SYSLIBS} ${ZLIB_LIBRARIES})
-    TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftz thrift)
-endif()
-
-if(WITH_QT4)
-    set(CMAKE_AUTOMOC ON)
-    find_package(Qt4 REQUIRED COMPONENTS QtCore QtNetwork)
-    ADD_LIBRARY_THRIFT(thriftqt ${thriftcppqt_SOURCES})
-    TARGET_LINK_LIBRARIES_THRIFT(thriftqt ${SYSLIBS} Qt4::QtCore Qt4::QtNetwork)
-    TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftqt thrift)
-endif()
-
-if(WITH_QT5)
-    # Qt5 has its own directory to avoid conflict with Qt4 caused by CMAKE_AUTOMOC
-    add_subdirectory(src/thrift/qt)
-endif()
-
-if(MSVC)
-    add_definitions("-DUNICODE -D_UNICODE")
-endif()
-
-add_definitions("-D__STDC_LIMIT_MACROS")
-
-# Install the headers
-install(DIRECTORY "src/thrift" DESTINATION "${INCLUDE_INSTALL_DIR}"
-    FILES_MATCHING PATTERN "*.h" PATTERN "*.tcc")
-# Copy config.h file
-install(DIRECTORY "${CMAKE_BINARY_DIR}/thrift" DESTINATION "${INCLUDE_INSTALL_DIR}"
-    FILES_MATCHING PATTERN "*.h")
-
-if(BUILD_TESTING)
-    add_subdirectory(test)
-endif()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/Makefile.am b/vendor/git.apache.org/thrift.git/lib/cpp/Makefile.am
deleted file mode 100755
index 2a1cca8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/Makefile.am
+++ /dev/null
@@ -1,287 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-moc_%.cpp: %.h
-	$(QT_MOC) $(QT_CFLAGS) $< -o $@
-
-moc__%.cpp: %.h
-	$(QT5_MOC) $(QT5_CFLAGS) $< -o $@
-
-SUBDIRS = .
-
-if WITH_TESTS
-# This file is needed by compiler with plugin, while test/Makefile.am needs compiler
-# So test directory is directly picked by top level Makefile.am for plugin build
-if !WITH_PLUGIN
-SUBDIRS += test
-endif
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-
-lib_LTLIBRARIES = libthrift.la
-pkgconfig_DATA = thrift.pc
-libthrift_la_LDFLAGS = -release $(VERSION)
-libthrift_la_LIBADD = $(BOOST_LDFLAGS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS)
-
-## We only build the extra libraries if we have the dependencies,
-## but we install all of the headers unconditionally.
-if AMX_HAVE_LIBEVENT
-lib_LTLIBRARIES += libthriftnb.la
-pkgconfig_DATA += thrift-nb.pc
-endif
-if AMX_HAVE_ZLIB
-lib_LTLIBRARIES += libthriftz.la
-pkgconfig_DATA += thrift-z.pc
-endif
-if AMX_HAVE_QT
-lib_LTLIBRARIES += libthriftqt.la
-pkgconfig_DATA += thrift-qt.pc
-endif
-if AMX_HAVE_QT5
-lib_LTLIBRARIES += libthriftqt5.la
-pkgconfig_DATA += thrift-qt5.pc
-endif
-
-AM_CXXFLAGS = -Wall -Wextra -pedantic
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(OPENSSL_INCLUDES) -I$(srcdir)/src -D__STDC_LIMIT_MACROS
-
-# Define the source files for the module
-
-libthrift_la_SOURCES = src/thrift/TApplicationException.cpp \
-                       src/thrift/TOutput.cpp \
-                       src/thrift/VirtualProfiling.cpp \
-                       src/thrift/async/TAsyncChannel.cpp \
-                       src/thrift/async/TConcurrentClientSyncInfo.cpp \
-                       src/thrift/concurrency/ThreadManager.cpp \
-                       src/thrift/concurrency/TimerManager.cpp \
-                       src/thrift/concurrency/Util.cpp \
-                       src/thrift/processor/PeekProcessor.cpp \
-                       src/thrift/protocol/TDebugProtocol.cpp \
-                       src/thrift/protocol/TJSONProtocol.cpp \
-                       src/thrift/protocol/TBase64Utils.cpp \
-                       src/thrift/protocol/TMultiplexedProtocol.cpp \
-                       src/thrift/protocol/TProtocol.cpp \
-                       src/thrift/transport/TTransportException.cpp \
-                       src/thrift/transport/TFDTransport.cpp \
-                       src/thrift/transport/TFileTransport.cpp \
-                       src/thrift/transport/TSimpleFileTransport.cpp \
-                       src/thrift/transport/THttpTransport.cpp \
-                       src/thrift/transport/THttpClient.cpp \
-                       src/thrift/transport/THttpServer.cpp \
-                       src/thrift/transport/TSocket.cpp \
-                       src/thrift/transport/TPipe.cpp \
-                       src/thrift/transport/TPipeServer.cpp \
-                       src/thrift/transport/TSSLSocket.cpp \
-                       src/thrift/transport/TSocketPool.cpp \
-                       src/thrift/transport/TServerSocket.cpp \
-                       src/thrift/transport/TSSLServerSocket.cpp \
-                       src/thrift/transport/TTransportUtils.cpp \
-                       src/thrift/transport/TBufferTransports.cpp \
-                       src/thrift/server/TConnectedClient.cpp \
-                       src/thrift/server/TServer.cpp \
-                       src/thrift/server/TServerFramework.cpp \
-                       src/thrift/server/TSimpleServer.cpp \
-                       src/thrift/server/TThreadPoolServer.cpp \
-                       src/thrift/server/TThreadedServer.cpp
-
-if WITH_BOOSTTHREADS
-libthrift_la_SOURCES += src/thrift/concurrency/BoostThreadFactory.cpp \
-                        src/thrift/concurrency/BoostMonitor.cpp \
-                        src/thrift/concurrency/BoostMutex.cpp
-else
-libthrift_la_SOURCES += src/thrift/concurrency/Mutex.cpp \
-                        src/thrift/concurrency/Monitor.cpp \
-                        src/thrift/concurrency/PosixThreadFactory.cpp
-endif
-
-libthriftnb_la_SOURCES = src/thrift/server/TNonblockingServer.cpp \
-                         src/thrift/async/TAsyncProtocolProcessor.cpp \
-                         src/thrift/async/TEvhttpServer.cpp \
-                         src/thrift/async/TEvhttpClientChannel.cpp
-
-libthriftz_la_SOURCES = src/thrift/transport/TZlibTransport.cpp \
-                        src/thrift/transport/THeaderTransport.cpp \
-                        src/thrift/protocol/THeaderProtocol.cpp 
-
-
-libthriftqt_la_MOC = src/thrift/qt/moc_TQTcpServer.cpp
-nodist_libthriftqt_la_SOURCES = $(libthriftqt_la_MOC)
-libthriftqt_la_SOURCES = src/thrift/qt/TQIODeviceTransport.cpp \
-                         src/thrift/qt/TQTcpServer.cpp
-CLEANFILES = $(libthriftqt_la_MOC)
-
-libthriftqt5_la_MOC = src/thrift/qt/moc__TQTcpServer.cpp
-nodist_libthriftqt5_la_SOURCES = $(libthriftqt5_la_MOC)
-libthriftqt5_la_SOURCES = src/thrift/qt/TQIODeviceTransport.cpp \
-                          src/thrift/qt/TQTcpServer.cpp
-CLEANFILES += $(libthriftqt5_la_MOC)
-
-# Flags for the various libraries
-libthriftnb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
-libthriftz_la_CPPFLAGS  = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
-libthriftqt_la_CPPFLAGS = $(AM_CPPFLAGS) $(QT_CFLAGS)
-libthriftqt5_la_CPPFLAGS = $(AM_CPPFLAGS) $(QT5_CFLAGS)
-if QT5_REDUCE_RELOCATIONS
-libthriftqt5_la_CPPFLAGS += -fPIC
-endif
-libthriftnb_la_CXXFLAGS = $(AM_CXXFLAGS)
-libthriftz_la_CXXFLAGS  = $(AM_CXXFLAGS)
-libthriftqt_la_CXXFLAGS  = $(AM_CXXFLAGS)
-libthriftqt5_la_CXXFLAGS  = $(AM_CXXFLAGS)
-libthriftnb_la_LDFLAGS  = -release $(VERSION) $(BOOST_LDFLAGS)
-libthriftz_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS)
-libthriftqt_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS) $(QT_LIBS)
-libthriftqt5_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS) $(QT5_LIBS)
-
-include_thriftdir = $(includedir)/thrift
-include_thrift_HEADERS = \
-                         $(top_builddir)/config.h \
-                         src/thrift/thrift-config.h \
-                         src/thrift/TDispatchProcessor.h \
-                         src/thrift/Thrift.h \
-                         src/thrift/TOutput.h \
-                         src/thrift/TProcessor.h \
-                         src/thrift/TApplicationException.h \
-                         src/thrift/TLogging.h \
-                         src/thrift/cxxfunctional.h \
-                         src/thrift/TToString.h \
-                         src/thrift/TBase.h
-
-include_concurrencydir = $(include_thriftdir)/concurrency
-include_concurrency_HEADERS = \
-                         src/thrift/concurrency/BoostThreadFactory.h \
-                         src/thrift/concurrency/Exception.h \
-                         src/thrift/concurrency/Mutex.h \
-                         src/thrift/concurrency/Monitor.h \
-                         src/thrift/concurrency/PlatformThreadFactory.h \
-                         src/thrift/concurrency/PosixThreadFactory.h \
-                         src/thrift/concurrency/StdMonitor.cpp \
-                         src/thrift/concurrency/StdMutex.cpp \
-                         src/thrift/concurrency/StdThreadFactory.cpp \
-                         src/thrift/concurrency/StdThreadFactory.h \
-                         src/thrift/concurrency/Thread.h \
-                         src/thrift/concurrency/ThreadManager.h \
-                         src/thrift/concurrency/TimerManager.h \
-                         src/thrift/concurrency/FunctionRunner.h \
-                         src/thrift/concurrency/Util.h
-
-include_protocoldir = $(include_thriftdir)/protocol
-include_protocol_HEADERS = \
-                         src/thrift/protocol/TBinaryProtocol.h \
-                         src/thrift/protocol/TBinaryProtocol.tcc \
-                         src/thrift/protocol/TCompactProtocol.h \
-                         src/thrift/protocol/TCompactProtocol.tcc \
-                         src/thrift/protocol/TDebugProtocol.h \
-                         src/thrift/protocol/THeaderProtocol.h \
-                         src/thrift/protocol/TBase64Utils.h \
-                         src/thrift/protocol/TJSONProtocol.h \
-                         src/thrift/protocol/TMultiplexedProtocol.h \
-                         src/thrift/protocol/TProtocolDecorator.h \
-                         src/thrift/protocol/TProtocolTap.h \
-                         src/thrift/protocol/TProtocolTypes.h \
-                         src/thrift/protocol/TProtocolException.h \
-                         src/thrift/protocol/TVirtualProtocol.h \
-                         src/thrift/protocol/TProtocol.h
-
-include_transportdir = $(include_thriftdir)/transport
-include_transport_HEADERS = \
-                         src/thrift/transport/PlatformSocket.h \
-                         src/thrift/transport/TFDTransport.h \
-                         src/thrift/transport/TFileTransport.h \
-                         src/thrift/transport/THeaderTransport.h \
-                         src/thrift/transport/TSimpleFileTransport.h \
-                         src/thrift/transport/TServerSocket.h \
-                         src/thrift/transport/TSSLServerSocket.h \
-                         src/thrift/transport/TServerTransport.h \
-                         src/thrift/transport/THttpTransport.h \
-                         src/thrift/transport/THttpClient.h \
-                         src/thrift/transport/THttpServer.h \
-                         src/thrift/transport/TSocket.h \
-                         src/thrift/transport/TPipe.h \
-                         src/thrift/transport/TPipeServer.h \
-                         src/thrift/transport/TSSLSocket.h \
-                         src/thrift/transport/TSocketPool.h \
-                         src/thrift/transport/TVirtualTransport.h \
-                         src/thrift/transport/TTransport.h \
-                         src/thrift/transport/TTransportException.h \
-                         src/thrift/transport/TTransportUtils.h \
-                         src/thrift/transport/TBufferTransports.h \
-                         src/thrift/transport/TShortReadTransport.h \
-                         src/thrift/transport/TZlibTransport.h
-
-include_serverdir = $(include_thriftdir)/server
-include_server_HEADERS = \
-                         src/thrift/server/TConnectedClient.h \
-                         src/thrift/server/TServer.h \
-                         src/thrift/server/TServerFramework.h \
-                         src/thrift/server/TSimpleServer.h \
-                         src/thrift/server/TThreadPoolServer.h \
-                         src/thrift/server/TThreadedServer.h \
-                         src/thrift/server/TNonblockingServer.h
-
-include_processordir = $(include_thriftdir)/processor
-include_processor_HEADERS = \
-                         src/thrift/processor/PeekProcessor.h \
-                         src/thrift/processor/StatsProcessor.h \
-                         src/thrift/processor/TMultiplexedProcessor.h
-
-include_asyncdir = $(include_thriftdir)/async
-include_async_HEADERS = \
-                     src/thrift/async/TAsyncChannel.h \
-                     src/thrift/async/TAsyncDispatchProcessor.h \
-                     src/thrift/async/TAsyncProcessor.h \
-                     src/thrift/async/TAsyncBufferProcessor.h \
-                     src/thrift/async/TAsyncProtocolProcessor.h \
-                     src/thrift/async/TConcurrentClientSyncInfo.h \
-                     src/thrift/async/TEvhttpClientChannel.h \
-                     src/thrift/async/TEvhttpServer.h
-
-include_qtdir = $(include_thriftdir)/qt
-include_qt_HEADERS = \
-                  src/thrift/qt/TQIODeviceTransport.h \
-                  src/thrift/qt/TQTcpServer.h
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-WINDOWS_DIST = \
-             src/thrift/windows \
-             thrift.sln \
-             libthrift.vcxproj \
-             libthrift.vcxproj.filters \
-             libthriftnb.vcxproj \
-             libthriftnb.vcxproj.filters \
-             3rdparty.props
-
-EXTRA_DIST = \
-             CMakeLists.txt \
-             coding_standards.md \
-             README.md \
-             thrift-nb.pc.in \
-             thrift.pc.in \
-             thrift-z.pc.in \
-             thrift-qt.pc.in \
-             thrift-qt5.pc.in \
-             src/thrift/qt/CMakeLists.txt \
-             $(WINDOWS_DIST)
-
-style-local:
-	$(CPPSTYLE_CMD)
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/README.md b/vendor/git.apache.org/thrift.git/lib/cpp/README.md
deleted file mode 100755
index 2bee2ec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/README.md
+++ /dev/null
@@ -1,274 +0,0 @@
-Thrift C++ Software Library
-
-# License
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-
-# Using Thrift with C++
-
-The Thrift C++ libraries are built using the GNU tools. Follow the instructions
-in the top-level README.md
-
-In case you do not want to open another README.md file, do this thrift src:
-
-    ./bootstrap.sh
-    ./configure (--with-boost=/usr/local)
-    make
-    sudo make install
-
-Thrift is divided into two libraries.
-
-* libthrift - The core Thrift library contains all the core Thrift code. It requires
-  boost shared pointers, pthreads, and librt.
-
-* libthriftnb - This library contains the Thrift nonblocking server, which uses libevent.
-  To link this library you will also need to link libevent.
-
-## Linking Against Thrift
-
-After you build and install Thrift the libraries are installed to
-/usr/local/lib by default. Make sure this is in your LDPATH.
-
-On Linux, the best way to do this is to ensure that /usr/local/lib is in
-your /etc/ld.so.conf and then run /sbin/ldconfig.
-
-Depending upon whether you are linking dynamically or statically and how
-your build environment it set up, you may need to include additional
-libraries when linking against thrift, such as librt and/or libpthread. If
-you are using libthriftnb you will also need libevent.
-
-## Dependencies
-
-boost shared pointers
-http://www.boost.org/libs/smart_ptr/smart_ptr.htm
-
-libevent (for libthriftnb only)
-http://monkey.org/~provos/libevent/
-
-# Using Thrift with C++ on Windows
-
-You need to define an environment variables for 3rd party components separately:
-
-BOOST_ROOT : For boost, e.g. D:\boost_1_55_0
-OPENSSL_ROOT_DIR : For OpenSSL, e.g. D:\OpenSSL-Win32
-
-only required by libthriftnb:
-
-LIBEVENT_ROOT_DIR : For Libevent e.g. D:\libevent-2.0.21-stable
-
-See /3rdparty.user for more details.
-
-Thrift is divided into two libraries.
-
-* libthrift - The core Thrift library contains all the core Thrift code. It requires
-  boost shared pointers, pthreads, and librt.
-
-* libthriftnb - This library contains the Thrift nonblocking server, which uses libevent.
-  To link this library you will also need to link libevent.
-
-## Linking Against Thrift
-
-You need to link your project that uses thrift against all the thrift
-dependencies; in the case of libthrift, boost and for
-libthriftnb, libevent.
-
-In the project properties you must also set HAVE_CONFIG_H as force include
-the config header: "windows/confg.h"
-
-## Dependencies
-
-boost shared pointers
-http://www.boost.org/libs/smart_ptr/smart_ptr.htm
-
-boost thread
-http://www.boost.org/doc/libs/release/doc/html/thread.html
-
-libevent (for libthriftnb only)
-http://monkey.org/~provos/libevent/
-
-## Notes on boost thread (static vs shared):
-
-By default lib/cpp/windows/force_inc.h defines:
-
-    #define BOOST_ALL_NO_LIB 1
-    #define BOOST_THREAD_NO_LIB 1
-
-This has for effect to have the host application linking against Thrift
-to have to link with boost thread as a static library.
-
-If you wanted instead to link with boost thread as a shared library,
-you'll need to uncomment those two lines, and recompile.
-
-## Windows version compatibility
-
-The Thrift library targets Windows XP for broadest compatbility. A notable
-difference is in the Windows-specific implementation of the socket poll
-function. To target Vista, Win7 or other versions, comment out the line
-
-    #define TARGET_WIN_XP.
-
-## Named Pipes
-
-Named Pipe transport has been added in the TPipe and TPipeServer classes. This
-is currently Windows-only. Named pipe transport for *NIX has not been
-implemented. Domain sockets are a better choice for local IPC under non-Windows
-OS's. *NIX named pipes only support 1:1 client-server connection.
-
-# Thrift/SSL
-
-## Scope
-
-This SSL only supports blocking mode socket I/O. It can only be used with
-TSimpleServer, TThreadedServer, and TThreadPoolServer.
-
-## Implementation
-
-There're two main classes TSSLSocketFactory and TSSLSocket. Instances of
-TSSLSocket are always created from TSSLSocketFactory.
-
-PosixSSLThreadFactory creates PosixSSLThread. The only difference from the
-PthreadThread type is that it cleanups OpenSSL error queue upon exiting
-the thread. Ideally, OpenSSL APIs should only be called from PosixSSLThread.
-
-## How to use SSL APIs
-
-This is for demo. In real code, typically only one TSSLSocketFactory
-instance is needed.
-
-    shared_ptr<TSSLSocketFactory> getSSLSocketFactory() {
-      shared_ptr<TSSLSocketFactory> factory(new TSSLSocketFactory());
-      // client: load trusted certificates
-      factory->loadTrustedCertificates("my-trusted-ca-certificates.pem");
-      // client: optionally set your own access manager, otherwise,
-      //         the default client access manager will be loaded.
-
-      factory->loadCertificate("my-certificate-signed-by-ca.pem");
-      factory->loadPrivateKey("my-private-key.pem");
-      // server: optionally setup access manager
-      // shared_ptr<AccessManager> accessManager(new MyAccessManager);
-      // factory->access(accessManager);
-      ...
-    }
-
-
-client code sample
-
-    shared_ptr<TSSLSocketFactory> factory = getSSLSocketFactory();
-    shared_ptr<TSocket> socket = factory.createSocket(host, port);
-    shared_ptr<TBufferedTransport> transport(new TBufferedTransport(socket));
-    ...
-
-
-server code sample
-
-    shared_ptr<TSSLSocketFactory> factory = getSSLSocketFactory();
-    shared_ptr<TSSLServerSocket> socket(new TSSLServerSocket(port, factory));
-    shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory));
-    ...
-
-## AccessManager
-
-AccessManager defines a callback interface. It has three callback methods:
-
-(a) Decision verify(const sockaddr_storage& sa);
-
-(b) Decision verify(const string& host, const char* name, int size);
-
-(c) Decision verify(const sockaddr_storage& sa, const char* data, int size);
-
-After SSL handshake completes, additional checks are conducted. Application
-is given the chance to decide whether or not to continue the conversation
-with the remote. Application is queried through the above three "verify"
-method. They are called at different points of the verification process.
-
-Decisions can be one of ALLOW, DENY, and SKIP. ALLOW and DENY means the
-conversation should be continued or disconnected, respectively. ALLOW and
-DENY decision stops the verification process. SKIP means there's no decision
-based on the given input, continue the verification process.
-
-First, (a) is called with the remote IP. It is called once at the beginning.
-"sa" is the IP address of the remote peer.
-
-Then, the certificate of remote peer is loaded. SubjectAltName extensions
-are extracted and sent to application for verification. When a DNS
-subjectAltName field is extracted, (b) is called. When an IP subjectAltName
-field is extracted, (c) is called.
-
-The "host" in (b) is the value from TSocket::getHost() if this is a client
-side socket, or TSocket::getPeerHost() if this is a server side socket. The
-reason is client side socket initiates the connection. TSocket::getHost()
-is the remote host name. On server side, the remote host name is unknown
-unless it's retrieved through TSocket::getPeerHost(). Either way, "host"
-should be the remote host name. Keep in mind, if TSocket::getPeerHost()
-failed, it would return the remote host name in numeric format.
-
-If all subjectAltName extensions were "skipped", the common name field would
-be checked. It is sent to application through (c), where "sa" is the remote
-IP address. "data" is the IP address extracted from subjectAltName IP
-extension, and "size" is the length of the extension data.
-
-If any of the above "verify" methods returned a decision ALLOW or DENY, the
-verification process would be stopped.
-
-If any of the above "verify" methods returned SKIP, that decision would be
-ignored and the verification process would move on till the last item is
-examined. At that point, if there's still no decision, the connection is
-terminated.
-
-Thread safety, an access manager should not store state information if it's
-to be used by many SSL sockets.
-
-## SIGPIPE signal
-
-Applications running OpenSSL over network connections may crash if SIGPIPE
-is not ignored. This happens when they receive a connection reset by remote
-peer exception, which somehow triggers a SIGPIPE signal. If not handled,
-this signal would kill the application.
-
-## How to run test client/server in SSL mode
-
-The server and client expects the followings from the directory /test/
-
-- keys/server.crt
-- keys/server.key
-- keys/CA.pem
-
-The file names are hard coded in the source code. You need to create these
-certificates before you can run the test code in SSL mode. Make sure at least
-one of the followings is included in "keys/server.crt",
-
-- subjectAltName, DNS localhost
-- subjectAltName, IP  127.0.0.1
-- common name,    localhost
-
-Run within /test/ folder,
-
-         ./cpp/TestServer --ssl &
-         ./cpp/TestClient --ssl
-
-If "-h <host>" is used to run client, the above "localhost" in the above
-keys/server.crt has to be replaced with that host name.
-
-## TSSLSocketFactory::randomize()
-
-The default implementation of OpenSSLSocketFactory::randomize() simply calls
-OpenSSL's RAND_poll() when OpenSSL library is first initialized.
-
-The PRNG seed is key to the application security. This method should be
-overridden if it's not strong enough for you.
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/cpp/coding_standards.md
deleted file mode 100644
index 8018c77..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/coding_standards.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
-
- * see .clang-format in root dir for settings of accepted format
- * clang-format (3.5 or newer) can be used to automaticaly reformat code ('make style' command)
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/libthrift.vcxproj b/vendor/git.apache.org/thrift.git/lib/cpp/libthrift.vcxproj
deleted file mode 100644
index db0e5d9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/libthrift.vcxproj
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug-mt|Win32">
-      <Configuration>Debug-mt</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-mt|x64">
-      <Configuration>Debug-mt</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-mt|Win32">
-      <Configuration>Release-mt</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-mt|x64">
-      <Configuration>Release-mt</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\thrift\async\TAsyncChannel.cpp"/>
-    <ClCompile Include="src\thrift\async\TConcurrentClientSyncInfo.cpp"/>
-    <ClCompile Include="src\thrift\concurrency\BoostMonitor.cpp" />
-    <ClCompile Include="src\thrift\concurrency\BoostMutex.cpp" />
-    <ClCompile Include="src\thrift\concurrency\BoostThreadFactory.cpp" />
-    <ClCompile Include="src\thrift\concurrency\StdThreadFactory.cpp" />
-    <ClCompile Include="src\thrift\concurrency\ThreadManager.cpp"/>
-    <ClCompile Include="src\thrift\concurrency\TimerManager.cpp"/>
-    <ClCompile Include="src\thrift\concurrency\Util.cpp"/>
-    <ClCompile Include="src\thrift\processor\PeekProcessor.cpp"/>
-    <ClCompile Include="src\thrift\protocol\TBase64Utils.cpp" />
-    <ClCompile Include="src\thrift\protocol\TDebugProtocol.cpp"/>
-    <ClCompile Include="src\thrift\protocol\TJSONProtocol.cpp"/>
-    <ClCompile Include="src\thrift\protocol\TProtocol.cpp"/>
-    <ClCompile Include="src\thrift\protocol\TMultiplexedProtocol.cpp"/>
-    <ClCompile Include="src\thrift\server\TSimpleServer.cpp"/>
-    <ClCompile Include="src\thrift\server\TThreadPoolServer.cpp"/>
-    <ClCompile Include="src\thrift\server\TThreadedServer.cpp"/>
-    <ClCompile Include="src\thrift\TApplicationException.cpp"/>
-    <ClCompile Include="src\thrift\TOutput.cpp"/>
-    <ClCompile Include="src\thrift\transport\TBufferTransports.cpp"/>
-    <ClCompile Include="src\thrift\transport\TFDTransport.cpp" />
-    <ClCompile Include="src\thrift\transport\THttpClient.cpp" />
-    <ClCompile Include="src\thrift\transport\THttpServer.cpp" />
-    <ClCompile Include="src\thrift\transport\THttpTransport.cpp"/>
-    <ClCompile Include="src\thrift\transport\TPipe.cpp" />
-    <ClCompile Include="src\thrift\transport\TPipeServer.cpp" />
-    <ClCompile Include="src\thrift\transport\TServerSocket.cpp"/>
-    <ClCompile Include="src\thrift\transport\TSimpleFileTransport.cpp" />
-    <ClCompile Include="src\thrift\transport\TFileTransport.cpp" />
-    <ClCompile Include="src\thrift\transport\TSocket.cpp"/>
-    <ClCompile Include="src\thrift\transport\TSSLSocket.cpp"/>
-    <ClCompile Include="src\thrift\transport\TTransportException.cpp"/>
-    <ClCompile Include="src\thrift\transport\TTransportUtils.cpp"/>
-    <ClCompile Include="src\thrift\windows\GetTimeOfDay.cpp" />
-    <ClCompile Include="src\thrift\windows\OverlappedSubmissionThread.cpp" />
-    <ClCompile Include="src\thrift\windows\SocketPair.cpp" />
-    <ClCompile Include="src\thrift\windows\TWinsockSingleton.cpp" />
-    <ClCompile Include="src\thrift\windows\WinFcntl.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\thrift\async\TAsyncChannel.h" />
-    <ClInclude Include="src\thrift\async\TConcurrentClientSyncInfo.h" />
-    <ClInclude Include="src\thrift\concurrency\BoostThreadFactory.h" />
-    <ClInclude Include="src\thrift\concurrency\StdThreadFactory.h" />
-    <ClInclude Include="src\thrift\concurrency\Exception.h" />
-    <ClInclude Include="src\thrift\concurrency\PlatformThreadFactory.h" />
-    <ClInclude Include="src\thrift\processor\PeekProcessor.h" />
-    <ClInclude Include="src\thrift\processor\TMultiplexedProcessor.h" />
-    <ClInclude Include="src\thrift\protocol\TBinaryProtocol.h" />
-    <ClInclude Include="src\thrift\protocol\TDebugProtocol.h" />
-    <ClInclude Include="src\thrift\protocol\TJSONProtocol.h" />
-    <ClInclude Include="src\thrift\protocol\TMultiplexedProtocol.h" />
-    <ClInclude Include="src\thrift\protocol\TProtocol.h" />
-    <ClInclude Include="src\thrift\protocol\TVirtualProtocol.h" />
-    <ClInclude Include="src\thrift\server\TServer.h" />
-    <ClInclude Include="src\thrift\server\TSimpleServer.h" />
-    <ClInclude Include="src\thrift\server\TThreadPoolServer.h" />
-    <ClInclude Include="src\thrift\server\TThreadedServer.h" />
-    <ClInclude Include="src\thrift\TApplicationException.h" />
-    <ClInclude Include="src\thrift\Thrift.h" />
-    <ClInclude Include="src\thrift\TOutput.h" />
-    <ClInclude Include="src\thrift\TProcessor.h" />
-    <ClInclude Include="src\thrift\transport\TBufferTransports.h" />
-    <ClInclude Include="src\thrift\transport\TFDTransport.h" />
-    <ClInclude Include="src\thrift\transport\TFileTransport.h" />
-    <ClInclude Include="src\thrift\transport\THttpClient.h" />
-    <ClInclude Include="src\thrift\transport\THttpServer.h" />
-    <ClInclude Include="src\thrift\transport\TPipe.h" />
-    <ClInclude Include="src\thrift\transport\TPipeServer.h" />
-    <ClInclude Include="src\thrift\transport\TServerSocket.h" />
-    <ClInclude Include="src\thrift\transport\TServerTransport.h" />
-    <ClInclude Include="src\thrift\transport\TSimpleFileTransport.h" />
-    <ClInclude Include="src\thrift\transport\TSocket.h" />
-    <ClInclude Include="src\thrift\transport\TSSLSocket.h" />
-    <ClInclude Include="src\thrift\transport\TTransport.h" />
-    <ClInclude Include="src\thrift\transport\TTransportException.h" />
-    <ClInclude Include="src\thrift\transport\TTransportUtils.h" />
-    <ClInclude Include="src\thrift\transport\TVirtualTransport.h" />
-    <ClInclude Include="src\thrift\windows\config.h" />
-    <ClInclude Include="src\thrift\windows\GetTimeOfDay.h" />
-    <ClInclude Include="src\thrift\windows\Operators.h" />
-    <ClInclude Include="src\thrift\windows\OverlappedSubmissionThread.h" />
-    <ClInclude Include="src\thrift\windows\SocketPair.h" />
-    <ClInclude Include="src\thrift\windows\TWinsockSingleton.h" />
-    <ClInclude Include="src\thrift\windows\WinFcntl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="src\thrift\protocol\TBinaryProtocol.tcc" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DD26F57E-60F2-4F37-A616-D219A9BF338F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>thrift</RootNamespace>
-    <ProjectName>libthrift</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(OPENSSL_ROOT_DIR)\include\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/libthrift.vcxproj.filters b/vendor/git.apache.org/thrift.git/lib/cpp/libthrift.vcxproj.filters
deleted file mode 100644
index 5f64f78..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/libthrift.vcxproj.filters
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="src\thrift\transport\TBufferTransports.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\TOutput.cpp" />
-    <ClCompile Include="src\thrift\TApplicationException.cpp" />
-    <ClCompile Include="src\thrift\windows\StdAfx.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TTransportException.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\windows\GetTimeOfDay.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\concurrency\ThreadManager.cpp">
-      <Filter>concurrency</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\concurrency\TimerManager.cpp">
-      <Filter>concurrency</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\concurrency\Util.cpp">
-      <Filter>concurrency</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\protocol\TDebugProtocol.cpp">
-      <Filter>protocol</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\protocol\TBase64Utils.cpp">
-      <Filter>protocol</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\protocol\TJSONProtocol.cpp">
-      <Filter>protocol</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\protocol\TMultiplexedProtocol.cpp">
-      <Filter>protocol</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TFDTransport.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TFileTransport.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TSimpleFileTransport.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\THttpTransport.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\THttpClient.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\THttpServer.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TSSLSocket.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TTransportUtils.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\server\TSimpleServer.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\server\TThreadPoolServer.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\server\TThreadedServer.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\async\TAsyncChannel.cpp">
-      <Filter>async</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\async\TConcurrentClientSyncInfo.cpp">
-      <Filter>async</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\processor\PeekProcessor.cpp">
-      <Filter>processor</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TServerSocket.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TSocket.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\windows\TWinsockSingleton.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\windows\SocketPair.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\concurrency\BoostMonitor.cpp">
-      <Filter>concurrency</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\concurrency\BoostMutex.cpp">
-      <Filter>concurrency</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\concurrency\BoostThreadFactory.cpp">
-      <Filter>concurrency</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\concurrency\StdThreadFactory.cpp">
-      <Filter>concurrency</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\windows\WinFcntl.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TPipe.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\transport\TPipeServer.cpp">
-      <Filter>transport</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\thrift\transport\TBufferTransports.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TSocket.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\protocol\TBinaryProtocol.h">
-      <Filter>protocol</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\Thrift.h" />
-    <ClInclude Include="src\thrift\TProcessor.h" />
-    <ClInclude Include="src\thrift\TApplicationException.h" />
-    <ClInclude Include="src\thrift\windows\StdAfx.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\TargetVersion.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\concurrency\Exception.h">
-      <Filter>concurrency</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TVirtualTransport.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TTransport.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TTransportException.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\GetTimeOfDay.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TServerTransport.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\config.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\protocol\TProtocol.h">
-      <Filter>protocol</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\protocol\TVirtualProtocol.h">
-      <Filter>protocol</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\server\TServer.h">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\server\TSimpleServer.h">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\server\TThreadPoolServer.h">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\server\TThreadedServer.h">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\async\TAsyncChannel.h">
-      <Filter>async</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\async\TConcurrentClientSyncInfo.h">
-      <Filter>async</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\processor\PeekProcessor.h">
-      <Filter>processor</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\processor\TMultiplexedProcessor.h">
-      <Filter>processor</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TFDTransport.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TFileTransport.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\THttpClient.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\THttpServer.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TSSLSocket.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TTransportUtils.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TSimpleFileTransport.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\protocol\TJSONProtocol.h">
-      <Filter>protocol</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\protocol\TMultiplexedProtocol.h">
-      <Filter>protocol</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\protocol\TDebugProtocol.h">
-      <Filter>protocol</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TServerSocket.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\Operators.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\TWinsockSingleton.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\SocketPair.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\force_inc.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\concurrency\BoostThreadFactory.h">
-      <Filter>concurrency</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\concurrency\StdThreadFactory.h">
-      <Filter>concurrency</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\concurrency\PlatformThreadFactory.h">
-      <Filter>concurrency</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\WinFcntl.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TPipe.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\transport\TPipeServer.h">
-      <Filter>transport</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="protocol">
-      <UniqueIdentifier>{07ced19b-b72a-4105-9ffb-6d2bcf64497e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="transport">
-      <UniqueIdentifier>{e9f61404-1148-4103-bd6f-e5869d37fa79}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="windows">
-      <UniqueIdentifier>{2814002a-3c68-427e-b0eb-33acd2f406ae}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="concurrency">
-      <UniqueIdentifier>{addd4707-dbaa-4d0c-bef6-fff8be7b495a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="server">
-      <UniqueIdentifier>{f55a8e9b-6959-487f-a396-c31b4d6c61d6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="async">
-      <UniqueIdentifier>{d526885b-1b3e-4ee3-8027-e694fe98ad63}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="processor">
-      <UniqueIdentifier>{8f428da8-5a83-44fb-9578-de935fb415e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="windows\tr1">
-      <UniqueIdentifier>{eea10406-3380-4f2d-9365-c26fa2875dae}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="src\thrift\protocol\TBinaryProtocol.tcc">
-      <Filter>protocol</Filter>
-    </None>
-    <None Include="src\thrift\windows\tr1\functional">
-      <Filter>windows\tr1</Filter>
-    </None>
-  </ItemGroup>
-</Project>
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/libthriftnb.vcxproj b/vendor/git.apache.org/thrift.git/lib/cpp/libthriftnb.vcxproj
deleted file mode 100755
index 259bb20..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/libthriftnb.vcxproj
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug-mt|Win32">
-      <Configuration>Debug-mt</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug-mt|x64">
-      <Configuration>Debug-mt</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-mt|Win32">
-      <Configuration>Release-mt</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-mt|x64">
-      <Configuration>Release-mt</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\thrift\async\TAsyncProtocolProcessor.cpp"/>
-    <ClCompile Include="src\thrift\async\TEvhttpClientChannel.cpp"/>
-    <ClCompile Include="src\thrift\async\TEvhttpServer.cpp"/>
-    <ClCompile Include="src\thrift\server\TNonblockingServer.cpp"/>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\thrift\async\TAsyncProtocolProcessor.h" />
-    <ClInclude Include="src\thrift\async\TEvhttpClientChannel.h" />
-    <ClInclude Include="src\thrift\async\TEvhttpServer.h" />
-    <ClInclude Include="src\thrift\server\TNonblockingServer.h" />
-    <ClInclude Include="src\thrift\windows\config.h" />
-    <ClInclude Include="src\thrift\windows\force_inc.h" />
-    <ClInclude Include="src\thrift\windows\TargetVersion.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D8696CCE-7D46-4659-B432-91754A41DEB0}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libthriftnb</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="3rdparty.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(LIBEVENT_ROOT)\WIN32-Code\;$(LIBEVENT_ROOT)\include;$(LIBEVENT_ROOT)\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(LIBEVENT_ROOT)\WIN32-Code\;$(LIBEVENT_ROOT)\include;$(LIBEVENT_ROOT)\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(LIBEVENT_ROOT)\WIN32-Code\;$(LIBEVENT_ROOT)\include;$(LIBEVENT_ROOT)\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(LIBEVENT_ROOT)\WIN32-Code\;$(LIBEVENT_ROOT)\include;$(LIBEVENT_ROOT)\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(LIBEVENT_ROOT)\WIN32-Code\;$(LIBEVENT_ROOT)\include;$(LIBEVENT_ROOT)\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(LIBEVENT_ROOT)\WIN32-Code\;$(LIBEVENT_ROOT)\include;$(LIBEVENT_ROOT)\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(LIBEVENT_ROOT)\WIN32-Code\;$(LIBEVENT_ROOT)\include;$(LIBEVENT_ROOT)\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'">
-    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(BOOST_ROOT)\include;$(BOOST_ROOT)\;$(LIBEVENT_ROOT)\WIN32-Code\;$(LIBEVENT_ROOT)\include;$(LIBEVENT_ROOT)\;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/libthriftnb.vcxproj.filters b/vendor/git.apache.org/thrift.git/lib/cpp/libthriftnb.vcxproj.filters
deleted file mode 100644
index 5245544..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/libthriftnb.vcxproj.filters
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="server">
-      <UniqueIdentifier>{bf449d92-4be8-4f6f-a010-c536f57c6f13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="async">
-      <UniqueIdentifier>{0294d0a6-ce46-4be8-a659-826d6e98ae41}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="windows">
-      <UniqueIdentifier>{60fc9e5e-0866-4aba-8662-439bb4a461d3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\thrift\server\TNonblockingServer.cpp">
-      <Filter>server</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\async\TEvhttpClientChannel.cpp">
-      <Filter>async</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\async\TEvhttpServer.cpp">
-      <Filter>async</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\async\TAsyncProtocolProcessor.cpp">
-      <Filter>async</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrift\windows\StdAfx.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\thrift\server\TNonblockingServer.h">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\async\TEvhttpClientChannel.h">
-      <Filter>async</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\async\TEvhttpServer.h">
-      <Filter>async</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\async\TAsyncProtocolProcessor.h">
-      <Filter>async</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\config.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\StdAfx.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\TargetVersion.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="src\thrift\windows\force_inc.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TApplicationException.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TApplicationException.cpp
deleted file mode 100644
index 2f14653..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TApplicationException.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/TApplicationException.h>
-#include <thrift/protocol/TProtocol.h>
-
-namespace apache {
-namespace thrift {
-
-uint32_t TApplicationException::read(apache::thrift::protocol::TProtocol* iprot) {
-  uint32_t xfer = 0;
-  std::string fname;
-  apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  while (true) {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid) {
-    case 1:
-      if (ftype == apache::thrift::protocol::T_STRING) {
-        xfer += iprot->readString(message_);
-      } else {
-        xfer += iprot->skip(ftype);
-      }
-      break;
-    case 2:
-      if (ftype == apache::thrift::protocol::T_I32) {
-        int32_t type;
-        xfer += iprot->readI32(type);
-        type_ = (TApplicationExceptionType)type;
-      } else {
-        xfer += iprot->skip(ftype);
-      }
-      break;
-    default:
-      xfer += iprot->skip(ftype);
-      break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-  return xfer;
-}
-
-uint32_t TApplicationException::write(apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("TApplicationException");
-  xfer += oprot->writeFieldBegin("message", apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(message_);
-  xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("type", apache::thrift::protocol::T_I32, 2);
-  xfer += oprot->writeI32(type_);
-  xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-}
-} // apache::thrift
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TApplicationException.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TApplicationException.h
deleted file mode 100644
index 81d9424..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TApplicationException.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TAPPLICATIONEXCEPTION_H_
-#define _THRIFT_TAPPLICATIONEXCEPTION_H_ 1
-
-#include <thrift/Thrift.h>
-
-namespace apache {
-namespace thrift {
-
-namespace protocol {
-class TProtocol;
-}
-
-class TApplicationException : public TException {
-public:
-  /**
-   * Error codes for the various types of exceptions.
-   */
-  enum TApplicationExceptionType {
-    UNKNOWN = 0,
-    UNKNOWN_METHOD = 1,
-    INVALID_MESSAGE_TYPE = 2,
-    WRONG_METHOD_NAME = 3,
-    BAD_SEQUENCE_ID = 4,
-    MISSING_RESULT = 5,
-    INTERNAL_ERROR = 6,
-    PROTOCOL_ERROR = 7,
-    INVALID_TRANSFORM = 8,
-    INVALID_PROTOCOL = 9,
-    UNSUPPORTED_CLIENT_TYPE = 10
-  };
-
-  TApplicationException() : TException(), type_(UNKNOWN) {}
-
-  TApplicationException(TApplicationExceptionType type) : TException(), type_(type) {}
-
-  TApplicationException(const std::string& message) : TException(message), type_(UNKNOWN) {}
-
-  TApplicationException(TApplicationExceptionType type, const std::string& message)
-    : TException(message), type_(type) {}
-
-  virtual ~TApplicationException() throw() {}
-
-  /**
-   * Returns an error code that provides information about the type of error
-   * that has occurred.
-   *
-   * @return Error code
-   */
-  TApplicationExceptionType getType() const { return type_; }
-
-  virtual const char* what() const throw() {
-    if (message_.empty()) {
-      switch (type_) {
-      case UNKNOWN:
-        return "TApplicationException: Unknown application exception";
-      case UNKNOWN_METHOD:
-        return "TApplicationException: Unknown method";
-      case INVALID_MESSAGE_TYPE:
-        return "TApplicationException: Invalid message type";
-      case WRONG_METHOD_NAME:
-        return "TApplicationException: Wrong method name";
-      case BAD_SEQUENCE_ID:
-        return "TApplicationException: Bad sequence identifier";
-      case MISSING_RESULT:
-        return "TApplicationException: Missing result";
-      case INTERNAL_ERROR:
-        return "TApplicationException: Internal error";
-      case PROTOCOL_ERROR:
-        return "TApplicationException: Protocol error";
-      case INVALID_TRANSFORM:
-        return "TApplicationException: Invalid transform";
-      case INVALID_PROTOCOL:
-        return "TApplicationException: Invalid protocol";
-      case UNSUPPORTED_CLIENT_TYPE:
-        return "TApplicationException: Unsupported client type";
-      default:
-        return "TApplicationException: (Invalid exception type)";
-      };
-    } else {
-      return message_.c_str();
-    }
-  }
-
-  uint32_t read(protocol::TProtocol* iprot);
-  uint32_t write(protocol::TProtocol* oprot) const;
-
-protected:
-  /**
-   * Error code
-   */
-  TApplicationExceptionType type_;
-};
-}
-} // apache::thrift
-
-#endif // #ifndef _THRIFT_TAPPLICATIONEXCEPTION_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TBase.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TBase.h
deleted file mode 100644
index a274bcd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TBase.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TBASE_H_
-#define _THRIFT_TBASE_H_ 1
-
-#include <thrift/Thrift.h>
-#include <thrift/protocol/TProtocol.h>
-
-namespace apache {
-namespace thrift {
-
-class TBase {
-public:
-  virtual ~TBase(){};
-  virtual uint32_t read(protocol::TProtocol* iprot) = 0;
-  virtual uint32_t write(protocol::TProtocol* oprot) const = 0;
-};
-}
-} // apache::thrift
-
-#endif // #ifndef _THRIFT_TBASE_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TDispatchProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TDispatchProcessor.h
deleted file mode 100644
index fd1dce7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TDispatchProcessor.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _THRIFT_TDISPATCHPROCESSOR_H_
-#define _THRIFT_TDISPATCHPROCESSOR_H_ 1
-
-#include <thrift/TProcessor.h>
-
-namespace apache {
-namespace thrift {
-
-/**
- * TDispatchProcessor is a helper class to parse the message header then call
- * another function to dispatch based on the function name.
- *
- * Subclasses must implement dispatchCall() to dispatch on the function name.
- */
-template <class Protocol_>
-class TDispatchProcessorT : public TProcessor {
-public:
-  virtual bool process(boost::shared_ptr<protocol::TProtocol> in,
-                       boost::shared_ptr<protocol::TProtocol> out,
-                       void* connectionContext) {
-    protocol::TProtocol* inRaw = in.get();
-    protocol::TProtocol* outRaw = out.get();
-
-    // Try to dynamic cast to the template protocol type
-    Protocol_* specificIn = dynamic_cast<Protocol_*>(inRaw);
-    Protocol_* specificOut = dynamic_cast<Protocol_*>(outRaw);
-    if (specificIn && specificOut) {
-      return processFast(specificIn, specificOut, connectionContext);
-    }
-
-    // Log the fact that we have to use the slow path
-    T_GENERIC_PROTOCOL(this, inRaw, specificIn);
-    T_GENERIC_PROTOCOL(this, outRaw, specificOut);
-
-    std::string fname;
-    protocol::TMessageType mtype;
-    int32_t seqid;
-    inRaw->readMessageBegin(fname, mtype, seqid);
-
-    // If this doesn't look like a valid call, log an error and return false so
-    // that the server will close the connection.
-    //
-    // (The old generated processor code used to try to skip a T_STRUCT and
-    // continue.  However, that seems unsafe.)
-    if (mtype != protocol::T_CALL && mtype != protocol::T_ONEWAY) {
-      GlobalOutput.printf("received invalid message type %d from client", mtype);
-      return false;
-    }
-
-    return this->dispatchCall(inRaw, outRaw, fname, seqid, connectionContext);
-  }
-
-protected:
-  bool processFast(Protocol_* in, Protocol_* out, void* connectionContext) {
-    std::string fname;
-    protocol::TMessageType mtype;
-    int32_t seqid;
-    in->readMessageBegin(fname, mtype, seqid);
-
-    if (mtype != protocol::T_CALL && mtype != protocol::T_ONEWAY) {
-      GlobalOutput.printf("received invalid message type %d from client", mtype);
-      return false;
-    }
-
-    return this->dispatchCallTemplated(in, out, fname, seqid, connectionContext);
-  }
-
-  /**
-   * dispatchCall() methods must be implemented by subclasses
-   */
-  virtual bool dispatchCall(apache::thrift::protocol::TProtocol* in,
-                            apache::thrift::protocol::TProtocol* out,
-                            const std::string& fname,
-                            int32_t seqid,
-                            void* callContext) = 0;
-
-  virtual bool dispatchCallTemplated(Protocol_* in,
-                                     Protocol_* out,
-                                     const std::string& fname,
-                                     int32_t seqid,
-                                     void* callContext) = 0;
-};
-
-/**
- * Non-templatized version of TDispatchProcessor, that doesn't bother trying to
- * perform a dynamic_cast.
- */
-class TDispatchProcessor : public TProcessor {
-public:
-  virtual bool process(boost::shared_ptr<protocol::TProtocol> in,
-                       boost::shared_ptr<protocol::TProtocol> out,
-                       void* connectionContext) {
-    std::string fname;
-    protocol::TMessageType mtype;
-    int32_t seqid;
-    in->readMessageBegin(fname, mtype, seqid);
-
-    if (mtype != protocol::T_CALL && mtype != protocol::T_ONEWAY) {
-      GlobalOutput.printf("received invalid message type %d from client", mtype);
-      return false;
-    }
-
-    return dispatchCall(in.get(), out.get(), fname, seqid, connectionContext);
-  }
-
-protected:
-  virtual bool dispatchCall(apache::thrift::protocol::TProtocol* in,
-                            apache::thrift::protocol::TProtocol* out,
-                            const std::string& fname,
-                            int32_t seqid,
-                            void* callContext) = 0;
-};
-
-// Specialize TDispatchProcessorT for TProtocol and TDummyProtocol just to use
-// the generic TDispatchProcessor.
-template <>
-class TDispatchProcessorT<protocol::TDummyProtocol> : public TDispatchProcessor {};
-template <>
-class TDispatchProcessorT<protocol::TProtocol> : public TDispatchProcessor {};
-}
-} // apache::thrift
-
-#endif // _THRIFT_TDISPATCHPROCESSOR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TLogging.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TLogging.h
deleted file mode 100644
index 07ff030..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TLogging.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TLOGGING_H_
-#define _THRIFT_TLOGGING_H_ 1
-
-#include <thrift/thrift-config.h>
-
-/**
- * Contains utility macros for debugging and logging.
- *
- */
-
-#include <time.h>
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-/**
- * T_GLOBAL_DEBUGGING_LEVEL = 0: all debugging turned off, debug macros undefined
- * T_GLOBAL_DEBUGGING_LEVEL = 1: all debugging turned on
- */
-#define T_GLOBAL_DEBUGGING_LEVEL 0
-
-/**
- * T_GLOBAL_LOGGING_LEVEL = 0: all logging turned off, logging macros undefined
- * T_GLOBAL_LOGGING_LEVEL = 1: all logging turned on
- */
-#define T_GLOBAL_LOGGING_LEVEL 1
-
-/**
- * Standard wrapper around fprintf what will prefix the file name and line
- * number to the line. Uses T_GLOBAL_DEBUGGING_LEVEL to control whether it is
- * turned on or off.
- *
- * @param format_string
- */
-#if T_GLOBAL_DEBUGGING_LEVEL > 0
-#define T_DEBUG(format_string, ...)                                                                \
-  if (T_GLOBAL_DEBUGGING_LEVEL > 0) {                                                              \
-    fprintf(stderr, "[%s,%d] " format_string " \n", __FILE__, __LINE__, ##__VA_ARGS__);            \
-  }
-#else
-#define T_DEBUG(format_string, ...)
-#endif
-
-/**
- * analogous to T_DEBUG but also prints the time
- *
- * @param string  format_string input: printf style format string
- */
-#if T_GLOBAL_DEBUGGING_LEVEL > 0
-#define T_DEBUG_T(format_string, ...)                                                              \
-  {                                                                                                \
-    if (T_GLOBAL_DEBUGGING_LEVEL > 0) {                                                            \
-      time_t now;                                                                                  \
-      char dbgtime[26];                                                                            \
-      time(&now);                                                                                  \
-      THRIFT_CTIME_R(&now, dbgtime);                                                               \
-      dbgtime[24] = '\0';                                                                          \
-      fprintf(stderr,                                                                              \
-              "[%s,%d] [%s] " format_string " \n",                                                 \
-              __FILE__,                                                                            \
-              __LINE__,                                                                            \
-              dbgtime,                                                                             \
-              ##__VA_ARGS__);                                                                      \
-    }                                                                                              \
-  }
-#else
-#define T_DEBUG_T(format_string, ...)
-#endif
-
-/**
- * analogous to T_DEBUG but uses input level to determine whether or not the string
- * should be logged.
- *
- * @param int     level: specified debug level
- * @param string  format_string input: format string
- */
-#define T_DEBUG_L(level, format_string, ...)                                                       \
-  if ((level) > 0) {                                                                               \
-    fprintf(stderr, "[%s,%d] " format_string " \n", __FILE__, __LINE__, ##__VA_ARGS__);            \
-  }
-
-/**
- * Explicit error logging. Prints time, file name and line number
- *
- * @param string  format_string input: printf style format string
- */
-#define T_ERROR(format_string, ...)                                                                \
-  {                                                                                                \
-    time_t now;                                                                                    \
-    char dbgtime[26];                                                                              \
-    time(&now);                                                                                    \
-    THRIFT_CTIME_R(&now, dbgtime);                                                                 \
-    dbgtime[24] = '\0';                                                                            \
-    fprintf(stderr,                                                                                \
-            "[%s,%d] [%s] ERROR: " format_string " \n",                                            \
-            __FILE__,                                                                              \
-            __LINE__,                                                                              \
-            dbgtime,                                                                               \
-            ##__VA_ARGS__);                                                                        \
-  }
-
-/**
- * Analogous to T_ERROR, additionally aborting the process.
- * WARNING: macro calls abort(), ending program execution
- *
- * @param string  format_string input: printf style format string
- */
-#define T_ERROR_ABORT(format_string, ...)                                                          \
-  {                                                                                                \
-    time_t now;                                                                                    \
-    char dbgtime[26];                                                                              \
-    time(&now);                                                                                    \
-    THRIFT_CTIME_R(&now, dbgtime);                                                                 \
-    dbgtime[24] = '\0';                                                                            \
-    fprintf(stderr,                                                                                \
-            "[%s,%d] [%s] ERROR: Going to abort " format_string " \n",                             \
-            __FILE__,                                                                              \
-            __LINE__,                                                                              \
-            dbgtime,                                                                               \
-            ##__VA_ARGS__);                                                                        \
-    exit(1);                                                                                       \
-  }
-
-/**
- * Log input message
- *
- * @param string  format_string input: printf style format string
- */
-#if T_GLOBAL_LOGGING_LEVEL > 0
-#define T_LOG_OPER(format_string, ...)                                                             \
-  {                                                                                                \
-    if (T_GLOBAL_LOGGING_LEVEL > 0) {                                                              \
-      time_t now;                                                                                  \
-      char dbgtime[26];                                                                            \
-      time(&now);                                                                                  \
-      THRIFT_CTIME_R(&now, dbgtime);                                                               \
-      dbgtime[24] = '\0';                                                                          \
-      fprintf(stderr, "[%s] " format_string " \n", dbgtime, ##__VA_ARGS__);                        \
-    }                                                                                              \
-  }
-#else
-#define T_LOG_OPER(format_string, ...)
-#endif
-
-/**
- * T_GLOBAL_DEBUG_VIRTUAL = 0 or unset: normal operation,
- *                                      virtual call debug messages disabled
- * T_GLOBAL_DEBUG_VIRTUAL = 1:          log a debug messages whenever an
- *                                      avoidable virtual call is made
- * T_GLOBAL_DEBUG_VIRTUAL = 2:          record detailed info that can be
- *                                      printed by calling
- *                                      apache::thrift::profile_print_info()
- */
-#if T_GLOBAL_DEBUG_VIRTUAL > 1
-#define T_VIRTUAL_CALL() ::apache::thrift::profile_virtual_call(typeid(*this))
-#define T_GENERIC_PROTOCOL(template_class, generic_prot, specific_prot)                            \
-  do {                                                                                             \
-    if (!(specific_prot)) {                                                                        \
-      ::apache::thrift::profile_generic_protocol(typeid(*template_class), typeid(*generic_prot));  \
-    }                                                                                              \
-  } while (0)
-#elif T_GLOBAL_DEBUG_VIRTUAL == 1
-#define T_VIRTUAL_CALL() fprintf(stderr, "[%s,%d] virtual call\n", __FILE__, __LINE__)
-#define T_GENERIC_PROTOCOL(template_class, generic_prot, specific_prot)                            \
-  do {                                                                                             \
-    if (!(specific_prot)) {                                                                        \
-      fprintf(stderr, "[%s,%d] failed to cast to specific protocol type\n", __FILE__, __LINE__);   \
-    }                                                                                              \
-  } while (0)
-#else
-#define T_VIRTUAL_CALL()
-#define T_GENERIC_PROTOCOL(template_class, generic_prot, specific_prot)
-#endif
-
-#endif // #ifndef _THRIFT_TLOGGING_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TOutput.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TOutput.cpp
deleted file mode 100644
index 5739d0f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TOutput.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/Thrift.h>
-#include <cstring>
-#include <cstdlib>
-#include <boost/lexical_cast.hpp>
-#include <stdarg.h>
-#include <stdio.h>
-
-namespace apache {
-namespace thrift {
-
-TOutput GlobalOutput;
-
-void TOutput::printf(const char* message, ...) {
-#ifndef THRIFT_SQUELCH_CONSOLE_OUTPUT
-  // Try to reduce heap usage, even if printf is called rarely.
-  static const int STACK_BUF_SIZE = 256;
-  char stack_buf[STACK_BUF_SIZE];
-  va_list ap;
-
-#ifdef _MSC_VER
-  va_start(ap, message);
-  int need = _vscprintf(message, ap);
-  va_end(ap);
-
-  if (need < STACK_BUF_SIZE) {
-    va_start(ap, message);
-    vsnprintf_s(stack_buf, STACK_BUF_SIZE, _TRUNCATE, message, ap);
-    va_end(ap);
-    f_(stack_buf);
-    return;
-  }
-#else
-  va_start(ap, message);
-  int need = vsnprintf(stack_buf, STACK_BUF_SIZE, message, ap);
-  va_end(ap);
-
-  if (need < STACK_BUF_SIZE) {
-    f_(stack_buf);
-    return;
-  }
-#endif
-
-  char* heap_buf = (char*)malloc((need + 1) * sizeof(char));
-  if (heap_buf == NULL) {
-#ifdef _MSC_VER
-    va_start(ap, message);
-    vsnprintf_s(stack_buf, STACK_BUF_SIZE, _TRUNCATE, message, ap);
-    va_end(ap);
-#endif
-    // Malloc failed.  We might as well print the stack buffer.
-    f_(stack_buf);
-    return;
-  }
-
-  va_start(ap, message);
-  int rval = vsnprintf(heap_buf, need + 1, message, ap);
-  va_end(ap);
-  // TODO(shigin): inform user
-  if (rval != -1) {
-    f_(heap_buf);
-  }
-  free(heap_buf);
-#endif
-}
-
-void TOutput::errorTimeWrapper(const char* msg) {
-#ifndef THRIFT_SQUELCH_CONSOLE_OUTPUT
-  time_t now;
-  char dbgtime[26];
-  time(&now);
-  THRIFT_CTIME_R(&now, dbgtime);
-  dbgtime[24] = 0;
-  fprintf(stderr, "Thrift: %s %s\n", dbgtime, msg);
-#endif
-}
-
-void TOutput::perror(const char* message, int errno_copy) {
-  std::string out = message + strerror_s(errno_copy);
-  f_(out.c_str());
-}
-
-std::string TOutput::strerror_s(int errno_copy) {
-#ifndef HAVE_STRERROR_R
-  return "errno = " + boost::lexical_cast<std::string>(errno_copy);
-#else // HAVE_STRERROR_R
-
-  char b_errbuf[1024] = {'\0'};
-#ifdef STRERROR_R_CHAR_P
-  char* b_error = strerror_r(errno_copy, b_errbuf, sizeof(b_errbuf));
-#else
-  char* b_error = b_errbuf;
-  int rv = strerror_r(errno_copy, b_errbuf, sizeof(b_errbuf));
-  if (rv == -1) {
-    // strerror_r failed.  omgwtfbbq.
-    return "XSI-compliant strerror_r() failed with errno = "
-           + boost::lexical_cast<std::string>(errno_copy);
-  }
-#endif
-  // Can anyone prove that explicit cast is probably not necessary
-  // to ensure that the string object is constructed before
-  // b_error becomes invalid?
-  return std::string(b_error);
-
-#endif // HAVE_STRERROR_R
-}
-}
-} // apache::thrift
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TOutput.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TOutput.h
deleted file mode 100644
index 1375f73..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TOutput.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_OUTPUT_H_
-#define _THRIFT_OUTPUT_H_ 1
-
-namespace apache {
-namespace thrift {
-
-class TOutput {
-public:
-  TOutput() : f_(&errorTimeWrapper) {}
-
-  inline void setOutputFunction(void (*function)(const char*)) { f_ = function; }
-
-  inline void operator()(const char* message) { f_(message); }
-
-  // It is important to have a const char* overload here instead of
-  // just the string version, otherwise errno could be corrupted
-  // if there is some problem allocating memory when constructing
-  // the string.
-  void perror(const char* message, int errno_copy);
-  inline void perror(const std::string& message, int errno_copy) {
-    perror(message.c_str(), errno_copy);
-  }
-
-  void printf(const char* message, ...);
-
-  static void errorTimeWrapper(const char* msg);
-
-  /** Just like strerror_r but returns a C++ string object. */
-  static std::string strerror_s(int errno_copy);
-
-private:
-  void (*f_)(const char*);
-};
-
-extern TOutput GlobalOutput;
-}
-} // namespace apache::thrift
-
-#endif //_THRIFT_OUTPUT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TProcessor.h
deleted file mode 100644
index 4a0604e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TProcessor.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TPROCESSOR_H_
-#define _THRIFT_TPROCESSOR_H_ 1
-
-#include <string>
-#include <thrift/protocol/TProtocol.h>
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-
-/**
- * Virtual interface class that can handle events from the processor. To
- * use this you should subclass it and implement the methods that you care
- * about. Your subclass can also store local data that you may care about,
- * such as additional "arguments" to these methods (stored in the object
- * instance's state).
- */
-class TProcessorEventHandler {
-public:
-  virtual ~TProcessorEventHandler() {}
-
-  /**
-   * Called before calling other callback methods.
-   * Expected to return some sort of context object.
-   * The return value is passed to all other callbacks
-   * for that function invocation.
-   */
-  virtual void* getContext(const char* fn_name, void* serverContext) {
-    (void)fn_name;
-    (void)serverContext;
-    return NULL;
-  }
-
-  /**
-   * Expected to free resources associated with a context.
-   */
-  virtual void freeContext(void* ctx, const char* fn_name) {
-    (void)ctx;
-    (void)fn_name;
-  }
-
-  /**
-   * Called before reading arguments.
-   */
-  virtual void preRead(void* ctx, const char* fn_name) {
-    (void)ctx;
-    (void)fn_name;
-  }
-
-  /**
-   * Called between reading arguments and calling the handler.
-   */
-  virtual void postRead(void* ctx, const char* fn_name, uint32_t bytes) {
-    (void)ctx;
-    (void)fn_name;
-    (void)bytes;
-  }
-
-  /**
-   * Called between calling the handler and writing the response.
-   */
-  virtual void preWrite(void* ctx, const char* fn_name) {
-    (void)ctx;
-    (void)fn_name;
-  }
-
-  /**
-   * Called after writing the response.
-   */
-  virtual void postWrite(void* ctx, const char* fn_name, uint32_t bytes) {
-    (void)ctx;
-    (void)fn_name;
-    (void)bytes;
-  }
-
-  /**
-   * Called when an async function call completes successfully.
-   */
-  virtual void asyncComplete(void* ctx, const char* fn_name) {
-    (void)ctx;
-    (void)fn_name;
-  }
-
-  /**
-   * Called if the handler throws an undeclared exception.
-   */
-  virtual void handlerError(void* ctx, const char* fn_name) {
-    (void)ctx;
-    (void)fn_name;
-  }
-
-protected:
-  TProcessorEventHandler() {}
-};
-
-/**
- * A helper class used by the generated code to free each context.
- */
-class TProcessorContextFreer {
-public:
-  TProcessorContextFreer(TProcessorEventHandler* handler, void* context, const char* method)
-    : handler_(handler), context_(context), method_(method) {}
-  ~TProcessorContextFreer() {
-    if (handler_ != NULL)
-      handler_->freeContext(context_, method_);
-  }
-  void unregister() { handler_ = NULL; }
-
-private:
-  apache::thrift::TProcessorEventHandler* handler_;
-  void* context_;
-  const char* method_;
-};
-
-/**
- * A processor is a generic object that acts upon two streams of data, one
- * an input and the other an output. The definition of this object is loose,
- * though the typical case is for some sort of server that either generates
- * responses to an input stream or forwards data from one pipe onto another.
- *
- */
-class TProcessor {
-public:
-  virtual ~TProcessor() {}
-
-  virtual bool process(boost::shared_ptr<protocol::TProtocol> in,
-                       boost::shared_ptr<protocol::TProtocol> out,
-                       void* connectionContext) = 0;
-
-  bool process(boost::shared_ptr<apache::thrift::protocol::TProtocol> io, void* connectionContext) {
-    return process(io, io, connectionContext);
-  }
-
-  boost::shared_ptr<TProcessorEventHandler> getEventHandler() const { return eventHandler_; }
-
-  void setEventHandler(boost::shared_ptr<TProcessorEventHandler> eventHandler) {
-    eventHandler_ = eventHandler;
-  }
-
-protected:
-  TProcessor() {}
-
-  boost::shared_ptr<TProcessorEventHandler> eventHandler_;
-};
-
-/**
- * This is a helper class to allow boost::shared_ptr to be used with handler
- * pointers returned by the generated handler factories.
- *
- * The handler factory classes generated by the thrift compiler return raw
- * pointers, and factory->releaseHandler() must be called when the handler is
- * no longer needed.
- *
- * A ReleaseHandler object can be instantiated and passed as the second
- * parameter to a shared_ptr, so that factory->releaseHandler() will be called
- * when the object is no longer needed, instead of deleting the pointer.
- */
-template <typename HandlerFactory_>
-class ReleaseHandler {
-public:
-  ReleaseHandler(const boost::shared_ptr<HandlerFactory_>& handlerFactory)
-    : handlerFactory_(handlerFactory) {}
-
-  void operator()(typename HandlerFactory_::Handler* handler) {
-    if (handler) {
-      handlerFactory_->releaseHandler(handler);
-    }
-  }
-
-private:
-  boost::shared_ptr<HandlerFactory_> handlerFactory_;
-};
-
-struct TConnectionInfo {
-  // The input and output protocols
-  boost::shared_ptr<protocol::TProtocol> input;
-  boost::shared_ptr<protocol::TProtocol> output;
-  // The underlying transport used for the connection
-  // This is the transport that was returned by TServerTransport::accept(),
-  // and it may be different than the transport pointed to by the input and
-  // output protocols.
-  boost::shared_ptr<transport::TTransport> transport;
-};
-
-class TProcessorFactory {
-public:
-  virtual ~TProcessorFactory() {}
-
-  /**
-   * Get the TProcessor to use for a particular connection.
-   *
-   * This method is always invoked in the same thread that the connection was
-   * accepted on.  This generally means that this call does not need to be
-   * thread safe, as it will always be invoked from a single thread.
-   */
-  virtual boost::shared_ptr<TProcessor> getProcessor(const TConnectionInfo& connInfo) = 0;
-};
-
-class TSingletonProcessorFactory : public TProcessorFactory {
-public:
-  TSingletonProcessorFactory(boost::shared_ptr<TProcessor> processor) : processor_(processor) {}
-
-  boost::shared_ptr<TProcessor> getProcessor(const TConnectionInfo&) { return processor_; }
-
-private:
-  boost::shared_ptr<TProcessor> processor_;
-};
-}
-} // apache::thrift
-
-#endif // #ifndef _THRIFT_TPROCESSOR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TToString.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TToString.h
deleted file mode 100644
index 5023869..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/TToString.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TOSTRING_H_
-#define _THRIFT_TOSTRING_H_ 1
-
-#include <boost/lexical_cast.hpp>
-
-#include <vector>
-#include <map>
-#include <set>
-#include <string>
-#include <sstream>
-
-namespace apache {
-namespace thrift {
-
-template <typename T>
-std::string to_string(const T& t) {
-  return boost::lexical_cast<std::string>(t);
-}
-
-template <typename K, typename V>
-std::string to_string(const std::map<K, V>& m);
-
-template <typename T>
-std::string to_string(const std::set<T>& s);
-
-template <typename T>
-std::string to_string(const std::vector<T>& t);
-
-template <typename K, typename V>
-std::string to_string(const typename std::pair<K, V>& v) {
-  std::ostringstream o;
-  o << to_string(v.first) << ": " << to_string(v.second);
-  return o.str();
-}
-
-template <typename T>
-std::string to_string(const T& beg, const T& end) {
-  std::ostringstream o;
-  for (T it = beg; it != end; ++it) {
-    if (it != beg)
-      o << ", ";
-    o << to_string(*it);
-  }
-  return o.str();
-}
-
-template <typename T>
-std::string to_string(const std::vector<T>& t) {
-  std::ostringstream o;
-  o << "[" << to_string(t.begin(), t.end()) << "]";
-  return o.str();
-}
-
-template <typename K, typename V>
-std::string to_string(const std::map<K, V>& m) {
-  std::ostringstream o;
-  o << "{" << to_string(m.begin(), m.end()) << "}";
-  return o.str();
-}
-
-template <typename T>
-std::string to_string(const std::set<T>& s) {
-  std::ostringstream o;
-  o << "{" << to_string(s.begin(), s.end()) << "}";
-  return o.str();
-}
-}
-} // apache::thrift
-
-#endif // _THRIFT_TOSTRING_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/Thrift.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/Thrift.h
deleted file mode 100644
index e8e70eb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/Thrift.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_THRIFT_H_
-#define _THRIFT_THRIFT_H_ 1
-
-#include <thrift/transport/PlatformSocket.h>
-
-#include <thrift/thrift-config.h>
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <sys/types.h>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#include <string>
-#include <map>
-#include <list>
-#include <set>
-#include <vector>
-#include <exception>
-#include <typeinfo>
-
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-
-#include <thrift/TLogging.h>
-#include <thrift/TOutput.h>
-
-#define THRIFT_UNUSED_VARIABLE(x) ((void)(x))
-
-namespace apache {
-namespace thrift {
-
-class TEnumIterator
-    : public std::iterator<std::forward_iterator_tag, std::pair<int, const char*> > {
-public:
-  TEnumIterator(int n, int* enums, const char** names)
-    : ii_(0), n_(n), enums_(enums), names_(names) {}
-
-  int operator++() { return ++ii_; }
-
-  bool operator!=(const TEnumIterator& end) {
-    THRIFT_UNUSED_VARIABLE(end);
-    assert(end.n_ == -1);
-    return (ii_ != n_);
-  }
-
-  std::pair<int, const char*> operator*() const { return std::make_pair(enums_[ii_], names_[ii_]); }
-
-private:
-  int ii_;
-  const int n_;
-  int* enums_;
-  const char** names_;
-};
-
-class TException : public std::exception {
-public:
-  TException() : message_() {}
-
-  TException(const std::string& message) : message_(message) {}
-
-  virtual ~TException() throw() {}
-
-  virtual const char* what() const throw() {
-    if (message_.empty()) {
-      return "Default TException.";
-    } else {
-      return message_.c_str();
-    }
-  }
-
-protected:
-  std::string message_;
-};
-
-class TDelayedException {
-public:
-  template <class E>
-  static TDelayedException* delayException(const E& e);
-  virtual void throw_it() = 0;
-  virtual ~TDelayedException(){};
-};
-
-template <class E>
-class TExceptionWrapper : public TDelayedException {
-public:
-  TExceptionWrapper(const E& e) : e_(e) {}
-  virtual void throw_it() {
-    E temp(e_);
-    delete this;
-    throw temp;
-  }
-
-private:
-  E e_;
-};
-
-template <class E>
-TDelayedException* TDelayedException::delayException(const E& e) {
-  return new TExceptionWrapper<E>(e);
-}
-
-#if T_GLOBAL_DEBUG_VIRTUAL > 1
-void profile_virtual_call(const std::type_info& info);
-void profile_generic_protocol(const std::type_info& template_type, const std::type_info& prot_type);
-void profile_print_info(FILE* f);
-void profile_print_info();
-void profile_write_pprof(FILE* gen_calls_f, FILE* virtual_calls_f);
-#endif
-}
-} // apache::thrift
-
-#endif // #ifndef _THRIFT_THRIFT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/VirtualProfiling.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/VirtualProfiling.cpp
deleted file mode 100644
index 6ce346b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/VirtualProfiling.cpp
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/Thrift.h>
-
-// Do nothing if virtual call profiling is not enabled
-#if T_GLOBAL_DEBUG_VIRTUAL > 1
-
-// TODO: This code only works with g++ (since we rely on the fact
-// that all std::type_info instances referring to a particular type
-// always return the exact same pointer value from name().)
-#ifndef __GNUG__
-#error "Thrift virtual function profiling currently only works with gcc"
-#endif // !__GNUG__
-
-// TODO: We also require glibc for the backtrace() and backtrace_symbols()
-// functions.
-#ifndef __GLIBC__
-#error "Thrift virtual function profiling currently requires glibc"
-#endif // !__GLIBC__
-
-#include <thrift/concurrency/Mutex.h>
-
-#include <ext/hash_map>
-#include <execinfo.h>
-#include <stdio.h>
-
-namespace apache {
-namespace thrift {
-
-using ::apache::thrift::concurrency::Mutex;
-using ::apache::thrift::concurrency::Guard;
-
-static const unsigned int MAX_STACK_DEPTH = 15;
-
-/**
- * A stack trace
- */
-class Backtrace {
-public:
-  Backtrace(int skip = 0);
-  Backtrace(Backtrace const& bt);
-
-  void operator=(Backtrace const& bt) {
-    numCallers_ = bt.numCallers_;
-    if (numCallers_ >= 0) {
-      memcpy(callers_, bt.callers_, numCallers_ * sizeof(void*));
-    }
-  }
-
-  bool operator==(Backtrace const& bt) const { return (cmp(bt) == 0); }
-
-  size_t hash() const {
-    intptr_t ret = 0;
-    for (int n = 0; n < numCallers_; ++n) {
-      ret ^= reinterpret_cast<intptr_t>(callers_[n]);
-    }
-    return static_cast<size_t>(ret);
-  }
-
-  int cmp(Backtrace const& bt) const {
-    int depth_diff = (numCallers_ - bt.numCallers_);
-    if (depth_diff != 0) {
-      return depth_diff;
-    }
-
-    for (int n = 0; n < numCallers_; ++n) {
-      int diff = reinterpret_cast<intptr_t>(callers_[n])
-                 - reinterpret_cast<intptr_t>(bt.callers_[n]);
-      if (diff != 0) {
-        return diff;
-      }
-    }
-
-    return 0;
-  }
-
-  void print(FILE* f, int indent = 0, int start = 0) const {
-    char** strings = backtrace_symbols(callers_, numCallers_);
-    if (strings) {
-      start += skip_;
-      if (start < 0) {
-        start = 0;
-      }
-      for (int n = start; n < numCallers_; ++n) {
-        fprintf(f, "%*s#%-2d %s\n", indent, "", n, strings[n]);
-      }
-      free(strings);
-    } else {
-      fprintf(f, "%*s<failed to determine symbols>\n", indent, "");
-    }
-  }
-
-  int getDepth() const { return numCallers_ - skip_; }
-
-  void* getFrame(int index) const {
-    int adjusted_index = index + skip_;
-    if (adjusted_index < 0 || adjusted_index >= numCallers_) {
-      return NULL;
-    }
-    return callers_[adjusted_index];
-  }
-
-private:
-  void* callers_[MAX_STACK_DEPTH];
-  int numCallers_;
-  int skip_;
-};
-
-// Define the constructors non-inline, so they consistently add a single
-// frame to the stack trace, regardless of whether optimization is enabled
-Backtrace::Backtrace(int skip)
-  : skip_(skip + 1) // ignore the constructor itself
-{
-  numCallers_ = backtrace(callers_, MAX_STACK_DEPTH);
-  if (skip_ > numCallers_) {
-    skip_ = numCallers_;
-  }
-}
-
-Backtrace::Backtrace(Backtrace const& bt) : numCallers_(bt.numCallers_), skip_(bt.skip_) {
-  if (numCallers_ >= 0) {
-    memcpy(callers_, bt.callers_, numCallers_ * sizeof(void*));
-  }
-}
-
-/**
- * A backtrace, plus one or two type names
- */
-class Key {
-public:
-  class Hash {
-  public:
-    size_t operator()(Key const& k) const { return k.hash(); }
-  };
-
-  Key(const Backtrace* bt, const std::type_info& type_info)
-    : backtrace_(bt), typeName1_(type_info.name()), typeName2_(NULL) {}
-
-  Key(const Backtrace* bt, const std::type_info& type_info1, const std::type_info& type_info2)
-    : backtrace_(bt), typeName1_(type_info1.name()), typeName2_(type_info2.name()) {}
-
-  Key(const Key& k)
-    : backtrace_(k.backtrace_), typeName1_(k.typeName1_), typeName2_(k.typeName2_) {}
-
-  void operator=(const Key& k) {
-    backtrace_ = k.backtrace_;
-    typeName1_ = k.typeName1_;
-    typeName2_ = k.typeName2_;
-  }
-
-  const Backtrace* getBacktrace() const { return backtrace_; }
-
-  const char* getTypeName() const { return typeName1_; }
-
-  const char* getTypeName2() const { return typeName2_; }
-
-  void makePersistent() {
-    // Copy the Backtrace object
-    backtrace_ = new Backtrace(*backtrace_);
-
-    // NOTE: We don't copy the type name.
-    // The GNU libstdc++ implementation of type_info::name() returns a value
-    // that will be valid for the lifetime of the program.  (Although the C++
-    // standard doesn't guarantee this will be true on all implementations.)
-  }
-
-  /**
-   * Clean up memory allocated by makePersistent()
-   *
-   * Should only be invoked if makePersistent() has previously been called.
-   * The Key should no longer be used after cleanup() is called.
-   */
-  void cleanup() {
-    delete backtrace_;
-    backtrace_ = NULL;
-  }
-
-  int cmp(const Key& k) const {
-    int ret = backtrace_->cmp(*k.backtrace_);
-    if (ret != 0) {
-      return ret;
-    }
-
-    // NOTE: We compare just the name pointers.
-    // With GNU libstdc++, every type_info object for the same type points to
-    // exactly the same name string.  (Although this isn't guaranteed by the
-    // C++ standard.)
-    ret = k.typeName1_ - typeName1_;
-    if (ret != 0) {
-      return ret;
-    }
-    return k.typeName2_ - typeName2_;
-  }
-
-  bool operator==(const Key& k) const { return cmp(k) == 0; }
-
-  size_t hash() const {
-    // NOTE: As above, we just use the name pointer value.
-    // Works with GNU libstdc++, but not guaranteed to be correct on all
-    // implementations.
-    return backtrace_->hash() ^ reinterpret_cast<size_t>(typeName1_)
-           ^ reinterpret_cast<size_t>(typeName2_);
-  }
-
-private:
-  const Backtrace* backtrace_;
-  const char* typeName1_;
-  const char* typeName2_;
-};
-
-/**
- * A functor that determines which of two BacktraceMap entries
- * has a higher count.
- */
-class CountGreater {
-public:
-  bool operator()(std::pair<Key, size_t> bt1, std::pair<Key, size_t> bt2) const {
-    return bt1.second > bt2.second;
-  }
-};
-
-typedef __gnu_cxx::hash_map<Key, size_t, Key::Hash> BacktraceMap;
-
-/**
- * A map describing how many times T_VIRTUAL_CALL() has been invoked.
- */
-BacktraceMap virtual_calls;
-Mutex virtual_calls_mutex;
-
-/**
- * A map describing how many times T_GENERIC_PROTOCOL() has been invoked.
- */
-BacktraceMap generic_calls;
-Mutex generic_calls_mutex;
-
-void _record_backtrace(BacktraceMap* map, const Mutex& mutex, Key* k) {
-  Guard guard(mutex);
-
-  BacktraceMap::iterator it = map->find(*k);
-  if (it == map->end()) {
-    k->makePersistent();
-    map->insert(std::make_pair(*k, 1));
-  } else {
-    // increment the count
-    // NOTE: we could assert if it->second is 0 afterwards, since that would
-    // mean we've wrapped.
-    ++(it->second);
-  }
-}
-
-/**
- * Record an unnecessary virtual function call.
- *
- * This method is invoked by the T_VIRTUAL_CALL() macro.
- */
-void profile_virtual_call(const std::type_info& type) {
-  int const skip = 1; // ignore this frame
-  Backtrace bt(skip);
-  Key k(&bt, type);
-  _record_backtrace(&virtual_calls, virtual_calls_mutex, &k);
-}
-
-/**
- * Record a call to a template processor with a protocol that is not the one
- * specified in the template parameter.
- *
- * This method is invoked by the T_GENERIC_PROTOCOL() macro.
- */
-void profile_generic_protocol(const std::type_info& template_type,
-                              const std::type_info& prot_type) {
-  int const skip = 1; // ignore this frame
-  Backtrace bt(skip);
-  Key k(&bt, template_type, prot_type);
-  _record_backtrace(&generic_calls, generic_calls_mutex, &k);
-}
-
-/**
- * Print the recorded profiling information to the specified file.
- */
-void profile_print_info(FILE* f) {
-  typedef std::vector<std::pair<Key, size_t> > BacktraceVector;
-
-  CountGreater is_greater;
-
-  // Grab both locks for the duration of the print operation,
-  // to ensure the output is a consistent snapshot of a single point in time
-  Guard generic_calls_guard(generic_calls_mutex);
-  Guard virtual_calls_guard(virtual_calls_mutex);
-
-  // print the info from generic_calls, sorted by frequency
-  //
-  // We print the generic_calls info ahead of virtual_calls, since it is more
-  // useful in some cases.  All T_GENERIC_PROTOCOL calls can be eliminated
-  // from most programs.  Not all T_VIRTUAL_CALLs will be eliminated by
-  // converting to templates.
-  BacktraceVector gp_sorted(generic_calls.begin(), generic_calls.end());
-  std::sort(gp_sorted.begin(), gp_sorted.end(), is_greater);
-
-  for (BacktraceVector::const_iterator it = gp_sorted.begin(); it != gp_sorted.end(); ++it) {
-    Key const& key = it->first;
-    size_t const count = it->second;
-    fprintf(f,
-            "T_GENERIC_PROTOCOL: %zu calls to %s with a %s:\n",
-            count,
-            key.getTypeName(),
-            key.getTypeName2());
-    key.getBacktrace()->print(f, 2);
-    fprintf(f, "\n");
-  }
-
-  // print the info from virtual_calls, sorted by frequency
-  BacktraceVector vc_sorted(virtual_calls.begin(), virtual_calls.end());
-  std::sort(vc_sorted.begin(), vc_sorted.end(), is_greater);
-
-  for (BacktraceVector::const_iterator it = vc_sorted.begin(); it != vc_sorted.end(); ++it) {
-    Key const& key = it->first;
-    size_t const count = it->second;
-    fprintf(f, "T_VIRTUAL_CALL: %zu calls on %s:\n", count, key.getTypeName());
-    key.getBacktrace()->print(f, 2);
-    fprintf(f, "\n");
-  }
-}
-
-/**
- * Print the recorded profiling information to stdout.
- */
-void profile_print_info() {
-  profile_print_info(stdout);
-}
-
-/**
- * Write a BacktraceMap as Google CPU profiler binary data.
- */
-static void profile_write_pprof_file(FILE* f, BacktraceMap const& map) {
-  // Write the header
-  uintptr_t header[5] = {0, 3, 0, 0, 0};
-  fwrite(&header, sizeof(header), 1, f);
-
-  // Write the profile records
-  for (BacktraceMap::const_iterator it = map.begin(); it != map.end(); ++it) {
-    uintptr_t count = it->second;
-    fwrite(&count, sizeof(count), 1, f);
-
-    Backtrace const* bt = it->first.getBacktrace();
-    uintptr_t num_pcs = bt->getDepth();
-    fwrite(&num_pcs, sizeof(num_pcs), 1, f);
-
-    for (uintptr_t n = 0; n < num_pcs; ++n) {
-      void* pc = bt->getFrame(n);
-      fwrite(&pc, sizeof(pc), 1, f);
-    }
-  }
-
-  // Write the trailer
-  uintptr_t trailer[3] = {0, 1, 0};
-  fwrite(&trailer, sizeof(trailer), 1, f);
-
-  // Write /proc/self/maps
-  // TODO(simpkins): This only works on linux
-  FILE* proc_maps = fopen("/proc/self/maps", "r");
-  if (proc_maps) {
-    uint8_t buf[4096];
-    while (true) {
-      size_t bytes_read = fread(buf, 1, sizeof(buf), proc_maps);
-      if (bytes_read == 0) {
-        break;
-      }
-      fwrite(buf, 1, bytes_read, f);
-    }
-    fclose(proc_maps);
-  }
-}
-
-/**
- * Write the recorded profiling information as pprof files.
- *
- * This writes the information using the Google CPU profiler binary data
- * format, so it can be analyzed with pprof.  Note that information about the
- * protocol/transport data types cannot be stored in this file format.
- *
- * See http://code.google.com/p/google-perftools/ for more details.
- *
- * @param gen_calls_f     The information about calls to
- *                        profile_generic_protocol() will be written to this
- *                        file.
- * @param virtual_calls_f The information about calls to
- *                        profile_virtual_call() will be written to this file.
- */
-void profile_write_pprof(FILE* gen_calls_f, FILE* virtual_calls_f) {
-  typedef std::vector<std::pair<Key, size_t> > BacktraceVector;
-
-  CountGreater is_greater;
-
-  // Grab both locks for the duration of the print operation,
-  // to ensure the output is a consistent snapshot of a single point in time
-  Guard generic_calls_guard(generic_calls_mutex);
-  Guard virtual_calls_guard(virtual_calls_mutex);
-
-  // write the info from generic_calls
-  profile_write_pprof_file(gen_calls_f, generic_calls);
-
-  // write the info from virtual_calls
-  profile_write_pprof_file(virtual_calls_f, virtual_calls);
-}
-}
-} // apache::thrift
-
-#endif // T_GLOBAL_PROFILE_VIRTUAL > 0
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncBufferProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncBufferProcessor.h
deleted file mode 100644
index 3c957a6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncBufferProcessor.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TASYNC_BUFFER_PROCESSOR_H_
-#define _THRIFT_TASYNC_BUFFER_PROCESSOR_H_ 1
-
-#include <thrift/cxxfunctional.h>
-#include <boost/shared_ptr.hpp>
-
-#include <thrift/transport/TBufferTransports.h>
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-class TAsyncBufferProcessor {
-public:
-  // Process data in "in", putting the result in "out".
-  // Call _return(true) when done, or _return(false) to
-  // forcefully close the connection (if applicable).
-  // "in" and "out" should be TMemoryBuffer or similar,
-  // not a wrapper around a socket.
-  virtual void process(apache::thrift::stdcxx::function<void(bool healthy)> _return,
-                       boost::shared_ptr<apache::thrift::transport::TBufferBase> ibuf,
-                       boost::shared_ptr<apache::thrift::transport::TBufferBase> obuf) = 0;
-  virtual ~TAsyncBufferProcessor() {}
-};
-}
-}
-} // apache::thrift::async
-
-#endif // #ifndef _THRIFT_TASYNC_BUFFER_PROCESSOR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncChannel.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncChannel.cpp
deleted file mode 100644
index 4716af2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncChannel.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/async/TAsyncChannel.h>
-#include <thrift/cxxfunctional.h>
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-void TAsyncChannel::sendAndRecvMessage(const VoidCallback& cob,
-                                       TMemoryBuffer* sendBuf,
-                                       TMemoryBuffer* recvBuf) {
-  apache::thrift::stdcxx::function<void()> send_done
-      = apache::thrift::stdcxx::bind(&TAsyncChannel::recvMessage, this, cob, recvBuf);
-
-  sendMessage(send_done, sendBuf);
-}
-}
-}
-} // apache::thrift::async
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncChannel.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncChannel.h
deleted file mode 100644
index eb3ce2a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncChannel.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_ASYNC_TASYNCCHANNEL_H_
-#define _THRIFT_ASYNC_TASYNCCHANNEL_H_ 1
-
-#include <thrift/cxxfunctional.h>
-#include <thrift/Thrift.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-class TMemoryBuffer;
-}
-}
-}
-
-namespace apache {
-namespace thrift {
-namespace async {
-using apache::thrift::transport::TMemoryBuffer;
-
-class TAsyncChannel {
-public:
-  typedef apache::thrift::stdcxx::function<void()> VoidCallback;
-
-  virtual ~TAsyncChannel() {}
-
-  // is the channel in a good state?
-  virtual bool good() const = 0;
-  virtual bool error() const = 0;
-  virtual bool timedOut() const = 0;
-
-  /**
-   * Send a message over the channel.
-   */
-  virtual void sendMessage(const VoidCallback& cob,
-                           apache::thrift::transport::TMemoryBuffer* message) = 0;
-
-  /**
-   * Receive a message from the channel.
-   */
-  virtual void recvMessage(const VoidCallback& cob,
-                           apache::thrift::transport::TMemoryBuffer* message) = 0;
-
-  /**
-   * Send a message over the channel and receive a response.
-   */
-  virtual void sendAndRecvMessage(const VoidCallback& cob,
-                                  apache::thrift::transport::TMemoryBuffer* sendBuf,
-                                  apache::thrift::transport::TMemoryBuffer* recvBuf);
-};
-}
-}
-} // apache::thrift::async
-
-#endif // #ifndef _THRIFT_ASYNC_TASYNCCHANNEL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h
deleted file mode 100644
index e79c57d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _THRIFT_ASYNC_TASYNCDISPATCHPROCESSOR_H_
-#define _THRIFT_ASYNC_TASYNCDISPATCHPROCESSOR_H_ 1
-
-#include <thrift/async/TAsyncProcessor.h>
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-/**
- * TAsyncDispatchProcessor is a helper class to parse the message header then
- * call another function to dispatch based on the function name.
- *
- * Subclasses must implement dispatchCall() to dispatch on the function name.
- */
-template <class Protocol_>
-class TAsyncDispatchProcessorT : public TAsyncProcessor {
-public:
-  virtual void process(apache::thrift::stdcxx::function<void(bool success)> _return,
-                       boost::shared_ptr<protocol::TProtocol> in,
-                       boost::shared_ptr<protocol::TProtocol> out) {
-    protocol::TProtocol* inRaw = in.get();
-    protocol::TProtocol* outRaw = out.get();
-
-    // Try to dynamic cast to the template protocol type
-    Protocol_* specificIn = dynamic_cast<Protocol_*>(inRaw);
-    Protocol_* specificOut = dynamic_cast<Protocol_*>(outRaw);
-    if (specificIn && specificOut) {
-      return processFast(_return, specificIn, specificOut);
-    }
-
-    // Log the fact that we have to use the slow path
-    T_GENERIC_PROTOCOL(this, inRaw, specificIn);
-    T_GENERIC_PROTOCOL(this, outRaw, specificOut);
-
-    std::string fname;
-    protocol::TMessageType mtype;
-    int32_t seqid;
-    inRaw->readMessageBegin(fname, mtype, seqid);
-
-    // If this doesn't look like a valid call, log an error and return false so
-    // that the server will close the connection.
-    //
-    // (The old generated processor code used to try to skip a T_STRUCT and
-    // continue.  However, that seems unsafe.)
-    if (mtype != protocol::T_CALL && mtype != protocol::T_ONEWAY) {
-      GlobalOutput.printf("received invalid message type %d from client", mtype);
-      _return(false);
-      return;
-    }
-
-    return this->dispatchCall(_return, inRaw, outRaw, fname, seqid);
-  }
-
-  void processFast(apache::thrift::stdcxx::function<void(bool success)> _return,
-                   Protocol_* in,
-                   Protocol_* out) {
-    std::string fname;
-    protocol::TMessageType mtype;
-    int32_t seqid;
-    in->readMessageBegin(fname, mtype, seqid);
-
-    if (mtype != protocol::T_CALL && mtype != protocol::T_ONEWAY) {
-      GlobalOutput.printf("received invalid message type %d from client", mtype);
-      _return(false);
-      return;
-    }
-
-    return this->dispatchCallTemplated(_return, in, out, fname, seqid);
-  }
-
-  virtual void dispatchCall(apache::thrift::stdcxx::function<void(bool ok)> _return,
-                            apache::thrift::protocol::TProtocol* in,
-                            apache::thrift::protocol::TProtocol* out,
-                            const std::string& fname,
-                            int32_t seqid) = 0;
-
-  virtual void dispatchCallTemplated(apache::thrift::stdcxx::function<void(bool ok)> _return,
-                                     Protocol_* in,
-                                     Protocol_* out,
-                                     const std::string& fname,
-                                     int32_t seqid) = 0;
-};
-
-/**
- * Non-templatized version of TAsyncDispatchProcessor,
- * that doesn't bother trying to perform a dynamic_cast.
- */
-class TAsyncDispatchProcessor : public TAsyncProcessor {
-public:
-  virtual void process(apache::thrift::stdcxx::function<void(bool success)> _return,
-                       boost::shared_ptr<protocol::TProtocol> in,
-                       boost::shared_ptr<protocol::TProtocol> out) {
-    protocol::TProtocol* inRaw = in.get();
-    protocol::TProtocol* outRaw = out.get();
-
-    std::string fname;
-    protocol::TMessageType mtype;
-    int32_t seqid;
-    inRaw->readMessageBegin(fname, mtype, seqid);
-
-    // If this doesn't look like a valid call, log an error and return false so
-    // that the server will close the connection.
-    //
-    // (The old generated processor code used to try to skip a T_STRUCT and
-    // continue.  However, that seems unsafe.)
-    if (mtype != protocol::T_CALL && mtype != protocol::T_ONEWAY) {
-      GlobalOutput.printf("received invalid message type %d from client", mtype);
-      _return(false);
-      return;
-    }
-
-    return dispatchCall(_return, inRaw, outRaw, fname, seqid);
-  }
-
-  virtual void dispatchCall(apache::thrift::stdcxx::function<void(bool ok)> _return,
-                            apache::thrift::protocol::TProtocol* in,
-                            apache::thrift::protocol::TProtocol* out,
-                            const std::string& fname,
-                            int32_t seqid) = 0;
-};
-
-// Specialize TAsyncDispatchProcessorT for TProtocol and TDummyProtocol just to
-// use the generic TDispatchProcessor.
-template <>
-class TAsyncDispatchProcessorT<protocol::TDummyProtocol> : public TAsyncDispatchProcessor {};
-template <>
-class TAsyncDispatchProcessorT<protocol::TProtocol> : public TAsyncDispatchProcessor {};
-}
-}
-} // apache::thrift::async
-
-#endif // _THRIFT_ASYNC_TASYNCDISPATCHPROCESSOR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProcessor.h
deleted file mode 100644
index 01a34c4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProcessor.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TASYNCPROCESSOR_H_
-#define _THRIFT_TASYNCPROCESSOR_H_ 1
-
-#include <thrift/cxxfunctional.h>
-#include <boost/shared_ptr.hpp>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/TProcessor.h>
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-/**
- * Async version of a TProcessor.  It is not expected to complete by the time
- * the call to process returns.  Instead, it calls a cob to signal completion.
- */
-
-class TAsyncProcessor {
-public:
-  virtual ~TAsyncProcessor() {}
-
-  virtual void process(apache::thrift::stdcxx::function<void(bool success)> _return,
-                       boost::shared_ptr<protocol::TProtocol> in,
-                       boost::shared_ptr<protocol::TProtocol> out) = 0;
-
-  void process(apache::thrift::stdcxx::function<void(bool success)> _return,
-               boost::shared_ptr<apache::thrift::protocol::TProtocol> io) {
-    return process(_return, io, io);
-  }
-
-  boost::shared_ptr<TProcessorEventHandler> getEventHandler() const { return eventHandler_; }
-
-  void setEventHandler(boost::shared_ptr<TProcessorEventHandler> eventHandler) {
-    eventHandler_ = eventHandler;
-  }
-
-protected:
-  TAsyncProcessor() {}
-
-  boost::shared_ptr<TProcessorEventHandler> eventHandler_;
-};
-
-class TAsyncProcessorFactory {
-public:
-  virtual ~TAsyncProcessorFactory() {}
-
-  /**
-   * Get the TAsyncProcessor to use for a particular connection.
-   *
-   * This method is always invoked in the same thread that the connection was
-   * accepted on.  This generally means that this call does not need to be
-   * thread safe, as it will always be invoked from a single thread.
-   */
-  virtual boost::shared_ptr<TAsyncProcessor> getProcessor(const TConnectionInfo& connInfo) = 0;
-};
-}
-}
-} // apache::thrift::async
-
-// XXX I'm lazy for now
-namespace apache {
-namespace thrift {
-using apache::thrift::async::TAsyncProcessor;
-}
-}
-
-#endif // #ifndef _THRIFT_TASYNCPROCESSOR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp
deleted file mode 100644
index 5a4f347..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/async/TAsyncProtocolProcessor.h>
-
-using apache::thrift::transport::TBufferBase;
-using apache::thrift::protocol::TProtocol;
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-void TAsyncProtocolProcessor::process(apache::thrift::stdcxx::function<void(bool healthy)> _return,
-                                      boost::shared_ptr<TBufferBase> ibuf,
-                                      boost::shared_ptr<TBufferBase> obuf) {
-  boost::shared_ptr<TProtocol> iprot(pfact_->getProtocol(ibuf));
-  boost::shared_ptr<TProtocol> oprot(pfact_->getProtocol(obuf));
-  return underlying_
-      ->process(apache::thrift::stdcxx::bind(&TAsyncProtocolProcessor::finish,
-                                             _return,
-                                             oprot,
-                                             apache::thrift::stdcxx::placeholders::_1),
-                iprot,
-                oprot);
-}
-
-/* static */ void TAsyncProtocolProcessor::finish(
-    apache::thrift::stdcxx::function<void(bool healthy)> _return,
-    boost::shared_ptr<TProtocol> oprot,
-    bool healthy) {
-  (void)oprot;
-  // This is a stub function to hold a reference to oprot.
-  return _return(healthy);
-}
-}
-}
-} // apache::thrift::async
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h
deleted file mode 100644
index 3f2b394..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TNAME_ME_H_
-#define _THRIFT_TNAME_ME_H_ 1
-
-#include <thrift/async/TAsyncProcessor.h>
-#include <thrift/async/TAsyncBufferProcessor.h>
-#include <thrift/protocol/TProtocol.h>
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-class TAsyncProtocolProcessor : public TAsyncBufferProcessor {
-public:
-  TAsyncProtocolProcessor(boost::shared_ptr<TAsyncProcessor> underlying,
-                          boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> pfact)
-    : underlying_(underlying), pfact_(pfact) {}
-
-  virtual void process(apache::thrift::stdcxx::function<void(bool healthy)> _return,
-                       boost::shared_ptr<apache::thrift::transport::TBufferBase> ibuf,
-                       boost::shared_ptr<apache::thrift::transport::TBufferBase> obuf);
-
-  virtual ~TAsyncProtocolProcessor() {}
-
-private:
-  static void finish(apache::thrift::stdcxx::function<void(bool healthy)> _return,
-                     boost::shared_ptr<apache::thrift::protocol::TProtocol> oprot,
-                     bool healthy);
-
-  boost::shared_ptr<TAsyncProcessor> underlying_;
-  boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> pfact_;
-};
-}
-}
-} // apache::thrift::async
-
-#endif // #ifndef _THRIFT_TNAME_ME_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TConcurrentClientSyncInfo.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TConcurrentClientSyncInfo.cpp
deleted file mode 100644
index c7e27c0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TConcurrentClientSyncInfo.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/async/TConcurrentClientSyncInfo.h>
-#include <thrift/TApplicationException.h>
-#include <thrift/transport/TTransportException.h>
-#include <limits>
-
-namespace apache { namespace thrift { namespace async {
-
-using namespace ::apache::thrift::concurrency;
-
-TConcurrentClientSyncInfo::TConcurrentClientSyncInfo() :
-  stop_(false),
-  seqidMutex_(),
-  // test rollover all the time
-  nextseqid_((std::numeric_limits<int32_t>::max)()-10),
-  seqidToMonitorMap_(),
-  freeMonitors_(),
-  writeMutex_(),
-  readMutex_(),
-  recvPending_(false),
-  wakeupSomeone_(false),
-  seqidPending_(0),
-  fnamePending_(),
-  mtypePending_(::apache::thrift::protocol::T_CALL)
-{
-  freeMonitors_.reserve(MONITOR_CACHE_SIZE);
-}
-
-bool TConcurrentClientSyncInfo::getPending(
-  std::string &fname,
-  ::apache::thrift::protocol::TMessageType &mtype,
-  int32_t &rseqid)
-{
-  if(stop_)
-    throwDeadConnection_();
-  wakeupSomeone_ = false;
-  if(recvPending_)
-  {
-    recvPending_ = false;
-    rseqid = seqidPending_;
-    fname  = fnamePending_;
-    mtype  = mtypePending_;
-    return true;
-  }
-  return false;
-}
-
-void TConcurrentClientSyncInfo::updatePending(
-  const std::string &fname,
-  ::apache::thrift::protocol::TMessageType mtype,
-  int32_t rseqid)
-{
-  recvPending_ = true;
-  seqidPending_ = rseqid;
-  fnamePending_ = fname;
-  mtypePending_ = mtype;
-  MonitorPtr monitor;
-  {
-    Guard seqidGuard(seqidMutex_);
-    MonitorMap::iterator i = seqidToMonitorMap_.find(rseqid);
-    if(i == seqidToMonitorMap_.end())
-      throwBadSeqId_();
-    monitor = i->second;
-  }
-  monitor->notify();
-}
-
-void TConcurrentClientSyncInfo::waitForWork(int32_t seqid)
-{
-  MonitorPtr m;
-  {
-    Guard seqidGuard(seqidMutex_);
-    m = seqidToMonitorMap_[seqid];
-  }
-  while(true)
-  {
-    // be very careful about setting state in this loop that affects waking up.  You may exit
-    // this function, attempt to grab some work, and someone else could have beaten you (or not
-    // left) the read mutex, and that will put you right back in this loop, with the mangled
-    // state you left behind.
-    if(stop_)
-      throwDeadConnection_();
-    if(wakeupSomeone_)
-      return;
-    if(recvPending_ && seqidPending_ == seqid)
-      return;
-    m->waitForever();
-  }
-}
-
-void TConcurrentClientSyncInfo::throwBadSeqId_()
-{
-  throw apache::thrift::TApplicationException(
-    TApplicationException::BAD_SEQUENCE_ID,
-    "server sent a bad seqid");
-}
-
-void TConcurrentClientSyncInfo::throwDeadConnection_()
-{
-  throw apache::thrift::transport::TTransportException(
-    apache::thrift::transport::TTransportException::NOT_OPEN,
-    "this client died on another thread, and is now in an unusable state");
-}
-
-void TConcurrentClientSyncInfo::wakeupAnyone_(const Guard &)
-{
-  wakeupSomeone_ = true;
-  if(!seqidToMonitorMap_.empty())
-  {
-    // The monitor map maps integers to monitors.  Larger integers are more recent
-    // messages.  Since this is ordered, it means that the last element is the most recent.
-    // We are trying to guess which thread will have its message complete next, so we are picking
-    // the most recent. The oldest message is likely to be some polling, long lived message.
-    // If we guess right, the thread we wake up will handle the message that comes in.
-    // If we guess wrong, the thread we wake up will hand off the work to the correct thread,
-    // costing us an extra context switch.
-    seqidToMonitorMap_.rbegin()->second->notify();
-  }
-}
-
-void TConcurrentClientSyncInfo::markBad_(const Guard &)
-{
-  wakeupSomeone_ = true;
-  stop_ = true;
-  for(MonitorMap::iterator i = seqidToMonitorMap_.begin(); i != seqidToMonitorMap_.end(); ++i)
-    i->second->notify();
-}
-
-TConcurrentClientSyncInfo::MonitorPtr
-TConcurrentClientSyncInfo::newMonitor_(const Guard &)
-{
-  if(freeMonitors_.empty())
-    return MonitorPtr(new Monitor(&readMutex_));
-  MonitorPtr retval;
-  //swapping to avoid an atomic operation
-  retval.swap(freeMonitors_.back());
-  freeMonitors_.pop_back();
-  return retval;
-}
-
-void TConcurrentClientSyncInfo::deleteMonitor_(
-  const Guard &,
-  TConcurrentClientSyncInfo::MonitorPtr &m) /*noexcept*/
-{
-  if(freeMonitors_.size() > MONITOR_CACHE_SIZE)
-  {
-    m.reset();
-    return;
-  }
-  //freeMonitors_ was reserved up to MONITOR_CACHE_SIZE in the ctor,
-  //so this shouldn't throw
-  freeMonitors_.push_back(TConcurrentClientSyncInfo::MonitorPtr());
-  //swapping to avoid an atomic operation
-  m.swap(freeMonitors_.back());
-}
-
-int32_t TConcurrentClientSyncInfo::generateSeqId()
-{
-  Guard seqidGuard(seqidMutex_);
-  if(stop_)
-    throwDeadConnection_();
-
-  if(!seqidToMonitorMap_.empty())
-    if(nextseqid_ == seqidToMonitorMap_.begin()->first)
-      throw apache::thrift::TApplicationException(
-        TApplicationException::BAD_SEQUENCE_ID,
-        "about to repeat a seqid");
-  int32_t newSeqId = nextseqid_++;
-  seqidToMonitorMap_[newSeqId] = newMonitor_(seqidGuard);
-  return newSeqId;
-}
-
-TConcurrentRecvSentry::TConcurrentRecvSentry(TConcurrentClientSyncInfo *sync, int32_t seqid) :
-  sync_(*sync),
-  seqid_(seqid),
-  committed_(false)
-{
-  sync_.getReadMutex().lock();
-}
-
-TConcurrentRecvSentry::~TConcurrentRecvSentry()
-{
-  {
-    Guard seqidGuard(sync_.seqidMutex_);
-    sync_.deleteMonitor_(seqidGuard, sync_.seqidToMonitorMap_[seqid_]);
-
-    sync_.seqidToMonitorMap_.erase(seqid_);
-    if(committed_)
-      sync_.wakeupAnyone_(seqidGuard);
-    else
-      sync_.markBad_(seqidGuard);
-  }
-  sync_.getReadMutex().unlock();
-}
-
-void TConcurrentRecvSentry::commit()
-{
-  committed_ = true;
-}
-
-TConcurrentSendSentry::TConcurrentSendSentry(TConcurrentClientSyncInfo *sync) :
-  sync_(*sync),
-  committed_(false)
-{
-  sync_.getWriteMutex().lock();
-}
-
-TConcurrentSendSentry::~TConcurrentSendSentry()
-{
-  if(!committed_)
-  {
-    Guard seqidGuard(sync_.seqidMutex_);
-    sync_.markBad_(seqidGuard);
-  }
-  sync_.getWriteMutex().unlock();
-}
-
-void TConcurrentSendSentry::commit()
-{
-  committed_ = true;
-}
-
-
-}}} // apache::thrift::async
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TConcurrentClientSyncInfo.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TConcurrentClientSyncInfo.h
deleted file mode 100644
index 7afcbc2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TConcurrentClientSyncInfo.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _THRIFT_TCONCURRENTCLIENTSYNCINFO_H_
-#define _THRIFT_TCONCURRENTCLIENTSYNCINFO_H_ 1
-
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/concurrency/Mutex.h>
-#include <thrift/concurrency/Monitor.h>
-#include <boost/shared_ptr.hpp>
-#include <vector>
-#include <string>
-#include <map>
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-class TConcurrentClientSyncInfo;
-
-class TConcurrentSendSentry {
-public:
-  explicit TConcurrentSendSentry(TConcurrentClientSyncInfo* sync);
-  ~TConcurrentSendSentry();
-
-  void commit();
-
-private:
-  TConcurrentClientSyncInfo& sync_;
-  bool committed_;
-};
-
-class TConcurrentRecvSentry {
-public:
-  TConcurrentRecvSentry(TConcurrentClientSyncInfo* sync, int32_t seqid);
-  ~TConcurrentRecvSentry();
-
-  void commit();
-
-private:
-  TConcurrentClientSyncInfo& sync_;
-  int32_t seqid_;
-  bool committed_;
-};
-
-class TConcurrentClientSyncInfo {
-private: // typedefs
-  typedef boost::shared_ptr< ::apache::thrift::concurrency::Monitor> MonitorPtr;
-  typedef std::map<int32_t, MonitorPtr> MonitorMap;
-
-public:
-  TConcurrentClientSyncInfo();
-
-  int32_t generateSeqId();
-
-  bool getPending(std::string& fname,
-                  ::apache::thrift::protocol::TMessageType& mtype,
-                  int32_t& rseqid); /* requires readMutex_ */
-
-  void updatePending(const std::string& fname,
-                     ::apache::thrift::protocol::TMessageType mtype,
-                     int32_t rseqid); /* requires readMutex_ */
-
-  void waitForWork(int32_t seqid); /* requires readMutex_ */
-
-  ::apache::thrift::concurrency::Mutex& getReadMutex() { return readMutex_; }
-  ::apache::thrift::concurrency::Mutex& getWriteMutex() { return writeMutex_; }
-
-private: // constants
-  enum { MONITOR_CACHE_SIZE = 10 };
-
-private: // functions
-  MonitorPtr newMonitor_(
-      const ::apache::thrift::concurrency::Guard& seqidGuard); /* requires seqidMutex_ */
-  void deleteMonitor_(const ::apache::thrift::concurrency::Guard& seqidGuard, MonitorPtr& m);
-      /*noexcept*/ /* requires seqidMutex_ */
-  void wakeupAnyone_(
-      const ::apache::thrift::concurrency::Guard& seqidGuard);           /* requires seqidMutex_ */
-  void markBad_(const ::apache::thrift::concurrency::Guard& seqidGuard); /* requires seqidMutex_ */
-  void throwBadSeqId_();
-  void throwDeadConnection_();
-
-private: // data members
-  volatile bool stop_;
-
-  ::apache::thrift::concurrency::Mutex seqidMutex_;
-  // begin seqidMutex_ protected members
-  int32_t nextseqid_;
-  MonitorMap seqidToMonitorMap_;
-  std::vector<MonitorPtr> freeMonitors_;
-  // end seqidMutex_ protected members
-
-  ::apache::thrift::concurrency::Mutex writeMutex_;
-
-  ::apache::thrift::concurrency::Mutex readMutex_;
-  // begin readMutex_ protected members
-  bool recvPending_;
-  bool wakeupSomeone_;
-  int32_t seqidPending_;
-  std::string fnamePending_;
-  ::apache::thrift::protocol::TMessageType mtypePending_;
-  // end readMutex_ protected members
-
-  friend class TConcurrentSendSentry;
-  friend class TConcurrentRecvSentry;
-};
-}
-}
-} // apache::thrift::async
-
-#endif // _THRIFT_TCONCURRENTCLIENTSYNCINFO_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp
deleted file mode 100644
index 74acfaa..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/async/TEvhttpClientChannel.h>
-#include <evhttp.h>
-#include <event2/buffer.h>
-#include <event2/buffer_compat.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/protocol/TProtocolException.h>
-
-#include <iostream>
-#include <sstream>
-
-using namespace apache::thrift::protocol;
-using apache::thrift::transport::TTransportException;
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-TEvhttpClientChannel::TEvhttpClientChannel(const std::string& host,
-                                           const std::string& path,
-                                           const char* address,
-                                           int port,
-                                           struct event_base* eb)
-  : host_(host), path_(path), conn_(NULL) {
-  conn_ = evhttp_connection_new(address, port);
-  if (conn_ == NULL) {
-    throw TException("evhttp_connection_new failed");
-  }
-  evhttp_connection_set_base(conn_, eb);
-}
-
-TEvhttpClientChannel::~TEvhttpClientChannel() {
-  if (conn_ != NULL) {
-    evhttp_connection_free(conn_);
-  }
-}
-
-void TEvhttpClientChannel::sendAndRecvMessage(const VoidCallback& cob,
-                                              apache::thrift::transport::TMemoryBuffer* sendBuf,
-                                              apache::thrift::transport::TMemoryBuffer* recvBuf) {
-  struct evhttp_request* req = evhttp_request_new(response, this);
-  if (req == NULL) {
-    throw TException("evhttp_request_new failed");
-  }
-
-  int rv;
-
-  rv = evhttp_add_header(req->output_headers, "Host", host_.c_str());
-  if (rv != 0) {
-    throw TException("evhttp_add_header failed");
-  }
-
-  rv = evhttp_add_header(req->output_headers, "Content-Type", "application/x-thrift");
-  if (rv != 0) {
-    throw TException("evhttp_add_header failed");
-  }
-
-  uint8_t* obuf;
-  uint32_t sz;
-  sendBuf->getBuffer(&obuf, &sz);
-  rv = evbuffer_add(req->output_buffer, obuf, sz);
-  if (rv != 0) {
-    throw TException("evbuffer_add failed");
-  }
-
-  rv = evhttp_make_request(conn_, req, EVHTTP_REQ_POST, path_.c_str());
-  if (rv != 0) {
-    throw TException("evhttp_make_request failed");
-  }
-
-  completionQueue_.push(Completion(cob, recvBuf));
-}
-
-void TEvhttpClientChannel::sendMessage(const VoidCallback& cob,
-                                       apache::thrift::transport::TMemoryBuffer* message) {
-  (void)cob;
-  (void)message;
-  throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                           "Unexpected call to TEvhttpClientChannel::sendMessage");
-}
-
-void TEvhttpClientChannel::recvMessage(const VoidCallback& cob,
-                                       apache::thrift::transport::TMemoryBuffer* message) {
-  (void)cob;
-  (void)message;
-  throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                           "Unexpected call to TEvhttpClientChannel::recvMessage");
-}
-
-void TEvhttpClientChannel::finish(struct evhttp_request* req) {
-  assert(!completionQueue_.empty());
-  Completion completion = completionQueue_.front();
-  completionQueue_.pop();
-  if (req == NULL) {
-    try {
-      completion.first();
-    } catch (const TTransportException& e) {
-      if (e.getType() == TTransportException::END_OF_FILE)
-        throw TException("connect failed");
-      else
-        throw;
-    }
-    return;
-  } else if (req->response_code != 200) {
-    try {
-      completion.first();
-    } catch (const TTransportException& e) {
-      std::stringstream ss;
-      ss << "server returned code " << req->response_code;
-      if (req->response_code_line)
-        ss << ": " << req->response_code_line;
-      if (e.getType() == TTransportException::END_OF_FILE)
-        throw TException(ss.str());
-      else
-        throw;
-    }
-    return;
-  }
-  completion.second->resetBuffer(EVBUFFER_DATA(req->input_buffer),
-                        static_cast<uint32_t>(EVBUFFER_LENGTH(req->input_buffer)));
-  completion.first();
-  return;
-}
-
-/* static */ void TEvhttpClientChannel::response(struct evhttp_request* req, void* arg) {
-  TEvhttpClientChannel* self = (TEvhttpClientChannel*)arg;
-  try {
-    self->finish(req);
-  } catch (std::exception& e) {
-    // don't propagate a C++ exception in C code (e.g. libevent)
-    std::cerr << "TEvhttpClientChannel::response exception thrown (ignored): " << e.what()
-              << std::endl;
-  }
-}
-}
-}
-} // apache::thrift::async
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpClientChannel.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpClientChannel.h
deleted file mode 100644
index 72eb32d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpClientChannel.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TEVHTTP_CLIENT_CHANNEL_H_
-#define _THRIFT_TEVHTTP_CLIENT_CHANNEL_H_ 1
-
-#include <queue>
-#include <string>
-#include <utility>
-#include <boost/shared_ptr.hpp>
-#include <thrift/async/TAsyncChannel.h>
-
-struct event_base;
-struct evhttp_connection;
-struct evhttp_request;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-class TMemoryBuffer;
-}
-}
-}
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-class TEvhttpClientChannel : public TAsyncChannel {
-public:
-  using TAsyncChannel::VoidCallback;
-
-  TEvhttpClientChannel(const std::string& host,
-                       const std::string& path,
-                       const char* address,
-                       int port,
-                       struct event_base* eb);
-  ~TEvhttpClientChannel();
-
-  virtual void sendAndRecvMessage(const VoidCallback& cob,
-                                  apache::thrift::transport::TMemoryBuffer* sendBuf,
-                                  apache::thrift::transport::TMemoryBuffer* recvBuf);
-
-  virtual void sendMessage(const VoidCallback& cob,
-                           apache::thrift::transport::TMemoryBuffer* message);
-  virtual void recvMessage(const VoidCallback& cob,
-                           apache::thrift::transport::TMemoryBuffer* message);
-
-  void finish(struct evhttp_request* req);
-
-  // XXX
-  virtual bool good() const { return true; }
-  virtual bool error() const { return false; }
-  virtual bool timedOut() const { return false; }
-
-private:
-  static void response(struct evhttp_request* req, void* arg);
-
-  std::string host_;
-  std::string path_;
-  typedef std::pair<VoidCallback, apache::thrift::transport::TMemoryBuffer*> Completion;
-  typedef std::queue<Completion> CompletionQueue;
-  CompletionQueue completionQueue_;
-  struct evhttp_connection* conn_;
-};
-}
-}
-} // apache::thrift::async
-
-#endif // #ifndef _THRIFT_TEVHTTP_CLIENT_CHANNEL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpServer.cpp
deleted file mode 100644
index 57d0d61..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpServer.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/async/TEvhttpServer.h>
-#include <thrift/async/TAsyncBufferProcessor.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <evhttp.h>
-#include <event2/buffer.h>
-#include <event2/buffer_compat.h>
-
-#include <iostream>
-
-#ifndef HTTP_INTERNAL // libevent < 2
-#define HTTP_INTERNAL 500
-#endif
-
-using apache::thrift::transport::TMemoryBuffer;
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-struct TEvhttpServer::RequestContext {
-  struct evhttp_request* req;
-  boost::shared_ptr<apache::thrift::transport::TMemoryBuffer> ibuf;
-  boost::shared_ptr<apache::thrift::transport::TMemoryBuffer> obuf;
-
-  RequestContext(struct evhttp_request* req);
-};
-
-TEvhttpServer::TEvhttpServer(boost::shared_ptr<TAsyncBufferProcessor> processor)
-  : processor_(processor), eb_(NULL), eh_(NULL) {
-}
-
-TEvhttpServer::TEvhttpServer(boost::shared_ptr<TAsyncBufferProcessor> processor, int port)
-  : processor_(processor), eb_(NULL), eh_(NULL) {
-  // Create event_base and evhttp.
-  eb_ = event_base_new();
-  if (eb_ == NULL) {
-    throw TException("event_base_new failed");
-  }
-  eh_ = evhttp_new(eb_);
-  if (eh_ == NULL) {
-    event_base_free(eb_);
-    throw TException("evhttp_new failed");
-  }
-
-  // Bind to port.
-  int ret = evhttp_bind_socket(eh_, NULL, port);
-  if (ret < 0) {
-    evhttp_free(eh_);
-    event_base_free(eb_);
-    throw TException("evhttp_bind_socket failed");
-  }
-
-  // Register a handler.  If you use the other constructor,
-  // you will want to do this yourself.
-  // Don't forget to unregister before destorying this TEvhttpServer.
-  evhttp_set_cb(eh_, "/", request, (void*)this);
-}
-
-TEvhttpServer::~TEvhttpServer() {
-  if (eh_ != NULL) {
-    evhttp_free(eh_);
-  }
-  if (eb_ != NULL) {
-    event_base_free(eb_);
-  }
-}
-
-int TEvhttpServer::serve() {
-  if (eb_ == NULL) {
-    throw TException("Unexpected call to TEvhttpServer::serve");
-  }
-  return event_base_dispatch(eb_);
-}
-
-TEvhttpServer::RequestContext::RequestContext(struct evhttp_request* req)
-  : req(req),
-    ibuf(new TMemoryBuffer(EVBUFFER_DATA(req->input_buffer),
-                           static_cast<uint32_t>(EVBUFFER_LENGTH(req->input_buffer)))),
-    obuf(new TMemoryBuffer()) {
-}
-
-void TEvhttpServer::request(struct evhttp_request* req, void* self) {
-  try {
-    static_cast<TEvhttpServer*>(self)->process(req);
-  } catch (std::exception& e) {
-    evhttp_send_reply(req, HTTP_INTERNAL, e.what(), 0);
-  }
-}
-
-void TEvhttpServer::process(struct evhttp_request* req) {
-  RequestContext* ctx = new RequestContext(req);
-  return processor_->process(apache::thrift::stdcxx::bind(&TEvhttpServer::complete,
-                                                          this,
-                                                          ctx,
-                                                          apache::thrift::stdcxx::placeholders::_1),
-                             ctx->ibuf,
-                             ctx->obuf);
-}
-
-void TEvhttpServer::complete(RequestContext* ctx, bool success) {
-  (void)success;
-  std::auto_ptr<RequestContext> ptr(ctx);
-
-  int code = success ? 200 : 400;
-  const char* reason = success ? "OK" : "Bad Request";
-
-  int rv = evhttp_add_header(ctx->req->output_headers, "Content-Type", "application/x-thrift");
-  if (rv != 0) {
-    // TODO: Log an error.
-    std::cerr << "evhttp_add_header failed " << __FILE__ << ":" << __LINE__ << std::endl;
-  }
-
-  struct evbuffer* buf = evbuffer_new();
-  if (buf == NULL) {
-    // TODO: Log an error.
-    std::cerr << "evbuffer_new failed " << __FILE__ << ":" << __LINE__ << std::endl;
-  } else {
-    uint8_t* obuf;
-    uint32_t sz;
-    ctx->obuf->getBuffer(&obuf, &sz);
-    int ret = evbuffer_add(buf, obuf, sz);
-    if (ret != 0) {
-      // TODO: Log an error.
-      std::cerr << "evhttp_add failed with " << ret << " " << __FILE__ << ":" << __LINE__
-                << std::endl;
-    }
-  }
-
-  evhttp_send_reply(ctx->req, code, reason, buf);
-  if (buf != NULL) {
-    evbuffer_free(buf);
-  }
-}
-
-struct event_base* TEvhttpServer::getEventBase() {
-  return eb_;
-}
-}
-}
-} // apache::thrift::async
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpServer.h
deleted file mode 100644
index 89bf337..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/async/TEvhttpServer.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TEVHTTP_SERVER_H_
-#define _THRIFT_TEVHTTP_SERVER_H_ 1
-
-#include <boost/shared_ptr.hpp>
-
-struct event_base;
-struct evhttp;
-struct evhttp_request;
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-class TAsyncBufferProcessor;
-
-class TEvhttpServer {
-public:
-  /**
-   * Create a TEvhttpServer for use with an external evhttp instance.
-   * Must be manually installed with evhttp_set_cb, using
-   * TEvhttpServer::request as the callback and the
-   * address of the server as the extra arg.
-   * Do not call "serve" on this server.
-   */
-  TEvhttpServer(boost::shared_ptr<TAsyncBufferProcessor> processor);
-
-  /**
-   * Create a TEvhttpServer with an embedded event_base and evhttp,
-   * listening on port and responding on the endpoint "/".
-   * Call "serve" on this server to serve forever.
-   */
-  TEvhttpServer(boost::shared_ptr<TAsyncBufferProcessor> processor, int port);
-
-  ~TEvhttpServer();
-
-  static void request(struct evhttp_request* req, void* self);
-  int serve();
-
-  struct event_base* getEventBase();
-
-private:
-  struct RequestContext;
-
-  void process(struct evhttp_request* req);
-  void complete(RequestContext* ctx, bool success);
-
-  boost::shared_ptr<TAsyncBufferProcessor> processor_;
-  struct event_base* eb_;
-  struct evhttp* eh_;
-};
-}
-}
-} // apache::thrift::async
-
-#endif // #ifndef _THRIFT_TEVHTTP_SERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp
deleted file mode 100644
index 6c24d82..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/Exception.h>
-#include <thrift/concurrency/Util.h>
-#include <thrift/transport/PlatformSocket.h>
-#include <assert.h>
-
-#include <boost/scoped_ptr.hpp>
-#include <boost/thread.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * Monitor implementation using the boost thread library
- *
- * @version $Id:$
- */
-class Monitor::Impl : public boost::condition_variable_any {
-
-public:
-  Impl() : ownedMutex_(new Mutex()), mutex_(NULL) { init(ownedMutex_.get()); }
-
-  Impl(Mutex* mutex) : mutex_(NULL) { init(mutex); }
-
-  Impl(Monitor* monitor) : mutex_(NULL) { init(&(monitor->mutex())); }
-
-  Mutex& mutex() { return *mutex_; }
-  void lock() { mutex().lock(); }
-  void unlock() { mutex().unlock(); }
-
-  /**
-   * Exception-throwing version of waitForTimeRelative(), called simply
-   * wait(int64) for historical reasons.  Timeout is in milliseconds.
-   *
-   * If the condition occurs,  this function returns cleanly; on timeout or
-   * error an exception is thrown.
-   */
-  void wait(int64_t timeout_ms) {
-    int result = waitForTimeRelative(timeout_ms);
-    if (result == THRIFT_ETIMEDOUT) {
-      throw TimedOutException();
-    } else if (result != 0) {
-      throw TException("Monitor::wait() failed");
-    }
-  }
-
-  /**
-   * Waits until the specified timeout in milliseconds for the condition to
-   * occur, or waits forever if timeout_ms == 0.
-   *
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTimeRelative(int64_t timeout_ms) {
-    if (timeout_ms == 0LL) {
-      return waitForever();
-    }
-
-    assert(mutex_);
-    boost::timed_mutex* mutexImpl
-        = reinterpret_cast<boost::timed_mutex*>(mutex_->getUnderlyingImpl());
-    assert(mutexImpl);
-
-    boost::timed_mutex::scoped_lock lock(*mutexImpl, boost::adopt_lock);
-    int res
-        = timed_wait(lock, boost::get_system_time() + boost::posix_time::milliseconds(timeout_ms))
-              ? 0
-              : THRIFT_ETIMEDOUT;
-    lock.release();
-    return res;
-  }
-
-  /**
-   * Waits until the absolute time specified using struct THRIFT_TIMESPEC.
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTime(const THRIFT_TIMESPEC* abstime) {
-    struct timeval temp;
-    temp.tv_sec = static_cast<long>(abstime->tv_sec);
-    temp.tv_usec = static_cast<long>(abstime->tv_nsec) / 1000;
-    return waitForTime(&temp);
-  }
-
-  /**
-   * Waits until the absolute time specified using struct timeval.
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTime(const struct timeval* abstime) {
-    assert(mutex_);
-    boost::timed_mutex* mutexImpl = static_cast<boost::timed_mutex*>(mutex_->getUnderlyingImpl());
-    assert(mutexImpl);
-
-    struct timeval currenttime;
-    Util::toTimeval(currenttime, Util::currentTime());
-
-    long tv_sec = static_cast<long>(abstime->tv_sec - currenttime.tv_sec);
-    long tv_usec = static_cast<long>(abstime->tv_usec - currenttime.tv_usec);
-    if (tv_sec < 0)
-      tv_sec = 0;
-    if (tv_usec < 0)
-      tv_usec = 0;
-
-    boost::timed_mutex::scoped_lock lock(*mutexImpl, boost::adopt_lock);
-    int res = timed_wait(lock,
-                         boost::get_system_time() + boost::posix_time::seconds(tv_sec)
-                         + boost::posix_time::microseconds(tv_usec))
-                  ? 0
-                  : THRIFT_ETIMEDOUT;
-    lock.release();
-    return res;
-  }
-
-  /**
-   * Waits forever until the condition occurs.
-   * Returns 0 if condition occurs, or an error code otherwise.
-   */
-  int waitForever() {
-    assert(mutex_);
-    boost::timed_mutex* mutexImpl
-        = reinterpret_cast<boost::timed_mutex*>(mutex_->getUnderlyingImpl());
-    assert(mutexImpl);
-
-    boost::timed_mutex::scoped_lock lock(*mutexImpl, boost::adopt_lock);
-    ((boost::condition_variable_any*)this)->wait(lock);
-    lock.release();
-    return 0;
-  }
-
-  void notify() { notify_one(); }
-
-  void notifyAll() { notify_all(); }
-
-private:
-  void init(Mutex* mutex) { mutex_ = mutex; }
-
-  boost::scoped_ptr<Mutex> ownedMutex_;
-  Mutex* mutex_;
-};
-
-Monitor::Monitor() : impl_(new Monitor::Impl()) {
-}
-Monitor::Monitor(Mutex* mutex) : impl_(new Monitor::Impl(mutex)) {
-}
-Monitor::Monitor(Monitor* monitor) : impl_(new Monitor::Impl(monitor)) {
-}
-
-Monitor::~Monitor() {
-  delete impl_;
-}
-
-Mutex& Monitor::mutex() const {
-  return const_cast<Monitor::Impl*>(impl_)->mutex();
-}
-
-void Monitor::lock() const {
-  const_cast<Monitor::Impl*>(impl_)->lock();
-}
-
-void Monitor::unlock() const {
-  const_cast<Monitor::Impl*>(impl_)->unlock();
-}
-
-void Monitor::wait(int64_t timeout) const {
-  const_cast<Monitor::Impl*>(impl_)->wait(timeout);
-}
-
-int Monitor::waitForTime(const THRIFT_TIMESPEC* abstime) const {
-  return const_cast<Monitor::Impl*>(impl_)->waitForTime(abstime);
-}
-
-int Monitor::waitForTime(const timeval* abstime) const {
-  return const_cast<Monitor::Impl*>(impl_)->waitForTime(abstime);
-}
-
-int Monitor::waitForTimeRelative(int64_t timeout_ms) const {
-  return const_cast<Monitor::Impl*>(impl_)->waitForTimeRelative(timeout_ms);
-}
-
-int Monitor::waitForever() const {
-  return const_cast<Monitor::Impl*>(impl_)->waitForever();
-}
-
-void Monitor::notify() const {
-  const_cast<Monitor::Impl*>(impl_)->notify();
-}
-
-void Monitor::notifyAll() const {
-  const_cast<Monitor::Impl*>(impl_)->notifyAll();
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostMutex.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostMutex.cpp
deleted file mode 100644
index f7cadab..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostMutex.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/concurrency/Mutex.h>
-#include <thrift/concurrency/Util.h>
-#include <thrift/Thrift.h>
-
-#include <cassert>
-#include <boost/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * Implementation of Mutex class using boost interprocess mutex
- *
- * @version $Id:$
- */
-class Mutex::impl : public boost::timed_mutex {};
-
-Mutex::Mutex(Initializer init) : impl_(new Mutex::impl()) {
-  THRIFT_UNUSED_VARIABLE(init);
-}
-
-void* Mutex::getUnderlyingImpl() const {
-  return impl_.get();
-}
-
-void Mutex::lock() const {
-  impl_->lock();
-}
-
-bool Mutex::trylock() const {
-  return impl_->try_lock();
-}
-
-bool Mutex::timedlock(int64_t ms) const {
-  return impl_->timed_lock(boost::get_system_time() + boost::posix_time::milliseconds(ms));
-}
-
-void Mutex::unlock() const {
-  impl_->unlock();
-}
-
-void Mutex::DEFAULT_INITIALIZER(void* arg) {
-  THRIFT_UNUSED_VARIABLE(arg);
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp
deleted file mode 100644
index a72d38b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#if USE_BOOST_THREAD
-
-#include <thrift/concurrency/BoostThreadFactory.h>
-#include <thrift/concurrency/Exception.h>
-
-#include <cassert>
-
-#include <boost/weak_ptr.hpp>
-#include <boost/thread.hpp>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-using boost::shared_ptr;
-using boost::weak_ptr;
-
-/**
- * The boost thread class.
- *
- * @version $Id:$
- */
-class BoostThread : public Thread {
-public:
-  enum STATE { uninitialized, starting, started, stopping, stopped };
-
-  static void* threadMain(void* arg);
-
-private:
-  std::auto_ptr<boost::thread> thread_;
-  STATE state_;
-  weak_ptr<BoostThread> self_;
-  bool detached_;
-
-public:
-  BoostThread(bool detached, shared_ptr<Runnable> runnable)
-    : state_(uninitialized), detached_(detached) {
-    this->Thread::runnable(runnable);
-  }
-
-  ~BoostThread() {
-    if (!detached_) {
-      try {
-        join();
-      } catch (...) {
-        // We're really hosed.
-      }
-    }
-  }
-
-  void start() {
-    if (state_ != uninitialized) {
-      return;
-    }
-
-    // Create reference
-    shared_ptr<BoostThread>* selfRef = new shared_ptr<BoostThread>();
-    *selfRef = self_.lock();
-
-    state_ = starting;
-
-    thread_
-        = std::auto_ptr<boost::thread>(new boost::thread(boost::bind(threadMain, (void*)selfRef)));
-
-    if (detached_)
-      thread_->detach();
-  }
-
-  void join() {
-    if (!detached_ && state_ != uninitialized) {
-      thread_->join();
-    }
-  }
-
-  Thread::id_t getId() { return thread_.get() ? thread_->get_id() : boost::thread::id(); }
-
-  shared_ptr<Runnable> runnable() const { return Thread::runnable(); }
-
-  void runnable(shared_ptr<Runnable> value) { Thread::runnable(value); }
-
-  void weakRef(shared_ptr<BoostThread> self) {
-    assert(self.get() == this);
-    self_ = weak_ptr<BoostThread>(self);
-  }
-};
-
-void* BoostThread::threadMain(void* arg) {
-  shared_ptr<BoostThread> thread = *(shared_ptr<BoostThread>*)arg;
-  delete reinterpret_cast<shared_ptr<BoostThread>*>(arg);
-
-  if (!thread) {
-    return (void*)0;
-  }
-
-  if (thread->state_ != starting) {
-    return (void*)0;
-  }
-
-  thread->state_ = started;
-  thread->runnable()->run();
-
-  if (thread->state_ != stopping && thread->state_ != stopped) {
-    thread->state_ = stopping;
-  }
-  return (void*)0;
-}
-
-BoostThreadFactory::BoostThreadFactory(bool detached)
-  : ThreadFactory(detached) {
-}
-
-shared_ptr<Thread> BoostThreadFactory::newThread(shared_ptr<Runnable> runnable) const {
-  shared_ptr<BoostThread> result = shared_ptr<BoostThread>(new BoostThread(isDetached(), runnable));
-  result->weakRef(result);
-  runnable->thread(result);
-  return result;
-}
-
-Thread::id_t BoostThreadFactory::getCurrentThreadId() const {
-  return boost::this_thread::get_id();
-}
-}
-}
-} // apache::thrift::concurrency
-
-#endif // USE_BOOST_THREAD
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h
deleted file mode 100644
index 7973245..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_BOOSTTHREADFACTORY_H_
-#define _THRIFT_CONCURRENCY_BOOSTTHREADFACTORY_H_ 1
-
-#include <thrift/concurrency/Thread.h>
-
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * A thread factory to create posix threads
- *
- * @version $Id:$
- */
-class BoostThreadFactory : public ThreadFactory {
-
-public:
-  /**
-   * Boost thread factory.  All threads created by a factory are reference-counted
-   * via boost::shared_ptr and boost::weak_ptr.  The factory guarantees that threads and
-   * the Runnable tasks they host will be properly cleaned up once the last strong reference
-   * to both is given up.
-   *
-   * Threads are created with the specified boost policy, priority, stack-size. A detachable thread
-   * is not joinable.
-   *
-   * By default threads are not joinable.
-   */
-
-  BoostThreadFactory(bool detached = true);
-
-  // From ThreadFactory;
-  boost::shared_ptr<Thread> newThread(boost::shared_ptr<Runnable> runnable) const;
-
-  // From ThreadFactory;
-  Thread::id_t getCurrentThreadId() const;
-};
-
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_BOOSTTHREADFACTORY_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Exception.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Exception.h
deleted file mode 100644
index 6438fda..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Exception.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_EXCEPTION_H_
-#define _THRIFT_CONCURRENCY_EXCEPTION_H_ 1
-
-#include <exception>
-#include <thrift/Thrift.h>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-class NoSuchTaskException : public apache::thrift::TException {};
-
-class UncancellableTaskException : public apache::thrift::TException {};
-
-class InvalidArgumentException : public apache::thrift::TException {};
-
-class IllegalStateException : public apache::thrift::TException {
-public:
-  IllegalStateException() {}
-  IllegalStateException(const std::string& message) : TException(message) {}
-};
-
-class TimedOutException : public apache::thrift::TException {
-public:
-  TimedOutException() : TException("TimedOutException"){};
-  TimedOutException(const std::string& message) : TException(message) {}
-};
-
-class TooManyPendingTasksException : public apache::thrift::TException {
-public:
-  TooManyPendingTasksException() : TException("TooManyPendingTasksException"){};
-  TooManyPendingTasksException(const std::string& message) : TException(message) {}
-};
-
-class SystemResourceException : public apache::thrift::TException {
-public:
-  SystemResourceException() {}
-
-  SystemResourceException(const std::string& message) : TException(message) {}
-};
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_EXCEPTION_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/FunctionRunner.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/FunctionRunner.h
deleted file mode 100644
index 9c085c0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/FunctionRunner.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_FUNCTION_RUNNER_H
-#define _THRIFT_CONCURRENCY_FUNCTION_RUNNER_H 1
-
-#include <thrift/cxxfunctional.h>
-#include <thrift/concurrency/Thread.h>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * Convenient implementation of Runnable that will execute arbitrary callbacks.
- * Interfaces are provided to accept both a generic 'void(void)' callback, and
- * a 'void* (void*)' pthread_create-style callback.
- *
- * Example use:
- *  void* my_thread_main(void* arg);
- *  shared_ptr<ThreadFactory> factory = ...;
- *  // To create a thread that executes my_thread_main once:
- *  shared_ptr<Thread> thread = factory->newThread(
- *    FunctionRunner::create(my_thread_main, some_argument));
- *  thread->start();
- *
- *  bool A::foo();
- *  A* a = new A();
- *  // To create a thread that executes a.foo() every 100 milliseconds:
- *  factory->newThread(FunctionRunner::create(
- *    apache::thrift::stdcxx::bind(&A::foo, a), 100))->start();
- *
- */
-
-class FunctionRunner : public Runnable {
-public:
-  // This is the type of callback 'pthread_create()' expects.
-  typedef void* (*PthreadFuncPtr)(void* arg);
-  // This a fully-generic void(void) callback for custom bindings.
-  typedef apache::thrift::stdcxx::function<void()> VoidFunc;
-
-  typedef apache::thrift::stdcxx::function<bool()> BoolFunc;
-
-  /**
-   * Syntactic sugar to make it easier to create new FunctionRunner
-   * objects wrapped in shared_ptr.
-   */
-  static boost::shared_ptr<FunctionRunner> create(const VoidFunc& cob) {
-    return boost::shared_ptr<FunctionRunner>(new FunctionRunner(cob));
-  }
-
-  static boost::shared_ptr<FunctionRunner> create(PthreadFuncPtr func, void* arg) {
-    return boost::shared_ptr<FunctionRunner>(new FunctionRunner(func, arg));
-  }
-
-private:
-  static void pthread_func_wrapper(PthreadFuncPtr func, void* arg) {
-    // discard return value
-    func(arg);
-  }
-
-public:
-  /**
-   * Given a 'pthread_create' style callback, this FunctionRunner will
-   * execute the given callback.  Note that the 'void*' return value is ignored.
-   */
-  FunctionRunner(PthreadFuncPtr func, void* arg)
-    : func_(apache::thrift::stdcxx::bind(pthread_func_wrapper, func, arg)), intervalMs_(-1) {}
-
-  /**
-   * Given a generic callback, this FunctionRunner will execute it.
-   */
-  FunctionRunner(const VoidFunc& cob) : func_(cob), intervalMs_(-1) {}
-
-  /**
-   * Given a bool foo(...) type callback, FunctionRunner will execute
-   * the callback repeatedly with 'intervalMs' milliseconds between the calls,
-   * until it returns false. Note that the actual interval between calls will
-   * be intervalMs plus execution time of the callback.
-   */
-  FunctionRunner(const BoolFunc& cob, int intervalMs) : repFunc_(cob), intervalMs_(intervalMs) {}
-
-  void run() {
-    if (repFunc_) {
-      while (repFunc_()) {
-        THRIFT_SLEEP_USEC(intervalMs_ * 1000);
-      }
-    } else {
-      func_();
-    }
-  }
-
-private:
-  VoidFunc func_;
-  BoolFunc repFunc_;
-  int intervalMs_;
-};
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_FUNCTION_RUNNER_H
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Monitor.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Monitor.cpp
deleted file mode 100644
index 5969e4a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Monitor.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/Exception.h>
-#include <thrift/concurrency/Util.h>
-#include <thrift/transport/PlatformSocket.h>
-
-#include <boost/scoped_ptr.hpp>
-
-#include <assert.h>
-
-#include <iostream>
-
-#include <pthread.h>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-using boost::scoped_ptr;
-
-/**
- * Monitor implementation using the POSIX pthread library
- *
- * @version $Id:$
- */
-class Monitor::Impl {
-
-public:
-  Impl() : ownedMutex_(new Mutex()), mutex_(NULL), condInitialized_(false) {
-    init(ownedMutex_.get());
-  }
-
-  Impl(Mutex* mutex) : mutex_(NULL), condInitialized_(false) { init(mutex); }
-
-  Impl(Monitor* monitor) : mutex_(NULL), condInitialized_(false) { init(&(monitor->mutex())); }
-
-  ~Impl() { cleanup(); }
-
-  Mutex& mutex() { return *mutex_; }
-  void lock() { mutex().lock(); }
-  void unlock() { mutex().unlock(); }
-
-  /**
-   * Exception-throwing version of waitForTimeRelative(), called simply
-   * wait(int64) for historical reasons.  Timeout is in milliseconds.
-   *
-   * If the condition occurs,  this function returns cleanly; on timeout or
-   * error an exception is thrown.
-   */
-  void wait(int64_t timeout_ms) const {
-    int result = waitForTimeRelative(timeout_ms);
-    if (result == THRIFT_ETIMEDOUT) {
-      // pthread_cond_timedwait has been observed to return early on
-      // various platforms, so comment out this assert.
-      // assert(Util::currentTime() >= (now + timeout));
-      throw TimedOutException();
-    } else if (result != 0) {
-      throw TException("pthread_cond_wait() or pthread_cond_timedwait() failed");
-    }
-  }
-
-  /**
-   * Waits until the specified timeout in milliseconds for the condition to
-   * occur, or waits forever if timeout_ms == 0.
-   *
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTimeRelative(int64_t timeout_ms) const {
-    if (timeout_ms == 0LL) {
-      return waitForever();
-    }
-
-    struct THRIFT_TIMESPEC abstime;
-    Util::toTimespec(abstime, Util::currentTime() + timeout_ms);
-    return waitForTime(&abstime);
-  }
-
-  /**
-   * Waits until the absolute time specified using struct THRIFT_TIMESPEC.
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTime(const THRIFT_TIMESPEC* abstime) const {
-    assert(mutex_);
-    pthread_mutex_t* mutexImpl = reinterpret_cast<pthread_mutex_t*>(mutex_->getUnderlyingImpl());
-    assert(mutexImpl);
-
-    // XXX Need to assert that caller owns mutex
-    return pthread_cond_timedwait(&pthread_cond_, mutexImpl, abstime);
-  }
-
-  int waitForTime(const struct timeval* abstime) const {
-    struct THRIFT_TIMESPEC temp;
-    temp.tv_sec = abstime->tv_sec;
-    temp.tv_nsec = abstime->tv_usec * 1000;
-    return waitForTime(&temp);
-  }
-  /**
-   * Waits forever until the condition occurs.
-   * Returns 0 if condition occurs, or an error code otherwise.
-   */
-  int waitForever() const {
-    assert(mutex_);
-    pthread_mutex_t* mutexImpl = reinterpret_cast<pthread_mutex_t*>(mutex_->getUnderlyingImpl());
-    assert(mutexImpl);
-    return pthread_cond_wait(&pthread_cond_, mutexImpl);
-  }
-
-  void notify() {
-    // XXX Need to assert that caller owns mutex
-    int iret = pthread_cond_signal(&pthread_cond_);
-    THRIFT_UNUSED_VARIABLE(iret);
-    assert(iret == 0);
-  }
-
-  void notifyAll() {
-    // XXX Need to assert that caller owns mutex
-    int iret = pthread_cond_broadcast(&pthread_cond_);
-    THRIFT_UNUSED_VARIABLE(iret);
-    assert(iret == 0);
-  }
-
-private:
-  void init(Mutex* mutex) {
-    mutex_ = mutex;
-
-    if (pthread_cond_init(&pthread_cond_, NULL) == 0) {
-      condInitialized_ = true;
-    }
-
-    if (!condInitialized_) {
-      cleanup();
-      throw SystemResourceException();
-    }
-  }
-
-  void cleanup() {
-    if (condInitialized_) {
-      condInitialized_ = false;
-      int iret = pthread_cond_destroy(&pthread_cond_);
-      THRIFT_UNUSED_VARIABLE(iret);
-      assert(iret == 0);
-    }
-  }
-
-  scoped_ptr<Mutex> ownedMutex_;
-  Mutex* mutex_;
-
-  mutable pthread_cond_t pthread_cond_;
-  mutable bool condInitialized_;
-};
-
-Monitor::Monitor() : impl_(new Monitor::Impl()) {
-}
-Monitor::Monitor(Mutex* mutex) : impl_(new Monitor::Impl(mutex)) {
-}
-Monitor::Monitor(Monitor* monitor) : impl_(new Monitor::Impl(monitor)) {
-}
-
-Monitor::~Monitor() {
-  delete impl_;
-}
-
-Mutex& Monitor::mutex() const {
-  return impl_->mutex();
-}
-
-void Monitor::lock() const {
-  impl_->lock();
-}
-
-void Monitor::unlock() const {
-  impl_->unlock();
-}
-
-void Monitor::wait(int64_t timeout) const {
-  impl_->wait(timeout);
-}
-
-int Monitor::waitForTime(const THRIFT_TIMESPEC* abstime) const {
-  return impl_->waitForTime(abstime);
-}
-
-int Monitor::waitForTime(const timeval* abstime) const {
-  return impl_->waitForTime(abstime);
-}
-
-int Monitor::waitForTimeRelative(int64_t timeout_ms) const {
-  return impl_->waitForTimeRelative(timeout_ms);
-}
-
-int Monitor::waitForever() const {
-  return impl_->waitForever();
-}
-
-void Monitor::notify() const {
-  impl_->notify();
-}
-
-void Monitor::notifyAll() const {
-  impl_->notifyAll();
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Monitor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Monitor.h
deleted file mode 100644
index 2399a98..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Monitor.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_MONITOR_H_
-#define _THRIFT_CONCURRENCY_MONITOR_H_ 1
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <thrift/concurrency/Exception.h>
-#include <thrift/concurrency/Mutex.h>
-
-#include <boost/utility.hpp>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * A monitor is a combination mutex and condition-event.  Waiting and
- * notifying condition events requires that the caller own the mutex.  Mutex
- * lock and unlock operations can be performed independently of condition
- * events.  This is more or less analogous to java.lang.Object multi-thread
- * operations.
- *
- * Note the Monitor can create a new, internal mutex; alternatively, a
- * separate Mutex can be passed in and the Monitor will re-use it without
- * taking ownership.  It's the user's responsibility to make sure that the
- * Mutex is not deallocated before the Monitor.
- *
- * Note that all methods are const.  Monitors implement logical constness, not
- * bit constness.  This allows const methods to call monitor methods without
- * needing to cast away constness or change to non-const signatures.
- *
- * @version $Id:$
- */
-class Monitor : boost::noncopyable {
-public:
-  /** Creates a new mutex, and takes ownership of it. */
-  Monitor();
-
-  /** Uses the provided mutex without taking ownership. */
-  explicit Monitor(Mutex* mutex);
-
-  /** Uses the mutex inside the provided Monitor without taking ownership. */
-  explicit Monitor(Monitor* monitor);
-
-  /** Deallocates the mutex only if we own it. */
-  virtual ~Monitor();
-
-  Mutex& mutex() const;
-
-  virtual void lock() const;
-
-  virtual void unlock() const;
-
-  /**
-   * Waits a maximum of the specified timeout in milliseconds for the condition
-   * to occur, or waits forever if timeout_ms == 0.
-   *
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTimeRelative(int64_t timeout_ms) const;
-
-  /**
-   * Waits until the absolute time specified using struct THRIFT_TIMESPEC.
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTime(const THRIFT_TIMESPEC* abstime) const;
-
-  /**
-   * Waits until the absolute time specified using struct timeval.
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTime(const struct timeval* abstime) const;
-
-  /**
-   * Waits forever until the condition occurs.
-   * Returns 0 if condition occurs, or an error code otherwise.
-   */
-  int waitForever() const;
-
-  /**
-   * Exception-throwing version of waitForTimeRelative(), called simply
-   * wait(int64) for historical reasons.  Timeout is in milliseconds.
-   *
-   * If the condition occurs,  this function returns cleanly; on timeout or
-   * error an exception is thrown.
-   */
-  void wait(int64_t timeout_ms = 0LL) const;
-
-  /** Wakes up one thread waiting on this monitor. */
-  virtual void notify() const;
-
-  /** Wakes up all waiting threads on this monitor. */
-  virtual void notifyAll() const;
-
-private:
-  class Impl;
-
-  Impl* impl_;
-};
-
-class Synchronized {
-public:
-  Synchronized(const Monitor* monitor) : g(monitor->mutex()) {}
-  Synchronized(const Monitor& monitor) : g(monitor.mutex()) {}
-
-private:
-  Guard g;
-};
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_MONITOR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Mutex.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Mutex.cpp
deleted file mode 100644
index e5e50f7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Mutex.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/Thrift.h>
-#include <thrift/concurrency/Mutex.h>
-#include <thrift/concurrency/Util.h>
-
-#include <assert.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#include <signal.h>
-
-using boost::shared_ptr;
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-#ifndef THRIFT_NO_CONTENTION_PROFILING
-
-static int32_t mutexProfilingCounter = 0;
-static int32_t mutexProfilingSampleRate = 0;
-static MutexWaitCallback mutexProfilingCallback = 0;
-
-void enableMutexProfiling(int32_t profilingSampleRate, MutexWaitCallback callback) {
-  mutexProfilingSampleRate = profilingSampleRate;
-  mutexProfilingCallback = callback;
-}
-
-#define PROFILE_MUTEX_START_LOCK() int64_t _lock_startTime = maybeGetProfilingStartTime();
-
-#define PROFILE_MUTEX_NOT_LOCKED()                                                                 \
-  do {                                                                                             \
-    if (_lock_startTime > 0) {                                                                     \
-      int64_t endTime = Util::currentTimeUsec();                                                   \
-      (*mutexProfilingCallback)(this, endTime - _lock_startTime);                                  \
-    }                                                                                              \
-  } while (0)
-
-#define PROFILE_MUTEX_LOCKED()                                                                     \
-  do {                                                                                             \
-    profileTime_ = _lock_startTime;                                                                \
-    if (profileTime_ > 0) {                                                                        \
-      profileTime_ = Util::currentTimeUsec() - profileTime_;                                       \
-    }                                                                                              \
-  } while (0)
-
-#define PROFILE_MUTEX_START_UNLOCK()                                                               \
-  int64_t _temp_profileTime = profileTime_;                                                        \
-  profileTime_ = 0;
-
-#define PROFILE_MUTEX_UNLOCKED()                                                                   \
-  do {                                                                                             \
-    if (_temp_profileTime > 0) {                                                                   \
-      (*mutexProfilingCallback)(this, _temp_profileTime);                                          \
-    }                                                                                              \
-  } while (0)
-
-static inline int64_t maybeGetProfilingStartTime() {
-  if (mutexProfilingSampleRate && mutexProfilingCallback) {
-    // This block is unsynchronized, but should produce a reasonable sampling
-    // rate on most architectures.  The main race conditions are the gap
-    // between the decrement and the test, the non-atomicity of decrement, and
-    // potential caching of different values at different CPUs.
-    //
-    // - if two decrements race, the likeliest result is that the counter
-    //      decrements slowly (perhaps much more slowly) than intended.
-    //
-    // - many threads could potentially decrement before resetting the counter
-    //      to its large value, causing each additional incoming thread to
-    //      profile every call.  This situation is unlikely to persist for long
-    //      as the critical gap is quite short, but profiling could be bursty.
-    sig_atomic_t localValue = --mutexProfilingCounter;
-    if (localValue <= 0) {
-      mutexProfilingCounter = mutexProfilingSampleRate;
-      return Util::currentTimeUsec();
-    }
-  }
-
-  return 0;
-}
-
-#else
-#define PROFILE_MUTEX_START_LOCK()
-#define PROFILE_MUTEX_NOT_LOCKED()
-#define PROFILE_MUTEX_LOCKED()
-#define PROFILE_MUTEX_START_UNLOCK()
-#define PROFILE_MUTEX_UNLOCKED()
-#endif // THRIFT_NO_CONTENTION_PROFILING
-
-/**
- * Implementation of Mutex class using POSIX mutex
- *
- * @version $Id:$
- */
-class Mutex::impl {
-public:
-  impl(Initializer init) : initialized_(false) {
-#ifndef THRIFT_NO_CONTENTION_PROFILING
-    profileTime_ = 0;
-#endif
-    init(&pthread_mutex_);
-    initialized_ = true;
-  }
-
-  ~impl() {
-    if (initialized_) {
-      initialized_ = false;
-      int ret = pthread_mutex_destroy(&pthread_mutex_);
-      THRIFT_UNUSED_VARIABLE(ret);
-      assert(ret == 0);
-    }
-  }
-
-  void lock() const {
-    PROFILE_MUTEX_START_LOCK();
-    pthread_mutex_lock(&pthread_mutex_);
-    PROFILE_MUTEX_LOCKED();
-  }
-
-  bool trylock() const { return (0 == pthread_mutex_trylock(&pthread_mutex_)); }
-
-  bool timedlock(int64_t milliseconds) const {
-#if defined(_POSIX_TIMEOUTS) && _POSIX_TIMEOUTS >= 200112L
-    PROFILE_MUTEX_START_LOCK();
-
-    struct THRIFT_TIMESPEC ts;
-    Util::toTimespec(ts, milliseconds + Util::currentTime());
-    int ret = pthread_mutex_timedlock(&pthread_mutex_, &ts);
-    if (ret == 0) {
-      PROFILE_MUTEX_LOCKED();
-      return true;
-    }
-
-    PROFILE_MUTEX_NOT_LOCKED();
-    return false;
-#else
-    /* Otherwise follow solution used by Mono for Android */
-    struct THRIFT_TIMESPEC sleepytime, now, to;
-
-    /* This is just to avoid a completely busy wait */
-    sleepytime.tv_sec = 0;
-    sleepytime.tv_nsec = 10000000L; /* 10ms */
-
-    Util::toTimespec(to, milliseconds + Util::currentTime());
-
-    while ((trylock()) == false) {
-      Util::toTimespec(now, Util::currentTime());
-      if (now.tv_sec >= to.tv_sec && now.tv_nsec >= to.tv_nsec) {
-        return false;
-      }
-      nanosleep(&sleepytime, NULL);
-    }
-
-    return true;
-#endif
-  }
-
-  void unlock() const {
-    PROFILE_MUTEX_START_UNLOCK();
-    pthread_mutex_unlock(&pthread_mutex_);
-    PROFILE_MUTEX_UNLOCKED();
-  }
-
-  void* getUnderlyingImpl() const { return (void*)&pthread_mutex_; }
-
-private:
-  mutable pthread_mutex_t pthread_mutex_;
-  mutable bool initialized_;
-#ifndef THRIFT_NO_CONTENTION_PROFILING
-  mutable int64_t profileTime_;
-#endif
-};
-
-Mutex::Mutex(Initializer init) : impl_(new Mutex::impl(init)) {
-}
-
-void* Mutex::getUnderlyingImpl() const {
-  return impl_->getUnderlyingImpl();
-}
-
-void Mutex::lock() const {
-  impl_->lock();
-}
-
-bool Mutex::trylock() const {
-  return impl_->trylock();
-}
-
-bool Mutex::timedlock(int64_t ms) const {
-  return impl_->timedlock(ms);
-}
-
-void Mutex::unlock() const {
-  impl_->unlock();
-}
-
-void Mutex::DEFAULT_INITIALIZER(void* arg) {
-  pthread_mutex_t* pthread_mutex = (pthread_mutex_t*)arg;
-  int ret = pthread_mutex_init(pthread_mutex, NULL);
-  THRIFT_UNUSED_VARIABLE(ret);
-  assert(ret == 0);
-}
-
-#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)                                                 \
-    || defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
-static void init_with_kind(pthread_mutex_t* mutex, int kind) {
-  pthread_mutexattr_t mutexattr;
-  int ret = pthread_mutexattr_init(&mutexattr);
-  assert(ret == 0);
-
-  // Apparently, this can fail.  Should we really be aborting?
-  ret = pthread_mutexattr_settype(&mutexattr, kind);
-  assert(ret == 0);
-
-  ret = pthread_mutex_init(mutex, &mutexattr);
-  assert(ret == 0);
-
-  ret = pthread_mutexattr_destroy(&mutexattr);
-  assert(ret == 0);
-  THRIFT_UNUSED_VARIABLE(ret);
-}
-#endif
-
-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
-void Mutex::ADAPTIVE_INITIALIZER(void* arg) {
-  // From mysql source: mysys/my_thr_init.c
-  // Set mutex type to "fast" a.k.a "adaptive"
-  //
-  // In this case the thread may steal the mutex from some other thread
-  // that is waiting for the same mutex. This will save us some
-  // context switches but may cause a thread to 'starve forever' while
-  // waiting for the mutex (not likely if the code within the mutex is
-  // short).
-  init_with_kind((pthread_mutex_t*)arg, PTHREAD_MUTEX_ADAPTIVE_NP);
-}
-#endif
-
-#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-void Mutex::RECURSIVE_INITIALIZER(void* arg) {
-  init_with_kind((pthread_mutex_t*)arg, PTHREAD_MUTEX_RECURSIVE_NP);
-}
-#endif
-
-/**
- * Implementation of ReadWriteMutex class using POSIX rw lock
- *
- * @version $Id:$
- */
-class ReadWriteMutex::impl {
-public:
-  impl() : initialized_(false) {
-#ifndef THRIFT_NO_CONTENTION_PROFILING
-    profileTime_ = 0;
-#endif
-    int ret = pthread_rwlock_init(&rw_lock_, NULL);
-    THRIFT_UNUSED_VARIABLE(ret);
-    assert(ret == 0);
-    initialized_ = true;
-  }
-
-  ~impl() {
-    if (initialized_) {
-      initialized_ = false;
-      int ret = pthread_rwlock_destroy(&rw_lock_);
-      THRIFT_UNUSED_VARIABLE(ret);
-      assert(ret == 0);
-    }
-  }
-
-  void acquireRead() const {
-    PROFILE_MUTEX_START_LOCK();
-    pthread_rwlock_rdlock(&rw_lock_);
-    PROFILE_MUTEX_NOT_LOCKED(); // not exclusive, so use not-locked path
-  }
-
-  void acquireWrite() const {
-    PROFILE_MUTEX_START_LOCK();
-    pthread_rwlock_wrlock(&rw_lock_);
-    PROFILE_MUTEX_LOCKED();
-  }
-
-  bool attemptRead() const { return !pthread_rwlock_tryrdlock(&rw_lock_); }
-
-  bool attemptWrite() const { return !pthread_rwlock_trywrlock(&rw_lock_); }
-
-  void release() const {
-    PROFILE_MUTEX_START_UNLOCK();
-    pthread_rwlock_unlock(&rw_lock_);
-    PROFILE_MUTEX_UNLOCKED();
-  }
-
-private:
-  mutable pthread_rwlock_t rw_lock_;
-  mutable bool initialized_;
-#ifndef THRIFT_NO_CONTENTION_PROFILING
-  mutable int64_t profileTime_;
-#endif
-};
-
-ReadWriteMutex::ReadWriteMutex() : impl_(new ReadWriteMutex::impl()) {
-}
-
-void ReadWriteMutex::acquireRead() const {
-  impl_->acquireRead();
-}
-
-void ReadWriteMutex::acquireWrite() const {
-  impl_->acquireWrite();
-}
-
-bool ReadWriteMutex::attemptRead() const {
-  return impl_->attemptRead();
-}
-
-bool ReadWriteMutex::attemptWrite() const {
-  return impl_->attemptWrite();
-}
-
-void ReadWriteMutex::release() const {
-  impl_->release();
-}
-
-NoStarveReadWriteMutex::NoStarveReadWriteMutex() : writerWaiting_(false) {
-}
-
-void NoStarveReadWriteMutex::acquireRead() const {
-  if (writerWaiting_) {
-    // writer is waiting, block on the writer's mutex until he's done with it
-    mutex_.lock();
-    mutex_.unlock();
-  }
-
-  ReadWriteMutex::acquireRead();
-}
-
-void NoStarveReadWriteMutex::acquireWrite() const {
-  // if we can acquire the rwlock the easy way, we're done
-  if (attemptWrite()) {
-    return;
-  }
-
-  // failed to get the rwlock, do it the hard way:
-  // locking the mutex and setting writerWaiting will cause all new readers to
-  // block on the mutex rather than on the rwlock.
-  mutex_.lock();
-  writerWaiting_ = true;
-  ReadWriteMutex::acquireWrite();
-  writerWaiting_ = false;
-  mutex_.unlock();
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Mutex.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Mutex.h
deleted file mode 100644
index 6f892dc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Mutex.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_MUTEX_H_
-#define _THRIFT_CONCURRENCY_MUTEX_H_ 1
-
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
-#include <stdint.h>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-#ifndef THRIFT_NO_CONTENTION_PROFILING
-
-/**
- * Determines if the Thrift Mutex and ReadWriteMutex classes will attempt to
- * profile their blocking acquire methods. If this value is set to non-zero,
- * Thrift will attempt to invoke the callback once every profilingSampleRate
- * times.  However, as the sampling is not synchronized the rate is not
- * guranateed, and could be subject to big bursts and swings.  Please ensure
- * your sampling callback is as performant as your application requires.
- *
- * The callback will get called with the wait time taken to lock the mutex in
- * usec and a (void*) that uniquely identifies the Mutex (or ReadWriteMutex)
- * being locked.
- *
- * The enableMutexProfiling() function is unsynchronized; calling this function
- * while profiling is already enabled may result in race conditions.  On
- * architectures where a pointer assignment is atomic, this is safe but there
- * is no guarantee threads will agree on a single callback within any
- * particular time period.
- */
-typedef void (*MutexWaitCallback)(const void* id, int64_t waitTimeMicros);
-void enableMutexProfiling(int32_t profilingSampleRate, MutexWaitCallback callback);
-
-#endif
-
-/**
- * A simple mutex class
- *
- * @version $Id:$
- */
-class Mutex {
-public:
-  typedef void (*Initializer)(void*);
-
-  Mutex(Initializer init = DEFAULT_INITIALIZER);
-  virtual ~Mutex() {}
-  virtual void lock() const;
-  virtual bool trylock() const;
-  virtual bool timedlock(int64_t milliseconds) const;
-  virtual void unlock() const;
-
-  void* getUnderlyingImpl() const;
-
-  static void DEFAULT_INITIALIZER(void*);
-  static void ADAPTIVE_INITIALIZER(void*);
-  static void RECURSIVE_INITIALIZER(void*);
-
-private:
-  class impl;
-  boost::shared_ptr<impl> impl_;
-};
-
-class ReadWriteMutex {
-public:
-  ReadWriteMutex();
-  virtual ~ReadWriteMutex() {}
-
-  // these get the lock and block until it is done successfully
-  virtual void acquireRead() const;
-  virtual void acquireWrite() const;
-
-  // these attempt to get the lock, returning false immediately if they fail
-  virtual bool attemptRead() const;
-  virtual bool attemptWrite() const;
-
-  // this releases both read and write locks
-  virtual void release() const;
-
-private:
-  class impl;
-  boost::shared_ptr<impl> impl_;
-};
-
-/**
- * A ReadWriteMutex that guarantees writers will not be starved by readers:
- * When a writer attempts to acquire the mutex, all new readers will be
- * blocked from acquiring the mutex until the writer has acquired and
- * released it. In some operating systems, this may already be guaranteed
- * by a regular ReadWriteMutex.
- */
-class NoStarveReadWriteMutex : public ReadWriteMutex {
-public:
-  NoStarveReadWriteMutex();
-
-  virtual void acquireRead() const;
-  virtual void acquireWrite() const;
-
-private:
-  Mutex mutex_;
-  mutable volatile bool writerWaiting_;
-};
-
-class Guard : boost::noncopyable {
-public:
-  Guard(const Mutex& value, int64_t timeout = 0) : mutex_(&value) {
-    if (timeout == 0) {
-      value.lock();
-    } else if (timeout < 0) {
-      if (!value.trylock()) {
-        mutex_ = NULL;
-      }
-    } else {
-      if (!value.timedlock(timeout)) {
-        mutex_ = NULL;
-      }
-    }
-  }
-  ~Guard() {
-    if (mutex_) {
-      mutex_->unlock();
-    }
-  }
-
-  operator bool() const { return (mutex_ != NULL); }
-
-private:
-  const Mutex* mutex_;
-};
-
-// Can be used as second argument to RWGuard to make code more readable
-// as to whether we're doing acquireRead() or acquireWrite().
-enum RWGuardType { RW_READ = 0, RW_WRITE = 1 };
-
-class RWGuard : boost::noncopyable {
-public:
-  RWGuard(const ReadWriteMutex& value, bool write = false) : rw_mutex_(value) {
-    if (write) {
-      rw_mutex_.acquireWrite();
-    } else {
-      rw_mutex_.acquireRead();
-    }
-  }
-
-  RWGuard(const ReadWriteMutex& value, RWGuardType type) : rw_mutex_(value) {
-    if (type == RW_WRITE) {
-      rw_mutex_.acquireWrite();
-    } else {
-      rw_mutex_.acquireRead();
-    }
-  }
-  ~RWGuard() { rw_mutex_.release(); }
-
-private:
-  const ReadWriteMutex& rw_mutex_;
-};
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_MUTEX_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h
deleted file mode 100644
index 545b572..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_
-#define _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_ 1
-
-// clang-format off
-#include <thrift/thrift-config.h>
-#if USE_BOOST_THREAD
-#  include <thrift/concurrency/BoostThreadFactory.h>
-#elif USE_STD_THREAD
-#  include <thrift/concurrency/StdThreadFactory.h>
-#else
-#  include <thrift/concurrency/PosixThreadFactory.h>
-#endif
-// clang-format on
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-// clang-format off
-#if USE_BOOST_THREAD
-  typedef BoostThreadFactory PlatformThreadFactory;
-#elif USE_STD_THREAD
-  typedef StdThreadFactory PlatformThreadFactory;
-#else
-  typedef PosixThreadFactory PlatformThreadFactory;
-#endif
-// clang-format on
-
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp
deleted file mode 100644
index 6a0b47c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/concurrency/PosixThreadFactory.h>
-#include <thrift/concurrency/Exception.h>
-
-#if GOOGLE_PERFTOOLS_REGISTER_THREAD
-#include <google/profiler.h>
-#endif
-
-#include <assert.h>
-#include <pthread.h>
-
-#include <iostream>
-
-#include <boost/weak_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-using boost::shared_ptr;
-using boost::weak_ptr;
-
-/**
- * The POSIX thread class.
- *
- * @version $Id:$
- */
-class PthreadThread : public Thread {
-public:
-  enum STATE { uninitialized, starting, started, stopping, stopped };
-
-  static const int MB = 1024 * 1024;
-
-  static void* threadMain(void* arg);
-
-private:
-  pthread_t pthread_;
-  STATE state_;
-  int policy_;
-  int priority_;
-  int stackSize_;
-  weak_ptr<PthreadThread> self_;
-  bool detached_;
-
-public:
-  PthreadThread(int policy,
-                int priority,
-                int stackSize,
-                bool detached,
-                shared_ptr<Runnable> runnable)
-    :
-
-#ifndef _WIN32
-      pthread_(0),
-#endif // _WIN32
-
-      state_(uninitialized),
-      policy_(policy),
-      priority_(priority),
-      stackSize_(stackSize),
-      detached_(detached) {
-
-    this->Thread::runnable(runnable);
-  }
-
-  ~PthreadThread() {
-    /* Nothing references this thread, if is is not detached, do a join
-       now, otherwise the thread-id and, possibly, other resources will
-       be leaked. */
-    if (!detached_) {
-      try {
-        join();
-      } catch (...) {
-        // We're really hosed.
-      }
-    }
-  }
-
-  void start() {
-    if (state_ != uninitialized) {
-      return;
-    }
-
-    pthread_attr_t thread_attr;
-    if (pthread_attr_init(&thread_attr) != 0) {
-      throw SystemResourceException("pthread_attr_init failed");
-    }
-
-    if (pthread_attr_setdetachstate(&thread_attr,
-                                    detached_ ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE)
-        != 0) {
-      throw SystemResourceException("pthread_attr_setdetachstate failed");
-    }
-
-    // Set thread stack size
-    if (pthread_attr_setstacksize(&thread_attr, MB * stackSize_) != 0) {
-      throw SystemResourceException("pthread_attr_setstacksize failed");
-    }
-
-// Set thread policy
-#ifdef _WIN32
-    // WIN32 Pthread implementation doesn't seem to support sheduling policies other then
-    // PosixThreadFactory::OTHER - runtime error
-    policy_ = PosixThreadFactory::OTHER;
-#endif
-
-#if _POSIX_THREAD_PRIORITY_SCHEDULING > 0
-    if (pthread_attr_setschedpolicy(&thread_attr, policy_) != 0) {
-      throw SystemResourceException("pthread_attr_setschedpolicy failed");
-    }
-#endif
-
-    struct sched_param sched_param;
-    sched_param.sched_priority = priority_;
-
-    // Set thread priority
-    if (pthread_attr_setschedparam(&thread_attr, &sched_param) != 0) {
-      throw SystemResourceException("pthread_attr_setschedparam failed");
-    }
-
-    // Create reference
-    shared_ptr<PthreadThread>* selfRef = new shared_ptr<PthreadThread>();
-    *selfRef = self_.lock();
-
-    state_ = starting;
-
-    if (pthread_create(&pthread_, &thread_attr, threadMain, (void*)selfRef) != 0) {
-      throw SystemResourceException("pthread_create failed");
-    }
-  }
-
-  void join() {
-    if (!detached_ && state_ != uninitialized) {
-      void* ignore;
-      /* XXX
-         If join fails it is most likely due to the fact
-         that the last reference was the thread itself and cannot
-         join.  This results in leaked threads and will eventually
-         cause the process to run out of thread resources.
-         We're beyond the point of throwing an exception.  Not clear how
-         best to handle this. */
-      int res = pthread_join(pthread_, &ignore);
-      detached_ = (res == 0);
-      if (res != 0) {
-        GlobalOutput.printf("PthreadThread::join(): fail with code %d", res);
-      }
-    } else {
-      GlobalOutput.printf("PthreadThread::join(): detached thread");
-    }
-  }
-
-  Thread::id_t getId() {
-
-#ifndef _WIN32
-    return (Thread::id_t)pthread_;
-#else
-    return (Thread::id_t)pthread_.p;
-#endif // _WIN32
-  }
-
-  shared_ptr<Runnable> runnable() const { return Thread::runnable(); }
-
-  void runnable(shared_ptr<Runnable> value) { Thread::runnable(value); }
-
-  void weakRef(shared_ptr<PthreadThread> self) {
-    assert(self.get() == this);
-    self_ = weak_ptr<PthreadThread>(self);
-  }
-};
-
-void* PthreadThread::threadMain(void* arg) {
-  shared_ptr<PthreadThread> thread = *(shared_ptr<PthreadThread>*)arg;
-  delete reinterpret_cast<shared_ptr<PthreadThread>*>(arg);
-
-  if (thread == NULL) {
-    return (void*)0;
-  }
-
-  if (thread->state_ != starting) {
-    return (void*)0;
-  }
-
-#if GOOGLE_PERFTOOLS_REGISTER_THREAD
-  ProfilerRegisterThread();
-#endif
-
-  thread->state_ = started;
-  thread->runnable()->run();
-  if (thread->state_ != stopping && thread->state_ != stopped) {
-    thread->state_ = stopping;
-  }
-
-  return (void*)0;
-}
-
-/**
- * Converts generic posix thread schedule policy enums into pthread
- * API values.
- */
-static int toPthreadPolicy(PosixThreadFactory::POLICY policy) {
-  switch (policy) {
-  case PosixThreadFactory::OTHER:
-    return SCHED_OTHER;
-  case PosixThreadFactory::FIFO:
-    return SCHED_FIFO;
-  case PosixThreadFactory::ROUND_ROBIN:
-    return SCHED_RR;
-  }
-  return SCHED_OTHER;
-}
-
-/**
- * Converts relative thread priorities to absolute value based on posix
- * thread scheduler policy
- *
- *  The idea is simply to divide up the priority range for the given policy
- * into the correpsonding relative priority level (lowest..highest) and
- * then pro-rate accordingly.
- */
-static int toPthreadPriority(PosixThreadFactory::POLICY policy, PosixThreadFactory::PRIORITY priority) {
-  int pthread_policy = toPthreadPolicy(policy);
-  int min_priority = 0;
-  int max_priority = 0;
-#ifdef HAVE_SCHED_GET_PRIORITY_MIN
-  min_priority = sched_get_priority_min(pthread_policy);
-#endif
-#ifdef HAVE_SCHED_GET_PRIORITY_MAX
-  max_priority = sched_get_priority_max(pthread_policy);
-#endif
-  int quanta = (PosixThreadFactory::HIGHEST - PosixThreadFactory::LOWEST) + 1;
-  float stepsperquanta = (float)(max_priority - min_priority) / quanta;
-
-  if (priority <= PosixThreadFactory::HIGHEST) {
-    return (int)(min_priority + stepsperquanta * priority);
-  } else {
-    // should never get here for priority increments.
-    assert(false);
-    return (int)(min_priority + stepsperquanta * PosixThreadFactory::NORMAL);
-  }
-}
-
-PosixThreadFactory::PosixThreadFactory(POLICY policy,
-                                       PRIORITY priority,
-                                       int stackSize,
-                                       bool detached)
-  : ThreadFactory(detached),
-    policy_(policy),
-    priority_(priority),
-    stackSize_(stackSize) {
-}
-
-PosixThreadFactory::PosixThreadFactory(bool detached)
-  : ThreadFactory(detached),
-    policy_(ROUND_ROBIN),
-    priority_(NORMAL),
-    stackSize_(1) {
-}
-
-shared_ptr<Thread> PosixThreadFactory::newThread(shared_ptr<Runnable> runnable) const {
-  shared_ptr<PthreadThread> result
-      = shared_ptr<PthreadThread>(new PthreadThread(toPthreadPolicy(policy_),
-                                                    toPthreadPriority(policy_, priority_),
-                                                    stackSize_,
-                                                    isDetached(),
-                                                    runnable));
-  result->weakRef(result);
-  runnable->thread(result);
-  return result;
-}
-
-int PosixThreadFactory::getStackSize() const {
-  return stackSize_;
-}
-
-void PosixThreadFactory::setStackSize(int value) {
-  stackSize_ = value;
-}
-
-PosixThreadFactory::PRIORITY PosixThreadFactory::getPriority() const {
-  return priority_;
-}
-
-void PosixThreadFactory::setPriority(PRIORITY value) {
-  priority_ = value;
-}
-
-Thread::id_t PosixThreadFactory::getCurrentThreadId() const {
-#ifndef _WIN32
-  return (Thread::id_t)pthread_self();
-#else
-  return (Thread::id_t)pthread_self().p;
-#endif // _WIN32
-}
-
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h
deleted file mode 100644
index c1bbe5c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_POSIXTHREADFACTORY_H_
-#define _THRIFT_CONCURRENCY_POSIXTHREADFACTORY_H_ 1
-
-#include <thrift/concurrency/Thread.h>
-
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * A thread factory to create posix threads
- *
- * @version $Id:$
- */
-class PosixThreadFactory : public ThreadFactory {
-
-public:
-  /**
-   * POSIX Thread scheduler policies
-   */
-  enum POLICY { OTHER, FIFO, ROUND_ROBIN };
-
-  /**
-   * POSIX Thread scheduler relative priorities,
-   *
-   * Absolute priority is determined by scheduler policy and OS. This
-   * enumeration specifies relative priorities such that one can specify a
-   * priority within a giving scheduler policy without knowing the absolute
-   * value of the priority.
-   */
-  enum PRIORITY {
-    LOWEST = 0,
-    LOWER = 1,
-    LOW = 2,
-    NORMAL = 3,
-    HIGH = 4,
-    HIGHER = 5,
-    HIGHEST = 6,
-    INCREMENT = 7,
-    DECREMENT = 8
-  };
-
-  /**
-   * Posix thread (pthread) factory.  All threads created by a factory are reference-counted
-   * via boost::shared_ptr and boost::weak_ptr.  The factory guarantees that threads and
-   * the Runnable tasks they host will be properly cleaned up once the last strong reference
-   * to both is given up.
-   *
-   * Threads are created with the specified policy, priority, stack-size and detachable-mode
-   * detached means the thread is free-running and will release all system resources the
-   * when it completes.  A detachable thread is not joinable.  The join method
-   * of a detachable thread will return immediately with no error.
-   *
-   * By default threads are not joinable.
-   */
-  PosixThreadFactory(POLICY policy = ROUND_ROBIN,
-                     PRIORITY priority = NORMAL,
-                     int stackSize = 1,
-                     bool detached = true);
-
-  /**
-   * Provide a constructor compatible with the other factories
-   * The default policy is POLICY::ROUND_ROBIN.
-   * The default priority is PRIORITY::NORMAL.
-   * The default stackSize is 1.
-   */
-  PosixThreadFactory(bool detached);
-
-  // From ThreadFactory;
-  boost::shared_ptr<Thread> newThread(boost::shared_ptr<Runnable> runnable) const;
-
-  // From ThreadFactory;
-  Thread::id_t getCurrentThreadId() const;
-
-  /**
-   * Gets stack size for newly created threads
-   *
-   * @return int size in megabytes
-   */
-  virtual int getStackSize() const;
-
-  /**
-   * Sets stack size for newly created threads
-   *
-   * @param value size in megabytes
-   */
-  virtual void setStackSize(int value);
-
-  /**
-   * Gets priority relative to current policy
-   */
-  virtual PRIORITY getPriority() const;
-
-  /**
-   * Sets priority relative to current policy
-   */
-  virtual void setPriority(PRIORITY priority);
-
-private:
-  POLICY policy_;
-  PRIORITY priority_;
-  int stackSize_;
-};
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_POSIXTHREADFACTORY_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdMonitor.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdMonitor.cpp
deleted file mode 100644
index 7b3b209..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdMonitor.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/Exception.h>
-#include <thrift/concurrency/Util.h>
-#include <thrift/transport/PlatformSocket.h>
-#include <assert.h>
-
-#include <condition_variable>
-#include <chrono>
-#include <thread>
-#include <mutex>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * Monitor implementation using the std thread library
- *
- * @version $Id:$
- */
-class Monitor::Impl {
-
-public:
-  Impl() : ownedMutex_(new Mutex()), conditionVariable_(), mutex_(NULL) { init(ownedMutex_.get()); }
-
-  Impl(Mutex* mutex) : ownedMutex_(), conditionVariable_(), mutex_(NULL) { init(mutex); }
-
-  Impl(Monitor* monitor) : ownedMutex_(), conditionVariable_(), mutex_(NULL) {
-    init(&(monitor->mutex()));
-  }
-
-  Mutex& mutex() { return *mutex_; }
-  void lock() { mutex_->lock(); }
-  void unlock() { mutex_->unlock(); }
-
-  /**
-   * Exception-throwing version of waitForTimeRelative(), called simply
-   * wait(int64) for historical reasons.  Timeout is in milliseconds.
-   *
-   * If the condition occurs,  this function returns cleanly; on timeout or
-   * error an exception is thrown.
-   */
-  void wait(int64_t timeout_ms) {
-    int result = waitForTimeRelative(timeout_ms);
-    if (result == THRIFT_ETIMEDOUT) {
-      throw TimedOutException();
-    } else if (result != 0) {
-      throw TException("Monitor::wait() failed");
-    }
-  }
-
-  /**
-   * Waits until the specified timeout in milliseconds for the condition to
-   * occur, or waits forever if timeout_ms == 0.
-   *
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTimeRelative(int64_t timeout_ms) {
-    if (timeout_ms == 0LL) {
-      return waitForever();
-    }
-
-    assert(mutex_);
-    std::timed_mutex* mutexImpl = static_cast<std::timed_mutex*>(mutex_->getUnderlyingImpl());
-    assert(mutexImpl);
-
-    std::unique_lock<std::timed_mutex> lock(*mutexImpl, std::adopt_lock);
-    bool timedout = (conditionVariable_.wait_for(lock, std::chrono::milliseconds(timeout_ms))
-                     == std::cv_status::timeout);
-    lock.release();
-    return (timedout ? THRIFT_ETIMEDOUT : 0);
-  }
-
-  /**
-   * Waits until the absolute time specified using struct THRIFT_TIMESPEC.
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTime(const THRIFT_TIMESPEC* abstime) {
-    struct timeval temp;
-    temp.tv_sec = static_cast<long>(abstime->tv_sec);
-    temp.tv_usec = static_cast<long>(abstime->tv_nsec) / 1000;
-    return waitForTime(&temp);
-  }
-
-  /**
-   * Waits until the absolute time specified using struct timeval.
-   * Returns 0 if condition occurs, THRIFT_ETIMEDOUT on timeout, or an error code.
-   */
-  int waitForTime(const struct timeval* abstime) {
-    assert(mutex_);
-    std::timed_mutex* mutexImpl = static_cast<std::timed_mutex*>(mutex_->getUnderlyingImpl());
-    assert(mutexImpl);
-
-    struct timeval currenttime;
-    Util::toTimeval(currenttime, Util::currentTime());
-
-    long tv_sec = static_cast<long>(abstime->tv_sec - currenttime.tv_sec);
-    long tv_usec = static_cast<long>(abstime->tv_usec - currenttime.tv_usec);
-    if (tv_sec < 0)
-      tv_sec = 0;
-    if (tv_usec < 0)
-      tv_usec = 0;
-
-    std::unique_lock<std::timed_mutex> lock(*mutexImpl, std::adopt_lock);
-    bool timedout = (conditionVariable_.wait_for(lock,
-                                                 std::chrono::seconds(tv_sec)
-                                                 + std::chrono::microseconds(tv_usec))
-                     == std::cv_status::timeout);
-    lock.release();
-    return (timedout ? THRIFT_ETIMEDOUT : 0);
-  }
-
-  /**
-   * Waits forever until the condition occurs.
-   * Returns 0 if condition occurs, or an error code otherwise.
-   */
-  int waitForever() {
-    assert(mutex_);
-    std::timed_mutex* mutexImpl = static_cast<std::timed_mutex*>(mutex_->getUnderlyingImpl());
-    assert(mutexImpl);
-
-    std::unique_lock<std::timed_mutex> lock(*mutexImpl, std::adopt_lock);
-    conditionVariable_.wait(lock);
-    lock.release();
-    return 0;
-  }
-
-  void notify() { conditionVariable_.notify_one(); }
-
-  void notifyAll() { conditionVariable_.notify_all(); }
-
-private:
-  void init(Mutex* mutex) { mutex_ = mutex; }
-
-  const std::unique_ptr<Mutex> ownedMutex_;
-  std::condition_variable_any conditionVariable_;
-  Mutex* mutex_;
-};
-
-Monitor::Monitor() : impl_(new Monitor::Impl()) {
-}
-Monitor::Monitor(Mutex* mutex) : impl_(new Monitor::Impl(mutex)) {
-}
-Monitor::Monitor(Monitor* monitor) : impl_(new Monitor::Impl(monitor)) {
-}
-
-Monitor::~Monitor() {
-  delete impl_;
-}
-
-Mutex& Monitor::mutex() const {
-  return const_cast<Monitor::Impl*>(impl_)->mutex();
-}
-
-void Monitor::lock() const {
-  const_cast<Monitor::Impl*>(impl_)->lock();
-}
-
-void Monitor::unlock() const {
-  const_cast<Monitor::Impl*>(impl_)->unlock();
-}
-
-void Monitor::wait(int64_t timeout) const {
-  const_cast<Monitor::Impl*>(impl_)->wait(timeout);
-}
-
-int Monitor::waitForTime(const THRIFT_TIMESPEC* abstime) const {
-  return const_cast<Monitor::Impl*>(impl_)->waitForTime(abstime);
-}
-
-int Monitor::waitForTime(const timeval* abstime) const {
-  return const_cast<Monitor::Impl*>(impl_)->waitForTime(abstime);
-}
-
-int Monitor::waitForTimeRelative(int64_t timeout_ms) const {
-  return const_cast<Monitor::Impl*>(impl_)->waitForTimeRelative(timeout_ms);
-}
-
-int Monitor::waitForever() const {
-  return const_cast<Monitor::Impl*>(impl_)->waitForever();
-}
-
-void Monitor::notify() const {
-  const_cast<Monitor::Impl*>(impl_)->notify();
-}
-
-void Monitor::notifyAll() const {
-  const_cast<Monitor::Impl*>(impl_)->notifyAll();
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdMutex.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdMutex.cpp
deleted file mode 100644
index 69678a2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdMutex.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/concurrency/Mutex.h>
-#include <thrift/concurrency/Util.h>
-
-#include <cassert>
-#include <chrono>
-#include <mutex>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * Implementation of Mutex class using C++11 std::timed_mutex
- *
- * @version $Id:$
- */
-class Mutex::impl : public std::timed_mutex {};
-
-Mutex::Mutex(Initializer init) : impl_(new Mutex::impl()) {
-}
-
-void* Mutex::getUnderlyingImpl() const {
-  return impl_.get();
-}
-
-void Mutex::lock() const {
-  impl_->lock();
-}
-
-bool Mutex::trylock() const {
-  return impl_->try_lock();
-}
-
-bool Mutex::timedlock(int64_t ms) const {
-  return impl_->try_lock_for(std::chrono::milliseconds(ms));
-}
-
-void Mutex::unlock() const {
-  impl_->unlock();
-}
-
-void Mutex::DEFAULT_INITIALIZER(void* arg) {
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp
deleted file mode 100644
index 66c7e75..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#if USE_STD_THREAD
-
-#include <thrift/concurrency/StdThreadFactory.h>
-#include <thrift/concurrency/Exception.h>
-
-#include <cassert>
-
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/weak_ptr.hpp>
-#include <thread>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * The C++11 thread class.
- *
- * Note that we use boost shared_ptr rather than std shared_ptrs here
- * because the Thread/Runnable classes use those and we don't want to
- * mix them.
- *
- * @version $Id:$
- */
-class StdThread : public Thread, public boost::enable_shared_from_this<StdThread> {
-public:
-  enum STATE { uninitialized, starting, started, stopping, stopped };
-
-  static void threadMain(boost::shared_ptr<StdThread> thread);
-
-private:
-  std::unique_ptr<std::thread> thread_;
-  STATE state_;
-  bool detached_;
-
-public:
-  StdThread(bool detached, boost::shared_ptr<Runnable> runnable)
-    : state_(uninitialized), detached_(detached) {
-    this->Thread::runnable(runnable);
-  }
-
-  ~StdThread() {
-    if (!detached_) {
-      try {
-        join();
-      } catch (...) {
-        // We're really hosed.
-      }
-    }
-  }
-
-  void start() {
-    if (state_ != uninitialized) {
-      return;
-    }
-
-    boost::shared_ptr<StdThread> selfRef = shared_from_this();
-    state_ = starting;
-
-    thread_ = std::unique_ptr<std::thread>(new std::thread(threadMain, selfRef));
-
-    if (detached_)
-      thread_->detach();
-  }
-
-  void join() {
-    if (!detached_ && state_ != uninitialized) {
-      thread_->join();
-    }
-  }
-
-  Thread::id_t getId() { return thread_.get() ? thread_->get_id() : std::thread::id(); }
-
-  boost::shared_ptr<Runnable> runnable() const { return Thread::runnable(); }
-
-  void runnable(boost::shared_ptr<Runnable> value) { Thread::runnable(value); }
-};
-
-void StdThread::threadMain(boost::shared_ptr<StdThread> thread) {
-  if (thread == NULL) {
-    return;
-  }
-
-  if (thread->state_ != starting) {
-    return;
-  }
-
-  thread->state_ = started;
-  thread->runnable()->run();
-
-  if (thread->state_ != stopping && thread->state_ != stopped) {
-    thread->state_ = stopping;
-  }
-
-  return;
-}
-
-StdThreadFactory::StdThreadFactory(bool detached) : ThreadFactory(detached) {
-}
-
-boost::shared_ptr<Thread> StdThreadFactory::newThread(boost::shared_ptr<Runnable> runnable) const {
-  boost::shared_ptr<StdThread> result = boost::shared_ptr<StdThread>(new StdThread(isDetached(), runnable));
-  runnable->thread(result);
-  return result;
-}
-
-Thread::id_t StdThreadFactory::getCurrentThreadId() const {
-  return std::this_thread::get_id();
-}
-}
-}
-} // apache::thrift::concurrency
-
-#endif // USE_STD_THREAD
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdThreadFactory.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdThreadFactory.h
deleted file mode 100644
index 88f00be..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/StdThreadFactory.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_STDTHREADFACTORY_H_
-#define _THRIFT_CONCURRENCY_STDTHREADFACTORY_H_ 1
-
-#include <thrift/concurrency/Thread.h>
-
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * A thread factory to create std::threads.
- *
- * @version $Id:$
- */
-class StdThreadFactory : public ThreadFactory {
-
-public:
-  /**
-   * Std thread factory.  All threads created by a factory are reference-counted
-   * via boost::shared_ptr and boost::weak_ptr.  The factory guarantees that threads and
-   * the Runnable tasks they host will be properly cleaned up once the last strong reference
-   * to both is given up.
-   *
-   * By default threads are not joinable.
-   */
-
-  StdThreadFactory(bool detached = true);
-
-  // From ThreadFactory;
-  boost::shared_ptr<Thread> newThread(boost::shared_ptr<Runnable> runnable) const;
-
-  // From ThreadFactory;
-  Thread::id_t getCurrentThreadId() const;
-};
-
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_STDTHREADFACTORY_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Thread.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Thread.h
deleted file mode 100644
index 2e15489..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Thread.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_THREAD_H_
-#define _THRIFT_CONCURRENCY_THREAD_H_ 1
-
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
-#include <thrift/thrift-config.h>
-
-#if USE_BOOST_THREAD
-#include <boost/thread.hpp>
-#elif USE_STD_THREAD
-#include <thread>
-#else
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#endif
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-class Thread;
-
-/**
- * Minimal runnable class.  More or less analogous to java.lang.Runnable.
- *
- * @version $Id:$
- */
-class Runnable {
-
-public:
-  virtual ~Runnable(){};
-  virtual void run() = 0;
-
-  /**
-   * Gets the thread object that is hosting this runnable object  - can return
-   * an empty boost::shared pointer if no references remain on that thread object
-   */
-  virtual boost::shared_ptr<Thread> thread() { return thread_.lock(); }
-
-  /**
-   * Sets the thread that is executing this object.  This is only meant for
-   * use by concrete implementations of Thread.
-   */
-  virtual void thread(boost::shared_ptr<Thread> value) { thread_ = value; }
-
-private:
-  boost::weak_ptr<Thread> thread_;
-};
-
-/**
- * Minimal thread class. Returned by thread factory bound to a Runnable object
- * and ready to start execution.  More or less analogous to java.lang.Thread
- * (minus all the thread group, priority, mode and other baggage, since that
- * is difficult to abstract across platforms and is left for platform-specific
- * ThreadFactory implemtations to deal with
- *
- * @see apache::thrift::concurrency::ThreadFactory)
- */
-class Thread {
-
-public:
-#if USE_BOOST_THREAD
-  typedef boost::thread::id id_t;
-
-  static inline bool is_current(id_t t) { return t == boost::this_thread::get_id(); }
-  static inline id_t get_current() { return boost::this_thread::get_id(); }
-#elif USE_STD_THREAD
-  typedef std::thread::id id_t;
-
-  static inline bool is_current(id_t t) { return t == std::this_thread::get_id(); }
-  static inline id_t get_current() { return std::this_thread::get_id(); }
-#else
-  typedef pthread_t id_t;
-
-  static inline bool is_current(id_t t) { return pthread_equal(pthread_self(), t); }
-  static inline id_t get_current() { return pthread_self(); }
-#endif
-
-  virtual ~Thread(){};
-
-  /**
-   * Starts the thread. Does platform specific thread creation and
-   * configuration then invokes the run method of the Runnable object bound
-   * to this thread.
-   */
-  virtual void start() = 0;
-
-  /**
-   * Join this thread. If this thread is joinable, the calling thread blocks
-   * until this thread completes.  If the target thread is not joinable, then
-   * nothing happens.
-   */
-  virtual void join() = 0;
-
-  /**
-   * Gets the thread's platform-specific ID
-   */
-  virtual id_t getId() = 0;
-
-  /**
-   * Gets the runnable object this thread is hosting
-   */
-  virtual boost::shared_ptr<Runnable> runnable() const { return _runnable; }
-
-protected:
-  virtual void runnable(boost::shared_ptr<Runnable> value) { _runnable = value; }
-
-private:
-  boost::shared_ptr<Runnable> _runnable;
-};
-
-/**
- * Factory to create platform-specific thread object and bind them to Runnable
- * object for execution
- */
-class ThreadFactory {
-protected:
-  ThreadFactory(bool detached) : detached_(detached) { }
-
-public:
-  virtual ~ThreadFactory() { }
-
-  /**
-   * Gets current detached mode
-   */
-  bool isDetached() const { return detached_; }
-
-  /**
-   * Sets the detached disposition of newly created threads.
-   */
-  void setDetached(bool detached) { detached_ = detached; }
-
-  /**
-   * Create a new thread.
-   */
-  virtual boost::shared_ptr<Thread> newThread(boost::shared_ptr<Runnable> runnable) const = 0;
-
-  /**
-   * Gets the current thread id or unknown_thread_id if the current thread is not a thrift thread
-   */
-  virtual Thread::id_t getCurrentThreadId() const = 0;
-
-  /**
-   * For code readability define the unknown/undefined thread id
-   */
-  static const Thread::id_t unknown_thread_id;
-
-private:
-  bool detached_;
-};
-
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_THREAD_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/ThreadManager.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/ThreadManager.cpp
deleted file mode 100644
index c4726dd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/ThreadManager.cpp
+++ /dev/null
@@ -1,588 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/concurrency/Exception.h>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/Util.h>
-
-#include <boost/shared_ptr.hpp>
-
-#include <stdexcept>
-#include <deque>
-#include <set>
-
-#if defined(DEBUG)
-#include <iostream>
-#endif // defined(DEBUG)
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-
-/**
- * ThreadManager class
- *
- * This class manages a pool of threads. It uses a ThreadFactory to create
- * threads.  It never actually creates or destroys worker threads, rather
- * it maintains statistics on number of idle threads, number of active threads,
- * task backlog, and average wait and service times.
- *
- * There are three different monitors used for signaling different conditions
- * however they all share the same mutex_.
- *
- * @version $Id:$
- */
-class ThreadManager::Impl : public ThreadManager {
-
-public:
-  Impl()
-    : workerCount_(0),
-      workerMaxCount_(0),
-      idleCount_(0),
-      pendingTaskCountMax_(0),
-      expiredCount_(0),
-      state_(ThreadManager::UNINITIALIZED),
-      monitor_(&mutex_),
-      maxMonitor_(&mutex_),
-      workerMonitor_(&mutex_) {}
-
-  ~Impl() { stop(); }
-
-  void start();
-  void stop();
-
-  ThreadManager::STATE state() const { return state_; }
-
-  shared_ptr<ThreadFactory> threadFactory() const {
-    Guard g(mutex_);
-    return threadFactory_;
-  }
-
-  void threadFactory(shared_ptr<ThreadFactory> value) {
-    Guard g(mutex_);
-    if (threadFactory_ && threadFactory_->isDetached() != value->isDetached()) {
-      throw InvalidArgumentException();
-    }
-    threadFactory_ = value;
-  }
-
-  void addWorker(size_t value);
-
-  void removeWorker(size_t value);
-
-  size_t idleWorkerCount() const { return idleCount_; }
-
-  size_t workerCount() const {
-    Guard g(mutex_);
-    return workerCount_;
-  }
-
-  size_t pendingTaskCount() const {
-    Guard g(mutex_);
-    return tasks_.size();
-  }
-
-  size_t totalTaskCount() const {
-    Guard g(mutex_);
-    return tasks_.size() + workerCount_ - idleCount_;
-  }
-
-  size_t pendingTaskCountMax() const {
-    Guard g(mutex_);
-    return pendingTaskCountMax_;
-  }
-
-  size_t expiredTaskCount() {
-    Guard g(mutex_);
-    return expiredCount_;
-  }
-
-  void pendingTaskCountMax(const size_t value) {
-    Guard g(mutex_);
-    pendingTaskCountMax_ = value;
-  }
-
-  void add(shared_ptr<Runnable> value, int64_t timeout, int64_t expiration);
-
-  void remove(shared_ptr<Runnable> task);
-
-  shared_ptr<Runnable> removeNextPending();
-
-  void removeExpiredTasks() {
-    removeExpired(false);
-  }
-
-  void setExpireCallback(ExpireCallback expireCallback);
-
-private:
-  /**
-   * Remove one or more expired tasks.
-   * \param[in]  justOne  if true, try to remove just one task and return
-   */
-  void removeExpired(bool justOne);
-
-  /**
-   * \returns whether it is acceptable to block, depending on the current thread id
-   */
-  bool canSleep() const;
-
-  /**
-   * Lowers the maximum worker count and blocks until enough worker threads complete
-   * to get to the new maximum worker limit.  The caller is responsible for acquiring
-   * a lock on the class mutex_.
-   */
-  void removeWorkersUnderLock(size_t value);
-
-  size_t workerCount_;
-  size_t workerMaxCount_;
-  size_t idleCount_;
-  size_t pendingTaskCountMax_;
-  size_t expiredCount_;
-  ExpireCallback expireCallback_;
-
-  ThreadManager::STATE state_;
-  shared_ptr<ThreadFactory> threadFactory_;
-
-  friend class ThreadManager::Task;
-  typedef std::deque<shared_ptr<Task> > TaskQueue;
-  TaskQueue tasks_;
-  Mutex mutex_;
-  Monitor monitor_;
-  Monitor maxMonitor_;
-  Monitor workerMonitor_;       // used to synchronize changes in worker count
-
-  friend class ThreadManager::Worker;
-  std::set<shared_ptr<Thread> > workers_;
-  std::set<shared_ptr<Thread> > deadWorkers_;
-  std::map<const Thread::id_t, shared_ptr<Thread> > idMap_;
-};
-
-class ThreadManager::Task : public Runnable {
-
-public:
-  enum STATE { WAITING, EXECUTING, TIMEDOUT, COMPLETE };
-
-  Task(shared_ptr<Runnable> runnable, int64_t expiration = 0LL)
-    : runnable_(runnable),
-      state_(WAITING),
-      expireTime_(expiration != 0LL ? Util::currentTime() + expiration : 0LL) {}
-
-  ~Task() {}
-
-  void run() {
-    if (state_ == EXECUTING) {
-      runnable_->run();
-      state_ = COMPLETE;
-    }
-  }
-
-  shared_ptr<Runnable> getRunnable() { return runnable_; }
-
-  int64_t getExpireTime() const { return expireTime_; }
-
-private:
-  shared_ptr<Runnable> runnable_;
-  friend class ThreadManager::Worker;
-  STATE state_;
-  int64_t expireTime_;
-};
-
-class ThreadManager::Worker : public Runnable {
-  enum STATE { UNINITIALIZED, STARTING, STARTED, STOPPING, STOPPED };
-
-public:
-  Worker(ThreadManager::Impl* manager) : manager_(manager), state_(UNINITIALIZED) {}
-
-  ~Worker() {}
-
-private:
-  bool isActive() const {
-    return (manager_->workerCount_ <= manager_->workerMaxCount_)
-           || (manager_->state_ == JOINING && !manager_->tasks_.empty());
-  }
-
-public:
-  /**
-   * Worker entry point
-   *
-   * As long as worker thread is running, pull tasks off the task queue and
-   * execute.
-   */
-  void run() {
-    Guard g(manager_->mutex_);
-
-    /**
-     * This method has three parts; one is to check for and account for
-     * admitting a task which happens under a lock.  Then the lock is released
-     * and the task itself is executed.  Finally we do some accounting
-     * under lock again when the task completes.
-     */
-
-    /**
-     * Admitting
-     */
-
-    /**
-     * Increment worker semaphore and notify manager if worker count reached
-     * desired max
-     */
-    bool active = manager_->workerCount_ < manager_->workerMaxCount_;
-    if (active) {
-      if (++manager_->workerCount_ == manager_->workerMaxCount_) {
-        manager_->workerMonitor_.notify();
-      }
-    }
-
-    while (active) {
-      /**
-        * While holding manager monitor block for non-empty task queue (Also
-        * check that the thread hasn't been requested to stop). Once the queue
-        * is non-empty, dequeue a task, release monitor, and execute. If the
-        * worker max count has been decremented such that we exceed it, mark
-        * ourself inactive, decrement the worker count and notify the manager
-        * (technically we're notifying the next blocked thread but eventually
-        * the manager will see it.
-        */
-      active = isActive();
-
-      while (active && manager_->tasks_.empty()) {
-        manager_->idleCount_++;
-        manager_->monitor_.wait();
-        active = isActive();
-        manager_->idleCount_--;
-      }
-
-      shared_ptr<ThreadManager::Task> task;
-
-      if (active) {
-        if (!manager_->tasks_.empty()) {
-          task = manager_->tasks_.front();
-          manager_->tasks_.pop_front();
-          if (task->state_ == ThreadManager::Task::WAITING) {
-            // If the state is changed to anything other than EXECUTING or TIMEDOUT here
-            // then the execution loop needs to be changed below.
-            task->state_ =
-                (task->getExpireTime() && task->getExpireTime() < Util::currentTime()) ?
-                    ThreadManager::Task::TIMEDOUT :
-                    ThreadManager::Task::EXECUTING;
-          }
-        }
-
-        /* If we have a pending task max and we just dropped below it, wakeup any
-            thread that might be blocked on add. */
-        if (manager_->pendingTaskCountMax_ != 0
-            && manager_->tasks_.size() <= manager_->pendingTaskCountMax_ - 1) {
-          manager_->maxMonitor_.notify();
-        }
-      }
-
-      /**
-       * Execution - not holding a lock
-       */
-      if (task) {
-        if (task->state_ == ThreadManager::Task::EXECUTING) {
-
-          // Release the lock so we can run the task without blocking the thread manager
-          manager_->mutex_.unlock();
-
-          try {
-            task->run();
-          } catch (const std::exception& e) {
-            GlobalOutput.printf("[ERROR] task->run() raised an exception: %s", e.what());
-          } catch (...) {
-            GlobalOutput.printf("[ERROR] task->run() raised an unknown exception");
-          }
-
-          // Re-acquire the lock to proceed in the thread manager
-          manager_->mutex_.lock();
-
-        } else if (manager_->expireCallback_) {
-          // The only other state the task could have been in is TIMEDOUT (see above)
-          manager_->expireCallback_(task->getRunnable());
-          manager_->expiredCount_++;
-        }
-      }
-    }
-
-    /**
-     * Final accounting for the worker thread that is done working
-     */
-    manager_->deadWorkers_.insert(this->thread());
-    if (--manager_->workerCount_ == manager_->workerMaxCount_) {
-      manager_->workerMonitor_.notify();
-    }
-  }
-
-private:
-  ThreadManager::Impl* manager_;
-  friend class ThreadManager::Impl;
-  STATE state_;
-};
-
-void ThreadManager::Impl::addWorker(size_t value) {
-  std::set<shared_ptr<Thread> > newThreads;
-  for (size_t ix = 0; ix < value; ix++) {
-    shared_ptr<ThreadManager::Worker> worker
-        = shared_ptr<ThreadManager::Worker>(new ThreadManager::Worker(this));
-    newThreads.insert(threadFactory_->newThread(worker));
-  }
-
-  Guard g(mutex_);
-  workerMaxCount_ += value;
-  workers_.insert(newThreads.begin(), newThreads.end());
-
-  for (std::set<shared_ptr<Thread> >::iterator ix = newThreads.begin(); ix != newThreads.end();
-       ++ix) {
-    shared_ptr<ThreadManager::Worker> worker
-        = dynamic_pointer_cast<ThreadManager::Worker, Runnable>((*ix)->runnable());
-    worker->state_ = ThreadManager::Worker::STARTING;
-    (*ix)->start();
-    idMap_.insert(std::pair<const Thread::id_t, shared_ptr<Thread> >((*ix)->getId(), *ix));
-  }
-
-  while (workerCount_ != workerMaxCount_) {
-    workerMonitor_.wait();
-  }
-}
-
-void ThreadManager::Impl::start() {
-  Guard g(mutex_);
-  if (state_ == ThreadManager::STOPPED) {
-    return;
-  }
-
-  if (state_ == ThreadManager::UNINITIALIZED) {
-    if (!threadFactory_) {
-      throw InvalidArgumentException();
-    }
-    state_ = ThreadManager::STARTED;
-    monitor_.notifyAll();
-  }
-
-  while (state_ == STARTING) {
-    monitor_.wait();
-  }
-}
-
-void ThreadManager::Impl::stop() {
-  Guard g(mutex_);
-  bool doStop = false;
-
-  if (state_ != ThreadManager::STOPPING && state_ != ThreadManager::JOINING
-      && state_ != ThreadManager::STOPPED) {
-    doStop = true;
-    state_ = ThreadManager::JOINING;
-  }
-
-  if (doStop) {
-    removeWorkersUnderLock(workerCount_);
-  }
-
-  state_ = ThreadManager::STOPPED;
-}
-
-void ThreadManager::Impl::removeWorker(size_t value) {
-  Guard g(mutex_);
-  removeWorkersUnderLock(value);
-}
-
-void ThreadManager::Impl::removeWorkersUnderLock(size_t value) {
-  if (value > workerMaxCount_) {
-    throw InvalidArgumentException();
-  }
-
-  workerMaxCount_ -= value;
-
-  if (idleCount_ > value) {
-    // There are more idle workers than we need to remove,
-    // so notify enough of them so they can terminate.
-    for (size_t ix = 0; ix < value; ix++) {
-      monitor_.notify();
-    }
-  } else {
-    // There are as many or less idle workers than we need to remove,
-    // so just notify them all so they can terminate.
-    monitor_.notifyAll();
-  }
-
-  while (workerCount_ != workerMaxCount_) {
-    workerMonitor_.wait();
-  }
-
-  for (std::set<shared_ptr<Thread> >::iterator ix = deadWorkers_.begin();
-       ix != deadWorkers_.end();
-       ++ix) {
-
-    // when used with a joinable thread factory, we join the threads as we remove them
-    if (!threadFactory_->isDetached()) {
-      (*ix)->join();
-    }
-
-    idMap_.erase((*ix)->getId());
-    workers_.erase(*ix);
-  }
-
-  deadWorkers_.clear();
-}
-
-bool ThreadManager::Impl::canSleep() const {
-  const Thread::id_t id = threadFactory_->getCurrentThreadId();
-  return idMap_.find(id) == idMap_.end();
-}
-
-void ThreadManager::Impl::add(shared_ptr<Runnable> value, int64_t timeout, int64_t expiration) {
-  Guard g(mutex_, timeout);
-
-  if (!g) {
-    throw TimedOutException();
-  }
-
-  if (state_ != ThreadManager::STARTED) {
-    throw IllegalStateException(
-        "ThreadManager::Impl::add ThreadManager "
-        "not started");
-  }
-
-  // if we're at a limit, remove an expired task to see if the limit clears
-  if (pendingTaskCountMax_ > 0 && (tasks_.size() >= pendingTaskCountMax_)) {
-    removeExpired(true);
-  }
-
-  if (pendingTaskCountMax_ > 0 && (tasks_.size() >= pendingTaskCountMax_)) {
-    if (canSleep() && timeout >= 0) {
-      while (pendingTaskCountMax_ > 0 && tasks_.size() >= pendingTaskCountMax_) {
-        // This is thread safe because the mutex is shared between monitors.
-        maxMonitor_.wait(timeout);
-      }
-    } else {
-      throw TooManyPendingTasksException();
-    }
-  }
-
-  tasks_.push_back(shared_ptr<ThreadManager::Task>(new ThreadManager::Task(value, expiration)));
-
-  // If idle thread is available notify it, otherwise all worker threads are
-  // running and will get around to this task in time.
-  if (idleCount_ > 0) {
-    monitor_.notify();
-  }
-}
-
-void ThreadManager::Impl::remove(shared_ptr<Runnable> task) {
-  Guard g(mutex_);
-  if (state_ != ThreadManager::STARTED) {
-    throw IllegalStateException(
-        "ThreadManager::Impl::remove ThreadManager not "
-        "started");
-  }
-
-  for (TaskQueue::iterator it = tasks_.begin(); it != tasks_.end(); ++it)
-  {
-    if ((*it)->getRunnable() == task)
-    {
-      tasks_.erase(it);
-      return;
-    }
-  }
-}
-
-boost::shared_ptr<Runnable> ThreadManager::Impl::removeNextPending() {
-  Guard g(mutex_);
-  if (state_ != ThreadManager::STARTED) {
-    throw IllegalStateException(
-        "ThreadManager::Impl::removeNextPending "
-        "ThreadManager not started");
-  }
-
-  if (tasks_.empty()) {
-    return boost::shared_ptr<Runnable>();
-  }
-
-  shared_ptr<ThreadManager::Task> task = tasks_.front();
-  tasks_.pop_front();
-
-  return task->getRunnable();
-}
-
-void ThreadManager::Impl::removeExpired(bool justOne) {
-  // this is always called under a lock
-  int64_t now = 0LL;
-
-  for (TaskQueue::iterator it = tasks_.begin(); it != tasks_.end(); )
-  {
-    if (now == 0LL) {
-      now = Util::currentTime();
-    }
-
-    if ((*it)->getExpireTime() > 0LL && (*it)->getExpireTime() < now) {
-      if (expireCallback_) {
-        expireCallback_((*it)->getRunnable());
-      }
-      it = tasks_.erase(it);
-      ++expiredCount_;
-      if (justOne) {
-        return;
-      }
-    }
-    else
-    {
-      ++it;
-    }
-  }
-}
-
-void ThreadManager::Impl::setExpireCallback(ExpireCallback expireCallback) {
-  Guard g(mutex_);
-  expireCallback_ = expireCallback;
-}
-
-class SimpleThreadManager : public ThreadManager::Impl {
-
-public:
-  SimpleThreadManager(size_t workerCount = 4, size_t pendingTaskCountMax = 0)
-    : workerCount_(workerCount), pendingTaskCountMax_(pendingTaskCountMax) {}
-
-  void start() {
-    ThreadManager::Impl::pendingTaskCountMax(pendingTaskCountMax_);
-    ThreadManager::Impl::start();
-    addWorker(workerCount_);
-  }
-
-private:
-  const size_t workerCount_;
-  const size_t pendingTaskCountMax_;
-};
-
-shared_ptr<ThreadManager> ThreadManager::newThreadManager() {
-  return shared_ptr<ThreadManager>(new ThreadManager::Impl());
-}
-
-shared_ptr<ThreadManager> ThreadManager::newSimpleThreadManager(size_t count,
-                                                                size_t pendingTaskCountMax) {
-  return shared_ptr<ThreadManager>(new SimpleThreadManager(count, pendingTaskCountMax));
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/ThreadManager.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/ThreadManager.h
deleted file mode 100644
index d8bf71b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/ThreadManager.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_THREADMANAGER_H_
-#define _THRIFT_CONCURRENCY_THREADMANAGER_H_ 1
-
-#include <boost/shared_ptr.hpp>
-#include <thrift/cxxfunctional.h>
-#include <sys/types.h>
-#include <thrift/concurrency/Thread.h>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * Thread Pool Manager and related classes
- *
- * @version $Id:$
- */
-class ThreadManager;
-
-/**
- * ThreadManager class
- *
- * This class manages a pool of threads. It uses a ThreadFactory to create
- * threads. It never actually creates or destroys worker threads, rather
- * it maintains statistics on number of idle threads, number of active threads,
- * task backlog, and average wait and service times and informs the PoolPolicy
- * object bound to instances of this manager of interesting transitions. It is
- * then up the PoolPolicy object to decide if the thread pool size needs to be
- * adjusted and call this object addWorker and removeWorker methods to make
- * changes.
- *
- * This design allows different policy implementations to use this code to
- * handle basic worker thread management and worker task execution and focus on
- * policy issues. The simplest policy, StaticPolicy, does nothing other than
- * create a fixed number of threads.
- */
-class ThreadManager {
-
-protected:
-  ThreadManager() {}
-
-public:
-  typedef apache::thrift::stdcxx::function<void(boost::shared_ptr<Runnable>)> ExpireCallback;
-
-  virtual ~ThreadManager() {}
-
-  /**
-   * Starts the thread manager. Verifies all attributes have been properly
-   * initialized, then allocates necessary resources to begin operation
-   */
-  virtual void start() = 0;
-
-  /**
-   * Stops the thread manager. Aborts all remaining unprocessed task, shuts
-   * down all created worker threads, and releases all allocated resources.
-   * This method blocks for all worker threads to complete, thus it can
-   * potentially block forever if a worker thread is running a task that
-   * won't terminate.
-   *
-   * Worker threads will be joined depending on the threadFactory's detached
-   * disposition.
-   */
-  virtual void stop() = 0;
-
-  enum STATE { UNINITIALIZED, STARTING, STARTED, JOINING, STOPPING, STOPPED };
-
-  virtual STATE state() const = 0;
-
-  /**
-   * \returns the current thread factory
-   */
-  virtual boost::shared_ptr<ThreadFactory> threadFactory() const = 0;
-
-  /**
-   * Set the thread factory.
-   * \throws InvalidArgumentException if the new thread factory has a different
-   *                                  detached disposition than the one replacing it
-   */
-  virtual void threadFactory(boost::shared_ptr<ThreadFactory> value) = 0;
-
-  /**
-   * Adds worker thread(s).
-   */
-  virtual void addWorker(size_t value = 1) = 0;
-
-  /**
-   * Removes worker thread(s).
-   * Threads are joined if the thread factory detached disposition allows it.
-   * Blocks until the number of worker threads reaches the new limit.
-   * \param[in]  value  the number to remove
-   * \throws InvalidArgumentException if the value is greater than the number
-   *                                  of workers
-   */
-  virtual void removeWorker(size_t value = 1) = 0;
-
-  /**
-   * Gets the current number of idle worker threads
-   */
-  virtual size_t idleWorkerCount() const = 0;
-
-  /**
-   * Gets the current number of total worker threads
-   */
-  virtual size_t workerCount() const = 0;
-
-  /**
-   * Gets the current number of pending tasks
-   */
-  virtual size_t pendingTaskCount() const = 0;
-
-  /**
-   * Gets the current number of pending and executing tasks
-   */
-  virtual size_t totalTaskCount() const = 0;
-
-  /**
-   * Gets the maximum pending task count.  0 indicates no maximum
-   */
-  virtual size_t pendingTaskCountMax() const = 0;
-
-  /**
-   * Gets the number of tasks which have been expired without being run
-   * since start() was called.
-   */
-  virtual size_t expiredTaskCount() = 0;
-
-  /**
-   * Adds a task to be executed at some time in the future by a worker thread.
-   *
-   * This method will block if pendingTaskCountMax() in not zero and pendingTaskCount()
-   * is greater than or equalt to pendingTaskCountMax().  If this method is called in the
-   * context of a ThreadManager worker thread it will throw a
-   * TooManyPendingTasksException
-   *
-   * @param task  The task to queue for execution
-   *
-   * @param timeout Time to wait in milliseconds to add a task when a pending-task-count
-   * is specified. Specific cases:
-   * timeout = 0  : Wait forever to queue task.
-   * timeout = -1 : Return immediately if pending task count exceeds specified max
-   * @param expiration when nonzero, the number of milliseconds the task is valid
-   * to be run; if exceeded, the task will be dropped off the queue and not run.
-   *
-   * @throws TooManyPendingTasksException Pending task count exceeds max pending task count
-   */
-  virtual void add(boost::shared_ptr<Runnable> task,
-                   int64_t timeout = 0LL,
-                   int64_t expiration = 0LL) = 0;
-
-  /**
-   * Removes a pending task
-   */
-  virtual void remove(boost::shared_ptr<Runnable> task) = 0;
-
-  /**
-   * Remove the next pending task which would be run.
-   *
-   * @return the task removed.
-   */
-  virtual boost::shared_ptr<Runnable> removeNextPending() = 0;
-
-  /**
-   * Remove tasks from front of task queue that have expired.
-   */
-  virtual void removeExpiredTasks() = 0;
-
-  /**
-   * Set a callback to be called when a task is expired and not run.
-   *
-   * @param expireCallback a function called with the shared_ptr<Runnable> for
-   * the expired task.
-   */
-  virtual void setExpireCallback(ExpireCallback expireCallback) = 0;
-
-  static boost::shared_ptr<ThreadManager> newThreadManager();
-
-  /**
-   * Creates a simple thread manager the uses count number of worker threads and has
-   * a pendingTaskCountMax maximum pending tasks. The default, 0, specified no limit
-   * on pending tasks
-   */
-  static boost::shared_ptr<ThreadManager> newSimpleThreadManager(size_t count = 4,
-                                                                 size_t pendingTaskCountMax = 0);
-
-  class Task;
-
-  class Worker;
-
-  class Impl;
-};
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_THREADMANAGER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/TimerManager.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/TimerManager.cpp
deleted file mode 100644
index f95fcda..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/TimerManager.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/concurrency/TimerManager.h>
-#include <thrift/concurrency/Exception.h>
-#include <thrift/concurrency/Util.h>
-
-#include <assert.h>
-#include <iostream>
-#include <set>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-using boost::shared_ptr;
-
-/**
- * TimerManager class
- *
- * @version $Id:$
- */
-class TimerManager::Task : public Runnable {
-
-public:
-  enum STATE { WAITING, EXECUTING, CANCELLED, COMPLETE };
-
-  Task(shared_ptr<Runnable> runnable) : runnable_(runnable), state_(WAITING) {}
-
-  ~Task() {}
-
-  void run() {
-    if (state_ == EXECUTING) {
-      runnable_->run();
-      state_ = COMPLETE;
-    }
-  }
-
-private:
-  shared_ptr<Runnable> runnable_;
-  friend class TimerManager::Dispatcher;
-  STATE state_;
-};
-
-class TimerManager::Dispatcher : public Runnable {
-
-public:
-  Dispatcher(TimerManager* manager) : manager_(manager) {}
-
-  ~Dispatcher() {}
-
-  /**
-   * Dispatcher entry point
-   *
-   * As long as dispatcher thread is running, pull tasks off the task taskMap_
-   * and execute.
-   */
-  void run() {
-    {
-      Synchronized s(manager_->monitor_);
-      if (manager_->state_ == TimerManager::STARTING) {
-        manager_->state_ = TimerManager::STARTED;
-        manager_->monitor_.notifyAll();
-      }
-    }
-
-    do {
-      std::set<shared_ptr<TimerManager::Task> > expiredTasks;
-      {
-        Synchronized s(manager_->monitor_);
-        task_iterator expiredTaskEnd;
-        int64_t now = Util::currentTime();
-        while (manager_->state_ == TimerManager::STARTED
-               && (expiredTaskEnd = manager_->taskMap_.upper_bound(now))
-                  == manager_->taskMap_.begin()) {
-          int64_t timeout = 0LL;
-          if (!manager_->taskMap_.empty()) {
-            timeout = manager_->taskMap_.begin()->first - now;
-          }
-          assert((timeout != 0 && manager_->taskCount_ > 0)
-                 || (timeout == 0 && manager_->taskCount_ == 0));
-          try {
-            manager_->monitor_.wait(timeout);
-          } catch (TimedOutException&) {
-          }
-          now = Util::currentTime();
-        }
-
-        if (manager_->state_ == TimerManager::STARTED) {
-          for (task_iterator ix = manager_->taskMap_.begin(); ix != expiredTaskEnd; ix++) {
-            shared_ptr<TimerManager::Task> task = ix->second;
-            expiredTasks.insert(task);
-            if (task->state_ == TimerManager::Task::WAITING) {
-              task->state_ = TimerManager::Task::EXECUTING;
-            }
-            manager_->taskCount_--;
-          }
-          manager_->taskMap_.erase(manager_->taskMap_.begin(), expiredTaskEnd);
-        }
-      }
-
-      for (std::set<shared_ptr<Task> >::iterator ix = expiredTasks.begin();
-           ix != expiredTasks.end();
-           ++ix) {
-        (*ix)->run();
-      }
-
-    } while (manager_->state_ == TimerManager::STARTED);
-
-    {
-      Synchronized s(manager_->monitor_);
-      if (manager_->state_ == TimerManager::STOPPING) {
-        manager_->state_ = TimerManager::STOPPED;
-        manager_->monitor_.notify();
-      }
-    }
-    return;
-  }
-
-private:
-  TimerManager* manager_;
-  friend class TimerManager;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4355) // 'this' used in base member initializer list
-#endif
-
-TimerManager::TimerManager()
-  : taskCount_(0),
-    state_(TimerManager::UNINITIALIZED),
-    dispatcher_(shared_ptr<Dispatcher>(new Dispatcher(this))) {
-}
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-TimerManager::~TimerManager() {
-
-  // If we haven't been explicitly stopped, do so now.  We don't need to grab
-  // the monitor here, since stop already takes care of reentrancy.
-
-  if (state_ != STOPPED) {
-    try {
-      stop();
-    } catch (...) {
-      // We're really hosed.
-    }
-  }
-}
-
-void TimerManager::start() {
-  bool doStart = false;
-  {
-    Synchronized s(monitor_);
-    if (!threadFactory_) {
-      throw InvalidArgumentException();
-    }
-    if (state_ == TimerManager::UNINITIALIZED) {
-      state_ = TimerManager::STARTING;
-      doStart = true;
-    }
-  }
-
-  if (doStart) {
-    dispatcherThread_ = threadFactory_->newThread(dispatcher_);
-    dispatcherThread_->start();
-  }
-
-  {
-    Synchronized s(monitor_);
-    while (state_ == TimerManager::STARTING) {
-      monitor_.wait();
-    }
-    assert(state_ != TimerManager::STARTING);
-  }
-}
-
-void TimerManager::stop() {
-  bool doStop = false;
-  {
-    Synchronized s(monitor_);
-    if (state_ == TimerManager::UNINITIALIZED) {
-      state_ = TimerManager::STOPPED;
-    } else if (state_ != STOPPING && state_ != STOPPED) {
-      doStop = true;
-      state_ = STOPPING;
-      monitor_.notifyAll();
-    }
-    while (state_ != STOPPED) {
-      monitor_.wait();
-    }
-  }
-
-  if (doStop) {
-    // Clean up any outstanding tasks
-    taskMap_.clear();
-
-    // Remove dispatcher's reference to us.
-    dispatcher_->manager_ = NULL;
-  }
-}
-
-shared_ptr<const ThreadFactory> TimerManager::threadFactory() const {
-  Synchronized s(monitor_);
-  return threadFactory_;
-}
-
-void TimerManager::threadFactory(shared_ptr<const ThreadFactory> value) {
-  Synchronized s(monitor_);
-  threadFactory_ = value;
-}
-
-size_t TimerManager::taskCount() const {
-  return taskCount_;
-}
-
-void TimerManager::add(shared_ptr<Runnable> task, int64_t timeout) {
-  int64_t now = Util::currentTime();
-  timeout += now;
-
-  {
-    Synchronized s(monitor_);
-    if (state_ != TimerManager::STARTED) {
-      throw IllegalStateException();
-    }
-
-    // If the task map is empty, we will kick the dispatcher for sure. Otherwise, we kick him
-    // if the expiration time is shorter than the current value. Need to test before we insert,
-    // because the new task might insert at the front.
-    bool notifyRequired = (taskCount_ == 0) ? true : timeout < taskMap_.begin()->first;
-
-    taskCount_++;
-    taskMap_.insert(
-        std::pair<int64_t, shared_ptr<Task> >(timeout, shared_ptr<Task>(new Task(task))));
-
-    // If the task map was empty, or if we have an expiration that is earlier
-    // than any previously seen, kick the dispatcher so it can update its
-    // timeout
-    if (notifyRequired) {
-      monitor_.notify();
-    }
-  }
-}
-
-void TimerManager::add(shared_ptr<Runnable> task, const struct THRIFT_TIMESPEC& value) {
-
-  int64_t expiration;
-  Util::toMilliseconds(expiration, value);
-
-  int64_t now = Util::currentTime();
-
-  if (expiration < now) {
-    throw InvalidArgumentException();
-  }
-
-  add(task, expiration - now);
-}
-
-void TimerManager::add(shared_ptr<Runnable> task, const struct timeval& value) {
-
-  int64_t expiration;
-  Util::toMilliseconds(expiration, value);
-
-  int64_t now = Util::currentTime();
-
-  if (expiration < now) {
-    throw InvalidArgumentException();
-  }
-
-  add(task, expiration - now);
-}
-
-void TimerManager::remove(shared_ptr<Runnable> task) {
-  (void)task;
-  Synchronized s(monitor_);
-  if (state_ != TimerManager::STARTED) {
-    throw IllegalStateException();
-  }
-}
-
-TimerManager::STATE TimerManager::state() const {
-  return state_;
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/TimerManager.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/TimerManager.h
deleted file mode 100644
index 3946827..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/TimerManager.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_TIMERMANAGER_H_
-#define _THRIFT_CONCURRENCY_TIMERMANAGER_H_ 1
-
-#include <thrift/concurrency/Exception.h>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/Thread.h>
-
-#include <boost/shared_ptr.hpp>
-#include <map>
-#include <time.h>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * Timer Manager
- *
- * This class dispatches timer tasks when they fall due.
- *
- * @version $Id:$
- */
-class TimerManager {
-
-public:
-  TimerManager();
-
-  virtual ~TimerManager();
-
-  virtual boost::shared_ptr<const ThreadFactory> threadFactory() const;
-
-  virtual void threadFactory(boost::shared_ptr<const ThreadFactory> value);
-
-  /**
-   * Starts the timer manager service
-   *
-   * @throws IllegalArgumentException Missing thread factory attribute
-   */
-  virtual void start();
-
-  /**
-   * Stops the timer manager service
-   */
-  virtual void stop();
-
-  virtual size_t taskCount() const;
-
-  /**
-   * Adds a task to be executed at some time in the future by a worker thread.
-   *
-   * @param task The task to execute
-   * @param timeout Time in milliseconds to delay before executing task
-   */
-  virtual void add(boost::shared_ptr<Runnable> task, int64_t timeout);
-
-  /**
-   * Adds a task to be executed at some time in the future by a worker thread.
-   *
-   * @param task The task to execute
-   * @param timeout Absolute time in the future to execute task.
-   */
-  virtual void add(boost::shared_ptr<Runnable> task, const struct THRIFT_TIMESPEC& timeout);
-
-  /**
-   * Adds a task to be executed at some time in the future by a worker thread.
-   *
-   * @param task The task to execute
-   * @param timeout Absolute time in the future to execute task.
-   */
-  virtual void add(boost::shared_ptr<Runnable> task, const struct timeval& timeout);
-
-  /**
-   * Removes a pending task
-   *
-   * @throws NoSuchTaskException Specified task doesn't exist. It was either
-   *                             processed already or this call was made for a
-   *                             task that was never added to this timer
-   *
-   * @throws UncancellableTaskException Specified task is already being
-   *                                    executed or has completed execution.
-   */
-  virtual void remove(boost::shared_ptr<Runnable> task);
-
-  enum STATE { UNINITIALIZED, STARTING, STARTED, STOPPING, STOPPED };
-
-  virtual STATE state() const;
-
-private:
-  boost::shared_ptr<const ThreadFactory> threadFactory_;
-  class Task;
-  friend class Task;
-  std::multimap<int64_t, boost::shared_ptr<Task> > taskMap_;
-  size_t taskCount_;
-  Monitor monitor_;
-  STATE state_;
-  class Dispatcher;
-  friend class Dispatcher;
-  boost::shared_ptr<Dispatcher> dispatcher_;
-  boost::shared_ptr<Thread> dispatcherThread_;
-  typedef std::multimap<int64_t, boost::shared_ptr<TimerManager::Task> >::iterator task_iterator;
-  typedef std::pair<task_iterator, task_iterator> task_range;
-};
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_TIMERMANAGER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Util.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Util.cpp
deleted file mode 100644
index dd6d19f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Util.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/Thrift.h>
-#include <thrift/concurrency/Util.h>
-
-#if defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-int64_t Util::currentTimeTicks(int64_t ticksPerSec) {
-  int64_t result;
-  struct timeval now;
-  int ret = THRIFT_GETTIMEOFDAY(&now, NULL);
-  assert(ret == 0);
-  THRIFT_UNUSED_VARIABLE(ret); // squelching "unused variable" warning
-  toTicks(result, now, ticksPerSec);
-  return result;
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Util.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Util.h
deleted file mode 100644
index 1a91599..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/concurrency/Util.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CONCURRENCY_UTIL_H_
-#define _THRIFT_CONCURRENCY_UTIL_H_ 1
-
-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <time.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <thrift/transport/PlatformSocket.h>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-
-/**
- * Utility methods
- *
- * This class contains basic utility methods for converting time formats,
- * and other common platform-dependent concurrency operations.
- * It should not be included in API headers for other concurrency library
- * headers, since it will, by definition, pull in all sorts of horrid
- * platform dependent stuff.  Rather it should be inluded directly in
- * concurrency library implementation source.
- *
- * @version $Id:$
- */
-class Util {
-
-  static const int64_t NS_PER_S = 1000000000LL;
-  static const int64_t US_PER_S = 1000000LL;
-  static const int64_t MS_PER_S = 1000LL;
-
-  static const int64_t NS_PER_MS = NS_PER_S / MS_PER_S;
-  static const int64_t NS_PER_US = NS_PER_S / US_PER_S;
-  static const int64_t US_PER_MS = US_PER_S / MS_PER_S;
-
-public:
-  /**
-   * Converts millisecond timestamp into a THRIFT_TIMESPEC struct
-   *
-   * @param struct THRIFT_TIMESPEC& result
-   * @param time or duration in milliseconds
-   */
-  static void toTimespec(struct THRIFT_TIMESPEC& result, int64_t value) {
-    result.tv_sec = value / MS_PER_S;                // ms to s
-    result.tv_nsec = (value % MS_PER_S) * NS_PER_MS; // ms to ns
-  }
-
-  static void toTimeval(struct timeval& result, int64_t value) {
-    result.tv_sec = static_cast<uint32_t>(value / MS_PER_S);                // ms to s
-    result.tv_usec = static_cast<uint32_t>((value % MS_PER_S) * US_PER_MS); // ms to us
-  }
-
-  static void toTicks(int64_t& result,
-                      int64_t secs,
-                      int64_t oldTicks,
-                      int64_t oldTicksPerSec,
-                      int64_t newTicksPerSec) {
-    result = secs * newTicksPerSec;
-    result += oldTicks * newTicksPerSec / oldTicksPerSec;
-
-    int64_t oldPerNew = oldTicksPerSec / newTicksPerSec;
-    if (oldPerNew && ((oldTicks % oldPerNew) >= (oldPerNew / 2))) {
-      ++result;
-    }
-  }
-  /**
-   * Converts struct THRIFT_TIMESPEC to arbitrary-sized ticks since epoch
-   */
-  static void toTicks(int64_t& result, const struct THRIFT_TIMESPEC& value, int64_t ticksPerSec) {
-    return toTicks(result, value.tv_sec, value.tv_nsec, NS_PER_S, ticksPerSec);
-  }
-
-  /**
-   * Converts struct timeval to arbitrary-sized ticks since epoch
-   */
-  static void toTicks(int64_t& result, const struct timeval& value, int64_t ticksPerSec) {
-    return toTicks(result, (unsigned long)value.tv_sec, (unsigned long)value.tv_usec, US_PER_S, ticksPerSec);
-  }
-
-  /**
-   * Converts struct THRIFT_TIMESPEC to milliseconds
-   */
-  static void toMilliseconds(int64_t& result, const struct THRIFT_TIMESPEC& value) {
-    return toTicks(result, value, MS_PER_S);
-  }
-
-  /**
-   * Converts struct timeval to milliseconds
-   */
-  static void toMilliseconds(int64_t& result, const struct timeval& value) {
-    return toTicks(result, value, MS_PER_S);
-  }
-
-  /**
-   * Converts struct THRIFT_TIMESPEC to microseconds
-   */
-  static void toUsec(int64_t& result, const struct THRIFT_TIMESPEC& value) {
-    return toTicks(result, value, US_PER_S);
-  }
-
-  /**
-   * Converts struct timeval to microseconds
-   */
-  static void toUsec(int64_t& result, const struct timeval& value) {
-    return toTicks(result, value, US_PER_S);
-  }
-
-  /**
-   * Get current time as a number of arbitrary-size ticks from epoch
-   */
-  static int64_t currentTimeTicks(int64_t ticksPerSec);
-
-  /**
-   * Get current time as milliseconds from epoch
-   */
-  static int64_t currentTime() { return currentTimeTicks(MS_PER_S); }
-
-  /**
-   * Get current time as micros from epoch
-   */
-  static int64_t currentTimeUsec() { return currentTimeTicks(US_PER_S); }
-};
-}
-}
-} // apache::thrift::concurrency
-
-#endif // #ifndef _THRIFT_CONCURRENCY_UTIL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/cxxfunctional.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/cxxfunctional.h
deleted file mode 100644
index 32933a4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/cxxfunctional.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_CXXFUNCTIONAL_H_
-#define _THRIFT_CXXFUNCTIONAL_H_ 1
-
-// clang-format off
-
-/**
- * Loads <functional> from the 'right' location, depending
- * on compiler and whether or not it's using C++03 with TR1
- * or C++11.
- */
-
-/*
- * MSVC 10 and 11 have the <functional> stuff at <functional>.
- * In MSVC 10 all of the implementations live in std::tr1.
- * In MSVC 11 all of the implementations live in std, with aliases
- *  in std::tr1 to point to the ones in std.
- */
-#if defined(_WIN32) && !defined(__MINGW32__)
-  #define _THRIFT_USING_MICROSOFT_STDLIB 1
-#endif
-
-#ifdef __clang__
-  /* Clang has two options, depending on standard library:
-   * - no -stdlib or -stdlib=libstdc++ set; uses GNU libstdc++.
-   *    <tr1/functional>
-   * - -stdlib=libc++; uses LLVM libc++.
-   *    <functional>, no 'std::tr1'.
-   *
-   * The compiler itself doesn't define anything differently
-   * depending on the value of -stdlib, but the library headers
-   * will set different preprocessor options. In order to check,
-   * though, we have to pull in some library header.
-   */
-  #include <utility>
-
-  /* With LLVM libc++, utility pulls in __config, which sets
-     _LIBCPP_VERSION. */
-  #if defined(_LIBCPP_VERSION)
-    #define _THRIFT_USING_CLANG_LIBCXX 1
-
-  /* With GNU libstdc++, utility pulls in bits/c++config.h,
-     which sets __GLIBCXX__. */
-  #elif defined(__GLIBCXX__)
-    #define _THRIFT_USING_GNU_LIBSTDCXX 1
-
-  /* No idea. */
-  #else
-    #error Unable to detect which C++ standard library is in use.
-  #endif
-#elif __GNUC__
-  #define _THRIFT_USING_GNU_LIBSTDCXX 1
-#endif
-
-#if _THRIFT_USING_MICROSOFT_STDLIB
-  #include <functional>
-
-  namespace apache { namespace thrift { namespace stdcxx {
-    using ::std::tr1::function;
-    using ::std::tr1::bind;
-
-    namespace placeholders {
-      using ::std::tr1::placeholders::_1;
-      using ::std::tr1::placeholders::_2;
-      using ::std::tr1::placeholders::_3;
-      using ::std::tr1::placeholders::_4;
-      using ::std::tr1::placeholders::_5;
-      using ::std::tr1::placeholders::_6;
-    } // apache::thrift::stdcxx::placeholders
-  }}} // apache::thrift::stdcxx
-
-#elif _THRIFT_USING_CLANG_LIBCXX
-  #include <functional>
-
-  namespace apache { namespace thrift { namespace stdcxx {
-    using ::std::function;
-    using ::std::bind;
-
-    namespace placeholders {
-      using ::std::placeholders::_1;
-      using ::std::placeholders::_2;
-      using ::std::placeholders::_3;
-      using ::std::placeholders::_4;
-      using ::std::placeholders::_5;
-      using ::std::placeholders::_6;
-    } // apache::thrift::stdcxx::placeholders
-  }}} // apache::thrift::stdcxx
-
-#elif _THRIFT_USING_GNU_LIBSTDCXX
-  #ifdef USE_BOOST_THREAD
-    #include <boost/tr1/functional.hpp>
-  #else
-    #include <tr1/functional>
-  #endif
-
-  namespace apache { namespace thrift { namespace stdcxx {
-    using ::std::tr1::function;
-    using ::std::tr1::bind;
-
-    namespace placeholders {
-      using ::std::tr1::placeholders::_1;
-      using ::std::tr1::placeholders::_2;
-      using ::std::tr1::placeholders::_3;
-      using ::std::tr1::placeholders::_4;
-      using ::std::tr1::placeholders::_5;
-      using ::std::tr1::placeholders::_6;
-    } // apache::thrift::stdcxx::placeholders
-  }}} // apache::thrift::stdcxx
-#endif
-
-  // Alias for thrift c++ compatibility namespace
-  namespace tcxx = apache::thrift::stdcxx;
-
-#endif // #ifndef _THRIFT_CXXFUNCTIONAL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/PeekProcessor.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/PeekProcessor.cpp
deleted file mode 100644
index 8c9a463..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/PeekProcessor.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/processor/PeekProcessor.h>
-
-using namespace apache::thrift::transport;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift;
-
-namespace apache {
-namespace thrift {
-namespace processor {
-
-PeekProcessor::PeekProcessor() {
-  memoryBuffer_.reset(new TMemoryBuffer());
-  targetTransport_ = memoryBuffer_;
-}
-PeekProcessor::~PeekProcessor() {
-}
-
-void PeekProcessor::initialize(boost::shared_ptr<TProcessor> actualProcessor,
-                               boost::shared_ptr<TProtocolFactory> protocolFactory,
-                               boost::shared_ptr<TPipedTransportFactory> transportFactory) {
-  actualProcessor_ = actualProcessor;
-  pipedProtocol_ = protocolFactory->getProtocol(targetTransport_);
-  transportFactory_ = transportFactory;
-  transportFactory_->initializeTargetTransport(targetTransport_);
-}
-
-boost::shared_ptr<TTransport> PeekProcessor::getPipedTransport(boost::shared_ptr<TTransport> in) {
-  return transportFactory_->getTransport(in);
-}
-
-void PeekProcessor::setTargetTransport(boost::shared_ptr<TTransport> targetTransport) {
-  targetTransport_ = targetTransport;
-  if (boost::dynamic_pointer_cast<TMemoryBuffer>(targetTransport_)) {
-    memoryBuffer_ = boost::dynamic_pointer_cast<TMemoryBuffer>(targetTransport);
-  } else if (boost::dynamic_pointer_cast<TPipedTransport>(targetTransport_)) {
-    memoryBuffer_ = boost::dynamic_pointer_cast<TMemoryBuffer>(
-        boost::dynamic_pointer_cast<TPipedTransport>(targetTransport_)->getTargetTransport());
-  }
-
-  if (!memoryBuffer_) {
-    throw TException(
-        "Target transport must be a TMemoryBuffer or a TPipedTransport with TMemoryBuffer");
-  }
-}
-
-bool PeekProcessor::process(boost::shared_ptr<TProtocol> in,
-                            boost::shared_ptr<TProtocol> out,
-                            void* connectionContext) {
-
-  std::string fname;
-  TMessageType mtype;
-  int32_t seqid;
-  in->readMessageBegin(fname, mtype, seqid);
-
-  if (mtype != T_CALL && mtype != T_ONEWAY) {
-    throw TException("Unexpected message type");
-  }
-
-  // Peek at the name
-  peekName(fname);
-
-  TType ftype;
-  int16_t fid;
-  while (true) {
-    in->readFieldBegin(fname, ftype, fid);
-    if (ftype == T_STOP) {
-      break;
-    }
-
-    // Peek at the variable
-    peek(in, ftype, fid);
-    in->readFieldEnd();
-  }
-  in->readMessageEnd();
-  in->getTransport()->readEnd();
-
-  //
-  // All the data is now in memoryBuffer_ and ready to be processed
-  //
-
-  // Let's first take a peek at the full data in memory
-  uint8_t* buffer;
-  uint32_t size;
-  memoryBuffer_->getBuffer(&buffer, &size);
-  peekBuffer(buffer, size);
-
-  // Done peeking at variables
-  peekEnd();
-
-  bool ret = actualProcessor_->process(pipedProtocol_, out, connectionContext);
-  memoryBuffer_->resetBuffer();
-  return ret;
-}
-
-void PeekProcessor::peekName(const std::string& fname) {
-  (void)fname;
-}
-
-void PeekProcessor::peekBuffer(uint8_t* buffer, uint32_t size) {
-  (void)buffer;
-  (void)size;
-}
-
-void PeekProcessor::peek(boost::shared_ptr<TProtocol> in, TType ftype, int16_t fid) {
-  (void)fid;
-  in->skip(ftype);
-}
-
-void PeekProcessor::peekEnd() {
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/PeekProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/PeekProcessor.h
deleted file mode 100644
index 21c5999..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/PeekProcessor.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef PEEKPROCESSOR_H
-#define PEEKPROCESSOR_H
-
-#include <string>
-#include <thrift/TProcessor.h>
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TTransportUtils.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace processor {
-
-/*
- * Class for peeking at the raw data that is being processed by another processor
- * and gives the derived class a chance to change behavior accordingly
- *
- */
-class PeekProcessor : public apache::thrift::TProcessor {
-
-public:
-  PeekProcessor();
-  virtual ~PeekProcessor();
-
-  // Input here: actualProcessor  - the underlying processor
-  //             protocolFactory  - the protocol factory used to wrap the memory buffer
-  //             transportFactory - this TPipedTransportFactory is used to wrap the source transport
-  //                                via a call to getPipedTransport
-  void initialize(
-      boost::shared_ptr<apache::thrift::TProcessor> actualProcessor,
-      boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> protocolFactory,
-      boost::shared_ptr<apache::thrift::transport::TPipedTransportFactory> transportFactory);
-
-  boost::shared_ptr<apache::thrift::transport::TTransport> getPipedTransport(
-      boost::shared_ptr<apache::thrift::transport::TTransport> in);
-
-  void setTargetTransport(boost::shared_ptr<apache::thrift::transport::TTransport> targetTransport);
-
-  virtual bool process(boost::shared_ptr<apache::thrift::protocol::TProtocol> in,
-                       boost::shared_ptr<apache::thrift::protocol::TProtocol> out,
-                       void* connectionContext);
-
-  // The following three functions can be overloaded by child classes to
-  // achieve desired peeking behavior
-  virtual void peekName(const std::string& fname);
-  virtual void peekBuffer(uint8_t* buffer, uint32_t size);
-  virtual void peek(boost::shared_ptr<apache::thrift::protocol::TProtocol> in,
-                    apache::thrift::protocol::TType ftype,
-                    int16_t fid);
-  virtual void peekEnd();
-
-private:
-  boost::shared_ptr<apache::thrift::TProcessor> actualProcessor_;
-  boost::shared_ptr<apache::thrift::protocol::TProtocol> pipedProtocol_;
-  boost::shared_ptr<apache::thrift::transport::TPipedTransportFactory> transportFactory_;
-  boost::shared_ptr<apache::thrift::transport::TMemoryBuffer> memoryBuffer_;
-  boost::shared_ptr<apache::thrift::transport::TTransport> targetTransport_;
-};
-}
-}
-} // apache::thrift::processor
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/StatsProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/StatsProcessor.h
deleted file mode 100644
index e8ca067..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/StatsProcessor.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef STATSPROCESSOR_H
-#define STATSPROCESSOR_H
-
-#include <boost/shared_ptr.hpp>
-#include <thrift/transport/TTransport.h>
-#include <thrift/protocol/TProtocol.h>
-#include <TProcessor.h>
-
-namespace apache {
-namespace thrift {
-namespace processor {
-
-/*
- * Class for keeping track of function call statistics and printing them if desired
- *
- */
-class StatsProcessor : public apache::thrift::TProcessor {
-public:
-  StatsProcessor(bool print, bool frequency) : print_(print), frequency_(frequency) {}
-  virtual ~StatsProcessor(){};
-
-  virtual bool process(boost::shared_ptr<apache::thrift::protocol::TProtocol> piprot,
-                       boost::shared_ptr<apache::thrift::protocol::TProtocol> poprot,
-                       void* serverContext) {
-
-    piprot_ = piprot;
-
-    std::string fname;
-    apache::thrift::protocol::TMessageType mtype;
-    int32_t seqid;
-
-    piprot_->readMessageBegin(fname, mtype, seqid);
-    if (mtype != apache::thrift::protocol::T_CALL && mtype != apache::thrift::protocol::T_ONEWAY) {
-      if (print_) {
-        printf("Unknown message type\n");
-      }
-      throw apache::thrift::TException("Unexpected message type");
-    }
-    if (print_) {
-      printf("%s (", fname.c_str());
-    }
-    if (frequency_) {
-      if (frequency_map_.find(fname) != frequency_map_.end()) {
-        frequency_map_[fname]++;
-      } else {
-        frequency_map_[fname] = 1;
-      }
-    }
-
-    apache::thrift::protocol::TType ftype;
-    int16_t fid;
-
-    while (true) {
-      piprot_->readFieldBegin(fname, ftype, fid);
-      if (ftype == apache::thrift::protocol::T_STOP) {
-        break;
-      }
-
-      printAndPassToBuffer(ftype);
-      if (print_) {
-        printf(", ");
-      }
-    }
-
-    if (print_) {
-      printf("\b\b)\n");
-    }
-    return true;
-  }
-
-  const std::map<std::string, int64_t>& get_frequency_map() { return frequency_map_; }
-
-protected:
-  void printAndPassToBuffer(apache::thrift::protocol::TType ftype) {
-    switch (ftype) {
-    case apache::thrift::protocol::T_BOOL: {
-      bool boolv;
-      piprot_->readBool(boolv);
-      if (print_) {
-        printf("%d", boolv);
-      }
-    } break;
-    case apache::thrift::protocol::T_BYTE: {
-      int8_t bytev;
-      piprot_->readByte(bytev);
-      if (print_) {
-        printf("%d", bytev);
-      }
-    } break;
-    case apache::thrift::protocol::T_I16: {
-      int16_t i16;
-      piprot_->readI16(i16);
-      if (print_) {
-        printf("%d", i16);
-      }
-    } break;
-    case apache::thrift::protocol::T_I32: {
-      int32_t i32;
-      piprot_->readI32(i32);
-      if (print_) {
-        printf("%d", i32);
-      }
-    } break;
-    case apache::thrift::protocol::T_I64: {
-      int64_t i64;
-      piprot_->readI64(i64);
-      if (print_) {
-        printf("%ld", i64);
-      }
-    } break;
-    case apache::thrift::protocol::T_DOUBLE: {
-      double dub;
-      piprot_->readDouble(dub);
-      if (print_) {
-        printf("%f", dub);
-      }
-    } break;
-    case apache::thrift::protocol::T_STRING: {
-      std::string str;
-      piprot_->readString(str);
-      if (print_) {
-        printf("%s", str.c_str());
-      }
-    } break;
-    case apache::thrift::protocol::T_STRUCT: {
-      std::string name;
-      int16_t fid;
-      apache::thrift::protocol::TType ftype;
-      piprot_->readStructBegin(name);
-      if (print_) {
-        printf("<");
-      }
-      while (true) {
-        piprot_->readFieldBegin(name, ftype, fid);
-        if (ftype == apache::thrift::protocol::T_STOP) {
-          break;
-        }
-        printAndPassToBuffer(ftype);
-        if (print_) {
-          printf(",");
-        }
-        piprot_->readFieldEnd();
-      }
-      piprot_->readStructEnd();
-      if (print_) {
-        printf("\b>");
-      }
-    } break;
-    case apache::thrift::protocol::T_MAP: {
-      apache::thrift::protocol::TType keyType;
-      apache::thrift::protocol::TType valType;
-      uint32_t i, size;
-      piprot_->readMapBegin(keyType, valType, size);
-      if (print_) {
-        printf("{");
-      }
-      for (i = 0; i < size; i++) {
-        printAndPassToBuffer(keyType);
-        if (print_) {
-          printf("=>");
-        }
-        printAndPassToBuffer(valType);
-        if (print_) {
-          printf(",");
-        }
-      }
-      piprot_->readMapEnd();
-      if (print_) {
-        printf("\b}");
-      }
-    } break;
-    case apache::thrift::protocol::T_SET: {
-      apache::thrift::protocol::TType elemType;
-      uint32_t i, size;
-      piprot_->readSetBegin(elemType, size);
-      if (print_) {
-        printf("{");
-      }
-      for (i = 0; i < size; i++) {
-        printAndPassToBuffer(elemType);
-        if (print_) {
-          printf(",");
-        }
-      }
-      piprot_->readSetEnd();
-      if (print_) {
-        printf("\b}");
-      }
-    } break;
-    case apache::thrift::protocol::T_LIST: {
-      apache::thrift::protocol::TType elemType;
-      uint32_t i, size;
-      piprot_->readListBegin(elemType, size);
-      if (print_) {
-        printf("[");
-      }
-      for (i = 0; i < size; i++) {
-        printAndPassToBuffer(elemType);
-        if (print_) {
-          printf(",");
-        }
-      }
-      piprot_->readListEnd();
-      if (print_) {
-        printf("\b]");
-      }
-    } break;
-    default:
-      break;
-    }
-  }
-
-  boost::shared_ptr<apache::thrift::protocol::TProtocol> piprot_;
-  std::map<std::string, int64_t> frequency_map_;
-
-  bool print_;
-  bool frequency_;
-};
-}
-}
-} // apache::thrift::processor
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/TMultiplexedProcessor.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/TMultiplexedProcessor.h
deleted file mode 100644
index 0ef7261..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/processor/TMultiplexedProcessor.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_TMULTIPLEXEDPROCESSOR_H_
-#define THRIFT_TMULTIPLEXEDPROCESSOR_H_ 1
-
-#include <thrift/protocol/TProtocolDecorator.h>
-#include <thrift/TApplicationException.h>
-#include <thrift/TProcessor.h>
-#include <boost/tokenizer.hpp>
-
-namespace apache {
-namespace thrift {
-using boost::shared_ptr;
-
-namespace protocol {
-
-/**
- *  To be able to work with any protocol, we needed
- *  to allow them to call readMessageBegin() and get a TMessage in exactly
- *  the standard format, without the service name prepended to TMessage.name.
- */
-class StoredMessageProtocol : public TProtocolDecorator {
-public:
-  StoredMessageProtocol(shared_ptr<protocol::TProtocol> _protocol,
-                        const std::string& _name,
-                        const TMessageType _type,
-                        const int32_t _seqid)
-    : TProtocolDecorator(_protocol), name(_name), type(_type), seqid(_seqid) {}
-
-  uint32_t readMessageBegin_virt(std::string& _name, TMessageType& _type, int32_t& _seqid) {
-
-    _name = name;
-    _type = type;
-    _seqid = seqid;
-
-    return 0; // (Normal TProtocol read functions return number of bytes read)
-  }
-
-  std::string name;
-  TMessageType type;
-  int32_t seqid;
-};
-} // namespace protocol
-
-/**
- * <code>TMultiplexedProcessor</code> is a <code>TProcessor</code> allowing
- * a single <code>TServer</code> to provide multiple services.
- *
- * <p>To do so, you instantiate the processor and then register additional
- * processors with it, as shown in the following example:</p>
- *
- * <blockquote><code>
- *     shared_ptr<TMultiplexedProcessor> processor(new TMultiplexedProcessor());
- *
- *     processor->registerProcessor(
- *         "Calculator",
- *         shared_ptr<TProcessor>( new CalculatorProcessor(
- *             shared_ptr<CalculatorHandler>( new CalculatorHandler()))));
- *
- *     processor->registerProcessor(
- *         "WeatherReport",
- *         shared_ptr<TProcessor>( new WeatherReportProcessor(
- *             shared_ptr<WeatherReportHandler>( new WeatherReportHandler()))));
- *
- *     shared_ptr<TServerTransport> transport(new TServerSocket(9090));
- *     TSimpleServer server(processor, transport);
- *
- *     server.serve();
- * </code></blockquote>
- */
-class TMultiplexedProcessor : public TProcessor {
-public:
-  typedef std::map<std::string, shared_ptr<TProcessor> > services_t;
-
-  /**
-    * 'Register' a service with this <code>TMultiplexedProcessor</code>.  This
-    * allows us to broker requests to individual services by using the service
-    * name to select them at request time.
-    *
-    * \param [in] serviceName Name of a service, has to be identical to the name
-    *                         declared in the Thrift IDL, e.g. "WeatherReport".
-    * \param [in] processor   Implementation of a service, usually referred to
-    *                         as "handlers", e.g. WeatherReportHandler,
-    *                         implementing WeatherReportIf interface.
-    */
-  void registerProcessor(const std::string& serviceName, shared_ptr<TProcessor> processor) {
-    services[serviceName] = processor;
-  }
-
-  /**
-   * This implementation of <code>process</code> performs the following steps:
-   *
-   * <ol>
-   *     <li>Read the beginning of the message.</li>
-   *     <li>Extract the service name from the message.</li>
-   *     <li>Using the service name to locate the appropriate processor.</li>
-   *     <li>Dispatch to the processor, with a decorated instance of TProtocol
-   *         that allows readMessageBegin() to return the original TMessage.</li>
-   * </ol>
-   *
-   * \throws TException If the message type is not T_CALL or T_ONEWAY, if
-   * the service name was not found in the message, or if the service
-   * name was not found in the service map.
-   */
-  bool process(shared_ptr<protocol::TProtocol> in,
-               shared_ptr<protocol::TProtocol> out,
-               void* connectionContext) {
-    std::string name;
-    protocol::TMessageType type;
-    int32_t seqid;
-
-    // Use the actual underlying protocol (e.g. TBinaryProtocol) to read the
-    // message header.  This pulls the message "off the wire", which we'll
-    // deal with at the end of this method.
-    in->readMessageBegin(name, type, seqid);
-
-    if (type != protocol::T_CALL && type != protocol::T_ONEWAY) {
-      // Unexpected message type.
-      in->skip(::apache::thrift::protocol::T_STRUCT);
-      in->readMessageEnd();
-      in->getTransport()->readEnd();
-      const std::string msg("TMultiplexedProcessor: Unexpected message type");
-      ::apache::thrift::TApplicationException
-          x(::apache::thrift::TApplicationException::PROTOCOL_ERROR, msg);
-      out->writeMessageBegin(name, ::apache::thrift::protocol::T_EXCEPTION, seqid);
-      x.write(out.get());
-      out->writeMessageEnd();
-      out->getTransport()->writeEnd();
-      out->getTransport()->flush();
-      throw TException(msg);
-    }
-
-    // Extract the service name
-
-    boost::tokenizer<boost::char_separator<char> > tok(name, boost::char_separator<char>(":"));
-
-    std::vector<std::string> tokens;
-    std::copy(tok.begin(), tok.end(), std::back_inserter(tokens));
-
-    // A valid message should consist of two tokens: the service
-    // name and the name of the method to call.
-    if (tokens.size() == 2) {
-      // Search for a processor associated with this service name.
-      services_t::iterator it = services.find(tokens[0]);
-
-      if (it != services.end()) {
-        shared_ptr<TProcessor> processor = it->second;
-        // Let the processor registered for this service name
-        // process the message.
-        return processor
-            ->process(shared_ptr<protocol::TProtocol>(
-                          new protocol::StoredMessageProtocol(in, tokens[1], type, seqid)),
-                      out,
-                      connectionContext);
-      } else {
-        // Unknown service.
-        in->skip(::apache::thrift::protocol::T_STRUCT);
-        in->readMessageEnd();
-        in->getTransport()->readEnd();
-
-        std::string msg("TMultiplexedProcessor: Unknown service: ");
-        msg += tokens[0];
-        ::apache::thrift::TApplicationException
-            x(::apache::thrift::TApplicationException::PROTOCOL_ERROR, msg);
-        out->writeMessageBegin(name, ::apache::thrift::protocol::T_EXCEPTION, seqid);
-        x.write(out.get());
-        out->writeMessageEnd();
-        out->getTransport()->writeEnd();
-        out->getTransport()->flush();
-        msg += ". Did you forget to call registerProcessor()?";
-        throw TException(msg);
-      }
-    }
-    return false;
-  }
-
-private:
-  /** Map of service processor objects, indexed by service names. */
-  services_t services;
-};
-}
-}
-
-#endif // THRIFT_TMULTIPLEXEDPROCESSOR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBase64Utils.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBase64Utils.cpp
deleted file mode 100644
index beb76eb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBase64Utils.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/protocol/TBase64Utils.h>
-
-#include <boost/static_assert.hpp>
-
-using std::string;
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-static const uint8_t* kBase64EncodeTable
-    = (const uint8_t*)"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-void base64_encode(const uint8_t* in, uint32_t len, uint8_t* buf) {
-  buf[0] = kBase64EncodeTable[(in[0] >> 2) & 0x3f];
-  if (len == 3) {
-    buf[1] = kBase64EncodeTable[((in[0] << 4) & 0x30) | ((in[1] >> 4) & 0x0f)];
-    buf[2] = kBase64EncodeTable[((in[1] << 2) & 0x3c) | ((in[2] >> 6) & 0x03)];
-    buf[3] = kBase64EncodeTable[in[2] & 0x3f];
-  } else if (len == 2) {
-    buf[1] = kBase64EncodeTable[((in[0] << 4) & 0x30) | ((in[1] >> 4) & 0x0f)];
-    buf[2] = kBase64EncodeTable[(in[1] << 2) & 0x3c];
-  } else { // len == 1
-    buf[1] = kBase64EncodeTable[(in[0] << 4) & 0x30];
-  }
-}
-
-static const uint8_t kBase64DecodeTable[256] = {
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0x3e,
-    0xff,
-    0xff,
-    0xff,
-    0x3f,
-    0x34,
-    0x35,
-    0x36,
-    0x37,
-    0x38,
-    0x39,
-    0x3a,
-    0x3b,
-    0x3c,
-    0x3d,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0x00,
-    0x01,
-    0x02,
-    0x03,
-    0x04,
-    0x05,
-    0x06,
-    0x07,
-    0x08,
-    0x09,
-    0x0a,
-    0x0b,
-    0x0c,
-    0x0d,
-    0x0e,
-    0x0f,
-    0x10,
-    0x11,
-    0x12,
-    0x13,
-    0x14,
-    0x15,
-    0x16,
-    0x17,
-    0x18,
-    0x19,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0x1a,
-    0x1b,
-    0x1c,
-    0x1d,
-    0x1e,
-    0x1f,
-    0x20,
-    0x21,
-    0x22,
-    0x23,
-    0x24,
-    0x25,
-    0x26,
-    0x27,
-    0x28,
-    0x29,
-    0x2a,
-    0x2b,
-    0x2c,
-    0x2d,
-    0x2e,
-    0x2f,
-    0x30,
-    0x31,
-    0x32,
-    0x33,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-    0xff,
-};
-
-void base64_decode(uint8_t* buf, uint32_t len) {
-  buf[0] = (kBase64DecodeTable[buf[0]] << 2) | (kBase64DecodeTable[buf[1]] >> 4);
-  if (len > 2) {
-    buf[1] = ((kBase64DecodeTable[buf[1]] << 4) & 0xf0) | (kBase64DecodeTable[buf[2]] >> 2);
-    if (len > 3) {
-      buf[2] = ((kBase64DecodeTable[buf[2]] << 6) & 0xc0) | (kBase64DecodeTable[buf[3]]);
-    }
-  }
-}
-}
-}
-} // apache::thrift::protocol
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBase64Utils.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBase64Utils.h
deleted file mode 100644
index 1ea6744..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBase64Utils.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TBASE64UTILS_H_
-#define _THRIFT_PROTOCOL_TBASE64UTILS_H_
-
-#include <stdint.h>
-#include <string>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-// in must be at least len bytes
-// len must be 1, 2, or 3
-// buf must be a buffer of at least 4 bytes and may not overlap in
-// the data is not padded with '='; the caller can do this if desired
-void base64_encode(const uint8_t* in, uint32_t len, uint8_t* buf);
-
-// buf must be a buffer of at least 4 bytes and contain base64 encoded values
-// buf will be changed to contain output bytes
-// len is number of bytes to consume from input (must be 2, 3, or 4)
-// no '=' padding should be included in the input
-void base64_decode(uint8_t* buf, uint32_t len);
-}
-}
-} // apache::thrift::protocol
-
-#endif // #define _THRIFT_PROTOCOL_TBASE64UTILS_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBinaryProtocol.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBinaryProtocol.h
deleted file mode 100644
index 87c53f7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBinaryProtocol.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_
-#define _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_ 1
-
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/protocol/TVirtualProtocol.h>
-
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-/**
- * The default binary protocol for thrift. Writes all data in a very basic
- * binary format, essentially just spitting out the raw bytes.
- *
- */
-template <class Transport_, class ByteOrder_ = TNetworkBigEndian>
-class TBinaryProtocolT : public TVirtualProtocol<TBinaryProtocolT<Transport_, ByteOrder_> > {
-public:
-  static const int32_t VERSION_MASK = ((int32_t)0xffff0000);
-  static const int32_t VERSION_1 = ((int32_t)0x80010000);
-  // VERSION_2 (0x80020000) was taken by TDenseProtocol (which has since been removed)
-
-  TBinaryProtocolT(boost::shared_ptr<Transport_> trans)
-    : TVirtualProtocol<TBinaryProtocolT<Transport_, ByteOrder_> >(trans),
-      trans_(trans.get()),
-      string_limit_(0),
-      container_limit_(0),
-      strict_read_(false),
-      strict_write_(true) {}
-
-  TBinaryProtocolT(boost::shared_ptr<Transport_> trans,
-                   int32_t string_limit,
-                   int32_t container_limit,
-                   bool strict_read,
-                   bool strict_write)
-    : TVirtualProtocol<TBinaryProtocolT<Transport_, ByteOrder_> >(trans),
-      trans_(trans.get()),
-      string_limit_(string_limit),
-      container_limit_(container_limit),
-      strict_read_(strict_read),
-      strict_write_(strict_write) {}
-
-  void setStringSizeLimit(int32_t string_limit) { string_limit_ = string_limit; }
-
-  void setContainerSizeLimit(int32_t container_limit) { container_limit_ = container_limit; }
-
-  void setStrict(bool strict_read, bool strict_write) {
-    strict_read_ = strict_read;
-    strict_write_ = strict_write;
-  }
-
-  /**
-   * Writing functions.
-   */
-
-  /*ol*/ uint32_t writeMessageBegin(const std::string& name,
-                                    const TMessageType messageType,
-                                    const int32_t seqid);
-
-  /*ol*/ uint32_t writeMessageEnd();
-
-  inline uint32_t writeStructBegin(const char* name);
-
-  inline uint32_t writeStructEnd();
-
-  inline uint32_t writeFieldBegin(const char* name, const TType fieldType, const int16_t fieldId);
-
-  inline uint32_t writeFieldEnd();
-
-  inline uint32_t writeFieldStop();
-
-  inline uint32_t writeMapBegin(const TType keyType, const TType valType, const uint32_t size);
-
-  inline uint32_t writeMapEnd();
-
-  inline uint32_t writeListBegin(const TType elemType, const uint32_t size);
-
-  inline uint32_t writeListEnd();
-
-  inline uint32_t writeSetBegin(const TType elemType, const uint32_t size);
-
-  inline uint32_t writeSetEnd();
-
-  inline uint32_t writeBool(const bool value);
-
-  inline uint32_t writeByte(const int8_t byte);
-
-  inline uint32_t writeI16(const int16_t i16);
-
-  inline uint32_t writeI32(const int32_t i32);
-
-  inline uint32_t writeI64(const int64_t i64);
-
-  inline uint32_t writeDouble(const double dub);
-
-  template <typename StrType>
-  inline uint32_t writeString(const StrType& str);
-
-  inline uint32_t writeBinary(const std::string& str);
-
-  /**
-   * Reading functions
-   */
-
-  /*ol*/ uint32_t readMessageBegin(std::string& name, TMessageType& messageType, int32_t& seqid);
-
-  /*ol*/ uint32_t readMessageEnd();
-
-  inline uint32_t readStructBegin(std::string& name);
-
-  inline uint32_t readStructEnd();
-
-  inline uint32_t readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId);
-
-  inline uint32_t readFieldEnd();
-
-  inline uint32_t readMapBegin(TType& keyType, TType& valType, uint32_t& size);
-
-  inline uint32_t readMapEnd();
-
-  inline uint32_t readListBegin(TType& elemType, uint32_t& size);
-
-  inline uint32_t readListEnd();
-
-  inline uint32_t readSetBegin(TType& elemType, uint32_t& size);
-
-  inline uint32_t readSetEnd();
-
-  inline uint32_t readBool(bool& value);
-  // Provide the default readBool() implementation for std::vector<bool>
-  using TVirtualProtocol<TBinaryProtocolT<Transport_, ByteOrder_> >::readBool;
-
-  inline uint32_t readByte(int8_t& byte);
-
-  inline uint32_t readI16(int16_t& i16);
-
-  inline uint32_t readI32(int32_t& i32);
-
-  inline uint32_t readI64(int64_t& i64);
-
-  inline uint32_t readDouble(double& dub);
-
-  template <typename StrType>
-  inline uint32_t readString(StrType& str);
-
-  inline uint32_t readBinary(std::string& str);
-
-protected:
-  template <typename StrType>
-  uint32_t readStringBody(StrType& str, int32_t sz);
-
-  Transport_* trans_;
-
-  int32_t string_limit_;
-  int32_t container_limit_;
-
-  // Enforce presence of version identifier
-  bool strict_read_;
-  bool strict_write_;
-};
-
-typedef TBinaryProtocolT<TTransport> TBinaryProtocol;
-typedef TBinaryProtocolT<TTransport, TNetworkLittleEndian> TLEBinaryProtocol;
-
-/**
- * Constructs binary protocol handlers
- */
-template <class Transport_, class ByteOrder_ = TNetworkBigEndian>
-class TBinaryProtocolFactoryT : public TProtocolFactory {
-public:
-  TBinaryProtocolFactoryT()
-    : string_limit_(0), container_limit_(0), strict_read_(false), strict_write_(true) {}
-
-  TBinaryProtocolFactoryT(int32_t string_limit,
-                          int32_t container_limit,
-                          bool strict_read,
-                          bool strict_write)
-    : string_limit_(string_limit),
-      container_limit_(container_limit),
-      strict_read_(strict_read),
-      strict_write_(strict_write) {}
-
-  virtual ~TBinaryProtocolFactoryT() {}
-
-  void setStringSizeLimit(int32_t string_limit) { string_limit_ = string_limit; }
-
-  void setContainerSizeLimit(int32_t container_limit) { container_limit_ = container_limit; }
-
-  void setStrict(bool strict_read, bool strict_write) {
-    strict_read_ = strict_read;
-    strict_write_ = strict_write;
-  }
-
-  boost::shared_ptr<TProtocol> getProtocol(boost::shared_ptr<TTransport> trans) {
-    boost::shared_ptr<Transport_> specific_trans = boost::dynamic_pointer_cast<Transport_>(trans);
-    TProtocol* prot;
-    if (specific_trans) {
-      prot = new TBinaryProtocolT<Transport_, ByteOrder_>(specific_trans,
-                                                          string_limit_,
-                                                          container_limit_,
-                                                          strict_read_,
-                                                          strict_write_);
-    } else {
-      prot = new TBinaryProtocolT<TTransport, ByteOrder_>(trans,
-                                                          string_limit_,
-                                                          container_limit_,
-                                                          strict_read_,
-                                                          strict_write_);
-    }
-
-    return boost::shared_ptr<TProtocol>(prot);
-  }
-
-private:
-  int32_t string_limit_;
-  int32_t container_limit_;
-  bool strict_read_;
-  bool strict_write_;
-};
-
-typedef TBinaryProtocolFactoryT<TTransport> TBinaryProtocolFactory;
-typedef TBinaryProtocolFactoryT<TTransport, TNetworkLittleEndian> TLEBinaryProtocolFactory;
-}
-}
-} // apache::thrift::protocol
-
-#include <thrift/protocol/TBinaryProtocol.tcc>
-
-#endif // #ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
deleted file mode 100644
index d6f6dbb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_TCC_
-#define _THRIFT_PROTOCOL_TBINARYPROTOCOL_TCC_ 1
-
-#include <thrift/protocol/TBinaryProtocol.h>
-
-#include <limits>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeMessageBegin(const std::string& name,
-                                                                     const TMessageType messageType,
-                                                                     const int32_t seqid) {
-  if (this->strict_write_) {
-    int32_t version = (VERSION_1) | ((int32_t)messageType);
-    uint32_t wsize = 0;
-    wsize += writeI32(version);
-    wsize += writeString(name);
-    wsize += writeI32(seqid);
-    return wsize;
-  } else {
-    uint32_t wsize = 0;
-    wsize += writeString(name);
-    wsize += writeByte((int8_t)messageType);
-    wsize += writeI32(seqid);
-    return wsize;
-  }
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeMessageEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeStructBegin(const char* name) {
-  (void)name;
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeStructEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeFieldBegin(const char* name,
-                                                                   const TType fieldType,
-                                                                   const int16_t fieldId) {
-  (void)name;
-  uint32_t wsize = 0;
-  wsize += writeByte((int8_t)fieldType);
-  wsize += writeI16(fieldId);
-  return wsize;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeFieldEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeFieldStop() {
-  return writeByte((int8_t)T_STOP);
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeMapBegin(const TType keyType,
-                                                                 const TType valType,
-                                                                 const uint32_t size) {
-  uint32_t wsize = 0;
-  wsize += writeByte((int8_t)keyType);
-  wsize += writeByte((int8_t)valType);
-  wsize += writeI32((int32_t)size);
-  return wsize;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeMapEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeListBegin(const TType elemType,
-                                                                  const uint32_t size) {
-  uint32_t wsize = 0;
-  wsize += writeByte((int8_t)elemType);
-  wsize += writeI32((int32_t)size);
-  return wsize;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeListEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeSetBegin(const TType elemType,
-                                                                 const uint32_t size) {
-  uint32_t wsize = 0;
-  wsize += writeByte((int8_t)elemType);
-  wsize += writeI32((int32_t)size);
-  return wsize;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeSetEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeBool(const bool value) {
-  uint8_t tmp = value ? 1 : 0;
-  this->trans_->write(&tmp, 1);
-  return 1;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeByte(const int8_t byte) {
-  this->trans_->write((uint8_t*)&byte, 1);
-  return 1;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeI16(const int16_t i16) {
-  int16_t net = (int16_t)ByteOrder_::toWire16(i16);
-  this->trans_->write((uint8_t*)&net, 2);
-  return 2;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeI32(const int32_t i32) {
-  int32_t net = (int32_t)ByteOrder_::toWire32(i32);
-  this->trans_->write((uint8_t*)&net, 4);
-  return 4;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeI64(const int64_t i64) {
-  int64_t net = (int64_t)ByteOrder_::toWire64(i64);
-  this->trans_->write((uint8_t*)&net, 8);
-  return 8;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeDouble(const double dub) {
-  BOOST_STATIC_ASSERT(sizeof(double) == sizeof(uint64_t));
-  BOOST_STATIC_ASSERT(std::numeric_limits<double>::is_iec559);
-
-  uint64_t bits = bitwise_cast<uint64_t>(dub);
-  bits = ByteOrder_::toWire64(bits);
-  this->trans_->write((uint8_t*)&bits, 8);
-  return 8;
-}
-
-template <class Transport_, class ByteOrder_>
-template <typename StrType>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeString(const StrType& str) {
-  if (str.size() > static_cast<size_t>((std::numeric_limits<int32_t>::max)()))
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  uint32_t size = static_cast<uint32_t>(str.size());
-  uint32_t result = writeI32((int32_t)size);
-  if (size > 0) {
-    this->trans_->write((uint8_t*)str.data(), size);
-  }
-  return result + size;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::writeBinary(const std::string& str) {
-  return TBinaryProtocolT<Transport_, ByteOrder_>::writeString(str);
-}
-
-/**
- * Reading functions
- */
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readMessageBegin(std::string& name,
-                                                                    TMessageType& messageType,
-                                                                    int32_t& seqid) {
-  uint32_t result = 0;
-  int32_t sz;
-  result += readI32(sz);
-
-  if (sz < 0) {
-    // Check for correct version number
-    int32_t version = sz & VERSION_MASK;
-    if (version != VERSION_1) {
-      throw TProtocolException(TProtocolException::BAD_VERSION, "Bad version identifier");
-    }
-    messageType = (TMessageType)(sz & 0x000000ff);
-    result += readString(name);
-    result += readI32(seqid);
-  } else {
-    if (this->strict_read_) {
-      throw TProtocolException(TProtocolException::BAD_VERSION,
-                               "No version identifier... old protocol client in strict mode?");
-    } else {
-      // Handle pre-versioned input
-      int8_t type;
-      result += readStringBody(name, sz);
-      result += readByte(type);
-      messageType = (TMessageType)type;
-      result += readI32(seqid);
-    }
-  }
-  return result;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readMessageEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readStructBegin(std::string& name) {
-  name = "";
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readStructEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readFieldBegin(std::string& name,
-                                                                  TType& fieldType,
-                                                                  int16_t& fieldId) {
-  (void)name;
-  uint32_t result = 0;
-  int8_t type;
-  result += readByte(type);
-  fieldType = (TType)type;
-  if (fieldType == T_STOP) {
-    fieldId = 0;
-    return result;
-  }
-  result += readI16(fieldId);
-  return result;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readFieldEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readMapBegin(TType& keyType,
-                                                                TType& valType,
-                                                                uint32_t& size) {
-  int8_t k, v;
-  uint32_t result = 0;
-  int32_t sizei;
-  result += readByte(k);
-  keyType = (TType)k;
-  result += readByte(v);
-  valType = (TType)v;
-  result += readI32(sizei);
-  if (sizei < 0) {
-    throw TProtocolException(TProtocolException::NEGATIVE_SIZE);
-  } else if (this->container_limit_ && sizei > this->container_limit_) {
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  }
-  size = (uint32_t)sizei;
-  return result;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readMapEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readListBegin(TType& elemType, uint32_t& size) {
-  int8_t e;
-  uint32_t result = 0;
-  int32_t sizei;
-  result += readByte(e);
-  elemType = (TType)e;
-  result += readI32(sizei);
-  if (sizei < 0) {
-    throw TProtocolException(TProtocolException::NEGATIVE_SIZE);
-  } else if (this->container_limit_ && sizei > this->container_limit_) {
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  }
-  size = (uint32_t)sizei;
-  return result;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readListEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readSetBegin(TType& elemType, uint32_t& size) {
-  int8_t e;
-  uint32_t result = 0;
-  int32_t sizei;
-  result += readByte(e);
-  elemType = (TType)e;
-  result += readI32(sizei);
-  if (sizei < 0) {
-    throw TProtocolException(TProtocolException::NEGATIVE_SIZE);
-  } else if (this->container_limit_ && sizei > this->container_limit_) {
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  }
-  size = (uint32_t)sizei;
-  return result;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readSetEnd() {
-  return 0;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readBool(bool& value) {
-  uint8_t b[1];
-  this->trans_->readAll(b, 1);
-  value = *(int8_t*)b != 0;
-  return 1;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readByte(int8_t& byte) {
-  uint8_t b[1];
-  this->trans_->readAll(b, 1);
-  byte = *(int8_t*)b;
-  return 1;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readI16(int16_t& i16) {
-  union bytes {
-    uint8_t b[2];
-    int16_t all;
-  } theBytes;
-  this->trans_->readAll(theBytes.b, 2);
-  i16 = (int16_t)ByteOrder_::fromWire16(theBytes.all);
-  return 2;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readI32(int32_t& i32) {
-  union bytes {
-    uint8_t b[4];
-    int32_t all;
-  } theBytes;
-  this->trans_->readAll(theBytes.b, 4);
-  i32 = (int32_t)ByteOrder_::fromWire32(theBytes.all);
-  return 4;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readI64(int64_t& i64) {
-  union bytes {
-    uint8_t b[8];
-    int64_t all;
-  } theBytes;
-  this->trans_->readAll(theBytes.b, 8);
-  i64 = (int64_t)ByteOrder_::fromWire64(theBytes.all);
-  return 8;
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readDouble(double& dub) {
-  BOOST_STATIC_ASSERT(sizeof(double) == sizeof(uint64_t));
-  BOOST_STATIC_ASSERT(std::numeric_limits<double>::is_iec559);
-
-  union bytes {
-    uint8_t b[8];
-    uint64_t all;
-  } theBytes;
-  this->trans_->readAll(theBytes.b, 8);
-  theBytes.all = ByteOrder_::fromWire64(theBytes.all);
-  dub = bitwise_cast<double>(theBytes.all);
-  return 8;
-}
-
-template <class Transport_, class ByteOrder_>
-template <typename StrType>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readString(StrType& str) {
-  uint32_t result;
-  int32_t size;
-  result = readI32(size);
-  return result + readStringBody(str, size);
-}
-
-template <class Transport_, class ByteOrder_>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readBinary(std::string& str) {
-  return TBinaryProtocolT<Transport_, ByteOrder_>::readString(str);
-}
-
-template <class Transport_, class ByteOrder_>
-template <typename StrType>
-uint32_t TBinaryProtocolT<Transport_, ByteOrder_>::readStringBody(StrType& str, int32_t size) {
-  uint32_t result = 0;
-
-  // Catch error cases
-  if (size < 0) {
-    throw TProtocolException(TProtocolException::NEGATIVE_SIZE);
-  }
-  if (this->string_limit_ > 0 && size > this->string_limit_) {
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  }
-
-  // Catch empty string case
-  if (size == 0) {
-    str.clear();
-    return result;
-  }
-
-  // Try to borrow first
-  const uint8_t* borrow_buf;
-  uint32_t got = size;
-  if ((borrow_buf = this->trans_->borrow(NULL, &got))) {
-    str.assign((const char*)borrow_buf, size);
-    this->trans_->consume(size);
-    return size;
-  }
-
-  str.resize(size);
-  this->trans_->readAll(reinterpret_cast<uint8_t*>(&str[0]), size);
-  return (uint32_t)size;
-}
-}
-}
-} // apache::thrift::protocol
-
-#endif // #ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_TCC_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TCompactProtocol.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TCompactProtocol.h
deleted file mode 100644
index d970be2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TCompactProtocol.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_H_
-#define _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_H_ 1
-
-#include <thrift/protocol/TVirtualProtocol.h>
-
-#include <stack>
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-/**
- * C++ Implementation of the Compact Protocol as described in THRIFT-110
- */
-template <class Transport_>
-class TCompactProtocolT : public TVirtualProtocol<TCompactProtocolT<Transport_> > {
-public:
-  static const int8_t PROTOCOL_ID = (int8_t)0x82u;
-  static const int8_t VERSION_N = 1;
-  static const int8_t VERSION_MASK = 0x1f;       // 0001 1111
-
-protected:
-  static const int8_t TYPE_MASK = (int8_t)0xE0u; // 1110 0000
-  static const int8_t TYPE_BITS = 0x07;          // 0000 0111
-  static const int32_t TYPE_SHIFT_AMOUNT = 5;
-
-  Transport_* trans_;
-
-  /**
-   * (Writing) If we encounter a boolean field begin, save the TField here
-   * so it can have the value incorporated.
-   */
-  struct {
-    const char* name;
-    TType fieldType;
-    int16_t fieldId;
-  } booleanField_;
-
-  /**
-   * (Reading) If we read a field header, and it's a boolean field, save
-   * the boolean value here so that readBool can use it.
-   */
-  struct {
-    bool hasBoolValue;
-    bool boolValue;
-  } boolValue_;
-
-  /**
-   * Used to keep track of the last field for the current and previous structs,
-   * so we can do the delta stuff.
-   */
-
-  std::stack<int16_t> lastField_;
-  int16_t lastFieldId_;
-
-public:
-  TCompactProtocolT(boost::shared_ptr<Transport_> trans)
-    : TVirtualProtocol<TCompactProtocolT<Transport_> >(trans),
-      trans_(trans.get()),
-      lastFieldId_(0),
-      string_limit_(0),
-      string_buf_(NULL),
-      string_buf_size_(0),
-      container_limit_(0) {
-    booleanField_.name = NULL;
-    boolValue_.hasBoolValue = false;
-  }
-
-  TCompactProtocolT(boost::shared_ptr<Transport_> trans,
-                    int32_t string_limit,
-                    int32_t container_limit)
-    : TVirtualProtocol<TCompactProtocolT<Transport_> >(trans),
-      trans_(trans.get()),
-      lastFieldId_(0),
-      string_limit_(string_limit),
-      string_buf_(NULL),
-      string_buf_size_(0),
-      container_limit_(container_limit) {
-    booleanField_.name = NULL;
-    boolValue_.hasBoolValue = false;
-  }
-
-  ~TCompactProtocolT() { free(string_buf_); }
-
-  /**
-   * Writing functions
-   */
-
-  virtual uint32_t writeMessageBegin(const std::string& name,
-                                     const TMessageType messageType,
-                                     const int32_t seqid);
-
-  uint32_t writeStructBegin(const char* name);
-
-  uint32_t writeStructEnd();
-
-  uint32_t writeFieldBegin(const char* name, const TType fieldType, const int16_t fieldId);
-
-  uint32_t writeFieldStop();
-
-  uint32_t writeListBegin(const TType elemType, const uint32_t size);
-
-  uint32_t writeSetBegin(const TType elemType, const uint32_t size);
-
-  virtual uint32_t writeMapBegin(const TType keyType, const TType valType, const uint32_t size);
-
-  uint32_t writeBool(const bool value);
-
-  uint32_t writeByte(const int8_t byte);
-
-  uint32_t writeI16(const int16_t i16);
-
-  uint32_t writeI32(const int32_t i32);
-
-  uint32_t writeI64(const int64_t i64);
-
-  uint32_t writeDouble(const double dub);
-
-  uint32_t writeString(const std::string& str);
-
-  uint32_t writeBinary(const std::string& str);
-
-  /**
-  * These methods are called by structs, but don't actually have any wired
-  * output or purpose
-  */
-  virtual uint32_t writeMessageEnd() { return 0; }
-  uint32_t writeMapEnd() { return 0; }
-  uint32_t writeListEnd() { return 0; }
-  uint32_t writeSetEnd() { return 0; }
-  uint32_t writeFieldEnd() { return 0; }
-
-protected:
-  int32_t writeFieldBeginInternal(const char* name,
-                                  const TType fieldType,
-                                  const int16_t fieldId,
-                                  int8_t typeOverride);
-  uint32_t writeCollectionBegin(const TType elemType, int32_t size);
-  uint32_t writeVarint32(uint32_t n);
-  uint32_t writeVarint64(uint64_t n);
-  uint64_t i64ToZigzag(const int64_t l);
-  uint32_t i32ToZigzag(const int32_t n);
-  inline int8_t getCompactType(const TType ttype);
-
-public:
-  uint32_t readMessageBegin(std::string& name, TMessageType& messageType, int32_t& seqid);
-
-  uint32_t readStructBegin(std::string& name);
-
-  uint32_t readStructEnd();
-
-  uint32_t readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId);
-
-  uint32_t readMapBegin(TType& keyType, TType& valType, uint32_t& size);
-
-  uint32_t readListBegin(TType& elemType, uint32_t& size);
-
-  uint32_t readSetBegin(TType& elemType, uint32_t& size);
-
-  uint32_t readBool(bool& value);
-  // Provide the default readBool() implementation for std::vector<bool>
-  using TVirtualProtocol<TCompactProtocolT<Transport_> >::readBool;
-
-  uint32_t readByte(int8_t& byte);
-
-  uint32_t readI16(int16_t& i16);
-
-  uint32_t readI32(int32_t& i32);
-
-  uint32_t readI64(int64_t& i64);
-
-  uint32_t readDouble(double& dub);
-
-  uint32_t readString(std::string& str);
-
-  uint32_t readBinary(std::string& str);
-
-  /*
-   *These methods are here for the struct to call, but don't have any wire
-   * encoding.
-   */
-  uint32_t readMessageEnd() { return 0; }
-  uint32_t readFieldEnd() { return 0; }
-  uint32_t readMapEnd() { return 0; }
-  uint32_t readListEnd() { return 0; }
-  uint32_t readSetEnd() { return 0; }
-
-protected:
-  uint32_t readVarint32(int32_t& i32);
-  uint32_t readVarint64(int64_t& i64);
-  int32_t zigzagToI32(uint32_t n);
-  int64_t zigzagToI64(uint64_t n);
-  TType getTType(int8_t type);
-
-  // Buffer for reading strings, save for the lifetime of the protocol to
-  // avoid memory churn allocating memory on every string read
-  int32_t string_limit_;
-  uint8_t* string_buf_;
-  int32_t string_buf_size_;
-  int32_t container_limit_;
-};
-
-typedef TCompactProtocolT<TTransport> TCompactProtocol;
-
-/**
- * Constructs compact protocol handlers
- */
-template <class Transport_>
-class TCompactProtocolFactoryT : public TProtocolFactory {
-public:
-  TCompactProtocolFactoryT() : string_limit_(0), container_limit_(0) {}
-
-  TCompactProtocolFactoryT(int32_t string_limit, int32_t container_limit)
-    : string_limit_(string_limit), container_limit_(container_limit) {}
-
-  virtual ~TCompactProtocolFactoryT() {}
-
-  void setStringSizeLimit(int32_t string_limit) { string_limit_ = string_limit; }
-
-  void setContainerSizeLimit(int32_t container_limit) { container_limit_ = container_limit; }
-
-  boost::shared_ptr<TProtocol> getProtocol(boost::shared_ptr<TTransport> trans) {
-    boost::shared_ptr<Transport_> specific_trans = boost::dynamic_pointer_cast<Transport_>(trans);
-    TProtocol* prot;
-    if (specific_trans) {
-      prot = new TCompactProtocolT<Transport_>(specific_trans, string_limit_, container_limit_);
-    } else {
-      prot = new TCompactProtocol(trans, string_limit_, container_limit_);
-    }
-
-    return boost::shared_ptr<TProtocol>(prot);
-  }
-
-private:
-  int32_t string_limit_;
-  int32_t container_limit_;
-};
-
-typedef TCompactProtocolFactoryT<TTransport> TCompactProtocolFactory;
-}
-}
-} // apache::thrift::protocol
-
-#include <thrift/protocol/TCompactProtocol.tcc>
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc
deleted file mode 100644
index 6bbf9ef..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TCompactProtocol.tcc
+++ /dev/null
@@ -1,826 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_TCC_
-#define _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_TCC_ 1
-
-#include <limits>
-
-#include "thrift/config.h"
-
-/*
- * TCompactProtocol::i*ToZigzag depend on the fact that the right shift
- * operator on a signed integer is an arithmetic (sign-extending) shift.
- * If this is not the case, the current implementation will not work.
- * If anyone encounters this error, we can try to figure out the best
- * way to implement an arithmetic right shift on their platform.
- */
-#if !defined(SIGNED_RIGHT_SHIFT_IS) || !defined(ARITHMETIC_RIGHT_SHIFT)
-# error "Unable to determine the behavior of a signed right shift"
-#endif
-#if SIGNED_RIGHT_SHIFT_IS != ARITHMETIC_RIGHT_SHIFT
-# error "TCompactProtocol currently only works if a signed right shift is arithmetic"
-#endif
-
-#ifdef __GNUC__
-#define UNLIKELY(val) (__builtin_expect((val), 0))
-#else
-#define UNLIKELY(val) (val)
-#endif
-
-namespace apache { namespace thrift { namespace protocol {
-
-namespace detail { namespace compact {
-
-enum Types {
-  CT_STOP           = 0x00,
-  CT_BOOLEAN_TRUE   = 0x01,
-  CT_BOOLEAN_FALSE  = 0x02,
-  CT_BYTE           = 0x03,
-  CT_I16            = 0x04,
-  CT_I32            = 0x05,
-  CT_I64            = 0x06,
-  CT_DOUBLE         = 0x07,
-  CT_BINARY         = 0x08,
-  CT_LIST           = 0x09,
-  CT_SET            = 0x0A,
-  CT_MAP            = 0x0B,
-  CT_STRUCT         = 0x0C
-};
-
-const int8_t TTypeToCType[16] = {
-  CT_STOP, // T_STOP
-  0, // unused
-  CT_BOOLEAN_TRUE, // T_BOOL
-  CT_BYTE, // T_BYTE
-  CT_DOUBLE, // T_DOUBLE
-  0, // unused
-  CT_I16, // T_I16
-  0, // unused
-  CT_I32, // T_I32
-  0, // unused
-  CT_I64, // T_I64
-  CT_BINARY, // T_STRING
-  CT_STRUCT, // T_STRUCT
-  CT_MAP, // T_MAP
-  CT_SET, // T_SET
-  CT_LIST, // T_LIST
-};
-
-}} // end detail::compact namespace
-
-
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeMessageBegin(
-    const std::string& name,
-    const TMessageType messageType,
-    const int32_t seqid) {
-  uint32_t wsize = 0;
-  wsize += writeByte(PROTOCOL_ID);
-  wsize += writeByte((VERSION_N & VERSION_MASK) | (((int32_t)messageType << TYPE_SHIFT_AMOUNT) & TYPE_MASK));
-  wsize += writeVarint32(seqid);
-  wsize += writeString(name);
-  return wsize;
-}
-
-/**
- * Write a field header containing the field id and field type. If the
- * difference between the current field id and the last one is small (< 15),
- * then the field id will be encoded in the 4 MSB as a delta. Otherwise, the
- * field id will follow the type header as a zigzag varint.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeFieldBegin(const char* name,
-                                                        const TType fieldType,
-                                                        const int16_t fieldId) {
-  if (fieldType == T_BOOL) {
-    booleanField_.name = name;
-    booleanField_.fieldType = fieldType;
-    booleanField_.fieldId = fieldId;
-  } else {
-    return writeFieldBeginInternal(name, fieldType, fieldId, -1);
-  }
-  return 0;
-}
-
-/**
- * Write the STOP symbol so we know there are no more fields in this struct.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeFieldStop() {
-  return writeByte(T_STOP);
-}
-
-/**
- * Write a struct begin. This doesn't actually put anything on the wire. We
- * use it as an opportunity to put special placeholder markers on the field
- * stack so we can get the field id deltas correct.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeStructBegin(const char* name) {
-  (void) name;
-  lastField_.push(lastFieldId_);
-  lastFieldId_ = 0;
-  return 0;
-}
-
-/**
- * Write a struct end. This doesn't actually put anything on the wire. We use
- * this as an opportunity to pop the last field from the current struct off
- * of the field stack.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeStructEnd() {
-  lastFieldId_ = lastField_.top();
-  lastField_.pop();
-  return 0;
-}
-
-/**
- * Write a List header.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeListBegin(const TType elemType,
-                                                       const uint32_t size) {
-  return writeCollectionBegin(elemType, size);
-}
-
-/**
- * Write a set header.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeSetBegin(const TType elemType,
-                                                      const uint32_t size) {
-  return writeCollectionBegin(elemType, size);
-}
-
-/**
- * Write a map header. If the map is empty, omit the key and value type
- * headers, as we don't need any additional information to skip it.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeMapBegin(const TType keyType,
-                                                      const TType valType,
-                                                      const uint32_t size) {
-  uint32_t wsize = 0;
-
-  if (size == 0) {
-    wsize += writeByte(0);
-  } else {
-    wsize += writeVarint32(size);
-    wsize += writeByte(getCompactType(keyType) << 4 | getCompactType(valType));
-  }
-  return wsize;
-}
-
-/**
- * Write a boolean value. Potentially, this could be a boolean field, in
- * which case the field header info isn't written yet. If so, decide what the
- * right type header is for the value and then write the field header.
- * Otherwise, write a single byte.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeBool(const bool value) {
-  uint32_t wsize = 0;
-
-  if (booleanField_.name != NULL) {
-    // we haven't written the field header yet
-    wsize
-      += writeFieldBeginInternal(booleanField_.name,
-                                 booleanField_.fieldType,
-                                 booleanField_.fieldId,
-                                 static_cast<int8_t>(value
-                                                     ? detail::compact::CT_BOOLEAN_TRUE
-                                                     : detail::compact::CT_BOOLEAN_FALSE));
-    booleanField_.name = NULL;
-  } else {
-    // we're not part of a field, so just write the value
-    wsize
-      += writeByte(static_cast<int8_t>(value
-                                       ? detail::compact::CT_BOOLEAN_TRUE
-                                       : detail::compact::CT_BOOLEAN_FALSE));
-  }
-  return wsize;
-}
-
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeByte(const int8_t byte) {
-  trans_->write((uint8_t*)&byte, 1);
-  return 1;
-}
-
-/**
- * Write an i16 as a zigzag varint.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeI16(const int16_t i16) {
-  return writeVarint32(i32ToZigzag(i16));
-}
-
-/**
- * Write an i32 as a zigzag varint.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeI32(const int32_t i32) {
-  return writeVarint32(i32ToZigzag(i32));
-}
-
-/**
- * Write an i64 as a zigzag varint.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeI64(const int64_t i64) {
-  return writeVarint64(i64ToZigzag(i64));
-}
-
-/**
- * Write a double to the wire as 8 bytes.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeDouble(const double dub) {
-  BOOST_STATIC_ASSERT(sizeof(double) == sizeof(uint64_t));
-  BOOST_STATIC_ASSERT(std::numeric_limits<double>::is_iec559);
-
-  uint64_t bits = bitwise_cast<uint64_t>(dub);
-  bits = THRIFT_htolell(bits);
-  trans_->write((uint8_t*)&bits, 8);
-  return 8;
-}
-
-/**
- * Write a string to the wire with a varint size preceding.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeString(const std::string& str) {
-  return writeBinary(str);
-}
-
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeBinary(const std::string& str) {
-  if(str.size() > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  uint32_t ssize = static_cast<uint32_t>(str.size());
-  uint32_t wsize = writeVarint32(ssize) ;
-  // checking ssize + wsize > uint_max, but we don't want to overflow while checking for overflows.
-  // transforming the check to ssize > uint_max - wsize
-  if(ssize > (std::numeric_limits<uint32_t>::max)() - wsize)
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  wsize += ssize;
-  trans_->write((uint8_t*)str.data(), ssize);
-  return wsize;
-}
-
-//
-// Internal Writing methods
-//
-
-/**
- * The workhorse of writeFieldBegin. It has the option of doing a
- * 'type override' of the type header. This is used specifically in the
- * boolean field case.
- */
-template <class Transport_>
-int32_t TCompactProtocolT<Transport_>::writeFieldBeginInternal(
-    const char* name,
-    const TType fieldType,
-    const int16_t fieldId,
-    int8_t typeOverride) {
-  (void) name;
-  uint32_t wsize = 0;
-
-  // if there's a type override, use that.
-  int8_t typeToWrite = (typeOverride == -1 ? getCompactType(fieldType) : typeOverride);
-
-  // check if we can use delta encoding for the field id
-  if (fieldId > lastFieldId_ && fieldId - lastFieldId_ <= 15) {
-    // write them together
-    wsize += writeByte(static_cast<int8_t>((fieldId - lastFieldId_)
-                                           << 4 | typeToWrite));
-  } else {
-    // write them separate
-    wsize += writeByte(typeToWrite);
-    wsize += writeI16(fieldId);
-  }
-
-  lastFieldId_ = fieldId;
-  return wsize;
-}
-
-/**
- * Abstract method for writing the start of lists and sets. List and sets on
- * the wire differ only by the type indicator.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeCollectionBegin(const TType elemType,
-                                                             int32_t size) {
-  uint32_t wsize = 0;
-  if (size <= 14) {
-    wsize += writeByte(static_cast<int8_t>(size
-                                           << 4 | getCompactType(elemType)));
-  } else {
-    wsize += writeByte(0xf0 | getCompactType(elemType));
-    wsize += writeVarint32(size);
-  }
-  return wsize;
-}
-
-/**
- * Write an i32 as a varint. Results in 1-5 bytes on the wire.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeVarint32(uint32_t n) {
-  uint8_t buf[5];
-  uint32_t wsize = 0;
-
-  while (true) {
-    if ((n & ~0x7F) == 0) {
-      buf[wsize++] = (int8_t)n;
-      break;
-    } else {
-      buf[wsize++] = (int8_t)((n & 0x7F) | 0x80);
-      n >>= 7;
-    }
-  }
-  trans_->write(buf, wsize);
-  return wsize;
-}
-
-/**
- * Write an i64 as a varint. Results in 1-10 bytes on the wire.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::writeVarint64(uint64_t n) {
-  uint8_t buf[10];
-  uint32_t wsize = 0;
-
-  while (true) {
-    if ((n & ~0x7FL) == 0) {
-      buf[wsize++] = (int8_t)n;
-      break;
-    } else {
-      buf[wsize++] = (int8_t)((n & 0x7F) | 0x80);
-      n >>= 7;
-    }
-  }
-  trans_->write(buf, wsize);
-  return wsize;
-}
-
-/**
- * Convert l into a zigzag long. This allows negative numbers to be
- * represented compactly as a varint.
- */
-template <class Transport_>
-uint64_t TCompactProtocolT<Transport_>::i64ToZigzag(const int64_t l) {
-  return (l << 1) ^ (l >> 63);
-}
-
-/**
- * Convert n into a zigzag int. This allows negative numbers to be
- * represented compactly as a varint.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::i32ToZigzag(const int32_t n) {
-  return (n << 1) ^ (n >> 31);
-}
-
-/**
- * Given a TType value, find the appropriate detail::compact::Types value
- */
-template <class Transport_>
-int8_t TCompactProtocolT<Transport_>::getCompactType(const TType ttype) {
-  return detail::compact::TTypeToCType[ttype];
-}
-
-//
-// Reading Methods
-//
-
-/**
- * Read a message header.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readMessageBegin(
-    std::string& name,
-    TMessageType& messageType,
-    int32_t& seqid) {
-  uint32_t rsize = 0;
-  int8_t protocolId;
-  int8_t versionAndType;
-  int8_t version;
-
-  rsize += readByte(protocolId);
-  if (protocolId != PROTOCOL_ID) {
-    throw TProtocolException(TProtocolException::BAD_VERSION, "Bad protocol identifier");
-  }
-
-  rsize += readByte(versionAndType);
-  version = (int8_t)(versionAndType & VERSION_MASK);
-  if (version != VERSION_N) {
-    throw TProtocolException(TProtocolException::BAD_VERSION, "Bad protocol version");
-  }
-
-  messageType = (TMessageType)((versionAndType >> TYPE_SHIFT_AMOUNT) & TYPE_BITS);
-  rsize += readVarint32(seqid);
-  rsize += readString(name);
-
-  return rsize;
-}
-
-/**
- * Read a struct begin. There's nothing on the wire for this, but it is our
- * opportunity to push a new struct begin marker on the field stack.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readStructBegin(std::string& name) {
-  name = "";
-  lastField_.push(lastFieldId_);
-  lastFieldId_ = 0;
-  return 0;
-}
-
-/**
- * Doesn't actually consume any wire data, just removes the last field for
- * this struct from the field stack.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readStructEnd() {
-  lastFieldId_ = lastField_.top();
-  lastField_.pop();
-  return 0;
-}
-
-/**
- * Read a field header off the wire.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readFieldBegin(std::string& name,
-                                                       TType& fieldType,
-                                                       int16_t& fieldId) {
-  (void) name;
-  uint32_t rsize = 0;
-  int8_t byte;
-  int8_t type;
-
-  rsize += readByte(byte);
-  type = (byte & 0x0f);
-
-  // if it's a stop, then we can return immediately, as the struct is over.
-  if (type == T_STOP) {
-    fieldType = T_STOP;
-    fieldId = 0;
-    return rsize;
-  }
-
-  // mask off the 4 MSB of the type header. it could contain a field id delta.
-  int16_t modifier = (int16_t)(((uint8_t)byte & 0xf0) >> 4);
-  if (modifier == 0) {
-    // not a delta, look ahead for the zigzag varint field id.
-    rsize += readI16(fieldId);
-  } else {
-    fieldId = (int16_t)(lastFieldId_ + modifier);
-  }
-  fieldType = getTType(type);
-
-  // if this happens to be a boolean field, the value is encoded in the type
-  if (type == detail::compact::CT_BOOLEAN_TRUE ||
-      type == detail::compact::CT_BOOLEAN_FALSE) {
-    // save the boolean value in a special instance variable.
-    boolValue_.hasBoolValue = true;
-    boolValue_.boolValue =
-      (type == detail::compact::CT_BOOLEAN_TRUE ? true : false);
-  }
-
-  // push the new field onto the field stack so we can keep the deltas going.
-  lastFieldId_ = fieldId;
-  return rsize;
-}
-
-/**
- * Read a map header off the wire. If the size is zero, skip reading the key
- * and value type. This means that 0-length maps will yield TMaps without the
- * "correct" types.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readMapBegin(TType& keyType,
-                                                     TType& valType,
-                                                     uint32_t& size) {
-  uint32_t rsize = 0;
-  int8_t kvType = 0;
-  int32_t msize = 0;
-
-  rsize += readVarint32(msize);
-  if (msize != 0)
-    rsize += readByte(kvType);
-
-  if (msize < 0) {
-    throw TProtocolException(TProtocolException::NEGATIVE_SIZE);
-  } else if (container_limit_ && msize > container_limit_) {
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  }
-
-  keyType = getTType((int8_t)((uint8_t)kvType >> 4));
-  valType = getTType((int8_t)((uint8_t)kvType & 0xf));
-  size = (uint32_t)msize;
-
-  return rsize;
-}
-
-/**
- * Read a list header off the wire. If the list size is 0-14, the size will
- * be packed into the element type header. If it's a longer list, the 4 MSB
- * of the element type header will be 0xF, and a varint will follow with the
- * true size.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readListBegin(TType& elemType,
-                                                      uint32_t& size) {
-  int8_t size_and_type;
-  uint32_t rsize = 0;
-  int32_t lsize;
-
-  rsize += readByte(size_and_type);
-
-  lsize = ((uint8_t)size_and_type >> 4) & 0x0f;
-  if (lsize == 15) {
-    rsize += readVarint32(lsize);
-  }
-
-  if (lsize < 0) {
-    throw TProtocolException(TProtocolException::NEGATIVE_SIZE);
-  } else if (container_limit_ && lsize > container_limit_) {
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  }
-
-  elemType = getTType((int8_t)(size_and_type & 0x0f));
-  size = (uint32_t)lsize;
-
-  return rsize;
-}
-
-/**
- * Read a set header off the wire. If the set size is 0-14, the size will
- * be packed into the element type header. If it's a longer set, the 4 MSB
- * of the element type header will be 0xF, and a varint will follow with the
- * true size.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readSetBegin(TType& elemType,
-                                                     uint32_t& size) {
-  return readListBegin(elemType, size);
-}
-
-/**
- * Read a boolean off the wire. If this is a boolean field, the value should
- * already have been read during readFieldBegin, so we'll just consume the
- * pre-stored value. Otherwise, read a byte.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readBool(bool& value) {
-  if (boolValue_.hasBoolValue == true) {
-    value = boolValue_.boolValue;
-    boolValue_.hasBoolValue = false;
-    return 0;
-  } else {
-    int8_t val;
-    readByte(val);
-    value = (val == detail::compact::CT_BOOLEAN_TRUE);
-    return 1;
-  }
-}
-
-/**
- * Read a single byte off the wire. Nothing interesting here.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readByte(int8_t& byte) {
-  uint8_t b[1];
-  trans_->readAll(b, 1);
-  byte = *(int8_t*)b;
-  return 1;
-}
-
-/**
- * Read an i16 from the wire as a zigzag varint.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readI16(int16_t& i16) {
-  int32_t value;
-  uint32_t rsize = readVarint32(value);
-  i16 = (int16_t)zigzagToI32(value);
-  return rsize;
-}
-
-/**
- * Read an i32 from the wire as a zigzag varint.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readI32(int32_t& i32) {
-  int32_t value;
-  uint32_t rsize = readVarint32(value);
-  i32 = zigzagToI32(value);
-  return rsize;
-}
-
-/**
- * Read an i64 from the wire as a zigzag varint.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readI64(int64_t& i64) {
-  int64_t value;
-  uint32_t rsize = readVarint64(value);
-  i64 = zigzagToI64(value);
-  return rsize;
-}
-
-/**
- * No magic here - just read a double off the wire.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readDouble(double& dub) {
-  BOOST_STATIC_ASSERT(sizeof(double) == sizeof(uint64_t));
-  BOOST_STATIC_ASSERT(std::numeric_limits<double>::is_iec559);
-
-  union {
-    uint64_t bits;
-    uint8_t b[8];
-  } u;
-  trans_->readAll(u.b, 8);
-  u.bits = THRIFT_letohll(u.bits);
-  dub = bitwise_cast<double>(u.bits);
-  return 8;
-}
-
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readString(std::string& str) {
-  return readBinary(str);
-}
-
-/**
- * Read a byte[] from the wire.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readBinary(std::string& str) {
-  int32_t rsize = 0;
-  int32_t size;
-
-  rsize += readVarint32(size);
-  // Catch empty string case
-  if (size == 0) {
-    str = "";
-    return rsize;
-  }
-
-  // Catch error cases
-  if (size < 0) {
-    throw TProtocolException(TProtocolException::NEGATIVE_SIZE);
-  }
-  if (string_limit_ > 0 && size > string_limit_) {
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  }
-
-  // Use the heap here to prevent stack overflow for v. large strings
-  if (size > string_buf_size_ || string_buf_ == NULL) {
-    void* new_string_buf = std::realloc(string_buf_, (uint32_t)size);
-    if (new_string_buf == NULL) {
-      throw std::bad_alloc();
-    }
-    string_buf_ = (uint8_t*)new_string_buf;
-    string_buf_size_ = size;
-  }
-  trans_->readAll(string_buf_, size);
-  str.assign((char*)string_buf_, size);
-
-  return rsize + (uint32_t)size;
-}
-
-/**
- * Read an i32 from the wire as a varint. The MSB of each byte is set
- * if there is another byte to follow. This can read up to 5 bytes.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readVarint32(int32_t& i32) {
-  int64_t val;
-  uint32_t rsize = readVarint64(val);
-  i32 = (int32_t)val;
-  return rsize;
-}
-
-/**
- * Read an i64 from the wire as a proper varint. The MSB of each byte is set
- * if there is another byte to follow. This can read up to 10 bytes.
- */
-template <class Transport_>
-uint32_t TCompactProtocolT<Transport_>::readVarint64(int64_t& i64) {
-  uint32_t rsize = 0;
-  uint64_t val = 0;
-  int shift = 0;
-  uint8_t buf[10];  // 64 bits / (7 bits/byte) = 10 bytes.
-  uint32_t buf_size = sizeof(buf);
-  const uint8_t* borrowed = trans_->borrow(buf, &buf_size);
-
-  // Fast path.
-  if (borrowed != NULL) {
-    while (true) {
-      uint8_t byte = borrowed[rsize];
-      rsize++;
-      val |= (uint64_t)(byte & 0x7f) << shift;
-      shift += 7;
-      if (!(byte & 0x80)) {
-        i64 = val;
-        trans_->consume(rsize);
-        return rsize;
-      }
-      // Have to check for invalid data so we don't crash.
-      if (UNLIKELY(rsize == sizeof(buf))) {
-        throw TProtocolException(TProtocolException::INVALID_DATA, "Variable-length int over 10 bytes.");
-      }
-    }
-  }
-
-  // Slow path.
-  else {
-    while (true) {
-      uint8_t byte;
-      rsize += trans_->readAll(&byte, 1);
-      val |= (uint64_t)(byte & 0x7f) << shift;
-      shift += 7;
-      if (!(byte & 0x80)) {
-        i64 = val;
-        return rsize;
-      }
-      // Might as well check for invalid data on the slow path too.
-      if (UNLIKELY(rsize >= sizeof(buf))) {
-        throw TProtocolException(TProtocolException::INVALID_DATA, "Variable-length int over 10 bytes.");
-      }
-    }
-  }
-}
-
-/**
- * Convert from zigzag int to int.
- */
-template <class Transport_>
-int32_t TCompactProtocolT<Transport_>::zigzagToI32(uint32_t n) {
-  return (n >> 1) ^ static_cast<uint32_t>(-static_cast<int32_t>(n & 1));
-}
-
-/**
- * Convert from zigzag long to long.
- */
-template <class Transport_>
-int64_t TCompactProtocolT<Transport_>::zigzagToI64(uint64_t n) {
-  return (n >> 1) ^ static_cast<uint64_t>(-static_cast<int64_t>(n & 1));
-}
-
-template <class Transport_>
-TType TCompactProtocolT<Transport_>::getTType(int8_t type) {
-  switch (type) {
-    case T_STOP:
-      return T_STOP;
-    case detail::compact::CT_BOOLEAN_FALSE:
-    case detail::compact::CT_BOOLEAN_TRUE:
-      return T_BOOL;
-    case detail::compact::CT_BYTE:
-      return T_BYTE;
-    case detail::compact::CT_I16:
-      return T_I16;
-    case detail::compact::CT_I32:
-      return T_I32;
-    case detail::compact::CT_I64:
-      return T_I64;
-    case detail::compact::CT_DOUBLE:
-      return T_DOUBLE;
-    case detail::compact::CT_BINARY:
-      return T_STRING;
-    case detail::compact::CT_LIST:
-      return T_LIST;
-    case detail::compact::CT_SET:
-      return T_SET;
-    case detail::compact::CT_MAP:
-      return T_MAP;
-    case detail::compact::CT_STRUCT:
-      return T_STRUCT;
-    default:
-      throw TException(std::string("don't know what type: ") + (char)type);
-  }
-}
-
-}}} // apache::thrift::protocol
-
-#endif // _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_TCC_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp
deleted file mode 100644
index 09b978c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/protocol/TDebugProtocol.h>
-
-#include <cassert>
-#include <cctype>
-#include <cstdio>
-#include <stdexcept>
-#include <boost/static_assert.hpp>
-#include <boost/lexical_cast.hpp>
-
-using std::string;
-
-static string byte_to_hex(const uint8_t byte) {
-  char buf[3];
-  int ret = std::sprintf(buf, "%02x", (int)byte);
-  THRIFT_UNUSED_VARIABLE(ret);
-  assert(ret == 2);
-  assert(buf[2] == '\0');
-  return buf;
-}
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-string TDebugProtocol::fieldTypeName(TType type) {
-  switch (type) {
-  case T_STOP:
-    return "stop";
-  case T_VOID:
-    return "void";
-  case T_BOOL:
-    return "bool";
-  case T_BYTE:
-    return "byte";
-  case T_I16:
-    return "i16";
-  case T_I32:
-    return "i32";
-  case T_U64:
-    return "u64";
-  case T_I64:
-    return "i64";
-  case T_DOUBLE:
-    return "double";
-  case T_STRING:
-    return "string";
-  case T_STRUCT:
-    return "struct";
-  case T_MAP:
-    return "map";
-  case T_SET:
-    return "set";
-  case T_LIST:
-    return "list";
-  case T_UTF8:
-    return "utf8";
-  case T_UTF16:
-    return "utf16";
-  default:
-    return "unknown";
-  }
-}
-
-void TDebugProtocol::indentUp() {
-  indent_str_ += string(indent_inc, ' ');
-}
-
-void TDebugProtocol::indentDown() {
-  if (indent_str_.length() < (string::size_type)indent_inc) {
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  }
-  indent_str_.erase(indent_str_.length() - indent_inc);
-}
-
-uint32_t TDebugProtocol::writePlain(const string& str) {
-  if (str.length() > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  trans_->write((uint8_t*)str.data(), static_cast<uint32_t>(str.length()));
-  return static_cast<uint32_t>(str.length());
-}
-
-uint32_t TDebugProtocol::writeIndented(const string& str) {
-  if (str.length() > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  if (indent_str_.length() > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  uint64_t total_len = indent_str_.length() + str.length();
-  if (total_len > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  trans_->write((uint8_t*)indent_str_.data(), static_cast<uint32_t>(indent_str_.length()));
-  trans_->write((uint8_t*)str.data(), static_cast<uint32_t>(str.length()));
-  return static_cast<uint32_t>(indent_str_.length() + str.length());
-}
-
-uint32_t TDebugProtocol::startItem() {
-  uint32_t size;
-
-  switch (write_state_.back()) {
-  case UNINIT:
-    // XXX figure out what to do here.
-    // throw TProtocolException(TProtocolException::INVALID_DATA);
-    // return writeIndented(str);
-    return 0;
-  case STRUCT:
-    return 0;
-  case SET:
-    return writeIndented("");
-  case MAP_KEY:
-    return writeIndented("");
-  case MAP_VALUE:
-    return writePlain(" -> ");
-  case LIST:
-    size = writeIndented("[" + boost::lexical_cast<string>(list_idx_.back()) + "] = ");
-    list_idx_.back()++;
-    return size;
-  default:
-    throw std::logic_error("Invalid enum value.");
-  }
-}
-
-uint32_t TDebugProtocol::endItem() {
-  // uint32_t size;
-
-  switch (write_state_.back()) {
-  case UNINIT:
-    // XXX figure out what to do here.
-    // throw TProtocolException(TProtocolException::INVALID_DATA);
-    // return writeIndented(str);
-    return 0;
-  case STRUCT:
-    return writePlain(",\n");
-  case SET:
-    return writePlain(",\n");
-  case MAP_KEY:
-    write_state_.back() = MAP_VALUE;
-    return 0;
-  case MAP_VALUE:
-    write_state_.back() = MAP_KEY;
-    return writePlain(",\n");
-  case LIST:
-    return writePlain(",\n");
-  default:
-    throw std::logic_error("Invalid enum value.");
-  }
-}
-
-uint32_t TDebugProtocol::writeItem(const std::string& str) {
-  uint32_t size = 0;
-  size += startItem();
-  size += writePlain(str);
-  size += endItem();
-  return size;
-}
-
-uint32_t TDebugProtocol::writeMessageBegin(const std::string& name,
-                                           const TMessageType messageType,
-                                           const int32_t seqid) {
-  (void)seqid;
-  string mtype;
-  switch (messageType) {
-  case T_CALL:
-    mtype = "call";
-    break;
-  case T_REPLY:
-    mtype = "reply";
-    break;
-  case T_EXCEPTION:
-    mtype = "exn";
-    break;
-  case T_ONEWAY:
-    mtype = "oneway";
-    break;
-  }
-
-  uint32_t size = writeIndented("(" + mtype + ") " + name + "(");
-  indentUp();
-  return size;
-}
-
-uint32_t TDebugProtocol::writeMessageEnd() {
-  indentDown();
-  return writeIndented(")\n");
-}
-
-uint32_t TDebugProtocol::writeStructBegin(const char* name) {
-  uint32_t size = 0;
-  size += startItem();
-  size += writePlain(string(name) + " {\n");
-  indentUp();
-  write_state_.push_back(STRUCT);
-  return size;
-}
-
-uint32_t TDebugProtocol::writeStructEnd() {
-  indentDown();
-  write_state_.pop_back();
-  uint32_t size = 0;
-  size += writeIndented("}");
-  size += endItem();
-  return size;
-}
-
-uint32_t TDebugProtocol::writeFieldBegin(const char* name,
-                                         const TType fieldType,
-                                         const int16_t fieldId) {
-  // sprintf(id_str, "%02d", fieldId);
-  string id_str = boost::lexical_cast<string>(fieldId);
-  if (id_str.length() == 1)
-    id_str = '0' + id_str;
-
-  return writeIndented(id_str + ": " + name + " (" + fieldTypeName(fieldType) + ") = ");
-}
-
-uint32_t TDebugProtocol::writeFieldEnd() {
-  assert(write_state_.back() == STRUCT);
-  return 0;
-}
-
-uint32_t TDebugProtocol::writeFieldStop() {
-  return 0;
-  // writeIndented("***STOP***\n");
-}
-
-uint32_t TDebugProtocol::writeMapBegin(const TType keyType,
-                                       const TType valType,
-                                       const uint32_t size) {
-  // TODO(dreiss): Optimize short maps?
-  uint32_t bsize = 0;
-  bsize += startItem();
-  bsize += writePlain(
-      "map<" + fieldTypeName(keyType) + "," + fieldTypeName(valType) + ">"
-      "[" + boost::lexical_cast<string>(size) + "] {\n");
-  indentUp();
-  write_state_.push_back(MAP_KEY);
-  return bsize;
-}
-
-uint32_t TDebugProtocol::writeMapEnd() {
-  indentDown();
-  write_state_.pop_back();
-  uint32_t size = 0;
-  size += writeIndented("}");
-  size += endItem();
-  return size;
-}
-
-uint32_t TDebugProtocol::writeListBegin(const TType elemType, const uint32_t size) {
-  // TODO(dreiss): Optimize short arrays.
-  uint32_t bsize = 0;
-  bsize += startItem();
-  bsize += writePlain(
-      "list<" + fieldTypeName(elemType) + ">"
-      "[" + boost::lexical_cast<string>(size) + "] {\n");
-  indentUp();
-  write_state_.push_back(LIST);
-  list_idx_.push_back(0);
-  return bsize;
-}
-
-uint32_t TDebugProtocol::writeListEnd() {
-  indentDown();
-  write_state_.pop_back();
-  list_idx_.pop_back();
-  uint32_t size = 0;
-  size += writeIndented("}");
-  size += endItem();
-  return size;
-}
-
-uint32_t TDebugProtocol::writeSetBegin(const TType elemType, const uint32_t size) {
-  // TODO(dreiss): Optimize short sets.
-  uint32_t bsize = 0;
-  bsize += startItem();
-  bsize += writePlain(
-      "set<" + fieldTypeName(elemType) + ">"
-      "[" + boost::lexical_cast<string>(size) + "] {\n");
-  indentUp();
-  write_state_.push_back(SET);
-  return bsize;
-}
-
-uint32_t TDebugProtocol::writeSetEnd() {
-  indentDown();
-  write_state_.pop_back();
-  uint32_t size = 0;
-  size += writeIndented("}");
-  size += endItem();
-  return size;
-}
-
-uint32_t TDebugProtocol::writeBool(const bool value) {
-  return writeItem(value ? "true" : "false");
-}
-
-uint32_t TDebugProtocol::writeByte(const int8_t byte) {
-  return writeItem("0x" + byte_to_hex(byte));
-}
-
-uint32_t TDebugProtocol::writeI16(const int16_t i16) {
-  return writeItem(boost::lexical_cast<string>(i16));
-}
-
-uint32_t TDebugProtocol::writeI32(const int32_t i32) {
-  return writeItem(boost::lexical_cast<string>(i32));
-}
-
-uint32_t TDebugProtocol::writeI64(const int64_t i64) {
-  return writeItem(boost::lexical_cast<string>(i64));
-}
-
-uint32_t TDebugProtocol::writeDouble(const double dub) {
-  return writeItem(boost::lexical_cast<string>(dub));
-}
-
-uint32_t TDebugProtocol::writeString(const string& str) {
-  // XXX Raw/UTF-8?
-
-  string to_show = str;
-  if (to_show.length() > (string::size_type)string_limit_) {
-    to_show = str.substr(0, string_prefix_size_);
-    to_show += "[...](" + boost::lexical_cast<string>(str.length()) + ")";
-  }
-
-  string output = "\"";
-
-  for (string::const_iterator it = to_show.begin(); it != to_show.end(); ++it) {
-    if (*it == '\\') {
-      output += "\\\\";
-    } else if (*it == '"') {
-      output += "\\\"";
-      // passing characters <0 to std::isprint causes asserts. isprint takes an
-      // int, so we need to be careful of sign extension
-    } else if (std::isprint((unsigned char)*it)) {
-      output += *it;
-    } else {
-      switch (*it) {
-      case '\a':
-        output += "\\a";
-        break;
-      case '\b':
-        output += "\\b";
-        break;
-      case '\f':
-        output += "\\f";
-        break;
-      case '\n':
-        output += "\\n";
-        break;
-      case '\r':
-        output += "\\r";
-        break;
-      case '\t':
-        output += "\\t";
-        break;
-      case '\v':
-        output += "\\v";
-        break;
-      default:
-        output += "\\x";
-        output += byte_to_hex(*it);
-      }
-    }
-  }
-
-  output += '\"';
-  return writeItem(output);
-}
-
-uint32_t TDebugProtocol::writeBinary(const string& str) {
-  // XXX Hex?
-  return TDebugProtocol::writeString(str);
-}
-}
-}
-} // apache::thrift::protocol
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TDebugProtocol.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TDebugProtocol.h
deleted file mode 100644
index cc93230..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TDebugProtocol.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TDEBUGPROTOCOL_H_
-#define _THRIFT_PROTOCOL_TDEBUGPROTOCOL_H_ 1
-
-#include <thrift/protocol/TVirtualProtocol.h>
-
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-/*
-
-!!! EXPERIMENTAL CODE !!!
-
-This protocol is very much a work in progress.
-It doesn't handle many cases properly.
-It throws exceptions in many cases.
-It probably segfaults in many cases.
-Bug reports and feature requests are welcome.
-Complaints are not. :R
-
-*/
-
-/**
- * Protocol that prints the payload in a nice human-readable format.
- * Reading from this protocol is not supported.
- *
- */
-class TDebugProtocol : public TVirtualProtocol<TDebugProtocol> {
-private:
-  enum write_state_t { UNINIT, STRUCT, LIST, SET, MAP_KEY, MAP_VALUE };
-
-public:
-  TDebugProtocol(boost::shared_ptr<TTransport> trans)
-    : TVirtualProtocol<TDebugProtocol>(trans),
-      trans_(trans.get()),
-      string_limit_(DEFAULT_STRING_LIMIT),
-      string_prefix_size_(DEFAULT_STRING_PREFIX_SIZE) {
-    write_state_.push_back(UNINIT);
-  }
-
-  static const int32_t DEFAULT_STRING_LIMIT = 256;
-  static const int32_t DEFAULT_STRING_PREFIX_SIZE = 16;
-
-  void setStringSizeLimit(int32_t string_limit) { string_limit_ = string_limit; }
-
-  void setStringPrefixSize(int32_t string_prefix_size) { string_prefix_size_ = string_prefix_size; }
-
-  uint32_t writeMessageBegin(const std::string& name,
-                             const TMessageType messageType,
-                             const int32_t seqid);
-
-  uint32_t writeMessageEnd();
-
-  uint32_t writeStructBegin(const char* name);
-
-  uint32_t writeStructEnd();
-
-  uint32_t writeFieldBegin(const char* name, const TType fieldType, const int16_t fieldId);
-
-  uint32_t writeFieldEnd();
-
-  uint32_t writeFieldStop();
-
-  uint32_t writeMapBegin(const TType keyType, const TType valType, const uint32_t size);
-
-  uint32_t writeMapEnd();
-
-  uint32_t writeListBegin(const TType elemType, const uint32_t size);
-
-  uint32_t writeListEnd();
-
-  uint32_t writeSetBegin(const TType elemType, const uint32_t size);
-
-  uint32_t writeSetEnd();
-
-  uint32_t writeBool(const bool value);
-
-  uint32_t writeByte(const int8_t byte);
-
-  uint32_t writeI16(const int16_t i16);
-
-  uint32_t writeI32(const int32_t i32);
-
-  uint32_t writeI64(const int64_t i64);
-
-  uint32_t writeDouble(const double dub);
-
-  uint32_t writeString(const std::string& str);
-
-  uint32_t writeBinary(const std::string& str);
-
-private:
-  void indentUp();
-  void indentDown();
-  uint32_t writePlain(const std::string& str);
-  uint32_t writeIndented(const std::string& str);
-  uint32_t startItem();
-  uint32_t endItem();
-  uint32_t writeItem(const std::string& str);
-
-  static std::string fieldTypeName(TType type);
-
-  TTransport* trans_;
-
-  int32_t string_limit_;
-  int32_t string_prefix_size_;
-
-  std::string indent_str_;
-  static const int indent_inc = 2;
-
-  std::vector<write_state_t> write_state_;
-  std::vector<int> list_idx_;
-};
-
-/**
- * Constructs debug protocol handlers
- */
-class TDebugProtocolFactory : public TProtocolFactory {
-public:
-  TDebugProtocolFactory() {}
-  virtual ~TDebugProtocolFactory() {}
-
-  boost::shared_ptr<TProtocol> getProtocol(boost::shared_ptr<TTransport> trans) {
-    return boost::shared_ptr<TProtocol>(new TDebugProtocol(trans));
-  }
-};
-}
-}
-} // apache::thrift::protocol
-
-// TODO(dreiss): Move (part of) ThriftDebugString into a .cpp file and remove this.
-#include <thrift/transport/TBufferTransports.h>
-
-namespace apache {
-namespace thrift {
-
-template <typename ThriftStruct>
-std::string ThriftDebugString(const ThriftStruct& ts) {
-  using namespace apache::thrift::transport;
-  using namespace apache::thrift::protocol;
-  TMemoryBuffer* buffer = new TMemoryBuffer;
-  boost::shared_ptr<TTransport> trans(buffer);
-  TDebugProtocol protocol(trans);
-
-  ts.write(&protocol);
-
-  uint8_t* buf;
-  uint32_t size;
-  buffer->getBuffer(&buf, &size);
-  return std::string((char*)buf, (unsigned int)size);
-}
-
-// TODO(dreiss): This is badly broken.  Don't use it unless you are me.
-#if 0
-template<typename Object>
-std::string DebugString(const std::vector<Object>& vec) {
-  using namespace apache::thrift::transport;
-  using namespace apache::thrift::protocol;
-  TMemoryBuffer* buffer = new TMemoryBuffer;
-  boost::shared_ptr<TTransport> trans(buffer);
-  TDebugProtocol protocol(trans);
-
-  // I am gross!
-  protocol.writeStructBegin("SomeRandomVector");
-
-  // TODO: Fix this with a trait.
-  protocol.writeListBegin((TType)99, vec.size());
-  typename std::vector<Object>::const_iterator it;
-  for (it = vec.begin(); it != vec.end(); ++it) {
-    it->write(&protocol);
-  }
-  protocol.writeListEnd();
-
-  uint8_t* buf;
-  uint32_t size;
-  buffer->getBuffer(&buf, &size);
-  return std::string((char*)buf, (unsigned int)size);
-}
-#endif // 0
-}
-} // apache::thrift
-
-#endif // #ifndef _THRIFT_PROTOCOL_TDEBUGPROTOCOL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/THeaderProtocol.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/THeaderProtocol.cpp
deleted file mode 100644
index 02dc736..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/THeaderProtocol.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef THRIFT_PROTOCOL_THEADERPROTOCOL_CPP_
-#define THRIFT_PROTOCOL_THEADERPROTOCOL_CPP_ 1
-
-#include <thrift/protocol/THeaderProtocol.h>
-#include <thrift/protocol/TCompactProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/TApplicationException.h>
-
-#include <limits>
-
-#include <boost/static_assert.hpp>
-#include <boost/make_shared.hpp>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-void THeaderProtocol::resetProtocol() {
-  if (proto_ && protoId_ == trans_->getProtocolId()) {
-    return;
-  }
-
-  protoId_ = trans_->getProtocolId();
-
-  switch (protoId_) {
-  case T_BINARY_PROTOCOL:
-    proto_ = boost::make_shared<TBinaryProtocolT<THeaderTransport> >(trans_);
-    break;
-
-  case T_COMPACT_PROTOCOL:
-    proto_ = boost::make_shared<TCompactProtocolT<THeaderTransport> >(trans_);
-    break;
-
-  default:
-    throw TApplicationException(TApplicationException::INVALID_PROTOCOL,
-                                "Unknown protocol requested");
-  }
-}
-
-uint32_t THeaderProtocol::writeMessageBegin(const std::string& name,
-                                            const TMessageType messageType,
-                                            const int32_t seqId) {
-  resetProtocol(); // Reset in case we changed protocols
-  trans_->setSequenceNumber(seqId);
-  return proto_->writeMessageBegin(name, messageType, seqId);
-}
-
-uint32_t THeaderProtocol::writeMessageEnd() {
-  return proto_->writeMessageEnd();
-}
-
-uint32_t THeaderProtocol::writeStructBegin(const char* name) {
-  return proto_->writeStructBegin(name);
-}
-
-uint32_t THeaderProtocol::writeStructEnd() {
-  return proto_->writeStructEnd();
-}
-
-uint32_t THeaderProtocol::writeFieldBegin(const char* name,
-                                          const TType fieldType,
-                                          const int16_t fieldId) {
-  return proto_->writeFieldBegin(name, fieldType, fieldId);
-}
-
-uint32_t THeaderProtocol::writeFieldEnd() {
-  return proto_->writeFieldEnd();
-}
-
-uint32_t THeaderProtocol::writeFieldStop() {
-  return proto_->writeFieldStop();
-}
-
-uint32_t THeaderProtocol::writeMapBegin(const TType keyType,
-                                        const TType valType,
-                                        const uint32_t size) {
-  return proto_->writeMapBegin(keyType, valType, size);
-}
-
-uint32_t THeaderProtocol::writeMapEnd() {
-  return proto_->writeMapEnd();
-}
-
-uint32_t THeaderProtocol::writeListBegin(const TType elemType, const uint32_t size) {
-  return proto_->writeListBegin(elemType, size);
-}
-
-uint32_t THeaderProtocol::writeListEnd() {
-  return proto_->writeListEnd();
-}
-
-uint32_t THeaderProtocol::writeSetBegin(const TType elemType, const uint32_t size) {
-  return proto_->writeSetBegin(elemType, size);
-}
-
-uint32_t THeaderProtocol::writeSetEnd() {
-  return proto_->writeSetEnd();
-}
-
-uint32_t THeaderProtocol::writeBool(const bool value) {
-  return proto_->writeBool(value);
-}
-
-uint32_t THeaderProtocol::writeByte(const int8_t byte) {
-  return proto_->writeByte(byte);
-}
-
-uint32_t THeaderProtocol::writeI16(const int16_t i16) {
-  return proto_->writeI16(i16);
-}
-
-uint32_t THeaderProtocol::writeI32(const int32_t i32) {
-  return proto_->writeI32(i32);
-}
-
-uint32_t THeaderProtocol::writeI64(const int64_t i64) {
-  return proto_->writeI64(i64);
-}
-
-uint32_t THeaderProtocol::writeDouble(const double dub) {
-  return proto_->writeDouble(dub);
-}
-
-uint32_t THeaderProtocol::writeString(const std::string& str) {
-  return proto_->writeString(str);
-}
-
-uint32_t THeaderProtocol::writeBinary(const std::string& str) {
-  return proto_->writeBinary(str);
-}
-
-/**
- * Reading functions
- */
-
-uint32_t THeaderProtocol::readMessageBegin(std::string& name,
-                                           TMessageType& messageType,
-                                           int32_t& seqId) {
-  // Read the next frame, and change protocols if needed
-  try {
-    trans_->resetProtocol();
-    resetProtocol();
-  } catch (const TApplicationException& ex) {
-    writeMessageBegin("", T_EXCEPTION, 0);
-    ex.write((TProtocol*)this);
-    writeMessageEnd();
-    trans_->flush();
-
-    // The framing is still good, but we don't know about this protocol.
-    // In the future, this could be made a client-side only error if
-    // connection pooling is used.
-    throw ex;
-  }
-  return proto_->readMessageBegin(name, messageType, seqId);
-}
-
-uint32_t THeaderProtocol::readMessageEnd() {
-  return proto_->readMessageEnd();
-}
-
-uint32_t THeaderProtocol::readStructBegin(std::string& name) {
-  return proto_->readStructBegin(name);
-}
-
-uint32_t THeaderProtocol::readStructEnd() {
-  return proto_->readStructEnd();
-}
-
-uint32_t THeaderProtocol::readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId) {
-  return proto_->readFieldBegin(name, fieldType, fieldId);
-}
-
-uint32_t THeaderProtocol::readFieldEnd() {
-  return proto_->readFieldEnd();
-}
-
-uint32_t THeaderProtocol::readMapBegin(TType& keyType, TType& valType, uint32_t& size) {
-  return proto_->readMapBegin(keyType, valType, size);
-}
-
-uint32_t THeaderProtocol::readMapEnd() {
-  return proto_->readMapEnd();
-}
-
-uint32_t THeaderProtocol::readListBegin(TType& elemType, uint32_t& size) {
-  return proto_->readListBegin(elemType, size);
-}
-
-uint32_t THeaderProtocol::readListEnd() {
-  return proto_->readListEnd();
-}
-
-uint32_t THeaderProtocol::readSetBegin(TType& elemType, uint32_t& size) {
-  return proto_->readSetBegin(elemType, size);
-}
-
-uint32_t THeaderProtocol::readSetEnd() {
-  return proto_->readSetEnd();
-}
-
-uint32_t THeaderProtocol::readBool(bool& value) {
-  return proto_->readBool(value);
-}
-
-uint32_t THeaderProtocol::readByte(int8_t& byte) {
-  return proto_->readByte(byte);
-}
-
-uint32_t THeaderProtocol::readI16(int16_t& i16) {
-  return proto_->readI16(i16);
-}
-
-uint32_t THeaderProtocol::readI32(int32_t& i32) {
-  return proto_->readI32(i32);
-}
-
-uint32_t THeaderProtocol::readI64(int64_t& i64) {
-  return proto_->readI64(i64);
-}
-
-uint32_t THeaderProtocol::readDouble(double& dub) {
-  return proto_->readDouble(dub);
-}
-
-uint32_t THeaderProtocol::readString(std::string& str) {
-  return proto_->readString(str);
-}
-
-uint32_t THeaderProtocol::readBinary(std::string& binary) {
-  return proto_->readBinary(binary);
-}
-}
-}
-} // apache::thrift::protocol
-
-#endif // #ifndef THRIFT_PROTOCOL_THEADERPROTOCOL_CPP_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/THeaderProtocol.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/THeaderProtocol.h
deleted file mode 100644
index e7d4bd6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/THeaderProtocol.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_PROTOCOL_THEADERPROTOCOL_H_
-#define THRIFT_PROTOCOL_THEADERPROTOCOL_H_ 1
-
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/protocol/TProtocolTypes.h>
-#include <thrift/protocol/TVirtualProtocol.h>
-#include <thrift/transport/THeaderTransport.h>
-
-#include <boost/shared_ptr.hpp>
-
-using apache::thrift::transport::THeaderTransport;
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-/**
- * The header protocol for thrift. Reads unframed, framed, header format,
- * and http
- *
- */
-class THeaderProtocol : public TVirtualProtocol<THeaderProtocol> {
-protected:
-public:
-  void resetProtocol();
-
-  explicit THeaderProtocol(const boost::shared_ptr<TTransport>& trans,
-                           uint16_t protoId = T_COMPACT_PROTOCOL)
-    : TVirtualProtocol<THeaderProtocol>(boost::shared_ptr<TTransport>(new THeaderTransport(trans))),
-      trans_(boost::dynamic_pointer_cast<THeaderTransport>(this->getTransport())),
-      protoId_(protoId) {
-    trans_->setProtocolId(protoId);
-    resetProtocol();
-  }
-
-  THeaderProtocol(const boost::shared_ptr<TTransport>& inTrans,
-                  const boost::shared_ptr<TTransport>& outTrans,
-                  uint16_t protoId = T_COMPACT_PROTOCOL)
-    : TVirtualProtocol<THeaderProtocol>(
-          boost::shared_ptr<TTransport>(new THeaderTransport(inTrans, outTrans))),
-      trans_(boost::dynamic_pointer_cast<THeaderTransport>(this->getTransport())),
-      protoId_(protoId) {
-    trans_->setProtocolId(protoId);
-    resetProtocol();
-  }
-
-  ~THeaderProtocol() {}
-
-  /**
-   * Functions to work with headers by calling into THeaderTransport
-   */
-  void setProtocolId(uint16_t protoId) {
-    trans_->setProtocolId(protoId);
-    resetProtocol();
-  }
-
-  typedef THeaderTransport::StringToStringMap StringToStringMap;
-
-  // these work with write headers
-  void setHeader(const std::string& key, const std::string& value) {
-    trans_->setHeader(key, value);
-  }
-
-  void clearHeaders() { trans_->clearHeaders(); }
-
-  StringToStringMap& getWriteHeaders() { return trans_->getWriteHeaders(); }
-
-  // these work with read headers
-  const StringToStringMap& getHeaders() const { return trans_->getHeaders(); }
-
-  /**
-   * Writing functions.
-   */
-
-  /*ol*/ uint32_t writeMessageBegin(const std::string& name,
-                                    const TMessageType messageType,
-                                    const int32_t seqId);
-
-  /*ol*/ uint32_t writeMessageEnd();
-
-  uint32_t writeStructBegin(const char* name);
-
-  uint32_t writeStructEnd();
-
-  uint32_t writeFieldBegin(const char* name, const TType fieldType, const int16_t fieldId);
-
-  uint32_t writeFieldEnd();
-
-  uint32_t writeFieldStop();
-
-  uint32_t writeMapBegin(const TType keyType, const TType valType, const uint32_t size);
-
-  uint32_t writeMapEnd();
-
-  uint32_t writeListBegin(const TType elemType, const uint32_t size);
-
-  uint32_t writeListEnd();
-
-  uint32_t writeSetBegin(const TType elemType, const uint32_t size);
-
-  uint32_t writeSetEnd();
-
-  uint32_t writeBool(const bool value);
-
-  uint32_t writeByte(const int8_t byte);
-
-  uint32_t writeI16(const int16_t i16);
-
-  uint32_t writeI32(const int32_t i32);
-
-  uint32_t writeI64(const int64_t i64);
-
-  uint32_t writeDouble(const double dub);
-
-  uint32_t writeString(const std::string& str);
-
-  uint32_t writeBinary(const std::string& str);
-
-  /**
-   * Reading functions
-   */
-
-  /*ol*/ uint32_t readMessageBegin(std::string& name, TMessageType& messageType, int32_t& seqId);
-
-  /*ol*/ uint32_t readMessageEnd();
-
-  uint32_t readStructBegin(std::string& name);
-
-  uint32_t readStructEnd();
-
-  uint32_t readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId);
-
-  uint32_t readFieldEnd();
-
-  uint32_t readMapBegin(TType& keyType, TType& valType, uint32_t& size);
-
-  uint32_t readMapEnd();
-
-  uint32_t readListBegin(TType& elemType, uint32_t& size);
-
-  uint32_t readListEnd();
-
-  uint32_t readSetBegin(TType& elemType, uint32_t& size);
-
-  uint32_t readSetEnd();
-
-  uint32_t readBool(bool& value);
-  // Provide the default readBool() implementation for std::vector<bool>
-  using TVirtualProtocol<THeaderProtocol>::readBool;
-
-  uint32_t readByte(int8_t& byte);
-
-  uint32_t readI16(int16_t& i16);
-
-  uint32_t readI32(int32_t& i32);
-
-  uint32_t readI64(int64_t& i64);
-
-  uint32_t readDouble(double& dub);
-
-  uint32_t readString(std::string& str);
-
-  uint32_t readBinary(std::string& binary);
-
-protected:
-  boost::shared_ptr<THeaderTransport> trans_;
-
-  boost::shared_ptr<TProtocol> proto_;
-  uint32_t protoId_;
-};
-
-class THeaderProtocolFactory : public TProtocolFactory {
-public:
-  virtual boost::shared_ptr<TProtocol> getProtocol(boost::shared_ptr<transport::TTransport> trans) {
-    THeaderProtocol* headerProtocol
-        = new THeaderProtocol(trans, boost::shared_ptr<transport::TTransport>(), T_BINARY_PROTOCOL);
-    return boost::shared_ptr<TProtocol>(headerProtocol);
-  }
-
-  virtual boost::shared_ptr<TProtocol> getProtocol(
-      boost::shared_ptr<transport::TTransport> inTrans,
-      boost::shared_ptr<transport::TTransport> outTrans) {
-    THeaderProtocol* headerProtocol = new THeaderProtocol(inTrans, outTrans, T_BINARY_PROTOCOL);
-    return boost::shared_ptr<TProtocol>(headerProtocol);
-  }
-};
-}
-}
-} // apache::thrift::protocol
-
-#endif // #ifndef THRIFT_PROTOCOL_THEADERPROTOCOL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp
deleted file mode 100644
index d3ec722..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp
+++ /dev/null
@@ -1,1099 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/protocol/TJSONProtocol.h>
-
-#include <boost/lexical_cast.hpp>
-#include <boost/locale.hpp>
-#include <boost/math/special_functions/fpclassify.hpp>
-
-#include <cmath>
-#include <limits>
-#include <locale>
-#include <sstream>
-#include <stdexcept>
-
-#include <thrift/protocol/TBase64Utils.h>
-#include <thrift/transport/TTransportException.h>
-
-using namespace apache::thrift::transport;
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-// Static data
-
-static const uint8_t kJSONObjectStart = '{';
-static const uint8_t kJSONObjectEnd = '}';
-static const uint8_t kJSONArrayStart = '[';
-static const uint8_t kJSONArrayEnd = ']';
-static const uint8_t kJSONPairSeparator = ':';
-static const uint8_t kJSONElemSeparator = ',';
-static const uint8_t kJSONBackslash = '\\';
-static const uint8_t kJSONStringDelimiter = '"';
-static const uint8_t kJSONZeroChar = '0';
-static const uint8_t kJSONEscapeChar = 'u';
-
-static const std::string kJSONEscapePrefix("\\u00");
-
-static const uint32_t kThriftVersion1 = 1;
-
-static const std::string kThriftNan("NaN");
-static const std::string kThriftInfinity("Infinity");
-static const std::string kThriftNegativeInfinity("-Infinity");
-
-static const std::string kTypeNameBool("tf");
-static const std::string kTypeNameByte("i8");
-static const std::string kTypeNameI16("i16");
-static const std::string kTypeNameI32("i32");
-static const std::string kTypeNameI64("i64");
-static const std::string kTypeNameDouble("dbl");
-static const std::string kTypeNameStruct("rec");
-static const std::string kTypeNameString("str");
-static const std::string kTypeNameMap("map");
-static const std::string kTypeNameList("lst");
-static const std::string kTypeNameSet("set");
-
-static const std::string& getTypeNameForTypeID(TType typeID) {
-  switch (typeID) {
-  case T_BOOL:
-    return kTypeNameBool;
-  case T_BYTE:
-    return kTypeNameByte;
-  case T_I16:
-    return kTypeNameI16;
-  case T_I32:
-    return kTypeNameI32;
-  case T_I64:
-    return kTypeNameI64;
-  case T_DOUBLE:
-    return kTypeNameDouble;
-  case T_STRING:
-    return kTypeNameString;
-  case T_STRUCT:
-    return kTypeNameStruct;
-  case T_MAP:
-    return kTypeNameMap;
-  case T_SET:
-    return kTypeNameSet;
-  case T_LIST:
-    return kTypeNameList;
-  default:
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED, "Unrecognized type");
-  }
-}
-
-static TType getTypeIDForTypeName(const std::string& name) {
-  TType result = T_STOP; // Sentinel value
-  if (name.length() > 1) {
-    switch (name[0]) {
-    case 'd':
-      result = T_DOUBLE;
-      break;
-    case 'i':
-      switch (name[1]) {
-      case '8':
-        result = T_BYTE;
-        break;
-      case '1':
-        result = T_I16;
-        break;
-      case '3':
-        result = T_I32;
-        break;
-      case '6':
-        result = T_I64;
-        break;
-      }
-      break;
-    case 'l':
-      result = T_LIST;
-      break;
-    case 'm':
-      result = T_MAP;
-      break;
-    case 'r':
-      result = T_STRUCT;
-      break;
-    case 's':
-      if (name[1] == 't') {
-        result = T_STRING;
-      } else if (name[1] == 'e') {
-        result = T_SET;
-      }
-      break;
-    case 't':
-      result = T_BOOL;
-      break;
-    }
-  }
-  if (result == T_STOP) {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED, "Unrecognized type");
-  }
-  return result;
-}
-
-// This table describes the handling for the first 0x30 characters
-//  0 : escape using "\u00xx" notation
-//  1 : just output index
-// <other> : escape using "\<other>" notation
-static const uint8_t kJSONCharTable[0x30] = {
-    //  0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    'b',
-    't',
-    'n',
-    0,
-    'f',
-    'r',
-    0,
-    0, // 0
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0, // 1
-    1,
-    1,
-    '"',
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1,
-    1, // 2
-};
-
-// This string's characters must match up with the elements in kEscapeCharVals.
-// I don't have '/' on this list even though it appears on www.json.org --
-// it is not in the RFC
-const static std::string kEscapeChars("\"\\bfnrt");
-
-// The elements of this array must match up with the sequence of characters in
-// kEscapeChars
-const static uint8_t kEscapeCharVals[7] = {
-    '"',
-    '\\',
-    '\b',
-    '\f',
-    '\n',
-    '\r',
-    '\t',
-};
-
-// Static helper functions
-
-// Read 1 character from the transport trans and verify that it is the
-// expected character ch.
-// Throw a protocol exception if it is not.
-static uint32_t readSyntaxChar(TJSONProtocol::LookaheadReader& reader, uint8_t ch) {
-  uint8_t ch2 = reader.read();
-  if (ch2 != ch) {
-    throw TProtocolException(TProtocolException::INVALID_DATA,
-                             "Expected \'" + std::string((char*)&ch, 1) + "\'; got \'"
-                             + std::string((char*)&ch2, 1) + "\'.");
-  }
-  return 1;
-}
-
-// Return the integer value of a hex character ch.
-// Throw a protocol exception if the character is not [0-9a-f].
-static uint8_t hexVal(uint8_t ch) {
-  if ((ch >= '0') && (ch <= '9')) {
-    return ch - '0';
-  } else if ((ch >= 'a') && (ch <= 'f')) {
-    return ch - 'a' + 10;
-  } else {
-    throw TProtocolException(TProtocolException::INVALID_DATA,
-                             "Expected hex val ([0-9a-f]); got \'" + std::string((char*)&ch, 1)
-                             + "\'.");
-  }
-}
-
-// Return the hex character representing the integer val. The value is masked
-// to make sure it is in the correct range.
-static uint8_t hexChar(uint8_t val) {
-  val &= 0x0F;
-  if (val < 10) {
-    return val + '0';
-  } else {
-    return val - 10 + 'a';
-  }
-}
-
-// Return true if the character ch is in [-+0-9.Ee]; false otherwise
-static bool isJSONNumeric(uint8_t ch) {
-  switch (ch) {
-  case '+':
-  case '-':
-  case '.':
-  case '0':
-  case '1':
-  case '2':
-  case '3':
-  case '4':
-  case '5':
-  case '6':
-  case '7':
-  case '8':
-  case '9':
-  case 'E':
-  case 'e':
-    return true;
-  }
-  return false;
-}
-
-// Return true if the code unit is high surrogate
-static bool isHighSurrogate(uint16_t val) {
-  return val >= 0xD800 && val <= 0xDBFF;
-}
-
-// Return true if the code unit is low surrogate
-static bool isLowSurrogate(uint16_t val) {
-  return val >= 0xDC00 && val <= 0xDFFF;
-}
-
-/**
- * Class to serve as base JSON context and as base class for other context
- * implementations
- */
-class TJSONContext {
-
-public:
-  TJSONContext(){};
-
-  virtual ~TJSONContext(){};
-
-  /**
-   * Write context data to the transport. Default is to do nothing.
-   */
-  virtual uint32_t write(TTransport& trans) {
-    (void)trans;
-    return 0;
-  };
-
-  /**
-   * Read context data from the transport. Default is to do nothing.
-   */
-  virtual uint32_t read(TJSONProtocol::LookaheadReader& reader) {
-    (void)reader;
-    return 0;
-  };
-
-  /**
-   * Return true if numbers need to be escaped as strings in this context.
-   * Default behavior is to return false.
-   */
-  virtual bool escapeNum() { return false; }
-};
-
-// Context class for object member key-value pairs
-class JSONPairContext : public TJSONContext {
-
-public:
-  JSONPairContext() : first_(true), colon_(true) {}
-
-  uint32_t write(TTransport& trans) {
-    if (first_) {
-      first_ = false;
-      colon_ = true;
-      return 0;
-    } else {
-      trans.write(colon_ ? &kJSONPairSeparator : &kJSONElemSeparator, 1);
-      colon_ = !colon_;
-      return 1;
-    }
-  }
-
-  uint32_t read(TJSONProtocol::LookaheadReader& reader) {
-    if (first_) {
-      first_ = false;
-      colon_ = true;
-      return 0;
-    } else {
-      uint8_t ch = (colon_ ? kJSONPairSeparator : kJSONElemSeparator);
-      colon_ = !colon_;
-      return readSyntaxChar(reader, ch);
-    }
-  }
-
-  // Numbers must be turned into strings if they are the key part of a pair
-  virtual bool escapeNum() { return colon_; }
-
-private:
-  bool first_;
-  bool colon_;
-};
-
-// Context class for lists
-class JSONListContext : public TJSONContext {
-
-public:
-  JSONListContext() : first_(true) {}
-
-  uint32_t write(TTransport& trans) {
-    if (first_) {
-      first_ = false;
-      return 0;
-    } else {
-      trans.write(&kJSONElemSeparator, 1);
-      return 1;
-    }
-  }
-
-  uint32_t read(TJSONProtocol::LookaheadReader& reader) {
-    if (first_) {
-      first_ = false;
-      return 0;
-    } else {
-      return readSyntaxChar(reader, kJSONElemSeparator);
-    }
-  }
-
-private:
-  bool first_;
-};
-
-TJSONProtocol::TJSONProtocol(boost::shared_ptr<TTransport> ptrans)
-  : TVirtualProtocol<TJSONProtocol>(ptrans),
-    trans_(ptrans.get()),
-    context_(new TJSONContext()),
-    reader_(*ptrans) {
-}
-
-TJSONProtocol::~TJSONProtocol() {
-}
-
-void TJSONProtocol::pushContext(boost::shared_ptr<TJSONContext> c) {
-  contexts_.push(context_);
-  context_ = c;
-}
-
-void TJSONProtocol::popContext() {
-  context_ = contexts_.top();
-  contexts_.pop();
-}
-
-// Write the character ch as a JSON escape sequence ("\u00xx")
-uint32_t TJSONProtocol::writeJSONEscapeChar(uint8_t ch) {
-  trans_->write((const uint8_t*)kJSONEscapePrefix.c_str(),
-                static_cast<uint32_t>(kJSONEscapePrefix.length()));
-  uint8_t outCh = hexChar(ch >> 4);
-  trans_->write(&outCh, 1);
-  outCh = hexChar(ch);
-  trans_->write(&outCh, 1);
-  return 6;
-}
-
-// Write the character ch as part of a JSON string, escaping as appropriate.
-uint32_t TJSONProtocol::writeJSONChar(uint8_t ch) {
-  if (ch >= 0x30) {
-    if (ch == kJSONBackslash) { // Only special character >= 0x30 is '\'
-      trans_->write(&kJSONBackslash, 1);
-      trans_->write(&kJSONBackslash, 1);
-      return 2;
-    } else {
-      trans_->write(&ch, 1);
-      return 1;
-    }
-  } else {
-    uint8_t outCh = kJSONCharTable[ch];
-    // Check if regular character, backslash escaped, or JSON escaped
-    if (outCh == 1) {
-      trans_->write(&ch, 1);
-      return 1;
-    } else if (outCh > 1) {
-      trans_->write(&kJSONBackslash, 1);
-      trans_->write(&outCh, 1);
-      return 2;
-    } else {
-      return writeJSONEscapeChar(ch);
-    }
-  }
-}
-
-// Write out the contents of the string str as a JSON string, escaping
-// characters as appropriate.
-uint32_t TJSONProtocol::writeJSONString(const std::string& str) {
-  uint32_t result = context_->write(*trans_);
-  result += 2; // For quotes
-  trans_->write(&kJSONStringDelimiter, 1);
-  std::string::const_iterator iter(str.begin());
-  std::string::const_iterator end(str.end());
-  while (iter != end) {
-    result += writeJSONChar(*iter++);
-  }
-  trans_->write(&kJSONStringDelimiter, 1);
-  return result;
-}
-
-// Write out the contents of the string as JSON string, base64-encoding
-// the string's contents, and escaping as appropriate
-uint32_t TJSONProtocol::writeJSONBase64(const std::string& str) {
-  uint32_t result = context_->write(*trans_);
-  result += 2; // For quotes
-  trans_->write(&kJSONStringDelimiter, 1);
-  uint8_t b[4];
-  const uint8_t* bytes = (const uint8_t*)str.c_str();
-  if (str.length() > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  uint32_t len = static_cast<uint32_t>(str.length());
-  while (len >= 3) {
-    // Encode 3 bytes at a time
-    base64_encode(bytes, 3, b);
-    trans_->write(b, 4);
-    result += 4;
-    bytes += 3;
-    len -= 3;
-  }
-  if (len) { // Handle remainder
-    base64_encode(bytes, len, b);
-    trans_->write(b, len + 1);
-    result += len + 1;
-  }
-  trans_->write(&kJSONStringDelimiter, 1);
-  return result;
-}
-
-// Convert the given integer type to a JSON number, or a string
-// if the context requires it (eg: key in a map pair).
-template <typename NumberType>
-uint32_t TJSONProtocol::writeJSONInteger(NumberType num) {
-  uint32_t result = context_->write(*trans_);
-  std::string val(boost::lexical_cast<std::string>(num));
-  bool escapeNum = context_->escapeNum();
-  if (escapeNum) {
-    trans_->write(&kJSONStringDelimiter, 1);
-    result += 1;
-  }
-  if (val.length() > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  trans_->write((const uint8_t*)val.c_str(), static_cast<uint32_t>(val.length()));
-  result += static_cast<uint32_t>(val.length());
-  if (escapeNum) {
-    trans_->write(&kJSONStringDelimiter, 1);
-    result += 1;
-  }
-  return result;
-}
-
-namespace {
-std::string doubleToString(double d) {
-  std::ostringstream str;
-  str.imbue(std::locale::classic());
-  const int max_digits10 = 2 + std::numeric_limits<double>::digits10;
-  str.precision(max_digits10);
-  str << d;
-  return str.str();
-}
-}
-
-// Convert the given double to a JSON string, which is either the number,
-// "NaN" or "Infinity" or "-Infinity".
-uint32_t TJSONProtocol::writeJSONDouble(double num) {
-  uint32_t result = context_->write(*trans_);
-  std::string val;
-
-  bool special = false;
-  switch (boost::math::fpclassify(num)) {
-  case FP_INFINITE:
-    if (boost::math::signbit(num)) {
-      val = kThriftNegativeInfinity;
-    } else {
-      val = kThriftInfinity;
-    }
-    special = true;
-    break;
-  case FP_NAN:
-    val = kThriftNan;
-    special = true;
-    break;
-  default:
-    val = doubleToString(num);
-    break;
-  }
-
-  bool escapeNum = special || context_->escapeNum();
-  if (escapeNum) {
-    trans_->write(&kJSONStringDelimiter, 1);
-    result += 1;
-  }
-  if (val.length() > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  trans_->write((const uint8_t*)val.c_str(), static_cast<uint32_t>(val.length()));
-  result += static_cast<uint32_t>(val.length());
-  if (escapeNum) {
-    trans_->write(&kJSONStringDelimiter, 1);
-    result += 1;
-  }
-  return result;
-}
-
-uint32_t TJSONProtocol::writeJSONObjectStart() {
-  uint32_t result = context_->write(*trans_);
-  trans_->write(&kJSONObjectStart, 1);
-  pushContext(boost::shared_ptr<TJSONContext>(new JSONPairContext()));
-  return result + 1;
-}
-
-uint32_t TJSONProtocol::writeJSONObjectEnd() {
-  popContext();
-  trans_->write(&kJSONObjectEnd, 1);
-  return 1;
-}
-
-uint32_t TJSONProtocol::writeJSONArrayStart() {
-  uint32_t result = context_->write(*trans_);
-  trans_->write(&kJSONArrayStart, 1);
-  pushContext(boost::shared_ptr<TJSONContext>(new JSONListContext()));
-  return result + 1;
-}
-
-uint32_t TJSONProtocol::writeJSONArrayEnd() {
-  popContext();
-  trans_->write(&kJSONArrayEnd, 1);
-  return 1;
-}
-
-uint32_t TJSONProtocol::writeMessageBegin(const std::string& name,
-                                          const TMessageType messageType,
-                                          const int32_t seqid) {
-  uint32_t result = writeJSONArrayStart();
-  result += writeJSONInteger(kThriftVersion1);
-  result += writeJSONString(name);
-  result += writeJSONInteger(messageType);
-  result += writeJSONInteger(seqid);
-  return result;
-}
-
-uint32_t TJSONProtocol::writeMessageEnd() {
-  return writeJSONArrayEnd();
-}
-
-uint32_t TJSONProtocol::writeStructBegin(const char* name) {
-  (void)name;
-  return writeJSONObjectStart();
-}
-
-uint32_t TJSONProtocol::writeStructEnd() {
-  return writeJSONObjectEnd();
-}
-
-uint32_t TJSONProtocol::writeFieldBegin(const char* name,
-                                        const TType fieldType,
-                                        const int16_t fieldId) {
-  (void)name;
-  uint32_t result = writeJSONInteger(fieldId);
-  result += writeJSONObjectStart();
-  result += writeJSONString(getTypeNameForTypeID(fieldType));
-  return result;
-}
-
-uint32_t TJSONProtocol::writeFieldEnd() {
-  return writeJSONObjectEnd();
-}
-
-uint32_t TJSONProtocol::writeFieldStop() {
-  return 0;
-}
-
-uint32_t TJSONProtocol::writeMapBegin(const TType keyType,
-                                      const TType valType,
-                                      const uint32_t size) {
-  uint32_t result = writeJSONArrayStart();
-  result += writeJSONString(getTypeNameForTypeID(keyType));
-  result += writeJSONString(getTypeNameForTypeID(valType));
-  result += writeJSONInteger((int64_t)size);
-  result += writeJSONObjectStart();
-  return result;
-}
-
-uint32_t TJSONProtocol::writeMapEnd() {
-  uint32_t result = writeJSONObjectEnd();
-  result += writeJSONArrayEnd();
-  return result;
-}
-
-uint32_t TJSONProtocol::writeListBegin(const TType elemType, const uint32_t size) {
-  uint32_t result = writeJSONArrayStart();
-  result += writeJSONString(getTypeNameForTypeID(elemType));
-  result += writeJSONInteger((int64_t)size);
-  return result;
-}
-
-uint32_t TJSONProtocol::writeListEnd() {
-  return writeJSONArrayEnd();
-}
-
-uint32_t TJSONProtocol::writeSetBegin(const TType elemType, const uint32_t size) {
-  uint32_t result = writeJSONArrayStart();
-  result += writeJSONString(getTypeNameForTypeID(elemType));
-  result += writeJSONInteger((int64_t)size);
-  return result;
-}
-
-uint32_t TJSONProtocol::writeSetEnd() {
-  return writeJSONArrayEnd();
-}
-
-uint32_t TJSONProtocol::writeBool(const bool value) {
-  return writeJSONInteger(value);
-}
-
-uint32_t TJSONProtocol::writeByte(const int8_t byte) {
-  // writeByte() must be handled specially because boost::lexical cast sees
-  // int8_t as a text type instead of an integer type
-  return writeJSONInteger((int16_t)byte);
-}
-
-uint32_t TJSONProtocol::writeI16(const int16_t i16) {
-  return writeJSONInteger(i16);
-}
-
-uint32_t TJSONProtocol::writeI32(const int32_t i32) {
-  return writeJSONInteger(i32);
-}
-
-uint32_t TJSONProtocol::writeI64(const int64_t i64) {
-  return writeJSONInteger(i64);
-}
-
-uint32_t TJSONProtocol::writeDouble(const double dub) {
-  return writeJSONDouble(dub);
-}
-
-uint32_t TJSONProtocol::writeString(const std::string& str) {
-  return writeJSONString(str);
-}
-
-uint32_t TJSONProtocol::writeBinary(const std::string& str) {
-  return writeJSONBase64(str);
-}
-
-/**
- * Reading functions
- */
-
-// Reads 1 byte and verifies that it matches ch.
-uint32_t TJSONProtocol::readJSONSyntaxChar(uint8_t ch) {
-  return readSyntaxChar(reader_, ch);
-}
-
-// Decodes the four hex parts of a JSON escaped string character and returns
-// the UTF-16 code unit via out.
-uint32_t TJSONProtocol::readJSONEscapeChar(uint16_t* out) {
-  uint8_t b[4];
-  b[0] = reader_.read();
-  b[1] = reader_.read();
-  b[2] = reader_.read();
-  b[3] = reader_.read();
-
-  *out = (hexVal(b[0]) << 12)
-    + (hexVal(b[1]) << 8) + (hexVal(b[2]) << 4) + hexVal(b[3]);
-
-  return 4;
-}
-
-// Decodes a JSON string, including unescaping, and returns the string via str
-uint32_t TJSONProtocol::readJSONString(std::string& str, bool skipContext) {
-  uint32_t result = (skipContext ? 0 : context_->read(reader_));
-  result += readJSONSyntaxChar(kJSONStringDelimiter);
-  std::vector<uint16_t> codeunits;
-  uint8_t ch;
-  str.clear();
-  while (true) {
-    ch = reader_.read();
-    ++result;
-    if (ch == kJSONStringDelimiter) {
-      break;
-    }
-    if (ch == kJSONBackslash) {
-      ch = reader_.read();
-      ++result;
-      if (ch == kJSONEscapeChar) {
-        uint16_t cp;
-        result += readJSONEscapeChar(&cp);
-        if (isHighSurrogate(cp)) {
-          codeunits.push_back(cp);
-        } else {
-          if (isLowSurrogate(cp)
-               && codeunits.empty()) {
-            throw TProtocolException(TProtocolException::INVALID_DATA,
-                                     "Missing UTF-16 high surrogate pair.");
-          }
-          codeunits.push_back(cp);
-          codeunits.push_back(0);
-          str += boost::locale::conv::utf_to_utf<char>(codeunits.data());
-          codeunits.clear();
-        }
-        continue;
-      } else {
-        size_t pos = kEscapeChars.find(ch);
-        if (pos == std::string::npos) {
-          throw TProtocolException(TProtocolException::INVALID_DATA,
-                                   "Expected control char, got '" + std::string((const char*)&ch, 1)
-                                   + "'.");
-        }
-        ch = kEscapeCharVals[pos];
-      }
-    }
-    if (!codeunits.empty()) {
-      throw TProtocolException(TProtocolException::INVALID_DATA,
-                               "Missing UTF-16 low surrogate pair.");
-    }
-    str += ch;
-  }
-
-  if (!codeunits.empty()) {
-    throw TProtocolException(TProtocolException::INVALID_DATA,
-                             "Missing UTF-16 low surrogate pair.");
-  }
-  return result;
-}
-
-// Reads a block of base64 characters, decoding it, and returns via str
-uint32_t TJSONProtocol::readJSONBase64(std::string& str) {
-  std::string tmp;
-  uint32_t result = readJSONString(tmp);
-  uint8_t* b = (uint8_t*)tmp.c_str();
-  if (tmp.length() > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  uint32_t len = static_cast<uint32_t>(tmp.length());
-  str.clear();
-  // Ignore padding
-  if (len >= 2)  {
-    uint32_t bound = len - 2;
-    for (uint32_t i = len - 1; i >= bound && b[i] == '='; --i) {
-      --len;
-    }
-  }
-  while (len >= 4) {
-    base64_decode(b, 4);
-    str.append((const char*)b, 3);
-    b += 4;
-    len -= 4;
-  }
-  // Don't decode if we hit the end or got a single leftover byte (invalid
-  // base64 but legal for skip of regular string type)
-  if (len > 1) {
-    base64_decode(b, len);
-    str.append((const char*)b, len - 1);
-  }
-  return result;
-}
-
-// Reads a sequence of characters, stopping at the first one that is not
-// a valid JSON numeric character.
-uint32_t TJSONProtocol::readJSONNumericChars(std::string& str) {
-  uint32_t result = 0;
-  str.clear();
-  while (true) {
-    uint8_t ch = reader_.peek();
-    if (!isJSONNumeric(ch)) {
-      break;
-    }
-    reader_.read();
-    str += ch;
-    ++result;
-  }
-  return result;
-}
-
-// Reads a sequence of characters and assembles them into a number,
-// returning them via num
-template <typename NumberType>
-uint32_t TJSONProtocol::readJSONInteger(NumberType& num) {
-  uint32_t result = context_->read(reader_);
-  if (context_->escapeNum()) {
-    result += readJSONSyntaxChar(kJSONStringDelimiter);
-  }
-  std::string str;
-  result += readJSONNumericChars(str);
-  try {
-    num = boost::lexical_cast<NumberType>(str);
-  } catch (boost::bad_lexical_cast e) {
-    throw TProtocolException(TProtocolException::INVALID_DATA,
-                                 "Expected numeric value; got \"" + str + "\"");
-  }
-  if (context_->escapeNum()) {
-    result += readJSONSyntaxChar(kJSONStringDelimiter);
-  }
-  return result;
-}
-
-namespace {
-double stringToDouble(const std::string& s) {
-  double d;
-  std::istringstream str(s);
-  str.imbue(std::locale::classic());
-  str >> d;
-  if (str.bad() || !str.eof())
-    throw std::runtime_error(s);
-  return d;
-}
-}
-
-// Reads a JSON number or string and interprets it as a double.
-uint32_t TJSONProtocol::readJSONDouble(double& num) {
-  uint32_t result = context_->read(reader_);
-  std::string str;
-  if (reader_.peek() == kJSONStringDelimiter) {
-    result += readJSONString(str, true);
-    // Check for NaN, Infinity and -Infinity
-    if (str == kThriftNan) {
-      num = HUGE_VAL / HUGE_VAL; // generates NaN
-    } else if (str == kThriftInfinity) {
-      num = HUGE_VAL;
-    } else if (str == kThriftNegativeInfinity) {
-      num = -HUGE_VAL;
-    } else {
-      if (!context_->escapeNum()) {
-        // Throw exception -- we should not be in a string in this case
-        throw TProtocolException(TProtocolException::INVALID_DATA,
-                                     "Numeric data unexpectedly quoted");
-      }
-      try {
-        num = stringToDouble(str);
-      } catch (std::runtime_error e) {
-        throw TProtocolException(TProtocolException::INVALID_DATA,
-                                     "Expected numeric value; got \"" + str + "\"");
-      }
-    }
-  } else {
-    if (context_->escapeNum()) {
-      // This will throw - we should have had a quote if escapeNum == true
-      readJSONSyntaxChar(kJSONStringDelimiter);
-    }
-    result += readJSONNumericChars(str);
-    try {
-      num = stringToDouble(str);
-    } catch (std::runtime_error e) {
-      throw TProtocolException(TProtocolException::INVALID_DATA,
-                                   "Expected numeric value; got \"" + str + "\"");
-    }
-  }
-  return result;
-}
-
-uint32_t TJSONProtocol::readJSONObjectStart() {
-  uint32_t result = context_->read(reader_);
-  result += readJSONSyntaxChar(kJSONObjectStart);
-  pushContext(boost::shared_ptr<TJSONContext>(new JSONPairContext()));
-  return result;
-}
-
-uint32_t TJSONProtocol::readJSONObjectEnd() {
-  uint32_t result = readJSONSyntaxChar(kJSONObjectEnd);
-  popContext();
-  return result;
-}
-
-uint32_t TJSONProtocol::readJSONArrayStart() {
-  uint32_t result = context_->read(reader_);
-  result += readJSONSyntaxChar(kJSONArrayStart);
-  pushContext(boost::shared_ptr<TJSONContext>(new JSONListContext()));
-  return result;
-}
-
-uint32_t TJSONProtocol::readJSONArrayEnd() {
-  uint32_t result = readJSONSyntaxChar(kJSONArrayEnd);
-  popContext();
-  return result;
-}
-
-uint32_t TJSONProtocol::readMessageBegin(std::string& name,
-                                         TMessageType& messageType,
-                                         int32_t& seqid) {
-  uint32_t result = readJSONArrayStart();
-  uint64_t tmpVal = 0;
-  result += readJSONInteger(tmpVal);
-  if (tmpVal != kThriftVersion1) {
-    throw TProtocolException(TProtocolException::BAD_VERSION, "Message contained bad version.");
-  }
-  result += readJSONString(name);
-  result += readJSONInteger(tmpVal);
-  messageType = (TMessageType)tmpVal;
-  result += readJSONInteger(tmpVal);
-  if (tmpVal > static_cast<uint64_t>((std::numeric_limits<int32_t>::max)()))
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  seqid = static_cast<int32_t>(tmpVal);
-  return result;
-}
-
-uint32_t TJSONProtocol::readMessageEnd() {
-  return readJSONArrayEnd();
-}
-
-uint32_t TJSONProtocol::readStructBegin(std::string& name) {
-  (void)name;
-  return readJSONObjectStart();
-}
-
-uint32_t TJSONProtocol::readStructEnd() {
-  return readJSONObjectEnd();
-}
-
-uint32_t TJSONProtocol::readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId) {
-  (void)name;
-  uint32_t result = 0;
-  // Check if we hit the end of the list
-  uint8_t ch = reader_.peek();
-  if (ch == kJSONObjectEnd) {
-    fieldType = apache::thrift::protocol::T_STOP;
-  } else {
-    uint64_t tmpVal = 0;
-    std::string tmpStr;
-    result += readJSONInteger(tmpVal);
-    if (tmpVal > static_cast<uint32_t>((std::numeric_limits<int16_t>::max)()))
-      throw TProtocolException(TProtocolException::SIZE_LIMIT);
-    fieldId = static_cast<int16_t>(tmpVal);
-    result += readJSONObjectStart();
-    result += readJSONString(tmpStr);
-    fieldType = getTypeIDForTypeName(tmpStr);
-  }
-  return result;
-}
-
-uint32_t TJSONProtocol::readFieldEnd() {
-  return readJSONObjectEnd();
-}
-
-uint32_t TJSONProtocol::readMapBegin(TType& keyType, TType& valType, uint32_t& size) {
-  uint64_t tmpVal = 0;
-  std::string tmpStr;
-  uint32_t result = readJSONArrayStart();
-  result += readJSONString(tmpStr);
-  keyType = getTypeIDForTypeName(tmpStr);
-  result += readJSONString(tmpStr);
-  valType = getTypeIDForTypeName(tmpStr);
-  result += readJSONInteger(tmpVal);
-  if (tmpVal > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  size = static_cast<uint32_t>(tmpVal);
-  result += readJSONObjectStart();
-  return result;
-}
-
-uint32_t TJSONProtocol::readMapEnd() {
-  uint32_t result = readJSONObjectEnd();
-  result += readJSONArrayEnd();
-  return result;
-}
-
-uint32_t TJSONProtocol::readListBegin(TType& elemType, uint32_t& size) {
-  uint64_t tmpVal = 0;
-  std::string tmpStr;
-  uint32_t result = readJSONArrayStart();
-  result += readJSONString(tmpStr);
-  elemType = getTypeIDForTypeName(tmpStr);
-  result += readJSONInteger(tmpVal);
-  if (tmpVal > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  size = static_cast<uint32_t>(tmpVal);
-  return result;
-}
-
-uint32_t TJSONProtocol::readListEnd() {
-  return readJSONArrayEnd();
-}
-
-uint32_t TJSONProtocol::readSetBegin(TType& elemType, uint32_t& size) {
-  uint64_t tmpVal = 0;
-  std::string tmpStr;
-  uint32_t result = readJSONArrayStart();
-  result += readJSONString(tmpStr);
-  elemType = getTypeIDForTypeName(tmpStr);
-  result += readJSONInteger(tmpVal);
-  if (tmpVal > (std::numeric_limits<uint32_t>::max)())
-    throw TProtocolException(TProtocolException::SIZE_LIMIT);
-  size = static_cast<uint32_t>(tmpVal);
-  return result;
-}
-
-uint32_t TJSONProtocol::readSetEnd() {
-  return readJSONArrayEnd();
-}
-
-uint32_t TJSONProtocol::readBool(bool& value) {
-  return readJSONInteger(value);
-}
-
-// readByte() must be handled properly because boost::lexical cast sees int8_t
-// as a text type instead of an integer type
-uint32_t TJSONProtocol::readByte(int8_t& byte) {
-  int16_t tmp = (int16_t)byte;
-  uint32_t result = readJSONInteger(tmp);
-  assert(tmp < 256);
-  byte = (int8_t)tmp;
-  return result;
-}
-
-uint32_t TJSONProtocol::readI16(int16_t& i16) {
-  return readJSONInteger(i16);
-}
-
-uint32_t TJSONProtocol::readI32(int32_t& i32) {
-  return readJSONInteger(i32);
-}
-
-uint32_t TJSONProtocol::readI64(int64_t& i64) {
-  return readJSONInteger(i64);
-}
-
-uint32_t TJSONProtocol::readDouble(double& dub) {
-  return readJSONDouble(dub);
-}
-
-uint32_t TJSONProtocol::readString(std::string& str) {
-  return readJSONString(str);
-}
-
-uint32_t TJSONProtocol::readBinary(std::string& str) {
-  return readJSONBase64(str);
-}
-}
-}
-} // apache::thrift::protocol
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TJSONProtocol.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TJSONProtocol.h
deleted file mode 100644
index 5834eff..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TJSONProtocol.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TJSONPROTOCOL_H_
-#define _THRIFT_PROTOCOL_TJSONPROTOCOL_H_ 1
-
-#include <thrift/protocol/TVirtualProtocol.h>
-
-#include <stack>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-// Forward declaration
-class TJSONContext;
-
-/**
- * JSON protocol for Thrift.
- *
- * Implements a protocol which uses JSON as the wire-format.
- *
- * Thrift types are represented as described below:
- *
- * 1. Every Thrift integer type is represented as a JSON number.
- *
- * 2. Thrift doubles are represented as JSON numbers. Some special values are
- *    represented as strings:
- *    a. "NaN" for not-a-number values
- *    b. "Infinity" for positive infinity
- *    c. "-Infinity" for negative infinity
- *
- * 3. Thrift string values are emitted as JSON strings, with appropriate
- *    escaping.
- *
- * 4. Thrift binary values are encoded into Base64 and emitted as JSON strings.
- *    The readBinary() method is written such that it will properly skip if
- *    called on a Thrift string (although it will decode garbage data).
- *
- *    NOTE: Base64 padding is optional for Thrift binary value encoding. So
- *    the readBinary() method needs to decode both input strings with padding
- *    and those without one.
- *
- * 5. Thrift structs are represented as JSON objects, with the field ID as the
- *    key, and the field value represented as a JSON object with a single
- *    key-value pair. The key is a short string identifier for that type,
- *    followed by the value. The valid type identifiers are: "tf" for bool,
- *    "i8" for byte, "i16" for 16-bit integer, "i32" for 32-bit integer, "i64"
- *    for 64-bit integer, "dbl" for double-precision loating point, "str" for
- *    string (including binary), "rec" for struct ("records"), "map" for map,
- *    "lst" for list, "set" for set.
- *
- * 6. Thrift lists and sets are represented as JSON arrays, with the first
- *    element of the JSON array being the string identifier for the Thrift
- *    element type and the second element of the JSON array being the count of
- *    the Thrift elements. The Thrift elements then follow.
- *
- * 7. Thrift maps are represented as JSON arrays, with the first two elements
- *    of the JSON array being the string identifiers for the Thrift key type
- *    and value type, followed by the count of the Thrift pairs, followed by a
- *    JSON object containing the key-value pairs. Note that JSON keys can only
- *    be strings, which means that the key type of the Thrift map should be
- *    restricted to numeric or string types -- in the case of numerics, they
- *    are serialized as strings.
- *
- * 8. Thrift messages are represented as JSON arrays, with the protocol
- *    version #, the message name, the message type, and the sequence ID as
- *    the first 4 elements.
- *
- * More discussion of the double handling is probably warranted. The aim of
- * the current implementation is to match as closely as possible the behavior
- * of Java's Double.toString(), which has no precision loss.  Implementors in
- * other languages should strive to achieve that where possible. I have not
- * yet verified whether boost:lexical_cast, which is doing that work for me in
- * C++, loses any precision, but I am leaving this as a future improvement. I
- * may try to provide a C component for this, so that other languages could
- * bind to the same underlying implementation for maximum consistency.
- *
- */
-class TJSONProtocol : public TVirtualProtocol<TJSONProtocol> {
-public:
-  TJSONProtocol(boost::shared_ptr<TTransport> ptrans);
-
-  ~TJSONProtocol();
-
-private:
-  void pushContext(boost::shared_ptr<TJSONContext> c);
-
-  void popContext();
-
-  uint32_t writeJSONEscapeChar(uint8_t ch);
-
-  uint32_t writeJSONChar(uint8_t ch);
-
-  uint32_t writeJSONString(const std::string& str);
-
-  uint32_t writeJSONBase64(const std::string& str);
-
-  template <typename NumberType>
-  uint32_t writeJSONInteger(NumberType num);
-
-  uint32_t writeJSONDouble(double num);
-
-  uint32_t writeJSONObjectStart();
-
-  uint32_t writeJSONObjectEnd();
-
-  uint32_t writeJSONArrayStart();
-
-  uint32_t writeJSONArrayEnd();
-
-  uint32_t readJSONSyntaxChar(uint8_t ch);
-
-  uint32_t readJSONEscapeChar(uint16_t* out);
-
-  uint32_t readJSONString(std::string& str, bool skipContext = false);
-
-  uint32_t readJSONBase64(std::string& str);
-
-  uint32_t readJSONNumericChars(std::string& str);
-
-  template <typename NumberType>
-  uint32_t readJSONInteger(NumberType& num);
-
-  uint32_t readJSONDouble(double& num);
-
-  uint32_t readJSONObjectStart();
-
-  uint32_t readJSONObjectEnd();
-
-  uint32_t readJSONArrayStart();
-
-  uint32_t readJSONArrayEnd();
-
-public:
-  /**
-   * Writing functions.
-   */
-
-  uint32_t writeMessageBegin(const std::string& name,
-                             const TMessageType messageType,
-                             const int32_t seqid);
-
-  uint32_t writeMessageEnd();
-
-  uint32_t writeStructBegin(const char* name);
-
-  uint32_t writeStructEnd();
-
-  uint32_t writeFieldBegin(const char* name, const TType fieldType, const int16_t fieldId);
-
-  uint32_t writeFieldEnd();
-
-  uint32_t writeFieldStop();
-
-  uint32_t writeMapBegin(const TType keyType, const TType valType, const uint32_t size);
-
-  uint32_t writeMapEnd();
-
-  uint32_t writeListBegin(const TType elemType, const uint32_t size);
-
-  uint32_t writeListEnd();
-
-  uint32_t writeSetBegin(const TType elemType, const uint32_t size);
-
-  uint32_t writeSetEnd();
-
-  uint32_t writeBool(const bool value);
-
-  uint32_t writeByte(const int8_t byte);
-
-  uint32_t writeI16(const int16_t i16);
-
-  uint32_t writeI32(const int32_t i32);
-
-  uint32_t writeI64(const int64_t i64);
-
-  uint32_t writeDouble(const double dub);
-
-  uint32_t writeString(const std::string& str);
-
-  uint32_t writeBinary(const std::string& str);
-
-  /**
-   * Reading functions
-   */
-
-  uint32_t readMessageBegin(std::string& name, TMessageType& messageType, int32_t& seqid);
-
-  uint32_t readMessageEnd();
-
-  uint32_t readStructBegin(std::string& name);
-
-  uint32_t readStructEnd();
-
-  uint32_t readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId);
-
-  uint32_t readFieldEnd();
-
-  uint32_t readMapBegin(TType& keyType, TType& valType, uint32_t& size);
-
-  uint32_t readMapEnd();
-
-  uint32_t readListBegin(TType& elemType, uint32_t& size);
-
-  uint32_t readListEnd();
-
-  uint32_t readSetBegin(TType& elemType, uint32_t& size);
-
-  uint32_t readSetEnd();
-
-  uint32_t readBool(bool& value);
-
-  // Provide the default readBool() implementation for std::vector<bool>
-  using TVirtualProtocol<TJSONProtocol>::readBool;
-
-  uint32_t readByte(int8_t& byte);
-
-  uint32_t readI16(int16_t& i16);
-
-  uint32_t readI32(int32_t& i32);
-
-  uint32_t readI64(int64_t& i64);
-
-  uint32_t readDouble(double& dub);
-
-  uint32_t readString(std::string& str);
-
-  uint32_t readBinary(std::string& str);
-
-  class LookaheadReader {
-
-  public:
-    LookaheadReader(TTransport& trans) : trans_(&trans), hasData_(false) {}
-
-    uint8_t read() {
-      if (hasData_) {
-        hasData_ = false;
-      } else {
-        trans_->readAll(&data_, 1);
-      }
-      return data_;
-    }
-
-    uint8_t peek() {
-      if (!hasData_) {
-        trans_->readAll(&data_, 1);
-      }
-      hasData_ = true;
-      return data_;
-    }
-
-  private:
-    TTransport* trans_;
-    bool hasData_;
-    uint8_t data_;
-  };
-
-private:
-  TTransport* trans_;
-
-  std::stack<boost::shared_ptr<TJSONContext> > contexts_;
-  boost::shared_ptr<TJSONContext> context_;
-  LookaheadReader reader_;
-};
-
-/**
- * Constructs input and output protocol objects given transports.
- */
-class TJSONProtocolFactory : public TProtocolFactory {
-public:
-  TJSONProtocolFactory() {}
-
-  virtual ~TJSONProtocolFactory() {}
-
-  boost::shared_ptr<TProtocol> getProtocol(boost::shared_ptr<TTransport> trans) {
-    return boost::shared_ptr<TProtocol>(new TJSONProtocol(trans));
-  }
-};
-}
-}
-} // apache::thrift::protocol
-
-// TODO(dreiss): Move part of ThriftJSONString into a .cpp file and remove this.
-#include <thrift/transport/TBufferTransports.h>
-
-namespace apache {
-namespace thrift {
-
-template <typename ThriftStruct>
-std::string ThriftJSONString(const ThriftStruct& ts) {
-  using namespace apache::thrift::transport;
-  using namespace apache::thrift::protocol;
-  TMemoryBuffer* buffer = new TMemoryBuffer;
-  boost::shared_ptr<TTransport> trans(buffer);
-  TJSONProtocol protocol(trans);
-
-  ts.write(&protocol);
-
-  uint8_t* buf;
-  uint32_t size;
-  buffer->getBuffer(&buf, &size);
-  return std::string((char*)buf, (unsigned int)size);
-}
-}
-} // apache::thrift
-
-#endif // #define _THRIFT_PROTOCOL_TJSONPROTOCOL_H_ 1
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TMultiplexedProtocol.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TMultiplexedProtocol.cpp
deleted file mode 100644
index f0dc69e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TMultiplexedProtocol.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/protocol/TMultiplexedProtocol.h>
-#include <thrift/processor/TMultiplexedProcessor.h>
-#include <thrift/protocol/TProtocolDecorator.h>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-uint32_t TMultiplexedProtocol::writeMessageBegin_virt(const std::string& _name,
-                                                      const TMessageType _type,
-                                                      const int32_t _seqid) {
-  if (_type == T_CALL || _type == T_ONEWAY) {
-    return TProtocolDecorator::writeMessageBegin_virt(serviceName + separator + _name,
-                                                      _type,
-                                                      _seqid);
-  } else {
-    return TProtocolDecorator::writeMessageBegin_virt(_name, _type, _seqid);
-  }
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TMultiplexedProtocol.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TMultiplexedProtocol.h
deleted file mode 100644
index 0244fbe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TMultiplexedProtocol.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_TMULTIPLEXEDPROTOCOL_H_
-#define THRIFT_TMULTIPLEXEDPROTOCOL_H_ 1
-
-#include <thrift/protocol/TProtocolDecorator.h>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-using boost::shared_ptr;
-
-/**
- * <code>TMultiplexedProtocol</code> is a protocol-independent concrete decorator
- * that allows a Thrift client to communicate with a multiplexing Thrift server,
- * by prepending the service name to the function name during function calls.
- *
- * \note THIS IS NOT USED BY SERVERS.  On the server, use
- * {@link apache::thrift::TMultiplexedProcessor TMultiplexedProcessor} to handle requests
- * from a multiplexing client.
- *
- * This example uses a single socket transport to invoke two services:
- *
- * <blockquote><code>
- *     shared_ptr<TSocket> transport(new TSocket("localhost", 9090));
- *     transport->open();
- *
- *     shared_ptr<TBinaryProtocol> protocol(new TBinaryProtocol(transport));
- *
- *     shared_ptr<TMultiplexedProtocol> mp1(new TMultiplexedProtocol(protocol, "Calculator"));
- *     shared_ptr<CalculatorClient> service1(new CalculatorClient(mp1));
- *
- *     shared_ptr<TMultiplexedProtocol> mp2(new TMultiplexedProtocol(protocol, "WeatherReport"));
- *     shared_ptr<WeatherReportClient> service2(new WeatherReportClient(mp2));
- *
- *     service1->add(2,2);
- *     int temp = service2->getTemperature();
- * </code></blockquote>
- *
- * @see apache::thrift::protocol::TProtocolDecorator
- */
-class TMultiplexedProtocol : public TProtocolDecorator {
-public:
-  /**
-   * Wrap the specified protocol, allowing it to be used to communicate with a
-   * multiplexing server.  The <code>serviceName</code> is required as it is
-   * prepended to the message header so that the multiplexing server can broker
-   * the function call to the proper service.
-   *
-   * \param _protocol    Your communication protocol of choice, e.g. <code>TBinaryProtocol</code>.
-   * \param _serviceName The service name of the service communicating via this protocol.
-   */
-  TMultiplexedProtocol(shared_ptr<TProtocol> _protocol, const std::string& _serviceName)
-    : TProtocolDecorator(_protocol), serviceName(_serviceName), separator(":") {}
-  virtual ~TMultiplexedProtocol() {}
-
-  /**
-   * Prepends the service name to the function name, separated by TMultiplexedProtocol::SEPARATOR.
-   *
-   * \param [in] _name   The name of the method to be called in the service.
-   * \param [in] _type   The type of message
-   * \param [in] _name   The sequential id of the message
-   *
-   * \throws TException  Passed through from wrapped <code>TProtocol</code> instance.
-   */
-  uint32_t writeMessageBegin_virt(const std::string& _name,
-                                  const TMessageType _type,
-                                  const int32_t _seqid);
-
-private:
-  const std::string serviceName;
-  const std::string separator;
-};
-}
-}
-}
-
-#endif // THRIFT_TMULTIPLEXEDPROTOCOL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocol.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocol.cpp
deleted file mode 100644
index c378aca..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocol.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/protocol/TProtocol.h>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-TProtocol::~TProtocol() {}
-uint32_t TProtocol::skip_virt(TType type) {
-  return ::apache::thrift::protocol::skip(*this, type);
-}
-
-TProtocolFactory::~TProtocolFactory() {}
-
-}}} // apache::thrift::protocol
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocol.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocol.h
deleted file mode 100644
index 448c4fe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocol.h
+++ /dev/null
@@ -1,762 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TPROTOCOL_H_
-#define _THRIFT_PROTOCOL_TPROTOCOL_H_ 1
-
-#ifdef _WIN32
-// Need to come before any Windows.h includes
-#include <Winsock2.h>
-#endif
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/protocol/TProtocolException.h>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/static_assert.hpp>
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#include <sys/types.h>
-#include <string>
-#include <map>
-#include <vector>
-#include <climits>
-
-// Use this to get around strict aliasing rules.
-// For example, uint64_t i = bitwise_cast<uint64_t>(returns_double());
-// The most obvious implementation is to just cast a pointer,
-// but that doesn't work.
-// For a pretty in-depth explanation of the problem, see
-// http://cellperformance.beyond3d.com/articles/2006/06/understanding-strict-aliasing.html
-template <typename To, typename From>
-static inline To bitwise_cast(From from) {
-  BOOST_STATIC_ASSERT(sizeof(From) == sizeof(To));
-
-  // BAD!!!  These are all broken with -O2.
-  //return *reinterpret_cast<To*>(&from);  // BAD!!!
-  //return *static_cast<To*>(static_cast<void*>(&from));  // BAD!!!
-  //return *(To*)(void*)&from;  // BAD!!!
-
-  // Super clean and paritally blessed by section 3.9 of the standard.
-  //unsigned char c[sizeof(from)];
-  //memcpy(c, &from, sizeof(from));
-  //To to;
-  //memcpy(&to, c, sizeof(c));
-  //return to;
-
-  // Slightly more questionable.
-  // Same code emitted by GCC.
-  //To to;
-  //memcpy(&to, &from, sizeof(from));
-  //return to;
-
-  // Technically undefined, but almost universally supported,
-  // and the most efficient implementation.
-  union {
-    From f;
-    To t;
-  } u;
-  u.f = from;
-  return u.t;
-}
-
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#ifndef __THRIFT_BYTE_ORDER
-# if defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN)
-#  define __THRIFT_BYTE_ORDER BYTE_ORDER
-#  define __THRIFT_LITTLE_ENDIAN LITTLE_ENDIAN
-#  define __THRIFT_BIG_ENDIAN BIG_ENDIAN
-# else
-#  include <boost/config.hpp>
-#  include <boost/detail/endian.hpp>
-#  define __THRIFT_BYTE_ORDER BOOST_BYTE_ORDER
-#  ifdef BOOST_LITTLE_ENDIAN
-#   define __THRIFT_LITTLE_ENDIAN __THRIFT_BYTE_ORDER
-#   define __THRIFT_BIG_ENDIAN 0
-#  else
-#   define __THRIFT_LITTLE_ENDIAN 0
-#   define __THRIFT_BIG_ENDIAN __THRIFT_BYTE_ORDER
-#  endif
-# endif
-#endif
-
-#if __THRIFT_BYTE_ORDER == __THRIFT_BIG_ENDIAN
-# if !defined(THRIFT_ntohll)
-#  define THRIFT_ntohll(n) (n)
-#  define THRIFT_htonll(n) (n)
-# endif
-# if defined(__GNUC__) && defined(__GLIBC__)
-#  include <byteswap.h>
-#  define THRIFT_htolell(n) bswap_64(n)
-#  define THRIFT_letohll(n) bswap_64(n)
-#  define THRIFT_htolel(n) bswap_32(n)
-#  define THRIFT_letohl(n) bswap_32(n)
-#  define THRIFT_htoles(n) bswap_16(n)
-#  define THRIFT_letohs(n) bswap_16(n)
-# else /* GNUC & GLIBC */
-#  define bswap_64(n) \
-      ( (((n) & 0xff00000000000000ull) >> 56) \
-      | (((n) & 0x00ff000000000000ull) >> 40) \
-      | (((n) & 0x0000ff0000000000ull) >> 24) \
-      | (((n) & 0x000000ff00000000ull) >> 8)  \
-      | (((n) & 0x00000000ff000000ull) << 8)  \
-      | (((n) & 0x0000000000ff0000ull) << 24) \
-      | (((n) & 0x000000000000ff00ull) << 40) \
-      | (((n) & 0x00000000000000ffull) << 56) )
-#  define bswap_32(n) \
-      ( (((n) & 0xff000000ul) >> 24) \
-      | (((n) & 0x00ff0000ul) >> 8)  \
-      | (((n) & 0x0000ff00ul) << 8)  \
-      | (((n) & 0x000000fful) << 24) )
-#  define bswap_16(n) \
-      ( (((n) & ((unsigned short)0xff00ul)) >> 8)  \
-      | (((n) & ((unsigned short)0x00fful)) << 8)  )
-#  define THRIFT_htolell(n) bswap_64(n)
-#  define THRIFT_letohll(n) bswap_64(n)
-#  define THRIFT_htolel(n) bswap_32(n)
-#  define THRIFT_letohl(n) bswap_32(n)
-#  define THRIFT_htoles(n) bswap_16(n)
-#  define THRIFT_letohs(n) bswap_16(n)
-# endif /* GNUC & GLIBC */
-#elif __THRIFT_BYTE_ORDER == __THRIFT_LITTLE_ENDIAN
-#  define THRIFT_htolell(n) (n)
-#  define THRIFT_letohll(n) (n)
-#  define THRIFT_htolel(n) (n)
-#  define THRIFT_letohl(n) (n)
-#  define THRIFT_htoles(n) (n)
-#  define THRIFT_letohs(n) (n)
-# if defined(__GNUC__) && defined(__GLIBC__)
-#  include <byteswap.h>
-#  define THRIFT_ntohll(n) bswap_64(n)
-#  define THRIFT_htonll(n) bswap_64(n)
-# elif defined(_MSC_VER) /* Microsoft Visual C++ */
-#  define THRIFT_ntohll(n) ( _byteswap_uint64((uint64_t)n) )
-#  define THRIFT_htonll(n) ( _byteswap_uint64((uint64_t)n) )
-# elif !defined(THRIFT_ntohll) /* Not GNUC/GLIBC or MSVC */
-#  define THRIFT_ntohll(n) ( (((uint64_t)ntohl((uint32_t)n)) << 32) + ntohl((uint32_t)(n >> 32)) )
-#  define THRIFT_htonll(n) ( (((uint64_t)htonl((uint32_t)n)) << 32) + htonl((uint32_t)(n >> 32)) )
-# endif /* GNUC/GLIBC or MSVC or something else */
-#else /* __THRIFT_BYTE_ORDER */
-# error "Can't define THRIFT_htonll or THRIFT_ntohll!"
-#endif
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-using apache::thrift::transport::TTransport;
-
-/**
- * Enumerated definition of the types that the Thrift protocol supports.
- * Take special note of the T_END type which is used specifically to mark
- * the end of a sequence of fields.
- */
-enum TType {
-  T_STOP       = 0,
-  T_VOID       = 1,
-  T_BOOL       = 2,
-  T_BYTE       = 3,
-  T_I08        = 3,
-  T_I16        = 6,
-  T_I32        = 8,
-  T_U64        = 9,
-  T_I64        = 10,
-  T_DOUBLE     = 4,
-  T_STRING     = 11,
-  T_UTF7       = 11,
-  T_STRUCT     = 12,
-  T_MAP        = 13,
-  T_SET        = 14,
-  T_LIST       = 15,
-  T_UTF8       = 16,
-  T_UTF16      = 17
-};
-
-/**
- * Enumerated definition of the message types that the Thrift protocol
- * supports.
- */
-enum TMessageType {
-  T_CALL       = 1,
-  T_REPLY      = 2,
-  T_EXCEPTION  = 3,
-  T_ONEWAY     = 4
-};
-
-static const uint32_t DEFAULT_RECURSION_LIMIT = 64;
-
-/**
- * Abstract class for a thrift protocol driver. These are all the methods that
- * a protocol must implement. Essentially, there must be some way of reading
- * and writing all the base types, plus a mechanism for writing out structs
- * with indexed fields.
- *
- * TProtocol objects should not be shared across multiple encoding contexts,
- * as they may need to maintain internal state in some protocols (i.e. XML).
- * Note that is is acceptable for the TProtocol module to do its own internal
- * buffered reads/writes to the underlying TTransport where appropriate (i.e.
- * when parsing an input XML stream, reading should be batched rather than
- * looking ahead character by character for a close tag).
- *
- */
-class TProtocol {
-public:
-  virtual ~TProtocol();
-
-  /**
-   * Writing functions.
-   */
-
-  virtual uint32_t writeMessageBegin_virt(const std::string& name,
-                                          const TMessageType messageType,
-                                          const int32_t seqid) = 0;
-
-  virtual uint32_t writeMessageEnd_virt() = 0;
-
-  virtual uint32_t writeStructBegin_virt(const char* name) = 0;
-
-  virtual uint32_t writeStructEnd_virt() = 0;
-
-  virtual uint32_t writeFieldBegin_virt(const char* name,
-                                        const TType fieldType,
-                                        const int16_t fieldId) = 0;
-
-  virtual uint32_t writeFieldEnd_virt() = 0;
-
-  virtual uint32_t writeFieldStop_virt() = 0;
-
-  virtual uint32_t writeMapBegin_virt(const TType keyType, const TType valType, const uint32_t size)
-      = 0;
-
-  virtual uint32_t writeMapEnd_virt() = 0;
-
-  virtual uint32_t writeListBegin_virt(const TType elemType, const uint32_t size) = 0;
-
-  virtual uint32_t writeListEnd_virt() = 0;
-
-  virtual uint32_t writeSetBegin_virt(const TType elemType, const uint32_t size) = 0;
-
-  virtual uint32_t writeSetEnd_virt() = 0;
-
-  virtual uint32_t writeBool_virt(const bool value) = 0;
-
-  virtual uint32_t writeByte_virt(const int8_t byte) = 0;
-
-  virtual uint32_t writeI16_virt(const int16_t i16) = 0;
-
-  virtual uint32_t writeI32_virt(const int32_t i32) = 0;
-
-  virtual uint32_t writeI64_virt(const int64_t i64) = 0;
-
-  virtual uint32_t writeDouble_virt(const double dub) = 0;
-
-  virtual uint32_t writeString_virt(const std::string& str) = 0;
-
-  virtual uint32_t writeBinary_virt(const std::string& str) = 0;
-
-  uint32_t writeMessageBegin(const std::string& name,
-                             const TMessageType messageType,
-                             const int32_t seqid) {
-    T_VIRTUAL_CALL();
-    return writeMessageBegin_virt(name, messageType, seqid);
-  }
-
-  uint32_t writeMessageEnd() {
-    T_VIRTUAL_CALL();
-    return writeMessageEnd_virt();
-  }
-
-  uint32_t writeStructBegin(const char* name) {
-    T_VIRTUAL_CALL();
-    return writeStructBegin_virt(name);
-  }
-
-  uint32_t writeStructEnd() {
-    T_VIRTUAL_CALL();
-    return writeStructEnd_virt();
-  }
-
-  uint32_t writeFieldBegin(const char* name, const TType fieldType, const int16_t fieldId) {
-    T_VIRTUAL_CALL();
-    return writeFieldBegin_virt(name, fieldType, fieldId);
-  }
-
-  uint32_t writeFieldEnd() {
-    T_VIRTUAL_CALL();
-    return writeFieldEnd_virt();
-  }
-
-  uint32_t writeFieldStop() {
-    T_VIRTUAL_CALL();
-    return writeFieldStop_virt();
-  }
-
-  uint32_t writeMapBegin(const TType keyType, const TType valType, const uint32_t size) {
-    T_VIRTUAL_CALL();
-    return writeMapBegin_virt(keyType, valType, size);
-  }
-
-  uint32_t writeMapEnd() {
-    T_VIRTUAL_CALL();
-    return writeMapEnd_virt();
-  }
-
-  uint32_t writeListBegin(const TType elemType, const uint32_t size) {
-    T_VIRTUAL_CALL();
-    return writeListBegin_virt(elemType, size);
-  }
-
-  uint32_t writeListEnd() {
-    T_VIRTUAL_CALL();
-    return writeListEnd_virt();
-  }
-
-  uint32_t writeSetBegin(const TType elemType, const uint32_t size) {
-    T_VIRTUAL_CALL();
-    return writeSetBegin_virt(elemType, size);
-  }
-
-  uint32_t writeSetEnd() {
-    T_VIRTUAL_CALL();
-    return writeSetEnd_virt();
-  }
-
-  uint32_t writeBool(const bool value) {
-    T_VIRTUAL_CALL();
-    return writeBool_virt(value);
-  }
-
-  uint32_t writeByte(const int8_t byte) {
-    T_VIRTUAL_CALL();
-    return writeByte_virt(byte);
-  }
-
-  uint32_t writeI16(const int16_t i16) {
-    T_VIRTUAL_CALL();
-    return writeI16_virt(i16);
-  }
-
-  uint32_t writeI32(const int32_t i32) {
-    T_VIRTUAL_CALL();
-    return writeI32_virt(i32);
-  }
-
-  uint32_t writeI64(const int64_t i64) {
-    T_VIRTUAL_CALL();
-    return writeI64_virt(i64);
-  }
-
-  uint32_t writeDouble(const double dub) {
-    T_VIRTUAL_CALL();
-    return writeDouble_virt(dub);
-  }
-
-  uint32_t writeString(const std::string& str) {
-    T_VIRTUAL_CALL();
-    return writeString_virt(str);
-  }
-
-  uint32_t writeBinary(const std::string& str) {
-    T_VIRTUAL_CALL();
-    return writeBinary_virt(str);
-  }
-
-  /**
-   * Reading functions
-   */
-
-  virtual uint32_t readMessageBegin_virt(std::string& name,
-                                         TMessageType& messageType,
-                                         int32_t& seqid) = 0;
-
-  virtual uint32_t readMessageEnd_virt() = 0;
-
-  virtual uint32_t readStructBegin_virt(std::string& name) = 0;
-
-  virtual uint32_t readStructEnd_virt() = 0;
-
-  virtual uint32_t readFieldBegin_virt(std::string& name, TType& fieldType, int16_t& fieldId) = 0;
-
-  virtual uint32_t readFieldEnd_virt() = 0;
-
-  virtual uint32_t readMapBegin_virt(TType& keyType, TType& valType, uint32_t& size) = 0;
-
-  virtual uint32_t readMapEnd_virt() = 0;
-
-  virtual uint32_t readListBegin_virt(TType& elemType, uint32_t& size) = 0;
-
-  virtual uint32_t readListEnd_virt() = 0;
-
-  virtual uint32_t readSetBegin_virt(TType& elemType, uint32_t& size) = 0;
-
-  virtual uint32_t readSetEnd_virt() = 0;
-
-  virtual uint32_t readBool_virt(bool& value) = 0;
-
-  virtual uint32_t readBool_virt(std::vector<bool>::reference value) = 0;
-
-  virtual uint32_t readByte_virt(int8_t& byte) = 0;
-
-  virtual uint32_t readI16_virt(int16_t& i16) = 0;
-
-  virtual uint32_t readI32_virt(int32_t& i32) = 0;
-
-  virtual uint32_t readI64_virt(int64_t& i64) = 0;
-
-  virtual uint32_t readDouble_virt(double& dub) = 0;
-
-  virtual uint32_t readString_virt(std::string& str) = 0;
-
-  virtual uint32_t readBinary_virt(std::string& str) = 0;
-
-  uint32_t readMessageBegin(std::string& name, TMessageType& messageType, int32_t& seqid) {
-    T_VIRTUAL_CALL();
-    return readMessageBegin_virt(name, messageType, seqid);
-  }
-
-  uint32_t readMessageEnd() {
-    T_VIRTUAL_CALL();
-    return readMessageEnd_virt();
-  }
-
-  uint32_t readStructBegin(std::string& name) {
-    T_VIRTUAL_CALL();
-    return readStructBegin_virt(name);
-  }
-
-  uint32_t readStructEnd() {
-    T_VIRTUAL_CALL();
-    return readStructEnd_virt();
-  }
-
-  uint32_t readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId) {
-    T_VIRTUAL_CALL();
-    return readFieldBegin_virt(name, fieldType, fieldId);
-  }
-
-  uint32_t readFieldEnd() {
-    T_VIRTUAL_CALL();
-    return readFieldEnd_virt();
-  }
-
-  uint32_t readMapBegin(TType& keyType, TType& valType, uint32_t& size) {
-    T_VIRTUAL_CALL();
-    return readMapBegin_virt(keyType, valType, size);
-  }
-
-  uint32_t readMapEnd() {
-    T_VIRTUAL_CALL();
-    return readMapEnd_virt();
-  }
-
-  uint32_t readListBegin(TType& elemType, uint32_t& size) {
-    T_VIRTUAL_CALL();
-    return readListBegin_virt(elemType, size);
-  }
-
-  uint32_t readListEnd() {
-    T_VIRTUAL_CALL();
-    return readListEnd_virt();
-  }
-
-  uint32_t readSetBegin(TType& elemType, uint32_t& size) {
-    T_VIRTUAL_CALL();
-    return readSetBegin_virt(elemType, size);
-  }
-
-  uint32_t readSetEnd() {
-    T_VIRTUAL_CALL();
-    return readSetEnd_virt();
-  }
-
-  uint32_t readBool(bool& value) {
-    T_VIRTUAL_CALL();
-    return readBool_virt(value);
-  }
-
-  uint32_t readByte(int8_t& byte) {
-    T_VIRTUAL_CALL();
-    return readByte_virt(byte);
-  }
-
-  uint32_t readI16(int16_t& i16) {
-    T_VIRTUAL_CALL();
-    return readI16_virt(i16);
-  }
-
-  uint32_t readI32(int32_t& i32) {
-    T_VIRTUAL_CALL();
-    return readI32_virt(i32);
-  }
-
-  uint32_t readI64(int64_t& i64) {
-    T_VIRTUAL_CALL();
-    return readI64_virt(i64);
-  }
-
-  uint32_t readDouble(double& dub) {
-    T_VIRTUAL_CALL();
-    return readDouble_virt(dub);
-  }
-
-  uint32_t readString(std::string& str) {
-    T_VIRTUAL_CALL();
-    return readString_virt(str);
-  }
-
-  uint32_t readBinary(std::string& str) {
-    T_VIRTUAL_CALL();
-    return readBinary_virt(str);
-  }
-
-  /*
-   * std::vector is specialized for bool, and its elements are individual bits
-   * rather than bools.   We need to define a different version of readBool()
-   * to work with std::vector<bool>.
-   */
-  uint32_t readBool(std::vector<bool>::reference value) {
-    T_VIRTUAL_CALL();
-    return readBool_virt(value);
-  }
-
-  /**
-   * Method to arbitrarily skip over data.
-   */
-  uint32_t skip(TType type) {
-    T_VIRTUAL_CALL();
-    return skip_virt(type);
-  }
-  virtual uint32_t skip_virt(TType type);
-
-  inline boost::shared_ptr<TTransport> getTransport() { return ptrans_; }
-
-  // TODO: remove these two calls, they are for backwards
-  // compatibility
-  inline boost::shared_ptr<TTransport> getInputTransport() { return ptrans_; }
-  inline boost::shared_ptr<TTransport> getOutputTransport() { return ptrans_; }
-
-  // input and output recursion depth are kept separate so that one protocol
-  // can be used concurrently for both input and output.
-  void incrementInputRecursionDepth() {
-    if (recursion_limit_ < ++input_recursion_depth_) {
-      throw TProtocolException(TProtocolException::DEPTH_LIMIT);
-    }
-  }
-  void decrementInputRecursionDepth() { --input_recursion_depth_; }
-
-  void incrementOutputRecursionDepth() {
-    if (recursion_limit_ < ++output_recursion_depth_) {
-      throw TProtocolException(TProtocolException::DEPTH_LIMIT);
-    }
-  }
-  void decrementOutputRecursionDepth() { --output_recursion_depth_; }
-
-  uint32_t getRecursionLimit() const {return recursion_limit_;}
-  void setRecurisionLimit(uint32_t depth) {recursion_limit_ = depth;}
-
-protected:
-  TProtocol(boost::shared_ptr<TTransport> ptrans)
-    : ptrans_(ptrans), input_recursion_depth_(0), output_recursion_depth_(0), recursion_limit_(DEFAULT_RECURSION_LIMIT)
-  {}
-
-  boost::shared_ptr<TTransport> ptrans_;
-
-private:
-  TProtocol() {}
-  uint32_t input_recursion_depth_;
-  uint32_t output_recursion_depth_;
-  uint32_t recursion_limit_;
-};
-
-/**
- * Constructs input and output protocol objects given transports.
- */
-class TProtocolFactory {
-public:
-  TProtocolFactory() {}
-
-  virtual ~TProtocolFactory();
-
-  virtual boost::shared_ptr<TProtocol> getProtocol(boost::shared_ptr<TTransport> trans) = 0;
-  virtual boost::shared_ptr<TProtocol> getProtocol(boost::shared_ptr<TTransport> inTrans,
-						   boost::shared_ptr<TTransport> outTrans) {
-    (void)outTrans;
-    return getProtocol(inTrans);
-  }
-};
-
-/**
- * Dummy protocol class.
- *
- * This class does nothing, and should never be instantiated.
- * It is used only by the generator code.
- */
-class TDummyProtocol : public TProtocol {};
-
-// This is the default / legacy choice
-struct TNetworkBigEndian
-{
-  static uint16_t toWire16(uint16_t x)   {return htons(x);}
-  static uint32_t toWire32(uint32_t x)   {return htonl(x);}
-  static uint64_t toWire64(uint64_t x)   {return THRIFT_htonll(x);}
-  static uint16_t fromWire16(uint16_t x) {return ntohs(x);}
-  static uint32_t fromWire32(uint32_t x) {return ntohl(x);}
-  static uint64_t fromWire64(uint64_t x) {return THRIFT_ntohll(x);}
-};
-
-// On most systems, this will be a bit faster than TNetworkBigEndian
-struct TNetworkLittleEndian
-{
-  static uint16_t toWire16(uint16_t x)   {return THRIFT_htoles(x);}
-  static uint32_t toWire32(uint32_t x)   {return THRIFT_htolel(x);}
-  static uint64_t toWire64(uint64_t x)   {return THRIFT_htolell(x);}
-  static uint16_t fromWire16(uint16_t x) {return THRIFT_letohs(x);}
-  static uint32_t fromWire32(uint32_t x) {return THRIFT_letohl(x);}
-  static uint64_t fromWire64(uint64_t x) {return THRIFT_letohll(x);}
-};
-
-struct TOutputRecursionTracker {
-  TProtocol &prot_;
-  TOutputRecursionTracker(TProtocol &prot) : prot_(prot) {
-    prot_.incrementOutputRecursionDepth();
-  }
-  ~TOutputRecursionTracker() {
-    prot_.decrementOutputRecursionDepth();
-  }
-};
-
-struct TInputRecursionTracker {
-  TProtocol &prot_;
-  TInputRecursionTracker(TProtocol &prot) : prot_(prot) {
-    prot_.incrementInputRecursionDepth();
-  }
-  ~TInputRecursionTracker() {
-    prot_.decrementInputRecursionDepth();
-  }
-};
-
-/**
- * Helper template for implementing TProtocol::skip().
- *
- * Templatized to avoid having to make virtual function calls.
- */
-template <class Protocol_>
-uint32_t skip(Protocol_& prot, TType type) {
-  TInputRecursionTracker tracker(prot);
-
-  switch (type) {
-  case T_BOOL: {
-    bool boolv;
-    return prot.readBool(boolv);
-  }
-  case T_BYTE: {
-    int8_t bytev;
-    return prot.readByte(bytev);
-  }
-  case T_I16: {
-    int16_t i16;
-    return prot.readI16(i16);
-  }
-  case T_I32: {
-    int32_t i32;
-    return prot.readI32(i32);
-  }
-  case T_I64: {
-    int64_t i64;
-    return prot.readI64(i64);
-  }
-  case T_DOUBLE: {
-    double dub;
-    return prot.readDouble(dub);
-  }
-  case T_STRING: {
-    std::string str;
-    return prot.readBinary(str);
-  }
-  case T_STRUCT: {
-    uint32_t result = 0;
-    std::string name;
-    int16_t fid;
-    TType ftype;
-    result += prot.readStructBegin(name);
-    while (true) {
-      result += prot.readFieldBegin(name, ftype, fid);
-      if (ftype == T_STOP) {
-        break;
-      }
-      result += skip(prot, ftype);
-      result += prot.readFieldEnd();
-    }
-    result += prot.readStructEnd();
-    return result;
-  }
-  case T_MAP: {
-    uint32_t result = 0;
-    TType keyType;
-    TType valType;
-    uint32_t i, size;
-    result += prot.readMapBegin(keyType, valType, size);
-    for (i = 0; i < size; i++) {
-      result += skip(prot, keyType);
-      result += skip(prot, valType);
-    }
-    result += prot.readMapEnd();
-    return result;
-  }
-  case T_SET: {
-    uint32_t result = 0;
-    TType elemType;
-    uint32_t i, size;
-    result += prot.readSetBegin(elemType, size);
-    for (i = 0; i < size; i++) {
-      result += skip(prot, elemType);
-    }
-    result += prot.readSetEnd();
-    return result;
-  }
-  case T_LIST: {
-    uint32_t result = 0;
-    TType elemType;
-    uint32_t i, size;
-    result += prot.readListBegin(elemType, size);
-    for (i = 0; i < size; i++) {
-      result += skip(prot, elemType);
-    }
-    result += prot.readListEnd();
-    return result;
-  }
-  case T_STOP:
-  case T_VOID:
-  case T_U64:
-  case T_UTF8:
-  case T_UTF16:
-    break;
-  }
-  return 0;
-}
-
-}}} // apache::thrift::protocol
-
-#endif // #define _THRIFT_PROTOCOL_TPROTOCOL_H_ 1
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolDecorator.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolDecorator.h
deleted file mode 100644
index 446a81f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolDecorator.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_TPROTOCOLDECORATOR_H_
-#define THRIFT_TPROTOCOLDECORATOR_H_ 1
-
-#include <thrift/protocol/TProtocol.h>
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-using boost::shared_ptr;
-
-/**
- * <code>TProtocolDecorator</code> forwards all requests to an enclosed
- * <code>TProtocol</code> instance, providing a way to author concise
- * concrete decorator subclasses.
- *
- * <p>See p.175 of Design Patterns (by Gamma et al.)</p>
- *
- * @see apache::thrift::protocol::TMultiplexedProtocol
- */
-class TProtocolDecorator : public TProtocol {
-public:
-  virtual ~TProtocolDecorator() {}
-
-  // Desc: Initializes the protocol decorator object.
-  TProtocolDecorator(shared_ptr<TProtocol> proto)
-    : TProtocol(proto->getTransport()), protocol(proto) {}
-
-  virtual uint32_t writeMessageBegin_virt(const std::string& name,
-                                          const TMessageType messageType,
-                                          const int32_t seqid) {
-    return protocol->writeMessageBegin(name, messageType, seqid);
-  }
-  virtual uint32_t writeMessageEnd_virt() { return protocol->writeMessageEnd(); }
-  virtual uint32_t writeStructBegin_virt(const char* name) {
-    return protocol->writeStructBegin(name);
-  }
-  virtual uint32_t writeStructEnd_virt() { return protocol->writeStructEnd(); }
-
-  virtual uint32_t writeFieldBegin_virt(const char* name,
-                                        const TType fieldType,
-                                        const int16_t fieldId) {
-    return protocol->writeFieldBegin(name, fieldType, fieldId);
-  }
-
-  virtual uint32_t writeFieldEnd_virt() { return protocol->writeFieldEnd(); }
-  virtual uint32_t writeFieldStop_virt() { return protocol->writeFieldStop(); }
-
-  virtual uint32_t writeMapBegin_virt(const TType keyType,
-                                      const TType valType,
-                                      const uint32_t size) {
-    return protocol->writeMapBegin(keyType, valType, size);
-  }
-
-  virtual uint32_t writeMapEnd_virt() { return protocol->writeMapEnd(); }
-
-  virtual uint32_t writeListBegin_virt(const TType elemType, const uint32_t size) {
-    return protocol->writeListBegin(elemType, size);
-  }
-  virtual uint32_t writeListEnd_virt() { return protocol->writeListEnd(); }
-
-  virtual uint32_t writeSetBegin_virt(const TType elemType, const uint32_t size) {
-    return protocol->writeSetBegin(elemType, size);
-  }
-  virtual uint32_t writeSetEnd_virt() { return protocol->writeSetEnd(); }
-
-  virtual uint32_t writeBool_virt(const bool value) { return protocol->writeBool(value); }
-  virtual uint32_t writeByte_virt(const int8_t byte) { return protocol->writeByte(byte); }
-  virtual uint32_t writeI16_virt(const int16_t i16) { return protocol->writeI16(i16); }
-  virtual uint32_t writeI32_virt(const int32_t i32) { return protocol->writeI32(i32); }
-  virtual uint32_t writeI64_virt(const int64_t i64) { return protocol->writeI64(i64); }
-
-  virtual uint32_t writeDouble_virt(const double dub) { return protocol->writeDouble(dub); }
-  virtual uint32_t writeString_virt(const std::string& str) { return protocol->writeString(str); }
-  virtual uint32_t writeBinary_virt(const std::string& str) { return protocol->writeBinary(str); }
-
-  virtual uint32_t readMessageBegin_virt(std::string& name,
-                                         TMessageType& messageType,
-                                         int32_t& seqid) {
-    return protocol->readMessageBegin(name, messageType, seqid);
-  }
-  virtual uint32_t readMessageEnd_virt() { return protocol->readMessageEnd(); }
-
-  virtual uint32_t readStructBegin_virt(std::string& name) {
-    return protocol->readStructBegin(name);
-  }
-  virtual uint32_t readStructEnd_virt() { return protocol->readStructEnd(); }
-
-  virtual uint32_t readFieldBegin_virt(std::string& name, TType& fieldType, int16_t& fieldId) {
-    return protocol->readFieldBegin(name, fieldType, fieldId);
-  }
-  virtual uint32_t readFieldEnd_virt() { return protocol->readFieldEnd(); }
-
-  virtual uint32_t readMapBegin_virt(TType& keyType, TType& valType, uint32_t& size) {
-    return protocol->readMapBegin(keyType, valType, size);
-  }
-  virtual uint32_t readMapEnd_virt() { return protocol->readMapEnd(); }
-
-  virtual uint32_t readListBegin_virt(TType& elemType, uint32_t& size) {
-    return protocol->readListBegin(elemType, size);
-  }
-  virtual uint32_t readListEnd_virt() { return protocol->readListEnd(); }
-
-  virtual uint32_t readSetBegin_virt(TType& elemType, uint32_t& size) {
-    return protocol->readSetBegin(elemType, size);
-  }
-  virtual uint32_t readSetEnd_virt() { return protocol->readSetEnd(); }
-
-  virtual uint32_t readBool_virt(bool& value) { return protocol->readBool(value); }
-  virtual uint32_t readBool_virt(std::vector<bool>::reference value) {
-    return protocol->readBool(value);
-  }
-
-  virtual uint32_t readByte_virt(int8_t& byte) { return protocol->readByte(byte); }
-
-  virtual uint32_t readI16_virt(int16_t& i16) { return protocol->readI16(i16); }
-  virtual uint32_t readI32_virt(int32_t& i32) { return protocol->readI32(i32); }
-  virtual uint32_t readI64_virt(int64_t& i64) { return protocol->readI64(i64); }
-
-  virtual uint32_t readDouble_virt(double& dub) { return protocol->readDouble(dub); }
-
-  virtual uint32_t readString_virt(std::string& str) { return protocol->readString(str); }
-  virtual uint32_t readBinary_virt(std::string& str) { return protocol->readBinary(str); }
-
-private:
-  shared_ptr<TProtocol> protocol;
-};
-}
-}
-}
-
-#endif // THRIFT_TPROTOCOLDECORATOR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolException.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolException.h
deleted file mode 100644
index 6e536b4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolException.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TPROTOCOLEXCEPTION_H_
-#define _THRIFT_PROTOCOL_TPROTOCOLEXCEPTION_H_ 1
-
-#include <string>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-/**
- * Class to encapsulate all the possible types of protocol errors that may
- * occur in various protocol systems. This provides a sort of generic
- * wrapper around the vague UNIX E_ error codes that lets a common code
- * base of error handling to be used for various types of protocols, i.e.
- * pipes etc.
- *
- */
-class TProtocolException : public apache::thrift::TException {
-public:
-  /**
-   * Error codes for the various types of exceptions.
-   */
-  enum TProtocolExceptionType {
-    UNKNOWN = 0,
-    INVALID_DATA = 1,
-    NEGATIVE_SIZE = 2,
-    SIZE_LIMIT = 3,
-    BAD_VERSION = 4,
-    NOT_IMPLEMENTED = 5,
-    DEPTH_LIMIT = 6
-  };
-
-  TProtocolException() : apache::thrift::TException(), type_(UNKNOWN) {}
-
-  TProtocolException(TProtocolExceptionType type) : apache::thrift::TException(), type_(type) {}
-
-  TProtocolException(const std::string& message)
-    : apache::thrift::TException(message), type_(UNKNOWN) {}
-
-  TProtocolException(TProtocolExceptionType type, const std::string& message)
-    : apache::thrift::TException(message), type_(type) {}
-
-  virtual ~TProtocolException() throw() {}
-
-  /**
-   * Returns an error code that provides information about the type of error
-   * that has occurred.
-   *
-   * @return Error code
-   */
-  TProtocolExceptionType getType() const { return type_; }
-
-  virtual const char* what() const throw() {
-    if (message_.empty()) {
-      switch (type_) {
-      case UNKNOWN:
-        return "TProtocolException: Unknown protocol exception";
-      case INVALID_DATA:
-        return "TProtocolException: Invalid data";
-      case NEGATIVE_SIZE:
-        return "TProtocolException: Negative size";
-      case SIZE_LIMIT:
-        return "TProtocolException: Exceeded size limit";
-      case BAD_VERSION:
-        return "TProtocolException: Invalid version";
-      case NOT_IMPLEMENTED:
-        return "TProtocolException: Not implemented";
-      default:
-        return "TProtocolException: (Invalid exception type)";
-      }
-    } else {
-      return message_.c_str();
-    }
-  }
-
-protected:
-  /**
-   * Error code
-   */
-  TProtocolExceptionType type_;
-};
-}
-}
-} // apache::thrift::protocol
-
-#endif // #ifndef _THRIFT_PROTOCOL_TPROTOCOLEXCEPTION_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolTap.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolTap.h
deleted file mode 100644
index 3e56393..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolTap.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TPROTOCOLTAP_H_
-#define _THRIFT_PROTOCOL_TPROTOCOLTAP_H_ 1
-
-#include <thrift/protocol/TVirtualProtocol.h>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-using apache::thrift::transport::TTransport;
-
-/**
- * Puts a wiretap on a protocol object.  Any reads to this class are passed
- * through to an enclosed protocol object, but also mirrored as write to a
- * second protocol object.
- *
- */
-class TProtocolTap : public TVirtualProtocol<TProtocolTap> {
-public:
-  TProtocolTap(boost::shared_ptr<TProtocol> source, boost::shared_ptr<TProtocol> sink)
-    : TVirtualProtocol<TProtocolTap>(source->getTransport()), source_(source), sink_(sink) {}
-
-  uint32_t readMessageBegin(std::string& name, TMessageType& messageType, int32_t& seqid) {
-    uint32_t rv = source_->readMessageBegin(name, messageType, seqid);
-    sink_->writeMessageBegin(name, messageType, seqid);
-    return rv;
-  }
-
-  uint32_t readMessageEnd() {
-    uint32_t rv = source_->readMessageEnd();
-    sink_->writeMessageEnd();
-    return rv;
-  }
-
-  uint32_t readStructBegin(std::string& name) {
-    uint32_t rv = source_->readStructBegin(name);
-    sink_->writeStructBegin(name.c_str());
-    return rv;
-  }
-
-  uint32_t readStructEnd() {
-    uint32_t rv = source_->readStructEnd();
-    sink_->writeStructEnd();
-    return rv;
-  }
-
-  uint32_t readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId) {
-    uint32_t rv = source_->readFieldBegin(name, fieldType, fieldId);
-    if (fieldType == T_STOP) {
-      sink_->writeFieldStop();
-    } else {
-      sink_->writeFieldBegin(name.c_str(), fieldType, fieldId);
-    }
-    return rv;
-  }
-
-  uint32_t readFieldEnd() {
-    uint32_t rv = source_->readFieldEnd();
-    sink_->writeFieldEnd();
-    return rv;
-  }
-
-  uint32_t readMapBegin(TType& keyType, TType& valType, uint32_t& size) {
-    uint32_t rv = source_->readMapBegin(keyType, valType, size);
-    sink_->writeMapBegin(keyType, valType, size);
-    return rv;
-  }
-
-  uint32_t readMapEnd() {
-    uint32_t rv = source_->readMapEnd();
-    sink_->writeMapEnd();
-    return rv;
-  }
-
-  uint32_t readListBegin(TType& elemType, uint32_t& size) {
-    uint32_t rv = source_->readListBegin(elemType, size);
-    sink_->writeListBegin(elemType, size);
-    return rv;
-  }
-
-  uint32_t readListEnd() {
-    uint32_t rv = source_->readListEnd();
-    sink_->writeListEnd();
-    return rv;
-  }
-
-  uint32_t readSetBegin(TType& elemType, uint32_t& size) {
-    uint32_t rv = source_->readSetBegin(elemType, size);
-    sink_->writeSetBegin(elemType, size);
-    return rv;
-  }
-
-  uint32_t readSetEnd() {
-    uint32_t rv = source_->readSetEnd();
-    sink_->writeSetEnd();
-    return rv;
-  }
-
-  uint32_t readBool(bool& value) {
-    uint32_t rv = source_->readBool(value);
-    sink_->writeBool(value);
-    return rv;
-  }
-
-  // Provide the default readBool() implementation for std::vector<bool>
-  using TVirtualProtocol<TProtocolTap>::readBool;
-
-  uint32_t readByte(int8_t& byte) {
-    uint32_t rv = source_->readByte(byte);
-    sink_->writeByte(byte);
-    return rv;
-  }
-
-  uint32_t readI16(int16_t& i16) {
-    uint32_t rv = source_->readI16(i16);
-    sink_->writeI16(i16);
-    return rv;
-  }
-
-  uint32_t readI32(int32_t& i32) {
-    uint32_t rv = source_->readI32(i32);
-    sink_->writeI32(i32);
-    return rv;
-  }
-
-  uint32_t readI64(int64_t& i64) {
-    uint32_t rv = source_->readI64(i64);
-    sink_->writeI64(i64);
-    return rv;
-  }
-
-  uint32_t readDouble(double& dub) {
-    uint32_t rv = source_->readDouble(dub);
-    sink_->writeDouble(dub);
-    return rv;
-  }
-
-  uint32_t readString(std::string& str) {
-    uint32_t rv = source_->readString(str);
-    sink_->writeString(str);
-    return rv;
-  }
-
-  uint32_t readBinary(std::string& str) {
-    uint32_t rv = source_->readBinary(str);
-    sink_->writeBinary(str);
-    return rv;
-  }
-
-private:
-  boost::shared_ptr<TProtocol> source_;
-  boost::shared_ptr<TProtocol> sink_;
-};
-}
-}
-} // apache::thrift::protocol
-
-#endif // #define _THRIFT_PROTOCOL_TPROTOCOLTAP_H_ 1
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolTypes.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolTypes.h
deleted file mode 100644
index 6898b24..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TProtocolTypes.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_PROTOCOL_TPROTOCOLTYPES_H_
-#define THRIFT_PROTOCOL_TPROTOCOLTYPES_H_ 1
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-enum PROTOCOL_TYPES {
-  T_BINARY_PROTOCOL = 0,
-  T_JSON_PROTOCOL = 1,
-  T_COMPACT_PROTOCOL = 2,
-};
-}
-}
-} // apache::thrift::protocol
-
-#endif // #define _THRIFT_PROTOCOL_TPROTOCOLTYPES_H_ 1
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TVirtualProtocol.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TVirtualProtocol.h
deleted file mode 100644
index 831c3a2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/protocol/TVirtualProtocol.h
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_PROTOCOL_TVIRTUALPROTOCOL_H_
-#define _THRIFT_PROTOCOL_TVIRTUALPROTOCOL_H_ 1
-
-#include <thrift/protocol/TProtocol.h>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-
-using apache::thrift::transport::TTransport;
-
-/**
- * Helper class that provides default implementations of TProtocol methods.
- *
- * This class provides default implementations of the non-virtual TProtocol
- * methods.  It exists primarily so TVirtualProtocol can derive from it.  It
- * prevents TVirtualProtocol methods from causing infinite recursion if the
- * non-virtual methods are not overridden by the TVirtualProtocol subclass.
- *
- * You probably don't want to use this class directly.  Use TVirtualProtocol
- * instead.
- */
-class TProtocolDefaults : public TProtocol {
-public:
-  uint32_t readMessageBegin(std::string& name, TMessageType& messageType, int32_t& seqid) {
-    (void)name;
-    (void)messageType;
-    (void)seqid;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readMessageEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readStructBegin(std::string& name) {
-    (void)name;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readStructEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readFieldBegin(std::string& name, TType& fieldType, int16_t& fieldId) {
-    (void)name;
-    (void)fieldType;
-    (void)fieldId;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readFieldEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readMapBegin(TType& keyType, TType& valType, uint32_t& size) {
-    (void)keyType;
-    (void)valType;
-    (void)size;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readMapEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readListBegin(TType& elemType, uint32_t& size) {
-    (void)elemType;
-    (void)size;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readListEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readSetBegin(TType& elemType, uint32_t& size) {
-    (void)elemType;
-    (void)size;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readSetEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readBool(bool& value) {
-    (void)value;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readBool(std::vector<bool>::reference value) {
-    (void)value;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readByte(int8_t& byte) {
-    (void)byte;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readI16(int16_t& i16) {
-    (void)i16;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readI32(int32_t& i32) {
-    (void)i32;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readI64(int64_t& i64) {
-    (void)i64;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readDouble(double& dub) {
-    (void)dub;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readString(std::string& str) {
-    (void)str;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t readBinary(std::string& str) {
-    (void)str;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support reading (yet).");
-  }
-
-  uint32_t writeMessageBegin(const std::string& name,
-                             const TMessageType messageType,
-                             const int32_t seqid) {
-    (void)name;
-    (void)messageType;
-    (void)seqid;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeMessageEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeStructBegin(const char* name) {
-    (void)name;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeStructEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeFieldBegin(const char* name, const TType fieldType, const int16_t fieldId) {
-    (void)name;
-    (void)fieldType;
-    (void)fieldId;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeFieldEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeFieldStop() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeMapBegin(const TType keyType, const TType valType, const uint32_t size) {
-    (void)keyType;
-    (void)valType;
-    (void)size;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeMapEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeListBegin(const TType elemType, const uint32_t size) {
-    (void)elemType;
-    (void)size;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeListEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeSetBegin(const TType elemType, const uint32_t size) {
-    (void)elemType;
-    (void)size;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeSetEnd() {
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeBool(const bool value) {
-    (void)value;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeByte(const int8_t byte) {
-    (void)byte;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeI16(const int16_t i16) {
-    (void)i16;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeI32(const int32_t i32) {
-    (void)i32;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeI64(const int64_t i64) {
-    (void)i64;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeDouble(const double dub) {
-    (void)dub;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeString(const std::string& str) {
-    (void)str;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t writeBinary(const std::string& str) {
-    (void)str;
-    throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
-                             "this protocol does not support writing (yet).");
-  }
-
-  uint32_t skip(TType type) { return ::apache::thrift::protocol::skip(*this, type); }
-
-protected:
-  TProtocolDefaults(boost::shared_ptr<TTransport> ptrans) : TProtocol(ptrans) {}
-};
-
-/**
- * Concrete TProtocol classes should inherit from TVirtualProtocol
- * so they don't have to manually override virtual methods.
- */
-template <class Protocol_, class Super_ = TProtocolDefaults>
-class TVirtualProtocol : public Super_ {
-public:
-  /**
-   * Writing functions.
-   */
-
-  virtual uint32_t writeMessageBegin_virt(const std::string& name,
-                                          const TMessageType messageType,
-                                          const int32_t seqid) {
-    return static_cast<Protocol_*>(this)->writeMessageBegin(name, messageType, seqid);
-  }
-
-  virtual uint32_t writeMessageEnd_virt() {
-    return static_cast<Protocol_*>(this)->writeMessageEnd();
-  }
-
-  virtual uint32_t writeStructBegin_virt(const char* name) {
-    return static_cast<Protocol_*>(this)->writeStructBegin(name);
-  }
-
-  virtual uint32_t writeStructEnd_virt() { return static_cast<Protocol_*>(this)->writeStructEnd(); }
-
-  virtual uint32_t writeFieldBegin_virt(const char* name,
-                                        const TType fieldType,
-                                        const int16_t fieldId) {
-    return static_cast<Protocol_*>(this)->writeFieldBegin(name, fieldType, fieldId);
-  }
-
-  virtual uint32_t writeFieldEnd_virt() { return static_cast<Protocol_*>(this)->writeFieldEnd(); }
-
-  virtual uint32_t writeFieldStop_virt() { return static_cast<Protocol_*>(this)->writeFieldStop(); }
-
-  virtual uint32_t writeMapBegin_virt(const TType keyType,
-                                      const TType valType,
-                                      const uint32_t size) {
-    return static_cast<Protocol_*>(this)->writeMapBegin(keyType, valType, size);
-  }
-
-  virtual uint32_t writeMapEnd_virt() { return static_cast<Protocol_*>(this)->writeMapEnd(); }
-
-  virtual uint32_t writeListBegin_virt(const TType elemType, const uint32_t size) {
-    return static_cast<Protocol_*>(this)->writeListBegin(elemType, size);
-  }
-
-  virtual uint32_t writeListEnd_virt() { return static_cast<Protocol_*>(this)->writeListEnd(); }
-
-  virtual uint32_t writeSetBegin_virt(const TType elemType, const uint32_t size) {
-    return static_cast<Protocol_*>(this)->writeSetBegin(elemType, size);
-  }
-
-  virtual uint32_t writeSetEnd_virt() { return static_cast<Protocol_*>(this)->writeSetEnd(); }
-
-  virtual uint32_t writeBool_virt(const bool value) {
-    return static_cast<Protocol_*>(this)->writeBool(value);
-  }
-
-  virtual uint32_t writeByte_virt(const int8_t byte) {
-    return static_cast<Protocol_*>(this)->writeByte(byte);
-  }
-
-  virtual uint32_t writeI16_virt(const int16_t i16) {
-    return static_cast<Protocol_*>(this)->writeI16(i16);
-  }
-
-  virtual uint32_t writeI32_virt(const int32_t i32) {
-    return static_cast<Protocol_*>(this)->writeI32(i32);
-  }
-
-  virtual uint32_t writeI64_virt(const int64_t i64) {
-    return static_cast<Protocol_*>(this)->writeI64(i64);
-  }
-
-  virtual uint32_t writeDouble_virt(const double dub) {
-    return static_cast<Protocol_*>(this)->writeDouble(dub);
-  }
-
-  virtual uint32_t writeString_virt(const std::string& str) {
-    return static_cast<Protocol_*>(this)->writeString(str);
-  }
-
-  virtual uint32_t writeBinary_virt(const std::string& str) {
-    return static_cast<Protocol_*>(this)->writeBinary(str);
-  }
-
-  /**
-   * Reading functions
-   */
-
-  virtual uint32_t readMessageBegin_virt(std::string& name,
-                                         TMessageType& messageType,
-                                         int32_t& seqid) {
-    return static_cast<Protocol_*>(this)->readMessageBegin(name, messageType, seqid);
-  }
-
-  virtual uint32_t readMessageEnd_virt() { return static_cast<Protocol_*>(this)->readMessageEnd(); }
-
-  virtual uint32_t readStructBegin_virt(std::string& name) {
-    return static_cast<Protocol_*>(this)->readStructBegin(name);
-  }
-
-  virtual uint32_t readStructEnd_virt() { return static_cast<Protocol_*>(this)->readStructEnd(); }
-
-  virtual uint32_t readFieldBegin_virt(std::string& name, TType& fieldType, int16_t& fieldId) {
-    return static_cast<Protocol_*>(this)->readFieldBegin(name, fieldType, fieldId);
-  }
-
-  virtual uint32_t readFieldEnd_virt() { return static_cast<Protocol_*>(this)->readFieldEnd(); }
-
-  virtual uint32_t readMapBegin_virt(TType& keyType, TType& valType, uint32_t& size) {
-    return static_cast<Protocol_*>(this)->readMapBegin(keyType, valType, size);
-  }
-
-  virtual uint32_t readMapEnd_virt() { return static_cast<Protocol_*>(this)->readMapEnd(); }
-
-  virtual uint32_t readListBegin_virt(TType& elemType, uint32_t& size) {
-    return static_cast<Protocol_*>(this)->readListBegin(elemType, size);
-  }
-
-  virtual uint32_t readListEnd_virt() { return static_cast<Protocol_*>(this)->readListEnd(); }
-
-  virtual uint32_t readSetBegin_virt(TType& elemType, uint32_t& size) {
-    return static_cast<Protocol_*>(this)->readSetBegin(elemType, size);
-  }
-
-  virtual uint32_t readSetEnd_virt() { return static_cast<Protocol_*>(this)->readSetEnd(); }
-
-  virtual uint32_t readBool_virt(bool& value) {
-    return static_cast<Protocol_*>(this)->readBool(value);
-  }
-
-  virtual uint32_t readBool_virt(std::vector<bool>::reference value) {
-    return static_cast<Protocol_*>(this)->readBool(value);
-  }
-
-  virtual uint32_t readByte_virt(int8_t& byte) {
-    return static_cast<Protocol_*>(this)->readByte(byte);
-  }
-
-  virtual uint32_t readI16_virt(int16_t& i16) {
-    return static_cast<Protocol_*>(this)->readI16(i16);
-  }
-
-  virtual uint32_t readI32_virt(int32_t& i32) {
-    return static_cast<Protocol_*>(this)->readI32(i32);
-  }
-
-  virtual uint32_t readI64_virt(int64_t& i64) {
-    return static_cast<Protocol_*>(this)->readI64(i64);
-  }
-
-  virtual uint32_t readDouble_virt(double& dub) {
-    return static_cast<Protocol_*>(this)->readDouble(dub);
-  }
-
-  virtual uint32_t readString_virt(std::string& str) {
-    return static_cast<Protocol_*>(this)->readString(str);
-  }
-
-  virtual uint32_t readBinary_virt(std::string& str) {
-    return static_cast<Protocol_*>(this)->readBinary(str);
-  }
-
-  virtual uint32_t skip_virt(TType type) { return static_cast<Protocol_*>(this)->skip(type); }
-
-  /*
-   * Provide a default skip() implementation that uses non-virtual read
-   * methods.
-   *
-   * Note: subclasses that use TVirtualProtocol to derive from another protocol
-   * implementation (i.e., not TProtocolDefaults) should beware that this may
-   * override any non-default skip() implementation provided by the parent
-   * transport class.  They may need to explicitly redefine skip() to call the
-   * correct parent implementation, if desired.
-   */
-  uint32_t skip(TType type) {
-    Protocol_* const prot = static_cast<Protocol_*>(this);
-    return ::apache::thrift::protocol::skip(*prot, type);
-  }
-
-  /*
-   * Provide a default readBool() implementation for use with
-   * std::vector<bool>, that behaves the same as reading into a normal bool.
-   *
-   * Subclasses can override this if desired, but there normally shouldn't
-   * be a need to.
-   */
-  uint32_t readBool(std::vector<bool>::reference value) {
-    bool b = false;
-    uint32_t ret = static_cast<Protocol_*>(this)->readBool(b);
-    value = b;
-    return ret;
-  }
-  using Super_::readBool; // so we don't hide readBool(bool&)
-
-protected:
-  TVirtualProtocol(boost::shared_ptr<TTransport> ptrans) : Super_(ptrans) {}
-};
-}
-}
-} // apache::thrift::protocol
-
-#endif // #define _THRIFT_PROTOCOL_TVIRTUALPROTOCOL_H_ 1
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/CMakeLists.txt
deleted file mode 100644
index 04a9a31..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-set( thriftcppqt5_SOURCES
-    TQIODeviceTransport.cpp
-    TQTcpServer.cpp
-)
-set(CMAKE_AUTOMOC ON)
-find_package(Qt5 REQUIRED COMPONENTS Core Network)
-ADD_LIBRARY_THRIFT(thriftqt5 ${thriftcppqt5_SOURCES})
-TARGET_LINK_LIBRARIES_THRIFT(thriftqt5 Qt5::Core Qt5::Network)
-TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY(thriftqt5 thrift)
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
deleted file mode 100644
index 686f242..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/qt/TQIODeviceTransport.h>
-
-#include <QAbstractSocket>
-#include <QIODevice>
-
-#include <thrift/transport/TBufferTransports.h>
-
-using boost::shared_ptr;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-TQIODeviceTransport::TQIODeviceTransport(shared_ptr<QIODevice> dev) : dev_(dev) {
-}
-
-TQIODeviceTransport::~TQIODeviceTransport() {
-  dev_->close();
-}
-
-void TQIODeviceTransport::open() {
-  if (!isOpen()) {
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "open(): underlying QIODevice isn't open");
-  }
-}
-
-bool TQIODeviceTransport::isOpen() {
-  return dev_->isOpen();
-}
-
-bool TQIODeviceTransport::peek() {
-  return dev_->bytesAvailable() > 0;
-}
-
-void TQIODeviceTransport::close() {
-  dev_->close();
-}
-
-uint32_t TQIODeviceTransport::readAll(uint8_t* buf, uint32_t len) {
-  uint32_t requestLen = len;
-  while (len) {
-    uint32_t readSize;
-    try {
-      readSize = read(buf, len);
-    } catch (...) {
-      if (len != requestLen) {
-        // something read already
-        return requestLen - len;
-      }
-      // error but nothing read yet
-      throw;
-    }
-    if (readSize == 0) {
-      dev_->waitForReadyRead(50);
-    } else {
-      buf += readSize;
-      len -= readSize;
-    }
-  }
-  return requestLen;
-}
-
-uint32_t TQIODeviceTransport::read(uint8_t* buf, uint32_t len) {
-  uint32_t actualSize;
-  qint64 readSize;
-
-  if (!dev_->isOpen()) {
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "read(): underlying QIODevice is not open");
-  }
-
-  actualSize = (uint32_t)std::min((qint64)len, dev_->bytesAvailable());
-  readSize = dev_->read(reinterpret_cast<char*>(buf), actualSize);
-
-  if (readSize < 0) {
-    QAbstractSocket* socket;
-    if ((socket = qobject_cast<QAbstractSocket*>(dev_.get()))) {
-      throw TTransportException(TTransportException::UNKNOWN,
-                                "Failed to read() from QAbstractSocket",
-                                socket->error());
-    }
-    throw TTransportException(TTransportException::UNKNOWN, "Failed to read from from QIODevice");
-  }
-
-  return (uint32_t)readSize;
-}
-
-void TQIODeviceTransport::write(const uint8_t* buf, uint32_t len) {
-  while (len) {
-    uint32_t written = write_partial(buf, len);
-    len -= written;
-    dev_->waitForBytesWritten(50);
-  }
-}
-
-uint32_t TQIODeviceTransport::write_partial(const uint8_t* buf, uint32_t len) {
-  qint64 written;
-
-  if (!dev_->isOpen()) {
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "write_partial(): underlying QIODevice is not open");
-  }
-
-  written = dev_->write(reinterpret_cast<const char*>(buf), len);
-  if (written < 0) {
-    QAbstractSocket* socket;
-    if ((socket = qobject_cast<QAbstractSocket*>(dev_.get()))) {
-      throw TTransportException(TTransportException::UNKNOWN,
-                                "write_partial(): failed to write to QAbstractSocket",
-                                socket->error());
-    }
-
-    throw TTransportException(TTransportException::UNKNOWN,
-                              "write_partial(): failed to write to underlying QIODevice");
-  }
-
-  return (uint32_t)written;
-}
-
-void TQIODeviceTransport::flush() {
-  if (!dev_->isOpen()) {
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "flush(): underlying QIODevice is not open");
-  }
-
-  QAbstractSocket* socket;
-
-  if ((socket = qobject_cast<QAbstractSocket*>(dev_.get()))) {
-    socket->flush();
-  } else {
-    dev_->waitForBytesWritten(1);
-  }
-}
-
-uint8_t* TQIODeviceTransport::borrow(uint8_t* buf, uint32_t* len) {
-  (void)buf;
-  (void)len;
-  return NULL;
-}
-
-void TQIODeviceTransport::consume(uint32_t len) {
-  (void)len;
-  throw TTransportException(TTransportException::UNKNOWN);
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQIODeviceTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQIODeviceTransport.h
deleted file mode 100644
index 8091d32..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQIODeviceTransport.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_ASYNC_TQIODEVICE_TRANSPORT_H_
-#define _THRIFT_ASYNC_TQIODEVICE_TRANSPORT_H_ 1
-
-#include <boost/shared_ptr.hpp>
-
-#include <thrift/transport/TVirtualTransport.h>
-
-class QIODevice;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- *  Transport that operates on a QIODevice (socket, file, etc).
- */
-class TQIODeviceTransport
-    : public apache::thrift::transport::TVirtualTransport<TQIODeviceTransport> {
-public:
-  explicit TQIODeviceTransport(boost::shared_ptr<QIODevice> dev);
-  virtual ~TQIODeviceTransport();
-
-  void open();
-  bool isOpen();
-  bool peek();
-  void close();
-
-  uint32_t readAll(uint8_t* buf, uint32_t len);
-  uint32_t read(uint8_t* buf, uint32_t len);
-
-  void write(const uint8_t* buf, uint32_t len);
-  uint32_t write_partial(const uint8_t* buf, uint32_t len);
-
-  void flush();
-
-  uint8_t* borrow(uint8_t* buf, uint32_t* len);
-  void consume(uint32_t len);
-
-private:
-  TQIODeviceTransport(const TQIODeviceTransport&);
-  TQIODeviceTransport& operator=(const TQIODeviceTransport&);
-
-  boost::shared_ptr<QIODevice> dev_;
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_ASYNC_TQIODEVICE_TRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQTcpServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQTcpServer.cpp
deleted file mode 100644
index 350198c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQTcpServer.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/qt/TQTcpServer.h>
-#include <thrift/qt/TQIODeviceTransport.h>
-
-#include <QMetaType>
-#include <QTcpSocket>
-
-#include <thrift/cxxfunctional.h>
-
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/async/TAsyncProcessor.h>
-
-using boost::shared_ptr;
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::protocol::TProtocolFactory;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TQIODeviceTransport;
-using apache::thrift::stdcxx::function;
-using apache::thrift::stdcxx::bind;
-
-QT_USE_NAMESPACE
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-struct TQTcpServer::ConnectionContext {
-  shared_ptr<QTcpSocket> connection_;
-  shared_ptr<TTransport> transport_;
-  shared_ptr<TProtocol> iprot_;
-  shared_ptr<TProtocol> oprot_;
-
-  explicit ConnectionContext(shared_ptr<QTcpSocket> connection,
-                             shared_ptr<TTransport> transport,
-                             shared_ptr<TProtocol> iprot,
-                             shared_ptr<TProtocol> oprot)
-    : connection_(connection), transport_(transport), iprot_(iprot), oprot_(oprot) {}
-};
-
-TQTcpServer::TQTcpServer(shared_ptr<QTcpServer> server,
-                         shared_ptr<TAsyncProcessor> processor,
-                         shared_ptr<TProtocolFactory> pfact,
-                         QObject* parent)
-  : QObject(parent), server_(server), processor_(processor), pfact_(pfact) {
-  qRegisterMetaType<QTcpSocket*>("QTcpSocket*");
-  connect(server.get(), SIGNAL(newConnection()), SLOT(processIncoming()));
-}
-
-TQTcpServer::~TQTcpServer() {
-}
-
-void TQTcpServer::processIncoming() {
-  while (server_->hasPendingConnections()) {
-    // take ownership of the QTcpSocket; technically it could be deleted
-    // when the QTcpServer is destroyed, but any real app should delete this
-    // class before deleting the QTcpServer that we are using
-    shared_ptr<QTcpSocket> connection(server_->nextPendingConnection());
-
-    shared_ptr<TTransport> transport;
-    shared_ptr<TProtocol> iprot;
-    shared_ptr<TProtocol> oprot;
-
-    try {
-      transport = shared_ptr<TTransport>(new TQIODeviceTransport(connection));
-      iprot = shared_ptr<TProtocol>(pfact_->getProtocol(transport));
-      oprot = shared_ptr<TProtocol>(pfact_->getProtocol(transport));
-    } catch (...) {
-      qWarning("[TQTcpServer] Failed to initialize transports/protocols");
-      continue;
-    }
-
-    ctxMap_[connection.get()]
-        = shared_ptr<ConnectionContext>(new ConnectionContext(connection, transport, iprot, oprot));
-
-    connect(connection.get(), SIGNAL(readyRead()), SLOT(beginDecode()));
-
-    connect(connection.get(), SIGNAL(disconnected()), SLOT(socketClosed()));
-  }
-}
-
-void TQTcpServer::beginDecode() {
-  QTcpSocket* connection(qobject_cast<QTcpSocket*>(sender()));
-  Q_ASSERT(connection);
-
-  if (ctxMap_.find(connection) == ctxMap_.end()) {
-    qWarning("[TQTcpServer] Got data on an unknown QTcpSocket");
-    return;
-  }
-
-  shared_ptr<ConnectionContext> ctx = ctxMap_[connection];
-
-  try {
-    processor_
-        ->process(bind(&TQTcpServer::finish, this, ctx, apache::thrift::stdcxx::placeholders::_1),
-                  ctx->iprot_,
-                  ctx->oprot_);
-  } catch (const TTransportException& ex) {
-    qWarning("[TQTcpServer] TTransportException during processing: '%s'", ex.what());
-    scheduleDeleteConnectionContext(connection);
-  } catch (...) {
-    qWarning("[TQTcpServer] Unknown processor exception");
-    scheduleDeleteConnectionContext(connection);
-  }
-}
-
-void TQTcpServer::socketClosed() {
-  QTcpSocket* connection(qobject_cast<QTcpSocket*>(sender()));
-  Q_ASSERT(connection);
-  scheduleDeleteConnectionContext(connection);
-}
-
-void TQTcpServer::deleteConnectionContext(QTcpSocket* connection) {
-  const ConnectionContextMap::size_type deleted = ctxMap_.erase(connection);
-  if (0 == deleted) {
-      qWarning("[TQTcpServer] Unknown QTcpSocket");
-  }
-}
-
-void TQTcpServer::scheduleDeleteConnectionContext(QTcpSocket* connection) {
-  QMetaObject::invokeMethod(this, "deleteConnectionContext", Qt::QueuedConnection, Q_ARG(QTcpSocket*, connection));
-}
-
-void TQTcpServer::finish(shared_ptr<ConnectionContext> ctx, bool healthy) {
-  if (!healthy) {
-    qWarning("[TQTcpServer] Processor failed to process data successfully");
-    deleteConnectionContext(ctx->connection_.get());
-  }
-}
-}
-}
-} // apache::thrift::async
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQTcpServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQTcpServer.h
deleted file mode 100644
index 081d84a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/qt/TQTcpServer.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TASYNC_QTCP_SERVER_H_
-#define _THRIFT_TASYNC_QTCP_SERVER_H_
-
-#include <QObject>
-#include <QTcpServer>
-
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace protocol {
-class TProtocolFactory;
-}
-}
-} // apache::thrift::protocol
-
-namespace apache {
-namespace thrift {
-namespace async {
-
-class TAsyncProcessor;
-
-/**
- *  Server that uses Qt to listen for connections.
- *  Simply give it a QTcpServer that is listening, along with an async
- *  processor and a protocol factory, and then run the Qt event loop.
- */
-class TQTcpServer : public QObject {
-  Q_OBJECT
-public:
-  TQTcpServer(boost::shared_ptr<QTcpServer> server,
-              boost::shared_ptr<TAsyncProcessor> processor,
-              boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> protocolFactory,
-              QObject* parent = NULL);
-  virtual ~TQTcpServer();
-
-private Q_SLOTS:
-  void processIncoming();
-  void beginDecode();
-  void socketClosed();
-  void deleteConnectionContext(QTcpSocket* connection);
-
-private:
-  Q_DISABLE_COPY(TQTcpServer)
-
-  struct ConnectionContext;
-
-  void scheduleDeleteConnectionContext(QTcpSocket* connection);
-  void finish(boost::shared_ptr<ConnectionContext> ctx, bool healthy);
-
-  boost::shared_ptr<QTcpServer> server_;
-  boost::shared_ptr<TAsyncProcessor> processor_;
-  boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> pfact_;
-
-  typedef std::map<QTcpSocket*, boost::shared_ptr<ConnectionContext> > ConnectionContextMap;
-  ConnectionContextMap ctxMap_;
-};
-}
-}
-} // apache::thrift::async
-
-#endif // #ifndef _THRIFT_TASYNC_QTCP_SERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TConnectedClient.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TConnectedClient.cpp
deleted file mode 100644
index 889c885..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TConnectedClient.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/server/TConnectedClient.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-using apache::thrift::TProcessor;
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::server::TServerEventHandler;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using boost::shared_ptr;
-using std::string;
-
-TConnectedClient::TConnectedClient(const shared_ptr<TProcessor>& processor,
-                                   const shared_ptr<TProtocol>& inputProtocol,
-                                   const shared_ptr<TProtocol>& outputProtocol,
-                                   const shared_ptr<TServerEventHandler>& eventHandler,
-                                   const shared_ptr<TTransport>& client)
-
-  : processor_(processor),
-    inputProtocol_(inputProtocol),
-    outputProtocol_(outputProtocol),
-    eventHandler_(eventHandler),
-    client_(client),
-    opaqueContext_(0) {
-}
-
-TConnectedClient::~TConnectedClient() {
-}
-
-void TConnectedClient::run() {
-  if (eventHandler_) {
-    opaqueContext_ = eventHandler_->createContext(inputProtocol_, outputProtocol_);
-  }
-
-  for (bool done = false; !done;) {
-    if (eventHandler_) {
-      eventHandler_->processContext(opaqueContext_, client_);
-    }
-
-    try {
-      if (!processor_->process(inputProtocol_, outputProtocol_, opaqueContext_)) {
-        break;
-      }
-    } catch (const TTransportException& ttx) {
-      switch (ttx.getType()) {
-        case TTransportException::END_OF_FILE:
-        case TTransportException::INTERRUPTED:
-        case TTransportException::TIMED_OUT:
-          // Client disconnected or was interrupted or did not respond within the receive timeout.
-          // No logging needed.  Done.
-          done = true;
-          break;
-
-        default: {
-          // All other transport exceptions are logged.
-          // State of connection is unknown.  Done.
-          string errStr = string("TConnectedClient died: ") + ttx.what();
-          GlobalOutput(errStr.c_str());
-          done = true;
-          break;
-        }
-      }
-    } catch (const TException& tex) {
-      string errStr = string("TConnectedClient processing exception: ") + tex.what();
-      GlobalOutput(errStr.c_str());
-      // Disconnect from client, because we could not process the message.
-      done = true;
-    }
-  }
-
-  cleanup();
-}
-
-void TConnectedClient::cleanup() {
-  if (eventHandler_) {
-    eventHandler_->deleteContext(opaqueContext_, inputProtocol_, outputProtocol_);
-  }
-
-  try {
-    inputProtocol_->getTransport()->close();
-  } catch (const TTransportException& ttx) {
-    string errStr = string("TConnectedClient input close failed: ") + ttx.what();
-    GlobalOutput(errStr.c_str());
-  }
-
-  try {
-    outputProtocol_->getTransport()->close();
-  } catch (const TTransportException& ttx) {
-    string errStr = string("TConnectedClient output close failed: ") + ttx.what();
-    GlobalOutput(errStr.c_str());
-  }
-
-  try {
-    client_->close();
-  } catch (const TTransportException& ttx) {
-    string errStr = string("TConnectedClient client close failed: ") + ttx.what();
-    GlobalOutput(errStr.c_str());
-  }
-}
-}
-}
-} // apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TConnectedClient.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TConnectedClient.h
deleted file mode 100644
index 3ea065e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TConnectedClient.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TCONNECTEDCLIENT_H_
-#define _THRIFT_SERVER_TCONNECTEDCLIENT_H_ 1
-
-#include <boost/shared_ptr.hpp>
-#include <thrift/TProcessor.h>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/server/TServer.h>
-#include <thrift/transport/TTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-/**
- * This represents a client connected to a TServer.  The
- * processing loop for a client must provide some required
- * functionality common to all implementations so it is
- * encapsulated here.
- */
-
-class TConnectedClient : public apache::thrift::concurrency::Runnable {
-public:
-  /**
-   * Constructor.
-   *
-   * @param[in] processor      the TProcessor
-   * @param[in] inputProtocol  the input TProtocol
-   * @param[in] outputProtocol the output TProtocol
-   * @param[in] eventHandler   the server event handler
-   * @param[in] client         the TTransport representing the client
-   */
-  TConnectedClient(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocol>& inputProtocol,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocol>& outputProtocol,
-      const boost::shared_ptr<apache::thrift::server::TServerEventHandler>& eventHandler,
-      const boost::shared_ptr<apache::thrift::transport::TTransport>& client);
-
-  /**
-   * Destructor.
-   */
-  virtual ~TConnectedClient();
-
-  /**
-   * Drive the client until it is done.
-   * The client processing loop is:
-   *
-   * [optional] call eventHandler->createContext once
-   * [optional] call eventHandler->processContext per request
-   *            call processor->process per request
-   *              handle expected transport exceptions:
-   *                END_OF_FILE means the client is gone
-   *                INTERRUPTED means the client was interrupted
-   *                            by TServerTransport::interruptChildren()
-   *              handle unexpected transport exceptions by logging
-   *              handle standard exceptions by logging
-   *              handle unexpected exceptions by logging
-   *            cleanup()
-   */
-  virtual void run() /* override */;
-
-protected:
-  /**
-   * Cleanup after a client.  This happens if the client disconnects,
-   * or if the server is stopped, or if an exception occurs.
-   *
-   * The cleanup processing is:
-   * [optional] call eventHandler->deleteContext once
-   *            close the inputProtocol's TTransport
-   *            close the outputProtocol's TTransport
-   *            close the client
-   */
-  virtual void cleanup();
-
-private:
-  boost::shared_ptr<apache::thrift::TProcessor> processor_;
-  boost::shared_ptr<apache::thrift::protocol::TProtocol> inputProtocol_;
-  boost::shared_ptr<apache::thrift::protocol::TProtocol> outputProtocol_;
-  boost::shared_ptr<apache::thrift::server::TServerEventHandler> eventHandler_;
-  boost::shared_ptr<apache::thrift::transport::TTransport> client_;
-
-  /**
-   * Context acquired from the eventHandler_ if one exists.
-   */
-  void* opaqueContext_;
-};
-}
-}
-}
-
-#endif // #ifndef _THRIFT_SERVER_TCONNECTEDCLIENT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TNonblockingServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TNonblockingServer.cpp
deleted file mode 100644
index ccc37a2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TNonblockingServer.cpp
+++ /dev/null
@@ -1,1625 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define __STDC_FORMAT_MACROS
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/server/TNonblockingServer.h>
-#include <thrift/concurrency/Exception.h>
-#include <thrift/transport/TSocket.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/transport/PlatformSocket.h>
-
-#include <iostream>
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#include <assert.h>
-
-#ifdef HAVE_SCHED_H
-#include <sched.h>
-#endif
-
-#ifndef AF_LOCAL
-#define AF_LOCAL AF_UNIX
-#endif
-
-#if !defined(PRIu32)
-#define PRIu32 "I32u"
-#define PRIu64 "I64u"
-#endif
-
-#if defined(_WIN32) && (_WIN32_WINNT < 0x0600)
-  #define AI_ADDRCONFIG 0x0400
-#endif
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::concurrency;
-using namespace std;
-using apache::thrift::transport::TSocket;
-using apache::thrift::transport::TTransportException;
-using boost::shared_ptr;
-
-/// Three states for sockets: recv frame size, recv data, and send mode
-enum TSocketState { SOCKET_RECV_FRAMING, SOCKET_RECV, SOCKET_SEND };
-
-/**
- * Five states for the nonblocking server:
- *  1) initialize
- *  2) read 4 byte frame size
- *  3) read frame of data
- *  4) send back data (if any)
- *  5) force immediate connection close
- */
-enum TAppState {
-  APP_INIT,
-  APP_READ_FRAME_SIZE,
-  APP_READ_REQUEST,
-  APP_WAIT_TASK,
-  APP_SEND_RESULT,
-  APP_CLOSE_CONNECTION
-};
-
-/**
- * Represents a connection that is handled via libevent. This connection
- * essentially encapsulates a socket that has some associated libevent state.
- */
-class TNonblockingServer::TConnection {
-private:
-  /// Server IO Thread handling this connection
-  TNonblockingIOThread* ioThread_;
-
-  /// Server handle
-  TNonblockingServer* server_;
-
-  /// TProcessor
-  boost::shared_ptr<TProcessor> processor_;
-
-  /// Object wrapping network socket
-  boost::shared_ptr<TSocket> tSocket_;
-
-  /// Libevent object
-  struct event event_;
-
-  /// Libevent flags
-  short eventFlags_;
-
-  /// Socket mode
-  TSocketState socketState_;
-
-  /// Application state
-  TAppState appState_;
-
-  /// How much data needed to read
-  uint32_t readWant_;
-
-  /// Where in the read buffer are we
-  uint32_t readBufferPos_;
-
-  /// Read buffer
-  uint8_t* readBuffer_;
-
-  /// Read buffer size
-  uint32_t readBufferSize_;
-
-  /// Write buffer
-  uint8_t* writeBuffer_;
-
-  /// Write buffer size
-  uint32_t writeBufferSize_;
-
-  /// How far through writing are we?
-  uint32_t writeBufferPos_;
-
-  /// Largest size of write buffer seen since buffer was constructed
-  size_t largestWriteBufferSize_;
-
-  /// Count of the number of calls for use with getResizeBufferEveryN().
-  int32_t callsForResize_;
-
-  /// Transport to read from
-  boost::shared_ptr<TMemoryBuffer> inputTransport_;
-
-  /// Transport that processor writes to
-  boost::shared_ptr<TMemoryBuffer> outputTransport_;
-
-  /// extra transport generated by transport factory (e.g. BufferedRouterTransport)
-  boost::shared_ptr<TTransport> factoryInputTransport_;
-  boost::shared_ptr<TTransport> factoryOutputTransport_;
-
-  /// Protocol decoder
-  boost::shared_ptr<TProtocol> inputProtocol_;
-
-  /// Protocol encoder
-  boost::shared_ptr<TProtocol> outputProtocol_;
-
-  /// Server event handler, if any
-  boost::shared_ptr<TServerEventHandler> serverEventHandler_;
-
-  /// Thrift call context, if any
-  void* connectionContext_;
-
-  /// Go into read mode
-  void setRead() { setFlags(EV_READ | EV_PERSIST); }
-
-  /// Go into write mode
-  void setWrite() { setFlags(EV_WRITE | EV_PERSIST); }
-
-  /// Set socket idle
-  void setIdle() { setFlags(0); }
-
-  /**
-   * Set event flags for this connection.
-   *
-   * @param eventFlags flags we pass to libevent for the connection.
-   */
-  void setFlags(short eventFlags);
-
-  /**
-   * Libevent handler called (via our static wrapper) when the connection
-   * socket had something happen.  Rather than use the flags libevent passed,
-   * we use the connection state to determine whether we need to read or
-   * write the socket.
-   */
-  void workSocket();
-
-public:
-  class Task;
-
-  /// Constructor
-  TConnection(THRIFT_SOCKET socket,
-              TNonblockingIOThread* ioThread,
-              const sockaddr* addr,
-              socklen_t addrLen) {
-    readBuffer_ = NULL;
-    readBufferSize_ = 0;
-
-    ioThread_ = ioThread;
-    server_ = ioThread->getServer();
-
-    // Allocate input and output transports these only need to be allocated
-    // once per TConnection (they don't need to be reallocated on init() call)
-    inputTransport_.reset(new TMemoryBuffer(readBuffer_, readBufferSize_));
-    outputTransport_.reset(
-        new TMemoryBuffer(static_cast<uint32_t>(server_->getWriteBufferDefaultSize())));
-    tSocket_.reset(new TSocket());
-    init(socket, ioThread, addr, addrLen);
-  }
-
-  ~TConnection() { std::free(readBuffer_); }
-
-  /// Close this connection and free or reset its resources.
-  void close();
-
-  /**
-    * Check buffers against any size limits and shrink it if exceeded.
-    *
-    * @param readLimit we reduce read buffer size to this (if nonzero).
-    * @param writeLimit if nonzero and write buffer is larger, replace it.
-    */
-  void checkIdleBufferMemLimit(size_t readLimit, size_t writeLimit);
-
-  /// Initialize
-  void init(THRIFT_SOCKET socket,
-            TNonblockingIOThread* ioThread,
-            const sockaddr* addr,
-            socklen_t addrLen);
-
-  /**
-   * This is called when the application transitions from one state into
-   * another. This means that it has finished writing the data that it needed
-   * to, or finished receiving the data that it needed to.
-   */
-  void transition();
-
-  /**
-   * C-callable event handler for connection events.  Provides a callback
-   * that libevent can understand which invokes connection_->workSocket().
-   *
-   * @param fd the descriptor the event occurred on.
-   * @param which the flags associated with the event.
-   * @param v void* callback arg where we placed TConnection's "this".
-   */
-  static void eventHandler(evutil_socket_t fd, short /* which */, void* v) {
-    assert(fd == static_cast<evutil_socket_t>(((TConnection*)v)->getTSocket()->getSocketFD()));
-    ((TConnection*)v)->workSocket();
-  }
-
-  /**
-   * Notification to server that processing has ended on this request.
-   * Can be called either when processing is completed or when a waiting
-   * task has been preemptively terminated (on overload).
-   *
-   * Don't call this from the IO thread itself.
-   *
-   * @return true if successful, false if unable to notify (check THRIFT_GET_SOCKET_ERROR).
-   */
-  bool notifyIOThread() { return ioThread_->notify(this); }
-
-  /*
-   * Returns the number of this connection's currently assigned IO
-   * thread.
-   */
-  int getIOThreadNumber() const { return ioThread_->getThreadNumber(); }
-
-  /// Force connection shutdown for this connection.
-  void forceClose() {
-    appState_ = APP_CLOSE_CONNECTION;
-    if (!notifyIOThread()) {
-      close();
-      throw TException("TConnection::forceClose: failed write on notify pipe");
-    }
-  }
-
-  /// return the server this connection was initialized for.
-  TNonblockingServer* getServer() const { return server_; }
-
-  /// get state of connection.
-  TAppState getState() const { return appState_; }
-
-  /// return the TSocket transport wrapping this network connection
-  boost::shared_ptr<TSocket> getTSocket() const { return tSocket_; }
-
-  /// return the server event handler if any
-  boost::shared_ptr<TServerEventHandler> getServerEventHandler() { return serverEventHandler_; }
-
-  /// return the Thrift connection context if any
-  void* getConnectionContext() { return connectionContext_; }
-};
-
-class TNonblockingServer::TConnection::Task : public Runnable {
-public:
-  Task(boost::shared_ptr<TProcessor> processor,
-       boost::shared_ptr<TProtocol> input,
-       boost::shared_ptr<TProtocol> output,
-       TConnection* connection)
-    : processor_(processor),
-      input_(input),
-      output_(output),
-      connection_(connection),
-      serverEventHandler_(connection_->getServerEventHandler()),
-      connectionContext_(connection_->getConnectionContext()) {}
-
-  void run() {
-    try {
-      for (;;) {
-        if (serverEventHandler_) {
-          serverEventHandler_->processContext(connectionContext_, connection_->getTSocket());
-        }
-        if (!processor_->process(input_, output_, connectionContext_)
-            || !input_->getTransport()->peek()) {
-          break;
-        }
-      }
-    } catch (const TTransportException& ttx) {
-      GlobalOutput.printf("TNonblockingServer: client died: %s", ttx.what());
-    } catch (const bad_alloc&) {
-      GlobalOutput("TNonblockingServer: caught bad_alloc exception.");
-      exit(1);
-    } catch (const std::exception& x) {
-      GlobalOutput.printf("TNonblockingServer: process() exception: %s: %s",
-                          typeid(x).name(),
-                          x.what());
-    } catch (...) {
-      GlobalOutput.printf("TNonblockingServer: unknown exception while processing.");
-    }
-
-    // Signal completion back to the libevent thread via a pipe
-    if (!connection_->notifyIOThread()) {
-      GlobalOutput.printf("TNonblockingServer: failed to notifyIOThread, closing.");
-      connection_->close();
-      throw TException("TNonblockingServer::Task::run: failed write on notify pipe");
-    }
-  }
-
-  TConnection* getTConnection() { return connection_; }
-
-private:
-  boost::shared_ptr<TProcessor> processor_;
-  boost::shared_ptr<TProtocol> input_;
-  boost::shared_ptr<TProtocol> output_;
-  TConnection* connection_;
-  boost::shared_ptr<TServerEventHandler> serverEventHandler_;
-  void* connectionContext_;
-};
-
-void TNonblockingServer::TConnection::init(THRIFT_SOCKET socket,
-                                           TNonblockingIOThread* ioThread,
-                                           const sockaddr* addr,
-                                           socklen_t addrLen) {
-  tSocket_->setSocketFD(socket);
-  tSocket_->setCachedAddress(addr, addrLen);
-
-  ioThread_ = ioThread;
-  server_ = ioThread->getServer();
-  appState_ = APP_INIT;
-  eventFlags_ = 0;
-
-  readBufferPos_ = 0;
-  readWant_ = 0;
-
-  writeBuffer_ = NULL;
-  writeBufferSize_ = 0;
-  writeBufferPos_ = 0;
-  largestWriteBufferSize_ = 0;
-
-  socketState_ = SOCKET_RECV_FRAMING;
-  callsForResize_ = 0;
-
-  // get input/transports
-  factoryInputTransport_ = server_->getInputTransportFactory()->getTransport(inputTransport_);
-  factoryOutputTransport_ = server_->getOutputTransportFactory()->getTransport(outputTransport_);
-
-  // Create protocol
-  if (server_->getHeaderTransport()) {
-    inputProtocol_ = server_->getInputProtocolFactory()->getProtocol(factoryInputTransport_,
-                                                                     factoryOutputTransport_);
-    outputProtocol_ = inputProtocol_;
-  } else {
-    inputProtocol_ = server_->getInputProtocolFactory()->getProtocol(factoryInputTransport_);
-    outputProtocol_ = server_->getOutputProtocolFactory()->getProtocol(factoryOutputTransport_);
-  }
-
-  // Set up for any server event handler
-  serverEventHandler_ = server_->getEventHandler();
-  if (serverEventHandler_) {
-    connectionContext_ = serverEventHandler_->createContext(inputProtocol_, outputProtocol_);
-  } else {
-    connectionContext_ = NULL;
-  }
-
-  // Get the processor
-  processor_ = server_->getProcessor(inputProtocol_, outputProtocol_, tSocket_);
-}
-
-void TNonblockingServer::TConnection::workSocket() {
-  int got = 0, left = 0, sent = 0;
-  uint32_t fetch = 0;
-
-  switch (socketState_) {
-  case SOCKET_RECV_FRAMING:
-    union {
-      uint8_t buf[sizeof(uint32_t)];
-      uint32_t size;
-    } framing;
-
-    // if we've already received some bytes we kept them here
-    framing.size = readWant_;
-    // determine size of this frame
-    try {
-      // Read from the socket
-      fetch = tSocket_->read(&framing.buf[readBufferPos_],
-                             uint32_t(sizeof(framing.size) - readBufferPos_));
-      if (fetch == 0) {
-        // Whenever we get here it means a remote disconnect
-        close();
-        return;
-      }
-      readBufferPos_ += fetch;
-    } catch (TTransportException& te) {
-      GlobalOutput.printf("TConnection::workSocket(): %s", te.what());
-      close();
-
-      return;
-    }
-
-    if (readBufferPos_ < sizeof(framing.size)) {
-      // more needed before frame size is known -- save what we have so far
-      readWant_ = framing.size;
-      return;
-    }
-
-    readWant_ = ntohl(framing.size);
-    if (readWant_ > server_->getMaxFrameSize()) {
-      // Don't allow giant frame sizes.  This prevents bad clients from
-      // causing us to try and allocate a giant buffer.
-      GlobalOutput.printf(
-          "TNonblockingServer: frame size too large "
-          "(%" PRIu32 " > %" PRIu64
-          ") from client %s. "
-          "Remote side not using TFramedTransport?",
-          readWant_,
-          (uint64_t)server_->getMaxFrameSize(),
-          tSocket_->getSocketInfo().c_str());
-      close();
-      return;
-    }
-    // size known; now get the rest of the frame
-    transition();
-    return;
-
-  case SOCKET_RECV:
-    // It is an error to be in this state if we already have all the data
-    assert(readBufferPos_ < readWant_);
-
-    try {
-      // Read from the socket
-      fetch = readWant_ - readBufferPos_;
-      got = tSocket_->read(readBuffer_ + readBufferPos_, fetch);
-    } catch (TTransportException& te) {
-      GlobalOutput.printf("TConnection::workSocket(): %s", te.what());
-      close();
-
-      return;
-    }
-
-    if (got > 0) {
-      // Move along in the buffer
-      readBufferPos_ += got;
-
-      // Check that we did not overdo it
-      assert(readBufferPos_ <= readWant_);
-
-      // We are done reading, move onto the next state
-      if (readBufferPos_ == readWant_) {
-        transition();
-      }
-      return;
-    }
-
-    // Whenever we get down here it means a remote disconnect
-    close();
-
-    return;
-
-  case SOCKET_SEND:
-    // Should never have position past size
-    assert(writeBufferPos_ <= writeBufferSize_);
-
-    // If there is no data to send, then let us move on
-    if (writeBufferPos_ == writeBufferSize_) {
-      GlobalOutput("WARNING: Send state with no data to send\n");
-      transition();
-      return;
-    }
-
-    try {
-      left = writeBufferSize_ - writeBufferPos_;
-      sent = tSocket_->write_partial(writeBuffer_ + writeBufferPos_, left);
-    } catch (TTransportException& te) {
-      GlobalOutput.printf("TConnection::workSocket(): %s ", te.what());
-      close();
-      return;
-    }
-
-    writeBufferPos_ += sent;
-
-    // Did we overdo it?
-    assert(writeBufferPos_ <= writeBufferSize_);
-
-    // We are done!
-    if (writeBufferPos_ == writeBufferSize_) {
-      transition();
-    }
-
-    return;
-
-  default:
-    GlobalOutput.printf("Unexpected Socket State %d", socketState_);
-    assert(0);
-  }
-}
-
-bool TNonblockingServer::getHeaderTransport() {
-  // Currently if there is no output protocol factory,
-  // we assume header transport (without having to create
-  // a new transport and check)
-  return getOutputProtocolFactory() == NULL;
-}
-
-/**
- * This is called when the application transitions from one state into
- * another. This means that it has finished writing the data that it needed
- * to, or finished receiving the data that it needed to.
- */
-void TNonblockingServer::TConnection::transition() {
-  // ensure this connection is active right now
-  assert(ioThread_);
-  assert(server_);
-
-  // Switch upon the state that we are currently in and move to a new state
-  switch (appState_) {
-
-  case APP_READ_REQUEST:
-    // We are done reading the request, package the read buffer into transport
-    // and get back some data from the dispatch function
-    if (server_->getHeaderTransport()) {
-      inputTransport_->resetBuffer(readBuffer_, readBufferPos_);
-      outputTransport_->resetBuffer();
-    } else {
-      // We saved room for the framing size in case header transport needed it,
-      // but just skip it for the non-header case
-      inputTransport_->resetBuffer(readBuffer_ + 4, readBufferPos_ - 4);
-      outputTransport_->resetBuffer();
-
-      // Prepend four bytes of blank space to the buffer so we can
-      // write the frame size there later.
-      outputTransport_->getWritePtr(4);
-      outputTransport_->wroteBytes(4);
-    }
-
-    server_->incrementActiveProcessors();
-
-    if (server_->isThreadPoolProcessing()) {
-      // We are setting up a Task to do this work and we will wait on it
-
-      // Create task and dispatch to the thread manager
-      boost::shared_ptr<Runnable> task = boost::shared_ptr<Runnable>(
-          new Task(processor_, inputProtocol_, outputProtocol_, this));
-      // The application is now waiting on the task to finish
-      appState_ = APP_WAIT_TASK;
-
-      try {
-        server_->addTask(task);
-      } catch (IllegalStateException& ise) {
-        // The ThreadManager is not ready to handle any more tasks (it's probably shutting down).
-        GlobalOutput.printf("IllegalStateException: Server::process() %s", ise.what());
-        close();
-      } catch (TimedOutException& to) {
-        GlobalOutput.printf("[ERROR] TimedOutException: Server::process() %s", to.what());
-        close();
-      }
-
-      // Set this connection idle so that libevent doesn't process more
-      // data on it while we're still waiting for the threadmanager to
-      // finish this task
-      setIdle();
-      return;
-    } else {
-      try {
-        if (serverEventHandler_) {
-          serverEventHandler_->processContext(connectionContext_, getTSocket());
-        }
-        // Invoke the processor
-        processor_->process(inputProtocol_, outputProtocol_, connectionContext_);
-      } catch (const TTransportException& ttx) {
-        GlobalOutput.printf(
-            "TNonblockingServer transport error in "
-            "process(): %s",
-            ttx.what());
-        server_->decrementActiveProcessors();
-        close();
-        return;
-      } catch (const std::exception& x) {
-        GlobalOutput.printf("Server::process() uncaught exception: %s: %s",
-                            typeid(x).name(),
-                            x.what());
-        server_->decrementActiveProcessors();
-        close();
-        return;
-      } catch (...) {
-        GlobalOutput.printf("Server::process() unknown exception");
-        server_->decrementActiveProcessors();
-        close();
-        return;
-      }
-    }
-
-  // Intentionally fall through here, the call to process has written into
-  // the writeBuffer_
-
-  case APP_WAIT_TASK:
-    // We have now finished processing a task and the result has been written
-    // into the outputTransport_, so we grab its contents and place them into
-    // the writeBuffer_ for actual writing by the libevent thread
-
-    server_->decrementActiveProcessors();
-    // Get the result of the operation
-    outputTransport_->getBuffer(&writeBuffer_, &writeBufferSize_);
-
-    // If the function call generated return data, then move into the send
-    // state and get going
-    // 4 bytes were reserved for frame size
-    if (writeBufferSize_ > 4) {
-
-      // Move into write state
-      writeBufferPos_ = 0;
-      socketState_ = SOCKET_SEND;
-
-      // Put the frame size into the write buffer
-      int32_t frameSize = (int32_t)htonl(writeBufferSize_ - 4);
-      memcpy(writeBuffer_, &frameSize, 4);
-
-      // Socket into write mode
-      appState_ = APP_SEND_RESULT;
-      setWrite();
-
-      // Try to work the socket immediately
-      // workSocket();
-
-      return;
-    }
-
-    // In this case, the request was oneway and we should fall through
-    // right back into the read frame header state
-    goto LABEL_APP_INIT;
-
-  case APP_SEND_RESULT:
-    // it's now safe to perform buffer size housekeeping.
-    if (writeBufferSize_ > largestWriteBufferSize_) {
-      largestWriteBufferSize_ = writeBufferSize_;
-    }
-    if (server_->getResizeBufferEveryN() > 0
-        && ++callsForResize_ >= server_->getResizeBufferEveryN()) {
-      checkIdleBufferMemLimit(server_->getIdleReadBufferLimit(),
-                              server_->getIdleWriteBufferLimit());
-      callsForResize_ = 0;
-    }
-
-  // N.B.: We also intentionally fall through here into the INIT state!
-
-  LABEL_APP_INIT:
-  case APP_INIT:
-
-    // Clear write buffer variables
-    writeBuffer_ = NULL;
-    writeBufferPos_ = 0;
-    writeBufferSize_ = 0;
-
-    // Into read4 state we go
-    socketState_ = SOCKET_RECV_FRAMING;
-    appState_ = APP_READ_FRAME_SIZE;
-
-    readBufferPos_ = 0;
-
-    // Register read event
-    setRead();
-
-    // Try to work the socket right away
-    // workSocket();
-
-    return;
-
-  case APP_READ_FRAME_SIZE:
-    readWant_ += 4;
-
-    // We just read the request length
-    // Double the buffer size until it is big enough
-    if (readWant_ > readBufferSize_) {
-      if (readBufferSize_ == 0) {
-        readBufferSize_ = 1;
-      }
-      uint32_t newSize = readBufferSize_;
-      while (readWant_ > newSize) {
-        newSize *= 2;
-      }
-
-      uint8_t* newBuffer = (uint8_t*)std::realloc(readBuffer_, newSize);
-      if (newBuffer == NULL) {
-        // nothing else to be done...
-        throw std::bad_alloc();
-      }
-      readBuffer_ = newBuffer;
-      readBufferSize_ = newSize;
-    }
-
-    readBufferPos_ = 4;
-    *((uint32_t*)readBuffer_) = htonl(readWant_ - 4);
-
-    // Move into read request state
-    socketState_ = SOCKET_RECV;
-    appState_ = APP_READ_REQUEST;
-
-    // Work the socket right away
-    // workSocket();
-
-    return;
-
-  case APP_CLOSE_CONNECTION:
-    server_->decrementActiveProcessors();
-    close();
-    return;
-
-  default:
-    GlobalOutput.printf("Unexpected Application State %d", appState_);
-    assert(0);
-  }
-}
-
-void TNonblockingServer::TConnection::setFlags(short eventFlags) {
-  // Catch the do nothing case
-  if (eventFlags_ == eventFlags) {
-    return;
-  }
-
-  // Delete a previously existing event
-  if (eventFlags_ != 0) {
-    if (event_del(&event_) == -1) {
-      GlobalOutput("TConnection::setFlags event_del");
-      return;
-    }
-  }
-
-  // Update in memory structure
-  eventFlags_ = eventFlags;
-
-  // Do not call event_set if there are no flags
-  if (!eventFlags_) {
-    return;
-  }
-
-  /*
-   * event_set:
-   *
-   * Prepares the event structure &event to be used in future calls to
-   * event_add() and event_del().  The event will be prepared to call the
-   * eventHandler using the 'sock' file descriptor to monitor events.
-   *
-   * The events can be either EV_READ, EV_WRITE, or both, indicating
-   * that an application can read or write from the file respectively without
-   * blocking.
-   *
-   * The eventHandler will be called with the file descriptor that triggered
-   * the event and the type of event which will be one of: EV_TIMEOUT,
-   * EV_SIGNAL, EV_READ, EV_WRITE.
-   *
-   * The additional flag EV_PERSIST makes an event_add() persistent until
-   * event_del() has been called.
-   *
-   * Once initialized, the &event struct can be used repeatedly with
-   * event_add() and event_del() and does not need to be reinitialized unless
-   * the eventHandler and/or the argument to it are to be changed.  However,
-   * when an ev structure has been added to libevent using event_add() the
-   * structure must persist until the event occurs (assuming EV_PERSIST
-   * is not set) or is removed using event_del().  You may not reuse the same
-   * ev structure for multiple monitored descriptors; each descriptor needs
-   * its own ev.
-   */
-  event_set(&event_, tSocket_->getSocketFD(), eventFlags_, TConnection::eventHandler, this);
-  event_base_set(ioThread_->getEventBase(), &event_);
-
-  // Add the event
-  if (event_add(&event_, 0) == -1) {
-    GlobalOutput("TConnection::setFlags(): could not event_add");
-  }
-}
-
-/**
- * Closes a connection
- */
-void TNonblockingServer::TConnection::close() {
-  // Delete the registered libevent
-  if (event_del(&event_) == -1) {
-    GlobalOutput.perror("TConnection::close() event_del", THRIFT_GET_SOCKET_ERROR);
-  }
-
-  if (serverEventHandler_) {
-    serverEventHandler_->deleteContext(connectionContext_, inputProtocol_, outputProtocol_);
-  }
-  ioThread_ = NULL;
-
-  // Close the socket
-  tSocket_->close();
-
-  // close any factory produced transports
-  factoryInputTransport_->close();
-  factoryOutputTransport_->close();
-
-  // release processor and handler
-  processor_.reset();
-
-  // Give this object back to the server that owns it
-  server_->returnConnection(this);
-}
-
-void TNonblockingServer::TConnection::checkIdleBufferMemLimit(size_t readLimit, size_t writeLimit) {
-  if (readLimit > 0 && readBufferSize_ > readLimit) {
-    free(readBuffer_);
-    readBuffer_ = NULL;
-    readBufferSize_ = 0;
-  }
-
-  if (writeLimit > 0 && largestWriteBufferSize_ > writeLimit) {
-    // just start over
-    outputTransport_->resetBuffer(static_cast<uint32_t>(server_->getWriteBufferDefaultSize()));
-    largestWriteBufferSize_ = 0;
-  }
-}
-
-TNonblockingServer::~TNonblockingServer() {
-  // Close any active connections (moves them to the idle connection stack)
-  while (activeConnections_.size()) {
-    activeConnections_.front()->close();
-  }
-  // Clean up unused TConnection objects in connectionStack_
-  while (!connectionStack_.empty()) {
-    TConnection* connection = connectionStack_.top();
-    connectionStack_.pop();
-    delete connection;
-  }
-  // The TNonblockingIOThread objects have shared_ptrs to the Thread
-  // objects and the Thread objects have shared_ptrs to the TNonblockingIOThread
-  // objects (as runnable) so these objects will never deallocate without help.
-  while (!ioThreads_.empty()) {
-    boost::shared_ptr<TNonblockingIOThread> iot = ioThreads_.back();
-    ioThreads_.pop_back();
-    iot->setThread(boost::shared_ptr<Thread>());
-  }
-}
-
-/**
- * Creates a new connection either by reusing an object off the stack or
- * by allocating a new one entirely
- */
-TNonblockingServer::TConnection* TNonblockingServer::createConnection(THRIFT_SOCKET socket,
-                                                                      const sockaddr* addr,
-                                                                      socklen_t addrLen) {
-  // Check the stack
-  Guard g(connMutex_);
-
-  // pick an IO thread to handle this connection -- currently round robin
-  assert(nextIOThread_ < ioThreads_.size());
-  int selectedThreadIdx = nextIOThread_;
-  nextIOThread_ = static_cast<uint32_t>((nextIOThread_ + 1) % ioThreads_.size());
-
-  TNonblockingIOThread* ioThread = ioThreads_[selectedThreadIdx].get();
-
-  // Check the connection stack to see if we can re-use
-  TConnection* result = NULL;
-  if (connectionStack_.empty()) {
-    result = new TConnection(socket, ioThread, addr, addrLen);
-    ++numTConnections_;
-  } else {
-    result = connectionStack_.top();
-    connectionStack_.pop();
-    result->init(socket, ioThread, addr, addrLen);
-  }
-  activeConnections_.push_back(result);
-  return result;
-}
-
-/**
- * Returns a connection to the stack
- */
-void TNonblockingServer::returnConnection(TConnection* connection) {
-  Guard g(connMutex_);
-
-  activeConnections_.erase(std::remove(activeConnections_.begin(),
-                                       activeConnections_.end(),
-                                       connection),
-                           activeConnections_.end());
-
-  if (connectionStackLimit_ && (connectionStack_.size() >= connectionStackLimit_)) {
-    delete connection;
-    --numTConnections_;
-  } else {
-    connection->checkIdleBufferMemLimit(idleReadBufferLimit_, idleWriteBufferLimit_);
-    connectionStack_.push(connection);
-  }
-}
-
-/**
- * Server socket had something happen.  We accept all waiting client
- * connections on fd and assign TConnection objects to handle those requests.
- */
-void TNonblockingServer::handleEvent(THRIFT_SOCKET fd, short which) {
-  (void)which;
-  // Make sure that libevent didn't mess up the socket handles
-  assert(fd == serverSocket_);
-
-  // Server socket accepted a new connection
-  socklen_t addrLen;
-  sockaddr_storage addrStorage;
-  sockaddr* addrp = (sockaddr*)&addrStorage;
-  addrLen = sizeof(addrStorage);
-
-  // Going to accept a new client socket
-  THRIFT_SOCKET clientSocket;
-
-  // Accept as many new clients as possible, even though libevent signaled only
-  // one, this helps us to avoid having to go back into the libevent engine so
-  // many times
-  while ((clientSocket = ::accept(fd, addrp, &addrLen)) != -1) {
-    // If we're overloaded, take action here
-    if (overloadAction_ != T_OVERLOAD_NO_ACTION && serverOverloaded()) {
-      Guard g(connMutex_);
-      nConnectionsDropped_++;
-      nTotalConnectionsDropped_++;
-      if (overloadAction_ == T_OVERLOAD_CLOSE_ON_ACCEPT) {
-        ::THRIFT_CLOSESOCKET(clientSocket);
-        return;
-      } else if (overloadAction_ == T_OVERLOAD_DRAIN_TASK_QUEUE) {
-        if (!drainPendingTask()) {
-          // Nothing left to discard, so we drop connection instead.
-          ::THRIFT_CLOSESOCKET(clientSocket);
-          return;
-        }
-      }
-    }
-
-    // Explicitly set this socket to NONBLOCK mode
-    int flags;
-    if ((flags = THRIFT_FCNTL(clientSocket, THRIFT_F_GETFL, 0)) < 0
-        || THRIFT_FCNTL(clientSocket, THRIFT_F_SETFL, flags | THRIFT_O_NONBLOCK) < 0) {
-      GlobalOutput.perror("thriftServerEventHandler: set THRIFT_O_NONBLOCK (THRIFT_FCNTL) ",
-                          THRIFT_GET_SOCKET_ERROR);
-      ::THRIFT_CLOSESOCKET(clientSocket);
-      return;
-    }
-
-    // Create a new TConnection for this client socket.
-    TConnection* clientConnection = createConnection(clientSocket, addrp, addrLen);
-
-    // Fail fast if we could not create a TConnection object
-    if (clientConnection == NULL) {
-      GlobalOutput.printf("thriftServerEventHandler: failed TConnection factory");
-      ::THRIFT_CLOSESOCKET(clientSocket);
-      return;
-    }
-
-    /*
-     * Either notify the ioThread that is assigned this connection to
-     * start processing, or if it is us, we'll just ask this
-     * connection to do its initial state change here.
-     *
-     * (We need to avoid writing to our own notification pipe, to
-     * avoid possible deadlocks if the pipe is full.)
-     *
-     * The IO thread #0 is the only one that handles these listen
-     * events, so unless the connection has been assigned to thread #0
-     * we know it's not on our thread.
-     */
-    if (clientConnection->getIOThreadNumber() == 0) {
-      clientConnection->transition();
-    } else {
-      if (!clientConnection->notifyIOThread()) {
-        GlobalOutput.perror("[ERROR] notifyIOThread failed on fresh connection, closing", errno);
-        returnConnection(clientConnection);
-      }
-    }
-
-    // addrLen is written by the accept() call, so needs to be set before the next call.
-    addrLen = sizeof(addrStorage);
-  }
-
-  // Done looping accept, now we have to make sure the error is due to
-  // blocking. Any other error is a problem
-  if (THRIFT_GET_SOCKET_ERROR != THRIFT_EAGAIN && THRIFT_GET_SOCKET_ERROR != THRIFT_EWOULDBLOCK) {
-    GlobalOutput.perror("thriftServerEventHandler: accept() ", THRIFT_GET_SOCKET_ERROR);
-  }
-}
-
-/**
- * Creates a socket to listen on and binds it to the local port.
- */
-void TNonblockingServer::createAndListenOnSocket() {
-#ifdef _WIN32
-  TWinsockSingleton::create();
-#endif // _WIN32
-
-  THRIFT_SOCKET s;
-
-  struct addrinfo hints, *res, *res0;
-  int error;
-
-  char port[sizeof("65536") + 1];
-  memset(&hints, 0, sizeof(hints));
-  hints.ai_family = PF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
-  sprintf(port, "%d", port_);
-
-  // Wildcard address
-  error = getaddrinfo(NULL, port, &hints, &res0);
-  if (error) {
-    throw TException("TNonblockingServer::serve() getaddrinfo "
-                     + string(THRIFT_GAI_STRERROR(error)));
-  }
-
-  // Pick the ipv6 address first since ipv4 addresses can be mapped
-  // into ipv6 space.
-  for (res = res0; res; res = res->ai_next) {
-    if (res->ai_family == AF_INET6 || res->ai_next == NULL)
-      break;
-  }
-
-  // Create the server socket
-  s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-  if (s == -1) {
-    freeaddrinfo(res0);
-    throw TException("TNonblockingServer::serve() socket() -1");
-  }
-
-#ifdef IPV6_V6ONLY
-  if (res->ai_family == AF_INET6) {
-    int zero = 0;
-    if (-1 == setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, const_cast_sockopt(&zero), sizeof(zero))) {
-      GlobalOutput("TServerSocket::listen() IPV6_V6ONLY");
-    }
-  }
-#endif // #ifdef IPV6_V6ONLY
-
-  int one = 1;
-
-  // Set THRIFT_NO_SOCKET_CACHING to avoid 2MSL delay on server restart
-  setsockopt(s, SOL_SOCKET, THRIFT_NO_SOCKET_CACHING, const_cast_sockopt(&one), sizeof(one));
-
-  if (::bind(s, res->ai_addr, static_cast<int>(res->ai_addrlen)) == -1) {
-    ::THRIFT_CLOSESOCKET(s);
-    freeaddrinfo(res0);
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "TNonblockingServer::serve() bind",
-                              THRIFT_GET_SOCKET_ERROR);
-  }
-
-  // Done with the addr info
-  freeaddrinfo(res0);
-
-  // Set up this file descriptor for listening
-  listenSocket(s);
-}
-
-/**
- * Takes a socket created by listenSocket() and sets various options on it
- * to prepare for use in the server.
- */
-void TNonblockingServer::listenSocket(THRIFT_SOCKET s) {
-  // Set socket to nonblocking mode
-  int flags;
-  if ((flags = THRIFT_FCNTL(s, THRIFT_F_GETFL, 0)) < 0
-      || THRIFT_FCNTL(s, THRIFT_F_SETFL, flags | THRIFT_O_NONBLOCK) < 0) {
-    ::THRIFT_CLOSESOCKET(s);
-    throw TException("TNonblockingServer::serve() THRIFT_O_NONBLOCK");
-  }
-
-  int one = 1;
-  struct linger ling = {0, 0};
-
-  // Keepalive to ensure full result flushing
-  setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, const_cast_sockopt(&one), sizeof(one));
-
-  // Turn linger off to avoid hung sockets
-  setsockopt(s, SOL_SOCKET, SO_LINGER, const_cast_sockopt(&ling), sizeof(ling));
-
-// Set TCP nodelay if available, MAC OS X Hack
-// See http://lists.danga.com/pipermail/memcached/2005-March/001240.html
-#ifndef TCP_NOPUSH
-  setsockopt(s, IPPROTO_TCP, TCP_NODELAY, const_cast_sockopt(&one), sizeof(one));
-#endif
-
-#ifdef TCP_LOW_MIN_RTO
-  if (TSocket::getUseLowMinRto()) {
-    setsockopt(s, IPPROTO_TCP, TCP_LOW_MIN_RTO, const_cast_sockopt(&one), sizeof(one));
-  }
-#endif
-
-  if (listen(s, LISTEN_BACKLOG) == -1) {
-    ::THRIFT_CLOSESOCKET(s);
-    throw TTransportException(TTransportException::NOT_OPEN, "TNonblockingServer::serve() listen");
-  }
-
-  // Cool, this socket is good to go, set it as the serverSocket_
-  serverSocket_ = s;
-
-  if (!port_) {
-    struct sockaddr_storage addr;
-    socklen_t size = sizeof(addr);
-    if (!getsockname(serverSocket_, reinterpret_cast<sockaddr*>(&addr), &size)) {
-      if (addr.ss_family == AF_INET6) {
-        const struct sockaddr_in6* sin = reinterpret_cast<const struct sockaddr_in6*>(&addr);
-        listenPort_ = ntohs(sin->sin6_port);
-      } else {
-        const struct sockaddr_in* sin = reinterpret_cast<const struct sockaddr_in*>(&addr);
-        listenPort_ = ntohs(sin->sin_port);
-      }
-    } else {
-      GlobalOutput.perror("TNonblocking: failed to get listen port: ", THRIFT_GET_SOCKET_ERROR);
-    }
-  }
-}
-
-void TNonblockingServer::setThreadManager(boost::shared_ptr<ThreadManager> threadManager) {
-  threadManager_ = threadManager;
-  if (threadManager) {
-    threadManager->setExpireCallback(
-        apache::thrift::stdcxx::bind(&TNonblockingServer::expireClose,
-                                     this,
-                                     apache::thrift::stdcxx::placeholders::_1));
-    threadPoolProcessing_ = true;
-  } else {
-    threadPoolProcessing_ = false;
-  }
-}
-
-bool TNonblockingServer::serverOverloaded() {
-  size_t activeConnections = numTConnections_ - connectionStack_.size();
-  if (numActiveProcessors_ > maxActiveProcessors_ || activeConnections > maxConnections_) {
-    if (!overloaded_) {
-      GlobalOutput.printf("TNonblockingServer: overload condition begun.");
-      overloaded_ = true;
-    }
-  } else {
-    if (overloaded_ && (numActiveProcessors_ <= overloadHysteresis_ * maxActiveProcessors_)
-        && (activeConnections <= overloadHysteresis_ * maxConnections_)) {
-      GlobalOutput.printf(
-          "TNonblockingServer: overload ended; "
-          "%u dropped (%llu total)",
-          nConnectionsDropped_,
-          nTotalConnectionsDropped_);
-      nConnectionsDropped_ = 0;
-      overloaded_ = false;
-    }
-  }
-
-  return overloaded_;
-}
-
-bool TNonblockingServer::drainPendingTask() {
-  if (threadManager_) {
-    boost::shared_ptr<Runnable> task = threadManager_->removeNextPending();
-    if (task) {
-      TConnection* connection = static_cast<TConnection::Task*>(task.get())->getTConnection();
-      assert(connection && connection->getServer() && connection->getState() == APP_WAIT_TASK);
-      connection->forceClose();
-      return true;
-    }
-  }
-  return false;
-}
-
-void TNonblockingServer::expireClose(boost::shared_ptr<Runnable> task) {
-  TConnection* connection = static_cast<TConnection::Task*>(task.get())->getTConnection();
-  assert(connection && connection->getServer() && connection->getState() == APP_WAIT_TASK);
-  connection->forceClose();
-}
-
-void TNonblockingServer::stop() {
-  if (!port_) {
-    listenPort_ = 0;
-  }
-  // Breaks the event loop in all threads so that they end ASAP.
-  for (uint32_t i = 0; i < ioThreads_.size(); ++i) {
-    ioThreads_[i]->stop();
-  }
-}
-
-void TNonblockingServer::registerEvents(event_base* user_event_base) {
-  userEventBase_ = user_event_base;
-
-  // init listen socket
-  if (serverSocket_ == THRIFT_INVALID_SOCKET)
-    createAndListenOnSocket();
-
-  // set up the IO threads
-  assert(ioThreads_.empty());
-  if (!numIOThreads_) {
-    numIOThreads_ = DEFAULT_IO_THREADS;
-  }
-  // User-provided event-base doesn't works for multi-threaded servers
-  assert(numIOThreads_ == 1 || !userEventBase_);
-
-  for (uint32_t id = 0; id < numIOThreads_; ++id) {
-    // the first IO thread also does the listening on server socket
-    THRIFT_SOCKET listenFd = (id == 0 ? serverSocket_ : THRIFT_INVALID_SOCKET);
-
-    shared_ptr<TNonblockingIOThread> thread(
-        new TNonblockingIOThread(this, id, listenFd, useHighPriorityIOThreads_));
-    ioThreads_.push_back(thread);
-  }
-
-  // Notify handler of the preServe event
-  if (eventHandler_) {
-    eventHandler_->preServe();
-  }
-
-  // Start all of our helper IO threads. Note that the threads run forever,
-  // only terminating if stop() is called.
-  assert(ioThreads_.size() == numIOThreads_);
-  assert(ioThreads_.size() > 0);
-
-  GlobalOutput.printf("TNonblockingServer: Serving on port %d, %d io threads.",
-                      listenPort_,
-                      ioThreads_.size());
-
-  // Launch all the secondary IO threads in separate threads
-  if (ioThreads_.size() > 1) {
-    ioThreadFactory_.reset(new PlatformThreadFactory(
-#if !USE_BOOST_THREAD && !USE_STD_THREAD
-        PlatformThreadFactory::OTHER,  // scheduler
-        PlatformThreadFactory::NORMAL, // priority
-        1,                             // stack size (MB)
-#endif
-        false // detached
-        ));
-
-    assert(ioThreadFactory_.get());
-
-    // intentionally starting at thread 1, not 0
-    for (uint32_t i = 1; i < ioThreads_.size(); ++i) {
-      shared_ptr<Thread> thread = ioThreadFactory_->newThread(ioThreads_[i]);
-      ioThreads_[i]->setThread(thread);
-      thread->start();
-    }
-  }
-
-  // Register the events for the primary (listener) IO thread
-  ioThreads_[0]->registerEvents();
-}
-
-/**
- * Main workhorse function, starts up the server listening on a port and
- * loops over the libevent handler.
- */
-void TNonblockingServer::serve() {
-
-  if (ioThreads_.empty())
-    registerEvents(NULL);
-
-  // Run the primary (listener) IO thread loop in our main thread; this will
-  // only return when the server is shutting down.
-  ioThreads_[0]->run();
-
-  // Ensure all threads are finished before exiting serve()
-  for (uint32_t i = 0; i < ioThreads_.size(); ++i) {
-    ioThreads_[i]->join();
-    GlobalOutput.printf("TNonblocking: join done for IO thread #%d", i);
-  }
-}
-
-TNonblockingIOThread::TNonblockingIOThread(TNonblockingServer* server,
-                                           int number,
-                                           THRIFT_SOCKET listenSocket,
-                                           bool useHighPriority)
-  : server_(server),
-    number_(number),
-    listenSocket_(listenSocket),
-    useHighPriority_(useHighPriority),
-    eventBase_(NULL),
-    ownEventBase_(false) {
-  notificationPipeFDs_[0] = -1;
-  notificationPipeFDs_[1] = -1;
-}
-
-TNonblockingIOThread::~TNonblockingIOThread() {
-  // make sure our associated thread is fully finished
-  join();
-
-  if (eventBase_ && ownEventBase_) {
-    event_base_free(eventBase_);
-    ownEventBase_ = false;
-  }
-
-  if (listenSocket_ >= 0) {
-    if (0 != ::THRIFT_CLOSESOCKET(listenSocket_)) {
-      GlobalOutput.perror("TNonblockingIOThread listenSocket_ close(): ", THRIFT_GET_SOCKET_ERROR);
-    }
-    listenSocket_ = THRIFT_INVALID_SOCKET;
-  }
-
-  for (int i = 0; i < 2; ++i) {
-    if (notificationPipeFDs_[i] >= 0) {
-      if (0 != ::THRIFT_CLOSESOCKET(notificationPipeFDs_[i])) {
-        GlobalOutput.perror("TNonblockingIOThread notificationPipe close(): ",
-                            THRIFT_GET_SOCKET_ERROR);
-      }
-      notificationPipeFDs_[i] = THRIFT_INVALID_SOCKET;
-    }
-  }
-}
-
-void TNonblockingIOThread::createNotificationPipe() {
-  if (evutil_socketpair(AF_LOCAL, SOCK_STREAM, 0, notificationPipeFDs_) == -1) {
-    GlobalOutput.perror("TNonblockingServer::createNotificationPipe ", EVUTIL_SOCKET_ERROR());
-    throw TException("can't create notification pipe");
-  }
-  if (evutil_make_socket_nonblocking(notificationPipeFDs_[0]) < 0
-      || evutil_make_socket_nonblocking(notificationPipeFDs_[1]) < 0) {
-    ::THRIFT_CLOSESOCKET(notificationPipeFDs_[0]);
-    ::THRIFT_CLOSESOCKET(notificationPipeFDs_[1]);
-    throw TException("TNonblockingServer::createNotificationPipe() THRIFT_O_NONBLOCK");
-  }
-  for (int i = 0; i < 2; ++i) {
-#if LIBEVENT_VERSION_NUMBER < 0x02000000
-    int flags;
-    if ((flags = THRIFT_FCNTL(notificationPipeFDs_[i], F_GETFD, 0)) < 0
-        || THRIFT_FCNTL(notificationPipeFDs_[i], F_SETFD, flags | FD_CLOEXEC) < 0) {
-#else
-    if (evutil_make_socket_closeonexec(notificationPipeFDs_[i]) < 0) {
-#endif
-      ::THRIFT_CLOSESOCKET(notificationPipeFDs_[0]);
-      ::THRIFT_CLOSESOCKET(notificationPipeFDs_[1]);
-      throw TException(
-          "TNonblockingServer::createNotificationPipe() "
-          "FD_CLOEXEC");
-    }
-  }
-}
-
-/**
- * Register the core libevent events onto the proper base.
- */
-void TNonblockingIOThread::registerEvents() {
-  threadId_ = Thread::get_current();
-
-  assert(eventBase_ == 0);
-  eventBase_ = getServer()->getUserEventBase();
-  if (eventBase_ == NULL) {
-    eventBase_ = event_base_new();
-    ownEventBase_ = true;
-  }
-
-  // Print some libevent stats
-  if (number_ == 0) {
-    GlobalOutput.printf("TNonblockingServer: using libevent %s method %s",
-                        event_get_version(),
-                        event_base_get_method(eventBase_));
-  }
-
-  if (listenSocket_ >= 0) {
-    // Register the server event
-    event_set(&serverEvent_,
-              listenSocket_,
-              EV_READ | EV_PERSIST,
-              TNonblockingIOThread::listenHandler,
-              server_);
-    event_base_set(eventBase_, &serverEvent_);
-
-    // Add the event and start up the server
-    if (-1 == event_add(&serverEvent_, 0)) {
-      throw TException(
-          "TNonblockingServer::serve(): "
-          "event_add() failed on server listen event");
-    }
-    GlobalOutput.printf("TNonblocking: IO thread #%d registered for listen.", number_);
-  }
-
-  createNotificationPipe();
-
-  // Create an event to be notified when a task finishes
-  event_set(&notificationEvent_,
-            getNotificationRecvFD(),
-            EV_READ | EV_PERSIST,
-            TNonblockingIOThread::notifyHandler,
-            this);
-
-  // Attach to the base
-  event_base_set(eventBase_, &notificationEvent_);
-
-  // Add the event and start up the server
-  if (-1 == event_add(&notificationEvent_, 0)) {
-    throw TException(
-        "TNonblockingServer::serve(): "
-        "event_add() failed on task-done notification event");
-  }
-  GlobalOutput.printf("TNonblocking: IO thread #%d registered for notify.", number_);
-}
-
-bool TNonblockingIOThread::notify(TNonblockingServer::TConnection* conn) {
-  THRIFT_SOCKET fd = getNotificationSendFD();
-  if (fd < 0) {
-    return false;
-  }
-
-  fd_set wfds, efds;
-  long ret = -1;
-  long kSize = sizeof(conn);
-  const char* pos = reinterpret_cast<const char*>(&conn);
-
-  while (kSize > 0) {
-    FD_ZERO(&wfds);
-    FD_ZERO(&efds);
-    FD_SET(fd, &wfds);
-    FD_SET(fd, &efds);
-    ret = select(static_cast<int>(fd + 1), NULL, &wfds, &efds, NULL);
-    if (ret < 0) {
-      return false;
-    } else if (ret == 0) {
-      continue;
-    }
-
-    if (FD_ISSET(fd, &efds)) {
-      ::THRIFT_CLOSESOCKET(fd);
-      return false;
-    }
-
-    if (FD_ISSET(fd, &wfds)) {
-      ret = send(fd, pos, kSize, 0);
-      if (ret < 0) {
-        if (errno == EAGAIN) {
-          continue;
-        }
-
-        ::THRIFT_CLOSESOCKET(fd);
-        return false;
-      }
-
-      kSize -= ret;
-      pos += ret;
-    }
-  }
-
-  return true;
-}
-
-/* static */
-void TNonblockingIOThread::notifyHandler(evutil_socket_t fd, short which, void* v) {
-  TNonblockingIOThread* ioThread = (TNonblockingIOThread*)v;
-  assert(ioThread);
-  (void)which;
-
-  while (true) {
-    TNonblockingServer::TConnection* connection = 0;
-    const int kSize = sizeof(connection);
-    long nBytes = recv(fd, cast_sockopt(&connection), kSize, 0);
-    if (nBytes == kSize) {
-      if (connection == NULL) {
-        // this is the command to stop our thread, exit the handler!
-        return;
-      }
-      connection->transition();
-    } else if (nBytes > 0) {
-      // throw away these bytes and hope that next time we get a solid read
-      GlobalOutput.printf("notifyHandler: Bad read of %d bytes, wanted %d", nBytes, kSize);
-      ioThread->breakLoop(true);
-      return;
-    } else if (nBytes == 0) {
-      GlobalOutput.printf("notifyHandler: Notify socket closed!");
-      // exit the loop
-      break;
-    } else { // nBytes < 0
-      if (THRIFT_GET_SOCKET_ERROR != THRIFT_EWOULDBLOCK
-          && THRIFT_GET_SOCKET_ERROR != THRIFT_EAGAIN) {
-        GlobalOutput.perror("TNonblocking: notifyHandler read() failed: ", THRIFT_GET_SOCKET_ERROR);
-        ioThread->breakLoop(true);
-        return;
-      }
-      // exit the loop
-      break;
-    }
-  }
-}
-
-void TNonblockingIOThread::breakLoop(bool error) {
-  if (error) {
-    GlobalOutput.printf("TNonblockingServer: IO thread #%d exiting with error.", number_);
-    // TODO: figure out something better to do here, but for now kill the
-    // whole process.
-    GlobalOutput.printf("TNonblockingServer: aborting process.");
-    ::abort();
-  }
-
-  // sets a flag so that the loop exits on the next event
-  event_base_loopbreak(eventBase_);
-
-  // event_base_loopbreak() only causes the loop to exit the next time
-  // it wakes up.  We need to force it to wake up, in case there are
-  // no real events it needs to process.
-  //
-  // If we're running in the same thread, we can't use the notify(0)
-  // mechanism to stop the thread, but happily if we're running in the
-  // same thread, this means the thread can't be blocking in the event
-  // loop either.
-  if (!Thread::is_current(threadId_)) {
-    notify(NULL);
-  }
-}
-
-void TNonblockingIOThread::setCurrentThreadHighPriority(bool value) {
-#ifdef HAVE_SCHED_H
-  // Start out with a standard, low-priority setup for the sched params.
-  struct sched_param sp;
-  bzero((void*)&sp, sizeof(sp));
-  int policy = SCHED_OTHER;
-
-  // If desired, set up high-priority sched params structure.
-  if (value) {
-    // FIFO scheduler, ranked above default SCHED_OTHER queue
-    policy = SCHED_FIFO;
-    // The priority only compares us to other SCHED_FIFO threads, so we
-    // just pick a random priority halfway between min & max.
-    const int priority = (sched_get_priority_max(policy) + sched_get_priority_min(policy)) / 2;
-
-    sp.sched_priority = priority;
-  }
-
-  // Actually set the sched params for the current thread.
-  if (0 == pthread_setschedparam(pthread_self(), policy, &sp)) {
-    GlobalOutput.printf("TNonblocking: IO Thread #%d using high-priority scheduler!", number_);
-  } else {
-    GlobalOutput.perror("TNonblocking: pthread_setschedparam(): ", THRIFT_GET_SOCKET_ERROR);
-  }
-#else
-  THRIFT_UNUSED_VARIABLE(value);
-#endif
-}
-
-void TNonblockingIOThread::run() {
-  if (eventBase_ == NULL)
-    registerEvents();
-
-  GlobalOutput.printf("TNonblockingServer: IO thread #%d entering loop...", number_);
-
-  if (useHighPriority_) {
-    setCurrentThreadHighPriority(true);
-  }
-
-  // Run libevent engine, never returns, invokes calls to eventHandler
-  event_base_loop(eventBase_, 0);
-
-  if (useHighPriority_) {
-    setCurrentThreadHighPriority(false);
-  }
-
-  // cleans up our registered events
-  cleanupEvents();
-
-  GlobalOutput.printf("TNonblockingServer: IO thread #%d run() done!", number_);
-}
-
-void TNonblockingIOThread::cleanupEvents() {
-  // stop the listen socket, if any
-  if (listenSocket_ >= 0) {
-    if (event_del(&serverEvent_) == -1) {
-      GlobalOutput.perror("TNonblockingIOThread::stop() event_del: ", THRIFT_GET_SOCKET_ERROR);
-    }
-  }
-
-  event_del(&notificationEvent_);
-}
-
-void TNonblockingIOThread::stop() {
-  // This should cause the thread to fall out of its event loop ASAP.
-  breakLoop(false);
-}
-
-void TNonblockingIOThread::join() {
-  // If this was a thread created by a factory (not the thread that called
-  // serve()), we join() it to make sure we shut down fully.
-  if (thread_) {
-    try {
-      // Note that it is safe to both join() ourselves twice, as well as join
-      // the current thread as the pthread implementation checks for deadlock.
-      thread_->join();
-    } catch (...) {
-      // swallow everything
-    }
-  }
-}
-}
-}
-} // apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TNonblockingServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TNonblockingServer.h
deleted file mode 100644
index 82d40e9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TNonblockingServer.h
+++ /dev/null
@@ -1,877 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TNONBLOCKINGSERVER_H_
-#define _THRIFT_SERVER_TNONBLOCKINGSERVER_H_ 1
-
-#include <thrift/Thrift.h>
-#include <thrift/server/TServer.h>
-#include <thrift/transport/PlatformSocket.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TSocket.h>
-#include <thrift/concurrency/ThreadManager.h>
-#include <climits>
-#include <thrift/concurrency/Thread.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/concurrency/Mutex.h>
-#include <stack>
-#include <vector>
-#include <string>
-#include <cstdlib>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <event.h>
-#include <event2/event_compat.h>
-#include <event2/event_struct.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-using apache::thrift::transport::TMemoryBuffer;
-using apache::thrift::transport::TSocket;
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::concurrency::Runnable;
-using apache::thrift::concurrency::ThreadManager;
-using apache::thrift::concurrency::PlatformThreadFactory;
-using apache::thrift::concurrency::ThreadFactory;
-using apache::thrift::concurrency::Thread;
-using apache::thrift::concurrency::Mutex;
-using apache::thrift::concurrency::Guard;
-
-#ifdef LIBEVENT_VERSION_NUMBER
-#define LIBEVENT_VERSION_MAJOR (LIBEVENT_VERSION_NUMBER >> 24)
-#define LIBEVENT_VERSION_MINOR ((LIBEVENT_VERSION_NUMBER >> 16) & 0xFF)
-#define LIBEVENT_VERSION_REL ((LIBEVENT_VERSION_NUMBER >> 8) & 0xFF)
-#else
-// assume latest version 1 series
-#define LIBEVENT_VERSION_MAJOR 1
-#define LIBEVENT_VERSION_MINOR 14
-#define LIBEVENT_VERSION_REL 13
-#define LIBEVENT_VERSION_NUMBER                                                                    \
-  ((LIBEVENT_VERSION_MAJOR << 24) | (LIBEVENT_VERSION_MINOR << 16) | (LIBEVENT_VERSION_REL << 8))
-#endif
-
-#if LIBEVENT_VERSION_NUMBER < 0x02000000
-typedef THRIFT_SOCKET evutil_socket_t;
-#endif
-
-#ifndef SOCKOPT_CAST_T
-#ifndef _WIN32
-#define SOCKOPT_CAST_T void
-#else
-#define SOCKOPT_CAST_T char
-#endif // _WIN32
-#endif
-
-template <class T>
-inline const SOCKOPT_CAST_T* const_cast_sockopt(const T* v) {
-  return reinterpret_cast<const SOCKOPT_CAST_T*>(v);
-}
-
-template <class T>
-inline SOCKOPT_CAST_T* cast_sockopt(T* v) {
-  return reinterpret_cast<SOCKOPT_CAST_T*>(v);
-}
-
-/**
- * This is a non-blocking server in C++ for high performance that
- * operates a set of IO threads (by default only one). It assumes that
- * all incoming requests are framed with a 4 byte length indicator and
- * writes out responses using the same framing.
- *
- * It does not use the TServerTransport framework, but rather has socket
- * operations hardcoded for use with select.
- *
- */
-
-/// Overload condition actions.
-enum TOverloadAction {
-  T_OVERLOAD_NO_ACTION,       ///< Don't handle overload */
-  T_OVERLOAD_CLOSE_ON_ACCEPT, ///< Drop new connections immediately */
-  T_OVERLOAD_DRAIN_TASK_QUEUE ///< Drop some tasks from head of task queue */
-};
-
-class TNonblockingIOThread;
-
-class TNonblockingServer : public TServer {
-private:
-  class TConnection;
-
-  friend class TNonblockingIOThread;
-
-private:
-  /// Listen backlog
-  static const int LISTEN_BACKLOG = 1024;
-
-  /// Default limit on size of idle connection pool
-  static const size_t CONNECTION_STACK_LIMIT = 1024;
-
-  /// Default limit on frame size
-  static const int MAX_FRAME_SIZE = 256 * 1024 * 1024;
-
-  /// Default limit on total number of connected sockets
-  static const int MAX_CONNECTIONS = INT_MAX;
-
-  /// Default limit on connections in handler/task processing
-  static const int MAX_ACTIVE_PROCESSORS = INT_MAX;
-
-  /// Default size of write buffer
-  static const int WRITE_BUFFER_DEFAULT_SIZE = 1024;
-
-  /// Maximum size of read buffer allocated to idle connection (0 = unlimited)
-  static const int IDLE_READ_BUFFER_LIMIT = 1024;
-
-  /// Maximum size of write buffer allocated to idle connection (0 = unlimited)
-  static const int IDLE_WRITE_BUFFER_LIMIT = 1024;
-
-  /// # of calls before resizing oversized buffers (0 = check only on close)
-  static const int RESIZE_BUFFER_EVERY_N = 512;
-
-  /// # of IO threads to use by default
-  static const int DEFAULT_IO_THREADS = 1;
-
-  /// # of IO threads this server will use
-  size_t numIOThreads_;
-
-  /// Whether to set high scheduling priority for IO threads
-  bool useHighPriorityIOThreads_;
-
-  /// Server socket file descriptor
-  THRIFT_SOCKET serverSocket_;
-
-  /// Port server runs on. Zero when letting OS decide actual port
-  int port_;
-
-  /// Port server actually runs on
-  int listenPort_;
-
-  /// The optional user-provided event-base (for single-thread servers)
-  event_base* userEventBase_;
-
-  /// For processing via thread pool, may be NULL
-  boost::shared_ptr<ThreadManager> threadManager_;
-
-  /// Is thread pool processing?
-  bool threadPoolProcessing_;
-
-  // Factory to create the IO threads
-  boost::shared_ptr<PlatformThreadFactory> ioThreadFactory_;
-
-  // Vector of IOThread objects that will handle our IO
-  std::vector<boost::shared_ptr<TNonblockingIOThread> > ioThreads_;
-
-  // Index of next IO Thread to be used (for round-robin)
-  uint32_t nextIOThread_;
-
-  // Synchronizes access to connection stack and similar data
-  Mutex connMutex_;
-
-  /// Number of TConnection object we've created
-  size_t numTConnections_;
-
-  /// Number of Connections processing or waiting to process
-  size_t numActiveProcessors_;
-
-  /// Limit for how many TConnection objects to cache
-  size_t connectionStackLimit_;
-
-  /// Limit for number of connections processing or waiting to process
-  size_t maxActiveProcessors_;
-
-  /// Limit for number of open connections
-  size_t maxConnections_;
-
-  /// Limit for frame size
-  size_t maxFrameSize_;
-
-  /// Time in milliseconds before an unperformed task expires (0 == infinite).
-  int64_t taskExpireTime_;
-
-  /**
-   * Hysteresis for overload state.  This is the fraction of the overload
-   * value that needs to be reached before the overload state is cleared;
-   * must be <= 1.0.
-   */
-  double overloadHysteresis_;
-
-  /// Action to take when we're overloaded.
-  TOverloadAction overloadAction_;
-
-  /**
-   * The write buffer is initialized (and when idleWriteBufferLimit_ is checked
-   * and found to be exceeded, reinitialized) to this size.
-   */
-  size_t writeBufferDefaultSize_;
-
-  /**
-   * Max read buffer size for an idle TConnection.  When we place an idle
-   * TConnection into connectionStack_ or on every resizeBufferEveryN_ calls,
-   * we will free the buffer (such that it will be reinitialized by the next
-   * received frame) if it has exceeded this limit.  0 disables this check.
-   */
-  size_t idleReadBufferLimit_;
-
-  /**
-   * Max write buffer size for an idle connection.  When we place an idle
-   * TConnection into connectionStack_ or on every resizeBufferEveryN_ calls,
-   * we insure that its write buffer is <= to this size; otherwise we
-   * replace it with a new one of writeBufferDefaultSize_ bytes to insure that
-   * idle connections don't hog memory. 0 disables this check.
-   */
-  size_t idleWriteBufferLimit_;
-
-  /**
-   * Every N calls we check the buffer size limits on a connected TConnection.
-   * 0 disables (i.e. the checks are only done when a connection closes).
-   */
-  int32_t resizeBufferEveryN_;
-
-  /// Set if we are currently in an overloaded state.
-  bool overloaded_;
-
-  /// Count of connections dropped since overload started
-  uint32_t nConnectionsDropped_;
-
-  /// Count of connections dropped on overload since server started
-  uint64_t nTotalConnectionsDropped_;
-
-  /**
-   * This is a stack of all the objects that have been created but that
-   * are NOT currently in use. When we close a connection, we place it on this
-   * stack so that the object can be reused later, rather than freeing the
-   * memory and reallocating a new object later.
-   */
-  std::stack<TConnection*> connectionStack_;
-
-  /**
-   * This container holds pointers to all active connections. This container
-   * allows the server to clean up unlcosed connection objects at destruction,
-   * which in turn allows their transports, protocols, processors and handlers
-   * to deallocate and clean up correctly.
-   */
-  std::vector<TConnection*> activeConnections_;
-
-  /**
-   * Called when server socket had something happen.  We accept all waiting
-   * client connections on listen socket fd and assign TConnection objects
-   * to handle those requests.
-   *
-   * @param fd the listen socket.
-   * @param which the event flag that triggered the handler.
-   */
-  void handleEvent(THRIFT_SOCKET fd, short which);
-
-  void init(int port) {
-    serverSocket_ = THRIFT_INVALID_SOCKET;
-    numIOThreads_ = DEFAULT_IO_THREADS;
-    nextIOThread_ = 0;
-    useHighPriorityIOThreads_ = false;
-    port_ = port;
-    listenPort_ = port;
-    userEventBase_ = NULL;
-    threadPoolProcessing_ = false;
-    numTConnections_ = 0;
-    numActiveProcessors_ = 0;
-    connectionStackLimit_ = CONNECTION_STACK_LIMIT;
-    maxActiveProcessors_ = MAX_ACTIVE_PROCESSORS;
-    maxConnections_ = MAX_CONNECTIONS;
-    maxFrameSize_ = MAX_FRAME_SIZE;
-    taskExpireTime_ = 0;
-    overloadHysteresis_ = 0.8;
-    overloadAction_ = T_OVERLOAD_NO_ACTION;
-    writeBufferDefaultSize_ = WRITE_BUFFER_DEFAULT_SIZE;
-    idleReadBufferLimit_ = IDLE_READ_BUFFER_LIMIT;
-    idleWriteBufferLimit_ = IDLE_WRITE_BUFFER_LIMIT;
-    resizeBufferEveryN_ = RESIZE_BUFFER_EVERY_N;
-    overloaded_ = false;
-    nConnectionsDropped_ = 0;
-    nTotalConnectionsDropped_ = 0;
-  }
-
-public:
-  TNonblockingServer(const boost::shared_ptr<TProcessorFactory>& processorFactory, int port)
-    : TServer(processorFactory) {
-    init(port);
-  }
-
-  TNonblockingServer(const boost::shared_ptr<TProcessor>& processor, int port)
-    : TServer(processor) {
-    init(port);
-  }
-
-  TNonblockingServer(const boost::shared_ptr<TProcessorFactory>& processorFactory,
-                     const boost::shared_ptr<TProtocolFactory>& protocolFactory,
-                     int port,
-                     const boost::shared_ptr<ThreadManager>& threadManager
-                     = boost::shared_ptr<ThreadManager>())
-    : TServer(processorFactory) {
-
-    init(port);
-
-    setInputProtocolFactory(protocolFactory);
-    setOutputProtocolFactory(protocolFactory);
-    setThreadManager(threadManager);
-  }
-
-  TNonblockingServer(const boost::shared_ptr<TProcessor>& processor,
-                     const boost::shared_ptr<TProtocolFactory>& protocolFactory,
-                     int port,
-                     const boost::shared_ptr<ThreadManager>& threadManager
-                     = boost::shared_ptr<ThreadManager>())
-    : TServer(processor) {
-
-    init(port);
-
-    setInputProtocolFactory(protocolFactory);
-    setOutputProtocolFactory(protocolFactory);
-    setThreadManager(threadManager);
-  }
-
-  TNonblockingServer(const boost::shared_ptr<TProcessorFactory>& processorFactory,
-                     const boost::shared_ptr<TTransportFactory>& inputTransportFactory,
-                     const boost::shared_ptr<TTransportFactory>& outputTransportFactory,
-                     const boost::shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                     const boost::shared_ptr<TProtocolFactory>& outputProtocolFactory,
-                     int port,
-                     const boost::shared_ptr<ThreadManager>& threadManager
-                     = boost::shared_ptr<ThreadManager>())
-    : TServer(processorFactory) {
-
-    init(port);
-
-    setInputTransportFactory(inputTransportFactory);
-    setOutputTransportFactory(outputTransportFactory);
-    setInputProtocolFactory(inputProtocolFactory);
-    setOutputProtocolFactory(outputProtocolFactory);
-    setThreadManager(threadManager);
-  }
-
-  TNonblockingServer(const boost::shared_ptr<TProcessor>& processor,
-                     const boost::shared_ptr<TTransportFactory>& inputTransportFactory,
-                     const boost::shared_ptr<TTransportFactory>& outputTransportFactory,
-                     const boost::shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                     const boost::shared_ptr<TProtocolFactory>& outputProtocolFactory,
-                     int port,
-                     const boost::shared_ptr<ThreadManager>& threadManager
-                     = boost::shared_ptr<ThreadManager>())
-    : TServer(processor) {
-
-    init(port);
-
-    setInputTransportFactory(inputTransportFactory);
-    setOutputTransportFactory(outputTransportFactory);
-    setInputProtocolFactory(inputProtocolFactory);
-    setOutputProtocolFactory(outputProtocolFactory);
-    setThreadManager(threadManager);
-  }
-
-  ~TNonblockingServer();
-
-  void setThreadManager(boost::shared_ptr<ThreadManager> threadManager);
-
-  int getListenPort() { return listenPort_; }
-
-  boost::shared_ptr<ThreadManager> getThreadManager() { return threadManager_; }
-
-  /**
-   * Sets the number of IO threads used by this server. Can only be used before
-   * the call to serve() and has no effect afterwards.  We always use a
-   * PosixThreadFactory for the IO worker threads, because they must joinable
-   * for clean shutdown.
-   */
-  void setNumIOThreads(size_t numThreads) {
-    numIOThreads_ = numThreads;
-    // User-provided event-base doesn't works for multi-threaded servers
-    assert(numIOThreads_ <= 1 || !userEventBase_);
-  }
-
-  /** Return whether the IO threads will get high scheduling priority */
-  bool useHighPriorityIOThreads() const { return useHighPriorityIOThreads_; }
-
-  /** Set whether the IO threads will get high scheduling priority. */
-  void setUseHighPriorityIOThreads(bool val) { useHighPriorityIOThreads_ = val; }
-
-  /** Return the number of IO threads used by this server. */
-  size_t getNumIOThreads() const { return numIOThreads_; }
-
-  /**
-   * Get the maximum number of unused TConnection we will hold in reserve.
-   *
-   * @return the current limit on TConnection pool size.
-   */
-  size_t getConnectionStackLimit() const { return connectionStackLimit_; }
-
-  /**
-   * Set the maximum number of unused TConnection we will hold in reserve.
-   *
-   * @param sz the new limit for TConnection pool size.
-   */
-  void setConnectionStackLimit(size_t sz) { connectionStackLimit_ = sz; }
-
-  bool isThreadPoolProcessing() const { return threadPoolProcessing_; }
-
-  void addTask(boost::shared_ptr<Runnable> task) {
-    threadManager_->add(task, 0LL, taskExpireTime_);
-  }
-
-  /**
-   * Return the count of sockets currently connected to.
-   *
-   * @return count of connected sockets.
-   */
-  size_t getNumConnections() const { return numTConnections_; }
-
-  /**
-   * Return the count of sockets currently connected to.
-   *
-   * @return count of connected sockets.
-   */
-  size_t getNumActiveConnections() const { return getNumConnections() - getNumIdleConnections(); }
-
-  /**
-   * Return the count of connection objects allocated but not in use.
-   *
-   * @return count of idle connection objects.
-   */
-  size_t getNumIdleConnections() const { return connectionStack_.size(); }
-
-  /**
-   * Return count of number of connections which are currently processing.
-   * This is defined as a connection where all data has been received and
-   * either assigned a task (when threading) or passed to a handler (when
-   * not threading), and where the handler has not yet returned.
-   *
-   * @return # of connections currently processing.
-   */
-  size_t getNumActiveProcessors() const { return numActiveProcessors_; }
-
-  /// Increment the count of connections currently processing.
-  void incrementActiveProcessors() {
-    Guard g(connMutex_);
-    ++numActiveProcessors_;
-  }
-
-  /// Decrement the count of connections currently processing.
-  void decrementActiveProcessors() {
-    Guard g(connMutex_);
-    if (numActiveProcessors_ > 0) {
-      --numActiveProcessors_;
-    }
-  }
-
-  /**
-   * Get the maximum # of connections allowed before overload.
-   *
-   * @return current setting.
-   */
-  size_t getMaxConnections() const { return maxConnections_; }
-
-  /**
-   * Set the maximum # of connections allowed before overload.
-   *
-   * @param maxConnections new setting for maximum # of connections.
-   */
-  void setMaxConnections(size_t maxConnections) { maxConnections_ = maxConnections; }
-
-  /**
-   * Get the maximum # of connections waiting in handler/task before overload.
-   *
-   * @return current setting.
-   */
-  size_t getMaxActiveProcessors() const { return maxActiveProcessors_; }
-
-  /**
-   * Set the maximum # of connections waiting in handler/task before overload.
-   *
-   * @param maxActiveProcessors new setting for maximum # of active processes.
-   */
-  void setMaxActiveProcessors(size_t maxActiveProcessors) {
-    maxActiveProcessors_ = maxActiveProcessors;
-  }
-
-  /**
-   * Get the maximum allowed frame size.
-   *
-   * If a client tries to send a message larger than this limit,
-   * its connection will be closed.
-   *
-   * @return Maxium frame size, in bytes.
-   */
-  size_t getMaxFrameSize() const { return maxFrameSize_; }
-
-  /**
-   * Set the maximum allowed frame size.
-   *
-   * @param maxFrameSize The new maximum frame size.
-   */
-  void setMaxFrameSize(size_t maxFrameSize) { maxFrameSize_ = maxFrameSize; }
-
-  /**
-   * Get fraction of maximum limits before an overload condition is cleared.
-   *
-   * @return hysteresis fraction
-   */
-  double getOverloadHysteresis() const { return overloadHysteresis_; }
-
-  /**
-   * Set fraction of maximum limits before an overload condition is cleared.
-   * A good value would probably be between 0.5 and 0.9.
-   *
-   * @param hysteresisFraction fraction <= 1.0.
-   */
-  void setOverloadHysteresis(double hysteresisFraction) {
-    if (hysteresisFraction <= 1.0 && hysteresisFraction > 0.0) {
-      overloadHysteresis_ = hysteresisFraction;
-    }
-  }
-
-  /**
-   * Get the action the server will take on overload.
-   *
-   * @return a TOverloadAction enum value for the currently set action.
-   */
-  TOverloadAction getOverloadAction() const { return overloadAction_; }
-
-  /**
-   * Set the action the server is to take on overload.
-   *
-   * @param overloadAction a TOverloadAction enum value for the action.
-   */
-  void setOverloadAction(TOverloadAction overloadAction) { overloadAction_ = overloadAction; }
-
-  /**
-   * Get the time in milliseconds after which a task expires (0 == infinite).
-   *
-   * @return a 64-bit time in milliseconds.
-   */
-  int64_t getTaskExpireTime() const { return taskExpireTime_; }
-
-  /**
-   * Set the time in milliseconds after which a task expires (0 == infinite).
-   *
-   * @param taskExpireTime a 64-bit time in milliseconds.
-   */
-  void setTaskExpireTime(int64_t taskExpireTime) { taskExpireTime_ = taskExpireTime; }
-
-  /**
-   * Determine if the server is currently overloaded.
-   * This function checks the maximums for open connections and connections
-   * currently in processing, and sets an overload condition if they are
-   * exceeded.  The overload will persist until both values are below the
-   * current hysteresis fraction of their maximums.
-   *
-   * @return true if an overload condition exists, false if not.
-   */
-  bool serverOverloaded();
-
-  /** Pop and discard next task on threadpool wait queue.
-   *
-   * @return true if a task was discarded, false if the wait queue was empty.
-   */
-  bool drainPendingTask();
-
-  /**
-   * Get the starting size of a TConnection object's write buffer.
-   *
-   * @return # bytes we initialize a TConnection object's write buffer to.
-   */
-  size_t getWriteBufferDefaultSize() const { return writeBufferDefaultSize_; }
-
-  /**
-   * Set the starting size of a TConnection object's write buffer.
-   *
-   * @param size # bytes we initialize a TConnection object's write buffer to.
-   */
-  void setWriteBufferDefaultSize(size_t size) { writeBufferDefaultSize_ = size; }
-
-  /**
-   * Get the maximum size of read buffer allocated to idle TConnection objects.
-   *
-   * @return # bytes beyond which we will dealloc idle buffer.
-   */
-  size_t getIdleReadBufferLimit() const { return idleReadBufferLimit_; }
-
-  /**
-   * [NOTE: This is for backwards compatibility, use getIdleReadBufferLimit().]
-   * Get the maximum size of read buffer allocated to idle TConnection objects.
-   *
-   * @return # bytes beyond which we will dealloc idle buffer.
-   */
-  size_t getIdleBufferMemLimit() const { return idleReadBufferLimit_; }
-
-  /**
-   * Set the maximum size read buffer allocated to idle TConnection objects.
-   * If a TConnection object is found (either on connection close or between
-   * calls when resizeBufferEveryN_ is set) with more than this much memory
-   * allocated to its read buffer, we free it and allow it to be reinitialized
-   * on the next received frame.
-   *
-   * @param limit of bytes beyond which we will shrink buffers when checked.
-   */
-  void setIdleReadBufferLimit(size_t limit) { idleReadBufferLimit_ = limit; }
-
-  /**
-   * [NOTE: This is for backwards compatibility, use setIdleReadBufferLimit().]
-   * Set the maximum size read buffer allocated to idle TConnection objects.
-   * If a TConnection object is found (either on connection close or between
-   * calls when resizeBufferEveryN_ is set) with more than this much memory
-   * allocated to its read buffer, we free it and allow it to be reinitialized
-   * on the next received frame.
-   *
-   * @param limit of bytes beyond which we will shrink buffers when checked.
-   */
-  void setIdleBufferMemLimit(size_t limit) { idleReadBufferLimit_ = limit; }
-
-  /**
-   * Get the maximum size of write buffer allocated to idle TConnection objects.
-   *
-   * @return # bytes beyond which we will reallocate buffers when checked.
-   */
-  size_t getIdleWriteBufferLimit() const { return idleWriteBufferLimit_; }
-
-  /**
-   * Set the maximum size write buffer allocated to idle TConnection objects.
-   * If a TConnection object is found (either on connection close or between
-   * calls when resizeBufferEveryN_ is set) with more than this much memory
-   * allocated to its write buffer, we destroy and construct that buffer with
-   * writeBufferDefaultSize_ bytes.
-   *
-   * @param limit of bytes beyond which we will shrink buffers when idle.
-   */
-  void setIdleWriteBufferLimit(size_t limit) { idleWriteBufferLimit_ = limit; }
-
-  /**
-   * Get # of calls made between buffer size checks.  0 means disabled.
-   *
-   * @return # of calls between buffer size checks.
-   */
-  int32_t getResizeBufferEveryN() const { return resizeBufferEveryN_; }
-
-  /**
-   * Check buffer sizes every "count" calls.  This allows buffer limits
-   * to be enforced for persistent connections with a controllable degree
-   * of overhead. 0 disables checks except at connection close.
-   *
-   * @param count the number of calls between checks, or 0 to disable
-   */
-  void setResizeBufferEveryN(int32_t count) { resizeBufferEveryN_ = count; }
-
-  /**
-   * Main workhorse function, starts up the server listening on a port and
-   * loops over the libevent handler.
-   */
-  void serve();
-
-  /**
-   * Causes the server to terminate gracefully (can be called from any thread).
-   */
-  void stop();
-
-  /// Creates a socket to listen on and binds it to the local port.
-  void createAndListenOnSocket();
-
-  /**
-   * Takes a socket created by createAndListenOnSocket() and sets various
-   * options on it to prepare for use in the server.
-   *
-   * @param fd descriptor of socket to be initialized/
-   */
-  void listenSocket(THRIFT_SOCKET fd);
-
-  /**
-   * Register the optional user-provided event-base (for single-thread servers)
-   *
-   * This method should be used when the server is running in a single-thread
-   * mode, and the event base is provided by the user (i.e., the caller).
-   *
-   * @param user_event_base the user-provided event-base. The user is
-   * responsible for freeing the event base memory.
-   */
-  void registerEvents(event_base* user_event_base);
-
-  /**
-   * Returns the optional user-provided event-base (for single-thread servers).
-   */
-  event_base* getUserEventBase() const { return userEventBase_; }
-
-  /** Some transports, like THeaderTransport, require passing through
-   * the framing size instead of stripping it.
-   */
-  bool getHeaderTransport();
-
-private:
-  /**
-   * Callback function that the threadmanager calls when a task reaches
-   * its expiration time.  It is needed to clean up the expired connection.
-   *
-   * @param task the runnable associated with the expired task.
-   */
-  void expireClose(boost::shared_ptr<Runnable> task);
-
-  /**
-   * Return an initialized connection object.  Creates or recovers from
-   * pool a TConnection and initializes it with the provided socket FD
-   * and flags.
-   *
-   * @param socket FD of socket associated with this connection.
-   * @param addr the sockaddr of the client
-   * @param addrLen the length of addr
-   * @return pointer to initialized TConnection object.
-   */
-  TConnection* createConnection(THRIFT_SOCKET socket, const sockaddr* addr, socklen_t addrLen);
-
-  /**
-   * Returns a connection to pool or deletion.  If the connection pool
-   * (a stack) isn't full, place the connection object on it, otherwise
-   * just delete it.
-   *
-   * @param connection the TConection being returned.
-   */
-  void returnConnection(TConnection* connection);
-};
-
-class TNonblockingIOThread : public Runnable {
-public:
-  // Creates an IO thread and sets up the event base.  The listenSocket should
-  // be a valid FD on which listen() has already been called.  If the
-  // listenSocket is < 0, accepting will not be done.
-  TNonblockingIOThread(TNonblockingServer* server,
-                       int number,
-                       THRIFT_SOCKET listenSocket,
-                       bool useHighPriority);
-
-  ~TNonblockingIOThread();
-
-  // Returns the event-base for this thread.
-  event_base* getEventBase() const { return eventBase_; }
-
-  // Returns the server for this thread.
-  TNonblockingServer* getServer() const { return server_; }
-
-  // Returns the number of this IO thread.
-  int getThreadNumber() const { return number_; }
-
-  // Returns the thread id associated with this object.  This should
-  // only be called after the thread has been started.
-  Thread::id_t getThreadId() const { return threadId_; }
-
-  // Returns the send-fd for task complete notifications.
-  evutil_socket_t getNotificationSendFD() const { return notificationPipeFDs_[1]; }
-
-  // Returns the read-fd for task complete notifications.
-  evutil_socket_t getNotificationRecvFD() const { return notificationPipeFDs_[0]; }
-
-  // Returns the actual thread object associated with this IO thread.
-  boost::shared_ptr<Thread> getThread() const { return thread_; }
-
-  // Sets the actual thread object associated with this IO thread.
-  void setThread(const boost::shared_ptr<Thread>& t) { thread_ = t; }
-
-  // Used by TConnection objects to indicate processing has finished.
-  bool notify(TNonblockingServer::TConnection* conn);
-
-  // Enters the event loop and does not return until a call to stop().
-  virtual void run();
-
-  // Exits the event loop as soon as possible.
-  void stop();
-
-  // Ensures that the event-loop thread is fully finished and shut down.
-  void join();
-
-  /// Registers the events for the notification & listen sockets
-  void registerEvents();
-
-private:
-  /**
-   * C-callable event handler for signaling task completion.  Provides a
-   * callback that libevent can understand that will read a connection
-   * object's address from a pipe and call connection->transition() for
-   * that object.
-   *
-   * @param fd the descriptor the event occurred on.
-   */
-  static void notifyHandler(evutil_socket_t fd, short which, void* v);
-
-  /**
-   * C-callable event handler for listener events.  Provides a callback
-   * that libevent can understand which invokes server->handleEvent().
-   *
-   * @param fd the descriptor the event occurred on.
-   * @param which the flags associated with the event.
-   * @param v void* callback arg where we placed TNonblockingServer's "this".
-   */
-  static void listenHandler(evutil_socket_t fd, short which, void* v) {
-    ((TNonblockingServer*)v)->handleEvent(fd, which);
-  }
-
-  /// Exits the loop ASAP in case of shutdown or error.
-  void breakLoop(bool error);
-
-  /// Create the pipe used to notify I/O process of task completion.
-  void createNotificationPipe();
-
-  /// Unregisters our events for notification and listen sockets.
-  void cleanupEvents();
-
-  /// Sets (or clears) high priority scheduling status for the current thread.
-  void setCurrentThreadHighPriority(bool value);
-
-private:
-  /// associated server
-  TNonblockingServer* server_;
-
-  /// thread number (for debugging).
-  const int number_;
-
-  /// The actual physical thread id.
-  Thread::id_t threadId_;
-
-  /// If listenSocket_ >= 0, adds an event on the event_base to accept conns
-  THRIFT_SOCKET listenSocket_;
-
-  /// Sets a high scheduling priority when running
-  bool useHighPriority_;
-
-  /// pointer to eventbase to be used for looping
-  event_base* eventBase_;
-
-  /// Set to true if this class is responsible for freeing the event base
-  /// memory.
-  bool ownEventBase_;
-
-  /// Used with eventBase_ for connection events (only in listener thread)
-  struct event serverEvent_;
-
-  /// Used with eventBase_ for task completion notification
-  struct event notificationEvent_;
-
-  /// File descriptors for pipe used for task completion notification.
-  evutil_socket_t notificationPipeFDs_[2];
-
-  /// Actual IO Thread
-  boost::shared_ptr<Thread> thread_;
-};
-}
-}
-} // apache::thrift::server
-
-#endif // #ifndef _THRIFT_SERVER_TNONBLOCKINGSERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServer.cpp
deleted file mode 100644
index df731c2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServer.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-#ifdef HAVE_SYS_RESOURCE_H
-int increase_max_fds(int max_fds = (1 << 24)) {
-  struct rlimit fdmaxrl;
-
-  for (fdmaxrl.rlim_cur = max_fds, fdmaxrl.rlim_max = max_fds;
-       max_fds && (setrlimit(RLIMIT_NOFILE, &fdmaxrl) < 0);
-       fdmaxrl.rlim_cur = max_fds, fdmaxrl.rlim_max = max_fds) {
-    max_fds /= 2;
-  }
-
-  return static_cast<int>(fdmaxrl.rlim_cur);
-}
-#endif
-}
-}
-} // apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServer.h
deleted file mode 100644
index 47e0d40..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServer.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TSERVER_H_
-#define _THRIFT_SERVER_TSERVER_H_ 1
-
-#include <thrift/TProcessor.h>
-#include <thrift/transport/TServerTransport.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/concurrency/Thread.h>
-
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-using apache::thrift::TProcessor;
-using apache::thrift::protocol::TBinaryProtocolFactory;
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::protocol::TProtocolFactory;
-using apache::thrift::transport::TServerTransport;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportFactory;
-
-/**
- * Virtual interface class that can handle events from the server core. To
- * use this you should subclass it and implement the methods that you care
- * about. Your subclass can also store local data that you may care about,
- * such as additional "arguments" to these methods (stored in the object
- * instance's state).
- */
-class TServerEventHandler {
-public:
-  virtual ~TServerEventHandler() {}
-
-  /**
-   * Called before the server begins.
-   */
-  virtual void preServe() {}
-
-  /**
-   * Called when a new client has connected and is about to being processing.
-   */
-  virtual void* createContext(boost::shared_ptr<TProtocol> input,
-                              boost::shared_ptr<TProtocol> output) {
-    (void)input;
-    (void)output;
-    return NULL;
-  }
-
-  /**
-   * Called when a client has finished request-handling to delete server
-   * context.
-   */
-  virtual void deleteContext(void* serverContext,
-                             boost::shared_ptr<TProtocol> input,
-                             boost::shared_ptr<TProtocol> output) {
-    (void)serverContext;
-    (void)input;
-    (void)output;
-  }
-
-  /**
-   * Called when a client is about to call the processor.
-   */
-  virtual void processContext(void* serverContext, boost::shared_ptr<TTransport> transport) {
-    (void)serverContext;
-    (void)transport;
-  }
-
-protected:
-  /**
-   * Prevent direct instantiation.
-   */
-  TServerEventHandler() {}
-};
-
-/**
- * Thrift server.
- *
- */
-class TServer : public concurrency::Runnable {
-public:
-  virtual ~TServer() {}
-
-  virtual void serve() = 0;
-
-  virtual void stop() {}
-
-  // Allows running the server as a Runnable thread
-  virtual void run() { serve(); }
-
-  boost::shared_ptr<TProcessorFactory> getProcessorFactory() { return processorFactory_; }
-
-  boost::shared_ptr<TServerTransport> getServerTransport() { return serverTransport_; }
-
-  boost::shared_ptr<TTransportFactory> getInputTransportFactory() { return inputTransportFactory_; }
-
-  boost::shared_ptr<TTransportFactory> getOutputTransportFactory() {
-    return outputTransportFactory_;
-  }
-
-  boost::shared_ptr<TProtocolFactory> getInputProtocolFactory() { return inputProtocolFactory_; }
-
-  boost::shared_ptr<TProtocolFactory> getOutputProtocolFactory() { return outputProtocolFactory_; }
-
-  boost::shared_ptr<TServerEventHandler> getEventHandler() { return eventHandler_; }
-
-protected:
-  TServer(const boost::shared_ptr<TProcessorFactory>& processorFactory)
-    : processorFactory_(processorFactory) {
-    setInputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
-    setOutputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
-    setInputProtocolFactory(boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory()));
-    setOutputProtocolFactory(boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory()));
-  }
-
-  TServer(const boost::shared_ptr<TProcessor>& processor)
-    : processorFactory_(new TSingletonProcessorFactory(processor)) {
-    setInputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
-    setOutputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
-    setInputProtocolFactory(boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory()));
-    setOutputProtocolFactory(boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory()));
-  }
-
-  TServer(const boost::shared_ptr<TProcessorFactory>& processorFactory,
-          const boost::shared_ptr<TServerTransport>& serverTransport)
-    : processorFactory_(processorFactory), serverTransport_(serverTransport) {
-    setInputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
-    setOutputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
-    setInputProtocolFactory(boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory()));
-    setOutputProtocolFactory(boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory()));
-  }
-
-  TServer(const boost::shared_ptr<TProcessor>& processor,
-          const boost::shared_ptr<TServerTransport>& serverTransport)
-    : processorFactory_(new TSingletonProcessorFactory(processor)),
-      serverTransport_(serverTransport) {
-    setInputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
-    setOutputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
-    setInputProtocolFactory(boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory()));
-    setOutputProtocolFactory(boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory()));
-  }
-
-  TServer(const boost::shared_ptr<TProcessorFactory>& processorFactory,
-          const boost::shared_ptr<TServerTransport>& serverTransport,
-          const boost::shared_ptr<TTransportFactory>& transportFactory,
-          const boost::shared_ptr<TProtocolFactory>& protocolFactory)
-    : processorFactory_(processorFactory),
-      serverTransport_(serverTransport),
-      inputTransportFactory_(transportFactory),
-      outputTransportFactory_(transportFactory),
-      inputProtocolFactory_(protocolFactory),
-      outputProtocolFactory_(protocolFactory) {}
-
-  TServer(const boost::shared_ptr<TProcessor>& processor,
-          const boost::shared_ptr<TServerTransport>& serverTransport,
-          const boost::shared_ptr<TTransportFactory>& transportFactory,
-          const boost::shared_ptr<TProtocolFactory>& protocolFactory)
-    : processorFactory_(new TSingletonProcessorFactory(processor)),
-      serverTransport_(serverTransport),
-      inputTransportFactory_(transportFactory),
-      outputTransportFactory_(transportFactory),
-      inputProtocolFactory_(protocolFactory),
-      outputProtocolFactory_(protocolFactory) {}
-
-  TServer(const boost::shared_ptr<TProcessorFactory>& processorFactory,
-          const boost::shared_ptr<TServerTransport>& serverTransport,
-          const boost::shared_ptr<TTransportFactory>& inputTransportFactory,
-          const boost::shared_ptr<TTransportFactory>& outputTransportFactory,
-          const boost::shared_ptr<TProtocolFactory>& inputProtocolFactory,
-          const boost::shared_ptr<TProtocolFactory>& outputProtocolFactory)
-    : processorFactory_(processorFactory),
-      serverTransport_(serverTransport),
-      inputTransportFactory_(inputTransportFactory),
-      outputTransportFactory_(outputTransportFactory),
-      inputProtocolFactory_(inputProtocolFactory),
-      outputProtocolFactory_(outputProtocolFactory) {}
-
-  TServer(const boost::shared_ptr<TProcessor>& processor,
-          const boost::shared_ptr<TServerTransport>& serverTransport,
-          const boost::shared_ptr<TTransportFactory>& inputTransportFactory,
-          const boost::shared_ptr<TTransportFactory>& outputTransportFactory,
-          const boost::shared_ptr<TProtocolFactory>& inputProtocolFactory,
-          const boost::shared_ptr<TProtocolFactory>& outputProtocolFactory)
-    : processorFactory_(new TSingletonProcessorFactory(processor)),
-      serverTransport_(serverTransport),
-      inputTransportFactory_(inputTransportFactory),
-      outputTransportFactory_(outputTransportFactory),
-      inputProtocolFactory_(inputProtocolFactory),
-      outputProtocolFactory_(outputProtocolFactory) {}
-
-  /**
-   * Get a TProcessor to handle calls on a particular connection.
-   *
-   * This method should only be called once per connection (never once per
-   * call).  This allows the TProcessorFactory to return a different processor
-   * for each connection if it desires.
-   */
-  boost::shared_ptr<TProcessor> getProcessor(boost::shared_ptr<TProtocol> inputProtocol,
-                                             boost::shared_ptr<TProtocol> outputProtocol,
-                                             boost::shared_ptr<TTransport> transport) {
-    TConnectionInfo connInfo;
-    connInfo.input = inputProtocol;
-    connInfo.output = outputProtocol;
-    connInfo.transport = transport;
-    return processorFactory_->getProcessor(connInfo);
-  }
-
-  // Class variables
-  boost::shared_ptr<TProcessorFactory> processorFactory_;
-  boost::shared_ptr<TServerTransport> serverTransport_;
-
-  boost::shared_ptr<TTransportFactory> inputTransportFactory_;
-  boost::shared_ptr<TTransportFactory> outputTransportFactory_;
-
-  boost::shared_ptr<TProtocolFactory> inputProtocolFactory_;
-  boost::shared_ptr<TProtocolFactory> outputProtocolFactory_;
-
-  boost::shared_ptr<TServerEventHandler> eventHandler_;
-
-public:
-  void setInputTransportFactory(boost::shared_ptr<TTransportFactory> inputTransportFactory) {
-    inputTransportFactory_ = inputTransportFactory;
-  }
-
-  void setOutputTransportFactory(boost::shared_ptr<TTransportFactory> outputTransportFactory) {
-    outputTransportFactory_ = outputTransportFactory;
-  }
-
-  void setInputProtocolFactory(boost::shared_ptr<TProtocolFactory> inputProtocolFactory) {
-    inputProtocolFactory_ = inputProtocolFactory;
-  }
-
-  void setOutputProtocolFactory(boost::shared_ptr<TProtocolFactory> outputProtocolFactory) {
-    outputProtocolFactory_ = outputProtocolFactory;
-  }
-
-  void setServerEventHandler(boost::shared_ptr<TServerEventHandler> eventHandler) {
-    eventHandler_ = eventHandler;
-  }
-};
-
-/**
- * Helper function to increase the max file descriptors limit
- * for the current process and all of its children.
- * By default, tries to increase it to as much as 2^24.
- */
-#ifdef HAVE_SYS_RESOURCE_H
-int increase_max_fds(int max_fds = (1 << 24));
-#endif
-}
-}
-} // apache::thrift::server
-
-#endif // #ifndef _THRIFT_SERVER_TSERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServerFramework.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServerFramework.cpp
deleted file mode 100644
index b62cf40..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServerFramework.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <algorithm>
-#include <boost/bind.hpp>
-#include <stdexcept>
-#include <stdint.h>
-#include <thrift/server/TServerFramework.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-using apache::thrift::concurrency::Synchronized;
-using apache::thrift::transport::TServerTransport;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TTransportFactory;
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::protocol::TProtocolFactory;
-using boost::bind;
-using boost::shared_ptr;
-using std::string;
-
-TServerFramework::TServerFramework(const shared_ptr<TProcessorFactory>& processorFactory,
-                                   const shared_ptr<TServerTransport>& serverTransport,
-                                   const shared_ptr<TTransportFactory>& transportFactory,
-                                   const shared_ptr<TProtocolFactory>& protocolFactory)
-  : TServer(processorFactory, serverTransport, transportFactory, protocolFactory),
-    clients_(0),
-    hwm_(0),
-    limit_(INT64_MAX) {
-}
-
-TServerFramework::TServerFramework(const shared_ptr<TProcessor>& processor,
-                                   const shared_ptr<TServerTransport>& serverTransport,
-                                   const shared_ptr<TTransportFactory>& transportFactory,
-                                   const shared_ptr<TProtocolFactory>& protocolFactory)
-  : TServer(processor, serverTransport, transportFactory, protocolFactory),
-    clients_(0),
-    hwm_(0),
-    limit_(INT64_MAX) {
-}
-
-TServerFramework::TServerFramework(const shared_ptr<TProcessorFactory>& processorFactory,
-                                   const shared_ptr<TServerTransport>& serverTransport,
-                                   const shared_ptr<TTransportFactory>& inputTransportFactory,
-                                   const shared_ptr<TTransportFactory>& outputTransportFactory,
-                                   const shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                                   const shared_ptr<TProtocolFactory>& outputProtocolFactory)
-  : TServer(processorFactory,
-            serverTransport,
-            inputTransportFactory,
-            outputTransportFactory,
-            inputProtocolFactory,
-            outputProtocolFactory),
-    clients_(0),
-    hwm_(0),
-    limit_(INT64_MAX) {
-}
-
-TServerFramework::TServerFramework(const shared_ptr<TProcessor>& processor,
-                                   const shared_ptr<TServerTransport>& serverTransport,
-                                   const shared_ptr<TTransportFactory>& inputTransportFactory,
-                                   const shared_ptr<TTransportFactory>& outputTransportFactory,
-                                   const shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                                   const shared_ptr<TProtocolFactory>& outputProtocolFactory)
-  : TServer(processor,
-            serverTransport,
-            inputTransportFactory,
-            outputTransportFactory,
-            inputProtocolFactory,
-            outputProtocolFactory),
-    clients_(0),
-    hwm_(0),
-    limit_(INT64_MAX) {
-}
-
-TServerFramework::~TServerFramework() {
-}
-
-template <typename T>
-static void releaseOneDescriptor(const string& name, T& pTransport) {
-  if (pTransport) {
-    try {
-      pTransport->close();
-    } catch (const TTransportException& ttx) {
-      string errStr = string("TServerFramework " + name + " close failed: ") + ttx.what();
-      GlobalOutput(errStr.c_str());
-    }
-  }
-}
-
-void TServerFramework::serve() {
-  shared_ptr<TTransport> client;
-  shared_ptr<TTransport> inputTransport;
-  shared_ptr<TTransport> outputTransport;
-  shared_ptr<TProtocol> inputProtocol;
-  shared_ptr<TProtocol> outputProtocol;
-
-  // Start the server listening
-  serverTransport_->listen();
-
-  // Run the preServe event to indicate server is now listening
-  // and that it is safe to connect.
-  if (eventHandler_) {
-    eventHandler_->preServe();
-  }
-
-  // Fetch client from server
-  for (;;) {
-    try {
-      // Dereference any resources from any previous client creation
-      // such that a blocking accept does not hold them indefinitely.
-      outputProtocol.reset();
-      inputProtocol.reset();
-      outputTransport.reset();
-      inputTransport.reset();
-      client.reset();
-
-      // If we have reached the limit on the number of concurrent
-      // clients allowed, wait for one or more clients to drain before
-      // accepting another.
-      {
-        Synchronized sync(mon_);
-        while (clients_ >= limit_) {
-          mon_.wait();
-        }
-      }
-
-      client = serverTransport_->accept();
-
-      inputTransport = inputTransportFactory_->getTransport(client);
-      outputTransport = outputTransportFactory_->getTransport(client);
-      if (!outputProtocolFactory_) {
-        inputProtocol = inputProtocolFactory_->getProtocol(inputTransport, outputTransport);
-        outputProtocol = inputProtocol;
-      } else {
-        inputProtocol = inputProtocolFactory_->getProtocol(inputTransport);
-        outputProtocol = outputProtocolFactory_->getProtocol(outputTransport);
-      }
-
-      newlyConnectedClient(shared_ptr<TConnectedClient>(
-          new TConnectedClient(getProcessor(inputProtocol, outputProtocol, client),
-                               inputProtocol,
-                               outputProtocol,
-                               eventHandler_,
-                               client),
-          bind(&TServerFramework::disposeConnectedClient, this, _1)));
-
-    } catch (TTransportException& ttx) {
-      releaseOneDescriptor("inputTransport", inputTransport);
-      releaseOneDescriptor("outputTransport", outputTransport);
-      releaseOneDescriptor("client", client);
-      if (ttx.getType() == TTransportException::TIMED_OUT) {
-        // Accept timeout - continue processing.
-        continue;
-      } else if (ttx.getType() == TTransportException::END_OF_FILE
-                 || ttx.getType() == TTransportException::INTERRUPTED) {
-        // Server was interrupted.  This only happens when stopping.
-        break;
-      } else {
-        // All other transport exceptions are logged.
-        // State of connection is unknown.  Done.
-        string errStr = string("TServerTransport died: ") + ttx.what();
-        GlobalOutput(errStr.c_str());
-        break;
-      }
-    }
-  }
-
-  releaseOneDescriptor("serverTransport", serverTransport_);
-}
-
-int64_t TServerFramework::getConcurrentClientLimit() const {
-  Synchronized sync(mon_);
-  return limit_;
-}
-
-int64_t TServerFramework::getConcurrentClientCount() const {
-  Synchronized sync(mon_);
-  return clients_;
-}
-
-int64_t TServerFramework::getConcurrentClientCountHWM() const {
-  Synchronized sync(mon_);
-  return hwm_;
-}
-
-void TServerFramework::setConcurrentClientLimit(int64_t newLimit) {
-  if (newLimit < 1) {
-    throw std::invalid_argument("newLimit must be greater than zero");
-  }
-  Synchronized sync(mon_);
-  limit_ = newLimit;
-  if (limit_ - clients_ > 0) {
-    mon_.notify();
-  }
-}
-
-void TServerFramework::stop() {
-  // Order is important because serve() releases serverTransport_ when it is
-  // interrupted, which closes the socket that interruptChildren uses.
-  serverTransport_->interruptChildren();
-  serverTransport_->interrupt();
-}
-
-void TServerFramework::newlyConnectedClient(const boost::shared_ptr<TConnectedClient>& pClient) {
-  {
-    Synchronized sync(mon_);
-    ++clients_;
-    hwm_ = (std::max)(hwm_, clients_);
-  }
-
-  onClientConnected(pClient);
-}
-
-void TServerFramework::disposeConnectedClient(TConnectedClient* pClient) {
-  onClientDisconnected(pClient);
-  delete pClient;
-
-  Synchronized sync(mon_);
-  if (limit_ - --clients_ > 0) {
-    mon_.notify();
-  }
-}
-
-}
-}
-} // apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServerFramework.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServerFramework.h
deleted file mode 100644
index 53d9bfd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TServerFramework.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TSERVERFRAMEWORK_H_
-#define _THRIFT_SERVER_TSERVERFRAMEWORK_H_ 1
-
-#include <boost/shared_ptr.hpp>
-#include <stdint.h>
-#include <thrift/TProcessor.h>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/server/TConnectedClient.h>
-#include <thrift/server/TServer.h>
-#include <thrift/transport/TServerTransport.h>
-#include <thrift/transport/TTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-/**
- * TServerFramework provides a single consolidated processing loop for
- * servers.  By having a single processing loop, behavior between servers
- * is more predictable and maintenance cost is lowered.  Implementations
- * of TServerFramework must provide a method to deal with a client that
- * connects and one that disconnects.
- *
- * While this functionality could be rolled directly into TServer, and
- * probably should be, it would break the TServer interface contract so
- * to maintain backwards compatibility for third party servers, no TServers
- * were harmed in the making of this class.
- */
-class TServerFramework : public TServer {
-public:
-  TServerFramework(
-      const boost::shared_ptr<apache::thrift::TProcessorFactory>& processorFactory,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& transportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& protocolFactory);
-
-  TServerFramework(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& transportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& protocolFactory);
-
-  TServerFramework(
-      const boost::shared_ptr<apache::thrift::TProcessorFactory>& processorFactory,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& inputTransportFactory,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& outputTransportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& inputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& outputProtocolFactory);
-
-  TServerFramework(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& inputTransportFactory,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& outputTransportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& inputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& outputProtocolFactory);
-
-  virtual ~TServerFramework();
-
-  /**
-   * Accept clients from the TServerTransport and add them for processing.
-   * Call stop() on another thread to interrupt processing
-   * and return control to the caller.
-   * Post-conditions (return guarantees):
-   *   The serverTransport will be closed.
-   */
-  virtual void serve();
-
-  /**
-   * Interrupt serve() so that it meets post-conditions and returns.
-   */
-  virtual void stop();
-
-  /**
-   * Get the concurrent client limit.
-   * \returns the concurrent client limit
-   */
-  virtual int64_t getConcurrentClientLimit() const;
-
-  /**
-   * Get the number of currently connected clients.
-   * \returns the number of currently connected clients
-   */
-  virtual int64_t getConcurrentClientCount() const;
-
-  /**
-   * Get the highest number of concurrent clients.
-   * \returns the highest number of concurrent clients
-   */
-  virtual int64_t getConcurrentClientCountHWM() const;
-
-  /**
-   * Set the concurrent client limit.  This can be changed while
-   * the server is serving however it will not necessarily be
-   * enforced until the next client is accepted and added.  If the
-   * limit is lowered below the number of connected clients, no
-   * action is taken to disconnect the clients.
-   * The default value used if this is not called is INT64_MAX.
-   * \param[in]  newLimit  the new limit of concurrent clients
-   * \throws std::invalid_argument if newLimit is less than 1
-   */
-  virtual void setConcurrentClientLimit(int64_t newLimit);
-
-protected:
-  /**
-   * A client has connected.  The implementation is responsible for managing the
-   * lifetime of the client object.  This is called during the serve() thread,
-   * therefore a failure to return quickly will result in new client connection
-   * delays.
-   *
-   * \param[in]  pClient  the newly connected client
-   */
-  virtual void onClientConnected(const boost::shared_ptr<TConnectedClient>& pClient) = 0;
-
-  /**
-   * A client has disconnected.
-   * When called:
-   *   The server no longer tracks the client.
-   *   The client TTransport has already been closed.
-   *   The implementation must not delete the pointer.
-   *
-   * \param[in]  pClient  the disconnected client
-   */
-  virtual void onClientDisconnected(TConnectedClient* pClient) = 0;
-
-private:
-  /**
-   * Common handling for new connected clients.  Implements concurrent
-   * client rate limiting after onClientConnected returns by blocking the
-   * serve() thread if the limit has been reached.
-   */
-  void newlyConnectedClient(const boost::shared_ptr<TConnectedClient>& pClient);
-
-  /**
-   * Smart pointer client deletion.
-   * Calls onClientDisconnected and then deletes pClient.
-   */
-  void disposeConnectedClient(TConnectedClient* pClient);
-
-  /**
-   * Monitor for limiting the number of concurrent clients.
-   */
-  apache::thrift::concurrency::Monitor mon_;
-
-  /**
-   * The number of concurrent clients.
-   */
-  int64_t clients_;
-
-  /**
-   * The high water mark of concurrent clients.
-   */
-  int64_t hwm_;
-
-  /**
-   * The limit on the number of concurrent clients.
-   */
-  int64_t limit_;
-};
-}
-}
-} // apache::thrift::server
-
-#endif // #ifndef _THRIFT_SERVER_TSERVERFRAMEWORK_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TSimpleServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TSimpleServer.cpp
deleted file mode 100644
index 2f69ff4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TSimpleServer.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/server/TSimpleServer.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::protocol::TProtocolFactory;
-using apache::thrift::transport::TServerTransport;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TTransportFactory;
-using boost::shared_ptr;
-using std::string;
-
-TSimpleServer::TSimpleServer(const shared_ptr<TProcessorFactory>& processorFactory,
-                             const shared_ptr<TServerTransport>& serverTransport,
-                             const shared_ptr<TTransportFactory>& transportFactory,
-                             const shared_ptr<TProtocolFactory>& protocolFactory)
-  : TServerFramework(processorFactory, serverTransport, transportFactory, protocolFactory) {
-  TServerFramework::setConcurrentClientLimit(1);
-}
-
-TSimpleServer::TSimpleServer(const shared_ptr<TProcessor>& processor,
-                             const shared_ptr<TServerTransport>& serverTransport,
-                             const shared_ptr<TTransportFactory>& transportFactory,
-                             const shared_ptr<TProtocolFactory>& protocolFactory)
-  : TServerFramework(processor, serverTransport, transportFactory, protocolFactory) {
-  TServerFramework::setConcurrentClientLimit(1);
-}
-
-TSimpleServer::TSimpleServer(const shared_ptr<TProcessorFactory>& processorFactory,
-                             const shared_ptr<TServerTransport>& serverTransport,
-                             const shared_ptr<TTransportFactory>& inputTransportFactory,
-                             const shared_ptr<TTransportFactory>& outputTransportFactory,
-                             const shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                             const shared_ptr<TProtocolFactory>& outputProtocolFactory)
-  : TServerFramework(processorFactory,
-                     serverTransport,
-                     inputTransportFactory,
-                     outputTransportFactory,
-                     inputProtocolFactory,
-                     outputProtocolFactory) {
-  TServerFramework::setConcurrentClientLimit(1);
-}
-
-TSimpleServer::TSimpleServer(const shared_ptr<TProcessor>& processor,
-                             const shared_ptr<TServerTransport>& serverTransport,
-                             const shared_ptr<TTransportFactory>& inputTransportFactory,
-                             const shared_ptr<TTransportFactory>& outputTransportFactory,
-                             const shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                             const shared_ptr<TProtocolFactory>& outputProtocolFactory)
-  : TServerFramework(processor,
-                     serverTransport,
-                     inputTransportFactory,
-                     outputTransportFactory,
-                     inputProtocolFactory,
-                     outputProtocolFactory) {
-  TServerFramework::setConcurrentClientLimit(1);
-}
-
-TSimpleServer::~TSimpleServer() {
-}
-
-/**
- * The main body of customized implementation for TSimpleServer is quite simple:
- * When a client connects, use the serve() thread to drive it to completion thus
- * blocking new connections.
- */
-void TSimpleServer::onClientConnected(const shared_ptr<TConnectedClient>& pClient) {
-  pClient->run();
-}
-
-/**
- * TSimpleServer does not track clients so there is nothing to do here.
- */
-void TSimpleServer::onClientDisconnected(TConnectedClient*) {
-}
-
-/**
- * This makes little sense to the simple server because it is not capable
- * of having more than one client at a time, so we hide it.
- */
-void TSimpleServer::setConcurrentClientLimit(int64_t) {
-}
-}
-}
-} // apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TSimpleServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TSimpleServer.h
deleted file mode 100644
index 391fbec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TSimpleServer.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TSIMPLESERVER_H_
-#define _THRIFT_SERVER_TSIMPLESERVER_H_ 1
-
-#include <thrift/server/TServerFramework.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-/**
- * This is the most basic simple server. It is single-threaded and runs a
- * continuous loop of accepting a single connection, processing requests on
- * that connection until it closes, and then repeating.
- */
-class TSimpleServer : public TServerFramework {
-public:
-  TSimpleServer(
-      const boost::shared_ptr<apache::thrift::TProcessorFactory>& processorFactory,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& transportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& protocolFactory);
-
-  TSimpleServer(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& transportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& protocolFactory);
-
-  TSimpleServer(
-      const boost::shared_ptr<apache::thrift::TProcessorFactory>& processorFactory,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& inputTransportFactory,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& outputTransportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& inputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& outputProtocolFactory);
-
-  TSimpleServer(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& inputTransportFactory,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& outputTransportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& inputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& outputProtocolFactory);
-
-  virtual ~TSimpleServer();
-
-protected:
-  virtual void onClientConnected(const boost::shared_ptr<TConnectedClient>& pClient) /* override */;
-  virtual void onClientDisconnected(TConnectedClient* pClient) /* override */;
-
-private:
-  void setConcurrentClientLimit(int64_t newLimit); // hide
-};
-}
-}
-} // apache::thrift::server
-
-#endif // #ifndef _THRIFT_SERVER_TSIMPLESERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadPoolServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadPoolServer.cpp
deleted file mode 100644
index 63af85c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadPoolServer.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/server/TThreadPoolServer.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-using apache::thrift::concurrency::ThreadManager;
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::protocol::TProtocolFactory;
-using apache::thrift::transport::TServerTransport;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TTransportFactory;
-using boost::shared_ptr;
-using std::string;
-
-TThreadPoolServer::TThreadPoolServer(const shared_ptr<TProcessorFactory>& processorFactory,
-                                     const shared_ptr<TServerTransport>& serverTransport,
-                                     const shared_ptr<TTransportFactory>& transportFactory,
-                                     const shared_ptr<TProtocolFactory>& protocolFactory,
-                                     const shared_ptr<ThreadManager>& threadManager)
-  : TServerFramework(processorFactory, serverTransport, transportFactory, protocolFactory),
-    threadManager_(threadManager),
-    timeout_(0),
-    taskExpiration_(0) {
-}
-
-TThreadPoolServer::TThreadPoolServer(const shared_ptr<TProcessor>& processor,
-                                     const shared_ptr<TServerTransport>& serverTransport,
-                                     const shared_ptr<TTransportFactory>& transportFactory,
-                                     const shared_ptr<TProtocolFactory>& protocolFactory,
-                                     const shared_ptr<ThreadManager>& threadManager)
-  : TServerFramework(processor, serverTransport, transportFactory, protocolFactory),
-    threadManager_(threadManager),
-    timeout_(0),
-    taskExpiration_(0) {
-}
-
-TThreadPoolServer::TThreadPoolServer(const shared_ptr<TProcessorFactory>& processorFactory,
-                                     const shared_ptr<TServerTransport>& serverTransport,
-                                     const shared_ptr<TTransportFactory>& inputTransportFactory,
-                                     const shared_ptr<TTransportFactory>& outputTransportFactory,
-                                     const shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                                     const shared_ptr<TProtocolFactory>& outputProtocolFactory,
-                                     const shared_ptr<ThreadManager>& threadManager)
-  : TServerFramework(processorFactory,
-                     serverTransport,
-                     inputTransportFactory,
-                     outputTransportFactory,
-                     inputProtocolFactory,
-                     outputProtocolFactory),
-    threadManager_(threadManager),
-    timeout_(0),
-    taskExpiration_(0) {
-}
-
-TThreadPoolServer::TThreadPoolServer(const shared_ptr<TProcessor>& processor,
-                                     const shared_ptr<TServerTransport>& serverTransport,
-                                     const shared_ptr<TTransportFactory>& inputTransportFactory,
-                                     const shared_ptr<TTransportFactory>& outputTransportFactory,
-                                     const shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                                     const shared_ptr<TProtocolFactory>& outputProtocolFactory,
-                                     const shared_ptr<ThreadManager>& threadManager)
-  : TServerFramework(processor,
-                     serverTransport,
-                     inputTransportFactory,
-                     outputTransportFactory,
-                     inputProtocolFactory,
-                     outputProtocolFactory),
-    threadManager_(threadManager),
-    timeout_(0),
-    taskExpiration_(0) {
-}
-
-TThreadPoolServer::~TThreadPoolServer() {
-}
-
-void TThreadPoolServer::serve() {
-  TServerFramework::serve();
-  threadManager_->stop();
-}
-
-int64_t TThreadPoolServer::getTimeout() const {
-  return timeout_;
-}
-
-void TThreadPoolServer::setTimeout(int64_t value) {
-  timeout_ = value;
-}
-
-int64_t TThreadPoolServer::getTaskExpiration() const {
-  return taskExpiration_;
-}
-
-void TThreadPoolServer::setTaskExpiration(int64_t value) {
-  taskExpiration_ = value;
-}
-
-boost::shared_ptr<apache::thrift::concurrency::ThreadManager>
-TThreadPoolServer::getThreadManager() const {
-  return threadManager_;
-}
-
-void TThreadPoolServer::onClientConnected(const shared_ptr<TConnectedClient>& pClient) {
-  threadManager_->add(pClient, getTimeout(), getTaskExpiration());
-}
-
-void TThreadPoolServer::onClientDisconnected(TConnectedClient*) {
-}
-
-}
-}
-} // apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadPoolServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadPoolServer.h
deleted file mode 100644
index c750b8c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadPoolServer.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TTHREADPOOLSERVER_H_
-#define _THRIFT_SERVER_TTHREADPOOLSERVER_H_ 1
-
-#include <boost/atomic.hpp>
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/server/TServerFramework.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-/**
- * Manage clients using a thread pool.
- */
-class TThreadPoolServer : public TServerFramework {
-public:
-  TThreadPoolServer(
-      const boost::shared_ptr<apache::thrift::TProcessorFactory>& processorFactory,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& transportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& protocolFactory,
-      const boost::shared_ptr<apache::thrift::concurrency::ThreadManager>& threadManager
-      = apache::thrift::concurrency::ThreadManager::newSimpleThreadManager());
-
-  TThreadPoolServer(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& transportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& protocolFactory,
-      const boost::shared_ptr<apache::thrift::concurrency::ThreadManager>& threadManager
-      = apache::thrift::concurrency::ThreadManager::newSimpleThreadManager());
-
-  TThreadPoolServer(
-      const boost::shared_ptr<apache::thrift::TProcessorFactory>& processorFactory,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& inputTransportFactory,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& outputTransportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& inputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& outputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::concurrency::ThreadManager>& threadManager
-      = apache::thrift::concurrency::ThreadManager::newSimpleThreadManager());
-
-  TThreadPoolServer(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& inputTransportFactory,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& outputTransportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& inputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& outputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::concurrency::ThreadManager>& threadManager
-      = apache::thrift::concurrency::ThreadManager::newSimpleThreadManager());
-
-  virtual ~TThreadPoolServer();
-
-  /**
-   * Post-conditions (return guarantees):
-   *   There will be no clients connected.
-   */
-  virtual void serve();
-
-  virtual int64_t getTimeout() const;
-  virtual void setTimeout(int64_t value);
-
-  virtual int64_t getTaskExpiration() const;
-  virtual void setTaskExpiration(int64_t value);
-
-  virtual boost::shared_ptr<apache::thrift::concurrency::ThreadManager> getThreadManager() const;
-
-protected:
-  virtual void onClientConnected(const boost::shared_ptr<TConnectedClient>& pClient) /* override */;
-  virtual void onClientDisconnected(TConnectedClient* pClient) /* override */;
-
-  boost::shared_ptr<apache::thrift::concurrency::ThreadManager> threadManager_;
-  boost::atomic<int64_t> timeout_;
-  boost::atomic<int64_t> taskExpiration_;
-};
-
-}
-}
-} // apache::thrift::server
-
-#endif // #ifndef _THRIFT_SERVER_TTHREADPOOLSERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadedServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadedServer.cpp
deleted file mode 100644
index c413be1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadedServer.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/shared_ptr.hpp>
-#include <string>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/server/TThreadedServer.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-using apache::thrift::concurrency::Runnable;
-using apache::thrift::concurrency::Synchronized;
-using apache::thrift::concurrency::Thread;
-using apache::thrift::concurrency::ThreadFactory;
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::protocol::TProtocolFactory;
-using apache::thrift::transport::TServerTransport;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TTransportFactory;
-using boost::shared_ptr;
-
-TThreadedServer::TThreadedServer(const shared_ptr<TProcessorFactory>& processorFactory,
-                                 const shared_ptr<TServerTransport>& serverTransport,
-                                 const shared_ptr<TTransportFactory>& transportFactory,
-                                 const shared_ptr<TProtocolFactory>& protocolFactory,
-                                 const shared_ptr<ThreadFactory>& threadFactory)
-  : TServerFramework(processorFactory, serverTransport, transportFactory, protocolFactory),
-    threadFactory_(threadFactory) {
-}
-
-TThreadedServer::TThreadedServer(const shared_ptr<TProcessor>& processor,
-                                 const shared_ptr<TServerTransport>& serverTransport,
-                                 const shared_ptr<TTransportFactory>& transportFactory,
-                                 const shared_ptr<TProtocolFactory>& protocolFactory,
-                                 const shared_ptr<ThreadFactory>& threadFactory)
-  : TServerFramework(processor, serverTransport, transportFactory, protocolFactory),
-    threadFactory_(threadFactory) {
-}
-
-TThreadedServer::TThreadedServer(const shared_ptr<TProcessorFactory>& processorFactory,
-                                 const shared_ptr<TServerTransport>& serverTransport,
-                                 const shared_ptr<TTransportFactory>& inputTransportFactory,
-                                 const shared_ptr<TTransportFactory>& outputTransportFactory,
-                                 const shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                                 const shared_ptr<TProtocolFactory>& outputProtocolFactory,
-                                 const shared_ptr<ThreadFactory>& threadFactory)
-  : TServerFramework(processorFactory,
-                     serverTransport,
-                     inputTransportFactory,
-                     outputTransportFactory,
-                     inputProtocolFactory,
-                     outputProtocolFactory),
-    threadFactory_(threadFactory) {
-}
-
-TThreadedServer::TThreadedServer(const shared_ptr<TProcessor>& processor,
-                                 const shared_ptr<TServerTransport>& serverTransport,
-                                 const shared_ptr<TTransportFactory>& inputTransportFactory,
-                                 const shared_ptr<TTransportFactory>& outputTransportFactory,
-                                 const shared_ptr<TProtocolFactory>& inputProtocolFactory,
-                                 const shared_ptr<TProtocolFactory>& outputProtocolFactory,
-                                 const shared_ptr<ThreadFactory>& threadFactory)
-  : TServerFramework(processor,
-                     serverTransport,
-                     inputTransportFactory,
-                     outputTransportFactory,
-                     inputProtocolFactory,
-                     outputProtocolFactory),
-    threadFactory_(threadFactory) {
-}
-
-TThreadedServer::~TThreadedServer() {
-}
-
-void TThreadedServer::serve() {
-  TServerFramework::serve();
-
-  // Ensure post-condition of no active clients
-  Synchronized s(clientMonitor_);
-  while (!activeClientMap_.empty()) {
-    clientMonitor_.wait();
-  }
-
-  drainDeadClients();
-}
-
-void TThreadedServer::drainDeadClients() {
-  // we're in a monitor here
-  while (!deadClientMap_.empty()) {
-    ClientMap::iterator it = deadClientMap_.begin();
-    it->second->join();
-    deadClientMap_.erase(it);
-  }
-}
-
-void TThreadedServer::onClientConnected(const shared_ptr<TConnectedClient>& pClient) {
-  Synchronized sync(clientMonitor_);
-  boost::shared_ptr<TConnectedClientRunner> pRunnable = boost::make_shared<TConnectedClientRunner>(pClient);
-  boost::shared_ptr<Thread> pThread = threadFactory_->newThread(pRunnable);
-  pRunnable->thread(pThread);
-  activeClientMap_.insert(ClientMap::value_type(pClient.get(), pThread));
-  pThread->start();
-}
-
-void TThreadedServer::onClientDisconnected(TConnectedClient* pClient) {
-  Synchronized sync(clientMonitor_);
-  drainDeadClients(); // use the outgoing thread to do some maintenance on our dead client backlog
-  ClientMap::iterator it = activeClientMap_.find(pClient);
-  ClientMap::iterator end = it;
-  deadClientMap_.insert(it, ++end);
-  activeClientMap_.erase(it);
-  if (activeClientMap_.empty()) {
-    clientMonitor_.notify();
-  }
-}
-
-TThreadedServer::TConnectedClientRunner::TConnectedClientRunner(const boost::shared_ptr<TConnectedClient>& pClient)
-  : pClient_(pClient) {
-}
-
-TThreadedServer::TConnectedClientRunner::~TConnectedClientRunner() {
-}
-
-void TThreadedServer::TConnectedClientRunner::run() /* override */ {
-  pClient_->run();  // Run the client
-  pClient_.reset(); // The client is done - release it here rather than in the destructor for safety
-}
-
-}
-}
-} // apache::thrift::server
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadedServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadedServer.h
deleted file mode 100644
index 56da901..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/server/TThreadedServer.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_SERVER_TTHREADEDSERVER_H_
-#define _THRIFT_SERVER_TTHREADEDSERVER_H_ 1
-
-#include <map>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/concurrency/Thread.h>
-#include <thrift/server/TServerFramework.h>
-
-namespace apache {
-namespace thrift {
-namespace server {
-
-/**
- * Manage clients using threads - threads are created one for each client and are
- * released when the client disconnects.  This server is used to make a dynamically
- * scalable server up to the concurrent connection limit.
- */
-class TThreadedServer : public TServerFramework {
-public:
-  TThreadedServer(
-      const boost::shared_ptr<apache::thrift::TProcessorFactory>& processorFactory,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& transportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& protocolFactory,
-      const boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>& threadFactory
-      = boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>(
-          new apache::thrift::concurrency::PlatformThreadFactory(false)));
-
-  TThreadedServer(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& transportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& protocolFactory,
-      const boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>& threadFactory
-      = boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>(
-          new apache::thrift::concurrency::PlatformThreadFactory(false)));
-
-  TThreadedServer(
-      const boost::shared_ptr<apache::thrift::TProcessorFactory>& processorFactory,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& inputTransportFactory,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& outputTransportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& inputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& outputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>& threadFactory
-      = boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>(
-          new apache::thrift::concurrency::PlatformThreadFactory(false)));
-
-  TThreadedServer(
-      const boost::shared_ptr<apache::thrift::TProcessor>& processor,
-      const boost::shared_ptr<apache::thrift::transport::TServerTransport>& serverTransport,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& inputTransportFactory,
-      const boost::shared_ptr<apache::thrift::transport::TTransportFactory>& outputTransportFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& inputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::protocol::TProtocolFactory>& outputProtocolFactory,
-      const boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>& threadFactory
-      = boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>(
-          new apache::thrift::concurrency::PlatformThreadFactory(false)));
-
-  virtual ~TThreadedServer();
-
-  /**
-   * Post-conditions (return guarantees):
-   *   There will be no clients connected.
-   */
-  virtual void serve();
-
-protected:
-  /**
-   * Drain recently connected clients by joining their threads - this is done lazily because
-   * we cannot do it inside the thread context that is disconnecting.
-   */
-  virtual void drainDeadClients();
-
-  /**
-   * Implementation of TServerFramework::onClientConnected
-   */
-  virtual void onClientConnected(const boost::shared_ptr<TConnectedClient>& pClient) /* override */;
-
-  /**
-   * Implementation of TServerFramework::onClientDisconnected
-   */
-  virtual void onClientDisconnected(TConnectedClient *pClient) /* override */;
-
-  boost::shared_ptr<apache::thrift::concurrency::ThreadFactory> threadFactory_;
-
-  /**
-   * A helper wrapper used to wrap the client in something we can use to maintain
-   * the lifetime of the connected client within a detached thread.  We cannot simply
-   * track the threads because a shared_ptr<Thread> hangs on to the Runnable it is
-   * passed, and TServerFramework requires the runnable (TConnectedClient) to be
-   * destroyed in order to work properly.
-   */
-  class TConnectedClientRunner : public apache::thrift::concurrency::Runnable
-  {
-  public:
-    TConnectedClientRunner(const boost::shared_ptr<TConnectedClient>& pClient);
-    virtual ~TConnectedClientRunner();
-    void run() /* override */;
-  private:
-    boost::shared_ptr<TConnectedClient> pClient_;
-  };
-
-  apache::thrift::concurrency::Monitor clientMonitor_;
-
-  typedef std::map<TConnectedClient *, boost::shared_ptr<apache::thrift::concurrency::Thread> > ClientMap;
-
-  /**
-   * A map of active clients
-   */
-  ClientMap activeClientMap_;
-
-  /**
-   * A map of clients that have disconnected but their threads have not been joined
-   */
-  ClientMap deadClientMap_;
-};
-
-}
-}
-} // apache::thrift::server
-
-#endif // #ifndef _THRIFT_SERVER_TTHREADEDSERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/thrift-config.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/thrift-config.h
deleted file mode 100644
index d648706..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/thrift-config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifdef _WIN32
-#include <thrift/windows/config.h>
-#else
-#include <thrift/config.h>
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/PlatformSocket.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/PlatformSocket.h
deleted file mode 100644
index e7addd6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/PlatformSocket.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// clang-format off
-
-#ifndef _THRIFT_TRANSPORT_PLATFORM_SOCKET_H_
-#  define _THRIFT_TRANSPORT_PLATFORM_SOCKET_H_
-
-#ifdef _WIN32
-#  define THRIFT_GET_SOCKET_ERROR ::WSAGetLastError()
-#  define THRIFT_ERRNO (*_errno())
-#  define THRIFT_EINPROGRESS WSAEINPROGRESS
-#  define THRIFT_EAGAIN WSAEWOULDBLOCK
-#  define THRIFT_EINTR WSAEINTR
-#  define THRIFT_ECONNRESET WSAECONNRESET
-#  define THRIFT_ENOTCONN WSAENOTCONN
-#  define THRIFT_ETIMEDOUT WSAETIMEDOUT
-#  define THRIFT_EWOULDBLOCK WSAEWOULDBLOCK
-#  define THRIFT_EPIPE WSAECONNRESET
-#  define THRIFT_NO_SOCKET_CACHING SO_EXCLUSIVEADDRUSE
-#  define THRIFT_SOCKET SOCKET
-#  define THRIFT_INVALID_SOCKET INVALID_SOCKET
-#  define THRIFT_SOCKETPAIR thrift_socketpair
-#  define THRIFT_FCNTL thrift_fcntl
-#  define THRIFT_O_NONBLOCK 1
-#  define THRIFT_F_GETFL 0
-#  define THRIFT_F_SETFL 1
-#  define THRIFT_GETTIMEOFDAY thrift_gettimeofday
-#  define THRIFT_CLOSESOCKET closesocket
-#  define THRIFT_CLOSE _close
-#  define THRIFT_OPEN _open
-#  define THRIFT_FTRUNCATE _chsize_s
-#  define THRIFT_FSYNC _commit
-#  define THRIFT_LSEEK _lseek
-#  define THRIFT_WRITE _write
-#  define THRIFT_READ _read
-#  define THRIFT_FSTAT _fstat
-#  define THRIFT_STAT _stat
-#  ifdef _WIN32_WCE
-#    define THRIFT_GAI_STRERROR(...) thrift_wstr2str(gai_strerrorW(__VA_ARGS__))
-#  else
-#    define THRIFT_GAI_STRERROR gai_strerrorA
-#  endif
-#  define THRIFT_SSIZET ptrdiff_t
-#  if (_MSC_VER < 1900)
-#    define THRIFT_SNPRINTF _snprintf
-#  else
-#    define THRIFT_SNPRINTF snprintf
-#  endif
-#  define THRIFT_SLEEP_SEC thrift_sleep
-#  define THRIFT_SLEEP_USEC thrift_usleep
-#  define THRIFT_TIMESPEC thrift_timespec
-#  define THRIFT_CTIME_R thrift_ctime_r
-#  define THRIFT_POLL thrift_poll
-#  if WINVER <= 0x0502 //XP, Server2003
-#    define THRIFT_POLLFD  thrift_pollfd
-#    define THRIFT_POLLIN  0x0300
-#    define THRIFT_POLLOUT 0x0010
-#  else //Vista, Win7...
-#    define THRIFT_POLLFD  pollfd
-#    define THRIFT_POLLIN  POLLIN
-#    define THRIFT_POLLOUT POLLOUT
-#  endif //WINVER
-#  define THRIFT_SHUT_RDWR SD_BOTH
-#else //not _WIN32
-#  include <errno.h>
-#  define THRIFT_GET_SOCKET_ERROR errno
-#  define THRIFT_ERRNO errno
-#  define THRIFT_EINTR       EINTR
-#  define THRIFT_EINPROGRESS EINPROGRESS
-#  define THRIFT_ECONNRESET  ECONNRESET
-#  define THRIFT_ENOTCONN    ENOTCONN
-#  define THRIFT_ETIMEDOUT   ETIMEDOUT
-#  define THRIFT_EWOULDBLOCK EWOULDBLOCK
-#  define THRIFT_EAGAIN      EAGAIN
-#  define THRIFT_EPIPE       EPIPE
-#  define THRIFT_NO_SOCKET_CACHING SO_REUSEADDR
-#  define THRIFT_SOCKET int
-#  define THRIFT_INVALID_SOCKET (-1)
-#  define THRIFT_SOCKETPAIR socketpair
-#  define THRIFT_FCNTL fcntl
-#  define THRIFT_O_NONBLOCK O_NONBLOCK
-#  define THRIFT_F_GETFL F_GETFL
-#  define THRIFT_F_SETFL F_SETFL
-#  define THRIFT_GETTIMEOFDAY gettimeofday
-#  define THRIFT_CLOSESOCKET close
-#  define THRIFT_CLOSE close
-#  define THRIFT_OPEN open
-#  define THRIFT_FTRUNCATE ftruncate
-#  define THRIFT_FSYNC fsync
-#  define THRIFT_LSEEK lseek
-#  define THRIFT_WRITE write
-#  define THRIFT_READ read
-#  define THRIFT_STAT stat
-#  define THRIFT_FSTAT fstat
-#  define THRIFT_GAI_STRERROR gai_strerror
-#  define THRIFT_SSIZET ssize_t
-#  define THRIFT_SNPRINTF snprintf
-#  define THRIFT_SLEEP_SEC sleep
-#  define THRIFT_SLEEP_USEC usleep
-#  define THRIFT_TIMESPEC timespec
-#  define THRIFT_CTIME_R ctime_r
-#  define THRIFT_POLL poll
-#  define THRIFT_POLLFD  pollfd
-#  define THRIFT_POLLIN  POLLIN
-#  define THRIFT_POLLOUT POLLOUT
-#  define THRIFT_SHUT_RDWR SHUT_RDWR
-#endif
-
-#endif // _THRIFT_TRANSPORT_PLATFORM_SOCKET_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TBufferTransports.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TBufferTransports.cpp
deleted file mode 100644
index 700bdd5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TBufferTransports.cpp
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <cassert>
-#include <algorithm>
-
-#include <thrift/transport/TBufferTransports.h>
-
-using std::string;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-uint32_t TBufferedTransport::readSlow(uint8_t* buf, uint32_t len) {
-  uint32_t have = static_cast<uint32_t>(rBound_ - rBase_);
-
-  // We should only take the slow path if we can't satisfy the read
-  // with the data already in the buffer.
-  assert(have < len);
-
-  // If we have some data in the buffer, copy it out and return it.
-  // We have to return it without attempting to read more, since we aren't
-  // guaranteed that the underlying transport actually has more data, so
-  // attempting to read from it could block.
-  if (have > 0) {
-    memcpy(buf, rBase_, have);
-    setReadBuffer(rBuf_.get(), 0);
-    return have;
-  }
-
-  // No data is available in our buffer.
-  // Get more from underlying transport up to buffer size.
-  // Note that this makes a lot of sense if len < rBufSize_
-  // and almost no sense otherwise.  TODO(dreiss): Fix that
-  // case (possibly including some readv hotness).
-  setReadBuffer(rBuf_.get(), transport_->read(rBuf_.get(), rBufSize_));
-
-  // Hand over whatever we have.
-  uint32_t give = (std::min)(len, static_cast<uint32_t>(rBound_ - rBase_));
-  memcpy(buf, rBase_, give);
-  rBase_ += give;
-
-  return give;
-}
-
-void TBufferedTransport::writeSlow(const uint8_t* buf, uint32_t len) {
-  uint32_t have_bytes = static_cast<uint32_t>(wBase_ - wBuf_.get());
-  uint32_t space = static_cast<uint32_t>(wBound_ - wBase_);
-  // We should only take the slow path if we can't accommodate the write
-  // with the free space already in the buffer.
-  assert(wBound_ - wBase_ < static_cast<ptrdiff_t>(len));
-
-  // Now here's the tricky question: should we copy data from buf into our
-  // internal buffer and write it from there, or should we just write out
-  // the current internal buffer in one syscall and write out buf in another.
-  // If our currently buffered data plus buf is at least double our buffer
-  // size, we will have to do two syscalls no matter what (except in the
-  // degenerate case when our buffer is empty), so there is no use copying.
-  // Otherwise, there is sort of a sliding scale.  If we have N-1 bytes
-  // buffered and need to write 2, it would be crazy to do two syscalls.
-  // On the other hand, if we have 2 bytes buffered and are writing 2N-3,
-  // we can save a syscall in the short term by loading up our buffer, writing
-  // it out, and copying the rest of the bytes into our buffer.  Of course,
-  // if we get another 2-byte write, we haven't saved any syscalls at all,
-  // and have just copied nearly 2N bytes for nothing.  Finding a perfect
-  // policy would require predicting the size of future writes, so we're just
-  // going to always eschew syscalls if we have less than 2N bytes to write.
-
-  // The case where we have to do two syscalls.
-  // This case also covers the case where the buffer is empty,
-  // but it is clearer (I think) to think of it as two separate cases.
-  if ((have_bytes + len >= 2 * wBufSize_) || (have_bytes == 0)) {
-    // TODO(dreiss): writev
-    if (have_bytes > 0) {
-      transport_->write(wBuf_.get(), have_bytes);
-    }
-    transport_->write(buf, len);
-    wBase_ = wBuf_.get();
-    return;
-  }
-
-  // Fill up our internal buffer for a write.
-  memcpy(wBase_, buf, space);
-  buf += space;
-  len -= space;
-  transport_->write(wBuf_.get(), wBufSize_);
-
-  // Copy the rest into our buffer.
-  assert(len < wBufSize_);
-  memcpy(wBuf_.get(), buf, len);
-  wBase_ = wBuf_.get() + len;
-  return;
-}
-
-const uint8_t* TBufferedTransport::borrowSlow(uint8_t* buf, uint32_t* len) {
-  (void)buf;
-  (void)len;
-  // Simply return NULL.  We don't know if there is actually data available on
-  // the underlying transport, so calling read() might block.
-  return NULL;
-}
-
-void TBufferedTransport::flush() {
-  // Write out any data waiting in the write buffer.
-  uint32_t have_bytes = static_cast<uint32_t>(wBase_ - wBuf_.get());
-  if (have_bytes > 0) {
-    // Note that we reset wBase_ prior to the underlying write
-    // to ensure we're in a sane state (i.e. internal buffer cleaned)
-    // if the underlying write throws up an exception
-    wBase_ = wBuf_.get();
-    transport_->write(wBuf_.get(), have_bytes);
-  }
-
-  // Flush the underlying transport.
-  transport_->flush();
-}
-
-uint32_t TFramedTransport::readSlow(uint8_t* buf, uint32_t len) {
-  uint32_t want = len;
-  uint32_t have = static_cast<uint32_t>(rBound_ - rBase_);
-
-  // We should only take the slow path if we can't satisfy the read
-  // with the data already in the buffer.
-  assert(have < want);
-
-  // If we have some data in the buffer, copy it out and return it.
-  // We have to return it without attempting to read more, since we aren't
-  // guaranteed that the underlying transport actually has more data, so
-  // attempting to read from it could block.
-  if (have > 0) {
-    memcpy(buf, rBase_, have);
-    setReadBuffer(rBuf_.get(), 0);
-    return have;
-  }
-
-  // Read another frame.
-  if (!readFrame()) {
-    // EOF.  No frame available.
-    return 0;
-  }
-
-  // TODO(dreiss): Should we warn when reads cross frames?
-
-  // Hand over whatever we have.
-  uint32_t give = (std::min)(want, static_cast<uint32_t>(rBound_ - rBase_));
-  memcpy(buf, rBase_, give);
-  rBase_ += give;
-  want -= give;
-
-  return (len - want);
-}
-
-bool TFramedTransport::readFrame() {
-  // TODO(dreiss): Think about using readv here, even though it would
-  // result in (gasp) read-ahead.
-
-  // Read the size of the next frame.
-  // We can't use readAll(&sz, sizeof(sz)), since that always throws an
-  // exception on EOF.  We want to throw an exception only if EOF occurs after
-  // partial size data.
-  int32_t sz = -1;
-  uint32_t size_bytes_read = 0;
-  while (size_bytes_read < sizeof(sz)) {
-    uint8_t* szp = reinterpret_cast<uint8_t*>(&sz) + size_bytes_read;
-    uint32_t bytes_read
-        = transport_->read(szp, static_cast<uint32_t>(sizeof(sz)) - size_bytes_read);
-    if (bytes_read == 0) {
-      if (size_bytes_read == 0) {
-        // EOF before any data was read.
-        return false;
-      } else {
-        // EOF after a partial frame header.  Raise an exception.
-        throw TTransportException(TTransportException::END_OF_FILE,
-                                  "No more data to read after "
-                                  "partial frame header.");
-      }
-    }
-    size_bytes_read += bytes_read;
-  }
-
-  sz = ntohl(sz);
-
-  if (sz < 0) {
-    throw TTransportException("Frame size has negative value");
-  }
-
-  // Check for oversized frame
-  if (sz > static_cast<int32_t>(maxFrameSize_))
-    throw TTransportException(TTransportException::CORRUPTED_DATA, "Received an oversized frame");
-
-  // Read the frame payload, and reset markers.
-  if (sz > static_cast<int32_t>(rBufSize_)) {
-    rBuf_.reset(new uint8_t[sz]);
-    rBufSize_ = sz;
-  }
-  transport_->readAll(rBuf_.get(), sz);
-  setReadBuffer(rBuf_.get(), sz);
-  return true;
-}
-
-void TFramedTransport::writeSlow(const uint8_t* buf, uint32_t len) {
-  // Double buffer size until sufficient.
-  uint32_t have = static_cast<uint32_t>(wBase_ - wBuf_.get());
-  uint32_t new_size = wBufSize_;
-  if (len + have < have /* overflow */ || len + have > 0x7fffffff) {
-    throw TTransportException(TTransportException::BAD_ARGS,
-                              "Attempted to write over 2 GB to TFramedTransport.");
-  }
-  while (new_size < len + have) {
-    new_size = new_size > 0 ? new_size * 2 : 1;
-  }
-
-  // TODO(dreiss): Consider modifying this class to use malloc/free
-  // so we can use realloc here.
-
-  // Allocate new buffer.
-  uint8_t* new_buf = new uint8_t[new_size];
-
-  // Copy the old buffer to the new one.
-  memcpy(new_buf, wBuf_.get(), have);
-
-  // Now point buf to the new one.
-  wBuf_.reset(new_buf);
-  wBufSize_ = new_size;
-  wBase_ = wBuf_.get() + have;
-  wBound_ = wBuf_.get() + wBufSize_;
-
-  // Copy the data into the new buffer.
-  memcpy(wBase_, buf, len);
-  wBase_ += len;
-}
-
-void TFramedTransport::flush() {
-  int32_t sz_hbo, sz_nbo;
-  assert(wBufSize_ > sizeof(sz_nbo));
-
-  // Slip the frame size into the start of the buffer.
-  sz_hbo = static_cast<uint32_t>(wBase_ - (wBuf_.get() + sizeof(sz_nbo)));
-  sz_nbo = (int32_t)htonl((uint32_t)(sz_hbo));
-  memcpy(wBuf_.get(), (uint8_t*)&sz_nbo, sizeof(sz_nbo));
-
-  if (sz_hbo > 0) {
-    // Note that we reset wBase_ (with a pad for the frame size)
-    // prior to the underlying write to ensure we're in a sane state
-    // (i.e. internal buffer cleaned) if the underlying write throws
-    // up an exception
-    wBase_ = wBuf_.get() + sizeof(sz_nbo);
-
-    // Write size and frame body.
-    transport_->write(wBuf_.get(), static_cast<uint32_t>(sizeof(sz_nbo)) + sz_hbo);
-  }
-
-  // Flush the underlying transport.
-  transport_->flush();
-
-  // reclaim write buffer
-  if (wBufSize_ > bufReclaimThresh_) {
-    wBufSize_ = DEFAULT_BUFFER_SIZE;
-    wBuf_.reset(new uint8_t[wBufSize_]);
-    setWriteBuffer(wBuf_.get(), wBufSize_);
-
-    // reset wBase_ with a pad for the frame size
-    int32_t pad = 0;
-    wBase_ = wBuf_.get() + sizeof(pad);
-  }
-}
-
-uint32_t TFramedTransport::writeEnd() {
-  return static_cast<uint32_t>(wBase_ - wBuf_.get());
-}
-
-const uint8_t* TFramedTransport::borrowSlow(uint8_t* buf, uint32_t* len) {
-  (void)buf;
-  (void)len;
-  // Don't try to be clever with shifting buffers.
-  // If the fast path failed let the protocol use its slow path.
-  // Besides, who is going to try to borrow across messages?
-  return NULL;
-}
-
-uint32_t TFramedTransport::readEnd() {
-  // include framing bytes
-  uint32_t bytes_read = static_cast<uint32_t>(rBound_ - rBuf_.get() + sizeof(uint32_t));
-
-  if (rBufSize_ > bufReclaimThresh_) {
-    rBufSize_ = 0;
-    rBuf_.reset();
-    setReadBuffer(rBuf_.get(), rBufSize_);
-  }
-
-  return bytes_read;
-}
-
-void TMemoryBuffer::computeRead(uint32_t len, uint8_t** out_start, uint32_t* out_give) {
-  // Correct rBound_ so we can use the fast path in the future.
-  rBound_ = wBase_;
-
-  // Decide how much to give.
-  uint32_t give = (std::min)(len, available_read());
-
-  *out_start = rBase_;
-  *out_give = give;
-
-  // Preincrement rBase_ so the caller doesn't have to.
-  rBase_ += give;
-}
-
-uint32_t TMemoryBuffer::readSlow(uint8_t* buf, uint32_t len) {
-  uint8_t* start;
-  uint32_t give;
-  computeRead(len, &start, &give);
-
-  // Copy into the provided buffer.
-  memcpy(buf, start, give);
-
-  return give;
-}
-
-uint32_t TMemoryBuffer::readAppendToString(std::string& str, uint32_t len) {
-  // Don't get some stupid assertion failure.
-  if (buffer_ == NULL) {
-    return 0;
-  }
-
-  uint8_t* start;
-  uint32_t give;
-  computeRead(len, &start, &give);
-
-  // Append to the provided string.
-  str.append((char*)start, give);
-
-  return give;
-}
-
-void TMemoryBuffer::ensureCanWrite(uint32_t len) {
-  // Check available space
-  uint32_t avail = available_write();
-  if (len <= avail) {
-    return;
-  }
-
-  if (!owner_) {
-    throw TTransportException("Insufficient space in external MemoryBuffer");
-  }
-
-  // Grow the buffer as necessary.
-  uint32_t new_size = bufferSize_;
-  while (len > avail) {
-    new_size = new_size > 0 ? new_size * 2 : 1;
-    avail = available_write() + (new_size - bufferSize_);
-  }
-
-  // Allocate into a new pointer so we don't bork ours if it fails.
-  uint8_t* new_buffer = static_cast<uint8_t*>(std::realloc(buffer_, new_size));
-  if (new_buffer == NULL) {
-    throw std::bad_alloc();
-  }
-
-  rBase_ = new_buffer + (rBase_ - buffer_);
-  rBound_ = new_buffer + (rBound_ - buffer_);
-  wBase_ = new_buffer + (wBase_ - buffer_);
-  wBound_ = new_buffer + new_size;
-  buffer_ = new_buffer;
-  bufferSize_ = new_size;
-}
-
-void TMemoryBuffer::writeSlow(const uint8_t* buf, uint32_t len) {
-  ensureCanWrite(len);
-
-  // Copy into the buffer and increment wBase_.
-  memcpy(wBase_, buf, len);
-  wBase_ += len;
-}
-
-void TMemoryBuffer::wroteBytes(uint32_t len) {
-  uint32_t avail = available_write();
-  if (len > avail) {
-    throw TTransportException("Client wrote more bytes than size of buffer.");
-  }
-  wBase_ += len;
-}
-
-const uint8_t* TMemoryBuffer::borrowSlow(uint8_t* buf, uint32_t* len) {
-  (void)buf;
-  rBound_ = wBase_;
-  if (available_read() >= *len) {
-    *len = available_read();
-    return rBase_;
-  }
-  return NULL;
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TBufferTransports.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TBufferTransports.h
deleted file mode 100644
index e690d0c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TBufferTransports.h
+++ /dev/null
@@ -1,718 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TBUFFERTRANSPORTS_H_
-#define _THRIFT_TRANSPORT_TBUFFERTRANSPORTS_H_ 1
-
-#include <cstdlib>
-#include <cstring>
-#include <limits>
-#include <boost/scoped_array.hpp>
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TVirtualTransport.h>
-
-#ifdef __GNUC__
-#define TDB_LIKELY(val) (__builtin_expect((val), 1))
-#define TDB_UNLIKELY(val) (__builtin_expect((val), 0))
-#else
-#define TDB_LIKELY(val) (val)
-#define TDB_UNLIKELY(val) (val)
-#endif
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Base class for all transports that use read/write buffers for performance.
- *
- * TBufferBase is designed to implement the fast-path "memcpy" style
- * operations that work in the common case.  It does so with small and
- * (eventually) nonvirtual, inlinable methods.  TBufferBase is an abstract
- * class.  Subclasses are expected to define the "slow path" operations
- * that have to be done when the buffers are full or empty.
- *
- */
-class TBufferBase : public TVirtualTransport<TBufferBase> {
-
-public:
-  /**
-   * Fast-path read.
-   *
-   * When we have enough data buffered to fulfill the read, we can satisfy it
-   * with a single memcpy, then adjust our internal pointers.  If the buffer
-   * is empty, we call out to our slow path, implemented by a subclass.
-   * This method is meant to eventually be nonvirtual and inlinable.
-   */
-  uint32_t read(uint8_t* buf, uint32_t len) {
-    uint8_t* new_rBase = rBase_ + len;
-    if (TDB_LIKELY(new_rBase <= rBound_)) {
-      std::memcpy(buf, rBase_, len);
-      rBase_ = new_rBase;
-      return len;
-    }
-    return readSlow(buf, len);
-  }
-
-  /**
-   * Shortcutted version of readAll.
-   */
-  uint32_t readAll(uint8_t* buf, uint32_t len) {
-    uint8_t* new_rBase = rBase_ + len;
-    if (TDB_LIKELY(new_rBase <= rBound_)) {
-      std::memcpy(buf, rBase_, len);
-      rBase_ = new_rBase;
-      return len;
-    }
-    return apache::thrift::transport::readAll(*this, buf, len);
-  }
-
-  /**
-   * Fast-path write.
-   *
-   * When we have enough empty space in our buffer to accommodate the write, we
-   * can satisfy it with a single memcpy, then adjust our internal pointers.
-   * If the buffer is full, we call out to our slow path, implemented by a
-   * subclass.  This method is meant to eventually be nonvirtual and
-   * inlinable.
-   */
-  void write(const uint8_t* buf, uint32_t len) {
-    uint8_t* new_wBase = wBase_ + len;
-    if (TDB_LIKELY(new_wBase <= wBound_)) {
-      std::memcpy(wBase_, buf, len);
-      wBase_ = new_wBase;
-      return;
-    }
-    writeSlow(buf, len);
-  }
-
-  /**
-   * Fast-path borrow.  A lot like the fast-path read.
-   */
-  const uint8_t* borrow(uint8_t* buf, uint32_t* len) {
-    if (TDB_LIKELY(static_cast<ptrdiff_t>(*len) <= rBound_ - rBase_)) {
-      // With strict aliasing, writing to len shouldn't force us to
-      // refetch rBase_ from memory.  TODO(dreiss): Verify this.
-      *len = static_cast<uint32_t>(rBound_ - rBase_);
-      return rBase_;
-    }
-    return borrowSlow(buf, len);
-  }
-
-  /**
-   * Consume doesn't require a slow path.
-   */
-  void consume(uint32_t len) {
-    if (TDB_LIKELY(static_cast<ptrdiff_t>(len) <= rBound_ - rBase_)) {
-      rBase_ += len;
-    } else {
-      throw TTransportException(TTransportException::BAD_ARGS, "consume did not follow a borrow.");
-    }
-  }
-
-protected:
-  /// Slow path read.
-  virtual uint32_t readSlow(uint8_t* buf, uint32_t len) = 0;
-
-  /// Slow path write.
-  virtual void writeSlow(const uint8_t* buf, uint32_t len) = 0;
-
-  /**
-   * Slow path borrow.
-   *
-   * POSTCONDITION: return == NULL || rBound_ - rBase_ >= *len
-   */
-  virtual const uint8_t* borrowSlow(uint8_t* buf, uint32_t* len) = 0;
-
-  /**
-   * Trivial constructor.
-   *
-   * Initialize pointers safely.  Constructing is not a very
-   * performance-sensitive operation, so it is okay to just leave it to
-   * the concrete class to set up pointers correctly.
-   */
-  TBufferBase() : rBase_(NULL), rBound_(NULL), wBase_(NULL), wBound_(NULL) {}
-
-  /// Convenience mutator for setting the read buffer.
-  void setReadBuffer(uint8_t* buf, uint32_t len) {
-    rBase_ = buf;
-    rBound_ = buf + len;
-  }
-
-  /// Convenience mutator for setting the write buffer.
-  void setWriteBuffer(uint8_t* buf, uint32_t len) {
-    wBase_ = buf;
-    wBound_ = buf + len;
-  }
-
-  virtual ~TBufferBase() {}
-
-  /// Reads begin here.
-  uint8_t* rBase_;
-  /// Reads may extend to just before here.
-  uint8_t* rBound_;
-
-  /// Writes begin here.
-  uint8_t* wBase_;
-  /// Writes may extend to just before here.
-  uint8_t* wBound_;
-};
-
-/**
- * Buffered transport. For reads it will read more data than is requested
- * and will serve future data out of a local buffer. For writes, data is
- * stored to an in memory buffer before being written out.
- *
- */
-class TBufferedTransport : public TVirtualTransport<TBufferedTransport, TBufferBase> {
-public:
-  static const int DEFAULT_BUFFER_SIZE = 512;
-
-  /// Use default buffer sizes.
-  TBufferedTransport(boost::shared_ptr<TTransport> transport)
-    : transport_(transport),
-      rBufSize_(DEFAULT_BUFFER_SIZE),
-      wBufSize_(DEFAULT_BUFFER_SIZE),
-      rBuf_(new uint8_t[rBufSize_]),
-      wBuf_(new uint8_t[wBufSize_]) {
-    initPointers();
-  }
-
-  /// Use specified buffer sizes.
-  TBufferedTransport(boost::shared_ptr<TTransport> transport, uint32_t sz)
-    : transport_(transport),
-      rBufSize_(sz),
-      wBufSize_(sz),
-      rBuf_(new uint8_t[rBufSize_]),
-      wBuf_(new uint8_t[wBufSize_]) {
-    initPointers();
-  }
-
-  /// Use specified read and write buffer sizes.
-  TBufferedTransport(boost::shared_ptr<TTransport> transport, uint32_t rsz, uint32_t wsz)
-    : transport_(transport),
-      rBufSize_(rsz),
-      wBufSize_(wsz),
-      rBuf_(new uint8_t[rBufSize_]),
-      wBuf_(new uint8_t[wBufSize_]) {
-    initPointers();
-  }
-
-  void open() { transport_->open(); }
-
-  bool isOpen() { return transport_->isOpen(); }
-
-  bool peek() {
-    if (rBase_ == rBound_) {
-      setReadBuffer(rBuf_.get(), transport_->read(rBuf_.get(), rBufSize_));
-    }
-    return (rBound_ > rBase_);
-  }
-
-  void close() {
-    flush();
-    transport_->close();
-  }
-
-  virtual uint32_t readSlow(uint8_t* buf, uint32_t len);
-
-  virtual void writeSlow(const uint8_t* buf, uint32_t len);
-
-  void flush();
-
-  /**
-   * Returns the origin of the underlying transport
-   */
-  virtual const std::string getOrigin() { return transport_->getOrigin(); }
-
-  /**
-   * The following behavior is currently implemented by TBufferedTransport,
-   * but that may change in a future version:
-   * 1/ If len is at most rBufSize_, borrow will never return NULL.
-   *    Depending on the underlying transport, it could throw an exception
-   *    or hang forever.
-   * 2/ Some borrow requests may copy bytes internally.  However,
-   *    if len is at most rBufSize_/2, none of the copied bytes
-   *    will ever have to be copied again.  For optimial performance,
-   *    stay under this limit.
-   */
-  virtual const uint8_t* borrowSlow(uint8_t* buf, uint32_t* len);
-
-  boost::shared_ptr<TTransport> getUnderlyingTransport() { return transport_; }
-
-  /*
-   * TVirtualTransport provides a default implementation of readAll().
-   * We want to use the TBufferBase version instead.
-   */
-  uint32_t readAll(uint8_t* buf, uint32_t len) { return TBufferBase::readAll(buf, len); }
-
-protected:
-  void initPointers() {
-    setReadBuffer(rBuf_.get(), 0);
-    setWriteBuffer(wBuf_.get(), wBufSize_);
-    // Write size never changes.
-  }
-
-  boost::shared_ptr<TTransport> transport_;
-
-  uint32_t rBufSize_;
-  uint32_t wBufSize_;
-  boost::scoped_array<uint8_t> rBuf_;
-  boost::scoped_array<uint8_t> wBuf_;
-};
-
-/**
- * Wraps a transport into a buffered one.
- *
- */
-class TBufferedTransportFactory : public TTransportFactory {
-public:
-  TBufferedTransportFactory() {}
-
-  virtual ~TBufferedTransportFactory() {}
-
-  /**
-   * Wraps the transport into a buffered one.
-   */
-  virtual boost::shared_ptr<TTransport> getTransport(boost::shared_ptr<TTransport> trans) {
-    return boost::shared_ptr<TTransport>(new TBufferedTransport(trans));
-  }
-};
-
-/**
- * Framed transport. All writes go into an in-memory buffer until flush is
- * called, at which point the transport writes the length of the entire
- * binary chunk followed by the data payload. This allows the receiver on the
- * other end to always do fixed-length reads.
- *
- */
-class TFramedTransport : public TVirtualTransport<TFramedTransport, TBufferBase> {
-public:
-  static const int DEFAULT_BUFFER_SIZE = 512;
-  static const int DEFAULT_MAX_FRAME_SIZE = 256 * 1024 * 1024;
-
-  /// Use default buffer sizes.
-  TFramedTransport()
-    : transport_(),
-      rBufSize_(0),
-      wBufSize_(DEFAULT_BUFFER_SIZE),
-      rBuf_(),
-      wBuf_(new uint8_t[wBufSize_]),
-      bufReclaimThresh_((std::numeric_limits<uint32_t>::max)()) {
-    initPointers();
-  }
-
-  TFramedTransport(boost::shared_ptr<TTransport> transport)
-    : transport_(transport),
-      rBufSize_(0),
-      wBufSize_(DEFAULT_BUFFER_SIZE),
-      rBuf_(),
-      wBuf_(new uint8_t[wBufSize_]),
-      bufReclaimThresh_((std::numeric_limits<uint32_t>::max)()),
-      maxFrameSize_(DEFAULT_MAX_FRAME_SIZE) {
-    initPointers();
-  }
-
-  TFramedTransport(boost::shared_ptr<TTransport> transport,
-                   uint32_t sz,
-                   uint32_t bufReclaimThresh = (std::numeric_limits<uint32_t>::max)())
-    : transport_(transport),
-      rBufSize_(0),
-      wBufSize_(sz),
-      rBuf_(),
-      wBuf_(new uint8_t[wBufSize_]),
-      bufReclaimThresh_(bufReclaimThresh),
-      maxFrameSize_(DEFAULT_MAX_FRAME_SIZE) {
-    initPointers();
-  }
-
-  void open() { transport_->open(); }
-
-  bool isOpen() { return transport_->isOpen(); }
-
-  bool peek() { return (rBase_ < rBound_) || transport_->peek(); }
-
-  void close() {
-    flush();
-    transport_->close();
-  }
-
-  virtual uint32_t readSlow(uint8_t* buf, uint32_t len);
-
-  virtual void writeSlow(const uint8_t* buf, uint32_t len);
-
-  virtual void flush();
-
-  uint32_t readEnd();
-
-  uint32_t writeEnd();
-
-  const uint8_t* borrowSlow(uint8_t* buf, uint32_t* len);
-
-  boost::shared_ptr<TTransport> getUnderlyingTransport() { return transport_; }
-
-  /*
-   * TVirtualTransport provides a default implementation of readAll().
-   * We want to use the TBufferBase version instead.
-   */
-  using TBufferBase::readAll;
-
-  /**
-   * Returns the origin of the underlying transport
-   */
-  virtual const std::string getOrigin() { return transport_->getOrigin(); }
-
-  /**
-   * Set the maximum size of the frame at read
-   */
-  void setMaxFrameSize(uint32_t maxFrameSize) { maxFrameSize_ = maxFrameSize; }
-
-  /**
-   * Get the maximum size of the frame at read
-   */
-  uint32_t getMaxFrameSize() { return maxFrameSize_; }
-
-protected:
-  /**
-   * Reads a frame of input from the underlying stream.
-   *
-   * Returns true if a frame was read successfully, or false on EOF.
-   * (Raises a TTransportException if EOF occurs after a partial frame.)
-   */
-  virtual bool readFrame();
-
-  void initPointers() {
-    setReadBuffer(NULL, 0);
-    setWriteBuffer(wBuf_.get(), wBufSize_);
-
-    // Pad the buffer so we can insert the size later.
-    int32_t pad = 0;
-    this->write((uint8_t*)&pad, sizeof(pad));
-  }
-
-  boost::shared_ptr<TTransport> transport_;
-
-  uint32_t rBufSize_;
-  uint32_t wBufSize_;
-  boost::scoped_array<uint8_t> rBuf_;
-  boost::scoped_array<uint8_t> wBuf_;
-  uint32_t bufReclaimThresh_;
-  uint32_t maxFrameSize_;
-};
-
-/**
- * Wraps a transport into a framed one.
- *
- */
-class TFramedTransportFactory : public TTransportFactory {
-public:
-  TFramedTransportFactory() {}
-
-  virtual ~TFramedTransportFactory() {}
-
-  /**
-   * Wraps the transport into a framed one.
-   */
-  virtual boost::shared_ptr<TTransport> getTransport(boost::shared_ptr<TTransport> trans) {
-    return boost::shared_ptr<TTransport>(new TFramedTransport(trans));
-  }
-};
-
-/**
- * A memory buffer is a tranpsort that simply reads from and writes to an
- * in memory buffer. Anytime you call write on it, the data is simply placed
- * into a buffer, and anytime you call read, data is read from that buffer.
- *
- * The buffers are allocated using C constructs malloc,realloc, and the size
- * doubles as necessary.  We've considered using scoped
- *
- */
-class TMemoryBuffer : public TVirtualTransport<TMemoryBuffer, TBufferBase> {
-private:
-  // Common initialization done by all constructors.
-  void initCommon(uint8_t* buf, uint32_t size, bool owner, uint32_t wPos) {
-    if (buf == NULL && size != 0) {
-      assert(owner);
-      buf = (uint8_t*)std::malloc(size);
-      if (buf == NULL) {
-        throw std::bad_alloc();
-      }
-    }
-
-    buffer_ = buf;
-    bufferSize_ = size;
-
-    rBase_ = buffer_;
-    rBound_ = buffer_ + wPos;
-    // TODO(dreiss): Investigate NULL-ing this if !owner.
-    wBase_ = buffer_ + wPos;
-    wBound_ = buffer_ + bufferSize_;
-
-    owner_ = owner;
-
-    // rBound_ is really an artifact.  In principle, it should always be
-    // equal to wBase_.  We update it in a few places (computeRead, etc.).
-  }
-
-public:
-  static const uint32_t defaultSize = 1024;
-
-  /**
-   * This enum specifies how a TMemoryBuffer should treat
-   * memory passed to it via constructors or resetBuffer.
-   *
-   * OBSERVE:
-   *   TMemoryBuffer will simply store a pointer to the memory.
-   *   It is the callers responsibility to ensure that the pointer
-   *   remains valid for the lifetime of the TMemoryBuffer,
-   *   and that it is properly cleaned up.
-   *   Note that no data can be written to observed buffers.
-   *
-   * COPY:
-   *   TMemoryBuffer will make an internal copy of the buffer.
-   *   The caller has no responsibilities.
-   *
-   * TAKE_OWNERSHIP:
-   *   TMemoryBuffer will become the "owner" of the buffer,
-   *   and will be responsible for freeing it.
-   *   The membory must have been allocated with malloc.
-   */
-  enum MemoryPolicy { OBSERVE = 1, COPY = 2, TAKE_OWNERSHIP = 3 };
-
-  /**
-   * Construct a TMemoryBuffer with a default-sized buffer,
-   * owned by the TMemoryBuffer object.
-   */
-  TMemoryBuffer() { initCommon(NULL, defaultSize, true, 0); }
-
-  /**
-   * Construct a TMemoryBuffer with a buffer of a specified size,
-   * owned by the TMemoryBuffer object.
-   *
-   * @param sz  The initial size of the buffer.
-   */
-  TMemoryBuffer(uint32_t sz) { initCommon(NULL, sz, true, 0); }
-
-  /**
-   * Construct a TMemoryBuffer with buf as its initial contents.
-   *
-   * @param buf    The initial contents of the buffer.
-   *               Note that, while buf is a non-const pointer,
-   *               TMemoryBuffer will not write to it if policy == OBSERVE,
-   *               so it is safe to const_cast<uint8_t*>(whatever).
-   * @param sz     The size of @c buf.
-   * @param policy See @link MemoryPolicy @endlink .
-   */
-  TMemoryBuffer(uint8_t* buf, uint32_t sz, MemoryPolicy policy = OBSERVE) {
-    if (buf == NULL && sz != 0) {
-      throw TTransportException(TTransportException::BAD_ARGS,
-                                "TMemoryBuffer given null buffer with non-zero size.");
-    }
-
-    switch (policy) {
-    case OBSERVE:
-    case TAKE_OWNERSHIP:
-      initCommon(buf, sz, policy == TAKE_OWNERSHIP, sz);
-      break;
-    case COPY:
-      initCommon(NULL, sz, true, 0);
-      this->write(buf, sz);
-      break;
-    default:
-      throw TTransportException(TTransportException::BAD_ARGS,
-                                "Invalid MemoryPolicy for TMemoryBuffer");
-    }
-  }
-
-  ~TMemoryBuffer() {
-    if (owner_) {
-      std::free(buffer_);
-    }
-  }
-
-  bool isOpen() { return true; }
-
-  bool peek() { return (rBase_ < wBase_); }
-
-  void open() {}
-
-  void close() {}
-
-  // TODO(dreiss): Make bufPtr const.
-  void getBuffer(uint8_t** bufPtr, uint32_t* sz) {
-    *bufPtr = rBase_;
-    *sz = static_cast<uint32_t>(wBase_ - rBase_);
-  }
-
-  std::string getBufferAsString() {
-    if (buffer_ == NULL) {
-      return "";
-    }
-    uint8_t* buf;
-    uint32_t sz;
-    getBuffer(&buf, &sz);
-    return std::string((char*)buf, (std::string::size_type)sz);
-  }
-
-  void appendBufferToString(std::string& str) {
-    if (buffer_ == NULL) {
-      return;
-    }
-    uint8_t* buf;
-    uint32_t sz;
-    getBuffer(&buf, &sz);
-    str.append((char*)buf, sz);
-  }
-
-  void resetBuffer() {
-    rBase_ = buffer_;
-    rBound_ = buffer_;
-    wBase_ = buffer_;
-    // It isn't safe to write into a buffer we don't own.
-    if (!owner_) {
-      wBound_ = wBase_;
-      bufferSize_ = 0;
-    }
-  }
-
-  /// See constructor documentation.
-  void resetBuffer(uint8_t* buf, uint32_t sz, MemoryPolicy policy = OBSERVE) {
-    // Use a variant of the copy-and-swap trick for assignment operators.
-    // This is sub-optimal in terms of performance for two reasons:
-    //   1/ The constructing and swapping of the (small) values
-    //      in the temporary object takes some time, and is not necessary.
-    //   2/ If policy == COPY, we allocate the new buffer before
-    //      freeing the old one, precluding the possibility of
-    //      reusing that memory.
-    // I doubt that either of these problems could be optimized away,
-    // but the second is probably no a common case, and the first is minor.
-    // I don't expect resetBuffer to be a common operation, so I'm willing to
-    // bite the performance bullet to make the method this simple.
-
-    // Construct the new buffer.
-    TMemoryBuffer new_buffer(buf, sz, policy);
-    // Move it into ourself.
-    this->swap(new_buffer);
-    // Our old self gets destroyed.
-  }
-
-  /// See constructor documentation.
-  void resetBuffer(uint32_t sz) {
-    // Construct the new buffer.
-    TMemoryBuffer new_buffer(sz);
-    // Move it into ourself.
-    this->swap(new_buffer);
-    // Our old self gets destroyed.
-  }
-
-  std::string readAsString(uint32_t len) {
-    std::string str;
-    (void)readAppendToString(str, len);
-    return str;
-  }
-
-  uint32_t readAppendToString(std::string& str, uint32_t len);
-
-  // return number of bytes read
-  uint32_t readEnd() {
-    // This cast should be safe, because buffer_'s size is a uint32_t
-    uint32_t bytes = static_cast<uint32_t>(rBase_ - buffer_);
-    if (rBase_ == wBase_) {
-      resetBuffer();
-    }
-    return bytes;
-  }
-
-  // Return number of bytes written
-  uint32_t writeEnd() {
-    // This cast should be safe, because buffer_'s size is a uint32_t
-    return static_cast<uint32_t>(wBase_ - buffer_);
-  }
-
-  uint32_t available_read() const {
-    // Remember, wBase_ is the real rBound_.
-    return static_cast<uint32_t>(wBase_ - rBase_);
-  }
-
-  uint32_t available_write() const { return static_cast<uint32_t>(wBound_ - wBase_); }
-
-  // Returns a pointer to where the client can write data to append to
-  // the TMemoryBuffer, and ensures the buffer is big enough to accommodate a
-  // write of the provided length.  The returned pointer is very convenient for
-  // passing to read(), recv(), or similar. You must call wroteBytes() as soon
-  // as data is written or the buffer will not be aware that data has changed.
-  uint8_t* getWritePtr(uint32_t len) {
-    ensureCanWrite(len);
-    return wBase_;
-  }
-
-  // Informs the buffer that the client has written 'len' bytes into storage
-  // that had been provided by getWritePtr().
-  void wroteBytes(uint32_t len);
-
-  /*
-   * TVirtualTransport provides a default implementation of readAll().
-   * We want to use the TBufferBase version instead.
-   */
-  uint32_t readAll(uint8_t* buf, uint32_t len) { return TBufferBase::readAll(buf, len); }
-
-protected:
-  void swap(TMemoryBuffer& that) {
-    using std::swap;
-    swap(buffer_, that.buffer_);
-    swap(bufferSize_, that.bufferSize_);
-
-    swap(rBase_, that.rBase_);
-    swap(rBound_, that.rBound_);
-    swap(wBase_, that.wBase_);
-    swap(wBound_, that.wBound_);
-
-    swap(owner_, that.owner_);
-  }
-
-  // Make sure there's at least 'len' bytes available for writing.
-  void ensureCanWrite(uint32_t len);
-
-  // Compute the position and available data for reading.
-  void computeRead(uint32_t len, uint8_t** out_start, uint32_t* out_give);
-
-  uint32_t readSlow(uint8_t* buf, uint32_t len);
-
-  void writeSlow(const uint8_t* buf, uint32_t len);
-
-  const uint8_t* borrowSlow(uint8_t* buf, uint32_t* len);
-
-  // Data buffer
-  uint8_t* buffer_;
-
-  // Allocated buffer size
-  uint32_t bufferSize_;
-
-  // Is this object the owner of the buffer?
-  bool owner_;
-
-  // Don't forget to update constrctors, initCommon, and swap if
-  // you add new members.
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TBUFFERTRANSPORTS_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFDTransport.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFDTransport.cpp
deleted file mode 100644
index 4bce3a8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFDTransport.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <cerrno>
-#include <exception>
-
-#include <thrift/transport/TFDTransport.h>
-#include <thrift/transport/PlatformSocket.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef _WIN32
-#include <io.h>
-#endif
-
-using namespace std;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-void TFDTransport::close() {
-  if (!isOpen()) {
-    return;
-  }
-
-  int rv = ::THRIFT_CLOSE(fd_);
-  int errno_copy = THRIFT_ERRNO;
-  fd_ = -1;
-  // Have to check uncaught_exception because this is called in the destructor.
-  if (rv < 0 && !std::uncaught_exception()) {
-    throw TTransportException(TTransportException::UNKNOWN, "TFDTransport::close()", errno_copy);
-  }
-}
-
-uint32_t TFDTransport::read(uint8_t* buf, uint32_t len) {
-  unsigned int maxRetries = 5; // same as the TSocket default
-  unsigned int retries = 0;
-  while (true) {
-    THRIFT_SSIZET rv = ::THRIFT_READ(fd_, buf, len);
-    if (rv < 0) {
-      if (THRIFT_ERRNO == THRIFT_EINTR && retries < maxRetries) {
-        // If interrupted, try again
-        ++retries;
-        continue;
-      }
-      int errno_copy = THRIFT_ERRNO;
-      throw TTransportException(TTransportException::UNKNOWN, "TFDTransport::read()", errno_copy);
-    }
-    // this should be fine, since we already checked for negative values,
-    // and ::read should only return a 32-bit value since len is 32-bit.
-    return static_cast<uint32_t>(rv);
-  }
-}
-
-void TFDTransport::write(const uint8_t* buf, uint32_t len) {
-  while (len > 0) {
-    THRIFT_SSIZET rv = ::THRIFT_WRITE(fd_, buf, len);
-
-    if (rv < 0) {
-      int errno_copy = THRIFT_ERRNO;
-      throw TTransportException(TTransportException::UNKNOWN, "TFDTransport::write()", errno_copy);
-    } else if (rv == 0) {
-      throw TTransportException(TTransportException::END_OF_FILE, "TFDTransport::write()");
-    }
-
-    buf += rv;
-    // this should be fine, as we've already checked for negative values, and
-    //::write shouldn't return more than a uint32_t since len is a uint32_t
-    len -= static_cast<uint32_t>(rv);
-  }
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFDTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFDTransport.h
deleted file mode 100644
index 5593d43..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFDTransport.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TFDTRANSPORT_H_
-#define _THRIFT_TRANSPORT_TFDTRANSPORT_H_ 1
-
-#include <string>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TVirtualTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Dead-simple wrapper around a file descriptor.
- *
- */
-class TFDTransport : public TVirtualTransport<TFDTransport> {
-public:
-  enum ClosePolicy { NO_CLOSE_ON_DESTROY = 0, CLOSE_ON_DESTROY = 1 };
-
-  TFDTransport(int fd, ClosePolicy close_policy = NO_CLOSE_ON_DESTROY)
-    : fd_(fd), close_policy_(close_policy) {}
-
-  ~TFDTransport() {
-    if (close_policy_ == CLOSE_ON_DESTROY) {
-      try {
-        close();
-      } catch (TTransportException& ex) {
-        GlobalOutput.printf("~TFDTransport TTransportException: '%s'", ex.what());
-      }
-    }
-  }
-
-  bool isOpen() { return fd_ >= 0; }
-
-  void open() {}
-
-  void close();
-
-  uint32_t read(uint8_t* buf, uint32_t len);
-
-  void write(const uint8_t* buf, uint32_t len);
-
-  void setFD(int fd) { fd_ = fd; }
-  int getFD() { return fd_; }
-
-protected:
-  int fd_;
-  ClosePolicy close_policy_;
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TFDTRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFileTransport.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFileTransport.cpp
deleted file mode 100644
index 85e88b9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFileTransport.cpp
+++ /dev/null
@@ -1,1069 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/transport/TFileTransport.h>
-#include <thrift/transport/TTransportUtils.h>
-#include <thrift/transport/PlatformSocket.h>
-#include <thrift/concurrency/FunctionRunner.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
-#include <limits>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef _WIN32
-#include <io.h>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using boost::scoped_ptr;
-using boost::shared_ptr;
-using namespace std;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::concurrency;
-
-TFileTransport::TFileTransport(string path, bool readOnly)
-  : readState_(),
-    readBuff_(NULL),
-    currentEvent_(NULL),
-    readBuffSize_(DEFAULT_READ_BUFF_SIZE),
-    readTimeout_(NO_TAIL_READ_TIMEOUT),
-    chunkSize_(DEFAULT_CHUNK_SIZE),
-    eventBufferSize_(DEFAULT_EVENT_BUFFER_SIZE),
-    flushMaxUs_(DEFAULT_FLUSH_MAX_US),
-    flushMaxBytes_(DEFAULT_FLUSH_MAX_BYTES),
-    maxEventSize_(DEFAULT_MAX_EVENT_SIZE),
-    maxCorruptedEvents_(DEFAULT_MAX_CORRUPTED_EVENTS),
-    eofSleepTime_(DEFAULT_EOF_SLEEP_TIME_US),
-    corruptedEventSleepTime_(DEFAULT_CORRUPTED_SLEEP_TIME_US),
-    writerThreadIOErrorSleepTime_(DEFAULT_WRITER_THREAD_SLEEP_TIME_US),
-    dequeueBuffer_(NULL),
-    enqueueBuffer_(NULL),
-    notFull_(&mutex_),
-    notEmpty_(&mutex_),
-    closing_(false),
-    flushed_(&mutex_),
-    forceFlush_(false),
-    filename_(path),
-    fd_(0),
-    bufferAndThreadInitialized_(false),
-    offset_(0),
-    lastBadChunk_(0),
-    numCorruptedEventsInChunk_(0),
-    readOnly_(readOnly) {
-  threadFactory_.setDetached(false);
-  openLogFile();
-}
-
-void TFileTransport::resetOutputFile(int fd, string filename, off_t offset) {
-  filename_ = filename;
-  offset_ = offset;
-
-  // check if current file is still open
-  if (fd_ > 0) {
-    // flush any events in the queue
-    flush();
-    GlobalOutput.printf("error, current file (%s) not closed", filename_.c_str());
-    if (-1 == ::THRIFT_CLOSE(fd_)) {
-      int errno_copy = THRIFT_ERRNO;
-      GlobalOutput.perror("TFileTransport: resetOutputFile() ::close() ", errno_copy);
-      throw TTransportException(TTransportException::UNKNOWN,
-                                "TFileTransport: error in file close",
-                                errno_copy);
-    } else {
-      // successfully closed fd
-      fd_ = 0;
-    }
-  }
-
-  if (fd) {
-    fd_ = fd;
-  } else {
-    // open file if the input fd is 0
-    openLogFile();
-  }
-}
-
-TFileTransport::~TFileTransport() {
-  // flush the buffer if a writer thread is active
-  if (writerThread_.get()) {
-    // set state to closing
-    closing_ = true;
-
-    // wake up the writer thread
-    // Since closing_ is true, it will attempt to flush all data, then exit.
-    notEmpty_.notify();
-
-    writerThread_->join();
-    writerThread_.reset();
-  }
-
-  if (dequeueBuffer_) {
-    delete dequeueBuffer_;
-    dequeueBuffer_ = NULL;
-  }
-
-  if (enqueueBuffer_) {
-    delete enqueueBuffer_;
-    enqueueBuffer_ = NULL;
-  }
-
-  if (readBuff_) {
-    delete[] readBuff_;
-    readBuff_ = NULL;
-  }
-
-  if (currentEvent_) {
-    delete currentEvent_;
-    currentEvent_ = NULL;
-  }
-
-  // close logfile
-  if (fd_ > 0) {
-    if (-1 == ::THRIFT_CLOSE(fd_)) {
-      GlobalOutput.perror("TFileTransport: ~TFileTransport() ::close() ", THRIFT_ERRNO);
-    } else {
-      // successfully closed fd
-      fd_ = 0;
-    }
-  }
-}
-
-bool TFileTransport::initBufferAndWriteThread() {
-  if (bufferAndThreadInitialized_) {
-    T_ERROR("%s", "Trying to double-init TFileTransport");
-    return false;
-  }
-
-  if (!writerThread_.get()) {
-    writerThread_ = threadFactory_.newThread(
-        apache::thrift::concurrency::FunctionRunner::create(startWriterThread, this));
-    writerThread_->start();
-  }
-
-  dequeueBuffer_ = new TFileTransportBuffer(eventBufferSize_);
-  enqueueBuffer_ = new TFileTransportBuffer(eventBufferSize_);
-  bufferAndThreadInitialized_ = true;
-
-  return true;
-}
-
-void TFileTransport::write(const uint8_t* buf, uint32_t len) {
-  if (readOnly_) {
-    throw TTransportException("TFileTransport: attempting to write to file opened readonly");
-  }
-
-  enqueueEvent(buf, len);
-}
-
-void TFileTransport::enqueueEvent(const uint8_t* buf, uint32_t eventLen) {
-  // can't enqueue more events if file is going to close
-  if (closing_) {
-    return;
-  }
-
-  // make sure that event size is valid
-  if ((maxEventSize_ > 0) && (eventLen > maxEventSize_)) {
-    T_ERROR("msg size is greater than max event size: %u > %u\n", eventLen, maxEventSize_);
-    return;
-  }
-
-  if (eventLen == 0) {
-    T_ERROR("%s", "cannot enqueue an empty event");
-    return;
-  }
-
-  std::auto_ptr<eventInfo> toEnqueue(new eventInfo());
-  toEnqueue->eventBuff_ = new uint8_t[(sizeof(uint8_t) * eventLen) + 4];
-
-  // first 4 bytes is the event length
-  memcpy(toEnqueue->eventBuff_, (void*)(&eventLen), 4);
-  // actual event contents
-  memcpy(toEnqueue->eventBuff_ + 4, buf, eventLen);
-  toEnqueue->eventSize_ = eventLen + 4;
-
-  // lock mutex
-  Guard g(mutex_);
-
-  // make sure that enqueue buffer is initialized and writer thread is running
-  if (!bufferAndThreadInitialized_) {
-    if (!initBufferAndWriteThread()) {
-      return;
-    }
-  }
-
-  // Can't enqueue while buffer is full
-  while (enqueueBuffer_->isFull()) {
-    notFull_.wait();
-  }
-
-  // We shouldn't be trying to enqueue new data while a forced flush is
-  // requested.  (Otherwise the writer thread might not ever be able to finish
-  // the flush if more data keeps being enqueued.)
-  assert(!forceFlush_);
-
-  // add to the buffer
-  eventInfo* pEvent = toEnqueue.release();
-  if (!enqueueBuffer_->addEvent(pEvent)) {
-    delete pEvent;
-    return;
-  }
-
-  // signal anybody who's waiting for the buffer to be non-empty
-  notEmpty_.notify();
-
-  // this really should be a loop where it makes sure it got flushed
-  // because condition variables can get triggered by the os for no reason
-  // it is probably a non-factor for the time being
-}
-
-bool TFileTransport::swapEventBuffers(struct timeval* deadline) {
-  bool swap;
-  Guard g(mutex_);
-
-  if (!enqueueBuffer_->isEmpty()) {
-    swap = true;
-  } else if (closing_) {
-    // even though there is no data to write,
-    // return immediately if the transport is closing
-    swap = false;
-  } else {
-    if (deadline != NULL) {
-      // if we were handed a deadline time struct, do a timed wait
-      notEmpty_.waitForTime(deadline);
-    } else {
-      // just wait until the buffer gets an item
-      notEmpty_.wait();
-    }
-
-    // could be empty if we timed out
-    swap = enqueueBuffer_->isEmpty();
-  }
-
-  if (swap) {
-    TFileTransportBuffer* temp = enqueueBuffer_;
-    enqueueBuffer_ = dequeueBuffer_;
-    dequeueBuffer_ = temp;
-  }
-
-  if (swap) {
-    notFull_.notify();
-  }
-
-  return swap;
-}
-
-void TFileTransport::writerThread() {
-  bool hasIOError = false;
-
-  // open file if it is not open
-  if (!fd_) {
-    try {
-      openLogFile();
-    } catch (...) {
-      int errno_copy = THRIFT_ERRNO;
-      GlobalOutput.perror("TFileTransport: writerThread() openLogFile() ", errno_copy);
-      fd_ = 0;
-      hasIOError = true;
-    }
-  }
-
-  // set the offset to the correct value (EOF)
-  if (!hasIOError) {
-    try {
-      seekToEnd();
-      // throw away any partial events
-      offset_ += readState_.lastDispatchPtr_;
-      if (0 == THRIFT_FTRUNCATE(fd_, offset_)) {
-        readState_.resetAllValues();
-      } else {
-        int errno_copy = THRIFT_ERRNO;
-        GlobalOutput.perror("TFileTransport: writerThread() truncate ", errno_copy);
-        hasIOError = true;
-      }
-    } catch (...) {
-      int errno_copy = THRIFT_ERRNO;
-      GlobalOutput.perror("TFileTransport: writerThread() initialization ", errno_copy);
-      hasIOError = true;
-    }
-  }
-
-  // Figure out the next time by which a flush must take place
-  struct timeval ts_next_flush;
-  getNextFlushTime(&ts_next_flush);
-  uint32_t unflushed = 0;
-
-  while (1) {
-    // this will only be true when the destructor is being invoked
-    if (closing_) {
-      if (hasIOError) {
-        return;
-      }
-
-      // Try to empty buffers before exit
-      if (enqueueBuffer_->isEmpty() && dequeueBuffer_->isEmpty()) {
-        ::THRIFT_FSYNC(fd_);
-        if (-1 == ::THRIFT_CLOSE(fd_)) {
-          int errno_copy = THRIFT_ERRNO;
-          GlobalOutput.perror("TFileTransport: writerThread() ::close() ", errno_copy);
-        } else {
-          // fd successfully closed
-          fd_ = 0;
-        }
-        return;
-      }
-    }
-
-    if (swapEventBuffers(&ts_next_flush)) {
-      eventInfo* outEvent;
-      while (NULL != (outEvent = dequeueBuffer_->getNext())) {
-        // Remove an event from the buffer and write it out to disk. If there is any IO error, for
-        // instance,
-        // the output file is unmounted or deleted, then this event is dropped. However, the writer
-        // thread
-        // will: (1) sleep for a short while; (2) try to reopen the file; (3) if successful then
-        // start writing
-        // from the end.
-
-        while (hasIOError) {
-          T_ERROR(
-              "TFileTransport: writer thread going to sleep for %d microseconds due to IO errors",
-              writerThreadIOErrorSleepTime_);
-          THRIFT_SLEEP_USEC(writerThreadIOErrorSleepTime_);
-          if (closing_) {
-            return;
-          }
-          if (!fd_) {
-            ::THRIFT_CLOSE(fd_);
-            fd_ = 0;
-          }
-          try {
-            openLogFile();
-            seekToEnd();
-            unflushed = 0;
-            hasIOError = false;
-            T_LOG_OPER(
-                "TFileTransport: log file %s reopened by writer thread during error recovery",
-                filename_.c_str());
-          } catch (...) {
-            T_ERROR("TFileTransport: unable to reopen log file %s during error recovery",
-                    filename_.c_str());
-          }
-        }
-
-        // sanity check on event
-        if ((maxEventSize_ > 0) && (outEvent->eventSize_ > maxEventSize_)) {
-          T_ERROR("msg size is greater than max event size: %u > %u\n",
-                  outEvent->eventSize_,
-                  maxEventSize_);
-          continue;
-        }
-
-        // If chunking is required, then make sure that msg does not cross chunk boundary
-        if ((outEvent->eventSize_ > 0) && (chunkSize_ != 0)) {
-          // event size must be less than chunk size
-          if (outEvent->eventSize_ > chunkSize_) {
-            T_ERROR("TFileTransport: event size(%u) > chunk size(%u): skipping event",
-                    outEvent->eventSize_,
-                    chunkSize_);
-            continue;
-          }
-
-          int64_t chunk1 = offset_ / chunkSize_;
-          int64_t chunk2 = (offset_ + outEvent->eventSize_ - 1) / chunkSize_;
-
-          // if adding this event will cross a chunk boundary, pad the chunk with zeros
-          if (chunk1 != chunk2) {
-            // refetch the offset to keep in sync
-            offset_ = THRIFT_LSEEK(fd_, 0, SEEK_CUR);
-            int32_t padding = (int32_t)((offset_ / chunkSize_ + 1) * chunkSize_ - offset_);
-
-            uint8_t* zeros = new uint8_t[padding];
-            memset(zeros, '\0', padding);
-            boost::scoped_array<uint8_t> array(zeros);
-            if (-1 == ::write(fd_, zeros, padding)) {
-              int errno_copy = THRIFT_ERRNO;
-              GlobalOutput.perror("TFileTransport: writerThread() error while padding zeros ",
-                                  errno_copy);
-              hasIOError = true;
-              continue;
-            }
-            unflushed += padding;
-            offset_ += padding;
-          }
-        }
-
-        // write the dequeued event to the file
-        if (outEvent->eventSize_ > 0) {
-          if (-1 == ::THRIFT_WRITE(fd_, outEvent->eventBuff_, outEvent->eventSize_)) {
-            int errno_copy = THRIFT_ERRNO;
-            GlobalOutput.perror("TFileTransport: error while writing event ", errno_copy);
-            hasIOError = true;
-            continue;
-          }
-          unflushed += outEvent->eventSize_;
-          offset_ += outEvent->eventSize_;
-        }
-      }
-      dequeueBuffer_->reset();
-    }
-
-    if (hasIOError) {
-      continue;
-    }
-
-    // Local variable to cache the state of forceFlush_.
-    //
-    // We only want to check the value of forceFlush_ once each time around the
-    // loop.  If we check it more than once without holding the lock the entire
-    // time, it could have changed state in between.  This will result in us
-    // making inconsistent decisions.
-    bool forced_flush = false;
-    {
-      Guard g(mutex_);
-      if (forceFlush_) {
-        if (!enqueueBuffer_->isEmpty()) {
-          // If forceFlush_ is true, we need to flush all available data.
-          // If enqueueBuffer_ is not empty, go back to the start of the loop to
-          // write it out.
-          //
-          // We know the main thread is waiting on forceFlush_ to be cleared,
-          // so no new events will be added to enqueueBuffer_ until we clear
-          // forceFlush_.  Therefore the next time around the loop enqueueBuffer_
-          // is guaranteed to be empty.  (I.e., we're guaranteed to make progress
-          // and clear forceFlush_ the next time around the loop.)
-          continue;
-        }
-        forced_flush = true;
-      }
-    }
-
-    // determine if we need to perform an fsync
-    bool flush = false;
-    if (forced_flush || unflushed > flushMaxBytes_) {
-      flush = true;
-    } else {
-      struct timeval current_time;
-      THRIFT_GETTIMEOFDAY(&current_time, NULL);
-      if (current_time.tv_sec > ts_next_flush.tv_sec
-          || (current_time.tv_sec == ts_next_flush.tv_sec
-              && current_time.tv_usec > ts_next_flush.tv_usec)) {
-        if (unflushed > 0) {
-          flush = true;
-        } else {
-          // If there is no new data since the last fsync,
-          // don't perform the fsync, but do reset the timer.
-          getNextFlushTime(&ts_next_flush);
-        }
-      }
-    }
-
-    if (flush) {
-      // sync (force flush) file to disk
-      THRIFT_FSYNC(fd_);
-      unflushed = 0;
-      getNextFlushTime(&ts_next_flush);
-
-      // notify anybody waiting for flush completion
-      if (forced_flush) {
-        Guard g(mutex_);
-        forceFlush_ = false;
-        assert(enqueueBuffer_->isEmpty());
-        assert(dequeueBuffer_->isEmpty());
-        flushed_.notifyAll();
-      }
-    }
-  }
-}
-
-void TFileTransport::flush() {
-  // file must be open for writing for any flushing to take place
-  if (!writerThread_.get()) {
-    return;
-  }
-  // wait for flush to take place
-  Guard g(mutex_);
-
-  // Indicate that we are requesting a flush
-  forceFlush_ = true;
-  // Wake up the writer thread so it will perform the flush immediately
-  notEmpty_.notify();
-
-  while (forceFlush_) {
-    flushed_.wait();
-  }
-}
-
-uint32_t TFileTransport::readAll(uint8_t* buf, uint32_t len) {
-  uint32_t have = 0;
-  uint32_t get = 0;
-
-  while (have < len) {
-    get = read(buf + have, len - have);
-    if (get <= 0) {
-      throw TEOFException();
-    }
-    have += get;
-  }
-
-  return have;
-}
-
-bool TFileTransport::peek() {
-  // check if there is an event ready to be read
-  if (!currentEvent_) {
-    currentEvent_ = readEvent();
-  }
-
-  // did not manage to read an event from the file. This could have happened
-  // if the timeout expired or there was some other error
-  if (!currentEvent_) {
-    return false;
-  }
-
-  // check if there is anything to read
-  return (currentEvent_->eventSize_ - currentEvent_->eventBuffPos_) > 0;
-}
-
-uint32_t TFileTransport::read(uint8_t* buf, uint32_t len) {
-  // check if there an event is ready to be read
-  if (!currentEvent_) {
-    currentEvent_ = readEvent();
-  }
-
-  // did not manage to read an event from the file. This could have happened
-  // if the timeout expired or there was some other error
-  if (!currentEvent_) {
-    return 0;
-  }
-
-  // read as much of the current event as possible
-  int32_t remaining = currentEvent_->eventSize_ - currentEvent_->eventBuffPos_;
-  if (remaining <= (int32_t)len) {
-    // copy over anything thats remaining
-    if (remaining > 0) {
-      memcpy(buf, currentEvent_->eventBuff_ + currentEvent_->eventBuffPos_, remaining);
-    }
-    delete (currentEvent_);
-    currentEvent_ = NULL;
-    return remaining;
-  }
-
-  // read as much as possible
-  memcpy(buf, currentEvent_->eventBuff_ + currentEvent_->eventBuffPos_, len);
-  currentEvent_->eventBuffPos_ += len;
-  return len;
-}
-
-// note caller is responsible for freeing returned events
-eventInfo* TFileTransport::readEvent() {
-  int readTries = 0;
-
-  if (!readBuff_) {
-    readBuff_ = new uint8_t[readBuffSize_];
-  }
-
-  while (1) {
-    // read from the file if read buffer is exhausted
-    if (readState_.bufferPtr_ == readState_.bufferLen_) {
-      // advance the offset pointer
-      offset_ += readState_.bufferLen_;
-      readState_.bufferLen_ = static_cast<uint32_t>(::THRIFT_READ(fd_, readBuff_, readBuffSize_));
-      //       if (readState_.bufferLen_) {
-      //         T_DEBUG_L(1, "Amount read: %u (offset: %lu)", readState_.bufferLen_, offset_);
-      //       }
-      readState_.bufferPtr_ = 0;
-      readState_.lastDispatchPtr_ = 0;
-
-      // read error
-      if (readState_.bufferLen_ == -1) {
-        readState_.resetAllValues();
-        GlobalOutput("TFileTransport: error while reading from file");
-        throw TTransportException("TFileTransport: error while reading from file");
-      } else if (readState_.bufferLen_ == 0) { // EOF
-        // wait indefinitely if there is no timeout
-        if (readTimeout_ == TAIL_READ_TIMEOUT) {
-          THRIFT_SLEEP_USEC(eofSleepTime_);
-          continue;
-        } else if (readTimeout_ == NO_TAIL_READ_TIMEOUT) {
-          // reset state
-          readState_.resetState(0);
-          return NULL;
-        } else if (readTimeout_ > 0) {
-          // timeout already expired once
-          if (readTries > 0) {
-            readState_.resetState(0);
-            return NULL;
-          } else {
-            THRIFT_SLEEP_USEC(readTimeout_ * 1000);
-            readTries++;
-            continue;
-          }
-        }
-      }
-    }
-
-    readTries = 0;
-
-    // attempt to read an event from the buffer
-    while (readState_.bufferPtr_ < readState_.bufferLen_) {
-      if (readState_.readingSize_) {
-        if (readState_.eventSizeBuffPos_ == 0) {
-          if ((offset_ + readState_.bufferPtr_) / chunkSize_
-              != ((offset_ + readState_.bufferPtr_ + 3) / chunkSize_)) {
-            // skip one byte towards chunk boundary
-            //            T_DEBUG_L(1, "Skipping a byte");
-            readState_.bufferPtr_++;
-            continue;
-          }
-        }
-
-        readState_.eventSizeBuff_[readState_.eventSizeBuffPos_++]
-            = readBuff_[readState_.bufferPtr_++];
-
-        if (readState_.eventSizeBuffPos_ == 4) {
-          if (readState_.getEventSize() == 0) {
-            // 0 length event indicates padding
-            //            T_DEBUG_L(1, "Got padding");
-            readState_.resetState(readState_.lastDispatchPtr_);
-            continue;
-          }
-          // got a valid event
-          readState_.readingSize_ = false;
-          if (readState_.event_) {
-            delete (readState_.event_);
-          }
-          readState_.event_ = new eventInfo();
-          readState_.event_->eventSize_ = readState_.getEventSize();
-
-          // check if the event is corrupted and perform recovery if required
-          if (isEventCorrupted()) {
-            performRecovery();
-            // start from the top
-            break;
-          }
-        }
-      } else {
-        if (!readState_.event_->eventBuff_) {
-          readState_.event_->eventBuff_ = new uint8_t[readState_.event_->eventSize_];
-          readState_.event_->eventBuffPos_ = 0;
-        }
-        // take either the entire event or the remaining bytes in the buffer
-        int reclaimBuffer = min((uint32_t)(readState_.bufferLen_ - readState_.bufferPtr_),
-                                readState_.event_->eventSize_ - readState_.event_->eventBuffPos_);
-
-        // copy data from read buffer into event buffer
-        memcpy(readState_.event_->eventBuff_ + readState_.event_->eventBuffPos_,
-               readBuff_ + readState_.bufferPtr_,
-               reclaimBuffer);
-
-        // increment position ptrs
-        readState_.event_->eventBuffPos_ += reclaimBuffer;
-        readState_.bufferPtr_ += reclaimBuffer;
-
-        // check if the event has been read in full
-        if (readState_.event_->eventBuffPos_ == readState_.event_->eventSize_) {
-          // set the completed event to the current event
-          eventInfo* completeEvent = readState_.event_;
-          completeEvent->eventBuffPos_ = 0;
-
-          readState_.event_ = NULL;
-          readState_.resetState(readState_.bufferPtr_);
-
-          // exit criteria
-          return completeEvent;
-        }
-      }
-    }
-  }
-}
-
-bool TFileTransport::isEventCorrupted() {
-  // an error is triggered if:
-  if ((maxEventSize_ > 0) && (readState_.event_->eventSize_ > maxEventSize_)) {
-    // 1. Event size is larger than user-speficied max-event size
-    T_ERROR("Read corrupt event. Event size(%u) greater than max event size (%u)",
-            readState_.event_->eventSize_,
-            maxEventSize_);
-    return true;
-  } else if (readState_.event_->eventSize_ > chunkSize_) {
-    // 2. Event size is larger than chunk size
-    T_ERROR("Read corrupt event. Event size(%u) greater than chunk size (%u)",
-            readState_.event_->eventSize_,
-            chunkSize_);
-    return true;
-  } else if (((offset_ + readState_.bufferPtr_ - 4) / chunkSize_)
-             != ((offset_ + readState_.bufferPtr_ + readState_.event_->eventSize_ - 1)
-                 / chunkSize_)) {
-    // 3. size indicates that event crosses chunk boundary
-    T_ERROR("Read corrupt event. Event crosses chunk boundary. Event size:%u  Offset:%lu",
-            readState_.event_->eventSize_,
-            static_cast<unsigned long>(offset_ + readState_.bufferPtr_ + 4));
-
-    return true;
-  }
-
-  return false;
-}
-
-void TFileTransport::performRecovery() {
-  // perform some kickass recovery
-  uint32_t curChunk = getCurChunk();
-  if (lastBadChunk_ == curChunk) {
-    numCorruptedEventsInChunk_++;
-  } else {
-    lastBadChunk_ = curChunk;
-    numCorruptedEventsInChunk_ = 1;
-  }
-
-  if (numCorruptedEventsInChunk_ < maxCorruptedEvents_) {
-    // maybe there was an error in reading the file from disk
-    // seek to the beginning of chunk and try again
-    seekToChunk(curChunk);
-  } else {
-
-    // just skip ahead to the next chunk if we not already at the last chunk
-    if (curChunk != (getNumChunks() - 1)) {
-      seekToChunk(curChunk + 1);
-    } else if (readTimeout_ == TAIL_READ_TIMEOUT) {
-      // if tailing the file, wait until there is enough data to start
-      // the next chunk
-      while (curChunk == (getNumChunks() - 1)) {
-        THRIFT_SLEEP_USEC(corruptedEventSleepTime_);
-      }
-      seekToChunk(curChunk + 1);
-    } else {
-      // pretty hosed at this stage, rewind the file back to the last successful
-      // point and punt on the error
-      readState_.resetState(readState_.lastDispatchPtr_);
-      currentEvent_ = NULL;
-      char errorMsg[1024];
-      sprintf(errorMsg,
-              "TFileTransport: log file corrupted at offset: %lu",
-              static_cast<unsigned long>(offset_ + readState_.lastDispatchPtr_));
-
-      GlobalOutput(errorMsg);
-      throw TTransportException(errorMsg);
-    }
-  }
-}
-
-void TFileTransport::seekToChunk(int32_t chunk) {
-  if (fd_ <= 0) {
-    throw TTransportException("File not open");
-  }
-
-  int32_t numChunks = getNumChunks();
-
-  // file is empty, seeking to chunk is pointless
-  if (numChunks == 0) {
-    return;
-  }
-
-  // negative indicates reverse seek (from the end)
-  if (chunk < 0) {
-    chunk += numChunks;
-  }
-
-  // too large a value for reverse seek, just seek to beginning
-  if (chunk < 0) {
-    T_DEBUG("%s", "Incorrect value for reverse seek. Seeking to beginning...");
-    chunk = 0;
-  }
-
-  // cannot seek past EOF
-  bool seekToEnd = false;
-  off_t minEndOffset = 0;
-  if (chunk >= numChunks) {
-    T_DEBUG("%s", "Trying to seek past EOF. Seeking to EOF instead...");
-    seekToEnd = true;
-    chunk = numChunks - 1;
-    // this is the min offset to process events till
-    minEndOffset = ::THRIFT_LSEEK(fd_, 0, SEEK_END);
-  }
-
-  off_t newOffset = off_t(chunk) * chunkSize_;
-  offset_ = ::THRIFT_LSEEK(fd_, newOffset, SEEK_SET);
-  readState_.resetAllValues();
-  currentEvent_ = NULL;
-  if (offset_ == -1) {
-    GlobalOutput("TFileTransport: lseek error in seekToChunk");
-    throw TTransportException("TFileTransport: lseek error in seekToChunk");
-  }
-
-  // seek to EOF if user wanted to go to last chunk
-  if (seekToEnd) {
-    uint32_t oldReadTimeout = getReadTimeout();
-    setReadTimeout(NO_TAIL_READ_TIMEOUT);
-    // keep on reading unti the last event at point of seekChunk call
-    boost::scoped_ptr<eventInfo> event;
-    while ((offset_ + readState_.bufferPtr_) < minEndOffset) {
-      event.reset(readEvent());
-      if (event.get() == NULL) {
-        break;
-      }
-    }
-    setReadTimeout(oldReadTimeout);
-  }
-}
-
-void TFileTransport::seekToEnd() {
-  seekToChunk(getNumChunks());
-}
-
-uint32_t TFileTransport::getNumChunks() {
-  if (fd_ <= 0) {
-    return 0;
-  }
-
-  struct THRIFT_STAT f_info;
-  int rv = ::THRIFT_FSTAT(fd_, &f_info);
-
-  if (rv < 0) {
-    int errno_copy = THRIFT_ERRNO;
-    throw TTransportException(TTransportException::UNKNOWN,
-                              "TFileTransport::getNumChunks() (fstat)",
-                              errno_copy);
-  }
-
-  if (f_info.st_size > 0) {
-    size_t numChunks = ((f_info.st_size) / chunkSize_) + 1;
-    if (numChunks > (std::numeric_limits<uint32_t>::max)())
-      throw TTransportException("Too many chunks");
-    return static_cast<uint32_t>(numChunks);
-  }
-
-  // empty file has no chunks
-  return 0;
-}
-
-uint32_t TFileTransport::getCurChunk() {
-  return static_cast<uint32_t>(offset_ / chunkSize_);
-}
-
-// Utility Functions
-void TFileTransport::openLogFile() {
-#ifndef _WIN32
-  mode_t mode = readOnly_ ? S_IRUSR | S_IRGRP | S_IROTH : S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
-  int flags = readOnly_ ? O_RDONLY : O_RDWR | O_CREAT | O_APPEND;
-#else
-  int mode = readOnly_ ? _S_IREAD : _S_IREAD | _S_IWRITE;
-  int flags = readOnly_ ? _O_RDONLY : _O_RDWR | _O_CREAT | _O_APPEND;
-#endif
-  fd_ = ::THRIFT_OPEN(filename_.c_str(), flags, mode);
-  offset_ = 0;
-
-  // make sure open call was successful
-  if (fd_ == -1) {
-    int errno_copy = THRIFT_ERRNO;
-    GlobalOutput.perror("TFileTransport: openLogFile() ::open() file: " + filename_, errno_copy);
-    throw TTransportException(TTransportException::NOT_OPEN, filename_, errno_copy);
-  }
-}
-
-void TFileTransport::getNextFlushTime(struct timeval* ts_next_flush) {
-  THRIFT_GETTIMEOFDAY(ts_next_flush, NULL);
-
-  ts_next_flush->tv_usec += flushMaxUs_;
-  if (ts_next_flush->tv_usec > 1000000) {
-    long extra_secs = ts_next_flush->tv_usec / 1000000;
-    ts_next_flush->tv_usec %= 1000000;
-    ts_next_flush->tv_sec += extra_secs;
-  }
-}
-
-TFileTransportBuffer::TFileTransportBuffer(uint32_t size)
-  : bufferMode_(WRITE), writePoint_(0), readPoint_(0), size_(size) {
-  buffer_ = new eventInfo* [size];
-}
-
-TFileTransportBuffer::~TFileTransportBuffer() {
-  if (buffer_) {
-    for (uint32_t i = 0; i < writePoint_; i++) {
-      delete buffer_[i];
-    }
-    delete[] buffer_;
-    buffer_ = NULL;
-  }
-}
-
-bool TFileTransportBuffer::addEvent(eventInfo* event) {
-  if (bufferMode_ == READ) {
-    GlobalOutput("Trying to write to a buffer in read mode");
-  }
-  if (writePoint_ < size_) {
-    buffer_[writePoint_++] = event;
-    return true;
-  } else {
-    // buffer is full
-    return false;
-  }
-}
-
-eventInfo* TFileTransportBuffer::getNext() {
-  if (bufferMode_ == WRITE) {
-    bufferMode_ = READ;
-  }
-  if (readPoint_ < writePoint_) {
-    return buffer_[readPoint_++];
-  } else {
-    // no more entries
-    return NULL;
-  }
-}
-
-void TFileTransportBuffer::reset() {
-  if (bufferMode_ == WRITE || writePoint_ > readPoint_) {
-    T_DEBUG("%s", "Resetting a buffer with unread entries");
-  }
-  // Clean up the old entries
-  for (uint32_t i = 0; i < writePoint_; i++) {
-    delete buffer_[i];
-  }
-  bufferMode_ = WRITE;
-  writePoint_ = 0;
-  readPoint_ = 0;
-}
-
-bool TFileTransportBuffer::isFull() {
-  return writePoint_ == size_;
-}
-
-bool TFileTransportBuffer::isEmpty() {
-  return writePoint_ == 0;
-}
-
-TFileProcessor::TFileProcessor(shared_ptr<TProcessor> processor,
-                               shared_ptr<TProtocolFactory> protocolFactory,
-                               shared_ptr<TFileReaderTransport> inputTransport)
-  : processor_(processor),
-    inputProtocolFactory_(protocolFactory),
-    outputProtocolFactory_(protocolFactory),
-    inputTransport_(inputTransport) {
-
-  // default the output transport to a null transport (common case)
-  outputTransport_ = shared_ptr<TNullTransport>(new TNullTransport());
-}
-
-TFileProcessor::TFileProcessor(shared_ptr<TProcessor> processor,
-                               shared_ptr<TProtocolFactory> inputProtocolFactory,
-                               shared_ptr<TProtocolFactory> outputProtocolFactory,
-                               shared_ptr<TFileReaderTransport> inputTransport)
-  : processor_(processor),
-    inputProtocolFactory_(inputProtocolFactory),
-    outputProtocolFactory_(outputProtocolFactory),
-    inputTransport_(inputTransport) {
-
-  // default the output transport to a null transport (common case)
-  outputTransport_ = shared_ptr<TNullTransport>(new TNullTransport());
-}
-
-TFileProcessor::TFileProcessor(shared_ptr<TProcessor> processor,
-                               shared_ptr<TProtocolFactory> protocolFactory,
-                               shared_ptr<TFileReaderTransport> inputTransport,
-                               shared_ptr<TTransport> outputTransport)
-  : processor_(processor),
-    inputProtocolFactory_(protocolFactory),
-    outputProtocolFactory_(protocolFactory),
-    inputTransport_(inputTransport),
-    outputTransport_(outputTransport) {
-}
-
-void TFileProcessor::process(uint32_t numEvents, bool tail) {
-  shared_ptr<TProtocol> inputProtocol = inputProtocolFactory_->getProtocol(inputTransport_);
-  shared_ptr<TProtocol> outputProtocol = outputProtocolFactory_->getProtocol(outputTransport_);
-
-  // set the read timeout to 0 if tailing is required
-  int32_t oldReadTimeout = inputTransport_->getReadTimeout();
-  if (tail) {
-    // save old read timeout so it can be restored
-    inputTransport_->setReadTimeout(TFileTransport::TAIL_READ_TIMEOUT);
-  }
-
-  uint32_t numProcessed = 0;
-  while (1) {
-    // bad form to use exceptions for flow control but there is really
-    // no other way around it
-    try {
-      processor_->process(inputProtocol, outputProtocol, NULL);
-      numProcessed++;
-      if ((numEvents > 0) && (numProcessed == numEvents)) {
-        return;
-      }
-    } catch (TEOFException&) {
-      if (!tail) {
-        break;
-      }
-    } catch (TException& te) {
-      cerr << te.what() << endl;
-      break;
-    }
-  }
-
-  // restore old read timeout
-  if (tail) {
-    inputTransport_->setReadTimeout(oldReadTimeout);
-  }
-}
-
-void TFileProcessor::processChunk() {
-  shared_ptr<TProtocol> inputProtocol = inputProtocolFactory_->getProtocol(inputTransport_);
-  shared_ptr<TProtocol> outputProtocol = outputProtocolFactory_->getProtocol(outputTransport_);
-
-  uint32_t curChunk = inputTransport_->getCurChunk();
-
-  while (1) {
-    // bad form to use exceptions for flow control but there is really
-    // no other way around it
-    try {
-      processor_->process(inputProtocol, outputProtocol, NULL);
-      if (curChunk != inputTransport_->getCurChunk()) {
-        break;
-      }
-    } catch (TEOFException&) {
-      break;
-    } catch (TException& te) {
-      cerr << te.what() << endl;
-      break;
-    }
-  }
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFileTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFileTransport.h
deleted file mode 100644
index c926c7c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TFileTransport.h
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TFILETRANSPORT_H_
-#define _THRIFT_TRANSPORT_TFILETRANSPORT_H_ 1
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/Thrift.h>
-#include <thrift/TProcessor.h>
-
-#include <string>
-#include <stdio.h>
-
-#include <boost/atomic.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include <thrift/concurrency/Mutex.h>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/concurrency/Thread.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using apache::thrift::TProcessor;
-using apache::thrift::protocol::TProtocolFactory;
-using apache::thrift::concurrency::Mutex;
-using apache::thrift::concurrency::Monitor;
-
-// Data pertaining to a single event
-typedef struct eventInfo {
-  uint8_t* eventBuff_;
-  uint32_t eventSize_;
-  uint32_t eventBuffPos_;
-
-  eventInfo() : eventBuff_(NULL), eventSize_(0), eventBuffPos_(0){};
-  ~eventInfo() {
-    if (eventBuff_) {
-      delete[] eventBuff_;
-    }
-  }
-} eventInfo;
-
-// information about current read state
-typedef struct readState {
-  eventInfo* event_;
-
-  // keep track of event size
-  uint8_t eventSizeBuff_[4];
-  uint8_t eventSizeBuffPos_;
-  bool readingSize_;
-
-  // read buffer variables
-  int32_t bufferPtr_;
-  int32_t bufferLen_;
-
-  // last successful dispatch point
-  int32_t lastDispatchPtr_;
-
-  void resetState(uint32_t lastDispatchPtr) {
-    readingSize_ = true;
-    eventSizeBuffPos_ = 0;
-    lastDispatchPtr_ = lastDispatchPtr;
-  }
-
-  void resetAllValues() {
-    resetState(0);
-    bufferPtr_ = 0;
-    bufferLen_ = 0;
-    if (event_) {
-      delete (event_);
-    }
-    event_ = 0;
-  }
-
-  inline uint32_t getEventSize() {
-    const void* buffer = reinterpret_cast<const void*>(eventSizeBuff_);
-    return *reinterpret_cast<const uint32_t*>(buffer);
-  }
-
-  readState() {
-    event_ = 0;
-    resetAllValues();
-  }
-
-  ~readState() {
-    if (event_) {
-      delete (event_);
-    }
-  }
-
-} readState;
-
-/**
- * TFileTransportBuffer - buffer class used by TFileTransport for queueing up events
- * to be written to disk.  Should be used in the following way:
- *  1) Buffer created
- *  2) Buffer written to (addEvent)
- *  3) Buffer read from (getNext)
- *  4) Buffer reset (reset)
- *  5) Go back to 2, or destroy buffer
- *
- * The buffer should never be written to after it is read from, unless it is reset first.
- * Note: The above rules are enforced mainly for debugging its sole client TFileTransport
- *       which uses the buffer in this way.
- *
- */
-class TFileTransportBuffer {
-public:
-  TFileTransportBuffer(uint32_t size);
-  ~TFileTransportBuffer();
-
-  bool addEvent(eventInfo* event);
-  eventInfo* getNext();
-  void reset();
-  bool isFull();
-  bool isEmpty();
-
-private:
-  TFileTransportBuffer(); // should not be used
-
-  enum mode { WRITE, READ };
-  mode bufferMode_;
-
-  uint32_t writePoint_;
-  uint32_t readPoint_;
-  uint32_t size_;
-  eventInfo** buffer_;
-};
-
-/**
- * Abstract interface for transports used to read files
- */
-class TFileReaderTransport : virtual public TTransport {
-public:
-  virtual int32_t getReadTimeout() = 0;
-  virtual void setReadTimeout(int32_t readTimeout) = 0;
-
-  virtual uint32_t getNumChunks() = 0;
-  virtual uint32_t getCurChunk() = 0;
-  virtual void seekToChunk(int32_t chunk) = 0;
-  virtual void seekToEnd() = 0;
-};
-
-/**
- * Abstract interface for transports used to write files
- */
-class TFileWriterTransport : virtual public TTransport {
-public:
-  virtual uint32_t getChunkSize() = 0;
-  virtual void setChunkSize(uint32_t chunkSize) = 0;
-};
-
-/**
- * File implementation of a transport. Reads and writes are done to a
- * file on disk.
- *
- */
-class TFileTransport : public TFileReaderTransport, public TFileWriterTransport {
-public:
-  TFileTransport(std::string path, bool readOnly = false);
-  ~TFileTransport();
-
-  // TODO: what is the correct behaviour for this?
-  // the log file is generally always open
-  bool isOpen() { return true; }
-
-  void write(const uint8_t* buf, uint32_t len);
-  void flush();
-
-  uint32_t readAll(uint8_t* buf, uint32_t len);
-  uint32_t read(uint8_t* buf, uint32_t len);
-  bool peek();
-
-  // log-file specific functions
-  void seekToChunk(int32_t chunk);
-  void seekToEnd();
-  uint32_t getNumChunks();
-  uint32_t getCurChunk();
-
-  // for changing the output file
-  void resetOutputFile(int fd, std::string filename, off_t offset);
-
-  // Setter/Getter functions for user-controllable options
-  void setReadBuffSize(uint32_t readBuffSize) {
-    if (readBuffSize) {
-      readBuffSize_ = readBuffSize;
-    }
-  }
-  uint32_t getReadBuffSize() { return readBuffSize_; }
-
-  static const int32_t TAIL_READ_TIMEOUT = -1;
-  static const int32_t NO_TAIL_READ_TIMEOUT = 0;
-  void setReadTimeout(int32_t readTimeout) { readTimeout_ = readTimeout; }
-  int32_t getReadTimeout() { return readTimeout_; }
-
-  void setChunkSize(uint32_t chunkSize) {
-    if (chunkSize) {
-      chunkSize_ = chunkSize;
-    }
-  }
-  uint32_t getChunkSize() { return chunkSize_; }
-
-  void setEventBufferSize(uint32_t bufferSize) {
-    if (bufferAndThreadInitialized_) {
-      GlobalOutput("Cannot change the buffer size after writer thread started");
-      return;
-    }
-    eventBufferSize_ = bufferSize;
-  }
-
-  uint32_t getEventBufferSize() { return eventBufferSize_; }
-
-  void setFlushMaxUs(uint32_t flushMaxUs) {
-    if (flushMaxUs) {
-      flushMaxUs_ = flushMaxUs;
-    }
-  }
-  uint32_t getFlushMaxUs() { return flushMaxUs_; }
-
-  void setFlushMaxBytes(uint32_t flushMaxBytes) {
-    if (flushMaxBytes) {
-      flushMaxBytes_ = flushMaxBytes;
-    }
-  }
-  uint32_t getFlushMaxBytes() { return flushMaxBytes_; }
-
-  void setMaxEventSize(uint32_t maxEventSize) { maxEventSize_ = maxEventSize; }
-  uint32_t getMaxEventSize() { return maxEventSize_; }
-
-  void setMaxCorruptedEvents(uint32_t maxCorruptedEvents) {
-    maxCorruptedEvents_ = maxCorruptedEvents;
-  }
-  uint32_t getMaxCorruptedEvents() { return maxCorruptedEvents_; }
-
-  void setEofSleepTimeUs(uint32_t eofSleepTime) {
-    if (eofSleepTime) {
-      eofSleepTime_ = eofSleepTime;
-    }
-  }
-  uint32_t getEofSleepTimeUs() { return eofSleepTime_; }
-
-  /*
-   * Override TTransport *_virt() functions to invoke our implementations.
-   * We cannot use TVirtualTransport to provide these, since we need to inherit
-   * virtually from TTransport.
-   */
-  virtual uint32_t read_virt(uint8_t* buf, uint32_t len) { return this->read(buf, len); }
-  virtual uint32_t readAll_virt(uint8_t* buf, uint32_t len) { return this->readAll(buf, len); }
-  virtual void write_virt(const uint8_t* buf, uint32_t len) { this->write(buf, len); }
-
-private:
-  // helper functions for writing to a file
-  void enqueueEvent(const uint8_t* buf, uint32_t eventLen);
-  bool swapEventBuffers(struct timeval* deadline);
-  bool initBufferAndWriteThread();
-
-  // control for writer thread
-  static void* startWriterThread(void* ptr) {
-    static_cast<TFileTransport*>(ptr)->writerThread();
-    return NULL;
-  }
-  void writerThread();
-
-  // helper functions for reading from a file
-  eventInfo* readEvent();
-
-  // event corruption-related functions
-  bool isEventCorrupted();
-  void performRecovery();
-
-  // Utility functions
-  void openLogFile();
-  void getNextFlushTime(struct timeval* ts_next_flush);
-
-  // Class variables
-  readState readState_;
-  uint8_t* readBuff_;
-  eventInfo* currentEvent_;
-
-  uint32_t readBuffSize_;
-  static const uint32_t DEFAULT_READ_BUFF_SIZE = 1 * 1024 * 1024;
-
-  int32_t readTimeout_;
-  static const int32_t DEFAULT_READ_TIMEOUT_MS = 200;
-
-  // size of chunks that file will be split up into
-  uint32_t chunkSize_;
-  static const uint32_t DEFAULT_CHUNK_SIZE = 16 * 1024 * 1024;
-
-  // size of event buffers
-  uint32_t eventBufferSize_;
-  static const uint32_t DEFAULT_EVENT_BUFFER_SIZE = 10000;
-
-  // max number of microseconds that can pass without flushing
-  uint32_t flushMaxUs_;
-  static const uint32_t DEFAULT_FLUSH_MAX_US = 3000000;
-
-  // max number of bytes that can be written without flushing
-  uint32_t flushMaxBytes_;
-  static const uint32_t DEFAULT_FLUSH_MAX_BYTES = 1000 * 1024;
-
-  // max event size
-  uint32_t maxEventSize_;
-  static const uint32_t DEFAULT_MAX_EVENT_SIZE = 0;
-
-  // max number of corrupted events per chunk
-  uint32_t maxCorruptedEvents_;
-  static const uint32_t DEFAULT_MAX_CORRUPTED_EVENTS = 0;
-
-  // sleep duration when EOF is hit
-  uint32_t eofSleepTime_;
-  static const uint32_t DEFAULT_EOF_SLEEP_TIME_US = 500 * 1000;
-
-  // sleep duration when a corrupted event is encountered
-  uint32_t corruptedEventSleepTime_;
-  static const uint32_t DEFAULT_CORRUPTED_SLEEP_TIME_US = 1 * 1000 * 1000;
-
-  // sleep duration in seconds when an IO error is encountered in the writer thread
-  uint32_t writerThreadIOErrorSleepTime_;
-  static const uint32_t DEFAULT_WRITER_THREAD_SLEEP_TIME_US = 60 * 1000 * 1000;
-
-  // writer thread
-  apache::thrift::concurrency::PlatformThreadFactory threadFactory_;
-  boost::shared_ptr<apache::thrift::concurrency::Thread> writerThread_;
-
-  // buffers to hold data before it is flushed. Each element of the buffer stores a msg that
-  // needs to be written to the file.  The buffers are swapped by the writer thread.
-  TFileTransportBuffer* dequeueBuffer_;
-  TFileTransportBuffer* enqueueBuffer_;
-
-  // conditions used to block when the buffer is full or empty
-  Monitor notFull_, notEmpty_;
-  bool closing_;
-
-  // To keep track of whether the buffer has been flushed
-  Monitor flushed_;
-  boost::atomic<bool> forceFlush_;
-
-  // Mutex that is grabbed when enqueueing and swapping the read/write buffers
-  Mutex mutex_;
-
-  // File information
-  std::string filename_;
-  int fd_;
-
-  // Whether the writer thread and buffers have been initialized
-  bool bufferAndThreadInitialized_;
-
-  // Offset within the file
-  off_t offset_;
-
-  // event corruption information
-  uint32_t lastBadChunk_;
-  uint32_t numCorruptedEventsInChunk_;
-
-  bool readOnly_;
-};
-
-// Exception thrown when EOF is hit
-class TEOFException : public TTransportException {
-public:
-  TEOFException() : TTransportException(TTransportException::END_OF_FILE){};
-};
-
-// wrapper class to process events from a file containing thrift events
-class TFileProcessor {
-public:
-  /**
-   * Constructor that defaults output transport to null transport
-   *
-   * @param processor processes log-file events
-   * @param protocolFactory protocol factory
-   * @param inputTransport file transport
-   */
-  TFileProcessor(boost::shared_ptr<TProcessor> processor,
-                 boost::shared_ptr<TProtocolFactory> protocolFactory,
-                 boost::shared_ptr<TFileReaderTransport> inputTransport);
-
-  TFileProcessor(boost::shared_ptr<TProcessor> processor,
-                 boost::shared_ptr<TProtocolFactory> inputProtocolFactory,
-                 boost::shared_ptr<TProtocolFactory> outputProtocolFactory,
-                 boost::shared_ptr<TFileReaderTransport> inputTransport);
-
-  /**
-   * Constructor
-   *
-   * @param processor processes log-file events
-   * @param protocolFactory protocol factory
-   * @param inputTransport input file transport
-   * @param output output transport
-   */
-  TFileProcessor(boost::shared_ptr<TProcessor> processor,
-                 boost::shared_ptr<TProtocolFactory> protocolFactory,
-                 boost::shared_ptr<TFileReaderTransport> inputTransport,
-                 boost::shared_ptr<TTransport> outputTransport);
-
-  /**
-   * processes events from the file
-   *
-   * @param numEvents number of events to process (0 for unlimited)
-   * @param tail tails the file if true
-   */
-  void process(uint32_t numEvents, bool tail);
-
-  /**
-   * process events until the end of the chunk
-   *
-   */
-  void processChunk();
-
-private:
-  boost::shared_ptr<TProcessor> processor_;
-  boost::shared_ptr<TProtocolFactory> inputProtocolFactory_;
-  boost::shared_ptr<TProtocolFactory> outputProtocolFactory_;
-  boost::shared_ptr<TFileReaderTransport> inputTransport_;
-  boost::shared_ptr<TTransport> outputTransport_;
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // _THRIFT_TRANSPORT_TFILETRANSPORT_H_
-
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THeaderTransport.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THeaderTransport.cpp
deleted file mode 100644
index b1fe923..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THeaderTransport.cpp
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/transport/THeaderTransport.h>
-#include <thrift/TApplicationException.h>
-#include <thrift/protocol/TProtocolTypes.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TCompactProtocol.h>
-
-#include <utility>
-#include <cassert>
-#include <string>
-#include <zlib.h>
-#include <string.h>
-
-using std::map;
-using boost::shared_ptr;
-using std::string;
-using std::vector;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using namespace apache::thrift::protocol;
-using apache::thrift::protocol::TBinaryProtocol;
-
-uint32_t THeaderTransport::readSlow(uint8_t* buf, uint32_t len) {
-  if (clientType == THRIFT_UNFRAMED_BINARY || clientType == THRIFT_UNFRAMED_COMPACT) {
-    return transport_->read(buf, len);
-  }
-
-  return TFramedTransport::readSlow(buf, len);
-}
-
-uint16_t THeaderTransport::getProtocolId() const {
-  if (clientType == THRIFT_HEADER_CLIENT_TYPE) {
-    return protoId;
-  } else if (clientType == THRIFT_UNFRAMED_COMPACT || clientType == THRIFT_FRAMED_COMPACT) {
-    return T_COMPACT_PROTOCOL;
-  } else {
-    return T_BINARY_PROTOCOL; // Assume other transports use TBinary
-  }
-}
-
-void THeaderTransport::ensureReadBuffer(uint32_t sz) {
-  if (sz > rBufSize_) {
-    rBuf_.reset(new uint8_t[sz]);
-    rBufSize_ = sz;
-  }
-}
-
-bool THeaderTransport::readFrame() {
-  // szN is network byte order of sz
-  uint32_t szN;
-  uint32_t sz;
-
-  // Read the size of the next frame.
-  // We can't use readAll(&sz, sizeof(sz)), since that always throws an
-  // exception on EOF.  We want to throw an exception only if EOF occurs after
-  // partial size data.
-  uint32_t sizeBytesRead = 0;
-  while (sizeBytesRead < sizeof(szN)) {
-    uint8_t* szp = reinterpret_cast<uint8_t*>(&szN) + sizeBytesRead;
-    uint32_t bytesRead = transport_->read(szp, sizeof(szN) - sizeBytesRead);
-    if (bytesRead == 0) {
-      if (sizeBytesRead == 0) {
-        // EOF before any data was read.
-        return false;
-      } else {
-        // EOF after a partial frame header.  Raise an exception.
-        throw TTransportException(TTransportException::END_OF_FILE,
-                                  "No more data to read after "
-                                  "partial frame header.");
-      }
-    }
-    sizeBytesRead += bytesRead;
-  }
-
-  sz = ntohl(szN);
-
-  ensureReadBuffer(4);
-
-  if ((sz & TBinaryProtocol::VERSION_MASK) == (uint32_t)TBinaryProtocol::VERSION_1) {
-    // unframed
-    clientType = THRIFT_UNFRAMED_BINARY;
-    memcpy(rBuf_.get(), &szN, sizeof(szN));
-    setReadBuffer(rBuf_.get(), 4);
-  } else if (static_cast<int8_t>(sz >> 24) == TCompactProtocol::PROTOCOL_ID
-             && (static_cast<int8_t>(sz >> 16) & TCompactProtocol::VERSION_MASK)
-                    == TCompactProtocol::VERSION_N) {
-    clientType = THRIFT_UNFRAMED_COMPACT;
-    memcpy(rBuf_.get(), &szN, sizeof(szN));
-    setReadBuffer(rBuf_.get(), 4);
-  } else {
-    // Could be header format or framed. Check next uint32
-    uint32_t magic_n;
-    uint32_t magic;
-
-    if (sz > MAX_FRAME_SIZE) {
-      throw TTransportException(TTransportException::CORRUPTED_DATA,
-                                "Header transport frame is too large");
-    }
-
-    ensureReadBuffer(sz);
-
-    // We can use readAll here, because it would be an invalid frame otherwise
-    transport_->readAll(reinterpret_cast<uint8_t*>(&magic_n), sizeof(magic_n));
-    memcpy(rBuf_.get(), &magic_n, sizeof(magic_n));
-    magic = ntohl(magic_n);
-
-    if ((magic & TBinaryProtocol::VERSION_MASK) == (uint32_t)TBinaryProtocol::VERSION_1) {
-      // framed
-      clientType = THRIFT_FRAMED_BINARY;
-      transport_->readAll(rBuf_.get() + 4, sz - 4);
-      setReadBuffer(rBuf_.get(), sz);
-    } else if (static_cast<int8_t>(magic >> 24) == TCompactProtocol::PROTOCOL_ID
-               && (static_cast<int8_t>(magic >> 16) & TCompactProtocol::VERSION_MASK)
-                      == TCompactProtocol::VERSION_N) {
-      clientType = THRIFT_FRAMED_COMPACT;
-      transport_->readAll(rBuf_.get() + 4, sz - 4);
-      setReadBuffer(rBuf_.get(), sz);
-    } else if (HEADER_MAGIC == (magic & HEADER_MASK)) {
-      if (sz < 10) {
-        throw TTransportException(TTransportException::CORRUPTED_DATA,
-                                  "Header transport frame is too small");
-      }
-
-      transport_->readAll(rBuf_.get() + 4, sz - 4);
-
-      // header format
-      clientType = THRIFT_HEADER_CLIENT_TYPE;
-      // flags
-      flags = magic & FLAGS_MASK;
-      // seqId
-      uint32_t seqId_n;
-      memcpy(&seqId_n, rBuf_.get() + 4, sizeof(seqId_n));
-      seqId = ntohl(seqId_n);
-      // header size
-      uint16_t headerSize_n;
-      memcpy(&headerSize_n, rBuf_.get() + 8, sizeof(headerSize_n));
-      uint16_t headerSize = ntohs(headerSize_n);
-      setReadBuffer(rBuf_.get(), sz);
-      readHeaderFormat(headerSize, sz);
-    } else {
-      clientType = THRIFT_UNKNOWN_CLIENT_TYPE;
-      throw TTransportException(TTransportException::BAD_ARGS,
-                                "Could not detect client transport type");
-    }
-  }
-
-  return true;
-}
-
-/**
- * Reads a string from ptr, taking care not to reach headerBoundary
- * Advances ptr on success
- *
- * @param   str                  output string
- * @throws  CORRUPTED_DATA  if size of string exceeds boundary
- */
-void THeaderTransport::readString(uint8_t*& ptr,
-                                  /* out */ string& str,
-                                  uint8_t const* headerBoundary) {
-  int32_t strLen;
-
-  uint32_t bytes = readVarint32(ptr, &strLen, headerBoundary);
-  if (strLen > headerBoundary - ptr) {
-    throw TTransportException(TTransportException::CORRUPTED_DATA,
-                              "Info header length exceeds header size");
-  }
-  ptr += bytes;
-  str.assign(reinterpret_cast<const char*>(ptr), strLen);
-  ptr += strLen;
-}
-
-void THeaderTransport::readHeaderFormat(uint16_t headerSize, uint32_t sz) {
-  readTrans_.clear();   // Clear out any previous transforms.
-  readHeaders_.clear(); // Clear out any previous headers.
-
-  // skip over already processed magic(4), seqId(4), headerSize(2)
-  uint8_t* ptr = reinterpret_cast<uint8_t*>(rBuf_.get() + 10);
-
-  // Catch integer overflow, check for reasonable header size
-  assert(headerSize < 16384);
-  headerSize *= 4;
-  const uint8_t* const headerBoundary = ptr + headerSize;
-  if (headerSize > sz) {
-    throw TTransportException(TTransportException::CORRUPTED_DATA,
-                              "Header size is larger than frame");
-  }
-  uint8_t* data = ptr + headerSize;
-  ptr += readVarint16(ptr, &protoId, headerBoundary);
-  int16_t numTransforms;
-  ptr += readVarint16(ptr, &numTransforms, headerBoundary);
-
-  // For now all transforms consist of only the ID, not data.
-  for (int i = 0; i < numTransforms; i++) {
-    int32_t transId;
-    ptr += readVarint32(ptr, &transId, headerBoundary);
-
-    readTrans_.push_back(transId);
-  }
-
-  // Info headers
-  while (ptr < headerBoundary) {
-    int32_t infoId;
-    ptr += readVarint32(ptr, &infoId, headerBoundary);
-
-    if (infoId == 0) {
-      // header padding
-      break;
-    }
-    if (infoId >= infoIdType::END) {
-      // cannot handle infoId
-      break;
-    }
-    switch (infoId) {
-    case infoIdType::KEYVALUE:
-      // Process key-value headers
-      uint32_t numKVHeaders;
-      ptr += readVarint32(ptr, (int32_t*)&numKVHeaders, headerBoundary);
-      // continue until we reach (padded) end of packet
-      while (numKVHeaders-- && ptr < headerBoundary) {
-        // format: key; value
-        // both: length (varint32); value (string)
-        string key, value;
-        readString(ptr, key, headerBoundary);
-        // value
-        readString(ptr, value, headerBoundary);
-        // save to headers
-        readHeaders_[key] = value;
-      }
-      break;
-    }
-  }
-
-  // Untransform the data section.  rBuf will contain result.
-  untransform(data, sz - (data - rBuf_.get())); // ignore header in size calc
-}
-
-void THeaderTransport::untransform(uint8_t* ptr, uint32_t sz) {
-  // Update the transform buffer size if needed
-  resizeTransformBuffer();
-
-  for (vector<uint16_t>::const_iterator it = readTrans_.begin(); it != readTrans_.end(); ++it) {
-    const uint16_t transId = *it;
-
-    if (transId == ZLIB_TRANSFORM) {
-      z_stream stream;
-      int err;
-
-      stream.next_in = ptr;
-      stream.avail_in = sz;
-
-      // Setting these to 0 means use the default free/alloc functions
-      stream.zalloc = (alloc_func)0;
-      stream.zfree = (free_func)0;
-      stream.opaque = (voidpf)0;
-      err = inflateInit(&stream);
-      if (err != Z_OK) {
-        throw TApplicationException(TApplicationException::MISSING_RESULT,
-                                    "Error while zlib deflateInit");
-      }
-      stream.next_out = tBuf_.get();
-      stream.avail_out = tBufSize_;
-      err = inflate(&stream, Z_FINISH);
-      if (err != Z_STREAM_END || stream.avail_out == 0) {
-        throw TApplicationException(TApplicationException::MISSING_RESULT,
-                                    "Error while zlib deflate");
-      }
-      sz = stream.total_out;
-
-      err = inflateEnd(&stream);
-      if (err != Z_OK) {
-        throw TApplicationException(TApplicationException::MISSING_RESULT,
-                                    "Error while zlib deflateEnd");
-      }
-
-      memcpy(ptr, tBuf_.get(), sz);
-    } else {
-      throw TApplicationException(TApplicationException::MISSING_RESULT, "Unknown transform");
-    }
-  }
-
-  setReadBuffer(ptr, sz);
-}
-
-/**
- * We may have updated the wBuf size, update the tBuf size to match.
- * Should be called in transform.
- *
- * The buffer should be slightly larger than write buffer size due to
- * compression transforms (that may slightly grow on small frame sizes)
- */
-void THeaderTransport::resizeTransformBuffer(uint32_t additionalSize) {
-  if (tBufSize_ < wBufSize_ + DEFAULT_BUFFER_SIZE) {
-    uint32_t new_size = wBufSize_ + DEFAULT_BUFFER_SIZE + additionalSize;
-    uint8_t* new_buf = new uint8_t[new_size];
-    tBuf_.reset(new_buf);
-    tBufSize_ = new_size;
-  }
-}
-
-void THeaderTransport::transform(uint8_t* ptr, uint32_t sz) {
-  // Update the transform buffer size if needed
-  resizeTransformBuffer();
-
-  for (vector<uint16_t>::const_iterator it = writeTrans_.begin(); it != writeTrans_.end(); ++it) {
-    const uint16_t transId = *it;
-
-    if (transId == ZLIB_TRANSFORM) {
-      z_stream stream;
-      int err;
-
-      stream.next_in = ptr;
-      stream.avail_in = sz;
-
-      stream.zalloc = (alloc_func)0;
-      stream.zfree = (free_func)0;
-      stream.opaque = (voidpf)0;
-      err = deflateInit(&stream, Z_DEFAULT_COMPRESSION);
-      if (err != Z_OK) {
-        throw TTransportException(TTransportException::CORRUPTED_DATA,
-                                  "Error while zlib deflateInit");
-      }
-      uint32_t tbuf_size = 0;
-      while (err == Z_OK) {
-        resizeTransformBuffer(tbuf_size);
-
-        stream.next_out = tBuf_.get();
-        stream.avail_out = tBufSize_;
-        err = deflate(&stream, Z_FINISH);
-        tbuf_size += DEFAULT_BUFFER_SIZE;
-      }
-      sz = stream.total_out;
-
-      err = deflateEnd(&stream);
-      if (err != Z_OK) {
-        throw TTransportException(TTransportException::CORRUPTED_DATA,
-                                  "Error while zlib deflateEnd");
-      }
-
-      memcpy(ptr, tBuf_.get(), sz);
-    } else {
-      throw TTransportException(TTransportException::CORRUPTED_DATA, "Unknown transform");
-    }
-  }
-
-  wBase_ = wBuf_.get() + sz;
-}
-
-void THeaderTransport::resetProtocol() {
-  // Set to anything except HTTP type so we don't flush again
-  clientType = THRIFT_HEADER_CLIENT_TYPE;
-
-  // Read the header and decide which protocol to go with
-  readFrame();
-}
-
-uint32_t THeaderTransport::getWriteBytes() {
-  return wBase_ - wBuf_.get();
-}
-
-/**
- * Writes a string to a byte buffer, as size (varint32) + string (non-null
- * terminated)
- * Automatically advances ptr to after the written portion
- */
-void THeaderTransport::writeString(uint8_t*& ptr, const string& str) {
-  uint32_t strLen = str.length();
-  ptr += writeVarint32(strLen, ptr);
-  memcpy(ptr, str.c_str(), strLen); // no need to write \0
-  ptr += strLen;
-}
-
-void THeaderTransport::setHeader(const string& key, const string& value) {
-  writeHeaders_[key] = value;
-}
-
-size_t THeaderTransport::getMaxWriteHeadersSize() const {
-  size_t maxWriteHeadersSize = 0;
-  THeaderTransport::StringToStringMap::const_iterator it;
-  for (it = writeHeaders_.begin(); it != writeHeaders_.end(); ++it) {
-    // add sizes of key and value to maxWriteHeadersSize
-    // 2 varints32 + the strings themselves
-    maxWriteHeadersSize += 5 + 5 + (it->first).length() + (it->second).length();
-  }
-  return maxWriteHeadersSize;
-}
-
-void THeaderTransport::clearHeaders() {
-  writeHeaders_.clear();
-}
-
-void THeaderTransport::flush() {
-  // Write out any data waiting in the write buffer.
-  uint32_t haveBytes = getWriteBytes();
-
-  if (clientType == THRIFT_HEADER_CLIENT_TYPE) {
-    transform(wBuf_.get(), haveBytes);
-    haveBytes = getWriteBytes(); // transform may have changed the size
-  }
-
-  // Note that we reset wBase_ prior to the underlying write
-  // to ensure we're in a sane state (i.e. internal buffer cleaned)
-  // if the underlying write throws up an exception
-  wBase_ = wBuf_.get();
-
-  if (haveBytes > MAX_FRAME_SIZE) {
-    throw TTransportException(TTransportException::CORRUPTED_DATA,
-                              "Attempting to send frame that is too large");
-  }
-
-  if (clientType == THRIFT_HEADER_CLIENT_TYPE) {
-    // header size will need to be updated at the end because of varints.
-    // Make it big enough here for max varint size, plus 4 for padding.
-    int headerSize = (2 + getNumTransforms()) * THRIFT_MAX_VARINT32_BYTES + 4;
-    // add approximate size of info headers
-    headerSize += getMaxWriteHeadersSize();
-
-    // Pkt size
-    uint32_t maxSzHbo = headerSize + haveBytes // thrift header + payload
-                        + 10;                  // common header section
-    uint8_t* pkt = tBuf_.get();
-    uint8_t* headerStart;
-    uint8_t* headerSizePtr;
-    uint8_t* pktStart = pkt;
-
-    if (maxSzHbo > tBufSize_) {
-      throw TTransportException(TTransportException::CORRUPTED_DATA,
-                                "Attempting to header frame that is too large");
-    }
-
-    uint32_t szHbo;
-    uint32_t szNbo;
-    uint16_t headerSizeN;
-
-    // Fixup szHbo later
-    pkt += sizeof(szNbo);
-    uint16_t headerN = htons(HEADER_MAGIC >> 16);
-    memcpy(pkt, &headerN, sizeof(headerN));
-    pkt += sizeof(headerN);
-    uint16_t flagsN = htons(flags);
-    memcpy(pkt, &flagsN, sizeof(flagsN));
-    pkt += sizeof(flagsN);
-    uint32_t seqIdN = htonl(seqId);
-    memcpy(pkt, &seqIdN, sizeof(seqIdN));
-    pkt += sizeof(seqIdN);
-    headerSizePtr = pkt;
-    // Fixup headerSizeN later
-    pkt += sizeof(headerSizeN);
-    headerStart = pkt;
-
-    pkt += writeVarint32(protoId, pkt);
-    pkt += writeVarint32(getNumTransforms(), pkt);
-
-    // For now, each transform is only the ID, no following data.
-    for (vector<uint16_t>::const_iterator it = writeTrans_.begin(); it != writeTrans_.end(); ++it) {
-      pkt += writeVarint32(*it, pkt);
-    }
-
-    // write info headers
-
-    // for now only write kv-headers
-    uint16_t headerCount = writeHeaders_.size();
-    if (headerCount > 0) {
-      pkt += writeVarint32(infoIdType::KEYVALUE, pkt);
-      // Write key-value headers count
-      pkt += writeVarint32(headerCount, pkt);
-      // Write info headers
-      map<string, string>::const_iterator it;
-      for (it = writeHeaders_.begin(); it != writeHeaders_.end(); ++it) {
-        writeString(pkt, it->first);  // key
-        writeString(pkt, it->second); // value
-      }
-      writeHeaders_.clear();
-    }
-
-    // Fixups after varint size calculations
-    headerSize = (pkt - headerStart);
-    uint8_t padding = 4 - (headerSize % 4);
-    headerSize += padding;
-
-    // Pad out pkt with 0x00
-    for (int i = 0; i < padding; i++) {
-      *(pkt++) = 0x00;
-    }
-
-    // Pkt size
-    szHbo = headerSize + haveBytes          // thrift header + payload
-            + (headerStart - pktStart - 4); // common header section
-    headerSizeN = htons(headerSize / 4);
-    memcpy(headerSizePtr, &headerSizeN, sizeof(headerSizeN));
-
-    // Set framing size.
-    szNbo = htonl(szHbo);
-    memcpy(pktStart, &szNbo, sizeof(szNbo));
-
-    outTransport_->write(pktStart, szHbo - haveBytes + 4);
-    outTransport_->write(wBuf_.get(), haveBytes);
-  } else if (clientType == THRIFT_FRAMED_BINARY || clientType == THRIFT_FRAMED_COMPACT) {
-    uint32_t szHbo = (uint32_t)haveBytes;
-    uint32_t szNbo = htonl(szHbo);
-
-    outTransport_->write(reinterpret_cast<uint8_t*>(&szNbo), 4);
-    outTransport_->write(wBuf_.get(), haveBytes);
-  } else if (clientType == THRIFT_UNFRAMED_BINARY || clientType == THRIFT_UNFRAMED_COMPACT) {
-    outTransport_->write(wBuf_.get(), haveBytes);
-  } else {
-    throw TTransportException(TTransportException::BAD_ARGS, "Unknown client type");
-  }
-
-  // Flush the underlying transport.
-  outTransport_->flush();
-}
-
-/**
- * Read an i16 from the wire as a varint. The MSB of each byte is set
- * if there is another byte to follow. This can read up to 3 bytes.
- */
-uint32_t THeaderTransport::readVarint16(uint8_t const* ptr, int16_t* i16, uint8_t const* boundary) {
-  int32_t val;
-  uint32_t rsize = readVarint32(ptr, &val, boundary);
-  *i16 = (int16_t)val;
-  return rsize;
-}
-
-/**
- * Read an i32 from the wire as a varint. The MSB of each byte is set
- * if there is another byte to follow. This can read up to 5 bytes.
- */
-uint32_t THeaderTransport::readVarint32(uint8_t const* ptr, int32_t* i32, uint8_t const* boundary) {
-
-  uint32_t rsize = 0;
-  uint32_t val = 0;
-  int shift = 0;
-
-  while (true) {
-    if (ptr == boundary) {
-      throw TApplicationException(TApplicationException::INVALID_MESSAGE_TYPE,
-                                  "Trying to read past header boundary");
-    }
-    uint8_t byte = *(ptr++);
-    rsize++;
-    val |= (uint64_t)(byte & 0x7f) << shift;
-    shift += 7;
-    if (!(byte & 0x80)) {
-      *i32 = val;
-      return rsize;
-    }
-  }
-}
-
-/**
- * Write an i32 as a varint. Results in 1-5 bytes on the wire.
- */
-uint32_t THeaderTransport::writeVarint32(int32_t n, uint8_t* pkt) {
-  uint8_t buf[5];
-  uint32_t wsize = 0;
-
-  while (true) {
-    if ((n & ~0x7F) == 0) {
-      buf[wsize++] = (int8_t)n;
-      break;
-    } else {
-      buf[wsize++] = (int8_t)((n & 0x7F) | 0x80);
-      n >>= 7;
-    }
-  }
-
-  // Caller will advance pkt.
-  for (uint32_t i = 0; i < wsize; i++) {
-    pkt[i] = buf[i];
-  }
-
-  return wsize;
-}
-
-uint32_t THeaderTransport::writeVarint16(int16_t n, uint8_t* pkt) {
-  return writeVarint32(n, pkt);
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THeaderTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THeaderTransport.h
deleted file mode 100644
index bf82674..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THeaderTransport.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_TRANSPORT_THEADERTRANSPORT_H_
-#define THRIFT_TRANSPORT_THEADERTRANSPORT_H_ 1
-
-#include <bitset>
-#include <vector>
-#include <stdexcept>
-#include <string>
-#include <map>
-
-#include <boost/scoped_array.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include <thrift/protocol/TProtocolTypes.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TVirtualTransport.h>
-
-enum CLIENT_TYPE {
-  THRIFT_HEADER_CLIENT_TYPE = 0,
-  THRIFT_FRAMED_BINARY = 1,
-  THRIFT_UNFRAMED_BINARY = 2,
-  THRIFT_FRAMED_COMPACT = 3,
-  THRIFT_UNFRAMED_COMPACT = 4,
-  THRIFT_UNKNOWN_CLIENT_TYPE = 5,
-};
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using apache::thrift::protocol::T_COMPACT_PROTOCOL;
-
-/**
- * Header transport. All writes go into an in-memory buffer until flush is
- * called, at which point the transport writes the length of the entire
- * binary chunk followed by the data payload. This allows the receiver on the
- * other end to always do fixed-length reads.
- *
- * Subclass TFramedTransport because most of the read/write methods are similar
- * and need similar buffers.  Major changes are readFrame & flush.
- *
- * Header Transport *must* be the same transport for both input and
- * output when used on the server side - client responses should be
- * the same protocol as those in the request.
- */
-class THeaderTransport : public TVirtualTransport<THeaderTransport, TFramedTransport> {
-public:
-  static const int DEFAULT_BUFFER_SIZE = 512u;
-  static const int THRIFT_MAX_VARINT32_BYTES = 5;
-
-  /// Use default buffer sizes.
-  explicit THeaderTransport(const boost::shared_ptr<TTransport>& transport)
-    : TVirtualTransport(transport),
-      outTransport_(transport),
-      protoId(T_COMPACT_PROTOCOL),
-      clientType(THRIFT_HEADER_CLIENT_TYPE),
-      seqId(0),
-      flags(0),
-      tBufSize_(0),
-      tBuf_(NULL) {
-    if (!transport_) throw std::invalid_argument("transport is empty");
-    initBuffers();
-  }
-
-  THeaderTransport(const boost::shared_ptr<TTransport> inTransport,
-                   const boost::shared_ptr<TTransport> outTransport)
-    : TVirtualTransport(inTransport),
-      outTransport_(outTransport),
-      protoId(T_COMPACT_PROTOCOL),
-      clientType(THRIFT_HEADER_CLIENT_TYPE),
-      seqId(0),
-      flags(0),
-      tBufSize_(0),
-      tBuf_(NULL) {
-    if (!transport_) throw std::invalid_argument("inTransport is empty");
-    if (!outTransport_) throw std::invalid_argument("outTransport is empty");
-    initBuffers();
-  }
-
-  virtual uint32_t readSlow(uint8_t* buf, uint32_t len);
-  virtual void flush();
-
-  void resizeTransformBuffer(uint32_t additionalSize = 0);
-
-  uint16_t getProtocolId() const;
-  void setProtocolId(uint16_t protoId) { this->protoId = protoId; }
-
-  void resetProtocol();
-
-  /**
-   * We know we got a packet in header format here, try to parse the header
-   *
-   * @param headerSize size of the header portion
-   * @param sz Size of the whole message, including header
-   */
-  void readHeaderFormat(uint16_t headerSize, uint32_t sz);
-
-  /**
-   * Untransform the data based on the received header flags
-   * On conclusion of function, setReadBuffer is called with the
-   * untransformed data.
-   *
-   * @param ptr ptr to data
-   * @param size of data
-   */
-  void untransform(uint8_t* ptr, uint32_t sz);
-
-  /**
-   * Transform the data based on our write transform flags
-   * At conclusion of function the write buffer is set to the
-   * transformed data.
-   *
-   * @param ptr Ptr to data to transform
-   * @param sz Size of data buffer
-   */
-  void transform(uint8_t* ptr, uint32_t sz);
-
-  uint16_t getNumTransforms() const {
-    int trans = writeTrans_.size();
-    return trans;
-  }
-
-  void setTransform(uint16_t transId) { writeTrans_.push_back(transId); }
-
-  // Info headers
-
-  typedef std::map<std::string, std::string> StringToStringMap;
-
-  // these work with write headers
-  void setHeader(const std::string& key, const std::string& value);
-
-  void clearHeaders();
-
-  StringToStringMap& getWriteHeaders() { return writeHeaders_; }
-
-  // these work with read headers
-  const StringToStringMap& getHeaders() const { return readHeaders_; }
-
-  // accessors for seqId
-  int32_t getSequenceNumber() const { return seqId; }
-  void setSequenceNumber(int32_t seqId) { this->seqId = seqId; }
-
-  enum TRANSFORMS {
-    ZLIB_TRANSFORM = 0x01,
-  };
-
-protected:
-  /**
-   * Reads a frame of input from the underlying stream.
-   *
-   * Returns true if a frame was read successfully, or false on EOF.
-   * (Raises a TTransportException if EOF occurs after a partial frame.)
-   */
-  virtual bool readFrame();
-
-  void ensureReadBuffer(uint32_t sz);
-  uint32_t getWriteBytes();
-
-  void initBuffers() {
-    setReadBuffer(NULL, 0);
-    setWriteBuffer(wBuf_.get(), wBufSize_);
-  }
-
-  boost::shared_ptr<TTransport> outTransport_;
-
-  // 0 and 16th bits must be 0 to differentiate from framed & unframed
-  static const uint32_t HEADER_MAGIC = 0x0FFF0000;
-  static const uint32_t HEADER_MASK = 0xFFFF0000;
-  static const uint32_t FLAGS_MASK = 0x0000FFFF;
-
-  static const uint32_t MAX_FRAME_SIZE = 0x3FFFFFFF;
-
-  int16_t protoId;
-  uint16_t clientType;
-  uint32_t seqId;
-  uint16_t flags;
-
-  std::vector<uint16_t> readTrans_;
-  std::vector<uint16_t> writeTrans_;
-
-  // Map to use for headers
-  StringToStringMap readHeaders_;
-  StringToStringMap writeHeaders_;
-
-  /**
-   * Returns the maximum number of bytes that write k/v headers can take
-   */
-  size_t getMaxWriteHeadersSize() const;
-
-  struct infoIdType {
-    enum idType {
-      // start at 1 to avoid confusing header padding for an infoId
-      KEYVALUE = 1,
-      END // signal the end of infoIds we can handle
-    };
-  };
-
-  // Buffers to use for transform processing
-  uint32_t tBufSize_;
-  boost::scoped_array<uint8_t> tBuf_;
-
-  void readString(uint8_t*& ptr, /* out */ std::string& str, uint8_t const* headerBoundary);
-
-  void writeString(uint8_t*& ptr, const std::string& str);
-
-  // Varint utils
-  /**
-   * Read an i16 from the wire as a varint. The MSB of each byte is set
-   * if there is another byte to follow. This can read up to 3 bytes.
-   */
-  uint32_t readVarint16(uint8_t const* ptr, int16_t* i16, uint8_t const* boundary);
-
-  /**
-   * Read an i32 from the wire as a varint. The MSB of each byte is set
-   * if there is another byte to follow. This can read up to 5 bytes.
-   */
-  uint32_t readVarint32(uint8_t const* ptr, int32_t* i32, uint8_t const* boundary);
-
-  /**
-   * Write an i32 as a varint. Results in 1-5 bytes on the wire.
-   */
-  uint32_t writeVarint32(int32_t n, uint8_t* pkt);
-
-  /**
-   * Write an i16 as a varint. Results in 1-3 bytes on the wire.
-   */
-  uint32_t writeVarint16(int16_t n, uint8_t* pkt);
-};
-
-/**
- * Wraps a transport into a header one.
- *
- */
-class THeaderTransportFactory : public TTransportFactory {
-public:
-  THeaderTransportFactory() {}
-
-  virtual ~THeaderTransportFactory() {}
-
-  /**
-   * Wraps the transport into a header one.
-   */
-  virtual boost::shared_ptr<TTransport> getTransport(boost::shared_ptr<TTransport> trans) {
-    return boost::shared_ptr<TTransport>(new THeaderTransport(trans));
-  }
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef THRIFT_TRANSPORT_THEADERTRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpClient.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpClient.cpp
deleted file mode 100644
index c610636..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpClient.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <limits>
-#include <cstdlib>
-#include <sstream>
-#include <boost/algorithm/string.hpp>
-
-#include <thrift/transport/THttpClient.h>
-#include <thrift/transport/TSocket.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using namespace std;
-
-THttpClient::THttpClient(boost::shared_ptr<TTransport> transport,
-                         std::string host,
-                         std::string path)
-  : THttpTransport(transport), host_(host), path_(path) {
-}
-
-THttpClient::THttpClient(string host, int port, string path)
-  : THttpTransport(boost::shared_ptr<TTransport>(new TSocket(host, port))),
-    host_(host),
-    path_(path) {
-}
-
-THttpClient::~THttpClient() {
-}
-
-void THttpClient::parseHeader(char* header) {
-  char* colon = strchr(header, ':');
-  if (colon == NULL) {
-    return;
-  }
-  char* value = colon + 1;
-
-  if (boost::istarts_with(header, "Transfer-Encoding")) {
-    if (boost::iends_with(value, "chunked")) {
-      chunked_ = true;
-    }
-  } else if (boost::istarts_with(header, "Content-Length")) {
-    chunked_ = false;
-    contentLength_ = atoi(value);
-  }
-}
-
-bool THttpClient::parseStatusLine(char* status) {
-  char* http = status;
-
-  char* code = strchr(http, ' ');
-  if (code == NULL) {
-    throw TTransportException(string("Bad Status: ") + status);
-  }
-
-  *code = '\0';
-  while (*(code++) == ' ') {
-  };
-
-  char* msg = strchr(code, ' ');
-  if (msg == NULL) {
-    throw TTransportException(string("Bad Status: ") + status);
-  }
-  *msg = '\0';
-
-  if (strcmp(code, "200") == 0) {
-    // HTTP 200 = OK, we got the response
-    return true;
-  } else if (strcmp(code, "100") == 0) {
-    // HTTP 100 = continue, just keep reading
-    return false;
-  } else {
-    throw TTransportException(string("Bad Status: ") + status);
-  }
-}
-
-void THttpClient::flush() {
-  // Fetch the contents of the write buffer
-  uint8_t* buf;
-  uint32_t len;
-  writeBuffer_.getBuffer(&buf, &len);
-
-  // Construct the HTTP header
-  std::ostringstream h;
-  h << "POST " << path_ << " HTTP/1.1" << CRLF << "Host: " << host_ << CRLF
-    << "Content-Type: application/x-thrift" << CRLF << "Content-Length: " << len << CRLF
-    << "Accept: application/x-thrift" << CRLF << "User-Agent: Thrift/" << VERSION
-    << " (C++/THttpClient)" << CRLF << CRLF;
-  string header = h.str();
-
-  if (header.size() > (std::numeric_limits<uint32_t>::max)())
-    throw TTransportException("Header too big");
-  // Write the header, then the data, then flush
-  transport_->write((const uint8_t*)header.c_str(), static_cast<uint32_t>(header.size()));
-  transport_->write(buf, len);
-  transport_->flush();
-
-  // Reset the buffer and header variables
-  writeBuffer_.resetBuffer();
-  readHeaders_ = true;
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpClient.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpClient.h
deleted file mode 100644
index 64e7332..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpClient.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_THTTPCLIENT_H_
-#define _THRIFT_TRANSPORT_THTTPCLIENT_H_ 1
-
-#include <thrift/transport/THttpTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-class THttpClient : public THttpTransport {
-public:
-  THttpClient(boost::shared_ptr<TTransport> transport, std::string host, std::string path = "");
-
-  THttpClient(std::string host, int port, std::string path = "");
-
-  virtual ~THttpClient();
-
-  virtual void flush();
-
-protected:
-  std::string host_;
-  std::string path_;
-
-  virtual void parseHeader(char* header);
-  virtual bool parseStatusLine(char* status);
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_THTTPCLIENT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpServer.cpp
deleted file mode 100644
index c89ab94..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpServer.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <cstdlib>
-#include <sstream>
-#include <iostream>
-
-#include <thrift/transport/THttpServer.h>
-#include <thrift/transport/TSocket.h>
-#if defined(_MSC_VER) || defined(__MINGW32__)
-  #include <Shlwapi.h>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using namespace std;
-
-THttpServer::THttpServer(boost::shared_ptr<TTransport> transport) : THttpTransport(transport) {
-}
-
-THttpServer::~THttpServer() {
-}
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-  #define THRIFT_strncasecmp(str1, str2, len) _strnicmp(str1, str2, len)
-  #define THRIFT_strcasestr(haystack, needle) StrStrIA(haystack, needle)
-#else
-  #define THRIFT_strncasecmp(str1, str2, len) strncasecmp(str1, str2, len)
-  #define THRIFT_strcasestr(haystack, needle) strcasestr(haystack, needle)
-#endif
-
-void THttpServer::parseHeader(char* header) {
-  char* colon = strchr(header, ':');
-  if (colon == NULL) {
-    return;
-  }
-  size_t sz = colon - header;
-  char* value = colon + 1;
-
-  if (THRIFT_strncasecmp(header, "Transfer-Encoding", sz) == 0) {
-    if (THRIFT_strcasestr(value, "chunked") != NULL) {
-      chunked_ = true;
-    }
-  } else if (THRIFT_strncasecmp(header, "Content-length", sz) == 0) {
-    chunked_ = false;
-    contentLength_ = atoi(value);
-  } else if (strncmp(header, "X-Forwarded-For", sz) == 0) {
-    origin_ = value;
-  }
-}
-
-bool THttpServer::parseStatusLine(char* status) {
-  char* method = status;
-
-  char* path = strchr(method, ' ');
-  if (path == NULL) {
-    throw TTransportException(string("Bad Status: ") + status);
-  }
-
-  *path = '\0';
-  while (*(++path) == ' ') {
-  };
-
-  char* http = strchr(path, ' ');
-  if (http == NULL) {
-    throw TTransportException(string("Bad Status: ") + status);
-  }
-  *http = '\0';
-
-  if (strcmp(method, "POST") == 0) {
-    // POST method ok, looking for content.
-    return true;
-  } else if (strcmp(method, "OPTIONS") == 0) {
-    // preflight OPTIONS method, we don't need further content.
-    // how to graciously close connection?
-    uint8_t* buf;
-    uint32_t len;
-    writeBuffer_.getBuffer(&buf, &len);
-
-    // Construct the HTTP header
-    std::ostringstream h;
-    h << "HTTP/1.1 200 OK" << CRLF << "Date: " << getTimeRFC1123() << CRLF
-      << "Access-Control-Allow-Origin: *" << CRLF << "Access-Control-Allow-Methods: POST, OPTIONS"
-      << CRLF << "Access-Control-Allow-Headers: Content-Type" << CRLF << CRLF;
-    string header = h.str();
-
-    // Write the header, then the data, then flush
-    transport_->write((const uint8_t*)header.c_str(), static_cast<uint32_t>(header.size()));
-    transport_->write(buf, len);
-    transport_->flush();
-
-    // Reset the buffer and header variables
-    writeBuffer_.resetBuffer();
-    readHeaders_ = true;
-    return true;
-  }
-  throw TTransportException(string("Bad Status (unsupported method): ") + status);
-}
-
-void THttpServer::flush() {
-  // Fetch the contents of the write buffer
-  uint8_t* buf;
-  uint32_t len;
-  writeBuffer_.getBuffer(&buf, &len);
-
-  // Construct the HTTP header
-  std::ostringstream h;
-  h << "HTTP/1.1 200 OK" << CRLF << "Date: " << getTimeRFC1123() << CRLF << "Server: Thrift/"
-    << VERSION << CRLF << "Access-Control-Allow-Origin: *" << CRLF
-    << "Content-Type: application/x-thrift" << CRLF << "Content-Length: " << len << CRLF
-    << "Connection: Keep-Alive" << CRLF << CRLF;
-  string header = h.str();
-
-  // Write the header, then the data, then flush
-  // cast should be fine, because none of "header" is under attacker control
-  transport_->write((const uint8_t*)header.c_str(), static_cast<uint32_t>(header.size()));
-  transport_->write(buf, len);
-  transport_->flush();
-
-  // Reset the buffer and header variables
-  writeBuffer_.resetBuffer();
-  readHeaders_ = true;
-}
-
-std::string THttpServer::getTimeRFC1123() {
-  static const char* Days[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-  static const char* Months[]
-      = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-  char buff[128];
-  time_t t = time(NULL);
-  tm* broken_t = gmtime(&t);
-
-  sprintf(buff,
-          "%s, %d %s %d %d:%d:%d GMT",
-          Days[broken_t->tm_wday],
-          broken_t->tm_mday,
-          Months[broken_t->tm_mon],
-          broken_t->tm_year + 1900,
-          broken_t->tm_hour,
-          broken_t->tm_min,
-          broken_t->tm_sec);
-  return std::string(buff);
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpServer.h
deleted file mode 100644
index a7ab944..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpServer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_THTTPSERVER_H_
-#define _THRIFT_TRANSPORT_THTTPSERVER_H_ 1
-
-#include <thrift/transport/THttpTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-class THttpServer : public THttpTransport {
-public:
-  THttpServer(boost::shared_ptr<TTransport> transport);
-
-  virtual ~THttpServer();
-
-  virtual void flush();
-
-protected:
-  void readHeaders();
-  virtual void parseHeader(char* header);
-  virtual bool parseStatusLine(char* status);
-  std::string getTimeRFC1123();
-};
-
-/**
- * Wraps a transport into HTTP protocol
- */
-class THttpServerTransportFactory : public TTransportFactory {
-public:
-  THttpServerTransportFactory() {}
-
-  virtual ~THttpServerTransportFactory() {}
-
-  /**
-   * Wraps the transport into a buffered one.
-   */
-  virtual boost::shared_ptr<TTransport> getTransport(boost::shared_ptr<TTransport> trans) {
-    return boost::shared_ptr<TTransport>(new THttpServer(trans));
-  }
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_THTTPSERVER_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpTransport.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpTransport.cpp
deleted file mode 100644
index f93df23..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpTransport.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <sstream>
-
-#include <thrift/transport/THttpTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using namespace std;
-
-// Yeah, yeah, hacky to put these here, I know.
-const char* THttpTransport::CRLF = "\r\n";
-const int THttpTransport::CRLF_LEN = 2;
-
-THttpTransport::THttpTransport(boost::shared_ptr<TTransport> transport)
-  : transport_(transport),
-    origin_(""),
-    readHeaders_(true),
-    chunked_(false),
-    chunkedDone_(false),
-    chunkSize_(0),
-    contentLength_(0),
-    httpBuf_(NULL),
-    httpPos_(0),
-    httpBufLen_(0),
-    httpBufSize_(1024) {
-  init();
-}
-
-void THttpTransport::init() {
-  httpBuf_ = (char*)std::malloc(httpBufSize_ + 1);
-  if (httpBuf_ == NULL) {
-    throw std::bad_alloc();
-  }
-  httpBuf_[httpBufLen_] = '\0';
-}
-
-THttpTransport::~THttpTransport() {
-  if (httpBuf_ != NULL) {
-    std::free(httpBuf_);
-  }
-}
-
-uint32_t THttpTransport::read(uint8_t* buf, uint32_t len) {
-  if (readBuffer_.available_read() == 0) {
-    readBuffer_.resetBuffer();
-    uint32_t got = readMoreData();
-    if (got == 0) {
-      return 0;
-    }
-  }
-  return readBuffer_.read(buf, len);
-}
-
-uint32_t THttpTransport::readEnd() {
-  // Read any pending chunked data (footers etc.)
-  if (chunked_) {
-    while (!chunkedDone_) {
-      readChunked();
-    }
-  }
-  return 0;
-}
-
-uint32_t THttpTransport::readMoreData() {
-  uint32_t size;
-
-  // Get more data!
-  refill();
-
-  if (readHeaders_) {
-    readHeaders();
-  }
-
-  if (chunked_) {
-    size = readChunked();
-  } else {
-    size = readContent(contentLength_);
-    readHeaders_ = true;
-  }
-
-  return size;
-}
-
-uint32_t THttpTransport::readChunked() {
-  uint32_t length = 0;
-
-  char* line = readLine();
-  uint32_t chunkSize = parseChunkSize(line);
-  if (chunkSize == 0) {
-    readChunkedFooters();
-  } else {
-    // Read data content
-    length += readContent(chunkSize);
-    // Read trailing CRLF after content
-    readLine();
-  }
-  return length;
-}
-
-void THttpTransport::readChunkedFooters() {
-  // End of data, read footer lines until a blank one appears
-  while (true) {
-    char* line = readLine();
-    if (strlen(line) == 0) {
-      chunkedDone_ = true;
-      break;
-    }
-  }
-}
-
-uint32_t THttpTransport::parseChunkSize(char* line) {
-  char* semi = strchr(line, ';');
-  if (semi != NULL) {
-    *semi = '\0';
-  }
-  uint32_t size = 0;
-  sscanf(line, "%x", &size);
-  return size;
-}
-
-uint32_t THttpTransport::readContent(uint32_t size) {
-  uint32_t need = size;
-  while (need > 0) {
-    uint32_t avail = httpBufLen_ - httpPos_;
-    if (avail == 0) {
-      // We have given all the data, reset position to head of the buffer
-      httpPos_ = 0;
-      httpBufLen_ = 0;
-      refill();
-
-      // Now have available however much we read
-      avail = httpBufLen_;
-    }
-    uint32_t give = avail;
-    if (need < give) {
-      give = need;
-    }
-    readBuffer_.write((uint8_t*)(httpBuf_ + httpPos_), give);
-    httpPos_ += give;
-    need -= give;
-  }
-  return size;
-}
-
-char* THttpTransport::readLine() {
-  while (true) {
-    char* eol = NULL;
-
-    eol = strstr(httpBuf_ + httpPos_, CRLF);
-
-    // No CRLF yet?
-    if (eol == NULL) {
-      // Shift whatever we have now to front and refill
-      shift();
-      refill();
-    } else {
-      // Return pointer to next line
-      *eol = '\0';
-      char* line = httpBuf_ + httpPos_;
-      httpPos_ = static_cast<uint32_t>((eol - httpBuf_) + CRLF_LEN);
-      return line;
-    }
-  }
-}
-
-void THttpTransport::shift() {
-  if (httpBufLen_ > httpPos_) {
-    // Shift down remaining data and read more
-    uint32_t length = httpBufLen_ - httpPos_;
-    memmove(httpBuf_, httpBuf_ + httpPos_, length);
-    httpBufLen_ = length;
-  } else {
-    httpBufLen_ = 0;
-  }
-  httpPos_ = 0;
-  httpBuf_[httpBufLen_] = '\0';
-}
-
-void THttpTransport::refill() {
-  uint32_t avail = httpBufSize_ - httpBufLen_;
-  if (avail <= (httpBufSize_ / 4)) {
-    httpBufSize_ *= 2;
-    httpBuf_ = (char*)std::realloc(httpBuf_, httpBufSize_ + 1);
-    if (httpBuf_ == NULL) {
-      throw std::bad_alloc();
-    }
-  }
-
-  // Read more data
-  uint32_t got = transport_->read((uint8_t*)(httpBuf_ + httpBufLen_), httpBufSize_ - httpBufLen_);
-  httpBufLen_ += got;
-  httpBuf_[httpBufLen_] = '\0';
-
-  if (got == 0) {
-    throw TTransportException(TTransportException::END_OF_FILE, "Could not refill buffer");
-  }
-}
-
-void THttpTransport::readHeaders() {
-  // Initialize headers state variables
-  contentLength_ = 0;
-  chunked_ = false;
-  chunkedDone_ = false;
-  chunkSize_ = 0;
-
-  // Control state flow
-  bool statusLine = true;
-  bool finished = false;
-
-  // Loop until headers are finished
-  while (true) {
-    char* line = readLine();
-
-    if (strlen(line) == 0) {
-      if (finished) {
-        readHeaders_ = false;
-        return;
-      } else {
-        // Must have been an HTTP 100, keep going for another status line
-        statusLine = true;
-      }
-    } else {
-      if (statusLine) {
-        statusLine = false;
-        finished = parseStatusLine(line);
-      } else {
-        parseHeader(line);
-      }
-    }
-  }
-}
-
-void THttpTransport::write(const uint8_t* buf, uint32_t len) {
-  writeBuffer_.write(buf, len);
-}
-
-const std::string THttpTransport::getOrigin() {
-  std::ostringstream oss;
-  if (!origin_.empty()) {
-    oss << origin_ << ", ";
-  }
-  oss << transport_->getOrigin();
-  return oss.str();
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpTransport.h
deleted file mode 100644
index a9f564c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/THttpTransport.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_THTTPTRANSPORT_H_
-#define _THRIFT_TRANSPORT_THTTPTRANSPORT_H_ 1
-
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TVirtualTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * HTTP implementation of the thrift transport. This was irritating
- * to write, but the alternatives in C++ land are daunting. Linking CURL
- * requires 23 dynamic libraries last time I checked (WTF?!?). All we have
- * here is a VERY basic HTTP/1.1 client which supports HTTP 100 Continue,
- * chunked transfer encoding, keepalive, etc. Tested against Apache.
- */
-class THttpTransport : public TVirtualTransport<THttpTransport> {
-public:
-  THttpTransport(boost::shared_ptr<TTransport> transport);
-
-  virtual ~THttpTransport();
-
-  void open() { transport_->open(); }
-
-  bool isOpen() { return transport_->isOpen(); }
-
-  bool peek() { return transport_->peek(); }
-
-  void close() { transport_->close(); }
-
-  uint32_t read(uint8_t* buf, uint32_t len);
-
-  uint32_t readEnd();
-
-  void write(const uint8_t* buf, uint32_t len);
-
-  virtual void flush() = 0;
-
-  virtual const std::string getOrigin();
-
-protected:
-  boost::shared_ptr<TTransport> transport_;
-  std::string origin_;
-
-  TMemoryBuffer writeBuffer_;
-  TMemoryBuffer readBuffer_;
-
-  bool readHeaders_;
-  bool chunked_;
-  bool chunkedDone_;
-  uint32_t chunkSize_;
-  uint32_t contentLength_;
-
-  char* httpBuf_;
-  uint32_t httpPos_;
-  uint32_t httpBufLen_;
-  uint32_t httpBufSize_;
-
-  virtual void init();
-
-  uint32_t readMoreData();
-  char* readLine();
-
-  void readHeaders();
-  virtual void parseHeader(char* header) = 0;
-  virtual bool parseStatusLine(char* status) = 0;
-
-  uint32_t readChunked();
-  void readChunkedFooters();
-  uint32_t parseChunkSize(char* line);
-
-  uint32_t readContent(uint32_t size);
-
-  void refill();
-  void shift();
-
-  static const char* CRLF;
-  static const int CRLF_LEN;
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_THTTPCLIENT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipe.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipe.cpp
deleted file mode 100644
index 75ce5d2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipe.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-#include <thrift/transport/TTransportException.h>
-#include <thrift/transport/TPipe.h>
-#ifdef _WIN32
-#include <thrift/windows/OverlappedSubmissionThread.h>
-#include <thrift/windows/Sync.h>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using namespace std;
-
-/**
-* TPipe implementation.
-*/
-
-#ifdef _WIN32
-
-uint32_t pipe_read(HANDLE pipe, uint8_t* buf, uint32_t len);
-void pipe_write(HANDLE pipe, const uint8_t* buf, uint32_t len);
-
-uint32_t pseudo_sync_read(HANDLE pipe, HANDLE event, uint8_t* buf, uint32_t len);
-void pseudo_sync_write(HANDLE pipe, HANDLE event, const uint8_t* buf, uint32_t len);
-
-class TPipeImpl : boost::noncopyable {
-public:
-  TPipeImpl() {}
-  virtual ~TPipeImpl() {}
-  virtual uint32_t read(uint8_t* buf, uint32_t len) = 0;
-  virtual void write(const uint8_t* buf, uint32_t len) = 0;
-  virtual HANDLE getPipeHandle() = 0; // doubles as the read handle for anon pipe
-  virtual void setPipeHandle(HANDLE pipehandle) = 0;
-  virtual HANDLE getWrtPipeHandle() { return INVALID_HANDLE_VALUE; }
-  virtual void setWrtPipeHandle(HANDLE) {}
-  virtual bool isBufferedDataAvailable() { return false; }
-  virtual HANDLE getNativeWaitHandle() { return INVALID_HANDLE_VALUE; }
-};
-
-class TNamedPipeImpl : public TPipeImpl {
-public:
-  explicit TNamedPipeImpl(TAutoHandle &pipehandle) : Pipe_(pipehandle.release()) {}
-  virtual ~TNamedPipeImpl() {}
-  virtual uint32_t read(uint8_t* buf, uint32_t len) {
-    return pseudo_sync_read(Pipe_.h, read_event_.h, buf, len);
-  }
-  virtual void write(const uint8_t* buf, uint32_t len) {
-    pseudo_sync_write(Pipe_.h, write_event_.h, buf, len);
-  }
-
-  virtual HANDLE getPipeHandle() { return Pipe_.h; }
-  virtual void setPipeHandle(HANDLE pipehandle) { Pipe_.reset(pipehandle); }
-
-private:
-  TManualResetEvent read_event_;
-  TManualResetEvent write_event_;
-  TAutoHandle Pipe_;
-};
-
-class TAnonPipeImpl : public TPipeImpl {
-public:
-  TAnonPipeImpl(HANDLE PipeRd, HANDLE PipeWrt) : PipeRd_(PipeRd), PipeWrt_(PipeWrt) {}
-  virtual ~TAnonPipeImpl() {}
-  virtual uint32_t read(uint8_t* buf, uint32_t len) { return pipe_read(PipeRd_.h, buf, len); }
-  virtual void write(const uint8_t* buf, uint32_t len) { pipe_write(PipeWrt_.h, buf, len); }
-
-  virtual HANDLE getPipeHandle() { return PipeRd_.h; }
-  virtual void setPipeHandle(HANDLE PipeRd) { PipeRd_.reset(PipeRd); }
-  virtual HANDLE getWrtPipeHandle() { return PipeWrt_.h; }
-  virtual void setWrtPipeHandle(HANDLE PipeWrt) { PipeWrt_.reset(PipeWrt); }
-
-private:
-  TAutoHandle PipeRd_;
-  TAutoHandle PipeWrt_;
-};
-
-// If you want a select-like loop to work, use this subclass.  Be warned...
-// the read implementation has several context switches, so this is slower
-// than using the regular named pipe implementation
-class TWaitableNamedPipeImpl : public TPipeImpl {
-public:
-  explicit TWaitableNamedPipeImpl(TAutoHandle &pipehandle)
-    : begin_unread_idx_(0), end_unread_idx_(0) {
-    readOverlap_.action = TOverlappedWorkItem::READ;
-    readOverlap_.h = pipehandle.h;
-    cancelOverlap_.action = TOverlappedWorkItem::CANCELIO;
-    cancelOverlap_.h = pipehandle.h;
-    buffer_.resize(1024 /*arbitrary buffer size*/, '\0');
-    beginAsyncRead(&buffer_[0], static_cast<uint32_t>(buffer_.size()));
-    Pipe_.reset(pipehandle.release());
-  }
-  virtual ~TWaitableNamedPipeImpl() {
-    // see if there is an outstanding read request
-    if (begin_unread_idx_ == end_unread_idx_) {
-      // if so, cancel it, and wait for the dead completion
-      thread_->addWorkItem(&cancelOverlap_);
-      readOverlap_.overlappedResults(false /*ignore errors*/);
-    }
-  }
-  virtual uint32_t read(uint8_t* buf, uint32_t len);
-  virtual void write(const uint8_t* buf, uint32_t len) {
-    pseudo_sync_write(Pipe_.h, write_event_.h, buf, len);
-  }
-
-  virtual HANDLE getPipeHandle() { return Pipe_.h; }
-  virtual void setPipeHandle(HANDLE pipehandle) { Pipe_.reset(pipehandle); }
-  virtual bool isBufferedDataAvailable() { return begin_unread_idx_ < end_unread_idx_; }
-  virtual HANDLE getNativeWaitHandle() { return ready_event_.h; }
-
-private:
-  void beginAsyncRead(uint8_t* buf, uint32_t len);
-  uint32_t endAsyncRead();
-
-  TAutoOverlapThread thread_;
-  TAutoHandle Pipe_;
-  TOverlappedWorkItem readOverlap_;
-  TOverlappedWorkItem cancelOverlap_;
-  TManualResetEvent ready_event_;
-  TManualResetEvent write_event_;
-  std::vector<uint8_t> buffer_;
-  uint32_t begin_unread_idx_;
-  uint32_t end_unread_idx_;
-};
-
-void TWaitableNamedPipeImpl::beginAsyncRead(uint8_t* buf, uint32_t len) {
-  begin_unread_idx_ = end_unread_idx_ = 0;
-  readOverlap_.reset(buf, len, ready_event_.h);
-  thread_->addWorkItem(&readOverlap_);
-  if (readOverlap_.success == FALSE && readOverlap_.last_error != ERROR_IO_PENDING) {
-    GlobalOutput.perror("TPipe ::ReadFile errored GLE=", readOverlap_.last_error);
-    throw TTransportException(TTransportException::UNKNOWN, "TPipe: ReadFile failed");
-  }
-}
-
-uint32_t TWaitableNamedPipeImpl::endAsyncRead() {
-  return readOverlap_.overlappedResults();
-}
-
-uint32_t TWaitableNamedPipeImpl::read(uint8_t* buf, uint32_t len) {
-  if (begin_unread_idx_ == end_unread_idx_) {
-    end_unread_idx_ = endAsyncRead();
-  }
-
-  uint32_t bytes_to_copy = (std::min)(len, end_unread_idx_ - begin_unread_idx_);
-  memcpy(buf, &buffer_[begin_unread_idx_], bytes_to_copy);
-  begin_unread_idx_ += bytes_to_copy;
-  if (begin_unread_idx_ != end_unread_idx_) {
-    assert(len == bytes_to_copy);
-    // we were able to fulfill the read with just the bytes in our
-    // buffer, and we still have buffer left
-    return bytes_to_copy;
-  }
-  uint32_t bytes_copied = bytes_to_copy;
-
-  // all of the requested data has been read.  Kick off an async read for the next round.
-  beginAsyncRead(&buffer_[0], static_cast<uint32_t>(buffer_.size()));
-
-  return bytes_copied;
-}
-
-void pseudo_sync_write(HANDLE pipe, HANDLE event, const uint8_t* buf, uint32_t len) {
-  OVERLAPPED tempOverlap;
-  memset(&tempOverlap, 0, sizeof(tempOverlap));
-  tempOverlap.hEvent = event;
-
-  uint32_t written = 0;
-  while (written < len) {
-    BOOL result = ::WriteFile(pipe, buf + written, len - written, NULL, &tempOverlap);
-
-    if (result == FALSE && ::GetLastError() != ERROR_IO_PENDING) {
-      GlobalOutput.perror("TPipe ::WriteFile errored GLE=", ::GetLastError());
-      throw TTransportException(TTransportException::UNKNOWN, "TPipe: write failed");
-    }
-
-    DWORD bytes = 0;
-    result = ::GetOverlappedResult(pipe, &tempOverlap, &bytes, TRUE);
-    if (!result) {
-      GlobalOutput.perror("TPipe ::GetOverlappedResult errored GLE=", ::GetLastError());
-      throw TTransportException(TTransportException::UNKNOWN, "TPipe: GetOverlappedResult failed");
-    }
-    written += bytes;
-  }
-}
-
-uint32_t pseudo_sync_read(HANDLE pipe, HANDLE event, uint8_t* buf, uint32_t len) {
-  OVERLAPPED tempOverlap;
-  memset(&tempOverlap, 0, sizeof(tempOverlap));
-  tempOverlap.hEvent = event;
-
-  BOOL result = ::ReadFile(pipe, buf, len, NULL, &tempOverlap);
-
-  if (result == FALSE && ::GetLastError() != ERROR_IO_PENDING) {
-    GlobalOutput.perror("TPipe ::ReadFile errored GLE=", ::GetLastError());
-    throw TTransportException(TTransportException::UNKNOWN, "TPipe: read failed");
-  }
-
-  DWORD bytes = 0;
-  result = ::GetOverlappedResult(pipe, &tempOverlap, &bytes, TRUE);
-  if (!result) {
-    GlobalOutput.perror("TPipe ::GetOverlappedResult errored GLE=", ::GetLastError());
-    throw TTransportException(TTransportException::UNKNOWN, "TPipe: GetOverlappedResult failed");
-  }
-  return bytes;
-}
-
-//---- Constructors ----
-TPipe::TPipe(TAutoHandle &Pipe)
-  : impl_(new TWaitableNamedPipeImpl(Pipe)), TimeoutSeconds_(3), isAnonymous_(false) {
-}
-
-TPipe::TPipe(HANDLE Pipe)
-  : TimeoutSeconds_(3), isAnonymous_(false)
-{
-  TAutoHandle pipeHandle(Pipe);
-  impl_.reset(new TWaitableNamedPipeImpl(pipeHandle));
-}
-
-TPipe::TPipe(const char* pipename) : TimeoutSeconds_(3), isAnonymous_(false) {
-  setPipename(pipename);
-}
-
-TPipe::TPipe(const std::string& pipename) : TimeoutSeconds_(3), isAnonymous_(false) {
-  setPipename(pipename);
-}
-
-TPipe::TPipe(HANDLE PipeRd, HANDLE PipeWrt)
-  : impl_(new TAnonPipeImpl(PipeRd, PipeWrt)), TimeoutSeconds_(3), isAnonymous_(true) {
-}
-
-TPipe::TPipe() : TimeoutSeconds_(3), isAnonymous_(false) {
-}
-
-TPipe::~TPipe() {
-}
-
-//---------------------------------------------------------
-// Transport callbacks
-//---------------------------------------------------------
-bool TPipe::isOpen() {
-  return impl_.get() != NULL;
-}
-
-bool TPipe::peek() {
-  return isOpen();
-}
-
-void TPipe::open() {
-  if (isOpen())
-    return;
-
-  TAutoHandle hPipe;
-  do {
-    DWORD flags = FILE_FLAG_OVERLAPPED; // async mode, so we can do reads at the same time as writes
-    hPipe.reset(CreateFileA(pipename_.c_str(),
-                            GENERIC_READ | GENERIC_WRITE,
-                            0,             // no sharing
-                            NULL,          // default security attributes
-                            OPEN_EXISTING, // opens existing pipe
-                            flags,
-                            NULL)); // no template file
-
-    if (hPipe.h != INVALID_HANDLE_VALUE)
-      break; // success!
-
-    if (::GetLastError() != ERROR_PIPE_BUSY) {
-      GlobalOutput.perror("TPipe::open ::CreateFile errored GLE=", ::GetLastError());
-      throw TTransportException(TTransportException::NOT_OPEN, "Unable to open pipe");
-    }
-  } while (::WaitNamedPipeA(pipename_.c_str(), TimeoutSeconds_ * 1000));
-
-  if (hPipe.h == INVALID_HANDLE_VALUE) {
-    GlobalOutput.perror("TPipe::open ::CreateFile errored GLE=", ::GetLastError());
-    throw TTransportException(TTransportException::NOT_OPEN, "Unable to open pipe");
-  }
-
-  impl_.reset(new TNamedPipeImpl(hPipe));
-}
-
-void TPipe::close() {
-  impl_.reset();
-}
-
-uint32_t TPipe::read(uint8_t* buf, uint32_t len) {
-  if (!isOpen())
-    throw TTransportException(TTransportException::NOT_OPEN, "Called read on non-open pipe");
-  return impl_->read(buf, len);
-}
-
-uint32_t pipe_read(HANDLE pipe, uint8_t* buf, uint32_t len) {
-  DWORD cbRead;
-  int fSuccess = ReadFile(pipe,    // pipe handle
-                          buf,     // buffer to receive reply
-                          len,     // size of buffer
-                          &cbRead, // number of bytes read
-                          NULL);   // not overlapped
-
-  if (!fSuccess && GetLastError() != ERROR_MORE_DATA)
-    return 0; // No more data, possibly because client disconnected.
-
-  return cbRead;
-}
-
-void TPipe::write(const uint8_t* buf, uint32_t len) {
-  if (!isOpen())
-    throw TTransportException(TTransportException::NOT_OPEN, "Called write on non-open pipe");
-  impl_->write(buf, len);
-}
-
-void pipe_write(HANDLE pipe, const uint8_t* buf, uint32_t len) {
-  DWORD cbWritten;
-  int fSuccess = WriteFile(pipe,       // pipe handle
-                           buf,        // message
-                           len,        // message length
-                           &cbWritten, // bytes written
-                           NULL);      // not overlapped
-
-  if (!fSuccess)
-    throw TTransportException(TTransportException::NOT_OPEN, "Write to pipe failed");
-}
-
-//---------------------------------------------------------
-// Accessors
-//---------------------------------------------------------
-
-string TPipe::getPipename() {
-  return pipename_;
-}
-
-void TPipe::setPipename(const std::string& pipename) {
-  if (pipename.find("\\\\") == -1)
-    pipename_ = "\\\\.\\pipe\\" + pipename;
-  else
-    pipename_ = pipename;
-}
-
-HANDLE TPipe::getPipeHandle() {
-  if (impl_)
-    return impl_->getPipeHandle();
-  return INVALID_HANDLE_VALUE;
-}
-
-void TPipe::setPipeHandle(HANDLE pipehandle) {
-  if (isAnonymous_)
-    impl_->setPipeHandle(pipehandle);
-  else
-  {
-    TAutoHandle pipe(pipehandle);
-    impl_.reset(new TNamedPipeImpl(pipe));
-  }
-}
-
-HANDLE TPipe::getWrtPipeHandle() {
-  if (impl_)
-    return impl_->getWrtPipeHandle();
-  return INVALID_HANDLE_VALUE;
-}
-
-void TPipe::setWrtPipeHandle(HANDLE pipehandle) {
-  if (impl_)
-    impl_->setWrtPipeHandle(pipehandle);
-}
-
-HANDLE TPipe::getNativeWaitHandle() {
-  if (impl_)
-    return impl_->getNativeWaitHandle();
-  return INVALID_HANDLE_VALUE;
-}
-
-long TPipe::getConnTimeout() {
-  return TimeoutSeconds_;
-}
-
-void TPipe::setConnTimeout(long seconds) {
-  TimeoutSeconds_ = seconds;
-}
-
-#endif //_WIN32
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipe.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipe.h
deleted file mode 100644
index 5dd8f9a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipe.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TPIPE_H_
-#define _THRIFT_TRANSPORT_TPIPE_H_ 1
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TVirtualTransport.h>
-#ifndef _WIN32
-#include <thrift/transport/TSocket.h>
-#endif
-#ifdef _WIN32
-#include <thrift/windows/Sync.h>
-#endif
-#include <boost/noncopyable.hpp>
-#ifdef _WIN32
-#include <thrift/windows/Sync.h>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Windows Pipes implementation of the TTransport interface.
- * Don't destroy a TPipe at global scope, as that will cause a thread join
- * during DLLMain.  That also means that client objects using TPipe shouldn't be at global
- * scope.
- */
-#ifdef _WIN32
-class TPipeImpl;
-
-class TPipe : public TVirtualTransport<TPipe> {
-public:
-  // Constructs a new pipe object.
-  TPipe();
-  // Named pipe constructors -
-  explicit TPipe(HANDLE Pipe);       // HANDLE is a void*
-  explicit TPipe(TAutoHandle& Pipe); // this ctor will clear out / move from Pipe
-  // need a const char * overload so string literals don't go to the HANDLE overload
-  explicit TPipe(const char* pipename);
-  explicit TPipe(const std::string& pipename);
-  // Anonymous pipe -
-  TPipe(HANDLE PipeRd, HANDLE PipeWrt);
-
-  // Destroys the pipe object, closing it if necessary.
-  virtual ~TPipe();
-
-  // Returns whether the pipe is open & valid.
-  virtual bool isOpen();
-
-  // Checks whether more data is available in the pipe.
-  virtual bool peek();
-
-  // Creates and opens the named/anonymous pipe.
-  virtual void open();
-
-  // Shuts down communications on the pipe.
-  virtual void close();
-
-  // Reads from the pipe.
-  virtual uint32_t read(uint8_t* buf, uint32_t len);
-
-  // Writes to the pipe.
-  virtual void write(const uint8_t* buf, uint32_t len);
-
-  // Accessors
-  std::string getPipename();
-  void setPipename(const std::string& pipename);
-  HANDLE getPipeHandle(); // doubles as the read handle for anon pipe
-  void setPipeHandle(HANDLE pipehandle);
-  HANDLE getWrtPipeHandle();
-  void setWrtPipeHandle(HANDLE pipehandle);
-  long getConnTimeout();
-  void setConnTimeout(long seconds);
-
-  // this function is intended to be used in generic / template situations,
-  // so its name needs to be the same as TPipeServer's
-  HANDLE getNativeWaitHandle();
-
-private:
-  boost::shared_ptr<TPipeImpl> impl_;
-
-  std::string pipename_;
-
-  long TimeoutSeconds_;
-  bool isAnonymous_;
-};
-
-#else
-typedef TSocket TPipe;
-#endif
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TPIPE_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipeServer.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipeServer.cpp
deleted file mode 100644
index cf6b410..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipeServer.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-#include <cstring>
-
-#include <thrift/transport/TPipe.h>
-#include <thrift/transport/TPipeServer.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
-
-#ifdef _WIN32
-#include <thrift/windows/OverlappedSubmissionThread.h>
-#include <AccCtrl.h>
-#include <Aclapi.h>
-#endif //_WIN32
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-#ifdef _WIN32
-
-using namespace std;
-using boost::shared_ptr;
-
-class TPipeServerImpl : boost::noncopyable {
-public:
-  TPipeServerImpl() {}
-  virtual ~TPipeServerImpl() {}
-  virtual void interrupt() = 0;
-  virtual boost::shared_ptr<TTransport> acceptImpl() = 0;
-
-  virtual HANDLE getPipeHandle() = 0;
-  virtual HANDLE getWrtPipeHandle() = 0;
-  virtual HANDLE getClientRdPipeHandle() = 0;
-  virtual HANDLE getClientWrtPipeHandle() = 0;
-  virtual HANDLE getNativeWaitHandle() { return NULL; }
-};
-
-class TAnonPipeServer : public TPipeServerImpl {
-public:
-  TAnonPipeServer() {
-    // The anonymous pipe needs to be created first so that the server can
-    // pass the handles on to the client before the serve (acceptImpl)
-    // blocking call.
-    if (!createAnonPipe()) {
-      GlobalOutput.perror("TPipeServer Create(Anon)Pipe failed, GLE=", GetLastError());
-      throw TTransportException(TTransportException::NOT_OPEN,
-                                " TPipeServer Create(Anon)Pipe failed");
-    }
-  }
-
-  virtual ~TAnonPipeServer() {
-    PipeR_.reset();
-    PipeW_.reset();
-    ClientAnonRead_.reset();
-    ClientAnonWrite_.reset();
-  }
-
-  virtual void interrupt() {} // not currently implemented
-
-  virtual boost::shared_ptr<TTransport> acceptImpl();
-
-  virtual HANDLE getPipeHandle() { return PipeR_.h; }
-  virtual HANDLE getWrtPipeHandle() { return PipeW_.h; }
-  virtual HANDLE getClientRdPipeHandle() { return ClientAnonRead_.h; }
-  virtual HANDLE getClientWrtPipeHandle() { return ClientAnonWrite_.h; }
-
-private:
-  bool createAnonPipe();
-
-  TAutoHandle PipeR_; // Anonymous Pipe (R)
-  TAutoHandle PipeW_; // Anonymous Pipe (W)
-
-  // Client side anonymous pipe handles
-  //? Do we need duplicates to send to client?
-  TAutoHandle ClientAnonRead_;
-  TAutoHandle ClientAnonWrite_;
-};
-
-class TNamedPipeServer : public TPipeServerImpl {
-public:
-  TNamedPipeServer(const std::string& pipename, uint32_t bufsize, uint32_t maxconnections)
-    : stopping_(false), pipename_(pipename), bufsize_(bufsize), maxconns_(maxconnections)
-  {
-    connectOverlap_.action = TOverlappedWorkItem::CONNECT;
-    cancelOverlap_.action = TOverlappedWorkItem::CANCELIO;
-    TAutoCrit lock(pipe_protect_);
-    initiateNamedConnect(lock);
-  }
-  virtual ~TNamedPipeServer() {}
-
-  virtual void interrupt() {
-    TAutoCrit lock(pipe_protect_);
-    cached_client_.reset();
-    if (Pipe_.h != INVALID_HANDLE_VALUE) {
-      stopping_ = true;
-      cancelOverlap_.h = Pipe_.h;
-      // This should wake up GetOverlappedResult
-      thread_->addWorkItem(&cancelOverlap_);
-    }
-  }
-
-  virtual boost::shared_ptr<TTransport> acceptImpl();
-
-  virtual HANDLE getPipeHandle() { return Pipe_.h; }
-  virtual HANDLE getWrtPipeHandle() { return INVALID_HANDLE_VALUE; }
-  virtual HANDLE getClientRdPipeHandle() { return INVALID_HANDLE_VALUE; }
-  virtual HANDLE getClientWrtPipeHandle() { return INVALID_HANDLE_VALUE; }
-  virtual HANDLE getNativeWaitHandle() { return listen_event_.h; }
-
-private:
-  bool createNamedPipe(const TAutoCrit &lockProof);
-  void initiateNamedConnect(const TAutoCrit &lockProof);
-
-  TAutoOverlapThread thread_;
-  TOverlappedWorkItem connectOverlap_;
-  TOverlappedWorkItem cancelOverlap_;
-
-  bool stopping_;
-  std::string pipename_;
-  uint32_t bufsize_;
-  uint32_t maxconns_;
-  TManualResetEvent listen_event_;
-
-  TCriticalSection pipe_protect_;
-  // only read or write these variables underneath a locked pipe_protect_
-  boost::shared_ptr<TPipe> cached_client_;
-  TAutoHandle Pipe_;
-};
-
-HANDLE TPipeServer::getNativeWaitHandle() {
-  if (impl_)
-    return impl_->getNativeWaitHandle();
-  return NULL;
-}
-
-//---- Constructors ----
-TPipeServer::TPipeServer(const std::string& pipename, uint32_t bufsize)
-  : bufsize_(bufsize), isAnonymous_(false) {
-  setMaxConnections(TPIPE_SERVER_MAX_CONNS_DEFAULT);
-  setPipename(pipename);
-}
-
-TPipeServer::TPipeServer(const std::string& pipename, uint32_t bufsize, uint32_t maxconnections)
-  : bufsize_(bufsize), isAnonymous_(false) {
-  setMaxConnections(maxconnections);
-  setPipename(pipename);
-}
-
-TPipeServer::TPipeServer(const std::string& pipename) : bufsize_(1024), isAnonymous_(false) {
-  setMaxConnections(TPIPE_SERVER_MAX_CONNS_DEFAULT);
-  setPipename(pipename);
-}
-
-TPipeServer::TPipeServer(int bufsize) : bufsize_(bufsize), isAnonymous_(true) {
-  setMaxConnections(1);
-  impl_.reset(new TAnonPipeServer);
-}
-
-TPipeServer::TPipeServer() : bufsize_(1024), isAnonymous_(true) {
-  setMaxConnections(1);
-  impl_.reset(new TAnonPipeServer);
-}
-
-//---- Destructor ----
-TPipeServer::~TPipeServer() {}
-
-//---------------------------------------------------------
-// Transport callbacks
-//---------------------------------------------------------
-void TPipeServer::listen() {
-  if (isAnonymous_)
-    return;
-  impl_.reset(new TNamedPipeServer(pipename_, bufsize_, maxconns_));
-}
-
-shared_ptr<TTransport> TPipeServer::acceptImpl() {
-  return impl_->acceptImpl();
-}
-
-shared_ptr<TTransport> TAnonPipeServer::acceptImpl() {
-  // This 0-byte read serves merely as a blocking call.
-  byte buf;
-  DWORD br;
-  int fSuccess = ReadFile(PipeR_.h, // pipe handle
-                          &buf,     // buffer to receive reply
-                          0,        // size of buffer
-                          &br,      // number of bytes read
-                          NULL);    // not overlapped
-
-  if (!fSuccess && GetLastError() != ERROR_MORE_DATA) {
-    GlobalOutput.perror("TPipeServer unable to initiate pipe comms, GLE=", GetLastError());
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              " TPipeServer unable to initiate pipe comms");
-  }
-  shared_ptr<TPipe> client(new TPipe(PipeR_.h, PipeW_.h));
-  return client;
-}
-
-void TNamedPipeServer::initiateNamedConnect(const TAutoCrit &lockProof) {
-  if (stopping_)
-    return;
-  if (!createNamedPipe(lockProof)) {
-    GlobalOutput.perror("TPipeServer CreateNamedPipe failed, GLE=", GetLastError());
-    throw TTransportException(TTransportException::NOT_OPEN, " TPipeServer CreateNamedPipe failed");
-  }
-
-  // The prior connection has been handled, so close the gate
-  ResetEvent(listen_event_.h);
-  connectOverlap_.reset(NULL, 0, listen_event_.h);
-  connectOverlap_.h = Pipe_.h;
-  thread_->addWorkItem(&connectOverlap_);
-
-  // Wait for the client to connect; if it succeeds, the
-  // function returns a nonzero value. If the function returns
-  // zero, GetLastError should return ERROR_PIPE_CONNECTED.
-  if (connectOverlap_.success) {
-    GlobalOutput.printf("Client connected.");
-    cached_client_.reset(new TPipe(Pipe_));
-    // make sure people know that a connection is ready
-    SetEvent(listen_event_.h);
-    return;
-  }
-
-  DWORD dwErr = connectOverlap_.last_error;
-  switch (dwErr) {
-  case ERROR_PIPE_CONNECTED:
-    GlobalOutput.printf("Client connected.");
-    cached_client_.reset(new TPipe(Pipe_));
-    // make sure people know that a connection is ready
-    SetEvent(listen_event_.h);
-    return;
-  case ERROR_IO_PENDING:
-    return; // acceptImpl will do the appropriate WaitForMultipleObjects
-  default:
-    GlobalOutput.perror("TPipeServer ConnectNamedPipe failed, GLE=", dwErr);
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              " TPipeServer ConnectNamedPipe failed");
-  }
-}
-
-shared_ptr<TTransport> TNamedPipeServer::acceptImpl() {
-  {
-    TAutoCrit lock(pipe_protect_);
-    if (cached_client_.get() != NULL) {
-      shared_ptr<TPipe> client;
-      // zero out cached_client, since we are about to return it.
-      client.swap(cached_client_);
-
-      // kick off the next connection before returning
-      initiateNamedConnect(lock);
-      return client; // success!
-    }
-  }
-
-  if (Pipe_.h == INVALID_HANDLE_VALUE) {
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "TNamedPipeServer: someone called accept on a closed pipe server");
-  }
-
-  DWORD dwDummy = 0;
-
-  // For the most part, Pipe_ should be protected with pipe_protect_.  We can't
-  // reasonably do that here though without breaking interruptability.  However,
-  // this should be safe, though I'm not happy about it.  We only need to ensure
-  // that no one writes / modifies Pipe_.h while we are reading it.  Well, the
-  // only two things that should be modifying Pipe_ are acceptImpl, the
-  // functions it calls, and the destructor.  Those things shouldn't be run
-  // concurrently anyway.  So this call is 'really' just a read that may happen
-  // concurrently with interrupt, and that should be fine.
-  if (GetOverlappedResult(Pipe_.h, &connectOverlap_.overlap, &dwDummy, TRUE)) {
-    TAutoCrit lock(pipe_protect_);
-    GlobalOutput.printf("Client connected.");
-    shared_ptr<TPipe> client(new TPipe(Pipe_));
-    // kick off the next connection before returning
-    initiateNamedConnect(lock);
-    return client; // success!
-  }
-  // if we got here, then we are in an error / shutdown case
-  DWORD gle = GetLastError(); // save error before doing cleanup
-  GlobalOutput.perror("TPipeServer ConnectNamedPipe GLE=", gle);
-  throw TTransportException(TTransportException::NOT_OPEN, "TPipeServer: client connection failed");
-}
-
-void TPipeServer::interrupt() {
-  if (impl_)
-    impl_->interrupt();
-}
-
-void TPipeServer::close() {
-  impl_.reset();
-}
-
-bool TNamedPipeServer::createNamedPipe(const TAutoCrit & /*lockProof*/) {
-
-  // Windows - set security to allow non-elevated apps
-  // to access pipes created by elevated apps.
-  SID_IDENTIFIER_AUTHORITY SIDAuthWorld = SECURITY_WORLD_SID_AUTHORITY;
-  PSID everyone_sid = NULL;
-  AllocateAndInitializeSid(
-      &SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &everyone_sid);
-
-  EXPLICIT_ACCESS ea;
-  ZeroMemory(&ea, sizeof(EXPLICIT_ACCESS));
-  ea.grfAccessPermissions = SPECIFIC_RIGHTS_ALL | STANDARD_RIGHTS_ALL;
-  ea.grfAccessMode = SET_ACCESS;
-  ea.grfInheritance = NO_INHERITANCE;
-  ea.Trustee.TrusteeForm = TRUSTEE_IS_SID;
-  ea.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
-  ea.Trustee.ptstrName = static_cast<LPTSTR>(everyone_sid);
-
-  PACL acl = NULL;
-  SetEntriesInAcl(1, &ea, NULL, &acl);
-
-  PSECURITY_DESCRIPTOR sd = (PSECURITY_DESCRIPTOR)LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH);
-  InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION);
-  SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE);
-
-  SECURITY_ATTRIBUTES sa;
-  sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-  sa.lpSecurityDescriptor = sd;
-  sa.bInheritHandle = FALSE;
-
-  // Create an instance of the named pipe
-  TAutoHandle hPipe(CreateNamedPipeA(pipename_.c_str(),    // pipe name
-                                     PIPE_ACCESS_DUPLEX |  // read/write access
-                                     FILE_FLAG_OVERLAPPED, // async mode
-                                     PIPE_TYPE_BYTE |      // byte type pipe
-                                     PIPE_READMODE_BYTE,   // byte read mode
-                                     maxconns_,            // max. instances
-                                     bufsize_,             // output buffer size
-                                     bufsize_,             // input buffer size
-                                     0,                    // client time-out
-                                     &sa));                // security attributes
-
-  DWORD lastError = GetLastError();
-  LocalFree(sd);
-  LocalFree(acl);
-  FreeSid(everyone_sid);
-
-  if (hPipe.h == INVALID_HANDLE_VALUE) {
-    Pipe_.reset();
-    GlobalOutput.perror("TPipeServer::TCreateNamedPipe() GLE=", lastError);
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "TCreateNamedPipe() failed",
-							  lastError);
-    return false;
-  }
-
-  Pipe_.reset(hPipe.release());
-  return true;
-}
-
-bool TAnonPipeServer::createAnonPipe() {
-  SECURITY_ATTRIBUTES sa;
-  SECURITY_DESCRIPTOR sd; // security information for pipes
-
-  InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION);
-  SetSecurityDescriptorDacl(&sd, true, NULL, false);
-  sa.lpSecurityDescriptor = &sd;
-  sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-  sa.bInheritHandle = true; // allow passing handle to child
-
-  HANDLE ClientAnonReadH, PipeW_H, ClientAnonWriteH, Pipe_H;
-  if (!CreatePipe(&ClientAnonReadH, &PipeW_H, &sa, 0)) // create stdin pipe
-  {
-    GlobalOutput.perror("TPipeServer CreatePipe (anon) failed, GLE=", GetLastError());
-    return false;
-  }
-  if (!CreatePipe(&Pipe_H, &ClientAnonWriteH, &sa, 0)) // create stdout pipe
-  {
-    GlobalOutput.perror("TPipeServer CreatePipe (anon) failed, GLE=", GetLastError());
-    CloseHandle(ClientAnonReadH);
-    CloseHandle(PipeW_H);
-    return false;
-  }
-
-  ClientAnonRead_.reset(ClientAnonReadH);
-  ClientAnonWrite_.reset(ClientAnonWriteH);
-  PipeR_.reset(Pipe_H);
-  PipeW_.reset(PipeW_H);
-
-  return true;
-}
-
-//---------------------------------------------------------
-// Accessors
-//---------------------------------------------------------
-string TPipeServer::getPipename() {
-  return pipename_;
-}
-
-void TPipeServer::setPipename(const std::string& pipename) {
-  if (pipename.find("\\\\") == -1)
-    pipename_ = "\\\\.\\pipe\\" + pipename;
-  else
-    pipename_ = pipename;
-}
-
-int TPipeServer::getBufferSize() {
-  return bufsize_;
-}
-void TPipeServer::setBufferSize(int bufsize) {
-  bufsize_ = bufsize;
-}
-
-HANDLE TPipeServer::getPipeHandle() {
-  return impl_ ? impl_->getPipeHandle() : INVALID_HANDLE_VALUE;
-}
-HANDLE TPipeServer::getWrtPipeHandle() {
-  return impl_ ? impl_->getWrtPipeHandle() : INVALID_HANDLE_VALUE;
-}
-HANDLE TPipeServer::getClientRdPipeHandle() {
-  return impl_ ? impl_->getClientRdPipeHandle() : INVALID_HANDLE_VALUE;
-}
-HANDLE TPipeServer::getClientWrtPipeHandle() {
-  return impl_ ? impl_->getClientWrtPipeHandle() : INVALID_HANDLE_VALUE;
-}
-
-bool TPipeServer::getAnonymous() {
-  return isAnonymous_;
-}
-void TPipeServer::setAnonymous(bool anon) {
-  isAnonymous_ = anon;
-}
-
-void TPipeServer::setMaxConnections(uint32_t maxconnections) {
-  if (maxconnections == 0)
-    maxconns_ = 1;
-  else if (maxconnections > PIPE_UNLIMITED_INSTANCES)
-    maxconns_ = PIPE_UNLIMITED_INSTANCES;
-  else
-    maxconns_ = maxconnections;
-}
-
-#endif //_WIN32
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipeServer.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipeServer.h
deleted file mode 100644
index 405793e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TPipeServer.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSERVERWINPIPES_H_
-#define _THRIFT_TRANSPORT_TSERVERWINPIPES_H_ 1
-
-#include <thrift/transport/TServerTransport.h>
-#include <boost/shared_ptr.hpp>
-#ifndef _WIN32
-#include <thrift/transport/TServerSocket.h>
-#endif
-#ifdef _WIN32
-#include <thrift/windows/Sync.h>
-#endif
-
-#define TPIPE_SERVER_MAX_CONNS_DEFAULT PIPE_UNLIMITED_INSTANCES
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Windows Pipes implementation of TServerTransport.
- * Don't destroy a TPipeServer at global scope, as that will cause a thread join
- * during DLLMain.  That also means that TServer's using TPipeServer shouldn't be at global
- * scope.
- */
-#ifdef _WIN32
-class TPipeServerImpl;
-class TPipe;
-
-class TPipeServer : public TServerTransport {
-public:
-  // Constructors
-  // Named Pipe -
-  TPipeServer(const std::string& pipename, uint32_t bufsize);
-  TPipeServer(const std::string& pipename, uint32_t bufsize, uint32_t maxconnections);
-  TPipeServer(const std::string& pipename);
-  // Anonymous pipe -
-  TPipeServer(int bufsize);
-  TPipeServer();
-
-  // Destructor
-  virtual ~TPipeServer();
-
-  // Standard transport callbacks
-  virtual void interrupt();
-  virtual void close();
-  virtual void listen();
-
-  // Accessors
-  std::string getPipename();
-  void setPipename(const std::string& pipename);
-  int getBufferSize();
-  void setBufferSize(int bufsize);
-  HANDLE getPipeHandle(); // Named Pipe R/W -or- Anonymous pipe Read handle
-  HANDLE getWrtPipeHandle();
-  HANDLE getClientRdPipeHandle();
-  HANDLE getClientWrtPipeHandle();
-  bool getAnonymous();
-  void setAnonymous(bool anon);
-  void setMaxConnections(uint32_t maxconnections);
-
-  // this function is intended to be used in generic / template situations,
-  // so its name needs to be the same as TPipe's
-  HANDLE getNativeWaitHandle();
-
-protected:
-  virtual boost::shared_ptr<TTransport> acceptImpl();
-
-private:
-  boost::shared_ptr<TPipeServerImpl> impl_;
-
-  std::string pipename_;
-  uint32_t bufsize_;
-  uint32_t maxconns_;
-  bool isAnonymous_;
-};
-#else //_WIN32
-//*NIX named pipe implementation uses domain socket
-typedef TServerSocket TPipeServer;
-#endif
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TSERVERWINPIPES_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
deleted file mode 100644
index 89423b4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/transport/TSSLServerSocket.h>
-#include <thrift/transport/TSSLSocket.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * SSL server socket implementation.
- */
-TSSLServerSocket::TSSLServerSocket(int port, boost::shared_ptr<TSSLSocketFactory> factory)
-  : TServerSocket(port), factory_(factory) {
-  factory_->server(true);
-}
-
-TSSLServerSocket::TSSLServerSocket(const std::string& address,
-                                   int port,
-                                   boost::shared_ptr<TSSLSocketFactory> factory)
-  : TServerSocket(address, port), factory_(factory) {
-  factory_->server(true);
-}
-
-TSSLServerSocket::TSSLServerSocket(int port,
-                                   int sendTimeout,
-                                   int recvTimeout,
-                                   boost::shared_ptr<TSSLSocketFactory> factory)
-  : TServerSocket(port, sendTimeout, recvTimeout), factory_(factory) {
-  factory_->server(true);
-}
-
-boost::shared_ptr<TSocket> TSSLServerSocket::createSocket(THRIFT_SOCKET client) {
-  if (interruptableChildren_) {
-      return factory_->createSocket(client, pChildInterruptSockReader_);
-
-  } else {
-      return factory_->createSocket(client);
-  }
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLServerSocket.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLServerSocket.h
deleted file mode 100644
index dfdbde8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLServerSocket.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSSLSERVERSOCKET_H_
-#define _THRIFT_TRANSPORT_TSSLSERVERSOCKET_H_ 1
-
-#include <boost/shared_ptr.hpp>
-#include <thrift/transport/TServerSocket.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-class TSSLSocketFactory;
-
-/**
- * Server socket that accepts SSL connections.
- */
-class TSSLServerSocket : public TServerSocket {
-public:
-  /**
-   * Constructor.  Binds to all interfaces.
-   *
-   * @param port    Listening port
-   * @param factory SSL socket factory implementation
-   */
-  TSSLServerSocket(int port, boost::shared_ptr<TSSLSocketFactory> factory);
-
-  /**
-   * Constructor.  Binds to the specified address.
-   *
-   * @param address Address to bind to
-   * @param port    Listening port
-   * @param factory SSL socket factory implementation
-   */
-  TSSLServerSocket(const std::string& address,
-                   int port,
-                   boost::shared_ptr<TSSLSocketFactory> factory);
-
-  /**
-   * Constructor.  Binds to all interfaces.
-   *
-   * @param port        Listening port
-   * @param sendTimeout Socket send timeout
-   * @param recvTimeout Socket receive timeout
-   * @param factory     SSL socket factory implementation
-   */
-  TSSLServerSocket(int port,
-                   int sendTimeout,
-                   int recvTimeout,
-                   boost::shared_ptr<TSSLSocketFactory> factory);
-
-protected:
-  boost::shared_ptr<TSocket> createSocket(THRIFT_SOCKET socket);
-  boost::shared_ptr<TSSLSocketFactory> factory_;
-};
-}
-}
-}
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLSocket.cpp
deleted file mode 100644
index 0af20cb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLSocket.cpp
+++ /dev/null
@@ -1,942 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <errno.h>
-#include <string>
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-
-#include <boost/lexical_cast.hpp>
-#include <boost/shared_array.hpp>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/ssl.h>
-#include <openssl/x509v3.h>
-#include <thrift/concurrency/Mutex.h>
-#include <thrift/transport/TSSLSocket.h>
-#include <thrift/transport/PlatformSocket.h>
-
-#define OPENSSL_VERSION_NO_THREAD_ID 0x10000000L
-
-using namespace std;
-using namespace apache::thrift::concurrency;
-
-struct CRYPTO_dynlock_value {
-  Mutex mutex;
-};
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-// OpenSSL initialization/cleanup
-
-static bool openSSLInitialized = false;
-static boost::shared_array<Mutex> mutexes;
-
-static void callbackLocking(int mode, int n, const char*, int) {
-  if (mode & CRYPTO_LOCK) {
-    mutexes[n].lock();
-  } else {
-    mutexes[n].unlock();
-  }
-}
-
-#if (OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_NO_THREAD_ID)
-static unsigned long callbackThreadID() {
-#ifdef _WIN32
-  return (unsigned long)GetCurrentThreadId();
-#else
-  return (unsigned long)pthread_self();
-#endif
-}
-#endif
-
-static CRYPTO_dynlock_value* dyn_create(const char*, int) {
-  return new CRYPTO_dynlock_value;
-}
-
-static void dyn_lock(int mode, struct CRYPTO_dynlock_value* lock, const char*, int) {
-  if (lock != NULL) {
-    if (mode & CRYPTO_LOCK) {
-      lock->mutex.lock();
-    } else {
-      lock->mutex.unlock();
-    }
-  }
-}
-
-static void dyn_destroy(struct CRYPTO_dynlock_value* lock, const char*, int) {
-  delete lock;
-}
-
-void initializeOpenSSL() {
-  if (openSSLInitialized) {
-    return;
-  }
-  openSSLInitialized = true;
-  SSL_library_init();
-  SSL_load_error_strings();
-  // static locking
-  // newer versions of OpenSSL changed CRYPTO_num_locks - see THRIFT-3878
-#ifdef CRYPTO_num_locks
-  mutexes = boost::shared_array<Mutex>(new Mutex[CRYPTO_num_locks()]);
-#else
-  mutexes = boost::shared_array<Mutex>(new Mutex[ ::CRYPTO_num_locks()]);
-#endif
-  if (mutexes == NULL) {
-    throw TTransportException(TTransportException::INTERNAL_ERROR,
-                              "initializeOpenSSL() failed, "
-                              "out of memory while creating mutex array");
-  }
-#if (OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_NO_THREAD_ID)
-  CRYPTO_set_id_callback(callbackThreadID);
-#endif
-  CRYPTO_set_locking_callback(callbackLocking);
-  // dynamic locking
-  CRYPTO_set_dynlock_create_callback(dyn_create);
-  CRYPTO_set_dynlock_lock_callback(dyn_lock);
-  CRYPTO_set_dynlock_destroy_callback(dyn_destroy);
-}
-
-void cleanupOpenSSL() {
-  if (!openSSLInitialized) {
-    return;
-  }
-  openSSLInitialized = false;
-#if (OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_NO_THREAD_ID)
-  CRYPTO_set_id_callback(NULL);
-#endif
-  CRYPTO_set_locking_callback(NULL);
-  CRYPTO_set_dynlock_create_callback(NULL);
-  CRYPTO_set_dynlock_lock_callback(NULL);
-  CRYPTO_set_dynlock_destroy_callback(NULL);
-  ERR_free_strings();
-  EVP_cleanup();
-  CRYPTO_cleanup_all_ex_data();
-  ERR_remove_state(0);
-  mutexes.reset();
-}
-
-static void buildErrors(string& message, int error = 0);
-static bool matchName(const char* host, const char* pattern, int size);
-static char uppercase(char c);
-
-// SSLContext implementation
-SSLContext::SSLContext(const SSLProtocol& protocol) {
-  if (protocol == SSLTLS) {
-    ctx_ = SSL_CTX_new(SSLv23_method());
-#ifndef OPENSSL_NO_SSL3
-  } else if (protocol == SSLv3) {
-    ctx_ = SSL_CTX_new(SSLv3_method());
-#endif
-  } else if (protocol == TLSv1_0) {
-    ctx_ = SSL_CTX_new(TLSv1_method());
-  } else if (protocol == TLSv1_1) {
-    ctx_ = SSL_CTX_new(TLSv1_1_method());
-  } else if (protocol == TLSv1_2) {
-    ctx_ = SSL_CTX_new(TLSv1_2_method());
-  } else {
-    /// UNKNOWN PROTOCOL!
-    throw TSSLException("SSL_CTX_new: Unknown protocol");
-  }
-
-  if (ctx_ == NULL) {
-    string errors;
-    buildErrors(errors);
-    throw TSSLException("SSL_CTX_new: " + errors);
-  }
-  SSL_CTX_set_mode(ctx_, SSL_MODE_AUTO_RETRY);
-
-  // Disable horribly insecure SSLv2 and SSLv3 protocols but allow a handshake
-  // with older clients so they get a graceful denial.
-  if (protocol == SSLTLS) {
-      SSL_CTX_set_options(ctx_, SSL_OP_NO_SSLv2);
-      SSL_CTX_set_options(ctx_, SSL_OP_NO_SSLv3);   // THRIFT-3164
-  }
-}
-
-SSLContext::~SSLContext() {
-  if (ctx_ != NULL) {
-    SSL_CTX_free(ctx_);
-    ctx_ = NULL;
-  }
-}
-
-SSL* SSLContext::createSSL() {
-  SSL* ssl = SSL_new(ctx_);
-  if (ssl == NULL) {
-    string errors;
-    buildErrors(errors);
-    throw TSSLException("SSL_new: " + errors);
-  }
-  return ssl;
-}
-
-// TSSLSocket implementation
-TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx)
-  : TSocket(), server_(false), ssl_(NULL), ctx_(ctx) {
-}
-
-TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, boost::shared_ptr<THRIFT_SOCKET> interruptListener)
-        : TSocket(), server_(false), ssl_(NULL), ctx_(ctx) {
-  interruptListener_ = interruptListener;
-}
-
-TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, THRIFT_SOCKET socket)
-  : TSocket(socket), server_(false), ssl_(NULL), ctx_(ctx) {
-}
-
-TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, THRIFT_SOCKET socket, boost::shared_ptr<THRIFT_SOCKET> interruptListener)
-        : TSocket(socket, interruptListener), server_(false), ssl_(NULL), ctx_(ctx) {
-}
-
-TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, string host, int port)
-  : TSocket(host, port), server_(false), ssl_(NULL), ctx_(ctx) {
-}
-
-TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, string host, int port, boost::shared_ptr<THRIFT_SOCKET> interruptListener)
-        : TSocket(host, port), server_(false), ssl_(NULL), ctx_(ctx) {
-  interruptListener_ = interruptListener;
-}
-
-TSSLSocket::~TSSLSocket() {
-  close();
-}
-
-bool TSSLSocket::isOpen() {
-  if (ssl_ == NULL || !TSocket::isOpen()) {
-    return false;
-  }
-  int shutdown = SSL_get_shutdown(ssl_);
-  // "!!" is squelching C4800 "forcing bool -> true or false" performance warning
-  bool shutdownReceived = !!(shutdown & SSL_RECEIVED_SHUTDOWN);
-  bool shutdownSent = !!(shutdown & SSL_SENT_SHUTDOWN);
-  if (shutdownReceived && shutdownSent) {
-    return false;
-  }
-  return true;
-}
-
-bool TSSLSocket::peek() {
-  if (!isOpen()) {
-    return false;
-  }
-  checkHandshake();
-  int rc;
-  uint8_t byte;
-  do {
-    rc = SSL_peek(ssl_, &byte, 1);
-    if (rc < 0) {
-
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      int error = SSL_get_error(ssl_, rc);
-      switch (error) {
-        case SSL_ERROR_SYSCALL:
-          if ((errno_copy != THRIFT_EINTR)
-              && (errno_copy != THRIFT_EAGAIN)) {
-            break;
-          }
-        case SSL_ERROR_WANT_READ:
-        case SSL_ERROR_WANT_WRITE:
-          waitForEvent(error == SSL_ERROR_WANT_READ);
-              continue;
-        default:;// do nothing
-      }
-      string errors;
-      buildErrors(errors, errno_copy);
-      throw TSSLException("SSL_peek: " + errors);
-    } else if (rc == 0) {
-      ERR_clear_error();
-      break;
-    }
-  } while (true);
-  return (rc > 0);
-}
-
-void TSSLSocket::open() {
-  if (isOpen() || server()) {
-    throw TTransportException(TTransportException::BAD_ARGS);
-  }
-  TSocket::open();
-}
-
-void TSSLSocket::close() {
-  if (ssl_ != NULL) {
-    try {
-      int rc;
-
-      do {
-        rc = SSL_shutdown(ssl_);
-        if (rc <= 0) {
-          int errno_copy = THRIFT_GET_SOCKET_ERROR;
-          int error = SSL_get_error(ssl_, rc);
-          switch (error) {
-            case SSL_ERROR_SYSCALL:
-              if ((errno_copy != THRIFT_EINTR)
-                  && (errno_copy != THRIFT_EAGAIN)) {
-                break;
-              }
-            case SSL_ERROR_WANT_READ:
-            case SSL_ERROR_WANT_WRITE:
-              waitForEvent(error == SSL_ERROR_WANT_READ);
-              rc = 2;
-            default:;// do nothing
-          }
-        }
-      } while (rc == 2);
-
-      if (rc < 0) {
-        int errno_copy = THRIFT_GET_SOCKET_ERROR;
-        string errors;
-        buildErrors(errors, errno_copy);
-        GlobalOutput(("SSL_shutdown: " + errors).c_str());
-      }
-    } catch (TTransportException& te) {
-      // Don't emit an exception because this method is called by the
-      // destructor. There's also not much that a user can do to recover, so
-      // just clean up as much as possible without throwing, similar to the rc
-      // < 0 case above.
-      GlobalOutput.printf("SSL_shutdown: %s", te.what());
-    }
-    SSL_free(ssl_);
-    ssl_ = NULL;
-    ERR_remove_state(0);
-  }
-  TSocket::close();
-}
-
-uint32_t TSSLSocket::read(uint8_t* buf, uint32_t len) {
-  checkHandshake();
-  int32_t bytes = 0;
-  for (int32_t retries = 0; retries < maxRecvRetries_; retries++) {
-    ERR_clear_error();
-    bytes = SSL_read(ssl_, buf, len);
-    if (bytes >= 0)
-      break;
-    int32_t errno_copy = THRIFT_GET_SOCKET_ERROR;
-    int32_t error = SSL_get_error(ssl_, bytes);
-    switch (error) {
-      case SSL_ERROR_SYSCALL:
-        if ((errno_copy != THRIFT_EINTR)
-            && (errno_copy != THRIFT_EAGAIN)) {
-              break;
-        }
-        if (retries++ >= maxRecvRetries_) {
-          // THRIFT_EINTR needs to be handled manually and we can tolerate
-          // a certain number
-          break;
-        }
-      case SSL_ERROR_WANT_READ:
-      case SSL_ERROR_WANT_WRITE:
-        if (waitForEvent(error == SSL_ERROR_WANT_READ) == TSSL_EINTR ) {
-          // repeat operation
-          if (retries++ < maxRecvRetries_) {
-            // THRIFT_EINTR needs to be handled manually and we can tolerate
-            // a certain number
-            continue;
-          }
-          throw TTransportException(TTransportException::INTERNAL_ERROR, "too much recv retries");
-        }
-        continue;
-      default:;// do nothing
-    }
-    string errors;
-    buildErrors(errors, errno_copy);
-    throw TSSLException("SSL_read: " + errors);
-  }
-  return bytes;
-}
-
-void TSSLSocket::write(const uint8_t* buf, uint32_t len) {
-  checkHandshake();
-  // loop in case SSL_MODE_ENABLE_PARTIAL_WRITE is set in SSL_CTX.
-  uint32_t written = 0;
-  while (written < len) {
-    ERR_clear_error();
-    int32_t bytes = SSL_write(ssl_, &buf[written], len - written);
-    if (bytes <= 0) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      int error = SSL_get_error(ssl_, bytes);
-      switch (error) {
-        case SSL_ERROR_SYSCALL:
-          if ((errno_copy != THRIFT_EINTR)
-              && (errno_copy != THRIFT_EAGAIN)) {
-            break;
-          }
-        case SSL_ERROR_WANT_READ:
-        case SSL_ERROR_WANT_WRITE:
-          waitForEvent(error == SSL_ERROR_WANT_READ);
-          continue;
-        default:;// do nothing
-      }
-      string errors;
-      buildErrors(errors, errno_copy);
-      throw TSSLException("SSL_write: " + errors);
-    }
-    written += bytes;
-  }
-}
-
-void TSSLSocket::flush() {
-  // Don't throw exception if not open. Thrift servers close socket twice.
-  if (ssl_ == NULL) {
-    return;
-  }
-  checkHandshake();
-  BIO* bio = SSL_get_wbio(ssl_);
-  if (bio == NULL) {
-    throw TSSLException("SSL_get_wbio returns NULL");
-  }
-  if (BIO_flush(bio) != 1) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    string errors;
-    buildErrors(errors, errno_copy);
-    throw TSSLException("BIO_flush: " + errors);
-  }
-}
-
-void TSSLSocket::checkHandshake() {
-  if (!TSocket::isOpen()) {
-    throw TTransportException(TTransportException::NOT_OPEN);
-  }
-  if (ssl_ != NULL) {
-    return;
-  }
-
-  // set underlying socket to non-blocking
-  int flags;
-  if ((flags = THRIFT_FCNTL(socket_, THRIFT_F_GETFL, 0)) < 0
-      || THRIFT_FCNTL(socket_, THRIFT_F_SETFL, flags | THRIFT_O_NONBLOCK) < 0) {
-    GlobalOutput.perror("thriftServerEventHandler: set THRIFT_O_NONBLOCK (THRIFT_FCNTL) ",
-                        THRIFT_GET_SOCKET_ERROR);
-    ::THRIFT_CLOSESOCKET(socket_);
-    return;
-  }
-
-  ssl_ = ctx_->createSSL();
-
-  //set read and write bios to non-blocking
-  BIO* wbio =  BIO_new(BIO_s_mem());
-  if (wbio == NULL) {
-    throw TSSLException("SSL_get_wbio returns NULL");
-  }
-  BIO_set_nbio(wbio, 1);
-
-  BIO* rbio = BIO_new(BIO_s_mem());
-  if (rbio == NULL) {
-    throw TSSLException("SSL_get_rbio returns NULL");
-  }
-  BIO_set_nbio(rbio, 1);
-
-  SSL_set_bio(ssl_, rbio, wbio);
-
-  SSL_set_fd(ssl_, static_cast<int>(socket_));
-  int rc;
-  if (server()) {
-    do {
-      rc = SSL_accept(ssl_);
-      if (rc <= 0) {
-        int errno_copy = THRIFT_GET_SOCKET_ERROR;
-        int error = SSL_get_error(ssl_, rc);
-        switch (error) {
-          case SSL_ERROR_SYSCALL:
-            if ((errno_copy != THRIFT_EINTR)
-                && (errno_copy != THRIFT_EAGAIN)) {
-              break;
-            }
-          case SSL_ERROR_WANT_READ:
-          case SSL_ERROR_WANT_WRITE:
-            waitForEvent(error == SSL_ERROR_WANT_READ);
-            rc = 2;
-          default:;// do nothing
-        }
-      }
-    } while (rc == 2);
-  } else {
-    // set the SNI hostname
-    SSL_set_tlsext_host_name(ssl_, getHost().c_str());
-    do {
-      rc = SSL_connect(ssl_);
-      if (rc <= 0) {
-        int errno_copy = THRIFT_GET_SOCKET_ERROR;
-        int error = SSL_get_error(ssl_, rc);
-        switch (error) {
-          case SSL_ERROR_SYSCALL:
-            if ((errno_copy != THRIFT_EINTR)
-                && (errno_copy != THRIFT_EAGAIN)) {
-              break;
-            }
-          case SSL_ERROR_WANT_READ:
-          case SSL_ERROR_WANT_WRITE:
-            waitForEvent(error == SSL_ERROR_WANT_READ);
-                rc = 2;
-          default:;// do nothing
-        }
-      }
-    } while (rc == 2);
-  }
-  if (rc <= 0) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    string fname(server() ? "SSL_accept" : "SSL_connect");
-    string errors;
-    buildErrors(errors, errno_copy);
-    throw TSSLException(fname + ": " + errors);
-  }
-  authorize();
-}
-
-void TSSLSocket::authorize() {
-  int rc = SSL_get_verify_result(ssl_);
-  if (rc != X509_V_OK) { // verify authentication result
-    throw TSSLException(string("SSL_get_verify_result(), ") + X509_verify_cert_error_string(rc));
-  }
-
-  X509* cert = SSL_get_peer_certificate(ssl_);
-  if (cert == NULL) {
-    // certificate is not present
-    if (SSL_get_verify_mode(ssl_) & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) {
-      throw TSSLException("authorize: required certificate not present");
-    }
-    // certificate was optional: didn't intend to authorize remote
-    if (server() && access_ != NULL) {
-      throw TSSLException("authorize: certificate required for authorization");
-    }
-    return;
-  }
-  // certificate is present
-  if (access_ == NULL) {
-    X509_free(cert);
-    return;
-  }
-  // both certificate and access manager are present
-
-  string host;
-  sockaddr_storage sa;
-  socklen_t saLength = sizeof(sa);
-
-  if (getpeername(socket_, (sockaddr*)&sa, &saLength) != 0) {
-    sa.ss_family = AF_UNSPEC;
-  }
-
-  AccessManager::Decision decision = access_->verify(sa);
-
-  if (decision != AccessManager::SKIP) {
-    X509_free(cert);
-    if (decision != AccessManager::ALLOW) {
-      throw TSSLException("authorize: access denied based on remote IP");
-    }
-    return;
-  }
-
-  // extract subjectAlternativeName
-  STACK_OF(GENERAL_NAME)* alternatives
-      = (STACK_OF(GENERAL_NAME)*)X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
-  if (alternatives != NULL) {
-    const int count = sk_GENERAL_NAME_num(alternatives);
-    for (int i = 0; decision == AccessManager::SKIP && i < count; i++) {
-      const GENERAL_NAME* name = sk_GENERAL_NAME_value(alternatives, i);
-      if (name == NULL) {
-        continue;
-      }
-      char* data = (char*)ASN1_STRING_data(name->d.ia5);
-      int length = ASN1_STRING_length(name->d.ia5);
-      switch (name->type) {
-      case GEN_DNS:
-        if (host.empty()) {
-          host = (server() ? getPeerHost() : getHost());
-        }
-        decision = access_->verify(host, data, length);
-        break;
-      case GEN_IPADD:
-        decision = access_->verify(sa, data, length);
-        break;
-      }
-    }
-    sk_GENERAL_NAME_pop_free(alternatives, GENERAL_NAME_free);
-  }
-
-  if (decision != AccessManager::SKIP) {
-    X509_free(cert);
-    if (decision != AccessManager::ALLOW) {
-      throw TSSLException("authorize: access denied");
-    }
-    return;
-  }
-
-  // extract commonName
-  X509_NAME* name = X509_get_subject_name(cert);
-  if (name != NULL) {
-    X509_NAME_ENTRY* entry;
-    unsigned char* utf8;
-    int last = -1;
-    while (decision == AccessManager::SKIP) {
-      last = X509_NAME_get_index_by_NID(name, NID_commonName, last);
-      if (last == -1)
-        break;
-      entry = X509_NAME_get_entry(name, last);
-      if (entry == NULL)
-        continue;
-      ASN1_STRING* common = X509_NAME_ENTRY_get_data(entry);
-      int size = ASN1_STRING_to_UTF8(&utf8, common);
-      if (host.empty()) {
-        host = (server() ? getPeerHost() : getHost());
-      }
-      decision = access_->verify(host, (char*)utf8, size);
-      OPENSSL_free(utf8);
-    }
-  }
-  X509_free(cert);
-  if (decision != AccessManager::ALLOW) {
-    throw TSSLException("authorize: cannot authorize peer");
-  }
-}
-
-unsigned int TSSLSocket::waitForEvent(bool wantRead) {
-  int fdSocket;
-  BIO* bio;
-
-  if (wantRead) {
-    bio = SSL_get_rbio(ssl_);
-  } else {
-    bio = SSL_get_wbio(ssl_);
-  }
-
-  if (bio == NULL) {
-    throw TSSLException("SSL_get_?bio returned NULL");
-  }
-
-  if (BIO_get_fd(bio, &fdSocket) <= 0) {
-    throw TSSLException("BIO_get_fd failed");
-  }
-
-  struct THRIFT_POLLFD fds[2];
-  std::memset(fds, 0, sizeof(fds));
-  fds[0].fd = fdSocket;
-  fds[0].events = wantRead ? THRIFT_POLLIN : THRIFT_POLLOUT;
-
-  if (interruptListener_) {
-    fds[1].fd = *(interruptListener_.get());
-    fds[1].events = THRIFT_POLLIN;
-  }
-
-  int timeout = -1;
-  if (wantRead && recvTimeout_) {
-    timeout = recvTimeout_;
-  }
-  if (!wantRead && sendTimeout_) {
-    timeout = sendTimeout_;
-  }
-
-  int ret = THRIFT_POLL(fds, interruptListener_ ? 2 : 1, timeout);
-
-  if (ret < 0) {
-    // error cases
-    if (THRIFT_GET_SOCKET_ERROR == THRIFT_EINTR) {
-      return TSSL_EINTR; // repeat operation
-    }
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TSSLSocket::read THRIFT_POLL() ", errno_copy);
-    throw TTransportException(TTransportException::UNKNOWN, "Unknown", errno_copy);
-  } else if (ret > 0){
-    if (fds[1].revents & THRIFT_POLLIN) {
-      throw TTransportException(TTransportException::INTERRUPTED, "Interrupted");
-    }
-    return TSSL_DATA;
-  } else {
-    throw TTransportException(TTransportException::TIMED_OUT, "THRIFT_POLL (timed out)");
-  }
-}
-
-// TSSLSocketFactory implementation
-uint64_t TSSLSocketFactory::count_ = 0;
-Mutex TSSLSocketFactory::mutex_;
-bool TSSLSocketFactory::manualOpenSSLInitialization_ = false;
-
-TSSLSocketFactory::TSSLSocketFactory(SSLProtocol protocol) : server_(false) {
-  Guard guard(mutex_);
-  if (count_ == 0) {
-    if (!manualOpenSSLInitialization_) {
-      initializeOpenSSL();
-    }
-    randomize();
-  }
-  count_++;
-  ctx_ = boost::shared_ptr<SSLContext>(new SSLContext(protocol));
-}
-
-TSSLSocketFactory::~TSSLSocketFactory() {
-  Guard guard(mutex_);
-  ctx_.reset();
-  count_--;
-  if (count_ == 0 && !manualOpenSSLInitialization_) {
-    cleanupOpenSSL();
-  }
-}
-
-boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket() {
-  boost::shared_ptr<TSSLSocket> ssl(new TSSLSocket(ctx_));
-  setup(ssl);
-  return ssl;
-}
-
-boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(boost::shared_ptr<THRIFT_SOCKET> interruptListener) {
-  boost::shared_ptr<TSSLSocket> ssl(new TSSLSocket(ctx_, interruptListener));
-  setup(ssl);
-  return ssl;
-}
-
-boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(THRIFT_SOCKET socket) {
-  boost::shared_ptr<TSSLSocket> ssl(new TSSLSocket(ctx_, socket));
-  setup(ssl);
-  return ssl;
-}
-
-boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(THRIFT_SOCKET socket, boost::shared_ptr<THRIFT_SOCKET> interruptListener) {
-  boost::shared_ptr<TSSLSocket> ssl(new TSSLSocket(ctx_, socket, interruptListener));
-  setup(ssl);
-  return ssl;
-}
-
-boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(const string& host, int port) {
-  boost::shared_ptr<TSSLSocket> ssl(new TSSLSocket(ctx_, host, port));
-  setup(ssl);
-  return ssl;
-}
-
-boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(const string& host, int port, boost::shared_ptr<THRIFT_SOCKET> interruptListener) {
-  boost::shared_ptr<TSSLSocket> ssl(new TSSLSocket(ctx_, host, port, interruptListener));
-  setup(ssl);
-  return ssl;
-}
-
-
-void TSSLSocketFactory::setup(boost::shared_ptr<TSSLSocket> ssl) {
-  ssl->server(server());
-  if (access_ == NULL && !server()) {
-    access_ = boost::shared_ptr<AccessManager>(new DefaultClientAccessManager);
-  }
-  if (access_ != NULL) {
-    ssl->access(access_);
-  }
-}
-
-void TSSLSocketFactory::ciphers(const string& enable) {
-  int rc = SSL_CTX_set_cipher_list(ctx_->get(), enable.c_str());
-  if (ERR_peek_error() != 0) {
-    string errors;
-    buildErrors(errors);
-    throw TSSLException("SSL_CTX_set_cipher_list: " + errors);
-  }
-  if (rc == 0) {
-    throw TSSLException("None of specified ciphers are supported");
-  }
-}
-
-void TSSLSocketFactory::authenticate(bool required) {
-  int mode;
-  if (required) {
-    mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE;
-  } else {
-    mode = SSL_VERIFY_NONE;
-  }
-  SSL_CTX_set_verify(ctx_->get(), mode, NULL);
-}
-
-void TSSLSocketFactory::loadCertificate(const char* path, const char* format) {
-  if (path == NULL || format == NULL) {
-    throw TTransportException(TTransportException::BAD_ARGS,
-                              "loadCertificateChain: either <path> or <format> is NULL");
-  }
-  if (strcmp(format, "PEM") == 0) {
-    if (SSL_CTX_use_certificate_chain_file(ctx_->get(), path) == 0) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      string errors;
-      buildErrors(errors, errno_copy);
-      throw TSSLException("SSL_CTX_use_certificate_chain_file: " + errors);
-    }
-  } else {
-    throw TSSLException("Unsupported certificate format: " + string(format));
-  }
-}
-
-void TSSLSocketFactory::loadPrivateKey(const char* path, const char* format) {
-  if (path == NULL || format == NULL) {
-    throw TTransportException(TTransportException::BAD_ARGS,
-                              "loadPrivateKey: either <path> or <format> is NULL");
-  }
-  if (strcmp(format, "PEM") == 0) {
-    if (SSL_CTX_use_PrivateKey_file(ctx_->get(), path, SSL_FILETYPE_PEM) == 0) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      string errors;
-      buildErrors(errors, errno_copy);
-      throw TSSLException("SSL_CTX_use_PrivateKey_file: " + errors);
-    }
-  }
-}
-
-void TSSLSocketFactory::loadTrustedCertificates(const char* path) {
-  if (path == NULL) {
-    throw TTransportException(TTransportException::BAD_ARGS,
-                              "loadTrustedCertificates: <path> is NULL");
-  }
-  if (SSL_CTX_load_verify_locations(ctx_->get(), path, NULL) == 0) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    string errors;
-    buildErrors(errors, errno_copy);
-    throw TSSLException("SSL_CTX_load_verify_locations: " + errors);
-  }
-}
-
-void TSSLSocketFactory::randomize() {
-  RAND_poll();
-}
-
-void TSSLSocketFactory::overrideDefaultPasswordCallback() {
-  SSL_CTX_set_default_passwd_cb(ctx_->get(), passwordCallback);
-  SSL_CTX_set_default_passwd_cb_userdata(ctx_->get(), this);
-}
-
-int TSSLSocketFactory::passwordCallback(char* password, int size, int, void* data) {
-  TSSLSocketFactory* factory = (TSSLSocketFactory*)data;
-  string userPassword;
-  factory->getPassword(userPassword, size);
-  int length = static_cast<int>(userPassword.size());
-  if (length > size) {
-    length = size;
-  }
-  strncpy(password, userPassword.c_str(), length);
-  userPassword.assign(userPassword.size(), '*');
-  return length;
-}
-
-// extract error messages from error queue
-void buildErrors(string& errors, int errno_copy) {
-  unsigned long errorCode;
-  char message[256];
-
-  errors.reserve(512);
-  while ((errorCode = ERR_get_error()) != 0) {
-    if (!errors.empty()) {
-      errors += "; ";
-    }
-    const char* reason = ERR_reason_error_string(errorCode);
-    if (reason == NULL) {
-      THRIFT_SNPRINTF(message, sizeof(message) - 1, "SSL error # %lu", errorCode);
-      reason = message;
-    }
-    errors += reason;
-  }
-  if (errors.empty()) {
-    if (errno_copy != 0) {
-      errors += TOutput::strerror_s(errno_copy);
-    }
-  }
-  if (errors.empty()) {
-    errors = "error code: " + boost::lexical_cast<string>(errno_copy);
-  }
-}
-
-/**
- * Default implementation of AccessManager
- */
-Decision DefaultClientAccessManager::verify(const sockaddr_storage& sa) throw() {
-  (void)sa;
-  return SKIP;
-}
-
-Decision DefaultClientAccessManager::verify(const string& host,
-                                            const char* name,
-                                            int size) throw() {
-  if (host.empty() || name == NULL || size <= 0) {
-    return SKIP;
-  }
-  return (matchName(host.c_str(), name, size) ? ALLOW : SKIP);
-}
-
-Decision DefaultClientAccessManager::verify(const sockaddr_storage& sa,
-                                            const char* data,
-                                            int size) throw() {
-  bool match = false;
-  if (sa.ss_family == AF_INET && size == sizeof(in_addr)) {
-    match = (memcmp(&((sockaddr_in*)&sa)->sin_addr, data, size) == 0);
-  } else if (sa.ss_family == AF_INET6 && size == sizeof(in6_addr)) {
-    match = (memcmp(&((sockaddr_in6*)&sa)->sin6_addr, data, size) == 0);
-  }
-  return (match ? ALLOW : SKIP);
-}
-
-/**
- * Match a name with a pattern. The pattern may include wildcard. A single
- * wildcard "*" can match up to one component in the domain name.
- *
- * @param  host    Host name, typically the name of the remote host
- * @param  pattern Name retrieved from certificate
- * @param  size    Size of "pattern"
- * @return True, if "host" matches "pattern". False otherwise.
- */
-bool matchName(const char* host, const char* pattern, int size) {
-  bool match = false;
-  int i = 0, j = 0;
-  while (i < size && host[j] != '\0') {
-    if (uppercase(pattern[i]) == uppercase(host[j])) {
-      i++;
-      j++;
-      continue;
-    }
-    if (pattern[i] == '*') {
-      while (host[j] != '.' && host[j] != '\0') {
-        j++;
-      }
-      i++;
-      continue;
-    }
-    break;
-  }
-  if (i == size && host[j] == '\0') {
-    match = true;
-  }
-  return match;
-}
-
-// This is to work around the Turkish locale issue, i.e.,
-// toupper('i') != toupper('I') if locale is "tr_TR"
-char uppercase(char c) {
-  if ('a' <= c && c <= 'z') {
-    return c + ('A' - 'a');
-  }
-  return c;
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLSocket.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLSocket.h
deleted file mode 100644
index 03157d7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSSLSocket.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSSLSOCKET_H_
-#define _THRIFT_TRANSPORT_TSSLSOCKET_H_ 1
-
-// Put this first to avoid WIN32 build failure
-#include <thrift/transport/TSocket.h>
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <openssl/ssl.h>
-#include <thrift/concurrency/Mutex.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-class AccessManager;
-class SSLContext;
-
-enum SSLProtocol {
-  SSLTLS  = 0,  // Supports SSLv2 and SSLv3 handshake but only negotiates at TLSv1_0 or later.
-//SSLv2   = 1,  // HORRIBLY INSECURE!
-  SSLv3   = 2,  // Supports SSLv3 only - also horribly insecure!
-  TLSv1_0 = 3,  // Supports TLSv1_0 or later.
-  TLSv1_1 = 4,  // Supports TLSv1_1 or later.
-  TLSv1_2 = 5,  // Supports TLSv1_2 or later.
-  LATEST  = TLSv1_2
-};
-
-#define TSSL_EINTR 0
-#define TSSL_DATA 1
-
-/**
- * Initialize OpenSSL library.  This function, or some other
- * equivalent function to initialize OpenSSL, must be called before
- * TSSLSocket is used.  If you set TSSLSocketFactory to use manual
- * OpenSSL initialization, you should call this function or otherwise
- * ensure OpenSSL is initialized yourself.
- */
-void initializeOpenSSL();
-/**
- * Cleanup OpenSSL library.  This function should be called to clean
- * up OpenSSL after use of OpenSSL functionality is finished.  If you
- * set TSSLSocketFactory to use manual OpenSSL initialization, you
- * should call this function yourself or ensure that whatever
- * initialized OpenSSL cleans it up too.
- */
-void cleanupOpenSSL();
-
-/**
- * OpenSSL implementation for SSL socket interface.
- */
-class TSSLSocket : public TSocket {
-public:
-  ~TSSLSocket();
-  /**
-   * TTransport interface.
-   */
-  bool isOpen();
-  bool peek();
-  void open();
-  void close();
-  uint32_t read(uint8_t* buf, uint32_t len);
-  void write(const uint8_t* buf, uint32_t len);
-  void flush();
-  /**
-  * Set whether to use client or server side SSL handshake protocol.
-  *
-  * @param flag  Use server side handshake protocol if true.
-  */
-  void server(bool flag) { server_ = flag; }
-  /**
-   * Determine whether the SSL socket is server or client mode.
-   */
-  bool server() const { return server_; }
-  /**
-   * Set AccessManager.
-   *
-   * @param manager  Instance of AccessManager
-   */
-  virtual void access(boost::shared_ptr<AccessManager> manager) { access_ = manager; }
-
-protected:
-  /**
-   * Constructor.
-   */
-  TSSLSocket(boost::shared_ptr<SSLContext> ctx);
-  /**
-   * Constructor with an interrupt signal.
-   */
-  TSSLSocket(boost::shared_ptr<SSLContext> ctx, boost::shared_ptr<THRIFT_SOCKET> interruptListener);
-  /**
-   * Constructor, create an instance of TSSLSocket given an existing socket.
-   *
-   * @param socket An existing socket
-   */
-  TSSLSocket(boost::shared_ptr<SSLContext> ctx, THRIFT_SOCKET socket);
-  /**
-   * Constructor, create an instance of TSSLSocket given an existing socket that can be interrupted.
-   *
-   * @param socket An existing socket
-   */
-  TSSLSocket(boost::shared_ptr<SSLContext> ctx, THRIFT_SOCKET socket, boost::shared_ptr<THRIFT_SOCKET> interruptListener);
-   /**
-   * Constructor.
-   *
-   * @param host  Remote host name
-   * @param port  Remote port number
-   */
-  TSSLSocket(boost::shared_ptr<SSLContext> ctx, std::string host, int port);
-    /**
-	* Constructor with an interrupt signal.
-	*
-	* @param host  Remote host name
-	* @param port  Remote port number
-	*/
-    TSSLSocket(boost::shared_ptr<SSLContext> ctx, std::string host, int port, boost::shared_ptr<THRIFT_SOCKET> interruptListener);
-  /**
-   * Authorize peer access after SSL handshake completes.
-   */
-  virtual void authorize();
-  /**
-   * Initiate SSL handshake if not already initiated.
-   */
-  void checkHandshake();
-  /**
-   * Waits for an socket or shutdown event.
-   *
-   * @throw TTransportException::INTERRUPTED if interrupted is signaled.
-   *
-   * @return TSSL_EINTR if EINTR happened on the underlying socket
-   *         TSSL_DATA  if data is available on the socket.
-   */
-  unsigned int waitForEvent(bool wantRead);
-
-  bool server_;
-  SSL* ssl_;
-  boost::shared_ptr<SSLContext> ctx_;
-  boost::shared_ptr<AccessManager> access_;
-  friend class TSSLSocketFactory;
-};
-
-/**
- * SSL socket factory. SSL sockets should be created via SSL factory.
- */
-class TSSLSocketFactory {
-public:
-  /**
-   * Constructor/Destructor
-   *
-   * @param protocol The SSL/TLS protocol to use.
-   */
-  TSSLSocketFactory(SSLProtocol protocol = SSLTLS);
-  virtual ~TSSLSocketFactory();
-  /**
-   * Create an instance of TSSLSocket with a fresh new socket.
-   */
-  virtual boost::shared_ptr<TSSLSocket> createSocket();
-  /**
-   * Create an instance of TSSLSocket with a fresh new socket, which is interruptable.
-   */
-  virtual boost::shared_ptr<TSSLSocket> createSocket(boost::shared_ptr<THRIFT_SOCKET> interruptListener);
-  /**
-   * Create an instance of TSSLSocket with the given socket.
-   *
-   * @param socket An existing socket.
-   */
-  virtual boost::shared_ptr<TSSLSocket> createSocket(THRIFT_SOCKET socket);
-  /**
-   * Create an instance of TSSLSocket with the given socket which is interruptable.
-   *
-   * @param socket An existing socket.
-   */
-  virtual boost::shared_ptr<TSSLSocket> createSocket(THRIFT_SOCKET socket, boost::shared_ptr<THRIFT_SOCKET> interruptListener);
-  /**
-  * Create an instance of TSSLSocket.
-  *
-  * @param host  Remote host to be connected to
-  * @param port  Remote port to be connected to
-  */
-  virtual boost::shared_ptr<TSSLSocket> createSocket(const std::string& host, int port);
-  /**
-  * Create an instance of TSSLSocket.
-  *
-  * @param host  Remote host to be connected to
-  * @param port  Remote port to be connected to
-  */
-  virtual boost::shared_ptr<TSSLSocket> createSocket(const std::string& host, int port, boost::shared_ptr<THRIFT_SOCKET> interruptListener);
-  /**
-   * Set ciphers to be used in SSL handshake process.
-   *
-   * @param ciphers  A list of ciphers
-   */
-  virtual void ciphers(const std::string& enable);
-  /**
-   * Enable/Disable authentication.
-   *
-   * @param required Require peer to present valid certificate if true
-   */
-  virtual void authenticate(bool required);
-  /**
-   * Load server certificate.
-   *
-   * @param path   Path to the certificate file
-   * @param format Certificate file format
-   */
-  virtual void loadCertificate(const char* path, const char* format = "PEM");
-  /**
-   * Load private key.
-   *
-   * @param path   Path to the private key file
-   * @param format Private key file format
-   */
-  virtual void loadPrivateKey(const char* path, const char* format = "PEM");
-  /**
-   * Load trusted certificates from specified file.
-   *
-   * @param path Path to trusted certificate file
-   */
-  virtual void loadTrustedCertificates(const char* path);
-  /**
-   * Default randomize method.
-   */
-  virtual void randomize();
-  /**
-   * Override default OpenSSL password callback with getPassword().
-   */
-  void overrideDefaultPasswordCallback();
-  /**
-   * Set/Unset server mode.
-   *
-   * @param flag  Server mode if true
-   */
-  virtual void server(bool flag) { server_ = flag; }
-  /**
-   * Determine whether the socket is in server or client mode.
-   *
-   * @return true, if server mode, or, false, if client mode
-   */
-  virtual bool server() const { return server_; }
-  /**
-   * Set AccessManager.
-   *
-   * @param manager  The AccessManager instance
-   */
-  virtual void access(boost::shared_ptr<AccessManager> manager) { access_ = manager; }
-  static void setManualOpenSSLInitialization(bool manualOpenSSLInitialization) {
-    manualOpenSSLInitialization_ = manualOpenSSLInitialization;
-  }
-
-protected:
-  boost::shared_ptr<SSLContext> ctx_;
-
-  /**
-   * Override this method for custom password callback. It may be called
-   * multiple times at any time during a session as necessary.
-   *
-   * @param password Pass collected password to OpenSSL
-   * @param size     Maximum length of password including NULL character
-   */
-  virtual void getPassword(std::string& /* password */, int /* size */) {}
-
-private:
-  bool server_;
-  boost::shared_ptr<AccessManager> access_;
-  static concurrency::Mutex mutex_;
-  static uint64_t count_;
-  static bool manualOpenSSLInitialization_;
-  void setup(boost::shared_ptr<TSSLSocket> ssl);
-  static int passwordCallback(char* password, int size, int, void* data);
-};
-
-/**
- * SSL exception.
- */
-class TSSLException : public TTransportException {
-public:
-  TSSLException(const std::string& message)
-    : TTransportException(TTransportException::INTERNAL_ERROR, message) {}
-
-  virtual const char* what() const throw() {
-    if (message_.empty()) {
-      return "TSSLException";
-    } else {
-      return message_.c_str();
-    }
-  }
-};
-
-/**
- * Wrap OpenSSL SSL_CTX into a class.
- */
-class SSLContext {
-public:
-  SSLContext(const SSLProtocol& protocol = SSLTLS);
-  virtual ~SSLContext();
-  SSL* createSSL();
-  SSL_CTX* get() { return ctx_; }
-
-private:
-  SSL_CTX* ctx_;
-};
-
-/**
- * Callback interface for access control. It's meant to verify the remote host.
- * It's constructed when application starts and set to TSSLSocketFactory
- * instance. It's passed onto all TSSLSocket instances created by this factory
- * object.
- */
-class AccessManager {
-public:
-  enum Decision {
-    DENY = -1, // deny access
-    SKIP = 0,  // cannot make decision, move on to next (if any)
-    ALLOW = 1  // allow access
-  };
-  /**
-   * Destructor
-   */
-  virtual ~AccessManager() {}
-  /**
-   * Determine whether the peer should be granted access or not. It's called
-   * once after the SSL handshake completes successfully, before peer certificate
-   * is examined.
-   *
-   * If a valid decision (ALLOW or DENY) is returned, the peer certificate is
-   * not to be verified.
-   *
-   * @param  sa Peer IP address
-   * @return True if the peer is trusted, false otherwise
-   */
-  virtual Decision verify(const sockaddr_storage& /* sa */) throw() { return DENY; }
-  /**
-   * Determine whether the peer should be granted access or not. It's called
-   * every time a DNS subjectAltName/common name is extracted from peer's
-   * certificate.
-   *
-   * @param  host Client mode: host name returned by TSocket::getHost()
-   *              Server mode: host name returned by TSocket::getPeerHost()
-   * @param  name SubjectAltName or common name extracted from peer certificate
-   * @param  size Length of name
-   * @return True if the peer is trusted, false otherwise
-   *
-   * Note: The "name" parameter may be UTF8 encoded.
-   */
-  virtual Decision verify(const std::string& /* host */,
-                          const char* /* name */,
-                          int /* size */) throw() {
-    return DENY;
-  }
-  /**
-   * Determine whether the peer should be granted access or not. It's called
-   * every time an IP subjectAltName is extracted from peer's certificate.
-   *
-   * @param  sa   Peer IP address retrieved from the underlying socket
-   * @param  data IP address extracted from certificate
-   * @param  size Length of the IP address
-   * @return True if the peer is trusted, false otherwise
-   */
-  virtual Decision verify(const sockaddr_storage& /* sa */,
-                          const char* /* data */,
-                          int /* size */) throw() {
-    return DENY;
-  }
-};
-
-typedef AccessManager::Decision Decision;
-
-class DefaultClientAccessManager : public AccessManager {
-public:
-  // AccessManager interface
-  Decision verify(const sockaddr_storage& sa) throw();
-  Decision verify(const std::string& host, const char* name, int size) throw();
-  Decision verify(const sockaddr_storage& sa, const char* data, int size) throw();
-};
-}
-}
-}
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerSocket.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerSocket.cpp
deleted file mode 100644
index 87b6383..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerSocket.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <cstring>
-#include <stdexcept>
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thrift/transport/TSocket.h>
-#include <thrift/transport/TServerSocket.h>
-#include <thrift/transport/PlatformSocket.h>
-#include <boost/shared_ptr.hpp>
-
-#ifndef AF_LOCAL
-#define AF_LOCAL AF_UNIX
-#endif
-
-#ifndef SOCKOPT_CAST_T
-#ifndef _WIN32
-#define SOCKOPT_CAST_T void
-#else
-#define SOCKOPT_CAST_T char
-#endif // _WIN32
-#endif
-
-#if defined(_WIN32) && (_WIN32_WINNT < 0x0600)
-  #define AI_ADDRCONFIG 0x0400
-#endif
-
-template <class T>
-inline const SOCKOPT_CAST_T* const_cast_sockopt(const T* v) {
-  return reinterpret_cast<const SOCKOPT_CAST_T*>(v);
-}
-
-template <class T>
-inline SOCKOPT_CAST_T* cast_sockopt(T* v) {
-  return reinterpret_cast<SOCKOPT_CAST_T*>(v);
-}
-
-void destroyer_of_fine_sockets(THRIFT_SOCKET* ssock) {
-  ::THRIFT_CLOSESOCKET(*ssock);
-  delete ssock;
-}
-
-class TGetAddrInfoWrapper {
-public:
-  TGetAddrInfoWrapper(const char* node, const char* service, const struct addrinfo* hints);
-
-  virtual ~TGetAddrInfoWrapper();
-
-  int init();
-  const struct addrinfo* res();
-
-private:
-  const char* node_;
-  const char* service_;
-  const struct addrinfo* hints_;
-  struct addrinfo* res_;
-};
-
-TGetAddrInfoWrapper::TGetAddrInfoWrapper(const char* node,
-                                         const char* service,
-                                         const struct addrinfo* hints)
-  : node_(node), service_(service), hints_(hints), res_(NULL) {}
-
-TGetAddrInfoWrapper::~TGetAddrInfoWrapper() {
-  if (this->res_ != NULL)
-    freeaddrinfo(this->res_);
-}
-
-int TGetAddrInfoWrapper::init() {
-  if (this->res_ == NULL)
-    return getaddrinfo(this->node_, this->service_, this->hints_, &(this->res_));
-  return 0;
-}
-
-const struct addrinfo* TGetAddrInfoWrapper::res() {
-  return this->res_;
-}
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using namespace std;
-using boost::shared_ptr;
-
-TServerSocket::TServerSocket(int port)
-  : interruptableChildren_(true),
-    port_(port),
-    serverSocket_(THRIFT_INVALID_SOCKET),
-    acceptBacklog_(DEFAULT_BACKLOG),
-    sendTimeout_(0),
-    recvTimeout_(0),
-    accTimeout_(-1),
-    retryLimit_(0),
-    retryDelay_(0),
-    tcpSendBuffer_(0),
-    tcpRecvBuffer_(0),
-    keepAlive_(false),
-    listening_(false),
-    interruptSockWriter_(THRIFT_INVALID_SOCKET),
-    interruptSockReader_(THRIFT_INVALID_SOCKET),
-    childInterruptSockWriter_(THRIFT_INVALID_SOCKET) {
-}
-
-TServerSocket::TServerSocket(int port, int sendTimeout, int recvTimeout)
-  : interruptableChildren_(true),
-    port_(port),
-    serverSocket_(THRIFT_INVALID_SOCKET),
-    acceptBacklog_(DEFAULT_BACKLOG),
-    sendTimeout_(sendTimeout),
-    recvTimeout_(recvTimeout),
-    accTimeout_(-1),
-    retryLimit_(0),
-    retryDelay_(0),
-    tcpSendBuffer_(0),
-    tcpRecvBuffer_(0),
-    keepAlive_(false),
-    listening_(false),
-    interruptSockWriter_(THRIFT_INVALID_SOCKET),
-    interruptSockReader_(THRIFT_INVALID_SOCKET),
-    childInterruptSockWriter_(THRIFT_INVALID_SOCKET) {
-}
-
-TServerSocket::TServerSocket(const string& address, int port)
-  : interruptableChildren_(true),
-    port_(port),
-    address_(address),
-    serverSocket_(THRIFT_INVALID_SOCKET),
-    acceptBacklog_(DEFAULT_BACKLOG),
-    sendTimeout_(0),
-    recvTimeout_(0),
-    accTimeout_(-1),
-    retryLimit_(0),
-    retryDelay_(0),
-    tcpSendBuffer_(0),
-    tcpRecvBuffer_(0),
-    keepAlive_(false),
-    listening_(false),
-    interruptSockWriter_(THRIFT_INVALID_SOCKET),
-    interruptSockReader_(THRIFT_INVALID_SOCKET),
-    childInterruptSockWriter_(THRIFT_INVALID_SOCKET) {
-}
-
-TServerSocket::TServerSocket(const string& path)
-  : interruptableChildren_(true),
-    port_(0),
-    path_(path),
-    serverSocket_(THRIFT_INVALID_SOCKET),
-    acceptBacklog_(DEFAULT_BACKLOG),
-    sendTimeout_(0),
-    recvTimeout_(0),
-    accTimeout_(-1),
-    retryLimit_(0),
-    retryDelay_(0),
-    tcpSendBuffer_(0),
-    tcpRecvBuffer_(0),
-    keepAlive_(false),
-    listening_(false),
-    interruptSockWriter_(THRIFT_INVALID_SOCKET),
-    interruptSockReader_(THRIFT_INVALID_SOCKET),
-    childInterruptSockWriter_(THRIFT_INVALID_SOCKET) {
-}
-
-TServerSocket::~TServerSocket() {
-  close();
-}
-
-void TServerSocket::setSendTimeout(int sendTimeout) {
-  sendTimeout_ = sendTimeout;
-}
-
-void TServerSocket::setRecvTimeout(int recvTimeout) {
-  recvTimeout_ = recvTimeout;
-}
-
-void TServerSocket::setAcceptTimeout(int accTimeout) {
-  accTimeout_ = accTimeout;
-}
-
-void TServerSocket::setAcceptBacklog(int accBacklog) {
-  acceptBacklog_ = accBacklog;
-}
-
-void TServerSocket::setRetryLimit(int retryLimit) {
-  retryLimit_ = retryLimit;
-}
-
-void TServerSocket::setRetryDelay(int retryDelay) {
-  retryDelay_ = retryDelay;
-}
-
-void TServerSocket::setTcpSendBuffer(int tcpSendBuffer) {
-  tcpSendBuffer_ = tcpSendBuffer;
-}
-
-void TServerSocket::setTcpRecvBuffer(int tcpRecvBuffer) {
-  tcpRecvBuffer_ = tcpRecvBuffer;
-}
-
-void TServerSocket::setInterruptableChildren(bool enable) {
-  if (listening_) {
-    throw std::logic_error("setInterruptableChildren cannot be called after listen()");
-  }
-  interruptableChildren_ = enable;
-}
-
-void TServerSocket::listen() {
-  listening_ = true;
-#ifdef _WIN32
-  TWinsockSingleton::create();
-#endif // _WIN32
-  THRIFT_SOCKET sv[2];
-  // Create the socket pair used to interrupt
-  if (-1 == THRIFT_SOCKETPAIR(AF_LOCAL, SOCK_STREAM, 0, sv)) {
-    GlobalOutput.perror("TServerSocket::listen() socketpair() interrupt", THRIFT_GET_SOCKET_ERROR);
-    interruptSockWriter_ = THRIFT_INVALID_SOCKET;
-    interruptSockReader_ = THRIFT_INVALID_SOCKET;
-  } else {
-    interruptSockWriter_ = sv[1];
-    interruptSockReader_ = sv[0];
-  }
-
-  // Create the socket pair used to interrupt all clients
-  if (-1 == THRIFT_SOCKETPAIR(AF_LOCAL, SOCK_STREAM, 0, sv)) {
-    GlobalOutput.perror("TServerSocket::listen() socketpair() childInterrupt",
-                        THRIFT_GET_SOCKET_ERROR);
-    childInterruptSockWriter_ = THRIFT_INVALID_SOCKET;
-    pChildInterruptSockReader_.reset();
-  } else {
-    childInterruptSockWriter_ = sv[1];
-    pChildInterruptSockReader_
-        = boost::shared_ptr<THRIFT_SOCKET>(new THRIFT_SOCKET(sv[0]), destroyer_of_fine_sockets);
-  }
-
-  // Validate port number
-  if (port_ < 0 || port_ > 0xFFFF) {
-    throw TTransportException(TTransportException::BAD_ARGS, "Specified port is invalid");
-  }
-
-  const struct addrinfo *res;
-  int error;
-  char port[sizeof("65535")];
-  THRIFT_SNPRINTF(port, sizeof(port), "%d", port_);
-
-  struct addrinfo hints;
-  std::memset(&hints, 0, sizeof(hints));
-  hints.ai_family = PF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
-
-  // If address is not specified use wildcard address (NULL)
-  TGetAddrInfoWrapper info(address_.empty() ? NULL : &address_[0], port, &hints);
-
-  error = info.init();
-  if (error) {
-    GlobalOutput.printf("getaddrinfo %d: %s", error, THRIFT_GAI_STRERROR(error));
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "Could not resolve host for server socket.");
-  }
-
-  // Pick the ipv6 address first since ipv4 addresses can be mapped
-  // into ipv6 space.
-  for (res = info.res(); res; res = res->ai_next) {
-    if (res->ai_family == AF_INET6 || res->ai_next == NULL)
-      break;
-  }
-
-  if (!path_.empty()) {
-    serverSocket_ = socket(PF_UNIX, SOCK_STREAM, IPPROTO_IP);
-  } else {
-    serverSocket_ = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-  }
-
-  if (serverSocket_ == THRIFT_INVALID_SOCKET) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TServerSocket::listen() socket() ", errno_copy);
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "Could not create server socket.",
-                              errno_copy);
-  }
-
-  // Set THRIFT_NO_SOCKET_CACHING to prevent 2MSL delay on accept
-  int one = 1;
-  if (-1 == setsockopt(serverSocket_,
-                       SOL_SOCKET,
-                       THRIFT_NO_SOCKET_CACHING,
-                       cast_sockopt(&one),
-                       sizeof(one))) {
-// ignore errors coming out of this setsockopt on Windows.  This is because
-// SO_EXCLUSIVEADDRUSE requires admin privileges on WinXP, but we don't
-// want to force servers to be an admin.
-#ifndef _WIN32
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TServerSocket::listen() setsockopt() THRIFT_NO_SOCKET_CACHING ",
-                        errno_copy);
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "Could not set THRIFT_NO_SOCKET_CACHING",
-                              errno_copy);
-#endif
-  }
-
-  // Set TCP buffer sizes
-  if (tcpSendBuffer_ > 0) {
-    if (-1 == setsockopt(serverSocket_,
-                         SOL_SOCKET,
-                         SO_SNDBUF,
-                         cast_sockopt(&tcpSendBuffer_),
-                         sizeof(tcpSendBuffer_))) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TServerSocket::listen() setsockopt() SO_SNDBUF ", errno_copy);
-      close();
-      throw TTransportException(TTransportException::NOT_OPEN,
-                                "Could not set SO_SNDBUF",
-                                errno_copy);
-    }
-  }
-
-  if (tcpRecvBuffer_ > 0) {
-    if (-1 == setsockopt(serverSocket_,
-                         SOL_SOCKET,
-                         SO_RCVBUF,
-                         cast_sockopt(&tcpRecvBuffer_),
-                         sizeof(tcpRecvBuffer_))) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TServerSocket::listen() setsockopt() SO_RCVBUF ", errno_copy);
-      close();
-      throw TTransportException(TTransportException::NOT_OPEN,
-                                "Could not set SO_RCVBUF",
-                                errno_copy);
-    }
-  }
-
-// Defer accept
-#ifdef TCP_DEFER_ACCEPT
-  if (path_.empty()) {
-    if (-1 == setsockopt(serverSocket_, IPPROTO_TCP, TCP_DEFER_ACCEPT, &one, sizeof(one))) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TServerSocket::listen() setsockopt() TCP_DEFER_ACCEPT ", errno_copy);
-      close();
-      throw TTransportException(TTransportException::NOT_OPEN,
-                                "Could not set TCP_DEFER_ACCEPT",
-                                errno_copy);
-    }
-  }
-#endif // #ifdef TCP_DEFER_ACCEPT
-
-#ifdef IPV6_V6ONLY
-  if (res->ai_family == AF_INET6 && path_.empty()) {
-    int zero = 0;
-    if (-1 == setsockopt(serverSocket_,
-                         IPPROTO_IPV6,
-                         IPV6_V6ONLY,
-                         cast_sockopt(&zero),
-                         sizeof(zero))) {
-      GlobalOutput.perror("TServerSocket::listen() IPV6_V6ONLY ", THRIFT_GET_SOCKET_ERROR);
-    }
-  }
-#endif // #ifdef IPV6_V6ONLY
-
-  // Turn linger off, don't want to block on calls to close
-  struct linger ling = {0, 0};
-  if (-1 == setsockopt(serverSocket_, SOL_SOCKET, SO_LINGER, cast_sockopt(&ling), sizeof(ling))) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TServerSocket::listen() setsockopt() SO_LINGER ", errno_copy);
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN, "Could not set SO_LINGER", errno_copy);
-  }
-
-  // Unix Sockets do not need that
-  if (path_.empty()) {
-    // TCP Nodelay, speed over bandwidth
-    if (-1
-        == setsockopt(serverSocket_, IPPROTO_TCP, TCP_NODELAY, cast_sockopt(&one), sizeof(one))) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TServerSocket::listen() setsockopt() TCP_NODELAY ", errno_copy);
-      close();
-      throw TTransportException(TTransportException::NOT_OPEN,
-                                "Could not set TCP_NODELAY",
-                                errno_copy);
-    }
-  }
-
-  // Set NONBLOCK on the accept socket
-  int flags = THRIFT_FCNTL(serverSocket_, THRIFT_F_GETFL, 0);
-  if (flags == -1) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TServerSocket::listen() THRIFT_FCNTL() THRIFT_F_GETFL ", errno_copy);
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "THRIFT_FCNTL() THRIFT_F_GETFL failed",
-                              errno_copy);
-  }
-
-  if (-1 == THRIFT_FCNTL(serverSocket_, THRIFT_F_SETFL, flags | THRIFT_O_NONBLOCK)) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TServerSocket::listen() THRIFT_FCNTL() THRIFT_O_NONBLOCK ", errno_copy);
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "THRIFT_FCNTL() THRIFT_F_SETFL THRIFT_O_NONBLOCK failed",
-                              errno_copy);
-  }
-
-  // prepare the port information
-  // we may want to try to bind more than once, since THRIFT_NO_SOCKET_CACHING doesn't
-  // always seem to work. The client can configure the retry variables.
-  int retries = 0;
-  int errno_copy = 0;
-
-  if (!path_.empty()) {
-
-#ifndef _WIN32
-
-    // Unix Domain Socket
-    size_t len = path_.size() + 1;
-    if (len > sizeof(((sockaddr_un*)NULL)->sun_path)) {
-      errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TSocket::listen() Unix Domain socket path too long", errno_copy);
-      throw TTransportException(TTransportException::NOT_OPEN,
-                                "Unix Domain socket path too long",
-                                errno_copy);
-    }
-
-    struct sockaddr_un address;
-    address.sun_family = AF_UNIX;
-    memcpy(address.sun_path, path_.c_str(), len);
-
-    socklen_t structlen = static_cast<socklen_t>(sizeof(address));
-
-    if (!address.sun_path[0]) { // abstract namespace socket
-#ifdef __linux__
-      // sun_path is not null-terminated in this case and structlen determines its length
-      structlen -= sizeof(address.sun_path) - len;
-#else
-      GlobalOutput.perror("TSocket::open() Abstract Namespace Domain sockets only supported on linux: ", -99);
-      throw TTransportException(TTransportException::NOT_OPEN,
-                                " Abstract Namespace Domain socket path not supported");
-#endif
-    }
-
-    do {
-      if (0 == ::bind(serverSocket_, (struct sockaddr*)&address, structlen)) {
-        break;
-      }
-      errno_copy = THRIFT_GET_SOCKET_ERROR;
-      // use short circuit evaluation here to only sleep if we need to
-    } while ((retries++ < retryLimit_) && (THRIFT_SLEEP_SEC(retryDelay_) == 0));
-#else
-    GlobalOutput.perror("TSocket::open() Unix Domain socket path not supported on windows", -99);
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              " Unix Domain socket path not supported");
-#endif
-  } else {
-    do {
-      if (0 == ::bind(serverSocket_, res->ai_addr, static_cast<int>(res->ai_addrlen))) {
-        break;
-      }
-      errno_copy = THRIFT_GET_SOCKET_ERROR;
-      // use short circuit evaluation here to only sleep if we need to
-    } while ((retries++ < retryLimit_) && (THRIFT_SLEEP_SEC(retryDelay_) == 0));
-
-    // retrieve bind info
-    if (port_ == 0 && retries <= retryLimit_) {
-      struct sockaddr_storage sa;
-      socklen_t len = sizeof(sa);
-      std::memset(&sa, 0, len);
-      if (::getsockname(serverSocket_, reinterpret_cast<struct sockaddr*>(&sa), &len) < 0) {
-        errno_copy = THRIFT_GET_SOCKET_ERROR;
-        GlobalOutput.perror("TServerSocket::getPort() getsockname() ", errno_copy);
-      } else {
-        if (sa.ss_family == AF_INET6) {
-          const struct sockaddr_in6* sin = reinterpret_cast<const struct sockaddr_in6*>(&sa);
-          port_ = ntohs(sin->sin6_port);
-        } else {
-          const struct sockaddr_in* sin = reinterpret_cast<const struct sockaddr_in*>(&sa);
-          port_ = ntohs(sin->sin_port);
-        }
-      }
-    }
-  }
-
-  // throw an error if we failed to bind properly
-  if (retries > retryLimit_) {
-    char errbuf[1024];
-    if (!path_.empty()) {
-      THRIFT_SNPRINTF(errbuf, sizeof(errbuf), "TServerSocket::listen() PATH %s", path_.c_str());
-    } else {
-      THRIFT_SNPRINTF(errbuf, sizeof(errbuf), "TServerSocket::listen() BIND %d", port_);
-    }
-    GlobalOutput(errbuf);
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "Could not bind",
-                              errno_copy);
-  }
-
-  if (listenCallback_)
-    listenCallback_(serverSocket_);
-
-  // Call listen
-  if (-1 == ::listen(serverSocket_, acceptBacklog_)) {
-    errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TServerSocket::listen() listen() ", errno_copy);
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN, "Could not listen", errno_copy);
-  }
-
-  // The socket is now listening!
-}
-
-int TServerSocket::getPort() {
-  return port_;
-}
-
-shared_ptr<TTransport> TServerSocket::acceptImpl() {
-  if (serverSocket_ == THRIFT_INVALID_SOCKET) {
-    throw TTransportException(TTransportException::NOT_OPEN, "TServerSocket not listening");
-  }
-
-  struct THRIFT_POLLFD fds[2];
-
-  int maxEintrs = 5;
-  int numEintrs = 0;
-
-  while (true) {
-    std::memset(fds, 0, sizeof(fds));
-    fds[0].fd = serverSocket_;
-    fds[0].events = THRIFT_POLLIN;
-    if (interruptSockReader_ != THRIFT_INVALID_SOCKET) {
-      fds[1].fd = interruptSockReader_;
-      fds[1].events = THRIFT_POLLIN;
-    }
-    /*
-      TODO: if THRIFT_EINTR is received, we'll restart the timeout.
-      To be accurate, we need to fix this in the future.
-     */
-    int ret = THRIFT_POLL(fds, 2, accTimeout_);
-
-    if (ret < 0) {
-      // error cases
-      if (THRIFT_GET_SOCKET_ERROR == THRIFT_EINTR && (numEintrs++ < maxEintrs)) {
-        // THRIFT_EINTR needs to be handled manually and we can tolerate
-        // a certain number
-        continue;
-      }
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TServerSocket::acceptImpl() THRIFT_POLL() ", errno_copy);
-      throw TTransportException(TTransportException::UNKNOWN, "Unknown", errno_copy);
-    } else if (ret > 0) {
-      // Check for an interrupt signal
-      if (interruptSockReader_ != THRIFT_INVALID_SOCKET && (fds[1].revents & THRIFT_POLLIN)) {
-        int8_t buf;
-        if (-1 == recv(interruptSockReader_, cast_sockopt(&buf), sizeof(int8_t), 0)) {
-          GlobalOutput.perror("TServerSocket::acceptImpl() recv() interrupt ",
-                              THRIFT_GET_SOCKET_ERROR);
-        }
-        throw TTransportException(TTransportException::INTERRUPTED);
-      }
-
-      // Check for the actual server socket being ready
-      if (fds[0].revents & THRIFT_POLLIN) {
-        break;
-      }
-    } else {
-      GlobalOutput("TServerSocket::acceptImpl() THRIFT_POLL 0");
-      throw TTransportException(TTransportException::UNKNOWN);
-    }
-  }
-
-  struct sockaddr_storage clientAddress;
-  int size = sizeof(clientAddress);
-  THRIFT_SOCKET clientSocket
-      = ::accept(serverSocket_, (struct sockaddr*)&clientAddress, (socklen_t*)&size);
-
-  if (clientSocket == -1) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TServerSocket::acceptImpl() ::accept() ", errno_copy);
-    throw TTransportException(TTransportException::UNKNOWN, "accept()", errno_copy);
-  }
-
-  // Make sure client socket is blocking
-  int flags = THRIFT_FCNTL(clientSocket, THRIFT_F_GETFL, 0);
-  if (flags == -1) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    ::THRIFT_CLOSESOCKET(clientSocket);
-    GlobalOutput.perror("TServerSocket::acceptImpl() THRIFT_FCNTL() THRIFT_F_GETFL ", errno_copy);
-    throw TTransportException(TTransportException::UNKNOWN,
-                              "THRIFT_FCNTL(THRIFT_F_GETFL)",
-                              errno_copy);
-  }
-
-  if (-1 == THRIFT_FCNTL(clientSocket, THRIFT_F_SETFL, flags & ~THRIFT_O_NONBLOCK)) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    ::THRIFT_CLOSESOCKET(clientSocket);
-    GlobalOutput
-        .perror("TServerSocket::acceptImpl() THRIFT_FCNTL() THRIFT_F_SETFL ~THRIFT_O_NONBLOCK ",
-                errno_copy);
-    throw TTransportException(TTransportException::UNKNOWN,
-                              "THRIFT_FCNTL(THRIFT_F_SETFL)",
-                              errno_copy);
-  }
-
-  shared_ptr<TSocket> client = createSocket(clientSocket);
-  if (sendTimeout_ > 0) {
-    client->setSendTimeout(sendTimeout_);
-  }
-  if (recvTimeout_ > 0) {
-    client->setRecvTimeout(recvTimeout_);
-  }
-  if (keepAlive_) {
-    client->setKeepAlive(keepAlive_);
-  }
-  client->setCachedAddress((sockaddr*)&clientAddress, size);
-
-  if (acceptCallback_)
-    acceptCallback_(clientSocket);
-
-  return client;
-}
-
-shared_ptr<TSocket> TServerSocket::createSocket(THRIFT_SOCKET clientSocket) {
-  if (interruptableChildren_) {
-    return shared_ptr<TSocket>(new TSocket(clientSocket, pChildInterruptSockReader_));
-  } else {
-    return shared_ptr<TSocket>(new TSocket(clientSocket));
-  }
-}
-
-void TServerSocket::notify(THRIFT_SOCKET notifySocket) {
-  if (notifySocket != THRIFT_INVALID_SOCKET) {
-    int8_t byte = 0;
-    if (-1 == send(notifySocket, cast_sockopt(&byte), sizeof(int8_t), 0)) {
-      GlobalOutput.perror("TServerSocket::notify() send() ", THRIFT_GET_SOCKET_ERROR);
-    }
-  }
-}
-
-void TServerSocket::interrupt() {
-  notify(interruptSockWriter_);
-}
-
-void TServerSocket::interruptChildren() {
-  notify(childInterruptSockWriter_);
-}
-
-void TServerSocket::close() {
-  if (serverSocket_ != THRIFT_INVALID_SOCKET) {
-    shutdown(serverSocket_, THRIFT_SHUT_RDWR);
-    ::THRIFT_CLOSESOCKET(serverSocket_);
-  }
-  if (interruptSockWriter_ != THRIFT_INVALID_SOCKET) {
-    ::THRIFT_CLOSESOCKET(interruptSockWriter_);
-  }
-  if (interruptSockReader_ != THRIFT_INVALID_SOCKET) {
-    ::THRIFT_CLOSESOCKET(interruptSockReader_);
-  }
-  if (childInterruptSockWriter_ != THRIFT_INVALID_SOCKET) {
-    ::THRIFT_CLOSESOCKET(childInterruptSockWriter_);
-  }
-  serverSocket_ = THRIFT_INVALID_SOCKET;
-  interruptSockWriter_ = THRIFT_INVALID_SOCKET;
-  interruptSockReader_ = THRIFT_INVALID_SOCKET;
-  childInterruptSockWriter_ = THRIFT_INVALID_SOCKET;
-  pChildInterruptSockReader_.reset();
-  listening_ = false;
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerSocket.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerSocket.h
deleted file mode 100644
index 20a37e7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerSocket.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSERVERSOCKET_H_
-#define _THRIFT_TRANSPORT_TSERVERSOCKET_H_ 1
-
-#include <thrift/transport/TServerTransport.h>
-#include <thrift/transport/PlatformSocket.h>
-#include <thrift/cxxfunctional.h>
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-class TSocket;
-
-/**
- * Server socket implementation of TServerTransport. Wrapper around a unix
- * socket listen and accept calls.
- *
- */
-class TServerSocket : public TServerTransport {
-public:
-  typedef apache::thrift::stdcxx::function<void(THRIFT_SOCKET fd)> socket_func_t;
-
-  const static int DEFAULT_BACKLOG = 1024;
-
-  /**
-   * Constructor.
-   *
-   * @param port    Port number to bind to
-   */
-  TServerSocket(int port);
-
-  /**
-   * Constructor.
-   *
-   * @param port        Port number to bind to
-   * @param sendTimeout Socket send timeout
-   * @param recvTimeout Socket receive timeout
-   */
-  TServerSocket(int port, int sendTimeout, int recvTimeout);
-
-  /**
-   * Constructor.
-   *
-   * @param address Address to bind to
-   * @param port    Port number to bind to
-   */
-  TServerSocket(const std::string& address, int port);
-
-  /**
-   * Constructor used for unix sockets.
-   *
-   * @param path Pathname for unix socket.
-   */
-  TServerSocket(const std::string& path);
-
-  virtual ~TServerSocket();
-
-  void setSendTimeout(int sendTimeout);
-  void setRecvTimeout(int recvTimeout);
-
-  void setAcceptTimeout(int accTimeout);
-  void setAcceptBacklog(int accBacklog);
-
-  void setRetryLimit(int retryLimit);
-  void setRetryDelay(int retryDelay);
-
-  void setKeepAlive(bool keepAlive) { keepAlive_ = keepAlive; }
-
-  void setTcpSendBuffer(int tcpSendBuffer);
-  void setTcpRecvBuffer(int tcpRecvBuffer);
-
-  // listenCallback gets called just before listen, and after all Thrift
-  // setsockopt calls have been made.  If you have custom setsockopt
-  // things that need to happen on the listening socket, this is the place to do it.
-  void setListenCallback(const socket_func_t& listenCallback) { listenCallback_ = listenCallback; }
-
-  // acceptCallback gets called after each accept call, on the newly created socket.
-  // It is called after all Thrift setsockopt calls have been made.  If you have
-  // custom setsockopt things that need to happen on the accepted
-  // socket, this is the place to do it.
-  void setAcceptCallback(const socket_func_t& acceptCallback) { acceptCallback_ = acceptCallback; }
-
-  // When enabled (the default), new children TSockets will be constructed so
-  // they can be interrupted by TServerTransport::interruptChildren().
-  // This is more expensive in terms of system calls (poll + recv) however
-  // ensures a connected client cannot interfere with TServer::stop().
-  //
-  // When disabled, TSocket children do not incur an additional poll() call.
-  // Server-side reads are more efficient, however a client can interfere with
-  // the server's ability to shutdown properly by staying connected.
-  //
-  // Must be called before listen(); mode cannot be switched after that.
-  // \throws std::logic_error if listen() has been called
-  void setInterruptableChildren(bool enable);
-
-  int getPort();
-
-  void listen();
-  void interrupt();
-  void interruptChildren();
-  void close();
-
-protected:
-  boost::shared_ptr<TTransport> acceptImpl();
-  virtual boost::shared_ptr<TSocket> createSocket(THRIFT_SOCKET client);
-  bool interruptableChildren_;
-  boost::shared_ptr<THRIFT_SOCKET> pChildInterruptSockReader_; // if interruptableChildren_ this is shared with child TSockets
-
-private:
-  void notify(THRIFT_SOCKET notifySock);
-
-  int port_;
-  std::string address_;
-  std::string path_;
-  THRIFT_SOCKET serverSocket_;
-  int acceptBacklog_;
-  int sendTimeout_;
-  int recvTimeout_;
-  int accTimeout_;
-  int retryLimit_;
-  int retryDelay_;
-  int tcpSendBuffer_;
-  int tcpRecvBuffer_;
-  bool keepAlive_;
-  bool listening_;
-
-  THRIFT_SOCKET interruptSockWriter_;                          // is notified on interrupt()
-  THRIFT_SOCKET interruptSockReader_;                          // is used in select/poll with serverSocket_ for interruptability
-  THRIFT_SOCKET childInterruptSockWriter_;                     // is notified on interruptChildren()
-
-  socket_func_t listenCallback_;
-  socket_func_t acceptCallback_;
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TSERVERSOCKET_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerTransport.h
deleted file mode 100644
index cd1d3da..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TServerTransport.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_
-#define _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_ 1
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TTransportException.h>
-#include <boost/shared_ptr.hpp>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Server transport framework. A server needs to have some facility for
- * creating base transports to read/write from.  The server is expected
- * to keep track of TTransport children that it creates for purposes of
- * controlling their lifetime.
- */
-class TServerTransport {
-public:
-  virtual ~TServerTransport() {}
-
-  /**
-   * Starts the server transport listening for new connections. Prior to this
-   * call most transports will not return anything when accept is called.
-   *
-   * @throws TTransportException if we were unable to listen
-   */
-  virtual void listen() {}
-
-  /**
-   * Gets a new dynamically allocated transport object and passes it to the
-   * caller. Note that it is the explicit duty of the caller to free the
-   * allocated object. The returned TTransport object must always be in the
-   * opened state. NULL should never be returned, instead an Exception should
-   * always be thrown.
-   *
-   * @return A new TTransport object
-   * @throws TTransportException if there is an error
-   */
-  boost::shared_ptr<TTransport> accept() {
-    boost::shared_ptr<TTransport> result = acceptImpl();
-    if (!result) {
-      throw TTransportException("accept() may not return NULL");
-    }
-    return result;
-  }
-
-  /**
-   * For "smart" TServerTransport implementations that work in a multi
-   * threaded context this can be used to break out of an accept() call.
-   * It is expected that the transport will throw a TTransportException
-   * with the INTERRUPTED error code.
-   *
-   * This will not make an attempt to interrupt any TTransport children.
-   */
-  virtual void interrupt() {}
-
-  /**
-   * This will interrupt the children created by the server transport.
-   * allowing them to break out of any blocking data reception call.
-   * It is expected that the children will throw a TTransportException
-   * with the INTERRUPTED error code.
-   */
-  virtual void interruptChildren() {}
-
-  /**
-   * Closes this transport such that future calls to accept will do nothing.
-   */
-  virtual void close() = 0;
-
-protected:
-  TServerTransport() {}
-
-  /**
-   * Subclasses should implement this function for accept.
-   *
-   * @return A newly allocated TTransport object
-   * @throw TTransportException If an error occurs
-   */
-  virtual boost::shared_ptr<TTransport> acceptImpl() = 0;
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TShortReadTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TShortReadTransport.h
deleted file mode 100644
index f2ecae1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TShortReadTransport.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_
-#define _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_ 1
-
-#include <cstdlib>
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TVirtualTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-namespace test {
-
-/**
- * This class is only meant for testing.  It wraps another transport.
- * Calls to read are passed through with some probability.  Otherwise,
- * the read amount is randomly reduced before being passed through.
- *
- */
-class TShortReadTransport : public TVirtualTransport<TShortReadTransport> {
-public:
-  TShortReadTransport(boost::shared_ptr<TTransport> transport, double full_prob)
-    : transport_(transport), fullProb_(full_prob) {}
-
-  bool isOpen() { return transport_->isOpen(); }
-
-  bool peek() { return transport_->peek(); }
-
-  void open() { transport_->open(); }
-
-  void close() { transport_->close(); }
-
-  uint32_t read(uint8_t* buf, uint32_t len) {
-    if (len == 0) {
-      return 0;
-    }
-
-    if (rand() / (double)RAND_MAX >= fullProb_) {
-      len = 1 + rand() % len;
-    }
-    return transport_->read(buf, len);
-  }
-
-  void write(const uint8_t* buf, uint32_t len) { transport_->write(buf, len); }
-
-  void flush() { transport_->flush(); }
-
-  const uint8_t* borrow(uint8_t* buf, uint32_t* len) { return transport_->borrow(buf, len); }
-
-  void consume(uint32_t len) { return transport_->consume(len); }
-
-  boost::shared_ptr<TTransport> getUnderlyingTransport() { return transport_; }
-
-protected:
-  boost::shared_ptr<TTransport> transport_;
-  double fullProb_;
-};
-}
-}
-}
-} // apache::thrift::transport::test
-
-#endif // #ifndef _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp
deleted file mode 100644
index 4b1399e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <thrift/transport/TSimpleFileTransport.h>
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#include <fcntl.h>
-
-#ifdef _WIN32
-#include <io.h>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-TSimpleFileTransport::TSimpleFileTransport(const std::string& path, bool read, bool write)
-  : TFDTransport(-1, TFDTransport::CLOSE_ON_DESTROY) {
-  int flags = 0;
-  if (read && write) {
-    flags = O_RDWR;
-  } else if (read) {
-    flags = O_RDONLY;
-  } else if (write) {
-    flags = O_WRONLY;
-  } else {
-    throw TTransportException("Neither READ nor WRITE specified");
-  }
-  if (write) {
-    flags |= O_CREAT | O_APPEND;
-  }
-#ifndef _WIN32
-  mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
-#else
-  int mode = _S_IREAD | _S_IWRITE;
-#endif
-  int fd = ::THRIFT_OPEN(path.c_str(), flags, mode);
-  if (fd < 0) {
-    throw TTransportException("failed to open file for writing: " + path);
-  }
-  setFD(fd);
-  open();
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSimpleFileTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSimpleFileTransport.h
deleted file mode 100644
index 32e1897..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSimpleFileTransport.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSIMPLEFILETRANSPORT_H_
-#define _THRIFT_TRANSPORT_TSIMPLEFILETRANSPORT_H_ 1
-
-#include <thrift/transport/TFDTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Dead-simple wrapper around a file.
- *
- * Writeable files are opened with O_CREAT and O_APPEND
- */
-class TSimpleFileTransport : public TFDTransport {
-public:
-  TSimpleFileTransport(const std::string& path, bool read = true, bool write = false);
-};
-}
-}
-} // apache::thrift::transport
-
-#endif //  _THRIFT_TRANSPORT_TSIMPLEFILETRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocket.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocket.cpp
deleted file mode 100644
index e1c106a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocket.cpp
+++ /dev/null
@@ -1,934 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <cstring>
-#include <sstream>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#endif
-#include <sys/types.h>
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/transport/TSocket.h>
-#include <thrift/transport/TTransportException.h>
-#include <thrift/transport/PlatformSocket.h>
-
-#ifndef SOCKOPT_CAST_T
-#ifndef _WIN32
-#define SOCKOPT_CAST_T void
-#else
-#define SOCKOPT_CAST_T char
-#endif // _WIN32
-#endif
-
-#if defined(_WIN32) && (_WIN32_WINNT < 0x0600)
-  #define AI_ADDRCONFIG 0x0400
-#endif
-
-template <class T>
-inline const SOCKOPT_CAST_T* const_cast_sockopt(const T* v) {
-  return reinterpret_cast<const SOCKOPT_CAST_T*>(v);
-}
-
-template <class T>
-inline SOCKOPT_CAST_T* cast_sockopt(T* v) {
-  return reinterpret_cast<SOCKOPT_CAST_T*>(v);
-}
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using namespace std;
-
-/**
- * TSocket implementation.
- *
- */
-
-TSocket::TSocket(const string& host, int port)
-  : host_(host),
-    port_(port),
-    socket_(THRIFT_INVALID_SOCKET),
-    peerPort_(0),
-    connTimeout_(0),
-    sendTimeout_(0),
-    recvTimeout_(0),
-    keepAlive_(false),
-    lingerOn_(1),
-    lingerVal_(0),
-    noDelay_(1),
-    maxRecvRetries_(5) {
-}
-
-TSocket::TSocket(const string& path)
-  : port_(0),
-    path_(path),
-    socket_(THRIFT_INVALID_SOCKET),
-    peerPort_(0),
-    connTimeout_(0),
-    sendTimeout_(0),
-    recvTimeout_(0),
-    keepAlive_(false),
-    lingerOn_(1),
-    lingerVal_(0),
-    noDelay_(1),
-    maxRecvRetries_(5) {
-  cachedPeerAddr_.ipv4.sin_family = AF_UNSPEC;
-}
-
-TSocket::TSocket()
-  : port_(0),
-    socket_(THRIFT_INVALID_SOCKET),
-    peerPort_(0),
-    connTimeout_(0),
-    sendTimeout_(0),
-    recvTimeout_(0),
-    keepAlive_(false),
-    lingerOn_(1),
-    lingerVal_(0),
-    noDelay_(1),
-    maxRecvRetries_(5) {
-  cachedPeerAddr_.ipv4.sin_family = AF_UNSPEC;
-}
-
-TSocket::TSocket(THRIFT_SOCKET socket)
-  : port_(0),
-    socket_(socket),
-    peerPort_(0),
-    connTimeout_(0),
-    sendTimeout_(0),
-    recvTimeout_(0),
-    keepAlive_(false),
-    lingerOn_(1),
-    lingerVal_(0),
-    noDelay_(1),
-    maxRecvRetries_(5) {
-  cachedPeerAddr_.ipv4.sin_family = AF_UNSPEC;
-#ifdef SO_NOSIGPIPE
-  {
-    int one = 1;
-    setsockopt(socket_, SOL_SOCKET, SO_NOSIGPIPE, &one, sizeof(one));
-  }
-#endif
-}
-
-TSocket::TSocket(THRIFT_SOCKET socket, boost::shared_ptr<THRIFT_SOCKET> interruptListener)
-  : port_(0),
-    socket_(socket),
-    peerPort_(0),
-    interruptListener_(interruptListener),
-    connTimeout_(0),
-    sendTimeout_(0),
-    recvTimeout_(0),
-    keepAlive_(false),
-    lingerOn_(1),
-    lingerVal_(0),
-    noDelay_(1),
-    maxRecvRetries_(5) {
-  cachedPeerAddr_.ipv4.sin_family = AF_UNSPEC;
-#ifdef SO_NOSIGPIPE
-  {
-    int one = 1;
-    setsockopt(socket_, SOL_SOCKET, SO_NOSIGPIPE, &one, sizeof(one));
-  }
-#endif
-}
-
-TSocket::~TSocket() {
-  close();
-}
-
-bool TSocket::isOpen() {
-  return (socket_ != THRIFT_INVALID_SOCKET);
-}
-
-bool TSocket::peek() {
-  if (!isOpen()) {
-    return false;
-  }
-  if (interruptListener_) {
-    for (int retries = 0;;) {
-      struct THRIFT_POLLFD fds[2];
-      std::memset(fds, 0, sizeof(fds));
-      fds[0].fd = socket_;
-      fds[0].events = THRIFT_POLLIN;
-      fds[1].fd = *(interruptListener_.get());
-      fds[1].events = THRIFT_POLLIN;
-      int ret = THRIFT_POLL(fds, 2, (recvTimeout_ == 0) ? -1 : recvTimeout_);
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      if (ret < 0) {
-        // error cases
-        if (errno_copy == THRIFT_EINTR && (retries++ < maxRecvRetries_)) {
-          continue;
-        }
-        GlobalOutput.perror("TSocket::peek() THRIFT_POLL() ", errno_copy);
-        throw TTransportException(TTransportException::UNKNOWN, "Unknown", errno_copy);
-      } else if (ret > 0) {
-        // Check the interruptListener
-        if (fds[1].revents & THRIFT_POLLIN) {
-          return false;
-        }
-        // There must be data or a disconnection, fall through to the PEEK
-        break;
-      } else {
-        // timeout
-        return false;
-      }
-    }
-  }
-
-  // Check to see if data is available or if the remote side closed
-  uint8_t buf;
-  int r = static_cast<int>(recv(socket_, cast_sockopt(&buf), 1, MSG_PEEK));
-  if (r == -1) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-#if defined __FreeBSD__ || defined __MACH__
-    /* shigin:
-     * freebsd returns -1 and THRIFT_ECONNRESET if socket was closed by
-     * the other side
-     */
-    if (errno_copy == THRIFT_ECONNRESET) {
-      close();
-      return false;
-    }
-#endif
-    GlobalOutput.perror("TSocket::peek() recv() " + getSocketInfo(), errno_copy);
-    throw TTransportException(TTransportException::UNKNOWN, "recv()", errno_copy);
-  }
-  return (r > 0);
-}
-
-void TSocket::openConnection(struct addrinfo* res) {
-
-  if (isOpen()) {
-    return;
-  }
-
-  if (!path_.empty()) {
-    socket_ = socket(PF_UNIX, SOCK_STREAM, IPPROTO_IP);
-  } else {
-    socket_ = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-  }
-
-  if (socket_ == THRIFT_INVALID_SOCKET) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TSocket::open() socket() " + getSocketInfo(), errno_copy);
-    throw TTransportException(TTransportException::NOT_OPEN, "socket()", errno_copy);
-  }
-
-  // Send timeout
-  if (sendTimeout_ > 0) {
-    setSendTimeout(sendTimeout_);
-  }
-
-  // Recv timeout
-  if (recvTimeout_ > 0) {
-    setRecvTimeout(recvTimeout_);
-  }
-
-  if (keepAlive_) {
-    setKeepAlive(keepAlive_);
-  }
-
-  // Linger
-  setLinger(lingerOn_, lingerVal_);
-
-  // No delay
-  setNoDelay(noDelay_);
-
-#ifdef SO_NOSIGPIPE
-  {
-    int one = 1;
-    setsockopt(socket_, SOL_SOCKET, SO_NOSIGPIPE, &one, sizeof(one));
-  }
-#endif
-
-// Uses a low min RTO if asked to.
-#ifdef TCP_LOW_MIN_RTO
-  if (getUseLowMinRto()) {
-    int one = 1;
-    setsockopt(socket_, IPPROTO_TCP, TCP_LOW_MIN_RTO, &one, sizeof(one));
-  }
-#endif
-
-  // Set the socket to be non blocking for connect if a timeout exists
-  int flags = THRIFT_FCNTL(socket_, THRIFT_F_GETFL, 0);
-  if (connTimeout_ > 0) {
-    if (-1 == THRIFT_FCNTL(socket_, THRIFT_F_SETFL, flags | THRIFT_O_NONBLOCK)) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TSocket::open() THRIFT_FCNTL() " + getSocketInfo(), errno_copy);
-      throw TTransportException(TTransportException::NOT_OPEN, "THRIFT_FCNTL() failed", errno_copy);
-    }
-  } else {
-    if (-1 == THRIFT_FCNTL(socket_, THRIFT_F_SETFL, flags & ~THRIFT_O_NONBLOCK)) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TSocket::open() THRIFT_FCNTL " + getSocketInfo(), errno_copy);
-      throw TTransportException(TTransportException::NOT_OPEN, "THRIFT_FCNTL() failed", errno_copy);
-    }
-  }
-
-  // Connect the socket
-  int ret;
-  if (!path_.empty()) {
-
-#ifndef _WIN32
-    size_t len = path_.size() + 1;
-    if (len > sizeof(((sockaddr_un*)NULL)->sun_path)) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TSocket::open() Unix Domain socket path too long", errno_copy);
-      throw TTransportException(TTransportException::NOT_OPEN, " Unix Domain socket path too long");
-    }
-
-    struct sockaddr_un address;
-    address.sun_family = AF_UNIX;
-    memcpy(address.sun_path, path_.c_str(), len);
-
-    socklen_t structlen = static_cast<socklen_t>(sizeof(address));
-
-    if (!address.sun_path[0]) { // abstract namespace socket
-#ifdef __linux__
-      // sun_path is not null-terminated in this case and structlen determines its length
-      structlen -= sizeof(address.sun_path) - len;
-#else
-      GlobalOutput.perror("TSocket::open() Abstract Namespace Domain sockets only supported on linux: ", -99);
-      throw TTransportException(TTransportException::NOT_OPEN,
-                                " Abstract Namespace Domain socket path not supported");
-#endif
-    }
-
-    ret = connect(socket_, (struct sockaddr*)&address, structlen);
-#else
-    GlobalOutput.perror("TSocket::open() Unix Domain socket path not supported on windows", -99);
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              " Unix Domain socket path not supported");
-#endif
-
-  } else {
-    ret = connect(socket_, res->ai_addr, static_cast<int>(res->ai_addrlen));
-  }
-
-  // success case
-  if (ret == 0) {
-    goto done;
-  }
-
-  if ((THRIFT_GET_SOCKET_ERROR != THRIFT_EINPROGRESS)
-      && (THRIFT_GET_SOCKET_ERROR != THRIFT_EWOULDBLOCK)) {
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TSocket::open() connect() " + getSocketInfo(), errno_copy);
-    throw TTransportException(TTransportException::NOT_OPEN, "connect() failed", errno_copy);
-  }
-
-  struct THRIFT_POLLFD fds[1];
-  std::memset(fds, 0, sizeof(fds));
-  fds[0].fd = socket_;
-  fds[0].events = THRIFT_POLLOUT;
-  ret = THRIFT_POLL(fds, 1, connTimeout_);
-
-  if (ret > 0) {
-    // Ensure the socket is connected and that there are no errors set
-    int val;
-    socklen_t lon;
-    lon = sizeof(int);
-    int ret2 = getsockopt(socket_, SOL_SOCKET, SO_ERROR, cast_sockopt(&val), &lon);
-    if (ret2 == -1) {
-      int errno_copy = THRIFT_GET_SOCKET_ERROR;
-      GlobalOutput.perror("TSocket::open() getsockopt() " + getSocketInfo(), errno_copy);
-      throw TTransportException(TTransportException::NOT_OPEN, "getsockopt()", errno_copy);
-    }
-    // no errors on socket, go to town
-    if (val == 0) {
-      goto done;
-    }
-    GlobalOutput.perror("TSocket::open() error on socket (after THRIFT_POLL) " + getSocketInfo(),
-                        val);
-    throw TTransportException(TTransportException::NOT_OPEN, "socket open() error", val);
-  } else if (ret == 0) {
-    // socket timed out
-    string errStr = "TSocket::open() timed out " + getSocketInfo();
-    GlobalOutput(errStr.c_str());
-    throw TTransportException(TTransportException::NOT_OPEN, "open() timed out");
-  } else {
-    // error on THRIFT_POLL()
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TSocket::open() THRIFT_POLL() " + getSocketInfo(), errno_copy);
-    throw TTransportException(TTransportException::NOT_OPEN, "THRIFT_POLL() failed", errno_copy);
-  }
-
-done:
-  // Set socket back to normal mode (blocking)
-  THRIFT_FCNTL(socket_, THRIFT_F_SETFL, flags);
-
-  if (path_.empty()) {
-    setCachedAddress(res->ai_addr, static_cast<socklen_t>(res->ai_addrlen));
-  }
-}
-
-void TSocket::open() {
-  if (isOpen()) {
-    return;
-  }
-  if (!path_.empty()) {
-    unix_open();
-  } else {
-    local_open();
-  }
-}
-
-void TSocket::unix_open() {
-  if (!path_.empty()) {
-    // Unix Domain SOcket does not need addrinfo struct, so we pass NULL
-    openConnection(NULL);
-  }
-}
-
-void TSocket::local_open() {
-
-#ifdef _WIN32
-  TWinsockSingleton::create();
-#endif // _WIN32
-
-  if (isOpen()) {
-    return;
-  }
-
-  // Validate port number
-  if (port_ < 0 || port_ > 0xFFFF) {
-    throw TTransportException(TTransportException::BAD_ARGS, "Specified port is invalid");
-  }
-
-  struct addrinfo hints, *res, *res0;
-  res = NULL;
-  res0 = NULL;
-  int error;
-  char port[sizeof("65535")];
-  std::memset(&hints, 0, sizeof(hints));
-  hints.ai_family = PF_UNSPEC;
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
-  sprintf(port, "%d", port_);
-
-  error = getaddrinfo(host_.c_str(), port, &hints, &res0);
-
-#ifdef _WIN32
-  if (error == WSANO_DATA) {
-    hints.ai_flags &= ~AI_ADDRCONFIG;
-    error = getaddrinfo(host_.c_str(), port, &hints, &res0);
-  }
-#endif
-
-  if (error) {
-    string errStr = "TSocket::open() getaddrinfo() " + getSocketInfo()
-                    + string(THRIFT_GAI_STRERROR(error));
-    GlobalOutput(errStr.c_str());
-    close();
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              "Could not resolve host for client socket.");
-  }
-
-  // Cycle through all the returned addresses until one
-  // connects or push the exception up.
-  for (res = res0; res; res = res->ai_next) {
-    try {
-      openConnection(res);
-      break;
-    } catch (TTransportException&) {
-      if (res->ai_next) {
-        close();
-      } else {
-        close();
-        freeaddrinfo(res0); // cleanup on failure
-        throw;
-      }
-    }
-  }
-
-  // Free address structure memory
-  freeaddrinfo(res0);
-}
-
-void TSocket::close() {
-  if (socket_ != THRIFT_INVALID_SOCKET) {
-    shutdown(socket_, THRIFT_SHUT_RDWR);
-    ::THRIFT_CLOSESOCKET(socket_);
-  }
-  socket_ = THRIFT_INVALID_SOCKET;
-}
-
-void TSocket::setSocketFD(THRIFT_SOCKET socket) {
-  if (socket_ != THRIFT_INVALID_SOCKET) {
-    close();
-  }
-  socket_ = socket;
-}
-
-uint32_t TSocket::read(uint8_t* buf, uint32_t len) {
-  if (socket_ == THRIFT_INVALID_SOCKET) {
-    throw TTransportException(TTransportException::NOT_OPEN, "Called read on non-open socket");
-  }
-
-  int32_t retries = 0;
-
-  // THRIFT_EAGAIN can be signalled both when a timeout has occurred and when
-  // the system is out of resources (an awesome undocumented feature).
-  // The following is an approximation of the time interval under which
-  // THRIFT_EAGAIN is taken to indicate an out of resources error.
-  uint32_t eagainThresholdMicros = 0;
-  if (recvTimeout_) {
-    // if a readTimeout is specified along with a max number of recv retries, then
-    // the threshold will ensure that the read timeout is not exceeded even in the
-    // case of resource errors
-    eagainThresholdMicros = (recvTimeout_ * 1000) / ((maxRecvRetries_ > 0) ? maxRecvRetries_ : 2);
-  }
-
-try_again:
-  // Read from the socket
-  struct timeval begin;
-  if (recvTimeout_ > 0) {
-    THRIFT_GETTIMEOFDAY(&begin, NULL);
-  } else {
-    // if there is no read timeout we don't need the TOD to determine whether
-    // an THRIFT_EAGAIN is due to a timeout or an out-of-resource condition.
-    begin.tv_sec = begin.tv_usec = 0;
-  }
-
-  int got = 0;
-
-  if (interruptListener_) {
-    struct THRIFT_POLLFD fds[2];
-    std::memset(fds, 0, sizeof(fds));
-    fds[0].fd = socket_;
-    fds[0].events = THRIFT_POLLIN;
-    fds[1].fd = *(interruptListener_.get());
-    fds[1].events = THRIFT_POLLIN;
-
-    int ret = THRIFT_POLL(fds, 2, (recvTimeout_ == 0) ? -1 : recvTimeout_);
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    if (ret < 0) {
-      // error cases
-      if (errno_copy == THRIFT_EINTR && (retries++ < maxRecvRetries_)) {
-        goto try_again;
-      }
-      GlobalOutput.perror("TSocket::read() THRIFT_POLL() ", errno_copy);
-      throw TTransportException(TTransportException::UNKNOWN, "Unknown", errno_copy);
-    } else if (ret > 0) {
-      // Check the interruptListener
-      if (fds[1].revents & THRIFT_POLLIN) {
-        throw TTransportException(TTransportException::INTERRUPTED, "Interrupted");
-      }
-    } else /* ret == 0 */ {
-      throw TTransportException(TTransportException::TIMED_OUT, "THRIFT_EAGAIN (timed out)");
-    }
-
-    // falling through means there is something to recv and it cannot block
-  }
-
-  got = static_cast<int>(recv(socket_, cast_sockopt(buf), len, 0));
-  // THRIFT_GETTIMEOFDAY can change THRIFT_GET_SOCKET_ERROR
-  int errno_copy = THRIFT_GET_SOCKET_ERROR;
-
-  // Check for error on read
-  if (got < 0) {
-    if (errno_copy == THRIFT_EAGAIN) {
-      // if no timeout we can assume that resource exhaustion has occurred.
-      if (recvTimeout_ == 0) {
-        throw TTransportException(TTransportException::TIMED_OUT,
-                                  "THRIFT_EAGAIN (unavailable resources)");
-      }
-      // check if this is the lack of resources or timeout case
-      struct timeval end;
-      THRIFT_GETTIMEOFDAY(&end, NULL);
-      uint32_t readElapsedMicros = static_cast<uint32_t>(((end.tv_sec - begin.tv_sec) * 1000 * 1000)
-                                                         + (end.tv_usec - begin.tv_usec));
-
-      if (!eagainThresholdMicros || (readElapsedMicros < eagainThresholdMicros)) {
-        if (retries++ < maxRecvRetries_) {
-          THRIFT_SLEEP_USEC(50);
-          goto try_again;
-        } else {
-          throw TTransportException(TTransportException::TIMED_OUT,
-                                    "THRIFT_EAGAIN (unavailable resources)");
-        }
-      } else {
-        // infer that timeout has been hit
-        throw TTransportException(TTransportException::TIMED_OUT, "THRIFT_EAGAIN (timed out)");
-      }
-    }
-
-    // If interrupted, try again
-    if (errno_copy == THRIFT_EINTR && retries++ < maxRecvRetries_) {
-      goto try_again;
-    }
-
-    if (errno_copy == THRIFT_ECONNRESET) {
-      return 0;
-    }
-
-    // This ish isn't open
-    if (errno_copy == THRIFT_ENOTCONN) {
-      throw TTransportException(TTransportException::NOT_OPEN, "THRIFT_ENOTCONN");
-    }
-
-    // Timed out!
-    if (errno_copy == THRIFT_ETIMEDOUT) {
-      throw TTransportException(TTransportException::TIMED_OUT, "THRIFT_ETIMEDOUT");
-    }
-
-    // Now it's not a try again case, but a real probblez
-    GlobalOutput.perror("TSocket::read() recv() " + getSocketInfo(), errno_copy);
-
-    // Some other error, whatevz
-    throw TTransportException(TTransportException::UNKNOWN, "Unknown", errno_copy);
-  }
-
-  return got;
-}
-
-void TSocket::write(const uint8_t* buf, uint32_t len) {
-  uint32_t sent = 0;
-
-  while (sent < len) {
-    uint32_t b = write_partial(buf + sent, len - sent);
-    if (b == 0) {
-      // This should only happen if the timeout set with SO_SNDTIMEO expired.
-      // Raise an exception.
-      throw TTransportException(TTransportException::TIMED_OUT, "send timeout expired");
-    }
-    sent += b;
-  }
-}
-
-uint32_t TSocket::write_partial(const uint8_t* buf, uint32_t len) {
-  if (socket_ == THRIFT_INVALID_SOCKET) {
-    throw TTransportException(TTransportException::NOT_OPEN, "Called write on non-open socket");
-  }
-
-  uint32_t sent = 0;
-
-  int flags = 0;
-#ifdef MSG_NOSIGNAL
-  // Note the use of MSG_NOSIGNAL to suppress SIGPIPE errors, instead we
-  // check for the THRIFT_EPIPE return condition and close the socket in that case
-  flags |= MSG_NOSIGNAL;
-#endif // ifdef MSG_NOSIGNAL
-
-  int b = static_cast<int>(send(socket_, const_cast_sockopt(buf + sent), len - sent, flags));
-
-  if (b < 0) {
-    if (THRIFT_GET_SOCKET_ERROR == THRIFT_EWOULDBLOCK || THRIFT_GET_SOCKET_ERROR == THRIFT_EAGAIN) {
-      return 0;
-    }
-    // Fail on a send error
-    int errno_copy = THRIFT_GET_SOCKET_ERROR;
-    GlobalOutput.perror("TSocket::write_partial() send() " + getSocketInfo(), errno_copy);
-
-    if (errno_copy == THRIFT_EPIPE || errno_copy == THRIFT_ECONNRESET
-        || errno_copy == THRIFT_ENOTCONN) {
-      close();
-      throw TTransportException(TTransportException::NOT_OPEN, "write() send()", errno_copy);
-    }
-
-    throw TTransportException(TTransportException::UNKNOWN, "write() send()", errno_copy);
-  }
-
-  // Fail on blocked send
-  if (b == 0) {
-    throw TTransportException(TTransportException::NOT_OPEN, "Socket send returned 0.");
-  }
-  return b;
-}
-
-std::string TSocket::getHost() {
-  return host_;
-}
-
-int TSocket::getPort() {
-  return port_;
-}
-
-void TSocket::setHost(string host) {
-  host_ = host;
-}
-
-void TSocket::setPort(int port) {
-  port_ = port;
-}
-
-void TSocket::setLinger(bool on, int linger) {
-  lingerOn_ = on;
-  lingerVal_ = linger;
-  if (socket_ == THRIFT_INVALID_SOCKET) {
-    return;
-  }
-
-#ifndef _WIN32
-  struct linger l = {(lingerOn_ ? 1 : 0), lingerVal_};
-#else
-  struct linger l = {static_cast<u_short>(lingerOn_ ? 1 : 0), static_cast<u_short>(lingerVal_)};
-#endif
-
-  int ret = setsockopt(socket_, SOL_SOCKET, SO_LINGER, cast_sockopt(&l), sizeof(l));
-  if (ret == -1) {
-    int errno_copy
-        = THRIFT_GET_SOCKET_ERROR; // Copy THRIFT_GET_SOCKET_ERROR because we're allocating memory.
-    GlobalOutput.perror("TSocket::setLinger() setsockopt() " + getSocketInfo(), errno_copy);
-  }
-}
-
-void TSocket::setNoDelay(bool noDelay) {
-  noDelay_ = noDelay;
-  if (socket_ == THRIFT_INVALID_SOCKET || !path_.empty()) {
-    return;
-  }
-
-  // Set socket to NODELAY
-  int v = noDelay_ ? 1 : 0;
-  int ret = setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, cast_sockopt(&v), sizeof(v));
-  if (ret == -1) {
-    int errno_copy
-        = THRIFT_GET_SOCKET_ERROR; // Copy THRIFT_GET_SOCKET_ERROR because we're allocating memory.
-    GlobalOutput.perror("TSocket::setNoDelay() setsockopt() " + getSocketInfo(), errno_copy);
-  }
-}
-
-void TSocket::setConnTimeout(int ms) {
-  connTimeout_ = ms;
-}
-
-void setGenericTimeout(THRIFT_SOCKET s, int timeout_ms, int optname) {
-  if (timeout_ms < 0) {
-    char errBuf[512];
-    sprintf(errBuf, "TSocket::setGenericTimeout with negative input: %d\n", timeout_ms);
-    GlobalOutput(errBuf);
-    return;
-  }
-
-  if (s == THRIFT_INVALID_SOCKET) {
-    return;
-  }
-
-#ifdef _WIN32
-  DWORD platform_time = static_cast<DWORD>(timeout_ms);
-#else
-  struct timeval platform_time = {(int)(timeout_ms / 1000), (int)((timeout_ms % 1000) * 1000)};
-#endif
-
-  int ret = setsockopt(s, SOL_SOCKET, optname, cast_sockopt(&platform_time), sizeof(platform_time));
-  if (ret == -1) {
-    int errno_copy
-        = THRIFT_GET_SOCKET_ERROR; // Copy THRIFT_GET_SOCKET_ERROR because we're allocating memory.
-    GlobalOutput.perror("TSocket::setGenericTimeout() setsockopt() ", errno_copy);
-  }
-}
-
-void TSocket::setRecvTimeout(int ms) {
-  setGenericTimeout(socket_, ms, SO_RCVTIMEO);
-  recvTimeout_ = ms;
-}
-
-void TSocket::setSendTimeout(int ms) {
-  setGenericTimeout(socket_, ms, SO_SNDTIMEO);
-  sendTimeout_ = ms;
-}
-
-void TSocket::setKeepAlive(bool keepAlive) {
-  keepAlive_ = keepAlive;
-
-  if (socket_ == -1) {
-    return;
-  }
-
-  int value = keepAlive_;
-  int ret
-      = setsockopt(socket_, SOL_SOCKET, SO_KEEPALIVE, const_cast_sockopt(&value), sizeof(value));
-
-  if (ret == -1) {
-    int errno_copy
-        = THRIFT_GET_SOCKET_ERROR; // Copy THRIFT_GET_SOCKET_ERROR because we're allocating memory.
-    GlobalOutput.perror("TSocket::setKeepAlive() setsockopt() " + getSocketInfo(), errno_copy);
-  }
-}
-
-void TSocket::setMaxRecvRetries(int maxRecvRetries) {
-  maxRecvRetries_ = maxRecvRetries;
-}
-
-string TSocket::getSocketInfo() {
-  std::ostringstream oss;
-  if (host_.empty() || port_ == 0) {
-    oss << "<Host: " << getPeerAddress();
-    oss << " Port: " << getPeerPort() << ">";
-  } else {
-    oss << "<Host: " << host_ << " Port: " << port_ << ">";
-  }
-  return oss.str();
-}
-
-std::string TSocket::getPeerHost() {
-  if (peerHost_.empty() && path_.empty()) {
-    struct sockaddr_storage addr;
-    struct sockaddr* addrPtr;
-    socklen_t addrLen;
-
-    if (socket_ == THRIFT_INVALID_SOCKET) {
-      return host_;
-    }
-
-    addrPtr = getCachedAddress(&addrLen);
-
-    if (addrPtr == NULL) {
-      addrLen = sizeof(addr);
-      if (getpeername(socket_, (sockaddr*)&addr, &addrLen) != 0) {
-        return peerHost_;
-      }
-      addrPtr = (sockaddr*)&addr;
-
-      setCachedAddress(addrPtr, addrLen);
-    }
-
-    char clienthost[NI_MAXHOST];
-    char clientservice[NI_MAXSERV];
-
-    getnameinfo((sockaddr*)addrPtr,
-                addrLen,
-                clienthost,
-                sizeof(clienthost),
-                clientservice,
-                sizeof(clientservice),
-                0);
-
-    peerHost_ = clienthost;
-  }
-  return peerHost_;
-}
-
-std::string TSocket::getPeerAddress() {
-  if (peerAddress_.empty() && path_.empty()) {
-    struct sockaddr_storage addr;
-    struct sockaddr* addrPtr;
-    socklen_t addrLen;
-
-    if (socket_ == THRIFT_INVALID_SOCKET) {
-      return peerAddress_;
-    }
-
-    addrPtr = getCachedAddress(&addrLen);
-
-    if (addrPtr == NULL) {
-      addrLen = sizeof(addr);
-      if (getpeername(socket_, (sockaddr*)&addr, &addrLen) != 0) {
-        return peerAddress_;
-      }
-      addrPtr = (sockaddr*)&addr;
-
-      setCachedAddress(addrPtr, addrLen);
-    }
-
-    char clienthost[NI_MAXHOST];
-    char clientservice[NI_MAXSERV];
-
-    getnameinfo(addrPtr,
-                addrLen,
-                clienthost,
-                sizeof(clienthost),
-                clientservice,
-                sizeof(clientservice),
-                NI_NUMERICHOST | NI_NUMERICSERV);
-
-    peerAddress_ = clienthost;
-    peerPort_ = std::atoi(clientservice);
-  }
-  return peerAddress_;
-}
-
-int TSocket::getPeerPort() {
-  getPeerAddress();
-  return peerPort_;
-}
-
-void TSocket::setCachedAddress(const sockaddr* addr, socklen_t len) {
-  if (!path_.empty()) {
-    return;
-  }
-
-  switch (addr->sa_family) {
-  case AF_INET:
-    if (len == sizeof(sockaddr_in)) {
-      memcpy((void*)&cachedPeerAddr_.ipv4, (void*)addr, len);
-    }
-    break;
-
-  case AF_INET6:
-    if (len == sizeof(sockaddr_in6)) {
-      memcpy((void*)&cachedPeerAddr_.ipv6, (void*)addr, len);
-    }
-    break;
-  }
-  peerAddress_.clear();
-  peerHost_.clear();
-}
-
-sockaddr* TSocket::getCachedAddress(socklen_t* len) const {
-  switch (cachedPeerAddr_.ipv4.sin_family) {
-  case AF_INET:
-    *len = sizeof(sockaddr_in);
-    return (sockaddr*)&cachedPeerAddr_.ipv4;
-
-  case AF_INET6:
-    *len = sizeof(sockaddr_in6);
-    return (sockaddr*)&cachedPeerAddr_.ipv6;
-
-  default:
-    return NULL;
-  }
-}
-
-bool TSocket::useLowMinRto_ = false;
-void TSocket::setUseLowMinRto(bool useLowMinRto) {
-  useLowMinRto_ = useLowMinRto;
-}
-bool TSocket::getUseLowMinRto() {
-  return useLowMinRto_;
-}
-
-const std::string TSocket::getOrigin() {
-  std::ostringstream oss;
-  oss << getPeerHost() << ":" << getPeerPort();
-  return oss.str();
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocket.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocket.h
deleted file mode 100644
index aa18c31..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocket.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSOCKET_H_
-#define _THRIFT_TRANSPORT_TSOCKET_H_ 1
-
-#include <string>
-
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TVirtualTransport.h>
-#include <thrift/transport/TServerSocket.h>
-#include <thrift/transport/PlatformSocket.h>
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * TCP Socket implementation of the TTransport interface.
- *
- */
-class TSocket : public TVirtualTransport<TSocket> {
-public:
-  /**
-   * Constructs a new socket. Note that this does NOT actually connect the
-   * socket.
-   *
-   */
-  TSocket();
-
-  /**
-   * Constructs a new socket. Note that this does NOT actually connect the
-   * socket.
-   *
-   * @param host An IP address or hostname to connect to
-   * @param port The port to connect on
-   */
-  TSocket(const std::string& host, int port);
-
-  /**
-   * Constructs a new Unix domain socket.
-   * Note that this does NOT actually connect the socket.
-   *
-   * @param path The Unix domain socket e.g. "/tmp/ThriftTest.binary.thrift"
-   */
-  TSocket(const std::string& path);
-
-  /**
-   * Destroyes the socket object, closing it if necessary.
-   */
-  virtual ~TSocket();
-
-  /**
-   * Whether the socket is alive.
-   *
-   * @return Is the socket alive?
-   */
-  virtual bool isOpen();
-
-  /**
-   * Calls select on the socket to see if there is more data available.
-   */
-  virtual bool peek();
-
-  /**
-   * Creates and opens the UNIX socket.
-   *
-   * @throws TTransportException If the socket could not connect
-   */
-  virtual void open();
-
-  /**
-   * Shuts down communications on the socket.
-   */
-  virtual void close();
-
-  /**
-   * Reads from the underlying socket.
-   * \returns the number of bytes read or 0 indicates EOF
-   * \throws TTransportException of types:
-   *           INTERRUPTED means the socket was interrupted
-   *                       out of a blocking call
-   *           NOT_OPEN means the socket has been closed
-   *           TIMED_OUT means the receive timeout expired
-   *           UNKNOWN means something unexpected happened
-   */
-  virtual uint32_t read(uint8_t* buf, uint32_t len);
-
-  /**
-   * Writes to the underlying socket.  Loops until done or fail.
-   */
-  virtual void write(const uint8_t* buf, uint32_t len);
-
-  /**
-   * Writes to the underlying socket.  Does single send() and returns result.
-   */
-  uint32_t write_partial(const uint8_t* buf, uint32_t len);
-
-  /**
-   * Get the host that the socket is connected to
-   *
-   * @return string host identifier
-   */
-  std::string getHost();
-
-  /**
-   * Get the port that the socket is connected to
-   *
-   * @return int port number
-   */
-  int getPort();
-
-  /**
-   * Set the host that socket will connect to
-   *
-   * @param host host identifier
-   */
-  void setHost(std::string host);
-
-  /**
-   * Set the port that socket will connect to
-   *
-   * @param port port number
-   */
-  void setPort(int port);
-
-  /**
-   * Controls whether the linger option is set on the socket.
-   *
-   * @param on      Whether SO_LINGER is on
-   * @param linger  If linger is active, the number of seconds to linger for
-   */
-  void setLinger(bool on, int linger);
-
-  /**
-   * Whether to enable/disable Nagle's algorithm.
-   *
-   * @param noDelay Whether or not to disable the algorithm.
-   * @return
-   */
-  void setNoDelay(bool noDelay);
-
-  /**
-   * Set the connect timeout
-   */
-  void setConnTimeout(int ms);
-
-  /**
-   * Set the receive timeout
-   */
-  void setRecvTimeout(int ms);
-
-  /**
-   * Set the send timeout
-   */
-  void setSendTimeout(int ms);
-
-  /**
-   * Set the max number of recv retries in case of an THRIFT_EAGAIN
-   * error
-   */
-  void setMaxRecvRetries(int maxRecvRetries);
-
-  /**
-   * Set SO_KEEPALIVE
-   */
-  void setKeepAlive(bool keepAlive);
-
-  /**
-   * Get socket information formatted as a string <Host: x Port: x>
-   */
-  std::string getSocketInfo();
-
-  /**
-   * Returns the DNS name of the host to which the socket is connected
-   */
-  std::string getPeerHost();
-
-  /**
-   * Returns the address of the host to which the socket is connected
-   */
-  std::string getPeerAddress();
-
-  /**
-   * Returns the port of the host to which the socket is connected
-   **/
-  int getPeerPort();
-
-  /**
-   * Returns the underlying socket file descriptor.
-   */
-  THRIFT_SOCKET getSocketFD() { return socket_; }
-
-  /**
-   * (Re-)initialize a TSocket for the supplied descriptor.  This is only
-   * intended for use by TNonblockingServer -- other use may result in
-   * unfortunate surprises.
-   *
-   * @param fd the descriptor for an already-connected socket
-   */
-  void setSocketFD(THRIFT_SOCKET fd);
-
-  /*
-   * Returns a cached copy of the peer address.
-   */
-  sockaddr* getCachedAddress(socklen_t* len) const;
-
-  /**
-   * Sets whether to use a low minimum TCP retransmission timeout.
-   */
-  static void setUseLowMinRto(bool useLowMinRto);
-
-  /**
-   * Gets whether to use a low minimum TCP retransmission timeout.
-   */
-  static bool getUseLowMinRto();
-
-  /**
-   * Get the origin the socket is connected to
-   *
-   * @return string peer host identifier and port
-   */
-  virtual const std::string getOrigin();
-
-  /**
-   * Constructor to create socket from file descriptor.
-   */
-  TSocket(THRIFT_SOCKET socket);
-
-  /**
-   * Constructor to create socket from file descriptor that
-   * can be interrupted safely.
-   */
-  TSocket(THRIFT_SOCKET socket, boost::shared_ptr<THRIFT_SOCKET> interruptListener);
-
-  /**
-   * Set a cache of the peer address (used when trivially available: e.g.
-   * accept() or connect()). Only caches IPV4 and IPV6; unset for others.
-   */
-  void setCachedAddress(const sockaddr* addr, socklen_t len);
-
-protected:
-  /** connect, called by open */
-  void openConnection(struct addrinfo* res);
-
-  /** Host to connect to */
-  std::string host_;
-
-  /** Port number to connect on */
-  int port_;
-
-  /** UNIX domain socket path */
-  std::string path_;
-
-  /** Underlying socket handle */
-  THRIFT_SOCKET socket_;
-
-  /** Peer hostname */
-  std::string peerHost_;
-
-  /** Peer address */
-  std::string peerAddress_;
-
-  /** Peer port */
-  int peerPort_;
-
-  /**
-   * A shared socket pointer that will interrupt a blocking read if data
-   * becomes available on it
-   */
-  boost::shared_ptr<THRIFT_SOCKET> interruptListener_;
-
-  /** Connect timeout in ms */
-  int connTimeout_;
-
-  /** Send timeout in ms */
-  int sendTimeout_;
-
-  /** Recv timeout in ms */
-  int recvTimeout_;
-
-  /** Keep alive on */
-  bool keepAlive_;
-
-  /** Linger on */
-  bool lingerOn_;
-
-  /** Linger val */
-  int lingerVal_;
-
-  /** Nodelay */
-  bool noDelay_;
-
-  /** Recv EGAIN retries */
-  int maxRecvRetries_;
-
-  /** Cached peer address */
-  union {
-    sockaddr_in ipv4;
-    sockaddr_in6 ipv6;
-  } cachedPeerAddr_;
-
-  /** Whether to use low minimum TCP retransmission timeout */
-  static bool useLowMinRto_;
-
-private:
-  void unix_open();
-  void local_open();
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TSOCKET_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocketPool.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocketPool.cpp
deleted file mode 100644
index ccab258..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocketPool.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <algorithm>
-#include <iostream>
-
-#include <thrift/transport/TSocketPool.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-using namespace std;
-
-using boost::shared_ptr;
-
-/**
- * TSocketPoolServer implementation
- *
- */
-TSocketPoolServer::TSocketPoolServer()
-  : host_(""), port_(0), socket_(THRIFT_INVALID_SOCKET), lastFailTime_(0), consecutiveFailures_(0) {
-}
-
-/**
- * Constructor for TSocketPool server
- */
-TSocketPoolServer::TSocketPoolServer(const string& host, int port)
-  : host_(host),
-    port_(port),
-    socket_(THRIFT_INVALID_SOCKET),
-    lastFailTime_(0),
-    consecutiveFailures_(0) {
-}
-
-/**
- * TSocketPool implementation.
- *
- */
-
-TSocketPool::TSocketPool()
-  : TSocket(),
-    numRetries_(1),
-    retryInterval_(60),
-    maxConsecutiveFailures_(1),
-    randomize_(true),
-    alwaysTryLast_(true) {
-}
-
-TSocketPool::TSocketPool(const vector<string>& hosts, const vector<int>& ports)
-  : TSocket(),
-    numRetries_(1),
-    retryInterval_(60),
-    maxConsecutiveFailures_(1),
-    randomize_(true),
-    alwaysTryLast_(true) {
-  if (hosts.size() != ports.size()) {
-    GlobalOutput("TSocketPool::TSocketPool: hosts.size != ports.size");
-    throw TTransportException(TTransportException::BAD_ARGS);
-  }
-
-  for (unsigned int i = 0; i < hosts.size(); ++i) {
-    addServer(hosts[i], ports[i]);
-  }
-}
-
-TSocketPool::TSocketPool(const vector<pair<string, int> >& servers)
-  : TSocket(),
-    numRetries_(1),
-    retryInterval_(60),
-    maxConsecutiveFailures_(1),
-    randomize_(true),
-    alwaysTryLast_(true) {
-  for (unsigned i = 0; i < servers.size(); ++i) {
-    addServer(servers[i].first, servers[i].second);
-  }
-}
-
-TSocketPool::TSocketPool(const vector<shared_ptr<TSocketPoolServer> >& servers)
-  : TSocket(),
-    servers_(servers),
-    numRetries_(1),
-    retryInterval_(60),
-    maxConsecutiveFailures_(1),
-    randomize_(true),
-    alwaysTryLast_(true) {
-}
-
-TSocketPool::TSocketPool(const string& host, int port)
-  : TSocket(),
-    numRetries_(1),
-    retryInterval_(60),
-    maxConsecutiveFailures_(1),
-    randomize_(true),
-    alwaysTryLast_(true) {
-  addServer(host, port);
-}
-
-TSocketPool::~TSocketPool() {
-  vector<shared_ptr<TSocketPoolServer> >::const_iterator iter = servers_.begin();
-  vector<shared_ptr<TSocketPoolServer> >::const_iterator iterEnd = servers_.end();
-  for (; iter != iterEnd; ++iter) {
-    setCurrentServer(*iter);
-    TSocketPool::close();
-  }
-}
-
-void TSocketPool::addServer(const string& host, int port) {
-  servers_.push_back(shared_ptr<TSocketPoolServer>(new TSocketPoolServer(host, port)));
-}
-
-void TSocketPool::addServer(shared_ptr<TSocketPoolServer>& server) {
-  if (server) {
-    servers_.push_back(server);
-  }
-}
-
-void TSocketPool::setServers(const vector<shared_ptr<TSocketPoolServer> >& servers) {
-  servers_ = servers;
-}
-
-void TSocketPool::getServers(vector<shared_ptr<TSocketPoolServer> >& servers) {
-  servers = servers_;
-}
-
-void TSocketPool::setNumRetries(int numRetries) {
-  numRetries_ = numRetries;
-}
-
-void TSocketPool::setRetryInterval(int retryInterval) {
-  retryInterval_ = retryInterval;
-}
-
-void TSocketPool::setMaxConsecutiveFailures(int maxConsecutiveFailures) {
-  maxConsecutiveFailures_ = maxConsecutiveFailures;
-}
-
-void TSocketPool::setRandomize(bool randomize) {
-  randomize_ = randomize;
-}
-
-void TSocketPool::setAlwaysTryLast(bool alwaysTryLast) {
-  alwaysTryLast_ = alwaysTryLast;
-}
-
-void TSocketPool::setCurrentServer(const shared_ptr<TSocketPoolServer>& server) {
-  currentServer_ = server;
-  host_ = server->host_;
-  port_ = server->port_;
-  socket_ = server->socket_;
-}
-
-/**
- * This function throws an exception if socket open fails. When socket
- * opens fails, the socket in the current server is reset.
- */
-/* TODO: without apc we ignore a lot of functionality from the php version */
-void TSocketPool::open() {
-
-  size_t numServers = servers_.size();
-  if (numServers == 0) {
-    socket_ = THRIFT_INVALID_SOCKET;
-    throw TTransportException(TTransportException::NOT_OPEN);
-  }
-
-  if (isOpen()) {
-    return;
-  }
-
-  if (randomize_ && numServers > 1) {
-    random_shuffle(servers_.begin(), servers_.end());
-  }
-
-  for (size_t i = 0; i < numServers; ++i) {
-
-    shared_ptr<TSocketPoolServer>& server = servers_[i];
-    // Impersonate the server socket
-    setCurrentServer(server);
-
-    if (isOpen()) {
-      // already open means we're done
-      return;
-    }
-
-    bool retryIntervalPassed = (server->lastFailTime_ == 0);
-    bool isLastServer = alwaysTryLast_ ? (i == (numServers - 1)) : false;
-
-    if (server->lastFailTime_ > 0) {
-      // The server was marked as down, so check if enough time has elapsed to retry
-      time_t elapsedTime = time(NULL) - server->lastFailTime_;
-      if (elapsedTime > retryInterval_) {
-        retryIntervalPassed = true;
-      }
-    }
-
-    if (retryIntervalPassed || isLastServer) {
-      for (int j = 0; j < numRetries_; ++j) {
-        try {
-          TSocket::open();
-        } catch (TException e) {
-          string errStr = "TSocketPool::open failed " + getSocketInfo() + ": " + e.what();
-          GlobalOutput(errStr.c_str());
-          socket_ = THRIFT_INVALID_SOCKET;
-          continue;
-        }
-
-        // Copy over the opened socket so that we can keep it persistent
-        server->socket_ = socket_;
-        // reset lastFailTime_ is required
-        server->lastFailTime_ = 0;
-        // success
-        return;
-      }
-
-      ++server->consecutiveFailures_;
-      if (server->consecutiveFailures_ > maxConsecutiveFailures_) {
-        // Mark server as down
-        server->consecutiveFailures_ = 0;
-        server->lastFailTime_ = time(NULL);
-      }
-    }
-  }
-
-  GlobalOutput("TSocketPool::open: all connections failed");
-  throw TTransportException(TTransportException::NOT_OPEN);
-}
-
-void TSocketPool::close() {
-  TSocket::close();
-  if (currentServer_) {
-    currentServer_->socket_ = THRIFT_INVALID_SOCKET;
-  }
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocketPool.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocketPool.h
deleted file mode 100644
index 78f0ebf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TSocketPool.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TSOCKETPOOL_H_
-#define _THRIFT_TRANSPORT_TSOCKETPOOL_H_ 1
-
-#include <vector>
-#include <thrift/transport/TSocket.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Class to hold server information for TSocketPool
- *
- */
-class TSocketPoolServer {
-
-public:
-  /**
-   * Default constructor for server info
-   */
-  TSocketPoolServer();
-
-  /**
-   * Constructor for TSocketPool server
-   */
-  TSocketPoolServer(const std::string& host, int port);
-
-  // Host name
-  std::string host_;
-
-  // Port to connect on
-  int port_;
-
-  // Socket for the server
-  THRIFT_SOCKET socket_;
-
-  // Last time connecting to this server failed
-  time_t lastFailTime_;
-
-  // Number of consecutive times connecting to this server failed
-  int consecutiveFailures_;
-};
-
-/**
- * TCP Socket implementation of the TTransport interface.
- *
- */
-class TSocketPool : public TSocket {
-
-public:
-  /**
-   * Socket pool constructor
-   */
-  TSocketPool();
-
-  /**
-   * Socket pool constructor
-   *
-   * @param hosts list of host names
-   * @param ports list of port names
-   */
-  TSocketPool(const std::vector<std::string>& hosts, const std::vector<int>& ports);
-
-  /**
-   * Socket pool constructor
-   *
-   * @param servers list of pairs of host name and port
-   */
-  TSocketPool(const std::vector<std::pair<std::string, int> >& servers);
-
-  /**
-   * Socket pool constructor
-   *
-   * @param servers list of TSocketPoolServers
-   */
-  TSocketPool(const std::vector<boost::shared_ptr<TSocketPoolServer> >& servers);
-
-  /**
-   * Socket pool constructor
-   *
-   * @param host single host
-   * @param port single port
-   */
-  TSocketPool(const std::string& host, int port);
-
-  /**
-   * Destroyes the socket object, closing it if necessary.
-   */
-  virtual ~TSocketPool();
-
-  /**
-   * Add a server to the pool
-   */
-  void addServer(const std::string& host, int port);
-
-  /**
-   * Add a server to the pool
-   */
-  void addServer(boost::shared_ptr<TSocketPoolServer>& server);
-
-  /**
-   * Set list of servers in this pool
-   */
-  void setServers(const std::vector<boost::shared_ptr<TSocketPoolServer> >& servers);
-
-  /**
-   * Get list of servers in this pool
-   */
-  void getServers(std::vector<boost::shared_ptr<TSocketPoolServer> >& servers);
-
-  /**
-   * Sets how many times to keep retrying a host in the connect function.
-   */
-  void setNumRetries(int numRetries);
-
-  /**
-   * Sets how long to wait until retrying a host if it was marked down
-   */
-  void setRetryInterval(int retryInterval);
-
-  /**
-   * Sets how many times to keep retrying a host before marking it as down.
-   */
-  void setMaxConsecutiveFailures(int maxConsecutiveFailures);
-
-  /**
-   * Turns randomization in connect order on or off.
-   */
-  void setRandomize(bool randomize);
-
-  /**
-   * Whether to always try the last server.
-   */
-  void setAlwaysTryLast(bool alwaysTryLast);
-
-  /**
-   * Creates and opens the UNIX socket.
-   */
-  void open();
-
-  /*
-   * Closes the UNIX socket
-   */
-  void close();
-
-protected:
-  void setCurrentServer(const boost::shared_ptr<TSocketPoolServer>& server);
-
-  /** List of servers to connect to */
-  std::vector<boost::shared_ptr<TSocketPoolServer> > servers_;
-
-  /** Current server */
-  boost::shared_ptr<TSocketPoolServer> currentServer_;
-
-  /** How many times to retry each host in connect */
-  int numRetries_;
-
-  /** Retry interval in seconds, how long to not try a host if it has been
-   * marked as down.
-   */
-  time_t retryInterval_;
-
-  /** Max consecutive failures before marking a host down. */
-  int maxConsecutiveFailures_;
-
-  /** Try hosts in order? or Randomized? */
-  bool randomize_;
-
-  /** Always try last host, even if marked down? */
-  bool alwaysTryLast_;
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TSOCKETPOOL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransport.h
deleted file mode 100644
index d06b0f8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransport.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TTRANSPORT_H_
-#define _THRIFT_TRANSPORT_TTRANSPORT_H_ 1
-
-#include <thrift/Thrift.h>
-#include <boost/shared_ptr.hpp>
-#include <thrift/transport/TTransportException.h>
-#include <string>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Helper template to hoist readAll implementation out of TTransport
- */
-template <class Transport_>
-uint32_t readAll(Transport_& trans, uint8_t* buf, uint32_t len) {
-  uint32_t have = 0;
-  uint32_t get = 0;
-
-  while (have < len) {
-    get = trans.read(buf + have, len - have);
-    if (get <= 0) {
-      throw TTransportException(TTransportException::END_OF_FILE, "No more data to read.");
-    }
-    have += get;
-  }
-
-  return have;
-}
-
-/**
- * Generic interface for a method of transporting data. A TTransport may be
- * capable of either reading or writing, but not necessarily both.
- *
- */
-class TTransport {
-public:
-  /**
-   * Virtual deconstructor.
-   */
-  virtual ~TTransport() {}
-
-  /**
-   * Whether this transport is open.
-   */
-  virtual bool isOpen() { return false; }
-
-  /**
-   * Tests whether there is more data to read or if the remote side is
-   * still open. By default this is true whenever the transport is open,
-   * but implementations should add logic to test for this condition where
-   * possible (i.e. on a socket).
-   * This is used by a server to check if it should listen for another
-   * request.
-   */
-  virtual bool peek() { return isOpen(); }
-
-  /**
-   * Opens the transport for communications.
-   *
-   * @return bool Whether the transport was successfully opened
-   * @throws TTransportException if opening failed
-   */
-  virtual void open() {
-    throw TTransportException(TTransportException::NOT_OPEN, "Cannot open base TTransport.");
-  }
-
-  /**
-   * Closes the transport.
-   */
-  virtual void close() {
-    throw TTransportException(TTransportException::NOT_OPEN, "Cannot close base TTransport.");
-  }
-
-  /**
-   * Attempt to read up to the specified number of bytes into the string.
-   *
-   * @param buf  Reference to the location to write the data
-   * @param len  How many bytes to read
-   * @return How many bytes were actually read
-   * @throws TTransportException If an error occurs
-   */
-  uint32_t read(uint8_t* buf, uint32_t len) {
-    T_VIRTUAL_CALL();
-    return read_virt(buf, len);
-  }
-  virtual uint32_t read_virt(uint8_t* /* buf */, uint32_t /* len */) {
-    throw TTransportException(TTransportException::NOT_OPEN, "Base TTransport cannot read.");
-  }
-
-  /**
-   * Reads the given amount of data in its entirety no matter what.
-   *
-   * @param s     Reference to location for read data
-   * @param len   How many bytes to read
-   * @return How many bytes read, which must be equal to size
-   * @throws TTransportException If insufficient data was read
-   */
-  uint32_t readAll(uint8_t* buf, uint32_t len) {
-    T_VIRTUAL_CALL();
-    return readAll_virt(buf, len);
-  }
-  virtual uint32_t readAll_virt(uint8_t* buf, uint32_t len) {
-    return apache::thrift::transport::readAll(*this, buf, len);
-  }
-
-  /**
-   * Called when read is completed.
-   * This can be over-ridden to perform a transport-specific action
-   * e.g. logging the request to a file
-   *
-   * @return number of bytes read if available, 0 otherwise.
-   */
-  virtual uint32_t readEnd() {
-    // default behaviour is to do nothing
-    return 0;
-  }
-
-  /**
-   * Writes the string in its entirety to the buffer.
-   *
-   * Note: You must call flush() to ensure the data is actually written,
-   * and available to be read back in the future.  Destroying a TTransport
-   * object does not automatically flush pending data--if you destroy a
-   * TTransport object with written but unflushed data, that data may be
-   * discarded.
-   *
-   * @param buf  The data to write out
-   * @throws TTransportException if an error occurs
-   */
-  void write(const uint8_t* buf, uint32_t len) {
-    T_VIRTUAL_CALL();
-    write_virt(buf, len);
-  }
-  virtual void write_virt(const uint8_t* /* buf */, uint32_t /* len */) {
-    throw TTransportException(TTransportException::NOT_OPEN, "Base TTransport cannot write.");
-  }
-
-  /**
-   * Called when write is completed.
-   * This can be over-ridden to perform a transport-specific action
-   * at the end of a request.
-   *
-   * @return number of bytes written if available, 0 otherwise
-   */
-  virtual uint32_t writeEnd() {
-    // default behaviour is to do nothing
-    return 0;
-  }
-
-  /**
-   * Flushes any pending data to be written. Typically used with buffered
-   * transport mechanisms.
-   *
-   * @throws TTransportException if an error occurs
-   */
-  virtual void flush() {
-    // default behaviour is to do nothing
-  }
-
-  /**
-   * Attempts to return a pointer to \c len bytes, possibly copied into \c buf.
-   * Does not consume the bytes read (i.e.: a later read will return the same
-   * data).  This method is meant to support protocols that need to read
-   * variable-length fields.  They can attempt to borrow the maximum amount of
-   * data that they will need, then consume (see next method) what they
-   * actually use.  Some transports will not support this method and others
-   * will fail occasionally, so protocols must be prepared to use read if
-   * borrow fails.
-   *
-   * @oaram buf  A buffer where the data can be stored if needed.
-   *             If borrow doesn't return buf, then the contents of
-   *             buf after the call are undefined.  This parameter may be
-   *             NULL to indicate that the caller is not supplying storage,
-   *             but would like a pointer into an internal buffer, if
-   *             available.
-   * @param len  *len should initially contain the number of bytes to borrow.
-   *             If borrow succeeds, *len will contain the number of bytes
-   *             available in the returned pointer.  This will be at least
-   *             what was requested, but may be more if borrow returns
-   *             a pointer to an internal buffer, rather than buf.
-   *             If borrow fails, the contents of *len are undefined.
-   * @return If the borrow succeeds, return a pointer to the borrowed data.
-   *         This might be equal to \c buf, or it might be a pointer into
-   *         the transport's internal buffers.
-   * @throws TTransportException if an error occurs
-   */
-  const uint8_t* borrow(uint8_t* buf, uint32_t* len) {
-    T_VIRTUAL_CALL();
-    return borrow_virt(buf, len);
-  }
-  virtual const uint8_t* borrow_virt(uint8_t* /* buf */, uint32_t* /* len */) { return NULL; }
-
-  /**
-   * Remove len bytes from the transport.  This should always follow a borrow
-   * of at least len bytes, and should always succeed.
-   * TODO(dreiss): Is there any transport that could borrow but fail to
-   * consume, or that would require a buffer to dump the consumed data?
-   *
-   * @param len  How many bytes to consume
-   * @throws TTransportException If an error occurs
-   */
-  void consume(uint32_t len) {
-    T_VIRTUAL_CALL();
-    consume_virt(len);
-  }
-  virtual void consume_virt(uint32_t /* len */) {
-    throw TTransportException(TTransportException::NOT_OPEN, "Base TTransport cannot consume.");
-  }
-
-  /**
-   * Returns the origin of the transports call. The value depends on the
-   * transport used. An IP based transport for example will return the
-   * IP address of the client making the request.
-   * If the transport doesn't know the origin Unknown is returned.
-   *
-   * The returned value can be used in a log message for example
-   */
-  virtual const std::string getOrigin() { return "Unknown"; }
-
-protected:
-  /**
-   * Simple constructor.
-   */
-  TTransport() {}
-};
-
-/**
- * Generic factory class to make an input and output transport out of a
- * source transport. Commonly used inside servers to make input and output
- * streams out of raw clients.
- *
- */
-class TTransportFactory {
-public:
-  TTransportFactory() {}
-
-  virtual ~TTransportFactory() {}
-
-  /**
-   * Default implementation does nothing, just returns the transport given.
-   */
-  virtual boost::shared_ptr<TTransport> getTransport(boost::shared_ptr<TTransport> trans) {
-    return trans;
-  }
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportException.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportException.cpp
deleted file mode 100644
index 612e7b7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportException.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/transport/TTransportException.h>
-#include <boost/lexical_cast.hpp>
-#include <cstring>
-
-#include <thrift/thrift-config.h>
-
-using std::string;
-using boost::lexical_cast;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-const char* TTransportException::what() const throw() {
-  if (message_.empty()) {
-    switch (type_) {
-    case UNKNOWN:
-      return "TTransportException: Unknown transport exception";
-    case NOT_OPEN:
-      return "TTransportException: Transport not open";
-    case TIMED_OUT:
-      return "TTransportException: Timed out";
-    case END_OF_FILE:
-      return "TTransportException: End of file";
-    case INTERRUPTED:
-      return "TTransportException: Interrupted";
-    case BAD_ARGS:
-      return "TTransportException: Invalid arguments";
-    case CORRUPTED_DATA:
-      return "TTransportException: Corrupted Data";
-    case INTERNAL_ERROR:
-      return "TTransportException: Internal error";
-    default:
-      return "TTransportException: (Invalid exception type)";
-    }
-  } else {
-    return message_.c_str();
-  }
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportException.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportException.h
deleted file mode 100644
index 83e876a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportException.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TTRANSPORTEXCEPTION_H_
-#define _THRIFT_TRANSPORT_TTRANSPORTEXCEPTION_H_ 1
-
-#include <string>
-#include <thrift/Thrift.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Class to encapsulate all the possible types of transport errors that may
- * occur in various transport systems. This provides a sort of generic
- * wrapper around the vague UNIX E_ error codes that lets a common code
- * base of error handling to be used for various types of transports, i.e.
- * pipes etc.
- *
- */
-class TTransportException : public apache::thrift::TException {
-public:
-  /**
-   * Error codes for the various types of exceptions.
-   */
-  enum TTransportExceptionType {
-    UNKNOWN = 0,
-    NOT_OPEN = 1,
-    TIMED_OUT = 2,
-    END_OF_FILE = 3,
-    INTERRUPTED = 4,
-    BAD_ARGS = 5,
-    CORRUPTED_DATA = 6,
-    INTERNAL_ERROR = 7
-  };
-
-  TTransportException() : apache::thrift::TException(), type_(UNKNOWN) {}
-
-  TTransportException(TTransportExceptionType type) : apache::thrift::TException(), type_(type) {}
-
-  TTransportException(const std::string& message)
-    : apache::thrift::TException(message), type_(UNKNOWN) {}
-
-  TTransportException(TTransportExceptionType type, const std::string& message)
-    : apache::thrift::TException(message), type_(type) {}
-
-  TTransportException(TTransportExceptionType type, const std::string& message, int errno_copy)
-    : apache::thrift::TException(message + ": " + TOutput::strerror_s(errno_copy)), type_(type) {}
-
-  virtual ~TTransportException() throw() {}
-
-  /**
-   * Returns an error code that provides information about the type of error
-   * that has occurred.
-   *
-   * @return Error code
-   */
-  TTransportExceptionType getType() const throw() { return type_; }
-
-  virtual const char* what() const throw();
-
-protected:
-  /** Just like strerror_r but returns a C++ string object. */
-  std::string strerror_s(int errno_copy);
-
-  /** Error code */
-  TTransportExceptionType type_;
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORTEXCEPTION_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportUtils.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportUtils.cpp
deleted file mode 100644
index 0f24c95..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportUtils.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/transport/TTransportUtils.h>
-
-using std::string;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-uint32_t TPipedTransport::read(uint8_t* buf, uint32_t len) {
-  uint32_t need = len;
-
-  // We don't have enough data yet
-  if (rLen_ - rPos_ < need) {
-    // Copy out whatever we have
-    if (rLen_ - rPos_ > 0) {
-      memcpy(buf, rBuf_ + rPos_, rLen_ - rPos_);
-      need -= rLen_ - rPos_;
-      buf += rLen_ - rPos_;
-      rPos_ = rLen_;
-    }
-
-    // Double the size of the underlying buffer if it is full
-    if (rLen_ == rBufSize_) {
-      rBufSize_ *= 2;
-      rBuf_ = (uint8_t*)std::realloc(rBuf_, sizeof(uint8_t) * rBufSize_);
-    }
-
-    // try to fill up the buffer
-    rLen_ += srcTrans_->read(rBuf_ + rPos_, rBufSize_ - rPos_);
-  }
-
-  // Hand over whatever we have
-  uint32_t give = need;
-  if (rLen_ - rPos_ < give) {
-    give = rLen_ - rPos_;
-  }
-  if (give > 0) {
-    memcpy(buf, rBuf_ + rPos_, give);
-    rPos_ += give;
-    need -= give;
-  }
-
-  return (len - need);
-}
-
-void TPipedTransport::write(const uint8_t* buf, uint32_t len) {
-  if (len == 0) {
-    return;
-  }
-
-  // Make the buffer as big as it needs to be
-  if ((len + wLen_) >= wBufSize_) {
-    uint32_t newBufSize = wBufSize_ * 2;
-    while ((len + wLen_) >= newBufSize) {
-      newBufSize *= 2;
-    }
-    wBuf_ = (uint8_t*)std::realloc(wBuf_, sizeof(uint8_t) * newBufSize);
-    wBufSize_ = newBufSize;
-  }
-
-  // Copy into the buffer
-  memcpy(wBuf_ + wLen_, buf, len);
-  wLen_ += len;
-}
-
-void TPipedTransport::flush() {
-  // Write out any data waiting in the write buffer
-  if (wLen_ > 0) {
-    srcTrans_->write(wBuf_, wLen_);
-    wLen_ = 0;
-  }
-
-  // Flush the underlying transport
-  srcTrans_->flush();
-}
-
-TPipedFileReaderTransport::TPipedFileReaderTransport(
-    boost::shared_ptr<TFileReaderTransport> srcTrans,
-    boost::shared_ptr<TTransport> dstTrans)
-  : TPipedTransport(srcTrans, dstTrans), srcTrans_(srcTrans) {
-}
-
-TPipedFileReaderTransport::~TPipedFileReaderTransport() {
-}
-
-bool TPipedFileReaderTransport::isOpen() {
-  return TPipedTransport::isOpen();
-}
-
-bool TPipedFileReaderTransport::peek() {
-  return TPipedTransport::peek();
-}
-
-void TPipedFileReaderTransport::open() {
-  TPipedTransport::open();
-}
-
-void TPipedFileReaderTransport::close() {
-  TPipedTransport::close();
-}
-
-uint32_t TPipedFileReaderTransport::read(uint8_t* buf, uint32_t len) {
-  return TPipedTransport::read(buf, len);
-}
-
-uint32_t TPipedFileReaderTransport::readAll(uint8_t* buf, uint32_t len) {
-  uint32_t have = 0;
-  uint32_t get = 0;
-
-  while (have < len) {
-    get = read(buf + have, len - have);
-    if (get <= 0) {
-      throw TEOFException();
-    }
-    have += get;
-  }
-
-  return have;
-}
-
-uint32_t TPipedFileReaderTransport::readEnd() {
-  return TPipedTransport::readEnd();
-}
-
-void TPipedFileReaderTransport::write(const uint8_t* buf, uint32_t len) {
-  TPipedTransport::write(buf, len);
-}
-
-uint32_t TPipedFileReaderTransport::writeEnd() {
-  return TPipedTransport::writeEnd();
-}
-
-void TPipedFileReaderTransport::flush() {
-  TPipedTransport::flush();
-}
-
-int32_t TPipedFileReaderTransport::getReadTimeout() {
-  return srcTrans_->getReadTimeout();
-}
-
-void TPipedFileReaderTransport::setReadTimeout(int32_t readTimeout) {
-  srcTrans_->setReadTimeout(readTimeout);
-}
-
-uint32_t TPipedFileReaderTransport::getNumChunks() {
-  return srcTrans_->getNumChunks();
-}
-
-uint32_t TPipedFileReaderTransport::getCurChunk() {
-  return srcTrans_->getCurChunk();
-}
-
-void TPipedFileReaderTransport::seekToChunk(int32_t chunk) {
-  srcTrans_->seekToChunk(chunk);
-}
-
-void TPipedFileReaderTransport::seekToEnd() {
-  srcTrans_->seekToEnd();
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportUtils.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportUtils.h
deleted file mode 100644
index c221836..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TTransportUtils.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TTRANSPORTUTILS_H_
-#define _THRIFT_TRANSPORT_TTRANSPORTUTILS_H_ 1
-
-#include <cstdlib>
-#include <cstring>
-#include <string>
-#include <algorithm>
-#include <thrift/transport/TTransport.h>
-// Include the buffered transports that used to be defined here.
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TFileTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * The null transport is a dummy transport that doesn't actually do anything.
- * It's sort of an analogy to /dev/null, you can never read anything from it
- * and it will let you write anything you want to it, though it won't actually
- * go anywhere.
- *
- */
-class TNullTransport : public TVirtualTransport<TNullTransport> {
-public:
-  TNullTransport() {}
-
-  ~TNullTransport() {}
-
-  bool isOpen() { return true; }
-
-  void open() {}
-
-  void write(const uint8_t* /* buf */, uint32_t /* len */) { return; }
-};
-
-/**
- * TPipedTransport. This transport allows piping of a request from one
- * transport to another either when readEnd() or writeEnd(). The typical
- * use case for this is to log a request or a reply to disk.
- * The underlying buffer expands to a keep a copy of the entire
- * request/response.
- *
- */
-class TPipedTransport : virtual public TTransport {
-public:
-  TPipedTransport(boost::shared_ptr<TTransport> srcTrans, boost::shared_ptr<TTransport> dstTrans)
-    : srcTrans_(srcTrans),
-      dstTrans_(dstTrans),
-      rBufSize_(512),
-      rPos_(0),
-      rLen_(0),
-      wBufSize_(512),
-      wLen_(0) {
-
-    // default is to to pipe the request when readEnd() is called
-    pipeOnRead_ = true;
-    pipeOnWrite_ = false;
-
-    rBuf_ = (uint8_t*)std::malloc(sizeof(uint8_t) * rBufSize_);
-    if (rBuf_ == NULL) {
-      throw std::bad_alloc();
-    }
-    wBuf_ = (uint8_t*)std::malloc(sizeof(uint8_t) * wBufSize_);
-    if (wBuf_ == NULL) {
-      throw std::bad_alloc();
-    }
-  }
-
-  TPipedTransport(boost::shared_ptr<TTransport> srcTrans,
-                  boost::shared_ptr<TTransport> dstTrans,
-                  uint32_t sz)
-    : srcTrans_(srcTrans),
-      dstTrans_(dstTrans),
-      rBufSize_(512),
-      rPos_(0),
-      rLen_(0),
-      wBufSize_(sz),
-      wLen_(0) {
-
-    rBuf_ = (uint8_t*)std::malloc(sizeof(uint8_t) * rBufSize_);
-    if (rBuf_ == NULL) {
-      throw std::bad_alloc();
-    }
-    wBuf_ = (uint8_t*)std::malloc(sizeof(uint8_t) * wBufSize_);
-    if (wBuf_ == NULL) {
-      throw std::bad_alloc();
-    }
-  }
-
-  ~TPipedTransport() {
-    std::free(rBuf_);
-    std::free(wBuf_);
-  }
-
-  bool isOpen() { return srcTrans_->isOpen(); }
-
-  bool peek() {
-    if (rPos_ >= rLen_) {
-      // Double the size of the underlying buffer if it is full
-      if (rLen_ == rBufSize_) {
-        rBufSize_ *= 2;
-        rBuf_ = (uint8_t*)std::realloc(rBuf_, sizeof(uint8_t) * rBufSize_);
-      }
-
-      // try to fill up the buffer
-      rLen_ += srcTrans_->read(rBuf_ + rPos_, rBufSize_ - rPos_);
-    }
-    return (rLen_ > rPos_);
-  }
-
-  void open() { srcTrans_->open(); }
-
-  void close() { srcTrans_->close(); }
-
-  void setPipeOnRead(bool pipeVal) { pipeOnRead_ = pipeVal; }
-
-  void setPipeOnWrite(bool pipeVal) { pipeOnWrite_ = pipeVal; }
-
-  uint32_t read(uint8_t* buf, uint32_t len);
-
-  uint32_t readEnd() {
-
-    if (pipeOnRead_) {
-      dstTrans_->write(rBuf_, rPos_);
-      dstTrans_->flush();
-    }
-
-    srcTrans_->readEnd();
-
-    // If requests are being pipelined, copy down our read-ahead data,
-    // then reset our state.
-    int read_ahead = rLen_ - rPos_;
-    uint32_t bytes = rPos_;
-    memcpy(rBuf_, rBuf_ + rPos_, read_ahead);
-    rPos_ = 0;
-    rLen_ = read_ahead;
-
-    return bytes;
-  }
-
-  void write(const uint8_t* buf, uint32_t len);
-
-  uint32_t writeEnd() {
-    if (pipeOnWrite_) {
-      dstTrans_->write(wBuf_, wLen_);
-      dstTrans_->flush();
-    }
-    return wLen_;
-  }
-
-  void flush();
-
-  boost::shared_ptr<TTransport> getTargetTransport() { return dstTrans_; }
-
-  /*
-   * Override TTransport *_virt() functions to invoke our implementations.
-   * We cannot use TVirtualTransport to provide these, since we need to inherit
-   * virtually from TTransport.
-   */
-  virtual uint32_t read_virt(uint8_t* buf, uint32_t len) { return this->read(buf, len); }
-  virtual void write_virt(const uint8_t* buf, uint32_t len) { this->write(buf, len); }
-
-protected:
-  boost::shared_ptr<TTransport> srcTrans_;
-  boost::shared_ptr<TTransport> dstTrans_;
-
-  uint8_t* rBuf_;
-  uint32_t rBufSize_;
-  uint32_t rPos_;
-  uint32_t rLen_;
-
-  uint8_t* wBuf_;
-  uint32_t wBufSize_;
-  uint32_t wLen_;
-
-  bool pipeOnRead_;
-  bool pipeOnWrite_;
-};
-
-/**
- * Wraps a transport into a pipedTransport instance.
- *
- */
-class TPipedTransportFactory : public TTransportFactory {
-public:
-  TPipedTransportFactory() {}
-  TPipedTransportFactory(boost::shared_ptr<TTransport> dstTrans) {
-    initializeTargetTransport(dstTrans);
-  }
-  virtual ~TPipedTransportFactory() {}
-
-  /**
-   * Wraps the base transport into a piped transport.
-   */
-  virtual boost::shared_ptr<TTransport> getTransport(boost::shared_ptr<TTransport> srcTrans) {
-    return boost::shared_ptr<TTransport>(new TPipedTransport(srcTrans, dstTrans_));
-  }
-
-  virtual void initializeTargetTransport(boost::shared_ptr<TTransport> dstTrans) {
-    if (dstTrans_.get() == NULL) {
-      dstTrans_ = dstTrans;
-    } else {
-      throw TException("Target transport already initialized");
-    }
-  }
-
-protected:
-  boost::shared_ptr<TTransport> dstTrans_;
-};
-
-/**
- * TPipedFileTransport. This is just like a TTransport, except that
- * it is a templatized class, so that clients who rely on a specific
- * TTransport can still access the original transport.
- *
- */
-class TPipedFileReaderTransport : public TPipedTransport, public TFileReaderTransport {
-public:
-  TPipedFileReaderTransport(boost::shared_ptr<TFileReaderTransport> srcTrans,
-                            boost::shared_ptr<TTransport> dstTrans);
-
-  ~TPipedFileReaderTransport();
-
-  // TTransport functions
-  bool isOpen();
-  bool peek();
-  void open();
-  void close();
-  uint32_t read(uint8_t* buf, uint32_t len);
-  uint32_t readAll(uint8_t* buf, uint32_t len);
-  uint32_t readEnd();
-  void write(const uint8_t* buf, uint32_t len);
-  uint32_t writeEnd();
-  void flush();
-
-  // TFileReaderTransport functions
-  int32_t getReadTimeout();
-  void setReadTimeout(int32_t readTimeout);
-  uint32_t getNumChunks();
-  uint32_t getCurChunk();
-  void seekToChunk(int32_t chunk);
-  void seekToEnd();
-
-  /*
-   * Override TTransport *_virt() functions to invoke our implementations.
-   * We cannot use TVirtualTransport to provide these, since we need to inherit
-   * virtually from TTransport.
-   */
-  virtual uint32_t read_virt(uint8_t* buf, uint32_t len) { return this->read(buf, len); }
-  virtual uint32_t readAll_virt(uint8_t* buf, uint32_t len) { return this->readAll(buf, len); }
-  virtual void write_virt(const uint8_t* buf, uint32_t len) { this->write(buf, len); }
-
-protected:
-  // shouldn't be used
-  TPipedFileReaderTransport();
-  boost::shared_ptr<TFileReaderTransport> srcTrans_;
-};
-
-/**
- * Creates a TPipedFileReaderTransport from a filepath and a destination transport
- *
- */
-class TPipedFileReaderTransportFactory : public TPipedTransportFactory {
-public:
-  TPipedFileReaderTransportFactory() {}
-  TPipedFileReaderTransportFactory(boost::shared_ptr<TTransport> dstTrans)
-    : TPipedTransportFactory(dstTrans) {}
-  virtual ~TPipedFileReaderTransportFactory() {}
-
-  boost::shared_ptr<TTransport> getTransport(boost::shared_ptr<TTransport> srcTrans) {
-    boost::shared_ptr<TFileReaderTransport> pFileReaderTransport
-        = boost::dynamic_pointer_cast<TFileReaderTransport>(srcTrans);
-    if (pFileReaderTransport.get() != NULL) {
-      return getFileReaderTransport(pFileReaderTransport);
-    } else {
-      return boost::shared_ptr<TTransport>();
-    }
-  }
-
-  boost::shared_ptr<TFileReaderTransport> getFileReaderTransport(
-      boost::shared_ptr<TFileReaderTransport> srcTrans) {
-    return boost::shared_ptr<TFileReaderTransport>(
-        new TPipedFileReaderTransport(srcTrans, dstTrans_));
-  }
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TTRANSPORTUTILS_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TVirtualTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TVirtualTransport.h
deleted file mode 100644
index 0cacf61..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TVirtualTransport.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TVIRTUALTRANSPORT_H_
-#define _THRIFT_TRANSPORT_TVIRTUALTRANSPORT_H_ 1
-
-#include <thrift/transport/TTransport.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Helper class that provides default implementations of TTransport methods.
- *
- * This class provides default implementations of read(), readAll(), write(),
- * borrow() and consume().
- *
- * In the TTransport base class, each of these methods simply invokes its
- * virtual counterpart.  This class overrides them to always perform the
- * default behavior, without a virtual function call.
- *
- * The primary purpose of this class is to serve as a base class for
- * TVirtualTransport, and prevent infinite recursion if one of its subclasses
- * does not override the TTransport implementation of these methods.  (Since
- * TVirtualTransport::read_virt() calls read(), and TTransport::read() calls
- * read_virt().)
- */
-class TTransportDefaults : public TTransport {
-public:
-  /*
-   * TTransport *_virt() methods provide reasonable default implementations.
-   * Invoke them non-virtually.
-   */
-  uint32_t read(uint8_t* buf, uint32_t len) { return this->TTransport::read_virt(buf, len); }
-  uint32_t readAll(uint8_t* buf, uint32_t len) { return this->TTransport::readAll_virt(buf, len); }
-  void write(const uint8_t* buf, uint32_t len) { this->TTransport::write_virt(buf, len); }
-  const uint8_t* borrow(uint8_t* buf, uint32_t* len) {
-    return this->TTransport::borrow_virt(buf, len);
-  }
-  void consume(uint32_t len) { this->TTransport::consume_virt(len); }
-
-protected:
-  TTransportDefaults() {}
-};
-
-/**
- * Helper class to provide polymorphism for subclasses of TTransport.
- *
- * This class implements *_virt() methods of TTransport, to call the
- * non-virtual versions of these functions in the proper subclass.
- *
- * To define your own transport class using TVirtualTransport:
- * 1) Derive your subclass from TVirtualTransport<your class>
- *    e.g:  class MyTransport : public TVirtualTransport<MyTransport> {
- * 2) Provide your own implementations of read(), readAll(), etc.
- *    These methods should be non-virtual.
- *
- * Transport implementations that need to use virtual inheritance when
- * inheriting from TTransport cannot use TVirtualTransport.
- *
- * @author Chad Walters <chad@powerset.com>
- */
-template <class Transport_, class Super_ = TTransportDefaults>
-class TVirtualTransport : public Super_ {
-public:
-  /*
-   * Implementations of the *_virt() functions, to call the subclass's
-   * non-virtual implementation function.
-   */
-  virtual uint32_t read_virt(uint8_t* buf, uint32_t len) {
-    return static_cast<Transport_*>(this)->read(buf, len);
-  }
-
-  virtual uint32_t readAll_virt(uint8_t* buf, uint32_t len) {
-    return static_cast<Transport_*>(this)->readAll(buf, len);
-  }
-
-  virtual void write_virt(const uint8_t* buf, uint32_t len) {
-    static_cast<Transport_*>(this)->write(buf, len);
-  }
-
-  virtual const uint8_t* borrow_virt(uint8_t* buf, uint32_t* len) {
-    return static_cast<Transport_*>(this)->borrow(buf, len);
-  }
-
-  virtual void consume_virt(uint32_t len) { static_cast<Transport_*>(this)->consume(len); }
-
-  /*
-   * Provide a default readAll() implementation that invokes
-   * read() non-virtually.
-   *
-   * Note: subclasses that use TVirtualTransport to derive from another
-   * transport implementation (i.e., not TTransportDefaults) should beware that
-   * this may override any non-default readAll() implementation provided by
-   * the parent transport class.  They may need to redefine readAll() to call
-   * the correct parent implementation, if desired.
-   */
-  uint32_t readAll(uint8_t* buf, uint32_t len) {
-    Transport_* trans = static_cast<Transport_*>(this);
-    return ::apache::thrift::transport::readAll(*trans, buf, len);
-  }
-
-protected:
-  TVirtualTransport() {}
-
-  /*
-   * Templatized constructors, to allow arguments to be passed to the Super_
-   * constructor.  Currently we only support 0, 1, or 2 arguments, but
-   * additional versions can be added as needed.
-   */
-  template <typename Arg_>
-  TVirtualTransport(Arg_ const& arg)
-    : Super_(arg) {}
-
-  template <typename Arg1_, typename Arg2_>
-  TVirtualTransport(Arg1_ const& a1, Arg2_ const& a2)
-    : Super_(a1, a2) {}
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TVIRTUALTRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TZlibTransport.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TZlibTransport.cpp
deleted file mode 100644
index fb5cc5d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TZlibTransport.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <cassert>
-#include <cstring>
-#include <algorithm>
-#include <thrift/transport/TZlibTransport.h>
-
-using std::string;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-// Don't call this outside of the constructor.
-void TZlibTransport::initZlib() {
-  int rv;
-  bool r_init = false;
-  try {
-    rstream_ = new z_stream;
-    wstream_ = new z_stream;
-
-    rstream_->zalloc = Z_NULL;
-    wstream_->zalloc = Z_NULL;
-    rstream_->zfree = Z_NULL;
-    wstream_->zfree = Z_NULL;
-    rstream_->opaque = Z_NULL;
-    wstream_->opaque = Z_NULL;
-
-    rstream_->next_in = crbuf_;
-    wstream_->next_in = uwbuf_;
-    rstream_->next_out = urbuf_;
-    wstream_->next_out = cwbuf_;
-    rstream_->avail_in = 0;
-    wstream_->avail_in = 0;
-    rstream_->avail_out = urbuf_size_;
-    wstream_->avail_out = cwbuf_size_;
-
-    rv = inflateInit(rstream_);
-    checkZlibRv(rv, rstream_->msg);
-
-    // Have to set this flag so we know whether to de-initialize.
-    r_init = true;
-
-    rv = deflateInit(wstream_, comp_level_);
-    checkZlibRv(rv, wstream_->msg);
-  }
-
-  catch (...) {
-    if (r_init) {
-      rv = inflateEnd(rstream_);
-      checkZlibRvNothrow(rv, rstream_->msg);
-    }
-    // There is no way we can get here if wstream_ was initialized.
-
-    throw;
-  }
-}
-
-inline void TZlibTransport::checkZlibRv(int status, const char* message) {
-  if (status != Z_OK) {
-    throw TZlibTransportException(status, message);
-  }
-}
-
-inline void TZlibTransport::checkZlibRvNothrow(int status, const char* message) {
-  if (status != Z_OK) {
-    string output = "TZlibTransport: zlib failure in destructor: "
-                    + TZlibTransportException::errorMessage(status, message);
-    GlobalOutput(output.c_str());
-  }
-}
-
-TZlibTransport::~TZlibTransport() {
-  int rv;
-  rv = inflateEnd(rstream_);
-  checkZlibRvNothrow(rv, rstream_->msg);
-
-  rv = deflateEnd(wstream_);
-  // Z_DATA_ERROR may be returned if the caller has written data, but not
-  // called flush() to actually finish writing the data out to the underlying
-  // transport.  The defined TTransport behavior in this case is that this data
-  // may be discarded, so we ignore the error and silently discard the data.
-  // For other erros, log a message.
-  if (rv != Z_DATA_ERROR) {
-    checkZlibRvNothrow(rv, wstream_->msg);
-  }
-
-  delete[] urbuf_;
-  delete[] crbuf_;
-  delete[] uwbuf_;
-  delete[] cwbuf_;
-  delete rstream_;
-  delete wstream_;
-}
-
-bool TZlibTransport::isOpen() {
-  return (readAvail() > 0) || (rstream_->avail_in > 0) || transport_->isOpen();
-}
-
-bool TZlibTransport::peek() {
-  return (readAvail() > 0) || (rstream_->avail_in > 0) || transport_->peek();
-}
-
-// READING STRATEGY
-//
-// We have two buffers for reading: one containing the compressed data (crbuf_)
-// and one containing the uncompressed data (urbuf_).  When read is called,
-// we repeat the following steps until we have satisfied the request:
-// - Copy data from urbuf_ into the caller's buffer.
-// - If we had enough, return.
-// - If urbuf_ is empty, read some data into it from the underlying transport.
-// - Inflate data from crbuf_ into urbuf_.
-//
-// In standalone objects, we set input_ended_ to true when inflate returns
-// Z_STREAM_END.  This allows to make sure that a checksum was verified.
-
-inline int TZlibTransport::readAvail() {
-  return urbuf_size_ - rstream_->avail_out - urpos_;
-}
-
-uint32_t TZlibTransport::read(uint8_t* buf, uint32_t len) {
-  uint32_t need = len;
-
-  // TODO(dreiss): Skip urbuf on big reads.
-
-  while (true) {
-    // Copy out whatever we have available, then give them the min of
-    // what we have and what they want, then advance indices.
-    int give = (std::min)((uint32_t)readAvail(), need);
-    memcpy(buf, urbuf_ + urpos_, give);
-    need -= give;
-    buf += give;
-    urpos_ += give;
-
-    // If they were satisfied, we are done.
-    if (need == 0) {
-      return len;
-    }
-
-    // If we will need to read from the underlying transport to get more data,
-    // but we already have some data available, return it now.  Reading from
-    // the underlying transport may block, and read() is only allowed to block
-    // when no data is available.
-    if (need < len && rstream_->avail_in == 0) {
-      return len - need;
-    }
-
-    // If we get to this point, we need to get some more data.
-
-    // If zlib has reported the end of a stream, we can't really do any more.
-    if (input_ended_) {
-      return len - need;
-    }
-
-    // The uncompressed read buffer is empty, so reset the stream fields.
-    rstream_->next_out = urbuf_;
-    rstream_->avail_out = urbuf_size_;
-    urpos_ = 0;
-
-    // Call inflate() to uncompress some more data
-    if (!readFromZlib()) {
-      // no data available from underlying transport
-      return len - need;
-    }
-
-    // Okay.  The read buffer should have whatever we can give it now.
-    // Loop back to the start and try to give some more.
-  }
-}
-
-bool TZlibTransport::readFromZlib() {
-  assert(!input_ended_);
-
-  // If we don't have any more compressed data available,
-  // read some from the underlying transport.
-  if (rstream_->avail_in == 0) {
-    uint32_t got = transport_->read(crbuf_, crbuf_size_);
-    if (got == 0) {
-      return false;
-    }
-    rstream_->next_in = crbuf_;
-    rstream_->avail_in = got;
-  }
-
-  // We have some compressed data now.  Uncompress it.
-  int zlib_rv = inflate(rstream_, Z_SYNC_FLUSH);
-
-  if (zlib_rv == Z_STREAM_END) {
-    input_ended_ = true;
-  } else {
-    checkZlibRv(zlib_rv, rstream_->msg);
-  }
-
-  return true;
-}
-
-// WRITING STRATEGY
-//
-// We buffer up small writes before sending them to zlib, so our logic is:
-// - Is the write big?
-//   - Send the buffer to zlib.
-//   - Send this data to zlib.
-// - Is the write small?
-//   - Is there insufficient space in the buffer for it?
-//     - Send the buffer to zlib.
-//   - Copy the data to the buffer.
-//
-// We have two buffers for writing also: the uncompressed buffer (mentioned
-// above) and the compressed buffer.  When sending data to zlib we loop over
-// the following until the source (uncompressed buffer or big write) is empty:
-// - Is there no more space in the compressed buffer?
-//   - Write the compressed buffer to the underlying transport.
-// - Deflate from the source into the compressed buffer.
-
-void TZlibTransport::write(const uint8_t* buf, uint32_t len) {
-  if (output_finished_) {
-    throw TTransportException(TTransportException::BAD_ARGS, "write() called after finish()");
-  }
-
-  // zlib's "deflate" function has enough logic in it that I think
-  // we're better off (performance-wise) buffering up small writes.
-  if (len > MIN_DIRECT_DEFLATE_SIZE) {
-    flushToZlib(uwbuf_, uwpos_, Z_NO_FLUSH);
-    uwpos_ = 0;
-    flushToZlib(buf, len, Z_NO_FLUSH);
-  } else if (len > 0) {
-    if (uwbuf_size_ - uwpos_ < len) {
-      flushToZlib(uwbuf_, uwpos_, Z_NO_FLUSH);
-      uwpos_ = 0;
-    }
-    memcpy(uwbuf_ + uwpos_, buf, len);
-    uwpos_ += len;
-  }
-}
-
-void TZlibTransport::flush() {
-  if (output_finished_) {
-    throw TTransportException(TTransportException::BAD_ARGS, "flush() called after finish()");
-  }
-
-  flushToTransport(Z_FULL_FLUSH);
-}
-
-void TZlibTransport::finish() {
-  if (output_finished_) {
-    throw TTransportException(TTransportException::BAD_ARGS, "finish() called more than once");
-  }
-
-  flushToTransport(Z_FINISH);
-}
-
-void TZlibTransport::flushToTransport(int flush) {
-  // write pending data in uwbuf_ to zlib
-  flushToZlib(uwbuf_, uwpos_, flush);
-  uwpos_ = 0;
-
-  // write all available data from zlib to the transport
-  transport_->write(cwbuf_, cwbuf_size_ - wstream_->avail_out);
-  wstream_->next_out = cwbuf_;
-  wstream_->avail_out = cwbuf_size_;
-
-  // flush the transport
-  transport_->flush();
-}
-
-void TZlibTransport::flushToZlib(const uint8_t* buf, int len, int flush) {
-  wstream_->next_in = const_cast<uint8_t*>(buf);
-  wstream_->avail_in = len;
-
-  while (true) {
-    if (flush == Z_NO_FLUSH && wstream_->avail_in == 0) {
-      break;
-    }
-
-    // If our ouput buffer is full, flush to the underlying transport.
-    if (wstream_->avail_out == 0) {
-      transport_->write(cwbuf_, cwbuf_size_);
-      wstream_->next_out = cwbuf_;
-      wstream_->avail_out = cwbuf_size_;
-    }
-
-    int zlib_rv = deflate(wstream_, flush);
-
-    if (flush == Z_FINISH && zlib_rv == Z_STREAM_END) {
-      assert(wstream_->avail_in == 0);
-      output_finished_ = true;
-      break;
-    }
-
-    checkZlibRv(zlib_rv, wstream_->msg);
-
-    if ((flush == Z_SYNC_FLUSH || flush == Z_FULL_FLUSH) && wstream_->avail_in == 0
-        && wstream_->avail_out != 0) {
-      break;
-    }
-  }
-}
-
-const uint8_t* TZlibTransport::borrow(uint8_t* buf, uint32_t* len) {
-  (void)buf;
-  // Don't try to be clever with shifting buffers.
-  // If we have enough data, give a pointer to it,
-  // otherwise let the protcol use its slow path.
-  if (readAvail() >= (int)*len) {
-    *len = (uint32_t)readAvail();
-    return urbuf_ + urpos_;
-  }
-  return NULL;
-}
-
-void TZlibTransport::consume(uint32_t len) {
-  if (readAvail() >= (int)len) {
-    urpos_ += len;
-  } else {
-    throw TTransportException(TTransportException::BAD_ARGS, "consume did not follow a borrow.");
-  }
-}
-
-void TZlibTransport::verifyChecksum() {
-  // If zlib has already reported the end of the stream,
-  // it has verified the checksum.
-  if (input_ended_) {
-    return;
-  }
-
-  // This should only be called when reading is complete.
-  // If the caller still has unread data, throw an exception.
-  if (readAvail() > 0) {
-    throw TTransportException(TTransportException::CORRUPTED_DATA,
-                              "verifyChecksum() called before end of zlib stream");
-  }
-
-  // Reset the rstream fields, in case avail_out is 0.
-  // (Since readAvail() is 0, we know there is no unread data in urbuf_)
-  rstream_->next_out = urbuf_;
-  rstream_->avail_out = urbuf_size_;
-  urpos_ = 0;
-
-  // Call inflate()
-  // This will throw an exception if the checksum is bad.
-  bool performed_inflate = readFromZlib();
-  if (!performed_inflate) {
-    // We needed to read from the underlying transport, and the read() call
-    // returned 0.
-    //
-    // Not all TTransport implementations behave the same way here, so we'll
-    // end up with different behavior depending on the underlying transport.
-    //
-    // For some transports (e.g., TFDTransport), read() blocks if no more data
-    // is available.  They only return 0 if EOF has been reached, or if the
-    // remote endpoint has closed the connection.  For those transports,
-    // verifyChecksum() will block until the checksum becomes available.
-    //
-    // Other transport types (e.g., TMemoryBuffer) always return 0 immediately
-    // if no more data is available.  For those transport types, verifyChecksum
-    // will raise the following exception if the checksum is not available from
-    // the underlying transport yet.
-    throw TTransportException(TTransportException::CORRUPTED_DATA,
-                              "checksum not available yet in "
-                              "verifyChecksum()");
-  }
-
-  // If input_ended_ is true now, the checksum has been verified
-  if (input_ended_) {
-    return;
-  }
-
-  // The caller invoked us before the actual end of the data stream
-  assert(rstream_->avail_out < urbuf_size_);
-  throw TTransportException(TTransportException::CORRUPTED_DATA,
-                            "verifyChecksum() called before end of "
-                            "zlib stream");
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TZlibTransport.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TZlibTransport.h
deleted file mode 100644
index 1e7b5ec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/transport/TZlibTransport.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_TZLIBTRANSPORT_H_
-#define _THRIFT_TRANSPORT_TZLIBTRANSPORT_H_ 1
-
-#include <boost/lexical_cast.hpp>
-#include <thrift/transport/TTransport.h>
-#include <thrift/transport/TVirtualTransport.h>
-#include <zlib.h>
-
-struct z_stream_s;
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-class TZlibTransportException : public TTransportException {
-public:
-  TZlibTransportException(int status, const char* msg)
-    : TTransportException(TTransportException::INTERNAL_ERROR, errorMessage(status, msg)),
-      zlib_status_(status),
-      zlib_msg_(msg == NULL ? "(null)" : msg) {}
-
-  virtual ~TZlibTransportException() throw() {}
-
-  int getZlibStatus() { return zlib_status_; }
-  std::string getZlibMessage() { return zlib_msg_; }
-
-  static std::string errorMessage(int status, const char* msg) {
-    std::string rv = "zlib error: ";
-    if (msg) {
-      rv += msg;
-    } else {
-      rv += "(no message)";
-    }
-    rv += " (status = ";
-    rv += boost::lexical_cast<std::string>(status);
-    rv += ")";
-    return rv;
-  }
-
-  int zlib_status_;
-  std::string zlib_msg_;
-};
-
-/**
- * This transport uses zlib to compress on write and decompress on read
- *
- * TODO(dreiss): Don't do an extra copy of the compressed data if
- *               the underlying transport is TBuffered or TMemory.
- *
- */
-class TZlibTransport : public TVirtualTransport<TZlibTransport> {
-public:
-  /**
-   * @param transport    The transport to read compressed data from
-   *                     and write compressed data to.
-   * @param urbuf_size   Uncompressed buffer size for reading.
-   * @param crbuf_size   Compressed buffer size for reading.
-   * @param uwbuf_size   Uncompressed buffer size for writing.
-   * @param cwbuf_size   Compressed buffer size for writing.
-   * @param comp_level   Compression level (0=none[fast], 6=default, 9=max[slow]).
-   */
-  TZlibTransport(boost::shared_ptr<TTransport> transport,
-                 int urbuf_size = DEFAULT_URBUF_SIZE,
-                 int crbuf_size = DEFAULT_CRBUF_SIZE,
-                 int uwbuf_size = DEFAULT_UWBUF_SIZE,
-                 int cwbuf_size = DEFAULT_CWBUF_SIZE,
-                 int16_t comp_level = Z_DEFAULT_COMPRESSION)
-    : transport_(transport),
-      urpos_(0),
-      uwpos_(0),
-      input_ended_(false),
-      output_finished_(false),
-      urbuf_size_(urbuf_size),
-      crbuf_size_(crbuf_size),
-      uwbuf_size_(uwbuf_size),
-      cwbuf_size_(cwbuf_size),
-      urbuf_(NULL),
-      crbuf_(NULL),
-      uwbuf_(NULL),
-      cwbuf_(NULL),
-      rstream_(NULL),
-      wstream_(NULL),
-      comp_level_(comp_level) {
-    if (uwbuf_size_ < MIN_DIRECT_DEFLATE_SIZE) {
-      // Have to copy this into a local because of a linking issue.
-      int minimum = MIN_DIRECT_DEFLATE_SIZE;
-      throw TTransportException(TTransportException::BAD_ARGS,
-                                "TZLibTransport: uncompressed write buffer must be at least"
-                                + boost::lexical_cast<std::string>(minimum) + ".");
-    }
-
-    try {
-      urbuf_ = new uint8_t[urbuf_size];
-      crbuf_ = new uint8_t[crbuf_size];
-      uwbuf_ = new uint8_t[uwbuf_size];
-      cwbuf_ = new uint8_t[cwbuf_size];
-
-      // Don't call this outside of the constructor.
-      initZlib();
-
-    } catch (...) {
-      delete[] urbuf_;
-      delete[] crbuf_;
-      delete[] uwbuf_;
-      delete[] cwbuf_;
-      throw;
-    }
-  }
-
-  // Don't call this outside of the constructor.
-  void initZlib();
-
-  /**
-   * TZlibTransport destructor.
-   *
-   * Warning: Destroying a TZlibTransport object may discard any written but
-   * unflushed data.  You must explicitly call flush() or finish() to ensure
-   * that data is actually written and flushed to the underlying transport.
-   */
-  ~TZlibTransport();
-
-  bool isOpen();
-  bool peek();
-
-  void open() { transport_->open(); }
-
-  void close() { transport_->close(); }
-
-  uint32_t read(uint8_t* buf, uint32_t len);
-
-  void write(const uint8_t* buf, uint32_t len);
-
-  void flush();
-
-  /**
-   * Finalize the zlib stream.
-   *
-   * This causes zlib to flush any pending write data and write end-of-stream
-   * information, including the checksum.  Once finish() has been called, no
-   * new data can be written to the stream.
-   */
-  void finish();
-
-  const uint8_t* borrow(uint8_t* buf, uint32_t* len);
-
-  void consume(uint32_t len);
-
-  /**
-   * Verify the checksum at the end of the zlib stream.
-   *
-   * This may only be called after all data has been read.
-   * It verifies the checksum that was written by the finish() call.
-   */
-  void verifyChecksum();
-
-  /**
-   * TODO(someone_smart): Choose smart defaults.
-   */
-  static const int DEFAULT_URBUF_SIZE = 128;
-  static const int DEFAULT_CRBUF_SIZE = 1024;
-  static const int DEFAULT_UWBUF_SIZE = 128;
-  static const int DEFAULT_CWBUF_SIZE = 1024;
-
-protected:
-  inline void checkZlibRv(int status, const char* msg);
-  inline void checkZlibRvNothrow(int status, const char* msg);
-  inline int readAvail();
-  void flushToTransport(int flush);
-  void flushToZlib(const uint8_t* buf, int len, int flush);
-  bool readFromZlib();
-
-protected:
-  // Writes smaller than this are buffered up.
-  // Larger (or equal) writes are dumped straight to zlib.
-  static const uint32_t MIN_DIRECT_DEFLATE_SIZE = 32;
-
-  boost::shared_ptr<TTransport> transport_;
-
-  int urpos_;
-  int uwpos_;
-
-  /// True iff zlib has reached the end of the input stream.
-  bool input_ended_;
-  /// True iff we have finished the output stream.
-  bool output_finished_;
-
-  uint32_t urbuf_size_;
-  uint32_t crbuf_size_;
-  uint32_t uwbuf_size_;
-  uint32_t cwbuf_size_;
-
-  uint8_t* urbuf_;
-  uint8_t* crbuf_;
-  uint8_t* uwbuf_;
-  uint8_t* cwbuf_;
-
-  struct z_stream_s* rstream_;
-  struct z_stream_s* wstream_;
-
-  const int comp_level_;
-};
-
-/**
- * Wraps a transport into a zlibbed one.
- *
- */
-class TZlibTransportFactory : public TTransportFactory {
-public:
-  TZlibTransportFactory() {}
-
-  virtual ~TZlibTransportFactory() {}
-
-  virtual boost::shared_ptr<TTransport> getTransport(boost::shared_ptr<TTransport> trans) {
-    return boost::shared_ptr<TTransport>(new TZlibTransport(trans));
-  }
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // #ifndef _THRIFT_TRANSPORT_TZLIBTRANSPORT_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp
deleted file mode 100644
index 820828f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/windows/GetTimeOfDay.h>
-#include <thrift/thrift-config.h>
-
-// win32
-#if defined(__MINGW32__)
-  #include <sys/time.h>
-#endif
-
-#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
-#else
-#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
-#endif
-
-#if !defined(__MINGW32__)
-struct timezone {
-  int tz_minuteswest; /* minutes W of Greenwich */
-  int tz_dsttime;     /* type of dst correction */
-};
-#endif
-
-#if defined(__MINGW32__)
-int thrift_gettimeofday(struct timeval* tv, struct timezone* tz) {
-  return gettimeofday(tv,tz);
-}
-#else
-int thrift_gettimeofday(struct timeval* tv, struct timezone* tz) {
-  FILETIME ft;
-  unsigned __int64 tmpres(0);
-  static int tzflag;
-
-  if (NULL != tv) {
-    GetSystemTimeAsFileTime(&ft);
-
-    tmpres |= ft.dwHighDateTime;
-    tmpres <<= 32;
-    tmpres |= ft.dwLowDateTime;
-
-    /*converting file time to unix epoch*/
-    tmpres -= DELTA_EPOCH_IN_MICROSECS;
-    tmpres /= 10; /*convert into microseconds*/
-    tv->tv_sec = (long)(tmpres / 1000000UL);
-    tv->tv_usec = (long)(tmpres % 1000000UL);
-  }
-
-  if (NULL != tz) {
-    if (!tzflag) {
-      _tzset();
-      tzflag++;
-    }
-
-    long time_zone(0);
-    errno_t err(_get_timezone(&time_zone));
-    if (err == NO_ERROR) {
-      tz->tz_minuteswest = time_zone / 60;
-    } else {
-      return -1;
-    }
-
-    int day_light(0);
-    err = (_get_daylight(&day_light));
-    if (err == NO_ERROR) {
-      tz->tz_dsttime = day_light;
-      return 0;
-    } else {
-      return -1;
-    }
-  }
-
-  return 0;
-}
-#endif
-
-int thrift_sleep(unsigned int seconds) {
-  ::Sleep(seconds * 1000);
-  return 0;
-}
-int thrift_usleep(unsigned int microseconds) {
-  unsigned int milliseconds = (microseconds + 999) / 1000;
-  ::Sleep(milliseconds);
-  return 0;
-}
-
-char* thrift_ctime_r(const time_t* _clock, char* _buf) {
-  strcpy(_buf, ctime(_clock));
-  return _buf;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/GetTimeOfDay.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/GetTimeOfDay.h
deleted file mode 100644
index 762ac5e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/GetTimeOfDay.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_WINDOWS_GETTIMEOFDAY_H_
-#define _THRIFT_WINDOWS_GETTIMEOFDAY_H_
-
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#pragma once
-#endif // _MSC_VER
-
-#ifndef _WIN32
-#error This is a MSVC header only.
-#endif
-
-#include <thrift/thrift-config.h>
-#include <time.h>
-
-struct thrift_timespec {
-  int64_t tv_sec;
-  int64_t tv_nsec;
-};
-
-int thrift_gettimeofday(struct timeval* tv, struct timezone* tz);
-int thrift_sleep(unsigned int seconds);
-int thrift_usleep(unsigned int micro_seconds);
-char* thrift_ctime_r(const time_t* _clock, char* _buf);
-
-#endif // _THRIFT_WINDOWS_GETTIMEOFDAY_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/Operators.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/Operators.h
deleted file mode 100644
index 9b86096..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/Operators.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_WINDOWS_OPERATORS_H_
-#define _THRIFT_WINDOWS_OPERATORS_H_
-
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#pragma once
-#endif // _MSC_VER
-
-namespace apache {
-namespace thrift {
-
-class TEnumIterator;
-
-inline bool operator==(const TEnumIterator&, const TEnumIterator&) {
-  // Not entirely sure what the test should be here. It is only to enable
-  // iterator debugging and is not used in release mode.
-  return true;
-}
-}
-} // apache::thrift
-
-#endif // _THRIFT_WINDOWS_OPERATORS_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.cpp
deleted file mode 100644
index 5ac6fe0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-#include <thrift/windows/OverlappedSubmissionThread.h>
-#include <thrift/transport/TTransportException.h>
-#include <boost/noncopyable.hpp>
-#include <boost/scope_exit.hpp>
-#include <process.h>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-TOverlappedWorkItem::TOverlappedWorkItem()
-  : SLIST_ENTRY(),
-    action(UNKNOWN),
-    h(INVALID_HANDLE_VALUE),
-    buffer(NULL),
-    buffer_len(0),
-    overlap(),
-    last_error(0),
-    success(TRUE) {
-}
-
-void TOverlappedWorkItem::reset(uint8_t* buf, uint32_t len, HANDLE event) {
-  memset(&overlap, 0, sizeof(overlap));
-  overlap.hEvent = event;
-  buffer = buf;
-  buffer_len = len;
-  last_error = 0;
-  success = FALSE;
-}
-
-uint32_t TOverlappedWorkItem::overlappedResults(bool signal_failure) {
-  DWORD bytes = 0;
-  BOOL result = ::GetOverlappedResult(h, &overlap, &bytes, TRUE);
-  if (signal_failure && !result) // get overlapped error case
-  {
-    GlobalOutput.perror("TPipe ::GetOverlappedResult errored GLE=", ::GetLastError());
-    throw TTransportException(TTransportException::UNKNOWN, "TPipe: GetOverlappedResult failed");
-  }
-  return bytes;
-}
-
-bool TOverlappedWorkItem::process() {
-  BOOST_SCOPE_EXIT((&doneSubmittingEvent)) { SetEvent(doneSubmittingEvent.h); }
-  BOOST_SCOPE_EXIT_END
-
-  switch (action) {
-  case (CONNECT):
-    success = ::ConnectNamedPipe(h, &overlap);
-    if (success == FALSE)
-      last_error = ::GetLastError();
-    return true;
-  case (READ):
-    success = ::ReadFile(h, buffer, buffer_len, NULL, &overlap);
-    if (success == FALSE)
-      last_error = ::GetLastError();
-    return true;
-  case (CANCELIO):
-    success = ::CancelIo(h);
-    if (success == FALSE)
-      last_error = ::GetLastError();
-    return true;
-  case (STOP):
-  default:
-    return false;
-  }
-}
-
-void TOverlappedSubmissionThread::addWorkItem(TOverlappedWorkItem* item) {
-  InterlockedPushEntrySList(&workList_, item);
-  SetEvent(workAvailableEvent_.h);
-  WaitForSingleObject(item->doneSubmittingEvent.h, INFINITE);
-}
-
-TOverlappedSubmissionThread* TOverlappedSubmissionThread::acquire_instance() {
-  TAutoCrit lock(instanceGuard_);
-  if (instance_ == NULL) {
-    assert(instanceRefCount_ == 0);
-    instance_ = new TOverlappedSubmissionThread;
-  }
-  ++instanceRefCount_;
-  return instance_;
-}
-void TOverlappedSubmissionThread::release_instance() {
-  TAutoCrit lock(instanceGuard_);
-  if (--instanceRefCount_ == 0) {
-    delete instance_;
-    instance_ = NULL;
-  }
-}
-
-TOverlappedSubmissionThread::TOverlappedSubmissionThread() {
-  stopItem_.action = TOverlappedWorkItem::STOP;
-
-  InitializeSListHead(&workList_);
-  thread_ = (HANDLE)_beginthreadex(NULL, 0, thread_proc, this, 0, NULL);
-  if (thread_ == 0) {
-    GlobalOutput.perror("TOverlappedSubmissionThread unable to create thread, errno=", errno);
-    throw TTransportException(TTransportException::NOT_OPEN,
-                              " TOverlappedSubmissionThread unable to create thread");
-  }
-}
-
-TOverlappedSubmissionThread::~TOverlappedSubmissionThread() {
-  addWorkItem(&stopItem_);
-  ::WaitForSingleObject(thread_, INFINITE);
-  CloseHandle(thread_);
-}
-
-void TOverlappedSubmissionThread::run() {
-  for (;;) {
-    WaitForSingleObject(workAvailableEvent_.h, INFINITE);
-    // todo check result
-    SLIST_ENTRY* entry = NULL;
-    while ((entry = InterlockedPopEntrySList(&workList_)) != NULL) {
-      TOverlappedWorkItem& item = *static_cast<TOverlappedWorkItem*>(entry);
-      if (!item.process())
-        return;
-    }
-  }
-}
-
-unsigned __stdcall TOverlappedSubmissionThread::thread_proc(void* addr) {
-  static_cast<TOverlappedSubmissionThread*>(addr)->run();
-  return 0;
-}
-
-TCriticalSection TOverlappedSubmissionThread::instanceGuard_;
-TOverlappedSubmissionThread* TOverlappedSubmissionThread::instance_;
-uint32_t TOverlappedSubmissionThread::instanceRefCount_ = 0;
-}
-}
-} // apach::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h
deleted file mode 100644
index 56684bb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_WINDOWS_OverlappedSubmissionThread_H_
-#define _THRIFT_WINDOWS_OverlappedSubmissionThread_H_ 1
-
-#ifndef _WIN32
-#error "OverlappedSubmissionThread.h is only usable on Windows"
-#endif
-
-#include <thrift/windows/Sync.h>
-#include <boost/noncopyable.hpp>
-#include <Windows.h>
-
-/*
-  *** Why does this class exist?
-  In short, because we want to enable something similar to a "select" loop, on Windows, with
-  named pipes.  The core of the "select" loop is a call to WaitForMultipleObjects.  So that means
-  we need a signalable object that indicates when data is available.
-
-  A pipe handle doesn't do that.  A pipe handle is signaled when a read or write completes, and if
-  no one has called read or write, then the pipe handle is useless in WaitForMultipleObjects.  So
-  instead, we use overlapped I/O.  With overlapped I/O, you call read, and associate an event with
-  the read.  When the read finishes, the event is signaled.  This means that when you create a pipe,
-  you start a read.  When the customer calls read on your transport object, you wait for the last
-  read to finish, and then kick off another.
-
-  There is one big caveat to this though.  The thread that initiated the read must stay alive.  If
-  the thread that initiated the read exits, then the read completes in an error state.  To ensure
-  that the initiating thread stays alive, we create a singleton thread whose sole responsibility is
-  to manage this overlapped I/O requests.  This introduces some overhead, but it is overhead that
-  is necessary for correct behavior.
-
-  This thread currently supports connect, read, and cancel io.  So far, I haven't needed to put any
-  writes on this thread, but if needed, it could be done.  The client write buffer would need to be
-  copied to ensure that it doesn't get invalidated.
-
-  *** How does one use this class?
-  Create a TOverlappedWorkItem, and fill in the action and "h", then call reset().  Your work item
-  is now ready to be submitted to the overlapped submission thread.  Create a TAutoOverlapThread,
-  and call thread->addWorkItem with your work item.  After addWorkItem completes, you may inspect
-  last_error and success.  At some point in the future, call workItem.overlappedResults to wait
-  until the operation has completed.
-*/
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-DECLSPEC_ALIGN(MEMORY_ALLOCATION_ALIGNMENT) struct TOverlappedWorkItem : public SLIST_ENTRY {
-  TOverlappedWorkItem();
-
-  enum action_t {
-    UNKNOWN = 3000,
-    CONNECT,
-    READ,
-    CANCELIO,
-    STOP,
-  };
-
-  TAutoResetEvent doneSubmittingEvent;
-  action_t action;
-  HANDLE h;
-  uint8_t* buffer;
-  uint32_t buffer_len;
-  OVERLAPPED overlap;
-
-  DWORD last_error;
-  BOOL success;
-
-  void reset(uint8_t* buf, uint32_t len, HANDLE event);
-  uint32_t overlappedResults(bool signal_failure = true);
-  bool process();
-};
-
-class TOverlappedSubmissionThread : boost::noncopyable {
-public:
-  void addWorkItem(TOverlappedWorkItem* item);
-
-  // singleton stuff
-public:
-  static TOverlappedSubmissionThread* acquire_instance();
-  static void release_instance();
-
-private:
-  static TCriticalSection instanceGuard_;
-  static TOverlappedSubmissionThread* instance_;
-  static uint32_t instanceRefCount_;
-
-  // thread details
-private:
-  TOverlappedSubmissionThread();
-  ~TOverlappedSubmissionThread();
-  void run();
-  static unsigned __stdcall thread_proc(void* addr);
-
-private:
-  DECLSPEC_ALIGN(MEMORY_ALLOCATION_ALIGNMENT) SLIST_HEADER workList_;
-  TOverlappedWorkItem stopItem_;
-  TAutoResetEvent workAvailableEvent_;
-  HANDLE thread_;
-};
-
-class TAutoOverlapThread : boost::noncopyable {
-private:
-  TOverlappedSubmissionThread* p;
-
-public:
-  TAutoOverlapThread() : p(TOverlappedSubmissionThread::acquire_instance()) {}
-  ~TAutoOverlapThread() { TOverlappedSubmissionThread::release_instance(); }
-  TOverlappedSubmissionThread* operator->() { return p; }
-};
-}
-}
-} // apache::thrift::transport
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/SocketPair.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/SocketPair.cpp
deleted file mode 100644
index 7228832..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/SocketPair.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/* socketpair.c
- * Copyright 2007 by Nathan C. Myers <ncm@cantrip.org>; some rights reserved.
- * This code is Free Software.  It may be copied freely, in original or
- * modified form, subject only to the restrictions that (1) the author is
- * relieved from all responsibilities for any use for any purpose, and (2)
- * this copyright notice must be retained, unchanged, in its entirety.  If
- * for any reason the author might be held responsible for any consequences
- * of copying or use, license is withheld.
- */
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/windows/SocketPair.h>
-#include <thrift/Thrift.h>
-
-// stl
-#include <string.h>
-
-// Win32
-#include <WS2tcpip.h>
-
-int thrift_socketpair(int d, int type, int protocol, THRIFT_SOCKET sv[2]) {
-  THRIFT_UNUSED_VARIABLE(protocol);
-  THRIFT_UNUSED_VARIABLE(type);
-  THRIFT_UNUSED_VARIABLE(d);
-
-  union {
-    struct sockaddr_in inaddr;
-    struct sockaddr addr;
-  } a;
-  THRIFT_SOCKET listener;
-  int e;
-  socklen_t addrlen = sizeof(a.inaddr);
-  DWORD flags = 0;
-  int reuse = 1;
-
-  if (sv == 0) {
-    WSASetLastError(WSAEINVAL);
-    return SOCKET_ERROR;
-  }
-
-  listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  if (listener == INVALID_SOCKET)
-    return SOCKET_ERROR;
-
-  memset(&a, 0, sizeof(a));
-  a.inaddr.sin_family = AF_INET;
-  a.inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-  a.inaddr.sin_port = 0;
-
-  sv[0] = sv[1] = INVALID_SOCKET;
-  do {
-    // ignore errors coming out of this setsockopt.  This is because
-    // SO_EXCLUSIVEADDRUSE requires admin privileges on WinXP, but we don't
-    // want to force socket pairs to be an admin.
-    setsockopt(listener, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char*)&reuse, (socklen_t)sizeof(reuse));
-    if (bind(listener, &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
-      break;
-    if (getsockname(listener, &a.addr, &addrlen) == SOCKET_ERROR)
-      break;
-    if (listen(listener, 1) == SOCKET_ERROR)
-      break;
-    sv[0] = WSASocket(AF_INET, SOCK_STREAM, 0, NULL, 0, flags);
-    if (sv[0] == INVALID_SOCKET)
-      break;
-    if (connect(sv[0], &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
-      break;
-    sv[1] = accept(listener, NULL, NULL);
-    if (sv[1] == INVALID_SOCKET)
-      break;
-
-    closesocket(listener);
-    return 0;
-
-  } while (0);
-
-  e = WSAGetLastError();
-  closesocket(listener);
-  closesocket(sv[0]);
-  closesocket(sv[1]);
-  WSASetLastError(e);
-  return SOCKET_ERROR;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/SocketPair.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/SocketPair.h
deleted file mode 100644
index 86bf431..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/SocketPair.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_WINDOWS_SOCKETPAIR_H_
-#define _THRIFT_WINDOWS_SOCKETPAIR_H_ 1
-
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#pragma once
-#endif // _MSC_VER
-
-#ifndef _WIN32
-#error This is a MSVC header only.
-#endif
-
-// Win32
-#include <Winsock2.h>
-#include <thrift/thrift-config.h>
-
-int thrift_socketpair(int d, int type, int protocol, THRIFT_SOCKET sv[2]);
-
-#endif // _THRIFT_WINDOWS_SOCKETPAIR_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/Sync.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/Sync.h
deleted file mode 100644
index 5d32199..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/Sync.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_WINDOWS_Sync_H_
-#define _THRIFT_WINDOWS_Sync_H_ 1
-
-#ifndef _WIN32
-#error "windows/Sync.h is only usable on Windows"
-#endif
-
-#include <thrift/concurrency/Exception.h>
-#include <boost/noncopyable.hpp>
-#include <Windows.h>
-
-/*
-  Lightweight synchronization objects that only make sense on Windows.  For cross-platform
-  code, use the classes found in the concurrency namespace
-*/
-
-namespace apache {
-namespace thrift {
-
-struct TCriticalSection : boost::noncopyable {
-  CRITICAL_SECTION cs;
-  TCriticalSection() { InitializeCriticalSection(&cs); }
-  ~TCriticalSection() { DeleteCriticalSection(&cs); }
-};
-
-class TAutoCrit : boost::noncopyable {
-private:
-  CRITICAL_SECTION* cs_;
-
-public:
-  explicit TAutoCrit(TCriticalSection& cs) : cs_(&cs.cs) { EnterCriticalSection(cs_); }
-  ~TAutoCrit() { LeaveCriticalSection(cs_); }
-};
-
-struct TAutoResetEvent : boost::noncopyable {
-  HANDLE h;
-
-  TAutoResetEvent() {
-    h = CreateEvent(NULL, FALSE, FALSE, NULL);
-    if (h == NULL) {
-      GlobalOutput.perror("TAutoResetEvent unable to create event, GLE=", GetLastError());
-      throw apache::thrift::concurrency::SystemResourceException("CreateEvent failed");
-    }
-  }
-  ~TAutoResetEvent() { CloseHandle(h); }
-};
-
-struct TManualResetEvent : boost::noncopyable {
-  HANDLE h;
-
-  TManualResetEvent() {
-    h = CreateEvent(NULL, TRUE, FALSE, NULL);
-    if (h == NULL) {
-      GlobalOutput.perror("TManualResetEvent unable to create event, GLE=", GetLastError());
-      throw apache::thrift::concurrency::SystemResourceException("CreateEvent failed");
-    }
-  }
-  ~TManualResetEvent() { CloseHandle(h); }
-};
-
-struct TAutoHandle : boost::noncopyable {
-  HANDLE h;
-  explicit TAutoHandle(HANDLE h_ = INVALID_HANDLE_VALUE) : h(h_) {}
-  ~TAutoHandle() {
-    if (h != INVALID_HANDLE_VALUE)
-      CloseHandle(h);
-  }
-
-  HANDLE release() {
-    HANDLE retval = h;
-    h = INVALID_HANDLE_VALUE;
-    return retval;
-  }
-  void reset(HANDLE h_ = INVALID_HANDLE_VALUE) {
-    if (h_ == h)
-      return;
-    if (h != INVALID_HANDLE_VALUE)
-      CloseHandle(h);
-    h = h_;
-  }
-};
-}
-} // apache::thrift
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp
deleted file mode 100644
index 2e0ccf5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/windows/TWinsockSingleton.h>
-
-// boost
-#include <boost/assert.hpp>
-#include <stdexcept>
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-TWinsockSingleton::instance_ptr TWinsockSingleton::instance_ptr_(NULL);
-#if USE_BOOST_THREAD
-boost::once_flag TWinsockSingleton::flags_ = BOOST_ONCE_INIT;
-#elif USE_STD_THREAD
-std::once_flag TWinsockSingleton::flags_;
-#else
-#error For windows you must choose USE_BOOST_THREAD or USE_STD_THREAD
-#endif
-
-//------------------------------------------------------------------------------
-TWinsockSingleton::TWinsockSingleton(void) {
-  WORD version(MAKEWORD(2, 2));
-  WSAData data = {0};
-
-  int error(WSAStartup(version, &data));
-  if (error != 0) {
-    BOOST_ASSERT(false);
-    throw std::runtime_error("Failed to initialise Winsock.");
-  }
-}
-
-//------------------------------------------------------------------------------
-TWinsockSingleton::~TWinsockSingleton(void) {
-  WSACleanup();
-}
-
-//------------------------------------------------------------------------------
-void TWinsockSingleton::create(void) {
-#if USE_BOOST_THREAD
-  boost::call_once(init, flags_);
-#elif USE_STD_THREAD
-  std::call_once(flags_, init);
-#endif
-}
-
-//------------------------------------------------------------------------------
-void TWinsockSingleton::init(void) {
-  instance_ptr_.reset(new TWinsockSingleton);
-}
-}
-}
-} // apache::thrift::transport
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/TWinsockSingleton.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/TWinsockSingleton.h
deleted file mode 100644
index dc1b52f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/TWinsockSingleton.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TRANSPORT_WINDOWS_TWINSOCKSINGLETON_H_
-#define _THRIFT_TRANSPORT_WINDOWS_TWINSOCKSINGLETON_H_ 1
-
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#pragma once
-#endif // _MSC_VER
-
-#ifndef _WIN32
-#error This is a MSVC header only.
-#endif
-
-#include <thrift/thrift-config.h>
-
-// boost
-#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
-
-#if USE_BOOST_THREAD
-#include <boost/thread/once.hpp>
-#elif USE_STD_THREAD
-#include <mutex>
-#else
-#error For windows you must choose USE_BOOST_THREAD or USE_STD_THREAD
-#endif
-
-namespace apache {
-namespace thrift {
-namespace transport {
-
-/**
- * Winsock2 must be intialised once only in order to create sockets. This class
- * performs a one time initialisation when create is called.
- */
-class TWinsockSingleton : private boost::noncopyable {
-
-public:
-  typedef boost::scoped_ptr<TWinsockSingleton> instance_ptr;
-
-private:
-  TWinsockSingleton(void);
-
-public:
-  ~TWinsockSingleton(void);
-
-public:
-  static void create(void);
-
-private:
-  static void init(void);
-
-private:
-  static instance_ptr instance_ptr_;
-#if USE_BOOST_THREAD
-  static boost::once_flag flags_;
-#elif USE_STD_THREAD
-  static std::once_flag flags_;
-#else
-#error Need a non-Boost non-C++11 way to track single initialization here.
-#endif
-};
-}
-}
-} // apache::thrift::transport
-
-#endif // _THRIFT_TRANSPORT_WINDOWS_TWINSOCKSINGLETON_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/WinFcntl.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/WinFcntl.cpp
deleted file mode 100644
index c907e92..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/WinFcntl.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/windows/WinFcntl.h>
-
-int thrift_fcntl(THRIFT_SOCKET fd, int cmd, int flags) {
-  if (cmd != THRIFT_F_GETFL && cmd != THRIFT_F_SETFL) {
-    return -1;
-  }
-
-  if (flags != THRIFT_O_NONBLOCK && flags != 0) {
-    return -1;
-  }
-
-  if (cmd == THRIFT_F_GETFL) {
-    return 0;
-  }
-
-  int res;
-  if (flags) {
-    res = ioctlsocket(fd, FIONBIO, reinterpret_cast<u_long*>(&(flags = 1)));
-  } else {
-    res = ioctlsocket(fd, FIONBIO, reinterpret_cast<u_long*>(&(flags = 0)));
-  }
-
-  return res;
-}
-
-#if WINVER <= 0x0502 // XP, Server2003
-int thrift_poll(THRIFT_POLLFD* fdArray, ULONG nfds, INT timeout) {
-  fd_set read_fds, write_fds;
-  fd_set* read_fds_ptr = NULL;
-  fd_set* write_fds_ptr = NULL;
-
-  FD_ZERO(&read_fds);
-  FD_ZERO(&write_fds);
-
-  for (ULONG i = 0; i < nfds; i++) {
-    // Read (in) socket
-    if ((fdArray[i].events & THRIFT_POLLIN) == THRIFT_POLLIN) {
-      read_fds_ptr = &read_fds;
-      FD_SET(fdArray[i].fd, &read_fds);
-    }
-    // Write (out) socket
-    else if ((fdArray[i].events & THRIFT_POLLOUT) == THRIFT_POLLOUT) {
-      write_fds_ptr = &write_fds;
-      FD_SET(fdArray[i].fd, &write_fds);
-    }
-  }
-
-  timeval time_out;
-  timeval* time_out_ptr = NULL;
-  if (timeout >= 0) {
-    time_out.tv_sec = timeout / 1000;
-    time_out.tv_usec = (timeout % 1000) * 1000;
-    time_out_ptr = &time_out;
-  } else { // to avoid compiler warnings
-    (void)time_out;
-    (void)timeout;
-  }
-
-  int sktready = select(1, read_fds_ptr, write_fds_ptr, NULL, time_out_ptr);
-  if (sktready > 0) {
-    for (ULONG i = 0; i < nfds; i++) {
-      fdArray[i].revents = 0;
-      if (FD_ISSET(fdArray[i].fd, &read_fds))
-        fdArray[i].revents |= THRIFT_POLLIN;
-      if (FD_ISSET(fdArray[i].fd, &write_fds))
-        fdArray[i].revents |= THRIFT_POLLOUT;
-    }
-  }
-  return sktready;
-}
-#else  // Vista, Win7...
-int thrift_poll(THRIFT_POLLFD* fdArray, ULONG nfds, INT timeout) {
-  return WSAPoll(fdArray, nfds, timeout);
-}
-#endif // WINVER
-
-#ifdef _WIN32_WCE
-std::string thrift_wstr2str(std::wstring ws) {
-  std::string s(ws.begin(), ws.end());
-  return s;
-}
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/WinFcntl.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/WinFcntl.h
deleted file mode 100644
index 6c6be97..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/WinFcntl.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_WINDOWS_FCNTL_H_
-#define _THRIFT_WINDOWS_FCNTL_H_ 1
-
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#pragma once
-#endif // _MSC_VER
-
-#ifndef _WIN32
-#error This is a MSVC header only.
-#endif
-
-#ifdef _WIN32_WCE
-#include <string>
-#endif
-
-// Win32
-#include <Winsock2.h>
-#include <thrift/transport/PlatformSocket.h>
-
-#if WINVER <= 0x0502 // XP, Server2003
-struct thrift_pollfd {
-  THRIFT_SOCKET fd;
-  SHORT events;
-  SHORT revents;
-};
-#endif
-
-extern "C" {
-int thrift_fcntl(THRIFT_SOCKET fd, int cmd, int flags);
-int thrift_poll(THRIFT_POLLFD* fdArray, ULONG nfds, INT timeout);
-}
-
-#ifdef _WIN32_WCE
-std::string thrift_wstr2str(std::wstring ws);
-#endif
-
-#endif // _THRIFT_WINDOWS_FCNTL_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/config.h b/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/config.h
deleted file mode 100644
index 049e249..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/src/thrift/windows/config.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_WINDOWS_CONFIG_H_
-#define _THRIFT_WINDOWS_CONFIG_H_ 1
-
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
-#pragma once
-#endif // _MSC_VER
-
-#ifndef _WIN32
-#error "This is a Windows header only"
-#endif
-
-// use std::thread in MSVC11 (2012) or newer
-#if _MSC_VER >= 1700
-#define USE_STD_THREAD 1
-#else
-// otherwise use boost threads
-#define USE_BOOST_THREAD 1
-#endif
-
-// VS2010 or later has stdint.h
-#if _MSC_VER >= 1600
-#define HAVE_STDINT_H 1
-#endif
-
-#ifndef TARGET_WIN_XP
-#define TARGET_WIN_XP 1
-#endif
-
-#if TARGET_WIN_XP
-#ifndef WINVER
-#define WINVER 0x0501
-#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
-#endif
-#endif
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0601
-#endif
-
-#if defined(_M_IX86) || defined(_M_X64)
-#define ARITHMETIC_RIGHT_SHIFT 1
-#define SIGNED_RIGHT_SHIFT_IS 1
-#endif
-
-#pragma warning(disable : 4996) // Deprecated posix name.
-
-#define VERSION "0.10.0"
-#define HAVE_GETTIMEOFDAY 1
-#define HAVE_SYS_STAT_H 1
-
-// Must be using VS2010 or later, or boost, so that C99 types are defined in the global namespace
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <boost/cstdint.hpp>
-
-typedef boost::int64_t int64_t;
-typedef boost::uint64_t uint64_t;
-typedef boost::int32_t int32_t;
-typedef boost::uint32_t uint32_t;
-typedef boost::int16_t int16_t;
-typedef boost::uint16_t uint16_t;
-typedef boost::int8_t int8_t;
-typedef boost::uint8_t uint8_t;
-#endif
-
-#include <thrift/transport/PlatformSocket.h>
-#include <thrift/windows/GetTimeOfDay.h>
-#include <thrift/windows/Operators.h>
-#include <thrift/windows/TWinsockSingleton.h>
-#include <thrift/windows/WinFcntl.h>
-#include <thrift/windows/SocketPair.h>
-
-// windows
-#include <Winsock2.h>
-#include <ws2tcpip.h>
-#ifdef _WIN32_WCE
-#pragma comment(lib, "Ws2.lib")
-#else
-#pragma comment(lib, "Ws2_32.lib")
-#pragma comment(lib, "advapi32.lib") // For security APIs in TPipeServer
-#pragma comment(lib, "Shlwapi.lib")  // For StrStrIA in TPipeServer
-#endif
-#endif // _THRIFT_WINDOWS_CONFIG_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/AllProtocolTests.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/AllProtocolTests.cpp
deleted file mode 100644
index 6b5c7c4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/AllProtocolTests.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <stdio.h>
-
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TCompactProtocol.h>
-#include <thrift/transport/TBufferTransports.h>
-
-#define BOOST_TEST_MODULE AllProtocolTests
-#include <boost/test/unit_test.hpp>
-
-#include "AllProtocolTests.tcc"
-
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-
-char errorMessage[ERR_LEN];
-
-BOOST_AUTO_TEST_CASE(test_binary_protocol) {
-  testProtocol<TBinaryProtocol>("TBinaryProtocol");
-}
-
-BOOST_AUTO_TEST_CASE(test_little_binary_protocol) {
-  testProtocol<TLEBinaryProtocol>("TLEBinaryProtocol");
-}
-
-BOOST_AUTO_TEST_CASE(test_compact_protocol) {
-  testProtocol<TCompactProtocol>("TCompactProtocol");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/AllProtocolTests.tcc b/vendor/git.apache.org/thrift.git/lib/cpp/test/AllProtocolTests.tcc
deleted file mode 100644
index 8c8eaa8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/AllProtocolTests.tcc
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TEST_GENERICPROTOCOLTEST_TCC_
-#define _THRIFT_TEST_GENERICPROTOCOLTEST_TCC_ 1
-
-#include <limits>
-
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/Thrift.h>
-
-#include "GenericHelpers.h"
-
-using boost::shared_ptr;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-
-#define ERR_LEN 512
-extern char errorMessage[ERR_LEN];
-
-template <typename TProto, typename Val>
-void testNaked(Val val) {
-  shared_ptr<TTransport> transport(new TMemoryBuffer());
-  shared_ptr<TProtocol> protocol(new TProto(transport));
-
-  GenericIO::write(protocol, val);
-  Val out;
-  GenericIO::read(protocol, out);
-  if (out != val) {
-    THRIFT_SNPRINTF(errorMessage,
-                    ERR_LEN,
-                    "Invalid naked test (type: %s)",
-                    ClassNames::getName<Val>());
-    throw TException(errorMessage);
-  }
-}
-
-template <typename TProto, TType type, typename Val>
-void testField(const Val val) {
-  shared_ptr<TTransport> transport(new TMemoryBuffer());
-  shared_ptr<TProtocol> protocol(new TProto(transport));
-
-  protocol->writeStructBegin("test_struct");
-  protocol->writeFieldBegin("test_field", type, (int16_t)15);
-
-  GenericIO::write(protocol, val);
-
-  protocol->writeFieldEnd();
-  protocol->writeStructEnd();
-
-  std::string name;
-  TType fieldType;
-  int16_t fieldId;
-
-  protocol->readStructBegin(name);
-  protocol->readFieldBegin(name, fieldType, fieldId);
-
-  if (fieldId != 15) {
-    THRIFT_SNPRINTF(errorMessage, ERR_LEN, "Invalid ID (type: %s)", typeid(val).name());
-    throw TException(errorMessage);
-  }
-  if (fieldType != type) {
-    THRIFT_SNPRINTF(errorMessage, ERR_LEN, "Invalid Field Type (type: %s)", typeid(val).name());
-    throw TException(errorMessage);
-  }
-
-  Val out;
-  GenericIO::read(protocol, out);
-
-  if (out != val) {
-    THRIFT_SNPRINTF(errorMessage, ERR_LEN, "Invalid value read (type: %s)", typeid(val).name());
-    throw TException(errorMessage);
-  }
-
-  protocol->readFieldEnd();
-  protocol->readStructEnd();
-}
-
-template <typename TProto>
-void testMessage() {
-  struct TMessage {
-    const char* name;
-    TMessageType type;
-    int32_t seqid;
-  } messages[] = {{"short message name", T_CALL, 0},
-                  {"1", T_REPLY, 12345},
-                  {"loooooooooooooooooooooooooooooooooong", T_EXCEPTION, 1 << 16},
-                  {"one way push", T_ONEWAY, 12},
-                  {"Janky", T_CALL, 0}};
-  const int messages_count = sizeof(messages) / sizeof(TMessage);
-
-  for (int i = 0; i < messages_count; i++) {
-    shared_ptr<TTransport> transport(new TMemoryBuffer());
-    shared_ptr<TProtocol> protocol(new TProto(transport));
-
-    protocol->writeMessageBegin(messages[i].name, messages[i].type, messages[i].seqid);
-    protocol->writeMessageEnd();
-
-    std::string name;
-    TMessageType type;
-    int32_t seqid;
-
-    protocol->readMessageBegin(name, type, seqid);
-    if (name != messages[i].name || type != messages[i].type || seqid != messages[i].seqid) {
-      throw TException("readMessageBegin failed.");
-    }
-  }
-}
-
-template <typename TProto>
-void testProtocol(const char* protoname) {
-  try {
-    testNaked<TProto, int8_t>((int8_t)123);
-
-    for (int32_t i = 0; i < 128; i++) {
-      testField<TProto, T_BYTE, int8_t>((int8_t)i);
-      testField<TProto, T_BYTE, int8_t>((int8_t)-i);
-    }
-
-    testNaked<TProto, int16_t>((int16_t)0);
-    testNaked<TProto, int16_t>((int16_t)1);
-    testNaked<TProto, int16_t>((int16_t)15000);
-    testNaked<TProto, int16_t>((int16_t)0x7fff);
-    testNaked<TProto, int16_t>((int16_t)-1);
-    testNaked<TProto, int16_t>((int16_t)-15000);
-    testNaked<TProto, int16_t>((int16_t)-0x7fff);
-    testNaked<TProto, int16_t>((std::numeric_limits<int16_t>::min)());
-    testNaked<TProto, int16_t>((std::numeric_limits<int16_t>::max)());
-
-    testField<TProto, T_I16, int16_t>((int16_t)0);
-    testField<TProto, T_I16, int16_t>((int16_t)1);
-    testField<TProto, T_I16, int16_t>((int16_t)7);
-    testField<TProto, T_I16, int16_t>((int16_t)150);
-    testField<TProto, T_I16, int16_t>((int16_t)15000);
-    testField<TProto, T_I16, int16_t>((int16_t)0x7fff);
-    testField<TProto, T_I16, int16_t>((int16_t)-1);
-    testField<TProto, T_I16, int16_t>((int16_t)-7);
-    testField<TProto, T_I16, int16_t>((int16_t)-150);
-    testField<TProto, T_I16, int16_t>((int16_t)-15000);
-    testField<TProto, T_I16, int16_t>((int16_t)-0x7fff);
-
-    testNaked<TProto, int32_t>(0);
-    testNaked<TProto, int32_t>(1);
-    testNaked<TProto, int32_t>(15000);
-    testNaked<TProto, int32_t>(0xffff);
-    testNaked<TProto, int32_t>(-1);
-    testNaked<TProto, int32_t>(-15000);
-    testNaked<TProto, int32_t>(-0xffff);
-    testNaked<TProto, int32_t>((std::numeric_limits<int32_t>::min)());
-    testNaked<TProto, int32_t>((std::numeric_limits<int32_t>::max)());
-
-    testField<TProto, T_I32, int32_t>(0);
-    testField<TProto, T_I32, int32_t>(1);
-    testField<TProto, T_I32, int32_t>(7);
-    testField<TProto, T_I32, int32_t>(150);
-    testField<TProto, T_I32, int32_t>(15000);
-    testField<TProto, T_I32, int32_t>(31337);
-    testField<TProto, T_I32, int32_t>(0xffff);
-    testField<TProto, T_I32, int32_t>(0xffffff);
-    testField<TProto, T_I32, int32_t>(-1);
-    testField<TProto, T_I32, int32_t>(-7);
-    testField<TProto, T_I32, int32_t>(-150);
-    testField<TProto, T_I32, int32_t>(-15000);
-    testField<TProto, T_I32, int32_t>(-0xffff);
-    testField<TProto, T_I32, int32_t>(-0xffffff);
-    testNaked<TProto, int64_t>((std::numeric_limits<int32_t>::min)());
-    testNaked<TProto, int64_t>((std::numeric_limits<int32_t>::max)());
-    testNaked<TProto, int64_t>((std::numeric_limits<int32_t>::min)() + 10);
-    testNaked<TProto, int64_t>((std::numeric_limits<int32_t>::max)() - 16);
-    testNaked<TProto, int64_t>((std::numeric_limits<int64_t>::min)());
-    testNaked<TProto, int64_t>((std::numeric_limits<int64_t>::max)());
-
-    testNaked<TProto, int64_t>(0);
-    for (int64_t i = 0; i < 62; i++) {
-      testNaked<TProto, int64_t>(1L << i);
-      testNaked<TProto, int64_t>(-(1L << i));
-    }
-
-    testField<TProto, T_I64, int64_t>(0);
-    for (int i = 0; i < 62; i++) {
-      testField<TProto, T_I64, int64_t>(1L << i);
-      testField<TProto, T_I64, int64_t>(-(1L << i));
-    }
-
-    testNaked<TProto, double>(123.456);
-
-    testNaked<TProto, std::string>("");
-    testNaked<TProto, std::string>("short");
-    testNaked<TProto, std::string>("borderlinetiny");
-    testNaked<TProto, std::string>("a bit longer than the smallest possible");
-    testNaked<TProto, std::string>("\x1\x2\x3\x4\x5\x6\x7\x8\x9\xA"); // kinda binary test
-
-    testField<TProto, T_STRING, std::string>("");
-    testField<TProto, T_STRING, std::string>("short");
-    testField<TProto, T_STRING, std::string>("borderlinetiny");
-    testField<TProto, T_STRING, std::string>("a bit longer than the smallest possible");
-
-    testMessage<TProto>();
-
-    printf("%s => OK\n", protoname);
-  } catch (TException e) {
-    THRIFT_SNPRINTF(errorMessage, ERR_LEN, "%s => Test FAILED: %s", protoname, e.what());
-    throw TException(errorMessage);
-  }
-}
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/Base64Test.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/Base64Test.cpp
deleted file mode 100644
index e9e86dd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/Base64Test.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <boost/test/auto_unit_test.hpp>
-#include <thrift/protocol/TBase64Utils.h>
-
-using apache::thrift::protocol::base64_encode;
-using apache::thrift::protocol::base64_decode;
-
-BOOST_AUTO_TEST_SUITE(Base64Test)
-
-void setupTestData(int i, uint8_t* data, int& len) {
-  len = 0;
-  do {
-    data[len] = (uint8_t)(i & 0xFF);
-    i >>= 8;
-    len++;
-  } while ((len < 3) && (i != 0));
-
-  BOOST_ASSERT(i == 0);
-}
-
-void checkEncoding(uint8_t* data, int len) {
-  for (int i = 0; i < len; i++) {
-    BOOST_ASSERT(isalnum(data[i]) || data[i] == '/' || data[i] == '+');
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_Base64_Encode_Decode) {
-  int len;
-  uint8_t testInput[3];
-  uint8_t testOutput[4];
-
-  // Test all possible encoding / decoding cases given the
-  // three byte limit for base64_encode.
-
-  for (int i = 0xFFFFFF; i >= 0; i--) {
-
-    // fill testInput based on i
-    setupTestData(i, testInput, len);
-
-    // encode the test data, then decode it again
-    base64_encode(testInput, len, testOutput);
-
-    // verify each byte has a valid Base64 value (alphanumeric or either + or /)
-    checkEncoding(testOutput, len);
-
-    // decode output and check that it matches input
-    base64_decode(testOutput, len + 1);
-    BOOST_ASSERT(0 == memcmp(testInput, testOutput, len));
-  }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/Benchmark.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/Benchmark.cpp
deleted file mode 100644
index 69e6414..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/Benchmark.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <iostream>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include "thrift/transport/TBufferTransports.h"
-#include "thrift/protocol/TBinaryProtocol.h"
-#include "gen-cpp/DebugProtoTest_types.h"
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-class Timer {
-public:
-  timeval vStart;
-
-  Timer() { THRIFT_GETTIMEOFDAY(&vStart, 0); }
-  void start() { THRIFT_GETTIMEOFDAY(&vStart, 0); }
-
-  double frame() {
-    timeval vEnd;
-    THRIFT_GETTIMEOFDAY(&vEnd, 0);
-    double dstart = vStart.tv_sec + ((double)vStart.tv_usec / 1000000.0);
-    double dend = vEnd.tv_sec + ((double)vEnd.tv_usec / 1000000.0);
-    return dend - dstart;
-  }
-};
-
-int main() {
-  using namespace std;
-  using namespace thrift::test::debug;
-  using namespace apache::thrift::transport;
-  using namespace apache::thrift::protocol;
-  using namespace boost;
-
-  OneOfEach ooe;
-  ooe.im_true = true;
-  ooe.im_false = false;
-  ooe.a_bite = 0x7f;
-  ooe.integer16 = 27000;
-  ooe.integer32 = 1 << 24;
-  ooe.integer64 = (uint64_t)6000 * 1000 * 1000;
-  ooe.double_precision = M_PI;
-  ooe.some_characters = "JSON THIS! \"\1";
-  ooe.zomg_unicode = "\xd7\n\a\t";
-  ooe.base64 = "\1\2\3\255";
-
-  int num = 100000;
-  boost::shared_ptr<TMemoryBuffer> buf(new TMemoryBuffer(num*1000));
-
-  uint8_t* data = NULL;
-  uint32_t datasize = 0;
-
-  {
-    buf->resetBuffer();
-    TBinaryProtocolT<TMemoryBuffer> prot(buf);
-    double elapsed = 0.0;
-    Timer timer;
-
-    for (int i = 0; i < num; i++) {
-      ooe.write(&prot);
-    }
-    elapsed = timer.frame();
-    cout << "Write big endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  buf->getBuffer(&data, &datasize);
-
-  {
-    boost::shared_ptr<TMemoryBuffer> buf2(new TMemoryBuffer(data, datasize));
-    TBinaryProtocolT<TMemoryBuffer> prot(buf2);
-    OneOfEach ooe2;
-    double elapsed = 0.0;
-    Timer timer;
-
-    for (int i = 0; i < num; i++) {
-      ooe2.read(&prot);
-    }
-    elapsed = timer.frame();
-    cout << " Read big endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  {
-    buf->resetBuffer();
-    TBinaryProtocolT<TMemoryBuffer, TNetworkLittleEndian> prot(buf);
-    double elapsed = 0.0;
-    Timer timer;
-
-    for (int i = 0; i < num; i++) {
-      ooe.write(&prot);
-    }
-    elapsed = timer.frame();
-    cout << "Write little endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  {
-    OneOfEach ooe2;
-    boost::shared_ptr<TMemoryBuffer> buf2(new TMemoryBuffer(data, datasize));
-    TBinaryProtocolT<TMemoryBuffer, TNetworkLittleEndian> prot(buf2);
-    double elapsed = 0.0;
-    Timer timer;
-
-    for (int i = 0; i < num; i++) {
-      ooe2.read(&prot);
-    }
-    elapsed = timer.frame();
-    cout << " Read little endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  {
-    buf->resetBuffer();
-    TBinaryProtocolT<TMemoryBuffer> prot(buf);
-    double elapsed = 0.0;
-    Timer timer;
-
-    for (int i = 0; i < num; i++) {
-      ooe.write(&prot);
-    }
-    elapsed = timer.frame();
-    cout << "Write big endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  {
-    boost::shared_ptr<TMemoryBuffer> buf2(new TMemoryBuffer(data, datasize));
-    TBinaryProtocolT<TMemoryBuffer> prot(buf2);
-    OneOfEach ooe2;
-    double elapsed = 0.0;
-    Timer timer;
-
-    for (int i = 0; i < num; i++) {
-      ooe2.read(&prot);
-    }
-    elapsed = timer.frame();
-    cout << " Read big endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-
-  data = NULL;
-  datasize = 0;
-  num = 10000000;
-
-  ListDoublePerf listDoublePerf;
-  listDoublePerf.field.reserve(num);
-  for (int x = 0; x < num; ++x)
-    listDoublePerf.field.push_back(double(x));
-
-  buf.reset(new TMemoryBuffer(num * 100));
-
-  {
-    buf->resetBuffer();
-    TBinaryProtocolT<TMemoryBuffer> prot(buf);
-    double elapsed = 0.0;
-    Timer timer;
-
-    listDoublePerf.write(&prot);
-    elapsed = timer.frame();
-    cout << "Double write big endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  buf->getBuffer(&data, &datasize);
-
-  {
-    boost::shared_ptr<TMemoryBuffer> buf2(new TMemoryBuffer(data, datasize));
-    TBinaryProtocolT<TMemoryBuffer> prot(buf2);
-    ListDoublePerf listDoublePerf2;
-    double elapsed = 0.0;
-    Timer timer;
-
-    listDoublePerf2.read(&prot);
-    elapsed = timer.frame();
-    cout << " Double read big endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  {
-    buf->resetBuffer();
-    TBinaryProtocolT<TMemoryBuffer, TNetworkLittleEndian> prot(buf);
-    double elapsed = 0.0;
-    Timer timer;
-
-    listDoublePerf.write(&prot);
-    elapsed = timer.frame();
-    cout << "Double write little endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  {
-    ListDoublePerf listDoublePerf2;
-    boost::shared_ptr<TMemoryBuffer> buf2(new TMemoryBuffer(data, datasize));
-    TBinaryProtocolT<TMemoryBuffer, TNetworkLittleEndian> prot(buf2);
-    double elapsed = 0.0;
-    Timer timer;
-
-    listDoublePerf2.read(&prot);
-    elapsed = timer.frame();
-    cout << " Double read little endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  {
-    buf->resetBuffer();
-    TBinaryProtocolT<TMemoryBuffer> prot(buf);
-    double elapsed = 0.0;
-    Timer timer;
-
-    listDoublePerf.write(&prot);
-    elapsed = timer.frame();
-    cout << "Double write big endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-  {
-    boost::shared_ptr<TMemoryBuffer> buf2(new TMemoryBuffer(data, datasize));
-    TBinaryProtocolT<TMemoryBuffer> prot(buf2);
-    ListDoublePerf listDoublePerf2;
-    double elapsed = 0.0;
-    Timer timer;
-
-    listDoublePerf2.read(&prot);
-    elapsed = timer.frame();
-    cout << " Double read big endian: " << num / (1000 * elapsed) << " kHz" << endl;
-  }
-
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/cpp/test/CMakeLists.txt
deleted file mode 100644
index cbeff08..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/CMakeLists.txt
+++ /dev/null
@@ -1,361 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
-
-#Make sure gen-cpp files can be included
-include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-
-# Create the thrift C++ test library
-set(testgencpp_SOURCES
-    gen-cpp/DebugProtoTest_types.cpp
-    gen-cpp/DebugProtoTest_types.h
-    gen-cpp/EnumTest_types.cpp
-    gen-cpp/EnumTest_types.h
-    gen-cpp/OptionalRequiredTest_types.cpp
-    gen-cpp/OptionalRequiredTest_types.h
-    gen-cpp/Recursive_types.cpp
-    gen-cpp/Recursive_types.h
-    gen-cpp/ThriftTest_types.cpp
-    gen-cpp/ThriftTest_types.h
-    gen-cpp/TypedefTest_types.cpp
-    gen-cpp/TypedefTest_types.h
-    ThriftTest_extras.cpp
-    DebugProtoTest_extras.cpp
-)
-
-add_library(testgencpp STATIC ${testgencpp_SOURCES})
-
-set(testgencpp_cob_SOURCES
-    gen-cpp/ChildService.cpp
-    gen-cpp/ChildService.h
-    gen-cpp/EmptyService.cpp
-    gen-cpp/EmptyService.h
-    gen-cpp/ParentService.cpp
-    gen-cpp/ParentService.h
-    gen-cpp/proc_types.cpp
-    gen-cpp/proc_types.h
-)
-add_library(testgencpp_cob STATIC ${testgencpp_cob_SOURCES})
-
-
-add_executable(Benchmark Benchmark.cpp)
-target_link_libraries(Benchmark testgencpp)
-LINK_AGAINST_THRIFT_LIBRARY(Benchmark thrift)
-add_test(NAME Benchmark COMMAND Benchmark)
-target_link_libraries(Benchmark testgencpp)
-
-set(UnitTest_SOURCES
-    UnitTestMain.cpp
-    TMemoryBufferTest.cpp
-    TBufferBaseTest.cpp
-    Base64Test.cpp
-    ToStringTest.cpp
-    TypedefTest.cpp
-    TServerSocketTest.cpp
-    TServerTransportTest.cpp
-)
-
-if(NOT WITH_BOOSTTHREADS AND NOT WITH_STDTHREADS AND NOT MSVC)
-    list(APPEND UnitTest_SOURCES RWMutexStarveTest.cpp)
-endif()
-
-add_executable(UnitTests ${UnitTest_SOURCES})
-target_link_libraries(UnitTests testgencpp ${Boost_LIBRARIES})
-LINK_AGAINST_THRIFT_LIBRARY(UnitTests thrift)
-add_test(NAME UnitTests COMMAND UnitTests)
-if ( MSVC )
-    # Disable C4503: decorated name length exceeded, name was truncated
-    # 'insanity' results in very long decorated names
-    set_property( TARGET UnitTests APPEND_STRING PROPERTY COMPILE_FLAGS /wd4503 )
-endif ( MSVC )
-
-
-set( TInterruptTest_SOURCES
-     TSocketInterruptTest.cpp
-     TSSLSocketInterruptTest.cpp
-)
-if (WIN32)
-    list(APPEND TInterruptTest_SOURCES
-        TPipeInterruptTest.cpp
-    )
-endif()
-add_executable(TInterruptTest ${TInterruptTest_SOURCES})
-target_link_libraries(TInterruptTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(TInterruptTest thrift)
-if (NOT MSVC AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT MINGW)
-target_link_libraries(TInterruptTest -lrt)
-endif ()
-add_test(NAME TInterruptTest COMMAND TInterruptTest "${CMAKE_CURRENT_SOURCE_DIR}/../../../test/keys")
-
-add_executable(TServerIntegrationTest TServerIntegrationTest.cpp)
-target_link_libraries(TServerIntegrationTest
-    testgencpp_cob
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(TServerIntegrationTest thrift)
-if (NOT MSVC AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT MINGW)
-target_link_libraries(TServerIntegrationTest -lrt)
-endif ()
-add_test(NAME TServerIntegrationTest COMMAND TServerIntegrationTest)
-
-if(WITH_ZLIB)
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-add_executable(TransportTest TransportTest.cpp)
-target_link_libraries(TransportTest
-    testgencpp
-    ${Boost_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(TransportTest thrift)
-LINK_AGAINST_THRIFT_LIBRARY(TransportTest thriftz)
-add_test(NAME TransportTest COMMAND TransportTest)
-
-add_executable(ZlibTest ZlibTest.cpp)
-target_link_libraries(ZlibTest
-    testgencpp
-    ${Boost_LIBRARIES}
-    ${ZLIB_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(ZlibTest thrift)
-LINK_AGAINST_THRIFT_LIBRARY(ZlibTest thriftz)
-add_test(NAME ZlibTest COMMAND ZlibTest)
-endif(WITH_ZLIB)
-
-
-add_executable(EnumTest EnumTest.cpp)
-target_link_libraries(EnumTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(EnumTest thrift)
-add_test(NAME EnumTest COMMAND EnumTest)
-
-if(HAVE_GETOPT_H)
-add_executable(TFileTransportTest TFileTransportTest.cpp)
-target_link_libraries(TFileTransportTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(TFileTransportTest thrift)
-add_test(NAME TFileTransportTest COMMAND TFileTransportTest)
-endif()
-
-add_executable(TFDTransportTest TFDTransportTest.cpp)
-target_link_libraries(TFDTransportTest
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(TFDTransportTest thrift)
-add_test(NAME TFDTransportTest COMMAND TFDTransportTest)
-
-add_executable(TPipedTransportTest TPipedTransportTest.cpp)
-target_link_libraries(TPipedTransportTest
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(TPipedTransportTest thrift)
-add_test(NAME TPipedTransportTest COMMAND TPipedTransportTest)
-
-set(AllProtocolsTest_SOURCES
-    AllProtocolTests.cpp
-    AllProtocolTests.tcc
-    GenericHelpers
-    )
-
-add_executable(AllProtocolsTest ${AllProtocolsTest_SOURCES})
-target_link_libraries(AllProtocolsTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(AllProtocolsTest thrift)
-add_test(NAME AllProtocolsTest COMMAND AllProtocolsTest)
-
-# The debug run-time in Windows asserts on isprint() with negative inputs
-if (NOT MSVC OR (MSVC AND CMAKE_BUILD_TYPE EQUAL "DEBUG"))
-add_executable(DebugProtoTest DebugProtoTest.cpp)
-target_link_libraries(DebugProtoTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(DebugProtoTest thrift)
-add_test(NAME DebugProtoTest COMMAND DebugProtoTest)
-endif()
-
-add_executable(JSONProtoTest JSONProtoTest.cpp)
-target_link_libraries(JSONProtoTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(JSONProtoTest thrift)
-add_test(NAME JSONProtoTest COMMAND JSONProtoTest)
-
-add_executable(OptionalRequiredTest OptionalRequiredTest.cpp)
-target_link_libraries(OptionalRequiredTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(OptionalRequiredTest thrift)
-add_test(NAME OptionalRequiredTest COMMAND OptionalRequiredTest)
-
-add_executable(RecursiveTest RecursiveTest.cpp)
-target_link_libraries(RecursiveTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(RecursiveTest thrift)
-add_test(NAME RecursiveTest COMMAND RecursiveTest)
-
-add_executable(SpecializationTest SpecializationTest.cpp)
-target_link_libraries(SpecializationTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(SpecializationTest thrift)
-add_test(NAME SpecializationTest COMMAND SpecializationTest)
-
-set(concurrency_test_SOURCES
-    concurrency/Tests.cpp
-    concurrency/ThreadFactoryTests.h
-    concurrency/ThreadManagerTests.h
-    concurrency/TimerManagerTests.h
-)
-add_executable(concurrency_test ${concurrency_test_SOURCES})
-LINK_AGAINST_THRIFT_LIBRARY(concurrency_test thrift)
-add_test(NAME concurrency_test COMMAND concurrency_test)
-
-set(link_test_SOURCES
-    link/LinkTest.cpp
-    gen-cpp/ParentService.h
-    link/TemplatedService1.cpp
-    link/TemplatedService2.cpp
-)
-
-add_executable(link_test ${link_test_SOURCES})
-target_link_libraries(link_test testgencpp_cob)
-LINK_AGAINST_THRIFT_LIBRARY(link_test thrift)
-target_link_libraries(link_test testgencpp)
-add_test(NAME link_test COMMAND link_test)
-
-if(WITH_LIBEVENT)
-set(processor_test_SOURCES
-    processor/ProcessorTest.cpp
-    processor/EventLog.cpp
-    processor/ServerThread.cpp
-    processor/EventLog.h
-    processor/Handlers.h
-    processor/ServerThread.h
-)
-add_executable(processor_test ${processor_test_SOURCES})
-target_link_libraries(processor_test
-    testgencpp_cob
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(processor_test thrift)
-LINK_AGAINST_THRIFT_LIBRARY(processor_test thriftnb)
-add_test(NAME processor_test COMMAND processor_test)
-
-set(TNonblockingServerTest_SOURCES TNonblockingServerTest.cpp)
-add_executable(TNonblockingServerTest ${TNonblockingServerTest_SOURCES})
-include_directories(${LIBEVENT_INCLUDE_DIRS})
-target_link_libraries(TNonblockingServerTest
-    testgencpp_cob
-    ${LIBEVENT_LIBRARIES}
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(TNonblockingServerTest thrift)
-LINK_AGAINST_THRIFT_LIBRARY(TNonblockingServerTest thriftnb)
-add_test(NAME TNonblockingServerTest COMMAND TNonblockingServerTest)
-endif()
-
-if(OPENSSL_FOUND AND WITH_OPENSSL)
-add_executable(OpenSSLManualInitTest OpenSSLManualInitTest.cpp)
-target_link_libraries(OpenSSLManualInitTest
-    ${OPENSSL_LIBRARIES}
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(OpenSSLManualInitTest thrift)
-add_test(NAME OpenSSLManualInitTest COMMAND OpenSSLManualInitTest)
-
-add_executable(SecurityTest SecurityTest.cpp)
-target_link_libraries(SecurityTest
-    testgencpp
-    ${Boost_LIBRARIES}
-)
-LINK_AGAINST_THRIFT_LIBRARY(SecurityTest thrift)
-if (NOT MSVC AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT MINGW)
-target_link_libraries(SecurityTest -lrt)
-endif ()
-add_test(NAME SecurityTest COMMAND SecurityTest "${CMAKE_CURRENT_SOURCE_DIR}/../../../test/keys")
-
-endif()
-
-if(WITH_QT4)
-set(CMAKE_AUTOMOC ON)
-find_package(Qt4 REQUIRED COMPONENTS QtTest)
-set(TQTcpServerTest_SOURCES
-    qt/TQTcpServerTest.cpp
-)
-add_executable(TQTcpServerTest ${TQTcpServerTest_SOURCES})
-target_link_libraries(TQTcpServerTest testgencpp_cob thriftqt Qt4::QtTest)
-LINK_AGAINST_THRIFT_LIBRARY(TQTcpServerTest thrift)
-add_test(NAME TQTcpServerTest COMMAND TQTcpServerTest)
-endif()
-
-if(WITH_QT5)
-add_subdirectory(qt)
-endif()
-
-#
-# Common thrift code generation rules
-#
-
-
-add_custom_command(OUTPUT gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h gen-cpp/EmptyService.cpp  gen-cpp/EmptyService.h
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/DebugProtoTest.thrift
-)
-
-add_custom_command(OUTPUT gen-cpp/EnumTest_types.cpp gen-cpp/EnumTest_types.h
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/EnumTest.thrift
-)
-
-add_custom_command(OUTPUT gen-cpp/TypedefTest_types.cpp gen-cpp/TypedefTest_types.h
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/TypedefTest.thrift
-)
-
-add_custom_command(OUTPUT gen-cpp/OptionalRequiredTest_types.cpp gen-cpp/OptionalRequiredTest_types.h
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/OptionalRequiredTest.thrift
-)
-
-add_custom_command(OUTPUT gen-cpp/Recursive_types.cpp gen-cpp/Recursive_types.h
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/Recursive.thrift
-)
-
-add_custom_command(OUTPUT gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/StressTest.thrift
-)
-
-add_custom_command(OUTPUT gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_types.h
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift
-)
-
-add_custom_command(OUTPUT gen-cpp/ChildService.cpp gen-cpp/ChildService.h gen-cpp/ParentService.cpp gen-cpp/ParentService.h gen-cpp/proc_types.cpp gen-cpp/proc_types.h
-    COMMAND ${THRIFT_COMPILER} --gen cpp:templates,cob_style ${CMAKE_CURRENT_SOURCE_DIR}/processor/proc.thrift
-)
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/DebugProtoTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/DebugProtoTest.cpp
deleted file mode 100644
index 607744b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/DebugProtoTest.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define _USE_MATH_DEFINES
-#include <cmath>
-#include "gen-cpp/DebugProtoTest_types.h"
-#include <thrift/protocol/TDebugProtocol.h>
-
-#define BOOST_TEST_MODULE DebugProtoTest
-#include <boost/test/unit_test.hpp>
-
-using namespace thrift::test::debug;
-
-static std::auto_ptr<OneOfEach> ooe;
-
-void testCaseSetup_1() {
-  ooe.reset(new OneOfEach);
-  ooe->im_true = true;
-  ooe->im_false = false;
-  ooe->a_bite = 0x7f;
-  ooe->integer16 = 27000;
-  ooe->integer32 = 1 << 24;
-  ooe->integer64 = (uint64_t)6000 * 1000 * 1000;
-  ooe->double_precision = M_PI;
-  ooe->some_characters = "Debug THIS!";
-  ooe->zomg_unicode = "\xd7\n\a\t";
-}
-
-BOOST_AUTO_TEST_CASE(test_debug_proto_1) {
-  testCaseSetup_1();
-
-  const std::string expected_result(
-    "OneOfEach {\n"
-    "  01: im_true (bool) = true,\n"
-    "  02: im_false (bool) = false,\n"
-    "  03: a_bite (byte) = 0x7f,\n"
-    "  04: integer16 (i16) = 27000,\n"
-    "  05: integer32 (i32) = 16777216,\n"
-    "  06: integer64 (i64) = 6000000000,\n"
-    "  07: double_precision (double) = 3.1415926535897931,\n"
-    "  08: some_characters (string) = \"Debug THIS!\",\n"
-    "  09: zomg_unicode (string) = \"\\xd7\\n\\a\\t\",\n"
-    "  10: what_who (bool) = false,\n"
-    "  11: base64 (string) = \"\",\n"
-    "  12: byte_list (list) = list<byte>[3] {\n"
-    "    [0] = 0x01,\n"
-    "    [1] = 0x02,\n"
-    "    [2] = 0x03,\n"
-    "  },\n"
-    "  13: i16_list (list) = list<i16>[3] {\n"
-    "    [0] = 1,\n"
-    "    [1] = 2,\n"
-    "    [2] = 3,\n"
-    "  },\n"
-    "  14: i64_list (list) = list<i64>[3] {\n"
-    "    [0] = 1,\n"
-    "    [1] = 2,\n"
-    "    [2] = 3,\n"
-    "  },\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(*ooe));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-static std::auto_ptr<Nesting> n;
-
-void testCaseSetup_2() {
-  testCaseSetup_1();
-
-  n.reset(new Nesting);
-  n->my_ooe = *ooe;
-  n->my_ooe.integer16 = 16;
-  n->my_ooe.integer32 = 32;
-  n->my_ooe.integer64 = 64;
-  n->my_ooe.double_precision = (std::sqrt(5.0) + 1) / 2;
-  n->my_ooe.some_characters = ":R (me going \"rrrr\")";
-  n->my_ooe.zomg_unicode     = "\xd3\x80\xe2\x85\xae\xce\x9d\x20\xd0\x9d\xce"
-                               "\xbf\xe2\x85\xbf\xd0\xbe\xc9\xa1\xd0\xb3\xd0"
-                               "\xb0\xcf\x81\xe2\x84\x8e\x20\xce\x91\x74\x74"
-                               "\xce\xb1\xe2\x85\xbd\xce\xba\xc7\x83\xe2\x80"
-                               "\xbc";
-  n->my_bonk.type = 31337;
-  n->my_bonk.message = "I am a bonk... xor!";
-}
-
-BOOST_AUTO_TEST_CASE(test_debug_proto_2) {
-  testCaseSetup_2();
-
-  const std::string expected_result(
-    "Nesting {\n"
-    "  01: my_bonk (struct) = Bonk {\n"
-    "    01: type (i32) = 31337,\n"
-    "    02: message (string) = \"I am a bonk... xor!\",\n"
-    "  },\n"
-    "  02: my_ooe (struct) = OneOfEach {\n"
-    "    01: im_true (bool) = true,\n"
-    "    02: im_false (bool) = false,\n"
-    "    03: a_bite (byte) = 0x7f,\n"
-    "    04: integer16 (i16) = 16,\n"
-    "    05: integer32 (i32) = 32,\n"
-    "    06: integer64 (i64) = 64,\n"
-    "    07: double_precision (double) = 1.6180339887498949,\n"
-    "    08: some_characters (string) = \":R (me going \\\"rrrr\\\")\",\n"
-    "    09: zomg_unicode (string) = \"\\xd3\\x80\\xe2\\x85\\xae\\xce\\x9d \\xd"
-      "0\\x9d\\xce\\xbf\\xe2\\x85\\xbf\\xd0\\xbe\\xc9\\xa1\\xd0\\xb3\\xd0\\xb0"
-      "\\xcf\\x81\\xe2\\x84\\x8e \\xce\\x91tt\\xce\\xb1\\xe2\\x85\\xbd\\xce\\xb"
-      "a\\xc7\\x83\\xe2\\x80\\xbc\",\n"
-    "    10: what_who (bool) = false,\n"
-    "    11: base64 (string) = \"\",\n"
-    "    12: byte_list (list) = list<byte>[3] {\n"
-    "      [0] = 0x01,\n"
-    "      [1] = 0x02,\n"
-    "      [2] = 0x03,\n"
-    "    },\n"
-    "    13: i16_list (list) = list<i16>[3] {\n"
-    "      [0] = 1,\n"
-    "      [1] = 2,\n"
-    "      [2] = 3,\n"
-    "    },\n"
-    "    14: i64_list (list) = list<i64>[3] {\n"
-    "      [0] = 1,\n"
-    "      [1] = 2,\n"
-    "      [2] = 3,\n"
-    "    },\n"
-    "  },\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(*n));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-static std::auto_ptr<HolyMoley> hm;
-
-void testCaseSetup_3() {
-  testCaseSetup_2();
-
-  hm.reset(new HolyMoley);
-
-  hm->big.push_back(*ooe);
-  hm->big.push_back(n->my_ooe);
-  hm->big[0].a_bite = 0x22;
-  hm->big[1].a_bite = 0x33;
-
-  std::vector<std::string> stage1;
-  stage1.push_back("and a one");
-  stage1.push_back("and a two");
-  hm->contain.insert(stage1);
-  stage1.clear();
-  stage1.push_back("then a one, two");
-  stage1.push_back("three!");
-  stage1.push_back("FOUR!!");
-  hm->contain.insert(stage1);
-  stage1.clear();
-  hm->contain.insert(stage1);
-
-  std::vector<Bonk> stage2;
-  hm->bonks["nothing"] = stage2;
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 1;
-  stage2.back().message = "Wait.";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 2;
-  stage2.back().message = "What?";
-  hm->bonks["something"] = stage2;
-  stage2.clear();
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 3;
-  stage2.back().message = "quoth";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 4;
-  stage2.back().message = "the raven";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 5;
-  stage2.back().message = "nevermore";
-  hm->bonks["poe"] = stage2;
-}
-
-BOOST_AUTO_TEST_CASE(test_debug_proto_3) {
-  testCaseSetup_3();
-
-  const std::string expected_result(
-    "HolyMoley {\n"
-    "  01: big (list) = list<struct>[2] {\n"
-    "    [0] = OneOfEach {\n"
-    "      01: im_true (bool) = true,\n"
-    "      02: im_false (bool) = false,\n"
-    "      03: a_bite (byte) = 0x22,\n"
-    "      04: integer16 (i16) = 27000,\n"
-    "      05: integer32 (i32) = 16777216,\n"
-    "      06: integer64 (i64) = 6000000000,\n"
-    "      07: double_precision (double) = 3.1415926535897931,\n"
-    "      08: some_characters (string) = \"Debug THIS!\",\n"
-    "      09: zomg_unicode (string) = \"\\xd7\\n\\a\\t\",\n"
-    "      10: what_who (bool) = false,\n"
-    "      11: base64 (string) = \"\",\n"
-    "      12: byte_list (list) = list<byte>[3] {\n"
-    "        [0] = 0x01,\n"
-    "        [1] = 0x02,\n"
-    "        [2] = 0x03,\n"
-    "      },\n"
-    "      13: i16_list (list) = list<i16>[3] {\n"
-    "        [0] = 1,\n"
-    "        [1] = 2,\n"
-    "        [2] = 3,\n"
-    "      },\n"
-    "      14: i64_list (list) = list<i64>[3] {\n"
-    "        [0] = 1,\n"
-    "        [1] = 2,\n"
-    "        [2] = 3,\n"
-    "      },\n"
-    "    },\n"
-    "    [1] = OneOfEach {\n"
-    "      01: im_true (bool) = true,\n"
-    "      02: im_false (bool) = false,\n"
-    "      03: a_bite (byte) = 0x33,\n"
-    "      04: integer16 (i16) = 16,\n"
-    "      05: integer32 (i32) = 32,\n"
-    "      06: integer64 (i64) = 64,\n"
-    "      07: double_precision (double) = 1.6180339887498949,\n"
-    "      08: some_characters (string) = \":R (me going \\\"rrrr\\\")\",\n"
-    "      09: zomg_unicode (string) = \"\\xd3\\x80\\xe2\\x85\\xae\\xce\\x9d \\"
-      "xd0\\x9d\\xce\\xbf\\xe2\\x85\\xbf\\xd0\\xbe\\xc9\\xa1\\xd0\\xb3\\xd0\\xb"
-      "0\\xcf\\x81\\xe2\\x84\\x8e \\xce\\x91tt\\xce\\xb1\\xe2\\x85\\xbd\\xce\\x"
-      "ba\\xc7\\x83\\xe2\\x80\\xbc\",\n"
-    "      10: what_who (bool) = false,\n"
-    "      11: base64 (string) = \"\",\n"
-    "      12: byte_list (list) = list<byte>[3] {\n"
-    "        [0] = 0x01,\n"
-    "        [1] = 0x02,\n"
-    "        [2] = 0x03,\n"
-    "      },\n"
-    "      13: i16_list (list) = list<i16>[3] {\n"
-    "        [0] = 1,\n"
-    "        [1] = 2,\n"
-    "        [2] = 3,\n"
-    "      },\n"
-    "      14: i64_list (list) = list<i64>[3] {\n"
-    "        [0] = 1,\n"
-    "        [1] = 2,\n"
-    "        [2] = 3,\n"
-    "      },\n"
-    "    },\n"
-    "  },\n"
-    "  02: contain (set) = set<list>[3] {\n"
-    "    list<string>[0] {\n"
-    "    },\n"
-    "    list<string>[2] {\n"
-    "      [0] = \"and a one\",\n"
-    "      [1] = \"and a two\",\n"
-    "    },\n"
-    "    list<string>[3] {\n"
-    "      [0] = \"then a one, two\",\n"
-    "      [1] = \"three!\",\n"
-    "      [2] = \"FOUR!!\",\n"
-    "    },\n"
-    "  },\n"
-    "  03: bonks (map) = map<string,list>[3] {\n"
-    "    \"nothing\" -> list<struct>[0] {\n"
-    "    },\n"
-    "    \"poe\" -> list<struct>[3] {\n"
-    "      [0] = Bonk {\n"
-    "        01: type (i32) = 3,\n"
-    "        02: message (string) = \"quoth\",\n"
-    "      },\n"
-    "      [1] = Bonk {\n"
-    "        01: type (i32) = 4,\n"
-    "        02: message (string) = \"the raven\",\n"
-    "      },\n"
-    "      [2] = Bonk {\n"
-    "        01: type (i32) = 5,\n"
-    "        02: message (string) = \"nevermore\",\n"
-    "      },\n"
-    "    },\n"
-    "    \"something\" -> list<struct>[2] {\n"
-    "      [0] = Bonk {\n"
-    "        01: type (i32) = 1,\n"
-    "        02: message (string) = \"Wait.\",\n"
-    "      },\n"
-    "      [1] = Bonk {\n"
-    "        01: type (i32) = 2,\n"
-    "        02: message (string) = \"What?\",\n"
-    "      },\n"
-    "    },\n"
-    "  },\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(*hm));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/DebugProtoTest_extras.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/DebugProtoTest_extras.cpp
deleted file mode 100644
index 5c4fd35..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/DebugProtoTest_extras.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Extra functions required for DebugProtoTest_types to work
-
-#include "gen-cpp/DebugProtoTest_types.h"
-
-namespace thrift {
-namespace test {
-namespace debug {
-
-bool Empty::operator<(Empty const& other) const {
-  (void)other;
-  // It is empty, so all are equal.
-  return false;
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/EnumTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/EnumTest.cpp
deleted file mode 100644
index 0e34b16..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/EnumTest.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#define BOOST_TEST_MODULE EnumTest
-#include <boost/test/unit_test.hpp>
-#include "gen-cpp/EnumTest_types.h"
-
-BOOST_AUTO_TEST_SUITE(EnumTest)
-
-BOOST_AUTO_TEST_CASE(test_enum) {
-  // Check that all the enum values match what we expect
-  BOOST_CHECK_EQUAL(MyEnum1::ME1_0, 0);
-  BOOST_CHECK_EQUAL(MyEnum1::ME1_1, 1);
-  BOOST_CHECK_EQUAL(MyEnum1::ME1_2, 2);
-  BOOST_CHECK_EQUAL(MyEnum1::ME1_3, 3);
-  BOOST_CHECK_EQUAL(MyEnum1::ME1_5, 5);
-  BOOST_CHECK_EQUAL(MyEnum1::ME1_6, 6);
-
-  BOOST_CHECK_EQUAL(MyEnum2::ME2_0, 0);
-  BOOST_CHECK_EQUAL(MyEnum2::ME2_1, 1);
-  BOOST_CHECK_EQUAL(MyEnum2::ME2_2, 2);
-
-  BOOST_CHECK_EQUAL(MyEnum3::ME3_0, 0);
-  BOOST_CHECK_EQUAL(MyEnum3::ME3_1, 1);
-  BOOST_CHECK_EQUAL(MyEnum3::ME3_N2, -2);
-  BOOST_CHECK_EQUAL(MyEnum3::ME3_N1, -1);
-  BOOST_CHECK_EQUAL(MyEnum3::ME3_D0, 0);
-  BOOST_CHECK_EQUAL(MyEnum3::ME3_D1, 1);
-  BOOST_CHECK_EQUAL(MyEnum3::ME3_9, 9);
-  BOOST_CHECK_EQUAL(MyEnum3::ME3_10, 10);
-
-  BOOST_CHECK_EQUAL(MyEnum4::ME4_A, 0x7ffffffd);
-  BOOST_CHECK_EQUAL(MyEnum4::ME4_B, 0x7ffffffe);
-  BOOST_CHECK_EQUAL(MyEnum4::ME4_C, 0x7fffffff);
-}
-
-BOOST_AUTO_TEST_CASE(test_enum_constant) {
-  MyStruct ms;
-  BOOST_CHECK_EQUAL(ms.me2_2, 2);
-  BOOST_CHECK_EQUAL(ms.me3_n2, -2);
-  BOOST_CHECK_EQUAL(ms.me3_d1, 1);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/GenericHelpers.h b/vendor/git.apache.org/thrift.git/lib/cpp/test/GenericHelpers.h
deleted file mode 100644
index c175561..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/GenericHelpers.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TEST_GENERICHELPERS_H_
-#define _THRIFT_TEST_GENERICHELPERS_H_ 1
-
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/Thrift.h>
-
-using boost::shared_ptr;
-using namespace apache::thrift::protocol;
-
-/* ClassName Helper for cleaner exceptions */
-class ClassNames {
-public:
-  template <typename T>
-  static const char* getName() {
-    return "Unknown type";
-  }
-};
-
-template <>
-const char* ClassNames::getName<int8_t>() {
-  return "byte";
-}
-template <>
-const char* ClassNames::getName<int16_t>() {
-  return "short";
-}
-template <>
-const char* ClassNames::getName<int32_t>() {
-  return "int";
-}
-template <>
-const char* ClassNames::getName<int64_t>() {
-  return "long";
-}
-template <>
-const char* ClassNames::getName<double>() {
-  return "double";
-}
-template <>
-const char* ClassNames::getName<std::string>() {
-  return "string";
-}
-
-/* Generic Protocol I/O function for tests */
-class GenericIO {
-public:
-  /* Write functions */
-
-  static uint32_t write(shared_ptr<TProtocol> proto, const int8_t& val) {
-    return proto->writeByte(val);
-  }
-
-  static uint32_t write(shared_ptr<TProtocol> proto, const int16_t& val) {
-    return proto->writeI16(val);
-  }
-
-  static uint32_t write(shared_ptr<TProtocol> proto, const int32_t& val) {
-    return proto->writeI32(val);
-  }
-
-  static uint32_t write(shared_ptr<TProtocol> proto, const double& val) {
-    return proto->writeDouble(val);
-  }
-
-  static uint32_t write(shared_ptr<TProtocol> proto, const int64_t& val) {
-    return proto->writeI64(val);
-  }
-
-  static uint32_t write(shared_ptr<TProtocol> proto, const std::string& val) {
-    return proto->writeString(val);
-  }
-
-  /* Read functions */
-
-  static uint32_t read(shared_ptr<TProtocol> proto, int8_t& val) { return proto->readByte(val); }
-
-  static uint32_t read(shared_ptr<TProtocol> proto, int16_t& val) { return proto->readI16(val); }
-
-  static uint32_t read(shared_ptr<TProtocol> proto, int32_t& val) { return proto->readI32(val); }
-
-  static uint32_t read(shared_ptr<TProtocol> proto, int64_t& val) { return proto->readI64(val); }
-
-  static uint32_t read(shared_ptr<TProtocol> proto, double& val) { return proto->readDouble(val); }
-
-  static uint32_t read(shared_ptr<TProtocol> proto, std::string& val) {
-    return proto->readString(val);
-  }
-};
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/JSONProtoTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/JSONProtoTest.cpp
deleted file mode 100644
index 301a064..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/JSONProtoTest.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define _USE_MATH_DEFINES
-#include <cmath>
-#include <iomanip>
-#include <sstream>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/protocol/TJSONProtocol.h>
-#include "gen-cpp/DebugProtoTest_types.h"
-
-#define BOOST_TEST_MODULE JSONProtoTest
-#include <boost/test/unit_test.hpp>
-
-using namespace thrift::test::debug;
-using apache::thrift::transport::TMemoryBuffer;
-using apache::thrift::protocol::TJSONProtocol;
-
-static std::auto_ptr<OneOfEach> ooe;
-
-void testCaseSetup_1() {
-  ooe.reset(new OneOfEach);
-  ooe->im_true = true;
-  ooe->im_false = false;
-  ooe->a_bite = 0x7f;
-  ooe->integer16 = 27000;
-  ooe->integer32 = 1 << 24;
-  ooe->integer64 = (uint64_t)6000 * 1000 * 1000;
-  ooe->double_precision = M_PI;
-  ooe->some_characters = "JSON THIS! \"\1";
-  ooe->zomg_unicode = "\xd7\n\a\t";
-  ooe->base64 = "\1\2\3\255";
-}
-
-BOOST_AUTO_TEST_CASE(test_json_proto_1) {
-  testCaseSetup_1();
-
-  const std::string expected_result(
-  "{\"1\":{\"tf\":1},\"2\":{\"tf\":0},\"3\":{\"i8\":127},\"4\":{\"i16\":27000},"
-  "\"5\":{\"i32\":16777216},\"6\":{\"i64\":6000000000},\"7\":{\"dbl\":3.1415926"
-  "535897931},\"8\":{\"str\":\"JSON THIS! \\\"\\u0001\"},\"9\":{\"str\":\"\xd7\\"
-  "n\\u0007\\t\"},\"10\":{\"tf\":0},\"11\":{\"str\":\"AQIDrQ\"},\"12\":{\"lst\""
-  ":[\"i8\",3,1,2,3]},\"13\":{\"lst\":[\"i16\",3,1,2,3]},\"14\":{\"lst\":[\"i64"
-  "\",3,1,2,3]}}");
-
-  const std::string result(apache::thrift::ThriftJSONString(*ooe));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-static std::auto_ptr<Nesting> n;
-
-void testCaseSetup_2() {
-  testCaseSetup_1();
-
-  n.reset(new Nesting);
-  n->my_ooe = *ooe;
-  n->my_ooe.integer16 = 16;
-  n->my_ooe.integer32 = 32;
-  n->my_ooe.integer64 = 64;
-  n->my_ooe.double_precision = (std::sqrt(5.0) + 1) / 2;
-  n->my_ooe.some_characters = ":R (me going \"rrrr\")";
-  n->my_ooe.zomg_unicode     = "\xd3\x80\xe2\x85\xae\xce\x9d\x20\xd0\x9d\xce"
-                               "\xbf\xe2\x85\xbf\xd0\xbe\xc9\xa1\xd0\xb3\xd0"
-                               "\xb0\xcf\x81\xe2\x84\x8e\x20\xce\x91\x74\x74"
-                               "\xce\xb1\xe2\x85\xbd\xce\xba\xc7\x83\xe2\x80"
-                               "\xbc";
-  n->my_bonk.type = 31337;
-  n->my_bonk.message = "I am a bonk... xor!";
-}
-
-BOOST_AUTO_TEST_CASE(test_json_proto_2) {
-  testCaseSetup_2();
-
-  const std::string expected_result(
-    "{\"1\":{\"rec\":{\"1\":{\"i32\":31337},\"2\":{\"str\":\"I am a bonk... xor"
-    "!\"}}},\"2\":{\"rec\":{\"1\":{\"tf\":1},\"2\":{\"tf\":0},\"3\":{\"i8\":127"
-    "},\"4\":{\"i16\":16},\"5\":{\"i32\":32},\"6\":{\"i64\":64},\"7\":{\"dbl\":"
-    "1.6180339887498949},\"8\":{\"str\":\":R (me going \\\"rrrr\\\")\"},\"9\":{"
-    "\"str\":\"ӀⅮΝ Нοⅿоɡгаρℎ Αttαⅽκǃ‼\"},\"10\":{\"tf\":0},\"11\":{\"str\":\""
-    "AQIDrQ\"},\"12\":{\"lst\":[\"i8\",3,1,2,3]},\"13\":{\"lst\":[\"i16\",3,1,2"
-    ",3]},\"14\":{\"lst\":[\"i64\",3,1,2,3]}}}}"
-  );
-
-  const std::string result(apache::thrift::ThriftJSONString(*n));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-static std::auto_ptr<HolyMoley> hm;
-
-void testCaseSetup_3() {
-  testCaseSetup_2();
-
-  hm.reset(new HolyMoley);
-
-  hm->big.push_back(*ooe);
-  hm->big.push_back(n->my_ooe);
-  hm->big[0].a_bite = 0x22;
-  hm->big[1].a_bite = 0x33;
-
-  std::vector<std::string> stage1;
-  stage1.push_back("and a one");
-  stage1.push_back("and a two");
-  hm->contain.insert(stage1);
-  stage1.clear();
-  stage1.push_back("then a one, two");
-  stage1.push_back("three!");
-  stage1.push_back("FOUR!!");
-  hm->contain.insert(stage1);
-  stage1.clear();
-  hm->contain.insert(stage1);
-
-  std::vector<Bonk> stage2;
-  hm->bonks["nothing"] = stage2;
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 1;
-  stage2.back().message = "Wait.";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 2;
-  stage2.back().message = "What?";
-  hm->bonks["something"] = stage2;
-  stage2.clear();
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 3;
-  stage2.back().message = "quoth";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 4;
-  stage2.back().message = "the raven";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 5;
-  stage2.back().message = "nevermore";
-  hm->bonks["poe"] = stage2;
-}
-
-BOOST_AUTO_TEST_CASE(test_json_proto_3) {
-  testCaseSetup_3();
-
-  const std::string expected_result(
-  "{\"1\":{\"lst\":[\"rec\",2,{\"1\":{\"tf\":1},\"2\":{\"tf\":0},\"3\":{\"i8\":"
-  "34},\"4\":{\"i16\":27000},\"5\":{\"i32\":16777216},\"6\":{\"i64\":6000000000"
-  "},\"7\":{\"dbl\":3.1415926535897931},\"8\":{\"str\":\"JSON THIS! \\\"\\u0001"
-  "\"},\"9\":{\"str\":\"\xd7\\n\\u0007\\t\"},\"10\":{\"tf\":0},\"11\":{\"str\":"
-  "\"AQIDrQ\"},\"12\":{\"lst\":[\"i8\",3,1,2,3]},\"13\":{\"lst\":[\"i16\",3,1,2"
-  ",3]},\"14\":{\"lst\":[\"i64\",3,1,2,3]}},{\"1\":{\"tf\":1},\"2\":{\"tf\":0},"
-  "\"3\":{\"i8\":51},\"4\":{\"i16\":16},\"5\":{\"i32\":32},\"6\":{\"i64\":64},"
-  "\"7\":{\"dbl\":1.6180339887498949},\"8\":{\"str\":\":R (me going \\\"rrrr\\\""
-  ")\"},\"9\":{\"str\":\"ӀⅮΝ Нοⅿоɡгаρℎ Αttαⅽκǃ‼\"},\"10\":{\"tf\":0},\"11\":{"
-  "\"str\":\"AQIDrQ\"},\"12\":{\"lst\":[\"i8\",3,1,2,3]},\"13\":{\"lst\":[\"i16"
-  "\",3,1,2,3]},\"14\":{\"lst\":[\"i64\",3,1,2,3]}}]},\"2\":{\"set\":[\"lst\",3"
-  ",[\"str\",0],[\"str\",2,\"and a one\",\"and a two\"],[\"str\",3,\"then a one"
-  ", two\",\"three!\",\"FOUR!!\"]]},\"3\":{\"map\":[\"str\",\"lst\",3,{\"nothin"
-  "g\":[\"rec\",0],\"poe\":[\"rec\",3,{\"1\":{\"i32\":3},\"2\":{\"str\":\"quoth"
-  "\"}},{\"1\":{\"i32\":4},\"2\":{\"str\":\"the raven\"}},{\"1\":{\"i32\":5},\""
-  "2\":{\"str\":\"nevermore\"}}],\"something\":[\"rec\",2,{\"1\":{\"i32\":1},\""
-  "2\":{\"str\":\"Wait.\"}},{\"1\":{\"i32\":2},\"2\":{\"str\":\"What?\"}}]}]}}"
-  );
-
-  const std::string result(apache::thrift::ThriftJSONString(*hm));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_json_proto_4) {
-  testCaseSetup_1();
-
-  boost::shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer());
-  boost::shared_ptr<TJSONProtocol> proto(new TJSONProtocol(buffer));
-
-  ooe->write(proto.get());
-  OneOfEach ooe2;
-  ooe2.read(proto.get());
-
-  BOOST_CHECK(*ooe == ooe2);
-}
-
-BOOST_AUTO_TEST_CASE(test_json_proto_5) {
-  testCaseSetup_3();
-
-  boost::shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer());
-  boost::shared_ptr<TJSONProtocol> proto(new TJSONProtocol(buffer));
-
-  hm->write(proto.get());
-  HolyMoley hm2;
-  hm2.read(proto.get());
-
-  BOOST_CHECK(*hm == hm2);
-
-  hm2.big[0].a_bite = 0x00;
-
-  BOOST_CHECK(*hm != hm2);
-}
-
-BOOST_AUTO_TEST_CASE(test_json_proto_6) {
-  Doubles dub;
-  dub.nan = HUGE_VAL / HUGE_VAL;
-  dub.inf = HUGE_VAL;
-  dub.neginf = -HUGE_VAL;
-  dub.repeating = 10.0 / 3.0;
-  dub.big = 1E+305;
-  dub.tiny = 1E-305;
-  dub.zero = 0.0;
-  dub.negzero = -0.0;
-
-  const std::string expected_result(
-  "{\"1\":{\"dbl\":\"NaN\"},\"2\":{\"dbl\":\"Infinity\"},\"3\":{\"dbl\":\"-Infi"
-  "nity\"},\"4\":{\"dbl\":3.3333333333333335},\"5\":{\"dbl\":9.9999999999999994e+"
-  "304},\"6\":{\"dbl\":1e-305},\"7\":{\"dbl\":0},\"8\":{\"dbl\":-0}}"
-  );
-
-  const std::string result(apache::thrift::ThriftJSONString(dub));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_json_proto_7) {
-  boost::shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer());
-  boost::shared_ptr<TJSONProtocol> proto(new TJSONProtocol(buffer));
-
-  Base64 base;
-  base.a = 123;
-  base.b1 = "1";
-  base.b2 = "12";
-  base.b3 = "123";
-  base.b4 = "1234";
-  base.b5 = "12345";
-  base.b6 = "123456";
-
-  base.write(proto.get());
-  Base64 base2;
-  base2.read(proto.get());
-
-  BOOST_CHECK(base == base2);
-}
-
-BOOST_AUTO_TEST_CASE(test_json_proto_8) {
-  const char* json_string =
-  "{\"1\":{\"tf\":1},\"2\":{\"tf\":0},\"3\":{\"i8\":127},\"4\":{\"i16\":27000},"
-  "\"5\":{\"i32\":16.77216},\"6\":{\"i64\":6000000000},\"7\":{\"dbl\":3.1415926"
-  "535897931},\"8\":{\"str\":\"JSON THIS! \\\"\\u0001\"},\"9\":{\"str\":\"\xd7\\"
-  "n\\u0007\\t\"},\"10\":{\"tf\":0},\"11\":{\"str\":\"AQIDrQ\"},\"12\":{\"lst\""
-  ":[\"i8\",3,1,2,3]},\"13\":{\"lst\":[\"i16\",3,1,2,3]},\"14\":{\"lst\":[\"i64"
-  "\",3,1,2,3]}}";
-
-  boost::shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(
-    (uint8_t*)(json_string), strlen(json_string)*sizeof(char)));
-  boost::shared_ptr<TJSONProtocol> proto(new TJSONProtocol(buffer));
-
-  OneOfEach ooe2;
-
-  BOOST_CHECK_THROW(ooe2.read(proto.get()),
-    apache::thrift::protocol::TProtocolException);
-}
-
-static std::string toHexSequence(const std::string& str) {
-  std::stringstream ss;
-  ss << std::hex << std::setfill('0');
-  for (std::size_t i = 0; i < str.size(); i++) {
-    ss << "\\x" << int(uint8_t(str[i]));
-  }
-  return ss.str();
-}
-
-BOOST_AUTO_TEST_CASE(test_json_unicode_escaped) {
-  const char json_string[] =
-  "{\"1\":{\"tf\":1},\"2\":{\"tf\":0},\"3\":{\"i8\":127},\"4\":{\"i16\":27000},"
-  "\"5\":{\"i32\":16},\"6\":{\"i64\":6000000000},\"7\":{\"dbl\":3.1415926"
-  "535897931},\"8\":{\"str\":\"JSON THIS!\"},\"9\":{\"str\":\"\\u0e01 \\ud835\\udd3e\"},"
-  "\"10\":{\"tf\":0},\"11\":{\"str\":\"000000\"},\"12\":{\"lst\""
-  ":[\"i8\",3,1,2,3]},\"13\":{\"lst\":[\"i16\",3,1,2,3]},\"14\":{\"lst\":[\"i64"
-  "\",3,1,2,3]}}";
-  const char* expected_zomg_unicode = "\xe0\xb8\x81 \xf0\x9d\x94\xbe";
-
-  boost::shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(
-    (uint8_t*)(json_string), sizeof(json_string)));
-  boost::shared_ptr<TJSONProtocol> proto(new TJSONProtocol(buffer));
-
-  OneOfEach ooe2;
-  ooe2.read(proto.get());
-  BOOST_CHECK_MESSAGE(!ooe2.zomg_unicode.compare(expected_zomg_unicode),
-    "Expected:\n" << toHexSequence(expected_zomg_unicode) << "\nGotten:\n"
-                  << toHexSequence(ooe2.zomg_unicode));
-
-}
-
-BOOST_AUTO_TEST_CASE(test_json_unicode_escaped_missing_low_surrogate) {
-  const char json_string[] =
-  "{\"1\":{\"tf\":1},\"2\":{\"tf\":0},\"3\":{\"i8\":127},\"4\":{\"i16\":27000},"
-  "\"5\":{\"i32\":16},\"6\":{\"i64\":6000000000},\"7\":{\"dbl\":3.1415926"
-  "535897931},\"8\":{\"str\":\"JSON THIS!\"},\"9\":{\"str\":\"\\ud835\"},"
-  "\"10\":{\"tf\":0},\"11\":{\"str\":\"000000\"},\"12\":{\"lst\""
-  ":[\"i8\",3,1,2,3]},\"13\":{\"lst\":[\"i16\",3,1,2,3]},\"14\":{\"lst\":[\"i64"
-  "\",3,1,2,3]}}";
-
-  boost::shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(
-    (uint8_t*)(json_string), sizeof(json_string)));
-  boost::shared_ptr<TJSONProtocol> proto(new TJSONProtocol(buffer));
-
-  OneOfEach ooe2;
-  BOOST_CHECK_THROW(ooe2.read(proto.get()),
-    apache::thrift::protocol::TProtocolException);
-}
-
-BOOST_AUTO_TEST_CASE(test_json_unicode_escaped_missing_hi_surrogate) {
-  const char json_string[] =
-  "{\"1\":{\"tf\":1},\"2\":{\"tf\":0},\"3\":{\"i8\":127},\"4\":{\"i16\":27000},"
-  "\"5\":{\"i32\":16},\"6\":{\"i64\":6000000000},\"7\":{\"dbl\":3.1415926"
-  "535897931},\"8\":{\"str\":\"JSON THIS!\"},\"9\":{\"str\":\"\\udd3e\"},"
-  "\"10\":{\"tf\":0},\"11\":{\"str\":\"000000\"},\"12\":{\"lst\""
-  ":[\"i8\",3,1,2,3]},\"13\":{\"lst\":[\"i16\",3,1,2,3]},\"14\":{\"lst\":[\"i64"
-  "\",3,1,2,3]}}";
-
-  boost::shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(
-    (uint8_t*)(json_string), sizeof(json_string)));
-  boost::shared_ptr<TJSONProtocol> proto(new TJSONProtocol(buffer));
-
-  OneOfEach ooe2;
-  BOOST_CHECK_THROW(ooe2.read(proto.get()),
-    apache::thrift::protocol::TProtocolException);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/cpp/test/Makefile.am
deleted file mode 100755
index 6f46117..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/Makefile.am
+++ /dev/null
@@ -1,374 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = subdir-objects serial-tests
-
-BUILT_SOURCES = gen-cpp/DebugProtoTest_types.h \
-                gen-cpp/EnumTest_types.h \
-                gen-cpp/OptionalRequiredTest_types.h \
-                gen-cpp/Recursive_types.h \
-                gen-cpp/ThriftTest_types.h \
-                gen-cpp/TypedefTest_types.h \
-                gen-cpp/ChildService.h \
-                gen-cpp/EmptyService.h \
-                gen-cpp/ParentService.h \
-                gen-cpp/proc_types.h
-
-noinst_LTLIBRARIES = libtestgencpp.la libprocessortest.la
-nodist_libtestgencpp_la_SOURCES = \
-	gen-cpp/DebugProtoTest_types.cpp \
-	gen-cpp/DebugProtoTest_types.h \
-	gen-cpp/EnumTest_types.cpp \
-	gen-cpp/EnumTest_types.h \
-	gen-cpp/OptionalRequiredTest_types.cpp \
-	gen-cpp/OptionalRequiredTest_types.h \
-	gen-cpp/Recursive_types.cpp \
-	gen-cpp/Recursive_types.h \
-	gen-cpp/ThriftTest_types.cpp \
-	gen-cpp/ThriftTest_types.h \
-	gen-cpp/ThriftTest_constants.cpp \
-	gen-cpp/ThriftTest_constants.h \
-	gen-cpp/TypedefTest_types.cpp \
-	gen-cpp/TypedefTest_types.h \
-	ThriftTest_extras.cpp \
-	DebugProtoTest_extras.cpp
-
-nodist_libprocessortest_la_SOURCES = \
-	gen-cpp/ChildService.cpp \
-	gen-cpp/ChildService.h \
-	gen-cpp/EmptyService.cpp \
-	gen-cpp/EmptyService.h \
-	gen-cpp/ParentService.cpp \
-	gen-cpp/ParentService.h \
-	gen-cpp/proc_types.cpp \
-	gen-cpp/proc_types.h
-
-ThriftTest_extras.o: gen-cpp/ThriftTest_types.h
-DebugProtoTest_extras.o: gen-cpp/DebugProtoTest_types.h
-
-libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
-
-noinst_PROGRAMS = Benchmark \
-	concurrency_test
-
-Benchmark_SOURCES = \
-	Benchmark.cpp
-
-Benchmark_LDADD = libtestgencpp.la
-
-check_PROGRAMS = \
-	UnitTests \
-	TFDTransportTest \
-	TPipedTransportTest \
-	DebugProtoTest \
-	JSONProtoTest \
-	OptionalRequiredTest \
-	RecursiveTest \
-	SpecializationTest \
-	AllProtocolsTest \
-	TransportTest \
-	TInterruptTest \
-	TServerIntegrationTest \
-	SecurityTest \
-	ZlibTest \
-	TFileTransportTest \
-	link_test \
-	OpenSSLManualInitTest \
-	EnumTest
-
-if AMX_HAVE_LIBEVENT
-noinst_PROGRAMS += \
-	processor_test
-check_PROGRAMS += \
-	TNonblockingServerTest
-endif
-
-TESTS_ENVIRONMENT= \
-	BOOST_TEST_LOG_SINK=tests.xml \
-	BOOST_TEST_LOG_LEVEL=test_suite \
-	BOOST_TEST_LOG_FORMAT=XML
-
-TESTS = \
-	$(check_PROGRAMS)
-
-UnitTests_SOURCES = \
-	UnitTestMain.cpp \
-	TMemoryBufferTest.cpp \
-	TBufferBaseTest.cpp \
-	Base64Test.cpp \
-	ToStringTest.cpp \
-	TypedefTest.cpp \
-	TServerSocketTest.cpp \
-	TServerTransportTest.cpp \
-	TTransportCheckThrow.h
-
-if !WITH_BOOSTTHREADS
-UnitTests_SOURCES += \
-    RWMutexStarveTest.cpp
-endif
-
-UnitTests_LDADD = \
-  libtestgencpp.la \
-  $(BOOST_TEST_LDADD)
-
-TInterruptTest_SOURCES = \
-	TSocketInterruptTest.cpp \
-	TSSLSocketInterruptTest.cpp
-
-TInterruptTest_LDADD = \
-  libtestgencpp.la \
-  $(BOOST_TEST_LDADD) \
-  $(BOOST_FILESYSTEM_LDADD) \
-  $(BOOST_CHRONO_LDADD) \
-  $(BOOST_SYSTEM_LDADD) \
-  $(BOOST_THREAD_LDADD)
-
-TServerIntegrationTest_SOURCES = \
-	TServerIntegrationTest.cpp
-
-TServerIntegrationTest_LDADD = \
-  libtestgencpp.la \
-  libprocessortest.la \
-  $(BOOST_TEST_LDADD) \
-  $(BOOST_SYSTEM_LDADD) \
-  $(BOOST_THREAD_LDADD)
-
-SecurityTest_SOURCES = \
-	SecurityTest.cpp
-
-SecurityTest_LDADD = \
-  libtestgencpp.la \
-  libprocessortest.la \
-  $(BOOST_TEST_LDADD) \
-  $(BOOST_FILESYSTEM_LDADD) \
-  $(BOOST_SYSTEM_LDADD) \
-  $(BOOST_THREAD_LDADD)
-
-TransportTest_SOURCES = \
-	TransportTest.cpp
-
-TransportTest_LDADD = \
-  libtestgencpp.la \
-  $(top_builddir)/lib/cpp/libthriftz.la \
-  $(BOOST_TEST_LDADD) \
-  -lz
-
-ZlibTest_SOURCES = \
-	ZlibTest.cpp
-
-ZlibTest_LDADD = \
-  libtestgencpp.la \
-  $(top_builddir)/lib/cpp/libthriftz.la \
-  $(BOOST_TEST_LDADD) \
-  -lz
-
-EnumTest_SOURCES = \
-  EnumTest.cpp
-
-EnumTest_LDADD = \
-  libtestgencpp.la \
-  $(BOOST_TEST_LDADD)
-
-TFileTransportTest_SOURCES = \
-	TFileTransportTest.cpp
-
-TFileTransportTest_LDADD = \
-  libtestgencpp.la \
-  $(BOOST_TEST_LDADD)
-
-#
-# TFDTransportTest
-#
-TFDTransportTest_SOURCES = \
-	TFDTransportTest.cpp
-
-TFDTransportTest_LDADD =  \
-	$(top_builddir)/lib/cpp/libthrift.la \
-	$(BOOST_TEST_LDADD)
-
-
-#
-# TPipedTransportTest
-#
-TPipedTransportTest_SOURCES = \
-	TPipedTransportTest.cpp \
-	TPipeInterruptTest.cpp
-
-TPipedTransportTest_LDADD = \
-	libtestgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la \
-	$(BOOST_TEST_LDADD) \
-	$(BOOST_SYSTEM_LDADD) \
-	$(BOOST_THREAD_LDADD)
-
-#
-# AllProtocolsTest
-#
-AllProtocolsTest_SOURCES = \
-	AllProtocolTests.cpp \
-	AllProtocolTests.tcc \
-	GenericHelpers.h
-
-AllProtocolsTest_LDADD = \
-  libtestgencpp.la \
-  $(BOOST_TEST_LDADD)
-
-#
-# DebugProtoTest
-#
-DebugProtoTest_SOURCES = \
-	DebugProtoTest.cpp
-
-DebugProtoTest_LDADD = \
-	libtestgencpp.la \
-	$(BOOST_TEST_LDADD)
-
-
-#
-# JSONProtoTest
-#
-JSONProtoTest_SOURCES = \
-	JSONProtoTest.cpp
-
-JSONProtoTest_LDADD = \
-	libtestgencpp.la \
-	$(BOOST_TEST_LDADD)
-
-#
-# TNonblockingServerTest
-#
-TNonblockingServerTest_SOURCES = TNonblockingServerTest.cpp
-
-TNonblockingServerTest_LDADD = libprocessortest.la \
-                               $(top_builddir)/lib/cpp/libthrift.la \
-                               $(top_builddir)/lib/cpp/libthriftnb.la \
-                               $(BOOST_TEST_LDADD) \
-                               $(BOOST_LDFLAGS) \
-                               $(LIBEVENT_LIBS)
-
-#
-# OptionalRequiredTest
-#
-OptionalRequiredTest_SOURCES = \
-	OptionalRequiredTest.cpp
-
-OptionalRequiredTest_LDADD = \
-	libtestgencpp.la \
-	$(BOOST_TEST_LDADD)
-
-#
-# OptionalRequiredTest
-#
-RecursiveTest_SOURCES = \
-	RecursiveTest.cpp
-
-RecursiveTest_LDADD = \
-	libtestgencpp.la \
-	$(BOOST_TEST_LDADD)
-
-#
-# SpecializationTest
-#
-SpecializationTest_SOURCES = \
-	SpecializationTest.cpp
-
-SpecializationTest_LDADD = \
-	libtestgencpp.la \
-	$(BOOST_TEST_LDADD)
-
-concurrency_test_SOURCES = \
-	concurrency/Tests.cpp \
-	concurrency/ThreadFactoryTests.h \
-	concurrency/ThreadManagerTests.h \
-	concurrency/TimerManagerTests.h
-
-concurrency_test_LDADD = \
-  $(top_builddir)/lib/cpp/libthrift.la
-
-link_test_SOURCES = \
-  link/LinkTest.cpp \
-  link/TemplatedService1.cpp \
-  link/TemplatedService2.cpp
-
-processor_test_SOURCES = \
-	processor/ProcessorTest.cpp \
-	processor/EventLog.cpp \
-	processor/ServerThread.cpp \
-	processor/EventLog.h \
-	processor/Handlers.h \
-	processor/ServerThread.h
-
-processor_test_LDADD = libprocessortest.la \
-                       $(top_builddir)/lib/cpp/libthrift.la \
-                       $(top_builddir)/lib/cpp/libthriftnb.la \
-                       $(BOOST_TEST_LDADD) \
-                       $(BOOST_LDFLAGS) \
-                       $(LIBEVENT_LIBS)
-
-OpenSSLManualInitTest_SOURCES = \
-	OpenSSLManualInitTest.cpp
-
-OpenSSLManualInitTest_LDADD = \
-	$(top_builddir)/lib/cpp/libthrift.la \
-	$(BOOST_TEST_LDADD) \
-	$(OPENSSL_LDFLAGS) \
-	$(OPENSSL_LIBS)
-
-#
-# Common thrift code generation rules
-#
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-cpp/DebugProtoTest_types.cpp gen-cpp/DebugProtoTest_types.h gen-cpp/EmptyService.cpp gen-cpp/EmptyService.h: $(top_srcdir)/test/DebugProtoTest.thrift
-	$(THRIFT) --gen cpp $<
-
-gen-cpp/EnumTest_types.cpp gen-cpp/EnumTest_types.h: $(top_srcdir)/test/EnumTest.thrift
-	$(THRIFT) --gen cpp $<
-
-gen-cpp/TypedefTest_types.cpp gen-cpp/TypedefTest_types.h: $(top_srcdir)/test/TypedefTest.thrift
-	$(THRIFT) --gen cpp $<
-
-gen-cpp/OptionalRequiredTest_types.cpp gen-cpp/OptionalRequiredTest_types.h: $(top_srcdir)/test/OptionalRequiredTest.thrift
-	$(THRIFT) --gen cpp $<
-
-gen-cpp/Recursive_types.cpp gen-cpp/Recursive_types.h: $(top_srcdir)/test/Recursive.thrift
-	$(THRIFT) --gen cpp $<
-
-gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: $(top_srcdir)/test/StressTest.thrift
-	$(THRIFT) --gen cpp $<
-
-gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_types.h: $(top_srcdir)/test/ThriftTest.thrift
-	$(THRIFT) --gen cpp $<
-
-gen-cpp/ChildService.cpp gen-cpp/ChildService.h gen-cpp/ParentService.cpp gen-cpp/ParentService.h gen-cpp/proc_types.cpp gen-cpp/proc_types.h: processor/proc.thrift
-	$(THRIFT) --gen cpp:templates,cob_style $<
-
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -D__STDC_LIMIT_MACROS -I.
-AM_LDFLAGS = $(BOOST_LDFLAGS)
-AM_CXXFLAGS = -Wall -Wextra -pedantic
-
-clean-local:
-	$(RM) gen-cpp/*
-
-EXTRA_DIST = \
-	concurrency \
-	processor \
-	qt \
-	CMakeLists.txt \
-	DebugProtoTest_extras.cpp \
-	ThriftTest_extras.cpp
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/OpenSSLManualInitTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/OpenSSLManualInitTest.cpp
deleted file mode 100644
index 5cd5e48..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/OpenSSLManualInitTest.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// To show that this test actually tests something, you can change
-// MANUAL_OPENSSL_INIT to 0 to cause automatic OpenSSL init/cleanup,
-// which will cause the test to fail
-#define MANUAL_OPENSSL_INIT 1
-#ifdef _WIN32
-#include <WinSock2.h>
-#endif
-
-#include <boost/test/unit_test.hpp>
-#include <openssl/evp.h>
-#include <thrift/transport/TSSLSocket.h>
-
-using namespace std;
-using namespace apache::thrift::transport;
-
-void make_isolated_sslsocketfactory() {
-  // Here we create an isolated TSSLSocketFactory to ensure the
-  // constructor and destructor of TSSLSocketFactory get run.  Thus
-  // without manual initialization normally OpenSSL would be
-  // uninitialized after this function.
-  TSSLSocketFactory factory;
-}
-
-void openssl_init() {
-#if MANUAL_OPENSSL_INIT
-  TSSLSocketFactory::setManualOpenSSLInitialization(true);
-  initializeOpenSSL();
-#endif
-}
-
-void openssl_cleanup() {
-#if MANUAL_OPENSSL_INIT
-  cleanupOpenSSL();
-#endif
-}
-
-void test_openssl_availability() {
-  // Check whether Thrift leaves OpenSSL functionality available after
-  // the last TSSLSocketFactory is destroyed when manual
-  // initialization is set
-  openssl_init();
-  make_isolated_sslsocketfactory();
-
-  // The following function is one that will fail if OpenSSL is
-  // uninitialized.  It might also fail on very old versions of
-  // OpenSSL...
-  const EVP_MD* md = EVP_get_digestbyname("SHA256");
-  BOOST_CHECK(md != NULL);
-  openssl_cleanup();
-}
-
-#ifdef BOOST_TEST_DYN_LINK
-bool init_unit_test_suite() {
-  boost::unit_test::test_suite* suite = &boost::unit_test::framework::master_test_suite();
-  suite->p_name.value = "OpenSSLManualInit";
-
-  suite->add(BOOST_TEST_CASE(test_openssl_availability));
-
-  return true;
-}
- 
-int main( int argc, char* argv[] ) {
-  return ::boost::unit_test::unit_test_main(&init_unit_test_suite,argc,argv);
-}
-#else
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-  THRIFT_UNUSED_VARIABLE(argc);
-  THRIFT_UNUSED_VARIABLE(argv);
-  boost::unit_test::test_suite* suite = &boost::unit_test::framework::master_test_suite();
-  suite->p_name.value = "OpenSSLManualInit";
-
-  suite->add(BOOST_TEST_CASE(test_openssl_availability));
-
-  return NULL;
-}
-#endif
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/OptionalRequiredTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/OptionalRequiredTest.cpp
deleted file mode 100644
index b0e5ef7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/OptionalRequiredTest.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include <map>
-#include <thrift/protocol/TDebugProtocol.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/transport/TBufferTransports.h>
-#include "gen-cpp/OptionalRequiredTest_types.h"
-
-#define BOOST_TEST_MODULE OptionalRequiredTest
-#include <boost/test/unit_test.hpp>
-
-using namespace thrift::test;
-using namespace apache::thrift;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::protocol;
-
-/*
-template<typename Struct>
-void trywrite(const Struct& s, bool should_work) {
-  bool worked;
-  try {
-    TBinaryProtocol protocol(boost::shared_ptr<TTransport>(new TMemoryBuffer));
-    s.write(&protocol);
-    worked = true;
-  } catch (TProtocolException & ex) {
-    worked = false;
-  }
-  BOOST_CHECK(worked == should_work);
-}
-*/
-
-template <typename Struct1, typename Struct2>
-void write_to_read(const Struct1& w, Struct2& r) {
-  TBinaryProtocol protocol(boost::shared_ptr<TTransport>(new TMemoryBuffer));
-  w.write(&protocol);
-  r.read(&protocol);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_1) {
-  OldSchool o;
-
-  const std::string expected_result(
-    "OldSchool {\n"
-    "  01: im_int (i16) = 0,\n"
-    "  02: im_str (string) = \"\",\n"
-    "  03: im_big (list) = list<map>[0] {\n"
-    "  },\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(o));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_2_1) {
-  Simple s;
-
-  const std::string expected_result(
-    "Simple {\n"
-    "  01: im_default (i16) = 0,\n"
-    "  02: im_required (i16) = 0,\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(s));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_2_2) {
-  Simple s;
-  s.im_optional = 10;
-
-  const std::string expected_result(
-    "Simple {\n"
-    "  01: im_default (i16) = 0,\n"
-    "  02: im_required (i16) = 0,\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(s));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_2_3) {
-  Simple s;
-  s.im_optional = 10;
-  s.__isset.im_optional = true;
-
-  const std::string expected_result(
-    "Simple {\n"
-    "  01: im_default (i16) = 0,\n"
-    "  02: im_required (i16) = 0,\n"
-    "  03: im_optional (i16) = 10,\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(s));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_2_4) {
-  Simple s;
-  s.__isset.im_optional = true;
-
-  const std::string expected_result(
-    "Simple {\n"
-    "  01: im_default (i16) = 0,\n"
-    "  02: im_required (i16) = 0,\n"
-    "  03: im_optional (i16) = 0,\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(s));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_2_5) {
-  Simple s;
-  s.__isset.im_optional = true;
-  s.im_optional = 10;
-
-  const std::string expected_result(
-    "Simple {\n"
-    "  01: im_default (i16) = 0,\n"
-    "  02: im_required (i16) = 0,\n"
-    "  03: im_optional (i16) = 10,\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(s));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_3) {
-  // assign/copy-construct with non-required fields
-
-  Simple s1, s2;
-  s1.__isset.im_default = true;
-  s1.__set_im_optional(10);
-  BOOST_CHECK(s1.__isset.im_default);
-  BOOST_CHECK(s1.__isset.im_optional);
-
-  s2 = s1;
-
-  BOOST_CHECK(s2.__isset.im_default);
-  BOOST_CHECK(s2.__isset.im_optional);
-
-  Simple s3(s1);
-
-  BOOST_CHECK(s3.__isset.im_default);
-  BOOST_CHECK(s3.__isset.im_optional);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_4) {
-  // Write-to-read with optional fields.
-
-  Simple s1, s2, s3;
-  s1.im_optional = 10;
-  BOOST_CHECK(!s1.__isset.im_default);
-  // BOOST_CHECK(!s1.__isset.im_required);  // Compile error.
-  BOOST_CHECK(!s1.__isset.im_optional);
-
-  write_to_read(s1, s2);
-
-  BOOST_CHECK(s2.__isset.im_default);
-  // BOOST_CHECK( s2.__isset.im_required);  // Compile error.
-  BOOST_CHECK(!s2.__isset.im_optional);
-  BOOST_CHECK(s3.im_optional == 0);
-
-  s1.__isset.im_optional = true;
-  write_to_read(s1, s3);
-
-  BOOST_CHECK(s3.__isset.im_default);
-  // BOOST_CHECK( s3.__isset.im_required);  // Compile error.
-  BOOST_CHECK(s3.__isset.im_optional);
-  BOOST_CHECK(s3.im_optional == 10);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_5) {
-  // Writing between optional and default.
-
-  Tricky1 t1;
-  Tricky2 t2;
-
-  t2.im_optional = 10;
-  write_to_read(t2, t1);
-  write_to_read(t1, t2);
-  BOOST_CHECK(!t1.__isset.im_default);
-  BOOST_CHECK(t2.__isset.im_optional);
-  BOOST_CHECK(t1.im_default == t2.im_optional);
-  BOOST_CHECK(t1.im_default == 0);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_6) {
-  // Writing between default and required.
-
-  Tricky1 t1;
-  Tricky3 t3;
-  write_to_read(t1, t3);
-  write_to_read(t3, t1);
-  BOOST_CHECK(t1.__isset.im_default);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_7) {
-  // Writing between optional and required.
-
-  Tricky2 t2;
-  Tricky3 t3;
-  t2.__isset.im_optional = true;
-  write_to_read(t2, t3);
-  write_to_read(t3, t2);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_8) {
-  // Mu-hu-ha-ha-ha!
-
-  Tricky2 t2;
-  Tricky3 t3;
-  try {
-    write_to_read(t2, t3);
-    abort();
-  } catch (const TProtocolException&) {
-  }
-
-  write_to_read(t3, t2);
-  BOOST_CHECK(t2.__isset.im_optional);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_9) {
-  Complex c;
-
-  const std::string expected_result(
-    "Complex {\n"
-    "  01: cp_default (i16) = 0,\n"
-    "  02: cp_required (i16) = 0,\n"
-    "  04: the_map (map) = map<i16,struct>[0] {\n"
-    "  },\n"
-    "  05: req_simp (struct) = Simple {\n"
-    "    01: im_default (i16) = 0,\n"
-    "    02: im_required (i16) = 0,\n"
-    "  },\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(c));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_10) {
-  Tricky1 t1;
-  Tricky2 t2;
-  // Compile error.
-  //(void)(t1 == t2);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_11) {
-  OldSchool o1, o2, o3;
-  BOOST_CHECK(o1 == o2);
-  o1.im_int = o2.im_int = 10;
-  BOOST_CHECK(o1 == o2);
-  o1.__isset.im_int = true;
-  o2.__isset.im_int = false;
-  BOOST_CHECK(o1 == o2);
-  o1.im_int = 20;
-  o1.__isset.im_int = false;
-  BOOST_CHECK(o1 != o2);
-  o1.im_int = 10;
-  BOOST_CHECK(o1 == o2);
-  o1.im_str = o2.im_str = "foo";
-  BOOST_CHECK(o1 == o2);
-  o1.__isset.im_str = o2.__isset.im_str = true;
-  BOOST_CHECK(o1 == o2);
-  std::map<int32_t, std::string> mymap;
-  mymap[1] = "bar";
-  mymap[2] = "baz";
-  o1.im_big.push_back(std::map<int32_t, std::string>());
-  BOOST_CHECK(o1 != o2);
-  o2.im_big.push_back(std::map<int32_t, std::string>());
-  BOOST_CHECK(o1 == o2);
-  o2.im_big.push_back(mymap);
-  BOOST_CHECK(o1 != o2);
-  o1.im_big.push_back(mymap);
-  BOOST_CHECK(o1 == o2);
-
-  TBinaryProtocol protocol(boost::shared_ptr<TTransport>(new TMemoryBuffer));
-  o1.write(&protocol);
-
-  o1.im_big.push_back(mymap);
-  mymap[3] = "qux";
-  o2.im_big.push_back(mymap);
-  BOOST_CHECK(o1 != o2);
-  o1.im_big.back()[3] = "qux";
-  BOOST_CHECK(o1 == o2);
-  
-  o3.read(&protocol);
-  o3.im_big.push_back(mymap);
-  BOOST_CHECK(o1 == o3);
-
-  const std::string expected_result(
-    "OldSchool {\n"
-    "  01: im_int (i16) = 10,\n"
-    "  02: im_str (string) = \"foo\",\n"
-    "  03: im_big (list) = list<map>[3] {\n"
-    "    [0] = map<i32,string>[0] {\n"
-    "    },\n"
-    "    [1] = map<i32,string>[2] {\n"
-    "      1 -> \"bar\",\n"
-    "      2 -> \"baz\",\n"
-    "    },\n"
-    "    [2] = map<i32,string>[3] {\n"
-    "      1 -> \"bar\",\n"
-    "      2 -> \"baz\",\n"
-    "      3 -> \"qux\",\n"
-    "    },\n"
-    "  },\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(o3));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_12) {
-  Tricky2 t1, t2;
-  BOOST_CHECK(t1.__isset.im_optional == false);
-  BOOST_CHECK(t2.__isset.im_optional == false);
-  BOOST_CHECK(t1 == t2);
-  t1.im_optional = 5;
-  BOOST_CHECK(t1 == t2);
-  t2.im_optional = 5;
-  BOOST_CHECK(t1 == t2);
-  t1.__isset.im_optional = true;
-  BOOST_CHECK(t1 != t2);
-  t2.__isset.im_optional = true;
-  BOOST_CHECK(t1 == t2);
-  t1.im_optional = 10;
-  BOOST_CHECK(t1 != t2);
-  t2.__isset.im_optional = false;
-  BOOST_CHECK(t1 != t2);
-}
-
-BOOST_AUTO_TEST_CASE(test_optional_required_13) {
-  OptionalDefault t1, t2;
-
-  BOOST_CHECK(t1.__isset.opt_int == true);
-  BOOST_CHECK(t1.__isset.opt_str == true);
-  BOOST_CHECK(t1.opt_int == t2.opt_int);
-  BOOST_CHECK(t1.opt_str == t2.opt_str);
-
-  write_to_read(t1, t2);
-  BOOST_CHECK(t2.__isset.opt_int == true);
-  BOOST_CHECK(t2.__isset.opt_str == true);
-  BOOST_CHECK(t1.opt_int == t2.opt_int);
-  BOOST_CHECK(t1.opt_str == t2.opt_str);
-
-  const std::string expected_result(
-    "OptionalDefault {\n"
-    "  01: opt_int (i16) = 1234,\n"
-    "  02: opt_str (string) = \"default\",\n"
-    "}");
-  const std::string result(apache::thrift::ThriftDebugString(t2));
-
-  BOOST_CHECK_MESSAGE(!expected_result.compare(result),
-    "Expected:\n" << expected_result << "\nGotten:\n" << result);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/RWMutexStarveTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/RWMutexStarveTest.cpp
deleted file mode 100644
index 32c1531..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/RWMutexStarveTest.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <iostream>
-#include <unistd.h>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include "thrift/concurrency/Mutex.h"
-#include "thrift/concurrency/PosixThreadFactory.h"
-
-using boost::shared_ptr;
-using boost::unit_test::test_suite;
-using boost::unit_test::framework::master_test_suite;
-
-using namespace apache::thrift::concurrency;
-using namespace std;
-
-class Locker : public Runnable {
-protected:
-  Locker(boost::shared_ptr<ReadWriteMutex> rwlock, bool writer)
-    : rwlock_(rwlock), writer_(writer), started_(false), gotLock_(false), signaled_(false) {}
-
-public:
-  virtual void run() {
-    started_ = true;
-    if (writer_) {
-      rwlock_->acquireWrite();
-    } else {
-      rwlock_->acquireRead();
-    }
-    gotLock_ = true;
-    while (!signaled_) {
-      usleep(5000);
-    }
-    rwlock_->release();
-  }
-
-  bool started() const { return started_; }
-  bool gotLock() const { return gotLock_; }
-  void signal() { signaled_ = true; }
-
-protected:
-  boost::shared_ptr<ReadWriteMutex> rwlock_;
-  bool writer_;
-  volatile bool started_;
-  volatile bool gotLock_;
-  volatile bool signaled_;
-};
-
-class Reader : public Locker {
-public:
-  Reader(boost::shared_ptr<ReadWriteMutex> rwlock) : Locker(rwlock, false) {}
-};
-
-class Writer : public Locker {
-public:
-  Writer(boost::shared_ptr<ReadWriteMutex> rwlock) : Locker(rwlock, true) {}
-};
-
-void test_starve(PosixThreadFactory::POLICY policy) {
-  // the man pages for pthread_wrlock_rdlock suggest that any OS guarantee about
-  // writer starvation may be influenced by the scheduling policy, so let's try
-  // all 3 policies to see if any of them work.
-  PosixThreadFactory factory(policy);
-  factory.setDetached(false);
-
-  boost::shared_ptr<ReadWriteMutex> rwlock(new NoStarveReadWriteMutex());
-
-  boost::shared_ptr<Reader> reader1(new Reader(rwlock));
-  boost::shared_ptr<Reader> reader2(new Reader(rwlock));
-  boost::shared_ptr<Writer> writer(new Writer(rwlock));
-
-  boost::shared_ptr<Thread> treader1 = factory.newThread(reader1);
-  boost::shared_ptr<Thread> treader2 = factory.newThread(reader2);
-  boost::shared_ptr<Thread> twriter = factory.newThread(writer);
-
-  // launch a reader and make sure he has the lock
-  treader1->start();
-  while (!reader1->gotLock()) {
-    usleep(2000);
-  }
-
-  // launch a writer and make sure he's blocked on the lock
-  twriter->start();
-  while (!writer->started()) {
-    usleep(2000);
-  }
-  // tricky part... we can never be 100% sure that the writer is actually
-  // blocked on the lock, but we can pretty reasonably sure because we know
-  // he just executed the line immediately before getting the lock, and
-  // we'll wait a full second for him to get on it.
-  sleep(1);
-
-  // launch a second reader... if the RWMutex guarantees that writers won't
-  // starve, this reader should not be able to acquire the lock until the writer
-  // has acquired and released it.
-  treader2->start();
-  while (!reader2->started()) {
-    usleep(2000);
-  }
-  // again... can't be 100% sure the reader is waiting on (or has) the lock
-  // but we can be close.
-  sleep(1);
-
-  // tell reader 1 to let go of the lock
-  reader1->signal();
-
-  // wait for someone to get the lock
-  while (!reader2->gotLock() && !writer->gotLock()) {
-    usleep(2000);
-  }
-
-  // the test succeeded if the WRITER got the lock.
-  bool success = writer->gotLock();
-
-  // tell everyone we're done and wait for them to finish
-  reader2->signal();
-  writer->signal();
-  treader1->join();
-  treader2->join();
-  twriter->join();
-
-  // make sure it worked.
-  BOOST_CHECK_MESSAGE(success, "writer is starving");
-}
-
-BOOST_AUTO_TEST_SUITE(RWMutexStarveTest)
-
-BOOST_AUTO_TEST_CASE(test_starve_other) {
-  test_starve(PosixThreadFactory::OTHER);
-}
-
-BOOST_AUTO_TEST_CASE(test_starve_rr) {
-  test_starve(PosixThreadFactory::ROUND_ROBIN);
-}
-
-BOOST_AUTO_TEST_CASE(test_starve_fifo) {
-  test_starve(PosixThreadFactory::FIFO);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/RecursiveTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/RecursiveTest.cpp
deleted file mode 100644
index e3e3f50..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/RecursiveTest.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-#include "gen-cpp/Recursive_types.h"
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-
-#define BOOST_TEST_MODULE RecursiveTest
-#include <boost/test/unit_test.hpp>
-
-using apache::thrift::transport::TMemoryBuffer;
-using apache::thrift::protocol::TBinaryProtocol;
-using boost::shared_ptr;
-
-BOOST_AUTO_TEST_CASE(test_recursive_1) {
-  shared_ptr<TMemoryBuffer> buf(new TMemoryBuffer());
-  shared_ptr<TBinaryProtocol> prot(new TBinaryProtocol(buf));
-  
-  RecTree tree;
-  RecTree child;
-  tree.children.push_back(child);
-
-  tree.write(prot.get());
-
-  RecTree result;
-  result.read(prot.get());
-  BOOST_CHECK(tree == result);
-}
-
-BOOST_AUTO_TEST_CASE(test_recursive_2) {
-  shared_ptr<TMemoryBuffer> buf(new TMemoryBuffer());
-  shared_ptr<TBinaryProtocol> prot(new TBinaryProtocol(buf));
-  
-  RecList l;
-  boost::shared_ptr<RecList> l2(new RecList);
-  l.nextitem = l2;
-
-  l.write(prot.get());
-
-  RecList resultlist;
-  resultlist.read(prot.get());
-  BOOST_CHECK(resultlist.nextitem != NULL);
-  BOOST_CHECK(resultlist.nextitem->nextitem == NULL);
-}
-
-BOOST_AUTO_TEST_CASE(test_recursive_3) {
-  shared_ptr<TMemoryBuffer> buf(new TMemoryBuffer());
-  shared_ptr<TBinaryProtocol> prot(new TBinaryProtocol(buf));
-
-  CoRec c;
-  boost::shared_ptr<CoRec2> r(new CoRec2);
-  c.other = r;
-
-  c.write(prot.get());
-
-  c.read(prot.get());
-  BOOST_CHECK(c.other != NULL);
-  BOOST_CHECK(c.other->other.other == NULL);
-}
-
-BOOST_AUTO_TEST_CASE(test_recursive_4) {
-  shared_ptr<TMemoryBuffer> buf(new TMemoryBuffer());
-  shared_ptr<TBinaryProtocol> prot(new TBinaryProtocol(buf));
-
-  boost::shared_ptr<RecList> depthLimit(new RecList);
-  depthLimit->nextitem = depthLimit;
-  BOOST_CHECK_THROW(depthLimit->write(prot.get()),
-    apache::thrift::protocol::TProtocolException);
-
-  depthLimit->nextitem.reset();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/SecurityTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/SecurityTest.cpp
deleted file mode 100644
index 23650d6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/SecurityTest.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define BOOST_TEST_MODULE SecurityTest
-#include <boost/test/unit_test.hpp>
-#include <boost/bind.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-#include <thrift/transport/TSSLServerSocket.h>
-#include <thrift/transport/TSSLSocket.h>
-#include <thrift/transport/TTransport.h>
-#include <vector>
-#ifdef __linux__
-#include <signal.h>
-#endif
-
-using apache::thrift::transport::TSSLServerSocket;
-using apache::thrift::transport::TServerTransport;
-using apache::thrift::transport::TSSLSocket;
-using apache::thrift::transport::TSSLSocketFactory;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TTransportFactory;
-
-boost::filesystem::path keyDir;
-boost::filesystem::path certFile(const std::string& filename)
-{
-    return keyDir / filename;
-}
-boost::mutex gMutex;
-
-struct GlobalFixture
-{
-    GlobalFixture()
-    {
-        using namespace boost::unit_test::framework;
-		for (int i = 0; i < master_test_suite().argc; ++i)
-		{
-			BOOST_TEST_MESSAGE(boost::format("argv[%1%] = \"%2%\"") % i % master_test_suite().argv[i]);
-		}
-
-    #ifdef __linux__
-		// OpenSSL calls send() without MSG_NOSIGPIPE so writing to a socket that has
-		// disconnected can cause a SIGPIPE signal...
-		signal(SIGPIPE, SIG_IGN);
-    #endif
-
-		TSSLSocketFactory::setManualOpenSSLInitialization(true);
-		apache::thrift::transport::initializeOpenSSL();
-
-		keyDir = boost::filesystem::current_path().parent_path().parent_path().parent_path() / "test" / "keys";
-		if (!boost::filesystem::exists(certFile("server.crt")))
-		{
-			keyDir = boost::filesystem::path(master_test_suite().argv[master_test_suite().argc - 1]);
-			if (!boost::filesystem::exists(certFile("server.crt")))
-			{
-				throw std::invalid_argument("The last argument to this test must be the directory containing the test certificate(s).");
-			}
-		}
-    }
-
-    virtual ~GlobalFixture()
-    {
-		apache::thrift::transport::cleanupOpenSSL();
-#ifdef __linux__
-		signal(SIGPIPE, SIG_DFL);
-#endif
-    }
-};
-
-#if (BOOST_VERSION >= 105900)
-BOOST_GLOBAL_FIXTURE(GlobalFixture);
-#else
-BOOST_GLOBAL_FIXTURE(GlobalFixture)
-#endif
-
-struct SecurityFixture
-{
-    void server(apache::thrift::transport::SSLProtocol protocol)
-    {
-        try
-        {
-            boost::mutex::scoped_lock lock(mMutex);
-
-            boost::shared_ptr<TSSLSocketFactory> pServerSocketFactory;
-            boost::shared_ptr<TSSLServerSocket> pServerSocket;
-
-            pServerSocketFactory.reset(new TSSLSocketFactory(static_cast<apache::thrift::transport::SSLProtocol>(protocol)));
-            pServerSocketFactory->ciphers("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
-            pServerSocketFactory->loadCertificate(certFile("server.crt").string().c_str());
-            pServerSocketFactory->loadPrivateKey(certFile("server.key").string().c_str());
-            pServerSocketFactory->server(true);
-            pServerSocket.reset(new TSSLServerSocket("localhost", 0, pServerSocketFactory));
-            boost::shared_ptr<TTransport> connectedClient;
-
-            try
-            {
-                pServerSocket->listen();
-                mPort = pServerSocket->getPort();
-                mCVar.notify_one();
-                lock.unlock();
-
-                connectedClient = pServerSocket->accept();
-                uint8_t buf[2];
-                buf[0] = 'O';
-                buf[1] = 'K';
-                connectedClient->write(&buf[0], 2);
-                connectedClient->flush();
-            }
-
-            catch (apache::thrift::transport::TTransportException& ex)
-            {
-                boost::mutex::scoped_lock lock(gMutex);
-                BOOST_TEST_MESSAGE(boost::format("SRV %1% Exception: %2%") % boost::this_thread::get_id() % ex.what());
-            }
-
-            if (connectedClient)
-            {
-                connectedClient->close();
-                connectedClient.reset();
-            }
-
-            pServerSocket->close();
-            pServerSocket.reset();
-        }
-        catch (std::exception& ex)
-        {
-            BOOST_FAIL(boost::format("%1%: %2%") % typeid(ex).name() % ex.what());
-        }
-    }
-
-    void client(apache::thrift::transport::SSLProtocol protocol)
-    {
-        try
-        {
-            boost::shared_ptr<TSSLSocketFactory> pClientSocketFactory;
-            boost::shared_ptr<TSSLSocket> pClientSocket;
-
-            try
-            {
-                pClientSocketFactory.reset(new TSSLSocketFactory(static_cast<apache::thrift::transport::SSLProtocol>(protocol)));
-                pClientSocketFactory->authenticate(true);
-                pClientSocketFactory->loadCertificate(certFile("client.crt").string().c_str());
-                pClientSocketFactory->loadPrivateKey(certFile("client.key").string().c_str());
-                pClientSocketFactory->loadTrustedCertificates(certFile("CA.pem").string().c_str());
-                pClientSocket = pClientSocketFactory->createSocket("localhost", mPort);
-                pClientSocket->open();
-
-                uint8_t buf[3];
-                buf[0] = 0;
-                buf[1] = 0;
-                BOOST_CHECK_EQUAL(2, pClientSocket->read(&buf[0], 2));
-                BOOST_CHECK_EQUAL(0, memcmp(&buf[0], "OK", 2));
-                mConnected = true;
-            }
-            catch (apache::thrift::transport::TTransportException& ex)
-            {
-                boost::mutex::scoped_lock lock(gMutex);
-                BOOST_TEST_MESSAGE(boost::format("CLI %1% Exception: %2%") % boost::this_thread::get_id() % ex.what());
-            }
-
-            if (pClientSocket)
-            {
-                pClientSocket->close();
-                pClientSocket.reset();
-            }
-        }
-        catch (std::exception& ex)
-        {
-            BOOST_FAIL(boost::format("%1%: %2%") % typeid(ex).name() % ex.what());
-        }
-    }
-
-    static const char *protocol2str(size_t protocol)
-    {
-        static const char *strings[apache::thrift::transport::LATEST + 1] =
-        {
-                "SSLTLS",
-                "SSLv2",
-                "SSLv3",
-                "TLSv1_0",
-                "TLSv1_1",
-                "TLSv1_2"
-        };
-        return strings[protocol];
-    }
-
-    boost::mutex mMutex;
-    boost::condition_variable mCVar;
-    int mPort;
-    bool mConnected;
-};
-
-BOOST_FIXTURE_TEST_SUITE(BOOST_TEST_MODULE, SecurityFixture)
-
-BOOST_AUTO_TEST_CASE(ssl_security_matrix)
-{
-    try
-    {
-        // matrix of connection success between client and server with different SSLProtocol selections
-        bool matrix[apache::thrift::transport::LATEST + 1][apache::thrift::transport::LATEST + 1] =
-        {
-    //   server    = SSLTLS   SSLv2    SSLv3    TLSv1_0  TLSv1_1  TLSv1_2
-    // client
-    /* SSLTLS  */  { true,    false,   false,   true,    true,    true    },
-    /* SSLv2   */  { false,   false,   false,   false,   false,   false   },
-    /* SSLv3   */  { false,   false,   true,    false,   false,   false   },
-    /* TLSv1_0 */  { true,    false,   false,   true,    false,   false   },
-    /* TLSv1_1 */  { true,    false,   false,   false,   true,    false   },
-    /* TLSv1_2 */  { true,    false,   false,   false,   false,   true    }
-        };
-
-        for (size_t si = 0; si <= apache::thrift::transport::LATEST; ++si)
-        {
-            for (size_t ci = 0; ci <= apache::thrift::transport::LATEST; ++ci)
-            {
-                if (si == 1 || ci == 1)
-                {
-                    // Skip all SSLv2 cases - protocol not supported
-                    continue;
-                }
-
-#ifdef OPENSSL_NO_SSL3
-                if (si == 2 || ci == 2)
-                {
-                    // Skip all SSLv3 cases - protocol not supported
-                    continue;
-                }
-#endif
-
-                boost::mutex::scoped_lock lock(mMutex);
-
-                BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
-                    % protocol2str(si) % protocol2str(ci));
-
-                mConnected = false;
-                boost::thread_group threads;
-                threads.create_thread(boost::bind(&SecurityFixture::server, this, static_cast<apache::thrift::transport::SSLProtocol>(si)));
-                mCVar.wait(lock);           // wait for listen() to succeed
-                lock.unlock();
-                threads.create_thread(boost::bind(&SecurityFixture::client, this, static_cast<apache::thrift::transport::SSLProtocol>(ci)));
-                threads.join_all();
-
-                BOOST_CHECK_MESSAGE(mConnected == matrix[ci][si],
-                        boost::format("      Server = %1%, Client = %2% expected mConnected == %3% but was %4%")
-                            % protocol2str(si) % protocol2str(ci) % matrix[ci][si] % mConnected);
-            }
-        }
-    }
-    catch (std::exception& ex)
-    {
-        BOOST_FAIL(boost::format("%1%: %2%") % typeid(ex).name() % ex.what());
-    }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/SpecializationTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/SpecializationTest.cpp
deleted file mode 100644
index e851bac..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/SpecializationTest.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#define _USE_MATH_DEFINES
-#include <cmath>
-#include <thrift/transport/TTransportUtils.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <gen-cpp/DebugProtoTest_types.h>
-
-using namespace thrift::test::debug;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::protocol;
-
-#define BOOST_TEST_MODULE SpecializationTest
-#include <boost/test/unit_test.hpp>
-
-typedef TBinaryProtocolT<TMemoryBuffer> MyProtocol;
-// typedef TBinaryProtocolT<TTransport> MyProtocol;
-
-BOOST_AUTO_TEST_CASE(test_specialization_1) {
-  OneOfEach ooe;
-  ooe.im_true = true;
-  ooe.im_false = false;
-  ooe.a_bite = 0x7f;
-  ooe.integer16 = 27000;
-  ooe.integer32 = 1 << 24;
-  ooe.integer64 = (uint64_t)6000 * 1000 * 1000;
-  ooe.double_precision = M_PI;
-  ooe.some_characters = "JSON THIS! \"\1";
-  ooe.zomg_unicode = "\xd7\n\a\t";
-  ooe.base64 = "\1\2\3\255";
-
-  Nesting n;
-  n.my_ooe = ooe;
-  n.my_ooe.integer16 = 16;
-  n.my_ooe.integer32 = 32;
-  n.my_ooe.integer64 = 64;
-  n.my_ooe.double_precision = (std::sqrt(5.0) + 1) / 2;
-  n.my_ooe.some_characters = ":R (me going \"rrrr\")";
-  n.my_ooe.zomg_unicode     = "\xd3\x80\xe2\x85\xae\xce\x9d\x20\xd0\x9d\xce"
-                              "\xbf\xe2\x85\xbf\xd0\xbe\xc9\xa1\xd0\xb3\xd0"
-                              "\xb0\xcf\x81\xe2\x84\x8e\x20\xce\x91\x74\x74"
-                              "\xce\xb1\xe2\x85\xbd\xce\xba\xc7\x83\xe2\x80"
-                              "\xbc";
-  n.my_bonk.type = 31337;
-  n.my_bonk.message = "I am a bonk... xor!";
-
-  HolyMoley hm;
-
-  hm.big.push_back(ooe);
-  hm.big.push_back(n.my_ooe);
-  hm.big[0].a_bite = 0x22;
-  hm.big[1].a_bite = 0x33;
-
-  std::vector<std::string> stage1;
-  stage1.push_back("and a one");
-  stage1.push_back("and a two");
-  hm.contain.insert(stage1);
-  stage1.clear();
-  stage1.push_back("then a one, two");
-  stage1.push_back("three!");
-  stage1.push_back("FOUR!!");
-  hm.contain.insert(stage1);
-  stage1.clear();
-  hm.contain.insert(stage1);
-
-  std::vector<Bonk> stage2;
-  hm.bonks["nothing"] = stage2;
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 1;
-  stage2.back().message = "Wait.";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 2;
-  stage2.back().message = "What?";
-  hm.bonks["something"] = stage2;
-  stage2.clear();
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 3;
-  stage2.back().message = "quoth";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 4;
-  stage2.back().message = "the raven";
-  stage2.resize(stage2.size() + 1);
-  stage2.back().type = 5;
-  stage2.back().message = "nevermore";
-  hm.bonks["poe"] = stage2;
-
-  boost::shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer());
-  boost::shared_ptr<TProtocol> proto(new MyProtocol(buffer));
-
-  ooe.write(proto.get());
-  OneOfEach ooe2;
-  ooe2.read(proto.get());
-
-  BOOST_CHECK(ooe == ooe2);
-
-  hm.write(proto.get());
-  HolyMoley hm2;
-  hm2.read(proto.get());
-
-  BOOST_CHECK(hm == hm2);
-
-  hm2.big[0].a_bite = 0x00;
-
-  BOOST_CHECK(hm != hm2);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TBufferBaseTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TBufferBaseTest.cpp
deleted file mode 100644
index 5d0bf45..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TBufferBaseTest.cpp
+++ /dev/null
@@ -1,645 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <algorithm>
-#include <boost/test/auto_unit_test.hpp>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TShortReadTransport.h>
-
-using std::string;
-using boost::shared_ptr;
-using apache::thrift::transport::TMemoryBuffer;
-using apache::thrift::transport::TBufferedTransport;
-using apache::thrift::transport::TFramedTransport;
-using apache::thrift::transport::test::TShortReadTransport;
-
-// Shamelessly copied from ZlibTransport.  TODO: refactor.
-unsigned int dist[][5000] = {
- { 1<<15 },
-
- {
-  5,13,9,1,8,9,11,13,18,48,24,13,21,13,5,11,35,2,4,20,17,72,27,14,15,4,7,26,
-  12,1,14,9,2,16,29,41,7,24,4,27,14,4,1,4,25,3,6,34,10,8,50,2,14,13,55,29,3,
-  43,53,49,14,4,10,32,27,48,1,3,1,11,5,17,16,51,17,30,15,11,9,2,2,11,52,12,2,
-  13,94,1,19,1,38,2,8,43,8,33,7,30,8,17,22,2,15,14,12,34,2,12,6,37,29,74,3,
-  165,16,11,17,5,14,3,10,7,37,11,24,7,1,3,12,37,8,9,34,17,12,8,21,13,37,1,4,
-  30,14,78,4,15,2,40,37,17,12,36,82,14,4,1,4,7,17,11,16,88,77,2,3,15,3,34,11,
-  5,79,22,34,8,4,4,40,22,24,28,9,13,3,34,27,9,16,39,16,39,13,2,4,3,41,26,10,4,
-  33,4,7,12,5,6,3,10,30,8,21,16,58,19,9,0,47,7,13,11,19,15,7,53,57,2,13,28,22,
-  3,16,9,25,33,12,40,7,12,64,7,14,24,44,9,2,14,11,2,58,1,26,30,11,9,5,24,7,9,
-  94,2,10,21,5,5,4,5,6,179,9,18,2,7,13,31,41,17,4,36,3,21,6,26,8,15,18,44,27,
-  11,9,25,7,0,14,2,12,20,23,13,2,163,9,5,15,65,2,14,6,8,98,11,15,14,34,2,3,10,
-  22,9,92,7,10,32,67,13,3,4,35,8,2,1,5,0,26,381,7,27,8,2,16,93,4,19,5,8,25,9,
-  31,14,4,21,5,3,9,22,56,4,18,3,11,18,6,4,3,40,12,16,110,8,35,14,1,18,40,9,12,
-  14,3,11,7,57,13,18,116,53,19,22,7,16,11,5,8,21,16,1,75,21,20,1,28,2,6,1,7,
-  19,38,5,6,9,9,4,1,7,55,36,62,5,4,4,24,15,1,12,35,48,20,5,17,1,5,26,15,4,54,
-  13,5,5,15,5,19,32,29,31,7,6,40,7,80,11,18,8,128,48,6,12,84,13,4,7,2,13,9,16,
-  17,3,254,1,4,181,8,44,7,6,24,27,9,23,14,34,16,22,25,10,3,3,4,4,12,2,12,6,7,
-  13,58,13,6,11,19,53,11,66,18,19,10,4,13,2,5,49,58,1,67,7,21,64,14,11,14,8,3,
-  26,33,91,31,20,7,9,42,39,4,3,55,11,10,0,7,4,75,8,12,0,27,3,8,9,0,12,12,23,
-  28,23,20,4,13,30,2,22,20,19,30,6,22,2,6,4,24,7,19,55,86,5,33,2,161,6,7,1,62,
-  13,3,72,12,12,9,7,12,10,5,10,29,1,5,22,13,13,5,2,12,3,7,14,18,2,3,46,21,17,
-  15,19,3,27,5,16,45,31,10,8,17,18,18,3,7,24,6,55,9,3,6,12,10,12,8,91,9,4,4,4,
-  27,29,16,5,7,22,43,28,11,14,8,11,28,109,55,71,40,3,8,22,26,15,44,3,25,29,5,
-  3,32,17,12,3,29,27,25,15,11,8,40,39,38,17,3,9,11,2,32,11,6,20,48,75,27,3,7,
-  54,12,95,12,7,24,23,2,13,8,15,16,5,12,4,17,7,19,88,2,6,13,115,45,12,21,2,86,
-  74,9,7,5,16,32,16,2,21,18,6,34,5,18,260,7,12,16,44,19,92,31,7,8,2,9,0,0,15,
-  8,38,4,8,20,18,2,83,3,3,4,9,5,3,10,3,5,29,15,7,11,8,48,17,23,2,17,4,11,22,
-  21,64,8,8,4,19,95,0,17,28,9,11,20,71,5,11,18,12,13,45,49,4,1,33,32,23,13,5,
-  52,2,2,16,3,4,7,12,2,1,12,6,24,1,22,155,21,3,45,4,12,44,26,5,40,36,9,9,8,20,
-  35,31,3,2,32,50,10,8,37,2,75,35,22,15,192,8,11,23,1,4,29,6,8,8,5,12,18,32,4,
-  7,12,2,0,0,9,5,48,11,35,3,1,123,6,29,8,11,8,23,51,16,6,63,12,2,5,4,14,2,15,
-  7,14,3,2,7,17,32,8,8,10,1,23,62,2,49,6,49,47,23,3,20,7,11,39,10,24,6,15,5,5,
-  11,8,16,36,8,13,20,3,10,44,7,52,7,10,36,6,15,10,5,11,4,14,19,17,10,12,3,6,
-  23,4,13,94,70,7,36,7,38,7,28,8,4,15,3,19,4,33,39,21,109,4,80,6,40,4,432,4,4,
-  7,8,3,31,8,28,37,34,10,2,21,5,22,0,7,36,14,12,6,24,1,21,5,9,2,29,20,54,113,
-  13,31,39,27,6,0,27,4,5,2,43,7,8,57,8,62,7,9,12,22,90,30,6,19,7,10,20,6,5,58,
-  32,30,41,4,10,25,13,3,8,7,10,2,9,6,151,44,16,12,16,20,8,3,18,11,17,4,10,45,
-  15,8,56,38,52,25,40,14,4,17,15,8,2,19,7,8,26,30,2,3,180,8,26,17,38,35,5,16,
-  28,5,15,56,13,14,18,9,15,83,27,3,9,4,11,8,27,27,44,10,12,8,3,48,14,7,9,4,4,
-  8,4,5,9,122,8,14,12,19,17,21,4,29,63,21,17,10,12,18,47,10,10,53,4,18,16,4,8,
-  118,9,5,12,9,11,9,3,12,32,3,23,2,15,3,3,30,3,17,235,15,22,9,299,14,17,1,5,
-  16,8,3,7,3,13,2,7,6,4,8,66,2,13,6,15,16,47,3,36,5,7,10,24,1,9,9,8,13,16,26,
-  12,7,24,21,18,49,23,39,10,41,4,13,4,27,11,12,12,19,4,147,8,10,9,40,21,2,83,
-  10,5,6,11,25,9,50,57,40,12,12,21,1,3,24,23,9,3,9,13,2,3,12,57,8,11,13,15,26,
-  15,10,47,36,4,25,1,5,8,5,4,0,12,49,5,19,4,6,16,14,6,10,69,10,33,29,7,8,61,
-  12,4,0,3,7,6,3,16,29,27,38,4,21,0,24,3,2,1,19,16,22,2,8,138,11,7,7,3,12,22,
-  3,16,5,7,3,53,9,10,32,14,5,7,3,6,22,9,59,26,8,7,58,5,16,11,55,7,4,11,146,91,
-  8,13,18,14,6,8,8,31,26,22,6,11,30,11,30,15,18,31,3,48,17,7,6,4,9,2,25,3,35,
-  13,13,7,8,4,31,10,8,10,4,3,45,10,23,2,7,259,17,21,13,14,3,26,3,8,27,4,18,9,
-  66,7,12,5,8,17,4,23,55,41,51,2,32,26,66,4,21,14,12,65,16,22,17,5,14,2,29,24,
-  7,3,36,2,43,53,86,5,28,4,58,13,49,121,6,2,73,2,1,47,4,2,27,10,35,28,27,10,
-  17,10,56,7,10,14,28,20,24,40,7,4,7,3,10,11,32,6,6,3,15,11,54,573,2,3,6,2,3,
-  14,64,4,16,12,16,42,10,26,4,6,11,69,18,27,2,2,17,22,9,13,22,11,6,1,15,49,3,
-  14,1
- },
-
- {
-  11,11,11,15,47,1,3,1,23,5,8,18,3,23,15,21,1,7,19,10,26,1,17,11,31,21,41,18,
-  34,4,9,58,19,3,3,36,5,18,13,3,14,4,9,10,4,19,56,15,3,5,3,11,27,9,4,10,13,4,
-  11,6,9,2,18,3,10,19,11,4,53,4,2,2,3,4,58,16,3,0,5,30,2,11,93,10,2,14,10,6,2,
-  115,2,25,16,22,38,101,4,18,13,2,145,51,45,15,14,15,13,20,7,24,5,13,14,30,40,
-  10,4,107,12,24,14,39,12,6,13,20,7,7,11,5,18,18,45,22,6,39,3,2,1,51,9,11,4,
-  13,9,38,44,8,11,9,15,19,9,23,17,17,17,13,9,9,1,10,4,18,6,2,9,5,27,32,72,8,
-  37,9,4,10,30,17,20,15,17,66,10,4,73,35,37,6,4,16,117,45,13,4,75,5,24,65,10,
-  4,9,4,13,46,5,26,29,10,4,4,52,3,13,18,63,6,14,9,24,277,9,88,2,48,27,123,14,
-  61,7,5,10,8,7,90,3,10,3,3,48,17,13,10,18,33,2,19,36,6,21,1,16,12,5,6,2,16,
-  15,29,88,28,2,15,6,11,4,6,11,3,3,4,18,9,53,5,4,3,33,8,9,8,6,7,36,9,62,14,2,
-  1,10,1,16,7,32,7,23,20,11,10,23,2,1,0,9,16,40,2,81,5,22,8,5,4,37,51,37,10,
-  19,57,11,2,92,31,6,39,10,13,16,8,20,6,9,3,10,18,25,23,12,30,6,2,26,7,64,18,
-  6,30,12,13,27,7,10,5,3,33,24,99,4,23,4,1,27,7,27,49,8,20,16,3,4,13,9,22,67,
-  28,3,10,16,3,2,10,4,8,1,8,19,3,85,6,21,1,9,16,2,30,10,33,12,4,9,3,1,60,38,6,
-  24,32,3,14,3,40,8,34,115,5,9,27,5,96,3,40,6,15,5,8,22,112,5,5,25,17,58,2,7,
-  36,21,52,1,3,95,12,21,4,11,8,59,24,5,21,4,9,15,8,7,21,3,26,5,11,6,7,17,65,
-  14,11,10,2,17,5,12,22,4,4,2,21,8,112,3,34,63,35,2,25,1,2,15,65,23,0,3,5,15,
-  26,27,9,5,48,11,15,4,9,5,33,20,15,1,18,19,11,24,40,10,21,74,6,6,32,30,40,5,
-  4,7,44,10,25,46,16,12,5,40,7,18,5,18,9,12,8,4,25,5,6,36,4,43,8,9,12,35,17,4,
-  8,9,11,27,5,10,17,40,8,12,4,18,9,18,12,20,25,39,42,1,24,13,22,15,7,112,35,3,
-  7,17,33,2,5,5,19,8,4,12,24,14,13,2,1,13,6,5,19,11,7,57,0,19,6,117,48,14,8,
-  10,51,17,12,14,2,5,8,9,15,4,48,53,13,22,4,25,12,11,19,45,5,2,6,54,22,9,15,9,
-  13,2,7,11,29,82,16,46,4,26,14,26,40,22,4,26,6,18,13,4,4,20,3,3,7,12,17,8,9,
-  23,6,20,7,25,23,19,5,15,6,23,15,11,19,11,3,17,59,8,18,41,4,54,23,44,75,13,
-  20,6,11,2,3,1,13,10,3,7,12,3,4,7,8,30,6,6,7,3,32,9,5,28,6,114,42,13,36,27,
-  59,6,93,13,74,8,69,140,3,1,17,48,105,6,11,5,15,1,10,10,14,8,53,0,8,24,60,2,
-  6,35,2,12,32,47,16,17,75,2,5,4,37,28,10,5,9,57,4,59,5,12,13,7,90,5,11,5,24,
-  22,13,30,1,2,10,9,6,19,3,18,47,2,5,7,9,35,15,3,6,1,21,14,14,18,14,9,12,8,73,
-  6,19,3,32,9,14,17,17,5,55,23,6,16,28,3,11,48,4,6,6,6,12,16,30,10,30,27,51,
-  18,29,2,3,15,1,76,0,16,33,4,27,3,62,4,10,2,4,8,15,9,41,26,22,2,4,20,4,49,0,
-  8,1,57,13,12,39,3,63,10,19,34,35,2,7,8,29,72,4,10,0,77,8,6,7,9,15,21,9,4,1,
-  20,23,1,9,18,9,15,36,4,7,6,15,5,7,7,40,2,9,22,2,3,20,4,12,34,13,6,18,15,1,
-  38,20,12,7,16,3,19,85,12,16,18,16,2,17,1,13,8,6,12,15,97,17,12,9,3,21,15,12,
-  23,44,81,26,30,2,5,17,6,6,0,22,42,19,6,19,41,14,36,7,3,56,7,9,3,2,6,9,69,3,
-  15,4,30,28,29,7,9,15,17,17,6,1,6,153,9,33,5,12,14,16,28,3,8,7,14,12,4,6,36,
-  9,24,13,13,4,2,9,15,19,9,53,7,13,4,150,17,9,2,6,12,7,3,5,58,19,58,28,8,14,3,
-  20,3,0,32,56,7,5,4,27,1,68,4,29,13,5,58,2,9,65,41,27,16,15,12,14,2,10,9,24,
-  3,2,9,2,2,3,14,32,10,22,3,13,11,4,6,39,17,0,10,5,5,10,35,16,19,14,1,8,63,19,
-  14,8,56,10,2,12,6,12,6,7,16,2,9,9,12,20,73,25,13,21,17,24,5,32,8,12,25,8,14,
-  16,5,23,3,7,6,3,11,24,6,30,4,21,13,28,4,6,29,15,5,17,6,26,8,15,8,3,7,7,50,
-  11,30,6,2,28,56,16,24,25,23,24,89,31,31,12,7,22,4,10,17,3,3,8,11,13,5,3,27,
-  1,12,1,14,8,10,29,2,5,2,2,20,10,0,31,10,21,1,48,3,5,43,4,5,18,13,5,18,25,34,
-  18,3,5,22,16,3,4,20,3,9,3,25,6,6,44,21,3,12,7,5,42,3,2,14,4,36,5,3,45,51,15,
-  9,11,28,9,7,6,6,12,26,5,14,10,11,42,55,13,21,4,28,6,7,23,27,11,1,41,36,0,32,
-  15,26,2,3,23,32,11,2,15,7,29,26,144,33,20,12,7,21,10,7,11,65,46,10,13,20,32,
-  4,4,5,19,2,19,15,49,41,1,75,10,11,25,1,2,45,11,8,27,18,10,60,28,29,12,30,19,
-  16,4,24,11,19,27,17,49,18,7,40,13,19,22,8,55,12,11,3,6,5,11,8,10,22,5,9,9,
-  25,7,17,7,64,1,24,2,12,17,44,4,12,27,21,11,10,7,47,5,9,13,12,38,27,21,7,29,
-  7,1,17,3,3,5,48,62,10,3,11,17,15,15,6,3,8,10,8,18,19,13,3,9,7,6,44,9,10,4,
-  43,8,6,6,14,20,38,24,2,4,5,5,7,5,9,39,8,44,40,9,19,7,3,15,25,2,37,18,15,9,5,
-  8,32,10,5,18,4,7,46,20,17,23,4,11,16,18,31,11,3,11,1,14,1,25,4,27,13,13,39,
-  14,6,6,35,6,16,13,11,122,21,15,20,24,10,5,152,15,39,5,20,16,9,14,7,53,6,3,8,
-  19,63,32,6,2,3,20,1,19,5,13,42,15,4,6,68,31,46,11,38,10,24,5,5,8,9,12,3,35,
-  46,26,16,2,8,4,74,16,44,4,5,1,16,4,14,23,16,69,15,42,31,14,7,7,6,97,14,40,1,
-  8,7,34,9,39,19,13,15,10,21,18,10,5,15,38,7,5,12,7,20,15,4,11,6,14,5,17,7,39,
-  35,36,18,20,26,22,4,2,36,21,64,0,5,9,10,6,4,1,7,3,1,3,3,4,10,20,90,2,22,48,
-  16,23,2,33,40,1,21,21,17,20,8,8,12,4,83,14,48,4,21,3,9,27,5,11,40,15,9,3,16,
-  17,9,11,4,24,31,17,3,4,2,11,1,8,4,8,6,41,17,4,13,3,7,17,8,27,5,13,6,10,7,13,
-  12,18,13,60,18,3,8,1,12,125,2,7,16,2,11,2,4,7,26,5,9,14,14,16,8,14,7,14,6,9,
-  13,9,6,4,26,35,49,36,55,3,9,6,40,26,23,31,19,41,2,10,31,6,54,5,69,16,7,8,16,
-  1,5,7,4,22,7,7,5,4,48,11,13,3,98,4,11,19,4,2,14,7,34,7,10,3,2,12,7,6,2,5,118
- },
-};
-
-uint8_t data[1<<15];
-string data_str;
-void init_data() {
-  static bool initted = false;
-  if (initted) return;
-  initted = true;
-
-  // Repeatability.  Kind of.
-  std::srand(42);
-  for (size_t i = 0; i < (sizeof(data)/sizeof(data[0])); ++i) {
-    data[i] = (uint8_t)rand();
-  }
-
-  data_str.assign((char*)data, sizeof(data));
-}
-
-
-BOOST_AUTO_TEST_SUITE( TBufferBaseTest )
-
-BOOST_AUTO_TEST_CASE( test_MemoryBuffer_Write_GetBuffer ) {
-  init_data();
-
-  for (int d1 = 0; d1 < 3; d1++) {
-    TMemoryBuffer buffer(16);
-    int offset = 0;
-    int index = 0;
-
-    while (offset < 1<<15) {
-      buffer.write(&data[offset], dist[d1][index]);
-      offset += dist[d1][index];
-      index++;
-    }
-
-    string output = buffer.getBufferAsString();
-    BOOST_CHECK_EQUAL(data_str, output);
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_MemoryBuffer_Write_Read ) {
-  init_data();
-
-  for (int d1 = 0; d1 < 3; d1++) {
-    for (int d2 = 0; d2 < 3; d2++) {
-      TMemoryBuffer buffer(16);
-      uint8_t data_out[1<<15];
-      int offset;
-      int index;
-
-      offset = 0;
-      index = 0;
-      while (offset < 1<<15) {
-        buffer.write(&data[offset], dist[d1][index]);
-        offset += dist[d1][index];
-        index++;
-      }
-
-      offset = 0;
-      index = 0;
-      while (offset < 1<<15) {
-        unsigned int got = buffer.read(&data_out[offset], dist[d2][index]);
-        BOOST_CHECK_EQUAL(got, dist[d2][index]);
-        offset += dist[d2][index];
-        index++;
-      }
-
-      BOOST_CHECK(!memcmp(data, data_out, sizeof(data)));
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_MemoryBuffer_Write_ReadString ) {
-  init_data();
-
-  for (int d1 = 0; d1 < 3; d1++) {
-    for (int d2 = 0; d2 < 3; d2++) {
-      TMemoryBuffer buffer(16);
-      string output;
-      int offset;
-      int index;
-
-      offset = 0;
-      index = 0;
-      while (offset < 1<<15) {
-        buffer.write(&data[offset], dist[d1][index]);
-        offset += dist[d1][index];
-        index++;
-      }
-
-      offset = 0;
-      index = 0;
-      while (offset < 1<<15) {
-        unsigned int got = buffer.readAppendToString(output, dist[d2][index]);
-        BOOST_CHECK_EQUAL(got, dist[d2][index]);
-        offset += dist[d2][index];
-        index++;
-      }
-
-      BOOST_CHECK_EQUAL(output, data_str);
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_MemoryBuffer_Write_Read_Multi1 ) {
-  init_data();
-
-  // Do shorter writes and reads so we don't align to power-of-two boundaries.
-
-  for (int d1 = 0; d1 < 3; d1++) {
-    for (int d2 = 0; d2 < 3; d2++) {
-      TMemoryBuffer buffer(16);
-      uint8_t data_out[1<<15];
-      int offset;
-      int index;
-
-      for (int iter = 0; iter < 6; iter++) {
-        offset = 0;
-        index = 0;
-        while (offset < (1<<15)-42) {
-          buffer.write(&data[offset], dist[d1][index]);
-          offset += dist[d1][index];
-          index++;
-        }
-
-        offset = 0;
-        index = 0;
-        while (offset < (1<<15)-42) {
-          buffer.read(&data_out[offset], dist[d2][index]);
-          offset += dist[d2][index];
-          index++;
-        }
-
-        BOOST_CHECK(!memcmp(data, data_out, (1<<15)-42));
-
-        // Pull out the extra data.
-        buffer.read(data_out, 42);
-      }
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_MemoryBuffer_Write_Read_Multi2 ) {
-  init_data();
-
-  // Do shorter writes and reads so we don't align to power-of-two boundaries.
-  // Pull the buffer out of the loop so its state gets worked harder.
-  TMemoryBuffer buffer(16);
-
-  for (int d1 = 0; d1 < 3; d1++) {
-    for (int d2 = 0; d2 < 3; d2++) {
-      uint8_t data_out[1<<15];
-      int offset;
-      int index;
-
-      for (int iter = 0; iter < 6; iter++) {
-        offset = 0;
-        index = 0;
-        while (offset < (1<<15)-42) {
-          buffer.write(&data[offset], dist[d1][index]);
-          offset += dist[d1][index];
-          index++;
-        }
-
-        offset = 0;
-        index = 0;
-        while (offset < (1<<15)-42) {
-          buffer.read(&data_out[offset], dist[d2][index]);
-          offset += dist[d2][index];
-          index++;
-        }
-
-        BOOST_CHECK(!memcmp(data, data_out, (1<<15)-42));
-
-        // Pull out the extra data.
-        buffer.read(data_out, 42);
-      }
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_MemoryBuffer_Write_Read_Incomplete ) {
-  init_data();
-
-  // Do shorter writes and reads so we don't align to power-of-two boundaries.
-  // Pull the buffer out of the loop so its state gets worked harder.
-
-  for (int d1 = 0; d1 < 3; d1++) {
-    for (int d2 = 0; d2 < 3; d2++) {
-      TMemoryBuffer buffer(16);
-      uint8_t data_out[1<<13];
-
-      int write_offset = 0;
-      int write_index = 0;
-      unsigned int to_write = (1<<14)-42;
-      while (to_write > 0) {
-        int write_amt = (std::min)(dist[d1][write_index], to_write);
-        buffer.write(&data[write_offset], write_amt);
-        write_offset += write_amt;
-        write_index++;
-        to_write -= write_amt;
-      }
-
-      int read_offset = 0;
-      int read_index = 0;
-      unsigned int to_read = (1<<13)-42;
-      while (to_read > 0) {
-        int read_amt = (std::min)(dist[d2][read_index], to_read);
-        int got = buffer.read(&data_out[read_offset], read_amt);
-        BOOST_CHECK_EQUAL(got, read_amt);
-        read_offset += read_amt;
-        read_index++;
-        to_read -= read_amt;
-      }
-
-      BOOST_CHECK(!memcmp(data, data_out, (1<<13)-42));
-
-      int second_offset = write_offset;
-      int second_index = write_index-1;
-      unsigned int to_second = (1<<14)+42;
-      while (to_second > 0) {
-        int second_amt = (std::min)(dist[d1][second_index], to_second);
-        //printf("%d\n", second_amt);
-        buffer.write(&data[second_offset], second_amt);
-        second_offset += second_amt;
-        second_index++;
-        to_second -= second_amt;
-      }
-
-      string output = buffer.getBufferAsString();
-      BOOST_CHECK_EQUAL(data_str.substr((1<<13)-42), output);
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_BufferedTransport_Write ) {
-  init_data();
-
-  int sizes[] = {
-    12, 15, 16, 17, 20,
-    501, 512, 523,
-    2000, 2048, 2096,
-    1<<14, 1<<17,
-  };
-
-  for (size_t i = 0; i < sizeof (sizes) / sizeof (sizes[0]); i++) {
-    int size = sizes[i];
-    for (int d1 = 0; d1 < 3; d1++) {
-      shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(16));
-      TBufferedTransport trans(buffer, size);
-
-      int offset = 0;
-      int index = 0;
-      while (offset < 1<<15) {
-        trans.write(&data[offset], dist[d1][index]);
-        offset += dist[d1][index];
-        index++;
-      }
-      trans.flush();
-
-      string output = buffer->getBufferAsString();
-      BOOST_CHECK_EQUAL(data_str, output);
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_BufferedTransport_Read_Full ) {
-  init_data();
-
-  int sizes[] = {
-    12, 15, 16, 17, 20,
-    501, 512, 523,
-    2000, 2048, 2096,
-    1<<14, 1<<17,
-  };
-
-  for (size_t i = 0; i < sizeof (sizes) / sizeof (sizes[0]); i++) {
-    int size = sizes[i];
-    for (int d1 = 0; d1 < 3; d1++) {
-      shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(data, sizeof(data)));
-      TBufferedTransport trans(buffer, size);
-      uint8_t data_out[1<<15];
-
-      int offset = 0;
-      int index = 0;
-      while (offset < 1<<15) {
-        // Note: this doesn't work with "read" because TBufferedTransport
-        // doesn't try loop over reads, so we get short reads.  We don't
-        // check the return value, so that messes us up.
-        trans.readAll(&data_out[offset], dist[d1][index]);
-        offset += dist[d1][index];
-        index++;
-      }
-
-      BOOST_CHECK(!memcmp(data, data_out, sizeof(data)));
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_BufferedTransport_Read_Short ) {
-  init_data();
-
-  int sizes[] = {
-    12, 15, 16, 17, 20,
-    501, 512, 523,
-    2000, 2048, 2096,
-    1<<14, 1<<17,
-  };
-
-  for (size_t i = 0; i < sizeof (sizes) / sizeof (sizes[0]); i++) {
-    int size = sizes[i];
-    for (int d1 = 0; d1 < 3; d1++) {
-      shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(data, sizeof(data)));
-      shared_ptr<TShortReadTransport> tshort(new TShortReadTransport(buffer, 0.125));
-      TBufferedTransport trans(buffer, size);
-      uint8_t data_out[1<<15];
-
-      int offset = 0;
-      int index = 0;
-      while (offset < 1<<15) {
-        // Note: this doesn't work with "read" because TBufferedTransport
-        // doesn't try loop over reads, so we get short reads.  We don't
-        // check the return value, so that messes us up.
-        trans.readAll(&data_out[offset], dist[d1][index]);
-        offset += dist[d1][index];
-        index++;
-      }
-
-      BOOST_CHECK(!memcmp(data, data_out, sizeof(data)));
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_FramedTransport_Write ) {
-  init_data();
-
-  int sizes[] = {
-    12, 15, 16, 17, 20,
-    501, 512, 523,
-    2000, 2048, 2096,
-    1<<14, 1<<17,
-  };
-
-  for (size_t i = 0; i < sizeof (sizes) / sizeof (sizes[0]); i++) {
-    int size = sizes[i];
-    for (int d1 = 0; d1 < 3; d1++) {
-      shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(16));
-      TFramedTransport trans(buffer, size);
-
-      int offset = 0;
-      int index = 0;
-      while (offset < 1<<15) {
-        trans.write(&data[offset], dist[d1][index]);
-        offset += dist[d1][index];
-        index++;
-      }
-      trans.flush();
-
-      int32_t frame_size = -1;
-      buffer->read(reinterpret_cast<uint8_t*>(&frame_size), sizeof(frame_size));
-      frame_size = (int32_t)ntohl((uint32_t)frame_size);
-      BOOST_CHECK_EQUAL(frame_size, 1<<15);
-      BOOST_CHECK_EQUAL(data_str.size(), (unsigned int)frame_size);
-      string output = buffer->getBufferAsString();
-      BOOST_CHECK_EQUAL(data_str, output);
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_FramedTransport_Read ) {
-  init_data();
-
-  for (int d1 = 0; d1 < 3; d1++) {
-    uint8_t data_out[1<<15];
-    shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer());
-    TFramedTransport trans(buffer);
-    int32_t length = sizeof(data);
-    length = (int32_t)htonl((uint32_t)length);
-    buffer->write(reinterpret_cast<uint8_t*>(&length), sizeof(length));
-    buffer->write(data, sizeof(data));
-
-    int offset = 0;
-    int index = 0;
-    while (offset < 1<<15) {
-      // This should work with read because we have one huge frame.
-      trans.read(&data_out[offset], dist[d1][index]);
-      offset += dist[d1][index];
-      index++;
-    }
-
-    BOOST_CHECK(!memcmp(data, data_out, sizeof(data)));
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_FramedTransport_Write_Read ) {
-  init_data();
-
-  int sizes[] = {
-    12, 15, 16, 17, 20,
-    501, 512, 523,
-    2000, 2048, 2096,
-    1<<14, 1<<17,
-  };
-
-  int probs[] = { 1, 2, 4, 8, 16, 32, };
-
-  for (size_t i = 0; i < sizeof (sizes) / sizeof (sizes[0]); i++) {
-    int size = sizes[i];
-    for (size_t j = 0; j < sizeof (probs) / sizeof (probs[0]); j++) {
-      int prob = probs[j];
-      for (int d1 = 0; d1 < 3; d1++) {
-        shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer(16));
-        TFramedTransport trans(buffer, size);
-        uint8_t data_out[1<<15];
-        std::vector<int> flush_sizes;
-
-        int write_offset = 0;
-        int write_index = 0;
-        int flush_size = 0;
-        while (write_offset < 1<<15) {
-          trans.write(&data[write_offset], dist[d1][write_index]);
-          write_offset += dist[d1][write_index];
-          flush_size += dist[d1][write_index];
-          write_index++;
-          if (flush_size > 0 && rand()%prob == 0) {
-            flush_sizes.push_back(flush_size);
-            flush_size = 0;
-            trans.flush();
-          }
-        }
-        if (flush_size != 0) {
-          flush_sizes.push_back(flush_size);
-          flush_size = 0;
-          trans.flush();
-        }
-
-        int read_offset = 0;
-        int read_index = 0;
-
-        for (unsigned int k = 0; k < flush_sizes.size(); k++) {
-          int fsize = flush_sizes[k];
-          // We are exploiting an implementation detail of TFramedTransport.
-          // The read buffer starts empty and it will never do more than one
-          // readFrame per read, so we should always get exactly one frame.
-          int got = trans.read(&data_out[read_offset], 1<<15);
-          BOOST_CHECK_EQUAL(got, fsize);
-          read_offset += got;
-          read_index++;
-        }
-
-        BOOST_CHECK_EQUAL((unsigned int)read_offset, sizeof(data));
-        BOOST_CHECK(!memcmp(data, data_out, sizeof(data)));
-      }
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE( test_FramedTransport_Empty_Flush ) {
-  init_data();
-
-  string output1("\x00\x00\x00\x01""a", 5);
-  string output2("\x00\x00\x00\x01""a\x00\x00\x00\x02""bc", 11);
-
-  shared_ptr<TMemoryBuffer> buffer(new TMemoryBuffer());
-  TFramedTransport trans(buffer);
-
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), "");
-  trans.flush();
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), "");
-  trans.flush();
-  trans.flush();
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), "");
-  trans.write((const uint8_t*)"a", 1);
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), "");
-  trans.flush();
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), output1);
-  trans.flush();
-  trans.flush();
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), output1);
-  trans.write((const uint8_t*)"bc", 2);
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), output1);
-  trans.flush();
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), output2);
-  trans.flush();
-  trans.flush();
-  BOOST_CHECK_EQUAL(buffer->getBufferAsString(), output2);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TFDTransportTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TFDTransportTest.cpp
deleted file mode 100644
index 0ba035a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TFDTransportTest.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <cstdlib>
-#include <stdexcept>
-#include <thrift/Thrift.h>
-#include <thrift/transport/TFDTransport.h>
-
-#define BOOST_TEST_MODULE TFDTransportTest
-#include <boost/test/unit_test.hpp>
-
-// Disabled on MSVC because the RTL asserts on an invalid file descriptor
-// in both debug and release mode; at least in MSVCR100 (Visual Studio 2010)
-#if !defined(WIN32)
-
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TFDTransport;
-
-BOOST_AUTO_TEST_CASE(test_tfdtransport_1) {
-  BOOST_CHECK_NO_THROW(TFDTransport t(256, TFDTransport::CLOSE_ON_DESTROY));
-}
-
-BOOST_AUTO_TEST_CASE(test_tfdtransport_2) {
-  TFDTransport t(256, TFDTransport::CLOSE_ON_DESTROY);
-  BOOST_CHECK_THROW(t.close(), TTransportException);
-}
-
-#else
-
-BOOST_AUTO_TEST_CASE(test_tfdtransport_dummy) {
-  BOOST_CHECK(true);
-}
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TFileTransportTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TFileTransportTest.cpp
deleted file mode 100644
index 82e84e8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TFileTransportTest.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE // needed for getopt_long
-#endif
-
-#include <thrift/thrift-config.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <getopt.h>
-#include <boost/test/unit_test.hpp>
-
-#include <thrift/transport/TFileTransport.h>
-
-#ifdef __MINGW32__
-  #include <io.h>
-  #include <unistd.h>
-  #include <sys/types.h>
-  #include <fcntl.h>
-  #include <sys\stat.h>
-#endif
-
-using namespace apache::thrift::transport;
-
-/**************************************************************************
- * Global state
- **************************************************************************/
-
-static const char* tmp_dir = "/tmp";
-
-class FsyncLog;
-FsyncLog* fsync_log;
-
-/**************************************************************************
- * Helper code
- **************************************************************************/
-
-// Provide BOOST_WARN_LT() and BOOST_WARN_GT(), in case we're compiled
-// with an older version of boost
-#ifndef BOOST_WARN_LT
-#define BOOST_WARN_CMP(a, b, op, check_fn)                                                         \
-  check_fn((a)op(b),                                                                               \
-           "check " BOOST_STRINGIZE(a) " " BOOST_STRINGIZE(op) " " BOOST_STRINGIZE(                \
-               b) " failed: " BOOST_STRINGIZE(a) "="                                               \
-           << (a) << " " BOOST_STRINGIZE(b) "=" << (b))
-
-#define BOOST_WARN_LT(a, b) BOOST_WARN_CMP(a, b, <, BOOST_WARN_MESSAGE)
-#define BOOST_WARN_GT(a, b) BOOST_WARN_CMP(a, b, >, BOOST_WARN_MESSAGE)
-#define BOOST_WARN_LT(a, b) BOOST_WARN_CMP(a, b, <, BOOST_WARN_MESSAGE)
-#endif // BOOST_WARN_LT
-
-/**
- * Class to record calls to fsync
- */
-class FsyncLog {
-public:
-  struct FsyncCall {
-    struct timeval time;
-    int fd;
-  };
-  typedef std::list<FsyncCall> CallList;
-
-  FsyncLog() {}
-
-  void fsync(int fd) {
-    (void)fd;
-    FsyncCall call;
-    gettimeofday(&call.time, NULL);
-    calls_.push_back(call);
-  }
-
-  const CallList* getCalls() const { return &calls_; }
-
-private:
-  CallList calls_;
-};
-
-/**
- * Helper class to clean up temporary files
- */
-class TempFile {
-public:
-  TempFile(const char* directory, const char* prefix) {
-  #ifdef __MINGW32__
-    size_t path_len = strlen(prefix) + 8;
-    path_ = new char[path_len];
-    snprintf(path_, path_len, "%sXXXXXX", prefix);
-    if (_mktemp_s(path_,path_len) == 0) {
-      fd_ = open(path_,O_CREAT | O_RDWR | O_BINARY,S_IREAD | S_IWRITE);
-      if (fd_ < 0) {
-        throw apache::thrift::TException("_mktemp_s() failed");
-      }
-    } else {
-      throw apache::thrift::TException("_mktemp_s() failed");
-    }
-  #else
-    size_t path_len = strlen(directory) + strlen(prefix) + 8;
-    path_ = new char[path_len];
-    snprintf(path_, path_len, "%s/%sXXXXXX", directory, prefix);
-
-    fd_ = mkstemp(path_);
-    if (fd_ < 0) {
-      throw apache::thrift::TException("mkstemp() failed");
-    }
-  #endif
-  }
-
-  ~TempFile() {
-    unlink();
-    close();
-  }
-
-  const char* getPath() const { return path_; }
-
-  int getFD() const { return fd_; }
-
-  void unlink() {
-    if (path_) {
-      ::unlink(path_);
-      delete[] path_;
-      path_ = NULL;
-    }
-  }
-
-  void close() {
-    if (fd_ < 0) {
-      return;
-    }
-
-    ::close(fd_);
-    fd_ = -1;
-  }
-
-private:
-  char* path_;
-  int fd_;
-};
-
-// Use our own version of fsync() for testing.
-// This returns immediately, so timing in test_destructor() isn't affected by
-// waiting on the actual filesystem.
-extern "C" int fsync(int fd) {
-  if (fsync_log) {
-    fsync_log->fsync(fd);
-  }
-  return 0;
-}
-
-int time_diff(const struct timeval* t1, const struct timeval* t2) {
-  return (t2->tv_usec - t1->tv_usec) + (t2->tv_sec - t1->tv_sec) * 1000000;
-}
-
-/**************************************************************************
- * Test cases
- **************************************************************************/
-
-/**
- * Make sure the TFileTransport destructor exits "quickly".
- *
- * Previous versions had a bug causing the writer thread not to exit
- * right away.
- *
- * It's kind of lame that we just check to see how long the destructor takes in
- * wall-clock time.  This could result in false failures on slower systems, or
- * on heavily loaded machines.
- */
-BOOST_AUTO_TEST_CASE(test_destructor) {
-  TempFile f(tmp_dir, "thrift.TFileTransportTest.");
-
-  unsigned int const NUM_ITERATIONS = 1000;
-
-  unsigned int num_over = 0;
-  for (unsigned int n = 0; n < NUM_ITERATIONS; ++n) {
-    BOOST_CHECK_EQUAL(0, ftruncate(f.getFD(), 0));
-
-    TFileTransport* transport = new TFileTransport(f.getPath());
-
-    // write something so that the writer thread gets started
-    transport->write(reinterpret_cast<const uint8_t*>("foo"), 3);
-
-    // Every other iteration, also call flush(), just in case that potentially
-    // has any effect on how the writer thread wakes up.
-    if (n & 0x1) {
-      transport->flush();
-    }
-
-    /*
-     * Time the call to the destructor
-     */
-    struct timeval start;
-    struct timeval end;
-
-    gettimeofday(&start, NULL);
-    delete transport;
-    gettimeofday(&end, NULL);
-
-    int delta = time_diff(&start, &end);
-
-    // If any attempt takes more than 500ms, treat that as a failure.
-    // Treat this as a fatal failure, so we'll return now instead of
-    // looping over a very slow operation.
-    BOOST_WARN_LT(delta, 500000);
-
-    // Normally, it takes less than 100ms on my dev box.
-    // However, if the box is heavily loaded, some of the test runs
-    // take longer, since we're just waiting for our turn on the CPU.
-    if (delta > 100000) {
-      ++num_over;
-    }
-  }
-
-  // Make sure fewer than 10% of the runs took longer than 1000us
-  BOOST_WARN(num_over < (NUM_ITERATIONS / 10));
-}
-
-/**
- * Make sure setFlushMaxUs() is honored.
- */
-void test_flush_max_us_impl(uint32_t flush_us, uint32_t write_us, uint32_t test_us) {
-  // TFileTransport only calls fsync() if data has been written,
-  // so make sure the write interval is smaller than the flush interval.
-  BOOST_WARN(write_us < flush_us);
-
-  TempFile f(tmp_dir, "thrift.TFileTransportTest.");
-
-  // Record calls to fsync()
-  FsyncLog log;
-  fsync_log = &log;
-
-  TFileTransport* transport = new TFileTransport(f.getPath());
-  // Don't flush because of # of bytes written
-  transport->setFlushMaxBytes(0xffffffff);
-  uint8_t buf[] = "a";
-  uint32_t buflen = sizeof(buf);
-
-  // Set the flush interval
-  transport->setFlushMaxUs(flush_us);
-
-  // Make one call to write, to start the writer thread now.
-  // (If we just let the thread get created during our test loop,
-  // the thread creation sometimes takes long enough to make the first
-  // fsync interval fail the check.)
-  transport->write(buf, buflen);
-
-  // Add one entry to the fsync log, just to mark the start time
-  log.fsync(-1);
-
-  // Loop doing write(), sleep(), ...
-  uint32_t total_time = 0;
-  while (true) {
-    transport->write(buf, buflen);
-    if (total_time > test_us) {
-      break;
-    }
-    usleep(write_us);
-    total_time += write_us;
-  }
-
-  delete transport;
-
-  // Stop logging new fsync() calls
-  fsync_log = NULL;
-
-  // Examine the fsync() log
-  //
-  // TFileTransport uses pthread_cond_timedwait(), which only has millisecond
-  // resolution.  In my testing, it normally wakes up about 1 millisecond late.
-  // However, sometimes it takes a bit longer.  Allow 5ms leeway.
-  int max_allowed_delta = flush_us + 5000;
-
-  const FsyncLog::CallList* calls = log.getCalls();
-  // We added 1 fsync call above.
-  // Make sure TFileTransport called fsync at least once
-  BOOST_WARN_GE(calls->size(), static_cast<FsyncLog::CallList::size_type>(1));
-
-  const struct timeval* prev_time = NULL;
-  for (FsyncLog::CallList::const_iterator it = calls->begin(); it != calls->end(); ++it) {
-    if (prev_time) {
-      int delta = time_diff(prev_time, &it->time);
-      BOOST_WARN_LT(delta, max_allowed_delta);
-    }
-    prev_time = &it->time;
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_flush_max_us1) {
-  // fsync every 10ms, write every 5ms, for 500ms
-  test_flush_max_us_impl(10000, 5000, 500000);
-}
-
-BOOST_AUTO_TEST_CASE(test_flush_max_us2) {
-  // fsync every 50ms, write every 20ms, for 500ms
-  test_flush_max_us_impl(50000, 20000, 500000);
-}
-
-BOOST_AUTO_TEST_CASE(test_flush_max_us3) {
-  // fsync every 400ms, write every 300ms, for 1s
-  test_flush_max_us_impl(400000, 300000, 1000000);
-}
-
-/**
- * Make sure flush() is fast when there is nothing to do.
- *
- * TFileTransport used to have a bug where flush() would wait for the fsync
- * timeout to expire.
- */
-BOOST_AUTO_TEST_CASE(test_noop_flush) {
-  TempFile f(tmp_dir, "thrift.TFileTransportTest.");
-  TFileTransport transport(f.getPath());
-
-  // Write something to start the writer thread.
-  uint8_t buf[] = "a";
-  transport.write(buf, 1);
-
-  struct timeval start;
-  gettimeofday(&start, NULL);
-
-  for (unsigned int n = 0; n < 10; ++n) {
-    transport.flush();
-
-    struct timeval now;
-    gettimeofday(&now, NULL);
-
-    // Fail if at any point we've been running for longer than half a second.
-    // (With the buggy code, TFileTransport used to take 3 seconds per flush())
-    //
-    // Use a fatal fail so we break out early, rather than continuing to make
-    // many more slow flush() calls.
-    int delta = time_diff(&start, &now);
-    BOOST_WARN_LT(delta, 2000000);
-  }
-}
-
-/**************************************************************************
- * General Initialization
- **************************************************************************/
-
-void print_usage(FILE* f, const char* argv0) {
-  fprintf(f, "Usage: %s [boost_options] [options]\n", argv0);
-  fprintf(f, "Options:\n");
-  fprintf(f, "  --tmp-dir=DIR, -t DIR\n");
-  fprintf(f, "  --help\n");
-}
-
-void parse_args(int argc, char* argv[]) {
-  struct option long_opts[]
-      = {{"help", false, NULL, 'h'}, {"tmp-dir", true, NULL, 't'}, {NULL, 0, NULL, 0}};
-
-  while (true) {
-    optopt = 1;
-    int optchar = getopt_long(argc, argv, "ht:", long_opts, NULL);
-    if (optchar == -1) {
-      break;
-    }
-
-    switch (optchar) {
-    case 't':
-      tmp_dir = optarg;
-      break;
-    case 'h':
-      print_usage(stdout, argv[0]);
-      exit(0);
-    case '?':
-      exit(1);
-    default:
-      // Only happens if someone adds another option to the optarg string,
-      // but doesn't update the switch statement to handle it.
-      fprintf(stderr, "unknown option \"-%c\"\n", optchar);
-      exit(1);
-    }
-  }
-}
-
-#ifdef BOOST_TEST_DYN_LINK
-static int myArgc = 0;
-static char **myArgv = NULL;
-
-bool init_unit_test_suite() {
-  boost::unit_test::framework::master_test_suite().p_name.value = "TFileTransportTest";
-
-  // Parse arguments
-  parse_args(myArgc,myArgv);
-  return true;
-}
-
-int main( int argc, char* argv[] ) {
-  myArgc = argc;
-  myArgv = argv;
-  return ::boost::unit_test::unit_test_main(&init_unit_test_suite,argc,argv);
-}
-#else
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-  boost::unit_test::framework::master_test_suite().p_name.value = "TFileTransportTest";
-
-  // Parse arguments
-  parse_args(argc, argv);
-  return NULL;
-}
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TMemoryBufferTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TMemoryBufferTest.cpp
deleted file mode 100644
index 84103e3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TMemoryBufferTest.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <boost/test/auto_unit_test.hpp>
-#include <iostream>
-#include <climits>
-#include <vector>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include "gen-cpp/ThriftTest_types.h"
-
-BOOST_AUTO_TEST_SUITE(TMemoryBufferTest)
-
-using apache::thrift::protocol::TBinaryProtocol;
-using apache::thrift::transport::TMemoryBuffer;
-using apache::thrift::transport::TTransportException;
-using boost::shared_ptr;
-using std::cout;
-using std::endl;
-using std::string;
-
-BOOST_AUTO_TEST_CASE(test_read_write_grow) {
-  // Added to test the fix for THRIFT-1248
-  TMemoryBuffer uut;
-  const int maxSize = 65536;
-  uint8_t verify[maxSize];
-  std::vector<uint8_t> buf;
-  buf.resize(maxSize);
-
-  for (uint32_t i = 0; i < maxSize; ++i) {
-    buf[i] = static_cast<uint8_t>(i);
-  }
-
-  for (uint32_t i = 1; i < maxSize; i *= 2) {
-    uut.write(&buf[0], i);
-  }
-
-  for (uint32_t i = 1; i < maxSize; i *= 2) {
-    uut.read(verify, i);
-    BOOST_CHECK_EQUAL(0, ::memcmp(verify, &buf[0], i));
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_roundtrip) {
-  shared_ptr<TMemoryBuffer> strBuffer(new TMemoryBuffer());
-  shared_ptr<TBinaryProtocol> binaryProtcol(new TBinaryProtocol(strBuffer));
-
-  thrift::test::Xtruct a;
-  a.i32_thing = 10;
-  a.i64_thing = 30;
-  a.string_thing = "holla back a";
-
-  a.write(binaryProtcol.get());
-  std::string serialized = strBuffer->getBufferAsString();
-
-  shared_ptr<TMemoryBuffer> strBuffer2(new TMemoryBuffer());
-  shared_ptr<TBinaryProtocol> binaryProtcol2(new TBinaryProtocol(strBuffer2));
-
-  strBuffer2->resetBuffer((uint8_t*)serialized.data(), static_cast<uint32_t>(serialized.length()));
-  thrift::test::Xtruct a2;
-  a2.read(binaryProtcol2.get());
-
-  BOOST_CHECK(a == a2);
-}
-
-BOOST_AUTO_TEST_CASE(test_copy) {
-  string* str1 = new string("abcd1234");
-  const char* data1 = str1->data();
-  TMemoryBuffer buf((uint8_t*)str1->data(),
-                    static_cast<uint32_t>(str1->length()),
-                    TMemoryBuffer::COPY);
-  delete str1;
-  string* str2 = new string("plsreuse");
-  bool obj_reuse = (str1 == str2);
-  bool dat_reuse = (data1 == str2->data());
-  BOOST_TEST_MESSAGE("Object reuse: " << obj_reuse << "   Data reuse: " << dat_reuse
-                << ((obj_reuse && dat_reuse) ? "   YAY!" : ""));
-  delete str2;
-
-  string str3 = "wxyz", str4 = "6789";
-  buf.readAppendToString(str3, 4);
-  buf.readAppendToString(str4, INT_MAX);
-
-  BOOST_CHECK(str3 == "wxyzabcd");
-  BOOST_CHECK(str4 == "67891234");
-}
-
-BOOST_AUTO_TEST_CASE(test_exceptions) {
-  char data[] = "foo\0bar";
-
-  TMemoryBuffer buf1((uint8_t*)data, 7, TMemoryBuffer::OBSERVE);
-  string str = buf1.getBufferAsString();
-  BOOST_CHECK(str.length() == 7);
-
-  buf1.resetBuffer();
-
-  BOOST_CHECK_THROW(buf1.write((const uint8_t*)"foo", 3), TTransportException);
-
-  TMemoryBuffer buf2((uint8_t*)data, 7, TMemoryBuffer::COPY);
-  BOOST_CHECK_NO_THROW(buf2.write((const uint8_t*)"bar", 3));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TNonblockingServerTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TNonblockingServerTest.cpp
deleted file mode 100644
index 48ea913..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TNonblockingServerTest.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define BOOST_TEST_MODULE TNonblockingServerTest
-#include <boost/test/unit_test.hpp>
-#include <boost/smart_ptr.hpp>
-
-#include "thrift/concurrency/Thread.h"
-#include "thrift/server/TNonblockingServer.h"
-
-#include "gen-cpp/ParentService.h"
-
-#include <event.h>
-
-using namespace apache::thrift;
-
-struct Handler : public test::ParentServiceIf {
-  void addString(const std::string& s) { strings_.push_back(s); }
-  void getStrings(std::vector<std::string>& _return) { _return = strings_; }
-  std::vector<std::string> strings_;
-
-  // dummy overrides not used in this test
-  int32_t incrementGeneration() { return 0; }
-  int32_t getGeneration() { return 0; }
-  void getDataWait(std::string&, const int32_t) {}
-  void onewayWait() {}
-  void exceptionWait(const std::string&) {}
-  void unexpectedExceptionWait(const std::string&) {}
-};
-
-class Fixture {
-private:
-  struct Runner : public apache::thrift::concurrency::Runnable {
-    int port;
-    boost::shared_ptr<event_base> userEventBase;
-    boost::shared_ptr<TProcessor> processor;
-    boost::shared_ptr<server::TNonblockingServer> server;
-
-    virtual void run() {
-      // When binding to explicit port, allow retrying to workaround bind failures on ports in use
-      int retryCount = port ? 10 : 0;
-      startServer(retryCount);
-    }
-
-  private:
-    void startServer(int retry_count) {
-      try {
-        server.reset(new server::TNonblockingServer(processor, port));
-        if (userEventBase) {
-          server->registerEvents(userEventBase.get());
-        }
-        server->serve();
-      } catch (const transport::TTransportException&) {
-        if (retry_count > 0) {
-          ++port;
-          startServer(retry_count - 1);
-        } else {
-          throw;
-        }
-      }
-    }
-  };
-
-  struct EventDeleter {
-    void operator()(event_base* p) { event_base_free(p); }
-  };
-
-protected:
-  Fixture() : processor(new test::ParentServiceProcessor(boost::make_shared<Handler>())) {}
-
-  ~Fixture() {
-    if (server) {
-      server->stop();
-    }
-    if (thread) {
-      thread->join();
-    }
-  }
-
-  void setEventBase(event_base* user_event_base) {
-    userEventBase_.reset(user_event_base, EventDeleter());
-  }
-
-  int startServer(int port) {
-    boost::shared_ptr<Runner> runner(new Runner);
-    runner->port = port;
-    runner->processor = processor;
-    runner->userEventBase = userEventBase_;
-
-    boost::scoped_ptr<apache::thrift::concurrency::ThreadFactory> threadFactory(
-        new apache::thrift::concurrency::PlatformThreadFactory(
-#if !USE_BOOST_THREAD && !USE_STD_THREAD
-            concurrency::PlatformThreadFactory::OTHER, concurrency::PlatformThreadFactory::NORMAL,
-            1,
-#endif
-            false));
-    thread = threadFactory->newThread(runner);
-    thread->start();
-    // wait 100 ms for the server to begin listening
-    THRIFT_SLEEP_USEC(100000);
-    server = runner->server;
-    return runner->port;
-  }
-
-  bool canCommunicate(int serverPort) {
-    boost::shared_ptr<transport::TSocket> socket(new transport::TSocket("localhost", serverPort));
-    socket->open();
-    test::ParentServiceClient client(boost::make_shared<protocol::TBinaryProtocol>(
-        boost::make_shared<transport::TFramedTransport>(socket)));
-    client.addString("foo");
-    std::vector<std::string> strings;
-    client.getStrings(strings);
-    return strings.size() == 1 && !(strings[0].compare("foo"));
-  }
-
-private:
-  boost::shared_ptr<event_base> userEventBase_;
-  boost::shared_ptr<test::ParentServiceProcessor> processor;
-protected:
-  boost::shared_ptr<server::TNonblockingServer> server;
-private:
-  boost::shared_ptr<apache::thrift::concurrency::Thread> thread;
-
-};
-
-BOOST_AUTO_TEST_SUITE(TNonblockingServerTest)
-
-BOOST_FIXTURE_TEST_CASE(get_specified_port, Fixture) {
-  int specified_port = startServer(12345);
-  BOOST_REQUIRE_GE(specified_port, 12345);
-  BOOST_REQUIRE_EQUAL(server->getListenPort(), specified_port);
-  BOOST_CHECK(canCommunicate(specified_port));
-
-  server->stop();
-  BOOST_CHECK_EQUAL(server->getListenPort(), specified_port);
-}
-
-BOOST_FIXTURE_TEST_CASE(get_assigned_port, Fixture) {
-  int specified_port = startServer(0);
-  BOOST_REQUIRE_EQUAL(specified_port, 0);
-  int assigned_port = server->getListenPort();
-  BOOST_REQUIRE_NE(assigned_port, 0);
-  BOOST_CHECK(canCommunicate(assigned_port));
-
-  server->stop();
-  BOOST_CHECK_EQUAL(server->getListenPort(), 0);
-}
-
-BOOST_FIXTURE_TEST_CASE(provide_event_base, Fixture) {
-  event_base* eb = event_base_new();
-  setEventBase(eb);
-  startServer(0);
-
-  // assert that the server works
-  BOOST_CHECK(canCommunicate(server->getListenPort()));
-#if LIBEVENT_VERSION_NUMBER > 0x02010400
-  // also assert that the event_base is actually used when it's easy
-  BOOST_CHECK_GT(event_base_get_num_events(eb, EVENT_BASE_COUNT_ADDED), 0);
-#endif
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TPipeInterruptTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TPipeInterruptTest.cpp
deleted file mode 100644
index 80e4c1f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TPipeInterruptTest.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifdef _WIN32
-
-#include <boost/test/test_tools.hpp>
-#include <boost/test/unit_test_suite.hpp>
-
-#include <boost/bind.hpp>
-#include <boost/chrono/duration.hpp>
-#include <boost/date_time/posix_time/posix_time_duration.hpp>
-#include <boost/thread/thread.hpp>
-#include <thrift/transport/TPipe.h>
-#include <thrift/transport/TPipeServer.h>
-
-using apache::thrift::transport::TPipeServer;
-using apache::thrift::transport::TPipe;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-
-BOOST_AUTO_TEST_SUITE(TPipeInterruptTest)
-
-// TODO: duplicate the test cases in TSocketInterruptTest for pipes,
-// once pipes implement interruptChildren
-
-BOOST_AUTO_TEST_CASE(test_interrupt_before_accept) {
-  TPipeServer pipe1("TPipeInterruptTest");
-  pipe1.listen();
-  pipe1.interrupt();
-  BOOST_CHECK_THROW(pipe1.accept(), TTransportException);
-}
-
-static void acceptWorker(TPipeServer *pipe) {
-  try
-  {
-    for (;;)
-    {
-      boost::shared_ptr<TTransport> temp = pipe->accept();
-    }
-  }
-  catch (...) {/*just want to make sure nothing crashes*/ }
-}
-
-static void interruptWorker(TPipeServer *pipe) {
-  boost::this_thread::sleep(boost::posix_time::milliseconds(10));
-  pipe->interrupt();
-}
-
-BOOST_AUTO_TEST_CASE(stress_pipe_accept_interruption) {
-  int interruptIters = 10;
-
-  for (int i = 0; i < interruptIters; ++i)
-  {
-    TPipeServer pipeServer("TPipeInterruptTest");
-    pipeServer.listen();
-    boost::thread acceptThread(boost::bind(acceptWorker, &pipeServer));
-    boost::thread interruptThread(boost::bind(interruptWorker, &pipeServer));
-    try
-    {
-      for (;;)
-      {
-        TPipe client("TPipeInterruptTest");
-        client.setConnTimeout(1);
-        client.open();
-      }
-    } catch (...) { /*just testing for crashes*/ }
-    interruptThread.join();
-    acceptThread.join();
-  }
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TPipedTransportTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TPipedTransportTest.cpp
deleted file mode 100644
index 3221fb9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TPipedTransportTest.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/Thrift.h>
-#include <thrift/transport/TTransportUtils.h>
-#include <thrift/transport/TBufferTransports.h>
-
-#define BOOST_TEST_MODULE TPipedTransportTest
-#include <boost/test/unit_test.hpp>
-
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TPipedTransport;
-using apache::thrift::transport::TMemoryBuffer;
-
-BOOST_AUTO_TEST_CASE(test_read_write) {
-  boost::shared_ptr<TMemoryBuffer> underlying(new TMemoryBuffer);
-  boost::shared_ptr<TMemoryBuffer> pipe(new TMemoryBuffer);
-  boost::shared_ptr<TPipedTransport> trans(new TPipedTransport(underlying, pipe));
-
-  uint8_t buffer[4];
-
-  underlying->write((uint8_t*)"abcd", 4);
-  trans->readAll(buffer, 2);
-  BOOST_CHECK(std::string((char*)buffer, 2) == "ab");
-  trans->readEnd();
-  BOOST_CHECK(pipe->getBufferAsString() == "ab");
-  pipe->resetBuffer();
-  underlying->write((uint8_t*)"ef", 2);
-  trans->readAll(buffer, 2);
-  BOOST_CHECK(std::string((char*)buffer, 2) == "cd");
-  trans->readAll(buffer, 2);
-  BOOST_CHECK(std::string((char*)buffer, 2) == "ef");
-  trans->readEnd();
-  BOOST_CHECK(pipe->getBufferAsString() == "cdef");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TSSLSocketInterruptTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TSSLSocketInterruptTest.cpp
deleted file mode 100644
index ba43daf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TSSLSocketInterruptTest.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <boost/test/auto_unit_test.hpp>
-#include <boost/test/unit_test_suite.hpp>
-#include <boost/bind.hpp>
-#include <boost/chrono/duration.hpp>
-#include <boost/date_time/posix_time/posix_time_duration.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/format.hpp>
-#include <boost/shared_ptr.hpp>
-#include <thrift/transport/TSSLSocket.h>
-#include <thrift/transport/TSSLServerSocket.h>
-#ifdef __linux__
-#include <signal.h>
-#endif
-
-using apache::thrift::transport::TSSLServerSocket;
-using apache::thrift::transport::TSSLSocket;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TSSLSocketFactory;
-
-BOOST_AUTO_TEST_SUITE(TSSLSocketInterruptTest)
-
-boost::filesystem::path keyDir;
-boost::filesystem::path certFile(const std::string& filename)
-{
-  return keyDir / filename;
-}
-boost::mutex gMutex;
-
-struct GlobalFixtureSSL
-{
-    GlobalFixtureSSL()
-    {
-      using namespace boost::unit_test::framework;
-      for (int i = 0; i < master_test_suite().argc; ++i)
-      {
-        BOOST_TEST_MESSAGE(boost::format("argv[%1%] = \"%2%\"") % i % master_test_suite().argv[i]);
-      }
-
-#ifdef __linux__
-      // OpenSSL calls send() without MSG_NOSIGPIPE so writing to a socket that has
-      // disconnected can cause a SIGPIPE signal...
-      signal(SIGPIPE, SIG_IGN);
-#endif
-
-      TSSLSocketFactory::setManualOpenSSLInitialization(true);
-      apache::thrift::transport::initializeOpenSSL();
-
-      keyDir = boost::filesystem::current_path().parent_path().parent_path().parent_path() / "test" / "keys";
-      if (!boost::filesystem::exists(certFile("server.crt")))
-      {
-        keyDir = boost::filesystem::path(master_test_suite().argv[master_test_suite().argc - 1]);
-        if (!boost::filesystem::exists(certFile("server.crt")))
-        {
-          throw std::invalid_argument("The last argument to this test must be the directory containing the test certificate(s).");
-        }
-      }
-    }
-
-    virtual ~GlobalFixtureSSL()
-    {
-      apache::thrift::transport::cleanupOpenSSL();
-#ifdef __linux__
-      signal(SIGPIPE, SIG_DFL);
-#endif
-    }
-};
-
-#if (BOOST_VERSION >= 105900)
-BOOST_GLOBAL_FIXTURE(GlobalFixtureSSL);
-#else
-BOOST_GLOBAL_FIXTURE(GlobalFixtureSSL)
-#endif
-
-void readerWorker(boost::shared_ptr<TTransport> tt, uint32_t expectedResult) {
-  uint8_t buf[4];
-  try {
-    tt->read(buf, 1);
-    BOOST_CHECK_EQUAL(expectedResult, tt->read(buf, 4));
-  } catch (const TTransportException& tx) {
-    BOOST_CHECK_EQUAL(TTransportException::TIMED_OUT, tx.getType());
-  }
-}
-
-void readerWorkerMustThrow(boost::shared_ptr<TTransport> tt) {
-  try {
-    uint8_t buf[400];
-    tt->read(buf, 1);
-    tt->read(buf, 400);
-    BOOST_ERROR("should not have gotten here");
-  } catch (const TTransportException& tx) {
-    BOOST_CHECK_EQUAL(TTransportException::INTERRUPTED, tx.getType());
-  }
-}
-
-boost::shared_ptr<TSSLSocketFactory> createServerSocketFactory() {
-  boost::shared_ptr<TSSLSocketFactory> pServerSocketFactory;
-
-  pServerSocketFactory.reset(new TSSLSocketFactory());
-  pServerSocketFactory->ciphers("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
-  pServerSocketFactory->loadCertificate(certFile("server.crt").string().c_str());
-  pServerSocketFactory->loadPrivateKey(certFile("server.key").string().c_str());
-  pServerSocketFactory->server(true);
-  return pServerSocketFactory;
-}
-
-boost::shared_ptr<TSSLSocketFactory> createClientSocketFactory() {
-  boost::shared_ptr<TSSLSocketFactory> pClientSocketFactory;
-
-  pClientSocketFactory.reset(new TSSLSocketFactory());
-  pClientSocketFactory->authenticate(true);
-  pClientSocketFactory->loadCertificate(certFile("client.crt").string().c_str());
-  pClientSocketFactory->loadPrivateKey(certFile("client.key").string().c_str());
-  pClientSocketFactory->loadTrustedCertificates(certFile("CA.pem").string().c_str());
-  return pClientSocketFactory;
-}
-
-BOOST_AUTO_TEST_CASE(test_ssl_interruptable_child_read_while_handshaking) {
-  boost::shared_ptr<TSSLSocketFactory> pServerSocketFactory = createServerSocketFactory();
-  TSSLServerSocket sock1("localhost", 0, pServerSocketFactory);
-  sock1.listen();
-  int port = sock1.getPort();
-  boost::shared_ptr<TSSLSocketFactory> pClientSocketFactory = createClientSocketFactory();
-  boost::shared_ptr<TSSLSocket> clientSock = pClientSocketFactory->createSocket("localhost", port);
-  clientSock->open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  boost::thread readThread(boost::bind(readerWorkerMustThrow, accepted));
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // readThread is practically guaranteed to be blocking now
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(readThread.try_join_for(boost::chrono::milliseconds(20)),
-  "server socket interruptChildren did not interrupt child read");
-  clientSock->close();
-  accepted->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_ssl_interruptable_child_read) {
-  boost::shared_ptr<TSSLSocketFactory> pServerSocketFactory = createServerSocketFactory();
-  TSSLServerSocket sock1("localhost", 0, pServerSocketFactory);
-  sock1.listen();
-  int port = sock1.getPort();
-  boost::shared_ptr<TSSLSocketFactory> pClientSocketFactory = createClientSocketFactory();
-  boost::shared_ptr<TSSLSocket> clientSock = pClientSocketFactory->createSocket("localhost", port);
-  clientSock->open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  boost::thread readThread(boost::bind(readerWorkerMustThrow, accepted));
-  clientSock->write((const uint8_t*)"0", 1);
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // readThread is practically guaranteed to be blocking now
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(readThread.try_join_for(boost::chrono::milliseconds(20)),
-                      "server socket interruptChildren did not interrupt child read");
-  accepted->close();
-  clientSock->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_ssl_non_interruptable_child_read) {
-  boost::shared_ptr<TSSLSocketFactory> pServerSocketFactory = createServerSocketFactory();
-  TSSLServerSocket sock1("localhost", 0, pServerSocketFactory);
-  sock1.setInterruptableChildren(false); // returns to pre-THRIFT-2441 behavior
-  sock1.listen();
-  int port = sock1.getPort();
-  boost::shared_ptr<TSSLSocketFactory> pClientSocketFactory = createClientSocketFactory();
-  boost::shared_ptr<TSSLSocket> clientSock = pClientSocketFactory->createSocket("localhost", port);
-  clientSock->open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  boost::static_pointer_cast<TSSLSocket>(accepted)->setRecvTimeout(1000);
-  boost::thread readThread(boost::bind(readerWorker, accepted, 0));
-  clientSock->write((const uint8_t*)"0", 1);
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // readThread is practically guaranteed to be blocking here
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(!readThread.try_join_for(boost::chrono::milliseconds(200)),
-                      "server socket interruptChildren interrupted child read");
-
-  // wait for receive timeout to kick in
-  readThread.join();
-  accepted->close();
-  clientSock->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_ssl_cannot_change_after_listen) {
-  boost::shared_ptr<TSSLSocketFactory> pServerSocketFactory = createServerSocketFactory();
-  TSSLServerSocket sock1("localhost", 0, pServerSocketFactory);
-  sock1.listen();
-  BOOST_CHECK_THROW(sock1.setInterruptableChildren(false), std::logic_error);
-  sock1.close();
-}
-
-void peekerWorker(boost::shared_ptr<TTransport> tt, bool expectedResult) {
-  uint8_t buf[400];
-  try {
-    tt->read(buf, 1);
-    tt->peek();
-  } catch (const TTransportException& tx) {
-    BOOST_CHECK_EQUAL(TTransportException::TIMED_OUT, tx.getType());
-  }
-}
-
-void peekerWorkerInterrupt(boost::shared_ptr<TTransport> tt) {
-  uint8_t buf[400];
-  try {
-    tt->read(buf, 1);
-    tt->peek();
-  } catch (const TTransportException& tx) {
-    BOOST_CHECK_EQUAL(TTransportException::INTERRUPTED, tx.getType());
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_ssl_interruptable_child_peek) {
-  boost::shared_ptr<TSSLSocketFactory> pServerSocketFactory = createServerSocketFactory();
-  TSSLServerSocket sock1("localhost", 0, pServerSocketFactory);
-  sock1.listen();
-  int port = sock1.getPort();
-  boost::shared_ptr<TSSLSocketFactory> pClientSocketFactory = createClientSocketFactory();
-  boost::shared_ptr<TSSLSocket> clientSock = pClientSocketFactory->createSocket("localhost", port);
-  clientSock->open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  boost::thread peekThread(boost::bind(peekerWorkerInterrupt, accepted));
-  clientSock->write((const uint8_t*)"0", 1);
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // peekThread is practically guaranteed to be blocking now
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(peekThread.try_join_for(boost::chrono::milliseconds(200)),
-                      "server socket interruptChildren did not interrupt child peek");
-  accepted->close();
-  clientSock->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_ssl_non_interruptable_child_peek) {
-  boost::shared_ptr<TSSLSocketFactory> pServerSocketFactory = createServerSocketFactory();
-  TSSLServerSocket sock1("localhost", 0, pServerSocketFactory);
-  sock1.setInterruptableChildren(false); // returns to pre-THRIFT-2441 behavior
-  sock1.listen();
-  int port = sock1.getPort();
-  boost::shared_ptr<TSSLSocketFactory> pClientSocketFactory = createClientSocketFactory();
-  boost::shared_ptr<TSSLSocket> clientSock = pClientSocketFactory->createSocket("localhost", port);
-  clientSock->open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  boost::static_pointer_cast<TSSLSocket>(accepted)->setRecvTimeout(1000);
-  boost::thread peekThread(boost::bind(peekerWorker, accepted, false));
-  clientSock->write((const uint8_t*)"0", 1);
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // peekThread is practically guaranteed to be blocking now
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(!peekThread.try_join_for(boost::chrono::milliseconds(200)),
-                      "server socket interruptChildren interrupted child peek");
-
-  // wait for the receive timeout to kick in
-  peekThread.join();
-  accepted->close();
-  clientSock->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerIntegrationTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerIntegrationTest.cpp
deleted file mode 100644
index fd7bae2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerIntegrationTest.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define BOOST_TEST_MODULE TServerIntegrationTest
-#include <boost/test/auto_unit_test.hpp>
-#include <boost/atomic.hpp>
-#include <boost/bind.hpp>
-#include <boost/date_time/posix_time/ptime.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-#include <thrift/server/TSimpleServer.h>
-#include <thrift/server/TThreadPoolServer.h>
-#include <thrift/server/TThreadedServer.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/transport/TServerSocket.h>
-#include <thrift/transport/TSocket.h>
-#include <thrift/transport/TTransport.h>
-#include "gen-cpp/ParentService.h"
-#include <string>
-#include <vector>
-
-using apache::thrift::concurrency::Guard;
-using apache::thrift::concurrency::Monitor;
-using apache::thrift::concurrency::Mutex;
-using apache::thrift::concurrency::Synchronized;
-using apache::thrift::protocol::TBinaryProtocol;
-using apache::thrift::protocol::TBinaryProtocolFactory;
-using apache::thrift::protocol::TProtocol;
-using apache::thrift::protocol::TProtocolFactory;
-using apache::thrift::transport::TServerSocket;
-using apache::thrift::transport::TServerTransport;
-using apache::thrift::transport::TSocket;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-using apache::thrift::transport::TTransportFactory;
-using apache::thrift::server::TServer;
-using apache::thrift::server::TServerEventHandler;
-using apache::thrift::server::TSimpleServer;
-using apache::thrift::server::TThreadPoolServer;
-using apache::thrift::server::TThreadedServer;
-using apache::thrift::test::ParentServiceClient;
-using apache::thrift::test::ParentServiceIf;
-using apache::thrift::test::ParentServiceIfFactory;
-using apache::thrift::test::ParentServiceIfSingletonFactory;
-using apache::thrift::test::ParentServiceProcessor;
-using apache::thrift::test::ParentServiceProcessorFactory;
-using apache::thrift::TProcessor;
-using apache::thrift::TProcessorFactory;
-using boost::posix_time::milliseconds;
-
-/**
- * preServe runs after listen() is successful, when we can connect
- */
-class TServerReadyEventHandler : public TServerEventHandler, public Monitor {
-public:
-  TServerReadyEventHandler() : isListening_(false), accepted_(0) {}
-  virtual ~TServerReadyEventHandler() {}
-  virtual void preServe() {
-    Synchronized sync(*this);
-    isListening_ = true;
-    notify();
-  }
-  virtual void* createContext(boost::shared_ptr<TProtocol> input,
-                              boost::shared_ptr<TProtocol> output) {
-    Synchronized sync(*this);
-    ++accepted_;
-    notify();
-
-    (void)input;
-    (void)output;
-    return NULL;
-  }
-  bool isListening() const { return isListening_; }
-  uint64_t acceptedCount() const { return accepted_; }
-
-private:
-  bool isListening_;
-  uint64_t accepted_;
-};
-
-/**
- * Reusing another generated test, just something to serve up
- */
-class ParentHandler : public ParentServiceIf {
-public:
-  ParentHandler() : generation_(0) {}
-
-  int32_t incrementGeneration() {
-    Guard g(mutex_);
-    return ++generation_;
-  }
-
-  int32_t getGeneration() {
-    Guard g(mutex_);
-    return generation_;
-  }
-
-  void addString(const std::string& s) {
-    Guard g(mutex_);
-    strings_.push_back(s);
-  }
-
-  void getStrings(std::vector<std::string>& _return) {
-    Guard g(mutex_);
-    _return = strings_;
-  }
-
-  void getDataWait(std::string& _return, const int32_t length) {
-    THRIFT_UNUSED_VARIABLE(_return);
-    THRIFT_UNUSED_VARIABLE(length);
-  }
-
-  void onewayWait() {}
-
-  void exceptionWait(const std::string& message) { THRIFT_UNUSED_VARIABLE(message); }
-
-  void unexpectedExceptionWait(const std::string& message) { THRIFT_UNUSED_VARIABLE(message); }
-
-protected:
-  Mutex mutex_;
-  int32_t generation_;
-  std::vector<std::string> strings_;
-};
-
-void autoSocketCloser(TSocket* pSock) {
-  pSock->close();
-  delete pSock;
-}
-
-template <class TServerType>
-class TServerIntegrationTestFixture {
-public:
-  TServerIntegrationTestFixture(const boost::shared_ptr<TProcessorFactory>& _processorFactory)
-    : pServer(new TServerType(_processorFactory,
-                              boost::shared_ptr<TServerTransport>(
-                                  new TServerSocket("localhost", 0)),
-                              boost::shared_ptr<TTransportFactory>(new TTransportFactory),
-                              boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory))),
-      pEventHandler(boost::shared_ptr<TServerReadyEventHandler>(new TServerReadyEventHandler)),
-    bStressDone(false),
-    bStressConnectionCount(0),
-    bStressRequestCount(0) {
-    pServer->setServerEventHandler(pEventHandler);
-  }
-
-  TServerIntegrationTestFixture(const boost::shared_ptr<TProcessor>& _processor)
-    : pServer(
-          new TServerType(_processor,
-                          boost::shared_ptr<TServerTransport>(new TServerSocket("localhost", 0)),
-                          boost::shared_ptr<TTransportFactory>(new TTransportFactory),
-                          boost::shared_ptr<TProtocolFactory>(new TBinaryProtocolFactory))),
-      pEventHandler(boost::shared_ptr<TServerReadyEventHandler>(new TServerReadyEventHandler)),
-      bStressDone(false),
-    bStressConnectionCount(0),
-    bStressRequestCount(0) {
-    pServer->setServerEventHandler(pEventHandler);
-  }
-
-  void startServer() {
-    pServerThread.reset(new boost::thread(boost::bind(&TServerType::serve, pServer.get())));
-
-    // block until listen() completes so clients will be able to connect
-    Synchronized sync(*(pEventHandler.get()));
-    while (!pEventHandler->isListening()) {
-      pEventHandler->wait();
-    }
-
-    BOOST_TEST_MESSAGE("  server is listening");
-  }
-
-  void blockUntilAccepted(uint64_t numAccepted) {
-    Synchronized sync(*(pEventHandler.get()));
-    while (pEventHandler->acceptedCount() < numAccepted) {
-      pEventHandler->wait();
-    }
-
-    BOOST_TEST_MESSAGE(boost::format("  server has accepted %1%") % numAccepted);
-  }
-
-  void stopServer() {
-    if (pServerThread) {
-      pServer->stop();
-      BOOST_TEST_MESSAGE("  server stop completed");
-
-      pServerThread->join();
-      BOOST_TEST_MESSAGE("  server thread joined");
-      pServerThread.reset();
-    }
-  }
-
-  ~TServerIntegrationTestFixture() { stopServer(); }
-
-  /**
-   * Performs a baseline test where some clients are opened and issue a single operation
-   * and then disconnect at different intervals.
-   * \param[in]  numToMake  the number of concurrent clients
-   * \param[in]  expectedHWM  the high water mark we expect of concurrency
-   * \param[in]  purpose  a description of the test for logging purposes
-   */
-  void baseline(int64_t numToMake, int64_t expectedHWM, const std::string& purpose) {
-    BOOST_TEST_MESSAGE(boost::format("Testing %1%: %2% with %3% clients, expect %4% HWM")
-            % typeid(TServerType).name() % purpose % numToMake % expectedHWM);
-
-    startServer();
-
-    std::vector<boost::shared_ptr<TSocket> > holdSockets;
-    std::vector<boost::shared_ptr<boost::thread> > holdThreads;
-
-    for (int64_t i = 0; i < numToMake; ++i) {
-      boost::shared_ptr<TSocket> pClientSock(new TSocket("localhost", getServerPort()),
-                                             autoSocketCloser);
-      holdSockets.push_back(pClientSock);
-      boost::shared_ptr<TProtocol> pClientProtocol(new TBinaryProtocol(pClientSock));
-      ParentServiceClient client(pClientProtocol);
-      pClientSock->open();
-      client.incrementGeneration();
-      holdThreads.push_back(boost::shared_ptr<boost::thread>(
-          new boost::thread(boost::bind(&TServerIntegrationTestFixture::delayClose,
-                                        this,
-                                        pClientSock,
-                                        milliseconds(10 * numToMake)))));
-    }
-
-    BOOST_CHECK_EQUAL(expectedHWM, pServer->getConcurrentClientCountHWM());
-
-    BOOST_FOREACH (boost::shared_ptr<boost::thread> pThread, holdThreads) { pThread->join(); }
-    holdThreads.clear();
-    holdSockets.clear();
-
-    stopServer();
-  }
-
-  /**
-   * Helper method used to close a connection after a delay.
-   * \param[in]  toClose  the connection to close
-   * \param[in]  after  the delay to impose
-   */
-  void delayClose(boost::shared_ptr<TTransport> toClose, boost::posix_time::time_duration after) {
-    boost::this_thread::sleep(after);
-    toClose->close();
-  }
-
-  /**
-   * \returns  the server port number
-   */
-  int getServerPort() {
-    TServerSocket* pSock = dynamic_cast<TServerSocket*>(pServer->getServerTransport().get());
-    return pSock->getPort();
-  }
-
-  /**
-   * Performs a stress test by spawning threads that connect, do a number of operations
-   * and disconnect, then a random delay, then do it over again.  This is done for a fixed
-   * period of time to test for concurrency correctness.
-   * \param[in]  numToMake  the number of concurrent clients
-   */
-  void stress(int64_t numToMake, const boost::posix_time::time_duration& duration) {
-    BOOST_TEST_MESSAGE(boost::format("Stress testing %1% with %2% clients for %3% seconds")
-        % typeid(TServerType).name() % numToMake % duration.total_seconds());
-
-    startServer();
-
-    std::vector<boost::shared_ptr<boost::thread> > holdThreads;
-    for (int64_t i = 0; i < numToMake; ++i) {
-      holdThreads.push_back(boost::shared_ptr<boost::thread>(
-        new boost::thread(boost::bind(&TServerIntegrationTestFixture::stressor, this))));
-    }
-
-    boost::this_thread::sleep(duration);
-    bStressDone = true;
-
-    BOOST_TEST_MESSAGE(boost::format("  serviced %1% connections (HWM %2%) totaling %3% requests")
-        % bStressConnectionCount % pServer->getConcurrentClientCountHWM() % bStressRequestCount);
-
-    BOOST_FOREACH (boost::shared_ptr<boost::thread> pThread, holdThreads) { pThread->join(); }
-    holdThreads.clear();
-
-    BOOST_CHECK(bStressRequestCount > 0);
-
-    stopServer();
-  }
-
-  /**
-   * Helper method to stress the system
-   */
-  void stressor() {
-  while (!bStressDone) {
-      boost::shared_ptr<TSocket> pSocket(new TSocket("localhost", getServerPort()), autoSocketCloser);
-      boost::shared_ptr<TProtocol> pProtocol(new TBinaryProtocol(pSocket));
-      ParentServiceClient client(pProtocol);
-      pSocket->open();
-      bStressConnectionCount.fetch_add(1, boost::memory_order_relaxed);
-      for (int i = 0; i < rand() % 1000; ++i) {
-      client.incrementGeneration();
-        bStressRequestCount.fetch_add(1, boost::memory_order_relaxed);
-      }
-    }
-  }
-
-  boost::shared_ptr<TServerType> pServer;
-  boost::shared_ptr<TServerReadyEventHandler> pEventHandler;
-  boost::shared_ptr<boost::thread> pServerThread;
-  bool bStressDone;
-  boost::atomic_int64_t bStressConnectionCount;
-  boost::atomic_int64_t bStressRequestCount;
-};
-
-template <class TServerType>
-class TServerIntegrationProcessorFactoryTestFixture
-    : public TServerIntegrationTestFixture<TServerType> {
-public:
-  TServerIntegrationProcessorFactoryTestFixture()
-    : TServerIntegrationTestFixture<TServerType>(boost::make_shared<ParentServiceProcessorFactory>(
-          boost::make_shared<ParentServiceIfSingletonFactory>(
-              boost::make_shared<ParentHandler>()))) {}
-};
-
-template <class TServerType>
-class TServerIntegrationProcessorTestFixture : public TServerIntegrationTestFixture<TServerType> {
-public:
-  TServerIntegrationProcessorTestFixture()
-    : TServerIntegrationTestFixture<TServerType>(
-          boost::make_shared<ParentServiceProcessor>(boost::make_shared<ParentHandler>())) {}
-};
-
-BOOST_AUTO_TEST_SUITE(constructors)
-
-BOOST_FIXTURE_TEST_CASE(test_simple_factory,
-                        TServerIntegrationProcessorFactoryTestFixture<TSimpleServer>) {
-  baseline(3, 1, "factory");
-}
-
-BOOST_FIXTURE_TEST_CASE(test_simple, TServerIntegrationProcessorTestFixture<TSimpleServer>) {
-  baseline(3, 1, "processor");
-}
-
-BOOST_FIXTURE_TEST_CASE(test_threaded_factory,
-                        TServerIntegrationProcessorFactoryTestFixture<TThreadedServer>) {
-  baseline(10, 10, "factory");
-}
-
-BOOST_FIXTURE_TEST_CASE(test_threaded, TServerIntegrationProcessorTestFixture<TThreadedServer>) {
-  baseline(10, 10, "processor");
-}
-
-BOOST_FIXTURE_TEST_CASE(test_threaded_bound,
-                        TServerIntegrationProcessorTestFixture<TThreadedServer>) {
-  pServer->setConcurrentClientLimit(4);
-  baseline(10, 4, "limit by server framework");
-}
-
-BOOST_FIXTURE_TEST_CASE(test_threaded_stress,
-                        TServerIntegrationProcessorFactoryTestFixture<TThreadedServer>) {
-  stress(10, boost::posix_time::seconds(3));
-}
-
-BOOST_FIXTURE_TEST_CASE(test_threadpool_factory,
-                        TServerIntegrationProcessorFactoryTestFixture<TThreadPoolServer>) {
-  pServer->getThreadManager()->threadFactory(
-      boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>(
-          new apache::thrift::concurrency::PlatformThreadFactory));
-  pServer->getThreadManager()->start();
-
-  // thread factory has 4 threads as a default
-  // thread factory however is a bad way to limit concurrent clients
-  // as accept() will be called to grab a 5th client socket, in this case
-  // and then the thread factory will block adding the thread to manage
-  // that client.
-  baseline(10, 5, "limit by thread manager");
-}
-
-BOOST_FIXTURE_TEST_CASE(test_threadpool,
-                        TServerIntegrationProcessorTestFixture<TThreadPoolServer>) {
-  pServer->getThreadManager()->threadFactory(
-      boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>(
-          new apache::thrift::concurrency::PlatformThreadFactory));
-  pServer->getThreadManager()->start();
-
-  // thread factory has 4 threads as a default
-  // thread factory however is a bad way to limit concurrent clients
-  // as accept() will be called to grab a 5th client socket, in this case
-  // and then the thread factory will block adding the thread to manage
-  // that client.
-  baseline(10, 5, "limit by thread manager");
-}
-
-BOOST_FIXTURE_TEST_CASE(test_threadpool_bound,
-                        TServerIntegrationProcessorTestFixture<TThreadPoolServer>) {
-  pServer->getThreadManager()->threadFactory(
-      boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>(
-          new apache::thrift::concurrency::PlatformThreadFactory));
-  pServer->getThreadManager()->start();
-  pServer->setConcurrentClientLimit(4);
-
-  baseline(10, 4, "server framework connection limit");
-}
-
-BOOST_FIXTURE_TEST_CASE(test_threadpool_stress,
-                        TServerIntegrationProcessorTestFixture<TThreadPoolServer>) {
-  pServer->getThreadManager()->threadFactory(
-      boost::shared_ptr<apache::thrift::concurrency::ThreadFactory>(
-          new apache::thrift::concurrency::PlatformThreadFactory));
-  pServer->getThreadManager()->start();
-
-  stress(10, boost::posix_time::seconds(3));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_FIXTURE_TEST_SUITE(TServerIntegrationTest,
-                         TServerIntegrationProcessorTestFixture<TThreadedServer>)
-
-BOOST_AUTO_TEST_CASE(test_stop_with_interruptable_clients_connected) {
-  // This tests THRIFT-2441 new behavior: stopping the server disconnects clients
-  BOOST_TEST_MESSAGE("Testing stop with interruptable clients");
-
-  startServer();
-
-  boost::shared_ptr<TSocket> pClientSock1(new TSocket("localhost", getServerPort()),
-                                          autoSocketCloser);
-  pClientSock1->open();
-
-  boost::shared_ptr<TSocket> pClientSock2(new TSocket("localhost", getServerPort()),
-                                          autoSocketCloser);
-  pClientSock2->open();
-
-  // Ensure they have been accepted
-  blockUntilAccepted(2);
-
-  // The test fixture destructor will force the sockets to disconnect
-  // Prior to THRIFT-2441, pServer->stop() would hang until clients disconnected
-  stopServer();
-
-  // extra proof the server end disconnected the clients
-  uint8_t buf[1];
-  BOOST_CHECK_EQUAL(0, pClientSock1->read(&buf[0], 1)); // 0 = disconnected
-  BOOST_CHECK_EQUAL(0, pClientSock2->read(&buf[0], 1)); // 0 = disconnected
-}
-
-BOOST_AUTO_TEST_CASE(test_stop_with_uninterruptable_clients_connected) {
-  // This tests pre-THRIFT-2441 behavior: stopping the server blocks until clients
-  // disconnect.
-    BOOST_TEST_MESSAGE("Testing stop with uninterruptable clients");
-
-  boost::dynamic_pointer_cast<TServerSocket>(pServer->getServerTransport())
-      ->setInterruptableChildren(false); // returns to pre-THRIFT-2441 behavior
-
-  startServer();
-
-  boost::shared_ptr<TSocket> pClientSock1(new TSocket("localhost", getServerPort()),
-                                          autoSocketCloser);
-  pClientSock1->open();
-
-  boost::shared_ptr<TSocket> pClientSock2(new TSocket("localhost", getServerPort()),
-                                          autoSocketCloser);
-  pClientSock2->open();
-
-  // Ensure they have been accepted
-  blockUntilAccepted(2);
-
-  boost::thread t1(boost::bind(&TServerIntegrationTestFixture::delayClose,
-                               this,
-                               pClientSock1,
-                               milliseconds(250)));
-  boost::thread t2(boost::bind(&TServerIntegrationTestFixture::delayClose,
-                               this,
-                               pClientSock2,
-                               milliseconds(250)));
-
-  // Once the clients disconnect the server will stop
-  stopServer();
-  BOOST_CHECK(pServer->getConcurrentClientCountHWM() > 0);
-  t1.join();
-  t2.join();
-}
-
-BOOST_AUTO_TEST_CASE(test_concurrent_client_limit) {
-  startServer();
-  BOOST_TEST_MESSAGE("Testing the concurrent client limit");
-
-  BOOST_CHECK_EQUAL(INT64_MAX, pServer->getConcurrentClientLimit());
-  pServer->setConcurrentClientLimit(2);
-  BOOST_CHECK_EQUAL(0, pServer->getConcurrentClientCount());
-  BOOST_CHECK_EQUAL(2, pServer->getConcurrentClientLimit());
-
-  boost::shared_ptr<TSocket> pClientSock1(new TSocket("localhost", getServerPort()),
-                                          autoSocketCloser);
-  pClientSock1->open();
-  blockUntilAccepted(1);
-  BOOST_CHECK_EQUAL(1, pServer->getConcurrentClientCount());
-
-  boost::shared_ptr<TSocket> pClientSock2(new TSocket("localhost", getServerPort()),
-                                          autoSocketCloser);
-  pClientSock2->open();
-  blockUntilAccepted(2);
-  BOOST_CHECK_EQUAL(2, pServer->getConcurrentClientCount());
-
-  // a third client cannot connect until one of the other two closes
-  boost::thread t2(boost::bind(&TServerIntegrationTestFixture::delayClose,
-                               this,
-                               pClientSock2,
-                               milliseconds(250)));
-  boost::shared_ptr<TSocket> pClientSock3(new TSocket("localhost", getServerPort()),
-                                          autoSocketCloser);
-  pClientSock2->open();
-  blockUntilAccepted(2);
-  BOOST_CHECK_EQUAL(2, pServer->getConcurrentClientCount());
-  BOOST_CHECK_EQUAL(2, pServer->getConcurrentClientCountHWM());
-
-  stopServer();
-  BOOST_CHECK(pServer->getConcurrentClientCountHWM() > 0);
-  t2.join();
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerSocketTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerSocketTest.cpp
deleted file mode 100644
index 1da5d36..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerSocketTest.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <boost/test/auto_unit_test.hpp>
-#include <thrift/transport/TSocket.h>
-#include <thrift/transport/TServerSocket.h>
-#include "TTransportCheckThrow.h"
-#include <iostream>
-
-using apache::thrift::transport::TServerSocket;
-using apache::thrift::transport::TSocket;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-
-BOOST_AUTO_TEST_SUITE(TServerSocketTest)
-
-BOOST_AUTO_TEST_CASE(test_bind_to_address) {
-  TServerSocket sock1("localhost", 0);
-  sock1.listen();
-  int port = sock1.getPort();
-  TSocket clientSock("localhost", port);
-  clientSock.open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  accepted->close();
-  sock1.close();
-
-  std::cout << "An error message from getaddrinfo on the console is expected:" << std::endl;
-  TServerSocket sock2("257.258.259.260", 0);
-  BOOST_CHECK_THROW(sock2.listen(), TTransportException);
-  sock2.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_listen_valid_port) {
-  TServerSocket sock1(-1);
-  TTRANSPORT_CHECK_THROW(sock1.listen(), TTransportException::BAD_ARGS);
-
-  TServerSocket sock2(65536);
-  TTRANSPORT_CHECK_THROW(sock2.listen(), TTransportException::BAD_ARGS);
-}
-
-BOOST_AUTO_TEST_CASE(test_close_before_listen) {
-  TServerSocket sock1("localhost", 0);
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_get_port) {
-  TServerSocket sock1("localHost", 888);
-  BOOST_CHECK_EQUAL(888, sock1.getPort());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerTransportTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerTransportTest.cpp
deleted file mode 100644
index a554622..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TServerTransportTest.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <boost/test/auto_unit_test.hpp>
-#include <thrift/transport/TSocket.h>
-#include <thrift/transport/TServerTransport.h>
-
-using apache::thrift::transport::TServerTransport;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-
-BOOST_AUTO_TEST_SUITE(TServerTransportTest)
-
-class TestTTransport : public TTransport {};
-
-class TestTServerTransport : public TServerTransport {
-public:
-  TestTServerTransport() : valid_(true) {}
-  void close() {}
-  bool valid_;
-
-protected:
-  boost::shared_ptr<TTransport> acceptImpl() {
-    return valid_ ? boost::shared_ptr<TestTTransport>(new TestTTransport)
-                  : boost::shared_ptr<TestTTransport>();
-  }
-};
-
-BOOST_AUTO_TEST_CASE(test_positive_accept) {
-  TestTServerTransport uut;
-  BOOST_CHECK(uut.accept());
-}
-
-BOOST_AUTO_TEST_CASE(test_negative_accept) {
-  TestTServerTransport uut;
-  uut.valid_ = false;
-  BOOST_CHECK_THROW(uut.accept(), TTransportException);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TSocketInterruptTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TSocketInterruptTest.cpp
deleted file mode 100644
index 27b89eb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TSocketInterruptTest.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define BOOST_TEST_MODULE TSocketInterruptTest
-#include <boost/test/auto_unit_test.hpp>
-
-#include <boost/bind.hpp>
-#include <boost/chrono/duration.hpp>
-#include <boost/date_time/posix_time/posix_time_duration.hpp>
-#include <boost/thread/thread.hpp>
-#include <thrift/transport/TSocket.h>
-#include <thrift/transport/TServerSocket.h>
-
-using apache::thrift::transport::TServerSocket;
-using apache::thrift::transport::TSocket;
-using apache::thrift::transport::TTransport;
-using apache::thrift::transport::TTransportException;
-
-BOOST_AUTO_TEST_SUITE(TSocketInterruptTest)
-
-void readerWorker(boost::shared_ptr<TTransport> tt, uint32_t expectedResult) {
-  uint8_t buf[4];
-  BOOST_CHECK_EQUAL(expectedResult, tt->read(buf, 4));
-}
-
-void readerWorkerMustThrow(boost::shared_ptr<TTransport> tt) {
-  try {
-    uint8_t buf[4];
-    tt->read(buf, 4);
-    BOOST_ERROR("should not have gotten here");
-  } catch (const TTransportException& tx) {
-    BOOST_CHECK_EQUAL(TTransportException::INTERRUPTED, tx.getType());
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_interruptable_child_read) {
-  TServerSocket sock1("localhost", 0);
-  sock1.listen();
-  int port = sock1.getPort();
-  TSocket clientSock("localhost", port);
-  clientSock.open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  boost::thread readThread(boost::bind(readerWorkerMustThrow, accepted));
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // readThread is practically guaranteed to be blocking now
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(readThread.try_join_for(boost::chrono::milliseconds(200)),
-                      "server socket interruptChildren did not interrupt child read");
-  clientSock.close();
-  accepted->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_non_interruptable_child_read) {
-  TServerSocket sock1("localhost", 0);
-  sock1.setInterruptableChildren(false); // returns to pre-THRIFT-2441 behavior
-  sock1.listen();
-  int port = sock1.getPort();
-  TSocket clientSock("localhost", port);
-  clientSock.open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  boost::thread readThread(boost::bind(readerWorker, accepted, 0));
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // readThread is practically guaranteed to be blocking here
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(!readThread.try_join_for(boost::chrono::milliseconds(200)),
-                      "server socket interruptChildren interrupted child read");
-
-  // only way to proceed is to have the client disconnect
-  clientSock.close();
-  readThread.join();
-  accepted->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_cannot_change_after_listen) {
-  TServerSocket sock1("localhost", 0);
-  sock1.listen();
-  BOOST_CHECK_THROW(sock1.setInterruptableChildren(false), std::logic_error);
-  sock1.close();
-}
-
-void peekerWorker(boost::shared_ptr<TTransport> tt, bool expectedResult) {
-  BOOST_CHECK_EQUAL(expectedResult, tt->peek());
-}
-
-BOOST_AUTO_TEST_CASE(test_interruptable_child_peek) {
-  TServerSocket sock1("localhost", 0);
-  sock1.listen();
-  int port = sock1.getPort();
-  TSocket clientSock("localhost", port);
-  clientSock.open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  // peek() will return false if child is interrupted
-  boost::thread peekThread(boost::bind(peekerWorker, accepted, false));
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // peekThread is practically guaranteed to be blocking now
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(peekThread.try_join_for(boost::chrono::milliseconds(200)),
-                      "server socket interruptChildren did not interrupt child peek");
-  clientSock.close();
-  accepted->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_CASE(test_non_interruptable_child_peek) {
-  TServerSocket sock1("localhost", 0);
-  sock1.setInterruptableChildren(false); // returns to pre-THRIFT-2441 behavior
-  sock1.listen();
-  int port = sock1.getPort();
-  TSocket clientSock("localhost", port);
-  clientSock.open();
-  boost::shared_ptr<TTransport> accepted = sock1.accept();
-  // peek() will return false when remote side is closed
-  boost::thread peekThread(boost::bind(peekerWorker, accepted, false));
-  boost::this_thread::sleep(boost::posix_time::milliseconds(50));
-  // peekThread is practically guaranteed to be blocking now
-  sock1.interruptChildren();
-  BOOST_CHECK_MESSAGE(!peekThread.try_join_for(boost::chrono::milliseconds(200)),
-                      "server socket interruptChildren interrupted child peek");
-
-  // only way to proceed is to have the client disconnect
-  clientSock.close();
-  peekThread.join();
-  accepted->close();
-  sock1.close();
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TTransportCheckThrow.h b/vendor/git.apache.org/thrift.git/lib/cpp/test/TTransportCheckThrow.h
deleted file mode 100644
index 92277b4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TTransportCheckThrow.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#pragma once
-
-#define TTRANSPORT_CHECK_THROW(_CALL, _TYPE)                                                       \
-  {                                                                                                \
-    bool caught = false;                                                                           \
-    try {                                                                                          \
-      (_CALL);                                                                                     \
-    } catch (TTransportException & ex) {                                                           \
-      BOOST_CHECK_EQUAL(ex.getType(), _TYPE);                                                      \
-      caught = true;                                                                               \
-    }                                                                                              \
-    BOOST_CHECK_MESSAGE(caught, "expected TTransportException but nothing was thrown");            \
-  }
-
-#define TTRANSPORT_REQUIRE_THROW(_CALL, _TYPE)                                                     \
-  {                                                                                                \
-    bool caught = false;                                                                           \
-    try {                                                                                          \
-      (_CALL);                                                                                     \
-    } catch (TTransportException & ex) {                                                           \
-      BOOST_REQUIRE_EQUAL(ex.getType(), _TYPE);                                                    \
-      caught = true;                                                                               \
-    }                                                                                              \
-    BOOST_REQUIRE_MESSAGE(caught, "expected TTransportException but nothing was thrown");          \
-  }
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/ThriftTest_extras.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/ThriftTest_extras.cpp
deleted file mode 100644
index af5606e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/ThriftTest_extras.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Extra functions required for ThriftTest_types to work
-
-#include <thrift/protocol/TDebugProtocol.h>
-#include "gen-cpp/ThriftTest_types.h"
-
-namespace thrift {
-namespace test {
-
-bool Insanity::operator<(thrift::test::Insanity const& other) const {
-  using apache::thrift::ThriftDebugString;
-  return ThriftDebugString(*this) < ThriftDebugString(other);
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/ToStringTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/ToStringTest.cpp
deleted file mode 100644
index d204cb3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/ToStringTest.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <vector>
-#include <map>
-
-#include <boost/test/auto_unit_test.hpp>
-
-#include <thrift/TToString.h>
-
-#include "gen-cpp/ThriftTest_types.h"
-#include "gen-cpp/OptionalRequiredTest_types.h"
-#include "gen-cpp/DebugProtoTest_types.h"
-
-using apache::thrift::to_string;
-
-BOOST_AUTO_TEST_SUITE(ToStringTest)
-
-BOOST_AUTO_TEST_CASE(base_types_to_string) {
-  BOOST_CHECK_EQUAL(to_string(10), "10");
-  BOOST_CHECK_EQUAL(to_string(true), "1");
-  BOOST_CHECK_EQUAL(to_string('a'), "a");
-  BOOST_CHECK_EQUAL(to_string(1.2), "1.2");
-  BOOST_CHECK_EQUAL(to_string("abc"), "abc");
-}
-
-BOOST_AUTO_TEST_CASE(empty_vector_to_string) {
-  std::vector<int> l;
-  BOOST_CHECK_EQUAL(to_string(l), "[]");
-}
-
-BOOST_AUTO_TEST_CASE(single_item_vector_to_string) {
-  std::vector<int> l;
-  l.push_back(100);
-  BOOST_CHECK_EQUAL(to_string(l), "[100]");
-}
-
-BOOST_AUTO_TEST_CASE(multiple_item_vector_to_string) {
-  std::vector<int> l;
-  l.push_back(100);
-  l.push_back(150);
-  BOOST_CHECK_EQUAL(to_string(l), "[100, 150]");
-}
-
-BOOST_AUTO_TEST_CASE(empty_map_to_string) {
-  std::map<int, std::string> m;
-  BOOST_CHECK_EQUAL(to_string(m), "{}");
-}
-
-BOOST_AUTO_TEST_CASE(single_item_map_to_string) {
-  std::map<int, std::string> m;
-  m[12] = "abc";
-  BOOST_CHECK_EQUAL(to_string(m), "{12: abc}");
-}
-
-BOOST_AUTO_TEST_CASE(multi_item_map_to_string) {
-  std::map<int, std::string> m;
-  m[12] = "abc";
-  m[31] = "xyz";
-  BOOST_CHECK_EQUAL(to_string(m), "{12: abc, 31: xyz}");
-}
-
-BOOST_AUTO_TEST_CASE(empty_set_to_string) {
-  std::set<char> s;
-  BOOST_CHECK_EQUAL(to_string(s), "{}");
-}
-
-BOOST_AUTO_TEST_CASE(single_item_set_to_string) {
-  std::set<char> s;
-  s.insert('c');
-  BOOST_CHECK_EQUAL(to_string(s), "{c}");
-}
-
-BOOST_AUTO_TEST_CASE(multi_item_set_to_string) {
-  std::set<char> s;
-  s.insert('a');
-  s.insert('z');
-  BOOST_CHECK_EQUAL(to_string(s), "{a, z}");
-}
-
-BOOST_AUTO_TEST_CASE(generated_empty_object_to_string) {
-  thrift::test::EmptyStruct e;
-  BOOST_CHECK_EQUAL(to_string(e), "EmptyStruct()");
-}
-
-BOOST_AUTO_TEST_CASE(generated_single_basic_field_object_to_string) {
-  thrift::test::StructA a;
-  a.__set_s("abcd");
-  BOOST_CHECK_EQUAL(to_string(a), "StructA(s=abcd)");
-}
-
-BOOST_AUTO_TEST_CASE(generated_two_basic_fields_object_to_string) {
-  thrift::test::Bonk a;
-  a.__set_message("abcd");
-  a.__set_type(1234);
-  BOOST_CHECK_EQUAL(to_string(a), "Bonk(message=abcd, type=1234)");
-}
-
-BOOST_AUTO_TEST_CASE(generated_optional_fields_object_to_string) {
-  thrift::test::Tricky2 a;
-  BOOST_CHECK_EQUAL(to_string(a), "Tricky2(im_optional=<null>)");
-  a.__set_im_optional(123);
-  BOOST_CHECK_EQUAL(to_string(a), "Tricky2(im_optional=123)");
-}
-
-BOOST_AUTO_TEST_CASE(generated_nested_object_to_string) {
-  thrift::test::OneField a;
-  BOOST_CHECK_EQUAL(to_string(a), "OneField(field=EmptyStruct())");
-}
-
-BOOST_AUTO_TEST_CASE(generated_nested_list_object_to_string) {
-  thrift::test::ListBonks l;
-  l.bonk.assign(2, thrift::test::Bonk());
-  l.bonk[0].__set_message("a");
-  l.bonk[1].__set_message("b");
-
-  BOOST_CHECK_EQUAL(to_string(l),
-                    "ListBonks(bonk=[Bonk(message=a, type=0), Bonk(message=b, type=0)])");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TransportTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TransportTest.cpp
deleted file mode 100644
index ccef9d5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TransportTest.cpp
+++ /dev/null
@@ -1,1061 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-
-#include <stdlib.h>
-#include <time.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#include <sstream>
-#include <fstream>
-#include <thrift/cxxfunctional.h>
-
-#include <boost/mpl/list.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/random.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/version.hpp>
-
-#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>
-
-#include <thrift/concurrency/FunctionRunner.h>
-#if _WIN32
-#include <thrift/windows/TWinsockSingleton.h>
-#endif
-
-using namespace apache::thrift::transport;
-
-static boost::mt19937 rng;
-
-void initrand(unsigned int seed) {
-  rng.seed(seed);
-}
-
-class SizeGenerator {
-public:
-  virtual ~SizeGenerator() {}
-  virtual uint32_t nextSize() = 0;
-  virtual std::string describe() const = 0;
-};
-
-class ConstantSizeGenerator : public SizeGenerator {
-public:
-  ConstantSizeGenerator(uint32_t value) : value_(value) {}
-  uint32_t nextSize() { return value_; }
-  std::string describe() const {
-    std::ostringstream desc;
-    desc << value_;
-    return desc.str();
-  }
-
-private:
-  uint32_t value_;
-};
-
-class RandomSizeGenerator : public SizeGenerator {
-public:
-  RandomSizeGenerator(uint32_t min, uint32_t max)
-    : generator_(rng, boost::uniform_int<int>(min, max)) {}
-
-  uint32_t nextSize() { return generator_(); }
-
-  std::string describe() const {
-    std::ostringstream desc;
-    desc << "rand(" << getMin() << ", " << getMax() << ")";
-    return desc.str();
-  }
-
-  uint32_t getMin() const { return (generator_.distribution().min)(); }
-  uint32_t getMax() const { return (generator_.distribution().max)(); }
-
-private:
-  boost::variate_generator<boost::mt19937&, boost::uniform_int<int> > generator_;
-};
-
-/**
- * This class exists solely to make the TEST_RW() macro easier to use.
- * - it can be constructed implicitly from an integer
- * - it can contain either a ConstantSizeGenerator or a RandomSizeGenerator
- *   (TEST_RW can't take a SizeGenerator pointer or reference, since it needs
- *   to make a copy of the generator to bind it to the test function.)
- */
-class GenericSizeGenerator : public SizeGenerator {
-public:
-  GenericSizeGenerator(uint32_t value) : generator_(new ConstantSizeGenerator(value)) {}
-  GenericSizeGenerator(uint32_t min, uint32_t max)
-    : generator_(new RandomSizeGenerator(min, max)) {}
-
-  uint32_t nextSize() { return generator_->nextSize(); }
-  std::string describe() const { return generator_->describe(); }
-
-private:
-  boost::shared_ptr<SizeGenerator> generator_;
-};
-
-/**************************************************************************
- * Classes to set up coupled transports
- **************************************************************************/
-
-/**
- * Helper class to represent a coupled pair of transports.
- *
- * Data written to the out transport can be read from the in transport.
- *
- * This is used as the base class for the various coupled transport
- * implementations.  It shouldn't be instantiated directly.
- */
-template <class Transport_>
-class CoupledTransports {
-public:
-  virtual ~CoupledTransports() {}
-  typedef Transport_ TransportType;
-
-  CoupledTransports() : in(), out() {}
-
-  boost::shared_ptr<Transport_> in;
-  boost::shared_ptr<Transport_> out;
-
-private:
-  CoupledTransports(const CoupledTransports&);
-  CoupledTransports& operator=(const CoupledTransports&);
-};
-
-/**
- * Coupled TMemoryBuffers
- */
-class CoupledMemoryBuffers : public CoupledTransports<TMemoryBuffer> {
-public:
-  CoupledMemoryBuffers() : buf(new TMemoryBuffer) {
-    in = buf;
-    out = buf;
-  }
-
-  boost::shared_ptr<TMemoryBuffer> buf;
-};
-
-/**
- * Helper template class for creating coupled transports that wrap
- * another transport.
- */
-template <class WrapperTransport_, class InnerCoupledTransports_>
-class CoupledWrapperTransportsT : public CoupledTransports<WrapperTransport_> {
-public:
-  CoupledWrapperTransportsT() {
-    if (inner_.in) {
-      this->in.reset(new WrapperTransport_(inner_.in));
-    }
-    if (inner_.out) {
-      this->out.reset(new WrapperTransport_(inner_.out));
-    }
-  }
-
-  InnerCoupledTransports_ inner_;
-};
-
-/**
- * Coupled TBufferedTransports.
- */
-template <class InnerTransport_>
-class CoupledBufferedTransportsT
-    : public CoupledWrapperTransportsT<TBufferedTransport, InnerTransport_> {};
-
-typedef CoupledBufferedTransportsT<CoupledMemoryBuffers> CoupledBufferedTransports;
-
-/**
- * Coupled TFramedTransports.
- */
-template <class InnerTransport_>
-class CoupledFramedTransportsT
-    : public CoupledWrapperTransportsT<TFramedTransport, InnerTransport_> {};
-
-typedef CoupledFramedTransportsT<CoupledMemoryBuffers> CoupledFramedTransports;
-
-/**
- * Coupled TZlibTransports.
- */
-template <class InnerTransport_>
-class CoupledZlibTransportsT : public CoupledWrapperTransportsT<TZlibTransport, InnerTransport_> {};
-
-typedef CoupledZlibTransportsT<CoupledMemoryBuffers> CoupledZlibTransports;
-
-#ifndef _WIN32
-// FD transport doesn't make much sense on Windows.
-/**
- * Coupled TFDTransports.
- */
-class CoupledFDTransports : public CoupledTransports<TFDTransport> {
-public:
-  CoupledFDTransports() {
-    int pipes[2];
-
-    if (pipe(pipes) != 0) {
-      return;
-    }
-
-    in.reset(new TFDTransport(pipes[0], TFDTransport::CLOSE_ON_DESTROY));
-    out.reset(new TFDTransport(pipes[1], TFDTransport::CLOSE_ON_DESTROY));
-  }
-};
-#endif
-
-/**
- * Coupled TSockets
- */
-class CoupledSocketTransports : public CoupledTransports<TSocket> {
-public:
-  CoupledSocketTransports() {
-    THRIFT_SOCKET sockets[2] = {0};
-    if (THRIFT_SOCKETPAIR(PF_UNIX, SOCK_STREAM, 0, sockets) != 0) {
-      return;
-    }
-
-    in.reset(new TSocket(sockets[0]));
-    out.reset(new TSocket(sockets[1]));
-    out->setSendTimeout(100);
-  }
-};
-
-// These could be made to work on Windows, but I don't care enough to make it happen
-#ifndef _WIN32
-/**
- * Coupled TFileTransports
- */
-class CoupledFileTransports : public CoupledTransports<TFileTransport> {
-public:
-  CoupledFileTransports() {
-#ifndef _WIN32
-    const char* tmp_dir = "/tmp";
-#define FILENAME_SUFFIX "/thrift.transport_test"
-#else
-    const char* tmp_dir = getenv("TMP");
-#define FILENAME_SUFFIX "\\thrift.transport_test"
-#endif
-
-    // Create a temporary file to use
-    filename.resize(strlen(tmp_dir) + strlen(FILENAME_SUFFIX));
-    THRIFT_SNPRINTF(&filename[0], filename.size(), "%s" FILENAME_SUFFIX, tmp_dir);
-#undef FILENAME_SUFFIX
-
-    { std::ofstream dummy_creation(filename.c_str(), std::ofstream::trunc); }
-
-    in.reset(new TFileTransport(filename, true));
-    out.reset(new TFileTransport(filename));
-  }
-
-  ~CoupledFileTransports() { remove(filename.c_str()); }
-
-  std::string filename;
-};
-#endif
-
-/**
- * Wrapper around another CoupledTransports implementation that exposes the
- * transports as TTransport pointers.
- *
- * This is used since accessing a transport via a "TTransport*" exercises a
- * different code path than using the base pointer class.  As part of the
- * template code changes, most transport methods are no longer virtual.
- */
-template <class CoupledTransports_>
-class CoupledTTransports : public CoupledTransports<TTransport> {
-public:
-  CoupledTTransports() : transports() {
-    in = transports.in;
-    out = transports.out;
-  }
-
-  CoupledTransports_ transports;
-};
-
-/**
- * Wrapper around another CoupledTransports implementation that exposes the
- * transports as TBufferBase pointers.
- *
- * This can only be instantiated with a transport type that is a subclass of
- * TBufferBase.
- */
-template <class CoupledTransports_>
-class CoupledBufferBases : public CoupledTransports<TBufferBase> {
-public:
-  CoupledBufferBases() : transports() {
-    in = transports.in;
-    out = transports.out;
-  }
-
-  CoupledTransports_ transports;
-};
-
-/**************************************************************************
- * Alarm handling code for use in tests that check the transport blocking
- * semantics.
- *
- * If the transport ends up blocking, we don't want to hang forever.  We use
- * SIGALRM to fire schedule signal to wake up and try to write data so the
- * transport will unblock.
- *
- * It isn't really the safest thing in the world to be mucking around with
- * complicated global data structures in a signal handler.  It should probably
- * be okay though, since we know the main thread should always be blocked in a
- * read() request when the signal handler is running.
- **************************************************************************/
-
-struct TriggerInfo {
-  TriggerInfo(int seconds, const boost::shared_ptr<TTransport>& transport, uint32_t writeLength)
-    : timeoutSeconds(seconds), transport(transport), writeLength(writeLength), next(NULL) {}
-
-  int timeoutSeconds;
-  boost::shared_ptr<TTransport> transport;
-  uint32_t writeLength;
-  TriggerInfo* next;
-};
-
-apache::thrift::concurrency::Monitor g_alarm_monitor;
-TriggerInfo* g_triggerInfo;
-unsigned int g_numTriggersFired;
-bool g_teardown = false;
-
-void alarm_handler() {
-  TriggerInfo* info = NULL;
-  {
-    apache::thrift::concurrency::Synchronized s(g_alarm_monitor);
-    // The alarm timed out, which almost certainly means we're stuck
-    // on a transport that is incorrectly blocked.
-    ++g_numTriggersFired;
-
-    // Note: we print messages to stdout instead of stderr, since
-    // tools/test/runner only records stdout messages in the failure messages for
-    // boost tests.  (boost prints its test info to stdout.)
-    printf("Timeout alarm expired; attempting to unblock transport\n");
-    if (g_triggerInfo == NULL) {
-      printf("  trigger stack is empty!\n");
-    }
-
-    // Pop off the first TriggerInfo.
-    // If there is another one, schedule an alarm for it.
-    info = g_triggerInfo;
-    g_triggerInfo = info->next;
-  }
-
-  // Write some data to the transport to hopefully unblock it.
-  uint8_t* buf = new uint8_t[info->writeLength];
-  memset(buf, 'b', info->writeLength);
-  boost::scoped_array<uint8_t> array(buf);
-  info->transport->write(buf, info->writeLength);
-  info->transport->flush();
-
-  delete info;
-}
-
-void alarm_handler_wrapper() {
-  int64_t timeout = 0; // timeout of 0 means wait forever
-  while (true) {
-    bool fireHandler = false;
-    {
-      apache::thrift::concurrency::Synchronized s(g_alarm_monitor);
-      if (g_teardown)
-        return;
-      // calculate timeout
-      if (g_triggerInfo == NULL) {
-        timeout = 0;
-      } else {
-        timeout = g_triggerInfo->timeoutSeconds * 1000;
-      }
-
-      int waitResult = g_alarm_monitor.waitForTimeRelative(timeout);
-      if (waitResult == THRIFT_ETIMEDOUT)
-        fireHandler = true;
-    }
-    if (fireHandler)
-      alarm_handler(); // calling outside the lock
-  }
-}
-
-/**
- * Add a trigger to be scheduled "seconds" seconds after the
- * last currently scheduled trigger.
- *
- * (Note that this is not "seconds" from now.  That might be more logical, but
- * would require slightly more complicated sorting, rather than just appending
- * to the end.)
- */
-void add_trigger(unsigned int seconds,
-                 const boost::shared_ptr<TTransport>& transport,
-                 uint32_t write_len) {
-  TriggerInfo* info = new TriggerInfo(seconds, transport, write_len);
-  {
-    apache::thrift::concurrency::Synchronized s(g_alarm_monitor);
-    if (g_triggerInfo == NULL) {
-      // This is the first trigger.
-      // Set g_triggerInfo, and schedule the alarm
-      g_triggerInfo = info;
-      g_alarm_monitor.notify();
-    } else {
-      // Add this trigger to the end of the list
-      TriggerInfo* prev = g_triggerInfo;
-      while (prev->next) {
-        prev = prev->next;
-      }
-      prev->next = info;
-    }
-  }
-}
-
-void clear_triggers() {
-  TriggerInfo* info = NULL;
-
-  {
-    apache::thrift::concurrency::Synchronized s(g_alarm_monitor);
-    info = g_triggerInfo;
-    g_triggerInfo = NULL;
-    g_numTriggersFired = 0;
-    g_alarm_monitor.notify();
-  }
-
-  while (info != NULL) {
-    TriggerInfo* next = info->next;
-    delete info;
-    info = next;
-  }
-}
-
-void set_trigger(unsigned int seconds,
-                 const boost::shared_ptr<TTransport>& transport,
-                 uint32_t write_len) {
-  clear_triggers();
-  add_trigger(seconds, transport, write_len);
-}
-
-/**************************************************************************
- * Test functions
- **************************************************************************/
-
-/**
- * Test interleaved write and read calls.
- *
- * Generates a buffer totalSize bytes long, then writes it to the transport,
- * and verifies the written data can be read back correctly.
- *
- * Mode of operation:
- * - call wChunkGenerator to figure out how large of a chunk to write
- *   - call wSizeGenerator to get the size for individual write() calls,
- *     and do this repeatedly until the entire chunk is written.
- * - call rChunkGenerator to figure out how large of a chunk to read
- *   - call rSizeGenerator to get the size for individual read() calls,
- *     and do this repeatedly until the entire chunk is read.
- * - repeat until the full buffer is written and read back,
- *   then compare the data read back against the original buffer
- *
- *
- * - If any of the size generators return 0, this means to use the maximum
- *   possible size.
- *
- * - If maxOutstanding is non-zero, write chunk sizes will be chosen such that
- *   there are never more than maxOutstanding bytes waiting to be read back.
- */
-template <class CoupledTransports>
-void test_rw(uint32_t totalSize,
-             SizeGenerator& wSizeGenerator,
-             SizeGenerator& rSizeGenerator,
-             SizeGenerator& wChunkGenerator,
-             SizeGenerator& rChunkGenerator,
-             uint32_t maxOutstanding) {
-  CoupledTransports transports;
-  BOOST_REQUIRE(transports.in != NULL);
-  BOOST_REQUIRE(transports.out != NULL);
-
-  boost::shared_array<uint8_t> wbuf = boost::shared_array<uint8_t>(new uint8_t[totalSize]);
-  boost::shared_array<uint8_t> rbuf = boost::shared_array<uint8_t>(new uint8_t[totalSize]);
-
-  // store some data in wbuf
-  for (uint32_t n = 0; n < totalSize; ++n) {
-    wbuf[n] = (n & 0xff);
-  }
-  // clear rbuf
-  memset(rbuf.get(), 0, totalSize);
-
-  uint32_t total_written = 0;
-  uint32_t total_read = 0;
-  while (total_read < totalSize) {
-    // Determine how large a chunk of data to write
-    uint32_t wchunk_size = wChunkGenerator.nextSize();
-    if (wchunk_size == 0 || wchunk_size > totalSize - total_written) {
-      wchunk_size = totalSize - total_written;
-    }
-
-    // Make sure (total_written - total_read) + wchunk_size
-    // is less than maxOutstanding
-    if (maxOutstanding > 0 && wchunk_size > maxOutstanding - (total_written - total_read)) {
-      wchunk_size = maxOutstanding - (total_written - total_read);
-    }
-
-    // Write the chunk
-    uint32_t chunk_written = 0;
-    while (chunk_written < wchunk_size) {
-      uint32_t write_size = wSizeGenerator.nextSize();
-      if (write_size == 0 || write_size > wchunk_size - chunk_written) {
-        write_size = wchunk_size - chunk_written;
-      }
-
-      try {
-        transports.out->write(wbuf.get() + total_written, write_size);
-      } catch (TTransportException& te) {
-        if (te.getType() == TTransportException::TIMED_OUT)
-          break;
-        throw te;
-      }
-      chunk_written += write_size;
-      total_written += write_size;
-    }
-
-    // Flush the data, so it will be available in the read transport
-    // Don't flush if wchunk_size is 0.  (This should only happen if
-    // total_written == totalSize already, and we're only reading now.)
-    if (wchunk_size > 0) {
-      transports.out->flush();
-    }
-
-    // Determine how large a chunk of data to read back
-    uint32_t rchunk_size = rChunkGenerator.nextSize();
-    if (rchunk_size == 0 || rchunk_size > total_written - total_read) {
-      rchunk_size = total_written - total_read;
-    }
-
-    // Read the chunk
-    uint32_t chunk_read = 0;
-    while (chunk_read < rchunk_size) {
-      uint32_t read_size = rSizeGenerator.nextSize();
-      if (read_size == 0 || read_size > rchunk_size - chunk_read) {
-        read_size = rchunk_size - chunk_read;
-      }
-
-      int bytes_read = -1;
-      try {
-        bytes_read = transports.in->read(rbuf.get() + total_read, read_size);
-      } catch (TTransportException& e) {
-        BOOST_FAIL("read(pos=" << total_read << ", size=" << read_size << ") threw exception \""
-                               << e.what() << "\"; written so far: " << total_written << " / "
-                               << totalSize << " bytes");
-      }
-
-      BOOST_REQUIRE_MESSAGE(bytes_read > 0,
-                            "read(pos=" << total_read << ", size=" << read_size << ") returned "
-                                        << bytes_read << "; written so far: " << total_written
-                                        << " / " << totalSize << " bytes");
-      chunk_read += bytes_read;
-      total_read += bytes_read;
-    }
-  }
-
-  // make sure the data read back is identical to the data written
-  BOOST_CHECK_EQUAL(memcmp(rbuf.get(), wbuf.get(), totalSize), 0);
-}
-
-template <class CoupledTransports>
-void test_read_part_available() {
-  CoupledTransports transports;
-  BOOST_REQUIRE(transports.in != NULL);
-  BOOST_REQUIRE(transports.out != NULL);
-
-  uint8_t write_buf[16];
-  uint8_t read_buf[16];
-  memset(write_buf, 'a', sizeof(write_buf));
-
-  // Attemping to read 10 bytes when only 9 are available should return 9
-  // immediately.
-  transports.out->write(write_buf, 9);
-  transports.out->flush();
-  set_trigger(3, transports.out, 1);
-  uint32_t bytes_read = transports.in->read(read_buf, 10);
-  BOOST_CHECK_EQUAL(g_numTriggersFired, (unsigned int)0);
-  BOOST_CHECK_EQUAL(bytes_read, (uint32_t)9);
-
-  clear_triggers();
-}
-
-template <class CoupledTransports>
-void test_read_part_available_in_chunks() {
-  CoupledTransports transports;
-  BOOST_REQUIRE(transports.in != NULL);
-  BOOST_REQUIRE(transports.out != NULL);
-
-  uint8_t write_buf[16];
-  uint8_t read_buf[16];
-  memset(write_buf, 'a', sizeof(write_buf));
-
-  // Write 10 bytes (in a single frame, for transports that use framing)
-  transports.out->write(write_buf, 10);
-  transports.out->flush();
-
-  // Read 1 byte, to force the transport to read the frame
-  uint32_t bytes_read = transports.in->read(read_buf, 1);
-  BOOST_CHECK_EQUAL(bytes_read, 1u);
-
-  // Read more than what is remaining and verify the transport does not block
-  set_trigger(3, transports.out, 1);
-  bytes_read = transports.in->read(read_buf, 10);
-  BOOST_CHECK_EQUAL(g_numTriggersFired, 0u);
-  BOOST_CHECK_EQUAL(bytes_read, 9u);
-
-  clear_triggers();
-}
-
-template <class CoupledTransports>
-void test_read_partial_midframe() {
-  CoupledTransports transports;
-  BOOST_REQUIRE(transports.in != NULL);
-  BOOST_REQUIRE(transports.out != NULL);
-
-  uint8_t write_buf[16];
-  uint8_t read_buf[16];
-  memset(write_buf, 'a', sizeof(write_buf));
-
-  // Attempt to read 10 bytes, when only 9 are available, but after we have
-  // already read part of the data that is available.  This exercises a
-  // different code path for several of the transports.
-  //
-  // For transports that add their own framing (e.g., TFramedTransport and
-  // TFileTransport), the two flush calls break up the data in to a 10 byte
-  // frame and a 3 byte frame.  The first read then puts us partway through the
-  // first frame, and then we attempt to read past the end of that frame, and
-  // through the next frame, too.
-  //
-  // For buffered transports that perform read-ahead (e.g.,
-  // TBufferedTransport), the read-ahead will most likely see all 13 bytes
-  // written on the first read.  The next read will then attempt to read past
-  // the end of the read-ahead buffer.
-  //
-  // Flush 10 bytes, then 3 bytes.  This creates 2 separate frames for
-  // transports that track framing internally.
-  transports.out->write(write_buf, 10);
-  transports.out->flush();
-  transports.out->write(write_buf, 3);
-  transports.out->flush();
-
-  // Now read 4 bytes, so that we are partway through the written data.
-  uint32_t bytes_read = transports.in->read(read_buf, 4);
-  BOOST_CHECK_EQUAL(bytes_read, (uint32_t)4);
-
-  // Now attempt to read 10 bytes.  Only 9 more are available.
-  //
-  // We should be able to get all 9 bytes, but it might take multiple read
-  // calls, since it is valid for read() to return fewer bytes than requested.
-  // (Most transports do immediately return 9 bytes, but the framing transports
-  // tend to only return to the end of the current frame, which is 6 bytes in
-  // this case.)
-  uint32_t total_read = 0;
-  while (total_read < 9) {
-    set_trigger(3, transports.out, 1);
-    bytes_read = transports.in->read(read_buf, 10);
-    BOOST_REQUIRE_EQUAL(g_numTriggersFired, (unsigned int)0);
-    BOOST_REQUIRE_GT(bytes_read, (uint32_t)0);
-    total_read += bytes_read;
-    BOOST_REQUIRE_LE(total_read, (uint32_t)9);
-  }
-
-  BOOST_CHECK_EQUAL(total_read, (uint32_t)9);
-
-  clear_triggers();
-}
-
-template <class CoupledTransports>
-void test_borrow_part_available() {
-  CoupledTransports transports;
-  BOOST_REQUIRE(transports.in != NULL);
-  BOOST_REQUIRE(transports.out != NULL);
-
-  uint8_t write_buf[16];
-  uint8_t read_buf[16];
-  memset(write_buf, 'a', sizeof(write_buf));
-
-  // Attemping to borrow 10 bytes when only 9 are available should return NULL
-  // immediately.
-  transports.out->write(write_buf, 9);
-  transports.out->flush();
-  set_trigger(3, transports.out, 1);
-  uint32_t borrow_len = 10;
-  const uint8_t* borrowed_buf = transports.in->borrow(read_buf, &borrow_len);
-  BOOST_CHECK_EQUAL(g_numTriggersFired, (unsigned int)0);
-  BOOST_CHECK(borrowed_buf == NULL);
-
-  clear_triggers();
-}
-
-template <class CoupledTransports>
-void test_read_none_available() {
-  CoupledTransports transports;
-  BOOST_REQUIRE(transports.in != NULL);
-  BOOST_REQUIRE(transports.out != NULL);
-
-  uint8_t write_buf[16];
-  uint8_t read_buf[16];
-  memset(write_buf, 'a', sizeof(write_buf));
-
-  // Attempting to read when no data is available should either block until
-  // some data is available, or fail immediately.  (e.g., TSocket blocks,
-  // TMemoryBuffer just fails.)
-  //
-  // If the transport blocks, it should succeed once some data is available,
-  // even if less than the amount requested becomes available.
-  set_trigger(1, transports.out, 2);
-  add_trigger(1, transports.out, 8);
-  uint32_t bytes_read = transports.in->read(read_buf, 10);
-  if (bytes_read == 0) {
-    BOOST_CHECK_EQUAL(g_numTriggersFired, (unsigned int)0);
-    clear_triggers();
-  } else {
-    BOOST_CHECK_EQUAL(g_numTriggersFired, (unsigned int)1);
-    BOOST_CHECK_EQUAL(bytes_read, (uint32_t)2);
-  }
-
-  clear_triggers();
-}
-
-template <class CoupledTransports>
-void test_borrow_none_available() {
-  CoupledTransports transports;
-  BOOST_REQUIRE(transports.in != NULL);
-  BOOST_REQUIRE(transports.out != NULL);
-
-  uint8_t write_buf[16];
-  memset(write_buf, 'a', sizeof(write_buf));
-
-  // Attempting to borrow when no data is available should fail immediately
-  set_trigger(1, transports.out, 10);
-  uint32_t borrow_len = 10;
-  const uint8_t* borrowed_buf = transports.in->borrow(NULL, &borrow_len);
-  BOOST_CHECK(borrowed_buf == NULL);
-  BOOST_CHECK_EQUAL(g_numTriggersFired, (unsigned int)0);
-
-  clear_triggers();
-}
-
-/**************************************************************************
- * Test case generation
- *
- * Pretty ugly and annoying.  This would be much easier if we the unit test
- * framework didn't force each test to be a separate function.
- * - Writing a completely separate function definition for each of these would
- *   result in a lot of repetitive boilerplate code.
- * - Combining many tests into a single function makes it more difficult to
- *   tell precisely which tests failed.  It also means you can't get a progress
- *   update after each test, and the tests are already fairly slow.
- * - Similar registration could be achieved with BOOST_TEST_CASE_TEMPLATE,
- *   but it requires a lot of awkward MPL code, and results in useless test
- *   case names.  (The names are generated from std::type_info::name(), which
- *   is compiler-dependent.  gcc returns mangled names.)
- **************************************************************************/
-
-#define ADD_TEST_RW(CoupledTransports, totalSize, ...)                                             \
-  addTestRW<CoupledTransports>(BOOST_STRINGIZE(CoupledTransports), totalSize, ##__VA_ARGS__);
-
-#define TEST_RW(CoupledTransports, totalSize, ...)                                                 \
-  do {                                                                                             \
-    /* Add the test as specified, to test the non-virtual function calls */                        \
-    ADD_TEST_RW(CoupledTransports, totalSize, ##__VA_ARGS__);                                      \
-    /*                                                                                             \
-     * Also test using the transport as a TTransport*, to test                                     \
-     * the read_virt()/write_virt() calls                                                          \
-     */                                                                                            \
-    ADD_TEST_RW(CoupledTTransports<CoupledTransports>, totalSize, ##__VA_ARGS__);                  \
-    /* Test wrapping the transport with TBufferedTransport */                                      \
-    ADD_TEST_RW(CoupledBufferedTransportsT<CoupledTransports>, totalSize, ##__VA_ARGS__);          \
-    /* Test wrapping the transport with TFramedTransports */                                       \
-    ADD_TEST_RW(CoupledFramedTransportsT<CoupledTransports>, totalSize, ##__VA_ARGS__);            \
-    /* Test wrapping the transport with TZlibTransport */                                          \
-    ADD_TEST_RW(CoupledZlibTransportsT<CoupledTransports>, totalSize, ##__VA_ARGS__);              \
-  } while (0)
-
-#define ADD_TEST_BLOCKING(CoupledTransports)                                                       \
-  addTestBlocking<CoupledTransports>(BOOST_STRINGIZE(CoupledTransports));
-
-#define TEST_BLOCKING_BEHAVIOR(CoupledTransports)                                                  \
-  ADD_TEST_BLOCKING(CoupledTransports);                                                            \
-  ADD_TEST_BLOCKING(CoupledTTransports<CoupledTransports>);                                        \
-  ADD_TEST_BLOCKING(CoupledBufferedTransportsT<CoupledTransports>);                                \
-  ADD_TEST_BLOCKING(CoupledFramedTransportsT<CoupledTransports>);                                  \
-  ADD_TEST_BLOCKING(CoupledZlibTransportsT<CoupledTransports>);
-
-class TransportTestGen {
-public:
-  TransportTestGen(boost::unit_test::test_suite* suite, float sizeMultiplier)
-    : suite_(suite), sizeMultiplier_(sizeMultiplier) {}
-
-  void generate() {
-    GenericSizeGenerator rand4k(1, 4096);
-
-    /*
-     * We do the basically the same set of tests for each transport type,
-     * although we tweak the parameters in some places.
-     */
-
-    // TMemoryBuffer tests
-    TEST_RW(CoupledMemoryBuffers, 1024 * 1024, 0, 0);
-    TEST_RW(CoupledMemoryBuffers, 1024 * 256, rand4k, rand4k);
-    TEST_RW(CoupledMemoryBuffers, 1024 * 256, 167, 163);
-    TEST_RW(CoupledMemoryBuffers, 1024 * 16, 1, 1);
-
-    TEST_RW(CoupledMemoryBuffers, 1024 * 256, 0, 0, rand4k, rand4k);
-    TEST_RW(CoupledMemoryBuffers, 1024 * 256, rand4k, rand4k, rand4k, rand4k);
-    TEST_RW(CoupledMemoryBuffers, 1024 * 256, 167, 163, rand4k, rand4k);
-    TEST_RW(CoupledMemoryBuffers, 1024 * 16, 1, 1, rand4k, rand4k);
-
-    TEST_BLOCKING_BEHAVIOR(CoupledMemoryBuffers);
-
-#ifndef _WIN32
-    // TFDTransport tests
-    // Since CoupledFDTransports tests with a pipe, writes will block
-    // if there is too much outstanding unread data in the pipe.
-    uint32_t fd_max_outstanding = 4096;
-    TEST_RW(CoupledFDTransports, 1024 * 1024, 0, 0, 0, 0, fd_max_outstanding);
-    TEST_RW(CoupledFDTransports, 1024 * 256, rand4k, rand4k, 0, 0, fd_max_outstanding);
-    TEST_RW(CoupledFDTransports, 1024 * 256, 167, 163, 0, 0, fd_max_outstanding);
-    TEST_RW(CoupledFDTransports, 1024 * 16, 1, 1, 0, 0, fd_max_outstanding);
-
-    TEST_RW(CoupledFDTransports, 1024 * 256, 0, 0, rand4k, rand4k, fd_max_outstanding);
-    TEST_RW(CoupledFDTransports, 1024 * 256, rand4k, rand4k, rand4k, rand4k, fd_max_outstanding);
-    TEST_RW(CoupledFDTransports, 1024 * 256, 167, 163, rand4k, rand4k, fd_max_outstanding);
-    TEST_RW(CoupledFDTransports, 1024 * 16, 1, 1, rand4k, rand4k, fd_max_outstanding);
-
-    TEST_BLOCKING_BEHAVIOR(CoupledFDTransports);
-#endif //_WIN32
-
-    // TSocket tests
-    uint32_t socket_max_outstanding = 4096;
-    TEST_RW(CoupledSocketTransports, 1024 * 1024, 0, 0, 0, 0, socket_max_outstanding);
-    TEST_RW(CoupledSocketTransports, 1024 * 256, rand4k, rand4k, 0, 0, socket_max_outstanding);
-    TEST_RW(CoupledSocketTransports, 1024 * 256, 167, 163, 0, 0, socket_max_outstanding);
-    // Doh.  Apparently writing to a socket has some additional overhead for
-    // each send() call.  If we have more than ~400 outstanding 1-byte write
-    // requests, additional send() calls start blocking.
-    TEST_RW(CoupledSocketTransports, 1024 * 16, 1, 1, 0, 0, socket_max_outstanding);
-    TEST_RW(CoupledSocketTransports, 1024 * 256, 0, 0, rand4k, rand4k, socket_max_outstanding);
-    TEST_RW(CoupledSocketTransports,
-            1024 * 256,
-            rand4k,
-            rand4k,
-            rand4k,
-            rand4k,
-            socket_max_outstanding);
-    TEST_RW(CoupledSocketTransports, 1024 * 256, 167, 163, rand4k, rand4k, socket_max_outstanding);
-    TEST_RW(CoupledSocketTransports, 1024 * 16, 1, 1, rand4k, rand4k, socket_max_outstanding);
-
-    TEST_BLOCKING_BEHAVIOR(CoupledSocketTransports);
-
-// These could be made to work on Windows, but I don't care enough to make it happen
-#ifndef _WIN32
-    // TFileTransport tests
-    // We use smaller buffer sizes here, since TFileTransport is fairly slow.
-    //
-    // TFileTransport can't write more than 16MB at once
-    uint32_t max_write_at_once = 1024 * 1024 * 16 - 4;
-    TEST_RW(CoupledFileTransports, 1024 * 1024, max_write_at_once, 0);
-    TEST_RW(CoupledFileTransports, 1024 * 128, rand4k, rand4k);
-    TEST_RW(CoupledFileTransports, 1024 * 128, 167, 163);
-    TEST_RW(CoupledFileTransports, 1024 * 2, 1, 1);
-
-    TEST_RW(CoupledFileTransports, 1024 * 64, 0, 0, rand4k, rand4k);
-    TEST_RW(CoupledFileTransports, 1024 * 64, rand4k, rand4k, rand4k, rand4k);
-    TEST_RW(CoupledFileTransports, 1024 * 64, 167, 163, rand4k, rand4k);
-    TEST_RW(CoupledFileTransports, 1024 * 2, 1, 1, rand4k, rand4k);
-
-    TEST_BLOCKING_BEHAVIOR(CoupledFileTransports);
-#endif
-
-    // Add some tests that access TBufferedTransport and TFramedTransport
-    // via TTransport pointers and TBufferBase pointers.
-    ADD_TEST_RW(CoupledTTransports<CoupledBufferedTransports>,
-                1024 * 1024,
-                rand4k,
-                rand4k,
-                rand4k,
-                rand4k);
-    ADD_TEST_RW(CoupledBufferBases<CoupledBufferedTransports>,
-                1024 * 1024,
-                rand4k,
-                rand4k,
-                rand4k,
-                rand4k);
-    ADD_TEST_RW(CoupledTTransports<CoupledFramedTransports>,
-                1024 * 1024,
-                rand4k,
-                rand4k,
-                rand4k,
-                rand4k);
-    ADD_TEST_RW(CoupledBufferBases<CoupledFramedTransports>,
-                1024 * 1024,
-                rand4k,
-                rand4k,
-                rand4k,
-                rand4k);
-
-    // Test using TZlibTransport via a TTransport pointer
-    ADD_TEST_RW(CoupledTTransports<CoupledZlibTransports>,
-                1024 * 1024,
-                rand4k,
-                rand4k,
-                rand4k,
-                rand4k);
-  }
-
-#if (BOOST_VERSION >= 105900)
-#define MAKE_TEST_CASE(_FUNC, _NAME) boost::unit_test::make_test_case(_FUNC, _NAME, __FILE__, __LINE__)
-#else
-#define MAKE_TEST_CASE(_FUNC, _NAME) boost::unit_test::make_test_case(_FUNC, _NAME)
-#endif
-
-private:
-  template <class CoupledTransports>
-  void addTestRW(const char* transport_name,
-                 uint32_t totalSize,
-                 GenericSizeGenerator wSizeGen,
-                 GenericSizeGenerator rSizeGen,
-                 GenericSizeGenerator wChunkSizeGen = 0,
-                 GenericSizeGenerator rChunkSizeGen = 0,
-                 uint32_t maxOutstanding = 0,
-                 uint32_t expectedFailures = 0) {
-    // adjust totalSize by the specified sizeMultiplier_ first
-    totalSize = static_cast<uint32_t>(totalSize * sizeMultiplier_);
-
-    std::ostringstream name;
-    name << transport_name << "::test_rw(" << totalSize << ", " << wSizeGen.describe() << ", "
-         << rSizeGen.describe() << ", " << wChunkSizeGen.describe() << ", "
-         << rChunkSizeGen.describe() << ", " << maxOutstanding << ")";
-
-#if (BOOST_VERSION >= 105900)
-    boost::function<void ()> test_func
-#else
-    boost::unit_test::callback0<> test_func
-#endif
-        = apache::thrift::stdcxx::bind(test_rw<CoupledTransports>,
-                                       totalSize,
-                                       wSizeGen,
-                                       rSizeGen,
-                                       wChunkSizeGen,
-                                       rChunkSizeGen,
-                                       maxOutstanding);
-    suite_->add(MAKE_TEST_CASE(test_func, name.str()), expectedFailures);
-  }
-
-  template <class CoupledTransports>
-  void addTestBlocking(const char* transportName, uint32_t expectedFailures = 0) {
-    char name[1024];
-
-    THRIFT_SNPRINTF(name, sizeof(name), "%s::test_read_part_available()", transportName);
-    suite_->add(MAKE_TEST_CASE(test_read_part_available<CoupledTransports>, name), expectedFailures);
-
-    THRIFT_SNPRINTF(name, sizeof(name), "%s::test_read_part_available_in_chunks()", transportName);
-    suite_->add(MAKE_TEST_CASE(test_read_part_available_in_chunks<CoupledTransports>, name), expectedFailures);
-
-    THRIFT_SNPRINTF(name, sizeof(name), "%s::test_read_partial_midframe()", transportName);
-    suite_->add(MAKE_TEST_CASE(test_read_partial_midframe<CoupledTransports>, name), expectedFailures);
-
-    THRIFT_SNPRINTF(name, sizeof(name), "%s::test_read_none_available()", transportName);
-    suite_->add(MAKE_TEST_CASE(test_read_none_available<CoupledTransports>, name), expectedFailures);
-
-    THRIFT_SNPRINTF(name, sizeof(name), "%s::test_borrow_part_available()", transportName);
-    suite_->add(MAKE_TEST_CASE(test_borrow_part_available<CoupledTransports>, name), expectedFailures);
-
-    THRIFT_SNPRINTF(name, sizeof(name), "%s::test_borrow_none_available()", transportName);
-    suite_->add(MAKE_TEST_CASE(test_borrow_none_available<CoupledTransports>, name), expectedFailures);
-  }
-
-  boost::unit_test::test_suite* suite_;
-  // sizeMultiplier_ is configurable via the command line, and allows the
-  // user to adjust between smaller buffers that can be tested quickly,
-  // or larger buffers that more thoroughly exercise the code, but take
-  // longer.
-  float sizeMultiplier_;
-};
-
-/**************************************************************************
- * General Initialization
- **************************************************************************/
-
-struct global_fixture {
-  boost::shared_ptr<apache::thrift::concurrency::Thread> alarmThread_;
-  global_fixture() {
-#if _WIN32
-    apache::thrift::transport::TWinsockSingleton::create();
-#endif
-
-    apache::thrift::concurrency::PlatformThreadFactory factory;
-    factory.setDetached(false);
-
-    alarmThread_ = factory.newThread(
-        apache::thrift::concurrency::FunctionRunner::create(alarm_handler_wrapper));
-    alarmThread_->start();
-  }
-  ~global_fixture() {
-    {
-      apache::thrift::concurrency::Synchronized s(g_alarm_monitor);
-      g_teardown = true;
-      g_alarm_monitor.notify();
-    }
-    alarmThread_->join();
-  }
-};
-
-#if (BOOST_VERSION >= 105900)
-BOOST_GLOBAL_FIXTURE(global_fixture);
-#else
-BOOST_GLOBAL_FIXTURE(global_fixture)
-#endif
-
-#ifdef BOOST_TEST_DYN_LINK
-bool init_unit_test_suite() {
-  struct timeval tv;
-  THRIFT_GETTIMEOFDAY(&tv, NULL);
-  int seed = tv.tv_sec ^ tv.tv_usec;
-
-  initrand(seed);
-
-  boost::unit_test::test_suite* suite = &boost::unit_test::framework::master_test_suite();
-  suite->p_name.value = "TransportTest";
-  TransportTestGen transport_test_generator(suite, 1);
-  transport_test_generator.generate();
-  return true;
-}
-
-int main( int argc, char* argv[] ) {
-  return ::boost::unit_test::unit_test_main(&init_unit_test_suite,argc,argv);
-}
-#else
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-  THRIFT_UNUSED_VARIABLE(argc);
-  THRIFT_UNUSED_VARIABLE(argv);
-  struct timeval tv;
-  THRIFT_GETTIMEOFDAY(&tv, NULL);
-  int seed = tv.tv_sec ^ tv.tv_usec;
-
-  initrand(seed);
-
-  boost::unit_test::test_suite* suite = &boost::unit_test::framework::master_test_suite();
-  suite->p_name.value = "TransportTest";
-  TransportTestGen transport_test_generator(suite, 1);
-  transport_test_generator.generate();
-  return NULL;
-}
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/TypedefTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/TypedefTest.cpp
deleted file mode 100644
index 24e9265..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/TypedefTest.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <boost/type_traits/is_same.hpp>
-#include <boost/static_assert.hpp>
-
-#include "gen-cpp/TypedefTest_types.h"
-
-BOOST_STATIC_ASSERT((boost::is_same<int32_t, thrift::test::MyInt32>::value));
-BOOST_STATIC_ASSERT((boost::is_same<std::string, thrift::test::MyString>::value));
-BOOST_STATIC_ASSERT(
-    (boost::is_same<thrift::test::TypedefTestStruct, thrift::test::MyStruct>::value));
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/UnitTestMain.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/UnitTestMain.cpp
deleted file mode 100644
index f0ef1e4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/UnitTestMain.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define BOOST_TEST_MODULE thrift
-#include <boost/test/auto_unit_test.hpp>
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/ZlibTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/ZlibTest.cpp
deleted file mode 100644
index e155970..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/ZlibTest.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define __STDC_FORMAT_MACROS
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE // needed for getopt_long
-#endif
-
-#include <stdint.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#include <cstddef>
-#include <fstream>
-#include <iostream>
-#include <thrift/cxxfunctional.h>
-
-#include <boost/function.hpp>
-#include <boost/random.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/version.hpp>
-
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TZlibTransport.h>
-
-using namespace std;
-using namespace apache::thrift::transport;
-
-boost::mt19937 rng;
-
-/*
- * Utility code
- */
-
-class SizeGenerator {
-public:
-  virtual ~SizeGenerator() {}
-  virtual unsigned int getSize() = 0;
-};
-
-class ConstantSizeGenerator : public SizeGenerator {
-public:
-  ConstantSizeGenerator(unsigned int value) : value_(value) {}
-  virtual unsigned int getSize() { return value_; }
-
-private:
-  unsigned int value_;
-};
-
-class LogNormalSizeGenerator : public SizeGenerator {
-public:
-  LogNormalSizeGenerator(double mean, double std_dev)
-    : gen_(rng, boost::lognormal_distribution<double>(mean, std_dev)) {}
-
-  virtual unsigned int getSize() {
-    // Loop until we get a size of 1 or more
-    while (true) {
-      unsigned int value = static_cast<unsigned int>(gen_());
-      if (value >= 1) {
-        return value;
-      }
-    }
-  }
-
-private:
-  boost::variate_generator<boost::mt19937, boost::lognormal_distribution<double> > gen_;
-};
-
-boost::shared_array<uint8_t> gen_uniform_buffer(uint32_t buf_len, uint8_t c) {
-  uint8_t* buf = new uint8_t[buf_len];
-  memset(buf, c, buf_len);
-  return boost::shared_array<uint8_t>(buf);
-}
-
-boost::shared_array<uint8_t> gen_compressible_buffer(uint32_t buf_len) {
-  uint8_t* buf = new uint8_t[buf_len];
-
-  // Generate small runs of alternately increasing and decreasing bytes
-  boost::uniform_smallint<uint32_t> run_length_distribution(1, 64);
-  boost::uniform_smallint<uint8_t> byte_distribution(0, UINT8_MAX);
-  boost::variate_generator<boost::mt19937, boost::uniform_smallint<uint8_t> >
-      byte_generator(rng, byte_distribution);
-  boost::variate_generator<boost::mt19937, boost::uniform_smallint<uint32_t> >
-      run_len_generator(rng, run_length_distribution);
-
-  uint32_t idx = 0;
-  int8_t step = 1;
-  while (idx < buf_len) {
-    uint32_t run_length = run_len_generator();
-    if (idx + run_length > buf_len) {
-      run_length = buf_len - idx;
-    }
-
-    uint8_t byte = byte_generator();
-    for (uint32_t n = 0; n < run_length; ++n) {
-      buf[idx] = byte;
-      ++idx;
-      byte += step;
-    }
-
-    step *= -1;
-  }
-
-  return boost::shared_array<uint8_t>(buf);
-}
-
-boost::shared_array<uint8_t> gen_random_buffer(uint32_t buf_len) {
-  uint8_t* buf = new uint8_t[buf_len];
-
-  boost::uniform_smallint<uint8_t> distribution(0, UINT8_MAX);
-  boost::variate_generator<boost::mt19937, boost::uniform_smallint<uint8_t> >
-      generator(rng, distribution);
-
-  for (uint32_t n = 0; n < buf_len; ++n) {
-    buf[n] = generator();
-  }
-
-  return boost::shared_array<uint8_t>(buf);
-}
-
-/*
- * Test functions
- */
-
-void test_write_then_read(const boost::shared_array<uint8_t> buf, uint32_t buf_len) {
-  boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
-  boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
-  zlib_trans->write(buf.get(), buf_len);
-  zlib_trans->finish();
-
-  boost::shared_array<uint8_t> mirror(new uint8_t[buf_len]);
-  uint32_t got = zlib_trans->readAll(mirror.get(), buf_len);
-  BOOST_REQUIRE_EQUAL(got, buf_len);
-  BOOST_CHECK_EQUAL(memcmp(mirror.get(), buf.get(), buf_len), 0);
-  zlib_trans->verifyChecksum();
-}
-
-void test_separate_checksum(const boost::shared_array<uint8_t> buf, uint32_t buf_len) {
-  // This one is tricky.  I separate the last byte of the stream out
-  // into a separate crbuf_.  The last byte is part of the checksum,
-  // so the entire read goes fine, but when I go to verify the checksum
-  // it isn't there.  The original implementation complained that
-  // the stream was not complete.  I'm about to go fix that.
-  // It worked.  Awesome.
-  boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
-  boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
-  zlib_trans->write(buf.get(), buf_len);
-  zlib_trans->finish();
-  string tmp_buf;
-  membuf->appendBufferToString(tmp_buf);
-  zlib_trans.reset(new TZlibTransport(membuf,
-                                      TZlibTransport::DEFAULT_URBUF_SIZE,
-                                      static_cast<uint32_t>(tmp_buf.length() - 1)));
-
-  boost::shared_array<uint8_t> mirror(new uint8_t[buf_len]);
-  uint32_t got = zlib_trans->readAll(mirror.get(), buf_len);
-  BOOST_REQUIRE_EQUAL(got, buf_len);
-  BOOST_CHECK_EQUAL(memcmp(mirror.get(), buf.get(), buf_len), 0);
-  zlib_trans->verifyChecksum();
-}
-
-void test_incomplete_checksum(const boost::shared_array<uint8_t> buf, uint32_t buf_len) {
-  // Make sure we still get that "not complete" error if
-  // it really isn't complete.
-  boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
-  boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
-  zlib_trans->write(buf.get(), buf_len);
-  zlib_trans->finish();
-  string tmp_buf;
-  membuf->appendBufferToString(tmp_buf);
-  tmp_buf.erase(tmp_buf.length() - 1);
-  membuf->resetBuffer(const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(tmp_buf.data())),
-                      static_cast<uint32_t>(tmp_buf.length()));
-
-  boost::shared_array<uint8_t> mirror(new uint8_t[buf_len]);
-  uint32_t got = zlib_trans->readAll(mirror.get(), buf_len);
-  BOOST_REQUIRE_EQUAL(got, buf_len);
-  BOOST_CHECK_EQUAL(memcmp(mirror.get(), buf.get(), buf_len), 0);
-  try {
-    zlib_trans->verifyChecksum();
-    BOOST_ERROR("verifyChecksum() did not report an error");
-  } catch (TTransportException& ex) {
-    BOOST_CHECK_EQUAL(ex.getType(), TTransportException::CORRUPTED_DATA);
-  }
-}
-
-void test_read_write_mix(const boost::shared_array<uint8_t> buf,
-                         uint32_t buf_len,
-                         const boost::shared_ptr<SizeGenerator>& write_gen,
-                         const boost::shared_ptr<SizeGenerator>& read_gen) {
-  // Try it with a mix of read/write sizes.
-  boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
-  boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
-  unsigned int tot;
-
-  tot = 0;
-  while (tot < buf_len) {
-    uint32_t write_len = write_gen->getSize();
-    if (tot + write_len > buf_len) {
-      write_len = buf_len - tot;
-    }
-    zlib_trans->write(buf.get() + tot, write_len);
-    tot += write_len;
-  }
-
-  zlib_trans->finish();
-
-  tot = 0;
-  boost::shared_array<uint8_t> mirror(new uint8_t[buf_len]);
-  while (tot < buf_len) {
-    uint32_t read_len = read_gen->getSize();
-    uint32_t expected_read_len = read_len;
-    if (tot + read_len > buf_len) {
-      expected_read_len = buf_len - tot;
-    }
-    uint32_t got = zlib_trans->read(mirror.get() + tot, read_len);
-    BOOST_REQUIRE_LE(got, expected_read_len);
-    BOOST_REQUIRE_NE(got, (uint32_t)0);
-    tot += got;
-  }
-
-  BOOST_CHECK_EQUAL(memcmp(mirror.get(), buf.get(), buf_len), 0);
-  zlib_trans->verifyChecksum();
-}
-
-void test_invalid_checksum(const boost::shared_array<uint8_t> buf, uint32_t buf_len) {
-  // Verify checksum checking.
-  boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
-  boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
-  zlib_trans->write(buf.get(), buf_len);
-  zlib_trans->finish();
-  string tmp_buf;
-  membuf->appendBufferToString(tmp_buf);
-  // Modify a byte at the end of the buffer (part of the checksum).
-  // On rare occasions, modifying a byte in the middle of the buffer
-  // isn't caught by the checksum.
-  //
-  // (This happens especially often for the uniform buffer.  The
-  // re-inflated data is correct, however.  I suspect in this case that
-  // we're more likely to modify bytes that are part of zlib metadata
-  // instead of the actual compressed data.)
-  //
-  // I've also seen some failure scenarios where a checksum failure isn't
-  // reported, but zlib keeps trying to decode past the end of the data.
-  // (When this occurs, verifyChecksum() throws an exception indicating
-  // that the end of the data hasn't been reached.)  I haven't seen this
-  // error when only modifying checksum bytes.
-  int index = static_cast<int>(tmp_buf.size() - 1);
-  tmp_buf[index]++;
-  membuf->resetBuffer(const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(tmp_buf.data())),
-                      static_cast<uint32_t>(tmp_buf.length()));
-
-  boost::shared_array<uint8_t> mirror(new uint8_t[buf_len]);
-  try {
-    zlib_trans->readAll(mirror.get(), buf_len);
-    zlib_trans->verifyChecksum();
-    BOOST_ERROR("verifyChecksum() did not report an error");
-  } catch (TZlibTransportException& ex) {
-    BOOST_CHECK_EQUAL(ex.getType(), TTransportException::INTERNAL_ERROR);
-  }
-}
-
-void test_write_after_flush(const boost::shared_array<uint8_t> buf, uint32_t buf_len) {
-  // write some data
-  boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
-  boost::shared_ptr<TZlibTransport> zlib_trans(new TZlibTransport(membuf));
-  zlib_trans->write(buf.get(), buf_len);
-
-  // call finish()
-  zlib_trans->finish();
-
-  // make sure write() throws an error
-  try {
-    uint8_t write_buf[] = "a";
-    zlib_trans->write(write_buf, 1);
-    BOOST_ERROR("write() after finish() did not raise an exception");
-  } catch (TTransportException& ex) {
-    BOOST_CHECK_EQUAL(ex.getType(), TTransportException::BAD_ARGS);
-  }
-
-  // make sure flush() throws an error
-  try {
-    zlib_trans->flush();
-    BOOST_ERROR("flush() after finish() did not raise an exception");
-  } catch (TTransportException& ex) {
-    BOOST_CHECK_EQUAL(ex.getType(), TTransportException::BAD_ARGS);
-  }
-
-  // make sure finish() throws an error
-  try {
-    zlib_trans->finish();
-    BOOST_ERROR("finish() after finish() did not raise an exception");
-  } catch (TTransportException& ex) {
-    BOOST_CHECK_EQUAL(ex.getType(), TTransportException::BAD_ARGS);
-  }
-}
-
-void test_no_write() {
-  // Verify that no data is written to the underlying transport if we
-  // never write data to the TZlibTransport.
-  boost::shared_ptr<TMemoryBuffer> membuf(new TMemoryBuffer());
-  {
-    // Create a TZlibTransport object, and immediately destroy it
-    // when it goes out of scope.
-    TZlibTransport w_zlib_trans(membuf);
-  }
-
-  BOOST_CHECK_EQUAL(membuf->available_read(), (uint32_t)0);
-}
-
-/*
- * Initialization
- */
-
-#if (BOOST_VERSION >= 105900)
-#define ADD_TEST_CASE(suite, name, _FUNC, ...)                                                     \
-  do {                                                                                             \
-    ::std::ostringstream name_ss;                                                                  \
-    name_ss << name << "-" << BOOST_STRINGIZE(_FUNC);                                              \
-    boost::function<void ()> test_func = ::apache::thrift::stdcxx::bind(_FUNC, ##__VA_ARGS__);     \
-    ::boost::unit_test::test_case* tc                                                              \
-        = ::boost::unit_test::make_test_case(test_func, name_ss.str(), __FILE__, __LINE__);        \
-    (suite)->add(tc);                                                                              \
-  } while (0)
-#else
-#define ADD_TEST_CASE(suite, name, _FUNC, ...)                                                     \
-  do {                                                                                             \
-    ::std::ostringstream name_ss;                                                                  \
-    name_ss << name << "-" << BOOST_STRINGIZE(_FUNC);                                              \
-    ::boost::unit_test::test_case* tc                                                              \
-        = ::boost::unit_test::make_test_case(::apache::thrift::stdcxx::bind(_FUNC,                 \
-                                                                            ##__VA_ARGS__),        \
-                                             name_ss.str());                                       \
-    (suite)->add(tc);                                                                              \
-  } while (0)
-#endif
-
-void add_tests(boost::unit_test::test_suite* suite,
-               const boost::shared_array<uint8_t>& buf,
-               uint32_t buf_len,
-               const char* name) {
-  ADD_TEST_CASE(suite, name, test_write_then_read, buf, buf_len);
-  ADD_TEST_CASE(suite, name, test_separate_checksum, buf, buf_len);
-  ADD_TEST_CASE(suite, name, test_incomplete_checksum, buf, buf_len);
-  ADD_TEST_CASE(suite, name, test_invalid_checksum, buf, buf_len);
-  ADD_TEST_CASE(suite, name, test_write_after_flush, buf, buf_len);
-
-  boost::shared_ptr<SizeGenerator> size_32k(new ConstantSizeGenerator(1 << 15));
-  boost::shared_ptr<SizeGenerator> size_lognormal(new LogNormalSizeGenerator(20, 30));
-  ADD_TEST_CASE(suite, name << "-constant", test_read_write_mix, buf, buf_len, size_32k, size_32k);
-  ADD_TEST_CASE(suite,
-                name << "-lognormal-write",
-                test_read_write_mix,
-                buf,
-                buf_len,
-                size_lognormal,
-                size_32k);
-  ADD_TEST_CASE(suite,
-                name << "-lognormal-read",
-                test_read_write_mix,
-                buf,
-                buf_len,
-                size_32k,
-                size_lognormal);
-  ADD_TEST_CASE(suite,
-                name << "-lognormal-both",
-                test_read_write_mix,
-                buf,
-                buf_len,
-                size_lognormal,
-                size_lognormal);
-
-  // Test with a random size distribution,
-  // but use the exact same distribution for reading as for writing.
-  //
-  // Because the SizeGenerator makes a copy of the random number generator,
-  // both SizeGenerators should return the exact same set of values, since they
-  // both start with random number generators in the same state.
-  boost::shared_ptr<SizeGenerator> write_size_gen(new LogNormalSizeGenerator(20, 30));
-  boost::shared_ptr<SizeGenerator> read_size_gen(new LogNormalSizeGenerator(20, 30));
-  ADD_TEST_CASE(suite,
-                name << "-lognormal-same-distribution",
-                test_read_write_mix,
-                buf,
-                buf_len,
-                write_size_gen,
-                read_size_gen);
-}
-
-void print_usage(FILE* f, const char* argv0) {
-  fprintf(f, "Usage: %s [boost_options] [options]\n", argv0);
-  fprintf(f, "Options:\n");
-  fprintf(f, "  --seed=<N>, -s <N>\n");
-  fprintf(f, "  --help\n");
-}
-
-#ifdef BOOST_TEST_DYN_LINK
-bool init_unit_test_suite() {
-  uint32_t seed = static_cast<uint32_t>(time(NULL));
-#ifdef HAVE_INTTYPES_H
-  printf("seed: %" PRIu32 "\n", seed);
-#endif
-  rng.seed(seed);
-
-  boost::unit_test::test_suite* suite = &boost::unit_test::framework::master_test_suite();
-  suite->p_name.value = "ZlibTest";
-
-  uint32_t buf_len = 1024 * 32;
-  add_tests(suite, gen_uniform_buffer(buf_len, 'a'), buf_len, "uniform");
-  add_tests(suite, gen_compressible_buffer(buf_len), buf_len, "compressible");
-  add_tests(suite, gen_random_buffer(buf_len), buf_len, "random");
-
-  suite->add(BOOST_TEST_CASE(test_no_write));
-
-  return true;
-}
-
-int main( int argc, char* argv[] ) {
-  return ::boost::unit_test::unit_test_main(&init_unit_test_suite,argc,argv);
-}
-#else
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-  THRIFT_UNUSED_VARIABLE(argc);
-  THRIFT_UNUSED_VARIABLE(argv);
-  uint32_t seed = static_cast<uint32_t>(time(NULL));
-#ifdef HAVE_INTTYPES_H
-  printf("seed: %" PRIu32 "\n", seed);
-#endif
-  rng.seed(seed);
-
-  boost::unit_test::test_suite* suite = &boost::unit_test::framework::master_test_suite();
-  suite->p_name.value = "ZlibTest";
-
-  uint32_t buf_len = 1024 * 32;
-  add_tests(suite, gen_uniform_buffer(buf_len, 'a'), buf_len, "uniform");
-  add_tests(suite, gen_compressible_buffer(buf_len), buf_len, "compressible");
-  add_tests(suite, gen_random_buffer(buf_len), buf_len, "random");
-
-  suite->add(BOOST_TEST_CASE(test_no_write));
-
-  return NULL;
-}
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/Tests.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/Tests.cpp
deleted file mode 100644
index 33af392..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/Tests.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <iostream>
-#include <vector>
-#include <string>
-
-#include "ThreadFactoryTests.h"
-#include "TimerManagerTests.h"
-#include "ThreadManagerTests.h"
-
-int main(int argc, char** argv) {
-
-  std::string arg;
-
-  std::vector<std::string> args(argc - 1 > 1 ? argc - 1 : 1);
-
-  args[0] = "all";
-
-  for (int ix = 1; ix < argc; ix++) {
-    args[ix - 1] = std::string(argv[ix]);
-  }
-
-  bool runAll = args[0].compare("all") == 0;
-
-  if (runAll || args[0].compare("thread-factory") == 0) {
-
-    ThreadFactoryTests threadFactoryTests;
-
-    std::cout << "ThreadFactory tests..." << std::endl;
-
-    int reapLoops = 20;
-    int reapCount = 1000;
-    size_t floodLoops = 3;
-    size_t floodCount = 20000;
-
-    std::cout << "\t\tThreadFactory reap N threads test: N = " << reapLoops << "x" << reapCount << std::endl;
-
-    if (!threadFactoryTests.reapNThreads(reapLoops, reapCount)) {
-      std::cerr << "\t\ttThreadFactory reap N threads FAILED" << std::endl;
-      return 1;
-    }
-
-    std::cout << "\t\tThreadFactory flood N threads test: N = " << floodLoops << "x" << floodCount << std::endl;
-
-    if (!threadFactoryTests.floodNTest(floodLoops, floodCount)) {
-      std::cerr << "\t\ttThreadFactory flood N threads FAILED" << std::endl;
-      return 1;
-    }
-
-    std::cout << "\t\tThreadFactory synchronous start test" << std::endl;
-
-    if (!threadFactoryTests.synchStartTest()) {
-      std::cerr << "\t\ttThreadFactory synchronous start FAILED" << std::endl;
-      return 1;
-    }
-
-    std::cout << "\t\tThreadFactory monitor timeout test" << std::endl;
-
-    if (!threadFactoryTests.monitorTimeoutTest()) {
-      std::cerr << "\t\ttThreadFactory monitor timeout FAILED" << std::endl;
-      return 1;
-    }
-  }
-
-  if (runAll || args[0].compare("util") == 0) {
-
-    std::cout << "Util tests..." << std::endl;
-
-    std::cout << "\t\tUtil minimum time" << std::endl;
-
-    int64_t time00 = Util::currentTime();
-    int64_t time01 = Util::currentTime();
-
-    std::cout << "\t\t\tMinimum time: " << time01 - time00 << "ms" << std::endl;
-
-    time00 = Util::currentTime();
-    time01 = time00;
-    size_t count = 0;
-
-    while (time01 < time00 + 10) {
-      count++;
-      time01 = Util::currentTime();
-    }
-
-    std::cout << "\t\t\tscall per ms: " << count / (time01 - time00) << std::endl;
-  }
-
-  if (runAll || args[0].compare("timer-manager") == 0) {
-
-    std::cout << "TimerManager tests..." << std::endl;
-
-    std::cout << "\t\tTimerManager test00" << std::endl;
-
-    TimerManagerTests timerManagerTests;
-
-    if (!timerManagerTests.test00()) {
-      std::cerr << "\t\tTimerManager tests FAILED" << std::endl;
-      return 1;
-    }
-  }
-
-  if (runAll || args[0].compare("thread-manager") == 0) {
-
-    std::cout << "ThreadManager tests..." << std::endl;
-
-    {
-      size_t workerCount = 100;
-      size_t taskCount = 50000;
-      int64_t delay = 10LL;
-
-      ThreadManagerTests threadManagerTests;
-
-      std::cout << "\t\tThreadManager api test:" << std::endl;
-
-      if (!threadManagerTests.apiTest()) {
-        std::cerr << "\t\tThreadManager apiTest FAILED" << std::endl;
-        return 1;
-      }
-
-      std::cout << "\t\tThreadManager load test: worker count: " << workerCount
-                << " task count: " << taskCount << " delay: " << delay << std::endl;
-
-      if (!threadManagerTests.loadTest(taskCount, delay, workerCount)) {
-        std::cerr << "\t\tThreadManager loadTest FAILED" << std::endl;
-        return 1;
-      }
-
-      std::cout << "\t\tThreadManager block test: worker count: " << workerCount
-                << " delay: " << delay << std::endl;
-
-      if (!threadManagerTests.blockTest(delay, workerCount)) {
-        std::cerr << "\t\tThreadManager blockTest FAILED" << std::endl;
-        return 1;
-      }
-    }
-  }
-
-  if (runAll || args[0].compare("thread-manager-benchmark") == 0) {
-
-    std::cout << "ThreadManager benchmark tests..." << std::endl;
-
-    {
-
-      size_t minWorkerCount = 2;
-
-      size_t maxWorkerCount = 64;
-
-      size_t tasksPerWorker = 1000;
-
-      int64_t delay = 5LL;
-
-      for (size_t workerCount = minWorkerCount; workerCount < maxWorkerCount; workerCount *= 4) {
-
-        size_t taskCount = workerCount * tasksPerWorker;
-
-        std::cout << "\t\tThreadManager load test: worker count: " << workerCount
-                  << " task count: " << taskCount << " delay: " << delay << std::endl;
-
-        ThreadManagerTests threadManagerTests;
-
-        if (!threadManagerTests.loadTest(taskCount, delay, workerCount))
-        {
-          std::cerr << "\t\tThreadManager loadTest FAILED" << std::endl;
-          return 1;
-        }
-      }
-    }
-  }
-
-  std::cout << "ALL TESTS PASSED" << std::endl;
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/ThreadFactoryTests.h b/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/ThreadFactoryTests.h
deleted file mode 100644
index 4fc688c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/ThreadFactoryTests.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-#include <thrift/concurrency/Thread.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/Util.h>
-
-#include <assert.h>
-#include <iostream>
-#include <set>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-namespace test {
-
-using boost::shared_ptr;
-using namespace apache::thrift::concurrency;
-
-/**
- * ThreadManagerTests class
- *
- * @version $Id:$
- */
-class ThreadFactoryTests {
-
-public:
-  /**
-   * Reap N threads
-   */
-  class ReapNTask : public Runnable {
-
-  public:
-    ReapNTask(Monitor& monitor, int& activeCount) : _monitor(monitor), _count(activeCount) {}
-
-    void run() {
-      Synchronized s(_monitor);
-
-      _count--;
-
-      // std::cout << "\t\t\tthread count: " << _count << std::endl;
-
-      if (_count == 0) {
-        _monitor.notify();
-      }
-    }
-
-    Monitor& _monitor;
-
-    int& _count;
-  };
-
-  bool reapNThreads(int loop = 1, int count = 10) {
-
-    PlatformThreadFactory threadFactory = PlatformThreadFactory();
-
-    shared_ptr<Monitor> monitor(new Monitor);
-
-    for (int lix = 0; lix < loop; lix++) {
-
-      int* activeCount = new int(count);
-
-      std::set<shared_ptr<Thread> > threads;
-
-      int tix;
-
-      for (tix = 0; tix < count; tix++) {
-        try {
-          threads.insert(
-              threadFactory.newThread(shared_ptr<Runnable>(new ReapNTask(*monitor, *activeCount))));
-        } catch (SystemResourceException& e) {
-          std::cout << "\t\t\tfailed to create " << lix* count + tix << " thread " << e.what()
-                    << std::endl;
-          throw e;
-        }
-      }
-
-      tix = 0;
-      for (std::set<shared_ptr<Thread> >::const_iterator thread = threads.begin();
-           thread != threads.end();
-           tix++, ++thread) {
-
-        try {
-          (*thread)->start();
-        } catch (SystemResourceException& e) {
-          std::cout << "\t\t\tfailed to start  " << lix* count + tix << " thread " << e.what()
-                    << std::endl;
-          throw e;
-        }
-      }
-
-      {
-        Synchronized s(*monitor);
-        while (*activeCount > 0) {
-          monitor->wait(1000);
-        }
-      }
-      delete activeCount;
-      std::cout << "\t\t\treaped " << lix* count << " threads" << std::endl;
-    }
-
-    std::cout << "\t\t\tSuccess!" << std::endl;
-
-    return true;
-  }
-
-  class SynchStartTask : public Runnable {
-
-  public:
-    enum STATE { UNINITIALIZED, STARTING, STARTED, STOPPING, STOPPED };
-
-    SynchStartTask(Monitor& monitor, volatile STATE& state) : _monitor(monitor), _state(state) {}
-
-    void run() {
-      {
-        Synchronized s(_monitor);
-        if (_state == SynchStartTask::STARTING) {
-          _state = SynchStartTask::STARTED;
-          _monitor.notify();
-        }
-      }
-
-      {
-        Synchronized s(_monitor);
-        while (_state == SynchStartTask::STARTED) {
-          _monitor.wait();
-        }
-
-        if (_state == SynchStartTask::STOPPING) {
-          _state = SynchStartTask::STOPPED;
-          _monitor.notifyAll();
-        }
-      }
-    }
-
-  private:
-    Monitor& _monitor;
-    volatile STATE& _state;
-  };
-
-  bool synchStartTest() {
-
-    Monitor monitor;
-
-    SynchStartTask::STATE state = SynchStartTask::UNINITIALIZED;
-
-    shared_ptr<SynchStartTask> task
-        = shared_ptr<SynchStartTask>(new SynchStartTask(monitor, state));
-
-    PlatformThreadFactory threadFactory = PlatformThreadFactory();
-
-    shared_ptr<Thread> thread = threadFactory.newThread(task);
-
-    if (state == SynchStartTask::UNINITIALIZED) {
-
-      state = SynchStartTask::STARTING;
-
-      thread->start();
-    }
-
-    {
-      Synchronized s(monitor);
-      while (state == SynchStartTask::STARTING) {
-        monitor.wait();
-      }
-    }
-
-    assert(state != SynchStartTask::STARTING);
-
-    {
-      Synchronized s(monitor);
-
-      try {
-        monitor.wait(100);
-      } catch (TimedOutException&) {
-      }
-
-      if (state == SynchStartTask::STARTED) {
-
-        state = SynchStartTask::STOPPING;
-
-        monitor.notify();
-      }
-
-      while (state == SynchStartTask::STOPPING) {
-        monitor.wait();
-      }
-    }
-
-    assert(state == SynchStartTask::STOPPED);
-
-    bool success = true;
-
-    std::cout << "\t\t\t" << (success ? "Success" : "Failure") << "!" << std::endl;
-
-    return true;
-  }
-
-  /**
-   * The only guarantee a monitor timeout can give you is that
-   * it will take "at least" as long as the timeout, no less.
-   * There is absolutely no guarantee around regaining execution
-   * near the timeout.  On a busy system (like inside a third party
-   * CI environment) it could take quite a bit longer than the
-   * requested timeout, and that's ok.
-   */
-
-  bool monitorTimeoutTest(int64_t count = 1000, int64_t timeout = 2) {
-
-    Monitor monitor;
-
-    int64_t startTime = Util::currentTime();
-
-    for (int64_t ix = 0; ix < count; ix++) {
-      {
-        Synchronized s(monitor);
-        try {
-          monitor.wait(timeout);
-        } catch (TimedOutException&) {
-        }
-      }
-    }
-
-    int64_t endTime = Util::currentTime();
-
-  bool success = (endTime - startTime) >= (count * timeout);
-
-    std::cout << "\t\t\t" << (success ? "Success" : "Failure")
-              << ": minimum required time to elapse " << count * timeout
-              << "ms; actual elapsed time " << endTime - startTime << "ms"
-              << std::endl;
-
-    return success;
-  }
-
-  class FloodTask : public Runnable {
-  public:
-    FloodTask(const size_t id) : _id(id) {}
-    ~FloodTask() {
-      if (_id % 10000 == 0) {
-        std::cout << "\t\tthread " << _id << " done" << std::endl;
-      }
-    }
-
-    void run() {
-      if (_id % 10000 == 0) {
-        std::cout << "\t\tthread " << _id << " started" << std::endl;
-      }
-    }
-    const size_t _id;
-  };
-
-  void foo(PlatformThreadFactory* tf) { (void)tf; }
-
-  bool floodNTest(size_t loop = 1, size_t count = 100000) {
-
-    bool success = false;
-
-    for (size_t lix = 0; lix < loop; lix++) {
-
-      PlatformThreadFactory threadFactory = PlatformThreadFactory();
-      threadFactory.setDetached(true);
-
-      for (size_t tix = 0; tix < count; tix++) {
-
-        try {
-
-          shared_ptr<FloodTask> task(new FloodTask(lix * count + tix));
-
-          shared_ptr<Thread> thread = threadFactory.newThread(task);
-
-          thread->start();
-
-        } catch (TException& e) {
-
-          std::cout << "\t\t\tfailed to start  " << lix* count + tix << " thread " << e.what()
-                    << std::endl;
-
-          return success;
-        }
-      }
-
-      std::cout << "\t\t\tflooded " << (lix + 1) * count << " threads" << std::endl;
-
-      success = true;
-    }
-
-    return success;
-  }
-};
-
-}
-}
-}
-} // apache::thrift::concurrency::test
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/ThreadManagerTests.h b/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/ThreadManagerTests.h
deleted file mode 100644
index b5925ac..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/ThreadManagerTests.h
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/thrift-config.h>
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/Util.h>
-
-#include <assert.h>
-#include <deque>
-#include <set>
-#include <iostream>
-#include <stdint.h>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-namespace test {
-
-using namespace apache::thrift::concurrency;
-
-static std::deque<boost::shared_ptr<Runnable> > m_expired;
-static void expiredNotifier(boost::shared_ptr<Runnable> runnable)
-{
-  m_expired.push_back(runnable);
-}
-
-static void sleep_(int64_t millisec) {
-  Monitor _sleep;
-  Synchronized s(_sleep);
-
-  try {
-    _sleep.wait(millisec);
-  } catch (TimedOutException&) {
-    ;
-  } catch (...) {
-    assert(0);
-  }
-}
-
-class ThreadManagerTests {
-
-public:
-  class Task : public Runnable {
-
-  public:
-    Task(Monitor& monitor, size_t& count, int64_t timeout)
-      : _monitor(monitor), _count(count), _timeout(timeout), _startTime(0), _endTime(0), _done(false) {}
-
-    void run() {
-
-      _startTime = Util::currentTime();
-
-      sleep_(_timeout);
-
-      _endTime = Util::currentTime();
-
-      _done = true;
-
-      {
-        Synchronized s(_monitor);
-
-        // std::cout << "Thread " << _count << " completed " << std::endl;
-
-        _count--;
-        if (_count % 10000 == 0) {
-          _monitor.notify();
-        }
-      }
-    }
-
-    Monitor& _monitor;
-    size_t& _count;
-    int64_t _timeout;
-    int64_t _startTime;
-    int64_t _endTime;
-    bool _done;
-    Monitor _sleep;
-  };
-
-  /**
-   * Dispatch count tasks, each of which blocks for timeout milliseconds then
-   * completes. Verify that all tasks completed and that thread manager cleans
-   * up properly on delete.
-   */
-  bool loadTest(size_t count = 100, int64_t timeout = 100LL, size_t workerCount = 4) {
-
-    Monitor monitor;
-
-    size_t activeCount = count;
-
-    shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(workerCount);
-
-    shared_ptr<PlatformThreadFactory> threadFactory
-        = shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory());
-
-#if !USE_BOOST_THREAD && !USE_STD_THREAD
-    threadFactory->setPriority(PosixThreadFactory::HIGHEST);
-#endif
-    threadManager->threadFactory(threadFactory);
-
-    threadManager->start();
-
-    std::set<shared_ptr<ThreadManagerTests::Task> > tasks;
-
-    for (size_t ix = 0; ix < count; ix++) {
-
-      tasks.insert(shared_ptr<ThreadManagerTests::Task>(
-          new ThreadManagerTests::Task(monitor, activeCount, timeout)));
-    }
-
-    int64_t time00 = Util::currentTime();
-
-    for (std::set<shared_ptr<ThreadManagerTests::Task> >::iterator ix = tasks.begin();
-         ix != tasks.end();
-         ix++) {
-
-      threadManager->add(*ix);
-    }
-
-    std::cout << "\t\t\t\tloaded " << count << " tasks to execute" << std::endl;
-
-    {
-      Synchronized s(monitor);
-
-      while (activeCount > 0) {
-        std::cout << "\t\t\t\tactiveCount = " << activeCount << std::endl;
-        monitor.wait();
-      }
-    }
-
-    int64_t time01 = Util::currentTime();
-
-    int64_t firstTime = 9223372036854775807LL;
-    int64_t lastTime = 0;
-
-    double averageTime = 0;
-    int64_t minTime = 9223372036854775807LL;
-    int64_t maxTime = 0;
-
-    for (std::set<shared_ptr<ThreadManagerTests::Task> >::iterator ix = tasks.begin();
-         ix != tasks.end();
-         ix++) {
-
-      shared_ptr<ThreadManagerTests::Task> task = *ix;
-
-      int64_t delta = task->_endTime - task->_startTime;
-
-      assert(delta > 0);
-
-      if (task->_startTime < firstTime) {
-        firstTime = task->_startTime;
-      }
-
-      if (task->_endTime > lastTime) {
-        lastTime = task->_endTime;
-      }
-
-      if (delta < minTime) {
-        minTime = delta;
-      }
-
-      if (delta > maxTime) {
-        maxTime = delta;
-      }
-
-      averageTime += delta;
-    }
-
-    averageTime /= count;
-
-    std::cout << "\t\t\tfirst start: " << firstTime << " Last end: " << lastTime
-              << " min: " << minTime << "ms max: " << maxTime << "ms average: " << averageTime
-              << "ms" << std::endl;
-
-    bool success = (time01 - time00) >= ((int64_t)count * timeout) / (int64_t)workerCount;
-
-    std::cout << "\t\t\t" << (success ? "Success" : "Failure")
-              << "! expected time: " << ((int64_t)count * timeout) / (int64_t)workerCount << "ms elapsed time: " << time01 - time00
-              << "ms" << std::endl;
-
-    return success;
-  }
-
-  class BlockTask : public Runnable {
-
-  public:
-    BlockTask(Monitor& entryMonitor, Monitor& blockMonitor, bool& blocked, Monitor& doneMonitor, size_t& count)
-      : _entryMonitor(entryMonitor), _entered(false), _blockMonitor(blockMonitor), _blocked(blocked), _doneMonitor(doneMonitor), _count(count) {}
-
-    void run() {
-      {
-        Synchronized s(_entryMonitor);
-        _entered = true;
-        _entryMonitor.notify();
-      }
-
-      {
-        Synchronized s(_blockMonitor);
-        while (_blocked) {
-          _blockMonitor.wait();
-        }
-      }
-
-      {
-        Synchronized s(_doneMonitor);
-        if (--_count == 0) {
-          _doneMonitor.notify();
-        }
-      }
-    }
-
-    Monitor& _entryMonitor;
-    bool _entered;
-    Monitor& _blockMonitor;
-    bool& _blocked;
-    Monitor& _doneMonitor;
-    size_t& _count;
-  };
-
-  /**
-   * Block test.  Create pendingTaskCountMax tasks.  Verify that we block adding the
-   * pendingTaskCountMax + 1th task.  Verify that we unblock when a task completes */
-
-  bool blockTest(int64_t timeout = 100LL, size_t workerCount = 2) {
-    (void)timeout;
-    bool success = false;
-
-    try {
-
-      Monitor entryMonitor;   // not used by this test
-      Monitor blockMonitor;
-      bool blocked[] = {true, true, true};
-      Monitor doneMonitor;
-
-      size_t pendingTaskMaxCount = workerCount;
-
-      size_t activeCounts[] = {workerCount, pendingTaskMaxCount, 1};
-
-      shared_ptr<ThreadManager> threadManager
-          = ThreadManager::newSimpleThreadManager(workerCount, pendingTaskMaxCount);
-
-      shared_ptr<PlatformThreadFactory> threadFactory
-          = shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory());
-
-#if !USE_BOOST_THREAD && !USE_STD_THREAD
-      threadFactory->setPriority(PosixThreadFactory::HIGHEST);
-#endif
-      threadManager->threadFactory(threadFactory);
-
-      threadManager->start();
-
-      std::vector<shared_ptr<ThreadManagerTests::BlockTask> > tasks;
-      tasks.reserve(workerCount + pendingTaskMaxCount);
-
-      for (size_t ix = 0; ix < workerCount; ix++) {
-
-        tasks.push_back(shared_ptr<ThreadManagerTests::BlockTask>(
-            new ThreadManagerTests::BlockTask(entryMonitor, blockMonitor, blocked[0], doneMonitor, activeCounts[0])));
-      }
-
-      for (size_t ix = 0; ix < pendingTaskMaxCount; ix++) {
-
-        tasks.push_back(shared_ptr<ThreadManagerTests::BlockTask>(
-            new ThreadManagerTests::BlockTask(entryMonitor, blockMonitor, blocked[1], doneMonitor, activeCounts[1])));
-      }
-
-      for (std::vector<shared_ptr<ThreadManagerTests::BlockTask> >::iterator ix = tasks.begin();
-           ix != tasks.end();
-           ix++) {
-        threadManager->add(*ix);
-      }
-
-      if (!(success = (threadManager->totalTaskCount() == pendingTaskMaxCount + workerCount))) {
-        throw TException("Unexpected pending task count");
-      }
-
-      shared_ptr<ThreadManagerTests::BlockTask> extraTask(
-          new ThreadManagerTests::BlockTask(entryMonitor, blockMonitor, blocked[2], doneMonitor, activeCounts[2]));
-
-      try {
-        threadManager->add(extraTask, 1);
-        throw TException("Unexpected success adding task in excess of pending task count");
-      } catch (TooManyPendingTasksException&) {
-        throw TException("Should have timed out adding task in excess of pending task count");
-      } catch (TimedOutException&) {
-        // Expected result
-      }
-
-      try {
-        threadManager->add(extraTask, -1);
-        throw TException("Unexpected success adding task in excess of pending task count");
-      } catch (TimedOutException&) {
-        throw TException("Unexpected timeout adding task in excess of pending task count");
-      } catch (TooManyPendingTasksException&) {
-        // Expected result
-      }
-
-      std::cout << "\t\t\t"
-                << "Pending tasks " << threadManager->pendingTaskCount() << std::endl;
-
-      {
-        Synchronized s(blockMonitor);
-        blocked[0] = false;
-        blockMonitor.notifyAll();
-      }
-
-      {
-        Synchronized s(doneMonitor);
-        while (activeCounts[0] != 0) {
-          doneMonitor.wait();
-        }
-      }
-
-      std::cout << "\t\t\t"
-                << "Pending tasks " << threadManager->pendingTaskCount() << std::endl;
-
-      try {
-        threadManager->add(extraTask, 1);
-      } catch (TimedOutException&) {
-        std::cout << "\t\t\t"
-                  << "add timed out unexpectedly" << std::endl;
-        throw TException("Unexpected timeout adding task");
-
-      } catch (TooManyPendingTasksException&) {
-        std::cout << "\t\t\t"
-                  << "add encountered too many pending exepctions" << std::endl;
-        throw TException("Unexpected timeout adding task");
-      }
-
-      // Wake up tasks that were pending before and wait for them to complete
-
-      {
-        Synchronized s(blockMonitor);
-        blocked[1] = false;
-        blockMonitor.notifyAll();
-      }
-
-      {
-        Synchronized s(doneMonitor);
-        while (activeCounts[1] != 0) {
-          doneMonitor.wait();
-        }
-      }
-
-      // Wake up the extra task and wait for it to complete
-
-      {
-        Synchronized s(blockMonitor);
-        blocked[2] = false;
-        blockMonitor.notifyAll();
-      }
-
-      {
-        Synchronized s(doneMonitor);
-        while (activeCounts[2] != 0) {
-          doneMonitor.wait();
-        }
-      }
-
-      threadManager->stop();
-
-      if (!(success = (threadManager->totalTaskCount() == 0))) {
-        throw TException("Unexpected total task count");
-      }
-
-    } catch (TException& e) {
-      std::cout << "ERROR: " << e.what() << std::endl;
-    }
-
-    std::cout << "\t\t\t" << (success ? "Success" : "Failure") << std::endl;
-    return success;
-  }
-
-
-  bool apiTest() {
-
-    // prove currentTime has milliseconds granularity since many other things depend on it
-    int64_t a = Util::currentTime();
-    sleep_(100);
-    int64_t b = Util::currentTime();
-    if (b - a < 50 || b - a > 150) {
-      std::cerr << "\t\t\texpected 100ms gap, found " << (b-a) << "ms gap instead." << std::endl;
-      return false;
-    }
-
-#if !USE_BOOST_THREAD && !USE_STD_THREAD
-    // test once with a detached thread factory and once with a joinable thread factory
-
-    shared_ptr<PosixThreadFactory> threadFactory
-        = shared_ptr<PosixThreadFactory>(new PosixThreadFactory(false));
-
-    std::cout << "\t\t\tapiTest with joinable thread factory" << std::endl;
-    if (!apiTestWithThreadFactory(threadFactory)) {
-      return false;
-    }
-
-    threadFactory.reset(new PosixThreadFactory(true));
-    std::cout << "\t\t\tapiTest with detached thread factory" << std::endl;
-    return apiTestWithThreadFactory(threadFactory);
-#else
-    return apiTestWithThreadFactory(shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory()));
-#endif
-
-  }
-
-  bool apiTestWithThreadFactory(shared_ptr<PlatformThreadFactory> threadFactory)
-  {
-    shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(1);
-    threadManager->threadFactory(threadFactory);
-
-#if !USE_BOOST_THREAD && !USE_STD_THREAD
-    threadFactory->setPriority(PosixThreadFactory::HIGHEST);
-
-    // verify we cannot change the thread factory to one with the opposite detached setting
-    shared_ptr<PlatformThreadFactory> threadFactory2
-        = shared_ptr<PosixThreadFactory>(new PlatformThreadFactory(
-          PosixThreadFactory::ROUND_ROBIN,
-          PosixThreadFactory::NORMAL,
-          1,
-          !threadFactory->isDetached()));
-    try {
-      threadManager->threadFactory(threadFactory2);
-      // if the call succeeded we changed the thread factory to one that had the opposite setting for "isDetached()".
-      // this is bad, because the thread manager checks with the thread factory to see if it should join threads
-      // as they are leaving - so the detached status of new threads cannot change while there are existing threads.
-      std::cerr << "\t\t\tShould not be able to change thread factory detached disposition" << std::endl;
-      return false;
-    }
-    catch (InvalidArgumentException& ex) {
-      /* expected */
-    }
-#endif
-
-    std::cout << "\t\t\t\tstarting.. " << std::endl;
-
-    threadManager->start();
-    threadManager->setExpireCallback(expiredNotifier); // apache::thrift::stdcxx::bind(&ThreadManagerTests::expiredNotifier, this));
-
-#define EXPECT(FUNC, COUNT) { size_t c = FUNC; if (c != COUNT) { std::cerr << "expected " #FUNC" to be " #COUNT ", but was " << c << std::endl; return false; } }
-
-    EXPECT(threadManager->workerCount(), 1);
-    EXPECT(threadManager->idleWorkerCount(), 1);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-
-    std::cout << "\t\t\t\tadd 2nd worker.. " << std::endl;
-
-    threadManager->addWorker();
-
-    EXPECT(threadManager->workerCount(), 2);
-    EXPECT(threadManager->idleWorkerCount(), 2);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-
-    std::cout << "\t\t\t\tremove 2nd worker.. " << std::endl;
-
-    threadManager->removeWorker();
-
-    EXPECT(threadManager->workerCount(), 1);
-    EXPECT(threadManager->idleWorkerCount(), 1);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-
-    std::cout << "\t\t\t\tremove 1st worker.. " << std::endl;
-
-    threadManager->removeWorker();
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-
-    std::cout << "\t\t\t\tadd blocking task.. " << std::endl;
-
-    // We're going to throw a blocking task into the mix
-    Monitor entryMonitor;   // signaled when task is running
-    Monitor blockMonitor;   // to be signaled to unblock the task
-    bool blocked(true);     // set to false before notifying
-    Monitor doneMonitor;    // signaled when count reaches zero
-    size_t activeCount = 1;
-    shared_ptr<ThreadManagerTests::BlockTask> blockingTask(
-      new ThreadManagerTests::BlockTask(entryMonitor, blockMonitor, blocked, doneMonitor, activeCount));
-    threadManager->add(blockingTask);
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 1);
-
-    std::cout << "\t\t\t\tadd other task.. " << std::endl;
-
-    shared_ptr<ThreadManagerTests::Task> otherTask(
-      new ThreadManagerTests::Task(doneMonitor, activeCount, 0));
-
-    threadManager->add(otherTask);
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 2);
-
-    std::cout << "\t\t\t\tremove blocking task specifically.. " << std::endl;
-
-    threadManager->remove(blockingTask);
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 1);
-
-    std::cout << "\t\t\t\tremove next pending task.." << std::endl;
-
-    shared_ptr<Runnable> nextTask = threadManager->removeNextPending();
-    if (nextTask != otherTask) {
-      std::cerr << "\t\t\t\t\texpected removeNextPending to return otherTask" << std::endl;
-      return false;
-    }
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-
-    std::cout << "\t\t\t\tremove next pending task (none left).." << std::endl;
-
-    nextTask = threadManager->removeNextPending();
-    if (nextTask) {
-      std::cerr << "\t\t\t\t\texpected removeNextPending to return an empty Runnable" << std::endl;
-      return false;
-    }
-
-    std::cout << "\t\t\t\tadd 2 expired tasks and 1 not.." << std::endl;
-
-    shared_ptr<ThreadManagerTests::Task> expiredTask(
-      new ThreadManagerTests::Task(doneMonitor, activeCount, 0));
-
-    threadManager->add(expiredTask, 0, 1);
-    threadManager->add(blockingTask);       // add one that hasn't expired to make sure it gets skipped
-    threadManager->add(expiredTask, 0, 1);  // add a second expired to ensure removeExpiredTasks removes both
-
-    sleep_(50);  // make sure enough time elapses for it to expire - the shortest expiration time is 1 millisecond
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 3);
-    EXPECT(threadManager->expiredTaskCount(), 0);
-
-    std::cout << "\t\t\t\tremove expired tasks.." << std::endl;
-
-    if (!m_expired.empty()) {
-      std::cerr << "\t\t\t\t\texpected m_expired to be empty" << std::endl;
-      return false;
-    }
-
-    threadManager->removeExpiredTasks();
-
-    if (m_expired.size() != 2) {
-      std::cerr << "\t\t\t\t\texpected m_expired to be set" << std::endl;
-      return false;
-    }
-
-    if (m_expired.front() != expiredTask) {
-      std::cerr << "\t\t\t\t\texpected m_expired[0] to be the expired task" << std::endl;
-      return false;
-    }
-    m_expired.pop_front();
-
-    if (m_expired.front() != expiredTask) {
-      std::cerr << "\t\t\t\t\texpected m_expired[1] to be the expired task" << std::endl;
-      return false;
-    }
-
-    m_expired.clear();
-
-    threadManager->remove(blockingTask);
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-    EXPECT(threadManager->expiredTaskCount(), 2);
-
-    std::cout << "\t\t\t\tadd expired task (again).." << std::endl;
-
-    threadManager->add(expiredTask, 0, 1);  // expires in 1ms
-    sleep_(50);  // make sure enough time elapses for it to expire - the shortest expiration time is 1ms
-
-    std::cout << "\t\t\t\tadd worker to consume expired task.." << std::endl;
-
-    threadManager->addWorker();
-    sleep_(100);  // make sure it has time to spin up and expire the task
-
-    if (m_expired.empty()) {
-      std::cerr << "\t\t\t\t\texpected m_expired to be set" << std::endl;
-      return false;
-    }
-
-    if (m_expired.front() != expiredTask) {
-      std::cerr << "\t\t\t\t\texpected m_expired to be the expired task" << std::endl;
-      return false;
-    }
-
-    m_expired.clear();
-
-    EXPECT(threadManager->workerCount(), 1);
-    EXPECT(threadManager->idleWorkerCount(), 1);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-    EXPECT(threadManager->expiredTaskCount(), 3);
-
-    std::cout << "\t\t\t\ttry to remove too many workers" << std::endl;
-    try {
-      threadManager->removeWorker(2);
-      std::cerr << "\t\t\t\t\texpected InvalidArgumentException" << std::endl;
-      return false;
-    } catch (const InvalidArgumentException&) {
-      /* expected */
-    }
-
-    std::cout << "\t\t\t\tremove worker.. " << std::endl;
-
-    threadManager->removeWorker();
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-    EXPECT(threadManager->expiredTaskCount(), 3);
-
-    std::cout << "\t\t\t\tadd blocking task.. " << std::endl;
-
-    threadManager->add(blockingTask);
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 1);
-
-    std::cout << "\t\t\t\tadd worker.. " << std::endl;
-
-    threadManager->addWorker();
-    {
-      Synchronized s(entryMonitor);
-      while (!blockingTask->_entered) {
-        entryMonitor.wait();
-      }
-    }
-
-    EXPECT(threadManager->workerCount(), 1);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-
-    std::cout << "\t\t\t\tunblock task and remove worker.. " << std::endl;
-
-    {
-      Synchronized s(blockMonitor);
-      blocked = false;
-      blockMonitor.notifyAll();
-    }
-    threadManager->removeWorker();
-
-    EXPECT(threadManager->workerCount(), 0);
-    EXPECT(threadManager->idleWorkerCount(), 0);
-    EXPECT(threadManager->pendingTaskCount(), 0);
-
-    std::cout << "\t\t\t\tcleanup.. " << std::endl;
-
-    blockingTask.reset();
-    threadManager.reset();
-    return true;
-  }
-};
-
-}
-}
-}
-} // apache::thrift::concurrency
-
-using namespace apache::thrift::concurrency::test;
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/TimerManagerTests.h b/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/TimerManagerTests.h
deleted file mode 100644
index 32d3935..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/concurrency/TimerManagerTests.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/concurrency/TimerManager.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/concurrency/Util.h>
-
-#include <assert.h>
-#include <iostream>
-
-namespace apache {
-namespace thrift {
-namespace concurrency {
-namespace test {
-
-using namespace apache::thrift::concurrency;
-
-class TimerManagerTests {
-
-public:
-  class Task : public Runnable {
-  public:
-    Task(Monitor& monitor, int64_t timeout)
-      : _timeout(timeout),
-        _startTime(Util::currentTime()),
-        _endTime(0),
-        _monitor(monitor),
-        _success(false),
-        _done(false) {}
-
-    ~Task() { std::cerr << this << std::endl; }
-
-    void run() {
-
-      _endTime = Util::currentTime();
-      _success = (_endTime - _startTime) >= _timeout;
-
-      {
-        Synchronized s(_monitor);
-        _done = true;
-        _monitor.notifyAll();
-      }
-    }
-
-    int64_t _timeout;
-    int64_t _startTime;
-    int64_t _endTime;
-    Monitor& _monitor;
-    bool _success;
-    bool _done;
-  };
-
-  /**
-   * This test creates two tasks and waits for the first to expire within 10%
-   * of the expected expiration time. It then verifies that the timer manager
-   * properly clean up itself and the remaining orphaned timeout task when the
-   * manager goes out of scope and its destructor is called.
-   */
-  bool test00(int64_t timeout = 1000LL) {
-
-    shared_ptr<TimerManagerTests::Task> orphanTask
-        = shared_ptr<TimerManagerTests::Task>(new TimerManagerTests::Task(_monitor, 10 * timeout));
-
-    {
-
-      TimerManager timerManager;
-
-      timerManager.threadFactory(shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory()));
-
-      timerManager.start();
-
-      assert(timerManager.state() == TimerManager::STARTED);
-
-      // Don't create task yet, because its constructor sets the expected completion time, and we
-      // need to delay between inserting the two tasks into the run queue.
-      shared_ptr<TimerManagerTests::Task> task;
-
-      {
-        Synchronized s(_monitor);
-
-        timerManager.add(orphanTask, 10 * timeout);
-
-        try {
-          // Wait for 1 second in order to give timerManager a chance to start sleeping in response
-          // to adding orphanTask. We need to do this so we can verify that adding the second task
-          // kicks the dispatcher out of the current wait and starts the new 1 second wait.
-          _monitor.wait(1000);
-          assert(
-              0 == "ERROR: This wait should time out. TimerManager dispatcher may have a problem.");
-        } catch (TimedOutException&) {
-        }
-
-        task.reset(new TimerManagerTests::Task(_monitor, timeout));
-
-        timerManager.add(task, timeout);
-
-        _monitor.wait();
-      }
-
-      assert(task->_done);
-
-      std::cout << "\t\t\t" << (task->_success ? "Success" : "Failure") << "!" << std::endl;
-    }
-
-    // timerManager.stop(); This is where it happens via destructor
-
-    assert(!orphanTask->_done);
-
-    return true;
-  }
-
-  friend class TestTask;
-
-  Monitor _monitor;
-};
-
-}
-}
-}
-} // apache::thrift::concurrency
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/link/LinkTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/link/LinkTest.cpp
deleted file mode 100644
index 18e14d1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/link/LinkTest.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-int main(int, char**) {
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/link/TemplatedService1.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/link/TemplatedService1.cpp
deleted file mode 100644
index da1790b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/link/TemplatedService1.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * This file is a part of a link test that makes sure generated
- * templated service headers can be included from multiple
- * implementation files.
- */
-
-#include "gen-cpp/ParentService.h"
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/link/TemplatedService2.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/link/TemplatedService2.cpp
deleted file mode 100644
index da1790b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/link/TemplatedService2.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * This file is a part of a link test that makes sure generated
- * templated service headers can be included from multiple
- * implementation files.
- */
-
-#include "gen-cpp/ParentService.h"
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/EventLog.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/EventLog.cpp
deleted file mode 100644
index 360307a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/EventLog.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#include "EventLog.h"
-
-#include <stdarg.h>
-#include <stdlib.h>
-
-using namespace std;
-using namespace apache::thrift::concurrency;
-
-namespace {
-
-// Define environment variable DEBUG_EVENTLOG to enable debug logging
-// ex: $ DEBUG_EVENTLOG=1 processor_test
-static const char * DEBUG_EVENTLOG = getenv("DEBUG_EVENTLOG");
-
-void debug(const char* fmt, ...) {
-  if (DEBUG_EVENTLOG) {
-    va_list ap;
-    va_start(ap, fmt);
-    vfprintf(stderr, fmt, ap);
-    va_end(ap);
-
-    fprintf(stderr, "\n");
-  }
-}
-}
-
-namespace apache {
-namespace thrift {
-namespace test {
-
-uint32_t EventLog::nextId_ = 0;
-
-#define EVENT_TYPE(value) EventType EventLog::value = #value
-EVENT_TYPE(ET_LOG_END);
-EVENT_TYPE(ET_CONN_CREATED);
-EVENT_TYPE(ET_CONN_DESTROYED);
-EVENT_TYPE(ET_CALL_STARTED);
-EVENT_TYPE(ET_CALL_FINISHED);
-EVENT_TYPE(ET_PROCESS);
-EVENT_TYPE(ET_PRE_READ);
-EVENT_TYPE(ET_POST_READ);
-EVENT_TYPE(ET_PRE_WRITE);
-EVENT_TYPE(ET_POST_WRITE);
-EVENT_TYPE(ET_ASYNC_COMPLETE);
-EVENT_TYPE(ET_HANDLER_ERROR);
-
-EVENT_TYPE(ET_CALL_INCREMENT_GENERATION);
-EVENT_TYPE(ET_CALL_GET_GENERATION);
-EVENT_TYPE(ET_CALL_ADD_STRING);
-EVENT_TYPE(ET_CALL_GET_STRINGS);
-EVENT_TYPE(ET_CALL_GET_DATA_WAIT);
-EVENT_TYPE(ET_CALL_ONEWAY_WAIT);
-EVENT_TYPE(ET_CALL_EXCEPTION_WAIT);
-EVENT_TYPE(ET_CALL_UNEXPECTED_EXCEPTION_WAIT);
-EVENT_TYPE(ET_CALL_SET_VALUE);
-EVENT_TYPE(ET_CALL_GET_VALUE);
-EVENT_TYPE(ET_WAIT_RETURN);
-
-EventLog::EventLog() {
-  id_ = nextId_++;
-  debug("New log: %d", id_);
-}
-
-void EventLog::append(EventType type,
-                      uint32_t connectionId,
-                      uint32_t callId,
-                      const string& message) {
-  Synchronized s(monitor_);
-  debug("%d <-- %u, %u, %s \"%s\"", id_, connectionId, callId, type, message.c_str());
-
-  Event e(type, connectionId, callId, message);
-  events_.push_back(e);
-
-  monitor_.notify();
-}
-
-Event EventLog::waitForEvent(int64_t timeout) {
-  Synchronized s(monitor_);
-
-  try {
-    while (events_.empty()) {
-      monitor_.wait(timeout);
-    }
-  } catch (TimedOutException ex) {
-    return Event(ET_LOG_END, 0, 0, "");
-  }
-
-  Event event = events_.front();
-  events_.pop_front();
-  return event;
-}
-
-Event EventLog::waitForConnEvent(uint32_t connId, int64_t timeout) {
-  Synchronized s(monitor_);
-
-  EventList::iterator it = events_.begin();
-  while (true) {
-    try {
-      // TODO: it would be nicer to honor timeout for the duration of this
-      // call, rather than restarting it for each call to wait().  It shouldn't
-      // be a big problem in practice, though.
-      while (it == events_.end()) {
-        monitor_.wait(timeout);
-      }
-    } catch (TimedOutException ex) {
-      return Event(ET_LOG_END, 0, 0, "");
-    }
-
-    if (it->connectionId == connId) {
-      Event event = *it;
-      events_.erase(it);
-      return event;
-    }
-  }
-}
-}
-}
-} // apache::thrift::test
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/EventLog.h b/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/EventLog.h
deleted file mode 100644
index 4f8275d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/EventLog.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _THRIFT_TEST_EVENTLOG_H_
-#define _THRIFT_TEST_EVENTLOG_H_ 1
-
-#include <thrift/concurrency/Monitor.h>
-
-namespace apache {
-namespace thrift {
-namespace test {
-
-// Initially I made EventType an enum, but using char* results
-// in much more readable error messages when there is a mismatch.
-// It also lets users of EventLog easily define their own new types.
-// Comparing the literal pointer values should be safe, barring any strange
-// linking setup that results in duplicate symbols.
-typedef const char* EventType;
-
-struct Event {
-  Event(EventType type, uint32_t connectionId, uint32_t callId, const std::string& message)
-    : type(type), connectionId(connectionId), callId(callId), message(message) {}
-
-  EventType type;
-  uint32_t connectionId;
-  uint32_t callId;
-  std::string message;
-};
-
-class EventLog {
-public:
-  static EventType ET_LOG_END;
-  static EventType ET_CONN_CREATED;
-  static EventType ET_CONN_DESTROYED;
-  static EventType ET_CALL_STARTED;
-  static EventType ET_CALL_FINISHED;
-  static EventType ET_PROCESS;
-  static EventType ET_PRE_READ;
-  static EventType ET_POST_READ;
-  static EventType ET_PRE_WRITE;
-  static EventType ET_POST_WRITE;
-  static EventType ET_ASYNC_COMPLETE;
-  static EventType ET_HANDLER_ERROR;
-
-  static EventType ET_CALL_INCREMENT_GENERATION;
-  static EventType ET_CALL_GET_GENERATION;
-  static EventType ET_CALL_ADD_STRING;
-  static EventType ET_CALL_GET_STRINGS;
-  static EventType ET_CALL_GET_DATA_WAIT;
-  static EventType ET_CALL_ONEWAY_WAIT;
-  static EventType ET_CALL_UNEXPECTED_EXCEPTION_WAIT;
-  static EventType ET_CALL_EXCEPTION_WAIT;
-  static EventType ET_WAIT_RETURN;
-  static EventType ET_CALL_SET_VALUE;
-  static EventType ET_CALL_GET_VALUE;
-
-  EventLog();
-
-  void append(EventType type,
-              uint32_t connectionId,
-              uint32_t callId,
-              const std::string& message = "");
-
-  Event waitForEvent(int64_t timeout = 500);
-  Event waitForConnEvent(uint32_t connId, int64_t timeout = 500);
-
-protected:
-  typedef std::list<Event> EventList;
-
-  concurrency::Monitor monitor_;
-  EventList events_;
-  uint32_t id_;
-
-  static uint32_t nextId_;
-};
-}
-}
-} // apache::thrift::test
-
-#endif // _THRIFT_TEST_EVENTLOG_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/Handlers.h b/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/Handlers.h
deleted file mode 100644
index 041fd3d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/Handlers.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _THRIFT_PROCESSOR_TEST_HANDLERS_H_
-#define _THRIFT_PROCESSOR_TEST_HANDLERS_H_ 1
-
-#include "EventLog.h"
-#include "gen-cpp/ParentService.h"
-#include "gen-cpp/ChildService.h"
-
-namespace apache {
-namespace thrift {
-namespace test {
-
-class ParentHandler : virtual public ParentServiceIf {
-public:
-  ParentHandler(const boost::shared_ptr<EventLog>& log)
-    : triggerMonitor(&mutex_), generation_(0), wait_(false), log_(log) {}
-
-  int32_t incrementGeneration() {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_INCREMENT_GENERATION, 0, 0);
-    return ++generation_;
-  }
-
-  int32_t getGeneration() {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_GET_GENERATION, 0, 0);
-    return generation_;
-  }
-
-  void addString(const std::string& s) {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_ADD_STRING, 0, 0);
-    strings_.push_back(s);
-  }
-
-  void getStrings(std::vector<std::string>& _return) {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_GET_STRINGS, 0, 0);
-    _return = strings_;
-  }
-
-  void getDataWait(std::string& _return, const int32_t length) {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_GET_DATA_WAIT, 0, 0);
-
-    blockUntilTriggered();
-
-    _return.append(length, 'a');
-  }
-
-  void onewayWait() {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_ONEWAY_WAIT, 0, 0);
-
-    blockUntilTriggered();
-  }
-
-  void exceptionWait(const std::string& message) {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_EXCEPTION_WAIT, 0, 0);
-
-    blockUntilTriggered();
-
-    MyError e;
-    e.message = message;
-    throw e;
-  }
-
-  void unexpectedExceptionWait(const std::string& message) {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_UNEXPECTED_EXCEPTION_WAIT, 0, 0);
-
-    blockUntilTriggered();
-
-    MyError e;
-    e.message = message;
-    throw e;
-  }
-
-  /**
-   * After prepareTriggeredCall() is invoked, calls to any of the *Wait()
-   * functions won't return until triggerPendingCalls() is invoked
-   *
-   * This has to be a separate function invoked by the main test thread
-   * in order to to avoid race conditions.
-   */
-  void prepareTriggeredCall() {
-    concurrency::Guard g(mutex_);
-    wait_ = true;
-  }
-
-  /**
-   * Wake up all calls waiting in blockUntilTriggered()
-   */
-  void triggerPendingCalls() {
-    concurrency::Guard g(mutex_);
-    wait_ = false;
-    triggerMonitor.notifyAll();
-  }
-
-protected:
-  /**
-   * blockUntilTriggered() won't return until triggerPendingCalls() is invoked
-   * in another thread.
-   *
-   * This should only be called when already holding mutex_.
-   */
-  void blockUntilTriggered() {
-    while (wait_) {
-      triggerMonitor.waitForever();
-    }
-
-    // Log an event when we return
-    log_->append(EventLog::ET_WAIT_RETURN, 0, 0);
-  }
-
-  concurrency::Mutex mutex_;
-  concurrency::Monitor triggerMonitor;
-  int32_t generation_;
-  bool wait_;
-  std::vector<std::string> strings_;
-  boost::shared_ptr<EventLog> log_;
-};
-
-#ifdef _WIN32
-  #pragma warning( push )
-  #pragma warning (disable : 4250 ) //inheriting methods via dominance
-#endif
-
-class ChildHandler : public ParentHandler, virtual public ChildServiceIf {
-public:
-  ChildHandler(const boost::shared_ptr<EventLog>& log) : ParentHandler(log), value_(0) {}
-
-  int32_t setValue(const int32_t value) {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_SET_VALUE, 0, 0);
-
-    int32_t oldValue = value_;
-    value_ = value;
-    return oldValue;
-  }
-
-  int32_t getValue() {
-    concurrency::Guard g(mutex_);
-    log_->append(EventLog::ET_CALL_GET_VALUE, 0, 0);
-
-    return value_;
-  }
-
-protected:
-  int32_t value_;
-};
-
-#ifdef _WIN32
-  #pragma warning( pop )
-#endif
-
-struct ConnContext {
-public:
-  ConnContext(boost::shared_ptr<protocol::TProtocol> in,
-              boost::shared_ptr<protocol::TProtocol> out,
-              uint32_t id)
-    : input(in), output(out), id(id) {}
-
-  boost::shared_ptr<protocol::TProtocol> input;
-  boost::shared_ptr<protocol::TProtocol> output;
-  uint32_t id;
-};
-
-struct CallContext {
-public:
-  CallContext(ConnContext* context, uint32_t id, const std::string& name)
-    : connContext(context), name(name), id(id) {}
-
-  ConnContext* connContext;
-  std::string name;
-  uint32_t id;
-};
-
-class ServerEventHandler : public server::TServerEventHandler {
-public:
-  ServerEventHandler(const boost::shared_ptr<EventLog>& log) : nextId_(1), log_(log) {}
-
-  virtual void preServe() {}
-
-  virtual void* createContext(boost::shared_ptr<protocol::TProtocol> input,
-                              boost::shared_ptr<protocol::TProtocol> output) {
-    ConnContext* context = new ConnContext(input, output, nextId_);
-    ++nextId_;
-    log_->append(EventLog::ET_CONN_CREATED, context->id, 0);
-    return context;
-  }
-
-  virtual void deleteContext(void* serverContext,
-                             boost::shared_ptr<protocol::TProtocol> input,
-                             boost::shared_ptr<protocol::TProtocol> output) {
-    ConnContext* context = reinterpret_cast<ConnContext*>(serverContext);
-
-    if (input != context->input) {
-      abort();
-    }
-    if (output != context->output) {
-      abort();
-    }
-
-    log_->append(EventLog::ET_CONN_DESTROYED, context->id, 0);
-
-    delete context;
-  }
-
-  virtual void processContext(void* serverContext,
-                              boost::shared_ptr<transport::TTransport> transport) {
-// TODO: We currently don't test the behavior of the processContext()
-// calls.  The various server implementations call processContext() at
-// slightly different times, and it is too annoying to try and account for
-// their various differences.
-//
-// TThreadedServer, TThreadPoolServer, and TSimpleServer usually wait until
-// they see the first byte of a request before calling processContext().
-// However, they don't wait for the first byte of the very first request,
-// and instead immediately call processContext() before any data is
-// received.
-//
-// TNonblockingServer always waits until receiving the full request before
-// calling processContext().
-#if 0
-    ConnContext* context = reinterpret_cast<ConnContext*>(serverContext);
-    log_->append(EventLog::ET_PROCESS, context->id, 0);
-#else
-    THRIFT_UNUSED_VARIABLE(serverContext);
-    THRIFT_UNUSED_VARIABLE(transport);
-#endif
-  }
-
-protected:
-  uint32_t nextId_;
-  boost::shared_ptr<EventLog> log_;
-};
-
-class ProcessorEventHandler : public TProcessorEventHandler {
-public:
-  ProcessorEventHandler(const boost::shared_ptr<EventLog>& log) : nextId_(1), log_(log) {}
-
-  void* getContext(const char* fnName, void* serverContext) {
-    ConnContext* connContext = reinterpret_cast<ConnContext*>(serverContext);
-
-    CallContext* context = new CallContext(connContext, nextId_, fnName);
-    ++nextId_;
-
-    log_->append(EventLog::ET_CALL_STARTED, connContext->id, context->id, fnName);
-    return context;
-  }
-
-  void freeContext(void* ctx, const char* fnName) {
-    CallContext* context = reinterpret_cast<CallContext*>(ctx);
-    checkName(context, fnName);
-    log_->append(EventLog::ET_CALL_FINISHED, context->connContext->id, context->id, fnName);
-    delete context;
-  }
-
-  void preRead(void* ctx, const char* fnName) {
-    CallContext* context = reinterpret_cast<CallContext*>(ctx);
-    checkName(context, fnName);
-    log_->append(EventLog::ET_PRE_READ, context->connContext->id, context->id, fnName);
-  }
-
-  void postRead(void* ctx, const char* fnName, uint32_t bytes) {
-    THRIFT_UNUSED_VARIABLE(bytes);
-    CallContext* context = reinterpret_cast<CallContext*>(ctx);
-    checkName(context, fnName);
-    log_->append(EventLog::ET_POST_READ, context->connContext->id, context->id, fnName);
-  }
-
-  void preWrite(void* ctx, const char* fnName) {
-    CallContext* context = reinterpret_cast<CallContext*>(ctx);
-    checkName(context, fnName);
-    log_->append(EventLog::ET_PRE_WRITE, context->connContext->id, context->id, fnName);
-  }
-
-  void postWrite(void* ctx, const char* fnName, uint32_t bytes) {
-    THRIFT_UNUSED_VARIABLE(bytes);
-    CallContext* context = reinterpret_cast<CallContext*>(ctx);
-    checkName(context, fnName);
-    log_->append(EventLog::ET_POST_WRITE, context->connContext->id, context->id, fnName);
-  }
-
-  void asyncComplete(void* ctx, const char* fnName) {
-    CallContext* context = reinterpret_cast<CallContext*>(ctx);
-    checkName(context, fnName);
-    log_->append(EventLog::ET_ASYNC_COMPLETE, context->connContext->id, context->id, fnName);
-  }
-
-  void handlerError(void* ctx, const char* fnName) {
-    CallContext* context = reinterpret_cast<CallContext*>(ctx);
-    checkName(context, fnName);
-    log_->append(EventLog::ET_HANDLER_ERROR, context->connContext->id, context->id, fnName);
-  }
-
-protected:
-  void checkName(const CallContext* context, const char* fnName) {
-    // Note: we can't use BOOST_CHECK_EQUAL here, since the handler runs in a
-    // different thread from the test functions.  Just abort if the names are
-    // different
-    if (context->name != fnName) {
-      fprintf(stderr,
-              "call context name mismatch: \"%s\" != \"%s\"\n",
-              context->name.c_str(),
-              fnName);
-      fflush(stderr);
-      abort();
-    }
-  }
-
-  uint32_t nextId_;
-  boost::shared_ptr<EventLog> log_;
-};
-}
-}
-} // apache::thrift::test
-
-#endif // _THRIFT_PROCESSOR_TEST_HANDLERS_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ProcessorTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ProcessorTest.cpp
deleted file mode 100644
index a4e984c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ProcessorTest.cpp
+++ /dev/null
@@ -1,927 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * This file contains tests that ensure TProcessorEventHandler and
- * TServerEventHandler are invoked properly by the various server
- * implementations.
- */
-
-#include <boost/test/unit_test.hpp>
-
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/concurrency/Monitor.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/server/TThreadedServer.h>
-#include <thrift/server/TThreadPoolServer.h>
-#include <thrift/server/TNonblockingServer.h>
-#include <thrift/server/TSimpleServer.h>
-#include <thrift/transport/TSocket.h>
-
-#include "EventLog.h"
-#include "ServerThread.h"
-#include "Handlers.h"
-#include "gen-cpp/ChildService.h"
-
-using namespace std;
-using namespace boost;
-using namespace apache::thrift;
-using namespace apache::thrift::concurrency;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::server;
-using namespace apache::thrift::transport;
-
-using namespace apache::thrift::test;
-
-/*
- * Traits classes that encapsulate how to create various types of servers.
- */
-
-class TSimpleServerTraits {
-public:
-  typedef TSimpleServer ServerType;
-
-  boost::shared_ptr<TSimpleServer> createServer(
-      const boost::shared_ptr<TProcessor>& processor,
-      uint16_t port,
-      const boost::shared_ptr<TTransportFactory>& transportFactory,
-      const boost::shared_ptr<TProtocolFactory>& protocolFactory) {
-    boost::shared_ptr<TServerSocket> socket(new TServerSocket(port));
-    return boost::shared_ptr<TSimpleServer>(
-        new TSimpleServer(processor, socket, transportFactory, protocolFactory));
-  }
-};
-
-class TThreadedServerTraits {
-public:
-  typedef TThreadedServer ServerType;
-
-  boost::shared_ptr<TThreadedServer> createServer(
-      const boost::shared_ptr<TProcessor>& processor,
-      uint16_t port,
-      const boost::shared_ptr<TTransportFactory>& transportFactory,
-      const boost::shared_ptr<TProtocolFactory>& protocolFactory) {
-    boost::shared_ptr<TServerSocket> socket(new TServerSocket(port));
-    return boost::shared_ptr<TThreadedServer>(
-        new TThreadedServer(processor, socket, transportFactory, protocolFactory));
-  }
-};
-
-class TThreadPoolServerTraits {
-public:
-  typedef TThreadPoolServer ServerType;
-
-  boost::shared_ptr<TThreadPoolServer> createServer(
-      const boost::shared_ptr<TProcessor>& processor,
-      uint16_t port,
-      const boost::shared_ptr<TTransportFactory>& transportFactory,
-      const boost::shared_ptr<TProtocolFactory>& protocolFactory) {
-    boost::shared_ptr<TServerSocket> socket(new TServerSocket(port));
-
-    boost::shared_ptr<PlatformThreadFactory> threadFactory(new PlatformThreadFactory);
-    boost::shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(8);
-    threadManager->threadFactory(threadFactory);
-    threadManager->start();
-
-    return boost::shared_ptr<TThreadPoolServer>(
-        new TThreadPoolServer(processor, socket, transportFactory, protocolFactory, threadManager));
-  }
-};
-
-class TNonblockingServerTraits {
-public:
-  typedef TNonblockingServer ServerType;
-
-  boost::shared_ptr<TNonblockingServer> createServer(
-      const boost::shared_ptr<TProcessor>& processor,
-      uint16_t port,
-      const boost::shared_ptr<TTransportFactory>& transportFactory,
-      const boost::shared_ptr<TProtocolFactory>& protocolFactory) {
-    // TNonblockingServer automatically uses TFramedTransport.
-    // Raise an exception if the supplied transport factory is not a
-    // TFramedTransportFactory
-    TFramedTransportFactory* framedFactory
-        = dynamic_cast<TFramedTransportFactory*>(transportFactory.get());
-    if (framedFactory == NULL) {
-      throw TException("TNonblockingServer must use TFramedTransport");
-    }
-
-    boost::shared_ptr<PlatformThreadFactory> threadFactory(new PlatformThreadFactory);
-    boost::shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(8);
-    threadManager->threadFactory(threadFactory);
-    threadManager->start();
-
-    return boost::shared_ptr<TNonblockingServer>(
-        new TNonblockingServer(processor, protocolFactory, port, threadManager));
-  }
-};
-
-class TNonblockingServerNoThreadsTraits {
-public:
-  typedef TNonblockingServer ServerType;
-
-  boost::shared_ptr<TNonblockingServer> createServer(
-      const boost::shared_ptr<TProcessor>& processor,
-      uint16_t port,
-      const boost::shared_ptr<TTransportFactory>& transportFactory,
-      const boost::shared_ptr<TProtocolFactory>& protocolFactory) {
-    // TNonblockingServer automatically uses TFramedTransport.
-    // Raise an exception if the supplied transport factory is not a
-    // TFramedTransportFactory
-    TFramedTransportFactory* framedFactory
-        = dynamic_cast<TFramedTransportFactory*>(transportFactory.get());
-    if (framedFactory == NULL) {
-      throw TException("TNonblockingServer must use TFramedTransport");
-    }
-
-    // Use a NULL ThreadManager
-    boost::shared_ptr<ThreadManager> threadManager;
-    return boost::shared_ptr<TNonblockingServer>(
-        new TNonblockingServer(processor, protocolFactory, port, threadManager));
-  }
-};
-
-/*
- * Traits classes for controlling if we instantiate templated or generic
- * protocol factories, processors, clients, etc.
- *
- * The goal is to allow the outer test code to select which server type is
- * being tested, and whether or not we are testing the templated classes, or
- * the generic classes.
- *
- * Each specific test case can control whether we create a child or parent
- * server, and whether we use TFramedTransport or TBufferedTransport.
- */
-
-class UntemplatedTraits {
-public:
-  typedef TBinaryProtocolFactory ProtocolFactory;
-  typedef TBinaryProtocol Protocol;
-
-  typedef ParentServiceProcessor ParentProcessor;
-  typedef ChildServiceProcessor ChildProcessor;
-  typedef ParentServiceClient ParentClient;
-  typedef ChildServiceClient ChildClient;
-};
-
-class TemplatedTraits {
-public:
-  typedef TBinaryProtocolFactoryT<TBufferBase> ProtocolFactory;
-  typedef TBinaryProtocolT<TBufferBase> Protocol;
-
-  typedef ParentServiceProcessorT<Protocol> ParentProcessor;
-  typedef ChildServiceProcessorT<Protocol> ChildProcessor;
-  typedef ParentServiceClientT<Protocol> ParentClient;
-  typedef ChildServiceClientT<Protocol> ChildClient;
-};
-
-template <typename TemplateTraits_>
-class ParentServiceTraits {
-public:
-  typedef typename TemplateTraits_::ParentProcessor Processor;
-  typedef typename TemplateTraits_::ParentClient Client;
-  typedef ParentHandler Handler;
-
-  typedef typename TemplateTraits_::ProtocolFactory ProtocolFactory;
-  typedef typename TemplateTraits_::Protocol Protocol;
-};
-
-template <typename TemplateTraits_>
-class ChildServiceTraits {
-public:
-  typedef typename TemplateTraits_::ChildProcessor Processor;
-  typedef typename TemplateTraits_::ChildClient Client;
-  typedef ChildHandler Handler;
-
-  typedef typename TemplateTraits_::ProtocolFactory ProtocolFactory;
-  typedef typename TemplateTraits_::Protocol Protocol;
-};
-
-// TODO: It would be nicer if the TTransportFactory types defined a typedef,
-// to allow us to figure out the exact transport type without having to pass it
-// in as a separate template parameter here.
-//
-// It would also be niec if they used covariant return types.  Unfortunately,
-// since they return shared_ptr instead of raw pointers, covariant return types
-// won't work.
-template <typename ServerTraits_,
-          typename ServiceTraits_,
-          typename TransportFactory_ = TFramedTransportFactory,
-          typename Transport_ = TFramedTransport>
-class ServiceState : public ServerState {
-public:
-  typedef typename ServiceTraits_::Processor Processor;
-  typedef typename ServiceTraits_::Client Client;
-  typedef typename ServiceTraits_::Handler Handler;
-
-  ServiceState()
-    : port_(0),
-      log_(new EventLog),
-      handler_(new Handler(log_)),
-      processor_(new Processor(handler_)),
-      transportFactory_(new TransportFactory_),
-      protocolFactory_(new typename ServiceTraits_::ProtocolFactory),
-      serverEventHandler_(new ServerEventHandler(log_)),
-      processorEventHandler_(new ProcessorEventHandler(log_)) {
-    processor_->setEventHandler(processorEventHandler_);
-  }
-
-  boost::shared_ptr<TServer> createServer(uint16_t port) {
-    ServerTraits_ serverTraits;
-    return serverTraits.createServer(processor_, port, transportFactory_, protocolFactory_);
-  }
-
-  boost::shared_ptr<TServerEventHandler> getServerEventHandler() { return serverEventHandler_; }
-
-  void bindSuccessful(uint16_t port) { port_ = port; }
-
-  uint16_t getPort() const { return port_; }
-
-  const boost::shared_ptr<EventLog>& getLog() const { return log_; }
-
-  const boost::shared_ptr<Handler>& getHandler() const { return handler_; }
-
-  boost::shared_ptr<Client> createClient() {
-    typedef typename ServiceTraits_::Protocol Protocol;
-
-    boost::shared_ptr<TSocket> socket(new TSocket("127.0.0.1", port_));
-    boost::shared_ptr<Transport_> transport(new Transport_(socket));
-    boost::shared_ptr<Protocol> protocol(new Protocol(transport));
-    transport->open();
-
-    boost::shared_ptr<Client> client(new Client(protocol));
-    return client;
-  }
-
-private:
-  uint16_t port_;
-  boost::shared_ptr<EventLog> log_;
-  boost::shared_ptr<Handler> handler_;
-  boost::shared_ptr<Processor> processor_;
-  boost::shared_ptr<TTransportFactory> transportFactory_;
-  boost::shared_ptr<TProtocolFactory> protocolFactory_;
-  boost::shared_ptr<TServerEventHandler> serverEventHandler_;
-  boost::shared_ptr<TProcessorEventHandler> processorEventHandler_;
-};
-
-/**
- * Check that there are no more events in the log
- */
-void checkNoEvents(const boost::shared_ptr<EventLog>& log) {
-  // Wait for an event with a very short timeout period.  We don't expect
-  // anything to be present, so we will normally wait for the full timeout.
-  // On the other hand, a non-zero timeout is nice since it does give a short
-  // window for events to arrive in case there is a problem.
-  Event event = log->waitForEvent(10);
-  BOOST_CHECK_EQUAL(EventLog::ET_LOG_END, event.type);
-}
-
-/**
- * Check for the events that should be logged when a new connection is created.
- *
- * Returns the connection ID allocated by the server.
- */
-uint32_t checkNewConnEvents(const boost::shared_ptr<EventLog>& log) {
-  // Check for an ET_CONN_CREATED event
-  Event event = log->waitForEvent(2500);
-  BOOST_CHECK_EQUAL(EventLog::ET_CONN_CREATED, event.type);
-
-  // Some servers call the processContext() hook immediately.
-  // Others (TNonblockingServer) only call it once a full request is received.
-  // We don't check for it yet, to allow either behavior.
-
-  return event.connectionId;
-}
-
-/**
- * Check for the events that should be logged when a connection is closed.
- */
-void checkCloseEvents(const boost::shared_ptr<EventLog>& log, uint32_t connId) {
-  // Check for an ET_CONN_DESTROYED event
-  Event event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CONN_DESTROYED, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-
-  // Make sure there are no more events
-  checkNoEvents(log);
-}
-
-/**
- * Check for the events that should be logged when a call is received
- * and the handler is invoked.
- *
- * It does not check for anything after the handler invocation.
- *
- * Returns the call ID allocated by the server.
- */
-uint32_t checkCallHandlerEvents(const boost::shared_ptr<EventLog>& log,
-                                uint32_t connId,
-                                EventType callType,
-                                const string& callName) {
-  // Call started
-  Event event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CALL_STARTED, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-  uint32_t callId = event.callId;
-
-  // Pre-read
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_PRE_READ, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  // Post-read
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_POST_READ, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  // Handler invocation
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(callType, event.type);
-  // The handler doesn't have any connection or call context,
-  // so the connectionId and callId in this event aren't valid
-
-  return callId;
-}
-
-/**
- * Check for the events that should be after a handler returns.
- */
-void checkCallPostHandlerEvents(const boost::shared_ptr<EventLog>& log,
-                                uint32_t connId,
-                                uint32_t callId,
-                                const string& callName) {
-  // Pre-write
-  Event event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_PRE_WRITE, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  // Post-write
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_POST_WRITE, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  // Call finished
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CALL_FINISHED, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  // It is acceptable for servers to call processContext() again immediately
-  // to start waiting on the next request.  However, some servers wait before
-  // getting either a partial request or the full request before calling
-  // processContext().  We don't check for the next call to processContext()
-  // yet.
-}
-
-/**
- * Check for the events that should be logged when a call is made.
- *
- * This just calls checkCallHandlerEvents() followed by
- * checkCallPostHandlerEvents().
- *
- * Returns the call ID allocated by the server.
- */
-uint32_t checkCallEvents(const boost::shared_ptr<EventLog>& log,
-                         uint32_t connId,
-                         EventType callType,
-                         const string& callName) {
-  uint32_t callId = checkCallHandlerEvents(log, connId, callType, callName);
-  checkCallPostHandlerEvents(log, connId, callId, callName);
-
-  return callId;
-}
-
-/*
- * Test functions
- */
-
-template <typename State_>
-void testParentService(const boost::shared_ptr<State_>& state) {
-  boost::shared_ptr<typename State_::Client> client = state->createClient();
-
-  int32_t gen = client->getGeneration();
-  int32_t newGen = client->incrementGeneration();
-  BOOST_CHECK_EQUAL(gen + 1, newGen);
-  newGen = client->getGeneration();
-  BOOST_CHECK_EQUAL(gen + 1, newGen);
-
-  client->addString("foo");
-  client->addString("bar");
-  client->addString("asdf");
-
-  vector<string> strings;
-  client->getStrings(strings);
-  BOOST_REQUIRE_EQUAL(3, strings.size());
-  BOOST_REQUIRE_EQUAL("foo", strings[0]);
-  BOOST_REQUIRE_EQUAL("bar", strings[1]);
-  BOOST_REQUIRE_EQUAL("asdf", strings[2]);
-}
-
-template <typename State_>
-void testChildService(const boost::shared_ptr<State_>& state) {
-  boost::shared_ptr<typename State_::Client> client = state->createClient();
-
-  // Test calling some of the parent methids via the a child client
-  int32_t gen = client->getGeneration();
-  int32_t newGen = client->incrementGeneration();
-  BOOST_CHECK_EQUAL(gen + 1, newGen);
-  newGen = client->getGeneration();
-  BOOST_CHECK_EQUAL(gen + 1, newGen);
-
-  // Test some of the child methods
-  client->setValue(10);
-  BOOST_CHECK_EQUAL(10, client->getValue());
-  BOOST_CHECK_EQUAL(10, client->setValue(99));
-  BOOST_CHECK_EQUAL(99, client->getValue());
-}
-
-template <typename ServerTraits, typename TemplateTraits>
-void testBasicService() {
-  typedef ServiceState<ServerTraits, ParentServiceTraits<TemplateTraits> > State;
-
-  // Start the server
-  boost::shared_ptr<State> state(new State);
-  ServerThread serverThread(state, true);
-
-  testParentService(state);
-}
-
-template <typename ServerTraits, typename TemplateTraits>
-void testInheritedService() {
-  typedef ServiceState<ServerTraits, ChildServiceTraits<TemplateTraits> > State;
-
-  // Start the server
-  boost::shared_ptr<State> state(new State);
-  ServerThread serverThread(state, true);
-
-  testParentService(state);
-  testChildService(state);
-}
-
-/**
- * Test to make sure that the TServerEventHandler and TProcessorEventHandler
- * methods are invoked in the correct order with the actual events.
- */
-template <typename ServerTraits, typename TemplateTraits>
-void testEventSequencing() {
-  // We use TBufferedTransport for this test, instead of TFramedTransport.
-  // This way the server will start processing data as soon as it is received,
-  // instead of waiting for the full request.  This is necessary so we can
-  // separate the preRead() and postRead() events.
-  typedef ServiceState<ServerTraits,
-                       ChildServiceTraits<TemplateTraits>,
-                       TBufferedTransportFactory,
-                       TBufferedTransport> State;
-
-  // Start the server
-  boost::shared_ptr<State> state(new State);
-  ServerThread serverThread(state, true);
-
-  const boost::shared_ptr<EventLog>& log = state->getLog();
-
-  // Make sure we're at the end of the log
-  checkNoEvents(log);
-
-  state->getHandler()->prepareTriggeredCall();
-
-  // Make sure createContext() is called after a connection has been
-  // established.  We open a plain socket instead of creating a client.
-  boost::shared_ptr<TSocket> socket(new TSocket("127.0.0.1", state->getPort()));
-  socket->open();
-
-  // Make sure the proper events occurred after a new connection
-  uint32_t connId = checkNewConnEvents(log);
-
-  // Send a message header.  We manually construct the request so that we
-  // can test the timing for the preRead() call.
-  string requestName = "getDataWait";
-  string eventName = "ParentService.getDataWait";
-  int32_t seqid = int32_t(time(NULL));
-  TBinaryProtocol protocol(socket);
-  protocol.writeMessageBegin(requestName, T_CALL, seqid);
-  socket->flush();
-
-  // Make sure we saw the call started and pre-read events
-  Event event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CALL_STARTED, event.type);
-  BOOST_CHECK_EQUAL(eventName, event.message);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  uint32_t callId = event.callId;
-
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_PRE_READ, event.type);
-  BOOST_CHECK_EQUAL(eventName, event.message);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-
-  // Make sure there are no new events
-  checkNoEvents(log);
-
-  // Send the rest of the request
-  protocol.writeStructBegin("ParentService_getDataNotified_pargs");
-  protocol.writeFieldBegin("length", apache::thrift::protocol::T_I32, 1);
-  protocol.writeI32(8 * 1024 * 1024);
-  protocol.writeFieldEnd();
-  protocol.writeFieldStop();
-  protocol.writeStructEnd();
-  protocol.writeMessageEnd();
-  socket->writeEnd();
-  socket->flush();
-
-  // We should then see postRead()
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_POST_READ, event.type);
-  BOOST_CHECK_EQUAL(eventName, event.message);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-
-  // Then the handler should be invoked
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CALL_GET_DATA_WAIT, event.type);
-
-  // The handler won't respond until we notify it.
-  // Make sure there are no more events.
-  checkNoEvents(log);
-
-  // Notify the handler that it should return
-  // We just use a global lock for now, since it is easiest
-  state->getHandler()->triggerPendingCalls();
-
-  // The handler will log a separate event before it returns
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_WAIT_RETURN, event.type);
-
-  // We should then see preWrite()
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_PRE_WRITE, event.type);
-  BOOST_CHECK_EQUAL(eventName, event.message);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-
-  // We requested more data than can be buffered, and we aren't reading it,
-  // so the server shouldn't be able to finish its write yet.
-  // Make sure there are no more events.
-  checkNoEvents(log);
-
-  // Read the response header
-  std::string responseName;
-  int32_t responseSeqid = 0;
-  apache::thrift::protocol::TMessageType responseType;
-  protocol.readMessageBegin(responseName, responseType, responseSeqid);
-  BOOST_CHECK_EQUAL(responseSeqid, seqid);
-  BOOST_CHECK_EQUAL(requestName, responseName);
-  BOOST_CHECK_EQUAL(responseType, T_REPLY);
-  // Read the body.  We just ignore it for now.
-  protocol.skip(T_STRUCT);
-
-  // Now that we have read, the server should have finished sending the data
-  // and called the postWrite() handler
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_POST_WRITE, event.type);
-  BOOST_CHECK_EQUAL(eventName, event.message);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-
-  // Call finished should be last
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CALL_FINISHED, event.type);
-  BOOST_CHECK_EQUAL(eventName, event.message);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-
-  // There should be no more events
-  checkNoEvents(log);
-
-  // Close the connection, and make sure we get a connection destroyed event
-  socket->close();
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CONN_DESTROYED, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-
-  // There should be no more events
-  checkNoEvents(log);
-}
-
-template <typename ServerTraits, typename TemplateTraits>
-void testSeparateConnections() {
-  typedef ServiceState<ServerTraits, ChildServiceTraits<TemplateTraits> > State;
-
-  // Start the server
-  boost::shared_ptr<State> state(new State);
-  ServerThread serverThread(state, true);
-
-  const boost::shared_ptr<EventLog>& log = state->getLog();
-
-  // Create a client
-  boost::shared_ptr<typename State::Client> client1 = state->createClient();
-
-  // Make sure the expected events were logged
-  uint32_t client1Id = checkNewConnEvents(log);
-
-  // Create a second client
-  boost::shared_ptr<typename State::Client> client2 = state->createClient();
-
-  // Make sure the expected events were logged
-  uint32_t client2Id = checkNewConnEvents(log);
-
-  // The two connections should have different IDs
-  BOOST_CHECK_NE(client1Id, client2Id);
-
-  // Make a call, and check for the proper events
-  int32_t value = 5;
-  client1->setValue(value);
-  uint32_t call1
-      = checkCallEvents(log, client1Id, EventLog::ET_CALL_SET_VALUE, "ChildService.setValue");
-
-  // Make a call with client2
-  int32_t v = client2->getValue();
-  BOOST_CHECK_EQUAL(value, v);
-  checkCallEvents(log, client2Id, EventLog::ET_CALL_GET_VALUE, "ChildService.getValue");
-
-  // Make another call with client1
-  v = client1->getValue();
-  BOOST_CHECK_EQUAL(value, v);
-  uint32_t call2
-      = checkCallEvents(log, client1Id, EventLog::ET_CALL_GET_VALUE, "ChildService.getValue");
-  BOOST_CHECK_NE(call1, call2);
-
-  // Close the second client, and check for the appropriate events
-  client2.reset();
-  checkCloseEvents(log, client2Id);
-}
-
-template <typename ServerTraits, typename TemplateTraits>
-void testOnewayCall() {
-  typedef ServiceState<ServerTraits, ChildServiceTraits<TemplateTraits> > State;
-
-  // Start the server
-  boost::shared_ptr<State> state(new State);
-  ServerThread serverThread(state, true);
-
-  const boost::shared_ptr<EventLog>& log = state->getLog();
-
-  // Create a client
-  boost::shared_ptr<typename State::Client> client = state->createClient();
-  uint32_t connId = checkNewConnEvents(log);
-
-  // Make a oneway call
-  // It should return immediately, even though the server's handler
-  // won't return right away
-  state->getHandler()->prepareTriggeredCall();
-  client->onewayWait();
-  string callName = "ParentService.onewayWait";
-  uint32_t callId = checkCallHandlerEvents(log, connId, EventLog::ET_CALL_ONEWAY_WAIT, callName);
-
-  // There shouldn't be any more events
-  checkNoEvents(log);
-
-  // Trigger the handler to return
-  state->getHandler()->triggerPendingCalls();
-
-  // The handler will log an ET_WAIT_RETURN event when it wakes up
-  Event event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_WAIT_RETURN, event.type);
-
-  // Now we should see the async complete event, then call finished
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_ASYNC_COMPLETE, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CALL_FINISHED, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  // Destroy the client, and check for connection closed events
-  client.reset();
-  checkCloseEvents(log, connId);
-
-  checkNoEvents(log);
-}
-
-template <typename ServerTraits, typename TemplateTraits>
-void testExpectedError() {
-  typedef ServiceState<ServerTraits, ChildServiceTraits<TemplateTraits> > State;
-
-  // Start the server
-  boost::shared_ptr<State> state(new State);
-  ServerThread serverThread(state, true);
-
-  const boost::shared_ptr<EventLog>& log = state->getLog();
-
-  // Create a client
-  boost::shared_ptr<typename State::Client> client = state->createClient();
-  uint32_t connId = checkNewConnEvents(log);
-
-  // Send the exceptionWait() call
-  state->getHandler()->prepareTriggeredCall();
-  string message = "test 1234 test";
-  client->send_exceptionWait(message);
-  string callName = "ParentService.exceptionWait";
-  uint32_t callId = checkCallHandlerEvents(log, connId, EventLog::ET_CALL_EXCEPTION_WAIT, callName);
-
-  // There shouldn't be any more events
-  checkNoEvents(log);
-
-  // Trigger the handler to return
-  state->getHandler()->triggerPendingCalls();
-
-  // The handler will log an ET_WAIT_RETURN event when it wakes up
-  Event event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_WAIT_RETURN, event.type);
-
-  // Now receive the response
-  try {
-    client->recv_exceptionWait();
-    BOOST_FAIL("expected MyError to be thrown");
-  } catch (const MyError& e) {
-    BOOST_CHECK_EQUAL(message, e.message);
-    // Check if std::exception::what() is handled properly
-    size_t message_pos = std::string(e.what()).find("TException - service has thrown: MyError");
-    BOOST_CHECK_NE(message_pos, std::string::npos);
-  }
-
-  // Now we should see the events for a normal call finish
-  checkCallPostHandlerEvents(log, connId, callId, callName);
-
-  // There shouldn't be any more events
-  checkNoEvents(log);
-
-  // Destroy the client, and check for connection closed events
-  client.reset();
-  checkCloseEvents(log, connId);
-
-  checkNoEvents(log);
-}
-
-template <typename ServerTraits, typename TemplateTraits>
-void testUnexpectedError() {
-  typedef ServiceState<ServerTraits, ChildServiceTraits<TemplateTraits> > State;
-
-  // Start the server
-  boost::shared_ptr<State> state(new State);
-  ServerThread serverThread(state, true);
-
-  const boost::shared_ptr<EventLog>& log = state->getLog();
-
-  // Create a client
-  boost::shared_ptr<typename State::Client> client = state->createClient();
-  uint32_t connId = checkNewConnEvents(log);
-
-  // Send the unexpectedExceptionWait() call
-  state->getHandler()->prepareTriggeredCall();
-  string message = "1234 test 5678";
-  client->send_unexpectedExceptionWait(message);
-  string callName = "ParentService.unexpectedExceptionWait";
-  uint32_t callId
-      = checkCallHandlerEvents(log, connId, EventLog::ET_CALL_UNEXPECTED_EXCEPTION_WAIT, callName);
-
-  // There shouldn't be any more events
-  checkNoEvents(log);
-
-  // Trigger the handler to return
-  state->getHandler()->triggerPendingCalls();
-
-  // The handler will log an ET_WAIT_RETURN event when it wakes up
-  Event event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_WAIT_RETURN, event.type);
-
-  // Now receive the response
-  try {
-    client->recv_unexpectedExceptionWait();
-    BOOST_FAIL("expected TApplicationError to be thrown");
-  } catch (const TApplicationException&) {
-  }
-
-  // Now we should see a handler error event
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_HANDLER_ERROR, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  // pre-write and post-write events aren't generated after a handler error
-  // (Even for non-oneway calls where a response is written.)
-  //
-  // A call finished event is logged when the call context is destroyed
-  event = log->waitForEvent();
-  BOOST_CHECK_EQUAL(EventLog::ET_CALL_FINISHED, event.type);
-  BOOST_CHECK_EQUAL(connId, event.connectionId);
-  BOOST_CHECK_EQUAL(callId, event.callId);
-  BOOST_CHECK_EQUAL(callName, event.message);
-
-  // There shouldn't be any more events
-  checkNoEvents(log);
-
-  // Destroy the client, and check for connection closed events
-  client.reset();
-  checkCloseEvents(log, connId);
-
-  checkNoEvents(log);
-}
-
-// Macro to define simple tests that can be used with all server types
-#define DEFINE_SIMPLE_TESTS(Server, Template)                                                      \
-  BOOST_AUTO_TEST_CASE(Server##_##Template##_basicService) {                                       \
-    testBasicService<Server##Traits, Template##Traits>();                                          \
-  }                                                                                                \
-  BOOST_AUTO_TEST_CASE(Server##_##Template##_inheritedService) {                                   \
-    testInheritedService<Server##Traits, Template##Traits>();                                      \
-  }                                                                                                \
-  BOOST_AUTO_TEST_CASE(Server##_##Template##_oneway) {                                             \
-    testOnewayCall<Server##Traits, Template##Traits>();                                            \
-  }                                                                                                \
-  BOOST_AUTO_TEST_CASE(Server##_##Template##_exception) {                                          \
-    testExpectedError<Server##Traits, Template##Traits>();                                         \
-  }                                                                                                \
-  BOOST_AUTO_TEST_CASE(Server##_##Template##_unexpectedException) {                                \
-    testUnexpectedError<Server##Traits, Template##Traits>();                                       \
-  }
-
-// Tests that require the server to process multiple connections concurrently
-// (i.e., not TSimpleServer)
-#define DEFINE_CONCURRENT_SERVER_TESTS(Server, Template)                                           \
-  BOOST_AUTO_TEST_CASE(Server##_##Template##_separateConnections) {                                \
-    testSeparateConnections<Server##Traits, Template##Traits>();                                   \
-  }
-
-// The testEventSequencing() test manually generates a request for the server,
-// and doesn't work with TFramedTransport.  Therefore we can't test it with
-// TNonblockingServer.
-#define DEFINE_NOFRAME_TESTS(Server, Template)                                                     \
-  BOOST_AUTO_TEST_CASE(Server##_##Template##_eventSequencing) {                                    \
-    testEventSequencing<Server##Traits, Template##Traits>();                                       \
-  }
-
-#define DEFINE_TNONBLOCKINGSERVER_TESTS(Server, Template)                                          \
-  DEFINE_SIMPLE_TESTS(Server, Template)                                                            \
-  DEFINE_CONCURRENT_SERVER_TESTS(Server, Template)
-
-#define DEFINE_ALL_SERVER_TESTS(Server, Template)                                                  \
-  DEFINE_SIMPLE_TESTS(Server, Template)                                                            \
-  DEFINE_CONCURRENT_SERVER_TESTS(Server, Template)                                                 \
-  DEFINE_NOFRAME_TESTS(Server, Template)
-
-DEFINE_ALL_SERVER_TESTS(TThreadedServer, Templated)
-DEFINE_ALL_SERVER_TESTS(TThreadedServer, Untemplated)
-DEFINE_ALL_SERVER_TESTS(TThreadPoolServer, Templated)
-DEFINE_ALL_SERVER_TESTS(TThreadPoolServer, Untemplated)
-
-DEFINE_TNONBLOCKINGSERVER_TESTS(TNonblockingServer, Templated)
-DEFINE_TNONBLOCKINGSERVER_TESTS(TNonblockingServer, Untemplated)
-DEFINE_TNONBLOCKINGSERVER_TESTS(TNonblockingServerNoThreads, Templated)
-DEFINE_TNONBLOCKINGSERVER_TESTS(TNonblockingServerNoThreads, Untemplated)
-
-DEFINE_SIMPLE_TESTS(TSimpleServer, Templated)
-DEFINE_SIMPLE_TESTS(TSimpleServer, Untemplated)
-DEFINE_NOFRAME_TESTS(TSimpleServer, Templated)
-DEFINE_NOFRAME_TESTS(TSimpleServer, Untemplated)
-
-// TODO: We should test TEventServer in the future.
-// For now, it is known not to work correctly with TProcessorEventHandler.
-#ifdef BOOST_TEST_DYN_LINK
-bool init_unit_test_suite() {
-  unit_test::framework::master_test_suite().p_name.value = "ProcessorTest";
-  return true;
-}
-
-int main( int argc, char* argv[] ) {
-  return ::boost::unit_test::unit_test_main(&init_unit_test_suite,argc,argv);
-}
-#else
-unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-  THRIFT_UNUSED_VARIABLE(argc);
-  THRIFT_UNUSED_VARIABLE(argv);
-  unit_test::framework::master_test_suite().p_name.value = "ProcessorTest";
-  return NULL;
-}
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ServerThread.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ServerThread.cpp
deleted file mode 100644
index e9d468f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ServerThread.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _THRIFT_TEST_SERVERTHREAD_TCC_
-#define _THRIFT_TEST_SERVERTHREAD_TCC_ 1
-
-#include "ServerThread.h"
-
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/server/TThreadPoolServer.h>
-#include <thrift/transport/TBufferTransports.h>
-#include <thrift/transport/TServerSocket.h>
-
-namespace apache {
-namespace thrift {
-namespace test {
-
-void ServerThread::start() {
-  assert(!running_);
-  running_ = true;
-
-  // Start the other thread
-  concurrency::PlatformThreadFactory threadFactory;
-  threadFactory.setDetached(false);
-  thread_ = threadFactory.newThread(helper_);
-
-  thread_->start();
-
-  // Wait on the other thread to tell us that it has successfully
-  // bound to the port and started listening (or until an error occurs).
-  concurrency::Synchronized s(serverMonitor_);
-  while (!serving_ && !error_) {
-    serverMonitor_.waitForever();
-  }
-
-  if (error_) {
-    throw transport::TTransportException(transport::TTransportException::NOT_OPEN,
-                                         "failed to bind on server socket");
-  }
-}
-
-void ServerThread::stop() {
-  if (!running_) {
-    return;
-  }
-
-  // Tell the server to stop
-  server_->stop();
-  running_ = false;
-
-  // Wait for the server thread to exit
-  //
-  // Note: this only works if all client connections have closed.  The servers
-  // generally wait for everything to be closed before exiting; there currently
-  // isn't a way to tell them to just exit now, and shut down existing
-  // connections.
-  thread_->join();
-}
-
-void ServerThread::run() {
-  /*
-   * Try binding to several ports, in case the one we want is already in use.
-   */
-  port_ = 12345;
-  unsigned int maxRetries = 10;
-  for (unsigned int n = 0; n < maxRetries; ++n) {
-    // Create the server
-    server_ = serverState_->createServer(port_);
-    // Install our helper as the server event handler, so that our
-    // preServe() method will be called once we've successfully bound to
-    // the port and are about to start listening.
-    server_->setServerEventHandler(helper_);
-
-    try {
-      // Try to serve requests
-      server_->serve();
-    } catch (const TException&) {
-      // TNonblockingServer throws a generic TException if it fails to bind.
-      // If we get a TException, we'll optimistically assume the bind failed.
-      ++port_;
-      continue;
-    }
-
-    // Seriously?  serve() is pretty lame.  If it fails to start serving it
-    // just returns rather than throwing an exception.
-    //
-    // We have to use our preServe() hook to tell if serve() successfully
-    // started serving and is returning because stop() is called, or if it just
-    // failed to start serving in the first place.
-    concurrency::Synchronized s(serverMonitor_);
-    if (serving_) {
-      // Oh good, we started serving and are exiting because
-      // we're trying to stop.
-      serving_ = false;
-      return;
-    } else {
-      // We never started serving, probably because we failed to bind to the
-      // port.  Increment the port number and try again.
-      ++port_;
-      continue;
-    }
-  }
-
-  // We failed to bind on any port.
-  concurrency::Synchronized s(serverMonitor_);
-  error_ = true;
-  serverMonitor_.notify();
-}
-
-void ServerThread::preServe() {
-  // We bound to the port successfully, and are about to start serving requests
-  serverState_->bindSuccessful(port_);
-
-  // Set the real server event handler (replacing ourself)
-  boost::shared_ptr<server::TServerEventHandler> serverEventHandler
-      = serverState_->getServerEventHandler();
-  server_->setServerEventHandler(serverEventHandler);
-
-  // Notify the main thread that we have successfully started serving requests
-  concurrency::Synchronized s(serverMonitor_);
-  serving_ = true;
-  serverMonitor_.notify();
-
-  // Invoke preServe() on the real event handler, since we ate
-  // the original preServe() event.
-  if (serverEventHandler) {
-    serverEventHandler->preServe();
-  }
-}
-}
-}
-} // apache::thrift::test
-
-#endif // _THRIFT_TEST_SERVERTHREAD_TCC_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ServerThread.h b/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ServerThread.h
deleted file mode 100644
index eed3469..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/ServerThread.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _THRIFT_TEST_SERVERTHREAD_H_
-#define _THRIFT_TEST_SERVERTHREAD_H_ 1
-
-#include <thrift/TProcessor.h>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/server/TServer.h>
-#include <thrift/transport/TTransport.h>
-
-#include "EventLog.h"
-
-namespace apache {
-namespace thrift {
-namespace test {
-
-/**
- * A helper class to tell ServerThread how to create the server
- */
-class ServerState {
-public:
-  virtual ~ServerState() {}
-
-  /**
-   * Create a server to listen on the specified port.
-   *
-   * If the server returned fails to bind to the specified port when serve() is
-   * called on it, createServer() may be called again on a different port.
-   */
-  virtual boost::shared_ptr<server::TServer> createServer(uint16_t port) = 0;
-
-  /**
-   * Get the TServerEventHandler to set on the server.
-   *
-   * This is only called after the server successfully binds and is about to
-   * start serving traffic.  It is invoked from the server thread, rather than
-   * the main thread.
-   */
-  virtual boost::shared_ptr<server::TServerEventHandler> getServerEventHandler() {
-    return boost::shared_ptr<server::TServerEventHandler>();
-  }
-
-  /**
-   * This method is called in the server thread after server binding succeeds.
-   *
-   * Subclasses may override this method if they wish to record the final
-   * port that was used for the server.
-   */
-  virtual void bindSuccessful(uint16_t /*port*/) {}
-};
-
-/**
- * ServerThread starts a thrift server running in a separate thread.
- */
-class ServerThread {
-public:
-  ServerThread(const boost::shared_ptr<ServerState>& state, bool autoStart)
-    : helper_(new Helper(this)),
-      port_(0),
-      running_(false),
-      serving_(false),
-      error_(false),
-      serverState_(state) {
-    if (autoStart) {
-      start();
-    }
-  }
-
-  void start();
-  void stop();
-
-  uint16_t getPort() const { return port_; }
-
-  ~ServerThread() {
-    if (running_) {
-      try {
-        stop();
-      } catch (...) {
-        GlobalOutput.printf("error shutting down server");
-      }
-    }
-  }
-
-protected:
-  // Annoying.  thrift forces us to use shared_ptr, so we have to use
-  // a helper class that we can allocate on the heap and give to thrift.
-  // It would be simpler if we could just make Runnable and TServerEventHandler
-  // private base classes of ServerThread.
-  class Helper : public concurrency::Runnable, public server::TServerEventHandler {
-  public:
-    Helper(ServerThread* serverThread) : serverThread_(serverThread) {}
-
-    void run() { serverThread_->run(); }
-
-    void preServe() { serverThread_->preServe(); }
-
-  private:
-    ServerThread* serverThread_;
-  };
-
-  void run();
-  void preServe();
-
-  boost::shared_ptr<Helper> helper_;
-
-  uint16_t port_;
-  bool running_;
-  bool serving_;
-  bool error_;
-  concurrency::Monitor serverMonitor_;
-
-  boost::shared_ptr<ServerState> serverState_;
-  boost::shared_ptr<server::TServer> server_;
-  boost::shared_ptr<concurrency::Thread> thread_;
-};
-}
-}
-} // apache::thrift::test
-
-#endif // _THRIFT_TEST_SERVERTHREAD_H_
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/proc.thrift b/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/proc.thrift
deleted file mode 100644
index ac3c5f9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/processor/proc.thrift
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace cpp apache.thrift.test
-
-exception MyError {
-  1: string message
-}
-
-service ParentService {
-  i32 incrementGeneration()
-  i32 getGeneration()
-  void addString(1: string s)
-  list<string> getStrings()
-
-  binary getDataWait(1: i32 length)
-  oneway void onewayWait()
-  void exceptionWait(1: string message) throws (2: MyError error)
-  void unexpectedExceptionWait(1: string message)
-}
-
-service ChildService extends ParentService {
-  i32 setValue(1: i32 value)
-  i32 getValue()
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/qt/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/cpp/test/qt/CMakeLists.txt
deleted file mode 100644
index 7f341cc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/qt/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-set(CMAKE_AUTOMOC ON)
-find_package(Qt5 REQUIRED COMPONENTS Test Network)
-set(TQTcpServerTest_Qt5_SOURCES
-    TQTcpServerTest.cpp
-)
-add_executable(TQTcpServerTest_Qt5 ${TQTcpServerTest_Qt5_SOURCES})
-target_link_libraries(TQTcpServerTest_Qt5 testgencpp_cob)
-LINK_AGAINST_THRIFT_LIBRARY(TQTcpServerTest_Qt5 thriftqt5)
-LINK_AGAINST_THRIFT_LIBRARY(TQTcpServerTest_Qt5 thrift)
-target_link_libraries(TQTcpServerTest_Qt5 Qt5::Test Qt5::Network)
-
-add_test(NAME TQTcpServerTest_Qt5 COMMAND TQTcpServerTest_Qt5)
-
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/test/qt/TQTcpServerTest.cpp b/vendor/git.apache.org/thrift.git/lib/cpp/test/qt/TQTcpServerTest.cpp
deleted file mode 100644
index 422d771..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/test/qt/TQTcpServerTest.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-#define BOOST_TEST_MODULE TQTcpServerTest
-#include <QTest>
-#include <iostream>
-
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QHostAddress>
-#include <QThread>
-
-#ifndef Q_MOC_RUN
-  #include <boost/smart_ptr.hpp>
-  #include "thrift/protocol/TBinaryProtocol.h"
-  #include "thrift/async/TAsyncProcessor.h"
-  #include "thrift/qt/TQTcpServer.h"
-  #include "thrift/qt/TQIODeviceTransport.h"
-  
-  #include "gen-cpp/ParentService.h"
-#endif
-
-using namespace apache::thrift;
-
-struct AsyncHandler : public test::ParentServiceCobSvIf {
-  std::vector<std::string> strings;
-  virtual void addString(tcxx::function<void()> cob, const std::string& s) {
-    strings.push_back(s);
-    cob();
-  }
-  virtual void getStrings(tcxx::function<void(std::vector<std::string> const& _return)> cob) {
-    cob(strings);
-  }
-
-  // Overrides not used in this test
-  virtual void incrementGeneration(tcxx::function<void(int32_t const& _return)> cob) {}
-  virtual void getGeneration(tcxx::function<void(int32_t const& _return)> cob) {}
-  virtual void getDataWait(tcxx::function<void(std::string const& _return)> cob,
-                           const int32_t length) {}
-  virtual void onewayWait(tcxx::function<void()> cob) {}
-  virtual void exceptionWait(
-      tcxx::function<void()> cob,
-      tcxx::function<void(::apache::thrift::TDelayedException* _throw)> /* exn_cob */,
-      const std::string& message) {}
-  virtual void unexpectedExceptionWait(tcxx::function<void()> cob, const std::string& message) {}
-};
-
-class TQTcpServerTest : public QObject {
-  Q_OBJECT
-
-private slots:
-  void initTestCase();
-  void cleanupTestCase();
-  void test_communicate();
-
-private:
-  boost::shared_ptr<QThread> serverThread;
-  boost::shared_ptr<async::TQTcpServer> server;
-  boost::shared_ptr<test::ParentServiceClient> client;
-};
-
-void TQTcpServerTest::initTestCase() {
-  // setup server
-  boost::shared_ptr<QTcpServer> serverSocket = boost::make_shared<QTcpServer>();
-  server.reset(new async::TQTcpServer(serverSocket,
-                                      boost::make_shared<test::ParentServiceAsyncProcessor>(
-                                          boost::make_shared<AsyncHandler>()),
-                                      boost::make_shared<protocol::TBinaryProtocolFactory>()));
-  QVERIFY(serverSocket->listen(QHostAddress::LocalHost));
-  int port = serverSocket->serverPort();
-  QVERIFY(port > 0);
-
-  //setup server thread and move server to it
-  serverThread.reset(new QThread());
-  serverSocket->moveToThread(serverThread.get());
-  server->moveToThread(serverThread.get());
-  serverThread->start();
-
-  // setup client
-  boost::shared_ptr<QTcpSocket> socket = boost::make_shared<QTcpSocket>();
-  client.reset(new test::ParentServiceClient(boost::make_shared<protocol::TBinaryProtocol>(
-      boost::make_shared<transport::TQIODeviceTransport>(socket))));
-  socket->connectToHost(QHostAddress::LocalHost, port);
-  QVERIFY(socket->waitForConnected());
-}
-
-void TQTcpServerTest::cleanupTestCase() {
-  //first, stop the thread which holds the server
-  serverThread->quit();
-  serverThread->wait();
-  // now, it is safe to delete the server
-  server.reset();
-  // delete thread now
-  serverThread.reset();
-
-  // cleanup client
-  client.reset();
-}
-
-void TQTcpServerTest::test_communicate() {
-  client->addString("foo");
-  client->addString("bar");
-
-  std::vector<std::string> reply;
-  client->getStrings(reply);
-  QCOMPARE(QString::fromStdString(reply[0]), QString("foo"));
-  QCOMPARE(QString::fromStdString(reply[1]), QString("bar"));
-}
-
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-QTEST_GUILESS_MAIN(TQTcpServerTest);
-#else
-#undef QT_GUI_LIB
-QTEST_MAIN(TQTcpServerTest);
-#endif
-#include "TQTcpServerTest.moc"
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/thrift-nb.pc.in b/vendor/git.apache.org/thrift.git/lib/cpp/thrift-nb.pc.in
deleted file mode 100755
index 2c6a969..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/thrift-nb.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Thrift
-Description: Thrift Nonblocking API
-Version: @VERSION@
-Requires: thrift = @VERSION@
-Libs: -L${libdir} -lthriftnb
-Cflags: -I${includedir}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/thrift-qt.pc.in b/vendor/git.apache.org/thrift.git/lib/cpp/thrift-qt.pc.in
deleted file mode 100755
index 5e60d84..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/thrift-qt.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Thrift
-Description: Thrift Qt API
-Version: @VERSION@
-Requires: thrift = @VERSION@
-Libs: -L${libdir} -lthriftqt
-Cflags: -I${includedir}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/thrift-qt5.pc.in b/vendor/git.apache.org/thrift.git/lib/cpp/thrift-qt5.pc.in
deleted file mode 100755
index a8b1666..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/thrift-qt5.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Thrift
-Description: Thrift Qt5 API
-Version: @VERSION@
-Requires: thrift = @VERSION@
-Libs: -L${libdir} -lthriftqt5
-Cflags: -I${includedir}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/thrift-z.pc.in b/vendor/git.apache.org/thrift.git/lib/cpp/thrift-z.pc.in
deleted file mode 100755
index 467d2e1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/thrift-z.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Thrift
-Description: Thrift Zlib API
-Version: @VERSION@
-Requires: thrift = @VERSION@
-Libs: -L${libdir} -lthriftz
-Cflags: -I${includedir}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/thrift.pc.in b/vendor/git.apache.org/thrift.git/lib/cpp/thrift.pc.in
deleted file mode 100755
index d11e6db..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/thrift.pc.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Thrift
-Description: Thrift C++ API
-Version: @VERSION@
-Libs: -L${libdir} -lthrift
-Cflags: -I${includedir}
diff --git a/vendor/git.apache.org/thrift.git/lib/cpp/thrift.sln b/vendor/git.apache.org/thrift.git/lib/cpp/thrift.sln
deleted file mode 100644
index cb0f455..0000000
--- a/vendor/git.apache.org/thrift.git/lib/cpp/thrift.sln
+++ /dev/null
@@ -1,61 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthriftnb", "libthriftnb.vcxproj", "{D8696CCE-7D46-4659-B432-91754A41DEB0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libthrift", "libthrift.vcxproj", "{DD26F57E-60F2-4F37-A616-D219A9BF338F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{006984E0-7CC1-47E2-ACD2-A40FE4D38693}"
-	ProjectSection(SolutionItems) = preProject
-		README.md = README.md
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Debug-mt|Win32 = Debug-mt|Win32
-		Debug-mt|x64 = Debug-mt|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		Release-mt|Win32 = Release-mt|Win32
-		Release-mt|x64 = Release-mt|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Debug|Win32.Build.0 = Debug|Win32
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Debug|x64.ActiveCfg = Debug|x64
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Debug|x64.Build.0 = Debug|x64
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Debug-mt|Win32.ActiveCfg = Debug-mt|Win32
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Debug-mt|Win32.Build.0 = Debug-mt|Win32
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Debug-mt|x64.ActiveCfg = Debug-mt|x64
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Debug-mt|x64.Build.0 = Debug-mt|x64
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Release|Win32.ActiveCfg = Release|Win32
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Release|Win32.Build.0 = Release|Win32
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Release|x64.ActiveCfg = Release|x64
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Release|x64.Build.0 = Release|x64
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Release-mt|Win32.ActiveCfg = Release-mt|Win32
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Release-mt|Win32.Build.0 = Release-mt|Win32
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Release-mt|x64.ActiveCfg = Release-mt|x64
-		{D8696CCE-7D46-4659-B432-91754A41DEB0}.Release-mt|x64.Build.0 = Release-mt|x64
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Debug|Win32.Build.0 = Debug|Win32
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Debug|x64.ActiveCfg = Debug|x64
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Debug|x64.Build.0 = Debug|x64
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Debug-mt|Win32.ActiveCfg = Debug-mt|Win32
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Debug-mt|Win32.Build.0 = Debug-mt|Win32
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Debug-mt|x64.ActiveCfg = Debug-mt|x64
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Debug-mt|x64.Build.0 = Debug-mt|x64
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Release|Win32.ActiveCfg = Release|Win32
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Release|Win32.Build.0 = Release|Win32
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Release|x64.ActiveCfg = Release|x64
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Release|x64.Build.0 = Release|x64
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Release-mt|Win32.ActiveCfg = Release-mt|Win32
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Release-mt|Win32.Build.0 = Release-mt|Win32
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Release-mt|x64.ActiveCfg = Release-mt|x64
-		{DD26F57E-60F2-4F37-A616-D219A9BF338F}.Release-mt|x64.Build.0 = Release-mt|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/Makefile.am b/vendor/git.apache.org/thrift.git/lib/csharp/Makefile.am
deleted file mode 100644
index bf02c87..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SUBDIRS = . test/Multiplex
-
-THRIFTCODE = \
-            src/Collections/THashSet.cs \
-            src/Collections/TCollections.cs \
-            src/Properties/AssemblyInfo.cs \
-            src/Protocol/TAbstractBase.cs \
-            src/Protocol/TBase.cs \
-            src/Protocol/TBase64Utils.cs \
-            src/Protocol/TJSONProtocol.cs \
-            src/Protocol/TProtocolException.cs \
-            src/Protocol/TProtocolFactory.cs \
-            src/Protocol/TList.cs \
-            src/Protocol/TSet.cs \
-            src/Protocol/TMap.cs \
-            src/Protocol/TProtocolUtil.cs \
-            src/Protocol/TMessageType.cs \
-            src/Protocol/TProtocol.cs \
-            src/Protocol/TProtocolDecorator.cs \
-            src/Protocol/TMultiplexedProtocol.cs \
-            src/Protocol/TMultiplexedProcessor.cs \
-            src/Protocol/TType.cs \
-            src/Protocol/TField.cs \
-            src/Protocol/TMessage.cs \
-            src/Protocol/TStruct.cs \
-            src/Protocol/TBinaryProtocol.cs \
-            src/Protocol/TCompactProtocol.cs \
-            src/Server/TThreadedServer.cs \
-            src/Server/TThreadPoolServer.cs \
-            src/Server/TSimpleServer.cs \
-            src/Server/TServer.cs \
-            src/Server/TServerEventHandler.cs \
-            src/Transport/TBufferedTransport.cs \
-            src/Transport/TTransport.cs \
-            src/Transport/TSocket.cs \
-            src/Transport/TTransportException.cs \
-            src/Transport/TStreamTransport.cs \
-            src/Transport/TFramedTransport.cs \
-            src/Transport/TServerTransport.cs \
-            src/Transport/TServerSocket.cs \
-            src/Transport/TTransportFactory.cs \
-            src/Transport/THttpClient.cs \
-            src/Transport/THttpHandler.cs \
-            src/Transport/TMemoryBuffer.cs \
-            src/Transport/TNamedPipeClientTransport.cs \
-            src/Transport/TNamedPipeServerTransport.cs \
-            src/Transport/TTLSSocket.cs \
-            src/Transport/TTLSServerSocket.cs \
-            src/TProcessor.cs \
-            src/TProcessorFactory.cs \
-            src/TSingletonProcessorFactory.cs \
-            src/TPrototypeProcessorFactory.cs \
-            src/TControllingHandler.cs \
-            src/TException.cs \
-            src/TApplicationException.cs
-
-if MONO_MCS
-export CSC = mcs
-else
-export CSC = gmcs
-endif
-
-if NET_2_0
-export CSC_DEFINES = -d:NET_2_0
-endif
-
-all-local: Thrift.dll
-
-Thrift.dll: $(THRIFTCODE)
-	$(CSC) $(CSC_DEFINES) -out:$@ -target:library -reference:System.Web $(THRIFTCODE)
-
-clean-local:
-	$(RM) Thrift.dll
-
-EXTRA_DIST = \
-             $(THRIFTCODE) \
-             ThriftMSBuildTask \
-             src/Thrift.csproj \
-             src/Thrift.45.csproj \
-             src/Thrift.sln \
-             src/Transport/TSilverlightSocket.cs \
-             src/Transport/THttpTaskAsyncHandler.cs \
-             src/TAsyncProcessor.cs \
-             test \
-             coding_standards.md \
-             README.md
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/README.md b/vendor/git.apache.org/thrift.git/lib/csharp/README.md
deleted file mode 100644
index b7dc5de..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Thrift C# Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with C#
-====================
-
-Thrift requires Mono >= 1.2.6 or .NET framework >= 3.5
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
deleted file mode 100644
index 64cec97..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ThriftMSBuildTask")]
-[assembly: AssemblyDescription("MSBuild Task to generate csharp from .thrift files, and compile the code into a library: ThriftImpl.dll")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("The Apache Software Foundation")]
-[assembly: AssemblyProduct("ThriftMSBuildTask")]
-[assembly: AssemblyCopyright("The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-//@TODO where to put License information?
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5095e09d-7b95-4be1-b250-e1c1db1c485e")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.10.0.*")]
-[assembly: AssemblyFileVersion("0.10.0.*")]
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs b/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs
deleted file mode 100644
index 4e6d301..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/ThriftBuild.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.Build.Tasks;
-using System.IO;
-using System.Diagnostics;
-
-namespace ThriftMSBuildTask
-{
-    /// <summary>
-    /// MSBuild Task to generate csharp from .thrift files, and compile the code into a library: ThriftImpl.dll
-    /// </summary>
-    public class ThriftBuild : Task
-    {
-        /// <summary>
-        /// The full path to the thrift.exe compiler
-        /// </summary>
-        [Required]
-        public ITaskItem ThriftExecutable
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The full path to a thrift.dll C# library
-        /// </summary>
-        [Required]
-        public ITaskItem ThriftLibrary
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// A direcotry containing .thrift files
-        /// </summary>
-        [Required]
-        public ITaskItem ThriftDefinitionDir
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The name of the auto-gen and compiled thrift library. It will placed in
-        /// the same directory as ThriftLibrary
-        /// </summary>
-        [Required]
-        public ITaskItem OutputName
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// The full path to the compiled ThriftLibrary. This allows msbuild tasks to use this
-        /// output as a variable for use elsewhere.
-        /// </summary>
-        [Output]
-        public ITaskItem ThriftImplementation
-        {
-            get { return thriftImpl; }
-        }
-
-        private ITaskItem thriftImpl;
-        private const string lastCompilationName = "LAST_COMP_TIMESTAMP";
-
-        //use the Message Build Task to write something to build log
-        private void LogMessage(string text, MessageImportance importance)
-        {
-            Message m = new Message();
-            m.Text = text;
-            m.Importance = importance.ToString();
-            m.BuildEngine = this.BuildEngine;
-            m.Execute();
-        }
-
-        //recursively find .cs files in srcDir, paths should initially be non-null and empty
-        private void FindSourcesHelper(string srcDir, List<string> paths)
-        {
-            string[] files = Directory.GetFiles(srcDir, "*.cs");
-            foreach (string f in files)
-            {
-                paths.Add(f);
-            }
-            string[] dirs = Directory.GetDirectories(srcDir);
-            foreach (string dir in dirs)
-            {
-                FindSourcesHelper(dir, paths);
-            }
-        }
-
-        /// <summary>
-        /// Quote paths with spaces
-        /// </summary>
-        private string SafePath(string path)
-        {
-            if (path.Contains(' ') && !path.StartsWith("\""))
-            {
-                return "\"" + path + "\"";
-            }
-            return path;
-        }
-
-        private ITaskItem[] FindSources(string srcDir)
-        {
-            List<string> files = new List<string>();
-            FindSourcesHelper(srcDir, files);
-            ITaskItem[] items = new ITaskItem[files.Count];
-            for (int i = 0; i < items.Length; i++)
-            {
-                items[i] = new TaskItem(files[i]);
-            }
-            return items;
-        }
-
-        private string LastWriteTime(string defDir)
-        {
-            string[] files = Directory.GetFiles(defDir, "*.thrift");
-            DateTime d = (new DirectoryInfo(defDir)).LastWriteTime;
-            foreach(string file in files)
-            {
-                FileInfo f = new FileInfo(file);
-                DateTime curr = f.LastWriteTime;
-                if (DateTime.Compare(curr, d) > 0)
-                {
-                    d = curr;
-                }
-            }
-            return d.ToFileTimeUtc().ToString();
-        }
-
-        public override bool Execute()
-        {
-            string defDir = SafePath(ThriftDefinitionDir.ItemSpec);
-            //look for last compilation timestamp
-            string lastBuildPath = Path.Combine(defDir, lastCompilationName);
-            DirectoryInfo defDirInfo = new DirectoryInfo(defDir);
-            string lastWrite = LastWriteTime(defDir);
-            if (File.Exists(lastBuildPath))
-            {
-                string lastComp = File.ReadAllText(lastBuildPath);
-                //don't recompile if the thrift library has been updated since lastComp
-                FileInfo f = new FileInfo(ThriftLibrary.ItemSpec);
-                string thriftLibTime = f.LastWriteTimeUtc.ToFileTimeUtc().ToString();
-                if (lastComp.CompareTo(thriftLibTime) < 0)
-                {
-                    //new thrift library, do a compile
-                    lastWrite = thriftLibTime;
-                }
-                else if (lastComp == lastWrite || (lastComp == thriftLibTime && lastComp.CompareTo(lastWrite) > 0))
-                {
-                    //the .thrift dir hasn't been written to since last compilation, don't need to do anything
-                    LogMessage("ThriftImpl up-to-date", MessageImportance.High);
-                    return true;
-                }
-            }
-
-            //find the directory of the thriftlibrary (that's where output will go)
-            FileInfo thriftLibInfo = new FileInfo(SafePath(ThriftLibrary.ItemSpec));
-            string thriftDir = thriftLibInfo.Directory.FullName;
-
-            string genDir = Path.Combine(thriftDir, "gen-csharp");
-            if (Directory.Exists(genDir))
-            {
-                try
-                {
-                    Directory.Delete(genDir, true);
-                }
-                catch { /*eh i tried, just over-write now*/}
-            }
-
-            //run the thrift executable to generate C#
-            foreach (string thriftFile in Directory.GetFiles(defDir, "*.thrift"))
-            {
-                LogMessage("Generating code for: " + thriftFile, MessageImportance.Normal);
-                Process p = new Process();
-                p.StartInfo.FileName = SafePath(ThriftExecutable.ItemSpec);
-                p.StartInfo.Arguments = "--gen csharp -o " + SafePath(thriftDir) + " -r " + thriftFile;
-                p.StartInfo.UseShellExecute = false;
-                p.StartInfo.CreateNoWindow = true;
-                p.StartInfo.RedirectStandardOutput = false;
-                p.Start();
-                p.WaitForExit();
-                if (p.ExitCode != 0)
-                {
-                    LogMessage("thrift.exe failed to compile " + thriftFile, MessageImportance.High);
-                    return false;
-                }
-                if (p.ExitCode != 0)
-                {
-                    LogMessage("thrift.exe failed to compile " + thriftFile, MessageImportance.High);
-                    return false;
-                }
-            }
-
-            Csc csc = new Csc();
-            csc.TargetType = "library";
-            csc.References = new ITaskItem[] { new TaskItem(ThriftLibrary.ItemSpec) };
-            csc.EmitDebugInformation = true;
-            string outputPath = Path.Combine(thriftDir, OutputName.ItemSpec);
-            csc.OutputAssembly = new TaskItem(outputPath);
-            csc.Sources = FindSources(Path.Combine(thriftDir, "gen-csharp"));
-            csc.BuildEngine = this.BuildEngine;
-            LogMessage("Compiling generated cs...", MessageImportance.Normal);
-            if (!csc.Execute())
-            {
-                return false;
-            }
-
-            //write file to defDir to indicate a build was successfully completed
-            File.WriteAllText(lastBuildPath, lastWrite);
-
-            thriftImpl = new TaskItem(outputPath);
-
-            return true;
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj b/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
deleted file mode 100644
index ae86081..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EC0A0231-66EA-4593-A792-C6CA3BB8668E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ThriftMSBuildTask</RootNamespace>
-    <AssemblyName>ThriftMSBuildTask</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Tasks" />
-    <Reference Include="Microsoft.Build.Utilities" />
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ThriftBuild.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/csharp/coding_standards.md
deleted file mode 100644
index dc87190..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/coding_standards.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## C# Coding Standards
-
-Please follow:
- * [Thrift General Coding Standards](/doc/coding_standards.md)
- * [MSDN C# Coding Conventions](http://msdn.microsoft.com/en-us/library/ff926074.aspx)
- * [C# Coding Guidelines](http://csharpguidelines.codeplex.com/)
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Collections/TCollections.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Collections/TCollections.cs
deleted file mode 100644
index f0bb1de..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Collections/TCollections.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-using System;
-using System.Collections;
-
-namespace Thrift.Collections
-{
-    public class TCollections
-    {
-        /// <summary>
-        /// This will return true if the two collections are value-wise the same.
-        /// If the collection contains a collection, the collections will be compared using this method.
-        /// </summary>
-        public static bool Equals (IEnumerable first, IEnumerable second)
-        {
-            if (first == null && second == null)
-            {
-                return true;
-            }
-            if (first == null || second == null)
-            {
-                return false;
-            }
-            IEnumerator fiter = first.GetEnumerator ();
-            IEnumerator siter = second.GetEnumerator ();
-
-            bool fnext = fiter.MoveNext ();
-            bool snext = siter.MoveNext ();
-            while (fnext && snext)
-            {
-                IEnumerable fenum = fiter.Current as IEnumerable;
-                IEnumerable senum = siter.Current as IEnumerable;
-                if (fenum != null && senum != null)
-                {
-                    if (!Equals(fenum, senum))
-                    {
-                        return false;
-                    }
-                }
-                else if (fenum == null ^ senum == null)
-                {
-                    return false;
-                }
-                else if (!Equals(fiter.Current, siter.Current))
-                {
-                    return false;
-                }
-                fnext = fiter.MoveNext();
-                snext = siter.MoveNext();
-            }
-
-            return fnext == snext;
-        }
-
-        /// <summary>
-        /// This returns a hashcode based on the value of the enumerable.
-        /// </summary>
-        public static int GetHashCode (IEnumerable enumerable)
-        {
-            if (enumerable == null)
-            {
-                return 0;
-            }
-
-            int hashcode = 0;
-            foreach (Object obj in enumerable)
-            {
-                IEnumerable enum2 = obj as IEnumerable;
-                int objHash = enum2 == null ? obj.GetHashCode () : GetHashCode (enum2);
-                unchecked
-                {
-                    hashcode = (hashcode * 397) ^ (objHash);
-                }
-            }
-            return hashcode;
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Collections/THashSet.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Collections/THashSet.cs
deleted file mode 100644
index e29271a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Collections/THashSet.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-#if SILVERLIGHT
-using System.Runtime.Serialization;
-#endif
-
-namespace Thrift.Collections
-{
-#if SILVERLIGHT
-    [DataContract]
-#else
-    [Serializable]
-#endif
-    public class THashSet<T> : ICollection<T>
-    {
-#if NET_2_0 || SILVERLIGHT
-#if SILVERLIGHT
-        [DataMember]
-#endif
-        TDictSet<T> set = new TDictSet<T>();
-#else
-        HashSet<T> set = new HashSet<T>();
-#endif
-        public int Count
-        {
-            get { return set.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-
-        public void Add(T item)
-        {
-            set.Add(item);
-        }
-
-        public void Clear()
-        {
-            set.Clear();
-        }
-
-        public bool Contains(T item)
-        {
-            return set.Contains(item);
-        }
-
-        public void CopyTo(T[] array, int arrayIndex)
-        {
-            set.CopyTo(array, arrayIndex);
-        }
-
-        public IEnumerator GetEnumerator()
-        {
-            return set.GetEnumerator();
-        }
-
-        IEnumerator<T> IEnumerable<T>.GetEnumerator()
-        {
-            return ((IEnumerable<T>)set).GetEnumerator();
-        }
-
-        public bool Remove(T item)
-        {
-            return set.Remove(item);
-        }
-
-#if NET_2_0 || SILVERLIGHT
-#if SILVERLIGHT
-        [DataContract]
-#endif
-        private class TDictSet<V> : ICollection<V>
-        {
-#if SILVERLIGHT
-            [DataMember]
-#endif
-            Dictionary<V, TDictSet<V>> dict = new Dictionary<V, TDictSet<V>>();
-
-            public int Count
-            {
-                get { return dict.Count; }
-            }
-
-            public bool IsReadOnly
-            {
-                get { return false; }
-            }
-
-            public IEnumerator GetEnumerator()
-            {
-                return ((IEnumerable)dict.Keys).GetEnumerator();
-            }
-
-            IEnumerator<V> IEnumerable<V>.GetEnumerator()
-            {
-                return dict.Keys.GetEnumerator();
-            }
-
-            public bool Add(V item)
-            {
-                if (!dict.ContainsKey(item))
-                {
-                    dict[item] = this;
-                    return true;
-                }
-
-                return false;
-            }
-
-            void ICollection<V>.Add(V item)
-            {
-                Add(item);
-            }
-
-            public void Clear()
-            {
-                dict.Clear();
-            }
-
-            public bool Contains(V item)
-            {
-                return dict.ContainsKey(item);
-            }
-
-            public void CopyTo(V[] array, int arrayIndex)
-            {
-                dict.Keys.CopyTo(array, arrayIndex);
-            }
-
-            public bool Remove(V item)
-            {
-                return dict.Remove(item);
-            }
-        }
-#endif
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Properties/AssemblyInfo.cs
deleted file mode 100644
index 22d53dc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Thrift")]
-[assembly: AssemblyDescription("C# bindings for the Apache Thrift RPC system")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("The Apache Software Foundation")]
-[assembly: AssemblyProduct("Thrift")]
-[assembly: AssemblyCopyright("The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-//@TODO where to put License information?
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("df3f8ef0-e0a3-4c86-a65b-8ec84e016b1d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.10.0.1")]
-[assembly: AssemblyFileVersion("0.10.0.1")]
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TAbstractBase.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TAbstractBase.cs
deleted file mode 100644
index c0d5abe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TAbstractBase.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace Thrift.Protocol
-{
-    public interface TAbstractBase
-    {
-        ///
-        /// Writes the objects out to the protocol
-        ///
-        void Write(TProtocol tProtocol);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBase.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBase.cs
deleted file mode 100644
index 350ff49..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBase.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace Thrift.Protocol
-{
-    public interface TBase : TAbstractBase
-    {
-        ///
-        /// Reads the TObject from the given input protocol.
-        ///
-        void Read(TProtocol tProtocol);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBase64Utils.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBase64Utils.cs
deleted file mode 100644
index 9eaaebd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBase64Utils.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-
-namespace Thrift.Protocol
-{
-    internal static class TBase64Utils
-    {
-        internal const string ENCODE_TABLE =
-            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-        internal static void encode(byte[] src, int srcOff, int len, byte[] dst,
-                                int dstOff)
-        {
-            dst[dstOff] = (byte)ENCODE_TABLE[(src[srcOff] >> 2) & 0x3F];
-            if (len == 3)
-            {
-                dst[dstOff + 1] =
-                    (byte)ENCODE_TABLE[
-                        ((src[srcOff] << 4) & 0x30) | ((src[srcOff + 1] >> 4) & 0x0F)];
-                dst[dstOff + 2] =
-                    (byte)ENCODE_TABLE[
-                        ((src[srcOff + 1] << 2) & 0x3C) | ((src[srcOff + 2] >> 6) & 0x03)];
-                dst[dstOff + 3] =
-                    (byte)ENCODE_TABLE[src[srcOff + 2] & 0x3F];
-            }
-            else if (len == 2)
-            {
-                dst[dstOff + 1] =
-                    (byte)ENCODE_TABLE[
-                        ((src[srcOff] << 4) & 0x30) | ((src[srcOff + 1] >> 4) & 0x0F)];
-                dst[dstOff + 2] =
-                    (byte)ENCODE_TABLE[(src[srcOff + 1] << 2) & 0x3C];
-
-            }
-            else
-            { // len == 1) {
-                dst[dstOff + 1] =
-                    (byte)ENCODE_TABLE[(src[srcOff] << 4) & 0x30];
-            }
-        }
-
-        private static int[] DECODE_TABLE = {
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
-            52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,
-            -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,
-            15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
-            -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
-            41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-            -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-        };
-
-        internal static void decode(byte[] src, int srcOff, int len, byte[] dst,
-                                 int dstOff)
-        {
-            dst[dstOff] = (byte)
-                ((DECODE_TABLE[src[srcOff] & 0x0FF] << 2) |
-                (DECODE_TABLE[src[srcOff + 1] & 0x0FF] >> 4));
-            if (len > 2)
-            {
-                dst[dstOff + 1] = (byte)
-                    (((DECODE_TABLE[src[srcOff + 1] & 0x0FF] << 4) & 0xF0) |
-                    (DECODE_TABLE[src[srcOff + 2] & 0x0FF] >> 2));
-                if (len > 3)
-                {
-                    dst[dstOff + 2] = (byte)
-                        (((DECODE_TABLE[src[srcOff + 2] & 0x0FF] << 6) & 0xC0) |
-                        DECODE_TABLE[src[srcOff + 3] & 0x0FF]);
-                }
-            }
-        }
-
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBinaryProtocol.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBinaryProtocol.cs
deleted file mode 100644
index 4eceb86..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TBinaryProtocol.cs
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Text;
-using Thrift.Transport;
-
-namespace Thrift.Protocol
-{
-    public class TBinaryProtocol : TProtocol
-    {
-        protected const uint VERSION_MASK = 0xffff0000;
-        protected const uint VERSION_1 = 0x80010000;
-
-        protected bool strictRead_ = false;
-        protected bool strictWrite_ = true;
-
-        #region BinaryProtocol Factory
-         /**
-          * Factory
-          */
-          public class Factory : TProtocolFactory {
-
-              protected bool strictRead_ = false;
-              protected bool strictWrite_ = true;
-
-              public Factory()
-                  :this(false, true)
-              {
-              }
-
-              public Factory(bool strictRead, bool strictWrite)
-              {
-                  strictRead_ = strictRead;
-                  strictWrite_ = strictWrite;
-              }
-
-            public TProtocol GetProtocol(TTransport trans) {
-              return new TBinaryProtocol(trans, strictRead_, strictWrite_);
-            }
-          }
-
-        #endregion
-
-        public TBinaryProtocol(TTransport trans)
-            : this(trans, false, true)
-        {
-        }
-
-        public TBinaryProtocol(TTransport trans, bool strictRead, bool strictWrite)
-            :base(trans)
-        {
-            strictRead_ = strictRead;
-            strictWrite_ = strictWrite;
-        }
-
-        #region Write Methods
-
-        public override void WriteMessageBegin(TMessage message)
-        {
-            if (strictWrite_)
-            {
-                uint version = VERSION_1 | (uint)(message.Type);
-                WriteI32((int)version);
-                WriteString(message.Name);
-                WriteI32(message.SeqID);
-            }
-            else
-            {
-                WriteString(message.Name);
-                WriteByte((sbyte)message.Type);
-                WriteI32(message.SeqID);
-            }
-        }
-
-        public override void WriteMessageEnd()
-        {
-        }
-
-        public override void WriteStructBegin(TStruct struc)
-        {
-        }
-
-        public override void WriteStructEnd()
-        {
-        }
-
-        public override void WriteFieldBegin(TField field)
-        {
-            WriteByte((sbyte)field.Type);
-            WriteI16(field.ID);
-        }
-
-        public override void WriteFieldEnd()
-        {
-        }
-
-        public override void WriteFieldStop()
-        {
-            WriteByte((sbyte)TType.Stop);
-        }
-
-        public override void WriteMapBegin(TMap map)
-        {
-            WriteByte((sbyte)map.KeyType);
-            WriteByte((sbyte)map.ValueType);
-            WriteI32(map.Count);
-        }
-
-        public override void WriteMapEnd()
-        {
-        }
-
-        public override void WriteListBegin(TList list)
-        {
-            WriteByte((sbyte)list.ElementType);
-            WriteI32(list.Count);
-        }
-
-        public override void WriteListEnd()
-        {
-        }
-
-        public override void WriteSetBegin(TSet set)
-        {
-            WriteByte((sbyte)set.ElementType);
-            WriteI32(set.Count);
-        }
-
-        public override void WriteSetEnd()
-        {
-        }
-
-        public override void WriteBool(bool b)
-        {
-            WriteByte(b ? (sbyte)1 : (sbyte)0);
-        }
-
-        private byte[] bout = new byte[1];
-        public override void WriteByte(sbyte b)
-        {
-            bout[0] = (byte)b;
-            trans.Write(bout, 0, 1);
-        }
-
-        private byte[] i16out = new byte[2];
-        public override void WriteI16(short s)
-        {
-            i16out[0] = (byte)(0xff & (s >> 8));
-            i16out[1] = (byte)(0xff & s);
-            trans.Write(i16out, 0, 2);
-        }
-
-        private byte[] i32out = new byte[4];
-        public override void WriteI32(int i32)
-        {
-            i32out[0] = (byte)(0xff & (i32 >> 24));
-            i32out[1] = (byte)(0xff & (i32 >> 16));
-            i32out[2] = (byte)(0xff & (i32 >> 8));
-            i32out[3] = (byte)(0xff & i32);
-            trans.Write(i32out, 0, 4);
-        }
-
-        private byte[] i64out = new byte[8];
-        public override void WriteI64(long i64)
-        {
-            i64out[0] = (byte)(0xff & (i64 >> 56));
-            i64out[1] = (byte)(0xff & (i64 >> 48));
-            i64out[2] = (byte)(0xff & (i64 >> 40));
-            i64out[3] = (byte)(0xff & (i64 >> 32));
-            i64out[4] = (byte)(0xff & (i64 >> 24));
-            i64out[5] = (byte)(0xff & (i64 >> 16));
-            i64out[6] = (byte)(0xff & (i64 >> 8));
-            i64out[7] = (byte)(0xff & i64);
-            trans.Write(i64out, 0, 8);
-        }
-
-        public override void WriteDouble(double d)
-        {
-#if !SILVERLIGHT
-            WriteI64(BitConverter.DoubleToInt64Bits(d));
-#else
-            var bytes = BitConverter.GetBytes(d);
-            WriteI64(BitConverter.ToInt64(bytes, 0));
-#endif
-        }
-
-        public override void WriteBinary(byte[] b)
-        {
-            WriteI32(b.Length);
-            trans.Write(b, 0, b.Length);
-        }
-
-        #endregion
-
-        #region ReadMethods
-
-        public override TMessage ReadMessageBegin()
-        {
-            TMessage message = new TMessage();
-            int size = ReadI32();
-            if (size < 0)
-            {
-                uint version = (uint)size & VERSION_MASK;
-                if (version != VERSION_1)
-                {
-                    throw new TProtocolException(TProtocolException.BAD_VERSION, "Bad version in ReadMessageBegin: " + version);
-                }
-                message.Type = (TMessageType)(size & 0x000000ff);
-                message.Name = ReadString();
-                message.SeqID = ReadI32();
-            }
-            else
-            {
-                if (strictRead_)
-                {
-                    throw new TProtocolException(TProtocolException.BAD_VERSION, "Missing version in readMessageBegin, old client?");
-                }
-                message.Name = ReadStringBody(size);
-                message.Type = (TMessageType)ReadByte();
-                message.SeqID = ReadI32();
-            }
-            return message;
-        }
-
-        public override void ReadMessageEnd()
-        {
-        }
-
-        public override TStruct ReadStructBegin()
-        {
-            return new TStruct();
-        }
-
-        public override void ReadStructEnd()
-        {
-        }
-
-        public override TField ReadFieldBegin()
-        {
-            TField field = new TField();
-            field.Type = (TType)ReadByte();
-
-            if (field.Type != TType.Stop)
-            {
-                field.ID = ReadI16();
-            }
-
-            return field;
-        }
-
-        public override void ReadFieldEnd()
-        {
-        }
-
-        public override TMap ReadMapBegin()
-        {
-            TMap map = new TMap();
-            map.KeyType = (TType)ReadByte();
-            map.ValueType = (TType)ReadByte();
-            map.Count = ReadI32();
-
-            return map;
-        }
-
-        public override void ReadMapEnd()
-        {
-        }
-
-        public override TList ReadListBegin()
-        {
-            TList list = new TList();
-            list.ElementType = (TType)ReadByte();
-            list.Count = ReadI32();
-
-            return list;
-        }
-
-        public override void ReadListEnd()
-        {
-        }
-
-        public override TSet ReadSetBegin()
-        {
-            TSet set = new TSet();
-            set.ElementType = (TType)ReadByte();
-            set.Count = ReadI32();
-
-            return set;
-        }
-
-        public override void ReadSetEnd()
-        {
-        }
-
-        public override bool ReadBool()
-        {
-            return ReadByte() == 1;
-        }
-
-        private byte[] bin = new byte[1];
-        public override sbyte ReadByte()
-        {
-            ReadAll(bin, 0, 1);
-            return (sbyte)bin[0];
-        }
-
-        private byte[] i16in = new byte[2];
-        public override short ReadI16()
-        {
-            ReadAll(i16in, 0, 2);
-            return (short)(((i16in[0] & 0xff) << 8) | ((i16in[1] & 0xff)));
-        }
-
-        private byte[] i32in = new byte[4];
-        public override int ReadI32()
-        {
-            ReadAll(i32in, 0, 4);
-            return (int)(((i32in[0] & 0xff) << 24) | ((i32in[1] & 0xff) << 16) | ((i32in[2] & 0xff) << 8) | ((i32in[3] & 0xff)));
-        }
-
-#pragma warning disable 675
-
-        private byte[] i64in = new byte[8];
-        public override long ReadI64()
-        {
-            ReadAll(i64in, 0, 8);
-            unchecked {
-              return (long)(
-                  ((long)(i64in[0] & 0xff) << 56) |
-                  ((long)(i64in[1] & 0xff) << 48) |
-                  ((long)(i64in[2] & 0xff) << 40) |
-                  ((long)(i64in[3] & 0xff) << 32) |
-                  ((long)(i64in[4] & 0xff) << 24) |
-                  ((long)(i64in[5] & 0xff) << 16) |
-                  ((long)(i64in[6] & 0xff) << 8) |
-                  ((long)(i64in[7] & 0xff)));
-            }
-        }
-
-#pragma warning restore 675
-
-        public override double ReadDouble()
-        {
-#if !SILVERLIGHT
-            return BitConverter.Int64BitsToDouble(ReadI64());
-#else
-            var value = ReadI64();
-            var bytes = BitConverter.GetBytes(value);
-            return BitConverter.ToDouble(bytes, 0);
-#endif
-        }
-
-        public override byte[] ReadBinary()
-        {
-            int size = ReadI32();
-            byte[] buf = new byte[size];
-            trans.ReadAll(buf, 0, size);
-            return buf;
-        }
-        private  string ReadStringBody(int size)
-        {
-            byte[] buf = new byte[size];
-            trans.ReadAll(buf, 0, size);
-            return Encoding.UTF8.GetString(buf, 0, buf.Length);
-        }
-
-        private int ReadAll(byte[] buf, int off, int len)
-        {
-            return trans.ReadAll(buf, off, len);
-        }
-
-        #endregion
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TCompactProtocol.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TCompactProtocol.cs
deleted file mode 100644
index 2b4f6f1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TCompactProtocol.cs
+++ /dev/null
@@ -1,851 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Text;
-using Thrift.Transport;
-using System.Collections;
-using System.IO;
-using System.Collections.Generic;
-
-namespace Thrift.Protocol
-{
-    public class TCompactProtocol : TProtocol
-    {
-        private static TStruct ANONYMOUS_STRUCT = new TStruct("");
-        private static TField TSTOP = new TField("", TType.Stop, (short)0);
-
-        private static byte[] ttypeToCompactType = new byte[16];
-
-        private const byte PROTOCOL_ID = 0x82;
-        private const byte VERSION = 1;
-        private const byte VERSION_MASK = 0x1f; // 0001 1111
-        private const byte TYPE_MASK = 0xE0; // 1110 0000
-        private const byte TYPE_BITS = 0x07; // 0000 0111
-        private const int TYPE_SHIFT_AMOUNT = 5;
-
-        /**
-         * All of the on-wire type codes.
-         */
-        private static class Types
-        {
-            public const byte STOP = 0x00;
-            public const byte BOOLEAN_TRUE = 0x01;
-            public const byte BOOLEAN_FALSE = 0x02;
-            public const byte BYTE = 0x03;
-            public const byte I16 = 0x04;
-            public const byte I32 = 0x05;
-            public const byte I64 = 0x06;
-            public const byte DOUBLE = 0x07;
-            public const byte BINARY = 0x08;
-            public const byte LIST = 0x09;
-            public const byte SET = 0x0A;
-            public const byte MAP = 0x0B;
-            public const byte STRUCT = 0x0C;
-        }
-
-        /**
-         * Used to keep track of the last field for the current and previous structs,
-         * so we can do the delta stuff.
-         */
-        private Stack<short> lastField_ = new Stack<short>(15);
-
-        private short lastFieldId_ = 0;
-
-        /**
-         * If we encounter a boolean field begin, save the TField here so it can
-         * have the value incorporated.
-         */
-        private Nullable<TField> booleanField_;
-
-        /**
-         * If we Read a field header, and it's a boolean field, save the boolean
-         * value here so that ReadBool can use it.
-         */
-        private  Nullable<Boolean> boolValue_;
-
-
-        #region CompactProtocol Factory
-
-        /**
-          * Factory
-          */
-        public class Factory : TProtocolFactory
-        {
-            public Factory() { }
-
-            public TProtocol GetProtocol(TTransport trans)
-            {
-                return new TCompactProtocol(trans);
-            }
-        }
-
-        #endregion
-
-        public TCompactProtocol(TTransport trans)
-            : base(trans)
-        {
-            ttypeToCompactType[(int)TType.Stop] = Types.STOP;
-            ttypeToCompactType[(int)TType.Bool] = Types.BOOLEAN_TRUE;
-            ttypeToCompactType[(int)TType.Byte] = Types.BYTE;
-            ttypeToCompactType[(int)TType.I16] = Types.I16;
-            ttypeToCompactType[(int)TType.I32] = Types.I32;
-            ttypeToCompactType[(int)TType.I64] = Types.I64;
-            ttypeToCompactType[(int)TType.Double] = Types.DOUBLE;
-            ttypeToCompactType[(int)TType.String] = Types.BINARY;
-            ttypeToCompactType[(int)TType.List] = Types.LIST;
-            ttypeToCompactType[(int)TType.Set] = Types.SET;
-            ttypeToCompactType[(int)TType.Map] = Types.MAP;
-            ttypeToCompactType[(int)TType.Struct] = Types.STRUCT;
-        }
-
-        public void reset()
-        {
-            lastField_.Clear();
-            lastFieldId_ = 0;
-        }
-
-        #region Write Methods
-
-
-        /**
-         * Writes a byte without any possibility of all that field header nonsense.
-         * Used internally by other writing methods that know they need to Write a byte.
-         */
-        private byte[] byteDirectBuffer = new byte[1];
-        private void WriteByteDirect(byte b)
-        {
-            byteDirectBuffer[0] = b;
-            trans.Write(byteDirectBuffer);
-        }
-
-        /**
-         * Writes a byte without any possibility of all that field header nonsense.
-         */
-        private void WriteByteDirect(int n)
-        {
-            WriteByteDirect((byte)n);
-        }
-
-        /**
-         * Write an i32 as a varint. Results in 1-5 bytes on the wire.
-         * TODO: make a permanent buffer like WriteVarint64?
-         */
-        byte[] i32buf = new byte[5];
-        private void WriteVarint32(uint n)
-        {
-            int idx = 0;
-            while (true)
-            {
-                if ((n & ~0x7F) == 0)
-                {
-                    i32buf[idx++] = (byte)n;
-                    // WriteByteDirect((byte)n);
-                    break;
-                    // return;
-                }
-                else
-                {
-                    i32buf[idx++] = (byte)((n & 0x7F) | 0x80);
-                    // WriteByteDirect((byte)((n & 0x7F) | 0x80));
-                    n >>= 7;
-                }
-            }
-            trans.Write(i32buf, 0, idx);
-        }
-
-        /**
-        * Write a message header to the wire. Compact Protocol messages contain the
-        * protocol version so we can migrate forwards in the future if need be.
-        */
-        public override void WriteMessageBegin(TMessage message)
-        {
-            WriteByteDirect(PROTOCOL_ID);
-            WriteByteDirect((byte)((VERSION & VERSION_MASK) | ((((uint)message.Type) << TYPE_SHIFT_AMOUNT) & TYPE_MASK)));
-            WriteVarint32((uint)message.SeqID);
-            WriteString(message.Name);
-        }
-
-        /**
-         * Write a struct begin. This doesn't actually put anything on the wire. We
-         * use it as an opportunity to put special placeholder markers on the field
-         * stack so we can get the field id deltas correct.
-         */
-        public override void WriteStructBegin(TStruct strct)
-        {
-            lastField_.Push(lastFieldId_);
-            lastFieldId_ = 0;
-        }
-
-        /**
-         * Write a struct end. This doesn't actually put anything on the wire. We use
-         * this as an opportunity to pop the last field from the current struct off
-         * of the field stack.
-         */
-        public override void WriteStructEnd()
-        {
-            lastFieldId_ = lastField_.Pop();
-        }
-
-        /**
-         * Write a field header containing the field id and field type. If the
-         * difference between the current field id and the last one is small (< 15),
-         * then the field id will be encoded in the 4 MSB as a delta. Otherwise, the
-         * field id will follow the type header as a zigzag varint.
-         */
-        public override void WriteFieldBegin(TField field)
-        {
-            if (field.Type == TType.Bool)
-            {
-                // we want to possibly include the value, so we'll wait.
-                booleanField_ = field;
-            }
-            else
-            {
-                WriteFieldBeginInternal(field, 0xFF);
-            }
-        }
-
-        /**
-         * The workhorse of WriteFieldBegin. It has the option of doing a
-         * 'type override' of the type header. This is used specifically in the
-         * boolean field case.
-         */
-        private void WriteFieldBeginInternal(TField field, byte typeOverride)
-        {
-            // short lastField = lastField_.Pop();
-
-            // if there's a type override, use that.
-            byte typeToWrite = typeOverride == 0xFF ? getCompactType(field.Type) : typeOverride;
-
-            // check if we can use delta encoding for the field id
-            if (field.ID > lastFieldId_ && field.ID - lastFieldId_ <= 15)
-            {
-                // Write them together
-                WriteByteDirect((field.ID - lastFieldId_) << 4 | typeToWrite);
-            }
-            else
-            {
-                // Write them separate
-                WriteByteDirect(typeToWrite);
-                WriteI16(field.ID);
-            }
-
-            lastFieldId_ = field.ID;
-            // lastField_.push(field.id);
-        }
-
-        /**
-         * Write the STOP symbol so we know there are no more fields in this struct.
-         */
-        public override void WriteFieldStop()
-        {
-            WriteByteDirect(Types.STOP);
-        }
-
-        /**
-         * Write a map header. If the map is empty, omit the key and value type
-         * headers, as we don't need any additional information to skip it.
-         */
-        public override void WriteMapBegin(TMap map)
-        {
-            if (map.Count == 0)
-            {
-                WriteByteDirect(0);
-            }
-            else
-            {
-                WriteVarint32((uint)map.Count);
-                WriteByteDirect(getCompactType(map.KeyType) << 4 | getCompactType(map.ValueType));
-            }
-        }
-
-        /**
-         * Write a list header.
-         */
-        public override void WriteListBegin(TList list)
-        {
-            WriteCollectionBegin(list.ElementType, list.Count);
-        }
-
-        /**
-         * Write a set header.
-         */
-        public override void WriteSetBegin(TSet set)
-        {
-            WriteCollectionBegin(set.ElementType, set.Count);
-        }
-
-        /**
-         * Write a boolean value. Potentially, this could be a boolean field, in
-         * which case the field header info isn't written yet. If so, decide what the
-         * right type header is for the value and then Write the field header.
-         * Otherwise, Write a single byte.
-         */
-        public override void WriteBool(Boolean b)
-        {
-            if (booleanField_ != null)
-            {
-                // we haven't written the field header yet
-                WriteFieldBeginInternal(booleanField_.Value, b ? Types.BOOLEAN_TRUE : Types.BOOLEAN_FALSE);
-                booleanField_ = null;
-            }
-            else
-            {
-                // we're not part of a field, so just Write the value.
-                WriteByteDirect(b ? Types.BOOLEAN_TRUE : Types.BOOLEAN_FALSE);
-            }
-        }
-
-        /**
-         * Write a byte. Nothing to see here!
-         */
-        public override void WriteByte(sbyte b)
-        {
-            WriteByteDirect((byte)b);
-        }
-
-        /**
-         * Write an I16 as a zigzag varint.
-         */
-        public override void WriteI16(short i16)
-        {
-            WriteVarint32(intToZigZag(i16));
-        }
-
-        /**
-         * Write an i32 as a zigzag varint.
-         */
-        public override void WriteI32(int i32)
-        {
-            WriteVarint32(intToZigZag(i32));
-        }
-
-        /**
-         * Write an i64 as a zigzag varint.
-         */
-        public override void WriteI64(long i64)
-        {
-            WriteVarint64(longToZigzag(i64));
-        }
-
-        /**
-         * Write a double to the wire as 8 bytes.
-         */
-        public override void WriteDouble(double dub)
-        {
-            byte[] data = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 };
-            fixedLongToBytes(BitConverter.DoubleToInt64Bits(dub), data, 0);
-            trans.Write(data);
-        }
-
-        /**
-         * Write a string to the wire with a varint size preceding.
-         */
-        public override void WriteString(String str)
-        {
-            byte[] bytes = UTF8Encoding.UTF8.GetBytes(str);
-            WriteBinary(bytes, 0, bytes.Length);
-        }
-
-        /**
-         * Write a byte array, using a varint for the size.
-         */
-        public override void WriteBinary(byte[] bin)
-        {
-            WriteBinary(bin, 0, bin.Length);
-        }
-
-        private void WriteBinary(byte[] buf, int offset, int length)
-        {
-            WriteVarint32((uint)length);
-            trans.Write(buf, offset, length);
-        }
-
-        //
-        // These methods are called by structs, but don't actually have any wire
-        // output or purpose.
-        //
-
-        public override void WriteMessageEnd() { }
-        public override void WriteMapEnd() { }
-        public override void WriteListEnd() { }
-        public override void WriteSetEnd() { }
-        public override void WriteFieldEnd() { }
-
-        //
-        // Internal writing methods
-        //
-
-        /**
-         * Abstract method for writing the start of lists and sets. List and sets on
-         * the wire differ only by the type indicator.
-         */
-        protected void WriteCollectionBegin(TType elemType, int size)
-        {
-            if (size <= 14)
-            {
-                WriteByteDirect(size << 4 | getCompactType(elemType));
-            }
-            else
-            {
-                WriteByteDirect(0xf0 | getCompactType(elemType));
-                WriteVarint32((uint)size);
-            }
-        }
-
-        /**
-         * Write an i64 as a varint. Results in 1-10 bytes on the wire.
-         */
-        byte[] varint64out = new byte[10];
-        private void WriteVarint64(ulong n)
-        {
-            int idx = 0;
-            while (true)
-            {
-                if ((n & ~(ulong)0x7FL) == 0)
-                {
-                    varint64out[idx++] = (byte)n;
-                    break;
-                }
-                else
-                {
-                    varint64out[idx++] = ((byte)((n & 0x7F) | 0x80));
-                    n >>= 7;
-                }
-            }
-            trans.Write(varint64out, 0, idx);
-        }
-
-        /**
-         * Convert l into a zigzag long. This allows negative numbers to be
-         * represented compactly as a varint.
-         */
-        private ulong longToZigzag(long n)
-        {
-            return (ulong)(n << 1) ^ (ulong)(n >> 63);
-        }
-
-        /**
-         * Convert n into a zigzag int. This allows negative numbers to be
-         * represented compactly as a varint.
-         */
-        private uint intToZigZag(int n)
-        {
-            return (uint)(n << 1) ^ (uint)(n >> 31);
-        }
-
-        /**
-         * Convert a long into little-endian bytes in buf starting at off and going
-         * until off+7.
-         */
-        private void fixedLongToBytes(long n, byte[] buf, int off)
-        {
-            buf[off + 0] = (byte)(n & 0xff);
-            buf[off + 1] = (byte)((n >> 8) & 0xff);
-            buf[off + 2] = (byte)((n >> 16) & 0xff);
-            buf[off + 3] = (byte)((n >> 24) & 0xff);
-            buf[off + 4] = (byte)((n >> 32) & 0xff);
-            buf[off + 5] = (byte)((n >> 40) & 0xff);
-            buf[off + 6] = (byte)((n >> 48) & 0xff);
-            buf[off + 7] = (byte)((n >> 56) & 0xff);
-        }
-
-        #endregion
-
-        #region ReadMethods
-
-        /**
-   * Read a message header.
-   */
-        public override TMessage ReadMessageBegin()
-        {
-            byte protocolId = (byte)ReadByte();
-            if (protocolId != PROTOCOL_ID)
-            {
-                throw new TProtocolException("Expected protocol id " + PROTOCOL_ID.ToString("X") + " but got " + protocolId.ToString("X"));
-            }
-            byte versionAndType = (byte)ReadByte();
-            byte version = (byte)(versionAndType & VERSION_MASK);
-            if (version != VERSION)
-            {
-                throw new TProtocolException("Expected version " + VERSION + " but got " + version);
-            }
-            byte type = (byte)((versionAndType >> TYPE_SHIFT_AMOUNT) & TYPE_BITS);
-            int seqid = (int)ReadVarint32();
-            String messageName = ReadString();
-            return new TMessage(messageName, (TMessageType)type, seqid);
-        }
-
-        /**
-         * Read a struct begin. There's nothing on the wire for this, but it is our
-         * opportunity to push a new struct begin marker onto the field stack.
-         */
-        public override TStruct ReadStructBegin()
-        {
-            lastField_.Push(lastFieldId_);
-            lastFieldId_ = 0;
-            return ANONYMOUS_STRUCT;
-        }
-
-        /**
-         * Doesn't actually consume any wire data, just removes the last field for
-         * this struct from the field stack.
-         */
-        public override void ReadStructEnd()
-        {
-            // consume the last field we Read off the wire.
-            lastFieldId_ = lastField_.Pop();
-        }
-
-        /**
-         * Read a field header off the wire.
-         */
-        public override TField ReadFieldBegin()
-        {
-            byte type = (byte)ReadByte();
-
-            // if it's a stop, then we can return immediately, as the struct is over.
-            if (type == Types.STOP)
-            {
-                return TSTOP;
-            }
-
-            short fieldId;
-
-            // mask off the 4 MSB of the type header. it could contain a field id delta.
-            short modifier = (short)((type & 0xf0) >> 4);
-            if (modifier == 0)
-            {
-                // not a delta. look ahead for the zigzag varint field id.
-                fieldId = ReadI16();
-            }
-            else
-            {
-                // has a delta. add the delta to the last Read field id.
-                fieldId = (short)(lastFieldId_ + modifier);
-            }
-
-            TField field = new TField("", getTType((byte)(type & 0x0f)), fieldId);
-
-            // if this happens to be a boolean field, the value is encoded in the type
-            if (isBoolType(type))
-            {
-                // save the boolean value in a special instance variable.
-                boolValue_ = (byte)(type & 0x0f) == Types.BOOLEAN_TRUE ? true : false;
-            }
-
-            // push the new field onto the field stack so we can keep the deltas going.
-            lastFieldId_ = field.ID;
-            return field;
-        }
-
-        /**
-         * Read a map header off the wire. If the size is zero, skip Reading the key
-         * and value type. This means that 0-length maps will yield TMaps without the
-         * "correct" types.
-         */
-        public override TMap ReadMapBegin()
-        {
-            int size = (int)ReadVarint32();
-            byte keyAndValueType = size == 0 ? (byte)0 : (byte)ReadByte();
-            return new TMap(getTType((byte)(keyAndValueType >> 4)), getTType((byte)(keyAndValueType & 0xf)), size);
-        }
-
-        /**
-         * Read a list header off the wire. If the list size is 0-14, the size will
-         * be packed into the element type header. If it's a longer list, the 4 MSB
-         * of the element type header will be 0xF, and a varint will follow with the
-         * true size.
-         */
-        public override TList ReadListBegin()
-        {
-            byte size_and_type = (byte)ReadByte();
-            int size = (size_and_type >> 4) & 0x0f;
-            if (size == 15)
-            {
-                size = (int)ReadVarint32();
-            }
-            TType type = getTType(size_and_type);
-            return new TList(type, size);
-        }
-
-        /**
-         * Read a set header off the wire. If the set size is 0-14, the size will
-         * be packed into the element type header. If it's a longer set, the 4 MSB
-         * of the element type header will be 0xF, and a varint will follow with the
-         * true size.
-         */
-        public override TSet ReadSetBegin()
-        {
-            return new TSet(ReadListBegin());
-        }
-
-        /**
-         * Read a boolean off the wire. If this is a boolean field, the value should
-         * already have been Read during ReadFieldBegin, so we'll just consume the
-         * pre-stored value. Otherwise, Read a byte.
-         */
-        public override Boolean ReadBool()
-        {
-            if (boolValue_ != null)
-            {
-                bool result = boolValue_.Value;
-                boolValue_ = null;
-                return result;
-            }
-            return ReadByte() == Types.BOOLEAN_TRUE;
-        }
-
-        byte[] byteRawBuf = new byte[1];
-        /**
-         * Read a single byte off the wire. Nothing interesting here.
-         */
-        public override sbyte ReadByte()
-        {
-            trans.ReadAll(byteRawBuf, 0, 1);
-            return (sbyte)byteRawBuf[0];
-        }
-
-        /**
-         * Read an i16 from the wire as a zigzag varint.
-         */
-        public override short ReadI16()
-        {
-            return (short)zigzagToInt(ReadVarint32());
-        }
-
-        /**
-         * Read an i32 from the wire as a zigzag varint.
-         */
-        public override int ReadI32()
-        {
-            return zigzagToInt(ReadVarint32());
-        }
-
-        /**
-         * Read an i64 from the wire as a zigzag varint.
-         */
-        public override long ReadI64()
-        {
-            return zigzagToLong(ReadVarint64());
-        }
-
-        /**
-         * No magic here - just Read a double off the wire.
-         */
-        public override double ReadDouble()
-        {
-            byte[] longBits = new byte[8];
-            trans.ReadAll(longBits, 0, 8);
-            return BitConverter.Int64BitsToDouble(bytesToLong(longBits));
-        }
-
-        /**
-         * Reads a byte[] (via ReadBinary), and then UTF-8 decodes it.
-         */
-        public override String ReadString()
-        {
-            int length = (int)ReadVarint32();
-
-            if (length == 0)
-            {
-                return "";
-            }
-
-            return Encoding.UTF8.GetString(ReadBinary(length));
-        }
-
-        /**
-         * Read a byte[] from the wire.
-         */
-        public override byte[] ReadBinary()
-        {
-            int length = (int)ReadVarint32();
-            if (length == 0) return new byte[0];
-
-            byte[] buf = new byte[length];
-            trans.ReadAll(buf, 0, length);
-            return buf;
-        }
-
-        /**
-         * Read a byte[] of a known length from the wire.
-         */
-        private byte[] ReadBinary(int length)
-        {
-            if (length == 0) return new byte[0];
-
-            byte[] buf = new byte[length];
-            trans.ReadAll(buf, 0, length);
-            return buf;
-        }
-
-        //
-        // These methods are here for the struct to call, but don't have any wire
-        // encoding.
-        //
-        public override void ReadMessageEnd() { }
-        public override void ReadFieldEnd() { }
-        public override void ReadMapEnd() { }
-        public override void ReadListEnd() { }
-        public override void ReadSetEnd() { }
-
-        //
-        // Internal Reading methods
-        //
-
-        /**
-         * Read an i32 from the wire as a varint. The MSB of each byte is set
-         * if there is another byte to follow. This can Read up to 5 bytes.
-         */
-        private uint ReadVarint32()
-        {
-            uint result = 0;
-            int shift = 0;
-            while (true)
-            {
-                byte b = (byte)ReadByte();
-                result |= (uint)(b & 0x7f) << shift;
-                if ((b & 0x80) != 0x80) break;
-                shift += 7;
-            }
-            return result;
-        }
-
-        /**
-         * Read an i64 from the wire as a proper varint. The MSB of each byte is set
-         * if there is another byte to follow. This can Read up to 10 bytes.
-         */
-        private ulong ReadVarint64()
-        {
-            int shift = 0;
-            ulong result = 0;
-            while (true)
-            {
-                byte b = (byte)ReadByte();
-                result |= (ulong)(b & 0x7f) << shift;
-                if ((b & 0x80) != 0x80) break;
-                shift += 7;
-            }
-
-            return result;
-        }
-
-        #endregion
-
-        //
-        // encoding helpers
-        //
-
-        /**
-         * Convert from zigzag int to int.
-         */
-        private int zigzagToInt(uint n)
-        {
-            return (int)(n >> 1) ^ (-(int)(n & 1));
-        }
-
-        /**
-         * Convert from zigzag long to long.
-         */
-        private long zigzagToLong(ulong n)
-        {
-            return (long)(n >> 1) ^ (-(long)(n & 1));
-        }
-
-        /**
-         * Note that it's important that the mask bytes are long literals,
-         * otherwise they'll default to ints, and when you shift an int left 56 bits,
-         * you just get a messed up int.
-         */
-        private long bytesToLong(byte[] bytes)
-        {
-            return
-              ((bytes[7] & 0xffL) << 56) |
-              ((bytes[6] & 0xffL) << 48) |
-              ((bytes[5] & 0xffL) << 40) |
-              ((bytes[4] & 0xffL) << 32) |
-              ((bytes[3] & 0xffL) << 24) |
-              ((bytes[2] & 0xffL) << 16) |
-              ((bytes[1] & 0xffL) << 8) |
-              ((bytes[0] & 0xffL));
-        }
-
-        //
-        // type testing and converting
-        //
-
-        private Boolean isBoolType(byte b)
-        {
-            int lowerNibble = b & 0x0f;
-            return lowerNibble == Types.BOOLEAN_TRUE || lowerNibble == Types.BOOLEAN_FALSE;
-        }
-
-        /**
-         * Given a TCompactProtocol.Types constant, convert it to its corresponding
-         * TType value.
-         */
-        private TType getTType(byte type)
-        {
-            switch ((byte)(type & 0x0f))
-            {
-                case Types.STOP:
-                    return TType.Stop;
-                case Types.BOOLEAN_FALSE:
-                case Types.BOOLEAN_TRUE:
-                    return TType.Bool;
-                case Types.BYTE:
-                    return TType.Byte;
-                case Types.I16:
-                    return TType.I16;
-                case Types.I32:
-                    return TType.I32;
-                case Types.I64:
-                    return TType.I64;
-                case Types.DOUBLE:
-                    return TType.Double;
-                case Types.BINARY:
-                    return TType.String;
-                case Types.LIST:
-                    return TType.List;
-                case Types.SET:
-                    return TType.Set;
-                case Types.MAP:
-                    return TType.Map;
-                case Types.STRUCT:
-                    return TType.Struct;
-                default:
-                    throw new TProtocolException("don't know what type: " + (byte)(type & 0x0f));
-            }
-        }
-
-        /**
-         * Given a TType value, find the appropriate TCompactProtocol.Types constant.
-         */
-        private byte getCompactType(TType ttype)
-        {
-            return ttypeToCompactType[(int)ttype];
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TField.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TField.cs
deleted file mode 100644
index 8179557..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TField.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Thrift.Protocol
-{
-    public struct TField
-    {
-        private string name;
-        private TType type;
-        private short id;
-
-        public TField(string name, TType type, short id)
-            :this()
-        {
-            this.name = name;
-            this.type = type;
-            this.id = id;
-        }
-
-        public string Name
-        {
-            get { return name; }
-            set { name = value; }
-        }
-
-        public TType Type
-        {
-            get { return type; }
-            set { type = value; }
-        }
-
-        public short ID
-        {
-            get { return id; }
-            set { id = value; }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TJSONProtocol.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TJSONProtocol.cs
deleted file mode 100644
index 5e6589e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TJSONProtocol.cs
+++ /dev/null
@@ -1,1128 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.IO;
-using System.Text;
-using System.Collections.Generic;
-
-using Thrift.Transport;
-using System.Globalization;
-
-namespace Thrift.Protocol
-{
-    /// <summary>
-    /// JSON protocol implementation for thrift.
-    ///
-    /// This is a full-featured protocol supporting Write and Read.
-    ///
-    /// Please see the C++ class header for a detailed description of the
-    /// protocol's wire format.
-    ///
-    /// Adapted from the Java version.
-    /// </summary>
-    public class TJSONProtocol : TProtocol
-    {
-        /// <summary>
-        /// Factory for JSON protocol objects
-        /// </summary>
-        public class Factory : TProtocolFactory
-        {
-            public TProtocol GetProtocol(TTransport trans)
-            {
-                return new TJSONProtocol(trans);
-            }
-        }
-
-        private static byte[] COMMA = new byte[] { (byte)',' };
-        private static byte[] COLON = new byte[] { (byte)':' };
-        private static byte[] LBRACE = new byte[] { (byte)'{' };
-        private static byte[] RBRACE = new byte[] { (byte)'}' };
-        private static byte[] LBRACKET = new byte[] { (byte)'[' };
-        private static byte[] RBRACKET = new byte[] { (byte)']' };
-        private static byte[] QUOTE = new byte[] { (byte)'"' };
-        private static byte[] BACKSLASH = new byte[] { (byte)'\\' };
-
-        private byte[] ESCSEQ = new byte[] { (byte)'\\', (byte)'u', (byte)'0', (byte)'0' };
-
-        private const long VERSION = 1;
-        private byte[] JSON_CHAR_TABLE = {
-    0,  0,  0,  0,  0,  0,  0,  0,(byte)'b',(byte)'t',(byte)'n',  0,(byte)'f',(byte)'r',  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,(byte)'"',  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-  };
-
-        private char[] ESCAPE_CHARS = "\"\\/bfnrt".ToCharArray();
-
-        private byte[] ESCAPE_CHAR_VALS = {
-    (byte)'"', (byte)'\\', (byte)'/', (byte)'\b', (byte)'\f', (byte)'\n', (byte)'\r', (byte)'\t',
-  };
-
-        private const int DEF_STRING_SIZE = 16;
-
-        private static byte[] NAME_BOOL = new byte[] { (byte)'t', (byte)'f' };
-        private static byte[] NAME_BYTE = new byte[] { (byte)'i', (byte)'8' };
-        private static byte[] NAME_I16 = new byte[] { (byte)'i', (byte)'1', (byte)'6' };
-        private static byte[] NAME_I32 = new byte[] { (byte)'i', (byte)'3', (byte)'2' };
-        private static byte[] NAME_I64 = new byte[] { (byte)'i', (byte)'6', (byte)'4' };
-        private static byte[] NAME_DOUBLE = new byte[] { (byte)'d', (byte)'b', (byte)'l' };
-        private static byte[] NAME_STRUCT = new byte[] { (byte)'r', (byte)'e', (byte)'c' };
-        private static byte[] NAME_STRING = new byte[] { (byte)'s', (byte)'t', (byte)'r' };
-        private static byte[] NAME_MAP = new byte[] { (byte)'m', (byte)'a', (byte)'p' };
-        private static byte[] NAME_LIST = new byte[] { (byte)'l', (byte)'s', (byte)'t' };
-        private static byte[] NAME_SET = new byte[] { (byte)'s', (byte)'e', (byte)'t' };
-
-        private static byte[] GetTypeNameForTypeID(TType typeID)
-        {
-            switch (typeID)
-            {
-                case TType.Bool:
-                    return NAME_BOOL;
-                case TType.Byte:
-                    return NAME_BYTE;
-                case TType.I16:
-                    return NAME_I16;
-                case TType.I32:
-                    return NAME_I32;
-                case TType.I64:
-                    return NAME_I64;
-                case TType.Double:
-                    return NAME_DOUBLE;
-                case TType.String:
-                    return NAME_STRING;
-                case TType.Struct:
-                    return NAME_STRUCT;
-                case TType.Map:
-                    return NAME_MAP;
-                case TType.Set:
-                    return NAME_SET;
-                case TType.List:
-                    return NAME_LIST;
-                default:
-                    throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED,
-                                                 "Unrecognized type");
-            }
-        }
-
-        private static TType GetTypeIDForTypeName(byte[] name)
-        {
-            TType result = TType.Stop;
-            if (name.Length > 1)
-            {
-                switch (name[0])
-                {
-                    case (byte)'d':
-                        result = TType.Double;
-                        break;
-                    case (byte)'i':
-                        switch (name[1])
-                        {
-                            case (byte)'8':
-                                result = TType.Byte;
-                                break;
-                            case (byte)'1':
-                                result = TType.I16;
-                                break;
-                            case (byte)'3':
-                                result = TType.I32;
-                                break;
-                            case (byte)'6':
-                                result = TType.I64;
-                                break;
-                        }
-                        break;
-                    case (byte)'l':
-                        result = TType.List;
-                        break;
-                    case (byte)'m':
-                        result = TType.Map;
-                        break;
-                    case (byte)'r':
-                        result = TType.Struct;
-                        break;
-                    case (byte)'s':
-                        if (name[1] == (byte)'t')
-                        {
-                            result = TType.String;
-                        }
-                        else if (name[1] == (byte)'e')
-                        {
-                            result = TType.Set;
-                        }
-                        break;
-                    case (byte)'t':
-                        result = TType.Bool;
-                        break;
-                }
-            }
-            if (result == TType.Stop)
-            {
-                throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED,
-                                             "Unrecognized type");
-            }
-            return result;
-        }
-
-        ///<summary>
-        /// Base class for tracking JSON contexts that may require
-        /// inserting/Reading additional JSON syntax characters
-        /// This base context does nothing.
-        ///</summary>
-        protected class JSONBaseContext
-        {
-            protected TJSONProtocol proto;
-
-            public JSONBaseContext(TJSONProtocol proto)
-            {
-                this.proto = proto;
-            }
-
-            public virtual void Write() { }
-
-            public virtual void Read() { }
-
-            public virtual bool EscapeNumbers() { return false; }
-        }
-
-        ///<summary>
-        /// Context for JSON lists. Will insert/Read commas before each item except
-        /// for the first one
-        ///</summary>
-        protected class JSONListContext : JSONBaseContext
-        {
-            public JSONListContext(TJSONProtocol protocol)
-                : base(protocol)
-            {
-
-            }
-
-            private bool first = true;
-
-            public override void Write()
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    proto.trans.Write(COMMA);
-                }
-            }
-
-            public override void Read()
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    proto.ReadJSONSyntaxChar(COMMA);
-                }
-            }
-        }
-
-        ///<summary>
-        /// Context for JSON records. Will insert/Read colons before the value portion
-        /// of each record pair, and commas before each key except the first. In
-        /// addition, will indicate that numbers in the key position need to be
-        /// escaped in quotes (since JSON keys must be strings).
-        ///</summary>
-        protected class JSONPairContext : JSONBaseContext
-        {
-            public JSONPairContext(TJSONProtocol proto)
-                : base(proto)
-            {
-
-            }
-
-            private bool first = true;
-            private bool colon = true;
-
-            public override void Write()
-            {
-                if (first)
-                {
-                    first = false;
-                    colon = true;
-                }
-                else
-                {
-                    proto.trans.Write(colon ? COLON : COMMA);
-                    colon = !colon;
-                }
-            }
-
-            public override void Read()
-            {
-                if (first)
-                {
-                    first = false;
-                    colon = true;
-                }
-                else
-                {
-                    proto.ReadJSONSyntaxChar(colon ? COLON : COMMA);
-                    colon = !colon;
-                }
-            }
-
-            public override bool EscapeNumbers()
-            {
-                return colon;
-            }
-        }
-
-        ///<summary>
-        /// Holds up to one byte from the transport
-        ///</summary>
-        protected class LookaheadReader
-        {
-            protected TJSONProtocol proto;
-
-            public LookaheadReader(TJSONProtocol proto)
-            {
-                this.proto = proto;
-            }
-
-            private bool hasData;
-            private byte[] data = new byte[1];
-
-            ///<summary>
-            /// Return and consume the next byte to be Read, either taking it from the
-            /// data buffer if present or getting it from the transport otherwise.
-            ///</summary>
-            public byte Read()
-            {
-                if (hasData)
-                {
-                    hasData = false;
-                }
-                else
-                {
-                    proto.trans.ReadAll(data, 0, 1);
-                }
-                return data[0];
-            }
-
-            ///<summary>
-            /// Return the next byte to be Read without consuming, filling the data
-            /// buffer if it has not been filled alReady.
-            ///</summary>
-            public byte Peek()
-            {
-                if (!hasData)
-                {
-                    proto.trans.ReadAll(data, 0, 1);
-                }
-                hasData = true;
-                return data[0];
-            }
-        }
-
-        // Default encoding
-        protected Encoding utf8Encoding = UTF8Encoding.UTF8;
-
-        // Stack of nested contexts that we may be in
-        protected Stack<JSONBaseContext> contextStack = new Stack<JSONBaseContext>();
-
-        // Current context that we are in
-        protected JSONBaseContext context;
-
-        // Reader that manages a 1-byte buffer
-        protected LookaheadReader reader;
-
-        ///<summary>
-        /// Push a new JSON context onto the stack.
-        ///</summary>
-        protected void PushContext(JSONBaseContext c)
-        {
-            contextStack.Push(context);
-            context = c;
-        }
-
-        ///<summary>
-        /// Pop the last JSON context off the stack
-        ///</summary>
-        protected void PopContext()
-        {
-            context = contextStack.Pop();
-        }
-
-        ///<summary>
-        /// TJSONProtocol Constructor
-        ///</summary>
-        public TJSONProtocol(TTransport trans)
-            : base(trans)
-        {
-            context = new JSONBaseContext(this);
-            reader = new LookaheadReader(this);
-        }
-
-        // Temporary buffer used by several methods
-        private byte[] tempBuffer = new byte[4];
-
-        ///<summary>
-        /// Read a byte that must match b[0]; otherwise an exception is thrown.
-        /// Marked protected to avoid synthetic accessor in JSONListContext.Read
-        /// and JSONPairContext.Read
-        ///</summary>
-        protected void ReadJSONSyntaxChar(byte[] b)
-        {
-            byte ch = reader.Read();
-            if (ch != b[0])
-            {
-                throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                             "Unexpected character:" + (char)ch);
-            }
-        }
-
-        ///<summary>
-        /// Convert a byte containing a hex char ('0'-'9' or 'a'-'f') into its
-        /// corresponding hex value
-        ///</summary>
-        private static byte HexVal(byte ch)
-        {
-            if ((ch >= '0') && (ch <= '9'))
-            {
-                return (byte)((char)ch - '0');
-            }
-            else if ((ch >= 'a') && (ch <= 'f'))
-            {
-                ch += 10;
-                return (byte)((char)ch - 'a');
-            }
-            else
-            {
-                throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                             "Expected hex character");
-            }
-        }
-
-        ///<summary>
-        /// Convert a byte containing a hex value to its corresponding hex character
-        ///</summary>
-        private static byte HexChar(byte val)
-        {
-            val &= 0x0F;
-            if (val < 10)
-            {
-                return (byte)((char)val + '0');
-            }
-            else
-            {
-                val -= 10;
-                return (byte)((char)val + 'a');
-            }
-        }
-
-        ///<summary>
-        /// Write the bytes in array buf as a JSON characters, escaping as needed
-        ///</summary>
-        private void WriteJSONString(byte[] b)
-        {
-            context.Write();
-            trans.Write(QUOTE);
-            int len = b.Length;
-            for (int i = 0; i < len; i++)
-            {
-                if ((b[i] & 0x00FF) >= 0x30)
-                {
-                    if (b[i] == BACKSLASH[0])
-                    {
-                        trans.Write(BACKSLASH);
-                        trans.Write(BACKSLASH);
-                    }
-                    else
-                    {
-                        trans.Write(b, i, 1);
-                    }
-                }
-                else
-                {
-                    tempBuffer[0] = JSON_CHAR_TABLE[b[i]];
-                    if (tempBuffer[0] == 1)
-                    {
-                        trans.Write(b, i, 1);
-                    }
-                    else if (tempBuffer[0] > 1)
-                    {
-                        trans.Write(BACKSLASH);
-                        trans.Write(tempBuffer, 0, 1);
-                    }
-                    else
-                    {
-                        trans.Write(ESCSEQ);
-                        tempBuffer[0] = HexChar((byte)(b[i] >> 4));
-                        tempBuffer[1] = HexChar(b[i]);
-                        trans.Write(tempBuffer, 0, 2);
-                    }
-                }
-            }
-            trans.Write(QUOTE);
-        }
-
-        ///<summary>
-        /// Write out number as a JSON value. If the context dictates so, it will be
-        /// wrapped in quotes to output as a JSON string.
-        ///</summary>
-        private void WriteJSONInteger(long num)
-        {
-            context.Write();
-            String str = num.ToString();
-
-            bool escapeNum = context.EscapeNumbers();
-            if (escapeNum)
-                trans.Write(QUOTE);
-
-            trans.Write(utf8Encoding.GetBytes(str));
-
-            if (escapeNum)
-                trans.Write(QUOTE);
-        }
-
-        ///<summary>
-        /// Write out a double as a JSON value. If it is NaN or infinity or if the
-        /// context dictates escaping, Write out as JSON string.
-        ///</summary>
-        private void WriteJSONDouble(double num)
-        {
-            context.Write();
-            String str = num.ToString("G17", CultureInfo.InvariantCulture);
-            bool special = false;
-
-            switch (str[0])
-            {
-                case 'N': // NaN
-                case 'I': // Infinity
-                    special = true;
-                    break;
-                case '-':
-                    if (str[1] == 'I')
-                    { // -Infinity
-                        special = true;
-                    }
-                    break;
-            }
-
-            bool escapeNum = special || context.EscapeNumbers();
-
-            if (escapeNum)
-                trans.Write(QUOTE);
-
-            trans.Write(utf8Encoding.GetBytes(str));
-
-            if (escapeNum)
-                trans.Write(QUOTE);
-        }
-        ///<summary>
-        /// Write out contents of byte array b as a JSON string with base-64 encoded
-        /// data
-        ///</summary>
-        private void WriteJSONBase64(byte[] b)
-        {
-            context.Write();
-            trans.Write(QUOTE);
-
-            int len = b.Length;
-            int off = 0;
-
-            // Ignore padding
-            int bound = len >= 2 ? len - 2 : 0;
-            for (int i = len - 1; i >= bound && b[i] == '='; --i) {
-                --len;
-            }
-            while (len >= 3)
-            {
-                // Encode 3 bytes at a time
-                TBase64Utils.encode(b, off, 3, tempBuffer, 0);
-                trans.Write(tempBuffer, 0, 4);
-                off += 3;
-                len -= 3;
-            }
-            if (len > 0)
-            {
-                // Encode remainder
-                TBase64Utils.encode(b, off, len, tempBuffer, 0);
-                trans.Write(tempBuffer, 0, len + 1);
-            }
-
-            trans.Write(QUOTE);
-        }
-
-        private void WriteJSONObjectStart()
-        {
-            context.Write();
-            trans.Write(LBRACE);
-            PushContext(new JSONPairContext(this));
-        }
-
-        private void WriteJSONObjectEnd()
-        {
-            PopContext();
-            trans.Write(RBRACE);
-        }
-
-        private void WriteJSONArrayStart()
-        {
-            context.Write();
-            trans.Write(LBRACKET);
-            PushContext(new JSONListContext(this));
-        }
-
-        private void WriteJSONArrayEnd()
-        {
-            PopContext();
-            trans.Write(RBRACKET);
-        }
-
-        public override void WriteMessageBegin(TMessage message)
-        {
-            WriteJSONArrayStart();
-            WriteJSONInteger(VERSION);
-
-            byte[] b = utf8Encoding.GetBytes(message.Name);
-            WriteJSONString(b);
-
-            WriteJSONInteger((long)message.Type);
-            WriteJSONInteger(message.SeqID);
-        }
-
-        public override void WriteMessageEnd()
-        {
-            WriteJSONArrayEnd();
-        }
-
-        public override void WriteStructBegin(TStruct str)
-        {
-            WriteJSONObjectStart();
-        }
-
-        public override void WriteStructEnd()
-        {
-            WriteJSONObjectEnd();
-        }
-
-        public override void WriteFieldBegin(TField field)
-        {
-            WriteJSONInteger(field.ID);
-            WriteJSONObjectStart();
-            WriteJSONString(GetTypeNameForTypeID(field.Type));
-        }
-
-        public override void WriteFieldEnd()
-        {
-            WriteJSONObjectEnd();
-        }
-
-        public override void WriteFieldStop() { }
-
-        public override void WriteMapBegin(TMap map)
-        {
-            WriteJSONArrayStart();
-            WriteJSONString(GetTypeNameForTypeID(map.KeyType));
-            WriteJSONString(GetTypeNameForTypeID(map.ValueType));
-            WriteJSONInteger(map.Count);
-            WriteJSONObjectStart();
-        }
-
-        public override void WriteMapEnd()
-        {
-            WriteJSONObjectEnd();
-            WriteJSONArrayEnd();
-        }
-
-        public override void WriteListBegin(TList list)
-        {
-            WriteJSONArrayStart();
-            WriteJSONString(GetTypeNameForTypeID(list.ElementType));
-            WriteJSONInteger(list.Count);
-        }
-
-        public override void WriteListEnd()
-        {
-            WriteJSONArrayEnd();
-        }
-
-        public override void WriteSetBegin(TSet set)
-        {
-            WriteJSONArrayStart();
-            WriteJSONString(GetTypeNameForTypeID(set.ElementType));
-            WriteJSONInteger(set.Count);
-        }
-
-        public override void WriteSetEnd()
-        {
-            WriteJSONArrayEnd();
-        }
-
-        public override void WriteBool(bool b)
-        {
-            WriteJSONInteger(b ? (long)1 : (long)0);
-        }
-
-        public override void WriteByte(sbyte b)
-        {
-            WriteJSONInteger((long)b);
-        }
-
-        public override void WriteI16(short i16)
-        {
-            WriteJSONInteger((long)i16);
-        }
-
-        public override void WriteI32(int i32)
-        {
-            WriteJSONInteger((long)i32);
-        }
-
-        public override void WriteI64(long i64)
-        {
-            WriteJSONInteger(i64);
-        }
-
-        public override void WriteDouble(double dub)
-        {
-            WriteJSONDouble(dub);
-        }
-
-        public override void WriteString(String str)
-        {
-            byte[] b = utf8Encoding.GetBytes(str);
-            WriteJSONString(b);
-        }
-
-        public override void WriteBinary(byte[] bin)
-        {
-            WriteJSONBase64(bin);
-        }
-
-        /**
-         * Reading methods.
-         */
-
-        ///<summary>
-        /// Read in a JSON string, unescaping as appropriate.. Skip Reading from the
-        /// context if skipContext is true.
-        ///</summary>
-        private byte[] ReadJSONString(bool skipContext)
-        {
-            MemoryStream buffer = new MemoryStream();
-            List<char> codeunits = new List<char>();
-
-
-            if (!skipContext)
-            {
-                context.Read();
-            }
-            ReadJSONSyntaxChar(QUOTE);
-            while (true)
-            {
-                byte ch = reader.Read();
-                if (ch == QUOTE[0])
-                {
-                    break;
-                }
-
-                // escaped?
-                if (ch != ESCSEQ[0])
-                {
-                    buffer.Write(new byte[] { (byte)ch }, 0, 1);
-                    continue;
-                }
-
-                // distinguish between \uXXXX and \?
-                ch = reader.Read();
-                if (ch != ESCSEQ[1])  // control chars like \n
-                {
-                    int off = Array.IndexOf(ESCAPE_CHARS, (char)ch);
-                    if (off == -1)
-                    {
-                        throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                                        "Expected control char");
-                    }
-                    ch = ESCAPE_CHAR_VALS[off];
-                    buffer.Write(new byte[] { (byte)ch }, 0, 1);
-                    continue;
-                }
-
-
-                // it's \uXXXX
-                trans.ReadAll(tempBuffer, 0, 4);
-                var wch = (short)((HexVal((byte)tempBuffer[0]) << 12) +
-                                  (HexVal((byte)tempBuffer[1]) << 8) +
-                                  (HexVal((byte)tempBuffer[2]) << 4) +
-                                   HexVal(tempBuffer[3]));
-                if (Char.IsHighSurrogate((char)wch))
-                {
-                    if (codeunits.Count > 0)
-                    {
-                        throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                                        "Expected low surrogate char");
-                    }
-                    codeunits.Add((char)wch);
-                }
-                else if (Char.IsLowSurrogate((char)wch))
-                {
-                    if (codeunits.Count == 0)
-                    {
-                        throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                                        "Expected high surrogate char");
-                    }
-                    codeunits.Add((char)wch);
-                    var tmp = utf8Encoding.GetBytes(codeunits.ToArray());
-                    buffer.Write(tmp, 0, tmp.Length);
-                    codeunits.Clear();
-                }
-                else
-                {
-                    var tmp = utf8Encoding.GetBytes(new char[] { (char)wch });
-                    buffer.Write(tmp, 0, tmp.Length);
-                }
-            }
-
-
-            if (codeunits.Count > 0)
-            {
-                throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                                "Expected low surrogate char");
-            }
-
-            return buffer.ToArray();
-        }
-
-        ///<summary>
-        /// Return true if the given byte could be a valid part of a JSON number.
-        ///</summary>
-        private bool IsJSONNumeric(byte b)
-        {
-            switch (b)
-            {
-                case (byte)'+':
-                case (byte)'-':
-                case (byte)'.':
-                case (byte)'0':
-                case (byte)'1':
-                case (byte)'2':
-                case (byte)'3':
-                case (byte)'4':
-                case (byte)'5':
-                case (byte)'6':
-                case (byte)'7':
-                case (byte)'8':
-                case (byte)'9':
-                case (byte)'E':
-                case (byte)'e':
-                    return true;
-            }
-            return false;
-        }
-
-        ///<summary>
-        /// Read in a sequence of characters that are all valid in JSON numbers. Does
-        /// not do a complete regex check to validate that this is actually a number.
-        ////</summary>
-        private String ReadJSONNumericChars()
-        {
-            StringBuilder strbld = new StringBuilder();
-            while (true)
-            {
-                byte ch = reader.Peek();
-                if (!IsJSONNumeric(ch))
-                {
-                    break;
-                }
-                strbld.Append((char)reader.Read());
-            }
-            return strbld.ToString();
-        }
-
-        ///<summary>
-        /// Read in a JSON number. If the context dictates, Read in enclosing quotes.
-        ///</summary>
-        private long ReadJSONInteger()
-        {
-            context.Read();
-            if (context.EscapeNumbers())
-            {
-                ReadJSONSyntaxChar(QUOTE);
-            }
-            String str = ReadJSONNumericChars();
-            if (context.EscapeNumbers())
-            {
-                ReadJSONSyntaxChar(QUOTE);
-            }
-            try
-            {
-                return Int64.Parse(str);
-            }
-            catch (FormatException)
-            {
-                throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                             "Bad data encounted in numeric data");
-            }
-        }
-
-        ///<summary>
-        /// Read in a JSON double value. Throw if the value is not wrapped in quotes
-        /// when expected or if wrapped in quotes when not expected.
-        ///</summary>
-        private double ReadJSONDouble()
-        {
-            context.Read();
-            if (reader.Peek() == QUOTE[0])
-            {
-                byte[] arr = ReadJSONString(true);
-                double dub = Double.Parse(utf8Encoding.GetString(arr,0,arr.Length), CultureInfo.InvariantCulture);
-
-                if (!context.EscapeNumbers() && !Double.IsNaN(dub) &&
-                    !Double.IsInfinity(dub))
-                {
-                    // Throw exception -- we should not be in a string in this case
-                    throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                                 "Numeric data unexpectedly quoted");
-                }
-                return dub;
-            }
-            else
-            {
-                if (context.EscapeNumbers())
-                {
-                    // This will throw - we should have had a quote if escapeNum == true
-                    ReadJSONSyntaxChar(QUOTE);
-                }
-                try
-                {
-                    return Double.Parse(ReadJSONNumericChars(), CultureInfo.InvariantCulture);
-                }
-                catch (FormatException)
-                {
-                    throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                                 "Bad data encounted in numeric data");
-                }
-            }
-        }
-
-        //<summary>
-        /// Read in a JSON string containing base-64 encoded data and decode it.
-        ///</summary>
-        private byte[] ReadJSONBase64()
-        {
-            byte[] b = ReadJSONString(false);
-            int len = b.Length;
-            int off = 0;
-            int size = 0;
-            // reduce len to ignore fill bytes
-            while ((len > 0) && (b[len - 1] == '='))
-            {
-                --len;
-            }
-            // read & decode full byte triplets = 4 source bytes
-            while (len > 4)
-            {
-                // Decode 4 bytes at a time
-                TBase64Utils.decode(b, off, 4, b, size); // NB: decoded in place
-                off += 4;
-                len -= 4;
-                size += 3;
-            }
-            // Don't decode if we hit the end or got a single leftover byte (invalid
-            // base64 but legal for skip of regular string type)
-            if (len > 1)
-            {
-                // Decode remainder
-                TBase64Utils.decode(b, off, len, b, size); // NB: decoded in place
-                size += len - 1;
-            }
-            // Sadly we must copy the byte[] (any way around this?)
-            byte[] result = new byte[size];
-            Array.Copy(b, 0, result, 0, size);
-            return result;
-        }
-
-        private void ReadJSONObjectStart()
-        {
-            context.Read();
-            ReadJSONSyntaxChar(LBRACE);
-            PushContext(new JSONPairContext(this));
-        }
-
-        private void ReadJSONObjectEnd()
-        {
-            ReadJSONSyntaxChar(RBRACE);
-            PopContext();
-        }
-
-        private void ReadJSONArrayStart()
-        {
-            context.Read();
-            ReadJSONSyntaxChar(LBRACKET);
-            PushContext(new JSONListContext(this));
-        }
-
-        private void ReadJSONArrayEnd()
-        {
-            ReadJSONSyntaxChar(RBRACKET);
-            PopContext();
-        }
-
-        public override TMessage ReadMessageBegin()
-        {
-            TMessage message = new TMessage();
-            ReadJSONArrayStart();
-            if (ReadJSONInteger() != VERSION)
-            {
-                throw new TProtocolException(TProtocolException.BAD_VERSION,
-                                             "Message contained bad version.");
-            }
-
-            var buf = ReadJSONString(false);
-            message.Name = utf8Encoding.GetString(buf,0,buf.Length);
-            message.Type = (TMessageType)ReadJSONInteger();
-            message.SeqID = (int)ReadJSONInteger();
-            return message;
-        }
-
-        public override void ReadMessageEnd()
-        {
-            ReadJSONArrayEnd();
-        }
-
-        public override TStruct ReadStructBegin()
-        {
-            ReadJSONObjectStart();
-            return new TStruct();
-        }
-
-        public override void ReadStructEnd()
-        {
-            ReadJSONObjectEnd();
-        }
-
-        public override TField ReadFieldBegin()
-        {
-            TField field = new TField();
-            byte ch = reader.Peek();
-            if (ch == RBRACE[0])
-            {
-                field.Type = TType.Stop;
-            }
-            else
-            {
-                field.ID = (short)ReadJSONInteger();
-                ReadJSONObjectStart();
-                field.Type = GetTypeIDForTypeName(ReadJSONString(false));
-            }
-            return field;
-        }
-
-        public override void ReadFieldEnd()
-        {
-            ReadJSONObjectEnd();
-        }
-
-        public override TMap ReadMapBegin()
-        {
-            TMap map = new TMap();
-            ReadJSONArrayStart();
-            map.KeyType = GetTypeIDForTypeName(ReadJSONString(false));
-            map.ValueType = GetTypeIDForTypeName(ReadJSONString(false));
-            map.Count = (int)ReadJSONInteger();
-            ReadJSONObjectStart();
-            return map;
-        }
-
-        public override void ReadMapEnd()
-        {
-            ReadJSONObjectEnd();
-            ReadJSONArrayEnd();
-        }
-
-        public override TList ReadListBegin()
-        {
-            TList list = new TList();
-            ReadJSONArrayStart();
-            list.ElementType = GetTypeIDForTypeName(ReadJSONString(false));
-            list.Count = (int)ReadJSONInteger();
-            return list;
-        }
-
-        public override void ReadListEnd()
-        {
-            ReadJSONArrayEnd();
-        }
-
-        public override TSet ReadSetBegin()
-        {
-            TSet set = new TSet();
-            ReadJSONArrayStart();
-            set.ElementType = GetTypeIDForTypeName(ReadJSONString(false));
-            set.Count = (int)ReadJSONInteger();
-            return set;
-        }
-
-        public override void ReadSetEnd()
-        {
-            ReadJSONArrayEnd();
-        }
-
-        public override bool ReadBool()
-        {
-            return (ReadJSONInteger() == 0 ? false : true);
-        }
-
-        public override sbyte ReadByte()
-        {
-            return (sbyte)ReadJSONInteger();
-        }
-
-        public override short ReadI16()
-        {
-            return (short)ReadJSONInteger();
-        }
-
-        public override int ReadI32()
-        {
-            return (int)ReadJSONInteger();
-        }
-
-        public override long ReadI64()
-        {
-            return (long)ReadJSONInteger();
-        }
-
-        public override double ReadDouble()
-        {
-            return ReadJSONDouble();
-        }
-
-        public override String ReadString()
-        {
-            var buf = ReadJSONString(false);
-            return utf8Encoding.GetString(buf,0,buf.Length);
-        }
-
-        public override byte[] ReadBinary()
-        {
-            return ReadJSONBase64();
-        }
-
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TList.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TList.cs
deleted file mode 100644
index 0c8f214..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TList.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Thrift.Protocol
-{
-    public struct TList
-    {
-        private TType elementType;
-        private int count;
-
-        public TList(TType elementType, int count)
-            :this()
-        {
-            this.elementType = elementType;
-            this.count = count;
-        }
-
-        public TType ElementType
-        {
-            get { return elementType; }
-            set { elementType = value; }
-        }
-
-        public int Count
-        {
-            get { return count; }
-            set { count = value; }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMap.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMap.cs
deleted file mode 100644
index aba9d3a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMap.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Thrift.Protocol
-{
-    public struct TMap
-    {
-        private TType keyType;
-        private TType valueType;
-        private int count;
-
-        public TMap(TType keyType, TType valueType, int count)
-            :this()
-        {
-            this.keyType = keyType;
-            this.valueType = valueType;
-            this.count = count;
-        }
-
-        public TType KeyType
-        {
-            get { return keyType; }
-            set { keyType = value; }
-        }
-
-        public TType ValueType
-        {
-            get { return valueType; }
-            set { valueType = value; }
-        }
-
-        public int Count
-        {
-            get { return count; }
-            set { count = value; }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMessage.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMessage.cs
deleted file mode 100644
index 348263c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMessage.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Thrift.Protocol
-{
-    public struct TMessage
-    {
-        private string name;
-        private TMessageType type;
-        private int seqID;
-
-        public TMessage(string name, TMessageType type, int seqid)
-            :this()
-        {
-            this.name = name;
-            this.type = type;
-            this.seqID = seqid;
-        }
-
-        public string Name
-        {
-            get { return name; }
-            set { name = value; }
-        }
-
-        public TMessageType Type
-        {
-            get { return type; }
-            set { type = value; }
-        }
-
-        public int SeqID
-        {
-            get { return seqID; }
-            set { seqID = value; }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMessageType.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMessageType.cs
deleted file mode 100644
index c7091fe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMessageType.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-
-namespace Thrift.Protocol
-{
-    public enum TMessageType
-    {
-        Call = 1,
-        Reply = 2,
-        Exception = 3,
-        Oneway = 4
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMultiplexedProcessor.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMultiplexedProcessor.cs
deleted file mode 100644
index 35d138c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMultiplexedProcessor.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Text;
-using Thrift.Transport;
-using System.Collections.Generic;
-using System.IO;
-
-namespace Thrift.Protocol
-{
-
-    /**
-     * TMultiplexedProcessor is a TProcessor allowing a single TServer to provide multiple services.
-     * To do so, you instantiate the processor and then register additional processors with it,
-     * as shown in the following example:
-     *
-     *     TMultiplexedProcessor processor = new TMultiplexedProcessor();
-     *
-     *     processor.registerProcessor(
-     *         "Calculator",
-     *         new Calculator.Processor(new CalculatorHandler()));
-     *
-     *     processor.registerProcessor(
-     *         "WeatherReport",
-     *         new WeatherReport.Processor(new WeatherReportHandler()));
-     *
-     *     TServerTransport t = new TServerSocket(9090);
-     *     TSimpleServer server = new TSimpleServer(processor, t);
-     *
-     *     server.serve();
-     */
-    public class TMultiplexedProcessor : TProcessor
-    {
-        private Dictionary<String,TProcessor> ServiceProcessorMap = new Dictionary<String,TProcessor>();
-
-        /**
-         * 'Register' a service with this TMultiplexedProcessor. This allows us to broker
-         * requests to individual services by using the service name to select them at request time.
-         *
-         * Args:
-         * - serviceName    Name of a service, has to be identical to the name
-         *                  declared in the Thrift IDL, e.g. "WeatherReport".
-         * - processor      Implementation of a service, usually referred to as "handlers",
-         *                  e.g. WeatherReportHandler implementing WeatherReport.Iface.
-         */
-        public void RegisterProcessor(String serviceName, TProcessor processor)
-        {
-            ServiceProcessorMap.Add(serviceName, processor);
-        }
-
-
-        private void Fail( TProtocol oprot, TMessage message, TApplicationException.ExceptionType extype, string etxt)
-        {
-            TApplicationException appex = new TApplicationException( extype, etxt);
-
-            TMessage newMessage = new TMessage(message.Name, TMessageType.Exception, message.SeqID);
-
-            oprot.WriteMessageBegin(newMessage);
-            appex.Write( oprot);
-            oprot.WriteMessageEnd();
-            oprot.Transport.Flush();
-        }
-
-
-        /**
-         * This implementation of process performs the following steps:
-         *
-         * - Read the beginning of the message.
-         * - Extract the service name from the message.
-         * - Using the service name to locate the appropriate processor.
-         * - Dispatch to the processor, with a decorated instance of TProtocol
-         *    that allows readMessageBegin() to return the original TMessage.
-         *
-         * Throws an exception if
-         * - the message type is not CALL or ONEWAY,
-         * - the service name was not found in the message, or
-         * - the service name has not been RegisterProcessor()ed.
-         */
-        public bool Process(TProtocol iprot, TProtocol oprot)
-        {
-            /*  Use the actual underlying protocol (e.g. TBinaryProtocol) to read the
-                message header.  This pulls the message "off the wire", which we'll
-                deal with at the end of this method. */
-
-            try
-            {
-                TMessage message = iprot.ReadMessageBegin();
-
-                if ((message.Type != TMessageType.Call) && (message.Type != TMessageType.Oneway))
-                {
-                    Fail(oprot, message,
-                          TApplicationException.ExceptionType.InvalidMessageType,
-                          "Message type CALL or ONEWAY expected");
-                    return false;
-                }
-
-                // Extract the service name
-                int index = message.Name.IndexOf(TMultiplexedProtocol.SEPARATOR);
-                if (index < 0)
-                {
-                    Fail(oprot, message,
-                          TApplicationException.ExceptionType.InvalidProtocol,
-                          "Service name not found in message name: " + message.Name + ". " +
-                          "Did you forget to use a TMultiplexProtocol in your client?");
-                    return false;
-                }
-
-                // Create a new TMessage, something that can be consumed by any TProtocol
-                string serviceName = message.Name.Substring(0, index);
-                TProcessor actualProcessor;
-                if (!ServiceProcessorMap.TryGetValue(serviceName, out actualProcessor))
-                {
-                    Fail(oprot, message,
-                          TApplicationException.ExceptionType.InternalError,
-                          "Service name not found: " + serviceName + ". " +
-                          "Did you forget to call RegisterProcessor()?");
-                    return false;
-                }
-
-                // Create a new TMessage, removing the service name
-                TMessage newMessage = new TMessage(
-                        message.Name.Substring(serviceName.Length + TMultiplexedProtocol.SEPARATOR.Length),
-                        message.Type,
-                        message.SeqID);
-
-                // Dispatch processing to the stored processor
-                return actualProcessor.Process(new StoredMessageProtocol(iprot, newMessage), oprot);
-
-            }
-            catch (IOException)
-            {
-                return false;  // similar to all other processors
-            }
-
-        }
-
-        /**
-         *  Our goal was to work with any protocol.  In order to do that, we needed
-         *  to allow them to call readMessageBegin() and get a TMessage in exactly
-         *  the standard format, without the service name prepended to TMessage.name.
-         */
-        private class StoredMessageProtocol : TProtocolDecorator
-        {
-            TMessage MsgBegin;
-
-            public StoredMessageProtocol(TProtocol protocol, TMessage messageBegin)
-                :base(protocol)
-            {
-                this.MsgBegin = messageBegin;
-            }
-
-            public override TMessage ReadMessageBegin()
-            {
-                return MsgBegin;
-            }
-        }
-
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMultiplexedProtocol.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMultiplexedProtocol.cs
deleted file mode 100644
index 1e2af83..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TMultiplexedProtocol.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Text;
-using Thrift.Transport;
-using System.Collections.Generic;
-
-namespace Thrift.Protocol
-{
-
-    /**
-     * TMultiplexedProtocol is a protocol-independent concrete decorator that allows a Thrift
-     * client to communicate with a multiplexing Thrift server, by prepending the service name
-     * to the function name during function calls.
-     *
-     * NOTE: THIS IS NOT TO BE USED BY SERVERS.
-     * On the server, use TMultiplexedProcessor to handle requests from a multiplexing client.
-     *
-     * This example uses a single socket transport to invoke two services:
-     *
-     *     TSocket transport = new TSocket("localhost", 9090);
-     *     transport.open();
-     *
-     *     TBinaryProtocol protocol = new TBinaryProtocol(transport);
-     *
-     *     TMultiplexedProtocol mp = new TMultiplexedProtocol(protocol, "Calculator");
-     *     Calculator.Client service = new Calculator.Client(mp);
-     *
-     *     TMultiplexedProtocol mp2 = new TMultiplexedProtocol(protocol, "WeatherReport");
-     *     WeatherReport.Client service2 = new WeatherReport.Client(mp2);
-     *
-     *     System.out.println(service.add(2,2));
-     *     System.out.println(service2.getTemperature());
-     *
-     */
-    public class TMultiplexedProtocol : TProtocolDecorator
-    {
-
-        /** Used to delimit the service name from the function name */
-        public static String SEPARATOR = ":";
-
-        private String ServiceName;
-
-        /**
-         * Wrap the specified protocol, allowing it to be used to communicate with a
-         * multiplexing server.  The <code>serviceName</code> is required as it is
-         * prepended to the message header so that the multiplexing server can broker
-         * the function call to the proper service.
-         *
-         * Args:
-         *  protocol        Your communication protocol of choice, e.g. TBinaryProtocol
-         *  serviceName     The service name of the service communicating via this protocol.
-         */
-        public TMultiplexedProtocol(TProtocol protocol, String serviceName)
-            : base(protocol)
-        {
-            ServiceName = serviceName;
-        }
-
-        /**
-         * Prepends the service name to the function name, separated by TMultiplexedProtocol.SEPARATOR.
-         * Args:
-         *   tMessage     The original message.
-         */
-        public override void WriteMessageBegin(TMessage tMessage)
-        {
-            switch(tMessage.Type)
-            {
-                case TMessageType.Call:
-                case TMessageType.Oneway:
-                    base.WriteMessageBegin(new TMessage(
-                        ServiceName + SEPARATOR + tMessage.Name,
-                        tMessage.Type,
-                        tMessage.SeqID));
-                    break;
-
-                default:
-                    base.WriteMessageBegin(tMessage);
-                    break;
-            }
-        }
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocol.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocol.cs
deleted file mode 100644
index bf481ab..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocol.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Text;
-using Thrift.Transport;
-
-namespace Thrift.Protocol
-{
-    public abstract class TProtocol : IDisposable
-    {
-        private const int DEFAULT_RECURSION_DEPTH = 64;
-
-        protected TTransport trans;
-        protected int recursionLimit;
-        protected int recursionDepth;
-
-        protected TProtocol(TTransport trans)
-        {
-            this.trans = trans;
-            this.recursionLimit = DEFAULT_RECURSION_DEPTH;
-            this.recursionDepth = 0;
-        }
-
-        public TTransport Transport
-        {
-            get { return trans; }
-        }
-
-        public int RecursionLimit
-        {
-            get { return recursionLimit; }
-            set { recursionLimit = value; }
-        }
-
-        public void IncrementRecursionDepth()
-        {
-            if (recursionDepth < recursionLimit)
-                ++recursionDepth;
-            else
-                throw new TProtocolException(TProtocolException.DEPTH_LIMIT, "Depth limit exceeded");
-        }
-
-        public void DecrementRecursionDepth()
-        {
-            --recursionDepth;
-        }
-
-        #region " IDisposable Support "
-        private bool _IsDisposed;
-
-        // IDisposable
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_IsDisposed)
-            {
-                if (disposing)
-                {
-                    if (trans is IDisposable)
-                        (trans as IDisposable).Dispose();
-                }
-            }
-            _IsDisposed = true;
-        }
-        #endregion
-
-        public abstract void WriteMessageBegin(TMessage message);
-        public abstract void WriteMessageEnd();
-        public abstract void WriteStructBegin(TStruct struc);
-        public abstract void WriteStructEnd();
-        public abstract void WriteFieldBegin(TField field);
-        public abstract void WriteFieldEnd();
-        public abstract void WriteFieldStop();
-        public abstract void WriteMapBegin(TMap map);
-        public abstract void WriteMapEnd();
-        public abstract void WriteListBegin(TList list);
-        public abstract void WriteListEnd();
-        public abstract void WriteSetBegin(TSet set);
-        public abstract void WriteSetEnd();
-        public abstract void WriteBool(bool b);
-        public abstract void WriteByte(sbyte b);
-        public abstract void WriteI16(short i16);
-        public abstract void WriteI32(int i32);
-        public abstract void WriteI64(long i64);
-        public abstract void WriteDouble(double d);
-        public virtual void WriteString(string s) {
-            WriteBinary(Encoding.UTF8.GetBytes(s));
-        }
-        public abstract void WriteBinary(byte[] b);
-
-        public abstract TMessage ReadMessageBegin();
-        public abstract void ReadMessageEnd();
-        public abstract TStruct ReadStructBegin();
-        public abstract void ReadStructEnd();
-        public abstract TField ReadFieldBegin();
-        public abstract void ReadFieldEnd();
-        public abstract TMap ReadMapBegin();
-        public abstract void ReadMapEnd();
-        public abstract TList ReadListBegin();
-        public abstract void ReadListEnd();
-        public abstract TSet ReadSetBegin();
-        public abstract void ReadSetEnd();
-        public abstract bool ReadBool();
-        public abstract sbyte ReadByte();
-        public abstract short ReadI16();
-        public abstract int ReadI32();
-        public abstract long ReadI64();
-        public abstract double ReadDouble();
-        public virtual string ReadString() {
-            var buf = ReadBinary();
-            return Encoding.UTF8.GetString(buf, 0, buf.Length);
-        }
-        public abstract byte[] ReadBinary();
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolDecorator.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolDecorator.cs
deleted file mode 100644
index 7bc34ef..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolDecorator.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Text;
-using Thrift.Transport;
-using System.Collections.Generic;
-
-namespace Thrift.Protocol
-{
-
-    /**
-     * TProtocolDecorator forwards all requests to an enclosed TProtocol instance,
-     * providing a way to author concise concrete decorator subclasses.  While it has
-     * no abstract methods, it is marked abstract as a reminder that by itself,
-     * it does not modify the behaviour of the enclosed TProtocol.
-     *
-     * See p.175 of Design Patterns (by Gamma et al.)
-     * See TMultiplexedProtocol
-     */
-    public abstract class TProtocolDecorator : TProtocol
-    {
-        private TProtocol WrappedProtocol;
-
-        /**
-         * Encloses the specified protocol.
-         * @param protocol All operations will be forward to this protocol.  Must be non-null.
-         */
-        public TProtocolDecorator(TProtocol protocol)
-            : base( protocol.Transport)
-        {
-
-            WrappedProtocol = protocol;
-        }
-
-        public override void WriteMessageBegin(TMessage tMessage)
-        {
-            WrappedProtocol.WriteMessageBegin(tMessage);
-        }
-
-        public override void WriteMessageEnd()
-        {
-            WrappedProtocol.WriteMessageEnd();
-        }
-
-        public override void WriteStructBegin(TStruct tStruct)
-        {
-            WrappedProtocol.WriteStructBegin(tStruct);
-        }
-
-        public override void WriteStructEnd()
-        {
-            WrappedProtocol.WriteStructEnd();
-        }
-
-        public override void WriteFieldBegin(TField tField)
-        {
-            WrappedProtocol.WriteFieldBegin(tField);
-        }
-
-        public override void WriteFieldEnd()
-        {
-            WrappedProtocol.WriteFieldEnd();
-        }
-
-        public override void WriteFieldStop()
-        {
-            WrappedProtocol.WriteFieldStop();
-        }
-
-        public override void WriteMapBegin(TMap tMap)
-        {
-            WrappedProtocol.WriteMapBegin(tMap);
-        }
-
-        public override void WriteMapEnd()
-        {
-            WrappedProtocol.WriteMapEnd();
-        }
-
-        public override void WriteListBegin(TList tList)
-        {
-            WrappedProtocol.WriteListBegin(tList);
-        }
-
-        public override void WriteListEnd()
-{
-            WrappedProtocol.WriteListEnd();
-        }
-
-        public override void WriteSetBegin(TSet tSet)
-        {
-            WrappedProtocol.WriteSetBegin(tSet);
-        }
-
-        public override void WriteSetEnd()
-        {
-            WrappedProtocol.WriteSetEnd();
-        }
-
-        public override void WriteBool(bool b)
-        {
-            WrappedProtocol.WriteBool(b);
-        }
-
-        public override void WriteByte(sbyte b)
-        {
-            WrappedProtocol.WriteByte(b);
-        }
-
-        public override void WriteI16(short i)
-        {
-            WrappedProtocol.WriteI16(i);
-        }
-
-        public override void WriteI32(int i)
-        {
-            WrappedProtocol.WriteI32(i);
-        }
-
-        public override void WriteI64(long l)
-        {
-            WrappedProtocol.WriteI64(l);
-        }
-
-        public override void WriteDouble(double v)
-        {
-            WrappedProtocol.WriteDouble(v);
-        }
-
-        public override void WriteString(String s)
-        {
-            WrappedProtocol.WriteString(s);
-        }
-
-        public override void WriteBinary(byte[] bytes)
-        {
-            WrappedProtocol.WriteBinary(bytes);
-        }
-
-        public override TMessage ReadMessageBegin()
-        {
-            return WrappedProtocol.ReadMessageBegin();
-        }
-
-        public override void ReadMessageEnd()
-        {
-            WrappedProtocol.ReadMessageEnd();
-        }
-
-        public override TStruct ReadStructBegin()
-        {
-            return WrappedProtocol.ReadStructBegin();
-        }
-
-        public override void ReadStructEnd()
-        {
-            WrappedProtocol.ReadStructEnd();
-        }
-
-        public override TField ReadFieldBegin()
-        {
-            return WrappedProtocol.ReadFieldBegin();
-        }
-
-        public override void ReadFieldEnd()
-        {
-            WrappedProtocol.ReadFieldEnd();
-        }
-
-        public override TMap ReadMapBegin()
-        {
-            return WrappedProtocol.ReadMapBegin();
-        }
-
-        public override void ReadMapEnd()
-        {
-            WrappedProtocol.ReadMapEnd();
-        }
-
-        public override TList ReadListBegin()
-        {
-            return WrappedProtocol.ReadListBegin();
-        }
-
-        public override void ReadListEnd()
-        {
-            WrappedProtocol.ReadListEnd();
-        }
-
-        public override TSet ReadSetBegin()
-        {
-            return WrappedProtocol.ReadSetBegin();
-        }
-
-        public override void ReadSetEnd()
-        {
-            WrappedProtocol.ReadSetEnd();
-        }
-
-        public override bool ReadBool()
-        {
-            return WrappedProtocol.ReadBool();
-        }
-
-        public override sbyte ReadByte()
-        {
-            return WrappedProtocol.ReadByte();
-        }
-
-        public override short ReadI16()
-        {
-            return WrappedProtocol.ReadI16();
-        }
-
-        public override int ReadI32()
-        {
-            return WrappedProtocol.ReadI32();
-        }
-
-        public override long ReadI64()
-        {
-            return WrappedProtocol.ReadI64();
-        }
-
-        public override double ReadDouble()
-        {
-            return WrappedProtocol.ReadDouble();
-        }
-
-        public override String ReadString()
-        {
-            return WrappedProtocol.ReadString();
-        }
-
-        public override byte[] ReadBinary()
-        {
-            return WrappedProtocol.ReadBinary();
-        }
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolException.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolException.cs
deleted file mode 100644
index 76c749d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolException.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-
-namespace Thrift.Protocol
-{
-    public class TProtocolException : TException
-    {
-        public const int UNKNOWN = 0;
-        public const int INVALID_DATA = 1;
-        public const int NEGATIVE_SIZE = 2;
-        public const int SIZE_LIMIT = 3;
-        public const int BAD_VERSION = 4;
-        public const int NOT_IMPLEMENTED = 5;
-        public const int DEPTH_LIMIT = 6;
-
-        protected int type_ = UNKNOWN;
-
-        public TProtocolException()
-            : base()
-        {
-        }
-
-        public TProtocolException(int type)
-            : base()
-        {
-            type_ = type;
-        }
-
-        public TProtocolException(int type, String message)
-            : base(message)
-        {
-            type_ = type;
-        }
-
-        public TProtocolException(String message)
-            : base(message)
-        {
-        }
-
-        public int getType()
-        {
-            return type_;
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolFactory.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolFactory.cs
deleted file mode 100644
index 71360a1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolFactory.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using Thrift.Transport;
-
-namespace Thrift.Protocol
-{
-    public interface TProtocolFactory
-    {
-        TProtocol GetProtocol(TTransport trans);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolUtil.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolUtil.cs
deleted file mode 100644
index 0932a7f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TProtocolUtil.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-
-namespace Thrift.Protocol
-{
-    public static class TProtocolUtil
-    {
-        public static void Skip(TProtocol prot, TType type)
-        {
-            prot.IncrementRecursionDepth();
-            try
-            {
-                switch (type)
-                {
-                    case TType.Bool:
-                        prot.ReadBool();
-                        break;
-                    case TType.Byte:
-                        prot.ReadByte();
-                        break;
-                    case TType.I16:
-                        prot.ReadI16();
-                        break;
-                    case TType.I32:
-                        prot.ReadI32();
-                        break;
-                    case TType.I64:
-                        prot.ReadI64();
-                        break;
-                    case TType.Double:
-                        prot.ReadDouble();
-                        break;
-                    case TType.String:
-                        // Don't try to decode the string, just skip it.
-                        prot.ReadBinary();
-                        break;
-                    case TType.Struct:
-                        prot.ReadStructBegin();
-                        while (true)
-                        {
-                            TField field = prot.ReadFieldBegin();
-                            if (field.Type == TType.Stop)
-                            {
-                                break;
-                            }
-                            Skip(prot, field.Type);
-                            prot.ReadFieldEnd();
-                        }
-                        prot.ReadStructEnd();
-                        break;
-                    case TType.Map:
-                        TMap map = prot.ReadMapBegin();
-                        for (int i = 0; i < map.Count; i++)
-                        {
-                            Skip(prot, map.KeyType);
-                            Skip(prot, map.ValueType);
-                        }
-                        prot.ReadMapEnd();
-                        break;
-                    case TType.Set:
-                        TSet set = prot.ReadSetBegin();
-                        for (int i = 0; i < set.Count; i++)
-                        {
-                            Skip(prot, set.ElementType);
-                        }
-                        prot.ReadSetEnd();
-                        break;
-                    case TType.List:
-                        TList list = prot.ReadListBegin();
-                        for (int i = 0; i < list.Count; i++)
-                        {
-                            Skip(prot, list.ElementType);
-                        }
-                        prot.ReadListEnd();
-                        break;
-                }
-
-            }
-            finally
-            {
-                prot.DecrementRecursionDepth();
-            }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TSet.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TSet.cs
deleted file mode 100644
index a918ab5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TSet.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Thrift.Protocol
-{
-    public struct TSet
-    {
-        private TType elementType;
-        private int count;
-
-        public TSet(TType elementType, int count)
-            :this()
-        {
-            this.elementType = elementType;
-            this.count = count;
-        }
-
-        public TSet(TList list)
-            : this(list.ElementType, list.Count)
-        {
-        }
-
-        public TType ElementType
-        {
-            get { return elementType; }
-            set { elementType = value; }
-        }
-
-        public int Count
-        {
-            get { return count; }
-            set { count = value; }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TStruct.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TStruct.cs
deleted file mode 100644
index f4844a4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TStruct.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Thrift.Protocol
-{
-    public struct TStruct
-    {
-        private string name;
-
-        public TStruct(string name)
-            :this()
-        {
-            this.name = name;
-        }
-
-        public string Name
-        {
-            get { return name; }
-            set { name = value; }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TType.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TType.cs
deleted file mode 100644
index 9ce915e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Protocol/TType.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-
-namespace Thrift.Protocol
-{
-    public enum TType : byte
-    {
-        Stop = 0,
-        Void = 1,
-        Bool = 2,
-        Byte = 3,
-        Double = 4,
-        I16 = 6,
-        I32 = 8,
-        I64 = 10,
-        String = 11,
-        Struct = 12,
-        Map = 13,
-        Set = 14,
-        List = 15
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TServer.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TServer.cs
deleted file mode 100644
index 34f06a9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TServer.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using Thrift.Protocol;
-using Thrift.Transport;
-using System.IO;
-
-namespace Thrift.Server
-{
-  public abstract class TServer
-  {
-    //Attributes
-    protected TProcessorFactory processorFactory;
-    protected TServerTransport serverTransport;
-    protected TTransportFactory inputTransportFactory;
-    protected TTransportFactory outputTransportFactory;
-    protected TProtocolFactory inputProtocolFactory;
-    protected TProtocolFactory outputProtocolFactory;
-    protected TServerEventHandler serverEventHandler = null;
-
-    //Methods
-    public void setEventHandler(TServerEventHandler seh)
-    {
-      serverEventHandler = seh;
-    }
-    public TServerEventHandler getEventHandler()
-    {
-      return serverEventHandler;
-    }
-
-    //Log delegation
-    public delegate void LogDelegate(string str);
-    private LogDelegate _logDelegate;
-    protected LogDelegate logDelegate
-    {
-      get { return _logDelegate; }
-      set { _logDelegate = (value != null) ? value : DefaultLogDelegate; }
-    }
-    protected static void DefaultLogDelegate(string s)
-    {
-      Console.Error.WriteLine(s);
-    }
-
-    //Construction
-    public TServer(TProcessor processor,
-              TServerTransport serverTransport)
-      : this(processor, serverTransport,
-         new TTransportFactory(),
-         new TTransportFactory(),
-         new TBinaryProtocol.Factory(),
-         new TBinaryProtocol.Factory(),
-         DefaultLogDelegate)
-    {
-    }
-
-    public TServer(TProcessor processor,
-            TServerTransport serverTransport,
-            LogDelegate logDelegate)
-      : this(processor,
-         serverTransport,
-         new TTransportFactory(),
-         new TTransportFactory(),
-         new TBinaryProtocol.Factory(),
-         new TBinaryProtocol.Factory(),
-         logDelegate)
-    {
-    }
-
-    public TServer(TProcessor processor,
-              TServerTransport serverTransport,
-              TTransportFactory transportFactory)
-      : this(processor,
-         serverTransport,
-         transportFactory,
-         transportFactory,
-         new TBinaryProtocol.Factory(),
-         new TBinaryProtocol.Factory(),
-         DefaultLogDelegate)
-    {
-    }
-
-    public TServer(TProcessor processor,
-              TServerTransport serverTransport,
-              TTransportFactory transportFactory,
-              TProtocolFactory protocolFactory)
-      : this(processor,
-         serverTransport,
-         transportFactory,
-         transportFactory,
-         protocolFactory,
-         protocolFactory,
-           DefaultLogDelegate)
-    {
-    }
-
-    public TServer(TProcessor processor,
-        TServerTransport serverTransport,
-        TTransportFactory inputTransportFactory,
-        TTransportFactory outputTransportFactory,
-        TProtocolFactory inputProtocolFactory,
-        TProtocolFactory outputProtocolFactory,
-        LogDelegate logDelegate)
-    {
-        this.processorFactory = new TSingletonProcessorFactory(processor);
-        this.serverTransport = serverTransport;
-        this.inputTransportFactory = inputTransportFactory;
-        this.outputTransportFactory = outputTransportFactory;
-        this.inputProtocolFactory = inputProtocolFactory;
-        this.outputProtocolFactory = outputProtocolFactory;
-        this.logDelegate = (logDelegate != null) ? logDelegate : DefaultLogDelegate;
-    }
-
-    public TServer(TProcessorFactory processorFactory,
-              TServerTransport serverTransport,
-              TTransportFactory inputTransportFactory,
-              TTransportFactory outputTransportFactory,
-              TProtocolFactory inputProtocolFactory,
-              TProtocolFactory outputProtocolFactory,
-              LogDelegate logDelegate)
-    {
-        this.processorFactory = processorFactory;
-        this.serverTransport = serverTransport;
-        this.inputTransportFactory = inputTransportFactory;
-        this.outputTransportFactory = outputTransportFactory;
-        this.inputProtocolFactory = inputProtocolFactory;
-        this.outputProtocolFactory = outputProtocolFactory;
-        this.logDelegate = (logDelegate != null) ? logDelegate : DefaultLogDelegate;
-    }
-
-    //Abstract Interface
-    public abstract void Serve();
-    public abstract void Stop();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TServerEventHandler.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TServerEventHandler.cs
deleted file mode 100644
index 843b166..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TServerEventHandler.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-
-namespace Thrift.Server
-{
-  /// <summary>
-  /// Interface implemented by server users to handle events from the server
-  /// </summary>
-  public interface TServerEventHandler
-  {
-    /// <summary>
-    /// Called before the server begins */
-    /// </summary>
-    void preServe();
-    /// <summary>
-    /// Called when a new client has connected and is about to being processing */
-    /// </summary>
-    Object createContext(Thrift.Protocol.TProtocol input, Thrift.Protocol.TProtocol output);
-    /// <summary>
-    /// Called when a client has finished request-handling to delete server context */
-    /// </summary>
-    void deleteContext(Object serverContext, Thrift.Protocol.TProtocol input, Thrift.Protocol.TProtocol output);
-    /// <summary>
-    /// Called when a client is about to call the processor */
-    /// </summary>
-    void processContext(Object serverContext, Thrift.Transport.TTransport transport);
-  };
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TSimpleServer.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TSimpleServer.cs
deleted file mode 100644
index c73fecf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TSimpleServer.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using Thrift.Transport;
-using Thrift.Protocol;
-
-namespace Thrift.Server
-{
-  /// <summary>
-  /// Simple single-threaded server for testing
-  /// </summary>
-  public class TSimpleServer : TServer
-  {
-    private bool stop = false;
-
-    public TSimpleServer(TProcessor processor,
-              TServerTransport serverTransport)
-      : base(processor, serverTransport, new TTransportFactory(), new TTransportFactory(), new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(), DefaultLogDelegate)
-    {
-    }
-
-    public TSimpleServer(TProcessor processor,
-              TServerTransport serverTransport,
-              LogDelegate logDel)
-      : base(processor, serverTransport, new TTransportFactory(), new TTransportFactory(), new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(), logDel)
-    {
-    }
-
-    public TSimpleServer(TProcessor processor,
-              TServerTransport serverTransport,
-              TTransportFactory transportFactory)
-      : base(processor,
-         serverTransport,
-         transportFactory,
-         transportFactory,
-         new TBinaryProtocol.Factory(),
-         new TBinaryProtocol.Factory(),
-           DefaultLogDelegate)
-    {
-    }
-
-    public TSimpleServer(TProcessor processor,
-        TServerTransport serverTransport,
-        TTransportFactory transportFactory,
-        TProtocolFactory protocolFactory)
-        : base(processor,
-           serverTransport,
-           transportFactory,
-           transportFactory,
-           protocolFactory,
-           protocolFactory,
-           DefaultLogDelegate)
-    {
-    }
-
-    public TSimpleServer(TProcessorFactory processorFactory,
-              TServerTransport serverTransport,
-              TTransportFactory transportFactory,
-              TProtocolFactory protocolFactory)
-      : base(processorFactory,
-         serverTransport,
-         transportFactory,
-         transportFactory,
-         protocolFactory,
-         protocolFactory,
-         DefaultLogDelegate)
-    {
-    }
-
-    public override void Serve()
-    {
-      try
-      {
-        serverTransport.Listen();
-      }
-      catch (TTransportException ttx)
-      {
-        logDelegate(ttx.ToString());
-        return;
-      }
-
-      //Fire the preServe server event when server is up but before any client connections
-      if (serverEventHandler != null)
-        serverEventHandler.preServe();
-
-      while (!stop)
-      {
-        TProcessor processor = null;
-        TTransport client = null;
-        TTransport inputTransport = null;
-        TTransport outputTransport = null;
-        TProtocol inputProtocol = null;
-        TProtocol outputProtocol = null;
-        Object connectionContext = null;
-        try
-        {
-          using (client = serverTransport.Accept())
-          {
-            processor = processorFactory.GetProcessor(client);
-            if (client != null)
-            {
-              using (inputTransport = inputTransportFactory.GetTransport(client))
-              {
-                using (outputTransport = outputTransportFactory.GetTransport(client))
-                {
-                  inputProtocol = inputProtocolFactory.GetProtocol(inputTransport);
-                  outputProtocol = outputProtocolFactory.GetProtocol(outputTransport);
-
-                  //Recover event handler (if any) and fire createContext server event when a client connects
-                  if (serverEventHandler != null)
-                    connectionContext = serverEventHandler.createContext(inputProtocol, outputProtocol);
-
-                  //Process client requests until client disconnects
-                  while (!stop)
-                  {
-                    if (!inputTransport.Peek())
-                      break;
-
-                    //Fire processContext server event
-                    //N.B. This is the pattern implemented in C++ and the event fires provisionally.
-                    //That is to say it may be many minutes between the event firing and the client request
-                    //actually arriving or the client may hang up without ever makeing a request.
-                    if (serverEventHandler != null)
-                      serverEventHandler.processContext(connectionContext, inputTransport);
-                    //Process client request (blocks until transport is readable)
-                    if (!processor.Process(inputProtocol, outputProtocol))
-                      break;
-                  }
-                }
-              }
-            }
-          }
-        }
-        catch (TTransportException ttx)
-        {
-          if (!stop || ttx.Type != TTransportException.ExceptionType.Interrupted)
-          {
-            logDelegate(ttx.ToString());
-          }
-        }
-        catch (Exception x)
-        {
-          //Unexpected
-          logDelegate(x.ToString());
-        }
-
-        //Fire deleteContext server event after client disconnects
-        if (serverEventHandler != null)
-          serverEventHandler.deleteContext(connectionContext, inputProtocol, outputProtocol);
-      }
-    }
-
-    public override void Stop()
-    {
-      stop = true;
-      serverTransport.Close();
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TThreadPoolServer.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TThreadPoolServer.cs
deleted file mode 100644
index f0c7fe4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TThreadPoolServer.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Threading;
-using Thrift.Protocol;
-using Thrift.Transport;
-
-namespace Thrift.Server
-{
-  /// <summary>
-  /// Server that uses C# built-in ThreadPool to spawn threads when handling requests
-  /// </summary>
-  public class TThreadPoolServer : TServer
-  {
-    private const int DEFAULT_MIN_THREADS = 10;
-    private const int DEFAULT_MAX_THREADS = 100;
-    private volatile bool stop = false;
-
-    public TThreadPoolServer(TProcessor processor, TServerTransport serverTransport)
-        : this(new TSingletonProcessorFactory(processor), serverTransport,
-         new TTransportFactory(), new TTransportFactory(),
-         new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(),
-         DEFAULT_MIN_THREADS, DEFAULT_MAX_THREADS, DefaultLogDelegate)
-    {
-    }
-
-    public TThreadPoolServer(TProcessor processor, TServerTransport serverTransport, LogDelegate logDelegate)
-        : this(new TSingletonProcessorFactory(processor), serverTransport,
-         new TTransportFactory(), new TTransportFactory(),
-         new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(),
-         DEFAULT_MIN_THREADS, DEFAULT_MAX_THREADS, logDelegate)
-    {
-    }
-
-    public TThreadPoolServer(TProcessor processor,
-     TServerTransport serverTransport,
-     TTransportFactory transportFactory,
-     TProtocolFactory protocolFactory)
-        : this(new TSingletonProcessorFactory(processor), serverTransport,
-           transportFactory, transportFactory,
-           protocolFactory, protocolFactory,
-           DEFAULT_MIN_THREADS, DEFAULT_MAX_THREADS, DefaultLogDelegate)
-    {
-    }
-
-    public TThreadPoolServer(TProcessorFactory processorFactory,
-                 TServerTransport serverTransport,
-                 TTransportFactory transportFactory,
-                 TProtocolFactory protocolFactory)
-        : this(processorFactory, serverTransport,
-         transportFactory, transportFactory,
-         protocolFactory, protocolFactory,
-         DEFAULT_MIN_THREADS, DEFAULT_MAX_THREADS, DefaultLogDelegate)
-    {
-    }
-
-    public TThreadPoolServer(TProcessorFactory processorFactory,
-                 TServerTransport serverTransport,
-                 TTransportFactory inputTransportFactory,
-                 TTransportFactory outputTransportFactory,
-                 TProtocolFactory inputProtocolFactory,
-                 TProtocolFactory outputProtocolFactory,
-                 int minThreadPoolThreads, int maxThreadPoolThreads, LogDelegate logDel)
-        : base(processorFactory, serverTransport, inputTransportFactory, outputTransportFactory,
-          inputProtocolFactory, outputProtocolFactory, logDel)
-    {
-      lock (typeof(TThreadPoolServer))
-      {
-        if (!ThreadPool.SetMaxThreads(maxThreadPoolThreads, maxThreadPoolThreads))
-        {
-          throw new Exception("Error: could not SetMaxThreads in ThreadPool");
-        }
-        if (!ThreadPool.SetMinThreads(minThreadPoolThreads, minThreadPoolThreads))
-        {
-          throw new Exception("Error: could not SetMinThreads in ThreadPool");
-        }
-      }
-    }
-
-
-    /// <summary>
-    /// Use new ThreadPool thread for each new client connection
-    /// </summary>
-    public override void Serve()
-    {
-      try
-      {
-        serverTransport.Listen();
-      }
-      catch (TTransportException ttx)
-      {
-        logDelegate("Error, could not listen on ServerTransport: " + ttx);
-        return;
-      }
-
-      //Fire the preServe server event when server is up but before any client connections
-      if (serverEventHandler != null)
-        serverEventHandler.preServe();
-
-      while (!stop)
-      {
-        int failureCount = 0;
-        try
-        {
-          TTransport client = serverTransport.Accept();
-          ThreadPool.QueueUserWorkItem(this.Execute, client);
-        }
-        catch (TTransportException ttx)
-        {
-          if (!stop || ttx.Type != TTransportException.ExceptionType.Interrupted)
-          {
-            ++failureCount;
-            logDelegate(ttx.ToString());
-          }
-
-        }
-      }
-
-      if (stop)
-      {
-        try
-        {
-          serverTransport.Close();
-        }
-        catch (TTransportException ttx)
-        {
-          logDelegate("TServerTransport failed on close: " + ttx.Message);
-        }
-        stop = false;
-      }
-    }
-
-    /// <summary>
-    /// Loops on processing a client forever
-    /// threadContext will be a TTransport instance
-    /// </summary>
-    /// <param name="threadContext"></param>
-    private void Execute(Object threadContext)
-    {
-      TTransport client = (TTransport)threadContext;
-      TProcessor processor = processorFactory.GetProcessor(client, this);
-      TTransport inputTransport = null;
-      TTransport outputTransport = null;
-      TProtocol inputProtocol = null;
-      TProtocol outputProtocol = null;
-      Object connectionContext = null;
-      try
-      {
-        inputTransport = inputTransportFactory.GetTransport(client);
-        outputTransport = outputTransportFactory.GetTransport(client);
-        inputProtocol = inputProtocolFactory.GetProtocol(inputTransport);
-        outputProtocol = outputProtocolFactory.GetProtocol(outputTransport);
-
-        //Recover event handler (if any) and fire createContext server event when a client connects
-        if (serverEventHandler != null)
-          connectionContext = serverEventHandler.createContext(inputProtocol, outputProtocol);
-
-        //Process client requests until client disconnects
-        while (!stop)
-        {
-          if (!inputTransport.Peek())
-            break;
-
-          //Fire processContext server event
-          //N.B. This is the pattern implemented in C++ and the event fires provisionally.
-          //That is to say it may be many minutes between the event firing and the client request
-          //actually arriving or the client may hang up without ever makeing a request.
-          if (serverEventHandler != null)
-            serverEventHandler.processContext(connectionContext, inputTransport);
-          //Process client request (blocks until transport is readable)
-          if (!processor.Process(inputProtocol, outputProtocol))
-            break;
-        }
-      }
-      catch (TTransportException)
-      {
-        //Usually a client disconnect, expected
-      }
-      catch (Exception x)
-      {
-        //Unexpected
-        logDelegate("Error: " + x);
-      }
-
-      //Fire deleteContext server event after client disconnects
-      if (serverEventHandler != null)
-        serverEventHandler.deleteContext(connectionContext, inputProtocol, outputProtocol);
-
-      //Close transports
-      if (inputTransport != null)
-        inputTransport.Close();
-      if (outputTransport != null)
-        outputTransport.Close();
-    }
-
-    public override void Stop()
-    {
-      stop = true;
-      serverTransport.Close();
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TThreadedServer.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TThreadedServer.cs
deleted file mode 100644
index fe13dfd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Server/TThreadedServer.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using Thrift.Collections;
-using Thrift.Protocol;
-using Thrift.Transport;
-
-namespace Thrift.Server
-{
-  /// <summary>
-  /// Server that uses C# threads (as opposed to the ThreadPool) when handling requests
-  /// </summary>
-  public class TThreadedServer : TServer
-  {
-    private const int DEFAULT_MAX_THREADS = 100;
-    private volatile bool stop = false;
-    private readonly int maxThreads;
-
-    private Queue<TTransport> clientQueue;
-    private THashSet<Thread> clientThreads;
-    private object clientLock;
-    private Thread workerThread;
-
-    public int ClientThreadsCount  {
-        get { return clientThreads.Count; }
-    }
-
-    public TThreadedServer(TProcessor processor, TServerTransport serverTransport)
-        : this(new TSingletonProcessorFactory(processor), serverTransport,
-         new TTransportFactory(), new TTransportFactory(),
-         new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(),
-         DEFAULT_MAX_THREADS, DefaultLogDelegate)
-    {
-    }
-
-    public TThreadedServer(TProcessor processor, TServerTransport serverTransport, LogDelegate logDelegate)
-        : this(new TSingletonProcessorFactory(processor), serverTransport,
-         new TTransportFactory(), new TTransportFactory(),
-         new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(),
-         DEFAULT_MAX_THREADS, logDelegate)
-    {
-    }
-
-
-    public TThreadedServer(TProcessor processor,
-                 TServerTransport serverTransport,
-                 TTransportFactory transportFactory,
-                 TProtocolFactory protocolFactory)
-        : this(new TSingletonProcessorFactory(processor), serverTransport,
-         transportFactory, transportFactory,
-         protocolFactory, protocolFactory,
-         DEFAULT_MAX_THREADS, DefaultLogDelegate)
-    {
-    }
-
-    public TThreadedServer(TProcessorFactory processorFactory,
-           TServerTransport serverTransport,
-           TTransportFactory transportFactory,
-           TProtocolFactory protocolFactory)
-        : this(processorFactory, serverTransport,
-         transportFactory, transportFactory,
-         protocolFactory, protocolFactory,
-         DEFAULT_MAX_THREADS, DefaultLogDelegate)
-    {
-    }
-    public TThreadedServer(TProcessorFactory processorFactory,
-                 TServerTransport serverTransport,
-                 TTransportFactory inputTransportFactory,
-                 TTransportFactory outputTransportFactory,
-                 TProtocolFactory inputProtocolFactory,
-                 TProtocolFactory outputProtocolFactory,
-                 int maxThreads, LogDelegate logDel)
-      : base(processorFactory, serverTransport, inputTransportFactory, outputTransportFactory,
-          inputProtocolFactory, outputProtocolFactory, logDel)
-    {
-      this.maxThreads = maxThreads;
-      clientQueue = new Queue<TTransport>();
-      clientLock = new object();
-      clientThreads = new THashSet<Thread>();
-    }
-
-    /// <summary>
-    /// Use new Thread for each new client connection. block until numConnections < maxThreads
-    /// </summary>
-    public override void Serve()
-    {
-      try
-      {
-        //start worker thread
-        workerThread = new Thread(new ThreadStart(Execute));
-        workerThread.Start();
-        serverTransport.Listen();
-      }
-      catch (TTransportException ttx)
-      {
-        logDelegate("Error, could not listen on ServerTransport: " + ttx);
-        return;
-      }
-
-      //Fire the preServe server event when server is up but before any client connections
-      if (serverEventHandler != null)
-        serverEventHandler.preServe();
-
-      while (!stop)
-      {
-        int failureCount = 0;
-        try
-        {
-          TTransport client = serverTransport.Accept();
-          lock (clientLock)
-          {
-            clientQueue.Enqueue(client);
-            Monitor.Pulse(clientLock);
-          }
-        }
-        catch (TTransportException ttx)
-        {
-          if (!stop || ttx.Type != TTransportException.ExceptionType.Interrupted)
-          {
-            ++failureCount;
-            logDelegate(ttx.ToString());
-          }
-
-        }
-      }
-
-      if (stop)
-      {
-        try
-        {
-          serverTransport.Close();
-        }
-        catch (TTransportException ttx)
-        {
-          logDelegate("TServeTransport failed on close: " + ttx.Message);
-        }
-        stop = false;
-      }
-    }
-
-    /// <summary>
-    /// Loops on processing a client forever
-    /// threadContext will be a TTransport instance
-    /// </summary>
-    /// <param name="threadContext"></param>
-    private void Execute()
-    {
-      while (!stop)
-      {
-        TTransport client;
-        Thread t;
-        lock (clientLock)
-        {
-          //don't dequeue if too many connections
-          while (clientThreads.Count >= maxThreads)
-          {
-            Monitor.Wait(clientLock);
-          }
-
-          while (clientQueue.Count == 0)
-          {
-            Monitor.Wait(clientLock);
-          }
-
-          client = clientQueue.Dequeue();
-          t = new Thread(new ParameterizedThreadStart(ClientWorker));
-          clientThreads.Add(t);
-        }
-        //start processing requests from client on new thread
-        t.Start(client);
-      }
-    }
-
-    private void ClientWorker(Object context)
-    {
-      TTransport client = (TTransport)context;
-      TProcessor processor = processorFactory.GetProcessor(client);
-      TTransport inputTransport = null;
-      TTransport outputTransport = null;
-      TProtocol inputProtocol = null;
-      TProtocol outputProtocol = null;
-      Object connectionContext = null;
-      try
-      {
-        using (inputTransport = inputTransportFactory.GetTransport(client))
-        {
-          using (outputTransport = outputTransportFactory.GetTransport(client))
-          {
-            inputProtocol = inputProtocolFactory.GetProtocol(inputTransport);
-            outputProtocol = outputProtocolFactory.GetProtocol(outputTransport);
-
-            //Recover event handler (if any) and fire createContext server event when a client connects
-            if (serverEventHandler != null)
-              connectionContext = serverEventHandler.createContext(inputProtocol, outputProtocol);
-
-            //Process client requests until client disconnects
-            while (!stop)
-            {
-              if (!inputTransport.Peek())
-                break;
-
-              //Fire processContext server event
-              //N.B. This is the pattern implemented in C++ and the event fires provisionally.
-              //That is to say it may be many minutes between the event firing and the client request
-              //actually arriving or the client may hang up without ever makeing a request.
-              if (serverEventHandler != null)
-                serverEventHandler.processContext(connectionContext, inputTransport);
-              //Process client request (blocks until transport is readable)
-              if (!processor.Process(inputProtocol, outputProtocol))
-                break;
-            }
-          }
-        }
-      }
-      catch (TTransportException)
-      {
-        //Usually a client disconnect, expected
-      }
-      catch (Exception x)
-      {
-        //Unexpected
-        logDelegate("Error: " + x);
-      }
-
-      //Fire deleteContext server event after client disconnects
-      if (serverEventHandler != null)
-        serverEventHandler.deleteContext(connectionContext, inputProtocol, outputProtocol);
-
-      lock (clientLock)
-      {
-        clientThreads.Remove(Thread.CurrentThread);
-        Monitor.Pulse(clientLock);
-      }
-      return;
-    }
-
-    public override void Stop()
-    {
-      stop = true;
-      serverTransport.Close();
-      //clean up all the threads myself
-      workerThread.Abort();
-      foreach (Thread t in clientThreads)
-      {
-        t.Abort();
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/TApplicationException.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/TApplicationException.cs
deleted file mode 100644
index 4c0d3a3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/TApplicationException.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using Thrift.Protocol;
-
-namespace Thrift
-{
-    public class TApplicationException : TException
-    {
-        protected ExceptionType type;
-
-        public TApplicationException()
-        {
-        }
-
-        public TApplicationException(ExceptionType type)
-        {
-            this.type = type;
-        }
-
-        public TApplicationException(ExceptionType type, string message)
-            : base(message)
-        {
-            this.type = type;
-        }
-
-        public static TApplicationException Read(TProtocol iprot)
-        {
-            TField field;
-
-            string message = null;
-            ExceptionType type = ExceptionType.Unknown;
-
-            iprot.ReadStructBegin();
-            while (true)
-            {
-                field = iprot.ReadFieldBegin();
-                if (field.Type == TType.Stop)
-                {
-                    break;
-                }
-
-                switch (field.ID)
-                {
-                    case 1:
-                        if (field.Type == TType.String)
-                        {
-                            message = iprot.ReadString();
-                        }
-                        else
-                        {
-                            TProtocolUtil.Skip(iprot, field.Type);
-                        }
-                        break;
-                    case 2:
-                        if (field.Type == TType.I32)
-                        {
-                            type = (ExceptionType)iprot.ReadI32();
-                        }
-                        else
-                        {
-                            TProtocolUtil.Skip(iprot, field.Type);
-                        }
-                        break;
-                    default:
-                        TProtocolUtil.Skip(iprot, field.Type);
-                        break;
-                }
-
-                iprot.ReadFieldEnd();
-            }
-
-            iprot.ReadStructEnd();
-
-            return new TApplicationException(type, message);
-        }
-
-        public void Write(TProtocol oprot)
-        {
-            TStruct struc = new TStruct("TApplicationException");
-            TField field = new TField();
-
-            oprot.WriteStructBegin(struc);
-
-            if (!String.IsNullOrEmpty(Message))
-            {
-                field.Name = "message";
-                field.Type = TType.String;
-                field.ID = 1;
-                oprot.WriteFieldBegin(field);
-                oprot.WriteString(Message);
-                oprot.WriteFieldEnd();
-            }
-
-            field.Name = "type";
-            field.Type = TType.I32;
-            field.ID = 2;
-            oprot.WriteFieldBegin(field);
-            oprot.WriteI32((int)type);
-            oprot.WriteFieldEnd();
-            oprot.WriteFieldStop();
-            oprot.WriteStructEnd();
-        }
-
-        public enum ExceptionType
-        {
-            Unknown,
-            UnknownMethod,
-            InvalidMessageType,
-            WrongMethodName,
-            BadSequenceID,
-            MissingResult,
-            InternalError,
-            ProtocolError,
-            InvalidTransform,
-            InvalidProtocol,
-            UnsupportedClientType
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/TAsyncProcessor.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/TAsyncProcessor.cs
deleted file mode 100644
index ab43225..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/TAsyncProcessor.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Threading.Tasks;
-using Thrift.Protocol;
-
-namespace Thrift
-{
-    /// <summary>
-    /// Processes a message asynchronously.
-    /// </summary>
-    public interface TAsyncProcessor
-    {
-        /// <summary>
-        /// Processes the next part of the message.
-        /// </summary>
-        /// <param name="iprot">The input protocol.</param>
-        /// <param name="oprot">The output protocol.</param>
-        /// <returns>true if there's more to process, false otherwise.</returns>
-        Task<bool> ProcessAsync(TProtocol iprot, TProtocol oprot);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/TControllingHandler.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/TControllingHandler.cs
deleted file mode 100644
index 7b5203a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/TControllingHandler.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using Thrift.Server;
-
-namespace Thrift
-{
-    public interface TControllingHandler
-    {
-        TServer server { get; set; }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/TException.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/TException.cs
deleted file mode 100644
index 65509ec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/TException.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-
-namespace Thrift
-{
-    public class TException : Exception
-    {
-        public TException()
-        {
-        }
-
-        public TException( string message)
-            : base(message)
-        {
-        }
-
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/TProcessor.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/TProcessor.cs
deleted file mode 100644
index 71ce755..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/TProcessor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using Thrift.Protocol;
-
-namespace Thrift
-{
-    public interface TProcessor
-    {
-        bool Process(TProtocol iprot, TProtocol oprot);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/TProcessorFactory.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/TProcessorFactory.cs
deleted file mode 100644
index fdf631b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/TProcessorFactory.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using Thrift.Server;
-using Thrift.Transport;
-
-namespace Thrift
-{
-    public interface TProcessorFactory
-    {
-        TProcessor GetProcessor(TTransport trans, TServer server = null);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/TPrototypeProcessorFactory.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/TPrototypeProcessorFactory.cs
deleted file mode 100644
index 6f56d33..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/TPrototypeProcessorFactory.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Thrift.Server;
-using Thrift.Transport;
-
-namespace Thrift
-{
-    public class TPrototypeProcessorFactory<P, H> : TProcessorFactory where P : TProcessor
-    {
-        object[] handlerArgs = null;
-
-        public TPrototypeProcessorFactory()
-        {
-            handlerArgs = new object[0];
-        }
-
-        public TPrototypeProcessorFactory(params object[] handlerArgs)
-        {
-            this.handlerArgs = handlerArgs;
-        }
-
-        public TProcessor GetProcessor(TTransport trans, TServer server = null)
-        {
-            H handler = (H) Activator.CreateInstance(typeof(H), handlerArgs);
-
-            TControllingHandler handlerServerRef = handler as TControllingHandler;
-            if (handlerServerRef != null)
-            {
-                handlerServerRef.server = server;
-            }
-            return Activator.CreateInstance(typeof(P), new object[] { handler }) as TProcessor;
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/TSingletonProcessorFactory.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/TSingletonProcessorFactory.cs
deleted file mode 100644
index 40dc44c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/TSingletonProcessorFactory.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Thrift.Server;
-using Thrift.Transport;
-
-namespace Thrift
-{
-    public class TSingletonProcessorFactory : TProcessorFactory
-    {
-        private readonly TProcessor processor_;
-
-        public TSingletonProcessorFactory(TProcessor processor)
-        {
-            processor_ = processor;
-        }
-
-        public TProcessor GetProcessor(TTransport trans, TServer server = null)
-        {
-            return processor_;
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.45.csproj b/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.45.csproj
deleted file mode 100644
index 949f373..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.45.csproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{EBCE35DA-CF6A-42BC-A357-A9C09B534299}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Thrift</RootNamespace>
-    <AssemblyName>Thrift45</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Collections\TCollections.cs" />
-    <Compile Include="Collections\THashSet.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Protocol\TAbstractBase.cs" />
-    <Compile Include="Protocol\TBase.cs" />
-    <Compile Include="Protocol\TBase64Utils.cs" />
-    <Compile Include="Protocol\TBinaryProtocol.cs" />
-    <Compile Include="Protocol\TCompactProtocol.cs" />
-    <Compile Include="Protocol\TField.cs" />
-    <Compile Include="Protocol\TJSONProtocol.cs" />
-    <Compile Include="Protocol\TList.cs" />
-    <Compile Include="Protocol\TMap.cs" />
-    <Compile Include="Protocol\TMessage.cs" />
-    <Compile Include="Protocol\TMessageType.cs" />
-    <Compile Include="Protocol\TMultiplexedProcessor.cs" />
-    <Compile Include="Protocol\TMultiplexedProtocol.cs" />
-    <Compile Include="Protocol\TProtocol.cs" />
-    <Compile Include="Protocol\TProtocolDecorator.cs" />
-    <Compile Include="Protocol\TProtocolException.cs" />
-    <Compile Include="Protocol\TProtocolFactory.cs" />
-    <Compile Include="Protocol\TProtocolUtil.cs" />
-    <Compile Include="Protocol\TSet.cs" />
-    <Compile Include="Protocol\TStruct.cs" />
-    <Compile Include="Protocol\TType.cs" />
-    <Compile Include="Server\TServer.cs" />
-    <Compile Include="Server\TServerEventHandler.cs" />
-    <Compile Include="Server\TSimpleServer.cs" />
-    <Compile Include="Server\TThreadedServer.cs" />
-    <Compile Include="Server\TThreadPoolServer.cs" />
-    <Compile Include="TApplicationException.cs" />
-    <Compile Include="TControllingHandler.cs" />
-    <Compile Include="TException.cs" />
-    <Compile Include="TAsyncProcessor.cs" />
-    <Compile Include="TProcessor.cs" />
-    <Compile Include="TProcessorFactory.cs" />
-    <Compile Include="TPrototypeProcessorFactory.cs" />
-    <Compile Include="Transport\TBufferedTransport.cs" />
-    <Compile Include="Transport\TFramedTransport.cs" />
-    <Compile Include="Transport\THttpTaskAsyncHandler.cs" />
-    <Compile Include="Transport\THttpClient.cs" />
-    <Compile Include="Transport\THttpHandler.cs" />
-    <Compile Include="Transport\TMemoryBuffer.cs" />
-    <Compile Include="Transport\TNamedPipeClientTransport.cs" />
-    <Compile Include="Transport\TNamedPipeServerTransport.cs" />
-    <Compile Include="Transport\TServerSocket.cs" />
-    <Compile Include="Transport\TServerTransport.cs" />
-    <Compile Include="Transport\TSilverlightSocket.cs" />
-    <Compile Include="Transport\TSocket.cs" />
-    <Compile Include="Transport\TStreamTransport.cs" />
-    <Compile Include="Transport\TTLSServerSocket.cs" />
-    <Compile Include="Transport\TTLSSocket.cs" />
-    <Compile Include="Transport\TTransport.cs" />
-    <Compile Include="Transport\TTransportException.cs" />
-    <Compile Include="Transport\TTransportFactory.cs" />
-    <Compile Include="TSingletonProcessorFactory.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Server\Collections\" />
-    <Folder Include="Server\Protocol\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.csproj b/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.csproj
deleted file mode 100644
index 99c6b46..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.csproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{499EB63C-D74C-47E8-AE48-A2FC94538E9D}</ProjectGuid>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputType>Library</OutputType>
-    <NoStandardLibraries>false</NoStandardLibraries>
-    <AssemblyName>Thrift</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <RootNamespace>Thrift</RootNamespace>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Web" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Collections\TCollections.cs" />
-    <Compile Include="Collections\THashSet.cs" />
-    <Compile Include="TControllingHandler.cs" />
-    <Compile Include="TProcessorFactory.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Protocol\TAbstractBase.cs" />
-    <Compile Include="Protocol\TBase.cs" />
-    <Compile Include="Protocol\TBase64Utils.cs" />
-    <Compile Include="Protocol\TBinaryProtocol.cs" />
-    <Compile Include="Protocol\TCompactProtocol.cs" />
-    <Compile Include="Protocol\TField.cs" />
-    <Compile Include="Protocol\TJSONProtocol.cs" />
-    <Compile Include="Protocol\TList.cs" />
-    <Compile Include="Protocol\TMap.cs" />
-    <Compile Include="Protocol\TMessage.cs" />
-    <Compile Include="Protocol\TMessageType.cs" />
-    <Compile Include="Protocol\TMultiplexedProcessor.cs" />
-    <Compile Include="Protocol\TMultiplexedProtocol.cs" />
-    <Compile Include="Protocol\TProtocol.cs" />
-    <Compile Include="Protocol\TProtocolDecorator.cs" />
-    <Compile Include="Protocol\TProtocolException.cs" />
-    <Compile Include="Protocol\TProtocolFactory.cs" />
-    <Compile Include="Protocol\TProtocolUtil.cs" />
-    <Compile Include="Protocol\TSet.cs" />
-    <Compile Include="Protocol\TStruct.cs" />
-    <Compile Include="Protocol\TType.cs" />
-    <Compile Include="TPrototypeProcessorFactory.cs" />
-    <Compile Include="TSingletonProcessorFactory.cs" />
-    <Compile Include="Server\TThreadedServer.cs" />
-    <Compile Include="Server\TServer.cs" />
-    <Compile Include="Server\TServerEventHandler.cs" />
-    <Compile Include="Server\TSimpleServer.cs" />
-    <Compile Include="Server\TThreadPoolServer.cs" />
-    <Compile Include="TException.cs" />
-    <Compile Include="TApplicationException.cs" />
-    <Compile Include="TProcessor.cs" />
-    <Compile Include="Transport\TBufferedTransport.cs" />
-    <Compile Include="Transport\TFramedTransport.cs" />
-    <Compile Include="Transport\THttpClient.cs" />
-    <Compile Include="Transport\THttpHandler.cs" />
-    <Compile Include="Transport\TNamedPipeClientTransport.cs" />
-    <Compile Include="Transport\TNamedPipeServerTransport.cs" />
-    <Compile Include="Transport\TServerSocket.cs" />
-    <Compile Include="Transport\TServerTransport.cs" />
-    <Compile Include="Transport\TSocket.cs" />
-    <Compile Include="Transport\TStreamTransport.cs" />
-    <Compile Include="Transport\TTLSServerSocket.cs" />
-    <Compile Include="Transport\TTLSSocket.cs" />
-    <Compile Include="Transport\TTransport.cs" />
-    <Compile Include="Transport\TTransportException.cs" />
-    <Compile Include="Transport\TTransportFactory.cs" />
-    <Compile Include="Transport\TMemoryBuffer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <ProjectExtensions>
-    <VisualStudio AllowExistingFolder="true" />
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.sln b/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.sln
deleted file mode 100644
index a29e468..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Thrift.sln
+++ /dev/null
@@ -1,47 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thrift", "Thrift.csproj", "{499EB63C-D74C-47E8-AE48-A2FC94538E9D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThriftTest", "..\test\ThriftTest\ThriftTest.csproj", "{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThriftMSBuildTask", "..\ThriftMSBuildTask\ThriftMSBuildTask.csproj", "{EC0A0231-66EA-4593-A792-C6CA3BB8668E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thrift.45", "Thrift.45.csproj", "{EBCE35DA-CF6A-42BC-A357-A9C09B534299}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThriftMVCTest", "..\test\ThriftMVCTest\ThriftMVCTest.csproj", "{891B4487-C7BA-427E-BBC8-4C596C229A10}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC0A0231-66EA-4593-A792-C6CA3BB8668E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC0A0231-66EA-4593-A792-C6CA3BB8668E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC0A0231-66EA-4593-A792-C6CA3BB8668E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC0A0231-66EA-4593-A792-C6CA3BB8668E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBCE35DA-CF6A-42BC-A357-A9C09B534299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBCE35DA-CF6A-42BC-A357-A9C09B534299}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBCE35DA-CF6A-42BC-A357-A9C09B534299}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBCE35DA-CF6A-42BC-A357-A9C09B534299}.Release|Any CPU.Build.0 = Release|Any CPU
-		{891B4487-C7BA-427E-BBC8-4C596C229A10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{891B4487-C7BA-427E-BBC8-4C596C229A10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{891B4487-C7BA-427E-BBC8-4C596C229A10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{891B4487-C7BA-427E-BBC8-4C596C229A10}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		        StartupItem = Thrift.csproj
-	EndGlobalSection
-EndGlobal
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TBufferedTransport.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TBufferedTransport.cs
deleted file mode 100644
index caedd87..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TBufferedTransport.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.IO;
-
-namespace Thrift.Transport
-{
-    public class TBufferedTransport : TTransport, IDisposable
-    {
-        private readonly int bufSize;
-        private readonly MemoryStream inputBuffer = new MemoryStream(0);
-        private readonly MemoryStream outputBuffer = new MemoryStream(0);
-        private readonly TTransport transport;
-
-        public TBufferedTransport(TTransport transport, int bufSize = 1024)
-        {
-            if (transport == null)
-                throw new ArgumentNullException("transport");
-            if (bufSize <= 0)
-                throw new ArgumentException("bufSize", "Buffer size must be a positive number.");
-            this.transport = transport;
-            this.bufSize = bufSize;
-        }
-
-        public TTransport UnderlyingTransport
-        {
-            get
-            {
-                CheckNotDisposed();
-                return transport;
-            }
-        }
-
-        public override bool IsOpen
-        {
-            get
-            {
-                // We can legitimately throw here but be nice a bit.
-                // CheckNotDisposed();
-                return !_IsDisposed && transport.IsOpen;
-            }
-        }
-
-        public override void Open()
-        {
-            CheckNotDisposed();
-            transport.Open();
-        }
-
-        public override void Close()
-        {
-            CheckNotDisposed();
-            transport.Close();
-        }
-
-        public override int Read(byte[] buf, int off, int len)
-        {
-            CheckNotDisposed();
-            ValidateBufferArgs(buf, off, len);
-            if (!IsOpen)
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-            if (inputBuffer.Capacity < bufSize)
-                inputBuffer.Capacity = bufSize;
-            int got = inputBuffer.Read(buf, off, len);
-            if (got > 0)
-                return got;
-
-            inputBuffer.Seek(0, SeekOrigin.Begin);
-            inputBuffer.SetLength(inputBuffer.Capacity);
-            int filled = transport.Read(inputBuffer.GetBuffer(), 0, (int)inputBuffer.Length);
-            inputBuffer.SetLength(filled);
-            if (filled == 0)
-                return 0;
-            return Read(buf, off, len);
-        }
-
-        public override void Write(byte[] buf, int off, int len)
-        {
-            CheckNotDisposed();
-            ValidateBufferArgs(buf, off, len);
-            if (!IsOpen)
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-            // Relative offset from "off" argument
-            int offset = 0;
-            if (outputBuffer.Length > 0)
-            {
-                int capa = (int)(outputBuffer.Capacity - outputBuffer.Length);
-                int writeSize = capa <= len ? capa : len;
-                outputBuffer.Write(buf, off, writeSize);
-                offset += writeSize;
-                if (writeSize == capa)
-                {
-                    transport.Write(outputBuffer.GetBuffer(), 0, (int)outputBuffer.Length);
-                    outputBuffer.SetLength(0);
-                }
-            }
-            while (len - offset >= bufSize)
-            {
-                transport.Write(buf, off + offset, bufSize);
-                offset += bufSize;
-            }
-            int remain = len - offset;
-            if (remain > 0)
-            {
-                if (outputBuffer.Capacity < bufSize)
-                    outputBuffer.Capacity = bufSize;
-                outputBuffer.Write(buf, off + offset, remain);
-            }
-        }
-
-        public override void Flush()
-        {
-            CheckNotDisposed();
-            if (!IsOpen)
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-            if (outputBuffer.Length > 0)
-            {
-                transport.Write(outputBuffer.GetBuffer(), 0, (int)outputBuffer.Length);
-                outputBuffer.SetLength(0);
-            }
-            transport.Flush();
-        }
-
-        private void CheckNotDisposed()
-        {
-            if (_IsDisposed)
-                throw new ObjectDisposedException("TBufferedTransport");
-        }
-
-        #region " IDisposable Support "
-        private bool _IsDisposed;
-
-        // IDisposable
-        protected override void Dispose(bool disposing)
-        {
-            if (!_IsDisposed)
-            {
-                if (disposing)
-                {
-                    inputBuffer.Dispose();
-                    outputBuffer.Dispose();
-                }
-            }
-            _IsDisposed = true;
-        }
-        #endregion
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TFramedTransport.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TFramedTransport.cs
deleted file mode 100644
index a369e8e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TFramedTransport.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-using System;
-using System.IO;
-
-namespace Thrift.Transport
-{
-    public class TFramedTransport : TTransport, IDisposable
-    {
-        private readonly TTransport transport;
-        private readonly MemoryStream writeBuffer = new MemoryStream(1024);
-        private readonly MemoryStream readBuffer = new MemoryStream(1024);
-
-        private const int HeaderSize = 4;
-        private readonly byte[] headerBuf = new byte[HeaderSize];
-
-        public class Factory : TTransportFactory
-        {
-            public override TTransport GetTransport(TTransport trans)
-            {
-                return new TFramedTransport(trans);
-            }
-        }
-
-        public TFramedTransport(TTransport transport)
-        {
-            if (transport == null)
-                throw new ArgumentNullException("transport");
-            this.transport = transport;
-            InitWriteBuffer();
-        }
-
-        public override void Open()
-        {
-            CheckNotDisposed();
-            transport.Open();
-        }
-
-        public override bool IsOpen
-        {
-            get
-            {
-                // We can legitimately throw here but be nice a bit.
-                // CheckNotDisposed();
-                return !_IsDisposed && transport.IsOpen;
-            }
-        }
-
-        public override void Close()
-        {
-            CheckNotDisposed();
-            transport.Close();
-        }
-
-        public override int Read(byte[] buf, int off, int len)
-        {
-            CheckNotDisposed();
-            ValidateBufferArgs(buf, off, len);
-            if (!IsOpen)
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-            int got = readBuffer.Read(buf, off, len);
-            if (got > 0)
-            {
-                return got;
-            }
-
-            // Read another frame of data
-            ReadFrame();
-
-            return readBuffer.Read(buf, off, len);
-        }
-
-        private void ReadFrame()
-        {
-            transport.ReadAll(headerBuf, 0, HeaderSize);
-            int size = DecodeFrameSize(headerBuf);
-
-            readBuffer.SetLength(size);
-            readBuffer.Seek(0, SeekOrigin.Begin);
-            byte[] buff = readBuffer.GetBuffer();
-            transport.ReadAll(buff, 0, size);
-        }
-
-        public override void Write(byte[] buf, int off, int len)
-        {
-            CheckNotDisposed();
-            ValidateBufferArgs(buf, off, len);
-            if (!IsOpen)
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-            if (writeBuffer.Length + (long)len > (long)int.MaxValue)
-                Flush();
-            writeBuffer.Write(buf, off, len);
-        }
-
-        public override void Flush()
-        {
-            CheckNotDisposed();
-            if (!IsOpen)
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-            byte[] buf = writeBuffer.GetBuffer();
-            int len = (int)writeBuffer.Length;
-            int data_len = len - HeaderSize;
-            if ( data_len < 0 )
-                throw new System.InvalidOperationException (); // logic error actually
-
-            // Inject message header into the reserved buffer space
-            EncodeFrameSize(data_len, buf);
-
-            // Send the entire message at once
-            transport.Write(buf, 0, len);
-
-            InitWriteBuffer();
-
-            transport.Flush();
-        }
-
-        private void InitWriteBuffer ()
-        {
-            // Reserve space for message header to be put right before sending it out
-            writeBuffer.SetLength(HeaderSize);
-            writeBuffer.Seek(0, SeekOrigin.End);
-        }
-
-        private static void EncodeFrameSize(int frameSize, byte[] buf)
-        {
-            buf[0] = (byte)(0xff & (frameSize >> 24));
-            buf[1] = (byte)(0xff & (frameSize >> 16));
-            buf[2] = (byte)(0xff & (frameSize >> 8));
-            buf[3] = (byte)(0xff & (frameSize));
-        }
-
-        private static int DecodeFrameSize(byte[] buf)
-        {
-            return
-                ((buf[0] & 0xff) << 24) |
-                ((buf[1] & 0xff) << 16) |
-                ((buf[2] & 0xff) <<  8) |
-                ((buf[3] & 0xff));
-        }
-
-
-        private void CheckNotDisposed()
-        {
-            if (_IsDisposed)
-                throw new ObjectDisposedException("TFramedTransport");
-        }
-
-        #region " IDisposable Support "
-        private bool _IsDisposed;
-
-        // IDisposable
-        protected override void Dispose(bool disposing)
-        {
-            if (!_IsDisposed)
-            {
-                if (disposing)
-                {
-                    readBuffer.Dispose();
-                    writeBuffer.Dispose();
-                }
-            }
-            _IsDisposed = true;
-        }
-        #endregion
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpClient.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpClient.cs
deleted file mode 100644
index a56a3e8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpClient.cs
+++ /dev/null
@@ -1,430 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *
- */
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Threading;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-
-namespace Thrift.Transport
-{
-
-    public class THttpClient : TTransport, IDisposable
-    {
-        private readonly Uri uri;
-        private readonly X509Certificate[] certificates;
-        private Stream inputStream;
-        private MemoryStream outputStream = new MemoryStream();
-
-        // Timeouts in milliseconds
-        private int connectTimeout = 30000;
-
-        private int readTimeout = 30000;
-
-        private IDictionary<String, String> customHeaders = new Dictionary<string, string>();
-
-#if !SILVERLIGHT
-        private IWebProxy proxy = WebRequest.DefaultWebProxy;
-#endif
-
-        public THttpClient(Uri u)
-            : this(u, Enumerable.Empty<X509Certificate>())
-        {
-        }
-
-        public THttpClient(Uri u, IEnumerable<X509Certificate> certificates)
-        {
-            uri = u;
-            this.certificates = (certificates ?? Enumerable.Empty<X509Certificate>()).ToArray();
-        }
-
-        public int ConnectTimeout
-        {
-            set
-            {
-               connectTimeout = value;
-            }
-        }
-
-        public int ReadTimeout
-        {
-            set
-            {
-                readTimeout = value;
-            }
-        }
-
-        public IDictionary<String, String> CustomHeaders
-        {
-            get
-            {
-                return customHeaders;
-            }
-        }
-
-#if !SILVERLIGHT
-        public IWebProxy Proxy
-        {
-            set
-            {
-                proxy = value;
-            }
-        }
-#endif
-
-        public override bool IsOpen
-        {
-            get
-            {
-                return true;
-            }
-        }
-
-        public override void Open()
-        {
-        }
-
-        public override void Close()
-        {
-            if (inputStream != null)
-            {
-                inputStream.Close();
-                inputStream = null;
-            }
-            if (outputStream != null)
-            {
-                outputStream.Close();
-                outputStream = null;
-            }
-        }
-
-        public override int Read(byte[] buf, int off, int len)
-        {
-            if (inputStream == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "No request has been sent");
-            }
-
-            try
-            {
-                int ret = inputStream.Read(buf, off, len);
-
-                if (ret == -1)
-                {
-                    throw new TTransportException(TTransportException.ExceptionType.EndOfFile, "No more data available");
-                }
-
-                return ret;
-            }
-            catch (IOException iox)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.Unknown, iox.ToString());
-            }
-        }
-
-        public override void Write(byte[] buf, int off, int len)
-        {
-            outputStream.Write(buf, off, len);
-        }
-
-#if !SILVERLIGHT
-        public override void Flush()
-        {
-            try
-            {
-                SendRequest();
-            }
-            finally
-            {
-                outputStream = new MemoryStream();
-            }
-        }
-
-        private void SendRequest()
-        {
-            try
-            {
-                HttpWebRequest connection = CreateRequest();
-
-                byte[] data = outputStream.ToArray();
-                connection.ContentLength = data.Length;
-
-                using (Stream requestStream = connection.GetRequestStream())
-                {
-                    requestStream.Write(data, 0, data.Length);
-
-                    // Resolve HTTP hang that can happens after successive calls by making sure
-                    // that we release the response and response stream. To support this, we copy
-                    // the response to a memory stream.
-                    using (var response = connection.GetResponse())
-                    {
-                        using (var responseStream = response.GetResponseStream())
-                        {
-                            // Copy the response to a memory stream so that we can
-                            // cleanly close the response and response stream.
-                            inputStream = new MemoryStream();
-                            byte[] buffer = new byte[8096];
-                            int bytesRead;
-                            while ((bytesRead = responseStream.Read(buffer, 0, buffer.Length)) > 0)
-                            {
-                                inputStream.Write (buffer, 0, bytesRead);
-                            }
-                            inputStream.Seek(0, 0);
-                        }
-                    }
-                }
-            }
-            catch (IOException iox)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.Unknown, iox.ToString());
-            }
-            catch (WebException wx)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.Unknown, "Couldn't connect to server: " + wx);
-            }
-        }
-#endif
-        private HttpWebRequest CreateRequest()
-        {
-            HttpWebRequest connection = (HttpWebRequest)WebRequest.Create(uri);
-
-
-#if !SILVERLIGHT
-            // Adding certificates through code is not supported with WP7 Silverlight
-            // see "Windows Phone 7 and Certificates_FINAL_121610.pdf"
-            connection.ClientCertificates.AddRange(certificates);
-
-            if (connectTimeout > 0)
-            {
-                connection.Timeout = connectTimeout;
-            }
-            if (readTimeout > 0)
-            {
-                connection.ReadWriteTimeout = readTimeout;
-            }
-#endif
-            // Make the request
-            connection.ContentType = "application/x-thrift";
-            connection.Accept = "application/x-thrift";
-            connection.UserAgent = "C#/THttpClient";
-            connection.Method = "POST";
-#if !SILVERLIGHT
-            connection.ProtocolVersion = HttpVersion.Version10;
-#endif
-
-            //add custom headers here
-            foreach (KeyValuePair<string, string> item in customHeaders)
-            {
-#if !SILVERLIGHT
-                connection.Headers.Add(item.Key, item.Value);
-#else
-                connection.Headers[item.Key] = item.Value;
-#endif
-            }
-
-#if !SILVERLIGHT
-            connection.Proxy = proxy;
-#endif
-
-            return connection;
-        }
-
-        public override IAsyncResult BeginFlush(AsyncCallback callback, object state)
-        {
-            // Extract request and reset buffer
-            var data = outputStream.ToArray();
-
-            //requestBuffer_ = new MemoryStream();
-
-            try
-            {
-                // Create connection object
-                var flushAsyncResult = new FlushAsyncResult(callback, state);
-                flushAsyncResult.Connection = CreateRequest();
-
-                flushAsyncResult.Data = data;
-
-
-                flushAsyncResult.Connection.BeginGetRequestStream(GetRequestStreamCallback, flushAsyncResult);
-                return flushAsyncResult;
-
-            }
-            catch (IOException iox)
-            {
-                throw new TTransportException(iox.ToString());
-            }
-        }
-
-        public override void EndFlush(IAsyncResult asyncResult)
-        {
-            try
-            {
-                var flushAsyncResult = (FlushAsyncResult) asyncResult;
-
-                if (!flushAsyncResult.IsCompleted)
-                {
-                    var waitHandle = flushAsyncResult.AsyncWaitHandle;
-                    waitHandle.WaitOne();  // blocking INFINITEly
-                    waitHandle.Close();
-                }
-
-                if (flushAsyncResult.AsyncException != null)
-                {
-                    throw flushAsyncResult.AsyncException;
-                }
-            } finally
-            {
-                outputStream = new MemoryStream();
-            }
-
-        }
-
-        private void GetRequestStreamCallback(IAsyncResult asynchronousResult)
-        {
-            var flushAsyncResult = (FlushAsyncResult)asynchronousResult.AsyncState;
-            try
-            {
-                var reqStream = flushAsyncResult.Connection.EndGetRequestStream(asynchronousResult);
-                reqStream.Write(flushAsyncResult.Data, 0, flushAsyncResult.Data.Length);
-                reqStream.Flush();
-                reqStream.Close();
-
-                // Start the asynchronous operation to get the response
-                flushAsyncResult.Connection.BeginGetResponse(GetResponseCallback, flushAsyncResult);
-            }
-            catch (Exception exception)
-            {
-                flushAsyncResult.AsyncException = new TTransportException(exception.ToString());
-                flushAsyncResult.UpdateStatusToComplete();
-                flushAsyncResult.NotifyCallbackWhenAvailable();
-            }
-        }
-
-        private void GetResponseCallback(IAsyncResult asynchronousResult)
-        {
-            var flushAsyncResult = (FlushAsyncResult)asynchronousResult.AsyncState;
-            try
-            {
-                inputStream = flushAsyncResult.Connection.EndGetResponse(asynchronousResult).GetResponseStream();
-            }
-            catch (Exception exception)
-            {
-                flushAsyncResult.AsyncException = new TTransportException(exception.ToString());
-            }
-            flushAsyncResult.UpdateStatusToComplete();
-            flushAsyncResult.NotifyCallbackWhenAvailable();
-        }
-
-        // Based on http://msmvps.com/blogs/luisabreu/archive/2009/06/15/multithreading-implementing-the-iasyncresult-interface.aspx
-        class FlushAsyncResult : IAsyncResult
-        {
-            private volatile Boolean _isCompleted;
-            private ManualResetEvent _evt;
-            private readonly AsyncCallback _cbMethod;
-            private readonly Object _state;
-
-            public FlushAsyncResult(AsyncCallback cbMethod, Object state)
-            {
-                _cbMethod = cbMethod;
-                _state = state;
-            }
-
-            internal byte[] Data { get; set; }
-            internal HttpWebRequest Connection { get; set; }
-            internal TTransportException AsyncException { get; set; }
-
-            public object AsyncState
-            {
-                get { return _state; }
-            }
-            public WaitHandle AsyncWaitHandle
-            {
-                get { return GetEvtHandle(); }
-            }
-            public bool CompletedSynchronously
-            {
-                get { return false; }
-            }
-            public bool IsCompleted
-            {
-                get { return _isCompleted; }
-            }
-            private readonly Object _locker = new Object();
-            private ManualResetEvent GetEvtHandle()
-            {
-                lock (_locker)
-                {
-                    if (_evt == null)
-                    {
-                        _evt = new ManualResetEvent(false);
-                    }
-                    if (_isCompleted)
-                    {
-                        _evt.Set();
-                    }
-                }
-                return _evt;
-            }
-            internal void UpdateStatusToComplete()
-            {
-                _isCompleted = true; //1. set _iscompleted to true
-                lock (_locker)
-                {
-                    if (_evt != null)
-                    {
-                        _evt.Set(); //2. set the event, when it exists
-                    }
-                }
-            }
-
-            internal void NotifyCallbackWhenAvailable()
-            {
-                if (_cbMethod != null)
-                {
-                    _cbMethod(this);
-                }
-            }
-        }
-
-#region " IDisposable Support "
-        private bool _IsDisposed;
-
-        // IDisposable
-        protected override void Dispose(bool disposing)
-        {
-            if (!_IsDisposed)
-            {
-                if (disposing)
-                {
-                    if (inputStream != null)
-                        inputStream.Dispose();
-                    if (outputStream != null)
-                        outputStream.Dispose();
-                }
-            }
-            _IsDisposed = true;
-        }
-#endregion
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpHandler.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpHandler.cs
deleted file mode 100644
index 4115ef9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpHandler.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *
- */
-
-using System;
-using System.Web;
-using System.Net;
-using System.IO;
-
-using Thrift.Protocol;
-
-namespace Thrift.Transport
-{
-    public class THttpHandler : IHttpHandler
-    {
-        protected TProcessor processor;
-
-        protected TProtocolFactory inputProtocolFactory;
-        protected TProtocolFactory outputProtocolFactory;
-
-        protected const string contentType = "application/x-thrift";
-        protected System.Text.Encoding encoding = System.Text.Encoding.UTF8;
-
-        public THttpHandler(TProcessor processor)
-            : this(processor, new TBinaryProtocol.Factory())
-        {
-
-        }
-
-        public THttpHandler(TProcessor processor, TProtocolFactory protocolFactory)
-            : this(processor, protocolFactory, protocolFactory)
-        {
-
-        }
-
-        public THttpHandler(TProcessor processor, TProtocolFactory inputProtocolFactory, TProtocolFactory outputProtocolFactory)
-        {
-            this.processor = processor;
-            this.inputProtocolFactory = inputProtocolFactory;
-            this.outputProtocolFactory = outputProtocolFactory;
-        }
-
-        public void ProcessRequest(HttpListenerContext context)
-        {
-            context.Response.ContentType = contentType;
-            context.Response.ContentEncoding = encoding;
-            ProcessRequest(context.Request.InputStream, context.Response.OutputStream);
-        }
-
-        public void ProcessRequest(HttpContext context)
-        {
-            context.Response.ContentType = contentType;
-            context.Response.ContentEncoding = encoding;
-            ProcessRequest(context.Request.InputStream, context.Response.OutputStream);
-        }
-
-        public void ProcessRequest(Stream input, Stream output)
-        {
-            TTransport transport = new TStreamTransport(input,output);
-
-            try
-            {
-                var inputProtocol = inputProtocolFactory.GetProtocol(transport);
-                var outputProtocol = outputProtocolFactory.GetProtocol(transport);
-
-                while (processor.Process(inputProtocol, outputProtocol))
-                {
-                }
-            }
-            catch (TTransportException)
-            {
-                // Client died, just move on
-            }
-            finally
-            {
-                transport.Close();
-            }
-        }
-
-        public bool IsReusable
-        {
-            get { return true; }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpTaskAsyncHandler.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpTaskAsyncHandler.cs
deleted file mode 100644
index e491f32..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/THttpTaskAsyncHandler.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System.Threading.Tasks;
-using System.Web;
-using Thrift.Protocol;
-
-namespace Thrift.Transport
-{
-    /// <summary>
-    /// An async task based HTTP handler for processing thrift services.
-    /// </summary>
-    public class THttpTaskAsyncHandler : HttpTaskAsyncHandler
-    {
-        private readonly TAsyncProcessor _processor;
-        private readonly TProtocolFactory _inputProtocolFactory;
-        private readonly TProtocolFactory _outputProtocolFactory;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="THttpTaskAsyncHandler"/> class
-        /// using the <see cref="TBinaryProtocol.Factory"/> for both input and output streams.
-        /// </summary>
-        /// <param name="processor">The async processor implementation.</param>
-        public THttpTaskAsyncHandler(TAsyncProcessor processor)
-            : this(processor, new TBinaryProtocol.Factory())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="THttpTaskAsyncHandler"/> class
-        /// using <paramref name="protocolFactory"/> for both input and output streams.
-        /// </summary>
-        /// <param name="processor">The async processor implementation.</param>
-        /// <param name="protocolFactory">The protocol factory.</param>
-        public THttpTaskAsyncHandler(TAsyncProcessor processor, TProtocolFactory protocolFactory)
-            : this(processor, protocolFactory, protocolFactory)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="THttpTaskAsyncHandler"/> class.
-        /// </summary>
-        /// <param name="processor">The async processor implementation.</param>
-        /// <param name="inputProtocolFactory">The input protocol factory.</param>
-        /// <param name="outputProtocolFactory">The output protocol factory.</param>
-        public THttpTaskAsyncHandler(TAsyncProcessor processor, TProtocolFactory inputProtocolFactory,
-            TProtocolFactory outputProtocolFactory)
-        {
-            _processor = processor;
-            _inputProtocolFactory = inputProtocolFactory;
-            _outputProtocolFactory = outputProtocolFactory;
-        }
-
-        public override async Task ProcessRequestAsync(HttpContext context)
-        {
-            var transport = new TStreamTransport(context.Request.InputStream, context.Response.OutputStream);
-
-            try
-            {
-                var input = _inputProtocolFactory.GetProtocol(transport);
-                var output = _outputProtocolFactory.GetProtocol(transport);
-
-                while (await _processor.ProcessAsync(input, output))
-                {
-                }
-            }
-            catch (TTransportException)
-            {
-                // Client died, just move on
-            }
-            finally
-            {
-                transport.Close();
-            }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TMemoryBuffer.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TMemoryBuffer.cs
deleted file mode 100644
index d8ff9dc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TMemoryBuffer.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.IO;
-using System.Reflection;
-using Thrift.Protocol;
-
-namespace Thrift.Transport {
-    public class TMemoryBuffer : TTransport {
-
-        private readonly MemoryStream byteStream;
-
-        public TMemoryBuffer() {
-            byteStream = new MemoryStream();
-        }
-
-        public TMemoryBuffer(byte[] buf) {
-            byteStream = new MemoryStream(buf);
-        }
-
-        public override void Open() {
-            /** do nothing **/
-        }
-
-        public override void Close() {
-            /** do nothing **/
-        }
-
-        public override int Read(byte[] buf, int off, int len) {
-            return byteStream.Read(buf, off, len);
-        }
-
-        public override void Write(byte[] buf, int off, int len) {
-            byteStream.Write(buf, off, len);
-        }
-
-        public byte[] GetBuffer() {
-            return byteStream.ToArray();
-        }
-
-
-        public override bool IsOpen {
-            get { return true; }
-        }
-
-        public static byte[] Serialize(TAbstractBase s) {
-            var t = new TMemoryBuffer();
-            var p = new TBinaryProtocol(t);
-
-            s.Write(p);
-
-            return t.GetBuffer();
-        }
-
-        public static T DeSerialize<T>(byte[] buf) where T : TAbstractBase {
-            var trans = new TMemoryBuffer(buf);
-            var p = new TBinaryProtocol(trans);
-            if (typeof (TBase).IsAssignableFrom(typeof (T))) {
-                var method = typeof (T).GetMethod("Read", BindingFlags.Instance | BindingFlags.Public);
-                var t = Activator.CreateInstance<T>();
-                method.Invoke(t, new object[] {p});
-                return t;
-             } else {
-                   var method = typeof (T).GetMethod("Read", BindingFlags.Static | BindingFlags.Public);
-                return (T) method.Invoke(null, new object[] {p});
-            }
-        }
-
-        private bool _IsDisposed;
-
-        // IDisposable
-        protected override void Dispose(bool disposing) {
-            if (!_IsDisposed) {
-                if (disposing) {
-                    if (byteStream != null)
-                        byteStream.Dispose();
-                }
-            }
-            _IsDisposed = true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TNamedPipeClientTransport.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TNamedPipeClientTransport.cs
deleted file mode 100644
index 9faa6e7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TNamedPipeClientTransport.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System.IO.Pipes;
-
-namespace Thrift.Transport
-{
-    public class TNamedPipeClientTransport : TTransport
-    {
-        private NamedPipeClientStream client;
-        private string ServerName;
-        private string PipeName;
-
-        public TNamedPipeClientTransport(string pipe)
-        {
-            ServerName = ".";
-            PipeName = pipe;
-        }
-
-        public TNamedPipeClientTransport(string server, string pipe)
-        {
-            ServerName = (server != "") ? server : ".";
-            PipeName = pipe;
-        }
-
-        public override bool IsOpen
-        {
-            get { return client != null && client.IsConnected; }
-        }
-
-        public override void Open()
-        {
-            if (IsOpen)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.AlreadyOpen);
-            }
-            client = new NamedPipeClientStream(ServerName, PipeName, PipeDirection.InOut, PipeOptions.None);
-            client.Connect();
-        }
-
-        public override void Close()
-        {
-            if (client != null)
-            {
-                client.Close();
-                client = null;
-            }
-        }
-
-        public override int Read(byte[] buf, int off, int len)
-        {
-            if (client == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-            }
-
-            return client.Read(buf, off, len);
-        }
-
-        public override void Write(byte[] buf, int off, int len)
-        {
-            if (client == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-            }
-
-            client.Write(buf, off, len);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            client.Dispose();
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TNamedPipeServerTransport.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TNamedPipeServerTransport.cs
deleted file mode 100644
index c1e8400..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TNamedPipeServerTransport.cs
+++ /dev/null
@@ -1,276 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Collections.Generic;
-using System.IO.Pipes;
-using System.Threading;
-
-namespace Thrift.Transport
-{
-    public class TNamedPipeServerTransport : TServerTransport
-    {
-        /// <summary>
-        /// This is the address of the Pipe on the localhost.
-        /// </summary>
-        private readonly string pipeAddress;
-        private NamedPipeServerStream stream = null;
-        private bool asyncMode = true;
-
-        public TNamedPipeServerTransport(string pipeAddress)
-        {
-            this.pipeAddress = pipeAddress;
-        }
-
-        public override void Listen()
-        {
-            // nothing to do here
-        }
-
-        public override void Close()
-        {
-            if (stream != null)
-            {
-                try
-                {
-                    stream.Close();
-                    stream.Dispose();
-                }
-                finally
-                {
-                    stream = null;
-                }
-            }
-        }
-
-        private void EnsurePipeInstance()
-        {
-            if (stream == null)
-            {
-                var direction = PipeDirection.InOut;
-                var maxconn = 254;
-                var mode = PipeTransmissionMode.Byte;
-                var options = asyncMode ? PipeOptions.Asynchronous : PipeOptions.None;
-                var inbuf = 4096;
-                var outbuf = 4096;
-                // TODO: security
-
-                try
-                {
-                    stream = new NamedPipeServerStream(pipeAddress, direction, maxconn, mode, options, inbuf, outbuf);
-                }
-                catch (NotImplementedException)  // Mono still does not support async, fallback to sync
-                {
-                    if (asyncMode)
-                    {
-                        options &= (~PipeOptions.Asynchronous);
-                        stream = new NamedPipeServerStream(pipeAddress, direction, maxconn, mode, options, inbuf, outbuf);
-                        asyncMode = false;
-                    }
-                    else
-                    {
-                        throw;
-                    }
-                }
-
-            }
-        }
-
-        protected override TTransport AcceptImpl()
-        {
-            try
-            {
-                EnsurePipeInstance();
-
-                if (asyncMode)
-                {
-                    var evt = new ManualResetEvent(false);
-                    Exception eOuter = null;
-
-                    stream.BeginWaitForConnection(asyncResult =>
-                    {
-                        try
-                        {
-                            if (stream != null)
-                                stream.EndWaitForConnection(asyncResult);
-                            else
-                                eOuter = new TTransportException(TTransportException.ExceptionType.Interrupted);
-                        }
-                        catch (Exception e)
-                        {
-                            if (stream != null)
-                                eOuter = e;
-                            else
-                                eOuter = new TTransportException(TTransportException.ExceptionType.Interrupted, e.Message);
-                        }
-                        evt.Set();
-                    }, null);
-
-                    evt.WaitOne();
-
-                    if (eOuter != null)
-                        throw eOuter; // rethrow exception
-                }
-                else
-                {
-                    stream.WaitForConnection();
-                }
-
-                var trans = new ServerTransport(stream,asyncMode);
-                stream = null;  // pass ownership to ServerTransport
-                return trans;
-            }
-            catch (TTransportException)
-            {
-                Close();
-                throw;
-            }
-            catch (Exception e)
-            {
-                Close();
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, e.Message);
-            }
-        }
-
-        private class ServerTransport : TTransport
-        {
-            private NamedPipeServerStream stream;
-            private bool asyncMode;
-
-            public ServerTransport(NamedPipeServerStream stream, bool asyncMode)
-            {
-                this.stream = stream;
-                this.asyncMode = asyncMode;
-            }
-
-            public override bool IsOpen
-            {
-                get { return stream != null && stream.IsConnected; }
-            }
-
-            public override void Open()
-            {
-            }
-
-            public override void Close()
-            {
-                if (stream != null)
-                    stream.Close();
-            }
-
-            public override int Read(byte[] buf, int off, int len)
-            {
-                if (stream == null)
-                {
-                    throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-                }
-
-                if (asyncMode)
-                {
-                    Exception eOuter = null;
-                    var evt = new ManualResetEvent(false);
-                    int retval = 0;
-
-                    stream.BeginRead(buf, off, len, asyncResult =>
-                    {
-                        try
-                        {
-                            if (stream != null)
-                                retval = stream.EndRead(asyncResult);
-                            else
-                                eOuter = new TTransportException(TTransportException.ExceptionType.Interrupted);
-                        }
-                        catch (Exception e)
-                        {
-                            if (stream != null)
-                                eOuter = e;
-                            else
-                                eOuter = new TTransportException(TTransportException.ExceptionType.Interrupted, e.Message);
-                        }
-                        evt.Set();
-                    }, null);
-
-                    evt.WaitOne();
-
-                    if (eOuter != null)
-                        throw eOuter; // rethrow exception
-                    else
-                        return retval;
-                }
-                else
-                {
-                    return stream.Read(buf, off, len);
-                }
-            }
-
-            public override void Write(byte[] buf, int off, int len)
-            {
-                if (stream == null)
-                {
-                    throw new TTransportException(TTransportException.ExceptionType.NotOpen);
-                }
-
-                if (asyncMode)
-                {
-                    Exception eOuter = null;
-                    var evt = new ManualResetEvent(false);
-
-                    stream.BeginWrite(buf, off, len, asyncResult =>
-                    {
-                        try
-                        {
-                            if (stream != null)
-                                stream.EndWrite(asyncResult);
-                            else
-                                eOuter = new TTransportException(TTransportException.ExceptionType.Interrupted);
-                        }
-                        catch (Exception e)
-                        {
-                            if (stream != null)
-                                eOuter = e;
-                            else
-                                eOuter = new TTransportException(TTransportException.ExceptionType.Interrupted, e.Message);
-                        }
-                        evt.Set();
-                    }, null);
-
-                    evt.WaitOne();
-
-                    if (eOuter != null)
-                        throw eOuter; // rethrow exception
-                }
-                else
-                {
-                    stream.Write(buf, off, len);
-                }
-
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-                if (stream != null)
-                    stream.Dispose();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TServerSocket.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TServerSocket.cs
deleted file mode 100644
index 82a367c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TServerSocket.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Net.Sockets;
-
-
-namespace Thrift.Transport
-{
-    public class TServerSocket : TServerTransport
-    {
-        /**
-        * Underlying server with socket
-        */
-        private TcpListener server = null;
-
-        /**
-         * Port to listen on
-         */
-        private int port = 0;
-
-        /**
-         * Timeout for client sockets from accept
-         */
-        private int clientTimeout = 0;
-
-        /**
-         * Whether or not to wrap new TSocket connections in buffers
-         */
-        private bool useBufferedSockets = false;
-
-        /**
-         * Creates a server socket from underlying socket object
-         */
-        public TServerSocket(TcpListener listener)
-            :this(listener, 0)
-        {
-        }
-
-        /**
-         * Creates a server socket from underlying socket object
-         */
-        public TServerSocket(TcpListener listener, int clientTimeout)
-        {
-            this.server = listener;
-            this.clientTimeout = clientTimeout;
-        }
-
-        /**
-         * Creates just a port listening server socket
-         */
-        public TServerSocket(int port)
-            : this(port, 0)
-        {
-        }
-
-        /**
-         * Creates just a port listening server socket
-         */
-        public TServerSocket(int port, int clientTimeout)
-            :this(port, clientTimeout, false)
-        {
-        }
-
-        public TServerSocket(int port, int clientTimeout, bool useBufferedSockets)
-        {
-            this.port = port;
-            this.clientTimeout = clientTimeout;
-            this.useBufferedSockets = useBufferedSockets;
-            try
-            {
-                // Make server socket
-                server = new TcpListener(System.Net.IPAddress.Any, this.port);
-                server.Server.NoDelay = true;
-            }
-            catch (Exception)
-            {
-                server = null;
-                throw new TTransportException("Could not create ServerSocket on port " + port + ".");
-            }
-        }
-
-        public override void Listen()
-        {
-            // Make sure not to block on accept
-            if (server != null)
-            {
-                try
-                {
-                    server.Start();
-                }
-                catch (SocketException sx)
-                {
-                    throw new TTransportException("Could not accept on listening socket: " + sx.Message);
-                }
-            }
-        }
-
-        protected override TTransport AcceptImpl()
-        {
-            if (server == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "No underlying server socket.");
-            }
-            try
-            {
-                TSocket result2 = null;
-                TcpClient result = server.AcceptTcpClient();
-                try
-                {
-                    result2 = new TSocket(result);
-                    result2.Timeout = clientTimeout;
-                    if (useBufferedSockets)
-                    {
-                        TBufferedTransport result3 = new TBufferedTransport(result2);
-                        return result3;
-                    }
-                    else
-                    {
-                        return result2;
-                    }
-                }
-                catch (System.Exception)
-                {
-                    // If a TSocket was successfully created, then let
-                    // it do proper cleanup of the TcpClient object.
-                    if (result2 != null)
-                        result2.Dispose();
-                    else //  Otherwise, clean it up ourselves.
-                        ((IDisposable)result).Dispose();
-                    throw;
-                }
-            }
-            catch (Exception ex)
-            {
-                throw new TTransportException(ex.ToString());
-            }
-        }
-
-        public override void Close()
-        {
-            if (server != null)
-            {
-                try
-                {
-                    server.Stop();
-                }
-                catch (Exception ex)
-                {
-                    throw new TTransportException("WARNING: Could not close server socket: " + ex);
-                }
-                server = null;
-            }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TServerTransport.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TServerTransport.cs
deleted file mode 100644
index 05d7d0f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TServerTransport.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-
-namespace Thrift.Transport
-{
-    public abstract class TServerTransport
-    {
-        public abstract void Listen();
-        public abstract void Close();
-        protected abstract TTransport AcceptImpl();
-
-        public TTransport Accept()
-        {
-            TTransport transport = AcceptImpl();
-            if (transport == null) {
-              throw new TTransportException("accept() may not return NULL");
-            }
-            return transport;
-         }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TSilverlightSocket.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TSilverlightSocket.cs
deleted file mode 100644
index cbd3baa..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TSilverlightSocket.cs
+++ /dev/null
@@ -1,393 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-/* only for silverlight */
-#if SILVERLIGHT
-
-using System;
-using System.Net.Sockets;
-using System.IO;
-using System.Net;
-using System.Threading;
-
-namespace Thrift.Transport
-{
-    public class TSilverlightSocket : TTransport
-    {
-        Socket socket = null;
-        static ManualResetEvent readAsyncComplete = new ManualResetEvent(false);
-        public event EventHandler<SocketAsyncEventArgs> connectHandler = null;
-
-        // memory stream for write cache.
-        private MemoryStream outputStream = new MemoryStream();
-
-        private string host = null;
-        private int port = 0;
-        private int timeout = 0;
-
-        // constructor
-        public TSilverlightSocket(string host, int port)
-            : this(host, port, 0)
-        {
-        }
-
-        // constructor
-        public TSilverlightSocket(string host, int port, int timeout)
-        {
-            this.host = host;
-            this.port = port;
-            this.timeout = timeout;
-
-            InitSocket();
-        }
-
-        private void InitSocket()
-        {
-            // Create a stream-based, TCP socket using the InterNetwork Address Family.
-            socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-            socket.NoDelay = true;
-        }
-
-        public int Timeout
-        {
-            set
-            {
-                timeout = value;
-            }
-        }
-
-        public string Host
-        {
-            get
-            {
-                return host;
-            }
-        }
-
-        public int Port
-        {
-            get
-            {
-                return port;
-            }
-        }
-
-        public override bool IsOpen
-        {
-            get
-            {
-                if (socket == null)
-                {
-                    return false;
-                }
-
-                return socket.Connected;
-            }
-        }
-
-        public override void Open()
-        {
-            if (IsOpen)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.AlreadyOpen, "Socket already connected");
-            }
-
-            if (String.IsNullOrEmpty(host))
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot open null host");
-            }
-
-            if (port <= 0)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot open without port");
-            }
-
-            if (socket == null)
-            {
-                InitSocket();
-            }
-
-            if (timeout == 0)     // no timeout -> infinite
-            {
-                timeout = 10000;  // set a default timeout for WP.
-            }
-
-            {
-                // Create DnsEndPoint. The hostName and port are passed in to this method.
-                DnsEndPoint hostEntry = new DnsEndPoint(this.host, this.port);
-
-                // Create a SocketAsyncEventArgs object to be used in the connection request
-                SocketAsyncEventArgs socketEventArg = new SocketAsyncEventArgs();
-                socketEventArg.RemoteEndPoint = hostEntry;
-
-                // Inline event handler for the Completed event.
-                // Note: This event handler was implemented inline in order to make this method self-contained.
-                socketEventArg.Completed += new EventHandler<SocketAsyncEventArgs>(delegate(object s, SocketAsyncEventArgs e)
-                {
-                    if (connectHandler != null)
-                    {
-                        connectHandler(this, e);
-                    }
-                });
-
-                // Make an asynchronous Connect request over the socket
-                socket.ConnectAsync(socketEventArg);
-            }
-        }
-
-        public override int Read(byte[] buf, int off, int len)
-        {
-            bool _timeout = true;
-            string _error = null;
-            int _recvBytes = -1;
-
-            if (socket == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Socket is not open");
-            }
-
-            // Create SocketAsyncEventArgs context object
-            SocketAsyncEventArgs socketEventArg = new SocketAsyncEventArgs();
-            socketEventArg.RemoteEndPoint = socket.RemoteEndPoint;
-
-            // Setup the buffer to receive the data
-            socketEventArg.SetBuffer(buf, off, len);
-
-            // Inline event handler for the Completed event.
-            // Note: This even handler was implemented inline in order to make
-            // this method self-contained.
-            socketEventArg.Completed += new EventHandler<SocketAsyncEventArgs>(delegate(object s, SocketAsyncEventArgs e)
-            {
-                _timeout = false;
-
-                if (e.SocketError == SocketError.Success)
-                {
-                    _recvBytes = e.BytesTransferred;
-                }
-                else
-                {
-                    _error = e.SocketError.ToString();
-                }
-
-                readAsyncComplete.Set();
-            });
-
-            // Sets the state of the event to nonsignaled, causing threads to block
-            readAsyncComplete.Reset();
-
-            // Make an asynchronous Receive request over the socket
-            socket.ReceiveAsync(socketEventArg);
-
-            // Block the UI thread for a maximum of TIMEOUT_MILLISECONDS milliseconds.
-            // If no response comes back within this time then proceed
-            readAsyncComplete.WaitOne(this.timeout);
-
-            if (_timeout)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.TimedOut, "Socket recv timeout");
-            }
-
-            if (_error != null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.Unknown, _error);
-            }
-
-            return _recvBytes;
-        }
-
-        public override void Write(byte[] buf, int off, int len)
-        {
-            outputStream.Write(buf, off, len);
-        }
-
-        private void beginFlush_Completed(object sender, SocketAsyncEventArgs e)
-        {
-            FlushAsyncResult flushAsyncResult = e.UserToken as FlushAsyncResult;
-            flushAsyncResult.UpdateStatusToComplete();
-            flushAsyncResult.NotifyCallbackWhenAvailable();
-
-            if (e.SocketError != SocketError.Success)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.Unknown, e.SocketError.ToString());
-            }
-        }
-
-        public override IAsyncResult BeginFlush(AsyncCallback callback, object state)
-        {
-            // Extract request and reset buffer
-            byte[] data = outputStream.ToArray();
-
-            FlushAsyncResult flushAsyncResult = new FlushAsyncResult(callback, state);
-
-            SocketAsyncEventArgs socketEventArg = new SocketAsyncEventArgs();
-            socketEventArg.RemoteEndPoint = socket.RemoteEndPoint;
-            socketEventArg.UserToken = flushAsyncResult;
-
-            socketEventArg.Completed += beginFlush_Completed;
-            socketEventArg.SetBuffer(data, 0, data.Length);
-
-            socket.SendAsync(socketEventArg);
-
-            return flushAsyncResult;
-        }
-
-        public override void EndFlush(IAsyncResult asyncResult)
-        {
-            try
-            {
-                var flushAsyncResult = (FlushAsyncResult)asyncResult;
-
-                if (!flushAsyncResult.IsCompleted)
-                {
-                    var waitHandle = flushAsyncResult.AsyncWaitHandle;
-                    waitHandle.WaitOne();
-                    waitHandle.Close();
-                }
-
-                if (flushAsyncResult.AsyncException != null)
-                {
-                    throw flushAsyncResult.AsyncException;
-                }
-            }
-            finally
-            {
-                outputStream = new MemoryStream();
-            }
-        }
-
-        // Copy from impl from THttpClient.cs
-        // Based on http://msmvps.com/blogs/luisabreu/archive/2009/06/15/multithreading-implementing-the-iasyncresult-interface.aspx
-        class FlushAsyncResult : IAsyncResult
-        {
-            private volatile Boolean _isCompleted;
-            private ManualResetEvent _evt;
-            private readonly AsyncCallback _cbMethod;
-            private readonly Object _state;
-
-            public FlushAsyncResult(AsyncCallback cbMethod, Object state)
-            {
-                _cbMethod = cbMethod;
-                _state = state;
-            }
-
-            internal byte[] Data { get; set; }
-            internal Socket Connection { get; set; }
-            internal TTransportException AsyncException { get; set; }
-
-            public object AsyncState
-            {
-                get { return _state; }
-            }
-
-            public WaitHandle AsyncWaitHandle
-            {
-                get { return GetEvtHandle(); }
-            }
-
-            public bool CompletedSynchronously
-            {
-                get { return false; }
-            }
-
-            public bool IsCompleted
-            {
-                get { return _isCompleted; }
-            }
-
-            private readonly Object _locker = new Object();
-
-            private ManualResetEvent GetEvtHandle()
-            {
-                lock (_locker)
-                {
-                    if (_evt == null)
-                    {
-                        _evt = new ManualResetEvent(false);
-                    }
-                    if (_isCompleted)
-                    {
-                        _evt.Set();
-                    }
-                }
-                return _evt;
-            }
-
-            internal void UpdateStatusToComplete()
-            {
-                _isCompleted = true; //1. set _iscompleted to true
-                lock (_locker)
-                {
-                    if (_evt != null)
-                    {
-                        _evt.Set(); //2. set the event, when it exists
-                    }
-                }
-            }
-
-            internal void NotifyCallbackWhenAvailable()
-            {
-                if (_cbMethod != null)
-                {
-                    _cbMethod(this);
-                }
-            }
-        }
-
-        public override void Close()
-        {
-            if (socket != null)
-            {
-                socket.Close();
-                socket = null;
-            }
-        }
-
-        #region " IDisposable Support "
-        private bool _IsDisposed;
-
-        // IDisposable
-        protected override void Dispose(bool disposing)
-        {
-            if (!_IsDisposed)
-            {
-                if (disposing)
-                {
-                    if (outputStream != null)
-                    {
-                        outputStream.Dispose();
-                    }
-                    outputStream = null;
-                    if (socket != null)
-                    {
-                        ((IDisposable)socket).Dispose();
-                    }
-                }
-            }
-            _IsDisposed = true;
-        }
-        #endregion
-    }
-}
-
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TSocket.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TSocket.cs
deleted file mode 100644
index cf1a440..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TSocket.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Net.Sockets;
-
-namespace Thrift.Transport
-{
-    public class TSocket : TStreamTransport
-    {
-        private TcpClient client = null;
-        private string host = null;
-        private int port = 0;
-        private int timeout = 0;
-
-        public TSocket(TcpClient client)
-        {
-            this.client = client;
-
-            if (IsOpen)
-            {
-                inputStream = client.GetStream();
-                outputStream = client.GetStream();
-            }
-        }
-
-        public TSocket(string host, int port)
-            : this(host, port, 0)
-        {
-        }
-
-        public TSocket(string host, int port, int timeout)
-        {
-            this.host = host;
-            this.port = port;
-            this.timeout = timeout;
-
-            InitSocket();
-        }
-
-        private void InitSocket()
-        {
-            client = new TcpClient();
-            client.ReceiveTimeout = client.SendTimeout = timeout;
-            client.Client.NoDelay = true;
-        }
-
-        public int Timeout
-        {
-            set
-            {
-                client.ReceiveTimeout = client.SendTimeout = timeout = value;
-            }
-        }
-
-        public TcpClient TcpClient
-        {
-            get
-            {
-                return client;
-            }
-        }
-
-        public string Host
-        {
-            get
-            {
-                return host;
-            }
-        }
-
-        public int Port
-        {
-            get
-            {
-                return port;
-            }
-        }
-
-        public override bool IsOpen
-        {
-            get
-            {
-                if (client == null)
-                {
-                    return false;
-                }
-
-                return client.Connected;
-            }
-        }
-
-        public override void Open()
-        {
-            if (IsOpen)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.AlreadyOpen, "Socket already connected");
-            }
-
-            if (String.IsNullOrEmpty(host))
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot open null host");
-            }
-
-            if (port <= 0)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot open without port");
-            }
-
-            if (client == null)
-            {
-                InitSocket();
-            }
-
-            if( timeout == 0)            // no timeout -> infinite
-            {
-                client.Connect(host, port);
-            }
-            else                        // we have a timeout -> use it
-            {
-                ConnectHelper hlp = new ConnectHelper(client);
-                IAsyncResult asyncres = client.BeginConnect(host, port, new AsyncCallback(ConnectCallback), hlp);
-                bool bConnected = asyncres.AsyncWaitHandle.WaitOne(timeout) && client.Connected;
-                if (!bConnected)
-                {
-                    lock (hlp.Mutex)
-                    {
-                        if( hlp.CallbackDone)
-                        {
-                            asyncres.AsyncWaitHandle.Close();
-                            client.Close();
-                        }
-                        else
-                        {
-                            hlp.DoCleanup = true;
-                            client = null;
-                        }
-                    }
-                    throw new TTransportException(TTransportException.ExceptionType.TimedOut, "Connect timed out");
-                }
-            }
-
-            inputStream = client.GetStream();
-            outputStream = client.GetStream();
-        }
-
-
-        static void ConnectCallback(IAsyncResult asyncres)
-        {
-            ConnectHelper hlp = asyncres.AsyncState as ConnectHelper;
-            lock (hlp.Mutex)
-            {
-                hlp.CallbackDone = true;
-
-                try
-                {
-                    if( hlp.Client.Client != null)
-                        hlp.Client.EndConnect(asyncres);
-                }
-                catch (Exception)
-                {
-                    // catch that away
-                }
-
-                if (hlp.DoCleanup)
-                {
-                    try {
-                        asyncres.AsyncWaitHandle.Close();
-                    } catch (Exception) {}
-
-                    try {
-                        if (hlp.Client is IDisposable)
-                            ((IDisposable)hlp.Client).Dispose();
-                    } catch (Exception) {}
-                    hlp.Client = null;
-                }
-            }
-        }
-
-        private class ConnectHelper
-        {
-            public object Mutex = new object();
-            public bool DoCleanup = false;
-            public bool CallbackDone = false;
-            public TcpClient Client;
-            public ConnectHelper(TcpClient client)
-            {
-                Client = client;
-            }
-        }
-
-        public override void Close()
-        {
-            base.Close();
-            if (client != null)
-            {
-                client.Close();
-                client = null;
-            }
-        }
-
-    #region " IDisposable Support "
-    private bool _IsDisposed;
-
-    // IDisposable
-    protected override void Dispose(bool disposing)
-    {
-      if (!_IsDisposed)
-      {
-        if (disposing)
-        {
-          if (client != null)
-            ((IDisposable)client).Dispose();
-          base.Dispose(disposing);
-        }
-      }
-      _IsDisposed = true;
-    }
-    #endregion
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TStreamTransport.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TStreamTransport.cs
deleted file mode 100644
index 468743c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TStreamTransport.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.IO;
-
-namespace Thrift.Transport
-{
-    public class TStreamTransport : TTransport
-    {
-        protected Stream inputStream;
-        protected Stream outputStream;
-
-        protected TStreamTransport()
-        {
-        }
-
-        public TStreamTransport(Stream inputStream, Stream outputStream)
-        {
-            this.inputStream = inputStream;
-            this.outputStream = outputStream;
-        }
-
-        public Stream OutputStream
-        {
-            get { return outputStream; }
-        }
-
-        public Stream InputStream
-        {
-            get { return inputStream; }
-        }
-
-        public override bool IsOpen
-        {
-            get { return true; }
-        }
-
-        public override void Open()
-        {
-        }
-
-        public override void Close()
-        {
-            if (inputStream != null)
-            {
-                inputStream.Close();
-                inputStream = null;
-            }
-            if (outputStream != null)
-            {
-                outputStream.Close();
-                outputStream = null;
-            }
-        }
-
-        public override int Read(byte[] buf, int off, int len)
-        {
-            if (inputStream == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot read from null inputstream");
-            }
-
-            return inputStream.Read(buf, off, len);
-        }
-
-        public override void Write(byte[] buf, int off, int len)
-        {
-            if (outputStream == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot write to null outputstream");
-            }
-
-            outputStream.Write(buf, off, len);
-        }
-
-        public override void Flush()
-        {
-            if (outputStream == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot flush null outputstream");
-            }
-
-            outputStream.Flush();
-        }
-
-
-    #region " IDisposable Support "
-    private bool _IsDisposed;
-
-    // IDisposable
-    protected override void Dispose(bool disposing)
-    {
-      if (!_IsDisposed)
-      {
-        if (disposing)
-        {
-          if (InputStream != null)
-            InputStream.Dispose();
-          if (OutputStream != null)
-            OutputStream.Dispose();
-        }
-      }
-      _IsDisposed = true;
-    }
-    #endregion
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTLSServerSocket.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTLSServerSocket.cs
deleted file mode 100644
index d6e69eb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTLSServerSocket.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-
-namespace Thrift.Transport
-{
-    /// <summary>
-    /// SSL Server Socket Wrapper Class
-    /// </summary>
-    public class TTLSServerSocket : TServerTransport
-    {
-        /// <summary>
-        /// Underlying tcp server
-        /// </summary>
-        private TcpListener server = null;
-
-        /// <summary>
-        /// The port where the socket listen
-        /// </summary>
-        private int port = 0;
-
-        /// <summary>
-        /// Timeout for the created server socket
-        /// </summary>
-        private readonly int clientTimeout;
-
-        /// <summary>
-        /// Whether or not to wrap new TSocket connections in buffers
-        /// </summary>
-        private bool useBufferedSockets = false;
-
-        /// <summary>
-        /// The servercertificate with the private- and public-key
-        /// </summary>
-        private X509Certificate serverCertificate;
-
-        /// <summary>
-        /// The function to validate the client certificate.
-        /// </summary>
-        private RemoteCertificateValidationCallback clientCertValidator;
-
-        /// <summary>
-        /// The function to determine which certificate to use.
-        /// </summary>
-        private LocalCertificateSelectionCallback localCertificateSelectionCallback;
-
-        /// <summary>
-        /// The SslProtocols value that represents the protocol used for authentication.
-        /// </summary>
-        private readonly SslProtocols sslProtocols;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TTLSServerSocket" /> class.
-        /// </summary>
-        /// <param name="port">The port where the server runs.</param>
-        /// <param name="certificate">The certificate object.</param>
-        public TTLSServerSocket(int port, X509Certificate2 certificate)
-            : this(port,  0, certificate)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TTLSServerSocket" /> class.
-        /// </summary>
-        /// <param name="port">The port where the server runs.</param>
-        /// <param name="clientTimeout">Send/receive timeout.</param>
-        /// <param name="certificate">The certificate object.</param>
-        public TTLSServerSocket(int port, int clientTimeout, X509Certificate2 certificate)
-            : this(port, clientTimeout, false, certificate)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TTLSServerSocket" /> class.
-        /// </summary>
-        /// <param name="port">The port where the server runs.</param>
-        /// <param name="clientTimeout">Send/receive timeout.</param>
-        /// <param name="useBufferedSockets">If set to <c>true</c> [use buffered sockets].</param>
-        /// <param name="certificate">The certificate object.</param>
-        /// <param name="clientCertValidator">The certificate validator.</param>
-        /// <param name="localCertificateSelectionCallback">The callback to select which certificate to use.</param>
-        /// <param name="sslProtocols">The SslProtocols value that represents the protocol used for authentication.</param>
-        public TTLSServerSocket(
-            int port,
-            int clientTimeout,
-            bool useBufferedSockets,
-            X509Certificate2 certificate,
-            RemoteCertificateValidationCallback clientCertValidator = null,
-            LocalCertificateSelectionCallback localCertificateSelectionCallback = null,
-            // TODO: Enable Tls1 and Tls2 (TLS 1.1 and 1.2) by default once we start using .NET 4.5+.
-            SslProtocols sslProtocols = SslProtocols.Tls)
-        {
-            if (!certificate.HasPrivateKey)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.Unknown, "Your server-certificate needs to have a private key");
-            }
-
-            this.port = port;
-            this.clientTimeout = clientTimeout;
-            this.serverCertificate = certificate;
-            this.useBufferedSockets = useBufferedSockets;
-            this.clientCertValidator = clientCertValidator;
-            this.localCertificateSelectionCallback = localCertificateSelectionCallback;
-            this.sslProtocols = sslProtocols;
-            try
-            {
-                // Create server socket
-                server = new TcpListener(System.Net.IPAddress.Any, this.port);
-                server.Server.NoDelay = true;
-            }
-            catch (Exception)
-            {
-                server = null;
-                throw new TTransportException("Could not create ServerSocket on port " + port + ".");
-            }
-        }
-
-        /// <summary>
-        /// Starts the server.
-        /// </summary>
-        public override void Listen()
-        {
-            // Make sure accept is not blocking
-            if (this.server != null)
-            {
-                try
-                {
-                    this.server.Start();
-                }
-                catch (SocketException sx)
-                {
-                    throw new TTransportException("Could not accept on listening socket: " + sx.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Callback for Accept Implementation
-        /// </summary>
-        /// <returns>
-        /// TTransport-object.
-        /// </returns>
-        protected override TTransport AcceptImpl()
-        {
-            if (this.server == null)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "No underlying server socket.");
-            }
-
-            try
-            {
-                TcpClient client = this.server.AcceptTcpClient();
-                client.SendTimeout = client.ReceiveTimeout = this.clientTimeout;
-
-                //wrap the client in an SSL Socket passing in the SSL cert
-                TTLSSocket socket = new TTLSSocket(
-                    client,
-                    this.serverCertificate,
-                    true,
-                    this.clientCertValidator,
-                    this.localCertificateSelectionCallback,
-                    this.sslProtocols);
-
-                socket.setupTLS();
-
-                if (useBufferedSockets)
-                {
-                    TBufferedTransport trans = new TBufferedTransport(socket);
-                    return trans;
-                }
-                else
-                {
-                    return socket;
-                }
-
-            }
-            catch (Exception ex)
-            {
-                throw new TTransportException(ex.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Stops the Server
-        /// </summary>
-        public override void Close()
-        {
-            if (this.server != null)
-            {
-                try
-                {
-                    this.server.Stop();
-                }
-                catch (Exception ex)
-                {
-                    throw new TTransportException("WARNING: Could not close server socket: " + ex);
-                }
-                this.server = null;
-            }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTLSSocket.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTLSSocket.cs
deleted file mode 100644
index 08f0215..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTLSSocket.cs
+++ /dev/null
@@ -1,371 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-
-namespace Thrift.Transport
-{
-    /// <summary>
-    /// SSL Socket Wrapper class
-    /// </summary>
-    public class TTLSSocket : TStreamTransport
-    {
-        /// <summary>
-        /// Internal TCP Client
-        /// </summary>
-        private TcpClient client;
-
-        /// <summary>
-        /// The host
-        /// </summary>
-        private string host;
-
-        /// <summary>
-        /// The port
-        /// </summary>
-        private int port;
-
-        /// <summary>
-        /// The timeout for the connection
-        /// </summary>
-        private int timeout;
-
-        /// <summary>
-        /// Internal SSL Stream for IO
-        /// </summary>
-        private SslStream secureStream;
-
-        /// <summary>
-        /// Defines wheter or not this socket is a server socket<br/>
-        /// This is used for the TLS-authentication
-        /// </summary>
-        private bool isServer;
-
-        /// <summary>
-        /// The certificate
-        /// </summary>
-        private X509Certificate certificate;
-
-        /// <summary>
-        /// User defined certificate validator.
-        /// </summary>
-        private RemoteCertificateValidationCallback certValidator;
-
-        /// <summary>
-        /// The function to determine which certificate to use.
-        /// </summary>
-        private LocalCertificateSelectionCallback localCertificateSelectionCallback;
-
-        /// <summary>
-        /// The SslProtocols value that represents the protocol used for authentication.SSL protocols to be used.
-        /// </summary>
-        private readonly SslProtocols sslProtocols;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TTLSSocket"/> class.
-        /// </summary>
-        /// <param name="client">An already created TCP-client</param>
-        /// <param name="certificate">The certificate.</param>
-        /// <param name="isServer">if set to <c>true</c> [is server].</param>
-        /// <param name="certValidator">User defined cert validator.</param>
-        /// <param name="localCertificateSelectionCallback">The callback to select which certificate to use.</param>
-        /// <param name="sslProtocols">The SslProtocols value that represents the protocol used for authentication.</param>
-        public TTLSSocket(
-            TcpClient client,
-            X509Certificate certificate,
-            bool isServer = false,
-            RemoteCertificateValidationCallback certValidator = null,
-            LocalCertificateSelectionCallback localCertificateSelectionCallback = null,
-            // TODO: Enable Tls11 and Tls12 (TLS 1.1 and 1.2) by default once we start using .NET 4.5+.
-            SslProtocols sslProtocols = SslProtocols.Tls)
-        {
-            this.client = client;
-            this.certificate = certificate;
-            this.certValidator = certValidator;
-            this.localCertificateSelectionCallback = localCertificateSelectionCallback;
-            this.sslProtocols = sslProtocols;
-            this.isServer = isServer;
-            if (isServer && certificate == null)
-            {
-                throw new ArgumentException("TTLSSocket needs certificate to be used for server", "certificate");
-            }
-
-            if (IsOpen)
-            {
-                base.inputStream = client.GetStream();
-                base.outputStream = client.GetStream();
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TTLSSocket"/> class.
-        /// </summary>
-        /// <param name="host">The host, where the socket should connect to.</param>
-        /// <param name="port">The port.</param>
-        /// <param name="certificatePath">The certificate path.</param>
-        /// <param name="certValidator">User defined cert validator.</param>
-        /// <param name="localCertificateSelectionCallback">The callback to select which certificate to use.</param>
-        /// <param name="sslProtocols">The SslProtocols value that represents the protocol used for authentication.</param>
-        public TTLSSocket(
-            string host,
-            int port,
-            string certificatePath,
-            RemoteCertificateValidationCallback certValidator = null,
-            LocalCertificateSelectionCallback localCertificateSelectionCallback = null,
-            SslProtocols sslProtocols = SslProtocols.Tls)
-            : this(host, port, 0, X509Certificate.CreateFromCertFile(certificatePath), certValidator, localCertificateSelectionCallback, sslProtocols)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TTLSSocket"/> class.
-        /// </summary>
-        /// <param name="host">The host, where the socket should connect to.</param>
-        /// <param name="port">The port.</param>
-        /// <param name="certificate">The certificate.</param>
-        /// <param name="certValidator">User defined cert validator.</param>
-        /// <param name="localCertificateSelectionCallback">The callback to select which certificate to use.</param>
-        /// <param name="sslProtocols">The SslProtocols value that represents the protocol used for authentication.</param>
-        public TTLSSocket(
-            string host,
-            int port,
-            X509Certificate certificate = null,
-            RemoteCertificateValidationCallback certValidator = null,
-            LocalCertificateSelectionCallback localCertificateSelectionCallback = null,
-            SslProtocols sslProtocols = SslProtocols.Tls)
-            : this(host, port, 0, certificate, certValidator, localCertificateSelectionCallback, sslProtocols)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TTLSSocket"/> class.
-        /// </summary>
-        /// <param name="host">The host, where the socket should connect to.</param>
-        /// <param name="port">The port.</param>
-        /// <param name="timeout">The timeout.</param>
-        /// <param name="certificate">The certificate.</param>
-        /// <param name="certValidator">User defined cert validator.</param>
-        /// <param name="localCertificateSelectionCallback">The callback to select which certificate to use.</param>
-        /// <param name="sslProtocols">The SslProtocols value that represents the protocol used for authentication.</param>
-        public TTLSSocket(
-            string host,
-            int port,
-            int timeout,
-            X509Certificate certificate,
-            RemoteCertificateValidationCallback certValidator = null,
-            LocalCertificateSelectionCallback localCertificateSelectionCallback = null,
-            SslProtocols sslProtocols = SslProtocols.Tls)
-        {
-            this.host = host;
-            this.port = port;
-            this.timeout = timeout;
-            this.certificate = certificate;
-            this.certValidator = certValidator;
-            this.localCertificateSelectionCallback = localCertificateSelectionCallback;
-            this.sslProtocols = sslProtocols;
-
-            InitSocket();
-        }
-
-        /// <summary>
-        /// Creates the TcpClient and sets the timeouts
-        /// </summary>
-        private void InitSocket()
-        {
-            this.client = new TcpClient();
-            client.ReceiveTimeout = client.SendTimeout = timeout;
-            client.Client.NoDelay = true;
-        }
-
-        /// <summary>
-        /// Sets Send / Recv Timeout for IO
-        /// </summary>
-        public int Timeout
-        {
-            set
-            {
-                this.client.ReceiveTimeout = this.client.SendTimeout = this.timeout = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the TCP client.
-        /// </summary>
-        public TcpClient TcpClient
-        {
-            get
-            {
-                return client;
-            }
-        }
-
-        /// <summary>
-        /// Gets the host.
-        /// </summary>
-        public string Host
-        {
-            get
-            {
-                return host;
-            }
-        }
-
-        /// <summary>
-        /// Gets the port.
-        /// </summary>
-        public int Port
-        {
-            get
-            {
-                return port;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether TCP Client is Cpen
-        /// </summary>
-        public override bool IsOpen
-        {
-            get
-            {
-                if (this.client == null)
-                {
-                    return false;
-                }
-
-                return this.client.Connected;
-            }
-        }
-
-        /// <summary>
-        /// Validates the certificates!<br/>
-        /// </summary>
-        /// <param name="sender">The sender-object.</param>
-        /// <param name="certificate">The used certificate.</param>
-        /// <param name="chain">The certificate chain.</param>
-        /// <param name="sslPolicyErrors">An enum, which lists all the errors from the .NET certificate check.</param>
-        /// <returns></returns>
-        private bool DefaultCertificateValidator(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslValidationErrors)
-        {
-            return (sslValidationErrors == SslPolicyErrors.None);
-        }
-
-        /// <summary>
-        /// Connects to the host and starts the routine, which sets up the TLS
-        /// </summary>
-        public override void Open()
-        {
-            if (IsOpen)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.AlreadyOpen, "Socket already connected");
-            }
-
-            if (String.IsNullOrEmpty(host))
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot open null host");
-            }
-
-            if (port <= 0)
-            {
-                throw new TTransportException(TTransportException.ExceptionType.NotOpen, "Cannot open without port");
-            }
-
-            if (client == null)
-            {
-                InitSocket();
-            }
-
-            client.Connect(host, port);
-
-            setupTLS();
-        }
-
-        /// <summary>
-        /// Creates a TLS-stream and lays it over the existing socket
-        /// </summary>
-        public void setupTLS()
-        {
-            RemoteCertificateValidationCallback validator = this.certValidator ?? DefaultCertificateValidator;
-
-            if( this.localCertificateSelectionCallback != null)
-            {
-                this.secureStream = new SslStream(
-                    this.client.GetStream(),
-                    false,
-                    validator,
-                    this.localCertificateSelectionCallback
-                );
-            }
-            else
-            {
-                this.secureStream = new SslStream(
-                    this.client.GetStream(),
-                    false,
-                    validator
-                );
-            }
-
-            try
-            {
-                if (isServer)
-                {
-                    // Server authentication
-                    this.secureStream.AuthenticateAsServer(this.certificate, this.certValidator != null, sslProtocols, true);
-                }
-                else
-                {
-                    // Client authentication
-                    X509CertificateCollection certs = certificate != null ?  new X509CertificateCollection { certificate } : new X509CertificateCollection();
-                    this.secureStream.AuthenticateAsClient(host, certs, sslProtocols, true);
-                }
-            }
-            catch (Exception)
-            {
-                this.Close();
-                throw;
-            }
-
-            inputStream = this.secureStream;
-            outputStream = this.secureStream;
-        }
-
-        /// <summary>
-        /// Closes the SSL Socket
-        /// </summary>
-        public override void Close()
-        {
-            base.Close();
-            if (this.client != null)
-            {
-                this.client.Close();
-                this.client = null;
-            }
-
-            if (this.secureStream != null)
-            {
-                this.secureStream.Close();
-                this.secureStream = null;
-            }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransport.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransport.cs
deleted file mode 100644
index 6fb1077..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransport.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.IO;
-
-namespace Thrift.Transport
-{
-    public abstract class TTransport : IDisposable
-    {
-        public abstract bool IsOpen
-        {
-            get;
-        }
-
-        private byte[] _peekBuffer = new byte[1];
-        private bool _hasPeekByte;
-
-        public bool Peek()
-        {
-            //If we already have a byte read but not consumed, do nothing.
-            if (_hasPeekByte)
-                return true;
-
-            //If transport closed we can't peek.
-            if (!IsOpen)
-                return false;
-
-            //Try to read one byte. If succeeds we will need to store it for the next read.
-            try
-            {
-                int bytes = Read(_peekBuffer, 0, 1);
-                if (bytes == 0)
-                    return false;
-            }
-            catch( IOException)
-            {
-                return false;
-            }
-
-            _hasPeekByte = true;
-            return true;
-        }
-
-        public abstract void Open();
-
-        public abstract void Close();
-
-        protected static void ValidateBufferArgs(byte[] buf, int off, int len)
-        {
-            if (buf == null)
-                throw new ArgumentNullException("buf");
-            if (off < 0)
-                throw new ArgumentOutOfRangeException("Buffer offset is smaller than zero.");
-            if (len < 0)
-                throw new ArgumentOutOfRangeException("Buffer length is smaller than zero.");
-            if (off + len > buf.Length)
-                throw new ArgumentOutOfRangeException("Not enough data.");
-        }
-
-        public abstract int Read(byte[] buf, int off, int len);
-
-        public int ReadAll(byte[] buf, int off, int len)
-        {
-            ValidateBufferArgs(buf, off, len);
-            int got = 0;
-
-            //If we previously peeked a byte, we need to use that first.
-            if (_hasPeekByte)
-            {
-                buf[off + got++] = _peekBuffer[0];
-                _hasPeekByte = false;
-            }
-
-            while (got < len)
-            {
-                int ret = Read(buf, off + got, len - got);
-                if (ret <= 0)
-                {
-                    throw new TTransportException(
-                        TTransportException.ExceptionType.EndOfFile,
-                        "Cannot read, Remote side has closed");
-                }
-                got += ret;
-            }
-            return got;
-        }
-
-        public virtual void Write(byte[] buf)
-        {
-            Write (buf, 0, buf.Length);
-        }
-
-        public abstract void Write(byte[] buf, int off, int len);
-
-        public virtual void Flush()
-        {
-        }
-
-        public virtual IAsyncResult BeginFlush(AsyncCallback callback, object state)
-        {
-            throw new TTransportException(
-                TTransportException.ExceptionType.Unknown,
-                "Asynchronous operations are not supported by this transport.");
-        }
-
-        public virtual void EndFlush(IAsyncResult asyncResult)
-        {
-            throw new TTransportException(
-                TTransportException.ExceptionType.Unknown,
-                "Asynchronous operations are not supported by this transport.");
-        }
-
-        #region " IDisposable Support "
-        // IDisposable
-        protected abstract void Dispose(bool disposing);
-
-        public void Dispose()
-        {
-            // Do not change this code.  Put cleanup code in Dispose(ByVal disposing As Boolean) above.
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-        #endregion
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransportException.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransportException.cs
deleted file mode 100644
index ae987d5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransportException.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-
-namespace Thrift.Transport
-{
-    public class TTransportException : TException
-    {
-        protected ExceptionType type;
-
-        public TTransportException()
-            : base()
-        {
-        }
-
-        public TTransportException(ExceptionType type)
-            : this()
-        {
-            this.type = type;
-        }
-
-        public TTransportException(ExceptionType type, string message)
-            : base(message)
-        {
-            this.type = type;
-        }
-
-        public TTransportException(string message)
-            : base(message)
-        {
-        }
-
-        public ExceptionType Type
-        {
-            get { return type; }
-        }
-
-        public enum ExceptionType
-        {
-            Unknown,
-            NotOpen,
-            AlreadyOpen,
-            TimedOut,
-            EndOfFile,
-            Interrupted
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransportFactory.cs b/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransportFactory.cs
deleted file mode 100644
index fa10033..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/src/Transport/TTransportFactory.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-
-namespace Thrift.Transport
-{
-    /// <summary>
-    /// From Mark Slee & Aditya Agarwal of Facebook:
-    /// Factory class used to create wrapped instance of Transports.
-    /// This is used primarily in servers, which get Transports from
-    /// a ServerTransport and then may want to mutate them (i.e. create
-    /// a BufferedTransport from the underlying base transport)
-    /// </summary>
-    public class TTransportFactory
-    {
-        public virtual TTransport GetTransport(TTransport trans)
-        {
-            return trans;
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/JSONTest.csproj b/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/JSONTest.csproj
deleted file mode 100644
index f07d43e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/JSONTest.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E37A0034-DCBF-4886-A0DA-25A03D12D975}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>JSONTest</RootNamespace>
-    <AssemblyName>JSONTest</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Thrift.csproj">
-      <Project>{499EB63C-D74C-47E8-AE48-A2FC94538E9D}</Project>
-      <Name>Thrift</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/Program.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/Program.cs
deleted file mode 100644
index f61388a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/Program.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Thrift.Protocol;
-using Thrift.Transport;
-
-namespace JSONTest
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            TestThrift2365();  // JSON binary decodes too much data
-            TestThrift2336();  // hex encoding using \uXXXX where 0xXXXX > 0xFF
-            TestThrift3403(); // JSON escaped unicode surrogate pair support.
-        }
-
-
-        public static void TestThrift2365()
-        {
-            var rnd = new Random();
-            for (var len = 0; len < 10; ++len)
-            {
-                byte[] dataWritten = new byte[len];
-                rnd.NextBytes(dataWritten);
-
-                Stream stm = new MemoryStream();
-                TTransport trans = new TStreamTransport(null, stm);
-                TProtocol prot = new TJSONProtocol(trans);
-                prot.WriteBinary(dataWritten);
-
-                stm.Position = 0;
-                trans = new TStreamTransport(stm, null);
-                prot = new TJSONProtocol(trans);
-                byte[] dataRead = prot.ReadBinary();
-
-                Debug.Assert(dataRead.Length == dataWritten.Length);
-                for (var i = 0; i < dataRead.Length; ++i)
-                    Debug.Assert(dataRead[i] == dataWritten[i]);
-            }
-        }
-
-
-        public static void TestThrift2336()
-        {
-            const string RUSSIAN_TEXT = "\u0420\u0443\u0441\u0441\u043a\u043e\u0435 \u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435";
-            const string RUSSIAN_JSON = "\"\\u0420\\u0443\\u0441\\u0441\\u043a\\u043e\\u0435 \\u041d\\u0430\\u0437\\u0432\\u0430\\u043d\\u0438\\u0435\"";
-
-            // prepare buffer with JSON data
-            byte[] rawBytes = new byte[RUSSIAN_JSON.Length];
-            for (var i = 0; i < RUSSIAN_JSON.Length; ++i)
-                rawBytes[i] = (byte)(RUSSIAN_JSON[i] & (char)0xFF);  // only low bytes
-
-            // parse and check
-            var stm = new MemoryStream(rawBytes);
-            var trans = new TStreamTransport(stm, null);
-            var prot = new TJSONProtocol(trans);
-            Debug.Assert(prot.ReadString() == RUSSIAN_TEXT, "reading JSON with hex-encoded chars > 8 bit");
-        }
-
-        public static void TestThrift3403()
-        {
-            string GCLEF_TEXT = "\ud834\udd1e";
-            const string GCLEF_JSON = "\"\\ud834\\udd1e\"";
-
-            // parse and check
-            var stm = new MemoryStream(Encoding.UTF8.GetBytes(GCLEF_JSON));
-            var trans = new TStreamTransport(stm, null);
-            var prot = new TJSONProtocol(trans);
-            Debug.Assert(prot.ReadString() == GCLEF_TEXT, "reading JSON with surrogate pair hex-encoded chars");
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6788bc3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die mit einer Assembly verknüpft sind.
-[assembly: AssemblyTitle("JSONTest")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("JSONTest")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
-// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
-// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("2b2e7d56-3e65-4368-92d7-e34d56b7105e")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/app.config b/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/app.config
deleted file mode 100644
index 9c1919d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/JSON/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/Multiplex.Test.Client.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/Multiplex.Test.Client.cs
deleted file mode 100644
index c810a08..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/Multiplex.Test.Client.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using Thrift.Collections;
-using Thrift.Transport;
-using Thrift.Protocol;
-using Thrift.Server;
-using Thrift;
-using Test.Multiplex;
-
-namespace Test.Multiplex.Client
-{
-    public class TestClient
-    {
-        static void Execute(int port)
-        {
-            try
-            {
-                TTransport trans;
-                trans = new TSocket("localhost", port);
-                trans = new TFramedTransport(trans);
-                trans.Open();
-
-                TProtocol Protocol = new TBinaryProtocol(trans, true, true);
-
-                TMultiplexedProtocol multiplex;
-
-                multiplex = new TMultiplexedProtocol(Protocol, Constants.NAME_BENCHMARKSERVICE);
-                BenchmarkService.Iface bench = new BenchmarkService.Client(multiplex);
-
-                multiplex = new TMultiplexedProtocol(Protocol, Constants.NAME_AGGR);
-                Aggr.Iface aggr = new Aggr.Client(multiplex);
-
-                for (sbyte i = 1; 10 >= i; ++i)
-                {
-                    aggr.addValue(bench.fibonacci(i));
-                }
-
-                foreach (int k in aggr.getValues())
-                {
-                    Console.Write(k.ToString() + " ");
-                    Console.WriteLine("");
-                }
-                trans.Close();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-            }
-        }
-
-        static void Main(string[] args)
-        {
-            int port = 9090;
-            if (args.Length > 0)
-            {
-                port = ushort.Parse(args[0]);
-            }
-            Execute(port);
-            Console.WriteLine("done.");
-        }
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj b/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj
deleted file mode 100644
index 6221e14..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/MultiplexClient.csproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5E91DA17-E548-415F-8C9F-9E84EDF8EE06}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MultiplexClient</RootNamespace>
-    <AssemblyName>MultiplexClient</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Multiplex.Test.Common.cs">
-      <Link>Multiplex.Test.Common.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\Aggr.cs" />
-    <Compile Include="..\gen-csharp\BenchmarkService.cs" />
-    <Compile Include="..\gen-csharp\Error.cs" />
-    <Compile Include="Multiplex.Test.Client.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Thrift.csproj">
-      <Project>{499EB63C-D74C-47E8-AE48-A2FC94538E9D}</Project>
-      <Name>Thrift</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>rmdir /s /q "$(ProjectDir)gen-csharp"
-del /f /q "$(ProjectDir)ThriftImpl.dll"
-SET OUTPUT_DIR=$(ProjectDir)
-
-SET THRIFT_FILE=$(ProjectDir)\..\..\..\..\..\contrib\async-test\aggr.thrift
-for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI
-for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI
-"$(ProjectDir)\..\..\..\..\..\compiler\cpp\thrift.exe" --gen csharp -o %25SHORT_DIR%25 %25THRIFT_SHORT%25
-
-SET THRIFT_FILE=$(ProjectDir)\..\..\..\..\..\lib\rb\benchmark\Benchmark.thrift
-for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI
-for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI
-"$(ProjectDir)\..\..\..\..\..\compiler\cpp\thrift.exe" --gen csharp -o %25SHORT_DIR%25 %25THRIFT_SHORT%25
-
-</PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs
deleted file mode 100644
index ee234bf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MultiplexClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MultiplexClient")]
-[assembly: AssemblyCopyright("Copyright © 2013 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("66FC61E5-420B-4b56-8012-D6D6CE22537F")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Makefile.am b/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Makefile.am
deleted file mode 100644
index 57253d6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-GENERATED = \
-	gen-csharp/Aggr.cs \
-	gen-csharp/BenchmarkService.cs \
-	gen-csharp/Error.cs
-
-BUILT_SOURCES = $(GENERATED)
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-csharp/Aggr.cs: $(top_srcdir)/contrib/async-test/aggr.thrift
-	$(THRIFT) --gen csharp $<
-
-gen-csharp/BenchmarkService.cs gen-csharp/Error.cs: $(top_srcdir)/lib/rb/benchmark/Benchmark.thrift
-	$(THRIFT) --gen csharp $<
-
-ThriftImpl.dll: Multiplex.Test.Common.cs $(GENERATED) ../../Thrift.dll
-	$(CSC) $(CSC_DEFINES) -t:library -out:./ThriftImpl.dll -reference:../../Thrift.dll $(GENERATED) $<
-
-MultiplexClient.exe: Client/Multiplex.Test.Client.cs ThriftImpl.dll
-	$(CSC) $(CSC_DEFINES) -out:$@ -reference:../../Thrift.dll -reference:ThriftImpl.dll $<
-
-MultiplexServer.exe: Server/Multiplex.Test.Server.cs ThriftImpl.dll
-	$(CSC) $(CSC_DEFINES) -out:$@ -reference:../../Thrift.dll -reference:ThriftImpl.dll $<
-
-clean-local:
-	$(RM) -rf gen-csharp *.exe *.dll
-
-TESTPORT = 9501
-check-local: MultiplexServer.exe MultiplexClient.exe
-	echo $(TESTPORT)
-	MONO_PATH=../../ timeout 10 mono MultiplexServer.exe $(TESTPORT) &
-	sleep 1
-	MONO_PATH=../../ mono MultiplexClient.exe $(TESTPORT)
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Multiplex.Test.Common.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Multiplex.Test.Common.cs
deleted file mode 100644
index a687852..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Multiplex.Test.Common.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Distributed under the Thrift Software License
-//
-// See accompanying file LICENSE or visit the Thrift site at:
-// http://developers.facebook.com/thrift/
-using System;
-using System.Collections.Generic;
-using Thrift.Collections;
-using Thrift.Transport;
-using Thrift.Protocol;
-using Thrift.Server;
-
-namespace Test.Multiplex
-{
-    public class Constants
-    {
-        public const string NAME_BENCHMARKSERVICE = "BenchmarkService";
-        public const string NAME_AGGR             = "Aggr";
-    }
-}
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/Multiplex.Test.Server.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/Multiplex.Test.Server.cs
deleted file mode 100644
index 9786189..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/Multiplex.Test.Server.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using Thrift.Collections;
-using Thrift.Transport;
-using Thrift.Protocol;
-using Thrift.Server;
-using Thrift;
-using Test.Multiplex;
-
-namespace Test.Multiplex.Server
-{
-    public class TestServer
-    {
-        class BenchmarkServiceImpl : BenchmarkService.Iface
-        {
-            public int fibonacci(sbyte n)
-            {
-                int prev, next, result;
-                prev   = 0;
-                result = 1;
-                while (n > 0)
-                {
-                    next   = result + prev;
-                    prev   = result;
-                    result = next;
-                    --n;
-                }
-                return result;
-            }
-        }
-
-        class AggrServiceImpl : Aggr.Iface
-        {
-            List<int> values = new List<int>();
-
-            public void addValue(int value)
-            {
-                values.Add(value);
-            }
-
-            public List<int> getValues()
-            {
-                return values;
-            }
-        }
-
-        static void Execute(int port)
-        {
-            try
-            {
-                // create protocol factory, default to BinaryProtocol
-                TProtocolFactory ProtocolFactory = new TBinaryProtocol.Factory(true,true);
-                TServerTransport servertrans = new TServerSocket(port, 0, false);
-                TTransportFactory TransportFactory = new TFramedTransport.Factory();
-
-                BenchmarkService.Iface benchHandler = new BenchmarkServiceImpl();
-                TProcessor benchProcessor = new BenchmarkService.Processor(benchHandler);
-
-                Aggr.Iface aggrHandler = new AggrServiceImpl();
-                TProcessor aggrProcessor = new Aggr.Processor(aggrHandler);
-
-                TMultiplexedProcessor multiplex = new TMultiplexedProcessor();
-                multiplex.RegisterProcessor(Constants.NAME_BENCHMARKSERVICE, benchProcessor);
-                multiplex.RegisterProcessor(Constants.NAME_AGGR, aggrProcessor);
-
-                TServer ServerEngine = new TSimpleServer(multiplex, servertrans, TransportFactory, ProtocolFactory);
-
-                Console.WriteLine("Starting the server ...");
-                ServerEngine.Serve();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.Message);
-            }
-        }
-
-        static void Main(string[] args)
-        {
-            int port = 9090;
-            if (args.Length > 0)
-            {
-                port = ushort.Parse(args[0]);
-            }
-            Execute(port);
-        }
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj b/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
deleted file mode 100644
index dc1d123..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D592BDF3-0DCE-48FB-890F-E4AE1D9CE7CD}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MultiplexServer</RootNamespace>
-    <AssemblyName>MultiplexServer</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Multiplex.Test.Common.cs">
-      <Link>Multiplex.Test.Common.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\Aggr.cs" />
-    <Compile Include="..\gen-csharp\BenchmarkService.cs" />
-    <Compile Include="..\gen-csharp\Error.cs" />
-    <Compile Include="Multiplex.Test.Server.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Thrift.csproj">
-      <Project>{499EB63C-D74C-47E8-AE48-A2FC94538E9D}</Project>
-      <Name>Thrift</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>rmdir /s /q "$(ProjectDir)gen-csharp"
-del /f /q "$(ProjectDir)ThriftImpl.dll"
-SET OUTPUT_DIR=$(ProjectDir)
-
-SET THRIFT_FILE=$(ProjectDir)\..\..\..\..\..\contrib\async-test\aggr.thrift
-for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI
-for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI
-"$(ProjectDir)\..\..\..\..\..\compiler\cpp\thrift.exe" --gen csharp -o %25SHORT_DIR%25 %25THRIFT_SHORT%25
-
-SET THRIFT_FILE=$(ProjectDir)\..\..\..\..\..\lib\rb\benchmark\Benchmark.thrift
-for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI
-for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI
-"$(ProjectDir)\..\..\..\..\..\compiler\cpp\thrift.exe" --gen csharp -o %25SHORT_DIR%25 %25THRIFT_SHORT%25
-
-</PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9b9dd6f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/Multiplex/Server/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MultiplexServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MultiplexServer")]
-[assembly: AssemblyCopyright("Copyright © 2013 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("F2F436C1-3D4F-411a-ADC3-B98848476A8E")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/App_Start/FilterConfig.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/App_Start/FilterConfig.cs
deleted file mode 100644
index 855184f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/App_Start/FilterConfig.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Web.Mvc;
-
-namespace ThriftMVCTest
-{
-    public static class FilterConfig
-    {
-        public static void RegisterGlobalFilters(GlobalFilterCollection filters)
-        {
-            filters.Add(new HandleErrorAttribute());
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/App_Start/RouteConfig.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/App_Start/RouteConfig.cs
deleted file mode 100644
index b4b6023..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/App_Start/RouteConfig.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Web.Mvc;
-using System.Web.Routing;
-
-namespace ThriftMVCTest
-{
-    public static class RouteConfig
-    {
-        public static void RegisterRoutes(RouteCollection routes)
-        {
-            routes.IgnoreRoute("{resource}.thrift");
-            routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
-
-            routes.MapRoute(
-                name: "Default",
-                url: "{controller}/{action}/{id}",
-                defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional }
-            );
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/AsyncHttpHandler.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/AsyncHttpHandler.cs
deleted file mode 100644
index 7f26184..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/AsyncHttpHandler.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using Thrift.Transport;
-
-namespace ThriftMVCTest
-{
-    public class AsyncHttpHandler : THttpTaskAsyncHandler
-    {
-        public AsyncHttpHandler()
-            : base(
-                new Thrift.Test.SecondService.AsyncProcessor(new SecondServiceImpl()))
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Controllers/HomeController.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Controllers/HomeController.cs
deleted file mode 100644
index ab9eada..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Controllers/HomeController.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using Thrift.Protocol;
-using Thrift.Test;
-using Thrift.Transport;
-
-namespace ThriftMVCTest.Controllers
-{
-    public class HomeController : Controller
-    {
-        public ActionResult Index()
-        {
-            return View();
-        }
-
-        public async Task<ActionResult> TestThriftAsync()
-        {
-            var baseUri = new Uri(string.Format("{0}://{1}{2}", Request.Url.Scheme, Request.Url.Authority,
-                Url.Content("~")));
-
-            SecondService.IAsync asyncService =
-                new SecondService.Client(new TBinaryProtocol(new THttpClient(new Uri(baseUri, "Async.thrift"))));
-
-            await asyncService.blahBlahAsync();
-            var result = await asyncService.secondtestStringAsync("TestString");
-            if (result != "TestString")
-            {
-                throw new Exception("The wrong result was returned");
-            }
-
-            return RedirectToAction("Index");
-        }
-
-        public ActionResult TestThriftSync()
-        {
-            var baseUri = new Uri(string.Format("{0}://{1}{2}", Request.Url.Scheme, Request.Url.Authority,
-                Url.Content("~")));
-
-            SecondService.ISync service =
-                new SecondService.Client(new TBinaryProtocol(new THttpClient(new Uri(baseUri, "Sync.thrift"))));
-
-            service.blahBlah();
-            var result = service.secondtestString("TestString");
-            if (result != "TestString")
-            {
-                throw new Exception("The wrong result was returned");
-            }
-
-            return RedirectToAction("Index");
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Global.asax b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Global.asax
deleted file mode 100644
index 7bb688c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Global.asax
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="ThriftMVCTest.MvcApplication" Language="C#" %>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Global.asax.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Global.asax.cs
deleted file mode 100644
index 59731ef..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Global.asax.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Web.Mvc;
-using System.Web.Routing;
-
-namespace ThriftMVCTest
-{
-    public class MvcApplication : System.Web.HttpApplication
-    {
-        protected void Application_Start()
-        {
-            AreaRegistration.RegisterAllAreas();
-            FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
-            RouteConfig.RegisterRoutes(RouteTable.Routes);
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Properties/AssemblyInfo.cs
deleted file mode 100644
index 05556ac..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ThriftMVCTest")]
-[assembly: AssemblyDescription("A web project for testing the thrift ASP.NET features.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("The Apache Software Foundation")]
-[assembly: AssemblyProduct("ThriftMVCTest")]
-[assembly: AssemblyCopyright("The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("366f9bd0-3c0e-48aa-b2ca-61fd4a93e427")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/SecondServiceImpl.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/SecondServiceImpl.cs
deleted file mode 100644
index dce0148..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/SecondServiceImpl.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Threading.Tasks;
-using Thrift.Test;
-
-namespace ThriftMVCTest
-{
-    public class SecondServiceImpl : SecondService.IAsync, SecondService.ISync
-    {
-        public Task blahBlahAsync()
-        {
-            return Task.FromResult(0);
-        }
-
-        public Task<string> secondtestStringAsync(string thing)
-        {
-            return Task.FromResult(thing);
-        }
-
-        public void blahBlah()
-        {
-
-        }
-
-        public string secondtestString(string thing)
-        {
-            return thing;
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/SyncHttpHandler.cs b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/SyncHttpHandler.cs
deleted file mode 100644
index 4fe2662..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/SyncHttpHandler.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using Thrift.Transport;
-
-namespace ThriftMVCTest
-{
-    public class SyncHttpHandler : THttpHandler
-    {
-        public SyncHttpHandler()
-            : base(
-                new Thrift.Test.SecondService.Processor(new SecondServiceImpl()))
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/ThriftMVCTest.csproj b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/ThriftMVCTest.csproj
deleted file mode 100644
index 0eb969a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/ThriftMVCTest.csproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{891B4487-C7BA-427E-BBC8-4C596C229A10}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ThriftMVCTest</RootNamespace>
-    <AssemblyName>ThriftMVCTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http">
-    </Reference>
-    <Reference Include="System.Net.Http.WebRequest">
-    </Reference>
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="ThriftImpl">
-      <HintPath>.\ThriftImpl.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App_Start\FilterConfig.cs" />
-    <Compile Include="App_Start\RouteConfig.cs" />
-    <Compile Include="SyncHttpHandler.cs" />
-    <Compile Include="AsyncHttpHandler.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SecondServiceImpl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="favicon.ico" />
-    <Content Include="Global.asax" />
-    <Content Include="Web.config" />
-    <Content Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <Content Include="Views\Web.config" />
-    <Content Include="Views\_ViewStart.cshtml" />
-    <Content Include="Views\Shared\_Layout.cshtml" />
-    <Content Include="Views\Home\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Thrift.45.csproj">
-      <Project>{ebce35da-cf6a-42bc-a357-a9c09b534299}</Project>
-      <Name>Thrift.45</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>57482</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:57482/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PreBuildEvent>rmdir /s /q "$(ProjectDir)gen-csharp"
-del /f /q "$(ProjectDir)ThriftImpl.dll"
-SET OUTPUT_DIR=$(ProjectDir)
-SET THRIFT_FILE=$(ProjectDir)\..\..\..\..\test\ThriftTest.thrift
-for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI
-for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI
-"$(ProjectDir)\..\..\..\..\compiler\cpp\Debug\thrift.exe" --gen csharp:async=true -o %25SHORT_DIR%25 %25THRIFT_SHORT%25
-"$(MSBuildToolsPath)\Csc.exe" /t:library /out:"$(ProjectDir)ThriftImpl.dll" /recurse:"$(ProjectDir)gen-csharp"\* /reference:"$(ProjectDir)..\..\src\bin\Debug\Thrift45.dll"</PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target> -->
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Home/Index.cshtml b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Home/Index.cshtml
deleted file mode 100644
index f0ca7da..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Home/Index.cshtml
+++ /dev/null
@@ -1,25 +0,0 @@
-@*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*@
-
-@{
-    ViewBag.Title = "Home Page";
-}
-
-<p>@Html.ActionLink("Test Thrift Async Service", "TestThriftAsync")</p>
-<p>@Html.ActionLink("Test Thrift Sync Service", "TestThriftSync")</p>
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Shared/_Layout.cshtml b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Shared/_Layout.cshtml
deleted file mode 100644
index b41c99a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Shared/_Layout.cshtml
+++ /dev/null
@@ -1,30 +0,0 @@
-@*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*@
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Thrift ASP.NET Test</title>
-</head>
-<body>
-    @RenderBody()
-</body>
-</html>
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Web.config b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Web.config
deleted file mode 100644
index 3c21138..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/Web.config
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Optimization"/>
-        <add namespace="System.Web.Routing" />
-        <add namespace="ThriftMVCTest" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-
-  <system.web>
-    <compilation>
-      <assemblies>
-        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </assemblies>
-    </compilation>
-  </system.web>
-</configuration>
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/_ViewStart.cshtml b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/_ViewStart.cshtml
deleted file mode 100644
index 8cde2ee..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Views/_ViewStart.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-@*
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements. See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership. The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*@
-
-@{
-    Layout = "~/Views/Shared/_Layout.cshtml";
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.Debug.config b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.Debug.config
deleted file mode 100644
index 45d56d8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.Debug.config
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    In the example below, the "SetAttributes" transform will change the value of
-    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator
-    finds an attribute "name" that has a value of "MyDB".
-
-    <connectionStrings>
-      <add name="MyDB"
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <!--
-      In the example below, the "Replace" transform will replace the entire
-      <customErrors> section of your Web.config file.
-      Note that because there is only one customErrors section under the
-      <system.web> node, there is no need to use the "xdt:Locator" attribute.
-
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.Release.config b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.Release.config
deleted file mode 100644
index 157c340..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.Release.config
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    In the example below, the "SetAttributes" transform will change the value of
-    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator
-    finds an attribute "name" that has a value of "MyDB".
-
-    <connectionStrings>
-      <add name="MyDB"
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <compilation xdt:Transform="RemoveAttributes(debug)" />
-    <!--
-      In the example below, the "Replace" transform will replace the entire
-      <customErrors> section of your Web.config file.
-      Note that because there is only one customErrors section under the
-      <system.web> node, there is no need to use the "xdt:Locator" attribute.
-
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.config b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.config
deleted file mode 100644
index 9c57d11..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/Web.config
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<!--
-  For more information on how to configure your ASP.NET application, please visit
-  http://go.microsoft.com/fwlink/?LinkId=301880
-  -->
-<configuration>
-  <appSettings>
-    <add key="webpages:Version" value="3.0.0.0" />
-    <add key="webpages:Enabled" value="false" />
-    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-    <add key="owin:AutomaticAppStartup" value="false" />
-  </appSettings>
-  <system.web>
-    <authentication mode="None" />
-    <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime targetFramework="4.5" />
-  </system.web>
-  <system.webServer>
-    <modules>
-      <remove name="FormsAuthentication" />
-    </modules>
-    <handlers>
-      <add name="AsyncHttpHandler" verb="*" path="Async.thrift" type="ThriftMVCTest.AsyncHttpHandler, ThriftMVCTest" />
-      <add name="SyncHttpHandler" verb="*" path="Sync.thrift" type="ThriftMVCTest.SyncHttpHandler, ThriftMVCTest" />
-    </handlers>
-  </system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/favicon.ico b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/favicon.ico
deleted file mode 100644
index a3a799985c43bc7309d701b2cad129023377dc71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32038
zcmeHwX>eTEbtY7aYbrGrkNjgie?1jXjZ#zP%3n{}GObKv$BxI7Sl;Bwl5E+Qtj&t8
z*p|m4DO#HoJC-FyvNnp8NP<{Na0LMnTtO21(rBP}?EAiNjWgeO?z`{3ZoURUQlV2d
zY1Pqv{m|X_oO91|?^z!6@@~od!@OH>&BN;>c@O+yUfy5w>LccTKJJ&`-k<%M^Zvi(
z<$dKp=jCnNX5Qa+M_%6g|IEv~4R84q9|7E=|Ho(Wz3f-0wPjaRL;W*N^>q%^KGRr7
zxbjSORb_c&eO;oV_DZ7ua!sPH=0c+W;`vzJ#j~-x3uj};50#vqo*0w4!LUqs*UCh9
zvy2S%$#8$K4EOa&e@~aBS65_hc~Mpu=454VT2^KzWqEpBA=ME|O;1cn?8p<+{MKJf
zbK#@1wzL44m$k(?85<eW@6XRp%jD>=Obido7=C|xWKe%66$z)NrzRwR>?hK?_bbwT
z@Da?lBrBL}Zemo1@!9pYRau&!ld17h{f+UV0sY(R{ET$PBB|-=Nr@l-nY6w8HEAw*
zRMIQU`24Jl_IFEPcS=_HdrOP5yf81z_?@M>83Vv65$Q<HOixSl<aTM__jl4#^thzg
zR%8kDj}7!lG~6zIy}i=c(}UmYmfr3z>Fr9nP<Q2WYG!6yx=!tqj{N(it>g(wr`Ke8
zaY4ogdnMA*F7a4Q1_uXadTLUpCk;$ZPRRJ^sMOch;rlbvUGc1R9=u;dr9YANbQ<4Z
z#P|Cp9BP$FXNPolgyr1XGt$^lFPF}rmBF5rj1Kh5%dforrP<k8>8W}_qJ<Ai`=Ou7
z`ue&ogWfUli9DMc8&O<H4|y`$*Ck6>L$2qMBS-#%-|s#BPZBSETsn_EBYcr(W5dq(
z@f%}<eeQ3J;Ww5b2VCRhCywj)`%eE_;>C|iN7)YN`^)<MX{;gTi@1yp^{2@b;(+g`
zAt&imr^?OutN&RNC7A!n)B63jwKbWao5ecJ%hKY!EZ~|jkF}#Ltw6^3x5~;&{eFM-
zi;^sTLgE!Ky7P}i#{58fMnFeDcsGT0=<Dl~`uh4mC;g*M#nOM~MM+)Qlk@xhE}^NZ
zQ9_}Rw6?bH#)oeiA0L;6g#`s(=X#N*<>h7R?Cg}Do*w-!zwZb9=BMp%Wsh@nb22hA
zA{`wa8Q;yz6S)zfo%sl08^GF`9csI9BlGnEy#0^Y3b);M+n<(}6jziM7nhe57a1rj
zC@(2ISYBL^UtWChKzVWgf%4LW2Tqg_^7jMw`C$KvU+mcakFjV(BGAW9g%CzSyM;Df
z143=mq0oxaK-H;o>F<Rt1N8OKCQyfy(wj_3Pa+10N>3~zJ<(3-j&?|QBn)WJfP#JR
zRuA;`N?L83wQt78QIA$(Z)lGQY9r^SFal;LB^qi`8%8@y+mwcGsf~nv)bBy2S7z~9
z=;X@Gglk)^jpbNz?1;`!J3QUfAOp4U$Uxm5>92iT`mek#$>s`)M>;e4<M8Hm<td$i
zo%63^{uMj_JZyl2H|=@`4jvvW(-Ts0+?#)(Zm%@H_UF>{#%HAAcb^8_Ax%ersk|}#
z0bd;ZPu|2}18KtvmIo8`1@H~@2ejwo(5rFS`Z4&O{$$+ch2hC0=06Jh`@p+p8LZzY
z&2M~8T6X^*X?yQ$3N5EzRv$(FtSxhW>>ABUyp!{<Wz0W0IwJGaQ;Ngf)HrbH_i%t+
zRbG%E4pf{tRz1*<`LTY34f{a*UrA^`{Keb<8-DNe(tP~azWFT<h7USFe1h^|)$m|)
zY*glF%>484f8(%C1_y)3D%Qgfl_!sz`LTXOjR&L!zPA0qH_iNS!tY{!^2WfD%uT}P
zI<~&?@&))5&hPPHVRl9);TPO>@UI2d!^ksb!$9T96V(F){puTsn(}qt_WXNw4VvHj
zf;6A_XCvE`Z@}E-IOaG0rs>K>^=Sr&OgT_p;F@v0VCN0Y$r|Lw1?Wjt`AKK~RT*kJ
z2>QPuVgLNcF+XKn<s0*3P3iB*gT^a0vIzTZU|trn2Uv9c3Hh)9f3g4{&h?nbULpvN
z96n^`Pp`^wOQE#w`Lc8replMCXK8)sOVV=kx5^vt9Vp{-(Alv;%nuxzF#i;MKYb4U
zzQV*feDk<Wj*l6DJWwXMCX~$yAMpLrvcuJb0|Uy(;g%w4-TgPxaq!#HhPhjz2Q4Rm
zgZUv_3Y>o;WBv$yj@d_WFJbl*#*V_Cwzo@%3n5%z4g21G*PVZ)wM5$A{klYozmGlB
zT@u2+s}=f}25%IA!yNcXUr!!1)z(Nqbhojg0lv@7@0UlvUMT)*r;M$d0-t)Z?<y`V
ztR5U35HLVSIse|TN~8$;o%g;jAzZhXzwF3Z8snPGVLi>B1@qQk()o!4fqvfr_I0r7
zy1(NdkHEj#Yu{K>T#We#b#FD=c1XhS{hdTh9+8gy-vkcdkk*QS@y(xxEMb1w6z<^~
zYcETGfB#ibR#ql0EiD;PR$L&Vrh2uRv5t_$;NxC;>7_S5_OXxsi8udY3BUUdi55Sk
zcyKM+PQ9YMA%D1kH1q48OFG(Gbl=FmV;yk8o>k%0$rJ8%-IYsHclnYuTskka<HNc)
zw7%ikv18A{=YN3n^EKXnL?Q>iCGkUlkMY~mx&K}XRlKIW;odWIeuKjtbc^8bBOTqK
zjj(ot`_j?A6y_h%vxE9o*ntx#PGrnK7AljD_r58ylE<WT-@UlL8}x(!oZA8J5zU^H
z^A9LLlqc{rSK**`!q^J#O?mF{`>*oy@{IY%+mA^!|2vW_`>`aC{#3`#3;D_$^S^cM
zRcF+uTO2sICledvFgNMU@A%M)%8JbSLq{dD|2|2Sg8vvh_uV6*Q?F&rKaV{v_qz&y
z`f;stIb?Cb2!Cg7CG91Bhu@D@RaIrq-+o+T2fwFu#|j>lD6ZS9-t^5cx>p|?flqUA
z;Cgs#V)O#`Aw4$Kr)L5?|7f4izl!;n0jux}tEW$&&YB<mKXAV!4?lsqzpK~nm2X@%
zznz;rn1?^*{QmQRy*7FZTn2bH>Xz9o{+~HhoiYDJ`w5BVTl&ARya=M7zdy$FE<n#M
zl!>e}iGBur8XE>rhLj&_yDk5D4n2GJZ07u7%zyAfNtOLn;)M?h*Py-Xtql5a<V_m;
zgjM+PrKKg|+4S7GbD8ri{bv3|(WAftcJSQ3j463m3!*jX9@l3SwsIJ9$n(_<d<V}-
zdM?8m`TY6woc|B3{h0`#lz73zk}Uaq<w4i6rzBQ)?7HUX-1c18+m(<moCSvAXLye5
zh5c`8YLaL)x*b1$i#PuXiRV8kiNc2^j&+D1gdfb}|5oTH&30~%=gw3MWL>JOtL4<G
zQ+geX#i}{CfBuEhxKIYkhY836$5h(|e8hWgX@2-7&O3^caOQNC+RsJA9=Z|lz!|j~
zzv!M%E&bjs-ql8b^FEb%#q+R*m6a8_c=4j1p}V@eu9_R)yao8k1Y%7=kV>U8e|!t?
z((sc6&OJXrPdVef^wZV&x=Z&~uA7^ix8rly^rEj?#d&~pQ{HN8Yq|fZ#*bXn-26P^
z5!)xRzYO9{u6vx5@q_{FE4#7BipS#{&J7*>y}lTyV94}dfE%Yk>@@pDe&F7J09<pd
zBG-35{NWG(mj@qs;K5x_@BH1ar=NZmqYF>(-0|wuI|$of-MRfK51#t@t2+U|*s=W;
z!Y&t{dS%!4VEEi$efA!#<<7&04?kB}Soprd8*jYv;-Qj~h~4v>{XX~kjF+@Z7<<HU
zYqNw~nxvi3+#u~u4m8wBdt;r18fqQ5f-wkc<;fra!=7j)qI)jCZL`;m=MLi>t?^|i
z#>_ag2i-CRAM8Ret^rZt*^K?`G|o>1o(mLkewxyA)38k93`<~4VFI?5VB!kBh%NNU
zxb8K(^-MU1ImWQxG~nFB-Un;6n{lQz_FfsW9^H$Xcn{;+W^ZcG$0qLM#eNV=vGE@#
z1~k&!h4@T|IiI<47@pS|i?Qcl=XZJL#$JKve;booMqDUYY{(xcdj6STDE=n?;fsS1
ze`h~Q{CT$K{+{t+#*I1=&&-UU8M&}AwAxD-rMa=e!{0gQXP@6azBq9(ji11uJF%@5
zCvV`#*?;ZguQ7o|nH%bm*s&jLej#@B35gy32Z<i}p+w67N1l-O`bz9E2Q&Prl{J&c
zFtWxN6yt(CUz#|WFBayHKRA5RSe_Guv1?%CbBu>AE0`Pz@#j6R&kN5w{O4~1rhDoU
zEBdU)%Nl?8zi|DR((u|gg~r$aLYmGMyK%FO*qLvwxK5+cn*`;O`16c!&&XT{$j~5k
zXb^fbh<puUpgSc4h;a^JPcx88NIwB_wZ3>1GT-CI*Nj{-?r7HNg=e3E{6rxuluPXY
z5Nm8ktc$o4-^SO0|Es_sp!A$8GVwOX+%)cH<;=u#R#nz;7QsHl;J@a{5NUAmAHq4D
zIU5@jT!h?kUp|g~iN*!>jM6K!W5ar0v~fWrSHK@})@6Lh#h<Y-#lOkKs1PG-dHahJ
zM$9B!@NH=agbTkTEj7nH{j+*#V~1D+#UC`_oFZ}Me`Xv{@kczB_^%*-rLiN#^HvZC
zW(<sHDV`^1p=WbA*Ya%3^OlV(W{)pCXZUY^cUfk7fj?qhj5jjg$(WPI9Nz{#c;9@!
z)Zp*vi`o)@{L|5U;-82?ew;X@(E~@0um(f0$%}}ESvgw3SzYA_xsriy$PoeZL|V8W
z{@A2<JtHqX_pFg0#+X+jKYhgiuT=-g|90fanqL15WCybU=I0>)C6F6@)&-+C3(zO!
z8+kV|B7LctM3DpI*~EYo>vCj>_?x&H;>y0*vKwE<xtH<PVcLDjlozY_*>0?vi$CLt
zfSJB##P|M2dEUDBPKW=9cY-F;L;h3Fs4E<eJzSD0o_jT(!I%bYf7s+A4F4S&vU&{u
zGbX8LWQ`N}<B$_Fk65OWB{ME!ZERdNV}zY};koB_$6`_N2)YHB>2ERdN#NSL7ctAC
z?-}_a{*L@GA7JHJudx<WJi9vaTgF5Z9j)pgxL;;`&B{@bE%JPV^=rl!1jcq@Z#B+K
zI|2CR^UoXk0q$!Sf5ta~Z|k1Fh3?+3@pjdRw-9@${9~P5058{|`@~;!oxq)E`a}o(
z8TJsw+Xa=SEL)22TOOnx8*XCLjxTj%)P9=0>tDVA{K5Y<t}S3@pcVZ8Th-w<@*n!!
z{5Iw1^Pc<=f6hypBmP*AsZr+1oqVnGKO_xxS8yg@lnLzHXK^lHLXLT2Y)od6$6zjW
z9C6|q#F-b7CmbIcmKp4m7BvnvBs0jtGR{3Vggi9%Ow@12rlw(+%(c0Xy{wTRCzd-q
z*e0R(?n0dVtJ1#zZi$pWqOotrym_zr!eLj|ROWD&A`Mex27eRR=>h*k(%#x4W7w+^
zcb-+ofbT5ieG+@QG2lx&7!MyE2JWDP@$k`M;0`*d+oQmJ2A^de!3c53HFcfW_Wtv<
zKghQ;*FifmI}kE4dc@1y-u<d{7CivIL!OYgVGO<b{2`UIHP{i#n~qoq@_&@^AO(Z}
z#dBx%d`SP8OeFNo#JyrN5tr_+l*A&Pl8ncsJC&4ZX9w(URJxP6hTSsP33H9_bi)@%
zu_vKVG}rhHu7CFAlP>;@qs|V75Z^|Q0l0?teobTE8t<n*L#~=H98x(W?vyu^e<1&d
zVCNt|KKw6VydWvylS1AzNdOH7;z|Q?cL6+10ul;Q-^lCSu>Gl@EB?k#q_wUjypJ*R
zyEI=DJ^Z+d*&}B_xoWvs27LtH7972qqMxVFcX9}c&JbeNCXUZM0`nQIkf&C}&skSt
z^9fw@b^Hb)!^hE2IJq~~GktG#ZWwWG<`@V&ckVR&r=JAO4YniJewVcG`HF;59}=bf
zLyz0uxf6MhuSyH#-^!ZbHxYl<XIQZKGrvIGxelxgp{*E!yiZR}IrSkt->^mmBVrx)
zyrb8sQ*qBd_WXm9c~Of$&ZP$b^)<~0%nt#7<SN=BJIqx?5B)&%HI%7#(A9E*{D)1a
zzF<__h-;n;xMv$>y$1Jg$e}WCK>TeUB{P>|b1FAB?%K7>;XiOfd}JQ`|IP#Vf%kVy
zXa4;XFZ+>n;F>uX&3|4zqWK2u3c<>q;tzjsb1;d{u;L$-hq3qe@82(ob<3qom#%`+
z;vzYAs7TIMl_O75BXu|r`Qhc4UT*vN$3Oo0kAC!{f2#HexDy|qUpgTF;k{o6|L>7l
z=?`=*LXaow1o;o<tE{OE(?2=<A4MF}#OA>NNLXsGTrvC)$R&{m=94Tf+2iTT3Y_Or
z-!;^0a{kyWtO4vksG_3cyc7HQ0~detf0+2+qxq(e1NS251N}w5iTSrM)`0p8rem!j
zZ<hbA{CN2H;rvl^?u=Z#a9)8m2_BTo>56hGD=pHI*B+dd)2B`%|9f0goozCSeXPw3
z+58k~sI02Yz#lOneJzYcG)EB0|F+ggC6D|B`6}d0khAK<z1EteZqA7EX64Ap4|63J
zj4Um~{}W6Oi8&OL<FvV6o6oW%_Z}v%WpZ1@U(esz>-gz7U3EGT|M_9$ZINqZjwf>P
zJCZ=ogSoE`=yV5YXrcTQZx@Un(64*AlLiyxWnCJ9I<5Nc*eK6eV1Mk}ci0*NrJ=t|
zCXuJG`#7GBbPceFtFEpl{(lTm`LX=B_!H+&<jfTRckhNg0e{@1{I9PYT{krFIt@FQ
zg+FwG^sp{Y@uzMp4aUaWbr@wX&jIfL%sQAoAlG7w_&aAJ|2mvGb0(1gMt;7hdCnN>
z>$*<vlz7PxQ0w-nB#-=5Lba8aRA*erxDLBLmXZInYq6sEvo_D#CSM*dTb3*>Hf}}y
zkt@nLXFG9%v**s{z&{H4e?aq<G31K6PCl)5elgO3{9)UrlZrQaZ(c^0v}TWI7z^P2
zsLTIFwM(SQ+9#ebDO2=!Tnny)T?^fZ19!?2&qc&PopnY%cm7<U{45MZe<3%K{ohhL
zm~)LF=iB)n^a1x;FCKO9wu8Z+e$vIAGyqou>p%&l#oU8lxUxk2o%K+?aAe6jLojA&
z_|J0<&#5-%u^<;NT*%4)n2-OdqfctSl6iCHE?W_Q2zpJken#_xUJlidzs249H=b#g
z?}L4-Tnp6)t_5X?_$v)vz`s9@^BME2X@w<>sKZ3=B{%*B$T5Nj%6!-Hr;I!Scj`lH
z&2dHFlOISwWJ&S2vf~@I4i~(0*T%OFiuX|eD*nd2utS4$1_JM?zmp>a#CsVy6Er^z
zeNNZZDE?R3pM?>~e?H_N`C`hy%m4jb;6L#8=a7l>3eJS2LGgEUxsau-Yh9l~o7=Yh
z2mYg3`m5*3Ik|lKQf~euzZlCWzaN&=vHuHtOwK!2@W6)hqq$Zm|7`Nmu%9^F6UH?+
z@2ii+=iJ;ZzhiUKu$QB()nKk3FooI>Jr_IjzY6=qxYy;&mvi7BlQ?t4kRjIhb|2q?
zd^K~{-^cxjVSj?<hi6;nFqt>!Xs=Da5IHmFzRj!Kzh~b!?`P7c&T9s77VLYB?8_?F
zauM^)p;qFG!9PHLfIsnt43UnmV?Wn?Ki7aXSosgq;f?MYUuSIYwOn(5vWhb{f%$pn
z4ySN-z}_%7|B);A@PA5k*7kkdr4xZ@s{e9j+9w<CJ?O>;*RFm;XPDQwx%~;8i<oa^
zexLQs#C;Swe&jxL;2)Pn5quSD44CilIrSXYU_0#4b{VXBL&8lp8{)5e>BzSKTIGKO
z{53ZZU*OLr@S5=k;?CM^i#zkxs3Sj%z0U`L%q`qM+t<Pf&d|V}H3F<zNPq^dnLw>P
zX$aL;*^g$7<Ue(mJhn9?_FDN)+hp<2y0&!%%(W5co>UyM2Go+_4A+f)IQcy^G$h2E
zb?nT$<GLCMXx=#+f8x!0hdAV2X~A_&-#?U7{;x-VC^O92Wb?eSzE+S6RX|=;&pC$<
z9g@=0Qq9>XlgTEFJI8GN6NQf%-eVn9mPilRqUbT$pN-|;FEjq@Ao&TxpZg=mEgBHB
zU@grU;&sfmqlO=6|G3sU;7t8rbK$?X0y_v9$^{X`m4jZ_BR|B|@?ZCLSPPEzz`w1n
zP5nA;4(kQFKm%$enjkkBxM%Y}2si&d|62L)U(dCzCGn56HN+i#6|nV-TGIo0;W;`(
zW-y=1KF4dp$$mC_|6}pbb>IHoKQeZajXQB>jVR?u`R>%l1o54?6NnS*arpVopdEF;
zeC5J3*M0p`*8lif;!irrcjC?(uExejsi~>4wKYwstGY^N@KY}TujLx`S=Cu+T=!dx
zKWlPm->I**E{A*q-Z^FFT5$G%7Ij0_*Mo4-y6~RmyTzUB&l<K=Dpmb{^4-!94u`ca
zdNVoO>fae(WZfO>um}mnsDXPEbau-!13!!xd!qh*{C)6&bz0j1I{>y$D-S)b*)J<Y
zxc^5t3qJV45B`taZ@>MCPk!=~KL&6Ngin0p6MCOxF2L_R9t8N!$2Wpced<#`y!F;w
zKTi5V_kX&X09wAIJ#anfg9Dhn0s7(C6Nj3S-mVn(i|C6ZAV<aixb6h<Sg0H6jw4qU
zV~?Bz5!)*lmM-iqJqY1C7nsj&+qP{N{V-~a1^op#4Sw~jUm=fL>q0$hE)874co};g
z^hR7pe4lU$P;*ggYc4o&UTQC%liCXooIfkI3TNaBV%t~FRr}yHu7kjQ2J*3;e%;iW
zvDVCh8=G80KAeyhCuY2LjrC!Od1rvF7h}zszxGV)&!)6ChP5WAjv-zQAMNJIG!JHS
zwl?pLxC-V5II#(hQ`<T9_no>l)ZAp&M0xd4%cxmco*MIk?{BD=BK`1vpc}D39|XlV
z{c&0oGdDa~TL2FT4lh=~1NL5O-P~0?V2#ie`v^CnANfGUM!b4F=JkCwd7Q`c8Na2q
zJGQQk^?6w}Vg9-{|2047((lAV84uN%sK!N2?V(!_1{{<Jh_kyRt}|;t96pc-^Er3`
zo}iC2gMPObPU{|m=x2|p6X&-wXJt%zkSPP3@xa!}dGs%8Jc%(S1BMS)CX6g%9UNV-
z>v6rdgZl56f0zDMQ+q)jKzzu^ztsVken;=DjAh6G`Cw`Q4G+BjS+n*=KI~^K{W=%t
zbD-rN)O4|*Q~@<#@1Vx$E!0W9`B~IZeFn87sHMXD>$M%|Bh93rdGf1lKo<R02YmTL
zqhr<%m_BFM7Fa&y947^SQ}y4{ZAaF|G`@C+sh521)5?cN^cOe0_9@gH-Y$)(pJd(P
z_1X@lpSgXfMnLNXGU%rcETRu24v0w?{GLKAA}IoVUkW|qDfm7YI>X3K651t&nhsl=
zXxG|%@8}Bbrlp_u#t*DZX<}_0Yb{A9*1Pd_)LtqNwy6xT4pZrOY{s?N4)pPwT(i#y
zT%`lRi8U#Ken4fw>H+N`{f#FF<O6FlgJ{<Kj?Q@Wliwb+>?ZxFlLZg7z7#cr4X>id
z{9kUD`d2=w_Zlb{^c`5IOxWCZ1k<0T1D1Z31IU0Q2edsZ1K0xv$pQVYq2KEp&#v#Z
z?{m@Lin;*S<!No<o1d3X^w>tr(C2sfF^L>{R3cjY`~#)m>Wm$Y|1fzeS0-$(Q^z@}
zEO*vlb-<?wRtMA$a{Uv^+e}~R^M`&pP`_w=4t2sW50+lDC-HjPUHYxxaYn6a!kV+c
zpX(pPb74a0@ugg}?EV6381FQ7Pgs9Tw;k1Ys~vUZ0Q%wWr;HEDO@F2gSo*u52fF@{
z0q%z~Y=K`6U=z3xA^l!GtVgeR&-iJVe)8J~tTk;$y|}FzXPtY??k~a~!Uo`(3(c&V
z#ovwmXW9;9NBlZr@{{g90y1FeXN>^XK9>w&Ef^=Zzo-1AFSP#9zb~X5_+){$(eB4K
z8gtW+nl{q+CTh+>v(gWrsP^DB*ge(~Q$AGxJ-eYc1isti%$%nM<_&Ev?%|??PK`$p
z{f-PM{Ym8k<$$)(F9)tqz<CJIAM$L1BM%w-GTk@RUOM3L%cGxlX&$hqjP-p4?g8S*
zf2wthE%1v3ttI8(g6O9&p&r4WTH3u4^(Uy`C@Z$~Z!QCFO|beXXOCj#AWIfZKZ&zf
zwlZ<mX#YOv`9G~&1pUsa&k{hbqt<3(t(AT}<AbzwZ(!($j*x!R8U(=C*57b6bs&@n
z(qG`LzmNXS_5(h-GP;nxKcZc<fIT|*=|N!k@%Sua0Na&@Ec*Fei5AudgZ5_Zb=dRL
zy5~!dP56w~t?J)Mzt3*i+F{ENmwwIvn;HPhLRoR4kA5Ey0`~*<Tu44!-QpM^3mNiY
zd69ec=!ec>FJ?h&Dk<xHrU>@D?Dt{4CHKJWLs8$zy6+(R)pr@0ur)xY{=uXFFzH_>
z-F^tN1y(2hG8V)GpDg%wW0Px_ep~nIjD~*HCSxDi0y`H!`V*~RHs^uQsb1*bK<T$Q
z`bO#l_@MP@_8AMlIwG!r58^)LK@V~`<U<c)KlBAULJoQm1LD58CzVp$)XfpU%erPW
z8sA`jr0x}Uuf#ng_s;N@pg(vtd+S{Ehw)4s))#8cIdmaez5{i`_h`*|+aA>1qGpmd
zB1m`Cjw0`nLBF2|umz+a#2X$c?Lj;M?Lj;MUp*d>7j~ayNAyj@SLpeH`)BgRH}byy
zyQSat!;U{@O(<<2fp&oQkIy$z`_CQ-)O@RN;QD9T4y|wIJ^%U#(BF%=`i49}j!D-)
zkOwPSJaG03SMkE~BzW}b_v>LA&y)EEYO6sbdnTX*$>UF|JhZ&^MSb4}Tgbne_4n+C
zwI8<r-Iaf>U4i~PI>7a3{kVa8<kbN6eyGEHKpnx06E+}DNbur?yk^WW2oOhPEHMzw
z=X22?2K^zfKk0w-3x<B|f7Kqq?vehsJ&ym&vK>|))*%C0|K+bIbmV~a`|G#+`TU#g
zXW;bWIcWsQi9c4X*RUDpIfyoPY)2bI-r9)xulm1CJDkQd6u+f)_N=w1ElgEBjprPF
z3o?Ly0RVeY_{<?)|7`m4UeEKeU77W{UX5;9iATSc1JZBhfY1KP&`I@+zH<_On{%uq
zN9diKefHP4moxi1V~=fpz8!PYj~a2-Rue*yfn@o1>3~fPVckRMxe2lM8hj!B8F)JO
z!`AP6>u>5Y&3o9t0QxBpN<VbL&~J6p@r$}YA`b%i;P8Su%#HYA>E=lJx#NyIbp1gD
zzUYBIPYHIv9ngk-Zt~<)62^1Zs1LLYMh@_tP^I7EX-9)Ed0^@y{k65Gp0KRcTmMWw
zU|+)qx{#q0SL+4q?Q`i0>COIIF8a0Cf&C`hbMj?LmG9K&iW-?PJt*u)38tTXAP>@R
zZL6uH^!RYNq$p>PKz7f-zvg>OKXcZ8h!%Vo@{VUZp|+iUD_xb(N~G|6c#oQK^nHZU
zKg#F6<)+`rf~k*Xjjye<Hud7yLjT^qdxgMfvTOvezVxCTF3Oif0G_WIV`7|<P~nWc
ze(AR_33^2C!`bid4}IuE|D80@5BovapS?PO_T6`4{db`M<z8uj=gZLlJGJM6&pb2V
z_4I~1<lonN^!s_xCx=V%oYNfrBiZ*!d-lDc_piSEqKx(?Wdva3^UN8rzr^2Ta=Q97
zbMnl0{t<JZx`tWn&mJE>+syV{bwU2glMMMs-^ss4`bYaVroXzn`YQUd__UlZL_mLs
z(vO}k!~(mi|L+(5&;>r<;|OHnbXBE78LruP;{yBxZ6y7K3)nMo-{6PCI7gQi6+rF_
zkPod!Z8n}q46ykrlQS|hVB<q)&YlUNAEf(Uu_DAf!GkDzUD%_;=Nj{#_Uqt1dtf5y
z;SZ7>(}(2Kf7BCZ>Vc;V>ccbk2~NGaf6wGQH@W9&?Zt3v(h*P4xDrN>ex7+jH*+Qg
z%^jH$&+*!v{sQ!xkWN4+>|b}qGvEd6ANzgqoVy5Qfws}ef2QqF{iiR5{pT}PS&yjo
z>lron#va-p=v;m>WB+XVz|o;UJFdjo5_!RRD|6W{4}A2a#bZ<YY5zOXFUQ`X@ZP(W
z{s{U%j85F8y<6<33tE5Ak68a_c;MC|yL{ktG|gVY^ADbn^!84m*MEMxiVt3lk+CKA
zNb%h3<?@Xjs4RdF=h6F?ZU20tua_~bKYP8{-xA*Y4e7!9EB(0Udp_^a`hUOO;5Gl#
z5jHhr?F00{?z@eCP$vBJ+iSab%;E!Oz$Xi%DibEYrm<#?yF0OWCss@zphsqN`q5Lu
zz8>v)gS_`b|KsSH)Sd_JIr%<%n06TX&t{&!H#{)?4W9hlJ`R1>FyugOh3=D_{einr
zu(Wf`qTkvED+gEULO0I*Hs%f;&=`=X4;N8Ovf28x$A*11`dmfy2=$+PNqX>XcG`h%
zJY&A6@&)*WT^rC(Caj}2+|X|6cICm5h0OK0cGB_!wEKFZJU)OQ+TZ1q2bTx9hxnq&
z$9ee|f9|0M^)#E&Pr4)f?o&DMM4w>Ksb{hF(0|wh+5_{vPow{V%TFzU2za&gjttNi
zIyR9qA56dX52Qbv2aY^g`U7R43-p`#sO1A=K<Q;83+yZ2l>S2aKgfR+Yu^bQ*i-qu
z%0mP;Ap)B~zZgO9lG^`325gOf?iUHF{~7jyGC)3L(eL(SQ70VzR~wLN18tnx(Cz2~
zctBl1kI)wAe+cxWHw*NW-d;=pd+>+wd$a@GBju*wFvabSaP<Ja6qEsn*3Id6d4Rqr
z^l|y<AEzB~*WX9~0M>tHiT!o#QFC+wBVwYo3s=y;z1jM+M=Fj!FZM>UzpL-eZzOT(
zhmZmEfWa=%KE#V3-ZK5#v!Hz<pvTgWaXk$=0q8wlZ_?`kYW{7!0CX>d{zc^{ctF~-
z>DT-U`}5!fk$aj24`#uGdB7r`>oX5tU|d*b|N3V1lXmv%MGrvE(dXG)^-J*LA>$LE
z7kut4`zE)v{@Op|(|@i#c>tM!12FQh?}PfA0`Bp%=%*RiXVzLDXnXtE@4B)5uR}a>
zbNU}q+712pIrM`k^odG8dKtG$zwHmQI^c}tfjx5?egx3!e%JRm_64e+>`Ra1IRfLb
z1KQ`SxmH{cZfyVS5m(&`{V}Y4j6J{b17`h6KWqZ&hfc(<m44z)dfXB6&vU2slR>oR
zxM%w!$F(mKy05kY&lco3%zvLCxBW+t*rxO+i=qGMvobx0-<7`VUu)ka`){=ew+Ovt
zg%52_{&UbkUA8aJPWsk)gYWV4`dnxI%s?7^fGpq{ZQuu=VH{-t7w~K%_E<8`zS;V-
zKTho*>;UQQul^1GT^HCt@I-q?)&4!QDgBndn?3sNKYKCQFU4LGKJ$n@Je$&w9@E$X
z^p@iJ(v<nWs((bE+M|w5L=Us_;lY2i^s{%yg6)%J4-lXC#CZGW^gpJ(s_ajV?!O=O
z|C7?MHi32l&s(N{*pmI<M2@dV_Wj@S_qE!d#UR?*C(6D*_Cak*KlNXGMIrBy1N}FN
z@XUh*`bF7$*>&`1(tq~1zc>0Vow-KR&vm!GUzT?Eqgnc)leZ9p)-Z*C!zqb=-$XG0
z^!8RfuQs5s>Q~qcz92(a_Q+KH?C*vCTr~UdTiR`JGuNH8v(J|FTiSEcPrBpmHRtmd
zI2Jng0J=bXK);YY^rM?jzn?~X-Pe`GbAy{D)Y6D&1GY-EBcy%Bq?bKh?A>DD9DD!p
z?{q02wno2sraGUkZv5dx+J8)&K$)No43Zr(*S`FEdL!4C)}WE}vJd%{S6-3VUw>Wp
z?Aasv`T0^%P$2vE?L+Qhj~qB~K%eW)xH(=b_jU}TLD&BP*Pc9hz@Z=e0nkpLkWl}>
z_5J^i(9Z7$(XG9~I3sY)`OGZ#_L06+Dy4E>UstcP-rU@xJ$&rxvo!n1Ao`P~KLU-8
z{zDgN4-&A6N!kPSYbQ&7sLufi`YtE2uN$S?e&5n>Y4(q#|KP!cc1j)T^QrUXMPFaP
z_SoYO8S8G}Z$?AL4`;pE?7J5K8yWqy23>cCT2<b;m*$JK^VtIU_Y$NB`p^DNyaH+G
z{mp3Lmvg;t<h!|kGyA^37d!i!w9>{=-)+A$X^-I9=e!@J@A&-;Ufc)`H}c(VI&;0x
zrrGv()5mjP%jXzS{^|29?bLNXS0bC%p!YXI!;O457rjCEEzMkGf~B3$T}dXBO23tP
z+Ci>;5UoM?C@bU@f9G1^X3=ly&ZeFH<@|RnOG--A&)fd)AUgjw?%izq{p(KJ`EP0v
z2mU)P!+3t@X14DA=E2RR-|p${GZ9ETX=d+kJRZL$nSa0daI@&oUUxnZg0xd_xu>Vz
lzF#z5%kSKX?YLH3ll^(hI(_`L*t#Iva2Ede*Z;>H_<!%{oZJ8a

diff --git a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/packages.config b/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/packages.config
deleted file mode 100644
index 98c8416..0000000
--- a/vendor/git.apache.org/thrift.git/lib/csharp/test/ThriftMVCTest/packages.config
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<packages>
-  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/d/Makefile.am b/vendor/git.apache.org/thrift.git/lib/d/Makefile.am
deleted file mode 100644
index 5c529ba..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/Makefile.am
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-AUTOMAKE_OPTIONS = serial-tests
-
-SUBDIRS = .
-
-if WITH_TESTS
-SUBDIRS += test
-endif
-
-#
-# Enumeration of all the public and private modules.
-#
-# We unconditionally install all of them, even if libevent or OpenSSL are
-# not available, but build the respective libraries only if the Deimos headers
-# could be found.
-#
-d_thriftmodules = $(addprefix thrift/, base)
-d_thriftdir = $(D_IMPORT_PREFIX)/thrift
-d_thrift_DATA = $(addprefix src/, $(addsuffix .d, $(d_thriftmodules)))
-
-d_asyncmodules = $(addprefix thrift/async/, base libevent socket ssl)
-d_asyncdir = $(d_thriftdir)/async
-d_async_DATA = $(addprefix src/, $(addsuffix .d, $(d_asyncmodules)))
-
-d_codegenmodules = $(addprefix thrift/codegen/, async_client \
-	async_client_pool base client client_pool processor)
-#d_codegenmodules = $(addprefix thrift/codegen/, async_client \
-#	async_client_pool base client client_pool idlgen processor)
-
-d_codegendir = $(d_thriftdir)/codegen
-d_codegen_DATA = $(addprefix src/, $(addsuffix .d, $(d_codegenmodules)))
-
-d_protocolmodules = $(addprefix thrift/protocol/, base binary compact json \
-	processor)
-d_protocoldir = $(d_thriftdir)/protocol
-d_protocol_DATA = $(addprefix src/, $(addsuffix .d, $(d_protocolmodules)))
-
-d_servermodules = $(addprefix thrift/server/, base simple nonblocking \
-	taskpool threaded)
-d_serverdir = $(d_thriftdir)/server
-d_server_DATA = $(addprefix src/, $(addsuffix .d, $(d_servermodules)))
-
-d_servertransportmodules = $(addprefix thrift/server/transport/, base socket ssl)
-d_servertransportdir = $(d_thriftdir)/server/transport
-d_servertransport_DATA = $(addprefix src/, $(addsuffix .d, \
-	$(d_servertransportmodules)))
-
-d_transportmodules = $(addprefix thrift/transport/, base buffered file \
-	framed http memory piped range socket ssl zlib)
-d_transportdir = $(d_thriftdir)/transport
-d_transport_DATA = $(addprefix src/, $(addsuffix .d, $(d_transportmodules)))
-
-d_utilmodules = $(addprefix thrift/util/, awaitable cancellation future \
-	hashset)
-d_utildir = $(d_thriftdir)/util
-d_util_DATA = $(addprefix src/, $(addsuffix .d, $(d_utilmodules)))
-
-d_internalmodules = $(addprefix thrift/internal/, algorithm codegen ctfe \
-	endian resource_pool socket ssl ssl_bio traits)
-d_internaldir = $(d_thriftdir)/internal
-d_internal_DATA = $(addprefix src/, $(addsuffix .d, $(d_internalmodules)))
-
-d_testmodules = $(addprefix thrift/internal/test/, protocol server)
-d_testdir = $(d_internaldir)/test
-d_test_DATA = $(addprefix src/, $(addsuffix .d, $(d_testmodules)))
-
-d_publicmodules = $(d_thriftmodules) $(d_asyncmodules) \
-	$(d_codegenmodules) $(d_protocolmodules) $(d_servermodules) \
-	$(d_servertransportmodules) $(d_transportmodules) $(d_utilmodules)
-d_publicsources = $(addprefix src/, $(addsuffix .d, $(d_publicmodules)))
-
-d_modules = $(d_publicmodules) $(d_internalmodules) $(d_testmodules)
-
-# List modules with external dependencies and remove them from the main list
-d_libevent_dependent_modules = thrift/async/libevent thrift/server/nonblocking
-d_openssl_dependent_modules = thrift/async/ssl thrift/internal/ssl \
-	thrift/internal/ssl_bio thrift/transport/ssl thrift/server/transport/ssl
-d_main_modules = $(filter-out $(d_libevent_dependent_modules) \
-	$(d_openssl_dependent_modules),$(d_modules))
-
-
-d_lib_flags = -w -wi -Isrc -lib
-all_targets =
-
-#
-# libevent-dependent modules.
-#
-if HAVE_DEIMOS_EVENT2
-$(D_EVENT_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_libevent_dependent_modules)))
-	$(DMD) -of$(D_EVENT_LIB_NAME) $(d_lib_flags) $^
-all_targets += $(D_EVENT_LIB_NAME)
-endif
-
-#
-# OpenSSL-dependent modules.
-#
-if HAVE_DEIMOS_OPENSSL
-$(D_SSL_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_openssl_dependent_modules)))
-	$(DMD) -of$(D_SSL_LIB_NAME) $(d_lib_flags) $^
-all_targets += $(D_SSL_LIB_NAME)
-endif
-
-#
-# Main library target.
-#
-$(D_LIB_NAME): $(addprefix src/, $(addsuffix .d, $(d_main_modules)))
-	$(DMD) -of$(D_LIB_NAME) $(d_lib_flags) $^
-all_targets += $(D_LIB_NAME)
-
-
-#
-# Documentation target (requires Dil).
-#
-docs: $(d_publicsources) src/thrift/index.d
-	dil ddoc docs -hl --kandil $^
-
-
-#
-# Hook custom library targets into the automake all/install targets.
-#
-all-local: $(all_targets)
-
-install-exec-local:
-	$(INSTALL_PROGRAM) $(all_targets) $(DESTDIR)$(libdir)
-
-
-clean-local:
-	$(RM) -rf docs $(D_LIB_NAME) $(D_EVENT_LIB_NAME) $(D_SSL_LIB_NAME) unittest
-
-
-#
-# Unit tests (built both in debug and release mode).
-#
-d_test_flags = -unittest -w -wi -I$(top_srcdir)/lib/d/src
-
-# There just must be some way to reassign a variable without warnings in
-# Automake...
-d_test_modules__ = $(d_modules)
-
-if WITH_D_EVENT_TESTS
-d_test_flags += $(DMD_LIBEVENT_FLAGS)
-d_test_modules_ = $(d_test_modules__)
-else
-d_test_modules_ = $(filter-out $(d_libevent_dependent_modules), $(d_test_modules__))
-endif
-
-if WITH_D_SSL_TESTS
-d_test_flags += $(DMD_OPENSSL_FLAGS)
-d_test_modules = $(d_test_modules_)
-else
-d_test_modules = $(filter-out $(d_openssl_dependent_modules), $(d_test_modules_))
-endif
-
-unittest/emptymain.d: unittest/.directory
-	@echo 'void main(){}' >$@
-
-unittest/.directory:
-	mkdir -p unittest || exists unittest
-	touch $@
-
-unittest/debug/%: src/%.d $(all_targets) unittest/emptymain.d
-	$(DMD) -gc -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
-
-unittest/release/%: src/%.d $(all_targets) unittest/emptymain.d
-	$(DMD) -O -release -of$(subst /,$(DMD_OF_DIRSEP),$@) $(d_test_flags) $^
-
-TESTS = $(addprefix unittest/debug/, $(d_test_modules)) \
-	$(addprefix unittest/release/, $(d_test_modules))
-
-precross: all-local
-	$(MAKE) -C test precross
-
-EXTRA_DIST = \
-	src \
-	test \
-	README.md
diff --git a/vendor/git.apache.org/thrift.git/lib/d/README.md b/vendor/git.apache.org/thrift.git/lib/d/README.md
deleted file mode 100644
index 5d37e4f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-Thrift D Software Library
-=========================
-
-License
--------
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Testing
--------
-
-D support in Thrift is covered by two sets of tests: first,
-the unit test blocks contained in the D source files, and
-second, the more extensive testing applications in the test/
-subdirectory, which also make use of the Thrift compiler.
-Both are built when running "make check", but only the
-unit tests are immediately run, however – the separate test
-cases typically run longer or require manual intervention.
-It might also be prudent to run the independent tests,
-which typically consist of a server and a client part,
-against the other language implementations.
-
-To build the unit tests on Windows, the easiest way might
-be to manually create a file containing an empty main() and
-invoke the compiler by running the following in the src/
-directory (PowerShell syntax):
-
-dmd -ofunittest -unittest -w $(dir -r -filter '*.d' -name)
-
-If you want to run the test clients/servers in OpenSSL
-mode, you have to provide »server-private-key.pem« and
-»server-certificate.pem« files in the directory the server
-executable resides in, and a »trusted-ca-certificate.pem«
-file for the client. The easiest way is to generate a new
-self signed certificate using the provided config file
-(openssl.test.cnf):
-
-openssl req -new -x509 -nodes -config openssl.test.cnf \
-  -out server-certificate.pem
-cat server-certificate.pem > trusted-ca-certificate.pem
-
-This steps are also performed automatically by the
-Autotools build system if the files are not present.
diff --git a/vendor/git.apache.org/thrift.git/lib/d/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/d/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/base.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/base.d
deleted file mode 100644
index 8debc3b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/base.d
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Defines the interface used for client-side handling of asynchronous
- * I/O operations, based on coroutines.
- *
- * The main piece of the »client side« (e.g. for TAsyncClient users) of the
- * API is TFuture, which represents an asynchronously executed operation,
- * which can have a return value, throw exceptions, and which can be waited
- * upon.
- *
- * On the »implementation side«, the idea is that by using a TAsyncTransport
- * instead of a normal TTransport and executing the work through a
- * TAsyncManager, the same code as for synchronous I/O can be used for
- * asynchronous operation as well, for example:
- *
- * ---
- * auto socket = new TAsyncSocket(someTAsyncSocketManager(), host, port);
- * // …
- * socket.asyncManager.execute(socket, {
- *   SomeThriftStruct s;
- *
- *   // Waiting for socket I/O will not block an entire thread but cause
- *   // the async manager to execute another task in the meantime, because
- *   // we are using TAsyncSocket instead of TSocket.
- *   s.read(socket);
- *
- *   // Do something with s, e.g. set a TPromise result to it.
- *   writeln(s);
- * });
- * ---
- */
-module thrift.async.base;
-
-import core.time : Duration, dur;
-import std.socket/+ : Socket+/; // DMD @@BUG314@@
-import thrift.base;
-import thrift.transport.base;
-import thrift.util.cancellation;
-
-/**
- * Manages one or more asynchronous transport resources (e.g. sockets in the
- * case of TAsyncSocketManager) and allows work items to be submitted for them.
- *
- * Implementations will typically run one or more background threads for
- * executing the work, which is one of the reasons for a TAsyncManager to be
- * used. Each work item is run in its own fiber and is expected to yield() away
- * while waiting for time-consuming operations.
- *
- * The second important purpose of TAsyncManager is to serialize access to
- * the transport resources – without taking care of that, e.g. issuing multiple
- * RPC calls over the same connection in rapid succession would likely lead to
- * more than one request being written at the same time, causing only garbage
- * to arrive at the remote end.
- *
- * All methods are thread-safe.
- */
-interface TAsyncManager {
-  /**
-   * Submits a work item to be executed asynchronously.
-   *
-   * Access to asnyc transports is serialized – if two work items associated
-   * with the same transport are submitted, the second delegate will not be
-   * invoked until the first has returned, even it the latter context-switches
-   * away (because it is waiting for I/O) and the async manager is idle
-   * otherwise.
-   *
-   * Optionally, a TCancellation instance can be specified. If present,
-   * triggering it will be considered a request to cancel the work item, if it
-   * is still waiting for the associated transport to become available.
-   * Delegates which are already being processed (i.e. waiting for I/O) are not
-   * affected because this would bring the connection into an undefined state
-   * (as probably half-written request or a half-read response would be left
-   * behind).
-   *
-   * Params:
-   *   transport = The TAsyncTransport the work delegate will operate on. Must
-   *     be associated with this TAsyncManager instance.
-   *   work = The operations to execute on the given transport. Must never
-   *     throw, errors should be handled in another way. nothrow semantics are
-   *     difficult to enforce in combination with fibres though, so currently
-   *     exceptions are just swallowed by TAsyncManager implementations.
-   *   cancellation = If set, can be used to request cancellatinon of this work
-   *     item if it is still waiting to be executed.
-   *
-   * Note: The work item will likely be executed in a different thread, so make
-   *   sure the code it relies on is thread-safe. An exception are the async
-   *   transports themselves, to which access is serialized as noted above.
-   */
-  void execute(TAsyncTransport transport, void delegate() work,
-    TCancellation cancellation = null
-  ) in {
-    assert(transport.asyncManager is this,
-      "The given transport must be associated with this TAsyncManager.");
-  }
-
-  /**
-   * Submits a delegate to be executed after a certain amount of time has
-   * passed.
-   *
-   * The actual amount of time elapsed can be higher if the async manager
-   * instance is busy and thus should not be relied on. The
-   *
-   * Params:
-   *   duration = The amount of time to wait before starting to execute the
-   *     work delegate.
-   *   work = The code to execute after the specified amount of time has passed.
-   *
-   * Example:
-   * ---
-   * // A very basic example – usually, the actuall work item would enqueue
-   * // some async transport operation.
-   * auto asyncMangager = someAsyncManager();
-   *
-   * TFuture!int calculate() {
-   *   // Create a promise and asynchronously set its value after three
-   *   // seconds have passed.
-   *   auto promise = new TPromise!int;
-   *   asyncManager.delay(dur!"seconds"(3), {
-   *     promise.succeed(42);
-   *   });
-   *
-   *   // Immediately return it to the caller.
-   *   return promise;
-   * }
-   *
-   * // This will wait until the result is available and then print it.
-   * writeln(calculate().waitGet());
-   * ---
-   */
-  void delay(Duration duration, void delegate() work);
-
-  /**
-   * Shuts down all background threads or other facilities that might have
-   * been started in order to execute work items. This function is typically
-   * called during program shutdown.
-   *
-   * If there are still tasks to be executed when the timeout expires, any
-   * currently executed work items will never receive any notifications
-   * for async transports managed by this instance, queued work items will
-   * be silently dropped, and implementations are allowed to leak resources.
-   *
-   * Params:
-   *   waitFinishTimeout = If positive, waits for all work items to be
-   *     finished for the specified amount of time, if negative, waits for
-   *     completion without ever timing out, if zero, immediately shuts down
-   *     the background facilities.
-   */
-  bool stop(Duration waitFinishTimeout = dur!"hnsecs"(-1));
-}
-
-/**
- * A TTransport which uses a TAsyncManager to schedule non-blocking operations.
- *
- * The actual type of device is not specified; typically, implementations will
- * depend on an interface derived from TAsyncManager to be notified of changes
- * in the transport state.
- *
- * The peeking, reading, writing and flushing methods must always be called
- * from within the associated async manager.
- */
-interface TAsyncTransport : TTransport {
-  /**
-   * The TAsyncManager associated with this transport.
-   */
-  TAsyncManager asyncManager() @property;
-}
-
-/**
- * A TAsyncManager providing notificiations for socket events.
- */
-interface TAsyncSocketManager : TAsyncManager {
-  /**
-   * Adds a listener that is triggered once when an event of the specified type
-   * occurs, and removed afterwards.
-   *
-   * Params:
-   *   socket = The socket to listen for events at.
-   *   eventType = The type of the event to listen for.
-   *   timeout = The period of time after which the listener will be called
-   *     with TAsyncEventReason.TIMED_OUT if no event happened.
-   *   listener = The delegate to call when an event happened.
-   */
-  void addOneshotListener(Socket socket, TAsyncEventType eventType,
-    Duration timeout, TSocketEventListener listener);
-
-  /// Ditto
-  void addOneshotListener(Socket socket, TAsyncEventType eventType,
-    TSocketEventListener listener);
-}
-
-/**
- * Types of events that can happen for an asynchronous transport.
- */
-enum TAsyncEventType {
-  READ, /// New data became available to read.
-  WRITE /// The transport became ready to be written to.
-}
-
-/**
- * The type of the delegates used to register socket event handlers.
- */
-alias void delegate(TAsyncEventReason callReason) TSocketEventListener;
-
-/**
- * The reason a listener was called.
- */
-enum TAsyncEventReason : byte {
-  NORMAL, /// The event listened for was triggered normally.
-  TIMED_OUT /// A timeout for the event was set, and it expired.
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/libevent.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/libevent.d
deleted file mode 100644
index 812e4a7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/libevent.d
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.async.libevent;
-
-import core.atomic;
-import core.time : Duration, dur;
-import core.exception : onOutOfMemoryError;
-import core.memory : GC;
-import core.thread : Fiber, Thread;
-import core.sync.condition;
-import core.sync.mutex;
-import core.stdc.stdlib : free, malloc;
-import deimos.event2.event;
-import std.array : empty, front, popFront;
-import std.conv : text, to;
-import std.exception : enforce;
-import std.socket : Socket, socketPair;
-import thrift.base;
-import thrift.async.base;
-import thrift.internal.socket;
-import thrift.internal.traits;
-import thrift.util.cancellation;
-
-// To avoid DMD @@BUG6395@@.
-import thrift.internal.algorithm;
-
-/**
- * A TAsyncManager implementation based on libevent.
- *
- * The libevent loop for handling non-blocking sockets is run in a background
- * thread, which is lazily spawned. The thread is not daemonized to avoid
- * crashes on program shutdown, it is only stopped when the manager instance
- * is destroyed. So, to ensure a clean program teardown, either make sure this
- * instance gets destroyed (e.g. by using scope), or manually call stop() at
- * the end.
- */
-class TLibeventAsyncManager : TAsyncSocketManager {
-  this() {
-    eventBase_ = event_base_new();
-
-    // Set up the socket pair for transferring control messages to the event
-    // loop.
-    auto pair = socketPair();
-    controlSendSocket_ = pair[0];
-    controlReceiveSocket_ = pair[1];
-    controlReceiveSocket_.blocking = false;
-
-    // Register an event for receiving control messages.
-    controlReceiveEvent_ = event_new(eventBase_, controlReceiveSocket_.handle,
-      EV_READ | EV_PERSIST | EV_ET, assumeNothrow(&controlMsgReceiveCallback),
-      cast(void*)this);
-    event_add(controlReceiveEvent_, null);
-
-    queuedCountMutex_ = new Mutex;
-    zeroQueuedCondition_ = new Condition(queuedCountMutex_);
-  }
-
-  ~this() {
-    // stop() should be safe to call, because either we don't have a worker
-    // thread running and it is a no-op anyway, or it is guaranteed to be
-    // still running (blocked in event_base_loop), and thus guaranteed not to
-    // be garbage collected yet.
-    stop(dur!"hnsecs"(0));
-
-    event_free(controlReceiveEvent_);
-    event_base_free(eventBase_);
-    eventBase_ = null;
-  }
-
-  override void execute(TAsyncTransport transport, Work work,
-    TCancellation cancellation = null
-  ) {
-    if (cancellation && cancellation.triggered) return;
-
-    // Keep track that there is a new work item to be processed.
-    incrementQueuedCount();
-
-    ensureWorkerThreadRunning();
-
-    // We should be able to send the control message as a whole – we currently
-    // assume to be able to receive it at once as well. If this proves to be
-    // unstable (e.g. send could possibly return early if the receiving buffer
-    // is full and the blocking call gets interrupted by a signal), it could
-    // be changed to a more sophisticated scheme.
-
-    // Make sure the delegate context doesn't get GCd while the work item is
-    // on the wire.
-    GC.addRoot(work.ptr);
-
-    // Send work message.
-    sendControlMsg(ControlMsg(MsgType.WORK, work, transport));
-
-    if (cancellation) {
-      cancellation.triggering.addCallback({
-        sendControlMsg(ControlMsg(MsgType.CANCEL, work, transport));
-      });
-    }
-  }
-
-  override void delay(Duration duration, void delegate() work) {
-    incrementQueuedCount();
-
-    ensureWorkerThreadRunning();
-
-    const tv = toTimeval(duration);
-
-    // DMD @@BUG@@: Cannot deduce T to void delegate() here.
-    registerOneshotEvent!(void delegate())(
-      -1, 0, assumeNothrow(&delayCallback), &tv,
-      {
-        work();
-        decrementQueuedCount();
-      }
-    );
-  }
-
-  override bool stop(Duration waitFinishTimeout = dur!"hnsecs"(-1)) {
-    bool cleanExit = true;
-
-    synchronized (this) {
-      if (workerThread_) {
-        synchronized (queuedCountMutex_) {
-          if (waitFinishTimeout > dur!"hnsecs"(0)) {
-            if (queuedCount_ > 0) {
-              zeroQueuedCondition_.wait(waitFinishTimeout);
-            }
-          } else if (waitFinishTimeout < dur!"hnsecs"(0)) {
-            while (queuedCount_ > 0) zeroQueuedCondition_.wait();
-          } else {
-            // waitFinishTimeout is zero, immediately exit in all cases.
-          }
-          cleanExit = (queuedCount_ == 0);
-        }
-
-        event_base_loopbreak(eventBase_);
-        sendControlMsg(ControlMsg(MsgType.SHUTDOWN));
-        workerThread_.join();
-        workQueues_ = null;
-        // We have nuked all currently enqueued items, so set the count to
-        // zero. This is safe to do without locking, since the worker thread
-        // is down.
-        queuedCount_ = 0;
-        atomicStore(*(cast(shared)&workerThread_), cast(shared(Thread))null);
-      }
-    }
-
-    return cleanExit;
-  }
-
-  override void addOneshotListener(Socket socket, TAsyncEventType eventType,
-     TSocketEventListener listener
-  ) {
-    addOneshotListenerImpl(socket, eventType, null, listener);
-  }
-
-  override void addOneshotListener(Socket socket, TAsyncEventType eventType,
-    Duration timeout, TSocketEventListener listener
-  ) {
-    if (timeout <= dur!"hnsecs"(0)) {
-      addOneshotListenerImpl(socket, eventType, null, listener);
-    } else {
-      // This is not really documented well, but libevent does not require to
-      // keep the timeval around after the event was added.
-      auto tv = toTimeval(timeout);
-      addOneshotListenerImpl(socket, eventType, &tv, listener);
-    }
-  }
-
-private:
-  alias void delegate() Work;
-
-  void addOneshotListenerImpl(Socket socket, TAsyncEventType eventType,
-     const(timeval)* timeout, TSocketEventListener listener
-  ) {
-    registerOneshotEvent(socket.handle, libeventEventType(eventType),
-      assumeNothrow(&socketCallback), timeout, listener);
-  }
-
-  void registerOneshotEvent(T)(evutil_socket_t fd, short type,
-    event_callback_fn callback, const(timeval)* timeout, T payload
-  ) {
-    // Create a copy of the payload on the C heap.
-    auto payloadMem = malloc(payload.sizeof);
-    if (!payloadMem) onOutOfMemoryError();
-    (cast(T*)payloadMem)[0 .. 1] = payload;
-    GC.addRange(payloadMem, payload.sizeof);
-
-    auto result = event_base_once(eventBase_, fd, type, callback,
-      payloadMem, timeout);
-
-    // Assuming that we didn't get our arguments wrong above, the only other
-    // situation in which event_base_once can fail is when it can't allocate
-    // memory.
-    if (result != 0) onOutOfMemoryError();
-  }
-
-  enum MsgType : ubyte {
-    SHUTDOWN,
-    WORK,
-    CANCEL
-  }
-
-  struct ControlMsg {
-    MsgType type;
-    Work work;
-    TAsyncTransport transport;
-  }
-
-  /**
-   * Starts the worker thread if it is not already running.
-   */
-  void ensureWorkerThreadRunning() {
-    // Technically, only half barriers would be required here, but adding the
-    // argument seems to trigger a DMD template argument deduction @@BUG@@.
-    if (!atomicLoad(*(cast(shared)&workerThread_))) {
-      synchronized (this) {
-        if (!workerThread_) {
-          auto thread = new Thread({ event_base_loop(eventBase_, 0); });
-          thread.start();
-          atomicStore(*(cast(shared)&workerThread_), cast(shared)thread);
-        }
-      }
-    }
-  }
-
-  /**
-   * Sends a control message to the worker thread.
-   */
-  void sendControlMsg(const(ControlMsg) msg) {
-    auto result = controlSendSocket_.send((&msg)[0 .. 1]);
-    enum size = msg.sizeof;
-    enforce(result == size, new TException(text(
-      "Sending control message of type ", msg.type, " failed (", result,
-      " bytes instead of ", size, " transmitted).")));
-  }
-
-  /**
-   * Receives messages from the control message socket and acts on them. Called
-   * from the worker thread.
-   */
-  void receiveControlMsg() {
-    // Read as many new work items off the socket as possible (at least one
-    // should be available, as we got notified by libevent).
-    ControlMsg msg;
-    ptrdiff_t bytesRead;
-    while (true) {
-      bytesRead = controlReceiveSocket_.receive(cast(ubyte[])((&msg)[0 .. 1]));
-
-      if (bytesRead < 0) {
-        auto errno = getSocketErrno();
-        if (errno != WOULD_BLOCK_ERRNO) {
-          logError("Reading control message, some work item will possibly " ~
-            "never be executed: %s", socketErrnoString(errno));
-        }
-      }
-      if (bytesRead != msg.sizeof) break;
-
-      // Everything went fine, we received a new control message.
-      final switch (msg.type) {
-        case MsgType.SHUTDOWN:
-          // The message was just intended to wake us up for shutdown.
-          break;
-
-        case MsgType.CANCEL:
-          // When processing a cancellation, we must not touch the first item,
-          // since it is already being processed.
-          auto queue = workQueues_[msg.transport];
-          if (queue.length > 0) {
-            workQueues_[msg.transport] = [queue[0]] ~
-              removeEqual(queue[1 .. $], msg.work);
-          }
-          break;
-
-        case MsgType.WORK:
-          // Now that the work item is back in the D world, we don't need the
-          // extra GC root for the context pointer anymore (see execute()).
-          GC.removeRoot(msg.work.ptr);
-
-          // Add the work item to the queue and execute it.
-          auto queue = msg.transport in workQueues_;
-          if (queue is null || (*queue).empty) {
-            // If the queue is empty, add the new work item to the queue as well,
-            // but immediately start executing it.
-            workQueues_[msg.transport] = [msg.work];
-            executeWork(msg.transport, msg.work);
-          } else {
-            (*queue) ~= msg.work;
-          }
-          break;
-      }
-    }
-
-    // If the last read was successful, but didn't read enough bytes, we got
-    // a problem.
-    if (bytesRead > 0) {
-      logError("Unexpected partial control message read (%s byte(s) " ~
-        "instead of %s), some work item will possibly never be executed.",
-        bytesRead, msg.sizeof);
-    }
-  }
-
-  /**
-   * Executes the given work item and all others enqueued for the same
-   * transport in a new fiber. Called from the worker thread.
-   */
-  void executeWork(TAsyncTransport transport, Work work) {
-    (new Fiber({
-      auto item = work;
-      while (true) {
-        try {
-          // Execute the actual work. It will possibly add listeners to the
-          // event loop and yield away if it has to wait for blocking
-          // operations. It is quite possible that another fiber will modify
-          // the work queue for the current transport.
-          item();
-        } catch (Exception e) {
-          // This should never happen, just to be sure the worker thread
-          // doesn't stop working in mysterious ways because of an unhandled
-          // exception.
-          logError("Exception thrown by work item: %s", e);
-        }
-
-        // Remove the item from the work queue.
-        // Note: Due to the value semantics of array slices, we have to
-        // re-lookup this on every iteration. This could be solved, but I'd
-        // rather replace this directly with a queue type once one becomes
-        // available in Phobos.
-        auto queue = workQueues_[transport];
-        assert(queue.front == item);
-        queue.popFront();
-        workQueues_[transport] = queue;
-
-        // Now that the work item is done, no longer count it as queued.
-        decrementQueuedCount();
-
-        if (queue.empty) break;
-
-        // If the queue is not empty, execute the next waiting item.
-        item = queue.front;
-      }
-    })).call();
-  }
-
-  /**
-   * Increments the amount of queued items.
-   */
-  void incrementQueuedCount() {
-    synchronized (queuedCountMutex_) {
-      ++queuedCount_;
-    }
-  }
-
-  /**
-   * Decrements the amount of queued items.
-   */
-  void decrementQueuedCount() {
-    synchronized (queuedCountMutex_) {
-      assert(queuedCount_ > 0);
-      --queuedCount_;
-      if (queuedCount_ == 0) {
-        zeroQueuedCondition_.notifyAll();
-      }
-    }
-  }
-
-  static extern(C) void controlMsgReceiveCallback(evutil_socket_t, short,
-    void *managerThis
-  ) {
-    (cast(TLibeventAsyncManager)managerThis).receiveControlMsg();
-  }
-
-  static extern(C) void socketCallback(evutil_socket_t, short flags,
-    void *arg
-  ) {
-    auto reason = (flags & EV_TIMEOUT) ? TAsyncEventReason.TIMED_OUT :
-      TAsyncEventReason.NORMAL;
-    (*(cast(TSocketEventListener*)arg))(reason);
-    GC.removeRange(arg);
-    destroy(arg);
-    free(arg);
-  }
-
-  static extern(C) void delayCallback(evutil_socket_t, short flags,
-    void *arg
-  ) {
-    assert(flags & EV_TIMEOUT);
-    (*(cast(void delegate()*)arg))();
-    GC.removeRange(arg);
-    destroy(arg);
-    free(arg);
-  }
-
-  Thread workerThread_;
-
-  event_base* eventBase_;
-
-  /// The socket used for receiving new work items in the event loop. Paired
-  /// with controlSendSocket_. Invalid (i.e. TAsyncWorkItem.init) items are
-  /// ignored and can be used to wake up the worker thread.
-  Socket controlReceiveSocket_;
-  event* controlReceiveEvent_;
-
-  /// The socket used to send new work items to the event loop. It is
-  /// expected that work items can always be read at once from it, i.e. that
-  /// there will never be short reads.
-  Socket controlSendSocket_;
-
-  /// Queued up work delegates for async transports. This also includes
-  /// currently active ones, they are removed from the queue on completion,
-  /// which is relied on by the control message receive fiber (the main one)
-  /// to decide whether to immediately start executing items or not.
-  // TODO: This should really be of some queue type, not an array slice, but
-  // std.container doesn't have anything.
-  Work[][TAsyncTransport] workQueues_;
-
-  /// The total number of work items not yet finished (queued and currently
-  /// executed) and delays not yet executed.
-  uint queuedCount_;
-
-  /// Protects queuedCount_.
-  Mutex queuedCountMutex_;
-
-  /// Triggered when queuedCount_ reaches zero, protected by queuedCountMutex_.
-  Condition zeroQueuedCondition_;
-}
-
-private {
-  timeval toTimeval(const(Duration) dur) {
-    timeval tv;
-    dur.split!("seconds", "usecs")(tv.tv_sec, tv.tv_usec);
-    return tv;
-  }
-
-  /**
-   * Returns the libevent flags combination to represent a given TAsyncEventType.
-   */
-  short libeventEventType(TAsyncEventType type) {
-    final switch (type) {
-      case TAsyncEventType.READ:
-        return EV_READ | EV_ET;
-      case TAsyncEventType.WRITE:
-        return EV_WRITE | EV_ET;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/socket.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/socket.d
deleted file mode 100644
index 6de13d9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/socket.d
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.async.socket;
-
-import core.thread : Fiber;
-import core.time : dur, Duration;
-import std.array : empty;
-import std.conv : to;
-import std.exception : enforce;
-import std.socket;
-import thrift.base;
-import thrift.async.base;
-import thrift.transport.base;
-import thrift.transport.socket : TSocketBase;
-import thrift.internal.endian;
-import thrift.internal.socket;
-
-version (Windows) {
-  import std.c.windows.winsock : connect;
-} else version (Posix) {
-  import core.sys.posix.sys.socket : connect;
-} else static assert(0, "Don't know connect on this platform.");
-
-/**
- * Non-blocking socket implementation of the TTransport interface.
- *
- * Whenever a socket operation would block, TAsyncSocket registers a callback
- * with the specified TAsyncSocketManager and yields.
- *
- * As for thrift.transport.socket, due to the limitations of std.socket,
- * currently only TCP/IP sockets are supported (i.e. Unix domain sockets are
- * not).
- */
-class TAsyncSocket : TSocketBase, TAsyncTransport {
-  /**
-   * Constructor that takes an already created, connected (!) socket.
-   *
-   * Params:
-   *   asyncManager = The TAsyncSocketManager to use for non-blocking I/O.
-   *   socket = Already created, connected socket object. Will be switched to
-   *     non-blocking mode if it isn't already.
-   */
-  this(TAsyncSocketManager asyncManager, Socket socket) {
-    asyncManager_ = asyncManager;
-    socket.blocking = false;
-    super(socket);
-  }
-
-  /**
-   * Creates a new unconnected socket that will connect to the given host
-   * on the given port.
-   *
-   * Params:
-   *   asyncManager = The TAsyncSocketManager to use for non-blocking I/O.
-   *   host = Remote host.
-   *   port = Remote port.
-   */
-  this(TAsyncSocketManager asyncManager, string host, ushort port) {
-    asyncManager_ = asyncManager;
-    super(host, port);
-  }
-
-  override TAsyncManager asyncManager() @property {
-    return asyncManager_;
-  }
-
-  /**
-   * Asynchronously connects the socket.
-   *
-   * Completes without blocking and defers further operations on the socket
-   * until the connection is established. If connecting fails, this is
-   * currently not indicated in any way other than every call to read/write
-   * failing.
-   */
-  override void open() {
-    if (isOpen) return;
-
-    enforce(!host_.empty, new TTransportException(
-      "Cannot open null host.", TTransportException.Type.NOT_OPEN));
-    enforce(port_ != 0, new TTransportException(
-      "Cannot open with null port.", TTransportException.Type.NOT_OPEN));
-
-
-    // Cannot use std.socket.Socket.connect here because it hides away
-    // EINPROGRESS/WSAWOULDBLOCK.
-    Address addr;
-    try {
-      // Currently, we just go with the first address returned, could be made
-      // more intelligent though – IPv6?
-      addr = getAddress(host_, port_)[0];
-    } catch (Exception e) {
-      throw new TTransportException(`Unable to resolve host "` ~ host_ ~ `".`,
-        TTransportException.Type.NOT_OPEN, __FILE__, __LINE__, e);
-    }
-
-    socket_ = new TcpSocket(addr.addressFamily);
-    socket_.blocking = false;
-    setSocketOpts();
-
-    auto errorCode = connect(socket_.handle, addr.name(), addr.nameLen());
-    if (errorCode == 0) {
-      // If the connection could be established immediately, just return. I
-      // don't know if this ever happens.
-      return;
-    }
-
-    auto errno = getSocketErrno();
-    if (errno != CONNECT_INPROGRESS_ERRNO) {
-      throw new TTransportException(`Could not establish connection to "` ~
-        host_ ~ `": ` ~ socketErrnoString(errno),
-        TTransportException.Type.NOT_OPEN);
-    }
-
-    // This is the expected case: connect() signalled that the connection
-    // is being established in the background. Queue up a work item with the
-    // async manager which just defers any other operations on this
-    // TAsyncSocket instance until the socket is ready.
-    asyncManager_.execute(this,
-      {
-        auto fiber = Fiber.getThis();
-        TAsyncEventReason reason = void;
-        asyncManager_.addOneshotListener(socket_, TAsyncEventType.WRITE,
-          connectTimeout,
-          scopedDelegate((TAsyncEventReason r){ reason = r; fiber.call(); })
-        );
-        Fiber.yield();
-
-        if (reason == TAsyncEventReason.TIMED_OUT) {
-          // Close the connection, so that subsequent work items fail immediately.
-          closeImmediately();
-          return;
-        }
-
-        int errorCode = void;
-        socket_.getOption(SocketOptionLevel.SOCKET, cast(SocketOption)SO_ERROR,
-          errorCode);
-
-        if (errorCode) {
-          logInfo("Could not connect TAsyncSocket: %s",
-            socketErrnoString(errorCode));
-
-          // Close the connection, so that subsequent work items fail immediately.
-          closeImmediately();
-          return;
-        }
-
-      }
-    );
-  }
-
-  /**
-   * Closes the socket.
-   *
-   * Will block until all currently active operations are finished before the
-   * socket is closed.
-   */
-  override void close() {
-    if (!isOpen) return;
-
-    import core.sync.condition;
-    import core.sync.mutex;
-
-    auto doneMutex = new Mutex;
-    auto doneCond = new Condition(doneMutex);
-    synchronized (doneMutex) {
-      asyncManager_.execute(this,
-        scopedDelegate(
-          {
-            closeImmediately();
-            synchronized (doneMutex) doneCond.notifyAll();
-          }
-        )
-      );
-      doneCond.wait();
-    }
-  }
-
-  override bool peek() {
-    if (!isOpen) return false;
-
-    ubyte buf;
-    auto r = socket_.receive((&buf)[0..1], SocketFlags.PEEK);
-    if (r == Socket.ERROR) {
-      auto lastErrno = getSocketErrno();
-      static if (connresetOnPeerShutdown) {
-        if (lastErrno == ECONNRESET) {
-          closeImmediately();
-          return false;
-        }
-      }
-      throw new TTransportException("Peeking into socket failed: " ~
-        socketErrnoString(lastErrno), TTransportException.Type.UNKNOWN);
-    }
-    return (r > 0);
-  }
-
-  override size_t read(ubyte[] buf) {
-    enforce(isOpen, new TTransportException(
-      "Cannot read if socket is not open.", TTransportException.Type.NOT_OPEN));
-
-    typeof(getSocketErrno()) lastErrno;
-
-    auto r = yieldOnBlock(socket_.receive(cast(void[])buf),
-      TAsyncEventType.READ);
-
-    // If recv went fine, immediately return.
-    if (r >= 0) return r;
-
-    // Something went wrong, find out how to handle it.
-    lastErrno = getSocketErrno();
-
-    static if (connresetOnPeerShutdown) {
-      // See top comment.
-      if (lastErrno == ECONNRESET) {
-        return 0;
-      }
-    }
-
-    throw new TTransportException("Receiving from socket failed: " ~
-      socketErrnoString(lastErrno), TTransportException.Type.UNKNOWN);
-  }
-
-  override void write(in ubyte[] buf) {
-    size_t sent;
-    while (sent < buf.length) {
-      sent += writeSome(buf[sent .. $]);
-    }
-    assert(sent == buf.length);
-  }
-
-  override size_t writeSome(in ubyte[] buf) {
-    enforce(isOpen, new TTransportException(
-      "Cannot write if socket is not open.", TTransportException.Type.NOT_OPEN));
-
-    auto r = yieldOnBlock(socket_.send(buf), TAsyncEventType.WRITE);
-
-    // Everything went well, just return the number of bytes written.
-    if (r > 0) return r;
-
-    // Handle error conditions.
-    if (r < 0) {
-      auto lastErrno = getSocketErrno();
-
-      auto type = TTransportException.Type.UNKNOWN;
-      if (isSocketCloseErrno(lastErrno)) {
-        type = TTransportException.Type.NOT_OPEN;
-        closeImmediately();
-      }
-
-      throw new TTransportException("Sending to socket failed: " ~
-        socketErrnoString(lastErrno), type);
-    }
-
-    // send() should never return 0.
-    throw new TTransportException("Sending to socket failed (0 bytes written).",
-      TTransportException.Type.UNKNOWN);
-  }
-
-  /// The amount of time in which a conncetion must be established before the
-  /// open() call times out.
-  Duration connectTimeout = dur!"seconds"(5);
-
-private:
-  void closeImmediately() {
-    socket_.close();
-    socket_ = null;
-  }
-
-  T yieldOnBlock(T)(lazy T call, TAsyncEventType eventType) {
-    while (true) {
-      auto result = call();
-      if (result != Socket.ERROR || getSocketErrno() != WOULD_BLOCK_ERRNO) return result;
-
-      // We got an EAGAIN result, register a callback to return here once some
-      // event happens and yield.
-
-      Duration timeout = void;
-      final switch (eventType) {
-        case TAsyncEventType.READ:
-          timeout = recvTimeout_;
-          break;
-        case TAsyncEventType.WRITE:
-          timeout = sendTimeout_;
-          break;
-      }
-
-      auto fiber = Fiber.getThis();
-      assert(fiber, "Current fiber null – not running in TAsyncManager?");
-      TAsyncEventReason eventReason = void;
-      asyncManager_.addOneshotListener(socket_, eventType, timeout,
-        scopedDelegate((TAsyncEventReason reason) {
-          eventReason = reason;
-          fiber.call();
-        })
-      );
-
-      // Yields execution back to the async manager, will return back here once
-      // the above listener is called.
-      Fiber.yield();
-
-      if (eventReason == TAsyncEventReason.TIMED_OUT) {
-        // If we are cancelling the request due to a timed out operation, the
-        // connection is in an undefined state, because the server could decide
-        // to send the requested data later, or we could have already been half-
-        // way into writing a request. Thus, we close the connection to make any
-        // possibly queued up work items fail immediately. Besides, the server
-        // is not very likely to immediately recover after a socket-level
-        // timeout has expired anyway.
-        closeImmediately();
-
-        throw new TTransportException("Timed out while waiting for socket " ~
-          "to get ready to " ~ to!string(eventType) ~ ".",
-          TTransportException.Type.TIMED_OUT);
-      }
-    }
-  }
-
-  /// The TAsyncSocketManager to use for non-blocking I/O.
-  TAsyncSocketManager asyncManager_;
-}
-
-private {
-  // std.socket doesn't include SO_ERROR for reasons unknown.
-  version (linux) {
-    enum SO_ERROR = 4;
-  } else version (OSX) {
-    enum SO_ERROR = 0x1007;
-  } else version (FreeBSD) {
-    enum SO_ERROR = 0x1007;
-  } else version (Win32) {
-    import std.c.windows.winsock : SO_ERROR;
-  } else static assert(false, "Don't know SO_ERROR on this platform.");
-
-  // This hack forces a delegate literal to be scoped, even if it is passed to
-  // a function accepting normal delegates as well. DMD likes to allocate the
-  // context on the heap anyway, but it seems to work for LDC.
-  import std.traits : isDelegate;
-  auto scopedDelegate(D)(scope D d) if (isDelegate!D) {
-    return d;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/ssl.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/ssl.d
deleted file mode 100644
index fe62426..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/async/ssl.d
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.async.ssl;
-
-import core.thread : Fiber;
-import core.time : Duration;
-import std.array : empty;
-import std.conv : to;
-import std.exception : enforce;
-import std.socket;
-import deimos.openssl.err;
-import deimos.openssl.ssl;
-import thrift.base;
-import thrift.async.base;
-import thrift.async.socket;
-import thrift.internal.ssl;
-import thrift.internal.ssl_bio;
-import thrift.transport.base;
-import thrift.transport.ssl;
-
-/**
- * Provides SSL/TLS encryption for async sockets.
- *
- * This implementation should be considered experimental, as it context-switches
- * between fibers from within OpenSSL calls, and the safety of this has not yet
- * been verified.
- *
- * For obvious reasons (the SSL connection is stateful), more than one instance
- * should never be used on a given socket at the same time.
- */
-// Note: This could easily be extended to other transports in the future as well.
-// There are only two parts of the implementation which don't work with a generic
-// TTransport: 1) the certificate verification, for which peer name/address are
-// needed from the socket, and 2) the connection shutdown, where the associated
-// async manager is needed because close() is not usually called from within a
-// work item.
-final class TAsyncSSLSocket : TBaseTransport {
-  /**
-   * Constructor.
-   *
-   * Params:
-   *   context = The SSL socket context to use. A reference to it is stored so
-   *     that it does not get cleaned up while the socket is used.
-   *   transport = The underlying async network transport to use for
-   *     communication.
-   */
-  this(TAsyncSocket underlyingSocket, TSSLContext context) {
-    socket_ = underlyingSocket;
-    context_ = context;
-    serverSide_ = context.serverSide;
-    accessManager_ = context.accessManager;
-  }
-
-  override bool isOpen() @property {
-    if (ssl_ is null || !socket_.isOpen) return false;
-
-    auto shutdown = SSL_get_shutdown(ssl_);
-    bool shutdownReceived = (shutdown & SSL_RECEIVED_SHUTDOWN) != 0;
-    bool shutdownSent = (shutdown & SSL_SENT_SHUTDOWN) != 0;
-    return !(shutdownReceived && shutdownSent);
-  }
-
-  override bool peek() {
-    if (!isOpen) return false;
-    checkHandshake();
-
-    byte bt = void;
-    auto rc = SSL_peek(ssl_, &bt, bt.sizeof);
-    sslEnforce(rc >= 0, "SSL_peek");
-
-    if (rc == 0) {
-      ERR_clear_error();
-    }
-    return (rc > 0);
-  }
-
-  override void open() {
-    enforce(!serverSide_, "Cannot open a server-side SSL socket.");
-    if (isOpen) return;
-
-    if (ssl_) {
-      // If the underlying socket was automatically closed because of an error
-      // (i.e. close() was called from inside a socket method), we can land
-      // here with the SSL object still allocated; delete it here.
-      cleanupSSL();
-    }
-
-    socket_.open();
-  }
-
-  override void close() {
-    if (!isOpen) return;
-
-    if (ssl_ !is null) {
-      // SSL needs to send/receive data over the socket as part of the shutdown
-      // protocol, so we must execute the calls in the context of the associated
-      // async manager. On the other hand, TTransport clients expect the socket
-      // to be closed when close() returns, so we have to block until the
-      // shutdown work item has been executed.
-      import core.sync.condition;
-      import core.sync.mutex;
-
-      int rc = void;
-      auto doneMutex = new Mutex;
-      auto doneCond = new Condition(doneMutex);
-      synchronized (doneMutex) {
-        socket_.asyncManager.execute(socket_, {
-          rc = SSL_shutdown(ssl_);
-          if (rc == 0) {
-            rc = SSL_shutdown(ssl_);
-          }
-          synchronized (doneMutex) doneCond.notifyAll();
-        });
-        doneCond.wait();
-      }
-
-      if (rc < 0) {
-        // Do not throw an exception here as leaving the transport "open" will
-        // probably produce only more errors, and the chance we can do
-        // something about the error e.g. by retrying is very low.
-        logError("Error while shutting down SSL: %s", getSSLException());
-      }
-
-      cleanupSSL();
-    }
-
-    socket_.close();
-  }
-
-  override size_t read(ubyte[] buf) {
-    checkHandshake();
-    auto rc = SSL_read(ssl_, buf.ptr, cast(int)buf.length);
-    sslEnforce(rc >= 0, "SSL_read");
-    return rc;
-  }
-
-  override void write(in ubyte[] buf) {
-    checkHandshake();
-
-    // Loop in case SSL_MODE_ENABLE_PARTIAL_WRITE is set in SSL_CTX.
-    size_t written = 0;
-    while (written < buf.length) {
-      auto bytes = SSL_write(ssl_, buf.ptr + written,
-        cast(int)(buf.length - written));
-      sslEnforce(bytes > 0, "SSL_write");
-      written += bytes;
-    }
-  }
-
-  override void flush() {
-    checkHandshake();
-
-    auto bio = SSL_get_wbio(ssl_);
-    enforce(bio !is null, new TSSLException("SSL_get_wbio returned null"));
-
-    auto rc = BIO_flush(bio);
-    sslEnforce(rc == 1, "BIO_flush");
-  }
-
-  /**
-   * Whether to use client or server side SSL handshake protocol.
-   */
-  bool serverSide() @property const {
-    return serverSide_;
-  }
-
-  /// Ditto
-  void serverSide(bool value) @property {
-    serverSide_ = value;
-  }
-
-  /**
-   * The access manager to use.
-   */
-  void accessManager(TAccessManager value) @property {
-    accessManager_ = value;
-  }
-
-private:
-  /**
-   * If the condition is false, cleans up the SSL connection and throws the
-   * exception for the last SSL error.
-   */
-  void sslEnforce(bool condition, string location) {
-    if (!condition) {
-      // We need to fetch the error first, as the error stack will be cleaned
-      // when shutting down SSL.
-      auto e = getSSLException(location);
-      cleanupSSL();
-      throw e;
-    }
-  }
-
-  /**
-   * Frees the SSL connection object and clears the SSL error state.
-   */
-  void cleanupSSL() {
-    SSL_free(ssl_);
-    ssl_ = null;
-    ERR_remove_state(0);
-  }
-
-  /**
-   * Makes sure the SSL connection is up and running, and initializes it if not.
-   */
-  void checkHandshake() {
-    enforce(socket_.isOpen, new TTransportException(
-      TTransportException.Type.NOT_OPEN));
-
-    if (ssl_ !is null) return;
-    ssl_ = context_.createSSL();
-
-    auto bio = createTTransportBIO(socket_, false);
-    SSL_set_bio(ssl_, bio, bio);
-
-    int rc = void;
-    if (serverSide_) {
-      rc = SSL_accept(ssl_);
-    } else {
-      rc = SSL_connect(ssl_);
-    }
-    enforce(rc > 0, getSSLException());
-
-    auto addr = socket_.getPeerAddress();
-    authorize(ssl_, accessManager_, addr,
-      (serverSide_ ? addr.toHostNameString() : socket_.host));
-  }
-
-  TAsyncSocket socket_;
-  bool serverSide_;
-  SSL* ssl_;
-  TSSLContext context_;
-  TAccessManager accessManager_;
-}
-
-/**
- * Wraps passed TAsyncSocket instances into TAsyncSSLSockets.
- *
- * Typically used with TAsyncClient. As an unfortunate consequence of the
- * async client design, the passed transports cannot be statically verified to
- * be of type TAsyncSocket. Instead, the type is verified at runtime – if a
- * transport of an unexpected type is passed to getTransport(), it fails,
- * throwing a TTransportException.
- *
- * Example:
- * ---
- * auto context = nwe TSSLContext();
- * ... // Configure SSL context.
- * auto factory = new TAsyncSSLSocketFactory(context);
- *
- * auto socket = new TAsyncSocket(someAsyncManager, host, port);
- * socket.open();
- *
- * auto client = new TAsyncClient!Service(transport, factory,
- *   new TBinaryProtocolFactory!());
- * ---
- */
-class TAsyncSSLSocketFactory : TTransportFactory {
-  ///
-  this(TSSLContext context) {
-    context_ = context;
-  }
-
-  override TAsyncSSLSocket getTransport(TTransport transport) {
-    auto socket = cast(TAsyncSocket)transport;
-    enforce(socket, new TTransportException(
-      "TAsyncSSLSocketFactory requires a TAsyncSocket to work on, not a " ~
-      to!string(typeid(transport)) ~ ".",
-      TTransportException.Type.INTERNAL_ERROR
-    ));
-    return new TAsyncSSLSocket(socket, context_);
-  }
-
-private:
-  TSSLContext context_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/base.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/base.d
deleted file mode 100644
index 1c963eb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/base.d
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.base;
-
-/**
- * Common base class for all Thrift exceptions.
- */
-class TException : Exception {
-  ///
-  this(string msg = "", string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    super(msg, file, line, next);
-  }
-}
-
-/**
- * An operation failed because one or more sub-tasks failed.
- */
-class TCompoundOperationException : TException {
-  ///
-  this(string msg, Exception[] exceptions, string file = __FILE__,
-    size_t line = __LINE__, Throwable next = null)
-  {
-    super(msg, file, line, next);
-    this.exceptions = exceptions;
-  }
-
-  /// The exceptions thrown by the children of the operation. If applicable,
-  /// the list is ordered in the same way the exceptions occurred.
-  Exception[] exceptions;
-}
-
-/// The Thrift version string, used for informative purposes.
-// Note: This is currently hardcoded, but will likely be filled in by the build
-// system in future versions.
-enum VERSION = "0.10.0";
-
-/**
- * Functions used for logging inside Thrift.
- *
- * By default, the formatted messages are written to stdout/stderr, but this
- * behavior can be overwritten by providing custom g_{Info, Error}LogSink
- * handlers.
- *
- * Examples:
- * ---
- * logInfo("An informative message.");
- * logError("Some error occurred: %s", e);
- * ---
- */
-alias logFormatted!g_infoLogSink logInfo;
-alias logFormatted!g_errorLogSink logError; /// Ditto
-
-/**
- * Error and info log message sinks.
- *
- * These delegates are called with the log message passed as const(char)[]
- * argument, and can be overwritten to hook the Thrift libraries up with a
- * custom logging system. By default, they forward all output to stdout/stderr.
- */
-__gshared void delegate(const(char)[]) g_infoLogSink;
-__gshared void delegate(const(char)[]) g_errorLogSink; /// Ditto
-
-shared static this() {
-  import std.stdio;
-
-  g_infoLogSink = (const(char)[] text) {
-    stdout.writeln(text);
-  };
-
-  g_errorLogSink = (const(char)[] text) {
-    stderr.writeln(text);
-  };
-}
-
-// This should be private, if it could still be used through the aliases then.
-template logFormatted(alias target) {
-  void logFormatted(string file = __FILE__, int line = __LINE__,
-    T...)(string fmt, T args) if (
-    __traits(compiles, { target(""); })
-  ) {
-    import std.format, std.stdio;
-    if (target !is null) {
-      scope(exit) g_formatBuffer.clear();
-
-      // Phobos @@BUG@@: If the empty string put() is removed, Appender.data
-      // stays empty.
-      g_formatBuffer.put("");
-
-      formattedWrite(g_formatBuffer, "%s:%s: ", file, line);
-
-      static if (T.length == 0) {
-        g_formatBuffer.put(fmt);
-      } else {
-        formattedWrite(g_formatBuffer, fmt, args);
-      }
-      target(g_formatBuffer.data);
-    }
-  }
-}
-
-private {
-  // Use a global, but thread-local buffer for constructing log messages.
-  import std.array : Appender;
-  Appender!(char[]) g_formatBuffer;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/async_client.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/async_client.d
deleted file mode 100644
index e916dea..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/async_client.d
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.codegen.async_client;
-
-import std.conv : text, to;
-import std.traits : ParameterStorageClass, ParameterStorageClassTuple,
-  ParameterTypeTuple, ReturnType;
-import thrift.base;
-import thrift.async.base;
-import thrift.codegen.base;
-import thrift.codegen.client;
-import thrift.internal.codegen;
-import thrift.internal.ctfe;
-import thrift.protocol.base;
-import thrift.transport.base;
-import thrift.util.cancellation;
-import thrift.util.future;
-
-/**
- * Asynchronous Thrift service client which returns the results as TFutures an
- * uses a TAsyncManager to perform the actual work.
- *
- * TAsyncClientBase serves as a supertype for all TAsyncClients for the same
- * service, which might be instantiated with different concrete protocol types
- * (there is no covariance for template type parameters), and extends
- * TFutureInterface!Interface. If Interface is derived from another service
- * BaseInterface, it also extends TAsyncClientBase!BaseInterface.
- *
- * TAsyncClient implements TAsyncClientBase and offers two constructors with
- * the following signatures:
- * ---
- * this(TAsyncTransport trans, TTransportFactory tf, TProtocolFactory pf);
- * this(TAsyncTransport trans, TTransportFactory itf, TTransportFactory otf,
- *   TProtocolFactory ipf, TProtocolFactory opf);
- * ---
- *
- * Again, if Interface represents a derived Thrift service,
- * TAsyncClient!Interface is also derived from TAsyncClient!BaseInterface.
- *
- * TAsyncClient can exclusively be used with TAsyncTransports, as it needs to
- * access the associated TAsyncManager. To set up any wrapper transports
- * (e.g. buffered, framed) on top of it and to instanciate the protocols to use,
- * TTransportFactory and TProtocolFactory instances are passed to the
- * constructors – the three argument constructor is a shortcut if the same
- * transport and protocol are to be used for both input and output, which is
- * the most common case.
- *
- * If the same transport factory is passed for both input and output transports,
- * only a single wrapper transport will be created and used for both directions.
- * This allows easy implementation of protocols like SSL.
- *
- * Just as TClient does, TAsyncClient also takes two optional template
- * arguments which can be used for specifying the actual TProtocol
- * implementation used for optimization purposes, as virtual calls can
- * completely be eliminated then. If the actual types of the protocols
- * instantiated by the factories used does not match the ones statically
- * specified in the template parameters, a TException is thrown during
- * construction.
- *
- * Example:
- * ---
- * // A simple Thrift service.
- * interface Foo { int foo(); }
- *
- * // Create a TAsyncSocketManager – thrift.async.libevent is used for this
- * // example.
- * auto manager = new TLibeventAsyncManager;
- *
- * // Set up an async transport to use.
- * auto socket = new TAsyncSocket(manager, host, port);
- *
- * // Create a client instance.
- * auto client = new TAsyncClient!Foo(
- *   socket,
- *   new TBufferedTransportFactory, // Wrap the socket in a TBufferedTransport.
- *   new TBinaryProtocolFactory!() // Use the Binary protocol.
- * );
- *
- * // Call foo and use the returned future.
- * auto result = client.foo();
- * pragma(msg, typeof(result)); // TFuture!int
- * int resultValue = result.waitGet(); // Waits until the result is available.
- * ---
- */
-interface TAsyncClientBase(Interface) if (isBaseService!Interface) :
-  TFutureInterface!Interface
-{
-  /**
-   * The underlying TAsyncTransport used by this client instance.
-   */
-  TAsyncTransport transport() @property;
-}
-
-/// Ditto
-interface TAsyncClientBase(Interface) if (isDerivedService!Interface) :
-  TAsyncClientBase!(BaseService!Interface), TFutureInterface!Interface
-{}
-
-/// Ditto
-template TAsyncClient(Interface, InputProtocol = TProtocol, OutputProtocol = void) if (
-  isService!Interface && isTProtocol!InputProtocol &&
-  (isTProtocol!OutputProtocol || is(OutputProtocol == void))
-) {
-  mixin({
-    static if (isDerivedService!Interface) {
-      string code = "class TAsyncClient : " ~
-        "TAsyncClient!(BaseService!Interface, InputProtocol, OutputProtocol), " ~
-        "TAsyncClientBase!Interface {\n";
-      code ~= q{
-        this(TAsyncTransport trans, TTransportFactory tf, TProtocolFactory pf) {
-          this(trans, tf, tf, pf, pf);
-        }
-
-        this(TAsyncTransport trans, TTransportFactory itf,
-          TTransportFactory otf, TProtocolFactory ipf, TProtocolFactory opf
-        ) {
-          super(trans, itf, otf, ipf, opf);
-          client_ = new typeof(client_)(iprot_, oprot_);
-        }
-
-        private TClient!(Interface, IProt, OProt) client_;
-      };
-    } else {
-      string code = "class TAsyncClient : TAsyncClientBase!Interface {";
-      code ~= q{
-        alias InputProtocol IProt;
-        static if (isTProtocol!OutputProtocol) {
-          alias OutputProtocol OProt;
-        } else {
-          static assert(is(OutputProtocol == void));
-          alias InputProtocol OProt;
-        }
-
-        this(TAsyncTransport trans, TTransportFactory tf, TProtocolFactory pf) {
-          this(trans, tf, tf, pf, pf);
-        }
-
-        this(TAsyncTransport trans, TTransportFactory itf,
-          TTransportFactory otf, TProtocolFactory ipf, TProtocolFactory opf
-        ) {
-          import std.exception;
-          transport_ = trans;
-
-          auto ip = itf.getTransport(trans);
-          TTransport op = void;
-          if (itf == otf) {
-            op = ip;
-          } else {
-            op = otf.getTransport(trans);
-          }
-
-          auto iprot = ipf.getProtocol(ip);
-          iprot_ = cast(IProt)iprot;
-          enforce(iprot_, new TException(text("Input protocol not of the " ~
-            "specified concrete type (", IProt.stringof, ").")));
-
-          auto oprot = opf.getProtocol(op);
-          oprot_ = cast(OProt)oprot;
-          enforce(oprot_, new TException(text("Output protocol not of the " ~
-            "specified concrete type (", OProt.stringof, ").")));
-
-          client_ = new typeof(client_)(iprot_, oprot_);
-        }
-
-        override TAsyncTransport transport() @property {
-          return transport_;
-        }
-
-        protected TAsyncTransport transport_;
-        protected IProt iprot_;
-        protected OProt oprot_;
-        private TClient!(Interface, IProt, OProt) client_;
-      };
-    }
-
-    foreach (methodName;
-      FilterMethodNames!(Interface, __traits(derivedMembers, Interface))
-    ) {
-      string[] paramList;
-      string[] paramNames;
-      foreach (i, _; ParameterTypeTuple!(mixin("Interface." ~ methodName))) {
-        immutable paramName = "param" ~ to!string(i + 1);
-        immutable storage = ParameterStorageClassTuple!(
-          mixin("Interface." ~ methodName))[i];
-
-        paramList ~= ((storage & ParameterStorageClass.ref_) ? "ref " : "") ~
-          "ParameterTypeTuple!(Interface." ~ methodName ~ ")[" ~
-          to!string(i) ~ "] " ~ paramName;
-        paramNames ~= paramName;
-      }
-      paramList ~= "TCancellation cancellation = null";
-
-      immutable returnTypeCode = "ReturnType!(Interface." ~ methodName ~ ")";
-      code ~= "TFuture!(" ~ returnTypeCode ~ ") " ~ methodName ~ "(" ~
-        ctfeJoin(paramList) ~ ") {\n";
-
-      // Create the future instance that will repesent the result.
-      code ~= "auto promise = new TPromise!(" ~ returnTypeCode ~ ");\n";
-
-      // Prepare delegate which executes the TClient method call.
-      code ~= "auto work = {\n";
-      code ~= "try {\n";
-      code ~= "static if (is(ReturnType!(Interface." ~ methodName ~
-        ") == void)) {\n";
-      code ~= "client_." ~ methodName ~ "(" ~ ctfeJoin(paramNames) ~ ");\n";
-      code ~= "promise.succeed();\n";
-      code ~= "} else {\n";
-      code ~= "auto result = client_." ~ methodName ~ "(" ~
-        ctfeJoin(paramNames) ~ ");\n";
-      code ~= "promise.succeed(result);\n";
-      code ~= "}\n";
-      code ~= "} catch (Exception e) {\n";
-      code ~= "promise.fail(e);\n";
-      code ~= "}\n";
-      code ~= "};\n";
-
-      // If the request is cancelled, set the result promise to cancelled
-      // as well. This could be moved into an additional TAsyncWorkItem
-      // delegate parameter.
-      code ~= q{
-        if (cancellation) {
-          cancellation.triggering.addCallback({
-            promise.cancel();
-          });
-        }
-      };
-
-      // Enqueue the work item and immediately return the promise (resp. its
-      // future interface).
-      code ~= "transport_.asyncManager.execute(transport_, work, cancellation);\n";
-      code ~= "return promise;\n";
-      code ~= "}\n";
-
-    }
-
-    code ~= "}\n";
-    return code;
-  }());
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/async_client_pool.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/async_client_pool.d
deleted file mode 100644
index 26cb975..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/async_client_pool.d
+++ /dev/null
@@ -1,906 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Utilities for asynchronously querying multiple servers, building on
- * TAsyncClient.
- *
- * Terminology note: The names of the artifacts defined in this module are
- *   derived from »client pool«, because they operate on a pool of
- *   TAsyncClients. However, from a architectural point of view, they often
- *   represent a pool of hosts a Thrift client application communicates with
- *   using RPC calls.
- */
-module thrift.codegen.async_client_pool;
-
-import core.sync.mutex;
-import core.time : Duration, dur;
-import std.algorithm : map;
-import std.array : array, empty;
-import std.exception : enforce;
-import std.traits : ParameterTypeTuple, ReturnType;
-import thrift.base;
-import thrift.codegen.base;
-import thrift.codegen.async_client;
-import thrift.internal.algorithm;
-import thrift.internal.codegen;
-import thrift.util.awaitable;
-import thrift.util.cancellation;
-import thrift.util.future;
-import thrift.internal.resource_pool;
-
-/**
- * Represents a generic client pool which implements TFutureInterface!Interface
- * using multiple TAsyncClients.
- */
-interface TAsyncClientPoolBase(Interface) if (isService!Interface) :
-  TFutureInterface!Interface
-{
-  /// Shorthand for the client type this pool operates on.
-  alias TAsyncClientBase!Interface Client;
-
-  /**
-   * Adds a client to the pool.
-   */
-  void addClient(Client client);
-
-  /**
-   * Removes a client from the pool.
-   *
-   * Returns: Whether the client was found in the pool.
-   */
-  bool removeClient(Client client);
-
-  /**
-   * Called to determine whether an exception comes from a client from the
-   * pool not working properly, or if it an exception thrown at the
-   * application level.
-   *
-   * If the delegate returns true, the server/connection is considered to be
-   * at fault, if it returns false, the exception is just passed on to the
-   * caller.
-   *
-   * By default, returns true for instances of TTransportException and
-   * TApplicationException, false otherwise.
-   */
-  bool delegate(Exception) rpcFaultFilter() const @property;
-  void rpcFaultFilter(bool delegate(Exception)) @property; /// Ditto
-
-  /**
-   * Whether to open the underlying transports of a client before trying to
-   * execute a method if they are not open. This is usually desirable
-   * because it allows e.g. to automatically reconnect to a remote server
-   * if the network connection is dropped.
-   *
-   * Defaults to true.
-   */
-  bool reopenTransports() const @property;
-  void reopenTransports(bool) @property; /// Ditto
-}
-
-immutable bool delegate(Exception) defaultRpcFaultFilter;
-static this() {
-  defaultRpcFaultFilter = (Exception e) {
-    import thrift.protocol.base;
-    import thrift.transport.base;
-    return (
-      (cast(TTransportException)e !is null) ||
-      (cast(TApplicationException)e !is null)
-    );
-  };
-}
-
-/**
- * A TAsyncClientPoolBase implementation which queries multiple servers in a
- * row until a request succeeds, the result of which is then returned.
- *
- * The definition of »success« can be customized using the rpcFaultFilter()
- * delegate property. If it is non-null and calling it for an exception set by
- * a failed method invocation returns true, the error is considered to be
- * caused by the RPC layer rather than the application layer, and the next
- * server in the pool is tried. If there are no more clients to try, the
- * operation is marked as failed with a TCompoundOperationException.
- *
- * If a TAsyncClient in the pool fails with an RPC exception for a number of
- * consecutive tries, it is temporarily disabled (not tried any longer) for
- * a certain duration. Both the limit and the timeout can be configured. If all
- * clients fail (and keepTrying is false), the operation fails with a
- * TCompoundOperationException which contains the collected RPC exceptions.
- */
-final class TAsyncClientPool(Interface) if (isService!Interface) :
-  TAsyncClientPoolBase!Interface
-{
-  ///
-  this(Client[] clients) {
-    pool_ = new TResourcePool!Client(clients);
-    rpcFaultFilter_ = defaultRpcFaultFilter;
-    reopenTransports_ = true;
-  }
-
-  /+override+/ void addClient(Client client) {
-    pool_.add(client);
-  }
-
-  /+override+/ bool removeClient(Client client) {
-    return pool_.remove(client);
-  }
-
-  /**
-   * Whether to keep trying to find a working client if all have failed in a
-   * row.
-   *
-   * Defaults to false.
-   */
-  bool keepTrying() const @property {
-    return pool_.cycle;
-  }
-
-  /// Ditto
-  void keepTrying(bool value) @property {
-    pool_.cycle = value;
-  }
-
-  /**
-   * Whether to use a random permutation of the client pool on every call to
-   * execute(). This can be used e.g. as a simple form of load balancing.
-   *
-   * Defaults to true.
-   */
-  bool permuteClients() const @property {
-    return pool_.permute;
-  }
-
-  /// Ditto
-  void permuteClients(bool value) @property {
-    pool_.permute = value;
-  }
-
-  /**
-   * The number of consecutive faults after which a client is disabled until
-   * faultDisableDuration has passed. 0 to never disable clients.
-   *
-   * Defaults to 0.
-   */
-  ushort faultDisableCount() const @property {
-    return pool_.faultDisableCount;
-  }
-
-  /// Ditto
-  void faultDisableCount(ushort value) @property {
-    pool_.faultDisableCount = value;
-  }
-
-  /**
-   * The duration for which a client is no longer considered after it has
-   * failed too often.
-   *
-   * Defaults to one second.
-   */
-  Duration faultDisableDuration() const @property {
-    return pool_.faultDisableDuration;
-  }
-
-  /// Ditto
-  void faultDisableDuration(Duration value) @property {
-    pool_.faultDisableDuration = value;
-  }
-
-  /+override+/ bool delegate(Exception) rpcFaultFilter() const @property {
-    return rpcFaultFilter_;
-  }
-
-  /+override+/ void rpcFaultFilter(bool delegate(Exception) value) @property {
-    rpcFaultFilter_ = value;
-  }
-
-  /+override+/ bool reopenTransports() const @property {
-    return reopenTransports_;
-  }
-
-  /+override+/ void reopenTransports(bool value) @property {
-    reopenTransports_ = value;
-  }
-
-  mixin(fallbackPoolForwardCode!Interface());
-
-protected:
-  // The actual worker implementation to which RPC method calls are forwarded.
-  auto executeOnPool(string method, Args...)(Args args,
-    TCancellation cancellation
-  ) {
-    auto clients = pool_[];
-    if (clients.empty) {
-      throw new TException("No clients available to try.");
-    }
-
-    auto promise = new TPromise!(ReturnType!(MemberType!(Interface, method)));
-    Exception[] rpcExceptions;
-
-    void tryNext() {
-      while (clients.empty) {
-        Client next;
-        Duration waitTime;
-        if (clients.willBecomeNonempty(next, waitTime)) {
-          if (waitTime > dur!"hnsecs"(0)) {
-            if (waitTime < dur!"usecs"(10)) {
-              import core.thread;
-              Thread.sleep(waitTime);
-            } else {
-              next.transport.asyncManager.delay(waitTime, { tryNext(); });
-              return;
-            }
-          }
-        } else {
-          promise.fail(new TCompoundOperationException("All clients failed.",
-            rpcExceptions));
-          return;
-        }
-      }
-
-      auto client = clients.front;
-      clients.popFront;
-
-      if (reopenTransports) {
-        if (!client.transport.isOpen) {
-          try {
-            client.transport.open();
-          } catch (Exception e) {
-            pool_.recordFault(client);
-            tryNext();
-            return;
-          }
-        }
-      }
-
-      auto future = mixin("client." ~ method)(args, cancellation);
-      future.completion.addCallback({
-        if (future.status == TFutureStatus.CANCELLED) {
-          promise.cancel();
-          return;
-        }
-
-        auto e = future.getException();
-        if (e) {
-          if (rpcFaultFilter_ && rpcFaultFilter_(e)) {
-            pool_.recordFault(client);
-            rpcExceptions ~= e;
-            tryNext();
-            return;
-          }
-        }
-        pool_.recordSuccess(client);
-        promise.complete(future);
-      });
-    }
-
-    tryNext();
-    return promise;
-  }
-
-private:
-  TResourcePool!Client pool_;
-  bool delegate(Exception) rpcFaultFilter_;
-  bool reopenTransports_;
-}
-
-/**
- * TAsyncClientPool construction helper to avoid having to explicitly
- * specify the interface type, i.e. to allow the constructor being called
- * using IFTI (see $(DMDBUG 6082, D Bugzilla enhancement request 6082)).
- */
-TAsyncClientPool!Interface tAsyncClientPool(Interface)(
-  TAsyncClientBase!Interface[] clients
-) if (isService!Interface) {
-  return new typeof(return)(clients);
-}
-
-private {
-  // Cannot use an anonymous delegate literal for this because they aren't
-  // allowed in class scope.
-  string fallbackPoolForwardCode(Interface)() {
-    string code = "";
-
-    foreach (methodName; AllMemberMethodNames!Interface) {
-      enum qn = "Interface." ~ methodName;
-      code ~= "TFuture!(ReturnType!(" ~ qn ~ ")) " ~ methodName ~
-        "(ParameterTypeTuple!(" ~ qn ~ ") args, TCancellation cancellation = null) {\n";
-      code ~= "return executeOnPool!(`" ~ methodName ~ "`)(args, cancellation);\n";
-      code ~= "}\n";
-    }
-
-    return code;
-  }
-}
-
-/**
- * A TAsyncClientPoolBase implementation which queries multiple servers at
- * the same time and returns the first success response.
- *
- * The definition of »success« can be customized using the rpcFaultFilter()
- * delegate property. If it is non-null and calling it for an exception set by
- * a failed method invocation returns true, the error is considered to be
- * caused by the RPC layer rather than the application layer, and the next
- * server in the pool is tried. If all clients fail, the operation is marked
- * as failed with a TCompoundOperationException.
- */
-final class TAsyncFastestClientPool(Interface) if (isService!Interface) :
-  TAsyncClientPoolBase!Interface
-{
-  ///
-  this(Client[] clients) {
-    clients_ = clients;
-    rpcFaultFilter_ = defaultRpcFaultFilter;
-    reopenTransports_ = true;
-  }
-
-  /+override+/ void addClient(Client client) {
-    clients_ ~= client;
-  }
-
-  /+override+/ bool removeClient(Client client) {
-    auto oldLength = clients_.length;
-    clients_ = removeEqual(clients_, client);
-    return clients_.length < oldLength;
-  }
-
-
-  /+override+/ bool delegate(Exception) rpcFaultFilter() const @property {
-    return rpcFaultFilter_;
-  }
-
-  /+override+/ void rpcFaultFilter(bool delegate(Exception) value) @property {
-    rpcFaultFilter_ = value;
-  }
-
-  /+override+/bool reopenTransports() const @property {
-    return reopenTransports_;
-  }
-
-  /+override+/ void reopenTransports(bool value) @property {
-    reopenTransports_ = value;
-  }
-
-  mixin(fastestPoolForwardCode!Interface());
-
-private:
-  Client[] clients_;
-  bool delegate(Exception) rpcFaultFilter_;
-  bool reopenTransports_;
-}
-
-/**
- * TAsyncFastestClientPool construction helper to avoid having to explicitly
- * specify the interface type, i.e. to allow the constructor being called
- * using IFTI (see $(DMDBUG 6082, D Bugzilla enhancement request 6082)).
- */
-TAsyncFastestClientPool!Interface tAsyncFastestClientPool(Interface)(
-  TAsyncClientBase!Interface[] clients
-) if (isService!Interface) {
-  return new typeof(return)(clients);
-}
-
-private {
-  // Cannot use an anonymous delegate literal for this because they aren't
-  // allowed in class scope.
-  string fastestPoolForwardCode(Interface)() {
-    string code = "";
-
-    foreach (methodName; AllMemberMethodNames!Interface) {
-      enum qn = "Interface." ~ methodName;
-      code ~= "TFuture!(ReturnType!(" ~ qn ~ ")) " ~ methodName ~
-        "(ParameterTypeTuple!(" ~ qn ~ ") args, " ~
-        "TCancellation cancellation = null) {\n";
-      code ~= "enum methodName = `" ~ methodName ~ "`;\n";
-      code ~= q{
-        alias ReturnType!(MemberType!(Interface, methodName)) ResultType;
-
-        auto childCancellation = new TCancellationOrigin;
-
-        TFuture!ResultType[] futures;
-        futures.reserve(clients_.length);
-
-        foreach (c; clients_) {
-          if (reopenTransports) {
-            if (!c.transport.isOpen) {
-              try {
-                c.transport.open();
-              } catch (Exception e) {
-                continue;
-              }
-            }
-          }
-          futures ~= mixin("c." ~ methodName)(args, childCancellation);
-        }
-
-        return new FastestPoolJob!(ResultType)(
-          futures, rpcFaultFilter, cancellation, childCancellation);
-      };
-      code ~= "}\n";
-    }
-
-    return code;
-  }
-
-  final class FastestPoolJob(Result) : TFuture!Result {
-    this(TFuture!Result[] poolFutures, bool delegate(Exception) rpcFaultFilter,
-      TCancellation cancellation, TCancellationOrigin childCancellation
-    ) {
-      resultPromise_ = new TPromise!Result;
-      poolFutures_ = poolFutures;
-      rpcFaultFilter_ = rpcFaultFilter;
-      childCancellation_ = childCancellation;
-
-      foreach (future; poolFutures) {
-        future.completion.addCallback({
-          auto f = future;
-          return { completionCallback(f); };
-        }());
-        if (future.status != TFutureStatus.RUNNING) {
-          // If the current future is already completed, we are done, don't
-          // bother adding callbacks for the others (they would just return
-          // immediately after acquiring the lock).
-          return;
-        }
-      }
-
-      if (cancellation) {
-        cancellation.triggering.addCallback({
-          resultPromise_.cancel();
-          childCancellation.trigger();
-        });
-      }
-    }
-
-    TFutureStatus status() const @property {
-      return resultPromise_.status;
-    }
-
-    TAwaitable completion() @property {
-      return resultPromise_.completion;
-    }
-
-    Result get() {
-      return resultPromise_.get();
-    }
-
-    Exception getException() {
-      return resultPromise_.getException();
-    }
-
-  private:
-    void completionCallback(TFuture!Result future) {
-      synchronized {
-        if (future.status == TFutureStatus.CANCELLED) {
-          assert(resultPromise_.status != TFutureStatus.RUNNING);
-          return;
-        }
-
-        if (resultPromise_.status != TFutureStatus.RUNNING) {
-          // The operation has already been completed. This can happen if
-          // another client completed first, but this callback was already
-          // waiting for the lock when it called cancel().
-          return;
-        }
-
-        if (future.status == TFutureStatus.FAILED) {
-          auto e = future.getException();
-          if (rpcFaultFilter_ && rpcFaultFilter_(e)) {
-            rpcExceptions_ ~= e;
-
-            if (rpcExceptions_.length == poolFutures_.length) {
-              resultPromise_.fail(new TCompoundOperationException(
-                "All child operations failed, unable to retrieve a result.",
-                rpcExceptions_
-              ));
-            }
-
-            return;
-          }
-        }
-
-        // Store the result to the target promise.
-        resultPromise_.complete(future);
-
-        // Cancel the other futures, we would just discard their results.
-        // Note: We do this after we have stored the results to our promise,
-        // see the assert at the top of the function.
-        childCancellation_.trigger();
-      }
-    }
-
-    TPromise!Result resultPromise_;
-    TFuture!Result[] poolFutures_;
-    Exception[] rpcExceptions_;
-    bool delegate(Exception) rpcFaultFilter_;
-    TCancellationOrigin childCancellation_;
-  }
-}
-
-/**
- * Allows easily aggregating results from a number of TAsyncClients.
- *
- * Contrary to TAsync{Fallback, Fastest}ClientPool, this class does not
- * simply implement TFutureInterface!Interface. It manages a pool of clients,
- * but allows the user to specify a custom accumulator function to use or to
- * iterate over the results using a TFutureAggregatorRange.
- *
- * For each service method, TAsyncAggregator offers a method
- * accepting the same arguments, and an optional TCancellation instance, just
- * like with TFutureInterface. The return type, however, is a proxy object
- * that offers the following methods:
- * ---
- * /++
- *  + Returns a thrift.util.future.TFutureAggregatorRange for the results of
- *  + the client pool method invocations.
- *  +
- *  + The [] (slicing) operator can also be used to obtain the range.
- *  +
- *  + Params:
- *  +   timeout = A timeout to pass to the TFutureAggregatorRange constructor,
- *  +     defaults to zero (no timeout).
- *  +/
- * TFutureAggregatorRange!ReturnType range(Duration timeout = dur!"hnsecs"(0));
- * auto opSlice() { return range(); } /// Ditto
- *
- * /++
- *  + Returns a future that gathers the results from the clients in the pool
- *  + and invokes a user-supplied accumulator function on them, returning its
- *  + return value to the client.
- *  +
- *  + In addition to the TFuture!AccumulatedType interface (where
- *  + AccumulatedType is the return type of the accumulator function), the
- *  + returned object also offers two additional methods, finish() and
- *  + finishGet(): By default, the accumulator functions is called after all
- *  + the results from the pool clients have become available. Calling finish()
- *  + causes the accumulator future to stop waiting for other results and
- *  + immediately invoking the accumulator function on the results currently
- *  + available. If all results are already available, finish() is a no-op.
- *  + finishGet() is a convenience shortcut for combining it with
- *  + a call to get() immediately afterwards, like waitGet() is for wait().
- *  +
- *  + The acc alias can point to any callable accepting either an array of
- *  + return values or an array of return values and an array of exceptions;
- *  + see isAccumulator!() for details. The default accumulator concatenates
- *  + return values that can be concatenated with each others (e.g. arrays),
- *  + and simply returns an array of values otherwise, failing with a
- *  + TCompoundOperationException no values were returned.
- *  +
- *  + The accumulator function is not executed in any of the async manager
- *  + worker threads associated with the async clients, but instead it is
- *  + invoked when the actual result is requested for the first time after the
- *  + operation has been completed. This also includes checking the status
- *  + of the operation once it is no longer running, since the accumulator
- *  + has to be run to determine whether the operation succeeded or failed.
- *  +/
- * auto accumulate(alias acc = defaultAccumulator)() if (isAccumulator!acc);
- * ---
- *
- * Example:
- * ---
- * // Some Thrift service.
- * interface Foo {
- *   int foo(string name);
- *   byte[] bar();
- * }
- *
- * // Create the aggregator pool – client0, client1, client2 are some
- * // TAsyncClient!Foo instances, but in theory could also be other
- * // TFutureInterface!Foo implementations (e.g. some async client pool).
- * auto pool = new TAsyncAggregator!Foo([client0, client1, client2]);
- *
- * foreach (val; pool.foo("baz").range(dur!"seconds"(1))) {
- *   // Process all the results that are available before a second has passed,
- *   // in the order they arrive.
- *   writeln(val);
- * }
- *
- * auto sumRoots = pool.foo("baz").accumulate!((int[] vals, Exceptions[] exs){
- *   if (vals.empty) {
- *     throw new TCompoundOperationException("All clients failed", exs);
- *   }
- *
- *   // Just to illustrate that the type of the values can change, convert the
- *   // numbers to double and sum up their roots.
- *   double result = 0;
- *   foreach (v; vals) result += sqrt(cast(double)v);
- *   return result;
- * })();
- *
- * // Wait up to three seconds for the result, and then accumulate what has
- * // arrived so far.
- * sumRoots.completion.wait(dur!"seconds"(3));
- * writeln(sumRoots.finishGet());
- *
- * // For scalars, the default accumulator returns an array of the values.
- * pragma(msg, typeof(pool.foo("").accumulate().get()); // int[].
- *
- * // For lists, etc., it concatenates the results together.
- * pragma(msg, typeof(pool.bar().accumulate().get())); // byte[].
- * ---
- *
- * Note: For the accumulate!() interface, you might currently hit a »cannot use
- * local '…' as parameter to non-global template accumulate«-error, see
- * $(DMDBUG 5710, DMD issue 5710). If your accumulator function does not need
- * to access the surrounding scope, you might want to use a function literal
- * instead of a delegate to avoid the issue.
- */
-class TAsyncAggregator(Interface) if (isBaseService!Interface) {
-  /// Shorthand for the client type this instance operates on.
-  alias TAsyncClientBase!Interface Client;
-
-  ///
-  this(Client[] clients) {
-    clients_ = clients;
-  }
-
-  /// Whether to open the underlying transports of a client before trying to
-  /// execute a method if they are not open. This is usually desirable
-  /// because it allows e.g. to automatically reconnect to a remote server
-  /// if the network connection is dropped.
-  ///
-  /// Defaults to true.
-  bool reopenTransports = true;
-
-  mixin AggregatorOpDispatch!();
-
-private:
-  Client[] clients_;
-}
-
-/// Ditto
-class TAsyncAggregator(Interface) if (isDerivedService!Interface) :
-  TAsyncAggregator!(BaseService!Interface)
-{
-  /// Shorthand for the client type this instance operates on.
-  alias TAsyncClientBase!Interface Client;
-
-  ///
-  this(Client[] clients) {
-    super(cast(TAsyncClientBase!(BaseService!Interface)[])clients);
-  }
-
-  mixin AggregatorOpDispatch!();
-}
-
-/**
- * Whether fun is a valid accumulator function for values of type ValueType.
- *
- * For this to be true, fun must be a callable matching one of the following
- * argument lists:
- * ---
- * fun(ValueType[] values);
- * fun(ValueType[] values, Exception[] exceptions);
- * ---
- *
- * The second version is passed the collected array exceptions from all the
- * clients in the pool.
- *
- * The return value of the accumulator function is passed to the client (via
- * the result future). If it throws an exception, the operation is marked as
- * failed with the given exception instead.
- */
-template isAccumulator(ValueType, alias fun) {
-  enum isAccumulator = is(typeof(fun(cast(ValueType[])[]))) ||
-    is(typeof(fun(cast(ValueType[])[], cast(Exception[])[])));
-}
-
-/**
- * TAsyncAggregator construction helper to avoid having to explicitly
- * specify the interface type, i.e. to allow the constructor being called
- * using IFTI (see $(DMDBUG 6082, D Bugzilla enhancement request 6082)).
- */
-TAsyncAggregator!Interface tAsyncAggregator(Interface)(
-  TAsyncClientBase!Interface[] clients
-) if (isService!Interface) {
-  return new typeof(return)(clients);
-}
-
-private {
-  mixin template AggregatorOpDispatch() {
-    auto opDispatch(string name, Args...)(Args args) if (
-      is(typeof(mixin("Interface.init." ~ name)(args)))
-    ) {
-      alias ReturnType!(MemberType!(Interface, name)) ResultType;
-
-      auto childCancellation = new TCancellationOrigin;
-
-      TFuture!ResultType[] futures;
-      futures.reserve(clients_.length);
-
-      foreach (c; cast(Client[])clients_) {
-        if (reopenTransports) {
-          if (!c.transport.isOpen) {
-            try {
-              c.transport.open();
-            } catch (Exception e) {
-              continue;
-            }
-          }
-        }
-        futures ~= mixin("c." ~ name)(args, childCancellation);
-      }
-
-      return AggregationResult!ResultType(futures, childCancellation);
-    }
-  }
-
-  struct AggregationResult(T) {
-    auto opSlice() {
-      return range();
-    }
-
-    auto range(Duration timeout = dur!"hnsecs"(0)) {
-      return tFutureAggregatorRange(futures_, childCancellation_, timeout);
-    }
-
-    auto accumulate(alias acc = defaultAccumulator)() if (isAccumulator!(T, acc)) {
-      return new AccumulatorJob!(T, acc)(futures_, childCancellation_);
-    }
-
-  private:
-    TFuture!T[] futures_;
-    TCancellationOrigin childCancellation_;
-  }
-
-  auto defaultAccumulator(T)(T[] values, Exception[] exceptions) {
-    if (values.empty) {
-      throw new TCompoundOperationException("All clients failed",
-        exceptions);
-    }
-
-    static if (is(typeof(T.init ~ T.init))) {
-      import std.algorithm;
-      return reduce!"a ~ b"(values);
-    } else {
-      return values;
-    }
-  }
-
-  final class AccumulatorJob(T, alias accumulator) if (
-    isAccumulator!(T, accumulator)
-  ) : TFuture!(AccumulatorResult!(T, accumulator)) {
-    this(TFuture!T[] futures, TCancellationOrigin childCancellation) {
-      futures_ = futures;
-      childCancellation_ = childCancellation;
-      resultMutex_ = new Mutex;
-      completionEvent_ = new TOneshotEvent;
-
-      foreach (future; futures) {
-        future.completion.addCallback({
-          auto f = future;
-          return {
-            synchronized (resultMutex_) {
-              if (f.status == TFutureStatus.CANCELLED) {
-                if (!finished_) {
-                  status_ = TFutureStatus.CANCELLED;
-                  finished_ = true;
-                }
-                return;
-              }
-
-              if (f.status == TFutureStatus.FAILED) {
-                exceptions_ ~= f.getException();
-              } else {
-                results_ ~= f.get();
-              }
-
-              if (results_.length + exceptions_.length == futures_.length) {
-                finished_ = true;
-                completionEvent_.trigger();
-              }
-            }
-          };
-        }());
-      }
-    }
-
-    TFutureStatus status() @property {
-      synchronized (resultMutex_) {
-        if (!finished_) return TFutureStatus.RUNNING;
-        if (status_ != TFutureStatus.RUNNING) return status_;
-
-        try {
-          result_ = invokeAccumulator!accumulator(results_, exceptions_);
-          status_ = TFutureStatus.SUCCEEDED;
-        } catch (Exception e) {
-          exception_ = e;
-          status_ = TFutureStatus.FAILED;
-        }
-
-        return status_;
-      }
-    }
-
-    TAwaitable completion() @property {
-      return completionEvent_;
-    }
-
-    AccumulatorResult!(T, accumulator) get() {
-      auto s = status;
-
-      enforce(s != TFutureStatus.RUNNING,
-        new TFutureException("Operation not yet completed."));
-
-      if (s == TFutureStatus.CANCELLED) throw new TCancelledException;
-      if (s == TFutureStatus.FAILED) throw exception_;
-      return result_;
-    }
-
-    Exception getException() {
-      auto s = status;
-      enforce(s != TFutureStatus.RUNNING,
-        new TFutureException("Operation not yet completed."));
-
-      if (s == TFutureStatus.CANCELLED) throw new TCancelledException;
-
-      if (s == TFutureStatus.SUCCEEDED) {
-        return null;
-      }
-      return exception_;
-    }
-
-    void finish() {
-      synchronized (resultMutex_) {
-        if (!finished_) {
-          finished_ = true;
-          childCancellation_.trigger();
-          completionEvent_.trigger();
-        }
-      }
-    }
-
-    auto finishGet() {
-      finish();
-      return get();
-    }
-
-  private:
-    TFuture!T[] futures_;
-    TCancellationOrigin childCancellation_;
-
-    bool finished_;
-    T[] results_;
-    Exception[] exceptions_;
-
-    TFutureStatus status_;
-    Mutex resultMutex_;
-    union {
-      AccumulatorResult!(T, accumulator) result_;
-      Exception exception_;
-    }
-    TOneshotEvent completionEvent_;
-  }
-
-  auto invokeAccumulator(alias accumulator, T)(
-    T[] values, Exception[] exceptions
-  ) if (
-    isAccumulator!(T, accumulator)
-  ) {
-    static if (is(typeof(accumulator(values, exceptions)))) {
-      return accumulator(values, exceptions);
-    } else {
-      return accumulator(values);
-    }
-  }
-
-  template AccumulatorResult(T, alias acc) {
-    alias typeof(invokeAccumulator!acc(cast(T[])[], cast(Exception[])[]))
-      AccumulatorResult;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/base.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/base.d
deleted file mode 100644
index db54992..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/base.d
+++ /dev/null
@@ -1,1021 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Code generation metadata and templates used for implementing struct
- * serialization.
- *
- * Many templates can be customized using field meta data, which is read from
- * a manifest constant member of the given type called fieldMeta (if present),
- * and is concatenated with the elements from the optional fieldMetaData
- * template alias parameter.
- *
- * Some code generation templates take account of the optional TVerboseCodegen
- * version declaration, which causes warning messages to be emitted if no
- * metadata for a field/method has been found and the default behavior is
- * used instead. If this version is not defined, the templates just silently
- * behave like the Thrift compiler does in this situation, i.e. automatically
- * assign negative ids (starting at -1) for fields and assume TReq.AUTO as
- * requirement level.
- */
-// Implementation note: All the templates in here taking a field metadata
-// parameter should ideally have a constraint that restricts the alias to
-// TFieldMeta[]-typed values, but the is() expressions seems to always fail.
-module thrift.codegen.base;
-
-import std.algorithm : find;
-import std.array : empty, front;
-import std.conv : to;
-import std.exception : enforce;
-import std.traits : BaseTypeTuple, isPointer, isSomeFunction, PointerTarget,
-  ReturnType;
-import thrift.base;
-import thrift.internal.codegen;
-import thrift.protocol.base;
-import thrift.util.hashset;
-
-/*
- * Thrift struct/service meta data, which is used to store information from
- * the interface definition files not representable in plain D, i.e. field
- * requirement levels, Thrift field IDs, etc.
- */
-
-/**
- * Struct field requirement levels.
- */
-enum TReq {
-  /// Detect the requiredness from the field type: if it is nullable, treat
-  /// the field as optional, if it is non-nullable, treat the field as
-  /// required. This is the default used for handling structs not generated
-  /// from an IDL file, and never emitted by the Thrift compiler. TReq.AUTO
-  /// shouldn't be specified explicitly.
-  // Implementation note: thrift.codegen templates use
-  // thrift.internal.codegen.memberReq to resolve AUTO to REQUIRED/OPTIONAL
-  // instead of handling it directly.
-  AUTO,
-
-  /// The field is treated as optional when deserializing/receiving the struct
-  /// and as required when serializing/sending. This is the Thrift default if
-  /// neither "required" nor "optional" are specified in the IDL file.
-  OPT_IN_REQ_OUT,
-
-  /// The field is optional.
-  OPTIONAL,
-
-  /// The field is required.
-  REQUIRED,
-
-  /// Ignore the struct field when serializing/deserializing.
-  IGNORE
-}
-
-/**
- * The way how methods are called.
- */
-enum TMethodType {
-  /// Called in the normal two-way scheme consisting of a request and a
-  /// response.
-  REGULAR,
-
-  /// A fire-and-forget one-way method, where no response is sent and the
-  /// client immediately returns.
-  ONEWAY
-}
-
-/**
- * Compile-time metadata for a struct field.
- */
-struct TFieldMeta {
-  /// The name of the field. Used for matching a TFieldMeta with the actual
-  /// D struct member during code generation.
-  string name;
-
-  /// The (Thrift) id of the field.
-  short id;
-
-  /// Whether the field is requried.
-  TReq req;
-
-  /// A code string containing a D expression for the default value, if there
-  /// is one.
-  string defaultValue;
-}
-
-/**
- * Compile-time metadata for a service method.
- */
-struct TMethodMeta {
-  /// The name of the method. Used for matching a TMethodMeta with the actual
-  /// method during code generation.
-  string name;
-
-  /// Meta information for the parameteres.
-  TParamMeta[] params;
-
-  /// Specifies which exceptions can be thrown by the method. All other
-  /// exceptions are converted to a TApplicationException instead.
-  TExceptionMeta[] exceptions;
-
-  /// The fundamental type of the method.
-  TMethodType type;
-}
-
-/**
- * Compile-time metadata for a service method parameter.
- */
-struct TParamMeta {
-  /// The name of the parameter. Contrary to TFieldMeta, it only serves
-  /// decorative purposes here.
-  string name;
-
-  /// The Thrift id of the parameter in the param struct.
-  short id;
-
-  /// A code string containing a D expression for the default value for the
-  /// parameter, if any.
-  string defaultValue;
-}
-
-/**
- * Compile-time metadata for a service method exception annotation.
- */
-struct TExceptionMeta {
-  /// The name of the exception »return value«. Contrary to TFieldMeta, it
-  /// only serves decorative purposes here, as it is only used in code not
-  /// visible to processor implementations/service clients.
-  string name;
-
-  /// The Thrift id of the exception field in the return value struct.
-  short id;
-
-  /// The name of the exception type.
-  string type;
-}
-
-/**
- * A pair of two TPorotocols. To be used in places where a list of protocols
- * is expected, for specifying different protocols for input and output.
- */
-struct TProtocolPair(InputProtocol, OutputProtocol) if (
-  isTProtocol!InputProtocol && isTProtocol!OutputProtocol
-) {}
-
-/**
- * true if T is a TProtocolPair.
- */
-template isTProtocolPair(T) {
-  static if (is(T _ == TProtocolPair!(I, O), I, O)) {
-    enum isTProtocolPair = true;
-  } else {
-    enum isTProtocolPair = false;
-  }
-}
-
-unittest {
-  static assert(isTProtocolPair!(TProtocolPair!(TProtocol, TProtocol)));
-  static assert(!isTProtocolPair!TProtocol);
-}
-
-/**
- * true if T is a TProtocol or a TProtocolPair.
- */
-template isTProtocolOrPair(T) {
-  enum isTProtocolOrPair = isTProtocol!T || isTProtocolPair!T;
-}
-
-unittest {
-  static assert(isTProtocolOrPair!TProtocol);
-  static assert(isTProtocolOrPair!(TProtocolPair!(TProtocol, TProtocol)));
-  static assert(!isTProtocolOrPair!void);
-}
-
-/**
- * true if T represents a Thrift service.
- */
-template isService(T) {
-  enum isService = isBaseService!T || isDerivedService!T;
-}
-
-/**
- * true if T represents a Thrift service not derived from another service.
- */
-template isBaseService(T) {
-  static if(is(T _ == interface) &&
-    (!is(T TBases == super) || TBases.length == 0)
-  ) {
-    enum isBaseService = true;
-  } else {
-    enum isBaseService = false;
-  }
-}
-
-/**
- * true if T represents a Thrift service derived from another service.
- */
-template isDerivedService(T) {
-  static if(is(T _ == interface) &&
-    is(T TBases == super) && TBases.length == 1
-  ) {
-    enum isDerivedService = isService!(TBases[0]);
-  } else {
-    enum isDerivedService = false;
-  }
-}
-
-/**
- * For derived services, gets the base service interface.
- */
-template BaseService(T) if (isDerivedService!T) {
-  alias BaseTypeTuple!T[0] BaseService;
-}
-
-
-/*
- * Code generation templates.
- */
-
-/**
- * Mixin template defining additional helper methods for using a struct with
- * Thrift, and a member called isSetFlags if the struct contains any fields
- * for which an »is set« flag is needed.
- *
- * It can only be used inside structs or Exception classes.
- *
- * For example, consider the following struct definition:
- * ---
- * struct Foo {
- *   string a;
- *   int b;
- *   int c;
- *
- *   mixin TStructHelpers!([
- *     TFieldMeta("a", 1), // Implicitly optional (nullable).
- *     TFieldMeta("b", 2), // Implicitly required (non-nullable).
- *     TFieldMeta("c", 3, TReq.REQUIRED, "4")
- *   ]);
- * }
- * ---
- *
- * TStructHelper adds the following methods to the struct:
- * ---
- * /++
- *  + Sets member fieldName to the given value and marks it as set.
- *  +
- *  + Examples:
- *  + ---
- *  + auto f = Foo();
- *  + f.set!"b"(12345);
- *  + assert(f.isSet!"b");
- *  + ---
- *  +/
- * void set(string fieldName)(MemberType!(This, fieldName) value);
- *
- * /++
- *  + Resets member fieldName to the init property of its type and marks it as
- *  + not set.
- *  +
- *  + Examples:
- *  + ---
- *  + // Set f.b to some value.
- *  + auto f = Foo();
- *  + f.set!"b"(12345);
- *  +
- *  + f.unset!b();
- *  +
- *  + // f.b is now unset again.
- *  + assert(!f.isSet!"b");
- *  + ---
- *  +/
- * void unset(string fieldName)();
- *
- * /++
- *  + Returns whether member fieldName is set.
- *  +
- *  + Examples:
- *  + ---
- *  + auto f = Foo();
- *  + assert(!f.isSet!"b");
- *  + f.set!"b"(12345);
- *  + assert(f.isSet!"b");
- *  + ---
- *  +/
- * bool isSet(string fieldName)() const @property;
- *
- * /++
- *  + Returns a string representation of the struct.
- *  +
- *  + Examples:
- *  + ---
- *  + auto f = Foo();
- *  + f.a = "a string";
- *  + assert(f.toString() == `Foo("a string", 0 (unset), 4)`);
- *  + ---
- *  +/
- * string toString() const;
- *
- * /++
- *  + Deserializes the struct, setting its members to the values read from the
- *  + protocol. Forwards to readStruct(this, proto);
- *  +/
- * void read(Protocol)(Protocol proto) if (isTProtocol!Protocol);
- *
- * /++
- *  + Serializes the struct to the target protocol. Forwards to
- *  + writeStruct(this, proto);
- *  +/
- * void write(Protocol)(Protocol proto) const if (isTProtocol!Protocol);
- * ---
- *
- * Additionally, an opEquals() implementation is provided which simply
- * compares all fields, but disregards the is set struct, if any (the exact
- * signature obviously differs between structs and exception classes). The
- * metadata is stored in a manifest constant called fieldMeta.
- *
- * Note: To set the default values for fields where one has been specified in
- * the field metadata, a parameterless static opCall is generated, because D
- * does not allow parameterless (default) constructors for structs. Thus, be
- * always to use to initialize structs:
- * ---
- * Foo foo; // Wrong!
- * auto foo = Foo(); // Correct.
- * ---
- */
-mixin template TStructHelpers(alias fieldMetaData = cast(TFieldMeta[])null) if (
-  is(typeof(fieldMetaData) : TFieldMeta[])
-) {
-  import std.algorithm : any;
-  import thrift.codegen.base;
-  import thrift.internal.codegen : isNullable, MemberType, mergeFieldMeta,
-    FieldNames;
-  import thrift.protocol.base : TProtocol, isTProtocol;
-
-  alias typeof(this) This;
-  static assert(is(This == struct) || is(This : Exception),
-    "TStructHelpers can only be used inside a struct or an Exception class.");
-
-  static if (TIsSetFlags!(This, fieldMetaData).tupleof.length > 0) {
-    // If we need to keep isSet flags around, create an instance of the
-    // container struct.
-    TIsSetFlags!(This, fieldMetaData) isSetFlags;
-    enum fieldMeta = fieldMetaData ~ [TFieldMeta("isSetFlags", 0, TReq.IGNORE)];
-  } else {
-    enum fieldMeta = fieldMetaData;
-  }
-
-  void set(string fieldName)(MemberType!(This, fieldName) value) if (
-    is(MemberType!(This, fieldName))
-  ) {
-    __traits(getMember, this, fieldName) = value;
-    static if (is(typeof(mixin("this.isSetFlags." ~ fieldName)) : bool)) {
-      __traits(getMember, this.isSetFlags, fieldName) = true;
-    }
-  }
-
-  void unset(string fieldName)() if (is(MemberType!(This, fieldName))) {
-    static if (is(typeof(mixin("this.isSetFlags." ~ fieldName)) : bool)) {
-      __traits(getMember, this.isSetFlags, fieldName) = false;
-    }
-    __traits(getMember, this, fieldName) = MemberType!(This, fieldName).init;
-  }
-
-  bool isSet(string fieldName)() const @property if (
-    is(MemberType!(This, fieldName))
-  ) {
-    static if (isNullable!(MemberType!(This, fieldName))) {
-      return __traits(getMember, this, fieldName) !is null;
-    } else static if (is(typeof(mixin("this.isSetFlags." ~ fieldName)) : bool)) {
-      return __traits(getMember, this.isSetFlags, fieldName);
-    } else {
-      // This is a required field, which is always set.
-      return true;
-    }
-  }
-
-  static if (is(This _ == class)) {
-    override string toString() const {
-      return thriftToStringImpl();
-    }
-
-    override bool opEquals(Object other) const {
-      auto rhs = cast(This)other;
-      if (rhs) {
-        return thriftOpEqualsImpl(rhs);
-      }
-
-      return (cast()super).opEquals(other);
-    }
-
-    override size_t toHash() const {
-      return thriftToHashImpl();
-    }
-  } else {
-    string toString() const {
-      return thriftToStringImpl();
-    }
-
-    bool opEquals(ref const This other) const {
-      return thriftOpEqualsImpl(other);
-    }
-
-    size_t toHash() const @safe nothrow {
-      return thriftToHashImpl();
-    }
-  }
-
-  private string thriftToStringImpl() const {
-    import std.conv : to;
-    string result = This.stringof ~ "(";
-    mixin({
-      string code = "";
-      bool first = true;
-      foreach (name; FieldNames!(This, fieldMeta)) {
-        if (first) {
-          first = false;
-        } else {
-          code ~= "result ~= `, `;\n";
-        }
-        code ~= "result ~= `" ~ name ~ ": ` ~ to!string(cast()this." ~ name ~ ");\n";
-        code ~= "if (!isSet!q{" ~ name ~ "}) {\n";
-        code ~= "result ~= ` (unset)`;\n";
-        code ~= "}\n";
-      }
-      return code;
-    }());
-    result ~= ")";
-    return result;
-  }
-
-  private bool thriftOpEqualsImpl(const ref This rhs) const {
-    foreach (name; FieldNames!This) {
-      if (mixin("this." ~ name) != mixin("rhs." ~ name)) return false;
-    }
-    return true;
-  }
-
-  private size_t thriftToHashImpl() const @trusted nothrow {
-    size_t hash = 0;
-    foreach (i, _; this.tupleof) {
-      auto val = this.tupleof[i];
-      hash += typeid(val).getHash(&val);
-    }
-    return hash;
-  }
-
-  static if (any!`!a.defaultValue.empty`(mergeFieldMeta!(This, fieldMetaData))) {
-    static if (is(This _ == class)) {
-      this() {
-        mixin(thriftFieldInitCode!(mergeFieldMeta!(This, fieldMetaData))("this"));
-      }
-    } else {
-      // DMD @@BUG@@: Have to use auto here to avoid »no size yet for forward
-      // reference« errors.
-      static auto opCall() {
-        auto result = This.init;
-        mixin(thriftFieldInitCode!(mergeFieldMeta!(This, fieldMetaData))("result"));
-        return result;
-      }
-    }
-  }
-
-  void read(Protocol)(Protocol proto) if (isTProtocol!Protocol) {
-    // Need to explicitly specify fieldMetaData here, since it isn't already
-    // picked up in some situations (e.g. the TArgs struct for methods with
-    // multiple parameters in async_test_servers) otherwise. Due to a DMD
-    // @@BUG@@, we need to explicitly specify the other template parameters
-    // as well.
-    readStruct!(This, Protocol, fieldMetaData, false)(this, proto);
-  }
-
-  void write(Protocol)(Protocol proto) const if (isTProtocol!Protocol) {
-    writeStruct!(This, Protocol, fieldMetaData, false)(this, proto);
-  }
-}
-
-// DMD @@BUG@@: Having this inside TStructHelpers leads to weird lookup errors
-// (e.g. for std.arry.empty).
-string thriftFieldInitCode(alias fieldMeta)(string thisName) {
-  string code = "";
-  foreach (field; fieldMeta) {
-    if (field.defaultValue.empty) continue;
-    code ~= thisName ~ "." ~ field.name ~ " = " ~ field.defaultValue ~ ";\n";
-  }
-  return code;
-}
-
-unittest {
-  // Cannot make this nested in the unittest block due to a »no size yet for
-  // forward reference« error.
-  static struct Foo {
-    string a;
-    int b;
-    int c;
-
-    mixin TStructHelpers!([
-      TFieldMeta("a", 1),
-      TFieldMeta("b", 2, TReq.OPT_IN_REQ_OUT),
-      TFieldMeta("c", 3, TReq.REQUIRED, "4")
-    ]);
-  }
-
-  auto f = Foo();
-
-  f.set!"b"(12345);
-  assert(f.isSet!"b");
-  f.unset!"b"();
-  assert(!f.isSet!"b");
-  f.set!"b"(12345);
-  assert(f.isSet!"b");
-  f.unset!"b"();
-
-  f.a = "a string";
-  assert(f.toString() == `Foo(a: a string, b: 0 (unset), c: 4)`);
-}
-
-
-/**
- * Generates an eponymous struct with boolean flags for the non-required
- * non-nullable fields of T.
- *
- * Nullable fields are just set to null to signal »not set«, so no flag is
- * emitted for them, even if they are optional.
- *
- * In most cases, you do not want to use this directly, but via TStructHelpers
- * instead.
- */
-template TIsSetFlags(T, alias fieldMetaData) {
-  mixin({
-    string code = "struct TIsSetFlags {\n";
-    foreach (meta; fieldMetaData) {
-      code ~= "static if (!is(MemberType!(T, `" ~ meta.name ~ "`))) {\n";
-      code ~= q{
-        static assert(false, "Field '" ~ meta.name ~
-          "' referenced in metadata not present in struct '" ~ T.stringof ~ "'.");
-      };
-      code ~= "}";
-      if (meta.req == TReq.OPTIONAL || meta.req == TReq.OPT_IN_REQ_OUT) {
-        code ~= "else static if (!isNullable!(MemberType!(T, `" ~ meta.name ~ "`))) {\n";
-        code ~= "  bool " ~ meta.name ~ ";\n";
-        code ~= "}\n";
-      }
-    }
-    code ~= "}";
-    return code;
-  }());
-}
-
-/**
- * Deserializes a Thrift struct from a protocol.
- *
- * Using the Protocol template parameter, the concrete TProtocol to use can be
- * be specified. If the pointerStruct parameter is set to true, the struct
- * fields are expected to be pointers to the actual data. This is used
- * internally (combined with TPResultStruct) and usually should not be used in
- * user code.
- *
- * This is a free function to make it possible to read exisiting structs from
- * the wire without altering their definitions.
- */
-void readStruct(T, Protocol, alias fieldMetaData = cast(TFieldMeta[])null,
-  bool pointerStruct = false)(auto ref T s, Protocol p) if (isTProtocol!Protocol)
-{
-  mixin({
-    string code;
-
-    // Check that all fields for which there is meta info are actually in the
-    // passed struct type.
-    foreach (field; mergeFieldMeta!(T, fieldMetaData)) {
-      code ~= "static assert(is(MemberType!(T, `" ~ field.name ~ "`)));\n";
-    }
-
-    // Returns the code string for reading a value of type F off the wire and
-    // assigning it to v. The level parameter is used to make sure that there
-    // are no conflicting variable names on recursive calls.
-    string readValueCode(ValueType)(string v, size_t level = 0) {
-      // Some non-ambigous names to use (shadowing is not allowed in D).
-      immutable i = "i" ~ to!string(level);
-      immutable elem = "elem" ~ to!string(level);
-      immutable key = "key" ~ to!string(level);
-      immutable list = "list" ~ to!string(level);
-      immutable map = "map" ~ to!string(level);
-      immutable set = "set" ~ to!string(level);
-      immutable value = "value" ~ to!string(level);
-
-      alias FullyUnqual!ValueType F;
-
-      static if (is(F == bool)) {
-        return v ~ " = p.readBool();";
-      } else static if (is(F == byte)) {
-        return v ~ " = p.readByte();";
-      } else static if (is(F == double)) {
-        return v ~ " = p.readDouble();";
-      } else static if (is(F == short)) {
-        return v ~ " = p.readI16();";
-      } else static if (is(F == int)) {
-        return v ~ " = p.readI32();";
-      } else static if (is(F == long)) {
-        return v ~ " = p.readI64();";
-      } else static if (is(F : string)) {
-        return v ~ " = p.readString();";
-      } else static if (is(F == enum)) {
-        return v ~ " = cast(typeof(" ~ v ~ "))p.readI32();";
-      } else static if (is(F _ : E[], E)) {
-        return "{\n" ~
-          "auto " ~ list ~ " = p.readListBegin();\n" ~
-          // TODO: Check element type here?
-          v ~ " = new typeof(" ~ v ~ "[0])[" ~ list ~ ".size];\n" ~
-          "foreach (" ~ i ~ "; 0 .. " ~ list ~ ".size) {\n" ~
-            readValueCode!E(v ~ "[" ~ i ~ "]", level + 1) ~ "\n" ~
-          "}\n" ~
-          "p.readListEnd();\n" ~
-        "}";
-      } else static if (is(F _ : V[K], K, V)) {
-        return "{\n" ~
-          "auto " ~ map ~ " = p.readMapBegin();" ~
-          v ~ " = null;\n" ~
-          // TODO: Check key/value types here?
-          "foreach (" ~ i ~ "; 0 .. " ~ map ~ ".size) {\n" ~
-            "FullyUnqual!(typeof(" ~ v ~ ".keys[0])) " ~ key ~ ";\n" ~
-            readValueCode!K(key, level + 1) ~ "\n" ~
-            "typeof(" ~ v ~ ".values[0]) " ~ value ~ ";\n" ~
-            readValueCode!V(value, level + 1) ~ "\n" ~
-            v ~ "[cast(typeof(" ~ v ~ ".keys[0]))" ~ key ~ "] = " ~ value ~ ";\n" ~
-          "}\n" ~
-          "p.readMapEnd();" ~
-        "}";
-      } else static if (is(F _ : HashSet!(E), E)) {
-        return "{\n" ~
-          "auto " ~ set ~ " = p.readSetBegin();" ~
-          // TODO: Check element type here?
-          v ~ " = new typeof(" ~ v ~ ")();\n" ~
-          "foreach (" ~ i ~ "; 0 .. " ~ set ~ ".size) {\n" ~
-            "typeof(" ~ v ~ "[][0]) " ~ elem ~ ";\n" ~
-            readValueCode!E(elem, level + 1) ~ "\n" ~
-            v ~ " ~= " ~ elem ~ ";\n" ~
-          "}\n" ~
-          "p.readSetEnd();" ~
-        "}";
-      } else static if (is(F == struct) || is(F : TException)) {
-        static if (is(F == struct)) {
-          auto result = v ~ " = typeof(" ~ v ~ ")();\n";
-        } else {
-          auto result = v ~ " = new typeof(" ~ v ~ ")();\n";
-        }
-
-        static if (__traits(compiles, F.init.read(TProtocol.init))) {
-          result ~= v ~ ".read(p);";
-        } else {
-          result ~= "readStruct(" ~ v ~ ", p);";
-        }
-        return result;
-      } else {
-        static assert(false, "Cannot represent type in Thrift: " ~ F.stringof);
-      }
-    }
-
-    string readFieldCode(FieldType)(string name, short id, TReq req) {
-      static if (pointerStruct && isPointer!FieldType) {
-        immutable v = "(*s." ~ name ~ ")";
-        alias PointerTarget!FieldType F;
-      } else {
-        immutable v = "s." ~ name;
-        alias FieldType F;
-      }
-
-      string code = "case " ~ to!string(id) ~ ":\n";
-      code ~= "if (f.type == " ~ dToTTypeString!F ~ ") {\n";
-      code ~= readValueCode!F(v) ~ "\n";
-      if (req == TReq.REQUIRED) {
-        // For required fields, set the corresponding local isSet variable.
-        code ~= "isSet_" ~ name ~ " = true;\n";
-      } else if (!isNullable!F){
-        code ~= "s.isSetFlags." ~ name ~ " = true;\n";
-      }
-      code ~= "} else skip(p, f.type);\n";
-      code ~= "break;\n";
-      return code;
-    }
-
-    // Code for the local boolean flags used to make sure required fields have
-    // been found.
-    string isSetFlagCode = "";
-
-    // Code for checking whether the flags for the required fields are true.
-    string isSetCheckCode = "";
-
-    /// Code for the case statements storing the fields to the result struct.
-    string readMembersCode = "";
-
-    // The last automatically assigned id – fields with no meta information
-    // are assigned (in lexical order) descending negative ids, starting with
-    // -1, just like the Thrift compiler does.
-    short lastId;
-
-    foreach (name; FieldNames!T) {
-      enum req = memberReq!(T, name, fieldMetaData);
-      if (req == TReq.REQUIRED) {
-        // For required fields, generate local bool flags to keep track
-        // whether the field has been encountered.
-        immutable n = "isSet_" ~ name;
-        isSetFlagCode ~= "bool " ~ n ~ ";\n";
-        isSetCheckCode ~= "enforce(" ~ n ~ ", new TProtocolException(" ~
-          "`Required field '" ~ name ~ "' not found in serialized data`, " ~
-          "TProtocolException.Type.INVALID_DATA));\n";
-      }
-
-      enum meta = find!`a.name == b`(mergeFieldMeta!(T, fieldMetaData), name);
-      static if (meta.empty) {
-        --lastId;
-        version (TVerboseCodegen) {
-          code ~= "pragma(msg, `[thrift.codegen.base.readStruct] Warning: No " ~
-            "meta information for field '" ~ name ~ "' in struct '" ~
-            T.stringof ~ "'. Assigned id: " ~ to!string(lastId) ~ ".`);\n";
-        }
-        readMembersCode ~= readFieldCode!(MemberType!(T, name))(
-          name, lastId, req);
-      } else static if (req != TReq.IGNORE) {
-        readMembersCode ~= readFieldCode!(MemberType!(T, name))(
-          name, meta.front.id, req);
-      }
-    }
-
-    code ~= isSetFlagCode;
-    code ~= "p.readStructBegin();\n";
-    code ~= "while (true) {\n";
-    code ~= "auto f = p.readFieldBegin();\n";
-    code ~= "if (f.type == TType.STOP) break;\n";
-    code ~= "switch(f.id) {\n";
-    code ~= readMembersCode;
-    code ~= "default: skip(p, f.type);\n";
-    code ~= "}\n";
-    code ~= "p.readFieldEnd();\n";
-    code ~= "}\n";
-    code ~= "p.readStructEnd();\n";
-    code ~= isSetCheckCode;
-
-    return code;
-  }());
-}
-
-/**
- * Serializes a struct to the target protocol.
- *
- * Using the Protocol template parameter, the concrete TProtocol to use can be
- * be specified. If the pointerStruct parameter is set to true, the struct
- * fields are expected to be pointers to the actual data. This is used
- * internally (combined with TPargsStruct) and usually should not be used in
- * user code.
- *
- * This is a free function to make it possible to read exisiting structs from
- * the wire without altering their definitions.
- */
-void writeStruct(T, Protocol, alias fieldMetaData = cast(TFieldMeta[])null,
-  bool pointerStruct = false) (const T s, Protocol p) if (isTProtocol!Protocol)
-{
-  mixin({
-    // Check that all fields for which there is meta info are actually in the
-    // passed struct type.
-    string code = "";
-    foreach (field; mergeFieldMeta!(T, fieldMetaData)) {
-      code ~= "static assert(is(MemberType!(T, `" ~ field.name ~ "`)));\n";
-    }
-
-    // Check that required nullable members are non-null.
-    // WORKAROUND: To stop LDC from emitting the manifest constant »meta« below
-    // into the writeStruct function body this is inside the string mixin
-    // block – the code wouldn't depend on it (this is an LDC bug, and because
-    // of it a new array would be allocated on each method invocation at runtime).
-    foreach (name; StaticFilter!(
-      Compose!(isNullable, PApply!(MemberType, T)),
-      FieldNames!T
-    )) {
-       static if (memberReq!(T, name, fieldMetaData) == TReq.REQUIRED) {
-         code ~= "enforce(__traits(getMember, s, `" ~ name ~ "`) !is null,
-           new TException(`Required field '" ~ name ~ "' is null.`));\n";
-       }
-    }
-
-    return code;
-  }());
-
-  p.writeStructBegin(TStruct(T.stringof));
-  mixin({
-    string writeValueCode(ValueType)(string v, size_t level = 0) {
-      // Some non-ambigous names to use (shadowing is not allowed in D).
-      immutable elem = "elem" ~ to!string(level);
-      immutable key = "key" ~ to!string(level);
-      immutable value = "value" ~ to!string(level);
-
-      alias FullyUnqual!ValueType F;
-      static if (is(F == bool)) {
-        return "p.writeBool(" ~ v ~ ");";
-      } else static if (is(F == byte)) {
-        return "p.writeByte(" ~ v ~ ");";
-      } else static if (is(F == double)) {
-        return "p.writeDouble(" ~ v ~ ");";
-      } else static if (is(F == short)) {
-        return "p.writeI16(" ~ v ~ ");";
-      } else static if (is(F == int)) {
-        return "p.writeI32(" ~ v ~ ");";
-      } else static if (is(F == long)) {
-        return "p.writeI64(" ~ v ~ ");";
-      } else static if (is(F : string)) {
-        return "p.writeString(" ~ v ~ ");";
-      } else static if (is(F == enum)) {
-        return "p.writeI32(cast(int)" ~ v ~ ");";
-      } else static if (is(F _ : E[], E)) {
-        return "p.writeListBegin(TList(" ~ dToTTypeString!E ~ ", " ~ v ~
-          ".length));\n" ~
-          "foreach (" ~ elem ~ "; " ~ v ~ ") {\n" ~
-            writeValueCode!E(elem, level + 1) ~ "\n" ~
-          "}\n" ~
-          "p.writeListEnd();";
-      } else static if (is(F _ : V[K], K, V)) {
-        return "p.writeMapBegin(TMap(" ~ dToTTypeString!K ~ ", " ~
-          dToTTypeString!V ~ ", " ~ v ~ ".length));\n" ~
-          "foreach (" ~ key ~ ", " ~ value ~ "; " ~ v ~ ") {\n" ~
-            writeValueCode!K(key, level + 1) ~ "\n" ~
-            writeValueCode!V(value, level + 1) ~ "\n" ~
-          "}\n" ~
-          "p.writeMapEnd();";
-      } else static if (is(F _ : HashSet!E, E)) {
-        return "p.writeSetBegin(TSet(" ~ dToTTypeString!E ~ ", " ~ v ~
-          ".length));\n" ~
-          "foreach (" ~ elem ~ "; " ~ v ~ "[]) {\n" ~
-            writeValueCode!E(elem, level + 1) ~ "\n" ~
-          "}\n" ~
-          "p.writeSetEnd();";
-      } else static if (is(F == struct) || is(F : TException)) {
-        static if (__traits(compiles, F.init.write(TProtocol.init))) {
-          return v ~ ".write(p);";
-        } else {
-          return "writeStruct(" ~ v ~ ", p);";
-        }
-      } else {
-        static assert(false, "Cannot represent type in Thrift: " ~ F.stringof);
-      }
-    }
-
-    string writeFieldCode(FieldType)(string name, short id, TReq req) {
-      string code;
-      if (!pointerStruct && req == TReq.OPTIONAL) {
-        code ~= "if (s.isSet!`" ~ name ~ "`) {\n";
-      }
-
-      static if (pointerStruct && isPointer!FieldType) {
-        immutable v = "(*s." ~ name ~ ")";
-        alias PointerTarget!FieldType F;
-      } else {
-        immutable v = "s." ~ name;
-        alias FieldType F;
-      }
-
-      code ~= "p.writeFieldBegin(TField(`" ~ name ~ "`, " ~ dToTTypeString!F ~
-        ", " ~ to!string(id) ~ "));\n";
-      code ~= writeValueCode!F(v) ~ "\n";
-      code ~= "p.writeFieldEnd();\n";
-
-      if (!pointerStruct && req == TReq.OPTIONAL) {
-        code ~= "}\n";
-      }
-      return code;
-    }
-
-    // The last automatically assigned id – fields with no meta information
-    // are assigned (in lexical order) descending negative ids, starting with
-    // -1, just like the Thrift compiler does.
-    short lastId;
-
-    string code = "";
-    foreach (name; FieldNames!T) {
-      alias MemberType!(T, name) F;
-      enum req = memberReq!(T, name, fieldMetaData);
-      enum meta = find!`a.name == b`(mergeFieldMeta!(T, fieldMetaData), name);
-      if (meta.empty) {
-        --lastId;
-        version (TVerboseCodegen) {
-          code ~= "pragma(msg, `[thrift.codegen.base.writeStruct] Warning: No " ~
-            "meta information for field '" ~ name ~ "' in struct '" ~
-            T.stringof ~ "'. Assigned id: " ~ to!string(lastId) ~ ".`);\n";
-        }
-        code ~= writeFieldCode!F(name, lastId, req);
-      } else if (req != TReq.IGNORE) {
-        code ~= writeFieldCode!F(name, meta.front.id, req);
-      }
-    }
-
-    return code;
-  }());
-  p.writeFieldStop();
-  p.writeStructEnd();
-}
-
-unittest {
-  // Ensure that the generated code at least compiles for the basic field type
-  // combinations. Functionality checks are covered by the rest of the test
-  // suite.
-
-  static struct Test {
-    // Non-nullable.
-    int a1;
-    int a2;
-    int a3;
-    int a4;
-
-    // Nullable.
-    string b1;
-    string b2;
-    string b3;
-    string b4;
-
-    mixin TStructHelpers!([
-      TFieldMeta("a1", 1, TReq.OPT_IN_REQ_OUT),
-      TFieldMeta("a2", 2, TReq.OPTIONAL),
-      TFieldMeta("a3", 3, TReq.REQUIRED),
-      TFieldMeta("a4", 4, TReq.IGNORE),
-      TFieldMeta("b1", 5, TReq.OPT_IN_REQ_OUT),
-      TFieldMeta("b2", 6, TReq.OPTIONAL),
-      TFieldMeta("b3", 7, TReq.REQUIRED),
-      TFieldMeta("b4", 8, TReq.IGNORE),
-    ]);
-  }
-
-  static assert(__traits(compiles, { Test t; t.read(cast(TProtocol)null); }));
-  static assert(__traits(compiles, { Test t; t.write(cast(TProtocol)null); }));
-}
-
-// Ensure opEquals and toHash consistency.
-unittest {
-  struct TestEquals {
-    int a1;
-
-    mixin TStructHelpers!([
-      TFieldMeta("a1", 1, TReq.OPT_IN_REQ_OUT),
-    ]);
-  }
-
-  TestEquals a, b;
-  assert(a == b);
-  assert(a.toHash() == b.toHash());
-
-  a.a1 = 42;
-  assert(a != b);
-  assert(a.toHash() != b.toHash());
-
-  b.a1 = 42;
-  assert(a == b);
-  assert(a.toHash() == b.toHash());
-}
-
-private {
-  /*
-   * Returns a D code string containing the matching TType value for a passed
-   * D type, e.g. dToTTypeString!byte == "TType.BYTE".
-   */
-  template dToTTypeString(T) {
-    static if (is(FullyUnqual!T == bool)) {
-      enum dToTTypeString = "TType.BOOL";
-    } else static if (is(FullyUnqual!T == byte)) {
-      enum dToTTypeString = "TType.BYTE";
-    } else static if (is(FullyUnqual!T == double)) {
-      enum dToTTypeString = "TType.DOUBLE";
-    } else static if (is(FullyUnqual!T == short)) {
-      enum dToTTypeString = "TType.I16";
-    } else static if (is(FullyUnqual!T == int)) {
-      enum dToTTypeString = "TType.I32";
-    } else static if (is(FullyUnqual!T == long)) {
-      enum dToTTypeString = "TType.I64";
-    } else static if (is(FullyUnqual!T : string)) {
-      enum dToTTypeString = "TType.STRING";
-    } else static if (is(FullyUnqual!T == enum)) {
-      enum dToTTypeString = "TType.I32";
-    } else static if (is(FullyUnqual!T _ : U[], U)) {
-      enum dToTTypeString = "TType.LIST";
-    } else static if (is(FullyUnqual!T _ : V[K], K, V)) {
-      enum dToTTypeString = "TType.MAP";
-    } else static if (is(FullyUnqual!T _ : HashSet!E, E)) {
-      enum dToTTypeString = "TType.SET";
-    } else static if (is(FullyUnqual!T == struct)) {
-      enum dToTTypeString = "TType.STRUCT";
-    } else static if (is(FullyUnqual!T : TException)) {
-      enum dToTTypeString = "TType.STRUCT";
-    } else {
-      static assert(false, "Cannot represent type in Thrift: " ~ T.stringof);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/client.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/client.d
deleted file mode 100644
index 117b076..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/client.d
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.codegen.client;
-
-import std.algorithm : find;
-import std.array : empty, front;
-import std.conv : to;
-import std.traits : isSomeFunction, ParameterStorageClass,
-  ParameterStorageClassTuple, ParameterTypeTuple, ReturnType;
-import thrift.codegen.base;
-import thrift.internal.codegen;
-import thrift.internal.ctfe;
-import thrift.protocol.base;
-
-/**
- * Thrift service client, which implements an interface by synchronously
- * calling a server over a TProtocol.
- *
- * TClientBase simply extends Interface with generic input/output protocol
- * properties to serve as a supertype for all TClients for the same service,
- * which might be instantiated with different concrete protocol types (there
- * is no covariance for template type parameters). If Interface is derived
- * from another interface BaseInterface, it also extends
- * TClientBase!BaseInterface.
- *
- * TClient is the class that actually implements TClientBase. Just as
- * TClientBase, it is also derived from TClient!BaseInterface for inheriting
- * services.
- *
- * TClient takes two optional template arguments which can be used for
- * specifying the actual TProtocol implementation used for optimization
- * purposes, as virtual calls can completely be eliminated then. If
- * OutputProtocol is not specified, it is assumed to be the same as
- * InputProtocol. The protocol properties defined by TClientBase are exposed
- * with their concrete type (return type covariance).
- *
- * In addition to implementing TClientBase!Interface, TClient offers the
- * following constructors:
- * ---
- * this(InputProtocol iprot, OutputProtocol oprot);
- * // Only if is(InputProtocol == OutputProtocol), to use the same protocol
- * // for both input and output:
- * this(InputProtocol prot);
- * ---
- *
- * The sequence id of the method calls starts at zero and is automatically
- * incremented.
- */
-interface TClientBase(Interface) if (isBaseService!Interface) : Interface {
-  /**
-   * The input protocol used by the client.
-   */
-  TProtocol inputProtocol() @property;
-
-  /**
-   * The output protocol used by the client.
-   */
-  TProtocol outputProtocol() @property;
-}
-
-/// Ditto
-interface TClientBase(Interface) if (isDerivedService!Interface) :
-  TClientBase!(BaseService!Interface), Interface {}
-
-/// Ditto
-template TClient(Interface, InputProtocol = TProtocol, OutputProtocol = void) if (
-  isService!Interface && isTProtocol!InputProtocol &&
-  (isTProtocol!OutputProtocol || is(OutputProtocol == void))
-) {
-  mixin({
-    static if (isDerivedService!Interface) {
-      string code = "class TClient : TClient!(BaseService!Interface, " ~
-        "InputProtocol, OutputProtocol), TClientBase!Interface {\n";
-      code ~= q{
-        this(IProt iprot, OProt oprot) {
-          super(iprot, oprot);
-        }
-
-        static if (is(IProt == OProt)) {
-          this(IProt prot) {
-            super(prot);
-          }
-        }
-
-        // DMD @@BUG@@: If these are not present in this class (would be)
-        // inherited anyway, »not implemented« errors are raised.
-        override IProt inputProtocol() @property {
-          return super.inputProtocol;
-        }
-        override OProt outputProtocol() @property {
-          return super.outputProtocol;
-        }
-      };
-    } else {
-      string code = "class TClient : TClientBase!Interface {";
-      code ~= q{
-        alias InputProtocol IProt;
-        static if (isTProtocol!OutputProtocol) {
-          alias OutputProtocol OProt;
-        } else {
-          static assert(is(OutputProtocol == void));
-          alias InputProtocol OProt;
-        }
-
-        this(IProt iprot, OProt oprot) {
-          iprot_ = iprot;
-          oprot_ = oprot;
-        }
-
-        static if (is(IProt == OProt)) {
-          this(IProt prot) {
-            this(prot, prot);
-          }
-        }
-
-        IProt inputProtocol() @property {
-          return iprot_;
-        }
-
-        OProt outputProtocol() @property {
-          return oprot_;
-        }
-
-        protected IProt iprot_;
-        protected OProt oprot_;
-        protected int seqid_;
-      };
-    }
-
-    foreach (methodName; __traits(derivedMembers, Interface)) {
-      static if (isSomeFunction!(mixin("Interface." ~ methodName))) {
-        bool methodMetaFound;
-        TMethodMeta methodMeta;
-        static if (is(typeof(Interface.methodMeta) : TMethodMeta[])) {
-          enum meta = find!`a.name == b`(Interface.methodMeta, methodName);
-          if (!meta.empty) {
-            methodMetaFound = true;
-            methodMeta = meta.front;
-          }
-        }
-
-        // Generate the code for sending.
-        string[] paramList;
-        string paramAssignCode;
-        foreach (i, _; ParameterTypeTuple!(mixin("Interface." ~ methodName))) {
-          // Use the param name speficied in the meta information if any –
-          // just cosmetics in this case.
-          string paramName;
-          if (methodMetaFound && i < methodMeta.params.length) {
-            paramName = methodMeta.params[i].name;
-          } else {
-            paramName = "param" ~ to!string(i + 1);
-          }
-
-          immutable storage = ParameterStorageClassTuple!(
-            mixin("Interface." ~ methodName))[i];
-          paramList ~= ((storage & ParameterStorageClass.ref_) ? "ref " : "") ~
-            "ParameterTypeTuple!(Interface." ~ methodName ~ ")[" ~
-            to!string(i) ~ "] " ~ paramName;
-          paramAssignCode ~= "args." ~ paramName ~ " = &" ~ paramName ~ ";\n";
-        }
-        code ~= "ReturnType!(Interface." ~ methodName ~ ") " ~ methodName ~
-          "(" ~ ctfeJoin(paramList) ~ ") {\n";
-
-        code ~= "immutable methodName = `" ~ methodName ~ "`;\n";
-
-        immutable paramStructType =
-          "TPargsStruct!(Interface, `" ~ methodName ~ "`)";
-        code ~= paramStructType ~ " args = " ~ paramStructType ~ "();\n";
-        code ~= paramAssignCode;
-        code ~= "oprot_.writeMessageBegin(TMessage(`" ~ methodName ~ "`, ";
-        code ~= ((methodMetaFound && methodMeta.type == TMethodType.ONEWAY)
-                 ? "TMessageType.ONEWAY" : "TMessageType.CALL");
-        code ~= ", ++seqid_));\n";
-        code ~= "args.write(oprot_);\n";
-        code ~= "oprot_.writeMessageEnd();\n";
-        code ~= "oprot_.transport.flush();\n";
-
-        // If this is not a oneway method, generate the receiving code.
-        if (!methodMetaFound || methodMeta.type != TMethodType.ONEWAY) {
-          code ~= "TPresultStruct!(Interface, `" ~ methodName ~ "`) result;\n";
-
-          if (!is(ReturnType!(mixin("Interface." ~ methodName)) == void)) {
-            code ~= "ReturnType!(Interface." ~ methodName ~ ") _return;\n";
-            code ~= "result.success = &_return;\n";
-          }
-
-          // TODO: The C++ implementation checks for matching method name here,
-          // should we do as well?
-          code ~= q{
-            auto msg = iprot_.readMessageBegin();
-            scope (exit) {
-              iprot_.readMessageEnd();
-              iprot_.transport.readEnd();
-            }
-
-            if (msg.type == TMessageType.EXCEPTION) {
-              auto x = new TApplicationException(null);
-              x.read(iprot_);
-              iprot_.transport.readEnd();
-              throw x;
-            }
-            if (msg.type != TMessageType.REPLY) {
-              skip(iprot_, TType.STRUCT);
-              iprot_.transport.readEnd();
-            }
-            if (msg.seqid != seqid_) {
-              throw new TApplicationException(
-                methodName ~ " failed: Out of sequence response.",
-                TApplicationException.Type.BAD_SEQUENCE_ID
-              );
-            }
-            result.read(iprot_);
-          };
-
-          if (methodMetaFound) {
-            foreach (e; methodMeta.exceptions) {
-              code ~= "if (result.isSet!`" ~ e.name ~ "`) throw result." ~
-                e.name ~ ";\n";
-            }
-          }
-
-          if (!is(ReturnType!(mixin("Interface." ~ methodName)) == void)) {
-            code ~= q{
-              if (result.isSet!`success`) return _return;
-              throw new TApplicationException(
-                methodName ~ " failed: Unknown result.",
-                TApplicationException.Type.MISSING_RESULT
-              );
-            };
-          }
-        }
-        code ~= "}\n";
-      }
-    }
-
-    code ~= "}\n";
-    return code;
-  }());
-}
-
-/**
- * TClient construction helper to avoid having to explicitly specify
- * the protocol types, i.e. to allow the constructor being called using IFTI
- * (see $(DMDBUG 6082, D Bugzilla enhancement requet 6082)).
- */
-TClient!(Interface, Prot) tClient(Interface, Prot)(Prot prot) if (
-  isService!Interface && isTProtocol!Prot
-) {
-  return new TClient!(Interface, Prot)(prot);
-}
-
-/// Ditto
-TClient!(Interface, IProt, Oprot) tClient(Interface, IProt, OProt)
-  (IProt iprot, OProt oprot) if (
-  isService!Interface && isTProtocol!IProt && isTProtocol!OProt
-) {
-  return new TClient!(Interface, IProt, OProt)(iprot, oprot);
-}
-
-/**
- * Represents the arguments of a Thrift method call, as pointers to the (const)
- * parameter type to avoid copying.
- *
- * There should usually be no reason to use this struct directly without the
- * help of TClient, but it is documented publicly to help debugging in case
- * of CTFE errors.
- *
- * Consider this example:
- * ---
- * interface Foo {
- *   int bar(string a, bool b);
- *
- *   enum methodMeta = [
- *     TMethodMeta("bar", [TParamMeta("a", 1), TParamMeta("b", 2)])
- *   ];
- * }
- *
- * alias TPargsStruct!(Foo, "bar") FooBarPargs;
- * ---
- *
- * The definition of FooBarPargs is equivalent to (ignoring the necessary
- * metadata to assign the field IDs):
- * ---
- * struct FooBarPargs {
- *   const(string)* a;
- *   const(bool)* b;
- *
- *   void write(Protocol)(Protocol proto) const if (isTProtocol!Protocol);
- * }
- * ---
- */
-template TPargsStruct(Interface, string methodName) {
-  static assert(is(typeof(mixin("Interface." ~ methodName))),
-    "Could not find method '" ~ methodName ~ "' in '" ~ Interface.stringof ~ "'.");
-  mixin({
-    bool methodMetaFound;
-    TMethodMeta methodMeta;
-    static if (is(typeof(Interface.methodMeta) : TMethodMeta[])) {
-      auto meta = find!`a.name == b`(Interface.methodMeta, methodName);
-      if (!meta.empty) {
-        methodMetaFound = true;
-        methodMeta = meta.front;
-      }
-    }
-
-    string memberCode;
-    string[] fieldMetaCodes;
-    foreach (i, _; ParameterTypeTuple!(mixin("Interface." ~ methodName))) {
-      // If we have no meta information, just use param1, param2, etc. as
-      // field names, it shouldn't really matter anyway. 1-based »indexing«
-      // is used to match the common scheme in the Thrift world.
-      string memberId;
-      string memberName;
-      if (methodMetaFound && i < methodMeta.params.length) {
-        memberId = to!string(methodMeta.params[i].id);
-        memberName = methodMeta.params[i].name;
-      } else {
-        memberId = to!string(i + 1);
-        memberName = "param" ~ to!string(i + 1);
-      }
-
-      // Workaround for DMD @@BUG@@ 6056: make an intermediary alias for the
-      // parameter type, and declare the member using const(memberNameType)*.
-      memberCode ~= "alias ParameterTypeTuple!(Interface." ~ methodName ~
-        ")[" ~ to!string(i) ~ "] " ~ memberName ~ "Type;\n";
-      memberCode ~= "const(" ~ memberName ~ "Type)* " ~ memberName ~ ";\n";
-
-      fieldMetaCodes ~= "TFieldMeta(`" ~ memberName ~ "`, " ~ memberId ~
-        ", TReq.OPT_IN_REQ_OUT)";
-    }
-
-    string code = "struct TPargsStruct {\n";
-    code ~= memberCode;
-    version (TVerboseCodegen) {
-      if (!methodMetaFound &&
-        ParameterTypeTuple!(mixin("Interface." ~ methodName)).length > 0)
-      {
-        code ~= "pragma(msg, `[thrift.codegen.base.TPargsStruct] Warning: No " ~
-          "meta information for method '" ~ methodName ~ "' in service '" ~
-          Interface.stringof ~ "' found.`);\n";
-      }
-    }
-    code ~= "void write(P)(P proto) const if (isTProtocol!P) {\n";
-    code ~= "writeStruct!(typeof(this), P, [" ~ ctfeJoin(fieldMetaCodes) ~
-      "], true)(this, proto);\n";
-    code ~= "}\n";
-    code ~= "}\n";
-    return code;
-  }());
-}
-
-/**
- * Represents the result of a Thrift method call, using a pointer to the return
- * value to avoid copying.
- *
- * There should usually be no reason to use this struct directly without the
- * help of TClient, but it is documented publicly to help debugging in case
- * of CTFE errors.
- *
- * Consider this example:
- * ---
- * interface Foo {
- *   int bar(string a);
- *
- *   alias .FooException FooException;
- *
- *   enum methodMeta = [
- *     TMethodMeta("bar",
- *       [TParamMeta("a", 1)],
- *       [TExceptionMeta("fooe", 1, "FooException")]
- *     )
- *   ];
- * }
- * alias TPresultStruct!(Foo, "bar") FooBarPresult;
- * ---
- *
- * The definition of FooBarPresult is equivalent to (ignoring the necessary
- * metadata to assign the field IDs):
- * ---
- * struct FooBarPresult {
- *   int* success;
- *   Foo.FooException fooe;
- *
- *   struct IsSetFlags {
- *     bool success;
- *   }
- *   IsSetFlags isSetFlags;
- *
- *   bool isSet(string fieldName)() const @property;
- *   void read(Protocol)(Protocol proto) if (isTProtocol!Protocol);
- * }
- * ---
- */
-template TPresultStruct(Interface, string methodName) {
-  static assert(is(typeof(mixin("Interface." ~ methodName))),
-    "Could not find method '" ~ methodName ~ "' in '" ~ Interface.stringof ~ "'.");
-
-  mixin({
-    string code = "struct TPresultStruct {\n";
-
-    string[] fieldMetaCodes;
-
-    alias ReturnType!(mixin("Interface." ~ methodName)) ResultType;
-    static if (!is(ResultType == void)) {
-      code ~= q{
-        ReturnType!(mixin("Interface." ~ methodName))* success;
-      };
-      fieldMetaCodes ~= "TFieldMeta(`success`, 0, TReq.OPTIONAL)";
-
-      static if (!isNullable!ResultType) {
-        code ~= q{
-          struct IsSetFlags {
-            bool success;
-          }
-          IsSetFlags isSetFlags;
-        };
-        fieldMetaCodes ~= "TFieldMeta(`isSetFlags`, 0, TReq.IGNORE)";
-      }
-    }
-
-    bool methodMetaFound;
-    static if (is(typeof(Interface.methodMeta) : TMethodMeta[])) {
-      auto meta = find!`a.name == b`(Interface.methodMeta, methodName);
-      if (!meta.empty) {
-        foreach (e; meta.front.exceptions) {
-          code ~= "Interface." ~ e.type ~ " " ~ e.name ~ ";\n";
-          fieldMetaCodes ~= "TFieldMeta(`" ~ e.name ~ "`, " ~ to!string(e.id) ~
-            ", TReq.OPTIONAL)";
-        }
-        methodMetaFound = true;
-      }
-    }
-
-    version (TVerboseCodegen) {
-      if (!methodMetaFound &&
-        ParameterTypeTuple!(mixin("Interface." ~ methodName)).length > 0)
-      {
-        code ~= "pragma(msg, `[thrift.codegen.base.TPresultStruct] Warning: No " ~
-          "meta information for method '" ~ methodName ~ "' in service '" ~
-          Interface.stringof ~ "' found.`);\n";
-      }
-    }
-
-    code ~= q{
-      bool isSet(string fieldName)() const @property if (
-        is(MemberType!(typeof(this), fieldName))
-      ) {
-        static if (fieldName == "success") {
-          static if (isNullable!(typeof(*success))) {
-            return *success !is null;
-          } else {
-            return isSetFlags.success;
-          }
-        } else {
-          // We are dealing with an exception member, which, being a nullable
-          // type (exceptions are always classes), has no isSet flag.
-          return __traits(getMember, this, fieldName) !is null;
-        }
-      }
-    };
-
-    code ~= "void read(P)(P proto) if (isTProtocol!P) {\n";
-    code ~= "readStruct!(typeof(this), P, [" ~ ctfeJoin(fieldMetaCodes) ~
-      "], true)(this, proto);\n";
-    code ~= "}\n";
-    code ~= "}\n";
-    return code;
-  }());
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/client_pool.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/client_pool.d
deleted file mode 100644
index c46b743..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/client_pool.d
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.codegen.client_pool;
-
-import core.time : dur, Duration, TickDuration;
-import std.traits : ParameterTypeTuple, ReturnType;
-import thrift.base;
-import thrift.codegen.base;
-import thrift.codegen.client;
-import thrift.internal.codegen;
-import thrift.internal.resource_pool;
-
-/**
- * Manages a pool of TClients for the given interface, forwarding RPC calls to
- * members of the pool.
- *
- * If a request fails, another client from the pool is tried, and optionally,
- * a client is disabled for a configurable amount of time if it fails too
- * often. If all clients fail (and keepTrying is false), a
- * TCompoundOperationException is thrown, containing all the collected RPC
- * exceptions.
- */
-class TClientPool(Interface) if (isService!Interface) : Interface {
-  /// Shorthand for TClientBase!Interface, the client type this instance
-  /// operates on.
-  alias TClientBase!Interface Client;
-
-  /**
-   * Creates a new instance and adds the given clients to the pool.
-   */
-  this(Client[] clients) {
-    pool_ = new TResourcePool!Client(clients);
-
-    rpcFaultFilter = (Exception e) {
-      import thrift.protocol.base;
-      import thrift.transport.base;
-      return (
-        (cast(TTransportException)e !is null) ||
-        (cast(TApplicationException)e !is null)
-      );
-    };
-  }
-
-  /**
-   * Executes an operation on the first currently active client.
-   *
-   * If the operation fails (throws an exception for which rpcFaultFilter is
-   * true), the failure is recorded and the next client in the pool is tried.
-   *
-   * Throws: Any non-rpc exception that occurs, a TCompoundOperationException
-   *   if all clients failed with an rpc exception (if keepTrying is false).
-   *
-   * Example:
-   * ---
-   * interface Foo { string bar(); }
-   * auto poolClient = tClientPool([tClient!Foo(someProtocol)]);
-   * auto result = poolClient.execute((c){ return c.bar(); });
-   * ---
-   */
-  ResultType execute(ResultType)(scope ResultType delegate(Client) work) {
-    return executeOnPool!Client(work);
-  }
-
-  /**
-   * Adds a client to the pool.
-   */
-  void addClient(Client client) {
-    pool_.add(client);
-  }
-
-  /**
-   * Removes a client from the pool.
-   *
-   * Returns: Whether the client was found in the pool.
-   */
-  bool removeClient(Client client) {
-    return pool_.remove(client);
-  }
-
-  mixin(poolForwardCode!Interface());
-
-  /// Whether to open the underlying transports of a client before trying to
-  /// execute a method if they are not open. This is usually desirable
-  /// because it allows e.g. to automatically reconnect to a remote server
-  /// if the network connection is dropped.
-  ///
-  /// Defaults to true.
-  bool reopenTransports = true;
-
-  /// Called to determine whether an exception comes from a client from the
-  /// pool not working properly, or if it an exception thrown at the
-  /// application level.
-  ///
-  /// If the delegate returns true, the server/connection is considered to be
-  /// at fault, if it returns false, the exception is just passed on to the
-  /// caller.
-  ///
-  /// By default, returns true for instances of TTransportException and
-  /// TApplicationException, false otherwise.
-  bool delegate(Exception) rpcFaultFilter;
-
-  /**
-   * Whether to keep trying to find a working client if all have failed in a
-   * row.
-   *
-   * Defaults to false.
-   */
-  bool keepTrying() const @property {
-    return pool_.cycle;
-  }
-
-  /// Ditto
-  void keepTrying(bool value) @property {
-    pool_.cycle = value;
-  }
-
-  /**
-   * Whether to use a random permutation of the client pool on every call to
-   * execute(). This can be used e.g. as a simple form of load balancing.
-   *
-   * Defaults to true.
-   */
-  bool permuteClients() const @property {
-    return pool_.permute;
-  }
-
-  /// Ditto
-  void permuteClients(bool value) @property {
-    pool_.permute = value;
-  }
-
-  /**
-   * The number of consecutive faults after which a client is disabled until
-   * faultDisableDuration has passed. 0 to never disable clients.
-   *
-   * Defaults to 0.
-   */
-  ushort faultDisableCount() @property {
-    return pool_.faultDisableCount;
-  }
-
-  /// Ditto
-  void faultDisableCount(ushort value) @property {
-    pool_.faultDisableCount = value;
-  }
-
-  /**
-   * The duration for which a client is no longer considered after it has
-   * failed too often.
-   *
-   * Defaults to one second.
-   */
-  Duration faultDisableDuration() @property {
-    return pool_.faultDisableDuration;
-  }
-
-  /// Ditto
-  void faultDisableDuration(Duration value) @property {
-    pool_.faultDisableDuration = value;
-  }
-
-protected:
-  ResultType executeOnPool(ResultType)(scope ResultType delegate(Client) work) {
-    auto clients = pool_[];
-    if (clients.empty) {
-      throw new TException("No clients available to try.");
-    }
-
-    while (true) {
-      Exception[] rpcExceptions;
-      while (!clients.empty) {
-        auto c = clients.front;
-        clients.popFront;
-        try {
-          scope (success) {
-            pool_.recordSuccess(c);
-          }
-
-          if (reopenTransports) {
-            c.inputProtocol.transport.open();
-            c.outputProtocol.transport.open();
-          }
-
-          return work(c);
-        } catch (Exception e) {
-          if (rpcFaultFilter && rpcFaultFilter(e)) {
-            pool_.recordFault(c);
-            rpcExceptions ~= e;
-          } else {
-            // We are dealing with a normal exception thrown by the
-            // server-side method, just pass it on. As far as we are
-            // concerned, the method call succeeded.
-            pool_.recordSuccess(c);
-            throw e;
-          }
-        }
-      }
-
-      // If we get here, no client succeeded during the current iteration.
-      Duration waitTime;
-      Client dummy;
-      if (clients.willBecomeNonempty(dummy, waitTime)) {
-        if (waitTime > dur!"hnsecs"(0)) {
-          import core.thread;
-          Thread.sleep(waitTime);
-        }
-      } else {
-        throw new TCompoundOperationException("All clients failed.",
-          rpcExceptions);
-      }
-    }
-  }
-
-private:
-  TResourcePool!Client pool_;
-}
-
-private {
-  // Cannot use an anonymous delegate literal for this because they aren't
-  // allowed in class scope.
-  string poolForwardCode(Interface)() {
-    string code = "";
-
-    foreach (methodName; AllMemberMethodNames!Interface) {
-      enum qn = "Interface." ~ methodName;
-      code ~= "ReturnType!(" ~ qn ~ ") " ~ methodName ~
-        "(ParameterTypeTuple!(" ~ qn ~ ") args) {\n";
-      code ~= "return executeOnPool((Client c){ return c." ~
-        methodName ~ "(args); });\n";
-      code ~= "}\n";
-    }
-
-    return code;
-  }
-}
-
-/**
- * TClientPool construction helper to avoid having to explicitly specify
- * the interface type, i.e. to allow the constructor being called using IFTI
- * (see $(DMDBUG 6082, D Bugzilla enhancement requet 6082)).
- */
-TClientPool!Interface tClientPool(Interface)(
-  TClientBase!Interface[] clients
-) if (isService!Interface) {
-  return new typeof(return)(clients);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/idlgen.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/idlgen.d
deleted file mode 100644
index 9f88936..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/idlgen.d
+++ /dev/null
@@ -1,770 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Contains <b>experimental</b> functionality for generating Thrift IDL files
- * (.thrift) from existing D data structures, i.e. the reverse of what the
- * Thrift compiler does.
- */
-module thrift.codegen.idlgen;
-
-import std.algorithm : find;
-import std.array : empty, front;
-import std.conv : to;
-import std.traits : EnumMembers, isSomeFunction, OriginalType,
-  ParameterTypeTuple, ReturnType;
-import std.typetuple : allSatisfy, staticIndexOf, staticMap, NoDuplicates,
-  TypeTuple;
-import thrift.base;
-import thrift.codegen.base;
-import thrift.internal.codegen;
-import thrift.internal.ctfe;
-import thrift.util.hashset;
-
-/**
- * True if the passed type is a Thrift entity (struct, exception, enum,
- * service).
- */
-alias Any!(isStruct, isException, isEnum, isService) isThriftEntity;
-
-/**
- * Returns an IDL string describing the passed »root« entities and all types
- * they depend on.
- */
-template idlString(Roots...) if (allSatisfy!(isThriftEntity, Roots)) {
-  enum idlString = idlStringImpl!Roots.result;
-}
-
-private {
-  template idlStringImpl(Roots...) if (allSatisfy!(isThriftEntity, Roots)) {
-    alias ForAllWithList!(
-      ConfinedTuple!(StaticFilter!(isService, Roots)),
-      AddBaseServices
-    ) Services;
-
-    alias TypeTuple!(
-      StaticFilter!(isEnum, Roots),
-      ForAllWithList!(
-        ConfinedTuple!(
-          StaticFilter!(Any!(isException, isStruct), Roots),
-          staticMap!(CompositeTypeDeps, staticMap!(ServiceTypeDeps, Services))
-        ),
-        AddStructWithDeps
-      )
-    ) Types;
-
-    enum result = ctfeJoin(
-      [
-        staticMap!(
-          enumIdlString,
-          StaticFilter!(isEnum, Types)
-        ),
-        staticMap!(
-          structIdlString,
-          StaticFilter!(Any!(isStruct, isException), Types)
-        ),
-        staticMap!(
-          serviceIdlString,
-          Services
-        )
-      ],
-      "\n"
-    );
-  }
-
-  template ServiceTypeDeps(T) if (isService!T) {
-    alias staticMap!(
-      PApply!(MethodTypeDeps, T),
-      FilterMethodNames!(T, __traits(derivedMembers, T))
-    ) ServiceTypeDeps;
-  }
-
-  template MethodTypeDeps(T, string name) if (
-    isService!T && isSomeFunction!(MemberType!(T, name))
-  ) {
-    alias TypeTuple!(
-      ReturnType!(MemberType!(T, name)),
-      ParameterTypeTuple!(MemberType!(T, name)),
-      ExceptionTypes!(T, name)
-    ) MethodTypeDeps;
-  }
-
-  template ExceptionTypes(T, string name) if (
-    isService!T && isSomeFunction!(MemberType!(T, name))
-  ) {
-    mixin({
-      enum meta = find!`a.name == b`(getMethodMeta!T, name);
-      if (meta.empty) return "alias TypeTuple!() ExceptionTypes;";
-
-      string result = "alias TypeTuple!(";
-      foreach (i, e; meta.front.exceptions) {
-        if (i > 0) result ~= ", ";
-        result ~= "mixin(`T." ~ e.type ~ "`)";
-      }
-      result ~= ") ExceptionTypes;";
-      return result;
-    }());
-  }
-
-  template AddBaseServices(T, List...) {
-    static if (staticIndexOf!(T, List) == -1) {
-      alias NoDuplicates!(BaseServices!T, List) AddBaseServices;
-    } else {
-      alias List AddStructWithDeps;
-    }
-  }
-
-  unittest {
-    interface A {}
-    interface B : A {}
-    interface C : B {}
-    interface D : A {}
-
-    static assert(is(AddBaseServices!(C) == TypeTuple!(A, B, C)));
-    static assert(is(ForAllWithList!(ConfinedTuple!(C, D), AddBaseServices) ==
-      TypeTuple!(A, D, B, C)));
-  }
-
-  template BaseServices(T, Rest...) if (isService!T) {
-    static if (isDerivedService!T) {
-      alias BaseServices!(BaseService!T, T, Rest) BaseServices;
-    } else {
-      alias TypeTuple!(T, Rest) BaseServices;
-    }
-  }
-
-  template AddStructWithDeps(T, List...) {
-    static if (staticIndexOf!(T, List) == -1) {
-      // T is not already in the List, so add T and the types it depends on in
-      // the front. Because with the Thrift compiler types can only depend on
-      // other types that have already been defined, we collect all the
-      // dependencies, prepend them to the list, and then prune the duplicates
-      // (keeping the first occurrences). If this requirement should ever be
-      // dropped from Thrift, this could be easily adapted to handle circular
-      // dependencies by passing TypeTuple!(T, List) to ForAllWithList instead
-      // of appending List afterwards, and removing the now unnecessary
-      // NoDuplicates.
-      alias NoDuplicates!(
-        ForAllWithList!(
-          ConfinedTuple!(
-            staticMap!(
-              CompositeTypeDeps,
-              staticMap!(
-                PApply!(MemberType, T),
-                FieldNames!T
-              )
-            )
-          ),
-          .AddStructWithDeps,
-          T
-        ),
-        List
-      ) AddStructWithDeps;
-    } else {
-      alias List AddStructWithDeps;
-    }
-  }
-
-  version (unittest) {
-    struct A {}
-    struct B {
-      A a;
-      int b;
-      A c;
-      string d;
-    }
-    struct C {
-      B b;
-      A a;
-    }
-
-    static assert(is(AddStructWithDeps!C == TypeTuple!(A, B, C)));
-
-    struct D {
-      C c;
-      mixin TStructHelpers!([TFieldMeta("c", 0, TReq.IGNORE)]);
-    }
-    static assert(is(AddStructWithDeps!D == TypeTuple!(D)));
-  }
-
-  version (unittest) {
-    // Circles in the type dependency graph are not allowed in Thrift, but make
-    // sure we fail in a sane way instead of crashing the compiler.
-
-    struct Rec1 {
-      Rec2[] other;
-    }
-
-    struct Rec2 {
-      Rec1[] other;
-    }
-
-    static assert(!__traits(compiles, AddStructWithDeps!Rec1));
-  }
-
-  /*
-   * Returns the non-primitive types T directly depends on.
-   *
-   * For example, CompositeTypeDeps!int would yield an empty type tuple,
-   * CompositeTypeDeps!SomeStruct would give SomeStruct, and
-   * CompositeTypeDeps!(A[B]) both CompositeTypeDeps!A and CompositeTypeDeps!B.
-   */
-  template CompositeTypeDeps(T) {
-    static if (is(FullyUnqual!T == bool) || is(FullyUnqual!T == byte) ||
-      is(FullyUnqual!T == short) || is(FullyUnqual!T == int) ||
-      is(FullyUnqual!T == long) || is(FullyUnqual!T : string) ||
-      is(FullyUnqual!T == double) || is(FullyUnqual!T == void)
-    ) {
-      alias TypeTuple!() CompositeTypeDeps;
-    } else static if (is(FullyUnqual!T _ : U[], U)) {
-      alias CompositeTypeDeps!U CompositeTypeDeps;
-    } else static if (is(FullyUnqual!T _ : HashSet!E, E)) {
-      alias CompositeTypeDeps!E CompositeTypeDeps;
-    } else static if (is(FullyUnqual!T _ : V[K], K, V)) {
-      alias TypeTuple!(CompositeTypeDeps!K, CompositeTypeDeps!V) CompositeTypeDeps;
-    } else static if (is(FullyUnqual!T == enum) || is(FullyUnqual!T == struct) ||
-      is(FullyUnqual!T : TException)
-    ) {
-      alias TypeTuple!(FullyUnqual!T) CompositeTypeDeps;
-    } else {
-      static assert(false, "Cannot represent type in Thrift: " ~ T.stringof);
-    }
-  }
-}
-
-/**
- * Returns an IDL string describing the passed service. IDL code for any type
- * dependcies is not included.
- */
-template serviceIdlString(T) if (isService!T) {
-  enum serviceIdlString = {
-    string result = "service " ~ T.stringof;
-    static if (isDerivedService!T) {
-      result ~= " extends " ~ BaseService!T.stringof;
-    }
-    result ~= " {\n";
-
-    foreach (methodName; FilterMethodNames!(T, __traits(derivedMembers, T))) {
-      result ~= "  ";
-
-      enum meta = find!`a.name == b`(T.methodMeta, methodName);
-
-      static if (!meta.empty && meta.front.type == TMethodType.ONEWAY) {
-        result ~= "oneway ";
-      }
-
-      alias ReturnType!(MemberType!(T, methodName)) RT;
-      static if (is(RT == void)) {
-        // We special-case this here instead of adding void to dToIdlType to
-        // avoid accepting things like void[].
-        result ~= "void ";
-      } else {
-        result ~= dToIdlType!RT ~ " ";
-      }
-      result ~= methodName ~ "(";
-
-      short lastId;
-      foreach (i, ParamType; ParameterTypeTuple!(MemberType!(T, methodName))) {
-        static if (!meta.empty && i < meta.front.params.length) {
-          enum havePM = true;
-        } else {
-          enum havePM = false;
-        }
-
-        short id;
-        static if (havePM) {
-          id = meta.front.params[i].id;
-        } else {
-          id = --lastId;
-        }
-
-        string paramName;
-        static if (havePM) {
-          paramName = meta.front.params[i].name;
-        } else {
-          paramName = "param" ~ to!string(i + 1);
-        }
-
-        result ~= to!string(id) ~ ": " ~ dToIdlType!ParamType ~ " " ~ paramName;
-
-        static if (havePM && !meta.front.params[i].defaultValue.empty) {
-          result ~= " = " ~ dToIdlConst(mixin(meta.front.params[i].defaultValue));
-        } else {
-          // Unfortunately, getting the default value for parameters from a
-          // function alias isn't possible – we can't transfer the default
-          // value to the IDL e.g. for interface Foo { void foo(int a = 5); }
-          // without the user explicitly declaring it in metadata.
-        }
-        result ~= ", ";
-      }
-      result ~= ")";
-
-      static if (!meta.empty && !meta.front.exceptions.empty) {
-        result ~= " throws (";
-        foreach (e; meta.front.exceptions) {
-          result ~= to!string(e.id) ~ ": " ~ e.type ~ " " ~ e.name ~ ", ";
-        }
-        result ~= ")";
-      }
-
-      result ~= ",\n";
-    }
-
-    result ~= "}\n";
-    return result;
-  }();
-}
-
-/**
- * Returns an IDL string describing the passed enum. IDL code for any type
- * dependcies is not included.
- */
-template enumIdlString(T) if (isEnum!T) {
-  enum enumIdlString = {
-    static assert(is(OriginalType!T : long),
-      "Can only have integer enums in Thrift (not " ~ OriginalType!T.stringof ~
-      ", for " ~ T.stringof ~ ").");
-
-    string result = "enum " ~ T.stringof ~ " {\n";
-
-    foreach (name; __traits(derivedMembers, T)) {
-      result ~= "  " ~ name ~ " = " ~ dToIdlConst(GetMember!(T, name)) ~ ",\n";
-    }
-
-    result ~= "}\n";
-    return result;
-  }();
-}
-
-/**
- * Returns an IDL string describing the passed struct. IDL code for any type
- * dependcies is not included.
- */
-template structIdlString(T) if (isStruct!T || isException!T) {
-  enum structIdlString = {
-    mixin({
-      string code = "";
-      foreach (field; getFieldMeta!T) {
-        code ~= "static assert(is(MemberType!(T, `" ~ field.name ~ "`)));\n";
-      }
-      return code;
-    }());
-
-    string result;
-    static if (isException!T) {
-      result = "exception ";
-    } else {
-      result = "struct ";
-    }
-    result ~= T.stringof ~ " {\n";
-
-    // The last automatically assigned id – fields with no meta information
-    // are assigned (in lexical order) descending negative ids, starting with
-    // -1, just like the Thrift compiler does.
-    short lastId;
-
-    foreach (name; FieldNames!T) {
-      enum meta = find!`a.name == b`(getFieldMeta!T, name);
-
-      static if (meta.empty || meta.front.req != TReq.IGNORE) {
-        short id;
-        static if (meta.empty) {
-          id = --lastId;
-        } else {
-          id = meta.front.id;
-        }
-
-        result ~= "  " ~ to!string(id) ~ ":";
-        static if (!meta.empty) {
-          result ~= dToIdlReq(meta.front.req);
-        }
-        result ~= " " ~ dToIdlType!(MemberType!(T, name)) ~ " " ~ name;
-
-        static if (!meta.empty && !meta.front.defaultValue.empty) {
-          result ~= " = " ~ dToIdlConst(mixin(meta.front.defaultValue));
-        } else static if (__traits(compiles, fieldInitA!(T, name))) {
-          static if (is(typeof(fieldInitA!(T, name))) &&
-            !is(typeof(fieldInitA!(T, name)) == void)
-          ) {
-            result ~= " = " ~ dToIdlConst(fieldInitA!(T, name));
-          }
-        } else static if (is(typeof(fieldInitB!(T, name))) &&
-          !is(typeof(fieldInitB!(T, name)) == void)
-        ) {
-          result ~= " = " ~ dToIdlConst(fieldInitB!(T, name));
-        }
-        result ~= ",\n";
-      }
-    }
-
-    result ~= "}\n";
-    return result;
-  }();
-}
-
-private {
-  // This very convoluted way of doing things was chosen because putting the
-  // static if directly into structIdlString caused »not evaluatable at compile
-  // time« errors to slip through even though typeof() was used, resp. the
-  // condition to be true even though the value couldn't actually be read at
-  // compile time due to a @@BUG@@ in DMD 2.055.
-  // The extra »compiled« field in fieldInitA is needed because we must not try
-  // to use != if !is compiled as well (but was false), e.g. for floating point
-  // types.
-  template fieldInitA(T, string name) {
-    static if (mixin("T.init." ~ name) !is MemberType!(T, name).init) {
-      enum fieldInitA = mixin("T.init." ~ name);
-    }
-  }
-
-  template fieldInitB(T, string name) {
-    static if (mixin("T.init." ~ name) != MemberType!(T, name).init) {
-      enum fieldInitB = mixin("T.init." ~ name);
-    }
-  }
-
-  template dToIdlType(T) {
-    static if (is(FullyUnqual!T == bool)) {
-      enum dToIdlType = "bool";
-    } else static if (is(FullyUnqual!T == byte)) {
-      enum dToIdlType = "byte";
-    } else static if (is(FullyUnqual!T == double)) {
-      enum dToIdlType = "double";
-    } else static if (is(FullyUnqual!T == short)) {
-      enum dToIdlType = "i16";
-    } else static if (is(FullyUnqual!T == int)) {
-      enum dToIdlType = "i32";
-    } else static if (is(FullyUnqual!T == long)) {
-      enum dToIdlType = "i64";
-    } else static if (is(FullyUnqual!T : string)) {
-      enum dToIdlType = "string";
-    } else static if (is(FullyUnqual!T _ : U[], U)) {
-      enum dToIdlType = "list<" ~ dToIdlType!U ~ ">";
-    } else static if (is(FullyUnqual!T _ : V[K], K, V)) {
-      enum dToIdlType = "map<" ~ dToIdlType!K ~ ", " ~ dToIdlType!V ~ ">";
-    } else static if (is(FullyUnqual!T _ : HashSet!E, E)) {
-      enum dToIdlType = "set<" ~ dToIdlType!E ~ ">";
-    } else static if (is(FullyUnqual!T == struct) || is(FullyUnqual!T == enum) ||
-      is(FullyUnqual!T : TException)
-    ) {
-      enum dToIdlType = FullyUnqual!(T).stringof;
-    } else {
-      static assert(false, "Cannot represent type in Thrift: " ~ T.stringof);
-    }
-  }
-
-  string dToIdlReq(TReq req) {
-    switch (req) {
-      case TReq.REQUIRED: return " required";
-      case TReq.OPTIONAL: return " optional";
-      default: return "";
-    }
-  }
-
-  string dToIdlConst(T)(T value) {
-    static if (is(FullyUnqual!T == bool)) {
-      return value ? "1" : "0";
-    } else static if (is(FullyUnqual!T == byte) ||
-      is(FullyUnqual!T == short) || is(FullyUnqual!T == int) ||
-      is(FullyUnqual!T == long)
-    ) {
-      return to!string(value);
-    } else static if (is(FullyUnqual!T : string)) {
-      return `"` ~ to!string(value) ~ `"`;
-    } else static if (is(FullyUnqual!T == double)) {
-      return ctfeToString(value);
-    } else static if (is(FullyUnqual!T _ : U[], U) ||
-      is(FullyUnqual!T _ : HashSet!E, E)
-    ) {
-      string result = "[";
-      foreach (e; value) {
-        result ~= dToIdlConst(e) ~ ", ";
-      }
-      result ~= "]";
-      return result;
-    } else static if (is(FullyUnqual!T _ : V[K], K, V)) {
-      string result = "{";
-      foreach (key, val; value) {
-        result ~= dToIdlConst(key) ~ ": " ~ dToIdlConst(val) ~ ", ";
-      }
-      result ~= "}";
-      return result;
-    } else static if (is(FullyUnqual!T == enum)) {
-      import std.conv;
-      import std.traits;
-      return to!string(cast(OriginalType!T)value);
-    } else static if (is(FullyUnqual!T == struct) ||
-      is(FullyUnqual!T : TException)
-    ) {
-      string result = "{";
-      foreach (name; __traits(derivedMembers, T)) {
-        static if (memberReq!(T, name) != TReq.IGNORE) {
-          result ~= name ~ ": " ~ dToIdlConst(mixin("value." ~ name)) ~ ", ";
-        }
-      }
-      result ~= "}";
-      return result;
-    } else {
-      static assert(false, "Cannot represent type in Thrift: " ~ T.stringof);
-    }
-  }
-}
-
-version (unittest) {
-  enum Foo {
-    a = 1,
-    b = 10,
-    c = 5
-  }
-
-  static assert(enumIdlString!Foo ==
-`enum Foo {
-  a = 1,
-  b = 10,
-  c = 5,
-}
-`);
-}
-
-
-version (unittest) {
-  struct WithoutMeta {
-    string a;
-    int b;
-  }
-
-  struct WithDefaults {
-    string a = "asdf";
-    double b = 3.1415;
-    WithoutMeta c;
-
-    mixin TStructHelpers!([
-      TFieldMeta("c", 1, TReq.init, `WithoutMeta("foo", 3)`)
-    ]);
-  }
-
-  // These are from DebugProtoTest.thrift.
-  struct OneOfEach {
-    bool im_true;
-    bool im_false;
-    byte a_bite;
-    short integer16;
-    int integer32;
-    long integer64;
-    double double_precision;
-    string some_characters;
-    string zomg_unicode;
-    bool what_who;
-    string base64;
-    byte[] byte_list;
-    short[] i16_list;
-    long[] i64_list;
-
-    mixin TStructHelpers!([
-      TFieldMeta(`im_true`, 1),
-      TFieldMeta(`im_false`, 2),
-      TFieldMeta(`a_bite`, 3, TReq.OPT_IN_REQ_OUT, q{cast(byte)127}),
-      TFieldMeta(`integer16`, 4, TReq.OPT_IN_REQ_OUT, q{cast(short)32767}),
-      TFieldMeta(`integer32`, 5),
-      TFieldMeta(`integer64`, 6, TReq.OPT_IN_REQ_OUT, q{10000000000L}),
-      TFieldMeta(`double_precision`, 7),
-      TFieldMeta(`some_characters`, 8),
-      TFieldMeta(`zomg_unicode`, 9),
-      TFieldMeta(`what_who`, 10),
-      TFieldMeta(`base64`, 11),
-      TFieldMeta(`byte_list`, 12, TReq.OPT_IN_REQ_OUT, q{{
-        byte[] v;
-        v ~= cast(byte)1;
-        v ~= cast(byte)2;
-        v ~= cast(byte)3;
-        return v;
-      }()}),
-      TFieldMeta(`i16_list`, 13, TReq.OPT_IN_REQ_OUT, q{{
-        short[] v;
-        v ~= cast(short)1;
-        v ~= cast(short)2;
-        v ~= cast(short)3;
-        return v;
-      }()}),
-      TFieldMeta(`i64_list`, 14, TReq.OPT_IN_REQ_OUT, q{{
-        long[] v;
-        v ~= 1L;
-        v ~= 2L;
-        v ~= 3L;
-        return v;
-      }()})
-    ]);
-  }
-
-  struct Bonk {
-    int type;
-    string message;
-
-    mixin TStructHelpers!([
-      TFieldMeta(`type`, 1),
-      TFieldMeta(`message`, 2)
-    ]);
-  }
-
-  struct HolyMoley {
-    OneOfEach[] big;
-    HashSet!(string[]) contain;
-    Bonk[][string] bonks;
-
-    mixin TStructHelpers!([
-      TFieldMeta(`big`, 1),
-      TFieldMeta(`contain`, 2),
-      TFieldMeta(`bonks`, 3)
-    ]);
-  }
-
-  static assert(structIdlString!WithoutMeta ==
-`struct WithoutMeta {
-  -1: string a,
-  -2: i32 b,
-}
-`);
-
-import std.algorithm;
-  static assert(structIdlString!WithDefaults.startsWith(
-`struct WithDefaults {
-  -1: string a = "asdf",
-  -2: double b = 3.141`));
-
-  static assert(structIdlString!WithDefaults.endsWith(
-`1: WithoutMeta c = {a: "foo", b: 3, },
-}
-`));
-
-  static assert(structIdlString!OneOfEach ==
-`struct OneOfEach {
-  1: bool im_true,
-  2: bool im_false,
-  3: byte a_bite = 127,
-  4: i16 integer16 = 32767,
-  5: i32 integer32,
-  6: i64 integer64 = 10000000000,
-  7: double double_precision,
-  8: string some_characters,
-  9: string zomg_unicode,
-  10: bool what_who,
-  11: string base64,
-  12: list<byte> byte_list = [1, 2, 3, ],
-  13: list<i16> i16_list = [1, 2, 3, ],
-  14: list<i64> i64_list = [1, 2, 3, ],
-}
-`);
-
-  static assert(structIdlString!Bonk ==
-`struct Bonk {
-  1: i32 type,
-  2: string message,
-}
-`);
-
-  static assert(structIdlString!HolyMoley ==
-`struct HolyMoley {
-  1: list<OneOfEach> big,
-  2: set<list<string>> contain,
-  3: map<string, list<Bonk>> bonks,
-}
-`);
-}
-
-version (unittest) {
-  class ExceptionWithAMap : TException {
-    string blah;
-    string[string] map_field;
-
-    mixin TStructHelpers!([
-      TFieldMeta(`blah`, 1),
-      TFieldMeta(`map_field`, 2)
-    ]);
-  }
-
-  interface Srv {
-    void voidMethod();
-    int primitiveMethod();
-    OneOfEach structMethod();
-    void methodWithDefaultArgs(int something);
-    void onewayMethod();
-    void exceptionMethod();
-
-    alias .ExceptionWithAMap ExceptionWithAMap;
-
-    enum methodMeta = [
-      TMethodMeta(`methodWithDefaultArgs`,
-        [TParamMeta(`something`, 1, q{2})]
-      ),
-      TMethodMeta(`onewayMethod`,
-        [],
-        [],
-        TMethodType.ONEWAY
-      ),
-      TMethodMeta(`exceptionMethod`,
-        [],
-        [
-          TExceptionMeta("a", 1, "ExceptionWithAMap"),
-          TExceptionMeta("b", 2, "ExceptionWithAMap")
-        ]
-      )
-    ];
-  }
-
-  interface ChildSrv : Srv {
-    int childMethod(int arg);
-  }
-
-  static assert(idlString!ChildSrv ==
-`exception ExceptionWithAMap {
-  1: string blah,
-  2: map<string, string> map_field,
-}
-
-struct OneOfEach {
-  1: bool im_true,
-  2: bool im_false,
-  3: byte a_bite = 127,
-  4: i16 integer16 = 32767,
-  5: i32 integer32,
-  6: i64 integer64 = 10000000000,
-  7: double double_precision,
-  8: string some_characters,
-  9: string zomg_unicode,
-  10: bool what_who,
-  11: string base64,
-  12: list<byte> byte_list = [1, 2, 3, ],
-  13: list<i16> i16_list = [1, 2, 3, ],
-  14: list<i64> i64_list = [1, 2, 3, ],
-}
-
-service Srv {
-  void voidMethod(),
-  i32 primitiveMethod(),
-  OneOfEach structMethod(),
-  void methodWithDefaultArgs(1: i32 something = 2, ),
-  oneway void onewayMethod(),
-  void exceptionMethod() throws (1: ExceptionWithAMap a, 2: ExceptionWithAMap b, ),
-}
-
-service ChildSrv extends Srv {
-  i32 childMethod(-1: i32 param1, ),
-}
-`);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/processor.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/processor.d
deleted file mode 100644
index 5ce7ac6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/codegen/processor.d
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.codegen.processor;
-
-import std.algorithm : find;
-import std.array : empty, front;
-import std.conv : to;
-import std.traits : ParameterTypeTuple, ReturnType, Unqual;
-import std.typetuple : allSatisfy, TypeTuple;
-import std.variant : Variant;
-import thrift.base;
-import thrift.codegen.base;
-import thrift.internal.codegen;
-import thrift.internal.ctfe;
-import thrift.protocol.base;
-import thrift.protocol.processor;
-
-/**
- * Service processor for Interface, which implements TProcessor by
- * synchronously forwarding requests for the service methods to a handler
- * implementing Interface.
- *
- * The generated class implements TProcessor and additionally allows a
- * TProcessorEventHandler to be specified via the public eventHandler property.
- * The constructor takes a single argument of type Interface, which is the
- * handler to forward the requests to:
- * ---
- * this(Interface iface);
- * TProcessorEventHandler eventHandler;
- * ---
- *
- * If Interface is derived from another service BaseInterface, this class is
- * also derived from TServiceProcessor!BaseInterface.
- *
- * The optional Protocols template tuple parameter can be used to specify
- * one or more TProtocol implementations to specifically generate code for. If
- * the actual types of the protocols passed to process() at runtime match one
- * of the items from the list, the optimized code paths are taken, otherwise,
- * a generic TProtocol version is used as fallback. For cases where the input
- * and output protocols differ, TProtocolPair!(InputProtocol, OutputProtocol)
- * can be used in the Protocols list:
- * ---
- * interface FooService { void foo(); }
- * class FooImpl { override void foo {} }
- *
- * // Provides fast path if TBinaryProtocol!TBufferedTransport is used for
- * // both input and output:
- * alias TServiceProcessor!(FooService, TBinaryProtocol!TBufferedTransport)
- *   BinaryProcessor;
- *
- * auto proc = new BinaryProcessor(new FooImpl());
- *
- * // Low overhead.
- * proc.process(tBinaryProtocol(tBufferTransport(someSocket)));
- *
- * // Not in the specialization list – higher overhead.
- * proc.process(tBinaryProtocol(tFramedTransport(someSocket)));
- *
- * // Same as above, but optimized for the Compact protocol backed by a
- * // TPipedTransport for input and a TBufferedTransport for output.
- * alias TServiceProcessor!(FooService, TProtocolPair!(
- *   TCompactProtocol!TPipedTransport, TCompactProtocol!TBufferedTransport)
- * ) MixedProcessor;
- * ---
- */
-template TServiceProcessor(Interface, Protocols...) if (
-  isService!Interface && allSatisfy!(isTProtocolOrPair, Protocols)
-) {
-  mixin({
-    static if (is(Interface BaseInterfaces == super) && BaseInterfaces.length > 0) {
-      static assert(BaseInterfaces.length == 1,
-        "Services cannot be derived from more than one parent.");
-
-      string code = "class TServiceProcessor : " ~
-        "TServiceProcessor!(BaseService!Interface) {\n";
-      code ~= "private Interface iface_;\n";
-
-      string constructorCode = "this(Interface iface) {\n";
-      constructorCode ~= "super(iface);\n";
-      constructorCode ~= "iface_ = iface;\n";
-    } else {
-      string code = "class TServiceProcessor : TProcessor {";
-      code ~= q{
-        override bool process(TProtocol iprot, TProtocol oprot,
-          Variant context = Variant()
-        ) {
-          auto msg = iprot.readMessageBegin();
-
-          void writeException(TApplicationException e) {
-            oprot.writeMessageBegin(TMessage(msg.name, TMessageType.EXCEPTION,
-              msg.seqid));
-            e.write(oprot);
-            oprot.writeMessageEnd();
-            oprot.transport.writeEnd();
-            oprot.transport.flush();
-          }
-
-          if (msg.type != TMessageType.CALL && msg.type != TMessageType.ONEWAY) {
-            skip(iprot, TType.STRUCT);
-            iprot.readMessageEnd();
-            iprot.transport.readEnd();
-
-            writeException(new TApplicationException(
-              TApplicationException.Type.INVALID_MESSAGE_TYPE));
-            return false;
-          }
-
-          auto dg = msg.name in processMap_;
-          if (!dg) {
-            skip(iprot, TType.STRUCT);
-            iprot.readMessageEnd();
-            iprot.transport.readEnd();
-
-            writeException(new TApplicationException("Invalid method name: '" ~
-              msg.name ~ "'.", TApplicationException.Type.INVALID_MESSAGE_TYPE));
-
-            return false;
-          }
-
-          (*dg)(msg.seqid, iprot, oprot, context);
-          return true;
-        }
-
-        TProcessorEventHandler eventHandler;
-
-        alias void delegate(int, TProtocol, TProtocol, Variant) ProcessFunc;
-        protected ProcessFunc[string] processMap_;
-        private Interface iface_;
-      };
-
-      string constructorCode = "this(Interface iface) {\n";
-      constructorCode ~= "iface_ = iface;\n";
-    }
-
-    // Generate the handling code for each method, consisting of the dispatch
-    // function, registering it in the constructor, and the actual templated
-    // handler function.
-    foreach (methodName;
-      FilterMethodNames!(Interface, __traits(derivedMembers, Interface))
-    ) {
-      // Register the processing function in the constructor.
-      immutable procFuncName = "process_" ~ methodName;
-      immutable dispatchFuncName = procFuncName ~ "_protocolDispatch";
-      constructorCode ~= "processMap_[`" ~ methodName ~ "`] = &" ~
-        dispatchFuncName ~ ";\n";
-
-      bool methodMetaFound;
-      TMethodMeta methodMeta;
-      static if (is(typeof(Interface.methodMeta) : TMethodMeta[])) {
-        enum meta = find!`a.name == b`(Interface.methodMeta, methodName);
-        if (!meta.empty) {
-          methodMetaFound = true;
-          methodMeta = meta.front;
-        }
-      }
-
-      // The dispatch function to call the specialized handler functions. We
-      // test the protocols if they can be converted to one of the passed
-      // protocol types, and if not, fall back to the generic TProtocol
-      // version of the processing function.
-      code ~= "void " ~ dispatchFuncName ~
-        "(int seqid, TProtocol iprot, TProtocol oprot, Variant context) {\n";
-      code ~= "foreach (Protocol; TypeTuple!(Protocols, TProtocol)) {\n";
-      code ~= q{
-        static if (is(Protocol _ : TProtocolPair!(I, O), I, O)) {
-          alias I IProt;
-          alias O OProt;
-        } else {
-          alias Protocol IProt;
-          alias Protocol OProt;
-        }
-        auto castedIProt = cast(IProt)iprot;
-        auto castedOProt = cast(OProt)oprot;
-      };
-      code ~= "if (castedIProt && castedOProt) {\n";
-      code ~= procFuncName ~
-        "!(IProt, OProt)(seqid, castedIProt, castedOProt, context);\n";
-      code ~= "return;\n";
-      code ~= "}\n";
-      code ~= "}\n";
-      code ~= "throw new TException(`Internal error: Null iprot/oprot " ~
-        "passed to processor protocol dispatch function.`);\n";
-      code ~= "}\n";
-
-      // The actual handler function, templated on the input and output
-      // protocol types.
-      code ~= "void " ~ procFuncName ~ "(IProt, OProt)(int seqid, IProt " ~
-        "iprot, OProt oprot, Variant connectionContext) " ~
-        "if (isTProtocol!IProt && isTProtocol!OProt) {\n";
-      code ~= "TArgsStruct!(Interface, `" ~ methodName ~ "`) args;\n";
-
-      // Store the (qualified) method name in a manifest constant to avoid
-      // having to litter the code below with lots of string manipulation.
-      code ~= "enum methodName = `" ~ methodName ~ "`;\n";
-
-      code ~= q{
-        enum qName = Interface.stringof ~ "." ~ methodName;
-
-        Variant callContext;
-        if (eventHandler) {
-          callContext = eventHandler.createContext(qName, connectionContext);
-        }
-
-        scope (exit) {
-          if (eventHandler) {
-            eventHandler.deleteContext(callContext, qName);
-          }
-        }
-
-        if (eventHandler) eventHandler.preRead(callContext, qName);
-
-        args.read(iprot);
-        iprot.readMessageEnd();
-        iprot.transport.readEnd();
-
-        if (eventHandler) eventHandler.postRead(callContext, qName);
-      };
-
-      code ~= "TResultStruct!(Interface, `" ~ methodName ~ "`) result;\n";
-      code ~= "try {\n";
-
-      // Generate the parameter list to pass to the called iface function.
-      string[] paramList;
-      foreach (i, _; ParameterTypeTuple!(mixin("Interface." ~ methodName))) {
-        string paramName;
-        if (methodMetaFound && i < methodMeta.params.length) {
-          paramName = methodMeta.params[i].name;
-        } else {
-          paramName = "param" ~ to!string(i + 1);
-        }
-        paramList ~= "args." ~ paramName;
-      }
-
-      immutable call = "iface_." ~ methodName ~ "(" ~ ctfeJoin(paramList) ~ ")";
-      if (is(ReturnType!(mixin("Interface." ~ methodName)) == void)) {
-        code ~= call ~ ";\n";
-      } else {
-        code ~= "result.set!`success`(" ~ call ~ ");\n";
-      }
-
-      // If this is not a oneway method, generate the receiving code.
-      if (!methodMetaFound || methodMeta.type != TMethodType.ONEWAY) {
-        if (methodMetaFound) {
-          foreach (e; methodMeta.exceptions) {
-            code ~= "} catch (Interface." ~ e.type ~ " " ~ e.name ~ ") {\n";
-            code ~= "result.set!`" ~ e.name ~ "`(" ~ e.name ~ ");\n";
-          }
-        }
-        code ~= "}\n";
-
-        code ~= q{
-          catch (Exception e) {
-            if (eventHandler) {
-              eventHandler.handlerError(callContext, qName, e);
-            }
-
-            auto x = new TApplicationException(to!string(e));
-            oprot.writeMessageBegin(
-              TMessage(methodName, TMessageType.EXCEPTION, seqid));
-            x.write(oprot);
-            oprot.writeMessageEnd();
-            oprot.transport.writeEnd();
-            oprot.transport.flush();
-            return;
-          }
-
-          if (eventHandler) eventHandler.preWrite(callContext, qName);
-
-          oprot.writeMessageBegin(TMessage(methodName,
-            TMessageType.REPLY, seqid));
-          result.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.transport.writeEnd();
-          oprot.transport.flush();
-
-          if (eventHandler) eventHandler.postWrite(callContext, qName);
-        };
-      } else {
-        // For oneway methods, we obviously cannot notify the client of any
-        // exceptions, just call the event handler if one is set.
-        code ~= "}\n";
-        code ~= q{
-          catch (Exception e) {
-            if (eventHandler) {
-              eventHandler.handlerError(callContext, qName, e);
-            }
-            return;
-          }
-
-          if (eventHandler) eventHandler.onewayComplete(callContext, qName);
-        };
-      }
-      code ~= "}\n";
-
-    }
-
-    code ~= constructorCode ~ "}\n";
-    code ~= "}\n";
-
-    return code;
-  }());
-}
-
-/**
- * A struct representing the arguments of a Thrift method call.
- *
- * There should usually be no reason to use this directly without the help of
- * TServiceProcessor, but it is documented publicly to help debugging in case
- * of CTFE errors.
- *
- * Consider this example:
- * ---
- * interface Foo {
- *   int bar(string a, bool b);
- *
- *   enum methodMeta = [
- *     TMethodMeta("bar", [TParamMeta("a", 1), TParamMeta("b", 2)])
- *   ];
- * }
- *
- * alias TArgsStruct!(Foo, "bar") FooBarArgs;
- * ---
- *
- * The definition of FooBarArgs is equivalent to:
- * ---
- * struct FooBarArgs {
- *   string a;
- *   bool b;
- *
- *   mixin TStructHelpers!([TFieldMeta("a", 1, TReq.OPT_IN_REQ_OUT),
- *     TFieldMeta("b", 2, TReq.OPT_IN_REQ_OUT)]);
- * }
- * ---
- *
- * If the TVerboseCodegen version is defined, a warning message is issued at
- * compilation if no TMethodMeta for Interface.methodName is found.
- */
-template TArgsStruct(Interface, string methodName) {
-  static assert(is(typeof(mixin("Interface." ~ methodName))),
-    "Could not find method '" ~ methodName ~ "' in '" ~ Interface.stringof ~ "'.");
-  mixin({
-    bool methodMetaFound;
-    TMethodMeta methodMeta;
-    static if (is(typeof(Interface.methodMeta) : TMethodMeta[])) {
-      auto meta = find!`a.name == b`(Interface.methodMeta, methodName);
-      if (!meta.empty) {
-        methodMetaFound = true;
-        methodMeta = meta.front;
-      }
-    }
-
-    string memberCode;
-    string[] fieldMetaCodes;
-    foreach (i, _; ParameterTypeTuple!(mixin("Interface." ~ methodName))) {
-      // If we have no meta information, just use param1, param2, etc. as
-      // field names, it shouldn't really matter anyway. 1-based »indexing«
-      // is used to match the common scheme in the Thrift world.
-      string memberId;
-      string memberName;
-      if (methodMetaFound && i < methodMeta.params.length) {
-        memberId = to!string(methodMeta.params[i].id);
-        memberName = methodMeta.params[i].name;
-      } else {
-        memberId = to!string(i + 1);
-        memberName = "param" ~ to!string(i + 1);
-      }
-
-      // Unqual!() is needed to generate mutable fields for ref const()
-      // struct parameters.
-      memberCode ~= "Unqual!(ParameterTypeTuple!(Interface." ~ methodName ~
-        ")[" ~ to!string(i) ~ "])" ~ memberName ~ ";\n";
-
-      fieldMetaCodes ~= "TFieldMeta(`" ~ memberName ~ "`, " ~ memberId ~
-        ", TReq.OPT_IN_REQ_OUT)";
-    }
-
-    string code = "struct TArgsStruct {\n";
-    code ~= memberCode;
-    version (TVerboseCodegen) {
-      if (!methodMetaFound &&
-        ParameterTypeTuple!(mixin("Interface." ~ methodName)).length > 0)
-      {
-        code ~= "pragma(msg, `[thrift.codegen.processor.TArgsStruct] Warning: No " ~
-          "meta information for method '" ~ methodName ~ "' in service '" ~
-          Interface.stringof ~ "' found.`);\n";
-      }
-    }
-    immutable fieldMetaCode =
-      fieldMetaCodes.empty ? "" : "[" ~ ctfeJoin(fieldMetaCodes) ~ "]";
-    code ~= "mixin TStructHelpers!(" ~ fieldMetaCode  ~ ");\n";
-    code ~= "}\n";
-    return code;
-  }());
-}
-
-/**
- * A struct representing the result of a Thrift method call.
- *
- * It contains a field called "success" for the return value of the function
- * (with id 0), and additional fields for the exceptions declared for the
- * method, if any.
- *
- * There should usually be no reason to use this directly without the help of
- * TServiceProcessor, but it is documented publicly to help debugging in case
- * of CTFE errors.
- *
- * Consider the following example:
- * ---
- * interface Foo {
- *   int bar(string a);
- *
- *   alias .FooException FooException;
- *
- *   enum methodMeta = [
- *     TMethodMeta("bar",
- *       [TParamMeta("a", 1)],
- *       [TExceptionMeta("fooe", 1, "FooException")]
- *     )
- *   ];
- * }
- * alias TResultStruct!(Foo, "bar") FooBarResult;
- * ---
- *
- * The definition of FooBarResult is equivalent to:
- * ---
- * struct FooBarResult {
- *   int success;
- *   FooException fooe;
- *
- *   mixin(TStructHelpers!([TFieldMeta("success", 0, TReq.OPTIONAL),
- *     TFieldMeta("fooe", 1, TReq.OPTIONAL)]));
- * }
- * ---
- *
- * If the TVerboseCodegen version is defined, a warning message is issued at
- * compilation if no TMethodMeta for Interface.methodName is found.
- */
-template TResultStruct(Interface, string methodName) {
-  static assert(is(typeof(mixin("Interface." ~ methodName))),
-    "Could not find method '" ~ methodName ~ "' in '" ~ Interface.stringof ~ "'.");
-
-  mixin({
-    string code = "struct TResultStruct {\n";
-
-    string[] fieldMetaCodes;
-
-    static if (!is(ReturnType!(mixin("Interface." ~ methodName)) == void)) {
-      code ~= "ReturnType!(Interface." ~ methodName ~ ") success;\n";
-      fieldMetaCodes ~= "TFieldMeta(`success`, 0, TReq.OPTIONAL)";
-    }
-
-    bool methodMetaFound;
-    static if (is(typeof(Interface.methodMeta) : TMethodMeta[])) {
-      auto meta = find!`a.name == b`(Interface.methodMeta, methodName);
-      if (!meta.empty) {
-        foreach (e; meta.front.exceptions) {
-          code ~= "Interface." ~ e.type ~ " " ~ e.name ~ ";\n";
-          fieldMetaCodes ~= "TFieldMeta(`" ~ e.name ~ "`, " ~ to!string(e.id) ~
-            ", TReq.OPTIONAL)";
-        }
-        methodMetaFound = true;
-      }
-    }
-
-    version (TVerboseCodegen) {
-      if (!methodMetaFound &&
-        ParameterTypeTuple!(mixin("Interface." ~ methodName)).length > 0)
-      {
-        code ~= "pragma(msg, `[thrift.codegen.processor.TResultStruct] Warning: No " ~
-          "meta information for method '" ~ methodName ~ "' in service '" ~
-          Interface.stringof ~ "' found.`);\n";
-      }
-    }
-
-    immutable fieldMetaCode =
-      fieldMetaCodes.empty ? "" : "[" ~ ctfeJoin(fieldMetaCodes) ~ "]";
-    code ~= "mixin TStructHelpers!(" ~ fieldMetaCode  ~ ");\n";
-    code ~= "}\n";
-    return code;
-  }());
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/index.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/index.d
deleted file mode 100644
index 12914b6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/index.d
+++ /dev/null
@@ -1,33 +0,0 @@
-Ddoc
-
-<h2>Package overview</h2>
-
-<dl>
-  <dt>$(D_CODE thrift.async)</dt>
-  <dd>Support infrastructure for handling client-side asynchronous operations using non-blocking I/O and coroutines.</dd>
-
-  <dt>$(D_CODE thrift.codegen)</dt>
-  <dd>
-    <p>Templates used for generating Thrift clients/processors from regular D struct and interface definitions.</p>
-    <p><strong>Note:</strong> Several artifacts in these modules have options for specifying the exact protocol types used. In this case, the amount of virtual calls can be greatly reduced and as a result, the code also can be optimized better. If performance is not a concern or the actual protocol type is not known at compile time, these parameters can just be left at their defaults.
-    </p>
-  </dd>
-
-  <dt>$(D_CODE thrift.internal)</dt>
-  <dd>Internal helper modules used by the Thrift library. This package is not part of the public API, and no stability guarantees are given whatsoever.</dd>
-
-  <dt>$(D_CODE thrift.protocol)</dt>
-  <dd>The Thrift protocol implemtations which specify how to pass messages over a TTransport.</dd>
-
-  <dt>$(D_CODE thrift.server)</dt>
-  <dd>Generic Thrift server implementations handling clients over a TTransport interface and forwarding requests to a TProcessor (which is in turn usually provided by thrift.codegen).</dd>
-
-  <dt>$(D_CODE thrift.transport)</dt>
-  <dd>The TTransport data source/sink interface used in the Thrift library and its imiplementations.</dd>
-
-  <dt>$(D_CODE thrift.util)</dt>
-  <dd>General-purpose utility modules not specific to Thrift, part of the public API.</dd>
-</dl>
-
-Macros:
-  TITLE = Thrift D Software Library
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/algorithm.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/algorithm.d
deleted file mode 100644
index 0938ac2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/algorithm.d
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Contains a modified version of std.algorithm.remove that doesn't take an
- * alias parameter to avoid DMD @@BUG6395@@.
- */
-module thrift.internal.algorithm;
-
-import std.algorithm : move;
-import std.exception;
-import std.functional;
-import std.range;
-import std.traits;
-
-enum SwapStrategy
-{
-    unstable,
-    semistable,
-    stable,
-}
-
-Range removeEqual(SwapStrategy s = SwapStrategy.stable, Range, E)(Range range, E e)
-if (isBidirectionalRange!Range)
-{
-    auto result = range;
-    static if (s != SwapStrategy.stable)
-    {
-        for (;!range.empty;)
-        {
-            if (range.front !is e)
-            {
-                range.popFront;
-                continue;
-            }
-            move(range.back, range.front);
-            range.popBack;
-            result.popBack;
-        }
-    }
-    else
-    {
-        auto tgt = range;
-        for (; !range.empty; range.popFront)
-        {
-            if (range.front is e)
-            {
-                // yank this guy
-                result.popBack;
-                continue;
-            }
-            // keep this guy
-            move(range.front, tgt.front);
-            tgt.popFront;
-        }
-    }
-    return result;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/codegen.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/codegen.d
deleted file mode 100644
index 85f9d18..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/codegen.d
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module thrift.internal.codegen;
-
-import std.algorithm : canFind;
-import std.traits : InterfacesTuple, isSomeFunction, isSomeString;
-import std.typetuple : staticIndexOf, staticMap, NoDuplicates, TypeTuple;
-import thrift.codegen.base;
-
-/**
- * Removes all type qualifiers from T.
- *
- * In contrast to std.traits.Unqual, FullyUnqual also removes qualifiers from
- * array elements (e.g. immutable(byte[]) -> byte[], not immutable(byte)[]),
- * excluding strings (string isn't reduced to char[]).
- */
-template FullyUnqual(T) {
-  static if (is(T _ == const(U), U)) {
-    alias FullyUnqual!U FullyUnqual;
-  } else static if (is(T _ == immutable(U), U)) {
-    alias FullyUnqual!U FullyUnqual;
-  } else static if (is(T _ == shared(U), U)) {
-    alias FullyUnqual!U FullyUnqual;
-  } else static if (is(T _ == U[], U) && !isSomeString!T) {
-    alias FullyUnqual!(U)[] FullyUnqual;
-  } else static if (is(T _ == V[K], K, V)) {
-    alias FullyUnqual!(V)[FullyUnqual!K] FullyUnqual;
-  } else {
-    alias T FullyUnqual;
-  }
-}
-
-/**
- * true if null can be assigned to the passed type, false if not.
- */
-template isNullable(T) {
-  enum isNullable = __traits(compiles, { T t = null; });
-}
-
-template isStruct(T) {
-  enum isStruct = is(T == struct);
-}
-
-template isException(T) {
- enum isException = is(T : Exception);
-}
-
-template isEnum(T) {
-  enum isEnum = is(T == enum);
-}
-
-/**
- * Aliases itself to T.name.
- */
-template GetMember(T, string name) {
-  mixin("alias T." ~ name ~ " GetMember;");
-}
-
-/**
- * Aliases itself to typeof(symbol).
- */
-template TypeOf(alias symbol) {
-  alias typeof(symbol) TypeOf;
-}
-
-/**
- * Aliases itself to the type of the T member called name.
- */
-alias Compose!(TypeOf, GetMember) MemberType;
-
-/**
- * Returns the field metadata array for T if any, or an empty array otherwise.
- */
-template getFieldMeta(T) if (isStruct!T || isException!T) {
-  static if (is(typeof(T.fieldMeta) == TFieldMeta[])) {
-    enum getFieldMeta = T.fieldMeta;
-  } else {
-    enum TFieldMeta[] getFieldMeta = [];
-  }
-}
-
-/**
- * Merges the field metadata array for D with the passed array.
- */
-template mergeFieldMeta(T, alias fieldMetaData = cast(TFieldMeta[])null) {
-  // Note: We don't use getFieldMeta here to avoid bug if it is instantiated
-  // from TIsSetFlags, see comment there.
-  static if (is(typeof(T.fieldMeta) == TFieldMeta[])) {
-    enum mergeFieldMeta = T.fieldMeta ~ fieldMetaData;
-  } else {
-    enum TFieldMeta[] mergeFieldMeta = fieldMetaData;
-  }
-}
-
-/**
- * Returns the field requirement level for T.name.
- */
-template memberReq(T, string name, alias fieldMetaData = cast(TFieldMeta[])null) {
-  enum memberReq = memberReqImpl!(T, name, fieldMetaData).result;
-}
-
-private {
-  import std.algorithm : find;
-  // DMD @@BUG@@: Missing import leads to failing build without error
-  // message in unittest/debug/thrift/codegen/async_client.
-  import std.array : empty, front;
-
-  template memberReqImpl(T, string name, alias fieldMetaData) {
-    enum meta = find!`a.name == b`(mergeFieldMeta!(T, fieldMetaData), name);
-    static if (meta.empty || meta.front.req == TReq.AUTO) {
-      static if (isNullable!(MemberType!(T, name))) {
-        enum result = TReq.OPTIONAL;
-      } else {
-        enum result = TReq.REQUIRED;
-      }
-    } else {
-      enum result = meta.front.req;
-    }
-  }
-}
-
-
-template notIgnored(T, string name, alias fieldMetaData = cast(TFieldMeta[])null) {
-  enum notIgnored = memberReq!(T, name, fieldMetaData) != TReq.IGNORE;
-}
-
-/**
- * Returns the method metadata array for T if any, or an empty array otherwise.
- */
-template getMethodMeta(T) if (isService!T) {
-  static if (is(typeof(T.methodMeta) == TMethodMeta[])) {
-    enum getMethodMeta = T.methodMeta;
-  } else {
-    enum TMethodMeta[] getMethodMeta = [];
-  }
-}
-
-
-/**
- * true if T.name is a member variable. Exceptions include methods, static
- * members, artifacts like package aliases, …
- */
-template isValueMember(T, string name) {
-  static if (!is(MemberType!(T, name))) {
-    enum isValueMember = false;
-  } else static if (
-    is(MemberType!(T, name) == void) ||
-    isSomeFunction!(MemberType!(T, name)) ||
-    __traits(compiles, { return mixin("T." ~ name); }())
-  ) {
-    enum isValueMember = false;
-  } else {
-    enum isValueMember = true;
-  }
-}
-
-/**
- * Returns a tuple containing the names of the fields of T, not including
- * inherited fields. If a member is marked as TReq.IGNORE, it is not included
- * as well.
- */
-template FieldNames(T, alias fieldMetaData = cast(TFieldMeta[])null) {
-  alias StaticFilter!(
-    All!(
-      doesNotReadMembers,
-      PApply!(isValueMember, T),
-      PApply!(notIgnored, T, PApplySkip, fieldMetaData)
-    ),
-    __traits(derivedMembers, T)
-  ) FieldNames;
-}
-
-/*
- * true if the passed member name is not a method generated by the
- * TStructHelpers template that in its implementations queries the struct
- * members.
- *
- * Kludge used internally to break a cycle caused a DMD forward reference
- * regression, see THRIFT-2130.
- */
-enum doesNotReadMembers(string name) = !["opEquals", "thriftOpEqualsImpl",
-  "toString", "thriftToStringImpl"].canFind(name);
-
-template derivedMembers(T) {
-  alias TypeTuple!(__traits(derivedMembers, T)) derivedMembers;
-}
-
-template AllMemberMethodNames(T) if (isService!T) {
-  alias NoDuplicates!(
-    FilterMethodNames!(
-      T,
-      staticMap!(
-        derivedMembers,
-        TypeTuple!(T, InterfacesTuple!T)
-      )
-    )
-  ) AllMemberMethodNames;
-}
-
-template FilterMethodNames(T, MemberNames...) {
-  alias StaticFilter!(
-    CompilesAndTrue!(
-      Compose!(isSomeFunction, TypeOf, PApply!(GetMember, T))
-    ),
-    MemberNames
-  ) FilterMethodNames;
-}
-
-/**
- * Returns a type tuple containing only the elements of T for which the
- * eponymous template predicate pred is true.
- *
- * Example:
- * ---
- * alias StaticFilter!(isIntegral, int, string, long, float[]) Filtered;
- * static assert(is(Filtered == TypeTuple!(int, long)));
- * ---
- */
-template StaticFilter(alias pred, T...) {
-  static if (T.length == 0) {
-    alias TypeTuple!() StaticFilter;
-  } else static if (pred!(T[0])) {
-    alias TypeTuple!(T[0], StaticFilter!(pred, T[1 .. $])) StaticFilter;
-  } else {
-    alias StaticFilter!(pred, T[1 .. $]) StaticFilter;
-  }
-}
-
-/**
- * Binds the first n arguments of a template to a particular value (where n is
- * the number of arguments passed to PApply).
- *
- * The passed arguments are always applied starting from the left. However,
- * the special PApplySkip marker template can be used to indicate that an
- * argument should be skipped, so that e.g. the first and third argument
- * to a template can be fixed, but the second and remaining arguments would
- * still be left undefined.
- *
- * Skipping a number of parameters, but not providing enough arguments to
- * assign all of them during instantiation of the resulting template is an
- * error.
- *
- * Example:
- * ---
- * struct Foo(T, U, V) {}
- * alias PApply!(Foo, int, long) PartialFoo;
- * static assert(is(PartialFoo!float == Foo!(int, long, float)));
- *
- * alias PApply!(Test, int, PApplySkip, float) SkippedTest;
- * static assert(is(SkippedTest!long == Test!(int, long, float)));
- * ---
- */
-template PApply(alias Target, T...) {
-  template PApply(U...) {
-    alias Target!(PApplyMergeArgs!(ConfinedTuple!T, U).Result) PApply;
-  }
-}
-
-/// Ditto.
-template PApplySkip() {}
-
-private template PApplyMergeArgs(alias Preset, Args...) {
-  static if (Preset.length == 0) {
-    alias Args Result;
-  } else {
-    enum nextSkip = staticIndexOf!(PApplySkip, Preset.Tuple);
-    static if (nextSkip == -1) {
-      alias TypeTuple!(Preset.Tuple, Args) Result;
-    } else static if (Args.length == 0) {
-      // Have to use a static if clause instead of putting the condition
-      // directly into the assert to avoid DMD trying to access Args[0]
-      // nevertheless below.
-      static assert(false,
-        "PArgsSkip encountered, but no argument left to bind.");
-    } else {
-      alias TypeTuple!(
-        Preset.Tuple[0 .. nextSkip],
-        Args[0],
-        PApplyMergeArgs!(
-          ConfinedTuple!(Preset.Tuple[nextSkip + 1 .. $]),
-          Args[1 .. $]
-        ).Result
-      ) Result;
-    }
-  }
-}
-
-unittest {
-  struct Test(T, U, V) {}
-  alias PApply!(Test, int, long) PartialTest;
-  static assert(is(PartialTest!float == Test!(int, long, float)));
-
-  alias PApply!(Test, int, PApplySkip, float) SkippedTest;
-  static assert(is(SkippedTest!long == Test!(int, long, float)));
-
-  alias PApply!(Test, int, PApplySkip, PApplySkip) TwoSkipped;
-  static assert(!__traits(compiles, TwoSkipped!long));
-}
-
-
-/**
- * Composes a number of templates. The result is a template equivalent to
- * all the passed templates evaluated from right to left, akin to the
- * mathematical function composition notation: Instantiating Compose!(A, B, C)
- * is the same as instantiating A!(B!(C!(…))).
- *
- * This is especially useful for creating a template to use with staticMap/
- * StaticFilter, as demonstrated below.
- *
- * Example:
- * ---
- * template AllMethodNames(T) {
- *   alias StaticFilter!(
- *     CompilesAndTrue!(
- *       Compose!(isSomeFunction, TypeOf, PApply!(GetMember, T))
- *     ),
- *     __traits(allMembers, T)
- *   ) AllMethodNames;
- * }
- *
- * pragma(msg, AllMethodNames!Object);
- * ---
- */
-template Compose(T...) {
-  static if (T.length == 0) {
-    template Compose(U...) {
-      alias U Compose;
-    }
-  } else {
-    template Compose(U...) {
-      alias Instantiate!(T[0], Instantiate!(.Compose!(T[1 .. $]), U)) Compose;
-    }
-  }
-}
-
-/**
- * Instantiates the given template with the given list of parameters.
- *
- * Used to work around syntactic limiations of D with regard to instantiating
- * a template from a type tuple (e.g. T[0]!(...) is not valid) or a template
- * returning another template (e.g. Foo!(Bar)!(Baz) is not allowed).
- */
-template Instantiate(alias Template, Params...) {
-  alias Template!Params Instantiate;
-}
-
-/**
- * Combines several template predicates using logical AND, i.e. instantiating
- * All!(a, b, c) with parameters P for some templates a, b, c is equivalent to
- * a!P && b!P && c!P.
- *
- * The templates are evaluated from left to right, aborting evaluation in a
- * shurt-cut manner if a false result is encountered, in which case the latter
- * instantiations do not need to compile.
- */
-template All(T...) {
-  static if (T.length == 0) {
-    template All(U...) {
-      enum All = true;
-    }
-  } else {
-    template All(U...) {
-      static if (Instantiate!(T[0], U)) {
-        alias Instantiate!(.All!(T[1 .. $]), U) All;
-      } else {
-        enum All = false;
-      }
-    }
-  }
-}
-
-/**
- * Combines several template predicates using logical OR, i.e. instantiating
- * Any!(a, b, c) with parameters P for some templates a, b, c is equivalent to
- * a!P || b!P || c!P.
- *
- * The templates are evaluated from left to right, aborting evaluation in a
- * shurt-cut manner if a true result is encountered, in which case the latter
- * instantiations do not need to compile.
- */
-template Any(T...) {
-  static if (T.length == 0) {
-    template Any(U...) {
-      enum Any = false;
-    }
-  } else {
-    template Any(U...) {
-      static if (Instantiate!(T[0], U)) {
-        enum Any = true;
-      } else {
-        alias Instantiate!(.Any!(T[1 .. $]), U) Any;
-      }
-    }
-  }
-}
-
-template ConfinedTuple(T...) {
-  alias T Tuple;
-  enum length = T.length;
-}
-
-/*
- * foreach (Item; Items) {
- *   List = Operator!(Item, List);
- * }
- * where Items is a ConfinedTuple and List is a type tuple.
- */
-template ForAllWithList(alias Items, alias Operator, List...) if (
-  is(typeof(Items.length) : size_t)
-){
-  static if (Items.length == 0) {
-    alias List ForAllWithList;
-  } else {
-    alias .ForAllWithList!(
-      ConfinedTuple!(Items.Tuple[1 .. $]),
-      Operator,
-      Operator!(Items.Tuple[0], List)
-    ) ForAllWithList;
-  }
-}
-
-/**
- * Wraps the passed template predicate so it returns true if it compiles and
- * evaluates to true, false it it doesn't compile or evaluates to false.
- */
-template CompilesAndTrue(alias T) {
-  template CompilesAndTrue(U...) {
-    static if (is(typeof(T!U) : bool)) {
-      enum bool CompilesAndTrue = T!U;
-    } else {
-      enum bool CompilesAndTrue = false;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ctfe.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ctfe.d
deleted file mode 100644
index 974db01..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ctfe.d
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module thrift.internal.ctfe;
-
-import std.conv : to;
-import std.traits;
-
-/*
- * Simple eager join() for strings, std.algorithm.join isn't CTFEable yet.
- */
-string ctfeJoin(string[] strings, string separator = ", ") {
-  string result;
-  if (strings.length > 0) {
-    result ~= strings[0];
-    foreach (s; strings[1..$]) {
-      result ~= separator ~ s;
-    }
-  }
-  return result;
-}
-
-/*
- * A very primitive to!string() implementation for floating point numbers that
- * is evaluatable at compile time.
- *
- * There is a wealth of problems associated with the algorithm used (e.g. 5.0
- * prints as 4.999…, incorrect rounding, etc.), but a better alternative should
- * be included with the D standard library instead of implementing it here.
- */
-string ctfeToString(T)(T val) if (isFloatingPoint!T) {
-  if (val is T.nan) return "nan";
-  if (val is T.infinity) return "inf";
-  if (val is -T.infinity) return "-inf";
-  if (val is 0.0) return "0";
-  if (val is -0.0) return "-0";
-
-  auto b = val;
-
-  string result;
-  if (b < 0) {
-    result ~= '-';
-    b *= -1;
-  }
-
-  short magnitude;
-  while (b >= 10) {
-    ++magnitude;
-    b /= 10;
-  }
-  while (b < 1) {
-    --magnitude;
-    b *= 10;
-  }
-
-  foreach (i; 0 .. T.dig) {
-    if (i == 1) result ~= '.';
-
-    auto first = cast(ubyte)b;
-    result ~= to!string(first);
-
-    b -= first;
-    import std.math;
-    if (b < pow(10.0, i - T.dig)) break;
-    b *= 10;
-  }
-
-  if (magnitude != 0) result ~= "e" ~ to!string(magnitude);
-  return result;
-}
-
-unittest {
-  import std.algorithm;
-  static assert(ctfeToString(double.infinity) == "inf");
-  static assert(ctfeToString(-double.infinity) == "-inf");
-  static assert(ctfeToString(double.nan) == "nan");
-  static assert(ctfeToString(0.0) == "0");
-  static assert(ctfeToString(-0.0) == "-0");
-  static assert(ctfeToString(2.5) == "2.5");
-  static assert(ctfeToString(3.1415).startsWith("3.141"));
-  static assert(ctfeToString(2e-200) == "2e-200");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/endian.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/endian.d
deleted file mode 100644
index 31b9814..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/endian.d
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Simple helpers for handling typical byte order-related issues.
- */
-module thrift.internal.endian;
-
-import core.bitop : bswap;
-import std.traits : isIntegral;
-
-union IntBuf(T) {
-  ubyte[T.sizeof] bytes;
-  T value;
-}
-
-T byteSwap(T)(T t) pure nothrow @trusted if (isIntegral!T) {
-  static if (T.sizeof == 2) {
-    return cast(T)((t & 0xff) << 8) | cast(T)((t & 0xff00) >> 8);
-  } else static if (T.sizeof == 4) {
-    return cast(T)bswap(cast(uint)t);
-  } else static if (T.sizeof == 8) {
-    return cast(T)byteSwap(cast(uint)(t & 0xffffffff)) << 32 |
-      cast(T)bswap(cast(uint)(t >> 32));
-  } else static assert(false, "Type of size " ~ to!string(T.sizeof) ~ " not supported.");
-}
-
-T doNothing(T)(T val) { return val; }
-
-version (BigEndian) {
-  alias doNothing hostToNet;
-  alias doNothing netToHost;
-  alias byteSwap hostToLe;
-  alias byteSwap leToHost;
-} else {
-  alias byteSwap hostToNet;
-  alias byteSwap netToHost;
-  alias doNothing hostToLe;
-  alias doNothing leToHost;
-}
-
-unittest {
-  import std.exception;
-
-  IntBuf!short s;
-  s.bytes = [1, 2];
-  s.value = byteSwap(s.value);
-  enforce(s.bytes == [2, 1]);
-
-  IntBuf!int i;
-  i.bytes = [1, 2, 3, 4];
-  i.value = byteSwap(i.value);
-  enforce(i.bytes == [4, 3, 2, 1]);
-
-  IntBuf!long l;
-  l.bytes = [1, 2, 3, 4, 5, 6, 7, 8];
-  l.value = byteSwap(l.value);
-  enforce(l.bytes == [8, 7, 6, 5, 4, 3, 2, 1]);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/resource_pool.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/resource_pool.d
deleted file mode 100644
index c0820a3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/resource_pool.d
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.internal.resource_pool;
-
-import core.time : Duration, dur, TickDuration;
-import std.algorithm : minPos, reduce, remove;
-import std.array : array, empty;
-import std.exception : enforce;
-import std.conv : to;
-import std.random : randomCover, rndGen;
-import std.range : zip;
-import thrift.internal.algorithm : removeEqual;
-
-/**
- * A pool of resources, which can be iterated over, and where resources that
- * have failed too often can be temporarily disabled.
- *
- * This class is oblivious to the actual resource type managed.
- */
-final class TResourcePool(Resource) {
-  /**
-   * Constructs a new instance.
-   *
-   * Params:
-   *   resources = The initial members of the pool.
-   */
-  this(Resource[] resources) {
-    resources_ = resources;
-  }
-
-  /**
-   * Adds a resource to the pool.
-   */
-  void add(Resource resource) {
-    resources_ ~= resource;
-  }
-
-  /**
-   * Removes a resource from the pool.
-   *
-   * Returns: Whether the resource could be found in the pool.
-   */
-  bool remove(Resource resource) {
-    auto oldLength = resources_.length;
-    resources_ = removeEqual(resources_, resource);
-    return resources_.length < oldLength;
-  }
-
-  /**
-   * Returns an »enriched« input range to iterate over the pool members.
-   */
-  static struct Range {
-    /**
-     * Whether the range is empty.
-     *
-     * This is the case if all members of the pool have been popped (or skipped
-     * because they were disabled) and TResourcePool.cycle is false, or there
-     * is no element to return in cycle mode because all have been temporarily
-     * disabled.
-     */
-    bool empty() @property {
-      // If no resources are in the pool, the range will never become non-empty.
-      if (resources_.empty) return true;
-
-      // If we already got the next resource in the cache, it doesn't matter
-      // whether there are more.
-      if (cached_) return false;
-
-      size_t examineCount;
-      if (parent_.cycle) {
-        // We want to check all the resources, but not iterate more than once
-        // to avoid spinning in a loop if nothing is available.
-        examineCount = resources_.length;
-      } else {
-        // When not in cycle mode, we just iterate the list exactly once. If all
-        // items have been consumed, the interval below is empty.
-        examineCount = resources_.length - nextIndex_;
-      }
-
-      foreach (i; 0 .. examineCount) {
-        auto r = resources_[(nextIndex_ + i) % resources_.length];
-        auto fi = r in parent_.faultInfos_;
-
-        if (fi && fi.resetTime != fi.resetTime.init) {
-          if (fi.resetTime < parent_.getCurrentTick_()) {
-            // The timeout expired, remove the resource from the list and go
-            // ahead trying it.
-            parent_.faultInfos_.remove(r);
-          } else {
-            // The timeout didn't expire yet, try the next resource.
-            continue;
-          }
-        }
-
-        cache_ = r;
-        cached_ = true;
-        nextIndex_ = nextIndex_ + i + 1;
-        return false;
-      }
-
-      // If we get here, all resources are currently inactive or the non-cycle
-      // pool has been exhausted, so there is nothing we can do.
-      nextIndex_ = nextIndex_ + examineCount;
-      return true;
-    }
-
-    /**
-     * Returns the first resource in the range.
-     */
-    Resource front() @property {
-      enforce(!empty);
-      return cache_;
-    }
-
-    /**
-     * Removes the first resource from the range.
-     *
-     * Usually, this is combined with a call to TResourcePool.recordSuccess()
-     * or recordFault().
-     */
-    void popFront() {
-      enforce(!empty);
-      cached_ = false;
-    }
-
-    /**
-     * Returns whether the range will become non-empty at some point in the
-     * future, and provides additional information when this will happen and
-     * what will be the next resource.
-     *
-     * Makes only sense to call on empty ranges.
-     *
-     * Params:
-     *   next = The next resource that will become available.
-     *   waitTime = The duration until that resource will become available.
-     */
-    bool willBecomeNonempty(out Resource next, out Duration waitTime) {
-      // If no resources are in the pool, the range will never become non-empty.
-      if (resources_.empty) return false;
-
-      // If cycle mode is not enabled, a range never becomes non-empty after
-      // being empty once, because all the elements have already been
-      // used/skipped in order to become empty.
-      if (!parent_.cycle) return false;
-
-      auto fi = parent_.faultInfos_;
-      auto nextPair = minPos!"a[1].resetTime < b[1].resetTime"(
-        zip(fi.keys, fi.values)
-      ).front;
-
-      next = nextPair[0];
-      waitTime = to!Duration(nextPair[1].resetTime - parent_.getCurrentTick_());
-
-      return true;
-    }
-
-  private:
-    this(TResourcePool parent, Resource[] resources) {
-      parent_ = parent;
-      resources_ = resources;
-    }
-
-    TResourcePool parent_;
-
-    /// All available resources. We keep a copy of it as to not get confused
-    /// when resources are added to/removed from the parent pool.
-    Resource[] resources_;
-
-    /// After we have determined the next element in empty(), we store it here.
-    Resource cache_;
-
-    /// Whether there is currently something in the cache.
-    bool cached_;
-
-    /// The index to start searching from at the next call to empty().
-    size_t nextIndex_;
-  }
-
-  /// Ditto
-  Range opSlice() {
-    auto res = resources_;
-    if (permute) {
-      res = array(randomCover(res, rndGen));
-    }
-    return Range(this, res);
-  }
-
-  /**
-   * Records a success for an operation on the given resource, cancelling a
-   * fault streak, if any.
-   */
-  void recordSuccess(Resource resource) {
-    if (resource in faultInfos_) {
-      faultInfos_.remove(resource);
-    }
-  }
-
-  /**
-   * Records a fault for the given resource.
-   *
-   * If a resource fails consecutively for more than faultDisableCount times,
-   * it is temporarily disabled (no longer considered) until
-   * faultDisableDuration has passed.
-   */
-  void recordFault(Resource resource) {
-    auto fi = resource in faultInfos_;
-
-    if (!fi) {
-      faultInfos_[resource] = FaultInfo();
-      fi = resource in faultInfos_;
-    }
-
-    ++fi.count;
-    if (fi.count >= faultDisableCount) {
-      // If the resource has hit the fault count limit, disable it for
-      // specified duration.
-      fi.resetTime = getCurrentTick_() + cast(TickDuration)faultDisableDuration;
-    }
-  }
-
-  /**
-   * Whether to randomly permute the order of the resources in the pool when
-   * taking a range using opSlice().
-   *
-   * This can be used e.g. as a simple form of load balancing.
-   */
-  bool permute = true;
-
-  /**
-   * Whether to keep iterating over the pool members after all have been
-   * returned/have failed once.
-   */
-  bool cycle = false;
-
-  /**
-   * The number of consecutive faults after which a resource is disabled until
-   * faultDisableDuration has passed. Zero to never disable resources.
-   *
-   * Defaults to zero.
-   */
-  ushort faultDisableCount = 0;
-
-  /**
-   * The duration for which a resource is no longer considered after it has
-   * failed too often.
-   *
-   * Defaults to one second.
-   */
-  Duration faultDisableDuration = dur!"seconds"(1);
-
-private:
-  Resource[] resources_;
-  FaultInfo[Resource] faultInfos_;
-
-  /// Function to get the current timestamp from some monotonic system clock.
-  ///
-  /// This is overridable to be able to write timing-insensitive unit tests.
-  /// The extra indirection should not matter much performance-wise compared to
-  /// the actual system call, and by its very nature thisshould not be on a hot
-  /// path anyway.
-  typeof(&TickDuration.currSystemTick) getCurrentTick_ =
-    &TickDuration.currSystemTick;
-}
-
-private {
-  struct FaultInfo {
-    ushort count;
-    TickDuration resetTime;
-  }
-}
-
-unittest {
-  auto pool = new TResourcePool!Object([]);
-  enforce(pool[].empty);
-  Object dummyRes;
-  Duration dummyDur;
-  enforce(!pool[].willBecomeNonempty(dummyRes, dummyDur));
-}
-
-unittest {
-  import std.datetime;
-  import thrift.base;
-
-  auto a = new Object;
-  auto b = new Object;
-  auto c = new Object;
-  auto objs = [a, b, c];
-  auto pool = new TResourcePool!Object(objs);
-  pool.permute = false;
-
-  static Duration fakeClock;
-  pool.getCurrentTick_ = () => cast(TickDuration)fakeClock;
-
-  Object dummyRes = void;
-  Duration dummyDur = void;
-
-  {
-    auto r = pool[];
-
-    foreach (i, o; objs) {
-      enforce(!r.empty);
-      enforce(r.front == o);
-      r.popFront();
-    }
-
-    enforce(r.empty);
-    enforce(!r.willBecomeNonempty(dummyRes, dummyDur));
-  }
-
-  {
-    pool.faultDisableCount = 2;
-
-    enforce(pool[].front == a);
-    pool.recordFault(a);
-    enforce(pool[].front == a);
-    pool.recordSuccess(a);
-    enforce(pool[].front == a);
-    pool.recordFault(a);
-    enforce(pool[].front == a);
-    pool.recordFault(a);
-
-    auto r = pool[];
-    enforce(r.front == b);
-    r.popFront();
-    enforce(r.front == c);
-    r.popFront();
-    enforce(r.empty);
-    enforce(!r.willBecomeNonempty(dummyRes, dummyDur));
-
-    fakeClock += 2.seconds;
-    // Not in cycle mode, has to be still empty after the timeouts expired.
-    enforce(r.empty);
-    enforce(!r.willBecomeNonempty(dummyRes, dummyDur));
-
-    foreach (o; objs) pool.recordSuccess(o);
-  }
-
-  {
-    pool.faultDisableCount = 1;
-
-    pool.recordFault(a);
-    pool.recordFault(b);
-    pool.recordFault(c);
-
-    auto r = pool[];
-    enforce(r.empty);
-    enforce(!r.willBecomeNonempty(dummyRes, dummyDur));
-
-    foreach (o; objs) pool.recordSuccess(o);
-  }
-
-  pool.cycle = true;
-
-  {
-    auto r = pool[];
-
-    foreach (o; objs ~ objs) {
-      enforce(!r.empty);
-      enforce(r.front == o);
-      r.popFront();
-    }
-  }
-
-  {
-    pool.faultDisableCount = 2;
-
-    enforce(pool[].front == a);
-    pool.recordFault(a);
-    enforce(pool[].front == a);
-    pool.recordSuccess(a);
-    enforce(pool[].front == a);
-    pool.recordFault(a);
-    enforce(pool[].front == a);
-    pool.recordFault(a);
-
-    auto r = pool[];
-    enforce(r.front == b);
-    r.popFront();
-    enforce(r.front == c);
-    r.popFront();
-    enforce(r.front == b);
-
-    fakeClock += 2.seconds;
-
-    r.popFront();
-    enforce(r.front == c);
-
-    r.popFront();
-    enforce(r.front == a);
-
-    enforce(pool[].front == a);
-
-    foreach (o; objs) pool.recordSuccess(o);
-  }
-
-  {
-    pool.faultDisableCount = 1;
-
-    pool.recordFault(a);
-    fakeClock += 1.msecs;
-    pool.recordFault(b);
-    fakeClock += 1.msecs;
-    pool.recordFault(c);
-
-    auto r = pool[];
-    enforce(r.empty);
-
-    // Make sure willBecomeNonempty gets the order right.
-    enforce(r.willBecomeNonempty(dummyRes, dummyDur));
-    enforce(dummyRes == a);
-    enforce(dummyDur > Duration.zero);
-
-    foreach (o; objs) pool.recordSuccess(o);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/socket.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/socket.d
deleted file mode 100644
index 6ca0a97..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/socket.d
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Abstractions over OS-dependent socket functionality.
- */
-module thrift.internal.socket;
-
-import std.conv : to;
-
-// FreeBSD and OS X return -1 and set ECONNRESET if socket was closed by
-// the other side, we need to check for that before throwing an exception.
-version (FreeBSD) {
-  enum connresetOnPeerShutdown = true;
-} else version (OSX) {
-  enum connresetOnPeerShutdown = true;
-} else {
-  enum connresetOnPeerShutdown = false;
-}
-
-version (Win32) {
-  import std.c.windows.winsock : WSAGetLastError, WSAEINTR, WSAEWOULDBLOCK;
-  import std.windows.syserror : sysErrorString;
-
-  // These are unfortunately not defined in std.c.windows.winsock, see
-  // http://msdn.microsoft.com/en-us/library/ms740668.aspx.
-  enum WSAECONNRESET = 10054;
-  enum WSAENOTCONN = 10057;
-  enum WSAETIMEDOUT = 10060;
-} else {
-  import core.stdc.errno : errno, EAGAIN, ECONNRESET, EINPROGRESS, EINTR,
-    ENOTCONN, EPIPE;
-  import core.stdc.string : strerror;
-}
-
-/*
- * CONNECT_INPROGRESS_ERRNO: set by connect() for non-blocking sockets if the
- *   connection could not be immediately established.
- * INTERRUPTED_ERRNO: set when blocking system calls are interrupted by
- *   signals or similar.
- * TIMEOUT_ERRNO: set when a socket timeout has been exceeded.
- * WOULD_BLOCK_ERRNO: set when send/recv would block on non-blocking sockets.
- *
- * isSocetCloseErrno(errno): returns true if errno indicates that the socket
- *   is logically in closed state now.
- */
-version (Win32) {
-  alias WSAGetLastError getSocketErrno;
-  enum CONNECT_INPROGRESS_ERRNO = WSAEWOULDBLOCK;
-  enum INTERRUPTED_ERRNO = WSAEINTR;
-  enum TIMEOUT_ERRNO = WSAETIMEDOUT;
-  enum WOULD_BLOCK_ERRNO = WSAEWOULDBLOCK;
-
-  bool isSocketCloseErrno(typeof(getSocketErrno()) errno) {
-    return (errno == WSAECONNRESET || errno == WSAENOTCONN);
-  }
-} else {
-  alias errno getSocketErrno;
-  enum CONNECT_INPROGRESS_ERRNO = EINPROGRESS;
-  enum INTERRUPTED_ERRNO = EINTR;
-  enum WOULD_BLOCK_ERRNO = EAGAIN;
-
-  // TODO: The C++ TSocket implementation mentions that EAGAIN can also be
-  // set (undocumentedly) in out of resource conditions; it would be a good
-  // idea to contact the original authors of the C++ code for details and adapt
-  // the code accordingly.
-  enum TIMEOUT_ERRNO = EAGAIN;
-
-  bool isSocketCloseErrno(typeof(getSocketErrno()) errno) {
-    return (errno == EPIPE || errno == ECONNRESET || errno == ENOTCONN);
-  }
-}
-
-string socketErrnoString(uint errno) {
-  version (Win32) {
-    return sysErrorString(errno);
-  } else {
-    return to!string(strerror(errno));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ssl.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ssl.d
deleted file mode 100644
index 3af54b5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ssl.d
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.internal.ssl;
-
-import core.memory : GC;
-import core.stdc.config;
-import core.stdc.errno : errno;
-import core.stdc.string : strerror;
-import deimos.openssl.err;
-import deimos.openssl.ssl;
-import deimos.openssl.x509v3;
-import std.array : empty, appender;
-import std.conv : to;
-import std.socket : Address;
-import thrift.transport.ssl;
-
-/**
- * Checks if the peer is authorized after the SSL handshake has been
- * completed on the given conncetion and throws an TSSLException if not.
- *
- * Params:
- *   ssl = The SSL connection to check.
- *   accessManager = The access manager to check the peer againts.
- *   peerAddress = The (IP) address of the peer.
- *   hostName = The host name of the peer.
- */
-void authorize(SSL* ssl, TAccessManager accessManager,
-  Address peerAddress, lazy string hostName
-) {
-  alias TAccessManager.Decision Decision;
-
-  auto rc = SSL_get_verify_result(ssl);
-  if (rc != X509_V_OK) {
-    throw new TSSLException("SSL_get_verify_result(): " ~
-      to!string(X509_verify_cert_error_string(rc)));
-  }
-
-  auto cert = SSL_get_peer_certificate(ssl);
-  if (cert is null) {
-    // Certificate is not present.
-    if (SSL_get_verify_mode(ssl) & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) {
-      throw new TSSLException(
-        "Authorize: Required certificate not present.");
-    }
-
-    // If we don't have an access manager set, we don't intend to authorize
-    // the client, so everything's fine.
-    if (accessManager) {
-      throw new TSSLException(
-        "Authorize: Certificate required for authorization.");
-    }
-    return;
-  }
-
-  if (accessManager is null) {
-    // No access manager set, can return immediately as the cert is valid
-    // and all peers are authorized.
-    X509_free(cert);
-    return;
-  }
-
-  // both certificate and access manager are present
-  auto decision = accessManager.verify(peerAddress);
-
-  if (decision != Decision.SKIP) {
-    X509_free(cert);
-    if (decision != Decision.ALLOW) {
-      throw new TSSLException("Authorize: Access denied based on remote IP.");
-    }
-    return;
-  }
-
-  // Check subjectAltName(s), if present.
-  auto alternatives = cast(STACK_OF!(GENERAL_NAME)*)
-    X509_get_ext_d2i(cert, NID_subject_alt_name, null, null);
-  if (alternatives != null) {
-    auto count = sk_GENERAL_NAME_num(alternatives);
-    for (int i = 0; decision == Decision.SKIP && i < count; i++) {
-      auto name = sk_GENERAL_NAME_value(alternatives, i);
-      if (name is null) {
-        continue;
-      }
-      auto data = ASN1_STRING_data(name.d.ia5);
-      auto length = ASN1_STRING_length(name.d.ia5);
-      switch (name.type) {
-        case GENERAL_NAME.GEN_DNS:
-          decision = accessManager.verify(hostName, cast(char[])data[0 .. length]);
-          break;
-        case GENERAL_NAME.GEN_IPADD:
-          decision = accessManager.verify(peerAddress, data[0 .. length]);
-          break;
-        default:
-          // Do nothing.
-      }
-    }
-
-    // DMD @@BUG@@: Empty template arguments parens should not be needed.
-    sk_GENERAL_NAME_pop_free!()(alternatives, &GENERAL_NAME_free);
-  }
-
-  // If we are alredy done, return.
-  if (decision != Decision.SKIP) {
-    X509_free(cert);
-    if (decision != Decision.ALLOW) {
-      throw new TSSLException("Authorize: Access denied.");
-    }
-    return;
-  }
-
-  // Check commonName.
-  auto name = X509_get_subject_name(cert);
-  if (name !is null) {
-    X509_NAME_ENTRY* entry;
-    char* utf8;
-    int last = -1;
-    while (decision == Decision.SKIP) {
-      last = X509_NAME_get_index_by_NID(name, NID_commonName, last);
-      if (last == -1)
-        break;
-      entry = X509_NAME_get_entry(name, last);
-      if (entry is null)
-        continue;
-      auto common = X509_NAME_ENTRY_get_data(entry);
-      auto size = ASN1_STRING_to_UTF8(&utf8, common);
-      decision = accessManager.verify(hostName, utf8[0 .. size]);
-      CRYPTO_free(utf8);
-    }
-  }
-  X509_free(cert);
-  if (decision != Decision.ALLOW) {
-    throw new TSSLException("Authorize: Could not authorize peer.");
-  }
-}
-
-/*
- * OpenSSL error information used for storing D exceptions on the OpenSSL
- * error stack.
- */
-enum ERR_LIB_D_EXCEPTION = ERR_LIB_USER;
-enum ERR_F_D_EXCEPTION = 0; // function id - what to use here?
-enum ERR_R_D_EXCEPTION = 1234; // 99 and above are reserved for applications
-enum ERR_FILE_D_EXCEPTION = "d_exception";
-enum ERR_LINE_D_EXCEPTION = 0;
-enum ERR_FLAGS_D_EXCEPTION = 0;
-
-/**
- * Returns an exception for the last.
- *
- * Params:
- *   location = An optional "location" to add to the error message (typically
- *     the last SSL API call).
- */
-Exception getSSLException(string location = null, string clientFile = __FILE__,
-  size_t clientLine = __LINE__
-) {
-  // We can return either an exception saved from D BIO code, or a "true"
-  // OpenSSL error. Because there can possibly be more than one error on the
-  // error stack, we have to fetch all of them, and pick the last, i.e. newest
-  // one. We concatenate multiple successive OpenSSL error messages into a
-  // single one, but always just return the last D expcetion.
-  string message; // Probably better use an Appender here.
-  bool hadMessage;
-  Exception exception;
-
-  void initMessage() {
-    message.destroy();
-    hadMessage = false;
-    if (!location.empty) {
-      message ~= location;
-      message ~= ": ";
-    }
-  }
-  initMessage();
-
-  auto errn = errno;
-
-  const(char)* file = void;
-  int line = void;
-  const(char)* data = void;
-  int flags = void;
-  c_ulong code = void;
-  while ((code = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0) {
-    if (ERR_GET_REASON(code) == ERR_R_D_EXCEPTION) {
-      initMessage();
-      GC.removeRoot(cast(void*)data);
-      exception = cast(Exception)data;
-    } else {
-      exception = null;
-
-      if (hadMessage) {
-        message ~= ", ";
-      }
-
-      auto reason = ERR_reason_error_string(code);
-      if (reason) {
-        message ~= "SSL error: " ~ to!string(reason);
-      } else {
-        message ~= "SSL error #" ~ to!string(code);
-      }
-
-      hadMessage = true;
-    }
-  }
-
-  // If the last item from the stack was a D exception, throw it.
-  if (exception) return exception;
-
-  // We are dealing with an OpenSSL error that doesn't root in a D exception.
-  if (!hadMessage) {
-    // If we didn't get an actual error from the stack yet, try errno.
-    string errnString;
-    if (errn != 0) {
-      errnString = to!string(strerror(errn));
-    }
-    if (errnString.empty) {
-      message ~= "Unknown error";
-    } else {
-      message ~= errnString;
-    }
-  }
-
-  message ~= ".";
-  return new TSSLException(message, clientFile, clientLine);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ssl_bio.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ssl_bio.d
deleted file mode 100644
index 796be91..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/ssl_bio.d
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Provides a SSL BIO implementation wrapping a Thrift transport.
- *
- * This way, SSL I/O can be relayed over Thrift transport without introducing
- * an additional layer of buffering, especially for the non-blocking
- * transports.
- *
- * For the Thrift transport incarnations of the SSL entities, "tt" is used as
- * prefix for clarity.
- */
-module thrift.internal.ssl_bio;
-
-import core.stdc.config;
-import core.stdc.string : strlen;
-import core.memory : GC;
-import deimos.openssl.bio;
-import deimos.openssl.err;
-import thrift.base;
-import thrift.internal.ssl;
-import thrift.transport.base;
-
-/**
- * Creates an SSL BIO object wrapping the given transport.
- *
- * Exceptions thrown by the transport are pushed onto the OpenSSL error stack,
- * using the location/reason values from thrift.internal.ssl.ERR_*_D_EXCEPTION.
- *
- * The transport is assumed to be ready for reading and writing when the BIO
- * functions are called, it is not opened by the implementation.
- *
- * Params:
- *   transport = The transport to wrap.
- *   closeTransport = Whether the close the transport when the SSL BIO is
- *     closed.
- */
-BIO* createTTransportBIO(TTransport transport, bool closeTransport) {
-  auto result = BIO_new(cast(BIO_METHOD*)&ttBioMethod);
-  if (!result) return null;
-
-  GC.addRoot(cast(void*)transport);
-  BIO_set_fd(result, closeTransport, cast(c_long)cast(void*)transport);
-
-  return result;
-}
-
-private {
-  // Helper to get the Thrift transport assigned with the given BIO.
-  TTransport trans(BIO* b) nothrow {
-    auto result = cast(TTransport)b.ptr;
-    assert(result);
-    return result;
-  }
-
-  void setError(Exception e) nothrow {
-    ERR_put_error(ERR_LIB_D_EXCEPTION, ERR_F_D_EXCEPTION, ERR_R_D_EXCEPTION,
-      ERR_FILE_D_EXCEPTION, ERR_LINE_D_EXCEPTION);
-    try { GC.addRoot(cast(void*)e); } catch {}
-    ERR_set_error_data(cast(char*)e, ERR_FLAGS_D_EXCEPTION);
-  }
-
-  extern(C) int ttWrite(BIO* b, const(char)* data, int length) nothrow {
-    assert(b);
-    if (!data || length <= 0) return 0;
-    try {
-      trans(b).write((cast(ubyte*)data)[0 .. length]);
-      return length;
-    } catch (Exception e) {
-      setError(e);
-      return -1;
-    }
-  }
-
-  extern(C) int ttRead(BIO* b, char* data, int length) nothrow {
-    assert(b);
-    if (!data || length <= 0) return 0;
-    try {
-      return cast(int)trans(b).read((cast(ubyte*)data)[0 .. length]);
-    } catch (Exception e) {
-      setError(e);
-      return -1;
-    }
-  }
-
-  extern(C) int ttPuts(BIO* b, const(char)* str) nothrow {
-    return ttWrite(b, str, cast(int)strlen(str));
-  }
-
-  extern(C) c_long ttCtrl(BIO* b, int cmd, c_long num, void* ptr) nothrow {
-    assert(b);
-
-    switch (cmd) {
-      case BIO_C_SET_FD:
-        // Note that close flag and "fd" are actually reversed here because we
-        // need 64 bit width for the pointer – should probably drop BIO_set_fd
-        // altogether.
-        ttDestroy(b);
-        b.ptr = cast(void*)num;
-        b.shutdown = cast(int)ptr;
-        b.init_ = 1;
-        return 1;
-      case BIO_C_GET_FD:
-        if (!b.init_) return -1;
-        *(cast(void**)ptr) = b.ptr;
-        return cast(c_long)b.ptr;
-      case BIO_CTRL_GET_CLOSE:
-        return b.shutdown;
-      case BIO_CTRL_SET_CLOSE:
-        b.shutdown = cast(int)num;
-        return 1;
-      case BIO_CTRL_FLUSH:
-        try {
-          trans(b).flush();
-          return 1;
-        } catch (Exception e) {
-          setError(e);
-          return -1;
-        }
-      case BIO_CTRL_DUP:
-        // Seems like we have nothing to do on duplication, but couldn't find
-        // any documentation if this actually ever happens during normal SSL
-        // usage.
-        return 1;
-      default:
-        return 0;
-    }
-  }
-
-  extern(C) int ttCreate(BIO* b) nothrow {
-    assert(b);
-    b.init_ = 0;
-    b.num = 0; // User-defined number field, unused here.
-    b.ptr = null;
-    b.flags = 0;
-    return 1;
-  }
-
-  extern(C) int ttDestroy(BIO* b) nothrow {
-    if (!b) return 0;
-
-    int rc = 1;
-    if (b.shutdown) {
-      if (b.init_) {
-        try {
-          trans(b).close();
-          GC.removeRoot(cast(void*)trans(b));
-          b.ptr = null;
-        } catch (Exception e) {
-          setError(e);
-          rc = -1;
-        }
-      }
-      b.init_ = 0;
-      b.flags = 0;
-    }
-
-    return rc;
-  }
-
-  immutable BIO_METHOD ttBioMethod = {
-    BIO_TYPE_SOURCE_SINK,
-    "TTransport",
-    &ttWrite,
-    &ttRead,
-    &ttPuts,
-    null, // gets
-    &ttCtrl,
-    &ttCreate,
-    &ttDestroy,
-    null // callback_ctrl
-  };
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/test/protocol.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/test/protocol.d
deleted file mode 100644
index 2d25154..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/test/protocol.d
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.internal.test.protocol;
-
-import std.exception;
-import thrift.transport.memory;
-import thrift.protocol.base;
-
-version (unittest):
-
-void testContainerSizeLimit(Protocol)() if (isTProtocol!Protocol) {
-  auto buffer = new TMemoryBuffer;
-  auto prot = new Protocol(buffer);
-
-  // Make sure reading fails if a container larger than the size limit is read.
-  prot.containerSizeLimit = 3;
-
-  {
-    prot.writeListBegin(TList(TType.I32, 4));
-    prot.writeI32(0); // Make sure size can be read e.g. for JSON protocol.
-    prot.reset();
-
-    auto e = cast(TProtocolException)collectException(prot.readListBegin());
-    enforce(e && e.type == TProtocolException.Type.SIZE_LIMIT);
-    prot.reset();
-    buffer.reset();
-  }
-
-  {
-    prot.writeMapBegin(TMap(TType.I32, TType.I32, 4));
-    prot.writeI32(0); // Make sure size can be read e.g. for JSON protocol.
-    prot.reset();
-
-    auto e = cast(TProtocolException)collectException(prot.readMapBegin());
-    enforce(e && e.type == TProtocolException.Type.SIZE_LIMIT);
-    prot.reset();
-    buffer.reset();
-  }
-
-  {
-    prot.writeSetBegin(TSet(TType.I32, 4));
-    prot.writeI32(0); // Make sure size can be read e.g. for JSON protocol.
-    prot.reset();
-
-    auto e = cast(TProtocolException)collectException(prot.readSetBegin());
-    enforce(e && e.type == TProtocolException.Type.SIZE_LIMIT);
-    prot.reset();
-    buffer.reset();
-  }
-
-  // Make sure reading works if the containers are smaller than the limit or
-  // no limit is set.
-  foreach (limit; [3, 0, -1]) {
-    prot.containerSizeLimit = limit;
-
-    {
-      prot.writeListBegin(TList(TType.I32, 2));
-      prot.writeI32(0);
-      prot.writeI32(1);
-      prot.writeListEnd();
-      prot.reset();
-
-      auto list = prot.readListBegin();
-      enforce(list.elemType == TType.I32);
-      enforce(list.size == 2);
-      enforce(prot.readI32() == 0);
-      enforce(prot.readI32() == 1);
-      prot.readListEnd();
-
-      prot.reset();
-      buffer.reset();
-    }
-
-    {
-      prot.writeMapBegin(TMap(TType.I32, TType.I32, 2));
-      prot.writeI32(0);
-      prot.writeI32(1);
-      prot.writeI32(2);
-      prot.writeI32(3);
-      prot.writeMapEnd();
-      prot.reset();
-
-      auto map = prot.readMapBegin();
-      enforce(map.keyType == TType.I32);
-      enforce(map.valueType == TType.I32);
-      enforce(map.size == 2);
-      enforce(prot.readI32() == 0);
-      enforce(prot.readI32() == 1);
-      enforce(prot.readI32() == 2);
-      enforce(prot.readI32() == 3);
-      prot.readMapEnd();
-
-      prot.reset();
-      buffer.reset();
-    }
-
-    {
-      prot.writeSetBegin(TSet(TType.I32, 2));
-      prot.writeI32(0);
-      prot.writeI32(1);
-      prot.writeSetEnd();
-      prot.reset();
-
-      auto set = prot.readSetBegin();
-      enforce(set.elemType == TType.I32);
-      enforce(set.size == 2);
-      enforce(prot.readI32() == 0);
-      enforce(prot.readI32() == 1);
-      prot.readSetEnd();
-
-      prot.reset();
-      buffer.reset();
-    }
-  }
-}
-
-void testStringSizeLimit(Protocol)() if (isTProtocol!Protocol) {
-  auto buffer = new TMemoryBuffer;
-  auto prot = new Protocol(buffer);
-
-  // Make sure reading fails if a string larger than the size limit is read.
-  prot.stringSizeLimit = 3;
-
-  {
-    prot.writeString("asdf");
-    prot.reset();
-
-    auto e = cast(TProtocolException)collectException(prot.readString());
-    enforce(e && e.type == TProtocolException.Type.SIZE_LIMIT);
-    prot.reset();
-    buffer.reset();
-  }
-
-  {
-    prot.writeBinary([1, 2, 3, 4]);
-    prot.reset();
-
-    auto e = cast(TProtocolException)collectException(prot.readBinary());
-    enforce(e && e.type == TProtocolException.Type.SIZE_LIMIT);
-    prot.reset();
-    buffer.reset();
-  }
-
-  // Make sure reading works if the containers are smaller than the limit or
-  // no limit is set.
-  foreach (limit; [3, 0, -1]) {
-    prot.containerSizeLimit = limit;
-
-    {
-      prot.writeString("as");
-      prot.reset();
-
-      enforce(prot.readString() == "as");
-      prot.reset();
-      buffer.reset();
-    }
-
-    {
-      prot.writeBinary([1, 2]);
-      prot.reset();
-
-      enforce(prot.readBinary() == [1, 2]);
-      prot.reset();
-      buffer.reset();
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/test/server.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/test/server.d
deleted file mode 100644
index fc5e86b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/test/server.d
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.internal.test.server;
-
-import core.sync.condition;
-import core.sync.mutex;
-import core.thread : Thread;
-import std.datetime;
-import std.exception : enforce;
-import std.typecons : WhiteHole;
-import std.variant : Variant;
-import thrift.protocol.base;
-import thrift.protocol.binary;
-import thrift.protocol.processor;
-import thrift.server.base;
-import thrift.server.transport.socket;
-import thrift.transport.base;
-import thrift.util.cancellation;
-
-version(unittest):
-
-/**
- * Tests if serving is stopped correctly if the cancellation passed to serve()
- * is triggered.
- *
- * Because the tests are run many times in a loop, this is indirectly also a
- * test whether socket, etc. handles are cleaned up correctly, because the
- * application will likely run out of handles otherwise.
- */
-void testServeCancel(Server)(void delegate(Server) serverSetup = null) if (
-  is(Server : TServer)
-) {
-  auto proc = new WhiteHole!TProcessor;
-  auto tf = new TTransportFactory;
-  auto pf = new TBinaryProtocolFactory!();
-
-  // Need a special case for TNonblockingServer which doesn't use
-  // TServerTransport.
-  static if (__traits(compiles, new Server(proc, 0, tf, pf))) {
-    auto server = new Server(proc, 0, tf, pf);
-  } else {
-    auto server = new Server(proc, new TServerSocket(0), tf, pf);
-  }
-
-  // On Windows, we use TCP sockets to replace socketpair(). Since they stay
-  // in TIME_WAIT for some time even if they are properly closed, we have to use
-  // a lower number of iterations to avoid running out of ports/buffer space.
-  version (Windows) {
-    enum ITERATIONS = 100;
-  } else {
-    enum ITERATIONS = 10000;
-  }
-
-  if (serverSetup) serverSetup(server);
-
-  auto servingMutex = new Mutex;
-  auto servingCondition = new Condition(servingMutex);
-  auto doneMutex = new Mutex;
-  auto doneCondition = new Condition(doneMutex);
-
-  class CancellingHandler : TServerEventHandler {
-    void preServe() {
-      synchronized (servingMutex) {
-        servingCondition.notifyAll();
-      }
-    }
-    Variant createContext(TProtocol input, TProtocol output) { return Variant.init; }
-    void deleteContext(Variant serverContext, TProtocol input, TProtocol output) {}
-    void preProcess(Variant serverContext, TTransport transport) {}
-  }
-  server.eventHandler = new CancellingHandler;
-
-  foreach (i; 0 .. ITERATIONS) {
-    synchronized (servingMutex) {
-      auto cancel = new TCancellationOrigin;
-      synchronized (doneMutex) {
-        auto serverThread = new Thread({
-          server.serve(cancel);
-          synchronized (doneMutex) {
-            doneCondition.notifyAll();
-          }
-        });
-        serverThread.isDaemon = true;
-        serverThread.start();
-
-        servingCondition.wait();
-
-        cancel.trigger();
-        enforce(doneCondition.wait(dur!"msecs"(3*1000)));
-        serverThread.join();
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/traits.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/traits.d
deleted file mode 100644
index 8ce1089..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/internal/traits.d
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.internal.traits;
-
-import std.traits;
-
-/**
- * Adds »nothrow« to the type of the passed function pointer/delegate, if it
- * is not already present.
- *
- * Technically, assumeNothrow just performs a cast, but using it has the
- * advantage of being explicitly about the operation that is performed.
- */
-auto assumeNothrow(T)(T t) if (isFunctionPointer!T || isDelegate!T) {
-  enum attrs = functionAttributes!T | FunctionAttribute.nothrow_;
-  return cast(SetFunctionAttributes!(T, functionLinkage!T, attrs)) t;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/base.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/base.d
deleted file mode 100644
index 70648b3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/base.d
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Defines the basic interface for a Thrift protocol and associated exception
- * types.
- *
- * Most parts of the protocol API are typically not used in client code, as
- * the actual serialization code is generated by thrift.codegen.* – the only
- * interesting thing usually is that there are protocols which can be created
- * from transports and passed around.
- */
-module thrift.protocol.base;
-
-import thrift.base;
-import thrift.transport.base;
-
-/**
- * The field types Thrift protocols support.
- */
-enum TType : byte {
-  STOP   = 0, /// Used to mark the end of a sequence of fields.
-  VOID   = 1, ///
-  BOOL   = 2, ///
-  BYTE   = 3, ///
-  DOUBLE = 4, ///
-  I16    = 6, ///
-  I32    = 8, ///
-  I64    = 10, ///
-  STRING = 11, ///
-  STRUCT = 12, ///
-  MAP    = 13, ///
-  SET    = 14, ///
-  LIST   = 15 ///
-}
-
-/**
- * Types of Thrift RPC messages.
- */
-enum TMessageType : byte {
-  CALL = 1, /// Call of a normal, two-way RPC method.
-  REPLY = 2, /// Reply to a normal method call.
-  EXCEPTION = 3, /// Reply to a method call if target raised a TApplicationException.
-  ONEWAY = 4 /// Call of a one-way RPC method which is not followed by a reply.
-}
-
-/**
- * Descriptions of Thrift entities.
- */
-struct TField {
-  string name;
-  TType type;
-  short id;
-}
-
-/// ditto
-struct TList {
-  TType elemType;
-  size_t size;
-}
-
-/// ditto
-struct TMap {
-  TType keyType;
-  TType valueType;
-  size_t size;
-}
-
-/// ditto
-struct TMessage {
-  string name;
-  TMessageType type;
-  int seqid;
-}
-
-/// ditto
-struct TSet {
-  TType elemType;
-  size_t size;
-}
-
-/// ditto
-struct TStruct {
-  string name;
-}
-
-/**
- * Interface for a Thrift protocol implementation. Essentially, it defines
- * a way of reading and writing all the base types, plus a mechanism for
- * writing out structs with indexed fields.
- *
- * TProtocol objects should not be shared across multiple encoding contexts,
- * as they may need to maintain internal state in some protocols (e.g. JSON).
- * Note that is is acceptable for the TProtocol module to do its own internal
- * buffered reads/writes to the underlying TTransport where appropriate (i.e.
- * when parsing an input XML stream, reading could be batched rather than
- * looking ahead character by character for a close tag).
- */
-interface TProtocol {
-  /// The underlying transport used by the protocol.
-  TTransport transport() @property;
-
-  /*
-   * Writing methods.
-   */
-
-  void writeBool(bool b); ///
-  void writeByte(byte b); ///
-  void writeI16(short i16); ///
-  void writeI32(int i32); ///
-  void writeI64(long i64); ///
-  void writeDouble(double dub); ///
-  void writeString(string str); ///
-  void writeBinary(ubyte[] buf); ///
-
-  void writeMessageBegin(TMessage message); ///
-  void writeMessageEnd(); ///
-  void writeStructBegin(TStruct tstruct); ///
-  void writeStructEnd(); ///
-  void writeFieldBegin(TField field); ///
-  void writeFieldEnd(); ///
-  void writeFieldStop(); ///
-  void writeListBegin(TList list); ///
-  void writeListEnd(); ///
-  void writeMapBegin(TMap map); ///
-  void writeMapEnd(); ///
-  void writeSetBegin(TSet set); ///
-  void writeSetEnd(); ///
-
-  /*
-   * Reading methods.
-   */
-
-  bool readBool(); ///
-  byte readByte(); ///
-  short readI16(); ///
-  int readI32(); ///
-  long readI64(); ///
-  double readDouble(); ///
-  string readString(); ///
-  ubyte[] readBinary(); ///
-
-  TMessage readMessageBegin(); ///
-  void readMessageEnd(); ///
-  TStruct readStructBegin(); ///
-  void readStructEnd(); ///
-  TField readFieldBegin(); ///
-  void readFieldEnd(); ///
-  TList readListBegin(); ///
-  void readListEnd(); ///
-  TMap readMapBegin(); ///
-  void readMapEnd(); ///
-  TSet readSetBegin(); ///
-  void readSetEnd(); ///
-
-  /**
-   * Reset any internal state back to a blank slate, if the protocol is
-   * stateful.
-   */
-  void reset();
-}
-
-/**
- * true if T is a TProtocol.
- */
-template isTProtocol(T) {
-  enum isTProtocol = is(T : TProtocol);
-}
-
-unittest {
-  static assert(isTProtocol!TProtocol);
-  static assert(!isTProtocol!void);
-}
-
-/**
- * Creates a protocol operating on a given transport.
- */
-interface TProtocolFactory {
-  ///
-  TProtocol getProtocol(TTransport trans);
-}
-
-/**
- * A protocol-level exception.
- */
-class TProtocolException : TException {
-  /// The possible exception types.
-  enum Type {
-    UNKNOWN, ///
-    INVALID_DATA, ///
-    NEGATIVE_SIZE, ///
-    SIZE_LIMIT, ///
-    BAD_VERSION, ///
-    NOT_IMPLEMENTED, ///
-    DEPTH_LIMIT ///
-  }
-
-  ///
-  this(Type type, string file = __FILE__, size_t line = __LINE__, Throwable next = null) {
-    static string msgForType(Type type) {
-      switch (type) {
-        case Type.UNKNOWN: return "Unknown protocol exception";
-        case Type.INVALID_DATA: return "Invalid data";
-        case Type.NEGATIVE_SIZE: return "Negative size";
-        case Type.SIZE_LIMIT: return "Exceeded size limit";
-        case Type.BAD_VERSION: return "Invalid version";
-        case Type.NOT_IMPLEMENTED: return "Not implemented";
-        case Type.DEPTH_LIMIT: return "Exceeded size limit";
-        default: return "(Invalid exception type)";
-      }
-    }
-    this(msgForType(type), type, file, line, next);
-  }
-
-  ///
-  this(string msg, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    this(msg, Type.UNKNOWN, file, line, next);
-  }
-
-  ///
-  this(string msg, Type type, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    super(msg, file, line, next);
-    type_ = type;
-  }
-
-  ///
-  Type type() const @property {
-    return type_;
-  }
-
-protected:
-  Type type_;
-}
-
-/**
- * Skips a field of the given type on the protocol.
- *
- * The main purpose of skip() is to allow treating struct and container types,
- * (where multiple primitive types have to be skipped) the same as scalar types
- * in generated code.
- */
-void skip(Protocol)(Protocol prot, TType type) if (is(Protocol : TProtocol)) {
-  final switch (type) {
-    case TType.BOOL:
-      prot.readBool();
-      break;
-
-    case TType.BYTE:
-      prot.readByte();
-      break;
-
-    case TType.I16:
-      prot.readI16();
-      break;
-
-    case TType.I32:
-      prot.readI32();
-      break;
-
-    case TType.I64:
-      prot.readI64();
-      break;
-
-    case TType.DOUBLE:
-      prot.readDouble();
-      break;
-
-    case TType.STRING:
-      prot.readBinary();
-      break;
-
-    case TType.STRUCT:
-      prot.readStructBegin();
-      while (true) {
-        auto f = prot.readFieldBegin();
-        if (f.type == TType.STOP) break;
-        skip(prot, f.type);
-        prot.readFieldEnd();
-      }
-      prot.readStructEnd();
-      break;
-
-    case TType.LIST:
-      auto l = prot.readListBegin();
-      foreach (i; 0 .. l.size) {
-        skip(prot, l.elemType);
-      }
-      prot.readListEnd();
-      break;
-
-    case TType.MAP:
-      auto m = prot.readMapBegin();
-      foreach (i; 0 .. m.size) {
-        skip(prot, m.keyType);
-        skip(prot, m.valueType);
-      }
-      prot.readMapEnd();
-      break;
-
-    case TType.SET:
-      auto s = prot.readSetBegin();
-      foreach (i; 0 .. s.size) {
-        skip(prot, s.elemType);
-      }
-      prot.readSetEnd();
-      break;
-    case TType.STOP: goto case;
-    case TType.VOID:
-      assert(false, "Invalid field type passed.");
-  }
-}
-
-/**
- * Application-level exception.
- *
- * It is thrown if an RPC call went wrong on the application layer, e.g. if
- * the receiver does not know the method name requested or a method invoked by
- * the service processor throws an exception not part of the Thrift API.
- */
-class TApplicationException : TException {
-  /// The possible exception types.
-  enum Type {
-    UNKNOWN = 0, ///
-    UNKNOWN_METHOD = 1, ///
-    INVALID_MESSAGE_TYPE = 2, ///
-    WRONG_METHOD_NAME = 3, ///
-    BAD_SEQUENCE_ID = 4, ///
-    MISSING_RESULT = 5, ///
-    INTERNAL_ERROR = 6, ///
-    PROTOCOL_ERROR = 7, ///
-    INVALID_TRANSFORM = 8, ///
-    INVALID_PROTOCOL = 9, ///
-    UNSUPPORTED_CLIENT_TYPE = 10 ///
-  }
-
-  ///
-  this(Type type, string file = __FILE__, size_t line = __LINE__, Throwable next = null) {
-    static string msgForType(Type type) {
-      switch (type) {
-        case Type.UNKNOWN: return "Unknown application exception";
-        case Type.UNKNOWN_METHOD: return "Unknown method";
-        case Type.INVALID_MESSAGE_TYPE: return "Invalid message type";
-        case Type.WRONG_METHOD_NAME: return "Wrong method name";
-        case Type.BAD_SEQUENCE_ID: return "Bad sequence identifier";
-        case Type.MISSING_RESULT: return "Missing result";
-        case Type.INTERNAL_ERROR: return "Internal error";
-        case Type.PROTOCOL_ERROR: return "Protocol error";
-        case Type.INVALID_TRANSFORM: return "Invalid transform";
-        case Type.INVALID_PROTOCOL: return "Invalid protocol";
-        case Type.UNSUPPORTED_CLIENT_TYPE: return "Unsupported client type";
-        default: return "(Invalid exception type)";
-      }
-    }
-    this(msgForType(type), type, file, line, next);
-  }
-
-  ///
-  this(string msg, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    this(msg, Type.UNKNOWN, file, line, next);
-  }
-
-  ///
-  this(string msg, Type type, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    super(msg, file, line, next);
-    type_ = type;
-  }
-
-  ///
-  Type type() @property const {
-    return type_;
-  }
-
-  // TODO: Replace hand-written read()/write() with thrift.codegen templates.
-
-  ///
-  void read(TProtocol iprot) {
-    iprot.readStructBegin();
-    while (true) {
-      auto f = iprot.readFieldBegin();
-      if (f.type == TType.STOP) break;
-
-      switch (f.id) {
-        case 1:
-          if (f.type == TType.STRING) {
-            msg = iprot.readString();
-          } else {
-            skip(iprot, f.type);
-          }
-          break;
-        case 2:
-          if (f.type == TType.I32) {
-            type_ = cast(Type)iprot.readI32();
-          } else {
-            skip(iprot, f.type);
-          }
-          break;
-        default:
-          skip(iprot, f.type);
-          break;
-      }
-    }
-    iprot.readStructEnd();
-  }
-
-  ///
-  void write(TProtocol oprot) const {
-    oprot.writeStructBegin(TStruct("TApplicationException"));
-
-    if (msg != null) {
-      oprot.writeFieldBegin(TField("message", TType.STRING, 1));
-      oprot.writeString(msg);
-      oprot.writeFieldEnd();
-    }
-
-    oprot.writeFieldBegin(TField("type", TType.I32, 2));
-    oprot.writeI32(type_);
-    oprot.writeFieldEnd();
-
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-private:
-  Type type_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/binary.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/binary.d
deleted file mode 100644
index 13d8fe8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/binary.d
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.protocol.binary;
-
-import std.array : uninitializedArray;
-import std.typetuple : allSatisfy, TypeTuple;
-import thrift.protocol.base;
-import thrift.transport.base;
-import thrift.internal.endian;
-
-/**
- * TProtocol implementation of the Binary Thrift protocol.
- */
-final class TBinaryProtocol(Transport = TTransport) if (
-  isTTransport!Transport
-) : TProtocol {
-
-  /**
-   * Constructs a new instance.
-   *
-   * Params:
-   *   trans = The transport to use.
-   *   containerSizeLimit = If positive, the container size is limited to the
-   *     given number of items.
-   *   stringSizeLimit = If positive, the string length is limited to the
-   *     given number of bytes.
-   *   strictRead = If false, old peers which do not include the protocol
-   *     version are tolerated.
-   *   strictWrite = Whether to include the protocol version in the header.
-   */
-  this(Transport trans, int containerSizeLimit = 0, int stringSizeLimit = 0,
-    bool strictRead = false, bool strictWrite = true
-  ) {
-    trans_ = trans;
-    this.containerSizeLimit = containerSizeLimit;
-    this.stringSizeLimit = stringSizeLimit;
-    this.strictRead = strictRead;
-    this.strictWrite = strictWrite;
-  }
-
-  Transport transport() @property {
-    return trans_;
-  }
-
-  void reset() {}
-
-  /**
-   * If false, old peers which do not include the protocol version in the
-   * message header are tolerated.
-   *
-   * Defaults to false.
-   */
-  bool strictRead;
-
-  /**
-   * Whether to include the protocol version in the message header (older
-   * versions didn't).
-   *
-   * Defaults to true.
-   */
-  bool strictWrite;
-
-  /**
-   * If positive, limits the number of items of deserialized containers to the
-   * given amount.
-   *
-   * This is useful to avoid allocating excessive amounts of memory when broken
-   * data is received. If the limit is exceeded, a SIZE_LIMIT-type
-   * TProtocolException is thrown.
-   *
-   * Defaults to zero (no limit).
-   */
-  int containerSizeLimit;
-
-  /**
-   * If positive, limits the length of deserialized strings/binary data to the
-   * given number of bytes.
-   *
-   * This is useful to avoid allocating excessive amounts of memory when broken
-   * data is received. If the limit is exceeded, a SIZE_LIMIT-type
-   * TProtocolException is thrown.
-   *
-   * Defaults to zero (no limit).
-   */
-  int stringSizeLimit;
-
-  /*
-   * Writing methods.
-   */
-
-  void writeBool(bool b) {
-    writeByte(b ? 1 : 0);
-  }
-
-  void writeByte(byte b) {
-    trans_.write((cast(ubyte*)&b)[0 .. 1]);
-  }
-
-  void writeI16(short i16) {
-    short net = hostToNet(i16);
-    trans_.write((cast(ubyte*)&net)[0 .. 2]);
-  }
-
-  void writeI32(int i32) {
-    int net = hostToNet(i32);
-    trans_.write((cast(ubyte*)&net)[0 .. 4]);
-  }
-
-  void writeI64(long i64) {
-    long net = hostToNet(i64);
-    trans_.write((cast(ubyte*)&net)[0 .. 8]);
-  }
-
-  void writeDouble(double dub) {
-    static assert(double.sizeof == ulong.sizeof);
-    auto bits = hostToNet(*cast(ulong*)(&dub));
-    trans_.write((cast(ubyte*)&bits)[0 .. 8]);
-  }
-
-  void writeString(string str) {
-    writeBinary(cast(ubyte[])str);
-  }
-
-  void writeBinary(ubyte[] buf) {
-    assert(buf.length <= int.max);
-    writeI32(cast(int)buf.length);
-    trans_.write(buf);
-  }
-
-  void writeMessageBegin(TMessage message) {
-    if (strictWrite) {
-      int versn = VERSION_1 | message.type;
-      writeI32(versn);
-      writeString(message.name);
-      writeI32(message.seqid);
-    } else {
-      writeString(message.name);
-      writeByte(message.type);
-      writeI32(message.seqid);
-    }
-  }
-  void writeMessageEnd() {}
-
-  void writeStructBegin(TStruct tstruct) {}
-  void writeStructEnd() {}
-
-  void writeFieldBegin(TField field) {
-    writeByte(field.type);
-    writeI16(field.id);
-  }
-  void writeFieldEnd() {}
-
-  void writeFieldStop() {
-    writeByte(TType.STOP);
-  }
-
-  void writeListBegin(TList list) {
-    assert(list.size <= int.max);
-    writeByte(list.elemType);
-    writeI32(cast(int)list.size);
-  }
-  void writeListEnd() {}
-
-  void writeMapBegin(TMap map) {
-    assert(map.size <= int.max);
-    writeByte(map.keyType);
-    writeByte(map.valueType);
-    writeI32(cast(int)map.size);
-  }
-  void writeMapEnd() {}
-
-  void writeSetBegin(TSet set) {
-    assert(set.size <= int.max);
-    writeByte(set.elemType);
-    writeI32(cast(int)set.size);
-  }
-  void writeSetEnd() {}
-
-
-  /*
-   * Reading methods.
-   */
-
-  bool readBool() {
-    return readByte() != 0;
-  }
-
-  byte readByte() {
-    ubyte[1] b = void;
-    trans_.readAll(b);
-    return cast(byte)b[0];
-  }
-
-  short readI16() {
-    IntBuf!short b = void;
-    trans_.readAll(b.bytes);
-    return netToHost(b.value);
-  }
-
-  int readI32() {
-    IntBuf!int b = void;
-    trans_.readAll(b.bytes);
-    return netToHost(b.value);
-  }
-
-  long readI64() {
-    IntBuf!long b = void;
-    trans_.readAll(b.bytes);
-    return netToHost(b.value);
-  }
-
-  double readDouble() {
-    IntBuf!long b = void;
-    trans_.readAll(b.bytes);
-    b.value = netToHost(b.value);
-    return *cast(double*)(&b.value);
-  }
-
-  string readString() {
-    return cast(string)readBinary();
-  }
-
-  ubyte[] readBinary() {
-    return readBinaryBody(readSize(stringSizeLimit));
-  }
-
-  TMessage readMessageBegin() {
-    TMessage msg = void;
-
-    int size = readI32();
-    if (size < 0) {
-      int versn = size & VERSION_MASK;
-      if (versn != VERSION_1) {
-        throw new TProtocolException("Bad protocol version.",
-          TProtocolException.Type.BAD_VERSION);
-      }
-
-      msg.type = cast(TMessageType)(size & MESSAGE_TYPE_MASK);
-      msg.name = readString();
-      msg.seqid = readI32();
-    } else {
-      if (strictRead) {
-        throw new TProtocolException(
-          "Protocol version missing, old client?",
-          TProtocolException.Type.BAD_VERSION);
-      } else {
-        if (size < 0) {
-          throw new TProtocolException(TProtocolException.Type.NEGATIVE_SIZE);
-        }
-        msg.name = cast(string)readBinaryBody(size);
-        msg.type = cast(TMessageType)(readByte());
-        msg.seqid = readI32();
-      }
-    }
-
-    return msg;
-  }
-  void readMessageEnd() {}
-
-  TStruct readStructBegin() {
-    return TStruct();
-  }
-  void readStructEnd() {}
-
-  TField readFieldBegin() {
-    TField f = void;
-    f.name = null;
-    f.type = cast(TType)readByte();
-    if (f.type == TType.STOP) return f;
-    f.id = readI16();
-    return f;
-  }
-  void readFieldEnd() {}
-
-  TList readListBegin() {
-    return TList(cast(TType)readByte(), readSize(containerSizeLimit));
-  }
-  void readListEnd() {}
-
-  TMap readMapBegin() {
-    return TMap(cast(TType)readByte(), cast(TType)readByte(),
-      readSize(containerSizeLimit));
-  }
-  void readMapEnd() {}
-
-  TSet readSetBegin() {
-    return TSet(cast(TType)readByte(), readSize(containerSizeLimit));
-  }
-  void readSetEnd() {}
-
-private:
-  ubyte[] readBinaryBody(int size) {
-    if (size == 0) {
-      return null;
-    }
-
-    auto buf = uninitializedArray!(ubyte[])(size);
-    trans_.readAll(buf);
-    return buf;
-  }
-
-  int readSize(int limit) {
-    auto size = readI32();
-    if (size < 0) {
-      throw new TProtocolException(TProtocolException.Type.NEGATIVE_SIZE);
-    } else if (limit > 0 && size > limit) {
-      throw new TProtocolException(TProtocolException.Type.SIZE_LIMIT);
-    }
-    return size;
-  }
-
-  enum MESSAGE_TYPE_MASK = 0x000000ff;
-  enum VERSION_MASK = 0xffff0000;
-  enum VERSION_1 = 0x80010000;
-
-  Transport trans_;
-}
-
-/**
- * TBinaryProtocol construction helper to avoid having to explicitly specify
- * the transport type, i.e. to allow the constructor being called using IFTI
- * (see $(LINK2 http://d.puremagic.com/issues/show_bug.cgi?id=6082, D Bugzilla
- * enhancement requet 6082)).
- */
-TBinaryProtocol!Transport tBinaryProtocol(Transport)(Transport trans,
-  int containerSizeLimit = 0, int stringSizeLimit = 0,
-  bool strictRead = false, bool strictWrite = true
-) if (isTTransport!Transport) {
-  return new TBinaryProtocol!Transport(trans, containerSizeLimit,
-    stringSizeLimit, strictRead, strictWrite);
-}
-
-unittest {
-  import std.exception;
-  import thrift.transport.memory;
-
-  // Check the message header format.
-  auto buf = new TMemoryBuffer;
-  auto binary = tBinaryProtocol(buf);
-  binary.writeMessageBegin(TMessage("foo", TMessageType.CALL, 0));
-
-  auto header = new ubyte[15];
-  buf.readAll(header);
-  enforce(header == [
-    128, 1, 0, 1, // Version 1, TMessageType.CALL
-    0, 0, 0, 3, // Method name length
-    102, 111, 111, // Method name ("foo")
-    0, 0, 0, 0, // Sequence id
-  ]);
-}
-
-unittest {
-  import thrift.internal.test.protocol;
-  testContainerSizeLimit!(TBinaryProtocol!())();
-  testStringSizeLimit!(TBinaryProtocol!())();
-}
-
-/**
- * TProtocolFactory creating a TBinaryProtocol instance for passed in
- * transports.
- *
- * The optional Transports template tuple parameter can be used to specify
- * one or more TTransport implementations to specifically instantiate
- * TBinaryProtocol for. If the actual transport types encountered at
- * runtime match one of the transports in the list, a specialized protocol
- * instance is created. Otherwise, a generic TTransport version is used.
- */
-class TBinaryProtocolFactory(Transports...) if (
-  allSatisfy!(isTTransport, Transports)
-) : TProtocolFactory {
-  ///
-  this (int containerSizeLimit = 0, int stringSizeLimit = 0,
-    bool strictRead = false, bool strictWrite = true
-  ) {
-    strictRead_ = strictRead;
-    strictWrite_ = strictWrite;
-    containerSizeLimit_ = containerSizeLimit;
-    stringSizeLimit_ = stringSizeLimit;
-  }
-
-  TProtocol getProtocol(TTransport trans) const {
-    foreach (Transport; TypeTuple!(Transports, TTransport)) {
-      auto concreteTrans = cast(Transport)trans;
-      if (concreteTrans) {
-        return new TBinaryProtocol!Transport(concreteTrans,
-          containerSizeLimit_, stringSizeLimit_, strictRead_, strictWrite_);
-      }
-    }
-    throw new TProtocolException(
-      "Passed null transport to TBinaryProtocolFactoy.");
-  }
-
-protected:
-  bool strictRead_;
-  bool strictWrite_;
-  int containerSizeLimit_;
-  int stringSizeLimit_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/compact.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/compact.d
deleted file mode 100644
index 9155c81..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/compact.d
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.protocol.compact;
-
-import std.array : uninitializedArray;
-import std.typetuple : allSatisfy, TypeTuple;
-import thrift.protocol.base;
-import thrift.transport.base;
-import thrift.internal.endian;
-
-/**
- * D implementation of the Compact protocol.
- *
- * See THRIFT-110 for a protocol description. This implementation is based on
- * the C++ one.
- */
-final class TCompactProtocol(Transport = TTransport) if (
-  isTTransport!Transport
-) : TProtocol {
-  /**
-   * Constructs a new instance.
-   *
-   * Params:
-   *   trans = The transport to use.
-   *   containerSizeLimit = If positive, the container size is limited to the
-   *     given number of items.
-   *   stringSizeLimit = If positive, the string length is limited to the
-   *     given number of bytes.
-   */
-  this(Transport trans, int containerSizeLimit = 0, int stringSizeLimit = 0) {
-    trans_ = trans;
-    this.containerSizeLimit = containerSizeLimit;
-    this.stringSizeLimit = stringSizeLimit;
-  }
-
-  Transport transport() @property {
-    return trans_;
-  }
-
-  void reset() {
-    lastFieldId_ = 0;
-    fieldIdStack_ = null;
-    booleanField_ = TField.init;
-    hasBoolValue_ = false;
-  }
-
-  /**
-   * If positive, limits the number of items of deserialized containers to the
-   * given amount.
-   *
-   * This is useful to avoid allocating excessive amounts of memory when broken
-   * data is received. If the limit is exceeded, a SIZE_LIMIT-type
-   * TProtocolException is thrown.
-   *
-   * Defaults to zero (no limit).
-   */
-  int containerSizeLimit;
-
-  /**
-   * If positive, limits the length of deserialized strings/binary data to the
-   * given number of bytes.
-   *
-   * This is useful to avoid allocating excessive amounts of memory when broken
-   * data is received. If the limit is exceeded, a SIZE_LIMIT-type
-   * TProtocolException is thrown.
-   *
-   * Defaults to zero (no limit).
-   */
-  int stringSizeLimit;
-
-  /*
-   * Writing methods.
-   */
-
-  void writeBool(bool b) {
-    if (booleanField_.name !is null) {
-      // we haven't written the field header yet
-      writeFieldBeginInternal(booleanField_,
-        b ? CType.BOOLEAN_TRUE : CType.BOOLEAN_FALSE);
-      booleanField_.name = null;
-    } else {
-      // we're not part of a field, so just write the value
-      writeByte(b ? CType.BOOLEAN_TRUE : CType.BOOLEAN_FALSE);
-    }
-  }
-
-  void writeByte(byte b) {
-    trans_.write((cast(ubyte*)&b)[0..1]);
-  }
-
-  void writeI16(short i16) {
-    writeVarint32(i32ToZigzag(i16));
-  }
-
-  void writeI32(int i32) {
-    writeVarint32(i32ToZigzag(i32));
-  }
-
-  void writeI64(long i64) {
-    writeVarint64(i64ToZigzag(i64));
-  }
-
-  void writeDouble(double dub) {
-    ulong bits = hostToLe(*cast(ulong*)(&dub));
-    trans_.write((cast(ubyte*)&bits)[0 .. 8]);
-  }
-
-  void writeString(string str) {
-    writeBinary(cast(ubyte[])str);
-  }
-
-  void writeBinary(ubyte[] buf) {
-    assert(buf.length <= int.max);
-    writeVarint32(cast(int)buf.length);
-    trans_.write(buf);
-  }
-
-  void writeMessageBegin(TMessage msg) {
-    writeByte(cast(byte)PROTOCOL_ID);
-    writeByte(cast(byte)((VERSION_N & VERSION_MASK) |
-                         ((cast(int)msg.type << TYPE_SHIFT_AMOUNT) & TYPE_MASK)));
-    writeVarint32(msg.seqid);
-    writeString(msg.name);
-  }
-  void writeMessageEnd() {}
-
-  void writeStructBegin(TStruct tstruct) {
-    fieldIdStack_ ~= lastFieldId_;
-    lastFieldId_ = 0;
-  }
-
-  void writeStructEnd() {
-    lastFieldId_ = fieldIdStack_[$ - 1];
-    fieldIdStack_ = fieldIdStack_[0 .. $ - 1];
-    fieldIdStack_.assumeSafeAppend();
-  }
-
-  void writeFieldBegin(TField field) {
-    if (field.type == TType.BOOL) {
-      booleanField_.name = field.name;
-      booleanField_.type = field.type;
-      booleanField_.id = field.id;
-    } else {
-      return writeFieldBeginInternal(field);
-    }
-  }
-  void writeFieldEnd() {}
-
-  void writeFieldStop() {
-    writeByte(TType.STOP);
-  }
-
-  void writeListBegin(TList list) {
-    writeCollectionBegin(list.elemType, list.size);
-  }
-  void writeListEnd() {}
-
-  void writeMapBegin(TMap map) {
-    if (map.size == 0) {
-      writeByte(0);
-    } else {
-      assert(map.size <= int.max);
-      writeVarint32(cast(int)map.size);
-      writeByte(cast(byte)(toCType(map.keyType) << 4 | toCType(map.valueType)));
-    }
-  }
-  void writeMapEnd() {}
-
-  void writeSetBegin(TSet set) {
-    writeCollectionBegin(set.elemType, set.size);
-  }
-  void writeSetEnd() {}
-
-
-  /*
-   * Reading methods.
-   */
-
-  bool readBool() {
-    if (hasBoolValue_ == true) {
-      hasBoolValue_ = false;
-      return boolValue_;
-    }
-
-    return readByte() == CType.BOOLEAN_TRUE;
-  }
-
-  byte readByte() {
-    ubyte[1] b = void;
-    trans_.readAll(b);
-    return cast(byte)b[0];
-  }
-
-  short readI16() {
-    return cast(short)zigzagToI32(readVarint32());
-  }
-
-  int readI32() {
-    return zigzagToI32(readVarint32());
-  }
-
-  long readI64() {
-    return zigzagToI64(readVarint64());
-  }
-
-  double readDouble() {
-    IntBuf!long b = void;
-    trans_.readAll(b.bytes);
-    b.value = leToHost(b.value);
-    return *cast(double*)(&b.value);
-  }
-
-  string readString() {
-    return cast(string)readBinary();
-  }
-
-  ubyte[] readBinary() {
-    auto size = readVarint32();
-    checkSize(size, stringSizeLimit);
-
-    if (size == 0) {
-      return null;
-    }
-
-    auto buf = uninitializedArray!(ubyte[])(size);
-    trans_.readAll(buf);
-    return buf;
-  }
-
-  TMessage readMessageBegin() {
-    TMessage msg = void;
-
-    auto protocolId = readByte();
-    if (protocolId != cast(byte)PROTOCOL_ID) {
-      throw new TProtocolException("Bad protocol identifier",
-        TProtocolException.Type.BAD_VERSION);
-    }
-
-    auto versionAndType = readByte();
-    auto ver = versionAndType & VERSION_MASK;
-    if (ver != VERSION_N) {
-      throw new TProtocolException("Bad protocol version",
-        TProtocolException.Type.BAD_VERSION);
-    }
-
-    msg.type = cast(TMessageType)((versionAndType >> TYPE_SHIFT_AMOUNT) & TYPE_BITS);
-    msg.seqid = readVarint32();
-    msg.name = readString();
-
-    return msg;
-  }
-  void readMessageEnd() {}
-
-  TStruct readStructBegin() {
-    fieldIdStack_ ~= lastFieldId_;
-    lastFieldId_ = 0;
-    return TStruct();
-  }
-
-  void readStructEnd() {
-    lastFieldId_ = fieldIdStack_[$ - 1];
-    fieldIdStack_ = fieldIdStack_[0 .. $ - 1];
-  }
-
-  TField readFieldBegin() {
-    TField f = void;
-    f.name = null;
-
-    auto bite = readByte();
-    auto type = cast(CType)(bite & 0x0f);
-
-    if (type == CType.STOP) {
-      // Struct stop byte, nothing more to do.
-      f.id = 0;
-      f.type = TType.STOP;
-      return f;
-    }
-
-    // Mask off the 4 MSB of the type header, which could contain a field id
-    // delta.
-    auto modifier = cast(short)((bite & 0xf0) >> 4);
-    if (modifier > 0) {
-      f.id = cast(short)(lastFieldId_ + modifier);
-    } else {
-      // Delta encoding not used, just read the id as usual.
-      f.id = readI16();
-    }
-    f.type = getTType(type);
-
-    if (type == CType.BOOLEAN_TRUE || type == CType.BOOLEAN_FALSE) {
-      // For boolean fields, the value is encoded in the type – keep it around
-      // for the readBool() call.
-      hasBoolValue_ = true;
-      boolValue_ = (type == CType.BOOLEAN_TRUE ? true : false);
-    }
-
-    lastFieldId_ = f.id;
-    return f;
-  }
-  void readFieldEnd() {}
-
-  TList readListBegin() {
-    auto sizeAndType = readByte();
-
-    auto lsize = (sizeAndType >> 4) & 0xf;
-    if (lsize == 0xf) {
-      lsize = readVarint32();
-    }
-    checkSize(lsize, containerSizeLimit);
-
-    TList l = void;
-    l.elemType = getTType(cast(CType)(sizeAndType & 0x0f));
-    l.size = cast(size_t)lsize;
-
-    return l;
-  }
-  void readListEnd() {}
-
-  TMap readMapBegin() {
-    TMap m = void;
-
-    auto size = readVarint32();
-    ubyte kvType;
-    if (size != 0) {
-      kvType = readByte();
-    }
-    checkSize(size, containerSizeLimit);
-
-    m.size = size;
-    m.keyType = getTType(cast(CType)(kvType >> 4));
-    m.valueType = getTType(cast(CType)(kvType & 0xf));
-
-    return m;
-  }
-  void readMapEnd() {}
-
-  TSet readSetBegin() {
-    auto sizeAndType = readByte();
-
-    auto lsize = (sizeAndType >> 4) & 0xf;
-    if (lsize == 0xf) {
-      lsize = readVarint32();
-    }
-    checkSize(lsize, containerSizeLimit);
-
-    TSet s = void;
-    s.elemType = getTType(cast(CType)(sizeAndType & 0xf));
-    s.size = cast(size_t)lsize;
-
-    return s;
-  }
-  void readSetEnd() {}
-
-private:
-  void writeFieldBeginInternal(TField field, byte typeOverride = -1) {
-    // If there's a type override, use that.
-    auto typeToWrite = (typeOverride == -1 ? toCType(field.type) : typeOverride);
-
-    // check if we can use delta encoding for the field id
-    if (field.id > lastFieldId_ && (field.id - lastFieldId_) <= 15) {
-      // write them together
-      writeByte(cast(byte)((field.id - lastFieldId_) << 4 | typeToWrite));
-    } else {
-      // write them separate
-      writeByte(cast(byte)typeToWrite);
-      writeI16(field.id);
-    }
-
-    lastFieldId_ = field.id;
-  }
-
-
-  void writeCollectionBegin(TType elemType, size_t size) {
-    if (size <= 14) {
-      writeByte(cast(byte)(size << 4 | toCType(elemType)));
-    } else {
-      assert(size <= int.max);
-      writeByte(cast(byte)(0xf0 | toCType(elemType)));
-      writeVarint32(cast(int)size);
-    }
-  }
-
-  void writeVarint32(uint n) {
-    ubyte[5] buf = void;
-    ubyte wsize;
-
-    while (true) {
-      if ((n & ~0x7F) == 0) {
-        buf[wsize++] = cast(ubyte)n;
-        break;
-      } else {
-        buf[wsize++] = cast(ubyte)((n & 0x7F) | 0x80);
-        n >>= 7;
-      }
-    }
-
-    trans_.write(buf[0 .. wsize]);
-  }
-
-  /*
-   * Write an i64 as a varint. Results in 1-10 bytes on the wire.
-   */
-  void writeVarint64(ulong n) {
-    ubyte[10] buf = void;
-    ubyte wsize;
-
-    while (true) {
-      if ((n & ~0x7FL) == 0) {
-        buf[wsize++] = cast(ubyte)n;
-        break;
-      } else {
-        buf[wsize++] = cast(ubyte)((n & 0x7F) | 0x80);
-        n >>= 7;
-      }
-    }
-
-    trans_.write(buf[0 .. wsize]);
-  }
-
-  /*
-   * Convert l into a zigzag long. This allows negative numbers to be
-   * represented compactly as a varint.
-   */
-  ulong i64ToZigzag(long l) {
-    return (l << 1) ^ (l >> 63);
-  }
-
-  /*
-   * Convert n into a zigzag int. This allows negative numbers to be
-   * represented compactly as a varint.
-   */
-  uint i32ToZigzag(int n) {
-    return (n << 1) ^ (n >> 31);
-  }
-
-  CType toCType(TType type) {
-    final switch (type) {
-      case TType.STOP:
-        return CType.STOP;
-      case TType.BOOL:
-        return CType.BOOLEAN_TRUE;
-      case TType.BYTE:
-        return CType.BYTE;
-      case TType.DOUBLE:
-        return CType.DOUBLE;
-      case TType.I16:
-        return CType.I16;
-      case TType.I32:
-        return CType.I32;
-      case TType.I64:
-        return CType.I64;
-      case TType.STRING:
-        return CType.BINARY;
-      case TType.STRUCT:
-        return CType.STRUCT;
-      case TType.MAP:
-        return CType.MAP;
-      case TType.SET:
-        return CType.SET;
-      case TType.LIST:
-        return CType.LIST;
-      case TType.VOID:
-        assert(false, "Invalid type passed.");
-    }
-  }
-
-  int readVarint32() {
-    return cast(int)readVarint64();
-  }
-
-  long readVarint64() {
-    ulong val;
-    ubyte shift;
-    ubyte[10] buf = void;  // 64 bits / (7 bits/byte) = 10 bytes.
-    auto bufSize = buf.sizeof;
-    auto borrowed = trans_.borrow(buf.ptr, bufSize);
-
-    ubyte rsize;
-
-    if (borrowed) {
-      // Fast path.
-      while (true) {
-        auto bite = borrowed[rsize];
-        rsize++;
-        val |= cast(ulong)(bite & 0x7f) << shift;
-        shift += 7;
-        if (!(bite & 0x80)) {
-          trans_.consume(rsize);
-          return val;
-        }
-        // Have to check for invalid data so we don't crash.
-        if (rsize == buf.sizeof) {
-          throw new TProtocolException(TProtocolException.Type.INVALID_DATA,
-            "Variable-length int over 10 bytes.");
-        }
-      }
-    } else {
-      // Slow path.
-      while (true) {
-        ubyte[1] bite;
-        trans_.readAll(bite);
-        ++rsize;
-
-        val |= cast(ulong)(bite[0] & 0x7f) << shift;
-        shift += 7;
-        if (!(bite[0] & 0x80)) {
-          return val;
-        }
-
-        // Might as well check for invalid data on the slow path too.
-        if (rsize >= buf.sizeof) {
-          throw new TProtocolException(TProtocolException.Type.INVALID_DATA,
-            "Variable-length int over 10 bytes.");
-        }
-      }
-    }
-  }
-
-  /*
-   * Convert from zigzag int to int.
-   */
-  int zigzagToI32(uint n) {
-    return (n >> 1) ^ -(n & 1);
-  }
-
-  /*
-   * Convert from zigzag long to long.
-   */
-  long zigzagToI64(ulong n) {
-    return (n >> 1) ^ -(n & 1);
-  }
-
-  TType getTType(CType type) {
-    final switch (type) {
-      case CType.STOP:
-        return TType.STOP;
-      case CType.BOOLEAN_FALSE:
-        return TType.BOOL;
-      case CType.BOOLEAN_TRUE:
-        return TType.BOOL;
-      case CType.BYTE:
-        return TType.BYTE;
-      case CType.I16:
-        return TType.I16;
-      case CType.I32:
-        return TType.I32;
-      case CType.I64:
-        return TType.I64;
-      case CType.DOUBLE:
-        return TType.DOUBLE;
-      case CType.BINARY:
-        return TType.STRING;
-      case CType.LIST:
-        return TType.LIST;
-      case CType.SET:
-        return TType.SET;
-      case CType.MAP:
-        return TType.MAP;
-      case CType.STRUCT:
-        return TType.STRUCT;
-    }
-  }
-
-  void checkSize(int size, int limit) {
-    if (size < 0) {
-      throw new TProtocolException(TProtocolException.Type.NEGATIVE_SIZE);
-    } else if (limit > 0 && size > limit) {
-      throw new TProtocolException(TProtocolException.Type.SIZE_LIMIT);
-    }
-  }
-
-  enum PROTOCOL_ID = 0x82;
-  enum VERSION_N = 1;
-  enum VERSION_MASK = 0b0001_1111;
-  enum TYPE_MASK = 0b1110_0000;
-  enum TYPE_BITS = 0b0000_0111;
-  enum TYPE_SHIFT_AMOUNT = 5;
-
-  // Probably need to implement a better stack at some point.
-  short[] fieldIdStack_;
-  short lastFieldId_;
-
-  TField booleanField_;
-
-  bool hasBoolValue_;
-  bool boolValue_;
-
-  Transport trans_;
-}
-
-/**
- * TCompactProtocol construction helper to avoid having to explicitly specify
- * the transport type, i.e. to allow the constructor being called using IFTI
- * (see $(LINK2 http://d.puremagic.com/issues/show_bug.cgi?id=6082, D Bugzilla
- * enhancement requet 6082)).
- */
-TCompactProtocol!Transport tCompactProtocol(Transport)(Transport trans,
-  int containerSizeLimit = 0, int stringSizeLimit = 0
-) if (isTTransport!Transport)
-{
-  return new TCompactProtocol!Transport(trans,
-    containerSizeLimit, stringSizeLimit);
-}
-
-private {
-  enum CType : ubyte {
-    STOP = 0x0,
-    BOOLEAN_TRUE = 0x1,
-    BOOLEAN_FALSE = 0x2,
-    BYTE = 0x3,
-    I16 = 0x4,
-    I32 = 0x5,
-    I64 = 0x6,
-    DOUBLE = 0x7,
-    BINARY = 0x8,
-    LIST = 0x9,
-    SET = 0xa,
-    MAP = 0xb,
-    STRUCT = 0xc
-  }
-  static assert(CType.max <= 0xf,
-    "Compact protocol wire type representation must fit into 4 bits.");
-}
-
-unittest {
-  import std.exception;
-  import thrift.transport.memory;
-
-  // Check the message header format.
-  auto buf = new TMemoryBuffer;
-  auto compact = tCompactProtocol(buf);
-  compact.writeMessageBegin(TMessage("foo", TMessageType.CALL, 0));
-
-  auto header = new ubyte[7];
-  buf.readAll(header);
-  enforce(header == [
-    130, // Protocol id.
-    33, // Version/type byte.
-    0, // Sequence id.
-    3, 102, 111, 111 // Method name.
-  ]);
-}
-
-unittest {
-  import thrift.internal.test.protocol;
-  testContainerSizeLimit!(TCompactProtocol!())();
-  testStringSizeLimit!(TCompactProtocol!())();
-}
-
-/**
- * TProtocolFactory creating a TCompactProtocol instance for passed in
- * transports.
- *
- * The optional Transports template tuple parameter can be used to specify
- * one or more TTransport implementations to specifically instantiate
- * TCompactProtocol for. If the actual transport types encountered at
- * runtime match one of the transports in the list, a specialized protocol
- * instance is created. Otherwise, a generic TTransport version is used.
- */
-class TCompactProtocolFactory(Transports...) if (
-  allSatisfy!(isTTransport, Transports)
-) : TProtocolFactory {
-  ///
-  this(int containerSizeLimit = 0, int stringSizeLimit = 0) {
-    containerSizeLimit_ = 0;
-    stringSizeLimit_ = 0;
-  }
-
-  TProtocol getProtocol(TTransport trans) const {
-    foreach (Transport; TypeTuple!(Transports, TTransport)) {
-      auto concreteTrans = cast(Transport)trans;
-      if (concreteTrans) {
-        return new TCompactProtocol!Transport(concreteTrans);
-      }
-    }
-    throw new TProtocolException(
-      "Passed null transport to TCompactProtocolFactory.");
-  }
-
-  int containerSizeLimit_;
-  int stringSizeLimit_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/json.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/json.d
deleted file mode 100644
index 56a71da..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/json.d
+++ /dev/null
@@ -1,1037 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.protocol.json;
-
-import std.algorithm;
-import std.array;
-import std.base64;
-import std.conv;
-import std.range;
-import std.string : format;
-import std.traits : isIntegral;
-import std.typetuple : allSatisfy, TypeTuple;
-import std.utf : toUTF8;
-import thrift.protocol.base;
-import thrift.transport.base;
-
-alias Base64Impl!('+', '/', Base64.NoPadding) Base64NoPad;
-
-/**
- * Implementation of the Thrift JSON protocol.
- */
-final class TJsonProtocol(Transport = TTransport) if (
-  isTTransport!Transport
-) : TProtocol {
-  /**
-   * Constructs a new instance.
-   *
-   * Params:
-   *   trans = The transport to use.
-   *   containerSizeLimit = If positive, the container size is limited to the
-   *     given number of items.
-   *   stringSizeLimit = If positive, the string length is limited to the
-   *     given number of bytes.
-   */
-  this(Transport trans, int containerSizeLimit = 0, int stringSizeLimit = 0) {
-    trans_ = trans;
-    this.containerSizeLimit = containerSizeLimit;
-    this.stringSizeLimit = stringSizeLimit;
-
-    context_ = new Context();
-    reader_ = new LookaheadReader(trans);
-  }
-
-  Transport transport() @property {
-    return trans_;
-  }
-
-  void reset() {
-    destroy(contextStack_);
-    context_ = new Context();
-    reader_ = new LookaheadReader(trans_);
-  }
-
-  /**
-   * If positive, limits the number of items of deserialized containers to the
-   * given amount.
-   *
-   * This is useful to avoid allocating excessive amounts of memory when broken
-   * data is received. If the limit is exceeded, a SIZE_LIMIT-type
-   * TProtocolException is thrown.
-   *
-   * Defaults to zero (no limit).
-   */
-  int containerSizeLimit;
-
-  /**
-   * If positive, limits the length of deserialized strings/binary data to the
-   * given number of bytes.
-   *
-   * This is useful to avoid allocating excessive amounts of memory when broken
-   * data is received. If the limit is exceeded, a SIZE_LIMIT-type
-   * TProtocolException is thrown.
-   *
-   * Note: For binary data, the limit applies to the length of the
-   * Base64-encoded string data, not the resulting byte array.
-   *
-   * Defaults to zero (no limit).
-   */
-  int stringSizeLimit;
-
-  /*
-   * Writing methods.
-   */
-
-  void writeBool(bool b) {
-    writeJsonInteger(b ? 1 : 0);
-  }
-
-  void writeByte(byte b) {
-    writeJsonInteger(b);
-  }
-
-  void writeI16(short i16) {
-    writeJsonInteger(i16);
-  }
-
-  void writeI32(int i32) {
-    writeJsonInteger(i32);
-  }
-
-  void writeI64(long i64) {
-    writeJsonInteger(i64);
-  }
-
-  void writeDouble(double dub) {
-    context_.write(trans_);
-
-    string value;
-    if (dub is double.nan) {
-      value = NAN_STRING;
-    } else if (dub is double.infinity) {
-      value = INFINITY_STRING;
-    } else if (dub is -double.infinity) {
-      value = NEG_INFINITY_STRING;
-    }
-
-    bool escapeNum = value !is null || context_.escapeNum;
-
-    if (value is null) {
-      /* precision is 17 */
-      value = format("%.17g", dub);
-    }
-
-    if (escapeNum) trans_.write(STRING_DELIMITER);
-    trans_.write(cast(ubyte[])value);
-    if (escapeNum) trans_.write(STRING_DELIMITER);
-  }
-
-  void writeString(string str) {
-    context_.write(trans_);
-    trans_.write(STRING_DELIMITER);
-    foreach (c; str) {
-      writeJsonChar(c);
-    }
-    trans_.write(STRING_DELIMITER);
-  }
-
-  void writeBinary(ubyte[] buf) {
-    context_.write(trans_);
-
-    trans_.write(STRING_DELIMITER);
-    ubyte[4] b;
-    while (!buf.empty) {
-      auto toWrite = take(buf, 3);
-      Base64NoPad.encode(toWrite, b[]);
-      trans_.write(b[0 .. toWrite.length + 1]);
-      buf.popFrontN(toWrite.length);
-    }
-    trans_.write(STRING_DELIMITER);
-  }
-
-  void writeMessageBegin(TMessage msg) {
-    writeJsonArrayBegin();
-    writeJsonInteger(THRIFT_JSON_VERSION);
-    writeString(msg.name);
-    writeJsonInteger(cast(byte)msg.type);
-    writeJsonInteger(msg.seqid);
-  }
-
-  void writeMessageEnd() {
-    writeJsonArrayEnd();
-  }
-
-  void writeStructBegin(TStruct tstruct) {
-    writeJsonObjectBegin();
-  }
-
-  void writeStructEnd() {
-    writeJsonObjectEnd();
-  }
-
-  void writeFieldBegin(TField field) {
-    writeJsonInteger(field.id);
-    writeJsonObjectBegin();
-    writeString(getNameFromTType(field.type));
-  }
-
-  void writeFieldEnd() {
-    writeJsonObjectEnd();
-  }
-
-  void writeFieldStop() {}
-
-  void writeListBegin(TList list) {
-    writeJsonArrayBegin();
-    writeString(getNameFromTType(list.elemType));
-    writeJsonInteger(list.size);
-  }
-
-  void writeListEnd() {
-    writeJsonArrayEnd();
-  }
-
-  void writeMapBegin(TMap map) {
-    writeJsonArrayBegin();
-    writeString(getNameFromTType(map.keyType));
-    writeString(getNameFromTType(map.valueType));
-    writeJsonInteger(map.size);
-    writeJsonObjectBegin();
-  }
-
-  void writeMapEnd() {
-    writeJsonObjectEnd();
-    writeJsonArrayEnd();
-  }
-
-  void writeSetBegin(TSet set) {
-    writeJsonArrayBegin();
-    writeString(getNameFromTType(set.elemType));
-    writeJsonInteger(set.size);
-  }
-
-  void writeSetEnd() {
-    writeJsonArrayEnd();
-  }
-
-
-  /*
-   * Reading methods.
-   */
-
-  bool readBool() {
-    return readJsonInteger!byte() ? true : false;
-  }
-
-  byte readByte() {
-    return readJsonInteger!byte();
-  }
-
-  short readI16() {
-    return readJsonInteger!short();
-  }
-
-  int readI32() {
-    return readJsonInteger!int();
-  }
-
-  long readI64() {
-    return readJsonInteger!long();
-  }
-
-  double readDouble() {
-    context_.read(reader_);
-
-    if (reader_.peek() == STRING_DELIMITER) {
-      auto str = readJsonString(true);
-      if (str == NAN_STRING) {
-        return double.nan;
-      }
-      if (str == INFINITY_STRING) {
-        return double.infinity;
-      }
-      if (str == NEG_INFINITY_STRING) {
-        return -double.infinity;
-      }
-
-      if (!context_.escapeNum) {
-        // Throw exception -- we should not be in a string in this case
-        throw new TProtocolException("Numeric data unexpectedly quoted",
-          TProtocolException.Type.INVALID_DATA);
-      }
-      try {
-        return to!double(str);
-      } catch (ConvException e) {
-        throw new TProtocolException(`Expected numeric value; got "` ~ str ~
-          `".`, TProtocolException.Type.INVALID_DATA);
-      }
-    }
-    else {
-      if (context_.escapeNum) {
-        // This will throw - we should have had a quote if escapeNum == true
-        readJsonSyntaxChar(STRING_DELIMITER);
-      }
-
-      auto str = readJsonNumericChars();
-      try {
-        return to!double(str);
-      } catch (ConvException e) {
-        throw new TProtocolException(`Expected numeric value; got "` ~ str ~
-          `".`, TProtocolException.Type.INVALID_DATA);
-      }
-    }
-  }
-
-  string readString() {
-    return readJsonString(false);
-  }
-
-  ubyte[] readBinary() {
-    return Base64NoPad.decode(readString());
-  }
-
-  TMessage readMessageBegin() {
-    TMessage msg = void;
-
-    readJsonArrayBegin();
-
-    auto ver = readJsonInteger!short();
-    if (ver != THRIFT_JSON_VERSION) {
-      throw new TProtocolException("Message contained bad version.",
-        TProtocolException.Type.BAD_VERSION);
-    }
-
-    msg.name = readString();
-    msg.type = cast(TMessageType)readJsonInteger!byte();
-    msg.seqid = readJsonInteger!short();
-
-    return msg;
-  }
-
-  void readMessageEnd() {
-    readJsonArrayEnd();
-  }
-
-  TStruct readStructBegin() {
-    readJsonObjectBegin();
-    return TStruct();
-  }
-
-  void readStructEnd() {
-    readJsonObjectEnd();
-  }
-
-  TField readFieldBegin() {
-    TField f = void;
-    f.name = null;
-
-    auto ch = reader_.peek();
-    if (ch == OBJECT_END) {
-      f.type = TType.STOP;
-    } else {
-      f.id = readJsonInteger!short();
-      readJsonObjectBegin();
-      f.type = getTTypeFromName(readString());
-    }
-
-    return f;
-  }
-
-  void readFieldEnd() {
-    readJsonObjectEnd();
-  }
-
-  TList readListBegin() {
-    readJsonArrayBegin();
-    auto type = getTTypeFromName(readString());
-    auto size = readContainerSize();
-    return TList(type, size);
-  }
-
-  void readListEnd() {
-    readJsonArrayEnd();
-  }
-
-  TMap readMapBegin() {
-    readJsonArrayBegin();
-    auto keyType = getTTypeFromName(readString());
-    auto valueType = getTTypeFromName(readString());
-    auto size = readContainerSize();
-    readJsonObjectBegin();
-    return TMap(keyType, valueType, size);
-  }
-
-  void readMapEnd() {
-    readJsonObjectEnd();
-    readJsonArrayEnd();
-  }
-
-  TSet readSetBegin() {
-    readJsonArrayBegin();
-    auto type = getTTypeFromName(readString());
-    auto size = readContainerSize();
-    return TSet(type, size);
-  }
-
-  void readSetEnd() {
-    readJsonArrayEnd();
-  }
-
-private:
-  void pushContext(Context c) {
-    contextStack_ ~= context_;
-    context_ = c;
-  }
-
-  void popContext() {
-    context_ = contextStack_.back;
-    contextStack_.popBack();
-    contextStack_.assumeSafeAppend();
-  }
-
-  /*
-   * Writing functions
-   */
-
-  // Write the character ch as a Json escape sequence ("\u00xx")
-  void writeJsonEscapeChar(ubyte ch) {
-    trans_.write(ESCAPE_PREFIX);
-    trans_.write(ESCAPE_PREFIX);
-    auto outCh = hexChar(cast(ubyte)(ch >> 4));
-    trans_.write((&outCh)[0 .. 1]);
-    outCh = hexChar(ch);
-    trans_.write((&outCh)[0 .. 1]);
-  }
-
-  // Write the character ch as part of a Json string, escaping as appropriate.
-  void writeJsonChar(ubyte ch) {
-    if (ch >= 0x30) {
-      if (ch == '\\') { // Only special character >= 0x30 is '\'
-        trans_.write(BACKSLASH);
-        trans_.write(BACKSLASH);
-      } else {
-        trans_.write((&ch)[0 .. 1]);
-      }
-    }
-    else {
-      auto outCh = kJsonCharTable[ch];
-      // Check if regular character, backslash escaped, or Json escaped
-      if (outCh == 1) {
-        trans_.write((&ch)[0 .. 1]);
-      } else if (outCh > 1) {
-        trans_.write(BACKSLASH);
-        trans_.write((&outCh)[0 .. 1]);
-      } else {
-        writeJsonEscapeChar(ch);
-      }
-    }
-  }
-
-  // Convert the given integer type to a Json number, or a string
-  // if the context requires it (eg: key in a map pair).
-  void writeJsonInteger(T)(T num) if (isIntegral!T) {
-    context_.write(trans_);
-
-    auto escapeNum = context_.escapeNum();
-    if (escapeNum) trans_.write(STRING_DELIMITER);
-    trans_.write(cast(ubyte[])to!string(num));
-    if (escapeNum) trans_.write(STRING_DELIMITER);
-  }
-
-  void writeJsonObjectBegin() {
-    context_.write(trans_);
-    trans_.write(OBJECT_BEGIN);
-    pushContext(new PairContext());
-  }
-
-  void writeJsonObjectEnd() {
-    popContext();
-    trans_.write(OBJECT_END);
-  }
-
-  void writeJsonArrayBegin() {
-    context_.write(trans_);
-    trans_.write(ARRAY_BEGIN);
-    pushContext(new ListContext());
-  }
-
-  void writeJsonArrayEnd() {
-    popContext();
-    trans_.write(ARRAY_END);
-  }
-
-  /*
-   * Reading functions
-   */
-
-  int readContainerSize() {
-    auto size = readJsonInteger!int();
-    if (size < 0) {
-      throw new TProtocolException(TProtocolException.Type.NEGATIVE_SIZE);
-    } else if (containerSizeLimit > 0 && size > containerSizeLimit) {
-      throw new TProtocolException(TProtocolException.Type.SIZE_LIMIT);
-    }
-    return size;
-  }
-
-  void readJsonSyntaxChar(ubyte[1] ch) {
-    return readSyntaxChar(reader_, ch);
-  }
-
-  wchar readJsonEscapeChar() {
-    auto a = reader_.read();
-    auto b = reader_.read();
-    auto c = reader_.read();
-    auto d = reader_.read();
-    return cast(ushort)(
-          (hexVal(a[0]) << 12) + (hexVal(b[0]) << 8) +
-          (hexVal(c[0]) << 4) + hexVal(d[0])
-        );
-  }
-
-  string readJsonString(bool skipContext = false) {
-    if (!skipContext) context_.read(reader_);
-
-    readJsonSyntaxChar(STRING_DELIMITER);
-    auto buffer = appender!string();
-
-    wchar[] wchs;
-    int bytesRead;
-    while (true) {
-      auto ch = reader_.read();
-      if (ch == STRING_DELIMITER) {
-        break;
-      }
-
-      ++bytesRead;
-      if (stringSizeLimit > 0 && bytesRead > stringSizeLimit) {
-        throw new TProtocolException(TProtocolException.Type.SIZE_LIMIT);
-      }
-
-      if (ch == BACKSLASH) {
-        ch = reader_.read();
-        if (ch == ESCAPE_CHAR) {
-          auto wch = readJsonEscapeChar();
-          if (wch >= 0xD800 && wch <= 0xDBFF) {
-            wchs ~= wch;
-          } else if (wch >= 0xDC00 && wch <= 0xDFFF && wchs.length == 0) {
-            throw new TProtocolException("Missing UTF-16 high surrogate.",
-                                         TProtocolException.Type.INVALID_DATA);
-          } else {
-            wchs ~= wch;
-            buffer.put(wchs.toUTF8);
-            wchs = [];
-          }
-          continue;
-        } else {
-          auto pos = countUntil(kEscapeChars[], ch[0]);
-          if (pos == -1) {
-            throw new TProtocolException("Expected control char, got '" ~
-              cast(char)ch[0] ~ "'.", TProtocolException.Type.INVALID_DATA);
-          }
-          ch = kEscapeCharVals[pos];
-        }
-      }
-      if (wchs.length != 0) {
-        throw new TProtocolException("Missing UTF-16 low surrogate.",
-                                     TProtocolException.Type.INVALID_DATA);
-      }
-      buffer.put(ch[0]);
-    }
-
-    if (wchs.length != 0) {
-      throw new TProtocolException("Missing UTF-16 low surrogate.",
-                                   TProtocolException.Type.INVALID_DATA);
-    }
-    return buffer.data;
-  }
-
-  // Reads a sequence of characters, stopping at the first one that is not
-  // a valid Json numeric character.
-  string readJsonNumericChars() {
-    string str;
-    while (true) {
-      auto ch = reader_.peek();
-      if (!isJsonNumeric(ch[0])) {
-        break;
-      }
-      reader_.read();
-      str ~= ch;
-    }
-    return str;
-  }
-
-  // Reads a sequence of characters and assembles them into a number,
-  // returning them via num
-  T readJsonInteger(T)() if (isIntegral!T) {
-    context_.read(reader_);
-    if (context_.escapeNum()) {
-      readJsonSyntaxChar(STRING_DELIMITER);
-    }
-    auto str = readJsonNumericChars();
-    T num;
-    try {
-      num = to!T(str);
-    } catch (ConvException e) {
-      throw new TProtocolException(`Expected numeric value, got "` ~ str ~ `".`,
-        TProtocolException.Type.INVALID_DATA);
-    }
-    if (context_.escapeNum()) {
-      readJsonSyntaxChar(STRING_DELIMITER);
-    }
-    return num;
-  }
-
-  void readJsonObjectBegin() {
-    context_.read(reader_);
-    readJsonSyntaxChar(OBJECT_BEGIN);
-    pushContext(new PairContext());
-  }
-
-  void readJsonObjectEnd() {
-    readJsonSyntaxChar(OBJECT_END);
-    popContext();
-  }
-
-  void readJsonArrayBegin() {
-    context_.read(reader_);
-    readJsonSyntaxChar(ARRAY_BEGIN);
-    pushContext(new ListContext());
-  }
-
-  void readJsonArrayEnd() {
-    readJsonSyntaxChar(ARRAY_END);
-    popContext();
-  }
-
-  static {
-    final class LookaheadReader {
-      this(Transport trans) {
-        trans_ = trans;
-      }
-
-      ubyte[1] read() {
-        if (hasData_) {
-          hasData_ = false;
-        } else {
-          trans_.readAll(data_);
-        }
-        return data_;
-      }
-
-      ubyte[1] peek() {
-        if (!hasData_) {
-          trans_.readAll(data_);
-          hasData_ = true;
-        }
-        return data_;
-      }
-
-     private:
-      Transport trans_;
-      bool hasData_;
-      ubyte[1] data_;
-    }
-
-    /*
-     * Class to serve as base Json context and as base class for other context
-     * implementations
-     */
-    class Context {
-      /**
-       * Write context data to the transport. Default is to do nothing.
-       */
-      void write(Transport trans) {}
-
-      /**
-       * Read context data from the transport. Default is to do nothing.
-       */
-      void read(LookaheadReader reader) {}
-
-      /**
-       * Return true if numbers need to be escaped as strings in this context.
-       * Default behavior is to return false.
-       */
-      bool escapeNum() @property {
-        return false;
-      }
-    }
-
-    // Context class for object member key-value pairs
-    class PairContext : Context {
-      this() {
-        first_ = true;
-        colon_ = true;
-      }
-
-      override void write(Transport trans) {
-        if (first_) {
-          first_ = false;
-          colon_ = true;
-        } else {
-          trans.write(colon_ ? PAIR_SEP : ELEM_SEP);
-          colon_ = !colon_;
-        }
-      }
-
-      override void read(LookaheadReader reader) {
-        if (first_) {
-          first_ = false;
-          colon_ = true;
-        } else {
-          auto ch = (colon_ ? PAIR_SEP : ELEM_SEP);
-          colon_ = !colon_;
-          return readSyntaxChar(reader, ch);
-        }
-      }
-
-      // Numbers must be turned into strings if they are the key part of a pair
-      override bool escapeNum() @property {
-        return colon_;
-      }
-
-    private:
-      bool first_;
-      bool colon_;
-    }
-
-    class ListContext : Context {
-      this() {
-        first_ = true;
-      }
-
-      override void write(Transport trans) {
-        if (first_) {
-          first_ = false;
-        } else {
-          trans.write(ELEM_SEP);
-        }
-      }
-
-      override void read(LookaheadReader reader) {
-        if (first_) {
-          first_ = false;
-        } else {
-          readSyntaxChar(reader, ELEM_SEP);
-        }
-      }
-
-    private:
-      bool first_;
-    }
-
-    // Read 1 character from the transport trans and verify that it is the
-    // expected character ch.
-    // Throw a protocol exception if it is not.
-    void readSyntaxChar(LookaheadReader reader, ubyte[1] ch) {
-      auto ch2 = reader.read();
-      if (ch2 != ch) {
-        throw new TProtocolException("Expected '" ~ cast(char)ch[0] ~ "', got '" ~
-          cast(char)ch2[0] ~ "'.", TProtocolException.Type.INVALID_DATA);
-      }
-    }
-  }
-
-  // Probably need to implement a better stack at some point.
-  Context[] contextStack_;
-  Context context_;
-
-  Transport trans_;
-  LookaheadReader reader_;
-}
-
-/**
- * TJsonProtocol construction helper to avoid having to explicitly specify
- * the transport type, i.e. to allow the constructor being called using IFTI
- * (see $(LINK2 http://d.puremagic.com/issues/show_bug.cgi?id=6082, D Bugzilla
- * enhancement requet 6082)).
- */
-TJsonProtocol!Transport tJsonProtocol(Transport)(Transport trans,
-  int containerSizeLimit = 0, int stringSizeLimit = 0
-) if (isTTransport!Transport) {
-  return new TJsonProtocol!Transport(trans, containerSizeLimit, stringSizeLimit);
-}
-
-unittest {
-  import std.exception;
-  import thrift.transport.memory;
-
-  // Check the message header format.
-  auto buf = new TMemoryBuffer;
-  auto json = tJsonProtocol(buf);
-  json.writeMessageBegin(TMessage("foo", TMessageType.CALL, 0));
-  json.writeMessageEnd();
-
-  auto header = new ubyte[13];
-  buf.readAll(header);
-  enforce(cast(char[])header == `[1,"foo",1,0]`);
-}
-
-unittest {
-  import std.exception;
-  import thrift.transport.memory;
-
-  // Check that short binary data is read correctly (the Thrift JSON format
-  // does not include padding chars in the Base64 encoded data).
-  auto buf = new TMemoryBuffer;
-  auto json = tJsonProtocol(buf);
-  json.writeBinary([1, 2]);
-  json.reset();
-  enforce(json.readBinary() == [1, 2]);
-}
-
-unittest {
-  import std.exception;
-  import thrift.transport.memory;
-
-  auto buf = new TMemoryBuffer(cast(ubyte[])"\"\\u0e01 \\ud835\\udd3e\"");
-  auto json = tJsonProtocol(buf);
-  auto str = json.readString();
-  enforce(str == "ก 𝔾");
-}
-
-unittest {
-  // Thrown if low surrogate is missing.
-  import std.exception;
-  import thrift.transport.memory;
-
-  auto buf = new TMemoryBuffer(cast(ubyte[])"\"\\u0e01 \\ud835\"");
-  auto json = tJsonProtocol(buf);
-  assertThrown!TProtocolException(json.readString());
-}
-
-unittest {
-  // Thrown if high surrogate is missing.
-  import std.exception;
-  import thrift.transport.memory;
-
-  auto buf = new TMemoryBuffer(cast(ubyte[])"\"\\u0e01 \\udd3e\"");
-  auto json = tJsonProtocol(buf);
-  assertThrown!TProtocolException(json.readString());
-}
-
-unittest {
-  import thrift.internal.test.protocol;
-  testContainerSizeLimit!(TJsonProtocol!())();
-  testStringSizeLimit!(TJsonProtocol!())();
-}
-
-/**
- * TProtocolFactory creating a TJsonProtocol instance for passed in
- * transports.
- *
- * The optional Transports template tuple parameter can be used to specify
- * one or more TTransport implementations to specifically instantiate
- * TJsonProtocol for. If the actual transport types encountered at
- * runtime match one of the transports in the list, a specialized protocol
- * instance is created. Otherwise, a generic TTransport version is used.
- */
-class TJsonProtocolFactory(Transports...) if (
-  allSatisfy!(isTTransport, Transports)
-) : TProtocolFactory {
-  TProtocol getProtocol(TTransport trans) const {
-    foreach (Transport; TypeTuple!(Transports, TTransport)) {
-      auto concreteTrans = cast(Transport)trans;
-      if (concreteTrans) {
-        auto p = new TJsonProtocol!Transport(concreteTrans);
-        return p;
-      }
-    }
-    throw new TProtocolException(
-      "Passed null transport to TJsonProtocolFactoy.");
-  }
-}
-
-private {
-  immutable ubyte[1] OBJECT_BEGIN = '{';
-  immutable ubyte[1] OBJECT_END = '}';
-  immutable ubyte[1] ARRAY_BEGIN = '[';
-  immutable ubyte[1] ARRAY_END = ']';
-  immutable ubyte[1] NEWLINE = '\n';
-  immutable ubyte[1] PAIR_SEP = ':';
-  immutable ubyte[1] ELEM_SEP = ',';
-  immutable ubyte[1] BACKSLASH = '\\';
-  immutable ubyte[1] STRING_DELIMITER = '"';
-  immutable ubyte[1] ZERO_CHAR = '0';
-  immutable ubyte[1] ESCAPE_CHAR = 'u';
-  immutable ubyte[4] ESCAPE_PREFIX = cast(ubyte[4])r"\u00";
-
-  enum THRIFT_JSON_VERSION = 1;
-
-  immutable NAN_STRING = "NaN";
-  immutable INFINITY_STRING = "Infinity";
-  immutable NEG_INFINITY_STRING = "-Infinity";
-
-  string getNameFromTType(TType typeID) {
-    final switch (typeID) {
-      case TType.BOOL:
-        return "tf";
-      case TType.BYTE:
-        return "i8";
-      case TType.I16:
-        return "i16";
-      case TType.I32:
-        return "i32";
-      case TType.I64:
-        return "i64";
-      case TType.DOUBLE:
-        return "dbl";
-      case TType.STRING:
-        return "str";
-      case TType.STRUCT:
-        return "rec";
-      case TType.MAP:
-        return "map";
-      case TType.LIST:
-        return "lst";
-      case TType.SET:
-        return "set";
-      case TType.STOP: goto case;
-      case TType.VOID:
-        assert(false, "Invalid type passed.");
-    }
-  }
-
-  TType getTTypeFromName(string name) {
-    TType result;
-    if (name.length > 1) {
-      switch (name[0]) {
-        case 'd':
-          result = TType.DOUBLE;
-          break;
-        case 'i':
-          switch (name[1]) {
-            case '8':
-              result = TType.BYTE;
-              break;
-            case '1':
-              result = TType.I16;
-              break;
-            case '3':
-              result = TType.I32;
-              break;
-            case '6':
-              result = TType.I64;
-              break;
-            default:
-              // Do nothing.
-          }
-          break;
-        case 'l':
-          result = TType.LIST;
-          break;
-        case 'm':
-          result = TType.MAP;
-          break;
-        case 'r':
-          result = TType.STRUCT;
-          break;
-        case 's':
-          if (name[1] == 't') {
-            result = TType.STRING;
-          }
-          else if (name[1] == 'e') {
-            result = TType.SET;
-          }
-          break;
-        case 't':
-          result = TType.BOOL;
-          break;
-        default:
-          // Do nothing.
-      }
-    }
-    if (result == TType.STOP) {
-      throw new TProtocolException("Unrecognized type",
-        TProtocolException.Type.NOT_IMPLEMENTED);
-    }
-    return result;
-  }
-
-  // This table describes the handling for the first 0x30 characters
-  //  0 : escape using "\u00xx" notation
-  //  1 : just output index
-  // <other> : escape using "\<other>" notation
-  immutable ubyte[0x30] kJsonCharTable = [
-  //  0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-      0,  0,  0,  0,  0,  0,  0,  0,'b','t','n',  0,'f','r',  0,  0, // 0
-      0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 1
-      1,  1,'"',  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, // 2
-  ];
-
-  // This string's characters must match up with the elements in kEscapeCharVals.
-  // I don't have '/' on this list even though it appears on www.json.org --
-  // it is not in the RFC
-  immutable kEscapeChars = cast(ubyte[7]) `"\\bfnrt`;
-
-  // The elements of this array must match up with the sequence of characters in
-  // kEscapeChars
-  immutable ubyte[7] kEscapeCharVals = [
-    '"', '\\', '\b', '\f', '\n', '\r', '\t',
-  ];
-
-  // Return the integer value of a hex character ch.
-  // Throw a protocol exception if the character is not [0-9a-f].
-  ubyte hexVal(ubyte ch) {
-    if ((ch >= '0') && (ch <= '9')) {
-      return cast(ubyte)(ch - '0');
-    } else if ((ch >= 'a') && (ch <= 'f')) {
-      return cast(ubyte)(ch - 'a' + 10);
-    }
-    else {
-      throw new TProtocolException("Expected hex val ([0-9a-f]), got '" ~
-        ch ~ "'.", TProtocolException.Type.INVALID_DATA);
-    }
-  }
-
-  // Return the hex character representing the integer val. The value is masked
-  // to make sure it is in the correct range.
-  ubyte hexChar(ubyte val) {
-    val &= 0x0F;
-    if (val < 10) {
-      return cast(ubyte)(val + '0');
-    } else {
-      return cast(ubyte)(val - 10 + 'a');
-    }
-  }
-
-  // Return true if the character ch is in [-+0-9.Ee]; false otherwise
-  bool isJsonNumeric(ubyte ch) {
-    switch (ch) {
-      case '+':
-      case '-':
-      case '.':
-      case '0':
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      case '7':
-      case '8':
-      case '9':
-      case 'E':
-      case 'e':
-        return true;
-      default:
-        return false;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/processor.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/processor.d
deleted file mode 100644
index 887421c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/protocol/processor.d
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.protocol.processor;
-
-// Use selective import once DMD @@BUG314@@ is fixed.
-import std.variant /+ : Variant +/;
-import thrift.protocol.base;
-import thrift.transport.base;
-
-/**
- * A processor is a generic object which operates upon an input stream and
- * writes to some output stream.
- *
- * The definition of this object is loose, though the typical case is for some
- * sort of server that either generates responses to an input stream or
- * forwards data from one pipe onto another.
- *
- * An implementation can optionally allow one or more TProcessorEventHandlers
- * to be attached, providing an interface to hook custom code into the
- * handling process, which can be used e.g. for gathering statistics.
- */
-interface TProcessor {
-  ///
-  bool process(TProtocol iprot, TProtocol oprot,
-    Variant connectionContext = Variant()
-  ) in {
-    assert(iprot);
-    assert(oprot);
-  }
-
-  ///
-  final bool process(TProtocol prot, Variant connectionContext = Variant()) {
-    return process(prot, prot, connectionContext);
-  }
-}
-
-/**
- * Handles events from a processor.
- */
-interface TProcessorEventHandler {
-  /**
-   * Called before calling other callback methods.
-   *
-   * Expected to return some sort of »call context«, which is passed to all
-   * other callbacks for that function invocation.
-   */
-  Variant createContext(string methodName, Variant connectionContext);
-
-  /**
-   * Called when handling the method associated with a context has been
-   * finished – can be used to perform clean up work.
-   */
-  void deleteContext(Variant callContext, string methodName);
-
-  /**
-   * Called before reading arguments.
-   */
-  void preRead(Variant callContext, string methodName);
-
-  /**
-   * Called between reading arguments and calling the handler.
-   */
-  void postRead(Variant callContext, string methodName);
-
-  /**
-   * Called between calling the handler and writing the response.
-   */
-  void preWrite(Variant callContext, string methodName);
-
-  /**
-   * Called after writing the response.
-   */
-  void postWrite(Variant callContext, string methodName);
-
-  /**
-   * Called when handling a one-way function call is completed successfully.
-   */
-  void onewayComplete(Variant callContext, string methodName);
-
-  /**
-   * Called if the handler throws an undeclared exception.
-   */
-  void handlerError(Variant callContext, string methodName, Exception e);
-}
-
-struct TConnectionInfo {
-  /// The input and output protocols.
-  TProtocol input;
-  TProtocol output; /// Ditto.
-
-  /// The underlying transport used for the connection
-  /// This is the transport that was returned by TServerTransport.accept(),
-  /// and it may be different than the transport pointed to by the input and
-  /// output protocols.
-  TTransport transport;
-}
-
-interface TProcessorFactory {
-  /**
-   * Get the TProcessor to use for a particular connection.
-   *
-   * This method is always invoked in the same thread that the connection was
-   * accepted on, which is always the same thread for all current server
-   * implementations.
-   */
-  TProcessor getProcessor(ref const(TConnectionInfo) connInfo);
-}
-
-/**
- * The default processor factory which always returns the same instance.
- */
-class TSingletonProcessorFactory : TProcessorFactory {
-  /**
-   * Creates a new instance.
-   *
-   * Params:
-   *   processor = The processor object to return from getProcessor().
-   */
-  this(TProcessor processor) {
-    processor_ = processor;
-  }
-
-  override TProcessor getProcessor(ref const(TConnectionInfo) connInfo) {
-    return processor_;
-  }
-
-private:
-  TProcessor processor_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/base.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/base.d
deleted file mode 100644
index f97adbe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/base.d
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.server.base;
-
-import std.variant : Variant;
-import thrift.protocol.base;
-import thrift.protocol.binary;
-import thrift.protocol.processor;
-import thrift.server.transport.base;
-import thrift.transport.base;
-import thrift.util.cancellation;
-
-/**
- * Base class for all Thrift servers.
- *
- * By setting the eventHandler property to a TServerEventHandler
- * implementation, custom code can be integrated into the processing pipeline,
- * which can be used e.g. for gathering statistics.
- */
-class TServer {
-  /**
-   * Starts serving.
-   *
-   * Blocks until the server finishes, i.e. a serious problem occurred or the
-   * cancellation request has been triggered.
-   *
-   * Server implementations are expected to implement cancellation in a best-
-   * effort way – usually, it should be possible to immediately stop accepting
-   * connections and return after all currently active clients have been
-   * processed, but this might not be the case for every conceivable
-   * implementation.
-   */
-  abstract void serve(TCancellation cancellation = null);
-
-  /// The server event handler to notify. Null by default.
-  TServerEventHandler eventHandler;
-
-protected:
-  this(
-    TProcessor processor,
-    TServerTransport serverTransport,
-    TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory
-  ) {
-    this(processor, serverTransport, transportFactory, transportFactory,
-      protocolFactory, protocolFactory);
-  }
-
-  this(
-    TProcessorFactory processorFactory,
-    TServerTransport serverTransport,
-    TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory
-  ) {
-    this(processorFactory, serverTransport, transportFactory, transportFactory,
-      protocolFactory, protocolFactory);
-  }
-
-  this(
-    TProcessor processor,
-    TServerTransport serverTransport,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory
-  ) {
-    this(new TSingletonProcessorFactory(processor), serverTransport,
-      inputTransportFactory, outputTransportFactory,
-      inputProtocolFactory, outputProtocolFactory);
-  }
-
-  this(
-    TProcessorFactory processorFactory,
-    TServerTransport serverTransport,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory
-  ) {
-    import std.exception;
-    import thrift.base;
-    enforce(inputTransportFactory,
-      new TException("Input transport factory must not be null."));
-    enforce(outputTransportFactory,
-      new TException("Output transport factory must not be null."));
-    enforce(inputProtocolFactory,
-      new TException("Input protocol factory must not be null."));
-    enforce(outputProtocolFactory,
-      new TException("Output protocol factory must not be null."));
-
-    processorFactory_ = processorFactory;
-    serverTransport_ = serverTransport;
-    inputTransportFactory_ = inputTransportFactory;
-    outputTransportFactory_ = outputTransportFactory;
-    inputProtocolFactory_ = inputProtocolFactory;
-    outputProtocolFactory_ = outputProtocolFactory;
-  }
-
-  TProcessorFactory processorFactory_;
-  TServerTransport serverTransport_;
-  TTransportFactory inputTransportFactory_;
-  TTransportFactory outputTransportFactory_;
-  TProtocolFactory inputProtocolFactory_;
-  TProtocolFactory outputProtocolFactory_;
-}
-
-/**
- * Handles events from a TServer core.
- */
-interface TServerEventHandler {
-  /**
-   * Called before the server starts accepting connections.
-   */
-  void preServe();
-
-  /**
-   * Called when a new client has connected and processing is about to begin.
-   */
-  Variant createContext(TProtocol input, TProtocol output);
-
-  /**
-   * Called when request handling for a client has been finished – can be used
-   * to perform clean up work.
-   */
-  void deleteContext(Variant serverContext, TProtocol input, TProtocol output);
-
-  /**
-   * Called when the processor for a client call is about to be invoked.
-   */
-  void preProcess(Variant serverContext, TTransport transport);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/nonblocking.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/nonblocking.d
deleted file mode 100644
index 0216799..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/nonblocking.d
+++ /dev/null
@@ -1,1397 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * A non-blocking server implementation that operates a set of I/O threads (by
- * default only one) and either does processing »in-line« or off-loads it to a
- * task pool.
- *
- * It *requires* TFramedTransport to be used on the client side, as it expects
- * a 4 byte length indicator and writes out responses using the same framing.
- *
- * Because I/O is done asynchronous/event based, unfortunately
- * TServerTransport can't be used.
- *
- * This implementation is based on the C++ one, with the exception of request
- * timeouts and the drain task queue overload handling strategy not being
- * implemented yet.
- */
-// This really should use a D non-blocking I/O library, once one becomes
-// available.
-module thrift.server.nonblocking;
-
-import core.atomic : atomicLoad, atomicStore, atomicOp;
-import core.exception : onOutOfMemoryError;
-import core.memory : GC;
-import core.sync.mutex;
-import core.stdc.stdlib : free, realloc;
-import core.time : Duration, dur;
-import core.thread : Thread, ThreadGroup;
-import deimos.event2.event;
-import std.array : empty;
-import std.conv : emplace, to;
-import std.exception : enforce;
-import std.parallelism : TaskPool, task;
-import std.socket : Socket, socketPair, SocketAcceptException,
-  SocketException, TcpSocket;
-import std.variant : Variant;
-import thrift.base;
-import thrift.internal.endian;
-import thrift.internal.socket;
-import thrift.internal.traits;
-import thrift.protocol.base;
-import thrift.protocol.binary;
-import thrift.protocol.processor;
-import thrift.server.base;
-import thrift.server.transport.socket;
-import thrift.transport.base;
-import thrift.transport.memory;
-import thrift.transport.range;
-import thrift.transport.socket;
-import thrift.util.cancellation;
-
-/**
- * Possible actions taken on new incoming connections when the server is
- * overloaded.
- */
-enum TOverloadAction {
-  /// Do not take any special actions while the server is overloaded, just
-  /// continue accepting connections.
-  NONE,
-
-  /// Immediately drop new connections after they have been accepted if the
-  /// server is overloaded.
-  CLOSE_ON_ACCEPT
-}
-
-///
-class TNonblockingServer : TServer {
-  ///
-  this(TProcessor processor, ushort port, TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory, TaskPool taskPool = null
-  ) {
-    this(new TSingletonProcessorFactory(processor), port, transportFactory,
-      transportFactory, protocolFactory, protocolFactory, taskPool);
-  }
-
-  ///
-  this(TProcessorFactory processorFactory, ushort port,
-    TTransportFactory transportFactory, TProtocolFactory protocolFactory,
-    TaskPool taskPool = null
-  ) {
-    this(processorFactory, port, transportFactory, transportFactory,
-      protocolFactory, protocolFactory, taskPool);
-  }
-
-  ///
-  this(
-    TProcessor processor,
-    ushort port,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory,
-    TaskPool taskPool = null
-  ) {
-    this(new TSingletonProcessorFactory(processor), port,
-      inputTransportFactory, outputTransportFactory,
-      inputProtocolFactory, outputProtocolFactory, taskPool);
-  }
-
-  ///
-  this(
-    TProcessorFactory processorFactory,
-    ushort port,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory,
-    TaskPool taskPool = null
-  ) {
-    super(processorFactory, null, inputTransportFactory,
-      outputTransportFactory, inputProtocolFactory, outputProtocolFactory);
-    port_ = port;
-
-    this.taskPool = taskPool;
-
-    connectionMutex_ = new Mutex;
-
-    connectionStackLimit = DEFAULT_CONNECTION_STACK_LIMIT;
-    maxActiveProcessors = DEFAULT_MAX_ACTIVE_PROCESSORS;
-    maxConnections = DEFAULT_MAX_CONNECTIONS;
-    overloadHysteresis = DEFAULT_OVERLOAD_HYSTERESIS;
-    overloadAction = DEFAULT_OVERLOAD_ACTION;
-    writeBufferDefaultSize = DEFAULT_WRITE_BUFFER_DEFAULT_SIZE;
-    idleReadBufferLimit = DEFAULT_IDLE_READ_BUFFER_LIMIT;
-    idleWriteBufferLimit = DEFAULT_IDLE_WRITE_BUFFER_LIMIT;
-    resizeBufferEveryN = DEFAULT_RESIZE_BUFFER_EVERY_N;
-    maxFrameSize = DEFAULT_MAX_FRAME_SIZE;
-    numIOThreads_ = DEFAULT_NUM_IO_THREADS;
-  }
-
-  override void serve(TCancellation cancellation = null) {
-    if (cancellation && cancellation.triggered) return;
-
-    // Initialize the listening socket.
-    // TODO: SO_KEEPALIVE, TCP_LOW_MIN_RTO, etc.
-    listenSocket_ = makeSocketAndListen(port_, TServerSocket.ACCEPT_BACKLOG,
-      BIND_RETRY_LIMIT, BIND_RETRY_DELAY, 0, 0, ipv6Only_);
-    listenSocket_.blocking = false;
-
-    logInfo("Using %s I/O thread(s).", numIOThreads_);
-    if (taskPool_) {
-      logInfo("Using task pool with size: %s.", numIOThreads_, taskPool_.size);
-    }
-
-    assert(numIOThreads_ > 0);
-    assert(ioLoops_.empty);
-    foreach (id; 0 .. numIOThreads_) {
-      // The IO loop on the first IO thread (this thread, i.e. the one serve()
-      // is called from) also accepts new connections.
-      auto listenSocket = (id == 0 ? listenSocket_ : null);
-      ioLoops_ ~= new IOLoop(this, listenSocket);
-    }
-
-    if (cancellation) {
-      cancellation.triggering.addCallback({
-        foreach (i, loop; ioLoops_) loop.stop();
-
-        // Stop accepting new connections right away.
-        listenSocket_.close();
-        listenSocket_ = null;
-      });
-    }
-
-    // Start the IO helper threads for all but the first loop, which we will run
-    // ourselves. Note that the threads run forever, only terminating if stop()
-    // is called.
-    auto threads = new ThreadGroup();
-    foreach (loop; ioLoops_[1 .. $]) {
-      auto t = new Thread(&loop.run);
-      threads.add(t);
-      t.start();
-    }
-
-    if (eventHandler) eventHandler.preServe();
-
-    // Run the primary (listener) IO thread loop in our main thread; this will
-    // block until the server is shutting down.
-    ioLoops_[0].run();
-
-    // Ensure all threads are finished before leaving serve().
-    threads.joinAll();
-
-    ioLoops_ = null;
-  }
-
-  /**
-   * Returns the number of currently active connections, i.e. open sockets.
-   */
-  size_t numConnections() const @property {
-    return numConnections_;
-  }
-
-  /**
-   * Returns the number of connection objects allocated, but not in use.
-   */
-  size_t numIdleConnections() const @property {
-    return connectionStack_.length;
-  }
-
-  /**
-   * Return count of number of connections which are currently processing.
-   *
-   * This is defined as a connection where all data has been received, and the
-   * processor was invoked but has not yet completed.
-   */
-  size_t numActiveProcessors() const @property {
-    return numActiveProcessors_;
-  }
-
-  /// Number of bind() retries.
-  enum BIND_RETRY_LIMIT = 0;
-
-  /// Duration between bind() retries.
-  enum BIND_RETRY_DELAY = dur!"hnsecs"(0);
-
-  /// Whether to listen on IPv6 only, if IPv6 support is detected
-  // (default: false).
-  void ipv6Only(bool value) @property {
-    ipv6Only_ = value;
-  }
-
-  /**
-   * The task pool to use for processing requests. If null, no additional
-   * threads are used and request are processed »inline«.
-   *
-   * Can safely be set even when the server is already running.
-   */
-  TaskPool taskPool() @property {
-    return taskPool_;
-  }
-
-  /// ditto
-  void taskPool(TaskPool pool) @property {
-    taskPool_ = pool;
-  }
-
-  /**
-   * Hysteresis for overload state.
-   *
-   * This is the fraction of the overload value that needs to be reached
-   * before the overload state is cleared. It must be between 0 and 1,
-   * practical choices probably lie between 0.5 and 0.9.
-   */
-  double overloadHysteresis() const @property {
-    return overloadHysteresis_;
-  }
-
-  /// Ditto
-  void overloadHysteresis(double value) @property {
-    enforce(0 < value && value <= 1,
-      "Invalid value for overload hysteresis: " ~ to!string(value));
-    overloadHysteresis_ = value;
-  }
-
-  /// Ditto
-  enum DEFAULT_OVERLOAD_HYSTERESIS = 0.8;
-
-  /**
-   * The action which will be taken on overload.
-   */
-  TOverloadAction overloadAction;
-
-  /// Ditto
-  enum DEFAULT_OVERLOAD_ACTION = TOverloadAction.NONE;
-
-  /**
-   * The write buffer is initialized (and when idleWriteBufferLimit_ is checked
-   * and found to be exceeded, reinitialized) to this size.
-   */
-  size_t writeBufferDefaultSize;
-
-  /// Ditto
-  enum size_t DEFAULT_WRITE_BUFFER_DEFAULT_SIZE = 1024;
-
-  /**
-   * Max read buffer size for an idle Connection. When we place an idle
-   * Connection into connectionStack_ or on every resizeBufferEveryN_ calls,
-   * we will free the buffer (such that it will be reinitialized by the next
-   * received frame) if it has exceeded this limit. 0 disables this check.
-   */
-  size_t idleReadBufferLimit;
-
-  /// Ditto
-  enum size_t DEFAULT_IDLE_READ_BUFFER_LIMIT = 1024;
-
-  /**
-   * Max write buffer size for an idle connection.  When we place an idle
-   * Connection into connectionStack_ or on every resizeBufferEveryN_ calls,
-   * we ensure that its write buffer is <= to this size; otherwise we
-   * replace it with a new one of writeBufferDefaultSize_ bytes to ensure that
-   * idle connections don't hog memory. 0 disables this check.
-   */
-  size_t idleWriteBufferLimit;
-
-  /// Ditto
-  enum size_t DEFAULT_IDLE_WRITE_BUFFER_LIMIT = 1024;
-
-  /**
-   * Every N calls we check the buffer size limits on a connected Connection.
-   * 0 disables (i.e. the checks are only done when a connection closes).
-   */
-  uint resizeBufferEveryN;
-
-  /// Ditto
-  enum uint DEFAULT_RESIZE_BUFFER_EVERY_N = 512;
-
-  /// Limit for how many Connection objects to cache.
-  size_t connectionStackLimit;
-
-  /// Ditto
-  enum size_t DEFAULT_CONNECTION_STACK_LIMIT = 1024;
-
-  /// Limit for number of open connections before server goes into overload
-  /// state.
-  size_t maxConnections;
-
-  /// Ditto
-  enum size_t DEFAULT_MAX_CONNECTIONS = int.max;
-
-  /// Limit for number of connections processing or waiting to process
-  size_t maxActiveProcessors;
-
-  /// Ditto
-  enum size_t DEFAULT_MAX_ACTIVE_PROCESSORS = int.max;
-
-  /// Maximum frame size, in bytes.
-  ///
-  /// If a client tries to send a message larger than this limit, its
-  /// connection will be closed. This helps to avoid allocating huge buffers
-  /// on bogous input.
-  uint maxFrameSize;
-
-  /// Ditto
-  enum uint DEFAULT_MAX_FRAME_SIZE = 256 * 1024 * 1024;
-
-
-  size_t numIOThreads() @property {
-    return numIOThreads_;
-  }
-
-  void numIOThreads(size_t value) @property {
-    enforce(value >= 1, new TException("Must use at least one I/O thread."));
-    numIOThreads_ = value;
-  }
-
-  enum DEFAULT_NUM_IO_THREADS = 1;
-
-private:
-  /**
-   * C callback wrapper around acceptConnections(). Expects the custom argument
-   * to be the this pointer of the associated server instance.
-   */
-  extern(C) static void acceptConnectionsCallback(int fd, short which,
-    void* serverThis
-  ) {
-    (cast(TNonblockingServer)serverThis).acceptConnections(fd, which);
-  }
-
-  /**
-   * Called by libevent (IO loop 0/serve() thread only) when something
-   * happened on the listening socket.
-   */
-  void acceptConnections(int fd, short eventFlags) {
-    if (atomicLoad(ioLoops_[0].shuttingDown_)) return;
-
-    assert(!!listenSocket_,
-      "Server should be shutting down if listen socket is null.");
-    assert(fd == listenSocket_.handle);
-    assert(eventFlags & EV_READ);
-
-    // Accept as many new clients as possible, even though libevent signaled
-    // only one. This helps the number of calls into libevent space.
-    while (true) {
-      // It is lame to use exceptions for regular control flow (failing is
-      // excepted due to non-blocking mode of operation), but that's the
-      // interface std.socket offers…
-      Socket clientSocket;
-      try {
-        clientSocket = listenSocket_.accept();
-      } catch (SocketAcceptException e) {
-        if (e.errorCode != WOULD_BLOCK_ERRNO) {
-          logError("Error accepting connection: %s", e);
-        }
-        break;
-      }
-
-      // If the server is overloaded, this is the point to take the specified
-      // action.
-      if (overloadAction != TOverloadAction.NONE && checkOverloaded()) {
-        nConnectionsDropped_++;
-        nTotalConnectionsDropped_++;
-        if (overloadAction == TOverloadAction.CLOSE_ON_ACCEPT) {
-          clientSocket.close();
-          return;
-        }
-      }
-
-      try {
-        clientSocket.blocking = false;
-      } catch (SocketException e) {
-        logError("Couldn't set client socket to non-blocking mode: %s", e);
-        clientSocket.close();
-        return;
-      }
-
-      // Create a new Connection for this client socket.
-      Connection conn = void;
-      IOLoop loop = void;
-      bool thisThread = void;
-      synchronized (connectionMutex_) {
-        // Assign an I/O loop to the connection (round-robin).
-        assert(nextIOLoop_ >= 0);
-        assert(nextIOLoop_ < ioLoops_.length);
-        auto selectedThreadIdx = nextIOLoop_;
-        nextIOLoop_ = (nextIOLoop_ + 1) % ioLoops_.length;
-
-        loop = ioLoops_[selectedThreadIdx];
-        thisThread = (selectedThreadIdx == 0);
-
-        // Check the connection stack to see if we can re-use an existing one.
-        if (connectionStack_.empty) {
-          ++numConnections_;
-          conn = new Connection(clientSocket, loop);
-
-          // Make sure the connection does not get collected while it is active,
-          // i.e. hooked up with libevent.
-          GC.addRoot(cast(void*)conn);
-        } else {
-          conn = connectionStack_[$ - 1];
-          connectionStack_ = connectionStack_[0 .. $ - 1];
-          connectionStack_.assumeSafeAppend();
-          conn.init(clientSocket, loop);
-        }
-      }
-
-      loop.addConnection();
-
-      // Either notify the ioThread that is assigned this connection to
-      // start processing, or if it is us, we'll just ask this
-      // connection to do its initial state change here.
-      //
-      // (We need to avoid writing to our own notification pipe, to
-      // avoid possible deadlocks if the pipe is full.)
-      if (thisThread) {
-        conn.transition();
-      } else {
-        loop.notifyCompleted(conn);
-      }
-    }
-  }
-
-  /// Increment the count of connections currently processing.
-  void incrementActiveProcessors() {
-    atomicOp!"+="(numActiveProcessors_, 1);
-  }
-
-  /// Decrement the count of connections currently processing.
-  void decrementActiveProcessors() {
-    assert(numActiveProcessors_ > 0);
-    atomicOp!"-="(numActiveProcessors_, 1);
-  }
-
-  /**
-   * Determines if the server is currently overloaded.
-   *
-   * If the number of open connections or »processing« connections is over the
-   * respective limit, the server will enter overload handling mode and a
-   * warning will be logged. If below values are below the hysteresis curve,
-   * this will cause the server to exit it again.
-   *
-   * Returns: Whether the server is currently overloaded.
-   */
-  bool checkOverloaded() {
-    auto activeConnections = numConnections_ - connectionStack_.length;
-    if (numActiveProcessors_ > maxActiveProcessors ||
-        activeConnections > maxConnections) {
-      if (!overloaded_) {
-        logInfo("Entering overloaded state.");
-        overloaded_ = true;
-      }
-    } else {
-      if (overloaded_ &&
-        (numActiveProcessors_ <= overloadHysteresis_ * maxActiveProcessors) &&
-        (activeConnections <= overloadHysteresis_ * maxConnections))
-      {
-        logInfo("Exiting overloaded state, %s connection(s) dropped (% total).",
-          nConnectionsDropped_, nTotalConnectionsDropped_);
-        nConnectionsDropped_ = 0;
-        overloaded_ = false;
-      }
-    }
-
-    return overloaded_;
-  }
-
-  /**
-   * Marks a connection as inactive and either puts it back into the
-   * connection pool or leaves it for garbage collection.
-   */
-  void disposeConnection(Connection connection) {
-    synchronized (connectionMutex_) {
-      if (!connectionStackLimit ||
-        (connectionStack_.length < connectionStackLimit))
-      {
-        connection.checkIdleBufferLimit(idleReadBufferLimit,
-          idleWriteBufferLimit);
-        connectionStack_ ~= connection;
-      } else {
-        assert(numConnections_ > 0);
-        --numConnections_;
-
-        // Leave the connection object for collection now.
-        GC.removeRoot(cast(void*)connection);
-      }
-    }
-  }
-
-  /// Socket used to listen for connections and accepting them.
-  Socket listenSocket_;
-
-  /// Port to listen on.
-  ushort port_;
-
-  /// Whether to listen on IPv6 only.
-  bool ipv6Only_;
-
-  /// The total number of connections existing, both active and idle.
-  size_t numConnections_;
-
-  /// The number of connections which are currently waiting for the processor
-  /// to return.
-  shared size_t numActiveProcessors_;
-
-  /// Hysteresis for leaving overload state.
-  double overloadHysteresis_;
-
-  /// Whether the server is currently overloaded.
-  bool overloaded_;
-
-  /// Number of connections dropped since the server entered the current
-  /// overloaded state.
-  uint nConnectionsDropped_;
-
-  /// Number of connections dropped due to overload since the server started.
-  ulong nTotalConnectionsDropped_;
-
-  /// The task pool used for processing requests.
-  TaskPool taskPool_;
-
-  /// Number of IO threads this server will use (>= 1).
-  size_t numIOThreads_;
-
-  /// The IOLoops among which socket handling work is distributed.
-  IOLoop[] ioLoops_;
-
-  /// The index of the loop in ioLoops_ which will handle the next accepted
-  /// connection.
-  size_t nextIOLoop_;
-
-  /// All the connection objects which have been created but are not currently
-  /// in use. When a connection is closed, it it placed here to enable object
-  /// (resp. buffer) reuse.
-  Connection[] connectionStack_;
-
-  /// This mutex protects the connection stack.
-  Mutex connectionMutex_;
-}
-
-private {
-  /*
-   * Encapsulates a libevent event loop.
-   *
-   * The design is a bit of a mess, since the first loop is actually run on the
-   * server thread itself and is special because it is the only instance for
-   * which listenSocket_ is not null.
-   */
-  final class IOLoop {
-    /**
-     * Creates a new instance and set up the event base.
-     *
-     * If listenSocket is not null, the thread will also accept new
-     * connections itself.
-     */
-    this(TNonblockingServer server, Socket listenSocket) {
-      server_ = server;
-      listenSocket_ = listenSocket;
-      initMutex_ = new Mutex;
-    }
-
-    /**
-     * Runs the event loop; only returns after a call to stop().
-     */
-    void run() {
-      assert(!atomicLoad(initialized_), "IOLoop already running?!");
-
-      synchronized (initMutex_) {
-        if (atomicLoad(shuttingDown_)) return;
-        atomicStore(initialized_, true);
-
-        assert(!eventBase_);
-        eventBase_ = event_base_new();
-
-        if (listenSocket_) {
-          // Log the libevent version and backend.
-          logInfo("libevent version %s, using method %s.",
-            to!string(event_get_version()), to!string(event_base_get_method(eventBase_)));
-
-          // Register the event for the listening socket.
-          listenEvent_ = event_new(eventBase_, listenSocket_.handle,
-            EV_READ | EV_PERSIST | EV_ET,
-            assumeNothrow(&TNonblockingServer.acceptConnectionsCallback),
-            cast(void*)server_);
-          if (event_add(listenEvent_, null) == -1) {
-            throw new TException("event_add for the listening socket event failed.");
-          }
-        }
-
-        auto pair = socketPair();
-        foreach (s; pair) s.blocking = false;
-        completionSendSocket_ = pair[0];
-        completionReceiveSocket_ = pair[1];
-
-        // Register an event for the task completion notification socket.
-        completionEvent_ = event_new(eventBase_, completionReceiveSocket_.handle,
-          EV_READ | EV_PERSIST | EV_ET, assumeNothrow(&completedCallback),
-          cast(void*)this);
-
-        if (event_add(completionEvent_, null) == -1) {
-          throw new TException("event_add for the notification socket failed.");
-        }
-      }
-
-      // Run libevent engine, returns only after stop().
-      event_base_dispatch(eventBase_);
-
-      if (listenEvent_) {
-        event_free(listenEvent_);
-        listenEvent_ = null;
-      }
-
-      event_free(completionEvent_);
-      completionEvent_ = null;
-
-      completionSendSocket_.close();
-      completionSendSocket_ = null;
-
-      completionReceiveSocket_.close();
-      completionReceiveSocket_ = null;
-
-      event_base_free(eventBase_);
-      eventBase_ = null;
-
-      atomicStore(shuttingDown_, false);
-
-      initialized_ = false;
-    }
-
-    /**
-     * Adds a new connection handled by this loop.
-     */
-    void addConnection() {
-      ++numActiveConnections_;
-    }
-
-    /**
-     * Disposes a connection object (typically after it has been closed).
-     */
-    void disposeConnection(Connection conn) {
-      server_.disposeConnection(conn);
-      assert(numActiveConnections_ > 0);
-      --numActiveConnections_;
-      if (numActiveConnections_ == 0) {
-        if (atomicLoad(shuttingDown_)) {
-          event_base_loopbreak(eventBase_);
-        }
-      }
-    }
-
-    /**
-     * Notifies the event loop that the current step (initialization,
-     * processing of a request) on a certain connection has been completed.
-     *
-     * This function is thread-safe, but should never be called from the
-     * thread running the loop itself.
-     */
-    void notifyCompleted(Connection conn) {
-      assert(!!completionSendSocket_);
-      auto bytesSent = completionSendSocket_.send(cast(ubyte[])((&conn)[0 .. 1]));
-
-      if (bytesSent != Connection.sizeof) {
-        logError("Sending completion notification failed, connection will " ~
-          "not be properly terminated.");
-      }
-    }
-
-    /**
-     * Exits the event loop after all currently active connections have been
-     * closed.
-     *
-     * This function is thread-safe.
-     */
-    void stop() {
-      // There is a bug in either libevent or its documentation, having no
-      // events registered doesn't actually terminate the loop, because
-      // event_base_new() registers some internal one by calling
-      // evthread_make_base_notifiable().
-      // Due to this, we can't simply remove all events and expect the event
-      // loop to terminate. Instead, we ping the event loop using a null
-      // completion message. This way, we make sure to wake up the libevent
-      // thread if it not currently processing any connections. It will break
-      // out of the loop in disposeConnection() after the last active
-      // connection has been closed.
-      synchronized (initMutex_) {
-        atomicStore(shuttingDown_, true);
-        if (atomicLoad(initialized_)) notifyCompleted(null);
-      }
-    }
-
-  private:
-    /**
-     * C callback to call completed() from libevent.
-     *
-     * Expects the custom argument to be the this pointer of the associated
-     * IOLoop instance.
-     */
-    extern(C) static void completedCallback(int fd, short what, void* loopThis) {
-      assert(what & EV_READ);
-      auto loop = cast(IOLoop)loopThis;
-      assert(fd == loop.completionReceiveSocket_.handle);
-      loop.completed();
-    }
-
-    /**
-     * Reads from the completion receive socket and appropriately transitions
-     * the connections and shuts down the loop if requested.
-     */
-    void completed() {
-      Connection connection;
-      ptrdiff_t bytesRead;
-      while (true) {
-        bytesRead = completionReceiveSocket_.receive(
-          cast(ubyte[])((&connection)[0 .. 1]));
-        if (bytesRead < 0) {
-          auto errno = getSocketErrno();
-
-          if (errno != WOULD_BLOCK_ERRNO) {
-            logError("Reading from completion socket failed, some connection " ~
-              "will never be properly terminated: %s", socketErrnoString(errno));
-          }
-        }
-
-        if (bytesRead != Connection.sizeof) break;
-
-        if (!connection) {
-          assert(atomicLoad(shuttingDown_));
-          if (numActiveConnections_ == 0) {
-            event_base_loopbreak(eventBase_);
-          }
-          continue;
-        }
-
-        connection.transition();
-      }
-
-      if (bytesRead > 0) {
-        logError("Unexpected partial read from completion socket " ~
-          "(%s bytes instead of %s).", bytesRead, Connection.sizeof);
-      }
-    }
-
-    /// associated server
-    TNonblockingServer server_;
-
-    /// The managed listening socket, if any.
-    Socket listenSocket_;
-
-    /// The libevent event base for the loop.
-    event_base* eventBase_;
-
-    /// Triggered on listen socket events.
-    event* listenEvent_;
-
-    /// Triggered on completion receive socket events.
-    event* completionEvent_;
-
-    /// Socket used to send completion notification messages. Paired with
-    /// completionReceiveSocket_.
-    Socket completionSendSocket_;
-
-    /// Socket used to send completion notification messages. Paired with
-    /// completionSendSocket_.
-    Socket completionReceiveSocket_;
-
-    /// Whether the server is currently shutting down (i.e. the cancellation has
-    /// been triggered, but not all client connections have been closed yet).
-    shared bool shuttingDown_;
-
-    /// The number of currently active client connections.
-    size_t numActiveConnections_;
-
-    /// Guards loop startup so that the loop can be reliably shut down even if
-    /// another thread has just started to execute run(). Locked during
-    /// initialization in run(). When unlocked, the completion mechanism is
-    /// expected to be fully set up.
-    Mutex initMutex_;
-    shared bool initialized_; /// Ditto
-  }
-
-  /*
-   * I/O states a socket can be in.
-   */
-  enum SocketState {
-    RECV_FRAME_SIZE, /// The frame size is received.
-    RECV, /// The payload is received.
-    SEND /// The response is written back out.
-  }
-
-  /*
-   * States a connection can be in.
-   */
-  enum ConnectionState {
-    INIT, /// The connection will be initialized.
-    READ_FRAME_SIZE, /// The four frame size bytes are being read.
-    READ_REQUEST, /// The request payload itself is being read.
-    WAIT_PROCESSOR, /// The connection waits for the processor to finish.
-    SEND_RESULT /// The result is written back out.
-  }
-
-  /*
-   * A connection that is handled via libevent.
-   *
-   * Data received is buffered until the request is complete (returning back to
-   * libevent if not), at which point the processor is invoked.
-   */
-  final class Connection {
-    /**
-     * Constructs a new instance.
-     *
-     * To reuse a connection object later on, the init() function can be used
-     * to the same effect on the internal state.
-     */
-    this(Socket socket, IOLoop loop) {
-      // The input and output transport objects are reused between clients
-      // connections, so initialize them here rather than in init().
-      inputTransport_ = new TInputRangeTransport!(ubyte[])([]);
-      outputTransport_ = new TMemoryBuffer(loop.server_.writeBufferDefaultSize);
-
-      init(socket, loop);
-    }
-
-    /**
-     * Initializes the connection.
-     *
-     * Params:
-     *   socket = The socket to work on.
-     *   eventFlags = Any flags to pass to libevent.
-     *   s = The server this connection is part of.
-     */
-    void init(Socket socket, IOLoop loop) {
-      // TODO: This allocation could be avoided.
-      socket_ = new TSocket(socket);
-
-      loop_ = loop;
-      server_ = loop_.server_;
-      connState_ = ConnectionState.INIT;
-      eventFlags_ = 0;
-
-      readBufferPos_ = 0;
-      readWant_ = 0;
-
-      writeBuffer_ = null;
-      writeBufferPos_ = 0;
-      largestWriteBufferSize_ = 0;
-
-      socketState_ = SocketState.RECV_FRAME_SIZE;
-      callsSinceResize_ = 0;
-
-      factoryInputTransport_ =
-        server_.inputTransportFactory_.getTransport(inputTransport_);
-      factoryOutputTransport_ =
-        server_.outputTransportFactory_.getTransport(outputTransport_);
-
-      inputProtocol_ =
-        server_.inputProtocolFactory_.getProtocol(factoryInputTransport_);
-      outputProtocol_ =
-        server_.outputProtocolFactory_.getProtocol(factoryOutputTransport_);
-
-      if (server_.eventHandler) {
-        connectionContext_ =
-          server_.eventHandler.createContext(inputProtocol_, outputProtocol_);
-      }
-
-      auto info = TConnectionInfo(inputProtocol_, outputProtocol_, socket_);
-      processor_ = server_.processorFactory_.getProcessor(info);
-    }
-
-    ~this() {
-      free(readBuffer_);
-      if (event_) {
-        event_free(event_);
-        event_ = null;
-      }
-    }
-
-    /**
-     * Check buffers against the size limits and shrink them if exceeded.
-     *
-     * Params:
-     *   readLimit = Read buffer size limit (in bytes, 0 to ignore).
-     *   writeLimit = Write buffer size limit (in bytes, 0 to ignore).
-     */
-    void checkIdleBufferLimit(size_t readLimit, size_t writeLimit) {
-      if (readLimit > 0 && readBufferSize_ > readLimit) {
-        free(readBuffer_);
-        readBuffer_ = null;
-        readBufferSize_ = 0;
-      }
-
-      if (writeLimit > 0 && largestWriteBufferSize_ > writeLimit) {
-        // just start over
-        outputTransport_.reset(server_.writeBufferDefaultSize);
-        largestWriteBufferSize_ = 0;
-      }
-    }
-
-    /**
-     * Transitions the connection to the next state.
-     *
-     * This is called e.g. when the request has been read completely or all
-     * the data has been written back.
-     */
-    void transition() {
-      assert(!!loop_);
-      assert(!!server_);
-
-      // Switch upon the state that we are currently in and move to a new state
-      final switch (connState_) {
-        case ConnectionState.READ_REQUEST:
-          // We are done reading the request, package the read buffer into transport
-          // and get back some data from the dispatch function
-          inputTransport_.reset(readBuffer_[0 .. readBufferPos_]);
-          outputTransport_.reset();
-
-          // Prepend four bytes of blank space to the buffer so we can
-          // write the frame size there later.
-          // Strictly speaking, we wouldn't have to write anything, just
-          // increment the TMemoryBuffer writeOffset_. This would yield a tiny
-          // performance gain.
-          ubyte[4] space = void;
-          outputTransport_.write(space);
-
-          server_.incrementActiveProcessors();
-
-          taskPool_ = server_.taskPool;
-          if (taskPool_) {
-            // Create a new task and add it to the task pool queue.
-            auto processingTask = task!processRequest(this);
-            connState_ = ConnectionState.WAIT_PROCESSOR;
-            taskPool_.put(processingTask);
-
-            // We don't want to process any more data while the task is active.
-            unregisterEvent();
-            return;
-          }
-
-          // Just process it right now if there is no task pool set.
-          processRequest(this);
-          goto case;
-        case ConnectionState.WAIT_PROCESSOR:
-          // We have now finished processing the request, set the frame size
-          // for the outputTransport_ contents and set everything up to write
-          // it out via libevent.
-          server_.decrementActiveProcessors();
-
-          // Acquire the data written to the transport.
-          // KLUDGE: To avoid copying, we simply cast the const away and
-          // modify the internal buffer of the TMemoryBuffer – works with the
-          // current implementation, but isn't exactly beautiful.
-          writeBuffer_ = cast(ubyte[])outputTransport_.getContents();
-
-          assert(writeBuffer_.length >= 4, "The write buffer should have " ~
-            "least the initially added dummy length bytes.");
-          if (writeBuffer_.length == 4) {
-            // The request was one-way, no response to write.
-            goto case ConnectionState.INIT;
-          }
-
-          // Write the frame size into the four bytes reserved for it.
-          auto size = hostToNet(cast(uint)(writeBuffer_.length - 4));
-          writeBuffer_[0 .. 4] = cast(ubyte[])((&size)[0 .. 1]);
-
-          writeBufferPos_ = 0;
-          socketState_ = SocketState.SEND;
-          connState_ = ConnectionState.SEND_RESULT;
-          registerEvent(EV_WRITE | EV_PERSIST);
-
-          return;
-        case ConnectionState.SEND_RESULT:
-          // The result has been sent back to the client, we don't need the
-          // buffers anymore.
-          if (writeBuffer_.length > largestWriteBufferSize_) {
-            largestWriteBufferSize_ = writeBuffer_.length;
-          }
-
-          if (server_.resizeBufferEveryN > 0 &&
-              ++callsSinceResize_ >= server_.resizeBufferEveryN
-          ) {
-            checkIdleBufferLimit(server_.idleReadBufferLimit,
-              server_.idleWriteBufferLimit);
-            callsSinceResize_ = 0;
-          }
-
-          goto case;
-        case ConnectionState.INIT:
-          writeBuffer_ = null;
-          writeBufferPos_ = 0;
-          socketState_ = SocketState.RECV_FRAME_SIZE;
-          connState_ = ConnectionState.READ_FRAME_SIZE;
-          readBufferPos_ = 0;
-          registerEvent(EV_READ | EV_PERSIST);
-
-          return;
-        case ConnectionState.READ_FRAME_SIZE:
-          // We just read the request length, set up the buffers for reading
-          // the payload.
-          if (readWant_ > readBufferSize_) {
-            // The current buffer is too small, exponentially grow the buffer
-            // until it is big enough.
-
-            if (readBufferSize_ == 0) {
-              readBufferSize_ = 1;
-            }
-
-            auto newSize = readBufferSize_;
-            while (readWant_ > newSize) {
-              newSize *= 2;
-            }
-
-            auto newBuffer = cast(ubyte*)realloc(readBuffer_, newSize);
-            if (!newBuffer) onOutOfMemoryError();
-
-            readBuffer_ = newBuffer;
-            readBufferSize_ = newSize;
-          }
-
-          readBufferPos_= 0;
-
-          socketState_ = SocketState.RECV;
-          connState_ = ConnectionState.READ_REQUEST;
-
-          return;
-      }
-    }
-
-  private:
-    /**
-     * C callback to call workSocket() from libevent.
-     *
-     * Expects the custom argument to be the this pointer of the associated
-     * connection.
-     */
-    extern(C) static void workSocketCallback(int fd, short flags, void* connThis) {
-      auto conn = cast(Connection)connThis;
-      assert(fd == conn.socket_.socketHandle);
-      conn.workSocket();
-    }
-
-    /**
-     * Invoked by libevent when something happens on the socket.
-     */
-    void workSocket() {
-      final switch (socketState_) {
-        case SocketState.RECV_FRAME_SIZE:
-          // If some bytes have already been read, they have been kept in
-          // readWant_.
-          auto frameSize = readWant_;
-
-          try {
-            // Read from the socket
-            auto bytesRead = socket_.read(
-              (cast(ubyte[])((&frameSize)[0 .. 1]))[readBufferPos_ .. $]);
-            if (bytesRead == 0) {
-              // Couldn't read anything, but we have been notified – client
-              // has disconnected.
-              close();
-              return;
-            }
-
-            readBufferPos_ += bytesRead;
-          } catch (TTransportException te) {
-            logError("Failed to read frame size from client connection: %s", te);
-            close();
-            return;
-          }
-
-          if (readBufferPos_ < frameSize.sizeof) {
-            // Frame size not complete yet, save the current buffer in
-            // readWant_ so that the remaining bytes can be read later.
-            readWant_ = frameSize;
-            return;
-          }
-
-          auto size = netToHost(frameSize);
-          if (size > server_.maxFrameSize) {
-            logError("Frame size too large (%s > %s), client %s not using " ~
-              "TFramedTransport?", size, server_.maxFrameSize,
-              socket_.getPeerAddress().toHostNameString());
-            close();
-            return;
-          }
-          readWant_ = size;
-
-          // Now we know the frame size, set everything up for reading the
-          // payload.
-          transition();
-          return;
-
-        case SocketState.RECV:
-          // If we already got all the data, we should be in the SEND state.
-          assert(readBufferPos_ < readWant_);
-
-          size_t bytesRead;
-          try {
-            // Read as much as possible from the socket.
-            bytesRead = socket_.read(readBuffer_[readBufferPos_ .. readWant_]);
-          } catch (TTransportException te) {
-            logError("Failed to read from client socket: %s", te);
-            close();
-            return;
-          }
-
-          if (bytesRead == 0) {
-            // We were notified, but no bytes could be read -> the client
-            // disconnected.
-            close();
-            return;
-          }
-
-          readBufferPos_ += bytesRead;
-          assert(readBufferPos_ <= readWant_);
-
-          if (readBufferPos_ == readWant_) {
-            // The payload has been read completely, move on.
-            transition();
-          }
-
-          return;
-        case SocketState.SEND:
-          assert(writeBufferPos_ <= writeBuffer_.length);
-
-          if (writeBufferPos_ == writeBuffer_.length) {
-            // Nothing left to send – this shouldn't happen, just move on.
-            logInfo("WARNING: In send state, but no data to send.\n");
-            transition();
-            return;
-          }
-
-          size_t bytesSent;
-          try {
-            bytesSent = socket_.writeSome(writeBuffer_[writeBufferPos_ .. $]);
-          } catch (TTransportException te) {
-            logError("Failed to write to client socket: %s", te);
-            close();
-            return;
-          }
-
-          writeBufferPos_ += bytesSent;
-          assert(writeBufferPos_ <= writeBuffer_.length);
-
-          if (writeBufferPos_ == writeBuffer_.length) {
-            // The whole response has been written out, we are done.
-            transition();
-          }
-
-          return;
-      }
-    }
-
-    /**
-     * Registers a libevent event for workSocket() with the passed flags,
-     * unregistering the previous one (if any).
-     */
-    void registerEvent(short eventFlags) {
-      if (eventFlags_ == eventFlags) {
-        // Nothing to do if flags are the same.
-        return;
-      }
-
-      // Delete the previously existing event.
-      unregisterEvent();
-
-      eventFlags_ = eventFlags;
-
-      if (eventFlags == 0) return;
-
-      if (!event_) {
-        // If the event was not already allocated, do it now.
-        event_ = event_new(loop_.eventBase_, socket_.socketHandle,
-          eventFlags_, assumeNothrow(&workSocketCallback), cast(void*)this);
-      } else {
-        event_assign(event_, loop_.eventBase_, socket_.socketHandle,
-          eventFlags_, assumeNothrow(&workSocketCallback), cast(void*)this);
-      }
-
-      // Add the event
-      if (event_add(event_, null) == -1) {
-        logError("event_add() for client socket failed.");
-      }
-    }
-
-    /**
-     * Unregisters the current libevent event, if any.
-     */
-    void unregisterEvent() {
-      if (event_ && eventFlags_ != 0) {
-        eventFlags_ = 0;
-        if (event_del(event_) == -1) {
-          logError("event_del() for client socket failed.");
-          return;
-        }
-      }
-    }
-
-    /**
-     * Closes this connection and returns it back to the server.
-     */
-    void close() {
-      unregisterEvent();
-
-      if (server_.eventHandler) {
-        server_.eventHandler.deleteContext(
-          connectionContext_, inputProtocol_, outputProtocol_);
-      }
-
-      // Close the socket
-      socket_.close();
-
-      // close any factory produced transports.
-      factoryInputTransport_.close();
-      factoryOutputTransport_.close();
-
-      // This connection object can now be reused.
-      loop_.disposeConnection(this);
-    }
-
-    /// The server this connection belongs to.
-    TNonblockingServer server_;
-
-    /// The task pool used for this connection. This is cached instead of
-    /// directly using server_.taskPool to avoid confusion if it is changed in
-    /// another thread while the request is processed.
-    TaskPool taskPool_;
-
-    /// The I/O thread handling this connection.
-    IOLoop loop_;
-
-    /// The socket managed by this connection.
-    TSocket socket_;
-
-    /// The libevent object used for registering the workSocketCallback.
-    event* event_;
-
-    /// Libevent flags
-    short eventFlags_;
-
-    /// Socket mode
-    SocketState socketState_;
-
-    /// Application state
-    ConnectionState connState_;
-
-    /// The size of the frame to read. If still in READ_FRAME_SIZE state, some
-    /// of the bytes might not have been written, and the value might still be
-    /// in network byte order. An uint (not a size_t) because the frame size on
-    /// the wire is specified as one.
-    uint readWant_;
-
-    /// The position in the read buffer, i.e. the number of payload bytes
-    /// already received from the socket in READ_REQUEST state, resp. the
-    /// number of size bytes in READ_FRAME_SIZE state.
-    uint readBufferPos_;
-
-    /// Read buffer
-    ubyte* readBuffer_;
-
-    /// Read buffer size
-    size_t readBufferSize_;
-
-    /// Write buffer
-    ubyte[] writeBuffer_;
-
-    /// How far through writing are we?
-    size_t writeBufferPos_;
-
-    /// Largest size of write buffer seen since buffer was constructed
-    size_t largestWriteBufferSize_;
-
-    /// Number of calls since the last time checkIdleBufferLimit has been
-    /// invoked (see TServer.resizeBufferEveryN).
-    uint callsSinceResize_;
-
-    /// Base transports the processor reads from/writes to.
-    TInputRangeTransport!(ubyte[]) inputTransport_;
-    TMemoryBuffer outputTransport_;
-
-    /// The actual transports passed to the processor obtained via the
-    /// transport factory.
-    TTransport factoryInputTransport_;
-    TTransport factoryOutputTransport_; /// Ditto
-
-    /// Input/output protocols, connected to factory{Input, Output}Transport.
-    TProtocol inputProtocol_;
-    TProtocol outputProtocol_; /// Ditto.
-
-    /// Connection context optionally created by the server event handler.
-    Variant connectionContext_;
-
-    /// The processor used for this connection.
-    TProcessor processor_;
-  }
-}
-
-/*
- * The request processing function, which invokes the processor for the server
- * for all the RPC messages received over a connection.
- *
- * Must be public because it is passed as alias to std.parallelism.task().
- */
-void processRequest(Connection connection) {
-  try {
-    while (true) {
-      with (connection) {
-        if (server_.eventHandler) {
-          server_.eventHandler.preProcess(connectionContext_, socket_);
-        }
-
-        if (!processor_.process(inputProtocol_, outputProtocol_,
-          connectionContext_) || !inputProtocol_.transport.peek()
-        ) {
-          // Something went fundamentally wrong or there is nothing more to
-          // process, close the connection.
-          break;
-        }
-      }
-    }
-  } catch (TTransportException ttx) {
-    logError("Client died: %s", ttx);
-  } catch (Exception e) {
-    logError("Uncaught exception: %s", e);
-  }
-
-  if (connection.taskPool_) connection.loop_.notifyCompleted(connection);
-}
-
-unittest {
-  import thrift.internal.test.server;
-
-  // Temporarily disable info log output in order not to spam the test results
-  // with startup info messages.
-  auto oldInfoLogSink = g_infoLogSink;
-  g_infoLogSink = null;
-  scope (exit) g_infoLogSink = oldInfoLogSink;
-
-  // Test in-line processing shutdown with one as well as several I/O threads.
-  testServeCancel!(TNonblockingServer)();
-  testServeCancel!(TNonblockingServer)((TNonblockingServer s) {
-    s.numIOThreads = 4;
-  });
-
-  // Test task pool processing shutdown with one as well as several I/O threads.
-  auto tp = new TaskPool(4);
-  tp.isDaemon = true;
-  testServeCancel!(TNonblockingServer)((TNonblockingServer s) {
-    s.taskPool = tp;
-  });
-  testServeCancel!(TNonblockingServer)((TNonblockingServer s) {
-    s.taskPool = tp;
-    s.numIOThreads = 4;
-  });
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/simple.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/simple.d
deleted file mode 100644
index f7183a7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/simple.d
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.server.simple;
-
-import std.variant : Variant;
-import thrift.base;
-import thrift.protocol.base;
-import thrift.protocol.processor;
-import thrift.server.base;
-import thrift.server.transport.base;
-import thrift.transport.base;
-import thrift.util.cancellation;
-
-/**
- * The most basic server.
- *
- * It is single-threaded and after it accepts a connections, it processes
- * requests on it until it closes, then waiting for the next connection.
- *
- * It is not so much of use in production than it is for writing unittests, or
- * as an example on how to provide a custom TServer implementation.
- */
-class TSimpleServer : TServer {
-  ///
-  this(
-    TProcessor processor,
-    TServerTransport serverTransport,
-    TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory
-  ) {
-    super(processor, serverTransport, transportFactory, protocolFactory);
-  }
-
-  ///
-  this(
-    TProcessorFactory processorFactory,
-    TServerTransport serverTransport,
-    TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory
-  ) {
-    super(processorFactory, serverTransport, transportFactory, protocolFactory);
-  }
-
-  ///
-  this(
-    TProcessor processor,
-    TServerTransport serverTransport,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory
-  ) {
-    super(processor, serverTransport, inputTransportFactory,
-      outputTransportFactory, inputProtocolFactory, outputProtocolFactory);
-  }
-
-  this(
-    TProcessorFactory processorFactory,
-    TServerTransport serverTransport,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory
-  ) {
-    super(processorFactory, serverTransport, inputTransportFactory,
-      outputTransportFactory, inputProtocolFactory, outputProtocolFactory);
-  }
-
-  override void serve(TCancellation cancellation = null) {
-    serverTransport_.listen();
-
-    if (eventHandler) eventHandler.preServe();
-
-    while (true) {
-      TTransport client;
-      TTransport inputTransport;
-      TTransport outputTransport;
-      TProtocol inputProtocol;
-      TProtocol outputProtocol;
-
-      try {
-        client = serverTransport_.accept(cancellation);
-        scope(failure) client.close();
-
-        inputTransport = inputTransportFactory_.getTransport(client);
-        scope(failure) inputTransport.close();
-
-        outputTransport = outputTransportFactory_.getTransport(client);
-        scope(failure) outputTransport.close();
-
-        inputProtocol = inputProtocolFactory_.getProtocol(inputTransport);
-        outputProtocol = outputProtocolFactory_.getProtocol(outputTransport);
-      } catch (TCancelledException tcx) {
-        break;
-      } catch (TTransportException ttx) {
-        logError("TServerTransport failed on accept: %s", ttx);
-        continue;
-      } catch (TException tx) {
-        logError("Caught TException on accept: %s", tx);
-        continue;
-      }
-
-      auto info = TConnectionInfo(inputProtocol, outputProtocol, client);
-      auto processor = processorFactory_.getProcessor(info);
-
-      Variant connectionContext;
-      if (eventHandler) {
-        connectionContext =
-          eventHandler.createContext(inputProtocol, outputProtocol);
-      }
-
-      try {
-        while (true) {
-          if (eventHandler) {
-            eventHandler.preProcess(connectionContext, client);
-          }
-
-          if (!processor.process(inputProtocol, outputProtocol,
-            connectionContext) || !inputProtocol.transport.peek()
-          ) {
-            // Something went fundamentlly wrong or there is nothing more to
-            // process, close the connection.
-            break;
-          }
-        }
-      } catch (TTransportException ttx) {
-        logError("Client died: %s", ttx);
-      } catch (Exception e) {
-        logError("Uncaught exception: %s", e);
-      }
-
-      if (eventHandler) {
-        eventHandler.deleteContext(connectionContext, inputProtocol,
-          outputProtocol);
-      }
-
-      try {
-        inputTransport.close();
-      } catch (TTransportException ttx) {
-        logError("Input close failed: %s", ttx);
-      }
-      try {
-        outputTransport.close();
-      } catch (TTransportException ttx) {
-        logError("Output close failed: %s", ttx);
-      }
-      try {
-        client.close();
-      } catch (TTransportException ttx) {
-        logError("Client close failed: %s", ttx);
-      }
-    }
-
-    try {
-      serverTransport_.close();
-    } catch (TServerTransportException e) {
-      logError("Server transport failed to close(): %s", e);
-    }
-  }
-}
-
-unittest {
-  import thrift.internal.test.server;
-  testServeCancel!TSimpleServer();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/taskpool.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/taskpool.d
deleted file mode 100644
index b4720a4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/taskpool.d
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.server.taskpool;
-
-import core.sync.condition;
-import core.sync.mutex;
-import std.exception : enforce;
-import std.parallelism;
-import std.variant : Variant;
-import thrift.base;
-import thrift.protocol.base;
-import thrift.protocol.processor;
-import thrift.server.base;
-import thrift.server.transport.base;
-import thrift.transport.base;
-import thrift.util.cancellation;
-
-/**
- * A server which dispatches client requests to a std.parallelism TaskPool.
- */
-class TTaskPoolServer : TServer {
-  ///
-  this(
-    TProcessor processor,
-    TServerTransport serverTransport,
-    TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory,
-    TaskPool taskPool = null
-  ) {
-    this(processor, serverTransport, transportFactory, transportFactory,
-      protocolFactory, protocolFactory, taskPool);
-  }
-
-  ///
-  this(
-    TProcessorFactory processorFactory,
-    TServerTransport serverTransport,
-    TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory,
-    TaskPool taskPool = null
-  ) {
-    this(processorFactory, serverTransport, transportFactory, transportFactory,
-      protocolFactory, protocolFactory, taskPool);
-  }
-
-  ///
-  this(
-    TProcessor processor,
-    TServerTransport serverTransport,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory,
-    TaskPool taskPool = null
-  ) {
-    this(new TSingletonProcessorFactory(processor), serverTransport,
-      inputTransportFactory, outputTransportFactory,
-      inputProtocolFactory, outputProtocolFactory);
-  }
-
-  ///
-  this(
-    TProcessorFactory processorFactory,
-    TServerTransport serverTransport,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory,
-    TaskPool taskPool = null
-  ) {
-    super(processorFactory, serverTransport, inputTransportFactory,
-      outputTransportFactory, inputProtocolFactory, outputProtocolFactory);
-
-    if (taskPool) {
-      this.taskPool = taskPool;
-    } else {
-      auto ptp = std.parallelism.taskPool;
-      if (ptp.size > 0) {
-        taskPool_ = ptp;
-      } else {
-        // If the global task pool is empty (default on a single-core machine),
-        // create a new one with a single worker thread. The rationale for this
-        // is to avoid that an application which worked fine with no task pool
-        // explicitly set on the multi-core developer boxes suddenly fails on a
-        // single-core user machine.
-        taskPool_ = new TaskPool(1);
-        taskPool_.isDaemon = true;
-      }
-    }
-  }
-
-  override void serve(TCancellation cancellation = null) {
-    serverTransport_.listen();
-
-    if (eventHandler) eventHandler.preServe();
-
-    auto queueState = QueueState();
-
-    while (true) {
-      // Check if we can still handle more connections.
-      if (maxActiveConns) {
-        synchronized (queueState.mutex) {
-          while (queueState.activeConns >= maxActiveConns) {
-            queueState.connClosed.wait();
-          }
-        }
-      }
-
-      TTransport client;
-      TTransport inputTransport;
-      TTransport outputTransport;
-      TProtocol inputProtocol;
-      TProtocol outputProtocol;
-
-      try {
-        client = serverTransport_.accept(cancellation);
-        scope(failure) client.close();
-
-        inputTransport = inputTransportFactory_.getTransport(client);
-        scope(failure) inputTransport.close();
-
-        outputTransport = outputTransportFactory_.getTransport(client);
-        scope(failure) outputTransport.close();
-
-        inputProtocol = inputProtocolFactory_.getProtocol(inputTransport);
-        outputProtocol = outputProtocolFactory_.getProtocol(outputTransport);
-      } catch (TCancelledException tce) {
-        break;
-      } catch (TTransportException ttx) {
-        logError("TServerTransport failed on accept: %s", ttx);
-        continue;
-      } catch (TException tx) {
-        logError("Caught TException on accept: %s", tx);
-        continue;
-      }
-
-      auto info = TConnectionInfo(inputProtocol, outputProtocol, client);
-      auto processor = processorFactory_.getProcessor(info);
-
-      synchronized (queueState.mutex) {
-        ++queueState.activeConns;
-      }
-      taskPool_.put(task!worker(queueState, client, inputProtocol,
-        outputProtocol, processor, eventHandler));
-    }
-
-    // First, stop accepting new connections.
-    try {
-      serverTransport_.close();
-    } catch (TServerTransportException e) {
-      logError("Server transport failed to close: %s", e);
-    }
-
-    // Then, wait until all active connections are finished.
-    synchronized (queueState.mutex) {
-      while (queueState.activeConns > 0) {
-        queueState.connClosed.wait();
-      }
-    }
-  }
-
-  /**
-   * Sets the task pool to use.
-   *
-   * By default, the global std.parallelism taskPool instance is used, which
-   * might not be appropriate for many applications, e.g. where tuning the
-   * number of worker threads is desired. (On single-core systems, a private
-   * task pool with a single thread is used by default, since the global
-   * taskPool instance has no worker threads then.)
-   *
-   * Note: TTaskPoolServer expects that tasks are never dropped from the pool,
-   * e.g. by calling TaskPool.close() while there are still tasks in the
-   * queue. If this happens, serve() will never return.
-   */
-  void taskPool(TaskPool pool) @property {
-    enforce(pool !is null, "Cannot use a null task pool.");
-    enforce(pool.size > 0, "Cannot use a task pool with no worker threads.");
-    taskPool_ = pool;
-  }
-
-  /**
-   * The maximum number of client connections open at the same time. Zero for
-   * no limit, which is the default.
-   *
-   * If this limit is reached, no clients are accept()ed from the server
-   * transport any longer until another connection has been closed again.
-   */
-  size_t maxActiveConns;
-
-protected:
-  TaskPool taskPool_;
-}
-
-// Cannot be private as worker has to be passed as alias parameter to
-// another module.
-// private {
-  /*
-   * The state of the »connection queue«, i.e. used for keeping track of how
-   * many client connections are currently processed.
-   */
-  struct QueueState {
-    /// Protects the queue state.
-    Mutex mutex;
-
-    /// The number of active connections (from the time they are accept()ed
-    /// until they are closed when the worked task finishes).
-    size_t activeConns;
-
-    /// Signals that the number of active connections has been decreased, i.e.
-    /// that a connection has been closed.
-    Condition connClosed;
-
-    /// Returns an initialized instance.
-    static QueueState opCall() {
-      QueueState q;
-      q.mutex = new Mutex;
-      q.connClosed = new Condition(q.mutex);
-      return q;
-    }
-  }
-
-  void worker(ref QueueState queueState, TTransport client,
-    TProtocol inputProtocol, TProtocol outputProtocol,
-    TProcessor processor, TServerEventHandler eventHandler)
-  {
-    scope (exit) {
-      synchronized (queueState.mutex) {
-        assert(queueState.activeConns > 0);
-        --queueState.activeConns;
-        queueState.connClosed.notifyAll();
-      }
-    }
-
-    Variant connectionContext;
-    if (eventHandler) {
-      connectionContext =
-        eventHandler.createContext(inputProtocol, outputProtocol);
-    }
-
-    try {
-      while (true) {
-        if (eventHandler) {
-          eventHandler.preProcess(connectionContext, client);
-        }
-
-        if (!processor.process(inputProtocol, outputProtocol,
-          connectionContext) || !inputProtocol.transport.peek()
-        ) {
-          // Something went fundamentlly wrong or there is nothing more to
-          // process, close the connection.
-          break;
-        }
-      }
-    } catch (TTransportException ttx) {
-      logError("Client died: %s", ttx);
-    } catch (Exception e) {
-      logError("Uncaught exception: %s", e);
-    }
-
-    if (eventHandler) {
-      eventHandler.deleteContext(connectionContext, inputProtocol,
-        outputProtocol);
-    }
-
-    try {
-      inputProtocol.transport.close();
-    } catch (TTransportException ttx) {
-      logError("Input close failed: %s", ttx);
-    }
-    try {
-      outputProtocol.transport.close();
-    } catch (TTransportException ttx) {
-      logError("Output close failed: %s", ttx);
-    }
-    try {
-      client.close();
-    } catch (TTransportException ttx) {
-      logError("Client close failed: %s", ttx);
-    }
-  }
-// }
-
-unittest {
-  import thrift.internal.test.server;
-  testServeCancel!TTaskPoolServer();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/threaded.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/threaded.d
deleted file mode 100644
index 1cde983..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/threaded.d
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.server.threaded;
-
-import core.thread;
-import std.variant : Variant;
-import thrift.base;
-import thrift.protocol.base;
-import thrift.protocol.processor;
-import thrift.server.base;
-import thrift.server.transport.base;
-import thrift.transport.base;
-import thrift.util.cancellation;
-
-/**
- * A simple threaded server which spawns a new thread per connection.
- */
-class TThreadedServer : TServer {
-  ///
-  this(
-    TProcessor processor,
-    TServerTransport serverTransport,
-    TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory
-  ) {
-    super(processor, serverTransport, transportFactory, protocolFactory);
-  }
-
-  ///
-  this(
-    TProcessorFactory processorFactory,
-    TServerTransport serverTransport,
-    TTransportFactory transportFactory,
-    TProtocolFactory protocolFactory
-  ) {
-    super(processorFactory, serverTransport, transportFactory, protocolFactory);
-  }
-
-  ///
-  this(
-    TProcessor processor,
-    TServerTransport serverTransport,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory
-  ) {
-    super(processor, serverTransport, inputTransportFactory,
-      outputTransportFactory, inputProtocolFactory, outputProtocolFactory);
-  }
-
-  ///
-  this(
-    TProcessorFactory processorFactory,
-    TServerTransport serverTransport,
-    TTransportFactory inputTransportFactory,
-    TTransportFactory outputTransportFactory,
-    TProtocolFactory inputProtocolFactory,
-    TProtocolFactory outputProtocolFactory
-  ) {
-    super(processorFactory, serverTransport, inputTransportFactory,
-      outputTransportFactory, inputProtocolFactory, outputProtocolFactory);
-  }
-
-  override void serve(TCancellation cancellation = null) {
-    try {
-      // Start the server listening
-      serverTransport_.listen();
-    } catch (TTransportException ttx) {
-      logError("listen() failed: %s", ttx);
-      return;
-    }
-
-    if (eventHandler) eventHandler.preServe();
-
-    auto workerThreads = new ThreadGroup();
-
-    while (true) {
-      TTransport client;
-      TTransport inputTransport;
-      TTransport outputTransport;
-      TProtocol inputProtocol;
-      TProtocol outputProtocol;
-
-      try {
-        client = serverTransport_.accept(cancellation);
-        scope(failure) client.close();
-
-        inputTransport = inputTransportFactory_.getTransport(client);
-        scope(failure) inputTransport.close();
-
-        outputTransport = outputTransportFactory_.getTransport(client);
-        scope(failure) outputTransport.close();
-
-        inputProtocol = inputProtocolFactory_.getProtocol(inputTransport);
-        outputProtocol = outputProtocolFactory_.getProtocol(outputTransport);
-      } catch (TCancelledException tce) {
-        break;
-      } catch (TTransportException ttx) {
-        logError("TServerTransport failed on accept: %s", ttx);
-        continue;
-      } catch (TException tx) {
-        logError("Caught TException on accept: %s", tx);
-        continue;
-      }
-
-      auto info = TConnectionInfo(inputProtocol, outputProtocol, client);
-      auto processor = processorFactory_.getProcessor(info);
-      auto worker = new WorkerThread(client, inputProtocol, outputProtocol,
-        processor, eventHandler);
-      workerThreads.add(worker);
-      worker.start();
-    }
-
-    try {
-      serverTransport_.close();
-    } catch (TServerTransportException e) {
-      logError("Server transport failed to close: %s", e);
-    }
-    workerThreads.joinAll();
-  }
-}
-
-// The worker thread handling a client connection.
-private class WorkerThread : Thread {
-  this(TTransport client, TProtocol inputProtocol, TProtocol outputProtocol,
-    TProcessor processor, TServerEventHandler eventHandler)
-  {
-    client_ = client;
-    inputProtocol_ = inputProtocol;
-    outputProtocol_ = outputProtocol;
-    processor_ = processor;
-    eventHandler_ = eventHandler;
-
-    super(&run);
-  }
-
-  void run() {
-    Variant connectionContext;
-    if (eventHandler_) {
-      connectionContext =
-        eventHandler_.createContext(inputProtocol_, outputProtocol_);
-    }
-
-    try {
-      while (true) {
-        if (eventHandler_) {
-          eventHandler_.preProcess(connectionContext, client_);
-        }
-
-        if (!processor_.process(inputProtocol_, outputProtocol_,
-          connectionContext) || !inputProtocol_.transport.peek()
-        ) {
-          // Something went fundamentlly wrong or there is nothing more to
-          // process, close the connection.
-          break;
-        }
-      }
-    } catch (TTransportException ttx) {
-      logError("Client died: %s", ttx);
-    } catch (Exception e) {
-      logError("Uncaught exception: %s", e);
-    }
-
-    if (eventHandler_) {
-      eventHandler_.deleteContext(connectionContext, inputProtocol_,
-        outputProtocol_);
-    }
-
-    try {
-      inputProtocol_.transport.close();
-    } catch (TTransportException ttx) {
-      logError("Input close failed: %s", ttx);
-    }
-    try {
-      outputProtocol_.transport.close();
-    } catch (TTransportException ttx) {
-      logError("Output close failed: %s", ttx);
-    }
-    try {
-      client_.close();
-    } catch (TTransportException ttx) {
-      logError("Client close failed: %s", ttx);
-    }
-  }
-
-private:
-  TTransport client_;
-  TProtocol inputProtocol_;
-  TProtocol outputProtocol_;
-  TProcessor processor_;
-  TServerEventHandler eventHandler_;
-}
-
-unittest {
-  import thrift.internal.test.server;
-  testServeCancel!TThreadedServer();
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/base.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/base.d
deleted file mode 100644
index da165d3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/base.d
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.server.transport.base;
-
-import thrift.base;
-import thrift.transport.base;
-import thrift.util.cancellation;
-
-/**
- * Some kind of I/O device enabling servers to listen for incoming client
- * connections and communicate with them via a TTransport interface.
- */
-interface TServerTransport {
-  /**
-   * Starts listening for server connections.
-   *
-   * Just as simliar functions commonly found in socket libraries, this
-   * function does not block.
-   *
-   * If the socket is already listening, nothing happens.
-   *
-   * Throws: TServerTransportException if listening failed or the transport
-   *   was already listening.
-   */
-  void listen();
-
-  /**
-   * Closes the server transport, causing it to stop listening.
-   *
-   * Throws: TServerTransportException if the transport was not listening.
-   */
-  void close();
-
-  /**
-   * Returns whether the server transport is currently listening.
-   */
-  bool isListening() @property;
-
-  /**
-   * Accepts a client connection and returns an opened TTransport for it,
-   * never returning null.
-   *
-   * Blocks until a client connection is available.
-   *
-   * Params:
-   *   cancellation = If triggered, requests the call to stop blocking and
-   *     return with a TCancelledException. Implementations are free to
-   *     ignore this if they cannot provide a reasonable.
-   *
-   * Throws: TServerTransportException if accepting failed,
-   *   TCancelledException if it was cancelled.
-   */
-  TTransport accept(TCancellation cancellation = null) out (result) {
-    assert(result !is null);
-  }
-}
-
-/**
- * Server transport exception.
- */
-class TServerTransportException : TException {
-  /**
-   * Error codes for the various types of exceptions.
-   */
-  enum Type {
-    ///
-    UNKNOWN,
-
-    /// The server socket is not listening, but excepted to be.
-    NOT_LISTENING,
-
-    /// The server socket is already listening, but expected not to be.
-    ALREADY_LISTENING,
-
-    /// An operation on the primary underlying resource, e.g. a socket used
-    /// for accepting connections, failed.
-    RESOURCE_FAILED
-  }
-
-  ///
-  this(Type type, string file = __FILE__, size_t line = __LINE__, Throwable next = null) {
-    string msg = "TTransportException: ";
-    switch (type) {
-      case Type.UNKNOWN: msg ~= "Unknown server transport exception"; break;
-      case Type.NOT_LISTENING: msg ~= "Server transport not listening"; break;
-      case Type.ALREADY_LISTENING: msg ~= "Server transport already listening"; break;
-      case Type.RESOURCE_FAILED: msg ~= "An underlying resource failed"; break;
-      default: msg ~= "(Invalid exception type)"; break;
-    }
-
-    this(msg, type, file, line, next);
-  }
-
-  ///
-  this(string msg, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    this(msg, Type.UNKNOWN, file, line, next);
-  }
-
-  ///
-  this(string msg, Type type, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    super(msg, file, line, next);
-    type_ = type;
-  }
-
-  ///
-  Type type() const nothrow @property {
-    return type_;
-  }
-
-protected:
-  Type type_;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/socket.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/socket.d
deleted file mode 100644
index e66d80e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/socket.d
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.server.transport.socket;
-
-import core.thread : dur, Duration, Thread;
-import core.stdc.string : strerror;
-import std.array : empty;
-import std.conv : text, to;
-import std.exception : enforce;
-import std.socket;
-import thrift.base;
-import thrift.internal.socket;
-import thrift.server.transport.base;
-import thrift.transport.base;
-import thrift.transport.socket;
-import thrift.util.awaitable;
-import thrift.util.cancellation;
-
-private alias TServerTransportException STE;
-
-/**
- * Server socket implementation of TServerTransport.
- *
- * Maps to std.socket listen()/accept(); only provides TCP/IP sockets (i.e. no
- * Unix sockets) for now, because they are not supported in std.socket.
- */
-class TServerSocket : TServerTransport {
-  /**
-   * Constructs a new instance.
-   *
-   * Params:
-   *   port = The TCP port to listen at (host is always 0.0.0.0).
-   *   sendTimeout = The socket sending timeout.
-   *   recvTimout = The socket receiving timeout.
-   */
-  this(ushort port, Duration sendTimeout = dur!"hnsecs"(0),
-    Duration recvTimeout = dur!"hnsecs"(0))
-  {
-    port_ = port;
-    sendTimeout_ = sendTimeout;
-    recvTimeout_ = recvTimeout;
-
-    cancellationNotifier_ = new TSocketNotifier;
-
-    socketSet_ = new SocketSet;
-  }
-
-  /// The port the server socket listens at.
-  ushort port() const @property {
-    return port_;
-  }
-
-  /// The socket sending timeout, zero to block infinitely.
-  void sendTimeout(Duration sendTimeout) @property {
-    sendTimeout_ = sendTimeout;
-  }
-
-  /// The socket receiving timeout, zero to block infinitely.
-  void recvTimeout(Duration recvTimeout) @property {
-    recvTimeout_ = recvTimeout;
-  }
-
-  /// The maximum number of listening retries if it fails.
-  void retryLimit(ushort retryLimit) @property {
-    retryLimit_ = retryLimit;
-  }
-
-  /// The delay between a listening attempt failing and retrying it.
-  void retryDelay(Duration retryDelay) @property {
-    retryDelay_ = retryDelay;
-  }
-
-  /// The size of the TCP send buffer, in bytes.
-  void tcpSendBuffer(int tcpSendBuffer) @property {
-    tcpSendBuffer_ = tcpSendBuffer;
-  }
-
-  /// The size of the TCP receiving buffer, in bytes.
-  void tcpRecvBuffer(int tcpRecvBuffer) @property {
-    tcpRecvBuffer_ = tcpRecvBuffer;
-  }
-
-  /// Whether to listen on IPv6 only, if IPv6 support is detected
-  /// (default: false).
-  void ipv6Only(bool value) @property {
-    ipv6Only_ = value;
-  }
-
-  override void listen() {
-    enforce(!isListening, new STE(STE.Type.ALREADY_LISTENING));
-
-    serverSocket_ = makeSocketAndListen(port_, ACCEPT_BACKLOG, retryLimit_,
-      retryDelay_, tcpSendBuffer_, tcpRecvBuffer_, ipv6Only_);
-  }
-
-  override void close() {
-    enforce(isListening, new STE(STE.Type.NOT_LISTENING));
-
-    serverSocket_.shutdown(SocketShutdown.BOTH);
-    serverSocket_.close();
-    serverSocket_ = null;
-  }
-
-  override bool isListening() @property {
-    return serverSocket_ !is null;
-  }
-
-  /// Number of connections listen() backlogs.
-  enum ACCEPT_BACKLOG = 1024;
-
-  override TTransport accept(TCancellation cancellation = null) {
-    enforce(isListening, new STE(STE.Type.NOT_LISTENING));
-
-    if (cancellation) cancellationNotifier_.attach(cancellation.triggering);
-    scope (exit) if (cancellation) cancellationNotifier_.detach();
-
-
-    // Too many EINTRs is a fault condition and would need to be handled
-    // manually by our caller, but we can tolerate a certain number.
-    enum MAX_EINTRS = 10;
-    uint numEintrs;
-
-    while (true) {
-      socketSet_.reset();
-      socketSet_.add(serverSocket_);
-      socketSet_.add(cancellationNotifier_.socket);
-
-      auto ret = Socket.select(socketSet_, null, null);
-      enforce(ret != 0, new STE("Socket.select() returned 0.",
-        STE.Type.RESOURCE_FAILED));
-
-      if (ret < 0) {
-        // Select itself failed, check if it was just due to an interrupted
-        // syscall.
-        if (getSocketErrno() == INTERRUPTED_ERRNO) {
-          if (numEintrs++ < MAX_EINTRS) {
-            continue;
-          } else {
-            throw new STE("Socket.select() was interrupted by a signal (EINTR) " ~
-              "more than " ~ to!string(MAX_EINTRS) ~ " times.",
-              STE.Type.RESOURCE_FAILED
-            );
-          }
-        }
-        throw new STE("Unknown error on Socket.select(): " ~
-          socketErrnoString(getSocketErrno()), STE.Type.RESOURCE_FAILED);
-      } else {
-        // Check for a ping on the interrupt socket.
-        if (socketSet_.isSet(cancellationNotifier_.socket)) {
-          cancellation.throwIfTriggered();
-        }
-
-        // Check for the actual server socket having a connection waiting.
-        if (socketSet_.isSet(serverSocket_)) {
-          break;
-        }
-      }
-    }
-
-    try {
-      auto client = createTSocket(serverSocket_.accept());
-      client.sendTimeout = sendTimeout_;
-      client.recvTimeout = recvTimeout_;
-      return client;
-    } catch (SocketException e) {
-      throw new STE("Unknown error on accepting: " ~ to!string(e),
-        STE.Type.RESOURCE_FAILED);
-    }
-  }
-
-protected:
-  /**
-   * Allows derived classes to create a different TSocket type.
-   */
-  TSocket createTSocket(Socket socket) {
-    return new TSocket(socket);
-  }
-
-private:
-  ushort port_;
-  Duration sendTimeout_;
-  Duration recvTimeout_;
-  ushort retryLimit_;
-  Duration retryDelay_;
-  uint tcpSendBuffer_;
-  uint tcpRecvBuffer_;
-  bool ipv6Only_;
-
-  Socket serverSocket_;
-  TSocketNotifier cancellationNotifier_;
-
-  // Keep socket set between accept() calls to avoid reallocating.
-  SocketSet socketSet_;
-}
-
-Socket makeSocketAndListen(ushort port, int backlog, ushort retryLimit,
-  Duration retryDelay, uint tcpSendBuffer = 0, uint tcpRecvBuffer = 0,
-  bool ipv6Only = false
-) {
-  Address localAddr;
-  try {
-    // null represents the wildcard address.
-    auto addrInfos = getAddressInfo(null, to!string(port),
-      AddressInfoFlags.PASSIVE, SocketType.STREAM, ProtocolType.TCP);
-    foreach (i, ai; addrInfos) {
-      // Prefer to bind to IPv6 addresses, because then IPv4 is listened to as
-      // well, but not the other way round.
-      if (ai.family == AddressFamily.INET6 || i == (addrInfos.length - 1)) {
-        localAddr = ai.address;
-        break;
-      }
-    }
-  } catch (Exception e) {
-    throw new STE("Could not determine local address to listen on.",
-      STE.Type.RESOURCE_FAILED, __FILE__, __LINE__, e);
-  }
-
-  Socket socket;
-  try {
-    socket = new Socket(localAddr.addressFamily, SocketType.STREAM,
-      ProtocolType.TCP);
-  } catch (SocketException e) {
-    throw new STE("Could not create accepting socket: " ~ to!string(e),
-      STE.Type.RESOURCE_FAILED);
-  }
-
-  try {
-    socket.setOption(SocketOptionLevel.IPV6, SocketOption.IPV6_V6ONLY, ipv6Only);
-  } catch (SocketException e) {
-    // This is somewhat expected on older systems (e.g. pre-Vista Windows),
-    // which do not support the IPV6_V6ONLY flag yet. Racy flag just to avoid
-    // log spew in unit tests.
-    shared static warned = false;
-    if (!warned) {
-      logError("Could not set IPV6_V6ONLY socket option: %s", e);
-      warned = true;
-    }
-  }
-
-  alias SocketOptionLevel.SOCKET lvlSock;
-
-  // Prevent 2 maximum segement lifetime delay on accept.
-  try {
-    socket.setOption(lvlSock, SocketOption.REUSEADDR, true);
-  } catch (SocketException e) {
-    throw new STE("Could not set REUSEADDR socket option: " ~ to!string(e),
-      STE.Type.RESOURCE_FAILED);
-  }
-
-  // Set TCP buffer sizes.
-  if (tcpSendBuffer > 0) {
-    try {
-      socket.setOption(lvlSock, SocketOption.SNDBUF, tcpSendBuffer);
-    } catch (SocketException e) {
-      throw new STE("Could not set socket send buffer size: " ~ to!string(e),
-        STE.Type.RESOURCE_FAILED);
-    }
-  }
-
-  if (tcpRecvBuffer > 0) {
-    try {
-      socket.setOption(lvlSock, SocketOption.RCVBUF, tcpRecvBuffer);
-    } catch (SocketException e) {
-      throw new STE("Could not set receive send buffer size: " ~ to!string(e),
-        STE.Type.RESOURCE_FAILED);
-    }
-  }
-
-  // Turn linger off to avoid blocking on socket close.
-  try {
-    Linger l;
-    l.on = 0;
-    l.time = 0;
-    socket.setOption(lvlSock, SocketOption.LINGER, l);
-  } catch (SocketException e) {
-    throw new STE("Could not disable socket linger: " ~ to!string(e),
-      STE.Type.RESOURCE_FAILED);
-  }
-
-  // Set TCP_NODELAY.
-  try {
-    socket.setOption(SocketOptionLevel.TCP, SocketOption.TCP_NODELAY, true);
-  } catch (SocketException e) {
-    throw new STE("Could not disable Nagle's algorithm: " ~ to!string(e),
-      STE.Type.RESOURCE_FAILED);
-  }
-
-  ushort retries;
-  while (true) {
-    try {
-      socket.bind(localAddr);
-      break;
-    } catch (SocketException) {}
-
-    // If bind() worked, we breaked outside the loop above.
-    retries++;
-    if (retries < retryLimit) {
-      Thread.sleep(retryDelay);
-    } else {
-      throw new STE(text("Could not bind to address: ", localAddr),
-        STE.Type.RESOURCE_FAILED);
-    }
-  }
-
-  socket.listen(backlog);
-  return socket;
-}
-
-unittest {
-  // Test interrupt().
-  {
-    auto sock = new TServerSocket(0);
-    sock.listen();
-    scope (exit) sock.close();
-
-    auto cancellation = new TCancellationOrigin;
-
-    auto intThread = new Thread({
-      // Sleep for a bit until the socket is accepting.
-      Thread.sleep(dur!"msecs"(50));
-      cancellation.trigger();
-    });
-    intThread.start();
-
-    import std.exception;
-    assertThrown!TCancelledException(sock.accept(cancellation));
-  }
-
-  // Test receive() timeout on accepted client sockets.
-  {
-    immutable port = 11122;
-    auto timeout = dur!"msecs"(500);
-    auto serverSock = new TServerSocket(port, timeout, timeout);
-    serverSock.listen();
-    scope (exit) serverSock.close();
-
-    auto clientSock = new TSocket("127.0.0.1", port);
-    clientSock.open();
-    scope (exit) clientSock.close();
-
-    shared bool hasTimedOut;
-    auto recvThread = new Thread({
-      auto sock = serverSock.accept();
-      ubyte[1] data;
-      try {
-        sock.read(data);
-      } catch (TTransportException e) {
-        if (e.type == TTransportException.Type.TIMED_OUT) {
-          hasTimedOut = true;
-        } else {
-          import std.stdio;
-          stderr.writeln(e);
-        }
-      }
-    });
-    recvThread.isDaemon = true;
-    recvThread.start();
-
-    // Wait for the timeout, with a little bit of spare time.
-    Thread.sleep(timeout + dur!"msecs"(50));
-    enforce(hasTimedOut,
-      "Client socket receive() blocked for longer than recvTimeout.");
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/ssl.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/ssl.d
deleted file mode 100644
index 2dd9d23..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/server/transport/ssl.d
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.server.transport.ssl;
-
-import std.datetime : Duration;
-import std.exception : enforce;
-import std.socket : Socket;
-import thrift.server.transport.socket;
-import thrift.transport.base;
-import thrift.transport.socket;
-import thrift.transport.ssl;
-
-/**
- * A server transport implementation using SSL-encrypted sockets.
- *
- * Note:
- * On Posix systems which do not have the BSD-specific SO_NOSIGPIPE flag, you
- * might want to ignore the SIGPIPE signal, as OpenSSL might try to write to
- * a closed socket if the peer disconnects abruptly:
- * ---
- * import core.stdc.signal;
- * import core.sys.posix.signal;
- * signal(SIGPIPE, SIG_IGN);
- * ---
- *
- * See: thrift.transport.ssl.
- */
-class TSSLServerSocket : TServerSocket {
-  /**
-   * Creates a new TSSLServerSocket.
-   *
-   * Params:
-   *   port = The port on which to listen.
-   *   sslContext = The TSSLContext to use for creating client
-   *     sockets. Must be in server-side mode.
-   */
-  this(ushort port, TSSLContext sslContext) {
-    super(port);
-    setSSLContext(sslContext);
-  }
-
-  /**
-   * Creates a new TSSLServerSocket.
-   *
-   * Params:
-   *   port = The port on which to listen.
-   *   sendTimeout = The send timeout to set on the client sockets.
-   *   recvTimeout = The receive timeout to set on the client sockets.
-   *   sslContext = The TSSLContext to use for creating client
-   *     sockets. Must be in server-side mode.
-   */
-  this(ushort port, Duration sendTimeout, Duration recvTimeout,
-    TSSLContext sslContext)
-  {
-    super(port, sendTimeout, recvTimeout);
-    setSSLContext(sslContext);
-  }
-
-protected:
-  override TSocket createTSocket(Socket socket) {
-    return new TSSLSocket(sslContext_, socket);
-  }
-
-private:
-  void setSSLContext(TSSLContext sslContext) {
-    enforce(sslContext.serverSide, new TTransportException(
-      "Need server-side SSL socket factory for TSSLServerSocket"));
-    sslContext_ = sslContext;
-  }
-
-  TSSLContext sslContext_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/base.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/base.d
deleted file mode 100644
index 7e76a59..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/base.d
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.transport.base;
-
-import core.stdc.string : strerror;
-import std.conv : text;
-import thrift.base;
-
-/**
- * An entity data can be read from and/or written to.
- *
- * A TTransport implementation may capable of either reading or writing, but
- * not necessarily both.
- */
-interface TTransport {
-  /**
-   * Whether this transport is open.
-   *
-   * If a transport is closed, it can be opened by calling open(), and vice
-   * versa for close().
-   *
-   * While a transport should always be open when trying to read/write data,
-   * the related functions do not necessarily fail when called for a closed
-   * transport. Situations like this could occur e.g. with a wrapper
-   * transport which buffers data when the underlying transport has already
-   * been closed (possibly because the connection was abruptly closed), but
-   * there is still data left to be read in the buffers. This choice has been
-   * made to simplify transport implementations, in terms of both  code
-   * complexity and runtime overhead.
-   */
-  bool isOpen() @property;
-
-  /**
-   * Tests whether there is more data to read or if the remote side is
-   * still open.
-   *
-   * A typical use case would be a server checking if it should process
-   * another request on the transport.
-   */
-  bool peek();
-
-  /**
-   * Opens the transport for communications.
-   *
-   * If the transport is already open, nothing happens.
-   *
-   * Throws: TTransportException if opening fails.
-   */
-  void open();
-
-  /**
-   * Closes the transport.
-   *
-   * If the transport is not open, nothing happens.
-   *
-   * Throws: TTransportException if closing fails.
-   */
-  void close();
-
-  /**
-   * Attempts to fill the given buffer by reading data.
-   *
-   * For potentially blocking data sources (e.g. sockets), read() will only
-   * block if no data is available at all. If there is some data available,
-   * but waiting for new data to arrive would be required to fill the whole
-   * buffer, the readily available data will be immediately returned – use
-   * readAll() if you want to wait until the whole buffer is filled.
-   *
-   * Params:
-   *   buf = Slice to use as buffer.
-   *
-   * Returns: How many bytes were actually read
-   *
-   * Throws: TTransportException if an error occurs.
-   */
-  size_t read(ubyte[] buf);
-
-  /**
-   * Fills the given buffer by reading data into it, failing if not enough
-   * data is available.
-   *
-   * Params:
-   *   buf = Slice to use as buffer.
-   *
-   * Throws: TTransportException if insufficient data is available or reading
-   *   fails altogether.
-   */
-  void readAll(ubyte[] buf);
-
-  /**
-   * Must be called by clients when read is completed.
-   *
-   * Implementations can choose to perform a transport-specific action, e.g.
-   * logging the request to a file.
-   *
-   * Returns: The number of bytes read if available, 0 otherwise.
-   */
-  size_t readEnd();
-
-  /**
-   * Writes the passed slice of data.
-   *
-   * Note: You must call flush() to ensure the data is actually written,
-   * and available to be read back in the future.  Destroying a TTransport
-   * object does not automatically flush pending data – if you destroy a
-   * TTransport object with written but unflushed data, that data may be
-   * discarded.
-   *
-   * Params:
-   *   buf = Slice of data to write.
-   *
-   * Throws: TTransportException if an error occurs.
-   */
-  void write(in ubyte[] buf);
-
-  /**
-   * Must be called by clients when write is completed.
-   *
-   * Implementations can choose to perform a transport-specific action, e.g.
-   * logging the request to a file.
-   *
-   * Returns: The number of bytes written if available, 0 otherwise.
-   */
-  size_t writeEnd();
-
-  /**
-   * Flushes any pending data to be written.
-   *
-   * Must be called before destruction to ensure writes are actually complete,
-   * otherwise pending data may be discarded. Typically used with buffered
-   * transport mechanisms.
-   *
-   * Throws: TTransportException if an error occurs.
-   */
-  void flush();
-
-  /**
-   * Attempts to return a slice of <code>len</code> bytes of incoming data,
-   * possibly copied into buf, not consuming them (i.e.: a later read will
-   * return the same data).
-   *
-   * This method is meant to support protocols that need to read variable-
-   * length fields. They can attempt to borrow the maximum amount of data that
-   * they will need, then <code>consume()</code> what they actually use. Some
-   * transports will not support this method and others will fail occasionally,
-   * so protocols must be prepared to fall back to <code>read()</code> if
-   * borrow fails.
-   *
-   * The transport must be open when calling this.
-   *
-   * Params:
-   *   buf = A buffer where the data can be stored if needed, or null to
-   *     indicate that the caller is not supplying storage, but would like a
-   *     slice of an internal buffer, if available.
-   *   len = The number of bytes to borrow.
-   *
-   * Returns: If the borrow succeeds, a slice containing the borrowed data,
-   *   null otherwise. The slice will be at least as long as requested, but
-   *   may be longer if the returned slice points into an internal buffer
-   *   rather than buf.
-   *
-   * Throws: TTransportException if an error occurs.
-   */
-  const(ubyte)[] borrow(ubyte* buf, size_t len) out (result) {
-    // FIXME: Commented out because len gets corrupted in
-    // thrift.transport.memory borrow() unittest.
-    version(none) assert(result is null || result.length >= len,
-       "Buffer returned by borrow() too short.");
-  }
-
-  /**
-   * Remove len bytes from the transport. This must always follow a borrow
-   * of at least len bytes, and should always succeed.
-   *
-   * The transport must be open when calling this.
-   *
-   * Params:
-   *   len = Number of bytes to consume.
-   *
-   * Throws: TTransportException if an error occurs.
-   */
-  void consume(size_t len);
-}
-
-/**
- * Provides basic fall-back implementations of the TTransport interface.
- */
-class TBaseTransport : TTransport {
-  override bool isOpen() @property {
-    return false;
-  }
-
-  override bool peek() {
-    return isOpen;
-  }
-
-  override void open() {
-    throw new TTransportException("Cannot open TBaseTransport.",
-      TTransportException.Type.NOT_IMPLEMENTED);
-  }
-
-  override void close() {
-    throw new TTransportException("Cannot close TBaseTransport.",
-      TTransportException.Type.NOT_IMPLEMENTED);
-  }
-
-  override size_t read(ubyte[] buf) {
-    throw new TTransportException("Cannot read from a TBaseTransport.",
-      TTransportException.Type.NOT_IMPLEMENTED);
-  }
-
-  override void readAll(ubyte[] buf) {
-    size_t have;
-    while (have < buf.length) {
-      size_t get = read(buf[have..$]);
-      if (get <= 0) {
-        throw new TTransportException(text("Could not readAll() ", buf.length,
-          " bytes as no more data was available after ", have, " bytes."),
-          TTransportException.Type.END_OF_FILE);
-      }
-      have += get;
-    }
-  }
-
-  override size_t readEnd() {
-    // Do nothing by default, not needed by all implementations.
-    return 0;
-  }
-
-  override void write(in ubyte[] buf) {
-    throw new TTransportException("Cannot write to a TBaseTransport.",
-      TTransportException.Type.NOT_IMPLEMENTED);
-  }
-
-  override size_t writeEnd() {
-    // Do nothing by default, not needed by all implementations.
-    return 0;
-  }
-
-  override void flush() {
-    // Do nothing by default, not needed by all implementations.
-  }
-
-  override const(ubyte)[] borrow(ubyte* buf, size_t len) {
-    // borrow() is allowed to fail anyway, so just return null.
-    return null;
-  }
-
-  override void consume(size_t len) {
-    throw new TTransportException("Cannot consume from a TBaseTransport.",
-      TTransportException.Type.NOT_IMPLEMENTED);
-  }
-
-protected:
-  this() {}
-}
-
-/**
- * Makes a TTransport which wraps a given source transport in some way.
- *
- * A common use case is inside server implementations, where the raw client
- * connections accepted from e.g. TServerSocket need to be wrapped into
- * buffered or compressed transports.
- */
-class TTransportFactory {
-  /**
-   * Default implementation does nothing, just returns the transport given.
-   */
-  TTransport getTransport(TTransport trans) {
-    return trans;
-  }
-}
-
-/**
- * Transport factory for transports which simply wrap an underlying TTransport
- * without requiring additional configuration.
- */
-class TWrapperTransportFactory(T) if (
-  is(T : TTransport) && __traits(compiles, new T(TTransport.init))
-)  : TTransportFactory {
-  override T getTransport(TTransport trans) {
-    return new T(trans);
-  }
-}
-
-/**
- * Transport-level exception.
- */
-class TTransportException : TException {
-  /**
-   * Error codes for the various types of exceptions.
-   */
-  enum Type {
-    UNKNOWN, ///
-    NOT_OPEN, ///
-    TIMED_OUT, ///
-    END_OF_FILE, ///
-    INTERRUPTED, ///
-    BAD_ARGS, ///
-    CORRUPTED_DATA, ///
-    INTERNAL_ERROR, ///
-    NOT_IMPLEMENTED ///
-  }
-
-  ///
-  this(Type type, string file = __FILE__, size_t line = __LINE__, Throwable next = null) {
-    static string msgForType(Type type) {
-      switch (type) {
-        case Type.UNKNOWN: return "Unknown transport exception";
-        case Type.NOT_OPEN: return "Transport not open";
-        case Type.TIMED_OUT: return "Timed out";
-        case Type.END_OF_FILE: return "End of file";
-        case Type.INTERRUPTED: return "Interrupted";
-        case Type.BAD_ARGS: return "Invalid arguments";
-        case Type.CORRUPTED_DATA: return "Corrupted Data";
-        case Type.INTERNAL_ERROR: return "Internal error";
-        case Type.NOT_IMPLEMENTED: return "Not implemented";
-        default: return "(Invalid exception type)";
-      }
-    }
-    this(msgForType(type), type, file, line, next);
-  }
-
-  ///
-  this(string msg, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    this(msg, Type.UNKNOWN, file, line, next);
-  }
-
-  ///
-  this(string msg, Type type, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    super(msg, file, line, next);
-    type_ = type;
-  }
-
-  ///
-  Type type() const nothrow @property {
-    return type_;
-  }
-
-protected:
-  Type type_;
-}
-
-/**
- * Meta-programming helper returning whether the passed type is a TTransport
- * implementation.
- */
-template isTTransport(T) {
-  enum isTTransport = is(T : TTransport);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/buffered.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/buffered.d
deleted file mode 100644
index cabfbdc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/buffered.d
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.transport.buffered;
-
-import std.algorithm : min;
-import std.array : empty;
-import std.exception : enforce;
-import thrift.transport.base;
-
-/**
- * Wraps another transport and buffers reads and writes until the internal
- * buffers are exhausted, at which point new data is fetched resp. the
- * accumulated data is written out at once.
- */
-final class TBufferedTransport : TBaseTransport {
-  /**
-   * Constructs a new instance, using the default buffer sizes.
-   *
-   * Params:
-   *   transport = The underlying transport to wrap.
-   */
-  this(TTransport transport) {
-    this(transport, DEFAULT_BUFFER_SIZE);
-  }
-
-  /**
-   * Constructs a new instance, using the specified buffer size.
-   *
-   * Params:
-   *   transport = The underlying transport to wrap.
-   *   bufferSize = The size of the read and write buffers to use, in bytes.
-   */
-  this(TTransport transport, size_t bufferSize) {
-    this(transport, bufferSize, bufferSize);
-  }
-
-  /**
-   * Constructs a new instance, using the specified buffer size.
-   *
-   * Params:
-   *   transport = The underlying transport to wrap.
-   *   readBufferSize = The size of the read buffer to use, in bytes.
-   *   writeBufferSize = The size of the write buffer to use, in bytes.
-   */
-  this(TTransport transport, size_t readBufferSize, size_t writeBufferSize) {
-    transport_ = transport;
-    readBuffer_ = new ubyte[readBufferSize];
-    writeBuffer_ = new ubyte[writeBufferSize];
-    writeAvail_ = writeBuffer_;
-  }
-
-  /// The default size of the read/write buffers, in bytes.
-  enum int DEFAULT_BUFFER_SIZE = 512;
-
-  override bool isOpen() @property {
-    return transport_.isOpen();
-  }
-
-  override bool peek() {
-    if (readAvail_.empty) {
-      // If there is nothing available to read, see if we can get something
-      // from the underlying transport.
-      auto bytesRead = transport_.read(readBuffer_);
-      readAvail_ = readBuffer_[0 .. bytesRead];
-    }
-
-    return !readAvail_.empty;
-  }
-
-  override void open() {
-    transport_.open();
-  }
-
-  override void close() {
-    if (!isOpen) return;
-    flush();
-    transport_.close();
-  }
-
-  override size_t read(ubyte[] buf) {
-    if (readAvail_.empty) {
-      // No data left in our buffer, fetch some from the underlying transport.
-
-      if (buf.length > readBuffer_.length) {
-        // If the amount of data requested is larger than our reading buffer,
-        // directly read to the passed buffer. This probably doesn't occur too
-        // often in practice (and even if it does, the underlying transport
-        // probably cannot fulfill the request at once anyway), but it can't
-        // harm to try…
-        return transport_.read(buf);
-      }
-
-      auto bytesRead = transport_.read(readBuffer_);
-      readAvail_ = readBuffer_[0 .. bytesRead];
-    }
-
-    // Hand over whatever we have.
-    auto give = min(readAvail_.length, buf.length);
-    buf[0 .. give] = readAvail_[0 .. give];
-    readAvail_ = readAvail_[give .. $];
-    return give;
-  }
-
-  /**
-   * Shortcut version of readAll.
-   */
-  override void readAll(ubyte[] buf) {
-    if (readAvail_.length >= buf.length) {
-      buf[] = readAvail_[0 .. buf.length];
-      readAvail_ = readAvail_[buf.length .. $];
-      return;
-    }
-
-    super.readAll(buf);
-  }
-
-  override void write(in ubyte[] buf) {
-    if (writeAvail_.length >= buf.length) {
-      // If the data fits in the buffer, just save it there.
-      writeAvail_[0 .. buf.length] = buf;
-      writeAvail_ = writeAvail_[buf.length .. $];
-      return;
-    }
-
-    // We have to decide if we copy data from buf to our internal buffer, or
-    // just directly write them out. The same considerations about avoiding
-    // syscalls as for C++ apply here.
-    auto bytesAvail = writeAvail_.ptr - writeBuffer_.ptr;
-    if ((bytesAvail + buf.length >= 2 * writeBuffer_.length) || (bytesAvail == 0)) {
-      // We would immediately need two syscalls anyway (or we don't have
-      // anything) in our buffer to write, so just write out both buffers.
-      if (bytesAvail > 0) {
-        transport_.write(writeBuffer_[0 .. bytesAvail]);
-        writeAvail_ = writeBuffer_;
-      }
-
-      transport_.write(buf);
-      return;
-    }
-
-    // Fill up our internal buffer for a write.
-    writeAvail_[] = buf[0 .. writeAvail_.length];
-    auto left = buf[writeAvail_.length .. $];
-    transport_.write(writeBuffer_);
-
-    // Copy the rest into our buffer.
-    writeBuffer_[0 .. left.length] = left[];
-    writeAvail_ = writeBuffer_[left.length .. $];
-  }
-
-  override void flush() {
-    // Write out any data waiting in the write buffer.
-    auto bytesAvail = writeAvail_.ptr - writeBuffer_.ptr;
-    if (bytesAvail > 0) {
-      // Note that we reset writeAvail_ prior to calling the underlying protocol
-      // to make sure the buffer is cleared even if the transport throws an
-      // exception.
-      writeAvail_ = writeBuffer_;
-      transport_.write(writeBuffer_[0 .. bytesAvail]);
-    }
-
-    // Flush the underlying transport.
-    transport_.flush();
-  }
-
-  override const(ubyte)[] borrow(ubyte* buf, size_t len) {
-    if (len <= readAvail_.length) {
-      return readAvail_;
-    }
-    return null;
-  }
-
-  override void consume(size_t len) {
-    enforce(len <= readBuffer_.length, new TTransportException(
-      "Invalid consume length.", TTransportException.Type.BAD_ARGS));
-    readAvail_ = readAvail_[len .. $];
-  }
-
-  /**
-   * The wrapped transport.
-   */
-  TTransport underlyingTransport() @property {
-    return transport_;
-  }
-
-private:
-  TTransport transport_;
-
-  ubyte[] readBuffer_;
-  ubyte[] writeBuffer_;
-
-  ubyte[] readAvail_;
-  ubyte[] writeAvail_;
-}
-
-/**
- * Wraps given transports into TBufferedTransports.
- */
-alias TWrapperTransportFactory!TBufferedTransport TBufferedTransportFactory;
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/file.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/file.d
deleted file mode 100644
index 04d34ac..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/file.d
+++ /dev/null
@@ -1,1100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Transports for reading from/writing to Thrift »log files«.
- *
- * These transports are not »stupid« sources and sinks just reading and
- * writing bytes from a file verbatim, but organize the contents in the form
- * of so-called »events«, which refers to the data written between two flush()
- * calls.
- *
- * Chunking is supported, events are guaranteed to never span chunk boundaries.
- * As a consequence, an event can never be larger than the chunk size. The
- * chunk size used is not saved with the file, so care has to be taken to make
- * sure the same chunk size is used for reading and writing.
- */
-module thrift.transport.file;
-
-import core.thread : Thread;
-import std.array : empty;
-import std.algorithm : min, max;
-import std.concurrency;
-import std.conv : to;
-import std.datetime : AutoStart, dur, Duration, StopWatch;
-import std.exception;
-import std.stdio : File;
-import thrift.base;
-import thrift.transport.base;
-
-/// The default chunk size, in bytes.
-enum DEFAULT_CHUNK_SIZE = 16 * 1024 * 1024;
-
-/// The type used to represent event sizes in the file.
-alias uint EventSize;
-
-version (BigEndian) {
-  static assert(false,
-    "Little endian byte order is assumed in thrift.transport.file.");
-}
-
-/**
- * A transport used to read log files. It can never be written to, calling
- * write() throws.
- *
- * Contrary to the C++ design, explicitly opening the transport/file before
- * using is necessary to allow manually closing the file without relying on the
- * object lifetime. Otherwise, it's a straight port of the C++ implementation.
- */
-final class TFileReaderTransport : TBaseTransport {
-  /**
-   * Creates a new file writer transport.
-   *
-   * Params:
-   *   path = Path of the file to opperate on.
-   */
-  this(string path) {
-    path_ = path;
-    chunkSize_ = DEFAULT_CHUNK_SIZE;
-    readBufferSize_ = DEFAULT_READ_BUFFER_SIZE;
-    readTimeout_ = DEFAULT_READ_TIMEOUT;
-    corruptedEventSleepDuration_ = DEFAULT_CORRUPTED_EVENT_SLEEP_DURATION;
-    maxEventSize = DEFAULT_MAX_EVENT_SIZE;
-  }
-
-  override bool isOpen() @property {
-    return isOpen_;
-  }
-
-  override bool peek() {
-    if (!isOpen) return false;
-
-    // If there is no event currently processed, try fetching one from the
-    // file.
-    if (!currentEvent_) {
-      currentEvent_ = readEvent();
-
-      if (!currentEvent_) {
-        // Still nothing there, couldn't read a new event.
-        return false;
-      }
-    }
-    // check if there is anything to read
-    return (currentEvent_.length - currentEventPos_) > 0;
-  }
-
-  override void open() {
-    if (isOpen) return;
-    try {
-      file_ = File(path_, "rb");
-    } catch (Exception e) {
-      throw new TTransportException("Error on opening input file.",
-        TTransportException.Type.NOT_OPEN, __FILE__, __LINE__, e);
-    }
-    isOpen_ = true;
-  }
-
-  override void close() {
-    if (!isOpen) return;
-
-    file_.close();
-    isOpen_ = false;
-    readState_.resetAllValues();
-  }
-
-  override size_t read(ubyte[] buf) {
-    enforce(isOpen, new TTransportException(
-      "Cannot read if file is not open.", TTransportException.Type.NOT_OPEN));
-
-    // If there is no event currently processed, try fetching one from the
-    // file.
-    if (!currentEvent_) {
-      currentEvent_ = readEvent();
-
-      if (!currentEvent_) {
-        // Still nothing there, couldn't read a new event.
-        return 0;
-      }
-    }
-
-    auto len = buf.length;
-    auto remaining = currentEvent_.length - currentEventPos_;
-
-    if (remaining <= len) {
-      // If less than the requested length is available, read as much as
-      // possible.
-      buf[0 .. remaining] = currentEvent_[currentEventPos_ .. $];
-      currentEvent_ = null;
-      currentEventPos_ = 0;
-      return remaining;
-    }
-
-    // There will still be data left in the buffer after reading, pass out len
-    // bytes.
-    buf[] = currentEvent_[currentEventPos_ .. currentEventPos_ + len];
-    currentEventPos_ += len;
-    return len;
-  }
-
-  ulong getNumChunks() {
-    enforce(isOpen, new TTransportException(
-      "Cannot get number of chunks if file not open.",
-      TTransportException.Type.NOT_OPEN));
-
-    try {
-      auto fileSize = file_.size();
-      if (fileSize == 0) {
-        // Empty files have no chunks.
-        return 0;
-      }
-      return ((fileSize)/chunkSize_) + 1;
-    } catch (Exception e) {
-      throw new TTransportException("Error getting file size.", __FILE__,
-        __LINE__, e);
-    }
-  }
-
-  ulong getCurChunk() {
-    return offset_ / chunkSize_;
-  }
-
-  void seekToChunk(long chunk) {
-    enforce(isOpen, new TTransportException(
-      "Cannot get number of chunks if file not open.",
-      TTransportException.Type.NOT_OPEN));
-
-    auto numChunks = getNumChunks();
-
-    if (chunk < 0) {
-      // Count negative indices from the end.
-      chunk += numChunks;
-    }
-
-    if (chunk < 0) {
-      logError("Incorrect chunk number for reverse seek, seeking to " ~
-       "beginning instead: %s", chunk);
-      chunk = 0;
-    }
-
-    bool seekToEnd;
-    long minEndOffset;
-    if (chunk >= numChunks) {
-      logError("Trying to seek to non-existing chunk, seeking to " ~
-       "end of file instead: %s", chunk);
-      seekToEnd = true;
-      chunk = numChunks - 1;
-      // this is the min offset to process events till
-      minEndOffset = file_.size();
-    }
-
-    readState_.resetAllValues();
-    currentEvent_ = null;
-
-    try {
-      file_.seek(chunk * chunkSize_);
-      offset_ = chunk * chunkSize_;
-    } catch (Exception e) {
-      throw new TTransportException("Error seeking to chunk", __FILE__,
-        __LINE__, e);
-    }
-
-    if (seekToEnd) {
-      // Never wait on the end of the file for new content, we just want to
-      // find the last one.
-      auto oldReadTimeout = readTimeout_;
-      scope (exit) readTimeout_ = oldReadTimeout;
-      readTimeout_ = dur!"hnsecs"(0);
-
-      // Keep on reading unti the last event at point of seekToChunk call.
-      while ((offset_ + readState_.bufferPos_) < minEndOffset) {
-        if (readEvent() is null) {
-          break;
-        }
-      }
-    }
-  }
-
-  void seekToEnd() {
-    seekToChunk(getNumChunks());
-  }
-
-  /**
-   * The size of the chunks the file is divided into, in bytes.
-   */
-  ulong chunkSize() @property const {
-    return chunkSize_;
-  }
-
-  /// ditto
-  void chunkSize(ulong value) @property {
-    enforce(!isOpen, new TTransportException(
-      "Cannot set chunk size after TFileReaderTransport has been opened."));
-    enforce(value > EventSize.sizeof, new TTransportException("Chunks must " ~
-      "be large enough to accommodate at least a single byte of payload data."));
-    chunkSize_ = value;
-  }
-
-  /**
-   * If positive, wait the specified duration for new data when arriving at
-   * end of file. If negative, wait forever (tailing mode), waking up to check
-   * in the specified interval. If zero, do not wait at all.
-   *
-   * Defaults to 500 ms.
-   */
-  Duration readTimeout() @property const {
-    return readTimeout_;
-  }
-
-  /// ditto
-  void readTimeout(Duration value) @property {
-    readTimeout_ = value;
-  }
-
-  /// ditto
-  enum DEFAULT_READ_TIMEOUT = dur!"msecs"(500);
-
-  /**
-   * Read buffer size, in bytes.
-   *
-   * Defaults to 1 MiB.
-   */
-  size_t readBufferSize() @property const {
-    return readBufferSize_;
-  }
-
-  /// ditto
-  void readBufferSize(size_t value) @property {
-    if (readBuffer_) {
-      enforce(value <= readBufferSize_,
-        "Cannot shrink read buffer after first read.");
-      readBuffer_.length = value;
-    }
-    readBufferSize_ = value;
-  }
-
-  /// ditto
-  enum DEFAULT_READ_BUFFER_SIZE = 1 * 1024 * 1024;
-
-  /**
-   * Arbitrary event size limit, in bytes. Must be smaller than chunk size.
-   *
-   * Defaults to zero (no limit).
-   */
-  size_t maxEventSize() @property const {
-    return maxEventSize_;
-  }
-
-  /// ditto
-  void maxEventSize(size_t value) @property {
-    enforce(value <= chunkSize_ - EventSize.sizeof, "Events cannot span " ~
-      "mutiple chunks, maxEventSize must be smaller than chunk size.");
-    maxEventSize_ = value;
-  }
-
-  /// ditto
-  enum DEFAULT_MAX_EVENT_SIZE = 0;
-
-  /**
-   * The interval at which the thread wakes up to check for the next chunk
-   * in tailing mode.
-   *
-   * Defaults to one second.
-   */
-  Duration corruptedEventSleepDuration() const {
-    return corruptedEventSleepDuration_;
-  }
-
-  /// ditto
-  void corruptedEventSleepDuration(Duration value) {
-    corruptedEventSleepDuration_ = value;
-  }
-
-  /// ditto
-  enum DEFAULT_CORRUPTED_EVENT_SLEEP_DURATION = dur!"seconds"(1);
-
-  /**
-   * The maximum number of corrupted events tolerated before the whole chunk
-   * is skipped.
-   *
-   * Defaults to zero.
-   */
-  uint maxCorruptedEvents() @property const {
-    return maxCorruptedEvents_;
-  }
-
-  /// ditto
-  void maxCorruptedEvents(uint value) @property {
-    maxCorruptedEvents_ = value;
-  }
-
-  /// ditto
-  enum DEFAULT_MAX_CORRUPTED_EVENTS = 0;
-
-private:
-  ubyte[] readEvent() {
-    if (!readBuffer_) {
-      readBuffer_ = new ubyte[readBufferSize_];
-    }
-
-    bool timeoutExpired;
-    while (1) {
-      // read from the file if read buffer is exhausted
-      if (readState_.bufferPos_ == readState_.bufferLen_) {
-        // advance the offset pointer
-        offset_ += readState_.bufferLen_;
-
-        try {
-          // Need to clear eof flag before reading, otherwise tailing a file
-          // does not work.
-          file_.clearerr();
-
-          auto usedBuf = file_.rawRead(readBuffer_);
-          readState_.bufferLen_ = usedBuf.length;
-        } catch (Exception e) {
-          readState_.resetAllValues();
-          throw new TTransportException("Error while reading from file",
-            __FILE__, __LINE__, e);
-        }
-
-        readState_.bufferPos_ = 0;
-        readState_.lastDispatchPos_ = 0;
-
-        if (readState_.bufferLen_ == 0) {
-          // Reached end of file.
-          if (readTimeout_ < dur!"hnsecs"(0)) {
-            // Tailing mode, sleep for the specified duration and try again.
-            Thread.sleep(-readTimeout_);
-            continue;
-          } else if (readTimeout_ == dur!"hnsecs"(0) || timeoutExpired) {
-            // Either no timeout set, or it has already expired.
-            readState_.resetState(0);
-            return null;
-          } else {
-            // Timeout mode, sleep for the specified amount of time and retry.
-            Thread.sleep(readTimeout_);
-            timeoutExpired = true;
-            continue;
-          }
-        }
-      }
-
-      // Attempt to read an event from the buffer.
-      while (readState_.bufferPos_ < readState_.bufferLen_) {
-        if (readState_.readingSize_) {
-          if (readState_.eventSizeBuffPos_ == 0) {
-            if ((offset_ + readState_.bufferPos_)/chunkSize_ !=
-              ((offset_ + readState_.bufferPos_ + 3)/chunkSize_))
-            {
-              readState_.bufferPos_++;
-              continue;
-            }
-          }
-
-          readState_.eventSizeBuff_[readState_.eventSizeBuffPos_++] =
-            readBuffer_[readState_.bufferPos_++];
-
-          if (readState_.eventSizeBuffPos_ == 4) {
-            auto size = (cast(uint[])readState_.eventSizeBuff_)[0];
-
-            if (size == 0) {
-              // This is part of the zero padding between chunks.
-              readState_.resetState(readState_.lastDispatchPos_);
-              continue;
-            }
-
-            // got a valid event
-            readState_.readingSize_ = false;
-            readState_.eventLen_ = size;
-            readState_.eventPos_ = 0;
-
-            // check if the event is corrupted and perform recovery if required
-            if (isEventCorrupted()) {
-              performRecovery();
-              // start from the top
-              break;
-            }
-          }
-        } else {
-          if (!readState_.event_) {
-            readState_.event_ = new ubyte[readState_.eventLen_];
-          }
-
-          // take either the entire event or the remaining bytes in the buffer
-          auto reclaimBuffer = min(readState_.bufferLen_ - readState_.bufferPos_,
-            readState_.eventLen_ - readState_.eventPos_);
-
-          // copy data from read buffer into event buffer
-          readState_.event_[
-            readState_.eventPos_ .. readState_.eventPos_ + reclaimBuffer
-          ] = readBuffer_[
-            readState_.bufferPos_ .. readState_.bufferPos_ + reclaimBuffer
-          ];
-
-          // increment position ptrs
-          readState_.eventPos_ += reclaimBuffer;
-          readState_.bufferPos_ += reclaimBuffer;
-
-          // check if the event has been read in full
-          if (readState_.eventPos_ == readState_.eventLen_) {
-            // Reset the read state and return the completed event.
-            auto completeEvent = readState_.event_;
-            readState_.event_ = null;
-            readState_.resetState(readState_.bufferPos_);
-            return completeEvent;
-          }
-        }
-      }
-    }
-  }
-
-  bool isEventCorrupted() {
-    if ((maxEventSize_ > 0) && (readState_.eventLen_ > maxEventSize_)) {
-      // Event size is larger than user-speficied max-event size
-      logError("Corrupt event read: Event size (%s) greater than max " ~
-        "event size (%s)", readState_.eventLen_, maxEventSize_);
-      return true;
-    } else if (readState_.eventLen_ > chunkSize_) {
-      // Event size is larger than chunk size
-      logError("Corrupt event read: Event size (%s) greater than chunk " ~
-        "size (%s)", readState_.eventLen_, chunkSize_);
-      return true;
-    } else if (((offset_ + readState_.bufferPos_ - EventSize.sizeof) / chunkSize_) !=
-      ((offset_ + readState_.bufferPos_ + readState_.eventLen_ - EventSize.sizeof) / chunkSize_))
-    {
-      // Size indicates that event crosses chunk boundary
-      logError("Read corrupt event. Event crosses chunk boundary. " ~
-        "Event size: %s. Offset: %s", readState_.eventLen_,
-        (offset_ + readState_.bufferPos_ + EventSize.sizeof)
-      );
-
-      return true;
-    }
-
-    return false;
-  }
-
-  void performRecovery() {
-    // perform some kickass recovery
-    auto curChunk = getCurChunk();
-    if (lastBadChunk_ == curChunk) {
-      numCorruptedEventsInChunk_++;
-    } else {
-      lastBadChunk_ = curChunk;
-      numCorruptedEventsInChunk_ = 1;
-    }
-
-    if (numCorruptedEventsInChunk_ < maxCorruptedEvents_) {
-      // maybe there was an error in reading the file from disk
-      // seek to the beginning of chunk and try again
-      seekToChunk(curChunk);
-    } else {
-      // Just skip ahead to the next chunk if we not already at the last chunk.
-      if (curChunk != (getNumChunks() - 1)) {
-        seekToChunk(curChunk + 1);
-      } else if (readTimeout_ < dur!"hnsecs"(0)) {
-        // We are in tailing mode, wait until there is enough data to start
-        // the next chunk.
-        while(curChunk == (getNumChunks() - 1)) {
-          Thread.sleep(corruptedEventSleepDuration_);
-        }
-        seekToChunk(curChunk + 1);
-      } else {
-        // Pretty hosed at this stage, rewind the file back to the last
-        // successful point and punt on the error.
-        readState_.resetState(readState_.lastDispatchPos_);
-        currentEvent_ = null;
-        currentEventPos_ = 0;
-
-        throw new TTransportException("File corrupted at offset: " ~
-          to!string(offset_ + readState_.lastDispatchPos_),
-          TTransportException.Type.CORRUPTED_DATA);
-      }
-    }
-  }
-
-  string path_;
-  File file_;
-  bool isOpen_;
-  long offset_;
-  ubyte[] currentEvent_;
-  size_t currentEventPos_;
-  ulong chunkSize_;
-  Duration readTimeout_;
-  size_t maxEventSize_;
-
-  // Read buffer – lazily allocated on the first read().
-  ubyte[] readBuffer_;
-  size_t readBufferSize_;
-
-  static struct ReadState {
-    ubyte[] event_;
-    size_t eventLen_;
-    size_t eventPos_;
-
-    // keep track of event size
-    ubyte[4] eventSizeBuff_;
-    ubyte eventSizeBuffPos_;
-    bool readingSize_ = true;
-
-    // read buffer variables
-    size_t bufferPos_;
-    size_t bufferLen_;
-
-    // last successful dispatch point
-    size_t lastDispatchPos_;
-
-    void resetState(size_t lastDispatchPos) {
-      readingSize_ = true;
-      eventSizeBuffPos_ = 0;
-      lastDispatchPos_ = lastDispatchPos;
-    }
-
-    void resetAllValues() {
-      resetState(0);
-      bufferPos_ = 0;
-      bufferLen_ = 0;
-      event_ = null;
-    }
-  }
-  ReadState readState_;
-
-  ulong lastBadChunk_;
-  uint maxCorruptedEvents_;
-  uint numCorruptedEventsInChunk_;
-  Duration corruptedEventSleepDuration_;
-}
-
-/**
- * A transport used to write log files. It can never be read from, calling
- * read() throws.
- *
- * Contrary to the C++ design, explicitly opening the transport/file before
- * using is necessary to allow manually closing the file without relying on the
- * object lifetime.
- */
-final class TFileWriterTransport : TBaseTransport {
-  /**
-   * Creates a new file writer transport.
-   *
-   * Params:
-   *   path = Path of the file to opperate on.
-   */
-  this(string path) {
-    path_ = path;
-
-    chunkSize_ = DEFAULT_CHUNK_SIZE;
-    eventBufferSize_ = DEFAULT_EVENT_BUFFER_SIZE;
-    ioErrorSleepDuration = DEFAULT_IO_ERROR_SLEEP_DURATION;
-    maxFlushBytes_ = DEFAULT_MAX_FLUSH_BYTES;
-    maxFlushInterval_ = DEFAULT_MAX_FLUSH_INTERVAL;
-  }
-
-  override bool isOpen() @property {
-    return isOpen_;
-  }
-
-  /**
-   * A file writer transport can never be read from.
-   */
-  override bool peek() {
-    return false;
-  }
-
-  override void open() {
-    if (isOpen) return;
-
-    writerThread_ = spawn(
-      &writerThread,
-      path_,
-      chunkSize_,
-      maxFlushBytes_,
-      maxFlushInterval_,
-      ioErrorSleepDuration_
-    );
-    setMaxMailboxSize(writerThread_, eventBufferSize_, OnCrowding.block);
-    isOpen_ = true;
-  }
-
-  /**
-   * Closes the transport, i.e. the underlying file and the writer thread.
-   */
-  override void close() {
-    if (!isOpen) return;
-
-    prioritySend(writerThread_, ShutdownMessage(), thisTid); // FIXME: Should use normal send here.
-    receive((ShutdownMessage msg, Tid tid){});
-    isOpen_ = false;
-  }
-
-  /**
-   * Enqueues the passed slice of data for writing and immediately returns.
-   * write() only blocks if the event buffer has been exhausted.
-   *
-   * The transport must be open when calling this.
-   *
-   * Params:
-   *   buf = Slice of data to write.
-   */
-  override void write(in ubyte[] buf) {
-    enforce(isOpen, new TTransportException(
-      "Cannot write to non-open file.", TTransportException.Type.NOT_OPEN));
-
-    if (buf.empty) {
-      logError("Cannot write empty event, skipping.");
-      return;
-    }
-
-    auto maxSize = chunkSize - EventSize.sizeof;
-    enforce(buf.length <= maxSize, new TTransportException(
-      "Cannot write more than " ~ to!string(maxSize) ~
-      "bytes at once due to chunk size."));
-
-    send(writerThread_, buf.idup);
-  }
-
-  /**
-   * Flushes any pending data to be written.
-   *
-   * The transport must be open when calling this.
-   *
-   * Throws: TTransportException if an error occurs.
-   */
-  override void flush() {
-    enforce(isOpen, new TTransportException(
-      "Cannot flush file if not open.", TTransportException.Type.NOT_OPEN));
-
-    send(writerThread_, FlushMessage(), thisTid);
-    receive((FlushMessage msg, Tid tid){});
-  }
-
-  /**
-   * The size of the chunks the file is divided into, in bytes.
-   *
-   * A single event (write call) never spans multiple chunks – this
-   * effectively limits the event size to chunkSize - EventSize.sizeof.
-   */
-  ulong chunkSize() @property {
-    return chunkSize_;
-  }
-
-  /// ditto
-  void chunkSize(ulong value) @property {
-    enforce(!isOpen, new TTransportException(
-      "Cannot set chunk size after TFileWriterTransport has been opened."));
-    chunkSize_ = value;
-  }
-
-  /**
-   * The maximum number of write() calls buffered, or zero for no limit.
-   *
-   * If the buffer is exhausted, write() will block until space becomes
-   * available.
-   */
-  size_t eventBufferSize() @property {
-    return eventBufferSize_;
-  }
-
-  /// ditto
-  void eventBufferSize(size_t value) @property {
-    eventBufferSize_ = value;
-    if (isOpen) {
-      setMaxMailboxSize(writerThread_, value, OnCrowding.throwException);
-    }
-  }
-
-  /// ditto
-  enum DEFAULT_EVENT_BUFFER_SIZE = 10_000;
-
-  /**
-   * Maximum number of bytes buffered before writing and flushing the file
-   * to disk.
-   *
-   * Currently cannot be set after the first call to write().
-   */
-  size_t maxFlushBytes() @property {
-    return maxFlushBytes_;
-  }
-
-  /// ditto
-  void maxFlushBytes(size_t value) @property {
-    maxFlushBytes_ = value;
-    if (isOpen) {
-      send(writerThread_, FlushBytesMessage(value));
-    }
-  }
-
-  /// ditto
-  enum DEFAULT_MAX_FLUSH_BYTES = 1000 * 1024;
-
-  /**
-   * Maximum interval between flushing the file to disk.
-   *
-   * Currenlty cannot be set after the first call to write().
-   */
-  Duration maxFlushInterval() @property {
-    return maxFlushInterval_;
-  }
-
-  /// ditto
-  void maxFlushInterval(Duration value) @property {
-    maxFlushInterval_ = value;
-    if (isOpen) {
-      send(writerThread_, FlushIntervalMessage(value));
-    }
-  }
-
-  /// ditto
-  enum DEFAULT_MAX_FLUSH_INTERVAL = dur!"seconds"(3);
-
-  /**
-   * When the writer thread encounteres an I/O error, it goes pauses for a
-   * short time before trying to reopen the output file. This controls the
-   * sleep duration.
-   */
-  Duration ioErrorSleepDuration() @property {
-    return ioErrorSleepDuration_;
-  }
-
-  /// ditto
-  void ioErrorSleepDuration(Duration value) @property {
-    ioErrorSleepDuration_ = value;
-    if (isOpen) {
-      send(writerThread_, FlushIntervalMessage(value));
-    }
-  }
-
-  /// ditto
-  enum DEFAULT_IO_ERROR_SLEEP_DURATION = dur!"msecs"(500);
-
-private:
-  string path_;
-  ulong chunkSize_;
-  size_t eventBufferSize_;
-  Duration ioErrorSleepDuration_;
-  size_t maxFlushBytes_;
-  Duration maxFlushInterval_;
-  bool isOpen_;
-  Tid writerThread_;
-}
-
-private {
-  // Signals that the file should be flushed on disk. Sent to the writer
-  // thread and sent back along with the tid for confirmation.
-  struct FlushMessage {}
-
-  // Signals that the writer thread should close the file and shut down. Sent
-  // to the writer thread and sent back along with the tid for confirmation.
-  struct ShutdownMessage {}
-
-  struct FlushBytesMessage {
-    size_t value;
-  }
-
-  struct FlushIntervalMessage {
-    Duration value;
-  }
-
-  struct IoErrorSleepDurationMessage {
-    Duration value;
-  }
-
-  void writerThread(
-    string path,
-    ulong chunkSize,
-    size_t maxFlushBytes,
-    Duration maxFlushInterval,
-    Duration ioErrorSleepDuration
-  ) {
-    bool errorOpening;
-    File file;
-    ulong offset;
-    try {
-      // Open file in appending and binary mode.
-      file = File(path, "ab");
-      offset = file.tell();
-    } catch (Exception e) {
-      logError("Error on opening output file in writer thread: %s", e);
-      errorOpening = true;
-    }
-
-    auto flushTimer = StopWatch(AutoStart.yes);
-    size_t unflushedByteCount;
-
-    Tid shutdownRequestTid;
-    bool shutdownRequested;
-    while (true) {
-      if (shutdownRequested) break;
-
-      bool forceFlush;
-      Tid flushRequestTid;
-      receiveTimeout(max(dur!"hnsecs"(0), maxFlushInterval - flushTimer.peek()),
-        (immutable(ubyte)[] data) {
-          while (errorOpening) {
-            logError("Writer thread going to sleep for %s µs due to IO errors",
-              ioErrorSleepDuration.total!"usecs");
-
-            // Sleep for ioErrorSleepDuration, being ready to be interrupted
-            // by shutdown requests.
-            auto timedOut = receiveTimeout(ioErrorSleepDuration,
-              (ShutdownMessage msg, Tid tid){ shutdownRequestTid = tid; });
-            if (!timedOut) {
-              // We got a shutdown request, just drop all events and exit the
-              // main loop as to not block application shutdown with our tries
-              // which we must assume to fail.
-              break;
-            }
-
-            try {
-              file = File(path, "ab");
-              unflushedByteCount = 0;
-              errorOpening = false;
-              logError("Output file %s reopened during writer thread error " ~
-                "recovery", path);
-            } catch (Exception e) {
-              logError("Unable to reopen output file %s during writer " ~
-                "thread error recovery", path);
-            }
-          }
-
-          // Make sure the event does not cross the chunk boundary by writing
-          // a padding consisting of zeroes if it would.
-          auto chunk1 = offset / chunkSize;
-          auto chunk2 = (offset + EventSize.sizeof + data.length - 1) / chunkSize;
-
-          if (chunk1 != chunk2) {
-            // TODO: The C++ implementation refetches the offset here to »keep
-            // in sync« – why would this be needed?
-            auto padding = cast(size_t)
-              ((((offset / chunkSize) + 1) * chunkSize) - offset);
-            auto zeroes = new ubyte[padding];
-            file.rawWrite(zeroes);
-            unflushedByteCount += padding;
-            offset += padding;
-          }
-
-          // TODO: 2 syscalls here, is this a problem performance-wise?
-          // Probably abysmal performance on Windows due to rawWrite
-          // implementation.
-          uint len = cast(uint)data.length;
-          file.rawWrite(cast(ubyte[])(&len)[0..1]);
-          file.rawWrite(data);
-
-          auto bytesWritten = EventSize.sizeof + data.length;
-          unflushedByteCount += bytesWritten;
-          offset += bytesWritten;
-        }, (FlushBytesMessage msg) {
-          maxFlushBytes = msg.value;
-        }, (FlushIntervalMessage msg) {
-          maxFlushInterval = msg.value;
-        }, (IoErrorSleepDurationMessage msg) {
-          ioErrorSleepDuration = msg.value;
-        }, (FlushMessage msg, Tid tid) {
-          forceFlush = true;
-          flushRequestTid = tid;
-        }, (OwnerTerminated msg) {
-          shutdownRequested = true;
-        }, (ShutdownMessage msg, Tid tid) {
-          shutdownRequested = true;
-          shutdownRequestTid = tid;
-        }
-      );
-
-      if (errorOpening) continue;
-
-      bool flush;
-      if (forceFlush || shutdownRequested || unflushedByteCount > maxFlushBytes) {
-        flush = true;
-      } else if (cast(Duration)flushTimer.peek() > maxFlushInterval) {
-        if (unflushedByteCount == 0) {
-          // If the flush timer is due, but no data has been written, don't
-          // needlessly fsync, but do reset the timer.
-          flushTimer.reset();
-        } else {
-          flush = true;
-        }
-      }
-
-      if (flush) {
-        file.flush();
-        flushTimer.reset();
-        unflushedByteCount = 0;
-        if (forceFlush) send(flushRequestTid, FlushMessage(), thisTid);
-      }
-    }
-
-    file.close();
-
-    if (shutdownRequestTid != Tid.init) {
-      send(shutdownRequestTid, ShutdownMessage(), thisTid);
-    }
-  }
-}
-
-version (unittest) {
-  import core.memory : GC;
-  import std.file;
-}
-
-unittest {
-  void tryRemove(string fileName) {
-    try {
-      remove(fileName);
-    } catch (Exception) {}
-  }
-
-  immutable fileName = "unittest.dat.tmp";
-  enforce(!exists(fileName), "Unit test output file " ~ fileName ~
-    " already exists.");
-
-  /*
-   * Check the most basic reading/writing operations.
-   */
-  {
-    scope (exit) tryRemove(fileName);
-
-    auto writer = new TFileWriterTransport(fileName);
-    writer.open();
-    scope (exit) writer.close();
-
-    writer.write([1, 2]);
-    writer.write([3, 4]);
-    writer.write([5, 6, 7]);
-    writer.flush();
-
-    auto reader = new TFileReaderTransport(fileName);
-    reader.open();
-    scope (exit) reader.close();
-
-    auto buf = new ubyte[7];
-    reader.readAll(buf);
-    enforce(buf == [1, 2, 3, 4, 5, 6, 7]);
-  }
-
-  /*
-   * Check that chunking works as expected.
-   */
-  {
-    scope (exit) tryRemove(fileName);
-
-    static assert(EventSize.sizeof == 4);
-    enum CHUNK_SIZE = 10;
-
-    // Write some contents to the file.
-    {
-      auto writer = new TFileWriterTransport(fileName);
-      writer.chunkSize = CHUNK_SIZE;
-      writer.open();
-      scope (exit) writer.close();
-
-      writer.write([0xde]);
-      writer.write([0xad]);
-      // Chunk boundary here.
-      writer.write([0xbe]);
-      // The next write doesn't fit in the five bytes remaining, so we expect
-      // padding zero bytes to be written.
-      writer.write([0xef, 0x12]);
-
-      try {
-        writer.write(new ubyte[CHUNK_SIZE]);
-        enforce(false, "Could write event not fitting in a single chunk.");
-      } catch (TTransportException e) {}
-
-      writer.flush();
-    }
-
-    // Check the raw contents of the file to see if chunk padding was written
-    // as expected.
-    auto file = File(fileName, "r");
-    enforce(file.size == 26);
-    auto written = new ubyte[26];
-    file.rawRead(written);
-    enforce(written == [
-      1, 0, 0, 0, 0xde,
-      1, 0, 0, 0, 0xad,
-      1, 0, 0, 0, 0xbe,
-      0, 0, 0, 0, 0,
-      2, 0, 0, 0, 0xef, 0x12
-    ]);
-
-    // Read the data back in, getting all the events at once.
-    {
-      auto reader = new TFileReaderTransport(fileName);
-      reader.chunkSize = CHUNK_SIZE;
-      reader.open();
-      scope (exit) reader.close();
-
-      auto buf = new ubyte[5];
-      reader.readAll(buf);
-      enforce(buf == [0xde, 0xad, 0xbe, 0xef, 0x12]);
-    }
-  }
-
-  /*
-   * Make sure that close() exits "quickly", i.e. that there is no problem
-   * with the worker thread waking up.
-   */
-  {
-    import std.conv : text;
-    enum NUM_ITERATIONS = 1000;
-
-    uint numOver = 0;
-    foreach (n; 0 .. NUM_ITERATIONS) {
-      scope (exit) tryRemove(fileName);
-
-      auto transport = new TFileWriterTransport(fileName);
-      transport.open();
-
-      // Write something so that the writer thread gets started.
-      transport.write(cast(ubyte[])"foo");
-
-      // Every other iteration, also call flush(), just in case that potentially
-      // has any effect on how the writer thread wakes up.
-      if (n & 0x1) {
-        transport.flush();
-      }
-
-      // Time the call to close().
-      auto sw = StopWatch(AutoStart.yes);
-      transport.close();
-      sw.stop();
-
-      // If any attempt takes more than 500ms, treat that as a fatal failure to
-      // avoid looping over a potentially very slow operation.
-      enforce(sw.peek().msecs < 1500,
-        text("close() took ", sw.peek().msecs, "ms."));
-
-      // Normally, it takes less than 5ms on my dev box.
-      // However, if the box is heavily loaded, some of the test runs can take
-      // longer. Additionally, on a Windows Server 2008 instance running in
-      // a VirtualBox VM, it has been observed that about a quarter of the runs
-      // takes (217 ± 1) ms, for reasons not yet known.
-      if (sw.peek().msecs > 50) {
-        ++numOver;
-      }
-
-      // Force garbage collection runs every now and then to make sure we
-      // don't run out of OS thread handles.
-      if (!(n % 100)) GC.collect();
-    }
-
-    // Make sure fewer than a third of the runs took longer than 5ms.
-    enforce(numOver < NUM_ITERATIONS / 3,
-      text(numOver, " iterations took more than 10 ms."));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/framed.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/framed.d
deleted file mode 100644
index 94effbb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/framed.d
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module thrift.transport.framed;
-
-import core.bitop : bswap;
-import std.algorithm : min;
-import std.array : empty;
-import std.exception : enforce;
-import thrift.transport.base;
-
-/**
- * Framed transport.
- *
- * All writes go into an in-memory buffer until flush is called, at which point
- * the transport writes the length of the entire binary chunk followed by the
- * data payload. The receiver on the other end then performs a single
- * »fixed-length« read to get the whole message off the wire.
- */
-final class TFramedTransport : TBaseTransport {
-  /**
-   * Constructs a new framed transport.
-   *
-   * Params:
-   *   transport = The underlying transport to wrap.
-   */
-  this(TTransport transport) {
-    transport_ = transport;
-  }
-
-  /**
-   * Returns the wrapped transport.
-   */
-  TTransport underlyingTransport() @property {
-    return transport_;
-  }
-
-  override bool isOpen() @property {
-    return transport_.isOpen;
-  }
-
-  override bool peek() {
-    return rBuf_.length > 0 || transport_.peek();
-  }
-
-  override void open() {
-    transport_.open();
-  }
-
-  override void close() {
-    flush();
-    transport_.close();
-  }
-
-  /**
-   * Attempts to read data into the given buffer, stopping when the buffer is
-   * exhausted or the frame end is reached.
-   *
-   * TODO: Contrary to the C++ implementation, this never does cross-frame
-   * reads – is there actually a valid use case for that?
-   *
-   * Params:
-   *   buf = Slice to use as buffer.
-   *
-   * Returns: How many bytes were actually read.
-   *
-   * Throws: TTransportException if an error occurs.
-   */
-  override size_t read(ubyte[] buf) {
-    // If the buffer is empty, read a new frame off the wire.
-    if (rBuf_.empty) {
-      bool gotFrame = readFrame();
-      if (!gotFrame) return 0;
-    }
-
-    auto size = min(rBuf_.length, buf.length);
-    buf[0..size] = rBuf_[0..size];
-    rBuf_ = rBuf_[size..$];
-    return size;
-  }
-
-  override void write(in ubyte[] buf) {
-    wBuf_ ~= buf;
-  }
-
-  override void flush() {
-    if (wBuf_.empty) return;
-
-    // Properly reset the write buffer even some of the protocol operations go
-    // wrong.
-    scope (exit) {
-      wBuf_.length = 0;
-      wBuf_.assumeSafeAppend();
-    }
-
-    int len = bswap(cast(int)wBuf_.length);
-    transport_.write(cast(ubyte[])(&len)[0..1]);
-    transport_.write(wBuf_);
-    transport_.flush();
-  }
-
-  override const(ubyte)[] borrow(ubyte* buf, size_t len) {
-    if (len <= rBuf_.length) {
-      return rBuf_;
-    } else {
-      // Don't try attempting cross-frame borrows, trying that does not make
-      // much sense anyway.
-      return null;
-    }
-  }
-
-  override void consume(size_t len) {
-    enforce(len <= rBuf_.length, new TTransportException(
-      "Invalid consume length", TTransportException.Type.BAD_ARGS));
-    rBuf_ = rBuf_[len .. $];
-  }
-
-private:
-  bool readFrame() {
-    // Read the size of the next frame. We can't use readAll() since that
-    // always throws an exception on EOF, but want to throw an exception only
-    // if EOF occurs after partial size data.
-    int size;
-    size_t size_read;
-    while (size_read < size.sizeof) {
-      auto data = (cast(ubyte*)&size)[size_read..size.sizeof];
-      auto read = transport_.read(data);
-      if (read == 0) {
-        if (size_read == 0) {
-          // EOF before any data was read.
-          return false;
-        } else {
-          // EOF after a partial frame header – illegal.
-          throw new TTransportException(
-            "No more data to read after partial frame header",
-            TTransportException.Type.END_OF_FILE
-          );
-        }
-      }
-      size_read += read;
-    }
-
-    size = bswap(size);
-    enforce(size >= 0, new TTransportException("Frame size has negative value",
-      TTransportException.Type.CORRUPTED_DATA));
-
-    // TODO: Benchmark this.
-    rBuf_.length = size;
-    rBuf_.assumeSafeAppend();
-
-    transport_.readAll(rBuf_);
-    return true;
-  }
-
-  TTransport transport_;
-  ubyte[] rBuf_;
-  ubyte[] wBuf_;
-}
-
-/**
- * Wraps given transports into TFramedTransports.
- */
-alias TWrapperTransportFactory!TFramedTransport TFramedTransportFactory;
-
-version (unittest) {
-  import std.random : Mt19937, uniform;
-  import thrift.transport.memory;
-}
-
-// Some basic random testing, always starting with the same seed for
-// deterministic unit test results – more tests in transport_test.
-unittest {
-  auto randGen = Mt19937(42);
-
-  // 32 kiB of data to work with.
-  auto data = new ubyte[1 << 15];
-  foreach (ref b; data) {
-    b = uniform!"[]"(cast(ubyte)0, cast(ubyte)255, randGen);
-  }
-
-  // Generate a list of chunk sizes to split the data into. A uniform
-  // distribution is not quite realistic, but std.random doesn't have anything
-  // else yet.
-  enum MAX_FRAME_LENGTH = 512;
-  auto chunkSizesList = new size_t[][2];
-  foreach (ref chunkSizes; chunkSizesList) {
-    size_t sum;
-    while (true) {
-      auto curLen = uniform(0, MAX_FRAME_LENGTH, randGen);
-      sum += curLen;
-      if (sum > data.length) break;
-      chunkSizes ~= curLen;
-    }
-  }
-  chunkSizesList ~= [data.length]; // Also test whole chunk at once.
-
-  // Test writing data.
-  {
-    foreach (chunkSizes; chunkSizesList) {
-      auto buf = new TMemoryBuffer;
-      auto framed = new TFramedTransport(buf);
-
-      auto remainingData = data;
-      foreach (chunkSize; chunkSizes) {
-        framed.write(remainingData[0..chunkSize]);
-        remainingData = remainingData[chunkSize..$];
-      }
-      framed.flush();
-
-      auto writtenData = data[0..($ - remainingData.length)];
-      auto actualData = buf.getContents();
-
-      // Check frame size.
-      int frameSize = bswap((cast(int[])(actualData[0..int.sizeof]))[0]);
-      enforce(frameSize == writtenData.length);
-
-      // Check actual data.
-      enforce(actualData[int.sizeof..$] == writtenData);
-    }
-  }
-
-  // Test reading data.
-  {
-    foreach (chunkSizes; chunkSizesList) {
-      auto buf = new TMemoryBuffer;
-
-      auto size = bswap(cast(int)data.length);
-      buf.write(cast(ubyte[])(&size)[0..1]);
-      buf.write(data);
-
-      auto framed = new TFramedTransport(buf);
-      ubyte[] readData;
-      readData.reserve(data.length);
-      foreach (chunkSize; chunkSizes) {
-        // This should work with read because we have one huge frame.
-        auto oldReadLen = readData.length;
-        readData.length += chunkSize;
-        framed.read(readData[oldReadLen..$]);
-      }
-
-      enforce(readData == data[0..readData.length]);
-    }
-  }
-
-  // Test combined reading/writing of multiple frames.
-  foreach (flushProbability; [1, 2, 4, 8, 16, 32]) {
-    foreach (chunkSizes; chunkSizesList) {
-      auto buf = new TMemoryBuffer;
-      auto framed = new TFramedTransport(buf);
-
-      size_t[] frameSizes;
-
-      // Write the data.
-      size_t frameSize;
-      auto remainingData = data;
-      foreach (chunkSize; chunkSizes) {
-        framed.write(remainingData[0..chunkSize]);
-        remainingData = remainingData[chunkSize..$];
-
-        frameSize += chunkSize;
-        if (frameSize > 0 && uniform(0, flushProbability, randGen) == 0) {
-          frameSizes ~= frameSize;
-          frameSize = 0;
-          framed.flush();
-        }
-      }
-      if (frameSize > 0) {
-        frameSizes ~= frameSize;
-        frameSize = 0;
-        framed.flush();
-      }
-
-      // Read it back.
-      auto readData = new ubyte[data.length - remainingData.length];
-      auto remainToRead = readData;
-      foreach (fSize; frameSizes) {
-        // We are exploiting an implementation detail of TFramedTransport:
-        // The read buffer starts empty and it will never return more than one
-        // frame per read, so by just requesting all of the data, we should
-        // always get exactly one frame.
-        auto got = framed.read(remainToRead);
-        enforce(got == fSize);
-        remainToRead = remainToRead[fSize..$];
-      }
-
-      enforce(remainToRead.empty);
-      enforce(readData == data[0..readData.length]);
-    }
-  }
-}
-
-// Test flush()ing an empty buffer.
-unittest {
-  auto buf = new TMemoryBuffer();
-  auto framed = new TFramedTransport(buf);
-  immutable out1 = [0, 0, 0, 1, 'a'];
-  immutable out2 = [0, 0, 0, 1, 'a', 0, 0, 0, 2, 'b', 'c'];
-
-  framed.flush();
-  enforce(buf.getContents() == []);
-  framed.flush();
-  framed.flush();
-  enforce(buf.getContents() == []);
-  framed.write(cast(ubyte[])"a");
-  enforce(buf.getContents() == []);
-  framed.flush();
-  enforce(buf.getContents() == out1);
-  framed.flush();
-  framed.flush();
-  enforce(buf.getContents() == out1);
-  framed.write(cast(ubyte[])"bc");
-  enforce(buf.getContents() == out1);
-  framed.flush();
-  enforce(buf.getContents() == out2);
-  framed.flush();
-  framed.flush();
-  enforce(buf.getContents() == out2);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/http.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/http.d
deleted file mode 100644
index c7d1f50..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/http.d
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * HTTP tranpsort implementation, modelled after the C++ one.
- *
- * Unfortunately, libcurl is quite heavyweight and supports only client-side
- * applications. This is an implementation of the basic HTTP/1.1 parts
- * supporting HTTP 100 Continue, chunked transfer encoding, keepalive, etc.
- */
-module thrift.transport.http;
-
-import std.algorithm : canFind, countUntil, endsWith, findSplit, min, startsWith;
-import std.ascii : toLower;
-import std.array : empty;
-import std.conv : parse, to;
-import std.datetime : Clock, UTC;
-import std.string : stripLeft;
-import thrift.base : VERSION;
-import thrift.transport.base;
-import thrift.transport.memory;
-import thrift.transport.socket;
-
-/**
- * Base class for both client- and server-side HTTP transports.
- */
-abstract class THttpTransport : TBaseTransport {
-  this(TTransport transport) {
-    transport_ = transport;
-    readHeaders_ = true;
-    httpBuf_ = new ubyte[HTTP_BUFFER_SIZE];
-    httpBufRemaining_ = httpBuf_[0 .. 0];
-    readBuffer_ = new TMemoryBuffer;
-    writeBuffer_ = new TMemoryBuffer;
-  }
-
-  override bool isOpen() {
-    return transport_.isOpen();
-  }
-
-  override bool peek() {
-    return transport_.peek();
-  }
-
-  override void open() {
-    transport_.open();
-  }
-
-  override void close() {
-    transport_.close();
-  }
-
-  override size_t read(ubyte[] buf) {
-    if (!readBuffer_.peek()) {
-      readBuffer_.reset();
-
-      if (!refill()) return 0;
-
-      if (readHeaders_) {
-        readHeaders();
-      }
-
-      size_t got;
-      if (chunked_) {
-        got = readChunked();
-      } else {
-        got = readContent(contentLength_);
-      }
-      readHeaders_ = true;
-
-      if (got == 0) return 0;
-    }
-    return readBuffer_.read(buf);
-  }
-
-  override size_t readEnd() {
-    // Read any pending chunked data (footers etc.)
-    if (chunked_) {
-      while (!chunkedDone_) {
-        readChunked();
-      }
-    }
-    return 0;
-  }
-
-  override void write(in ubyte[] buf) {
-    writeBuffer_.write(buf);
-  }
-
-  override void flush() {
-    auto data = writeBuffer_.getContents();
-    string header = getHeader(data.length);
-
-    transport_.write(cast(const(ubyte)[]) header);
-    transport_.write(data);
-    transport_.flush();
-
-    // Reset the buffer and header variables.
-    writeBuffer_.reset();
-    readHeaders_ = true;
-  }
-
-  /**
-   * The size of the buffer to read HTTP requests into, in bytes. Will expand
-   * as required.
-   */
-  enum HTTP_BUFFER_SIZE = 1024;
-
-protected:
-  abstract string getHeader(size_t dataLength);
-  abstract bool parseStatusLine(const(ubyte)[] status);
-
-  void parseHeader(const(ubyte)[] header) {
-    auto split = findSplit(header, [':']);
-    if (split[1].empty) {
-      // No colon found.
-      return;
-    }
-
-    static bool compToLower(ubyte a, ubyte b) {
-      return toLower(cast(char)a) == toLower(cast(char)b);
-    }
-
-    if (startsWith!compToLower(split[0], cast(ubyte[])"transfer-encoding")) {
-      if (endsWith!compToLower(split[2], cast(ubyte[])"chunked")) {
-        chunked_ = true;
-      }
-    } else if (startsWith!compToLower(split[0], cast(ubyte[])"content-length")) {
-      chunked_ = false;
-      auto lengthString = stripLeft(cast(const(char)[])split[2]);
-      contentLength_ = parse!size_t(lengthString);
-    }
-  }
-
-private:
-  ubyte[] readLine() {
-    while (true) {
-      auto split = findSplit(httpBufRemaining_, cast(ubyte[])"\r\n");
-
-      if (split[1].empty) {
-        // No CRLF yet, move whatever we have now to front and refill.
-        if (httpBufRemaining_.empty) {
-          httpBufRemaining_ = httpBuf_[0 .. 0];
-        } else {
-          httpBuf_[0 .. httpBufRemaining_.length] = httpBufRemaining_;
-          httpBufRemaining_ = httpBuf_[0 .. httpBufRemaining_.length];
-        }
-
-        if (!refill()) {
-          auto buf = httpBufRemaining_;
-          httpBufRemaining_ = httpBufRemaining_[$ - 1 .. $ - 1];
-          return buf;
-        }
-      } else {
-        // Set the remaining buffer to the part after \r\n and return the part
-        // (line) before it.
-        httpBufRemaining_ = split[2];
-        return split[0];
-      }
-    }
-  }
-
-  void readHeaders() {
-    // Initialize headers state variables
-    contentLength_ = 0;
-    chunked_ = false;
-    chunkedDone_ = false;
-    chunkSize_ = 0;
-
-    // Control state flow
-    bool statusLine = true;
-    bool finished;
-
-    // Loop until headers are finished
-    while (true) {
-      auto line = readLine();
-
-      if (line.length == 0) {
-        if (finished) {
-          readHeaders_ = false;
-          return;
-        } else {
-          // Must have been an HTTP 100, keep going for another status line
-          statusLine = true;
-        }
-      } else {
-        if (statusLine) {
-          statusLine = false;
-          finished = parseStatusLine(line);
-        } else {
-          parseHeader(line);
-        }
-      }
-    }
-  }
-
-  size_t readChunked() {
-    size_t length;
-
-    auto line = readLine();
-    size_t chunkSize;
-    try {
-      auto charLine = cast(char[])line;
-      chunkSize = parse!size_t(charLine, 16);
-    } catch (Exception e) {
-      throw new TTransportException("Invalid chunk size: " ~ to!string(line),
-        TTransportException.Type.CORRUPTED_DATA);
-    }
-
-    if (chunkSize == 0) {
-      readChunkedFooters();
-    } else {
-      // Read data content
-      length += readContent(chunkSize);
-      // Read trailing CRLF after content
-      readLine();
-    }
-    return length;
-  }
-
-  void readChunkedFooters() {
-    while (true) {
-      auto line = readLine();
-      if (line.length == 0) {
-        chunkedDone_ = true;
-        break;
-      }
-    }
-  }
-
-  size_t readContent(size_t size) {
-    auto need = size;
-    while (need > 0) {
-      if (httpBufRemaining_.length == 0) {
-        // We have given all the data, reset position to head of the buffer.
-        httpBufRemaining_ = httpBuf_[0 .. 0];
-        if (!refill()) return size - need;
-      }
-
-      auto give = min(httpBufRemaining_.length, need);
-      readBuffer_.write(cast(ubyte[])httpBufRemaining_[0 .. give]);
-      httpBufRemaining_ = httpBufRemaining_[give .. $];
-      need -= give;
-    }
-    return size;
-  }
-
-  bool refill() {
-    // Is there a nicer way to do this?
-    auto indexBegin = httpBufRemaining_.ptr - httpBuf_.ptr;
-    auto indexEnd = indexBegin + httpBufRemaining_.length;
-
-    if (httpBuf_.length - indexEnd <= (httpBuf_.length / 4)) {
-      httpBuf_.length *= 2;
-    }
-
-    // Read more data.
-    auto got = transport_.read(cast(ubyte[])httpBuf_[indexEnd .. $]);
-    if (got == 0) return false;
-    httpBufRemaining_ = httpBuf_[indexBegin .. indexEnd + got];
-    return true;
-  }
-
-  TTransport transport_;
-
-  TMemoryBuffer writeBuffer_;
-  TMemoryBuffer readBuffer_;
-
-  bool readHeaders_;
-  bool chunked_;
-  bool chunkedDone_;
-  size_t chunkSize_;
-  size_t contentLength_;
-
-  ubyte[] httpBuf_;
-  ubyte[] httpBufRemaining_;
-}
-
-/**
- * HTTP client transport.
- */
-final class TClientHttpTransport : THttpTransport {
-  /**
-   * Constructs a client http transport operating on the passed underlying
-   * transport.
-   *
-   * Params:
-   *   transport = The underlying transport used for the actual I/O.
-   *   host = The HTTP host string.
-   *   path = The HTTP path string.
-   */
-  this(TTransport transport, string host, string path) {
-    super(transport);
-    host_ = host;
-    path_ = path;
-  }
-
-  /**
-   * Convenience overload for constructing a client HTTP transport using a
-   * TSocket connecting to the specified host and port.
-   *
-   * Params:
-   *   host = The server to connect to, also used as HTTP host string.
-   *   port = The port to connect to.
-   *   path = The HTTP path string.
-   */
-  this(string host, ushort port, string path) {
-    this(new TSocket(host, port), host, path);
-  }
-
-protected:
-  override string getHeader(size_t dataLength) {
-    return "POST " ~ path_ ~ " HTTP/1.1\r\n" ~
-      "Host: " ~ host_ ~ "\r\n" ~
-      "Content-Type: application/x-thrift\r\n" ~
-      "Content-Length: " ~ to!string(dataLength) ~ "\r\n" ~
-      "Accept: application/x-thrift\r\n"
-      "User-Agent: Thrift/" ~ VERSION ~ " (D/TClientHttpTransport)\r\n" ~
-      "\r\n";
-  }
-
-  override bool parseStatusLine(const(ubyte)[] status) {
-    // HTTP-Version SP Status-Code SP Reason-Phrase CRLF
-    auto firstSplit = findSplit(status, [' ']);
-    if (firstSplit[1].empty) {
-      throw new TTransportException("Bad status: " ~ to!string(status),
-        TTransportException.Type.CORRUPTED_DATA);
-    }
-
-    auto codeReason = firstSplit[2][countUntil!"a != b"(firstSplit[2], ' ') .. $];
-    auto secondSplit = findSplit(codeReason, [' ']);
-    if (secondSplit[1].empty) {
-      throw new TTransportException("Bad status: " ~ to!string(status),
-        TTransportException.Type.CORRUPTED_DATA);
-    }
-
-    if (secondSplit[0] == "200") {
-      // HTTP 200 = OK, we got the response
-      return true;
-    } else if (secondSplit[0] == "100") {
-      // HTTP 100 = continue, just keep reading
-      return false;
-    }
-
-    throw new TTransportException("Bad status (unhandled status code): " ~
-      to!string(cast(const(char[]))status), TTransportException.Type.CORRUPTED_DATA);
-  }
-
-private:
-  string host_;
-  string path_;
-}
-
-/**
- * HTTP server transport.
- */
-final class TServerHttpTransport : THttpTransport {
-  /**
-   * Constructs a new instance.
-   *
-   * Param:
-   *   transport = The underlying transport used for the actual I/O.
-   */
-  this(TTransport transport) {
-    super(transport);
-  }
-
-protected:
-  override string getHeader(size_t dataLength) {
-    return "HTTP/1.1 200 OK\r\n" ~
-      "Date: " ~ getRFC1123Time() ~ "\r\n" ~
-      "Server: Thrift/" ~ VERSION ~ "\r\n" ~
-      "Content-Type: application/x-thrift\r\n" ~
-      "Content-Length: " ~ to!string(dataLength) ~ "\r\n" ~
-      "Connection: Keep-Alive\r\n" ~
-      "\r\n";
-  }
-
-  override bool parseStatusLine(const(ubyte)[] status) {
-    // Method SP Request-URI SP HTTP-Version CRLF.
-    auto split = findSplit(status, [' ']);
-    if (split[1].empty) {
-      throw new TTransportException("Bad status: " ~ to!string(status),
-        TTransportException.Type.CORRUPTED_DATA);
-    }
-
-    auto uriVersion = split[2][countUntil!"a != b"(split[2], ' ') .. $];
-    if (!canFind(uriVersion, ' ')) {
-      throw new TTransportException("Bad status: " ~ to!string(status),
-        TTransportException.Type.CORRUPTED_DATA);
-    }
-
-    if (split[0] == "POST") {
-      // POST method ok, looking for content.
-      return true;
-    }
-
-    throw new TTransportException("Bad status (unsupported method): " ~
-      to!string(status), TTransportException.Type.CORRUPTED_DATA);
-  }
-}
-
-/**
- * Wraps a transport into a HTTP server protocol.
- */
-alias TWrapperTransportFactory!TServerHttpTransport TServerHttpTransportFactory;
-
-private {
-  import std.string : format;
-  string getRFC1123Time() {
-    auto sysTime = Clock.currTime(UTC());
-
-    auto dayName = capMemberName(sysTime.dayOfWeek);
-    auto monthName = capMemberName(sysTime.month);
-
-    return format("%s, %s %s %s %s:%s:%s GMT", dayName, sysTime.day,
-      monthName, sysTime.year, sysTime.hour, sysTime.minute, sysTime.second);
-  }
-
-  import std.ascii : toUpper;
-  import std.traits : EnumMembers;
-  string capMemberName(T)(T val) if (is(T == enum)) {
-    foreach (i, e; EnumMembers!T) {
-      enum name = __traits(derivedMembers, T)[i];
-      enum capName = cast(char) toUpper(name[0]) ~ name [1 .. $];
-      if (val == e) {
-        return capName;
-      }
-    }
-    throw new Exception("Not a member of " ~ T.stringof ~ ": " ~ to!string(val));
-  }
-
-  unittest {
-    enum Foo {
-      bar,
-      bAZ
-    }
-
-    import std.exception;
-    enforce(capMemberName(Foo.bar) == "Bar");
-    enforce(capMemberName(Foo.bAZ) == "BAZ");
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/memory.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/memory.d
deleted file mode 100644
index cdf0807..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/memory.d
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.transport.memory;
-
-import core.exception : onOutOfMemoryError;
-import core.stdc.stdlib : free, realloc;
-import std.algorithm : min;
-import std.conv : text;
-import thrift.transport.base;
-
-/**
- * A transport that simply reads from and writes to an in-memory buffer. Every
- * time you call write on it, the data is simply placed into a buffer, and
- * every time you call read, data is consumed from that buffer.
- *
- * Currently, the storage for written data is never reclaimed, even if the
- * buffer contents have already been read out again.
- */
-final class TMemoryBuffer : TBaseTransport {
-  /**
-   * Constructs a new memory transport with an empty internal buffer.
-   */
-  this() {}
-
-  /**
-   * Constructs a new memory transport with an empty internal buffer,
-   * reserving space for capacity bytes in advance.
-   *
-   * If the amount of data which will be written to the buffer is already
-   * known on construction, this can better performance over the default
-   * constructor because reallocations can be avoided.
-   *
-   * If the preallocated buffer is exhausted, data can still be written to the
-   * transport, but reallocations will happen.
-   *
-   * Params:
-   *   capacity = Size of the initially reserved buffer (in bytes).
-   */
-  this(size_t capacity) {
-    reset(capacity);
-  }
-
-  /**
-   * Constructs a new memory transport initially containing the passed data.
-   *
-   * For now, the passed buffer is not intelligently used, the data is just
-   * copied to the internal buffer.
-   *
-   * Params:
-   *   buffer = Initial contents available to be read.
-   */
-  this(in ubyte[] contents) {
-    auto size = contents.length;
-    reset(size);
-    buffer_[0 .. size] = contents[];
-    writeOffset_ = size;
-  }
-
-  /**
-   * Destructor, frees the internally allocated buffer.
-   */
-  ~this() {
-    free(buffer_);
-  }
-
-  /**
-   * Returns a read-only view of the current buffer contents.
-   *
-   * Note: For performance reasons, the returned slice is only valid for the
-   * life of this object, and may be invalidated on the next write() call at
-   * will – you might want to immediately .dup it if you intend to keep it
-   * around.
-   */
-  const(ubyte)[] getContents() {
-    return buffer_[readOffset_ .. writeOffset_];
-  }
-
-  /**
-   * A memory transport is always open.
-   */
-  override bool isOpen() @property {
-    return true;
-  }
-
-  override bool peek() {
-    return writeOffset_ - readOffset_ > 0;
-  }
-
-  /**
-   * Opening is a no-op() for a memory buffer.
-   */
-  override void open() {}
-
-  /**
-   * Closing is a no-op() for a memory buffer, it is always open.
-   */
-  override void close() {}
-
-  override size_t read(ubyte[] buf) {
-    auto size = min(buf.length, writeOffset_ - readOffset_);
-    buf[0 .. size] = buffer_[readOffset_ .. readOffset_ + size];
-    readOffset_ += size;
-    return size;
-  }
-
-  /**
-   * Shortcut version of readAll() – using this over TBaseTransport.readAll()
-   * can give us a nice speed increase because gives us a nice speed increase
-   * because it is typically a very hot path during deserialization.
-   */
-  override void readAll(ubyte[] buf) {
-    auto available = writeOffset_ - readOffset_;
-    if (buf.length > available) {
-      throw new TTransportException(text("Cannot readAll() ", buf.length,
-        " bytes of data because only ", available, " bytes are available."),
-        TTransportException.Type.END_OF_FILE);
-    }
-
-    buf[] = buffer_[readOffset_ .. readOffset_ + buf.length];
-    readOffset_ += buf.length;
-  }
-
-  override void write(in ubyte[] buf) {
-    auto need = buf.length;
-    if (bufferLen_ - writeOffset_ < need) {
-      // Exponential growth.
-      auto newLen = bufferLen_ + 1;
-      while (newLen - writeOffset_ < need) newLen *= 2;
-      cRealloc(buffer_, newLen);
-      bufferLen_ = newLen;
-    }
-
-    buffer_[writeOffset_ .. writeOffset_ + need] = buf[];
-    writeOffset_ += need;
-  }
-
-  override const(ubyte)[] borrow(ubyte* buf, size_t len) {
-    if (len <= writeOffset_ - readOffset_) {
-      return buffer_[readOffset_ .. writeOffset_];
-    } else {
-      return null;
-    }
-  }
-
-  override void consume(size_t len) {
-    readOffset_ += len;
-  }
-
-  void reset() {
-    readOffset_ = 0;
-    writeOffset_ = 0;
-  }
-
-  void reset(size_t capacity) {
-    readOffset_ = 0;
-    writeOffset_ = 0;
-    if (bufferLen_ < capacity) {
-      cRealloc(buffer_, capacity);
-      bufferLen_ = capacity;
-    }
-  }
-
-private:
-  ubyte* buffer_;
-  size_t bufferLen_;
-  size_t readOffset_;
-  size_t writeOffset_;
-}
-
-private {
-  void cRealloc(ref ubyte* data, size_t newSize) {
-    auto result = realloc(data, newSize);
-    if (result is null) onOutOfMemoryError();
-    data = cast(ubyte*)result;
-  }
-}
-
-version (unittest) {
-  import std.exception;
-}
-
-unittest {
-  auto a = new TMemoryBuffer(5);
-  immutable(ubyte[]) testData = [1, 2, 3, 4];
-  auto buf = new ubyte[testData.length];
-  enforce(a.isOpen);
-
-  // a should be empty.
-  enforce(!a.peek());
-  enforce(a.read(buf) == 0);
-  assertThrown!TTransportException(a.readAll(buf));
-
-  // Write some data and read it back again.
-  a.write(testData);
-  enforce(a.peek());
-  enforce(a.getContents() == testData);
-  enforce(a.read(buf) == testData.length);
-  enforce(buf == testData);
-
-  // a should be empty again.
-  enforce(!a.peek());
-  enforce(a.read(buf) == 0);
-  assertThrown!TTransportException(a.readAll(buf));
-
-  // Test the constructor which directly accepts initial data.
-  auto b = new TMemoryBuffer(testData);
-  enforce(b.isOpen);
-  enforce(b.peek());
-  enforce(b.getContents() == testData);
-
-  // Test borrow().
-  auto borrowed = b.borrow(null, testData.length);
-  enforce(borrowed == testData);
-  enforce(b.peek());
-  b.consume(testData.length);
-  enforce(!b.peek());
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/piped.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/piped.d
deleted file mode 100644
index 9fe1432..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/piped.d
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.transport.piped;
-
-import thrift.transport.base;
-import thrift.transport.memory;
-
-/**
- * Pipes data request from one transport to another when readEnd()
- * or writeEnd() is called.
- *
- * A typical use case would be to log requests on e.g. a socket to
- * disk (i. e. pipe them to a TFileWriterTransport).
- *
- * The implementation keeps an internal buffer which expands to
- * hold the whole amount of data read/written until the corresponding *End()
- * method is called.
- *
- * Contrary to the C++ implementation, this doesn't introduce yet another layer
- * of input/output buffering, all calls are passed to the underlying source
- * transport verbatim.
- */
-final class TPipedTransport(Source = TTransport) if (
-  isTTransport!Source
-) : TBaseTransport {
-  /// The default initial buffer size if not explicitly specified, in bytes.
-  enum DEFAULT_INITIAL_BUFFER_SIZE = 512;
-
-  /**
-   * Constructs a new instance.
-   *
-   * By default, only reads are piped (pipeReads = true, pipeWrites = false).
-   *
-   * Params:
-   *   srcTrans = The transport to which all requests are forwarded.
-   *   dstTrans = The transport the read/written data is copied to.
-   *   initialBufferSize = The default size of the read/write buffers, for
-   *     performance tuning.
-   */
-  this(Source srcTrans, TTransport dstTrans,
-    size_t initialBufferSize = DEFAULT_INITIAL_BUFFER_SIZE
-  ) {
-    srcTrans_ = srcTrans;
-    dstTrans_ = dstTrans;
-
-    readBuffer_ = new TMemoryBuffer(initialBufferSize);
-    writeBuffer_ = new TMemoryBuffer(initialBufferSize);
-
-    pipeReads_ = true;
-    pipeWrites_ = false;
-  }
-
-  bool pipeReads() @property const {
-    return pipeReads_;
-  }
-
-  void pipeReads(bool value) @property {
-    if (!value) {
-      readBuffer_.reset();
-    }
-    pipeReads_ = value;
-  }
-
-  bool pipeWrites() @property const {
-    return pipeWrites_;
-  }
-
-  void pipeWrites(bool value) @property {
-    if (!value) {
-      writeBuffer_.reset();
-    }
-    pipeWrites_ = value;
-  }
-
-  override bool isOpen() {
-    return srcTrans_.isOpen();
-  }
-
-  override bool peek() {
-    return srcTrans_.peek();
-  }
-
-  override void open() {
-    srcTrans_.open();
-  }
-
-  override void close() {
-    srcTrans_.close();
-  }
-
-  override size_t read(ubyte[] buf) {
-    auto bytesRead = srcTrans_.read(buf);
-
-    if (pipeReads_) {
-      readBuffer_.write(buf[0 .. bytesRead]);
-    }
-
-    return bytesRead;
-  }
-
-  override size_t readEnd() {
-    if (pipeReads_) {
-      auto data = readBuffer_.getContents();
-      dstTrans_.write(data);
-      dstTrans_.flush();
-      readBuffer_.reset();
-
-      srcTrans_.readEnd();
-
-      // Return data.length instead of the readEnd() result of the source
-      // transports because it might not be available from it.
-      return data.length;
-    }
-
-    return srcTrans_.readEnd();
-  }
-
-  override void write(in ubyte[] buf) {
-    if (pipeWrites_) {
-      writeBuffer_.write(buf);
-    }
-
-    srcTrans_.write(buf);
-  }
-
-  override size_t writeEnd() {
-    if (pipeWrites_) {
-      auto data = writeBuffer_.getContents();
-      dstTrans_.write(data);
-      dstTrans_.flush();
-      writeBuffer_.reset();
-
-      srcTrans_.writeEnd();
-
-      // Return data.length instead of the readEnd() result of the source
-      // transports because it might not be available from it.
-      return data.length;
-    }
-
-    return srcTrans_.writeEnd();
-  }
-
-  override void flush() {
-    srcTrans_.flush();
-  }
-
-private:
-  Source srcTrans_;
-  TTransport dstTrans_;
-
-  TMemoryBuffer readBuffer_;
-  TMemoryBuffer writeBuffer_;
-
-  bool pipeReads_;
-  bool pipeWrites_;
-}
-
-/**
- * TPipedTransport construction helper to avoid having to explicitly
- * specify the transport types, i.e. to allow the constructor being called
- * using IFTI (see $(DMDBUG 6082, D Bugzilla enhancement request 6082)).
- */
-TPipedTransport!Source tPipedTransport(Source)(
-  Source srcTrans, TTransport dstTrans
-) if (isTTransport!Source) {
-  return new typeof(return)(srcTrans, dstTrans);
-}
-
-version (unittest) {
-  // DMD @@BUG@@: UFCS for std.array.empty doesn't work when import is moved
-  // into unittest block.
-  import std.array;
-  import std.exception : enforce;
-}
-
-unittest {
-  auto underlying = new TMemoryBuffer;
-  auto pipeTarget = new TMemoryBuffer;
-  auto trans = tPipedTransport(underlying, pipeTarget);
-
-  underlying.write(cast(ubyte[])"abcd");
-
-  ubyte[4] buffer;
-  trans.readAll(buffer[0 .. 2]);
-  enforce(buffer[0 .. 2] == "ab");
-  enforce(pipeTarget.getContents().empty);
-
-  trans.readEnd();
-  enforce(pipeTarget.getContents() == "ab");
-  pipeTarget.reset();
-
-  underlying.write(cast(ubyte[])"ef");
-  trans.readAll(buffer[0 .. 2]);
-  enforce(buffer[0 .. 2] == "cd");
-  enforce(pipeTarget.getContents().empty);
-
-  trans.readAll(buffer[0 .. 2]);
-  enforce(buffer[0 .. 2] == "ef");
-  enforce(pipeTarget.getContents().empty);
-
-  trans.readEnd();
-  enforce(pipeTarget.getContents() == "cdef");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/range.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/range.d
deleted file mode 100644
index 761cea1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/range.d
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Transports which operate on generic D ranges.
- */
-module thrift.transport.range;
-
-import std.array : empty;
-import std.range;
-import std.traits : Unqual;
-import thrift.transport.base;
-
-/**
- * Adapts an ubyte input range for reading via the TTransport interface.
- *
- * The case where R is a plain ubyte[] is reasonably optimized, so a possible
- * use case for TInputRangeTransport would be to deserialize some data held in
- * a memory buffer.
- */
-final class TInputRangeTransport(R) if (
-  isInputRange!(Unqual!R) && is(ElementType!R : const(ubyte))
-) : TBaseTransport {
-  /**
-   * Constructs a new instance.
-   *
-   * Params:
-   *   data = The input range to use as data.
-   */
-  this(R data) {
-    data_ = data;
-  }
-
-  /**
-   * An input range transport is always open.
-   */
-  override bool isOpen() @property {
-    return true;
-  }
-
-  override bool peek() {
-    return !data_.empty;
-  }
-
-  /**
-   * Opening is a no-op() for an input range transport.
-   */
-  override void open() {}
-
-  /**
-   * Closing is a no-op() for a memory buffer.
-   */
-  override void close() {}
-
-  override size_t read(ubyte[] buf) {
-    auto data = data_.take(buf.length);
-    auto bytes = data.length;
-
-    static if (is(typeof(R.init[1 .. 2]) : const(ubyte)[])) {
-      // put() is currently unnecessarily slow if both ranges are sliceable.
-      buf[0 .. bytes] = data[];
-      data_ = data_[bytes .. $];
-    } else {
-      buf.put(data);
-    }
-
-    return bytes;
-  }
-
-  /**
-   * Shortcut version of readAll() for slicable ranges.
-   *
-   * Because readAll() is typically a very hot path during deserialization,
-   * using this over TBaseTransport.readAll() gives us a nice increase in
-   * speed due to the reduced amount of indirections.
-   */
-  override void readAll(ubyte[] buf) {
-    static if (is(typeof(R.init[1 .. 2]) : const(ubyte)[])) {
-      if (buf.length <= data_.length) {
-        buf[] = data_[0 .. buf.length];
-        data_ = data_[buf.length .. $];
-        return;
-      }
-    }
-    super.readAll(buf);
-  }
-
-  override const(ubyte)[] borrow(ubyte* buf, size_t len) {
-    static if (is(R : const(ubyte)[])) {
-      // Can only borrow if our data type is actually an ubyte array.
-      if (len <= data_.length) {
-        return data_;
-      }
-    }
-    return null;
-  }
-
-  override void consume(size_t len) {
-    static if (is(R : const(ubyte)[])) {
-      if (len > data_.length) {
-        throw new TTransportException("Invalid consume length",
-          TTransportException.Type.BAD_ARGS);
-      }
-      data_ = data_[len .. $];
-    } else {
-      super.consume(len);
-    }
-  }
-
-  /**
-   * Sets a new data range to use.
-   */
-  void reset(R data) {
-    data_ = data;
-  }
-
-private:
-  R data_;
-}
-
-/**
- * TInputRangeTransport construction helper to avoid having to explicitly
- * specify the argument type, i.e. to allow the constructor being called using
- * IFTI (see $(LINK2 http://d.puremagic.com/issues/show_bug.cgi?id=6082, D
- * Bugzilla enhancement requet 6082)).
- */
-TInputRangeTransport!R tInputRangeTransport(R)(R data) if (
-  is (TInputRangeTransport!R)
-) {
-  return new TInputRangeTransport!R(data);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/socket.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/socket.d
deleted file mode 100644
index 38b567a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/socket.d
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.transport.socket;
-
-import core.thread : Thread;
-import core.time : dur, Duration;
-import std.array : empty;
-import std.conv : text, to;
-import std.exception : enforce;
-import std.socket;
-import thrift.base;
-import thrift.transport.base;
-import thrift.internal.socket;
-
-/**
- * Common parts of a socket TTransport implementation, regardless of how the
- * actual I/O is performed (sync/async).
- */
-abstract class TSocketBase : TBaseTransport {
-  /**
-   * Constructor that takes an already created, connected (!) socket.
-   *
-   * Params:
-   *   socket = Already created, connected socket object.
-   */
-  this(Socket socket) {
-    socket_ = socket;
-    setSocketOpts();
-  }
-
-  /**
-   * Creates a new unconnected socket that will connect to the given host
-   * on the given port.
-   *
-   * Params:
-   *   host = Remote host.
-   *   port = Remote port.
-   */
-  this(string host, ushort port) {
-    host_ = host;
-    port_ = port;
-  }
-
-  /**
-   * Checks whether the socket is connected.
-   */
-  override bool isOpen() @property {
-    return socket_ !is null;
-  }
-
-  /**
-   * Writes as much data to the socket as there can be in a single OS call.
-   *
-   * Params:
-   *   buf = Data to write.
-   *
-   * Returns: The actual number of bytes written. Never more than buf.length.
-   */
-  abstract size_t writeSome(in ubyte[] buf) out (written) {
-    // DMD @@BUG@@: Enabling this e.g. fails the contract in the
-    // async_test_server, because buf.length evaluates to 0 here, even though
-    // in the method body it correctly is 27 (equal to the return value).
-    version (none) assert(written <= buf.length, text("Implementation wrote " ~
-      "more data than requested to?! (", written, " vs. ", buf.length, ")"));
-  } body {
-    assert(0, "DMD bug? – Why would contracts work for interfaces, but not "
-      "for abstract methods? "
-      "(Error: function […] in and out contracts require function body");
-  }
-
-  /**
-   * Returns the actual address of the peer the socket is connected to.
-   *
-   * In contrast, the host and port properties contain the address used to
-   * establish the connection, and are not updated after the connection.
-   *
-   * The socket must be open when calling this.
-   */
-  Address getPeerAddress() {
-    enforce(isOpen, new TTransportException("Cannot get peer host for " ~
-      "closed socket.", TTransportException.Type.NOT_OPEN));
-
-    if (!peerAddress_) {
-      peerAddress_ = socket_.remoteAddress();
-      assert(peerAddress_);
-    }
-
-    return peerAddress_;
-  }
-
-  /**
-   * The host the socket is connected to or will connect to. Null if an
-   * already connected socket was used to construct the object.
-   */
-  string host() const @property {
-    return host_;
-  }
-
-  /**
-   * The port the socket is connected to or will connect to. Zero if an
-   * already connected socket was used to construct the object.
-   */
-  ushort port() const @property {
-    return port_;
-  }
-
-  /// The socket send timeout.
-  Duration sendTimeout() const @property {
-    return sendTimeout_;
-  }
-
-  /// Ditto
-  void sendTimeout(Duration value) @property {
-    sendTimeout_ = value;
-  }
-
-  /// The socket receiving timeout. Values smaller than 500 ms are not
-  /// supported on Windows.
-  Duration recvTimeout() const @property {
-    return recvTimeout_;
-  }
-
-  /// Ditto
-  void recvTimeout(Duration value) @property {
-    recvTimeout_ = value;
-  }
-
-  /**
-   * Returns the OS handle of the underlying socket.
-   *
-   * Should not usually be used directly, but access to it can be necessary
-   * to interface with C libraries.
-   */
-  typeof(socket_.handle()) socketHandle() @property {
-    return socket_.handle();
-  }
-
-protected:
-  /**
-   * Sets the needed socket options.
-   */
-  void setSocketOpts() {
-    try {
-      alias SocketOptionLevel.SOCKET lvlSock;
-      Linger l;
-      l.on = 0;
-      l.time = 0;
-      socket_.setOption(lvlSock, SocketOption.LINGER, l);
-    } catch (SocketException e) {
-      logError("Could not set socket option: %s", e);
-    }
-
-    // Just try to disable Nagle's algorithm – this will fail if we are passed
-    // in a non-TCP socket via the Socket-accepting constructor.
-    try {
-      socket_.setOption(SocketOptionLevel.TCP, SocketOption.TCP_NODELAY, true);
-    } catch (SocketException e) {}
-  }
-
-  /// Remote host.
-  string host_;
-
-  /// Remote port.
-  ushort port_;
-
-  /// Timeout for sending.
-  Duration sendTimeout_;
-
-  /// Timeout for receiving.
-  Duration recvTimeout_;
-
-  /// Cached peer address.
-  Address peerAddress_;
-
-  /// Cached peer host name.
-  string peerHost_;
-
-  /// Cached peer port.
-  ushort peerPort_;
-
-  /// Wrapped socket object.
-  Socket socket_;
-}
-
-/**
- * Socket implementation of the TTransport interface.
- *
- * Due to the limitations of std.socket, currently only TCP/IP sockets are
- * supported (i.e. Unix domain sockets are not).
- */
-class TSocket : TSocketBase {
-  ///
-  this(Socket socket) {
-    super(socket);
-  }
-
-  ///
-  this(string host, ushort port) {
-    super(host, port);
-  }
-
-  /**
-   * Connects the socket.
-   */
-  override void open() {
-    if (isOpen) return;
-
-    enforce(!host_.empty, new TTransportException(
-      "Cannot open socket to null host.", TTransportException.Type.NOT_OPEN));
-    enforce(port_ != 0, new TTransportException(
-      "Cannot open socket to port zero.", TTransportException.Type.NOT_OPEN));
-
-    Address[] addrs;
-    try {
-      addrs = getAddress(host_, port_);
-    } catch (SocketException e) {
-      throw new TTransportException("Could not resolve given host string.",
-        TTransportException.Type.NOT_OPEN, __FILE__, __LINE__, e);
-    }
-
-    Exception[] errors;
-    foreach (addr; addrs) {
-      try {
-        socket_ = new TcpSocket(addr.addressFamily);
-        setSocketOpts();
-        socket_.connect(addr);
-        break;
-      } catch (SocketException e) {
-        errors ~= e;
-      }
-    }
-    if (errors.length == addrs.length) {
-      socket_ = null;
-      // Need to throw a TTransportException to abide the TTransport API.
-      import std.algorithm, std.range;
-      throw new TTransportException(
-        text("Failed to connect to ", host_, ":", port_, "."),
-        TTransportException.Type.NOT_OPEN,
-        __FILE__, __LINE__,
-        new TCompoundOperationException(
-          text(
-            "All addresses tried failed (",
-            joiner(map!q{text(a._0, `: "`, a._1.msg, `"`)}(zip(addrs, errors)), ", "),
-            ")."
-          ),
-          errors
-        )
-      );
-    }
-  }
-
-  /**
-   * Closes the socket.
-   */
-  override void close() {
-    if (!isOpen) return;
-
-    socket_.close();
-    socket_ = null;
-  }
-
-  override bool peek() {
-    if (!isOpen) return false;
-
-    ubyte buf;
-    auto r = socket_.receive((&buf)[0 .. 1], SocketFlags.PEEK);
-    if (r == -1) {
-      auto lastErrno = getSocketErrno();
-      static if (connresetOnPeerShutdown) {
-        if (lastErrno == ECONNRESET) {
-          close();
-          return false;
-        }
-      }
-      throw new TTransportException("Peeking into socket failed: " ~
-        socketErrnoString(lastErrno), TTransportException.Type.UNKNOWN);
-    }
-    return (r > 0);
-  }
-
-  override size_t read(ubyte[] buf) {
-    enforce(isOpen, new TTransportException(
-      "Cannot read if socket is not open.", TTransportException.Type.NOT_OPEN));
-
-    typeof(getSocketErrno()) lastErrno;
-    ushort tries;
-    while (tries++ <= maxRecvRetries_) {
-      auto r = socket_.receive(cast(void[])buf);
-
-      // If recv went fine, immediately return.
-      if (r >= 0) return r;
-
-      // Something went wrong, find out how to handle it.
-      lastErrno = getSocketErrno();
-
-      if (lastErrno == INTERRUPTED_ERRNO) {
-        // If the syscall was interrupted, just try again.
-        continue;
-      }
-
-      static if (connresetOnPeerShutdown) {
-        // See top comment.
-        if (lastErrno == ECONNRESET) {
-          return 0;
-        }
-      }
-
-      // Not an error which is handled in a special way, just leave the loop.
-      break;
-    }
-
-    if (isSocketCloseErrno(lastErrno)) {
-      close();
-      throw new TTransportException("Receiving failed, closing socket: " ~
-        socketErrnoString(lastErrno), TTransportException.Type.NOT_OPEN);
-    } else if (lastErrno == TIMEOUT_ERRNO) {
-      throw new TTransportException(TTransportException.Type.TIMED_OUT);
-    } else {
-      throw new TTransportException("Receiving from socket failed: " ~
-        socketErrnoString(lastErrno), TTransportException.Type.UNKNOWN);
-    }
-  }
-
-  override void write(in ubyte[] buf) {
-    size_t sent;
-    while (sent < buf.length) {
-      auto b = writeSome(buf[sent .. $]);
-      if (b == 0) {
-        // This should only happen if the timeout set with SO_SNDTIMEO expired.
-        throw new TTransportException("send() timeout expired.",
-          TTransportException.Type.TIMED_OUT);
-      }
-      sent += b;
-    }
-    assert(sent == buf.length);
-  }
-
-  override size_t writeSome(in ubyte[] buf) {
-    enforce(isOpen, new TTransportException(
-      "Cannot write if file is not open.", TTransportException.Type.NOT_OPEN));
-
-    auto r = socket_.send(buf);
-
-    // Everything went well, just return the number of bytes written.
-    if (r > 0) return r;
-
-    // Handle error conditions.
-    if (r < 0) {
-      auto lastErrno = getSocketErrno();
-
-      if (lastErrno == WOULD_BLOCK_ERRNO) {
-        // Not an exceptional error per se – even with blocking sockets,
-        // EAGAIN apparently is returned sometimes on out-of-resource
-        // conditions (see the C++ implementation for details). Also, this
-        // allows using TSocket with non-blocking sockets e.g. in
-        // TNonblockingServer.
-        return 0;
-      }
-
-      auto type = TTransportException.Type.UNKNOWN;
-      if (isSocketCloseErrno(lastErrno)) {
-        type = TTransportException.Type.NOT_OPEN;
-        close();
-      }
-
-      throw new TTransportException("Sending to socket failed: " ~
-        socketErrnoString(lastErrno), type);
-    }
-
-    // send() should never return 0.
-    throw new TTransportException("Sending to socket failed (0 bytes written).",
-      TTransportException.Type.UNKNOWN);
-  }
-
-  override void sendTimeout(Duration value) @property {
-    super.sendTimeout(value);
-    setTimeout(SocketOption.SNDTIMEO, value);
-  }
-
-  override void recvTimeout(Duration value) @property {
-    super.recvTimeout(value);
-    setTimeout(SocketOption.RCVTIMEO, value);
-  }
-
-  /**
-   * Maximum number of retries for receiving from socket on read() in case of
-   * EAGAIN/EINTR.
-   */
-  ushort maxRecvRetries() @property const {
-    return maxRecvRetries_;
-  }
-
-  /// Ditto
-  void maxRecvRetries(ushort value) @property {
-    maxRecvRetries_ = value;
-  }
-
-  /// Ditto
-  enum DEFAULT_MAX_RECV_RETRIES = 5;
-
-protected:
-  override void setSocketOpts() {
-    super.setSocketOpts();
-    setTimeout(SocketOption.SNDTIMEO, sendTimeout_);
-    setTimeout(SocketOption.RCVTIMEO, recvTimeout_);
-  }
-
-  void setTimeout(SocketOption type, Duration value) {
-    assert(type == SocketOption.SNDTIMEO || type == SocketOption.RCVTIMEO);
-    version (Win32) {
-      if (value > dur!"hnsecs"(0) && value < dur!"msecs"(500)) {
-        logError(
-          "Socket %s timeout of %s ms might be raised to 500 ms on Windows.",
-          (type == SocketOption.SNDTIMEO) ? "send" : "receive",
-          value.total!"msecs"
-        );
-      }
-    }
-
-    if (socket_) {
-      try {
-        socket_.setOption(SocketOptionLevel.SOCKET, type, value);
-      } catch (SocketException e) {
-        throw new TTransportException(
-          "Could not set timeout.",
-          TTransportException.Type.UNKNOWN,
-          __FILE__,
-          __LINE__,
-          e
-        );
-      }
-    }
-  }
-
-  /// Maximum number of recv() retries.
-  ushort maxRecvRetries_  = DEFAULT_MAX_RECV_RETRIES;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/ssl.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/ssl.d
deleted file mode 100644
index a78a2ed..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/ssl.d
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * OpenSSL socket implementation, in large parts ported from C++.
- */
-module thrift.transport.ssl;
-
-import core.exception : onOutOfMemoryError;
-import core.stdc.errno : errno, EINTR;
-import core.sync.mutex : Mutex;
-import core.memory : GC;
-import core.stdc.config;
-import core.stdc.stdlib : free, malloc;
-import std.ascii : toUpper;
-import std.array : empty, front, popFront;
-import std.conv : emplace, to;
-import std.exception : enforce;
-import std.socket : Address, InternetAddress, Internet6Address, Socket;
-import std.string : toStringz;
-import deimos.openssl.err;
-import deimos.openssl.rand;
-import deimos.openssl.ssl;
-import deimos.openssl.x509v3;
-import thrift.base;
-import thrift.internal.ssl;
-import thrift.transport.base;
-import thrift.transport.socket;
-
-/**
- * SSL encrypted socket implementation using OpenSSL.
- *
- * Note:
- * On Posix systems which do not have the BSD-specific SO_NOSIGPIPE flag, you
- * might want to ignore the SIGPIPE signal, as OpenSSL might try to write to
- * a closed socket if the peer disconnects abruptly:
- * ---
- * import core.stdc.signal;
- * import core.sys.posix.signal;
- * signal(SIGPIPE, SIG_IGN);
- * ---
- */
-final class TSSLSocket : TSocket {
-  /**
-   * Creates an instance that wraps an already created, connected (!) socket.
-   *
-   * Params:
-   *   context = The SSL socket context to use. A reference to it is stored so
-   *     that it doesn't get cleaned up while the socket is used.
-   *   socket = Already created, connected socket object.
-   */
-  this(TSSLContext context, Socket socket) {
-    super(socket);
-    context_ = context;
-    serverSide_ = context.serverSide;
-    accessManager_ = context.accessManager;
-  }
-
-  /**
-   * Creates a new unconnected socket that will connect to the given host
-   * on the given port.
-   *
-   * Params:
-   *   context = The SSL socket context to use. A reference to it is stored so
-    *     that it doesn't get cleaned up while the socket is used.
-   *   host = Remote host.
-   *   port = Remote port.
-   */
-  this(TSSLContext context, string host, ushort port) {
-    super(host, port);
-    context_ = context;
-    serverSide_ = context.serverSide;
-    accessManager_ = context.accessManager;
-  }
-
-  override bool isOpen() @property {
-    if (ssl_ is null || !super.isOpen()) return false;
-
-    auto shutdown = SSL_get_shutdown(ssl_);
-    bool shutdownReceived = (shutdown & SSL_RECEIVED_SHUTDOWN) != 0;
-    bool shutdownSent = (shutdown & SSL_SENT_SHUTDOWN) != 0;
-    return !(shutdownReceived && shutdownSent);
-  }
-
-  override bool peek() {
-    if (!isOpen) return false;
-    checkHandshake();
-
-    byte bt;
-    auto rc = SSL_peek(ssl_, &bt, bt.sizeof);
-    enforce(rc >= 0, getSSLException("SSL_peek"));
-
-    if (rc == 0) {
-      ERR_clear_error();
-    }
-    return (rc > 0);
-  }
-
-  override void open() {
-    enforce(!serverSide_, "Cannot open a server-side SSL socket.");
-    if (isOpen) return;
-    super.open();
-  }
-
-  override void close() {
-    if (!isOpen) return;
-
-    if (ssl_ !is null) {
-      // Two-step SSL shutdown.
-      auto rc = SSL_shutdown(ssl_);
-      if (rc == 0) {
-        rc = SSL_shutdown(ssl_);
-      }
-      if (rc < 0) {
-        // Do not throw an exception here as leaving the transport "open" will
-        // probably produce only more errors, and the chance we can do
-        // something about the error e.g. by retrying is very low.
-        logError("Error shutting down SSL: %s", getSSLException());
-      }
-
-      SSL_free(ssl_);
-      ssl_ = null;
-      ERR_remove_state(0);
-    }
-    super.close();
-  }
-
-  override size_t read(ubyte[] buf) {
-    checkHandshake();
-
-    int bytes;
-    foreach (_; 0 .. maxRecvRetries) {
-      bytes = SSL_read(ssl_, buf.ptr, cast(int)buf.length);
-      if (bytes >= 0) break;
-
-      auto errnoCopy = errno;
-      if (SSL_get_error(ssl_, bytes) == SSL_ERROR_SYSCALL) {
-        if (ERR_get_error() == 0 && errnoCopy == EINTR) {
-          // FIXME: Windows.
-          continue;
-        }
-      }
-      throw getSSLException("SSL_read");
-    }
-    return bytes;
-  }
-
-  override void write(in ubyte[] buf) {
-    checkHandshake();
-
-    // Loop in case SSL_MODE_ENABLE_PARTIAL_WRITE is set in SSL_CTX.
-    size_t written = 0;
-    while (written < buf.length) {
-      auto bytes = SSL_write(ssl_, buf.ptr + written,
-        cast(int)(buf.length - written));
-      if (bytes <= 0) {
-        throw getSSLException("SSL_write");
-      }
-      written += bytes;
-    }
-  }
-
-  override void flush() {
-    checkHandshake();
-
-    auto bio = SSL_get_wbio(ssl_);
-    enforce(bio !is null, new TSSLException("SSL_get_wbio returned null"));
-
-    auto rc = BIO_flush(bio);
-    enforce(rc == 1, getSSLException("BIO_flush"));
-  }
-
-  /**
-   * Whether to use client or server side SSL handshake protocol.
-   */
-  bool serverSide() @property const {
-    return serverSide_;
-  }
-
-  /// Ditto
-  void serverSide(bool value) @property {
-    serverSide_ = value;
-  }
-
-  /**
-   * The access manager to use.
-   */
-  void accessManager(TAccessManager value) @property {
-    accessManager_ = value;
-  }
-
-private:
-  void checkHandshake() {
-    enforce(super.isOpen(), new TTransportException(
-      TTransportException.Type.NOT_OPEN));
-
-    if (ssl_ !is null) return;
-    ssl_ = context_.createSSL();
-
-    SSL_set_fd(ssl_, socketHandle);
-    int rc;
-    if (serverSide_) {
-      rc = SSL_accept(ssl_);
-    } else {
-      rc = SSL_connect(ssl_);
-    }
-    enforce(rc > 0, getSSLException());
-    authorize(ssl_, accessManager_, getPeerAddress(),
-      (serverSide_ ? getPeerAddress().toHostNameString() : host));
-  }
-
-  bool serverSide_;
-  SSL* ssl_;
-  TSSLContext context_;
-  TAccessManager accessManager_;
-}
-
-/**
- * Represents an OpenSSL context with certification settings, etc. and handles
- * initialization/teardown.
- *
- * OpenSSL is initialized when the first instance of this class is created
- * and shut down when the last one is destroyed (thread-safe).
- */
-class TSSLContext {
-  this() {
-    initMutex_.lock();
-    scope(exit) initMutex_.unlock();
-
-    if (count_ == 0) {
-      initializeOpenSSL();
-      randomize();
-    }
-    count_++;
-
-    ctx_ = SSL_CTX_new(TLSv1_method());
-    enforce(ctx_, getSSLException("SSL_CTX_new"));
-    SSL_CTX_set_mode(ctx_, SSL_MODE_AUTO_RETRY);
-  }
-
-  ~this() {
-    initMutex_.lock();
-    scope(exit) initMutex_.unlock();
-
-    if (ctx_ !is null) {
-      SSL_CTX_free(ctx_);
-      ctx_ = null;
-    }
-
-    count_--;
-    if (count_ == 0) {
-      cleanupOpenSSL();
-    }
-  }
-
-  /**
-   * Ciphers to be used in SSL handshake process.
-   *
-   * The string must be in the colon-delimited OpenSSL notation described in
-   * ciphers(1), for example: "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH".
-   */
-  void ciphers(string enable) @property {
-    auto rc = SSL_CTX_set_cipher_list(ctx_, toStringz(enable));
-
-    enforce(ERR_peek_error() == 0, getSSLException("SSL_CTX_set_cipher_list"));
-    enforce(rc > 0, new TSSLException("None of specified ciphers are supported"));
-  }
-
-  /**
-   * Whether peer is required to present a valid certificate.
-   */
-  void authenticate(bool required) @property {
-    int mode;
-    if (required) {
-      mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT |
-        SSL_VERIFY_CLIENT_ONCE;
-    } else {
-      mode = SSL_VERIFY_NONE;
-    }
-    SSL_CTX_set_verify(ctx_, mode, null);
-  }
-
-  /**
-   * Load server certificate.
-   *
-   * Params:
-   *   path = Path to the certificate file.
-   *   format = Certificate file format. Defaults to PEM, which is currently
-   *     the only one supported.
-   */
-  void loadCertificate(string path, string format = "PEM") {
-    enforce(path !is null && format !is null, new TTransportException(
-      "loadCertificateChain: either <path> or <format> is null",
-      TTransportException.Type.BAD_ARGS));
-
-    if (format == "PEM") {
-      enforce(SSL_CTX_use_certificate_chain_file(ctx_, toStringz(path)),
-        getSSLException(
-          `Could not load SSL server certificate from file "` ~ path ~ `"`
-        )
-      );
-    } else {
-      throw new TSSLException("Unsupported certificate format: " ~ format);
-    }
-  }
-
-  /*
-   * Load private key.
-   *
-   * Params:
-   *   path = Path to the certificate file.
-   *   format = Private key file format. Defaults to PEM, which is currently
-   *     the only one supported.
-   */
-  void loadPrivateKey(string path, string format = "PEM") {
-    enforce(path !is null && format !is null, new TTransportException(
-      "loadPrivateKey: either <path> or <format> is NULL",
-      TTransportException.Type.BAD_ARGS));
-
-    if (format == "PEM") {
-      enforce(SSL_CTX_use_PrivateKey_file(ctx_, toStringz(path), SSL_FILETYPE_PEM),
-        getSSLException(
-          `Could not load SSL private key from file "` ~ path ~ `"`
-        )
-      );
-    } else {
-      throw new TSSLException("Unsupported certificate format: " ~ format);
-    }
-  }
-
-  /**
-   * Load trusted certificates from specified file (in PEM format).
-   *
-   * Params.
-   *   path = Path to the file containing the trusted certificates.
-   */
-  void loadTrustedCertificates(string path) {
-    enforce(path !is null, new TTransportException(
-      "loadTrustedCertificates: <path> is NULL",
-      TTransportException.Type.BAD_ARGS));
-
-    enforce(SSL_CTX_load_verify_locations(ctx_, toStringz(path), null),
-      getSSLException(
-        `Could not load SSL trusted certificate list from file "` ~ path ~ `"`
-      )
-    );
-  }
-
-  /**
-   * Called during OpenSSL initialization to seed the OpenSSL entropy pool.
-   *
-   * Defaults to simply calling RAND_poll(), but it can be overwritten if a
-   * different, perhaps more secure implementation is desired.
-   */
-  void randomize() {
-    RAND_poll();
-  }
-
-  /**
-   * Whether to use client or server side SSL handshake protocol.
-   */
-  bool serverSide() @property const {
-    return serverSide_;
-  }
-
-  /// Ditto
-  void serverSide(bool value) @property {
-    serverSide_ = value;
-  }
-
-  /**
-   * The access manager to use.
-   */
-  TAccessManager accessManager() @property {
-    if (!serverSide_ && !accessManager_) {
-      accessManager_ = new TDefaultClientAccessManager;
-    }
-    return accessManager_;
-  }
-
-  /// Ditto
-  void accessManager(TAccessManager value) @property {
-    accessManager_ = value;
-  }
-
-  SSL* createSSL() out (result) {
-    assert(result);
-  } body {
-    auto result = SSL_new(ctx_);
-    enforce(result, getSSLException("SSL_new"));
-    return result;
-  }
-
-protected:
-  /**
-   * Override this method for custom password callback. It may be called
-   * multiple times at any time during a session as necessary.
-   *
-   * Params:
-   *   size = Maximum length of password, including null byte.
-   */
-  string getPassword(int size) nothrow out(result) {
-    assert(result.length < size);
-  } body {
-    return "";
-  }
-
-  /**
-   * Notifies OpenSSL to use getPassword() instead of the default password
-   * callback with getPassword().
-   */
-  void overrideDefaultPasswordCallback() {
-    SSL_CTX_set_default_passwd_cb(ctx_, &passwordCallback);
-    SSL_CTX_set_default_passwd_cb_userdata(ctx_, cast(void*)this);
-  }
-
-  SSL_CTX* ctx_;
-
-private:
-  bool serverSide_;
-  TAccessManager accessManager_;
-
-  shared static this() {
-    initMutex_ = new Mutex();
-  }
-
-  static void initializeOpenSSL() {
-    if (initialized_) {
-      return;
-    }
-    initialized_ = true;
-
-    SSL_library_init();
-    SSL_load_error_strings();
-
-    mutexes_ = new Mutex[CRYPTO_num_locks()];
-    foreach (ref m; mutexes_) {
-      m = new Mutex;
-    }
-
-    import thrift.internal.traits;
-    // As per the OpenSSL threads manpage, this isn't needed on Windows.
-    version (Posix) {
-      CRYPTO_set_id_callback(assumeNothrow(&threadIdCallback));
-    }
-    CRYPTO_set_locking_callback(assumeNothrow(&lockingCallback));
-    CRYPTO_set_dynlock_create_callback(assumeNothrow(&dynlockCreateCallback));
-    CRYPTO_set_dynlock_lock_callback(assumeNothrow(&dynlockLockCallback));
-    CRYPTO_set_dynlock_destroy_callback(assumeNothrow(&dynlockDestroyCallback));
-  }
-
-  static void cleanupOpenSSL() {
-    if (!initialized_) return;
-
-    initialized_ = false;
-    CRYPTO_set_locking_callback(null);
-    CRYPTO_set_dynlock_create_callback(null);
-    CRYPTO_set_dynlock_lock_callback(null);
-    CRYPTO_set_dynlock_destroy_callback(null);
-    CRYPTO_cleanup_all_ex_data();
-    ERR_free_strings();
-    ERR_remove_state(0);
-  }
-
-  static extern(C) {
-    version (Posix) {
-      import core.sys.posix.pthread : pthread_self;
-      c_ulong threadIdCallback() {
-        return cast(c_ulong)pthread_self();
-      }
-    }
-
-    void lockingCallback(int mode, int n, const(char)* file, int line) {
-      if (mode & CRYPTO_LOCK) {
-        mutexes_[n].lock();
-      } else {
-        mutexes_[n].unlock();
-      }
-    }
-
-    CRYPTO_dynlock_value* dynlockCreateCallback(const(char)* file, int line) {
-      enum size =  __traits(classInstanceSize, Mutex);
-      auto mem = malloc(size)[0 .. size];
-      if (!mem) onOutOfMemoryError();
-      GC.addRange(mem.ptr, size);
-      auto mutex = emplace!Mutex(mem);
-      return cast(CRYPTO_dynlock_value*)mutex;
-    }
-
-    void dynlockLockCallback(int mode, CRYPTO_dynlock_value* l,
-      const(char)* file, int line)
-    {
-      if (l is null) return;
-      if (mode & CRYPTO_LOCK) {
-        (cast(Mutex)l).lock();
-      } else {
-        (cast(Mutex)l).unlock();
-      }
-    }
-
-    void dynlockDestroyCallback(CRYPTO_dynlock_value* l,
-      const(char)* file, int line)
-    {
-      GC.removeRange(l);
-      destroy(cast(Mutex)l);
-      free(l);
-    }
-
-    int passwordCallback(char* password, int size, int, void* data) nothrow {
-      auto context = cast(TSSLContext) data;
-      auto userPassword = context.getPassword(size);
-      auto len = userPassword.length;
-      if (len > size) {
-        len = size;
-      }
-      password[0 .. len] = userPassword[0 .. len]; // TODO: \0 handling correct?
-      return cast(int)len;
-    }
-  }
-
-  static __gshared bool initialized_;
-  static __gshared Mutex initMutex_;
-  static __gshared Mutex[] mutexes_;
-  static __gshared uint count_;
-}
-
-/**
- * Decides whether a remote host is legitimate or not.
- *
- * It is usually set at a TSSLContext, which then passes it to all the created
- * TSSLSockets.
- */
-class TAccessManager {
-  ///
-  enum Decision {
-    DENY = -1, /// Deny access.
-    SKIP =  0, /// Cannot decide, move on to next check (deny if last).
-    ALLOW = 1  /// Allow access.
-  }
-
-  /**
-   * Determines whether a peer should be granted access or not based on its
-   * IP address.
-   *
-   * Called once after SSL handshake is completes successfully and before peer
-   * certificate is examined.
-   *
-   * If a valid decision (ALLOW or DENY) is returned, the peer certificate
-   * will not be verified.
-   */
-  Decision verify(Address address) {
-    return Decision.DENY;
-  }
-
-  /**
-   * Determines whether a peer should be granted access or not based on a
-   * name from its certificate.
-   *
-   * Called every time a DNS subjectAltName/common name is extracted from the
-   * peer's certificate.
-   *
-   * Params:
-   *   host = The actual host name string from the socket connection.
-   *   certHost = A host name string from the certificate.
-   */
-  Decision verify(string host, const(char)[] certHost) {
-    return Decision.DENY;
-  }
-
-  /**
-   * Determines whether a peer should be granted access or not based on an IP
-   * address from its certificate.
-   *
-   * Called every time an IP subjectAltName is extracted from the peer's
-   * certificate.
-   *
-   * Params:
-   *   address = The actual address from the socket connection.
-   *   certHost = A host name string from the certificate.
-   */
-  Decision verify(Address address, ubyte[] certAddress) {
-    return Decision.DENY;
-  }
-}
-
-/**
- * Default access manager implementation, which just checks the host name
- * resp. IP address of the connection against the certificate.
- */
-class TDefaultClientAccessManager : TAccessManager {
-  override Decision verify(Address address) {
-    return Decision.SKIP;
-  }
-
-  override Decision verify(string host, const(char)[] certHost) {
-    if (host.empty || certHost.empty) {
-      return Decision.SKIP;
-    }
-    return (matchName(host, certHost) ? Decision.ALLOW : Decision.SKIP);
-  }
-
-  override Decision verify(Address address, ubyte[] certAddress) {
-    bool match;
-    if (certAddress.length == 4) {
-      if (auto ia = cast(InternetAddress)address) {
-        match = ((cast(ubyte*)ia.addr())[0 .. 4] == certAddress[]);
-      }
-    } else if (certAddress.length == 16) {
-      if (auto ia = cast(Internet6Address)address) {
-        match = (ia.addr() == certAddress[]);
-      }
-    }
-    return (match ? Decision.ALLOW : Decision.SKIP);
-  }
-}
-
-private {
-  /**
-   * Matches a name with a pattern. The pattern may include wildcard. A single
-   * wildcard "*" can match up to one component in the domain name.
-   *
-   * Params:
-   *   host = Host name to match, typically the SSL remote peer.
-   *   pattern = Host name pattern, typically from the SSL certificate.
-   *
-   * Returns: true if host matches pattern, false otherwise.
-   */
-  bool matchName(const(char)[] host, const(char)[] pattern) {
-    while (!host.empty && !pattern.empty) {
-      if (toUpper(pattern.front) == toUpper(host.front)) {
-        host.popFront;
-        pattern.popFront;
-      } else if (pattern.front == '*') {
-        while (!host.empty && host.front != '.') {
-          host.popFront;
-        }
-        pattern.popFront;
-      } else {
-        break;
-      }
-    }
-    return (host.empty && pattern.empty);
-  }
-
-  unittest {
-    enforce(matchName("thrift.apache.org", "*.apache.org"));
-    enforce(!matchName("thrift.apache.org", "apache.org"));
-    enforce(matchName("thrift.apache.org", "thrift.*.*"));
-    enforce(matchName("", ""));
-    enforce(!matchName("", "*"));
-  }
-}
-
-/**
- * SSL-level exception.
- */
-class TSSLException : TTransportException {
-  ///
-  this(string msg, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    super(msg, TTransportException.Type.INTERNAL_ERROR, file, line, next);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/zlib.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/zlib.d
deleted file mode 100644
index 9496f9b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/transport/zlib.d
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module thrift.transport.zlib;
-
-import core.bitop : bswap;
-import etc.c.zlib;
-import std.algorithm : min;
-import std.array : empty;
-import std.conv : to;
-import std.exception : enforce;
-import thrift.base;
-import thrift.transport.base;
-
-/**
- * zlib transport. Compresses (deflates) data before writing it to the
- * underlying transport, and decompresses (inflates) it after reading.
- */
-final class TZlibTransport : TBaseTransport {
-  // These defaults have yet to be optimized.
-  enum DEFAULT_URBUF_SIZE = 128;
-  enum DEFAULT_CRBUF_SIZE = 1024;
-  enum DEFAULT_UWBUF_SIZE = 128;
-  enum DEFAULT_CWBUF_SIZE = 1024;
-
-  /**
-   * Constructs a new zlib transport.
-   *
-   * Params:
-   *   transport = The underlying transport to wrap.
-   *   urbufSize = The size of the uncompressed reading buffer, in bytes.
-   *   crbufSize = The size of the compressed reading buffer, in bytes.
-   *   uwbufSize = The size of the uncompressed writing buffer, in bytes.
-   *   cwbufSize = The size of the compressed writing buffer, in bytes.
-   */
-  this(
-    TTransport transport,
-    size_t urbufSize = DEFAULT_URBUF_SIZE,
-    size_t crbufSize = DEFAULT_CRBUF_SIZE,
-    size_t uwbufSize = DEFAULT_UWBUF_SIZE,
-    size_t cwbufSize = DEFAULT_CWBUF_SIZE
-  ) {
-    transport_ = transport;
-
-    enforce(uwbufSize >= MIN_DIRECT_DEFLATE_SIZE, new TTransportException(
-      "TZLibTransport: uncompressed write buffer must be at least " ~
-      to!string(MIN_DIRECT_DEFLATE_SIZE) ~ "bytes in size.",
-      TTransportException.Type.BAD_ARGS));
-
-    urbuf_ = new ubyte[urbufSize];
-    crbuf_ = new ubyte[crbufSize];
-    uwbuf_ = new ubyte[uwbufSize];
-    cwbuf_ = new ubyte[cwbufSize];
-
-    rstream_ = new z_stream;
-    rstream_.next_in = crbuf_.ptr;
-    rstream_.avail_in  = 0;
-    rstream_.next_out = urbuf_.ptr;
-    rstream_.avail_out = to!uint(urbuf_.length);
-
-    wstream_ = new z_stream;
-    wstream_.next_in = uwbuf_.ptr;
-    wstream_.avail_in = 0;
-    wstream_.next_out = cwbuf_.ptr;
-    wstream_.avail_out = to!uint(crbuf_.length);
-
-    zlibEnforce(inflateInit(rstream_), rstream_);
-    scope (failure) {
-      zlibLogError(inflateEnd(rstream_), rstream_);
-    }
-
-    zlibEnforce(deflateInit(wstream_, Z_DEFAULT_COMPRESSION), wstream_);
-  }
-
-  ~this() {
-    zlibLogError(inflateEnd(rstream_), rstream_);
-
-    auto result = deflateEnd(wstream_);
-    // Z_DATA_ERROR may indicate unflushed data, so just ignore it.
-    if (result != Z_DATA_ERROR) {
-      zlibLogError(result, wstream_);
-    }
-  }
-
-  /**
-   * Returns the wrapped transport.
-   */
-  TTransport underlyingTransport() @property {
-    return transport_;
-  }
-
-  override bool isOpen() @property {
-    return readAvail > 0 || transport_.isOpen;
-  }
-
-  override bool peek() {
-    return readAvail > 0 || transport_.peek();
-  }
-
-  override void open() {
-    transport_.open();
-  }
-
-  override void close() {
-    transport_.close();
-  }
-
-  override size_t read(ubyte[] buf) {
-    // The C++ implementation suggests to skip urbuf on big reads in future
-    // versions, we would benefit from it as well.
-    auto origLen = buf.length;
-    while (true) {
-      auto give = min(readAvail, buf.length);
-
-      // If std.range.put was optimized for slicable ranges, it could be used
-      // here as well.
-      buf[0 .. give] = urbuf_[urpos_ .. urpos_ + give];
-      buf = buf[give .. $];
-      urpos_ += give;
-
-      auto need = buf.length;
-      if (need == 0) {
-        // We could manage to get the all the data requested.
-        return origLen;
-      }
-
-      if (inputEnded_ || (need < origLen && rstream_.avail_in == 0)) {
-        // We didn't fill buf completely, but there is no more data available.
-        return origLen - need;
-      }
-
-      // Refill our buffer by reading more data through zlib.
-      rstream_.next_out = urbuf_.ptr;
-      rstream_.avail_out = to!uint(urbuf_.length);
-      urpos_ = 0;
-
-      if (!readFromZlib()) {
-        // Couldn't get more data from the underlying transport.
-        return origLen - need;
-      }
-    }
-  }
-
-  override void write(in ubyte[] buf) {
-    enforce(!outputFinished_, new TTransportException(
-      "write() called after finish()", TTransportException.Type.BAD_ARGS));
-
-    auto len = buf.length;
-    if (len > MIN_DIRECT_DEFLATE_SIZE) {
-      flushToZlib(uwbuf_[0 .. uwpos_], Z_NO_FLUSH);
-      uwpos_ = 0;
-      flushToZlib(buf, Z_NO_FLUSH);
-    } else if (len > 0) {
-      if (uwbuf_.length - uwpos_ < len) {
-        flushToZlib(uwbuf_[0 .. uwpos_], Z_NO_FLUSH);
-        uwpos_ = 0;
-      }
-      uwbuf_[uwpos_ .. uwpos_ + len] = buf[];
-      uwpos_ += len;
-    }
-  }
-
-  override void flush() {
-    enforce(!outputFinished_, new TTransportException(
-      "flush() called after finish()", TTransportException.Type.BAD_ARGS));
-
-    flushToTransport(Z_SYNC_FLUSH);
-  }
-
-  override const(ubyte)[] borrow(ubyte* buf, size_t len) {
-    if (len <= readAvail) {
-      return urbuf_[urpos_ .. $];
-    }
-    return null;
-  }
-
-  override void consume(size_t len) {
-    enforce(readAvail >= len, new TTransportException(
-      "consume() did not follow a borrow().", TTransportException.Type.BAD_ARGS));
-    urpos_ += len;
-  }
-
-  /**
-   * Finalize the zlib stream.
-   *
-   * This causes zlib to flush any pending write data and write end-of-stream
-   * information, including the checksum.  Once finish() has been called, no
-   * new data can be written to the stream.
-   */
-  void finish() {
-    enforce(!outputFinished_, new TTransportException(
-      "flush() called on already finished TZlibTransport",
-      TTransportException.Type.BAD_ARGS));
-    flushToTransport(Z_FINISH);
-  }
-
-  /**
-   * Verify the checksum at the end of the zlib stream (by finish()).
-   *
-   * May only be called after all data has been read.
-   *
-   * Throws: TTransportException when the checksum is corrupted or there is
-   *   still unread data left.
-   */
-  void verifyChecksum() {
-    // If zlib has already reported the end of the stream, the checksum has
-    // been verified, no.
-    if (inputEnded_) return;
-
-    enforce(!readAvail, new TTransportException(
-      "verifyChecksum() called before end of zlib stream",
-      TTransportException.Type.CORRUPTED_DATA));
-
-    rstream_.next_out = urbuf_.ptr;
-    rstream_.avail_out = to!uint(urbuf_.length);
-    urpos_ = 0;
-
-    // readFromZlib() will throw an exception if the checksum is bad.
-    enforce(readFromZlib(), new TTransportException(
-      "checksum not available yet in verifyChecksum()",
-      TTransportException.Type.CORRUPTED_DATA));
-
-    enforce(inputEnded_, new TTransportException(
-      "verifyChecksum() called before end of zlib stream",
-      TTransportException.Type.CORRUPTED_DATA));
-
-    // If we get here, we are at the end of the stream and thus zlib has
-    // successfully verified the checksum.
-  }
-
-private:
-  size_t readAvail() const @property {
-    return urbuf_.length - rstream_.avail_out - urpos_;
-  }
-
-  bool readFromZlib() {
-    assert(!inputEnded_);
-
-    if (rstream_.avail_in == 0) {
-      // zlib has used up all the compressed data we provided in crbuf, read
-      // some more from the underlying transport.
-      auto got = transport_.read(crbuf_);
-      if (got == 0) return false;
-      rstream_.next_in = crbuf_.ptr;
-      rstream_.avail_in = to!uint(got);
-    }
-
-    // We have some compressed data now, uncompress it.
-    auto zlib_result = inflate(rstream_, Z_SYNC_FLUSH);
-    if (zlib_result == Z_STREAM_END) {
-      inputEnded_ = true;
-    } else {
-      zlibEnforce(zlib_result, rstream_);
-    }
-
-    return true;
-  }
-
-  void flushToTransport(int type)  {
-    // Compress remaining data in uwbuf_ to cwbuf_.
-    flushToZlib(uwbuf_[0 .. uwpos_], type);
-    uwpos_ = 0;
-
-    // Write all compressed data to the transport.
-    transport_.write(cwbuf_[0 .. $ - wstream_.avail_out]);
-    wstream_.next_out = cwbuf_.ptr;
-    wstream_.avail_out = to!uint(cwbuf_.length);
-
-    // Flush the transport.
-    transport_.flush();
-  }
-
-  void flushToZlib(in ubyte[] buf, int type) {
-    wstream_.next_in = cast(ubyte*)buf.ptr; // zlib only reads, cast is safe.
-    wstream_.avail_in = to!uint(buf.length);
-
-    while (true) {
-      if (type == Z_NO_FLUSH && wstream_.avail_in == 0) {
-        break;
-      }
-
-      if (wstream_.avail_out == 0) {
-        // cwbuf has been exhausted by zlib, flush to the underlying transport.
-        transport_.write(cwbuf_);
-        wstream_.next_out = cwbuf_.ptr;
-        wstream_.avail_out = to!uint(cwbuf_.length);
-      }
-
-      auto zlib_result = deflate(wstream_, type);
-
-      if (type == Z_FINISH && zlib_result == Z_STREAM_END) {
-        assert(wstream_.avail_in == 0);
-        outputFinished_ = true;
-        break;
-      }
-
-      zlibEnforce(zlib_result, wstream_);
-
-      if ((type == Z_SYNC_FLUSH || type == Z_FULL_FLUSH) &&
-          wstream_.avail_in == 0 && wstream_.avail_out != 0) {
-        break;
-      }
-    }
-  }
-
-  static void zlibEnforce(int status, z_stream* stream) {
-    if (status != Z_OK) {
-      throw new TZlibException(status, stream.msg);
-    }
-  }
-
-  static void zlibLogError(int status, z_stream* stream) {
-    if (status != Z_OK) {
-      logError("TZlibTransport: zlib failure in destructor: %s",
-        TZlibException.errorMessage(status, stream.msg));
-    }
-  }
-
-  // Writes smaller than this are buffered up (due to zlib handling overhead).
-  // Larger (or equal) writes are dumped straight to zlib.
-  enum MIN_DIRECT_DEFLATE_SIZE = 32;
-
-  TTransport transport_;
-  z_stream* rstream_;
-  z_stream* wstream_;
-
-  /// Whether zlib has reached the end of the input stream.
-  bool inputEnded_;
-
-  /// Whether the output stream was already finish()ed.
-  bool outputFinished_;
-
-  /// Compressed input data buffer.
-  ubyte[] crbuf_;
-
-  /// Uncompressed input data buffer.
-  ubyte[] urbuf_;
-  size_t urpos_;
-
-  /// Uncompressed output data buffer (where small writes are accumulated
-  /// before handing over to zlib).
-  ubyte[] uwbuf_;
-  size_t uwpos_;
-
-  /// Compressed output data buffer (filled by zlib, we flush it to the
-  /// underlying transport).
-  ubyte[] cwbuf_;
-}
-
-/**
- * Wraps given transports into TZlibTransports.
- */
-alias TWrapperTransportFactory!TZlibTransport TZlibTransportFactory;
-
-/**
- * An INTERNAL_ERROR-type TTransportException originating from an error
- * signaled by zlib.
- */
-class TZlibException : TTransportException {
-  this(int statusCode, const(char)* msg) {
-    super(errorMessage(statusCode, msg), TTransportException.Type.INTERNAL_ERROR);
-    zlibStatusCode = statusCode;
-    zlibMsg = msg ? to!string(msg) : "(null)";
-  }
-
-  int zlibStatusCode;
-  string zlibMsg;
-
-  static string errorMessage(int statusCode, const(char)* msg) {
-    string result = "zlib error: ";
-
-    if (msg) {
-      result ~= to!string(msg);
-    } else {
-      result ~= "(no message)";
-    }
-
-    result ~= " (status code = " ~ to!string(statusCode) ~ ")";
-    return result;
-  }
-}
-
-version (unittest) {
-  import std.exception : collectException;
-  import thrift.transport.memory;
-}
-
-// Make sure basic reading/writing works.
-unittest {
-  auto buf = new TMemoryBuffer;
-  auto zlib = new TZlibTransport(buf);
-
-  immutable ubyte[] data = [1, 2, 3, 4, 5];
-  zlib.write(data);
-  zlib.finish();
-
-  auto result = new ubyte[data.length];
-  zlib.readAll(result);
-  enforce(data == result);
-  zlib.verifyChecksum();
-}
-
-// Make sure there is no data is written if write() is never called.
-unittest {
-  auto buf = new TMemoryBuffer;
-  {
-    scope zlib = new TZlibTransport(buf);
-  }
-  enforce(buf.getContents().length == 0);
-}
-
-// Make sure calling write()/flush()/finish() again after finish() throws.
-unittest {
-  auto buf = new TMemoryBuffer;
-  auto zlib = new TZlibTransport(buf);
-
-  zlib.write([1, 2, 3, 4, 5]);
-  zlib.finish();
-
-  auto ex = collectException!TTransportException(zlib.write([6]));
-  enforce(ex && ex.type == TTransportException.Type.BAD_ARGS);
-
-  ex = collectException!TTransportException(zlib.flush());
-  enforce(ex && ex.type == TTransportException.Type.BAD_ARGS);
-
-  ex = collectException!TTransportException(zlib.finish());
-  enforce(ex && ex.type == TTransportException.Type.BAD_ARGS);
-}
-
-// Make sure verifying the checksum works even if it requires starting a new
-// reading buffer after reading the payload has already been completed.
-unittest {
-  auto buf = new TMemoryBuffer;
-  auto zlib = new TZlibTransport(buf);
-
-  immutable ubyte[] data = [1, 2, 3, 4, 5];
-  zlib.write(data);
-  zlib.finish();
-
-  zlib = new TZlibTransport(buf, TZlibTransport.DEFAULT_URBUF_SIZE,
-    buf.getContents().length - 1); // The last byte belongs to the checksum.
-
-  auto result = new ubyte[data.length];
-  zlib.readAll(result);
-  enforce(data == result);
-
-  zlib.verifyChecksum();
-}
-
-// Make sure verifyChecksum() throws if we messed with the checksum.
-unittest {
-  import std.stdio;
-  import thrift.transport.range;
-
-  auto buf = new TMemoryBuffer;
-  auto zlib = new TZlibTransport(buf);
-
-  immutable ubyte[] data = [1, 2, 3, 4, 5];
-  zlib.write(data);
-  zlib.finish();
-
-  void testCorrupted(const(ubyte)[] corruptedData) {
-    auto reader = new TZlibTransport(tInputRangeTransport(corruptedData));
-    auto result = new ubyte[data.length];
-    try {
-      reader.readAll(result);
-
-      // If it does read without complaining, the result should be correct.
-      enforce(result == data);
-    } catch (TZlibException e) {}
-
-    auto ex = collectException!TTransportException(reader.verifyChecksum());
-    enforce(ex && ex.type == TTransportException.Type.CORRUPTED_DATA);
-  }
-
-  testCorrupted(buf.getContents()[0 .. $ - 1]);
-
-  auto modified = buf.getContents().dup;
-  ++modified[$ - 1];
-  testCorrupted(modified);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/awaitable.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/awaitable.d
deleted file mode 100644
index 38436ee..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/awaitable.d
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.util.awaitable;
-
-import core.sync.condition;
-import core.sync.mutex;
-import core.time : Duration;
-import std.exception : enforce;
-import std.socket/+ : Socket, socketPair+/; // DMD @@BUG314@@
-import thrift.base;
-
-// To avoid DMD @@BUG6395@@.
-import thrift.internal.algorithm;
-
-/**
- * An event that can occur at some point in the future and which can be
- * awaited, either by blocking until it occurs, or by registering a callback
- * delegate.
- */
-interface TAwaitable {
-  /**
-   * Waits until the event occurs.
-   *
-   * Calling wait() for an event that has already occurred is a no-op.
-   */
-  void wait();
-
-  /**
-   * Waits until the event occurs or the specified timeout expires.
-   *
-   * Calling wait() for an event that has already occurred is a no-op.
-   *
-   * Returns: Whether the event was triggered before the timeout expired.
-   */
-  bool wait(Duration timeout);
-
-  /**
-   * Registers a callback that is called if the event occurs.
-   *
-   * The delegate will likely be invoked from a different thread, and is
-   * expected not to perform expensive work as it will usually be invoked
-   * synchronously by the notifying thread. The order in which registered
-   * callbacks are invoked is not specified.
-   *
-   * The callback must never throw, but nothrow semantics are difficult to
-   * enforce, so currently exceptions are just swallowed by
-   * TAwaitable implementations.
-   *
-   * If the event has already occurred, the delegate is immediately executed
-   * in the current thread.
-   */
-  void addCallback(void delegate() dg);
-
-  /**
-   * Removes a previously added callback.
-   *
-   * Returns: Whether the callback could be found in the list, i.e. whether it
-   *   was previously added.
-   */
-  bool removeCallback(void delegate() dg);
-}
-
-/**
- * A simple TAwaitable event triggered by just calling a trigger() method.
- */
-class TOneshotEvent : TAwaitable {
-  this() {
-    mutex_ = new Mutex;
-    condition_ = new Condition(mutex_);
-  }
-
-  override void wait() {
-    synchronized (mutex_) {
-      while (!triggered_) condition_.wait();
-    }
-  }
-
-  override bool wait(Duration timeout) {
-    synchronized (mutex_) {
-      if (triggered_) return true;
-      condition_.wait(timeout);
-      return triggered_;
-    }
-  }
-
-  override void addCallback(void delegate() dg) {
-    mutex_.lock();
-    scope (failure) mutex_.unlock();
-
-    callbacks_ ~= dg;
-
-    if (triggered_) {
-      mutex_.unlock();
-      dg();
-      return;
-    }
-
-    mutex_.unlock();
-  }
-
-  override bool removeCallback(void delegate() dg) {
-    synchronized (mutex_) {
-      auto oldLength = callbacks_.length;
-      callbacks_ = removeEqual(callbacks_, dg);
-      return callbacks_.length < oldLength;
-    }
-  }
-
-  /**
-   * Triggers the event.
-   *
-   * Any registered event callbacks are executed synchronously before the
-   * function returns.
-   */
-  void trigger() {
-    synchronized (mutex_) {
-      if (!triggered_) {
-        triggered_ = true;
-        condition_.notifyAll();
-        foreach (c; callbacks_) c();
-      }
-    }
-  }
-
-private:
-  bool triggered_;
-  Mutex mutex_;
-  Condition condition_;
-  void delegate()[] callbacks_;
-}
-
-/**
- * Translates TAwaitable events into dummy messages on a socket that can be
- * used e.g. to wake up from a select() call.
- */
-final class TSocketNotifier {
-  this() {
-    auto socks = socketPair();
-    foreach (s; socks) s.blocking = false;
-    sendSocket_ = socks[0];
-    recvSocket_ = socks[1];
-  }
-
-  /**
-   * The socket the messages will be sent to.
-   */
-  Socket socket() @property {
-    return recvSocket_;
-  }
-
-  /**
-   * Atatches the socket notifier to the specified awaitable, causing it to
-   * write a byte to the notification socket when the awaitable callbacks are
-   * invoked.
-   *
-   * If the event has already been triggered, the dummy byte is written
-   * immediately to the socket.
-   *
-   * A socket notifier can only be attached to a single awaitable at a time.
-   *
-   * Throws: TException if the socket notifier is already attached.
-   */
-  void attach(TAwaitable awaitable) {
-    enforce(!awaitable_, new TException("Already attached."));
-    awaitable.addCallback(&notify);
-    awaitable_ = awaitable;
-  }
-
-  /**
-   * Detaches the socket notifier from the awaitable it is currently attached
-   * to.
-   *
-   * Throws: TException if the socket notifier is not currently attached.
-   */
-  void detach() {
-    enforce(awaitable_, new TException("Not attached."));
-
-    // Soak up any not currently read notification bytes.
-    ubyte[1] dummy = void;
-    while (recvSocket_.receive(dummy) != Socket.ERROR) {}
-
-    auto couldRemove = awaitable_.removeCallback(&notify);
-    assert(couldRemove);
-    awaitable_ = null;
-  }
-
-private:
-  void notify() {
-    ubyte[1] zero;
-    sendSocket_.send(zero);
-  }
-
-  TAwaitable awaitable_;
-  Socket sendSocket_;
-  Socket recvSocket_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/cancellation.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/cancellation.d
deleted file mode 100644
index 6255236..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/cancellation.d
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.util.cancellation;
-
-import core.atomic;
-import thrift.base;
-import thrift.util.awaitable;
-
-/**
- * A cancellation request for asynchronous or blocking synchronous operations.
- *
- * It is passed to the entity creating an operation, which will usually monitor
- * it either by polling or by adding event handlers, and cancel the operation
- * if it is triggered.
- *
- * For synchronous operations, this usually means either throwing a
- * TCancelledException or immediately returning, depending on whether
- * cancellation is an expected part of the task outcome or not. For
- * asynchronous operations, cancellation typically entails stopping background
- * work and cancelling a result future, if not already completed.
- *
- * An operation accepting a TCancellation does not need to guarantee that it
- * will actually be able to react to the cancellation request.
- */
-interface TCancellation {
-  /**
-   * Whether the cancellation request has been triggered.
-   */
-  bool triggered() const @property;
-
-  /**
-   * Throws a TCancelledException if the cancellation request has already been
-   * triggered.
-   */
-  void throwIfTriggered() const;
-
-  /**
-   * A TAwaitable that can be used to wait for cancellation triggering.
-   */
-  TAwaitable triggering() @property;
-}
-
-/**
- * The origin of a cancellation request, which provides a way to actually
- * trigger it.
- *
- * This design allows operations to pass the TCancellation on to sub-tasks,
- * while making sure that the cancellation can only be triggered by the
- * »outermost« instance waiting for the result.
- */
-final class TCancellationOrigin : TCancellation {
-  this() {
-    event_ = new TOneshotEvent;
-  }
-
-  /**
-   * Triggers the cancellation request.
-   */
-  void trigger() {
-    atomicStore(triggered_, true);
-    event_.trigger();
-  }
-
-  /+override+/ bool triggered() const @property {
-    return atomicLoad(triggered_);
-  }
-
-  /+override+/ void throwIfTriggered() const {
-    if (triggered) throw new TCancelledException;
-  }
-
-  /+override+/ TAwaitable triggering() @property {
-    return event_;
-  }
-
-private:
-  shared bool triggered_;
-  TOneshotEvent event_;
-}
-
-///
-class TCancelledException : TException {
-  ///
-  this(string msg = null, string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null
-  ) {
-    super(msg ? msg : "The operation has been cancelled.", file, line, next);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/future.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/future.d
deleted file mode 100644
index 2b32a01..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/future.d
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.util.future;
-
-import core.atomic;
-import core.sync.condition;
-import core.sync.mutex;
-import core.time : Duration;
-import std.array : empty, front, popFront;
-import std.conv : to;
-import std.exception : enforce;
-import std.traits : BaseTypeTuple, isSomeFunction, ParameterTypeTuple, ReturnType;
-import thrift.base;
-import thrift.util.awaitable;
-import thrift.util.cancellation;
-
-/**
- * Represents an operation which is executed asynchronously and the result of
- * which will become available at some point in the future.
- *
- * Once a operation is completed, the result of the operation can be fetched
- * via the get() family of methods. There are three possible cases: Either the
- * operation succeeded, then its return value is returned, or it failed by
- * throwing, in which case the exception is rethrown, or it was cancelled
- * before, then a TCancelledException is thrown. There might be TFuture
- * implementations which never possibly enter the cancelled state.
- *
- * All methods are thread-safe, but keep in mind that any exception object or
- * result (if it is a reference type, of course) is shared between all
- * get()-family invocations.
- */
-interface TFuture(ResultType) {
-  /**
-   * The status the operation is currently in.
-   *
-   * An operation starts out in RUNNING status, and changes state to one of the
-   * others at most once afterwards.
-   */
-  TFutureStatus status() @property;
-
-  /**
-   * A TAwaitable triggered when the operation leaves the RUNNING status.
-   */
-  TAwaitable completion() @property;
-
-  /**
-   * Convenience shorthand for waiting until the result is available and then
-   * get()ing it.
-   *
-   * If the operation has already completed, the result is immediately
-   * returned.
-   *
-   * The result of this method is »alias this«'d to the interface, so that
-   * TFuture can be used as a drop-in replacement for a simple value in
-   * synchronous code.
-   */
-  final ResultType waitGet() {
-    completion.wait();
-    return get();
-  }
-  final @property auto waitGetProperty() { return waitGet(); }
-  alias waitGetProperty this;
-
-  /**
-   * Convenience shorthand for waiting until the result is available and then
-   * get()ing it.
-   *
-   * If the operation completes in time, returns its result (resp. throws an
-   * exception for the failed/cancelled cases). If not, throws a
-   * TFutureException.
-   */
-  final ResultType waitGet(Duration timeout) {
-    enforce(completion.wait(timeout), new TFutureException(
-      "Operation did not complete in time."));
-    return get();
-  }
-
-  /**
-   * Returns the result of the operation.
-   *
-   * Throws: TFutureException if the operation has been cancelled,
-   *   TCancelledException if it is not yet done; the set exception if it
-   *   failed.
-   */
-  ResultType get();
-
-  /**
-   * Returns the captured exception if the operation failed, or null otherwise.
-   *
-   * Throws: TFutureException if not yet done, TCancelledException if the
-   *   operation has been cancelled.
-   */
-  Exception getException();
-}
-
-/**
- * The states the operation offering a future interface can be in.
- */
-enum TFutureStatus : byte {
-  RUNNING, /// The operation is still running.
-  SUCCEEDED, /// The operation completed without throwing an exception.
-  FAILED, /// The operation completed by throwing an exception.
-  CANCELLED /// The operation was cancelled.
-}
-
-/**
- * A TFuture covering the simple but common case where the result is simply
- * set by a call to succeed()/fail().
- *
- * All methods are thread-safe, but usually, succeed()/fail() are only called
- * from a single thread (different from the thread(s) waiting for the result
- * using the TFuture interface, though).
- */
-class TPromise(ResultType) : TFuture!ResultType {
-  this() {
-    statusMutex_ = new Mutex;
-    completionEvent_ = new TOneshotEvent;
-  }
-
-  override S status() const @property {
-    return atomicLoad(status_);
-  }
-
-  override TAwaitable completion() @property {
-    return completionEvent_;
-  }
-
-  override ResultType get() {
-    auto s = atomicLoad(status_);
-    enforce(s != S.RUNNING,
-      new TFutureException("Operation not yet completed."));
-
-    if (s == S.CANCELLED) throw new TCancelledException;
-    if (s == S.FAILED) throw exception_;
-
-    static if (!is(ResultType == void)) {
-      return result_;
-    }
-  }
-
-  override Exception getException() {
-    auto s = atomicLoad(status_);
-    enforce(s != S.RUNNING,
-      new TFutureException("Operation not yet completed."));
-
-    if (s == S.CANCELLED) throw new TCancelledException;
-    if (s == S.SUCCEEDED) return null;
-
-    return exception_;
-  }
-
-  static if (!is(ResultType == void)) {
-    /**
-     * Sets the result of the operation, marks it as done, and notifies any
-     * waiters.
-     *
-     * If the operation has been cancelled before, nothing happens.
-     *
-     * Throws: TFutureException if the operation is already completed.
-     */
-    void succeed(ResultType result) {
-      synchronized (statusMutex_) {
-        auto s = atomicLoad(status_);
-        if (s == S.CANCELLED) return;
-
-        enforce(s == S.RUNNING,
-          new TFutureException("Operation already completed."));
-        result_ = result;
-
-        atomicStore(status_, S.SUCCEEDED);
-      }
-
-      completionEvent_.trigger();
-    }
-  } else {
-    void succeed() {
-      synchronized (statusMutex_) {
-        auto s = atomicLoad(status_);
-        if (s == S.CANCELLED) return;
-
-        enforce(s == S.RUNNING,
-          new TFutureException("Operation already completed."));
-
-        atomicStore(status_, S.SUCCEEDED);
-      }
-
-      completionEvent_.trigger();
-    }
-  }
-
-  /**
-   * Marks the operation as failed with the specified exception and notifies
-   * any waiters.
-   *
-   * If the operation was already cancelled, nothing happens.
-   *
-   * Throws: TFutureException if the operation is already completed.
-   */
-  void fail(Exception exception) {
-    synchronized (statusMutex_) {
-      auto status = atomicLoad(status_);
-      if (status == S.CANCELLED) return;
-
-      enforce(status == S.RUNNING,
-        new TFutureException("Operation already completed."));
-      exception_ = exception;
-
-      atomicStore(status_, S.FAILED);
-    }
-
-    completionEvent_.trigger();
-  }
-
-
-  /**
-   * Marks this operation as completed and takes over the outcome of another
-   * TFuture of the same type.
-   *
-   * If this operation was already cancelled, nothing happens. If the other
-   * operation was cancelled, this operation is marked as failed with a
-   * TCancelledException.
-   *
-   * Throws: TFutureException if the passed in future was not completed or
-   *   this operation is already completed.
-   */
-  void complete(TFuture!ResultType future) {
-    synchronized (statusMutex_) {
-      auto status = atomicLoad(status_);
-      if (status == S.CANCELLED) return;
-      enforce(status == S.RUNNING,
-        new TFutureException("Operation already completed."));
-
-      enforce(future.status != S.RUNNING, new TFutureException(
-        "The passed TFuture is not yet completed."));
-
-      status = future.status;
-      if (status == S.CANCELLED) {
-        status = S.FAILED;
-        exception_ = new TCancelledException;
-      } else if (status == S.FAILED) {
-        exception_ = future.getException();
-      } else static if (!is(ResultType == void)) {
-        result_ = future.get();
-      }
-
-      atomicStore(status_, status);
-    }
-
-    completionEvent_.trigger();
-  }
-
-  /**
-   * Marks this operation as cancelled and notifies any waiters.
-   *
-   * If the operation is already completed, nothing happens.
-   */
-  void cancel() {
-    synchronized (statusMutex_) {
-      auto status = atomicLoad(status_);
-      if (status == S.RUNNING) atomicStore(status_, S.CANCELLED);
-    }
-
-    completionEvent_.trigger();
-  }
-
-private:
-  // Convenience alias because TFutureStatus is ubiquitous in this class.
-  alias TFutureStatus S;
-
-  // The status the promise is currently in.
-  shared S status_;
-
-  union {
-    static if (!is(ResultType == void)) {
-      // Set if status_ is SUCCEEDED.
-      ResultType result_;
-    }
-    // Set if status_ is FAILED.
-    Exception exception_;
-  }
-
-  // Protects status_.
-  // As for result_ and exception_: They are only set once, while status_ is
-  // still RUNNING, so given that the operation has already completed, reading
-  // them is safe without holding some kind of lock.
-  Mutex statusMutex_;
-
-  // Triggered when the event completes.
-  TOneshotEvent completionEvent_;
-}
-
-///
-class TFutureException : TException {
-  ///
-  this(string msg = "", string file = __FILE__, size_t line = __LINE__,
-    Throwable next = null)
-  {
-    super(msg, file, line, next);
-  }
-}
-
-/**
- * Creates an interface that is similar to a given one, but accepts an
- * additional, optional TCancellation parameter each method, and returns
- * TFutures instead of plain return values.
- *
- * For example, given the following declarations:
- * ---
- * interface Foo {
- *   void bar();
- *   string baz(int a);
- * }
- * alias TFutureInterface!Foo FutureFoo;
- * ---
- *
- * FutureFoo would be equivalent to:
- * ---
- * interface FutureFoo {
- *   TFuture!void bar(TCancellation cancellation = null);
- *   TFuture!string baz(int a, TCancellation cancellation = null);
- * }
- * ---
- */
-template TFutureInterface(Interface) if (is(Interface _ == interface)) {
-  mixin({
-    string code = "interface TFutureInterface \n";
-
-    static if (is(Interface Bases == super) && Bases.length > 0) {
-      code ~= ": ";
-      foreach (i; 0 .. Bases.length) {
-        if (i > 0) code ~= ", ";
-        code ~= "TFutureInterface!(BaseTypeTuple!Interface[" ~ to!string(i) ~ "]) ";
-      }
-    }
-
-    code ~= "{\n";
-
-    foreach (methodName; __traits(derivedMembers, Interface)) {
-      enum qn = "Interface." ~ methodName;
-      static if (isSomeFunction!(mixin(qn))) {
-        code ~= "TFuture!(ReturnType!(" ~ qn ~ ")) " ~ methodName ~
-          "(ParameterTypeTuple!(" ~ qn ~ "), TCancellation cancellation = null);\n";
-      }
-    }
-
-    code ~= "}\n";
-    return code;
-  }());
-}
-
-/**
- * An input range that aggregates results from multiple asynchronous operations,
- * returning them in the order they arrive.
- *
- * Additionally, a timeout can be set after which results from not yet finished
- * futures will no longer be waited for, e.g. to ensure the time it takes to
- * iterate over a set of results is limited.
- */
-final class TFutureAggregatorRange(T) {
-  /**
-   * Constructs a new instance.
-   *
-   * Params:
-   *   futures = The set of futures to collect results from.
-   *   timeout = If positive, not yet finished futures will be cancelled and
-   *     their results will not be taken into account.
-   */
-  this(TFuture!T[] futures, TCancellationOrigin childCancellation,
-    Duration timeout = dur!"hnsecs"(0)
-  ) {
-    if (timeout > dur!"hnsecs"(0)) {
-      timeoutSysTick_ = TickDuration.currSystemTick +
-        TickDuration.from!"hnsecs"(timeout.total!"hnsecs");
-    } else {
-      timeoutSysTick_ = TickDuration(0);
-    }
-
-    queueMutex_ = new Mutex;
-    queueNonEmptyCondition_ = new Condition(queueMutex_);
-    futures_ = futures;
-    childCancellation_ = childCancellation;
-
-    foreach (future; futures_) {
-      future.completion.addCallback({
-        auto f = future;
-        return {
-          if (f.status == TFutureStatus.CANCELLED) return;
-          assert(f.status != TFutureStatus.RUNNING);
-
-          synchronized (queueMutex_) {
-            completedQueue_ ~= f;
-
-            if (completedQueue_.length == 1) {
-              queueNonEmptyCondition_.notifyAll();
-            }
-          }
-        };
-      }());
-    }
-  }
-
-  /**
-   * Whether the range is empty.
-   *
-   * This is the case if the results from the completed futures not having
-   * failed have already been popped and either all future have been finished
-   * or the timeout has expired.
-   *
-   * Potentially blocks until a new result is available or the timeout has
-   * expired.
-   */
-  bool empty() @property {
-    if (finished_) return true;
-    if (bufferFilled_) return false;
-
-    while (true) {
-      TFuture!T future;
-      synchronized (queueMutex_) {
-        // The while loop is just being cautious about spurious wakeups, in
-        // case they should be possible.
-        while (completedQueue_.empty) {
-          auto remaining = to!Duration(timeoutSysTick_ -
-            TickDuration.currSystemTick);
-
-          if (remaining <= dur!"hnsecs"(0)) {
-            // No time left, but still no element received – we are empty now.
-            finished_ = true;
-            childCancellation_.trigger();
-            return true;
-          }
-
-          queueNonEmptyCondition_.wait(remaining);
-        }
-
-        future = completedQueue_.front;
-        completedQueue_.popFront();
-      }
-
-      ++completedCount_;
-      if (completedCount_ == futures_.length) {
-        // This was the last future in the list, there is no possibility
-        // another result could ever become available.
-        finished_ = true;
-      }
-
-      if (future.status == TFutureStatus.FAILED) {
-        // This one failed, loop again and try getting another item from
-        // the queue.
-        exceptions_ ~= future.getException();
-      } else {
-        resultBuffer_ = future.get();
-        bufferFilled_ = true;
-        return false;
-      }
-    }
-  }
-
-  /**
-   * Returns the first element from the range.
-   *
-   * Potentially blocks until a new result is available or the timeout has
-   * expired.
-   *
-   * Throws: TException if the range is empty.
-   */
-  T front() {
-    enforce(!empty, new TException(
-      "Cannot get front of an empty future aggregator range."));
-    return resultBuffer_;
-  }
-
-  /**
-   * Removes the first element from the range.
-   *
-   * Potentially blocks until a new result is available or the timeout has
-   * expired.
-   *
-   * Throws: TException if the range is empty.
-   */
-  void popFront() {
-    enforce(!empty, new TException(
-      "Cannot pop front of an empty future aggregator range."));
-    bufferFilled_ = false;
-  }
-
-  /**
-   * The number of futures the result of which has been returned or which have
-   * failed so far.
-   */
-  size_t completedCount() @property const {
-    return completedCount_;
-  }
-
-  /**
-   * The exceptions collected from failed TFutures so far.
-   */
-  Exception[] exceptions() @property {
-    return exceptions_;
-  }
-
-private:
-  TFuture!T[] futures_;
-  TCancellationOrigin childCancellation_;
-
-  // The system tick this operation will time out, or zero if no timeout has
-  // been set.
-  TickDuration timeoutSysTick_;
-
-  bool finished_;
-
-  bool bufferFilled_;
-  T resultBuffer_;
-
-  Exception[] exceptions_;
-  size_t completedCount_;
-
-  // The queue of completed futures. This (and the associated condition) are
-  // the only parts of this class that are accessed by multiple threads.
-  TFuture!T[] completedQueue_;
-  Mutex queueMutex_;
-  Condition queueNonEmptyCondition_;
-}
-
-/**
- * TFutureAggregatorRange construction helper to avoid having to explicitly
- * specify the value type, i.e. to allow the constructor being called using IFTI
- * (see $(DMDBUG 6082, D Bugzilla enhancement requet 6082)).
- */
-TFutureAggregatorRange!T tFutureAggregatorRange(T)(TFuture!T[] futures,
-  TCancellationOrigin childCancellation, Duration timeout = dur!"hnsecs"(0)
-) {
-  return new TFutureAggregatorRange!T(futures, childCancellation, timeout);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/hashset.d b/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/hashset.d
deleted file mode 100644
index ede122e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/src/thrift/util/hashset.d
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift.util.hashset;
-
-import std.algorithm : joiner, map;
-import std.conv : to;
-import std.traits : isImplicitlyConvertible, ParameterTypeTuple;
-import std.range : ElementType, isInputRange;
-
-struct Void {}
-
-/**
- * A quickly hacked together hash set implementation backed by built-in
- * associative arrays to have something to compile Thrift's set<> to until
- * std.container gains something suitable.
- */
-// Note: The funky pointer casts (i.e. *(cast(immutable(E)*)&e) instead of
-// just cast(immutable(E))e) are a workaround for LDC 2 compatibility.
-final class HashSet(E) {
-  ///
-  this() {}
-
-  ///
-  this(E[] elems...) {
-    insert(elems);
-  }
-
-  ///
-  void insert(Stuff)(Stuff stuff) if (isImplicitlyConvertible!(Stuff, E)) {
-    aa_[*(cast(immutable(E)*)&stuff)] = Void.init;
-  }
-
-  ///
-  void insert(Stuff)(Stuff stuff) if (
-    isInputRange!Stuff && isImplicitlyConvertible!(ElementType!Stuff, E)
-  ) {
-    foreach (e; stuff) {
-      aa_[*(cast(immutable(E)*)&e)] = Void.init;
-    }
-  }
-
-  ///
-  void opOpAssign(string op : "~", Stuff)(Stuff stuff) {
-    insert(stuff);
-  }
-
-  ///
-  void remove(E e) {
-    aa_.remove(*(cast(immutable(E)*)&e));
-  }
-  alias remove removeKey;
-
-  ///
-  void removeAll() {
-    aa_ = null;
-  }
-
-  ///
-  size_t length() @property const {
-    return aa_.length;
-  }
-
-  ///
-  size_t empty() @property const {
-    return !aa_.length;
-  }
-
-  ///
-  bool opBinaryRight(string op : "in")(E e) const {
-    return (e in aa_) !is null;
-  }
-
-  ///
-  auto opSlice() const {
-    // TODO: Implement using AA key range once available in release DMD/druntime
-    // to avoid allocation.
-    return cast(E[])(aa_.keys);
-  }
-
-  ///
-  override string toString() const {
-    // Only provide toString() if to!string() is available for E (exceptions are
-    // e.g. delegates).
-    static if (is(typeof(to!string(E.init)) : string)) {
-      return "{" ~ to!string(joiner(map!`to!string(a)`(aa_.keys), ", ")) ~ "}";
-    } else {
-      // Cast to work around Object not being const-correct.
-      return (cast()super).toString();
-    }
-  }
-
-  ///
-  override bool opEquals(Object other) const {
-    auto rhs = cast(const(HashSet))other;
-    if (rhs) {
-      return aa_ == rhs.aa_;
-    }
-
-    // Cast to work around Object not being const-correct.
-    return (cast()super).opEquals(other);
-  }
-
-private:
-  Void[immutable(E)] aa_;
-}
-
-/// Ditto
-auto hashSet(E)(E[] elems...) {
-  return new HashSet!E(elems);
-}
-
-unittest {
-  import std.exception;
-
-  auto a = hashSet(1, 2, 2, 3);
-  enforce(a.length == 3);
-  enforce(2 in a);
-  enforce(5 !in a);
-  enforce(a.toString().length == 9);
-  a.remove(2);
-  enforce(a.length == 2);
-  enforce(2 !in a);
-  a.removeAll();
-  enforce(a.empty);
-  enforce(a.toString() == "{}");
-
-  void delegate() dg;
-  auto b = hashSet(dg);
-  static assert(__traits(compiles, b.toString()));
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/d/test/Makefile.am
deleted file mode 100755
index c510471..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/Makefile.am
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-AUTOMAKE_OPTIONS = serial-tests
-
-BUILT_SOURCES = trusted-ca-certificate.pem server-certificate.pem
-
-
-# Thrift compiler rules
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-debug_proto_gen = $(addprefix gen-d/, DebugProtoTest_types.d)
-
-$(debug_proto_gen): $(top_srcdir)/test/DebugProtoTest.thrift
-	$(THRIFT) --gen d -nowarn $<
-
-stress_test_gen = $(addprefix gen-d/thrift/test/stress/, Service.d \
-	StressTest_types.d)
-
-$(stress_test_gen): $(top_srcdir)/test/StressTest.thrift
-	$(THRIFT) --gen d $<
-
-thrift_test_gen = $(addprefix gen-d/thrift/test/, SecondService.d \
-	ThriftTest.d ThriftTest_constants.d ThriftTest_types.d)
-
-$(thrift_test_gen): $(top_srcdir)/test/ThriftTest.thrift
-	$(THRIFT) --gen d $<
-
-
-# The actual test targets.
-# There just must be some way to reassign a variable without warnings in
-# Automake...
-targets__ = async_test client_pool_test serialization_benchmark \
-	stress_test_server thrift_test_client thrift_test_server transport_test
-ran_tests__ = client_pool_test \
-	transport_test \
-	async_test_runner.sh \
-	thrift_test_runner.sh
-
-libevent_dependent_targets = async_test_client client_pool_test \
-	stress_test_server thrift_test_server
-libevent_dependent_ran_tests = client_pool_test async_test_runner.sh thrift_test_runner.sh
-
-openssl_dependent_targets = async_test thrift_test_client thrift_test_server
-openssl_dependent_ran_tests = async_test_runner.sh thrift_test_runner.sh
-
-d_test_flags =
-
-if WITH_D_EVENT_TESTS
-d_test_flags += $(DMD_LIBEVENT_FLAGS) ../$(D_EVENT_LIB_NAME)
-targets_ = $(targets__)
-ran_tests_ = $(ran_tests__)
-else
-targets_ = $(filter-out $(libevent_dependent_targets), $(targets__))
-ran_tests_ = $(filter-out $(libevent_dependent_ran_tests), $(ran_tests__))
-endif
-
-if WITH_D_SSL_TESTS
-d_test_flags += $(DMD_OPENSSL_FLAGS) ../$(D_SSL_LIB_NAME)
-targets = $(targets_)
-ran_tests = $(ran_tests_)
-else
-targets = $(filter-out $(openssl_dependent_targets), $(targets_))
-ran_tests = $(filter-out $(openssl_dependent_ran_tests), $(ran_tests_))
-endif
-
-d_test_flags += -w -wi -O -release -inline -I$(top_srcdir)/lib/d/src -Igen-d \
-	$(top_builddir)/lib/d/$(D_LIB_NAME)
-
-
-async_test client_pool_test transport_test: %: %.d
-	$(DMD) $(d_test_flags) -of$@ $^
-
-serialization_benchmark: %: %.d $(debug_proto_gen)
-	$(DMD) $(d_test_flags) -of$@ $^
-
-stress_test_server: %: %.d test_utils.d $(stress_test_gen)
-	$(DMD) $(d_test_flags) -of$@ $^
-
-thrift_test_client: %: %.d thrift_test_common.d $(thrift_test_gen)
-	$(DMD) $(d_test_flags) -of$@ $^
-
-thrift_test_server: %: %.d thrift_test_common.d test_utils.d $(thrift_test_gen)
-	$(DMD) $(d_test_flags) -of$@ $^
-
-
-# Certificate generation targets (for the SSL tests).
-# Currently, we just assume that the "openssl" tool is on the path, could be
-# replaced by a more elaborate mechanism.
-
-server-certificate.pem: openssl.test.cnf
-	openssl req -new -x509 -nodes -config openssl.test.cnf \
-		-out server-certificate.pem
-
-trusted-ca-certificate.pem: server-certificate.pem
-	cat server-certificate.pem > $@
-
-check-local: $(targets)
-
-clean-local:
-	$(RM) -rf gen-d $(targets) $(addsuffix .o, $(targets))
-
-
-# Tests ran as part of make check.
-
-async_test_runner.sh: async_test trusted-ca-certificate.pem server-certificate.pem
-thrift_test_runner.sh: thrift_test_client thrift_test_server \
-	trusted-ca-certificate.pem server-certificate.pem
-
-TESTS = $(ran_tests)
-
-precross: $(targets)
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/async_test.d b/vendor/git.apache.org/thrift.git/lib/d/test/async_test.d
deleted file mode 100644
index fb765ad..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/async_test.d
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless enforced by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module async_test;
-
-import core.atomic;
-import core.sync.condition : Condition;
-import core.sync.mutex : Mutex;
-import core.thread : dur, Thread, ThreadGroup;
-import std.conv : text;
-import std.datetime;
-import std.getopt;
-import std.exception : collectException, enforce;
-import std.parallelism : TaskPool;
-import std.stdio;
-import std.string;
-import std.variant : Variant;
-import thrift.base;
-import thrift.async.base;
-import thrift.async.libevent;
-import thrift.async.socket;
-import thrift.async.ssl;
-import thrift.codegen.async_client;
-import thrift.codegen.async_client_pool;
-import thrift.codegen.base;
-import thrift.codegen.processor;
-import thrift.protocol.base;
-import thrift.protocol.binary;
-import thrift.server.base;
-import thrift.server.simple;
-import thrift.server.transport.socket;
-import thrift.server.transport.ssl;
-import thrift.transport.base;
-import thrift.transport.buffered;
-import thrift.transport.ssl;
-import thrift.util.cancellation;
-
-version (Posix) {
-  import core.stdc.signal;
-  import core.sys.posix.signal;
-
-  // Disable SIGPIPE because SSL server will write to broken socket after
-  // client disconnected (see TSSLSocket docs).
-  shared static this() {
-    signal(SIGPIPE, SIG_IGN);
-  }
-}
-
-interface AsyncTest {
-  string echo(string value);
-  string delayedEcho(string value, long milliseconds);
-
-  void fail(string reason);
-  void delayedFail(string reason, long milliseconds);
-
-  enum methodMeta = [
-    TMethodMeta("fail", [], [TExceptionMeta("ate", 1, "AsyncTestException")]),
-    TMethodMeta("delayedFail", [], [TExceptionMeta("ate", 1, "AsyncTestException")])
-  ];
-  alias .AsyncTestException AsyncTestException;
-}
-
-class AsyncTestException : TException {
-  string reason;
-  mixin TStructHelpers!();
-}
-
-void main(string[] args) {
-  ushort port = 9090;
-  ushort managerCount = 2;
-  ushort serversPerManager = 5;
-  ushort threadsPerServer = 10;
-  uint iterations = 10;
-  bool ssl;
-  bool trace;
-
-  getopt(args,
-    "iterations", &iterations,
-    "managers", &managerCount,
-    "port", &port,
-    "servers-per-manager", &serversPerManager,
-    "ssl", &ssl,
-    "threads-per-server", &threadsPerServer,
-    "trace", &trace,
-  );
-
-  TTransportFactory clientTransportFactory;
-  TSSLContext serverSSLContext;
-  if (ssl) {
-    auto clientSSLContext = new TSSLContext();
-    with (clientSSLContext) {
-      ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
-      authenticate = true;
-      loadTrustedCertificates("./trusted-ca-certificate.pem");
-    }
-    clientTransportFactory = new TAsyncSSLSocketFactory(clientSSLContext);
-
-    serverSSLContext = new TSSLContext();
-    with (serverSSLContext) {
-      serverSide = true;
-      loadCertificate("./server-certificate.pem");
-      loadPrivateKey("./server-private-key.pem");
-      ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
-    }
-  } else {
-    clientTransportFactory = new TBufferedTransportFactory;
-  }
-
-
-  auto serverCancel = new TCancellationOrigin;
-  scope(exit) {
-    writeln("Triggering server shutdown...");
-    serverCancel.trigger();
-    writeln("done.");
-  }
-
-  auto managers = new TLibeventAsyncManager[managerCount];
-  scope (exit) foreach (ref m; managers) destroy(m);
-
-  auto clientsThreads = new ThreadGroup;
-  foreach (managerIndex, ref manager; managers) {
-    manager = new TLibeventAsyncManager;
-    foreach (serverIndex; 0 .. serversPerManager) {
-      auto currentPort = cast(ushort)
-        (port + managerIndex * serversPerManager + serverIndex);
-
-      // Start the server and wait until it is up and running.
-      auto servingMutex = new Mutex;
-      auto servingCondition = new Condition(servingMutex);
-      auto handler = new PreServeNotifyHandler(servingMutex, servingCondition);
-      synchronized (servingMutex) {
-        (new ServerThread!TSimpleServer(currentPort, serverSSLContext, trace,
-          serverCancel, handler)).start();
-        servingCondition.wait();
-      }
-
-      // We only run the timing tests for the first server on each async
-      // manager, so that we don't get spurious timing errors becaue of
-      // ordering issues.
-      auto runTimingTests = (serverIndex == 0);
-
-      auto c = new ClientsThread(manager, currentPort, clientTransportFactory,
-        threadsPerServer, iterations, runTimingTests, trace);
-      clientsThreads.add(c);
-      c.start();
-    }
-  }
-  clientsThreads.joinAll();
-}
-
-class AsyncTestHandler : AsyncTest {
-  this(bool trace) {
-    trace_ = trace;
-  }
-
-  override string echo(string value) {
-    if (trace_) writefln(`echo("%s")`, value);
-    return value;
-  }
-
-  override string delayedEcho(string value, long milliseconds) {
-    if (trace_) writef(`delayedEcho("%s", %s ms)... `, value, milliseconds);
-    Thread.sleep(dur!"msecs"(milliseconds));
-    if (trace_) writeln("returning.");
-
-    return value;
-  }
-
-  override void fail(string reason) {
-    if (trace_) writefln(`fail("%s")`, reason);
-    auto ate = new AsyncTestException;
-    ate.reason = reason;
-    throw ate;
-  }
-
-  override void delayedFail(string reason, long milliseconds) {
-    if (trace_) writef(`delayedFail("%s", %s ms)... `, reason, milliseconds);
-    Thread.sleep(dur!"msecs"(milliseconds));
-    if (trace_) writeln("returning.");
-
-    auto ate = new AsyncTestException;
-    ate.reason = reason;
-    throw ate;
-  }
-
-private:
-  bool trace_;
-  AsyncTestException ate_;
-}
-
-class PreServeNotifyHandler : TServerEventHandler {
-  this(Mutex servingMutex, Condition servingCondition) {
-    servingMutex_ = servingMutex;
-    servingCondition_ = servingCondition;
-  }
-
-  void preServe() {
-    synchronized (servingMutex_) {
-      servingCondition_.notifyAll();
-    }
-  }
-  Variant createContext(TProtocol input, TProtocol output) { return Variant.init; }
-  void deleteContext(Variant serverContext, TProtocol input, TProtocol output) {}
-  void preProcess(Variant serverContext, TTransport transport) {}
-
-private:
-  Mutex servingMutex_;
-  Condition servingCondition_;
-}
-
-class ServerThread(ServerType) : Thread {
-  this(ushort port, TSSLContext sslContext, bool trace,
-    TCancellation cancellation, TServerEventHandler eventHandler
-  ) {
-    port_ = port;
-    sslContext_ = sslContext;
-    trace_ = trace;
-    cancellation_ = cancellation;
-    eventHandler_ = eventHandler;
-
-    super(&run);
-  }
-
-  void run() {
-    TServerSocket serverSocket;
-    if (sslContext_) {
-      serverSocket = new TSSLServerSocket(port_, sslContext_);
-    } else {
-      serverSocket = new TServerSocket(port_);
-    }
-    auto transportFactory = new TBufferedTransportFactory;
-    auto protocolFactory = new TBinaryProtocolFactory!();
-    auto processor = new TServiceProcessor!AsyncTest(new AsyncTestHandler(trace_));
-
-    auto server = new ServerType(processor, serverSocket, transportFactory,
-      protocolFactory);
-    server.eventHandler = eventHandler_;
-
-    writefln("Starting server on port %s...", port_);
-    server.serve(cancellation_);
-    writefln("Server thread on port %s done.", port_);
-  }
-
-private:
-  ushort port_;
-  bool trace_;
-  TCancellation cancellation_;
-  TSSLContext sslContext_;
-  TServerEventHandler eventHandler_;
-}
-
-class ClientsThread : Thread {
-  this(TAsyncSocketManager manager, ushort port, TTransportFactory tf,
-    ushort threads, uint iterations, bool runTimingTests, bool trace
-  ) {
-    manager_ = manager;
-    port_ = port;
-    transportFactory_ = tf;
-    threads_ = threads;
-    iterations_ = iterations;
-    runTimingTests_ = runTimingTests;
-    trace_ = trace;
-    super(&run);
-  }
-
-  void run() {
-    auto transport = new TAsyncSocket(manager_, "localhost", port_);
-
-    {
-      auto client = new TAsyncClient!AsyncTest(
-        transport,
-        transportFactory_,
-        new TBinaryProtocolFactory!()
-      );
-      transport.open();
-      auto clientThreads = new ThreadGroup;
-      foreach (clientId; 0 .. threads_) {
-        clientThreads.create({
-          auto c = clientId;
-          return {
-            foreach (i; 0 .. iterations_) {
-              immutable id = text(port_, ":", c, ":", i);
-
-              {
-                if (trace_) writefln(`Calling echo("%s")... `, id);
-                auto a = client.echo(id);
-                enforce(a == id);
-                if (trace_) writefln(`echo("%s") done.`, id);
-              }
-
-              {
-                if (trace_) writefln(`Calling fail("%s")... `, id);
-                auto a = cast(AsyncTestException)collectException(client.fail(id).waitGet());
-                enforce(a && a.reason == id);
-                if (trace_) writefln(`fail("%s") done.`, id);
-              }
-            }
-          };
-        }());
-      }
-      clientThreads.joinAll();
-      transport.close();
-    }
-
-    if (runTimingTests_) {
-      auto client = new TAsyncClient!AsyncTest(
-        transport,
-        transportFactory_,
-        new TBinaryProtocolFactory!TBufferedTransport
-      );
-
-      // Temporarily redirect error logs to stdout, as SSL errors on the server
-      // side are expected when the client terminates aburptly (as is the case
-      // in the timeout test).
-      auto oldErrorLogSink = g_errorLogSink;
-      g_errorLogSink = g_infoLogSink;
-      scope (exit) g_errorLogSink = oldErrorLogSink;
-
-      foreach (i; 0 .. iterations_) {
-        transport.open();
-
-        immutable id = text(port_, ":", i);
-
-        {
-          if (trace_) writefln(`Calling delayedEcho("%s", 100 ms)...`, id);
-          auto a = client.delayedEcho(id, 100);
-          enforce(!a.completion.wait(dur!"usecs"(1)),
-            text("wait() succeeded early (", a.get(), ", ", id, ")."));
-          enforce(!a.completion.wait(dur!"usecs"(1)),
-            text("wait() succeeded early (", a.get(), ", ", id, ")."));
-          enforce(a.completion.wait(dur!"msecs"(200)),
-            text("wait() didn't succeed as expected (", id, ")."));
-          enforce(a.get() == id);
-          if (trace_) writefln(`... delayedEcho("%s") done.`, id);
-        }
-
-        {
-          if (trace_) writefln(`Calling delayedFail("%s", 100 ms)... `, id);
-          auto a = client.delayedFail(id, 100);
-          enforce(!a.completion.wait(dur!"usecs"(1)),
-            text("wait() succeeded early (", id, ", ", collectException(a.get()), ")."));
-          enforce(!a.completion.wait(dur!"usecs"(1)),
-            text("wait() succeeded early (", id, ", ", collectException(a.get()), ")."));
-          enforce(a.completion.wait(dur!"msecs"(200)),
-            text("wait() didn't succeed as expected (", id, ")."));
-          auto e = cast(AsyncTestException)collectException(a.get());
-          enforce(e && e.reason == id);
-          if (trace_) writefln(`... delayedFail("%s") done.`, id);
-        }
-
-        {
-          transport.recvTimeout = dur!"msecs"(50);
-
-          if (trace_) write(`Calling delayedEcho("socketTimeout", 100 ms)... `);
-          auto a = client.delayedEcho("socketTimeout", 100);
-          auto e = cast(TTransportException)collectException(a.waitGet());
-          enforce(e, text("Operation didn't fail as expected (", id, ")."));
-          enforce(e.type == TTransportException.Type.TIMED_OUT,
-            text("Wrong timeout exception type (", id, "): ", e));
-          if (trace_) writeln(`timed out as expected.`);
-
-          // Wait until the server thread reset before the next iteration.
-          Thread.sleep(dur!"msecs"(50));
-          transport.recvTimeout = dur!"hnsecs"(0);
-        }
-
-        transport.close();
-      }
-    }
-
-    writefln("Clients thread for port %s done.", port_);
-  }
-
-  TAsyncSocketManager manager_;
-  ushort port_;
-  TTransportFactory transportFactory_;
-  ushort threads_;
-  uint iterations_;
-  bool runTimingTests_;
-  bool trace_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/async_test_runner.sh b/vendor/git.apache.org/thrift.git/lib/d/test/async_test_runner.sh
deleted file mode 100755
index 7d507ee..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/async_test_runner.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-CUR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# Runs the async test in both SSL and non-SSL mode.
-${CUR}/async_test > /dev/null || exit 1
-echo "Non-SSL tests done."
-${CUR}/async_test --ssl > /dev/null || exit 1
-echo "SSL tests done."
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/client_pool_test.d b/vendor/git.apache.org/thrift.git/lib/d/test/client_pool_test.d
deleted file mode 100644
index 85bcb29..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/client_pool_test.d
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module client_pool_test;
-
-import core.time : Duration, dur;
-import core.thread : Thread;
-import std.algorithm;
-import std.array;
-import std.conv;
-import std.exception;
-import std.getopt;
-import std.range;
-import std.stdio;
-import std.typecons;
-import thrift.base;
-import thrift.async.libevent;
-import thrift.async.socket;
-import thrift.codegen.base;
-import thrift.codegen.async_client;
-import thrift.codegen.async_client_pool;
-import thrift.codegen.client;
-import thrift.codegen.client_pool;
-import thrift.codegen.processor;
-import thrift.protocol.binary;
-import thrift.server.simple;
-import thrift.server.transport.socket;
-import thrift.transport.buffered;
-import thrift.transport.socket;
-import thrift.util.cancellation;
-import thrift.util.future;
-
-// We use this as our RPC-layer exception here to make sure socket/… problems
-// (that would usually considered to be RPC layer faults) cause the tests to
-// fail, even though we are testing the RPC exception handling.
-class TestServiceException : TException {
-  int port;
-}
-
-interface TestService {
-  int getPort();
-  alias .TestServiceException TestServiceException;
-  enum methodMeta = [TMethodMeta("getPort", [],
-    [TExceptionMeta("a", 1, "TestServiceException")])];
-}
-
-// Use some derived service, just to check that the pools handle inheritance
-// correctly.
-interface ExTestService : TestService {
-  int[] getPortInArray();
-  enum methodMeta = [TMethodMeta("getPortInArray", [],
-    [TExceptionMeta("a", 1, "TestServiceException")])];
-}
-
-class ExTestHandler : ExTestService {
-  this(ushort port, Duration delay, bool failing, bool trace) {
-    this.port = port;
-    this.delay = delay;
-    this.failing = failing;
-    this.trace = trace;
-  }
-
-  override int getPort() {
-    if (trace) {
-      stderr.writefln("getPort() called on %s (delay: %s, failing: %s)", port,
-        delay, failing);
-    }
-    sleep();
-    failIfEnabled();
-    return port;
-  }
-
-  override int[] getPortInArray() {
-    return [getPort()];
-  }
-
-  ushort port;
-  Duration delay;
-  bool failing;
-  bool trace;
-
-private:
-  void sleep() {
-    if (delay > dur!"hnsecs"(0)) Thread.sleep(delay);
-  }
-
-  void failIfEnabled() {
-    if (!failing) return;
-
-    auto e = new TestServiceException;
-    e.port = port;
-    throw e;
-  }
-}
-
-class ServerThread : Thread {
-  this(ExTestHandler handler, TCancellation cancellation) {
-    super(&run);
-    handler_ = handler;
-    cancellation_ = cancellation;
-  }
-private:
-  void run() {
-    try {
-      auto protocolFactory = new TBinaryProtocolFactory!();
-      auto processor = new TServiceProcessor!ExTestService(handler_);
-      auto serverTransport = new TServerSocket(handler_.port);
-      serverTransport.recvTimeout = dur!"seconds"(3);
-      auto transportFactory = new TBufferedTransportFactory;
-
-      auto server = new TSimpleServer(
-        processor, serverTransport, transportFactory, protocolFactory);
-      server.serve(cancellation_);
-    } catch (Exception e) {
-      writefln("Server thread on port %s failed: %s", handler_.port, e);
-    }
-  }
-
-  TCancellation cancellation_;
-  ExTestHandler handler_;
-}
-
-void main(string[] args) {
-  bool trace;
-  ushort port = 9090;
-  getopt(args, "port", &port, "trace", &trace);
-
-  auto serverCancellation = new TCancellationOrigin;
-  scope (exit) serverCancellation.trigger();
-
-  immutable ports = cast(immutable)array(map!"cast(ushort)a"(iota(port, port + 6)));
-
-version (none) {
-  // Cannot use this due to multiple DMD @@BUG@@s:
-  // 1. »function D main is a nested function and cannot be accessed from array«
-  //    when calling array() on the result of the outer map() – would have to
-  //    manually do the eager evaluation/array conversion.
-  // 2. »Zip.opSlice cannot get frame pointer to map« for the delay argument,
-  //    can be worked around by calling array() on the map result first.
-  // 3. Even when using the workarounds for the last two points, the DMD-built
-  //    executable crashes when building without (sic!) inlining enabled,
-  //    the backtrace points into the first delegate literal.
-  auto handlers = array(map!((args){
-    return new ExTestHandler(args._0, args._1, args._2, trace);
-  })(zip(
-    ports,
-    map!((a){ return dur!`msecs`(a); })([1, 10, 100, 1, 10, 100]),
-    [false, false, false, true, true, true]
-  )));
-} else {
-  auto handlers = [
-    new ExTestHandler(cast(ushort)(port + 0), dur!"msecs"(1), false, trace),
-    new ExTestHandler(cast(ushort)(port + 1), dur!"msecs"(10), false, trace),
-    new ExTestHandler(cast(ushort)(port + 2), dur!"msecs"(100), false, trace),
-    new ExTestHandler(cast(ushort)(port + 3), dur!"msecs"(1), true, trace),
-    new ExTestHandler(cast(ushort)(port + 4), dur!"msecs"(10), true, trace),
-    new ExTestHandler(cast(ushort)(port + 5), dur!"msecs"(100), true, trace)
-  ];
-}
-
-  // Fire up the server threads.
-  foreach (h; handlers) (new ServerThread(h, serverCancellation)).start();
-
-  // Give the servers some time to get up. This should really be accomplished
-  // via a barrier here and in the preServe() hook.
-  Thread.sleep(dur!"msecs"(10));
-
-  syncClientPoolTest(ports, handlers);
-  asyncClientPoolTest(ports, handlers);
-  asyncFastestClientPoolTest(ports, handlers);
-  asyncAggregatorTest(ports, handlers);
-}
-
-
-void syncClientPoolTest(const(ushort)[] ports, ExTestHandler[] handlers) {
-  auto clients = array(map!((a){
-    return cast(TClientBase!ExTestService)tClient!ExTestService(
-      tBinaryProtocol(new TSocket("127.0.0.1", a))
-    );
-  })(ports));
-
-  scope(exit) foreach (c; clients) c.outputProtocol.transport.close();
-
-  // Try the case where the first client succeeds.
-  {
-    enforce(makePool(clients).getPort() == ports[0]);
-  }
-
-  // Try the case where all clients fail.
-  {
-    auto pool = makePool(clients[3 .. $]);
-    auto e = cast(TCompoundOperationException)collectException(pool.getPort());
-    enforce(e);
-    enforce(equal(map!"a.port"(cast(TestServiceException[])e.exceptions),
-      ports[3 .. $]));
-  }
-
-  // Try the case where the first clients fail, but a later one succeeds.
-  {
-    auto pool = makePool(clients[3 .. $] ~ clients[0 .. 3]);
-    enforce(pool.getPortInArray() == [ports[0]]);
-  }
-
-  // Make sure a client is properly deactivated when it has failed too often.
-  {
-    auto pool = makePool(clients);
-    pool.faultDisableCount = 1;
-    pool.faultDisableDuration = dur!"msecs"(50);
-
-    handlers[0].failing = true;
-    enforce(pool.getPort() == ports[1]);
-
-    handlers[0].failing = false;
-    enforce(pool.getPort() == ports[1]);
-
-    Thread.sleep(dur!"msecs"(50));
-    enforce(pool.getPort() == ports[0]);
-  }
-}
-
-auto makePool(TClientBase!ExTestService[] clients) {
-  auto p = tClientPool(clients);
-  p.permuteClients = false;
-  p.rpcFaultFilter = (Exception e) {
-    return (cast(TestServiceException)e !is null);
-  };
-  return p;
-}
-
-
-void asyncClientPoolTest(const(ushort)[] ports, ExTestHandler[] handlers) {
-  auto manager = new TLibeventAsyncManager;
-  scope (exit) manager.stop(dur!"hnsecs"(0));
-
-  auto clients = makeAsyncClients(manager, ports);
-  scope(exit) foreach (c; clients) c.transport.close();
-
-  // Try the case where the first client succeeds.
-  {
-    enforce(makeAsyncPool(clients).getPort() == ports[0]);
-  }
-
-  // Try the case where all clients fail.
-  {
-    auto pool = makeAsyncPool(clients[3 .. $]);
-    auto e = cast(TCompoundOperationException)collectException(pool.getPort().waitGet());
-    enforce(e);
-    enforce(equal(map!"a.port"(cast(TestServiceException[])e.exceptions),
-      ports[3 .. $]));
-  }
-
-  // Try the case where the first clients fail, but a later one succeeds.
-  {
-    auto pool = makeAsyncPool(clients[3 .. $] ~ clients[0 .. 3]);
-    enforce(pool.getPortInArray() == [ports[0]]);
-  }
-
-  // Make sure a client is properly deactivated when it has failed too often.
-  {
-    auto pool = makeAsyncPool(clients);
-    pool.faultDisableCount = 1;
-    pool.faultDisableDuration = dur!"msecs"(50);
-
-    handlers[0].failing = true;
-    enforce(pool.getPort() == ports[1]);
-
-    handlers[0].failing = false;
-    enforce(pool.getPort() == ports[1]);
-
-    Thread.sleep(dur!"msecs"(50));
-    enforce(pool.getPort() == ports[0]);
-  }
-}
-
-auto makeAsyncPool(TAsyncClientBase!ExTestService[] clients) {
-  auto p = tAsyncClientPool(clients);
-  p.permuteClients = false;
-  p.rpcFaultFilter = (Exception e) {
-    return (cast(TestServiceException)e !is null);
-  };
-  return p;
-}
-
-auto makeAsyncClients(TLibeventAsyncManager manager, in ushort[] ports) {
-  // DMD @@BUG@@ workaround: Using array on the lazyHandlers map result leads
-  // to »function D main is a nested function and cannot be accessed from array«.
-  // Thus, we manually do the array conversion.
-  auto lazyClients = map!((a){
-    return new TAsyncClient!ExTestService(
-      new TAsyncSocket(manager, "127.0.0.1", a),
-      new TBufferedTransportFactory,
-      new TBinaryProtocolFactory!(TBufferedTransport)
-    );
-  })(ports);
-  TAsyncClientBase!ExTestService[] clients;
-  foreach (c; lazyClients) clients ~= c;
-  return clients;
-}
-
-
-void asyncFastestClientPoolTest(const(ushort)[] ports, ExTestHandler[] handlers) {
-  auto manager = new TLibeventAsyncManager;
-  scope (exit) manager.stop(dur!"hnsecs"(0));
-
-  auto clients = makeAsyncClients(manager, ports);
-  scope(exit) foreach (c; clients) c.transport.close();
-
-  // Make sure the fastest client wins, even if they are called in some other
-  // order.
-  {
-    auto result = makeAsyncFastestPool(array(retro(clients))).getPort().waitGet();
-    enforce(result == ports[0]);
-  }
-
-  // Try the case where all clients fail.
-  {
-    auto pool = makeAsyncFastestPool(clients[3 .. $]);
-    auto e = cast(TCompoundOperationException)collectException(pool.getPort().waitGet());
-    enforce(e);
-    enforce(equal(map!"a.port"(cast(TestServiceException[])e.exceptions),
-      ports[3 .. $]));
-  }
-
-  // Try the case where the first clients fail, but a later one succeeds.
-  {
-    auto pool = makeAsyncFastestPool(clients[1 .. $]);
-    enforce(pool.getPortInArray() == [ports[1]]);
-  }
-}
-
-auto makeAsyncFastestPool(TAsyncClientBase!ExTestService[] clients) {
-  auto p = tAsyncFastestClientPool(clients);
-  p.rpcFaultFilter = (Exception e) {
-    return (cast(TestServiceException)e !is null);
-  };
-  return p;
-}
-
-
-void asyncAggregatorTest(const(ushort)[] ports, ExTestHandler[] handlers) {
-  auto manager = new TLibeventAsyncManager;
-  scope (exit) manager.stop(dur!"hnsecs"(0));
-
-  auto clients = makeAsyncClients(manager, ports);
-  scope(exit) foreach (c; clients) c.transport.close();
-
-  auto aggregator = tAsyncAggregator(
-    cast(TAsyncClientBase!ExTestService[])clients);
-
-  // Test aggregator range interface.
-  {
-    auto range = aggregator.getPort().range(dur!"msecs"(50));
-    enforce(equal(range, ports[0 .. 2][]));
-    enforce(equal(map!"a.port"(cast(TestServiceException[])range.exceptions),
-      ports[3 .. $ - 1]));
-    enforce(range.completedCount == 4);
-  }
-
-  // Test default accumulator for scalars.
-  {
-    auto fullResult = aggregator.getPort().accumulate();
-    enforce(fullResult.waitGet() == ports[0 .. 3]);
-
-    auto partialResult = aggregator.getPort().accumulate();
-    Thread.sleep(dur!"msecs"(20));
-    enforce(partialResult.finishGet() == ports[0 .. 2]);
-
-  }
-
-  // Test default accumulator for arrays.
-  {
-    auto fullResult = aggregator.getPortInArray().accumulate();
-    enforce(fullResult.waitGet() == ports[0 .. 3]);
-
-    auto partialResult = aggregator.getPortInArray().accumulate();
-    Thread.sleep(dur!"msecs"(20));
-    enforce(partialResult.finishGet() == ports[0 .. 2]);
-  }
-
-  // Test custom accumulator.
-  {
-    auto fullResult = aggregator.getPort().accumulate!(function(int[] results){
-      return reduce!"a + b"(results);
-    })();
-    enforce(fullResult.waitGet() == ports[0] + ports[1] + ports[2]);
-
-    auto partialResult = aggregator.getPort().accumulate!(
-      function(int[] results, Exception[] exceptions) {
-        // Return a tuple of the parameters so we can check them outside of
-        // this function (to verify the values, we need access to »ports«, but
-        // due to DMD @@BUG5710@@, we can't use a delegate literal).f
-        return tuple(results, exceptions);
-      }
-    )();
-    Thread.sleep(dur!"msecs"(20));
-    auto resultTuple = partialResult.finishGet();
-    enforce(resultTuple._0 == ports[0 .. 2]);
-    enforce(equal(map!"a.port"(cast(TestServiceException[])resultTuple._1),
-      ports[3 .. $ - 1]));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/openssl.test.cnf b/vendor/git.apache.org/thrift.git/lib/d/test/openssl.test.cnf
deleted file mode 100644
index 2ada30b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/openssl.test.cnf
+++ /dev/null
@@ -1,14 +0,0 @@
-[ req ]
-default_bits = 2048
-default_keyfile = server-private-key.pem
-distinguished_name = req_distinguished_name
-x509_extensions = v3_ca
-prompt = no
-
-[ req_distinguished_name ]
-CN = localhost
-
-[ v3_ca ]
-# Add ::1 to the list of allowed IPs so we can use ::1 to explicitly connect
-# to localhost via IPv6.
-subjectAltName = IP:::1
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/serialization_benchmark.d b/vendor/git.apache.org/thrift.git/lib/d/test/serialization_benchmark.d
deleted file mode 100644
index 35515c8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/serialization_benchmark.d
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * An implementation of the mini serialization benchmark also available for
- * C++ and Java.
- *
- * For meaningful results, you might want to make sure that
- * the Thrift library is compiled with release build flags,
- * e.g. by including the source files with the build instead
- * of linking libthriftd:
- *
-   dmd -w -O -release -inline -I../src -Igen-d -ofserialization_benchmark \
-   $(find ../src/thrift -name '*.d' -not -name index.d) \
-   gen-d/DebugProtoTest_types.d serialization_benchmark.d
- */
-module serialization_benchmark;
-
-import std.datetime : AutoStart, StopWatch;
-import std.math : PI;
-import std.stdio;
-import thrift.protocol.binary;
-import thrift.transport.memory;
-import thrift.transport.range;
-import DebugProtoTest_types;
-
-void main() {
-  auto buf = new TMemoryBuffer;
-  enum ITERATIONS = 10_000_000;
-
-  {
-    auto ooe = OneOfEach();
-    ooe.im_true   = true;
-    ooe.im_false  = false;
-    ooe.a_bite    = 0x7f;
-    ooe.integer16 = 27_000;
-    ooe.integer32 = 1 << 24;
-    ooe.integer64 = 6_000_000_000;
-    ooe.double_precision = PI;
-    ooe.some_characters = "JSON THIS! \"\1";
-    ooe.zomg_unicode = "\xd7\n\a\t";
-    ooe.base64 = "\1\2\3\255";
-
-    auto prot = tBinaryProtocol(buf);
-    auto sw = StopWatch(AutoStart.yes);
-    foreach (i; 0 .. ITERATIONS) {
-      buf.reset(120);
-      ooe.write(prot);
-    }
-    sw.stop();
-
-    auto msecs = sw.peek().msecs;
-    writefln("Write: %s ms (%s kHz)", msecs, ITERATIONS / msecs);
-  }
-
-  auto data = buf.getContents().dup;
-
-  {
-    auto readBuf = tInputRangeTransport(data);
-    auto prot = tBinaryProtocol(readBuf);
-    auto ooe = OneOfEach();
-
-    auto sw = StopWatch(AutoStart.yes);
-    foreach (i; 0 .. ITERATIONS) {
-      readBuf.reset(data);
-      ooe.read(prot);
-    }
-    sw.stop();
-
-    auto msecs = sw.peek().msecs;
-    writefln(" Read: %s ms (%s kHz)", msecs, ITERATIONS / msecs);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/stress_test_server.d b/vendor/git.apache.org/thrift.git/lib/d/test/stress_test_server.d
deleted file mode 100644
index ddda098..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/stress_test_server.d
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module stress_test_server;
-
-import std.getopt;
-import std.parallelism : totalCPUs;
-import std.stdio;
-import std.typetuple;
-import thrift.codegen.processor;
-import thrift.protocol.binary;
-import thrift.server.base;
-import thrift.server.transport.socket;
-import thrift.transport.buffered;
-import thrift.transport.memory;
-import thrift.transport.socket;
-import thrift.util.hashset;
-import test_utils;
-
-import thrift.test.stress.Service;
-
-class ServiceHandler : Service {
-  void echoVoid() { return; }
-  byte echoByte(byte arg) { return arg; }
-  int echoI32(int arg) { return arg; }
-  long echoI64(long arg) { return arg; }
-  byte[] echoList(byte[] arg) { return arg; }
-  HashSet!byte echoSet(HashSet!byte arg) { return arg; }
-  byte[byte] echoMap(byte[byte] arg) { return arg; }
-
-  string echoString(string arg) {
-    if (arg != "hello") {
-      stderr.writefln(`Wrong string received: %s instead of "hello"`, arg);
-      throw new Exception("Wrong string received.");
-    }
-    return arg;
-  }
-}
-
-void main(string[] args) {
-  ushort port = 9091;
-  auto serverType = ServerType.threaded;
-  TransportType transportType;
-  size_t numIOThreads = 1;
-  size_t taskPoolSize = totalCPUs;
-
-  getopt(args, "port", &port, "server-type", &serverType,
-    "transport-type", &transportType, "task-pool-size", &taskPoolSize,
-    "num-io-threads", &numIOThreads);
-
-  alias TypeTuple!(TBufferedTransport, TMemoryBuffer) AvailableTransports;
-
-  auto processor = new TServiceProcessor!(Service,
-    staticMap!(TBinaryProtocol, AvailableTransports))(new ServiceHandler());
-  auto serverSocket = new TServerSocket(port);
-  auto transportFactory = createTransportFactory(transportType);
-  auto protocolFactory = new TBinaryProtocolFactory!AvailableTransports;
-
-  auto server = createServer(serverType, taskPoolSize, numIOThreads,
-    processor, serverSocket, transportFactory, protocolFactory);
-
-  writefln("Starting %s %s StressTest server on port %s...", transportType,
-    serverType, port);
-  server.serve();
-  writeln("done.");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/test_utils.d b/vendor/git.apache.org/thrift.git/lib/d/test/test_utils.d
deleted file mode 100644
index 174100b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/test_utils.d
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Various helpers used by more than a single test.
- */
-module test_utils;
-
-import std.parallelism : TaskPool;
-import thrift.protocol.base;
-import thrift.protocol.processor;
-import thrift.server.base;
-import thrift.server.nonblocking;
-import thrift.server.simple;
-import thrift.server.taskpool;
-import thrift.server.threaded;
-import thrift.server.transport.socket;
-import thrift.transport.base;
-import thrift.transport.buffered;
-import thrift.transport.framed;
-import thrift.transport.http;
-
-// This is a likely victim of @@BUG4744@@ when used with command argument
-// parsing.
-enum ServerType {
-  simple,
-  nonblocking,
-  pooledNonblocking,
-  taskpool,
-  threaded
-}
-
-TServer createServer(ServerType type, size_t taskPoolSize, size_t numIOThreads,
-  TProcessor processor, TServerSocket serverTransport,
-  TTransportFactory transportFactory, TProtocolFactory protocolFactory)
-{
-  final switch (type) {
-    case ServerType.simple:
-      return new TSimpleServer(processor, serverTransport,
-        transportFactory, protocolFactory);
-    case ServerType.nonblocking:
-      auto nb = new TNonblockingServer(processor, serverTransport.port,
-        transportFactory, protocolFactory);
-      nb.numIOThreads = numIOThreads;
-      return nb;
-    case ServerType.pooledNonblocking:
-      auto nb = new TNonblockingServer(processor, serverTransport.port,
-        transportFactory, protocolFactory, new TaskPool(taskPoolSize));
-      nb.numIOThreads = numIOThreads;
-      return nb;
-    case ServerType.taskpool:
-      auto tps = new TTaskPoolServer(processor, serverTransport,
-        transportFactory, protocolFactory);
-      tps.taskPool = new TaskPool(taskPoolSize);
-      return tps;
-    case ServerType.threaded:
-      return new TThreadedServer(processor, serverTransport,
-        transportFactory, protocolFactory);
-  }
-}
-
-enum TransportType {
-  buffered,
-  framed,
-  http,
-  raw
-}
-
-TTransportFactory createTransportFactory(TransportType type) {
-  final switch (type) {
-    case TransportType.buffered:
-      return new TBufferedTransportFactory;
-    case TransportType.framed:
-      return new TFramedTransportFactory;
-    case TransportType.http:
-      return new TServerHttpTransportFactory;
-    case TransportType.raw:
-      return new TTransportFactory;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_client.d b/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_client.d
deleted file mode 100644
index 49419f7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_client.d
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift_test_client;
-
-import std.conv;
-import std.datetime;
-import std.exception : enforce;
-import std.getopt;
-import std.stdio;
-import std.string;
-import std.traits;
-import thrift.base;
-import thrift.codegen.client;
-import thrift.protocol.base;
-import thrift.protocol.binary;
-import thrift.protocol.compact;
-import thrift.protocol.json;
-import thrift.transport.base;
-import thrift.transport.buffered;
-import thrift.transport.framed;
-import thrift.transport.http;
-import thrift.transport.socket;
-import thrift.transport.ssl;
-import thrift.util.hashset;
-
-import thrift_test_common;
-import thrift.test.ThriftTest;
-import thrift.test.ThriftTest_types;
-
-enum TransportType {
-  buffered,
-  framed,
-  http,
-  raw
-}
-
-TProtocol createProtocol(T)(T trans, ProtocolType type) {
-  final switch (type) {
-    case ProtocolType.binary:
-      return tBinaryProtocol(trans);
-    case ProtocolType.compact:
-      return tCompactProtocol(trans);
-    case ProtocolType.json:
-      return tJsonProtocol(trans);
-  }
-}
-
-void main(string[] args) {
-  string host = "localhost";
-  ushort port = 9090;
-  uint numTests = 1;
-  bool ssl;
-  ProtocolType protocolType;
-  TransportType transportType;
-  bool trace;
-
-  getopt(args,
-    "numTests|n", &numTests,
-    "protocol", &protocolType,
-    "ssl", &ssl,
-    "transport", &transportType,
-    "trace", &trace,
-    "port", &port,
-    "host", (string _, string value) {
-      auto parts = split(value, ":");
-      if (parts.length > 1) {
-        // IPv6 addresses can contain colons, so take the last part for the
-        // port.
-        host = join(parts[0 .. $ - 1], ":");
-        port = to!ushort(parts[$ - 1]);
-      } else {
-        host = value;
-      }
-    }
-  );
-  port = to!ushort(port);
-
-  TSocket socket;
-  if (ssl) {
-    auto sslContext = new TSSLContext();
-    sslContext.ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
-    sslContext.authenticate = true;
-    sslContext.loadTrustedCertificates("../../../test/keys/CA.pem");
-    socket = new TSSLSocket(sslContext, host, port);
-  } else {
-    socket = new TSocket(host, port);
-  }
-
-  TProtocol protocol;
-  final switch (transportType) {
-    case TransportType.buffered:
-      protocol = createProtocol(new TBufferedTransport(socket), protocolType);
-      break;
-    case TransportType.framed:
-      protocol = createProtocol(new TFramedTransport(socket), protocolType);
-      break;
-    case TransportType.http:
-      protocol = createProtocol(
-        new TClientHttpTransport(socket, host, "/service"), protocolType);
-      break;
-    case TransportType.raw:
-      protocol = createProtocol(socket, protocolType);
-      break;
-  }
-
-  auto client = tClient!ThriftTest(protocol);
-
-  ulong time_min;
-  ulong time_max;
-  ulong time_tot;
-
-  StopWatch sw;
-  foreach(test; 0 .. numTests) {
-    sw.start();
-
-    protocol.transport.open();
-
-    if (trace) writefln("Test #%s, connect %s:%s", test + 1, host, port);
-
-    if (trace) write("testVoid()");
-    client.testVoid();
-    if (trace) writeln(" = void");
-
-    if (trace) write("testString(\"Test\")");
-    string s = client.testString("Test");
-    if (trace) writefln(" = \"%s\"", s);
-    enforce(s == "Test");
-
-    if (trace) write("testByte(1)");
-    byte u8 = client.testByte(1);
-    if (trace) writefln(" = %s", u8);
-    enforce(u8 == 1);
-
-    if (trace) write("testI32(-1)");
-    int i32 = client.testI32(-1);
-    if (trace) writefln(" = %s", i32);
-    enforce(i32 == -1);
-
-    if (trace) write("testI64(-34359738368)");
-    long i64 = client.testI64(-34359738368L);
-    if (trace) writefln(" = %s", i64);
-    enforce(i64 == -34359738368L);
-
-    if (trace) write("testDouble(-5.2098523)");
-    double dub = client.testDouble(-5.2098523);
-    if (trace) writefln(" = %s", dub);
-    enforce(dub == -5.2098523);
-
-	// TODO: add testBinary() call
-	
-    Xtruct out1;
-    out1.string_thing = "Zero";
-    out1.byte_thing = 1;
-    out1.i32_thing = -3;
-    out1.i64_thing = -5;
-    if (trace) writef("testStruct(%s)", out1);
-    auto in1 = client.testStruct(out1);
-    if (trace) writefln(" = %s", in1);
-    enforce(in1 == out1);
-
-    if (trace) write("testNest({1, {\"Zero\", 1, -3, -5}), 5}");
-    Xtruct2 out2;
-    out2.byte_thing = 1;
-    out2.struct_thing = out1;
-    out2.i32_thing = 5;
-    auto in2 = client.testNest(out2);
-    in1 = in2.struct_thing;
-    if (trace) writefln(" = {%s, {\"%s\", %s, %s, %s}, %s}", in2.byte_thing,
-      in1.string_thing, in1.byte_thing, in1.i32_thing, in1.i64_thing,
-      in2.i32_thing);
-    enforce(in2 == out2);
-
-    int[int] mapout;
-    for (int i = 0; i < 5; ++i) {
-      mapout[i] = i - 10;
-    }
-    if (trace) writef("testMap({%s})", mapout);
-    auto mapin = client.testMap(mapout);
-    if (trace) writefln(" = {%s}", mapin);
-    enforce(mapin == mapout);
-
-    auto setout = new HashSet!int;
-    for (int i = -2; i < 3; ++i) {
-      setout ~= i;
-    }
-    if (trace) writef("testSet(%s)", setout);
-    auto setin = client.testSet(setout);
-    if (trace) writefln(" = %s", setin);
-    enforce(setin == setout);
-
-    int[] listout;
-    for (int i = -2; i < 3; ++i) {
-      listout ~= i;
-    }
-    if (trace) writef("testList(%s)", listout);
-    auto listin = client.testList(listout);
-    if (trace) writefln(" = %s", listin);
-    enforce(listin == listout);
-
-    {
-      if (trace) write("testEnum(ONE)");
-      auto ret = client.testEnum(Numberz.ONE);
-      if (trace) writefln(" = %s", ret);
-      enforce(ret == Numberz.ONE);
-
-      if (trace) write("testEnum(TWO)");
-      ret = client.testEnum(Numberz.TWO);
-      if (trace) writefln(" = %s", ret);
-      enforce(ret == Numberz.TWO);
-
-      if (trace) write("testEnum(THREE)");
-      ret = client.testEnum(Numberz.THREE);
-      if (trace) writefln(" = %s", ret);
-      enforce(ret == Numberz.THREE);
-
-      if (trace) write("testEnum(FIVE)");
-      ret = client.testEnum(Numberz.FIVE);
-      if (trace) writefln(" = %s", ret);
-      enforce(ret == Numberz.FIVE);
-
-      if (trace) write("testEnum(EIGHT)");
-      ret = client.testEnum(Numberz.EIGHT);
-      if (trace) writefln(" = %s", ret);
-      enforce(ret == Numberz.EIGHT);
-    }
-
-    if (trace) write("testTypedef(309858235082523)");
-    UserId uid = client.testTypedef(309858235082523L);
-    if (trace) writefln(" = %s", uid);
-    enforce(uid == 309858235082523L);
-
-    if (trace) write("testMapMap(1)");
-    auto mm = client.testMapMap(1);
-    if (trace) writefln(" = {%s}", mm);
-    // Simply doing == doesn't seem to work for nested AAs.
-    foreach (key, value; mm) {
-      enforce(testMapMapReturn[key] == value);
-    }
-    foreach (key, value; testMapMapReturn) {
-      enforce(mm[key] == value);
-    }
-
-    Insanity insane;
-    insane.userMap[Numberz.FIVE] = 5000;
-    Xtruct truck;
-    truck.string_thing = "Truck";
-    truck.byte_thing = 8;
-    truck.i32_thing = 8;
-    truck.i64_thing = 8;
-    insane.xtructs ~= truck;
-    if (trace) write("testInsanity()");
-    auto whoa = client.testInsanity(insane);
-    if (trace) writefln(" = %s", whoa);
-
-    // Commented for now, this is cumbersome to write without opEqual getting
-    // called on AA comparison.
-    // enforce(whoa == testInsanityReturn);
-
-    {
-      try {
-        if (trace) write("client.testException(\"Xception\") =>");
-        client.testException("Xception");
-        if (trace) writeln("  void\nFAILURE");
-        throw new Exception("testException failed.");
-      } catch (Xception e) {
-        if (trace) writefln("  {%s, \"%s\"}", e.errorCode, e.message);
-      }
-
-      try {
-        if (trace) write("client.testException(\"TException\") =>");
-        client.testException("Xception");
-        if (trace) writeln("  void\nFAILURE");
-        throw new Exception("testException failed.");
-      } catch (TException e) {
-        if (trace) writefln("  {%s}", e.msg);
-      }
-
-      try {
-        if (trace) write("client.testException(\"success\") =>");
-        client.testException("success");
-        if (trace) writeln("  void");
-      } catch (Exception e) {
-        if (trace) writeln("  exception\nFAILURE");
-        throw new Exception("testException failed.");
-      }
-    }
-
-    {
-      try {
-        if (trace) write("client.testMultiException(\"Xception\", \"test 1\") =>");
-        auto result = client.testMultiException("Xception", "test 1");
-        if (trace) writeln("  result\nFAILURE");
-        throw new Exception("testMultiException failed.");
-      } catch (Xception e) {
-        if (trace) writefln("  {%s, \"%s\"}", e.errorCode, e.message);
-      }
-
-      try {
-        if (trace) write("client.testMultiException(\"Xception2\", \"test 2\") =>");
-        auto result = client.testMultiException("Xception2", "test 2");
-        if (trace) writeln("  result\nFAILURE");
-        throw new Exception("testMultiException failed.");
-      } catch (Xception2 e) {
-        if (trace) writefln("  {%s, {\"%s\"}}",
-          e.errorCode, e.struct_thing.string_thing);
-      }
-
-      try {
-        if (trace) writef("client.testMultiException(\"success\", \"test 3\") =>");
-        auto result = client.testMultiException("success", "test 3");
-        if (trace) writefln("  {{\"%s\"}}", result.string_thing);
-      } catch (Exception e) {
-        if (trace) writeln("  exception\nFAILURE");
-        throw new Exception("testMultiException failed.");
-      }
-    }
-
-    // Do not run oneway test when doing multiple iterations, as it blocks the
-    // server for three seconds.
-    if (numTests == 1) {
-      if (trace) writef("client.testOneway(3) =>");
-      auto onewayWatch = StopWatch(AutoStart.yes);
-      client.testOneway(3);
-      onewayWatch.stop();
-      if (onewayWatch.peek().msecs > 200) {
-        if (trace) {
-          writefln("  FAILURE - took %s ms", onewayWatch.peek().usecs / 1000.0);
-        }
-        throw new Exception("testOneway failed.");
-      } else {
-        if (trace) {
-          writefln("  success - took %s ms", onewayWatch.peek().usecs / 1000.0);
-        }
-      }
-
-      // Redo a simple test after the oneway to make sure we aren't "off by
-      // one", which would be the case if the server treated oneway methods
-      // like normal ones.
-      if (trace) write("re-test testI32(-1)");
-      i32 = client.testI32(-1);
-      if (trace) writefln(" = %s", i32);
-    }
-
-    // Time metering.
-    sw.stop();
-
-    immutable tot = sw.peek().usecs;
-    if (trace) writefln("Total time: %s us\n", tot);
-
-    time_tot += tot;
-    if (time_min == 0 || tot < time_min) {
-      time_min = tot;
-    }
-    if (tot > time_max) {
-      time_max = tot;
-    }
-    protocol.transport.close();
-
-    sw.reset();
-  }
-
-  writeln("All tests done.");
-
-  if (numTests > 1) {
-    auto time_avg = time_tot / numTests;
-    writefln("Min time: %s us", time_min);
-    writefln("Max time: %s us", time_max);
-    writefln("Avg time: %s us", time_avg);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_common.d b/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_common.d
deleted file mode 100644
index 13a5686..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_common.d
+++ /dev/null
@@ -1,92 +0,0 @@
-module thrift_test_common;
-
-import std.stdio;
-import thrift.test.ThriftTest_types;
-
-enum ProtocolType {
-  binary,
-  compact,
-  json
-}
-
-void writeInsanityReturn(in Insanity[Numberz][UserId] insane) {
-  write("{");
-  foreach(key1, value1; insane) {
-    writef("%s => {", key1);
-    foreach(key2, value2; value1) {
-      writef("%s => {", key2);
-      write("{");
-      foreach(key3, value3; value2.userMap) {
-        writef("%s => %s, ", key3, value3);
-      }
-      write("}, ");
-
-      write("{");
-      foreach (x; value2.xtructs) {
-        writef("{\"%s\", %s, %s, %s}, ",
-          x.string_thing, x.byte_thing, x.i32_thing, x.i64_thing);
-      }
-      write("}");
-
-      write("}, ");
-    }
-    write("}, ");
-  }
-  write("}");
-}
-
-Insanity[Numberz][UserId] testInsanityReturn;
-int[int][int] testMapMapReturn;
-
-static this() {
-  testInsanityReturn = {
-    Insanity[Numberz][UserId] insane;
-
-    Xtruct hello;
-    hello.string_thing = "Hello2";
-    hello.byte_thing = 2;
-    hello.i32_thing = 2;
-    hello.i64_thing = 2;
-
-    Xtruct goodbye;
-    goodbye.string_thing = "Goodbye4";
-    goodbye.byte_thing = 4;
-    goodbye.i32_thing = 4;
-    goodbye.i64_thing = 4;
-
-    Insanity crazy;
-    crazy.userMap[Numberz.EIGHT] = 8;
-    crazy.xtructs ~= goodbye;
-
-    Insanity looney;
-    // The C++ TestServer also assigns these to crazy, but that is probably
-    // an oversight.
-    looney.userMap[Numberz.FIVE] = 5;
-    looney.xtructs ~= hello;
-
-    Insanity[Numberz] first_map;
-    first_map[Numberz.TWO] = crazy;
-    first_map[Numberz.THREE] = crazy;
-    insane[1] = first_map;
-
-    Insanity[Numberz] second_map;
-    second_map[Numberz.SIX] = looney;
-    insane[2] = second_map;
-    return insane;
-  }();
-
-  testMapMapReturn = {
-    int[int] pos;
-    int[int] neg;
-
-    for (int i = 1; i < 5; i++) {
-      pos[i] = i;
-      neg[-i] = -i;
-    }
-
-    int[int][int] result;
-    result[4] = pos;
-    result[-4] = neg;
-    return result;
-  }();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_runner.sh b/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_runner.sh
deleted file mode 100755
index 51bfe99..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_runner.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Runs the D ThriftTest client and servers for all combinations of transport,
-# protocol, SSL-mode and server type.
-# Pass -k to keep going after failed tests.
-
-CUR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-protocols="binary compact json"
-# TODO: fix and enable http
-# transports="buffered framed raw http"
-transports="buffered framed raw"
-servers="simple taskpool threaded"
-framed_only_servers="nonblocking pooledNonblocking"
-
-# Don't leave any server instances behind when interrupted (e.g. by Ctrl+C)
-# or terminated.
-trap "kill $(jobs -p) 2>/dev/null" INT TERM
-
-for protocol in $protocols; do
-  for ssl in "" " --ssl"; do
-    for transport in $transports; do
-      for server in $servers $framed_only_servers; do
-        case $framed_only_servers in
-          *$server*) if [ $transport != "framed" ] || [ $ssl != "" ]; then continue; fi;;
-        esac
-
-        args="--transport=$transport --protocol=$protocol$ssl"
-        ${CUR}/thrift_test_server $args --server-type=$server > /dev/null &
-        server_pid=$!
-
-        # Give the server some time to get up and check if it runs (yes, this
-        # is a huge kludge, should add a connect timeout to test client).
-        client_rc=-1
-        if [ "$server" = "taskpool" ]; then
-          sleep 0.5
-        else
-          sleep 0.02
-        fi
-        kill -0 $server_pid 2>/dev/null
-        if [ $? -eq 0 ]; then
-          ${CUR}/thrift_test_client $args --numTests=10 > /dev/null
-          client_rc=$?
-
-          # Temporarily redirect stderr to null to avoid job control messages,
-          # restore it afterwards.
-          exec 3>&2
-          exec 2>/dev/null
-          kill $server_pid
-          exec 3>&2
-        fi
-
-        # Get the server exit code (wait should immediately return).
-        wait $server_pid
-        server_rc=$?
-
-        if [ $client_rc -ne 0 -o $server_rc -eq 1 ]; then
-          echo -e "\nTests failed for: $args --server-type=$server"
-          failed="true"
-          if [ "$1" != "-k" ]; then
-            exit 1
-          fi
-        else
-           echo -n "."
-        fi
-      done
-    done
-  done
-done
-
-echo
-if [ -z "$failed" ]; then
-  echo "All tests passed."
-fi
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_server.d b/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_server.d
deleted file mode 100644
index 71ab917..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/thrift_test_server.d
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module thrift_test_server;
-
-import core.thread : dur, Thread;
-import std.algorithm;
-import std.exception : enforce;
-import std.getopt;
-import std.parallelism : totalCPUs;
-import std.string;
-import std.stdio;
-import std.typetuple : TypeTuple, staticMap;
-import thrift.base;
-import thrift.codegen.processor;
-import thrift.protocol.base;
-import thrift.protocol.binary;
-import thrift.protocol.compact;
-import thrift.protocol.json;
-import thrift.server.base;
-import thrift.server.transport.socket;
-import thrift.server.transport.ssl;
-import thrift.transport.base;
-import thrift.transport.buffered;
-import thrift.transport.framed;
-import thrift.transport.http;
-import thrift.transport.ssl;
-import thrift.util.hashset;
-import test_utils;
-
-import thrift_test_common;
-import thrift.test.ThriftTest_types;
-import thrift.test.ThriftTest;
-
-class TestHandler : ThriftTest {
-  this(bool trace) {
-    trace_ = trace;
-  }
-
-  override void testVoid() {
-    if (trace_) writeln("testVoid()");
-  }
-
-  override string testString(string thing) {
-    if (trace_) writefln("testString(\"%s\")", thing);
-    return thing;
-  }
-
-  override byte testByte(byte thing) {
-    if (trace_) writefln("testByte(%s)", thing);
-    return thing;
-  }
-
-  override int testI32(int thing) {
-    if (trace_) writefln("testI32(%s)", thing);
-    return thing;
-  }
-
-  override long testI64(long thing) {
-    if (trace_) writefln("testI64(%s)", thing);
-    return thing;
-  }
-
-  override double testDouble(double thing) {
-    if (trace_) writefln("testDouble(%s)", thing);
-    return thing;
-  }
-
-  override string testBinary(string thing) {
-    if (trace_) writefln("testBinary(\"%s\")", thing);
-    return thing;
-  }
-
-  override bool testBool(bool thing) {
-    if (trace_) writefln("testBool(\"%s\")", thing);
-    return thing;
-  }
-
-  override Xtruct testStruct(ref const(Xtruct) thing) {
-    if (trace_) writefln("testStruct({\"%s\", %s, %s, %s})",
-      thing.string_thing, thing.byte_thing, thing.i32_thing, thing.i64_thing);
-    return thing;
-  }
-
-  override Xtruct2 testNest(ref const(Xtruct2) nest) {
-    auto thing = nest.struct_thing;
-    if (trace_) writefln("testNest({%s, {\"%s\", %s, %s, %s}, %s})",
-      nest.byte_thing, thing.string_thing, thing.byte_thing, thing.i32_thing,
-      thing.i64_thing, nest.i32_thing);
-    return nest;
-  }
-
-  override int[int] testMap(int[int] thing) {
-    if (trace_) writefln("testMap({%s})", thing);
-    return thing;
-  }
-
-  override HashSet!int testSet(HashSet!int thing) {
-    if (trace_) writefln("testSet({%s})",
-      join(map!`to!string(a)`(thing[]), ", "));
-    return thing;
-  }
-
-  override int[] testList(int[] thing) {
-    if (trace_) writefln("testList(%s)", thing);
-    return thing;
-  }
-
-  override Numberz testEnum(Numberz thing) {
-    if (trace_) writefln("testEnum(%s)", thing);
-    return thing;
-  }
-
-  override UserId testTypedef(UserId thing) {
-    if (trace_) writefln("testTypedef(%s)", thing);
-    return thing;
-  }
-
-  override string[string] testStringMap(string[string] thing) {
-    if (trace_) writefln("testStringMap(%s)", thing);
-    return thing;
-  }
-
-  override int[int][int] testMapMap(int hello) {
-    if (trace_) writefln("testMapMap(%s)", hello);
-    return testMapMapReturn;
-  }
-
-  override Insanity[Numberz][UserId] testInsanity(ref const(Insanity) argument) {
-    if (trace_) writeln("testInsanity()");
-    Insanity[Numberz][UserId] ret;
-    Insanity[Numberz] m1;
-    Insanity[Numberz] m2;
-    Insanity tmp;
-    tmp = cast(Insanity)argument;
-    m1[Numberz.TWO] = tmp;
-    m1[Numberz.THREE] = tmp;
-    m2[Numberz.SIX] = Insanity();
-    ret[1] = m1;
-    ret[2] = m2;
-    return ret;
-  }
-
-  override Xtruct testMulti(byte arg0, int arg1, long arg2, string[short] arg3,
-    Numberz arg4, UserId arg5)
-  {
-    if (trace_) writeln("testMulti()");
-    return Xtruct("Hello2", arg0, arg1, arg2);
-  }
-
-  override void testException(string arg) {
-    if (trace_) writefln("testException(%s)", arg);
-    if (arg == "Xception") {
-      auto e = new Xception();
-      e.errorCode = 1001;
-      e.message = arg;
-      throw e;
-    } else if (arg == "TException") {
-      throw new TException();
-    } else if (arg == "ApplicationException") {
-      throw new TException();
-    }
-  }
-
-  override Xtruct testMultiException(string arg0, string arg1) {
-    if (trace_) writefln("testMultiException(%s, %s)", arg0, arg1);
-
-    if (arg0 == "Xception") {
-      auto e = new Xception();
-      e.errorCode = 1001;
-      e.message = "This is an Xception";
-      throw e;
-    } else if (arg0 == "Xception2") {
-      auto e = new Xception2();
-      e.errorCode = 2002;
-      e.struct_thing.string_thing = "This is an Xception2";
-      throw e;
-    } else {
-      return Xtruct(arg1);
-    }
-  }
-
-  override void testOneway(int sleepFor) {
-    if (trace_) writefln("testOneway(%s): Sleeping...", sleepFor);
-    Thread.sleep(dur!"seconds"(sleepFor));
-    if (trace_) writefln("testOneway(%s): done sleeping!", sleepFor);
-  }
-
-private:
-  bool trace_;
-}
-
-void main(string[] args) {
-  ushort port = 9090;
-  ServerType serverType;
-  ProtocolType protocolType;
-  size_t numIOThreads = 1;
-  TransportType transportType;
-  bool ssl;
-  bool trace;
-  size_t taskPoolSize = totalCPUs;
-
-  getopt(args, "port", &port, "protocol", &protocolType, "server-type",
-    &serverType, "ssl", &ssl, "num-io-threads", &numIOThreads,
-    "task-pool-size", &taskPoolSize, "trace", &trace,
-    "transport", &transportType);
-
-  if (serverType == ServerType.nonblocking ||
-    serverType == ServerType.pooledNonblocking
-  ) {
-    enforce(transportType == TransportType.framed,
-      "Need to use framed transport with non-blocking server.");
-    enforce(!ssl, "The non-blocking server does not support SSL yet.");
-
-    // Don't wrap the contents into another layer of framing.
-    transportType = TransportType.raw;
-  }
-
-  version (ThriftTestTemplates) {
-    // Only exercise the specialized template code paths if explicitly enabled
-    // to reduce memory consumption on regular test suite runs – there should
-    // not be much that can go wrong with that specifically anyway.
-    alias TypeTuple!(TBufferedTransport, TFramedTransport, TServerHttpTransport)
-      AvailableTransports;
-    alias TypeTuple!(
-      staticMap!(TBinaryProtocol, AvailableTransports),
-      staticMap!(TCompactProtocol, AvailableTransports)
-    ) AvailableProtocols;
-  } else {
-    alias TypeTuple!() AvailableTransports;
-    alias TypeTuple!() AvailableProtocols;
-  }
-
-  TProtocolFactory protocolFactory;
-  final switch (protocolType) {
-    case ProtocolType.binary:
-      protocolFactory = new TBinaryProtocolFactory!AvailableTransports;
-      break;
-    case ProtocolType.compact:
-      protocolFactory = new TCompactProtocolFactory!AvailableTransports;
-      break;
-    case ProtocolType.json:
-      protocolFactory = new TJsonProtocolFactory!AvailableTransports;
-      break;
-  }
-
-  auto processor = new TServiceProcessor!(ThriftTest, AvailableProtocols)(
-    new TestHandler(trace));
-
-  TServerSocket serverSocket;
-  if (ssl) {
-    auto sslContext = new TSSLContext();
-    sslContext.serverSide = true;
-    sslContext.loadCertificate("../../../test/keys/server.crt");
-    sslContext.loadPrivateKey("../../../test/keys/server.key");
-    sslContext.ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
-    serverSocket = new TSSLServerSocket(port, sslContext);
-  } else {
-    serverSocket = new TServerSocket(port);
-  }
-
-  auto transportFactory = createTransportFactory(transportType);
-
-  auto server = createServer(serverType, numIOThreads, taskPoolSize,
-    processor, serverSocket, transportFactory, protocolFactory);
-
-  writefln("Starting %s/%s %s ThriftTest server %son port %s...", protocolType,
-    transportType, serverType, ssl ? "(using SSL) ": "", port);
-  server.serve();
-  writeln("done.");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/d/test/transport_test.d b/vendor/git.apache.org/thrift.git/lib/d/test/transport_test.d
deleted file mode 100644
index 623e03f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/d/test/transport_test.d
+++ /dev/null
@@ -1,803 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Exercises various transports, combined with the buffered/framed wrappers.
- *
- * Originally ported from the C++ version, with Windows support code added.
- */
-module transport_test;
-
-import core.atomic;
-import core.time : Duration;
-import core.thread : Thread;
-import std.conv : to;
-import std.datetime;
-import std.exception : enforce;
-static import std.file;
-import std.getopt;
-import std.random : rndGen, uniform, unpredictableSeed;
-import std.socket;
-import std.stdio;
-import std.string;
-import std.typetuple;
-import thrift.transport.base;
-import thrift.transport.buffered;
-import thrift.transport.framed;
-import thrift.transport.file;
-import thrift.transport.http;
-import thrift.transport.memory;
-import thrift.transport.socket;
-import thrift.transport.zlib;
-
-/*
- * Size generation helpers – used to be able to run the same testing code
- * with both constant and random total/chunk sizes.
- */
-
-interface SizeGenerator {
-  size_t nextSize();
-  string toString();
-}
-
-class ConstantSizeGenerator : SizeGenerator {
-  this(size_t value) {
-    value_ = value;
-  }
-
-  override size_t nextSize() {
-    return value_;
-  }
-
-  override string toString() const {
-    return to!string(value_);
-  }
-
-private:
-  size_t value_;
-}
-
-class RandomSizeGenerator : SizeGenerator {
-  this(size_t min, size_t max) {
-    min_ = min;
-    max_ = max;
-  }
-
-  override size_t nextSize() {
-    return uniform!"[]"(min_, max_);
-  }
-
-  override string toString() const {
-    return format("rand(%s, %s)", min_, max_);
-  }
-
-  size_t min() const @property {
-    return min_;
-  }
-
-  size_t max() const @property {
-    return max_;
-  }
-
-private:
-  size_t min_;
-  size_t max_;
-}
-
-
-/*
- * Classes to set up coupled transports
- */
-
-/**
- * Helper class to represent a coupled pair of transports.
- *
- * Data written to the output transport can be read from the input transport.
- *
- * This is used as the base class for the various coupled transport
- * implementations. It shouldn't be used directly.
- */
-class CoupledTransports(Transport) if (isTTransport!Transport) {
-  Transport input;
-  Transport output;
-}
-
-template isCoupledTransports(T) {
-  static if (is(T _ : CoupledTransports!U, U)) {
-    enum isCoupledTransports = true;
-  } else {
-    enum isCoupledTransports = false;
-  }
-}
-
-/**
- * Helper template class for creating coupled transports that wrap
- * another transport.
- */
-class CoupledWrapperTransports(WrapperTransport, InnerCoupledTransports) if (
-  isTTransport!WrapperTransport && isCoupledTransports!InnerCoupledTransports
-) : CoupledTransports!WrapperTransport {
-  this() {
-    inner_ = new InnerCoupledTransports();
-    if (inner_.input) {
-      input = new WrapperTransport(inner_.input);
-    }
-    if (inner_.output) {
-      output = new WrapperTransport(inner_.output);
-    }
-  }
-
-  ~this() {
-    destroy(inner_);
-  }
-
-private:
-  InnerCoupledTransports inner_;
-}
-
-import thrift.internal.codegen : PApply;
-alias PApply!(CoupledWrapperTransports, TBufferedTransport) CoupledBufferedTransports;
-alias PApply!(CoupledWrapperTransports, TFramedTransport) CoupledFramedTransports;
-alias PApply!(CoupledWrapperTransports, TZlibTransport) CoupledZlibTransports;
-
-/**
- * Coupled TMemoryBuffers.
- */
-class CoupledMemoryBuffers : CoupledTransports!TMemoryBuffer {
-  this() {
-    buf = new TMemoryBuffer;
-    input = buf;
-    output = buf;
-  }
-
-  TMemoryBuffer buf;
-}
-
-/**
- * Coupled TSockets.
- */
-class CoupledSocketTransports : CoupledTransports!TSocket {
-  this() {
-    auto sockets = socketPair();
-    input = new TSocket(sockets[0]);
-    output = new TSocket(sockets[1]);
-  }
-
-  ~this() {
-    input.close();
-    output.close();
-  }
-}
-
-/**
- * Coupled TFileTransports
- */
-class CoupledFileTransports : CoupledTransports!TTransport {
-  this() {
-    // We actually need the file name of the temp file here, so we can't just
-    // use the usual tempfile facilities.
-    do {
-      fileName_ = tmpDir ~ "/thrift.transport_test." ~ to!string(rndGen().front);
-      rndGen().popFront();
-    } while (std.file.exists(fileName_));
-
-    writefln("Using temp file: %s", fileName_);
-
-    auto writer = new TFileWriterTransport(fileName_);
-    writer.open();
-    output = writer;
-
-    // Wait until the file has been created.
-    writer.flush();
-
-    auto reader = new TFileReaderTransport(fileName_);
-    reader.open();
-    reader.readTimeout(dur!"msecs"(-1));
-    input = reader;
-  }
-
-  ~this() {
-    input.close();
-    output.close();
-    std.file.remove(fileName_);
-  }
-
-  static string tmpDir;
-
-private:
-  string fileName_;
-}
-
-
-/*
- * Test functions
- */
-
-/**
- * Test interleaved write and read calls.
- *
- * Generates a buffer totalSize bytes long, then writes it to the transport,
- * and verifies the written data can be read back correctly.
- *
- * Mode of operation:
- * - call wChunkGenerator to figure out how large of a chunk to write
- *   - call wSizeGenerator to get the size for individual write() calls,
- *     and do this repeatedly until the entire chunk is written.
- * - call rChunkGenerator to figure out how large of a chunk to read
- *   - call rSizeGenerator to get the size for individual read() calls,
- *     and do this repeatedly until the entire chunk is read.
- * - repeat until the full buffer is written and read back,
- *   then compare the data read back against the original buffer
- *
- *
- * - If any of the size generators return 0, this means to use the maximum
- *   possible size.
- *
- * - If maxOutstanding is non-zero, write chunk sizes will be chosen such that
- *   there are never more than maxOutstanding bytes waiting to be read back.
- */
-void testReadWrite(CoupledTransports)(
-  size_t totalSize,
-  SizeGenerator wSizeGenerator,
-  SizeGenerator rSizeGenerator,
-  SizeGenerator wChunkGenerator,
-  SizeGenerator rChunkGenerator,
-  size_t maxOutstanding
-) if (
-  isCoupledTransports!CoupledTransports
-) {
-  scope transports = new CoupledTransports;
-  assert(transports.input);
-  assert(transports.output);
-
-  auto wbuf = new ubyte[totalSize];
-  auto rbuf = new ubyte[totalSize];
-
-  // Store some data in wbuf.
-  foreach (i, ref b; wbuf) {
-    b = i & 0xff;
-  }
-
-  size_t totalWritten;
-  size_t totalRead;
-  while (totalRead < totalSize) {
-    // Determine how large a chunk of data to write.
-    auto wChunkSize = wChunkGenerator.nextSize();
-    if (wChunkSize == 0 || wChunkSize > totalSize - totalWritten) {
-      wChunkSize = totalSize - totalWritten;
-    }
-
-    // Make sure (totalWritten - totalRead) + wChunkSize is less than
-    // maxOutstanding.
-    if (maxOutstanding > 0 &&
-        wChunkSize > maxOutstanding - (totalWritten - totalRead)) {
-      wChunkSize = maxOutstanding - (totalWritten - totalRead);
-    }
-
-    // Write the chunk.
-    size_t chunkWritten = 0;
-    while (chunkWritten < wChunkSize) {
-      auto writeSize = wSizeGenerator.nextSize();
-      if (writeSize == 0 || writeSize > wChunkSize - chunkWritten) {
-        writeSize = wChunkSize - chunkWritten;
-      }
-
-      transports.output.write(wbuf[totalWritten .. totalWritten + writeSize]);
-      chunkWritten += writeSize;
-      totalWritten += writeSize;
-    }
-
-    // Flush the data, so it will be available in the read transport
-    // Don't flush if wChunkSize is 0. (This should only happen if
-    // totalWritten == totalSize already, and we're only reading now.)
-    if (wChunkSize > 0) {
-      transports.output.flush();
-    }
-
-    // Determine how large a chunk of data to read back.
-    auto rChunkSize = rChunkGenerator.nextSize();
-    if (rChunkSize == 0 || rChunkSize > totalWritten - totalRead) {
-      rChunkSize = totalWritten - totalRead;
-    }
-
-    // Read the chunk.
-    size_t chunkRead;
-    while (chunkRead < rChunkSize) {
-      auto readSize = rSizeGenerator.nextSize();
-      if (readSize == 0 || readSize > rChunkSize - chunkRead) {
-        readSize = rChunkSize - chunkRead;
-      }
-
-      size_t bytesRead;
-      try {
-        bytesRead = transports.input.read(
-          rbuf[totalRead .. totalRead + readSize]);
-      } catch (TTransportException e) {
-        throw new Exception(format(`read(pos = %s, size = %s) threw ` ~
-          `exception "%s"; written so far: %s/%s bytes`, totalRead, readSize,
-          e.msg, totalWritten, totalSize));
-      }
-
-      enforce(bytesRead > 0, format(`read(pos = %s, size = %s) returned %s; ` ~
-        `written so far: %s/%s bytes`, totalRead, readSize, bytesRead,
-        totalWritten, totalSize));
-
-      chunkRead += bytesRead;
-      totalRead += bytesRead;
-    }
-  }
-
-  // make sure the data read back is identical to the data written
-  if (rbuf != wbuf) {
-    stderr.writefln("%s vs. %s", wbuf[$ - 4 .. $], rbuf[$ - 4 .. $]);
-    stderr.writefln("rbuf: %s vs. wbuf: %s", rbuf.length, wbuf.length);
-  }
-  enforce(rbuf == wbuf);
-}
-
-void testReadPartAvailable(CoupledTransports)() if (
-  isCoupledTransports!CoupledTransports
-) {
-  scope transports = new CoupledTransports;
-  assert(transports.input);
-  assert(transports.output);
-
-  ubyte[10] writeBuf = 'a';
-  ubyte[10] readBuf;
-
-  // Attemping to read 10 bytes when only 9 are available should return 9
-  // immediately.
-  transports.output.write(writeBuf[0 .. 9]);
-  transports.output.flush();
-
-  auto t = Trigger(dur!"seconds"(3), transports.output, 1);
-  auto bytesRead = transports.input.read(readBuf);
-  enforce(t.fired == 0);
-  enforce(bytesRead == 9);
-}
-
-void testReadPartialMidframe(CoupledTransports)() if (
-  isCoupledTransports!CoupledTransports
-) {
-  scope transports = new CoupledTransports;
-  assert(transports.input);
-  assert(transports.output);
-
-  ubyte[13] writeBuf = 'a';
-  ubyte[14] readBuf;
-
-  // Attempt to read 10 bytes, when only 9 are available, but after we have
-  // already read part of the data that is available.  This exercises a
-  // different code path for several of the transports.
-  //
-  // For transports that add their own framing (e.g., TFramedTransport and
-  // TFileTransport), the two flush calls break up the data in to a 10 byte
-  // frame and a 3 byte frame.  The first read then puts us partway through the
-  // first frame, and then we attempt to read past the end of that frame, and
-  // through the next frame, too.
-  //
-  // For buffered transports that perform read-ahead (e.g.,
-  // TBufferedTransport), the read-ahead will most likely see all 13 bytes
-  // written on the first read.  The next read will then attempt to read past
-  // the end of the read-ahead buffer.
-  //
-  // Flush 10 bytes, then 3 bytes.  This creates 2 separate frames for
-  // transports that track framing internally.
-  transports.output.write(writeBuf[0 .. 10]);
-  transports.output.flush();
-  transports.output.write(writeBuf[10 .. 13]);
-  transports.output.flush();
-
-  // Now read 4 bytes, so that we are partway through the written data.
-  auto bytesRead = transports.input.read(readBuf[0 .. 4]);
-  enforce(bytesRead == 4);
-
-  // Now attempt to read 10 bytes.  Only 9 more are available.
-  //
-  // We should be able to get all 9 bytes, but it might take multiple read
-  // calls, since it is valid for read() to return fewer bytes than requested.
-  // (Most transports do immediately return 9 bytes, but the framing transports
-  // tend to only return to the end of the current frame, which is 6 bytes in
-  // this case.)
-  size_t totalRead = 0;
-  while (totalRead < 9) {
-    auto t = Trigger(dur!"seconds"(3), transports.output, 1);
-    bytesRead = transports.input.read(readBuf[4 + totalRead .. 14]);
-    enforce(t.fired == 0);
-    enforce(bytesRead > 0);
-    totalRead += bytesRead;
-    enforce(totalRead <= 9);
-  }
-
-  enforce(totalRead == 9);
-}
-
-void testBorrowPartAvailable(CoupledTransports)() if (
-  isCoupledTransports!CoupledTransports
-) {
-  scope transports = new CoupledTransports;
-  assert(transports.input);
-  assert(transports.output);
-
-  ubyte[9] writeBuf = 'a';
-  ubyte[10] readBuf;
-
-  // Attemping to borrow 10 bytes when only 9 are available should return NULL
-  // immediately.
-  transports.output.write(writeBuf);
-  transports.output.flush();
-
-  auto t = Trigger(dur!"seconds"(3), transports.output, 1);
-  auto borrowLen = readBuf.length;
-  auto borrowedBuf = transports.input.borrow(readBuf.ptr, borrowLen);
-  enforce(t.fired == 0);
-  enforce(borrowedBuf is null);
-}
-
-void testReadNoneAvailable(CoupledTransports)() if (
-  isCoupledTransports!CoupledTransports
-) {
-  scope transports = new CoupledTransports;
-  assert(transports.input);
-  assert(transports.output);
-
-  // Attempting to read when no data is available should either block until
-  // some data is available, or fail immediately.  (e.g., TSocket blocks,
-  // TMemoryBuffer just fails.)
-  //
-  // If the transport blocks, it should succeed once some data is available,
-  // even if less than the amount requested becomes available.
-  ubyte[10] readBuf;
-
-  auto t = Trigger(dur!"seconds"(1), transports.output, 2);
-  t.add(dur!"seconds"(1), transports.output, 8);
-
-  auto bytesRead = transports.input.read(readBuf);
-  if (bytesRead == 0) {
-    enforce(t.fired == 0);
-  } else {
-    enforce(t.fired == 1);
-    enforce(bytesRead == 2);
-  }
-}
-
-void testBorrowNoneAvailable(CoupledTransports)() if (
-  isCoupledTransports!CoupledTransports
-) {
-  scope transports = new CoupledTransports;
-  assert(transports.input);
-  assert(transports.output);
-
-  ubyte[16] writeBuf = 'a';
-
-  // Attempting to borrow when no data is available should fail immediately
-  auto t = Trigger(dur!"seconds"(1), transports.output, 10);
-
-  auto borrowLen = 10;
-  auto borrowedBuf = transports.input.borrow(null, borrowLen);
-  enforce(borrowedBuf is null);
-  enforce(t.fired == 0);
-}
-
-
-void doRwTest(CoupledTransports)(
-  size_t totalSize,
-  SizeGenerator wSizeGen,
-  SizeGenerator rSizeGen,
-  SizeGenerator wChunkSizeGen = new ConstantSizeGenerator(0),
-  SizeGenerator rChunkSizeGen = new ConstantSizeGenerator(0),
-  size_t maxOutstanding = 0
-) if (
-  isCoupledTransports!CoupledTransports
-) {
-  totalSize = cast(size_t)(totalSize * g_sizeMultiplier);
-
-  scope(failure) {
-    writefln("Test failed for %s: testReadWrite(%s, %s, %s, %s, %s, %s)",
-      CoupledTransports.stringof, totalSize, wSizeGen, rSizeGen,
-      wChunkSizeGen, rChunkSizeGen, maxOutstanding);
-  }
-
-  testReadWrite!CoupledTransports(totalSize, wSizeGen, rSizeGen,
-    wChunkSizeGen, rChunkSizeGen, maxOutstanding);
-}
-
-void doBlockingTest(CoupledTransports)() if (
-  isCoupledTransports!CoupledTransports
-) {
-  void writeFailure(string name) {
-    writefln("Test failed for %s: %s()", CoupledTransports.stringof, name);
-  }
-
-  {
-    scope(failure) writeFailure("testReadPartAvailable");
-    testReadPartAvailable!CoupledTransports();
-  }
-
-  {
-    scope(failure) writeFailure("testReadPartialMidframe");
-    testReadPartialMidframe!CoupledTransports();
-  }
-
-  {
-    scope(failure) writeFailure("testReadNoneAvaliable");
-    testReadNoneAvailable!CoupledTransports();
-  }
-
-  {
-    scope(failure) writeFailure("testBorrowPartAvailable");
-    testBorrowPartAvailable!CoupledTransports();
-  }
-
-  {
-    scope(failure) writeFailure("testBorrowNoneAvailable");
-    testBorrowNoneAvailable!CoupledTransports();
-  }
-}
-
-SizeGenerator getGenerator(T)(T t) {
-  static if (is(T : SizeGenerator)) {
-    return t;
-  } else {
-    return new ConstantSizeGenerator(t);
-  }
-}
-
-template WrappedTransports(T) if (isCoupledTransports!T) {
-  alias TypeTuple!(
-    T,
-    CoupledBufferedTransports!T,
-    CoupledFramedTransports!T,
-    CoupledZlibTransports!T
-  ) WrappedTransports;
-}
-
-void testRw(C, R, S)(
-  size_t totalSize,
-  R wSize,
-  S rSize
-) if (
-  isCoupledTransports!C && is(typeof(getGenerator(wSize))) &&
-  is(typeof(getGenerator(rSize)))
-) {
-  testRw!C(totalSize, wSize, rSize, 0, 0, 0);
-}
-
-void testRw(C, R, S, T, U)(
-  size_t totalSize,
-  R wSize,
-  S rSize,
-  T wChunkSize,
-  U rChunkSize,
-  size_t maxOutstanding = 0
-) if (
-  isCoupledTransports!C && is(typeof(getGenerator(wSize))) &&
-  is(typeof(getGenerator(rSize))) && is(typeof(getGenerator(wChunkSize))) &&
-  is(typeof(getGenerator(rChunkSize)))
-) {
-  foreach (T; WrappedTransports!C) {
-    doRwTest!T(
-      totalSize,
-      getGenerator(wSize),
-      getGenerator(rSize),
-      getGenerator(wChunkSize),
-      getGenerator(rChunkSize),
-      maxOutstanding
-    );
-  }
-}
-
-void testBlocking(C)() if (isCoupledTransports!C) {
-  foreach (T; WrappedTransports!C) {
-    doBlockingTest!T();
-  }
-}
-
-// A quick hack, for the sake of brevity…
-float g_sizeMultiplier = 1;
-
-version (Posix) {
-  immutable defaultTempDir = "/tmp";
-} else version (Windows) {
-  import core.sys.windows.windows;
-  extern(Windows) DWORD GetTempPathA(DWORD nBufferLength, LPTSTR lpBuffer);
-
-  string defaultTempDir() @property {
-    char[MAX_PATH + 1] dir;
-    enforce(GetTempPathA(dir.length, dir.ptr));
-    return to!string(dir.ptr)[0 .. $ - 1];
-  }
-} else static assert(false);
-
-void main(string[] args) {
-  int seed = unpredictableSeed();
-  string tmpDir = defaultTempDir;
-
-  getopt(args, "seed", &seed, "size-multiplier", &g_sizeMultiplier,
-    "tmp-dir", &tmpDir);
-  enforce(g_sizeMultiplier >= 0, "Size multiplier must not be negative.");
-
-  writefln("Using seed: %s", seed);
-  rndGen().seed(seed);
-  CoupledFileTransports.tmpDir = tmpDir;
-
-  auto rand4k = new RandomSizeGenerator(1, 4096);
-
-  /*
-   * We do the basically the same set of tests for each transport type,
-   * although we tweak the parameters in some places.
-   */
-
-  // TMemoryBuffer tests
-  testRw!CoupledMemoryBuffers(1024 * 1024, 0, 0);
-  testRw!CoupledMemoryBuffers(1024 * 256, rand4k, rand4k);
-  testRw!CoupledMemoryBuffers(1024 * 256, 167, 163);
-  testRw!CoupledMemoryBuffers(1024 * 16, 1, 1);
-
-  testRw!CoupledMemoryBuffers(1024 * 256, 0, 0, rand4k, rand4k);
-  testRw!CoupledMemoryBuffers(1024 * 256, rand4k, rand4k, rand4k, rand4k);
-  testRw!CoupledMemoryBuffers(1024 * 256, 167, 163, rand4k, rand4k);
-  testRw!CoupledMemoryBuffers(1024 * 16, 1, 1, rand4k, rand4k);
-
-  testBlocking!CoupledMemoryBuffers();
-
-  // TSocket tests
-  enum socketMaxOutstanding = 4096;
-  testRw!CoupledSocketTransports(1024 * 1024, 0, 0,
-          0, 0, socketMaxOutstanding);
-  testRw!CoupledSocketTransports(1024 * 256, rand4k, rand4k,
-          0, 0, socketMaxOutstanding);
-  testRw!CoupledSocketTransports(1024 * 256, 167, 163,
-          0, 0, socketMaxOutstanding);
-  // Doh.  Apparently writing to a socket has some additional overhead for
-  // each send() call.  If we have more than ~400 outstanding 1-byte write
-  // requests, additional send() calls start blocking.
-  testRw!CoupledSocketTransports(1024 * 16, 1, 1,
-          0, 0, 250);
-  testRw!CoupledSocketTransports(1024 * 256, 0, 0,
-          rand4k, rand4k, socketMaxOutstanding);
-  testRw!CoupledSocketTransports(1024 * 256, rand4k, rand4k,
-          rand4k, rand4k, socketMaxOutstanding);
-  testRw!CoupledSocketTransports(1024 * 256, 167, 163,
-          rand4k, rand4k, socketMaxOutstanding);
-  testRw!CoupledSocketTransports(1024 * 16, 1, 1,
-          rand4k, rand4k, 250);
-
-  testBlocking!CoupledSocketTransports();
-
-  // File transport tests.
-
-  // Cannot write more than the frame size at once.
-  enum maxWriteAtOnce = 1024 * 1024 * 16 - 4;
-
-  testRw!CoupledFileTransports(1024 * 1024, maxWriteAtOnce, 0);
-  testRw!CoupledFileTransports(1024 * 256, rand4k, rand4k);
-  testRw!CoupledFileTransports(1024 * 256, 167, 163);
-  testRw!CoupledFileTransports(1024 * 16, 1, 1);
-
-  testRw!CoupledFileTransports(1024 * 256, 0, 0, rand4k, rand4k);
-  testRw!CoupledFileTransports(1024 * 256, rand4k, rand4k, rand4k, rand4k);
-  testRw!CoupledFileTransports(1024 * 256, 167, 163, rand4k, rand4k);
-  testRw!CoupledFileTransports(1024 * 16, 1, 1, rand4k, rand4k);
-
-  testBlocking!CoupledFileTransports();
-}
-
-
-/*
- * Timer handling code for use in tests that check the transport blocking
- * semantics.
- *
- * The implementation has been hacked together in a hurry and wastes a lot of
- * threads, but speed should not be the concern here.
- */
-
-struct Trigger {
-  this(Duration timeout, TTransport transport, size_t writeLength) {
-    mutex_ = new Mutex;
-    cancelCondition_ = new Condition(mutex_);
-    info_ = new Info(timeout, transport, writeLength);
-    startThread();
-  }
-
-  ~this() {
-    synchronized (mutex_) {
-      info_ = null;
-      cancelCondition_.notifyAll();
-    }
-    if (thread_) thread_.join();
-  }
-
-  @disable this(this) { assert(0); }
-
-  void add(Duration timeout, TTransport transport, size_t writeLength) {
-    synchronized (mutex_) {
-      auto info = new Info(timeout, transport, writeLength);
-      if (info_) {
-        auto prev = info_;
-        while (prev.next) prev = prev.next;
-        prev.next = info;
-      } else {
-        info_ = info;
-        startThread();
-      }
-    }
-  }
-
-  @property short fired() {
-    return atomicLoad(fired_);
-  }
-
-private:
-  void timerThread() {
-    // KLUDGE: Make sure the std.concurrency mbox is initialized on the timer
-    // thread to be able to unblock the file transport.
-    import std.concurrency;
-    thisTid;
-
-    synchronized (mutex_) {
-      while (info_) {
-        auto cancelled = cancelCondition_.wait(info_.timeout);
-        if (cancelled) {
-          info_ = null;
-          break;
-        }
-
-        atomicOp!"+="(fired_, 1);
-
-        // Write some data to the transport to unblock it.
-        auto buf = new ubyte[info_.writeLength];
-        buf[] = 'b';
-        info_.transport.write(buf);
-        info_.transport.flush();
-
-        info_ = info_.next;
-      }
-    }
-
-    thread_ = null;
-  }
-
-  void startThread() {
-    thread_ = new Thread(&timerThread);
-    thread_.start();
-  }
-
-  struct Info {
-    this(Duration timeout, TTransport transport, size_t writeLength) {
-      this.timeout = timeout;
-      this.transport = transport;
-      this.writeLength = writeLength;
-    }
-
-    Duration timeout;
-    TTransport transport;
-    size_t writeLength;
-    Info* next;
-  }
-
-  Info* info_;
-  Thread thread_;
-  shared short fired_;
-
-  import core.sync.mutex;
-  Mutex mutex_;
-  import core.sync.condition;
-  Condition cancelCondition_;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/.analysis_options b/vendor/git.apache.org/thrift.git/lib/dart/.analysis_options
deleted file mode 100644
index a10d4c5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/.analysis_options
+++ /dev/null
@@ -1,2 +0,0 @@
-analyzer:
-  strong-mode: true
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/LICENSE_HEADER b/vendor/git.apache.org/thrift.git/lib/dart/LICENSE_HEADER
deleted file mode 100644
index 4eacb64..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/LICENSE_HEADER
+++ /dev/null
@@ -1,16 +0,0 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/Makefile.am b/vendor/git.apache.org/thrift.git/lib/dart/Makefile.am
deleted file mode 100644
index a6e4556..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-all-local:
-	$(DARTPUB) get
-
-clean-local:
-	$(RM) -r .pub
-	find . -type d -name "packages" | xargs $(RM) -r
-	find . -type f -name ".packages" | xargs $(RM)
-
-check-local: all
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/README.md b/vendor/git.apache.org/thrift.git/lib/dart/README.md
deleted file mode 100644
index 2be168b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Thrift Dart Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with Dart
-====================
-
-Dart 1.12.0 or newer is required
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/dart/coding_standards.md
deleted file mode 100644
index 62f6003..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/coding_standards.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dart Coding Standards
-
-### Please follow:
- * [Thrift General Coding Standards](/doc/coding_standards.md)
- * [Use dartfmt](https://www.dartlang.org/tools/dartfmt/) and follow the 
-   [Dart Style Guide](https://www.dartlang.org/articles/style-guide/)
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/browser/t_web_socket.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/browser/t_web_socket.dart
deleted file mode 100644
index 17693b3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/browser/t_web_socket.dart
+++ /dev/null
@@ -1,130 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-library thrift.src.browser;
-
-import 'dart:async';
-import 'dart:convert' show BASE64;
-import 'dart:html' show CloseEvent;
-import 'dart:html' show Event;
-import 'dart:html' show MessageEvent;
-import 'dart:html' show WebSocket;
-import 'dart:typed_data' show Uint8List;
-
-import 'package:thrift/thrift.dart';
-
-/// A [TSocket] backed by a [WebSocket] from dart:html
-class TWebSocket implements TSocket {
-  final Uri url;
-
-  final StreamController<TSocketState> _onStateController;
-  Stream<TSocketState> get onState => _onStateController.stream;
-
-  final StreamController<Object> _onErrorController;
-  Stream<Object> get onError => _onErrorController.stream;
-
-  final StreamController<Uint8List> _onMessageController;
-  Stream<Uint8List> get onMessage => _onMessageController.stream;
-
-  final List<Uint8List> _requests = [];
-
-  TWebSocket(this.url)
-      : _onStateController = new StreamController.broadcast(),
-        _onErrorController = new StreamController.broadcast(),
-        _onMessageController = new StreamController.broadcast() {
-    if (url == null || !url.hasAuthority || !url.hasPort) {
-      throw new ArgumentError('Invalid url');
-    }
-  }
-
-  WebSocket _socket;
-
-  bool get isOpen => _socket != null && _socket.readyState == WebSocket.OPEN;
-
-  bool get isClosed =>
-      _socket == null || _socket.readyState == WebSocket.CLOSED;
-
-  Future open() {
-    if (!isClosed) {
-      throw new TTransportError(
-          TTransportErrorType.ALREADY_OPEN, 'Socket already connected');
-    }
-
-    _socket = new WebSocket(url.toString());
-    _socket.onError.listen(_onError);
-    _socket.onOpen.listen(_onOpen);
-    _socket.onClose.listen(_onClose);
-    _socket.onMessage.listen(_onMessage);
-
-    return _socket.onOpen.first;
-  }
-
-  Future close() {
-    if (_socket != null) {
-      _socket.close();
-      return _socket.onClose.first;
-    } else {
-      return new Future.value();
-    }
-  }
-
-  void send(Uint8List data) {
-    _requests.add(data);
-    _sendRequests();
-  }
-
-  void _sendRequests() {
-    while (isOpen && _requests.isNotEmpty) {
-      Uint8List data = _requests.removeAt(0);
-      _socket.sendString(BASE64.encode(data));
-    }
-  }
-
-  void _onOpen(Event event) {
-    _onStateController.add(TSocketState.OPEN);
-    _sendRequests();
-  }
-
-  void _onClose(CloseEvent event) {
-    _socket = null;
-
-    if (_requests.isNotEmpty) {
-      _onErrorController
-          .add(new StateError('Socket was closed with pending requests'));
-    }
-    _requests.clear();
-
-    _onStateController.add(TSocketState.CLOSED);
-  }
-
-  void _onMessage(MessageEvent message) {
-    try {
-      Uint8List data =
-          new Uint8List.fromList(BASE64.decode(message.data));
-      _onMessageController.add(data);
-    } on FormatException catch (_) {
-      var error = new TProtocolError(TProtocolErrorType.INVALID_DATA,
-          "Expected a Base 64 encoded string.");
-      _onErrorController.add(error);
-    }
-  }
-
-  void _onError(Event event) {
-    close();
-    _onErrorController.add(event.toString());
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/console/t_tcp_socket.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/console/t_tcp_socket.dart
deleted file mode 100644
index b714803..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/console/t_tcp_socket.dart
+++ /dev/null
@@ -1,81 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-library thrift.src.console.t_tcp_socket;
-
-import 'dart:async';
-import 'dart:io';
-import 'dart:typed_data' show Uint8List;
-
-import 'package:thrift/thrift.dart';
-
-/// A [TSocket] backed by a [Socket] from dart:io
-class TTcpSocket implements TSocket {
-  final StreamController<TSocketState> _onStateController;
-  Stream<TSocketState> get onState => _onStateController.stream;
-
-  final StreamController<Object> _onErrorController;
-  Stream<Object> get onError => _onErrorController.stream;
-
-  final StreamController<Uint8List> _onMessageController;
-  Stream<Uint8List> get onMessage => _onMessageController.stream;
-
-  TTcpSocket(Socket socket)
-      : _onStateController = new StreamController.broadcast(),
-        _onErrorController = new StreamController.broadcast(),
-        _onMessageController = new StreamController.broadcast() {
-    if (socket == null) {
-      throw new ArgumentError.notNull('socket');
-    }
-
-    _socket = socket;
-    _socket.listen(_onMessage, onError: _onError, onDone: close);
-  }
-
-  Socket _socket;
-
-  bool get isOpen => _socket != null;
-
-  bool get isClosed => _socket == null;
-
-  Future open() async {
-    _onStateController.add(TSocketState.OPEN);
-  }
-
-  Future close() async {
-    if (_socket != null) {
-      await _socket.close();
-      _socket = null;
-    }
-
-    _onStateController.add(TSocketState.CLOSED);
-  }
-
-  void send(Uint8List data) {
-    _socket.add(data);
-  }
-
-  void _onMessage(List<int> message) {
-    Uint8List data = new Uint8List.fromList(message);
-    _onMessageController.add(data);
-  }
-
-  void _onError(Object error) {
-    close();
-    _onErrorController.add('$error');
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/console/t_web_socket.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/console/t_web_socket.dart
deleted file mode 100644
index 4ed7284..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/console/t_web_socket.dart
+++ /dev/null
@@ -1,89 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-library thrift.src.console.t_web_socket;
-
-import 'dart:async';
-import 'dart:convert' show BASE64;
-import 'dart:io';
-import 'dart:typed_data' show Uint8List;
-
-import 'package:thrift/thrift.dart';
-
-/// A [TSocket] backed by a [WebSocket] from dart:io
-class TWebSocket implements TSocket {
-  final StreamController<TSocketState> _onStateController;
-  Stream<TSocketState> get onState => _onStateController.stream;
-
-  final StreamController<Object> _onErrorController;
-  Stream<Object> get onError => _onErrorController.stream;
-
-  final StreamController<Uint8List> _onMessageController;
-  Stream<Uint8List> get onMessage => _onMessageController.stream;
-
-  TWebSocket(WebSocket socket)
-      : _onStateController = new StreamController.broadcast(),
-        _onErrorController = new StreamController.broadcast(),
-        _onMessageController = new StreamController.broadcast() {
-    if (socket == null) {
-      throw new ArgumentError.notNull('socket');
-    }
-
-    _socket = socket;
-    _socket.listen(_onMessage, onError: _onError, onDone: close);
-  }
-
-  WebSocket _socket;
-
-  bool get isOpen => _socket != null;
-
-  bool get isClosed => _socket == null;
-
-  Future open() async {
-    _onStateController.add(TSocketState.OPEN);
-  }
-
-  Future close() async {
-    if (_socket != null) {
-      await _socket.close();
-      _socket = null;
-    }
-
-    _onStateController.add(TSocketState.CLOSED);
-  }
-
-  void send(Uint8List data) {
-    _socket.add(BASE64.encode(data));
-  }
-
-  void _onMessage(String message) {
-    try {
-      Uint8List data =
-          new Uint8List.fromList(BASE64.decode(message));
-      _onMessageController.add(data);
-    } on FormatException catch (_) {
-      var error = new TProtocolError(TProtocolErrorType.INVALID_DATA,
-          "Expected a Base 64 encoded string.");
-      _onErrorController.add(error);
-    }
-  }
-
-  void _onError(Object error) {
-    close();
-    _onErrorController.add('$error');
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_binary_protocol.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_binary_protocol.dart
deleted file mode 100644
index a785d81..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_binary_protocol.dart
+++ /dev/null
@@ -1,281 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TBinaryProtocolFactory implements TProtocolFactory<TBinaryProtocol> {
-  TBinaryProtocolFactory({this.strictRead: false, this.strictWrite: true});
-
-  final bool strictRead;
-  final bool strictWrite;
-
-  TBinaryProtocol getProtocol(TTransport transport) {
-    return new TBinaryProtocol(transport,
-        strictRead: strictRead, strictWrite: strictWrite);
-  }
-}
-
-/// Binary protocol implementation for Thrift.
-///
-/// Adapted from the C# version.
-class TBinaryProtocol extends TProtocol {
-  static const int VERSION_MASK = 0xffff0000;
-  static const int VERSION_1 = 0x80010000;
-
-  static const Utf8Codec _utf8Codec = const Utf8Codec();
-
-  final bool strictRead;
-  final bool strictWrite;
-
-  TBinaryProtocol(TTransport transport,
-      {this.strictRead: false, this.strictWrite: true})
-      : super(transport);
-
-  /// write
-  void writeMessageBegin(TMessage message) {
-    if (strictWrite) {
-      int version = VERSION_1 | message.type;
-      writeI32(version);
-      writeString(message.name);
-      writeI32(message.seqid);
-    } else {
-      writeString(message.name);
-      writeByte(message.type);
-      writeI32(message.seqid);
-    }
-  }
-
-  void writeMessageEnd() {}
-
-  void writeStructBegin(TStruct struct) {}
-
-  void writeStructEnd() {}
-
-  void writeFieldBegin(TField field) {
-    writeByte(field.type);
-    writeI16(field.id);
-  }
-
-  void writeFieldEnd() {}
-
-  void writeFieldStop() {
-    writeByte(TType.STOP);
-  }
-
-  void writeMapBegin(TMap map) {
-    writeByte(map.keyType);
-    writeByte(map.valueType);
-    writeI32(map.length);
-  }
-
-  void writeMapEnd() {}
-
-  void writeListBegin(TList list) {
-    writeByte(list.elementType);
-    writeI32(list.length);
-  }
-
-  void writeListEnd() {}
-
-  void writeSetBegin(TSet set) {
-    writeByte(set.elementType);
-    writeI32(set.length);
-  }
-
-  void writeSetEnd() {}
-
-  void writeBool(bool b) {
-    if (b == null) b = false;
-    writeByte(b ? 1 : 0);
-  }
-
-  final ByteData _byteOut = new ByteData(1);
-  void writeByte(int byte) {
-    if (byte == null) byte = 0;
-    _byteOut.setUint8(0, byte);
-    transport.write(_byteOut.buffer.asUint8List(), 0, 1);
-  }
-
-  final ByteData _i16Out = new ByteData(2);
-  void writeI16(int i16) {
-    if (i16 == null) i16 = 0;
-    _i16Out.setInt16(0, i16);
-    transport.write(_i16Out.buffer.asUint8List(), 0, 2);
-  }
-
-  final ByteData _i32Out = new ByteData(4);
-  void writeI32(int i32) {
-    if (i32 == null) i32 = 0;
-    _i32Out.setInt32(0, i32);
-    transport.write(_i32Out.buffer.asUint8List(), 0, 4);
-  }
-
-  final Uint8List _i64Out = new Uint8List(8);
-  void writeI64(int i64) {
-    if (i64 == null) i64 = 0;
-    var i = new Int64(i64);
-    var bts = i.toBytes();
-    for (var j = 0; j < 8; j++) {
-      _i64Out[j] = bts[8 - j - 1];
-    }
-    transport.write(_i64Out, 0, 8);
-  }
-
-  void writeString(String s) {
-    var bytes = s != null ? _utf8Codec.encode(s) : new Uint8List.fromList([]);
-    writeI32(bytes.length);
-    transport.write(bytes, 0, bytes.length);
-  }
-
-  final ByteData _doubleOut = new ByteData(8);
-  void writeDouble(double d) {
-    if (d == null) d = 0.0;
-    _doubleOut.setFloat64(0, d);
-    transport.write(_doubleOut.buffer.asUint8List(), 0, 8);
-  }
-
-  void writeBinary(Uint8List bytes) {
-    var length = bytes.length;
-    writeI32(length);
-    transport.write(bytes, 0, length);
-  }
-
-  /// read
-  TMessage readMessageBegin() {
-    String name;
-    int type;
-    int seqid;
-
-    int size = readI32();
-    if (size < 0) {
-      int version = size & VERSION_MASK;
-      if (version != VERSION_1) {
-        throw new TProtocolError(TProtocolErrorType.BAD_VERSION,
-            "Bad version in readMessageBegin: $version");
-      }
-      type = size & 0x000000ff;
-      name = readString();
-      seqid = readI32();
-    } else {
-      if (strictRead) {
-        throw new TProtocolError(TProtocolErrorType.BAD_VERSION,
-            "Missing version in readMessageBegin");
-      }
-      name = _readString(size);
-      type = readByte();
-      seqid = readI32();
-    }
-    return new TMessage(name, type, seqid);
-  }
-
-  void readMessageEnd() {}
-
-  TStruct readStructBegin() {
-    return new TStruct();
-  }
-
-  void readStructEnd() {}
-
-  TField readFieldBegin() {
-    String name = "";
-    int type = readByte();
-    int id = type != TType.STOP ? readI16() : 0;
-
-    return new TField(name, type, id);
-  }
-
-  void readFieldEnd() {}
-
-  TMap readMapBegin() {
-    int keyType = readByte();
-    int valueType = readByte();
-    int length = readI32();
-
-    return new TMap(keyType, valueType, length);
-  }
-
-  void readMapEnd() {}
-
-  TList readListBegin() {
-    int elementType = readByte();
-    int length = readI32();
-
-    return new TList(elementType, length);
-  }
-
-  void readListEnd() {}
-
-  TSet readSetBegin() {
-    int elementType = readByte();
-    int length = readI32();
-
-    return new TSet(elementType, length);
-  }
-
-  void readSetEnd() {}
-
-  bool readBool() => readByte() == 1;
-
-  final Uint8List _byteIn = new Uint8List(1);
-  int readByte() {
-    transport.readAll(_byteIn, 0, 1);
-    return _byteIn.buffer.asByteData().getUint8(0);
-  }
-
-  final Uint8List _i16In = new Uint8List(2);
-  int readI16() {
-    transport.readAll(_i16In, 0, 2);
-    return _i16In.buffer.asByteData().getInt16(0);
-  }
-
-  final Uint8List _i32In = new Uint8List(4);
-  int readI32() {
-    transport.readAll(_i32In, 0, 4);
-    return _i32In.buffer.asByteData().getInt32(0);
-  }
-
-  final Uint8List _i64In = new Uint8List(8);
-  int readI64() {
-    transport.readAll(_i64In, 0, 8);
-    var i = new Int64.fromBytesBigEndian(_i64In);
-    return i.toInt();
-  }
-
-  final Uint8List _doubleIn = new Uint8List(8);
-  double readDouble() {
-    transport.readAll(_doubleIn, 0, 8);
-    return _doubleIn.buffer.asByteData().getFloat64(0);
-  }
-
-  String readString() {
-    int size = readI32();
-    return _readString(size);
-  }
-
-  String _readString(int size) {
-    Uint8List stringIn = new Uint8List(size);
-    transport.readAll(stringIn, 0, size);
-    return _utf8Codec.decode(stringIn);
-  }
-
-  Uint8List readBinary() {
-    int length = readI32();
-    Uint8List binaryIn = new Uint8List(length);
-    transport.readAll(binaryIn, 0, length);
-    return binaryIn;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_compact_protocol.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_compact_protocol.dart
deleted file mode 100644
index 72d7641..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_compact_protocol.dart
+++ /dev/null
@@ -1,470 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// 'License'); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TCompactProtocolFactory implements TProtocolFactory<TCompactProtocol> {
-  TCompactProtocolFactory();
-
-  TCompactProtocol getProtocol(TTransport transport) {
-    return new TCompactProtocol(transport);
-  }
-}
-
-/// Compact protocol implementation for Thrift.
-///
-/// Use of fixnum library is required due to bugs like
-/// https://github.com/dart-lang/sdk/issues/15361
-///
-/// Adapted from the Java version.
-class TCompactProtocol extends TProtocol {
-  static const int PROTOCOL_ID = 0x82;
-  static const int VERSION = 1;
-  static const int VERSION_MASK = 0x1f;
-  static const int TYPE_MASK = 0xE0;
-  static const int TYPE_BITS = 0x07;
-  static const int TYPE_SHIFT_AMOUNT = 5;
-  static final TField TSTOP = new TField("", TType.STOP, 0);
-
-  static const int TYPE_BOOLEAN_TRUE = 0x01;
-  static const int TYPE_BOOLEAN_FALSE = 0x02;
-  static const int TYPE_BYTE = 0x03;
-  static const int TYPE_I16 = 0x04;
-  static const int TYPE_I32 = 0x05;
-  static const int TYPE_I64 = 0x06;
-  static const int TYPE_DOUBLE = 0x07;
-  static const int TYPE_BINARY = 0x08;
-  static const int TYPE_LIST = 0x09;
-  static const int TYPE_SET = 0x0A;
-  static const int TYPE_MAP = 0x0B;
-  static const int TYPE_STRUCT = 0x0C;
-
-  static final List<int> _typeMap = new List.unmodifiable(new List(16)
-    ..[TType.STOP] = TType.STOP
-    ..[TType.BOOL] = TYPE_BOOLEAN_TRUE
-    ..[TType.BYTE] = TYPE_BYTE
-    ..[TType.I16] = TYPE_I16
-    ..[TType.I32] = TYPE_I32
-    ..[TType.I64] = TYPE_I64
-    ..[TType.DOUBLE] = TYPE_DOUBLE
-    ..[TType.STRING] = TYPE_BINARY
-    ..[TType.LIST] = TYPE_LIST
-    ..[TType.SET] = TYPE_SET
-    ..[TType.MAP] = TYPE_MAP
-    ..[TType.STRUCT] = TYPE_STRUCT);
-
-  static const Utf8Codec _utf8Codec = const Utf8Codec();
-
-  // Pretend this is a stack
-  DoubleLinkedQueue<int> _lastField = new DoubleLinkedQueue<int>();
-  int _lastFieldId = 0;
-
-  TField _booleanField = null;
-  bool _boolValue = null;
-
-  final Uint8List tempList = new Uint8List(10);
-  final ByteData tempBD = new ByteData(10);
-
-  TCompactProtocol(TTransport transport) : super(transport);
-
-  /// Write
-  void writeMessageBegin(TMessage message) {
-    writeByte(PROTOCOL_ID);
-    writeByte((VERSION & VERSION_MASK) |
-        ((message.type << TYPE_SHIFT_AMOUNT) & TYPE_MASK));
-    _writeVarInt32(new Int32(message.seqid));
-    writeString(message.name);
-  }
-
-  void writeMessageEnd() {}
-
-  void writeStructBegin(TStruct struct) {
-    _lastField.addLast(_lastFieldId);
-    _lastFieldId = 0;
-  }
-
-  void writeStructEnd() {
-    _lastFieldId = _lastField.removeLast();
-  }
-
-  void writeFieldBegin(TField field) {
-    if (field.type == TType.BOOL) {
-      _booleanField = field;
-    } else {
-      _writeFieldBegin(field, -1);
-    }
-  }
-
-  void _writeFieldBegin(TField field, int typeOverride) {
-    int typeToWrite =
-        typeOverride == -1 ? _getCompactType(field.type) : typeOverride;
-
-    if (field.id > _lastFieldId && field.id - _lastFieldId <= 15) {
-      writeByte((field.id - _lastFieldId) << 4 | typeToWrite);
-    } else {
-      writeByte(typeToWrite);
-      writeI16(field.id);
-    }
-
-    _lastFieldId = field.id;
-  }
-
-  void writeFieldEnd() {}
-
-  void writeFieldStop() {
-    writeByte(TType.STOP);
-  }
-
-  void writeMapBegin(TMap map) {
-    if (map.length == 0) {
-      writeByte(0);
-    } else {
-      _writeVarInt32(new Int32(map.length));
-      writeByte(
-          _getCompactType(map.keyType) << 4 | _getCompactType(map.valueType));
-    }
-  }
-
-  void writeMapEnd() {}
-
-  void writeListBegin(TList list) {
-    _writeCollectionBegin(list.elementType, list.length);
-  }
-
-  void writeListEnd() {}
-
-  void writeSetBegin(TSet set) {
-    _writeCollectionBegin(set.elementType, set.length);
-  }
-
-  void writeSetEnd() {}
-
-  void writeBool(bool b) {
-    if (b == null) b = false;
-    if (_booleanField != null) {
-      _writeFieldBegin(
-          _booleanField, b ? TYPE_BOOLEAN_TRUE : TYPE_BOOLEAN_FALSE);
-      _booleanField = null;
-    } else {
-      writeByte(b ? TYPE_BOOLEAN_TRUE : TYPE_BOOLEAN_FALSE);
-    }
-  }
-
-  void writeByte(int b) {
-    if (b == null) b = 0;
-    tempList[0] = b;
-    transport.write(tempList, 0, 1);
-  }
-
-  void writeI16(int i16) {
-    if (i16 == null) i16 = 0;
-    _writeVarInt32(_int32ToZigZag(new Int32(i16)));
-  }
-
-  void writeI32(int i32) {
-    if (i32 == null) i32 = 0;
-    _writeVarInt32(_int32ToZigZag(new Int32(i32)));
-  }
-
-  void writeI64(int i64) {
-    if (i64 == null) i64 = 0;
-    _writeVarInt64(_int64ToZigZag(new Int64(i64)));
-  }
-
-  void writeDouble(double d) {
-    if (d == null) d = 0.0;
-    tempBD.setFloat64(0, d, Endianness.LITTLE_ENDIAN);
-    transport.write(tempBD.buffer.asUint8List(), 0, 8);
-  }
-
-  void writeString(String str) {
-    Uint8List bytes =
-        str != null ? _utf8Codec.encode(str) : new Uint8List.fromList([]);
-    writeBinary(bytes);
-  }
-
-  void writeBinary(Uint8List bytes) {
-    _writeVarInt32(new Int32(bytes.length));
-    transport.write(bytes, 0, bytes.length);
-  }
-
-  void _writeVarInt32(Int32 n) {
-    int idx = 0;
-    while (true) {
-      if ((n & ~0x7F) == 0) {
-        tempList[idx++] = (n & 0xFF).toInt();
-        break;
-      } else {
-        tempList[idx++] = (((n & 0x7F) | 0x80) & 0xFF).toInt();
-        n = n.shiftRightUnsigned(7);
-      }
-    }
-    transport.write(tempList, 0, idx);
-  }
-
-  void _writeVarInt64(Int64 n) {
-    int idx = 0;
-    while (true) {
-      if ((n & ~0x7F) == 0) {
-        tempList[idx++] = (n & 0xFF).toInt();
-        break;
-      } else {
-        tempList[idx++] = (((n & 0x7F) | 0x80) & 0xFF).toInt();
-        n = n.shiftRightUnsigned(7);
-      }
-    }
-    transport.write(tempList, 0, idx);
-  }
-
-  void _writeCollectionBegin(int elemType, int length) {
-    if (length <= 14) {
-      writeByte(length << 4 | _getCompactType(elemType));
-    } else {
-      writeByte(0xF0 | _getCompactType(elemType));
-      _writeVarInt32(new Int32(length));
-    }
-  }
-
-  Int32 _int32ToZigZag(Int32 n) {
-    return (n << 1) ^ (n >> 31);
-  }
-
-  Int64 _int64ToZigZag(Int64 n) {
-    return (n << 1) ^ (n >> 63);
-  }
-
-  /// Read
-  TMessage readMessageBegin() {
-    int protocolId = readByte();
-    if (protocolId != PROTOCOL_ID) {
-      throw new TProtocolError(TProtocolErrorType.BAD_VERSION,
-          'Expected protocol id $PROTOCOL_ID but got $protocolId');
-    }
-    int versionAndType = readByte();
-    int version = versionAndType & VERSION_MASK;
-    if (version != VERSION) {
-      throw new TProtocolError(TProtocolErrorType.BAD_VERSION,
-          'Expected version $VERSION but got $version');
-    }
-    int type = (versionAndType >> TYPE_SHIFT_AMOUNT) & TYPE_BITS;
-    int seqId = _readVarInt32().toInt();
-    String messageName = readString();
-    return new TMessage(messageName, type, seqId);
-  }
-
-  void readMessageEnd() {}
-
-  TStruct readStructBegin() {
-    _lastField.addLast(_lastFieldId);
-    _lastFieldId = 0;
-    // TODO make this a constant?
-    return new TStruct();
-  }
-
-  void readStructEnd() {
-    _lastFieldId = _lastField.removeLast();
-  }
-
-  TField readFieldBegin() {
-    int type = readByte();
-    if (type == TType.STOP) {
-      return TSTOP;
-    }
-
-    int fieldId;
-    int modifier = (type & 0xF0) >> 4;
-    if (modifier == 0) {
-      fieldId = readI16();
-    } else {
-      fieldId = _lastFieldId + modifier;
-    }
-
-    TField field = new TField('', _getTType(type & 0x0F), fieldId);
-    if (_isBoolType(type)) {
-      _boolValue = (type & 0x0F) == TYPE_BOOLEAN_TRUE;
-    }
-
-    _lastFieldId = field.id;
-    return field;
-  }
-
-  void readFieldEnd() {}
-
-  TMap readMapBegin() {
-    int length = _readVarInt32().toInt();
-    _checkNegReadLength(length);
-
-    int keyAndValueType = length == 0 ? 0 : readByte();
-    int keyType = _getTType(keyAndValueType >> 4);
-    int valueType = _getTType(keyAndValueType & 0x0F);
-    return new TMap(keyType, valueType, length);
-  }
-
-  void readMapEnd() {}
-
-  TList readListBegin() {
-    int lengthAndType = readByte();
-    int length = (lengthAndType >> 4) & 0x0F;
-    if (length == 15) {
-      length = _readVarInt32().toInt();
-    }
-    _checkNegReadLength(length);
-    int type = _getTType(lengthAndType);
-    return new TList(type, length);
-  }
-
-  void readListEnd() {}
-
-  TSet readSetBegin() {
-    TList tlist = readListBegin();
-    return new TSet(tlist.elementType, tlist.length);
-  }
-
-  void readSetEnd() {}
-
-  bool readBool() {
-    if (_boolValue != null) {
-      bool result = _boolValue;
-      _boolValue = null;
-      return result;
-    }
-    return readByte() == TYPE_BOOLEAN_TRUE;
-  }
-
-  int readByte() {
-    transport.readAll(tempList, 0, 1);
-    return tempList.buffer.asByteData().getUint8(0);
-  }
-
-  int readI16() {
-    return _zigzagToInt32(_readVarInt32()).toInt();
-  }
-
-  int readI32() {
-    return _zigzagToInt32(_readVarInt32()).toInt();
-  }
-
-  int readI64() {
-    return _zigzagToInt64(_readVarInt64()).toInt();
-  }
-
-  double readDouble() {
-    transport.readAll(tempList, 0, 8);
-    return tempList.buffer.asByteData().getFloat64(0, Endianness.LITTLE_ENDIAN);
-  }
-
-  String readString() {
-    int length = _readVarInt32().toInt();
-    _checkNegReadLength(length);
-
-    // TODO look at using temp for small strings?
-    Uint8List buff = new Uint8List(length);
-    transport.readAll(buff, 0, length);
-    return _utf8Codec.decode(buff);
-  }
-
-  Uint8List readBinary() {
-    int length = _readVarInt32().toInt();
-    _checkNegReadLength(length);
-
-    Uint8List buff = new Uint8List(length);
-    transport.readAll(buff, 0, length);
-    return buff;
-  }
-
-  Int32 _readVarInt32() {
-    Int32 result = Int32.ZERO;
-    int shift = 0;
-    while (true) {
-      Int32 b = new Int32(readByte());
-      result |= (b & 0x7f) << shift;
-      if ((b & 0x80) != 0x80) break;
-      shift += 7;
-    }
-    return result;
-  }
-
-  Int64 _readVarInt64() {
-    Int64 result = Int64.ZERO;
-    int shift = 0;
-    while (true) {
-      Int64 b = new Int64(readByte());
-      result |= (b & 0x7f) << shift;
-      if ((b & 0x80) != 0x80) break;
-      shift += 7;
-    }
-    return result;
-  }
-
-  Int32 _zigzagToInt32(Int32 n) {
-    return (n.shiftRightUnsigned(1)) ^ -(n & 1);
-  }
-
-  Int64 _zigzagToInt64(Int64 n) {
-    return (n.shiftRightUnsigned(1)) ^ -(n & 1);
-  }
-
-  void _checkNegReadLength(int length) {
-    if (length < 0) {
-      throw new TProtocolError(
-          TProtocolErrorType.NEGATIVE_SIZE, 'Negative length: $length');
-    }
-  }
-
-  int _getCompactType(int ttype) {
-    return _typeMap[ttype];
-  }
-
-  int _getTType(int type) {
-    switch (type & 0x0F) {
-      case TType.STOP:
-        return TType.STOP;
-      case TYPE_BOOLEAN_FALSE:
-      case TYPE_BOOLEAN_TRUE:
-        return TType.BOOL;
-      case TYPE_BYTE:
-        return TType.BYTE;
-      case TYPE_I16:
-        return TType.I16;
-      case TYPE_I32:
-        return TType.I32;
-      case TYPE_I64:
-        return TType.I64;
-      case TYPE_DOUBLE:
-        return TType.DOUBLE;
-      case TYPE_BINARY:
-        return TType.STRING;
-      case TYPE_LIST:
-        return TType.LIST;
-      case TYPE_SET:
-        return TType.SET;
-      case TYPE_MAP:
-        return TType.MAP;
-      case TYPE_STRUCT:
-        return TType.STRUCT;
-      default:
-        throw new TProtocolError(
-            TProtocolErrorType.INVALID_DATA, "Unknown type: ${type & 0x0F}");
-    }
-  }
-
-  bool _isBoolType(int b) {
-    int lowerNibble = b & 0x0F;
-    return lowerNibble == TYPE_BOOLEAN_TRUE ||
-        lowerNibble == TYPE_BOOLEAN_FALSE;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_field.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_field.dart
deleted file mode 100644
index 444b4e5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_field.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TField {
-  final String name;
-  final int type;
-  final int id;
-
-  TField(this.name, this.type, this.id);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_json_protocol.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_json_protocol.dart
deleted file mode 100644
index 7fbb7c4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_json_protocol.dart
+++ /dev/null
@@ -1,784 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TJsonProtocolFactory implements TProtocolFactory<TJsonProtocol> {
-  TJsonProtocol getProtocol(TTransport transport) {
-    return new TJsonProtocol(transport);
-  }
-}
-
-/// JSON protocol implementation for Thrift.
-///
-/// Adapted from the C# version.
-class TJsonProtocol extends TProtocol {
-  static const int VERSION_1 = 1;
-
-  static const Utf8Codec utf8Codec = const Utf8Codec();
-
-  _BaseContext _context;
-  _BaseContext _rootContext;
-  _LookaheadReader _reader;
-
-  final List<_BaseContext> _contextStack = [];
-  final Uint8List _tempBuffer = new Uint8List(4);
-
-  TJsonProtocol(TTransport transport) : super(transport) {
-    _rootContext = new _BaseContext(this);
-    _reader = new _LookaheadReader(this);
-    _resetContext();
-  }
-
-  void _pushContext(_BaseContext c) {
-    _contextStack.add(c);
-    _context = c;
-  }
-
-  void _popContext() {
-    _contextStack.removeLast();
-    _context = _contextStack.isEmpty ? _rootContext : _contextStack.last;
-  }
-
-  void _resetContext() {
-    _contextStack.clear();
-    _context = _rootContext;
-  }
-
-  /// Read a byte that must match [char]; otherwise throw a [TProtocolError].
-  void _readJsonSyntaxChar(int charByte) {
-    int byte = _reader.read();
-    if (byte != charByte) {
-      throw new TProtocolError(TProtocolErrorType.INVALID_DATA,
-          "Expected character ${new String.fromCharCode(charByte)} but found: ${new String.fromCharCode(byte)}");
-    }
-  }
-
-  int _hexVal(int byte) {
-    if (byte >= _Constants.HEX_0_BYTES[0] &&
-        byte <= _Constants.HEX_9_BYTES[0]) {
-      return byte - _Constants.HEX_0_BYTES[0];
-    } else if (byte >= _Constants.HEX_A_BYTES[0] &&
-        byte <= _Constants.HEX_F_BYTES[0]) {
-      byte += 10;
-      return byte - _Constants.HEX_A_BYTES[0];
-    } else {
-      throw new TProtocolError(
-          TProtocolErrorType.INVALID_DATA, "Expected hex character");
-    }
-  }
-
-  int _hexChar(int byte) => byte.toRadixString(16).codeUnitAt(0);
-
-  /// write
-
-  /// Write the [bytes] as JSON characters, escaping as needed.
-  void _writeJsonString(Uint8List bytes) {
-    _context.write();
-    transport.writeAll(_Constants.QUOTE_BYTES);
-
-    int length = bytes.length;
-    for (int i = 0; i < length; i++) {
-      int byte = bytes[i];
-      if ((byte & 0x00FF) >= 0x30) {
-        if (byte == _Constants.BACKSLASH_BYTES[0]) {
-          transport.writeAll(_Constants.BACKSLASH_BYTES);
-          transport.writeAll(_Constants.BACKSLASH_BYTES);
-        } else {
-          transport.write(bytes, i, 1);
-        }
-      } else {
-        _tempBuffer[0] = _Constants.JSON_CHAR_TABLE[byte];
-        if (_tempBuffer[0] == 1) {
-          transport.write(bytes, i, 1);
-        } else if (_tempBuffer[0] > 1) {
-          transport.writeAll(_Constants.BACKSLASH_BYTES);
-          transport.write(_tempBuffer, 0, 1);
-        } else {
-          transport.writeAll(_Constants.ESCSEQ_BYTES);
-          _tempBuffer[0] = _hexChar(byte >> 4);
-          _tempBuffer[1] = _hexChar(byte);
-          transport.write(_tempBuffer, 0, 2);
-        }
-      }
-    }
-
-    transport.writeAll(_Constants.QUOTE_BYTES);
-  }
-
-  void _writeJsonInteger(int i) {
-    if (i == null) i = 0;
-
-    _context.write();
-    String str = i.toString();
-
-    if (_context.escapeNumbers) {
-      transport.writeAll(_Constants.QUOTE_BYTES);
-    }
-    transport.writeAll(utf8Codec.encode(str));
-    if (_context.escapeNumbers) {
-      transport.writeAll(_Constants.QUOTE_BYTES);
-    }
-  }
-
-  void _writeJsonDouble(double d) {
-    if (d == null) d = 0.0;
-
-    _context.write();
-    String str = d.toString();
-    bool escapeNumbers = d.isNaN || d.isInfinite || _context.escapeNumbers;
-
-    if (escapeNumbers) {
-      transport.writeAll(_Constants.QUOTE_BYTES);
-    }
-    transport.writeAll(utf8Codec.encode(str));
-    if (escapeNumbers) {
-      transport.writeAll(_Constants.QUOTE_BYTES);
-    }
-  }
-
-  void _writeJsonBase64(Uint8List bytes) {
-    _context.write();
-    transport.writeAll(_Constants.QUOTE_BYTES);
-
-    String base64 = BASE64.encode(bytes);
-    transport.writeAll(utf8Codec.encode(base64));
-
-    transport.writeAll(_Constants.QUOTE_BYTES);
-  }
-
-  void _writeJsonObjectStart() {
-    _context.write();
-    transport.writeAll(_Constants.LBRACE_BYTES);
-    _pushContext(new _PairContext(this));
-  }
-
-  void _writeJsonObjectEnd() {
-    _popContext();
-    transport.writeAll(_Constants.RBRACE_BYTES);
-  }
-
-  void _writeJsonArrayStart() {
-    _context.write();
-    transport.writeAll(_Constants.LBRACKET_BYTES);
-    _pushContext(new _ListContext(this));
-  }
-
-  void _writeJsonArrayEnd() {
-    _popContext();
-    transport.writeAll(_Constants.RBRACKET_BYTES);
-  }
-
-  void writeMessageBegin(TMessage message) {
-    _resetContext();
-
-    _writeJsonArrayStart();
-    _writeJsonInteger(VERSION_1);
-
-    _writeJsonString(utf8Codec.encode(message.name));
-    _writeJsonInteger(message.type);
-    _writeJsonInteger(message.seqid);
-  }
-
-  void writeMessageEnd() {
-    _writeJsonArrayEnd();
-  }
-
-  void writeStructBegin(TStruct struct) {
-    _writeJsonObjectStart();
-  }
-
-  void writeStructEnd() {
-    _writeJsonObjectEnd();
-  }
-
-  void writeFieldBegin(TField field) {
-    _writeJsonInteger(field.id);
-    _writeJsonObjectStart();
-    _writeJsonString(_Constants.getTypeNameBytesForTypeId(field.type));
-  }
-
-  void writeFieldEnd() {
-    _writeJsonObjectEnd();
-  }
-
-  void writeFieldStop() {}
-
-  void writeMapBegin(TMap map) {
-    _writeJsonArrayStart();
-    _writeJsonString(_Constants.getTypeNameBytesForTypeId(map.keyType));
-    _writeJsonString(_Constants.getTypeNameBytesForTypeId(map.valueType));
-    _writeJsonInteger(map.length);
-    _writeJsonObjectStart();
-  }
-
-  void writeMapEnd() {
-    _writeJsonObjectEnd();
-    _writeJsonArrayEnd();
-  }
-
-  void writeListBegin(TList list) {
-    _writeJsonArrayStart();
-    _writeJsonString(_Constants.getTypeNameBytesForTypeId(list.elementType));
-    _writeJsonInteger(list.length);
-  }
-
-  void writeListEnd() {
-    _writeJsonArrayEnd();
-  }
-
-  void writeSetBegin(TSet set) {
-    _writeJsonArrayStart();
-    _writeJsonString(_Constants.getTypeNameBytesForTypeId(set.elementType));
-    _writeJsonInteger(set.length);
-  }
-
-  void writeSetEnd() {
-    _writeJsonArrayEnd();
-  }
-
-  void writeBool(bool b) {
-    if (b == null) b = false;
-    _writeJsonInteger(b ? 1 : 0);
-  }
-
-  void writeByte(int b) {
-    _writeJsonInteger(b);
-  }
-
-  void writeI16(int i16) {
-    _writeJsonInteger(i16);
-  }
-
-  void writeI32(int i32) {
-    _writeJsonInteger(i32);
-  }
-
-  void writeI64(int i64) {
-    _writeJsonInteger(i64);
-  }
-
-  void writeDouble(double d) {
-    _writeJsonDouble(d);
-  }
-
-  void writeString(String s) {
-    var bytes = s != null ? utf8Codec.encode(s) : new Uint8List.fromList([]);
-    _writeJsonString(bytes);
-  }
-
-  void writeBinary(Uint8List bytes) {
-    _writeJsonBase64(bytes);
-  }
-
-  bool _isHighSurrogate(int b) => b >= 0xD800 && b <= 0xDBFF;
-
-  bool _isLowSurrogate(int b) => b >= 0xDC00 && b <= 0xDFFF;
-
-  /// read
-
-  Uint8List _readJsonString({bool skipContext: false}) {
-    List<int> bytes = [];
-    List<int> codeunits = [];
-
-    if (!skipContext) {
-      _context.read();
-    }
-
-    _readJsonSyntaxChar(_Constants.QUOTE_BYTES[0]);
-    while (true) {
-      int byte = _reader.read();
-      if (byte == _Constants.QUOTE_BYTES[0]) {
-        break;
-      }
-
-      // escaped?
-      if (byte != _Constants.ESCSEQ_BYTES[0]) {
-        bytes.add(byte);
-        continue;
-      }
-
-      byte = _reader.read();
-
-      // distinguish between \uXXXX and control chars like \n
-      if (byte != _Constants.ESCSEQ_BYTES[1]) {
-        String char = new String.fromCharCode(byte);
-        int offset = _Constants.ESCAPE_CHARS.indexOf(char);
-        if (offset == -1) {
-          throw new TProtocolError(
-              TProtocolErrorType.INVALID_DATA, "Expected control char");
-        }
-        byte = _Constants.ESCAPE_CHAR_VALS.codeUnitAt(offset);
-        bytes.add(byte);
-        continue;
-      }
-
-      // it's \uXXXX
-      transport.readAll(_tempBuffer, 0, 4);
-      byte = (_hexVal(_tempBuffer[0]) << 12)
-        + (_hexVal(_tempBuffer[1]) << 8)
-        + (_hexVal(_tempBuffer[2]) << 4)
-        + _hexVal(_tempBuffer[3]);
-      if (_isHighSurrogate(byte)) {
-        if (codeunits.isNotEmpty) {
-          throw new TProtocolError(
-              TProtocolErrorType.INVALID_DATA, "Expected low surrogate");
-        }
-        codeunits.add(byte);
-      }
-      else if (_isLowSurrogate(byte)) {
-        if (codeunits.isEmpty) {
-          throw new TProtocolError(
-              TProtocolErrorType.INVALID_DATA, "Expected high surrogate");
-        }
-        codeunits.add(byte);
-        bytes.addAll(utf8Codec.encode(new String.fromCharCodes(codeunits)));
-        codeunits.clear();
-      }
-      else {
-        bytes.addAll(utf8Codec.encode(new String.fromCharCode(byte)));
-      }
-    }
-
-    if (codeunits.isNotEmpty) {
-      throw new TProtocolError(
-          TProtocolErrorType.INVALID_DATA, "Expected low surrogate");
-    }
-
-    return new Uint8List.fromList(bytes);
-  }
-
-  String _readJsonNumericChars() {
-    StringBuffer buffer = new StringBuffer();
-    while (true) {
-      if (!_Constants.isJsonNumeric(_reader.peek())) {
-        break;
-      }
-      buffer.write(new String.fromCharCode(_reader.read()));
-    }
-    return buffer.toString();
-  }
-
-  int _readJsonInteger() {
-    _context.read();
-
-    if (_context.escapeNumbers) {
-      _readJsonSyntaxChar(_Constants.QUOTE_BYTES[0]);
-    }
-    String str = _readJsonNumericChars();
-    if (_context.escapeNumbers) {
-      _readJsonSyntaxChar(_Constants.QUOTE_BYTES[0]);
-    }
-
-    try {
-      return int.parse(str);
-    } on FormatException catch (_) {
-      throw new TProtocolError(TProtocolErrorType.INVALID_DATA,
-          "Bad data encounted in numeric data");
-    }
-  }
-
-  double _readJsonDouble() {
-    _context.read();
-
-    if (_reader.peek() == _Constants.QUOTE_BYTES[0]) {
-      Uint8List bytes = _readJsonString(skipContext: true);
-      double d = double.parse(utf8Codec.decode(bytes), (_) {
-        throw new TProtocolError(TProtocolErrorType.INVALID_DATA,
-            "Bad data encounted in numeric data");
-      });
-      if (!_context.escapeNumbers && !d.isNaN && !d.isInfinite) {
-        throw new TProtocolError(TProtocolErrorType.INVALID_DATA,
-            "Numeric data unexpectedly quoted");
-      }
-      return d;
-    } else {
-      if (_context.escapeNumbers) {
-        // This will throw - we should have had a quote if escapeNumbers == true
-        _readJsonSyntaxChar(_Constants.QUOTE_BYTES[0]);
-      }
-      return double.parse(_readJsonNumericChars(), (_) {
-        throw new TProtocolError(TProtocolErrorType.INVALID_DATA,
-            "Bad data encounted in numeric data");
-      });
-    }
-  }
-
-  Uint8List _readJsonBase64() {
-    // convert UTF-8 bytes of a Base 64 encoded string to binary bytes
-    Uint8List base64Bytes = _readJsonString();
-    String base64 = utf8Codec.decode(base64Bytes);
-
-    return new Uint8List.fromList(BASE64.decode(base64));
-  }
-
-  void _readJsonObjectStart() {
-    _context.read();
-    _readJsonSyntaxChar(_Constants.LBRACE_BYTES[0]);
-    _pushContext(new _PairContext(this));
-  }
-
-  void _readJsonObjectEnd() {
-    _readJsonSyntaxChar(_Constants.RBRACE_BYTES[0]);
-    _popContext();
-  }
-
-  void _readJsonArrayStart() {
-    _context.read();
-    _readJsonSyntaxChar(_Constants.LBRACKET_BYTES[0]);
-    _pushContext(new _ListContext(this));
-  }
-
-  void _readJsonArrayEnd() {
-    _readJsonSyntaxChar(_Constants.RBRACKET_BYTES[0]);
-    _popContext();
-  }
-
-  TMessage readMessageBegin() {
-    _resetContext();
-
-    _readJsonArrayStart();
-    if (_readJsonInteger() != VERSION_1) {
-      throw new TProtocolError(
-          TProtocolErrorType.BAD_VERSION, "Message contained bad version.");
-    }
-
-    Uint8List buffer = _readJsonString();
-    String name = utf8Codec.decode(buffer);
-    int type = _readJsonInteger();
-    int seqid = _readJsonInteger();
-
-    return new TMessage(name, type, seqid);
-  }
-
-  void readMessageEnd() {
-    _readJsonArrayEnd();
-  }
-
-  TStruct readStructBegin() {
-    _readJsonObjectStart();
-    return new TStruct();
-  }
-
-  void readStructEnd() {
-    _readJsonObjectEnd();
-  }
-
-  TField readFieldBegin() {
-    String name = "";
-    int type = TType.STOP;
-    int id = 0;
-
-    if (_reader.peek() != _Constants.RBRACE_BYTES[0]) {
-      id = _readJsonInteger();
-      _readJsonObjectStart();
-      type = _Constants.getTypeIdForTypeName(_readJsonString());
-    }
-
-    return new TField(name, type, id);
-  }
-
-  void readFieldEnd() {
-    _readJsonObjectEnd();
-  }
-
-  TMap readMapBegin() {
-    _readJsonArrayStart();
-    int keyType = _Constants.getTypeIdForTypeName(_readJsonString());
-    int valueType = _Constants.getTypeIdForTypeName(_readJsonString());
-    int length = _readJsonInteger();
-    _readJsonObjectStart();
-
-    return new TMap(keyType, valueType, length);
-  }
-
-  void readMapEnd() {
-    _readJsonObjectEnd();
-    _readJsonArrayEnd();
-  }
-
-  TList readListBegin() {
-    _readJsonArrayStart();
-    int elementType = _Constants.getTypeIdForTypeName(_readJsonString());
-    int length = _readJsonInteger();
-
-    return new TList(elementType, length);
-  }
-
-  void readListEnd() {
-    _readJsonArrayEnd();
-  }
-
-  TSet readSetBegin() {
-    _readJsonArrayStart();
-    int elementType = _Constants.getTypeIdForTypeName(_readJsonString());
-    int length = _readJsonInteger();
-
-    return new TSet(elementType, length);
-  }
-
-  void readSetEnd() {
-    _readJsonArrayEnd();
-  }
-
-  bool readBool() {
-    return _readJsonInteger() == 0 ? false : true;
-  }
-
-  int readByte() {
-    return _readJsonInteger();
-  }
-
-  int readI16() {
-    return _readJsonInteger();
-  }
-
-  int readI32() {
-    return _readJsonInteger();
-  }
-
-  int readI64() {
-    return _readJsonInteger();
-  }
-
-  double readDouble() {
-    return _readJsonDouble();
-  }
-
-  String readString() {
-    return utf8Codec.decode(_readJsonString());
-  }
-
-  Uint8List readBinary() {
-    return new Uint8List.fromList(_readJsonBase64());
-  }
-}
-
-class _Constants {
-  static const utf8codec = const Utf8Codec();
-
-  static final Uint8List HEX_0_BYTES = new Uint8List.fromList('0'.codeUnits);
-  static final Uint8List HEX_9_BYTES = new Uint8List.fromList('9'.codeUnits);
-  static final Uint8List HEX_A_BYTES = new Uint8List.fromList('a'.codeUnits);
-  static final Uint8List HEX_F_BYTES = new Uint8List.fromList('f'.codeUnits);
-  static final Uint8List COMMA_BYTES = new Uint8List.fromList(','.codeUnits);
-  static final Uint8List COLON_BYTES = new Uint8List.fromList(':'.codeUnits);
-  static final Uint8List LBRACE_BYTES = new Uint8List.fromList('{'.codeUnits);
-  static final Uint8List RBRACE_BYTES = new Uint8List.fromList('}'.codeUnits);
-  static final Uint8List LBRACKET_BYTES = new Uint8List.fromList('['.codeUnits);
-  static final Uint8List RBRACKET_BYTES = new Uint8List.fromList(']'.codeUnits);
-  static final Uint8List QUOTE_BYTES = new Uint8List.fromList('"'.codeUnits);
-  static final Uint8List BACKSLASH_BYTES =
-      new Uint8List.fromList(r'\'.codeUnits);
-
-  static final ESCSEQ_BYTES = new Uint8List.fromList(r'\u00'.codeUnits);
-
-  static final Uint8List JSON_CHAR_TABLE = new Uint8List.fromList([
-    0, 0, 0, 0, 0, 0, 0, 0, // 8 bytes
-    'b'.codeUnitAt(0), 't'.codeUnitAt(0), 'n'.codeUnitAt(0), 0, // 4 bytes
-    'f'.codeUnitAt(0), 'r'.codeUnitAt(0), 0, 0, // 4 bytes
-    0, 0, 0, 0, 0, 0, 0, 0, // 8 bytes
-    0, 0, 0, 0, 0, 0, 0, 0, // 8 bytes
-    1, 1, '"'.codeUnitAt(0), 1, 1, 1, 1, 1, // 8 bytes
-    1, 1, 1, 1, 1, 1, 1, 1 // 8 bytes
-  ]);
-
-  static const String ESCAPE_CHARS = r'"\/bfnrt';
-  static const String ESCAPE_CHAR_VALS = '"\\/\b\f\n\r\t';
-
-  static const String NAME_BOOL = 'tf';
-  static const String NAME_BYTE = 'i8';
-  static const String NAME_I16 = 'i16';
-  static const String NAME_I32 = 'i32';
-  static const String NAME_I64 = 'i64';
-  static const String NAME_DOUBLE = 'dbl';
-  static const String NAME_STRUCT = 'rec';
-  static const String NAME_STRING = 'str';
-  static const String NAME_MAP = 'map';
-  static const String NAME_LIST = 'lst';
-  static const String NAME_SET = 'set';
-
-  static final Map<int, Uint8List> _TYPE_ID_TO_NAME_BYTES =
-      new Map.unmodifiable({
-    TType.BOOL: new Uint8List.fromList(NAME_BOOL.codeUnits),
-    TType.BYTE: new Uint8List.fromList(NAME_BYTE.codeUnits),
-    TType.I16: new Uint8List.fromList(NAME_I16.codeUnits),
-    TType.I32: new Uint8List.fromList(NAME_I32.codeUnits),
-    TType.I64: new Uint8List.fromList(NAME_I64.codeUnits),
-    TType.DOUBLE: new Uint8List.fromList(NAME_DOUBLE.codeUnits),
-    TType.STRING: new Uint8List.fromList(NAME_STRING.codeUnits),
-    TType.STRUCT: new Uint8List.fromList(NAME_STRUCT.codeUnits),
-    TType.MAP: new Uint8List.fromList(NAME_MAP.codeUnits),
-    TType.SET: new Uint8List.fromList(NAME_SET.codeUnits),
-    TType.LIST: new Uint8List.fromList(NAME_LIST.codeUnits)
-  });
-
-  static Uint8List getTypeNameBytesForTypeId(int typeId) {
-    if (!_TYPE_ID_TO_NAME_BYTES.containsKey(typeId)) {
-      throw new TProtocolError(
-          TProtocolErrorType.NOT_IMPLEMENTED, "Unrecognized type");
-    }
-
-    return _TYPE_ID_TO_NAME_BYTES[typeId];
-  }
-
-  static final Map<String, int> _NAME_TO_TYPE_ID = new Map.unmodifiable({
-    NAME_BOOL: TType.BOOL,
-    NAME_BYTE: TType.BYTE,
-    NAME_I16: TType.I16,
-    NAME_I32: TType.I32,
-    NAME_I64: TType.I64,
-    NAME_DOUBLE: TType.DOUBLE,
-    NAME_STRING: TType.STRING,
-    NAME_STRUCT: TType.STRUCT,
-    NAME_MAP: TType.MAP,
-    NAME_SET: TType.SET,
-    NAME_LIST: TType.LIST
-  });
-
-  static int getTypeIdForTypeName(Uint8List bytes) {
-    String name = utf8codec.decode(bytes);
-    if (!_NAME_TO_TYPE_ID.containsKey(name)) {
-      throw new TProtocolError(
-          TProtocolErrorType.NOT_IMPLEMENTED, "Unrecognized type");
-    }
-
-    return _NAME_TO_TYPE_ID[name];
-  }
-
-  static final Set<int> _JSON_NUMERICS = new Set.from([
-    '+'.codeUnitAt(0),
-    '-'.codeUnitAt(0),
-    '.'.codeUnitAt(0),
-    '0'.codeUnitAt(0),
-    '1'.codeUnitAt(0),
-    '2'.codeUnitAt(0),
-    '3'.codeUnitAt(0),
-    '4'.codeUnitAt(0),
-    '5'.codeUnitAt(0),
-    '6'.codeUnitAt(0),
-    '7'.codeUnitAt(0),
-    '8'.codeUnitAt(0),
-    '9'.codeUnitAt(0),
-    'E'.codeUnitAt(0),
-    'e'.codeUnitAt(0)
-  ]);
-
-  static bool isJsonNumeric(int byte) {
-    return _JSON_NUMERICS.contains(byte);
-  }
-}
-
-class _LookaheadReader {
-  final TJsonProtocol protocol;
-
-  _LookaheadReader(this.protocol);
-
-  bool _hasData = false;
-  final Uint8List _data = new Uint8List(1);
-
-  int read() {
-    if (_hasData) {
-      _hasData = false;
-    } else {
-      protocol.transport.readAll(_data, 0, 1);
-    }
-
-    return _data[0];
-  }
-
-  int peek() {
-    if (!_hasData) {
-      protocol.transport.readAll(_data, 0, 1);
-    }
-    _hasData = true;
-
-    return _data[0];
-  }
-}
-
-class _BaseContext {
-  final TJsonProtocol protocol;
-
-  _BaseContext(this.protocol);
-
-  void write() {}
-
-  void read() {}
-
-  bool get escapeNumbers => false;
-
-  String toString() => 'BaseContext';
-}
-
-class _ListContext extends _BaseContext {
-  _ListContext(TJsonProtocol protocol) : super(protocol);
-
-  bool _first = true;
-
-  void write() {
-    if (_first) {
-      _first = false;
-    } else {
-      protocol.transport.writeAll(_Constants.COMMA_BYTES);
-    }
-  }
-
-  void read() {
-    if (_first) {
-      _first = false;
-    } else {
-      protocol._readJsonSyntaxChar(_Constants.COMMA_BYTES[0]);
-    }
-  }
-
-  String toString() => 'ListContext';
-}
-
-class _PairContext extends _BaseContext {
-  _PairContext(TJsonProtocol protocol) : super(protocol);
-
-  bool _first = true;
-  bool _colon = true;
-
-  Uint8List get symbolBytes =>
-      _colon ? _Constants.COLON_BYTES : _Constants.COMMA_BYTES;
-
-  void write() {
-    if (_first) {
-      _first = false;
-      _colon = true;
-    } else {
-      protocol.transport.writeAll(symbolBytes);
-      _colon = !_colon;
-    }
-  }
-
-  void read() {
-    if (_first) {
-      _first = false;
-      _colon = true;
-    } else {
-      protocol._readJsonSyntaxChar(symbolBytes[0]);
-      _colon = !_colon;
-    }
-  }
-
-  bool get escapeNumbers => _colon;
-
-  String toString() => 'PairContext';
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_list.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_list.dart
deleted file mode 100644
index 49f4673..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_list.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TList {
-  final int elementType;
-  final int length;
-
-  TList(this.elementType, this.length);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_map.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_map.dart
deleted file mode 100644
index efdf681..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_map.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TMap {
-  final int keyType;
-  final int valueType;
-  final int length;
-
-  TMap(this.keyType, this.valueType, this.length);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_message.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_message.dart
deleted file mode 100644
index cc7b886..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_message.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TMessageType {
-  static const int CALL = 1;
-  static const int REPLY = 2;
-  static const int EXCEPTION = 3;
-  static const int ONEWAY = 4;
-}
-
-class TMessage {
-  final String name;
-  final int type;
-  final int seqid;
-
-  TMessage(this.name, this.type, this.seqid);
-
-  String toString() => "<TMessage name: '$name' type: $type seqid: $seqid>";
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_multiplexed_protocol.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_multiplexed_protocol.dart
deleted file mode 100644
index 078a6d7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_multiplexed_protocol.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// Adapted from the C# version.
-class TMultiplexedProtocol extends TProtocolDecorator {
-  static const SEPARATOR = ':';
-
-  final String _serviceName;
-
-  TMultiplexedProtocol(TProtocol protocol, String serviceName)
-      : _serviceName = serviceName,
-        super(protocol) {
-    if (serviceName == null) {
-      throw new ArgumentError.notNull("serviceName");
-    }
-  }
-
-  void writeMessageBegin(TMessage message) {
-    if (message.type == TMessageType.CALL ||
-        message.type == TMessageType.ONEWAY) {
-      String name = _serviceName + SEPARATOR + message.name;
-      message = new TMessage(name, message.type, message.seqid);
-    }
-
-    super.writeMessageBegin(message);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol.dart
deleted file mode 100644
index f49c032..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol.dart
+++ /dev/null
@@ -1,95 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-abstract class TProtocol {
-  final TTransport transport;
-
-  TProtocol(this.transport);
-
-  /// Write
-  void writeMessageBegin(TMessage message);
-  void writeMessageEnd();
-
-  void writeStructBegin(TStruct struct);
-  void writeStructEnd();
-
-  void writeFieldBegin(TField field);
-  void writeFieldEnd();
-  void writeFieldStop();
-
-  void writeMapBegin(TMap map);
-  void writeMapEnd();
-
-  void writeListBegin(TList list);
-  void writeListEnd();
-
-  void writeSetBegin(TSet set);
-  void writeSetEnd();
-
-  void writeBool(bool b);
-
-  void writeByte(int b);
-
-  void writeI16(int i16);
-
-  void writeI32(int i32);
-
-  void writeI64(int i64);
-
-  void writeDouble(double d);
-
-  void writeString(String str);
-
-  void writeBinary(Uint8List bytes);
-
-  /// Read
-  TMessage readMessageBegin();
-  void readMessageEnd();
-
-  TStruct readStructBegin();
-  void readStructEnd();
-
-  TField readFieldBegin();
-  void readFieldEnd();
-
-  TMap readMapBegin();
-  void readMapEnd();
-
-  TList readListBegin();
-  void readListEnd();
-
-  TSet readSetBegin();
-  void readSetEnd();
-
-  bool readBool();
-
-  int readByte();
-
-  int readI16();
-
-  int readI32();
-
-  int readI64();
-
-  double readDouble();
-
-  String readString();
-
-  Uint8List readBinary();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_decorator.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_decorator.dart
deleted file mode 100644
index 9cd02f6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_decorator.dart
+++ /dev/null
@@ -1,150 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// Forward all operations to the wrapped protocol.  Used as a base class.
-///
-/// Adapted from the C# version.
-class TProtocolDecorator extends TProtocol {
-  final TProtocol _protocol;
-
-  TProtocolDecorator(TProtocol protocol)
-      : _protocol = protocol,
-        super(protocol.transport);
-
-  /// Write
-
-  void writeMessageBegin(TMessage message) {
-    _protocol.writeMessageBegin(message);
-  }
-
-  void writeMessageEnd() {
-    _protocol.writeMessageEnd();
-  }
-
-  void writeStructBegin(TStruct struct) {
-    _protocol.writeStructBegin(struct);
-  }
-
-  void writeStructEnd() {
-    _protocol.writeStructEnd();
-  }
-
-  void writeFieldBegin(TField field) {
-    _protocol.writeFieldBegin(field);
-  }
-
-  void writeFieldEnd() {
-    _protocol.writeFieldEnd();
-  }
-
-  void writeFieldStop() {
-    _protocol.writeFieldStop();
-  }
-
-  void writeMapBegin(TMap map) {
-    _protocol.writeMapBegin(map);
-  }
-
-  void writeMapEnd() {
-    _protocol.writeMapEnd();
-  }
-
-  void writeListBegin(TList list) {
-    _protocol.writeListBegin(list);
-  }
-
-  void writeListEnd() {
-    _protocol.writeListEnd();
-  }
-
-  void writeSetBegin(TSet set) {
-    _protocol.writeSetBegin(set);
-  }
-
-  void writeSetEnd() {
-    _protocol.writeSetEnd();
-  }
-
-  void writeBool(bool b) {
-    _protocol.writeBool(b);
-  }
-
-  void writeByte(int b) {
-    _protocol.writeByte(b);
-  }
-
-  void writeI16(int i16) {
-    _protocol.writeI16(i16);
-  }
-
-  void writeI32(int i32) {
-    _protocol.writeI32(i32);
-  }
-
-  void writeI64(int i64) {
-    _protocol.writeI64(i64);
-  }
-
-  void writeDouble(double d) {
-    _protocol.writeDouble(d);
-  }
-
-  void writeString(String str) {
-    _protocol.writeString(str);
-  }
-
-  void writeBinary(Uint8List bytes) {
-    _protocol.writeBinary(bytes);
-  }
-
-  /// Read
-  TMessage readMessageBegin() => _protocol.readMessageBegin();
-  void readMessageEnd() => _protocol.readMessageEnd();
-
-  TStruct readStructBegin() => _protocol.readStructBegin();
-  void readStructEnd() => _protocol.readStructEnd();
-
-  TField readFieldBegin() => _protocol.readFieldBegin();
-  void readFieldEnd() => _protocol.readFieldEnd();
-
-  TMap readMapBegin() => _protocol.readMapBegin();
-  void readMapEnd() => _protocol.readMapEnd();
-
-  TList readListBegin() => _protocol.readListBegin();
-  void readListEnd() => _protocol.readListEnd();
-
-  TSet readSetBegin() => _protocol.readSetBegin();
-  void readSetEnd() => _protocol.readSetEnd();
-
-  bool readBool() => _protocol.readBool();
-
-  int readByte() => _protocol.readByte();
-
-  int readI16() => _protocol.readI16();
-
-  int readI32() => _protocol.readI32();
-
-  int readI64() => _protocol.readI64();
-
-  double readDouble() => _protocol.readDouble();
-
-  String readString() => _protocol.readString();
-
-  Uint8List readBinary() => _protocol.readBinary();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_error.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_error.dart
deleted file mode 100644
index 456baeb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_error.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TProtocolErrorType {
-  static const int UNKNOWN = 0;
-  static const int INVALID_DATA = 1;
-  static const int NEGATIVE_SIZE = 2;
-  static const int SIZE_LIMIT = 3;
-  static const int BAD_VERSION = 4;
-  static const int NOT_IMPLEMENTED = 5;
-  static const int DEPTH_LIMIT = 6;
-}
-
-class TProtocolError extends TError {
-  TProtocolError([int type = TProtocolErrorType.UNKNOWN, String message = ""])
-      : super(type, message);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_factory.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_factory.dart
deleted file mode 100644
index 922c6cb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_factory.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-abstract class TProtocolFactory<T extends TProtocol> {
-  T getProtocol(TTransport transport);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_util.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_util.dart
deleted file mode 100644
index ad20068..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_protocol_util.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TProtocolUtil {
-  // equal to JavaScript Number.MAX_SAFE_INTEGER, 2^53 - 1
-  static const int defaultRecursionLimit = 9007199254740991;
-
-  static int maxRecursionLimit = defaultRecursionLimit;
-
-  static skip(TProtocol prot, int type) {
-    _skip(prot, type, maxRecursionLimit);
-  }
-
-  static _skip(TProtocol prot, int type, int recursionLimit) {
-    if (recursionLimit <= 0) {
-      throw new TProtocolError(
-          TProtocolErrorType.DEPTH_LIMIT, "Depth limit exceeded");
-    }
-
-    switch (type) {
-      case TType.BOOL:
-        prot.readBool();
-        break;
-
-      case TType.BYTE:
-        prot.readByte();
-        break;
-
-      case TType.I16:
-        prot.readI16();
-        break;
-
-      case TType.I32:
-        prot.readI32();
-        break;
-
-      case TType.I64:
-        prot.readI64();
-        break;
-
-      case TType.DOUBLE:
-        prot.readDouble();
-        break;
-
-      case TType.STRING:
-        prot.readBinary();
-        break;
-
-      case TType.STRUCT:
-        prot.readStructBegin();
-        while (true) {
-          TField field = prot.readFieldBegin();
-          if (field.type == TType.STOP) {
-            break;
-          }
-          _skip(prot, field.type, recursionLimit - 1);
-          prot.readFieldEnd();
-        }
-        prot.readStructEnd();
-        break;
-
-      case TType.MAP:
-        TMap map = prot.readMapBegin();
-        for (int i = 0; i < map.length; i++) {
-          _skip(prot, map.keyType, recursionLimit - 1);
-          _skip(prot, map.valueType, recursionLimit - 1);
-        }
-        prot.readMapEnd();
-        break;
-
-      case TType.SET:
-        TSet set = prot.readSetBegin();
-        for (int i = 0; i < set.length; i++) {
-          _skip(prot, set.elementType, recursionLimit - 1);
-        }
-        prot.readSetEnd();
-        break;
-
-      case TType.LIST:
-        TList list = prot.readListBegin();
-        for (int i = 0; i < list.length; i++) {
-          _skip(prot, list.elementType, recursionLimit - 1);
-        }
-        prot.readListEnd();
-        break;
-
-      default:
-        break;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_set.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_set.dart
deleted file mode 100644
index b342537..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_set.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TSet {
-  final int elementType;
-  final int length;
-
-  TSet(this.elementType, this.length);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_struct.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_struct.dart
deleted file mode 100644
index 0303f63..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_struct.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TStruct {
-  final String name;
-
-  TStruct([this.name = ""]);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_type.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_type.dart
deleted file mode 100644
index 3919d96..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/protocol/t_type.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TType {
-  static const int STOP = 0;
-  static const int VOID = 1;
-  static const int BOOL = 2;
-  static const int BYTE = 3;
-  static const int DOUBLE = 4;
-  static const int I16 = 6;
-  static const int I32 = 8;
-  static const int I64 = 10;
-  static const int STRING = 11;
-  static const int STRUCT = 12;
-  static const int MAP = 13;
-  static const int SET = 14;
-  static const int LIST = 15;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/serializer/t_deserializer.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/serializer/t_deserializer.dart
deleted file mode 100644
index ed1d139..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/serializer/t_deserializer.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TDeserializer {
-  final message = new TMessage('Deserializer', TMessageType.ONEWAY, 1);
-  TBufferedTransport transport;
-  TProtocol protocol;
-
-  TDeserializer({TProtocolFactory protocolFactory}) {
-    this.transport = new TBufferedTransport();
-    
-    if (protocolFactory == null) {
-        protocolFactory = new TBinaryProtocolFactory();
-    }
-    
-    this.protocol = protocolFactory.getProtocol(this.transport);
-  }
-
-  void read(TBase base, Uint8List data) {
-    transport.writeAll(data);
-    
-    transport.flush();
-    
-    base.read(protocol);
-  }
-
-  void readString(TBase base, String data) {
-    transport.writeAll(BASE64.decode(data));
-    
-    transport.flush();
-
-    base.read(protocol);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/serializer/t_serializer.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/serializer/t_serializer.dart
deleted file mode 100644
index 20ddb6d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/serializer/t_serializer.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TSerializer {
-  final message = new TMessage('Serializer', TMessageType.ONEWAY, 1);
-  TBufferedTransport transport;
-  TProtocol protocol;
-
-  TSerializer({TProtocolFactory protocolFactory}) {
-    this.transport = new TBufferedTransport();
-    
-    if (protocolFactory == null) {
-      protocolFactory = new TBinaryProtocolFactory();
-    }
-
-    this.protocol = protocolFactory.getProtocol(this.transport);
-  }
-
-  Uint8List write(TBase base) {
-    base.write(protocol);
-    
-    return transport.consumeWriteBuffer();
-  }
-
-  String writeString(TBase base) {
-    base.write(protocol);
-    
-    Uint8List bytes = transport.consumeWriteBuffer();
-    
-    return BASE64.encode(bytes);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_application_error.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_application_error.dart
deleted file mode 100644
index 6f8abd4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_application_error.dart
+++ /dev/null
@@ -1,104 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TApplicationErrorType {
-  static const int UNKNOWN = 0;
-  static const int UNKNOWN_METHOD = 1;
-  static const int INVALID_MESSAGE_TYPE = 2;
-  static const int WRONG_METHOD_NAME = 3;
-  static const int BAD_SEQUENCE_ID = 4;
-  static const int MISSING_RESULT = 5;
-  static const int INTERNAL_ERROR = 6;
-  static const int PROTOCOL_ERROR = 7;
-  static const int INVALID_TRANSFORM = 8;
-  static const int INVALID_PROTOCOL = 9;
-  static const int UNSUPPORTED_CLIENT_TYPE = 10;
-}
-
-class TApplicationError extends TError {
-  static final TStruct _struct = new TStruct("TApplicationError");
-  static const int MESSAGE = 1;
-  static final TField _messageField =
-      new TField("message", TType.STRING, MESSAGE);
-  static const int TYPE = 2;
-  static final TField _typeField = new TField("type", TType.I32, TYPE);
-
-  TApplicationError(
-      [int type = TApplicationErrorType.UNKNOWN, String message = ""])
-      : super(type, message);
-
-  static TApplicationError read(TProtocol iprot) {
-    TField field;
-
-    String message = null;
-    int type = TApplicationErrorType.UNKNOWN;
-
-    iprot.readStructBegin();
-    while (true) {
-      field = iprot.readFieldBegin();
-
-      if (field.type == TType.STOP) {
-        break;
-      }
-
-      switch (field.id) {
-        case MESSAGE:
-          if (field.type == TType.STRING) {
-            message = iprot.readString();
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-
-        case TYPE:
-          if (field.type == TType.I32) {
-            type = iprot.readI32();
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-
-        default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    return new TApplicationError(type, message);
-  }
-
-  write(TProtocol oprot) {
-    oprot.writeStructBegin(_struct);
-
-    if (message != null && !message.isEmpty) {
-      oprot.writeFieldBegin(_messageField);
-      oprot.writeString(message);
-      oprot.writeFieldEnd();
-    }
-
-    oprot.writeFieldBegin(_typeField);
-    oprot.writeI32(type);
-    oprot.writeFieldEnd();
-
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_base.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_base.dart
deleted file mode 100644
index d5571b6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_base.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-abstract class TBase {
-  /// Reads the TObject from the given input protocol.
-  void read(TProtocol iprot);
-
-  /// Writes the objects out to the [oprot] protocol.
-  void write(TProtocol oprot);
-
-  /// Check if a field is currently set or unset, using the [fieldId].
-  bool isSet(int fieldId);
-
-  /// Get a field's value by [fieldId]. Primitive types will be wrapped in the
-  /// appropriate "boxed" types.
-  getFieldValue(int fieldId);
-
-  /// Set a field's value by [fieldId]. Primitive types must be "boxed" in the
-  /// appropriate object wrapper type.
-  setFieldValue(int fieldId, Object value);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_error.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_error.dart
deleted file mode 100644
index 93ab732..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_error.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TError extends Error {
-  final String message;
-  final int type;
-
-  TError(this.type, this.message);
-
-  String toString() => "<TError type: $type message: '$message'>";
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_processor.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_processor.dart
deleted file mode 100644
index dcf20fb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/t_processor.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// A processor is a generic object which operates upon an input stream and
-/// writes to some output stream.
-abstract class TProcessor {
-  bool process(TProtocol input, TProtocol output);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_buffered_transport.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_buffered_transport.dart
deleted file mode 100644
index b73a30c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_buffered_transport.dart
+++ /dev/null
@@ -1,98 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// Buffered implementation of [TTransport].
-class TBufferedTransport extends TTransport {
-  final List<int> _writeBuffer = [];
-  Iterator<int> _readIterator;
-
-  Uint8List consumeWriteBuffer() {
-    Uint8List buffer = new Uint8List.fromList(_writeBuffer);
-    _writeBuffer.clear();
-    return buffer;
-  }
-
-  void _setReadBuffer(Uint8List readBuffer) {
-    _readIterator = readBuffer != null ? readBuffer.iterator : null;
-  }
-
-  void _reset({bool isOpen: false}) {
-    _isOpen = isOpen;
-    _writeBuffer.clear();
-    _readIterator = null;
-  }
-
-  bool get hasReadData => _readIterator != null;
-
-  bool _isOpen;
-  bool get isOpen => _isOpen;
-
-  Future open() async {
-    _reset(isOpen: true);
-  }
-
-  Future close() async {
-    _reset(isOpen: false);
-  }
-
-  int read(Uint8List buffer, int offset, int length) {
-    if (buffer == null) {
-      throw new ArgumentError.notNull("buffer");
-    }
-
-    if (offset + length > buffer.length) {
-      throw new ArgumentError("The range exceeds the buffer length");
-    }
-
-    if (_readIterator == null || length <= 0) {
-      return 0;
-    }
-
-    int i = 0;
-    while (i < length && _readIterator.moveNext()) {
-      buffer[offset + i] = _readIterator.current;
-      i++;
-    }
-
-    // cleanup iterator when we've reached the end
-    if (_readIterator.current == null) {
-      _readIterator = null;
-    }
-
-    return i;
-  }
-
-  void write(Uint8List buffer, int offset, int length) {
-    if (buffer == null) {
-      throw new ArgumentError.notNull("buffer");
-    }
-
-    if (offset + length > buffer.length) {
-      throw new ArgumentError("The range exceeds the buffer length");
-    }
-
-    _writeBuffer.addAll(buffer.sublist(offset, offset + length));
-  }
-
-  Future flush() {
-    _readIterator = consumeWriteBuffer().iterator;
-
-    return new Future.value();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_framed_transport.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_framed_transport.dart
deleted file mode 100644
index 80ccf2c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_framed_transport.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// Framed [TTransport].
-///
-/// Adapted from the Java Framed transport.
-class TFramedTransport extends TBufferedTransport {
-  static const int headerByteCount = 4;
-
-  final TTransport _transport;
-
-  final Uint8List headerBytes = new Uint8List(headerByteCount);
-
-  TFramedTransport(TTransport transport) : _transport = transport {
-    if (transport == null) {
-      throw new ArgumentError.notNull("transport");
-    }
-  }
-
-  bool get isOpen => _transport.isOpen;
-
-  Future open() {
-    _reset(isOpen: true);
-    return _transport.open();
-  }
-
-  Future close() {
-    _reset(isOpen: false);
-    return _transport.close();
-  }
-
-  int read(Uint8List buffer, int offset, int length) {
-    if (hasReadData) {
-      int got = super.read(buffer, offset, length);
-      if (got > 0) return got;
-    }
-
-    _readFrame();
-
-    return super.read(buffer, offset, length);
-  }
-
-  void _readFrame() {
-    _transport.readAll(headerBytes, 0, headerByteCount);
-    int size = headerBytes.buffer.asByteData().getUint32(0);
-
-    if (size < 0) {
-      throw new TTransportError(
-          TTransportErrorType.UNKNOWN, "Read a negative frame size: $size");
-    }
-
-    Uint8List buffer = new Uint8List(size);
-    _transport.readAll(buffer, 0, size);
-    _setReadBuffer(buffer);
-  }
-
-  Future flush() {
-    Uint8List buffer = consumeWriteBuffer();
-    int length = buffer.length;
-
-    headerBytes.buffer.asByteData().setUint32(0, length);
-    _transport.write(headerBytes, 0, headerByteCount);
-    _transport.write(buffer, 0, length);
-
-    return _transport.flush();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_http_transport.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_http_transport.dart
deleted file mode 100644
index aa78e9c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_http_transport.dart
+++ /dev/null
@@ -1,100 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// HTTP implementation of [TTransport].
-///
-/// For example:
-///
-///     var transport = new THttpClientTransport(new BrowserClient(),
-///         new THttpConfig(url, {'X-My-Custom-Header': 'my value'}));
-///     var protocol = new TJsonProtocol(transport);
-///     var client = new MyThriftServiceClient(protocol);
-///     var result = client.myMethod();
-///
-/// Adapted from the JS XHR HTTP transport.
-class THttpClientTransport extends TBufferedTransport {
-  final Client httpClient;
-  final THttpConfig config;
-
-  THttpClientTransport(this.httpClient, this.config) {
-    if (httpClient == null) {
-      throw new ArgumentError.notNull("httpClient");
-    }
-  }
-
-  Future close() async {
-    _reset(isOpen: false);
-    httpClient.close();
-  }
-
-  Future flush() {
-    var requestBody = BASE64.encode(consumeWriteBuffer());
-
-    // Use a sync completer to ensure that the buffer can be read immediately
-    // after the read buffer is set, and avoid a race condition where another
-    // response could overwrite the read buffer.
-    var completer = new Completer.sync();
-
-    httpClient
-        .post(config.url, headers: config.headers, body: requestBody)
-        .then((response) {
-      Uint8List data;
-      try {
-        data = new Uint8List.fromList(
-            BASE64.decode(response.body));
-      } on FormatException catch (_) {
-        throw new TProtocolError(TProtocolErrorType.INVALID_DATA,
-            "Expected a Base 64 encoded string.");
-      }
-
-      _setReadBuffer(data);
-      completer.complete();
-    });
-
-    return completer.future;
-  }
-}
-
-class THttpConfig {
-  final Uri url;
-
-  Map<String, String> _headers;
-  Map<String, String> get headers => _headers;
-
-  THttpConfig(this.url, Map<String, String> headers) {
-    if (url == null || !url.hasAuthority) {
-      throw new ArgumentError("Invalid url");
-    }
-
-    _initHeaders(headers);
-  }
-
-  void _initHeaders(Map<String, String> initial) {
-    var h = {};
-
-    if (initial != null) {
-      h.addAll(initial);
-    }
-
-    h['Content-Type'] = 'application/x-thrift';
-    h['Accept'] = 'application/x-thrift';
-
-    _headers = new Map.unmodifiable(h);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_message_reader.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_message_reader.dart
deleted file mode 100644
index 8ca0708..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_message_reader.dart
+++ /dev/null
@@ -1,99 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// [TMessageReader] extracts a [TMessage] from bytes.  This is used to allow a
-/// transport to inspect the message seqid and map responses to requests.
-class TMessageReader {
-  final TProtocolFactory protocolFactory;
-
-  final int byteOffset;
-  final _TMessageReaderTransport _transport;
-
-  /// Construct a [MessageReader].  The optional [byteOffset] specifies the
-  /// number of bytes to skip before reading the [TMessage].
-  TMessageReader(this.protocolFactory, {int byteOffset: 0})
-      : _transport = new _TMessageReaderTransport(),
-        this.byteOffset = byteOffset;
-
-  TMessage readMessage(Uint8List bytes) {
-    _transport.reset(bytes, byteOffset);
-    TProtocol protocol = protocolFactory.getProtocol(_transport);
-    TMessage message = protocol.readMessageBegin();
-    _transport.reset(null);
-
-    return message;
-  }
-}
-
-/// An internal class used to support [TMessageReader].
-class _TMessageReaderTransport extends TTransport {
-  _TMessageReaderTransport();
-
-  Iterator<int> _readIterator;
-
-  void reset(Uint8List bytes, [int offset = 0]) {
-    if (bytes == null) {
-      _readIterator = null;
-      return;
-    }
-
-    if (offset > bytes.length) {
-      throw new ArgumentError("The offset exceeds the bytes length");
-    }
-
-    _readIterator = bytes.iterator;
-
-    for (var i = 0; i < offset; i++) {
-      _readIterator.moveNext();
-    }
-  }
-
-  get isOpen => true;
-
-  Future open() => throw new UnsupportedError("Unsupported in MessageReader");
-
-  Future close() => throw new UnsupportedError("Unsupported in MessageReader");
-
-  int read(Uint8List buffer, int offset, int length) {
-    if (buffer == null) {
-      throw new ArgumentError.notNull("buffer");
-    }
-
-    if (offset + length > buffer.length) {
-      throw new ArgumentError("The range exceeds the buffer length");
-    }
-
-    if (_readIterator == null || length <= 0) {
-      return 0;
-    }
-
-    int i = 0;
-    while (i < length && _readIterator.moveNext()) {
-      buffer[offset + i] = _readIterator.current;
-      i++;
-    }
-
-    return i;
-  }
-
-  void write(Uint8List buffer, int offset, int length) =>
-      throw new UnsupportedError("Unsupported in MessageReader");
-
-  Future flush() => throw new UnsupportedError("Unsupported in MessageReader");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_socket.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_socket.dart
deleted file mode 100644
index b2eb6b6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_socket.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-enum TSocketState { CLOSED, OPEN }
-
-abstract class TSocket {
-  Stream<TSocketState> get onState;
-
-  Stream<Object> get onError;
-
-  Stream<Uint8List> get onMessage;
-
-  bool get isOpen;
-
-  bool get isClosed;
-
-  Future open();
-
-  Future close();
-
-  void send(Uint8List data);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_socket_transport.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_socket_transport.dart
deleted file mode 100644
index 8dcdfde..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_socket_transport.dart
+++ /dev/null
@@ -1,175 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// Socket implementation of [TTransport].
-///
-/// For example:
-///
-///     var transport = new TClientSocketTransport(new TWebSocket(url));
-///     var protocol = new TBinaryProtocol(transport);
-///     var client = new MyThriftServiceClient(protocol);
-///     var result = client.myMethod();
-///
-/// Adapted from the JS WebSocket transport.
-abstract class TSocketTransport extends TBufferedTransport {
-  final Logger logger = new Logger('thrift.TSocketTransport');
-
-  final TSocket socket;
-
-  /// A transport using the provided [socket].
-  TSocketTransport(this.socket) {
-    if (socket == null) {
-      throw new ArgumentError.notNull('socket');
-    }
-
-    socket.onError.listen((e) => logger.warning(e));
-    socket.onMessage.listen(handleIncomingMessage);
-  }
-
-  bool get isOpen => socket.isOpen;
-
-  Future open() {
-    _reset(isOpen: true);
-    return socket.open();
-  }
-
-  Future close() {
-    _reset(isOpen: false);
-    return socket.close();
-  }
-
-  /// Make an incoming message available to read from the transport.
-  void handleIncomingMessage(Uint8List messageBytes) {
-    _setReadBuffer(messageBytes);
-  }
-}
-
-/// [TClientSocketTransport] is a basic client socket transport.  It sends
-/// outgoing messages and expects a response.
-///
-/// NOTE: This transport expects a single threaded server, as it will process
-/// responses in FIFO order.
-class TClientSocketTransport extends TSocketTransport {
-  final List<Completer<Uint8List>> _completers = [];
-
-  TClientSocketTransport(TSocket socket) : super(socket);
-
-  Future flush() {
-    Uint8List bytes = consumeWriteBuffer();
-
-    // Use a sync completer to ensure that the buffer can be read immediately
-    // after the read buffer is set, and avoid a race condition where another
-    // response could overwrite the read buffer.
-    var completer = new Completer<Uint8List>.sync();
-    _completers.add(completer);
-
-    socket.send(bytes);
-
-    return completer.future;
-  }
-
-  void handleIncomingMessage(Uint8List messageBytes) {
-    super.handleIncomingMessage(messageBytes);
-
-    if (_completers.isNotEmpty) {
-      var completer = _completers.removeAt(0);
-      completer.complete();
-    }
-  }
-}
-
-/// [TAsyncClientSocketTransport] sends outgoing messages and expects an
-/// asynchronous response.
-///
-/// NOTE: This transport uses a [MessageReader] to read a [TMessage] when an
-/// incoming message arrives to correlate a response to a request, using the
-/// seqid.
-class TAsyncClientSocketTransport extends TSocketTransport {
-  static const defaultTimeout = const Duration(seconds: 30);
-
-  final Map<int, Completer<Uint8List>> _completers = {};
-
-  final TMessageReader messageReader;
-
-  final Duration responseTimeout;
-
-  TAsyncClientSocketTransport(TSocket socket, TMessageReader messageReader,
-      {Duration responseTimeout: defaultTimeout})
-      : this.messageReader = messageReader,
-        this.responseTimeout = responseTimeout,
-        super(socket);
-
-  Future flush() {
-    Uint8List bytes = consumeWriteBuffer();
-    TMessage message = messageReader.readMessage(bytes);
-    int seqid = message.seqid;
-
-    // Use a sync completer to ensure that the buffer can be read immediately
-    // after the read buffer is set, and avoid a race condition where another
-    // response could overwrite the read buffer.
-    var completer = new Completer<Uint8List>.sync();
-    _completers[seqid] = completer;
-
-    if (responseTimeout != null) {
-      new Future.delayed(responseTimeout, () {
-        var completer = _completers.remove(seqid);
-        if (completer != null) {
-          completer.completeError(
-              new TimeoutException("Response timed out.", responseTimeout));
-        }
-      });
-    }
-
-    socket.send(bytes);
-
-    return completer.future;
-  }
-
-  void handleIncomingMessage(Uint8List messageBytes) {
-    super.handleIncomingMessage(messageBytes);
-
-    TMessage message = messageReader.readMessage(messageBytes);
-    var completer = _completers.remove(message.seqid);
-    if (completer != null) {
-      completer.complete();
-    }
-  }
-}
-
-/// [TServerSocketTransport] listens for incoming messages.  When it sends a
-/// response, it does not expect an acknowledgement.
-class TServerSocketTransport extends TSocketTransport {
-  final StreamController _onIncomingMessageController;
-  Stream get onIncomingMessage => _onIncomingMessageController.stream;
-
-  TServerSocketTransport(TSocket socket)
-      : _onIncomingMessageController = new StreamController.broadcast(),
-        super(socket);
-
-  Future flush() async {
-    Uint8List message = consumeWriteBuffer();
-    socket.send(message);
-  }
-
-  void handleIncomingMessage(Uint8List messageBytes) {
-    super.handleIncomingMessage(messageBytes);
-
-    _onIncomingMessageController.add(null);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport.dart
deleted file mode 100644
index 563d5eb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-abstract class TTransport {
-  /// Queries whether the transport is open.
-  /// Returns [true] if the transport is open.
-  bool get isOpen;
-
-  /// Opens the transport for reading/writing.
-  /// Throws [TTransportError] if the transport could not be opened.
-  Future open();
-
-  /// Closes the transport.
-  Future close();
-
-  /// Reads up to [length] bytes into [buffer], starting at [offset].
-  /// Returns the number of bytes actually read.
-  /// Throws [TTransportError] if there was an error reading data
-  int read(Uint8List buffer, int offset, int length);
-
-  /// Guarantees that all of [length] bytes are actually read off the transport.
-  /// Returns the number of bytes actually read, which must be equal to
-  /// [length].
-  /// Throws [TTransportError] if there was an error reading data
-  int readAll(Uint8List buffer, int offset, int length) {
-    int got = 0;
-    int ret = 0;
-    while (got < length) {
-      ret = read(buffer, offset + got, length - got);
-      if (ret <= 0) {
-        throw new TTransportError(
-            TTransportErrorType.UNKNOWN,
-            "Cannot read. Remote side has closed. Tried to read $length "
-            "bytes, but only got $got bytes.");
-      }
-      got += ret;
-    }
-    return got;
-  }
-
-  /// Writes up to [len] bytes from the buffer.
-  /// Throws [TTransportError] if there was an error writing data
-  void write(Uint8List buffer, int offset, int length);
-
-  /// Writes the [bytes] to the output.
-  /// Throws [TTransportError] if there was an error writing data
-  void writeAll(Uint8List buffer) {
-    write(buffer, 0, buffer.length);
-  }
-
-  /// Flush any pending data out of a transport buffer.
-  /// Throws [TTransportError] if there was an error writing out data.
-  Future flush();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport_error.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport_error.dart
deleted file mode 100644
index d3508e0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport_error.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-class TTransportErrorType {
-  static const int UNKNOWN = 0;
-  static const int NOT_OPEN = 1;
-  static const int ALREADY_OPEN = 2;
-  static const int TIMED_OUT = 3;
-  static const int END_OF_FILE = 4;
-}
-
-class TTransportError extends TError {
-  TTransportError([int type = TTransportErrorType.UNKNOWN, String message = ""])
-      : super(type, message);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport_factory.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport_factory.dart
deleted file mode 100644
index 7a10461..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/src/transport/t_transport_factory.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-part of thrift;
-
-/// Factory class used to create wrapped instance of a [TTransport]. This is
-/// used primarily in servers.
-///
-/// Adapted from the Java version.
-class TTransportFactory {
-  Future<TTransport> getTransport(TTransport transport) =>
-      new Future.value(transport);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift.dart
deleted file mode 100644
index 3d9bb01..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift.dart
+++ /dev/null
@@ -1,64 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-library thrift;
-
-import 'dart:async';
-import 'dart:collection';
-import 'dart:convert' show Utf8Codec, BASE64;
-import 'dart:typed_data' show ByteData;
-import 'dart:typed_data' show Endianness;
-import 'dart:typed_data' show Uint8List;
-
-import 'package:fixnum/fixnum.dart';
-import 'package:http/http.dart' show Client;
-import 'package:logging/logging.dart';
-
-part 'src/t_application_error.dart';
-part 'src/t_base.dart';
-part 'src/t_error.dart';
-part 'src/t_processor.dart';
-
-part 'src/protocol/t_binary_protocol.dart';
-part 'src/protocol/t_compact_protocol.dart';
-part 'src/protocol/t_field.dart';
-part 'src/protocol/t_json_protocol.dart';
-part 'src/protocol/t_list.dart';
-part 'src/protocol/t_map.dart';
-part 'src/protocol/t_message.dart';
-part 'src/protocol/t_multiplexed_protocol.dart';
-part 'src/protocol/t_protocol.dart';
-part 'src/protocol/t_protocol_decorator.dart';
-part 'src/protocol/t_protocol_error.dart';
-part 'src/protocol/t_protocol_factory.dart';
-part 'src/protocol/t_protocol_util.dart';
-part 'src/protocol/t_set.dart';
-part 'src/protocol/t_struct.dart';
-part 'src/protocol/t_type.dart';
-
-part 'src/serializer/t_deserializer.dart';
-part 'src/serializer/t_serializer.dart';
-
-part 'src/transport/t_buffered_transport.dart';
-part 'src/transport/t_framed_transport.dart';
-part 'src/transport/t_http_transport.dart';
-part 'src/transport/t_message_reader.dart';
-part 'src/transport/t_socket.dart';
-part 'src/transport/t_transport.dart';
-part 'src/transport/t_transport_error.dart';
-part 'src/transport/t_transport_factory.dart';
-part 'src/transport/t_socket_transport.dart';
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift_browser.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift_browser.dart
deleted file mode 100644
index 2ebc257..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift_browser.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-library thrift_browser;
-
-/// Classes that are only supported in browser applications go here
-
-export 'src/browser/t_web_socket.dart' show TWebSocket;
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift_console.dart b/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift_console.dart
deleted file mode 100644
index 48a83d1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/lib/thrift_console.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-library thrift_console;
-
-/// Classes that are only supported in console applications go here
-
-export 'src/console/t_tcp_socket.dart' show TTcpSocket;
-export 'src/console/t_web_socket.dart' show TWebSocket;
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/pubspec.yaml b/vendor/git.apache.org/thrift.git/lib/dart/pubspec.yaml
deleted file mode 100644
index 782aa82..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/pubspec.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# 'License'); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: thrift
-version: 0.10.0
-description: >
-  A Dart library for Apache Thrift
-author: Apache Thrift Developers <dev@thrift.apache.org>
-homepage: http://thrift.apache.org
-documentation: http://thrift.apache.org
-
-environment:
-  sdk: ">=1.13.0 <2.0.0"
-
-dependencies:
-  fixnum: ^0.10.2
-  http: ^0.11.3
-  logging: ^0.11.0
-
-dev_dependencies:
-  # test
-  mockito: ^1.0.0
-  test: ^0.12.0
-
-  # dart_dev - https://github.com/Workiva/dart_dev
-  dart_dev: ^1.5.0
-  coverage: ^0.7.3
-  dart_style: ">=0.2.4 <0.3.0"
-  dartdoc: ^0.9.0
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/test/protocol/t_protocol_test.dart b/vendor/git.apache.org/thrift.git/lib/dart/test/protocol/t_protocol_test.dart
deleted file mode 100644
index 0e6cde5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/test/protocol/t_protocol_test.dart
+++ /dev/null
@@ -1,406 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-library thrift.test.transport.t_json_protocol_test;
-
-import 'dart:async';
-import 'dart:convert' show UTF8;
-import 'dart:typed_data' show Uint8List;
-
-import 'package:test/test.dart';
-import 'package:thrift/thrift.dart';
-
-void main() {
-  final message = new TMessage('my message', TMessageType.ONEWAY, 123);
-
-  TProtocol protocol;
-
-  Primitive getPrimitive(int tType) {
-    switch (tType) {
-      case TType.BOOL:
-        return new Primitive(protocol.readBool, protocol.writeBool, false);
-
-      case TType.BYTE:
-        return new Primitive(protocol.readByte, protocol.writeByte, 0);
-
-      case TType.I16:
-        return new Primitive(protocol.readI16, protocol.writeI16, 0);
-
-      case TType.I32:
-        return new Primitive(protocol.readI32, protocol.writeI32, 0);
-
-      case TType.I64:
-        return new Primitive(protocol.readI64, protocol.writeI64, 0);
-
-      case TType.DOUBLE:
-        return new Primitive(protocol.readDouble, protocol.writeDouble, 0);
-
-      case TType.STRING:
-        return new Primitive(protocol.readString, protocol.writeString, '');
-
-      default:
-        throw new UnsupportedError("Unsupported TType $tType");
-    }
-  }
-
-  Future primitiveTest(Primitive primitive, input) async {
-    primitive.write(input);
-    protocol.writeMessageEnd();
-
-    await protocol.transport.flush();
-
-    protocol.readMessageBegin();
-    var output = primitive.read();
-
-    expect(output, input);
-  }
-
-  Future primitiveNullTest(Primitive primitive) async {
-    primitive.write(null);
-    protocol.writeMessageEnd();
-
-    await protocol.transport.flush();
-
-    protocol.readMessageBegin();
-    var output = primitive.read();
-
-    expect(output, primitive.defaultValue);
-  }
-
-  var sharedTests = () {
-    test('Test message', () async {
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      var subject = protocol.readMessageBegin();
-
-      expect(subject.name, message.name);
-      expect(subject.type, message.type);
-      expect(subject.seqid, message.seqid);
-    });
-
-    test('Test struct', () async {
-      var input = new TStruct();
-
-      protocol.writeStructBegin(input);
-      protocol.writeStructEnd();
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      protocol.readMessageBegin();
-      var output = protocol.readStructBegin();
-
-      // name is not serialized, see C# version for reference
-      expect(output, isNotNull);
-    });
-
-    test('Test field', () async {
-      var input = new TField('my field', TType.MAP, 123);
-
-      protocol.writeFieldBegin(input);
-      protocol.writeFieldEnd();
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      protocol.readMessageBegin();
-      var output = protocol.readFieldBegin();
-
-      // name is not serialized, see C# version for reference
-      expect(output.type, input.type);
-      expect(output.id, input.id);
-    });
-
-    test('Test map', () async {
-      var input = new TMap(TType.STRING, TType.STRUCT, 123);
-
-      protocol.writeMapBegin(input);
-      protocol.writeMapEnd();
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      protocol.readMessageBegin();
-      var output = protocol.readMapBegin();
-
-      expect(output.keyType, input.keyType);
-      expect(output.valueType, input.valueType);
-      expect(output.length, input.length);
-    });
-
-    test('Test list', () async {
-      var input = new TList(TType.STRING, 123);
-
-      protocol.writeListBegin(input);
-      protocol.writeListEnd();
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      protocol.readMessageBegin();
-      var output = protocol.readListBegin();
-
-      expect(output.elementType, input.elementType);
-      expect(output.length, input.length);
-    });
-
-    test('Test set', () async {
-      var input = new TSet(TType.STRING, 123);
-
-      protocol.writeSetBegin(input);
-      protocol.writeSetEnd();
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      protocol.readMessageBegin();
-      var output = protocol.readListBegin();
-
-      expect(output.elementType, input.elementType);
-      expect(output.length, input.length);
-    });
-
-    test('Test bool', () async {
-      await primitiveTest(getPrimitive(TType.BOOL), true);
-    });
-
-    test('Test bool null', () async {
-      await primitiveNullTest(getPrimitive(TType.BOOL));
-    });
-
-    test('Test byte', () async {
-      await primitiveTest(getPrimitive(TType.BYTE), 64);
-    });
-
-    test('Test byte null', () async {
-      await primitiveNullTest(getPrimitive(TType.BYTE));
-    });
-
-    test('Test I16', () async {
-      await primitiveTest(getPrimitive(TType.I16), 32767);
-    });
-
-    test('Test I16 null', () async {
-      await primitiveNullTest(getPrimitive(TType.I16));
-    });
-
-    test('Test I32', () async {
-      await primitiveTest(getPrimitive(TType.I32), 2147483647);
-    });
-
-    test('Test I32 null', () async {
-      await primitiveNullTest(getPrimitive(TType.I32));
-    });
-
-    test('Test I64', () async {
-      await primitiveTest(getPrimitive(TType.I64), 9223372036854775807);
-    });
-
-    test('Test I64 null', () async {
-      await primitiveNullTest(getPrimitive(TType.I64));
-    });
-
-    test('Test double', () async {
-      await primitiveTest(getPrimitive(TType.DOUBLE), 3.1415926);
-    });
-
-    test('Test double null', () async {
-      await primitiveNullTest(getPrimitive(TType.DOUBLE));
-    });
-
-    test('Test string', () async {
-      var input = 'There are only two hard things in computer science: '
-          'cache invalidation, naming things, and off-by-one errors.';
-      await primitiveTest(getPrimitive(TType.STRING), input);
-    });
-
-    test('Test string null', () async {
-      await primitiveNullTest(getPrimitive(TType.STRING));
-    });
-
-    test('Test binary', () async {
-      var input = new Uint8List.fromList(new List.filled(100, 123));
-
-      protocol.writeBinary(input);
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      protocol.readMessageBegin();
-      var output = protocol.readBinary();
-
-      expect(output.length, input.length);
-      expect(output.every((i) => i == 123), isTrue);
-    });
-
-    test('Test complex struct', () async {
-      // {1: {10: 20}, 2: {30: 40}}
-      protocol.writeStructBegin(new TStruct());
-      protocol.writeFieldBegin(new TField('success', TType.MAP, 0));
-      protocol.writeMapBegin(new TMap(TType.I32, TType.MAP, 2));
-
-      protocol.writeI32(1); // key
-      protocol.writeMapBegin(new TMap(TType.I32, TType.I32, 1));
-      protocol.writeI32(10); // key
-      protocol.writeI32(20); // value
-      protocol.writeMapEnd();
-
-      protocol.writeI32(2); // key
-      protocol.writeMapBegin(new TMap(TType.I32, TType.I32, 1));
-      protocol.writeI32(30); // key
-      protocol.writeI32(40); // value
-      protocol.writeMapEnd();
-
-      protocol.writeMapEnd();
-      protocol.writeFieldEnd();
-      protocol.writeFieldStop();
-      protocol.writeStructEnd();
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      protocol.readMessageBegin();
-      protocol.readStructBegin();
-      expect(protocol.readFieldBegin().type, TType.MAP);
-      expect(protocol.readMapBegin().length, 2);
-
-      expect(protocol.readI32(), 1); // key
-      expect(protocol.readMapBegin().length, 1);
-      expect(protocol.readI32(), 10); // key
-      expect(protocol.readI32(), 20); // value
-      protocol.readMapEnd();
-
-      expect(protocol.readI32(), 2); // key
-      expect(protocol.readMapBegin().length, 1);
-      expect(protocol.readI32(), 30); // key
-      expect(protocol.readI32(), 40); // value
-      protocol.readMapEnd();
-
-      protocol.readMapEnd();
-      protocol.readFieldEnd();
-      protocol.readStructEnd();
-      protocol.readMessageEnd();
-    });
-
-    test('Test nested maps and lists', () async {
-      // {1: [{10: 20}], 2: [{30: 40}]}
-      protocol.writeMapBegin(new TMap(TType.I32, TType.LIST, 2));
-
-      protocol.writeI32(1); // key
-      protocol.writeListBegin(new TList(TType.MAP, 1));
-      protocol.writeMapBegin(new TMap(TType.I32, TType.I32, 1));
-      protocol.writeI32(10); // key
-      protocol.writeI32(20); // value
-      protocol.writeMapEnd();
-      protocol.writeListEnd();
-
-      protocol.writeI32(2); // key
-      protocol.writeListBegin(new TList(TType.MAP, 1));
-      protocol.writeMapBegin(new TMap(TType.I32, TType.I32, 1));
-      protocol.writeI32(30); // key
-      protocol.writeI32(40); // value
-      protocol.writeMapEnd();
-      protocol.writeListEnd();
-
-      protocol.writeMapEnd();
-      protocol.writeMessageEnd();
-
-      await protocol.transport.flush();
-
-      protocol.readMessageBegin();
-      expect(protocol.readMapBegin().length, 2);
-
-      expect(protocol.readI32(), 1); // key
-      expect(protocol.readListBegin().length, 1);
-      expect(protocol.readMapBegin().length, 1);
-      expect(protocol.readI32(), 10); // key
-      expect(protocol.readI32(), 20); // value
-      protocol.readMapEnd();
-      protocol.readListEnd();
-
-      expect(protocol.readI32(), 2); // key
-      expect(protocol.readListBegin().length, 1);
-      expect(protocol.readMapBegin().length, 1);
-      expect(protocol.readI32(), 30); // key
-      expect(protocol.readI32(), 40); // value
-      protocol.readMapEnd();
-      protocol.readListEnd();
-
-      protocol.readMapEnd();
-      protocol.readMessageEnd();
-    });
-  };
-
-  group('JSON', () {
-    setUp(() {
-      protocol = new TJsonProtocol(new TBufferedTransport());
-      protocol.writeMessageBegin(message);
-    });
-
-    test('Test escaped unicode', () async {
-      /*
-         KOR_KAI
-           UTF-8:  0xE0 0xB8 0x81
-           UTF-16: 0x0E01
-         G clef:
-           UTF-8:  0xF0 0x9D 0x84 0x9E
-           UTF-16: 0xD834 0xDD1E
-       */
-      var buffer = UTF8.encode(r'"\u0001\u0e01 \ud834\udd1e"');
-      var transport = new TBufferedTransport();
-      transport.writeAll(buffer);
-
-      var protocol = new TJsonProtocol(transport);
-
-      await protocol.transport.flush();
-
-      var subject = protocol.readString();
-      expect(subject,
-          UTF8.decode([0x01, 0xE0, 0xB8, 0x81, 0x20, 0xF0, 0x9D, 0x84, 0x9E]));
-    });
-
-    group('shared tests', sharedTests);
-  });
-
-  group('binary', () {
-    setUp(() {
-      protocol = new TBinaryProtocol(new TBufferedTransport());
-      protocol.writeMessageBegin(message);
-    });
-
-    group('shared tests', sharedTests);
-  });
-
-  group('compact', () {
-    setUp(() {
-      protocol = new TCompactProtocol(new TBufferedTransport());
-      protocol.writeMessageBegin(message);
-    });
-
-    group('shared tests', sharedTests);
-  });
-}
-
-class Primitive {
-  final Function read;
-  final Function write;
-  final defaultValue;
-
-  Primitive(this.read, this.write, this.defaultValue);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/test/serializer/serializer_test.dart b/vendor/git.apache.org/thrift.git/lib/dart/test/serializer/serializer_test.dart
deleted file mode 100644
index 2f76503..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/test/serializer/serializer_test.dart
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-library thrift.test.serializer.serializer_test;
-
-import 'package:test/test.dart';
-import 'package:thrift/thrift.dart';
-import 'serializer_test_data.dart';
-
-void main() {
-  var serializer = () {
-    TDeserializer deserializer;
-    TSerializer serializer;
-    TestTObject testTObject;
-
-    setUp(() {
-      serializer = new TSerializer();
-      deserializer = new TDeserializer();
-      
-      testTObject = new TestTObject();
-      testTObject.b = true;
-      testTObject.s = "TEST";
-      testTObject.d = 15.25;
-      testTObject.i = 10;
-      
-      var testList = new List<String>();
-      testList.add("TEST 1");
-      testList.add("TEST 2");
-      
-      testTObject.l = testList;
-    });
-    
-    assertNewObjectEqualsTObject(TestTObject newObject) {
-      expect(newObject.l, equals(testTObject.l));
-      expect(newObject.b, equals(testTObject.b));
-      expect(newObject.i, equals(testTObject.i));
-      expect(newObject.d, equals(testTObject.d));
-      expect(newObject.s, equals(testTObject.s));
-    }
-    
-    runWriteStringTest() {
-      var s = serializer.writeString(testTObject);
-
-      var newObject = new TestTObject();
-      deserializer.readString(newObject, s);
-
-      assertNewObjectEqualsTObject(newObject);
-    };
-
-    runWriteTest() {
-      var s = serializer.write(testTObject);
-
-      var newObject = new TestTObject();
-      deserializer.read(newObject, s);
-
-      assertNewObjectEqualsTObject(newObject);
-    };
-
-    test('JSON Protocol String', () {
-      serializer.protocol = new TJsonProtocol(serializer.transport);
-      deserializer.protocol = new TJsonProtocol(deserializer.transport);
-      
-      runWriteStringTest();
-    });
-
-    test('JSON Protocol', () {
-      serializer.protocol = new TJsonProtocol(serializer.transport);
-      deserializer.protocol = new TJsonProtocol(deserializer.transport);
-
-      runWriteTest();
-    });
-
-    test('Binary Protocol String', () {
-      serializer.protocol = new TBinaryProtocol(serializer.transport);
-      deserializer.protocol = new TBinaryProtocol(deserializer.transport);
-
-      runWriteStringTest();
-    });
-
-    test('Binary Protocol', () {
-      serializer.protocol = new TBinaryProtocol(serializer.transport);
-      deserializer.protocol = new TBinaryProtocol(deserializer.transport);
-
-      runWriteTest();
-    });
-
-    test('Compact Protocol String', () {
-      serializer.protocol = new TCompactProtocol(serializer.transport);
-      deserializer.protocol = new TCompactProtocol(deserializer.transport);
-
-      runWriteStringTest();
-    });
-
-    test('Compact Protocol', () {
-      serializer.protocol = new TCompactProtocol(serializer.transport);
-      deserializer.protocol = new TCompactProtocol(deserializer.transport);
-
-      runWriteTest();
-    });
-  };
-
-  group('Serializer', serializer);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/test/serializer/serializer_test_data.dart b/vendor/git.apache.org/thrift.git/lib/dart/test/serializer/serializer_test_data.dart
deleted file mode 100644
index 3586f08..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/test/serializer/serializer_test_data.dart
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-library thrift.test.serializer.serializer_test;
-
-import 'package:thrift/thrift.dart';
-
-/// TestTObject is a simple test struct
-class TestTObject implements TBase {
-  static final TStruct _STRUCT_DESC = new TStruct("TestTObject");
-  static final TField _I_FIELD_DESC = new TField("i", TType.I32, 1);
-  static final TField _D_FIELD_DESC = new TField("d", TType.DOUBLE, 2);
-  static final TField _S_FIELD_DESC = new TField("s", TType.STRING, 3);
-  static final TField _L_FIELD_DESC = new TField("l", TType.LIST, 4);
-  static final TField _B_FIELD_DESC = new TField("b", TType.BOOL, 5);
-
-  int _i;
-  static const int I = 1;
-  double _d;
-  static const int D = 2;
-  String _s;
-  static const int S = 3;
-  List<String> _l;
-  static const int L = 4;
-  bool _b;
-  static const int B = 5;
-
-  bool __isset_i = false;
-  bool __isset_d = false;
-  bool __isset_b = false;
-
-  TestTObject() {
-  }
-
-  // i
-  int get i => this._i;
-
-  set i(int i) {
-    this._i = i;
-    this.__isset_i = true;
-  }
-
-  bool isSetI() => this.__isset_i;
-
-  unsetI() {
-    this.__isset_i = false;
-  }
-
-  // d
-  double get d => this._d;
-
-  set d(double d) {
-    this._d = d;
-    this.__isset_d = true;
-  }
-
-  bool isSetD() => this.__isset_d;
-
-  unsetD() {
-    this.__isset_d = false;
-  }
-
-  // s
-  String get s => this._s;
-
-  set s(String s) {
-    this._s = s;
-  }
-
-  bool isSetS() => this.s != null;
-
-  unsetS() {
-    this.s = null;
-  }
-
-  // l
-  List<String> get l => this._l;
-
-  set l(List<String> l) {
-    this._l = l;
-  }
-
-  bool isSetL() => this.l != null;
-
-  unsetL() {
-    this.l = null;
-  }
-
-  // b
-  bool get b => this._b;
-
-  set b(bool b) {
-    this._b = b;
-    this.__isset_b = true;
-  }
-
-  bool isSetB() => this.__isset_b;
-
-  unsetB() {
-    this.__isset_b = false;
-  }
-
-  getFieldValue(int fieldID) {
-    switch (fieldID) {
-      case I:
-        return this.i;
-      case D:
-        return this.d;
-      case S:
-        return this.s;
-      case L:
-        return this.l;
-      case B:
-        return this.b;
-      default:
-        throw new ArgumentError("Field $fieldID doesn't exist!");
-    }
-  }
-
-  setFieldValue(int fieldID, Object value) {
-    switch (fieldID) {
-      case I:
-        if (value == null) {
-          unsetI();
-        } else {
-          this.i = value;
-        }
-        break;
-
-      case D:
-        if (value == null) {
-          unsetD();
-        } else {
-          this.d = value;
-        }
-        break;
-
-      case S:
-        if (value == null) {
-          unsetS();
-        } else {
-          this.s = value;
-        }
-        break;
-
-      case L:
-        if (value == null) {
-          unsetL();
-        } else {
-          this.l = value as List<String>;
-        }
-        break;
-
-      case B:
-        if (value == null) {
-          unsetB();
-        } else {
-          this.b = value;
-        }
-        break;
-
-      default:
-        throw new ArgumentError("Field $fieldID doesn't exist!");
-    }
-  }
-
-  // Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise
-  bool isSet(int fieldID) {
-    switch (fieldID) {
-      case I:
-        return isSetI();
-      case D:
-        return isSetD();
-      case S:
-        return isSetS();
-      case L:
-        return isSetL();
-      case B:
-        return isSetB();
-      default:
-        throw new ArgumentError("Field $fieldID doesn't exist!");
-    }
-  }
-
-  read(TProtocol iprot) {
-    TField field;
-    iprot.readStructBegin();
-    while (true) {
-      field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) {
-        break;
-      }
-      switch (field.id) {
-        case I:
-          if (field.type == TType.I32) {
-            this.i = iprot.readI32();
-            this.__isset_i = true;
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case D:
-          if (field.type == TType.DOUBLE) {
-            this.d = iprot.readDouble();
-            this.__isset_d = true;
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case S:
-          if (field.type == TType.STRING) {
-            this.s = iprot.readString();
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case L:
-          if (field.type == TType.LIST) {
-            {
-              TList _list74 = iprot.readListBegin();
-              this.l = new List<String>();
-              for (int _i75 = 0; _i75 < _list74.length; ++_i75) {
-                String _elem76;
-                _elem76 = iprot.readString();
-                this.l.add(_elem76);
-              }
-              iprot.readListEnd();
-            }
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case B:
-          if (field.type == TType.BOOL) {
-            this.b = iprot.readBool();
-            this.__isset_b = true;
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
-  }
-
-  write(TProtocol oprot) {
-    validate();
-
-    oprot.writeStructBegin(_STRUCT_DESC);
-    oprot.writeFieldBegin(_I_FIELD_DESC);
-    oprot.writeI32(this.i);
-    oprot.writeFieldEnd();
-    oprot.writeFieldBegin(_D_FIELD_DESC);
-    oprot.writeDouble(this.d);
-    oprot.writeFieldEnd();
-    if (this.s != null) {
-      oprot.writeFieldBegin(_S_FIELD_DESC);
-      oprot.writeString(this.s);
-      oprot.writeFieldEnd();
-    }
-    if (this.l != null) {
-      oprot.writeFieldBegin(_L_FIELD_DESC);
-      {
-        oprot.writeListBegin(new TList(TType.STRING, this.l.length));
-        for (var elem77 in this.l) {
-          oprot.writeString(elem77);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldBegin(_B_FIELD_DESC);
-    oprot.writeBool(this.b);
-    oprot.writeFieldEnd();
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  String toString() {
-    StringBuffer ret = new StringBuffer("TestTObject(");
-
-    ret.write("i:");
-    ret.write(this.i);
-
-    ret.write(", ");
-    ret.write("d:");
-    ret.write(this.d);
-
-    ret.write(", ");
-    ret.write("s:");
-    if (this.s == null) {
-      ret.write("null");
-    } else {
-      ret.write(this.s);
-    }
-
-    ret.write(", ");
-    ret.write("l:");
-    if (this.l == null) {
-      ret.write("null");
-    } else {
-      ret.write(this.l);
-    }
-
-    ret.write(", ");
-    ret.write("b:");
-    ret.write(this.b);
-
-    ret.write(")");
-
-    return ret.toString();
-  }
-
-  validate() {
-    // check for required fields
-    // check that fields of type enum have valid values
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/test/t_application_error_test.dart b/vendor/git.apache.org/thrift.git/lib/dart/test/t_application_error_test.dart
deleted file mode 100644
index 511d8d6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/test/t_application_error_test.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-library thrift.test.t_application_error_test;
-
-import 'package:test/test.dart';
-import 'package:thrift/thrift.dart';
-
-void main() {
-  TProtocol protocol;
-
-  setUp(() {
-    protocol = new TBinaryProtocol(new TBufferedTransport());
-  });
-
-  test('Write and read an application error', () {
-    var expectedType = TApplicationErrorType.INTERNAL_ERROR;
-    var expectedMessage = 'test error message';
-
-    TApplicationError error =
-        new TApplicationError(expectedType, expectedMessage);
-    error.write(protocol);
-
-    protocol.transport.flush();
-
-    TApplicationError subject = TApplicationError.read(protocol);
-
-    expect(subject, isNotNull);
-    expect(subject.type, expectedType);
-    expect(subject.message, expectedMessage);
-  });
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_http_transport_test.dart b/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_http_transport_test.dart
deleted file mode 100644
index 66f3d05..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_http_transport_test.dart
+++ /dev/null
@@ -1,164 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-library thrift.test.transport.t_socket_transport_test;
-
-import 'dart:async';
-import 'dart:convert' show Encoding;
-import 'dart:convert' show Utf8Codec, BASE64;
-import 'dart:typed_data' show Uint8List;
-
-import 'package:http/http.dart' show BaseRequest;
-import 'package:http/http.dart' show Client;
-import 'package:http/http.dart' show Response;
-import 'package:http/http.dart' show StreamedResponse;
-import 'package:test/test.dart';
-import 'package:thrift/thrift.dart';
-
-void main() {
-  const utf8Codec = const Utf8Codec();
-
-  group('THttpClientTransport', () {
-    FakeHttpClient client;
-    THttpClientTransport transport;
-
-    setUp(() {
-      client = new FakeHttpClient(sync: false);
-      var config = new THttpConfig(Uri.parse('http://localhost'), {});
-      transport = new THttpClientTransport(client, config);
-    });
-
-    test('Test transport sends body', () async {
-      var expectedText = 'my request';
-      transport.writeAll(utf8Codec.encode(expectedText));
-
-      expect(client.postRequest, isEmpty);
-
-      await transport.flush();
-
-      expect(client.postRequest, isNotEmpty);
-
-      var requestText =
-          utf8Codec.decode(BASE64.decode(client.postRequest));
-      expect(requestText, expectedText);
-    });
-
-    test('Test transport receives response', () async {
-      var expectedText = 'my response';
-      var expectedBytes = utf8Codec.encode(expectedText);
-      client.postResponse = BASE64.encode(expectedBytes);
-
-      transport.writeAll(utf8Codec.encode('my request'));
-      expect(transport.hasReadData, isFalse);
-
-      await transport.flush();
-
-      expect(transport.hasReadData, isTrue);
-
-      var buffer = new Uint8List(expectedBytes.length);
-      transport.readAll(buffer, 0, expectedBytes.length);
-
-      var bufferText = utf8Codec.decode(buffer);
-      expect(bufferText, expectedText);
-    });
-  });
-
-  group('THttpClientTransport with multiple messages', () {
-    FakeHttpClient client;
-    THttpClientTransport transport;
-
-    setUp(() {
-      client = new FakeHttpClient(sync: true);
-      var config = new THttpConfig(Uri.parse('http://localhost'), {});
-      transport = new THttpClientTransport(client, config);
-    });
-
-    test('Test read correct buffer after flush', () async {
-      String bufferText;
-      var expectedText = 'response 1';
-      var expectedBytes = utf8Codec.encode(expectedText);
-
-      // prepare a response
-      transport.writeAll(utf8Codec.encode('request 1'));
-      client.postResponse = BASE64.encode(expectedBytes);
-
-      Future responseReady = transport.flush().then((_) {
-        var buffer = new Uint8List(expectedBytes.length);
-        transport.readAll(buffer, 0, expectedBytes.length);
-        bufferText = utf8Codec.decode(buffer);
-      });
-
-      // prepare a second response
-      transport.writeAll(utf8Codec.encode('request 2'));
-      var response2Bytes = utf8Codec.encode('response 2');
-      client.postResponse = BASE64.encode(response2Bytes);
-      await transport.flush();
-
-      await responseReady;
-      expect(bufferText, expectedText);
-    });
-  });
-}
-
-class FakeHttpClient implements Client {
-  String postResponse = '';
-  String postRequest = '';
-
-  final bool sync;
-
-  FakeHttpClient({this.sync: false});
-
-  Future<Response> post(url,
-      {Map<String, String> headers, body, Encoding encoding}) {
-    postRequest = body;
-    var response = new Response(postResponse, 200);
-
-    if (sync) {
-      return new Future.sync(() => response);
-    } else {
-      return new Future.value(response);
-    }
-  }
-
-  Future<Response> head(url, {Map<String, String> headers}) =>
-      throw new UnimplementedError();
-
-  Future<Response> get(url, {Map<String, String> headers}) =>
-      throw new UnimplementedError();
-
-  Future<Response> put(url,
-          {Map<String, String> headers, body, Encoding encoding}) =>
-      throw new UnimplementedError();
-
-  Future<Response> patch(url,
-          {Map<String, String> headers, body, Encoding encoding}) =>
-      throw new UnimplementedError();
-
-  Future<Response> delete(url, {Map<String, String> headers}) =>
-      throw new UnimplementedError();
-
-  Future<String> read(url, {Map<String, String> headers}) =>
-      throw new UnimplementedError();
-
-  Future<Uint8List> readBytes(url, {Map<String, String> headers}) =>
-      throw new UnimplementedError();
-
-  Future<StreamedResponse> send(BaseRequest request) =>
-      throw new UnimplementedError();
-
-  void close() => throw new UnimplementedError();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_socket_transport_test.dart b/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_socket_transport_test.dart
deleted file mode 100644
index 929ab17..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_socket_transport_test.dart
+++ /dev/null
@@ -1,311 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-library thrift.test.transport.t_socket_transport_test;
-
-import 'dart:async';
-import 'dart:convert' show Utf8Codec, BASE64;
-import 'dart:typed_data' show Uint8List;
-
-import 'package:mockito/mockito.dart';
-import 'package:test/test.dart';
-import 'package:thrift/thrift.dart';
-
-void main() {
-  const utf8Codec = const Utf8Codec();
-
-  final requestText = 'my test request';
-  final requestBytes = new Uint8List.fromList(utf8Codec.encode(requestText));
-  final requestBase64 = BASE64.encode(requestBytes);
-
-  final responseText = 'response 1';
-  final responseBytes = new Uint8List.fromList(utf8Codec.encode(responseText));
-  final responseBase64 = BASE64.encode(responseBytes);
-
-  final framedResponseBase64 =
-      BASE64.encode(_getFramedResponse(responseBytes));
-
-  group('TClientSocketTransport', () {
-    FakeSocket socket;
-    TTransport transport;
-
-    setUp(() async {
-      socket = new FakeSocket(sync: false);
-      await socket.open();
-      transport = new TClientSocketTransport(socket);
-      await transport.open();
-      transport.writeAll(requestBytes);
-    });
-
-    test('Test client sending data over transport', () async {
-      expect(socket.sendPayload, isNull);
-
-      Future responseReady = transport.flush();
-
-      // allow microtask events to finish
-      await new Future.value();
-
-      expect(socket.sendPayload, isNotNull);
-      expect(socket.sendPayload, requestBytes);
-
-      // simulate a response
-      socket.receiveFakeMessage(responseBase64);
-
-      await responseReady;
-      var buffer = new Uint8List(responseBytes.length);
-      transport.readAll(buffer, 0, responseBytes.length);
-      var bufferText = utf8Codec.decode(buffer);
-
-      expect(bufferText, responseText);
-    });
-  }, timeout: new Timeout(new Duration(seconds: 1)));
-
-  group('TClientSocketTransport with FramedTransport', () {
-    FakeSocket socket;
-    TTransport transport;
-
-    setUp(() async {
-      socket = new FakeSocket(sync: true);
-      await socket.open();
-
-      transport = new TFramedTransport(new TClientSocketTransport(socket));
-      await transport.open();
-      transport.writeAll(requestBytes);
-    });
-
-    test('Test client sending data over framed transport', () async {
-      String bufferText;
-
-      Future responseReady = transport.flush().then((_) {
-        var buffer = new Uint8List(responseBytes.length);
-        transport.readAll(buffer, 0, responseBytes.length);
-        bufferText = utf8Codec.decode(buffer);
-      });
-
-      // simulate a response
-      socket.receiveFakeMessage(framedResponseBase64);
-
-      await responseReady;
-      expect(bufferText, responseText);
-    });
-  }, timeout: new Timeout(new Duration(seconds: 1)));
-
-  group('TAsyncClientSocketTransport', () {
-    FakeSocket socket;
-    FakeProtocolFactory protocolFactory;
-    TTransport transport;
-
-    setUp(() async {
-      socket = new FakeSocket(sync: true);
-      await socket.open();
-
-      protocolFactory = new FakeProtocolFactory();
-      protocolFactory.message = new TMessage('foo', TMessageType.CALL, 123);
-      transport = new TAsyncClientSocketTransport(
-          socket, new TMessageReader(protocolFactory),
-          responseTimeout: Duration.ZERO);
-      await transport.open();
-      transport.writeAll(requestBytes);
-    });
-
-    test('Test response correlates to correct request', () async {
-      String bufferText;
-
-      Future responseReady = transport.flush().then((_) {
-        var buffer = new Uint8List(responseBytes.length);
-        transport.readAll(buffer, 0, responseBytes.length);
-        bufferText = utf8Codec.decode(buffer);
-      });
-
-      // simulate a response
-      protocolFactory.message = new TMessage('foo', TMessageType.REPLY, 123);
-      socket.receiveFakeMessage(responseBase64);
-
-      // simulate a second response
-      var response2Text = 'response 2';
-      var response2Bytes =
-          new Uint8List.fromList(utf8Codec.encode(response2Text));
-      var response2Base64 = BASE64.encode(response2Bytes);
-      protocolFactory.message = new TMessage('foo2', TMessageType.REPLY, 124);
-      socket.receiveFakeMessage(response2Base64);
-
-      await responseReady;
-      expect(bufferText, responseText);
-    });
-
-    test('Test response timeout', () async {
-      Future responseReady = transport.flush();
-      expect(responseReady, throwsA(new isInstanceOf<TimeoutException>()));
-    });
-  }, timeout: new Timeout(new Duration(seconds: 1)));
-
-  group('TAsyncClientSocketTransport with TFramedTransport', () {
-    FakeSocket socket;
-    FakeProtocolFactory protocolFactory;
-    TTransport transport;
-
-    setUp(() async {
-      socket = new FakeSocket(sync: true);
-      await socket.open();
-
-      protocolFactory = new FakeProtocolFactory();
-      protocolFactory.message = new TMessage('foo', TMessageType.CALL, 123);
-      var messageReader = new TMessageReader(protocolFactory,
-          byteOffset: TFramedTransport.headerByteCount);
-
-      transport = new TFramedTransport(new TAsyncClientSocketTransport(
-          socket, messageReader,
-          responseTimeout: Duration.ZERO));
-      await transport.open();
-      transport.writeAll(requestBytes);
-    });
-
-    test('Test async client sending data over framed transport', () async {
-      String bufferText;
-
-      Future responseReady = transport.flush().then((_) {
-        var buffer = new Uint8List(responseBytes.length);
-        transport.readAll(buffer, 0, responseBytes.length);
-        bufferText = utf8Codec.decode(buffer);
-      });
-
-      // simulate a response
-      protocolFactory.message = new TMessage('foo', TMessageType.REPLY, 123);
-      socket.receiveFakeMessage(framedResponseBase64);
-
-      await responseReady;
-      expect(bufferText, responseText);
-    });
-  }, timeout: new Timeout(new Duration(seconds: 1)));
-
-  group('TServerTransport', () {
-    test('Test server transport listens to socket', () async {
-      var socket = new FakeSocket();
-      await socket.open();
-      expect(socket.isOpen, isTrue);
-
-      var transport = new TServerSocketTransport(socket);
-      expect(transport.hasReadData, isFalse);
-
-      socket.receiveFakeMessage(requestBase64);
-
-      // allow microtask events to finish
-      await new Future.value();
-
-      expect(transport.hasReadData, isTrue);
-
-      var buffer = new Uint8List(requestBytes.length);
-      transport.readAll(buffer, 0, requestBytes.length);
-
-      var bufferText = utf8Codec.decode(buffer);
-      expect(bufferText, requestText);
-    });
-
-    test('Test server sending data over transport', () async {
-      var socket = new FakeSocket();
-      await socket.open();
-
-      var transport = new TServerSocketTransport(socket);
-
-      transport.writeAll(responseBytes);
-      expect(socket.sendPayload, isNull);
-
-      transport.flush();
-
-      // allow microtask events to finish
-      await new Future.value();
-
-      expect(socket.sendPayload, isNotNull);
-      expect(socket.sendPayload, responseBytes);
-    });
-  }, timeout: new Timeout(new Duration(seconds: 1)));
-}
-
-class FakeSocket extends TSocket {
-  final StreamController<TSocketState> _onStateController;
-  Stream<TSocketState> get onState => _onStateController.stream;
-
-  final StreamController<Object> _onErrorController;
-  Stream<Object> get onError => _onErrorController.stream;
-
-  final StreamController<Uint8List> _onMessageController;
-  Stream<Uint8List> get onMessage => _onMessageController.stream;
-
-  FakeSocket({bool sync: false})
-      : _onStateController = new StreamController.broadcast(sync: sync),
-        _onErrorController = new StreamController.broadcast(sync: sync),
-        _onMessageController = new StreamController.broadcast(sync: sync);
-
-  bool _isOpen;
-
-  bool get isOpen => _isOpen;
-
-  bool get isClosed => !isOpen;
-
-  Future open() async {
-    _isOpen = true;
-    _onStateController.add(TSocketState.OPEN);
-  }
-
-  Future close() async {
-    _isOpen = false;
-    _onStateController.add(TSocketState.CLOSED);
-  }
-
-  Uint8List _sendPayload;
-  Uint8List get sendPayload => _sendPayload;
-
-  void send(Uint8List data) {
-    if (!isOpen) throw new StateError('The socket is not open');
-
-    _sendPayload = data;
-  }
-
-  void receiveFakeMessage(String base64) {
-    if (!isOpen) throw new StateError('The socket is not open');
-
-    var message =
-        new Uint8List.fromList(BASE64.decode(base64));
-    _onMessageController.add(message);
-  }
-}
-
-class FakeProtocolFactory implements TProtocolFactory {
-  FakeProtocolFactory();
-
-  TMessage message;
-
-  getProtocol(TTransport transport) => new FakeProtocol(message);
-}
-
-class FakeProtocol extends Mock implements TProtocol {
-  FakeProtocol(this._message);
-
-  TMessage _message;
-
-  readMessageBegin() => _message;
-}
-
-Uint8List _getFramedResponse(Uint8List responseBytes) {
-  var byteOffset = TFramedTransport.headerByteCount;
-  var response = new Uint8List(byteOffset + responseBytes.length);
-
-  response.buffer.asByteData().setInt32(0, responseBytes.length);
-  response.setAll(byteOffset, responseBytes);
-
-  return response;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_transport_test.dart b/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_transport_test.dart
deleted file mode 100644
index 0bb381a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/test/transport/t_transport_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-library thrift.test.transport.t_socket_transport_test;
-
-import 'package:test/test.dart';
-import 'package:thrift/thrift.dart';
-
-/// Common transport tests
-void main() {
-  group('TTransportFactory', () {
-    test('transport is returned from base factory', () async {
-      TTransport result;
-      TTransport transport = null;
-
-      var factory = new TTransportFactory();
-
-      result = await factory.getTransport(transport);
-      expect(result, isNull);
-
-      transport = new TBufferedTransport();
-      result = await factory.getTransport(transport);
-
-      expect(result, transport);
-    });
-  });
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/dart/tool/dev.dart b/vendor/git.apache.org/thrift.git/lib/dart/tool/dev.dart
deleted file mode 100644
index 27f8b8f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/dart/tool/dev.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-library tool.dev;
-
-import 'package:dart_dev/dart_dev.dart' show dev, config;
-
-main(List<String> args) async {
-  // https://github.com/Workiva/dart_dev
-
-  var directories = ['lib/', 'test/', 'tool/'];
-  config.analyze.entryPoints = directories;
-  config.format.directories = directories;
-  config.copyLicense
-    ..licensePath = 'LICENSE_HEADER'
-    ..directories = directories;
-
-  await dev(args);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/README.md b/vendor/git.apache.org/thrift.git/lib/delphi/README.md
deleted file mode 100644
index 91799d0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Thrift Delphi Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with Delphi
-====================
-
-The Thrift Delphi Library requires at least Delphi 2010.
-
-Because the Library heavily relies on generics, using it
-with earlier versions (such as Delphi 7) will *not* work.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/delphi/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Collections.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Collections.pas
deleted file mode 100644
index b2206cb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Collections.pas
+++ /dev/null
@@ -1,619 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.Collections;
-
-interface
-
-uses
-  Generics.Collections, Generics.Defaults, Thrift.Utils;
-
-type
-
-{$IF CompilerVersion < 21.0}
-  TArray<T> = array of T;
-{$IFEND}
-
-  IThriftContainer = interface
-    ['{93DEF5A0-D162-461A-AB22-5B4EE0734050}']
-    function ToString: string;
-  end;
-
-  IThriftDictionary<TKey,TValue> = interface(IThriftContainer)
-    ['{25EDD506-F9D1-4008-A40F-5940364B7E46}']
-    function GetEnumerator: TEnumerator<TPair<TKey,TValue>>;
-
-    function GetKeys: TDictionary<TKey,TValue>.TKeyCollection;
-    function GetValues: TDictionary<TKey,TValue>.TValueCollection;
-    function GetItem(const Key: TKey): TValue;
-    procedure SetItem(const Key: TKey; const Value: TValue);
-    function GetCount: Integer;
-
-    procedure Add(const Key: TKey; const Value: TValue);
-    procedure Remove(const Key: TKey);
-{$IF CompilerVersion >= 21.0}
-    function ExtractPair(const Key: TKey): TPair<TKey,TValue>;
-{$IFEND}
-    procedure Clear;
-    procedure TrimExcess;
-    function TryGetValue(const Key: TKey; out Value: TValue): Boolean;
-    procedure AddOrSetValue(const Key: TKey; const Value: TValue);
-    function ContainsKey(const Key: TKey): Boolean;
-    function ContainsValue(const Value: TValue): Boolean;
-    function ToArray: TArray<TPair<TKey,TValue>>;
-
-    property Items[const Key: TKey]: TValue read GetItem write SetItem; default;
-    property Count: Integer read GetCount;
-    property Keys: TDictionary<TKey,TValue>.TKeyCollection read GetKeys;
-    property Values: TDictionary<TKey,TValue>.TValueCollection read GetValues;
-  end;
-
-  TThriftDictionaryImpl<TKey,TValue> = class( TInterfacedObject, IThriftDictionary<TKey,TValue>)
-  private
-    FDictionaly : TDictionary<TKey,TValue>;
-  protected
-    function GetEnumerator: TEnumerator<TPair<TKey,TValue>>;
-
-    function GetKeys: TDictionary<TKey,TValue>.TKeyCollection;
-    function GetValues: TDictionary<TKey,TValue>.TValueCollection;
-    function GetItem(const Key: TKey): TValue;
-    procedure SetItem(const Key: TKey; const Value: TValue);
-    function GetCount: Integer;
-
-    procedure Add(const Key: TKey; const Value: TValue);
-    procedure Remove(const Key: TKey);
-{$IF CompilerVersion >= 21.0}
-    function ExtractPair(const Key: TKey): TPair<TKey,TValue>;
-{$IFEND}
-    procedure Clear;
-    procedure TrimExcess;
-    function TryGetValue(const Key: TKey; out Value: TValue): Boolean;
-    procedure AddOrSetValue(const Key: TKey; const Value: TValue);
-    function ContainsKey(const Key: TKey): Boolean;
-    function ContainsValue(const Value: TValue): Boolean;
-    function ToArray: TArray<TPair<TKey,TValue>>;
-    property Items[const Key: TKey]: TValue read GetItem write SetItem; default;
-    property Count: Integer read GetCount;
-    property Keys: TDictionary<TKey,TValue>.TKeyCollection read GetKeys;
-    property Values: TDictionary<TKey,TValue>.TValueCollection read GetValues;
-  public
-    constructor Create(ACapacity: Integer = 0);
-    destructor Destroy; override;
-  end;
-
-  IThriftList<T> = interface(IThriftContainer)
-    ['{29BEEE31-9CB4-401B-AA04-5148A75F473B}']
-    function GetEnumerator: TEnumerator<T>;
-    function GetCapacity: Integer;
-    procedure SetCapacity(Value: Integer);
-    function GetCount: Integer;
-    procedure SetCount(Value: Integer);
-    function GetItem(Index: Integer): T;
-    procedure SetItem(Index: Integer; const Value: T);
-    function Add(const Value: T): Integer;
-    procedure AddRange(const Values: array of T); overload;
-    procedure AddRange(const Collection: IEnumerable<T>); overload;
-    procedure AddRange(Collection: TEnumerable<T>); overload;
-    procedure Insert(Index: Integer; const Value: T);
-    procedure InsertRange(Index: Integer; const Values: array of T); overload;
-    procedure InsertRange(Index: Integer; const Collection: IEnumerable<T>); overload;
-    procedure InsertRange(Index: Integer; const Collection: TEnumerable<T>); overload;
-    function Remove(const Value: T): Integer;
-    procedure Delete(Index: Integer);
-    procedure DeleteRange(AIndex, ACount: Integer);
-    function Extract(const Value: T): T;
-{$IF CompilerVersion >= 21.0}
-    procedure Exchange(Index1, Index2: Integer);
-    procedure Move(CurIndex, NewIndex: Integer);
-    function First: T;
-    function Last: T;
-{$IFEND}
-    procedure Clear;
-    function Contains(const Value: T): Boolean;
-    function IndexOf(const Value: T): Integer;
-    function LastIndexOf(const Value: T): Integer;
-    procedure Reverse;
-    procedure Sort; overload;
-    procedure Sort(const AComparer: IComparer<T>); overload;
-    function BinarySearch(const Item: T; out Index: Integer): Boolean; overload;
-    function BinarySearch(const Item: T; out Index: Integer; const AComparer: IComparer<T>): Boolean; overload;
-    procedure TrimExcess;
-    function ToArray: TArray<T>;
-    property Capacity: Integer read GetCapacity write SetCapacity;
-    property Count: Integer read GetCount write SetCount;
-    property Items[Index: Integer]: T read GetItem write SetItem; default;
-  end;
-
-  TThriftListImpl<T> = class( TInterfacedObject, IThriftList<T>)
-  private
-    FList : TList<T>;
-  protected
-    function GetEnumerator: TEnumerator<T>;
-    function GetCapacity: Integer;
-    procedure SetCapacity(Value: Integer);
-    function GetCount: Integer;
-    procedure SetCount(Value: Integer);
-    function GetItem(Index: Integer): T;
-    procedure SetItem(Index: Integer; const Value: T);
-    function Add(const Value: T): Integer;
-    procedure AddRange(const Values: array of T); overload;
-    procedure AddRange(const Collection: IEnumerable<T>); overload;
-    procedure AddRange(Collection: TEnumerable<T>); overload;
-    procedure Insert(Index: Integer; const Value: T);
-    procedure InsertRange(Index: Integer; const Values: array of T); overload;
-    procedure InsertRange(Index: Integer; const Collection: IEnumerable<T>); overload;
-    procedure InsertRange(Index: Integer; const Collection: TEnumerable<T>); overload;
-    function Remove(const Value: T): Integer;
-    procedure Delete(Index: Integer);
-    procedure DeleteRange(AIndex, ACount: Integer);
-    function Extract(const Value: T): T;
-{$IF CompilerVersion >= 21.0}
-    procedure Exchange(Index1, Index2: Integer);
-    procedure Move(CurIndex, NewIndex: Integer);
-    function First: T;
-    function Last: T;
-{$IFEND}
-    procedure Clear;
-    function Contains(const Value: T): Boolean;
-    function IndexOf(const Value: T): Integer;
-    function LastIndexOf(const Value: T): Integer;
-    procedure Reverse;
-    procedure Sort; overload;
-    procedure Sort(const AComparer: IComparer<T>); overload;
-    function BinarySearch(const Item: T; out Index: Integer): Boolean; overload;
-    function BinarySearch(const Item: T; out Index: Integer; const AComparer: IComparer<T>): Boolean; overload;
-    procedure TrimExcess;
-    function ToArray: TArray<T>;
-    property Capacity: Integer read GetCapacity write SetCapacity;
-    property Count: Integer read GetCount write SetCount;
-    property Items[Index: Integer]: T read GetItem write SetItem; default;
-  public
-    constructor Create;
-    destructor Destroy; override;
-  end;
-
-  IHashSet<TValue> = interface(IThriftContainer)
-    ['{0923A3B5-D4D4-48A8-91AD-40238E2EAD66}']
-    function GetEnumerator: TEnumerator<TValue>;
-    function GetIsReadOnly: Boolean;
-    function GetCount: Integer;
-    property Count: Integer read GetCount;
-    property IsReadOnly: Boolean read GetIsReadOnly;
-    procedure Add( const item: TValue);
-    procedure Clear;
-    function Contains( const item: TValue): Boolean;
-    procedure CopyTo(var A: TArray<TValue>; arrayIndex: Integer);
-    function Remove( const item: TValue ): Boolean;
-  end;
-
-  THashSetImpl<TValue> = class( TInterfacedObject, IHashSet<TValue>)
-  private
-    FDictionary : IThriftDictionary<TValue,Integer>;
-    FIsReadOnly: Boolean;
-  protected
-    function GetEnumerator: TEnumerator<TValue>;
-    function GetIsReadOnly: Boolean;
-    function GetCount: Integer;
-    property Count: Integer read GetCount;
-    property IsReadOnly: Boolean read FIsReadOnly;
-    procedure Add( const item: TValue);
-    procedure Clear;
-    function Contains( const item: TValue): Boolean;
-    procedure CopyTo(var A: TArray<TValue>; arrayIndex: Integer);
-    function Remove( const item: TValue ): Boolean;
-  public
-    constructor Create;
-  end;
-
-implementation
-
-{ THashSetImpl<TValue> }
-
-procedure THashSetImpl<TValue>.Add( const item: TValue);
-begin
-  if not FDictionary.ContainsKey(item) then
-  begin
-    FDictionary.Add( item, 0);
-  end;
-end;
-
-procedure THashSetImpl<TValue>.Clear;
-begin
-  FDictionary.Clear;
-end;
-
-function THashSetImpl<TValue>.Contains( const item: TValue): Boolean;
-begin
-  Result := FDictionary.ContainsKey(item);
-end;
-
-procedure THashSetImpl<TValue>.CopyTo(var A: TArray<TValue>; arrayIndex: Integer);
-var
-  i : Integer;
-  Enumlator : TEnumerator<TValue>;
-begin
-  Enumlator := GetEnumerator;
-  while Enumlator.MoveNext do
-  begin
-    A[arrayIndex] := Enumlator.Current;
-    Inc(arrayIndex);
-  end;
-end;
-
-constructor THashSetImpl<TValue>.Create;
-begin
-  inherited;
-  FDictionary := TThriftDictionaryImpl<TValue,Integer>.Create;
-end;
-
-function THashSetImpl<TValue>.GetCount: Integer;
-begin
-  Result := FDictionary.Count;
-end;
-
-function THashSetImpl<TValue>.GetEnumerator: TEnumerator<TValue>;
-begin
-  Result := FDictionary.Keys.GetEnumerator;
-end;
-
-function THashSetImpl<TValue>.GetIsReadOnly: Boolean;
-begin
-  Result := FIsReadOnly;
-end;
-
-function THashSetImpl<TValue>.Remove( const item: TValue): Boolean;
-begin
-  Result := False;
-  if FDictionary.ContainsKey( item ) then
-  begin
-    FDictionary.Remove( item );
-    Result := not FDictionary.ContainsKey( item );
-  end;
-end;
-
-{ TThriftDictionaryImpl<TKey, TValue> }
-
-procedure TThriftDictionaryImpl<TKey, TValue>.Add(const Key: TKey;
-  const Value: TValue);
-begin
-  FDictionaly.Add( Key, Value);
-end;
-
-procedure TThriftDictionaryImpl<TKey, TValue>.AddOrSetValue(const Key: TKey;
-  const Value: TValue);
-begin
-  FDictionaly.AddOrSetValue( Key, Value);
-end;
-
-procedure TThriftDictionaryImpl<TKey, TValue>.Clear;
-begin
-  FDictionaly.Clear;
-end;
-
-function TThriftDictionaryImpl<TKey, TValue>.ContainsKey(
-  const Key: TKey): Boolean;
-begin
-  Result := FDictionaly.ContainsKey( Key );
-end;
-
-function TThriftDictionaryImpl<TKey, TValue>.ContainsValue(
-  const Value: TValue): Boolean;
-begin
-  Result := FDictionaly.ContainsValue( Value );
-end;
-
-constructor TThriftDictionaryImpl<TKey, TValue>.Create(ACapacity: Integer);
-begin
-  inherited Create;
-  FDictionaly := TDictionary<TKey,TValue>.Create( ACapacity );
-end;
-
-destructor TThriftDictionaryImpl<TKey, TValue>.Destroy;
-begin
-  FDictionaly.Free;
-  inherited;
-end;
-
-{$IF CompilerVersion >= 21.0}
-function TThriftDictionaryImpl<TKey, TValue>.ExtractPair( const Key: TKey): TPair<TKey, TValue>;
-begin
-  Result := FDictionaly.ExtractPair( Key);
-end;
-{$IFEND}
-
-function TThriftDictionaryImpl<TKey, TValue>.GetCount: Integer;
-begin
-  Result := FDictionaly.Count;
-end;
-
-function TThriftDictionaryImpl<TKey, TValue>.GetEnumerator: TEnumerator<TPair<TKey, TValue>>;
-begin
-  Result := FDictionaly.GetEnumerator;
-end;
-
-function TThriftDictionaryImpl<TKey, TValue>.GetItem(const Key: TKey): TValue;
-begin
-  Result := FDictionaly.Items[Key];
-end;
-
-function TThriftDictionaryImpl<TKey, TValue>.GetKeys: TDictionary<TKey, TValue>.TKeyCollection;
-begin
-  Result := FDictionaly.Keys;
-end;
-
-function TThriftDictionaryImpl<TKey, TValue>.GetValues: TDictionary<TKey, TValue>.TValueCollection;
-begin
-  Result := FDictionaly.Values;
-end;
-
-procedure TThriftDictionaryImpl<TKey, TValue>.Remove(const Key: TKey);
-begin
-  FDictionaly.Remove( Key );
-end;
-
-procedure TThriftDictionaryImpl<TKey, TValue>.SetItem(const Key: TKey;
-  const Value: TValue);
-begin
-  FDictionaly.AddOrSetValue( Key, Value);
-end;
-
-function TThriftDictionaryImpl<TKey, TValue>.ToArray: TArray<TPair<TKey, TValue>>;
-{$IF CompilerVersion < 22.0}
-var
-  x : TPair<TKey, TValue>;
-  i : Integer;
-{$IFEND}
-begin
-{$IF CompilerVersion < 22.0}
-  SetLength(Result, Count);
-  i := 0;
-  for x in FDictionaly do
-  begin
-    Result[i] := x;
-    Inc( i );
-  end;
-{$ELSE}
-  Result := FDictionaly.ToArray;
-{$IFEND}
-end;
-
-procedure TThriftDictionaryImpl<TKey, TValue>.TrimExcess;
-begin
-  FDictionaly.TrimExcess;
-end;
-
-function TThriftDictionaryImpl<TKey, TValue>.TryGetValue(const Key: TKey;
-  out Value: TValue): Boolean;
-begin
-  Result := FDictionaly.TryGetValue( Key, Value);
-end;
-
-{ TThriftListImpl<T> }
-
-function TThriftListImpl<T>.Add(const Value: T): Integer;
-begin
-  Result := FList.Add( Value );
-end;
-
-procedure TThriftListImpl<T>.AddRange(Collection: TEnumerable<T>);
-begin
-  FList.AddRange( Collection );
-end;
-
-procedure TThriftListImpl<T>.AddRange(const Collection: IEnumerable<T>);
-begin
-  FList.AddRange( Collection );
-end;
-
-procedure TThriftListImpl<T>.AddRange(const Values: array of T);
-begin
-  FList.AddRange( Values );
-end;
-
-function TThriftListImpl<T>.BinarySearch(const Item: T;
-  out Index: Integer): Boolean;
-begin
-  Result := FList.BinarySearch( Item, Index);
-end;
-
-function TThriftListImpl<T>.BinarySearch(const Item: T; out Index: Integer;
-  const AComparer: IComparer<T>): Boolean;
-begin
-  Result := FList.BinarySearch( Item, Index, AComparer);
-end;
-
-procedure TThriftListImpl<T>.Clear;
-begin
-  FList.Clear;
-end;
-
-function TThriftListImpl<T>.Contains(const Value: T): Boolean;
-begin
-  Result := FList.Contains( Value );
-end;
-
-constructor TThriftListImpl<T>.Create;
-begin
-  inherited;
-  FList := TList<T>.Create;
-end;
-
-procedure TThriftListImpl<T>.Delete(Index: Integer);
-begin
-  FList.Delete( Index )
-end;
-
-procedure TThriftListImpl<T>.DeleteRange(AIndex, ACount: Integer);
-begin
-  FList.DeleteRange( AIndex, ACount)
-end;
-
-destructor TThriftListImpl<T>.Destroy;
-begin
-  FList.Free;
-  inherited;
-end;
-
-{$IF CompilerVersion >= 21.0}
-procedure TThriftListImpl<T>.Exchange(Index1, Index2: Integer);
-begin
-  FList.Exchange( Index1, Index2 )
-end;
-{$IFEND}
-
-function TThriftListImpl<T>.Extract(const Value: T): T;
-begin
-  Result := FList.Extract( Value )
-end;
-
-{$IF CompilerVersion >= 21.0}
-function TThriftListImpl<T>.First: T;
-begin
-  Result := FList.First;
-end;
-{$IFEND}
-
-function TThriftListImpl<T>.GetCapacity: Integer;
-begin
-  Result := FList.Capacity;
-end;
-
-function TThriftListImpl<T>.GetCount: Integer;
-begin
-  Result := FList.Count;
-end;
-
-function TThriftListImpl<T>.GetEnumerator: TEnumerator<T>;
-begin
-  Result := FList.GetEnumerator;
-end;
-
-function TThriftListImpl<T>.GetItem(Index: Integer): T;
-begin
-  Result := FList[Index];
-end;
-
-function TThriftListImpl<T>.IndexOf(const Value: T): Integer;
-begin
-  Result := FList.IndexOf( Value );
-end;
-
-procedure TThriftListImpl<T>.Insert(Index: Integer; const Value: T);
-begin
-  FList.Insert( Index, Value);
-end;
-
-procedure TThriftListImpl<T>.InsertRange(Index: Integer;
-  const Collection: TEnumerable<T>);
-begin
-  FList.InsertRange( Index, Collection );
-end;
-
-procedure TThriftListImpl<T>.InsertRange(Index: Integer;
-  const Values: array of T);
-begin
-  FList.InsertRange( Index, Values);
-end;
-
-procedure TThriftListImpl<T>.InsertRange(Index: Integer;
-  const Collection: IEnumerable<T>);
-begin
-  FList.InsertRange( Index, Collection );
-end;
-
-{$IF CompilerVersion >= 21.0}
-function TThriftListImpl<T>.Last: T;
-begin
-  Result := FList.Last;
-end;
-{$IFEND}
-
-function TThriftListImpl<T>.LastIndexOf(const Value: T): Integer;
-begin
-  Result := FList.LastIndexOf( Value );
-end;
-
-{$IF CompilerVersion >= 21.0}
-procedure TThriftListImpl<T>.Move(CurIndex, NewIndex: Integer);
-begin
-  FList.Move( CurIndex,  NewIndex);
-end;
-{$IFEND}
-
-function TThriftListImpl<T>.Remove(const Value: T): Integer;
-begin
-  Result := FList.Remove( Value );
-end;
-
-procedure TThriftListImpl<T>.Reverse;
-begin
-  FList.Reverse;
-end;
-
-procedure TThriftListImpl<T>.SetCapacity(Value: Integer);
-begin
-  FList.Capacity := Value;
-end;
-
-procedure TThriftListImpl<T>.SetCount(Value: Integer);
-begin
-  FList.Count := Value;
-end;
-
-procedure TThriftListImpl<T>.SetItem(Index: Integer; const Value: T);
-begin
-  FList[Index] := Value;
-end;
-
-procedure TThriftListImpl<T>.Sort;
-begin
-  FList.Sort;
-end;
-
-procedure TThriftListImpl<T>.Sort(const AComparer: IComparer<T>);
-begin
-  FList.Sort;
-end;
-
-function TThriftListImpl<T>.ToArray: TArray<T>;
-{$IF CompilerVersion < 22.0}
-var
-  x : T;
-  i : Integer;
-{$IFEND}
-begin
-{$IF CompilerVersion < 22.0}
-  SetLength(Result, Count);
-  i := 0;
-  for x in FList do
-  begin
-    Result[i] := x;
-    Inc( i );
-  end;
-{$ELSE}
-  Result := FList.ToArray;
-{$IFEND}
-end;
-
-procedure TThriftListImpl<T>.TrimExcess;
-begin
-  FList.TrimExcess;
-end;
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Console.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Console.pas
deleted file mode 100644
index 1dbb309..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Console.pas
+++ /dev/null
@@ -1,133 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.Console;
-
-interface
-
-uses Classes;
-
-type
-  TThriftConsole = class
-  public
-    procedure Write( const S: string); virtual;
-    procedure WriteLine( const S: string); virtual;
-  end;
-
-  TGUIConsole = class( TThriftConsole )
-  private
-    FLineBreak : Boolean;
-    FMemo : TStrings;
-
-    procedure InternalWrite( const S: string; bWriteLine: Boolean);
-  public
-    procedure Write( const S: string); override;
-    procedure WriteLine( const S: string); override;
-    constructor Create( AMemo: TStrings);
-  end;
-
-function Console: TThriftConsole;
-procedure ChangeConsole( AConsole: TThriftConsole );
-procedure RestoreConsoleToDefault;
-
-implementation
-
-var
-  FDefaultConsole : TThriftConsole;
-  FConsole : TThriftConsole;
-
-function Console: TThriftConsole;
-begin
-  Result := FConsole;
-end;
-
-{ TThriftConsole }
-
-procedure TThriftConsole.Write(const S: string);
-begin
-  System.Write( S );
-end;
-
-procedure TThriftConsole.WriteLine(const S: string);
-begin
-  System.Writeln( S );
-end;
-
-procedure ChangeConsole( AConsole: TThriftConsole );
-begin
-  FConsole := AConsole;
-end;
-
-procedure RestoreConsoleToDefault;
-begin
-  FConsole := FDefaultConsole;
-end;
-
-{ TGUIConsole }
-
-constructor TGUIConsole.Create( AMemo: TStrings);
-begin
-  inherited Create;
-  FMemo := AMemo;
-  FLineBreak := True;
-end;
-
-procedure TGUIConsole.InternalWrite(const S: string; bWriteLine: Boolean);
-var
-  idx : Integer;
-begin
-  if FLineBreak then
-  begin
-    FMemo.Add( S );
-  end else
-  begin
-    idx := FMemo.Count - 1;
-    if idx < 0 then
-    begin
-      FMemo.Add( S );
-    end;
-    FMemo[idx] := FMemo[idx] + S;
-  end;
-  FLineBreak := bWriteLine;
-end;
-
-procedure TGUIConsole.Write(const S: string);
-begin
-  InternalWrite( S, False);
-end;
-
-procedure TGUIConsole.WriteLine(const S: string);
-begin
-  InternalWrite( S, True);
-end;
-
-initialization
-begin
-  FDefaultConsole := TThriftConsole.Create;
-  FConsole := FDefaultConsole;
-end;
-
-finalization
-begin
-  FDefaultConsole.Free;
-end;
-
-end.
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Defines.inc b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Defines.inc
deleted file mode 100644
index 499ccae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Defines.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-
-// Good lists of Delphi version numbers
-// https://github.com/project-jedi/jedi/blob/master/jedi.inc
-// http://docwiki.embarcadero.com/RADStudio/Seattle/en/Compiler_Versions
-
-
-// start with most backwards compatible defaults
-
-{$DEFINE OLD_UNIT_NAMES}
-{$DEFINE OLD_SOCKETS}      // TODO: add socket support for CompilerVersion >= 28.0
-{$UNDEF HAVE_CLASS_CTOR}
-
-
-// enable features as they are available
-
-{$IF CompilerVersion >= 21.0}   // Delphi 2010
-  {$DEFINE HAVE_CLASS_CTOR}
-{$IFEND}
-
-{$IF CompilerVersion >= 23.0}   // Delphi XE2
-  {$UNDEF OLD_UNIT_NAMES}
-{$IFEND}
-
-{$IF CompilerVersion >= 28.0}   // Delphi XE7
-  {$UNDEF OLD_SOCKETS}
-{$IFEND}
-
-
-// EOF
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Processor.Multiplex.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Processor.Multiplex.pas
deleted file mode 100644
index 756daa1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Processor.Multiplex.pas
+++ /dev/null
@@ -1,216 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.Processor.Multiplex;
-
-
-interface
-
-uses
-  SysUtils,
-  Generics.Collections,
-  Thrift,
-  Thrift.Protocol,
-  Thrift.Protocol.Multiplex;
-
-{ TMultiplexedProcessor is a TProcessor allowing a single TServer to provide multiple services.
-  To do so, you instantiate the processor and then register additional processors with it,
-  as shown in the following example:
-
-
-     TMultiplexedProcessor processor = new TMultiplexedProcessor();
-
-     processor.registerProcessor(
-         "Calculator",
-         new Calculator.Processor(new CalculatorHandler()));
-
-     processor.registerProcessor(
-         "WeatherReport",
-         new WeatherReport.Processor(new WeatherReportHandler()));
-
-     TServerTransport t = new TServerSocket(9090);
-     TSimpleServer server = new TSimpleServer(processor, t);
-
-     server.serve();
-}
-
-
-type
-  IMultiplexedProcessor = interface( IProcessor)
-    ['{810FF32D-22A2-4D58-B129-B0590703ECEC}']
-    // Register a service with this TMultiplexedProcessor.  This allows us
-    // to broker requests to individual services by using the service name
-    // to select them at request time.
-    procedure RegisterProcessor( const serviceName : String; const processor : IProcessor);
-  end;
-
-
-  TMultiplexedProcessorImpl = class( TInterfacedObject, IMultiplexedProcessor, IProcessor)
-  private type
-    // Our goal was to work with any protocol.  In order to do that, we needed
-    // to allow them to call readMessageBegin() and get a TMessage in exactly
-    // the standard format, without the service name prepended to TMessage.name.
-    TStoredMessageProtocol = class( TProtocolDecorator)
-    private
-      FMessageBegin : IMessage;
-    public
-      constructor Create( const protocol : IProtocol; const aMsgBegin : IMessage);
-      function ReadMessageBegin: IMessage; override;
-    end;
-
-  private
-    FServiceProcessorMap : TDictionary<String, IProcessor>;
-
-    procedure Error( const oprot : IProtocol; const msg : IMessage;
-                     extype : TApplicationExceptionSpecializedClass; const etxt : string);
-
-  public
-    constructor Create;
-    destructor Destroy;  override;
-
-    // Register a service with this TMultiplexedProcessorImpl.  This allows us
-    // to broker requests to individual services by using the service name
-    // to select them at request time.
-    procedure RegisterProcessor( const serviceName : String; const processor : IProcessor);
-
-    { This implementation of process performs the following steps:
-      - Read the beginning of the message.
-      - Extract the service name from the message.
-      - Using the service name to locate the appropriate processor.
-      - Dispatch to the processor, with a decorated instance of TProtocol
-        that allows readMessageBegin() to return the original TMessage.
-
-      An exception is thrown if the message type is not CALL or ONEWAY
-      or if the service is unknown (or not properly registered).
-    }
-    function Process( const iprot, oprot: IProtocol; const events : IProcessorEvents = nil): Boolean;
-  end;
-
-
-implementation
-
-constructor TMultiplexedProcessorImpl.TStoredMessageProtocol.Create( const protocol : IProtocol; const aMsgBegin : IMessage);
-begin
-  inherited Create( protocol);
-  FMessageBegin := aMsgBegin;
-end;
-
-
-function TMultiplexedProcessorImpl.TStoredMessageProtocol.ReadMessageBegin: IMessage;
-begin
-  result := FMessageBegin;
-end;
-
-
-constructor TMultiplexedProcessorImpl.Create;
-begin
-  inherited Create;
-  FServiceProcessorMap := TDictionary<string,IProcessor>.Create;
-end;
-
-
-destructor TMultiplexedProcessorImpl.Destroy;
-begin
-  try
-    FreeAndNil( FServiceProcessorMap);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-procedure TMultiplexedProcessorImpl.RegisterProcessor( const serviceName : String; const processor : IProcessor);
-begin
-  FServiceProcessorMap.Add( serviceName, processor);
-end;
-
-
-procedure TMultiplexedProcessorImpl.Error( const oprot : IProtocol; const msg : IMessage;
-                                           extype : TApplicationExceptionSpecializedClass;
-                                           const etxt : string);
-var appex  : TApplicationException;
-    newMsg : IMessage;
-begin
-  appex := extype.Create(etxt);
-  try
-    newMsg := TMessageImpl.Create( msg.Name, TMessageType.Exception, msg.SeqID);
-
-    oprot.WriteMessageBegin(newMsg);
-    appex.Write(oprot);
-    oprot.WriteMessageEnd();
-    oprot.Transport.Flush();
-
-  finally
-    appex.Free;
-  end;
-end;
-
-
-function TMultiplexedProcessorImpl.Process(const iprot, oprot : IProtocol; const events : IProcessorEvents = nil): Boolean;
-var msg, newMsg : IMessage;
-    idx         : Integer;
-    sService    : string;
-    processor   : IProcessor;
-    protocol    : IProtocol;
-const
-  ERROR_INVALID_MSGTYPE   = 'Message must be "call" or "oneway"';
-  ERROR_INCOMPATIBLE_PROT = 'No service name found in "%s". Client is expected to use TMultiplexProtocol.';
-  ERROR_UNKNOWN_SERVICE   = 'Service "%s" is not registered with MultiplexedProcessor';
-begin
-  // Use the actual underlying protocol (e.g. TBinaryProtocol) to read the message header.
-  // This pulls the message "off the wire", which we'll deal with at the end of this method.
-  msg := iprot.readMessageBegin();
-  if not (msg.Type_ in [TMessageType.Call, TMessageType.Oneway]) then begin
-    Error( oprot, msg,
-           TApplicationExceptionInvalidMessageType,
-           ERROR_INVALID_MSGTYPE);
-    Exit( FALSE);
-  end;
-
-  // Extract the service name
-  idx := Pos( TMultiplexedProtocol.SEPARATOR, msg.Name);
-  if idx < 1 then begin
-    Error( oprot, msg,
-           TApplicationExceptionInvalidProtocol,
-           Format(ERROR_INCOMPATIBLE_PROT,[msg.Name]));
-    Exit( FALSE);
-  end;
-
-  // Create a new TMessage, something that can be consumed by any TProtocol
-  sService := Copy( msg.Name, 1, idx-1);
-  if not FServiceProcessorMap.TryGetValue( sService, processor)
-  then begin
-    Error( oprot, msg,
-           TApplicationExceptionInternalError,
-           Format(ERROR_UNKNOWN_SERVICE,[sService]));
-    Exit( FALSE);
-  end;
-
-  // Create a new TMessage, removing the service name
-  Inc( idx, Length(TMultiplexedProtocol.SEPARATOR));
-  newMsg := TMessageImpl.Create( Copy( msg.Name, idx, MAXINT), msg.Type_, msg.SeqID);
-
-  // Dispatch processing to the stored processor
-  protocol := TStoredMessageProtocol.Create( iprot, newMsg);
-  result   := processor.process( protocol, oprot, events);
-end;
-
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.Compact.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.Compact.pas
deleted file mode 100644
index e9944d6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.Compact.pas
+++ /dev/null
@@ -1,1105 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-{$SCOPEDENUMS ON}
-
-unit Thrift.Protocol.Compact;
-
-interface
-
-uses
-  Classes,
-  SysUtils,
-  Math,
-  Generics.Collections,
-  Thrift.Transport,
-  Thrift.Protocol,
-  Thrift.Utils;
-
-type
-  ICompactProtocol = interface( IProtocol)
-    ['{C01927EC-021A-45F7-93B1-23D6A5420EDD}']
-  end;
-
-  // Compact protocol implementation for thrift.
-  // Adapted from the C# version.
-  TCompactProtocolImpl = class( TProtocolImpl, ICompactProtocol)
-  public
-    type
-      TFactory = class( TInterfacedObject, IProtocolFactory)
-      public
-        function GetProtocol( const trans: ITransport): IProtocol;
-      end;
-
-  private const
-
-    { TODO
-    static TStruct ANONYMOUS_STRUCT = new TStruct("");
-    static TField TSTOP = new TField("", TType.Stop, (short)0);
-    }
-
-    PROTOCOL_ID       = Byte( $82);
-    VERSION           = Byte( 1);
-    VERSION_MASK      = Byte( $1F); // 0001 1111
-    TYPE_MASK         = Byte( $E0); // 1110 0000
-    TYPE_BITS         = Byte( $07); // 0000 0111
-    TYPE_SHIFT_AMOUNT = Byte( 5);
-
-  private type
-    // All of the on-wire type codes.
-    Types = (
-      STOP          = $00,
-      BOOLEAN_TRUE  = $01,
-      BOOLEAN_FALSE = $02,
-      BYTE_         = $03,
-      I16           = $04,
-      I32           = $05,
-      I64           = $06,
-      DOUBLE_       = $07,
-      BINARY        = $08,
-      LIST          = $09,
-      SET_          = $0A,
-      MAP           = $0B,
-      STRUCT        = $0C
-    );
-
-  private const
-    ttypeToCompactType : array[TType] of Types = (
-      Types.STOP,           // Stop    = 0,
-      Types(-1),            // Void    = 1,
-      Types.BOOLEAN_TRUE,   // Bool_   = 2,
-      Types.BYTE_,          // Byte_   = 3,
-      Types.DOUBLE_,        // Double_ = 4,
-      Types(-5),            // unused
-      Types.I16,            // I16     = 6,
-      Types(-7),            // unused
-      Types.I32,            // I32     = 8,
-      Types(-9),            // unused
-      Types.I64,            // I64     = 10,
-      Types.BINARY,         // String_ = 11,
-      Types.STRUCT,         // Struct  = 12,
-      Types.MAP,            // Map     = 13,
-      Types.SET_,           // Set_    = 14,
-      Types.LIST            // List    = 15,
-    );
-
-    tcompactTypeToType : array[Types] of TType = (
-      TType.Stop,       // STOP
-      TType.Bool_,      // BOOLEAN_TRUE
-      TType.Bool_,      // BOOLEAN_FALSE
-      TType.Byte_,      // BYTE_
-      TType.I16,        // I16
-      TType.I32,        // I32
-      TType.I64,        // I64
-      TType.Double_,    // DOUBLE_
-      TType.String_,    // BINARY
-      TType.List,       // LIST
-      TType.Set_,       // SET_
-      TType.Map,        // MAP
-      TType.Struct      // STRUCT
-    );
-
-  private
-    // Used to keep track of the last field for the current and previous structs,
-    // so we can do the delta stuff.
-    lastField_ : TStack<Integer>;
-    lastFieldId_ : Integer;
-
-    // If we encounter a boolean field begin, save the TField here so it can
-    // have the value incorporated.
-    private booleanField_ : IField;
-
-    // If we Read a field header, and it's a boolean field, save the boolean
-    // value here so that ReadBool can use it.
-    private  boolValue_  : ( unused, bool_true, bool_false);
-
-  public
-    constructor Create(const trans : ITransport);
-    destructor Destroy;  override;
-
-    procedure Reset;
-
-  private
-    procedure WriteByteDirect( const b : Byte);  overload;
-
-    // Writes a byte without any possibility of all that field header nonsense.
-    procedure WriteByteDirect( const n : Integer);  overload;
-
-    // Write an i32 as a varint. Results in 1-5 bytes on the wire.
-    // TODO: make a permanent buffer like WriteVarint64?
-    procedure WriteVarint32( n : Cardinal);
-
-  private
-    // The workhorse of WriteFieldBegin. It has the option of doing a 'type override'
-    // of the type header. This is used specifically in the boolean field case.
-    procedure WriteFieldBeginInternal( const field : IField; typeOverride : Byte);
-
-  public
-    procedure WriteMessageBegin( const msg: IMessage); override;
-    procedure WriteMessageEnd; override;
-    procedure WriteStructBegin( const struc: IStruct); override;
-    procedure WriteStructEnd; override;
-    procedure WriteFieldBegin( const field: IField); override;
-    procedure WriteFieldEnd; override;
-    procedure WriteFieldStop; override;
-    procedure WriteMapBegin( const map: IMap); override;
-    procedure WriteMapEnd; override;
-    procedure WriteListBegin( const list: IList); override;
-    procedure WriteListEnd(); override;
-    procedure WriteSetBegin( const set_: ISet ); override;
-    procedure WriteSetEnd(); override;
-    procedure WriteBool( b: Boolean); override;
-    procedure WriteByte( b: ShortInt); override;
-    procedure WriteI16( i16: SmallInt); override;
-    procedure WriteI32( i32: Integer); override;
-    procedure WriteI64( const i64: Int64); override;
-    procedure WriteDouble( const dub: Double); override;
-    procedure WriteBinary( const b: TBytes); overload; override;
-
-  private
-    class function  DoubleToInt64Bits( const db : Double) : Int64;
-    class function  Int64BitsToDouble( const i64 : Int64) : Double;
-
-    // Abstract method for writing the start of lists and sets. List and sets on
-    // the wire differ only by the type indicator.
-    procedure WriteCollectionBegin( const elemType : TType; size : Integer);
-
-    procedure WriteVarint64( n : UInt64);
-
-    // Convert l into a zigzag long. This allows negative numbers to be
-    // represented compactly as a varint.
-    class function  longToZigzag( const n : Int64) : UInt64;
-
-    // Convert n into a zigzag int. This allows negative numbers to be
-    // represented compactly as a varint.
-    class function intToZigZag( const n : Integer) : Cardinal;
-
-    //Convert a Int64 into little-endian bytes in buf starting at off and going until off+7.
-    class procedure fixedLongToBytes( const n : Int64; var buf : TBytes);
-
-  public
-    function  ReadMessageBegin: IMessage; override;
-    procedure ReadMessageEnd(); override;
-    function  ReadStructBegin: IStruct; override;
-    procedure ReadStructEnd; override;
-    function  ReadFieldBegin: IField; override;
-    procedure ReadFieldEnd(); override;
-    function  ReadMapBegin: IMap; override;
-    procedure ReadMapEnd(); override;
-    function  ReadListBegin: IList; override;
-    procedure ReadListEnd(); override;
-    function  ReadSetBegin: ISet; override;
-    procedure ReadSetEnd(); override;
-    function  ReadBool: Boolean; override;
-    function  ReadByte: ShortInt; override;
-    function  ReadI16: SmallInt; override;
-    function  ReadI32: Integer; override;
-    function  ReadI64: Int64; override;
-    function  ReadDouble:Double; override;
-    function  ReadBinary: TBytes; overload; override;
-
-  private
-    // Internal Reading methods
-
-    // Read an i32 from the wire as a varint. The MSB of each byte is set
-    // if there is another byte to follow. This can Read up to 5 bytes.
-    function ReadVarint32 : Cardinal;
-
-    // Read an i64 from the wire as a proper varint. The MSB of each byte is set
-    // if there is another byte to follow. This can Read up to 10 bytes.
-    function ReadVarint64 : UInt64;
-
-
-    // encoding helpers
-
-    // Convert from zigzag Integer to Integer.
-    class function zigzagToInt( const n : Cardinal ) : Integer;
-
-    // Convert from zigzag Int64 to Int64.
-    class function zigzagToLong( const n : UInt64) : Int64;
-
-    // Note that it's important that the mask bytes are Int64 literals,
-    // otherwise they'll default to ints, and when you shift an Integer left 56 bits,
-    // you just get a messed up Integer.
-    class function bytesToLong( const bytes : TBytes) : Int64;
-
-    // type testing and converting
-    class function isBoolType( const b : byte) : Boolean;
-
-    // Given a TCompactProtocol.Types constant, convert it to its corresponding TType value.
-    class function getTType( const type_ : byte) : TType;
-
-    // Given a TType value, find the appropriate TCompactProtocol.Types constant.
-    class function getCompactType( const ttype : TType) : Byte;
-  end;
-
-
-implementation
-
-
-
-//--- TCompactProtocolImpl.TFactory ----------------------------------------
-
-
-function TCompactProtocolImpl.TFactory.GetProtocol( const trans: ITransport): IProtocol;
-begin
-  result := TCompactProtocolImpl.Create( trans);
-end;
-
-
-//--- TCompactProtocolImpl -------------------------------------------------
-
-
-constructor TCompactProtocolImpl.Create(const trans: ITransport);
-begin
-  inherited Create( trans);
-
-  lastFieldId_ := 0;
-  lastField_ := TStack<Integer>.Create;
-
-  booleanField_ := nil;
-  boolValue_ := unused;
-end;
-
-
-destructor TCompactProtocolImpl.Destroy;
-begin
-  try
-    FreeAndNil( lastField_);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-
-procedure TCompactProtocolImpl.Reset;
-begin
-  lastField_.Clear();
-  lastFieldId_ := 0;
-  booleanField_ := nil;
-  boolValue_ := unused;
-end;
-
-
-// Writes a byte without any possibility of all that field header nonsense.
-// Used internally by other writing methods that know they need to Write a byte.
-procedure TCompactProtocolImpl.WriteByteDirect( const b : Byte);
-var data : TBytes;
-begin
-  SetLength( data, 1);
-  data[0] := b;
-  Transport.Write( data);
-end;
-
-
-// Writes a byte without any possibility of all that field header nonsense.
-procedure TCompactProtocolImpl.WriteByteDirect( const n : Integer);
-begin
-  WriteByteDirect( Byte(n));
-end;
-
-
-// Write an i32 as a varint. Results in 1-5 bytes on the wire.
-procedure TCompactProtocolImpl.WriteVarint32( n : Cardinal);
-var i32buf : TBytes;
-    idx : Integer;
-begin
-  SetLength( i32buf, 5);
-  idx := 0;
-  while TRUE do begin
-    ASSERT( idx < Length(i32buf));
-
-    // last part?
-    if ((n and not $7F) = 0) then begin
-      i32buf[idx] := Byte(n);
-      Inc(idx);
-      Break;
-    end;
-
-    i32buf[idx] := Byte((n and $7F) or $80);
-    Inc(idx);
-    n := n shr 7;
-  end;
-
-  Transport.Write( i32buf, 0, idx);
-end;
-
-
-// Write a message header to the wire. Compact Protocol messages contain the
-// protocol version so we can migrate forwards in the future if need be.
-procedure TCompactProtocolImpl.WriteMessageBegin( const msg: IMessage);
-var versionAndType : Byte;
-begin
-  Reset;
-
-  versionAndType := Byte( VERSION and VERSION_MASK)
-                 or Byte( (Cardinal(msg.Type_) shl TYPE_SHIFT_AMOUNT) and TYPE_MASK);
-
-  WriteByteDirect( PROTOCOL_ID);
-  WriteByteDirect( versionAndType);
-  WriteVarint32( Cardinal(msg.SeqID));
-  WriteString( msg.Name);
-end;
-
-
-// Write a struct begin. This doesn't actually put anything on the wire. We use it as an
-// opportunity to put special placeholder markers on the field stack so we can get the
-// field id deltas correct.
-procedure TCompactProtocolImpl.WriteStructBegin( const struc: IStruct);
-begin
-  lastField_.Push(lastFieldId_);
-  lastFieldId_ := 0;
-end;
-
-
-// Write a struct end. This doesn't actually put anything on the wire. We use this as an
-// opportunity to pop the last field from the current struct off of the field stack.
-procedure TCompactProtocolImpl.WriteStructEnd;
-begin
-  lastFieldId_ := lastField_.Pop();
-end;
-
-
-// Write a field header containing the field id and field type. If the difference between the
-// current field id and the last one is small (< 15), then the field id will be encoded in
-// the 4 MSB as a delta. Otherwise, the field id will follow the type header as a zigzag varint.
-procedure TCompactProtocolImpl.WriteFieldBegin( const field: IField);
-begin
-  case field.Type_ of
-    TType.Bool_ : booleanField_ := field; // we want to possibly include the value, so we'll wait.
-  else
-    WriteFieldBeginInternal(field, $FF);
-  end;
-end;
-
-
-// The workhorse of WriteFieldBegin. It has the option of doing a 'type override'
-// of the type header. This is used specifically in the boolean field case.
-procedure TCompactProtocolImpl.WriteFieldBeginInternal( const field : IField; typeOverride : Byte);
-var typeToWrite : Byte;
-begin
-  // if there's a type override, use that.
-  if typeOverride = $FF
-  then typeToWrite := getCompactType( field.Type_)
-  else typeToWrite := typeOverride;
-
-  // check if we can use delta encoding for the field id
-  if (field.ID > lastFieldId_) and ((field.ID - lastFieldId_) <= 15)
-  then begin
-    // Write them together
-    WriteByteDirect( ((field.ID - lastFieldId_) shl 4) or typeToWrite);
-  end
-  else begin
-    // Write them separate
-    WriteByteDirect( typeToWrite);
-    WriteI16( field.ID);
-  end;
-
-  lastFieldId_ := field.ID;
-end;
-
-
-// Write the STOP symbol so we know there are no more fields in this struct.
-procedure TCompactProtocolImpl.WriteFieldStop;
-begin
-  WriteByteDirect( Byte( Types.STOP));
-end;
-
-
-// Write a map header. If the map is empty, omit the key and value type
-// headers, as we don't need any additional information to skip it.
-procedure TCompactProtocolImpl.WriteMapBegin( const map: IMap);
-var key, val : Byte;
-begin
-  if (map.Count = 0)
-  then WriteByteDirect( 0)
-  else begin
-    WriteVarint32( Cardinal( map.Count));
-    key := getCompactType(map.KeyType);
-    val := getCompactType(map.ValueType);
-    WriteByteDirect( (key shl 4) or val);
-  end;
-end;
-
-
-// Write a list header.
-procedure TCompactProtocolImpl.WriteListBegin( const list: IList);
-begin
-  WriteCollectionBegin( list.ElementType, list.Count);
-end;
-
-
-// Write a set header.
-procedure TCompactProtocolImpl.WriteSetBegin( const set_: ISet );
-begin
-  WriteCollectionBegin( set_.ElementType, set_.Count);
-end;
-
-
-// Write a boolean value. Potentially, this could be a boolean field, in
-// which case the field header info isn't written yet. If so, decide what the
-// right type header is for the value and then Write the field header.
-// Otherwise, Write a single byte.
-procedure TCompactProtocolImpl.WriteBool( b: Boolean);
-var bt : Types;
-begin
-  if b
-  then bt := Types.BOOLEAN_TRUE
-  else bt := Types.BOOLEAN_FALSE;
-
-  if booleanField_ <> nil then begin
-    // we haven't written the field header yet
-    WriteFieldBeginInternal( booleanField_, Byte(bt));
-    booleanField_ := nil;
-  end
-  else begin
-    // we're not part of a field, so just Write the value.
-    WriteByteDirect( Byte(bt));
-  end;
-end;
-
-
-// Write a byte. Nothing to see here!
-procedure TCompactProtocolImpl.WriteByte( b: ShortInt);
-begin
-  WriteByteDirect( Byte(b));
-end;
-
-
-// Write an I16 as a zigzag varint.
-procedure TCompactProtocolImpl.WriteI16( i16: SmallInt);
-begin
-  WriteVarint32( intToZigZag( i16));
-end;
-
-
-// Write an i32 as a zigzag varint.
-procedure TCompactProtocolImpl.WriteI32( i32: Integer);
-begin
-  WriteVarint32( intToZigZag( i32));
-end;
-
-
-// Write an i64 as a zigzag varint.
-procedure TCompactProtocolImpl.WriteI64( const i64: Int64);
-begin
-  WriteVarint64( longToZigzag( i64));
-end;
-
-
-class function TCompactProtocolImpl.DoubleToInt64Bits( const db : Double) : Int64;
-begin
-  ASSERT( SizeOf(db) = SizeOf(result));
-  Move( db, result, SizeOf(result));
-end;
-
-
-class function TCompactProtocolImpl.Int64BitsToDouble( const i64 : Int64) : Double;
-begin
-  ASSERT( SizeOf(i64) = SizeOf(result));
-  Move( i64, result, SizeOf(result));
-end;
-
-
-// Write a double to the wire as 8 bytes.
-procedure TCompactProtocolImpl.WriteDouble( const dub: Double);
-var data : TBytes;
-begin
-  fixedLongToBytes( DoubleToInt64Bits(dub), data);
-  Transport.Write( data);
-end;
-
-
-// Write a byte array, using a varint for the size.
-procedure TCompactProtocolImpl.WriteBinary( const b: TBytes);
-begin
-  WriteVarint32( Cardinal(Length(b)));
-  Transport.Write( b);
-end;
-
-procedure TCompactProtocolImpl.WriteMessageEnd;
-begin
-  // nothing to do
-end;
-
-
-procedure TCompactProtocolImpl.WriteMapEnd;
-begin
-  // nothing to do
-end;
-
-
-procedure TCompactProtocolImpl.WriteListEnd;
-begin
-  // nothing to do
-end;
-
-
-procedure TCompactProtocolImpl.WriteSetEnd;
-begin
-  // nothing to do
-end;
-
-
-procedure TCompactProtocolImpl.WriteFieldEnd;
-begin
-  // nothing to do
-end;
-
-
-// Abstract method for writing the start of lists and sets. List and sets on
-// the wire differ only by the type indicator.
-procedure TCompactProtocolImpl.WriteCollectionBegin( const elemType : TType; size : Integer);
-begin
-  if size <= 14
-  then WriteByteDirect( (size shl 4) or getCompactType(elemType))
-  else begin
-    WriteByteDirect( $F0 or getCompactType(elemType));
-    WriteVarint32( Cardinal(size));
-  end;
-end;
-
-
-// Write an i64 as a varint. Results in 1-10 bytes on the wire.
-procedure TCompactProtocolImpl.WriteVarint64( n : UInt64);
-var varint64out : TBytes;
-    idx : Integer;
-begin
-  SetLength( varint64out, 10);
-  idx := 0;
-  while TRUE do begin
-    ASSERT( idx < Length(varint64out));
-
-    // last one?
-    if (n and not UInt64($7F)) = 0 then begin
-      varint64out[idx] := Byte(n);
-      Inc(idx);
-      Break;
-    end;
-
-    varint64out[idx] := Byte((n and $7F) or $80);
-    Inc(idx);
-    n := n shr 7;
-  end;
-
-  Transport.Write( varint64out, 0, idx);
-end;
-
-
-// Convert l into a zigzag Int64. This allows negative numbers to be
-// represented compactly as a varint.
-class function TCompactProtocolImpl.longToZigzag( const n : Int64) : UInt64;
-begin
-  // there is no arithmetic right shift in Delphi
-  if n >= 0
-  then result := UInt64(n shl 1)
-  else result := UInt64(n shl 1) xor $FFFFFFFFFFFFFFFF;
-end;
-
-
-// Convert n into a zigzag Integer. This allows negative numbers to be
-// represented compactly as a varint.
-class function TCompactProtocolImpl.intToZigZag( const n : Integer) : Cardinal;
-begin
-  // there is no arithmetic right shift in Delphi
-  if n >= 0
-  then result := Cardinal(n shl 1)
-  else result := Cardinal(n shl 1) xor $FFFFFFFF;
-end;
-
-
-// Convert a Int64 into 8 little-endian bytes in buf
-class procedure TCompactProtocolImpl.fixedLongToBytes( const n : Int64; var buf : TBytes);
-begin
-  SetLength( buf, 8);
-  buf[0] := Byte( n         and $FF);
-  buf[1] := Byte((n shr 8)  and $FF);
-  buf[2] := Byte((n shr 16) and $FF);
-  buf[3] := Byte((n shr 24) and $FF);
-  buf[4] := Byte((n shr 32) and $FF);
-  buf[5] := Byte((n shr 40) and $FF);
-  buf[6] := Byte((n shr 48) and $FF);
-  buf[7] := Byte((n shr 56) and $FF);
-end;
-
-
-
-// Read a message header.
-function TCompactProtocolImpl.ReadMessageBegin : IMessage;
-var protocolId, versionAndType, version, type_ : Byte;
-    seqid : Integer;
-    msgNm : String;
-begin
-  Reset;
-
-  protocolId := Byte( ReadByte);
-  if (protocolId <> PROTOCOL_ID)
-  then raise TProtocolExceptionBadVersion.Create( 'Expected protocol id ' + IntToHex(PROTOCOL_ID,2)
-                                                + ' but got ' + IntToHex(protocolId,2));
-
-  versionAndType := Byte( ReadByte);
-  version        := Byte( versionAndType and VERSION_MASK);
-  if (version <> VERSION)
-  then raise TProtocolExceptionBadVersion.Create( 'Expected version ' +IntToStr(VERSION)
-                                                + ' but got ' + IntToStr(version));
-
-  type_ := Byte( (versionAndType shr TYPE_SHIFT_AMOUNT) and TYPE_BITS);
-  seqid := Integer( ReadVarint32);
-  msgNm := ReadString;
-  result := TMessageImpl.Create( msgNm, TMessageType(type_), seqid);
-end;
-
-
-// Read a struct begin. There's nothing on the wire for this, but it is our
-// opportunity to push a new struct begin marker onto the field stack.
-function TCompactProtocolImpl.ReadStructBegin: IStruct;
-begin
-  lastField_.Push( lastFieldId_);
-  lastFieldId_ := 0;
-  result := TStructImpl.Create('');
-end;
-
-
-// Doesn't actually consume any wire data, just removes the last field for
-// this struct from the field stack.
-procedure TCompactProtocolImpl.ReadStructEnd;
-begin
-  // consume the last field we Read off the wire.
-  lastFieldId_ := lastField_.Pop();
-end;
-
-
-// Read a field header off the wire.
-function TCompactProtocolImpl.ReadFieldBegin: IField;
-var type_ : Byte;
-    fieldId, modifier : ShortInt;
-begin
-  type_ := Byte( ReadByte);
-
-  // if it's a stop, then we can return immediately, as the struct is over.
-  if type_ = Byte(Types.STOP) then begin
-    result := TFieldImpl.Create( '', TType.Stop, 0);
-    Exit;
-  end;
-
-  // mask off the 4 MSB of the type header. it could contain a field id delta.
-  modifier := ShortInt( (type_ and $F0) shr 4);
-  if (modifier = 0)
-  then fieldId := ReadI16    // not a delta. look ahead for the zigzag varint field id.
-  else fieldId := ShortInt( lastFieldId_ + modifier); // add the delta to the last Read field id.
-
-  result := TFieldImpl.Create( '', getTType(Byte(type_ and $0F)), fieldId);
-
-  // if this happens to be a boolean field, the value is encoded in the type
-   // save the boolean value in a special instance variable.
-  if isBoolType(type_) then begin
-    if Byte(type_ and $0F) = Byte(Types.BOOLEAN_TRUE)
-    then boolValue_ := bool_true
-    else boolValue_ := bool_false;
-  end;
-
-  // push the new field onto the field stack so we can keep the deltas going.
-  lastFieldId_ := result.ID;
-end;
-
-
-// Read a map header off the wire. If the size is zero, skip Reading the key
-// and value type. This means that 0-length maps will yield TMaps without the
-// "correct" types.
-function TCompactProtocolImpl.ReadMapBegin: IMap;
-var size : Integer;
-    keyAndValueType : Byte;
-    key, val : TType;
-begin
-  size := Integer( ReadVarint32);
-  if size = 0
-  then keyAndValueType := 0
-  else keyAndValueType := Byte( ReadByte);
-
-  key := getTType( Byte( keyAndValueType shr 4));
-  val := getTType( Byte( keyAndValueType and $F));
-  result := TMapImpl.Create( key, val, size);
-  ASSERT( (result.KeyType = key) and (result.ValueType = val));
-end;
-
-
-// Read a list header off the wire. If the list size is 0-14, the size will
-// be packed into the element type header. If it's a longer list, the 4 MSB
-// of the element type header will be $F, and a varint will follow with the
-// true size.
-function TCompactProtocolImpl.ReadListBegin: IList;
-var size_and_type : Byte;
-    size : Integer;
-    type_ : TType;
-begin
-  size_and_type := Byte( ReadByte);
-
-  size := (size_and_type shr 4) and $0F;
-  if (size = 15)
-  then size := Integer( ReadVarint32);
-
-  type_ := getTType( size_and_type);
-  result := TListImpl.Create( type_, size);
-end;
-
-
-// Read a set header off the wire. If the set size is 0-14, the size will
-// be packed into the element type header. If it's a longer set, the 4 MSB
-// of the element type header will be $F, and a varint will follow with the
-// true size.
-function TCompactProtocolImpl.ReadSetBegin: ISet;
-var size_and_type : Byte;
-    size : Integer;
-    type_ : TType;
-begin
-  size_and_type := Byte( ReadByte);
-
-  size := (size_and_type shr 4) and $0F;
-  if (size = 15)
-  then size := Integer( ReadVarint32);
-
-  type_ := getTType( size_and_type);
-  result := TSetImpl.Create( type_, size);
-end;
-
-
-// Read a boolean off the wire. If this is a boolean field, the value should
-// already have been Read during ReadFieldBegin, so we'll just consume the
-// pre-stored value. Otherwise, Read a byte.
-function TCompactProtocolImpl.ReadBool: Boolean;
-begin
-  if boolValue_ <> unused then begin
-    result := (boolValue_ = bool_true);
-    boolValue_ := unused;
-    Exit;
-  end;
-
-  result := (Byte(ReadByte) = Byte(Types.BOOLEAN_TRUE));
-end;
-
-
-// Read a single byte off the wire. Nothing interesting here.
-function TCompactProtocolImpl.ReadByte: ShortInt;
-var data : TBytes;
-begin
-  SetLength( data, 1);
-  Transport.ReadAll( data, 0, 1);
-  result := ShortInt(data[0]);
-end;
-
-
-// Read an i16 from the wire as a zigzag varint.
-function TCompactProtocolImpl.ReadI16: SmallInt;
-begin
-  result := SmallInt( zigzagToInt( ReadVarint32));
-end;
-
-
-// Read an i32 from the wire as a zigzag varint.
-function TCompactProtocolImpl.ReadI32: Integer;
-begin
-  result := zigzagToInt( ReadVarint32);
-end;
-
-
-// Read an i64 from the wire as a zigzag varint.
-function TCompactProtocolImpl.ReadI64: Int64;
-begin
-  result := zigzagToLong( ReadVarint64);
-end;
-
-
-// No magic here - just Read a double off the wire.
-function TCompactProtocolImpl.ReadDouble:Double;
-var longBits : TBytes;
-begin
-  SetLength( longBits, 8);
-  Transport.ReadAll( longBits, 0, 8);
-  result := Int64BitsToDouble( bytesToLong( longBits));
-end;
-
-
-// Read a byte[] from the wire.
-function TCompactProtocolImpl.ReadBinary: TBytes;
-var length : Integer;
-begin
-  length := Integer( ReadVarint32);
-  SetLength( result, length);
-  if (length > 0)
-  then Transport.ReadAll( result, 0, length);
-end;
-
-
-procedure TCompactProtocolImpl.ReadMessageEnd;
-begin
-  // nothing to do
-end;
-
-
-procedure TCompactProtocolImpl.ReadFieldEnd;
-begin
-  // nothing to do
-end;
-
-
-procedure TCompactProtocolImpl.ReadMapEnd;
-begin
-  // nothing to do
-end;
-
-
-procedure TCompactProtocolImpl.ReadListEnd;
-begin
-  // nothing to do
-end;
-
-
-procedure TCompactProtocolImpl.ReadSetEnd;
-begin
-  // nothing to do
-end;
-
-
-
-// Read an i32 from the wire as a varint. The MSB of each byte is set
-// if there is another byte to follow. This can Read up to 5 bytes.
-function TCompactProtocolImpl.ReadVarint32 : Cardinal;
-var shift : Integer;
-    b : Byte;
-begin
-  result := 0;
-  shift  := 0;
-  while TRUE do begin
-    b := Byte( ReadByte);
-    result := result or (Cardinal(b and $7F) shl shift);
-    if ((b and $80) <> $80)
-    then Break;
-    Inc( shift, 7);
-  end;
-end;
-
-
-// Read an i64 from the wire as a proper varint. The MSB of each byte is set
-// if there is another byte to follow. This can Read up to 10 bytes.
-function TCompactProtocolImpl.ReadVarint64 : UInt64;
-var shift : Integer;
-    b : Byte;
-begin
-  result := 0;
-  shift  := 0;
-  while TRUE do begin
-    b := Byte( ReadByte);
-    result := result or (UInt64(b and $7F) shl shift);
-    if ((b and $80) <> $80)
-    then Break;
-    Inc( shift, 7);
-  end;
-end;
-
-
-// Convert from zigzag Integer to Integer.
-class function TCompactProtocolImpl.zigzagToInt( const n : Cardinal ) : Integer;
-begin
-  result := Integer(n shr 1) xor (-Integer(n and 1));
-end;
-
-
-// Convert from zigzag Int64 to Int64.
-class function TCompactProtocolImpl.zigzagToLong( const n : UInt64) : Int64;
-begin
-  result := Int64(n shr 1) xor (-Int64(n and 1));
-end;
-
-
-// Note that it's important that the mask bytes are Int64 literals,
-// otherwise they'll default to ints, and when you shift an Integer left 56 bits,
-// you just get a messed up Integer.
-class function TCompactProtocolImpl.bytesToLong( const bytes : TBytes) : Int64;
-begin
-  ASSERT( Length(bytes) >= 8);
-  result := (Int64(bytes[7] and $FF) shl 56) or
-            (Int64(bytes[6] and $FF) shl 48) or
-            (Int64(bytes[5] and $FF) shl 40) or
-            (Int64(bytes[4] and $FF) shl 32) or
-            (Int64(bytes[3] and $FF) shl 24) or
-            (Int64(bytes[2] and $FF) shl 16) or
-            (Int64(bytes[1] and $FF) shl  8) or
-            (Int64(bytes[0] and $FF));
-end;
-
-
-class function TCompactProtocolImpl.isBoolType( const b : byte) : Boolean;
-var lowerNibble : Byte;
-begin
-  lowerNibble := b and $0f;
-  result := (Types(lowerNibble) in [Types.BOOLEAN_TRUE, Types.BOOLEAN_FALSE]);
-end;
-
-
-// Given a TCompactProtocol.Types constant, convert it to its corresponding TType value.
-class function TCompactProtocolImpl.getTType( const type_ : byte) : TType;
-var tct : Types;
-begin
-  tct := Types( type_ and $0F);
-  if tct in [Low(Types)..High(Types)]
-  then result := tcompactTypeToType[tct]
-  else raise TProtocolExceptionInvalidData.Create('don''t know what type: '+IntToStr(Ord(tct)));
-end;
-
-
-// Given a TType value, find the appropriate TCompactProtocol.Types constant.
-class function TCompactProtocolImpl.getCompactType( const ttype : TType) : Byte;
-begin
-  if ttype in VALID_TTYPES
-  then result := Byte( ttypeToCompactType[ttype])
-  else raise TProtocolExceptionInvalidData.Create('don''t know what type: '+IntToStr(Ord(ttype)));
-end;
-
-
-//--- unit tests -------------------------------------------
-
-{$IFDEF Debug}
-procedure TestDoubleToInt64Bits;
-
-  procedure TestPair( const a : Double; const b : Int64);
-  begin
-    ASSERT( TCompactProtocolImpl.DoubleToInt64Bits(a) = b);
-    ASSERT( TCompactProtocolImpl.Int64BitsToDouble(b) = a);
-  end;
-
-begin
-  TestPair( 1.0000000000000000E+000,  Int64($3FF0000000000000));
-  TestPair( 1.5000000000000000E+001,  Int64($402E000000000000));
-  TestPair( 2.5500000000000000E+002,  Int64($406FE00000000000));
-  TestPair( 4.2949672950000000E+009,  Int64($41EFFFFFFFE00000));
-  TestPair( 3.9062500000000000E-003,  Int64($3F70000000000000));
-  TestPair( 2.3283064365386963E-010,  Int64($3DF0000000000000));
-  TestPair( 1.2345678901230000E-300,  Int64($01AA74FE1C1E7E45));
-  TestPair( 1.2345678901234500E-150,  Int64($20D02A36586DB4BB));
-  TestPair( 1.2345678901234565E+000,  Int64($3FF3C0CA428C59FA));
-  TestPair( 1.2345678901234567E+000,  Int64($3FF3C0CA428C59FB));
-  TestPair( 1.2345678901234569E+000,  Int64($3FF3C0CA428C59FC));
-  TestPair( 1.2345678901234569E+150,  Int64($5F182344CD3CDF9F));
-  TestPair( 1.2345678901234569E+300,  Int64($7E3D7EE8BCBBD352));
-  TestPair( -1.7976931348623157E+308, Int64($FFEFFFFFFFFFFFFF));
-  TestPair( 1.7976931348623157E+308,  Int64($7FEFFFFFFFFFFFFF));
-  TestPair( 4.9406564584124654E-324,  Int64($0000000000000001));
-  TestPair( 0.0000000000000000E+000,  Int64($0000000000000000));
-  TestPair( 4.94065645841247E-324,    Int64($0000000000000001));
-  TestPair( 3.2378592100206092E-319,  Int64($000000000000FFFF));
-  TestPair( 1.3906711615669959E-309,  Int64($0000FFFFFFFFFFFF));
-  TestPair( NegInfinity,              Int64($FFF0000000000000));
-  TestPair( Infinity,                 Int64($7FF0000000000000));
-
-  // NaN is special
-  ASSERT( TCompactProtocolImpl.DoubleToInt64Bits( NaN) = Int64($FFF8000000000000));
-  ASSERT( IsNan( TCompactProtocolImpl.Int64BitsToDouble( Int64($FFF8000000000000))));
-end;
-{$ENDIF}
-
-
-{$IFDEF Debug}
-procedure TestZigZag;
-
-  procedure Test32( const test : Integer);
-  var zz : Cardinal;
-  begin
-    zz := TCompactProtocolImpl.intToZigZag(test);
-    ASSERT( TCompactProtocolImpl.zigzagToInt(zz) = test, IntToStr(test));
-  end;
-
-  procedure Test64( const test : Int64);
-  var zz : UInt64;
-  begin
-    zz := TCompactProtocolImpl.longToZigzag(test);
-    ASSERT( TCompactProtocolImpl.zigzagToLong(zz) = test, IntToStr(test));
-  end;
-
-var i : Integer;
-begin
-  // protobuf testcases
-  ASSERT( TCompactProtocolImpl.intToZigZag(0)  = 0, 'pb #1 to ZigZag');
-  ASSERT( TCompactProtocolImpl.intToZigZag(-1) = 1, 'pb #2 to ZigZag');
-  ASSERT( TCompactProtocolImpl.intToZigZag(1)  = 2, 'pb #3 to ZigZag');
-  ASSERT( TCompactProtocolImpl.intToZigZag(-2) = 3, 'pb #4 to ZigZag');
-  ASSERT( TCompactProtocolImpl.intToZigZag(+2147483647) = 4294967294, 'pb #5 to ZigZag');
-  ASSERT( TCompactProtocolImpl.intToZigZag(-2147483648) = 4294967295, 'pb #6 to ZigZag');
-
-  // protobuf testcases
-  ASSERT( TCompactProtocolImpl.zigzagToInt(0)  = 0, 'pb #1 from ZigZag');
-  ASSERT( TCompactProtocolImpl.zigzagToInt(1) = -1, 'pb #2 from ZigZag');
-  ASSERT( TCompactProtocolImpl.zigzagToInt(2)  = 1, 'pb #3 from ZigZag');
-  ASSERT( TCompactProtocolImpl.zigzagToInt(3) = -2, 'pb #4 from ZigZag');
-  ASSERT( TCompactProtocolImpl.zigzagToInt(4294967294) = +2147483647, 'pb #5 from ZigZag');
-  ASSERT( TCompactProtocolImpl.zigzagToInt(4294967295) = -2147483648, 'pb #6 from ZigZag');
-
-  // back and forth 32
-  Test32( 0);
-  for i := 0 to 30 do begin
-    Test32( +(Integer(1) shl i));
-    Test32( -(Integer(1) shl i));
-  end;
-  Test32( Integer($7FFFFFFF));
-  Test32( Integer($80000000));
-
-  // back and forth 64
-  Test64( 0);
-  for i := 0 to 62 do begin
-    Test64( +(Int64(1) shl i));
-    Test64( -(Int64(1) shl i));
-  end;
-  Test64( Int64($7FFFFFFFFFFFFFFF));
-  Test64( Int64($8000000000000000));
-end;
-{$ENDIF}
-
-
-{$IFDEF Debug}
-procedure TestLongBytes;
-
-  procedure Test( const test : Int64);
-  var buf : TBytes;
-  begin
-    TCompactProtocolImpl.fixedLongToBytes( test, buf);
-    ASSERT( TCompactProtocolImpl.bytesToLong( buf) = test, IntToStr(test));
-  end;
-
-var i : Integer;
-begin
-  Test( 0);
-  for i := 0 to 62 do begin
-    Test( +(Int64(1) shl i));
-    Test( -(Int64(1) shl i));
-  end;
-  Test( Int64($7FFFFFFFFFFFFFFF));
-  Test( Int64($8000000000000000));
-end;
-{$ENDIF}
-
-
-initialization
-  {$IFDEF Debug}
-  TestDoubleToInt64Bits;
-  TestZigZag;
-  TestLongBytes;
-  {$ENDIF}
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.JSON.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.JSON.pas
deleted file mode 100644
index 71ee7ae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.JSON.pas
+++ /dev/null
@@ -1,1239 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-{$SCOPEDENUMS ON}
-
-unit Thrift.Protocol.JSON;
-
-interface
-
-uses
-  Character,
-  Classes,
-  SysUtils,
-  Math,
-  Generics.Collections,
-  Thrift.Transport,
-  Thrift.Protocol,
-  Thrift.Utils;
-
-type
-  IJSONProtocol = interface( IProtocol)
-    ['{F0DAFDBD-692A-4B71-9736-F5D485A2178F}']
-    // Read a byte that must match b; otherwise an exception is thrown.
-    procedure ReadJSONSyntaxChar( b : Byte);
-  end;
-
-  // JSON protocol implementation for thrift.
-  // This is a full-featured protocol supporting Write and Read.
-  // Please see the C++ class header for a detailed description of the protocol's wire format.
-  // Adapted from the C# version.
-  TJSONProtocolImpl = class( TProtocolImpl, IJSONProtocol)
-  public
-    type
-      TFactory = class( TInterfacedObject, IProtocolFactory)
-      public
-        function GetProtocol( const trans: ITransport): IProtocol;
-      end;
-
-  private
-    class function GetTypeNameForTypeID(typeID : TType) : string;
-    class function GetTypeIDForTypeName( const name : string) : TType;
-
-  protected
-    type
-      // Base class for tracking JSON contexts that may require
-      // inserting/Reading additional JSON syntax characters.
-      // This base context does nothing.
-      TJSONBaseContext = class
-      protected
-        FProto : Pointer;  // weak IJSONProtocol;
-      public
-        constructor Create( const aProto : IJSONProtocol);
-        procedure Write;  virtual;
-        procedure Read;  virtual;
-        function EscapeNumbers : Boolean;  virtual;
-      end;
-
-      // Context for JSON lists.
-      // Will insert/Read commas before each item except for the first one.
-      TJSONListContext = class( TJSONBaseContext)
-      private
-        FFirst : Boolean;
-      public
-        constructor Create( const aProto : IJSONProtocol);
-        procedure Write;  override;
-        procedure Read;  override;
-      end;
-
-      // Context for JSON records. Will insert/Read colons before the value portion of each record
-      // pair, and commas before each key except the first. In addition, will indicate that numbers
-      // in the key position need to be escaped in quotes (since JSON keys must be strings).
-      TJSONPairContext = class( TJSONBaseContext)
-      private
-        FFirst, FColon : Boolean;
-      public
-        constructor Create( const aProto : IJSONProtocol);
-        procedure Write;  override;
-        procedure Read;  override;
-        function EscapeNumbers : Boolean;  override;
-      end;
-
-      // Holds up to one byte from the transport
-      TLookaheadReader = class
-      protected
-        FProto : Pointer;  // weak IJSONProtocol;
-        constructor Create( const aProto : IJSONProtocol);
-
-      private
-        FHasData : Boolean;
-        FData    : TBytes;
-
-      public
-        // Return and consume the next byte to be Read, either taking it from the
-        // data buffer if present or getting it from the transport otherwise.
-        function Read : Byte;
-
-        // Return the next byte to be Read without consuming, filling the data
-        // buffer if it has not been filled alReady.
-        function Peek : Byte;
-      end;
-
-  protected
-    // Stack of nested contexts that we may be in
-    FContextStack : TStack<TJSONBaseContext>;
-
-    // Current context that we are in
-    FContext : TJSONBaseContext;
-
-    // Reader that manages a 1-byte buffer
-    FReader : TLookaheadReader;
-
-    // Push/pop a new JSON context onto/from the stack.
-    procedure ResetContextStack;
-    procedure PushContext( const aCtx : TJSONBaseContext);
-    procedure PopContext;
-
-  public
-    // TJSONProtocolImpl Constructor
-    constructor Create( const aTrans : ITransport);
-    destructor Destroy;   override;
-
-  protected
-    // IJSONProtocol
-    // Read a byte that must match b; otherwise an exception is thrown.
-    procedure ReadJSONSyntaxChar( b : Byte);
-
-  private
-    // Convert a byte containing a hex char ('0'-'9' or 'a'-'f') into its corresponding hex value
-    class function HexVal( ch : Byte) : Byte;
-
-    // Convert a byte containing a hex value to its corresponding hex character
-    class function HexChar( val : Byte) : Byte;
-
-    // Write the bytes in array buf as a JSON characters, escaping as needed
-    procedure WriteJSONString( const b : TBytes);  overload;
-    procedure WriteJSONString( const str : string);  overload;
-
-    // Write out number as a JSON value. If the context dictates so, it will be
-    // wrapped in quotes to output as a JSON string.
-    procedure WriteJSONInteger( const num : Int64);
-
-    // Write out a double as a JSON value. If it is NaN or infinity or if the
-    // context dictates escaping, Write out as JSON string.
-    procedure WriteJSONDouble( const num : Double);
-
-    // Write out contents of byte array b as a JSON string with base-64 encoded data
-    procedure WriteJSONBase64( const b : TBytes);
-
-    procedure WriteJSONObjectStart;
-    procedure WriteJSONObjectEnd;
-    procedure WriteJSONArrayStart;
-    procedure WriteJSONArrayEnd;
-
-  public
-    // IProtocol
-    procedure WriteMessageBegin( const aMsg : IMessage); override;
-    procedure WriteMessageEnd; override;
-    procedure WriteStructBegin( const struc: IStruct); override;
-    procedure WriteStructEnd; override;
-    procedure WriteFieldBegin( const field: IField); override;
-    procedure WriteFieldEnd; override;
-    procedure WriteFieldStop; override;
-    procedure WriteMapBegin( const map: IMap); override;
-    procedure WriteMapEnd; override;
-    procedure WriteListBegin( const list: IList); override;
-    procedure WriteListEnd(); override;
-    procedure WriteSetBegin( const set_: ISet ); override;
-    procedure WriteSetEnd(); override;
-    procedure WriteBool( b: Boolean); override;
-    procedure WriteByte( b: ShortInt); override;
-    procedure WriteI16( i16: SmallInt); override;
-    procedure WriteI32( i32: Integer); override;
-    procedure WriteI64( const i64: Int64); override;
-    procedure WriteDouble( const d: Double); override;
-    procedure WriteString( const s: string );   override;
-    procedure WriteBinary( const b: TBytes); override;
-    //
-    function ReadMessageBegin: IMessage; override;
-    procedure ReadMessageEnd(); override;
-    function ReadStructBegin: IStruct; override;
-    procedure ReadStructEnd; override;
-    function ReadFieldBegin: IField; override;
-    procedure ReadFieldEnd(); override;
-    function ReadMapBegin: IMap; override;
-    procedure ReadMapEnd(); override;
-    function ReadListBegin: IList; override;
-    procedure ReadListEnd(); override;
-    function ReadSetBegin: ISet; override;
-    procedure ReadSetEnd(); override;
-    function ReadBool: Boolean; override;
-    function ReadByte: ShortInt; override;
-    function ReadI16: SmallInt; override;
-    function ReadI32: Integer; override;
-    function ReadI64: Int64; override;
-    function ReadDouble:Double; override;
-    function ReadString : string;  override;
-    function ReadBinary: TBytes; override;
-
-
-  private
-    // Reading methods.
-
-    // Read in a JSON string, unescaping as appropriate.
-    // Skip Reading from the context if skipContext is true.
-    function ReadJSONString( skipContext : Boolean) : TBytes;
-
-    // Return true if the given byte could be a valid part of a JSON number.
-    function IsJSONNumeric( b : Byte) : Boolean;
-
-    // Read in a sequence of characters that are all valid in JSON numbers. Does
-    // not do a complete regex check to validate that this is actually a number.
-    function ReadJSONNumericChars : String;
-
-    // Read in a JSON number. If the context dictates, Read in enclosing quotes.
-    function ReadJSONInteger : Int64;
-
-    // Read in a JSON double value. Throw if the value is not wrapped in quotes
-    // when expected or if wrapped in quotes when not expected.
-    function ReadJSONDouble : Double;
-
-    // Read in a JSON string containing base-64 encoded data and decode it.
-    function ReadJSONBase64 : TBytes;
-
-    procedure ReadJSONObjectStart;
-    procedure ReadJSONObjectEnd;
-    procedure ReadJSONArrayStart;
-    procedure ReadJSONArrayEnd;
-  end;
-
-
-implementation
-
-var
-  COMMA     : TBytes;
-  COLON     : TBytes;
-  LBRACE    : TBytes;
-  RBRACE    : TBytes;
-  LBRACKET  : TBytes;
-  RBRACKET  : TBytes;
-  QUOTE     : TBytes;
-  BACKSLASH : TBytes;
-  ESCSEQ    : TBytes;
-
-const
-  VERSION = 1;
-  JSON_CHAR_TABLE : array[0..$2F] of Byte
-                  = (0,0,0,0, 0,0,0,0, Byte('b'),Byte('t'),Byte('n'),0, Byte('f'),Byte('r'),0,0,
-                     0,0,0,0, 0,0,0,0, 0,0,0,0,  0,0,0,0,
-                     1,1,Byte('"'),1,  1,1,1,1, 1,1,1,1, 1,1,1,1);
-
-  ESCAPE_CHARS     = '"\/btnfr';
-  ESCAPE_CHAR_VALS = '"\/'#8#9#10#12#13;
-
-  DEF_STRING_SIZE = 16;
-
-  NAME_BOOL   = 'tf';
-  NAME_BYTE   = 'i8';
-  NAME_I16    = 'i16';
-  NAME_I32    = 'i32';
-  NAME_I64    = 'i64';
-  NAME_DOUBLE = 'dbl';
-  NAME_STRUCT = 'rec';
-  NAME_STRING = 'str';
-  NAME_MAP    = 'map';
-  NAME_LIST   = 'lst';
-  NAME_SET    = 'set';
-
-  INVARIANT_CULTURE : TFormatSettings
-                    = ( ThousandSeparator: ',';
-                        DecimalSeparator: '.');
-
-
-
-//--- TJSONProtocolImpl ----------------------
-
-
-function TJSONProtocolImpl.TFactory.GetProtocol( const trans: ITransport): IProtocol;
-begin
-  result := TJSONProtocolImpl.Create(trans);
-end;
-
-class function TJSONProtocolImpl.GetTypeNameForTypeID(typeID : TType) : string;
-begin
-  case typeID of
-    TType.Bool_:    result := NAME_BOOL;
-    TType.Byte_:    result := NAME_BYTE;
-    TType.I16:      result := NAME_I16;
-    TType.I32:      result := NAME_I32;
-    TType.I64:      result := NAME_I64;
-    TType.Double_:  result := NAME_DOUBLE;
-    TType.String_:  result := NAME_STRING;
-    TType.Struct:   result := NAME_STRUCT;
-    TType.Map:      result := NAME_MAP;
-    TType.Set_:     result := NAME_SET;
-    TType.List:     result := NAME_LIST;
-  else
-    raise TProtocolExceptionNotImplemented.Create('Unrecognized type ('+IntToStr(Ord(typeID))+')');
-  end;
-end;
-
-
-class function TJSONProtocolImpl.GetTypeIDForTypeName( const name : string) : TType;
-begin
-  if      name = NAME_BOOL   then result := TType.Bool_
-  else if name = NAME_BYTE   then result := TType.Byte_
-  else if name = NAME_I16    then result := TType.I16
-  else if name = NAME_I32    then result := TType.I32
-  else if name = NAME_I64    then result := TType.I64
-  else if name = NAME_DOUBLE then result := TType.Double_
-  else if name = NAME_STRUCT then result := TType.Struct
-  else if name = NAME_STRING then result := TType.String_
-  else if name = NAME_MAP    then result := TType.Map
-  else if name = NAME_LIST   then result := TType.List
-  else if name = NAME_SET    then result := TType.Set_
-  else raise TProtocolExceptionNotImplemented.Create('Unrecognized type ('+name+')');
-end;
-
-
-constructor TJSONProtocolImpl.TJSONBaseContext.Create( const aProto : IJSONProtocol);
-begin
-  inherited Create;
-  FProto := Pointer(aProto);
-end;
-
-
-procedure TJSONProtocolImpl.TJSONBaseContext.Write;
-begin
-  // nothing
-end;
-
-
-procedure TJSONProtocolImpl.TJSONBaseContext.Read;
-begin
-  // nothing
-end;
-
-
-function TJSONProtocolImpl.TJSONBaseContext.EscapeNumbers : Boolean;
-begin
-  result := FALSE;
-end;
-
-
-constructor TJSONProtocolImpl.TJSONListContext.Create( const aProto : IJSONProtocol);
-begin
-  inherited Create( aProto);
-  FFirst := TRUE;
-end;
-
-
-procedure TJSONProtocolImpl.TJSONListContext.Write;
-begin
-  if FFirst
-  then FFirst := FALSE
-  else IJSONProtocol(FProto).Transport.Write( COMMA);
-end;
-
-
-procedure TJSONProtocolImpl.TJSONListContext.Read;
-begin
-  if FFirst
-  then FFirst := FALSE
-  else IJSONProtocol(FProto).ReadJSONSyntaxChar( COMMA[0]);
-end;
-
-
-constructor TJSONProtocolImpl.TJSONPairContext.Create( const aProto : IJSONProtocol);
-begin
-  inherited Create( aProto);
-  FFirst := TRUE;
-  FColon := TRUE;
-end;
-
-
-procedure TJSONProtocolImpl.TJSONPairContext.Write;
-begin
-  if FFirst then begin
-    FFirst := FALSE;
-    FColon := TRUE;
-  end
-  else begin
-    if FColon
-    then IJSONProtocol(FProto).Transport.Write( COLON)
-    else IJSONProtocol(FProto).Transport.Write( COMMA);
-    FColon := not FColon;
-  end;
-end;
-
-
-procedure TJSONProtocolImpl.TJSONPairContext.Read;
-begin
-  if FFirst then begin
-    FFirst := FALSE;
-    FColon := TRUE;
-  end
-  else begin
-    if FColon
-    then IJSONProtocol(FProto).ReadJSONSyntaxChar( COLON[0])
-    else IJSONProtocol(FProto).ReadJSONSyntaxChar( COMMA[0]);
-    FColon := not FColon;
-  end;
-end;
-
-
-function TJSONProtocolImpl.TJSONPairContext.EscapeNumbers : Boolean;
-begin
-  result := FColon;
-end;
-
-
-constructor TJSONProtocolImpl.TLookaheadReader.Create( const aProto : IJSONProtocol);
-begin
-  inherited Create;
-  FProto   := Pointer(aProto);
-  FHasData := FALSE;
-end;
-
-
-function TJSONProtocolImpl.TLookaheadReader.Read : Byte;
-begin
-  if FHasData
-  then FHasData := FALSE
-  else begin
-    SetLength( FData, 1);
-    IJSONProtocol(FProto).Transport.ReadAll( FData, 0, 1);
-  end;
-  result := FData[0];
-end;
-
-
-function TJSONProtocolImpl.TLookaheadReader.Peek : Byte;
-begin
-  if not FHasData then begin
-    SetLength( FData, 1);
-    IJSONProtocol(FProto).Transport.ReadAll( FData, 0, 1);
-    FHasData := TRUE;
-  end;
-  result := FData[0];
-end;
-
-
-constructor TJSONProtocolImpl.Create( const aTrans : ITransport);
-begin
-  inherited Create( aTrans);
-
-  // Stack of nested contexts that we may be in
-  FContextStack := TStack<TJSONBaseContext>.Create;
-
-  FContext := TJSONBaseContext.Create( Self);
-  FReader  := TLookaheadReader.Create( Self);
-end;
-
-
-destructor TJSONProtocolImpl.Destroy;
-begin
-  try
-    ResetContextStack;  // free any contents
-    FreeAndNil( FReader);
-    FreeAndNil( FContext);
-    FreeAndNil( FContextStack);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-procedure TJSONProtocolImpl.ResetContextStack;
-begin
-  while FContextStack.Count > 0
-  do PopContext;
-end;
-
-
-procedure TJSONProtocolImpl.PushContext( const aCtx : TJSONBaseContext);
-begin
-  FContextStack.Push( FContext);
-  FContext := aCtx;
-end;
-
-
-procedure TJSONProtocolImpl.PopContext;
-begin
-  FreeAndNil(FContext);
-  FContext := FContextStack.Pop;
-end;
-
-
-procedure TJSONProtocolImpl.ReadJSONSyntaxChar( b : Byte);
-var ch : Byte;
-begin
-  ch := FReader.Read;
-  if (ch <> b)
-  then raise TProtocolExceptionInvalidData.Create('Unexpected character ('+Char(ch)+')');
-end;
-
-
-class function TJSONProtocolImpl.HexVal( ch : Byte) : Byte;
-var i : Integer;
-begin
-  i := StrToIntDef( '$0'+Char(ch), -1);
-  if (0 <= i) and (i < $10)
-  then result := i
-  else raise TProtocolExceptionInvalidData.Create('Expected hex character ('+Char(ch)+')');
-end;
-
-
-class function TJSONProtocolImpl.HexChar( val : Byte) : Byte;
-const HEXCHARS = '0123456789ABCDEF';
-begin
-  result := Byte( PChar(HEXCHARS)[val and $0F]);
-  ASSERT( Pos( Char(result), HEXCHARS) > 0);
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONString( const str : string);
-begin
-  WriteJSONString( SysUtils.TEncoding.UTF8.GetBytes( str));
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONString( const b : TBytes);
-var i : Integer;
-    tmp : TBytes;
-begin
-  FContext.Write;
-  Transport.Write( QUOTE);
-  for i := 0 to Length(b)-1 do begin
-
-    if (b[i] and $00FF) >= $30 then begin
-
-      if (b[i] = BACKSLASH[0]) then begin
-        Transport.Write( BACKSLASH);
-        Transport.Write( BACKSLASH);
-      end
-      else begin
-        Transport.Write( b, i, 1);
-      end;
-
-    end
-    else begin
-      SetLength( tmp, 2);
-      tmp[0] := JSON_CHAR_TABLE[b[i]];
-      if (tmp[0] = 1) then begin
-        Transport.Write( b, i, 1)
-      end
-      else if (tmp[0] > 1) then begin
-        Transport.Write( BACKSLASH);
-        Transport.Write( tmp, 0, 1);
-      end
-      else begin
-        Transport.Write( ESCSEQ);
-        tmp[0] := HexChar( b[i] div $10);
-        tmp[1] := HexChar( b[i]);
-        Transport.Write( tmp, 0, 2);
-      end;
-    end;
-  end;
-  Transport.Write( QUOTE);
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONInteger( const num : Int64);
-var str : String;
-    escapeNum : Boolean;
-begin
-  FContext.Write;
-  str := IntToStr(num);
-
-  escapeNum := FContext.EscapeNumbers;
-  if escapeNum
-  then Transport.Write( QUOTE);
-
-  Transport.Write( SysUtils.TEncoding.UTF8.GetBytes( str));
-
-  if escapeNum
-  then Transport.Write( QUOTE);
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONDouble( const num : Double);
-var str : string;
-    special : Boolean;
-    escapeNum : Boolean;
-begin
-  FContext.Write;
-
-  str := FloatToStr( num, INVARIANT_CULTURE);
-  special := FALSE;
-
-  case UpCase(str[1]) of
-    'N' : special := TRUE;  // NaN
-    'I' : special := TRUE;  // Infinity
-    '-' : special := (UpCase(str[2]) = 'I'); // -Infinity
-  end;
-
-  escapeNum := special or FContext.EscapeNumbers;
-
-
-  if escapeNum
-  then Transport.Write( QUOTE);
-
-  Transport.Write( SysUtils.TEncoding.UTF8.GetBytes( str));
-
-  if escapeNum
-  then Transport.Write( QUOTE);
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONBase64( const b : TBytes);
-var len, off, cnt : Integer;
-    tmpBuf : TBytes;
-begin
-  FContext.Write;
-  Transport.Write( QUOTE);
-
-  len := Length(b);
-  off := 0;
-  SetLength( tmpBuf, 4);
-
-  while len >= 3 do begin
-    // Encode 3 bytes at a time
-    Base64Utils.Encode( b, off, 3, tmpBuf, 0);
-    Transport.Write( tmpBuf, 0, 4);
-    Inc( off, 3);
-    Dec( len, 3);
-  end;
-
-  // Encode remainder, if any
-  if len > 0 then begin
-    cnt := Base64Utils.Encode( b, off, len, tmpBuf, 0);
-    Transport.Write( tmpBuf, 0, cnt);
-  end;
-
-  Transport.Write( QUOTE);
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONObjectStart;
-begin
-  FContext.Write;
-  Transport.Write( LBRACE);
-  PushContext( TJSONPairContext.Create( Self));
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONObjectEnd;
-begin
-  PopContext;
-  Transport.Write( RBRACE);
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONArrayStart;
-begin
-  FContext.Write;
-  Transport.Write( LBRACKET);
-  PushContext( TJSONListContext.Create( Self));
-end;
-
-
-procedure TJSONProtocolImpl.WriteJSONArrayEnd;
-begin
-  PopContext;
-  Transport.Write( RBRACKET);
-end;
-
-
-procedure TJSONProtocolImpl.WriteMessageBegin( const aMsg : IMessage);
-begin
-  ResetContextStack;  // THRIFT-1473
-
-  WriteJSONArrayStart;
-  WriteJSONInteger(VERSION);
-
-  WriteJSONString( SysUtils.TEncoding.UTF8.GetBytes( aMsg.Name));
-
-  WriteJSONInteger( LongInt( aMsg.Type_));
-  WriteJSONInteger( aMsg.SeqID);
-end;
-
-procedure TJSONProtocolImpl.WriteMessageEnd;
-begin
-  WriteJSONArrayEnd;
-end;
-
-
-procedure TJSONProtocolImpl.WriteStructBegin( const struc: IStruct);
-begin
-  WriteJSONObjectStart;
-end;
-
-
-procedure TJSONProtocolImpl.WriteStructEnd;
-begin
-  WriteJSONObjectEnd;
-end;
-
-
-procedure TJSONProtocolImpl.WriteFieldBegin( const field : IField);
-begin
-  WriteJSONInteger(field.ID);
-  WriteJSONObjectStart;
-  WriteJSONString( GetTypeNameForTypeID(field.Type_));
-end;
-
-
-procedure TJSONProtocolImpl.WriteFieldEnd;
-begin
-  WriteJSONObjectEnd;
-end;
-
-
-procedure TJSONProtocolImpl.WriteFieldStop;
-begin
-  // nothing to do
-end;
-
-procedure TJSONProtocolImpl.WriteMapBegin( const map: IMap);
-begin
-  WriteJSONArrayStart;
-  WriteJSONString( GetTypeNameForTypeID( map.KeyType));
-  WriteJSONString( GetTypeNameForTypeID( map.ValueType));
-  WriteJSONInteger( map.Count);
-  WriteJSONObjectStart;
-end;
-
-
-procedure TJSONProtocolImpl.WriteMapEnd;
-begin
-  WriteJSONObjectEnd;
-  WriteJSONArrayEnd;
-end;
-
-
-procedure TJSONProtocolImpl.WriteListBegin( const list: IList);
-begin
-  WriteJSONArrayStart;
-  WriteJSONString( GetTypeNameForTypeID( list.ElementType));
-  WriteJSONInteger(list.Count);
-end;
-
-
-procedure TJSONProtocolImpl.WriteListEnd;
-begin
-  WriteJSONArrayEnd;
-end;
-
-
-procedure TJSONProtocolImpl.WriteSetBegin( const set_: ISet);
-begin
-  WriteJSONArrayStart;
-  WriteJSONString( GetTypeNameForTypeID( set_.ElementType));
-  WriteJSONInteger( set_.Count);
-end;
-
-
-procedure TJSONProtocolImpl.WriteSetEnd;
-begin
-  WriteJSONArrayEnd;
-end;
-
-procedure TJSONProtocolImpl.WriteBool( b: Boolean);
-begin
-  if b
-  then WriteJSONInteger( 1)
-  else WriteJSONInteger( 0);
-end;
-
-procedure TJSONProtocolImpl.WriteByte( b: ShortInt);
-begin
-  WriteJSONInteger( b);
-end;
-
-procedure TJSONProtocolImpl.WriteI16( i16: SmallInt);
-begin
-  WriteJSONInteger( i16);
-end;
-
-procedure TJSONProtocolImpl.WriteI32( i32: Integer);
-begin
-  WriteJSONInteger( i32);
-end;
-
-procedure TJSONProtocolImpl.WriteI64( const i64: Int64);
-begin
-  WriteJSONInteger(i64);
-end;
-
-procedure TJSONProtocolImpl.WriteDouble( const d: Double);
-begin
-  WriteJSONDouble( d);
-end;
-
-procedure TJSONProtocolImpl.WriteString( const s: string );
-begin
-  WriteJSONString( SysUtils.TEncoding.UTF8.GetBytes( s));
-end;
-
-procedure TJSONProtocolImpl.WriteBinary( const b: TBytes);
-begin
-  WriteJSONBase64( b);
-end;
-
-
-function TJSONProtocolImpl.ReadJSONString( skipContext : Boolean) : TBytes;
-var buffer : TMemoryStream;
-    ch  : Byte;
-    wch : Word;
-    highSurogate: Char;
-    surrogatePairs: Array[0..1] of Char;
-    off : Integer;
-    tmp : TBytes;
-begin
-  highSurogate := #0;
-  buffer := TMemoryStream.Create;
-  try
-    if not skipContext
-    then FContext.Read;
-
-    ReadJSONSyntaxChar( QUOTE[0]);
-
-    while TRUE do begin
-      ch := FReader.Read;
-
-      if (ch = QUOTE[0])
-      then Break;
-
-      // check for escapes
-      if (ch <> ESCSEQ[0]) then begin
-        buffer.Write( ch, 1);
-        Continue;
-      end;
-
-      // distuinguish between \uNNNN and \?
-      ch := FReader.Read;
-      if (ch <> ESCSEQ[1])
-      then begin
-        off := Pos( Char(ch), ESCAPE_CHARS);
-        if off < 1
-        then raise TProtocolExceptionInvalidData.Create('Expected control char');
-        ch := Byte( ESCAPE_CHAR_VALS[off]);
-        buffer.Write( ch, 1);
-        Continue;
-      end;
-
-      // it is \uXXXX
-      SetLength( tmp, 4);
-      Transport.ReadAll( tmp, 0, 4);
-      wch := (HexVal(tmp[0]) shl 12)
-           + (HexVal(tmp[1]) shl 8)
-           + (HexVal(tmp[2]) shl 4)
-           +  HexVal(tmp[3]);
-
-      // we need to make UTF8 bytes from it, to be decoded later
-      if CharUtils.IsHighSurrogate(char(wch)) then begin
-        if highSurogate <> #0
-        then raise TProtocolExceptionInvalidData.Create('Expected low surrogate char');
-        highSurogate := char(wch);
-      end
-      else if CharUtils.IsLowSurrogate(char(wch)) then begin
-        if highSurogate = #0
-        then TProtocolExceptionInvalidData.Create('Expected high surrogate char');
-        surrogatePairs[0] := highSurogate;
-        surrogatePairs[1] := char(wch);
-        tmp := TEncoding.UTF8.GetBytes(surrogatePairs);
-        buffer.Write( tmp[0], Length(tmp));
-        highSurogate := #0;
-      end
-      else begin
-        tmp := SysUtils.TEncoding.UTF8.GetBytes(Char(wch));
-        buffer.Write( tmp[0], Length(tmp));
-      end;
-    end;
-
-    if highSurogate <> #0
-    then raise TProtocolExceptionInvalidData.Create('Expected low surrogate char');
-
-    SetLength( result, buffer.Size);
-    if buffer.Size > 0 then Move( buffer.Memory^, result[0], Length(result));
-
-  finally
-    buffer.Free;
-  end;
-end;
-
-
-function TJSONProtocolImpl.IsJSONNumeric( b : Byte) : Boolean;
-const NUMCHARS = ['+','-','.','0','1','2','3','4','5','6','7','8','9','E','e'];
-begin
-  result := CharInSet( Char(b), NUMCHARS);
-end;
-
-
-function TJSONProtocolImpl.ReadJSONNumericChars : string;
-var strbld : TThriftStringBuilder;
-    ch : Byte;
-begin
-  strbld := TThriftStringBuilder.Create;
-  try
-    while TRUE do begin
-      ch := FReader.Peek;
-      if IsJSONNumeric(ch)
-      then strbld.Append( Char(FReader.Read))
-      else Break;
-    end;
-    result := strbld.ToString;
-
-  finally
-    strbld.Free;
-  end;
-end;
-
-
-function TJSONProtocolImpl.ReadJSONInteger : Int64;
-var str : string;
-begin
-  FContext.Read;
-  if FContext.EscapeNumbers
-  then ReadJSONSyntaxChar( QUOTE[0]);
-
-  str := ReadJSONNumericChars;
-
-  if FContext.EscapeNumbers
-  then ReadJSONSyntaxChar( QUOTE[0]);
-
-  try
-    result := StrToInt64(str);
-  except
-    on e:Exception do begin
-      raise TProtocolExceptionInvalidData.Create('Bad data encounted in numeric data ('+str+') ('+e.Message+')');
-    end;
-  end;
-end;
-
-
-function TJSONProtocolImpl.ReadJSONDouble : Double;
-var dub : Double;
-    str : string;
-begin
-  FContext.Read;
-
-  if FReader.Peek = QUOTE[0]
-  then begin
-    str := SysUtils.TEncoding.UTF8.GetString( ReadJSONString( TRUE));
-    dub := StrToFloat( str, INVARIANT_CULTURE);
-
-    if not FContext.EscapeNumbers()
-    and not Math.IsNaN(dub)
-    and not Math.IsInfinite(dub)
-    then begin
-      // Throw exception -- we should not be in a string in  Self case
-      raise TProtocolExceptionInvalidData.Create('Numeric data unexpectedly quoted');
-    end;
-    result := dub;
-    Exit;
-  end;
-
-  // will throw - we should have had a quote if escapeNum == true
-  if FContext.EscapeNumbers
-  then ReadJSONSyntaxChar( QUOTE[0]);
-
-  try
-    str := ReadJSONNumericChars;
-    result := StrToFloat( str, INVARIANT_CULTURE);
-  except
-    on e:Exception
-    do raise TProtocolExceptionInvalidData.Create('Bad data encounted in numeric data ('+str+') ('+e.Message+')');
-  end;
-end;
-
-
-function TJSONProtocolImpl.ReadJSONBase64 : TBytes;
-var b : TBytes;
-    len, off, size : Integer;
-begin
-  b := ReadJSONString(false);
-
-  len := Length(b);
-  off := 0;
-  size := 0;
-
-  // reduce len to ignore fill bytes
-  Dec(len);
-  while (len >= 0) and (b[len] = Byte('=')) do Dec(len);
-  Inc(len);
-
-  // read & decode full byte triplets = 4 source bytes
-  while (len >= 4) do begin
-    // Decode 4 bytes at a time
-    Inc( size, Base64Utils.Decode( b, off, 4, b, size)); // decoded in place
-    Inc( off, 4);
-    Dec( len, 4);
-  end;
-
-  // Don't decode if we hit the end or got a single leftover byte (invalid
-  // base64 but legal for skip of regular string type)
-  if len > 1 then begin
-    // Decode remainder
-    Inc( size, Base64Utils.Decode( b, off, len, b, size)); // decoded in place
-  end;
-
-  // resize to final size and return the data
-  SetLength( b, size);
-  result := b;
-end;
-
-
-procedure TJSONProtocolImpl.ReadJSONObjectStart;
-begin
-  FContext.Read;
-  ReadJSONSyntaxChar( LBRACE[0]);
-  PushContext( TJSONPairContext.Create( Self));
-end;
-
-
-procedure TJSONProtocolImpl.ReadJSONObjectEnd;
-begin
-  ReadJSONSyntaxChar( RBRACE[0]);
-  PopContext;
-end;
-
-
-procedure TJSONProtocolImpl.ReadJSONArrayStart;
-begin
-  FContext.Read;
-  ReadJSONSyntaxChar( LBRACKET[0]);
-  PushContext( TJSONListContext.Create( Self));
-end;
-
-
-procedure TJSONProtocolImpl.ReadJSONArrayEnd;
-begin
-  ReadJSONSyntaxChar( RBRACKET[0]);
-  PopContext;
-end;
-
-
-function TJSONProtocolImpl.ReadMessageBegin: IMessage;
-begin
-  ResetContextStack;  // THRIFT-1473
-
-  result := TMessageImpl.Create;
-  ReadJSONArrayStart;
-
-  if ReadJSONInteger <> VERSION
-  then raise TProtocolExceptionBadVersion.Create('Message contained bad version.');
-
-  result.Name  := SysUtils.TEncoding.UTF8.GetString( ReadJSONString( FALSE));
-  result.Type_ := TMessageType( ReadJSONInteger);
-  result.SeqID := ReadJSONInteger;
-end;
-
-
-procedure TJSONProtocolImpl.ReadMessageEnd;
-begin
-  ReadJSONArrayEnd;
-end;
-
-
-function TJSONProtocolImpl.ReadStructBegin : IStruct ;
-begin
-  ReadJSONObjectStart;
-  result := TStructImpl.Create('');
-end;
-
-
-procedure TJSONProtocolImpl.ReadStructEnd;
-begin
-  ReadJSONObjectEnd;
-end;
-
-
-function TJSONProtocolImpl.ReadFieldBegin : IField;
-var ch : Byte;
-    str : string;
-begin
-  result := TFieldImpl.Create;
-  ch := FReader.Peek;
-  if ch = RBRACE[0]
-  then result.Type_ := TType.Stop
-  else begin
-    result.ID := ReadJSONInteger;
-    ReadJSONObjectStart;
-
-    str := SysUtils.TEncoding.UTF8.GetString( ReadJSONString( FALSE));
-    result.Type_ := GetTypeIDForTypeName( str);
-  end;
-end;
-
-
-procedure TJSONProtocolImpl.ReadFieldEnd;
-begin
-  ReadJSONObjectEnd;
-end;
-
-
-function TJSONProtocolImpl.ReadMapBegin : IMap;
-var str : string;
-begin
-  result := TMapImpl.Create;
-  ReadJSONArrayStart;
-
-  str := SysUtils.TEncoding.UTF8.GetString( ReadJSONString(FALSE));
-  result.KeyType := GetTypeIDForTypeName( str);
-
-  str := SysUtils.TEncoding.UTF8.GetString( ReadJSONString(FALSE));
-  result.ValueType := GetTypeIDForTypeName( str);
-
-  result.Count := ReadJSONInteger;
-  ReadJSONObjectStart;
-end;
-
-
-procedure TJSONProtocolImpl.ReadMapEnd;
-begin
-  ReadJSONObjectEnd;
-  ReadJSONArrayEnd;
-end;
-
-
-function TJSONProtocolImpl.ReadListBegin : IList;
-var str : string;
-begin
-  result := TListImpl.Create;
-  ReadJSONArrayStart;
-
-  str := SysUtils.TEncoding.UTF8.GetString( ReadJSONString(FALSE));
-  result.ElementType := GetTypeIDForTypeName( str);
-  result.Count := ReadJSONInteger;
-end;
-
-
-procedure TJSONProtocolImpl.ReadListEnd;
-begin
-  ReadJSONArrayEnd;
-end;
-
-
-function TJSONProtocolImpl.ReadSetBegin : ISet;
-var str : string;
-begin
-  result := TSetImpl.Create;
-  ReadJSONArrayStart;
-
-  str := SysUtils.TEncoding.UTF8.GetString( ReadJSONString(FALSE));
-  result.ElementType := GetTypeIDForTypeName( str);
-  result.Count := ReadJSONInteger;
-end;
-
-
-procedure TJSONProtocolImpl.ReadSetEnd;
-begin
-  ReadJSONArrayEnd;
-end;
-
-
-function TJSONProtocolImpl.ReadBool : Boolean;
-begin
-  result := (ReadJSONInteger <> 0);
-end;
-
-
-function TJSONProtocolImpl.ReadByte : ShortInt;
-begin
-  result := ReadJSONInteger;
-end;
-
-
-function TJSONProtocolImpl.ReadI16 : SmallInt;
-begin
-  result := ReadJSONInteger;
-end;
-
-
-function TJSONProtocolImpl.ReadI32 : LongInt;
-begin
-  result := ReadJSONInteger;
-end;
-
-
-function TJSONProtocolImpl.ReadI64 : Int64;
-begin
-  result := ReadJSONInteger;
-end;
-
-
-function TJSONProtocolImpl.ReadDouble : Double;
-begin
-  result := ReadJSONDouble;
-end;
-
-
-function TJSONProtocolImpl.ReadString : string;
-begin
-  result := SysUtils.TEncoding.UTF8.GetString( ReadJSONString( FALSE));
-end;
-
-
-function TJSONProtocolImpl.ReadBinary : TBytes;
-begin
-  result := ReadJSONBase64;
-end;
-
-
-//--- init code ---
-
-procedure InitBytes( var b : TBytes; aData : array of Byte);
-begin
-  SetLength( b, Length(aData));
-  Move( aData, b[0], Length(b));
-end;
-
-initialization
-  InitBytes( COMMA,     [Byte(',')]);
-  InitBytes( COLON,     [Byte(':')]);
-  InitBytes( LBRACE,    [Byte('{')]);
-  InitBytes( RBRACE,    [Byte('}')]);
-  InitBytes( LBRACKET,  [Byte('[')]);
-  InitBytes( RBRACKET,  [Byte(']')]);
-  InitBytes( QUOTE,     [Byte('"')]);
-  InitBytes( BACKSLASH, [Byte('\')]);
-  InitBytes( ESCSEQ,    [Byte('\'),Byte('u'),Byte('0'),Byte('0')]);
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.Multiplex.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.Multiplex.pas
deleted file mode 100644
index 18b39b5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.Multiplex.pas
+++ /dev/null
@@ -1,107 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.Protocol.Multiplex;
-
-interface
-
-uses Thrift.Protocol;
-
-{ TMultiplexedProtocol is a protocol-independent concrete decorator
-  that allows a Thrift client to communicate with a multiplexing Thrift server,
-  by prepending the service name to the function name during function calls.
-
-  NOTE: THIS IS NOT USED BY SERVERS.
-  On the server, use TMultiplexedProcessor to handle requests from a multiplexing client.
-
-  This example uses a single socket transport to invoke two services:
-
-      TSocket transport = new TSocket("localhost", 9090);
-      transport.open();
-
-      TBinaryProtocol protocol = new TBinaryProtocol(transport);
-
-      TMultiplexedProtocol mp = new TMultiplexedProtocol(protocol, "Calculator");
-      Calculator.Client service = new Calculator.Client(mp);
-
-      TMultiplexedProtocol mp2 = new TMultiplexedProtocol(protocol, "WeatherReport");
-      WeatherReport.Client service2 = new WeatherReport.Client(mp2);
-
-      System.out.println(service.add(2,2));
-      System.out.println(service2.getTemperature());
-
-}
-
-type
-  TMultiplexedProtocol = class( TProtocolDecorator)
-  public const
-    {  Used to delimit the service name from the function name }
-    SEPARATOR = ':';
-
-  private
-     FServiceName : String;
-
-  public
-    { Wrap the specified protocol, allowing it to be used to communicate with a multiplexing server.
-      The serviceName is required as it is prepended to the message header so that the multiplexing
-      server can broker the function call to the proper service.
-
-      Args:
-        protocol ....... Your communication protocol of choice, e.g. TBinaryProtocol.
-        serviceName .... The service name of the service communicating via this protocol.
-    }
-    constructor Create( const aProtocol : IProtocol; const aServiceName : string);
-
-    { Prepends the service name to the function name, separated by SEPARATOR.
-      Args: The original message.
-    }
-    procedure WriteMessageBegin( const msg: IMessage); override;
-  end;
-
-
-implementation
-
-
-constructor TMultiplexedProtocol.Create(const aProtocol: IProtocol; const aServiceName: string);
-begin
-  ASSERT( aServiceName <> '');
-  inherited Create(aProtocol);
-  FServiceName := aServiceName;
-end;
-
-
-procedure TMultiplexedProtocol.WriteMessageBegin( const msg: IMessage);
-// Prepends the service name to the function name, separated by TMultiplexedProtocol.SEPARATOR.
-var newMsg : IMessage;
-begin
-  case msg.Type_ of
-    TMessageType.Call,
-    TMessageType.Oneway : begin
-      newMsg := TMessageImpl.Create( FServiceName + SEPARATOR + msg.Name, msg.Type_, msg.SeqID);
-      inherited WriteMessageBegin( newMsg);
-    end;
-
-  else
-    inherited WriteMessageBegin( msg);
-  end;
-end;
-
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.pas
deleted file mode 100644
index 7ff2eae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Protocol.pas
+++ /dev/null
@@ -1,1724 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-{$SCOPEDENUMS ON}
-
-unit Thrift.Protocol;
-
-interface
-
-uses
-  Classes,
-  SysUtils,
-  Contnrs,
-  Thrift.Stream,
-  Thrift.Collections,
-  Thrift.Transport;
-
-type
-
-  TType = (
-    Stop = 0,
-    Void = 1,
-    Bool_ = 2,
-    Byte_ = 3,
-    Double_ = 4,
-    I16 = 6,
-    I32 = 8,
-    I64 = 10,
-    String_ = 11,
-    Struct = 12,
-    Map = 13,
-    Set_ = 14,
-    List = 15
-  );
-
-  TMessageType = (
-    Call = 1,
-    Reply = 2,
-    Exception = 3,
-    Oneway = 4
-  );
-
-const
-  VALID_TTYPES = [
-    TType.Stop, TType.Void,
-    TType.Bool_, TType.Byte_, TType.Double_, TType.I16, TType.I32, TType.I64, TType.String_,
-    TType.Struct, TType.Map, TType.Set_, TType.List
-  ];
-
-  VALID_MESSAGETYPES = [Low(TMessageType)..High(TMessageType)];
-
-const
-  DEFAULT_RECURSION_LIMIT = 64;
-
-type
-  IProtocol = interface;
-  IStruct = interface;
-
-  IProtocolFactory = interface
-    ['{7CD64A10-4E9F-4E99-93BF-708A31F4A67B}']
-    function GetProtocol( const trans: ITransport): IProtocol;
-  end;
-
-  TThriftStringBuilder = class( TStringBuilder)
-  public
-    function Append(const Value: TBytes): TStringBuilder; overload;
-    function Append(const Value: IThriftContainer): TStringBuilder; overload;
-  end;
-
-  TProtocolException = class( Exception )
-  public
-    const // TODO(jensg): change into enum
-      UNKNOWN = 0;
-      INVALID_DATA = 1;
-      NEGATIVE_SIZE = 2;
-      SIZE_LIMIT = 3;
-      BAD_VERSION = 4;
-      NOT_IMPLEMENTED = 5;
-      DEPTH_LIMIT = 6;
-  protected
-    constructor HiddenCreate(const Msg: string);
-  public
-    // purposefully hide inherited constructor
-    class function Create(const Msg: string): TProtocolException; overload; deprecated 'Use specialized TProtocolException types (or regenerate from IDL)';
-    class function Create: TProtocolException; overload; deprecated 'Use specialized TProtocolException types (or regenerate from IDL)';
-    class function Create( type_: Integer): TProtocolException; overload; deprecated 'Use specialized TProtocolException types (or regenerate from IDL)';
-    class function Create( type_: Integer; const msg: string): TProtocolException; overload; deprecated 'Use specialized TProtocolException types (or regenerate from IDL)';
-  end;
-
-  // Needed to remove deprecation warning
-  TProtocolExceptionSpecialized = class abstract (TProtocolException)
-  public
-    constructor Create(const Msg: string);
-  end;
-
-  TProtocolExceptionUnknown = class (TProtocolExceptionSpecialized);
-  TProtocolExceptionInvalidData = class (TProtocolExceptionSpecialized);
-  TProtocolExceptionNegativeSize = class (TProtocolExceptionSpecialized);
-  TProtocolExceptionSizeLimit = class (TProtocolExceptionSpecialized);
-  TProtocolExceptionBadVersion = class (TProtocolExceptionSpecialized);
-  TProtocolExceptionNotImplemented = class (TProtocolExceptionSpecialized);
-  TProtocolExceptionDepthLimit = class (TProtocolExceptionSpecialized);
-
-  IMap = interface
-    ['{30531D97-7E06-4233-B800-C3F53CCD23E7}']
-    function GetKeyType: TType;
-    procedure SetKeyType( Value: TType);
-    function GetValueType: TType;
-    procedure SetValueType( Value: TType);
-    function GetCount: Integer;
-    procedure SetCount( Value: Integer);
-    property KeyType: TType read GetKeyType write SetKeyType;
-    property ValueType: TType read GetValueType write SetValueType;
-    property Count: Integer read GetCount write SetCount;
-  end;
-
-  TMapImpl = class( TInterfacedObject, IMap)
-  private
-    FValueType: TType;
-    FKeyType: TType;
-    FCount: Integer;
-  protected
-    function GetKeyType: TType;
-    procedure SetKeyType( Value: TType);
-    function GetValueType: TType;
-    procedure SetValueType( Value: TType);
-    function GetCount: Integer;
-    procedure SetCount( Value: Integer);
-  public
-    constructor Create( AKeyType, AValueType: TType; ACount: Integer); overload;
-    constructor Create; overload;
-  end;
-
-  IList = interface
-    ['{6763E1EA-A934-4472-904F-0083980B9B87}']
-    function GetElementType: TType;
-    procedure SetElementType( Value: TType);
-    function GetCount: Integer;
-    procedure SetCount( Value: Integer);
-    property ElementType: TType read GetElementType write SetElementType;
-    property Count: Integer read GetCount write SetCount;
-  end;
-
-  TListImpl = class( TInterfacedObject, IList)
-  private
-    FElementType: TType;
-    FCount : Integer;
-  protected
-    function GetElementType: TType;
-    procedure SetElementType( Value: TType);
-    function GetCount: Integer;
-    procedure SetCount( Value: Integer);
-  public
-    constructor Create( AElementType: TType; ACount: Integer); overload;
-    constructor Create; overload;
-  end;
-
-  ISet = interface
-    ['{A8671700-7514-4C1E-8A05-62786872005F}']
-    function GetElementType: TType;
-    procedure SetElementType( Value: TType);
-    function GetCount: Integer;
-    procedure SetCount( Value: Integer);
-    property ElementType: TType read GetElementType write SetElementType;
-    property Count: Integer read GetCount write SetCount;
-  end;
-
-  TSetImpl = class( TInterfacedObject, ISet)
-  private
-    FCount: Integer;
-    FElementType: TType;
-  protected
-    function GetElementType: TType;
-    procedure SetElementType( Value: TType);
-    function GetCount: Integer;
-    procedure SetCount( Value: Integer);
-  public
-    constructor Create( AElementType: TType; ACount: Integer); overload;
-    constructor Create; overload;
-  end;
-
-  IMessage = interface
-    ['{9E368B4A-B1FA-43E7-8CF5-56C66D256CA7}']
-    function GetName: string;
-    procedure SetName( const Value: string);
-    function GetType: TMessageType;
-    procedure SetType( Value: TMessageType);
-    function GetSeqID: Integer;
-    procedure SetSeqID( Value: Integer);
-    property Name: string read GetName write SetName;
-    property Type_: TMessageType read GetType write SetType;
-    property SeqID: Integer read GetSeqID write SetSeqID;
-  end;
-
-  TMessageImpl = class( TInterfacedObject, IMessage )
-  private
-    FName: string;
-    FMessageType: TMessageType;
-    FSeqID: Integer;
-  protected
-    function GetName: string;
-    procedure SetName( const Value: string);
-    function GetType: TMessageType;
-    procedure SetType( Value: TMessageType);
-    function GetSeqID: Integer;
-    procedure SetSeqID( Value: Integer);
-  public
-    property Name: string read FName write FName;
-    property Type_: TMessageType read FMessageType write FMessageType;
-    property SeqID: Integer read FSeqID write FSeqID;
-    constructor Create( AName: string; AMessageType: TMessageType; ASeqID: Integer); overload;
-    constructor Create; overload;
-  end;
-
-  IField = interface
-    ['{F0D43BE5-7883-442E-83FF-0580CC632B72}']
-    function GetName: string;
-    procedure SetName( const Value: string);
-    function GetType: TType;
-    procedure SetType( Value: TType);
-    function GetId: SmallInt;
-    procedure SetId( Value: SmallInt);
-    property Name: string read GetName write SetName;
-    property Type_: TType read GetType write SetType;
-    property Id: SmallInt read GetId write SetId;
-  end;
-
-  TFieldImpl = class( TInterfacedObject, IField)
-  private
-    FName : string;
-    FType : TType;
-    FId   : SmallInt;
-  protected
-    function GetName: string;
-    procedure SetName( const Value: string);
-    function GetType: TType;
-    procedure SetType( Value: TType);
-    function GetId: SmallInt;
-    procedure SetId( Value: SmallInt);
-  public
-    constructor Create( const AName: string; const AType: TType; AId: SmallInt); overload;
-    constructor Create; overload;
-  end;
-
-  TProtocolUtil = class
-  public
-    class procedure Skip( prot: IProtocol; type_: TType);
-  end;
-
-  IProtocolRecursionTracker = interface
-    ['{29CA033F-BB56-49B1-9EE3-31B1E82FC7A5}']
-    // no members yet
-  end;
-
-  TProtocolRecursionTrackerImpl = class abstract( TInterfacedObject, IProtocolRecursionTracker)
-  protected
-    FProtocol : IProtocol;
-  public
-    constructor Create( prot : IProtocol);
-    destructor Destroy; override;
-  end;
-
-  IProtocol = interface
-    ['{602A7FFB-0D9E-4CD8-8D7F-E5076660588A}']
-    function GetTransport: ITransport;
-    procedure WriteMessageBegin( const msg: IMessage);
-    procedure WriteMessageEnd;
-    procedure WriteStructBegin( const struc: IStruct);
-    procedure WriteStructEnd;
-    procedure WriteFieldBegin( const field: IField);
-    procedure WriteFieldEnd;
-    procedure WriteFieldStop;
-    procedure WriteMapBegin( const map: IMap);
-    procedure WriteMapEnd;
-    procedure WriteListBegin( const list: IList);
-    procedure WriteListEnd();
-    procedure WriteSetBegin( const set_: ISet );
-    procedure WriteSetEnd();
-    procedure WriteBool( b: Boolean);
-    procedure WriteByte( b: ShortInt);
-    procedure WriteI16( i16: SmallInt);
-    procedure WriteI32( i32: Integer);
-    procedure WriteI64( const i64: Int64);
-    procedure WriteDouble( const d: Double);
-    procedure WriteString( const s: string );
-    procedure WriteAnsiString( const s: AnsiString);
-    procedure WriteBinary( const b: TBytes);
-
-    function ReadMessageBegin: IMessage;
-    procedure ReadMessageEnd();
-    function ReadStructBegin: IStruct;
-    procedure ReadStructEnd;
-    function ReadFieldBegin: IField;
-    procedure ReadFieldEnd();
-    function ReadMapBegin: IMap;
-    procedure ReadMapEnd();
-    function ReadListBegin: IList;
-    procedure ReadListEnd();
-    function ReadSetBegin: ISet;
-    procedure ReadSetEnd();
-    function ReadBool: Boolean;
-    function ReadByte: ShortInt;
-    function ReadI16: SmallInt;
-    function ReadI32: Integer;
-    function ReadI64: Int64;
-    function ReadDouble:Double;
-    function ReadBinary: TBytes;
-    function ReadString: string;
-    function ReadAnsiString: AnsiString;
-
-    procedure SetRecursionLimit( value : Integer);
-    function  GetRecursionLimit : Integer;
-    function  NextRecursionLevel : IProtocolRecursionTracker;
-    procedure IncrementRecursionDepth;
-    procedure DecrementRecursionDepth;
-
-    property Transport: ITransport read GetTransport;
-    property RecursionLimit : Integer read GetRecursionLimit write SetRecursionLimit;
-  end;
-
-  TProtocolImpl = class abstract( TInterfacedObject, IProtocol)
-  protected
-    FTrans : ITransport;
-    FRecursionLimit : Integer;
-    FRecursionDepth : Integer;
-
-    procedure SetRecursionLimit( value : Integer);
-    function  GetRecursionLimit : Integer;
-    function  NextRecursionLevel : IProtocolRecursionTracker;
-    procedure IncrementRecursionDepth;
-    procedure DecrementRecursionDepth;
-
-    function GetTransport: ITransport;
-  public
-    procedure WriteMessageBegin( const msg: IMessage); virtual; abstract;
-    procedure WriteMessageEnd; virtual; abstract;
-    procedure WriteStructBegin( const struc: IStruct); virtual; abstract;
-    procedure WriteStructEnd; virtual; abstract;
-    procedure WriteFieldBegin( const field: IField); virtual; abstract;
-    procedure WriteFieldEnd; virtual; abstract;
-    procedure WriteFieldStop; virtual; abstract;
-    procedure WriteMapBegin( const map: IMap); virtual; abstract;
-    procedure WriteMapEnd; virtual; abstract;
-    procedure WriteListBegin( const list: IList); virtual; abstract;
-    procedure WriteListEnd(); virtual; abstract;
-    procedure WriteSetBegin( const set_: ISet ); virtual; abstract;
-    procedure WriteSetEnd(); virtual; abstract;
-    procedure WriteBool( b: Boolean); virtual; abstract;
-    procedure WriteByte( b: ShortInt); virtual; abstract;
-    procedure WriteI16( i16: SmallInt); virtual; abstract;
-    procedure WriteI32( i32: Integer); virtual; abstract;
-    procedure WriteI64( const i64: Int64); virtual; abstract;
-    procedure WriteDouble( const d: Double); virtual; abstract;
-    procedure WriteString( const s: string ); virtual;
-    procedure WriteAnsiString( const s: AnsiString); virtual;
-    procedure WriteBinary( const b: TBytes); virtual; abstract;
-
-    function ReadMessageBegin: IMessage; virtual; abstract;
-    procedure ReadMessageEnd(); virtual; abstract;
-    function ReadStructBegin: IStruct; virtual; abstract;
-    procedure ReadStructEnd; virtual; abstract;
-    function ReadFieldBegin: IField; virtual; abstract;
-    procedure ReadFieldEnd(); virtual; abstract;
-    function ReadMapBegin: IMap; virtual; abstract;
-    procedure ReadMapEnd(); virtual; abstract;
-    function ReadListBegin: IList; virtual; abstract;
-    procedure ReadListEnd(); virtual; abstract;
-    function ReadSetBegin: ISet; virtual; abstract;
-    procedure ReadSetEnd(); virtual; abstract;
-    function ReadBool: Boolean; virtual; abstract;
-    function ReadByte: ShortInt; virtual; abstract;
-    function ReadI16: SmallInt; virtual; abstract;
-    function ReadI32: Integer; virtual; abstract;
-    function ReadI64: Int64; virtual; abstract;
-    function ReadDouble:Double; virtual; abstract;
-    function ReadBinary: TBytes; virtual; abstract;
-    function ReadString: string; virtual;
-    function ReadAnsiString: AnsiString; virtual;
-
-    property Transport: ITransport read GetTransport;
-
-    constructor Create( trans: ITransport );
-  end;
-
-  IBase = interface
-    ['{08D9BAA8-5EAA-410F-B50B-AC2E6E5E4155}']
-    function ToString: string;
-    procedure Read( const iprot: IProtocol);
-    procedure Write( const iprot: IProtocol);
-  end;
-
-  IStruct = interface
-    ['{5DCE39AA-C916-4BC7-A79B-96A0C36B2220}']
-    procedure SetName(const Value: string);
-    function GetName: string;
-    property Name: string read GetName write SetName;
-  end;
-
-  TStructImpl = class( TInterfacedObject, IStruct )
-  private
-    FName: string;
-  protected
-    function GetName: string;
-    procedure SetName(const Value: string);
-  public
-    constructor Create( const AName: string);
-  end;
-
-  TBinaryProtocolImpl = class( TProtocolImpl )
-  protected
-    const
-      VERSION_MASK : Cardinal = $ffff0000;
-      VERSION_1 : Cardinal = $80010000;
-  protected
-    FStrictRead : Boolean;
-    FStrictWrite : Boolean;
-
-  private
-    function ReadAll( var buf: TBytes; off: Integer; len: Integer ): Integer;
-    function ReadStringBody( size: Integer): string;
-
-  public
-
-    type
-      TFactory = class( TInterfacedObject, IProtocolFactory)
-      protected
-        FStrictRead : Boolean;
-        FStrictWrite : Boolean;
-      public
-        function GetProtocol( const trans: ITransport): IProtocol;
-        constructor Create( AStrictRead, AStrictWrite: Boolean ); overload;
-        constructor Create; overload;
-      end;
-
-    constructor Create( const trans: ITransport); overload;
-    constructor Create( const trans: ITransport; strictRead: Boolean; strictWrite: Boolean); overload;
-
-    procedure WriteMessageBegin( const msg: IMessage); override;
-    procedure WriteMessageEnd; override;
-    procedure WriteStructBegin( const struc: IStruct); override;
-    procedure WriteStructEnd; override;
-    procedure WriteFieldBegin( const field: IField); override;
-    procedure WriteFieldEnd; override;
-    procedure WriteFieldStop; override;
-    procedure WriteMapBegin( const map: IMap); override;
-    procedure WriteMapEnd; override;
-    procedure WriteListBegin( const list: IList); override;
-    procedure WriteListEnd(); override;
-    procedure WriteSetBegin( const set_: ISet ); override;
-    procedure WriteSetEnd(); override;
-    procedure WriteBool( b: Boolean); override;
-    procedure WriteByte( b: ShortInt); override;
-    procedure WriteI16( i16: SmallInt); override;
-    procedure WriteI32( i32: Integer); override;
-    procedure WriteI64( const i64: Int64); override;
-    procedure WriteDouble( const d: Double); override;
-    procedure WriteBinary( const b: TBytes); override;
-
-    function ReadMessageBegin: IMessage; override;
-    procedure ReadMessageEnd(); override;
-    function ReadStructBegin: IStruct; override;
-    procedure ReadStructEnd; override;
-    function ReadFieldBegin: IField; override;
-    procedure ReadFieldEnd(); override;
-    function ReadMapBegin: IMap; override;
-    procedure ReadMapEnd(); override;
-    function ReadListBegin: IList; override;
-    procedure ReadListEnd(); override;
-    function ReadSetBegin: ISet; override;
-    procedure ReadSetEnd(); override;
-    function ReadBool: Boolean; override;
-    function ReadByte: ShortInt; override;
-    function ReadI16: SmallInt; override;
-    function ReadI32: Integer; override;
-    function ReadI64: Int64; override;
-    function ReadDouble:Double; override;
-    function ReadBinary: TBytes; override;
-
-  end;
-
-
-  { TProtocolDecorator forwards all requests to an enclosed TProtocol instance,
-    providing a way to author concise concrete decorator subclasses. The decorator
-    does not (and should not) modify the behaviour of the enclosed TProtocol
-
-    See p.175 of Design Patterns (by Gamma et al.)
-  }
-  TProtocolDecorator = class( TProtocolImpl)
-  private
-    FWrappedProtocol : IProtocol;
-
-  public
-    // Encloses the specified protocol.
-    // All operations will be forward to the given protocol.  Must be non-null.
-    constructor Create( const aProtocol : IProtocol);
-
-    procedure WriteMessageBegin( const msg: IMessage); override;
-    procedure WriteMessageEnd; override;
-    procedure WriteStructBegin( const struc: IStruct); override;
-    procedure WriteStructEnd; override;
-    procedure WriteFieldBegin( const field: IField); override;
-    procedure WriteFieldEnd; override;
-    procedure WriteFieldStop; override;
-    procedure WriteMapBegin( const map: IMap); override;
-    procedure WriteMapEnd; override;
-    procedure WriteListBegin( const list: IList); override;
-    procedure WriteListEnd(); override;
-    procedure WriteSetBegin( const set_: ISet ); override;
-    procedure WriteSetEnd(); override;
-    procedure WriteBool( b: Boolean); override;
-    procedure WriteByte( b: ShortInt); override;
-    procedure WriteI16( i16: SmallInt); override;
-    procedure WriteI32( i32: Integer); override;
-    procedure WriteI64( const i64: Int64); override;
-    procedure WriteDouble( const d: Double); override;
-    procedure WriteString( const s: string ); override;
-    procedure WriteAnsiString( const s: AnsiString); override;
-    procedure WriteBinary( const b: TBytes); override;
-
-    function ReadMessageBegin: IMessage; override;
-    procedure ReadMessageEnd(); override;
-    function ReadStructBegin: IStruct; override;
-    procedure ReadStructEnd; override;
-    function ReadFieldBegin: IField; override;
-    procedure ReadFieldEnd(); override;
-    function ReadMapBegin: IMap; override;
-    procedure ReadMapEnd(); override;
-    function ReadListBegin: IList; override;
-    procedure ReadListEnd(); override;
-    function ReadSetBegin: ISet; override;
-    procedure ReadSetEnd(); override;
-    function ReadBool: Boolean; override;
-    function ReadByte: ShortInt; override;
-    function ReadI16: SmallInt; override;
-    function ReadI32: Integer; override;
-    function ReadI64: Int64; override;
-    function ReadDouble:Double; override;
-    function ReadBinary: TBytes; override;
-    function ReadString: string; override;
-    function ReadAnsiString: AnsiString; override;
-  end;
-
-
-type
-  IRequestEvents = interface
-    ['{F926A26A-5B00-4560-86FA-2CAE3BA73DAF}']
-    // Called before reading arguments.
-    procedure PreRead;
-    // Called between reading arguments and calling the handler.
-    procedure PostRead;
-    // Called between calling the handler and writing the response.
-    procedure PreWrite;
-    // Called after writing the response.
-    procedure PostWrite;
-    // Called when an oneway (async) function call completes successfully.
-    procedure OnewayComplete;
-    // Called if the handler throws an undeclared exception.
-    procedure UnhandledError( const e : Exception);
-    // Called when a client has finished request-handling to clean up
-    procedure CleanupContext;
-  end;
-
-
-  IProcessorEvents = interface
-    ['{A8661119-657C-447D-93C5-512E36162A45}']
-    // Called when a client is about to call the processor.
-    procedure Processing( const transport : ITransport);
-    // Called on any service function invocation
-    function  CreateRequestContext( const aFunctionName : string) : IRequestEvents;
-    // Called when a client has finished request-handling to clean up
-    procedure CleanupContext;
-  end;
-
-
-  IProcessor = interface
-    ['{7BAE92A5-46DA-4F13-B6EA-0EABE233EE5F}']
-    function Process( const iprot :IProtocol; const oprot: IProtocol; const events : IProcessorEvents = nil): Boolean;
-  end;
-
-
-
-implementation
-
-function ConvertInt64ToDouble( const n: Int64): Double;
-begin
-  ASSERT( SizeOf(n) = SizeOf(Result));
-  System.Move( n, Result, SizeOf(Result));
-end;
-
-function ConvertDoubleToInt64( const d: Double): Int64;
-begin
-  ASSERT( SizeOf(d) = SizeOf(Result));
-  System.Move( d, Result, SizeOf(Result));
-end;
-
-{ TFieldImpl }
-
-constructor TFieldImpl.Create(const AName: string; const AType: TType;
-  AId: SmallInt);
-begin
-  inherited Create;
-  FName := AName;
-  FType := AType;
-  FId := AId;
-end;
-
-constructor TFieldImpl.Create;
-begin
-  inherited Create;
-  FName := '';
-  FType := Low(TType);
-  FId   := 0;
-end;
-
-function TFieldImpl.GetId: SmallInt;
-begin
-  Result := FId;
-end;
-
-function TFieldImpl.GetName: string;
-begin
-  Result := FName;
-end;
-
-function TFieldImpl.GetType: TType;
-begin
-  Result := FType;
-end;
-
-procedure TFieldImpl.SetId(Value: SmallInt);
-begin
-  FId := Value;
-end;
-
-procedure TFieldImpl.SetName(const Value: string);
-begin
-  FName := Value;
-end;
-
-procedure TFieldImpl.SetType(Value: TType);
-begin
-  FType := Value;
-end;
-
-{ TProtocolRecursionTrackerImpl }
-
-constructor TProtocolRecursionTrackerImpl.Create( prot : IProtocol);
-begin
-  inherited Create;
-
-  // storing the pointer *after* the (successful) increment is important here
-  prot.IncrementRecursionDepth;
-  FProtocol := prot;
-end;
-
-destructor TProtocolRecursionTrackerImpl.Destroy;
-begin
-  try
-    // we have to release the reference iff the pointer has been stored
-    if FProtocol <> nil then begin
-      FProtocol.DecrementRecursionDepth;
-      FProtocol := nil;
-    end;
-  finally
-    inherited Destroy;
-  end;
-end;
-
-{ TProtocolImpl }
-
-constructor TProtocolImpl.Create(trans: ITransport);
-begin
-  inherited Create;
-  FTrans := trans;
-  FRecursionLimit := DEFAULT_RECURSION_LIMIT;
-  FRecursionDepth := 0;
-end;
-
-procedure TProtocolImpl.SetRecursionLimit( value : Integer);
-begin
-  FRecursionLimit := value;
-end;
-
-function TProtocolImpl.GetRecursionLimit : Integer;
-begin
-  result := FRecursionLimit;
-end;
-
-function TProtocolImpl.NextRecursionLevel : IProtocolRecursionTracker;
-begin
-  result := TProtocolRecursionTrackerImpl.Create(Self);
-end;
-
-procedure TProtocolImpl.IncrementRecursionDepth;
-begin
-  if FRecursionDepth < FRecursionLimit
-  then Inc(FRecursionDepth)
-  else raise TProtocolExceptionDepthLimit.Create('Depth limit exceeded');
-end;
-
-procedure TProtocolImpl.DecrementRecursionDepth;
-begin
-  Dec(FRecursionDepth)
-end;
-
-function TProtocolImpl.GetTransport: ITransport;
-begin
-  Result := FTrans;
-end;
-
-function TProtocolImpl.ReadAnsiString: AnsiString;
-var
-  b : TBytes;
-  len : Integer;
-begin
-  Result := '';
-  b := ReadBinary;
-  len := Length( b );
-  if len > 0 then
-  begin
-    SetLength( Result, len);
-    System.Move( b[0], Pointer(Result)^, len );
-  end;
-end;
-
-function TProtocolImpl.ReadString: string;
-begin
-  Result := TEncoding.UTF8.GetString( ReadBinary );
-end;
-
-procedure TProtocolImpl.WriteAnsiString(const s: AnsiString);
-var
-  b : TBytes;
-  len : Integer;
-begin
-  len := Length(s);
-  SetLength( b, len);
-  if len > 0 then
-  begin
-    System.Move( Pointer(s)^, b[0], len );
-  end;
-  WriteBinary( b );
-end;
-
-procedure TProtocolImpl.WriteString(const s: string);
-var
-  b : TBytes;
-begin
-  b := TEncoding.UTF8.GetBytes(s);
-  WriteBinary( b );
-end;
-
-{ TProtocolUtil }
-
-class procedure TProtocolUtil.Skip( prot: IProtocol; type_: TType);
-var field : IField;
-    map   : IMap;
-    set_  : ISet;
-    list  : IList;
-    i     : Integer;
-    tracker : IProtocolRecursionTracker;
-begin
-  tracker := prot.NextRecursionLevel;
-  case type_ of
-    // simple types
-    TType.Bool_   :  prot.ReadBool();
-    TType.Byte_   :  prot.ReadByte();
-    TType.I16     :  prot.ReadI16();
-    TType.I32     :  prot.ReadI32();
-    TType.I64     :  prot.ReadI64();
-    TType.Double_ :  prot.ReadDouble();
-    TType.String_ :  prot.ReadBinary();// Don't try to decode the string, just skip it.
-
-    // structured types
-    TType.Struct :  begin
-      prot.ReadStructBegin();
-      while TRUE do begin
-        field := prot.ReadFieldBegin();
-        if (field.Type_ = TType.Stop) then Break;
-        Skip(prot, field.Type_);
-        prot.ReadFieldEnd();
-      end;
-      prot.ReadStructEnd();
-    end;
-
-    TType.Map :  begin
-      map := prot.ReadMapBegin();
-      for i := 0 to map.Count-1 do begin
-        Skip(prot, map.KeyType);
-        Skip(prot, map.ValueType);
-      end;
-      prot.ReadMapEnd();
-    end;
-
-    TType.Set_ :  begin
-      set_ := prot.ReadSetBegin();
-      for i := 0 to set_.Count-1
-      do Skip( prot, set_.ElementType);
-      prot.ReadSetEnd();
-    end;
-
-    TType.List :  begin
-      list := prot.ReadListBegin();
-      for i := 0 to list.Count-1
-      do Skip( prot, list.ElementType);
-      prot.ReadListEnd();
-    end;
-
-  else
-    ASSERT( FALSE); // any new types?
-  end;
-end;
-
-{ TStructImpl }
-
-constructor TStructImpl.Create(const AName: string);
-begin
-  inherited Create;
-  FName := AName;
-end;
-
-function TStructImpl.GetName: string;
-begin
-  Result := FName;
-end;
-
-procedure TStructImpl.SetName(const Value: string);
-begin
-  FName := Value;
-end;
-
-{ TMapImpl }
-
-constructor TMapImpl.Create( AKeyType, AValueType: TType; ACount: Integer);
-begin
-  inherited Create;
-  FValueType := AValueType;
-  FKeyType := AKeyType;
-  FCount := ACount;
-end;
-
-constructor TMapImpl.Create;
-begin
-  inherited Create;
-end;
-
-function TMapImpl.GetCount: Integer;
-begin
-  Result := FCount;
-end;
-
-function TMapImpl.GetKeyType: TType;
-begin
-  Result := FKeyType;
-end;
-
-function TMapImpl.GetValueType: TType;
-begin
-  Result := FValueType;
-end;
-
-procedure TMapImpl.SetCount(Value: Integer);
-begin
-  FCount := Value;
-end;
-
-procedure TMapImpl.SetKeyType(Value: TType);
-begin
-  FKeyType := Value;
-end;
-
-procedure TMapImpl.SetValueType(Value: TType);
-begin
-  FValueType := Value;
-end;
-
-{ IMessage }
-
-constructor TMessageImpl.Create(AName: string; AMessageType: TMessageType;
-  ASeqID: Integer);
-begin
-  inherited Create;
-  FName := AName;
-  FMessageType := AMessageType;
-  FSeqID := ASeqID;
-end;
-
-constructor TMessageImpl.Create;
-begin
-  inherited;
-end;
-
-function TMessageImpl.GetName: string;
-begin
-  Result := FName;
-end;
-
-function TMessageImpl.GetSeqID: Integer;
-begin
-  Result := FSeqID;
-end;
-
-function TMessageImpl.GetType: TMessageType;
-begin
-  Result := FMessageType;
-end;
-
-procedure TMessageImpl.SetName(const Value: string);
-begin
-  FName := Value;
-end;
-
-procedure TMessageImpl.SetSeqID(Value: Integer);
-begin
-  FSeqID := Value;
-end;
-
-procedure TMessageImpl.SetType(Value: TMessageType);
-begin
-  FMessageType := Value;
-end;
-
-{ ISet }
-
-constructor TSetImpl.Create( AElementType: TType; ACount: Integer);
-begin
-  inherited Create;
-  FCount := ACount;
-  FElementType := AElementType;
-end;
-
-constructor TSetImpl.Create;
-begin
-  inherited Create;
-end;
-
-function TSetImpl.GetCount: Integer;
-begin
-  Result := FCount;
-end;
-
-function TSetImpl.GetElementType: TType;
-begin
-  Result := FElementType;
-end;
-
-procedure TSetImpl.SetCount(Value: Integer);
-begin
-  FCount := Value;
-end;
-
-procedure TSetImpl.SetElementType(Value: TType);
-begin
-  FElementType := Value;
-end;
-
-{ IList }
-
-constructor TListImpl.Create( AElementType: TType; ACount: Integer);
-begin
-  inherited Create;
-  FCount := ACount;
-  FElementType := AElementType;
-end;
-
-constructor TListImpl.Create;
-begin
-  inherited Create;
-end;
-
-function TListImpl.GetCount: Integer;
-begin
-  Result := FCount;
-end;
-
-function TListImpl.GetElementType: TType;
-begin
-  Result := FElementType;
-end;
-
-procedure TListImpl.SetCount(Value: Integer);
-begin
-  FCount := Value;
-end;
-
-procedure TListImpl.SetElementType(Value: TType);
-begin
-  FElementType := Value;
-end;
-
-{ TBinaryProtocolImpl }
-
-constructor TBinaryProtocolImpl.Create( const trans: ITransport);
-begin
-  //no inherited
-  Create( trans, False, True);
-end;
-
-constructor TBinaryProtocolImpl.Create( const trans: ITransport; strictRead,
-  strictWrite: Boolean);
-begin
-  inherited Create( trans );
-  FStrictRead := strictRead;
-  FStrictWrite := strictWrite;
-end;
-
-function TBinaryProtocolImpl.ReadAll( var buf: TBytes; off,
-  len: Integer): Integer;
-begin
-  Result := FTrans.ReadAll( buf, off, len );
-end;
-
-function TBinaryProtocolImpl.ReadBinary: TBytes;
-var
-  size : Integer;
-  buf : TBytes;
-begin
-  size := ReadI32;
-  SetLength( buf, size );
-  FTrans.ReadAll( buf, 0, size);
-  Result := buf;
-end;
-
-function TBinaryProtocolImpl.ReadBool: Boolean;
-begin
-  Result := ReadByte = 1;
-end;
-
-function TBinaryProtocolImpl.ReadByte: ShortInt;
-var
-  bin : TBytes;
-begin
-  SetLength( bin, 1);
-  ReadAll( bin, 0, 1 );
-  Result := ShortInt( bin[0]);
-end;
-
-function TBinaryProtocolImpl.ReadDouble: Double;
-begin
-  Result := ConvertInt64ToDouble( ReadI64 )
-end;
-
-function TBinaryProtocolImpl.ReadFieldBegin: IField;
-var
-  field : IField;
-begin
-  field := TFieldImpl.Create;
-  field.Type_ := TType( ReadByte);
-  if ( field.Type_ <> TType.Stop ) then
-  begin
-    field.Id := ReadI16;
-  end;
-  Result := field;
-end;
-
-procedure TBinaryProtocolImpl.ReadFieldEnd;
-begin
-
-end;
-
-function TBinaryProtocolImpl.ReadI16: SmallInt;
-var
-  i16in : TBytes;
-begin
-  SetLength( i16in, 2 );
-  ReadAll( i16in, 0, 2);
-  Result := SmallInt(((i16in[0] and $FF) shl 8) or (i16in[1] and $FF));
-end;
-
-function TBinaryProtocolImpl.ReadI32: Integer;
-var
-  i32in : TBytes;
-begin
-  SetLength( i32in, 4 );
-  ReadAll( i32in, 0, 4);
-
-  Result := Integer(
-    ((i32in[0] and $FF) shl 24) or
-    ((i32in[1] and $FF) shl 16) or
-    ((i32in[2] and $FF) shl 8) or
-     (i32in[3] and $FF));
-
-end;
-
-function TBinaryProtocolImpl.ReadI64: Int64;
-var
-  i64in : TBytes;
-begin
-  SetLength( i64in, 8);
-  ReadAll( i64in, 0, 8);
-  Result :=
-    (Int64( i64in[0] and $FF) shl 56) or
-    (Int64( i64in[1] and $FF) shl 48) or
-    (Int64( i64in[2] and $FF) shl 40) or
-    (Int64( i64in[3] and $FF) shl 32) or
-    (Int64( i64in[4] and $FF) shl 24) or
-    (Int64( i64in[5] and $FF) shl 16) or
-    (Int64( i64in[6] and $FF) shl 8) or
-    (Int64( i64in[7] and $FF));
-end;
-
-function TBinaryProtocolImpl.ReadListBegin: IList;
-var
-  list : IList;
-begin
-  list := TListImpl.Create;
-  list.ElementType := TType( ReadByte );
-  list.Count := ReadI32;
-  Result := list;
-end;
-
-procedure TBinaryProtocolImpl.ReadListEnd;
-begin
-
-end;
-
-function TBinaryProtocolImpl.ReadMapBegin: IMap;
-var
-  map : IMap;
-begin
-  map := TMapImpl.Create;
-  map.KeyType := TType( ReadByte );
-  map.ValueType := TType( ReadByte );
-  map.Count := ReadI32;
-  Result := map;
-end;
-
-procedure TBinaryProtocolImpl.ReadMapEnd;
-begin
-
-end;
-
-function TBinaryProtocolImpl.ReadMessageBegin: IMessage;
-var
-  size : Integer;
-  version : Integer;
-  message : IMessage;
-begin
-  message := TMessageImpl.Create;
-  size := ReadI32;
-  if (size < 0) then
-  begin
-    version := size and Integer( VERSION_MASK);
-    if ( version <> Integer( VERSION_1)) then
-    begin
-      raise TProtocolExceptionBadVersion.Create('Bad version in ReadMessageBegin: ' + IntToStr(version) );
-    end;
-    message.Type_ := TMessageType( size and $000000ff);
-    message.Name := ReadString;
-    message.SeqID := ReadI32;
-  end else
-  begin
-    if FStrictRead then
-    begin
-      raise TProtocolExceptionBadVersion.Create('Missing version in readMessageBegin, old client?' );
-    end;
-    message.Name := ReadStringBody( size );
-    message.Type_ := TMessageType( ReadByte );
-    message.SeqID := ReadI32;
-  end;
-  Result := message;
-end;
-
-procedure TBinaryProtocolImpl.ReadMessageEnd;
-begin
-  inherited;
-
-end;
-
-function TBinaryProtocolImpl.ReadSetBegin: ISet;
-var
-  set_ : ISet;
-begin
-  set_ := TSetImpl.Create;
-  set_.ElementType := TType( ReadByte );
-  set_.Count := ReadI32;
-  Result := set_;
-end;
-
-procedure TBinaryProtocolImpl.ReadSetEnd;
-begin
-
-end;
-
-function TBinaryProtocolImpl.ReadStringBody( size: Integer): string;
-var
-  buf : TBytes;
-begin
-  SetLength( buf, size );
-  FTrans.ReadAll( buf, 0, size );
-  Result := TEncoding.UTF8.GetString( buf);
-end;
-
-function TBinaryProtocolImpl.ReadStructBegin: IStruct;
-begin
-  Result := TStructImpl.Create('');
-end;
-
-procedure TBinaryProtocolImpl.ReadStructEnd;
-begin
-  inherited;
-
-end;
-
-procedure TBinaryProtocolImpl.WriteBinary( const b: TBytes);
-var iLen : Integer;
-begin
-  iLen := Length(b);
-  WriteI32( iLen);
-  if iLen > 0 then FTrans.Write(b, 0, iLen);
-end;
-
-procedure TBinaryProtocolImpl.WriteBool(b: Boolean);
-begin
-  if b then
-  begin
-    WriteByte( 1 );
-  end else
-  begin
-    WriteByte( 0 );
-  end;
-end;
-
-procedure TBinaryProtocolImpl.WriteByte(b: ShortInt);
-var
-  a : TBytes;
-begin
-  SetLength( a, 1);
-  a[0] := Byte( b );
-  FTrans.Write( a, 0, 1 );
-end;
-
-procedure TBinaryProtocolImpl.WriteDouble( const d: Double);
-begin
-  WriteI64(ConvertDoubleToInt64(d));
-end;
-
-procedure TBinaryProtocolImpl.WriteFieldBegin( const field: IField);
-begin
-  WriteByte(ShortInt(field.Type_));
-  WriteI16(field.ID);
-end;
-
-procedure TBinaryProtocolImpl.WriteFieldEnd;
-begin
-
-end;
-
-procedure TBinaryProtocolImpl.WriteFieldStop;
-begin
-  WriteByte(ShortInt(TType.Stop));
-end;
-
-procedure TBinaryProtocolImpl.WriteI16(i16: SmallInt);
-var
-  i16out : TBytes;
-begin
-  SetLength( i16out, 2);
-  i16out[0] := Byte($FF and (i16 shr 8));
-  i16out[1] := Byte($FF and i16);
-  FTrans.Write( i16out );
-end;
-
-procedure TBinaryProtocolImpl.WriteI32(i32: Integer);
-var
-  i32out : TBytes;
-begin
-  SetLength( i32out, 4);
-  i32out[0] := Byte($FF and (i32 shr 24));
-  i32out[1] := Byte($FF and (i32 shr 16));
-  i32out[2] := Byte($FF and (i32 shr 8));
-  i32out[3] := Byte($FF and i32);
-  FTrans.Write( i32out, 0, 4);
-end;
-
-procedure TBinaryProtocolImpl.WriteI64( const i64: Int64);
-var
-  i64out : TBytes;
-begin
-  SetLength( i64out, 8);
-  i64out[0] := Byte($FF and (i64 shr 56));
-  i64out[1] := Byte($FF and (i64 shr 48));
-  i64out[2] := Byte($FF and (i64 shr 40));
-  i64out[3] := Byte($FF and (i64 shr 32));
-  i64out[4] := Byte($FF and (i64 shr 24));
-  i64out[5] := Byte($FF and (i64 shr 16));
-  i64out[6] := Byte($FF and (i64 shr 8));
-  i64out[7] := Byte($FF and i64);
-  FTrans.Write( i64out, 0, 8);
-end;
-
-procedure TBinaryProtocolImpl.WriteListBegin( const list: IList);
-begin
-  WriteByte(ShortInt(list.ElementType));
-  WriteI32(list.Count);
-end;
-
-procedure TBinaryProtocolImpl.WriteListEnd;
-begin
-
-end;
-
-procedure TBinaryProtocolImpl.WriteMapBegin( const map: IMap);
-begin
-  WriteByte(ShortInt(map.KeyType));
-  WriteByte(ShortInt(map.ValueType));
-  WriteI32(map.Count);
-end;
-
-procedure TBinaryProtocolImpl.WriteMapEnd;
-begin
-
-end;
-
-procedure TBinaryProtocolImpl.WriteMessageBegin( const msg: IMessage);
-var
-  version : Cardinal;
-begin
-  if FStrictWrite then
-  begin
-    version := VERSION_1 or Cardinal( msg.Type_);
-    WriteI32( Integer( version) );
-    WriteString( msg.Name);
-    WriteI32( msg.SeqID);
-  end else
-  begin
-    WriteString( msg.Name);
-    WriteByte(ShortInt( msg.Type_));
-    WriteI32( msg.SeqID);
-  end;
-end;
-
-procedure TBinaryProtocolImpl.WriteMessageEnd;
-begin
-
-end;
-
-procedure TBinaryProtocolImpl.WriteSetBegin( const set_: ISet);
-begin
-  WriteByte(ShortInt(set_.ElementType));
-  WriteI32(set_.Count);
-end;
-
-procedure TBinaryProtocolImpl.WriteSetEnd;
-begin
-
-end;
-
-procedure TBinaryProtocolImpl.WriteStructBegin( const struc: IStruct);
-begin
-
-end;
-
-procedure TBinaryProtocolImpl.WriteStructEnd;
-begin
-
-end;
-
-{ TProtocolException }
-
-constructor TProtocolException.HiddenCreate(const Msg: string);
-begin
-  inherited Create(Msg);
-end;
-
-class function TProtocolException.Create(const Msg: string): TProtocolException;
-begin
-  Result := TProtocolExceptionUnknown.Create(Msg);
-end;
-
-class function TProtocolException.Create: TProtocolException;
-begin
-  Result := TProtocolExceptionUnknown.Create('');
-end;
-
-class function TProtocolException.Create(type_: Integer): TProtocolException;
-begin
-{$WARN SYMBOL_DEPRECATED OFF}
-  Result := Create(type_, '');
-{$WARN SYMBOL_DEPRECATED DEFAULT}
-end;
-
-class function TProtocolException.Create(type_: Integer; const msg: string): TProtocolException;
-begin
-  case type_ of
-    INVALID_DATA:    Result := TProtocolExceptionInvalidData.Create(msg);
-    NEGATIVE_SIZE:   Result := TProtocolExceptionNegativeSize.Create(msg);
-    SIZE_LIMIT:      Result := TProtocolExceptionSizeLimit.Create(msg);
-    BAD_VERSION:     Result := TProtocolExceptionBadVersion.Create(msg);
-    NOT_IMPLEMENTED: Result := TProtocolExceptionNotImplemented.Create(msg);
-    DEPTH_LIMIT:     Result := TProtocolExceptionDepthLimit.Create(msg);
-  else
-    Result := TProtocolExceptionUnknown.Create(msg);
-  end;
-end;
-
-{ TProtocolExceptionSpecialized }
-
-constructor TProtocolExceptionSpecialized.Create(const Msg: string);
-begin
-  inherited HiddenCreate(Msg);
-end;
-
-{ TThriftStringBuilder }
-
-function TThriftStringBuilder.Append(const Value: TBytes): TStringBuilder;
-begin
-  Result := Append( string( RawByteString(Value)) );
-end;
-
-function TThriftStringBuilder.Append(
-  const Value: IThriftContainer): TStringBuilder;
-begin
-  Result := Append( Value.ToString );
-end;
-
-{ TBinaryProtocolImpl.TFactory }
-
-constructor TBinaryProtocolImpl.TFactory.Create(AStrictRead, AStrictWrite: Boolean);
-begin
-  inherited Create;
-  FStrictRead := AStrictRead;
-  FStrictWrite := AStrictWrite;
-end;
-
-constructor TBinaryProtocolImpl.TFactory.Create;
-begin
-  //no inherited;
-  Create( False, True )
-end;
-
-function TBinaryProtocolImpl.TFactory.GetProtocol( const trans: ITransport): IProtocol;
-begin
-  Result := TBinaryProtocolImpl.Create( trans, FStrictRead, FStrictWrite);
-end;
-
-
-{ TProtocolDecorator }
-
-constructor TProtocolDecorator.Create( const aProtocol : IProtocol);
-begin
-  ASSERT( aProtocol <> nil);
-  inherited Create( aProtocol.Transport);
-  FWrappedProtocol := aProtocol;
-end;
-
-
-procedure TProtocolDecorator.WriteMessageBegin( const msg: IMessage);
-begin
-  FWrappedProtocol.WriteMessageBegin( msg);
-end;
-
-
-procedure TProtocolDecorator.WriteMessageEnd;
-begin
-  FWrappedProtocol.WriteMessageEnd;
-end;
-
-
-procedure TProtocolDecorator.WriteStructBegin( const struc: IStruct);
-begin
-  FWrappedProtocol.WriteStructBegin( struc);
-end;
-
-
-procedure TProtocolDecorator.WriteStructEnd;
-begin
-  FWrappedProtocol.WriteStructEnd;
-end;
-
-
-procedure TProtocolDecorator.WriteFieldBegin( const field: IField);
-begin
-  FWrappedProtocol.WriteFieldBegin( field);
-end;
-
-
-procedure TProtocolDecorator.WriteFieldEnd;
-begin
-  FWrappedProtocol.WriteFieldEnd;
-end;
-
-
-procedure TProtocolDecorator.WriteFieldStop;
-begin
-  FWrappedProtocol.WriteFieldStop;
-end;
-
-
-procedure TProtocolDecorator.WriteMapBegin( const map: IMap);
-begin
-  FWrappedProtocol.WriteMapBegin( map);
-end;
-
-
-procedure TProtocolDecorator.WriteMapEnd;
-begin
-  FWrappedProtocol.WriteMapEnd;
-end;
-
-
-procedure TProtocolDecorator.WriteListBegin( const list: IList);
-begin
-  FWrappedProtocol.WriteListBegin( list);
-end;
-
-
-procedure TProtocolDecorator.WriteListEnd();
-begin
-  FWrappedProtocol.WriteListEnd();
-end;
-
-
-procedure TProtocolDecorator.WriteSetBegin( const set_: ISet );
-begin
-  FWrappedProtocol.WriteSetBegin( set_);
-end;
-
-
-procedure TProtocolDecorator.WriteSetEnd();
-begin
-  FWrappedProtocol.WriteSetEnd();
-end;
-
-
-procedure TProtocolDecorator.WriteBool( b: Boolean);
-begin
-  FWrappedProtocol.WriteBool( b);
-end;
-
-
-procedure TProtocolDecorator.WriteByte( b: ShortInt);
-begin
-  FWrappedProtocol.WriteByte( b);
-end;
-
-
-procedure TProtocolDecorator.WriteI16( i16: SmallInt);
-begin
-  FWrappedProtocol.WriteI16( i16);
-end;
-
-
-procedure TProtocolDecorator.WriteI32( i32: Integer);
-begin
-  FWrappedProtocol.WriteI32( i32);
-end;
-
-
-procedure TProtocolDecorator.WriteI64( const i64: Int64);
-begin
-  FWrappedProtocol.WriteI64( i64);
-end;
-
-
-procedure TProtocolDecorator.WriteDouble( const d: Double);
-begin
-  FWrappedProtocol.WriteDouble( d);
-end;
-
-
-procedure TProtocolDecorator.WriteString( const s: string );
-begin
-  FWrappedProtocol.WriteString( s);
-end;
-
-
-procedure TProtocolDecorator.WriteAnsiString( const s: AnsiString);
-begin
-  FWrappedProtocol.WriteAnsiString( s);
-end;
-
-
-procedure TProtocolDecorator.WriteBinary( const b: TBytes);
-begin
-  FWrappedProtocol.WriteBinary( b);
-end;
-
-
-function TProtocolDecorator.ReadMessageBegin: IMessage;
-begin
-  result := FWrappedProtocol.ReadMessageBegin;
-end;
-
-
-procedure TProtocolDecorator.ReadMessageEnd();
-begin
-  FWrappedProtocol.ReadMessageEnd();
-end;
-
-
-function TProtocolDecorator.ReadStructBegin: IStruct;
-begin
-  result := FWrappedProtocol.ReadStructBegin;
-end;
-
-
-procedure TProtocolDecorator.ReadStructEnd;
-begin
-  FWrappedProtocol.ReadStructEnd;
-end;
-
-
-function TProtocolDecorator.ReadFieldBegin: IField;
-begin
-  result := FWrappedProtocol.ReadFieldBegin;
-end;
-
-
-procedure TProtocolDecorator.ReadFieldEnd();
-begin
-  FWrappedProtocol.ReadFieldEnd();
-end;
-
-
-function TProtocolDecorator.ReadMapBegin: IMap;
-begin
-  result := FWrappedProtocol.ReadMapBegin;
-end;
-
-
-procedure TProtocolDecorator.ReadMapEnd();
-begin
-  FWrappedProtocol.ReadMapEnd();
-end;
-
-
-function TProtocolDecorator.ReadListBegin: IList;
-begin
-  result := FWrappedProtocol.ReadListBegin;
-end;
-
-
-procedure TProtocolDecorator.ReadListEnd();
-begin
-  FWrappedProtocol.ReadListEnd();
-end;
-
-
-function TProtocolDecorator.ReadSetBegin: ISet;
-begin
-  result := FWrappedProtocol.ReadSetBegin;
-end;
-
-
-procedure TProtocolDecorator.ReadSetEnd();
-begin
-  FWrappedProtocol.ReadSetEnd();
-end;
-
-
-function TProtocolDecorator.ReadBool: Boolean;
-begin
-  result := FWrappedProtocol.ReadBool;
-end;
-
-
-function TProtocolDecorator.ReadByte: ShortInt;
-begin
-  result := FWrappedProtocol.ReadByte;
-end;
-
-
-function TProtocolDecorator.ReadI16: SmallInt;
-begin
-  result := FWrappedProtocol.ReadI16;
-end;
-
-
-function TProtocolDecorator.ReadI32: Integer;
-begin
-  result := FWrappedProtocol.ReadI32;
-end;
-
-
-function TProtocolDecorator.ReadI64: Int64;
-begin
-  result := FWrappedProtocol.ReadI64;
-end;
-
-
-function TProtocolDecorator.ReadDouble:Double;
-begin
-  result := FWrappedProtocol.ReadDouble;
-end;
-
-
-function TProtocolDecorator.ReadBinary: TBytes;
-begin
-  result := FWrappedProtocol.ReadBinary;
-end;
-
-
-function TProtocolDecorator.ReadString: string;
-begin
-  result := FWrappedProtocol.ReadString;
-end;
-
-
-function TProtocolDecorator.ReadAnsiString: AnsiString;
-begin
-  result := FWrappedProtocol.ReadAnsiString;
-end;
-
-
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Serializer.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Serializer.pas
deleted file mode 100644
index 5f2905a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Serializer.pas
+++ /dev/null
@@ -1,230 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-unit Thrift.Serializer;
-
-{$I Thrift.Defines.inc}
-
-interface
-
-uses
-  {$IFDEF OLD_UNIT_NAMES}
-  Classes, Windows, SysUtils,
-  {$ELSE}
-  System.Classes, Winapi.Windows, System.SysUtils,
-  {$ENDIF}
-  Thrift.Protocol,
-  Thrift.Transport,
-  Thrift.Stream;
-
-
-type
-  // Generic utility for easily serializing objects into a byte array or Stream.
-  TSerializer = class
-  private
-    FStream    : TMemoryStream;
-    FTransport : ITransport;
-    FProtocol  : IProtocol;
-
-  public
-    // Create a new TSerializer that uses the TBinaryProtocol by default.
-    constructor Create;  overload;
-
-    // Create a new TSerializer.
-    // It will use the TProtocol specified by the factory that is passed in.
-    constructor Create( const factory : IProtocolFactory);  overload;
-
-    // DTOR
-    destructor Destroy;  override;
-
-    // Serialize the Thrift object.
-    function  Serialize( const input : IBase) : TBytes;  overload;
-    procedure Serialize( const input : IBase; const aStm : TStream);  overload;
-  end;
-
-
-  // Generic utility for easily deserializing objects from byte array or Stream.
-  TDeserializer = class
-  private
-    FStream    : TMemoryStream;
-    FTransport : ITransport;
-    FProtocol  : IProtocol;
-
-  public
-    // Create a new TDeserializer that uses the TBinaryProtocol by default.
-    constructor Create;  overload;
-
-    // Create a new TDeserializer.
-    // It will use the TProtocol specified by the factory that is passed in.
-    constructor Create( const factory : IProtocolFactory);  overload;
-
-    // DTOR
-    destructor Destroy;  override;
-
-    // Deserialize the Thrift object data.
-    procedure Deserialize( const input : TBytes; const target : IBase);  overload;
-    procedure Deserialize( const input : TStream; const target : IBase);  overload;
-  end;
-
-
-
-implementation
-
-
-{ TSerializer }
-
-
-constructor TSerializer.Create();
-// Create a new TSerializer that uses the TBinaryProtocol by default.
-begin
-  //no inherited;
-  Create( TBinaryProtocolImpl.TFactory.Create);
-end;
-
-
-constructor TSerializer.Create( const factory : IProtocolFactory);
-// Create a new TSerializer.
-// It will use the TProtocol specified by the factory that is passed in.
-var adapter : IThriftStream;
-begin
-  inherited Create;
-  FStream    := TMemoryStream.Create;
-  adapter    := TThriftStreamAdapterDelphi.Create( FStream, FALSE);
-  FTransport := TStreamTransportImpl.Create( nil, adapter);
-  FProtocol  := factory.GetProtocol( FTransport);
-end;
-
-
-destructor TSerializer.Destroy;
-begin
-  try
-    FProtocol  := nil;
-    FTransport := nil;
-    FreeAndNil( FStream);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-function TSerializer.Serialize( const input : IBase) : TBytes;
-// Serialize the Thrift object into a byte array. The process is simple,
-// just clear the byte array output, write the object into it, and grab the
-// raw bytes.
-var iBytes : Int64;
-begin
-  try
-    FStream.Size := 0;
-    input.Write( FProtocol);
-    SetLength( result, FStream.Size);
-    iBytes := Length(result);
-    if iBytes > 0
-    then Move( FStream.Memory^, result[0], iBytes);
-  finally
-    FStream.Size := 0;  // free any allocated memory
-  end;
-end;
-
-
-procedure TSerializer.Serialize( const input : IBase; const aStm : TStream);
-// Serialize the Thrift object into a byte array. The process is simple,
-// just clear the byte array output, write the object into it, and grab the
-// raw bytes.
-const COPY_ENTIRE_STREAM = 0;
-begin
-  try
-    FStream.Size := 0;
-    input.Write( FProtocol);
-    aStm.CopyFrom( FStream, COPY_ENTIRE_STREAM);
-  finally
-    FStream.Size := 0;  // free any allocated memory
-  end;
-end;
-
-
-{ TDeserializer }
-
-
-constructor TDeserializer.Create();
-// Create a new TDeserializer that uses the TBinaryProtocol by default.
-begin
-  //no inherited;
-  Create( TBinaryProtocolImpl.TFactory.Create);
-end;
-
-
-constructor TDeserializer.Create( const factory : IProtocolFactory);
-// Create a new TDeserializer.
-// It will use the TProtocol specified by the factory that is passed in.
-var adapter : IThriftStream;
-begin
-  inherited Create;
-  FStream    := TMemoryStream.Create;
-  adapter    := TThriftStreamAdapterDelphi.Create( FStream, FALSE);
-  FTransport := TStreamTransportImpl.Create( adapter, nil);
-  FProtocol  := factory.GetProtocol( FTransport);
-end;
-
-
-destructor TDeserializer.Destroy;
-begin
-  try
-    FProtocol  := nil;
-    FTransport := nil;
-    FreeAndNil( FStream);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-procedure TDeserializer.Deserialize( const input : TBytes; const target : IBase);
-// Deserialize the Thrift object data from the byte array.
-var iBytes : Int64;
-begin
-  try
-    iBytes := Length(input);
-    FStream.Size := iBytes;
-    if iBytes > 0
-    then Move( input[0], FStream.Memory^, iBytes);
-
-    target.Read( FProtocol);
-  finally
-    FStream.Size := 0;  // free any allocated memory
-  end;
-end;
-
-
-procedure TDeserializer.Deserialize( const input : TStream; const target : IBase);
-// Deserialize the Thrift object data from the byte array.
-const COPY_ENTIRE_STREAM = 0;
-var before : Int64;
-begin
-  try
-    before := FStream.Position;
-    FStream.CopyFrom( input, COPY_ENTIRE_STREAM);
-    FStream.Position := before;
-    target.Read( FProtocol);
-  finally
-    FStream.Size := 0;  // free any allocated memory
-  end;
-end;
-
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Server.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Server.pas
deleted file mode 100644
index 13c5762..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Server.pas
+++ /dev/null
@@ -1,423 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
- unit Thrift.Server;
-
-{$I Thrift.Defines.inc}
-{$I-}  // prevent annoying errors with default log delegate and no console
-
-interface
-
-uses
-  {$IFDEF OLD_UNIT_NAMES}
-  Windows, SysUtils,
-  {$ELSE}
-  Winapi.Windows, System.SysUtils,
-  {$ENDIF}
-  Thrift,
-  Thrift.Protocol,
-  Thrift.Transport;
-
-type
-  IServerEvents = interface
-    ['{9E2A99C5-EE85-40B2-9A52-2D1722B18176}']
-    // Called before the server begins.
-    procedure PreServe;
-    // Called when the server transport is ready to accept requests
-    procedure PreAccept;
-    // Called when a new client has connected and the server is about to being processing.
-    function  CreateProcessingContext( const input, output : IProtocol) : IProcessorEvents;
-  end;
-
-
-  IServer = interface
-    ['{ADC46F2D-8199-4D1C-96D2-87FD54351723}']
-    procedure Serve;
-    procedure Stop;
-
-    function GetServerEvents : IServerEvents;
-    procedure SetServerEvents( const value : IServerEvents);
-
-    property ServerEvents : IServerEvents read GetServerEvents write SetServerEvents;
-  end;
-
-  TServerImpl = class abstract( TInterfacedObject, IServer )
-  public
-    type
-      TLogDelegate = reference to procedure( const str: string);
-  protected
-    FProcessor : IProcessor;
-    FServerTransport : IServerTransport;
-    FInputTransportFactory : ITransportFactory;
-    FOutputTransportFactory : ITransportFactory;
-    FInputProtocolFactory : IProtocolFactory;
-    FOutputProtocolFactory : IProtocolFactory;
-    FLogDelegate : TLogDelegate;
-    FServerEvents : IServerEvents;
-
-    class procedure DefaultLogDelegate( const str: string);
-
-    function GetServerEvents : IServerEvents;
-    procedure SetServerEvents( const value : IServerEvents);
-
-    procedure Serve; virtual; abstract;
-    procedure Stop; virtual; abstract;
-  public
-    constructor Create(
-      const AProcessor :IProcessor;
-      const AServerTransport: IServerTransport;
-      const AInputTransportFactory : ITransportFactory;
-      const AOutputTransportFactory : ITransportFactory;
-      const AInputProtocolFactory : IProtocolFactory;
-      const AOutputProtocolFactory : IProtocolFactory;
-      const ALogDelegate : TLogDelegate
-      ); overload;
-
-    constructor Create(
-      const AProcessor :IProcessor;
-      const AServerTransport: IServerTransport
-      ); overload;
-
-    constructor Create(
-      const AProcessor :IProcessor;
-      const AServerTransport: IServerTransport;
-      const ALogDelegate: TLogDelegate
-      ); overload;
-
-    constructor Create(
-      const AProcessor :IProcessor;
-      const AServerTransport: IServerTransport;
-      const ATransportFactory : ITransportFactory
-      ); overload;
-
-    constructor Create(
-      const AProcessor :IProcessor;
-      const AServerTransport: IServerTransport;
-      const ATransportFactory : ITransportFactory;
-      const AProtocolFactory : IProtocolFactory
-      ); overload;
-  end;
-
-  TSimpleServer = class( TServerImpl)
-  private
-    FStop : Boolean;
-  public
-    constructor Create( const AProcessor: IProcessor; const AServerTransport: IServerTransport); overload;
-    constructor Create( const AProcessor: IProcessor; const AServerTransport: IServerTransport;
-      ALogDel: TServerImpl.TLogDelegate); overload;
-    constructor Create( const AProcessor: IProcessor; const AServerTransport: IServerTransport;
-      const ATransportFactory: ITransportFactory); overload;
-    constructor Create( const AProcessor: IProcessor; const AServerTransport: IServerTransport;
-      const ATransportFactory: ITransportFactory; const AProtocolFactory: IProtocolFactory); overload;
-
-    procedure Serve; override;
-    procedure Stop; override;
-  end;
-
-
-implementation
-
-{ TServerImpl }
-
-constructor TServerImpl.Create( const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport; const ALogDelegate: TLogDelegate);
-var
-  InputFactory, OutputFactory : IProtocolFactory;
-  InputTransFactory, OutputTransFactory : ITransportFactory;
-
-begin
-  InputFactory := TBinaryProtocolImpl.TFactory.Create;
-  OutputFactory := TBinaryProtocolImpl.TFactory.Create;
-  InputTransFactory := TTransportFactoryImpl.Create;
-  OutputTransFactory := TTransportFactoryImpl.Create;
-
-  //no inherited;
-  Create(
-    AProcessor,
-    AServerTransport,
-    InputTransFactory,
-    OutputTransFactory,
-    InputFactory,
-    OutputFactory,
-    ALogDelegate
-  );
-end;
-
-constructor TServerImpl.Create(const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport);
-var
-  InputFactory, OutputFactory : IProtocolFactory;
-  InputTransFactory, OutputTransFactory : ITransportFactory;
-
-begin
-  InputFactory := TBinaryProtocolImpl.TFactory.Create;
-  OutputFactory := TBinaryProtocolImpl.TFactory.Create;
-  InputTransFactory := TTransportFactoryImpl.Create;
-  OutputTransFactory := TTransportFactoryImpl.Create;
-
-  //no inherited;
-  Create(
-    AProcessor,
-    AServerTransport,
-    InputTransFactory,
-    OutputTransFactory,
-    InputFactory,
-    OutputFactory,
-    DefaultLogDelegate
-  );
-end;
-
-constructor TServerImpl.Create(const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport; const ATransportFactory: ITransportFactory);
-var
-  InputProtocolFactory : IProtocolFactory;
-  OutputProtocolFactory : IProtocolFactory;
-begin
-  InputProtocolFactory := TBinaryProtocolImpl.TFactory.Create;
-  OutputProtocolFactory := TBinaryProtocolImpl.TFactory.Create;
-
-  //no inherited;
-  Create( AProcessor, AServerTransport, ATransportFactory, ATransportFactory,
-    InputProtocolFactory, OutputProtocolFactory, DefaultLogDelegate);
-end;
-
-constructor TServerImpl.Create(const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport;
-  const AInputTransportFactory, AOutputTransportFactory: ITransportFactory;
-  const AInputProtocolFactory, AOutputProtocolFactory: IProtocolFactory;
-  const ALogDelegate : TLogDelegate);
-begin
-  inherited Create;
-  FProcessor := AProcessor;
-  FServerTransport := AServerTransport;
-  FInputTransportFactory := AInputTransportFactory;
-  FOutputTransportFactory := AOutputTransportFactory;
-  FInputProtocolFactory := AInputProtocolFactory;
-  FOutputProtocolFactory := AOutputProtocolFactory;
-  FLogDelegate := ALogDelegate;
-end;
-
-class procedure TServerImpl.DefaultLogDelegate( const str: string);
-begin
-  try
-    Writeln( str);
-    if IoResult <> 0 then OutputDebugString(PChar(str));
-  except
-    OutputDebugString(PChar(str));
-  end;
-end;
-
-constructor TServerImpl.Create( const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport; const ATransportFactory: ITransportFactory;
-  const AProtocolFactory: IProtocolFactory);
-begin
-  //no inherited;
-  Create( AProcessor, AServerTransport,
-          ATransportFactory, ATransportFactory,
-          AProtocolFactory, AProtocolFactory,
-          DefaultLogDelegate);
-end;
-
-
-function TServerImpl.GetServerEvents : IServerEvents;
-begin
-  result := FServerEvents;
-end;
-
-
-procedure TServerImpl.SetServerEvents( const value : IServerEvents);
-begin
-  // if you need more than one, provide a specialized IServerEvents implementation
-  FServerEvents := value;
-end;
-
-
-{ TSimpleServer }
-
-constructor TSimpleServer.Create( const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport);
-var
-  InputProtocolFactory : IProtocolFactory;
-  OutputProtocolFactory : IProtocolFactory;
-  InputTransportFactory : ITransportFactory;
-  OutputTransportFactory : ITransportFactory;
-begin
-  InputProtocolFactory := TBinaryProtocolImpl.TFactory.Create;
-  OutputProtocolFactory := TBinaryProtocolImpl.TFactory.Create;
-  InputTransportFactory := TTransportFactoryImpl.Create;
-  OutputTransportFactory := TTransportFactoryImpl.Create;
-
-  inherited Create( AProcessor, AServerTransport, InputTransportFactory,
-    OutputTransportFactory, InputProtocolFactory, OutputProtocolFactory, DefaultLogDelegate);
-end;
-
-constructor TSimpleServer.Create( const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport; ALogDel: TServerImpl.TLogDelegate);
-var
-  InputProtocolFactory : IProtocolFactory;
-  OutputProtocolFactory : IProtocolFactory;
-  InputTransportFactory : ITransportFactory;
-  OutputTransportFactory : ITransportFactory;
-begin
-  InputProtocolFactory := TBinaryProtocolImpl.TFactory.Create;
-  OutputProtocolFactory := TBinaryProtocolImpl.TFactory.Create;
-  InputTransportFactory := TTransportFactoryImpl.Create;
-  OutputTransportFactory := TTransportFactoryImpl.Create;
-
-  inherited Create( AProcessor, AServerTransport, InputTransportFactory,
-    OutputTransportFactory, InputProtocolFactory, OutputProtocolFactory, ALogDel);
-end;
-
-constructor TSimpleServer.Create( const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport; const ATransportFactory: ITransportFactory);
-begin
-  inherited Create( AProcessor, AServerTransport, ATransportFactory,
-    ATransportFactory, TBinaryProtocolImpl.TFactory.Create, TBinaryProtocolImpl.TFactory.Create, DefaultLogDelegate);
-end;
-
-constructor TSimpleServer.Create( const AProcessor: IProcessor;
-  const AServerTransport: IServerTransport; const ATransportFactory: ITransportFactory;
-  const AProtocolFactory: IProtocolFactory);
-begin
-  inherited Create( AProcessor, AServerTransport, ATransportFactory,
-    ATransportFactory, AProtocolFactory, AProtocolFactory, DefaultLogDelegate);
-end;
-
-procedure TSimpleServer.Serve;
-var
-  client : ITransport;
-  InputTransport : ITransport;
-  OutputTransport : ITransport;
-  InputProtocol : IProtocol;
-  OutputProtocol : IProtocol;
-  context : IProcessorEvents;
-begin
-  try
-    FServerTransport.Listen;
-  except
-    on E: Exception do
-    begin
-      FLogDelegate( E.ToString);
-    end;
-  end;
-
-  if FServerEvents <> nil
-  then FServerEvents.PreServe;
-
-  client := nil;
-  while (not FStop) do
-  begin
-    try
-      // clean up any old instances before waiting for clients
-      InputTransport := nil;
-      OutputTransport := nil;
-      InputProtocol := nil;
-      OutputProtocol := nil;
-
-      // close any old connections before before waiting for new clients
-      if client <> nil then try
-        try
-          client.Close;
-        finally
-          client := nil;
-        end;
-      except
-        // catch all, we can't do much about it at this point
-      end;
-
-      client := FServerTransport.Accept( procedure
-                                         begin
-                                           if FServerEvents <> nil
-                                           then FServerEvents.PreAccept;
-                                         end);
-
-      if client = nil then begin
-        if FStop
-        then Abort  // silent exception
-        else raise TTransportExceptionUnknown.Create('ServerTransport.Accept() may not return NULL');
-      end;
-
-      FLogDelegate( 'Client Connected!');
-
-      InputTransport := FInputTransportFactory.GetTransport( client );
-      OutputTransport := FOutputTransportFactory.GetTransport( client );
-      InputProtocol := FInputProtocolFactory.GetProtocol( InputTransport );
-      OutputProtocol := FOutputProtocolFactory.GetProtocol( OutputTransport );
-
-      if FServerEvents <> nil
-      then context := FServerEvents.CreateProcessingContext( InputProtocol, OutputProtocol)
-      else context := nil;
-
-      while not FStop do begin
-        if context <> nil
-        then context.Processing( client);
-        if not FProcessor.Process( InputProtocol, OutputProtocol, context)
-        then Break;
-      end;
-
-    except
-      on E: TTransportException do
-      begin
-        if FStop
-        then FLogDelegate('TSimpleServer was shutting down, caught ' + E.ToString)
-        else FLogDelegate( E.ToString);
-      end;
-      on E: Exception do
-      begin
-        FLogDelegate( E.ToString);
-      end;
-    end;
-
-    if context <> nil
-    then begin
-      context.CleanupContext;
-      context := nil;
-    end;
-
-    if InputTransport <> nil then
-    begin
-      InputTransport.Close;
-    end;
-    if OutputTransport <> nil then
-    begin
-      OutputTransport.Close;
-    end;
-  end;
-
-  if FStop then
-  begin
-    try
-      FServerTransport.Close;
-    except
-      on E: TTransportException do
-      begin
-        FLogDelegate('TServerTranport failed on close: ' + E.Message);
-      end;
-    end;
-    FStop := False;
-  end;
-end;
-
-procedure TSimpleServer.Stop;
-begin
-  FStop := True;
-  FServerTransport.Close;
-end;
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Socket.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Socket.pas
deleted file mode 100644
index f0cab79..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Socket.pas
+++ /dev/null
@@ -1,1617 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.Socket;
-
-{$I Thrift.Defines.inc}
-{$I-}  // prevent annoying errors with default log delegate and no console
-
-interface
-{$IFNDEF OLD_SOCKETS} // not for OLD_SOCKETS
-
-uses
-  Winapi.Windows, Winapi.Winsock2;
-
-const
-  AI_PASSIVE                = $00000001;  // Socket address will be used in bind() call
-  AI_CANONNAME              = $00000002;  // Return canonical name in first ai_canonname
-  AI_NUMERICHOST            = $00000004;  // Nodename must be a numeric address string
-  AI_NUMERICSERV            = $00000008;  // Servicename must be a numeric port number
-
-  AI_ALL                    = $00000100;  // Query both IP6 and IP4 with AI_V4MAPPED
-  AI_ADDRCONFIG             = $00000400;  // Resolution only if global address configured
-  AI_V4MAPPED               = $00000800;  // On v6 failure, query v4 and convert to V4MAPPED format
-
-  AI_NON_AUTHORITATIVE      = $00004000;  // LUP_NON_AUTHORITATIVE
-  AI_SECURE                 = $00008000;  // LUP_SECURE
-  AI_RETURN_PREFERRED_NAMES = $00010000;  // LUP_RETURN_PREFERRED_NAMES
-
-  AI_FQDN                   = $00020000;  // Return the FQDN in ai_canonname
-  AI_FILESERVER             = $00040000;  // Resolving fileserver name resolution
-
-type
-  PAddrInfoA = ^TAddrInfoA;
-  TAddrInfoA = record
-    ai_flags: Integer;
-    ai_family: Integer;
-    ai_socktype: Integer;
-    ai_protocol: Integer;
-    ai_addrlen: NativeUInt;
-    ai_canonname: PAnsiChar;
-    ai_addr: PSockAddr;
-    ai_next: PAddrInfoA;
-  end;
-
-  PAddrInfoW = ^TAddrInfoW;
-  TAddrInfoW = record
-    ai_flags: Integer;
-    ai_family: Integer;
-    ai_socktype: Integer;
-    ai_protocol: Integer;
-    ai_addrlen: NativeUInt;
-    ai_canonname: PChar;
-    ai_addr: PSockAddr;
-    ai_next: PAddrInfoW;
-  end;
-
-  TAddressFamily = USHORT;
-
-  TIn6Addr = record
-  case Integer of
-    0: (_Byte: array[0..15] of UCHAR);
-    1: (_Word: array[0..7] of USHORT);
-  end;
-
-  TScopeId = record
-  public
-    Value: ULONG;
-  private
-    function GetBitField(Loc: Integer): Integer; inline;
-    procedure SetBitField(Loc: Integer; const aValue: Integer); inline;
-  public
-    property Zone: Integer index $0028 read GetBitField write SetBitField;
-    property Level: Integer index $2804 read GetBitField write SetBitField;
-  end;
-
-  TSockAddrIn6 = record
-    sin6_family: TAddressFamily;
-    sin6_port: USHORT;
-    sin6_flowinfo: ULONG;
-    sin6_addr: TIn6Addr;
-  case Integer of
-    0: (sin6_scope_id: ULONG);
-    1: (sin6_scope_struct: TScopeId);
-  end;
-  PSockAddrIn6 = ^TSockAddrIn6;
-
-const
-  NI_NOFQDN      = $01;  // Only return nodename portion for local hosts
-  NI_NUMERICHOST = $02;  // Return numeric form of the host's address
-  NI_NAMEREQD    = $04;  // Error if the host's name not in DNS
-  NI_NUMERICSERV = $08;  // Return numeric form of the service (port #)
-  NI_DGRAM       = $10;  // Service is a datagram service
-
-  NI_MAXHOST     = 1025;  // Max size of a fully-qualified domain name
-  NI_MAXSERV     = 32;    // Max size of a service name
-
-function getaddrinfo(pNodeName, pServiceName: PAnsiChar; const pHints: TAddrInfoA; var ppResult: PAddrInfoA): Integer; stdcall;
-function GetAddrInfoW(pNodeName, pServiceName: PWideChar; const pHints: TAddrInfoW; var ppResult: PAddrInfoW): Integer; stdcall;
-procedure freeaddrinfo(pAddrInfo: PAddrInfoA); stdcall;
-procedure FreeAddrInfoW(pAddrInfo: PAddrInfoW); stdcall;
-function getnameinfo(const pSockaddr: TSockAddr; SockaddrLength: Integer; pNodeBuffer: PAnsiChar; NodeBufferSize: DWORD; pServiceBuffer: PAnsiChar;
-  ServiceBufferSize: DWORD; Flags: Integer): Integer; stdcall;
-function GetNameInfoW(const pSockaddr: TSockAddr; SockaddrLength: Integer; pNodeBuffer: PWideChar; NodeBufferSize: DWORD; pServiceBuffer: PWideChar;
-  ServiceBufferSize: DWORD; Flags: Integer): Integer; stdcall;
-
-type
-  TSmartPointerDestroyer<T> = reference to procedure(Value: T);
-
-  ISmartPointer<T> = reference to function: T;
-
-  TSmartPointer<T> = class(TInterfacedObject, ISmartPointer<T>)
-  private
-    FValue: T;
-    FDestroyer: TSmartPointerDestroyer<T>;
-  public
-    constructor Create(AValue: T; ADestroyer: TSmartPointerDestroyer<T>);
-    destructor Destroy; override;
-    function Invoke: T;
-  end;
-
-  TBaseSocket = class abstract
-  public type
-    TLogDelegate = reference to procedure( const str: string);
-  strict private
-    FPort: Integer;
-    FSocket: Winapi.Winsock2.TSocket;
-    FSendTimeout,
-    FRecvTimeout: Longword;
-    FKeepAlive: Boolean;
-    FLogDelegate: TLogDelegate;
-    class constructor Create;
-    class destructor Destroy;
-    class procedure DefaultLogDelegate(const Str: string);
-  protected type
-    IGetAddrInfoWrapper = interface
-      function Init: Integer;
-      function GetRes: PAddrInfoW;
-      property Res: PAddrInfoW read GetRes;
-    end;
-    TGetAddrInfoWrapper = class(TInterfacedObject, IGetAddrInfoWrapper)
-    strict private
-      FNode: string;
-      FService: string;
-      FHints,
-      FRes: PAddrInfoW;
-    public
-      constructor Create(ANode, AService: string; AHints: PAddrInfoW);
-      destructor Destroy; override;
-      function Init: Integer;
-      function GetRes: PAddrInfoW;
-      property Res: PAddrInfoW read GetRes;
-    end;
-  strict protected
-    procedure CommonInit; virtual;
-    function CreateSocket(AAddress: string; APort: Integer): IGetAddrInfoWrapper;
-    procedure SetRecvTimeout(ARecvTimeout: Longword); virtual;
-    procedure SetSendTimeout(ASendTimeout: Longword); virtual;
-    procedure SetKeepAlive(AKeepAlive: Boolean); virtual;
-    procedure SetSocket(ASocket: Winapi.Winsock2.TSocket);
-    property LogDelegate: TLogDelegate read FLogDelegate;
-  public
-    //
-    // Constructs a new socket. Note that this does NOT actually connect the
-    // socket.
-    //
-    constructor Create(ALogDelegate: TLogDelegate = nil); overload;
-    constructor Create(APort: Integer; ALogDelegate: TLogDelegate = nil); overload;
-
-    //
-    // Destroys the socket object, closing it if necessary.
-    //
-    destructor Destroy; override;
-
-    //
-    // Shuts down communications on the socket
-    //
-    procedure Close; virtual;
-
-    // The port that the socket is connected to
-    property Port: Integer read FPort write FPort;
-
-    // The receive timeout
-    property RecvTimeout: Longword read FRecvTimeout write SetRecvTimeout;
-
-    // The send timeout
-    property SendTimeout: Longword read FSendTimeout write SetSendTimeout;
-
-    // Set SO_KEEPALIVE
-    property KeepAlive: Boolean read FKeepAlive write SetKeepAlive;
-
-    // The underlying socket descriptor
-    property Socket: Winapi.Winsock2.TSocket read FSocket write SetSocket;
-  end;
-
-  TSocket = class(TBaseSocket)
-  strict private type
-    TCachedPeerAddr = record
-    case Integer of
-      0: (ipv4: TSockAddrIn);
-      1: (ipv6: TSockAddrIn6);
-    end;
-  strict private
-    FHost: string;
-    FPeerHost: string;
-    FPeerAddress: string;
-    FPeerPort: Integer;
-    FInterruptListener: ISmartPointer<Winapi.Winsock2.TSocket>;
-    FConnTimeout: Longword;
-    FLingerOn: Boolean;
-    FLingerVal: Integer;
-    FNoDelay: Boolean;
-    FMaxRecvRetries: Longword;
-    FCachedPeerAddr: TCachedPeerAddr;
-    procedure InitPeerInfo;
-    procedure OpenConnection(Res: TBaseSocket.IGetAddrInfoWrapper);
-    procedure LocalOpen;
-    procedure SetGenericTimeout(S: Winapi.Winsock2.TSocket; Timeout: Longword; OptName: Integer);
-    function GetIsOpen: Boolean;
-    procedure SetNoDelay(ANoDelay: Boolean);
-    function GetSocketInfo: string;
-    function GetPeerHost: string;
-    function GetPeerAddress: string;
-    function GetPeerPort: Integer;
-    function GetOrigin: string;
-  strict protected
-    procedure CommonInit; override;
-    procedure SetRecvTimeout(ARecvTimeout: Longword); override;
-    procedure SetSendTimeout(ASendTimeout: Longword); override;
-    procedure SetKeepAlive(AKeepAlive: Boolean); override;
-  public
-    //
-    // Constructs a new socket. Note that this does NOT actually connect the
-    // socket.
-    //
-    constructor Create(ALogDelegate: TBaseSocket.TLogDelegate = nil); overload;
-
-    //
-    // Constructs a new socket. Note that this does NOT actually connect the
-    // socket.
-    //
-    // @param host An IP address or hostname to connect to
-    // @param port The port to connect on
-    //
-    constructor Create(AHost: string; APort: Integer; ALogDelegate: TBaseSocket.TLogDelegate = nil); overload;
-
-    //
-    // Constructor to create socket from socket descriptor.
-    //
-    constructor Create(ASocket: Winapi.Winsock2.TSocket; ALogDelegate: TBaseSocket.TLogDelegate = nil); overload;
-
-    //
-    // Constructor to create socket from socket descriptor that
-    // can be interrupted safely.
-    //
-    constructor Create(ASocket: Winapi.Winsock2.TSocket; AInterruptListener: ISmartPointer<Winapi.Winsock2.TSocket>;
-      ALogDelegate: TBaseSocket.TLogDelegate = nil); overload;
-
-    //
-    // Creates and opens the socket
-    //
-    // @throws ETransportationException If the socket could not connect
-    //
-    procedure Open;
-
-    //
-    // Shuts down communications on the socket
-    //
-    procedure Close; override;
-
-    //
-    // Reads from the underlying socket.
-    // \returns the number of bytes read or 0 indicates EOF
-    // \throws TTransportException of types:
-    //          Interrupted means the socket was interrupted
-    //                      out of a blocking call
-    //          NotOpen means the socket has been closed
-    //          TimedOut means the receive timeout expired
-    //          Unknown means something unexpected happened
-    //
-    function Read(var Buf; Len: Integer): Integer;
-
-    //
-    // Writes to the underlying socket.  Loops until done or fail.
-    //
-    procedure Write(const Buf; Len: Integer);
-
-    //
-    // Writes to the underlying socket.  Does single send() and returns result.
-    //
-    function WritePartial(const Buf; Len: Integer): Integer;
-
-    //
-    // Returns a cached copy of the peer address.
-    //
-    function GetCachedAddress(out Len: Integer): PSockAddr;
-
-    //
-    // Set a cache of the peer address (used when trivially available: e.g.
-    // accept() or connect()). Only caches IPV4 and IPV6; unset for others.
-    //
-    procedure SetCachedAddress(const Addr: TSockAddr; Len: Integer);
-
-    //
-    // Controls whether the linger option is set on the socket.
-    //
-    // @param on      Whether SO_LINGER is on
-    // @param linger  If linger is active, the number of seconds to linger for
-    //
-    procedure SetLinger(LingerOn: Boolean; LingerVal: Integer);
-
-    //
-    // Calls select() on the socket to see if there is more data available.
-    //
-    function Peek: Boolean;
-
-    // Whether the socket is alive
-    property IsOpen: Boolean read GetIsOpen;
-
-    // The host that the socket is connected to
-    property Host: string read FHost write FHost;
-
-    // Whether to enable or disable Nagle's algorithm
-    property NoDelay: Boolean read FNoDelay write SetNoDelay;
-
-    // Connect timeout
-    property ConnTimeout: Longword read FConnTimeout write FConnTimeout;
-
-    // The max number of recv retries in the case of a WSAEWOULDBLOCK
-    property MaxRecvRetries: Longword read FMaxRecvRetries write FMaxRecvRetries;
-
-    // Socket information formatted as a string <Host: x Port: x>
-    property SocketInfo: string read GetSocketInfo;
-
-    // The DNS name of the host to which the socket is connected
-    property PeerHost: string read GetPeerHost;
-
-    // The address of the host to which the socket is connected
-    property PeerAddress: string read GetPeerAddress;
-
-    // The port of the host to which the socket is connected
-    property PeerPort: Integer read GetPeerPort;
-
-    // The origin the socket is connected to
-    property Origin: string read GetOrigin;
-  end;
-
-  TServerSocketFunc = reference to procedure(sock: Winapi.Winsock2.TSocket);
-
-  TServerSocket = class(TBaseSocket)
-  strict private
-    FAddress: string;
-    FAcceptBacklog,
-    FRetryLimit,
-    FRetryDelay,
-    FTcpSendBuffer,
-    FTcpRecvBuffer: Integer;
-    FAcceptTimeout: Longword;
-    FListening,
-    FInterruptableChildren: Boolean;
-    FInterruptSockWriter,                                               // is notified on Interrupt()
-    FInterruptSockReader,                                               // is used in select with FSocket for interruptability
-    FChildInterruptSockWriter: Winapi.Winsock2.TSocket;                 // is notified on InterruptChildren()
-    FChildInterruptSockReader: ISmartPointer<Winapi.Winsock2.TSocket>;  // if FnterruptableChildren this is shared with child TSockets
-    FListenCallback,
-    FAcceptCallback: TServerSocketFunc;
-    function CreateSocketObj(Client: Winapi.Winsock2.TSocket): TSocket;
-    procedure Notify(NotifySocket: Winapi.Winsock2.TSocket);
-    procedure SetInterruptableChildren(AValue: Boolean);
-  strict protected
-    procedure CommonInit; override;
-  public const
-    DEFAULT_BACKLOG = 1024;
-  public
-    //
-    // Constructor.
-    //
-    // @param port    Port number to bind to
-    //
-    constructor Create(APort: Integer; ALogDelegate: TBaseSocket.TLogDelegate = nil); overload;
-
-    //
-    // Constructor.
-    //
-    // @param port        Port number to bind to
-    // @param sendTimeout Socket send timeout
-    // @param recvTimeout Socket receive timeout
-    //
-    constructor Create(APort: Integer; ASendTimeout, ARecvTimeout: Longword; ALogDelegate: TBaseSocket.TLogDelegate = nil); overload;
-
-    //
-    // Constructor.
-    //
-    // @param address Address to bind to
-    // @param port    Port number to bind to
-    //
-    constructor Create(AAddress: string; APort: Integer; ALogDelegate: TBaseSocket.TLogDelegate = nil); overload;
-
-    procedure Listen;
-    function Accept: TSocket;
-    procedure Interrupt;
-    procedure InterruptChildren;
-    procedure Close; override;
-
-    property AcceptBacklog: Integer read FAcceptBacklog write FAcceptBacklog;
-    property AcceptTimeout: Longword read FAcceptTimeout write FAcceptTimeout;
-    property RetryLimit: Integer read FRetryLimit write FRetryLimit;
-    property RetryDelay: Integer read FRetryDelay write FRetryDelay;
-    property TcpSendBuffer: Integer read FTcpSendBuffer write FTcpSendBuffer;
-    property TcpRecvBuffer: Integer read FTcpRecvBuffer write FTcpRecvBuffer;
-
-    // When enabled (the default), new children TSockets will be constructed so
-    // they can be interrupted by TServerTransport.InterruptChildren().
-    // This is more expensive in terms of system calls (poll + recv) however
-    // ensures a connected client cannot interfere with TServer.Stop().
-    //
-    // When disabled, TSocket children do not incur an additional poll() call.
-    // Server-side reads are more efficient, however a client can interfere with
-    // the server's ability to shutdown properly by staying connected.
-    //
-    // Must be called before listen(); mode cannot be switched after that.
-    // \throws EPropertyError if listen() has been called
-    property InterruptableChildren: Boolean read FInterruptableChildren write SetInterruptableChildren;
-
-    // listenCallback gets called just before listen, and after all Thrift
-    // setsockopt calls have been made.  If you have custom setsockopt
-    // things that need to happen on the listening socket, this is the place to do it.
-    property ListenCallback: TServerSocketFunc read FListenCallback write FListenCallback;
-
-    // acceptCallback gets called after each accept call, on the newly created socket.
-    // It is called after all Thrift setsockopt calls have been made.  If you have
-    // custom setsockopt things that need to happen on the accepted
-    // socket, this is the place to do it.
-    property AcceptCallback: TServerSocketFunc read FAcceptCallback write FAcceptCallback;
-  end;
-
-{$ENDIF} // not for OLD_SOCKETS
-implementation
-{$IFNDEF OLD_SOCKETS} // not for OLD_SOCKETS
-
-uses
-  System.SysUtils, System.Math, System.DateUtils, Thrift.Transport;
-
-constructor TBaseSocket.TGetAddrInfoWrapper.Create(ANode, AService: string; AHints: PAddrInfoW);
-begin
-  inherited Create;
-  FNode := ANode;
-  FService := AService;
-  FHints := AHints;
-  FRes := nil;
-end;
-
-destructor TBaseSocket.TGetAddrInfoWrapper.Destroy;
-begin
-  if Assigned(FRes) then
-    FreeAddrInfoW(FRes);
-  inherited Destroy;
-end;
-
-function TBaseSocket.TGetAddrInfoWrapper.Init: Integer;
-begin
-  if FRes = nil then
-    Exit(GetAddrInfoW(@FNode[1], @FService[1], FHints^, FRes));
-  Result := 0;
-end;
-
-function TBaseSocket.TGetAddrInfoWrapper.GetRes: PAddrInfoW;
-begin
-  Result := FRes;
-end;
-
-procedure DestroyerOfFineSockets(ssock: Winapi.Winsock2.TSocket);
-begin
-  closesocket(ssock);
-end;
-
-function TScopeId.GetBitField(Loc: Integer): Integer;
-begin
-  Result := (Value shr (Loc shr 8)) and ((1 shl (Loc and $FF)) - 1);
-end;
-
-procedure TScopeId.SetBitField(Loc: Integer; const aValue: Integer);
-begin
-  Value := (Value and ULONG((not ((1 shl (Loc and $FF)) - 1)))) or ULONG(aValue shl (Loc shr 8));
-end;
-
-function getaddrinfo; external 'ws2_32.dll' name 'getaddrinfo';
-function GetAddrInfoW; external 'ws2_32.dll' name 'GetAddrInfoW';
-procedure freeaddrinfo; external 'ws2_32.dll' name 'freeaddrinfo';
-procedure FreeAddrInfoW; external 'ws2_32.dll' name 'FreeAddrInfoW';
-function getnameinfo; external 'ws2_32.dll' name 'getnameinfo';
-function GetNameInfoW; external 'ws2_32.dll' name 'GetNameInfoW';
-
-constructor TSmartPointer<T>.Create(AValue: T; ADestroyer: TSmartPointerDestroyer<T>);
-begin
-  inherited Create;
-  FValue := AValue;
-  FDestroyer := ADestroyer;
-end;
-
-destructor TSmartPointer<T>.Destroy;
-begin
-  if Assigned(FDestroyer) then FDestroyer(FValue);
-  inherited Destroy;
-end;
-
-function TSmartPointer<T>.Invoke: T;
-begin
-  Result := FValue;
-end;
-
-class constructor TBaseSocket.Create;
-var
-  Version: WORD;
-  Data: WSAData;
-  Error: Integer;
-begin
-  Version := $0202;
-  FillChar(Data, SizeOf(Data), 0);
-  Error := WSAStartup(Version, Data);
-  if Error <> 0 then
-    raise Exception.Create('Failed to initialize Winsock.');
-end;
-
-class destructor TBaseSocket.Destroy;
-begin
-  WSACleanup;
-end;
-
-class procedure TBaseSocket.DefaultLogDelegate(const Str: string);
-var
-  OutStr: string;
-begin
-  OutStr := Format('Thrift: %s %s', [DateTimeToStr(Now, TFormatSettings.Create), Str]);
-  try
-    Writeln(OutStr);
-    if IoResult <> 0 then OutputDebugString(PChar(OutStr));
-  except
-    OutputDebugString(PChar(OutStr));
-  end;
-end;
-
-procedure TBaseSocket.CommonInit;
-begin
-  FSocket := INVALID_SOCKET;
-  FPort := 0;
-  FSendTimeout := 0;
-  FRecvTimeout := 0;
-  FKeepAlive := False;
-  FLogDelegate := DefaultLogDelegate;
-end;
-
-function TBaseSocket.CreateSocket(AAddress: string; APort: Integer): IGetAddrInfoWrapper;
-var
-  Hints: TAddrInfoW;
-  Res: PAddrInfoW;
-  ThePort: array[0..5] of Char;
-  Error: Integer;
-begin
-  FillChar(Hints, SizeOf(Hints), 0);
-  Hints.ai_family := PF_UNSPEC;
-  Hints.ai_socktype := SOCK_STREAM;
-  Hints.ai_flags := AI_PASSIVE or AI_ADDRCONFIG;
-  StrFmt(ThePort, '%d', [FPort]);
-
-  Result := TGetAddrInfoWrapper.Create(AAddress, ThePort, @Hints);
-  Error := Result.Init;
-  if Error <> 0 then begin
-    LogDelegate(Format('GetAddrInfoW %d: %s', [Error, SysErrorMessage(Error)]));
-    Close;
-    raise TTransportExceptionNotOpen.Create('Could not resolve host for server socket.');
-  end;
-
-  // Pick the ipv6 address first since ipv4 addresses can be mapped
-  // into ipv6 space.
-  Res := Result.Res;
-  while Assigned(Res) do begin
-    if (Res^.ai_family = AF_INET6) or (not Assigned(Res^.ai_next)) then
-      Break;
-    Res := Res^.ai_next;
-  end;
-
-  FSocket := Winapi.Winsock2.socket(Res^.ai_family, Res^.ai_socktype, Res^.ai_protocol);
-  if FSocket = INVALID_SOCKET then begin
-    Error := WSAGetLastError;
-    LogDelegate(Format('TBaseSocket.CreateSocket() socket() %s', [SysErrorMessage(Error)]));
-    Close;
-    raise TTransportExceptionNotOpen.Create(Format('socket(): %s', [SysErrorMessage(Error)]));
-  end;
-end;
-
-procedure TBaseSocket.SetRecvTimeout(ARecvTimeout: Longword);
-begin
-  FRecvTimeout := ARecvTimeout;
-end;
-
-procedure TBaseSocket.SetSendTimeout(ASendTimeout: Longword);
-begin
-  FSendTimeout := ASendTimeout;
-end;
-
-procedure TBaseSocket.SetKeepAlive(AKeepAlive: Boolean);
-begin
-  FKeepAlive := AKeepAlive;
-end;
-
-procedure TBaseSocket.SetSocket(ASocket: Winapi.Winsock2.TSocket);
-begin
-  if FSocket <> INVALID_SOCKET then
-    Close;
-  FSocket := ASocket;
-end;
-
-constructor TBaseSocket.Create(ALogDelegate: TLogDelegate);
-begin
-  inherited Create;
-  CommonInit;
-  if Assigned(ALogDelegate) then FLogDelegate := ALogDelegate;
-end;
-
-constructor TBaseSocket.Create(APort: Integer; ALogDelegate: TLogDelegate);
-begin
-  inherited Create;
-  CommonInit;
-  FPort := APort;
-  if Assigned(ALogDelegate) then FLogDelegate := ALogDelegate;
-end;
-
-destructor TBaseSocket.Destroy;
-begin
-  Close;
-  inherited Destroy;
-end;
-
-procedure TBaseSocket.Close;
-begin
-  if FSocket <> INVALID_SOCKET then begin
-    shutdown(FSocket, SD_BOTH);
-    closesocket(FSocket);
-  end;
-  FSocket := INVALID_SOCKET;
-end;
-
-procedure TSocket.InitPeerInfo;
-begin
-  FCachedPeerAddr.ipv4.sin_family := AF_UNSPEC;
-  FPeerHost := '';
-  FPeerAddress := '';
-  FPeerPort := 0;
-end;
-
-procedure TSocket.CommonInit;
-begin
-  inherited CommonInit;
-  FHost := '';
-  FInterruptListener := nil;
-  FConnTimeout := 0;
-  FLingerOn := True;
-  FLingerVal := 0;
-  FNoDelay := True;
-  FMaxRecvRetries := 5;
-  InitPeerInfo;
-end;
-
-procedure TSocket.OpenConnection(Res: TBaseSocket.IGetAddrInfoWrapper);
-label
-  Done;
-var
-  ErrnoCopy: Integer;
-  Ret,
-  Ret2: Integer;
-  Fds: TFdSet;
-  TVal: TTimeVal;
-  PTVal: PTimeVal;
-  Val,
-  Lon: Integer;
-  One,
-  Zero: Cardinal;
-begin
-  if SendTimeout > 0 then SetSendTimeout(SendTimeout);
-  if RecvTimeout > 0 then SetRecvTimeout(RecvTimeout);
-  if KeepAlive then SetKeepAlive(KeepAlive);
-  SetLinger(FLingerOn, FLingerVal);
-  SetNoDelay(FNoDelay);
-
-  // Set the socket to be non blocking for connect if a timeout exists
-  Zero := 0;
-  if FConnTimeout > 0 then begin
-    One := 1;
-    if ioctlsocket(Socket, Integer(FIONBIO), One) = SOCKET_ERROR then begin
-      ErrnoCopy := WSAGetLastError;
-      LogDelegate(Format('TSocket.OpenConnection() ioctlsocket() %s %s', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-      raise TTransportExceptionNotOpen.Create(Format('ioctlsocket() failed: %s', [SysErrorMessage(ErrnoCopy)]));
-    end;
-  end
-  else begin
-    if ioctlsocket(Socket, Integer(FIONBIO), Zero) = SOCKET_ERROR then begin
-      ErrnoCopy := WSAGetLastError;
-      LogDelegate(Format('TSocket.OpenConnection() ioctlsocket() %s %s', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-      raise TTransportExceptionNotOpen.Create(Format('ioctlsocket() failed: %s', [SysErrorMessage(ErrnoCopy)]));
-    end;
-  end;
-
-  Ret := connect(Socket, Res.Res^.ai_addr^, Res.Res^.ai_addrlen);
-  if Ret = 0 then goto Done;
-
-  ErrnoCopy := WSAGetLastError;
-  if (ErrnoCopy <> WSAEINPROGRESS) and (ErrnoCopy <> WSAEWOULDBLOCK) then begin
-    LogDelegate(Format('TSocket.OpenConnection() connect() ', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionNotOpen.Create(Format('connect() failed: %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  FD_ZERO(Fds);
-  _FD_SET(Socket, Fds);
-  if FConnTimeout > 0 then begin
-    TVal.tv_sec := FConnTimeout div 1000;
-    TVal.tv_usec := (FConnTimeout mod 1000) * 1000;
-    PTVal := @TVal;
-  end
-  else
-    PTVal := nil;
-  Ret := select(1, nil, @Fds, nil, PTVal);
-
-  if Ret > 0 then begin
-    // Ensure the socket is connected and that there are no errors set
-    Lon := SizeOf(Val);
-    Ret2 := getsockopt(Socket, SOL_SOCKET, SO_ERROR, @Val, Lon);
-    if Ret2 = SOCKET_ERROR then begin
-      ErrnoCopy := WSAGetLastError;
-      LogDelegate(Format('TSocket.OpenConnection() getsockopt() ', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-      raise TTransportExceptionNotOpen.Create(Format('getsockopt(): %s', [SysErrorMessage(ErrnoCopy)]));
-    end;
-    // no errors on socket, go to town
-    if Val = 0 then goto Done;
-    LogDelegate(Format('TSocket.OpenConnection() error on socket (after select()) ', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionNotOpen.Create(Format('socket OpenConnection() error: %s', [SysErrorMessage(Val)]));
-  end
-  else if Ret = 0 then begin
-    // socket timed out
-    LogDelegate(Format('TSocket.OpenConnection() timed out ', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionNotOpen.Create('OpenConnection() timed out');
-  end
-  else begin
-    // error on select()
-    ErrnoCopy := WSAGetLastError;
-    LogDelegate(Format('TSocket.OpenConnection() select() ', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionNotOpen.Create(Format('select() failed: %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-Done:
-  // Set socket back to normal mode (blocking)
-  ioctlsocket(Socket, Integer(FIONBIO), Zero);
-  SetCachedAddress(Res.Res^.ai_addr^, Res.Res^.ai_addrlen);
-end;
-
-procedure TSocket.LocalOpen;
-var
-  Res: TBaseSocket.IGetAddrInfoWrapper;
-begin
-  if IsOpen then Exit;
-
-  // Validate port number
-  if (Port < 0) or (Port > $FFFF) then
-    raise TTransportExceptionBadArgs.Create('Specified port is invalid');
-
-  Res := CreateSocket(Host, Port);
-
-  OpenConnection(Res);
-end;
-
-procedure TSocket.SetGenericTimeout(S: Winapi.Winsock2.TSocket; Timeout: Longword; OptName: Integer);
-var
-  Time: DWORD;
-begin
-  if S = INVALID_SOCKET then
-    Exit;
-
-  Time := Timeout;
-
-  if setsockopt(S, SOL_SOCKET, OptName, @Time, SizeOf(Time)) = SOCKET_ERROR then
-    LogDelegate(Format('SetGenericTimeout() setsockopt() %s', [SysErrorMessage(WSAGetLastError)]));
-end;
-
-function TSocket.GetIsOpen: Boolean;
-begin
-  Result := Socket <> INVALID_SOCKET;
-end;
-
-procedure TSocket.SetNoDelay(ANoDelay: Boolean);
-var
-  V: Integer;
-begin
-  FNoDelay := ANoDelay;
-  if Socket = INVALID_SOCKET then
-    Exit;
-
-  V := IfThen(FNoDelay, 1, 0);
-  if setsockopt(Socket, IPPROTO_TCP, TCP_NODELAY, @V, SizeOf(V)) = SOCKET_ERROR then
-    LogDelegate(Format('TSocket.SetNoDelay() setsockopt() %s %s', [SocketInfo, SysErrorMessage(WSAGetLastError)]));
-end;
-
-function TSocket.GetSocketInfo: string;
-begin
-  if (FHost = '') or (Port = 0) then
-    Result := '<Host: ' + GetPeerAddress + ' Port: ' + GetPeerPort.ToString + '>'
-  else
-    Result := '<Host: ' + FHost + ' Port: ' + Port.ToString + '>';
-end;
-
-function TSocket.GetPeerHost: string;
-var
-  Addr: TSockAddrStorage;
-  AddrPtr: PSockAddr;
-  AddrLen: Integer;
-  ClientHost: array[0..NI_MAXHOST-1] of Char;
-  ClientService: array[0..NI_MAXSERV-1] of Char;
-begin
-  if FPeerHost = '' then begin
-    if Socket = INVALID_SOCKET then
-      Exit(FPeerHost);
-
-    AddrPtr := GetCachedAddress(AddrLen);
-    if AddrPtr = nil then begin
-      AddrLen := SizeOf(Addr);
-      if getpeername(Socket, PSockAddr(@Addr)^, AddrLen) <> 0 then
-        Exit(FPeerHost);
-      AddrPtr := PSockAddr(@Addr);
-      SetCachedAddress(AddrPtr^, AddrLen);
-    end;
-
-    GetNameInfoW(AddrPtr^, AddrLen, ClientHost, NI_MAXHOST, ClientService, NI_MAXSERV, 0);
-    FPeerHost := ClientHost;
-  end;
-  Result := FPeerHost;
-end;
-
-function TSocket.GetPeerAddress: string;
-var
-  Addr: TSockAddrStorage;
-  AddrPtr: PSockAddr;
-  AddrLen: Integer;
-  ClientHost: array[0..NI_MAXHOST-1] of Char;
-  ClientService: array[0..NI_MAXSERV-1] of Char;
-begin
-  if FPeerAddress = '' then begin
-    if Socket = INVALID_SOCKET then
-      Exit(FPeerAddress);
-
-    AddrPtr := GetCachedAddress(AddrLen);
-    if AddrPtr = nil then begin
-      AddrLen := SizeOf(Addr);
-      if getpeername(Socket, PSockAddr(@Addr)^, AddrLen) <> 0 then
-        Exit(FPeerHost);
-      AddrPtr := PSockAddr(@Addr);
-      SetCachedAddress(AddrPtr^, AddrLen);
-    end;
-
-    GetNameInfoW(AddrPtr^, AddrLen, ClientHost, NI_MAXHOST, ClientService, NI_MAXSERV, NI_NUMERICHOST or NI_NUMERICSERV);
-    FPeerAddress := ClientHost;
-    TryStrToInt(ClientService, FPeerPort);
-  end;
-  Result := FPeerAddress
-end;
-
-function TSocket.GetPeerPort: Integer;
-begin
-  GetPeerAddress;
-  Result := FPeerPort;
-end;
-
-function TSocket.GetOrigin: string;
-begin
-  Result := GetPeerHost + ':' + GetPeerPort.ToString;
-end;
-
-procedure TSocket.SetRecvTimeout(ARecvTimeout: Longword);
-begin
-  inherited SetRecvTimeout(ARecvTimeout);
-  SetGenericTimeout(Socket, ARecvTimeout, SO_RCVTIMEO);
-end;
-
-procedure TSocket.SetSendTimeout(ASendTimeout: Longword);
-begin
-  inherited SetSendTimeout(ASendTimeout);
-  SetGenericTimeout(Socket, ASendTimeout, SO_SNDTIMEO);
-end;
-
-procedure TSocket.SetKeepAlive(AKeepAlive: Boolean);
-var
-  Value: Integer;
-begin
-  inherited SetKeepAlive(AKeepAlive);
-
-  Value := IfThen(KeepAlive, 1, 0);
-  if setsockopt(Socket, SOL_SOCKET, SO_KEEPALIVE, @Value, SizeOf(Value)) = SOCKET_ERROR then
-    LogDelegate(Format('TSocket.SetKeepAlive() setsockopt() %s %s', [SocketInfo, SysErrorMessage(WSAGetLastError)]));
-end;
-
-constructor TSocket.Create(ALogDelegate: TBaseSocket.TLogDelegate = nil);
-begin
-  // Not needed, but just a placeholder
-  inherited Create(ALogDelegate);
-end;
-
-constructor TSocket.Create(AHost: string; APort: Integer; ALogDelegate: TBaseSocket.TLogDelegate);
-begin
-  inherited Create(APort, ALogDelegate);
-  FHost := AHost;
-end;
-
-constructor TSocket.Create(ASocket: Winapi.Winsock2.TSocket; ALogDelegate: TBaseSocket.TLogDelegate);
-begin
-  inherited Create(ALogDelegate);
-  Socket := ASocket;
-end;
-
-constructor TSocket.Create(ASocket: Winapi.Winsock2.TSocket; AInterruptListener: ISmartPointer<Winapi.Winsock2.TSocket>;
-  ALogDelegate: TBaseSocket.TLogDelegate);
-begin
-  inherited Create(ALogDelegate);
-  Socket := ASocket;
-  FInterruptListener := AInterruptListener;
-end;
-
-procedure TSocket.Open;
-begin
-  if IsOpen then Exit;
-  LocalOpen;
-end;
-
-procedure TSocket.Close;
-begin
-  inherited Close;
-  InitPeerInfo;
-end;
-
-function TSocket.Read(var Buf; Len: Integer): Integer;
-label
-  TryAgain;
-var
-  Retries: Longword;
-  EAgainThreshold,
-  ReadElapsed: UInt64;
-  Start: TDateTime;
-  Got: Integer;
-  Fds: TFdSet;
-  ErrnoCopy: Integer;
-  TVal: TTimeVal;
-  PTVal: PTimeVal;
-  Ret: Integer;
-begin
-  if Socket = INVALID_SOCKET then
-    raise TTransportExceptionNotOpen.Create('Called read on non-open socket');
-
-  Retries := 0;
-
-  // THRIFT_EAGAIN can be signalled both when a timeout has occurred and when
-  // the system is out of resources (an awesome undocumented feature).
-  // The following is an approximation of the time interval under which
-  // THRIFT_EAGAIN is taken to indicate an out of resources error.
-  EAgainThreshold := 0;
-  if RecvTimeout <> 0 then
-    // if a readTimeout is specified along with a max number of recv retries, then
-    // the threshold will ensure that the read timeout is not exceeded even in the
-    // case of resource errors
-    EAgainThreshold := RecvTimeout div IfThen(FMaxRecvRetries > 0, FMaxRecvRetries, 2);
-
-TryAgain:
-  // Read from the socket
-  if RecvTimeout > 0 then
-    Start := Now
-  else
-    // if there is no read timeout we don't need the TOD to determine whether
-    // an THRIFT_EAGAIN is due to a timeout or an out-of-resource condition.
-    Start := 0;
-
-  if Assigned(FInterruptListener) then begin
-    FD_ZERO(Fds);
-    _FD_SET(Socket, Fds);
-    _FD_SET(FInterruptListener, Fds);
-    if RecvTimeout > 0 then begin
-      TVal.tv_sec := RecvTimeout div 1000;
-      TVal.tv_usec := (RecvTimeout mod 1000) * 1000;
-      PTVal := @TVal;
-    end
-    else
-      PTVal := nil;
-
-    Ret := select(2, @Fds, nil, nil, PTVal);
-    ErrnoCopy := WSAGetLastError;
-    if Ret < 0 then begin
-      // error cases
-      if (ErrnoCopy = WSAEINTR) and (Retries < FMaxRecvRetries) then begin
-        Inc(Retries);
-        goto TryAgain;
-      end;
-      LogDelegate(Format('TSocket.Read() select() %s', [SysErrorMessage(ErrnoCopy)]));
-      raise TTransportExceptionUnknown.Create(Format('Unknown: %s', [SysErrorMessage(ErrnoCopy)]));
-    end
-    else if Ret > 0 then begin
-      // Check the interruptListener
-      if FD_ISSET(FInterruptListener, Fds) then
-        raise TTransportExceptionInterrupted.Create('Interrupted');
-    end
-    else // Ret = 0
-      raise TTransportExceptionTimedOut.Create('WSAEWOULDBLOCK (timed out)');
-
-    // falling through means there is something to recv and it cannot block
-  end;
-
-  Got := recv(Socket, Buf, Len, 0);
-  ErrnoCopy := WSAGetLastError;
-  // Check for error on read
-  if Got < 0 then begin
-    if ErrnoCopy = WSAEWOULDBLOCK then begin
-      // if no timeout we can assume that resource exhaustion has occurred.
-      if RecvTimeout = 0 then
-        raise TTransportExceptionTimedOut.Create('WSAEWOULDBLOCK (unavailable resources)');
-      // check if this is the lack of resources or timeout case
-      ReadElapsed := MilliSecondsBetween(Now, Start);
-      if (EAgainThreshold = 0) or (ReadElapsed < EAgainThreshold) then begin
-        if Retries < FMaxRecvRetries then begin
-          Inc(Retries);
-          Sleep(1);
-          goto TryAgain;
-        end
-        else
-          raise TTransportExceptionTimedOut.Create('WSAEWOULDBLOCK (unavailable resources)');
-      end
-      else
-        // infer that timeout has been hit
-        raise TTransportExceptionTimedOut.Create('WSAEWOULDBLOCK (timed out)');
-    end;
-
-    // If interrupted, try again
-    if (ErrnoCopy = WSAEINTR) and (Retries < FMaxRecvRetries) then begin
-      Inc(Retries);
-      goto TryAgain;
-    end;
-
-    if ErrnoCopy = WSAECONNRESET then
-      Exit(0);
-
-    // This ish isn't open
-    if ErrnoCopy = WSAENOTCONN then
-      raise TTransportExceptionNotOpen.Create('WSAENOTCONN');
-
-    // Timed out!
-    if ErrnoCopy = WSAETIMEDOUT then
-      raise TTransportExceptionNotOpen.Create('WSAETIMEDOUT');
-
-    // Now it's not a try again case, but a real probblez
-    LogDelegate(Format('TSocket.Read() recv() %s %s', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-
-    // Some other error, whatevz
-    raise TTransportExceptionUnknown.Create(Format('Unknown: %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  Result := Got;
-end;
-
-procedure TSocket.Write(const Buf; Len: Integer);
-var
-  Sent, B: Integer;
-begin
-  Sent := 0;
-  while Sent < Len do begin
-    B := WritePartial((PByte(@Buf) + Sent)^, Len - Sent);
-    if B = 0 then
-      // This should only happen if the timeout set with SO_SNDTIMEO expired.
-      // Raise an exception.
-      raise TTransportExceptionTimedOut.Create('send timeout expired');
-    Inc(Sent, B);
-  end;
-end;
-
-function TSocket.WritePartial(const Buf; Len: Integer): Integer;
-var
-  B: Integer;
-  ErrnoCopy: Integer;
-begin
-  if Socket = INVALID_SOCKET then
-    raise TTransportExceptionNotOpen.Create('Called write on non-open socket');
-
-  B := send(Socket, Buf, Len, 0);
-
-  if B < 0 then begin
-    // Fail on a send error
-    ErrnoCopy := WSAGetLastError;
-    if ErrnoCopy = WSAEWOULDBLOCK then
-      Exit(0);
-
-    LogDelegate(Format('TSocket.WritePartial() send() %s %s', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-
-    if (ErrnoCopy = WSAECONNRESET) or (ErrnoCopy = WSAENOTCONN) then begin
-      Close;
-      raise TTransportExceptionNotOpen.Create(Format('write() send(): %s', [SysErrorMessage(ErrnoCopy)]));
-    end;
-
-    raise TTransportExceptionUnknown.Create(Format('write() send(): %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  // Fail on blocked send
-  if B = 0 then
-    raise TTransportExceptionNotOpen.Create('Socket send returned 0.');
-
-  Result := B;
-end;
-
-function TSocket.GetCachedAddress(out Len: Integer): PSockAddr;
-begin
-  case FCachedPeerAddr.ipv4.sin_family of
-    AF_INET: begin
-      Len := SizeOf(TSockAddrIn);
-      Result := PSockAddr(@FCachedPeerAddr.ipv4);
-    end;
-    AF_INET6: begin
-      Len := SizeOf(TSockAddrIn6);
-      Result := PSockAddr(@FCachedPeerAddr.ipv6);
-    end;
-  else
-    Len := 0;
-    Result := nil;
-  end;
-end;
-
-procedure TSocket.SetCachedAddress(const Addr: TSockAddr; Len: Integer);
-begin
-  case Addr.sa_family of
-    AF_INET: if Len = SizeOf(TSockAddrIn) then FCachedPeerAddr.ipv4 := PSockAddrIn(@Addr)^;
-    AF_INET6: if Len = SizeOf(TSockAddrIn6) then FCachedPeerAddr.ipv6 := PSockAddrIn6(@Addr)^;
-  end;
-  FPeerAddress := '';
-  FPeerHost := '';
-  FPeerPort := 0;
-end;
-
-procedure TSocket.SetLinger(LingerOn: Boolean; LingerVal: Integer);
-var
-  L: TLinger;
-begin
-  FLingerOn := LingerOn;
-  FLingerVal := LingerVal;
-  if Socket = INVALID_SOCKET then
-    Exit;
-
-  L.l_onoff := IfThen(FLingerOn, 1, 0);
-  L.l_linger := LingerVal;
-
-  if setsockopt(Socket, SOL_SOCKET, SO_LINGER, @L, SizeOf(L)) = SOCKET_ERROR then
-    LogDelegate(Format('TSocket.SetLinger() setsockopt() %s %s', [SocketInfo, SysErrorMessage(WSAGetLastError)]));
-end;
-
-function TSocket.Peek: Boolean;
-var
-  Retries: Longword;
-  Fds: TFdSet;
-  TVal: TTimeVal;
-  PTVal: PTimeVal;
-  Ret: Integer;
-  ErrnoCopy: Integer;
-  Buf: Byte;
-begin
-  if not IsOpen then Exit(False);
-
-  if Assigned(FInterruptListener) then begin
-    Retries := 0;
-    while true do begin
-      FD_ZERO(Fds);
-      _FD_SET(Socket, Fds);
-      _FD_SET(FInterruptListener, Fds);
-      if RecvTimeout > 0 then begin
-        TVal.tv_sec := RecvTimeout div 1000;
-        TVal.tv_usec := (RecvTimeout mod 1000) * 1000;
-        PTVal := @TVal;
-      end
-      else
-        PTVal := nil;
-
-      Ret := select(2, @Fds, nil, nil, PTVal);
-      ErrnoCopy := WSAGetLastError;
-      if Ret < 0 then begin
-        // error cases
-        if (ErrnoCopy = WSAEINTR) and (Retries < FMaxRecvRetries) then begin
-          Inc(Retries);
-          Continue;
-        end;
-        LogDelegate(Format('TSocket.Peek() select() %s', [SysErrorMessage(ErrnoCopy)]));
-        raise TTransportExceptionUnknown.Create(Format('Unknown: %s', [SysErrorMessage(ErrnoCopy)]));
-      end
-      else if Ret > 0 then begin
-        // Check the interruptListener
-        if FD_ISSET(FInterruptListener, Fds) then
-          Exit(False);
-        // There must be data or a disconnection, fall through to the PEEK
-        Break;
-      end
-      else
-        // timeout
-        Exit(False);
-    end;
-  end;
-
-  // Check to see if data is available or if the remote side closed
-  Ret := recv(Socket, Buf, 1, MSG_PEEK);
-  if Ret = SOCKET_ERROR then begin
-    ErrnoCopy := WSAGetLastError;
-    if ErrnoCopy = WSAECONNRESET then begin
-      Close;
-      Exit(False);
-    end;
-    LogDelegate(Format('TSocket.Peek() recv() %s %s', [SocketInfo, SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionUnknown.Create(Format('recv(): %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-  Result := Ret > 0;
-end;
-
-function TServerSocket.CreateSocketObj(Client: Winapi.Winsock2.TSocket): TSocket;
-begin
-  if FInterruptableChildren then
-    Result := TSocket.Create(Client, FChildInterruptSockReader)
-  else
-    Result := TSocket.Create(Client);
-end;
-
-procedure TServerSocket.Notify(NotifySocket: Winapi.Winsock2.TSocket);
-var
-  Byt: Byte;
-begin
-  if NotifySocket <> INVALID_SOCKET then begin
-    Byt := 0;
-    if send(NotifySocket, Byt, SizeOf(Byt), 0) = SOCKET_ERROR then
-      LogDelegate(Format('TServerSocket.Notify() send() %s', [SysErrorMessage(WSAGetLastError)]));
-  end;
-end;
-
-procedure TServerSocket.SetInterruptableChildren(AValue: Boolean);
-begin
-  if FListening then
-    raise Exception.Create('InterruptableChildren cannot be set after listen()');
-  FInterruptableChildren := AValue;
-end;
-
-procedure TServerSocket.CommonInit;
-begin
-  inherited CommonInit;
-  FInterruptableChildren := True;
-  FAcceptBacklog := DEFAULT_BACKLOG;
-  FAcceptTimeout := 0;
-  FRetryLimit := 0;
-  FRetryDelay := 0;
-  FTcpSendBuffer := 0;
-  FTcpRecvBuffer := 0;
-  FListening := False;
-  FInterruptSockWriter := INVALID_SOCKET;
-  FInterruptSockReader := INVALID_SOCKET;
-  FChildInterruptSockWriter := INVALID_SOCKET;
-end;
-
-constructor TServerSocket.Create(APort: Integer; ALogDelegate: TBaseSocket.TLogDelegate = nil);
-begin
-  // Unnecessary, but here for documentation purposes
-  inherited Create(APort, ALogDelegate);
-end;
-
-constructor TServerSocket.Create(APort: Integer; ASendTimeout, ARecvTimeout: Longword; ALogDelegate: TBaseSocket.TLogDelegate);
-begin
-  inherited Create(APort, ALogDelegate);
-  SendTimeout := ASendTimeout;
-  RecvTimeout := ARecvTimeout;
-end;
-
-constructor TServerSocket.Create(AAddress: string; APort: Integer; ALogDelegate: TBaseSocket.TLogDelegate);
-begin
-  inherited Create(APort, ALogDelegate);
-  FAddress := AAddress;
-end;
-
-procedure TServerSocket.Listen;
-
-  function CreateSocketPair(var Reader, Writer: Winapi.Winsock2.TSocket): Integer;
-  label
-    Error;
-  type
-    TSAUnion = record
-    case Integer of
-      0: (inaddr: TSockAddrIn);
-      1: (addr: TSockAddr);
-    end;
-  var
-    a: TSAUnion;
-    listener: Winapi.Winsock2.TSocket;
-    e: Integer;
-    addrlen: Integer;
-    flags: DWORD;
-    reuse: Integer;
-  begin
-    addrlen := SizeOf(a.inaddr);
-    flags := 0;
-    reuse := 1;
-
-    listener := Winapi.Winsock2.socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if listener = INVALID_SOCKET then
-      Exit(SOCKET_ERROR);
-
-    FillChar(a, SizeOf(a), 0);
-    a.inaddr.sin_family := AF_INET;
-    a.inaddr.sin_addr.s_addr := htonl(INADDR_LOOPBACK);
-    a.inaddr.sin_port := 0;
-    Reader := INVALID_SOCKET;
-    Writer := INVALID_SOCKET;
-
-    // ignore errors coming out of this setsockopt.  This is because
-    // SO_EXCLUSIVEADDRUSE requires admin privileges on WinXP, but we don't
-    // want to force socket pairs to be an admin.
-    setsockopt(listener, SOL_SOCKET, Integer(SO_EXCLUSIVEADDRUSE), @reuse, SizeOf(reuse));
-    if bind(listener, a.addr, SizeOf(a.inaddr)) = SOCKET_ERROR then
-      goto Error;
-
-    if getsockname(listener, a.addr, addrlen) = SOCKET_ERROR then
-      goto Error;
-
-    if Winapi.Winsock2.listen(listener, 1) = SOCKET_ERROR then
-      goto Error;
-
-    Reader := WSASocket(AF_INET, SOCK_STREAM, 0, nil, 0, flags);
-    if Reader = INVALID_SOCKET then
-      goto Error;
-
-    if connect(Reader, a.addr, SizeOf(a.inaddr)) = SOCKET_ERROR then
-      goto Error;
-
-    Writer := Winapi.Winsock2.accept(listener, nil, nil);
-    if Writer = INVALID_SOCKET then
-      goto Error;
-
-    closesocket(listener);
-    Exit(0);
-
-  Error:
-    e := WSAGetLastError;
-    closesocket(listener);
-    closesocket(Reader);
-    closesocket(Writer);
-    WSASetLastError(e);
-    Result := SOCKET_ERROR;
-  end;
-
-var
-  TempIntReader,
-  TempIntWriter: Winapi.Winsock2.TSocket;
-  One: Cardinal;
-  ErrnoCopy: Integer;
-  Ling: TLinger;
-  Retries: Integer;
-  AddrInfo: IGetAddrInfoWrapper;
-  SA: TSockAddrStorage;
-  Len: Integer;
-begin
-  // Create the socket pair used to interrupt
-  if CreateSocketPair(TempIntReader, TempIntWriter) = SOCKET_ERROR then begin
-    LogDelegate(Format('TServerSocket.Listen() CreateSocketPair() Interrupt %s', [SysErrorMessage(WSAGetLastError)]));
-    FInterruptSockReader := INVALID_SOCKET;
-    FInterruptSockWriter := INVALID_SOCKET;
-  end
-  else begin
-    FInterruptSockReader := TempIntReader;
-    FInterruptSockWriter := TempIntWriter;
-  end;
-
-  // Create the socket pair used to interrupt all clients
-  if CreateSocketPair(TempIntReader, TempIntWriter) = SOCKET_ERROR then begin
-    LogDelegate(Format('TServerSocket.Listen() CreateSocketPair() ChildInterrupt %s', [SysErrorMessage(WSAGetLastError)]));
-    FChildInterruptSockReader := TSmartPointer<Winapi.Winsock2.TSocket>.Create(INVALID_SOCKET, nil);
-    FChildInterruptSockWriter := INVALID_SOCKET;
-  end
-  else begin
-    FChildInterruptSockReader := TSmartPointer<Winapi.Winsock2.TSocket>.Create(TempIntReader, DestroyerOfFineSockets);
-    FChildInterruptSockWriter := TempIntWriter;
-  end;
-
-  if (Port < 0) or (Port > $FFFF) then
-    raise TTransportExceptionBadArgs.Create('Specified port is invalid');
-
-  AddrInfo := CreateSocket(FAddress, Port);
-
-  // Set SO_EXCLUSIVEADDRUSE to prevent 2MSL delay on accept
-  One := 1;
-  setsockopt(Socket, SOL_SOCKET, Integer(SO_EXCLUSIVEADDRUSE), @one, SizeOf(One));
-  // ignore errors coming out of this setsockopt on Windows.  This is because
-  // SO_EXCLUSIVEADDRUSE requires admin privileges on WinXP, but we don't
-  // want to force servers to be an admin.
-
-  // Set TCP buffer sizes
-  if FTcpSendBuffer > 0 then begin
-    if setsockopt(Socket, SOL_SOCKET, SO_SNDBUF, @FTcpSendBuffer, SizeOf(FTcpSendBuffer)) = SOCKET_ERROR then begin
-      ErrnoCopy := WSAGetLastError;
-      LogDelegate(Format('TServerSocket.Listen() setsockopt() SO_SNDBUF %s', [SysErrorMessage(ErrnoCopy)]));
-      raise TTransportExceptionNotOpen.Create(Format('Could not set SO_SNDBUF: %s', [SysErrorMessage(ErrnoCopy)]));
-    end;
-  end;
-
-  if FTcpRecvBuffer > 0 then begin
-    if setsockopt(Socket, SOL_SOCKET, SO_RCVBUF, @FTcpRecvBuffer, SizeOf(FTcpRecvBuffer)) = SOCKET_ERROR then begin
-      ErrnoCopy := WSAGetLastError;
-      LogDelegate(Format('TServerSocket.Listen() setsockopt() SO_RCVBUF %s', [SysErrorMessage(ErrnoCopy)]));
-      raise TTransportExceptionNotOpen.Create(Format('Could not set SO_RCVBUF: %s', [SysErrorMessage(ErrnoCopy)]));
-    end;
-  end;
-
-  // Turn linger off, don't want to block on calls to close
-  Ling.l_onoff := 0;
-  Ling.l_linger := 0;
-  if setsockopt(Socket, SOL_SOCKET, SO_LINGER, @Ling, SizeOf(Ling)) = SOCKET_ERROR then begin
-    ErrnoCopy := WSAGetLastError;
-    LogDelegate(Format('TServerSocket.Listen() setsockopt() SO_LINGER %s', [SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionNotOpen.Create(Format('Could not set SO_LINGER: %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  // TCP Nodelay, speed over bandwidth
-  if setsockopt(Socket, IPPROTO_TCP, TCP_NODELAY, @One, SizeOf(One)) = SOCKET_ERROR then begin
-    ErrnoCopy := WSAGetLastError;
-    LogDelegate(Format('TServerSocket.Listen() setsockopt() TCP_NODELAY %s', [SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionNotOpen.Create(Format('Could not set TCP_NODELAY: %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  // Set NONBLOCK on the accept socket
-  if ioctlsocket(Socket, Integer(FIONBIO), One) = SOCKET_ERROR then begin
-    ErrnoCopy := WSAGetLastError;
-    LogDelegate(Format('TServerSocket.Listen() ioctlsocket() FIONBIO %s', [SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionNotOpen.Create(Format('ioctlsocket() FIONBIO: %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  // prepare the port information
-  // we may want to try to bind more than once, since THRIFT_NO_SOCKET_CACHING doesn't
-  // always seem to work. The client can configure the retry variables.
-  Retries := 0;
-  while True do begin
-    if bind(Socket, AddrInfo.Res^.ai_addr^, AddrInfo.Res^.ai_addrlen) = 0 then
-      Break;
-    Inc(Retries);
-    if Retries > FRetryLimit then
-      Break;
-    Sleep(FRetryDelay * 1000);
-  end;
-
-  // retrieve bind info
-  if (Port = 0) and (Retries < FRetryLimit) then begin
-    Len := SizeOf(SA);
-    FillChar(SA, Len, 0);
-    if getsockname(Socket, PSockAddr(@SA)^, Len) = SOCKET_ERROR then
-      LogDelegate(Format('TServerSocket.Listen() getsockname() %s', [SysErrorMessage(WSAGetLastError)]))
-    else begin
-      if SA.ss_family = AF_INET6 then
-        Port := ntohs(PSockAddrIn6(@SA)^.sin6_port)
-      else
-        Port := ntohs(PSockAddrIn(@SA)^.sin_port);
-    end;
-  end;
-
-  // throw an error if we failed to bind properly
-  if (Retries > FRetryLimit) then begin
-    LogDelegate(Format('TServerSocket.Listen() BIND %d', [Port]));
-    Close;
-    raise TTransportExceptionNotOpen.Create(Format('Could not bind: %s', [SysErrorMessage(WSAGetLastError)]));
-  end;
-
-  if Assigned(FListenCallback) then
-    FListenCallback(Socket);
-
-  // Call listen
-  if Winapi.Winsock2.listen(Socket, FAcceptBacklog) = SOCKET_ERROR then begin
-    ErrnoCopy := WSAGetLastError;
-    LogDelegate(Format('TServerSocket.Listen() listen() %s', [SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionNotOpen.Create(Format('Could not listen: %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  // The socket is now listening!
-end;
-
-function TServerSocket.Accept: TSocket;
-var
-  Fds: TFdSet;
-  MaxEInters,
-  NumEInters: Integer;
-  TVal: TTimeVal;
-  PTVal: PTimeVal;
-  ErrnoCopy: Integer;
-  Buf: Byte;
-  ClientAddress: TSockAddrStorage;
-  Size: Integer;
-  ClientSocket: Winapi.Winsock2.TSocket;
-  Zero: Cardinal;
-  Client: TSocket;
-  Ret: Integer;
-begin
-  MaxEInters := 5;
-  NumEInters := 0;
-
-  while True do begin
-    FD_ZERO(Fds);
-    _FD_SET(Socket, Fds);
-    _FD_SET(FInterruptSockReader, Fds);
-    if FAcceptTimeout > 0 then begin
-      TVal.tv_sec := FAcceptTimeout div 1000;
-      TVal.tv_usec := (FAcceptTimeout mod 1000) * 1000;
-      PTVal := @TVal;
-    end
-    else
-      PTVal := nil;
-
-    // TODO: if WSAEINTR is received, we'll restart the timeout.
-    // To be accurate, we need to fix this in the future.
-    Ret := select(2, @Fds, nil, nil, PTVal);
-
-    if Ret < 0 then begin
-      // error cases
-      if (WSAGetLastError = WSAEINTR) and (NumEInters < MaxEInters) then begin
-        // THRIFT_EINTR needs to be handled manually and we can tolerate
-        // a certain number
-        Inc(NumEInters);
-        Continue;
-      end;
-      ErrnoCopy := WSAGetLastError;
-      LogDelegate(Format('TServerSocket.Accept() select() %s', [SysErrorMessage(ErrnoCopy)]));
-      raise TTransportExceptionUnknown.Create(Format('Unknown: %s', [SysErrorMessage(ErrnoCopy)]));
-    end
-    else if Ret > 0 then begin
-      // Check for an interrupt signal
-      if (FInterruptSockReader <> INVALID_SOCKET) and FD_ISSET(FInterruptSockReader, Fds) then begin
-        if recv(FInterruptSockReader, Buf, SizeOf(Buf), 0) = SOCKET_ERROR then
-          LogDelegate(Format('TServerSocket.Accept() recv() interrupt %s', [SysErrorMessage(WSAGetLastError)]));
-        raise TTransportExceptionInterrupted.Create('interrupted');
-      end;
-
-      // Check for the actual server socket being ready
-      if FD_ISSET(Socket, Fds) then
-        Break;
-    end
-    else begin
-      LogDelegate('TServerSocket.Accept() select() 0');
-      raise TTransportExceptionUnknown.Create('unknown error');
-    end;
-  end;
-
-  Size := SizeOf(ClientAddress);
-  ClientSocket := Winapi.Winsock2.accept(Socket, @ClientAddress, @Size);
-  if ClientSocket = INVALID_SOCKET then begin
-    ErrnoCopy := WSAGetLastError;
-    LogDelegate(Format('TServerSocket.Accept() accept() %s', [SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionUnknown.Create(Format('accept(): %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  // Make sure client socket is blocking
-  Zero := 0;
-  if ioctlsocket(ClientSocket, Integer(FIONBIO), Zero) = SOCKET_ERROR then begin
-    ErrnoCopy := WSAGetLastError;
-    closesocket(ClientSocket);
-    LogDelegate(Format('TServerSocket.Accept() ioctlsocket() FIONBIO %s', [SysErrorMessage(ErrnoCopy)]));
-    raise TTransportExceptionUnknown.Create(Format('ioctlsocket(): %s', [SysErrorMessage(ErrnoCopy)]));
-  end;
-
-  Client := CreateSocketObj(ClientSocket);
-  if SendTimeout > 0 then
-    Client.SendTimeout := SendTimeout;
-  if RecvTimeout > 0 then
-    Client.RecvTimeout := RecvTimeout;
-  if KeepAlive then
-    Client.KeepAlive := KeepAlive;
-  Client.SetCachedAddress(PSockAddr(@ClientAddress)^, Size);
-
-  if Assigned(FAcceptCallback) then
-    FAcceptCallback(ClientSocket);
-
-  Result := Client;
-end;
-
-procedure TServerSocket.Interrupt;
-begin
-  Notify(FInterruptSockWriter);
-end;
-
-procedure TServerSocket.InterruptChildren;
-begin
-  Notify(FChildInterruptSockWriter);
-end;
-
-procedure TServerSocket.Close;
-begin
-  inherited Close;
-  if FInterruptSockWriter <> INVALID_SOCKET then
-    closesocket(FInterruptSockWriter);
-  if FInterruptSockReader <> INVALID_SOCKET then
-    closesocket(FInterruptSockReader);
-  if FChildInterruptSockWriter <> INVALID_SOCKET then
-    closesocket(FChildInterruptSockWriter);
-  FChildInterruptSockReader := TSmartPointer<Winapi.Winsock2.TSocket>.Create(INVALID_SOCKET, nil);
-  FListening := False;
-end;
-
-{$ENDIF} // not for OLD_SOCKETS
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Stream.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Stream.pas
deleted file mode 100644
index 7c448d8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Stream.pas
+++ /dev/null
@@ -1,288 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.Stream;
-
-{$I Thrift.Defines.inc}
-
-interface
-
-uses
-  Classes,
-  SysUtils,
-  SysConst,
-  RTLConsts,
-  {$IFDEF OLD_UNIT_NAMES}
-  ActiveX,
-  {$ELSE}
-  Winapi.ActiveX,
-  {$ENDIF}
-  Thrift.Utils;
-
-type
-
-  IThriftStream = interface
-    ['{732621B3-F697-4D76-A1B0-B4DD5A8E4018}']
-    procedure Write( const buffer: TBytes; offset: Integer; count: Integer);
-    function Read( var buffer: TBytes; offset: Integer; count: Integer): Integer;
-    procedure Open;
-    procedure Close;
-    procedure Flush;
-    function IsOpen: Boolean;
-    function ToArray: TBytes;
-  end;
-
-  TThriftStreamImpl = class( TInterfacedObject, IThriftStream)
-  private
-    procedure CheckSizeAndOffset( const buffer: TBytes; offset: Integer; count: Integer);
-  protected
-    procedure Write( const buffer: TBytes; offset: Integer; count: Integer); virtual;
-    function Read( var buffer: TBytes; offset: Integer; count: Integer): Integer; virtual;
-    procedure Open; virtual; abstract;
-    procedure Close; virtual; abstract;
-    procedure Flush; virtual; abstract;
-    function IsOpen: Boolean; virtual; abstract;
-    function ToArray: TBytes; virtual; abstract;
-  end;
-
-  TThriftStreamAdapterDelphi = class( TThriftStreamImpl )
-  private
-    FStream : TStream;
-    FOwnsStream : Boolean;
-  protected
-    procedure Write( const buffer: TBytes; offset: Integer; count: Integer); override;
-    function Read( var buffer: TBytes; offset: Integer; count: Integer): Integer; override;
-    procedure Open; override;
-    procedure Close; override;
-    procedure Flush; override;
-    function IsOpen: Boolean; override;
-    function ToArray: TBytes; override;
-  public
-    constructor Create( const AStream: TStream; AOwnsStream : Boolean);
-    destructor Destroy; override;
-  end;
-
-  TThriftStreamAdapterCOM = class( TThriftStreamImpl)
-  private
-    FStream : IStream;
-  protected
-    procedure Write( const buffer: TBytes; offset: Integer; count: Integer); override;
-    function Read( var buffer: TBytes; offset: Integer; count: Integer): Integer; override;
-    procedure Open; override;
-    procedure Close; override;
-    procedure Flush; override;
-    function IsOpen: Boolean; override;
-    function ToArray: TBytes; override;
-  public
-    constructor Create( const AStream: IStream);
-  end;
-
-implementation
-
-{ TThriftStreamAdapterCOM }
-
-procedure TThriftStreamAdapterCOM.Close;
-begin
-  FStream := nil;
-end;
-
-constructor TThriftStreamAdapterCOM.Create( const AStream: IStream);
-begin
-  inherited Create;
-  FStream := AStream;
-end;
-
-procedure TThriftStreamAdapterCOM.Flush;
-begin
-  if IsOpen then begin
-    if FStream <> nil then begin
-      FStream.Commit( STGC_DEFAULT );
-    end;
-  end;
-end;
-
-function TThriftStreamAdapterCOM.IsOpen: Boolean;
-begin
-  Result := FStream <> nil;
-end;
-
-procedure TThriftStreamAdapterCOM.Open;
-begin
-  // nothing to do
-end;
-
-function TThriftStreamAdapterCOM.Read( var buffer: TBytes; offset: Integer; count: Integer): Integer;
-begin
-  inherited;
-  Result := 0;
-  if FStream <> nil then begin
-    if count > 0 then begin
-      FStream.Read( @buffer[offset], count, @Result);
-    end;
-  end;
-end;
-
-function TThriftStreamAdapterCOM.ToArray: TBytes;
-var
-  statstg: TStatStg;
-  len : Integer;
-  NewPos : {$IF CompilerVersion >= 29.0} UInt64 {$ELSE} Int64  {$IFEND};
-  cbRead : Integer;
-begin
-  FillChar( statstg, SizeOf( statstg), 0);
-  len := 0;
-  if IsOpen then begin
-    if Succeeded( FStream.Stat( statstg, STATFLAG_NONAME )) then begin
-      len := statstg.cbSize;
-    end;
-  end;
-
-  SetLength( Result, len );
-
-  if len > 0 then begin
-    if Succeeded( FStream.Seek( 0, STREAM_SEEK_SET, NewPos) ) then begin
-      FStream.Read( @Result[0], len, @cbRead);
-    end;
-  end;
-end;
-
-procedure TThriftStreamAdapterCOM.Write( const buffer: TBytes; offset: Integer; count: Integer);
-var nWritten : Integer;
-begin
-  inherited;
-  if IsOpen then begin
-    if count > 0 then begin
-      FStream.Write( @buffer[0], count, @nWritten);
-    end;
-  end;
-end;
-
-{ TThriftStreamImpl }
-
-procedure TThriftStreamImpl.CheckSizeAndOffset(const buffer: TBytes; offset,
-  count: Integer);
-var
-  len : Integer;
-begin
-  if count > 0 then begin
-    len := Length( buffer );
-    if (offset < 0) or ( offset >= len) then begin
-      raise ERangeError.Create( SBitsIndexError );
-    end;
-    if count > len then begin
-      raise ERangeError.Create( SBitsIndexError );
-    end;
-  end;
-end;
-
-function TThriftStreamImpl.Read(var buffer: TBytes; offset, count: Integer): Integer;
-begin
-  Result := 0;
-  CheckSizeAndOffset( buffer, offset, count );
-end;
-
-procedure TThriftStreamImpl.Write(const buffer: TBytes; offset, count: Integer);
-begin
-  CheckSizeAndOffset( buffer, offset, count );
-end;
-
-{ TThriftStreamAdapterDelphi }
-
-procedure TThriftStreamAdapterDelphi.Close;
-begin
-  FStream.Free;
-  FStream := nil;
-  FOwnsStream := False;
-end;
-
-constructor TThriftStreamAdapterDelphi.Create( const AStream: TStream; AOwnsStream: Boolean);
-begin
-  inherited Create;
-  FStream := AStream;
-  FOwnsStream := AOwnsStream;
-end;
-
-destructor TThriftStreamAdapterDelphi.Destroy;
-begin
-  if FOwnsStream 
-  then Close;
-  
-  inherited;
-end;
-
-procedure TThriftStreamAdapterDelphi.Flush;
-begin
-  // nothing to do
-end;
-
-function TThriftStreamAdapterDelphi.IsOpen: Boolean;
-begin
-  Result := FStream <> nil;
-end;
-
-procedure TThriftStreamAdapterDelphi.Open;
-begin
-  // nothing to do
-end;
-
-function TThriftStreamAdapterDelphi.Read(var buffer: TBytes; offset,
-  count: Integer): Integer;
-begin
-  inherited;
-  Result := 0;
-  if count > 0 then begin
-    Result := FStream.Read( Pointer(@buffer[offset])^, count)
-  end;
-end;
-
-function TThriftStreamAdapterDelphi.ToArray: TBytes;
-var
-  OrgPos : Integer;
-  len : Integer;
-begin
-  len := 0;
-  if FStream <> nil then
-  begin
-    len := FStream.Size;
-  end;
-
-  SetLength( Result, len );
-
-  if len > 0 then
-  begin
-    OrgPos := FStream.Position;
-    try
-      FStream.Position := 0;
-      FStream.ReadBuffer( Pointer(@Result[0])^, len );
-    finally
-      FStream.Position := OrgPos;
-    end;
-  end
-end;
-
-procedure TThriftStreamAdapterDelphi.Write(const buffer: TBytes; offset,
-  count: Integer);
-begin
-  inherited;
-  if count > 0 then begin
-    FStream.Write( Pointer(@buffer[offset])^, count)
-  end;
-end;
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Transport.Pipes.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Transport.Pipes.pas
deleted file mode 100644
index d4f99ab..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Transport.Pipes.pas
+++ /dev/null
@@ -1,997 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-unit Thrift.Transport.Pipes;
-
-{$WARN SYMBOL_PLATFORM OFF}
-{$I Thrift.Defines.inc}
-
-interface
-
-uses
-  {$IFDEF OLD_UNIT_NAMES}
-  Windows, SysUtils, Math, AccCtrl, AclAPI, SyncObjs,
-  {$ELSE}
-  Winapi.Windows, System.SysUtils, System.Math, Winapi.AccCtrl, Winapi.AclAPI, System.SyncObjs,
-  {$ENDIF}
-  Thrift.Transport,
-  Thrift.Utils,
-  Thrift.Stream;
-
-const
-  DEFAULT_THRIFT_PIPE_OPEN_TIMEOUT = 10;  // default: fail fast on open
-
-
-type
-  //--- Pipe Streams ---
-
-
-  TPipeStreamBase = class( TThriftStreamImpl)
-  strict protected
-    FPipe    : THandle;
-    FTimeout : DWORD;
-    FOpenTimeOut : DWORD;  // separate value to allow for fail-fast-on-open scenarios
-    FOverlapped : Boolean;
-
-    procedure Write( const buffer: TBytes; offset: Integer; count: Integer); override;
-    function  Read( var buffer: TBytes; offset: Integer; count: Integer): Integer; override;
-    //procedure Open; override; - see derived classes
-    procedure Close; override;
-    procedure Flush; override;
-
-    function  ReadDirect(     var buffer: TBytes; offset: Integer; count: Integer): Integer;
-    function  ReadOverlapped( var buffer: TBytes; offset: Integer; count: Integer): Integer;
-    procedure WriteDirect(     const buffer: TBytes; offset: Integer; count: Integer);
-    procedure WriteOverlapped( const buffer: TBytes; offset: Integer; count: Integer);
-
-    function IsOpen: Boolean; override;
-    function ToArray: TBytes; override;
-  public
-    constructor Create( aEnableOverlapped : Boolean;
-                        const aTimeOut : DWORD = DEFAULT_THRIFT_TIMEOUT;
-                        const aOpenTimeOut : DWORD = DEFAULT_THRIFT_PIPE_OPEN_TIMEOUT);
-    destructor Destroy;  override;
-  end;
-
-
-  TNamedPipeStreamImpl = class sealed( TPipeStreamBase)
-  strict private
-    FPipeName  : string;
-    FShareMode : DWORD;
-    FSecurityAttribs : PSecurityAttributes;
-
-  strict protected
-    procedure Open; override;
-
-  public
-    constructor Create( const aPipeName : string;
-                        const aEnableOverlapped : Boolean;
-                        const aShareMode: DWORD = 0;
-                        const aSecurityAttributes: PSecurityAttributes = nil;
-                        const aTimeOut : DWORD = DEFAULT_THRIFT_TIMEOUT;
-                        const aOpenTimeOut : DWORD = DEFAULT_THRIFT_PIPE_OPEN_TIMEOUT);  overload;
-  end;
-
-
-  THandlePipeStreamImpl = class sealed( TPipeStreamBase)
-  strict private
-    FSrcHandle : THandle;
-
-  strict protected
-    procedure Open; override;
-
-  public
-    constructor Create( const aPipeHandle : THandle;
-                        const aOwnsHandle, aEnableOverlapped : Boolean;
-                        const aTimeOut : DWORD = DEFAULT_THRIFT_TIMEOUT);  overload;
-    destructor Destroy;  override;
-  end;
-
-
-  //--- Pipe Transports ---
-
-
-  IPipeTransport = interface( IStreamTransport)
-    ['{5E05CC85-434F-428F-BFB2-856A168B5558}']
-  end;
-
-
-  TPipeTransportBase = class( TStreamTransportImpl, IPipeTransport)
-  public
-    // ITransport
-    function  GetIsOpen: Boolean; override;
-    procedure Open; override;
-    procedure Close; override;
-  end;
-
-
-  TNamedPipeTransportClientEndImpl = class( TPipeTransportBase)
-  public
-    // Named pipe constructors
-    constructor Create( aPipe : THandle; aOwnsHandle : Boolean;
-                        const aTimeOut : DWORD); overload;
-    constructor Create( const aPipeName : string;
-                        const aShareMode: DWORD = 0;
-                        const aSecurityAttributes: PSecurityAttributes = nil;
-                        const aTimeOut : DWORD = DEFAULT_THRIFT_TIMEOUT;
-                        const aOpenTimeOut : DWORD = DEFAULT_THRIFT_PIPE_OPEN_TIMEOUT);  overload;
-  end;
-
-
-  TNamedPipeTransportServerEndImpl = class( TNamedPipeTransportClientEndImpl)
-  strict private
-    FHandle : THandle;
-  public
-    // ITransport
-    procedure Close; override;
-    constructor Create( aPipe : THandle; aOwnsHandle : Boolean;
-                        const aTimeOut : DWORD = DEFAULT_THRIFT_TIMEOUT); reintroduce;
-  end;
-
-
-  TAnonymousPipeTransportImpl = class( TPipeTransportBase)
-  public
-    // Anonymous pipe constructor
-    constructor Create(const aPipeRead, aPipeWrite : THandle;
-                       aOwnsHandles : Boolean;
-                       const aTimeOut : DWORD = DEFAULT_THRIFT_TIMEOUT); overload;
-  end;
-
-
-  //--- Server Transports ---
-
-
-  IAnonymousPipeServerTransport = interface( IServerTransport)
-    ['{7AEE6793-47B9-4E49-981A-C39E9108E9AD}']
-    // Server side anonymous pipe ends
-    function ReadHandle : THandle;
-    function WriteHandle : THandle;
-    // Client side anonymous pipe ends
-    function ClientAnonRead : THandle;
-    function ClientAnonWrite  : THandle;
-  end;
-
-
-  INamedPipeServerTransport = interface( IServerTransport)
-    ['{9DF9EE48-D065-40AF-8F67-D33037D3D960}']
-    function Handle : THandle;
-  end;
-
-
-  TPipeServerTransportBase = class( TServerTransportImpl)
-  strict protected
-    FStopServer : TEvent;
-    procedure InternalClose; virtual; abstract;
-    function QueryStopServer : Boolean;
-  public
-    constructor Create;
-    destructor Destroy;  override;
-    procedure Listen; override;
-    procedure Close; override;
-  end;
-
-
-  TAnonymousPipeServerTransportImpl = class( TPipeServerTransportBase, IAnonymousPipeServerTransport)
-  strict private
-    FBufSize      : DWORD;
-
-    // Server side anonymous pipe handles
-    FReadHandle,
-    FWriteHandle : THandle;
-
-    //Client side anonymous pipe handles
-    FClientAnonRead,
-    FClientAnonWrite  : THandle;
-
-    FTimeOut: DWORD;
-  protected
-    function Accept(const fnAccepting: TProc): ITransport; override;
-
-    function CreateAnonPipe : Boolean;
-
-    // IAnonymousPipeServerTransport
-    function ReadHandle : THandle;
-    function WriteHandle : THandle;
-    function ClientAnonRead : THandle;
-    function ClientAnonWrite  : THandle;
-
-    procedure InternalClose; override;
-
-  public
-    constructor Create(aBufsize : Cardinal = 4096; aTimeOut : DWORD = DEFAULT_THRIFT_TIMEOUT);
-  end;
-
-
-  TNamedPipeServerTransportImpl = class( TPipeServerTransportBase, INamedPipeServerTransport)
-  strict private
-    FPipeName     : string;
-    FMaxConns     : DWORD;
-    FBufSize      : DWORD;
-    FTimeout      : DWORD;
-    FHandle       : THandle;
-    FConnected    : Boolean;
-
-
-  strict protected
-    function Accept(const fnAccepting: TProc): ITransport; override;
-    function CreateNamedPipe : THandle;
-    function CreateTransportInstance : ITransport;
-
-    // INamedPipeServerTransport
-    function Handle : THandle;
-    procedure InternalClose; override;
-
-  public
-    constructor Create( aPipename : string; aBufsize : Cardinal = 4096;
-                        aMaxConns : Cardinal = PIPE_UNLIMITED_INSTANCES;
-                        aTimeOut : Cardinal = INFINITE);
-  end;
-
-
-implementation
-
-
-procedure ClosePipeHandle( var hPipe : THandle);
-begin
-  if hPipe <> INVALID_HANDLE_VALUE
-  then try
-    CloseHandle( hPipe);
-  finally
-    hPipe := INVALID_HANDLE_VALUE;
-  end;
-end;
-
-
-function DuplicatePipeHandle( const hSource : THandle) : THandle;
-begin
-  if not DuplicateHandle( GetCurrentProcess, hSource,
-                          GetCurrentProcess, @result,
-                          0, FALSE, DUPLICATE_SAME_ACCESS)
-  then raise TTransportExceptionNotOpen.Create('DuplicateHandle: '+SysErrorMessage(GetLastError));
-end;
-
-
-
-{ TPipeStreamBase }
-
-
-constructor TPipeStreamBase.Create( aEnableOverlapped : Boolean;
-                                    const aTimeOut, aOpenTimeOut : DWORD);
-begin
-  inherited Create;
-  ASSERT( aTimeout > 0);  // aOpenTimeout may be 0
-  FPipe        := INVALID_HANDLE_VALUE;
-  FTimeout     := aTimeOut;
-  FOpenTimeOut := aOpenTimeOut;
-  FOverlapped  := aEnableOverlapped;
-end;
-
-
-destructor TPipeStreamBase.Destroy;
-begin
-  try
-    Close;
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-procedure TPipeStreamBase.Close;
-begin
-  ClosePipeHandle( FPipe);
-end;
-
-
-procedure TPipeStreamBase.Flush;
-begin
-  FlushFileBuffers( FPipe);
-end;
-
-
-function TPipeStreamBase.IsOpen: Boolean;
-begin
-  result := (FPipe <> INVALID_HANDLE_VALUE);
-end;
-
-
-procedure TPipeStreamBase.Write(const buffer: TBytes; offset, count: Integer);
-begin
-  if FOverlapped
-  then WriteOverlapped( buffer, offset, count)
-  else WriteDirect( buffer, offset, count);
-end;
-
-
-function TPipeStreamBase.Read( var buffer: TBytes; offset, count: Integer): Integer;
-begin
-  if FOverlapped
-  then result := ReadOverlapped( buffer, offset, count)
-  else result := ReadDirect( buffer, offset, count);
-end;
-
-
-procedure TPipeStreamBase.WriteDirect(const buffer: TBytes; offset, count: Integer);
-var cbWritten : DWORD;
-begin
-  if not IsOpen
-  then raise TTransportExceptionNotOpen.Create('Called write on non-open pipe');
-
-  if not WriteFile( FPipe, buffer[offset], count, cbWritten, nil)
-  then raise TTransportExceptionNotOpen.Create('Write to pipe failed');
-end;
-
-
-function TPipeStreamBase.ReadDirect( var buffer: TBytes; offset, count: Integer): Integer;
-var cbRead, dwErr  : DWORD;
-    bytes, retries  : LongInt;
-    bOk     : Boolean;
-const INTERVAL = 10;  // ms
-begin
-  if not IsOpen
-  then raise TTransportExceptionNotOpen.Create('Called read on non-open pipe');
-
-  // MSDN: Handle can be a handle to a named pipe instance,
-  // or it can be a handle to the read end of an anonymous pipe,
-  // The handle must have GENERIC_READ access to the pipe.
-  if FTimeOut <> INFINITE then begin
-    retries := Max( 1, Round( 1.0 * FTimeOut / INTERVAL));
-    while TRUE do begin
-      if not PeekNamedPipe( FPipe, nil, 0, nil, @bytes, nil) then begin
-        dwErr := GetLastError;
-        if (dwErr = ERROR_INVALID_HANDLE)
-        or (dwErr = ERROR_BROKEN_PIPE)
-        or (dwErr = ERROR_PIPE_NOT_CONNECTED)
-        then begin
-          result := 0;  // other side closed the pipe
-          Exit;
-        end;
-      end
-      else if bytes > 0 then begin
-        Break;  // there are data
-      end;
-
-      Dec( retries);
-      if retries > 0
-      then Sleep( INTERVAL)
-      else raise TTransportExceptionTimedOut.Create('Pipe read timed out');
-    end;
-  end;
-
-  // read the data (or block INFINITE-ly)
-  bOk := ReadFile( FPipe, buffer[offset], count, cbRead, nil);
-  if (not bOk) and (GetLastError() <> ERROR_MORE_DATA)
-  then result := 0 // No more data, possibly because client disconnected.
-  else result := cbRead;
-end;
-
-
-procedure TPipeStreamBase.WriteOverlapped(const buffer: TBytes; offset, count: Integer);
-var cbWritten, dwWait, dwError : DWORD;
-    overlapped : IOverlappedHelper;
-begin
-  if not IsOpen
-  then raise TTransportExceptionNotOpen.Create('Called write on non-open pipe');
-
-  overlapped := TOverlappedHelperImpl.Create;
-
-  if not WriteFile( FPipe, buffer[offset], count, cbWritten, overlapped.OverlappedPtr)
-  then begin
-    dwError := GetLastError;
-    case dwError of
-      ERROR_IO_PENDING : begin
-        dwWait := overlapped.WaitFor(FTimeout);
-
-        if (dwWait = WAIT_TIMEOUT)
-        then raise TTransportExceptionTimedOut.Create('Pipe write timed out');
-
-        if (dwWait <> WAIT_OBJECT_0)
-        or not GetOverlappedResult( FPipe, overlapped.Overlapped, cbWritten, TRUE)
-        then raise TTransportExceptionUnknown.Create('Pipe write error');
-      end;
-
-    else
-      raise TTransportExceptionUnknown.Create(SysErrorMessage(dwError));
-    end;
-  end;
-
-  ASSERT( DWORD(count) = cbWritten);
-end;
-
-
-function TPipeStreamBase.ReadOverlapped( var buffer: TBytes; offset, count: Integer): Integer;
-var cbRead, dwWait, dwError  : DWORD;
-    bOk     : Boolean;
-    overlapped : IOverlappedHelper;
-begin
-  if not IsOpen
-  then raise TTransportExceptionNotOpen.Create('Called read on non-open pipe');
-
-  overlapped := TOverlappedHelperImpl.Create;
-
-  // read the data
-  bOk := ReadFile( FPipe, buffer[offset], count, cbRead, overlapped.OverlappedPtr);
-  if not bOk then begin
-    dwError := GetLastError;
-    case dwError of
-      ERROR_IO_PENDING : begin
-        dwWait := overlapped.WaitFor(FTimeout);
-
-        if (dwWait = WAIT_TIMEOUT)
-        then raise TTransportExceptionTimedOut.Create('Pipe read timed out');
-
-        if (dwWait <> WAIT_OBJECT_0)
-        or not GetOverlappedResult( FPipe, overlapped.Overlapped, cbRead, TRUE)
-        then raise TTransportExceptionUnknown.Create('Pipe read error');
-      end;
-
-    else
-      raise TTransportExceptionUnknown.Create(SysErrorMessage(dwError));
-    end;
-  end;
-
-  ASSERT( cbRead > 0);  // see TTransportImpl.ReadAll()
-  ASSERT( cbRead = DWORD(count));
-  result := cbRead;
-end;
-
-
-function TPipeStreamBase.ToArray: TBytes;
-var bytes : LongInt;
-begin
-  SetLength( result, 0);
-  bytes := 0;
-
-  if  IsOpen
-  and PeekNamedPipe( FPipe, nil, 0, nil, @bytes, nil)
-  and (bytes > 0)
-  then begin
-    SetLength( result, bytes);
-    Read( result, 0, bytes);
-  end;
-end;
-
-
-{ TNamedPipeStreamImpl }
-
-
-constructor TNamedPipeStreamImpl.Create( const aPipeName : string;
-                                         const aEnableOverlapped : Boolean;
-                                         const aShareMode: DWORD;
-                                         const aSecurityAttributes: PSecurityAttributes;
-                                         const aTimeOut, aOpenTimeOut : DWORD);
-begin
-  inherited Create( aEnableOverlapped, aTimeout, aOpenTimeOut);
-
-  FPipeName        := aPipeName;
-  FShareMode       := aShareMode;
-  FSecurityAttribs := aSecurityAttributes;
-
-  if Copy(FPipeName,1,2) <> '\\'
-  then FPipeName := '\\.\pipe\' + FPipeName;  // assume localhost
-end;
-
-
-procedure TNamedPipeStreamImpl.Open;
-var hPipe    : THandle;
-    retries, timeout, dwErr : DWORD;
-const INTERVAL = 10; // ms
-begin
-  if IsOpen then Exit;
-
-  retries := Max( 1, Round( 1.0 * FOpenTimeOut / INTERVAL));
-  timeout := FOpenTimeOut;
-
-  // if the server hasn't gotten to the point where the pipe has been created, at least wait the timeout
-  // According to MSDN, if no instances of the specified named pipe exist, the WaitNamedPipe function
-  // returns IMMEDIATELY, regardless of the time-out value.
-  // Always use INTERVAL, since WaitNamedPipe(0) defaults to some other value
-  while not WaitNamedPipe( PChar(FPipeName), INTERVAL) do begin
-    dwErr := GetLastError;
-    if dwErr <> ERROR_FILE_NOT_FOUND
-    then raise TTransportExceptionNotOpen.Create('Unable to open pipe, '+SysErrorMessage(dwErr));
-
-    if timeout <> INFINITE then begin
-      if (retries > 0)
-      then Dec(retries)
-      else raise TTransportExceptionNotOpen.Create('Unable to open pipe, timed out');
-    end;
-
-    Sleep(INTERVAL)
-  end;
-
-  // open that thingy
-  hPipe := CreateFile( PChar( FPipeName),
-                       GENERIC_READ or GENERIC_WRITE,
-                       FShareMode,        // sharing
-                       FSecurityAttribs,  // security attributes
-                       OPEN_EXISTING,     // opens existing pipe
-                       FILE_FLAG_OVERLAPPED or FILE_FLAG_WRITE_THROUGH, // async+fast, please
-                       0);                // no template file
-
-  if hPipe = INVALID_HANDLE_VALUE
-  then raise TTransportExceptionNotOpen.Create('Unable to open pipe, '+SysErrorMessage(GetLastError));
-
-  // everything fine
-  FPipe := hPipe;
-end;
-
-
-{ THandlePipeStreamImpl }
-
-
-constructor THandlePipeStreamImpl.Create( const aPipeHandle : THandle;
-                                          const aOwnsHandle, aEnableOverlapped : Boolean;
-                                          const aTimeOut : DWORD);
-begin
-  inherited Create( aEnableOverlapped, aTimeOut);
-
-  if aOwnsHandle
-  then FSrcHandle := aPipeHandle
-  else FSrcHandle := DuplicatePipeHandle( aPipeHandle);
-
-  Open;
-end;
-
-
-destructor THandlePipeStreamImpl.Destroy;
-begin
-  try
-    ClosePipeHandle( FSrcHandle);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-procedure THandlePipeStreamImpl.Open;
-begin
-  if not IsOpen
-  then FPipe := DuplicatePipeHandle( FSrcHandle);
-end;
-
-
-{ TPipeTransportBase }
-
-
-function TPipeTransportBase.GetIsOpen: Boolean;
-begin
-  result := (FInputStream <> nil)  and (FInputStream.IsOpen)
-        and (FOutputStream <> nil) and (FOutputStream.IsOpen);
-end;
-
-
-procedure TPipeTransportBase.Open;
-begin
-  FInputStream.Open;
-  FOutputStream.Open;
-end;
-
-
-procedure TPipeTransportBase.Close;
-begin
-  FInputStream.Close;
-  FOutputStream.Close;
-end;
-
-
-{ TNamedPipeTransportClientEndImpl }
-
-
-constructor TNamedPipeTransportClientEndImpl.Create( const aPipeName : string; const aShareMode: DWORD;
-                                   const aSecurityAttributes: PSecurityAttributes;
-                                   const aTimeOut, aOpenTimeOut : DWORD);
-// Named pipe constructor
-begin
-  inherited Create( nil, nil);
-  FInputStream  := TNamedPipeStreamImpl.Create( aPipeName, TRUE, aShareMode, aSecurityAttributes, aTimeOut, aOpenTimeOut);
-  FOutputStream := FInputStream;  // true for named pipes
-end;
-
-
-constructor TNamedPipeTransportClientEndImpl.Create( aPipe : THandle; aOwnsHandle : Boolean;
-                                                     const aTimeOut : DWORD);
-// Named pipe constructor
-begin
-  inherited Create( nil, nil);
-  FInputStream  := THandlePipeStreamImpl.Create( aPipe, TRUE, aOwnsHandle, aTimeOut);
-  FOutputStream := FInputStream;  // true for named pipes
-end;
-
-
-{ TNamedPipeTransportServerEndImpl }
-
-
-constructor TNamedPipeTransportServerEndImpl.Create( aPipe : THandle; aOwnsHandle : Boolean;
-                                                     const aTimeOut : DWORD);
-// Named pipe constructor
-begin
-  FHandle := DuplicatePipeHandle( aPipe);
-  inherited Create( aPipe, aOwnsHandle, aTimeOut);
-end;
-
-
-procedure TNamedPipeTransportServerEndImpl.Close;
-begin
-  FlushFileBuffers( FHandle);
-  DisconnectNamedPipe( FHandle);  // force client off the pipe
-  ClosePipeHandle( FHandle);
-
-  inherited Close;
-end;
-
-
-{ TAnonymousPipeTransportImpl }
-
-
-constructor TAnonymousPipeTransportImpl.Create( const aPipeRead, aPipeWrite : THandle;
-                                                aOwnsHandles : Boolean;
-                                                const aTimeOut : DWORD = DEFAULT_THRIFT_TIMEOUT);
-// Anonymous pipe constructor
-begin
-  inherited Create( nil, nil);
-  // overlapped is not supported with AnonPipes, see MSDN
-  FInputStream  := THandlePipeStreamImpl.Create( aPipeRead, aOwnsHandles, FALSE, aTimeOut);
-  FOutputStream := THandlePipeStreamImpl.Create( aPipeWrite, aOwnsHandles, FALSE, aTimeOut);
-end;
-
-
-{ TPipeServerTransportBase }
-
-
-constructor TPipeServerTransportBase.Create;
-begin
-  inherited Create;
-  FStopServer := TEvent.Create(nil,TRUE,FALSE,'');  // manual reset
-end;
-
-
-destructor TPipeServerTransportBase.Destroy;
-begin
-  try
-    FreeAndNil( FStopServer);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-function TPipeServerTransportBase.QueryStopServer : Boolean;
-begin
-  result := (FStopServer = nil)
-         or (FStopServer.WaitFor(0) <> wrTimeout);
-end;
-
-
-procedure TPipeServerTransportBase.Listen;
-begin
-  FStopServer.ResetEvent;
-end;
-
-
-procedure TPipeServerTransportBase.Close;
-begin
-  FStopServer.SetEvent;
-  InternalClose;
-end;
-
-
-{ TAnonymousPipeServerTransportImpl }
-
-
-constructor TAnonymousPipeServerTransportImpl.Create(aBufsize : Cardinal; aTimeOut : DWORD);
-// Anonymous pipe CTOR
-begin
-  inherited Create;
-  FBufsize  := aBufSize;
-  FReadHandle := INVALID_HANDLE_VALUE;
-  FWriteHandle := INVALID_HANDLE_VALUE;
-  FClientAnonRead := INVALID_HANDLE_VALUE;
-  FClientAnonWrite := INVALID_HANDLE_VALUE;
-  FTimeOut := aTimeOut;
-
-  // The anonymous pipe needs to be created first so that the server can
-  // pass the handles on to the client before the serve (acceptImpl)
-  // blocking call.
-  if not CreateAnonPipe
-  then raise TTransportExceptionNotOpen.Create(ClassName+'.Create() failed');
-end;
-
-
-function TAnonymousPipeServerTransportImpl.Accept(const fnAccepting: TProc): ITransport;
-var buf    : Byte;
-    br     : DWORD;
-begin
-  if Assigned(fnAccepting)
-  then fnAccepting();
-
-  // This 0-byte read serves merely as a blocking call.
-  if not ReadFile( FReadHandle, buf, 0, br, nil)
-  and (GetLastError() <> ERROR_MORE_DATA)
-  then raise TTransportExceptionNotOpen.Create('TServerPipe unable to initiate pipe communication');
-
-  // create the transport impl
-  result := TAnonymousPipeTransportImpl.Create( FReadHandle, FWriteHandle, FALSE, FTimeOut);
-end;
-
-
-procedure TAnonymousPipeServerTransportImpl.InternalClose;
-begin
-  ClosePipeHandle( FReadHandle);
-  ClosePipeHandle( FWriteHandle);
-  ClosePipeHandle( FClientAnonRead);
-  ClosePipeHandle( FClientAnonWrite);
-end;
-
-
-function TAnonymousPipeServerTransportImpl.ReadHandle : THandle;
-begin
-  result := FReadHandle;
-end;
-
-
-function TAnonymousPipeServerTransportImpl.WriteHandle : THandle;
-begin
-  result := FWriteHandle;
-end;
-
-
-function TAnonymousPipeServerTransportImpl.ClientAnonRead : THandle;
-begin
-  result := FClientAnonRead;
-end;
-
-
-function TAnonymousPipeServerTransportImpl.ClientAnonWrite  : THandle;
-begin
-  result := FClientAnonWrite;
-end;
-
-
-function TAnonymousPipeServerTransportImpl.CreateAnonPipe : Boolean;
-var sd           : PSECURITY_DESCRIPTOR;
-    sa           : SECURITY_ATTRIBUTES; //TSecurityAttributes;
-    hCAR, hPipeW, hCAW, hPipe : THandle;
-begin
-  result := FALSE;
-
-  sd := PSECURITY_DESCRIPTOR( LocalAlloc( LPTR,SECURITY_DESCRIPTOR_MIN_LENGTH));
-  try
-    Win32Check( InitializeSecurityDescriptor( sd, SECURITY_DESCRIPTOR_REVISION));
-    Win32Check( SetSecurityDescriptorDacl( sd, TRUE, nil, FALSE));
-
-    sa.nLength := sizeof( sa);
-    sa.lpSecurityDescriptor := sd;
-    sa.bInheritHandle       := TRUE; //allow passing handle to child
-
-    if not CreatePipe( hCAR, hPipeW, @sa, FBufSize) then begin   //create stdin pipe
-      raise TTransportExceptionNotOpen.Create('TServerPipe CreatePipe (anon) failed, '+SysErrorMessage(GetLastError));
-      Exit;
-    end;
-
-    if not CreatePipe( hPipe, hCAW, @sa, FBufSize) then begin  //create stdout pipe
-      CloseHandle( hCAR);
-      CloseHandle( hPipeW);
-      raise TTransportExceptionNotOpen.Create('TServerPipe CreatePipe (anon) failed, '+SysErrorMessage(GetLastError));
-      Exit;
-    end;
-
-    FClientAnonRead  := hCAR;
-    FClientAnonWrite := hCAW;
-    FReadHandle      := hPipe;
-    FWriteHandle     := hPipeW;
-
-    result := TRUE;
-
-  finally
-    if sd <> nil then LocalFree( Cardinal(sd));
-  end;
-end;
-
-
-{ TNamedPipeServerTransportImpl }
-
-
-constructor TNamedPipeServerTransportImpl.Create( aPipename : string; aBufsize, aMaxConns, aTimeOut : Cardinal);
-// Named Pipe CTOR
-begin
-  inherited Create;
-  ASSERT( aTimeout > 0);
-  FPipeName  := aPipename;
-  FBufsize   := aBufSize;
-  FMaxConns  := Max( 1, Min( PIPE_UNLIMITED_INSTANCES, aMaxConns));
-  FHandle    := INVALID_HANDLE_VALUE;
-  FTimeout   := aTimeOut;
-  FConnected := FALSE;
-
-  if Copy(FPipeName,1,2) <> '\\'
-  then FPipeName := '\\.\pipe\' + FPipeName;  // assume localhost
-end;
-
-
-function TNamedPipeServerTransportImpl.Accept(const fnAccepting: TProc): ITransport;
-var dwError, dwWait, dwDummy : DWORD;
-    overlapped : IOverlappedHelper;
-    handles : array[0..1] of THandle;
-begin
-  overlapped := TOverlappedHelperImpl.Create;
-
-  ASSERT( not FConnected);
-  CreateNamedPipe;
-  while not FConnected do begin
-
-    if QueryStopServer
-    then Abort;
-
-    if Assigned(fnAccepting)
-    then fnAccepting();
-
-    // Wait for the client to connect; if it succeeds, the
-    // function returns a nonzero value. If the function returns
-    // zero, GetLastError should return ERROR_PIPE_CONNECTED.
-    if ConnectNamedPipe( Handle, overlapped.OverlappedPtr) then begin
-      FConnected := TRUE;
-      Break;
-    end;
-
-    // ConnectNamedPipe() returns FALSE for OverlappedIO, even if connected.
-    // We have to check GetLastError() explicitly to find out
-    dwError := GetLastError;
-    case dwError of
-      ERROR_PIPE_CONNECTED : begin
-        FConnected := not QueryStopServer;  // special case: pipe immediately connected
-      end;
-
-      ERROR_IO_PENDING : begin
-        handles[0] := overlapped.WaitHandle;
-        handles[1] := FStopServer.Handle;
-        dwWait := WaitForMultipleObjects( 2, @handles, FALSE, FTimeout);
-        FConnected := (dwWait = WAIT_OBJECT_0)
-                  and GetOverlappedResult( Handle, overlapped.Overlapped, dwDummy, TRUE)
-                  and not QueryStopServer;
-      end;
-
-    else
-      InternalClose;
-      raise TTransportExceptionNotOpen.Create('Client connection failed');
-    end;
-  end;
-
-  // create the transport impl
-  result := CreateTransportInstance;
-end;
-
-
-function TNamedPipeServerTransportImpl.CreateTransportInstance : ITransport;
-// create the transport impl
-var hPipe : THandle;
-begin
-  hPipe := THandle( InterlockedExchangePointer( Pointer(FHandle), Pointer(INVALID_HANDLE_VALUE)));
-  try
-    FConnected := FALSE;
-    result := TNamedPipeTransportServerEndImpl.Create( hPipe, TRUE, FTimeout);
-  except
-    ClosePipeHandle(hPipe);
-    raise;
-  end;
-end;
-
-
-procedure TNamedPipeServerTransportImpl.InternalClose;
-var hPipe : THandle;
-begin
-  hPipe := THandle( InterlockedExchangePointer( Pointer(FHandle), Pointer(INVALID_HANDLE_VALUE)));
-  if hPipe = INVALID_HANDLE_VALUE then Exit;
-
-  try
-    if FConnected
-    then FlushFileBuffers( hPipe)
-    else CancelIo( hPipe);
-    DisconnectNamedPipe( hPipe);
-  finally
-    ClosePipeHandle( hPipe);
-    FConnected := FALSE;
-  end;
-end;
-
-
-function TNamedPipeServerTransportImpl.Handle : THandle;
-begin
-  {$IFDEF WIN64}
-  result := THandle( InterlockedExchangeAdd64( Int64(FHandle), 0));
-  {$ELSE}
-  result := THandle( InterlockedExchangeAdd( Integer(FHandle), 0));
-  {$ENDIF}
-end;
-
-
-function TNamedPipeServerTransportImpl.CreateNamedPipe : THandle;
-var SIDAuthWorld : SID_IDENTIFIER_AUTHORITY ;
-    everyone_sid : PSID;
-    ea           : EXPLICIT_ACCESS;
-    acl          : PACL;
-    sd           : PSECURITY_DESCRIPTOR;
-    sa           : SECURITY_ATTRIBUTES;
-const
-  SECURITY_WORLD_SID_AUTHORITY  : TSIDIdentifierAuthority = (Value : (0,0,0,0,0,1));
-  SECURITY_WORLD_RID = $00000000;
-begin
-  sd := nil;
-  everyone_sid := nil;
-  try
-    ASSERT( (FHandle = INVALID_HANDLE_VALUE) and not FConnected);
-
-    // Windows - set security to allow non-elevated apps
-    // to access pipes created by elevated apps.
-    SIDAuthWorld := SECURITY_WORLD_SID_AUTHORITY;
-    AllocateAndInitializeSid( SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, everyone_sid);
-
-    ZeroMemory( @ea, SizeOf(ea));
-    ea.grfAccessPermissions := GENERIC_ALL; //SPECIFIC_RIGHTS_ALL or STANDARD_RIGHTS_ALL;
-    ea.grfAccessMode        := SET_ACCESS;
-    ea.grfInheritance       := NO_INHERITANCE;
-    ea.Trustee.TrusteeForm  := TRUSTEE_IS_SID;
-    ea.Trustee.TrusteeType  := TRUSTEE_IS_WELL_KNOWN_GROUP;
-    ea.Trustee.ptstrName    := PChar(everyone_sid);
-
-    acl := nil;
-    SetEntriesInAcl( 1, @ea, nil, acl);
-
-    sd := PSECURITY_DESCRIPTOR( LocalAlloc( LPTR,SECURITY_DESCRIPTOR_MIN_LENGTH));
-    Win32Check( InitializeSecurityDescriptor( sd, SECURITY_DESCRIPTOR_REVISION));
-    Win32Check( SetSecurityDescriptorDacl( sd, TRUE, acl, FALSE));
-
-    sa.nLength := SizeOf(sa);
-    sa.lpSecurityDescriptor := sd;
-    sa.bInheritHandle       := FALSE;
-
-    // Create an instance of the named pipe
-    {$IFDEF OLD_UNIT_NAMES}
-    result := Windows.CreateNamedPipe(
-    {$ELSE}
-    result := Winapi.Windows.CreateNamedPipe(
-    {$ENDIF}
-        PChar( FPipeName),        // pipe name
-        PIPE_ACCESS_DUPLEX or     // read/write access
-        FILE_FLAG_OVERLAPPED,     // async mode
-        PIPE_TYPE_BYTE or         // byte type pipe
-        PIPE_READMODE_BYTE,       // byte read mode
-        FMaxConns,                // max. instances
-        FBufSize,                 // output buffer size
-        FBufSize,                 // input buffer size
-        FTimeout,                 // time-out, see MSDN
-        @sa                       // default security attribute
-    );
-
-    if( result <> INVALID_HANDLE_VALUE)
-    then InterlockedExchangePointer( Pointer(FHandle), Pointer(result))
-    else raise TTransportExceptionNotOpen.Create('CreateNamedPipe() failed ' + IntToStr(GetLastError));
-
-  finally
-    if sd <> nil then LocalFree( Cardinal( sd));
-    if acl <> nil then LocalFree( Cardinal( acl));
-    if everyone_sid <> nil then FreeSid(everyone_sid);
-  end;
-end;
-
-
-
-end.
-
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Transport.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Transport.pas
deleted file mode 100644
index 5dfb14e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Transport.pas
+++ /dev/null
@@ -1,1604 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-unit Thrift.Transport;
-
-{$I Thrift.Defines.inc}
-{$SCOPEDENUMS ON}
-
-interface
-
-uses
-  Classes,
-  SysUtils,
-  Math,
-  Generics.Collections,
-  {$IFDEF OLD_UNIT_NAMES}
-    ActiveX, msxml, WinSock, Sockets,
-  {$ELSE}
-    Winapi.ActiveX, Winapi.msxml, Winapi.WinSock,
-    {$IFDEF OLD_SOCKETS}
-      Web.Win.Sockets,
-    {$ELSE}
-      Thrift.Socket,
-    {$ENDIF}
-  {$ENDIF}
-  Thrift.Collections,
-  Thrift.Utils,
-  Thrift.Stream;
-
-type
-  ITransport = interface
-    ['{A4A9FC37-D620-44DC-AD21-662D16364CE4}']
-    function GetIsOpen: Boolean;
-    property IsOpen: Boolean read GetIsOpen;
-    function Peek: Boolean;
-    procedure Open;
-    procedure Close;
-    function Read(var buf: TBytes; off: Integer; len: Integer): Integer;
-    function ReadAll(var buf: TBytes; off: Integer; len: Integer): Integer;
-    procedure Write( const buf: TBytes); overload;
-    procedure Write( const buf: TBytes; off: Integer; len: Integer); overload;
-    procedure Flush;
-  end;
-
-  TTransportImpl = class( TInterfacedObject, ITransport)
-  protected
-    function GetIsOpen: Boolean; virtual; abstract;
-    property IsOpen: Boolean read GetIsOpen;
-    function Peek: Boolean; virtual;
-    procedure Open(); virtual; abstract;
-    procedure Close(); virtual; abstract;
-    function Read(var buf: TBytes; off: Integer; len: Integer): Integer; virtual; abstract;
-    function ReadAll(var buf: TBytes; off: Integer; len: Integer): Integer; virtual;
-    procedure Write( const buf: TBytes); overload; virtual;
-    procedure Write( const buf: TBytes; off: Integer; len: Integer); overload; virtual; abstract;
-    procedure Flush; virtual;
-  end;
-
-  TTransportException = class( Exception )
-  public
-    type
-      TExceptionType = (
-        Unknown,
-        NotOpen,
-        AlreadyOpen,
-        TimedOut,
-        EndOfFile,
-        BadArgs,
-        Interrupted
-      );
-  private
-    function GetType: TExceptionType;
-  protected
-    constructor HiddenCreate(const Msg: string);
-  public
-    class function Create( AType: TExceptionType): TTransportException; overload; deprecated 'Use specialized TTransportException types (or regenerate from IDL)';
-    class function Create( const msg: string): TTransportException; reintroduce; overload; deprecated 'Use specialized TTransportException types (or regenerate from IDL)';
-    class function Create( AType: TExceptionType; const msg: string): TTransportException; overload; deprecated 'Use specialized TTransportException types (or regenerate from IDL)';
-    property Type_: TExceptionType read GetType;
-  end;
-
-  // Needed to remove deprecation warning
-  TTransportExceptionSpecialized = class abstract (TTransportException)
-  public
-    constructor Create(const Msg: string);
-  end;
-
-  TTransportExceptionUnknown = class (TTransportExceptionSpecialized);
-  TTransportExceptionNotOpen = class (TTransportExceptionSpecialized);
-  TTransportExceptionAlreadyOpen = class (TTransportExceptionSpecialized);
-  TTransportExceptionTimedOut = class (TTransportExceptionSpecialized);
-  TTransportExceptionEndOfFile = class (TTransportExceptionSpecialized);
-  TTransportExceptionBadArgs = class (TTransportExceptionSpecialized);
-  TTransportExceptionInterrupted = class (TTransportExceptionSpecialized);
-
-  IHTTPClient = interface( ITransport )
-    ['{0F5DB8AB-710D-4338-AAC9-46B5734C5057}']
-    procedure SetConnectionTimeout(const Value: Integer);
-    function GetConnectionTimeout: Integer;
-    procedure SetReadTimeout(const Value: Integer);
-    function GetReadTimeout: Integer;
-    function GetCustomHeaders: IThriftDictionary<string,string>;
-    procedure SendRequest;
-    property ConnectionTimeout: Integer read GetConnectionTimeout write SetConnectionTimeout;
-    property ReadTimeout: Integer read GetReadTimeout write SetReadTimeout;
-    property CustomHeaders: IThriftDictionary<string,string> read GetCustomHeaders;
-  end;
-
-  THTTPClientImpl = class( TTransportImpl, IHTTPClient)
-  private
-    FUri : string;
-    FInputStream : IThriftStream;
-    FOutputStream : IThriftStream;
-    FConnectionTimeout : Integer;
-    FReadTimeout : Integer;
-    FCustomHeaders : IThriftDictionary<string,string>;
-
-    function CreateRequest: IXMLHTTPRequest;
-  protected
-    function GetIsOpen: Boolean; override;
-    procedure Open(); override;
-    procedure Close(); override;
-    function Read( var buf: TBytes; off: Integer; len: Integer): Integer; override;
-    procedure Write( const buf: TBytes; off: Integer; len: Integer); override;
-    procedure Flush; override;
-
-    procedure SetConnectionTimeout(const Value: Integer);
-    function GetConnectionTimeout: Integer;
-    procedure SetReadTimeout(const Value: Integer);
-    function GetReadTimeout: Integer;
-    function GetCustomHeaders: IThriftDictionary<string,string>;
-    procedure SendRequest;
-    property ConnectionTimeout: Integer read GetConnectionTimeout write SetConnectionTimeout;
-    property ReadTimeout: Integer read GetReadTimeout write SetReadTimeout;
-    property CustomHeaders: IThriftDictionary<string,string> read GetCustomHeaders;
-  public
-    constructor Create( const AUri: string);
-    destructor Destroy; override;
-  end;
-
-  IServerTransport = interface
-    ['{C43B87ED-69EA-47C4-B77C-15E288252900}']
-    procedure Listen;
-    procedure Close;
-    function Accept( const fnAccepting: TProc): ITransport;
-  end;
-
-  TServerTransportImpl = class( TInterfacedObject, IServerTransport)
-  protected
-    procedure Listen; virtual; abstract;
-    procedure Close; virtual; abstract;
-    function Accept( const fnAccepting: TProc): ITransport;  virtual; abstract;
-  end;
-
-  ITransportFactory = interface
-    ['{DD809446-000F-49E1-9BFF-E0D0DC76A9D7}']
-    function GetTransport( const ATrans: ITransport): ITransport;
-  end;
-
-  TTransportFactoryImpl = class( TInterfacedObject, ITransportFactory)
-    function GetTransport( const ATrans: ITransport): ITransport; virtual;
-  end;
-
-  TTcpSocketStreamImpl = class( TThriftStreamImpl )
-{$IFDEF OLD_SOCKETS}
-  private type
-    TWaitForData = ( wfd_HaveData, wfd_Timeout, wfd_Error);
-  private
-    FTcpClient : TCustomIpClient;
-    FTimeout : Integer;
-    function Select( ReadReady, WriteReady, ExceptFlag: PBoolean;
-                     TimeOut: Integer; var wsaError : Integer): Integer;
-    function WaitForData( TimeOut : Integer; pBuf : Pointer; DesiredBytes: Integer;
-                          var wsaError, bytesReady : Integer): TWaitForData;
-{$ELSE}
-    FTcpClient: TSocket;
-  protected const
-    SLEEP_TIME = 200;
-{$ENDIF}
-  protected
-    procedure Write( const buffer: TBytes; offset: Integer; count: Integer); override;
-    function Read( var buffer: TBytes; offset: Integer; count: Integer): Integer; override;
-    procedure Open; override;
-    procedure Close; override;
-    procedure Flush; override;
-
-    function IsOpen: Boolean; override;
-    function ToArray: TBytes; override;
-  public
-{$IFDEF OLD_SOCKETS}
-    constructor Create( const ATcpClient: TCustomIpClient; const aTimeout : Integer = 0);
-{$ELSE}
-    constructor Create( const ATcpClient: TSocket; const aTimeout : Longword = 0);
-{$ENDIF}
-  end;
-
-  IStreamTransport = interface( ITransport )
-    ['{A8479B47-2A3E-4421-A9A0-D5A9EDCC634A}']
-    function GetInputStream: IThriftStream;
-    function GetOutputStream: IThriftStream;
-    property InputStream : IThriftStream read GetInputStream;
-    property OutputStream : IThriftStream read GetOutputStream;
-  end;
-
-  TStreamTransportImpl = class( TTransportImpl, IStreamTransport)
-  protected
-    FInputStream : IThriftStream;
-    FOutputStream : IThriftStream;
-  protected
-    function GetIsOpen: Boolean; override;
-
-    function GetInputStream: IThriftStream;
-    function GetOutputStream: IThriftStream;
-  public
-    property InputStream : IThriftStream read GetInputStream;
-    property OutputStream : IThriftStream read GetOutputStream;
-
-    procedure Open; override;
-    procedure Close; override;
-    procedure Flush; override;
-    function Read(var buf: TBytes; off: Integer; len: Integer): Integer; override;
-    procedure Write( const buf: TBytes; off: Integer; len: Integer); override;
-    constructor Create( const AInputStream : IThriftStream; const AOutputStream : IThriftStream);
-    destructor Destroy; override;
-  end;
-
-  TBufferedStreamImpl = class( TThriftStreamImpl)
-  private
-    FStream : IThriftStream;
-    FBufSize : Integer;
-    FReadBuffer : TMemoryStream;
-    FWriteBuffer : TMemoryStream;
-  protected
-    procedure Write( const buffer: TBytes; offset: Integer; count: Integer); override;
-    function Read( var buffer: TBytes; offset: Integer; count: Integer): Integer; override;
-    procedure Open;  override;
-    procedure Close; override;
-    procedure Flush; override;
-    function IsOpen: Boolean; override;
-    function ToArray: TBytes; override;
-  public
-    constructor Create( const AStream: IThriftStream; ABufSize: Integer);
-    destructor Destroy; override;
-  end;
-
-  TServerSocketImpl = class( TServerTransportImpl)
-  private
-{$IFDEF OLD_SOCKETS}
-    FServer : TTcpServer;
-    FPort : Integer;
-    FClientTimeout : Integer;
-{$ELSE}
-    FServer: TServerSocket;
-{$ENDIF}
-    FUseBufferedSocket : Boolean;
-    FOwnsServer : Boolean;
-  protected
-    function Accept( const fnAccepting: TProc) : ITransport; override;
-  public
-{$IFDEF OLD_SOCKETS}
-    constructor Create( const AServer: TTcpServer; AClientTimeout: Integer = 0); overload;
-    constructor Create( APort: Integer; AClientTimeout: Integer = 0; AUseBufferedSockets: Boolean = FALSE); overload;
-{$ELSE}
-    constructor Create( const AServer: TServerSocket; AClientTimeout: Longword = 0); overload;
-    constructor Create( APort: Integer; AClientTimeout: Longword = 0; AUseBufferedSockets: Boolean = FALSE); overload;
-{$ENDIF}
-    destructor Destroy; override;
-    procedure Listen; override;
-    procedure Close; override;
-  end;
-
-  TBufferedTransportImpl = class( TTransportImpl )
-  private
-    FInputBuffer : IThriftStream;
-    FOutputBuffer : IThriftStream;
-    FTransport : IStreamTransport;
-    FBufSize : Integer;
-
-    procedure InitBuffers;
-    function GetUnderlyingTransport: ITransport;
-  protected
-    function GetIsOpen: Boolean; override;
-    procedure Flush; override;
-  public
-    procedure Open(); override;
-    procedure Close(); override;
-    function Read(var buf: TBytes; off: Integer; len: Integer): Integer; override;
-    procedure Write( const buf: TBytes; off: Integer; len: Integer); override;
-    constructor Create( const ATransport : IStreamTransport ); overload;
-    constructor Create( const ATransport : IStreamTransport; ABufSize: Integer); overload;
-    property UnderlyingTransport: ITransport read GetUnderlyingTransport;
-    property IsOpen: Boolean read GetIsOpen;
-  end;
-
-  TSocketImpl = class(TStreamTransportImpl)
-  private
-{$IFDEF OLD_SOCKETS}
-    FClient : TCustomIpClient;
-{$ELSE}
-    FClient: TSocket;
-{$ENDIF}
-    FOwnsClient : Boolean;
-    FHost : string;
-    FPort : Integer;
-{$IFDEF OLD_SOCKETS}
-    FTimeout : Integer;
-{$ELSE}
-    FTimeout : Longword;
-{$ENDIF}
-
-    procedure InitSocket;
-  protected
-    function GetIsOpen: Boolean; override;
-  public
-    procedure Open; override;
-{$IFDEF OLD_SOCKETS}
-    constructor Create( const AClient : TCustomIpClient; aOwnsClient : Boolean; ATimeout: Integer = 0); overload;
-    constructor Create( const AHost: string; APort: Integer; ATimeout: Integer = 0); overload;
-{$ELSE}
-    constructor Create(const AClient: TSocket; aOwnsClient: Boolean); overload;
-    constructor Create( const AHost: string; APort: Integer; ATimeout: Longword = 0); overload;
-{$ENDIF}
-    destructor Destroy; override;
-    procedure Close; override;
-{$IFDEF OLD_SOCKETS}
-    property TcpClient: TCustomIpClient read FClient;
-{$ELSE}
-    property TcpClient: TSocket read FClient;
-{$ENDIF}
-    property Host : string read FHost;
-    property Port: Integer read FPort;
-  end;
-
-  TFramedTransportImpl = class( TTransportImpl)
-  private const
-    FHeaderSize : Integer = 4;
-  private class var
-    FHeader_Dummy : array of Byte;
-  protected
-    FTransport : ITransport;
-    FWriteBuffer : TMemoryStream;
-    FReadBuffer : TMemoryStream;
-
-    procedure InitWriteBuffer;
-    procedure ReadFrame;
-  public
-    type
-      TFactory = class( TTransportFactoryImpl )
-      public
-        function GetTransport( const ATrans: ITransport): ITransport; override;
-      end;
-
-    {$IFDEF HAVE_CLASS_CTOR}
-    class constructor Create;
-    {$ENDIF}
-
-    constructor Create; overload;
-    constructor Create( const ATrans: ITransport); overload;
-    destructor Destroy; override;
-
-    procedure Open(); override;
-    function GetIsOpen: Boolean; override;
-
-    procedure Close(); override;
-    function Read(var buf: TBytes; off: Integer; len: Integer): Integer; override;
-    procedure Write( const buf: TBytes; off: Integer; len: Integer); override;
-    procedure Flush; override;
-  end;
-
-{$IFNDEF HAVE_CLASS_CTOR}
-procedure TFramedTransportImpl_Initialize;
-{$ENDIF}
-
-const
-  DEFAULT_THRIFT_TIMEOUT = 5 * 1000; // ms
-
-
-implementation
-
-{ TTransportImpl }
-
-procedure TTransportImpl.Flush;
-begin
-  // nothing to do
-end;
-
-function TTransportImpl.Peek: Boolean;
-begin
-  Result := IsOpen;
-end;
-
-function TTransportImpl.ReadAll( var buf: TBytes; off, len: Integer): Integer;
-var
-  got : Integer;
-  ret : Integer;
-begin
-  got := 0;
-  while got < len do begin
-    ret := Read( buf, off + got, len - got);
-    if ret > 0 
-    then Inc( got, ret)
-    else raise TTransportExceptionNotOpen.Create( 'Cannot read, Remote side has closed' );
-  end;
-  Result := got;
-end;
-
-procedure TTransportImpl.Write( const buf: TBytes);
-begin
-  Self.Write( buf, 0, Length(buf) );
-end;
-
-{ THTTPClientImpl }
-
-procedure THTTPClientImpl.Close;
-begin
-  FInputStream := nil;
-  FOutputStream := nil;
-end;
-
-constructor THTTPClientImpl.Create(const AUri: string);
-begin
-  inherited Create;
-  FUri := AUri;
-  FCustomHeaders := TThriftDictionaryImpl<string,string>.Create;
-  FOutputStream := TThriftStreamAdapterDelphi.Create( TMemoryStream.Create, True);
-end;
-
-function THTTPClientImpl.CreateRequest: IXMLHTTPRequest;
-var
-  pair : TPair<string,string>;
-begin
-  {$IF CompilerVersion >= 21.0}
-  Result := CoXMLHTTP.Create;
-  {$ELSE}
-  Result := CoXMLHTTPRequest.Create;
-  {$IFEND}
-
-  Result.open('POST', FUri, False, '', '');
-  Result.setRequestHeader( 'Content-Type', 'application/x-thrift');
-  Result.setRequestHeader( 'Accept', 'application/x-thrift');
-  Result.setRequestHeader( 'User-Agent', 'Delphi/IHTTPClient');
-
-  for pair in FCustomHeaders do begin
-    Result.setRequestHeader( pair.Key, pair.Value );
-  end;
-end;
-
-destructor THTTPClientImpl.Destroy;
-begin
-  Close;
-  inherited;
-end;
-
-procedure THTTPClientImpl.Flush;
-begin
-  try
-    SendRequest;
-  finally
-    FOutputStream := nil;
-    FOutputStream := TThriftStreamAdapterDelphi.Create( TMemoryStream.Create, True);
-  end;
-end;
-
-function THTTPClientImpl.GetConnectionTimeout: Integer;
-begin
-  Result := FConnectionTimeout;
-end;
-
-function THTTPClientImpl.GetCustomHeaders: IThriftDictionary<string,string>;
-begin
-  Result := FCustomHeaders;
-end;
-
-function THTTPClientImpl.GetIsOpen: Boolean;
-begin
-  Result := True;
-end;
-
-function THTTPClientImpl.GetReadTimeout: Integer;
-begin
-  Result := FReadTimeout;
-end;
-
-procedure THTTPClientImpl.Open;
-begin
-  // nothing to do
-end;
-
-function THTTPClientImpl.Read( var buf: TBytes; off, len: Integer): Integer;
-begin
-  if FInputStream = nil then begin
-    raise TTransportExceptionNotOpen.Create('No request has been sent');
-  end;
-
-  try
-    Result := FInputStream.Read( buf, off, len )
-  except
-    on E: Exception
-    do raise TTransportExceptionUnknown.Create(E.Message);
-  end;
-end;
-
-procedure THTTPClientImpl.SendRequest;
-var
-  xmlhttp : IXMLHTTPRequest;
-  ms : TMemoryStream;
-  a : TBytes;
-  len : Integer;
-begin
-  xmlhttp := CreateRequest;
-
-  ms := TMemoryStream.Create;
-  try
-    a := FOutputStream.ToArray;
-    len := Length(a);
-    if len > 0 then begin
-      ms.WriteBuffer( Pointer(@a[0])^, len);
-    end;
-    ms.Position := 0;
-    xmlhttp.send( IUnknown( TStreamAdapter.Create( ms, soReference )));
-    FInputStream := nil;
-    FInputStream := TThriftStreamAdapterCOM.Create( IUnknown( xmlhttp.responseStream) as IStream);
-  finally
-    ms.Free;
-  end;
-end;
-
-procedure THTTPClientImpl.SetConnectionTimeout(const Value: Integer);
-begin
-  FConnectionTimeout := Value;
-end;
-
-procedure THTTPClientImpl.SetReadTimeout(const Value: Integer);
-begin
-  FReadTimeout := Value
-end;
-
-procedure THTTPClientImpl.Write( const buf: TBytes; off, len: Integer);
-begin
-  FOutputStream.Write( buf, off, len);
-end;
-
-{ TTransportException }
-
-function TTransportException.GetType: TExceptionType;
-begin
-  if Self is TTransportExceptionNotOpen then Result := TExceptionType.NotOpen
-  else if Self is TTransportExceptionAlreadyOpen then Result := TExceptionType.AlreadyOpen
-  else if Self is TTransportExceptionTimedOut then Result := TExceptionType.TimedOut
-  else if Self is TTransportExceptionEndOfFile then Result := TExceptionType.EndOfFile
-  else if Self is TTransportExceptionBadArgs then Result := TExceptionType.BadArgs
-  else if Self is TTransportExceptionInterrupted then Result := TExceptionType.Interrupted
-  else Result := TExceptionType.Unknown;
-end;
-
-constructor TTransportException.HiddenCreate(const Msg: string);
-begin
-  inherited Create(Msg);
-end;
-
-class function TTransportException.Create(AType: TExceptionType): TTransportException;
-begin
-  //no inherited;
-{$WARN SYMBOL_DEPRECATED OFF}
-  Result := Create(AType, '')
-{$WARN SYMBOL_DEPRECATED DEFAULT}
-end;
-
-class function TTransportException.Create(AType: TExceptionType;
-  const msg: string): TTransportException;
-begin
-  case AType of
-    TExceptionType.NotOpen:     Result := TTransportExceptionNotOpen.Create(msg);
-    TExceptionType.AlreadyOpen: Result := TTransportExceptionAlreadyOpen.Create(msg);
-    TExceptionType.TimedOut:    Result := TTransportExceptionTimedOut.Create(msg);
-    TExceptionType.EndOfFile:   Result := TTransportExceptionEndOfFile.Create(msg);
-    TExceptionType.BadArgs:     Result := TTransportExceptionBadArgs.Create(msg);
-    TExceptionType.Interrupted: Result := TTransportExceptionInterrupted.Create(msg);
-  else
-    Result := TTransportExceptionUnknown.Create(msg);
-  end;
-end;
-
-class function TTransportException.Create(const msg: string): TTransportException;
-begin
-  Result := TTransportExceptionUnknown.Create(Msg);
-end;
-
-{ TTransportExceptionSpecialized }
-
-constructor TTransportExceptionSpecialized.Create(const Msg: string);
-begin
-  inherited HiddenCreate(Msg);
-end;
-
-{ TTransportFactoryImpl }
-
-function TTransportFactoryImpl.GetTransport( const ATrans: ITransport): ITransport;
-begin
-  Result := ATrans;
-end;
-
-{ TServerSocket }
-
-{$IFDEF OLD_SOCKETS}
-constructor TServerSocketImpl.Create( const AServer: TTcpServer; AClientTimeout: Integer);
-begin
-  inherited Create;
-  FServer := AServer;
-  FClientTimeout := AClientTimeout;
-end;
-{$ELSE}
-constructor TServerSocketImpl.Create( const AServer: TServerSocket; AClientTimeout: Longword);
-begin
-  inherited Create;
-  FServer := AServer;
-  FServer.RecvTimeout := AClientTimeout;
-  FServer.SendTimeout := AClientTimeout;
-end;
-{$ENDIF}
-
-{$IFDEF OLD_SOCKETS}
-constructor TServerSocketImpl.Create(APort, AClientTimeout: Integer; AUseBufferedSockets: Boolean);
-{$ELSE}
-constructor TServerSocketImpl.Create(APort: Integer; AClientTimeout: Longword; AUseBufferedSockets: Boolean);
-{$ENDIF}
-begin
-  inherited Create;
-{$IFDEF OLD_SOCKETS}
-  FPort := APort;
-  FClientTimeout := AClientTimeout;
-  FServer := TTcpServer.Create( nil );
-  FServer.BlockMode := bmBlocking;
-  {$IF CompilerVersion >= 21.0}
-  FServer.LocalPort := AnsiString( IntToStr( FPort));
-  {$ELSE}
-  FServer.LocalPort := IntToStr( FPort);
-  {$IFEND}
-{$ELSE}
-  FServer := TServerSocket.Create(APort, AClientTimeout, AClientTimeout);
-{$ENDIF}
-  FUseBufferedSocket := AUseBufferedSockets;
-  FOwnsServer := True;
-end;
-
-destructor TServerSocketImpl.Destroy;
-begin
-  if FOwnsServer then begin
-    FServer.Free;
-    FServer := nil;
-  end;
-  inherited;
-end;
-
-function TServerSocketImpl.Accept( const fnAccepting: TProc): ITransport;
-var
-{$IFDEF OLD_SOCKETS}
-  client : TCustomIpClient;
-{$ELSE}
-  client: TSocket;
-{$ENDIF}
-  trans  : IStreamTransport;
-begin
-  if FServer = nil then begin
-    raise TTransportExceptionNotOpen.Create('No underlying server socket.');
-  end;
-
-{$IFDEF OLD_SOCKETS}
-  client := nil;
-  try
-    client := TCustomIpClient.Create(nil);
-
-    if Assigned(fnAccepting)
-    then fnAccepting();
-
-    if not FServer.Accept( client) then begin
-      client.Free;
-      Result := nil;
-      Exit;
-    end;
-
-    if client = nil then begin
-      Result := nil;
-      Exit;
-    end;
-
-    trans := TSocketImpl.Create( client, TRUE, FClientTimeout);
-    client := nil;  // trans owns it now
-
-    if FUseBufferedSocket
-    then result := TBufferedTransportImpl.Create( trans)
-    else result := trans;
-
-  except
-    on E: Exception do begin
-      client.Free;
-      raise TTransportExceptionUnknown.Create(E.ToString);
-    end;
-  end;
-{$ELSE}
-  if Assigned(fnAccepting) then
-    fnAccepting();
-
-  client := FServer.Accept;
-  try
-    trans := TSocketImpl.Create(client, True);
-    client := nil;
-
-    if FUseBufferedSocket then
-      Result := TBufferedTransportImpl.Create(trans)
-    else
-      Result := trans;
-  except
-    client.Free;
-    raise;
-  end;
-{$ENDIF}
-end;
-
-procedure TServerSocketImpl.Listen;
-begin
-  if FServer <> nil then
-  begin
-{$IFDEF OLD_SOCKETS}
-    try
-      FServer.Active := True;
-    except
-      on E: Exception
-      do raise TTransportExceptionUnknown.Create('Could not accept on listening socket: ' + E.Message);
-    end;
-{$ELSE}
-    FServer.Listen;
-{$ENDIF}
-  end;
-end;
-
-procedure TServerSocketImpl.Close;
-begin
-  if FServer <> nil then
-{$IFDEF OLD_SOCKETS}
-    try
-      FServer.Active := False;
-    except
-      on E: Exception
-      do raise TTransportExceptionUnknown.Create('Error on closing socket : ' + E.Message);
-    end;
-{$ELSE}
-    FServer.Close;
-{$ENDIF}
-end;
-
-{ TSocket }
-
-{$IFDEF OLD_SOCKETS}
-constructor TSocketImpl.Create( const AClient : TCustomIpClient; aOwnsClient : Boolean; ATimeout: Integer = 0);
-var stream : IThriftStream;
-begin
-  FClient := AClient;
-  FTimeout := ATimeout;
-  FOwnsClient := aOwnsClient;
-  stream := TTcpSocketStreamImpl.Create( FClient, FTimeout);
-  inherited Create( stream, stream);
-end;
-{$ELSE}
-constructor TSocketImpl.Create(const AClient: TSocket; aOwnsClient: Boolean);
-var stream : IThriftStream;
-begin
-  FClient := AClient;
-  FTimeout := AClient.RecvTimeout;
-  FOwnsClient := aOwnsClient;
-  stream := TTcpSocketStreamImpl.Create(FClient, FTimeout);
-  inherited Create(stream, stream);
-end;
-{$ENDIF}
-
-{$IFDEF OLD_SOCKETS}
-constructor TSocketImpl.Create(const AHost: string; APort, ATimeout: Integer);
-{$ELSE}
-constructor TSocketImpl.Create(const AHost: string; APort: Integer; ATimeout: Longword);
-{$ENDIF}
-begin
-  inherited Create(nil,nil);
-  FHost := AHost;
-  FPort := APort;
-  FTimeout := ATimeout;
-  InitSocket;
-end;
-
-destructor TSocketImpl.Destroy;
-begin
-  if FOwnsClient
-  then FreeAndNil( FClient);
-  inherited;
-end;
-
-procedure TSocketImpl.Close;
-begin
-  inherited Close;
-  if FOwnsClient
-  then FreeAndNil( FClient);
-end;
-
-function TSocketImpl.GetIsOpen: Boolean;
-begin
-{$IFDEF OLD_SOCKETS}
-  Result := (FClient <> nil) and FClient.Connected;
-{$ELSE}
-  Result := (FClient <> nil) and FClient.IsOpen
-{$ENDIF}
-end;
-
-procedure TSocketImpl.InitSocket;
-var
-  stream : IThriftStream;
-begin
-  if FOwnsClient
-  then FreeAndNil( FClient)
-  else FClient := nil;
-
-{$IFDEF OLD_SOCKETS}
-  FClient := TTcpClient.Create( nil);
-{$ELSE}
-  FClient := TSocket.Create(FHost, FPort);
-{$ENDIF}
-  FOwnsClient := True;
-
-  stream := TTcpSocketStreamImpl.Create( FClient, FTimeout);
-  FInputStream := stream;
-  FOutputStream := stream;
-end;
-
-procedure TSocketImpl.Open;
-begin
-  if IsOpen then begin
-    raise TTransportExceptionAlreadyOpen.Create('Socket already connected');
-  end;
-
-  if FHost = '' then begin
-    raise TTransportExceptionNotOpen.Create('Cannot open null host');
-  end;
-
-  if Port <= 0 then begin
-    raise TTransportExceptionNotOpen.Create('Cannot open without port');
-  end;
-
-  if FClient = nil
-  then InitSocket;
-
-{$IFDEF OLD_SOCKETS}
-  FClient.RemoteHost := TSocketHost( Host);
-  FClient.RemotePort := TSocketPort( IntToStr( Port));
-  FClient.Connect;
-{$ELSE}
-  FClient.Open;
-{$ENDIF}
-
-  FInputStream := TTcpSocketStreamImpl.Create( FClient, FTimeout);
-  FOutputStream := FInputStream;
-end;
-
-{ TBufferedStream }
-
-procedure TBufferedStreamImpl.Close;
-begin
-  Flush;
-  FStream := nil;
-
-  FReadBuffer.Free;
-  FReadBuffer := nil;
-
-  FWriteBuffer.Free;
-  FWriteBuffer := nil;
-end;
-
-constructor TBufferedStreamImpl.Create( const AStream: IThriftStream; ABufSize: Integer);
-begin
-  inherited Create;
-  FStream := AStream;
-  FBufSize := ABufSize;
-  FReadBuffer := TMemoryStream.Create;
-  FWriteBuffer := TMemoryStream.Create;
-end;
-
-destructor TBufferedStreamImpl.Destroy;
-begin
-  Close;
-  inherited;
-end;
-
-procedure TBufferedStreamImpl.Flush;
-var
-  buf : TBytes;
-  len : Integer;
-begin
-  if IsOpen then begin
-    len := FWriteBuffer.Size;
-    if len > 0 then begin
-      SetLength( buf, len );
-      FWriteBuffer.Position := 0;
-      FWriteBuffer.Read( Pointer(@buf[0])^, len );
-      FStream.Write( buf, 0, len );
-    end;
-    FWriteBuffer.Clear;
-  end;
-end;
-
-function TBufferedStreamImpl.IsOpen: Boolean;
-begin
-  Result := (FWriteBuffer <> nil)
-        and (FReadBuffer <> nil)
-        and (FStream <> nil);
-end;
-
-procedure TBufferedStreamImpl.Open;
-begin
-  // nothing to do
-end;
-
-function TBufferedStreamImpl.Read( var buffer: TBytes; offset: Integer; count: Integer): Integer;
-var
-  nRead : Integer;
-  tempbuf : TBytes;
-begin
-  inherited;
-  Result := 0;
-  
-  if IsOpen then begin
-    while count > 0 do begin
-
-      if FReadBuffer.Position >= FReadBuffer.Size then begin
-        FReadBuffer.Clear;
-        SetLength( tempbuf, FBufSize);
-        nRead := FStream.Read( tempbuf, 0, FBufSize );
-        if nRead = 0 then Break; // avoid infinite loop
-
-        FReadBuffer.WriteBuffer( Pointer(@tempbuf[0])^, nRead );
-        FReadBuffer.Position := 0;
-      end;
-
-      if FReadBuffer.Position < FReadBuffer.Size then begin
-        nRead  := Min( FReadBuffer.Size - FReadBuffer.Position, count);
-        Inc( Result, FReadBuffer.Read( Pointer(@buffer[offset])^, nRead));
-        Dec( count, nRead);
-        Inc( offset, nRead);
-      end;
-    end;
-  end;
-end;
-
-function TBufferedStreamImpl.ToArray: TBytes;
-var len : Integer;
-begin
-  len := 0;
-
-  if IsOpen then begin
-    len := FReadBuffer.Size;
-  end;
-
-  SetLength( Result, len);
-
-  if len > 0 then begin
-    FReadBuffer.Position := 0;
-    FReadBuffer.Read( Pointer(@Result[0])^, len );
-  end;
-end;
-
-procedure TBufferedStreamImpl.Write( const buffer: TBytes; offset: Integer; count: Integer);
-begin
-  inherited;
-  if count > 0 then begin
-    if IsOpen then begin
-      FWriteBuffer.Write( Pointer(@buffer[offset])^, count );
-      if FWriteBuffer.Size > FBufSize then begin
-        Flush;
-      end;
-    end;
-  end;
-end;
-
-{ TStreamTransportImpl }
-
-procedure TStreamTransportImpl.Close;
-begin
-  FInputStream := nil;
-  FOutputStream := nil;
-end;
-
-constructor TStreamTransportImpl.Create( const AInputStream : IThriftStream; const AOutputStream : IThriftStream);
-begin
-  inherited Create;
-  FInputStream := AInputStream;
-  FOutputStream := AOutputStream;
-end;
-
-destructor TStreamTransportImpl.Destroy;
-begin
-  FInputStream := nil;
-  FOutputStream := nil;
-  inherited;
-end;
-
-procedure TStreamTransportImpl.Flush;
-begin
-  if FOutputStream = nil then begin
-    raise TTransportExceptionNotOpen.Create('Cannot flush null outputstream' );
-  end;
-
-  FOutputStream.Flush;
-end;
-
-function TStreamTransportImpl.GetInputStream: IThriftStream;
-begin
-  Result := FInputStream;
-end;
-
-function TStreamTransportImpl.GetIsOpen: Boolean;
-begin
-  Result := True;
-end;
-
-function TStreamTransportImpl.GetOutputStream: IThriftStream;
-begin
-  Result := FInputStream;
-end;
-
-procedure TStreamTransportImpl.Open;
-begin
-
-end;
-
-function TStreamTransportImpl.Read(var buf: TBytes; off, len: Integer): Integer;
-begin
-  if FInputStream = nil then begin
-    raise TTransportExceptionNotOpen.Create('Cannot read from null inputstream' );
-  end;
-
-  Result := FInputStream.Read( buf, off, len );
-end;
-
-procedure TStreamTransportImpl.Write(const buf: TBytes; off, len: Integer);
-begin
-  if FOutputStream = nil then begin
-    raise TTransportExceptionNotOpen.Create('Cannot write to null outputstream' );
-  end;
-
-  FOutputStream.Write( buf, off, len );
-end;
-
-{ TBufferedTransportImpl }
-
-constructor TBufferedTransportImpl.Create( const ATransport: IStreamTransport);
-begin
-  //no inherited;
-  Create( ATransport, 1024 );
-end;
-
-procedure TBufferedTransportImpl.Close;
-begin
-  FTransport.Close;
-end;
-
-constructor TBufferedTransportImpl.Create( const ATransport: IStreamTransport;  ABufSize: Integer);
-begin
-  inherited Create;
-  FTransport := ATransport;
-  FBufSize := ABufSize;
-  InitBuffers;
-end;
-
-procedure TBufferedTransportImpl.Flush;
-begin
-  if FOutputBuffer <> nil then begin
-    FOutputBuffer.Flush;
-  end;
-end;
-
-function TBufferedTransportImpl.GetIsOpen: Boolean;
-begin
-  Result := FTransport.IsOpen;
-end;
-
-function TBufferedTransportImpl.GetUnderlyingTransport: ITransport;
-begin
-  Result := FTransport;
-end;
-
-procedure TBufferedTransportImpl.InitBuffers;
-begin
-  if FTransport.InputStream <> nil then begin
-    FInputBuffer := TBufferedStreamImpl.Create( FTransport.InputStream, FBufSize );
-  end;
-  if FTransport.OutputStream <> nil then begin
-    FOutputBuffer := TBufferedStreamImpl.Create( FTransport.OutputStream, FBufSize );
-  end;
-end;
-
-procedure TBufferedTransportImpl.Open;
-begin
-  FTransport.Open
-end;
-
-function TBufferedTransportImpl.Read(var buf: TBytes; off, len: Integer): Integer;
-begin
-  Result := 0;
-  if FInputBuffer <> nil then begin
-    Result := FInputBuffer.Read( buf, off, len );
-  end;
-end;
-
-procedure TBufferedTransportImpl.Write(const buf: TBytes; off, len: Integer);
-begin
-  if FOutputBuffer <> nil then begin
-    FOutputBuffer.Write( buf, off, len );
-  end;
-end;
-
-{ TFramedTransportImpl }
-
-{$IFDEF HAVE_CLASS_CTOR}
-class constructor TFramedTransportImpl.Create;
-begin
-  SetLength( FHeader_Dummy, FHeaderSize);
-  FillChar( FHeader_Dummy[0], Length( FHeader_Dummy) * SizeOf( Byte ), 0);
-end;
-{$ELSE}
-procedure TFramedTransportImpl_Initialize;
-begin
-  SetLength( TFramedTransportImpl.FHeader_Dummy, TFramedTransportImpl.FHeaderSize);
-  FillChar( TFramedTransportImpl.FHeader_Dummy[0],
-    Length( TFramedTransportImpl.FHeader_Dummy) * SizeOf( Byte ), 0);
-end;
-{$ENDIF}
-
-constructor TFramedTransportImpl.Create;
-begin
-  inherited Create;
-  InitWriteBuffer;
-end;
-
-procedure TFramedTransportImpl.Close;
-begin
-  FTransport.Close;
-end;
-
-constructor TFramedTransportImpl.Create( const ATrans: ITransport);
-begin
-  inherited Create;
-  InitWriteBuffer;
-  FTransport := ATrans;
-end;
-
-destructor TFramedTransportImpl.Destroy;
-begin
-  FWriteBuffer.Free;
-  FReadBuffer.Free;
-  inherited;
-end;
-
-procedure TFramedTransportImpl.Flush;
-var
-  buf : TBytes;
-  len : Integer;
-  data_len : Integer;
-
-begin
-  len := FWriteBuffer.Size;
-  SetLength( buf, len);
-  if len > 0 then begin
-    System.Move( FWriteBuffer.Memory^, buf[0], len );
-  end;
-
-  data_len := len - FHeaderSize;
-  if (data_len < 0) then begin
-    raise TTransportExceptionUnknown.Create('TFramedTransport.Flush: data_len < 0' );
-  end;
-
-  InitWriteBuffer;
-
-  buf[0] := Byte($FF and (data_len shr 24));
-  buf[1] := Byte($FF and (data_len shr 16));
-  buf[2] := Byte($FF and (data_len shr 8));
-  buf[3] := Byte($FF and data_len);
-
-  FTransport.Write( buf, 0, len );
-  FTransport.Flush;
-end;
-
-function TFramedTransportImpl.GetIsOpen: Boolean;
-begin
-  Result := FTransport.IsOpen;
-end;
-
-type
-  TAccessMemoryStream = class(TMemoryStream)
-  end;
-
-procedure TFramedTransportImpl.InitWriteBuffer;
-begin
-  FWriteBuffer.Free;
-  FWriteBuffer := TMemoryStream.Create;
-  TAccessMemoryStream(FWriteBuffer).Capacity := 1024;
-  FWriteBuffer.Write( Pointer(@FHeader_Dummy[0])^, FHeaderSize);
-end;
-
-procedure TFramedTransportImpl.Open;
-begin
-  FTransport.Open;
-end;
-
-function TFramedTransportImpl.Read(var buf: TBytes; off, len: Integer): Integer;
-var
-  got : Integer;
-begin
-  if FReadBuffer <> nil then begin
-    if len > 0
-    then got := FReadBuffer.Read( Pointer(@buf[off])^, len )
-    else got := 0;
-	
-    if got > 0 then begin
-      Result := got;
-      Exit;
-    end;
-  end;
-
-  ReadFrame;
-  if len > 0
-  then Result := FReadBuffer.Read( Pointer(@buf[off])^, len)
-  else Result := 0;
-end;
-
-procedure TFramedTransportImpl.ReadFrame;
-var
-  i32rd : TBytes;
-  size : Integer;
-  buff : TBytes;
-begin
-  SetLength( i32rd, FHeaderSize );
-  FTransport.ReadAll( i32rd, 0, FHeaderSize);
-  size :=
-    ((i32rd[0] and $FF) shl 24) or
-    ((i32rd[1] and $FF) shl 16) or
-    ((i32rd[2] and $FF) shl 8) or
-     (i32rd[3] and $FF);
-  SetLength( buff, size );
-  FTransport.ReadAll( buff, 0, size );
-  FReadBuffer.Free;
-  FReadBuffer := TMemoryStream.Create;
-  FReadBuffer.Write( Pointer(@buff[0])^, size );
-  FReadBuffer.Position := 0;
-end;
-
-procedure TFramedTransportImpl.Write(const buf: TBytes; off, len: Integer);
-begin
-  if len > 0
-  then FWriteBuffer.Write( Pointer(@buf[off])^, len );
-end;
-
-{ TFramedTransport.TFactory }
-
-function TFramedTransportImpl.TFactory.GetTransport( const ATrans: ITransport): ITransport;
-begin
-  Result := TFramedTransportImpl.Create( ATrans );
-end;
-
-{ TTcpSocketStreamImpl }
-
-procedure TTcpSocketStreamImpl.Close;
-begin
-  FTcpClient.Close;
-end;
-
-{$IFDEF OLD_SOCKETS}
-constructor TTcpSocketStreamImpl.Create( const ATcpClient: TCustomIpClient; const aTimeout : Integer);
-begin
-  inherited Create;
-  FTcpClient := ATcpClient;
-  FTimeout := aTimeout;
-end;
-{$ELSE}
-constructor TTcpSocketStreamImpl.Create( const ATcpClient: TSocket; const aTimeout : Longword);
-begin
-  inherited Create;
-  FTcpClient := ATcpClient;
-  if aTimeout = 0 then
-    FTcpClient.RecvTimeout := SLEEP_TIME
-  else
-    FTcpClient.RecvTimeout := aTimeout;
-  FTcpClient.SendTimeout := aTimeout;
-end;
-{$ENDIF}
-
-procedure TTcpSocketStreamImpl.Flush;
-begin
-
-end;
-
-function TTcpSocketStreamImpl.IsOpen: Boolean;
-begin
-{$IFDEF OLD_SOCKETS}
-  Result := FTcpClient.Active;
-{$ELSE}
-  Result := FTcpClient.IsOpen;
-{$ENDIF}
-end;
-
-procedure TTcpSocketStreamImpl.Open;
-begin
-  FTcpClient.Open;
-end;
-
-
-{$IFDEF OLD_SOCKETS}
-function TTcpSocketStreamImpl.Select( ReadReady, WriteReady, ExceptFlag: PBoolean;
-                                      TimeOut: Integer; var wsaError : Integer): Integer;
-var
-  ReadFds: TFDset;
-  ReadFdsptr: PFDset;
-  WriteFds: TFDset;
-  WriteFdsptr: PFDset;
-  ExceptFds: TFDset;
-  ExceptFdsptr: PFDset;
-  tv: timeval;
-  Timeptr: PTimeval;
-  socket : TSocket;
-begin
-  if not FTcpClient.Active then begin
-    wsaError := WSAEINVAL;
-    Exit( SOCKET_ERROR);
-  end;
-
-  socket := FTcpClient.Handle;
-
-  if Assigned(ReadReady) then begin
-    ReadFdsptr := @ReadFds;
-    FD_ZERO(ReadFds);
-    FD_SET(socket, ReadFds);
-  end
-  else begin
-    ReadFdsptr := nil;
-  end;
-
-  if Assigned(WriteReady) then begin
-    WriteFdsptr := @WriteFds;
-    FD_ZERO(WriteFds);
-    FD_SET(socket, WriteFds);
-  end
-  else begin
-    WriteFdsptr := nil;
-  end;
-
-  if Assigned(ExceptFlag) then begin
-    ExceptFdsptr := @ExceptFds;
-    FD_ZERO(ExceptFds);
-    FD_SET(socket, ExceptFds);
-  end
-  else begin
-    ExceptFdsptr := nil;
-  end;
-
-  if TimeOut >= 0 then begin
-    tv.tv_sec := TimeOut div 1000;
-    tv.tv_usec :=  1000 * (TimeOut mod 1000);
-    Timeptr := @tv;
-  end
-  else begin
-    Timeptr := nil;  // wait forever
-  end;
-
-  wsaError := 0;
-  try
-    {$IFDEF MSWINDOWS}
-      {$IFDEF OLD_UNIT_NAMES}
-      result := WinSock.select(        socket + 1, ReadFdsptr, WriteFdsptr, ExceptFdsptr, Timeptr);
-      {$ELSE}
-      result := Winapi.WinSock.select( socket + 1, ReadFdsptr, WriteFdsptr, ExceptFdsptr, Timeptr);
-      {$ENDIF}
-    {$ENDIF}
-    {$IFDEF LINUX}
-      result := Libc.select(           socket + 1, ReadFdsptr, WriteFdsptr, ExceptFdsptr, Timeptr);
-    {$ENDIF}
-	
-    if result = SOCKET_ERROR
-    then wsaError := WSAGetLastError;
-
-  except
-    result := SOCKET_ERROR;
-  end;
-
-  if Assigned(ReadReady) then
-   ReadReady^ := FD_ISSET(socket, ReadFds);
-   
-  if Assigned(WriteReady) then
-    WriteReady^ := FD_ISSET(socket, WriteFds);
-  
-  if Assigned(ExceptFlag) then
-    ExceptFlag^ := FD_ISSET(socket, ExceptFds);
-end;
-{$ENDIF}
-
-{$IFDEF OLD_SOCKETS}
-function TTcpSocketStreamImpl.WaitForData( TimeOut : Integer; pBuf : Pointer;
-                                           DesiredBytes : Integer;
-                                           var wsaError, bytesReady : Integer): TWaitForData;
-var bCanRead, bError : Boolean;
-    retval : Integer;
-const 
-  MSG_PEEK = {$IFDEF OLD_UNIT_NAMES} WinSock.MSG_PEEK  {$ELSE} Winapi.WinSock.MSG_PEEK  {$ENDIF};
-begin
-  bytesReady := 0;
-
-  // The select function returns the total number of socket handles that are ready
-  // and contained in the fd_set structures, zero if the time limit expired,
-  // or SOCKET_ERROR if an error occurred. If the return value is SOCKET_ERROR,
-  // WSAGetLastError can be used to retrieve a specific error code.
-  retval := Self.Select( @bCanRead, nil, @bError, TimeOut, wsaError);
-  if retval = SOCKET_ERROR
-  then Exit( TWaitForData.wfd_Error);
-  if (retval = 0) or not bCanRead
-  then Exit( TWaitForData.wfd_Timeout);
-
-  // recv() returns the number of bytes received, or -1 if an error occurred.
-  // The return value will be 0 when the peer has performed an orderly shutdown.
-  
-  retval := recv( FTcpClient.Handle, pBuf^, DesiredBytes, MSG_PEEK);
-  if retval <= 0
-  then Exit( TWaitForData.wfd_Error);
-
-  // at least we have some data
-  bytesReady := Min( retval, DesiredBytes);
-  result := TWaitForData.wfd_HaveData;
-end;
-{$ENDIF}
-
-{$IFDEF OLD_SOCKETS}
-function TTcpSocketStreamImpl.Read(var buffer: TBytes; offset, count: Integer): Integer;
-// old sockets version
-var wfd : TWaitForData;
-    wsaError,
-    msecs : Integer;
-    nBytes : Integer;
-    pDest : PByte;
-begin
-  inherited;
-
-  if FTimeout > 0
-  then msecs := FTimeout
-  else msecs := DEFAULT_THRIFT_TIMEOUT;
-
-  result := 0;
-  pDest := Pointer(@buffer[offset]);
-  while count > 0 do begin
-
-    while TRUE do begin
-      wfd := WaitForData( msecs, pDest, count, wsaError, nBytes);
-      case wfd of
-        TWaitForData.wfd_Error    :  Exit;
-        TWaitForData.wfd_HaveData :  Break;
-        TWaitForData.wfd_Timeout  :  begin
-          if (FTimeout = 0)
-          then Exit
-          else begin
-            raise TTransportExceptionTimedOut.Create(SysErrorMessage(Cardinal(wsaError)));
-
-          end;
-        end;
-      else
-        ASSERT( FALSE);
-      end;
-    end;
-
-    // reduce the timeout once we got data
-    if FTimeout > 0
-    then msecs := FTimeout div 10
-    else msecs := DEFAULT_THRIFT_TIMEOUT div 10;
-    msecs := Max( msecs, 200);
-
-    ASSERT( nBytes <= count);
-    nBytes := FTcpClient.ReceiveBuf( pDest^, nBytes);
-    Inc( pDest, nBytes);
-    Dec( count, nBytes);
-    Inc( result, nBytes);
-  end;
-end;
-
-function TTcpSocketStreamImpl.ToArray: TBytes;
-// old sockets version
-var len : Integer;
-begin
-  len := 0;
-  if IsOpen then begin
-    len := FTcpClient.BytesReceived;
-  end;
-
-  SetLength( Result, len );
-
-  if len > 0 then begin
-    FTcpClient.ReceiveBuf( Pointer(@Result[0])^, len);
-  end;
-end;
-
-procedure TTcpSocketStreamImpl.Write(const buffer: TBytes; offset, count: Integer);
-// old sockets version
-var bCanWrite, bError : Boolean;
-    retval, wsaError : Integer;
-begin
-  inherited;
-
-  if not FTcpClient.Active
-  then raise TTransportExceptionNotOpen.Create('not open');
-
-  // The select function returns the total number of socket handles that are ready
-  // and contained in the fd_set structures, zero if the time limit expired,
-  // or SOCKET_ERROR if an error occurred. If the return value is SOCKET_ERROR,
-  // WSAGetLastError can be used to retrieve a specific error code.
-  retval := Self.Select( nil, @bCanWrite, @bError, FTimeOut, wsaError);
-  if retval = SOCKET_ERROR
-  then raise TTransportExceptionUnknown.Create(SysErrorMessage(Cardinal(wsaError)));
-
-  if (retval = 0)
-  then raise TTransportExceptionTimedOut.Create('timed out');
-
-  if bError or not bCanWrite
-  then raise TTransportExceptionUnknown.Create('unknown error');
-
-  FTcpClient.SendBuf( Pointer(@buffer[offset])^, count);
-end;
-
-{$ELSE}
-
-function TTcpSocketStreamImpl.Read(var buffer: TBytes; offset, count: Integer): Integer;
-// new sockets version
-var nBytes : Integer;
-    pDest : PByte;
-begin
-  inherited;
-
-  result := 0;
-  pDest := Pointer(@buffer[offset]);
-  while count > 0 do begin
-    nBytes := FTcpClient.Read(pDest^, count);
-    if nBytes = 0 then Exit;
-    Inc( pDest, nBytes);
-    Dec( count, nBytes);
-    Inc( result, nBytes);
-  end;
-end;
-
-function TTcpSocketStreamImpl.ToArray: TBytes;
-// new sockets version
-var len : Integer;
-begin
-  len := 0;
-  try
-    if FTcpClient.Peek then
-      repeat
-        SetLength(Result, Length(Result) + 1024);
-        len := FTcpClient.Read(Result[Length(Result) - 1024], 1024);
-      until len < 1024;
-  except
-    on TTransportException do begin { don't allow default exceptions } end;
-    else raise;
-  end;
-  if len > 0 then
-    SetLength(Result, Length(Result) - 1024 + len);
-end;
-
-procedure TTcpSocketStreamImpl.Write(const buffer: TBytes; offset, count: Integer);
-// new sockets version
-begin
-  inherited;
-
-  if not FTcpClient.IsOpen
-  then raise TTransportExceptionNotOpen.Create('not open');
-
-  FTcpClient.Write(buffer[offset], count);
-end;
-
-{$ENDIF}
-
-
-{$IF CompilerVersion < 21.0}
-initialization
-begin
-  TFramedTransportImpl_Initialize;
-end;
-{$IFEND}
-
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.TypeRegistry.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.TypeRegistry.pas
deleted file mode 100644
index c18e97f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.TypeRegistry.pas
+++ /dev/null
@@ -1,95 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.TypeRegistry;
-
-interface
-
-uses
-  Generics.Collections, TypInfo,
-  Thrift.Protocol;
-
-type
-  TFactoryMethod<T> = function:T;
-
-  TypeRegistry = class
-  private
-    class var FTypeInfoToFactoryLookup : TDictionary<Pointer, Pointer>;
-  public
-    class constructor Create;
-    class destructor Destroy;
-    class procedure RegisterTypeFactory<F>(const aFactoryMethod: TFactoryMethod<F>);
-    class function  Construct<F>: F;
-    class function  ConstructFromTypeInfo(const aTypeInfo: PTypeInfo): IBase;
-  end;
-
-implementation
-
-
-{ TypeRegistration }
-
-class constructor TypeRegistry.Create;
-begin
-  FTypeInfoToFactoryLookup := TDictionary<Pointer, Pointer>.Create;
-end;
-
-class destructor TypeRegistry.Destroy;
-begin
-  FTypeInfoToFactoryLookup.Free;
-end;
-
-class procedure TypeRegistry.RegisterTypeFactory<F>(const aFactoryMethod: TFactoryMethod<F>);
-var
-  TypeInfo     : Pointer;
-begin
-  TypeInfo := System.TypeInfo(F);
-
-  if (TypeInfo <> nil) and (PTypeInfo(TypeInfo).Kind = tkInterface)
-  then FTypeInfoToFactoryLookup.AddOrSetValue(TypeInfo, @aFactoryMethod);
-end;
-
-class function TypeRegistry.Construct<F>: F;
-var
-  TypeInfo     : PTypeInfo;
-  Factory      : Pointer;
-begin
-  Result := default(F);
-
-  TypeInfo := System.TypeInfo(F);
-
-  if Assigned(TypeInfo) and (TypeInfo.Kind = tkInterface)
-  then begin
-    if FTypeInfoToFactoryLookup.TryGetValue(TypeInfo, Factory)
-    then Result := TFactoryMethod<F>(Factory)();
-  end;
-end;
-
-class function TypeRegistry.ConstructFromTypeInfo(const aTypeInfo: PTypeInfo): IBase;
-var
-  Factory      : Pointer;
-begin
-  Result := nil;
-  if FTypeInfoToFactoryLookup.TryGetValue(aTypeInfo, Factory)
-  then Result := IBase(TFactoryMethod<IBase>(Factory)());
-end;
-
-
-
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Utils.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Utils.pas
deleted file mode 100644
index a0bf144..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.Utils.pas
+++ /dev/null
@@ -1,244 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift.Utils;
-
-interface
-
-{$I Thrift.Defines.inc}
-
-uses
-  {$IFDEF OLD_UNIT_NAMES}
-  Classes, Windows, SysUtils, Character, SyncObjs;
-  {$ELSE}
-  System.Classes, Winapi.Windows, System.SysUtils, System.Character, System.SyncObjs;
-  {$ENDIF}
-
-type
-  IOverlappedHelper = interface
-    ['{A1832EFA-2E02-4884-8F09-F0A0277157FA}']
-    function Overlapped : TOverlapped;
-    function OverlappedPtr : POverlapped;
-    function WaitHandle : THandle;
-    function WaitFor(dwTimeout: DWORD) : DWORD;
-  end;
-
-  TOverlappedHelperImpl = class( TInterfacedObject, IOverlappedHelper)
-  strict protected
-    FOverlapped : TOverlapped;
-    FEvent      : TEvent;
-
-    // IOverlappedHelper
-    function Overlapped : TOverlapped;
-    function OverlappedPtr : POverlapped;
-    function WaitHandle : THandle;
-    function WaitFor(dwTimeout: DWORD) : DWORD;
-  public
-    constructor Create;
-    destructor Destroy;  override;
-  end;
-
-
-  Base64Utils = class sealed
-  public
-    class function Encode( const src : TBytes; srcOff, len : Integer; dst : TBytes; dstOff : Integer) : Integer; static;
-    class function Decode( const src : TBytes; srcOff, len : Integer; dst : TBytes; dstOff : Integer) : Integer; static;
-  end;
-
-
-  CharUtils = class sealed
-  public
-    class function IsHighSurrogate( const c : Char) : Boolean; static; inline;
-    class function IsLowSurrogate( const c : Char) : Boolean; static; inline;
-  end;
-
-
-function InterlockedCompareExchange64( var Target : Int64; Exchange, Comparand : Int64) : Int64; stdcall;
-function InterlockedExchangeAdd64( var Addend : Int64; Value : Int64) : Int64; stdcall;
-
-
-implementation
-
-{ TOverlappedHelperImpl }
-
-constructor TOverlappedHelperImpl.Create;
-begin
-  inherited Create;
-  FillChar( FOverlapped, SizeOf(FOverlapped), 0);
-  FEvent := TEvent.Create( nil, TRUE, FALSE, '');  // always ManualReset, see MSDN
-  FOverlapped.hEvent := FEvent.Handle;
-end;
-
-
-
-destructor TOverlappedHelperImpl.Destroy;
-begin
-  try
-    FOverlapped.hEvent := 0;
-    FreeAndNil( FEvent);
-
-  finally
-    inherited Destroy;
-  end;
-
-end;
-
-
-function TOverlappedHelperImpl.Overlapped : TOverlapped;
-begin
-  result := FOverlapped;
-end;
-
-
-function TOverlappedHelperImpl.OverlappedPtr : POverlapped;
-begin
-  result := @FOverlapped;
-end;
-
-
-function TOverlappedHelperImpl.WaitHandle : THandle;
-begin
-  result := FOverlapped.hEvent;
-end;
-
-
-function TOverlappedHelperImpl.WaitFor( dwTimeout : DWORD) : DWORD;
-begin
-  result := WaitForSingleObject( FOverlapped.hEvent, dwTimeout);
-end;
-
-
-{ Base64Utils }
-
-class function Base64Utils.Encode( const src : TBytes; srcOff, len : Integer; dst : TBytes; dstOff : Integer) : Integer;
-const ENCODE_TABLE : PAnsiChar = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-begin
-  ASSERT( len in [1..3]);
-  dst[dstOff] := Byte( ENCODE_TABLE[ (src[srcOff] shr 2) and $3F]);
-  case len of
-    3 : begin
-      Inc(dstOff);
-      dst[dstOff] := Byte( ENCODE_TABLE[ ((src[srcOff] shl 4) and $30) or ((src[srcOff + 1] shr 4) and $0F)]);
-      Inc(dstOff);
-      dst[dstOff] := Byte( ENCODE_TABLE[ ((src[srcOff + 1] shl 2) and $3C) or ((src[srcOff + 2] shr 6) and $03)]);
-      Inc(dstOff);
-      dst[dstOff] := Byte( ENCODE_TABLE[ src[srcOff + 2] and $3F]);
-      result := 4;
-    end;
-
-    2 : begin
-      Inc(dstOff);
-      dst[dstOff] := Byte( ENCODE_TABLE[ ((src[srcOff] shl 4) and $30) or ((src[srcOff + 1] shr 4) and $0F)]);
-      Inc(dstOff);
-      dst[dstOff] := Byte( ENCODE_TABLE[ (src[srcOff + 1] shl 2) and $3C]);
-      result := 3;
-    end;
-
-    1 : begin
-      Inc(dstOff);
-      dst[dstOff] := Byte( ENCODE_TABLE[ (src[srcOff] shl 4) and $30]);
-      result := 2;
-    end;
-
-  else
-    ASSERT( FALSE);
-    result := 0;  // because invalid call
-  end;
-end;
-
-
-class function Base64Utils.Decode( const src : TBytes; srcOff, len : Integer; dst : TBytes; dstOff : Integer) : Integer;
-const DECODE_TABLE : array[0..$FF] of Integer
-                   = ( -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
-                       52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,
-                       -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,
-                       15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
-                       -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
-                       41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-                       -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1  );
-begin
-  ASSERT( len in [1..4]);
-  result := 1;
-  dst[dstOff] := ((DECODE_TABLE[src[srcOff]     and $0FF] shl 2)
-              or  (DECODE_TABLE[src[srcOff + 1] and $0FF] shr 4));
-
-  if (len > 2) then begin
-    Inc( result);
-    Inc( dstOff);
-    dst[dstOff] := (((DECODE_TABLE[src[srcOff + 1] and $0FF] shl 4) and $F0)
-                or   (DECODE_TABLE[src[srcOff + 2] and $0FF] shr 2));
-
-    if (len > 3) then begin
-      Inc( result);
-      Inc( dstOff);
-      dst[dstOff] := (((DECODE_TABLE[src[srcOff + 2] and $0FF] shl 6) and $C0)
-                  or    DECODE_TABLE[src[srcOff + 3] and $0FF]);
-    end;
-  end;
-end;
-
-
-class function CharUtils.IsHighSurrogate( const c : Char) : Boolean;
-begin
-  {$IF CompilerVersion < 23.0}
-  result := Character.IsHighSurrogate( c);
-  {$ELSE}
-  result := c.IsHighSurrogate();
-  {$IFEND}
-end;
-
-
-class function CharUtils.IsLowSurrogate( const c : Char) : Boolean;
-begin
-  {$IF CompilerVersion < 23.0}
-  result := Character.IsLowSurrogate( c);
-  {$ELSE}
-  result := c.IsLowSurrogate;
-  {$IFEND}
-end;
-
-
-// natively available since stone age
-function InterlockedCompareExchange64;
-external KERNEL32 name 'InterlockedCompareExchange64';
-
-
-// natively available >= Vista
-// implemented this way since there are still some people running Windows XP :-(
-function InterlockedExchangeAdd64( var Addend : Int64; Value : Int64) : Int64; stdcall;
-var old : Int64;
-begin
-  repeat
-    Old := Addend;
-  until (InterlockedCompareExchange64( Addend, Old + Value, Old) = Old);
-  result := Old;
-end;
-
-
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.pas b/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.pas
deleted file mode 100644
index fe8f8d7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/src/Thrift.pas
+++ /dev/null
@@ -1,258 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Thrift;
-
-interface
-
-uses
-  SysUtils, Thrift.Protocol;
-
-const
-  Version = '0.10.0';
-
-type
-  TApplicationExceptionSpecializedClass = class of TApplicationExceptionSpecialized;
-
-  TApplicationException = class( SysUtils.Exception )
-  public
-    type
-{$SCOPEDENUMS ON}
-      TExceptionType = (
-        Unknown,
-        UnknownMethod,
-        InvalidMessageType,
-        WrongMethodName,
-        BadSequenceID,
-        MissingResult,
-        InternalError,
-        ProtocolError,
-        InvalidTransform,
-        InvalidProtocol,
-        UnsupportedClientType
-      );
-{$SCOPEDENUMS OFF}
-  private
-    function GetType: TExceptionType;
-  protected
-    constructor HiddenCreate(const Msg: string);
-  public
-    // purposefully hide inherited constructor
-    class function Create(const Msg: string): TApplicationException; overload; deprecated 'Use specialized TApplicationException types (or regenerate from IDL)';
-    class function Create: TApplicationException; overload; deprecated 'Use specialized TApplicationException types (or regenerate from IDL)';
-    class function Create( AType: TExceptionType): TApplicationException; overload; deprecated 'Use specialized TApplicationException types (or regenerate from IDL)';
-    class function Create( AType: TExceptionType; const msg: string): TApplicationException; overload; deprecated 'Use specialized TApplicationException types (or regenerate from IDL)';
-
-    class function GetSpecializedExceptionType(AType: TExceptionType): TApplicationExceptionSpecializedClass;
-
-    class function Read( const iprot: IProtocol): TApplicationException;
-    procedure Write( const oprot: IProtocol );
-  end;
-
-  // Needed to remove deprecation warning
-  TApplicationExceptionSpecialized = class abstract (TApplicationException)
-  public
-    constructor Create(const Msg: string);
-  end;
-
-  TApplicationExceptionUnknown = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionUnknownMethod = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionInvalidMessageType = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionWrongMethodName = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionBadSequenceID = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionMissingResult = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionInternalError = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionProtocolError = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionInvalidTransform = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionInvalidProtocol = class (TApplicationExceptionSpecialized);
-  TApplicationExceptionUnsupportedClientType = class (TApplicationExceptionSpecialized);
-
-  // base class for IDL-generated exceptions
-  TException = class( SysUtils.Exception)
-  public
-    function Message : string;        // hide inherited property: allow read, but prevent accidental writes
-    procedure UpdateMessageProperty;  // update inherited message property with toString()
-  end;
-
-implementation
-
-{ TException }
-
-function TException.Message;
-// allow read (exception summary), but prevent accidental writes
-// read will return the exception summary
-begin
-  result := Self.ToString;
-end;
-
-procedure TException.UpdateMessageProperty;
-// Update the inherited Message property to better conform to standard behaviour.
-// Nice benefit: The IDE is now able to show the exception message again.
-begin
-  inherited Message := Self.ToString;  // produces a summary text
-end;
-
-{ TApplicationException }
-
-function TApplicationException.GetType: TExceptionType;
-begin
-  if Self is TApplicationExceptionUnknownMethod then Result := TExceptionType.UnknownMethod
-  else if Self is TApplicationExceptionInvalidMessageType then Result := TExceptionType.InvalidMessageType
-  else if Self is TApplicationExceptionWrongMethodName then Result := TExceptionType.WrongMethodName
-  else if Self is TApplicationExceptionBadSequenceID then Result := TExceptionType.BadSequenceID
-  else if Self is TApplicationExceptionMissingResult then Result := TExceptionType.MissingResult
-  else if Self is TApplicationExceptionInternalError then Result := TExceptionType.InternalError
-  else if Self is TApplicationExceptionProtocolError then Result := TExceptionType.ProtocolError
-  else if Self is TApplicationExceptionInvalidTransform then Result := TExceptionType.InvalidTransform
-  else if Self is TApplicationExceptionInvalidProtocol then Result := TExceptionType.InvalidProtocol
-  else if Self is TApplicationExceptionUnsupportedClientType then Result := TExceptionType.UnsupportedClientType
-  else Result := TExceptionType.Unknown;
-end;
-
-constructor TApplicationException.HiddenCreate(const Msg: string);
-begin
-  inherited Create(Msg);
-end;
-
-class function TApplicationException.Create(const Msg: string): TApplicationException;
-begin
-  Result := TApplicationExceptionUnknown.Create(Msg);
-end;
-
-class function TApplicationException.Create: TApplicationException;
-begin
-  Result := TApplicationExceptionUnknown.Create('');
-end;
-
-class function TApplicationException.Create( AType: TExceptionType): TApplicationException;
-begin
-{$WARN SYMBOL_DEPRECATED OFF}
-  Result := Create(AType, '');
-{$WARN SYMBOL_DEPRECATED DEFAULT}
-end;
-
-class function TApplicationException.Create( AType: TExceptionType; const msg: string): TApplicationException;
-begin
-  Result := GetSpecializedExceptionType(AType).Create(msg);
-end;
-
-class function TApplicationException.GetSpecializedExceptionType(AType: TExceptionType): TApplicationExceptionSpecializedClass;
-begin
-  case AType of
-    TExceptionType.UnknownMethod:         Result := TApplicationExceptionUnknownMethod;
-    TExceptionType.InvalidMessageType:    Result := TApplicationExceptionInvalidMessageType;
-    TExceptionType.WrongMethodName:       Result := TApplicationExceptionWrongMethodName;
-    TExceptionType.BadSequenceID:         Result := TApplicationExceptionBadSequenceID;
-    TExceptionType.MissingResult:         Result := TApplicationExceptionMissingResult;
-    TExceptionType.InternalError:         Result := TApplicationExceptionInternalError;
-    TExceptionType.ProtocolError:         Result := TApplicationExceptionProtocolError;
-    TExceptionType.InvalidTransform:      Result := TApplicationExceptionInvalidTransform;
-    TExceptionType.InvalidProtocol:       Result := TApplicationExceptionInvalidProtocol;
-    TExceptionType.UnsupportedClientType: Result := TApplicationExceptionUnsupportedClientType;
-  else
-    Result := TApplicationExceptionUnknown;
-  end;
-end;
-
-class function TApplicationException.Read( const iprot: IProtocol): TApplicationException;
-var
-  field : IField;
-  msg : string;
-  typ : TExceptionType;
-  struc : IStruct;
-begin
-  msg := '';
-  typ := TExceptionType.Unknown;
-  struc := iprot.ReadStructBegin;
-  while ( True ) do
-  begin
-    field := iprot.ReadFieldBegin;
-    if ( field.Type_ = TType.Stop) then
-    begin
-      Break;
-    end;
-
-    case field.Id of
-      1 : begin
-        if ( field.Type_ = TType.String_) then
-        begin
-          msg := iprot.ReadString;
-        end else
-        begin
-          TProtocolUtil.Skip( iprot, field.Type_ );
-        end;
-      end;
-
-      2 : begin
-        if ( field.Type_ = TType.I32) then
-        begin
-          typ := TExceptionType( iprot.ReadI32 );
-        end else
-        begin
-          TProtocolUtil.Skip( iprot, field.Type_ );
-        end;
-      end else
-      begin
-        TProtocolUtil.Skip( iprot, field.Type_);
-      end;
-    end;
-    iprot.ReadFieldEnd;
-  end;
-  iprot.ReadStructEnd;
-  Result := GetSpecializedExceptionType(typ).Create(msg);
-end;
-
-procedure TApplicationException.Write( const oprot: IProtocol);
-var
-  struc : IStruct;
-  field : IField;
-
-begin
-  struc := TStructImpl.Create( 'TApplicationException' );
-  field := TFieldImpl.Create;
-
-  oprot.WriteStructBegin( struc );
-  if Message <> '' then
-  begin
-    field.Name := 'message';
-    field.Type_ := TType.String_;
-    field.Id := 1;
-    oprot.WriteFieldBegin( field );
-    oprot.WriteString( Message );
-    oprot.WriteFieldEnd;
-  end;
-
-  field.Name := 'type';
-  field.Type_ := TType.I32;
-  field.Id := 2;
-  oprot.WriteFieldBegin(field);
-  oprot.WriteI32(Integer(GetType));
-  oprot.WriteFieldEnd();
-  oprot.WriteFieldStop();
-  oprot.WriteStructEnd();
-end;
-
-{ TApplicationExceptionSpecialized }
-
-constructor TApplicationExceptionSpecialized.Create(const Msg: string);
-begin
-  inherited HiddenCreate(Msg);
-end;
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/TestClient.pas b/vendor/git.apache.org/thrift.git/lib/delphi/test/TestClient.pas
deleted file mode 100644
index 9f45a91..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/TestClient.pas
+++ /dev/null
@@ -1,1314 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit TestClient;
-
-{$I ../src/Thrift.Defines.inc}
-
-{.$DEFINE StressTest}   // activate to stress-test the server with frequent connects/disconnects
-{.$DEFINE PerfTest}     // activate to activate the performance test
-
-interface
-
-uses
-  Windows, SysUtils, Classes, Math,
-  DateUtils,
-  Generics.Collections,
-  TestConstants,
-  Thrift,
-  Thrift.Protocol.Compact,
-  Thrift.Protocol.JSON,
-  Thrift.Protocol,
-  Thrift.Transport.Pipes,
-  Thrift.Transport,
-  Thrift.Stream,
-  Thrift.Test,
-  Thrift.Collections,
-  Thrift.Console;
-
-type
-  TThreadConsole = class
-  private
-    FThread : TThread;
-  public
-    procedure Write( const S : string);
-    procedure WriteLine( const S : string);
-    constructor Create( AThread: TThread);
-  end;
-
-  TClientThread = class( TThread )
-  private type
-    TTestGroup = (
-      test_Unknown,
-      test_BaseTypes,
-      test_Structs,
-      test_Containers,
-      test_Exceptions
-      // new values here
-    );
-    TTestGroups = set of TTestGroup;
-
-  private
-    FTransport : ITransport;
-    FProtocol : IProtocol;
-    FNumIteration : Integer;
-    FConsole : TThreadConsole;
-
-    // test reporting, will be refactored out into separate class later
-    FTestGroup : string;
-    FCurrentTest : TTestGroup;
-    FSuccesses : Integer;
-    FErrors : TStringList;
-    FFailed : TTestGroups;
-    FExecuted : TTestGroups;
-    procedure StartTestGroup( const aGroup : string; const aTest : TTestGroup);
-    procedure Expect( aTestResult : Boolean; const aTestInfo : string);
-    procedure ReportResults;
-    function  CalculateExitCode : Byte;
-
-    procedure ClientTest;
-    procedure JSONProtocolReadWriteTest;
-    function  PrepareBinaryData( aRandomDist : Boolean = FALSE) : TBytes;
-    {$IFDEF StressTest}
-    procedure StressTest(const client : TThriftTest.Iface);
-    {$ENDIF}
-  protected
-    procedure Execute; override;
-  public
-    constructor Create( const ATransport: ITransport; const AProtocol : IProtocol; ANumIteration: Integer);
-    destructor Destroy; override;
-  end;
-
-  TTestClient = class
-  private
-    class var
-      FNumIteration : Integer;
-      FNumThread : Integer;
-
-    class procedure PrintCmdLineHelp;
-    class procedure InvalidArgs;
-  public
-    class function Execute( const args: array of string) : Byte;
-  end;
-
-
-implementation
-
-const
-   EXITCODE_SUCCESS           = $00;  // no errors bits set
-   //
-   EXITCODE_FAILBIT_BASETYPES  = $01;
-   EXITCODE_FAILBIT_STRUCTS    = $02;
-   EXITCODE_FAILBIT_CONTAINERS = $04;
-   EXITCODE_FAILBIT_EXCEPTIONS = $08;
-
-   MAP_FAILURES_TO_EXITCODE_BITS : array[TClientThread.TTestGroup] of Byte = (
-     EXITCODE_SUCCESS,  // no bits here
-     EXITCODE_FAILBIT_BASETYPES,
-     EXITCODE_FAILBIT_STRUCTS,
-     EXITCODE_FAILBIT_CONTAINERS,
-     EXITCODE_FAILBIT_EXCEPTIONS
-   );
-
-
-
-function BoolToString( b : Boolean) : string;
-// overrides global BoolToString()
-begin
-  if b
-  then result := 'true'
-  else result := 'false';
-end;
-
-// not available in all versions, so make sure we have this one imported
-function IsDebuggerPresent: BOOL; stdcall; external KERNEL32 name 'IsDebuggerPresent';
-
-{ TTestClient }
-
-class procedure TTestClient.PrintCmdLineHelp;
-const HELPTEXT = ' [options]'#10
-               + #10
-               + 'Allowed options:'#10
-               + '  -h [ --help ]               produce help message'#10
-               + '  --host arg (=localhost)     Host to connect'#10
-               + '  --port arg (=9090)          Port number to connect'#10
-               + '  --domain-socket arg         Domain Socket (e.g. /tmp/ThriftTest.thrift),'#10
-               + '                              instead of host and port'#10
-               + '  --named-pipe arg            Windows Named Pipe (e.g. MyThriftPipe)'#10
-               + '  --anon-pipes hRead hWrite   Windows Anonymous Pipes pair (handles)'#10
-               + '  --transport arg (=sockets)  Transport: buffered, framed, http, evhttp'#10
-               + '  --protocol arg (=binary)    Protocol: binary, compact, json'#10
-               + '  --ssl                       Encrypted Transport using SSL'#10
-               + '  -n [ --testloops ] arg (=1) Number of Tests'#10
-               + '  -t [ --threads ] arg (=1)   Number of Test threads'#10
-               ;
-begin
-  Writeln( ChangeFileExt(ExtractFileName(ParamStr(0)),'') + HELPTEXT);
-end;
-
-class procedure TTestClient.InvalidArgs;
-begin
-  Console.WriteLine( 'Invalid args.');
-  Console.WriteLine( ChangeFileExt(ExtractFileName(ParamStr(0)),'') + ' -h for more information');
-  Abort;
-end;
-
-class function TTestClient.Execute(const args: array of string) : Byte;
-var
-  i : Integer;
-  host : string;
-  port : Integer;
-  sPipeName : string;
-  hAnonRead, hAnonWrite : THandle;
-  s : string;
-  threads : array of TThread;
-  dtStart : TDateTime;
-  test : Integer;
-  thread : TThread;
-  trans : ITransport;
-  prot : IProtocol;
-  streamtrans : IStreamTransport;
-  http : IHTTPClient;
-  protType : TKnownProtocol;
-  endpoint : TEndpointTransport;
-  layered : TLayeredTransports;
-  UseSSL : Boolean; // include where appropriate (TLayeredTransport?)
-const
-  // pipe timeouts to be used
-  DEBUG_TIMEOUT   = 30 * 1000;
-  RELEASE_TIMEOUT = DEFAULT_THRIFT_TIMEOUT;
-  TIMEOUT         = RELEASE_TIMEOUT;
-begin
-  protType := prot_Binary;
-  endpoint := trns_Sockets;
-  layered := [];
-  UseSSL := FALSE;
-  host := 'localhost';
-  port := 9090;
-  sPipeName := '';
-  hAnonRead := INVALID_HANDLE_VALUE;
-  hAnonWrite := INVALID_HANDLE_VALUE;
-  try
-    i := 0;
-    while ( i < Length(args) ) do begin
-      s := args[i];
-      Inc( i);
-
-      if (s = '-h') or (s = '--help') then begin
-        // -h [ --help ]               produce help message
-        PrintCmdLineHelp;
-        result := $FF;   // all tests failed
-        Exit;
-      end
-      else if s = '--host' then begin
-        // --host arg (=localhost)     Host to connect
-        host := args[i];
-        Inc( i);
-      end
-      else if s = '--port' then begin
-        // --port arg (=9090)          Port number to connect
-        s := args[i];
-        Inc( i);
-        port := StrToIntDef(s,0);
-        if port <= 0 then InvalidArgs;
-      end
-      else if s = '--domain-socket' then begin
-        // --domain-socket arg         Domain Socket (e.g. /tmp/ThriftTest.thrift), instead of host and port
-        raise Exception.Create('domain-socket not supported');
-      end
-      else if s = '--named-pipe' then begin
-        // --named-pipe arg            Windows Named Pipe (e.g. MyThriftPipe)
-        endpoint := trns_NamedPipes;
-        sPipeName := args[i];
-        Inc( i);
-      end
-      else if s = '--anon-pipes' then begin
-        // --anon-pipes hRead hWrite   Windows Anonymous Pipes pair (handles)
-        endpoint := trns_AnonPipes;
-        hAnonRead := THandle( StrToIntDef( args[i], Integer(INVALID_HANDLE_VALUE)));
-        Inc( i);
-        hAnonWrite := THandle( StrToIntDef( args[i], Integer(INVALID_HANDLE_VALUE)));
-        Inc( i);
-      end
-      else if s = '--transport' then begin
-        // --transport arg (=sockets)  Transport: buffered, framed, http, evhttp
-        s := args[i];
-        Inc( i);
-
-        if      s = 'buffered' then Include( layered, trns_Buffered)
-        else if s = 'framed'   then Include( layered, trns_Framed)
-        else if s = 'http'     then endpoint := trns_Http
-        else if s = 'evhttp'   then endpoint := trns_AnonPipes
-        else InvalidArgs;
-      end
-      else if s = '--protocol' then begin
-        // --protocol arg (=binary)    Protocol: binary, compact, json
-        s := args[i];
-        Inc( i);
-
-        if      s = 'binary'   then protType := prot_Binary
-        else if s = 'compact'  then protType := prot_Compact
-        else if s = 'json'     then protType := prot_JSON
-        else InvalidArgs;
-      end
-      else if s = '--ssl' then begin
-        // --ssl                       Encrypted Transport using SSL
-        UseSSL := TRUE;
-
-      end
-      else if (s = '-n') or (s = '--testloops') then begin
-        // -n [ --testloops ] arg (=1) Number of Tests
-        FNumIteration := StrToIntDef( args[i], 0);
-        Inc( i);
-        if FNumIteration <= 0
-        then InvalidArgs;
-
-      end
-      else if (s = '-t') or (s = '--threads') then begin
-        // -t [ --threads ] arg (=1)   Number of Test threads
-        FNumThread := StrToIntDef( args[i], 0);
-        Inc( i);
-        if FNumThread <= 0
-        then InvalidArgs;
-      end
-      else begin
-        InvalidArgs;
-      end;
-    end;
-
-
-    // In the anonymous pipes mode the client is launched by the test server
-    // -> behave nicely and allow for attaching a debugger to this process
-    if (endpoint = trns_AnonPipes) and not IsDebuggerPresent
-    then MessageBox( 0, 'Attach Debugger and/or click OK to continue.',
-                        'Thrift TestClient (Delphi)',
-                        MB_OK or MB_ICONEXCLAMATION);
-
-    SetLength( threads, FNumThread);
-    dtStart := Now;
-
-    for test := 0 to FNumThread - 1 do
-    begin
-      case endpoint of
-        trns_Sockets: begin
-          Console.WriteLine('Using sockets ('+host+' port '+IntToStr(port)+')');
-          streamtrans := TSocketImpl.Create( host, port );
-        end;
-
-        trns_Http: begin
-          Console.WriteLine('Using HTTPClient');
-          http := THTTPClientImpl.Create( host);
-          trans := http;
-        end;
-
-        trns_EvHttp: begin
-          raise Exception.Create(ENDPOINT_TRANSPORTS[endpoint]+' transport not implemented');
-        end;
-
-        trns_NamedPipes: begin
-          Console.WriteLine('Using named pipe ('+sPipeName+')');
-          streamtrans := TNamedPipeTransportClientEndImpl.Create( sPipeName, 0, nil, TIMEOUT, TIMEOUT);
-        end;
-
-        trns_AnonPipes: begin
-          Console.WriteLine('Using anonymous pipes ('+IntToStr(Integer(hAnonRead))+' and '+IntToStr(Integer(hAnonWrite))+')');
-          streamtrans := TAnonymousPipeTransportImpl.Create( hAnonRead, hAnonWrite, FALSE);
-        end;
-
-      else
-        raise Exception.Create('Unhandled endpoint transport');
-      end;
-      trans := streamtrans;
-      ASSERT( trans <> nil);
-
-      if (trns_Buffered in layered) then begin
-        trans := TBufferedTransportImpl.Create( streamtrans, 32);  // small buffer to test read()
-        Console.WriteLine('Using buffered transport');
-      end;
-
-      if (trns_Framed in layered) then begin
-        trans := TFramedTransportImpl.Create( trans );
-        Console.WriteLine('Using framed transport');
-      end;
-
-      if UseSSL then begin
-        raise Exception.Create('SSL not implemented');
-      end;
-
-      // create protocol instance, default to BinaryProtocol
-      case protType of
-        prot_Binary  :  prot := TBinaryProtocolImpl.Create( trans, BINARY_STRICT_READ, BINARY_STRICT_WRITE);
-        prot_JSON    :  prot := TJSONProtocolImpl.Create( trans);
-        prot_Compact :  prot := TCompactProtocolImpl.Create( trans);
-      else
-        raise Exception.Create('Unhandled protocol');
-      end;
-      ASSERT( trans <> nil);
-      Console.WriteLine(THRIFT_PROTOCOLS[protType]+' protocol');
-
-      thread := TClientThread.Create( trans, prot, FNumIteration);
-      threads[test] := thread;
-      thread.Start;
-    end;
-
-    result := 0;
-    for test := 0 to FNumThread - 1 do begin
-      result := result or threads[test].WaitFor;
-    end;
-
-    for test := 0 to FNumThread - 1
-    do threads[test].Free;
-
-    Console.Write('Total time: ' + IntToStr( MilliSecondsBetween(Now, dtStart)));
-
-  except
-    on E: EAbort do raise;
-    on E: Exception do begin
-      Console.WriteLine( E.Message + #10 + E.StackTrace);
-      raise;
-    end;
-  end;
-
-  Console.WriteLine('');
-  Console.WriteLine('done!');
-end;
-
-{ TClientThread }
-
-procedure TClientThread.ClientTest;
-var
-  client : TThriftTest.Iface;
-  s : string;
-  i8 : ShortInt;
-  i32 : Integer;
-  i64 : Int64;
-  binOut,binIn : TBytes;
-  dub : Double;
-  o : IXtruct;
-  o2 : IXtruct2;
-  i : IXtruct;
-  i2 : IXtruct2;
-  mapout : IThriftDictionary<Integer,Integer>;
-  mapin : IThriftDictionary<Integer,Integer>;
-  strmapout : IThriftDictionary<string,string>;
-  strmapin : IThriftDictionary<string,string>;
-  j : Integer;
-  first : Boolean;
-  key : Integer;
-  strkey : string;
-  listout : IThriftList<Integer>;
-  listin : IThriftList<Integer>;
-  setout : IHashSet<Integer>;
-  setin : IHashSet<Integer>;
-  ret : TNumberz;
-  uid : Int64;
-  mm : IThriftDictionary<Integer, IThriftDictionary<Integer, Integer>>;
-  pos : IThriftDictionary<Integer, Integer>;
-  neg : IThriftDictionary<Integer, Integer>;
-  m2 : IThriftDictionary<Integer, Integer>;
-  k2 : Integer;
-  insane : IInsanity;
-  truck : IXtruct;
-  whoa : IThriftDictionary<Int64, IThriftDictionary<TNumberz, IInsanity>>;
-  key64 : Int64;
-  val : IThriftDictionary<TNumberz, IInsanity>;
-  k2_2 : TNumberz;
-  k3 : TNumberz;
-  v2 : IInsanity;
-  userMap : IThriftDictionary<TNumberz, Int64>;
-  xtructs : IThriftList<IXtruct>;
-  x : IXtruct;
-  arg0 : ShortInt;
-  arg1 : Integer;
-  arg2 : Int64;
-  arg3 : IThriftDictionary<SmallInt, string>;
-  arg4 : TNumberz;
-  arg5 : Int64;
-  {$IFDEF PerfTest}
-  StartTick : Cardinal;
-  k : Integer;
-  {$ENDIF}
-  hello, goodbye : IXtruct;
-  crazy : IInsanity;
-  looney : IInsanity;
-  first_map : IThriftDictionary<TNumberz, IInsanity>;
-  second_map : IThriftDictionary<TNumberz, IInsanity>;
-
-begin
-  client := TThriftTest.TClient.Create( FProtocol);
-  FTransport.Open;
-
-  {$IFDEF StressTest}
-  StressTest( client);
-  {$ENDIF StressTest}
-
-  // in-depth exception test
-  // (1) do we get an exception at all?
-  // (2) do we get the right exception?
-  // (3) does the exception contain the expected data?
-  StartTestGroup( 'testException', test_Exceptions);
-  // case 1: exception type declared in IDL at the function call
-  try
-    client.testException('Xception');
-    Expect( FALSE, 'testException(''Xception''): must trow an exception');
-  except
-    on e:TXception do begin
-      Expect( e.ErrorCode = 1001,       'error code');
-      Expect( e.Message_  = 'Xception', 'error message');
-      Console.WriteLine( ' = ' + IntToStr(e.ErrorCode) + ', ' + e.Message_ );
-    end;
-    on e:TTransportException do Expect( FALSE, 'Unexpected : "'+e.ToString+'"');
-    on e:Exception do Expect( FALSE, 'Unexpected exception type "'+e.ClassName+'"');
-  end;
-
-  // case 2: exception type NOT declared in IDL at the function call
-  // this will close the connection
-  try
-    client.testException('TException');
-    Expect( FALSE, 'testException(''TException''): must trow an exception');
-  except
-    on e:TTransportException do begin
-      Console.WriteLine( e.ClassName+' = '+e.Message); // this is what we get
-    end;
-    on e:TApplicationException do begin
-      Console.WriteLine( e.ClassName+' = '+e.Message); // this is what we get
-    end;
-    on e:TException do Expect( FALSE, 'Unexpected exception type "'+e.ClassName+'"');
-    on e:Exception do Expect( FALSE, 'Unexpected exception type "'+e.ClassName+'"');
-  end;
-
-
-  if FTransport.IsOpen then FTransport.Close;
-  FTransport.Open;   // re-open connection, server has already closed
-
-
-  // case 3: no exception
-  try
-    client.testException('something');
-    Expect( TRUE, 'testException(''something''): must not trow an exception');
-  except
-    on e:TTransportException do Expect( FALSE, 'Unexpected : "'+e.ToString+'"');
-    on e:Exception do Expect( FALSE, 'Unexpected exception "'+e.ClassName+'"');
-  end;
-
-
-  // simple things
-  StartTestGroup( 'simple Thrift calls', test_BaseTypes);
-  client.testVoid();
-  Expect( TRUE, 'testVoid()');  // success := no exception
-
-  s := BoolToString( client.testBool(TRUE));
-  Expect( s = BoolToString(TRUE),  'testBool(TRUE) = '+s);
-  s := BoolToString( client.testBool(FALSE));
-  Expect( s = BoolToString(FALSE),  'testBool(FALSE) = '+s);
-
-  s := client.testString('Test');
-  Expect( s = 'Test', 'testString(''Test'') = "'+s+'"');
-
-  s := client.testString(HUGE_TEST_STRING);
-  Expect( length(s) = length(HUGE_TEST_STRING),
-          'testString( length(HUGE_TEST_STRING) = '+IntToStr(Length(HUGE_TEST_STRING))+') '
-         +'=> length(result) = '+IntToStr(Length(s)));
-
-  i8 := client.testByte(1);
-  Expect( i8 = 1, 'testByte(1) = ' + IntToStr( i8 ));
-
-  i32 := client.testI32(-1);
-  Expect( i32 = -1, 'testI32(-1) = ' + IntToStr(i32));
-
-  Console.WriteLine('testI64(-34359738368)');
-  i64 := client.testI64(-34359738368);
-  Expect( i64 = -34359738368, 'testI64(-34359738368) = ' + IntToStr( i64));
-
-  binOut := PrepareBinaryData( TRUE);
-  Console.WriteLine('testBinary('+BytesToHex(binOut)+')');
-  try
-    binIn := client.testBinary(binOut);
-    Expect( Length(binOut) = Length(binIn), 'testBinary(): length '+IntToStr(Length(binOut))+' = '+IntToStr(Length(binIn)));
-    i32 := Min( Length(binOut), Length(binIn));
-    Expect( CompareMem( binOut, binIn, i32), 'testBinary('+BytesToHex(binOut)+') = '+BytesToHex(binIn));
-  except
-    on e:TApplicationException do Console.WriteLine('testBinary(): '+e.Message);
-    on e:Exception do Expect( FALSE, 'testBinary(): Unexpected exception "'+e.ClassName+'": '+e.Message);
-  end;
-
-  Console.WriteLine('testDouble(5.325098235)');
-  dub := client.testDouble(5.325098235);
-  Expect( abs(dub-5.325098235) < 1e-14, 'testDouble(5.325098235) = ' + FloatToStr( dub));
-
-  // structs
-  StartTestGroup( 'testStruct', test_Structs);
-  Console.WriteLine('testStruct({''Zero'', 1, -3, -5})');
-  o := TXtructImpl.Create;
-  o.String_thing := 'Zero';
-  o.Byte_thing := 1;
-  o.I32_thing := -3;
-  o.I64_thing := -5;
-  i := client.testStruct(o);
-  Expect( i.String_thing = 'Zero', 'i.String_thing = "'+i.String_thing+'"');
-  Expect( i.Byte_thing = 1, 'i.Byte_thing = '+IntToStr(i.Byte_thing));
-  Expect( i.I32_thing = -3, 'i.I32_thing = '+IntToStr(i.I32_thing));
-  Expect( i.I64_thing = -5, 'i.I64_thing = '+IntToStr(i.I64_thing));
-  Expect( i.__isset_String_thing, 'i.__isset_String_thing = '+BoolToString(i.__isset_String_thing));
-  Expect( i.__isset_Byte_thing, 'i.__isset_Byte_thing = '+BoolToString(i.__isset_Byte_thing));
-  Expect( i.__isset_I32_thing, 'i.__isset_I32_thing = '+BoolToString(i.__isset_I32_thing));
-  Expect( i.__isset_I64_thing, 'i.__isset_I64_thing = '+BoolToString(i.__isset_I64_thing));
-
-  // nested structs
-  StartTestGroup( 'testNest', test_Structs);
-  Console.WriteLine('testNest({1, {''Zero'', 1, -3, -5}, 5})');
-  o2 := TXtruct2Impl.Create;
-  o2.Byte_thing := 1;
-  o2.Struct_thing := o;
-  o2.I32_thing := 5;
-  i2 := client.testNest(o2);
-  i := i2.Struct_thing;
-  Expect( i.String_thing = 'Zero', 'i.String_thing = "'+i.String_thing+'"');
-  Expect( i.Byte_thing = 1,  'i.Byte_thing = '+IntToStr(i.Byte_thing));
-  Expect( i.I32_thing = -3,  'i.I32_thing = '+IntToStr(i.I32_thing));
-  Expect( i.I64_thing = -5,  'i.I64_thing = '+IntToStr(i.I64_thing));
-  Expect( i2.Byte_thing = 1, 'i2.Byte_thing = '+IntToStr(i2.Byte_thing));
-  Expect( i2.I32_thing = 5,  'i2.I32_thing = '+IntToStr(i2.I32_thing));
-  Expect( i.__isset_String_thing, 'i.__isset_String_thing = '+BoolToString(i.__isset_String_thing));
-  Expect( i.__isset_Byte_thing,  'i.__isset_Byte_thing = '+BoolToString(i.__isset_Byte_thing));
-  Expect( i.__isset_I32_thing,  'i.__isset_I32_thing = '+BoolToString(i.__isset_I32_thing));
-  Expect( i.__isset_I64_thing,  'i.__isset_I64_thing = '+BoolToString(i.__isset_I64_thing));
-  Expect( i2.__isset_Byte_thing, 'i2.__isset_Byte_thing');
-  Expect( i2.__isset_I32_thing,  'i2.__isset_I32_thing');
-
-  // map<type1,type2>: A map of strictly unique keys to values.
-  // Translates to an STL map, Java HashMap, PHP associative array, Python/Ruby dictionary, etc.
-  StartTestGroup( 'testMap', test_Containers);
-  mapout := TThriftDictionaryImpl<Integer,Integer>.Create;
-  for j := 0 to 4 do
-  begin
-    mapout.AddOrSetValue( j, j - 10);
-  end;
-  Console.Write('testMap({');
-  first := True;
-  for key in mapout.Keys do
-  begin
-    if first
-    then first := False
-    else Console.Write( ', ' );
-    Console.Write( IntToStr( key) + ' => ' + IntToStr( mapout[key]));
-  end;
-  Console.WriteLine('})');
-
-  mapin := client.testMap( mapout );
-  Expect( mapin.Count = mapout.Count, 'testMap: mapin.Count = mapout.Count');
-  for j := 0 to 4 do
-  begin
-    Expect( mapout.ContainsKey(j), 'testMap: mapout.ContainsKey('+IntToStr(j)+') = '+BoolToString(mapout.ContainsKey(j)));
-  end;
-  for key in mapin.Keys do
-  begin
-    Expect( mapin[key] = mapout[key], 'testMap: '+IntToStr(key) + ' => ' + IntToStr( mapin[key]));
-    Expect( mapin[key] = key - 10, 'testMap: mapin['+IntToStr(key)+'] = '+IntToStr( mapin[key]));
-  end;
-
-
-  // map<type1,type2>: A map of strictly unique keys to values.
-  // Translates to an STL map, Java HashMap, PHP associative array, Python/Ruby dictionary, etc.
-  StartTestGroup( 'testStringMap', test_Containers);
-  strmapout := TThriftDictionaryImpl<string,string>.Create;
-  for j := 0 to 4 do
-  begin
-    strmapout.AddOrSetValue( IntToStr(j), IntToStr(j - 10));
-  end;
-  Console.Write('testStringMap({');
-  first := True;
-  for strkey in strmapout.Keys do
-  begin
-    if first
-    then first := False
-    else Console.Write( ', ' );
-    Console.Write( strkey + ' => ' + strmapout[strkey]);
-  end;
-  Console.WriteLine('})');
-
-  strmapin := client.testStringMap( strmapout );
-  Expect( strmapin.Count = strmapout.Count, 'testStringMap: strmapin.Count = strmapout.Count');
-  for j := 0 to 4 do
-  begin
-    Expect( strmapout.ContainsKey(IntToStr(j)),
-            'testStringMap: strmapout.ContainsKey('+IntToStr(j)+') = '
-            + BoolToString(strmapout.ContainsKey(IntToStr(j))));
-  end;
-  for strkey in strmapin.Keys do
-  begin
-    Expect( strmapin[strkey] = strmapout[strkey], 'testStringMap: '+strkey + ' => ' + strmapin[strkey]);
-    Expect( strmapin[strkey] = IntToStr( StrToInt(strkey) - 10), 'testStringMap: strmapin['+strkey+'] = '+strmapin[strkey]);
-  end;
-
-
-  // set<type>: An unordered set of unique elements.
-  // Translates to an STL set, Java HashSet, set in Python, etc.
-  // Note: PHP does not support sets, so it is treated similar to a List
-  StartTestGroup( 'testSet', test_Containers);
-  setout := THashSetImpl<Integer>.Create;
-  for j := -2 to 2 do
-  begin
-    setout.Add( j );
-  end;
-  Console.Write('testSet({');
-  first := True;
-  for j in setout do
-  begin
-    if first
-    then first := False
-    else Console.Write(', ');
-    Console.Write(IntToStr( j));
-  end;
-  Console.WriteLine('})');
-
-  setin := client.testSet(setout);
-  Expect( setin.Count = setout.Count, 'testSet: setin.Count = setout.Count');
-  Expect( setin.Count = 5, 'testSet: setin.Count = '+IntToStr(setin.Count));
-  for j := -2 to 2 do // unordered, we can't rely on the order => test for known elements only
-  begin
-    Expect( setin.Contains(j), 'testSet: setin.Contains('+IntToStr(j)+') => '+BoolToString(setin.Contains(j)));
-  end;
-
-  // list<type>: An ordered list of elements.
-  // Translates to an STL vector, Java ArrayList, native arrays in scripting languages, etc.
-  StartTestGroup( 'testList', test_Containers);
-  listout := TThriftListImpl<Integer>.Create;
-  listout.Add( +1);
-  listout.Add( -2);
-  listout.Add( +3);
-  listout.Add( -4);
-  listout.Add( 0);
-  Console.Write('testList({');
-  first := True;
-  for j in listout do
-    begin
-    if first
-    then first := False
-    else Console.Write(', ');
-    Console.Write(IntToStr( j));
-  end;
-  Console.WriteLine('})');
-
-  listin := client.testList(listout);
-  Expect( listin.Count = listout.Count, 'testList: listin.Count = listout.Count');
-  Expect( listin.Count = 5, 'testList: listin.Count = '+IntToStr(listin.Count));
-  Expect( listin[0] = +1, 'listin[0] = '+IntToStr( listin[0]));
-  Expect( listin[1] = -2, 'listin[1] = '+IntToStr( listin[1]));
-  Expect( listin[2] = +3, 'listin[2] = '+IntToStr( listin[2]));
-  Expect( listin[3] = -4, 'listin[3] = '+IntToStr( listin[3]));
-  Expect( listin[4] = 0,  'listin[4] = '+IntToStr( listin[4]));
-
-  // enums
-  ret := client.testEnum(TNumberz.ONE);
-  Expect( ret = TNumberz.ONE, 'testEnum(ONE) = '+IntToStr(Ord(ret)));
-
-  ret := client.testEnum(TNumberz.TWO);
-  Expect( ret = TNumberz.TWO, 'testEnum(TWO) = '+IntToStr(Ord(ret)));
-
-  ret := client.testEnum(TNumberz.THREE);
-  Expect( ret = TNumberz.THREE, 'testEnum(THREE) = '+IntToStr(Ord(ret)));
-
-  ret := client.testEnum(TNumberz.FIVE);
-  Expect( ret = TNumberz.FIVE, 'testEnum(FIVE) = '+IntToStr(Ord(ret)));
-
-  ret := client.testEnum(TNumberz.EIGHT);
-  Expect( ret = TNumberz.EIGHT, 'testEnum(EIGHT) = '+IntToStr(Ord(ret)));
-
-
-  // typedef
-  uid := client.testTypedef(309858235082523);
-  Expect( uid = 309858235082523, 'testTypedef(309858235082523) = '+IntToStr(uid));
-
-
-  // maps of maps
-  StartTestGroup( 'testMapMap(1)', test_Containers);
-  mm := client.testMapMap(1);
-  Console.Write(' = {');
-  for key in mm.Keys do
-  begin
-    Console.Write( IntToStr( key) + ' => {');
-    m2 := mm[key];
-    for  k2 in m2.Keys do
-    begin
-      Console.Write( IntToStr( k2) + ' => ' + IntToStr( m2[k2]) + ', ');
-    end;
-    Console.Write('}, ');
-  end;
-  Console.WriteLine('}');
-
-  // verify result data
-  Expect( mm.Count = 2, 'mm.Count = '+IntToStr(mm.Count));
-  pos := mm[4];
-  neg := mm[-4];
-  for j := 1 to 4 do
-  begin
-    Expect( pos[j]  = j,  'pos[j]  = '+IntToStr(pos[j]));
-    Expect( neg[-j] = -j, 'neg[-j] = '+IntToStr(neg[-j]));
-  end;
-
-
-
-  // insanity
-  StartTestGroup( 'testInsanity', test_Structs);
-  insane := TInsanityImpl.Create;
-  insane.UserMap := TThriftDictionaryImpl<TNumberz, Int64>.Create;
-  insane.UserMap.AddOrSetValue( TNumberz.FIVE, 5000);
-  truck := TXtructImpl.Create;
-  truck.String_thing := 'Truck';
-  truck.Byte_thing := 8;
-  truck.I32_thing := 8;
-  truck.I64_thing := 8;
-  insane.Xtructs := TThriftListImpl<IXtruct>.Create;
-  insane.Xtructs.Add( truck );
-  whoa := client.testInsanity( insane );
-  Console.Write(' = {');
-  for key64 in whoa.Keys do
-  begin
-    val := whoa[key64];
-    Console.Write( IntToStr( key64) + ' => {');
-    for k2_2 in val.Keys do
-    begin
-      v2 := val[k2_2];
-      Console.Write( IntToStr( Integer( k2_2)) + ' => {');
-      userMap := v2.UserMap;
-      Console.Write('{');
-      if userMap <> nil then
-      begin
-        for k3 in userMap.Keys do
-        begin
-          Console.Write( IntToStr( Integer( k3)) + ' => ' + IntToStr( userMap[k3]) + ', ');
-        end;
-      end else
-      begin
-        Console.Write('null');
-      end;
-      Console.Write('}, ');
-      xtructs := v2.Xtructs;
-      Console.Write('{');
-
-      if xtructs <> nil then
-      begin
-        for x in xtructs do
-        begin
-          Console.Write('{"' + x.String_thing + '", ' +
-            IntToStr( x.Byte_thing) + ', ' +
-            IntToStr( x.I32_thing) + ', ' +
-            IntToStr( x.I32_thing) + '}, ');
-        end;
-      end else
-      begin
-        Console.Write('null');
-      end;
-      Console.Write('}');
-      Console.Write('}, ');
-    end;
-    Console.Write('}, ');
-  end;
-  Console.WriteLine('}');
-
-  // verify result data
-  Expect( whoa.Count = 2, 'whoa.Count = '+IntToStr(whoa.Count));
-  //
-  first_map  := whoa[1];
-  second_map := whoa[2];
-  Expect( first_map.Count = 2, 'first_map.Count = '+IntToStr(first_map.Count));
-  Expect( second_map.Count = 1, 'second_map.Count = '+IntToStr(second_map.Count));
-  //
-  looney := second_map[TNumberz.SIX];
-  Expect( Assigned(looney), 'Assigned(looney) = '+BoolToString(Assigned(looney)));
-  Expect( not looney.__isset_UserMap, 'looney.__isset_UserMap = '+BoolToString(looney.__isset_UserMap));
-  Expect( not looney.__isset_Xtructs, 'looney.__isset_Xtructs = '+BoolToString(looney.__isset_Xtructs));
-  //
-  for ret in [TNumberz.TWO, TNumberz.THREE] do begin
-    crazy := first_map[ret];
-    Console.WriteLine('first_map['+intToStr(Ord(ret))+']');
-
-    Expect( crazy.__isset_UserMap, 'crazy.__isset_UserMap = '+BoolToString(crazy.__isset_UserMap));
-    Expect( crazy.__isset_Xtructs, 'crazy.__isset_Xtructs = '+BoolToString(crazy.__isset_Xtructs));
-
-    Expect( crazy.UserMap.Count = 2, 'crazy.UserMap.Count = '+IntToStr(crazy.UserMap.Count));
-    Expect( crazy.UserMap[TNumberz.FIVE] = 5, 'crazy.UserMap[TNumberz.FIVE] = '+IntToStr(crazy.UserMap[TNumberz.FIVE]));
-    Expect( crazy.UserMap[TNumberz.EIGHT] = 8, 'crazy.UserMap[TNumberz.EIGHT] = '+IntToStr(crazy.UserMap[TNumberz.EIGHT]));
-
-    Expect( crazy.Xtructs.Count = 2, 'crazy.Xtructs.Count = '+IntToStr(crazy.Xtructs.Count));
-    goodbye := crazy.Xtructs[0];  // lists are ordered, so we are allowed to assume this order
-      hello   := crazy.Xtructs[1];
-
-    Expect( goodbye.String_thing = 'Goodbye4', 'goodbye.String_thing = "'+goodbye.String_thing+'"');
-    Expect( goodbye.Byte_thing = 4, 'goodbye.Byte_thing = '+IntToStr(goodbye.Byte_thing));
-    Expect( goodbye.I32_thing = 4, 'goodbye.I32_thing = '+IntToStr(goodbye.I32_thing));
-    Expect( goodbye.I64_thing = 4, 'goodbye.I64_thing = '+IntToStr(goodbye.I64_thing));
-    Expect( goodbye.__isset_String_thing, 'goodbye.__isset_String_thing = '+BoolToString(goodbye.__isset_String_thing));
-    Expect( goodbye.__isset_Byte_thing, 'goodbye.__isset_Byte_thing = '+BoolToString(goodbye.__isset_Byte_thing));
-    Expect( goodbye.__isset_I32_thing, 'goodbye.__isset_I32_thing = '+BoolToString(goodbye.__isset_I32_thing));
-    Expect( goodbye.__isset_I64_thing, 'goodbye.__isset_I64_thing = '+BoolToString(goodbye.__isset_I64_thing));
-
-    Expect( hello.String_thing = 'Hello2', 'hello.String_thing = "'+hello.String_thing+'"');
-    Expect( hello.Byte_thing = 2, 'hello.Byte_thing = '+IntToStr(hello.Byte_thing));
-    Expect( hello.I32_thing = 2, 'hello.I32_thing = '+IntToStr(hello.I32_thing));
-    Expect( hello.I64_thing = 2, 'hello.I64_thing = '+IntToStr(hello.I64_thing));
-    Expect( hello.__isset_String_thing, 'hello.__isset_String_thing = '+BoolToString(hello.__isset_String_thing));
-    Expect( hello.__isset_Byte_thing, 'hello.__isset_Byte_thing = '+BoolToString(hello.__isset_Byte_thing));
-    Expect( hello.__isset_I32_thing, 'hello.__isset_I32_thing = '+BoolToString(hello.__isset_I32_thing));
-    Expect( hello.__isset_I64_thing, 'hello.__isset_I64_thing = '+BoolToString(hello.__isset_I64_thing));
-  end;
-
-
-  // multi args
-  StartTestGroup( 'testMulti', test_BaseTypes);
-  arg0 := 1;
-  arg1 := 2;
-  arg2 := High(Int64);
-  arg3 := TThriftDictionaryImpl<SmallInt, string>.Create;
-  arg3.AddOrSetValue( 1, 'one');
-  arg4 := TNumberz.FIVE;
-  arg5 := 5000000;
-  Console.WriteLine('Test Multi(' + IntToStr( arg0) + ',' +
-    IntToStr( arg1) + ',' + IntToStr( arg2) + ',' +
-    arg3.ToString + ',' + IntToStr( Integer( arg4)) + ',' +
-      IntToStr( arg5) + ')');
-
-  i := client.testMulti( arg0, arg1, arg2, arg3, arg4, arg5);
-  Expect( i.String_thing = 'Hello2', 'testMulti: i.String_thing = "'+i.String_thing+'"');
-  Expect( i.Byte_thing = arg0, 'testMulti: i.Byte_thing = '+IntToStr(i.Byte_thing));
-  Expect( i.I32_thing = arg1, 'testMulti: i.I32_thing = '+IntToStr(i.I32_thing));
-  Expect( i.I64_thing = arg2, 'testMulti: i.I64_thing = '+IntToStr(i.I64_thing));
-  Expect( i.__isset_String_thing, 'testMulti: i.__isset_String_thing = '+BoolToString(i.__isset_String_thing));
-  Expect( i.__isset_Byte_thing, 'testMulti: i.__isset_Byte_thing = '+BoolToString(i.__isset_Byte_thing));
-  Expect( i.__isset_I32_thing, 'testMulti: i.__isset_I32_thing = '+BoolToString(i.__isset_I32_thing));
-  Expect( i.__isset_I64_thing, 'testMulti: i.__isset_I64_thing = '+BoolToString(i.__isset_I64_thing));
-
-  // multi exception
-  StartTestGroup( 'testMultiException(1)', test_Exceptions);
-  try
-    i := client.testMultiException( 'need more pizza', 'run out of beer');
-    Expect( i.String_thing = 'run out of beer', 'i.String_thing = "' +i.String_thing+ '"');
-    Expect( i.__isset_String_thing, 'i.__isset_String_thing = '+BoolToString(i.__isset_String_thing));
-    { this is not necessarily true, these fields are default-serialized
-    Expect( not i.__isset_Byte_thing, 'i.__isset_Byte_thing = '+BoolToString(i.__isset_Byte_thing));
-    Expect( not i.__isset_I32_thing, 'i.__isset_I32_thing = '+BoolToString(i.__isset_I32_thing));
-    Expect( not i.__isset_I64_thing, 'i.__isset_I64_thing = '+BoolToString(i.__isset_I64_thing));
-    }
-  except
-    on e:Exception do Expect( FALSE, 'Unexpected exception "'+e.ClassName+'"');
-  end;
-
-  StartTestGroup( 'testMultiException(Xception)', test_Exceptions);
-  try
-    i := client.testMultiException( 'Xception', 'second test');
-    Expect( FALSE, 'testMultiException(''Xception''): must trow an exception');
-  except
-    on x:TXception do begin
-      Expect( x.__isset_ErrorCode, 'x.__isset_ErrorCode = '+BoolToString(x.__isset_ErrorCode));
-      Expect( x.__isset_Message_,  'x.__isset_Message_ = '+BoolToString(x.__isset_Message_));
-      Expect( x.ErrorCode = 1001, 'x.ErrorCode = '+IntToStr(x.ErrorCode));
-      Expect( x.Message_ = 'This is an Xception', 'x.Message = "'+x.Message_+'"');
-    end;
-    on e:Exception do Expect( FALSE, 'Unexpected exception "'+e.ClassName+'"');
-  end;
-
-  StartTestGroup( 'testMultiException(Xception2)', test_Exceptions);
-  try
-    i := client.testMultiException( 'Xception2', 'third test');
-    Expect( FALSE, 'testMultiException(''Xception2''): must trow an exception');
-  except
-    on x:TXception2 do begin
-      Expect( x.__isset_ErrorCode, 'x.__isset_ErrorCode = '+BoolToString(x.__isset_ErrorCode));
-      Expect( x.__isset_Struct_thing,  'x.__isset_Struct_thing = '+BoolToString(x.__isset_Struct_thing));
-      Expect( x.ErrorCode = 2002, 'x.ErrorCode = '+IntToStr(x.ErrorCode));
-      Expect( x.Struct_thing.String_thing = 'This is an Xception2', 'x.Struct_thing.String_thing = "'+x.Struct_thing.String_thing+'"');
-      Expect( x.Struct_thing.__isset_String_thing, 'x.Struct_thing.__isset_String_thing = '+BoolToString(x.Struct_thing.__isset_String_thing));
-      { this is not necessarily true, these fields are default-serialized
-      Expect( not x.Struct_thing.__isset_Byte_thing, 'x.Struct_thing.__isset_Byte_thing = '+BoolToString(x.Struct_thing.__isset_Byte_thing));
-      Expect( not x.Struct_thing.__isset_I32_thing, 'x.Struct_thing.__isset_I32_thing = '+BoolToString(x.Struct_thing.__isset_I32_thing));
-      Expect( not x.Struct_thing.__isset_I64_thing, 'x.Struct_thing.__isset_I64_thing = '+BoolToString(x.Struct_thing.__isset_I64_thing));
-      }
-    end;
-    on e:Exception do Expect( FALSE, 'Unexpected exception "'+e.ClassName+'"');
-  end;
-
-
-  // oneway functions
-  StartTestGroup( 'Test Oneway(1)', test_Unknown);
-  client.testOneway(1);
-  Expect( TRUE, 'Test Oneway(1)');  // success := no exception
-
-  // call time
-  {$IFDEF PerfTest}
-  StartTestGroup( 'Test Calltime()');
-  StartTick := GetTickCount;
-  for k := 0 to 1000 - 1 do
-  begin
-    client.testVoid();
-  end;
-  Console.WriteLine(' = ' + FloatToStr( (GetTickCount - StartTick) / 1000 ) + ' ms a testVoid() call' );
-  {$ENDIF PerfTest}
-
-  // no more tests here
-  StartTestGroup( '', test_Unknown);
-end;
-
-
-{$IFDEF StressTest}
-procedure TClientThread.StressTest(const client : TThriftTest.Iface);
-begin
-  while TRUE do begin
-    try
-      if not FTransport.IsOpen then FTransport.Open;   // re-open connection, server has already closed
-      try
-        client.testString('Test');
-        Write('.');
-      finally
-        if FTransport.IsOpen then FTransport.Close;
-      end;
-    except
-      on e:Exception do Writeln(#10+e.message);
-    end;
-  end;
-end;
-{$ENDIF}
-
-
-function TClientThread.PrepareBinaryData( aRandomDist : Boolean = FALSE) : TBytes;
-var i, nextPos : Integer;
-begin
-  SetLength( result, $100);
-  ASSERT( Low(result) = 0);
-
-  // linear distribution, unless random is requested
-  if not aRandomDist then begin
-    for i := Low(result) to High(result) do begin
-      result[i] := i;
-    end;
-    Exit;
-  end;
-
-  // random distribution of all 256 values
-  FillChar( result[0], Length(result) * SizeOf(result[0]), $0);
-  i := 1;
-  while i < Length(result) do begin
-    nextPos := Byte( Random($100));
-    if result[nextPos] = 0 then begin  // unused?
-      result[nextPos] := i;
-      Inc(i);
-    end;
-  end;
-end;
-
-
-procedure TClientThread.JSONProtocolReadWriteTest;
-// Tests only then read/write procedures of the JSON protocol
-// All tests succeed, if we can read what we wrote before
-// Note that passing this test does not imply, that our JSON is really compatible to what
-// other clients or servers expect as the real JSON. This is beyond the scope of this test.
-var prot   : IProtocol;
-    stm    : TStringStream;
-    list   : IList;
-    binary, binRead : TBytes;
-    i,iErr : Integer;
-const
-  TEST_SHORT   = ShortInt( $FE);
-  TEST_SMALL   = SmallInt( $FEDC);
-  TEST_LONG    = LongInt( $FEDCBA98);
-  TEST_I64     = Int64( $FEDCBA9876543210);
-  TEST_DOUBLE  = -1.234e-56;
-  DELTA_DOUBLE = TEST_DOUBLE * 1e-14;
-  TEST_STRING  = 'abc-'#$00E4#$00f6#$00fc; // german umlauts (en-us: "funny chars")
-  // Test THRIFT-2336 and THRIFT-3404 with U+1D11E (G Clef symbol) and 'Русское Название';
-  G_CLEF_AND_CYRILLIC_TEXT = #$1d11e' '#$0420#$0443#$0441#$0441#$043a#$043e#$0435' '#$041d#$0430#$0437#$0432#$0430#$043d#$0438#$0435;
-  G_CLEF_AND_CYRILLIC_JSON = '"\ud834\udd1e \u0420\u0443\u0441\u0441\u043a\u043e\u0435 \u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435"';
-  // test both possible solidus encodings
-  SOLIDUS_JSON_DATA = '"one/two\/three"';
-  SOLIDUS_EXCPECTED = 'one/two/three';
-begin
-  stm  := TStringStream.Create;
-  try
-    StartTestGroup( 'JsonProtocolTest', test_Unknown);
-
-    // prepare binary data
-    binary := PrepareBinaryData( FALSE);
-
-    // output setup
-    prot := TJSONProtocolImpl.Create(
-              TStreamTransportImpl.Create(
-                nil, TThriftStreamAdapterDelphi.Create( stm, FALSE)));
-
-    // write
-    prot.WriteListBegin( TListImpl.Create( TType.String_, 9));
-    prot.WriteBool( TRUE);
-    prot.WriteBool( FALSE);
-    prot.WriteByte( TEST_SHORT);
-    prot.WriteI16( TEST_SMALL);
-    prot.WriteI32( TEST_LONG);
-    prot.WriteI64( TEST_I64);
-    prot.WriteDouble( TEST_DOUBLE);
-    prot.WriteString( TEST_STRING);
-    prot.WriteBinary( binary);
-    prot.WriteListEnd;
-
-    // input setup
-    Expect( stm.Position = stm.Size, 'Stream position/length after write');
-    stm.Position := 0;
-    prot := TJSONProtocolImpl.Create(
-              TStreamTransportImpl.Create(
-                TThriftStreamAdapterDelphi.Create( stm, FALSE), nil));
-
-    // read and compare
-    list := prot.ReadListBegin;
-    Expect( list.ElementType = TType.String_, 'list element type');
-    Expect( list.Count = 9, 'list element count');
-    Expect( prot.ReadBool, 'WriteBool/ReadBool: TRUE');
-    Expect( not prot.ReadBool, 'WriteBool/ReadBool: FALSE');
-    Expect( prot.ReadByte   = TEST_SHORT,  'WriteByte/ReadByte');
-    Expect( prot.ReadI16    = TEST_SMALL,  'WriteI16/ReadI16');
-    Expect( prot.ReadI32    = TEST_LONG,   'WriteI32/ReadI32');
-    Expect( prot.ReadI64    = TEST_I64,    'WriteI64/ReadI64');
-    Expect( abs(prot.ReadDouble-TEST_DOUBLE) < abs(DELTA_DOUBLE), 'WriteDouble/ReadDouble');
-    Expect( prot.ReadString = TEST_STRING, 'WriteString/ReadString');
-    binRead := prot.ReadBinary;
-    prot.ReadListEnd;
-
-    // test binary data
-    Expect( Length(binary) = Length(binRead), 'Binary data length check');
-    iErr := -1;
-    for i := Low(binary) to High(binary) do begin
-      if binary[i] <> binRead[i] then begin
-        iErr := i;
-        Break;
-      end;
-    end;
-    if iErr < 0
-    then Expect( TRUE,  'Binary data check ('+IntToStr(Length(binary))+' Bytes)')
-    else Expect( FALSE, 'Binary data check at offset '+IntToStr(iErr));
-
-    Expect( stm.Position = stm.Size, 'Stream position after read');
-
-
-    // Solidus can be encoded in two ways. Make sure we can read both
-    stm.Position := 0;
-    stm.Size     := 0;
-    stm.WriteString(SOLIDUS_JSON_DATA);
-    stm.Position := 0;
-    prot := TJSONProtocolImpl.Create(
-              TStreamTransportImpl.Create(
-                TThriftStreamAdapterDelphi.Create( stm, FALSE), nil));
-    Expect( prot.ReadString = SOLIDUS_EXCPECTED, 'Solidus encoding');
-
-
-    // Widechars should work too. Do they?
-    // After writing, we ensure that we are able to read it back
-    // We can't assume hex-encoding, since (nearly) any Unicode char is valid JSON
-    stm.Position := 0;
-    stm.Size     := 0;
-    prot := TJSONProtocolImpl.Create(
-              TStreamTransportImpl.Create(
-                nil, TThriftStreamAdapterDelphi.Create( stm, FALSE)));
-    prot.WriteString( G_CLEF_AND_CYRILLIC_TEXT);
-    stm.Position := 0;
-    prot := TJSONProtocolImpl.Create(
-              TStreamTransportImpl.Create(
-                TThriftStreamAdapterDelphi.Create( stm, FALSE), nil));
-    Expect( prot.ReadString = G_CLEF_AND_CYRILLIC_TEXT, 'Writing JSON with chars > 8 bit');
-
-    // Widechars should work with hex-encoding too. Do they?
-    stm.Position := 0;
-    stm.Size     := 0;
-    stm.WriteString( G_CLEF_AND_CYRILLIC_JSON);
-    stm.Position := 0;
-    prot := TJSONProtocolImpl.Create(
-              TStreamTransportImpl.Create(
-                TThriftStreamAdapterDelphi.Create( stm, FALSE), nil));
-    Expect( prot.ReadString = G_CLEF_AND_CYRILLIC_TEXT, 'Reading JSON with chars > 8 bit');
-
-
-  finally
-    stm.Free;
-    prot := nil;  //-> Release
-    StartTestGroup( '', test_Unknown);  // no more tests here
-  end;
-end;
-
-
-procedure TClientThread.StartTestGroup( const aGroup : string; const aTest : TTestGroup);
-begin
-  FTestGroup := aGroup;
-  FCurrentTest := aTest;
-
-  Include( FExecuted, aTest);
-
-  if FTestGroup <> '' then begin
-    Console.WriteLine('');
-    Console.WriteLine( aGroup+' tests');
-    Console.WriteLine( StringOfChar('-',60));
-  end;
-end;
-
-
-procedure TClientThread.Expect( aTestResult : Boolean; const aTestInfo : string);
-begin
-  if aTestResult  then begin
-    Inc(FSuccesses);
-    Console.WriteLine( aTestInfo+': passed');
-  end
-  else begin
-    FErrors.Add( FTestGroup+': '+aTestInfo);
-    Include( FFailed, FCurrentTest);
-    Console.WriteLine( aTestInfo+': *** FAILED ***');
-
-    // We have a failed test!
-    // -> issue DebugBreak ONLY if a debugger is attached,
-    // -> unhandled DebugBreaks would cause Windows to terminate the app otherwise
-    if IsDebuggerPresent
-    then {$IFDEF CPUX64} DebugBreak {$ELSE} asm int 3 end {$ENDIF};
-  end;
-end;
-
-
-procedure TClientThread.ReportResults;
-var nTotal : Integer;
-    sLine : string;
-begin
-  // prevent us from stupid DIV/0 errors
-  nTotal := FSuccesses + FErrors.Count;
-  if nTotal = 0 then begin
-    Console.WriteLine('No results logged');
-    Exit;
-  end;
-
-  Console.WriteLine('');
-  Console.WriteLine( StringOfChar('=',60));
-  Console.WriteLine( IntToStr(nTotal)+' tests performed');
-  Console.WriteLine( IntToStr(FSuccesses)+' tests succeeded ('+IntToStr(round(100*FSuccesses/nTotal))+'%)');
-  Console.WriteLine( IntToStr(FErrors.Count)+' tests failed ('+IntToStr(round(100*FErrors.Count/nTotal))+'%)');
-  Console.WriteLine( StringOfChar('=',60));
-  if FErrors.Count > 0 then begin
-    Console.WriteLine('FAILED TESTS:');
-    for sLine in FErrors do Console.WriteLine('- '+sLine);
-    Console.WriteLine( StringOfChar('=',60));
-    InterlockedIncrement( ExitCode);  // return <> 0 on errors
-  end;
-  Console.WriteLine('');
-end;
-
-
-function TClientThread.CalculateExitCode : Byte;
-var test : TTestGroup;
-begin
-  result := EXITCODE_SUCCESS;
-  for test := Low(TTestGroup) to High(TTestGroup) do begin
-    if (test in FFailed) or not (test in FExecuted)
-    then result := result or MAP_FAILURES_TO_EXITCODE_BITS[test];
-  end;
-end;
-
-
-constructor TClientThread.Create( const ATransport: ITransport; const AProtocol : IProtocol; ANumIteration: Integer);
-begin
-  inherited Create( True );
-  FNumIteration := ANumIteration;
-  FTransport := ATransport;
-  FProtocol := AProtocol;
-  FConsole := TThreadConsole.Create( Self );
-  FCurrentTest := test_Unknown;
-
-  // error list: keep correct order, allow for duplicates
-  FErrors := TStringList.Create;
-  FErrors.Sorted := FALSE;
-  FErrors.Duplicates := dupAccept;
-end;
-
-destructor TClientThread.Destroy;
-begin
-  FreeAndNil( FConsole);
-  FreeAndNil( FErrors);
-  inherited;
-end;
-
-procedure TClientThread.Execute;
-var
-  i : Integer;
-  proc : TThreadProcedure;
-begin
-  // perform all tests
-  try
-    JSONProtocolReadWriteTest;
-    for i := 0 to FNumIteration - 1 do
-    begin
-      ClientTest;
-    end;
-  except
-    on e:Exception do Expect( FALSE, 'unexpected exception: "'+e.message+'"');
-  end;
-
-  // report the outcome
-  ReportResults;
-  SetReturnValue( CalculateExitCode);
-
-  // shutdown
-  proc := procedure
-  begin
-    if FTransport <> nil then
-    begin
-      FTransport.Close;
-      FTransport := nil;
-    end;
-  end;
-
-  Synchronize( proc );
-end;
-
-
-{ TThreadConsole }
-
-constructor TThreadConsole.Create(AThread: TThread);
-begin
-  inherited Create;
-  FThread := AThread;
-end;
-
-procedure TThreadConsole.Write(const S: string);
-var
-  proc : TThreadProcedure;
-begin
-  proc := procedure
-  begin
-    Console.Write( S );
-  end;
-  TThread.Synchronize( FThread, proc);
-end;
-
-procedure TThreadConsole.WriteLine(const S: string);
-var
-  proc : TThreadProcedure;
-begin
-  proc := procedure
-  begin
-    Console.WriteLine( S );
-  end;
-  TThread.Synchronize( FThread, proc);
-end;
-
-initialization
-begin
-  TTestClient.FNumIteration := 1;
-  TTestClient.FNumThread := 1;
-end;
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/TestConstants.pas b/vendor/git.apache.org/thrift.git/lib/delphi/test/TestConstants.pas
deleted file mode 100644
index 37969dc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/TestConstants.pas
+++ /dev/null
@@ -1,162 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit TestConstants;
-
-interface
-
-uses SysUtils;
-
-type
-  TKnownProtocol = (
-    prot_Binary,  // default binary protocol
-    prot_JSON,    // JSON protocol
-    prot_Compact
-  );
-
-  TServerType = (
-    srv_Simple,
-    srv_Nonblocking,
-    srv_Threadpool,
-    srv_Threaded
-  );
-
-  TEndpointTransport = (
-    trns_Sockets,
-    trns_Http,
-    trns_NamedPipes,
-    trns_AnonPipes,
-    trns_EvHttp  // as listed on http://thrift.apache.org/test
-  );
-
-  TLayeredTransport = (
-    trns_Buffered,
-    trns_Framed
-  );
-
-  TLayeredTransports = set of TLayeredTransport;
-
-const
-  SERVER_TYPES : array[TServerType] of string
-                  = ('Simple', 'Nonblocking', 'Threadpool', 'Threaded');
-
-  THRIFT_PROTOCOLS : array[TKnownProtocol] of string
-                  = ('Binary', 'JSON', 'Compact');
-
-  LAYERED_TRANSPORTS : array[TLayeredTransport] of string
-                  = ('Buffered', 'Framed');
-
-  ENDPOINT_TRANSPORTS : array[TEndpointTransport] of string
-                  = ('Sockets', 'Http', 'Named Pipes','Anon Pipes', 'EvHttp');
-
-  // defaults are: read=false, write=true
-  BINARY_STRICT_READ  = FALSE;
-  BINARY_STRICT_WRITE = FALSE;
-
-  HUGE_TEST_STRING = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '
-                   + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '
-                   + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '
-                   + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '
-                   + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '
-                   + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '
-                   + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '
-                   + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '
-                   + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy '
-                   + 'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam '
-                   + 'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit '
-                   + 'amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam '
-                   + 'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed '
-                   + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet '
-                   + 'clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. ';
-
-
-function BytesToHex( const bytes : TBytes) : string;
-
-
-implementation
-
-
-function BytesToHex( const bytes : TBytes) : string;
-var i : Integer;
-begin
-  result := '';
-  for i := Low(bytes) to High(bytes) do begin
-    result := result + IntToHex(bytes[i],2);
-  end;
-end;
-
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/TestServer.pas b/vendor/git.apache.org/thrift.git/lib/delphi/test/TestServer.pas
deleted file mode 100644
index d7917ca..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/TestServer.pas
+++ /dev/null
@@ -1,756 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit TestServer;
-
-{$I ../src/Thrift.Defines.inc}
-{$WARN SYMBOL_PLATFORM OFF}
-
-{.$DEFINE RunEndless}   // activate to interactively stress-test the server stop routines via Ctrl+C
-
-interface
-
-uses
-  Windows, SysUtils,
-  Generics.Collections,
-  Thrift.Console,
-  Thrift.Server,
-  Thrift.Transport,
-  Thrift.Transport.Pipes,
-  Thrift.Protocol,
-  Thrift.Protocol.JSON,
-  Thrift.Protocol.Compact,
-  Thrift.Collections,
-  Thrift.Utils,
-  Thrift.Test,
-  Thrift,
-  TestConstants,
-  TestServerEvents,
-  Contnrs;
-
-type
-  TTestServer = class
-  public
-    type
-
-      ITestHandler = interface( TThriftTest.Iface )
-        procedure SetServer( const AServer : IServer );
-        procedure TestStop;
-      end;
-
-      TTestHandlerImpl = class( TInterfacedObject, ITestHandler )
-      private
-        FServer : IServer;
-      protected
-        procedure testVoid();
-        function testBool(thing: Boolean): Boolean;
-        function testString(const thing: string): string;
-        function testByte(thing: ShortInt): ShortInt;
-        function testI32(thing: Integer): Integer;
-        function testI64(const thing: Int64): Int64;
-        function testDouble(const thing: Double): Double;
-        function testBinary(const thing: TBytes): TBytes;
-        function testStruct(const thing: IXtruct): IXtruct;
-        function testNest(const thing: IXtruct2): IXtruct2;
-        function testMap(const thing: IThriftDictionary<Integer, Integer>): IThriftDictionary<Integer, Integer>;
-        function testStringMap(const thing: IThriftDictionary<string, string>): IThriftDictionary<string, string>;
-        function testSet(const thing: IHashSet<Integer>): IHashSet<Integer>;
-        function testList(const thing: IThriftList<Integer>): IThriftList<Integer>;
-        function testEnum(thing: TNumberz): TNumberz;
-        function testTypedef(const thing: Int64): Int64;
-        function testMapMap(hello: Integer): IThriftDictionary<Integer, IThriftDictionary<Integer, Integer>>;
-        function testInsanity(const argument: IInsanity): IThriftDictionary<Int64, IThriftDictionary<TNumberz, IInsanity>>;
-        function testMulti(arg0: ShortInt; arg1: Integer; const arg2: Int64; const arg3: IThriftDictionary<SmallInt, string>; arg4: TNumberz; const arg5: Int64): IXtruct;
-        procedure testException(const arg: string);
-        function testMultiException(const arg0: string; const arg1: string): IXtruct;
-        procedure testOneway(secondsToSleep: Integer);
-
-        procedure TestStop;
-        procedure SetServer( const AServer : IServer );
-      end;
-
-      class procedure PrintCmdLineHelp;
-      class procedure InvalidArgs;
-
-      class procedure LaunchAnonPipeChild( const app : string; const transport : IAnonymousPipeServerTransport);
-      class procedure Execute( const args: array of string);
-  end;
-
-implementation
-
-
-var g_Handler : TTestServer.ITestHandler = nil;
-
-
-function MyConsoleEventHandler( dwCtrlType : DWORD) : BOOL;  stdcall;
-// Note that this Handler procedure is called from another thread
-var handler : TTestServer.ITestHandler;
-begin
-  result := TRUE;
-  try
-    case dwCtrlType of
-      CTRL_C_EVENT        :  Console.WriteLine( 'Ctrl+C pressed');
-      CTRL_BREAK_EVENT    :  Console.WriteLine( 'Ctrl+Break pressed');
-      CTRL_CLOSE_EVENT    :  Console.WriteLine( 'Received CloseTask signal');
-      CTRL_LOGOFF_EVENT   :  Console.WriteLine( 'Received LogOff signal');
-      CTRL_SHUTDOWN_EVENT :  Console.WriteLine( 'Received Shutdown signal');
-    else
-      Console.WriteLine( 'Received console event #'+IntToStr(Integer(dwCtrlType)));
-    end;
-
-    handler := g_Handler;
-    if handler <> nil then handler.TestStop;
-
-  except
-    // catch all
-  end;
-end;
-
-
-{ TTestServer.TTestHandlerImpl }
-
-procedure TTestServer.TTestHandlerImpl.SetServer( const AServer: IServer);
-begin
-  FServer := AServer;
-end;
-
-function TTestServer.TTestHandlerImpl.testByte(thing: ShortInt): ShortInt;
-begin
-  Console.WriteLine('testByte("' + IntToStr( thing) + '")');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testDouble( const thing: Double): Double;
-begin
-  Console.WriteLine('testDouble("' + FloatToStr( thing ) + '")');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testBinary(const thing: TBytes): TBytes;
-begin
-  Console.WriteLine('testBinary("' + BytesToHex( thing ) + '")');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testEnum(thing: TNumberz): TNumberz;
-begin
-  Console.WriteLine('testEnum(' + IntToStr( Integer( thing)) + ')');
-  Result := thing;
-end;
-
-procedure TTestServer.TTestHandlerImpl.testException(const arg: string);
-begin
-  Console.WriteLine('testException(' + arg + ')');
-  if ( arg = 'Xception') then
-  begin
-    raise TXception.Create( 1001, arg);
-  end;
-
-  if (arg = 'TException') then
-  begin
-    raise TException.Create('');
-  end;
-
-  // else do not throw anything
-end;
-
-function TTestServer.TTestHandlerImpl.testI32(thing: Integer): Integer;
-begin
-  Console.WriteLine('testI32("' + IntToStr( thing) + '")');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testI64( const thing: Int64): Int64;
-begin
-  Console.WriteLine('testI64("' + IntToStr( thing) + '")');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testInsanity(
-  const argument: IInsanity): IThriftDictionary<Int64, IThriftDictionary<TNumberz, IInsanity>>;
-var
-  hello, goodbye : IXtruct;
-  crazy : IInsanity;
-  looney : IInsanity;
-  first_map : IThriftDictionary<TNumberz, IInsanity>;
-  second_map : IThriftDictionary<TNumberz, IInsanity>;
-  insane : IThriftDictionary<Int64, IThriftDictionary<TNumberz, IInsanity>>;
-
-begin
-
-  Console.WriteLine('testInsanity()');
-  hello := TXtructImpl.Create;
-  hello.String_thing := 'Hello2';
-  hello.Byte_thing := 2;
-  hello.I32_thing := 2;
-  hello.I64_thing := 2;
-
-  goodbye := TXtructImpl.Create;
-  goodbye.String_thing := 'Goodbye4';
-  goodbye.Byte_thing := 4;
-  goodbye.I32_thing := 4;
-  goodbye.I64_thing := 4;
-
-  crazy := TInsanityImpl.Create;
-  crazy.UserMap := TThriftDictionaryImpl<TNumberz, Int64>.Create;
-  crazy.UserMap.AddOrSetValue( TNumberz.EIGHT, 8);
-  crazy.Xtructs := TThriftListImpl<IXtruct>.Create;
-  crazy.Xtructs.Add(goodbye);
-
-  looney := TInsanityImpl.Create;
-  crazy.UserMap.AddOrSetValue( TNumberz.FIVE, 5);
-  crazy.Xtructs.Add(hello);
-
-  first_map := TThriftDictionaryImpl<TNumberz, IInsanity>.Create;
-  second_map := TThriftDictionaryImpl<TNumberz, IInsanity>.Create;
-
-  first_map.AddOrSetValue( TNumberz.TWO, crazy);
-  first_map.AddOrSetValue( TNumberz.THREE, crazy);
-
-  second_map.AddOrSetValue( TNumberz.SIX, looney);
-
-  insane := TThriftDictionaryImpl<Int64, IThriftDictionary<TNumberz, IInsanity>>.Create;
-
-  insane.AddOrSetValue( 1, first_map);
-  insane.AddOrSetValue( 2, second_map);
-
-  Result := insane;
-end;
-
-function TTestServer.TTestHandlerImpl.testList(
-  const thing: IThriftList<Integer>): IThriftList<Integer>;
-var
-  first : Boolean;
-  elem : Integer;
-begin
-  Console.Write('testList({');
-  first := True;
-  for elem in thing do
-  begin
-    if first then
-    begin
-      first := False;
-    end else
-    begin
-      Console.Write(', ');
-    end;
-    Console.Write( IntToStr( elem));
-  end;
-  Console.WriteLine('})');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testMap(
-  const thing: IThriftDictionary<Integer, Integer>): IThriftDictionary<Integer, Integer>;
-var
-  first : Boolean;
-  key : Integer;
-begin
-  Console.Write('testMap({');
-  first := True;
-  for key in thing.Keys do
-  begin
-    if (first) then
-    begin
-      first := false;
-    end else
-    begin
-      Console.Write(', ');
-    end;
-    Console.Write(IntToStr(key) + ' => ' + IntToStr( thing[key]));
-  end;
-  Console.WriteLine('})');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.TestMapMap(
-  hello: Integer): IThriftDictionary<Integer, IThriftDictionary<Integer, Integer>>;
-var
-  mapmap : IThriftDictionary<Integer, IThriftDictionary<Integer, Integer>>;
-  pos : IThriftDictionary<Integer, Integer>;
-  neg : IThriftDictionary<Integer, Integer>;
-  i : Integer;
-begin
-  Console.WriteLine('testMapMap(' + IntToStr( hello) + ')');
-  mapmap := TThriftDictionaryImpl<Integer, IThriftDictionary<Integer, Integer>>.Create;
-  pos := TThriftDictionaryImpl<Integer, Integer>.Create;
-  neg := TThriftDictionaryImpl<Integer, Integer>.Create;
-
-  for i := 1 to 4 do
-  begin
-    pos.AddOrSetValue( i, i);
-    neg.AddOrSetValue( -i, -i);
-  end;
-
-  mapmap.AddOrSetValue(4, pos);
-  mapmap.AddOrSetValue( -4, neg);
-
-  Result := mapmap;
-end;
-
-function TTestServer.TTestHandlerImpl.testMulti(arg0: ShortInt; arg1: Integer;
-  const arg2: Int64; const arg3: IThriftDictionary<SmallInt, string>;
-  arg4: TNumberz; const arg5: Int64): IXtruct;
-var
-  hello : IXtruct;
-begin
-  Console.WriteLine('testMulti()');
-  hello := TXtructImpl.Create;
-  hello.String_thing := 'Hello2';
-  hello.Byte_thing := arg0;
-  hello.I32_thing := arg1;
-  hello.I64_thing := arg2;
-  Result := hello;
-end;
-
-function TTestServer.TTestHandlerImpl.testMultiException( const arg0, arg1: string): IXtruct;
-var
-  x2 : TXception2;
-begin
-  Console.WriteLine('testMultiException(' + arg0 + ', ' + arg1 + ')');
-  if ( arg0 = 'Xception') then
-  begin
-    raise TXception.Create( 1001, 'This is an Xception');  // test the new rich CTOR
-  end else
-  if ( arg0 = 'Xception2') then
-  begin
-    x2 := TXception2.Create;  // the old way still works too?
-    x2.ErrorCode := 2002;
-    x2.Struct_thing := TXtructImpl.Create;
-    x2.Struct_thing.String_thing := 'This is an Xception2';
-    x2.UpdateMessageProperty;
-    raise x2;
-  end;
-
-  Result := TXtructImpl.Create;
-  Result.String_thing := arg1;
-end;
-
-function TTestServer.TTestHandlerImpl.testNest( const thing: IXtruct2): IXtruct2;
-var
-  temp : IXtruct;
-begin
-  temp := thing.Struct_thing;
-  Console.WriteLine('testNest({' +
-         IntToStr( thing.Byte_thing) + ', {' +
-         '"' + temp.String_thing + '", ' +
-         IntToStr( temp.Byte_thing) + ', ' +
-         IntToStr( temp.I32_thing) + ', ' +
-         IntToStr( temp.I64_thing) + '}, ' +
-         IntToStr( temp.I32_thing) + '})');
-  Result := thing;
-end;
-
-procedure TTestServer.TTestHandlerImpl.testOneway(secondsToSleep: Integer);
-begin
-  Console.WriteLine('testOneway(' + IntToStr( secondsToSleep )+ '), sleeping...');
-  Sleep(secondsToSleep * 1000);
-  Console.WriteLine('testOneway finished');
-end;
-
-function TTestServer.TTestHandlerImpl.testSet(
-  const thing: IHashSet<Integer>):IHashSet<Integer>;
-var
-  first : Boolean;
-  elem : Integer;
-begin
-  Console.Write('testSet({');
-  first := True;
-
-  for elem in thing do
-  begin
-    if first then
-    begin
-      first := False;
-    end else
-    begin
-      Console.Write( ', ');
-    end;
-    Console.Write( IntToStr( elem));
-  end;
-  Console.WriteLine('})');
-  Result := thing;
-end;
-
-procedure TTestServer.TTestHandlerImpl.testStop;
-begin
-  if FServer <> nil then
-  begin
-    FServer.Stop;
-  end;
-end;
-
-function TTestServer.TTestHandlerImpl.testBool(thing: Boolean): Boolean;
-begin
-  Console.WriteLine('testBool(' + BoolToStr(thing,true) + ')');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testString( const thing: string): string;
-begin
-  Console.WriteLine('teststring("' + thing + '")');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testStringMap(
-  const thing: IThriftDictionary<string, string>): IThriftDictionary<string, string>;
-var
-  first : Boolean;
-  key : string;
-begin
-  Console.Write('testStringMap({');
-  first := True;
-  for key in thing.Keys do
-  begin
-    if (first) then
-    begin
-      first := false;
-    end else
-    begin
-      Console.Write(', ');
-    end;
-    Console.Write(key + ' => ' + thing[key]);
-  end;
-  Console.WriteLine('})');
-  Result := thing;
-end;
-
-function TTestServer.TTestHandlerImpl.testTypedef( const thing: Int64): Int64;
-begin
-  Console.WriteLine('testTypedef(' + IntToStr( thing) + ')');
-  Result := thing;
-end;
-
-procedure TTestServer.TTestHandlerImpl.TestVoid;
-begin
-  Console.WriteLine('testVoid()');
-end;
-
-function TTestServer.TTestHandlerImpl.testStruct( const thing: IXtruct): IXtruct;
-begin
-  Console.WriteLine('testStruct({' +
-    '"' + thing.String_thing + '", ' +
-      IntToStr( thing.Byte_thing) + ', ' +
-      IntToStr( thing.I32_thing) + ', ' +
-      IntToStr( thing.I64_thing));
-  Result := thing;
-end;
-
-
-{ TTestServer }
-
-
-class procedure TTestServer.PrintCmdLineHelp;
-const HELPTEXT = ' [options]'#10
-               + #10
-               + 'Allowed options:'#10
-               + '  -h [ --help ]               produce help message'#10
-               + '  --port arg (=9090)          Port number to listen'#10
-               + '  --domain-socket arg         Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)'#10
-               + '  --named-pipe arg            Windows Named Pipe (e.g. MyThriftPipe)'#10
-               + '  --server-type arg (=simple) type of server, "simple", "thread-pool",'#10
-               + '                              "threaded", or "nonblocking"'#10
-               + '  --transport arg (=socket)   transport: buffered, framed, http, anonpipe'#10
-               + '  --protocol arg (=binary)    protocol: binary, compact, json'#10
-               + '  --ssl                       Encrypted Transport using SSL'#10
-               + '  --processor-events          processor-events'#10
-               + '  -n [ --workers ] arg (=4)   Number of thread pools workers. Only valid for'#10
-               + '                              thread-pool server type'#10
-               ;
-begin
-  Console.WriteLine( ChangeFileExt(ExtractFileName(ParamStr(0)),'') + HELPTEXT);
-end;
-
-class procedure TTestServer.InvalidArgs;
-begin
-  Console.WriteLine( 'Invalid args.');
-  Console.WriteLine( ChangeFileExt(ExtractFileName(ParamStr(0)),'') + ' -h for more information');
-  Abort;
-end;
-
-class procedure TTestServer.LaunchAnonPipeChild( const app : string; const transport : IAnonymousPipeServerTransport);
-//Launch child process and pass R/W anonymous pipe handles on cmd line.
-//This is a simple example and does not include elevation or other
-//advanced features.
-var pi : PROCESS_INFORMATION;
-        si : STARTUPINFO;
-        sArg, sHandles, sCmdLine : string;
-    i : Integer;
-begin
-  GetStartupInfo( si);  //set startupinfo for the spawned process
-
-  // preformat handles args
-  sHandles := Format( '%d %d',
-                    [ Integer(transport.ClientAnonRead),
-                      Integer(transport.ClientAnonWrite)]);
-
-  // pass all settings to client
-  sCmdLine := app;
-  for i := 1 to ParamCount do begin
-    sArg := ParamStr(i);
-
-    // add anonymous handles and quote strings where appropriate
-    if sArg = '-anon'
-    then sArg := sArg +' '+ sHandles
-    else begin
-      if Pos(' ',sArg) > 0
-      then sArg := '"'+sArg+'"';
-    end;;
-
-    sCmdLine := sCmdLine +' '+ sArg;
-  end;
-
-  // spawn the child process
-  Console.WriteLine('Starting client '+sCmdLine);
-  Win32Check( CreateProcess( nil, PChar(sCmdLine), nil,nil,TRUE,0,nil,nil,si,pi));
-
-  CloseHandle( pi.hThread);
-    CloseHandle( pi.hProcess);
-end;
-
-
-class procedure TTestServer.Execute( const args: array of string);
-var
-  Port : Integer;
-  ServerEvents : Boolean;
-  sPipeName : string;
-  testHandler : ITestHandler;
-  testProcessor : IProcessor;
-  ServerTrans : IServerTransport;
-  ServerEngine : IServer;
-  anonymouspipe : IAnonymousPipeServerTransport;
-  namedpipe : INamedPipeServerTransport;
-  TransportFactory : ITransportFactory;
-  ProtocolFactory : IProtocolFactory;
-  i, numWorker : Integer;
-  s : string;
-  protType : TKnownProtocol;
-  servertype : TServerType;
-  endpoint : TEndpointTransport;
-  layered : TLayeredTransports;
-  UseSSL : Boolean; // include where appropriate (TLayeredTransport?)
-begin
-  try
-    ServerEvents := FALSE;
-    protType := prot_Binary;
-    servertype := srv_Simple;
-    endpoint := trns_Sockets;
-    layered := [];
-    UseSSL := FALSE;
-    Port := 9090;
-    sPipeName := '';
-    numWorker := 4;
-
-    i := 0;
-    while ( i < Length(args) ) do begin
-      s := args[i];
-      Inc(i);
-
-      // Allowed options:
-      if (s = '-h') or (s = '--help') then begin
-        // -h [ --help ]               produce help message
-        PrintCmdLineHelp;
-        Exit;
-      end
-      else if (s = '--port') then begin
-        // --port arg (=9090)          Port number to listen
-        s := args[i];
-        Inc(i);
-        Port := StrToIntDef( s, Port);
-      end
-      else if (s = '--domain-socket') then begin
-        // --domain-socket arg         Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)
-        raise Exception.Create('domain-socket not supported');
-      end
-      else if (s = '--named-pipe') then begin
-        // --named-pipe arg            Windows Named Pipe (e.g. MyThriftPipe)
-        endpoint := trns_NamedPipes;
-        sPipeName := args[i];  // -pipe <name>
-        Inc( i );
-      end
-      else if (s = '--server-type') then begin
-        // --server-type arg (=simple) type of server,
-        // arg = "simple", "thread-pool", "threaded", or "nonblocking"
-        s := args[i];
-        Inc(i);
-
-        if      s = 'simple'      then servertype := srv_Simple
-        else if s = 'thread-pool' then servertype := srv_Threadpool
-        else if s = 'threaded'    then servertype := srv_Threaded
-        else if s = 'nonblocking' then servertype := srv_Nonblocking
-        else InvalidArgs;
-      end
-      else if (s = '--transport') then begin
-        // --transport arg (=buffered) transport: buffered, framed, http
-        s := args[i];
-        Inc(i);
-
-        if      s = 'buffered' then Include( layered, trns_Buffered)
-        else if s = 'framed'   then Include( layered, trns_Framed)
-        else if s = 'http'     then endpoint := trns_Http
-        else if s = 'anonpipe' then endpoint := trns_AnonPipes
-        else InvalidArgs;
-      end
-      else if (s = '--protocol') then begin
-        // --protocol arg (=binary)    protocol: binary, compact, json
-        s := args[i];
-        Inc(i);
-
-        if      s = 'binary'   then protType := prot_Binary
-        else if s = 'compact'  then protType := prot_Compact
-        else if s = 'json'     then protType := prot_JSON
-        else InvalidArgs;
-      end
-      else if (s = '--ssl') then begin
-        // --ssl     Encrypted Transport using SSL
-        UseSSL := TRUE;
-      end
-      else if (s = '--processor-events') then begin
-         // --processor-events          processor-events
-        ServerEvents := TRUE;
-      end
-      else if (s = '-n') or (s = '--workers') then begin
-        // -n [ --workers ] arg (=4)   Number of thread pools workers.
-        // Only valid for thread-pool server type
-        s := args[i];
-        numWorker := StrToIntDef(s,0);
-        if numWorker > 0
-        then Inc(i)
-        else numWorker := 4;
-      end
-      else begin
-        InvalidArgs;
-      end;
-    end;
-
-
-    Console.WriteLine('Server configuration: ');
-
-    // create protocol factory, default to BinaryProtocol
-    case protType of
-      prot_Binary  :  ProtocolFactory := TBinaryProtocolImpl.TFactory.Create( BINARY_STRICT_READ, BINARY_STRICT_WRITE);
-      prot_JSON    :  ProtocolFactory := TJSONProtocolImpl.TFactory.Create;
-      prot_Compact :  ProtocolFactory := TCompactProtocolImpl.TFactory.Create;
-    else
-      raise Exception.Create('Unhandled protocol');
-    end;
-    ASSERT( ProtocolFactory <> nil);
-    Console.WriteLine('- '+THRIFT_PROTOCOLS[protType]+' protocol');
-
-    case endpoint of
-
-      trns_Sockets : begin
-        Console.WriteLine('- sockets (port '+IntToStr(port)+')');
-        if (trns_Buffered in layered) then Console.WriteLine('- buffered');
-        servertrans := TServerSocketImpl.Create( Port, 0, (trns_Buffered in layered));
-      end;
-
-      trns_Http : begin
-        raise Exception.Create(ENDPOINT_TRANSPORTS[endpoint]+' server transport not implemented');
-      end;
-
-      trns_NamedPipes : begin
-        Console.WriteLine('- named pipe ('+sPipeName+')');
-        namedpipe   := TNamedPipeServerTransportImpl.Create( sPipeName, 4096, PIPE_UNLIMITED_INSTANCES);
-        servertrans := namedpipe;
-      end;
-
-      trns_AnonPipes : begin
-        Console.WriteLine('- anonymous pipes');
-        anonymouspipe := TAnonymousPipeServerTransportImpl.Create;
-        servertrans   := anonymouspipe;
-      end
-
-    else
-      raise Exception.Create('Unhandled endpoint transport');
-    end;
-    ASSERT( servertrans <> nil);
-
-    if UseSSL then begin
-      raise Exception.Create('SSL not implemented');
-    end;
-
-    if (trns_Framed in layered) then begin
-      Console.WriteLine('- framed transport');
-      TransportFactory := TFramedTransportImpl.TFactory.Create
-    end
-    else begin
-      TransportFactory := TTransportFactoryImpl.Create;
-    end;
-    ASSERT( TransportFactory <> nil);
-
-    testHandler   := TTestHandlerImpl.Create;
-    testProcessor := TThriftTest.TProcessorImpl.Create( testHandler );
-
-    case servertype of
-      srv_Simple      : begin
-        ServerEngine := TSimpleServer.Create( testProcessor, ServerTrans, TransportFactory, ProtocolFactory);
-      end;
-
-      srv_Nonblocking : begin
-        raise Exception.Create(SERVER_TYPES[servertype]+' server not implemented');
-      end;
-
-      srv_Threadpool,
-      srv_Threaded: begin
-        if numWorker > 1 then {use here};
-        raise Exception.Create(SERVER_TYPES[servertype]+' server not implemented');
-      end;
-
-    else
-      raise Exception.Create('Unhandled server type');
-    end;
-    ASSERT( ServerEngine <> nil);
-
-    testHandler.SetServer( ServerEngine);
-
-    // test events?
-    if ServerEvents then begin
-      Console.WriteLine('- server events test enabled');
-      ServerEngine.ServerEvents := TServerEventsImpl.Create;
-    end;
-
-    // start the client now when we have the anon handles, but before the server starts
-    if endpoint = trns_AnonPipes
-    then LaunchAnonPipeChild( ExtractFilePath(ParamStr(0))+'client.exe', anonymouspipe);
-
-    // install Ctrl+C handler before the server starts
-    g_Handler := testHandler;
-    SetConsoleCtrlHandler( @MyConsoleEventHandler, TRUE);
-
-    Console.WriteLine('');
-    repeat
-      Console.WriteLine('Starting the server ...');
-      serverEngine.Serve;
-    until {$IFDEF RunEndless} FALSE {$ELSE} TRUE {$ENDIF};
-
-    testHandler.SetServer( nil);
-    g_Handler := nil;
-
-  except
-    on E: EAbort do raise;
-    on E: Exception do begin
-      Console.WriteLine( E.Message + #10 + E.StackTrace );
-    end;
-  end;
-  Console.WriteLine( 'done.');
-end;
-
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/TestServerEvents.pas b/vendor/git.apache.org/thrift.git/lib/delphi/test/TestServerEvents.pas
deleted file mode 100644
index 2e776d2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/TestServerEvents.pas
+++ /dev/null
@@ -1,174 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit TestServerEvents;
-
-interface
-
-uses
-  SysUtils,
-  Thrift,
-  Thrift.Protocol,
-  Thrift.Transport,
-  Thrift.Server,
-  Thrift.Console;
-
-type
-  TRequestEventsImpl = class( TInterfacedObject, IRequestEvents)
-  protected
-    FStart : TDateTime;
-    // IRequestProcessingEvents
-    procedure PreRead;
-    procedure PostRead;
-    procedure PreWrite;
-    procedure PostWrite;
-    procedure OnewayComplete;
-    procedure UnhandledError( const e : Exception);
-    procedure CleanupContext;
-  public
-    constructor Create;
-  end;
-
-
-  TProcessorEventsImpl = class( TInterfacedObject, IProcessorEvents)
-  protected
-    FReqs : Integer;
-    // IProcessorEvents
-    procedure Processing( const transport : ITransport);
-    function  CreateRequestContext( const aFunctionName : string) : IRequestEvents;
-    procedure CleanupContext;
-  public
-    constructor Create;
-  end;
-
-
-  TServerEventsImpl = class( TInterfacedObject, IServerEvents)
-  protected
-    // IServerEvents
-    procedure PreServe;
-    procedure PreAccept;
-    function  CreateProcessingContext( const input, output : IProtocol) : IProcessorEvents;
-  end;
-
-
-implementation
-
-{ TServerEventsImpl }
-
-procedure TServerEventsImpl.PreServe;
-begin
-  Console.WriteLine('ServerEvents: Server starting to serve requests');
-end;
-
-
-procedure TServerEventsImpl.PreAccept;
-begin
-  Console.WriteLine('ServerEvents: Server transport is ready to accept incoming calls');
-end;
-
-
-function TServerEventsImpl.CreateProcessingContext(const input, output: IProtocol): IProcessorEvents;
-begin
-  result := TProcessorEventsImpl.Create;
-end;
-
-
-{ TProcessorEventsImpl }
-
-constructor TProcessorEventsImpl.Create;
-begin
-  inherited Create;
-  FReqs := 0;
-  Console.WriteLine('ProcessorEvents: Client connected, processing begins');
-end;
-
-procedure TProcessorEventsImpl.Processing(const transport: ITransport);
-begin
-  Console.WriteLine('ProcessorEvents: Processing of incoming request begins');
-end;
-
-
-function TProcessorEventsImpl.CreateRequestContext( const aFunctionName: string): IRequestEvents;
-begin
-  result := TRequestEventsImpl.Create;
-  Inc( FReqs);
-end;
-
-
-procedure TProcessorEventsImpl.CleanupContext;
-begin
-  Console.WriteLine( 'ProcessorEvents: completed after handling '+IntToStr(FReqs)+' requests.');
-end;
-
-
-{ TRequestEventsImpl }
-
-
-constructor TRequestEventsImpl.Create;
-begin
-  inherited Create;
-  FStart := Now;
-  Console.WriteLine('RequestEvents: New request');
-end;
-
-
-procedure TRequestEventsImpl.PreRead;
-begin
-  Console.WriteLine('RequestEvents: Reading request message ...');
-end;
-
-
-procedure TRequestEventsImpl.PostRead;
-begin
-  Console.WriteLine('RequestEvents: Reading request message completed');
-end;
-
-procedure TRequestEventsImpl.PreWrite;
-begin
-  Console.WriteLine('RequestEvents: Writing response message ...');
-end;
-
-
-procedure TRequestEventsImpl.PostWrite;
-begin
-  Console.WriteLine('RequestEvents: Writing response message completed');
-end;
-
-
-procedure TRequestEventsImpl.OnewayComplete;
-begin
-  Console.WriteLine('RequestEvents: Oneway message processed');
-end;
-
-
-procedure TRequestEventsImpl.UnhandledError(const e: Exception);
-begin
-  Console.WriteLine('RequestEvents: Unhandled exception of type '+e.classname);
-end;
-
-
-procedure TRequestEventsImpl.CleanupContext;
-var millis : Double;
-begin
-  millis := (Now - FStart) * (24*60*60*1000);
-  Console.WriteLine( 'Request processing completed in '+IntToStr(Round(millis))+' ms');
-end;
-
-
-end.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/client.dpr b/vendor/git.apache.org/thrift.git/lib/delphi/test/client.dpr
deleted file mode 100644
index f2e5250..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/client.dpr
+++ /dev/null
@@ -1,72 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-
-program client;
-
-{$APPTYPE CONSOLE}
-
-uses
-  SysUtils,
-  TestClient in 'TestClient.pas',
-  Thrift.Test, // in 'gen-delphi\Thrift.Test.pas',
-  Thrift in '..\src\Thrift.pas',
-  Thrift.Transport in '..\src\Thrift.Transport.pas',
-  Thrift.Socket in '..\src\Thrift.Socket.pas',
-  Thrift.Transport.Pipes in '..\src\Thrift.Transport.Pipes.pas',
-  Thrift.Protocol in '..\src\Thrift.Protocol.pas',
-  Thrift.Protocol.JSON in '..\src\Thrift.Protocol.JSON.pas',
-  Thrift.Protocol.Compact in '..\src\Thrift.Protocol.Compact.pas',
-  Thrift.Protocol.Multiplex in '..\src\Thrift.Protocol.Multiplex.pas',
-  Thrift.Collections in '..\src\Thrift.Collections.pas',
-  Thrift.Server in '..\src\Thrift.Server.pas',
-  Thrift.Stream in '..\src\Thrift.Stream.pas',
-  Thrift.Console in '..\src\Thrift.Console.pas',
-  Thrift.TypeRegistry in '..\src\Thrift.TypeRegistry.pas',
-  Thrift.Utils in '..\src\Thrift.Utils.pas';
-
-var
-  nParamCount : Integer;
-  args : array of string;
-  i : Integer;
-  arg : string;
-
-begin
-  try
-    Writeln( 'Delphi TestClient '+Thrift.Version);
-    nParamCount := ParamCount;
-    SetLength( args, nParamCount);
-    for i := 1 to nParamCount do begin
-      arg := ParamStr( i );
-      args[i-1] := arg;
-    end;
-
-    ExitCode := TTestClient.Execute( args);
-
-  except
-    on E: EAbort do begin
-      ExitCode := $FF;
-    end;
-    on E: Exception do begin
-      Writeln(E.ClassName, ': ', E.Message);
-      ExitCode := $FF;
-    end;
-  end;
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/README.md b/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/README.md
deleted file mode 100644
index a014589..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-How to use the test case:
-----------------------------------------------
-- copy and the template batch file
-- open the batch file and adjust configuration as necessary
-- run the batch
-
-
-Configuration:
-----------------------------------------------
-SVNWORKDIR
-should point to the Thrift working copy root
-
-MY_THRIFT_FILES
-can be set to point to a folder with more thrift IDL files.
-If you don't have any such files, just leave the setting blank.
-
-BIN
-Local MSYS binary folder. Your THRIFT.EXE is installed here.
-
-MINGW_BIN
-Local MinGW bin folder. Contains DLL files required by THRIFT.EXE
-
-DCC
-Identifies the Delphi Command Line compiler (dcc32.exe)
-To be configuired only, if the default is not suitable.
-
-----------------------------------------------
-*EOF*
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/ReservedKeywords.thrift b/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/ReservedKeywords.thrift
deleted file mode 100644
index 300adf9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/ReservedKeywords.thrift
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// make sure generated code does not produce name collisions with predefined keywords
-
-
-
-typedef i32 Cardinal
-typedef string message
-typedef list< map< Cardinal, message>> program
-
-struct unit {
-  1: Cardinal downto;
-  2: program procedure;
-}
-
-typedef set< unit> units
-
-exception exception1 {
-  1: program message;
-  2: unit array;
-}
-
-service constructor {
-  unit Create(1: Cardinal asm; 2: message inherited) throws (1: exception1 label);
-  units Destroy();
-}
-
-const Cardinal downto = +1
-const Cardinal published = -1
-
-enum keywords {
-  record = 1,
-  repeat = 2,
-  deprecated = 3
-}
-
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/run-Pascal-Codegen-Tests.bat.tmpl b/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/run-Pascal-Codegen-Tests.bat.tmpl
deleted file mode 100644
index dbab0ae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/codegen/run-Pascal-Codegen-Tests.bat.tmpl
+++ /dev/null
@@ -1,173 +0,0 @@
-REM /*
-REM * Licensed to the Apache Software Foundation (ASF) under one
-REM * or more contributor license agreements. See the NOTICE file
-REM * distributed with this work for additional information
-REM * regarding copyright ownership. The ASF licenses this file
-REM * to you under the Apache License, Version 2.0 (the
-REM * "License"); you may not use this file except in compliance
-REM * with the License. You may obtain a copy of the License at
-REM *
-REM *   http://www.apache.org/licenses/LICENSE-2.0
-REM *
-REM * Unless required by applicable law or agreed to in writing,
-REM * software distributed under the License is distributed on an
-REM * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM * KIND, either express or implied. See the License for the
-REM * specific language governing permissions and limitations
-REM * under the License.
-REM */
-@echo off
-if ""=="%1" goto CONFIG
-goto HANDLEDIR
-
-REM -----------------------------------------------------
-:CONFIG
-REM -----------------------------------------------------
-
-rem * CONFIGURATION BEGIN
-rem * configuration settings, adjust as necessary to meet your system setup
-set SVNWORKDIR=
-set MY_THRIFT_FILES=
-set BIN=C:\MSys10\local\bin
-set MINGW_BIN=C:\MinGW\bin
-set DCC=
-set SUBDIR=gen-delphi
-rem * CONFIGURATION END
-
-
-REM -----------------------------------------------------
-:START
-REM -----------------------------------------------------
-
-rem * configured?
-if "%SVNWORKDIR%"=="" goto CONFIG_ERROR
-
-rem * try to find dcc32.exe
-echo Looking for dcc32.exe ...
-if not exist "%DCC%" set DCC=%ProgramFiles%\Embarcadero\RAD Studio\8.0\bin\dcc32.exe
-if not exist "%DCC%" set DCC=%ProgramFiles(x86)%\Embarcadero\RAD Studio\8.0\bin\dcc32.exe
-if not exist "%DCC%" goto CONFIG_ERROR
-echo Found %DCC%
-echo.
-
-rem * some helpers
-set PATH=%BIN%;%MINGW_BIN%;%PATH%
-set TARGET=%SVNWORKDIR%\..\thrift-testing
-set SOURCE=%SVNWORKDIR%
-set TESTAPP=TestProject
-set UNITSEARCH=%SOURCE%\lib\pas\src;%SOURCE%\lib\delphi\src
-set OUTDCU="%TARGET%\dcu"
-set LOGFILE=%TARGET%\%SUBDIR%\codegen.log
-
-rem * create and/or empty target dirs
-if not exist "%TARGET%"           md "%TARGET%"
-if not exist "%TARGET%\%SUBDIR%"  md "%TARGET%\%SUBDIR%"
-if not exist "%OUTDCU%"           md "%OUTDCU%"
-if exist "%TARGET%\*.thrift"      del "%TARGET%\*.thrift"       /Q
-if exist "%TARGET%\%SUBDIR%\*.*"  del "%TARGET%\%SUBDIR%\*.*"   /Q
-if exist "%OUTDCU%\*.*"           del "%OUTDCU%\*.*"            /Q
-
-rem * recurse through thrift WC and "my thrift files" folder
-rem * copies all .thrift files into thrift-testing
-call %0 %SOURCE%
-if not "%MY_THRIFT_FILES%"=="" call %0 %MY_THRIFT_FILES%
-
-rem * compile all thrift files, generate PAS and C++ code
-echo.
-echo Generating code, please wait ...
-cd "%TARGET%"
-for %%a in (*.thrift) do "%BIN%\thrift.exe" -v --gen delphi:register_types,constprefix,events,xmldoc "%%a" 2>> "%LOGFILE%"
-REM * for %%a in (*.thrift) do "%BIN%\thrift.exe" -v --gen cpp "%%a" >> NUL:
-cmd /c start notepad "%LOGFILE%"
-cd ..
-
-rem * check for special Delphi testcases being processed
-if not exist "%TARGET%\%SUBDIR%\ReservedKeywords.pas" goto TESTCASE_MISSING
-
-
-rem * generate a minimal DPR file that uses all generated pascal units
-cd "%TARGET%\%SUBDIR%\"
-if exist inherited.*  ren inherited.*  _inherited.*
-echo program %TESTAPP%;                                           > %TESTAPP%.dpr
-echo {$APPTYPE CONSOLE}                                          >> %TESTAPP%.dpr
-echo.                                                            >> %TESTAPP%.dpr
-echo uses                                                        >> %TESTAPP%.dpr
-for %%a in (*.pas) do echo   %%~na,                              >> %TESTAPP%.dpr
-echo   Windows, Classes, SysUtils;                               >> %TESTAPP%.dpr
-echo.                                                            >> %TESTAPP%.dpr
-echo begin                                                       >> %TESTAPP%.dpr
-echo   Writeln('Successfully compiled!');                        >> %TESTAPP%.dpr
-echo   Writeln('List of units:');                                >> %TESTAPP%.dpr
-for %%a in (*.pas) do echo   Write('%%~na':30,'':10);            >> %TESTAPP%.dpr
-echo   Writeln;                                                  >> %TESTAPP%.dpr
-echo end.                                                        >> %TESTAPP%.dpr
-echo.                                                            >> %TESTAPP%.dpr
-cd ..\..
-
-rem * try to compile the DPR
-rem * this should not throw any errors, warnings or hints
-"%DCC%"  -B "%TARGET%\%SUBDIR%\%TESTAPP%" -U"%UNITSEARCH%" -I"%UNITSEARCH%" -N"%OUTDCU%" -E"%TARGET%\%SUBDIR%"
-dir "%TARGET%\%SUBDIR%\%TESTAPP%.exe"
-if not exist "%TARGET%\%SUBDIR%\%TESTAPP%.exe"  goto CODEGEN_FAILED
-echo.
-echo -----------------------------------------------------------------
-echo The compiled program is now executed. If it hangs or crashes, we
-echo have a serious problem with the generated code. Expected output
-echo is "Successfully compiled:" followed by a list of generated units.
-echo -----------------------------------------------------------------
-"%TARGET%\%SUBDIR%\%TESTAPP%.exe"
-echo -----------------------------------------------------------------
-echo.
-pause
-GOTO EOF
-
-REM -----------------------------------------------------
-:DXE_NOT_FOUND
-REM -----------------------------------------------------
-echo Delphi Compiler (dcc32.exe) not found.
-echo Please check the "DCC" setting in this batch.
-echo.
-cmd /c start notepad README.MD
-cmd /c start notepad %0
-pause
-GOTO EOF
-
-
-REM -----------------------------------------------------
-:CONFIG_ERROR
-REM -----------------------------------------------------
-echo Missing, incomplete or wrong configuration settings!
-cmd /c start notepad README.MD
-cmd /c start notepad %0
-pause
-GOTO EOF
-
-
-REM -----------------------------------------------------
-:TESTCASE_MISSING
-REM -----------------------------------------------------
-echo Missing an expected Delphi testcase!
-pause
-GOTO EOF
-
-
-REM -----------------------------------------------------
-:CODEGEN_FAILED
-REM -----------------------------------------------------
-echo Code generation FAILED!
-pause
-GOTO EOF
-
-
-REM -----------------------------------------------------
-:HANDLEDIR
-REM -----------------------------------------------------
-REM echo %1
-for /D %%a in (%1\*) do call %0 %%a
-if exist "%1\*.thrift"   copy /b "%1\*.thrift" "%TARGET%\*.*"
-GOTO EOF
-
-
-REM -----------------------------------------------------
-:EOF
-REM -----------------------------------------------------
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/maketest.sh b/vendor/git.apache.org/thrift.git/lib/delphi/test/maketest.sh
deleted file mode 100755
index 8f0639c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/maketest.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-../../../compiler/cpp/thrift --gen delphi -o . ../../../test/ThriftTest.thrift
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Client.Main.pas b/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Client.Main.pas
deleted file mode 100644
index 35fdf6f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Client.Main.pas
+++ /dev/null
@@ -1,131 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Multiplex.Client.Main;
-
-{.$DEFINE StressTest}   // activate to stress-test the server with frequent connects/disconnects
-{.$DEFINE PerfTest}     // activate to activate the performance test
-
-interface
-
-uses
-  Windows, SysUtils, Classes,
-  DateUtils,
-  Generics.Collections,
-  Thrift,
-  Thrift.Protocol,
-  Thrift.Protocol.Multiplex,
-  Thrift.Transport.Pipes,
-  Thrift.Transport,
-  Thrift.Stream,
-  Thrift.Collections,
-  Benchmark,  // in gen-delphi folder
-  Aggr,       // in gen-delphi folder
-  Multiplex.Test.Common;
-
-type
-  TTestClient = class
-  protected
-    FProtocol : IProtocol;
-
-    procedure ParseArgs( const args: array of string);
-    procedure Setup;
-    procedure Run;
-  public
-    constructor Create( const args: array of string);
-    class procedure Execute( const args: array of string);
-  end;
-
-implementation
-
-
-type
-  IServiceClient = interface
-    ['{7745C1C2-AB20-43BA-B6F0-08BF92DE0BAC}']
-    procedure Test;
-  end;
-
-//--- TTestClient -------------------------------------
-
-
-class procedure TTestClient.Execute( const args: array of string);
-var client : TTestClient;
-begin
-  client := TTestClient.Create(args);
-  try
-    client.Run;
-  finally
-    client.Free;
-  end;
-end;
-
-
-constructor TTestClient.Create( const args: array of string);
-begin
-  inherited Create;
-  ParseArgs(args);
-  Setup;
-end;
-
-
-procedure TTestClient.ParseArgs( const args: array of string);
-begin
-  if Length(args) <> 0
-  then raise Exception.Create('No args accepted so far');
-end;
-
-
-procedure TTestClient.Setup;
-var trans : ITransport;
-begin
-  trans := TSocketImpl.Create( 'localhost', 9090);
-  trans := TFramedTransportImpl.Create( trans);
-  trans.Open;
-  FProtocol := TBinaryProtocolImpl.Create( trans, TRUE, TRUE);
-end;
-
-
-procedure TTestClient.Run;
-var bench : TBenchmarkService.Iface;
-    aggr  : TAggr.Iface;
-    multiplex : IProtocol;
-    i         : Integer;
-begin
-  try
-    multiplex := TMultiplexedProtocol.Create( FProtocol, NAME_BENCHMARKSERVICE);
-    bench     := TBenchmarkService.TClient.Create( multiplex);
-
-    multiplex := TMultiplexedProtocol.Create( FProtocol, NAME_AGGR);
-    aggr      := TAggr.TClient.Create( multiplex);
-
-    for i := 1 to 10
-    do aggr.addValue( bench.fibonacci(i));
-
-    for i in aggr.getValues
-    do Write(IntToStr(i)+' ');
-    WriteLn;
-  except
-    on e:Exception do Writeln(#10+e.Message);
-  end;
-end;
-
-
-end.
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Server.Main.pas b/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Server.Main.pas
deleted file mode 100644
index 37f84bb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Server.Main.pas
+++ /dev/null
@@ -1,201 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Multiplex.Server.Main;
-
-{$WARN SYMBOL_PLATFORM OFF}
-
-{.$DEFINE RunEndless}   // activate to interactively stress-test the server stop routines via Ctrl+C
-
-interface
-
-uses
-  Windows, SysUtils,
-  Generics.Collections,
-  Thrift.Console,
-  Thrift.Server,
-  Thrift.Transport,
-  Thrift.Transport.Pipes,
-  Thrift.Protocol,
-  Thrift.Protocol.Multiplex,
-  Thrift.Processor.Multiplex,
-  Thrift.Collections,
-  Thrift.Utils,
-  Thrift,
-  Benchmark,  // in gen-delphi folder
-  Aggr,       // in gen-delphi folder
-  Multiplex.Test.Common,
-  Contnrs;
-
-type
-  TTestServer = class
-  public type
-    ITestHandler = interface
-      ['{CAE09AAB-80FB-48E9-B3A8-7F9B96F5419A}']
-      procedure SetServer( const AServer : IServer );
-    end;
-
-  protected type
-    TTestHandlerImpl = class( TInterfacedObject, ITestHandler)
-    private
-      FServer : IServer;
-    protected
-      // ITestHandler
-      procedure SetServer( const AServer : IServer );
-
-      property Server : IServer read FServer write SetServer;
-    end;
-
-    TBenchmarkServiceImpl = class( TTestHandlerImpl, TBenchmarkService.Iface)
-    protected
-      // TBenchmarkService.Iface
-      function fibonacci(n: ShortInt): Integer;
-    end;
-
-
-    TAggrImpl = class( TTestHandlerImpl, TAggr.Iface)
-    protected
-      FList : IThriftList<Integer>;
-
-      // TAggr.Iface
-      procedure addValue(value: Integer);
-      function getValues(): IThriftList<Integer>;
-    public
-      constructor Create;
-      destructor Destroy;  override;
-    end;
-
-  public
-    class procedure Execute( const args: array of string);
-  end;
-
-
-implementation
-
-
-{ TTestServer.TTestHandlerImpl }
-
-procedure TTestServer.TTestHandlerImpl.SetServer( const AServer: IServer);
-begin
-  FServer := AServer;
-end;
-
-
-{ TTestServer.TBenchmarkServiceImpl }
-
-function TTestServer.TBenchmarkServiceImpl.fibonacci(n: ShortInt): Integer;
-var prev, next : Integer;
-begin
-  prev   := 0;
-  result := 1;
-  while n > 0 do begin
-    next   := result + prev;
-    prev   := result;
-    result := next;
-    Dec(n);
-  end;
-end;
-
-{ TTestServer.TAggrImpl }
-
-constructor TTestServer.TAggrImpl.Create;
-begin
-  inherited Create;
-  FList := TThriftListImpl<Integer>.Create;
-end;
-
-
-destructor TTestServer.TAggrImpl.Destroy;
-begin
-  try
-    FreeAndNil( FList);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-procedure TTestServer.TAggrImpl.addValue(value: Integer);
-begin
-  FList.Add( value);
-end;
-
-
-function TTestServer.TAggrImpl.getValues(): IThriftList<Integer>;
-begin
-  result := FList;
-end;
-
-
-{ TTestServer }
-
-class procedure TTestServer.Execute( const args: array of string);
-var
-  TransportFactory : ITransportFactory;
-  ProtocolFactory  : IProtocolFactory;
-  ServerTrans      : IServerTransport;
-  benchHandler     : TBenchmarkService.Iface;
-  aggrHandler      : TAggr.Iface;
-  benchProcessor   : IProcessor;
-  aggrProcessor    : IProcessor;
-  multiplex        : IMultiplexedProcessor;
-  ServerEngine     : IServer;
-begin
-  try
-    // create protocol factory, default to BinaryProtocol
-    ProtocolFactory  := TBinaryProtocolImpl.TFactory.Create( TRUE, TRUE);
-    servertrans      := TServerSocketImpl.Create( 9090, 0, FALSE);
-    TransportFactory := TFramedTransportImpl.TFactory.Create;
-
-    benchHandler     := TBenchmarkServiceImpl.Create;
-    benchProcessor   := TBenchmarkService.TProcessorImpl.Create( benchHandler);
-
-    aggrHandler      := TAggrImpl.Create;
-    aggrProcessor    := TAggr.TProcessorImpl.Create( aggrHandler);
-
-    multiplex        := TMultiplexedProcessorImpl.Create;
-    multiplex.RegisterProcessor( NAME_BENCHMARKSERVICE, benchProcessor);
-    multiplex.RegisterProcessor( NAME_AGGR,  aggrProcessor);
-
-    ServerEngine := TSimpleServer.Create( multiplex,
-                                          ServerTrans,
-                                          TransportFactory,
-                                          ProtocolFactory);
-
-    (benchHandler as ITestHandler).SetServer( ServerEngine);
-    (aggrHandler as ITestHandler).SetServer( ServerEngine);
-
-    Console.WriteLine('Starting the server ...');
-    ServerEngine.serve();
-
-    (benchHandler as ITestHandler).SetServer( nil);
-    (aggrHandler as ITestHandler).SetServer( nil);
-
-  except
-    on E: Exception do
-    begin
-      Console.Write( E.Message);
-    end;
-  end;
-  Console.WriteLine( 'done.');
-end;
-
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Client.dpr b/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Client.dpr
deleted file mode 100644
index d6f93a1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Client.dpr
+++ /dev/null
@@ -1,67 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-
-program Multiplex.Test.Client;
-
-{$APPTYPE CONSOLE}
-
-uses
-  SysUtils,
-  Multiplex.Client.Main in 'Multiplex.Client.Main.pas',
-  Thrift in '..\..\src\Thrift.pas',
-  Thrift.Socket in '..\..\src\Thrift.Socket.pas',
-  Thrift.Transport in '..\..\src\Thrift.Transport.pas',
-  Thrift.Transport.Pipes in '..\..\src\Thrift.Transport.Pipes.pas',
-  Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
-  Thrift.Protocol.Multiplex in '..\..\src\Thrift.Protocol.Multiplex.pas',
-  Thrift.Collections in '..\..\src\Thrift.Collections.pas',
-  Thrift.Server in '..\..\src\Thrift.Server.pas',
-  Thrift.Stream in '..\..\src\Thrift.Stream.pas',
-  Thrift.Console in '..\..\src\Thrift.Console.pas',
-  Thrift.TypeRegistry in '..\..\src\Thrift.TypeRegistry.pas',
-  Thrift.Utils in '..\..\src\Thrift.Utils.pas';
-
-var
-  nParamCount : Integer;
-  args : array of string;
-  i : Integer;
-  arg : string;
-  s : string;
-
-begin
-  try
-    Writeln( 'Multiplex TestClient '+Thrift.Version);
-    nParamCount := ParamCount;
-    SetLength( args, nParamCount);
-    for i := 1 to nParamCount do
-    begin
-      arg := ParamStr( i );
-      args[i-1] := arg;
-    end;
-    TTestClient.Execute( args );
-    Readln;
-  except
-    on E: Exception do begin
-      Writeln(E.ClassName, ': ', E.Message);
-      ExitCode := $FFFF;
-    end;
-  end;
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Common.pas b/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Common.pas
deleted file mode 100644
index 2caf081..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Common.pas
+++ /dev/null
@@ -1,35 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit Multiplex.Test.Common;
-
-interface
-
-const
-  NAME_BENCHMARKSERVICE = 'BenchmarkService';
-  NAME_AGGR             = 'Aggr';
-
-
-implementation
-
-// nix
-
-end.
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Server.dpr b/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Server.dpr
deleted file mode 100644
index 5550036..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/multiplexed/Multiplex.Test.Server.dpr
+++ /dev/null
@@ -1,67 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-program Multiplex.Test.Server;
-
-{$APPTYPE CONSOLE}
-
-uses
-  SysUtils,
-  Multiplex.Server.Main in 'Multiplex.Server.Main.pas',
-  Thrift in '..\..\src\Thrift.pas',
-  Thrift.Socket in '..\..\src\Thrift.Socket.pas',
-  Thrift.Transport in '..\..\src\Thrift.Transport.pas',
-  Thrift.Transport.Pipes in '..\..\src\Thrift.Transport.Pipes.pas',
-  Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
-  Thrift.Protocol.Multiplex in '..\..\src\Thrift.Protocol.Multiplex.pas',
-  Thrift.Processor.Multiplex in '..\..\src\Thrift.Processor.Multiplex.pas',
-  Thrift.Collections in '..\..\src\Thrift.Collections.pas',
-  Thrift.Server in '..\..\src\Thrift.Server.pas',
-  Thrift.Console in '..\..\src\Thrift.Console.pas',
-  Thrift.Utils in '..\..\src\Thrift.Utils.pas',
-  Thrift.TypeRegistry in '..\..\src\Thrift.TypeRegistry.pas',
-  Thrift.Stream in '..\..\src\Thrift.Stream.pas';
-
-var
-  nParamCount : Integer;
-  args : array of string;
-  i : Integer;
-  arg : string;
-  s : string;
-
-begin
-  try
-    Writeln( 'Multiplex TestServer '+Thrift.Version);
-    nParamCount := ParamCount;
-    SetLength( args, nParamCount);
-    for i := 1 to nParamCount do
-    begin
-      arg := ParamStr( i );
-      args[i-1] := arg;
-    end;
-    TTestServer.Execute( args );
-    Writeln('Press ENTER to close ... '); Readln;
-  except
-    on E: Exception do
-      Writeln(E.ClassName, ': ', E.Message);
-  end;
-end.
-
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/serializer/TestSerializer.Data.pas b/vendor/git.apache.org/thrift.git/lib/delphi/test/serializer/TestSerializer.Data.pas
deleted file mode 100644
index 30d9dd4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/serializer/TestSerializer.Data.pas
+++ /dev/null
@@ -1,349 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-unit TestSerializer.Data;
-
-interface
-
-uses
-  Thrift.Collections,
-  DebugProtoTest;
-
-
-type
-  Fixtures = class
-  public
-    class function CreateOneOfEach : IOneOfEach;
-    class function CreateNesting : INesting;
-    class function CreateHolyMoley : IHolyMoley;
-    class function CreateCompactProtoTestStruct : ICompactProtoTestStruct;
-
-  // These byte arrays are serialized versions of the above structs.
-  // They were serialized in binary protocol using thrift 0.6.x and are used to
-  // test backwards compatibility with respect to the standard scheme.
-  (*
-          all data copied from JAVA version,
-          to be used later
-
-  public static final byte[] persistentBytesOneOfEach = new byte[] {
-    $02, $00, $01, $01, $02, $00, $02, $00, $03, $00,
-    $03, $D6, $06, $00, $04, $69, $78, $08, $00, $05,
-    $01, $00, $00, $00, $0A, $00, $06, $00, $00, $00,
-    $01, $65, $A0, $BC, $00, $04, $00, $07, $40, $09,
-    $21, $FB, $54, $44, $2D, $18, $0B, $00, $08, $00,
-    $00, $00, $0D, $4A, $53, $4F, $4E, $20, $54, $48,
-    $49, $53, $21, $20, $22, $01, $0B, $00, $09, $00,
-    $00, $00, $2E, $D3, $80, $E2, $85, $AE, $CE, $9D,
-    $20, $D0, $9D, $CE, $BF, $E2, $85, $BF, $D0, $BE,
-    $C9, $A1, $D0, $B3, $D0, $B0, $CF, $81, $E2, $84,
-    $8E, $20, $CE, $91, $74, $74, $CE, $B1, $E2, $85,
-    $BD, $CE, $BA, $EF, $BF, $BD, $E2, $80, $BC, $02,
-    $00, $0A, $00, $0B, $00, $0B, $00, $00, $00, $06,
-    $62, $61, $73, $65, $36, $34, $0F, $00, $0C, $03,
-    $00, $00, $00, $03, $01, $02, $03, $0F, $00, $0D,
-    $06, $00, $00, $00, $03, $00, $01, $00, $02, $00,
-    $03, $0F, $00, $0E, $0A, $00, $00, $00, $03, $00,
-    $00, $00, $00, $00, $00, $00, $01, $00, $00, $00,
-    $00, $00, $00, $00, $02, $00, $00, $00, $00, $00,
-    $00, $00, $03, $00 };
-
-
-  public static final byte[] persistentBytesNesting = new byte[] {
-    $0C, $00, $01, $08, $00, $01, $00, $00, $7A, $69,
-    $0B, $00, $02, $00, $00, $00, $13, $49, $20, $61,
-    $6D, $20, $61, $20, $62, $6F, $6E, $6B, $2E, $2E,
-    $2E, $20, $78, $6F, $72, $21, $00, $0C, $00, $02,
-    $02, $00, $01, $01, $02, $00, $02, $00, $03, $00,
-    $03, $D6, $06, $00, $04, $69, $78, $08, $00, $05,
-    $01, $00, $00, $00, $0A, $00, $06, $00, $00, $00,
-    $01, $65, $A0, $BC, $00, $04, $00, $07, $40, $09,
-    $21, $FB, $54, $44, $2D, $18, $0B, $00, $08, $00,
-    $00, $00, $0D, $4A, $53, $4F, $4E, $20, $54, $48,
-    $49, $53, $21, $20, $22, $01, $0B, $00, $09, $00,
-    $00, $00, $2E, $D3, $80, $E2, $85, $AE, $CE, $9D,
-    $20, $D0, $9D, $CE, $BF, $E2, $85, $BF, $D0, $BE,
-    $C9, $A1, $D0, $B3, $D0, $B0, $CF, $81, $E2, $84,
-    $8E, $20, $CE, $91, $74, $74, $CE, $B1, $E2, $85,
-    $BD, $CE, $BA, $EF, $BF, $BD, $E2, $80, $BC, $02,
-    $00, $0A, $00, $0B, $00, $0B, $00, $00, $00, $06,
-    $62, $61, $73, $65, $36, $34, $0F, $00, $0C, $03,
-    $00, $00, $00, $03, $01, $02, $03, $0F, $00, $0D,
-    $06, $00, $00, $00, $03, $00, $01, $00, $02, $00,
-    $03, $0F, $00, $0E, $0A, $00, $00, $00, $03, $00,
-    $00, $00, $00, $00, $00, $00, $01, $00, $00, $00,
-    $00, $00, $00, $00, $02, $00, $00, $00, $00, $00,
-    $00, $00, $03, $00, $00 };
-
-  public static final byte[] persistentBytesHolyMoley = new byte[] {
-    $0F, $00, $01, $0C, $00, $00, $00, $02, $02, $00,
-    $01, $01, $02, $00, $02, $00, $03, $00, $03, $23,
-    $06, $00, $04, $69, $78, $08, $00, $05, $01, $00,
-    $00, $00, $0A, $00, $06, $00, $00, $00, $01, $65,
-    $A0, $BC, $00, $04, $00, $07, $40, $09, $21, $FB,
-    $54, $44, $2D, $18, $0B, $00, $08, $00, $00, $00,
-    $0D, $4A, $53, $4F, $4E, $20, $54, $48, $49, $53,
-    $21, $20, $22, $01, $0B, $00, $09, $00, $00, $00,
-    $2E, $D3, $80, $E2, $85, $AE, $CE, $9D, $20, $D0,
-    $9D, $CE, $BF, $E2, $85, $BF, $D0, $BE, $C9, $A1,
-    $D0, $B3, $D0, $B0, $CF, $81, $E2, $84, $8E, $20,
-    $CE, $91, $74, $74, $CE, $B1, $E2, $85, $BD, $CE,
-    $BA, $EF, $BF, $BD, $E2, $80, $BC, $02, $00, $0A,
-    $00, $0B, $00, $0B, $00, $00, $00, $06, $62, $61,
-    $73, $65, $36, $34, $0F, $00, $0C, $03, $00, $00,
-    $00, $03, $01, $02, $03, $0F, $00, $0D, $06, $00,
-    $00, $00, $03, $00, $01, $00, $02, $00, $03, $0F,
-    $00, $0E, $0A, $00, $00, $00, $03, $00, $00, $00,
-    $00, $00, $00, $00, $01, $00, $00, $00, $00, $00,
-    $00, $00, $02, $00, $00, $00, $00, $00, $00, $00,
-    $03, $00, $02, $00, $01, $01, $02, $00, $02, $00,
-    $03, $00, $03, $D6, $06, $00, $04, $69, $78, $08,
-    $00, $05, $01, $00, $00, $00, $0A, $00, $06, $00,
-    $00, $00, $01, $65, $A0, $BC, $00, $04, $00, $07,
-    $40, $09, $21, $FB, $54, $44, $2D, $18, $0B, $00,
-    $08, $00, $00, $00, $0D, $4A, $53, $4F, $4E, $20,
-    $54, $48, $49, $53, $21, $20, $22, $01, $0B, $00,
-    $09, $00, $00, $00, $2E, $D3, $80, $E2, $85, $AE,
-    $CE, $9D, $20, $D0, $9D, $CE, $BF, $E2, $85, $BF,
-    $D0, $BE, $C9, $A1, $D0, $B3, $D0, $B0, $CF, $81,
-    $E2, $84, $8E, $20, $CE, $91, $74, $74, $CE, $B1,
-    $E2, $85, $BD, $CE, $BA, $EF, $BF, $BD, $E2, $80,
-    $BC, $02, $00, $0A, $00, $0B, $00, $0B, $00, $00,
-    $00, $06, $62, $61, $73, $65, $36, $34, $0F, $00,
-    $0C, $03, $00, $00, $00, $03, $01, $02, $03, $0F,
-    $00, $0D, $06, $00, $00, $00, $03, $00, $01, $00,
-    $02, $00, $03, $0F, $00, $0E, $0A, $00, $00, $00,
-    $03, $00, $00, $00, $00, $00, $00, $00, $01, $00,
-    $00, $00, $00, $00, $00, $00, $02, $00, $00, $00,
-    $00, $00, $00, $00, $03, $00, $0E, $00, $02, $0F,
-    $00, $00, $00, $03, $0B, $00, $00, $00, $00, $0B,
-    $00, $00, $00, $03, $00, $00, $00, $0F, $74, $68,
-    $65, $6E, $20, $61, $20, $6F, $6E, $65, $2C, $20,
-    $74, $77, $6F, $00, $00, $00, $06, $74, $68, $72,
-    $65, $65, $21, $00, $00, $00, $06, $46, $4F, $55,
-    $52, $21, $21, $0B, $00, $00, $00, $02, $00, $00,
-    $00, $09, $61, $6E, $64, $20, $61, $20, $6F, $6E,
-    $65, $00, $00, $00, $09, $61, $6E, $64, $20, $61,
-    $20, $74, $77, $6F, $0D, $00, $03, $0B, $0F, $00,
-    $00, $00, $03, $00, $00, $00, $03, $74, $77, $6F,
-    $0C, $00, $00, $00, $02, $08, $00, $01, $00, $00,
-    $00, $01, $0B, $00, $02, $00, $00, $00, $05, $57,
-    $61, $69, $74, $2E, $00, $08, $00, $01, $00, $00,
-    $00, $02, $0B, $00, $02, $00, $00, $00, $05, $57,
-    $68, $61, $74, $3F, $00, $00, $00, $00, $05, $74,
-    $68, $72, $65, $65, $0C, $00, $00, $00, $00, $00,
-    $00, $00, $04, $7A, $65, $72, $6F, $0C, $00, $00,
-    $00, $00, $00 };
-
-
-*)
-
-  private
-    const
-      kUnicodeBytes : packed array[0..43] of Byte
-                    = ( $d3, $80, $e2, $85, $ae, $ce, $9d, $20, $d0, $9d,
-                        $ce, $bf, $e2, $85, $bf, $d0, $be, $c9, $a1, $d0,
-                        $b3, $d0, $b0, $cf, $81, $e2, $84, $8e, $20, $ce,
-                        $91, $74, $74, $ce, $b1, $e2, $85, $bd, $ce, $ba,
-                        $83, $e2, $80, $bc);
-
-  end;
-
-
-implementation
-
-
-class function Fixtures.CreateOneOfEach : IOneOfEach;
-var db : Double;
-    us : Utf8String;
-begin
-  result := TOneOfEachImpl.Create;
-  result.setIm_true( TRUE);
-  result.setIm_false( FALSE);
-  result.setA_bite( ShortInt($D6));
-  result.setInteger16( 27000);
-  result.setInteger32( 1 shl 24);
-  result.setInteger64( Int64(6000) * Int64(1000) * Int64(1000));
-  db := Pi;
-  result.setDouble_precision( db);
-  result.setSome_characters( 'JSON THIS! \"\1');
-
-  // ??
-  SetLength( us, Length(kUnicodeBytes));
-  Move( kUnicodeBytes[0], us[1], Length(kUnicodeBytes));
-  // ??
-  SetString( us, PChar(@kUnicodeBytes[0]), Length(kUnicodeBytes));
-  // !!
-  result.setZomg_unicode( UnicodeString( us));
-
-  {$IF cDebugProtoTest_Option_AnsiStr_Binary}
-  result.SetBase64('base64');
-  {$ELSE}
-  not yet impl
-  {$IFEND}
-
-  // byte, i16, and i64 lists are populated by default constructor
-end;
-
-
-class function Fixtures.CreateNesting : INesting;
-var bonk : IBonk;
-begin
-  bonk := TBonkImpl.Create;
-  bonk.Type_   := 31337;
-  bonk.Message := 'I am a bonk... xor!';
-
-  result := TNestingImpl.Create;
-  result.My_bonk := bonk;
-  result.My_ooe := CreateOneOfEach;
-end;
-
-
-class function Fixtures.CreateHolyMoley : IHolyMoley;
-var big : IThriftList<IOneOfEach>;
-    stage1 : IThriftList<String>;
-    stage2 : IThriftList<IBonk>;
-    b      : IBonk;
-begin
-  result := THolyMoleyImpl.Create;
-
-  big := TThriftListImpl<IOneOfEach>.Create;
-  big.add( CreateOneOfEach);
-  big.add( CreateNesting.my_ooe);
-  result.Big := big;
-  result.Big[0].setA_bite( $22);
-  result.Big[0].setA_bite( $23);
-
-  result.Contain := THashSetImpl< IThriftList<string>>.Create;
-  stage1 := TThriftListImpl<String>.Create;
-  stage1.add( 'and a one');
-  stage1.add( 'and a two');
-  result.Contain.add( stage1);
-
-  stage1 := TThriftListImpl<String>.Create;
-  stage1.add( 'then a one, two');
-  stage1.add( 'three!');
-  stage1.add( 'FOUR!!');
-  result.Contain.add( stage1);
-
-  stage1 := TThriftListImpl<String>.Create;
-  result.Contain.add( stage1);
-
-  stage2 := TThriftListImpl<IBonk>.Create;
-  result.Bonks := TThriftDictionaryImpl< String, IThriftList< IBonk>>.Create;
-  // one empty
-  result.Bonks.Add( 'zero', stage2);
-
-  // one with two
-  stage2 := TThriftListImpl<IBonk>.Create;
-  b := TBonkImpl.Create;
-  b.type_ := 1;
-  b.message := 'Wait.';
-  stage2.Add( b);
-  b := TBonkImpl.Create;
-  b.type_ := 2;
-  b.message := 'What?';
-  stage2.Add( b);
-  result.Bonks.Add( 'two', stage2);
-
-  // one with three
-  stage2 := TThriftListImpl<IBonk>.Create;
-  b := TBonkImpl.Create;
-  b.type_ := 3;
-  b.message := 'quoth';
-  stage2.Add( b);
-  b := TBonkImpl.Create;
-  b.type_ := 4;
-  b.message := 'the raven';
-  stage2.Add( b);
-  b := TBonkImpl.Create;
-  b.type_ := 5;
-  b.message := 'nevermore';
-  stage2.Add( b);
-  result.bonks.Add( 'three', stage2);
-end;
-
-
-class function Fixtures.CreateCompactProtoTestStruct : ICompactProtoTestStruct;
-// superhuge compact proto test struct
-begin
-  result := TCompactProtoTestStructImpl.Create;
-  result.A_byte := TDebugProtoTestConstants.COMPACT_TEST.A_byte;
-  result.A_i16 := TDebugProtoTestConstants.COMPACT_TEST.A_i16;
-  result.A_i32 := TDebugProtoTestConstants.COMPACT_TEST.A_i32;
-  result.A_i64 := TDebugProtoTestConstants.COMPACT_TEST.A_i64;
-  result.A_double := TDebugProtoTestConstants.COMPACT_TEST.A_double;
-  result.A_string := TDebugProtoTestConstants.COMPACT_TEST.A_string;
-  result.A_binary := TDebugProtoTestConstants.COMPACT_TEST.A_binary;
-  result.True_field := TDebugProtoTestConstants.COMPACT_TEST.True_field;
-  result.False_field := TDebugProtoTestConstants.COMPACT_TEST.False_field;
-  result.Empty_struct_field := TDebugProtoTestConstants.COMPACT_TEST.Empty_struct_field;
-  result.Byte_list := TDebugProtoTestConstants.COMPACT_TEST.Byte_list;
-  result.I16_list := TDebugProtoTestConstants.COMPACT_TEST.I16_list;
-  result.I32_list := TDebugProtoTestConstants.COMPACT_TEST.I32_list;
-  result.I64_list := TDebugProtoTestConstants.COMPACT_TEST.I64_list;
-  result.Double_list := TDebugProtoTestConstants.COMPACT_TEST.Double_list;
-  result.String_list := TDebugProtoTestConstants.COMPACT_TEST.String_list;
-  result.Binary_list := TDebugProtoTestConstants.COMPACT_TEST.Binary_list;
-  result.Boolean_list := TDebugProtoTestConstants.COMPACT_TEST.Boolean_list;
-  result.Struct_list := TDebugProtoTestConstants.COMPACT_TEST.Struct_list;
-  result.Byte_set := TDebugProtoTestConstants.COMPACT_TEST.Byte_set;
-  result.I16_set := TDebugProtoTestConstants.COMPACT_TEST.I16_set;
-  result.I32_set := TDebugProtoTestConstants.COMPACT_TEST.I32_set;
-  result.I64_set := TDebugProtoTestConstants.COMPACT_TEST.I64_set;
-  result.Double_set := TDebugProtoTestConstants.COMPACT_TEST.Double_set;
-  result.String_set := TDebugProtoTestConstants.COMPACT_TEST.String_set;
-  result.String_set := TDebugProtoTestConstants.COMPACT_TEST.String_set;
-  result.String_set := TDebugProtoTestConstants.COMPACT_TEST.String_set;
-  result.Binary_set := TDebugProtoTestConstants.COMPACT_TEST.Binary_set;
-  result.Boolean_set := TDebugProtoTestConstants.COMPACT_TEST.Boolean_set;
-  result.Struct_set := TDebugProtoTestConstants.COMPACT_TEST.Struct_set;
-  result.Byte_byte_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_byte_map;
-  result.I16_byte_map := TDebugProtoTestConstants.COMPACT_TEST.I16_byte_map;
-  result.I32_byte_map := TDebugProtoTestConstants.COMPACT_TEST.I32_byte_map;
-  result.I64_byte_map := TDebugProtoTestConstants.COMPACT_TEST.I64_byte_map;
-  result.Double_byte_map := TDebugProtoTestConstants.COMPACT_TEST.Double_byte_map;
-  result.String_byte_map := TDebugProtoTestConstants.COMPACT_TEST.String_byte_map;
-  result.Binary_byte_map := TDebugProtoTestConstants.COMPACT_TEST.Binary_byte_map;
-  result.Boolean_byte_map := TDebugProtoTestConstants.COMPACT_TEST.Boolean_byte_map;
-  result.Byte_i16_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_i16_map;
-  result.Byte_i32_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_i32_map;
-  result.Byte_i64_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_i64_map;
-  result.Byte_double_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_double_map;
-  result.Byte_string_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_string_map;
-  result.Byte_binary_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_binary_map;
-  result.Byte_boolean_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_boolean_map;
-  result.List_byte_map := TDebugProtoTestConstants.COMPACT_TEST.List_byte_map;
-  result.Set_byte_map := TDebugProtoTestConstants.COMPACT_TEST.Set_byte_map;
-  result.Map_byte_map := TDebugProtoTestConstants.COMPACT_TEST.Map_byte_map;
-  result.Byte_map_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_map_map;
-  result.Byte_set_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_set_map;
-  result.Byte_list_map := TDebugProtoTestConstants.COMPACT_TEST.Byte_list_map;
-
-  {$IF cDebugProtoTest_Option_AnsiStr_Binary}
-  result.A_binary := AnsiString( #0#1#2#3#4#5#6#7#8);
-  {$ELSE}
-  not yet impl
-  {$IFEND}
-end;
-
-
-
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/serializer/TestSerializer.dpr b/vendor/git.apache.org/thrift.git/lib/delphi/test/serializer/TestSerializer.dpr
deleted file mode 100644
index 9e283e5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/serializer/TestSerializer.dpr
+++ /dev/null
@@ -1,230 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-program TestSerializer;
-
-{$APPTYPE CONSOLE}
-
-uses
-  Classes, Windows, SysUtils, Generics.Collections,
-  Thrift in '..\..\src\Thrift.pas',
-  Thrift.Socket in '..\..\src\Thrift.Socket.pas',
-  Thrift.Transport in '..\..\src\Thrift.Transport.pas',
-  Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
-  Thrift.Protocol.JSON in '..\..\src\Thrift.Protocol.JSON.pas',
-  Thrift.Collections in '..\..\src\Thrift.Collections.pas',
-  Thrift.Server in '..\..\src\Thrift.Server.pas',
-  Thrift.Console in '..\..\src\Thrift.Console.pas',
-  Thrift.Utils in '..\..\src\Thrift.Utils.pas',
-  Thrift.Serializer in '..\..\src\Thrift.Serializer.pas',
-  Thrift.Stream in '..\..\src\Thrift.Stream.pas',
-  Thrift.TypeRegistry in '..\..\src\Thrift.TypeRegistry.pas',
-  DebugProtoTest,
-  TestSerializer.Data;
-
-
-
-type
-  TTestSerializer = class //extends TestCase {
-  private
-    FProtocols : TList< IProtocolFactory>;
-
-    class function  Serialize(const input : IBase; const factory : IProtocolFactory) : TBytes;  overload;
-    class procedure Serialize(const input : IBase; const factory : IProtocolFactory; const aStream : TStream);  overload;
-    class procedure Deserialize( const input : TBytes; const target : IBase; const factory : IProtocolFactory);  overload;
-    class procedure Deserialize( const input : TStream; const target : IBase; const factory : IProtocolFactory);  overload;
-
-    procedure Test_Serializer_Deserializer;
-
-  public
-    constructor Create;
-    destructor Destroy;  override;
-
-    procedure RunTests;
-  end;
-
-
-
-{ TTestSerializer }
-
-constructor TTestSerializer.Create;
-begin
-  inherited Create;
-  FProtocols := TList< IProtocolFactory>.Create;
-  FProtocols.Add( TBinaryProtocolImpl.TFactory.Create);
-  //FProtocols.Add( TCompactProtocolImpl.TFactory.Create);
-  FProtocols.Add( TJSONProtocolImpl.TFactory.Create);
-end;
-
-
-destructor TTestSerializer.Destroy;
-begin
-  try
-    FreeAndNil( FProtocols);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-type TMethod = (mt_Bytes, mt_Stream);
-
-
-procedure TTestSerializer.Test_Serializer_Deserializer;
-var level3ooe, correct : IOneOfEach;
-    factory : IProtocolFactory;
-    bytes   : TBytes;
-    stream  : TFileStream;
-    i       : Integer;
-    method  : TMethod;
-begin
-  correct := Fixtures.CreateOneOfEach;
-  stream  := TFileStream.Create( 'TestSerializer.dat', fmCreate);
-  try
-
-    for method in [Low(TMethod)..High(TMethod)] do begin
-      for factory in FProtocols do begin
-
-        // write
-        level3ooe := Fixtures.CreateOneOfEach;
-        case method of
-          mt_Bytes:  bytes := Serialize( level3ooe, factory);
-          mt_Stream: begin
-            stream.Size := 0;
-            Serialize( level3ooe, factory, stream);
-          end
-        else
-          ASSERT( FALSE);
-        end;
-
-        // init + read
-        level3ooe := TOneOfEachImpl.Create;
-        case method of
-          mt_Bytes:  Deserialize( bytes, level3ooe, factory);
-          mt_Stream: begin
-            stream.Position := 0;
-            Deserialize( stream, level3ooe, factory);
-          end
-        else
-          ASSERT( FALSE);
-        end;
-
-
-        // check
-        ASSERT( level3ooe.Im_true = correct.Im_true);
-        ASSERT( level3ooe.Im_false = correct.Im_false);
-        ASSERT( level3ooe.A_bite = correct.A_bite);
-        ASSERT( level3ooe.Integer16 = correct.Integer16);
-        ASSERT( level3ooe.Integer32 = correct.Integer32);
-        ASSERT( level3ooe.Integer64 = correct.Integer64);
-        ASSERT( Abs( level3ooe.Double_precision - correct.Double_precision) < 1E-12);
-        ASSERT( level3ooe.Some_characters = correct.Some_characters);
-        ASSERT( level3ooe.Zomg_unicode = correct.Zomg_unicode);
-        ASSERT( level3ooe.What_who = correct.What_who);
-        ASSERT( level3ooe.Base64 = correct.Base64);
-
-        ASSERT( level3ooe.Byte_list.Count = correct.Byte_list.Count);
-        for i := 0 to level3ooe.Byte_list.Count-1
-        do ASSERT( level3ooe.Byte_list[i] = correct.Byte_list[i]);
-
-        ASSERT( level3ooe.I16_list.Count = correct.I16_list.Count);
-        for i := 0 to level3ooe.I16_list.Count-1
-        do ASSERT( level3ooe.I16_list[i] = correct.I16_list[i]);
-
-        ASSERT( level3ooe.I64_list.Count = correct.I64_list.Count);
-        for i := 0 to level3ooe.I64_list.Count-1
-        do ASSERT( level3ooe.I64_list[i] = correct.I64_list[i]);
-      end;
-    end;
-
-  finally
-    stream.Free;
-  end;
-end;
-
-
-procedure TTestSerializer.RunTests;
-begin
-  try
-    Test_Serializer_Deserializer;
-  except
-    on e:Exception do begin
-      Writeln( e.Message);
-      Write('Hit ENTER to close ... '); Readln;
-    end;
-  end;
-end;
-
-
-class function TTestSerializer.Serialize(const input : IBase; const factory : IProtocolFactory) : TBytes;
-var serial : TSerializer;
-begin
-  serial := TSerializer.Create( factory);
-  try
-    result := serial.Serialize( input);
-  finally
-    serial.Free;
-  end;
-end;
-
-
-class procedure TTestSerializer.Serialize(const input : IBase; const factory : IProtocolFactory; const aStream : TStream);
-var serial : TSerializer;
-begin
-  serial := TSerializer.Create( factory);
-  try
-    serial.Serialize( input, aStream);
-  finally
-    serial.Free;
-  end;
-end;
-
-
-class procedure TTestSerializer.Deserialize( const input : TBytes; const target : IBase; const factory : IProtocolFactory);
-var serial : TDeserializer;
-begin
-  serial := TDeserializer.Create( factory);
-  try
-    serial.Deserialize( input, target);
-  finally
-    serial.Free;
-  end;
-end;
-
-class procedure TTestSerializer.Deserialize( const input : TStream; const target : IBase; const factory : IProtocolFactory);
-var serial : TDeserializer;
-begin
-  serial := TDeserializer.Create( factory);
-  try
-    serial.Deserialize( input, target);
-  finally
-    serial.Free;
-  end;
-end;
-
-
-var test : TTestSerializer;
-begin
-  test := TTestSerializer.Create;
-  try
-    test.RunTests;
-  finally
-    test.Free;
-  end;
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/server.dpr b/vendor/git.apache.org/thrift.git/lib/delphi/test/server.dpr
deleted file mode 100644
index d87a331..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/server.dpr
+++ /dev/null
@@ -1,73 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-program server;
-
-{$APPTYPE CONSOLE}
-
-uses
-  SysUtils,
-  TestServer in 'TestServer.pas',
-  TestServerEvents in 'TestServerEvents.pas',
-  Thrift.Test,  // in gen-delphi folder
-  Thrift in '..\src\Thrift.pas',
-  Thrift.Transport in '..\src\Thrift.Transport.pas',
-  Thrift.Socket in '..\src\Thrift.Socket.pas',
-  Thrift.Transport.Pipes in '..\src\Thrift.Transport.Pipes.pas',
-  Thrift.Protocol in '..\src\Thrift.Protocol.pas',
-  Thrift.Protocol.JSON in '..\src\Thrift.Protocol.JSON.pas',
-  Thrift.Protocol.Compact in '..\src\Thrift.Protocol.Compact.pas',
-  Thrift.Protocol.Multiplex in '..\src\Thrift.Protocol.Multiplex.pas',
-  Thrift.Processor.Multiplex in '..\src\Thrift.Processor.Multiplex.pas',
-  Thrift.Collections in '..\src\Thrift.Collections.pas',
-  Thrift.Server in '..\src\Thrift.Server.pas',
-  Thrift.Console in '..\src\Thrift.Console.pas',
-  Thrift.TypeRegistry in '..\src\Thrift.TypeRegistry.pas',
-  Thrift.Utils in '..\src\Thrift.Utils.pas',
-  Thrift.Stream in '..\src\Thrift.Stream.pas';
-
-var
-  nParamCount : Integer;
-  args : array of string;
-  i : Integer;
-  arg : string;
-
-begin
-  try
-    Writeln( 'Delphi TestServer '+Thrift.Version);
-    nParamCount := ParamCount;
-    SetLength( args, nParamCount);
-    for i := 1 to nParamCount do begin
-      arg := ParamStr( i );
-      args[i-1] := arg;
-    end;
-
-    TTestServer.Execute( args );
-
-  except
-    on E: EAbort do begin
-      ExitCode := $FF;
-    end;
-    on E: Exception do begin
-      Writeln(E.ClassName, ': ', E.Message);
-      ExitCode := $FF;
-    end;
-  end;
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/README.md b/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/README.md
deleted file mode 100644
index f349368..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-These two projects belong together. Both programs
-simulate server and client for different versions
-of the same protocol.
-
-The intention of this test is to ensure fully
-working compatibility features of the Delphi Thrift
-implementation.
-
-The expected test result is, that no errors occur
-with both programs, regardless in which order they
-might be started.
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/idl/skiptest_version_1.thrift b/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/idl/skiptest_version_1.thrift
deleted file mode 100644
index 8353c5e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/idl/skiptest_version_1.thrift
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-// version 1 of the interface
-
-namespace * Skiptest.One
-
-const i32 SKIPTESTSERVICE_VERSION = 1
-
-struct Pong {
-  1 : optional i32 version1
-}
-
-struct Ping {
-  1 : optional i32 version1
-}
-
-exception PongFailed {
-  222 : optional i32 pongErrorCode
-}
-
-
-service SkipTestService {
-  void PingPong( 1: Ping pong) throws (444: PongFailed pof);
-}
-
-
-// EOF
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/idl/skiptest_version_2.thrift b/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/idl/skiptest_version_2.thrift
deleted file mode 100644
index f3352d3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/idl/skiptest_version_2.thrift
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-// version 2 of the interface
-
-namespace * Skiptest.Two
-
-const i32 SKIPTESTSERVICE_VERSION = 2
-
-struct Pong {
-  1 : optional i32 version1
-  2 : optional i16 version2
-}
-
-struct Ping {
-  1 : optional i32 version1
-  10 : optional bool boolVal
-  11 : optional byte byteVal
-  12 : optional double dbVal
-  13 : optional i16 i16Val
-  14 : optional i32 i32Val
-  15 : optional i64 i64Val
-  16 : optional string strVal
-  17 : optional Pong structVal
-  18 : optional map< list< Pong>, set< string>> mapVal
-}
-
-exception PingFailed {
-  1 : optional i32 pingErrorCode
-}
-
-exception PongFailed {
-  222 : optional i32 pongErrorCode
-  10 : optional bool boolVal
-  11 : optional byte byteVal
-  12 : optional double dbVal
-  13 : optional i16 i16Val
-  14 : optional i32 i32Val
-  15 : optional i64 i64Val
-  16 : optional string strVal
-  17 : optional Pong structVal
-  18 : optional map< list< Pong>, set< string>> mapVal
-}
-
-
-service SkipTestService {
-  Ping PingPong( 1: Ping ping, 3: Pong pong) throws (1: PingFailed pif, 444: PongFailed pof);
-}
-
-
-// EOF
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/skiptest_version1.dpr b/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/skiptest_version1.dpr
deleted file mode 100644
index c7092c9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/skiptest_version1.dpr
+++ /dev/null
@@ -1,201 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-program skiptest_version1;
-
-{$APPTYPE CONSOLE}
-
-uses
-  Classes, Windows, SysUtils,
-  Skiptest.One,
-  Thrift in '..\..\src\Thrift.pas',
-  Thrift.Socket in '..\..\src\Thrift.Socket.pas',
-  Thrift.Transport in '..\..\src\Thrift.Transport.pas',
-  Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
-  Thrift.Protocol.JSON in '..\..\src\Thrift.Protocol.JSON.pas',
-  Thrift.Collections in '..\..\src\Thrift.Collections.pas',
-  Thrift.Server in '..\..\src\Thrift.Server.pas',
-  Thrift.Console in '..\..\src\Thrift.Console.pas',
-  Thrift.Utils in '..\..\src\Thrift.Utils.pas',
-  Thrift.TypeRegistry in '..\..\src\Thrift.TypeRegistry.pas',
-  Thrift.Stream in '..\..\src\Thrift.Stream.pas';
-
-const
-  REQUEST_EXT  = '.request';
-  RESPONSE_EXT = '.response';
-
-
-function CreatePing : IPing;
-begin
-  result := TPingImpl.Create;
-  result.Version1  := Skiptest.One.TConstants.SKIPTESTSERVICE_VERSION;
-end;
-
-
-type
-  TDummyServer = class( TInterfacedObject, TSkipTestService.Iface)
-  protected
-    // TSkipTestService.Iface
-    procedure PingPong(const ping: IPing);
-  end;
-
-
-procedure TDummyServer.PingPong(const ping: IPing);
-// TSkipTestService.Iface
-begin
-  Writeln('- performing request from version '+IntToStr(ping.Version1)+' client');
-end;
-
-
-function CreateProtocol( protfact : IProtocolFactory; stm : TStream; aForInput : Boolean) : IProtocol;
-var adapt  : IThriftStream;
-    trans  : ITransport;
-begin
-  adapt  := TThriftStreamAdapterDelphi.Create( stm, FALSE);
-  if aForInput
-  then trans := TStreamTransportImpl.Create( adapt, nil)
-  else trans := TStreamTransportImpl.Create( nil, adapt);
-  result := protfact.GetProtocol( trans);
-end;
-
-
-procedure CreateRequest( protfact : IProtocolFactory; fname : string);
-var stm    : TFileStream;
-    ping   : IPing;
-    proto  : IProtocol;
-    client : TSkipTestService.TClient;   // we need access to send/recv_pingpong()
-    cliRef : IUnknown;                   // holds the refcount
-begin
-  Writeln('- creating new request');
-  stm := TFileStream.Create( fname+REQUEST_EXT+'.tmp', fmCreate);
-  try
-    ping := CreatePing;
-
-    // save request data
-    proto  := CreateProtocol( protfact, stm, FALSE);
-    client := TSkipTestService.TClient.Create( nil, proto);
-    cliRef := client as IUnknown;
-    client.send_PingPong( ping);
-
-  finally
-    client := nil;  // not Free!
-    cliRef := nil;
-    stm.Free;
-    if client = nil then {warning suppressed};
-  end;
-
-  DeleteFile( fname+REQUEST_EXT);
-  RenameFile( fname+REQUEST_EXT+'.tmp', fname+REQUEST_EXT);
-end;
-
-
-procedure ReadResponse( protfact : IProtocolFactory; fname : string);
-var stm    : TFileStream;
-    proto  : IProtocol;
-    client : TSkipTestService.TClient;   // we need access to send/recv_pingpong()
-    cliRef : IUnknown;                   // holds the refcount
-begin
-  Writeln('- reading response');
-  stm := TFileStream.Create( fname+RESPONSE_EXT, fmOpenRead);
-  try
-    // save request data
-    proto  := CreateProtocol( protfact, stm, TRUE);
-    client := TSkipTestService.TClient.Create( proto, nil);
-    cliRef := client as IUnknown;
-    client.recv_PingPong;
-
-  finally
-    client := nil;  // not Free!
-    cliRef := nil;
-    stm.Free;
-    if client = nil then {warning suppressed};
-  end;
-end;
-
-
-procedure ProcessFile( protfact : IProtocolFactory; fname : string);
-var stmIn, stmOut   : TFileStream;
-    protIn, protOut : IProtocol;
-    server : IProcessor;
-begin
-  Writeln('- processing request');
-  stmOut := nil;
-  stmIn  := TFileStream.Create( fname+REQUEST_EXT, fmOpenRead);
-  try
-    stmOut := TFileStream.Create( fname+RESPONSE_EXT+'.tmp', fmCreate);
-
-    // process request and write response data
-    protIn  := CreateProtocol( protfact, stmIn,  TRUE);
-    protOut := CreateProtocol( protfact, stmOut, FALSE);
-
-    server := TSkipTestService.TProcessorImpl.Create( TDummyServer.Create);
-    server.Process( protIn, protOut);
-
-  finally
-    server := nil;  // not Free!
-    stmIn.Free;
-    stmOut.Free;
-    if server = nil then {warning suppressed};
-  end;
-
-  DeleteFile( fname+RESPONSE_EXT);
-  RenameFile( fname+RESPONSE_EXT+'.tmp', fname+RESPONSE_EXT);
-end;
-
-
-procedure Test( protfact : IProtocolFactory; fname : string);
-begin
-  // try to read an existing request
-  if FileExists( fname + REQUEST_EXT) then begin
-    ProcessFile( protfact, fname);
-    ReadResponse( protfact, fname);
-  end;
-
-  // create a new request and try to process
-  CreateRequest( protfact, fname);
-  ProcessFile( protfact, fname);
-  ReadResponse( protfact, fname);
-end;
-
-
-const
-  FILE_BINARY = 'pingpong.bin';
-  FILE_JSON   = 'pingpong.json';
-begin
-  try
-    Writeln( 'Delphi SkipTest '+IntToStr(TConstants.SKIPTESTSERVICE_VERSION)+' using '+Thrift.Version);
-
-    Writeln;
-    Writeln('Binary protocol');
-    Test( TBinaryProtocolImpl.TFactory.Create, FILE_BINARY);
-
-    Writeln;
-    Writeln('JSON protocol');
-    Test( TJSONProtocolImpl.TFactory.Create,   FILE_JSON);
-
-    Writeln;
-    Writeln('Test completed without errors.');
-    Writeln;
-    Write('Press ENTER to close ...');  Readln;
-  except
-    on E: Exception do
-      Writeln(E.ClassName, ': ', E.Message);
-  end;
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/skiptest_version2.dpr b/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/skiptest_version2.dpr
deleted file mode 100644
index e99e62e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/skip/skiptest_version2.dpr
+++ /dev/null
@@ -1,228 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-program skiptest_version2;
-
-{$APPTYPE CONSOLE}
-
-uses
-  Classes, Windows, SysUtils,
-  Skiptest.Two,
-  Thrift in '..\..\src\Thrift.pas',
-  Thrift.Socket in '..\..\src\Thrift.Socket.pas',
-  Thrift.Transport in '..\..\src\Thrift.Transport.pas',
-  Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
-  Thrift.Protocol.JSON in '..\..\src\Thrift.Protocol.JSON.pas',
-  Thrift.Collections in '..\..\src\Thrift.Collections.pas',
-  Thrift.Server in '..\..\src\Thrift.Server.pas',
-  Thrift.Console in '..\..\src\Thrift.Console.pas',
-  Thrift.Utils in '..\..\src\Thrift.Utils.pas',
-  Thrift.TypeRegistry in '..\..\src\Thrift.TypeRegistry.pas',
-  Thrift.Stream in '..\..\src\Thrift.Stream.pas';
-
-const
-  REQUEST_EXT  = '.request';
-  RESPONSE_EXT = '.response';
-
-function CreatePing : IPing;
-var list : IThriftList<IPong>;
-    set_ : IHashSet<string>;
-begin
-  result := TPingImpl.Create;
-  result.Version1  := Skiptest.Two.TConstants.SKIPTESTSERVICE_VERSION;
-  result.BoolVal   := TRUE;
-  result.ByteVal   := 2;
-  result.DbVal     := 3;
-  result.I16Val    := 4;
-  result.I32Val    := 5;
-  result.I64Val    := 6;
-  result.StrVal    := 'seven';
-
-  result.StructVal := TPongImpl.Create;
-  result.StructVal.Version1 := -1;
-  result.StructVal.Version2 := -2;
-
-  list := TThriftListImpl<IPong>.Create;
-  list.Add( result.StructVal);
-  list.Add( result.StructVal);
-
-  set_ := THashSetImpl<string>.Create;
-  set_.Add( 'one');
-  set_.Add( 'uno');
-  set_.Add( 'eins');
-  set_.Add( 'een');
-
-  result.MapVal := TThriftDictionaryImpl< IThriftList<IPong>, IHashSet<string>>.Create;
-  result.MapVal.Add( list, set_);
-end;
-
-
-type
-  TDummyServer = class( TInterfacedObject, TSkipTestService.Iface)
-  protected
-    // TSkipTestService.Iface
-    function PingPong(const ping: IPing; const pong: IPong): IPing;
-  end;
-
-
-function TDummyServer.PingPong(const ping: IPing; const pong: IPong): IPing;
-// TSkipTestService.Iface
-begin
-  Writeln('- performing request from version '+IntToStr(ping.Version1)+' client');
-  result := CreatePing;
-end;
-
-
-function CreateProtocol( protfact : IProtocolFactory; stm : TStream; aForInput : Boolean) : IProtocol;
-var adapt  : IThriftStream;
-    trans  : ITransport;
-begin
-  adapt  := TThriftStreamAdapterDelphi.Create( stm, FALSE);
-  if aForInput
-  then trans := TStreamTransportImpl.Create( adapt, nil)
-  else trans := TStreamTransportImpl.Create( nil, adapt);
-  result := protfact.GetProtocol( trans);
-end;
-
-
-procedure CreateRequest( protfact : IProtocolFactory; fname : string);
-var stm    : TFileStream;
-    ping   : IPing;
-    proto  : IProtocol;
-    client : TSkipTestService.TClient;   // we need access to send/recv_pingpong()
-    cliRef : IUnknown;                   // holds the refcount
-begin
-  Writeln('- creating new request');
-  stm := TFileStream.Create( fname+REQUEST_EXT+'.tmp', fmCreate);
-  try
-    ping := CreatePing;
-
-    // save request data
-    proto  := CreateProtocol( protfact, stm, FALSE);
-    client := TSkipTestService.TClient.Create( nil, proto);
-    cliRef := client as IUnknown;
-    client.send_PingPong( ping, ping.StructVal);
-
-  finally
-    client := nil;  // not Free!
-    cliRef := nil;
-    stm.Free;
-    if client = nil then {warning suppressed};
-  end;
-
-  DeleteFile( fname+REQUEST_EXT);
-  RenameFile( fname+REQUEST_EXT+'.tmp', fname+REQUEST_EXT);
-end;
-
-
-procedure ReadResponse( protfact : IProtocolFactory; fname : string);
-var stm    : TFileStream;
-    ping   : IPing;
-    proto  : IProtocol;
-    client : TSkipTestService.TClient;   // we need access to send/recv_pingpong()
-    cliRef : IUnknown;                   // holds the refcount
-begin
-  Writeln('- reading response');
-  stm := TFileStream.Create( fname+RESPONSE_EXT, fmOpenRead);
-  try
-    // save request data
-    proto  := CreateProtocol( protfact, stm, TRUE);
-    client := TSkipTestService.TClient.Create( proto, nil);
-    cliRef := client as IUnknown;
-    ping   := client.recv_PingPong;
-
-  finally
-    client := nil;  // not Free!
-    cliRef := nil;
-    stm.Free;
-    if client = nil then {warning suppressed};
-  end;
-end;
-
-
-procedure ProcessFile( protfact : IProtocolFactory; fname : string);
-var stmIn, stmOut   : TFileStream;
-    protIn, protOut : IProtocol;
-    server : IProcessor;
-begin
-  Writeln('- processing request');
-  stmOut := nil;
-  stmIn  := TFileStream.Create( fname+REQUEST_EXT, fmOpenRead);
-  try
-    stmOut := TFileStream.Create( fname+RESPONSE_EXT+'.tmp', fmCreate);
-
-    // process request and write response data
-    protIn  := CreateProtocol( protfact, stmIn,  TRUE);
-    protOut := CreateProtocol( protfact, stmOut, FALSE);
-
-    server := TSkipTestService.TProcessorImpl.Create( TDummyServer.Create);
-    server.Process( protIn, protOut);
-
-  finally
-    server := nil;  // not Free!
-    stmIn.Free;
-    stmOut.Free;
-    if server = nil then {warning suppressed};
-  end;
-
-  DeleteFile( fname+RESPONSE_EXT);
-  RenameFile( fname+RESPONSE_EXT+'.tmp', fname+RESPONSE_EXT);
-end;
-
-
-procedure Test( protfact : IProtocolFactory; fname : string);
-begin
-  // try to read an existing request
-  if FileExists( fname + REQUEST_EXT) then begin
-    ProcessFile( protfact, fname);
-    ReadResponse( protfact, fname);
-  end;
-
-  // create a new request and try to process
-  CreateRequest( protfact, fname);
-  ProcessFile( protfact, fname);
-  ReadResponse( protfact, fname);
-end;
-
-
-const
-  FILE_BINARY = 'pingpong.bin';
-  FILE_JSON   = 'pingpong.json';
-begin
-  try
-    Writeln( 'Delphi SkipTest '+IntToStr(TConstants.SKIPTESTSERVICE_VERSION)+' using '+Thrift.Version);
-
-    Writeln;
-    Writeln('Binary protocol');
-    Test( TBinaryProtocolImpl.TFactory.Create, FILE_BINARY);
-
-    Writeln;
-    Writeln('JSON protocol');
-    Test( TJSONProtocolImpl.TFactory.Create,   FILE_JSON);
-
-    Writeln;
-    Writeln('Test completed without errors.');
-    Writeln;
-    Write('Press ENTER to close ...');  Readln;
-  except
-    on E: Exception do
-      Writeln(E.ClassName, ': ', E.Message);
-  end;
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/delphi/test/typeregistry/TestTypeRegistry.dpr b/vendor/git.apache.org/thrift.git/lib/delphi/test/typeregistry/TestTypeRegistry.dpr
deleted file mode 100644
index 3a77aae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/delphi/test/typeregistry/TestTypeRegistry.dpr
+++ /dev/null
@@ -1,90 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-
-program TestTypeRegistry;
-
-{$APPTYPE CONSOLE}
-
-uses
-  Classes, Windows, SysUtils, Generics.Collections, TypInfo,
-  Thrift in '..\..\src\Thrift.pas',
-  Thrift.Transport in '..\..\src\Thrift.Transport.pas',
-  Thrift.Socket in '..\..\src\Thrift.Socket.pas',
-  Thrift.Protocol in '..\..\src\Thrift.Protocol.pas',
-  Thrift.Protocol.JSON in '..\..\src\Thrift.Protocol.JSON.pas',
-  Thrift.Collections in '..\..\src\Thrift.Collections.pas',
-  Thrift.Server in '..\..\src\Thrift.Server.pas',
-  Thrift.Console in '..\..\src\Thrift.Console.pas',
-  Thrift.Utils in '..\..\src\Thrift.Utils.pas',
-  Thrift.Serializer in '..\..\src\Thrift.Serializer.pas',
-  Thrift.Stream in '..\..\src\Thrift.Stream.pas',
-  Thrift.TypeRegistry in '..\..\src\Thrift.TypeRegistry.pas',
-  DebugProtoTest;
-
-type
-  Tester<T : IInterface> = class
-  public
-    class procedure Test;
-  end;
-
-class procedure Tester<T>.Test;
-var instance : T;
-    name : string;
-begin
-  instance := TypeRegistry.Construct<T>;
-  name := GetTypeName(TypeInfo(T));
-  if instance <> nil
-  then Writeln( name, ' = ok')
-  else begin
-    Writeln( name, ' = failed');
-    raise Exception.Create( 'Test with '+name+' failed!');
-  end;
-end;
-
-begin
-  Writeln('Testing ...');
-  Tester<IDoubles>.Test;
-  Tester<IOneOfEach>.Test;
-  Tester<IBonk>.Test;
-  Tester<INesting>.Test;
-  Tester<IHolyMoley>.Test;
-  Tester<IBackwards>.Test;
-  Tester<IEmpty>.Test;
-  Tester<IWrapper>.Test;
-  Tester<IRandomStuff>.Test;
-  Tester<IBase64>.Test;
-  Tester<ICompactProtoTestStruct>.Test;
-  Tester<ISingleMapTestStruct>.Test;
-  Tester<IBlowUp>.Test;
-  Tester<IReverseOrderStruct>.Test;
-  Tester<IStructWithSomeEnum>.Test;
-  Tester<ITestUnion>.Test;
-  Tester<ITestUnionMinusStringField>.Test;
-  Tester<IComparableUnion>.Test;
-  Tester<IStructWithAUnion>.Test;
-  Tester<IPrimitiveThenStruct>.Test;
-  Tester<IStructWithASomemap>.Test;
-  Tester<IBigFieldIdStruct>.Test;
-  Tester<IBreaksRubyCompactProtocol>.Test;
-  Tester<ITupleProtocolTestStruct>.Test;
-  Writeln('Completed.');
-
-
-end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/Makefile.am b/vendor/git.apache.org/thrift.git/lib/erl/Makefile.am
deleted file mode 100644
index 2502d31..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = ../../compiler/cpp/thrift
-THRIFT_FILES = $(wildcard test/*.thrift) \
-		  ../../test/NameConflictTest.thrift \
-		  ../../test/ThriftTest.thrift
-
-if ERLANG_OTP16
-ERL_FLAG = erl:otp16
-ERL_FLAG_LEGACY = erl:otp16,legacynames
-# otp16 + maps does not make sense. We need to generate it anyway to avoid include error.
-ERL_FLAG_MAPS = erl:otp16
-else
-ERL_FLAG = erl
-ERL_FLAG_LEGACY = erl:legacynames
-ERL_FLAG_MAPS = erl:maps
-endif
-.generated: $(THRIFT) $(THRIFT_FILES)
-	for f in $(THRIFT_FILES) ; do \
-		$(THRIFT) --gen $(ERL_FLAG) -o test $$f ; \
-	done
-	$(THRIFT) --gen $(ERL_FLAG_LEGACY) -o test test/flags/LegacyNames.thrift
-	$(THRIFT) --gen $(ERL_FLAG_MAPS) -o test test/flags/Thrift3214.thrift
-	touch .generated
-
-all: .generated
-	$(REBAR) get-deps
-	$(REBAR) compile
-
-check: .generated
-	$(REBAR) -C rebar.test.config get-deps
-	$(REBAR) -C rebar.test.config compile
-	$(REBAR) -C rebar.test.config skip_deps=true eunit
-
-install: all
-	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) ; \
-	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/ebin ; \
-	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/include ; \
-	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/src ; \
-	for p in ebin/*.app* ebin/*.beam include/*.hrl src/*.erl ; \
-		do $(INSTALL) $$p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/$$p ; \
-	done
-
-uninstall:
-	rm -rf $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)
-
-clean:
-	rm -f .generated
-	rm -rf test/gen-erl/
-	$(REBAR) clean
-
-maintainer-clean-local:
-	rm -rf ebin
-
-EXTRA_DIST = \
-	include \
-	src \
-	coding_standards.md \
-	rebar.config \
-	rebar.test.config \
-	test \
-	README.md
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/README.md b/vendor/git.apache.org/thrift.git/lib/erl/README.md
deleted file mode 100644
index 433d05c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Thrift Erlang Software Library #
-
-## License ##
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-## Release Notes ##
-
-### 0.9.2 ###
-
-as of 0.9.2 struct and function naming conventions have changed. to retain the
-old naming conventions (for backwards compatibility) use the compiler option
-`legacynames`
-
-## Example ##
-
-Example session using thrift_client:
-
-```erl
-1> {ok, C0} = thrift_client_util:new("localhost", 9090, thrift_test_thrift, []), ok.
-ok
-2> {C1, R1} = thrift_client:call(C0, testVoid, []), R1.
-{ok,ok}
-3> {C2, R2} = thrift_client:call(C1, testVoid, [asdf]), R2.
-{error,{bad_args,testVoid,[asdf]}}
-4> {C3, R3} = thrift_client:call(C2, testI32, [123]), R3.
-{ok,123}
-5> {C4, R4} = thrift_client:call(C3, testOneway, [1]), R4.
-{ok,ok}
-6> {C5, R5} = thrift_client:call(C4, testXception, ["foo"]), R5.
-{error,{no_function,testXception}}
-7> {C6, R6} = thrift_client:call(C5, testException, ["foo"]), R6.
-{ok,ok}
-8> {C7, R7} = (catch thrift_client:call(C6, testException, ["Xception"])), R7.
-{exception,{xception,1001,<<"Xception">>}}
-```
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/erl/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_constants.hrl b/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_constants.hrl
deleted file mode 100644
index 7cb29eb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_constants.hrl
+++ /dev/null
@@ -1,62 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
-%% TType
--define(tType_STOP, 0).
--define(tType_VOID, 1).
--define(tType_BOOL, 2).
--define(tType_BYTE, 3).
--define(tType_I8, 3).
--define(tType_DOUBLE, 4).
--define(tType_I16, 6).
--define(tType_I32, 8).
--define(tType_I64, 10).
--define(tType_STRING, 11).
--define(tType_STRUCT, 12).
--define(tType_MAP, 13).
--define(tType_SET, 14).
--define(tType_LIST, 15).
-
-% TMessageType
--define(tMessageType_CALL, 1).
--define(tMessageType_REPLY, 2).
--define(tMessageType_EXCEPTION, 3).
--define(tMessageType_ONEWAY, 4).
-
-% TApplicationException
--define(TApplicationException_Structure,
-        {struct, [{1, string},
-                  {2, i32}]}).
-
--record('TApplicationException', {message, type}).
-
--define(TApplicationException_UNKNOWN, 0).
--define(TApplicationException_UNKNOWN_METHOD, 1).
--define(TApplicationException_INVALID_MESSAGE_TYPE, 2).
--define(TApplicationException_WRONG_METHOD_NAME, 3).
--define(TApplicationException_BAD_SEQUENCE_ID, 4).
--define(TApplicationException_MISSING_RESULT, 5).
--define(TApplicationException_INTERNAL_ERROR, 6).
--define(TApplicationException_PROTOCOL_ERROR, 7).
--define(TApplicationException_INVALID_TRANSFORM, 8).
--define(TApplicationException_INVALID_PROTOCOL, 9).
--define(TApplicationException_UNSUPPORTED_CLIENT_TYPE, 10).
-
--define (MULTIPLEXED_SERVICE_SEPARATOR, ":").
--define (MULTIPLEXED_ERROR_HANDLER_KEY, "error_handler").
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_protocol.hrl b/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_protocol.hrl
deleted file mode 100644
index f85f455..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_protocol.hrl
+++ /dev/null
@@ -1,66 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--ifndef(THRIFT_PROTOCOL_INCLUDED).
--define(THRIFT_PROTOCOL_INCLUDED, true).
-
--record(protocol_message_begin, {name, type, seqid}).
--record(protocol_struct_begin, {name}).
--record(protocol_field_begin, {name, type, id}).
--record(protocol_map_begin, {ktype, vtype, size}).
--record(protocol_list_begin, {etype, size}).
--record(protocol_set_begin, {etype, size}).
-
--type tprot_header_val() :: #protocol_message_begin{}
-                          | #protocol_struct_begin{}
-                          | #protocol_field_begin{}
-                          | #protocol_map_begin{}
-                          | #protocol_list_begin{}
-                          | #protocol_set_begin{}
-                          .
--type tprot_empty_tag() :: message_end
-                         | struct_begin
-                         | struct_end
-                         | field_end
-                         | map_end
-                         | list_end
-                         | set_end
-                         .
--type tprot_header_tag() :: message_begin
-                          | field_begin
-                          | map_begin
-                          | list_begin
-                          | set_begin
-                          .
--type tprot_data_tag() :: ui32
-                        | bool
-                        | byte
-                        | i16
-                        | i32
-                        | i64
-                        | double
-                        | string
-                        .
--type tprot_cont_tag() :: {list, _Type}
-                        | {map, _KType, _VType}
-                        | {set, _Type}
-                        .
-
-
--endif.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_protocol_behaviour.hrl b/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_protocol_behaviour.hrl
deleted file mode 100644
index abe300b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_protocol_behaviour.hrl
+++ /dev/null
@@ -1,37 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
-%% Signature specifications for protocol implementations.
-
--ifndef(THRIFT_PROTOCOL_BEHAVIOUR_INCLUDED).
--define(THRIFT_PROTOCOL_BEHAVIOUR_INCLUDED, true).
-
--spec flush_transport(state()) -> {state(), ok | {error, _Reason}}.
--spec close_transport(state()) -> {state(), ok | {error, _Reason}}.
-
--spec write(state(), any()) -> {state(), ok | {error, _Reason}}.
-
-%% NOTE: Keep this in sync with thrift_protocol:read and read_specific.
--spec read
-        (state(), tprot_empty_tag()) ->  {state(),  ok                | {error, _Reason}};
-        (state(), tprot_header_tag()) -> {state(), tprot_header_val() | {error, _Reason}};
-        (state(), tprot_data_tag()) ->   {state(), {ok, any()}        | {error, _Reason}}.
-
-
--endif.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_transport_behaviour.hrl b/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_transport_behaviour.hrl
deleted file mode 100644
index dbc05aa..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/include/thrift_transport_behaviour.hrl
+++ /dev/null
@@ -1,31 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
-%% Signature specifications for transport implementations.
-
--ifndef(THRIFT_TRANSPORT_BEHAVIOUR_INCLUDED).
--define(THRIFT_TRANSPORT_BEHAVIOUR_INCLUDED, true).
-
--spec write(state(), iolist() | binary()) -> {state(), ok | {error, _Reason}}.
--spec read(state(), non_neg_integer()) -> {state(), {ok, binary()} | {error, _Reason}}.
--spec flush(state()) -> {state(), ok | {error, _Reason}}.
--spec close(state()) -> {state(), ok | {error, _Reason}}.
-
-
--endif.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/rebar.config b/vendor/git.apache.org/thrift.git/lib/erl/rebar.config
deleted file mode 100644
index 1ea18a4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/rebar.config
+++ /dev/null
@@ -1 +0,0 @@
-{erl_opts, [{platform_define, "^R.*", otp16_or_less}, debug_info]}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/rebar.config.script b/vendor/git.apache.org/thrift.git/lib/erl/rebar.config.script
deleted file mode 100644
index c733823..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/rebar.config.script
+++ /dev/null
@@ -1,7 +0,0 @@
-Def0 = case not erlang:is_builtin(erlang, monotonic_time, 0) of
-           true -> [];
-           false -> [{d, time_correction}]
-       end,
-Defs = Def0,
-lists:keystore(erl_opts, 1, CONFIG,
-               {erl_opts, proplists:get_value(erl_opts, CONFIG, []) ++ Defs}).
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/rebar.test.config b/vendor/git.apache.org/thrift.git/lib/erl/rebar.test.config
deleted file mode 100644
index 12515b7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/rebar.test.config
+++ /dev/null
@@ -1,5 +0,0 @@
-{erl_opts, [{platform_define, "^R.*", otp16_or_less}, debug_info]}.
-
-{deps, [
-  {meck, "", {git, "https://github.com/eproxus/meck.git", {tag, "0.8.2"}}}
-]}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_base64_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_base64_transport.erl
deleted file mode 100644
index d31f2ba..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_base64_transport.erl
+++ /dev/null
@@ -1,69 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_base64_transport).
-
--behaviour(thrift_transport).
-
-%% API
--export([new/1, new_transport_factory/1]).
-
-%% thrift_transport callbacks
--export([write/2, read/2, flush/1, close/1]).
-
-%% State
--record(b64_transport, {wrapped}).
--type state() :: #b64_transport{}.
--include("thrift_transport_behaviour.hrl").
-
-new(Wrapped) ->
-    State = #b64_transport{wrapped = Wrapped},
-    thrift_transport:new(?MODULE, State).
-
-
-write(This = #b64_transport{wrapped = Wrapped}, Data) ->
-    {NewWrapped, Result} = thrift_transport:write(Wrapped, base64:encode(iolist_to_binary(Data))),
-    {This#b64_transport{wrapped = NewWrapped}, Result}.
-
-
-%% base64 doesn't support reading quite yet since it would involve
-%% nasty buffering and such
-read(This = #b64_transport{}, _Data) ->
-    {This, {error, no_reads_allowed}}.
-
-
-flush(This = #b64_transport{wrapped = Wrapped0}) ->
-    {Wrapped1, ok} = thrift_transport:write(Wrapped0, <<"\n">>),
-    {Wrapped2, ok} = thrift_transport:flush(Wrapped1),
-    {This#b64_transport{wrapped = Wrapped2}, ok}.
-
-
-close(This0) ->
-    {This1 = #b64_transport{wrapped = Wrapped}, ok} = flush(This0),
-    {NewWrapped, ok} = thrift_transport:close(Wrapped),
-    {This1#b64_transport{wrapped = NewWrapped}, ok}.
-
-
-%%%% FACTORY GENERATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-new_transport_factory(WrapFactory) ->
-    F = fun() ->
-                {ok, Wrapped} = WrapFactory(),
-                new(Wrapped)
-        end,
-    {ok, F}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_binary_protocol.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_binary_protocol.erl
deleted file mode 100644
index 85abb62..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_binary_protocol.erl
+++ /dev/null
@@ -1,347 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_binary_protocol).
-
--behaviour(thrift_protocol).
-
--include("thrift_constants.hrl").
--include("thrift_protocol.hrl").
-
--export([new/1, new/2,
-         read/2,
-         write/2,
-         flush_transport/1,
-         close_transport/1,
-
-         new_protocol_factory/2
-        ]).
-
--record(binary_protocol, {transport,
-                          strict_read=true,
-                          strict_write=true
-                         }).
--type state() :: #binary_protocol{}.
--include("thrift_protocol_behaviour.hrl").
-
--define(VERSION_MASK, 16#FFFF0000).
--define(VERSION_1, 16#80010000).
--define(TYPE_MASK, 16#000000ff).
-
-new(Transport) ->
-    new(Transport, _Options = []).
-
-new(Transport, Options) ->
-    State  = #binary_protocol{transport = Transport},
-    State1 = parse_options(Options, State),
-    thrift_protocol:new(?MODULE, State1).
-
-parse_options([], State) ->
-    State;
-parse_options([{strict_read, Bool} | Rest], State) when is_boolean(Bool) ->
-    parse_options(Rest, State#binary_protocol{strict_read=Bool});
-parse_options([{strict_write, Bool} | Rest], State) when is_boolean(Bool) ->
-    parse_options(Rest, State#binary_protocol{strict_write=Bool}).
-
-
-flush_transport(This = #binary_protocol{transport = Transport}) ->
-    {NewTransport, Result} = thrift_transport:flush(Transport),
-    {This#binary_protocol{transport = NewTransport}, Result}.
-
-close_transport(This = #binary_protocol{transport = Transport}) ->
-    {NewTransport, Result} = thrift_transport:close(Transport),
-    {This#binary_protocol{transport = NewTransport}, Result}.
-
-%%%
-%%% instance methods
-%%%
-
-write(This0, #protocol_message_begin{
-        name = Name,
-        type = Type,
-        seqid = Seqid}) ->
-    case This0#binary_protocol.strict_write of
-        true ->
-            {This1, ok} = write(This0, {i32, ?VERSION_1 bor Type}),
-            {This2, ok} = write(This1, {string, Name}),
-            {This3, ok} = write(This2, {i32, Seqid}),
-            {This3, ok};
-        false ->
-            {This1, ok} = write(This0, {string, Name}),
-            {This2, ok} = write(This1, {byte, Type}),
-            {This3, ok} = write(This2, {i32, Seqid}),
-            {This3, ok}
-    end;
-
-write(This, message_end) -> {This, ok};
-
-write(This0, #protocol_field_begin{
-       name = _Name,
-       type = Type,
-       id = Id}) ->
-    {This1, ok} = write(This0, {byte, Type}),
-    {This2, ok} = write(This1, {i16, Id}),
-    {This2, ok};
-
-write(This, field_stop) ->
-    write(This, {byte, ?tType_STOP});
-
-write(This, field_end) -> {This, ok};
-
-write(This0, #protocol_map_begin{
-       ktype = Ktype,
-       vtype = Vtype,
-       size = Size}) ->
-    {This1, ok} = write(This0, {byte, Ktype}),
-    {This2, ok} = write(This1, {byte, Vtype}),
-    {This3, ok} = write(This2, {i32, Size}),
-    {This3, ok};
-
-write(This, map_end) -> {This, ok};
-
-write(This0, #protocol_list_begin{
-        etype = Etype,
-        size = Size}) ->
-    {This1, ok} = write(This0, {byte, Etype}),
-    {This2, ok} = write(This1, {i32, Size}),
-    {This2, ok};
-
-write(This, list_end) -> {This, ok};
-
-write(This0, #protocol_set_begin{
-        etype = Etype,
-        size = Size}) ->
-    {This1, ok} = write(This0, {byte, Etype}),
-    {This2, ok} = write(This1, {i32, Size}),
-    {This2, ok};
-
-write(This, set_end) -> {This, ok};
-
-write(This, #protocol_struct_begin{}) -> {This, ok};
-write(This, struct_end) -> {This, ok};
-
-write(This, {bool, true})  -> write(This, {byte, 1});
-write(This, {bool, false}) -> write(This, {byte, 0});
-
-write(This, {byte, Byte}) ->
-    write(This, <<Byte:8/big-signed>>);
-
-write(This, {i16, I16}) ->
-    write(This, <<I16:16/big-signed>>);
-
-write(This, {i32, I32}) ->
-    write(This, <<I32:32/big-signed>>);
-
-write(This, {i64, I64}) ->
-    write(This, <<I64:64/big-signed>>);
-
-write(This, {double, Double}) ->
-    write(This, <<Double:64/big-signed-float>>);
-
-write(This0, {string, Str}) when is_list(Str) ->
-    {This1, ok} = write(This0, {i32, length(Str)}),
-    {This2, ok} = write(This1, list_to_binary(Str)),
-    {This2, ok};
-
-write(This0, {string, Bin}) when is_binary(Bin) ->
-    {This1, ok} = write(This0, {i32, size(Bin)}),
-    {This2, ok} = write(This1, Bin),
-    {This2, ok};
-
-%% Data :: iolist()
-write(This = #binary_protocol{transport = Trans}, Data) ->
-    {NewTransport, Result} = thrift_transport:write(Trans, Data),
-    {This#binary_protocol{transport = NewTransport}, Result}.
-
-%%
-
-read(This0, message_begin) ->
-    {This1, Initial} = read(This0, ui32),
-    case Initial of
-        {ok, Sz} when Sz band ?VERSION_MASK =:= ?VERSION_1 ->
-            %% we're at version 1
-            {This2, {ok, Name}}  = read(This1, string),
-            {This3, {ok, SeqId}} = read(This2, i32),
-            Type                 = Sz band ?TYPE_MASK,
-            {This3, #protocol_message_begin{name  = binary_to_list(Name),
-                                            type  = Type,
-                                            seqid = SeqId}};
-
-        {ok, Sz} when Sz < 0 ->
-            %% there's a version number but it's unexpected
-            {This1, {error, {bad_binary_protocol_version, Sz}}};
-
-        {ok, _Sz} when This1#binary_protocol.strict_read =:= true ->
-            %% strict_read is true and there's no version header; that's an error
-            {This1, {error, no_binary_protocol_version}};
-
-        {ok, Sz} when This1#binary_protocol.strict_read =:= false ->
-            %% strict_read is false, so just read the old way
-            {This2, {ok, Name}}  = read_data(This1, Sz),
-            {This3, {ok, Type}}  = read(This2, byte),
-            {This4, {ok, SeqId}} = read(This3, i32),
-            {This4, #protocol_message_begin{name  = binary_to_list(Name),
-                                            type  = Type,
-                                            seqid = SeqId}};
-
-        Else ->
-            {This1, Else}
-    end;
-
-read(This, message_end) -> {This, ok};
-
-read(This, struct_begin) -> {This, ok};
-read(This, struct_end) -> {This, ok};
-
-read(This0, field_begin) ->
-    {This1, Result} = read(This0, byte),
-    case Result of
-        {ok, Type = ?tType_STOP} ->
-            {This1, #protocol_field_begin{type = Type}};
-        {ok, Type} ->
-            {This2, {ok, Id}} = read(This1, i16),
-            {This2, #protocol_field_begin{type = Type,
-                                          id = Id}}
-    end;
-
-read(This, field_end) -> {This, ok};
-
-read(This0, map_begin) ->
-    {This1, {ok, Ktype}} = read(This0, byte),
-    {This2, {ok, Vtype}} = read(This1, byte),
-    {This3, {ok, Size}}  = read(This2, i32),
-    {This3, #protocol_map_begin{ktype = Ktype,
-                                vtype = Vtype,
-                                size = Size}};
-read(This, map_end) -> {This, ok};
-
-read(This0, list_begin) ->
-    {This1, {ok, Etype}} = read(This0, byte),
-    {This2, {ok, Size}}  = read(This1, i32),
-    {This2, #protocol_list_begin{etype = Etype,
-                                 size = Size}};
-read(This, list_end) -> {This, ok};
-
-read(This0, set_begin) ->
-    {This1, {ok, Etype}} = read(This0, byte),
-    {This2, {ok, Size}}  = read(This1, i32),
-    {This2, #protocol_set_begin{etype = Etype,
-                                 size = Size}};
-read(This, set_end) -> {This, ok};
-
-read(This0, field_stop) ->
-    {This1, {ok, ?tType_STOP}} = read(This0, byte),
-    {This1, ok};
-
-%%
-
-read(This0, bool) ->
-    {This1, Result} = read(This0, byte),
-    case Result of
-        {ok, Byte} -> {This1, {ok, Byte /= 0}};
-        Else -> {This1, Else}
-    end;
-
-read(This0, byte) ->
-    {This1, Bytes} = read_data(This0, 1),
-    case Bytes of
-        {ok, <<Val:8/integer-signed-big, _/binary>>} -> {This1, {ok, Val}};
-        Else -> {This1, Else}
-    end;
-
-read(This0, i16) ->
-    {This1, Bytes} = read_data(This0, 2),
-    case Bytes of
-        {ok, <<Val:16/integer-signed-big, _/binary>>} -> {This1, {ok, Val}};
-        Else -> {This1, Else}
-    end;
-
-read(This0, i32) ->
-    {This1, Bytes} = read_data(This0, 4),
-    case Bytes of
-        {ok, <<Val:32/integer-signed-big, _/binary>>} -> {This1, {ok, Val}};
-        Else -> {This1, Else}
-    end;
-
-%% unsigned ints aren't used by thrift itself, but it's used for the parsing
-%% of the packet version header. Without this special function BEAM works fine
-%% but hipe thinks it received a bad version header.
-read(This0, ui32) ->
-    {This1, Bytes} = read_data(This0, 4),
-    case Bytes of
-        {ok, <<Val:32/integer-unsigned-big, _/binary>>} -> {This1, {ok, Val}};
-        Else -> {This1, Else}
-    end;
-
-read(This0, i64) ->
-    {This1, Bytes} = read_data(This0, 8),
-    case Bytes of
-        {ok, <<Val:64/integer-signed-big, _/binary>>} -> {This1, {ok, Val}};
-        Else -> {This1, Else}
-    end;
-
-read(This0, double) ->
-    {This1, Bytes} = read_data(This0, 8),
-    case Bytes of
-        {ok, <<Val:64/float-signed-big, _/binary>>} -> {This1, {ok, Val}};
-        Else -> {This1, Else}
-    end;
-
-% returns a binary directly, call binary_to_list if necessary
-read(This0, string) ->
-    {This1, {ok, Sz}}  = read(This0, i32),
-    read_data(This1, Sz).
-
--spec read_data(#binary_protocol{}, non_neg_integer()) ->
-    {#binary_protocol{}, {ok, binary()} | {error, _Reason}}.
-read_data(This, 0) -> {This, {ok, <<>>}};
-read_data(This = #binary_protocol{transport = Trans}, Len) when is_integer(Len) andalso Len > 0 ->
-    {NewTransport, Result} = thrift_transport:read(Trans, Len),
-    {This#binary_protocol{transport = NewTransport}, Result}.
-
-
-%%%% FACTORY GENERATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--record(tbp_opts, {strict_read = true,
-                   strict_write = true}).
-
-parse_factory_options([], Opts) ->
-    Opts;
-parse_factory_options([{strict_read, Bool} | Rest], Opts) when is_boolean(Bool) ->
-    parse_factory_options(Rest, Opts#tbp_opts{strict_read=Bool});
-parse_factory_options([{strict_write, Bool} | Rest], Opts) when is_boolean(Bool) ->
-    parse_factory_options(Rest, Opts#tbp_opts{strict_write=Bool}).
-
-
-%% returns a (fun() -> thrift_protocol())
-new_protocol_factory(TransportFactory, Options) ->
-    ParsedOpts = parse_factory_options(Options, #tbp_opts{}),
-    F = fun() ->
-               case TransportFactory() of
-                    {ok, Transport} ->
-                        thrift_binary_protocol:new(
-                            Transport,
-                            [{strict_read,  ParsedOpts#tbp_opts.strict_read},
-                             {strict_write, ParsedOpts#tbp_opts.strict_write}]);
-                    {error, Error} ->
-                        {error, Error}
-                end
-        end,
-    {ok, F}.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_buffered_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_buffered_transport.erl
deleted file mode 100644
index e9d3fff..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_buffered_transport.erl
+++ /dev/null
@@ -1,98 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_buffered_transport).
-
--behaviour(thrift_transport).
-
-%% constructor
--export([new/1]).
-%% protocol callbacks
--export([read/2, read_exact/2, write/2, flush/1, close/1]).
-%% legacy api
--export([new_transport_factory/1]).
-
-
--record(t_buffered, {
-  wrapped,
-  write_buffer
-}).
-
--type state() :: #t_buffered{}.
-
-
--spec new(Transport::thrift_transport:t_transport()) ->
-  thrift_transport:t_transport().
-
-new(Wrapped) ->
-  State = #t_buffered{
-    wrapped = Wrapped,
-    write_buffer = []
-  },
-  thrift_transport:new(?MODULE, State).
-
-
--include("thrift_transport_behaviour.hrl").
-
-
-%% reads data through from the wrapped transport
-read(State = #t_buffered{wrapped = Wrapped}, Len)
-when is_integer(Len), Len >= 0 ->
-  {NewState, Response} = thrift_transport:read(Wrapped, Len),
-  {State#t_buffered{wrapped = NewState}, Response}.
-
-
-%% reads data through from the wrapped transport
-read_exact(State = #t_buffered{wrapped = Wrapped}, Len)
-when is_integer(Len), Len >= 0 ->
-  {NewState, Response} = thrift_transport:read_exact(Wrapped, Len),
-  {State#t_buffered{wrapped = NewState}, Response}.
-
-
-write(State = #t_buffered{write_buffer = Buffer}, Data) ->
-  {State#t_buffered{write_buffer = [Buffer, Data]}, ok}.
-
-
-flush(State = #t_buffered{wrapped = Wrapped, write_buffer = Buffer}) ->
-  case iolist_size(Buffer) of
-    %% if write buffer is empty, do nothing
-    0 -> {State, ok};
-    _ ->
-      {Written, Response} = thrift_transport:write(Wrapped, Buffer),
-      {Flushed, ok} = thrift_transport:flush(Written),
-      {State#t_buffered{wrapped = Flushed, write_buffer = []}, Response}
-  end.
-
-
-close(State = #t_buffered{wrapped = Wrapped}) ->
-  {Closed, Result} = thrift_transport:close(Wrapped),
-  {State#t_buffered{wrapped = Closed}, Result}.
-
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-%%%% FACTORY GENERATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-new_transport_factory(WrapFactory) ->
-  F = fun() ->
-    {ok, Wrapped} = WrapFactory(),
-    new(Wrapped)
-  end,
-  {ok, F}.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_client.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_client.erl
deleted file mode 100644
index 1a9cb50..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_client.erl
+++ /dev/null
@@ -1,162 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_client).
-
-%% API
--export([new/2, call/3, send_call/3, close/1]).
-
--include("thrift_constants.hrl").
--include("thrift_protocol.hrl").
-
--record(tclient, {service, protocol, seqid}).
-
-
-new(Protocol, Service)
-  when is_atom(Service) ->
-    {ok, #tclient{protocol = Protocol,
-                  service = Service,
-                  seqid = 0}}.
-
--spec call(#tclient{}, atom(), list()) -> {#tclient{}, {ok, any()} | {error, any()}}.
-call(Client = #tclient{}, Function, Args)
-when is_atom(Function), is_list(Args) ->
-  case send_function_call(Client, Function, Args) of
-    {ok, Client1} -> receive_function_result(Client1, Function);
-    {{error, X}, Client1} -> {Client1, {error, X}};
-    Else -> Else
-  end.
-
-
-%% Sends a function call but does not read the result. This is useful
-%% if you're trying to log non-oneway function calls to write-only
-%% transports like thrift_disk_log_transport.
--spec send_call(#tclient{}, atom(), list()) -> {#tclient{}, ok}.
-send_call(Client = #tclient{}, Function, Args)
-  when is_atom(Function), is_list(Args) ->
-    case send_function_call(Client, Function, Args) of
-      {ok, Client1} -> {Client1, ok};
-      Else -> Else
-    end.
-
--spec close(#tclient{}) -> ok.
-close(#tclient{protocol=Protocol}) ->
-    thrift_protocol:close_transport(Protocol).
-
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
--spec send_function_call(#tclient{}, atom(), list()) -> {ok | {error, any()}, #tclient{}}.
-send_function_call(Client = #tclient{service = Service}, Function, Args) ->
-  {Params, Reply} = try
-    {Service:function_info(Function, params_type), Service:function_info(Function, reply_type)}
-  catch error:function_clause -> {no_function, 0}
-  end,
-  MsgType = case Reply of
-    oneway_void -> ?tMessageType_ONEWAY;
-    _ -> ?tMessageType_CALL
-  end,
-  case Params of
-    no_function ->
-      {{error, {no_function, Function}}, Client};
-    {struct, PList} when length(PList) =/= length(Args) ->
-      {{error, {bad_args, Function, Args}}, Client};
-    {struct, _PList} -> write_message(Client, Function, Args, Params, MsgType)
-  end.
-
--spec write_message(#tclient{}, atom(), list(), {struct, list()}, integer()) ->
-  {ok | {error, any()}, #tclient{}}.
-write_message(Client = #tclient{protocol = P0, seqid = Seq}, Function, Args, Params, MsgType) ->
-  try
-    {P1, ok} = thrift_protocol:write(P0, #protocol_message_begin{
-      name = atom_to_list(Function),
-      type = MsgType,
-      seqid = Seq
-    }),
-    {P2, ok} = thrift_protocol:write(P1, {Params, list_to_tuple([Function|Args])}),
-    {P3, ok} = thrift_protocol:write(P2, message_end),
-    {P4, ok} = thrift_protocol:flush_transport(P3),
-    {ok, Client#tclient{protocol = P4}}
-  catch
-    error:{badmatch, {_, {error, _} = Error}} -> {Error, Client}
-  end.
-
--spec receive_function_result(#tclient{}, atom()) -> {#tclient{}, {ok, any()} | {error, any()}}.
-receive_function_result(Client = #tclient{service = Service}, Function) ->
-    ResultType = Service:function_info(Function, reply_type),
-    read_result(Client, Function, ResultType).
-
-read_result(Client, _Function, oneway_void) ->
-    {Client, {ok, ok}};
-
-read_result(Client = #tclient{protocol = Proto0,
-                              seqid    = SeqId},
-            Function,
-            ReplyType) ->
-    case thrift_protocol:read(Proto0, message_begin) of
-         {Proto1, {error, Reason}} ->
-             NewClient = Client#tclient{protocol = Proto1},
-             {NewClient, {error, Reason}};
-         {Proto1, MessageBegin} ->
-             NewClient = Client#tclient{protocol = Proto1},
-             case MessageBegin of
-                 #protocol_message_begin{seqid = RetSeqId} when RetSeqId =/= SeqId ->
-                     {NewClient, {error, {bad_seq_id, SeqId}}};
-                 #protocol_message_begin{type = ?tMessageType_EXCEPTION} ->
-                     handle_application_exception(NewClient);
-                 #protocol_message_begin{type = ?tMessageType_REPLY} ->
-                     handle_reply(NewClient, Function, ReplyType)
-             end
-    end.
-
-
-handle_reply(Client = #tclient{protocol = Proto0,
-                               service = Service},
-             Function,
-             ReplyType) ->
-    {struct, ExceptionFields} = Service:function_info(Function, exceptions),
-    ReplyStructDef = {struct, [{0, ReplyType}] ++ ExceptionFields},
-    {Proto1, {ok, Reply}} = thrift_protocol:read(Proto0, ReplyStructDef),
-    {Proto2, ok} = thrift_protocol:read(Proto1, message_end),
-    NewClient = Client#tclient{protocol = Proto2},
-    ReplyList = tuple_to_list(Reply),
-    true = length(ReplyList) == length(ExceptionFields) + 1,
-    ExceptionVals = tl(ReplyList),
-    Thrown = [X || X <- ExceptionVals,
-                   X =/= undefined],
-    case Thrown of
-        [] when ReplyType == {struct, []} ->
-            {NewClient, {ok, ok}};
-        [] ->
-            {NewClient, {ok, hd(ReplyList)}};
-        [Exception] ->
-            throw({NewClient, {exception, Exception}})
-    end.
-
-handle_application_exception(Client = #tclient{protocol = Proto0}) ->
-    {Proto1, {ok, Exception}} =
-        thrift_protocol:read(Proto0, ?TApplicationException_Structure),
-    {Proto2, ok} = thrift_protocol:read(Proto1, message_end),
-    XRecord = list_to_tuple(
-                ['TApplicationException' | tuple_to_list(Exception)]),
-    error_logger:error_msg("X: ~p~n", [XRecord]),
-    true = is_record(XRecord, 'TApplicationException'),
-    NewClient = Client#tclient{protocol = Proto2},
-    throw({NewClient, {exception, XRecord}}).
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_client_util.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_client_util.erl
deleted file mode 100644
index 1dbe51e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_client_util.erl
+++ /dev/null
@@ -1,112 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_client_util).
-
--export([new/4]).
--export([new_multiplexed/3, new_multiplexed/4]).
-
--type service_name()            :: nonempty_string().
--type service_module()          :: atom().
--type multiplexed_service_map() :: [{ServiceName::service_name(), ServiceModule::service_module()}].
-
-%%
-%% Splits client options into client, protocol, and transport options
-%%
-%% split_options([Options...]) -> {ProtocolOptions, TransportOptions}
-%%
-split_options(Options) ->
-    split_options(Options, [], []).
-
-split_options([], ProtoIn, TransIn) ->
-    {ProtoIn, TransIn};
-
-split_options([Opt = {OptKey, _} | Rest], ProtoIn, TransIn)
-  when OptKey =:= strict_read;
-       OptKey =:= strict_write;
-       OptKey =:= protocol ->
-    split_options(Rest, [Opt | ProtoIn], TransIn);
-
-split_options([Opt = {OptKey, _} | Rest], ProtoIn, TransIn)
-  when OptKey =:= framed;
-       OptKey =:= connect_timeout;
-       OptKey =:= recv_timeout;
-       OptKey =:= sockopts;
-       OptKey =:= ssltransport;
-       OptKey =:= ssloptions->
-    split_options(Rest, ProtoIn, [Opt | TransIn]).
-
-
-%% Client constructor for the common-case of socket transports
-new(Host, Port, Service, Options)
-  when is_integer(Port), is_atom(Service), is_list(Options) ->
-    {ProtoOpts, TransOpts0} = split_options(Options),
-
-    {TransportModule, TransOpts2} = case lists:keytake(ssltransport, 1, TransOpts0) of
-                                        {value, {_, true}, TransOpts1} -> {thrift_sslsocket_transport, TransOpts1};
-                                        false -> {thrift_socket_transport, TransOpts0}
-                                    end,
-
-    {ProtocolModule, ProtoOpts1} = case lists:keytake(protocol, 1, ProtoOpts) of
-                                     {value, {_, compact}, Opts} -> {thrift_compact_protocol, Opts};
-                                     {value, {_, json}, Opts} -> {thrift_json_protocol, Opts};
-                                     {value, {_, binary}, Opts} -> {thrift_binary_protocol, Opts};
-                                     false -> {thrift_binary_protocol, ProtoOpts}
-                                   end,
-    {ok, TransportFactory} =
-        TransportModule:new_transport_factory(Host, Port, TransOpts2),
-
-    {ok, ProtocolFactory} = ProtocolModule:new_protocol_factory(
-                              TransportFactory, ProtoOpts1),
-
-    case ProtocolFactory() of
-        {ok, Protocol} ->
-            thrift_client:new(Protocol, Service);
-        {error, Error} ->
-            {error, Error}
-    end.
-
--spec new_multiplexed(Host, Port, Services, Options) -> {ok, ServiceThriftClientList} when
-    Host        :: nonempty_string(),
-    Port        :: non_neg_integer(),
-    Services    :: multiplexed_service_map(),
-    Options     :: list(),
-    ServiceThriftClientList :: [{ServiceName::list(), ThriftClient::term()}].
-new_multiplexed(Host, Port, Services, Options) when is_integer(Port),
-                                                    is_list(Services),
-                                                    is_list(Options) ->
-    new_multiplexed(thrift_socket_transport:new_transport_factory(Host, Port, Options), Services, Options).
-
--spec new_multiplexed(TransportFactoryTuple, Services, Options) -> {ok, ServiceThriftClientList} when
-    TransportFactoryTuple   :: {ok, TransportFactory::term()},
-    Services                :: multiplexed_service_map(),
-    Options                 :: list(),
-    ServiceThriftClientList :: [{ServiceName::service_name(), ThriftClient::term()}].
-new_multiplexed(TransportFactoryTuple, Services, Options) when is_list(Services),
-                                                               is_list(Options),
-                                                               is_tuple(TransportFactoryTuple) ->
-    {ProtoOpts, _} = split_options(Options),
-
-    {ok, TransportFactory} = TransportFactoryTuple,
-
-    {ok, ProtocolFactory} = thrift_binary_protocol:new_protocol_factory(TransportFactory, ProtoOpts),
-
-    {ok, Protocol} = ProtocolFactory(),
-
-    {ok, [{ServiceName, element(2, thrift_client:new(element(2, thrift_multiplexed_protocol:new(Protocol, ServiceName)), Service))} || {ServiceName, Service} <- Services]}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_compact_protocol.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_compact_protocol.erl
deleted file mode 100644
index 0f14221..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_compact_protocol.erl
+++ /dev/null
@@ -1,390 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_compact_protocol).
-
--behaviour(thrift_protocol).
-
--include("thrift_constants.hrl").
--include("thrift_protocol.hrl").
-
--export([new/1, new/2,
-         read/2,
-         write/2,
-         flush_transport/1,
-         close_transport/1,
-         new_protocol_factory/2
-        ]).
-
--define(ID_NONE, 16#10000).
--define(CBOOL_NONE, 0).
--define(CBOOL_TRUE, 1).
--define(CBOOL_FALSE, 2).
-
--record(t_compact, {transport,
-                           % state for pending boolean fields
-                           read_stack=[],
-                           read_value=?CBOOL_NONE,
-                           write_stack=[],
-                           write_id=?ID_NONE
-                          }).
--type state() :: #t_compact{}.
--include("thrift_protocol_behaviour.hrl").
-
--define(PROTOCOL_ID, 16#82).
--define(VERSION_MASK, 16#1f).
--define(VERSION_1, 16#01).
--define(TYPE_MASK, 16#E0).
--define(TYPE_BITS, 16#07).
--define(TYPE_SHIFT_AMOUNT, 5).
-
-typeid_to_compact(?tType_STOP) -> 16#0;
-typeid_to_compact(?tType_BOOL) -> 16#2;
-typeid_to_compact(?tType_I8) -> 16#3;
-typeid_to_compact(?tType_I16) -> 16#4;
-typeid_to_compact(?tType_I32) -> 16#5;
-typeid_to_compact(?tType_I64) -> 16#6;
-typeid_to_compact(?tType_DOUBLE) -> 16#7;
-typeid_to_compact(?tType_STRING) -> 16#8;
-typeid_to_compact(?tType_STRUCT) -> 16#C;
-typeid_to_compact(?tType_MAP) -> 16#B;
-typeid_to_compact(?tType_SET) -> 16#A;
-typeid_to_compact(?tType_LIST) -> 16#9.
-
-compact_to_typeid(16#0) ->  ?tType_STOP;
-compact_to_typeid(?CBOOL_FALSE) ->  ?tType_BOOL;
-compact_to_typeid(?CBOOL_TRUE) ->  ?tType_BOOL;
-compact_to_typeid(16#7) ->  ?tType_DOUBLE;
-compact_to_typeid(16#3) ->  ?tType_I8;
-compact_to_typeid(16#4) ->  ?tType_I16;
-compact_to_typeid(16#5) ->  ?tType_I32;
-compact_to_typeid(16#6) ->  ?tType_I64;
-compact_to_typeid(16#8) ->  ?tType_STRING;
-compact_to_typeid(16#C) ->  ?tType_STRUCT;
-compact_to_typeid(16#B) ->  ?tType_MAP;
-compact_to_typeid(16#A) ->  ?tType_SET;
-compact_to_typeid(16#9) ->  ?tType_LIST.
-
-bool_to_cbool(Value) when Value -> ?CBOOL_TRUE;
-bool_to_cbool(_) -> ?CBOOL_FALSE.
-cbool_to_bool(Value) -> Value =:= ?CBOOL_TRUE.
-
-new(Transport) -> new(Transport, _Options = []).
-
-new(Transport, _Options) ->
-  State  = #t_compact{transport = Transport},
-  thrift_protocol:new(?MODULE, State).
-
-flush_transport(This = #t_compact{transport = Transport}) ->
-  {NewTransport, Result} = thrift_transport:flush(Transport),
-  {This#t_compact{transport = NewTransport}, Result}.
-
-close_transport(This = #t_compact{transport = Transport}) ->
-  {NewTransport, Result} = thrift_transport:close(Transport),
-  {This#t_compact{transport = NewTransport}, Result}.
-
-%%%
-%%% instance methods
-%%%
-
-write_field_begin(This0 = #t_compact{write_stack=[LastId|T]}, CompactType, Id) ->
-  IdDiff = Id - LastId,
-  This1 = This0#t_compact{write_stack=[Id|T]},
-  case (IdDiff > 0) and (IdDiff < 16) of
-    true -> write(This1, {byte, (IdDiff bsl 4) bor CompactType});
-    false ->
-      {This2, ok} = write(This1, {byte, CompactType}),
-      write(This2, {i16, Id})
-  end.
-
--spec to_zigzag(integer()) -> non_neg_integer().
-to_zigzag(Value) -> 16#FFFFFFFFFFFFFFFF band ((Value bsl 1) bxor (Value bsr 63)).
-
--spec from_zigzag(non_neg_integer()) -> integer().
-from_zigzag(Value) -> (Value bsr 1) bxor -(Value band 1).
-
--spec to_varint(non_neg_integer(), iolist()) -> iolist().
-to_varint(Value, Acc) when (Value < 16#80) -> [Acc, Value];
-to_varint(Value, Acc) ->
-  to_varint(Value bsr 7, [Acc, ((Value band 16#7F) bor 16#80)]).
-
--spec read_varint(#t_compact{}, non_neg_integer(), non_neg_integer()) -> non_neg_integer().
-read_varint(This0, Acc, Count) ->
-  {This1, {ok, Byte}} = read(This0, byte),
-  case (Byte band 16#80) of
-    0 -> {This1, {ok, (Byte bsl (7 * Count)) + Acc}};
-    _ -> read_varint(This1, ((Byte band 16#7f) bsl (7 * Count)) + Acc, Count + 1)
-  end.
-
-write(This0, #protocol_message_begin{
-        name = Name,
-        type = Type,
-        seqid = Seqid}) ->
-  {This1, ok} = write(This0, {byte, ?PROTOCOL_ID}),
-  {This2, ok} = write(This1, {byte, (?VERSION_1 band ?VERSION_MASK) bor (Type bsl ?TYPE_SHIFT_AMOUNT)}),
-  {This3, ok} = write(This2, {ui32, Seqid}),
-  {This4, ok} = write(This3, {string, Name}),
-  {This4, ok};
-
-write(This, message_end) -> {This, ok};
-
-write(This0, #protocol_field_begin{
-       name = _Name,
-       type = Type,
-       id = Id})
-when (Type =:= ?tType_BOOL) -> {This0#t_compact{write_id = Id}, ok};
-
-write(This0, #protocol_field_begin{
-       name = _Name,
-       type = Type,
-       id = Id}) ->
-  write_field_begin(This0, typeid_to_compact(Type), Id);
-
-write(This, field_stop) -> write(This, {byte, ?tType_STOP});
-
-write(This, field_end) -> {This, ok};
-
-write(This0, #protocol_map_begin{
-      ktype = _Ktype,
-      vtype = _Vtype,
-      size = Size})
-when Size =:= 0 ->
-  write(This0, {byte, 0});
-
-write(This0, #protocol_map_begin{
-       ktype = Ktype,
-       vtype = Vtype,
-       size = Size}) ->
-  {This1, ok} = write(This0, {ui32, Size}),
-  write(This1, {byte, (typeid_to_compact(Ktype) bsl 4) bor typeid_to_compact(Vtype)});
-
-write(This, map_end) -> {This, ok};
-
-write(This0, #protocol_list_begin{
-        etype = Etype,
-        size = Size})
-when Size < 16#f ->
-  write(This0, {byte, (Size bsl 4) bor typeid_to_compact(Etype)});
-
-write(This0, #protocol_list_begin{
-        etype = Etype,
-        size = Size}) ->
-  {This1, ok} = write(This0, {byte, 16#f0 bor typeid_to_compact(Etype)}),
-  write(This1, {ui32, Size});
-
-write(This, list_end) -> {This, ok};
-
-write(This0, #protocol_set_begin{
-        etype = Etype,
-        size = Size}) ->
-  write(This0, #protocol_list_begin{etype = Etype, size =  Size});
-
-write(This, set_end) -> {This, ok};
-
-write(This = #t_compact{write_stack = Stack}, #protocol_struct_begin{}) ->
-  {This#t_compact{write_stack = [0|Stack]}, ok};
-write(This = #t_compact{write_stack = [_|T]}, struct_end) ->
-  {This#t_compact{write_stack = T}, ok};
-
-write(This = #t_compact{write_id = ?ID_NONE}, {bool, Value}) ->
-  write(This, {byte, bool_to_cbool(Value)});
-
-write(This0 = #t_compact{write_id = Id}, {bool, Value}) ->
-  {This1, ok} = write_field_begin(This0, bool_to_cbool(Value), Id),
-  {This1#t_compact{write_id = ?ID_NONE}, ok};
-
-write(This, {byte, Value}) when is_integer(Value) ->
-  write(This, <<Value:8/big-signed>>);
-
-write(This, {i16, Value}) when is_integer(Value) -> write(This, to_varint(to_zigzag(Value), []));
-write(This, {ui32, Value}) when is_integer(Value) -> write(This, to_varint(Value, []));
-write(This, {i32, Value}) when is_integer(Value) ->
-  write(This, to_varint(to_zigzag(Value), []));
-write(This, {i64, Value}) when is_integer(Value) -> write(This, to_varint(to_zigzag(Value), []));
-
-write(This, {double, Double}) ->
-  write(This, <<Double:64/float-signed-little>>);
-
-write(This0, {string, Str}) when is_list(Str) ->
-  % TODO: limit length
-  {This1, ok} = write(This0, {ui32, length(Str)}),
-  {This2, ok} = write(This1, list_to_binary(Str)),
-  {This2, ok};
-
-write(This0, {string, Bin}) when is_binary(Bin) ->
-  % TODO: limit length
-  {This1, ok} = write(This0, {ui32, size(Bin)}),
-  {This2, ok} = write(This1, Bin),
-  {This2, ok};
-
-%% Data :: iolist()
-write(This = #t_compact{transport = Trans}, Data) ->
-  {NewTransport, Result} = thrift_transport:write(Trans, Data),
-  {This#t_compact{transport = NewTransport}, Result}.
-
-%%
-%%
-
-read(This0, message_begin) ->
-  {This1, {ok, ?PROTOCOL_ID}} = read(This0, ubyte),
-  {This2, {ok, VerAndType}} = read(This1, ubyte),
-  ?VERSION_1 = VerAndType band ?VERSION_MASK,
-  {This3, {ok, SeqId}} = read(This2, ui32),
-  {This4, {ok, Name}} = read(This3, string),
-  {This4, #protocol_message_begin{
-             name  = binary_to_list(Name),
-             type  = (VerAndType bsr ?TYPE_SHIFT_AMOUNT) band ?TYPE_BITS,
-             seqid = SeqId}};
-
-read(This, message_end) -> {This, ok};
-
-read(This = #t_compact{read_stack = Stack}, struct_begin) ->
-  {This#t_compact{read_stack = [0|Stack]}, ok};
-read(This = #t_compact{read_stack = [_H|T]}, struct_end) ->
-  {This#t_compact{read_stack = T}, ok};
-
-read(This0 = #t_compact{read_stack = [LastId|T]}, field_begin) ->
-  {This1, {ok, Byte}} = read(This0, ubyte),
-  case Byte band 16#f of
-    CompactType = ?tType_STOP ->
-      {This1, #protocol_field_begin{type = CompactType}};
-    CompactType ->
-      {This2, {ok, Id}} = case Byte bsr 4 of
-                            0 -> read(This1, i16);
-                            IdDiff ->
-                              {This1, {ok, LastId + IdDiff}}
-                          end,
-      case compact_to_typeid(CompactType) of
-        ?tType_BOOL ->
-          {This2#t_compact{read_stack = [Id|T], read_value = cbool_to_bool(CompactType)},
-           #protocol_field_begin{type = ?tType_BOOL, id = Id}};
-        Type ->
-          {This2#t_compact{read_stack = [Id|T]},
-           #protocol_field_begin{type = Type, id = Id}}
-      end
-  end;
-
-read(This, field_end) -> {This, ok};
-
-read(This0, map_begin) ->
-  {This1, {ok, Size}}  = read(This0, ui32),
-  {This2, {ok, KV}} = case Size of
-                        0 -> {This1, {ok, 0}};
-                        _ -> read(This1, ubyte)
-                      end,
-  {This2, #protocol_map_begin{ktype = compact_to_typeid(KV bsr 4),
-                              vtype = compact_to_typeid(KV band 16#f),
-                              size = Size}};
-read(This, map_end) -> {This, ok};
-
-read(This0, list_begin) ->
-  {This1, {ok, SizeAndType}} = read(This0, ubyte),
-  {This2, {ok, Size}} = case (SizeAndType bsr 4) band 16#f of
-                          16#f -> read(This1, ui32);
-                          Else -> {This1, {ok, Else}}
-                        end,
-  {This2, #protocol_list_begin{etype = compact_to_typeid(SizeAndType band 16#f),
-                               size = Size}};
-
-read(This, list_end) -> {This, ok};
-
-read(This0, set_begin) ->
-  {This1, {ok, SizeAndType}} = read(This0, ubyte),
-  {This2, {ok, Size}} = case (SizeAndType bsr 4) band 16#f of
-                          16#f -> read(This1, ui32);
-                          Else -> {This1, {ok, Else}}
-                        end,
-  {This2, #protocol_set_begin{etype = compact_to_typeid(SizeAndType band 16#f),
-                               size = Size}};
-
-read(This, set_end) -> {This, ok};
-
-read(This0, field_stop) ->
-  {This1, {ok, ?tType_STOP}} = read(This0, ubyte),
-  {This1, ok};
-
-%%
-
-read(This0 = #t_compact{read_value = ?CBOOL_NONE}, bool) ->
-  {This1, {ok, Byte}} = read(This0, ubyte),
-  {This1, {ok, cbool_to_bool(Byte)}};
-
-read(This0 = #t_compact{read_value = Bool}, bool) ->
-  {This0#t_compact{read_value = ?CBOOL_NONE}, {ok, Bool}};
-
-read(This0, ubyte) ->
-  {This1, {ok, <<Val:8/integer-unsigned-big, _/binary>>}} = read_data(This0, 1),
-  {This1, {ok, Val}};
-
-read(This0, byte) ->
-  {This1, Bytes} = read_data(This0, 1),
-  case Bytes of
-    {ok, <<Val:8/integer-signed-big, _/binary>>} -> {This1, {ok, Val}};
-    Else -> {This1, Else}
-  end;
-
-read(This0, i16) ->
-  {This1, {ok, Zigzag}} = read_varint(This0, 0, 0),
-  {This1, {ok, from_zigzag(Zigzag)}};
-
-read(This0, ui32) -> read_varint(This0, 0, 0);
-
-read(This0, i32) ->
-  {This1, {ok, Zigzag}} = read_varint(This0, 0, 0),
-  {This1, {ok, from_zigzag(Zigzag)}};
-
-read(This0, i64) ->
-  {This1, {ok, Zigzag}} = read_varint(This0, 0, 0),
-  {This1, {ok, from_zigzag(Zigzag)}};
-
-read(This0, double) ->
-  {This1, Bytes} = read_data(This0, 8),
-  case Bytes of
-    {ok, <<Val:64/float-signed-little, _/binary>>} -> {This1, {ok, Val}};
-    Else -> {This1, Else}
-  end;
-
-% returns a binary directly, call binary_to_list if necessary
-read(This0, string) ->
-  {This1, {ok, Sz}}  = read(This0, ui32),
-  read_data(This1, Sz).
-
--spec read_data(#t_compact{}, non_neg_integer()) ->
-    {#t_compact{}, {ok, binary()} | {error, _Reason}}.
-read_data(This, 0) -> {This, {ok, <<>>}};
-read_data(This = #t_compact{transport = Trans}, Len) when is_integer(Len) andalso Len > 0 ->
-    {NewTransport, Result} = thrift_transport:read(Trans, Len),
-    {This#t_compact{transport = NewTransport}, Result}.
-
-
-%%%% FACTORY GENERATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% returns a (fun() -> thrift_protocol())
-new_protocol_factory(TransportFactory, _Options) ->
-  F = fun() ->
-          case TransportFactory() of
-            {ok, Transport} ->
-              thrift_compact_protocol:new(
-                Transport,
-                []);
-            {error, Error} ->
-              {error, Error}
-          end
-      end,
-  {ok, F}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_disk_log_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_disk_log_transport.erl
deleted file mode 100644
index de8ee41..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_disk_log_transport.erl
+++ /dev/null
@@ -1,123 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
-%%% Todo: this might be better off as a gen_server type of transport
-%%%       that handles stuff like group commit, similar to TFileTransport
-%%%       in cpp land
--module(thrift_disk_log_transport).
-
--behaviour(thrift_transport).
-
-%% API
--export([new/2, new_transport_factory/2, new_transport_factory/3]).
-
-%% thrift_transport callbacks
--export([read/2, write/2, force_flush/1, flush/1, close/1]).
-
-%% state
--record(dl_transport, {log,
-                       close_on_close = false,
-                       sync_every = infinity,
-                       sync_tref}).
--type state() :: #dl_transport{}.
--include("thrift_transport_behaviour.hrl").
-
-
-%% Create a transport attached to an already open log.
-%% If you'd like this transport to close the disk_log using disk_log:lclose()
-%% when the transport is closed, pass a {close_on_close, true} tuple in the
-%% Opts list.
-new(LogName, Opts) when is_atom(LogName), is_list(Opts) ->
-    State = parse_opts(Opts, #dl_transport{log = LogName}),
-
-    State2 =
-        case State#dl_transport.sync_every of
-            N when is_integer(N), N > 0 ->
-                {ok, TRef} = timer:apply_interval(N, ?MODULE, force_flush, [State]),
-                State#dl_transport{sync_tref = TRef};
-            _ -> State
-        end,
-
-    thrift_transport:new(?MODULE, State2).
-
-
-parse_opts([], State) ->
-    State;
-parse_opts([{close_on_close, Bool} | Rest], State) when is_boolean(Bool) ->
-    parse_opts(Rest, State#dl_transport{close_on_close = Bool});
-parse_opts([{sync_every, Int} | Rest], State) when is_integer(Int), Int > 0 ->
-    parse_opts(Rest, State#dl_transport{sync_every = Int}).
-
-
-%%%% TRANSPORT IMPLENTATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% disk_log_transport is write-only
-read(State, _Len) ->
-    {State, {error, no_read_from_disk_log}}.
-
-write(This = #dl_transport{log = Log}, Data) ->
-    {This, disk_log:balog(Log, erlang:iolist_to_binary(Data))}.
-
-force_flush(#dl_transport{log = Log}) ->
-    error_logger:info_msg("~p syncing~n", [?MODULE]),
-    disk_log:sync(Log).
-
-flush(This = #dl_transport{log = Log, sync_every = SE}) ->
-    case SE of
-        undefined -> % no time-based sync
-            disk_log:sync(Log);
-        _Else ->     % sync will happen automagically
-            ok
-    end,
-    {This, ok}.
-
-
-
-
-%% On close, close the underlying log if we're configured to do so.
-close(This = #dl_transport{close_on_close = false}) ->
-    {This, ok};
-close(This = #dl_transport{log = Log}) ->
-    {This, disk_log:lclose(Log)}.
-
-
-%%%% FACTORY GENERATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-new_transport_factory(Name, ExtraLogOpts) ->
-    new_transport_factory(Name, ExtraLogOpts, [{close_on_close, true},
-                                               {sync_every, 500}]).
-
-new_transport_factory(Name, ExtraLogOpts, TransportOpts) ->
-    F = fun() -> factory_impl(Name, ExtraLogOpts, TransportOpts) end,
-    {ok, F}.
-
-factory_impl(Name, ExtraLogOpts, TransportOpts) ->
-    LogOpts = [{name, Name},
-               {format, external},
-               {type, wrap} |
-               ExtraLogOpts],
-    Log =
-        case disk_log:open(LogOpts) of
-            {ok, LogS} ->
-                LogS;
-            {repaired, LogS, Info1, Info2} ->
-                error_logger:info_msg("Disk log ~p repaired: ~p, ~p~n", [LogS, Info1, Info2]),
-                LogS
-        end,
-    new(Log, TransportOpts).
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_file_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_file_transport.erl
deleted file mode 100644
index 071152b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_file_transport.erl
+++ /dev/null
@@ -1,115 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_file_transport).
-
--behaviour(thrift_transport).
-
-%% constructors
--export([new/1, new/2]).
-%% protocol callbacks
--export([read/2, read_exact/2, write/2, flush/1, close/1]).
-%% legacy api
--export([new_reader/1]).
-
-
--record(t_file, {
-  device,
-  should_close = true,
-  mode = write
-}).
-
--type state() :: #t_file{}.
-
-
--spec new(Device::file:io_device()) ->
-  thrift_transport:t_transport().
-
-new(Device) -> new(Device, []).
-
--spec new(Device::file:io_device(), Opts::list()) ->
-  thrift_transport:t_transport().
-
-%% Device should be opened in raw and binary mode.
-new(Device, Opts) when is_list(Opts) ->
-  State = parse_opts(Opts, #t_file{device = Device}),
-  thrift_transport:new(?MODULE, State).
-
-
-parse_opts([{should_close, Bool}|Rest], State)
-when is_boolean(Bool) ->
-  parse_opts(Rest, State#t_file{should_close = Bool});
-parse_opts([{mode, Mode}|Rest], State)
-when Mode =:= write; Mode =:= read ->
-  parse_opts(Rest, State#t_file{mode = Mode});
-parse_opts([], State) ->
-  State.
-
-
--include("thrift_transport_behaviour.hrl").
-
-
-read(State = #t_file{device = Device, mode = read}, Len)
-when is_integer(Len), Len >= 0 ->
-  case file:read(Device, Len) of
-    eof -> {State, {error, eof}};
-    {ok, Result} -> {State, {ok, iolist_to_binary(Result)}}
-  end;
-read(State, _) ->
-  {State, {error, write_mode}}.
-
-
-read_exact(State = #t_file{device = Device, mode = read}, Len)
-when is_integer(Len), Len >= 0 ->
-  case file:read(Device, Len) of
-    eof -> {State, {error, eof}};
-    {ok, Result} ->
-      case iolist_size(Result) of
-        X when X < Len -> {State, {error, eof}};
-        _ -> {State, {ok, iolist_to_binary(Result)}}
-      end
-  end;
-read_exact(State, _) ->
-  {State, {error, write_mode}}.
-
-
-write(State = #t_file{device = Device, mode = write}, Data) ->
-  {State, file:write(Device, Data)};
-write(State, _) ->
-  {State, {error, read_mode}}.
-
-
-flush(State = #t_file{device = Device, mode = write}) ->
-  {State, file:sync(Device)}.
-
-
-close(State = #t_file{device = Device, should_close = SC}) ->
-  case SC of
-    true -> {State, file:close(Device)};
-    false -> {State, ok}
-  end.
-
-
-%% legacy api. left for compatibility
-new_reader(Filename) ->
-  case file:open(Filename, [read, binary, {read_ahead, 1024*1024}]) of
-    {ok, IODevice} -> new(IODevice, [{should_close, true}, {mode, read}]);
-    Error -> Error
-  end.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_framed_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_framed_transport.erl
deleted file mode 100644
index 715f090..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_framed_transport.erl
+++ /dev/null
@@ -1,125 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_framed_transport).
-
--behaviour(thrift_transport).
-
-%% constructor
--export([new/1]).
-%% protocol callbacks
--export([read/2, read_exact/2, write/2, flush/1, close/1]).
-
-
--record(t_framed, {
-  wrapped,
-  read_buffer,
-  write_buffer
-}).
-
--type state() :: #t_framed{}.
-
-
--spec new(Transport::thrift_transport:t_transport()) ->
-  thrift_transport:t_transport().
-
-new(Wrapped) ->
-  State = #t_framed{
-    wrapped = Wrapped,
-    read_buffer = [],
-    write_buffer = []
-  },
-  thrift_transport:new(?MODULE, State).
-
-
--include("thrift_transport_behaviour.hrl").
-
-
-read(State = #t_framed{wrapped = Wrapped, read_buffer = Buffer}, Len)
-when is_integer(Len), Len >= 0 ->
-  Binary = iolist_to_binary(Buffer),
-  case Binary of
-    <<>> when Len > 0 ->
-      case next_frame(Wrapped) of
-        {NewState, {ok, Frame}} ->
-          NewBinary = iolist_to_binary([Binary, Frame]),
-          Give = min(iolist_size(NewBinary), Len),
-          {Result, Remaining} = split_binary(NewBinary, Give),
-          {State#t_framed{wrapped = NewState, read_buffer = Remaining}, {ok, Result}};
-        Error -> Error
-      end;
-    %% read of zero bytes
-    <<>> -> {State, {ok, <<>>}};
-    %% read buffer is nonempty
-    _ ->
-      Give = min(iolist_size(Binary), Len),
-      {Result, Remaining} = split_binary(Binary, Give),
-      {State#t_framed{read_buffer = Remaining}, {ok, Result}}
-  end.
-
-
-read_exact(State = #t_framed{wrapped = Wrapped, read_buffer = Buffer}, Len)
-when is_integer(Len), Len >= 0 ->
-  Binary = iolist_to_binary(Buffer),
-  case iolist_size(Binary) of
-    %% read buffer is larger than requested read size
-    X when X >= Len ->
-      {Result, Remaining} = split_binary(Binary, Len),
-      {State#t_framed{read_buffer = Remaining}, {ok, Result}};
-    %% read buffer is insufficient for requested read size
-    _ ->
-      case next_frame(Wrapped) of
-        {NewState, {ok, Frame}} ->
-          read_exact(
-            State#t_framed{wrapped = NewState, read_buffer = [Buffer, Frame]},
-            Len
-          );
-        {NewState, Error} ->
-          {State#t_framed{wrapped = NewState}, Error}
-      end
-  end.
-
-next_frame(Transport) ->
-  case thrift_transport:read_exact(Transport, 4) of
-    {NewState, {ok, <<FrameLength:32/integer-signed-big>>}} ->
-      thrift_transport:read_exact(NewState, FrameLength);
-    Error -> Error
-  end.
-
-
-write(State = #t_framed{write_buffer = Buffer}, Data) ->
-  {State#t_framed{write_buffer = [Buffer, Data]}, ok}.
-
-
-flush(State = #t_framed{write_buffer = Buffer, wrapped = Wrapped}) ->
-  case iolist_size(Buffer) of
-    %% if write buffer is empty, do nothing
-    0 -> {State, ok};
-    FrameLen ->
-      Data = [<<FrameLen:32/integer-signed-big>>, Buffer],
-      {Written, Response} = thrift_transport:write(Wrapped, Data),
-      {Flushed, ok} = thrift_transport:flush(Written),
-      {State#t_framed{wrapped = Flushed, write_buffer = []}, Response}
-  end.
-
-
-close(State = #t_framed{wrapped = Wrapped}) ->
-  {Closed, Result} = thrift_transport:close(Wrapped),
-  {State#t_framed{wrapped = Closed}, Result}.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_http_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_http_transport.erl
deleted file mode 100644
index 46bcede..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_http_transport.erl
+++ /dev/null
@@ -1,116 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_http_transport).
-
--behaviour(thrift_transport).
-
-%% API
--export([new/2, new/3]).
-
-%% thrift_transport callbacks
--export([write/2, read/2, flush/1, close/1]).
-
--record(http_transport, {host, % string()
-                         path, % string()
-                         read_buffer, % iolist()
-                         write_buffer, % iolist()
-                         http_options, % see http(3)
-                         extra_headers % [{str(), str()}, ...]
-                        }).
--type state() :: #http_transport{}.
--include("thrift_transport_behaviour.hrl").
-
-new(Host, Path) ->
-    new(Host, Path, _Options = []).
-
-%%--------------------------------------------------------------------
-%% Options include:
-%%   {http_options, HttpOptions}  = See http(3)
-%%   {extra_headers, ExtraHeaders}  = List of extra HTTP headers
-%%--------------------------------------------------------------------
-new(Host, Path, Options) ->
-    State1 = #http_transport{host = Host,
-                             path = Path,
-                             read_buffer = [],
-                             write_buffer = [],
-                             http_options = [],
-                             extra_headers = []},
-    ApplyOption =
-        fun
-            ({http_options, HttpOpts}, State = #http_transport{}) ->
-                State#http_transport{http_options = HttpOpts};
-            ({extra_headers, ExtraHeaders}, State = #http_transport{}) ->
-                State#http_transport{extra_headers = ExtraHeaders};
-            (Other, #http_transport{}) ->
-                {invalid_option, Other};
-            (_, Error) ->
-                Error
-        end,
-    case lists:foldl(ApplyOption, State1, Options) of
-        State2 = #http_transport{} ->
-            thrift_transport:new(?MODULE, State2);
-        Else ->
-            {error, Else}
-    end.
-
-%% Writes data into the buffer
-write(State = #http_transport{write_buffer = WBuf}, Data) ->
-    {State#http_transport{write_buffer = [WBuf, Data]}, ok}.
-
-%% Flushes the buffer, making a request
-flush(State = #http_transport{host = Host,
-                                 path = Path,
-                                 read_buffer = Rbuf,
-                                 write_buffer = Wbuf,
-                                 http_options = HttpOptions,
-                                 extra_headers = ExtraHeaders}) ->
-    case iolist_to_binary(Wbuf) of
-        <<>> ->
-            %% Don't bother flushing empty buffers.
-            {State, ok};
-        WBinary ->
-            {ok, {{_Version, 200, _ReasonPhrase}, _Headers, Body}} =
-              httpc:request(post,
-                           {"http://" ++ Host ++ Path,
-                            [{"User-Agent", "Erlang/thrift_http_transport"} | ExtraHeaders],
-                            "application/x-thrift",
-                            WBinary},
-                           HttpOptions,
-                           [{body_format, binary}]),
-
-            State1 = State#http_transport{read_buffer = [Rbuf, Body],
-                                          write_buffer = []},
-            {State1, ok}
-    end.
-
-close(State) ->
-    {State, ok}.
-
-read(State = #http_transport{read_buffer = RBuf}, Len) when is_integer(Len) ->
-    %% Pull off Give bytes, return them to the user, leave the rest in the buffer.
-    Give = min(iolist_size(RBuf), Len),
-    case iolist_to_binary(RBuf) of
-        <<Data:Give/binary, RBuf1/binary>> ->
-            Response = {ok, Data},
-            State1 = State#http_transport{read_buffer=RBuf1},
-            {State1, Response};
-        _ ->
-            {State, {error, 'EOF'}}
-    end.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_json_parser.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_json_parser.erl
deleted file mode 100644
index 4e47f10..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_json_parser.erl
+++ /dev/null
@@ -1,419 +0,0 @@
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-%% The json parser implementation was created by
-%% alisdair sullivan <alisdair@hartbrake.com> based on
-%% the jsx json library
-
--module(thrift_json_parser).
--export([parser/0, handle_event/2]).
-
-
--record(config, {strict_utf8 = false :: boolean()}).
-
-
-parser() -> fun(JSON) -> start(JSON, {?MODULE, []}, [], #config{}) end.
-
-
-handle_event(Event, {Handler, State}, _Config) -> {Handler, Handler:handle_event(Event, State)}.
-
-handle_event(end_json, State) -> lists:reverse([end_json] ++ State);
-handle_event(Event, State) -> [Event] ++ State.
-
-
-%% whitespace
--define(space, 16#20).
--define(tab, 16#09).
--define(cr, 16#0D).
--define(newline, 16#0A).
-
-%% object delimiters
--define(start_object, 16#7B).
--define(end_object, 16#7D).
-
-%% array delimiters
--define(start_array, 16#5B).
--define(end_array, 16#5D).
-
-%% kv seperator
--define(comma, 16#2C).
--define(doublequote, 16#22).
--define(singlequote, 16#27).
--define(colon, 16#3A).
-
-%% string escape sequences
--define(rsolidus, 16#5C).
--define(solidus, 16#2F).
-
-%% math
--define(zero, 16#30).
--define(decimalpoint, 16#2E).
--define(negative, 16#2D).
--define(positive, 16#2B).
-
-%% comments
--define(star, 16#2A).
-
-
-%% some useful guards
--define(is_hex(Symbol),
-    (Symbol >= $a andalso Symbol =< $f) orelse
-    (Symbol >= $A andalso Symbol =< $F) orelse
-    (Symbol >= $0 andalso Symbol =< $9)
-).
-
--define(is_nonzero(Symbol),
-    Symbol >= $1 andalso Symbol =< $9
-).
-
--define(is_whitespace(Symbol),
-    Symbol =:= ?space; Symbol =:= ?tab; Symbol =:= ?cr; Symbol =:= ?newline
-).
-
-
-%% lists are benchmarked to be faster (tho higher in memory usage) than binaries
-new_seq() -> [].
-new_seq(C) -> [C].
-
-acc_seq(Seq, C) when is_list(C) -> lists:reverse(C) ++ Seq;
-acc_seq(Seq, C) -> [C] ++ Seq.
-
-end_seq(Seq) -> unicode:characters_to_binary(lists:reverse(Seq)).
-
-end_seq(Seq, _) -> end_seq(Seq).
-
-
-start(<<16#ef, 16#bb, 16#bf, Rest/binary>>, Handler, Stack, Config) ->
-    value(Rest, Handler, Stack, Config);
-start(Bin, Handler, Stack, Config) ->
-    value(Bin, Handler, Stack, Config).
-
-
-value(<<?doublequote, Rest/binary>>, Handler, Stack, Config) ->
-    string(Rest, Handler, new_seq(), Stack, Config);
-value(<<$t, Rest/binary>>, Handler, Stack, Config) ->
-    true(Rest, Handler, Stack, Config);
-value(<<$f, Rest/binary>>, Handler, Stack, Config) ->
-    false(Rest, Handler, Stack, Config);
-value(<<$n, Rest/binary>>, Handler, Stack, Config) ->
-    null(Rest, Handler, Stack, Config);
-value(<<?negative, Rest/binary>>, Handler, Stack, Config) ->
-    negative(Rest, Handler, new_seq($-), Stack, Config);
-value(<<?zero, Rest/binary>>, Handler, Stack, Config) ->
-    zero(Rest, Handler, new_seq($0), Stack, Config);
-value(<<S, Rest/binary>>, Handler, Stack, Config) when ?is_nonzero(S) ->
-    integer(Rest, Handler, new_seq(S), Stack, Config);
-value(<<?start_object, Rest/binary>>, Handler, Stack, Config) ->
-    object(Rest, handle_event(start_object, Handler, Config), [key|Stack], Config);
-value(<<?start_array, Rest/binary>>, Handler, Stack, Config) ->
-    array(Rest, handle_event(start_array, Handler, Config), [array|Stack], Config);
-value(<<S, Rest/binary>>, Handler, Stack, Config) when ?is_whitespace(S) ->
-    value(Rest, Handler, Stack, Config);
-value(_Bin, _Handler, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-object(<<?doublequote, Rest/binary>>, Handler, Stack, Config) ->
-    string(Rest, Handler, new_seq(), Stack, Config);
-object(<<?end_object, Rest/binary>>, Handler, [key|Stack], Config) ->
-    maybe_done(Rest, handle_event(end_object, Handler, Config), Stack, Config);
-object(<<S, Rest/binary>>, Handler, Stack, Config) when ?is_whitespace(S) ->
-    object(Rest, Handler, Stack, Config);
-object(_Bin, _Handler, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-array(<<?end_array, Rest/binary>>, Handler, [array|Stack], Config) ->
-    maybe_done(Rest, handle_event(end_array, Handler, Config), Stack, Config);
-array(<<S, Rest/binary>>, Handler, Stack, Config) when ?is_whitespace(S) ->
-    array(Rest, Handler, Stack, Config);
-array(Bin, Handler, Stack, Config) ->
-    value(Bin, Handler, Stack, Config).
-
-
-colon(<<?colon, Rest/binary>>, Handler, [key|Stack], Config) ->
-    value(Rest, Handler, [object|Stack], Config);
-colon(<<S, Rest/binary>>, Handler, Stack, Config) when ?is_whitespace(S) ->
-    colon(Rest, Handler, Stack, Config);
-colon(_Bin, _Handler, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-key(<<?doublequote, Rest/binary>>, Handler, Stack, Config) ->
-    string(Rest, Handler, new_seq(), Stack, Config);
-key(<<S, Rest/binary>>, Handler, Stack, Config) when ?is_whitespace(S) ->
-    key(Rest, Handler, Stack, Config);
-key(_Bin, _Handler, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-%% note that if you encounter an error from string and you can't find the clause that
-%%  caused it here, it might be in unescape below
-string(<<?doublequote, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    doublequote(Rest, Handler, Acc, Stack, Config);
-string(<<?solidus, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, ?solidus), Stack, Config);
-string(<<?rsolidus/utf8, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    unescape(Rest, Handler, Acc, Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#20, X < 16#2028 ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X == 16#2028; X == 16#2029 ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X > 16#2029, X < 16#d800 ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X > 16#dfff, X < 16#fdd0 ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X > 16#fdef, X < 16#fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#10000, X < 16#1fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#20000, X < 16#2fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#30000, X < 16#3fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#40000, X < 16#4fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#50000, X < 16#5fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#60000, X < 16#6fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#70000, X < 16#7fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#80000, X < 16#8fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#90000, X < 16#9fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#a0000, X < 16#afffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#b0000, X < 16#bfffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#c0000, X < 16#cfffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#d0000, X < 16#dfffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#e0000, X < 16#efffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#f0000, X < 16#ffffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-string(<<X/utf8, Rest/binary>>, Handler, Acc, Stack, Config) when X >= 16#100000, X < 16#10fffe ->
-    string(Rest, Handler, acc_seq(Acc, X), Stack, Config);
-%% surrogates
-string(<<237, X, _, Rest/binary>>, Handler, Acc, Stack, Config=#config{strict_utf8=false})
-        when X >= 160 ->
-    string(Rest, Handler, acc_seq(Acc, 16#fffd), Stack, Config);
-%% u+xfffe, u+xffff, control codes and other noncharacters
-string(<<_/utf8, Rest/binary>>, Handler, Acc, Stack, Config=#config{strict_utf8=false}) ->
-    string(Rest, Handler, acc_seq(Acc, 16#fffd), Stack, Config);
-%% u+fffe and u+ffff for R14BXX (subsequent runtimes will happily match the
-%%  preceding clause
-string(<<239, 191, X, Rest/binary>>, Handler, Acc, Stack, Config=#config{strict_utf8=false})
-        when X == 190; X == 191 ->
-    string(Rest, Handler, acc_seq(Acc, 16#fffd), Stack, Config);
-%% overlong encodings and missing continuations of a 2 byte sequence
-string(<<X, Rest/binary>>, Handler, Acc, Stack, Config=#config{strict_utf8=false})
-        when X >= 192, X =< 223 ->
-    strip_continuations(Rest, Handler, Acc, Stack, Config, 1);
-%% overlong encodings and missing continuations of a 3 byte sequence
-string(<<X, Rest/binary>>, Handler, Acc, Stack, Config=#config{strict_utf8=false})
-        when X >= 224, X =< 239 ->
-    strip_continuations(Rest, Handler, Acc, Stack, Config, 2);
-%% overlong encodings and missing continuations of a 4 byte sequence
-string(<<X, Rest/binary>>, Handler, Acc, Stack, Config=#config{strict_utf8=false})
-        when X >= 240, X =< 247 ->
-    strip_continuations(Rest, Handler, Acc, Stack, Config, 3);
-%% incompletes and unexpected bytes, including orphan continuations
-string(<<_, Rest/binary>>, Handler, Acc, Stack, Config=#config{strict_utf8=false}) ->
-    string(Rest, Handler, acc_seq(Acc, 16#fffd), Stack, Config);
-string(_Bin, _Handler, _Acc, _Stack, _Config) ->
-  erlang:error(badarg).
-
-
-doublequote(Rest, Handler, Acc, [key|_] = Stack, Config) ->
-    colon(Rest, handle_event({key, end_seq(Acc, Config)}, Handler, Config), Stack, Config);
-doublequote(Rest, Handler, Acc, Stack, Config) ->
-    maybe_done(Rest, handle_event({string, end_seq(Acc, Config)}, Handler, Config), Stack, Config).
-
-
-%% strips continuation bytes after bad utf bytes, guards against both too short
-%%  and overlong sequences. N is the maximum number of bytes to strip
-strip_continuations(<<Rest/binary>>, Handler, Acc, Stack, Config, 0) ->
-    string(Rest, Handler, acc_seq(Acc, 16#fffd), Stack, Config);
-strip_continuations(<<X, Rest/binary>>, Handler, Acc, Stack, Config, N) when X >= 128, X =< 191 ->
-    strip_continuations(Rest, Handler, Acc, Stack, Config, N - 1);
-%% not a continuation byte, insert a replacement character for sequence thus
-%%  far and dispatch back to string
-strip_continuations(<<Rest/binary>>, Handler, Acc, Stack, Config, _) ->
-    string(Rest, Handler, acc_seq(Acc, 16#fffd), Stack, Config).
-
-
-%% this all gets really gross and should probably eventually be folded into
-%%  but for now it fakes being part of string on incompletes and errors
-unescape(<<$b, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, $\b), Stack, Config);
-unescape(<<$f, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, $\f), Stack, Config);
-unescape(<<$n, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, $\n), Stack, Config);
-unescape(<<$r, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, $\r), Stack, Config);
-unescape(<<$t, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, $\t), Stack, Config);
-unescape(<<?doublequote, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, $\"), Stack, Config);
-unescape(<<?rsolidus, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, $\\), Stack, Config);
-unescape(<<?solidus, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    string(Rest, Handler, acc_seq(Acc, $/), Stack, Config);
-unescape(<<$u, $d, A, B, C, ?rsolidus, $u, $d, X, Y, Z, Rest/binary>>, Handler, Acc, Stack, Config)
-        when (A == $8 orelse A == $9 orelse A == $a orelse A == $b),
-             (X == $c orelse X == $d orelse X == $e orelse X == $f),
-             ?is_hex(B), ?is_hex(C), ?is_hex(Y), ?is_hex(Z)
-        ->
-    High = erlang:list_to_integer([$d, A, B, C], 16),
-    Low = erlang:list_to_integer([$d, X, Y, Z], 16),
-    Codepoint = (High - 16#d800) * 16#400 + (Low - 16#dc00) + 16#10000,
-    string(Rest, Handler, acc_seq(Acc, Codepoint), Stack, Config);
-unescape(<<$u, $d, A, B, C, ?rsolidus, $u, W, X, Y, Z, Rest/binary>>, Handler, Acc, Stack, Config)
-        when (A == $8 orelse A == $9 orelse A == $a orelse A == $b),
-             ?is_hex(B), ?is_hex(C), ?is_hex(W), ?is_hex(X), ?is_hex(Y), ?is_hex(Z)
-        ->
-    string(Rest, Handler, acc_seq(Acc, [16#fffd, 16#fffd]), Stack, Config);
-unescape(<<$u, A, B, C, D, Rest/binary>>, Handler, Acc, Stack, Config)
-        when ?is_hex(A), ?is_hex(B), ?is_hex(C), ?is_hex(D) ->
-    case erlang:list_to_integer([A, B, C, D], 16) of
-        Codepoint when Codepoint < 16#d800; Codepoint > 16#dfff ->
-            string(Rest, Handler, acc_seq(Acc, Codepoint), Stack, Config);
-        _ ->
-            string(Rest, Handler, acc_seq(Acc, 16#fffd), Stack, Config)
-    end;
-unescape(_Bin, _Handler, _Acc, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-%% like in strings, there's some pseudo states in here that will never
-%%  show up in errors or incompletes. some show up in value, some show
-%%  up in integer, decimal or exp
-negative(<<$0, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    zero(Rest, Handler, acc_seq(Acc, $0), Stack, Config);
-negative(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when ?is_nonzero(S) ->
-    integer(Rest, Handler, acc_seq(Acc, S), Stack, Config);
-negative(_Bin, _Handler, _Acc, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-zero(<<?decimalpoint, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    decimal(Rest, Handler, acc_seq(Acc, ?decimalpoint), Stack, Config);
-zero(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= $e; S =:= $E ->
-    e(Rest, Handler, acc_seq(Acc, ".0e"), Stack, Config);
-zero(Bin, Handler, Acc, Stack, Config) ->
-    finish_number(Bin, Handler, {zero, Acc}, Stack, Config).
-
-
-integer(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= ?zero; ?is_nonzero(S) ->
-    integer(Rest, Handler, acc_seq(Acc, S), Stack, Config);
-integer(<<?decimalpoint, Rest/binary>>, Handler, Acc, Stack, Config) ->
-    initialdecimal(Rest, Handler, acc_seq(Acc, ?decimalpoint), Stack, Config);
-integer(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= $e; S =:= $E ->
-    e(Rest, Handler, acc_seq(Acc, ".0e"), Stack, Config);
-integer(Bin, Handler, Acc, Stack, Config) ->
-    finish_number(Bin, Handler, {integer, Acc}, Stack, Config).
-
-
-initialdecimal(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= ?zero; ?is_nonzero(S) ->
-    decimal(Rest, Handler, acc_seq(Acc, S), Stack, Config);
-initialdecimal(_Bin, _Handler, _Acc, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-decimal(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= ?zero; ?is_nonzero(S) ->
-    decimal(Rest, Handler, acc_seq(Acc, S), Stack, Config);
-decimal(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= $e; S =:= $E ->
-    e(Rest, Handler, acc_seq(Acc, $e), Stack, Config);
-decimal(Bin, Handler, Acc, Stack, Config) ->
-    finish_number(Bin, Handler, {decimal, Acc}, Stack, Config).
-
-
-e(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= ?zero; ?is_nonzero(S) ->
-    exp(Rest, Handler, acc_seq(Acc, S), Stack, Config);
-e(<<Sign, Rest/binary>>, Handler, Acc, Stack, Config) when Sign =:= ?positive; Sign =:= ?negative ->
-    ex(Rest, Handler, acc_seq(Acc, Sign), Stack, Config);
-e(_Bin, _Handler, _Acc, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-ex(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= ?zero; ?is_nonzero(S) ->
-    exp(Rest, Handler, acc_seq(Acc, S), Stack, Config);
-ex(_Bin, _Handler, _Acc, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-exp(<<S, Rest/binary>>, Handler, Acc, Stack, Config) when S =:= ?zero; ?is_nonzero(S) ->
-    exp(Rest, Handler, acc_seq(Acc, S), Stack, Config);
-exp(Bin, Handler, Acc, Stack, Config) ->
-    finish_number(Bin, Handler, {exp, Acc}, Stack, Config).
-
-
-finish_number(Rest, Handler, Acc, [], Config) ->
-    maybe_done(Rest, handle_event(format_number(Acc), Handler, Config), [], Config);
-finish_number(Rest, Handler, Acc, Stack, Config) ->
-    maybe_done(Rest, handle_event(format_number(Acc), Handler, Config), Stack, Config).
-
-
-format_number({zero, Acc}) -> {integer, list_to_integer(lists:reverse(Acc))};
-format_number({integer, Acc}) -> {integer, list_to_integer(lists:reverse(Acc))};
-format_number({decimal, Acc}) -> {float, list_to_float(lists:reverse(Acc))};
-format_number({exp, Acc}) -> {float, list_to_float(lists:reverse(Acc))}.
-
-
-true(<<$r, $u, $e, Rest/binary>>, Handler, Stack, Config) ->
-    maybe_done(Rest, handle_event({literal, true}, Handler, Config), Stack, Config);
-true(_Bin, _Handler, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-false(<<$a, $l, $s, $e, Rest/binary>>, Handler, Stack, Config) ->
-    maybe_done(Rest, handle_event({literal, false}, Handler, Config), Stack, Config);
-false(_Bin, _Handler, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-null(<<$u, $l, $l, Rest/binary>>, Handler, Stack, Config) ->
-    maybe_done(Rest, handle_event({literal, null}, Handler, Config), Stack, Config);
-null(_Bin, _Handler, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-maybe_done(<<Rest/binary>>, Handler, [], Config) ->
-    done(Rest, handle_event(end_json, Handler, Config), [], Config);
-maybe_done(<<?end_object, Rest/binary>>, Handler, [object|Stack], Config) ->
-    maybe_done(Rest, handle_event(end_object, Handler, Config), Stack, Config);
-maybe_done(<<?end_array, Rest/binary>>, Handler, [array|Stack], Config) ->
-    maybe_done(Rest, handle_event(end_array, Handler, Config), Stack, Config);
-maybe_done(<<?comma, Rest/binary>>, Handler, [object|Stack], Config) ->
-    key(Rest, Handler, [key|Stack], Config);
-maybe_done(<<?comma, Rest/binary>>, Handler, [array|_] = Stack, Config) ->
-    value(Rest, Handler, Stack, Config);
-maybe_done(<<S, Rest/binary>>, Handler, Stack, Config) when ?is_whitespace(S) ->
-    maybe_done(Rest, Handler, Stack, Config);
-maybe_done(_Bin, _Handler, _Stack, _Config) ->
-    erlang:error(badarg).
-
-
-done(<<S, Rest/binary>>, Handler, [], Config) when ?is_whitespace(S) ->
-    done(Rest, Handler, [], Config);
-done(<<>>, {_Handler, State}, [], _Config) -> State;
-done(_Bin, _Handler, _Stack, _Config) -> erlang:error(badarg).
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_json_protocol.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_json_protocol.erl
deleted file mode 100644
index c5f3da8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_json_protocol.erl
+++ /dev/null
@@ -1,567 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-%% The JSON protocol implementation was created by
-%% Peter Neumark <neumark.peter@gmail.com> based on
-%% the binary protocol implementation.
-
--module(thrift_json_protocol).
-
--behaviour(thrift_protocol).
-
--include("thrift_constants.hrl").
--include("thrift_protocol.hrl").
-
--export([new/1, new/2,
-         read/2,
-         write/2,
-         flush_transport/1,
-         close_transport/1,
-         new_protocol_factory/2
-        ]).
-
--record(json_context, {
-    % the type of json_context: array or object
-    type,
-    % fields read or written
-    fields_processed = 0
-}).
-
--record(json_protocol, {
-    transport,
-    context_stack = [],
-    jsx
-}).
--type state() :: #json_protocol{}.
--include("thrift_protocol_behaviour.hrl").
-
--define(VERSION_1, 1).
--define(JSON_DOUBLE_PRECISION, 16).
-
-typeid_to_json(?tType_BOOL) -> "tf";
-typeid_to_json(?tType_BYTE) -> "i8";
-typeid_to_json(?tType_DOUBLE) -> "dbl";
-typeid_to_json(?tType_I8) -> "i8";
-typeid_to_json(?tType_I16) -> "i16";
-typeid_to_json(?tType_I32) -> "i32";
-typeid_to_json(?tType_I64) -> "i64";
-typeid_to_json(?tType_STRING) -> "str";
-typeid_to_json(?tType_STRUCT) -> "rec";
-typeid_to_json(?tType_MAP) -> "map";
-typeid_to_json(?tType_SET) -> "set";
-typeid_to_json(?tType_LIST) -> "lst".
-
-json_to_typeid("tf") -> ?tType_BOOL;
-json_to_typeid("dbl") -> ?tType_DOUBLE;
-json_to_typeid("i8") -> ?tType_I8;
-json_to_typeid("i16") -> ?tType_I16;
-json_to_typeid("i32") -> ?tType_I32;
-json_to_typeid("i64") -> ?tType_I64;
-json_to_typeid("str") -> ?tType_STRING;
-json_to_typeid("rec") -> ?tType_STRUCT;
-json_to_typeid("map") -> ?tType_MAP;
-json_to_typeid("set") -> ?tType_SET;
-json_to_typeid("lst") -> ?tType_LIST.
-
-start_context(object) -> "{";
-start_context(array) -> "[".
-
-end_context(object) -> "}";
-end_context(array) -> "]".
-
-
-new(Transport) ->
-    new(Transport, _Options = []).
-
-new(Transport, _Options) ->
-    State  = #json_protocol{transport = Transport},
-    thrift_protocol:new(?MODULE, State).
-
-flush_transport(This = #json_protocol{transport = Transport}) ->
-    {NewTransport, Result} = thrift_transport:flush(Transport),
-    {This#json_protocol{
-            transport = NewTransport,
-            context_stack = []
-        }, Result}.
-
-close_transport(This = #json_protocol{transport = Transport}) ->
-    {NewTransport, Result} = thrift_transport:close(Transport),
-    {This#json_protocol{
-            transport = NewTransport,
-            context_stack = [],
-            jsx = undefined
-        }, Result}.
-
-%%%
-%%% instance methods
-%%%
-% places a new context on the stack:
-write(#json_protocol{context_stack = Stack} = State0, {enter_context, Type}) ->
-    {State1, ok} = write_values(State0, [{context_pre_item, false}]),
-    State2 = State1#json_protocol{context_stack = [
-        #json_context{type=Type}|Stack]},
-    write_values(State2,  [list_to_binary(start_context(Type))]);
-
-% removes the topmost context from stack    
-write(#json_protocol{context_stack = [CurrCtxt|Stack]} = State0, {exit_context}) ->
-    Type = CurrCtxt#json_context.type,
-    State1 = State0#json_protocol{context_stack = Stack},
-    write_values(State1, [
-            list_to_binary(end_context(Type)),
-            {context_post_item, false}
-        ]);
-
-% writes necessary prelude to field or container depending on current context   
-write(#json_protocol{context_stack = []} = This0,
-    {context_pre_item, _}) -> {This0, ok};
-write(#json_protocol{context_stack = [Context|_CtxtTail]} = This0,
-    {context_pre_item, MayNeedQuotes}) ->
-    FieldNo = Context#json_context.fields_processed,
-    CtxtType = Context#json_context.type,
-    Rem = FieldNo rem 2,
-    case {CtxtType, FieldNo, Rem, MayNeedQuotes} of
-        {array, N, _, _} when N > 0 ->  % array element (not first)
-            write(This0, <<",">>);
-        {object, 0, _, true} -> % non-string object key (first)
-            write(This0, <<"\"">>);
-        {object, N, 0, true} when N > 0 -> % non-string object key (not first)
-            write(This0, <<",\"">>);
-        {object, N, 0, false} when N > 0-> % string object key (not first)
-            write(This0, <<",">>);
-        _ -> % no pre-field necessary
-            {This0, ok}
-    end;
-
-% writes necessary postlude to field or container depending on current context   
-write(#json_protocol{context_stack = []} = This0,
-    {context_post_item, _}) -> {This0, ok};
-write(#json_protocol{context_stack = [Context|CtxtTail]} = This0,
-    {context_post_item, MayNeedQuotes}) ->
-    FieldNo = Context#json_context.fields_processed,
-    CtxtType = Context#json_context.type,
-    Rem = FieldNo rem 2,
-    {This1, ok} = case {CtxtType, Rem, MayNeedQuotes} of
-        {object, 0, true} -> % non-string object key 
-            write(This0, <<"\":">>);
-        {object, 0, false} -> % string object key 
-            write(This0, <<":">>);
-        _ -> % no pre-field necessary
-            {This0, ok}
-    end,
-    NewContext = Context#json_context{fields_processed = FieldNo + 1},
-    {This1#json_protocol{context_stack=[NewContext|CtxtTail]}, ok};
-
-write(This0, #protocol_message_begin{
-    name = Name,
-    type = Type,
-    seqid = Seqid}) ->
-    write_values(This0, [
-        {enter_context, array},
-        {i32, ?VERSION_1},
-        {string, Name},
-        {i32, Type},
-        {i32, Seqid}
-    ]);
-
-write(This, message_end) ->  
-    write_values(This, [{exit_context}]);
-
-% Example field expression: "1":{"dbl":3.14}
-write(This0, #protocol_field_begin{
-       name = _Name,
-       type = Type,
-       id = Id}) ->
-    write_values(This0, [
-        % entering 'outer' object
-        {i16, Id},
-        % entering 'outer' object
-        {enter_context, object},
-        {string, typeid_to_json(Type)}
-    ]);
-
-write(This, field_stop) -> 
-    {This, ok};
-
-write(This, field_end) -> 
-    write_values(This,[{exit_context}]);
-
-% Example message with map: [1,"testMap",1,0,{"1":{"map":["i32","i32",3,{"7":77,"8":88,"9":99}]}}]
-write(This0, #protocol_map_begin{
-       ktype = Ktype,
-       vtype = Vtype,
-       size = Size}) ->
-    write_values(This0, [
-        {enter_context, array},
-        {string, typeid_to_json(Ktype)},
-        {string, typeid_to_json(Vtype)},
-        {i32, Size},
-        {enter_context, object}
-    ]);
-
-write(This, map_end) -> 
-    write_values(This,[
-        {exit_context},
-        {exit_context}
-    ]);
-
-write(This0, #protocol_list_begin{
-        etype = Etype,
-        size = Size}) ->
-    write_values(This0, [
-        {enter_context, array},
-        {string, typeid_to_json(Etype)},
-        {i32, Size}
-    ]);
-
-write(This, list_end) -> 
-    write_values(This,[
-        {exit_context}
-    ]);
-
-% example message with set: [1,"testSet",1,0,{"1":{"set":["i32",3,1,2,3]}}]
-write(This0, #protocol_set_begin{
-        etype = Etype,
-        size = Size}) ->
-    write_values(This0, [
-        {enter_context, array},
-        {string, typeid_to_json(Etype)},
-        {i32, Size}
-    ]);
-
-write(This, set_end) -> 
-    write_values(This,[
-        {exit_context}
-    ]);
-% example message with struct: [1,"testStruct",1,0,{"1":{"rec":{"1":{"str":"worked"},"4":{"i8":1},"9":{"i32":1073741824},"11":{"i64":1152921504606847000}}}}]
-write(This, #protocol_struct_begin{}) -> 
-    write_values(This, [
-        {enter_context, object}
-    ]);
-
-write(This, struct_end) -> 
-    write_values(This,[
-        {exit_context}
-    ]);
-
-write(This, {bool, true})  -> write_values(This, [
-        {context_pre_item, true},
-        <<"true">>,
-        {context_post_item, true}
-    ]);
-
-write(This, {bool, false}) -> write_values(This, [
-        {context_pre_item, true},
-        <<"false">>,
-        {context_post_item, true}
-    ]);
-
-write(This, {byte, Byte}) -> write_values(This, [
-        {context_pre_item, true},
-        list_to_binary(integer_to_list(Byte)),
-        {context_post_item, true}
-    ]);
-
-write(This, {i16, I16}) ->
-    write(This, {byte, I16});
-
-write(This, {i32, I32}) ->
-    write(This, {byte, I32});
-
-write(This, {i64, I64}) ->
-    write(This, {byte, I64});
-
-write(This, {double, Double}) -> write_values(This, [
-        {context_pre_item, true},
-        list_to_binary(io_lib:format("~.*f", [?JSON_DOUBLE_PRECISION,Double])),
-        {context_post_item, true}
-    ]);
-
-write(This0, {string, Str}) -> write_values(This0, [
-        {context_pre_item, false},
-        case is_binary(Str) of
-            true -> Str;
-            false -> <<"\"", (list_to_binary(Str))/binary, "\"">>
-        end,
-        {context_post_item, false}
-    ]);
-
-%% TODO: binary fields should be base64 encoded?
-
-%% Data :: iolist()
-write(This = #json_protocol{transport = Trans}, Data) ->
-    %io:format("Data ~p Ctxt ~p~n~n", [Data, This#json_protocol.context_stack]),
-    {NewTransport, Result} = thrift_transport:write(Trans, Data),
-    {This#json_protocol{transport = NewTransport}, Result}.
-
-write_values(This0, ValueList) ->
-    FinalState = lists:foldl(
-        fun(Val, ThisIn) ->
-            {ThisOut, ok} = write(ThisIn, Val),
-            ThisOut
-        end,
-        This0,
-        ValueList),
-    {FinalState, ok}.
-
-%% I wish the erlang version of the transport interface included a 
-%% read_all function (like eg. the java implementation). Since it doesn't,
-%% here's my version (even though it probably shouldn't be in this file).
-%%
-%% The resulting binary is immediately send to the JSX stream parser.
-%% Subsequent calls to read actually operate on the events returned by JSX.
-read_all(#json_protocol{transport = Transport0} = State) ->
-    {Transport1, Bin} = read_all_1(Transport0, []),
-    P = thrift_json_parser:parser(),
-    [First|Rest] = P(Bin),
-    State#json_protocol{
-        transport = Transport1,
-        jsx = {event, First, Rest}
-    }.
-
-read_all_1(Transport0, IoList) ->
-    {Transport1, Result} = thrift_transport:read(Transport0, 1),
-    case Result of
-        {ok, <<>>} -> % nothing read: assume we're done
-            {Transport1, iolist_to_binary(lists:reverse(IoList))};
-        {ok, Data} -> % character successfully read; read more
-            read_all_1(Transport1, [Data|IoList]);
-        {error, 'EOF'} -> % we're done
-            {Transport1, iolist_to_binary(lists:reverse(IoList))}
-    end.
-
-% Expect reads an event from the JSX event stream. It receives an event or data
-% type as input. Comparing the read event from the one is was passed, it
-% returns an error if something other than the expected value is encountered.
-% Expect also maintains the context stack in #json_protocol.
-expect(#json_protocol{jsx={event, {Type, Data}=Ev, [Next|Rest]}}=State, ExpectedType) ->
-    NextState = State#json_protocol{jsx={event, Next, Rest}},
-    case Type == ExpectedType of
-        true -> 
-            {NextState, {ok, convert_data(Type, Data)}};
-        false ->
-            {NextState, {error, {unexpected_json_event, Ev}}}
-    end;
-
-expect(#json_protocol{jsx={event, Event, Next}}=State, ExpectedEvent) ->
-     expect(State#json_protocol{jsx={event, {Event, none}, Next}}, ExpectedEvent).
-
-convert_data(integer, I) -> list_to_integer(I);
-convert_data(float, F) -> list_to_float(F);
-convert_data(_, D) -> D.
-
-expect_many(State, ExpectedList) ->
-    expect_many_1(State, ExpectedList, [], ok).
-
-expect_many_1(State, [], ResultList, Status) ->
-    {State, {Status, lists:reverse(ResultList)}};
-expect_many_1(State, [Expected|ExpTail], ResultList, _PrevStatus) ->
-    {State1, {Status, Data}} = expect(State, Expected),
-    NewResultList = [Data|ResultList],
-    case Status of
-        % in case of error, end prematurely
-        error -> expect_many_1(State1, [], NewResultList, Status);
-        ok -> expect_many_1(State1, ExpTail, NewResultList, Status)
-    end.
-
-% wrapper around expect to make life easier for container opening/closing functions
-expect_nodata(This, ExpectedList) ->
-    case expect_many(This, ExpectedList) of
-        {State, {ok, _}} -> 
-            {State, ok};
-        Error -> 
-            Error
-    end.
-
-read_field(#json_protocol{jsx={event, Field, [Next|Rest]}} = State) ->
-    NewState = State#json_protocol{jsx={event, Next, Rest}},
-    {NewState, Field}.
-
-read(This0, message_begin) ->
-    % call read_all to get the contents of the transport buffer into JSX.
-    This1 = read_all(This0),
-    case expect_many(This1, 
-            [start_array, integer, string, integer, integer]) of
-        {This2, {ok, [_, Version, Name, Type, SeqId]}} ->
-            case Version =:= ?VERSION_1 of
-                true ->
-                    {This2, #protocol_message_begin{name  = Name,
-                                                    type  = Type,
-                                                    seqid = SeqId}};
-                false ->
-                    {This2, {error, no_json_protocol_version}}
-            end;
-        Other -> Other
-    end;
-
-read(This, message_end) -> 
-    expect_nodata(This, [end_array]);
-
-read(This, struct_begin) -> 
-    expect_nodata(This, [start_object]);
-
-read(This, struct_end) -> 
-    expect_nodata(This, [end_object]);
-
-read(This0, field_begin) ->
-    {This1, Read} = expect_many(This0, 
-            [%field id
-             key, 
-             % {} surrounding field
-             start_object, 
-             % type of field
-             key]),
-    case Read of
-        {ok, [FieldIdStr, _, FieldType]} ->
-            {This1, #protocol_field_begin{
-                type = json_to_typeid(FieldType), 
-                id = list_to_integer(FieldIdStr)}}; % TODO: do we need to wrap this in a try/catch?
-        {error,[{unexpected_json_event, {end_object,none}}]} ->
-            {This1, #protocol_field_begin{type = ?tType_STOP}};
-        Other -> 
-            io:format("**** OTHER branch selected ****"),
-            {This1, Other}
-    end;
-
-read(This, field_end) -> 
-    expect_nodata(This, [end_object]);
-
-% Example message with map: [1,"testMap",1,0,{"1":{"map":["i32","i32",3,{"7":77,"8":88,"9":99}]}}]
-read(This0, map_begin) ->
-    case expect_many(This0, 
-            [start_array,
-             % key type
-             string, 
-             % value type
-             string, 
-             % size
-             integer,
-             % the following object contains the map
-             start_object]) of
-        {This1, {ok, [_, Ktype, Vtype, Size, _]}} ->
-            {This1, #protocol_map_begin{ktype = Ktype,
-                                vtype = Vtype,
-                                size = Size}};
-        Other -> Other
-    end;
-
-read(This, map_end) -> 
-    expect_nodata(This, [end_object, end_array]);
-
-read(This0, list_begin) ->
-    case expect_many(This0, 
-            [start_array,
-             % element type
-             string, 
-             % size
-             integer]) of
-        {This1, {ok, [_, Etype, Size]}} ->
-            {This1, #protocol_list_begin{
-                etype = Etype,
-                size = Size}};
-        Other -> Other
-    end;
-
-read(This, list_end) -> 
-    expect_nodata(This, [end_array]);
-
-% example message with set: [1,"testSet",1,0,{"1":{"set":["i32",3,1,2,3]}}]
-read(This0, set_begin) ->
-    case expect_many(This0, 
-            [start_array,
-             % element type
-             string, 
-             % size
-             integer]) of
-        {This1, {ok, [_, Etype, Size]}} ->
-            {This1, #protocol_set_begin{
-                etype = Etype,
-                size = Size}};
-        Other -> Other
-    end;
-
-read(This, set_end) -> 
-    expect_nodata(This, [end_array]);
-
-read(This0, field_stop) ->
-    {This0, ok};
-%%
-
-read(This0, bool) ->
-    {This1, Field} = read_field(This0),
-    Value = case Field of
-        {literal, I} -> 
-            {ok, I}; 
-        _Other ->
-            {error, unexpected_event_for_boolean}
-    end,
-    {This1, Value};
-
-read(This0, byte) ->
-    {This1, Field} = read_field(This0),
-    Value = case Field of
-        {key, K} ->
-            {ok, list_to_integer(K)};
-        {integer, I} -> 
-            {ok, list_to_integer(I)}; 
-        _Other ->
-            {error, unexpected_event_for_integer}
-    end,
-    {This1, Value};
-
-read(This0, i16) ->
-    read(This0, byte);
-
-read(This0, i32) ->
-    read(This0, byte);
-
-read(This0, i64) ->
-    read(This0, byte);
-
-read(This0, double) ->
-    {This1, Field} = read_field(This0),
-    Value = case Field of
-        {float, I} -> 
-            {ok, list_to_float(I)}; 
-        _Other ->
-            {error, unexpected_event_for_double}
-    end,
-    {This1, Value};
-
-% returns a binary directly, call binary_to_list if necessary
-read(This0, string) ->
-    {This1, Field} = read_field(This0),
-    Value = case Field of
-        {string, I} -> 
-            {ok, I}; 
-        {key, J} -> 
-            {ok, J}; 
-        _Other ->
-            {error, unexpected_event_for_string}
-    end,
-    {This1, Value}.
-
-%%%% FACTORY GENERATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% returns a (fun() -> thrift_protocol())
-new_protocol_factory(TransportFactory, _Options) ->
-    % Only strice read/write are implemented
-    F = fun() ->
-                {ok, Transport} = TransportFactory(),
-                thrift_json_protocol:new(Transport, [])
-        end,
-    {ok, F}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_membuffer_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_membuffer_transport.erl
deleted file mode 100644
index be9acb2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_membuffer_transport.erl
+++ /dev/null
@@ -1,83 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_membuffer_transport).
-
--behaviour(thrift_transport).
-
-%% constructors
--export([new/0, new/1]).
-%% protocol callbacks
--export([read/2, read_exact/2, write/2, flush/1, close/1]).
-
-
--record(t_membuffer, {
-  buffer = []
-}).
-
--type state() :: #t_membuffer{}.
-
-
--spec new() -> thrift_transport:t_transport().
-
-new() -> new([]).
-
--spec new(Buf::iodata()) -> thrift_transport:t_transport().
-
-new(Buf) when is_list(Buf) ->
-  State = #t_membuffer{buffer = Buf},
-  thrift_transport:new(?MODULE, State);
-new(Buf) when is_binary(Buf) ->
-  State = #t_membuffer{buffer = [Buf]},
-  thrift_transport:new(?MODULE, State).
-
-
--include("thrift_transport_behaviour.hrl").
-
-
-read(State = #t_membuffer{buffer = Buf}, Len)
-when is_integer(Len), Len >= 0 ->
-  Binary = iolist_to_binary(Buf),
-  Give = min(iolist_size(Binary), Len),
-  {Result, Remaining} = split_binary(Binary, Give),
-  {State#t_membuffer{buffer = Remaining}, {ok, Result}}.
-
-
-read_exact(State = #t_membuffer{buffer = Buf}, Len)
-when is_integer(Len), Len >= 0 ->
-  Binary = iolist_to_binary(Buf),
-  case iolist_size(Binary) of
-    X when X >= Len ->
-      {Result, Remaining} = split_binary(Binary, Len),
-      {State#t_membuffer{buffer = Remaining}, {ok, Result}};
-    _ ->
-      {State, {error, eof}}
-  end.
-
-
-write(State = #t_membuffer{buffer = Buf}, Data)
-when is_list(Data); is_binary(Data) ->
-  {State#t_membuffer{buffer = [Buf, Data]}, ok}.
-
-
-flush(State) -> {State, ok}.
-
-
-close(State) -> {State, ok}.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_memory_buffer.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_memory_buffer.erl
deleted file mode 100644
index 6a59ea5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_memory_buffer.erl
+++ /dev/null
@@ -1,47 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_memory_buffer).
-
--behaviour(thrift_transport).
-
-%% constructors
--export([new/0, new/1]).
-%% protocol callbacks
--export([read/2, write/2, flush/1, close/1]).
-%% legacy api
--export([new_transport_factory/0]).
-
-
-%% wrapper around thrift_membuffer_transport for legacy reasons
-
-new() -> thrift_membuffer_transport:new().
-
-new(State) -> thrift_membuffer_transport:new(State).
-
-new_transport_factory() -> {ok, fun() -> new() end}.
-
-write(State, Data) -> thrift_membuffer_transport:write(State, Data).
-
-read(State, Data) -> thrift_membuffer_transport:read(State, Data).
-
-flush(State) -> thrift_membuffer_transport:flush(State).
-
-close(State) -> thrift_membuffer_transport:close(State).
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_multiplexed_map_wrapper.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_multiplexed_map_wrapper.erl
deleted file mode 100644
index 34c5e95..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_multiplexed_map_wrapper.erl
+++ /dev/null
@@ -1,57 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_multiplexed_map_wrapper).
-
--export([
-          new/0
-         ,store/3
-         ,find/2
-         ,fetch/2
-        ]).
-
--type service_handler()     :: nonempty_string().
--type module_()             :: atom().
--type service_handler_map() :: [{ServiceHandler::service_handler(), Module::module_()}].
-
--spec new() -> service_handler_map().
-new() ->
-    orddict:new().
-
--spec store(ServiceHandler, Module, Map) -> NewMap when
-    ServiceHandler :: service_handler(),
-    Module         :: module_(),
-    Map            :: service_handler_map(),
-    NewMap         :: service_handler_map().
-store(ServiceHandler, Module, Map) ->
-    orddict:store(ServiceHandler, Module, Map).
-
--spec find(ServiceHandler, Map) -> {ok, Module} | error when
-    ServiceHandler :: service_handler(),
-    Module         :: module_(),
-    Map            :: service_handler_map().
-find(ServiceHandler, Map) ->
-    orddict:find(ServiceHandler, Map).
-
--spec fetch(ServiceHandler, Map) -> Module when
-    ServiceHandler :: service_handler(),
-    Module         :: module_(),
-    Map            :: service_handler_map().
-fetch(ServiceHandler, Map) ->
-    orddict:fetch(ServiceHandler, Map).
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_multiplexed_protocol.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_multiplexed_protocol.erl
deleted file mode 100644
index 5f7b70c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_multiplexed_protocol.erl
+++ /dev/null
@@ -1,83 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_multiplexed_protocol).
-
--behaviour(thrift_protocol).
-
--include("thrift_constants.hrl").
--include("thrift_protocol.hrl").
-
--include("thrift_protocol_behaviour.hrl").
-
--export([new/2,
-         read/2,
-         write/2,
-         flush_transport/1,
-         close_transport/1
-        ]).
-
--record(protocol, {module, data}).
--type protocol() :: #protocol{}.
-
--record (multiplexed_protocol, {protocol_module_to_decorate::atom(),
-								protocol_data_to_decorate::term(),
-								service_name::nonempty_string()}).
-
--type state() :: #multiplexed_protocol{}.
-
--spec new(ProtocolToDecorate::protocol(), ServiceName::nonempty_string()) -> {ok, Protocol::protocol()}.
-new(ProtocolToDecorate, ServiceName) when is_record(ProtocolToDecorate, protocol),
-                                          is_list(ServiceName) ->
-    State = #multiplexed_protocol{protocol_module_to_decorate = ProtocolToDecorate#protocol.module,
-                                    protocol_data_to_decorate = ProtocolToDecorate#protocol.data,
-                                                 service_name = ServiceName},
-    thrift_protocol:new(?MODULE, State).
-
-flush_transport(State = #multiplexed_protocol{protocol_module_to_decorate = ProtocolModuleToDecorate,
-                                                protocol_data_to_decorate = State0}) ->
-    {State1, ok} = ProtocolModuleToDecorate:flush_transport(State0),
-    {State#multiplexed_protocol{protocol_data_to_decorate = State1}, ok}.
-
-close_transport(State = #multiplexed_protocol{protocol_module_to_decorate = ProtocolModuleToDecorate,
-                                                protocol_data_to_decorate = State0}) ->
-    {State1, ok} = ProtocolModuleToDecorate:close_transport(State0),
-    {State#multiplexed_protocol{protocol_data_to_decorate = State1}, ok}.
-
-write(State = #multiplexed_protocol{protocol_module_to_decorate = ProtocolModuleToDecorate,
-                                      protocol_data_to_decorate = State0,
-                                                   service_name = ServiceName},
-      Message = #protocol_message_begin{name = Name}) ->
-    {State1, ok} = ProtocolModuleToDecorate:write(State0,
-                                                  Message#protocol_message_begin{name=ServiceName ++
-                                                                                      ?MULTIPLEXED_SERVICE_SEPARATOR ++
-                                                                                      Name}),
-    {State#multiplexed_protocol{protocol_data_to_decorate = State1}, ok};
-
-write(State = #multiplexed_protocol{protocol_module_to_decorate = ProtocolModuleToDecorate,
-                                      protocol_data_to_decorate = State0},
-      Message) ->
-    {State1, ok} = ProtocolModuleToDecorate:write(State0, Message),
-    {State#multiplexed_protocol{protocol_data_to_decorate = State1}, ok}.
-
-read(State = #multiplexed_protocol{protocol_module_to_decorate = ProtocolModuleToDecorate,
-                                     protocol_data_to_decorate = State0},
-     Message) ->
-    {State1, Result} = ProtocolModuleToDecorate:read(State0, Message),
-    {State#multiplexed_protocol{protocol_data_to_decorate = State1}, Result}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_processor.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_processor.erl
deleted file mode 100644
index 5c9f26f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_processor.erl
+++ /dev/null
@@ -1,219 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_processor).
-
--export([init/1]).
-
--include("thrift_constants.hrl").
--include("thrift_protocol.hrl").
-
--record(thrift_processor, {handler, protocol, service}).
-
-init({_Server, ProtoGen, Service, Handler}) when is_function(ProtoGen, 0) ->
-    {ok, Proto} = ProtoGen(),
-    loop(#thrift_processor{protocol = Proto,
-                           service = Service,
-                           handler = Handler}).
-
-loop(State0 = #thrift_processor{protocol  = Proto0,
-                                handler = Handler,
-                                service = Service}) ->
-
-    {Proto1, MessageBegin} = thrift_protocol:read(Proto0, message_begin),
-    State1 = State0#thrift_processor{protocol = Proto1},
-
-    ErrorHandler = fun
-        (HandlerModules) when is_list(HandlerModules) -> thrift_multiplexed_map_wrapper:fetch(?MULTIPLEXED_ERROR_HANDLER_KEY, HandlerModules);
-        (HandlerModule) -> HandlerModule
-    end,
-
-    case MessageBegin of
-
-        #protocol_message_begin{name = Function,
-                                type = Type,
-                                seqid = Seqid} when Type =:= ?tMessageType_CALL; Type =:= ?tMessageType_ONEWAY ->
-            case string:tokens(Function, ?MULTIPLEXED_SERVICE_SEPARATOR) of
-                [ServiceName, FunctionName] ->
-                    ServiceModule  = thrift_multiplexed_map_wrapper:fetch(ServiceName, Service),
-                    ServiceHandler = thrift_multiplexed_map_wrapper:fetch(ServiceName, Handler),
-                    case handle_function(State1#thrift_processor{service=ServiceModule, handler=ServiceHandler}, list_to_atom(FunctionName), Seqid) of
-                        {State2, ok} -> loop(State2#thrift_processor{service=Service, handler=Handler});
-                        {_State2, {error, Reason}} ->
-							apply(ErrorHandler(Handler), handle_error, [list_to_atom(Function), Reason]),
-                            thrift_protocol:close_transport(Proto1),
-                            ok
-                    end;
-                _ ->
-                    case handle_function(State1, list_to_atom(Function), Seqid) of
-                        {State2, ok} -> loop(State2);
-                        {_State2, {error, Reason}} ->
-							apply(ErrorHandler(Handler), handle_error, [list_to_atom(Function), Reason]),
-                            thrift_protocol:close_transport(Proto1),
-                            ok
-                    end
-            end;
-        {error, timeout = Reason} ->
-			apply(ErrorHandler(Handler), handle_error, [undefined, Reason]),
-            thrift_protocol:close_transport(Proto1),
-            ok;
-        {error, closed = Reason} ->
-            %% error_logger:info_msg("Client disconnected~n"),
-			apply(ErrorHandler(Handler), handle_error, [undefined, Reason]),
-            thrift_protocol:close_transport(Proto1),
-            exit(shutdown);
-        {error, Reason} ->
-			apply(ErrorHandler(Handler), handle_error, [undefined, Reason]),
-            thrift_protocol:close_transport(Proto1),
-            exit(shutdown)
-    end.
-
-handle_function(State0=#thrift_processor{protocol = Proto0,
-                                         handler = Handler,
-                                         service = Service},
-                Function,
-                Seqid) ->
-    InParams = Service:function_info(Function, params_type),
-
-    {Proto1, {ok, Params}} = thrift_protocol:read(Proto0, InParams),
-    State1 = State0#thrift_processor{protocol = Proto1},
-
-    try
-        Result = Handler:handle_function(Function, Params),
-        %% {Micro, Result} = better_timer(Handler, handle_function, [Function, Params]),
-        %% error_logger:info_msg("Processed ~p(~p) in ~.4fms~n",
-        %%                       [Function, Params, Micro/1000.0]),
-        handle_success(State1, Function, Result, Seqid)
-    catch
-        Type:Data when Type =:= throw orelse Type =:= error ->
-            handle_function_catch(State1, Function, Type, Data, Seqid)
-    end.
-
-handle_function_catch(State = #thrift_processor{service = Service},
-                      Function, ErrType, ErrData, Seqid) ->
-    IsOneway = Service:function_info(Function, reply_type) =:= oneway_void,
-
-    case {ErrType, ErrData} of
-        _ when IsOneway ->
-            Stack = erlang:get_stacktrace(),
-            error_logger:warning_msg(
-              "oneway void ~p threw error which must be ignored: ~p",
-              [Function, {ErrType, ErrData, Stack}]),
-            {State, ok};
-
-        {throw, Exception} when is_tuple(Exception), size(Exception) > 0 ->
-            %error_logger:warning_msg("~p threw exception: ~p~n", [Function, Exception]),
-            handle_exception(State, Function, Exception, Seqid);
-            % we still want to accept more requests from this client
-
-        {error, Error} ->
-            handle_error(State, Function, Error, Seqid)
-    end.
-
-handle_success(State = #thrift_processor{service = Service},
-               Function,
-               Result,
-               Seqid) ->
-    ReplyType  = Service:function_info(Function, reply_type),
-    StructName = atom_to_list(Function) ++ "_result",
-
-    case Result of
-        {reply, ReplyData} ->
-            Reply = {{struct, [{0, ReplyType}]}, {StructName, ReplyData}},
-            send_reply(State, Function, ?tMessageType_REPLY, Reply, Seqid);
-
-        ok when ReplyType == {struct, []} ->
-            send_reply(State, Function, ?tMessageType_REPLY, {ReplyType, {StructName}}, Seqid);
-
-        ok when ReplyType == oneway_void ->
-            %% no reply for oneway void
-            {State, ok}
-    end.
-
-handle_exception(State = #thrift_processor{service = Service},
-                 Function,
-                 Exception,
-                 Seqid) ->
-    ExceptionType = element(1, Exception),
-    %% Fetch a structure like {struct, [{-2, {struct, {Module, Type}}},
-    %%                                  {-3, {struct, {Module, Type}}}]}
-
-    ReplySpec = Service:function_info(Function, exceptions),
-    {struct, XInfo} = ReplySpec,
-
-    true = is_list(XInfo),
-
-    %% Assuming we had a type1 exception, we'd get: [undefined, Exception, undefined]
-    %% e.g.: [{-1, type0}, {-2, type1}, {-3, type2}]
-    ExceptionList = [case Type of
-                         ExceptionType -> Exception;
-                         _ -> undefined
-                     end
-                     || {_Fid, {struct, {_Module, Type}}} <- XInfo],
-
-    ExceptionTuple = list_to_tuple([Function | ExceptionList]),
-
-                                                % Make sure we got at least one defined
-    case lists:all(fun(X) -> X =:= undefined end, ExceptionList) of
-        true ->
-            handle_unknown_exception(State, Function, Exception, Seqid);
-        false ->
-            send_reply(State, Function, ?tMessageType_REPLY, {ReplySpec, ExceptionTuple}, Seqid)
-    end.
-
-%%
-%% Called when an exception has been explicitly thrown by the service, but it was
-%% not one of the exceptions that was defined for the function.
-%%
-handle_unknown_exception(State, Function, Exception, Seqid) ->
-    handle_error(State, Function, {exception_not_declared_as_thrown,
-                                   Exception}, Seqid).
-
-handle_error(State, Function, Error, Seqid) ->
-    Stack = erlang:get_stacktrace(),
-    error_logger:error_msg("~p had an error: ~p~n", [Function, {Error, Stack}]),
-
-    Message =
-        case application:get_env(thrift, exceptions_include_traces) of
-            {ok, true} ->
-                lists:flatten(io_lib:format("An error occurred: ~p~n",
-                                            [{Error, Stack}]));
-            _ ->
-                "An unknown handler error occurred."
-        end,
-    Reply = {?TApplicationException_Structure,
-             #'TApplicationException'{
-                message = Message,
-                type = ?TApplicationException_UNKNOWN}},
-    send_reply(State, Function, ?tMessageType_EXCEPTION, Reply, Seqid).
-
-send_reply(State = #thrift_processor{protocol = Proto0}, Function, ReplyMessageType, Reply, Seqid) ->
-    try
-        {Proto1, ok} = thrift_protocol:write(Proto0, #protocol_message_begin{
-                                               name = atom_to_list(Function),
-                                               type = ReplyMessageType,
-                                               seqid = Seqid}),
-        {Proto2, ok} = thrift_protocol:write(Proto1, Reply),
-        {Proto3, ok} = thrift_protocol:write(Proto2, message_end),
-        {Proto4, ok} = thrift_protocol:flush_transport(Proto3),
-        {State#thrift_processor{protocol = Proto4}, ok}
-    catch
-        error:{badmatch, {_, {error, _} = Error}} ->
-            {State, Error}
-    end.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_protocol.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_protocol.erl
deleted file mode 100644
index dc3bfef..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_protocol.erl
+++ /dev/null
@@ -1,413 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_protocol).
-
--export([new/2,
-         write/2,
-         read/2,
-         read/3,
-         skip/2,
-         flush_transport/1,
-         close_transport/1,
-         typeid_to_atom/1
-        ]).
-
--export([behaviour_info/1]).
-
--include("thrift_constants.hrl").
--include("thrift_protocol.hrl").
-
--record(protocol, {module, data}).
-
-behaviour_info(callbacks) ->
-    [
-     {read, 2},
-     {write, 2},
-     {flush_transport, 1},
-     {close_transport, 1}
-    ];
-behaviour_info(_Else) -> undefined.
-
-new(Module, Data) when is_atom(Module) ->
-    {ok, #protocol{module = Module,
-                   data = Data}}.
-
--spec flush_transport(#protocol{}) -> {#protocol{}, ok}.
-flush_transport(Proto = #protocol{module = Module,
-                                  data = Data}) ->
-    {NewData, Result} = Module:flush_transport(Data),
-    {Proto#protocol{data = NewData}, Result}.
-
--spec close_transport(#protocol{}) -> ok.
-close_transport(#protocol{module = Module,
-                          data = Data}) ->
-    Module:close_transport(Data).
-
-typeid_to_atom(?tType_STOP) -> field_stop;
-typeid_to_atom(?tType_VOID) -> void;
-typeid_to_atom(?tType_BOOL) -> bool;
-typeid_to_atom(?tType_DOUBLE) -> double;
-typeid_to_atom(?tType_I8) -> byte;
-typeid_to_atom(?tType_I16) -> i16;
-typeid_to_atom(?tType_I32) -> i32;
-typeid_to_atom(?tType_I64) -> i64;
-typeid_to_atom(?tType_STRING) -> string;
-typeid_to_atom(?tType_STRUCT) -> struct;
-typeid_to_atom(?tType_MAP) -> map;
-typeid_to_atom(?tType_SET) -> set;
-typeid_to_atom(?tType_LIST) -> list.
-
-term_to_typeid(void) -> ?tType_VOID;
-term_to_typeid(bool) -> ?tType_BOOL;
-term_to_typeid(byte) -> ?tType_I8;
-term_to_typeid(double) -> ?tType_DOUBLE;
-term_to_typeid(i8) -> ?tType_I8;
-term_to_typeid(i16) -> ?tType_I16;
-term_to_typeid(i32) -> ?tType_I32;
-term_to_typeid(i64) -> ?tType_I64;
-term_to_typeid(string) -> ?tType_STRING;
-term_to_typeid({struct, _}) -> ?tType_STRUCT;
-term_to_typeid({map, _, _}) -> ?tType_MAP;
-term_to_typeid({set, _}) -> ?tType_SET;
-term_to_typeid({list, _}) -> ?tType_LIST.
-
-%% Structure is like:
-%%    [{Fid, Type}, ...]
--spec read(#protocol{}, {struct, _StructDef}, atom()) -> {#protocol{}, {ok, tuple()}}.
-read(IProto0, {struct, Structure}, Tag)
-  when is_list(Structure), is_atom(Tag) ->
-
-    % If we want a tagged tuple, we need to offset all the tuple indices
-    % by 1 to avoid overwriting the tag.
-    Offset = if Tag =/= undefined -> 1; true -> 0 end,
-    IndexList = case length(Structure) of
-                    N when N > 0 -> lists:seq(1 + Offset, N + Offset);
-                    _ -> []
-                end,
-
-    SWithIndices = [{Fid, {Type, Index}} ||
-                       {{Fid, Type}, Index} <-
-                           lists:zip(Structure, IndexList)],
-    % Fid -> {Type, Index}
-    SDict = dict:from_list(SWithIndices),
-
-    {IProto1, ok} = read(IProto0, struct_begin),
-    RTuple0 = erlang:make_tuple(length(Structure) + Offset, undefined),
-    RTuple1 = if Tag =/= undefined -> setelement(1, RTuple0, Tag);
-                 true              -> RTuple0
-              end,
-
-    {IProto2, RTuple2} = read_struct_loop(IProto1, SDict, RTuple1),
-    {IProto2, {ok, RTuple2}}.
-
-
-%% NOTE: Keep this in sync with thrift_protocol_behaviour:read
--spec read
-        (#protocol{}, {struct, _Info}) ->    {#protocol{}, {ok, tuple()}      | {error, _Reason}};
-        (#protocol{}, tprot_cont_tag()) ->   {#protocol{}, {ok, any()}        | {error, _Reason}};
-        (#protocol{}, tprot_empty_tag()) ->  {#protocol{},  ok                | {error, _Reason}};
-        (#protocol{}, tprot_header_tag()) -> {#protocol{}, tprot_header_val() | {error, _Reason}};
-        (#protocol{}, tprot_data_tag()) ->   {#protocol{}, {ok, any()}        | {error, _Reason}}.
-
-read(IProto, {struct, {Module, StructureName}}) when is_atom(Module),
-                                                     is_atom(StructureName) ->
-    read(IProto, Module:struct_info(StructureName), StructureName);
-
-read(IProto, S={struct, Structure}) when is_list(Structure) ->
-    read(IProto, S, undefined);
-
-read(IProto0, {list, Type}) ->
-    {IProto1, #protocol_list_begin{etype = EType, size = Size}} =
-        read(IProto0, list_begin),
-    {EType, EType} = {term_to_typeid(Type), EType},
-    {List, IProto2} = lists:mapfoldl(fun(_, ProtoS0) ->
-                                             {ProtoS1, {ok, Item}} = read(ProtoS0, Type),
-                                             {Item, ProtoS1}
-                                     end,
-                                     IProto1,
-                                     lists:duplicate(Size, 0)),
-    {IProto3, ok} = read(IProto2, list_end),
-    {IProto3, {ok, List}};
-
-read(IProto0, {map, KeyType, ValType}) ->
-    {IProto1, #protocol_map_begin{size = Size, ktype = KType, vtype = VType}} =
-        read(IProto0, map_begin),
-    _ = case Size of
-      0 -> 0;
-      _ ->
-        {KType, KType} = {term_to_typeid(KeyType), KType},
-        {VType, VType} = {term_to_typeid(ValType), VType}
-    end,
-    {List, IProto2} = lists:mapfoldl(fun(_, ProtoS0) ->
-                                             {ProtoS1, {ok, Key}} = read(ProtoS0, KeyType),
-                                             {ProtoS2, {ok, Val}} = read(ProtoS1, ValType),
-                                             {{Key, Val}, ProtoS2}
-                                     end,
-                                     IProto1,
-                                     lists:duplicate(Size, 0)),
-    {IProto3, ok} = read(IProto2, map_end),
-    {IProto3, {ok, dict:from_list(List)}};
-
-read(IProto0, {set, Type}) ->
-    {IProto1, #protocol_set_begin{etype = EType, size = Size}} =
-        read(IProto0, set_begin),
-    {EType, EType} = {term_to_typeid(Type), EType},
-    {List, IProto2} = lists:mapfoldl(fun(_, ProtoS0) ->
-                                             {ProtoS1, {ok, Item}} = read(ProtoS0, Type),
-                                             {Item, ProtoS1}
-                                     end,
-                                     IProto1,
-                                     lists:duplicate(Size, 0)),
-    {IProto3, ok} = read(IProto2, set_end),
-    {IProto3, {ok, sets:from_list(List)}};
-
-read(Protocol, ProtocolType) ->
-    read_specific(Protocol, ProtocolType).
-
-%% NOTE: Keep this in sync with thrift_protocol_behaviour:read
--spec read_specific
-        (#protocol{}, tprot_empty_tag()) ->  {#protocol{},  ok                | {error, _Reason}};
-        (#protocol{}, tprot_header_tag()) -> {#protocol{}, tprot_header_val() | {error, _Reason}};
-        (#protocol{}, tprot_data_tag()) ->   {#protocol{}, {ok, any()}        | {error, _Reason}}.
-read_specific(Proto = #protocol{module = Module,
-                                data = ModuleData}, ProtocolType) ->
-    {NewData, Result} = Module:read(ModuleData, ProtocolType),
-    {Proto#protocol{data = NewData}, Result}.
-
-read_struct_loop(IProto0, SDict, RTuple) ->
-    {IProto1, #protocol_field_begin{type = FType, id = Fid}} =
-        thrift_protocol:read(IProto0, field_begin),
-    case {FType, Fid} of
-        {?tType_STOP, _} ->
-            {IProto2, ok} = read(IProto1, struct_end),
-            {IProto2, RTuple};
-        _Else ->
-            case dict:find(Fid, SDict) of
-                {ok, {Type, Index}} ->
-                    case term_to_typeid(Type) of
-                        FType ->
-                            {IProto2, {ok, Val}} = read(IProto1, Type),
-                            {IProto3, ok} = thrift_protocol:read(IProto2, field_end),
-                            NewRTuple = setelement(Index, RTuple, Val),
-                            read_struct_loop(IProto3, SDict, NewRTuple);
-                        Expected ->
-                            error_logger:info_msg(
-                              "Skipping field ~p with wrong type (~p != ~p)~n",
-                              [Fid, FType, Expected]),
-                            skip_field(FType, IProto1, SDict, RTuple)
-                    end;
-                _Else2 ->
-                    skip_field(FType, IProto1, SDict, RTuple)
-            end
-    end.
-
-skip_field(FType, IProto0, SDict, RTuple) ->
-    FTypeAtom = thrift_protocol:typeid_to_atom(FType),
-    {IProto1, ok} = thrift_protocol:skip(IProto0, FTypeAtom),
-    {IProto2, ok} = read(IProto1, field_end),
-    read_struct_loop(IProto2, SDict, RTuple).
-
--spec skip(#protocol{}, any()) -> {#protocol{}, ok}.
-
-skip(Proto0, struct) ->
-    {Proto1, ok} = read(Proto0, struct_begin),
-    {Proto2, ok} = skip_struct_loop(Proto1),
-    {Proto3, ok} = read(Proto2, struct_end),
-    {Proto3, ok};
-
-skip(Proto0, map) ->
-    {Proto1, Map} = read(Proto0, map_begin),
-    {Proto2, ok} = skip_map_loop(Proto1, Map),
-    {Proto3, ok} = read(Proto2, map_end),
-    {Proto3, ok};
-
-skip(Proto0, set) ->
-    {Proto1, Set} = read(Proto0, set_begin),
-    {Proto2, ok} = skip_set_loop(Proto1, Set),
-    {Proto3, ok} = read(Proto2, set_end),
-    {Proto3, ok};
-
-skip(Proto0, list) ->
-    {Proto1, List} = read(Proto0, list_begin),
-    {Proto2, ok} = skip_list_loop(Proto1, List),
-    {Proto3, ok} = read(Proto2, list_end),
-    {Proto3, ok};
-
-skip(Proto0, Type) when is_atom(Type) ->
-    {Proto1, _Ignore} = read(Proto0, Type),
-    {Proto1, ok}.
-
-
-skip_struct_loop(Proto0) ->
-    {Proto1, #protocol_field_begin{type = Type}} = read(Proto0, field_begin),
-    case Type of
-        ?tType_STOP ->
-            {Proto1, ok};
-        _Else ->
-            {Proto2, ok} = skip(Proto1, Type),
-            {Proto3, ok} = read(Proto2, field_end),
-            skip_struct_loop(Proto3)
-    end.
-
-skip_map_loop(Proto0, Map = #protocol_map_begin{ktype = Ktype,
-                                                vtype = Vtype,
-                                                size = Size}) ->
-    case Size of
-        N when N > 0 ->
-            {Proto1, ok} = skip(Proto0, Ktype),
-            {Proto2, ok} = skip(Proto1, Vtype),
-            skip_map_loop(Proto2,
-                          Map#protocol_map_begin{size = Size - 1});
-        0 -> {Proto0, ok}
-    end.
-
-skip_set_loop(Proto0, Map = #protocol_set_begin{etype = Etype,
-                                                size = Size}) ->
-    case Size of
-        N when N > 0 ->
-            {Proto1, ok} = skip(Proto0, Etype),
-            skip_set_loop(Proto1,
-                          Map#protocol_set_begin{size = Size - 1});
-        0 -> {Proto0, ok}
-    end.
-
-skip_list_loop(Proto0, Map = #protocol_list_begin{etype = Etype,
-                                                  size = Size}) ->
-    case Size of
-        N when N > 0 ->
-            {Proto1, ok} = skip(Proto0, Etype),
-            skip_list_loop(Proto1,
-                           Map#protocol_list_begin{size = Size - 1});
-        0 -> {Proto0, ok}
-    end.
-
-
-%%--------------------------------------------------------------------
-%% Function: write(OProto, {Type, Data}) -> ok
-%%
-%% Type = {struct, StructDef} |
-%%        {list, Type} |
-%%        {map, KeyType, ValType} |
-%%        {set, Type} |
-%%        BaseType
-%%
-%% Data =
-%%         tuple()  -- for struct
-%%       | list()   -- for list
-%%       | dictionary()   -- for map
-%%       | set()    -- for set
-%%       | any()    -- for base types
-%%
-%% Description:
-%%--------------------------------------------------------------------
--spec write(#protocol{}, any()) -> {#protocol{}, ok | {error, _Reason}}.
-
-write(Proto0, {{struct, StructDef}, Data})
-  when is_list(StructDef), is_tuple(Data), length(StructDef) == size(Data) - 1 ->
-
-    [StructName | Elems] = tuple_to_list(Data),
-    {Proto1, ok} = write(Proto0, #protocol_struct_begin{name = StructName}),
-    {Proto2, ok} = struct_write_loop(Proto1, StructDef, Elems),
-    {Proto3, ok} = write(Proto2, struct_end),
-    {Proto3, ok};
-
-write(Proto, {{struct, {Module, StructureName}}, Data})
-  when is_atom(Module),
-       is_atom(StructureName),
-       element(1, Data) =:= StructureName ->
-    write(Proto, {Module:struct_info(StructureName), Data});
-
-write(_, {{struct, {Module, StructureName}}, Data})
-  when is_atom(Module),
-       is_atom(StructureName) ->
-    erlang:error(struct_unmatched, {{provided, element(1, Data)},
-                             {expected, StructureName}});
-
-write(Proto0, {{list, Type}, Data})
-  when is_list(Data) ->
-    {Proto1, ok} = write(Proto0,
-               #protocol_list_begin{
-                 etype = term_to_typeid(Type),
-                 size = length(Data)
-                }),
-    Proto2 = lists:foldl(fun(Elem, ProtoIn) ->
-                                 {ProtoOut, ok} = write(ProtoIn, {Type, Elem}),
-                                 ProtoOut
-                         end,
-                         Proto1,
-                         Data),
-    {Proto3, ok} = write(Proto2, list_end),
-    {Proto3, ok};
-
-write(Proto0, {{map, KeyType, ValType}, Data}) ->
-    {Proto1, ok} = write(Proto0,
-                         #protocol_map_begin{
-                           ktype = term_to_typeid(KeyType),
-                           vtype = term_to_typeid(ValType),
-                           size  = dict:size(Data)
-                          }),
-    Proto2 = dict:fold(fun(KeyData, ValData, ProtoS0) ->
-                               {ProtoS1, ok} = write(ProtoS0, {KeyType, KeyData}),
-                               {ProtoS2, ok} = write(ProtoS1, {ValType, ValData}),
-                               ProtoS2
-                       end,
-                       Proto1,
-                       Data),
-    {Proto3, ok} = write(Proto2, map_end),
-    {Proto3, ok};
-
-write(Proto0, {{set, Type}, Data}) ->
-    true = sets:is_set(Data),
-    {Proto1, ok} = write(Proto0,
-                         #protocol_set_begin{
-                           etype = term_to_typeid(Type),
-                           size  = sets:size(Data)
-                          }),
-    Proto2 = sets:fold(fun(Elem, ProtoIn) ->
-                               {ProtoOut, ok} = write(ProtoIn, {Type, Elem}),
-                               ProtoOut
-                       end,
-                       Proto1,
-                       Data),
-    {Proto3, ok} = write(Proto2, set_end),
-    {Proto3, ok};
-
-write(Proto = #protocol{module = Module,
-                        data = ModuleData}, Data) ->
-    {NewData, Result} = Module:write(ModuleData, Data),
-    {Proto#protocol{data = NewData}, Result}.
-
-struct_write_loop(Proto0, [{Fid, Type} | RestStructDef], [Data | RestData]) ->
-    NewProto = case Data of
-                   undefined ->
-                       Proto0; % null fields are skipped in response
-                   _ ->
-                       {Proto1, ok} = write(Proto0,
-                                           #protocol_field_begin{
-                                             type = term_to_typeid(Type),
-                                             id = Fid
-                                            }),
-                       {Proto2, ok} = write(Proto1, {Type, Data}),
-                       {Proto3, ok} = write(Proto2, field_end),
-                       Proto3
-               end,
-    struct_write_loop(NewProto, RestStructDef, RestData);
-struct_write_loop(Proto, [], []) ->
-    write(Proto, field_stop).
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_reconnecting_client.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_reconnecting_client.erl
deleted file mode 100644
index 468c38b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_reconnecting_client.erl
+++ /dev/null
@@ -1,258 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_reconnecting_client).
-
--behaviour(gen_server).
-
-%% API
--export([ call/3,
-          get_stats/1,
-          get_and_reset_stats/1 ]).
-
--export([ start_link/6 ]).
-
-%% gen_server callbacks
--export([ init/1,
-          handle_call/3,
-          handle_cast/2,
-          handle_info/2,
-          terminate/2,
-          code_change/3 ]).
-
--record( state, { client = nil, 
-                  host,
-                  port,
-                  thrift_svc,
-                  thrift_opts,
-                  reconn_min,
-                  reconn_max,
-                  reconn_time = 0,
-                  op_cnt_dict,
-                  op_time_dict } ).
-
-%%====================================================================
-%% API
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
-%% Description: Starts the server
-%%--------------------------------------------------------------------
-start_link( Host, Port,
-            ThriftSvc, ThriftOpts,
-            ReconnMin, ReconnMax ) ->
-  gen_server:start_link( ?MODULE,
-                         [ Host, Port,
-                           ThriftSvc, ThriftOpts,
-                           ReconnMin, ReconnMax ],
-                         [] ).
-
-call( Pid, Op, Args ) ->
-  gen_server:call( Pid, { call, Op, Args } ).
-
-get_stats( Pid ) ->
-  gen_server:call( Pid, get_stats ).
-
-get_and_reset_stats( Pid ) ->
-  gen_server:call( Pid, get_and_reset_stats ).
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, State} |
-%%                         {ok, State, Timeout} |
-%%                         ignore               |
-%%                         {stop, Reason}
-%% Description: Start the server.
-%%--------------------------------------------------------------------
-init( [ Host, Port, TSvc, TOpts, ReconnMin, ReconnMax ] ) ->
-  process_flag( trap_exit, true ),
-
-  State = #state{ host         = Host,
-                  port         = Port,
-                  thrift_svc   = TSvc,
-                  thrift_opts  = TOpts,
-                  reconn_min   = ReconnMin,
-                  reconn_max   = ReconnMax,
-                  op_cnt_dict  = dict:new(),
-                  op_time_dict = dict:new() },
-
-  { ok, try_connect( State ) }.
-
-%%--------------------------------------------------------------------
-%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                                   {reply, Reply, State, Timeout} |
-%%                                                   {noreply, State} |
-%%                                                   {noreply, State, Timeout} |
-%%                                                   {stop, Reason, Reply, State} |
-%%                                                   {stop, Reason, State}
-%% Description: Handling call messages
-%%--------------------------------------------------------------------
-handle_call( { call, Op, _ },
-             _From,
-             State = #state{ client = nil } ) ->
-  { reply, { error, noconn }, incr_stats( Op, "failfast", 1, State ) };
-
-handle_call( { call, Op, Args },
-             _From,
-             State=#state{ client = Client } ) ->
-
-  Timer = timer_fun(),
-  Result = ( catch thrift_client:call( Client, Op, Args) ),
-  Time = Timer(),
-
-  case Result of
-    { C, { ok, Reply } } ->
-      S = incr_stats( Op, "success", Time, State#state{ client = C } ),
-      { reply, {ok, Reply }, S };
-    { _, { E, Msg } } when E == error; E == exception ->
-      S = incr_stats( Op, "error", Time, try_connect( State ) ),
-      { reply, { E, Msg }, S };
-    Other ->
-      S = incr_stats( Op, "error", Time, try_connect( State ) ),
-      { reply, Other, S }
-  end;
-
-handle_call( get_stats,
-             _From,
-             State = #state{} ) ->
-  { reply, stats( State ), State };
-
-handle_call( get_and_reset_stats,
-             _From,
-             State = #state{} ) ->
-  { reply, stats( State ), reset_stats( State ) }.
-
-%%--------------------------------------------------------------------
-%% Function: handle_cast(Msg, State) -> {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, State}
-%% Description: Handling cast messages
-%%--------------------------------------------------------------------
-handle_cast( _Msg, State ) ->
-  { noreply, State }.
-
-%%--------------------------------------------------------------------
-%% Function: handle_info(Info, State) -> {noreply, State} |
-%%                                       {noreply, State, Timeout} |
-%%                                       {stop, Reason, State}
-%% Description: Handling all non call/cast messages
-%%--------------------------------------------------------------------
-handle_info( try_connect, State ) ->
-  { noreply, try_connect( State ) };
-
-handle_info( _Info, State ) ->
-  { noreply, State }.
-
-%%--------------------------------------------------------------------
-%% Function: terminate(Reason, State) -> void()
-%% Description: This function is called by a gen_server when it is about to
-%% terminate. It should be the opposite of Module:init/1 and do any necessary
-%% cleaning up. When it returns, the gen_server terminates with Reason.
-%% The return value is ignored.
-%%--------------------------------------------------------------------
-terminate( _Reason, #state{ client = Client } ) ->
-  thrift_client:close( Client ),
-  ok.
-
-%%--------------------------------------------------------------------
-%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
-code_change( _OldVsn, State, _Extra ) ->
-  { ok, State }.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-try_connect( State = #state{ client      = OldClient,
-                             host        = Host,
-                             port        = Port,
-                             thrift_svc  = TSvc,
-                             thrift_opts = TOpts } ) ->
-
-  case OldClient of
-    nil -> ok;
-    _   -> ( catch thrift_client:close( OldClient ) )
-  end,
-
-  case catch thrift_client_util:new( Host, Port, TSvc, TOpts ) of
-    { ok, Client } ->
-      State#state{ client = Client, reconn_time = 0 };
-    { E, Msg } when E == error; E == exception ->
-      ReconnTime = reconn_time( State ),
-      error_logger:error_msg( "[~w] ~w connect failed (~w), trying again in ~w ms~n",
-                              [ self(), TSvc, Msg, ReconnTime ] ),
-      erlang:send_after( ReconnTime, self(), try_connect ),
-      State#state{ client = nil, reconn_time = ReconnTime }
-  end.
-
-
-reconn_time( #state{ reconn_min = ReconnMin, reconn_time = 0 } ) ->
-  ReconnMin;
-reconn_time( #state{ reconn_max = ReconnMax, reconn_time = ReconnMax } ) ->
-  ReconnMax;
-reconn_time( #state{ reconn_max = ReconnMax, reconn_time = R } ) ->
-  Backoff = 2 * R,
-  case Backoff > ReconnMax of
-    true  -> ReconnMax;
-    false -> Backoff
-  end.
-
--ifdef(time_correction).
-timer_fun() ->
-  T1 = erlang:monotonic_time(),
-  fun() ->
-    T2 = erlang:monotonic_time(),
-    erlang:convert_time_unit(T2 - T1, native, micro_seconds)
-  end.
--else.
-timer_fun() ->
-  T1 = erlang:now(),
-  fun() ->
-    T2 = erlang:now(),
-    timer:now_diff(T2, T1)
-  end.
--endif.
-
-incr_stats( Op, Result, Time,
-            State = #state{ op_cnt_dict  = OpCntDict,
-                            op_time_dict = OpTimeDict } ) ->
-  Key = lists:flatten( [ atom_to_list( Op ), [ "_" | Result ] ] ),
-  State#state{ op_cnt_dict  = dict:update_counter( Key, 1, OpCntDict ),
-               op_time_dict = dict:update_counter( Key, Time, OpTimeDict ) }.
-
-
-stats( #state{ thrift_svc   = TSvc,
-               op_cnt_dict  = OpCntDict,
-               op_time_dict = OpTimeDict } ) ->
-  Svc = atom_to_list(TSvc),
-
-  F = fun( Key, Count, Stats ) ->
-        Name = lists:flatten( [ Svc, [ "_" | Key ] ] ),
-        Micros = dict:fetch( Key, OpTimeDict ),
-        [ { Name, Count, Micros } | Stats ]
-      end,
-
-  dict:fold( F, [], OpCntDict ).
-
-reset_stats( State = #state{} ) ->
-  State#state{ op_cnt_dict = dict:new(), op_time_dict = dict:new() }.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_server.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_server.erl
deleted file mode 100644
index 5012e16..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_server.erl
+++ /dev/null
@@ -1,183 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_server).
-
--behaviour(gen_server).
-
-%% API
--export([start_link/3, stop/1, take_socket/2]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3]).
-
--define(SERVER, ?MODULE).
-
--record(state, {listen_socket, acceptor_ref, service, handler}).
-
-%%====================================================================
-%% API
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
-%% Description: Starts the server
-%%--------------------------------------------------------------------
-start_link(Port, Service, HandlerModule) when is_integer(Port), is_atom(HandlerModule) ->
-    gen_server:start_link({local, ?SERVER}, ?MODULE, {Port, Service, HandlerModule}, []).
-
-%%--------------------------------------------------------------------
-%% Function: stop(Pid) -> ok, {error, Reason}
-%% Description: Stops the server.
-%%--------------------------------------------------------------------
-stop(Pid) when is_pid(Pid) ->
-    gen_server:call(Pid, stop).
-
-
-take_socket(Server, Socket) ->
-    gen_server:call(Server, {take_socket, Socket}).
-
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, State} |
-%%                         {ok, State, Timeout} |
-%%                         ignore               |
-%%                         {stop, Reason}
-%% Description: Initiates the server
-%%--------------------------------------------------------------------
-init({Port, Service, Handler}) ->
-    {ok, Socket} = gen_tcp:listen(Port,
-                                  [binary,
-                                   {packet, 0},
-                                   {active, false},
-                                   {nodelay, true},
-                                   {reuseaddr, true}]),
-    {ok, Ref} = prim_inet:async_accept(Socket, -1),
-    {ok, #state{listen_socket = Socket,
-                acceptor_ref = Ref,
-                service = Service,
-                handler = Handler}}.
-
-%%--------------------------------------------------------------------
-%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                      {reply, Reply, State, Timeout} |
-%%                                      {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, Reply, State} |
-%%                                      {stop, Reason, State}
-%% Description: Handling call messages
-%%--------------------------------------------------------------------
-handle_call(stop, _From, State) ->
-    {stop, stopped, ok, State};
-
-handle_call({take_socket, Socket}, {FromPid, _Tag}, State) ->
-    Result = gen_tcp:controlling_process(Socket, FromPid),
-    {reply, Result, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_cast(Msg, State) -> {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, State}
-%% Description: Handling cast messages
-%%--------------------------------------------------------------------
-handle_cast(_Msg, State) ->
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_info(Info, State) -> {noreply, State} |
-%%                                       {noreply, State, Timeout} |
-%%                                       {stop, Reason, State}
-%% Description: Handling all non call/cast messages
-%%--------------------------------------------------------------------
-handle_info({inet_async, ListenSocket, Ref, {ok, ClientSocket}},
-            State = #state{listen_socket = ListenSocket,
-                           acceptor_ref = Ref,
-                           service = Service,
-                           handler = Handler}) ->
-    case set_sockopt(ListenSocket, ClientSocket) of
-        ok ->
-            %% New client connected - start processor
-            start_processor(ClientSocket, Service, Handler),
-            {ok, NewRef} = prim_inet:async_accept(ListenSocket, -1),
-            {noreply, State#state{acceptor_ref = NewRef}};
-        {error, Reason} ->
-            error_logger:error_msg("Couldn't set socket opts: ~p~n",
-                                   [Reason]),
-            {stop, Reason, State}
-    end;
-
-handle_info({inet_async, _ListenSocket, _Ref, Error}, State) ->
-    error_logger:error_msg("Error in acceptor: ~p~n", [Error]),
-    {stop, Error, State};
-
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: terminate(Reason, State) -> void()
-%% Description: This function is called by a gen_server when it is about to
-%% terminate. It should be the opposite of Module:init/1 and do any necessary
-%% cleaning up. When it returns, the gen_server terminates with Reason.
-%% The return value is ignored.
-%%--------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-set_sockopt(ListenSocket, ClientSocket) ->
-    true = inet_db:register_socket(ClientSocket, inet_tcp),
-    case prim_inet:getopts(ListenSocket,
-                           [active, nodelay, keepalive, delay_send, priority, tos]) of
-        {ok, Opts} ->
-            case prim_inet:setopts(ClientSocket, Opts) of
-                ok    -> ok;
-                Error -> gen_tcp:close(ClientSocket),
-                         Error
-            end;
-        Error ->
-            gen_tcp:close(ClientSocket),
-            Error
-    end.
-
-start_processor(Socket, Service, Handler) ->
-    Server = self(),
-
-    ProtoGen = fun() ->
-                       % Become the controlling process
-                       ok = take_socket(Server, Socket),
-                       {ok, SocketTransport} = thrift_socket_transport:new(Socket),
-                       {ok, BufferedTransport} = thrift_buffered_transport:new(SocketTransport),
-                       {ok, Protocol} = thrift_binary_protocol:new(BufferedTransport),
-                       {ok, Protocol}
-               end,
-
-    spawn(thrift_processor, init, [{Server, ProtoGen, Service, Handler}]).
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_service.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_service.erl
deleted file mode 100644
index 2ed7b57..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_service.erl
+++ /dev/null
@@ -1,25 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_service).
-
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{function_info, 2}].
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_socket_server.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_socket_server.erl
deleted file mode 100644
index 4e3c052..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_socket_server.erl
+++ /dev/null
@@ -1,320 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_socket_server).
-
--behaviour(gen_server).
-
--include ("thrift_constants.hrl").
-
--ifdef(TEST).
-    -compile(export_all).
-    -export_records([thrift_socket_server]).
--else.
-    -export([start/1, stop/1]).
-
-    -export([init/1, handle_call/3, handle_cast/2, terminate/2, code_change/3,
-             handle_info/2]).
-
-    -export([acceptor_loop/1]).
--endif.
-
--record(thrift_socket_server,
-        {port,
-         service,
-         handler,
-         name,
-         max=2048,
-         ip=any,
-         listen=null,
-         acceptor=null,
-         socket_opts=[{recv_timeout, 500}],
-         protocol=binary,
-         framed=false,
-         ssltransport=false,
-         ssloptions=[]
-        }).
-
-start(State=#thrift_socket_server{}) ->
-    start_server(State);
-start(Options) ->
-    start(parse_options(Options)).
-
-stop(Name) when is_atom(Name) ->
-    gen_server:cast(Name, stop);
-stop(Pid) when is_pid(Pid) ->
-    gen_server:cast(Pid, stop);
-stop({local, Name}) ->
-    stop(Name);
-stop({global, Name}) ->
-    stop(Name);
-stop(Options) ->
-    State = parse_options(Options),
-    stop(State#thrift_socket_server.name).
-
-%% Internal API
-
-parse_options(Options) ->
-    parse_options(Options, #thrift_socket_server{}).
-
-parse_options([], State) ->
-    State;
-parse_options([{name, L} | Rest], State) when is_list(L) ->
-    Name = {local, list_to_atom(L)},
-    parse_options(Rest, State#thrift_socket_server{name=Name});
-parse_options([{name, A} | Rest], State) when is_atom(A) ->
-    Name = {local, A},
-    parse_options(Rest, State#thrift_socket_server{name=Name});
-parse_options([{name, Name} | Rest], State) ->
-    parse_options(Rest, State#thrift_socket_server{name=Name});
-parse_options([{port, L} | Rest], State) when is_list(L) ->
-    Port = list_to_integer(L),
-    parse_options(Rest, State#thrift_socket_server{port=Port});
-parse_options([{port, Port} | Rest], State) ->
-    parse_options(Rest, State#thrift_socket_server{port=Port});
-parse_options([{ip, Ip} | Rest], State) ->
-    ParsedIp = case Ip of
-                   any ->
-                       any;
-                   Ip when is_tuple(Ip) ->
-                       Ip;
-                   Ip when is_list(Ip) ->
-                       {ok, IpTuple} = inet_parse:address(Ip),
-                       IpTuple
-               end,
-    parse_options(Rest, State#thrift_socket_server{ip=ParsedIp});
-parse_options([{socket_opts, L} | Rest], State) when is_list(L), length(L) > 0 ->
-    parse_options(Rest, State#thrift_socket_server{socket_opts=L});
-
-parse_options([{handler, []} | _Rest], _State) ->
-    throw("At least an error handler must be defined.");
-parse_options([{handler, ServiceHandlerPropertyList} | Rest], State) when is_list(ServiceHandlerPropertyList) ->
-    ServiceHandlerMap =
-    case State#thrift_socket_server.handler of
-        undefined ->
-            lists:foldl(
-                fun ({ServiceName, ServiceHandler}, Acc) when is_list(ServiceName), is_atom(ServiceHandler) ->
-                        thrift_multiplexed_map_wrapper:store(ServiceName, ServiceHandler, Acc);
-                    (_, _Acc) ->
-                        throw("The handler option is not properly configured for multiplexed services. It should be a kind of [{\"error_handler\", Module::atom()}, {SericeName::list(), Module::atom()}, ...]")
-                end, thrift_multiplexed_map_wrapper:new(), ServiceHandlerPropertyList);
-        _ -> throw("Error while parsing the handler option.")
-    end,
-    case thrift_multiplexed_map_wrapper:find(?MULTIPLEXED_ERROR_HANDLER_KEY, ServiceHandlerMap) of
-        {ok, _ErrorHandler} -> parse_options(Rest, State#thrift_socket_server{handler=ServiceHandlerMap});
-        error -> throw("The handler option is not properly configured for multiplexed services. It should be a kind of [{\"error_handler\", Module::atom()}, {SericeName::list(), Module::atom()}, ...]")
-    end;
-parse_options([{handler, Handler} | Rest], State) when State#thrift_socket_server.handler == undefined, is_atom(Handler) ->
-    parse_options(Rest, State#thrift_socket_server{handler=Handler});
-
-parse_options([{service, []} | _Rest], _State) ->
-    throw("At least one service module must be defined.");
-parse_options([{service, ServiceModulePropertyList} | Rest], State) when is_list(ServiceModulePropertyList) ->
-    ServiceModuleMap =
-    case State#thrift_socket_server.service of
-        undefined ->
-            lists:foldl(
-                fun ({ServiceName, ServiceModule}, Acc) when is_list(ServiceName), is_atom(ServiceModule) ->
-                        thrift_multiplexed_map_wrapper:store(ServiceName, ServiceModule, Acc);
-                    (_, _Acc) ->
-                        throw("The service option is not properly configured for multiplexed services. It should be a kind of [{SericeName::list(), ServiceModule::atom()}, ...]")
-                end, thrift_multiplexed_map_wrapper:new(), ServiceModulePropertyList);
-        _ -> throw("Error while parsing the service option.")
-    end,
-    parse_options(Rest, State#thrift_socket_server{service=ServiceModuleMap});
-parse_options([{service, Service} | Rest], State) when State#thrift_socket_server.service == undefined, is_atom(Service) ->
-    parse_options(Rest, State#thrift_socket_server{service=Service});
-
-parse_options([{max, Max} | Rest], State) ->
-    MaxInt = case Max of
-                 Max when is_list(Max) ->
-                     list_to_integer(Max);
-                 Max when is_integer(Max) ->
-                     Max
-             end,
-    parse_options(Rest, State#thrift_socket_server{max=MaxInt});
-
-parse_options([{protocol, Proto} | Rest], State) when is_atom(Proto) ->
-    parse_options(Rest, State#thrift_socket_server{protocol=Proto});
-
-parse_options([{framed, Framed} | Rest], State) when is_boolean(Framed) ->
-    parse_options(Rest, State#thrift_socket_server{framed=Framed});
-
-parse_options([{ssltransport, SSLTransport} | Rest], State) when is_boolean(SSLTransport) ->
-    parse_options(Rest, State#thrift_socket_server{ssltransport=SSLTransport});
-parse_options([{ssloptions, SSLOptions} | Rest], State) when is_list(SSLOptions) ->
-    parse_options(Rest, State#thrift_socket_server{ssloptions=SSLOptions}).
-
-start_server(State=#thrift_socket_server{name=Name}) ->
-    case Name of
-        undefined ->
-            gen_server:start_link(?MODULE, State, []);
-        _ ->
-            gen_server:start_link(Name, ?MODULE, State, [])
-    end.
-
-init(State=#thrift_socket_server{ip=Ip, port=Port}) ->
-    process_flag(trap_exit, true),
-    BaseOpts = [binary,
-                {reuseaddr, true},
-                {packet, 0},
-                {backlog, 4096},
-                {recbuf, 8192},
-                {active, false}],
-    Opts = case Ip of
-               any ->
-                   BaseOpts;
-               Ip ->
-                   [{ip, Ip} | BaseOpts]
-           end,
-    case gen_tcp_listen(Port, Opts, State) of
-        {stop, eacces} ->
-            %% fdsrv module allows another shot to bind
-            %% ports which require root access
-            case Port < 1024 of
-                true ->
-                    case fdsrv:start() of
-                        {ok, _} ->
-                            case fdsrv:bind_socket(tcp, Port) of
-                                {ok, Fd} ->
-                                    gen_tcp_listen(Port, [{fd, Fd} | Opts], State);
-                                _ ->
-                                    {stop, fdsrv_bind_failed}
-                            end;
-                        _ ->
-                            {stop, fdsrv_start_failed}
-                    end;
-                false ->
-                    {stop, eacces}
-            end;
-        Other ->
-            error_logger:info_msg("thrift service listening on port ~p", [Port]),
-            Other
-    end.
-
-gen_tcp_listen(Port, Opts, State) ->
-    case gen_tcp:listen(Port, Opts) of
-        {ok, Listen} ->
-            {ok, ListenPort} = inet:port(Listen),
-            {ok, new_acceptor(State#thrift_socket_server{listen=Listen,
-                                                         port=ListenPort})};
-        {error, Reason} ->
-            {stop, Reason}
-    end.
-
-new_acceptor(State=#thrift_socket_server{max=0}) ->
-    error_logger:error_msg("Not accepting new connections"),
-    State#thrift_socket_server{acceptor=null};
-new_acceptor(State=#thrift_socket_server{listen=Listen,
-                                         service=Service, handler=Handler,
-                                         socket_opts=Opts, framed=Framed, protocol=Proto,
-                                         ssltransport=SslTransport, ssloptions=SslOptions
-                                        }) ->
-    Pid = proc_lib:spawn_link(?MODULE, acceptor_loop,
-                              [{self(), Listen, Service, Handler, Opts, Framed, SslTransport, SslOptions, Proto}]),
-    State#thrift_socket_server{acceptor=Pid}.
-
-acceptor_loop({Server, Listen, Service, Handler, SocketOpts, Framed, SslTransport, SslOptions, Proto})
-  when is_pid(Server), is_list(SocketOpts) ->
-    case catch gen_tcp:accept(Listen) of % infinite timeout
-        {ok, Socket} ->
-            gen_server:cast(Server, {accepted, self()}),
-            ProtoGen = fun() ->
-                               {ok, SocketTransport} = case SslTransport of
-                                                           true  -> thrift_sslsocket_transport:new(Socket, SocketOpts, SslOptions);
-                                                           false -> thrift_socket_transport:new(Socket, SocketOpts)
-                                                       end,
-                               {ok, Transport}       = case Framed of
-                                                           true  -> thrift_framed_transport:new(SocketTransport);
-                                                           false -> thrift_buffered_transport:new(SocketTransport)
-                                                       end,
-                               {ok, Protocol}        = case Proto of
-                                                         compact -> thrift_compact_protocol:new(Transport);
-                                                         json -> thrift_json_protocol:new(Transport);
-                                                         _ -> thrift_binary_protocol:new(Transport)
-                                                       end,
-                               {ok, Protocol}
-                       end,
-            thrift_processor:init({Server, ProtoGen, Service, Handler});
-        {error, closed} ->
-            exit({error, closed});
-        Other ->
-            error_logger:error_report(
-              [{application, thrift},
-               "Accept failed error",
-               lists:flatten(io_lib:format("~p", [Other]))]),
-            exit({error, accept_failed})
-    end.
-
-handle_call({get, port}, _From, State=#thrift_socket_server{port=Port}) ->
-    {reply, Port, State};
-handle_call(_Message, _From, State) ->
-    Res = error,
-    {reply, Res, State}.
-
-handle_cast({accepted, Pid},
-            State=#thrift_socket_server{acceptor=Pid, max=Max}) ->
-    % io:format("accepted ~p~n", [Pid]),
-    State1 = State#thrift_socket_server{max=Max - 1},
-    {noreply, new_acceptor(State1)};
-handle_cast(stop, State) ->
-    {stop, normal, State}.
-
-terminate(Reason, #thrift_socket_server{listen=Listen, port=Port}) ->
-    gen_tcp:close(Listen),
-    {backtrace, Bt} = erlang:process_info(self(), backtrace),
-    error_logger:error_report({?MODULE, ?LINE,
-                               {child_error, Reason, Bt}}),
-    case Port < 1024 of
-        true ->
-            catch fdsrv:stop(),
-            ok;
-        false ->
-            ok
-    end.
-
-code_change(_OldVsn, State, _Extra) ->
-    State.
-
-handle_info({'EXIT', Pid, normal},
-            State=#thrift_socket_server{acceptor=Pid}) ->
-    {noreply, new_acceptor(State)};
-handle_info({'EXIT', Pid, Reason},
-            State=#thrift_socket_server{acceptor=Pid}) ->
-    error_logger:error_report({?MODULE, ?LINE,
-                               {acceptor_error, Reason}}),
-    timer:sleep(100),
-    {noreply, new_acceptor(State)};
-handle_info({'EXIT', _LoopPid, Reason},
-            State=#thrift_socket_server{acceptor=Pid, max=Max}) ->
-    case Reason of
-        normal -> ok;
-        shutdown -> ok;
-        _ -> error_logger:error_report({?MODULE, ?LINE,
-                                        {child_error, Reason, erlang:get_stacktrace()}})
-    end,
-    State1 = State#thrift_socket_server{max=Max + 1},
-    State2 = case Pid of
-                 null -> new_acceptor(State1);
-                 _ -> State1
-             end,
-    {noreply, State2};
-handle_info(Info, State) ->
-    error_logger:info_report([{'INFO', Info}, {'State', State}]),
-    {noreply, State}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_socket_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_socket_transport.erl
deleted file mode 100644
index fa10ed0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_socket_transport.erl
+++ /dev/null
@@ -1,176 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_socket_transport).
-
--behaviour(thrift_transport).
-
-%% constructors
--export([new/1, new/2]).
-%% transport callbacks
--export([read/2, read_exact/2, write/2, flush/1, close/1]).
-%% legacy api
--export([new_transport_factory/3]).
-
-
--record(t_socket, {
-  socket,
-  recv_timeout=60000,
-  buffer = []
-}).
-
--type state() :: #t_socket{}.
-
-
--spec new(Socket::any()) ->
-  thrift_transport:t_transport().
-
-new(Socket) -> new(Socket, []).
-
--spec new(Socket::any(), Opts::list()) ->
-  thrift_transport:t_transport().
-
-new(Socket, Opts) when is_list(Opts) ->
-  State = parse_opts(Opts, #t_socket{socket = Socket}),
-  thrift_transport:new(?MODULE, State).
-
-
-parse_opts([{recv_timeout, Timeout}|Rest], State)
-when is_integer(Timeout), Timeout > 0 ->
-  parse_opts(Rest, State#t_socket{recv_timeout = Timeout});
-parse_opts([{recv_timeout, infinity}|Rest], State) ->
-  parse_opts(Rest, State#t_socket{recv_timeout = infinity});
-parse_opts([], State) ->
-  State.
-
-
--include("thrift_transport_behaviour.hrl").
-
-
-read(State = #t_socket{buffer = Buf}, Len)
-when is_integer(Len), Len >= 0 ->
-  Binary = iolist_to_binary(Buf),
-  case iolist_size(Binary) of
-    X when X >= Len ->
-      {Result, Remaining} = split_binary(Binary, Len),
-      {State#t_socket{buffer = Remaining}, {ok, Result}};
-    _ -> recv(State, Len)
-  end.
-
-recv(State = #t_socket{socket = Socket, buffer = Buf}, Len) ->
-  case gen_tcp:recv(Socket, 0, State#t_socket.recv_timeout) of
-    {error, Error} ->
-      gen_tcp:close(Socket),
-      {State, {error, Error}};
-    {ok, Data} ->
-      Binary = iolist_to_binary([Buf, Data]),
-      Give = min(iolist_size(Binary), Len),
-      {Result, Remaining} = split_binary(Binary, Give),
-      {State#t_socket{buffer = Remaining}, {ok, Result}}
-  end.
-
-
-read_exact(State = #t_socket{buffer = Buf}, Len)
-when is_integer(Len), Len >= 0 ->
-  Binary = iolist_to_binary(Buf),
-  case iolist_size(Binary) of
-    X when X >= Len -> read(State, Len);
-    X ->
-      case gen_tcp:recv(State#t_socket.socket, Len - X, State#t_socket.recv_timeout) of
-        {error, Error} ->
-          gen_tcp:close(State#t_socket.socket),
-          {State, {error, Error}};
-        {ok, Data} ->
-          {State#t_socket{buffer = []}, {ok, <<Binary/binary, Data/binary>>}}
-      end
-  end.
-
-
-write(State = #t_socket{socket = Socket}, Data) ->
-  case gen_tcp:send(Socket, Data) of
-    {error, Error} ->
-      gen_tcp:close(Socket),
-      {State, {error, Error}};
-    ok -> {State, ok}
-  end.
-
-
-flush(State) ->
-  {State#t_socket{buffer = []}, ok}.
-
-
-close(State = #t_socket{socket = Socket}) ->
-  {State, gen_tcp:close(Socket)}.
-
-
-%% legacy api. left for compatibility
-
-%% The following "local" record is filled in by parse_factory_options/2
-%% below. These options can be passed to new_protocol_factory/3 in a
-%% proplists-style option list. They're parsed like this so it is an O(n)
-%% operation instead of O(n^2)
--record(factory_opts, {
-  connect_timeout = infinity,
-  sockopts = [],
-  framed = false
-}).
-
-parse_factory_options([], FactoryOpts, TransOpts) -> {FactoryOpts, TransOpts};
-parse_factory_options([{framed, Bool}|Rest], FactoryOpts, TransOpts)
-when is_boolean(Bool) ->
-  parse_factory_options(Rest, FactoryOpts#factory_opts{framed = Bool}, TransOpts);
-parse_factory_options([{sockopts, OptList}|Rest], FactoryOpts, TransOpts)
-when is_list(OptList) ->
-  parse_factory_options(Rest, FactoryOpts#factory_opts{sockopts = OptList}, TransOpts);
-parse_factory_options([{connect_timeout, TO}|Rest], FactoryOpts, TransOpts)
-when TO =:= infinity; is_integer(TO) ->
-  parse_factory_options(Rest, FactoryOpts#factory_opts{connect_timeout = TO}, TransOpts);
-parse_factory_options([{recv_timeout, TO}|Rest], FactoryOpts, TransOpts)
-when TO =:= infinity; is_integer(TO) ->
-  parse_factory_options(Rest, FactoryOpts, [{recv_timeout, TO}] ++ TransOpts).
-
-
-%% Generates a "transport factory" function - a fun which returns a thrift_transport()
-%% instance.
-%% State can be passed into a protocol factory to generate a connection to a
-%% thrift server over a socket.
-new_transport_factory(Host, Port, Options) ->
-  {FactoryOpts, TransOpts} = parse_factory_options(Options, #factory_opts{}, []),
-  {ok, fun() -> SockOpts = [binary,
-      {packet, 0},
-      {active, false},
-      {nodelay, true}|FactoryOpts#factory_opts.sockopts
-    ],
-    case catch gen_tcp:connect(
-      Host,
-      Port,
-      SockOpts,
-      FactoryOpts#factory_opts.connect_timeout
-    ) of
-      {ok, Sock} ->
-        {ok, Transport} = thrift_socket_transport:new(Sock, TransOpts),
-        {ok, BufTransport} = case FactoryOpts#factory_opts.framed of
-          true  -> thrift_framed_transport:new(Transport);
-          false -> thrift_buffered_transport:new(Transport)
-        end,
-        {ok, BufTransport};
-      Error  -> Error
-    end
-  end}.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_sslsocket_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_sslsocket_transport.erl
deleted file mode 100644
index 211153f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_sslsocket_transport.erl
+++ /dev/null
@@ -1,147 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
--module(thrift_sslsocket_transport).
-
--include("thrift_transport_behaviour.hrl").
-
--behaviour(thrift_transport).
-
--export([new/3,
-         write/2, read/2, flush/1, close/1,
-
-         new_transport_factory/3]).
-
-%% Export only for the transport factory
--export([new/2]).
-
--record(data, {socket,
-               recv_timeout=infinity}).
--type state() :: #data{}.
-
-%% The following "local" record is filled in by parse_factory_options/2
-%% below. These options can be passed to new_protocol_factory/3 in a
-%% proplists-style option list. They're parsed like this so it is an O(n)
-%% operation instead of O(n^2)
--record(factory_opts, {connect_timeout = infinity,
-                       sockopts = [],
-                       framed = false,
-                       ssloptions = []}).
-
-parse_factory_options([], Opts) ->
-    Opts;
-parse_factory_options([{framed, Bool} | Rest], Opts) when is_boolean(Bool) ->
-    parse_factory_options(Rest, Opts#factory_opts{framed=Bool});
-parse_factory_options([{sockopts, OptList} | Rest], Opts) when is_list(OptList) ->
-    parse_factory_options(Rest, Opts#factory_opts{sockopts=OptList});
-parse_factory_options([{connect_timeout, TO} | Rest], Opts) when TO =:= infinity; is_integer(TO) ->
-    parse_factory_options(Rest, Opts#factory_opts{connect_timeout=TO});
-parse_factory_options([{ssloptions, SslOptions} | Rest], Opts) when is_list(SslOptions) ->
-    parse_factory_options(Rest, Opts#factory_opts{ssloptions=SslOptions}).
-
-new(Socket, SockOpts, SslOptions) when is_list(SockOpts), is_list(SslOptions) ->
-    inet:setopts(Socket, [{active, false}]), %% => prevent the ssl handshake messages get lost
-
-    %% upgrade to an ssl socket
-    case catch ssl:ssl_accept(Socket, SslOptions) of % infinite timeout
-        {ok, SslSocket} ->
-            new(SslSocket, SockOpts);
-        {error, Reason} ->
-            exit({error, Reason});
-        Other ->
-            error_logger:error_report(
-              [{application, thrift},
-               "SSL accept failed error",
-               lists:flatten(io_lib:format("~p", [Other]))]),
-            exit({error, ssl_accept_failed})
-    end.
-
-new(SslSocket, SockOpts) ->
-    State =
-        case lists:keysearch(recv_timeout, 1, SockOpts) of
-            {value, {recv_timeout, Timeout}}
-              when is_integer(Timeout), Timeout > 0 ->
-                #data{socket=SslSocket, recv_timeout=Timeout};
-            _ ->
-                #data{socket=SslSocket}
-        end,
-    thrift_transport:new(?MODULE, State).
-
-%% Data :: iolist()
-write(This = #data{socket = Socket}, Data) ->
-    {This, ssl:send(Socket, Data)}.
-
-read(This = #data{socket=Socket, recv_timeout=Timeout}, Len)
-  when is_integer(Len), Len >= 0 ->
-    case ssl:recv(Socket, Len, Timeout) of
-        Err = {error, timeout} ->
-            error_logger:info_msg("read timeout: peer conn ~p", [inet:peername(Socket)]),
-            ssl:close(Socket),
-            {This, Err};
-        Data ->
-            {This, Data}
-    end.
-
-%% We can't really flush - everything is flushed when we write
-flush(This) ->
-    {This, ok}.
-
-close(This = #data{socket = Socket}) ->
-    {This, ssl:close(Socket)}.
-
-%%%% FACTORY GENERATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%
-%% Generates a "transport factory" function - a fun which returns a thrift_transport()
-%% instance.
-%% This can be passed into a protocol factory to generate a connection to a
-%% thrift server over a socket.
-%%
-new_transport_factory(Host, Port, Options) ->
-    ParsedOpts = parse_factory_options(Options, #factory_opts{}),
-
-    F = fun() ->
-                SockOpts = [binary,
-                            {packet, 0},
-                            {active, false},
-                            {nodelay, true} |
-                            ParsedOpts#factory_opts.sockopts],
-                case catch gen_tcp:connect(Host, Port, SockOpts,
-                                           ParsedOpts#factory_opts.connect_timeout) of
-                    {ok, Sock} ->
-                        SslSock = case catch ssl:connect(Sock, ParsedOpts#factory_opts.ssloptions,
-                                                         ParsedOpts#factory_opts.connect_timeout) of
-                                      {ok, SslSocket} ->
-                                          SslSocket;
-                                      Other ->
-                                          error_logger:info_msg("error while connecting over ssl - reason: ~p~n", [Other]),
-                                          catch gen_tcp:close(Sock),
-                                          exit(error)
-                                  end,
-                        {ok, Transport} = thrift_sslsocket_transport:new(SslSock, SockOpts),
-                        {ok, BufTransport} =
-                            case ParsedOpts#factory_opts.framed of
-                                true  -> thrift_framed_transport:new(Transport);
-                                false -> thrift_buffered_transport:new(Transport)
-                            end,
-                        {ok, BufTransport};
-                    Error  ->
-                        Error
-                end
-        end,
-    {ok, F}.
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_transport.erl
deleted file mode 100644
index 526050f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_transport.erl
+++ /dev/null
@@ -1,128 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_transport).
-
--export([behaviour_info/1]).
-%% constructors
--export([new/1, new/2]).
-%% transport callbacks
--export([read/2, read_exact/2, write/2, flush/1, close/1]).
-
--export_type([t_transport/0]).
-
-
-behaviour_info(callbacks) ->
-  [{read, 2}, {write, 2}, {flush, 1}, {close, 1}].
-
-
--record(t_transport, {
-  module,
-  state
-}).
-
--type state() :: #t_transport{}.
--type t_transport() :: #t_transport{}.
-
-
--ifdef(transport_wrapper_module).
--define(debug_wrap(Transport),
-  case Transport#t_transport.module of
-    ?transport_wrapper_module -> Transport;
-    _Else ->
-      {ok, Result} = ?transport_wrapper_module:new(Transport),
-      Result
-  end
-).
--else.
--define(debug_wrap(Transport), Transport).
--endif.
-
-
--type wrappable() ::
-  binary() |
-  list() |
-  {membuffer, binary() | list()} |
-  {tcp, port()} |
-  {tcp, port(), list()} |
-  {file, file:io_device()} |
-  {file, file:io_device(), list()} |
-  {file, file:filename()} |
-  {file, file:filename(), list()}.
-
--spec new(wrappable()) -> {ok, #t_transport{}}.
-
-new({membuffer, Membuffer}) when is_binary(Membuffer); is_list(Membuffer) ->
-  thrift_membuffer_transport:new(Membuffer);
-new({membuffer, Membuffer, []}) when is_binary(Membuffer); is_list(Membuffer) ->
-  thrift_membuffer_transport:new(Membuffer);
-new({tcp, Socket}) when is_port(Socket) ->
-  new({tcp, Socket, []});
-new({tcp, Socket, Opts}) when is_port(Socket) ->
-  thrift_socket_transport:new(Socket, Opts);
-new({file, Filename}) when is_list(Filename); is_binary(Filename) ->
-  new({file, Filename, []});
-new({file, Filename, Opts}) when is_list(Filename); is_binary(Filename) ->
-  {ok, File} = file:open(Filename, [raw, binary]),
-  new({file, File, Opts});
-new({file, File, Opts}) ->
-  thrift_file_transport:new(File, Opts).
-
--spec new(Module::module(), State::any()) -> {ok, #t_transport{}}.
-
-new(Module, State) when is_atom(Module) ->
-  {ok, ?debug_wrap(#t_transport{module = Module, state = State})}.
-
-
--include("thrift_transport_behaviour.hrl").
-
-
-read(Transport = #t_transport{module = Module}, Len)
-when is_integer(Len), Len >= 0 ->
-  {NewState, Result} = Module:read(Transport#t_transport.state, Len),
-  {Transport#t_transport{state = NewState}, Result}.
-
-
-read_exact(Transport = #t_transport{module = Module}, Len)
-when is_integer(Len), Len >= 0 ->
-  case lists:keyfind(read_exact, 1, Module:module_info(exports)) of
-    {read_exact, 2} ->
-      io:fwrite("HAS EXACT"),
-      {NewState, Result} = Module:read_exact(Transport#t_transport.state, Len),
-      {Transport#t_transport{state = NewState}, Result};
-    _ ->
-      io:fwrite("~p NO EXACT", [Module]),
-      read(Transport, Len)
-  end.
-
-
-write(Transport = #t_transport{module = Module}, Data) ->
-  {NewState, Result} = Module:write(Transport#t_transport.state, Data),
-  {Transport#t_transport{state = NewState}, Result}.
-
-
-flush(Transport = #t_transport{module = Module}) ->
-  {NewState, Result} = Module:flush(Transport#t_transport.state),
-  {Transport#t_transport{state = NewState}, Result}.
-
-
-close(Transport = #t_transport{module = Module}) ->
-  {NewState, Result} = Module:close(Transport#t_transport.state),
-  {Transport#t_transport{state = NewState}, Result}.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_transport_state_test.erl b/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_transport_state_test.erl
deleted file mode 100644
index e83a44d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/src/thrift_transport_state_test.erl
+++ /dev/null
@@ -1,117 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(thrift_transport_state_test).
-
--behaviour(gen_server).
--behaviour(thrift_transport).
-
-%% API
--export([new/1]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3]).
-
-%% thrift_transport callbacks
--export([write/2, read/2, flush/1, close/1]).
-
--record(trans, {wrapped, % #thrift_transport{}
-                version :: integer(),
-                counter :: pid()
-               }).
--type state() :: #trans{}.
--include("thrift_transport_behaviour.hrl").
-
--record(state, {cversion :: integer()}).
-
-
-new(WrappedTransport) ->
-    case gen_server:start_link(?MODULE, [], []) of
-        {ok, Pid} ->
-            Trans = #trans{wrapped = WrappedTransport,
-                           version = 0,
-                           counter = Pid},
-            thrift_transport:new(?MODULE, Trans);
-        Else ->
-            Else
-    end.
-
-%%====================================================================
-%% thrift_transport callbacks
-%%====================================================================
-
-write(Transport0 = #trans{wrapped = Wrapped0}, Data) ->
-    Transport1 = check_version(Transport0),
-    {Wrapped1, Result} = thrift_transport:write(Wrapped0, Data),
-    Transport2 = Transport1#trans{wrapped = Wrapped1},
-    {Transport2, Result}.
-
-flush(Transport0 = #trans{wrapped = Wrapped0}) ->
-    Transport1 = check_version(Transport0),
-    {Wrapped1, Result} = thrift_transport:flush(Wrapped0),
-    Transport2 = Transport1#trans{wrapped = Wrapped1},
-    {Transport2, Result}.
-
-close(Transport0 = #trans{wrapped = Wrapped0}) ->
-    Transport1 = check_version(Transport0),
-    shutdown_counter(Transport1),
-    {Wrapped1, Result} = thrift_transport:close(Wrapped0),
-    Transport2 = Transport1#trans{wrapped = Wrapped1},
-    {Transport2, Result}.
-
-read(Transport0 = #trans{wrapped = Wrapped0}, Len) ->
-    Transport1 = check_version(Transport0),
-    {Wrapped1, Result} = thrift_transport:read(Wrapped0, Len),
-    Transport2 = Transport1#trans{wrapped = Wrapped1},
-    {Transport2, Result}.
-
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-init([]) ->
-    {ok, #state{cversion = 0}}.
-
-handle_call(check_version, _From, State = #state{cversion = Version}) ->
-    {reply, Version, State#state{cversion = Version+1}}.
-
-handle_cast(shutdown, State) ->
-    {stop, normal, State}.
-
-handle_info(_Info, State) -> {noreply, State}.
-code_change(_OldVsn, State, _Extra) -> {ok, State}.
-terminate(_Reason, _State) -> ok.
-
-%%--------------------------------------------------------------------
-%% Internal functions
-%%--------------------------------------------------------------------
-
-check_version(Transport = #trans{version = Version, counter = Counter}) ->
-    case gen_server:call(Counter, check_version) of
-        Version ->
-            Transport#trans{version = Version+1};
-        _Else ->
-            % State wasn't propagated properly.  Die.
-            erlang:error(state_not_propagated)
-    end.
-
-shutdown_counter(#trans{counter = Counter}) ->
-    gen_server:cast(Counter, shutdown).
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/Thrift1151.thrift b/vendor/git.apache.org/thrift.git/lib/erl/test/Thrift1151.thrift
deleted file mode 100644
index 6f934a7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/Thrift1151.thrift
+++ /dev/null
@@ -1,3 +0,0 @@
-struct StructA { 1: i16 x; }
-struct StructB { 1: i32 x; }
-struct StructC { 1: StructA x; }
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/Thrift1475.thrift b/vendor/git.apache.org/thrift.git/lib/erl/test/Thrift1475.thrift
deleted file mode 100644
index 7adeb7e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/Thrift1475.thrift
+++ /dev/null
@@ -1,34 +0,0 @@
-struct StructB
-{
-  1: string x
-}
-
-struct StructA
-{
-  1: string a,
-  2: binary b,
-  3: optional string c,
-  4: optional binary d,
-  5: required string e,
-  6: required binary f,
-  7: string g = "foo",
-  8: i32 h,
-  9: optional i32 i,
-  10: required i32 j,
-  11: required i32 k = 5,
-  12: double l,
-  13: optional double m,
-  14: required double n,
-  15: double o = 3.14159,
-  16: list<string> string_list,
-  17: list<byte> byte_list = [1, 2, 3],
-  18: required list<string> rsl,
-  19: optional list<string> osl,
-  20: set<string> string_set,
-  21: required set<string> rss,
-  22: optional set<string> oss,
-  23: map<string, string> string_map,
-  24: required map<string, string> rsm,
-  25: optional map<string, string> osm,
-  26: StructB structb
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/flags/LegacyNames.thrift b/vendor/git.apache.org/thrift.git/lib/erl/test/flags/LegacyNames.thrift
deleted file mode 100644
index 38f2729..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/flags/LegacyNames.thrift
+++ /dev/null
@@ -1,33 +0,0 @@
-enum Numberz
-{
-  ONE = 1,
-  TWO,
-  THREE,
-  FIVE = 5,
-  SIX,
-  EIGHT = 8
-}
-
-const Numberz myNumberz = Numberz.ONE;
-
-struct CapitalizedStruct
-{
-  1: i32 Id,
-  2: binary message
-}
-
-struct ListCapitalizedStructs
-{
-  1: list<CapitalizedStruct> structs
-}
-
-exception Xception {
-  1: i32 errorCode,
-  2: binary message
-}
-
-service LegacyNames
-{
-  ListCapitalizedStructs Names(1: CapitalizedStruct foo, 2: CapitalizedStruct bar)
-    throws(1: Xception err)
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/flags/Thrift3214.thrift b/vendor/git.apache.org/thrift.git/lib/erl/test/flags/Thrift3214.thrift
deleted file mode 100644
index a9110ce..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/flags/Thrift3214.thrift
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-struct StringMap
-{
-  1: map<i32, string> data = {1: "a", 2: "b"};
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/legacy_names_test.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/legacy_names_test.erl
deleted file mode 100644
index c16aa3e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/legacy_names_test.erl
+++ /dev/null
@@ -1,69 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(legacy_names_test).
--compile(export_all).
-
--include_lib("eunit/include/eunit.hrl").
-
--include("gen-erl/legacyNames_constants.hrl").
-
-record_generation_test_() ->
-  [
-    {"capitalizedStruct record", ?_assertMatch(
-      {capitalizedStruct, _, _},
-      #capitalizedStruct{id=null,message=null}
-    )}
-  ].
-
-struct_info_test_() ->
-  [
-    {"capitalizedStruct extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, i32, 'id', undefined},
-        {2, undefined, string, 'message', undefined}
-      ]},
-      legacyNames_types:struct_info_ext(capitalizedStruct)
-    )},
-    {"listCapitalizedStructs extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {list, {struct, {'legacyNames_types', 'capitalizedStruct'}}}, 'structs', []}
-      ]},
-      legacyNames_types:struct_info_ext(listCapitalizedStructs)
-    )}
-  ].
-
-service_info_test_() ->
-  [
-    {"names params", ?_assertEqual(
-      {struct, [
-        {1, {struct, {'legacyNames_types', 'capitalizedStruct'}}},
-        {2, {struct, {'legacyNames_types', 'capitalizedStruct'}}}
-      ]},
-      legacyNames_thrift:function_info(names, params_type)
-    )},
-    {"names reply", ?_assertEqual(
-      {struct, {'legacyNames_types', 'listCapitalizedStructs'}},
-      legacyNames_thrift:function_info(names, reply_type)
-    )},
-    {"names exceptions", ?_assertEqual(
-      {struct, [{1, {struct, {'legacyNames_types', 'xception'}}}]},
-      legacyNames_thrift:function_info(names, exceptions)
-    )}
-  ].
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/multiplexing.thrift b/vendor/git.apache.org/thrift.git/lib/erl/test/multiplexing.thrift
deleted file mode 100644
index 7c7994b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/multiplexing.thrift
+++ /dev/null
@@ -1,7 +0,0 @@
-service Multiplexing_Calculator {
-    i32 add(1: i32 x, 2: i32 y)
-}
-
-service Multiplexing_WeatherReport {
-    double getTemperature()
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/multiplexing_test.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/multiplexing_test.erl
deleted file mode 100644
index 0f2d616..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/multiplexing_test.erl
+++ /dev/null
@@ -1,57 +0,0 @@
--module(multiplexing_test).
-
--include_lib("eunit/include/eunit.hrl").
-
--export([
-     handle_function/2
-    ,handle_error/2
-]).
-
-start_multiplexed_server_test() ->
-
-    Port = 9090,
-    Services = [
-                {"Multiplexing_Calculator",    multiplexing__calculator_thrift},
-                {"Multiplexing_WeatherReport", multiplexing__weather_report_thrift}
-               ],
-
-    {ok, Pid} = thrift_socket_server:start([
-        {ip, "127.0.0.1"},
-        {port, Port},
-        {name, ?MODULE},
-        {service, Services},
-        {handler, [
-            {"error_handler",              ?MODULE},
-            {"Multiplexing_Calculator",    ?MODULE},
-            {"Multiplexing_WeatherReport", ?MODULE}
-        ]}
-     ]),
-
-    {ok, [{"Multiplexing_Calculator", CalculatorClient0},
-          {"Multiplexing_WeatherReport", WeatherReportClient0}]} = thrift_client_util:new_multiplexed("127.0.0.1", Port, Services, []),
-
-    ?assertMatch({_, {error, {bad_args, _, _}}}, thrift_client:call(WeatherReportClient0, getTemperature, [1])),
-    ?assertMatch({_, {error, {bad_args, _, _}}}, thrift_client:call(CalculatorClient0, add, [1])),
-    ?assertMatch({_, {error, {bad_args, _, _}}}, thrift_client:call(CalculatorClient0, add, [1,1,1])),
-
-    ?assertMatch({_, {error, {no_function, _}}}, thrift_client:call(CalculatorClient0, getTemperature, [])),
-    ?assertMatch({_, {error, {no_function, _}}}, thrift_client:call(WeatherReportClient0, add, [41, 1])),
-
-    ?assertMatch({_, {ok, 42}}, thrift_client:call(CalculatorClient0, add, [41, 1])),
-    ?assertMatch({_, {ok, 42.0}}, thrift_client:call(WeatherReportClient0, getTemperature, [])),
-
-    thrift_socket_server:stop(Pid).
-
-%% HANDLE FUNCTIONS
-
-%% Calculator handles
-handle_function(add, {X, Y}) ->
-    {reply, X + Y};
-
-%% WeatherReport handles
-handle_function(getTemperature, {}) ->
-    {reply, 42.0}.
-
-handle_error(_F, _Reason) ->
-%%     ?debugHere, ?debugVal({_F, _Reason}),
-    ok.
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/name_conflict_test.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/name_conflict_test.erl
deleted file mode 100644
index b01df57..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/name_conflict_test.erl
+++ /dev/null
@@ -1,299 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(name_conflict_test).
--compile(export_all).
-
--include_lib("eunit/include/eunit.hrl").
-
--include("gen-erl/name_conflict_test_constants.hrl").
-
-record_generation_test_() ->
-  [
-    {"using record", ?_assertMatch(
-      {using, _, _},
-      #using{single=null,integer=null}
-    )},
-    {"delegate record", ?_assertMatch(
-      {delegate, _, _},
-      #delegate{partial=null,delegate=null}
-    )},
-    {"get record", ?_assertMatch(
-      {get, _},
-      #get{sbyte=null}
-    )},
-    {"partial record", ?_assertMatch(
-      {partial, _, _, _},
-      #partial{using=null}
-    )},
-    {"ClassAndProp record", ?_assertMatch(
-      {'ClassAndProp', _, _, _, _},
-      #'ClassAndProp'{
-        'ClassAndProp'=null,
-        'ClassAndProp_'=null,
-        'ClassAndProp__'=null,
-        'ClassAndProper'=null
-      }
-    )},
-    {"second_chance record", ?_assertMatch(
-      {second_chance, _, _, _, _},
-      #second_chance{
-        'SECOND_CHANCE'=null,
-        'SECOND_CHANCE_'=null,
-        'SECOND_CHANCE__'=null,
-        'SECOND_CHANCES'=null
-      }
-    )},
-    {"NOW_EAT_THIS record", ?_assertMatch(
-      {'NOW_EAT_THIS', _, _, _, _},
-      #'NOW_EAT_THIS'{
-        now_eat_this=null,
-        now_eat_this_=null,
-        now_eat_this__=null,
-        now_eat_this_and_this=null
-      }
-    )},
-    {"TheEdgeCase record", ?_assertMatch(
-      {'TheEdgeCase', _, _, _, _, _, _},
-      #'TheEdgeCase'{
-        theEdgeCase=null,
-        theEdgeCase_=null,
-        theEdgeCase__=null,
-        'TheEdgeCase'=null,
-        'TheEdgeCase_'=null,
-        'TheEdgeCase__'=null
-      }
-    )},
-    {"Tricky_ record", ?_assertMatch(
-      {'Tricky_', _, _},
-      #'Tricky_'{tricky=null,'Tricky'=null}
-    )},
-    {"Nested record", ?_assertMatch(
-      {'Nested', _, _, _, _, _, _},
-      #'Nested'{
-        'ClassAndProp'=null,
-        second_chance=null,
-        'NOW_EAT_THIS'=null,
-        'TheEdgeCase'=null,
-        'Tricky_'=null,
-        'Nested'=null
-      }
-    )},
-    {"Problem_ record", ?_assertMatch(
-      {'Problem_', _, _},
-      #'Problem_'{problem=null,'Problem'=null}
-    )}
-  ].
-
-struct_info_test_() ->
-  [
-    {"using definition", ?_assertEqual(
-      {struct, [{1, double},{2, double}]},
-      name_conflict_test_types:struct_info(using)
-    )},
-    {"delegate definition", ?_assertEqual(
-      {struct, [
-        {1, string},
-        {2, {struct, {name_conflict_test_types, delegate}}}
-      ]},
-      name_conflict_test_types:struct_info(delegate)
-    )},
-    {"get definition", ?_assertEqual(
-      {struct, [{1, bool}]},
-      name_conflict_test_types:struct_info(get)
-    )},
-    {"partial definition", ?_assertEqual(
-      {struct, [
-        {1, {struct, {name_conflict_test_types, using}}},
-        {2, bool},
-        {3, bool}
-      ]},
-      name_conflict_test_types:struct_info(partial)
-    )},
-    {"ClassAndProp definition", ?_assertEqual(
-      {struct, [{1, bool},{2, bool},{3, bool},{4, bool}]},
-      name_conflict_test_types:struct_info('ClassAndProp')
-    )},
-    {"second_chance definition", ?_assertEqual(
-      {struct, [{1, bool},{2, bool},{3, bool},{4, bool}]},
-      name_conflict_test_types:struct_info(second_chance)
-    )},
-    {"NOW_EAT_THIS definition", ?_assertEqual(
-      {struct, [{1, bool},{2, bool},{3, bool},{4, bool}]},
-      name_conflict_test_types:struct_info('NOW_EAT_THIS')
-    )},
-    {"TheEdgeCase definition", ?_assertEqual(
-      {struct, [{1, bool},{2, bool},{3, bool},{4, bool},{5, bool},{6, bool}]},
-      name_conflict_test_types:struct_info('TheEdgeCase')
-    )},
-    {"Tricky_ definition", ?_assertEqual(
-      {struct, [{1, bool},{2, bool}]},
-      name_conflict_test_types:struct_info('Tricky_')
-    )},
-    {"Nested definition", ?_assertEqual(
-      {struct, [
-        {1, {struct, {name_conflict_test_types, 'ClassAndProp'}}},
-        {2, {struct, {name_conflict_test_types, second_chance}}},
-        {3, {struct, {name_conflict_test_types, 'NOW_EAT_THIS'}}},
-        {4, {struct, {name_conflict_test_types, 'TheEdgeCase'}}},
-        {5, {struct, {name_conflict_test_types, 'Tricky_'}}},
-        {6, {struct, {name_conflict_test_types, 'Nested'}}}
-      ]},
-      name_conflict_test_types:struct_info('Nested')
-    )},
-    {"Problem_ definition", ?_assertEqual(
-      {struct, [{1, bool},{2, bool}]},
-      name_conflict_test_types:struct_info('Problem_')
-    )},
-    {"using extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, double, single, undefined},
-        {2, undefined, double, integer, undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext(using)
-    )},
-    {"delegate extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, string, partial, undefined},
-        {2, undefined, {struct, {name_conflict_test_types, delegate}}, delegate, undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext(delegate)
-    )},
-    {"get extended definition", ?_assertEqual(
-      {struct, [{1, undefined, bool, sbyte, undefined}]},
-      name_conflict_test_types:struct_info_ext(get)
-    )},
-    {"partial extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {struct, {name_conflict_test_types, using}}, using, #using{}},
-        {2, undefined, bool, read, undefined},
-        {3, undefined, bool, write, undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext(partial)
-    )},
-    {"ClassAndProp extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, bool, 'ClassAndProp', undefined},
-        {2, undefined, bool, 'ClassAndProp_', undefined},
-        {3, undefined, bool, 'ClassAndProp__', undefined},
-        {4, undefined, bool, 'ClassAndProper', undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext('ClassAndProp')
-    )},
-    {"second_chance extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, bool, 'SECOND_CHANCE', undefined},
-        {2, undefined, bool, 'SECOND_CHANCE_', undefined},
-        {3, undefined, bool, 'SECOND_CHANCE__', undefined},
-        {4, undefined, bool, 'SECOND_CHANCES', undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext(second_chance)
-    )},
-    {"NOW_EAT_THIS extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, bool, now_eat_this, undefined},
-        {2, undefined, bool, now_eat_this_, undefined},
-        {3, undefined, bool, now_eat_this__, undefined},
-        {4, undefined, bool, now_eat_this_and_this, undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext('NOW_EAT_THIS')
-    )},
-    {"TheEdgeCase extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, bool, theEdgeCase, undefined},
-        {2, undefined, bool, theEdgeCase_, undefined},
-        {3, undefined, bool, theEdgeCase__, undefined},
-        {4, undefined, bool, 'TheEdgeCase', undefined},
-        {5, undefined, bool, 'TheEdgeCase_', undefined},
-        {6, undefined, bool, 'TheEdgeCase__', undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext('TheEdgeCase')
-    )},
-    {"Tricky_ extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, bool, tricky, undefined},
-        {2, undefined, bool, 'Tricky', undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext('Tricky_')
-    )},
-    {"Nested extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {struct, {
-          name_conflict_test_types,
-          'ClassAndProp'
-        }}, 'ClassAndProp', #'ClassAndProp'{}},
-        {2, undefined, {struct, {
-          name_conflict_test_types,
-          second_chance
-        }}, second_chance, #second_chance{}},
-        {3, undefined, {struct, {
-          name_conflict_test_types,
-          'NOW_EAT_THIS'
-        }}, 'NOW_EAT_THIS', #'NOW_EAT_THIS'{}},
-        {4, undefined, {struct, {
-          name_conflict_test_types,
-          'TheEdgeCase'
-        }}, 'TheEdgeCase', #'TheEdgeCase'{}},
-        {5, undefined, {struct, {
-          name_conflict_test_types,
-          'Tricky_'
-        }}, 'Tricky_', #'Tricky_'{}},
-        {6, undefined, {struct, {
-          name_conflict_test_types,
-          'Nested'
-        }}, 'Nested', undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext('Nested')
-    )},
-    {"Problem_ extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, bool, problem, undefined},
-        {2, undefined, bool, 'Problem', undefined}
-      ]},
-      name_conflict_test_types:struct_info_ext('Problem_')
-    )}
-  ].
-
-service_info_test_() ->
-  [
-    {"event params", ?_assertEqual(
-      {struct, [{1, {struct, {name_conflict_test_types, partial}}}]},
-      extern_thrift:function_info(event, params_type)
-    )},
-    {"event reply", ?_assertEqual(
-      {struct, {name_conflict_test_types, delegate}},
-      extern_thrift:function_info(event, reply_type)
-    )},
-    {"event exceptions", ?_assertEqual(
-      {struct, []},
-      extern_thrift:function_info(event, exceptions)
-    )},
-    {"Foo params", ?_assertEqual(
-      {struct, [{1, {struct, {name_conflict_test_types, 'Nested'}}}]},
-      extern_thrift:function_info('Foo', params_type)
-    )},
-    {"Foo reply", ?_assertEqual(
-      {struct, []},
-      extern_thrift:function_info('Foo', reply_type)
-    )},
-    {"Foo exceptions", ?_assertEqual(
-      {struct, [{1, {struct, {name_conflict_test_types, 'Problem_'}}}]},
-      extern_thrift:function_info('Foo', exceptions)
-    )}
-  ].
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/stress_server.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/stress_server.erl
deleted file mode 100644
index 35fff06..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/stress_server.erl
+++ /dev/null
@@ -1,64 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(stress_server).
-
-
--export([start_link/1,
-
-         handle_function/2,
-
-         echoVoid/0,
-         echoByte/1,
-         echoI32/1,
-         echoI64/1,
-         echoString/1,
-         echoList/1,
-         echoSet/1,
-         echoMap/1
-        ]).
-
-start_link(Port) ->
-    thrift_server:start_link(Port, service_thrift, ?MODULE).
-
-
-handle_function(Function, Args) ->
-    case apply(?MODULE, Function, tuple_to_list(Args)) of
-        ok ->
-             ok;
-        Else -> {reply, Else}
-    end.
-
-
-echoVoid() ->
-    ok.
-echoByte(X) ->
-    X.
-echoI32(X) ->
-    X.
-echoI64(X) ->
-    X.
-echoString(X) ->
-    X.
-echoList(X) ->
-    X.
-echoSet(X) ->
-    X.
-echoMap(X) ->
-    X.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_disklog.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_disklog.erl
deleted file mode 100644
index dcb6fc1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_disklog.erl
+++ /dev/null
@@ -1,99 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_disklog).
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-disklog_test() ->
-  {ok, TransportFactory} =
-    thrift_disk_log_transport:new_transport_factory(
-      test_disklog,
-      [{file, "./test_log"},
-       {size, {1024*1024, 10}}]),
-  {ok, ProtocolFactory} =
-    thrift_binary_protocol:new_protocol_factory( TransportFactory, []),
-  {ok, Proto} = ProtocolFactory(),
-  {ok, Client0} = thrift_client:new(Proto, thrift_test_thrift),
-
-  io:format("Client started~n"),
-
-  % We have to make oneway calls into this client only since otherwise it
-  % will try to read from the disklog and go boom.
-  {Client1, {ok, ok}} = thrift_client:call(Client0, testOneway, [16#deadbeef]),
-  io:format("Call written~n"),
-
-  % Use the send_call method to write a non-oneway call into the log
-  {Client2, ok} =
-    thrift_client:send_call(Client1, testString, [<<"hello world">>]),
-  io:format("Non-oneway call sent~n"),
-
-  {_Client3, ok} = thrift_client:close(Client2),
-  io:format("Client closed~n"),
-  
-  lists:foreach(fun(File) -> file:delete(File) end, [
-    "./test_log.1",
-    "./test_log.idx",
-    "./test_log.siz"
-  ]),
-  io:format("Cleaning up test files~n"),
-
-  ok.
-
-disklog_base64_test() ->
-  {ok, TransportFactory} =
-    thrift_disk_log_transport:new_transport_factory(
-      test_disklog,
-      [{file, "./test_b64_log"},
-       {size, {1024*1024, 10}}]),
-  {ok, B64Factory} =
-    thrift_base64_transport:new_transport_factory(TransportFactory),
-  {ok, BufFactory} =
-    thrift_buffered_transport:new_transport_factory(B64Factory),
-  {ok, ProtocolFactory} =
-    thrift_binary_protocol:new_protocol_factory(BufFactory, []),
-  {ok, Proto} = ProtocolFactory(),
-  {ok, Client0} = thrift_client:new(Proto, thrift_test_thrift),
-
-  io:format("Client started~n"),
-
-  % We have to make oneway calls into this client only since otherwise
-  % it will try to read from the disklog and go boom.
-  {Client1, {ok, ok}} = thrift_client:call(Client0, testOneway, [16#deadbeef]),
-  io:format("Call written~n"),
-
-  % Use the send_call method to write a non-oneway call into the log
-  {Client2, ok} =
-    thrift_client:send_call(Client1, testString, [<<"hello world">>]),
-  io:format("Non-oneway call sent~n"),
-
-  {_Client3, ok} = thrift_client:close(Client2),
-  io:format("Client closed~n"),
-
-  lists:foreach(fun(File) -> file:delete(File) end, [
-    "./test_b64_log.1",
-    "./test_b64_log.idx",
-    "./test_b64_log.siz"
-  ]),
-  io:format("Cleaning up test files~n"),
-
-  ok.
-
--endif.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_1151.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_1151.erl
deleted file mode 100644
index f4a910e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_1151.erl
+++ /dev/null
@@ -1,34 +0,0 @@
--module(test_thrift_1151).
-
--include("gen-erl/thrift1151_types.hrl").
-
--ifdef(TEST).
--include_lib("eunit/include/eunit.hrl").
-
-unmatched_struct_test() ->
-  S1 = #'StructC'{x=#'StructB'{x=1}},
-  {ok, Transport} = thrift_memory_buffer:new(),
-  {ok, Protocol} = thrift_binary_protocol:new(Transport),
-  ?assertException(
-    error,
-    struct_unmatched,
-    thrift_protocol:write(
-      Protocol,
-      {{struct, element(2, thrift1151_types:struct_info('StructC'))}, S1}
-    )
-  ).
-
-badarg_test() ->
-  S2 = #'StructC'{x=#'StructA'{x="1"}},
-  {ok, Transport} = thrift_memory_buffer:new(),
-  {ok, Protocol} = thrift_binary_protocol:new(Transport),
-  ?assertException(
-    error,
-    badarg,
-    thrift_protocol:write(
-      Protocol,
-      {{struct, element(2, thrift1151_types:struct_info('StructC'))}, S2}
-    )
-  ).
-
--endif.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_3214.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_3214.erl
deleted file mode 100644
index 0f9544b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_3214.erl
+++ /dev/null
@@ -1,60 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_thrift_3214).
--compile(export_all).
-
--include("gen-erl/thrift3214_types.hrl").
-
--ifdef(TEST).
--ifndef(otp16_or_less).
--include_lib("eunit/include/eunit.hrl").
-
-record_generation_test_() ->
-  [
-    {"StringMap record", ?_assertMatch(
-      {'StringMap', _},
-      #'StringMap'{data=#{50 => "foo"}}
-    )},
-    {"StringMap record defaults", ?_assertEqual(
-      {'StringMap', #{1 => "a", 2 => "b"}},
-      #'StringMap'{}
-    )},
-    {"StringMap record dict from list", ?_assertNotEqual(
-      {'StringMap', dict:from_list([{1, "a"}, {2, "b"}])},
-      #'StringMap'{}
-    )},
-    {"StringMap record map from list", ?_assertEqual(
-      {'StringMap', maps:from_list([{1, "a"}, {2, "b"}])},
-      #'StringMap'{}
-    )}
-  ].
-
-struct_info_test_() ->
-  [
-    {"StringMap extended definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {map, i32, string}, 'data', #{1 => "a", 2 => "b"}}
-      ]},
-      thrift3214_types:struct_info_ext('StringMap')
-    )}
-  ].
-
--endif.
--endif.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_buffered_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_buffered_transport.erl
deleted file mode 100644
index 8519e82..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_buffered_transport.erl
+++ /dev/null
@@ -1,359 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_thrift_buffered_transport).
--include_lib("eunit/include/eunit.hrl").
-
-
-new(Transport) -> thrift_buffered_transport:new(Transport).
-
-new_test_() ->
-  [
-    {"new buffered membuffer", ?_assertMatch(
-      {ok, {t_transport, thrift_buffered_transport, {t_buffered,
-        {t_transport, thrift_membuffer_transport, {t_membuffer, []}},
-        []
-      }}},
-      new({t_transport, thrift_membuffer_transport, {t_membuffer, []}})
-    )}
-  ].
-
-
-read(Frame, Bytes) -> thrift_buffered_transport:read(Frame, Bytes).
-
-read_test_() ->
-  [
-    {"read zero bytes from an empty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        {ok, <<>>}
-      },
-      read(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        0
-      )
-    )},
-    {"read 1 byte from an empty buffered membuffer", ?_assertMatch(
-      {_, {ok, <<>>}},
-      read(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        1
-      )
-    )},
-    {"read zero bytes from nonempty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<"hallo world">>
-          }},
-          []
-        },
-        {ok, <<>>}
-      },
-      read(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<"hallo world">>
-          }},
-          []
-        },
-        0
-      )
-    )},
-    {"read 1 byte from nonempty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"allo world">>}},
-          []
-        },
-        {ok, <<"h">>}
-      },
-      read(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"hallo world">>}},
-          []
-        },
-        1
-      )
-    )},
-    {"read 1 byte from nonempty buffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"allo world">>}},
-          []
-        },
-        {ok, <<"h">>}
-      },
-      read(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"hallo world">>}},
-          []
-        },
-        1
-      )
-    )},
-    {"read a zillion bytes from nonempty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        {ok, <<"hallo world">>}
-      },
-      read(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"hallo world">>}},
-          []
-        },
-        65536
-      )
-    )}
-  ].
-
-
-read_exact(Frame, Bytes) -> thrift_buffered_transport:read_exact(Frame, Bytes).
-
-read_exact_test_() ->
-  [
-    {"read exactly zero bytes from an empty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        {ok, <<>>}
-      },
-      read_exact(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        0
-      )
-    )},
-    {"read exactly 1 byte from an empty buffered membuffer", ?_assertMatch(
-      {_, {error, eof}},
-      read_exact(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        1
-      )
-    )},
-    {"read exactly zero bytes from nonempty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"hallo world">>}},
-          []
-        },
-        {ok, <<>>}
-      },
-      read_exact(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"hallo world">>}},
-          []
-        },
-        0
-      )
-    )},
-    {"read exactly 1 byte from nonempty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"allo world">>}},
-          []
-        },
-        {ok, <<"h">>}
-      },
-      read_exact(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<"hallo world">>
-          }},
-          []
-        },
-        1
-      )
-    )},
-    {"read exactly 1 byte from nonempty buffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"allo world">>}},
-          []
-        },
-        {ok, <<"h">>}
-      },
-      read_exact(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"hallo world">>}},
-          []
-        },
-        1
-      )
-    )},
-    {"read exactly a zillion bytes from nonempty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<"hallo world">>}},
-          []
-        },
-        {error, eof}
-      },
-      read_exact(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<"hallo world">>
-          }},
-          []
-        },
-        65536
-      )
-    )}
-  ].
-
-
-write(Framed, Data) -> thrift_buffered_transport:write(Framed, Data).
-
-write_test_() ->
-  [
-    {"write empty list to empty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [[], []]
-        },
-        ok
-      },
-      write(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        []
-      )
-    )},
-    {"write empty list to nonempty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [["hallo world"], []]
-        },
-        ok
-      },
-      write(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          ["hallo world"]
-        },
-        []
-      )
-    )},
-    {"write empty binary to empty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [[], <<>>]
-        },
-        ok
-      },
-      write(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        <<>>
-      )
-    )},
-    {"write empty binary to nonempty buffered membuffer", ?_assertMatch(
-      {
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [["hallo world"], <<>>]
-        },
-        ok
-      },
-      write(
-        {t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          ["hallo world"]
-        },
-        <<>>
-      )
-    )}
-  ].
-
-
-flush(Transport) -> thrift_buffered_transport:flush(Transport).
-
-flush_test_() ->
-  [
-    {"flush empty buffered membuffer", ?_assertMatch(
-      {{t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          []
-        },
-        ok
-      },
-      flush({t_buffered,
-        {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-        []
-      })
-    )},
-    {"flush nonempty buffered membuffer", ?_assertMatch(
-      {{t_buffered,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            [<<>>, <<"hallo world">>]
-          }},
-          []
-        },
-        ok
-      },
-      flush({t_buffered,
-        {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-        <<"hallo world">>
-      })
-    )}
-  ].
-
-
-close(Transport) -> thrift_buffered_transport:close(Transport).
-
-close_test_() ->
-  {"close buffered membuffer", ?_assertMatch(
-    {{t_buffered,
-        {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-        []
-      },
-      ok
-    },
-    close({t_buffered,
-      {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-      []
-    })
-  )}.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_compact_protocol.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_compact_protocol.erl
deleted file mode 100644
index 5da78c6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_compact_protocol.erl
+++ /dev/null
@@ -1,219 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_thrift_compact_protocol).
--include_lib("eunit/include/eunit.hrl").
--include("thrift_constants.hrl").
--include("thrift_protocol.hrl").
-
-
-new(Transport) -> thrift_compact_protocol:new(Transport).
-new() ->
-  {ok, Transport} = thrift_membuffer_transport:new(),
-  thrift_compact_protocol:new(Transport).
-
-new_test() ->
-  new(thrift_membuffer_transport:new()).
-
-write(This, Value) -> thrift_protocol:write(This, Value).
-read(This, Type) -> thrift_protocol:read(This, Type).
-
-str(This0, Value0) ->
-  {This1, ok} = write(This0, {string, Value0}),
-  {This2, {ok, Value1}} = read(This1, string),
-  ?assertEqual(Value0, binary_to_list(Value1)),
-  {This2, ok}.
-string_test() ->
-  {ok, This0} = new(),
-  {This1, ok} = str(This0, "aaa"),
-  {This2, ok} = str(This1, ""),
-  {This2, ok}.
-
-round_trip(This0, Type, Value0) ->
-  {This1, ok} = write(This0, {Type, Value0}),
-  {This2, {ok, Value1}} = read(This1, Type),
-  ?assertEqual(Value0, Value1),
-  {This2, ok}.
-
-bool_test() ->
-  {ok, This0} = new(),
-  {This1, ok} = round_trip(This0, bool, true),
-  {This2, ok} = round_trip(This1, bool, false),
-  {This2, ok}.
-
-byte(This0, Value0) -> round_trip(This0, byte, Value0).
-byte_test() ->
-  {ok, This0} = new(),
-  {This1, ok} = byte(This0, 0),
-  {This2, ok} = byte(This1, 42),
-  {This3, ok} = byte(This2, -1),
-  {This4, ok} = byte(This3, -128),
-  {This4, ok}.
-
-i16(This0, Value0) -> round_trip(This0, i16, Value0).
-i16_test() ->
-  {ok, This0} = new(),
-  {This1, ok} = i16(This0, 0),
-  {This2, ok} = i16(This1, 42),
-  {This3, ok} = i16(This2, 30000),
-  {This4, ok} = i16(This3, -1),
-  {This5, ok} = i16(This4, -128),
-  {This6, ok} = i16(This5, -30000),
-  {This6, ok}.
-
-i32(This0, Value0) -> round_trip(This0, i32, Value0).
-i32_test() ->
-  {ok, This0} = new(),
-  {This1, ok} = i32(This0, 0),
-  {This2, ok} = i32(This1, 42),
-  {This3, ok} = i32(This2, 30000),
-  {This4, ok} = i32(This3, 2000000002),
-  {This5, ok} = i32(This4, -1),
-  {This6, ok} = i32(This5, -128),
-  {This7, ok} = i32(This6, -30000),
-  {This8, ok} = i32(This7, -2000000002),
-  {This8, ok}.
-
-i64(This0, Value0) -> round_trip(This0, i64, Value0).
-i64_test() ->
-  {ok, This0} = new(),
-  {This1, ok} = i64(This0, 0),
-  {This2, ok} = i64(This1, 42),
-  {This3, ok} = i64(This2, 30000),
-  {This4, ok} = i64(This3, 2000000002),
-  {This5, ok} = i64(This4, 100000000000000064),
-  {This6, ok} = i64(This5, -1),
-  {This7, ok} = i64(This6, -128),
-  {This8, ok} = i64(This7, -30000),
-  {This9, ok} = i64(This8, -2000000002),
-  {This10, ok} = i64(This9, -100000000000000064),
-  {This10, ok}.
-
-struct_test() ->
-  {ok, P0} = new(),
-  {P1, ok} = write(P0, #protocol_message_begin{ name = "Message1", type = ?tType_I8, seqid = 3}),
-  {P2, ok} = write(P1, #protocol_struct_begin{}),
-  {P3, ok} = write(P2, #protocol_field_begin{ name = "field1", type = ?tType_I8, id = 1}),
-  {P4, ok} = write(P3, {byte, 42}),
-  {P5, ok} = write(P4, field_end),
-  {P6, ok} = write(P5, #protocol_field_begin{ name = "field2", type = ?tType_I8, id = 14}),
-  {P7, ok} = write(P6, {byte, 3}),
-  {P8, ok} = write(P7, field_end),
-  {P9, ok} = write(P8, #protocol_field_begin{ name = "field3", type = ?tType_I8, id = 42}),
-  {P10, ok} = write(P9, {byte, 8}),
-  {P11, ok} = write(P10, field_end),
-  {P12, ok} = write(P11, field_stop),
-  {P13, ok} = write(P12, struct_end),
-  {P14, ok} = write(P13, message_end),
-
-  {P15, #protocol_message_begin{ name = "Message1", type = ?tType_I8, seqid = 3}} = read(P14, message_begin),
-  {P16, ok} = read(P15, struct_begin),
-  {P17, #protocol_field_begin{ type = ?tType_I8, id = 1 }} = read(P16, field_begin),
-  {P18, {ok, 42}} = read(P17, byte),
-  {P19, ok} = read(P18, field_end),
-  {P20, #protocol_field_begin{ type = ?tType_I8, id = 14 }} = read(P19, field_begin),
-  {P21, {ok, 3}} = read(P20, byte),
-  {P22, ok} = read(P21, field_end),
-  {P23, #protocol_field_begin{ type = ?tType_I8, id = 42 }} = read(P22, field_begin),
-  {P24, {ok, 8}} = read(P23, byte),
-  {P25, ok} = read(P24, field_end),
-  {P26, #protocol_field_begin{ type = ?tType_STOP}} = read(P25, field_begin),
-  {P27, ok} = read(P26, struct_end),
-  {P28, ok} = read(P27, message_end),
-  {P28, ok}.
-
-bool_field_test() ->
-  {ok, P0} = new(),
-  {P1, ok} = write(P0, #protocol_message_begin{ name = "Message1", type = ?tType_I8, seqid = 3}),
-  {P2, ok} = write(P1, #protocol_struct_begin{}),
-  {P3, ok} = write(P2, #protocol_field_begin{ name = "field1", type = ?tType_BOOL, id = 1}),
-  {P4, ok} = write(P3, {bool, true}),
-  {P5, ok} = write(P4, field_end),
-  {P6, ok} = write(P5, #protocol_field_begin{ name = "field2", type = ?tType_BOOL, id = 14}),
-  {P7, ok} = write(P6, {bool, false}),
-  {P8, ok} = write(P7, field_end),
-  {P9, ok} = write(P8, #protocol_field_begin{ name = "field3", type = ?tType_BOOL, id = 42}),
-  {P10, ok} = write(P9, {bool, true}),
-  {P11, ok} = write(P10, field_end),
-  {P12, ok} = write(P11, field_stop),
-  {P13, ok} = write(P12, struct_end),
-  {P14, ok} = write(P13, message_end),
-
-  {P15, #protocol_message_begin{ name = "Message1", type = ?tType_I8, seqid = 3}} = read(P14, message_begin),
-  {P16, ok} = read(P15, struct_begin),
-  {P17, #protocol_field_begin{ type = ?tType_BOOL, id = 1 }} = read(P16, field_begin),
-  {P18, {ok, true}} = read(P17, bool),
-  {P19, ok} = read(P18, field_end),
-  {P20, #protocol_field_begin{ type = ?tType_BOOL, id = 14 }} = read(P19, field_begin),
-  {P21, {ok, false}} = read(P20, bool),
-  {P22, ok} = read(P21, field_end),
-  {P23, #protocol_field_begin{ type = ?tType_BOOL, id = 42 }} = read(P22, field_begin),
-  {P24, {ok, true}} = read(P23, bool),
-  {P25, ok} = read(P24, field_end),
-  {P26, #protocol_field_begin{ type = ?tType_STOP}} = read(P25, field_begin),
-  {P27, ok} = read(P26, struct_end),
-  {P28, ok} = read(P27, message_end),
-  {P28, ok}.
-
-nesting_test() ->
-  {ok, P0} = new(),
-  {P1, ok} = write(P0, #protocol_message_begin{ name = "Message1", type = ?tType_I8, seqid = 3}),
-  {P2, ok} = write(P1, #protocol_struct_begin{}),
-  {P3, ok} = write(P2, #protocol_field_begin{ name = "field1", type = ?tType_BOOL, id = 14}),
-  {P4, ok} = write(P3, {bool, true}),
-  {P5, ok} = write(P4, field_end),
-
-  {P6, ok} = write(P5, #protocol_field_begin{ name = "field2", type = ?tType_STRUCT, id = 28}),
-  {P7, ok} = write(P6, #protocol_struct_begin{}),
-  {P8, ok} = write(P7, #protocol_field_begin{ name = "field2_1", type = ?tType_BOOL, id = 30000}),
-  {P9, ok} = write(P8, {bool, false}),
-  {P10, ok} = write(P9, field_end),
-  {P11, ok} = write(P10, field_stop),
-  {P12, ok} = write(P11, struct_end),
-  {P13, ok} = write(P12, field_end),
-
-  {P14, ok} = write(P13, #protocol_field_begin{ name = "field3", type = ?tType_BOOL, id = 42}),
-  {P15, ok} = write(P14, {bool, true}),
-  {P16, ok} = write(P15, field_end),
-  {P17, ok} = write(P16, field_stop),
-  {P18, ok} = write(P17, struct_end),
-  {P19, ok} = write(P18, message_end),
-
-  {P20, #protocol_message_begin{ name = "Message1", type = ?tType_I8, seqid = 3}} = read(P19, message_begin),
-  {P21, ok} = read(P20, struct_begin),
-  {P22, #protocol_field_begin{ type = ?tType_BOOL, id = 14 }} = read(P21, field_begin),
-  {P23, {ok, true}} = read(P22, bool),
-  {P24, ok} = read(P23, field_end),
-
-  {P25, #protocol_field_begin{ type = ?tType_STRUCT, id = 28 }} = read(P24, field_begin),
-  {P26, ok} = read(P25, struct_begin),
-  {P27, #protocol_field_begin{ type = ?tType_BOOL, id = 30000 }} = read(P26, field_begin),
-  {P28, {ok, false}} = read(P27, bool),
-  {P29, ok} = read(P28, field_end),
-  {P30, #protocol_field_begin{ type = ?tType_STOP }} = read(P29, field_begin),
-  {P31, ok} = read(P30, struct_end),
-  {P32, ok} = read(P31, field_end),
-
-  {P33, #protocol_field_begin{ type = ?tType_BOOL, id = 42 }} = read(P32, field_begin),
-  {P34, {ok, true}} = read(P33, bool),
-  {P35, ok} = read(P34, field_end),
-  {P36, #protocol_field_begin{ type = ?tType_STOP }} = read(P35, field_begin),
-  {P37, ok} = read(P36, struct_end),
-  {P38, ok} = read(P37, message_end),
-  {P38, ok}.
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_file_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_file_transport.erl
deleted file mode 100644
index 3e5c1d1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_file_transport.erl
+++ /dev/null
@@ -1,213 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_thrift_file_transport).
--include_lib("eunit/include/eunit.hrl").
-
-
-new(File) -> thrift_file_transport:new(File).
-new(File, Opts) -> thrift_file_transport:new(File, Opts).
-
-new_test_() ->
-  [
-    {"new file", ?_assertMatch(
-      {ok, {_, thrift_file_transport, {t_file, a_fake_file, true, write}}},
-      new(a_fake_file)
-    )},
-    {"new file in read mode", ?_assertMatch(
-      {ok, {_, thrift_file_transport, {t_file, a_fake_file, true, read}}},
-      new(a_fake_file, [{mode, read}])
-    )},
-    {"new file in write mode", ?_assertMatch(
-      {ok, {_, thrift_file_transport, {t_file, a_fake_file, true, write}}},
-      new(a_fake_file, [{mode, write}])
-    )},
-    {"new file in should_close true mode", ?_assertMatch(
-      {ok, {_, thrift_file_transport, {t_file, a_fake_file, true, write}}},
-      new(a_fake_file, [{should_close, true}])
-    )},
-    {"new file in should_close false mode", ?_assertMatch(
-      {ok, {_, thrift_file_transport, {t_file, a_fake_file, false, write}}},
-      new(a_fake_file, [{should_close, false}])
-    )}
-  ].
-
-
-read(File, Bytes) -> thrift_file_transport:read(File, Bytes).
-
-read_test_() ->
-  {setup,
-    fun() ->
-      meck:new(file, [unstick, passthrough]),
-      meck:expect(file, read, fun(Bin, N) ->
-        {Result, _} = split_binary(Bin, min(iolist_size(Bin), N)),
-        {ok, Result}
-      end)
-    end,
-    fun(_) -> meck:unload(file) end,
-    [
-      {"read zero bytes from empty file", ?_assertMatch(
-        {_, {ok, <<>>}},
-        read({t_file, <<>>, true, read}, 0)
-      )},
-      {"read 1 byte from empty file", ?_assertMatch(
-        {_, {ok, <<>>}},
-        read({t_file, <<>>, true, read}, 1)
-      )},
-      {"read zero bytes from nonempty file", ?_assertMatch(
-        {_, {ok, <<>>}},
-        read({t_file, <<"hallo world">>, true, read}, 0)
-      )},
-      {"read 1 byte from nonempty file", ?_assertMatch(
-        {_, {ok, <<"h">>}},
-        read({t_file, <<"hallo world">>, true, read}, 1)
-      )},
-      {"read a zillion bytes from nonempty file", ?_assertMatch(
-        {_, {ok, <<"hallo world">>}},
-        read({t_file, <<"hallo world">>, true, read}, 65536)
-      )},
-      {"read 0 byte from file in write mode", ?_assertMatch(
-        {_, {error, write_mode}},
-        read({t_file, <<>>, true, write}, 0)
-      )},
-      {"read 1 byte from file in write mode", ?_assertMatch(
-        {_, {error, write_mode}},
-        read({t_file, <<>>, true, write}, 1)
-      )}
-    ]
-  }.
-
-
-read_exact(File, Bytes) -> thrift_file_transport:read_exact(File, Bytes).
-
-read_exact_test_() ->
-  {setup,
-    fun() ->
-      meck:new(file, [unstick, passthrough]),
-      meck:expect(file, read, fun(Bin, N) ->
-        {Result, _} = split_binary(Bin, min(iolist_size(Bin), N)),
-        {ok, Result}
-      end)
-    end,
-    fun(_) -> meck:unload(file) end,
-    [
-      {"read exactly zero bytes from empty file", ?_assertMatch(
-        {_, {ok, <<>>}},
-        read_exact({t_file, <<>>, true, read}, 0)
-      )},
-      {"read exactly 1 byte from empty file", ?_assertMatch(
-        {_, {error, eof}},
-        read_exact({t_file, <<>>, true, read}, 1)
-      )},
-      {"read exactly zero bytes from nonempty file", ?_assertMatch(
-        {_, {ok, <<>>}},
-        read_exact({t_file, <<"hallo world">>, true, read}, 0)
-      )},
-      {"read exactly 1 byte from nonempty file", ?_assertMatch(
-        {_, {ok, <<"h">>}},
-        read_exact({t_file, <<"hallo world">>, true, read}, 1)
-      )},
-      {"read exactly a zillion bytes from nonempty file", ?_assertMatch(
-        {_, {error, eof}},
-        read_exact({t_file, <<"hallo world">>, true, read}, 65536)
-      )},
-      {"read exactly 0 byte from file in write mode", ?_assertMatch(
-        {_, {error, write_mode}},
-        read_exact({t_file, <<>>, true, write}, 0)
-      )},
-      {"read exactly 1 byte from file in write mode", ?_assertMatch(
-        {_, {error, write_mode}},
-        read_exact({t_file, <<>>, true, write}, 1)
-      )}
-    ]
-  }.
-
-
-write(File, Data) -> thrift_file_transport:write(File, Data).
-
-write_test_() ->
-  {setup,
-    fun() ->
-      meck:new(file, [unstick, passthrough]),
-      meck:expect(file, write, fun(_, _) -> ok end)
-    end,
-    fun(_) -> meck:unload(file) end,
-    [
-      {"write empty list to file", ?_assertMatch(
-        {{t_file, a_fake_file, true, write}, ok},
-        write({t_file, a_fake_file, true, write}, [])
-      )},
-      {"write empty binary to file", ?_assertMatch(
-        {{t_file, a_fake_file, true, write}, ok},
-        write({t_file, a_fake_file, true, write}, <<>>)
-      )},
-      {"write a list to file", ?_assertMatch(
-        {{t_file, a_fake_file, true, write}, ok},
-        write({t_file, a_fake_file, true, write}, "hallo world")
-      )},
-      {"write a binary to file", ?_assertMatch(
-        {{t_file, a_fake_file, true, write}, ok},
-        write({t_file, a_fake_file, true, write}, <<"hallo world">>)
-      )},
-      {"write a binary to file in read mode", ?_assertMatch(
-        {_, {error, read_mode}},
-        write({t_file, a_fake_file, true, read}, <<"hallo world">>)
-      )},
-      {"write a list to file in read mode", ?_assertMatch(
-        {_, {error, read_mode}},
-        write({t_file, a_fake_file, true, read}, "hallo world")
-      )}
-    ]
-  }.
-
-
-flush(Transport) -> thrift_file_transport:flush(Transport).
-
-flush_test_() ->
-  {setup,
-    fun() ->
-      meck:new(file, [unstick, passthrough]),
-      meck:expect(file, sync, fun(_File) -> ok end)
-    end,
-    fun(_) -> meck:unload(file) end,
-    [
-      {"flush file", ?_assertMatch(
-        {{t_file, a_fake_file, true, write}, ok},
-        flush({t_file, a_fake_file, true, write})
-      )}
-    ]
-  }.
-
-
-close(Transport) -> thrift_file_transport:close(Transport).
-
-close_test_() ->
-  {setup,
-    fun() ->
-      meck:new(file, [unstick, passthrough]),
-      meck:expect(file, close, fun(_) -> ok end)
-    end,
-    fun(_) -> meck:unload(file) end,
-    [
-      {"close file", ?_assertMatch(
-        {{t_file, a_fake_file, true, write}, ok},
-        close({t_file, a_fake_file, true, write})
-      )}
-    ]
-  }.
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_framed_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_framed_transport.erl
deleted file mode 100644
index 8a538a5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_framed_transport.erl
+++ /dev/null
@@ -1,404 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_thrift_framed_transport).
--include_lib("eunit/include/eunit.hrl").
-
-
-new(Transport) -> thrift_framed_transport:new(Transport).
-
-new_test_() ->
-  [
-    {"new framed membuffer", ?_assertMatch(
-      {ok, {t_transport, thrift_framed_transport, {t_framed,
-        {t_transport, thrift_membuffer_transport, {t_membuffer, []}},
-        [],
-        []
-      }}},
-      new({t_transport, thrift_membuffer_transport, {t_membuffer, []}})
-    )}
-  ].
-
-
-read(Frame, Bytes) -> thrift_framed_transport:read(Frame, Bytes).
-
-read_test_() ->
-  [
-    {"read zero bytes from an empty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          []
-        },
-        {ok, <<>>}
-      },
-      read(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          []
-        },
-        0
-      )
-    )},
-    {"read 1 byte from an empty framed membuffer", ?_assertMatch(
-      {_, {error, eof}},
-      read(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          []
-        },
-        1
-      )
-    )},
-    {"read zero bytes from nonempty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<0, 0, 0, 11, "hallo world">>
-          }},
-          [],
-          []
-        },
-        {ok, <<>>}
-      },
-      read(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<0, 0, 0, 11, "hallo world">>
-          }},
-          [],
-          []
-        },
-        0
-      )
-    )},
-    {"read 1 byte from nonempty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          <<"allo world">>,
-          []
-        },
-        {ok, <<"h">>}
-      },
-      read(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<0, 0, 0, 11, "hallo world">>
-          }},
-          [],
-          []
-        },
-        1
-      )
-    )},
-    {"read 1 byte from nonempty buffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          <<"allo world">>,
-          []
-        },
-        {ok, <<"h">>}
-      },
-      read(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          <<"hallo world">>,
-          []
-        },
-        1
-      )
-    )},
-    {"read a zillion bytes from nonempty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          <<>>,
-          []
-        },
-        {ok, <<"hallo world">>}
-      },
-      read(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<0, 0, 0, 11, "hallo world">>
-          }},
-          [],
-          []
-        },
-        65536
-      )
-    )}
-  ].
-
-
-read_exact(Frame, Bytes) -> thrift_framed_transport:read_exact(Frame, Bytes).
-
-read_exact_test_() ->
-  [
-    {"read exactly zero bytes from an empty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          <<>>,
-          []
-        },
-        {ok, <<>>}
-      },
-      read_exact(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          []
-        },
-        0
-      )
-    )},
-    {"read exactly 1 byte from an empty framed membuffer", ?_assertMatch(
-      {_, {error, eof}},
-      read_exact(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          []
-        },
-        1
-      )
-    )},
-    {"read exactly zero bytes from nonempty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<0, 0, 0, 11, "hallo world">>
-          }},
-          <<>>,
-          []
-        },
-        {ok, <<>>}
-      },
-      read_exact(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<0, 0, 0, 11, "hallo world">>
-          }},
-          [],
-          []
-        },
-        0
-      )
-    )},
-    {"read exactly 1 byte from nonempty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          <<"allo world">>,
-          []
-        },
-        {ok, <<"h">>}
-      },
-      read_exact(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<0, 0, 0, 11, "hallo world">>
-          }},
-          [],
-          []
-        },
-        1
-      )
-    )},
-    {"read exactly 1 byte from nonempty buffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          <<"allo world">>,
-          []
-        },
-        {ok, <<"h">>}
-      },
-      read_exact(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          <<"hallo world">>,
-          []
-        },
-        1
-      )
-    )},
-    {"read exactly a zillion bytes from nonempty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [[],<<"hallo world">>],
-          []
-        },
-        {error, eof}
-      },
-      read_exact(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            <<0, 0, 0, 11, "hallo world">>
-          }},
-          [],
-          []
-        },
-        65536
-      )
-    )}
-  ].
-
-
-write(Framed, Data) -> thrift_framed_transport:write(Framed, Data).
-
-write_test_() ->
-  [
-    {"write empty list to empty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          [[], []]
-        },
-        ok
-      },
-      write(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          []
-        },
-        []
-      )
-    )},
-    {"write empty list to nonempty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          [["hallo world"], []]
-        },
-        ok
-      },
-      write(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          ["hallo world"]
-        },
-        []
-      )
-    )},
-    {"write empty binary to empty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          [[], <<>>]
-        },
-        ok
-      },
-      write(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          []
-        },
-        <<>>
-      )
-    )},
-    {"write empty binary to nonempty framed membuffer", ?_assertMatch(
-      {
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          [["hallo world"], <<>>]
-        },
-        ok
-      },
-      write(
-        {t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          ["hallo world"]
-        },
-        <<>>
-      )
-    )}
-  ].
-
-
-flush(Transport) -> thrift_framed_transport:flush(Transport).
-
-flush_test_() ->
-  [
-    {"flush empty framed membuffer", ?_assertMatch(
-      {{t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-          [],
-          []
-        },
-        ok
-      },
-      flush({t_framed,
-        {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-        [],
-        []
-      })
-    )},
-    {"flush nonempty framed membuffer", ?_assertMatch(
-      {{t_framed,
-          {t_transport, thrift_membuffer_transport, {t_membuffer,
-            [<<>>, [<<0, 0, 0, 11>>, <<"hallo world">>]]
-          }},
-          [],
-          []
-        },
-        ok
-      },
-      flush({t_framed,
-        {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-        [],
-        <<"hallo world">>
-      })
-    )}
-  ].
-
-
-close(Transport) -> thrift_framed_transport:close(Transport).
-
-close_test_() ->
-  {"close framed membuffer", ?_assertMatch(
-    {{t_framed,
-        {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-        [],
-        []
-      },
-      ok
-    },
-    close({t_framed,
-      {t_transport, thrift_membuffer_transport, {t_membuffer, <<>>}},
-      [],
-      []
-    })
-  )}.
-
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_membuffer_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_membuffer_transport.erl
deleted file mode 100644
index 9689c79..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_membuffer_transport.erl
+++ /dev/null
@@ -1,167 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_thrift_membuffer_transport).
--include_lib("eunit/include/eunit.hrl").
-
-
-new() -> thrift_membuffer_transport:new().
-new(Data) -> thrift_membuffer_transport:new(Data).
-
-new_test_() ->
-  [
-    {"new empty membuffer", ?_assertMatch(
-      {ok, {_, _, {t_membuffer, []}}},
-      new()
-    )},
-    {"new membuffer with <<>>", ?_assertMatch(
-      {ok, {_, _, {t_membuffer, [<<>>]}}},
-      new(<<>>)
-    )},
-    {"new membuffer with []", ?_assertMatch(
-      {ok, {_, _, {t_membuffer, []}}},
-      new([])
-    )},
-    {"new membuffer with <<\"hallo world\">>", ?_assertMatch(
-      {ok, {_, _, {t_membuffer, [<<"hallo world">>]}}},
-      new(<<"hallo world">>)
-    )},
-    {"new membuffer with \"hallo world\"", ?_assertMatch(
-      {ok, {_, _, {t_membuffer, "hallo world"}}},
-      new("hallo world")
-    )}
-  ].
-
-
-read(Membuffer, Bytes) -> thrift_membuffer_transport:read(Membuffer, Bytes).
-
-read_test_() ->
-  [
-    {"read zero bytes from an empty membuffer", ?_assertMatch(
-      {_, {ok, <<>>}},
-      read({t_membuffer, []}, 0)
-    )},
-    {"read 1 byte from an empty membuffer", ?_assertMatch(
-      {_, {ok, <<>>}},
-      read({t_membuffer, []}, 1)
-    )},
-    {"read zero bytes from nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, <<"hallo world">>}, {ok, <<>>}},
-      read({t_membuffer, [["hallo", " "], "world"]}, 0)
-    )},
-    {"read 1 byte from nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, <<"allo world">>}, {ok, <<"h">>}},
-      read({t_membuffer, [["hallo", " "], "world"]}, 1)
-    )},
-    {"read a zillion bytes from nonempty buffer", ?_assertMatch(
-      {{t_membuffer, <<>>}, {ok, <<"hallo world">>}},
-      read({t_membuffer, [["hallo", " "], "world"]}, 65536)
-    )}
-  ].
-
-
-read_exact(Membuffer, Bytes) ->
-  thrift_membuffer_transport:read_exact(Membuffer, Bytes).
-
-read_exact_test_() ->
-  [
-    {"read exactly zero bytes from an empty membuffer", ?_assertMatch(
-      {_, {ok, <<>>}},
-      read_exact({t_membuffer, []}, 0)
-    )},
-    {"read exactly 1 byte from an empty membuffer", ?_assertMatch(
-      {_, {error, eof}},
-      read_exact({t_membuffer, []}, 1)
-    )},
-    {"read exactly zero bytes from nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, <<"hallo world">>}, {ok, <<>>}},
-      read_exact({t_membuffer, [["hallo", " "], "world"]}, 0)
-    )},
-    {"read exactly 1 byte from nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, <<"allo world">>}, {ok, <<"h">>}},
-      read_exact({t_membuffer, [["hallo", " "], "world"]}, 1)
-    )},
-    {"read exactly a zillion bytes from nonempty buffer", ?_assertMatch(
-      {{t_membuffer, [["hallo", " "], "world"]}, {error, eof}},
-      read_exact({t_membuffer, [["hallo", " "], "world"]}, 65536)
-    )}
-  ].
-
-
-write(Membuffer, Data) -> thrift_membuffer_transport:write(Membuffer, Data).
-
-write_test_() ->
-  [
-    {"write empty list to empty membuffer", ?_assertMatch(
-      {{t_membuffer, [[], []]}, ok},
-      write({t_membuffer, []}, [])
-    )},
-    {"write empty list to nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, ["hallo world", []]}, ok},
-      write({t_membuffer, "hallo world"}, [])
-    )},
-    {"write empty binary to empty membuffer", ?_assertMatch(
-      {{t_membuffer, [[], <<>>]}, ok},
-      write({t_membuffer, []}, <<>>)
-    )},
-    {"write empty binary to nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, ["hallo world", <<>>]}, ok},
-      write({t_membuffer, "hallo world"}, <<>>)
-    )},
-    {"write a list to empty membuffer", ?_assertMatch(
-      {{t_membuffer, [[], "hallo world"]}, ok},
-      write({t_membuffer, []}, "hallo world")
-    )},
-    {"write a list to nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, [["hallo", " "], "world"]}, ok},
-      write({t_membuffer, ["hallo", " "]}, "world")
-    )},
-    {"write a binary to empty membuffer", ?_assertMatch(
-      {{t_membuffer, [[], <<"hallo world">>]}, ok},
-      write({t_membuffer, []}, <<"hallo world">>)
-    )},
-    {"write a binary to nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, [["hallo", " "], <<"world">>]}, ok},
-      write({t_membuffer, ["hallo", " "]}, <<"world">>)
-    )}
-  ].
-
-
-flush(Transport) -> thrift_membuffer_transport:flush(Transport).
-
-flush_test_() ->
-  [
-    {"flush empty membuffer", ?_assertMatch(
-      {{t_membuffer, []}, ok},
-      flush({t_membuffer, []})
-    )},
-    {"flush nonempty membuffer", ?_assertMatch(
-      {{t_membuffer, [<<"hallo world">>]}, ok},
-      flush({t_membuffer, [<<"hallo world">>]})
-    )}
-  ].
-
-
-close(Transport) -> thrift_membuffer_transport:close(Transport).
-
-close_test_() ->
-  {"close membuffer", ?_assertMatch(
-    {{t_membuffer, _}, ok},
-    close({t_membuffer, []})
-  )}.
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_socket_transport.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_socket_transport.erl
deleted file mode 100644
index 5bc0f24..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/test_thrift_socket_transport.erl
+++ /dev/null
@@ -1,199 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_thrift_socket_transport).
--include_lib("eunit/include/eunit.hrl").
-
-
-new(Socket) -> thrift_socket_transport:new(Socket).
-new(Socket, Opts) -> thrift_socket_transport:new(Socket, Opts).
-
-new_test_() ->
-  [
-    {"new socket", ?_assertMatch(
-      {ok, {_, thrift_socket_transport, {t_socket, a_fake_socket, 60000, []}}},
-      new(a_fake_socket)
-    )},
-    {"new socket with no options", ?_assertMatch(
-      {ok, {_, thrift_socket_transport, {t_socket, a_fake_socket, 60000, []}}},
-      new(a_fake_socket, [])
-    )},
-    {"new socket with integer timeout", ?_assertMatch(
-      {ok, {_, thrift_socket_transport, {t_socket, a_fake_socket, 5000, []}}},
-      new(a_fake_socket, [{recv_timeout, 5000}])
-    )},
-    {"new socket with infinity timeout", ?_assertMatch(
-      {ok, {_, thrift_socket_transport, {t_socket, a_fake_socket, infinity, []}}},
-      new(a_fake_socket, [{recv_timeout, infinity}])
-    )}
-  ].
-
-
-read(Socket, Bytes) -> thrift_socket_transport:read(Socket, Bytes).
-
-read_test_() ->
-  {setup,
-    fun() ->
-      meck:new(gen_tcp, [unstick, passthrough]),
-      meck:expect(gen_tcp, recv, fun(Bin, 0, _) -> {ok, Bin} end)
-    end,
-    fun(_) -> meck:unload(gen_tcp) end,
-    [
-      {"read zero bytes from empty socket", ?_assertMatch(
-        {_, {ok, <<>>}},
-        read({t_socket, <<>>, 60000, []}, 0)
-      )},
-      {"read 1 byte from empty socket", ?_assertMatch(
-        {_, {ok, <<>>}},
-        read({t_socket, <<>>, 60000, []}, 1)
-      )},
-      {"read zero bytes from nonempty socket", ?_assertMatch(
-        {{t_socket, _, _, _}, {ok, <<>>}},
-        read({t_socket, <<"hallo world">>, 60000, []}, 0)
-      )},
-      {"read 1 byte from nonempty socket", ?_assertMatch(
-        {{t_socket, _, _, <<"allo world">>}, {ok, <<"h">>}},
-        read({t_socket, <<"hallo world">>, 60000, []}, 1)
-      )},
-      {"read a zillion bytes from nonempty socket", ?_assertMatch(
-        {{t_socket, _, _, <<>>}, {ok, <<"hallo world">>}},
-        read({t_socket, <<"hallo world">>, 60000, []}, 65536)
-      )},
-      {"read 1 byte from previously buffered socket", ?_assertMatch(
-        {{t_socket, _, _, <<"allo">>}, {ok, <<"h">>}},
-        read({t_socket, <<" world">>, 60000, <<"hallo">>}, 1)
-      )},
-      {"read 6 byte from previously buffered socket", ?_assertMatch(
-        {{t_socket, _, _, <<"world">>}, {ok, <<"hallo ">>}},
-        read({t_socket, <<" world">>, 60000, <<"hallo">>}, 6)
-      )},
-      {"read a zillion bytes from previously buffered socket", ?_assertMatch(
-        {{t_socket, _, _, <<>>}, {ok, <<"hallo world">>}},
-        read({t_socket, <<" world">>, 60000, <<"hallo">>}, 65536)
-      )}
-    ]
-  }.
-
-
-read_exact(Socket, Bytes) -> thrift_socket_transport:read_exact(Socket, Bytes).
-
-read_exact_test_() ->
-  {setup,
-    fun() ->
-      meck:new(gen_tcp, [unstick, passthrough]),
-      meck:expect(gen_tcp, recv, fun(Bin, N, _) ->
-        case N of
-          0 -> {ok, Bin};
-          1 -> {ok, <<"h">>};
-          N when N > 2 -> {error, timeout}
-        end
-      end),
-      meck:expect(gen_tcp, close, fun(_) -> ok end)
-    end,
-    fun(_) -> meck:unload(gen_tcp) end,
-    [
-      {"read_exact zero bytes from empty socket", ?_assertMatch(
-        {_, {ok, <<>>}},
-        read_exact({t_socket, <<>>, 60000, []}, 0)
-      )},
-      {"read_exact zero bytes from nonempty socket", ?_assertMatch(
-        {{t_socket, _, _, _}, {ok, <<>>}},
-        read_exact({t_socket, <<"hallo world">>, 60000, []}, 0)
-      )},
-      {"read_exact 1 byte from nonempty socket", ?_assertMatch(
-        {{t_socket, _, _, []}, {ok, <<"h">>}},
-        read_exact({t_socket, <<"hallo world">>, 60000, []}, 1)
-      )},
-      {"read_exact a zillion bytes from nonempty socket", ?_assertMatch(
-        {{t_socket, _, _, []}, {error, timeout}},
-        read_exact({t_socket, <<"hallo world">>, 60000, []}, 65536)
-      )},
-      {"read_exact 1 byte from previously buffered socket", ?_assertMatch(
-        {{t_socket, _, _, <<"allo">>}, {ok, <<"h">>}},
-        read_exact({t_socket, <<" world">>, 60000, <<"hallo">>}, 1)
-      )},
-      {"read_exact 6 byte from previously buffered socket", ?_assertMatch(
-        {{t_socket, _, _, []}, {ok, <<"more h">>}},
-        read_exact({t_socket, <<"hallo">>, 60000, <<"more ">>}, 6)
-      )},
-      {"read_exact a zillion bytes from previously buffered socket", ?_assertMatch(
-        {{t_socket, _, _, <<"hallo">>}, {error, timeout}},
-        read_exact({t_socket, <<" world">>, 60000, <<"hallo">>}, 65536)
-      )}
-    ]
-  }.
-
-
-write(Socket, Data) -> thrift_socket_transport:write(Socket, Data).
-
-write_test_() ->
-  {setup,
-    fun() ->
-      meck:new(gen_tcp, [unstick, passthrough]),
-      meck:expect(gen_tcp, send, fun(_, _) -> ok end)
-    end,
-    fun(_) -> meck:unload(gen_tcp) end,
-    [
-      {"write empty list to socket", ?_assertMatch(
-        {{t_socket, a_fake_socket, 60000, []}, ok},
-        write({t_socket, a_fake_socket, 60000, []}, [])
-      )},
-      {"write empty binary to socket", ?_assertMatch(
-        {{t_socket, a_fake_socket, 60000, []}, ok},
-        write({t_socket, a_fake_socket, 60000, []}, <<>>)
-      )},
-      {"write a list to socket", ?_assertMatch(
-        {{t_socket, a_fake_socket, 60000, []}, ok},
-        write({t_socket, a_fake_socket, 60000, []}, "hallo world")
-      )},
-      {"write a binary to socket", ?_assertMatch(
-        {{t_socket, a_fake_socket, 60000, []}, ok},
-        write({t_socket, a_fake_socket, 60000, []}, <<"hallo world">>)
-      )}
-    ]
-  }.
-
-
-flush(Transport) -> thrift_socket_transport:flush(Transport).
-
-flush_test_() ->
-  [
-    {"flush socket", ?_assertMatch(
-      {{t_socket, a_fake_socket, 60000, []}, ok},
-      flush({t_socket, a_fake_socket, 60000, []})
-    )}
-  ].
-
-
-close(Transport) -> thrift_socket_transport:close(Transport).
-
-close_test_() ->
-  {setup,
-    fun() ->
-      meck:new(gen_tcp, [unstick, passthrough]),
-      meck:expect(gen_tcp, close, fun(_) -> ok end)
-    end,
-    fun(_) -> meck:unload(gen_tcp) end,
-    [
-      {"close membuffer", ?_assertMatch(
-        {{t_socket, a_fake_socket, 60000, []}, ok},
-        close({t_socket, a_fake_socket, 60000, []})
-      )}
-    ]
-  }.
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/thrift_socket_server_test.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/thrift_socket_server_test.erl
deleted file mode 100644
index 0818b84..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/thrift_socket_server_test.erl
+++ /dev/null
@@ -1,49 +0,0 @@
--module (thrift_socket_server_test).
-
--include_lib("eunit/include/eunit.hrl").
-
--include ("thrift_constants.hrl").
-
-parse_handler_options_test_() ->
-    CorrectServiceHandlerOptionList = [{?MULTIPLEXED_ERROR_HANDLER_KEY, ?MODULE}, {"Service1", ?MODULE}, {"Service2", ?MODULE}],
-    MissingErrorHandlerOptionList   = [{"Service1", ?MODULE}, {"Service2", ?MODULE}],
-    WrongService2HandlerOptionList  = [{?MULTIPLEXED_ERROR_HANDLER_KEY, ?MODULE}, {"Service1", ?MODULE}, {"Service2", "Module"}],
-    WrongServiceKeyOptionList       = [{?MULTIPLEXED_ERROR_HANDLER_KEY, ?MODULE}, {'service1', ?MODULE}, {"Service2", ?MODULE}],
-    CorrectHandlerTestFunction = fun() ->
-        ?assertMatch({thrift_socket_server,_,_,_,_,_,_,_,_,_,_,_,_,_}, thrift_socket_server:parse_options([{handler, CorrectServiceHandlerOptionList}])),
-        {thrift_socket_server,_,_, HandlerList,_,_,_,_,_,_,_,_,_,_} = thrift_socket_server:parse_options([{handler, CorrectServiceHandlerOptionList}]),
-        lists:foreach(fun
-            ({ServiceName, HandlerModule}) ->
-                ?assertMatch({ok, HandlerModule} when is_atom(HandlerModule), thrift_multiplexed_map_wrapper:find(ServiceName, HandlerList))
-        end, CorrectServiceHandlerOptionList)
-    end,
-    [
-     {"Bad argument for the handler option", ?_assertThrow(_, thrift_socket_server:parse_options([{handler, []}]))},
-     {"Try to parse the handler option twice", ?_assertThrow(_, thrift_socket_server:parse_options([{handler, ?MODULE}, {handler, CorrectServiceHandlerOptionList}]))},
-     {"Parse the handler option as a non multiplexed service handler", ?_assertMatch({thrift_socket_server,_,_,?MODULE,_,_,_,_,_,_,_,_,_,_}, thrift_socket_server:parse_options([{handler, ?MODULE}]))},
-     {"No error handler was defined", ?_assertThrow(_, thrift_socket_server:parse_options([{handler, MissingErrorHandlerOptionList}]))},
-     {"Bad handler module for Service2", ?_assertThrow(_, thrift_socket_server:parse_options([{handler, WrongService2HandlerOptionList}]))},
-     {"Bad service key for Service1", ?_assertThrow(_, thrift_socket_server:parse_options([{handler, WrongServiceKeyOptionList}]))},
-     {"Try to parse a correct handler option list", CorrectHandlerTestFunction}
-    ].
-
-parse_service_options_test_() ->
-    CorrectServiceModuleOptionList = [{"Service1", ?MODULE}, {"Service2", ?MODULE}],
-    WrongService2ModuleOptionList  = [{"Service1", ?MODULE}, {"Service2", "thrift_service_module"}],
-    WrongServiceKeyOptionList       = [{'service1', ?MODULE}, {"Service2", ?MODULE}],
-    CorrectServiceModuleTestFunction = fun() ->
-        ?assertMatch({thrift_socket_server,_,_,_,_,_,_,_,_,_,_,_,_,_}, thrift_socket_server:parse_options([{service, CorrectServiceModuleOptionList}])),
-        {thrift_socket_server,_, ServiceModuleList,_,_,_,_,_,_,_,_,_,_,_} = thrift_socket_server:parse_options([{service, CorrectServiceModuleOptionList}]),
-        lists:foreach(fun
-            ({ServiceName, ServiceModule}) ->
-                ?assertMatch({ok, ServiceModule} when is_atom(ServiceModule), thrift_multiplexed_map_wrapper:find(ServiceName, ServiceModuleList))
-        end, CorrectServiceModuleOptionList)
-    end,
-    [
-     {"Bad argument for the service option", ?_assertThrow(_, thrift_socket_server:parse_options([{service, []}]))},
-     {"Try to parse the service option twice", ?_assertThrow(_, thrift_socket_server:parse_options([{service, ?MODULE}, {service, CorrectServiceModuleOptionList}]))},
-     {"Parse a service module for a non multiplexed service", ?_assertMatch({thrift_socket_server,_,?MODULE,_,_,_,_,_,_,_,_,_,_,_}, thrift_socket_server:parse_options([{service, ?MODULE}]))},
-     {"Bad service module for Service2", ?_assertThrow(_, thrift_socket_server:parse_options([{service, WrongService2ModuleOptionList}]))},
-     {"Bad service key for Service1", ?_assertThrow(_, thrift_socket_server:parse_options([{service, WrongServiceKeyOptionList}]))},
-     {"Try to parse a correct service option list", CorrectServiceModuleTestFunction}
-    ].
diff --git a/vendor/git.apache.org/thrift.git/lib/erl/test/thrift_test_test.erl b/vendor/git.apache.org/thrift.git/lib/erl/test/thrift_test_test.erl
deleted file mode 100644
index ae20f31..0000000
--- a/vendor/git.apache.org/thrift.git/lib/erl/test/thrift_test_test.erl
+++ /dev/null
@@ -1,655 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
-% don't rename this thrift_test, it clobbers generated files
--module(thrift_test_test).
--compile(export_all).
-
--include_lib("eunit/include/eunit.hrl").
-
--include("gen-erl/thrift_test_constants.hrl").
-
-constant_test_() ->
-  [
-    {"myNumberz equals 1", ?_assertEqual(1, ?THRIFT_TEST_MYNUMBERZ)}
-  ].
-
-record_generation_test_() ->
-  [
-    {"Bonk record", ?_assertMatch(
-      {'thrift.test.Bonk', _, _},
-      #'thrift.test.Bonk'{message=null,type=null}
-    )},
-    {"Bools record", ?_assertMatch(
-      {'thrift.test.Bools', _, _},
-      #'thrift.test.Bools'{im_true=null,im_false=null}
-    )},
-    {"Xtruct record", ?_assertMatch(
-      {'thrift.test.Xtruct', _, _, _, _},
-      #'thrift.test.Xtruct'{string_thing=null,byte_thing=null,i32_thing=null,i64_thing=null}
-    )},
-    {"Xtruct2 record", ?_assertMatch(
-      {'thrift.test.Xtruct2', _, _, _},
-      #'thrift.test.Xtruct2'{byte_thing=null,struct_thing=null,i32_thing=null}
-    )},
-    {"Xtruct3 record", ?_assertMatch(
-      {'thrift.test.Xtruct3', _, _, _, _},
-      #'thrift.test.Xtruct3'{string_thing=null,changed=null,i32_thing=null,i64_thing=null}
-    )},
-    {"Insanity record", ?_assertMatch(
-      {'thrift.test.Insanity', _, _},
-      #'thrift.test.Insanity'{userMap=null,xtructs=null}
-    )},
-    {"CrazyNesting record", ?_assertMatch(
-      {'thrift.test.CrazyNesting', _, _, _, _},
-      #'thrift.test.CrazyNesting'{
-        string_field=null,
-        set_field=null,
-        list_field=null,
-        binary_field=null
-      }
-    )},
-    {"Xception record", ?_assertMatch(
-      {'thrift.test.Xception', _, _},
-      #'thrift.test.Xception'{errorCode=null,message=null}
-    )},
-    {"Xception2 record", ?_assertMatch(
-      {'thrift.test.Xception2', _, _},
-      #'thrift.test.Xception2'{errorCode=null,struct_thing=null}
-    )},
-    {"EmptyStruct record", ?_assertMatch({'thrift.test.EmptyStruct'}, #'thrift.test.EmptyStruct'{})},
-    {"OneField record", ?_assertMatch({'thrift.test.OneField', _}, #'thrift.test.OneField'{field=null})},
-    {"VersioningTestV1 record", ?_assertMatch(
-      {'thrift.test.VersioningTestV1', _, _, _},
-      #'thrift.test.VersioningTestV1'{begin_in_both=null,old_string=null,end_in_both=null}
-    )},
-    {"VersioningTestV2 record", ?_assertMatch(
-      {'thrift.test.VersioningTestV2', _, _, _, _, _, _, _, _, _, _, _, _},
-      #'thrift.test.VersioningTestV2'{
-        begin_in_both=null,
-        newint=null,
-        newbyte=null,
-        newshort=null,
-        newlong=null,
-        newdouble=null,
-        newstruct=null,
-        newlist=null,
-        newset=null,
-        newmap=null,
-        newstring=null,
-        end_in_both=null
-      }
-    )},
-    {"ListTypeVersioningV1 record", ?_assertMatch(
-      {'thrift.test.ListTypeVersioningV1', _, _},
-      #'thrift.test.ListTypeVersioningV1'{myints=null,hello=null}
-    )},
-    {"ListTypeVersioningV2 record", ?_assertMatch(
-      {'thrift.test.ListTypeVersioningV2', _, _},
-      #'thrift.test.ListTypeVersioningV2'{strings=null,hello=null}
-    )},
-    {"GuessProtocolStruct record", ?_assertMatch(
-      {'thrift.test.GuessProtocolStruct', _},
-      #'thrift.test.GuessProtocolStruct'{map_field=null}
-    )},
-    {"LargeDeltas record", ?_assertMatch(
-      {'thrift.test.LargeDeltas', _, _, _, _, _, _, _, _, _, _},
-      #'thrift.test.LargeDeltas'{
-        b1=null,
-        b10=null,
-        b100=null,
-        check_true=null,
-        b1000=null,
-        check_false=null,
-        vertwo2000=null,
-        a_set2500=null,
-        vertwo3000=null,
-        big_numbers=null
-      }
-    )},
-    {"NestedListsI32x2 record", ?_assertMatch(
-      {'thrift.test.NestedListsI32x2', _},
-      #'thrift.test.NestedListsI32x2'{integerlist=null}
-    )},
-    {"NestedListsI32x3 record", ?_assertMatch(
-      {'thrift.test.NestedListsI32x3', _},
-      #'thrift.test.NestedListsI32x3'{integerlist=null}
-    )},
-    {"NestedMixedx2 record", ?_assertMatch(
-      {'thrift.test.NestedMixedx2', _, _, _},
-      #'thrift.test.NestedMixedx2'{
-        int_set_list=null,
-        map_int_strset=null,
-        map_int_strset_list=null
-      }
-    )},
-    {"ListBonks record", ?_assertMatch({'thrift.test.ListBonks', _}, #'thrift.test.ListBonks'{bonk=null})},
-    {"NestedListsBonk record", ?_assertMatch(
-      {'thrift.test.NestedListsBonk', _},
-      #'thrift.test.NestedListsBonk'{bonk=null}
-    )},
-    {"BoolTest record", ?_assertMatch(
-      {'thrift.test.BoolTest', _, _},
-      #'thrift.test.BoolTest'{b=null,s=null}
-    )},
-    {"StructA record", ?_assertMatch({'thrift.test.StructA', _}, #'thrift.test.StructA'{s=null})},
-    {"StructB record", ?_assertMatch(
-      {'thrift.test.StructB', _, _},
-      #'thrift.test.StructB'{aa=null,ab=null}
-    )}
-  ].
-
-struct_info_test_() ->
-  [
-    {"Bonk definition (short version)", ?_assertEqual(
-      {struct, [{1, string}, {2, i32}]},
-      thrift_test_types:struct_info('thrift.test.Bonk')
-    )},
-    {"Bonk definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, string, message, undefined},
-        {2, undefined, i32, type, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.Bonk')
-    )},
-    {"Bools definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, bool, im_true, undefined},
-        {2, undefined, bool, im_false, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.Bools')
-    )},
-    {"Xtruct definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, string, string_thing, undefined},
-        {4, undefined, byte, byte_thing, undefined},
-        {9, undefined, i32, i32_thing, undefined},
-        {11, undefined, i64, i64_thing, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.Xtruct')
-    )},
-    {"Xtruct2 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, byte, byte_thing, undefined},
-        {2, undefined, {struct, {'thrift_test_types', 'thrift.test.Xtruct'}}, struct_thing, #'thrift.test.Xtruct'{}},
-        {3, undefined, i32, i32_thing, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.Xtruct2')
-    )},
-    {"Xtruct3 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, string, string_thing, undefined},
-        {4, undefined, i32, changed, undefined},
-        {9, undefined, i32, i32_thing, undefined},
-        {11, undefined, i64, i64_thing, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.Xtruct3')
-    )},
-    {"Insanity definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {map, i32, i64}, userMap, dict:new()},
-        {2, undefined, {list, {struct, {'thrift_test_types', 'thrift.test.Xtruct'}}}, xtructs, []}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.Insanity')
-    )},
-    {"CrazyNesting definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, string, string_field, undefined},
-        {2, optional, {set, {struct, {'thrift_test_types', 'thrift.test.Insanity'}}}, set_field, sets:new()},
-        {3, required, {list, {map,
-          {set, i32},
-          {map, i32, {set, {list, {map, {struct, {'thrift_test_types', 'thrift.test.Insanity'}}, string}}}}
-        }}, list_field, []},
-        {4, undefined, string, binary_field, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.CrazyNesting')
-    )},
-    {"Xception definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, i32, errorCode, undefined},
-        {2, undefined, string, message, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.Xception')
-    )},
-    {"Xception2 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, i32, errorCode, undefined},
-        {2, undefined, {struct, {'thrift_test_types', 'thrift.test.Xtruct'}}, struct_thing, #'thrift.test.Xtruct'{}}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.Xception2')
-    )},
-    {"EmptyStruct definition", ?_assertEqual(
-      {struct, []},
-      thrift_test_types:struct_info_ext('thrift.test.EmptyStruct')
-    )},
-    {"OneField definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {struct, {'thrift_test_types', 'thrift.test.EmptyStruct'}}, field, #'thrift.test.EmptyStruct'{}}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.OneField')
-    )},
-    {"VersioningTestV1 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, i32, begin_in_both, undefined},
-        {3, undefined, string, old_string, undefined},
-        {12, undefined, i32, end_in_both, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.VersioningTestV1')
-    )},
-    {"VersioningTestV2 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, i32, begin_in_both, undefined},
-        {2, undefined, i32, newint, undefined},
-        {3, undefined, byte, newbyte, undefined},
-        {4, undefined, i16, newshort, undefined},
-        {5, undefined, i64, newlong, undefined},
-        {6, undefined, double, newdouble, undefined},
-        {7, undefined, {struct, {thrift_test_types, 'thrift.test.Bonk'}}, newstruct, #'thrift.test.Bonk'{}},
-        {8, undefined, {list, i32}, newlist, []},
-        {9, undefined, {set, i32}, newset, sets:new()},
-        {10, undefined, {map, i32, i32}, newmap, dict:new()},
-        {11, undefined, string, newstring, undefined},
-        {12, undefined, i32, end_in_both, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.VersioningTestV2')
-    )},
-    {"ListTypeVersioningV1 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {list, i32}, myints, []},
-        {2, undefined, string, hello, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.ListTypeVersioningV1')
-    )},
-    {"ListTypeVersioningV2 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {list, string}, strings, []},
-        {2, undefined, string, hello, undefined}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.ListTypeVersioningV2')
-    )},
-    {"GuessProtocolStruct definition", ?_assertEqual(
-      {struct, [
-        {7, undefined, {map, string, string}, map_field, dict:new()}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.GuessProtocolStruct')
-    )},
-    {"LargeDeltas definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {struct, {thrift_test_types, 'thrift.test.Bools'}}, b1, #'thrift.test.Bools'{}},
-        {10, undefined, {struct, {thrift_test_types, 'thrift.test.Bools'}}, b10, #'thrift.test.Bools'{}},
-        {100, undefined, {struct, {thrift_test_types, 'thrift.test.Bools'}}, b100, #'thrift.test.Bools'{}},
-        {500, undefined, bool, check_true, undefined},
-        {1000, undefined, {struct, {thrift_test_types, 'thrift.test.Bools'}}, b1000, #'thrift.test.Bools'{}},
-        {1500, undefined, bool, check_false, undefined},
-        {2000, undefined, {struct, {thrift_test_types, 'thrift.test.VersioningTestV2'}}, vertwo2000, #'thrift.test.VersioningTestV2'{}},
-        {2500, undefined, {set, string}, a_set2500, sets:new()},
-        {3000, undefined, {struct, {thrift_test_types, 'thrift.test.VersioningTestV2'}}, vertwo3000, #'thrift.test.VersioningTestV2'{}},
-        {4000, undefined, {list, i32}, big_numbers, []}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.LargeDeltas')
-    )},
-    {"NestedListsI32x2 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {list, {list, i32}}, integerlist, []}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.NestedListsI32x2')
-    )},
-    {"NestedListsI32x3 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {list, {list, {list, i32}}}, integerlist, []}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.NestedListsI32x3')
-    )},
-    {"NestedMixedx2 definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {list, {set, i32}}, int_set_list, []},
-        {2, undefined, {map, i32, {set, string}}, map_int_strset, dict:new()},
-        {3, undefined, {list, {map, i32, {set, string}}}, map_int_strset_list, []}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.NestedMixedx2')
-    )},
-    {"ListBonks definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {list, {struct, {thrift_test_types, 'thrift.test.Bonk'}}}, bonk, []}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.ListBonks')
-    )},
-    {"NestedListsBonk definition", ?_assertEqual(
-      {struct, [
-        {1, undefined, {list, {list, {list, {struct, {thrift_test_types, 'thrift.test.Bonk'}}}}}, bonk, []}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.NestedListsBonk')
-    )},
-    {"BoolTest definition", ?_assertEqual(
-      {struct, [
-        {1, optional, bool, b, true},
-        {2, optional, string, s, "true"}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.BoolTest')
-    )},
-    {"StructA definition", ?_assertEqual(
-      {struct, [{1, required, string, s, undefined}]},
-      thrift_test_types:struct_info_ext('thrift.test.StructA')
-    )},
-    {"StructB definition", ?_assertEqual(
-      {struct, [
-        {1, optional, {struct, {thrift_test_types, 'thrift.test.StructA'}}, aa, #'thrift.test.StructA'{}},
-        {2, required, {struct, {thrift_test_types, 'thrift.test.StructA'}}, ab, #'thrift.test.StructA'{}}
-      ]},
-      thrift_test_types:struct_info_ext('thrift.test.StructB')
-    )}
-  ].
-
-service_info_test_() ->
-  [
-    {"testVoid params", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testVoid, params_type)
-    )},
-    {"testVoid reply", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testVoid, reply_type)
-    )},
-    {"testVoid exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testVoid, exceptions)
-    )},
-    {"testString params", ?_assertEqual(
-      {struct, [{1, string}]},
-      thrift_test_thrift:function_info(testString, params_type)
-    )},
-    {"testString reply", ?_assertEqual(
-      string,
-      thrift_test_thrift:function_info(testString, reply_type)
-    )},
-    {"testString exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testString, exceptions)
-    )},
-    {"testByte params", ?_assertEqual(
-      {struct, [{1, byte}]},
-      thrift_test_thrift:function_info(testByte, params_type)
-    )},
-    {"testByte reply", ?_assertEqual(
-      byte,
-      thrift_test_thrift:function_info(testByte, reply_type)
-    )},
-    {"testByte exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testByte, exceptions)
-    )},
-    {"testI32 params", ?_assertEqual(
-      {struct, [{1, i32}]},
-      thrift_test_thrift:function_info(testI32, params_type)
-    )},
-    {"testI32 reply", ?_assertEqual(
-      i32,
-      thrift_test_thrift:function_info(testI32, reply_type)
-    )},
-    {"testI32 exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testI32, exceptions)
-    )},
-    {"testI64 params", ?_assertEqual(
-      {struct, [{1, i64}]},
-      thrift_test_thrift:function_info(testI64, params_type)
-    )},
-    {"testI64 reply", ?_assertEqual(
-      i64,
-      thrift_test_thrift:function_info(testI64, reply_type)
-    )},
-    {"testI64 exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testI64, exceptions)
-    )},
-    {"testDouble params", ?_assertEqual(
-      {struct, [{1, double}]},
-      thrift_test_thrift:function_info(testDouble, params_type)
-    )},
-    {"testDouble reply", ?_assertEqual(
-      double,
-      thrift_test_thrift:function_info(testDouble, reply_type)
-    )},
-    {"testDouble exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testDouble, exceptions)
-    )},
-    {"testStruct params", ?_assertEqual(
-      {struct, [
-        {1, {struct, {thrift_test_types, 'thrift.test.Xtruct'}}}
-      ]},
-      thrift_test_thrift:function_info(testStruct, params_type)
-    )},
-    {"testStruct reply", ?_assertEqual(
-      {struct, {thrift_test_types, 'thrift.test.Xtruct'}},
-      thrift_test_thrift:function_info(testStruct, reply_type)
-    )},
-    {"testStruct exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testStruct, exceptions)
-    )},
-    {"testNest params", ?_assertEqual(
-      {struct, [
-        {1, {struct, {thrift_test_types, 'thrift.test.Xtruct2'}}}
-      ]},
-      thrift_test_thrift:function_info(testNest, params_type)
-    )},
-    {"testNest reply", ?_assertEqual(
-      {struct, {thrift_test_types, 'thrift.test.Xtruct2'}},
-      thrift_test_thrift:function_info(testNest, reply_type)
-    )},
-    {"testNest exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testNest, exceptions)
-    )},
-    {"testMap params", ?_assertEqual(
-      {struct, [
-        {1, {map, i32, i32}}
-      ]},
-      thrift_test_thrift:function_info(testMap, params_type)
-    )},
-    {"testMap reply", ?_assertEqual(
-      {map, i32, i32},
-      thrift_test_thrift:function_info(testMap, reply_type)
-    )},
-    {"testMap exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testMap, exceptions)
-    )},
-    {"testStringMap params", ?_assertEqual(
-      {struct, [
-        {1, {map, string, string}}
-      ]},
-      thrift_test_thrift:function_info(testStringMap, params_type)
-    )},
-    {"testStringMap reply", ?_assertEqual(
-      {map, string, string},
-      thrift_test_thrift:function_info(testStringMap, reply_type)
-    )},
-    {"testStringMap exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testStringMap, exceptions)
-    )},
-    {"testSet params", ?_assertEqual(
-      {struct, [
-        {1, {set, i32}}
-      ]},
-      thrift_test_thrift:function_info(testSet, params_type)
-    )},
-    {"testSet reply", ?_assertEqual(
-      {set, i32},
-      thrift_test_thrift:function_info(testSet, reply_type)
-    )},
-    {"testSet exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testSet, exceptions)
-    )},
-    {"testList params", ?_assertEqual(
-      {struct, [
-        {1, {list, i32}}
-      ]},
-      thrift_test_thrift:function_info(testList, params_type)
-    )},
-    {"testList reply", ?_assertEqual(
-      {list, i32},
-      thrift_test_thrift:function_info(testList, reply_type)
-    )},
-    {"testList exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testList, exceptions)
-    )},
-    {"testEnum params", ?_assertEqual(
-      {struct, [
-        {1, i32}
-      ]},
-      thrift_test_thrift:function_info(testEnum, params_type)
-    )},
-    {"testEnum reply", ?_assertEqual(
-      i32,
-      thrift_test_thrift:function_info(testEnum, reply_type)
-    )},
-    {"testEnum exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testEnum, exceptions)
-    )},
-    {"testTypedef params", ?_assertEqual(
-      {struct, [{1, i64}]},
-      thrift_test_thrift:function_info(testTypedef, params_type)
-    )},
-    {"testTypedef reply", ?_assertEqual(
-      i64,
-      thrift_test_thrift:function_info(testTypedef, reply_type)
-    )},
-    {"testTypedef exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testTypedef, exceptions)
-    )},
-    {"testMapMap params", ?_assertEqual(
-      {struct, [
-        {1, i32}
-      ]},
-      thrift_test_thrift:function_info(testMapMap, params_type)
-    )},
-    {"testMapMap reply", ?_assertEqual(
-      {map, i32, {map, i32,i32}},
-      thrift_test_thrift:function_info(testMapMap, reply_type)
-    )},
-    {"testMapMap exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testMapMap, exceptions)
-    )},
-    {"testInsanity params", ?_assertEqual(
-      {struct, [
-        {1, {struct, {thrift_test_types, 'thrift.test.Insanity'}}}
-      ]},
-      thrift_test_thrift:function_info(testInsanity, params_type)
-    )},
-    {"testInsanity reply", ?_assertEqual(
-      {map, i64, {map, i32, {struct, {'thrift_test_types', 'thrift.test.Insanity'}}}},
-      thrift_test_thrift:function_info(testInsanity, reply_type)
-    )},
-    {"testInsanity exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testInsanity, exceptions)
-    )},
-    {"testMulti params", ?_assertEqual(
-      {struct, [
-        {1, byte},
-        {2, i32},
-        {3, i64},
-        {4, {map, i16, string}},
-        {5, i32},
-        {6, i64}
-      ]},
-      thrift_test_thrift:function_info(testMulti, params_type)
-    )},
-    {"testMulti reply", ?_assertEqual(
-      {struct, {thrift_test_types, 'thrift.test.Xtruct'}},
-      thrift_test_thrift:function_info(testMulti, reply_type)
-    )},
-    {"testMulti exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testMulti, exceptions)
-    )},
-    {"testException params", ?_assertEqual(
-      {struct, [{1, string}]},
-      thrift_test_thrift:function_info(testException, params_type)
-    )},
-    {"testException reply", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testException, reply_type)
-    )},
-    {"testException exceptions", ?_assertEqual(
-      {struct, [
-        {1, {struct, {thrift_test_types, 'thrift.test.Xception'}}}
-      ]},
-      thrift_test_thrift:function_info(testException, exceptions)
-    )},
-    {"testMultiException params", ?_assertEqual(
-      {struct, [{1, string}, {2, string}]},
-      thrift_test_thrift:function_info(testMultiException, params_type)
-    )},
-    {"testMultiException reply", ?_assertEqual(
-      {struct, {thrift_test_types, 'thrift.test.Xtruct'}},
-      thrift_test_thrift:function_info(testMultiException, reply_type)
-    )},
-    {"testMultiException exceptions", ?_assertEqual(
-      {struct, [
-        {1, {struct, {thrift_test_types, 'thrift.test.Xception'}}},
-        {2, {struct, {thrift_test_types, 'thrift.test.Xception2'}}}
-      ]},
-      thrift_test_thrift:function_info(testMultiException, exceptions)
-    )},
-    {"testOneway params", ?_assertEqual(
-      {struct, [{1, i32}]},
-      thrift_test_thrift:function_info(testOneway, params_type)
-    )},
-    {"testOneway reply", ?_assertEqual(
-      oneway_void,
-      thrift_test_thrift:function_info(testOneway, reply_type)
-    )},
-    {"testOneway exceptions", ?_assertEqual(
-      {struct, []},
-      thrift_test_thrift:function_info(testOneway, exceptions)
-    )},
-    {"blahBlah params", ?_assertEqual(
-      {struct, []},
-      second_service_thrift:function_info(blahBlah, params_type)
-    )},
-    {"blahBlah reply", ?_assertEqual(
-      {struct, []},
-      second_service_thrift:function_info(blahBlah, reply_type)
-    )},
-    {"blahBlah exceptions", ?_assertEqual(
-      {struct, []},
-      second_service_thrift:function_info(blahBlah, exceptions)
-    )},
-    {"secondtestString params", ?_assertEqual(
-      {struct, [{1, string}]},
-      second_service_thrift:function_info(secondtestString, params_type)
-    )},
-    {"secondtestString reply", ?_assertEqual(
-      string,
-      second_service_thrift:function_info(secondtestString, reply_type)
-    )},
-    {"secondtestString exceptions", ?_assertEqual(
-      {struct, []},
-      second_service_thrift:function_info(secondtestString, exceptions)
-    )}
-  ].
diff --git a/vendor/git.apache.org/thrift.git/lib/go/Makefile.am b/vendor/git.apache.org/thrift.git/lib/go/Makefile.am
deleted file mode 100644
index ff946ea..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SUBDIRS = .
-
-if WITH_TESTS
-SUBDIRS += test
-endif
-
-install:
-	@echo '##############################################################'
-	@echo '##############################################################'
-	@echo 'The Go client library should be installed via "go get", please see /lib/go/README.md'
-	@echo '##############################################################'
-	@echo '##############################################################'
-
-check-local:
-	$(GO) test ./thrift
-
-all-local:
-	$(GO) build ./thrift
-
-EXTRA_DIST = \
-	thrift \
-	coding_standards.md \
-	README.md
diff --git a/vendor/git.apache.org/thrift.git/lib/go/README.md b/vendor/git.apache.org/thrift.git/lib/go/README.md
deleted file mode 100644
index 7440474..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-Thrift Go Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-
-Using Thrift with Go
-====================
-
-In following Go conventions, we recommend you use the 'go' tool to install
-Thrift for go.
-
-    $ go get git.apache.org/thrift.git/lib/go/thrift/...
-
-Will retrieve and install the most recent version of the package.
-
-
-A note about optional fields
-============================
-
-The thrift-to-Go compiler tries to represent thrift IDL structs as Go structs.
-We must be able to distinguish between optional fields that are set to their
-default value and optional values which are actually unset, so the generated
-code represents optional fields via pointers.
-
-This is generally intuitive and works well much of the time, but Go does not
-have a syntax for creating a pointer to a constant in a single expression. That
-is, given a struct like
-
-    struct SomeIDLType {
-    	OptionalField *int32
-    }
-
-, the following will not compile:
-
-    x := &SomeIDLType{
-    	OptionalField: &(3),
-    }
-
-(Nor is there any other syntax that's built in to the language)
-
-As such, we provide some helpers that do just this under lib/go/thrift/. E.g.,
-
-    x := &SomeIDLType{
-    	OptionalField: thrift.Int32Ptr(3),
-    }
-
-And so on. The code generator also creates analogous helpers for user-defined
-typedefs and enums.
-
-Adding custom tags to generated Thrift structs
-==============================================
-
-You can add tags to the auto-generated thrift structs using the following format:
-
-    struct foo {
-      1: required string Bar (go.tag = "some_tag:\"some_tag_value\"")
-    }
-    
-which will generate:
-
-    type Foo struct {
-      Bar string `thrift:"bar,1,required" some_tag:"some_tag_value"`
-    }
diff --git a/vendor/git.apache.org/thrift.git/lib/go/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/go/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/BinaryKeyTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/BinaryKeyTest.thrift
deleted file mode 100644
index 71cb614..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/BinaryKeyTest.thrift
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Make sure that thrift produce compilable code for binary key
-struct testStruct {
-  1: required map<binary,string> bin_to_string
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/DontExportRWTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/DontExportRWTest.thrift
deleted file mode 100644
index 39e5a6f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/DontExportRWTest.thrift
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-struct InnerStruct {
-  1: required string id
-}
-
-struct TestStruct {
-  1: required string id
-  2: required InnerStruct inner
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/ErrorTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/ErrorTest.thrift
deleted file mode 100644
index 33b6644..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/ErrorTest.thrift
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-struct TestStruct 
-{
-  1: map<string, string> m,
-  2: list<string> l,
-  3: set<string> s,
-  4: i32 i
-}
-
-service ErrorTest 
-{
-  TestStruct         testStruct(1: TestStruct thing)
-  string             testString(1: string s)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/GoTagTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/GoTagTest.thrift
deleted file mode 100644
index 508b3b6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/GoTagTest.thrift
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-struct tagged {
-    1: string string_thing,
-    2: i64 int_thing (go.tag = "json:\"int_thing,string\""),
-    3: optional i64 optional_int_thing
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/IgnoreInitialismsTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/IgnoreInitialismsTest.thrift
deleted file mode 100644
index 0b30e9e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/IgnoreInitialismsTest.thrift
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-struct IgnoreInitialismsTest {
-    1: i64 id,
-    2: i64 my_id,
-    3: i64 num_cpu,
-    4: i64 num_gpu,
-    5: i64 my_ID,
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/IncludesTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/IncludesTest.thrift
deleted file mode 100644
index 3f60321..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/IncludesTest.thrift
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-include "ThriftTest.thrift"
-include "NamespacedTest.thrift"
-
-const ThriftTest.UserId USERID = 42
-const NamespacedTest.UserId USERID1 = 41
-const ThriftTest.MapType MAPCONSTANT = {'hello':{}, 'goodnight':{}}
-
-const i32 TWO = NamespacedTest.Stuff.TWO
-const i32 THREE = NamespacedTest.THREE
-
-struct testStruct {
-  1: list<ThriftTest.Numberz> listNumbers
-}
-
-struct TestStruct2 {
-  1: testStruct blah,
-  2: ThriftTest.UserId id,
-  3: NamespacedTest.Stuff stuff,
-}
-
-service testService extends ThriftTest.SecondService {
-  ThriftTest.CrazyNesting getCrazyNesting(
-    1: ThriftTest.StructA a,
-    2: ThriftTest.Numberz numbers
-  ) throws(1: ThriftTest.Xception err1),
-
-  void getSomeValue_DO_NOT_CALL(),
-}
-
-service ExtendedService extends testService {
-  void extendedMethod(),
-  NamespacedTest.StuffStruct extendedMethod2(),
-}
-
-service Extended2Service extends NamespacedTest.NamespacedService {
-  void extendedMethod3(),
-}
-
-typedef map<ThriftTest.UserId, map<NamespacedTest.UserId, list<TestStruct2> > > ComplexMapType
-
-struct ComplexMapStruct {
-  1: ComplexMapType complex,
-}
-
-service ComplexMapService {
-  ComplexMapStruct transformMap(1: ComplexMapStruct input),
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/InitialismsTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/InitialismsTest.thrift
deleted file mode 100644
index ad86ac1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/InitialismsTest.thrift
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-struct InitialismsTest {
-    1: string user_id,
-    2: string server_url,
-    3: string id, 
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/go/test/Makefile.am
deleted file mode 100644
index bbcec96..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-THRIFTARGS = -out gopath/src/ --gen go:thrift_import=thrift
-THRIFTTEST = $(top_srcdir)/test/ThriftTest.thrift
-
-# Thrift for GO has problems with complex map keys: THRIFT-2063
-gopath: $(THRIFT) $(THRIFTTEST) \
-				IncludesTest.thrift \
-				NamespacedTest.thrift \
-				MultiplexedProtocolTest.thrift \
-				OnewayTest.thrift \
-				OptionalFieldsTest.thrift \
-				ServicesTest.thrift \
-				GoTagTest.thrift \
-				TypedefFieldTest.thrift \
-				RefAnnotationFieldsTest.thrift \
-				UnionDefaultValueTest.thrift \
-				ErrorTest.thrift \
-				NamesTest.thrift \
-				InitialismsTest.thrift \
-				DontExportRWTest.thrift \
-				dontexportrwtest/compile_test.go \
-				IgnoreInitialismsTest.thrift
-	mkdir -p gopath/src
-	grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift
-	$(THRIFT) $(THRIFTARGS) -r IncludesTest.thrift
-	$(THRIFT) $(THRIFTARGS) BinaryKeyTest.thrift
-	$(THRIFT) $(THRIFTARGS) MultiplexedProtocolTest.thrift
-	$(THRIFT) $(THRIFTARGS) OnewayTest.thrift
-	$(THRIFT) $(THRIFTARGS) OptionalFieldsTest.thrift
-	$(THRIFT) $(THRIFTARGS) ServicesTest.thrift
-	$(THRIFT) $(THRIFTARGS) GoTagTest.thrift
-	$(THRIFT) $(THRIFTARGS) TypedefFieldTest.thrift
-	$(THRIFT) $(THRIFTARGS) RefAnnotationFieldsTest.thrift
-	$(THRIFT) $(THRIFTARGS) UnionDefaultValueTest.thrift
-	$(THRIFT) $(THRIFTARGS) ErrorTest.thrift
-	$(THRIFT) $(THRIFTARGS) NamesTest.thrift
-	$(THRIFT) $(THRIFTARGS) InitialismsTest.thrift
-	$(THRIFT) $(THRIFTARGS),read_write_private DontExportRWTest.thrift
-	$(THRIFT) $(THRIFTARGS),ignore_initialisms IgnoreInitialismsTest.thrift
-	GOPATH=`pwd`/gopath $(GO) get github.com/golang/mock/gomock
-	ln -nfs ../../../thrift gopath/src/thrift
-	ln -nfs ../../tests gopath/src/tests
-	cp -r ./dontexportrwtest gopath/src
-	touch gopath
-
-check: gopath
-	GOPATH=`pwd`/gopath $(GO) build \
-				includestest \
-				binarykeytest \
-				servicestest \
-				typedeffieldtest \
-				refannotationfieldstest \
-				errortest	\
-				namestest \
-				initialismstest \
-				dontexportrwtest \
-				ignoreinitialismstest
-	GOPATH=`pwd`/gopath $(GO) test thrift tests dontexportrwtest
-
-clean-local:
-	$(RM) -r gopath ThriftTest.thrift gen-go
-
-client: stubs
-	$(GO) run TestClient.go
-
-EXTRA_DIST = \
-	dontexportrwtest \
-	tests \
-	BinaryKeyTest.thrift \
-	GoTagTest.thrift \
-	IncludesTest.thrift \
-	MultiplexedProtocolTest.thrift \
-	NamespacedTest.thrift \
-	OnewayTest.thrift \
-	OptionalFieldsTest.thrift \
-	RefAnnotationFieldsTest.thrift \
-	UnionDefaultValueTest.thrift \
-	ServicesTest.thrift \
-	TypedefFieldTest.thrift \
-	ErrorTest.thrift \
-	NamesTest.thrift \
-	InitialismsTest.thrift \
-	DontExportRWTest.thrift \
-	IgnoreInitialismsTest.thrift
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/MultiplexedProtocolTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/MultiplexedProtocolTest.thrift
deleted file mode 100644
index b263f59..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/MultiplexedProtocolTest.thrift
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-service First {
-    i64 returnOne();
-}
-
-service Second {
-    i64 returnTwo();
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/NamesTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/NamesTest.thrift
deleted file mode 100644
index e7e9563..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/NamesTest.thrift
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-struct NamesTest {
-    1: required string type
-}
-
-service NameCollisionOne
-{
-    void blahBlah()
-}
-
-service NameCollisionTwo
-{
-    void blahBlah()
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/NamespacedTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/NamespacedTest.thrift
deleted file mode 100644
index a910350..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/NamespacedTest.thrift
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-include "ThriftTest.thrift"
-
-namespace go lib.go.test.namespacedtest
-
-enum Stuff {
-  ONE = 1,
-  TWO = 2,
-}
-
-const i32 THREE = 3;
-
-typedef i64 UserId
-
-struct StuffStruct {
-  2: Stuff stuff,
-}
-
-service NamespacedService {
-  ThriftTest.UserId getUserID(),
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/OnewayTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/OnewayTest.thrift
deleted file mode 100644
index 3242f80..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/OnewayTest.thrift
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-service OneWay {
-    oneway void hi(1: i64 i, 2: string s)
-    void emptyfunc()
-    i64 echo_int(1: i64 param)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/OptionalFieldsTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/OptionalFieldsTest.thrift
deleted file mode 100644
index 2afc157..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/OptionalFieldsTest.thrift
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-struct structA {
- 1: required i64 sa_i
-}
-
-struct all_optional {
- 1: optional string s = "DEFAULT",
- 2: optional i64 i = 42,
- 3: optional bool b = false,
- 4: optional string s2,
- 5: optional i64 i2,
- 6: optional bool b2,
- 7: optional structA aa,
- 9: optional list<i64> l,
- 10: optional list<i64> l2 = [1, 2],
- 11: optional map<i64, i64> m,
- 12: optional map<i64, i64> m2 = {1:2, 3:4},
- 13: optional binary bin,
- 14: optional binary bin2 = "asdf",
-}
-
-struct structB {
- 1: required structA required_struct_thing
- 2: optional structA optional_struct_thing
-}
-
-struct structC {
- 1: string s,
- 2: required i32 i,
- 3: optional bool b,
- 4: required string s2,
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/RefAnnotationFieldsTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/RefAnnotationFieldsTest.thrift
deleted file mode 100644
index b7f28c2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/RefAnnotationFieldsTest.thrift
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-struct structA {
- 1: required i64 sa_i
-}
-
-struct all_referenced {
- 1: optional string s = "DEFAULT" (cpp.ref = ""),
- 2: optional i64 i = 42 (cpp.ref = ""),
- 3: optional bool b = false (cpp.ref = ""),
- 4: optional string s2 (cpp.ref = ""),
- 5: optional i64 i2 (cpp.ref = ""),
- 6: optional bool b2 (cpp.ref = ""),
- 7: optional structA aa (cpp.ref = ""),
- 9: optional list<i64> l (cpp.ref = ""),
- 10: optional list<i64> l2 = [1, 2] (cpp.ref = ""),
- 11: optional map<i64, i64> m (cpp.ref = ""),
- 12: optional map<i64, i64> m2 = {1:2, 3:4} (cpp.ref = ""),
- 13: optional binary bin (cpp.ref = ""),
- 14: optional binary bin2 = "asdf" (cpp.ref = ""),
-
- 15: required string ref_s = "DEFAULT" (cpp.ref = ""),
- 16: required i64 ref_i = 42 (cpp.ref = ""),
- 17: required bool ref_b = false (cpp.ref = ""),
- 18: required string ref_s2 (cpp.ref = ""),
- 19: required i64 ref_i2 (cpp.ref = ""),
- 20: required bool ref_b2 (cpp.ref = ""),
- 21: required structA ref_aa (cpp.ref = ""),
- 22: required list<i64> ref_l (cpp.ref = ""),
- 23: required list<i64> ref_l2 = [1, 2] (cpp.ref = ""),
- 24: required map<i64, i64> ref_m (cpp.ref = ""),
- 25: required map<i64, i64> ref_m2 = {1:2, 3:4} (cpp.ref = ""),
- 26: required binary ref_bin (cpp.ref = ""),
- 27: required binary ref_bin2 = "asdf" (cpp.ref = ""),
-
-}
-
-struct structB {
- 1: required structA required_struct_thing
- 2: optional structA optional_struct_thing
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/ServicesTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/ServicesTest.thrift
deleted file mode 100644
index 882b03a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/ServicesTest.thrift
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# We are only testing that generated code compiles, no correctness checking is done
-
-exception moderate_disaster {
-  1: i32 errorCode,
-  2: string message
-}
-
-exception total_disaster {
-  1: string message
-  2: optional bool president_was_woken_up = false
-}
-
-struct struct_a {
-  1: required i64 whatever
-}
-
-service a_serv {
-    void voidfunc(),
-    void void_with_1ex() throws(1: moderate_disaster err1)
-    void void_with_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    string stringfunc()
-    string stringfunc_1ex() throws(1: moderate_disaster err1)
-    string stringfunc_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    i64 i64func()
-    i64 i64func_1ex() throws(1: moderate_disaster err1)
-    i64 i64func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    list<string> list_of_strings_func()
-    list<string> list_of_strings_func_1ex() throws(1: moderate_disaster err1)
-    list<string> list_of_strings_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    map<i64,string> map_func()
-    map<i64,string> map_func_1ex() throws(1: moderate_disaster err1)
-    map<i64,string> map_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    struct_a struct_a_func()
-    struct_a struct_a_func_1ex() throws(1: moderate_disaster err1)
-    struct_a struct_a_func_2ex() throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    void voidfunc_1int(1: i64 i),
-    void void_with_1ex_1int(1: i64 i) throws(1: moderate_disaster err1)
-    void void_with_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    string stringfunc_1int(1: i64 i)
-    string stringfunc_1ex_1int(1: i64 i) throws(1: moderate_disaster err1)
-    string stringfunc_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    i64 i64func_1int(1: i64 i)
-    i64 i64func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1)
-    i64 i64func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    list<string> list_of_strings_func_1int(1: i64 i)
-    list<string> list_of_strings_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1)
-    list<string> list_of_strings_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    map<i64,string> map_func_1int(1: i64 i)
-    map<i64,string> map_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1)
-    map<i64,string> map_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    struct_a struct_a_func_1int(1: i64 i)
-    struct_a struct_a_func_1ex_1int(1: i64 i) throws(1: moderate_disaster err1)
-    struct_a struct_a_func_2ex_1int(1: i64 i) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    void voidfunc_1int_1s(1: i64 i, 2: string s),
-    void void_with_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1)
-    void void_with_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    string stringfunc_1int_1s(1: i64 i, 2: string s)
-    string stringfunc_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1)
-    string stringfunc_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    i64 i64func_1int_1s(1: i64 i, 2: string s)
-    i64 i64func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1)
-    i64 i64func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    list<string> list_of_strings_func_1int_1s(1: i64 i, 2: string s)
-    list<string> list_of_strings_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1)
-    list<string> list_of_strings_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    map<i64,string> map_func_1int_1s(1: i64 i, 2: string s)
-    map<i64,string> map_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1)
-    map<i64,string> map_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    struct_a struct_a_func_1int_1s(1: i64 i, 2: string s)
-    struct_a struct_a_func_1ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1)
-    struct_a struct_a_func_2ex_1int_1s(1: i64 i, 2: string s) throws(1: moderate_disaster err1, 2:total_disaster err2)
-
-    struct_a struct_a_func_1struct_a(1: struct_a st)
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/TypedefFieldTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/TypedefFieldTest.thrift
deleted file mode 100644
index 390e8c8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/TypedefFieldTest.thrift
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# We are only testing that generated code compiles, no correctness checking is done
-
-enum Details {
-  Everything = 0
-  StateOnly = 1
-  StateAndOptions = 2
-  SomethingElse = 3
-}
-
-typedef list< Details>  DetailsWanted
-
-struct BaseRequest {
-  1 : optional string RequestID
-}
-
-struct GetMyDetails {
-  1 : required BaseRequest base_
-  2 : required string ObjectID
-  3 : optional DetailsWanted DetailsWanted
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/UnionDefaultValueTest.thrift b/vendor/git.apache.org/thrift.git/lib/go/test/UnionDefaultValueTest.thrift
deleted file mode 100644
index 4c93480..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/UnionDefaultValueTest.thrift
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-struct Option1 {
-}
-
-struct Option2 {
-  1: optional string name
-}
-
-union Descendant {
-  1: Option1 option1
-  2: Option2 option2
-}
-
-struct TestStruct {
-  1: optional Descendant descendant = { "option1": {}}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/dontexportrwtest/compile_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/dontexportrwtest/compile_test.go
deleted file mode 100644
index 2b877e3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/dontexportrwtest/compile_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package dontexportrwtest
-
-import (
-	"fmt"
-	"testing"
-)
-
-// Make sure that thrift generates non-exported read/write methods if
-// read_write_private option is specified
-func TestReadWriteMethodsArePrivate(t *testing.T) {
-	// This will only compile if read/write methods exist
-	s := NewTestStruct()
-	fmt.Sprintf("%v", s.read)
-	fmt.Sprintf("%v", s.write)
-
-	is := NewInnerStruct()
-	fmt.Sprintf("%v", is.read)
-	fmt.Sprintf("%v", is.write)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/binary_key_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/binary_key_test.go
deleted file mode 100644
index aa96193..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/binary_key_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"binarykeytest"
-	"testing"
-)
-
-func TestBinaryMapKeyGeneratesString(t *testing.T) {
-	s := binarykeytest.NewTestStruct()
-	//This will only compile if BinToString has type of map[string]string
-	s.BinToString = make(map[string]string)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/client_error_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/client_error_test.go
deleted file mode 100644
index 838883d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/client_error_test.go
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"github.com/golang/mock/gomock"
-	"errors"
-	"errortest"
-	"testing"
-	"thrift"
-)
-
-// TestCase: Comprehensive call and reply workflow in the client.
-// Setup mock to fail at a certain position. Return true if position exists otherwise false.
-func prepareClientCallReply(protocol *MockTProtocol, failAt int, failWith error) bool {
-	var err error = nil
-
-	if failAt == 0 {
-		err = failWith
-	}
-	last := protocol.EXPECT().WriteMessageBegin("testStruct", thrift.CALL, int32(1)).Return(err)
-	if failAt == 0 {
-		return true
-	}
-	if failAt == 1 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteStructBegin("testStruct_args").Return(err).After(last)
-	if failAt == 1 {
-		return true
-	}
-	if failAt == 2 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldBegin("thing", thrift.TType(thrift.STRUCT), int16(1)).Return(err).After(last)
-	if failAt == 2 {
-		return true
-	}
-	if failAt == 3 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteStructBegin("TestStruct").Return(err).After(last)
-	if failAt == 3 {
-		return true
-	}
-	if failAt == 4 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldBegin("m", thrift.TType(thrift.MAP), int16(1)).Return(err).After(last)
-	if failAt == 4 {
-		return true
-	}
-	if failAt == 5 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteMapBegin(thrift.TType(thrift.STRING), thrift.TType(thrift.STRING), 0).Return(err).After(last)
-	if failAt == 5 {
-		return true
-	}
-	if failAt == 6 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteMapEnd().Return(err).After(last)
-	if failAt == 6 {
-		return true
-	}
-	if failAt == 7 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldEnd().Return(err).After(last)
-	if failAt == 7 {
-		return true
-	}
-	if failAt == 8 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldBegin("l", thrift.TType(thrift.LIST), int16(2)).Return(err).After(last)
-	if failAt == 8 {
-		return true
-	}
-	if failAt == 9 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteListBegin(thrift.TType(thrift.STRING), 0).Return(err).After(last)
-	if failAt == 9 {
-		return true
-	}
-	if failAt == 10 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteListEnd().Return(err).After(last)
-	if failAt == 10 {
-		return true
-	}
-	if failAt == 11 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldEnd().Return(err).After(last)
-	if failAt == 11 {
-		return true
-	}
-	if failAt == 12 {
-		err = failWith
-	}
-
-	last = protocol.EXPECT().WriteFieldBegin("s", thrift.TType(thrift.SET), int16(3)).Return(err).After(last)
-	if failAt == 12 {
-		return true
-	}
-	if failAt == 13 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteSetBegin(thrift.TType(thrift.STRING), 0).Return(err).After(last)
-	if failAt == 13 {
-		return true
-	}
-	if failAt == 14 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteSetEnd().Return(err).After(last)
-	if failAt == 14 {
-		return true
-	}
-	if failAt == 15 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldEnd().Return(err).After(last)
-	if failAt == 15 {
-		return true
-	}
-	if failAt == 16 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldBegin("i", thrift.TType(thrift.I32), int16(4)).Return(err).After(last)
-	if failAt == 16 {
-		return true
-	}
-	if failAt == 17 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteI32(int32(3)).Return(err).After(last)
-	if failAt == 17 {
-		return true
-	}
-	if failAt == 18 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldEnd().Return(err).After(last)
-	if failAt == 18 {
-		return true
-	}
-	if failAt == 19 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldStop().Return(err).After(last)
-	if failAt == 19 {
-		return true
-	}
-	if failAt == 20 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteStructEnd().Return(err).After(last)
-	if failAt == 20 {
-		return true
-	}
-	if failAt == 21 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldEnd().Return(err).After(last)
-	if failAt == 21 {
-		return true
-	}
-	if failAt == 22 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteFieldStop().Return(err).After(last)
-	if failAt == 22 {
-		return true
-	}
-	if failAt == 23 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteStructEnd().Return(err).After(last)
-	if failAt == 23 {
-		return true
-	}
-	if failAt == 24 {
-		err = failWith
-	}
-	last = protocol.EXPECT().WriteMessageEnd().Return(err).After(last)
-	if failAt == 24 {
-		return true
-	}
-	if failAt == 25 {
-		err = failWith
-	}
-	last = protocol.EXPECT().Flush().Return(err).After(last)
-	if failAt == 25 {
-		return true
-	}
-	if failAt == 26 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadMessageBegin().Return("testStruct", thrift.REPLY, int32(1), err).After(last)
-	if failAt == 26 {
-		return true
-	}
-	if failAt == 27 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadStructBegin().Return("testStruct_args", err).After(last)
-	if failAt == 27 {
-		return true
-	}
-	if failAt == 28 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("_", thrift.TType(thrift.STRUCT), int16(0), err).After(last)
-	if failAt == 28 {
-		return true
-	}
-	if failAt == 29 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadStructBegin().Return("TestStruct", err).After(last)
-	if failAt == 29 {
-		return true
-	}
-	if failAt == 30 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("m", thrift.TType(thrift.MAP), int16(1), err).After(last)
-	if failAt == 30 {
-		return true
-	}
-	if failAt == 31 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadMapBegin().Return(thrift.TType(thrift.STRING), thrift.TType(thrift.STRING), 0, err).After(last)
-	if failAt == 31 {
-		return true
-	}
-	if failAt == 32 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadMapEnd().Return(err).After(last)
-	if failAt == 32 {
-		return true
-	}
-	if failAt == 33 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldEnd().Return(err).After(last)
-	if failAt == 33 {
-		return true
-	}
-	if failAt == 34 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("l", thrift.TType(thrift.LIST), int16(2), err).After(last)
-	if failAt == 34 {
-		return true
-	}
-	if failAt == 35 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadListBegin().Return(thrift.TType(thrift.STRING), 0, err).After(last)
-	if failAt == 35 {
-		return true
-	}
-	if failAt == 36 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadListEnd().Return(err).After(last)
-	if failAt == 36 {
-		return true
-	}
-	if failAt == 37 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldEnd().Return(err).After(last)
-	if failAt == 37 {
-		return true
-	}
-	if failAt == 38 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("s", thrift.TType(thrift.SET), int16(3), err).After(last)
-	if failAt == 38 {
-		return true
-	}
-	if failAt == 39 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadSetBegin().Return(thrift.TType(thrift.STRING), 0, err).After(last)
-	if failAt == 39 {
-		return true
-	}
-	if failAt == 40 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadSetEnd().Return(err).After(last)
-	if failAt == 40 {
-		return true
-	}
-	if failAt == 41 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldEnd().Return(err).After(last)
-	if failAt == 41 {
-		return true
-	}
-	if failAt == 42 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("i", thrift.TType(thrift.I32), int16(4), err).After(last)
-	if failAt == 42 {
-		return true
-	}
-	if failAt == 43 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadI32().Return(int32(3), err).After(last)
-	if failAt == 43 {
-		return true
-	}
-	if failAt == 44 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldEnd().Return(err).After(last)
-	if failAt == 44 {
-		return true
-	}
-	if failAt == 45 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("_", thrift.TType(thrift.STOP), int16(5), err).After(last)
-	if failAt == 45 {
-		return true
-	}
-	if failAt == 46 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadStructEnd().Return(err).After(last)
-	if failAt == 46 {
-		return true
-	}
-	if failAt == 47 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldEnd().Return(err).After(last)
-	if failAt == 47 {
-		return true
-	}
-	if failAt == 48 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("_", thrift.TType(thrift.STOP), int16(1), err).After(last)
-	if failAt == 48 {
-		return true
-	}
-	if failAt == 49 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadStructEnd().Return(err).After(last)
-	if failAt == 49 {
-		return true
-	}
-	if failAt == 50 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadMessageEnd().Return(err).After(last)
-	if failAt == 50 {
-		return true
-	}
-	return false
-}
-
-// TestCase: Comprehensive call and reply workflow in the client.
-// Expecting TTransportError on fail.
-func TestClientReportTTransportErrors(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	transport := thrift.NewTMemoryBuffer()
-
-	thing := errortest.NewTestStruct()
-	thing.M = make(map[string]string)
-	thing.L = make([]string, 0)
-	thing.S = make(map[string]struct{})
-	thing.I = 3
-
-	err := thrift.NewTTransportException(thrift.TIMED_OUT, "test")
-	for i := 0; ; i++ {
-		protocol := NewMockTProtocol(mockCtrl)
-		if !prepareClientCallReply(protocol, i, err) {
-			return
-		}
-		client := errortest.NewErrorTestClientProtocol(transport, protocol, protocol)
-		_, retErr := client.TestStruct(thing)
-		mockCtrl.Finish()
-		err2, ok := retErr.(thrift.TTransportException)
-		if !ok {
-			t.Fatal("Expected a TTrasportException")
-		}
-
-		if err2.TypeId() != thrift.TIMED_OUT {
-			t.Fatal("Expected TIMED_OUT error")
-		}
-	}
-}
-
-// TestCase: Comprehensive call and reply workflow in the client.
-// Expecting TTProtocolErrors on fail.
-func TestClientReportTProtocolErrors(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	transport := thrift.NewTMemoryBuffer()
-
-	thing := errortest.NewTestStruct()
-	thing.M = make(map[string]string)
-	thing.L = make([]string, 0)
-	thing.S = make(map[string]struct{})
-	thing.I = 3
-
-	err := thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, errors.New("test"))
-	for i := 0; ; i++ {
-		protocol := NewMockTProtocol(mockCtrl)
-		if !prepareClientCallReply(protocol, i, err) {
-			return
-		}
-		client := errortest.NewErrorTestClientProtocol(transport, protocol, protocol)
-		_, retErr := client.TestStruct(thing)
-		mockCtrl.Finish()
-		err2, ok := retErr.(thrift.TProtocolException)
-		if !ok {
-			t.Fatal("Expected a TProtocolException")
-		}
-		if err2.TypeId() != thrift.INVALID_DATA {
-			t.Fatal("Expected INVALID_DATA error")
-		}
-	}
-}
-
-// TestCase: call and reply with exception workflow in the client.
-// Setup mock to fail at a certain position. Return true if position exists otherwise false.
-func prepareClientCallException(protocol *MockTProtocol, failAt int, failWith error) bool {
-	var err error = nil
-
-	// No need to test failure in this block, because it is covered in other test cases
-	last := protocol.EXPECT().WriteMessageBegin("testString", thrift.CALL, int32(1))
-	last = protocol.EXPECT().WriteStructBegin("testString_args").After(last)
-	last = protocol.EXPECT().WriteFieldBegin("s", thrift.TType(thrift.STRING), int16(1)).After(last)
-	last = protocol.EXPECT().WriteString("test").After(last)
-	last = protocol.EXPECT().WriteFieldEnd().After(last)
-	last = protocol.EXPECT().WriteFieldStop().After(last)
-	last = protocol.EXPECT().WriteStructEnd().After(last)
-	last = protocol.EXPECT().WriteMessageEnd().After(last)
-	last = protocol.EXPECT().Flush().After(last)
-
-	// Reading the exception, might fail.
-	if failAt == 0 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadMessageBegin().Return("testString", thrift.EXCEPTION, int32(1), err).After(last)
-	if failAt == 0 {
-		return true
-	}
-	if failAt == 1 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadStructBegin().Return("TApplicationException", err).After(last)
-	if failAt == 1 {
-		return true
-	}
-	if failAt == 2 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("message", thrift.TType(thrift.STRING), int16(1), err).After(last)
-	if failAt == 2 {
-		return true
-	}
-	if failAt == 3 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadString().Return("test", err).After(last)
-	if failAt == 3 {
-		return true
-	}
-	if failAt == 4 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldEnd().Return(err).After(last)
-	if failAt == 4 {
-		return true
-	}
-	if failAt == 5 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("type", thrift.TType(thrift.I32), int16(2), err).After(last)
-	if failAt == 5 {
-		return true
-	}
-	if failAt == 6 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadI32().Return(int32(thrift.PROTOCOL_ERROR), err).After(last)
-	if failAt == 6 {
-		return true
-	}
-	if failAt == 7 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldEnd().Return(err).After(last)
-	if failAt == 7 {
-		return true
-	}
-	if failAt == 8 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadFieldBegin().Return("_", thrift.TType(thrift.STOP), int16(2), err).After(last)
-	if failAt == 8 {
-		return true
-	}
-	if failAt == 9 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadStructEnd().Return(err).After(last)
-	if failAt == 9 {
-		return true
-	}
-	if failAt == 10 {
-		err = failWith
-	}
-	last = protocol.EXPECT().ReadMessageEnd().Return(err).After(last)
-	if failAt == 10 {
-		return true
-	}
-
-	return false
-}
-
-// TestCase: call and reply with exception workflow in the client.
-func TestClientCallException(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	transport := thrift.NewTMemoryBuffer()
-
-	err := thrift.NewTTransportException(thrift.TIMED_OUT, "test")
-	for i := 0; ; i++ {
-		protocol := NewMockTProtocol(mockCtrl)
-		willComplete := !prepareClientCallException(protocol, i, err)
-
-		client := errortest.NewErrorTestClientProtocol(transport, protocol, protocol)
-		_, retErr := client.TestString("test")
-		mockCtrl.Finish()
-
-		if !willComplete {
-			err2, ok := retErr.(thrift.TTransportException)
-			if !ok {
-				t.Fatal("Expected a TTransportException")
-			}
-			if err2.TypeId() != thrift.TIMED_OUT {
-				t.Fatal("Expected TIMED_OUT error")
-			}
-		} else {
-			err2, ok := retErr.(thrift.TApplicationException)
-			if !ok {
-				t.Fatal("Expected a TApplicationException")
-			}
-			if err2.TypeId() != thrift.PROTOCOL_ERROR {
-				t.Fatal("Expected PROTOCOL_ERROR error")
-			}
-			break
-		}
-	}
-}
-
-// TestCase: Mismatching sequence id has been received in the client.
-func TestClientSeqIdMismatch(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	transport := thrift.NewTMemoryBuffer()
-	protocol := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		protocol.EXPECT().WriteMessageBegin("testString", thrift.CALL, int32(1)),
-		protocol.EXPECT().WriteStructBegin("testString_args"),
-		protocol.EXPECT().WriteFieldBegin("s", thrift.TType(thrift.STRING), int16(1)),
-		protocol.EXPECT().WriteString("test"),
-		protocol.EXPECT().WriteFieldEnd(),
-		protocol.EXPECT().WriteFieldStop(),
-		protocol.EXPECT().WriteStructEnd(),
-		protocol.EXPECT().WriteMessageEnd(),
-		protocol.EXPECT().Flush(),
-		protocol.EXPECT().ReadMessageBegin().Return("testString", thrift.REPLY, int32(2), nil),
-	)
-
-	client := errortest.NewErrorTestClientProtocol(transport, protocol, protocol)
-	_, err := client.TestString("test")
-	mockCtrl.Finish()
-	appErr, ok := err.(thrift.TApplicationException)
-	if !ok {
-		t.Fatal("Expected TApplicationException")
-	}
-	if appErr.TypeId() != thrift.BAD_SEQUENCE_ID {
-		t.Fatal("Expected BAD_SEQUENCE_ID error")
-	}
-}
-
-// TestCase: Wrong method name has been received in the client.
-func TestClientWrongMethodName(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	transport := thrift.NewTMemoryBuffer()
-	protocol := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		protocol.EXPECT().WriteMessageBegin("testString", thrift.CALL, int32(1)),
-		protocol.EXPECT().WriteStructBegin("testString_args"),
-		protocol.EXPECT().WriteFieldBegin("s", thrift.TType(thrift.STRING), int16(1)),
-		protocol.EXPECT().WriteString("test"),
-		protocol.EXPECT().WriteFieldEnd(),
-		protocol.EXPECT().WriteFieldStop(),
-		protocol.EXPECT().WriteStructEnd(),
-		protocol.EXPECT().WriteMessageEnd(),
-		protocol.EXPECT().Flush(),
-		protocol.EXPECT().ReadMessageBegin().Return("unknown", thrift.REPLY, int32(1), nil),
-	)
-
-	client := errortest.NewErrorTestClientProtocol(transport, protocol, protocol)
-	_, err := client.TestString("test")
-	mockCtrl.Finish()
-	appErr, ok := err.(thrift.TApplicationException)
-	if !ok {
-		t.Fatal("Expected TApplicationException")
-	}
-	if appErr.TypeId() != thrift.WRONG_METHOD_NAME {
-		t.Fatal("Expected WRONG_METHOD_NAME error")
-	}
-}
-
-// TestCase: Wrong message type has been received in the client.
-func TestClientWrongMessageType(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	transport := thrift.NewTMemoryBuffer()
-	protocol := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		protocol.EXPECT().WriteMessageBegin("testString", thrift.CALL, int32(1)),
-		protocol.EXPECT().WriteStructBegin("testString_args"),
-		protocol.EXPECT().WriteFieldBegin("s", thrift.TType(thrift.STRING), int16(1)),
-		protocol.EXPECT().WriteString("test"),
-		protocol.EXPECT().WriteFieldEnd(),
-		protocol.EXPECT().WriteFieldStop(),
-		protocol.EXPECT().WriteStructEnd(),
-		protocol.EXPECT().WriteMessageEnd(),
-		protocol.EXPECT().Flush(),
-		protocol.EXPECT().ReadMessageBegin().Return("testString", thrift.INVALID_TMESSAGE_TYPE, int32(1), nil),
-	)
-
-	client := errortest.NewErrorTestClientProtocol(transport, protocol, protocol)
-	_, err := client.TestString("test")
-	mockCtrl.Finish()
-	appErr, ok := err.(thrift.TApplicationException)
-	if !ok {
-		t.Fatal("Expected TApplicationException")
-	}
-	if appErr.TypeId() != thrift.INVALID_MESSAGE_TYPE_EXCEPTION {
-		t.Fatal("Expected INVALID_MESSAGE_TYPE_EXCEPTION error")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/encoding_json_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/encoding_json_test.go
deleted file mode 100644
index 12d4566..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/encoding_json_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"encoding"
-	"encoding/json"
-	"testing"
-	"thrifttest"
-)
-
-func TestEnumIsTextMarshaller(t *testing.T) {
-	one := thrifttest.Numberz_ONE
-	var tm encoding.TextMarshaler = one
-	b, err := tm.MarshalText()
-	if err != nil {
-		t.Fatalf("Unexpected error from MarshalText: %s", err)
-	}
-	if string(b) != one.String() {
-		t.Errorf("MarshalText(%s) = %s, expected = %s", one, b, one)
-	}
-}
-
-func TestEnumIsTextUnmarshaller(t *testing.T) {
-	var tm encoding.TextUnmarshaler = thrifttest.NumberzPtr(thrifttest.Numberz_TWO)
-	err := tm.UnmarshalText([]byte("TWO"))
-	if err != nil {
-		t.Fatalf("Unexpected error from UnmarshalText(TWO): %s", err)
-	}
-	if *(tm.(*thrifttest.Numberz)) != thrifttest.Numberz_TWO {
-		t.Errorf("UnmarshalText(TWO) = %s", tm)
-	}
-
-	err = tm.UnmarshalText([]byte("NAN"))
-	if err == nil {
-		t.Errorf("Error from UnmarshalText(NAN)")
-	}
-}
-
-func TestJSONMarshalUnmarshal(t *testing.T) {
-	s1 := thrifttest.StructB{
-		Aa: &thrifttest.StructA{S: "Aa"},
-		Ab: &thrifttest.StructA{S: "Ab"},
-	}
-
-	b, err := json.Marshal(s1)
-	if err != nil {
-		t.Fatalf("Unexpected error from json.Marshal: %s", err)
-	}
-
-	s2 := thrifttest.StructB{}
-	err = json.Unmarshal(b, &s2)
-	if err != nil {
-		t.Fatalf("Unexpected error from json.Unmarshal: %s", err)
-	}
-
-	if *s1.Aa != *s2.Aa || *s1.Ab != *s2.Ab {
-		t.Logf("s1 = %+v", s1)
-		t.Logf("s2 = %+v", s2)
-		t.Errorf("json: Unmarshal(Marshal(s)) != s")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/gotag_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/gotag_test.go
deleted file mode 100644
index 32f056f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/gotag_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"gotagtest"
-	"reflect"
-	"testing"
-)
-
-func TestDefaultTag(t *testing.T) {
-	s := gotagtest.Tagged{}
-	st := reflect.TypeOf(s)
-	field, ok := st.FieldByName("StringThing")
-	if !ok || field.Tag.Get("json") != "string_thing" {
-		t.Error("Unexpected default tag value")
-	}
-}
-
-func TestCustomTag(t *testing.T) {
-	s := gotagtest.Tagged{}
-	st := reflect.TypeOf(s)
-	field, ok := st.FieldByName("IntThing")
-	if !ok || field.Tag.Get("json") != "int_thing,string" {
-		t.Error("Unexpected custom tag value")
-	}
-}
-
-func TestOptionalTag(t *testing.T) {
-	s := gotagtest.Tagged{}
-	st := reflect.TypeOf(s)
-	field, ok := st.FieldByName("OptionalIntThing")
-	if !ok || field.Tag.Get("json") != "optional_int_thing,omitempty" {
-		t.Error("Unexpected default tag value for optional field")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/ignoreinitialisms_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/ignoreinitialisms_test.go
deleted file mode 100644
index 3cd5f65..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/ignoreinitialisms_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"ignoreinitialismstest"
-	"reflect"
-	"testing"
-)
-
-func TestIgnoreInitialismsFlagIsHonoured(t *testing.T) {
-	s := ignoreinitialismstest.IgnoreInitialismsTest{}
-	st := reflect.TypeOf(s)
-	_, ok := st.FieldByName("Id")
-	if !ok {
-		t.Error("Id attribute is missing!")
-	}
-	_, ok = st.FieldByName("MyId")
-	if !ok {
-		t.Error("MyId attribute is missing!")
-	}
-	_, ok = st.FieldByName("NumCpu")
-	if !ok {
-		t.Error("NumCpu attribute is missing!")
-	}
-	_, ok = st.FieldByName("NumGpu")
-	if !ok {
-		t.Error("NumGpu attribute is missing!")
-	}
-	_, ok = st.FieldByName("My_ID")
-	if !ok {
-		t.Error("My_ID attribute is missing!")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/initialisms_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/initialisms_test.go
deleted file mode 100644
index 40923d2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/initialisms_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"initialismstest"
-	"reflect"
-	"testing"
-)
-
-func TestThatCommonInitialismsAreFixed(t *testing.T) {
-	s := initialismstest.InitialismsTest{}
-	st := reflect.TypeOf(s)
-	_, ok := st.FieldByName("UserID")
-	if !ok {
-		t.Error("UserID attribute is missing!")
-	}
-	_, ok = st.FieldByName("ServerURL")
-	if !ok {
-		t.Error("ServerURL attribute is missing!")
-	}
-	_, ok = st.FieldByName("ID")
-	if !ok {
-		t.Error("ID attribute is missing!")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/multiplexed_protocol_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/multiplexed_protocol_test.go
deleted file mode 100644
index b1674bd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/multiplexed_protocol_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"multiplexedprotocoltest"
-	"net"
-	"testing"
-	"thrift"
-	"time"
-)
-
-func FindAvailableTCPServerPort() net.Addr {
-	if l, err := net.Listen("tcp", "127.0.0.1:0"); err != nil {
-		panic("Could not find available server port")
-	} else {
-		defer l.Close()
-		return l.Addr()
-	}
-}
-
-type FirstImpl struct{}
-
-func (f *FirstImpl) ReturnOne() (r int64, err error) {
-	return 1, nil
-}
-
-type SecondImpl struct{}
-
-func (s *SecondImpl) ReturnTwo() (r int64, err error) {
-	return 2, nil
-}
-
-var processor = thrift.NewTMultiplexedProcessor()
-
-func TestInitTwoServers(t *testing.T) {
-	var err error
-	protocolFactory := thrift.NewTBinaryProtocolFactoryDefault()
-	transportFactory := thrift.NewTTransportFactory()
-	transportFactory = thrift.NewTFramedTransportFactory(transportFactory)
-	addr = FindAvailableTCPServerPort()
-	serverTransport, err := thrift.NewTServerSocketTimeout(addr.String(), TIMEOUT)
-	if err != nil {
-		t.Fatal("Unable to create server socket", err)
-	}
-	server = thrift.NewTSimpleServer4(processor, serverTransport, transportFactory, protocolFactory)
-
-	firstProcessor := multiplexedprotocoltest.NewFirstProcessor(&FirstImpl{})
-	processor.RegisterProcessor("FirstService", firstProcessor)
-
-	secondProcessor := multiplexedprotocoltest.NewSecondProcessor(&SecondImpl{})
-	processor.RegisterProcessor("SecondService", secondProcessor)
-
-	go server.Serve()
-	time.Sleep(10 * time.Millisecond)
-}
-
-var firstClient *multiplexedprotocoltest.FirstClient
-
-func TestInitClient1(t *testing.T) {
-	socket := thrift.NewTSocketFromAddrTimeout(addr, TIMEOUT)
-	transport := thrift.NewTFramedTransport(socket)
-	var protocol thrift.TProtocol = thrift.NewTBinaryProtocolTransport(transport)
-	protocol = thrift.NewTMultiplexedProtocol(protocol, "FirstService")
-	firstClient = multiplexedprotocoltest.NewFirstClientProtocol(transport, protocol, protocol)
-	err := transport.Open()
-	if err != nil {
-		t.Fatal("Unable to open client socket", err)
-	}
-}
-
-var secondClient *multiplexedprotocoltest.SecondClient
-
-func TestInitClient2(t *testing.T) {
-	socket := thrift.NewTSocketFromAddrTimeout(addr, TIMEOUT)
-	transport := thrift.NewTFramedTransport(socket)
-	var protocol thrift.TProtocol = thrift.NewTBinaryProtocolTransport(transport)
-	protocol = thrift.NewTMultiplexedProtocol(protocol, "SecondService")
-	secondClient = multiplexedprotocoltest.NewSecondClientProtocol(transport, protocol, protocol)
-	err := transport.Open()
-	if err != nil {
-		t.Fatal("Unable to open client socket", err)
-	}
-}
-
-//create client without service prefix
-func createLegacyClient(t *testing.T) *multiplexedprotocoltest.SecondClient {
-	socket := thrift.NewTSocketFromAddrTimeout(addr, TIMEOUT)
-	transport := thrift.NewTFramedTransport(socket)
-	var protocol thrift.TProtocol = thrift.NewTBinaryProtocolTransport(transport)
-	legacyClient := multiplexedprotocoltest.NewSecondClientProtocol(transport, protocol, protocol)
-	err := transport.Open()
-	if err != nil {
-		t.Fatal("Unable to open client socket", err)
-	}
-	return legacyClient
-}
-
-func TestCallFirst(t *testing.T) {
-	ret, err := firstClient.ReturnOne()
-	if err != nil {
-		t.Fatal("Unable to call first server:", err)
-	}
-	if ret != 1 {
-		t.Fatal("Unexpected result from server: ", ret)
-	}
-}
-
-func TestCallSecond(t *testing.T) {
-	ret, err := secondClient.ReturnTwo()
-	if err != nil {
-		t.Fatal("Unable to call second server:", err)
-	}
-	if ret != 2 {
-		t.Fatal("Unexpected result from server: ", ret)
-	}
-}
-
-func TestCallLegacy(t *testing.T) {
-	legacyClient := createLegacyClient(t)
-	ret, err := legacyClient.ReturnTwo()
-	//expect error since default processor is not registered
-	if err == nil {
-		t.Fatal("Expecting error")
-	}
-	//register default processor and call again
-	processor.RegisterDefault(multiplexedprotocoltest.NewSecondProcessor(&SecondImpl{}))
-	legacyClient = createLegacyClient(t)
-	ret, err = legacyClient.ReturnTwo()
-	if err != nil {
-		t.Fatal("Unable to call legacy server:", err)
-	}
-	if ret != 2 {
-		t.Fatal("Unexpected result from server: ", ret)
-	}
-}
-
-func TestShutdownServerAndClients(t *testing.T) {
-	firstClient.Transport.Close()
-	secondClient.Transport.Close()
-	server.Stop()
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/names_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/names_test.go
deleted file mode 100644
index 90b63a3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/names_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"namestest"
-	"reflect"
-	"testing"
-)
-
-func TestThatAttributeNameSubstituionDoesNotOccur(t *testing.T) {
-	s := namestest.NamesTest{}
-	st := reflect.TypeOf(s)
-	_, ok := st.FieldByName("Type")
-	if !ok {
-		t.Error("Type attribute is missing!")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/one_way_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/one_way_test.go
deleted file mode 100644
index 5bb1dae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/one_way_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"fmt"
-	"net"
-	"onewaytest"
-	"testing"
-	"thrift"
-	"time"
-)
-
-func findPort() net.Addr {
-	if l, err := net.Listen("tcp", "127.0.0.1:0"); err != nil {
-		panic("Could not find available server port")
-	} else {
-		defer l.Close()
-		return l.Addr()
-	}
-}
-
-type impl struct{}
-
-func (i *impl) Hi(in int64, s string) (err error)        { fmt.Println("Hi!"); return }
-func (i *impl) Emptyfunc() (err error)                   { return }
-func (i *impl) EchoInt(param int64) (r int64, err error) { return param, nil }
-
-const TIMEOUT = time.Second
-
-var addr net.Addr
-var server *thrift.TSimpleServer
-var client *onewaytest.OneWayClient
-
-func TestInitOneway(t *testing.T) {
-	var err error
-	addr = findPort()
-	serverTransport, err := thrift.NewTServerSocketTimeout(addr.String(), TIMEOUT)
-	if err != nil {
-		t.Fatal("Unable to create server socket", err)
-	}
-	processor := onewaytest.NewOneWayProcessor(&impl{})
-	server = thrift.NewTSimpleServer2(processor, serverTransport)
-
-	go server.Serve()
-	time.Sleep(10 * time.Millisecond)
-}
-
-func TestInitOnewayClient(t *testing.T) {
-	transport := thrift.NewTSocketFromAddrTimeout(addr, TIMEOUT)
-	protocol := thrift.NewTBinaryProtocolTransport(transport)
-	client = onewaytest.NewOneWayClientProtocol(transport, protocol, protocol)
-	err := transport.Open()
-	if err != nil {
-		t.Fatal("Unable to open client socket", err)
-	}
-}
-
-func TestCallOnewayServer(t *testing.T) {
-	//call oneway function
-	err := client.Hi(1, "")
-	if err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-	//There is no way to detect protocol problems with single oneway call so we call it second time
-	i, err := client.EchoInt(42)
-	if err != nil {
-		t.Fatal("Unexpected error: ", err)
-	}
-	if i != 42 {
-		t.Fatal("Unexpected returned value: ", i)
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/optional_fields_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/optional_fields_test.go
deleted file mode 100644
index 34ad660..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/optional_fields_test.go
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"bytes"
-	gomock "github.com/golang/mock/gomock"
-	"optionalfieldstest"
-	"testing"
-	"thrift"
-)
-
-func TestIsSetReturnFalseOnCreation(t *testing.T) {
-	ao := optionalfieldstest.NewAllOptional()
-	if ao.IsSetS() {
-		t.Errorf("Optional field S is set on initialization")
-	}
-	if ao.IsSetI() {
-		t.Errorf("Optional field I is set on initialization")
-	}
-	if ao.IsSetB() {
-		t.Errorf("Optional field B is set on initialization")
-	}
-	if ao.IsSetS2() {
-		t.Errorf("Optional field S2 is set on initialization")
-	}
-	if ao.IsSetI2() {
-		t.Errorf("Optional field I2 is set on initialization")
-	}
-	if ao.IsSetB2() {
-		t.Errorf("Optional field B2 is set on initialization")
-	}
-	if ao.IsSetAa() {
-		t.Errorf("Optional field Aa is set on initialization")
-	}
-	if ao.IsSetL() {
-		t.Errorf("Optional field L is set on initialization")
-	}
-	if ao.IsSetL2() {
-		t.Errorf("Optional field L2 is set on initialization")
-	}
-	if ao.IsSetM() {
-		t.Errorf("Optional field M is set on initialization")
-	}
-	if ao.IsSetM2() {
-		t.Errorf("Optional field M2 is set on initialization")
-	}
-	if ao.IsSetBin() {
-		t.Errorf("Optional field Bin is set on initialization")
-	}
-	if ao.IsSetBin2() {
-		t.Errorf("Optional field Bin2 is set on initialization")
-	}
-}
-
-func TestDefaultValuesOnCreation(t *testing.T) {
-	ao := optionalfieldstest.NewAllOptional()
-	if ao.GetS() != "DEFAULT" {
-		t.Errorf("Unexpected default value %#v for field S", ao.GetS())
-	}
-	if ao.GetI() != 42 {
-		t.Errorf("Unexpected default value %#v for field I", ao.GetI())
-	}
-	if ao.GetB() != false {
-		t.Errorf("Unexpected default value %#v for field B", ao.GetB())
-	}
-	if ao.GetS2() != "" {
-		t.Errorf("Unexpected default value %#v for field S2", ao.GetS2())
-	}
-	if ao.GetI2() != 0 {
-		t.Errorf("Unexpected default value %#v for field I2", ao.GetI2())
-	}
-	if ao.GetB2() != false {
-		t.Errorf("Unexpected default value %#v for field B2", ao.GetB2())
-	}
-	if l := ao.GetL(); len(l) != 0 {
-		t.Errorf("Unexpected default value %#v for field L", l)
-	}
-	if l := ao.GetL2(); len(l) != 2 || l[0] != 1 || l[1] != 2 {
-		t.Errorf("Unexpected default value %#v for field L2", l)
-	}
-	//FIXME: should we return empty map here?
-	if m := ao.GetM(); m != nil {
-		t.Errorf("Unexpected default value %#v for field M", m)
-	}
-	if m := ao.GetM2(); len(m) != 2 || m[1] != 2 || m[3] != 4 {
-		t.Errorf("Unexpected default value %#v for field M2", m)
-	}
-	if bv := ao.GetBin(); bv != nil {
-		t.Errorf("Unexpected default value %#v for field Bin", bv)
-	}
-	if bv := ao.GetBin2(); !bytes.Equal(bv, []byte("asdf")) {
-		t.Errorf("Unexpected default value %#v for field Bin2", bv)
-	}
-}
-
-func TestInitialValuesOnCreation(t *testing.T) {
-	ao := optionalfieldstest.NewAllOptional()
-	if ao.S != "DEFAULT" {
-		t.Errorf("Unexpected initial value %#v for field S", ao.S)
-	}
-	if ao.I != 42 {
-		t.Errorf("Unexpected initial value %#v for field I", ao.I)
-	}
-	if ao.B != false {
-		t.Errorf("Unexpected initial value %#v for field B", ao.B)
-	}
-	if ao.S2 != nil {
-		t.Errorf("Unexpected initial value %#v for field S2", ao.S2)
-	}
-	if ao.I2 != nil {
-		t.Errorf("Unexpected initial value %#v for field I2", ao.I2)
-	}
-	if ao.B2 != nil {
-		t.Errorf("Unexpected initial value %#v for field B2", ao.B2)
-	}
-	if ao.L != nil || len(ao.L) != 0 {
-		t.Errorf("Unexpected initial value %#v for field L", ao.L)
-	}
-	if ao.L2 != nil {
-		t.Errorf("Unexpected initial value %#v for field L2", ao.L2)
-	}
-	if ao.M != nil {
-		t.Errorf("Unexpected initial value %#v for field M", ao.M)
-	}
-	if ao.M2 != nil {
-		t.Errorf("Unexpected initial value %#v for field M2", ao.M2)
-	}
-	if ao.Bin != nil || len(ao.Bin) != 0 {
-		t.Errorf("Unexpected initial value %#v for field Bin", ao.Bin)
-	}
-	if !bytes.Equal(ao.Bin2, []byte("asdf")) {
-		t.Errorf("Unexpected initial value %#v for field Bin2", ao.Bin2)
-	}
-}
-
-func TestIsSetReturnTrueAfterUpdate(t *testing.T) {
-	ao := optionalfieldstest.NewAllOptional()
-	ao.S = "somevalue"
-	ao.I = 123
-	ao.B = true
-	ao.Aa = optionalfieldstest.NewStructA()
-	if !ao.IsSetS() {
-		t.Errorf("Field S should be set")
-	}
-	if !ao.IsSetI() {
-		t.Errorf("Field I should be set")
-	}
-	if !ao.IsSetB() {
-		t.Errorf("Field B should be set")
-	}
-	if !ao.IsSetAa() {
-		t.Errorf("Field aa should be set")
-	}
-}
-
-func TestListNotEmpty(t *testing.T) {
-	ao := optionalfieldstest.NewAllOptional()
-	ao.L = []int64{1, 2, 3}
-	if !ao.IsSetL() {
-		t.Errorf("Field L should be set")
-	}
-}
-
-//Make sure that optional fields are not being serialized
-func TestNoOptionalUnsetFieldsOnWire(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	proto := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		proto.EXPECT().WriteStructBegin("all_optional").Return(nil),
-		proto.EXPECT().WriteFieldStop().Return(nil),
-		proto.EXPECT().WriteStructEnd().Return(nil),
-	)
-	ao := optionalfieldstest.NewAllOptional()
-	ao.Write(proto)
-}
-
-func TestNoSetToDefaultFieldsOnWire(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	proto := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		proto.EXPECT().WriteStructBegin("all_optional").Return(nil),
-		proto.EXPECT().WriteFieldStop().Return(nil),
-		proto.EXPECT().WriteStructEnd().Return(nil),
-	)
-	ao := optionalfieldstest.NewAllOptional()
-	ao.I = 42
-	ao.Write(proto)
-}
-
-//Make sure that only one field is being serialized when set to non-default
-func TestOneISetFieldOnWire(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	proto := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		proto.EXPECT().WriteStructBegin("all_optional").Return(nil),
-		proto.EXPECT().WriteFieldBegin("i", thrift.TType(thrift.I64), int16(2)).Return(nil),
-		proto.EXPECT().WriteI64(int64(123)).Return(nil),
-		proto.EXPECT().WriteFieldEnd().Return(nil),
-		proto.EXPECT().WriteFieldStop().Return(nil),
-		proto.EXPECT().WriteStructEnd().Return(nil),
-	)
-	ao := optionalfieldstest.NewAllOptional()
-	ao.I = 123
-	ao.Write(proto)
-}
-
-func TestOneLSetFieldOnWire(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	proto := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		proto.EXPECT().WriteStructBegin("all_optional").Return(nil),
-		proto.EXPECT().WriteFieldBegin("l", thrift.TType(thrift.LIST), int16(9)).Return(nil),
-		proto.EXPECT().WriteListBegin(thrift.TType(thrift.I64), 2).Return(nil),
-		proto.EXPECT().WriteI64(int64(1)).Return(nil),
-		proto.EXPECT().WriteI64(int64(2)).Return(nil),
-		proto.EXPECT().WriteListEnd().Return(nil),
-		proto.EXPECT().WriteFieldEnd().Return(nil),
-		proto.EXPECT().WriteFieldStop().Return(nil),
-		proto.EXPECT().WriteStructEnd().Return(nil),
-	)
-	ao := optionalfieldstest.NewAllOptional()
-	ao.L = []int64{1, 2}
-	ao.Write(proto)
-}
-
-func TestOneBinSetFieldOnWire(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	proto := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		proto.EXPECT().WriteStructBegin("all_optional").Return(nil),
-		proto.EXPECT().WriteFieldBegin("bin", thrift.TType(thrift.STRING), int16(13)).Return(nil),
-		proto.EXPECT().WriteBinary([]byte("somebytestring")).Return(nil),
-		proto.EXPECT().WriteFieldEnd().Return(nil),
-		proto.EXPECT().WriteFieldStop().Return(nil),
-		proto.EXPECT().WriteStructEnd().Return(nil),
-	)
-	ao := optionalfieldstest.NewAllOptional()
-	ao.Bin = []byte("somebytestring")
-	ao.Write(proto)
-}
-
-func TestOneEmptyBinSetFieldOnWire(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	proto := NewMockTProtocol(mockCtrl)
-	gomock.InOrder(
-		proto.EXPECT().WriteStructBegin("all_optional").Return(nil),
-		proto.EXPECT().WriteFieldBegin("bin", thrift.TType(thrift.STRING), int16(13)).Return(nil),
-		proto.EXPECT().WriteBinary([]byte{}).Return(nil),
-		proto.EXPECT().WriteFieldEnd().Return(nil),
-		proto.EXPECT().WriteFieldStop().Return(nil),
-		proto.EXPECT().WriteStructEnd().Return(nil),
-	)
-	ao := optionalfieldstest.NewAllOptional()
-	ao.Bin = []byte{}
-	ao.Write(proto)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/protocol_mock.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/protocol_mock.go
deleted file mode 100644
index 9197fed..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/protocol_mock.go
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Automatically generated by MockGen. DO NOT EDIT!
-// Source: thrift (interfaces: TProtocol)
-
-package tests
-
-import (
-	thrift "thrift"
-	gomock "github.com/golang/mock/gomock"
-)
-
-// Mock of TProtocol interface
-type MockTProtocol struct {
-	ctrl     *gomock.Controller
-	recorder *_MockTProtocolRecorder
-}
-
-// Recorder for MockTProtocol (not exported)
-type _MockTProtocolRecorder struct {
-	mock *MockTProtocol
-}
-
-func NewMockTProtocol(ctrl *gomock.Controller) *MockTProtocol {
-	mock := &MockTProtocol{ctrl: ctrl}
-	mock.recorder = &_MockTProtocolRecorder{mock}
-	return mock
-}
-
-func (_m *MockTProtocol) EXPECT() *_MockTProtocolRecorder {
-	return _m.recorder
-}
-
-func (_m *MockTProtocol) Flush() error {
-	ret := _m.ctrl.Call(_m, "Flush")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) Flush() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Flush")
-}
-
-func (_m *MockTProtocol) ReadBinary() ([]byte, error) {
-	ret := _m.ctrl.Call(_m, "ReadBinary")
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadBinary() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadBinary")
-}
-
-func (_m *MockTProtocol) ReadBool() (bool, error) {
-	ret := _m.ctrl.Call(_m, "ReadBool")
-	ret0, _ := ret[0].(bool)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadBool() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadBool")
-}
-
-func (_m *MockTProtocol) ReadByte() (int8, error) {
-	ret := _m.ctrl.Call(_m, "ReadByte")
-	ret0, _ := ret[0].(int8)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadByte() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadByte")
-}
-
-func (_m *MockTProtocol) ReadDouble() (float64, error) {
-	ret := _m.ctrl.Call(_m, "ReadDouble")
-	ret0, _ := ret[0].(float64)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadDouble() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadDouble")
-}
-
-func (_m *MockTProtocol) ReadFieldBegin() (string, thrift.TType, int16, error) {
-	ret := _m.ctrl.Call(_m, "ReadFieldBegin")
-	ret0, _ := ret[0].(string)
-	ret1, _ := ret[1].(thrift.TType)
-	ret2, _ := ret[2].(int16)
-	ret3, _ := ret[3].(error)
-	return ret0, ret1, ret2, ret3
-}
-
-func (_mr *_MockTProtocolRecorder) ReadFieldBegin() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadFieldBegin")
-}
-
-func (_m *MockTProtocol) ReadFieldEnd() error {
-	ret := _m.ctrl.Call(_m, "ReadFieldEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) ReadFieldEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadFieldEnd")
-}
-
-func (_m *MockTProtocol) ReadI16() (int16, error) {
-	ret := _m.ctrl.Call(_m, "ReadI16")
-	ret0, _ := ret[0].(int16)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadI16() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadI16")
-}
-
-func (_m *MockTProtocol) ReadI32() (int32, error) {
-	ret := _m.ctrl.Call(_m, "ReadI32")
-	ret0, _ := ret[0].(int32)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadI32() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadI32")
-}
-
-func (_m *MockTProtocol) ReadI64() (int64, error) {
-	ret := _m.ctrl.Call(_m, "ReadI64")
-	ret0, _ := ret[0].(int64)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadI64() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadI64")
-}
-
-func (_m *MockTProtocol) ReadListBegin() (thrift.TType, int, error) {
-	ret := _m.ctrl.Call(_m, "ReadListBegin")
-	ret0, _ := ret[0].(thrift.TType)
-	ret1, _ := ret[1].(int)
-	ret2, _ := ret[2].(error)
-	return ret0, ret1, ret2
-}
-
-func (_mr *_MockTProtocolRecorder) ReadListBegin() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadListBegin")
-}
-
-func (_m *MockTProtocol) ReadListEnd() error {
-	ret := _m.ctrl.Call(_m, "ReadListEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) ReadListEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadListEnd")
-}
-
-func (_m *MockTProtocol) ReadMapBegin() (thrift.TType, thrift.TType, int, error) {
-	ret := _m.ctrl.Call(_m, "ReadMapBegin")
-	ret0, _ := ret[0].(thrift.TType)
-	ret1, _ := ret[1].(thrift.TType)
-	ret2, _ := ret[2].(int)
-	ret3, _ := ret[3].(error)
-	return ret0, ret1, ret2, ret3
-}
-
-func (_mr *_MockTProtocolRecorder) ReadMapBegin() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadMapBegin")
-}
-
-func (_m *MockTProtocol) ReadMapEnd() error {
-	ret := _m.ctrl.Call(_m, "ReadMapEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) ReadMapEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadMapEnd")
-}
-
-func (_m *MockTProtocol) ReadMessageBegin() (string, thrift.TMessageType, int32, error) {
-	ret := _m.ctrl.Call(_m, "ReadMessageBegin")
-	ret0, _ := ret[0].(string)
-	ret1, _ := ret[1].(thrift.TMessageType)
-	ret2, _ := ret[2].(int32)
-	ret3, _ := ret[3].(error)
-	return ret0, ret1, ret2, ret3
-}
-
-func (_mr *_MockTProtocolRecorder) ReadMessageBegin() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadMessageBegin")
-}
-
-func (_m *MockTProtocol) ReadMessageEnd() error {
-	ret := _m.ctrl.Call(_m, "ReadMessageEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) ReadMessageEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadMessageEnd")
-}
-
-func (_m *MockTProtocol) ReadSetBegin() (thrift.TType, int, error) {
-	ret := _m.ctrl.Call(_m, "ReadSetBegin")
-	ret0, _ := ret[0].(thrift.TType)
-	ret1, _ := ret[1].(int)
-	ret2, _ := ret[2].(error)
-	return ret0, ret1, ret2
-}
-
-func (_mr *_MockTProtocolRecorder) ReadSetBegin() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadSetBegin")
-}
-
-func (_m *MockTProtocol) ReadSetEnd() error {
-	ret := _m.ctrl.Call(_m, "ReadSetEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) ReadSetEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadSetEnd")
-}
-
-func (_m *MockTProtocol) ReadString() (string, error) {
-	ret := _m.ctrl.Call(_m, "ReadString")
-	ret0, _ := ret[0].(string)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadString() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadString")
-}
-
-func (_m *MockTProtocol) ReadStructBegin() (string, error) {
-	ret := _m.ctrl.Call(_m, "ReadStructBegin")
-	ret0, _ := ret[0].(string)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockTProtocolRecorder) ReadStructBegin() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadStructBegin")
-}
-
-func (_m *MockTProtocol) ReadStructEnd() error {
-	ret := _m.ctrl.Call(_m, "ReadStructEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) ReadStructEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ReadStructEnd")
-}
-
-func (_m *MockTProtocol) Skip(_param0 thrift.TType) error {
-	ret := _m.ctrl.Call(_m, "Skip", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) Skip(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Skip", arg0)
-}
-
-func (_m *MockTProtocol) Transport() thrift.TTransport {
-	ret := _m.ctrl.Call(_m, "Transport")
-	ret0, _ := ret[0].(thrift.TTransport)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) Transport() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "Transport")
-}
-
-func (_m *MockTProtocol) WriteBinary(_param0 []byte) error {
-	ret := _m.ctrl.Call(_m, "WriteBinary", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteBinary(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteBinary", arg0)
-}
-
-func (_m *MockTProtocol) WriteBool(_param0 bool) error {
-	ret := _m.ctrl.Call(_m, "WriteBool", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteBool(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteBool", arg0)
-}
-
-func (_m *MockTProtocol) WriteByte(_param0 int8) error {
-	ret := _m.ctrl.Call(_m, "WriteByte", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteByte(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteByte", arg0)
-}
-
-func (_m *MockTProtocol) WriteDouble(_param0 float64) error {
-	ret := _m.ctrl.Call(_m, "WriteDouble", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteDouble(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteDouble", arg0)
-}
-
-func (_m *MockTProtocol) WriteFieldBegin(_param0 string, _param1 thrift.TType, _param2 int16) error {
-	ret := _m.ctrl.Call(_m, "WriteFieldBegin", _param0, _param1, _param2)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteFieldBegin(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteFieldBegin", arg0, arg1, arg2)
-}
-
-func (_m *MockTProtocol) WriteFieldEnd() error {
-	ret := _m.ctrl.Call(_m, "WriteFieldEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteFieldEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteFieldEnd")
-}
-
-func (_m *MockTProtocol) WriteFieldStop() error {
-	ret := _m.ctrl.Call(_m, "WriteFieldStop")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteFieldStop() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteFieldStop")
-}
-
-func (_m *MockTProtocol) WriteI16(_param0 int16) error {
-	ret := _m.ctrl.Call(_m, "WriteI16", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteI16(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteI16", arg0)
-}
-
-func (_m *MockTProtocol) WriteI32(_param0 int32) error {
-	ret := _m.ctrl.Call(_m, "WriteI32", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteI32(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteI32", arg0)
-}
-
-func (_m *MockTProtocol) WriteI64(_param0 int64) error {
-	ret := _m.ctrl.Call(_m, "WriteI64", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteI64(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteI64", arg0)
-}
-
-func (_m *MockTProtocol) WriteListBegin(_param0 thrift.TType, _param1 int) error {
-	ret := _m.ctrl.Call(_m, "WriteListBegin", _param0, _param1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteListBegin(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteListBegin", arg0, arg1)
-}
-
-func (_m *MockTProtocol) WriteListEnd() error {
-	ret := _m.ctrl.Call(_m, "WriteListEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteListEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteListEnd")
-}
-
-func (_m *MockTProtocol) WriteMapBegin(_param0 thrift.TType, _param1 thrift.TType, _param2 int) error {
-	ret := _m.ctrl.Call(_m, "WriteMapBegin", _param0, _param1, _param2)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteMapBegin(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteMapBegin", arg0, arg1, arg2)
-}
-
-func (_m *MockTProtocol) WriteMapEnd() error {
-	ret := _m.ctrl.Call(_m, "WriteMapEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteMapEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteMapEnd")
-}
-
-func (_m *MockTProtocol) WriteMessageBegin(_param0 string, _param1 thrift.TMessageType, _param2 int32) error {
-	ret := _m.ctrl.Call(_m, "WriteMessageBegin", _param0, _param1, _param2)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteMessageBegin(arg0, arg1, arg2 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteMessageBegin", arg0, arg1, arg2)
-}
-
-func (_m *MockTProtocol) WriteMessageEnd() error {
-	ret := _m.ctrl.Call(_m, "WriteMessageEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteMessageEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteMessageEnd")
-}
-
-func (_m *MockTProtocol) WriteSetBegin(_param0 thrift.TType, _param1 int) error {
-	ret := _m.ctrl.Call(_m, "WriteSetBegin", _param0, _param1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteSetBegin(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteSetBegin", arg0, arg1)
-}
-
-func (_m *MockTProtocol) WriteSetEnd() error {
-	ret := _m.ctrl.Call(_m, "WriteSetEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteSetEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteSetEnd")
-}
-
-func (_m *MockTProtocol) WriteString(_param0 string) error {
-	ret := _m.ctrl.Call(_m, "WriteString", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteString(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteString", arg0)
-}
-
-func (_m *MockTProtocol) WriteStructBegin(_param0 string) error {
-	ret := _m.ctrl.Call(_m, "WriteStructBegin", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteStructBegin(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteStructBegin", arg0)
-}
-
-func (_m *MockTProtocol) WriteStructEnd() error {
-	ret := _m.ctrl.Call(_m, "WriteStructEnd")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockTProtocolRecorder) WriteStructEnd() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "WriteStructEnd")
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/protocols_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/protocols_test.go
deleted file mode 100644
index 1580678..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/protocols_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"testing"
-	"thrift"
-	"thrifttest"
-)
-
-func RunSocketTestSuite(t *testing.T, protocolFactory thrift.TProtocolFactory,
-	transportFactory thrift.TTransportFactory) {
-	// server
-	var err error
-	addr = FindAvailableTCPServerPort()
-	serverTransport, err := thrift.NewTServerSocketTimeout(addr.String(), TIMEOUT)
-	if err != nil {
-		t.Fatal("Unable to create server socket", err)
-	}
-	processor := thrifttest.NewThriftTestProcessor(NewThriftTestHandler())
-	server = thrift.NewTSimpleServer4(processor, serverTransport, transportFactory, protocolFactory)
-	server.Listen()
-
-	go server.Serve()
-
-	// client
-	var transport thrift.TTransport = thrift.NewTSocketFromAddrTimeout(addr, TIMEOUT)
-	transport, err = transportFactory.GetTransport(transport)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var protocol thrift.TProtocol = protocolFactory.GetProtocol(transport)
-	thriftTestClient := thrifttest.NewThriftTestClientProtocol(transport, protocol, protocol)
-	err = transport.Open()
-	if err != nil {
-		t.Fatal("Unable to open client socket", err)
-	}
-
-	driver := NewThriftTestDriver(t, thriftTestClient)
-	driver.Start()
-}
-
-// Run test suite using TJSONProtocol
-func TestTJSONProtocol(t *testing.T) {
-	RunSocketTestSuite(t,
-		thrift.NewTJSONProtocolFactory(),
-		thrift.NewTTransportFactory())
-	RunSocketTestSuite(t,
-		thrift.NewTJSONProtocolFactory(),
-		thrift.NewTBufferedTransportFactory(8912))
-	RunSocketTestSuite(t,
-		thrift.NewTJSONProtocolFactory(),
-		thrift.NewTFramedTransportFactory(thrift.NewTTransportFactory()))
-}
-
-// Run test suite using TBinaryProtocol
-func TestTBinaryProtocol(t *testing.T) {
-	RunSocketTestSuite(t,
-		thrift.NewTBinaryProtocolFactoryDefault(),
-		thrift.NewTTransportFactory())
-	RunSocketTestSuite(t,
-		thrift.NewTBinaryProtocolFactoryDefault(),
-		thrift.NewTBufferedTransportFactory(8912))
-	RunSocketTestSuite(t,
-		thrift.NewTBinaryProtocolFactoryDefault(),
-		thrift.NewTFramedTransportFactory(thrift.NewTTransportFactory()))
-}
-
-// Run test suite using TCompactBinaryProtocol
-func TestTCompactProtocol(t *testing.T) {
-	RunSocketTestSuite(t,
-		thrift.NewTCompactProtocolFactory(),
-		thrift.NewTTransportFactory())
-	RunSocketTestSuite(t,
-		thrift.NewTCompactProtocolFactory(),
-		thrift.NewTBufferedTransportFactory(8912))
-	RunSocketTestSuite(t,
-		thrift.NewTCompactProtocolFactory(),
-		thrift.NewTFramedTransportFactory(thrift.NewTTransportFactory()))
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/required_fields_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/required_fields_test.go
deleted file mode 100644
index 2053712..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/required_fields_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"github.com/golang/mock/gomock"
-	"optionalfieldstest"
-	"testing"
-	"thrift"
-)
-
-func TestStructReadRequiredFields(t *testing.T) {
-	mockCtrl := gomock.NewController(t)
-	protocol := NewMockTProtocol(mockCtrl)
-	testStruct := optionalfieldstest.NewStructC()
-
-	// None of required fields are set
-	gomock.InOrder(
-		protocol.EXPECT().ReadStructBegin().Return("StructC", nil),
-		protocol.EXPECT().ReadFieldBegin().Return("_", thrift.TType(thrift.STOP), int16(1), nil),
-		protocol.EXPECT().ReadStructEnd().Return(nil),
-	)
-
-	err := testStruct.Read(protocol)
-	mockCtrl.Finish()
-	if err == nil {
-		t.Fatal("Expected read to fail")
-	}
-	err2, ok := err.(thrift.TProtocolException)
-	if !ok {
-		t.Fatal("Expected a TProtocolException")
-	}
-	if err2.TypeId() != thrift.INVALID_DATA {
-		t.Fatal("Expected INVALID_DATA TProtocolException")
-	}
-
-	// One of the required fields is set
-	gomock.InOrder(
-		protocol.EXPECT().ReadStructBegin().Return("StructC", nil),
-		protocol.EXPECT().ReadFieldBegin().Return("I", thrift.TType(thrift.I32), int16(2), nil),
-		protocol.EXPECT().ReadI32().Return(int32(1), nil),
-		protocol.EXPECT().ReadFieldEnd().Return(nil),
-		protocol.EXPECT().ReadFieldBegin().Return("_", thrift.TType(thrift.STOP), int16(1), nil),
-		protocol.EXPECT().ReadStructEnd().Return(nil),
-	)
-
-	err = testStruct.Read(protocol)
-	mockCtrl.Finish()
-	if err == nil {
-		t.Fatal("Expected read to fail")
-	}
-	err2, ok = err.(thrift.TProtocolException)
-	if !ok {
-		t.Fatal("Expected a TProtocolException")
-	}
-	if err2.TypeId() != thrift.INVALID_DATA {
-		t.Fatal("Expected INVALID_DATA TProtocolException")
-	}
-
-	// Both of the required fields are set
-	gomock.InOrder(
-		protocol.EXPECT().ReadStructBegin().Return("StructC", nil),
-		protocol.EXPECT().ReadFieldBegin().Return("i", thrift.TType(thrift.I32), int16(2), nil),
-		protocol.EXPECT().ReadI32().Return(int32(1), nil),
-		protocol.EXPECT().ReadFieldEnd().Return(nil),
-		protocol.EXPECT().ReadFieldBegin().Return("s2", thrift.TType(thrift.STRING), int16(4), nil),
-		protocol.EXPECT().ReadString().Return("test", nil),
-		protocol.EXPECT().ReadFieldEnd().Return(nil),
-		protocol.EXPECT().ReadFieldBegin().Return("_", thrift.TType(thrift.STOP), int16(1), nil),
-		protocol.EXPECT().ReadStructEnd().Return(nil),
-	)
-
-	err = testStruct.Read(protocol)
-	mockCtrl.Finish()
-	if err != nil {
-		t.Fatal("Expected read to succeed")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/struct_args_rets_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/struct_args_rets_test.go
deleted file mode 100644
index 363423d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/struct_args_rets_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	st "servicestest"
-)
-
-//this function is never called, it will fail to compile if check is failed
-func staticCheckStructArgsResults() {
-	//Check that struct args and results are passed by reference
-	var sa *st.StructA = &st.StructA{}
-	var iface st.AServ
-	var err error
-
-	sa, err = iface.StructAFunc_1structA(sa)
-	_ = err
-	_ = sa
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/thrifttest_driver.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/thrifttest_driver.go
deleted file mode 100644
index 1e0cf86..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/thrifttest_driver.go
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * 'License'); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"reflect"
-	"testing"
-	"thrifttest"
-)
-
-type ThriftTestDriver struct {
-	client thrifttest.ThriftTest
-	t      *testing.T
-}
-
-func NewThriftTestDriver(t *testing.T, client thrifttest.ThriftTest) *ThriftTestDriver {
-	return &ThriftTestDriver{client, t}
-}
-
-func (p *ThriftTestDriver) Start() {
-	client := p.client
-	t := p.t
-
-	if client.TestVoid() != nil {
-		t.Fatal("TestVoid failed")
-	}
-
-	if r, err := client.TestString("Test"); r != "Test" || err != nil {
-		t.Fatal("TestString with simple text failed")
-	}
-
-	if r, err := client.TestString(""); r != "" || err != nil {
-		t.Fatal("TestString with empty text failed")
-	}
-
-	stringTest := "Afrikaans, Alemannisch, Aragonés, العربية, مصرى, " +
-		"Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška, " +
-		"Беларуская, Беларуская (тарашкевіца), Български, Bamanankan, " +
-		"বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн, " +
-		"Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg, " +
-		"Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English, " +
-		"Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt, " +
-		"Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego, " +
-		"Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski, " +
-		"Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia, " +
-		"Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa, " +
-		"ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар, " +
-		"Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino, " +
-		"Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa " +
-		"Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, مازِرونی, Bahasa " +
-		"Melayu, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪" +
-		"Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad, " +
-		"Occitan, Иронау, Papiamentu, Deitsch, Polski, پنجابی, پښتو, " +
-		"Norfuk / Pitkern, Português, Runa Simi, Rumantsch, Romani, Română, " +
-		"Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple " +
-		"English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk, " +
-		"Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog, " +
-		"Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük, " +
-		"Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文, " +
-		"Bân-lâm-gú, 粵語"
-
-	if r, err := client.TestString(stringTest); r != stringTest || err != nil {
-		t.Fatal("TestString with all languages failed")
-	}
-
-	specialCharacters := "quote: \" backslash:" +
-		" backspace: \b formfeed: \f newline: \n return: \r tab: " +
-		" now-all-of-them-together: '\\\b\n\r\t'" +
-		" now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><" +
-		" char-to-test-json-parsing: ]] \"]] \\\" }}}{ [[[ "
-
-	if r, err := client.TestString(specialCharacters); r != specialCharacters || err != nil {
-		t.Fatal("TestString with specialCharacters failed")
-	}
-
-	if r, err := client.TestByte(1); r != 1 || err != nil {
-		t.Fatal("TestByte(1) failed")
-	}
-	if r, err := client.TestByte(0); r != 0 || err != nil {
-		t.Fatal("TestByte(0) failed")
-	}
-	if r, err := client.TestByte(-1); r != -1 || err != nil {
-		t.Fatal("TestByte(-1) failed")
-	}
-	if r, err := client.TestByte(-127); r != -127 || err != nil {
-		t.Fatal("TestByte(-127) failed")
-	}
-
-	if r, err := client.TestI32(-1); r != -1 || err != nil {
-		t.Fatal("TestI32(-1) failed")
-	}
-	if r, err := client.TestI32(1); r != 1 || err != nil {
-		t.Fatal("TestI32(1) failed")
-	}
-
-	if r, err := client.TestI64(-5); r != -5 || err != nil {
-		t.Fatal("TestI64(-5) failed")
-	}
-	if r, err := client.TestI64(5); r != 5 || err != nil {
-		t.Fatal("TestI64(5) failed")
-	}
-	if r, err := client.TestI64(-34359738368); r != -34359738368 || err != nil {
-		t.Fatal("TestI64(-34359738368) failed")
-	}
-
-	if r, err := client.TestDouble(-5.2098523); r != -5.2098523 || err != nil {
-		t.Fatal("TestDouble(-5.2098523) failed")
-	}
-	if r, err := client.TestDouble(-7.012052175215044); r != -7.012052175215044 || err != nil {
-		t.Fatal("TestDouble(-7.012052175215044) failed")
-	}
-
-	// TODO: add testBinary() call
-
-	out := thrifttest.NewXtruct()
-	out.StringThing = "Zero"
-	out.ByteThing = 1
-	out.I32Thing = -3
-	out.I64Thing = 1000000
-	if r, err := client.TestStruct(out); !reflect.DeepEqual(r, out) || err != nil {
-		t.Fatal("TestStruct failed")
-	}
-
-	out2 := thrifttest.NewXtruct2()
-	out2.ByteThing = 1
-	out2.StructThing = out
-	out2.I32Thing = 5
-	if r, err := client.TestNest(out2); !reflect.DeepEqual(r, out2) || err != nil {
-		t.Fatal("TestNest failed")
-	}
-
-	mapout := make(map[int32]int32)
-	for i := int32(0); i < 5; i++ {
-		mapout[i] = i - 10
-	}
-	if r, err := client.TestMap(mapout); !reflect.DeepEqual(r, mapout) || err != nil {
-		t.Fatal("TestMap failed")
-	}
-
-	mapTestInput := map[string]string{
-		"a": "123", "a b": "with spaces ", "same": "same", "0": "numeric key",
-		"longValue": stringTest, stringTest: "long key",
-	}
-	if r, err := client.TestStringMap(mapTestInput); !reflect.DeepEqual(r, mapTestInput) || err != nil {
-		t.Fatal("TestStringMap failed")
-	}
-
-	setTestInput := map[int32]struct{}{1: {}, 2: {}, 3: {}}
-	if r, err := client.TestSet(setTestInput); !reflect.DeepEqual(r, setTestInput) || err != nil {
-		t.Fatal("TestSet failed")
-	}
-
-	listTest := []int32{1, 2, 3}
-	if r, err := client.TestList(listTest); !reflect.DeepEqual(r, listTest) || err != nil {
-		t.Fatal("TestList failed")
-	}
-
-	if r, err := client.TestEnum(thrifttest.Numberz_ONE); r != thrifttest.Numberz_ONE || err != nil {
-		t.Fatal("TestEnum failed")
-	}
-
-	if r, err := client.TestTypedef(69); r != 69 || err != nil {
-		t.Fatal("TestTypedef failed")
-	}
-
-	mapMapTest := map[int32]map[int32]int32{
-		4:  {1: 1, 2: 2, 3: 3, 4: 4},
-		-4: {-4: -4, -3: -3, -2: -2, -1: -1},
-	}
-	if r, err := client.TestMapMap(1); !reflect.DeepEqual(r, mapMapTest) || err != nil {
-		t.Fatal("TestMapMap failed")
-	}
-
-	crazyX1 := thrifttest.NewXtruct()
-	crazyX1.StringThing = "Goodbye4"
-	crazyX1.ByteThing = 4
-	crazyX1.I32Thing = 4
-	crazyX1.I64Thing = 4
-
-	crazyX2 := thrifttest.NewXtruct()
-	crazyX2.StringThing = "Hello2"
-	crazyX2.ByteThing = 2
-	crazyX2.I32Thing = 2
-	crazyX2.I64Thing = 2
-
-	crazy := thrifttest.NewInsanity()
-	crazy.UserMap = map[thrifttest.Numberz]thrifttest.UserId{5: 5, 8: 8}
-	crazy.Xtructs = []*thrifttest.Xtruct{crazyX1, crazyX2}
-
-	crazyEmpty := thrifttest.NewInsanity()
-	crazyEmpty.UserMap = map[thrifttest.Numberz]thrifttest.UserId{}
-	crazyEmpty.Xtructs = []*thrifttest.Xtruct{}
-
-	insanity := map[thrifttest.UserId]map[thrifttest.Numberz]*thrifttest.Insanity{
-		1: {thrifttest.Numberz_TWO: crazy, thrifttest.Numberz_THREE: crazy},
-		2: {thrifttest.Numberz_SIX: crazyEmpty},
-	}
-	if r, err := client.TestInsanity(crazy); !reflect.DeepEqual(r, insanity) || err != nil {
-		t.Fatal("TestInsanity failed")
-	}
-
-	if err := client.TestException("TException"); err == nil {
-		t.Fatal("TestException TException failed")
-	}
-
-	if err, ok := client.TestException("Xception").(*thrifttest.Xception); ok == false || err == nil {
-		t.Fatal("TestException Xception failed")
-	} else if err.ErrorCode != 1001 || err.Message != "Xception" {
-		t.Fatal("TestException Xception failed")
-	}
-
-	if err := client.TestException("no Exception"); err != nil {
-		t.Fatal("TestException no Exception failed")
-	}
-
-	if err := client.TestOneway(0); err != nil {
-		t.Fatal("TestOneway failed")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/thrifttest_handler.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/thrifttest_handler.go
deleted file mode 100644
index 822a6c7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/thrifttest_handler.go
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * 'License'); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"errors"
-	"thrift"
-	"thrifttest"
-	"time"
-)
-
-type SecondServiceHandler struct {
-}
-
-func NewSecondServiceHandler() *SecondServiceHandler {
-	return &SecondServiceHandler{}
-}
-
-func (p *SecondServiceHandler) BlahBlah() (err error) {
-	return nil
-}
-
-func (p *SecondServiceHandler) SecondtestString(thing string) (r string, err error) {
-	return thing, nil
-}
-
-type ThriftTestHandler struct {
-}
-
-func NewThriftTestHandler() *ThriftTestHandler {
-	return &ThriftTestHandler{}
-}
-
-func (p *ThriftTestHandler) TestVoid() (err error) {
-	return nil
-}
-
-func (p *ThriftTestHandler) TestString(thing string) (r string, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestBool(thing bool) (r bool, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestByte(thing int8) (r int8, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestI32(thing int32) (r int32, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestI64(thing int64) (r int64, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestDouble(thing float64) (r float64, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestBinary(thing []byte) (r []byte, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestStruct(thing *thrifttest.Xtruct) (r *thrifttest.Xtruct, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestNest(thing *thrifttest.Xtruct2) (r *thrifttest.Xtruct2, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestMap(thing map[int32]int32) (r map[int32]int32, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestStringMap(thing map[string]string) (r map[string]string, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestSet(thing map[int32]struct{}) (r map[int32]struct{}, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestList(thing []int32) (r []int32, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestEnum(thing thrifttest.Numberz) (r thrifttest.Numberz, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestTypedef(thing thrifttest.UserId) (r thrifttest.UserId, err error) {
-	return thing, nil
-}
-
-func (p *ThriftTestHandler) TestMapMap(hello int32) (r map[int32]map[int32]int32, err error) {
-	r = make(map[int32]map[int32]int32)
-	pos := make(map[int32]int32)
-	neg := make(map[int32]int32)
-
-	for i := int32(1); i < 5; i++ {
-		pos[i] = i
-		neg[-i] = -i
-	}
-	r[4] = pos
-	r[-4] = neg
-
-	return r, nil
-}
-
-func (p *ThriftTestHandler) TestInsanity(argument *thrifttest.Insanity) (r map[thrifttest.UserId]map[thrifttest.Numberz]*thrifttest.Insanity, err error) {
-	hello := thrifttest.NewXtruct()
-	hello.StringThing = "Hello2"
-	hello.ByteThing = 2
-	hello.I32Thing = 2
-	hello.I64Thing = 2
-
-	goodbye := thrifttest.NewXtruct()
-	goodbye.StringThing = "Goodbye4"
-	goodbye.ByteThing = 4
-	goodbye.I32Thing = 4
-	goodbye.I64Thing = 4
-
-	crazy := thrifttest.NewInsanity()
-	crazy.UserMap = make(map[thrifttest.Numberz]thrifttest.UserId)
-	crazy.UserMap[thrifttest.Numberz_EIGHT] = 8
-	crazy.UserMap[thrifttest.Numberz_FIVE] = 5
-	crazy.Xtructs = []*thrifttest.Xtruct{goodbye, hello}
-
-	first_map := make(map[thrifttest.Numberz]*thrifttest.Insanity)
-	second_map := make(map[thrifttest.Numberz]*thrifttest.Insanity)
-
-	first_map[thrifttest.Numberz_TWO] = crazy
-	first_map[thrifttest.Numberz_THREE] = crazy
-
-	looney := thrifttest.NewInsanity()
-	second_map[thrifttest.Numberz_SIX] = looney
-
-	var insane = make(map[thrifttest.UserId]map[thrifttest.Numberz]*thrifttest.Insanity)
-	insane[1] = first_map
-	insane[2] = second_map
-
-	return insane, nil
-}
-
-func (p *ThriftTestHandler) TestMulti(arg0 int8, arg1 int32, arg2 int64, arg3 map[int16]string, arg4 thrifttest.Numberz, arg5 thrifttest.UserId) (r *thrifttest.Xtruct, err error) {
-	r = thrifttest.NewXtruct()
-	r.StringThing = "Hello2"
-	r.ByteThing = arg0
-	r.I32Thing = arg1
-	r.I64Thing = arg2
-	return r, nil
-}
-
-func (p *ThriftTestHandler) TestException(arg string) (err error) {
-	if arg == "Xception" {
-		x := thrifttest.NewXception()
-		x.ErrorCode = 1001
-		x.Message = arg
-		return x
-	} else if arg == "TException" {
-		return thrift.TException(errors.New(arg))
-	} else {
-		return nil
-	}
-}
-
-func (p *ThriftTestHandler) TestMultiException(arg0 string, arg1 string) (r *thrifttest.Xtruct, err error) {
-	if arg0 == "Xception" {
-		x := thrifttest.NewXception()
-		x.ErrorCode = 1001
-		x.Message = "This is an Xception"
-		return nil, x
-	} else if arg0 == "Xception2" {
-		x2 := thrifttest.NewXception2()
-		x2.ErrorCode = 2002
-		x2.StructThing = thrifttest.NewXtruct()
-		x2.StructThing.StringThing = "This is an Xception2"
-		return nil, x2
-	}
-
-	res := thrifttest.NewXtruct()
-	res.StringThing = arg1
-	return res, nil
-}
-
-func (p *ThriftTestHandler) TestOneway(secondsToSleep int32) (err error) {
-	time.Sleep(time.Second * time.Duration(secondsToSleep))
-	return nil
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/test/tests/union_default_value_test.go b/vendor/git.apache.org/thrift.git/lib/go/test/tests/union_default_value_test.go
deleted file mode 100644
index 2dcbf4e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/test/tests/union_default_value_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package tests
-
-import (
-	"testing"
-	"uniondefaultvaluetest"
-)
-
-func TestUnionDefaultValue(t *testing.T) {
-	s := uniondefaultvaluetest.NewTestStruct()
-	d := s.GetDescendant()
-	if d == nil {
-		t.Error("Default Union value not set!")
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/processor.go b/vendor/git.apache.org/thrift.git/lib/go/thrift/processor.go
deleted file mode 100644
index ca0d3fa..0000000
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/processor.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package thrift
-
-// A processor is a generic object which operates upon an input stream and
-// writes to some output stream.
-type TProcessor interface {
-	Process(in, out TProtocol) (bool, TException)
-}
-
-type TProcessorFunction interface {
-	Process(seqId int32, in, out TProtocol) (bool, TException)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/README.md b/vendor/git.apache.org/thrift.git/lib/haxe/README.md
deleted file mode 100644
index c5ad680..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/README.md
+++ /dev/null
@@ -1,164 +0,0 @@
-Thrift Haxe Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with Haxe
-========================
-
-Haxe setup
----------------
-
-Thrift requires Haxe 3.1.3. Installers for Windows and OSX
-platforms are available at `http://haxe.org/download`. 
-
-Depending on the desired targets, you may have to install the appropriate HaxeLibs 
-after installing Haxe itself. For example, if you plan to target C#, Java and C++,
-enter the following commands after installing Haxe:
-
-    haxelib install hxcpp
-    haxelib install hxjava
-    haxelib install hxcs
-
-For other targets, please consult the Haxe documentation whether or not any additional
-target libraries need to be installed and how to achieve this.
-
-
-Haxe on Linux 
----------------
-
-For Linux platforms it is recommended not to download the 
-binaries manually, instead use the Haxe installation shell 
-script which can be found at `http://www.openfl.org/download`.
-
-If you run into the error message 
-
-    Uncaught exception - load.c(237) : Failed to load library : /usr/lib/neko/regexp.ndll  
-	(libpcre.so.3: cannot open shared object file: No such file or directory)
-
-this can be solved depending on your OSes bitness by either
-
-    sudo ln -sf /usr/lib/libpcre.so.1 /usr/lib/libpcre.so.3
-    sudo ldconfig
-	
-or
-
-    sudo ln -sf /usr/lib64/libpcre.so.1 /usr/lib64/libpcre.so.3
-    sudo ldconfig
-
-Thrift Haxe bindings
--------------------
-	
-Thrift Haxe bindings can be set up via the `haxelib` tool  
-either from the official ASF repo, or via the github mirror.
-
-- To set up any **stable version**, choose the appropriate branch (e.g. `0.9.3`):
-
-    - `haxelib git thrift https://git.apache.org/thrift.git 0.9.3 lib/haxe`
-    - `haxelib git thrift https://github.com/apache/thrift.git 0.9.3 lib/haxe`
-
-- To set up the current **development version**, use the `master` branch:
-  
-    - `haxelib git thrift https://git.apache.org/thrift.git master lib/haxe`	
-    - `haxelib git thrift https://github.com/apache/thrift.git master lib/haxe`
-
-As usual, the installed library can be updated using `haxelib upgrade` 
-or `haxelib update thrift`.
-
-In order to work with Thrift, you will need to install the Thrift compiler 
-or build from source, depending on your operating system. Appropriate 
-downloads and more information can be found at http://thrift.apache.org
-	
-To get started, visit the /tutorial/haxe and /test/haxe dirs for examples. 
-If you are using HIDE or the FlashDevelop IDE, you'll find appropriate 
-project files in these folders.
-
-
-Current status
-========================
-- tested with Haxe C++ target
-- tested with Haxe PHP target (console/web server, binary protocols)
-- transports: Socket, HTTP (servers run inside PHP server/PHP target only), Stream
-- protocols: Binary, JSON, Multiplex, Compact
-- tutorial client and server available
-- cross-test client and server available 
-
-
-Further developments
-========================
-- improve to work with C#, Java and JavaScript Haxe/OpenFL targets
-- improve to work with more (ideally all) Haxe/OpenFL targets
-- add HTTP server, update tutorial and tests accordingly
-
-
-Known restrictions
-========================
-
-Although designed with maximum portability in mind, for technical reasons some platforms
-may only support parts of the library, or not be compatible at all.
-
-Javascript:
-- tutorial fails to build because of unsupported Sys.args
-
-PHP HTTP Server notes
-========================
-
-- you have to import PHP files generated by haxe into PHP
-```php
-require_once  dirname(__FILE__) . '/bin/php-web-server/Main-debug.php';
-```
-
-- trace() by default outputs into stdout (http response), so you have to redirect it to stderr or you own logs, something like
-```haxe
-//remap trace to error log
-haxe.Log.trace = function(v:Dynamic, ?infos:haxe.PosInfos) 
-{ 
-	//simulate normal trace https://github.com/HaxeFoundation/haxe/blob/development/std/haxe/Log.hx
-	var newValue : Dynamic;
-	if (infos != null && infos.customParams!=null) {
-		var extra:String = "";
-		for( v in infos.customParams )
-			extra += "," + v;
-		newValue = v + extra;
-	}
-	else {
-		newValue = v;
-	}
-	var msg = infos != null ? infos.fileName + ':' + infos.lineNumber + ': ' : '';
-	Sys.stderr().writeString('${msg}${newValue}\n');
-}
-```
-
-- to allow thrift server to read/write HTTP request/response, it should be pointed out to php streams
-```haxe
-transport =	new TWrappingServerTransport(
-				new TStreamTransport(
-					new TFileStream("php://input", Read),
-					new TFileStream("php://output", Append)
-					)
-				);
-```
-
-- TSimpleServer doesn't stop after first call, so processor.process() should be called instead, or use runOnce property 
-```haxe
-var server = new TSimpleServer( processor, transport, transfactory, protfactory);
-server.runOnce = true;
-```
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/haxe/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/haxelib.json b/vendor/git.apache.org/thrift.git/lib/haxe/haxelib.json
deleted file mode 100644
index 4c27917..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/haxelib.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"name": "thrift",
-	"url" : "http://thrift.apache.org",
-	"license": "Apache",
-	"tags": ["thrift", "rpc", "serialization", "cross", "framework"],
-	"description": "Haxe bindings for the Apache Thrift RPC and serialization framework",
-	"version": "0.10.0",
-	"releasenote": "Licensed under Apache License, Version 2.0. The Apache Thrift compiler needs to be installed separately.",
-	"contributors": ["Apache Software Foundation (ASF)"],
-	"dependencies": { },
-	"classPath": "src"
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/AbstractMethodError.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/AbstractMethodError.hx
deleted file mode 100644
index 54b8153..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/AbstractMethodError.hx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-#if flash
-import flash.errors.IllegalOperationError;
-#else
-import org.apache.thrift.TException;
-#end
-
-class AbstractMethodError
-#if flash
-extends IllegalOperationError
-#else
-extends TException
-#end
-{
-
-    public function new(message : String="") {
-          super("Attempt to call an abstract method");
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/ArgumentError.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/ArgumentError.hx
deleted file mode 100644
index 3ca04fd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/ArgumentError.hx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-#if ! flash
-// predefined for flash only
-class ArgumentError extends TException {
-    public function new(msg : String = "") {
-        super(msg);
-    }
-}
-#end
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/Limits.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/Limits.hx
deleted file mode 100644
index 44eec3a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/Limits.hx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-class Limits {
-
-    // Haxe limits are not fixed values, they depend on the target platform
-    // For example, neko limits an int to 31 bits instead of 32. So we detect
-    // the values once during intialisation in order to
-    // (a) get the right values for the current  platform, and
-    // (b) prevent us from dependecies to a bunch of defines
-
-    public static var I32_MAX = {
-        var last : Int = 0;
-        var next : Int = 0;
-        for(bit in 0 ... 32) {
-            last = next;
-            next = last | (1 << bit);
-            if(next < 0) {
-                break;
-            }
-        }
-        last; // final value
-    }
-
-    // add whatever you need
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TApplicationException.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TApplicationException.hx
deleted file mode 100644
index 7fe844f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TApplicationException.hx
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TField;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolUtil;
-import org.apache.thrift.protocol.TStruct;
-import org.apache.thrift.protocol.TType;
-
-  /**
-   * Application level exception
-   */
-class TApplicationException extends TException {
-
-    private static var TAPPLICATION_EXCEPTION_STRUCT = { new TStruct("TApplicationException"); };
-    private static var MESSAGE_FIELD = { new TField("message", TType.STRING, 1); };
-    private static var TYPE_FIELD = { new TField("type", TType.I32, 2); };
-
-    // WARNING: These are subject to be extended in the future, so we can't use enums
-    // with Haxe 3.1.3 because of https://github.com/HaxeFoundation/haxe/issues/3649
-    public static inline var UNKNOWN : Int = 0;
-    public static inline var UNKNOWN_METHOD : Int = 1;
-    public static inline var INVALID_MESSAGE_TYPE : Int = 2;
-    public static inline var WRONG_METHOD_NAME : Int = 3;
-    public static inline var BAD_SEQUENCE_ID : Int = 4;
-    public static inline var MISSING_RESULT : Int = 5;
-    public static inline var INTERNAL_ERROR : Int = 6;
-    public static inline var PROTOCOL_ERROR : Int = 7;
-    public static inline var INVALID_TRANSFORM : Int = 8;
-    public static inline var INVALID_PROTOCOL : Int = 9;
-    public static inline var UNSUPPORTED_CLIENT_TYPE : Int = 10;
-
-    public function new(type : Int = UNKNOWN, message : String = "") {
-      super(message, type);
-    }
-
-    public static function read(iprot:TProtocol) : TApplicationException {
-      var field:TField;
-      iprot.readStructBegin();
-
-      var message : String = null;
-      var type : Int = UNKNOWN;
-
-      while (true) {
-        field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) {
-          break;
-        }
-        switch (field.id) {
-          case 1:
-            if (field.type == TType.STRING) {
-              message = iprot.readString();
-            }
-            else {
-              TProtocolUtil.skip(iprot, field.type);
-            }
-          case 2:
-            if (field.type == TType.I32) {
-              type = iprot.readI32();
-            }
-            else {
-              TProtocolUtil.skip(iprot, field.type);
-            }
-          default:
-            TProtocolUtil.skip(iprot, field.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      return new TApplicationException(type, message);
-    }
-
-    public function write(oprot:TProtocol) : Void {
-        oprot.writeStructBegin(TAPPLICATION_EXCEPTION_STRUCT);
-        if (errorMsg != null) {
-          oprot.writeFieldBegin(MESSAGE_FIELD);
-          oprot.writeString(errorMsg);
-          oprot.writeFieldEnd();
-        }
-        oprot.writeFieldBegin(TYPE_FIELD);
-        oprot.writeI32(errorID);
-        oprot.writeFieldEnd();
-        oprot.writeFieldStop();
-        oprot.writeStructEnd();
-      }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TBase.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TBase.hx
deleted file mode 100644
index ede0beb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TBase.hx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-// Make sure we use at least 3.1.3
-// Some Linux platforms have waaaay too old packages in their repos
-// Pro Tip: Look at http://openfl.com for a good Linux install script
-#if( haxe_ver < 3.103)
-#error Haxe 3.1.3 or newer required, sorry!
-#end
-
-import org.apache.thrift.protocol.TProtocol;
-
-  /**
-   * Generic base interface for generated Thrift objects.
-   *
-   */
-interface TBase {
-
-    /**
-     * Reads the TObject from the given input protocol.
-     *
-     * @param iprot Input protocol
-     */
-    function read(iprot:TProtocol) : Void;
-
-    /**
-     * Writes the objects out to the protocol
-     *
-     * @param oprot Output protocol
-     */
-    function write(oprot:TProtocol) : Void;
-
-    /**
-     * Check if a field is currently set or unset.
-     *
-     * @param fieldId The field's id tag as found in the IDL.
-     */
-    function isSet(fieldId : Int) : Bool;
-
-    /**
-     * Get a field's value by id. Primitive types will be wrapped in the
-     * appropriate "boxed" types.
-     *
-     * @param fieldId The field's id tag as found in the IDL.
-     */
-    function getFieldValue(fieldId : Int) : Dynamic;
-
-    /**
-     * Set a field's value by id. Primitive types must be "boxed" in the
-     * appropriate object wrapper type.
-     *
-     * @param fieldId The field's id tag as found in the IDL.
-     */
-    function setFieldValue(fieldId : Int, value : Dynamic) : Void;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TException.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TException.hx
deleted file mode 100644
index 54fa1ff..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TException.hx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-class TException {
-
-    @:isVar
-    public var errorID(default,null) : Int;
-    @:isVar
-    public var errorMsg(default,null) : String;
-
-
-    public function new(msg : String = "", id : Int = 0) {
-        errorID = id;
-        errorMsg = msg;
-    }
-
-}
- 
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TFieldRequirementType.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TFieldRequirementType.hx
deleted file mode 100644
index 039a2cf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TFieldRequirementType.hx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-  /**
-   * Requirement type constants.
-   *
-   */
-@:enum
-abstract TFieldRequirementType(Int)  from Int to Int  {
-    public static inline var REQUIRED : Int = 1;
-    public static inline var OPTIONAL : Int = 2;
-    public static inline var DEFAULT  : Int = 3;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TProcessor.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TProcessor.hx
deleted file mode 100644
index 0cb6f7d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/TProcessor.hx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * A processor is a generic object which operates upon an input stream and
- * writes to some output stream.
- */
-interface TProcessor {
-    function process(input:TProtocol, output:TProtocol) : Bool;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/BitConverter.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/BitConverter.hx
deleted file mode 100644
index ee0aaa8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/BitConverter.hx
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.helper;
-
-import haxe.Int64;
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-
-class BitConverter {
-
-    public static function DoubleToInt64Bits( db : Float) : Int64 {
-        var buf = new BytesBuffer();
-        buf.addDouble( db);
-        return bytesToLong( buf.getBytes());
-    }
-
-
-    public static function Int64BitsToDouble( i64 : Int64) : Float {
-        var buf = new BytesBuffer();
-        buf.add( fixedLongToBytes( i64));
-        return buf.getBytes().getDouble(0);
-    }
-
-
-
-    /**
-     * Convert a long into little-endian bytes in buf starting at off and going
-     * until off+7.
-     */
-    public static function fixedLongToBytes( n : Int64)  : Bytes {
-        var buf = Bytes.alloc(8);
-        #if( haxe_ver < 3.2)
-        buf.set( 0, Int64.getLow( Int64.and( n, Int64.make(0, 0xff))));
-        buf.set( 1, Int64.getLow( Int64.and( Int64.shr( n, 8),  Int64.make(0, 0xff))));
-        buf.set( 2, Int64.getLow( Int64.and( Int64.shr( n, 16), Int64.make(0, 0xff))));
-        buf.set( 3, Int64.getLow( Int64.and( Int64.shr( n, 24), Int64.make(0, 0xff))));
-        buf.set( 4, Int64.getLow( Int64.and( Int64.shr( n, 32), Int64.make(0, 0xff))));
-        buf.set( 5, Int64.getLow( Int64.and( Int64.shr( n, 40), Int64.make(0, 0xff))));
-        buf.set( 6, Int64.getLow( Int64.and( Int64.shr( n, 48), Int64.make(0, 0xff))));
-        buf.set( 7, Int64.getLow( Int64.and( Int64.shr( n, 56), Int64.make(0, 0xff))));
-        #else
-        buf.set( 0, Int64.and( n, Int64.make(0, 0xff)).low);
-        buf.set( 1, Int64.and( Int64.shr( n, 8),  Int64.make(0, 0xff)).low);
-        buf.set( 2, Int64.and( Int64.shr( n, 16), Int64.make(0, 0xff)).low);
-        buf.set( 3, Int64.and( Int64.shr( n, 24), Int64.make(0, 0xff)).low);
-        buf.set( 4, Int64.and( Int64.shr( n, 32), Int64.make(0, 0xff)).low);
-        buf.set( 5, Int64.and( Int64.shr( n, 40), Int64.make(0, 0xff)).low);
-        buf.set( 6, Int64.and( Int64.shr( n, 48), Int64.make(0, 0xff)).low);
-        buf.set( 7, Int64.and( Int64.shr( n, 56), Int64.make(0, 0xff)).low);
-        #end
-        return buf;
-    }
-
-    /**
-     * Note that it's important that the mask bytes are long literals,
-     * otherwise they'll default to ints, and when you shift an int left 56 bits,
-     * you just get a messed up int.
-     */
-    public static function bytesToLong( bytes : Bytes) : Int64 {
-        var result : Int64 = Int64.make(0, 0);
-        result = Int64.or( Int64.shl( result, 8), Int64.make( 0, bytes.get(7)));
-        result = Int64.or( Int64.shl( result, 8), Int64.make( 0, bytes.get(6)));
-        result = Int64.or( Int64.shl( result, 8), Int64.make( 0, bytes.get(5)));
-        result = Int64.or( Int64.shl( result, 8), Int64.make( 0, bytes.get(4)));
-        result = Int64.or( Int64.shl( result, 8), Int64.make( 0, bytes.get(3)));
-        result = Int64.or( Int64.shl( result, 8), Int64.make( 0, bytes.get(2)));
-        result = Int64.or( Int64.shl( result, 8), Int64.make( 0, bytes.get(1)));
-        result = Int64.or( Int64.shl( result, 8), Int64.make( 0, bytes.get(0)));
-        return result;
-    }
-
-
-    #if debug
-    private static function TestBTL( test : Int64) : Void {
-        var buf : Bytes = fixedLongToBytes( test);
-        var erg = bytesToLong(buf);
-        if ( Int64.compare( erg, test) != 0)
-            throw 'BitConverter.bytesToLongTest($test) failed: $erg';
-    }
-    #end
-
-
-    #if debug
-    private static function TestPair( a : Float, b : Int64) : Void {
-        var bx = DoubleToInt64Bits(a);
-        if ( Int64.compare( bx, b) != 0)
-            throw 'BitConverter.TestPair: DoubleToInt64Bits($a): expected $b, got $bx';
-        var ax = Int64BitsToDouble(b);
-        if( ax != a)
-            throw 'BitConverter.TestPair: Int64BitsToDouble($b: expected $a, got  $ax';
-    }
-    #end
-
-
-    #if debug
-    public static function UnitTest() : Void {
-
-        // bytesToLong()
-        var i : Int;
-        TestBTL( Int64.make(0,0));
-        for ( i in 0 ... 62) {
-            TestBTL( Int64.shl( Int64.make(0,1), i));
-            TestBTL( Int64.sub( Int64.make(0,0), Int64.shl( Int64.make(0,1), i)));
-        }
-        TestBTL( Int64.make(0x7FFFFFFF,0xFFFFFFFF));
-        TestBTL( Int64.make(cast(0x80000000,Int),0x00000000));
-
-        // DoubleToInt64Bits;
-        TestPair( 1.0000000000000000E+000,  Int64.make(cast(0x3FF00000,Int),cast(0x00000000,Int)));
-        TestPair( 1.5000000000000000E+001,  Int64.make(cast(0x402E0000,Int),cast(0x00000000,Int)));
-        TestPair( 2.5500000000000000E+002,  Int64.make(cast(0x406FE000,Int),cast(0x00000000,Int)));
-        TestPair( 4.2949672950000000E+009,  Int64.make(cast(0x41EFFFFF,Int),cast(0xFFE00000,Int)));
-        TestPair( 3.9062500000000000E-003,  Int64.make(cast(0x3F700000,Int),cast(0x00000000,Int)));
-        TestPair( 2.3283064365386963E-010,  Int64.make(cast(0x3DF00000,Int),cast(0x00000000,Int)));
-        TestPair( 1.2345678901230000E-300,  Int64.make(cast(0x01AA74FE,Int),cast(0x1C1E7E45,Int)));
-        TestPair( 1.2345678901234500E-150,  Int64.make(cast(0x20D02A36,Int),cast(0x586DB4BB,Int)));
-        TestPair( 1.2345678901234565E+000,  Int64.make(cast(0x3FF3C0CA,Int),cast(0x428C59FA,Int)));
-        TestPair( 1.2345678901234567E+000,  Int64.make(cast(0x3FF3C0CA,Int),cast(0x428C59FB,Int)));
-        TestPair( 1.2345678901234569E+000,  Int64.make(cast(0x3FF3C0CA,Int),cast(0x428C59FC,Int)));
-        TestPair( 1.2345678901234569E+150,  Int64.make(cast(0x5F182344,Int),cast(0xCD3CDF9F,Int)));
-        TestPair( 1.2345678901234569E+300,  Int64.make(cast(0x7E3D7EE8,Int),cast(0xBCBBD352,Int)));
-        TestPair( -1.7976931348623157E+308, Int64.make(cast(0xFFEFFFFF,Int),cast(0xFFFFFFFF,Int)));
-        TestPair( 1.7976931348623157E+308,  Int64.make(cast(0x7FEFFFFF,Int),cast(0xFFFFFFFF,Int)));
-        TestPair( 4.9406564584124654E-324,  Int64.make(cast(0x00000000,Int),cast(0x00000001,Int)));
-        TestPair( 0.0000000000000000E+000,  Int64.make(cast(0x00000000,Int),cast(0x00000000,Int)));
-        TestPair( 4.94065645841247E-324,    Int64.make(cast(0x00000000,Int),cast(0x00000001,Int)));
-        TestPair( 3.2378592100206092E-319,  Int64.make(cast(0x00000000,Int),cast(0x0000FFFF,Int)));
-        TestPair( 1.3906711615669959E-309,  Int64.make(cast(0x0000FFFF,Int),cast(0xFFFFFFFF,Int)));
-        TestPair( Math.NEGATIVE_INFINITY,   Int64.make(cast(0xFFF00000,Int),cast(0x00000000,Int)));
-        TestPair( Math.POSITIVE_INFINITY,   Int64.make(cast(0x7FF00000,Int),cast(0x00000000,Int)));
-
-        // NaN is special
-        var i64nan = DoubleToInt64Bits( Math.NaN);
-        var i64cmp = Int64.make(cast(0xFFF80000, Int), cast(0x00000000, Int));
-        if ( ! Math.isNaN( Int64BitsToDouble( i64cmp)))
-            throw 'BitConverter NaN-Test #1: expected NaN';
-
-        // For doubles, a quiet NaN is a bit pattern
-        // between 7FF8000000000000 and 7FFFFFFFFFFFFFFF
-        //      or FFF8000000000000 and FFFFFFFFFFFFFFFF
-        var min1 = Int64.make( cast(0x7FF80000, Int), cast(0x00000000, Int));
-        var max1 = Int64.make( cast(0x7FFFFFFF, Int), cast(0xFFFFFFFF, Int));
-        var min2 = Int64.make( cast(0xFFF80000, Int), cast(0x00000000, Int));
-        var max2 = Int64.make( cast(0xFFFFFFFF, Int), cast(0xFFFFFFFF, Int));
-        var ok1 =  (Int64.compare( min1, i64nan) <= 0) && (Int64.compare( i64nan, max1) <= 0);
-        var ok2 =  (Int64.compare( min2, i64nan) <= 0) && (Int64.compare( i64nan, max2) <= 0);
-        if( ! (ok1 || ok2))
-            throw 'BitConverter NaN-Test #2: failed';
-    }
-    #end
-
-}
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/Int64Map.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/Int64Map.hx
deleted file mode 100644
index 8845fd0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/Int64Map.hx
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.helper;
-
-import Map;
-import haxe.Int64;
-import haxe.ds.IntMap;
-
-
-// Int64Map allows mapping of Int64 keys to arbitrary values.
-// ObjectMap<> cannot be used, since we want to compare by value, not address
-
-class Int64Map<T> implements IMap< Int64, T> {
-
-    private var SubMaps : IntMap< IntMap< T>>;  // Hi -> Lo -> Value
-
-    public function new() : Void {
-        SubMaps = new IntMap< IntMap< T>>();
-    };
-
-    private function GetSubMap( hi : haxe.Int32, canCreate : Bool) : IntMap< T> {
-        if( SubMaps.exists(hi)) {
-            return SubMaps.get(hi);
-        }
-
-        if( ! canCreate) {
-            return null;
-        }
-
-        var lomap = new IntMap< T>();
-        SubMaps.set( hi, lomap);
-        return lomap;
-    }
-
-
-    private function GetLowMap( key : haxe.Int64, canCreate : Bool) : IntMap< T> {
-        #if( haxe_ver < 3.2)
-        return GetSubMap( Int64.getHigh(key), canCreate);
-        #else
-        return GetSubMap( key.high, canCreate);
-        #end
-    }
-
-
-    private function GetLowIndex( key : haxe.Int64) : haxe.Int32 {
-        #if( haxe_ver < 3.2)
-        return Int64.getLow(key);
-        #else
-        return key.low;
-        #end
-    }
-
-
-    private function NullCheck( key : haxe.Int64) : Bool {
-        #if( haxe_ver < 3.2)
-        return (key != null);
-        #else
-        return true;  // Int64 is not nullable anymore (it never really was)
-        #end
-    };
-
-
-
-    /**
-        Maps `key` to `value`.
-        If `key` already has a mapping, the previous value disappears.
-        If `key` is null, the result is unspecified.
-    **/
-    public function set( key : Int64, value : T ) : Void {
-        if( ! NullCheck(key)) {
-            return;
-        }
-
-        var lomap = GetLowMap( key, true);
-        lomap.set( GetLowIndex(key), value);
-    }
-
-
-    /**
-        Returns the current mapping of `key`.
-        If no such mapping exists, null is returned.
-        If `key` is null, the result is unspecified.
-
-        Note that a check like `map.get(key) == null` can hold for two reasons:
-
-            1. the map has no mapping for `key`
-            2. the map has a mapping with a value of `null`
-
-        If it is important to distinguish these cases, `exists()` should be
-        used.
-
-    **/
-    public function get( key : Int64) : Null<T> {
-        if( ! NullCheck(key)) {
-            return null;
-        }
-
-        var lomap = GetLowMap( key, true);
-        if( lomap == null) {
-            return null;
-        }
-
-        return lomap.get( GetLowIndex(key));
-    }
-
-    /**
-        Returns true if `key` has a mapping, false otherwise.
-        If `key` is null, the result is unspecified.
-    **/
-    public function exists( key : Int64) : Bool {
-        if( ! NullCheck(key)) {
-            return false;
-        }
-
-        var lomap = GetLowMap( key, true);
-        if( lomap == null) {
-            return false;
-        }
-
-        return lomap.exists( GetLowIndex(key));
-    }
-
-    /**
-        Removes the mapping of `key` and returns true if such a mapping existed,
-        false otherwise. If `key` is null, the result is unspecified.
-    **/
-    public function remove( key : Int64) : Bool {
-        if( ! NullCheck(key)) {
-            return false;
-        }
-
-        var lomap = GetLowMap( key, true);
-        if( lomap == null) {
-            return false;
-        }
-
-        return lomap.remove( GetLowIndex(key));
-    }
-
-
-    /**
-        Returns an Iterator over the keys of `this` Map.
-        The order of keys is undefined.
-    **/
-    public function keys() : Iterator<Int64> {
-        return new Int64KeyIterator<T>(SubMaps);
-    }
-
-    /**
-        Returns an Iterator over the values of `this` Map.
-        The order of values is undefined.
-    **/
-    public function iterator() : Iterator<T> {
-        return new Int64ValueIterator<T>(SubMaps);
-    }
-
-    /**
-        Returns a String representation of `this` Map.
-        The exact representation depends on the platform and key-type.
-    **/
-    public function toString() : String {
-        var result : String = "{";
-
-        var first = true;
-        for( key in this.keys()) {
-            if( first) {
-                first = false;
-            } else {
-                result += ",";
-            }
-
-            result += " ";
-            var value = this.get(key);
-            result += Int64.toStr(key) + ' => $value';
-        }
-
-        return result + "}";
-    }
-
-}
-
-
-// internal helper class for Int64Map<T>
-// all class with matching methods can be used as iterator (duck typing)
-private class Int64MapIteratorBase<T> {
-
-    private var SubMaps : IntMap< IntMap< T>>;  // Hi -> Lo -> Value
-
-    private var HiIterator : Iterator< Int> = null;
-    private var LoIterator : Iterator< Int> = null;
-    private var CurrentHi : Int = 0;
-
-    public function new( data : IntMap< IntMap< T>>) : Void {
-        SubMaps = data;
-        HiIterator = SubMaps.keys();
-        LoIterator = null;
-        CurrentHi = 0;
-    };
-
-    /**
-        Returns false if the iteration is complete, true otherwise.
-
-        Usually iteration is considered to be complete if all elements of the
-        underlying data structure were handled through calls to next(). However,
-        in custom iterators any logic may be used to determine the completion
-        state.
-    **/
-    public function hasNext() : Bool {
-
-        if( (LoIterator != null) && LoIterator.hasNext()) {
-            return true;
-        }
-
-        while( (HiIterator != null) && HiIterator.hasNext()) {
-            CurrentHi = HiIterator.next();
-            LoIterator = SubMaps.get(CurrentHi).keys();
-            if( (LoIterator != null) && LoIterator.hasNext()) {
-                return true;
-            }
-        }
-
-        HiIterator = null;
-        LoIterator = null;
-        return false;
-    }
-
-}
-
-
-// internal helper class for Int64Map<T>
-// all class with matching methods can be used as iterator (duck typing)
-private class Int64KeyIterator<T>extends Int64MapIteratorBase<T> {
-
-    public function new( data : IntMap< IntMap< T>>) : Void {
-        super(data);
-    };
-
-    /**
-        Returns the current item of the Iterator and advances to the next one.
-
-        This method is not required to check hasNext() first. A call to this
-        method while hasNext() is false yields unspecified behavior.
-    **/
-    public function next() : Int64 {
-        if( hasNext()) {
-            return Int64.make( CurrentHi, LoIterator.next());
-        } else {
-            throw "no more elements";
-        }
-    }
-}
-
-
-// internal helper class for Int64Map<T>
-// all class with matching methods can be used as iterator (duck typing)
-private class Int64ValueIterator<T> extends Int64MapIteratorBase<T> {
-
-    public function new( data : IntMap< IntMap< T>>) : Void {
-        super(data);
-    };
-
-    /**
-        Returns the current item of the Iterator and advances to the next one.
-
-        This method is not required to check hasNext() first. A call to this
-        method while hasNext() is false yields unspecified behavior.
-    **/
-    public function next() : T {
-        if( hasNext()) {
-            return SubMaps.get(CurrentHi).get(LoIterator.next());
-        } else {
-            throw "no more elements";
-        }
-    }
-}
-
-
-// EOF
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/IntSet.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/IntSet.hx
deleted file mode 100644
index 91e5d8e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/IntSet.hx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.helper;
-
-import Map;
-
-
-class IntSet {
-
-    private var _elements = new haxe.ds.IntMap<Int>();
-    private var _size : Int = 0;
-    public var size(get,never) : Int;
-
-    public function new( values : Array<Int> = null) {
-        if ( values != null) {
-            for ( value in values) {
-                 add(value);
-            }
-        }
-    }
-
-    public function iterator():Iterator<Int> {
-        return _elements.keys();
-    }
-
-    public function traceAll() : Void {
-        trace('$_size entries');
-        for(entry in this) {
-            var yes = contains(entry);
-            trace('- $entry, contains() = $yes');
-        }
-    }
-
-    public function add(o : Int) : Bool {
-        if( _elements.exists(o)) {
-            return false;
-        }
-        _size++;
-        _elements.set(o,_size);
-        return true;
-    }
-
-    public function clear() : Void {
-        while( _size > 0) {
-            remove( _elements.keys().next());
-        }
-    }
-
-    public function contains(o : Int) : Bool {
-        return _elements.exists(o);
-    }
-
-    public function isEmpty() : Bool {
-        return _size == 0;
-    }
-
-    public function remove(o : Int) : Bool {
-        if (contains(o)) {
-            _elements.remove(o);
-            _size--;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function toArray() : Array<Int> {
-        var ret : Array<Int> = new Array<Int>();
-        for (key in _elements.keys()) {
-            ret.push(key);
-        }
-        return ret;
-    }
-
-    public function get_size() : Int {
-        return _size;
-    }
-}
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/ObjectSet.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/ObjectSet.hx
deleted file mode 100644
index bcf72fb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/ObjectSet.hx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.helper;
-
-import Map;
-
-
-class ObjectSet<K> {
-
-    private var _elements = new haxe.ds.ObjectMap<K,Int>();
-    private var _size : Int = 0;
-    public var size(get,never) : Int;
-
-    public function new( values : Array<K> = null) {
-        if ( values != null) {
-            for ( value in values) {
-                 add(value);
-            }
-        }
-    }
-
-    public function iterator():Iterator<K> {
-        return _elements.keys();
-    }
-
-    public function traceAll() : Void {
-        trace('$_size entries');
-        for(entry in this) {
-            var yes = contains(entry);
-            trace('- $entry, contains() = $yes');
-        }
-    }
-
-    public function add(o : K) : Bool {
-        if( _elements.exists(o)) {
-            return false;
-        }
-        _size++;
-        _elements.set(o,_size);
-        return true;
-    }
-
-    public function clear() : Void {
-        while( _size > 0) {
-            remove( _elements.keys().next());
-        }
-    }
-
-    public function contains(o : K) : Bool {
-        return _elements.exists(o);
-    }
-
-    public function isEmpty() : Bool {
-        return _size == 0;
-    }
-
-    public function remove(o : K) : Bool {
-        if (contains(o)) {
-            _elements.remove(o);
-            _size--;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function toArray() : Array<K> {
-        var ret : Array<K> = new Array<K>();
-        for (key in _elements.keys()) {
-            ret.push(key);
-        }
-        return ret;
-    }
-
-    public function get_size() : Int {
-        return _size;
-    }
-}
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/StringSet.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/StringSet.hx
deleted file mode 100644
index d8c0d90..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/StringSet.hx
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.helper;
-
-import Map;
-
-
-class StringSet {
-
-    private var _elements = new haxe.ds.StringMap<Int>();
-    private var _size : Int = 0;
-    public var size(get,never) : Int;
-
-    public function new( values : Array<String> = null) {
-        if ( values != null) {
-            for ( value in values) {
-                 add(value);
-            }
-        }
-    }
-
-    public function iterator():Iterator<String> {
-        return _elements.keys();
-    }
-
-    public function traceAll() : Void {
-        trace('$_size entries');
-        for(entry in this) {
-            var yes = contains(entry);
-            trace('- $entry, contains() = $yes');
-        }
-    }
-
-    public function add(o : String) : Bool {
-        if( _elements.exists(o)) {
-            return false;
-        }
-        _size++;
-        _elements.set(o,_size);
-        return true;
-    }
-
-    public function clear() : Void {
-        while( _size > 0) {
-            remove( _elements.keys().next());
-        }
-    }
-
-    public function contains(o : String) : Bool {
-        return _elements.exists(o);
-    }
-
-    public function isEmpty() : Bool {
-        return _size == 0;
-    }
-
-    public function remove(o : String) : Bool {
-        if (contains(o)) {
-            _elements.remove(o);
-            _size--;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function toArray() : Array<String> {
-        var ret : Array<String> = new Array<String>();
-        for (key in _elements.keys()) {
-            ret.push(key);
-        }
-        return ret;
-    }
-
-    public function get_size() : String {
-        return _size;
-    }
-}
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/ZigZag.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/ZigZag.hx
deleted file mode 100644
index 3f8601b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/helper/ZigZag.hx
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.helper;
-
-import haxe.Int64;
-import haxe.Int32;
-
-class ZigZag {
-
-    /**
-     * Convert n into a zigzag int. This allows negative numbers to be
-     * represented compactly as a varint.
-     */
-    public static function FromInt( n : Int) : UInt    {
-        #if php
-
-        return cast(cast(cast(n,Int32) << 1,Int32) ^ cast(cast(n,Int32) >> 31,Int32),UInt);
-
-        #else
-
-        return cast(n << 1,UInt) ^ cast(n >> 31,UInt);
-
-        #end
-    }
-
-
-    /**
-     * Convert from zigzag int to int.
-     */
-    public static function ToInt( n : UInt) : Int {
-        #if php
-
-        var a = (0x7FFFFFFF & cast(n >> 1,Int));
-        var b = (cast(n & 1,Int));
-        b = -b;  // workaround for https://github.com/HaxeFoundation/haxe/issues/5288
-        return a ^ b;
-
-        #else
-
-        return (0x7FFFFFFF & cast(n >> 1,Int)) ^ (-cast(n & 1,Int));
-
-        #end
-    }
-
-
-    /**
-     * Convert l into a zigzag long. This allows negative numbers to be
-     * represented compactly as a varint.
-     */
-    public static function FromLong( n : Int64) : Int64 {
-        return Int64.xor( Int64.shl(n, 1), Int64.shr(n, 63));
-    }
-
-
-    /**
-     * Convert from zigzag long to long.
-     */
-    public static function ToLong( n : Int64) : Int64 {
-        return Int64.xor(
-            Int64.and(
-                Int64.shr(n, 1),
-                Int64.make(0x7FFFFFFF, 0xFFFFFFFF)),
-            Int64.sub(
-                Int64.make(0, 0),
-                Int64.and(n, Int64.make(0,1))));
-    }
-
-
-    #if debug
-    private static function Test32( test : Int) : Void {
-        var a : UInt = ZigZag.FromInt( test);
-        var b : Int = ZigZag.ToInt(a);
-        #if php
-        test = test & 0xFFFFFFFF;  // workaround for https://github.com/HaxeFoundation/haxe/issues/5289
-        #end
-        if( test != b)
-            throw 'ZigZag.Test32($test) failed: a = $a, b = $b';
-    }
-    #end
-
-
-
-    #if debug
-    private static function Test64( test : haxe.Int64) : Void {
-        var a : Int64 = ZigZag.FromLong( test);
-        var b : Int64 = ZigZag.ToLong(a);
-        if( Int64.compare( test, b) != 0)
-            throw 'ZigZag.Test64($test) failed: a = $a, b = $b';
-    }
-    #end
-
-
-    #if debug
-    public static function UnitTest() : Void {
-      var u1 : UInt = 0xFFFFFFFE;
-      var u2 : UInt = 0xFFFFFFFF;
-      var i1 : Int = 2147483647;
-      var i2 : Int = -2147483648;
-
-      #if php
-      i2 = i2 & 0xFFFFFFFF;  // workaround for https://github.com/HaxeFoundation/haxe/issues/5289
-      #end
-
-      // protobuf testcases
-      if( FromInt(0)  != 0) throw 'pb #1 to ZigZag';
-      if( FromInt(-1) != 1) throw 'pb #2 to ZigZag';
-      if( FromInt(1)  != 2) throw 'pb #3 to ZigZag';
-      if( FromInt(-2) != 3) throw 'pb #4 to ZigZag';
-      if( FromInt(i1) != u1) throw 'pb #5 to ZigZag';
-      if( FromInt(i2) != u2) throw 'pb #6 to ZigZag';
-
-      // protobuf testcases
-      if( ToInt(0) != 0) throw 'pb #1 from ZigZag';
-      if( ToInt(1) != -1) throw 'pb #2 from ZigZag';
-      if( ToInt(2) != 1) throw 'pb #3 from ZigZag';
-      if( ToInt(3) != -2) throw 'pb #4 from ZigZag';
-      if( ToInt(u1) != i1) throw 'pb #5 from ZigZag, got ${ToInt(u1)} expected $i1';
-      if( ToInt(u2) != i2) throw 'pb #6 from ZigZag, got ${ToInt(u2)} expected $i2';
-
-      // back and forth 32
-      Test32( 0);
-      for( i in 0 ... 30) {
-        Test32( 1 << i);
-        Test32( -(1  << i));
-      }
-      Test32( 0x7FFFFFFF);
-      Test32( cast(0x80000000,Int));
-
-      // back and forth 64
-      Test64( Int64.make(0,0));
-      for( i in 0 ... 62) {
-        Test64( Int64.shl( Int64.make(0,1), i));
-        Test64( Int64.sub( Int64.make(0,0), Int64.shl( Int64.make(0,1), i)));
-      }
-      Test64( Int64.make(0x7FFFFFFF,0xFFFFFFFF));
-      Test64( Int64.make(cast(0x80000000,Int),0x00000000));
-    }
-    #end
-}
-
-   
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/FieldMetaData.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/FieldMetaData.hx
deleted file mode 100644
index 26db113..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/FieldMetaData.hx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import flash.utils.Dictionary;
-
-/**
-* This class is used to store meta data about thrift fields. Every field in a
-* a struct should have a corresponding instance of this class describing it.
-*
-*/
-class FieldMetaData {
-
-  public var fieldName : String;
-  public var requirementType : Int;
-  public var valueMetaData:FieldValueMetaData;
-
-  private static var structMap:Dictionary = new Dictionary();
-
-  public function FieldMetaData(name : String, req : Int, vMetaData:FieldValueMetaData) {
-    this.fieldName = name;
-    this.requirementType = req;
-    this.valueMetaData = vMetaData;
-  }
-
-  public static function addStructMetaDataMap(sClass:Class, map:Dictionary) : Void{
-    structMap[sClass] = map;
-  }
-
-  /**
-   * Returns a map with metadata (i.e. instances of FieldMetaData) that
-   * describe the fields of the given class.
-   *
-   * @param sClass The TBase class for which the metadata map is requested
-   */
-  public static function getStructMetaDataMap(sClass:Class):Dictionary {
-    return structMap[sClass];
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/FieldValueMetaData.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/FieldValueMetaData.hx
deleted file mode 100644
index 8879d91..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/FieldValueMetaData.hx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.protocol.TType;
-
-/**
- * FieldValueMetaData and collection of subclasses to store metadata about
- * the value(s) of a field
- */
-class FieldValueMetaData {
-
-  public var type : Int;
-
-  public function FieldValueMetaData(type : Int) {
-    this.type = type;
-  }
-
-  public function isStruct() : Bool {
-    return type == TType.STRUCT;
-  }
-
-  public function isContainer() : Bool {
-    return type == TType.LIST || type == TType.MAP || type == TType.SET;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/ListMetaData.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/ListMetaData.hx
deleted file mode 100644
index 40ca31b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/ListMetaData.hx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-class ListMetaData extends FieldValueMetaData {
-
-    public var elemMetaData:FieldValueMetaData;
-
-    public function ListMetaData(type : Int, eMetaData:FieldValueMetaData) {
-      super(type);
-      this.elemMetaData = eMetaData;
-    }
-}
- 
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/MapMetaData.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/MapMetaData.hx
deleted file mode 100644
index 5463e62..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/MapMetaData.hx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-class MapMetaData extends FieldValueMetaData {
-
-    public var keyMetaData:FieldValueMetaData;
-    public var valueMetaData:FieldValueMetaData;
-
-    public function MapMetaData(type : Int, kMetaData:FieldValueMetaData, vMetaData:FieldValueMetaData) {
-      super(type);
-      this.keyMetaData = kMetaData;
-      this.valueMetaData = vMetaData;
-    }
-}
-   
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/SetMetaData.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/SetMetaData.hx
deleted file mode 100644
index a3367f4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/SetMetaData.hx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-class SetMetaData extends FieldValueMetaData {
-
-    public var elemMetaData:FieldValueMetaData;
-
-    public function SetMetaData(type : Int, eMetaData:FieldValueMetaData) {
-      super(type);
-      this.elemMetaData = eMetaData;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/StructMetaData.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/StructMetaData.hx
deleted file mode 100644
index 1822dd3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/meta_data/StructMetaData.hx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-class StructMetaData extends FieldValueMetaData {
-
-    public var structClass:Class;
-
-    public function StructMetaData(type : Int, sClass:Class) {
-      super(type);
-      this.structClass = sClass;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TBinaryProtocol.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TBinaryProtocol.hx
deleted file mode 100644
index 7ef291c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TBinaryProtocol.hx
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import haxe.io.Bytes;
-import haxe.io.BytesInput;
-import haxe.io.BytesOutput;
-import haxe.io.BytesBuffer;
-import haxe.Int64;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
-* Binary protocol implementation for thrift.
-*/
-class TBinaryProtocol extends TRecursionTracker implements TProtocol {
-
-    private static var ANONYMOUS_STRUCT:TStruct = new TStruct();
-
-    private static inline var VERSION_MASK : haxe.Int32 = 0xffff0000;
-    private static inline var VERSION_1 : haxe.Int32 = 0x80010000;
-
-    private var strictRead_ : Bool = false;
-    private var strictWrite_ : Bool = true;
-    private var trans_ : TTransport;
-
-    /**
-     * Constructor
-     */
-    public function new(trans:TTransport, strictRead : Bool=false, strictWrite : Bool=true) {
-      trans_ = trans;
-      strictRead_ = strictRead;
-      strictWrite_ = strictWrite;
-    }
-
-    public function getTransport():TTransport {
-      return trans_;
-    }
-
-    public function writeMessageBegin(message:TMessage) : Void {
-        if (strictWrite_) {
-          var version : Int = VERSION_1 | message.type;
-          writeI32(version);
-          writeString(message.name);
-          writeI32(message.seqid);
-        } else {
-          writeString(message.name);
-          writeByte(message.type);
-          writeI32(message.seqid);
-        }
-    }
-
-    public function writeMessageEnd() : Void {}
-
-    public function writeStructBegin(struct:TStruct) : Void {}
-
-    public function writeStructEnd() : Void {}
-
-    public function writeFieldBegin(field:TField) : Void {
-      writeByte(field.type);
-      writeI16(field.id);
-    }
-
-    public function writeFieldEnd() : Void {}
-
-    public function writeFieldStop() : Void {
-      writeByte(TType.STOP);
-    }
-
-    public function writeMapBegin(map:TMap) : Void {
-      writeByte(map.keyType);
-      writeByte(map.valueType);
-      writeI32(map.size);
-    }
-
-    public function writeMapEnd() : Void {}
-
-    public function writeListBegin(list:TList) : Void {
-        writeByte(list.elemType);
-        writeI32(list.size);
-    }
-
-    public function writeListEnd() : Void {}
-
-    public function writeSetBegin(set:TSet) : Void {
-        writeByte(set.elemType);
-        writeI32(set.size);
-    }
-
-    public function writeSetEnd() : Void {}
-
-    public function writeBool(b : Bool) : Void {
-        writeByte(b ? 1 : 0);
-    }
-
-
-    public function writeByte(b : Int) : Void {
-        var out = new BytesOutput();
-        out.bigEndian = true;
-        out.writeByte(b);
-        trans_.write(out.getBytes(), 0, 1);
-    }
-
-    public function writeI16(i16 : Int) : Void {
-        var out = new BytesOutput();
-        out.bigEndian = true;
-        out.writeInt16(i16);
-        trans_.write(out.getBytes(), 0, 2);
-    }
-
-    public function writeI32(i32 : Int) : Void {
-        var out = new BytesOutput();
-        out.bigEndian = true;
-        out.writeInt32(i32);
-        trans_.write(out.getBytes(), 0, 4);
-    }
-
-    public function writeI64(i64 : haxe.Int64) : Void {
-        var out = new BytesOutput();
-        out.bigEndian = true;
-        #if( haxe_ver < 3.2)
-        var hi = Int64.getHigh(i64);
-        var lo = Int64.getLow(i64);
-        out.writeInt32(hi);
-        out.writeInt32(lo);
-        #else
-        out.writeInt32(i64.high);
-        out.writeInt32(i64.low);
-        #end
-        trans_.write(out.getBytes(), 0, 8);
-    }
-
-    public function writeDouble(dub:Float) : Void {
-        var out = new BytesOutput();
-        out.bigEndian = true;
-        out.writeDouble(dub);
-        trans_.write(out.getBytes(), 0, 8);
-    }
-
-    public function writeString(str : String) : Void {
-        var out = new BytesOutput();
-        out.bigEndian = true;
-        out.writeString(str);
-        var bytes = out.getBytes();
-        writeI32( bytes.length);
-        trans_.write( bytes, 0, bytes.length);
-    }
-
-    public function writeBinary(bin:Bytes) : Void {
-        writeI32(bin.length);
-        trans_.write(bin, 0, bin.length);
-    }
-
-    /**
-     * Reading methods.
-     */
-
-    public function readMessageBegin():TMessage {
-        var size : Int = readI32();
-        if (size < 0) {
-            var version : Int = size & VERSION_MASK;
-            if (version != VERSION_1) {
-                throw new TProtocolException(TProtocolException.BAD_VERSION, "Bad version in readMessageBegin");
-            }
-            return new TMessage(readString(), size & 0x000000ff, readI32());
-        } else {
-            if (strictRead_) {
-                throw new TProtocolException(TProtocolException.BAD_VERSION, "Missing version in readMessageBegin, old client?");
-            }
-            return new TMessage(readStringBody(size), readByte(), readI32());
-        }
-    }
-
-    public function readMessageEnd() : Void {}
-
-    public function readStructBegin():TStruct {
-        return ANONYMOUS_STRUCT;
-    }
-
-    public function readStructEnd() : Void {}
-
-    public function readFieldBegin() : TField {
-        var type : Int = readByte();
-        var id : Int = 0;
-        if (type != TType.STOP)
-        {
-            id = readI16();
-        }
-        return new TField("", type, id);
-    }
-
-    public function readFieldEnd() : Void {}
-
-    public function readMapBegin() : TMap {
-        return new TMap(readByte(), readByte(), readI32());
-    }
-
-    public function readMapEnd() : Void {}
-
-    public function readListBegin():TList {
-        return new TList(readByte(), readI32());
-    }
-
-    public function readListEnd() : Void {}
-
-    public function readSetBegin() : TSet {
-      return new TSet(readByte(), readI32());
-    }
-
-    public function readSetEnd() : Void {}
-
-    public function readBool() : Bool {
-        return (readByte() == 1);
-    }
-
-
-    public function readByte() : Int {
-        var buffer = new BytesBuffer();
-        var len = trans_.readAll( buffer, 0, 1);
-        var inp = new BytesInput( buffer.getBytes(), 0, 1);
-        inp.bigEndian = true;
-        return inp.readByte();
-    }
-
-    public function readI16() : Int {
-        var buffer = new BytesBuffer();
-        var len = trans_.readAll( buffer, 0, 2);
-        var inp = new BytesInput( buffer.getBytes(), 0, 2);
-        inp.bigEndian = true;
-        return inp.readInt16();
-    }
-
-    public function readI32() : Int {
-        var buffer = new BytesBuffer();
-        var len = trans_.readAll( buffer, 0, 4);
-        var inp = new BytesInput( buffer.getBytes(), 0, 4);
-        inp.bigEndian = true;
-        return inp.readInt32();
-    }
-
-    public function readI64() : haxe.Int64 {
-        var buffer = new BytesBuffer();
-        var len = trans_.readAll( buffer, 0, 8);
-        var inp = new BytesInput( buffer.getBytes(), 0, 8);
-        inp.bigEndian = true;
-        var hi = inp.readInt32();
-        var lo = inp.readInt32();
-        return Int64.make(hi,lo);
-    }
-
-    public function readDouble():Float {
-        var buffer = new BytesBuffer();
-        var len = trans_.readAll( buffer, 0, 8);
-        var inp = new BytesInput( buffer.getBytes(), 0, 8);
-        inp.bigEndian = true;
-        return inp.readDouble();
-    }
-
-    public function readString() : String {
-        return readStringBody( readI32());
-    }
-
-    public function readStringBody(len : Int) : String {
-        if( len > 0) {
-            var buffer = new BytesBuffer();
-            trans_.readAll( buffer, 0, len);
-            var inp = new BytesInput( buffer.getBytes(), 0, len);
-            inp.bigEndian = true;
-            return inp.readString(len);
-        } else {
-            return "";
-        }
-    }
-
-    public function readBinary() : Bytes {
-        var len : Int = readI32();
-        var buffer = new BytesBuffer();
-        trans_.readAll( buffer, 0, len);
-        return buffer.getBytes();
-    }
-
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TBinaryProtocolFactory.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TBinaryProtocolFactory.hx
deleted file mode 100644
index f4a9bec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TBinaryProtocolFactory.hx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.transport.TTransport;
-
-
-/**
-* Binary Protocol Factory
-*/
-class TBinaryProtocolFactory implements TProtocolFactory {
-
-    private var strictRead_ : Bool = false;
-    private var strictWrite_ : Bool = true;
-
-    public function new( strictRead : Bool = false, strictWrite : Bool = true) {
-        strictRead_  = strictRead;
-        strictWrite_ = strictWrite;
-    }
-
-    public function getProtocol( trans : TTransport) : TProtocol  {
-        return new TBinaryProtocol( trans, strictRead_, strictWrite_);
-    }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactProtocol.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactProtocol.hx
deleted file mode 100644
index 03b13e2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactProtocol.hx
+++ /dev/null
@@ -1,718 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import haxe.io.Bytes;
-import haxe.io.BytesInput;
-import haxe.io.BytesOutput;
-import haxe.io.BytesBuffer;
-import haxe.ds.GenericStack;
-import haxe.Int32;
-import haxe.Int64;
-import haxe.Utf8;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.helper.ZigZag;
-import org.apache.thrift.helper.BitConverter;
-
-
-/**
-* Compact protocol implementation for thrift.
-*/
-class TCompactProtocol extends TRecursionTracker implements TProtocol {
-
-    private static var ANONYMOUS_STRUCT : TStruct = new TStruct("");
-    private static var TSTOP : TField = new TField("", TType.STOP, 0);
-
-    private static inline var PROTOCOL_ID : Int = 0x82;
-    private static inline var VERSION : Int = 1;
-    private static inline var VERSION_MASK : Int = 0x1f; // 0001 1111
-    private static inline var TYPE_MASK : Int = 0xE0; // 1110 0000
-    private static inline var TYPE_BITS : Int = 0x07; // 0000 0111
-    private static inline var TYPE_SHIFT_AMOUNT : Int = 5;
-
-
-    private static var ttypeToCompactType = [
-        TType.STOP    => TCompactTypes.STOP,
-        TType.BOOL    => TCompactTypes.BOOLEAN_TRUE,
-        TType.BYTE    => TCompactTypes.BYTE,
-        TType.DOUBLE  => TCompactTypes.DOUBLE,
-        TType.I16     => TCompactTypes.I16,
-        TType.I32     => TCompactTypes.I32,
-        TType.I64     => TCompactTypes.I64,
-        TType.STRING  => TCompactTypes.BINARY,
-        TType.STRUCT  => TCompactTypes.STRUCT,
-        TType.MAP     => TCompactTypes.MAP,
-        TType.SET     => TCompactTypes.SET,
-        TType.LIST    => TCompactTypes.LIST
-    ];
-
-    private static var tcompactTypeToType = [
-        TCompactTypes.STOP          => TType.STOP,
-        TCompactTypes.BOOLEAN_TRUE  => TType.BOOL,
-        TCompactTypes.BOOLEAN_FALSE => TType.BOOL,
-        TCompactTypes.BYTE          => TType.BYTE,
-        TCompactTypes.I16           => TType.I16,
-        TCompactTypes.I32           => TType.I32,
-        TCompactTypes.I64           => TType.I64,
-        TCompactTypes.DOUBLE        => TType.DOUBLE,
-        TCompactTypes.BINARY        => TType.STRING,
-        TCompactTypes.LIST          => TType.LIST,
-        TCompactTypes.SET           => TType.SET,
-        TCompactTypes.MAP           => TType.MAP,
-        TCompactTypes.STRUCT        => TType.STRUCT
-    ];
-
-
-    /**
-     * Used to keep track of the last field for the current and previous structs,
-     * so we can do the delta stuff.
-     */
-    private var lastField_ : GenericStack<Int> = new GenericStack<Int>();
-    private var lastFieldId_ : Int = 0;
-
-    /**
-     * If we encounter a boolean field begin, save the TField here so it can
-     * have the value incorporated.
-     */
-    private var booleanField_ : Null<TField>;
-
-    /**
-     * If we Read a field header, and it's a boolean field, save the boolean
-     * value here so that ReadBool can use it.
-     */
-    private var boolValue_ : Null<Bool>;
-
-
-    // whether the underlying system holds Strings as UTF-8
-    // http://old.haxe.org/manual/encoding
-    private static var utf8Strings = haxe.Utf8.validate("Ç-ß-Æ-Ю-Ш");
-
-    // the transport used
-    public var trans(default,null) : TTransport;
-
-
-    // TCompactProtocol Constructor
-    public function new( trans : TTransport) {
-        this.trans = trans;
-    }
-
-    public function getTransport() : TTransport {
-      return trans;
-    }
-
-
-    public function Reset() : Void{
-        while ( ! lastField_.isEmpty()) {
-            lastField_.pop();
-        }
-        lastFieldId_ = 0;
-    }
-
-
-    /**
-     * Writes a byte without any possibility of all that field header nonsense.
-     * Used internally by other writing methods that know they need to Write a byte.
-     */
-    private function WriteByteDirect( b : Int) : Void {
-        var buf = Bytes.alloc(1);
-        buf.set( 0, b);
-        trans.write( buf, 0, 1);
-    }
-
-    /**
-     * Write an i32 as a varint. Results in 1-5 bytes on the wire.
-     */
-    private function WriteVarint32( n : UInt) : Void {
-        var i32buf = new BytesBuffer();
-        while (true)
-        {
-            if ((n & ~0x7F) == 0)
-            {
-                i32buf.addByte( n & 0xFF);
-                break;
-            }
-            else
-            {
-                i32buf.addByte( (n & 0x7F) | 0x80);
-                n >>= 7;
-            }
-        }
-
-        var tmp = i32buf.getBytes();
-        trans.write( tmp, 0, tmp.length);
-    }
-
-    /**
-    * Write a message header to the wire. Compact Protocol messages contain the
-    * protocol version so we can migrate forwards in the future if need be.
-    */
-    public function writeMessageBegin( message : TMessage) : Void {
-        Reset();
-
-        var versionAndType : Int =  (VERSION & VERSION_MASK) | ((message.type << TYPE_SHIFT_AMOUNT) & TYPE_MASK);
-        WriteByteDirect( PROTOCOL_ID);
-        WriteByteDirect( versionAndType);
-        WriteVarint32( cast( message.seqid, UInt));
-        writeString( message.name);
-    }
-
-    /**
-     * Write a struct begin. This doesn't actually put anything on the wire. We
-     * use it as an opportunity to put special placeholder markers on the field
-     * stack so we can get the field id deltas correct.
-     */
-    public function writeStructBegin(struct:TStruct) : Void {
-        lastField_.add( lastFieldId_);
-        lastFieldId_ = 0;
-    }
-
-    /**
-     * Write a struct end. This doesn't actually put anything on the wire. We use
-     * this as an opportunity to pop the last field from the current struct off
-     * of the field stack.
-     */
-    public function writeStructEnd() : Void {
-        lastFieldId_ = lastField_.pop();
-    }
-
-    /**
-     * Write a field header containing the field id and field type. If the
-     * difference between the current field id and the last one is small (< 15),
-     * then the field id will be encoded in the 4 MSB as a delta. Otherwise, the
-     * field id will follow the type header as a zigzag varint.
-     */
-    public function writeFieldBegin(field:TField) : Void {
-        if (field.type == TType.BOOL)
-            booleanField_ = field; // we want to possibly include the value, so we'll wait.
-        else
-            WriteFieldBeginInternal(field, 0xFF);
-    }
-
-    /**
-     * The workhorse of WriteFieldBegin. It has the option of doing a
-     * 'type override' of the type header. This is used specifically in the
-     * boolean field case.
-     */
-    private function WriteFieldBeginInternal( field : TField, typeOverride : Int) : Void {
-        // if there's a type override, use that.
-        var typeToWrite : Int;
-        if ( typeOverride == 0xFF)
-            typeToWrite = getCompactType( field.type);
-        else
-            typeToWrite = typeOverride;
-
-        // check if we can use delta encoding for the field id
-        if (field.id > lastFieldId_ && field.id - lastFieldId_ <= 15)
-        {
-            // Write them together
-            WriteByteDirect((field.id - lastFieldId_) << 4 | typeToWrite);
-        }
-        else
-        {
-            // Write them separate
-            WriteByteDirect(typeToWrite);
-            writeI16(field.id);
-        }
-
-        lastFieldId_ = field.id;
-    }
-
-    /**
-     * Write the STOP symbol so we know there are no more fields in this struct.
-     */
-    public function writeFieldStop() : Void {
-        WriteByteDirect( cast(TCompactTypes.STOP, Int));
-    }
-
-    /**
-     * Write a map header. If the map is empty, omit the key and value type
-     * headers, as we don't need any additional information to skip it.
-     */
-    public function writeMapBegin(map:TMap) : Void {
-        if (map.size == 0)
-        {
-            WriteByteDirect(0);
-        }
-        else
-        {
-            var kvtype = (getCompactType(map.keyType) << 4) | getCompactType(map.valueType);
-            WriteVarint32( cast( map.size, UInt));
-            WriteByteDirect( kvtype);
-        }
-    }
-
-    /**
-     * Write a list header.
-     */
-    public function writeListBegin( list : TList) : Void {
-        WriteCollectionBegin( list.elemType, list.size);
-    }
-
-    /**
-     * Write a set header.
-     */
-    public function writeSetBegin( set : TSet) : Void {
-        WriteCollectionBegin( set.elemType, set.size);
-    }
-
-    /**
-     * Write a boolean value. Potentially, this could be a boolean field, in
-     * which case the field header info isn't written yet. If so, decide what the
-     * right type header is for the value and then Write the field header.
-     * Otherwise, Write a single byte.
-     */
-    public function writeBool(b : Bool) : Void {
-        var bct : Int = b ? TCompactTypes.BOOLEAN_TRUE : TCompactTypes.BOOLEAN_FALSE;
-
-        if (booleanField_ != null)
-        {
-            // we haven't written the field header yet
-            WriteFieldBeginInternal( booleanField_, bct);
-            booleanField_ = null;
-        }
-        else
-        {
-            // we're not part of a field, so just Write the value.
-            WriteByteDirect( bct);
-        }
-    }
-
-    /**
-     * Write a byte. Nothing to see here!
-     */
-    public function writeByte( b : Int) : Void {
-        WriteByteDirect( b);
-    }
-
-    /**
-     * Write an I16 as a zigzag varint.
-     */
-    public function writeI16( i16 : Int) : Void {
-        WriteVarint32( ZigZag.FromInt( i16));
-    }
-
-    /**
-     * Write an i32 as a zigzag varint.
-     */
-    public function writeI32( i32 : Int) : Void {
-        WriteVarint32( ZigZag.FromInt( i32));
-    }
-
-    /**
-     * Write an i64 as a zigzag varint.
-     */
-    public function writeI64( i64 : haxe.Int64) : Void {
-        WriteVarint64(  ZigZag.FromLong( i64));
-    }
-
-    /**
-     * Write a double to the wire as 8 bytes.
-     */
-    public function writeDouble( dub : Float) : Void {
-        var data = BitConverter.fixedLongToBytes( BitConverter.DoubleToInt64Bits(dub));
-        trans.write( data, 0, data.length);
-    }
-
-    /**
-     * Write a string to the wire with a varint size preceding.
-     */
-    public function writeString(str : String) : Void {
-        var buf = new BytesBuffer();
-        if( utf8Strings)
-            buf.addString( str);  // no need to encode on UTF8 targets, the string is just fine
-        else
-            buf.addString( Utf8.encode( str));
-        var tmp = buf.getBytes();
-        writeBinary( tmp);
-    }
-
-    /**
-     * Write a byte array, using a varint for the size.
-     */
-    public function writeBinary( bin : Bytes) : Void {
-        WriteVarint32( cast(bin.length,UInt));
-        trans.write( bin, 0, bin.length);
-    }
-
-
-    // These methods are called by structs, but don't actually have any wire
-    // output or purpose.
-    public function writeMessageEnd() : Void { }
-    public function writeMapEnd() : Void { }
-    public function writeListEnd() : Void { }
-    public function writeSetEnd() : Void { }
-    public function writeFieldEnd() : Void { }
-
-    //
-    // Internal writing methods
-    //
-
-    /**
-     * Abstract method for writing the start of lists and sets. List and sets on
-     * the wire differ only by the type indicator.
-     */
-    private function WriteCollectionBegin( elemType : Int, size : Int) : Void {
-        if (size <= 14)    {
-            WriteByteDirect( size << 4 | getCompactType(elemType));
-        }
-        else {
-            WriteByteDirect( 0xf0 | getCompactType(elemType));
-            WriteVarint32( cast(size, UInt));
-        }
-    }
-
-    /**
-     * Write an i64 as a varint. Results in 1-10 bytes on the wire.
-     */
-    private function WriteVarint64(n : haxe.Int64) : Void    {
-        var varint64out = new BytesBuffer();
-        while (true)
-        {
-            if( Int64.isZero( Int64.and( n, Int64.neg(Int64.make(0,0x7F)))))
-            {
-                #if( haxe_ver < 3.2)
-                varint64out.addByte( Int64.getLow(n));
-                #else
-                varint64out.addByte( n.low);
-                #end
-                break;
-            }
-            else
-            {
-                #if ( haxe_ver < 3.2)
-                varint64out.addByte( (Int64.getLow(n) & 0x7F) | 0x80);
-                #else
-                varint64out.addByte( (n.low & 0x7F) | 0x80);
-                #end
-                n = Int64.shr( n, 7);
-                n = Int64.and( n, Int64.make(0x01FFFFFF,0xFFFFFFFF));  // clean out the shifted 7 bits
-            }
-        }
-        var tmp = varint64out.getBytes();
-        trans.write( tmp, 0, tmp.length);
-    }
-
-
-    /**
-     * Read a message header.
-     */
-    public function readMessageBegin():TMessage {
-        Reset();
-
-        var protocolId : Int = readByte();
-        if (protocolId != PROTOCOL_ID) {
-            throw new TProtocolException( TProtocolException.INVALID_DATA, "Expected protocol id " + StringTools.hex(PROTOCOL_ID,2) + " but got " + StringTools.hex(protocolId));
-        }
-
-        var versionAndType : Int = readByte();
-        var version : Int = (versionAndType & VERSION_MASK);
-        if (version != VERSION) {
-            throw new TProtocolException( TProtocolException.INVALID_DATA, "Expected version " + VERSION + " but got " + version);
-        }
-
-        var type : Int = ((versionAndType >> TYPE_SHIFT_AMOUNT) & TYPE_BITS);
-        var seqid : Int = cast( ReadVarint32(), Int);
-        var msgNm : String = readString();
-        return new TMessage( msgNm, type, seqid);
-    }
-
-    /**
-     * Read a struct begin. There's nothing on the wire for this, but it is our
-     * opportunity to push a new struct begin marker onto the field stack.
-     */
-    public function readStructBegin():TStruct {
-        lastField_.add(lastFieldId_);
-        lastFieldId_ = 0;
-        return ANONYMOUS_STRUCT;
-    }
-
-    /**
-     * Doesn't actually consume any wire data, just removes the last field for
-     * this struct from the field stack.
-     */
-    public function readStructEnd() : Void {
-        // consume the last field we Read off the wire.
-        lastFieldId_ = lastField_.pop();
-    }
-
-    /**
-     * Read a field header off the wire.
-     */
-    public function readFieldBegin() : TField {
-        var type : Int = readByte();
-
-        // if it's a stop, then we can return immediately, as the struct is over.
-        if (type == cast(TCompactTypes.STOP,Int)) {
-            return TSTOP;
-        }
-
-        var fieldId : Int;
-
-        // mask off the 4 MSB of the type header. it could contain a field id delta.
-        var modifier : Int = ((type & 0xf0) >> 4);
-        if (modifier == 0)
-            fieldId = readI16();  // not a delta. look ahead for the zigzag varint field id.
-        else
-            fieldId = lastFieldId_ + modifier; // add the delta to the last Read field id.
-
-        var field : TField  = new TField( "", cast(getTType(type & 0x0f),Int), fieldId);
-
-        // if this happens to be a boolean field, the value is encoded in the type
-        if (isBoolType(type)) {
-            // save the boolean value in a special instance variable.
-            boolValue_ = ((type & 0x0f) == cast(TCompactTypes.BOOLEAN_TRUE,Int));
-        }
-
-        // push the new field onto the field stack so we can keep the deltas going.
-        lastFieldId_ = field.id;
-        return field;
-    }
-
-    /**
-     * Read a map header off the wire. If the size is zero, skip Reading the key
-     * and value type. This means that 0-length maps will yield TMaps without the
-     * "correct" types.
-     */
-    public function readMapBegin() : TMap {
-        var size : Int = cast( ReadVarint32(), Int);
-        var keyAndValueType : Int = ((size == 0)  ?  0  :  readByte());
-        var key : Int = cast( getTType( (keyAndValueType & 0xF0) >> 4), Int);
-        var val : Int = cast( getTType( keyAndValueType & 0x0F), Int);
-        return new TMap( key, val, size);
-    }
-
-    /**
-     * Read a list header off the wire. If the list size is 0-14, the size will
-     * be packed into the element type header. If it's a longer list, the 4 MSB
-     * of the element type header will be 0xF, and a varint will follow with the
-     * true size.
-     */
-    public function readListBegin():TList {
-        var size_and_type : Int = readByte();
-
-        var size : Int = ((size_and_type & 0xF0) >> 4) & 0x0F;
-        if (size == 15) {
-            size = cast( ReadVarint32(), Int);
-        }
-
-        var type = getTType(size_and_type);
-        return new TList( type, size);
-    }
-
-    /**
-     * Read a set header off the wire. If the set size is 0-14, the size will
-     * be packed into the element type header. If it's a longer set, the 4 MSB
-     * of the element type header will be 0xF, and a varint will follow with the
-     * true size.
-     */
-    public function readSetBegin() : TSet {
-        var size_and_type : Int = readByte();
-
-        var size : Int = ((size_and_type & 0xF0) >> 4) & 0x0F;
-        if (size == 15) {
-            size = cast( ReadVarint32(), Int);
-        }
-
-        var type = getTType(size_and_type);
-        return new TSet( type, size);
-    }
-
-    /**
-     * Read a boolean off the wire. If this is a boolean field, the value should
-     * already have been Read during ReadFieldBegin, so we'll just consume the
-     * pre-stored value. Otherwise, Read a byte.
-     */
-    public function readBool() : Bool {
-        if (boolValue_ != null) {
-            var result : Bool = boolValue_;
-            boolValue_ = null;
-            return result;
-        }
-
-        return (readByte() == cast(TCompactTypes.BOOLEAN_TRUE,Int));
-    }
-
-    /**
-     * Read a single byte off the wire. Nothing interesting here.
-     */
-    public function readByte() : Int {
-        var byteRawBuf = new BytesBuffer();
-        trans.readAll( byteRawBuf, 0, 1);
-        return byteRawBuf.getBytes().get(0);
-    }
-
-    /**
-     * Read an i16 from the wire as a zigzag varint.
-     */
-    public function readI16() : Int {
-        return ZigZag.ToInt( ReadVarint32());
-    }
-
-    /**
-     * Read an i32 from the wire as a zigzag varint.
-     */
-    public function readI32() : Int {
-        return ZigZag.ToInt( ReadVarint32());
-    }
-
-    /**
-     * Read an i64 from the wire as a zigzag varint.
-     */
-    public function readI64() : haxe.Int64 {
-        return ZigZag.ToLong( ReadVarint64());
-    }
-
-    /**
-     * No magic here - just Read a double off the wire.
-     */
-    public function readDouble():Float {
-        var longBits = new BytesBuffer();
-        trans.readAll( longBits, 0, 8);
-        return BitConverter.Int64BitsToDouble( BitConverter.bytesToLong( longBits.getBytes()));
-    }
-
-    /**
-     * Reads a byte[] (via ReadBinary), and then UTF-8 decodes it.
-     */
-    public function readString() : String {
-        var length : Int = cast( ReadVarint32(), Int);
-
-        if (length == 0) {
-            return "";
-        }
-
-        var buf = new BytesBuffer();
-        trans.readAll( buf, 0, length);
-
-        length = buf.length;
-        var inp = new BytesInput( buf.getBytes());
-        var str = inp.readString( length);
-        if( utf8Strings)
-            return str;  // no need to decode on UTF8 targets, the string is just fine
-        else
-            return Utf8.decode( str);
-    }
-
-    /**
-     * Read a byte[] from the wire.
-     */
-    public function readBinary() : Bytes {
-        var length : Int = cast( ReadVarint32(), Int);
-        if (length == 0) {
-            return Bytes.alloc(0);
-        }
-
-        var buf = new BytesBuffer();
-        trans.readAll( buf, 0, length);
-        return buf.getBytes();
-    }
-
-
-    // These methods are here for the struct to call, but don't have any wire
-    // encoding.
-    public function readMessageEnd() : Void { }
-    public function readFieldEnd() : Void { }
-    public function readMapEnd() : Void { }
-    public function readListEnd() : Void { }
-    public function readSetEnd() : Void { }
-
-    //
-    // Internal Reading methods
-    //
-
-    /**
-     * Read an i32 from the wire as a varint. The MSB of each byte is set
-     * if there is another byte to follow. This can Read up to 5 bytes.
-     */
-    private function ReadVarint32() : UInt {
-        var result : UInt = 0;
-        var shift : Int = 0;
-        while (true) {
-            var b : Int = readByte();
-            result |= cast((b & 0x7f) << shift, UInt);
-            if ((b & 0x80) != 0x80) {
-                break;
-            }
-            shift += 7;
-        }
-        return result;
-    }
-
-    /**
-     * Read an i64 from the wire as a proper varint. The MSB of each byte is set
-     * if there is another byte to follow. This can Read up to 10 bytes.
-     */
-    private function ReadVarint64() : Int64 {
-        var shift : Int = 0;
-        var result : Int64 = Int64.make(0,0);
-        while (true) {
-            var b : Int = readByte();
-            result = Int64.or( result, Int64.shl( Int64.make(0,b & 0x7f), shift));
-            if ((b & 0x80) != 0x80) {
-                break;
-            }
-            shift += 7;
-        }
-
-        return result;
-    }
-
-
-    //
-    // type testing and converting
-    //
-
-    private function isBoolType( b : Int) : Bool {
-        var lowerNibble : Int = b & 0x0f;
-        switch(lowerNibble)
-        {
-            case TCompactTypes.BOOLEAN_TRUE: return true;
-            case TCompactTypes.BOOLEAN_FALSE: return true;
-            default: return false;
-        }
-    }
-
-
-    /**
-     * Given a TCompactProtocol.TCompactTypes constant, convert it to its corresponding
-     * TType value.
-     */
-    private function getTType( type : Int) : Int {
-        try
-        {
-            return tcompactTypeToType[type];
-        }
-        catch ( e : Dynamic)
-        {
-            var tt : Int = (type & 0x0f);
-            throw new TProtocolException( TProtocolException.UNKNOWN, 'don\'t know what type: $tt ($e)');
-        }
-    }
-
-    /**
-     * Given a TType value, find the appropriate TCompactProtocol.TCompactTypes constant.
-     */
-    private function getCompactType( ttype : Int) : Int
-    {
-        return cast( ttypeToCompactType[ttype], Int);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactProtocolFactory.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactProtocolFactory.hx
deleted file mode 100644
index c5673b4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactProtocolFactory.hx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.transport.TTransport;
-
-
-/**
-* Compact Protocol Factory
-*/
-class TCompactProtocolFactory implements TProtocolFactory {
-
-    public function new() {
-    }
-
-    public function getProtocol( trans : TTransport) : TProtocol  {
-        return new TCompactProtocol( trans);
-    }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactTypes.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactTypes.hx
deleted file mode 100644
index cdd3d87..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TCompactTypes.hx
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * All of the on-wire type codes.
- */
-@:enum
-abstract TCompactTypes(Int)  from Int to Int  {
-    public static inline var STOP          = 0x00;
-    public static inline var BOOLEAN_TRUE  = 0x01;
-    public static inline var BOOLEAN_FALSE = 0x02;
-    public static inline var BYTE          = 0x03;
-    public static inline var I16           = 0x04;
-    public static inline var I32           = 0x05;
-    public static inline var I64           = 0x06;
-    public static inline var DOUBLE        = 0x07;
-    public static inline var BINARY        = 0x08;
-    public static inline var LIST          = 0x09;
-    public static inline var SET           = 0x0A;
-    public static inline var MAP           = 0x0B;
-    public static inline var STRUCT        = 0x0C;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TField.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TField.hx
deleted file mode 100644
index 3f5498d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TField.hx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-class TField {
-
-    public var name : String;
-    public var type : Int;
-    public var id : Int;
-
-    public function new(n : String = "", t : Int = 0, i : Int = 0) {
-      name = n;
-      type = t;
-      id = i;
-    }
-
-    public function toString() : String {
-      return '<TField name:"$name" type:"$type" field-id:"$id">';
-    }
-
-    public function equals( otherField : TField) : Bool {
-      return (type == otherField.type)
-          && (id == otherField.id);
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TJSONProtocol.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TJSONProtocol.hx
deleted file mode 100644
index e20ff33..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TJSONProtocol.hx
+++ /dev/null
@@ -1,1073 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import haxe.io.Bytes;
-import haxe.io.BytesInput;
-import haxe.io.BytesOutput;
-import haxe.io.BytesBuffer;
-import haxe.ds.GenericStack;
-import haxe.Utf8;
-import haxe.crypto.Base64;
-import haxe.Int64;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TMessage;
-import org.apache.thrift.protocol.TField;
-import org.apache.thrift.protocol.TMap;
-import org.apache.thrift.protocol.TSet;
-import org.apache.thrift.protocol.TList;
-import org.apache.thrift.transport.TTransport;
-
-
-
-/* JSON protocol implementation for thrift.
-*  This is a full-featured protocol supporting Write and Read.
-*
-*  Please see the C++ class header for a detailed description of the wire format.
-*
-*  Adapted from the Java version.
-*/
-class TJSONProtocol extends TRecursionTracker implements TProtocol {
-
-    public var trans(default,null) : TTransport;
-
-    // Stack of nested contexts that we may be in
-    private var contextStack : GenericStack<JSONBaseContext> = new GenericStack<JSONBaseContext>();
-
-    // Current context that we are in
-    private var context : JSONBaseContext;
-
-    // Reader that manages a 1-byte buffer
-    private var reader : LookaheadReader;
-
-    // whether the underlying system holds Strings as UTF-8
-    // http://old.haxe.org/manual/encoding
-    private static var utf8Strings = haxe.Utf8.validate("Ç-ß-Æ-Ю-Ш");
-
-    // TJSONProtocol Constructor
-    public function new( trans : TTransport)
-    {
-        this.trans = trans;
-        this.context = new JSONBaseContext(this);
-        this.reader = new LookaheadReader(this);
-    }
-
-    public function getTransport() : TTransport {
-      return trans;
-    }
-
-    public function writeMessageBegin(message:TMessage) : Void {
-        WriteJSONArrayStart();
-        WriteJSONInteger( JSONConstants.VERSION);
-        WriteJSONString( BytesFromString(message.name));
-        WriteJSONInteger( message.type);
-        WriteJSONInteger( message.seqid);
-    }
-
-    public function writeMessageEnd() : Void {
-        WriteJSONArrayEnd();
-    }
-
-    public function writeStructBegin(struct:TStruct) : Void {
-        WriteJSONObjectStart();
-    }
-
-    public function writeStructEnd() : Void {
-        WriteJSONObjectEnd();
-    }
-
-    public function writeFieldBegin(field:TField) : Void {
-        WriteJSONInteger( field.id );
-        WriteJSONObjectStart();
-        WriteJSONString( BytesFromString( JSONConstants.GetTypeNameForTypeID( field.type)));
-    }
-
-    public function writeFieldEnd() : Void {
-        WriteJSONObjectEnd();
-    }
-
-    public function writeFieldStop() : Void { }
-
-    public function writeMapBegin(map:TMap) : Void {
-        WriteJSONArrayStart();
-        WriteJSONString( BytesFromString( JSONConstants.GetTypeNameForTypeID( map.keyType)));
-        WriteJSONString( BytesFromString( JSONConstants.GetTypeNameForTypeID( map.valueType)));
-        WriteJSONInteger( map.size);
-        WriteJSONObjectStart();
-    }
-
-    public function writeMapEnd() : Void {
-        WriteJSONObjectEnd();
-        WriteJSONArrayEnd();
-    }
-
-    public function writeListBegin(list:TList) : Void {
-        WriteJSONArrayStart();
-        WriteJSONString( BytesFromString( JSONConstants.GetTypeNameForTypeID( list.elemType )));
-        WriteJSONInteger( list.size);
-    }
-
-    public function writeListEnd() : Void {
-        WriteJSONArrayEnd();
-    }
-
-    public function writeSetBegin(set:TSet) : Void {
-        WriteJSONArrayStart();
-        WriteJSONString( BytesFromString( JSONConstants.GetTypeNameForTypeID( set.elemType)));
-        WriteJSONInteger( set.size);
-    }
-
-    public function writeSetEnd() : Void {
-        WriteJSONArrayEnd();
-    }
-
-    public function writeBool(b : Bool) : Void {
-        if( b)
-            WriteJSONInteger( 1);
-        else
-            WriteJSONInteger( 0);
-    }
-
-    public function writeByte(b : Int) : Void {
-        WriteJSONInteger( b);
-    }
-
-    public function writeI16(i16 : Int) : Void {
-        WriteJSONInteger( i16);
-    }
-
-    public function writeI32(i32 : Int) : Void {
-        WriteJSONInteger( i32);
-    }
-
-    public function writeI64(i64 : haxe.Int64) : Void {
-        WriteJSONInt64( i64);
-    }
-
-    public function writeDouble(dub:Float) : Void {
-        WriteJSONDouble(dub);
-    }
-
-    public function writeString(str : String) : Void {
-        WriteJSONString( BytesFromString(str));
-    }
-
-    public function writeBinary(bin:Bytes) : Void {
-        WriteJSONBase64(bin);
-    }
-
-    public function readMessageBegin():TMessage {
-        var message : TMessage = new TMessage();
-        ReadJSONArrayStart();
-        if (ReadJSONInteger() != JSONConstants.VERSION)
-        {
-            throw new TProtocolException(TProtocolException.BAD_VERSION,
-                                         "Message contained bad version.");
-        }
-
-        message.name = ReadJSONString(false);
-        message.type = ReadJSONInteger();
-        message.seqid = ReadJSONInteger();
-        return message;
-    }
-
-    public function readMessageEnd() : Void {
-        ReadJSONArrayEnd();
-    }
-
-    public function readStructBegin():TStruct {
-        ReadJSONObjectStart();
-        return new TStruct();
-    }
-
-    public function readStructEnd() : Void {
-        ReadJSONObjectEnd();
-    }
-
-    public function readFieldBegin() : TField {
-        var field : TField = new TField();
-        var ch = reader.Peek();
-        if (StringFromBytes(ch) == JSONConstants.RBRACE)
-        {
-            field.type = TType.STOP;
-        }
-        else
-        {
-            field.id = ReadJSONInteger();
-            ReadJSONObjectStart();
-            field.type = JSONConstants.GetTypeIDForTypeName( ReadJSONString(false));
-        }
-        return field;
-    }
-
-    public function readFieldEnd() : Void {
-        ReadJSONObjectEnd();
-    }
-
-    public function readMapBegin() : TMap {
-        ReadJSONArrayStart();
-        var KeyType = JSONConstants.GetTypeIDForTypeName( ReadJSONString(false));
-        var ValueType = JSONConstants.GetTypeIDForTypeName( ReadJSONString(false));
-        var Count : Int = ReadJSONInteger();
-        ReadJSONObjectStart();
-
-        var map = new TMap( KeyType, ValueType, Count);
-        return map;
-    }
-
-    public function readMapEnd() : Void {
-        ReadJSONObjectEnd();
-        ReadJSONArrayEnd();
-    }
-
-    public function readListBegin():TList {
-        ReadJSONArrayStart();
-        var ElementType = JSONConstants.GetTypeIDForTypeName( ReadJSONString(false));
-        var Count : Int = ReadJSONInteger();
-
-        var list = new TList( ElementType, Count);
-        return list;
-    }
-
-    public function readListEnd() : Void {
-        ReadJSONArrayEnd();
-    }
-
-    public function readSetBegin() : TSet {
-        ReadJSONArrayStart();
-        var ElementType = JSONConstants.GetTypeIDForTypeName( ReadJSONString(false));
-        var Count : Int = ReadJSONInteger();
-
-        var set = new TSet( ElementType, Count);
-        return set;
-    }
-
-    public function readSetEnd() : Void {
-        ReadJSONArrayEnd();
-    }
-
-    public function readBool() : Bool {
-        return (ReadJSONInteger() != 0);
-    }
-
-    public function readByte() : Int {
-        return ReadJSONInteger();
-    }
-
-    public function readI16() : Int {
-        return ReadJSONInteger();
-    }
-
-    public function readI32() : Int {
-        return ReadJSONInteger();
-    }
-
-    public function readI64() : haxe.Int64 {
-        return ReadJSONInt64();
-    }
-
-    public function readDouble():Float {
-        return ReadJSONDouble();
-    }
-
-    public function readString() : String {
-        return ReadJSONString(false);
-    }
-
-    public function readBinary() : Bytes {
-        return ReadJSONBase64();
-    }
-
-    // Push a new JSON context onto the stack.
-    private function  PushContext(c : JSONBaseContext) : Void {
-        contextStack.add(context);
-        context = c;
-    }
-
-    // Pop the last JSON context off the stack
-    private function  PopContext() : Void {
-        context = contextStack.pop();
-    }
-
-
-    // Write the bytes in array buf as a JSON characters, escaping as needed
-    private function WriteJSONString( b : Bytes) : Void {
-        context.Write();
-
-        var tmp = BytesFromString( JSONConstants.QUOTE);
-        trans.write( tmp, 0, tmp.length);
-
-        for (i in 0 ... b.length) {
-            var value = b.get(i);
-
-            if ((value & 0x00FF) >= 0x30)
-            {
-                if (String.fromCharCode(value) == JSONConstants.BACKSLASH.charAt(0))
-                {
-                    tmp = BytesFromString( JSONConstants.BACKSLASH + JSONConstants.BACKSLASH);
-                    trans.write( tmp, 0, tmp.length);
-                }
-                else
-                {
-                    trans.write( b, i, 1);
-                }
-            }
-            else
-            {
-                var num = JSONConstants.JSON_CHAR_TABLE[value];
-                if (num == 1)
-                {
-                    trans.write( b, i, 1);
-                }
-                else if (num > 1)
-                {
-                    var buf = new BytesBuffer();
-                    buf.addString( JSONConstants.BACKSLASH);
-                    buf.addByte( num);
-                    tmp = buf.getBytes();
-                    trans.write( tmp, 0, tmp.length);
-                }
-                else
-                {
-                    var buf = new BytesBuffer();
-                    buf.addString( JSONConstants.ESCSEQ);
-                    buf.addString( HexChar( (value & 0xFF000000) >> 12));
-                    buf.addString( HexChar( (value & 0x00FF0000) >> 8));
-                    buf.addString( HexChar( (value & 0x0000FF00) >> 4));
-                    buf.addString( HexChar( value & 0x000000FF));
-                    tmp = buf.getBytes();
-                    trans.write( tmp, 0, tmp.length);
-                }
-            }
-        }
-
-        tmp = BytesFromString( JSONConstants.QUOTE);
-        trans.write( tmp, 0, tmp.length);
-    }
-
-    // Write out number as a JSON value. If the context dictates so,
-    // it will be wrapped in quotes to output as a JSON string.
-    private function WriteJSONInteger( num : Int) : Void {
-        context.Write();
-
-        var str : String = "";
-        var escapeNum : Bool = context.EscapeNumbers();
-
-        if (escapeNum) {
-            str += JSONConstants.QUOTE;
-        }
-
-        str += Std.string(num);
-
-        if (escapeNum) {
-            str += JSONConstants.QUOTE;
-        }
-
-        var tmp = BytesFromString( str);
-        trans.write( tmp, 0, tmp.length);
-    }
-
-    // Write out number as a JSON value. If the context dictates so,
-    // it will be wrapped in quotes to output as a JSON string.
-    private function WriteJSONInt64( num : Int64) : Void {
-        context.Write();
-
-        var str : String = "";
-        var escapeNum : Bool = context.EscapeNumbers();
-
-        if (escapeNum) {
-            str += JSONConstants.QUOTE;
-        }
-
-        str += Std.string(num);
-
-        if (escapeNum) {
-            str += JSONConstants.QUOTE;
-        }
-
-        var tmp = BytesFromString( str);
-        trans.write( tmp, 0, tmp.length);
-    }
-
-    // Write out a double as a JSON value. If it is NaN or infinity or if the
-    // context dictates escaping, Write out as JSON string.
-    private function WriteJSONDouble(num : Float) : Void {
-        context.Write();
-
-
-        var special : Bool = false;
-        var rendered : String = "";
-        if( Math.isNaN(num)) {
-            special = true;
-            rendered = JSONConstants.FLOAT_IS_NAN;
-        } else if (! Math.isFinite(num)) {
-            special = true;
-            if( num > 0) {
-                rendered = JSONConstants.FLOAT_IS_POS_INF;
-            } else {
-                rendered = JSONConstants.FLOAT_IS_NEG_INF;
-            }
-        } else {
-            rendered = Std.string(num);  // plain and simple float number
-        }
-
-        // compose output
-        var escapeNum : Bool = special || context.EscapeNumbers();
-        var str : String = "";
-        if (escapeNum) {
-            str += JSONConstants.QUOTE;
-        }
-        str += rendered;
-        if (escapeNum) {
-            str += JSONConstants.QUOTE;
-        }
-
-        var tmp = BytesFromString( str);
-        trans.write( tmp, 0, tmp.length);
-    }
-
-    // Write out contents of byte array b as a JSON string with base-64 encoded data
-    private function WriteJSONBase64( b : Bytes) : Void {
-        context.Write();
-
-        var buf = new BytesBuffer();
-        buf.addString( JSONConstants.QUOTE);
-        buf.addString( Base64.encode(b));
-        buf.addString( JSONConstants.QUOTE);
-
-        var tmp = buf.getBytes();
-        trans.write( tmp, 0, tmp.length);
-    }
-
-    private function WriteJSONObjectStart() : Void {
-        context.Write();
-        var tmp = BytesFromString( JSONConstants.LBRACE);
-        trans.write( tmp, 0, tmp.length);
-        PushContext( new JSONPairContext(this));
-    }
-
-    private function WriteJSONObjectEnd() : Void {
-        PopContext();
-        var tmp = BytesFromString( JSONConstants.RBRACE);
-        trans.write( tmp, 0, tmp.length);
-    }
-
-    private function WriteJSONArrayStart() : Void {
-        context.Write();
-        var tmp = BytesFromString( JSONConstants.LBRACKET);
-        trans.write( tmp, 0, tmp.length);
-        PushContext( new JSONListContext(this));
-    }
-
-    private function WriteJSONArrayEnd() : Void {
-        PopContext();
-        var tmp = BytesFromString( JSONConstants.RBRACKET);
-        trans.write( tmp, 0, tmp.length);
-    }
-
-
-    /**
-     * Reading methods.
-     */
-
-    // Read a byte that must match char, otherwise an exception is thrown.
-    public function ReadJSONSyntaxChar( char : String) : Void {
-        var b = BytesFromString( char);
-
-        var ch = reader.Read();
-        if (ch.get(0) != b.get(0))
-        {
-            throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                         'Unexpected character: $ch');
-        }
-    }
-
-    // Read in a JSON string, unescaping as appropriate.
-    // Skip Reading from the context if skipContext is true.
-    private function ReadJSONString(skipContext : Bool) : String
-    {
-        if (!skipContext)
-        {
-            context.Read();
-        }
-
-        var buffer : BytesBuffer = new BytesBuffer();
-
-        ReadJSONSyntaxChar( JSONConstants.QUOTE);
-        while (true)
-        {
-            var ch = reader.Read();
-
-            // end of string?
-            if (StringFromBytes(ch) == JSONConstants.QUOTE)
-            {
-                break;
-            }
-
-            // escaped?
-            if (StringFromBytes(ch) != JSONConstants.ESCSEQ.charAt(0))
-            {
-                buffer.addByte( ch.get(0));
-                continue;
-            }
-
-            // distinguish between \uXXXX (hex unicode) and \X (control chars)
-            ch = reader.Read();
-            if (StringFromBytes(ch) != JSONConstants.ESCSEQ.charAt(1))
-            {
-                var value = JSONConstants.ESCAPE_CHARS_TO_VALUES[ch.get(0)];
-                if( value == null)
-                {
-                    throw new TProtocolException( TProtocolException.INVALID_DATA, "Expected control char");
-                }
-                buffer.addByte( value);
-                continue;
-            }
-
-
-            // it's \uXXXX
-            var hexbuf = new BytesBuffer();
-            var hexlen = trans.readAll( hexbuf, 0, 4);
-            if( hexlen != 4)
-            {
-                throw new TProtocolException( TProtocolException.INVALID_DATA, "Not enough data for \\uNNNN sequence");
-            }
-
-            var hexdigits = hexbuf.getBytes();
-            var charcode = 0;
-            charcode = (charcode << 4) + HexVal( String.fromCharCode(hexdigits.get(0)));
-            charcode = (charcode << 4) + HexVal( String.fromCharCode(hexdigits.get(1)));
-            charcode = (charcode << 4) + HexVal( String.fromCharCode(hexdigits.get(2)));
-            charcode = (charcode << 4) + HexVal( String.fromCharCode(hexdigits.get(3)));
-            buffer.addString( String.fromCharCode(charcode));
-        }
-
-        return StringFromBytes( buffer.getBytes());
-    }
-
-    // Return true if the given byte could be a valid part of a JSON number.
-    private function IsJSONNumeric(b : Int) : Bool {
-        switch (b)
-        {
-            case "+".code:  return true;
-            case "-".code:  return true;
-            case ".".code:  return true;
-            case "0".code:  return true;
-            case "1".code:  return true;
-            case "2".code:  return true;
-            case "3".code:  return true;
-            case "4".code:  return true;
-            case "5".code:  return true;
-            case "6".code:  return true;
-            case "7".code:  return true;
-            case "8".code:  return true;
-            case "9".code:  return true;
-            case "E".code:  return true;
-            case "e".code:  return true;
-        }
-        return false;
-    }
-
-    // Read in a sequence of characters that are all valid in JSON numbers. Does
-    // not do a complete regex check to validate that this is actually a number.
-    private function ReadJSONNumericChars() : String
-    {
-        var buffer : BytesBuffer = new BytesBuffer();
-        while (true)
-        {
-            var ch = reader.Peek();
-            if( ! IsJSONNumeric( ch.get(0)))
-            {
-                break;
-            }
-            buffer.addByte( reader.Read().get(0));
-        }
-        return StringFromBytes( buffer.getBytes());
-    }
-
-    // Read in a JSON number. If the context dictates, Read in enclosing quotes.
-    private function ReadJSONInteger() : Int {
-        context.Read();
-
-        if (context.EscapeNumbers()) {
-            ReadJSONSyntaxChar( JSONConstants.QUOTE);
-        }
-
-        var str : String = ReadJSONNumericChars();
-
-        if (context.EscapeNumbers()) {
-            ReadJSONSyntaxChar( JSONConstants.QUOTE);
-        }
-
-        var value = Std.parseInt(str);
-        if( value == null) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA, 'Bad numeric data: $str');
-        }
-
-        return value;
-    }
-
-    // Read in a JSON number. If the context dictates, Read in enclosing quotes.
-    private function ReadJSONInt64() : haxe.Int64 {
-        context.Read();
-
-        if (context.EscapeNumbers()) {
-            ReadJSONSyntaxChar( JSONConstants.QUOTE);
-        }
-
-        var str : String = ReadJSONNumericChars();
-        if( str.length == 0) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA, 'Bad numeric data: $str');
-        }
-
-        if (context.EscapeNumbers()) {
-            ReadJSONSyntaxChar( JSONConstants.QUOTE);
-        }
-
-        // process sign
-        var bMinus = false;
-        var startAt = 0;
-        if( (str.charAt(0) == "+") || (str.charAt(0) == "-")) {
-            bMinus = (str.charAt(0) == "-");
-            startAt++;
-        }
-
-        // process digits
-        var value : Int64 = Int64.make(0,0);
-        var bGotDigits = false;
-        for( i in startAt ... str.length) {
-            var ch = str.charAt(i);
-            var digit = JSONConstants.DECIMAL_DIGITS[ch];
-            if( digit == null) {
-                throw new TProtocolException(TProtocolException.INVALID_DATA, 'Bad numeric data: $str');
-            }
-            bGotDigits = true;
-
-            // these are decimal digits
-            value = Int64.mul( value, Int64.make(0,10));
-            value = Int64.add( value, Int64.make(0,digit));
-        }
-
-        // process pending minus sign, if applicable
-        // this should also handle the edge case MIN_INT64 correctly
-        if( bMinus && (Int64.compare(value,Int64.make(0,0)) > 0)) {
-            value = Int64.neg( value);
-            bMinus = false;
-        }
-
-        if( ! bGotDigits) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA, 'Bad numeric data: $str');
-        }
-
-        return value;
-    }
-
-    // Read in a JSON double value. Throw if the value is not wrapped in quotes
-    // when expected or if wrapped in quotes when not expected.
-    private function ReadJSONDouble() : Float {
-        context.Read();
-
-        var str : String = "";
-        if (StringFromBytes(reader.Peek()) == JSONConstants.QUOTE) {
-            str = ReadJSONString(true);
-
-            // special cases
-            if( str == JSONConstants.FLOAT_IS_NAN) {
-                return Math.NaN;
-            }
-            if( str == JSONConstants.FLOAT_IS_POS_INF) {
-                return Math.POSITIVE_INFINITY;
-            }
-            if( str == JSONConstants.FLOAT_IS_NEG_INF) {
-                return Math.NEGATIVE_INFINITY;
-            }
-
-            if( ! context.EscapeNumbers())    {
-                // throw - we should not be in a string in this case
-                throw new TProtocolException(TProtocolException.INVALID_DATA, "Numeric data unexpectedly quoted");
-            }
-        }
-        else
-        {
-            if( context.EscapeNumbers())    {
-                // This will throw - we should have had a quote if EscapeNumbers() == true
-                ReadJSONSyntaxChar( JSONConstants.QUOTE);
-            }
-
-            str = ReadJSONNumericChars();
-        }
-
-        // parse and check - we should have at least one valid digit
-        var dub = Std.parseFloat( str);
-        if( (str.length == 0) || Math.isNaN(dub)) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA, 'Bad numeric data: $str');
-        }
-
-        return dub;
-    }
-
-    // Read in a JSON string containing base-64 encoded data and decode it.
-    private function ReadJSONBase64() : Bytes
-    {
-        var str = ReadJSONString(false);
-        return Base64.decode( str);
-    }
-
-    private function ReadJSONObjectStart() : Void {
-        context.Read();
-        ReadJSONSyntaxChar( JSONConstants.LBRACE);
-        PushContext(new JSONPairContext(this));
-    }
-
-    private function ReadJSONObjectEnd() : Void {
-        ReadJSONSyntaxChar( JSONConstants.RBRACE);
-        PopContext();
-    }
-
-    private function ReadJSONArrayStart() : Void {
-        context.Read();
-        ReadJSONSyntaxChar( JSONConstants.LBRACKET);
-        PushContext(new JSONListContext(this));
-    }
-
-    private function ReadJSONArrayEnd() : Void {
-        ReadJSONSyntaxChar( JSONConstants.RBRACKET);
-        PopContext();
-    }
-
-
-    public static function BytesFromString( str : String) : Bytes {
-        var buf = new BytesBuffer();
-        if( utf8Strings)
-            buf.addString( str);  // no need to encode on UTF8 targets, the string is just fine
-        else
-            buf.addString( Utf8.encode( str));
-        return buf.getBytes();
-    }
-
-    public static function StringFromBytes( buf : Bytes) : String {
-        var inp = new BytesInput( buf);
-        if( buf.length == 0)
-            return "";  // readString() would return null in that case, which is wrong
-        var str = inp.readString( buf.length);
-        if( utf8Strings)
-            return str;  // no need to decode on UTF8 targets, the string is just fine
-        else
-            return Utf8.decode( str);
-    }
-
-    // Convert a byte containing a hex char ('0'-'9' or 'a'-'f') into its corresponding hex value
-    private static function HexVal(char : String) : Int {
-        var value = JSONConstants.HEX_DIGITS[char];
-        if( value == null) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA, 'Expected hex character: $char');
-        }
-        return value;
-    }
-
-    // Convert a byte containing a hex nibble to its corresponding hex character
-    private static function HexChar(nibble : Int) : String
-    {
-        return "0123456789abcdef".charAt(nibble & 0x0F);
-    }
-
-
-}
-
-
-@:allow(TJSONProtocol)
-class JSONConstants {
-    public static var COMMA = ",";
-    public static var COLON = ":";
-    public static var LBRACE = "{";
-    public static var RBRACE = "}";
-    public static var LBRACKET = "[";
-    public static var RBRACKET = "]";
-    public static var QUOTE = "\"";
-    public static var BACKSLASH = "\\";
-
-    public static var ESCSEQ = "\\u";
-
-    public static var FLOAT_IS_NAN = "NaN";
-    public static var FLOAT_IS_POS_INF = "Infinity";
-    public static var FLOAT_IS_NEG_INF = "-Infinity";
-
-    public static var VERSION = 1;
-    public static var JSON_CHAR_TABLE = [
-        0,  0,  0,  0,  0,  0,  0,  0,
-        "b".code, "t".code, "n".code,  0, "f".code, "r".code,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,
-        0,  0,  0,  0,  0,  0,  0,  0,
-        1,  1, "\"".code,  1,  1,  1,  1,  1,
-        1,  1,  1,  1,  1,  1,  1,  1,
-    ];
-
-    public static var ESCAPE_CHARS     = ['"','\\','/','b','f','n','r','t'];
-    public static var ESCAPE_CHARS_TO_VALUES = [
-        "\"".code => 0x22,
-        "\\".code => 0x5C,
-        "/".code  => 0x2F,
-        "b".code  => 0x08,
-        "f".code  => 0x0C,
-        "n".code  => 0x0A,
-        "r".code  => 0x0D,
-        "t".code  => 0x09
-    ];
-
-    public static var DECIMAL_DIGITS = [
-        "0" => 0,
-        "1" => 1,
-        "2" => 2,
-        "3" => 3,
-        "4" => 4,
-        "5" => 5,
-        "6" => 6,
-        "7" => 7,
-        "8" => 8,
-        "9" => 9
-    ];
-
-    public static var HEX_DIGITS = [
-        "0" => 0,
-        "1" => 1,
-        "2" => 2,
-        "3" => 3,
-        "4" => 4,
-        "5" => 5,
-        "6" => 6,
-        "7" => 7,
-        "8" => 8,
-        "9" => 9,
-        "A" => 10,
-        "a" => 10,
-        "B" => 11,
-        "b" => 11,
-        "C" => 12,
-        "c" => 12,
-        "D" => 13,
-        "d" => 13,
-        "E" => 14,
-        "e" => 14,
-        "F" => 15,
-        "f" => 15
-    ];
-
-
-    public static var DEF_STRING_SIZE = 16;
-
-    public static var NAME_BOOL   = 'tf';
-    public static var NAME_BYTE   = 'i8';
-    public static var NAME_I16    = 'i16';
-    public static var NAME_I32    = 'i32';
-    public static var NAME_I64    = 'i64';
-    public static var NAME_DOUBLE = 'dbl';
-    public static var NAME_STRUCT = 'rec';
-    public static var NAME_STRING = 'str';
-    public static var NAME_MAP    = 'map';
-    public static var NAME_LIST   = 'lst';
-    public static var NAME_SET    = 'set';
-
-    public static function GetTypeNameForTypeID(typeID : Int) : String {
-        switch (typeID)
-        {
-            case TType.BOOL:     return NAME_BOOL;
-            case TType.BYTE:     return NAME_BYTE;
-            case TType.I16:         return NAME_I16;
-            case TType.I32:         return NAME_I32;
-            case TType.I64:         return NAME_I64;
-            case TType.DOUBLE:     return NAME_DOUBLE;
-            case TType.STRING:     return NAME_STRING;
-            case TType.STRUCT:     return NAME_STRUCT;
-            case TType.MAP:         return NAME_MAP;
-            case TType.SET:         return NAME_SET;
-            case TType.LIST:     return NAME_LIST;
-        }
-        throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED, "Unrecognized type");
-    }
-
-    private static var NAMES_TO_TYPES = [
-        NAME_BOOL   => TType.BOOL,
-        NAME_BYTE   => TType.BYTE,
-        NAME_I16    => TType.I16,
-        NAME_I32    => TType.I32,
-        NAME_I64    => TType.I64,
-        NAME_DOUBLE => TType.DOUBLE,
-        NAME_STRING => TType.STRING,
-        NAME_STRUCT => TType.STRUCT,
-        NAME_MAP    => TType.MAP,
-        NAME_SET    => TType.SET,
-        NAME_LIST   => TType.LIST
-    ];
-
-    public static function GetTypeIDForTypeName(name : String) : Int
-    {
-        var type = NAMES_TO_TYPES[name];
-        if( null != type) {
-            return type;
-        }
-        throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED, "Unrecognized type");
-    }
-
-}
-
-
-// Base class for tracking JSON contexts that may require inserting/Reading
-// additional JSON syntax characters. This base context does nothing.
-@:allow(TJSONProtocol)
-class JSONBaseContext
-{
-    private var proto : TJSONProtocol;
-
-    public function new(proto : TJSONProtocol )
-    {
-        this.proto = proto;
-    }
-
-    public function Write() : Void { }
-    public function Read() : Void { }
-
-    public function EscapeNumbers() : Bool {
-        return false;
-    }
-}
-
-
-// Context for JSON lists.
-// Will insert/Read commas before each item except for the first one
-@:allow(TJSONProtocol)
-class JSONListContext extends JSONBaseContext
-{
-    public function new( proto : TJSONProtocol) {
-        super(proto);
-    }
-
-    private var first : Bool = true;
-
-    public override function Write() : Void {
-        if (first)
-        {
-            first = false;
-        }
-        else
-        {
-            var buf = new BytesBuffer();
-            buf.addString( JSONConstants.COMMA);
-            var tmp = buf.getBytes();
-            proto.trans.write( tmp, 0, tmp.length);
-        }
-    }
-
-    public override function Read() : Void {
-        if (first)
-        {
-            first = false;
-        }
-        else
-        {
-            proto.ReadJSONSyntaxChar( JSONConstants.COMMA);
-        }
-    }
-}
-
-
-// Context for JSON records.
-// Will insert/Read colons before the value portion of each record
-// pair, and commas before each key except the first. In addition,
-// will indicate that numbers in the key position need to be escaped
-// in quotes (since JSON keys must be strings).
-@:allow(TJSONProtocol)
-class JSONPairContext extends JSONBaseContext
-{
-    public function new( proto : TJSONProtocol ) {
-        super( proto);
-    }
-
-    private var first : Bool = true;
-    private var colon : Bool  = true;
-
-    public override function Write() : Void {
-        if (first)
-        {
-            first = false;
-            colon = true;
-        }
-        else
-        {
-            var buf = new BytesBuffer();
-            buf.addString( colon ? JSONConstants.COLON : JSONConstants.COMMA);
-            var tmp = buf.getBytes();
-            proto.trans.write( tmp, 0, tmp.length);
-            colon = !colon;
-        }
-    }
-
-    public override function Read() : Void {
-        if (first)
-        {
-            first = false;
-            colon = true;
-        }
-        else
-        {
-            proto.ReadJSONSyntaxChar( colon ? JSONConstants.COLON : JSONConstants.COMMA);
-            colon = !colon;
-        }
-    }
-
-    public override function EscapeNumbers() : Bool
-    {
-        return colon;
-    }
-}
-
-// Holds up to one byte from the transport
-@:allow(TJSONProtocol)
-class LookaheadReader {
-
-    private var proto : TJSONProtocol;
-    private var data : Bytes;
-
-    public function new( proto : TJSONProtocol ) {
-        this.proto = proto;
-        data = null;
-    }
-
-
-    // Return and consume the next byte to be Read, either taking it from the
-    // data buffer if present or getting it from the transport otherwise.
-    public function Read() : Bytes {
-        var retval = Peek();
-        data = null;
-        return retval;
-    }
-
-    // Return the next byte to be Read without consuming, filling the data
-    // buffer if it has not been filled alReady.
-    public function Peek() : Bytes {
-        if (data == null) {
-            var buf = new BytesBuffer();
-            proto.trans.readAll(buf, 0, 1);
-            data = buf.getBytes();
-        }
-        return data;
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TJSONProtocolFactory.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TJSONProtocolFactory.hx
deleted file mode 100644
index 363558a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TJSONProtocolFactory.hx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.transport.TTransport;
-
-
-/**
-* JSON Protocol Factory
-*/
-class TJSONProtocolFactory implements TProtocolFactory {
-
-    public function new() {
-    }
-
-    public function getProtocol( trans : TTransport) : TProtocol  {
-        return new TJSONProtocol( trans);
-    }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TList.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TList.hx
deleted file mode 100644
index 5a1fb55..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TList.hx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-class TList {
-
-    public var elemType : Int;
-    public var size : Int;
-
-      public function new(t : Int = 0, s : Int = 0) {
-        elemType = t;
-        size = s;
-      }
-
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMap.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMap.hx
deleted file mode 100644
index f4e6288..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMap.hx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-class TMap {
-
-    public var keyType : Int;
-    public var valueType : Int;
-    public var size : Int;
-
-    public function new(k : Int = 0, v : Int = 0, s : Int = 0) {
-      keyType = k;
-      valueType = v;
-      size = s;
-    }
-
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMessage.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMessage.hx
deleted file mode 100644
index d99264a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMessage.hx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-class TMessage {
-
-    public var name : String;
-    public var type : Int;
-    public var seqid : Int;
-
-    public function new(n : String = "", t : Int = 0, s : Int = 0) {
-      name = n;
-      type = t;
-      seqid = s;
-    }
-
-    public function toString() : String {
-      return "<TMessage name:'" + name + "' type: " + type + " seqid:" + seqid + ">";
-    }
-
-    public function equals(other:TMessage) : Bool {
-      return name == other.name && type == other.type && seqid == other.seqid;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMessageType.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMessageType.hx
deleted file mode 100644
index 706d329..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMessageType.hx
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-@:enum
-abstract TMessageType(Int)  from Int to Int  {
-    public static inline var CALL      : Int = 1;
-    public static inline var REPLY     : Int = 2;
-    public static inline var EXCEPTION : Int = 3;
-    public static inline var ONEWAY    : Int = 4;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMultiplexedProcessor.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMultiplexedProcessor.hx
deleted file mode 100644
index 50aa3cd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMultiplexedProcessor.hx
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import haxe.ds.StringMap;
-import org.apache.thrift.TApplicationException;
-import org.apache.thrift.TProcessor;
-
-import org.apache.thrift.transport.TTransport;
-
-
-/**
- * TMultiplexedProcessor is a TProcessor allowing a single TServer to provide multiple services.
- * To do so, you instantiate the processor and then register additional processors with it,
- * as shown in the following example:
- *
- *     TMultiplexedProcessor processor = new TMultiplexedProcessor();
- *
- *     processor.registerProcessor(
- *         "Calculator",
- *         new Calculator.Processor(new CalculatorHandler()));
- *
- *     processor.registerProcessor(
- *         "WeatherReport",
- *         new WeatherReport.Processor(new WeatherReportHandler()));
- *
- *     TServerTransport t = new TServerSocket(9090);
- *     TSimpleServer server = new TSimpleServer(processor, t);
- *
- *     server.serve();
- */
-class TMultiplexedProcessor implements TProcessor
-{
-    private var serviceProcessorMap : StringMap<TProcessor> = new StringMap<TProcessor>();
-    private var defaultProcessor : TProcessor = null;
-
-    public function new() {
-    }
-
-    /**
-     * 'Register' a service with this TMultiplexedProcessor. This allows us to broker
-     * requests to individual services by using the service name to select them at request time.
-     *
-     * Args:
-     * - serviceName    Name of a service, has to be identical to the name
-     *                  declared in the Thrift IDL, e.g. "WeatherReport".
-     * - processor      Implementation of a service, usually referred to as "handlers",
-     *                  e.g. WeatherReportHandler implementing WeatherReport.Iface.
-     */
-    public function RegisterProcessor(serviceName : String, processor : TProcessor, asDefault : Bool = false) : Void {
-        serviceProcessorMap.set(serviceName, processor);
-        if ( asDefault) {
-            if( defaultProcessor != null) {
-                throw new TApplicationException( TApplicationException.UNKNOWN, "Can't have multiple default processors");
-            } else {
-                defaultProcessor = processor;
-            }
-        }
-    }
-
-
-    private function Fail( oprot : TProtocol, message : TMessage, extype : Int, etxt : String) : Void {
-        var appex = new TApplicationException( extype, etxt);
-
-        var newMessage = new TMessage(message.name, TMessageType.EXCEPTION, message.seqid);
-
-        oprot.writeMessageBegin(newMessage);
-        appex.write( oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-    }
-
-
-    /**
-     * This implementation of process performs the following steps:
-     *
-     * - Read the beginning of the message.
-     * - Extract the service name from the message.
-     * - Using the service name to locate the appropriate processor.
-     * - Dispatch to the processor, with a decorated instance of TProtocol
-     *    that allows readMessageBegin() to return the original TMessage.
-     *
-     * Throws an exception if
-     * - the message type is not CALL or ONEWAY,
-     * - the service name was not found in the message, or
-     * - the service name has not been RegisterProcessor()ed.
-     */
-    public function process( iprot : TProtocol, oprot : TProtocol) : Bool {
-        /*  Use the actual underlying protocol (e.g. TBinaryProtocol) to read the
-            message header.  This pulls the message "off the wire", which we'll
-            deal with at the end of this method. */
-
-        var message : TMessage = iprot.readMessageBegin();
-        var methodName : String = "";
-
-        if ((message.type != TMessageType.CALL) && (message.type != TMessageType.ONEWAY))
-        {
-            Fail(oprot, message,
-                  TApplicationException.INVALID_MESSAGE_TYPE,
-                  "Message type CALL or ONEWAY expected");
-            return false;
-        }
-
-        // Extract the service name
-        var actualProcessor : TProcessor = null;
-        var index = message.name.indexOf(TMultiplexedProtocol.SEPARATOR);
-        if (index < 0) {
-            // fallback to default processor
-            methodName = message.name;
-            actualProcessor = defaultProcessor;
-            if( actualProcessor == null) {
-                Fail(oprot, message,
-                      TApplicationException.INVALID_PROTOCOL,
-                      "Service name not found in message name: " + message.name + " and no default processor defined. " +
-                      "Did you forget to use a TMultiplexProtocol in your client?");
-                return false;
-            }
-
-        } else {
-            // service name given
-            var serviceName = message.name.substring(0, index);
-            methodName = message.name.substring( serviceName.length + TMultiplexedProtocol.SEPARATOR.length);
-            actualProcessor = serviceProcessorMap.get( serviceName);
-            if( actualProcessor == null) {
-                Fail(oprot, message,
-                      TApplicationException.INTERNAL_ERROR,
-                      "Service name not found: " + serviceName + ". " +
-                      "Did you forget to call RegisterProcessor()?");
-                return false;
-            }
-        }
-
-        // Create a new TMessage, removing the service name
-        // Dispatch processing to the stored processor
-        var newMessage = new TMessage( methodName, message.type, message.seqid);
-        var storedMsg = new StoredMessageProtocol( iprot, newMessage);
-        return actualProcessor.process( storedMsg, oprot);
-    }
-}
-
-
-/**
- *  Our goal was to work with any protocol.  In order to do that, we needed
- *  to allow them to call readMessageBegin() and get a TMessage in exactly
- *  the standard format, without the service name prepended to TMessage.name.
- */
-class StoredMessageProtocol extends TProtocolDecorator
-{
-    private var messageBegin : TMessage;
-
-    public function new( protocol : TProtocol, messageBegin : TMessage) {
-        super( protocol);
-        this.messageBegin = messageBegin;
-    }
-
-    public override function readMessageBegin() : TMessage {
-        return messageBegin;
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMultiplexedProtocol.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMultiplexedProtocol.hx
deleted file mode 100644
index cacd1d7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TMultiplexedProtocol.hx
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.transport.TTransport;
-
-
-/**
- * TMultiplexedProtocol is a protocol-independent concrete decorator that allows a Thrift
- * client to communicate with a multiplexing Thrift server, by prepending the service name
- * to the function name during function calls.
- *
- * NOTE: THIS IS NOT TO BE USED BY SERVERS.
- * On the server, use TMultiplexedProcessor to handle requests from a multiplexing client.
- *
- * This example uses a single socket transport to invoke two services:
- *
- *     TSocket transport = new TSocket("localhost", 9090);
- *     transport.open();
- *
- *     TBinaryProtocol protocol = new TBinaryProtocol(transport);
- *
- *     TMultiplexedProtocol mp = new TMultiplexedProtocol(protocol, "Calculator");
- *     Calculator.Client service = new Calculator.Client(mp);
- *
- *     TMultiplexedProtocol mp2 = new TMultiplexedProtocol(protocol, "WeatherReport");
- *     WeatherReport.Client service2 = new WeatherReport.Client(mp2);
- *
- *     System.out.println(service.add(2,2));
- *     System.out.println(service2.getTemperature());
- *
- */
-class TMultiplexedProtocol extends TProtocolDecorator {
-
-    /** Used to delimit the service name from the function name */
-    public static inline var SEPARATOR : String = ":";
-
-    private var service : String;
-
-    /**
-     * Wrap the specified protocol, allowing it to be used to communicate with a
-     * multiplexing server.  The <code>serviceName</code> is required as it is
-     * prepended to the message header so that the multiplexing server can broker
-     * the function call to the proper service.
-     *
-     * Args:
-     *  protocol        Your communication protocol of choice, e.g. TBinaryProtocol
-     *  serviceName     The service name of the service communicating via this protocol.
-     */
-    public function new( protocol : TProtocol, serviceName : String)    {
-        super( protocol);
-        service = serviceName;
-    }
-
-    /**
-     * Prepends the service name to the function name, separated by TMultiplexedProtocol.SEPARATOR.
-     * Args:
-     *   tMessage     The original message.
-     */
-    public override function writeMessageBegin( message : TMessage) : Void {
-        switch( message.type)
-        {
-            case TMessageType.CALL:
-                super.writeMessageBegin(new TMessage(
-                    service + SEPARATOR + message.name,
-                    message.type,
-                    message.seqid));
-
-            case TMessageType.ONEWAY:
-                super.writeMessageBegin(new TMessage(
-                    service + SEPARATOR + message.name,
-                    message.type,
-                    message.seqid));
-
-            default:
-                super.writeMessageBegin(message);
-        }
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocol.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocol.hx
deleted file mode 100644
index b7f3842..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocol.hx
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import haxe.io.Bytes;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
-* Protocol interface definition
-*/
-interface TProtocol {
-
-    function getTransport() : TTransport;
-
-    /**
-     * Writing methods.
-     */
-    function writeMessageBegin(message:TMessage) : Void;
-    function writeMessageEnd() : Void;
-    function writeStructBegin(struct:TStruct) : Void;
-    function writeStructEnd() : Void;
-    function writeFieldBegin(field:TField) : Void;
-    function writeFieldEnd() : Void;
-    function writeFieldStop() : Void;
-    function writeMapBegin(map:TMap) : Void;
-    function writeMapEnd() : Void;
-    function writeListBegin(list:TList) : Void;
-    function writeListEnd() : Void;
-    function writeSetBegin(set:TSet) : Void;
-    function writeSetEnd() : Void;
-    function writeBool(b : Bool) : Void;
-    function writeByte(b : Int) : Void;
-    function writeI16(i16 : Int) : Void;
-    function writeI32(i32 : Int) : Void;
-    function writeI64(i64 : haxe.Int64) : Void;
-    function writeDouble(dub : Float) : Void;
-    function writeString(str : String) : Void;
-    function writeBinary(bin : Bytes) : Void;
-
-    /**
-     * Reading methods.
-     */
-    function readMessageBegin():TMessage;
-    function readMessageEnd() : Void;
-    function readStructBegin():TStruct;
-    function readStructEnd() : Void;
-    function readFieldBegin():TField;
-    function readFieldEnd() : Void;
-    function readMapBegin():TMap;
-    function readMapEnd() : Void;
-    function readListBegin():TList;
-    function readListEnd() : Void;
-    function readSetBegin():TSet;
-    function readSetEnd() : Void;
-    function readBool() : Bool;
-    function readByte() : Int;
-    function readI16() : Int;
-    function readI32() : Int;
-    function readI64() : haxe.Int64;
-    function readDouble() : Float;
-    function readString() : String;
-    function readBinary() : Bytes;
-
-    // recursion tracking
-    function IncrementRecursionDepth() : Void;
-    function DecrementRecursionDepth() : Void;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolDecorator.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolDecorator.hx
deleted file mode 100644
index 769e93c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolDecorator.hx
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import haxe.io.Bytes;
-import haxe.Int64;
-
-import org.apache.thrift.transport.TTransport;
-
-
-/**
- * TProtocolDecorator forwards all requests to an enclosed TProtocol instance,
- * providing a way to author concise concrete decorator subclasses.  While it has
- * no abstract methods, it is marked abstract as a reminder that by itself,
- * it does not modify the behaviour of the enclosed TProtocol.
- *
- * See p.175 of Design Patterns (by Gamma et al.)
- * See TMultiplexedProtocol
- */
-class TProtocolDecorator implements TProtocol
-{
-    private var wrapped : TProtocol;
-
-    /**
-     * Encloses the specified protocol.
-     * @param protocol All operations will be forward to this protocol.  Must be non-null.
-     */
-    private function new( protocol : TProtocol)  // not to be instantiated, must derive a class
-    {
-        wrapped = protocol;
-    }
-
-    public function getTransport() : TTransport {
-      return wrapped.getTransport();
-    }
-
-    public function writeMessageBegin( value : TMessage) : Void    {
-        wrapped.writeMessageBegin( value);
-    }
-
-    public function writeMessageEnd() : Void {
-        wrapped.writeMessageEnd();
-    }
-
-    public function writeStructBegin(value : TStruct) : Void {
-        wrapped.writeStructBegin( value);
-    }
-
-    public function writeStructEnd() : Void {
-        wrapped.writeStructEnd();
-    }
-
-    public function writeFieldBegin(value : TField) : Void {
-        wrapped.writeFieldBegin( value);
-    }
-
-    public function writeFieldEnd() : Void {
-        wrapped.writeFieldEnd();
-    }
-
-    public function writeFieldStop() : Void {
-        wrapped.writeFieldStop();
-    }
-
-    public function writeMapBegin( value : TMap) : Void {
-        wrapped.writeMapBegin( value);
-    }
-
-    public function writeMapEnd() : Void {
-        wrapped.writeMapEnd();
-    }
-
-    public function writeListBegin( value : TList) : Void {
-        wrapped.writeListBegin( value);
-    }
-
-    public function writeListEnd() : Void {
-        wrapped.writeListEnd();
-    }
-
-    public function writeSetBegin( value : TSet) : Void {
-        wrapped.writeSetBegin( value);
-    }
-
-    public function writeSetEnd() : Void {
-        wrapped.writeSetEnd();
-    }
-
-    public function writeBool(value : Bool) : Void {
-        wrapped.writeBool( value);
-    }
-
-    public function writeByte(value : Int) : Void {
-        wrapped.writeByte( value);
-    }
-
-    public function writeI16(value : Int) : Void {
-        wrapped.writeI16( value);
-    }
-
-    public function writeI32(value : Int) : Void {
-        wrapped.writeI32( value);
-    }
-
-    public function writeI64(value : haxe.Int64) : Void {
-        wrapped.writeI64( value);
-    }
-
-    public function writeDouble(value : Float) : Void {
-        wrapped.writeDouble( value);
-    }
-
-    public function writeString(value : String) : Void {
-        wrapped.writeString( value);
-    }
-
-    public function writeBinary(value : Bytes ) : Void {
-        wrapped.writeBinary( value);
-    }
-
-    public function readMessageBegin() : TMessage {
-        return wrapped.readMessageBegin();
-    }
-
-    public function readMessageEnd() : Void {
-        wrapped.readMessageEnd();
-    }
-
-    public function readStructBegin() : TStruct {
-        return wrapped.readStructBegin();
-    }
-
-    public function readStructEnd() : Void {
-        wrapped.readStructEnd();
-    }
-
-    public function readFieldBegin() : TField {
-        return wrapped.readFieldBegin();
-    }
-
-    public function readFieldEnd() : Void {
-        wrapped.readFieldEnd();
-    }
-
-    public function readMapBegin() : TMap {
-        return wrapped.readMapBegin();
-    }
-
-    public function readMapEnd() : Void {
-        wrapped.readMapEnd();
-    }
-
-    public function readListBegin() : TList {
-        return wrapped.readListBegin();
-    }
-
-    public function readListEnd() : Void {
-        wrapped.readListEnd();
-    }
-
-    public function readSetBegin() : TSet {
-        return wrapped.readSetBegin();
-    }
-
-    public function readSetEnd() : Void {
-        wrapped.readSetEnd();
-    }
-
-    public function readBool() : Bool
-    {
-        return wrapped.readBool();
-    }
-
-    public function readByte() : Int {
-        return wrapped.readByte();
-    }
-
-    public function readI16() : Int {
-        return wrapped.readI16();
-    }
-
-    public function readI32() : Int {
-        return wrapped.readI32();
-    }
-
-    public function readI64() : haxe.Int64 {
-        return wrapped.readI64();
-    }
-
-    public function readDouble() : Float {
-        return wrapped.readDouble();
-    }
-
-    public function readString() : String {
-        return wrapped.readString();
-    }
-
-    public function readBinary() : Bytes {
-        return wrapped.readBinary();
-    }
-
-    public function IncrementRecursionDepth() : Void {
-        return wrapped.IncrementRecursionDepth();
-    }
-
-    public function DecrementRecursionDepth() : Void {
-        return wrapped.DecrementRecursionDepth();
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolException.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolException.hx
deleted file mode 100644
index a3b37a5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolException.hx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TException;
-
-class TProtocolException extends TException {
-
-    // WARNING: These are subject to be extended in the future, so we can't use enums
-    // with Haxe 3.1.3 because of https://github.com/HaxeFoundation/haxe/issues/3649
-    public static inline var UNKNOWN : Int = 0;
-    public static inline var INVALID_DATA : Int = 1;
-    public static inline var NEGATIVE_SIZE : Int = 2;
-    public static inline var SIZE_LIMIT : Int = 3;
-    public static inline var BAD_VERSION : Int = 4;
-    public static inline var NOT_IMPLEMENTED : Int = 5;
-    public static inline var DEPTH_LIMIT : Int = 6;
-
-    public function new(error : Int = UNKNOWN, message : String = "") {
-      super(message, error);
-    }
-
-
-} 
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolFactory.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolFactory.hx
deleted file mode 100644
index 1c2d62e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolFactory.hx
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.transport.TTransport;
-
-interface TProtocolFactory {
-     function getProtocol(trans:TTransport):TProtocol;
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolUtil.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolUtil.hx
deleted file mode 100644
index 1ec59d2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TProtocolUtil.hx
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.*;
-
-  /**
-   * Utility class with static methods for interacting with protocol data
-   * streams.
-   *
-   */
-class TProtocolUtil {
-
-    /**
-     * Skips over the next data element from the provided input TProtocol object.
-     *
-     * @param prot  the protocol object to read from
-     * @param type  the next value will be intepreted as this TType value.
-     */
-    public static function skip(prot:TProtocol, type : Int) : Void {
-        prot.IncrementRecursionDepth();
-        try
-        {
-            switch (type) {
-                case TType.BOOL:
-                    prot.readBool();
-
-                case TType.BYTE:
-                    prot.readByte();
-
-                case TType.I16:
-                    prot.readI16();
-
-                case TType.I32:
-                    prot.readI32();
-
-                case TType.I64:
-                    prot.readI64();
-
-                case TType.DOUBLE:
-                    prot.readDouble();
-
-                case TType.STRING:
-                    prot.readBinary();
-
-                case TType.STRUCT:
-                    prot.readStructBegin();
-                    while (true) {
-                        var field:TField = prot.readFieldBegin();
-                        if (field.type == TType.STOP) {
-                          break;
-                        }
-                        skip(prot, field.type);
-                        prot.readFieldEnd();
-                    }
-                    prot.readStructEnd();
-
-                case TType.MAP:
-                    var map:TMap = prot.readMapBegin();
-                    for (i in 0 ... map.size) {
-                        skip(prot, map.keyType);
-                        skip(prot, map.valueType);
-                    }
-                    prot.readMapEnd();
-
-                case TType.SET:
-                    var set:TSet = prot.readSetBegin();
-                    for (j in 0 ... set.size) {
-                        skip(prot, set.elemType);
-                    }
-                    prot.readSetEnd();
-
-                case TType.LIST:
-                    var list:TList = prot.readListBegin();
-                    for (k in 0 ... list.size) {
-                        skip(prot, list.elemType);
-                    }
-                    prot.readListEnd();
-
-                default:
-                    trace("Unknown field type ",type," in skipMaxDepth()");
-            }
-
-            prot.DecrementRecursionDepth();
-        }
-        catch(e:Dynamic)
-        {
-            prot.DecrementRecursionDepth();
-            throw e;
-        }
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TRecursionTracker.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TRecursionTracker.hx
deleted file mode 100644
index cf0211b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TRecursionTracker.hx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.*;
-
-
-class TRecursionTracker {
-
-    // default
-    private static inline var DEFAULT_RECURSION_DEPTH : Int = 64;
-
-    // limit and actual value
-    public var recursionLimit : Int = DEFAULT_RECURSION_DEPTH;
-    private var recursionDepth : Int = 0;
-
-    public function IncrementRecursionDepth() : Void
-    {
-        if (recursionDepth < recursionLimit)
-            ++recursionDepth;
-        else
-            throw new TProtocolException(TProtocolException.DEPTH_LIMIT, "Depth limit exceeded");
-    }
-
-    public function DecrementRecursionDepth() : Void
-    {
-        --recursionDepth;
-    }
-
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TSet.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TSet.hx
deleted file mode 100644
index 44eab36..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TSet.hx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-class TSet {
-
-    public var elemType : Int;
-    public var size : Int;
-
-      public function new(t : Int = 0, s : Int = 0) {
-        elemType = t;
-        size = s;
-      }
-
-}    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TStruct.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TStruct.hx
deleted file mode 100644
index 9e0b7dd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TStruct.hx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-class TStruct {
-
-    public var name : String;
-
-    public function new(n : String = "") {
-      name = n;
-    }
-
-}  
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TType.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TType.hx
deleted file mode 100644
index 6abbc96..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/protocol/TType.hx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-@:enum
-abstract TType(Int)  from Int to Int  {
-    public static inline var STOP : Int   = 0;
-    public static inline var VOID : Int   = 1;
-    public static inline var BOOL : Int   = 2;
-    public static inline var BYTE : Int   = 3;
-    public static inline var DOUBLE : Int = 4;
-    public static inline var I16 : Int    = 6;
-    public static inline var I32 : Int    = 8;
-    public static inline var I64 : Int    = 10;
-    public static inline var STRING : Int = 11;
-    public static inline var STRUCT : Int = 12;
-    public static inline var MAP : Int    = 13;
-    public static inline var SET : Int    = 14;
-    public static inline var LIST : Int   = 15;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TServer.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TServer.hx
deleted file mode 100644
index 56eee0a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TServer.hx
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.meta_data.*;
-
-class TServer
-{
-    private var processor : TProcessor = null;
-    private var serverTransport : TServerTransport = null;
-    private var inputTransportFactory : TTransportFactory = null;
-    private var outputTransportFactory : TTransportFactory = null;
-    private var inputProtocolFactory : TProtocolFactory = null;
-    private var outputProtocolFactory : TProtocolFactory = null;
-
-    // server events
-    public var serverEventHandler : TServerEventHandler = null;
-
-    // Log delegation
-    private var _logDelegate : Dynamic->Void  = null;
-    public var logDelegate(get,set) : Dynamic->Void;
-
-    public function new( processor : TProcessor,
-                         serverTransport : TServerTransport,
-                         inputTransportFactory : TTransportFactory = null,
-                         outputTransportFactory : TTransportFactory = null,
-                         inputProtocolFactory : TProtocolFactory = null,
-                         outputProtocolFactory : TProtocolFactory = null,
-                         logDelegate : Dynamic->Void = null)
-    {
-      this.processor = processor;
-      this.serverTransport = serverTransport;
-      this.inputTransportFactory = inputTransportFactory;
-      this.outputTransportFactory = outputTransportFactory;
-      this.inputProtocolFactory = inputProtocolFactory;
-      this.outputProtocolFactory = outputProtocolFactory;
-      this.logDelegate = logDelegate;
-
-      ApplyMissingDefaults();
-    }
-
-    private function ApplyMissingDefaults() {
-        if( processor == null)
-            throw "Invalid server configuration: processor missing";
-        if( serverTransport == null)
-            throw "Invalid server configuration: serverTransport missing";
-        if( inputTransportFactory == null)
-            inputTransportFactory = new TTransportFactory();
-        if( outputTransportFactory  == null)
-            outputTransportFactory = new TTransportFactory();
-        if( inputProtocolFactory  == null)
-            inputProtocolFactory = new TBinaryProtocolFactory();
-        if( outputProtocolFactory == null)
-            outputProtocolFactory= new TBinaryProtocolFactory();
-        if( logDelegate == null)
-            logDelegate = DefaultLogDelegate;
-    }
-
-
-    private function set_logDelegate(value : Dynamic->Void) : Dynamic->Void {
-        if(value != null) {
-            _logDelegate = value;
-        } else {
-            _logDelegate = DefaultLogDelegate;
-        }
-        return _logDelegate;
-    }
-
-
-    private function get_logDelegate() : Dynamic->Void {
-        return _logDelegate;
-    }
-
-
-    private function DefaultLogDelegate(value : Dynamic) : Void  {
-        trace( value);
-    }
-
-
-
-    public function Serve() : Void {
-        throw new AbstractMethodError();
-    }
-
-
-    public function Stop() : Void {
-        throw new AbstractMethodError();
-    }
-
-}
- 
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TServerEventHandler.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TServerEventHandler.hx
deleted file mode 100644
index 9bc9927..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TServerEventHandler.hx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import org.apache.thrift.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-
-// Interface implemented by server users to handle events from the server
-interface TServerEventHandler {
-
-    // Called before the server begins
-    function preServe() : Void;
-
-    // Called when a new client has connected and is about to being processing
-    function createContext( input : TProtocol, output : TProtocol) : Dynamic;
-
-    // Called when a client has finished request-handling to delete server context
-    function deleteContext( serverContext : Dynamic, input : TProtocol, output : TProtocol) : Void;
-
-    // Called when a client is about to call the processor
-    function processContext( serverContext : Dynamic, transport : TTransport) : Void;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TSimpleServer.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TSimpleServer.hx
deleted file mode 100644
index c9856b4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/server/TSimpleServer.hx
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.meta_data.*;
-
-// Simple single-threaded server for testing
-class TSimpleServer extends TServer  {
-
-    private var stop : Bool = false;
-
-    //stops just after input transport returns EOF
-    //useful for limited scenarios, like embeding into php server
-    public var runOnce : Bool = false;
-
-    public function new( processor : TProcessor,
-                         serverTransport : TServerTransport,
-                         transportFactory : TTransportFactory = null,
-                         protocolFactory : TProtocolFactory = null,
-                         logger : Dynamic->Void = null) {
-      super( processor, serverTransport,
-             transportFactory, transportFactory,
-             protocolFactory, protocolFactory,
-             logger);
-    }
-
-
-    public override function Serve() : Void
-    {
-        try
-        {
-            serverTransport.Listen();
-        }
-        catch (ttx : TTransportException)
-        {
-            logDelegate(ttx);
-            return;
-        }
-
-        // Fire the preServe server event when server is up,
-        // but before any client connections
-        if (serverEventHandler != null) {
-            serverEventHandler.preServe();
-        }
-
-        while( ! stop)
-        {
-            var client : TTransport = null;
-            var inputTransport : TTransport = null;
-            var outputTransport : TTransport = null;
-            var inputProtocol : TProtocol = null;
-            var outputProtocol : TProtocol = null;
-            var connectionContext : Dynamic = null;
-            try
-            {
-                client = serverTransport.Accept();
-                if (client != null) {
-                    inputTransport = inputTransportFactory.getTransport( client);
-                    outputTransport = outputTransportFactory.getTransport( client);
-                    inputProtocol = inputProtocolFactory.getProtocol( inputTransport);
-                    outputProtocol = outputProtocolFactory.getProtocol( outputTransport);
-
-                    // Recover event handler (if any) and fire createContext
-                    // server event when a client connects
-                    if (serverEventHandler != null) {
-                        connectionContext = serverEventHandler.createContext(inputProtocol, outputProtocol);
-                    }
-
-                    // Process client requests until client disconnects
-                    while( true) {
-                        // Fire processContext server event
-                        // N.B. This is the pattern implemented in C++ and the event fires provisionally.
-                        // That is to say it may be many minutes between the event firing and the client request
-                        // actually arriving or the client may hang up without ever makeing a request.
-                        if (serverEventHandler != null) {
-                            serverEventHandler.processContext(connectionContext, inputTransport);
-                        }
-
-                        //Process client request (blocks until transport is readable)
-                        if( ! processor.process( inputProtocol, outputProtocol)) {
-                            break;
-                        }
-                    }
-                }
-            }
-            catch( ttx : TTransportException)
-            {
-                // Usually a client disconnect, expected
-                if(runOnce && ttx.errorID == TTransportException.END_OF_FILE) {
-                  //input returns eof, exit
-                  //follows lib/cpp/src/thrift/server/TServerFramework.cpp
-                  Stop();
-                }
-            }
-            catch( pex : TProtocolException)
-            {
-                logDelegate('$pex ${pex.errorID} ${pex.errorMsg}'); // Unexpected
-            }
-            catch( e : Dynamic)
-            {
-                logDelegate(e); // Unexpected
-            }
-
-            // Fire deleteContext server event after client disconnects
-            if (serverEventHandler != null) {
-                serverEventHandler.deleteContext(connectionContext, inputProtocol, outputProtocol);
-            }
-        }
-    }
-
-    public override function Stop() : Void
-    {
-      stop = true;
-      serverTransport.Close();
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TBufferedTransport.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TBufferedTransport.hx
deleted file mode 100644
index 4b33fcf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TBufferedTransport.hx
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.transport.*;
-
-import haxe.io.Eof;
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-import haxe.io.BytesOutput;
-import haxe.io.BytesInput;
-
-
-class TBufferedTransport extends TTransport
-{
-    // constants
-    public static inline var DEFAULT_BUFSIZE : Int = 0x1000;    // 4096 Bytes
-    public static inline var MIN_BUFSIZE : Int = 0x100;         // 256 Bytes
-    public static inline var MAX_BUFSIZE : Int = 0x100000;      // 1 MB
-
-    // Underlying transport
-    public var transport(default,null) :  TTransport = null;
-
-    // Buffer for input/output
-    private var readBuffer_ : BytesInput = null;
-    private var writeBuffer_ : BytesOutput = null;
-    private var bufSize : Int;
-
-    // Constructor wraps around another transport
-    public function new( transport : TTransport, bufSize : Int = DEFAULT_BUFSIZE) {
-
-        // ensure buffer size is in the range
-        if ( bufSize < MIN_BUFSIZE)
-            bufSize = MIN_BUFSIZE;
-        else if( bufSize > MAX_BUFSIZE)
-            bufSize = MAX_BUFSIZE;
-
-        this.transport = transport;
-        this.bufSize = bufSize;
-        this.writeBuffer_ = new BytesOutput();
-        this.writeBuffer_.bigEndian = true;
-    }
-
-    public override function open() : Void {
-        transport.open();
-    }
-
-    public override function isOpen() : Bool {
-        return transport.isOpen();
-    }
-
-    public override function close() : Void {
-        transport.close();
-    }
-
-    public override function read(buf : BytesBuffer, off : Int, len : Int) : Int {
-        try {
-            var data = Bytes.alloc(len);
-
-            while( true) {
-                if ((readBuffer_ != null) && (readBuffer_.position < readBuffer_.length)) {
-                    var got = readBuffer_.readBytes(data, 0, len);
-                    if (got > 0) {
-                        buf.addBytes(data, 0, got);
-                        return got;
-                    }
-                }
-
-                // there is no point in buffering whenever the
-                // remaining length exceeds the buffer size
-                if ( len >= bufSize) {
-                    var got = transport.read( buf, off, len);
-                    if (got > 0) {
-                        buf.addBytes(data, 0, got);
-                        return got;
-                    }
-                }
-
-                // fill the buffer
-                if ( readChunk() <= 0)
-                    break;
-            }
-
-            throw new TTransportException(TTransportException.END_OF_FILE, 'Can\'t read $len bytes!');
-        }
-        catch (eof : Eof) {
-            throw new TTransportException(TTransportException.END_OF_FILE, 'Can\'t read $len bytes!');
-        }
-    }
-
-    function readChunk() : Int {
-        var size = bufSize;
-        try {
-            var buffer = new BytesBuffer();
-            size = transport.read( buffer, 0, size);
-            readBuffer_ = new BytesInput( buffer.getBytes(), 0, size);
-            readBuffer_.bigEndian = true;
-            return size;
-        }
-        catch(eof : Eof) {
-            throw new TTransportException(TTransportException.END_OF_FILE, 'Can\'t read $size bytes!');
-        }
-    }
-
-    private function writeChunk(forceWrite : Bool) : Void {
-        if( writeBuffer_.length > 0) {
-            if ( forceWrite || (writeBuffer_.length >= bufSize)) {
-                var buf = writeBuffer_.getBytes();
-                writeBuffer_ = new BytesOutput();
-                writeBuffer_.bigEndian = true;
-                transport.write(buf, 0, buf.length);
-            }
-        }
-    }
-
-    public override function write(buf : Bytes, off : Int, len : Int) : Void {
-        var halfSize : Int = Std.int(bufSize / 2);
-
-        // No point in buffering if len exceeds the buffer size.
-        // However, if the buffer is less than half full we should still consider
-        // squashing all into one write, except when the actual write len is very large.
-        var huge_write : Bool = (len >= (2 * bufSize));
-        var exceeds_buf : Bool = huge_write || (len >= bufSize);
-        var write_thru : Bool = exceeds_buf && (writeBuffer_.length >= halfSize);
-        if ( write_thru) {
-            writeChunk(true); // force send whatever we have in there
-            transport.write(buf, off, len);  // write thru
-        } else {
-            writeBuffer_.writeBytes(buf, off, len);
-            writeChunk(false);
-        }
-    }
-
-    public override function flush( callback : Dynamic->Void =null) : Void {
-        writeChunk(true);
-        transport.flush(callback);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TBufferedTransportFactory.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TBufferedTransportFactory.hx
deleted file mode 100644
index 539e720..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TBufferedTransportFactory.hx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.transport.*;
-
-
-class TBufferedTransportFactory extends TTransportFactory {
-
-    private var bufSize : Int;
-
-    public function new(bufSize : Int = TBufferedTransport.DEFAULT_BUFSIZE) {
-        super();
-        this.bufSize = bufSize;
-    }
-
-    public override function getTransport(base : TTransport) : TTransport {
-        return new TBufferedTransport(base, bufSize);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFileStream.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFileStream.hx
deleted file mode 100644
index cd8ad17..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFileStream.hx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-import haxe.io.Input;
-import haxe.io.Output;
-
-
-enum TFileMode {
-    CreateNew;
-    Append;
-    Read;
-}
-
-
-class TFileStream implements TStream {
-
-    public var FileName(default,null) : String;
-
-    private var Input  : sys.io.FileInput;
-    private var Output : sys.io.FileOutput;
-
-
-    public function new( fname : String, mode : TFileMode) {
-        FileName = fname;
-        switch ( mode)
-        {
-            case TFileMode.CreateNew:
-                Output = sys.io.File.write( fname, true);
-
-            case TFileMode.Append:
-                Output = sys.io.File.append( fname, true);
-
-            case TFileMode.Read:
-                Input = sys.io.File.read( fname, true);
-
-            default:
-                throw new TTransportException( TTransportException.UNKNOWN,
-                                               "Unsupported mode");
-        }
-
-    }
-
-    public function Close() : Void {
-        if( Input != null) {
-            Input.close();
-            Input = null;
-        }
-        if( Output != null) {
-            Output.close();
-            Output = null;
-        }
-    }
-
-    public function Peek() : Bool {
-        if( Input == null)
-            throw new TTransportException( TTransportException.NOT_OPEN, "File not open for input");
-
-        return (! Input.eof());
-    }
-
-    public function Read( buf : Bytes, offset : Int, count : Int) : Int {
-        if( Input == null)
-            throw new TTransportException( TTransportException.NOT_OPEN, "File not open for input");
-
-        return Input.readBytes( buf, offset, count);
-    }
-
-    public function Write( buf : Bytes, offset : Int, count : Int) : Void {
-        if( Output == null)
-            throw new TTransportException( TTransportException.NOT_OPEN, "File not open for output");
-
-        Output.writeBytes( buf, offset, count);
-    }
-
-    public function Flush() : Void {
-        if( Output != null)
-            Output.flush();
-    }
-
-}
- 
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFramedTransport.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFramedTransport.hx
deleted file mode 100644
index cef82ef..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFramedTransport.hx
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.transport.*;
-
-import haxe.io.Eof;
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-import haxe.io.BytesOutput;
-import haxe.io.BytesInput;
-
-
-/**
- * TFramedTransport is a buffered TTransport that ensures a fully read message
- * every time by preceding messages with a 4-byte frame size.
- */
-class TFramedTransport extends TTransport
-{
-    public static inline var DEFAULT_MAX_LENGTH = 16384000;
-
-    var maxLength_ :  Int;
-
-    /**
-     * Underlying transport
-     */
-    var transport_ :  TTransport = null;
-
-    /**
-     * Buffer for output
-     */
-    var writeBuffer_ : BytesOutput = new BytesOutput();
-
-    /**
-     * Buffer for input
-     */
-    var readBuffer_ : BytesInput = null;
-
-    /**
-     * Constructor wraps around another transport
-     */
-    public function new( transport : TTransport, maxLength : Int = DEFAULT_MAX_LENGTH) {
-        transport_ = transport;
-        maxLength_ = maxLength;
-    }
-
-    public override function open() : Void {
-        transport_.open();
-    }
-
-    public override function isOpen() : Bool {
-        return transport_.isOpen();
-    }
-
-    public override function close() : Void {
-        transport_.close();
-    }
-
-    public override function read(buf : BytesBuffer, off : Int, len : Int) : Int {
-        try {
-            var data = Bytes.alloc(len);
-
-            if ((readBuffer_ != null) && (readBuffer_.position < readBuffer_.length)) {
-                var got : Int = readBuffer_.readBytes(data, off, len);
-                if (got > 0) {
-                    buf.addBytes(data,0,got);
-                    return got;
-                };
-            };
-
-            // Read another frame of data
-            readFrame();
-
-            var got = readBuffer_.readBytes(data, off, len);
-            buf.addBytes(data,0,got);
-            return got;
-        }
-        catch (eof : Eof) {
-            throw new TTransportException(TTransportException.END_OF_FILE, 'Can\'t read $len bytes!');
-        }
-    }
-
-
-    function readFrameSize() : Int {
-        try {
-            var buffer = new BytesBuffer();
-            var len = transport_.readAll( buffer, 0, 4);
-            var inp = new BytesInput( buffer.getBytes(), 0, 4);
-            inp.bigEndian = true;
-            return inp.readInt32();
-        }
-        catch(eof : Eof) {
-            throw new TTransportException(TTransportException.END_OF_FILE, 'Can\'t read 4 bytes!');
-        }
-    }
-
-
-    function readFrame() : Void {
-        var size : Int = readFrameSize();
-
-        if (size < 0) {
-            throw new TTransportException(TTransportException.UNKNOWN, 'Read a negative frame size ($size)!');
-        };
-        if (size > maxLength_) {
-            throw new TTransportException(TTransportException.UNKNOWN, 'Frame size ($size) larger than max length ($maxLength_)!');
-        };
-
-        try {
-            var buffer = new BytesBuffer();
-            size = transport_.readAll( buffer, 0, size);
-            readBuffer_ = new BytesInput( buffer.getBytes(), 0, size);
-            readBuffer_.bigEndian = true;
-        }
-        catch(eof : Eof) {
-            throw new TTransportException(TTransportException.END_OF_FILE, 'Can\'t read $size bytes!');
-        }
-    }
-
-    public override function write(buf : Bytes, off : Int, len : Int) : Void {
-        writeBuffer_.writeBytes(buf, off, len);
-    }
-
-    function writeFrameSize(len : Int) : Void {
-        var out = new BytesOutput();
-        out.bigEndian = true;
-        out.writeInt32(len);
-        transport_.write(out.getBytes(), 0, 4);
-    }
-
-    public override function flush( callback : Dynamic->Void =null) : Void {
-        var buf : Bytes = writeBuffer_.getBytes();
-        var len : Int = buf.length;
-        writeBuffer_ = new BytesOutput();
-
-        writeFrameSize(len);
-        transport_.write(buf, 0, len);
-        transport_.flush(callback);
-    }
-}
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFramedTransportFactory.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFramedTransportFactory.hx
deleted file mode 100644
index 8d45a64..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFramedTransportFactory.hx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.transport.*;
-
-
-class TFramedTransportFactory extends TTransportFactory {
-
-    var maxLength_ : Int;
-
-    public function new(maxLength : Int = TFramedTransport.DEFAULT_MAX_LENGTH) {
-        super();
-        maxLength_ = maxLength;
-    }
-
-    public override function getTransport(base : TTransport) : TTransport {
-        return new TFramedTransport(base, maxLength_);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFullDuplexHttpClient.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFullDuplexHttpClient.hx
deleted file mode 100644
index 1972853..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TFullDuplexHttpClient.hx
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import flash.errors.EOFError;
-import flash.events.Event;
-import flash.events.IOErrorEvent;
-import flash.events.ProgressEvent;
-import flash.events.SecurityErrorEvent;
-import flash.net.URLLoader;
-import flash.net.URLLoaderDataFormat;
-import flash.net.URLRequest;
-import flash.net.URLRequestMethod;
-import flash.utils.IDataInput;
-import flash.utils.IDataOutput;
-import haxe.io.Bytes;
-import flash.net.Socket;
-import flash.events.EventDispatcher;
-
-
-    /**
-     * HTTP implementation of the TTransport interface. Used for working with a
-     * Thrift web services implementation.
-     * Unlike Http Client, it uses a single POST, and chunk-encoding to transfer all messages.
-     */
-
-    public class TFullDuplexHttpClient extends TTransport
-    {
-        private var socket : Socket = null;
-        private var host  :  String;
-        private var port  :  Int;
-        private var resource  :  String;
-        private var stripped  :  Bool = false;
-        private var obuffer : Bytes = new Bytes();
-        private var input : IDataInput;
-        private var output : IDataOutput;
-        private var bytesInChunk  :  Int = 0;
-        private var CRLF : Bytes = new Bytes();
-        private var ioCallback : TException->Void = null;
-        private var eventDispatcher : EventDispatcher = new EventDispatcher();
-
-        public function new(host  :  String, port  :  Int, resource  :  String)  :  Void
-        {
-            CRLF.writeByte(13);
-            CRLF.writeByte(10);
-            this.host = host;
-            this.port = port;
-            this.resource = resource;
-        }
-
-        public override function close()  :  Void
-        {
-            this.input = null;
-            this.output = null;
-            this.stripped = false;
-            socket.close()
-        }
-
-        public override function peek()  :  Bool
-        {
-            if(socket.connected)
-            {
-                trace("Bytes remained:" + socket.bytesAvailable);
-                return socket.bytesAvailable>0;
-            }
-            return false;
-        }
-
-        public override function read(buf : Bytes, off  :  Int, len  :  Int)  :  Int
-        {
-            var n1  :  Int = 0, n2  :  Int = 0, n3  :  Int = 0, n4  :  Int = 0, cidx  :  Int = 2;
-            var chunkSize : Bytes = new Bytes();
-
-            try
-            {
-                while (!stripped)
-                {
-                    n1 = n2;
-                    n2 = n3;
-                    n3 = n4;
-                    n4 = input.readByte();
-                    if ((n1 == 13) && (n2 == 10) && (n3 == 13) && (n4 == 10))
-                    {
-                        stripped = true;
-                    }
-                }
-
-                // read chunk size
-                if (bytesInChunk == 0)
-                {
-                    n1 = input.readByte();
-                    n2 = input.readByte();
-
-                    chunkSize.writeByte(n1);
-                    chunkSize.writeByte(n2);
-
-                    while (!((n1 == 13) && (n2 == 10)))
-                    {
-                        n1 = n2;
-                        n2 = input.readByte();
-                        chunkSize.writeByte(n2);
-                    }
-
-                    bytesInChunk = parseInt(chunkSize.toString(), 16);
-                }
-
-                input.readBytes(buf, off, len);
-                debugBuffer(buf);
-                bytesInChunk -= len;
-
-                if (bytesInChunk == 0)
-                {
-                    // advance the  :  "\r\n"
-                    input.readUTFBytes(2);
-                }
-                return len;
-            }
-            catch (e : EOFError)
-            {
-                trace(e);
-                throw new TTransportException(TTransportException.UNKNOWN, "No more data available.");
-            }
-            catch (e : TException)
-            {
-                trace('TException $e');
-                throw e;
-            }
-            catch (e : Error)
-            {
-                trace(e);
-                throw new TTransportException(TTransportException.UNKNOWN, 'Bad IO error: $e');
-            }
-            catch (e : Dynamic)
-            {
-                trace(e);
-                throw new TTransportException(TTransportException.UNKNOWN, 'Bad IO error: $e');
-            }
-            return 0;
-        }
-
-        public function debugBuffer(buf : Bytes)  :  Void
-        {
-            var debug  :  String = "BUFFER >>";
-            var i  :  Int;
-            for (i = 0; i < buf.length; i++)
-            {
-                debug += buf[i] as int;
-                debug += " ";
-            }
-
-            trace(debug + "<<");
-        }
-
-        public override function write(buf : Bytes, off  :  Int, len  :  Int)  :  Void
-        {
-            obuffer.writeBytes(buf, off, len);
-        }
-
-        public function addEventListener(type  :  String, listener : Function, useCapture  :  Bool = false, priority  :  Int = 0, useWeakReference  :  Bool = false)  :  Void
-        {
-            this.eventDispatcher.addEventListener(type, listener, useCapture, priority, useWeakReference);
-        }
-
-        public override function open()  :  Void
-        {
-            this.socket = new Socket();
-            this.socket.addEventListener(Event.CONNECT, socketConnected);
-            this.socket.addEventListener(IOErrorEvent.IO_ERROR, socketError);
-            this.socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socketSecurityError);
-            this.socket.addEventListener(ProgressEvent.SOCKET_DATA, socketDataHandler);
-            this.socket.connect(host, port);
-        }
-
-        public function socketConnected(event : Event)  :  Void
-        {
-            this.output = this.socket;
-            this.input = this.socket;
-            this.output.writeUTF( "CONNECT " + resource + " HTTP/1.1\n"
-                                + "Host :  " + host + ":" + port + "\r\n"
-                                + "User-Agent :  Thrift/Haxe\r\n"
-                                + "Transfer-Encoding :  chunked\r\n"
-                                + "content-type :  application/x-thrift\r\n"
-                                + "Accept :  */*\r\n"
-                                + "\r\n");
-            this.eventDispatcher.dispatchEvent(event);
-        }
-
-        public function socketError(event : IOErrorEvent)  :  Void
-        {
-            trace("Error Connecting:" + event);
-            this.close();
-            if (ioCallback == null)
-            {
-                return;
-            }
-            ioCallback(new TTransportException(TTransportException.UNKNOWN, "IOError :  " + event.text));
-            this.eventDispatcher.dispatchEvent(event);
-        }
-
-        public function socketSecurityError(event : SecurityErrorEvent)  :  Void
-        {
-            trace("Security Error Connecting:" + event);
-            this.close();
-            this.eventDispatcher.dispatchEvent(event);
-        }
-
-        public function socketDataHandler(event : ProgressEvent)  :  Void
-        {
-            trace("Got Data call:" +ioCallback);
-            if (ioCallback != null)
-            {
-                ioCallback(null);
-            };
-            this.eventDispatcher.dispatchEvent(event);
-        }
-
-        public override function flush(callback : Error->Void = null)  :  Void
-        {
-            trace("set callback:" + callback);
-            this.ioCallback = callback;
-            this.output.writeUTF(this.obuffer.length.toString(16));
-            this.output.writeBytes(CRLF);
-            this.output.writeBytes(this.obuffer);
-            this.output.writeBytes(CRLF);
-            this.socket.flush();
-            // waiting for  new Flex sdk 3.5
-            //this.obuffer.clear();
-            this.obuffer = new Bytes();
-        }
-
-        public override function isOpen()  :  Bool
-        {
-            return (this.socket == null ? false  :  this.socket.connected);
-        }
-
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/THttpClient.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/THttpClient.hx
deleted file mode 100644
index 79f8661..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/THttpClient.hx
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-import haxe.io.BytesOutput;
-import haxe.io.BytesInput;
-
-import haxe.Http;
-
-
-
-/**
-* HTTP implementation of the TTransport interface. Used for working with a
-* Thrift web services implementation.
-*/
-
-class THttpClient extends TTransport {
-
-    private var requestBuffer_  : BytesOutput = new BytesOutput();
-    private var responseBuffer_ : BytesInput = null;
-
-    private var request_        : Http = null;
-
-
-    public function new( requestUrl : String) : Void {
-          request_ = new Http(requestUrl);
-        request_.addHeader( "contentType", "application/x-thrift");
-    }
-
-
-    public override function open() : Void {
-    }
-
-    public override function close() : Void {
-    }
-
-    public override function isOpen() : Bool {
-      return true;
-    }
-
-    public override function read(buf:BytesBuffer, off : Int, len : Int) : Int {
-        if (responseBuffer_ == null) {
-            throw new TTransportException(TTransportException.UNKNOWN, "Response buffer is empty, no request.");
-        }
-
-        var data =Bytes.alloc(len);
-        len = responseBuffer_.readBytes(data, off, len);
-        buf.addBytes(data,0,len);
-        return len;
-    }
-
-    public override function write(buf:Bytes, off : Int, len : Int) : Void {
-      requestBuffer_.writeBytes(buf, off, len);
-    }
-
-
-    public override function flush(callback:Dynamic->Void = null) : Void {
-        var buffer = requestBuffer_;
-        requestBuffer_ = new BytesOutput();
-        responseBuffer_ = null;
-
-        request_.onData = function(data : String) {
-            var tmp = new BytesBuffer();
-            tmp.addString(data);
-            responseBuffer_ = new BytesInput(tmp.getBytes());
-            if( callback != null) {
-                callback(null);
-            }
-        };
-
-        request_.onError = function(msg : String) {
-            if( callback != null) {
-                callback(new TTransportException(TTransportException.UNKNOWN, "IOError: " + msg));
-            }
-        };
-
-        request_.setPostData(buffer.getBytes().toString());
-        request_.request(true/*POST*/);
-    }
-
-}
-
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TServerSocket.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TServerSocket.hx
deleted file mode 100644
index 4badb2a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TServerSocket.hx
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import haxe.remoting.SocketProtocol;
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-import haxe.io.BytesInput;
-import haxe.io.BytesOutput;
-import haxe.io.Input;
-import haxe.io.Output;
-import haxe.io.Eof;
-
-//import flash.net.ServerSocket; - not yet available on Haxe 3.1.3
-#if ! (flash || html5)
-
-import sys.net.Host;
-
-
-class TServerSocket extends TServerTransport {
-
-    // Underlying server with socket
-    private var _socket : Socket= null;
-
-    // Timeout for client sockets from accept
-    private var _clientTimeout : Float = 5;
-
-    // Whether or not to wrap new TSocket connections in buffers
-    private var _useBufferedSockets : Bool = false;
-
-
-    public function new(?address : String = 'localhost',  port : Int, clientTimeout : Float = 5, useBufferedSockets : Bool = false)
-    {
-        _clientTimeout = clientTimeout;
-        _useBufferedSockets = useBufferedSockets;
-
-        try
-        {
-            _socket = new Socket();
-            _socket.bind( new Host(address), port);
-        }
-        catch (e : Dynamic)
-        {
-            _socket = null;
-            throw new TTransportException( TTransportException.UNKNOWN, 'Could not create ServerSocket on port $port: $e');
-        }
-    }
-
-
-    public override function Listen() : Void
-    {
-        // Make sure not to block on accept
-        if (_socket != null)    {
-            try
-            {
-                #if !php
-                _socket.listen(1);
-                #end
-            }
-            catch (e : Dynamic)
-            {
-                trace('Error $e');
-                throw new TTransportException( TTransportException.UNKNOWN, 'Could not accept on listening socket: $e');
-            }
-        }
-    }
-
-    private override function AcceptImpl() : TTransport
-    {
-        if (_socket == null) {
-            throw new TTransportException( TTransportException.NOT_OPEN, "No underlying server socket.");
-        }
-
-        try
-        {
-            var accepted = _socket.accept();
-            var result = TSocket.fromSocket(accepted);
-            result.setTimeout( _clientTimeout);
-
-            if( _useBufferedSockets)
-            {
-                throw "buffered transport not yet supported";  // TODO
-                //result = new TBufferedTransport(result);
-            }
-
-            return result;
-        }
-        catch (e : Dynamic)
-        {
-            trace('Error $e');
-            throw new TTransportException( TTransportException.UNKNOWN, '$e');
-        }
-    }
-
-    public override function Close() : Void
-    {
-        if (_socket != null)
-        {
-            try
-            {
-                _socket.close();
-            }
-            catch (e : Dynamic)
-            {
-                trace('Error $e');
-                throw new TTransportException( TTransportException.UNKNOWN, 'WARNING: Could not close server socket: $e');
-            }
-            _socket = null;
-        }
-    }
-}
-
-#end
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TServerTransport.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TServerTransport.hx
deleted file mode 100644
index 2189981..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TServerTransport.hx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-class TServerTransport {
-
-    public function Accept() : TTransport {
-        var transport = AcceptImpl();
-        if (transport == null) {
-          throw new TTransportException( TTransportException.UNKNOWN, "accept() may not return NULL");
-        }
-        return transport;
-    }
-
-    public function Listen() : Void {
-        throw new AbstractMethodError();
-    }
-
-    public function Close() : Void {
-        throw new AbstractMethodError();
-    }
-
-    private function AcceptImpl() : TTransport {
-        throw new AbstractMethodError();
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TSocket.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TSocket.hx
deleted file mode 100644
index 7941ab9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TSocket.hx
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-#if flash
-import flash.net.Socket;
-#elseif js
-import js.html.WebSocket;
-#else
-import haxe.remoting.SocketProtocol;
-#end
-
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-import haxe.io.BytesInput;
-import haxe.io.BytesOutput;
-import haxe.io.Input;
-import haxe.io.Output;
-import haxe.io.Eof;
-
-
-#if ! (flash || js)
-import sys.net.Host;
-#end
-
-
-  /**
-   * Socket implementation of the TTransport interface. Used for working with a
-   * Thrift Socket Server based implementations.
-   */
-
-class TSocket extends TTransport  {
-
-    #if (flash || js)
-    private var host  :  String;
-    #else
-    private var host  :  Host;
-    #end
-
-    private var port  :  Int;
-
-    #if js
-    private var socket : WebSocket = null;
-    #else
-    private var socket : Socket = null;
-    #end
-
-    #if js
-    private var input : Dynamic = null;
-    private var output : WebSocket = null;
-    #elseif flash
-    private var input : Socket = null;
-    private var output : Socket = null;
-    #else
-    private var input : Input = null;
-    private var output : Output = null;
-    #end
-
-    private var timeout : Float = 30;
-
-    private var obuffer : BytesOutput = new BytesOutput();
-    private var ioCallback : TException->Void = null;
-    private var readCount : Int = 0;
-
-    public function new(host : String, port  :  Int)  :  Void  {
-        #if (flash || js)
-        this.host = host;
-        #else
-        this.host = new Host(host);
-        #end
-
-        this.port = port;
-    }
-
-    #if ! (flash || js)
-    // used by TSocketServer
-    public static function fromSocket( socket : Socket) : TSocket  {
-        var socketHost = socket.host();
-        var result = new TSocket(socketHost.host.toString(), socketHost.port);
-        result.assignSocket(socket);
-        return result;
-    }
-    #end
-
-    public override function close()  :  Void  {
-        input = null;
-        output = null;
-        socket.close();
-    }
-
-    public override function peek()  :  Bool  {
-        if( (input == null) || (socket == null)) {
-            return false;
-        } else {
-            #if flash
-            return (input.bytesAvailable > 0);
-            #elseif js
-            return true;
-            #else
-            var ready = Socket.select( [socket], null, null, 0);
-            return (ready.read.length > 0);
-            #end
-        }
-    }
-
-    // Reads up to len bytes into buffer buf, starting att offset off.
-    // May return less bytes than len required
-    public override function read( buf : BytesBuffer, off : Int, len : Int) : Int   {
-        try
-        {
-            #if flash
-
-            var remaining = len;
-            while( remaining > 0) {
-                buf.addByte( input.readByte());
-                --remaining;
-            }
-            return len;
-
-            #elseif js
-
-            if( input == null) {
-                throw new TTransportException(TTransportException.UNKNOWN, "Still no data ");  // don't block
-            }
-            var nr = len;
-            while( nr < len) {
-                buf.addByte( input.get(off+nr));
-                ++nr;
-            }
-            return len;
-
-            #else
-
-            //socket.waitForRead();  -  no, this ignores timeout and blocks infinitely
-            if(readCount < off) {
-                input.read(off-readCount);
-                readCount = off;
-            }
-
-            var data = Bytes.alloc(len);
-            var got = input.readBytes(data, 0, len);
-            buf.addBytes( data, 0, got);
-            readCount += got;
-            return got;
-
-            #end
-        }
-        catch (e : Eof)
-        {
-            trace('Eof $e');
-            throw new TTransportException(TTransportException.END_OF_FILE, "No more data available.");
-        }
-        catch (e : TException)
-        {
-            trace('TException $e');
-            throw e;
-        }
-        catch (e : Dynamic)
-        {
-            trace('Error $e');
-            throw new TTransportException(TTransportException.UNKNOWN, 'Bad IO error : $e');
-        }
-    }
-
-
-    public override function write(buf : Bytes, off  :  Int, len  :  Int)  :  Void
-    {
-        obuffer.writeBytes(buf, off, len);
-    }
-
-
-
-    public override function flush(callback : Dynamic->Void = null)  :  Void
-    {
-        if( ! isOpen())
-        {
-            throw new TTransportException(TTransportException.NOT_OPEN, "Transport not open");
-        }
-
-        #if flash
-
-        var bytes = new flash.utils.ByteArray();
-        var data = obuffer.getBytes();
-        var len = 0;
-        while( len < data.length) {
-            bytes.writeByte(data.get(len));
-            ++len;
-        }
-
-        #elseif js
-
-        var data = obuffer.getBytes();
-        var outbuf = new js.html.Int8Array(data.length);
-        var len = 0;
-        while( len < data.length) {
-            outbuf.set( [data.get(len)], len);
-            ++len;
-        }
-        var bytes = outbuf.buffer;
-
-        #else
-
-        var bytes = obuffer.getBytes();
-        var len = bytes.length;
-
-        #end
-
-        obuffer = new BytesOutput();
-
-
-        ioCallback = callback;
-        try {
-            readCount = 0;
-
-            #if js
-            output.send( bytes);
-            #else
-            output.writeBytes( bytes, 0, bytes.length);
-            #end
-
-            if(ioCallback != null) {
-                ioCallback(null);  // success call
-            }
-        }
-        catch (e : TException)
-        {
-            trace('TException $e, message : ${e.errorMsg}');
-            if(ioCallback != null) {
-                ioCallback(e);
-            }
-        }
-        catch (e : Dynamic) {
-            trace(e);
-            if(ioCallback != null) {
-                ioCallback(new TTransportException(TTransportException.UNKNOWN, 'Bad IO error : $e'));
-            }
-        }
-    }
-
-    public override function isOpen()  :  Bool
-    {
-        return (socket != null);
-    }
-
-    public override function open()  :  Void
-    {
-        #if js
-        var socket = new WebSocket();
-        socket.onmessage = function( event : js.html.MessageEvent) {
-            this.input = event.data;
-        }
-
-        #elseif flash
-        var socket = new Socket();
-        socket.connect(host, port);
-
-        #elseif php
-        var socket = new Socket();
-        socket.connect(host, port);
-        socket.setBlocking(true);
-        socket.setTimeout(timeout);
-
-        #else
-        var socket = new Socket();
-        socket.setBlocking(true);
-        socket.setFastSend(true);
-        socket.setTimeout(timeout);
-        socket.connect(host, port);
-
-        #end
-
-        assignSocket( socket);
-    }
-
-    #if js
-    private function assignSocket( socket : WebSocket)  :  Void
-    #else
-    private function assignSocket( socket : Socket)  :  Void
-    #end
-    {
-        this.socket = socket;
-
-        #if (flash || js)
-        output = socket;
-        input = socket;
-
-        #else
-        output = socket.output;
-        input = socket.input;
-
-        #end
-    }
-
-    public function setTimeout( timeout : Float ) : Void {
-        if(isOpen()) {
-            socket.setTimeout(timeout);
-        }
-        this.timeout = timeout;
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TStream.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TStream.hx
deleted file mode 100644
index 50b3ed3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TStream.hx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-
-
-interface TStream {
-    function Close() : Void;
-    function Peek() : Bool;
-    function Read( buf : Bytes, offset : Int, count : Int) : Int;
-    function Write( buf : Bytes, offset : Int, count : Int) : Void;
-    function Flush() : Void;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TStreamTransport.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TStreamTransport.hx
deleted file mode 100644
index 31a7c14..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TStreamTransport.hx
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.transport.*;
-import org.apache.thrift.helper.*;
-
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-import haxe.io.BytesOutput;
-import haxe.io.BytesInput;
-
-
-class TStreamTransport extends TTransport {
-
-    public var InputStream(default,null) : TStream;
-    public var OutputStream(default,null) : TStream;
-
-
-    public function new( input : TStream, output : TStream) {
-        this.InputStream = input;
-        this.OutputStream = output;
-    }
-
-    public override function isOpen() : Bool {
-        return true;
-    }
-
-    public override function peek() : Bool {
-        return (InputStream != null);
-    }
-
-    public override function open() : Void {
-    }
-
-    public override function close() : Void {
-        if (InputStream != null)
-        {
-            InputStream.Close();
-            InputStream = null;
-        }
-        if (OutputStream != null)
-        {
-            OutputStream.Close();
-            OutputStream = null;
-        }
-    }
-
-    public override function read( buf : BytesBuffer, off : Int, len : Int) : Int {
-        if (InputStream == null)
-        {
-            throw new TTransportException( TTransportException.NOT_OPEN,
-                                             "Cannot read from null InputStream");
-        }
-
-        var data : Bytes =  Bytes.alloc(len);
-        var size = InputStream.Read( data, off, len);
-        buf.addBytes( data, 0, size);
-        return size;
-    }
-
-    public override function write(buf:Bytes, off : Int, len : Int) : Void {
-        if (OutputStream == null)
-        {
-            throw new TTransportException( TTransportException.NOT_OPEN,
-                                           "Cannot write to null OutputStream");
-        }
-
-        OutputStream.Write(buf, off, len);
-    }
-
-    public override function flush(callback:Dynamic->Void =null) : Void {
-        if (OutputStream == null)
-        {
-            var err = new TTransportException( TTransportException.NOT_OPEN,
-                                               "Cannot flush null OutputStream");
-            if(callback != null)
-                callback(err);
-            else
-                throw err;
-        }
-
-        OutputStream.Flush();
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransport.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransport.hx
deleted file mode 100644
index e6b3179..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransport.hx
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import haxe.io.Eof;
-import haxe.io.Bytes;
-import haxe.io.BytesBuffer;
-import org.apache.thrift.AbstractMethodError;
-
-class TTransport {
-
-    /**
-     * Queries whether the transport is open.
-     *
-     * @return True if the transport is open.
-     */
-    public function isOpen() : Bool {
-          throw new AbstractMethodError();
-    }
-
-    /**
-     * Is there more data to be read?
-     *
-     * @return True if the remote side is still alive and feeding us
-     */
-    public function peek() : Bool {
-          return isOpen();
-    }
-
-    /**
-     * Opens the transport for reading/writing.
-     *
-     * @throws TTransportException if the transport could not be opened
-     */
-    public function open() : Void {
-          throw new AbstractMethodError();
-    }
-
-    /**
-     * Closes the transport.
-     */
-    public function close() : Void {
-          throw new AbstractMethodError();
-    };
-
-    /**
-     * Reads up to len bytes into buffer buf, starting att offset off.
-     *
-     * @param buf Array to read into
-     * @param off Index to start reading at
-     * @param len Maximum number of bytes to read
-     * @return The bytes count actually read
-     * @throws TTransportException if there was an error reading data
-     */
-     public function read( buf : BytesBuffer, off : Int, len : Int) : Int {
-          throw new AbstractMethodError();
-     }
-
-    /**
-     * Guarantees that all of len bytes are actually read off the transport.
-     *
-     * @param buf Array to read into
-     * @param off Index to start reading at
-     * @param len Maximum number of bytes to read
-     * @return The number of bytes actually read, which must be equal to len
-     * @throws TTransportException if there was an error reading data
-     */
-    public function readAll(buf : BytesBuffer, off : Int, len : Int) : Int {
-        var got : Int = 0;
-        var ret : Int = 0;
-        while (got < len) {
-          try {
-            ret = read(buf, off+got, len-got);
-            if (ret <= 0) {
-              throw new TTransportException(TTransportException.UNKNOWN,
-                          "Cannot read. Remote side has closed. Tried to read "
-                          + len + " bytes, but only got " + got + " bytes.");
-            }
-          }
-          catch (eof : Eof) {
-            throw new TTransportException(TTransportException.END_OF_FILE, 'Can\'t read $len bytes!');
-          }
-          got += ret;
-        }
-        return got;
-    }
-
-    /**
-     * Writes the buffer to the output
-     *
-     * @param buf The output data buffer
-     * @throws TTransportException if an error occurs writing data
-     */
-    public function writeAll(buf:Bytes) : Void {
-        write(buf, 0, buf.length);
-    }
-
-    /**
-     * Writes up to len bytes from the buffer.
-     *
-     * @param buf The output data buffer
-     * @param off The offset to start writing from
-     * @param len The number of bytes to write
-     * @throws TTransportException if there was an error writing data
-     */
-    public function write(buf:Bytes, off : Int, len : Int) : Void {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Flush any pending data out of a transport buffer.
-     *
-     * @throws TTransportException if there was an error writing out data.
-     */
-    public function flush(callback:Dynamic->Void =null) : Void {
-        if(callback != null)
-            callback(new AbstractMethodError());
-        else
-            throw new AbstractMethodError();
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransportException.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransportException.hx
deleted file mode 100644
index ad028dd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransportException.hx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.TException;
-
-class TTransportException extends TException {
-
-    // WARNING: These are subject to be extended in the future, so we can't use enums
-    // with Haxe 3.1.3 because of https://github.com/HaxeFoundation/haxe/issues/3649
-    public static inline var UNKNOWN : Int = 0;
-    public static inline var NOT_OPEN : Int = 1;
-    public static inline var ALREADY_OPEN : Int = 2;
-    public static inline var TIMED_OUT : Int = 3;
-    public static inline var END_OF_FILE : Int = 4;
-
-    public function new(error : Int = UNKNOWN, message : String = "") {
-        super(message, error);
-    }
-
-}
- 
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransportFactory.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransportFactory.hx
deleted file mode 100644
index 361f35f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TTransportFactory.hx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-/**
- * Factory class used to create wrapped instance of Transports.
- * This is used primarily in servers, which get Transports from
- * a ServerTransport and then may want to mutate them (i.e. create
- * a BufferedTransport from the underlying base transport)
- *
- */
-class TTransportFactory {
-
-    public function new() {
-    }
-
-    /**
-    * Return a wrapped instance of the base Transport.
-    *
-    * @param trans The base transport
-    * @return Wrapped Transport
-    */
-    public function getTransport( trans : TTransport) : TTransport {
-        return trans;
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TWrappingServerTransport.hx b/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TWrappingServerTransport.hx
deleted file mode 100644
index b2272f3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/src/org/apache/thrift/transport/TWrappingServerTransport.hx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-
-/*
-   wraps real transport, provided by constructor
-*/
-class TWrappingServerTransport extends TServerTransport {
-
-  private var transport(default,null) : TTransport;
-
-  public function new(transport : TTransport) {
-    this.transport = transport;
-  }
-
-  public override function Listen() : Void
-  {
-  }
-
-  private override function AcceptImpl() : TTransport
-  {
-    return transport;
-  }
-
-  public override function Close() : Void
-  {
-
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/HaxeTests.hxproj b/vendor/git.apache.org/thrift.git/lib/haxe/test/HaxeTests.hxproj
deleted file mode 100644
index 3beed82..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/HaxeTests.hxproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project version="2">
-  <!-- Output SWF options -->
-  <output>
-    <movie outputType="Application" />
-    <movie input="" />
-    <movie path="bin/HaxeTests" />
-    <movie fps="30" />
-    <movie width="800" />
-    <movie height="600" />
-    <movie version="1" />
-    <movie minorVersion="0" />
-    <movie platform="C++" />
-    <movie background="#FFFFFF" />
-  </output>
-  <!-- Other classes to be compiled into your SWF -->
-  <classpaths>
-    <class path="src" />
-    <class path="gen-haxe" />
-    <class path="../src" />
-  </classpaths>
-  <!-- Build options -->
-  <build>
-    <option directives="" />
-    <option flashStrict="False" />
-    <option noInlineOnDebug="False" />
-    <option mainClass="Main" />
-    <option enabledebug="False" />
-    <option additional="" />
-  </build>
-  <!-- haxelib libraries -->
-  <haxelib>
-    <!-- example: <library name="..." /> -->
-  </haxelib>
-  <!-- Class files to compile (other referenced classes will automatically be included) -->
-  <compileTargets>
-    <!-- example: <compile path="..." /> -->
-  </compileTargets>
-  <!-- Paths to exclude from the Project Explorer tree -->
-  <hiddenPaths>
-    <hidden path="obj" />
-    <hidden path="cpp.hxml" />
-    <hidden path="csharp.hxml" />
-    <hidden path="flash.hxml" />
-    <hidden path="java.hxml" />
-    <hidden path="javascript.hxml" />
-    <hidden path="make_all.bat" />
-    <hidden path="make_all.sh" />
-    <hidden path="Makefile.am" />
-    <hidden path="neko.hxml" />
-    <hidden path="php.hxml" />
-    <hidden path="project.hide" />
-    <hidden path="python.hxml" />
-  </hiddenPaths>
-  <!-- Executed before build -->
-  <preBuildCommand>thrift -r -gen haxe  ../../../test/ThriftTest.thrift
-thrift -r -gen haxe  ../../../contrib/async-test/aggr.thrift
-thrift -r -gen haxe  ../../../lib/rb/benchmark/Benchmark.thrift</preBuildCommand>
-  <!-- Executed after build -->
-  <postBuildCommand alwaysRun="False" />
-  <!-- Other project options -->
-  <options>
-    <option showHiddenPaths="False" />
-    <option testMovie="Custom" />
-    <option testMovieCommand="bin/HaxeTests/Main.exe server multiplex" />
-  </options>
-  <!-- Plugin storage -->
-  <storage />
-</project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/haxe/test/Makefile.am
deleted file mode 100644
index 5c638d4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-THRIFTCMD = $(THRIFT) --gen haxe -r
-THRIFTTEST = $(top_srcdir)/test/ThriftTest.thrift
-AGGR = $(top_srcdir)/contrib/async-test/aggr.thrift
-BENCHMARK = $(top_srcdir)/lib/rb/benchmark/Benchmark.thrift
-
-BIN_CPP = bin/Main-debug
-BIN_PHP = bin/php/Main-debug.php
-
-gen-haxe/thrift/test/ThriftTest.hx: $(THRIFTTEST)
-	$(THRIFTCMD) $(THRIFTTEST)
-
-gen-haxe/thrift/test/Aggr.hx: $(AGGR)
-	$(THRIFTCMD) $(AGGR)
-
-gen-haxe/thrift/test/BenchmarkService.hx: $(BENCHMARK)
-	$(THRIFTCMD) $(BENCHMARK)
-
-all-local: $(BIN_CPP) $(BIN_PHP)
-
-$(BIN_CPP): \
-		src/*.hx \
-		../src/org/apache/thrift/**/*.hx \
-		gen-haxe/thrift/test/ThriftTest.hx \
-		gen-haxe/thrift/test/Aggr.hx \
-		gen-haxe/thrift/test/BenchmarkService.hx
-	$(HAXE) --cwd .  cpp.hxml
-
-$(BIN_PHP): \
-		src/*.hx \
-		../src/org/apache/thrift/**/*.hx \
-		gen-haxe/thrift/test/ThriftTest.hx \
-		gen-haxe/thrift/test/Aggr.hx \
-		gen-haxe/thrift/test/BenchmarkService.hx
-	$(HAXE) --cwd .  php.hxml
-
-
-#TODO: other haxe targets
-#    $(HAXE)  --cwd .  csharp
-#    $(HAXE)  --cwd .  flash
-#    $(HAXE)  --cwd .  java
-#    $(HAXE)  --cwd .  javascript
-#    $(HAXE)  --cwd .  neko
-#    $(HAXE)  --cwd .  python  # needs Haxe 3.2.0
-
-
-clean-local:
-	$(RM) -r gen-haxe bin
-
-check: $(BIN_CPP) $(BIN_PHP)
-	$(BIN_CPP)
-	php -f $(BIN_PHP)
-
-EXTRA_DIST = \
-             src \
-             cpp.hxml \
-             csharp.hxml \
-             flash.hxml \
-             java.hxml \
-             javascript.hxml \
-             neko.hxml \
-             php.hxml \
-             python.hxml \
-             project.hide \
-             HaxeTests.hxproj \
-             make_all.bat \
-             make_all.sh
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/cpp.hxml b/vendor/git.apache.org/thrift.git/lib/haxe/test/cpp.hxml
deleted file mode 100644
index 73848a8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/cpp.hxml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp ../src
--cp gen-haxe
-
-#this class wil be used as entry point for your app.
--main Main
-
-#CPP target
--cpp bin
-
-#To produce 64 bit binaries the file should define the HXCPP_M64 compile variable:
-#-D HXCPP_M64
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/csharp.hxml b/vendor/git.apache.org/thrift.git/lib/haxe/test/csharp.hxml
deleted file mode 100644
index 4c34b0d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/csharp.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp ../src
--cp gen-haxe
-
-#this class wil be used as entry point for your app.
--main Main
-
-#CSHARP target
--cs bin/Test.exe
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/flash.hxml b/vendor/git.apache.org/thrift.git/lib/haxe/test/flash.hxml
deleted file mode 100644
index 8b17631..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/flash.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp ../src
--cp gen-haxe
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Flash target
--swf bin/Test.swf
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/java.hxml b/vendor/git.apache.org/thrift.git/lib/haxe/test/java.hxml
deleted file mode 100644
index c947159..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/java.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp ../src
--cp gen-haxe
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Java target
--java bin/Test.jar
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/javascript.hxml b/vendor/git.apache.org/thrift.git/lib/haxe/test/javascript.hxml
deleted file mode 100644
index 18d9964..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/javascript.hxml
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp ../src
--cp gen-haxe
-
-#this class wil be used as entry point for your app.
--main Main
-
-#JavaScript target
--js bin/Test.js
-
-#You can use -D source-map-content (requires Haxe 3.1+) to have the .hx 
-#files directly embedded into the map file, this way you only have to 
-#upload it, and it will be always in sync with the compiled .js even if 
-#you modify your .hx files.
--D source-map-content
-
-#Generate source map and add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/make_all.bat b/vendor/git.apache.org/thrift.git/lib/haxe/test/make_all.bat
deleted file mode 100644
index 0314e18..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/make_all.bat
+++ /dev/null
@@ -1,70 +0,0 @@
-@echo off
-rem /*
-rem  * Licensed to the Apache Software Foundation (ASF) under one
-rem  * or more contributor license agreements. See the NOTICE file
-rem  * distributed with this work for additional information
-rem  * regarding copyright ownership. The ASF licenses this file
-rem  * to you under the Apache License, Version 2.0 (the
-rem  * "License"); you may not use this file except in compliance
-rem  * with the License. You may obtain a copy of the License at
-rem  *
-rem  *   http://www.apache.org/licenses/LICENSE-2.0
-rem  *
-rem  * Unless required by applicable law or agreed to in writing,
-rem  * software distributed under the License is distributed on an
-rem  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem  * KIND, either express or implied. See the License for the
-rem  * specific language governing permissions and limitations
-rem  * under the License.
-rem  */
-
-setlocal
-if "%HOMEDRIVE%"=="" goto MISSINGVARS
-if "%HOMEPATH%"=="" goto MISSINGVARS
-if "%HAXEPATH%"=="" goto NOTINSTALLED
-
-set path=%HAXEPATH%;%HAXEPATH%\..\neko;%path%
-
-rem # invoke Thrift comnpiler
-thrift -r -gen haxe  ..\..\..\test\ThriftTest.thrift
-thrift -r -gen haxe  ..\..\..\contrib\async-test\aggr.thrift
-thrift -r -gen haxe  ..\..\..\lib\rb\benchmark\Benchmark.thrift
-if errorlevel 1 goto STOP
-
-rem # invoke Haxe compiler for all targets
-for %%a in (*.hxml) do (
-	rem * filter Python, as it is not supported by Haxe 3.1.3 (but will be in 3.1.4)
-	if not "%%a"=="python.hxml" (
-		echo --------------------------
-		echo Building %%a ...
-		echo --------------------------
-		haxe  --cwd .  %%a
-	)
-)
-
-
-echo.
-echo done.
-pause
-goto eof
-
-:NOTINSTALLED
-echo FATAL: Either Haxe is not installed, or the HAXEPATH variable is not set.
-pause
-goto eof
-
-:MISSINGVARS
-echo FATAL: Unable to locate home folder.
-echo.
-echo Both HOMEDRIVE and HOMEPATH need to be set to point to your Home folder.
-echo The current values are:
-echo HOMEDRIVE=%HOMEDRIVE%
-echo HOMEPATH=%HOMEPATH%
-pause
-goto eof
-
-:STOP
-pause
-goto eof
-
-:eof
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/make_all.sh b/vendor/git.apache.org/thrift.git/lib/haxe/test/make_all.sh
deleted file mode 100644
index 512f5ec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/make_all.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# invoke Thrift comnpiler
-thrift -r -gen haxe  ../../../test/ThriftTest.thrift
-thrift -r -gen haxe  ../../../contrib/async-test/aggr.thrift
-thrift -r -gen haxe  ../../../lib/rb/benchmark/Benchmark.thrift
-
-# output folder
-if [ ! -d bin ]; then
-  mkdir  bin
-fi
-
-# invoke Haxe compiler
-for target in *.hxml; do 
-  echo --------------------------
-  echo Building ${target} ...
-  echo --------------------------
-  if [ ! -d bin/${target} ]; then
-    mkdir  bin/${target}
-  fi
-  haxe  --cwd .  ${target} 
-done
-
-
-#eof
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/neko.hxml b/vendor/git.apache.org/thrift.git/lib/haxe/test/neko.hxml
deleted file mode 100644
index 2db70c8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/neko.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp ../src
--cp gen-haxe
-
-#this class wil be used as entry point for your app.
--main Main
-
-#neko target
--neko bin/Test.n
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/php.hxml b/vendor/git.apache.org/thrift.git/lib/haxe/test/php.hxml
deleted file mode 100644
index 14f2b2d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/php.hxml
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp ../src
--cp gen-haxe
-
-#this class wil be used as entry point for your app.
--main Main
-
-#PHP target
--php bin/php/
---php-front Main-debug.php
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/project.hide b/vendor/git.apache.org/thrift.git/lib/haxe/test/project.hide
deleted file mode 100644
index 16ef98e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/project.hide
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-     "type" : 0
-    ,"target" : 4
-    ,"name" : "Test"
-    ,"main" : null
-    ,"projectPackage" : ""
-    ,"company" : ""
-    ,"license" : ""
-    ,"url" : ""
-    ,"targetData" : [
-         {
-             "pathToHxml" : "flash.hxml"
-            ,"runActionType" : 1
-            ,"runActionText" : "bin/Test.swf"
-        }
-        ,{
-             "pathToHxml" : "javascript.hxml"
-            ,"runActionType" : 1
-            ,"runActionText" : "bin\\index.html"
-        }
-        ,{
-             "pathToHxml" : "neko.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "neko bin/Test.n"
-        }
-        ,{
-             "pathToHxml" : "php.hxml"
-        }
-        ,{
-             "pathToHxml" : "cpp.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "bin/Main-debug.exe"
-        }
-        ,{
-             "pathToHxml" : "java.hxml"
-        }
-        ,{
-             "pathToHxml" : "csharp.hxml"
-        }
-        ,{
-             "pathToHxml" : "python.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "python bin/Test.py"
-        }
-    ]
-    ,"files" : [
-         {
-             "path" : "src\\Main.hx"
-            ,"useTabs" : true
-            ,"indentSize" : 4
-            ,"foldedRegions" : [
-
-            ]
-            ,"activeLine" : 13
-        }
-    ]
-    ,"activeFile" : "src\\Main.hx"
-    ,"openFLTarget" : null
-    ,"openFLBuildMode" : "Debug"
-    ,"runActionType" : null
-    ,"runActionText" : null
-    ,"buildActionCommand" : null
-    ,"hiddenItems" : [
-
-    ]
-    ,"showHiddenItems" : false
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/python.hxml b/vendor/git.apache.org/thrift.git/lib/haxe/test/python.hxml
deleted file mode 100644
index 4d6a133..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/python.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp ../src
--cp gen-haxe
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Python target
--python bin/Test.py
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/src/Main.hx b/vendor/git.apache.org/thrift.git/lib/haxe/test/src/Main.hx
deleted file mode 100644
index 6c262d7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/src/Main.hx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-import thrift.test.*;  // generated code
-
-
-enum WhatTests {
-    Normal;
-    Multiplex;
-}
-
-class Main
-{
-    static private var tests : WhatTests = Normal;
-    static private var server : Bool = false;
-
-    static private inline var CMDLINEHELP : String
-        = "\nHaxeTests  [client|server]  [multiplex]\n"
-        + "  client|server  ... determines run mode for some tests, default is client\n"
-        + "  multiplex ........ run multiplex test server or client\n";
-
-    static private function ParseArgs() {
-        #if sys
-
-        var args = Sys.args();
-        if ( args != null) {
-            for ( arg in args) {
-                switch(arg.toLowerCase()) {
-                    case "client":
-                        server = false;
-                    case "server" :
-                        server = true;
-                    case "multiplex" :
-                        tests = Multiplex;
-                    default:
-                throw 'Invalid argument "$arg"\n'+CMDLINEHELP;
-                }
-            }
-        }
-
-        #end
-    }
-
-    static public function main()
-    {
-        try
-        {
-            ParseArgs();
-
-            switch( tests) {
-                case Normal:
-                    StreamTest.Run(server);
-                case Multiplex:
-                    MultiplexTest.Run(server);
-                default:
-                    throw "Unhandled test mode $tests";
-            }
-
-            trace("All tests completed.");
-        }
-        catch( e: Dynamic)
-        {
-            trace('$e');
-            #if sys
-            Sys.exit(1);  // indicate error
-            #end
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/src/MultiplexTest.hx b/vendor/git.apache.org/thrift.git/lib/haxe/test/src/MultiplexTest.hx
deleted file mode 100644
index 3818b66..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/src/MultiplexTest.hx
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import haxe.Int64;
-import haxe.Int32;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-// debug only
-import org.apache.thrift.protocol.TProtocolDecorator;
-import org.apache.thrift.protocol.TMultiplexedProtocol;
-import org.apache.thrift.protocol.TMultiplexedProcessor;
-
-// generated code imports
-import Aggr;
-import AggrImpl;
-import AggrProcessor;
-import BenchmarkService;
-import BenchmarkServiceImpl;
-import BenchmarkServiceProcessor;
-import Error;
-
-
-class BenchmarkServiceHandler implements BenchmarkService
-{
-    public function new() {
-    }
-
-    public function fibonacci(n : haxe.Int32) : haxe.Int32 {
-        trace('Benchmark.fibonacci($n)');
-        var next : Int;
-        var prev   = 0;
-        var result = 1;
-        while( n > 0)
-        {
-            next   = result + prev;
-            prev   = result;
-            result = next;
-            --n;
-        }
-        return result;
-    }
-}
-
-
-class AggrServiceHandler implements Aggr
-{
-    private var values : List<haxe.Int32> = new List<haxe.Int32>();
-
-    public function new() {
-    }
-
-    public function addValue(value : haxe.Int32) : Void    {
-        trace('Aggr.addValue($value)');
-        values.add( value);
-    }
-
-    public function getValues() : List< haxe.Int32> {
-        trace('Aggr.getValues()');
-        return values;
-    }
-}
-
-
-
-class MultiplexTest extends TestBase {
-
-    private inline static var NAME_BENCHMARKSERVICE : String = "BenchmarkService";
-    private inline static var NAME_AGGR             : String  = "Aggr";
-
-
-    public static override function Run(server : Bool) : Void {
-        if ( server) {
-            RunMultiplexServer();
-        } else {
-            RunMultiplexClient();
-            RunDefaultClient();
-        }
-    }
-
-
-    // run the multiplex server
-    public static override function RunMultiplexServer() : Void  {
-       try
-       {
-            var benchHandler : BenchmarkService = new BenchmarkServiceHandler();
-            var benchProcessor : TProcessor = new BenchmarkServiceProcessor( benchHandler);
-
-            var aggrHandler : Aggr = new AggrServiceHandler();
-            var aggrProcessor : TProcessor = new AggrProcessor( aggrHandler);
-
-            var multiplex : TMultiplexedProcessor = new TMultiplexedProcessor();
-            multiplex.RegisterProcessor( NAME_BENCHMARKSERVICE, benchProcessor, true);  // default
-            multiplex.RegisterProcessor( NAME_AGGR, aggrProcessor);
-
-            // protocol+transport stack
-            var protfact : TProtocolFactory = new TBinaryProtocolFactory(true,true);
-            var servertrans : TServerTransport = new TServerSocket( 9090, 5, false);
-            var transfact : TTransportFactory = new TFramedTransportFactory();
-
-            var server : TServer = new TSimpleServer( multiplex, servertrans, transfact, protfact);
-
-            trace("Starting the server ...");
-            server.Serve();
-       }
-        catch( e : TApplicationException)
-        {
-            TestBase.Expect(false,'${e.errorID} ${e.errorMsg}');
-        }
-        catch( e : TException)
-        {
-            TestBase.Expect(false,'$e');
-        }
-    }
-
-
-    // run multiplex client against multiplex server
-    public static override function RunMultiplexClient() : Void  {
-        try
-        {
-            var trans : TTransport;
-            trans = new TSocket("localhost", 9090);
-            trans = new TFramedTransport(trans);
-            trans.open();
-
-            var protocol : TProtocol = new TBinaryProtocol(trans,true,true);
-            var multiplex : TMultiplexedProtocol;
-
-            multiplex = new TMultiplexedProtocol( protocol, NAME_BENCHMARKSERVICE);
-            var bench = new BenchmarkServiceImpl( multiplex);
-
-            multiplex = new TMultiplexedProtocol( protocol, NAME_AGGR);
-            var aggr = new AggrImpl( multiplex);
-
-            trace('calling aggr.add( bench.fibo())...');
-            for( i in 1 ... 10)
-            {
-                trace('$i');
-                aggr.addValue( bench.fibonacci(i));
-            }
-
-            trace('calling aggr ...');
-            var i = 1;
-            var values = aggr.getValues();
-            TestBase.Expect(values != null,'aggr.getValues() == null');
-            for( k in values)
-            {
-                trace('fib($i) = $k');
-                ++i;
-            }
-
-            trans.close();
-            trace('done.');
-
-        }
-        catch( e : TApplicationException)
-        {
-            TestBase.Expect(false,'${e.errorID} ${e.errorMsg}');
-        }
-        catch( e : TException)
-        {
-            TestBase.Expect(false,'$e');
-        }
-    }
-
-
-    // run non-multiplex client against multiplex server to test default fallback
-    public static override function RunDefaultClient() : Void  {
-        try
-        {
-            var trans : TTransport;
-            trans = new TSocket("localhost", 9090);
-            trans = new TFramedTransport(trans);
-            trans.open();
-
-            var protocol : TProtocol = new TBinaryProtocol(trans,true,true);
-
-            var bench = new BenchmarkServiceImpl( protocol);
-
-            trace('calling bench (via default) ...');
-            for( i in 1 ... 10)
-            {
-                var k = bench.fibonacci(i);
-                trace('fib($i) = $k');
-            }
-
-            trans.close();
-            trace('done.');
-        }
-        catch( e : TApplicationException)
-        {
-            TestBase.Expect(false,'${e.errorID} ${e.errorMsg}');
-        }
-        catch( e : TException)
-        {
-            TestBase.Expect(false,'$e');
-        }
-    }
-
-}
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/src/StreamTest.hx b/vendor/git.apache.org/thrift.git/lib/haxe/test/src/StreamTest.hx
deleted file mode 100644
index 244f1ea..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/src/StreamTest.hx
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import haxe.Int64;
-import sys.FileSystem;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-import thrift.test.*;  // generated code
-
-
-class StreamTest extends TestBase {
-
-
-    private inline static var tmpfile : String = "data.tmp";
-
-
-    private static function MakeTestData() : Xtruct {
-        var data : Xtruct = new Xtruct();
-        data.string_thing = "Streamtest";
-        data.byte_thing = -128;
-        data.i32_thing = 4711;
-        data.i64_thing = Int64.make(0x12345678,0x9ABCDEF0);
-        return data;
-    }
-
-    public static function WriteData() : Xtruct
-    {
-        var stream : TStream = new TFileStream( tmpfile, CreateNew);
-        var trans : TTransport = new TStreamTransport( null, stream);
-        var prot = new TJSONProtocol( trans);
-
-        var data = MakeTestData();
-        data.write(prot);
-        trans.close();
-
-        return data;
-    }
-
-    public static function ReadData() : Xtruct
-    {
-        var stream : TStream = new TFileStream( tmpfile, Read);
-        var trans : TTransport = new TStreamTransport( stream, null);
-        var prot = new TJSONProtocol( trans);
-
-        var data : Xtruct = new Xtruct();
-        data.read(prot);
-        trans.close();
-
-        return data;
-    }
-
-    public static override function Run(server : Bool) : Void
-    {
-        try {
-            var written = WriteData();
-            var read = ReadData();
-            FileSystem.deleteFile(tmpfile);
-
-            TestBase.Expect( read.string_thing == written.string_thing, "string data");
-            TestBase.Expect( read.byte_thing == written.byte_thing, "byte data");
-            TestBase.Expect( read.i32_thing == written.i32_thing, "i32 data");
-            TestBase.Expect( Int64.compare( read.i64_thing, written.i64_thing) == 0, "i64 data");
-
-        } catch(e:Dynamic) {
-            FileSystem.deleteFile(tmpfile);
-            throw e;
-        }
-    }
-
-}
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/haxe/test/src/TestBase.hx b/vendor/git.apache.org/thrift.git/lib/haxe/test/src/TestBase.hx
deleted file mode 100644
index 1232773..0000000
--- a/vendor/git.apache.org/thrift.git/lib/haxe/test/src/TestBase.hx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-
-class TestBase {
-
-    private function new() {
-        // override, if necessary
-    }
-
-    public static function Run(server : Bool) : Void {
-          throw new AbstractMethodError();
-    }
-
-    public static function Expect( expr : Bool, info : String, ?pos : haxe.PosInfos) : Void {
-        if( ! expr) {
-            throw ('Test "$info" failed at '+pos.methodName+' in '+pos.fileName+':'+pos.lineNumber);
-        }
-    }
-
-}
- 
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/hs/CMakeLists.txt
deleted file mode 100644
index 7653ed6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Rebuild when any of these files changes
-set(haskell_sources
-    src/Thrift.hs
-    src/Thrift/Arbitraries.hs
-    src/Thrift/Protocol.hs
-    src/Thrift/Protocol/Binary.hs
-    src/Thrift/Protocol/Compact.hs
-    src/Thrift/Protocol/JSON.hs
-    src/Thrift/Server.hs
-    src/Thrift/Transport.hs
-    src/Thrift/Transport/Empty.hs
-    src/Thrift/Transport/Framed.hs
-    src/Thrift/Transport/Handle.hs
-    src/Thrift/Transport/HttpClient.hs
-    src/Thrift/Transport/IOBuffer.hs
-    src/Thrift/Types.hs
-    Thrift.cabal
-)
-
-if(BUILD_TESTING)
-    list(APPEND haskell_soruces
-        test/Spec.hs
-        test/BinarySpec.hs
-        test/CompactSpec.hs
-        test/JSONSpec.hs
-    )
-    set(hs_enable_test "--enable-tests")
-endif()
-
-set(haskell_artifacts thrift_cabal.stamp)
-# Adding *.hi files so that any missing file triggers the build
-foreach(SRC ${haskell_sources})
-    get_filename_component(EX ${SRC} EXT)
-    if(${EX} STREQUAL ".hs")
-        file(RELATIVE_PATH REL ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/${SRC})
-        get_filename_component(DIR ${REL} DIRECTORY)
-        get_filename_component(BASE ${REL} NAME_WE)
-        list(APPEND haskell_artifacts dist/build/${DIR}/${BASE}.hi)
-    endif()
-endforeach()
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(hs_optimize -O0)
-elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(hs_optimize -O1)
-endif()
-
-add_custom_command(
-    OUTPUT ${haskell_artifacts}
-    COMMAND ${CABAL} update
-    # Build dependencies first without --builddir, otherwise it fails.
-    COMMAND ${CABAL} install --only-dependencies ${hs_enable_test}
-    COMMAND ${CABAL} configure ${hs_optimize} ${hs_enable_test} --builddir=${CMAKE_CURRENT_BINARY_DIR}/dist
-    COMMAND ${CABAL} build --builddir=${CMAKE_CURRENT_BINARY_DIR}/dist
-    COMMAND ${CABAL} install --builddir=${CMAKE_CURRENT_BINARY_DIR}/dist
-    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/thrift_cabal.stamp
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${haskell_sources}
-    COMMENT "Building Haskell library")
-
-add_custom_target(haskell_library ALL
-    DEPENDS ${haskell_artifacts})
-
-if(BUILD_TESTING)
-    add_test(NAME HaskellCabalCheck
-            COMMAND ${CABAL} check
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-    add_test(NAME HaskellCabalTest
-            # Cabal fails to find built executable when --builddir is specified.
-            # So we invoke the executable directly.
-            # COMMAND ${CABAL} test --builddir=${CMAKE_CURRENT_BINARY_DIR}/dist
-            # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-            COMMAND dist/build/spec/spec)
-endif()
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/LICENSE b/vendor/git.apache.org/thrift.git/lib/hs/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/Makefile.am b/vendor/git.apache.org/thrift.git/lib/hs/Makefile.am
deleted file mode 100644
index 90d5e14..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-EXTRA_DIST = \
-	coding_standards.md \
-	CMakeLists.txt \
-	LICENSE \
-	README.md \
-	Setup.lhs \
-	TODO \
-	Thrift.cabal \
-	src \
-	test
-
-all-local:
-	$(CABAL) update
-	$(CABAL) install
-
-install-exec-hook:
-	$(CABAL) install
-
-# Make sure this doesn't fail if Haskell is not configured.
-clean-local:
-	$(CABAL) clean
-
-maintainer-clean-local:
-	$(CABAL) clean
-
-check-local:
-	$(CABAL) check
-	$(CABAL) install --only-dependencies --enable-tests
-	$(CABAL) configure --enable-tests
-	$(CABAL) build
-	$(CABAL) test
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/README.md b/vendor/git.apache.org/thrift.git/lib/hs/README.md
deleted file mode 100644
index eea0a73..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/README.md
+++ /dev/null
@@ -1,99 +0,0 @@
-Haskell Thrift Bindings
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Compile
-=======
-
-Use Cabal to compile and install; ./configure uses Cabal underneath, and that
-path is not yet well tested. Thrift's library and generated code should compile
-with pretty much any GHC extensions or warnings you enable (or disable).
-Please report this not being the case as a bug on
-https://issues.apache.org/jira/secure/CreateIssue!default.jspa
-
-Chances you'll need to muck a bit with Cabal flags to install Thrift:
-
-CABAL_CONFIGURE_FLAGS="--user" ./configure
-
-Base Types
-==========
-
-The mapping from Thrift types to Haskell's is:
-
- * double -> Double
- * byte -> Data.Int.Int8
- * i16 -> Data.Int.Int16
- * i32 -> Data.Int.Int32
- * i64 -> Data.Int.Int64
- * string -> Text
- * binary -> Data.ByteString.Lazy
- * bool -> Boolean
-
-Enums
-=====
-
-Become Haskell 'data' types. Use fromEnum to get out the int value.
-
-Lists
-=====
-
-Become Data.Vector.Vector from the vector package.
-
-Maps and Sets
-=============
-
-Become Data.HashMap.Strict.Map and Data.HashSet.Set from the
-unordered-containers package.
-
-Structs
-=======
-
-Become records. Field labels are ugly, of the form f_STRUCTNAME_FIELDNAME. All
-fields are Maybe types.
-
-Exceptions
-==========
-
-Identical to structs. Use them with throw and catch from Control.Exception.
-
-Client
-======
-
-Just a bunch of functions. You may have to import a bunch of client files to
-deal with inheritance.
-
-Interface
-=========
-
-You should only have to import the last one in the chain of inheritors. To make
-an interface, declare a label:
-
-  data MyIface = MyIface
-
-and then declare it an instance of each iface class, starting with the superest
-class and proceeding down (all the while defining the methods).  Then pass your
-label to process as the handler.
-
-Processor
-=========
-
-Just a function that takes a handler label, protocols. It calls the
-superclasses process if there is a superclass.
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/Setup.lhs b/vendor/git.apache.org/thrift.git/lib/hs/Setup.lhs
deleted file mode 100755
index d52ae94..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/Setup.lhs
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env runhaskell
-
-> -- Licensed to the Apache Software Foundation (ASF) under one
-> -- or more contributor license agreements. See the NOTICE file
-> -- distributed with this work for additional information
-> -- regarding copyright ownership. The ASF licenses this file
-> -- to you under the Apache License, Version 2.0 (the
-> -- "License"); you may not use this file except in compliance
-> -- with the License. You may obtain a copy of the License at
-> -- 
-> --   http://www.apache.org/licenses/LICENSE-2.0
-> -- 
-> -- Unless required by applicable law or agreed to in writing,
-> -- software distributed under the License is distributed on an
-> -- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-> -- KIND, either express or implied. See the License for the
-> -- specific language governing permissions and limitations
-> -- under the License.
-
-> import Distribution.Simple
-> main = defaultMain
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/TODO b/vendor/git.apache.org/thrift.git/lib/hs/TODO
deleted file mode 100644
index 1368173..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-The library could stand to be built up more.
-Many modules need export lists.
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/Thrift.cabal b/vendor/git.apache.org/thrift.git/lib/hs/Thrift.cabal
deleted file mode 100644
index a604307..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/Thrift.cabal
+++ /dev/null
@@ -1,80 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-Name:           thrift
-Version:        0.10.0
-Cabal-Version:  >= 1.8
-License:        OtherLicense
-Category:       Foreign
-Build-Type:     Simple
-Synopsis:       Haskell bindings for the Apache Thrift RPC system
-Homepage:       http://thrift.apache.org
-Bug-Reports:    https://issues.apache.org/jira/browse/THRIFT
-Maintainer:     dev@thrift.apache.org
-License-File:   LICENSE
-
-Description:
-  Haskell bindings for the Apache Thrift RPC system. Requires the use of the thrift code generator.
-
-flag network-uri
-   description: Get Network.URI from the network-uri package
-   default: True
-
-Library
-  Hs-Source-Dirs:
-    src
-  Build-Depends:
-    base >= 4, base < 5, containers, ghc-prim, attoparsec, binary, bytestring >= 0.10, base64-bytestring, hashable, HTTP, text, unordered-containers >= 0.2.6, vector == 0.10.12.2, QuickCheck >= 2.8.2, split
-  if flag(network-uri)
-     build-depends: network-uri >= 2.6, network >= 2.6
-  else
-     build-depends: network < 2.6
-  Exposed-Modules:
-    Thrift,
-    Thrift.Arbitraries
-    Thrift.Protocol,
-    Thrift.Protocol.Binary,
-    Thrift.Protocol.Compact,
-    Thrift.Protocol.JSON,
-    Thrift.Server,
-    Thrift.Transport,
-    Thrift.Transport.Empty,
-    Thrift.Transport.Framed,
-    Thrift.Transport.Handle,
-    Thrift.Transport.HttpClient,
-    Thrift.Transport.IOBuffer,
-    Thrift.Transport.Memory,
-    Thrift.Types
-  Extensions:
-    DeriveDataTypeable,
-    ExistentialQuantification,
-    FlexibleInstances,
-    KindSignatures,
-    MagicHash,
-    RankNTypes,
-    RecordWildCards,
-    ScopedTypeVariables,
-    TypeSynonymInstances
-
-Test-Suite spec
-  Type: exitcode-stdio-1.0
-  Hs-Source-Dirs: test
-  Ghc-Options: -Wall
-  main-is: Spec.hs
-  Build-Depends: base, thrift, hspec, QuickCheck >= 2.8.2, bytestring >= 0.10, unordered-containers >= 0.2.6
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/hs/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift.hs
deleted file mode 100644
index 58a304b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift.hs
+++ /dev/null
@@ -1,114 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift
-    ( module Thrift.Transport
-    , module Thrift.Protocol
-    , AppExnType(..)
-    , AppExn(..)
-    , readAppExn
-    , writeAppExn
-    , ThriftException(..)
-    ) where
-
-import Control.Exception
-
-import Data.Int
-import Data.Text.Lazy ( Text, pack, unpack )
-import Data.Text.Lazy.Encoding
-import Data.Typeable ( Typeable )
-import qualified Data.HashMap.Strict as Map
-
-import Thrift.Protocol
-import Thrift.Transport
-import Thrift.Types
-
-data ThriftException = ThriftException
-  deriving ( Show, Typeable )
-instance Exception ThriftException
-
-data AppExnType
-    = AE_UNKNOWN
-    | AE_UNKNOWN_METHOD
-    | AE_INVALID_MESSAGE_TYPE
-    | AE_WRONG_METHOD_NAME
-    | AE_BAD_SEQUENCE_ID
-    | AE_MISSING_RESULT
-    | AE_INTERNAL_ERROR
-    | AE_PROTOCOL_ERROR
-    | AE_INVALID_TRANSFORM
-    | AE_INVALID_PROTOCOL
-    | AE_UNSUPPORTED_CLIENT_TYPE
-      deriving ( Eq, Show, Typeable )
-
-instance Enum AppExnType where
-    toEnum 0 = AE_UNKNOWN
-    toEnum 1 = AE_UNKNOWN_METHOD
-    toEnum 2 = AE_INVALID_MESSAGE_TYPE
-    toEnum 3 = AE_WRONG_METHOD_NAME
-    toEnum 4 = AE_BAD_SEQUENCE_ID
-    toEnum 5 = AE_MISSING_RESULT
-    toEnum 6 = AE_INTERNAL_ERROR
-    toEnum 7 = AE_PROTOCOL_ERROR
-    toEnum 8 = AE_INVALID_TRANSFORM
-    toEnum 9 = AE_INVALID_PROTOCOL
-    toEnum 10 = AE_UNSUPPORTED_CLIENT_TYPE
-    toEnum t = error $ "Invalid AppExnType " ++ show t
-
-    fromEnum AE_UNKNOWN = 0
-    fromEnum AE_UNKNOWN_METHOD = 1
-    fromEnum AE_INVALID_MESSAGE_TYPE = 2
-    fromEnum AE_WRONG_METHOD_NAME = 3
-    fromEnum AE_BAD_SEQUENCE_ID = 4
-    fromEnum AE_MISSING_RESULT = 5
-    fromEnum AE_INTERNAL_ERROR = 6
-    fromEnum AE_PROTOCOL_ERROR = 7
-    fromEnum AE_INVALID_TRANSFORM = 8
-    fromEnum AE_INVALID_PROTOCOL = 9
-    fromEnum AE_UNSUPPORTED_CLIENT_TYPE = 10
-
-data AppExn = AppExn { ae_type :: AppExnType, ae_message :: String }
-  deriving ( Show, Typeable )
-instance Exception AppExn
-
-writeAppExn :: (Protocol p, Transport t) => p t -> AppExn -> IO ()
-writeAppExn pt ae = writeVal pt $ TStruct $ Map.fromList
-                    [ (1, ("message", TString $ encodeUtf8 $ pack $ ae_message ae))
-                    , (2, ("type", TI32 $ fromIntegral $ fromEnum (ae_type ae)))
-                    ]
-
-readAppExn :: (Protocol p, Transport t) => p t -> IO AppExn
-readAppExn pt = do
-    let typemap = Map.fromList [(1,("message",T_STRING)),(2,("type",T_I32))]
-    TStruct fields <- readVal pt $ T_STRUCT typemap
-    return $ readAppExnFields fields
-
-readAppExnFields :: Map.HashMap Int16 (Text, ThriftVal) -> AppExn
-readAppExnFields fields = AppExn{
-  ae_message = maybe undefined unwrapMessage $ Map.lookup 1 fields,
-  ae_type    = maybe undefined unwrapType $ Map.lookup 2 fields
-  }
-  where
-    unwrapMessage (_, TString s) = unpack $ decodeUtf8 s
-    unwrapMessage _ = undefined
-    unwrapType (_, TI32 i) = toEnum $ fromIntegral i
-    unwrapType _ = undefined
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Arbitraries.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Arbitraries.hs
deleted file mode 100644
index e9c0fc3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Arbitraries.hs
+++ /dev/null
@@ -1,55 +0,0 @@
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-
-module Thrift.Arbitraries where
-
-import Data.Bits()
-
-import Test.QuickCheck.Arbitrary
-
-import Control.Applicative ((<$>))
-import Data.Map (Map)
-import qualified Data.Map as Map
-import qualified Data.Set as Set
-import qualified Data.Vector as Vector
-import qualified Data.Text.Lazy as Text
-import qualified Data.HashSet as HSet
-import qualified Data.HashMap.Strict as HMap
-import Data.Hashable (Hashable)
-
-import Data.ByteString.Lazy (ByteString)
-import qualified Data.ByteString.Lazy as BS
-
--- String has an Arbitrary instance already
--- Bool has an Arbitrary instance already
--- A Thrift 'list' is a Vector.
-
-instance Arbitrary ByteString where
-  arbitrary = BS.pack . filter (/= 0) <$> arbitrary
-
-instance (Arbitrary k) => Arbitrary (Vector.Vector k) where
-  arbitrary = Vector.fromList <$> arbitrary
-
-instance Arbitrary Text.Text where
-  arbitrary = Text.pack . filter (/= '\0') <$> arbitrary
-
-instance (Eq k, Hashable k, Arbitrary k) => Arbitrary (HSet.HashSet k) where
-  arbitrary = HSet.fromList <$> arbitrary
-
-instance (Eq k, Hashable k, Arbitrary k, Arbitrary v) =>
-    Arbitrary (HMap.HashMap k v) where
-  arbitrary = HMap.fromList <$> arbitrary
-
-{-
-   To handle Thrift 'enum' we would ideally use something like:
-
-instance (Enum a, Bounded a) => Arbitrary a
-    where arbitrary = elements (enumFromTo minBound maxBound)
-
-Unfortunately this doesn't play nicely with the type system.
-Instead we'll generate an arbitrary instance along with the code.
--}
-
-{-
-    There might be some way to introspect on the Haskell structure of a
-    Thrift 'struct' or 'exception' but generating the code directly is simpler.
--}
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol.hs
deleted file mode 100644
index ed779a2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol.hs
+++ /dev/null
@@ -1,149 +0,0 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE OverloadedStrings #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Protocol
-    ( Protocol(..)
-    , ProtocolExn(..)
-    , ProtocolExnType(..)
-    , getTypeOf
-    , runParser
-    , versionMask
-    , version1
-    , bsToDouble
-    , bsToDoubleLE
-    ) where
-
-import Control.Exception
-import Data.Attoparsec.ByteString
-import Data.Bits
-import Data.ByteString.Lazy (ByteString, toStrict)
-import Data.ByteString.Unsafe
-import Data.Functor ((<$>))
-import Data.Int
-import Data.Monoid (mempty)
-import Data.Text.Lazy (Text)
-import Data.Typeable (Typeable)
-import Data.Word
-import Foreign.Ptr (castPtr)
-import Foreign.Storable (Storable, peek, poke)
-import System.IO.Unsafe
-import qualified Data.ByteString as BS
-import qualified Data.HashMap.Strict as Map
-
-import Thrift.Types
-import Thrift.Transport
-
-versionMask :: Int32
-versionMask = fromIntegral (0xffff0000 :: Word32)
-
-version1 :: Int32
-version1 = fromIntegral (0x80010000 :: Word32)
-
-class Protocol a where
-  getTransport :: Transport t => a t -> t
-
-  writeMessageBegin :: Transport t => a t -> (Text, MessageType, Int32) -> IO ()
-  writeMessageEnd :: Transport t => a t -> IO ()
-  writeMessageEnd _ = return ()
-  
-  readMessageBegin :: Transport t => a t -> IO (Text, MessageType, Int32)
-  readMessageEnd :: Transport t => a t -> IO ()
-  readMessageEnd _ = return ()
-
-  serializeVal :: Transport t => a t -> ThriftVal -> ByteString
-  deserializeVal :: Transport t => a t -> ThriftType -> ByteString -> ThriftVal
-
-  writeVal :: Transport t => a t -> ThriftVal -> IO ()
-  writeVal p = tWrite (getTransport p) . serializeVal p
-  readVal :: Transport t => a t -> ThriftType -> IO ThriftVal
-
-data ProtocolExnType
-    = PE_UNKNOWN
-    | PE_INVALID_DATA
-    | PE_NEGATIVE_SIZE
-    | PE_SIZE_LIMIT
-    | PE_BAD_VERSION
-    | PE_NOT_IMPLEMENTED
-    | PE_MISSING_REQUIRED_FIELD
-      deriving ( Eq, Show, Typeable )
-
-data ProtocolExn = ProtocolExn ProtocolExnType String
-  deriving ( Show, Typeable )
-instance Exception ProtocolExn
-
-getTypeOf :: ThriftVal -> ThriftType
-getTypeOf v =  case v of
-  TStruct{} -> T_STRUCT Map.empty
-  TMap{} -> T_MAP T_VOID T_VOID
-  TList{} -> T_LIST T_VOID
-  TSet{} -> T_SET T_VOID
-  TBool{} -> T_BOOL
-  TByte{} -> T_BYTE
-  TI16{} -> T_I16
-  TI32{} -> T_I32
-  TI64{} -> T_I64
-  TString{} -> T_STRING
-  TBinary{} -> T_BINARY
-  TDouble{} -> T_DOUBLE
-
-runParser :: (Protocol p, Transport t, Show a) => p t -> Parser a -> IO a
-runParser prot p = refill >>= getResult . parse p
-  where
-    refill = handle handleEOF $ toStrict <$> tReadAll (getTransport prot) 1
-    getResult (Done _ a) = return a
-    getResult (Partial k) = refill >>= getResult . k
-    getResult f = throw $ ProtocolExn PE_INVALID_DATA (show f)
-
-handleEOF :: SomeException -> IO BS.ByteString
-handleEOF = const $ return mempty
-
--- | Converts a ByteString to a Floating point number
--- The ByteString is assumed to be encoded in network order (Big Endian)
--- therefore the behavior of this function varies based on whether the local
--- machine is big endian or little endian.
-bsToDouble :: BS.ByteString -> Double
-bsToDoubleLE :: BS.ByteString -> Double
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-bsToDouble bs = unsafeDupablePerformIO $ unsafeUseAsCString bs castBsSwapped
-bsToDoubleLE bs = unsafeDupablePerformIO $ unsafeUseAsCString bs castBs
-#else
-bsToDouble bs = unsafeDupablePerformIO $ unsafeUseAsCString bs castBs
-bsToDoubleLE bs = unsafeDupablePerformIO $ unsafeUseAsCString bs castBsSwapped
-#endif
-
-
-castBsSwapped chrPtr = do
-  w <- peek (castPtr chrPtr)
-  poke (castPtr chrPtr) (byteSwap w)
-  peek (castPtr chrPtr)
-castBs = peek . castPtr
-
--- | Swap endianness of a 64-bit word
-byteSwap :: Word64 -> Word64
-byteSwap w = (w `shiftL` 56 .&. 0xFF00000000000000) .|.
-             (w `shiftL` 40 .&. 0x00FF000000000000) .|.
-             (w `shiftL` 24 .&. 0x0000FF0000000000) .|.
-             (w `shiftL` 8  .&. 0x000000FF00000000) .|.
-             (w `shiftR` 8  .&. 0x00000000FF000000) .|.
-             (w `shiftR` 24 .&. 0x0000000000FF0000) .|.
-             (w `shiftR` 40 .&. 0x000000000000FF00) .|.
-             (w `shiftR` 56 .&. 0x00000000000000FF)
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/Binary.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/Binary.hs
deleted file mode 100644
index 2d35305..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/Binary.hs
+++ /dev/null
@@ -1,191 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE ExistentialQuantification #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Thrift.Protocol.Binary
-    ( module Thrift.Protocol
-    , BinaryProtocol(..)
-    ) where
-
-import Control.Exception ( throw )
-import Control.Monad
-import Data.Bits
-import Data.ByteString.Lazy.Builder
-import Data.Functor
-import Data.Int
-import Data.Monoid
-import Data.Text.Lazy.Encoding ( decodeUtf8, encodeUtf8 )
-
-import Thrift.Protocol
-import Thrift.Transport
-import Thrift.Types
-
-import qualified Data.Attoparsec.ByteString as P
-import qualified Data.Attoparsec.ByteString.Lazy as LP
-import qualified Data.Binary as Binary
-import qualified Data.ByteString.Lazy as LBS
-import qualified Data.HashMap.Strict as Map
-import qualified Data.Text.Lazy as LT
-
-data BinaryProtocol a = BinaryProtocol a
-
--- NOTE: Reading and Writing functions rely on Builders and Data.Binary to
--- encode and decode data.  Data.Binary assumes that the binary values it is
--- encoding to and decoding from are in BIG ENDIAN format, and converts the
--- endianness as necessary to match the local machine.
-instance Protocol BinaryProtocol where
-    getTransport (BinaryProtocol t) = t
-
-    writeMessageBegin p (n, t, s) = tWrite (getTransport p) $ toLazyByteString $
-        buildBinaryValue (TI32 (version1 .|. fromIntegral (fromEnum t))) <>
-        buildBinaryValue (TString $ encodeUtf8 n) <>
-        buildBinaryValue (TI32 s)
-
-    readMessageBegin p = runParser p $ do
-      TI32 ver <- parseBinaryValue T_I32
-      if ver .&. versionMask /= version1
-        then throw $ ProtocolExn PE_BAD_VERSION "Missing version identifier"
-        else do
-          TString s <- parseBinaryValue T_STRING
-          TI32 sz <- parseBinaryValue T_I32
-          return (decodeUtf8 s, toEnum $ fromIntegral $ ver .&. 0xFF, sz)
-
-    serializeVal _ = toLazyByteString . buildBinaryValue
-    deserializeVal _ ty bs =
-      case LP.eitherResult $ LP.parse (parseBinaryValue ty) bs of
-        Left s -> error s
-        Right val -> val
-
-    readVal p = runParser p . parseBinaryValue
-
--- | Writing Functions
-buildBinaryValue :: ThriftVal -> Builder
-buildBinaryValue (TStruct fields) = buildBinaryStruct fields <> buildType T_STOP
-buildBinaryValue (TMap ky vt entries) =
-  buildType ky <>
-  buildType vt <>
-  int32BE (fromIntegral (length entries)) <>
-  buildBinaryMap entries
-buildBinaryValue (TList ty entries) =
-  buildType ty <>
-  int32BE (fromIntegral (length entries)) <>
-  buildBinaryList entries
-buildBinaryValue (TSet ty entries) =
-  buildType ty <>
-  int32BE (fromIntegral (length entries)) <>
-  buildBinaryList entries
-buildBinaryValue (TBool b) =
-  word8 $ toEnum $ if b then 1 else 0
-buildBinaryValue (TByte b) = int8 b
-buildBinaryValue (TI16 i) = int16BE i
-buildBinaryValue (TI32 i) = int32BE i
-buildBinaryValue (TI64 i) = int64BE i
-buildBinaryValue (TDouble d) = doubleBE d
-buildBinaryValue (TString s) = int32BE len <> lazyByteString s
-  where
-    len :: Int32 = fromIntegral (LBS.length s)
-buildBinaryValue (TBinary s) = buildBinaryValue (TString s)
-
-buildBinaryStruct :: Map.HashMap Int16 (LT.Text, ThriftVal) -> Builder
-buildBinaryStruct = Map.foldrWithKey combine mempty
-  where
-    combine fid (_,val) s =
-      buildTypeOf val <> int16BE fid <> buildBinaryValue val <> s
-
-buildBinaryMap :: [(ThriftVal, ThriftVal)] -> Builder
-buildBinaryMap = foldl combine mempty
-  where
-    combine s (key, val) = s <> buildBinaryValue key <> buildBinaryValue val
-
-buildBinaryList :: [ThriftVal] -> Builder
-buildBinaryList = foldr (mappend . buildBinaryValue) mempty
-
--- | Reading Functions
-parseBinaryValue :: ThriftType -> P.Parser ThriftVal
-parseBinaryValue (T_STRUCT tmap) = TStruct <$> parseBinaryStruct tmap
-parseBinaryValue (T_MAP _ _) = do
-  kt <- parseType
-  vt <- parseType
-  n <- Binary.decode . LBS.fromStrict <$> P.take 4
-  TMap kt vt <$> parseBinaryMap kt vt n
-parseBinaryValue (T_LIST _) = do
-  t <- parseType
-  n <- Binary.decode . LBS.fromStrict <$> P.take 4
-  TList t <$> parseBinaryList t n
-parseBinaryValue (T_SET _) = do
-  t <- parseType
-  n <- Binary.decode . LBS.fromStrict <$> P.take 4
-  TSet t <$> parseBinaryList t n
-parseBinaryValue T_BOOL = TBool . (/=0) <$> P.anyWord8
-parseBinaryValue T_BYTE = TByte . Binary.decode . LBS.fromStrict <$> P.take 1
-parseBinaryValue T_I16 = TI16 . Binary.decode . LBS.fromStrict <$> P.take 2
-parseBinaryValue T_I32 = TI32 . Binary.decode . LBS.fromStrict <$> P.take 4
-parseBinaryValue T_I64 = TI64 . Binary.decode . LBS.fromStrict <$> P.take 8
-parseBinaryValue T_DOUBLE = TDouble . bsToDouble <$> P.take 8
-parseBinaryValue T_STRING = parseBinaryString TString
-parseBinaryValue T_BINARY = parseBinaryString TBinary
-parseBinaryValue ty = error $ "Cannot read value of type " ++ show ty
-
-parseBinaryString ty = do
-  i :: Int32  <- Binary.decode . LBS.fromStrict <$> P.take 4
-  ty . LBS.fromStrict <$> P.take (fromIntegral i)
-
-parseBinaryStruct :: TypeMap -> P.Parser (Map.HashMap Int16 (LT.Text, ThriftVal))
-parseBinaryStruct tmap = Map.fromList <$> P.manyTill parseField (matchType T_STOP)
-  where
-    parseField = do
-      t <- parseType
-      n <- Binary.decode . LBS.fromStrict <$> P.take 2
-      v <- case (t, Map.lookup n tmap) of
-             (T_STRING, Just (_, T_BINARY)) -> parseBinaryValue T_BINARY
-             _ -> parseBinaryValue t
-      return (n, ("", v))
-
-parseBinaryMap :: ThriftType -> ThriftType -> Int32 -> P.Parser [(ThriftVal, ThriftVal)]
-parseBinaryMap kt vt n | n <= 0 = return []
-                       | otherwise = do
-  k <- parseBinaryValue kt
-  v <- parseBinaryValue vt
-  ((k,v) :) <$> parseBinaryMap kt vt (n-1)
-
-parseBinaryList :: ThriftType -> Int32 -> P.Parser [ThriftVal]
-parseBinaryList ty n | n <= 0 = return []
-                     | otherwise = liftM2 (:) (parseBinaryValue ty)
-                                   (parseBinaryList ty (n-1))
-
-
-
--- | Write a type as a byte
-buildType :: ThriftType -> Builder
-buildType t = word8 $ fromIntegral $ fromEnum t
-
--- | Write type of a ThriftVal as a byte
-buildTypeOf :: ThriftVal -> Builder
-buildTypeOf = buildType . getTypeOf
-
--- | Read a byte as though it were a ThriftType
-parseType :: P.Parser ThriftType
-parseType = toEnum . fromIntegral <$> P.anyWord8
-
-matchType :: ThriftType -> P.Parser ThriftType
-matchType t = t <$ P.word8 (fromIntegral $ fromEnum t)
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/Compact.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/Compact.hs
deleted file mode 100644
index 07113df..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/Compact.hs
+++ /dev/null
@@ -1,301 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE ExistentialQuantification #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Thrift.Protocol.Compact
-    ( module Thrift.Protocol
-    , CompactProtocol(..)
-    ) where
-
-import Control.Applicative
-import Control.Exception ( throw )
-import Control.Monad
-import Data.Attoparsec.ByteString as P
-import Data.Attoparsec.ByteString.Lazy as LP
-import Data.Bits
-import Data.ByteString.Lazy.Builder as B
-import Data.Int
-import Data.List as List
-import Data.Monoid
-import Data.Word
-import Data.Text.Lazy.Encoding ( decodeUtf8, encodeUtf8 )
-
-import Thrift.Protocol hiding (versionMask)
-import Thrift.Transport
-import Thrift.Types
-
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Lazy as LBS
-import qualified Data.HashMap.Strict as Map
-import qualified Data.Text.Lazy as LT
-
--- | the Compact Protocol implements the standard Thrift 'TCompactProcotol'
--- which is similar to the 'TBinaryProtocol', but takes less space on the wire.
--- Integral types are encoded using as varints.
-data CompactProtocol a = CompactProtocol a
-                         -- ^ Constuct a 'CompactProtocol' with a 'Transport'
-
-protocolID, version, versionMask, typeMask, typeBits :: Word8
-protocolID  = 0x82 -- 1000 0010
-version     = 0x01
-versionMask = 0x1f -- 0001 1111
-typeMask    = 0xe0 -- 1110 0000
-typeBits    = 0x07 -- 0000 0111
-typeShiftAmount :: Int
-typeShiftAmount = 5
-
-
-instance Protocol CompactProtocol where
-    getTransport (CompactProtocol t) = t
-
-    writeMessageBegin p (n, t, s) = tWrite (getTransport p) $ toLazyByteString $
-      B.word8 protocolID <>
-      B.word8 ((version .&. versionMask) .|.
-              (((fromIntegral $ fromEnum t) `shiftL`
-                typeShiftAmount) .&. typeMask)) <>
-      buildVarint (i32ToZigZag s) <>
-      buildCompactValue (TString $ encodeUtf8 n)
-    
-    readMessageBegin p = runParser p $ do
-      pid <- fromIntegral <$> P.anyWord8
-      when (pid /= protocolID) $ error "Bad Protocol ID"
-      w <- fromIntegral <$> P.anyWord8
-      let ver = w .&. versionMask 
-      when (ver /= version) $ error "Bad Protocol version"
-      let typ = (w `shiftR` typeShiftAmount) .&. typeBits
-      seqId <- parseVarint zigZagToI32
-      TString name <- parseCompactValue T_STRING
-      return (decodeUtf8 name, toEnum $ fromIntegral $ typ, seqId)
-
-    serializeVal _ = toLazyByteString . buildCompactValue
-    deserializeVal _ ty bs =
-      case LP.eitherResult $ LP.parse (parseCompactValue ty) bs of
-        Left s -> error s
-        Right val -> val
-
-    readVal p ty = runParser p $ parseCompactValue ty
-
-
--- | Writing Functions
-buildCompactValue :: ThriftVal -> Builder
-buildCompactValue (TStruct fields) = buildCompactStruct fields
-buildCompactValue (TMap kt vt entries) =
-  let len = fromIntegral $ length entries :: Word32 in
-  if len == 0
-  then B.word8 0x00
-  else buildVarint len <>
-       B.word8 (fromTType kt `shiftL` 4 .|. fromTType vt) <>
-       buildCompactMap entries
-buildCompactValue (TList ty entries) =
-  let len = length entries in
-  (if len < 15
-   then B.word8 $ (fromIntegral len `shiftL` 4) .|. fromTType ty
-   else B.word8 (0xF0 .|. fromTType ty) <>
-        buildVarint (fromIntegral len :: Word32)) <>
-  buildCompactList entries
-buildCompactValue (TSet ty entries) = buildCompactValue (TList ty entries)
-buildCompactValue (TBool b) =
-  B.word8 $ toEnum $ if b then 1 else 0
-buildCompactValue (TByte b) = int8 b
-buildCompactValue (TI16 i) = buildVarint $ i16ToZigZag i
-buildCompactValue (TI32 i) = buildVarint $ i32ToZigZag i
-buildCompactValue (TI64 i) = buildVarint $ i64ToZigZag i
-buildCompactValue (TDouble d) = doubleLE d
-buildCompactValue (TString s) = buildVarint len <> lazyByteString s
-  where
-    len = fromIntegral (LBS.length s) :: Word32
-buildCompactValue (TBinary s) = buildCompactValue (TString s)
-
-buildCompactStruct :: Map.HashMap Int16 (LT.Text, ThriftVal) -> Builder
-buildCompactStruct = flip (loop 0) mempty . Map.toList
-  where
-    loop _ [] acc = acc <> B.word8 (fromTType T_STOP)
-    loop lastId ((fid, (_,val)) : fields) acc = loop fid fields $ acc <>
-      (if fid > lastId && fid - lastId <= 15
-       then B.word8 $ fromIntegral ((fid - lastId) `shiftL` 4) .|. typeOf val
-       else B.word8 (typeOf val) <> buildVarint (i16ToZigZag fid)) <>
-      (if typeOf val > 0x02 -- Not a T_BOOL
-       then buildCompactValue val
-       else mempty) -- T_BOOLs are encoded in the type
-buildCompactMap :: [(ThriftVal, ThriftVal)] -> Builder
-buildCompactMap = foldl combine mempty
-  where
-    combine s (key, val) = buildCompactValue key <> buildCompactValue val <> s
-
-buildCompactList :: [ThriftVal] -> Builder
-buildCompactList = foldr (mappend . buildCompactValue) mempty
-
--- | Reading Functions
-parseCompactValue :: ThriftType -> Parser ThriftVal
-parseCompactValue (T_STRUCT tmap) = TStruct <$> parseCompactStruct tmap
-parseCompactValue (T_MAP kt' vt') = do
-  n <- parseVarint id
-  if n == 0
-    then return $ TMap kt' vt' []
-    else do
-    w <- P.anyWord8
-    let kt = typeFrom $ w `shiftR` 4
-        vt = typeFrom $ w .&. 0x0F
-    TMap kt vt <$> parseCompactMap kt vt n
-parseCompactValue (T_LIST ty) = TList ty <$> parseCompactList
-parseCompactValue (T_SET ty) = TSet ty <$> parseCompactList
-parseCompactValue T_BOOL = TBool . (/=0) <$> P.anyWord8
-parseCompactValue T_BYTE = TByte . fromIntegral <$> P.anyWord8
-parseCompactValue T_I16 = TI16 <$> parseVarint zigZagToI16
-parseCompactValue T_I32 = TI32 <$> parseVarint zigZagToI32
-parseCompactValue T_I64 = TI64 <$> parseVarint zigZagToI64
-parseCompactValue T_DOUBLE = TDouble . bsToDoubleLE <$> P.take 8
-parseCompactValue T_STRING = parseCompactString TString
-parseCompactValue T_BINARY = parseCompactString TBinary
-parseCompactValue ty = error $ "Cannot read value of type " ++ show ty
-
-parseCompactString ty = do
-  len :: Word32 <- parseVarint id
-  ty . LBS.fromStrict <$> P.take (fromIntegral len)
-
-parseCompactStruct :: TypeMap -> Parser (Map.HashMap Int16 (LT.Text, ThriftVal))
-parseCompactStruct tmap = Map.fromList <$> parseFields 0
-  where
-    parseFields :: Int16 -> Parser [(Int16, (LT.Text, ThriftVal))]
-    parseFields lastId = do
-      w <- P.anyWord8
-      if w == 0x00
-        then return []
-        else do
-          let ty = typeFrom (w .&. 0x0F)
-              modifier = (w .&. 0xF0) `shiftR` 4
-          fid <- if modifier /= 0
-                 then return (lastId + fromIntegral modifier)
-                 else parseVarint zigZagToI16
-          val <- if ty == T_BOOL
-                 then return (TBool $ (w .&. 0x0F) == 0x01)
-                 else case (ty, Map.lookup fid tmap) of
-                        (T_STRING, Just (_, T_BINARY)) -> parseCompactValue T_BINARY
-                        _ -> parseCompactValue ty
-          ((fid, (LT.empty, val)) : ) <$> parseFields fid
-
-parseCompactMap :: ThriftType -> ThriftType -> Int32 ->
-                   Parser [(ThriftVal, ThriftVal)]
-parseCompactMap kt vt n | n <= 0 = return []
-                        | otherwise = do
-  k <- parseCompactValue kt
-  v <- parseCompactValue vt
-  ((k,v) :) <$> parseCompactMap kt vt (n-1)
-
-parseCompactList :: Parser [ThriftVal]
-parseCompactList = do
-  w <- P.anyWord8
-  let ty = typeFrom $ w .&. 0x0F
-      lsize = w `shiftR` 4
-  size <- if lsize == 0xF
-          then parseVarint id
-          else return $ fromIntegral lsize
-  loop ty size
-  where
-    loop :: ThriftType -> Int32 -> Parser [ThriftVal]
-    loop ty n | n <= 0 = return []
-              | otherwise = liftM2 (:) (parseCompactValue ty)
-                            (loop ty (n-1))
-
--- Signed numbers must be converted to "Zig Zag" format before they can be
--- serialized in the Varint format
-i16ToZigZag :: Int16 -> Word16
-i16ToZigZag n = fromIntegral $ (n `shiftL` 1) `xor` (n `shiftR` 15)
-
-zigZagToI16 :: Word16 -> Int16
-zigZagToI16 n = fromIntegral $ (n `shiftR` 1) `xor` negate (n .&. 0x1)
-
-i32ToZigZag :: Int32 -> Word32
-i32ToZigZag n = fromIntegral $ (n `shiftL` 1) `xor` (n `shiftR` 31)
-
-zigZagToI32 :: Word32 -> Int32
-zigZagToI32 n = fromIntegral $ (n `shiftR` 1) `xor` negate (n .&. 0x1)
-
-i64ToZigZag :: Int64 -> Word64
-i64ToZigZag n = fromIntegral $ (n `shiftL` 1) `xor` (n `shiftR` 63)
-
-zigZagToI64 :: Word64 -> Int64
-zigZagToI64 n = fromIntegral $ (n `shiftR` 1) `xor` negate (n .&. 0x1)
-
-buildVarint :: (Bits a, Integral a)  => a -> Builder
-buildVarint n | n .&. complement 0x7F == 0 = B.word8 $ fromIntegral n
-              | otherwise = B.word8 (0x80 .|. (fromIntegral n .&. 0x7F)) <>
-                            buildVarint (n `shiftR` 7)
-
-parseVarint :: (Bits a, Integral a, Ord a) => (a -> b) -> Parser b
-parseVarint fromZigZag = do
-  bytestemp <- BS.unpack <$> P.takeTill (not . flip testBit 7)
-  lsb <- P.anyWord8
-  let bytes = lsb : List.reverse bytestemp
-  return $ fromZigZag $ List.foldl' combine 0x00 bytes
-  where combine a b = (a `shiftL` 7) .|. (fromIntegral b .&. 0x7f)
-
--- | Compute the Compact Type
-fromTType :: ThriftType -> Word8
-fromTType ty = case ty of
-  T_STOP -> 0x00
-  T_BOOL -> 0x01
-  T_BYTE -> 0x03
-  T_I16 -> 0x04
-  T_I32 -> 0x05
-  T_I64 -> 0x06
-  T_DOUBLE -> 0x07
-  T_STRING -> 0x08
-  T_BINARY -> 0x08
-  T_LIST{} -> 0x09
-  T_SET{} -> 0x0A
-  T_MAP{} -> 0x0B
-  T_STRUCT{} -> 0x0C
-  T_VOID -> error "No Compact type for T_VOID"
-
-typeOf :: ThriftVal -> Word8
-typeOf v = case v of
-  TBool True -> 0x01
-  TBool False -> 0x02
-  TByte _ -> 0x03
-  TI16 _ -> 0x04
-  TI32 _ -> 0x05
-  TI64 _ -> 0x06
-  TDouble _ -> 0x07
-  TString _ -> 0x08
-  TBinary _ -> 0x08
-  TList{} -> 0x09
-  TSet{} -> 0x0A
-  TMap{} -> 0x0B
-  TStruct{} -> 0x0C
-  
-typeFrom :: Word8 -> ThriftType
-typeFrom w = case w of
-  0x01 -> T_BOOL
-  0x02 -> T_BOOL
-  0x03 -> T_BYTE
-  0x04 -> T_I16
-  0x05 -> T_I32
-  0x06 -> T_I64
-  0x07 -> T_DOUBLE
-  0x08 -> T_STRING
-  0x09 -> T_LIST T_VOID
-  0x0A -> T_SET T_VOID
-  0x0B -> T_MAP T_VOID T_VOID
-  0x0C -> T_STRUCT Map.empty
-  n -> error $ "typeFrom: " ++ show n ++ " is not a compact type"
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/JSON.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/JSON.hs
deleted file mode 100644
index 7f619e8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Protocol/JSON.hs
+++ /dev/null
@@ -1,352 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE ExistentialQuantification #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections #-}
-
-module Thrift.Protocol.JSON
-    ( module Thrift.Protocol
-    , JSONProtocol(..)
-    ) where
-
-import Control.Applicative
-import Control.Monad
-import Data.Attoparsec.ByteString as P
-import Data.Attoparsec.ByteString.Char8 as PC
-import Data.Attoparsec.ByteString.Lazy as LP
-import Data.ByteString.Base64.Lazy as B64C
-import Data.ByteString.Base64 as B64
-import Data.ByteString.Lazy.Builder as B
-import Data.ByteString.Internal (c2w, w2c)
-import Data.Functor
-import Data.Int
-import Data.List
-import Data.Maybe (catMaybes)
-import Data.Monoid
-import Data.Text.Lazy.Encoding
-import Data.Word
-import qualified Data.HashMap.Strict as Map
-
-import Thrift.Protocol
-import Thrift.Transport
-import Thrift.Types
-
-import qualified Data.ByteString.Lazy as LBS
-import qualified Data.ByteString.Lazy.Char8 as LBSC
-import qualified Data.Text.Lazy as LT
-
--- | The JSON Protocol data uses the standard 'TJSONProtocol'.  Data is
--- encoded as a JSON 'ByteString'
-data JSONProtocol t = JSONProtocol t
-                      -- ^ Construct a 'JSONProtocol' with a 'Transport'
-
-instance Protocol JSONProtocol where
-    getTransport (JSONProtocol t) = t
-
-    writeMessageBegin (JSONProtocol t) (s, ty, sq) = tWrite t $ toLazyByteString $
-      B.char8 '[' <> buildShowable (1 :: Int32) <>
-      B.string8 ",\"" <> escape (encodeUtf8 s) <> B.char8 '\"' <>
-      B.char8 ',' <> buildShowable (fromEnum ty) <>
-      B.char8 ',' <> buildShowable sq <>
-      B.char8 ','
-    writeMessageEnd (JSONProtocol t) = tWrite t "]"
-    readMessageBegin p = runParser p $ skipSpace *> do
-      _ver :: Int32 <- lexeme (PC.char8 '[') *> lexeme (signed decimal)
-      bs <- lexeme (PC.char8 ',') *> lexeme escapedString
-      case decodeUtf8' bs of
-        Left _ -> fail "readMessage: invalid text encoding"
-        Right str -> do
-          ty <- toEnum <$> (lexeme (PC.char8 ',') *> lexeme (signed decimal))
-          seqNum <- lexeme (PC.char8 ',') *> lexeme (signed decimal)
-          _ <- PC.char8 ','
-          return (str, ty, seqNum)
-    readMessageEnd p = void $ runParser p (PC.char8 ']')
-
-    serializeVal _ = toLazyByteString . buildJSONValue
-    deserializeVal _ ty bs =
-      case LP.eitherResult $ LP.parse (parseJSONValue ty) bs of
-        Left s -> error s
-        Right val -> val
-
-    readVal p ty = runParser p $ skipSpace *> parseJSONValue ty
-
-
--- Writing Functions
-
-buildJSONValue :: ThriftVal -> Builder
-buildJSONValue (TStruct fields) = B.char8 '{' <> buildJSONStruct fields <> B.char8 '}'
-buildJSONValue (TMap kt vt entries) =
-  B.char8 '[' <> B.char8 '"' <> getTypeName kt <> B.char8 '"' <>
-  B.char8 ',' <> B.char8 '"' <> getTypeName vt <> B.char8 '"' <>
-  B.char8 ',' <> buildShowable (length entries) <>
-  B.char8 ',' <> B.char8 '{' <> buildJSONMap entries <> B.char8 '}' <>
-  B.char8 ']'
-buildJSONValue (TList ty entries) =
-  B.char8 '[' <> B.char8 '"' <> getTypeName ty <> B.char8 '"' <>
-  B.char8 ',' <> buildShowable (length entries) <>
-  (if length entries > 0
-   then B.char8 ',' <> buildJSONList entries
-   else mempty) <>
-  B.char8 ']'
-buildJSONValue (TSet ty entries) = buildJSONValue (TList ty entries)
-buildJSONValue (TBool b) = if b then B.char8 '1' else B.char8 '0'
-buildJSONValue (TByte b) = buildShowable b
-buildJSONValue (TI16 i) = buildShowable i
-buildJSONValue (TI32 i) = buildShowable i
-buildJSONValue (TI64 i) = buildShowable i
-buildJSONValue (TDouble d) = buildShowable d
-buildJSONValue (TString s) = B.char8 '\"' <> escape s <> B.char8 '\"'
-buildJSONValue (TBinary s) = B.char8 '\"' <> (B.lazyByteString . B64C.encode $ s) <> B.char8 '\"'
-
-buildJSONStruct :: Map.HashMap Int16 (LT.Text, ThriftVal) -> Builder
-buildJSONStruct = mconcat . intersperse (B.char8 ',') . Map.foldrWithKey buildField []
-  where 
-    buildField fid (_,val) = (:) $
-      B.char8 '"' <> buildShowable fid <> B.string8 "\":" <> 
-      B.char8 '{' <>
-      B.char8 '"' <> getTypeName (getTypeOf val) <> B.string8 "\":" <>
-      buildJSONValue val <>
-      B.char8 '}'
-
-buildJSONMap :: [(ThriftVal, ThriftVal)] -> Builder
-buildJSONMap = mconcat . intersperse (B.char8 ',') . map buildKV
-  where
-    buildKV (key@(TString _), val) =
-      buildJSONValue key <> B.char8 ':' <> buildJSONValue val
-    buildKV (key, val) =
-      B.char8 '\"' <> buildJSONValue key <> B.string8 "\":" <> buildJSONValue val
-buildJSONList :: [ThriftVal] -> Builder
-buildJSONList = mconcat . intersperse (B.char8 ',') . map buildJSONValue
-
-buildShowable :: Show a => a ->  Builder
-buildShowable = B.string8 . show
-
--- Reading Functions
-
-parseJSONValue :: ThriftType -> Parser ThriftVal
-parseJSONValue (T_STRUCT tmap) =
-  TStruct <$> (lexeme (PC.char8 '{') *> parseJSONStruct tmap <* PC.char8 '}')
-parseJSONValue (T_MAP kt vt) = fmap (TMap kt vt) $
-  between '[' ']' $
-    lexeme escapedString *> lexeme (PC.char8 ',') *>
-    lexeme escapedString *> lexeme (PC.char8 ',') *>
-    lexeme decimal *> lexeme (PC.char8 ',') *>
-    between '{' '}' (parseJSONMap kt vt)
-parseJSONValue (T_LIST ty) = fmap (TList ty) $
-  between '[' ']' $ do
-    len <- lexeme escapedString *> lexeme (PC.char8 ',') *> lexeme decimal
-    if len > 0
-      then lexeme (PC.char8 ',') *> parseJSONList ty
-      else return []
-parseJSONValue (T_SET ty) = fmap (TSet ty) $
-  between '[' ']' $ do
-    len <- lexeme escapedString *> lexeme (PC.char8 ',') *> lexeme decimal
-    if len > 0
-      then  lexeme (PC.char8 ',') *> parseJSONList ty
-      else return []
-parseJSONValue T_BOOL =
-  (TBool True <$ PC.char8 '1') <|> (TBool False <$ PC.char8 '0')
-parseJSONValue T_BYTE = TByte <$> signed decimal
-parseJSONValue T_I16 = TI16 <$> signed decimal
-parseJSONValue T_I32 = TI32 <$> signed decimal
-parseJSONValue T_I64 = TI64 <$> signed decimal
-parseJSONValue T_DOUBLE = TDouble <$> double
-parseJSONValue T_STRING = TString <$> escapedString
-parseJSONValue T_BINARY = TBinary <$> base64String
-parseJSONValue T_STOP = fail "parseJSONValue: cannot parse type T_STOP"
-parseJSONValue T_VOID = fail "parseJSONValue: cannot parse type T_VOID"
-
-parseAnyValue :: Parser ()
-parseAnyValue = choice $
-                skipBetween '{' '}' :
-                skipBetween '[' ']' :
-                map (void . parseJSONValue)
-                  [ T_BOOL
-                  , T_I16
-                  , T_I32
-                  , T_I64
-                  , T_DOUBLE
-                  , T_STRING
-                  , T_BINARY
-                  ]
-  where
-    skipBetween :: Char -> Char -> Parser ()
-    skipBetween a b = between a b $ void (PC.satisfy (\c -> c /= a && c /= b))
-                                          <|> skipBetween a b
-
-parseJSONStruct :: TypeMap -> Parser (Map.HashMap Int16 (LT.Text, ThriftVal))
-parseJSONStruct tmap = Map.fromList . catMaybes <$> parseField
-                       `sepBy` lexeme (PC.char8 ',')
-  where
-    parseField = do
-      fid <- lexeme (between '"' '"' decimal) <* lexeme (PC.char8 ':')
-      case Map.lookup fid tmap of
-        Just (str, ftype) -> between '{' '}' $ do
-          _ <- lexeme (escapedString) *> lexeme (PC.char8 ':')
-          val <- lexeme (parseJSONValue ftype)
-          return $ Just (fid, (str, val))
-        Nothing -> lexeme parseAnyValue *> return Nothing
-
-parseJSONMap :: ThriftType -> ThriftType -> Parser [(ThriftVal, ThriftVal)]
-parseJSONMap kt vt =
-  ((,) <$> lexeme (parseJSONKey kt) <*>
-   (lexeme (PC.char8 ':') *> lexeme (parseJSONValue vt))) `sepBy`
-  lexeme (PC.char8 ',')
-  where
-    parseJSONKey T_STRING = parseJSONValue T_STRING
-    parseJSONKey T_BINARY = parseJSONValue T_BINARY
-    parseJSONKey kt = PC.char8 '"' *> parseJSONValue kt <* PC.char8 '"'
-
-parseJSONList :: ThriftType -> Parser [ThriftVal]
-parseJSONList ty = lexeme (parseJSONValue ty) `sepBy` lexeme (PC.char8 ',')
-
-escapedString :: Parser LBS.ByteString
-escapedString = PC.char8 '"' *>
-                (LBS.pack <$> P.many' (escapedChar <|> notChar8 '"')) <*
-                PC.char8 '"'
-
-base64String :: Parser LBS.ByteString
-base64String = PC.char8 '"' *>
-               (decodeBase64 . LBSC.pack <$> P.many' (PC.notChar '"')) <*
-               PC.char8 '"'
-               where
-                 decodeBase64 b =
-                   let padded = case (LBS.length b) `mod` 4 of
-                                  2 -> LBS.append b "=="
-                                  3 -> LBS.append b "="
-                                  _ -> b in
-                   case B64C.decode padded of
-                     Right s -> s
-                     Left x -> error x
-
-escapedChar :: Parser Word8
-escapedChar = PC.char8 '\\' *> (c2w <$> choice
-                                [ '\SOH' <$ P.string "u0001"
-                                , '\STX' <$ P.string "u0002"
-                                , '\ETX' <$ P.string "u0003"
-                                , '\EOT' <$ P.string "u0004"
-                                , '\ENQ' <$ P.string "u0005"
-                                , '\ACK' <$ P.string "u0006"
-                                , '\BEL' <$ P.string "u0007"
-                                , '\BS'  <$ P.string "u0008"
-                                , '\VT'  <$ P.string "u000b"
-                                , '\FF'  <$ P.string "u000c"
-                                , '\CR'  <$ P.string "u000d"
-                                , '\SO'  <$ P.string "u000e"
-                                , '\SI'  <$ P.string "u000f"
-                                , '\DLE' <$ P.string "u0010"
-                                , '\DC1' <$ P.string "u0011"
-                                , '\DC2' <$ P.string "u0012"
-                                , '\DC3' <$ P.string "u0013"
-                                , '\DC4' <$ P.string "u0014"
-                                , '\NAK' <$ P.string "u0015"
-                                , '\SYN' <$ P.string "u0016"
-                                , '\ETB' <$ P.string "u0017"
-                                , '\CAN' <$ P.string "u0018"
-                                , '\EM'  <$ P.string "u0019"
-                                , '\SUB' <$ P.string "u001a"
-                                , '\ESC' <$ P.string "u001b"
-                                , '\FS'  <$ P.string "u001c"
-                                , '\GS'  <$ P.string "u001d"
-                                , '\RS'  <$ P.string "u001e"
-                                , '\US'  <$ P.string "u001f"
-                                , '\DEL' <$ P.string "u007f"
-                                , '\0' <$ PC.char '0'
-                                , '\a' <$ PC.char 'a'
-                                , '\b' <$ PC.char 'b'
-                                , '\f' <$ PC.char 'f'
-                                , '\n' <$ PC.char 'n'
-                                , '\r' <$ PC.char 'r'
-                                , '\t' <$ PC.char 't'
-                                , '\v' <$ PC.char 'v'
-                                , '\"' <$ PC.char '"'
-                                , '\'' <$ PC.char '\''
-                                , '\\' <$ PC.char '\\'
-                                , '/'  <$ PC.char '/'
-                                ])
-
-escape :: LBS.ByteString -> Builder
-escape = LBS.foldl' escapeChar mempty
-  where
-    escapeChar b w = b <> (B.lazyByteString $ case w2c w of
-      '\0' -> "\\0"
-      '\b' -> "\\b"
-      '\f' -> "\\f"
-      '\n' -> "\\n"
-      '\r' -> "\\r"
-      '\t' -> "\\t"
-      '\"' -> "\\\""
-      '\\' -> "\\\\"
-      '\SOH' -> "\\u0001"
-      '\STX' -> "\\u0002"
-      '\ETX' -> "\\u0003"
-      '\EOT' -> "\\u0004"
-      '\ENQ' -> "\\u0005"
-      '\ACK' -> "\\u0006"
-      '\BEL' -> "\\u0007"
-      '\VT'  -> "\\u000b"
-      '\SO'  -> "\\u000e"
-      '\SI'  -> "\\u000f"
-      '\DLE' -> "\\u0010"
-      '\DC1' -> "\\u0011"
-      '\DC2' -> "\\u0012"
-      '\DC3' -> "\\u0013"
-      '\DC4' -> "\\u0014"
-      '\NAK' -> "\\u0015"
-      '\SYN' -> "\\u0016"
-      '\ETB' -> "\\u0017"
-      '\CAN' -> "\\u0018"
-      '\EM'  -> "\\u0019"
-      '\SUB' -> "\\u001a"
-      '\ESC' -> "\\u001b"
-      '\FS'  -> "\\u001c"
-      '\GS'  -> "\\u001d"
-      '\RS'  -> "\\u001e"
-      '\US'  -> "\\u001f"
-      '\DEL' -> "\\u007f"
-      _ -> LBS.singleton w)
-
-lexeme :: Parser a -> Parser a
-lexeme = (<* skipSpace)
-
-notChar8 :: Char -> Parser Word8
-notChar8 c = P.satisfy (/= c2w c)
-
-between :: Char -> Char -> Parser a -> Parser a
-between a b p = lexeme (PC.char8 a) *> lexeme p <* lexeme (PC.char8 b)
-
-getTypeName :: ThriftType -> Builder
-getTypeName ty = B.string8 $ case ty of
-  T_STRUCT _ -> "rec"
-  T_MAP _ _  -> "map"
-  T_LIST _   -> "lst"
-  T_SET _    -> "set"
-  T_BOOL     -> "tf"
-  T_BYTE     -> "i8"
-  T_I16      -> "i16"
-  T_I32      -> "i32"
-  T_I64      -> "i64"
-  T_DOUBLE   -> "dbl"
-  T_STRING   -> "str"
-  T_BINARY   -> "str"
-  _ -> error "Unrecognized Type"
-
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Server.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Server.hs
deleted file mode 100644
index ed74ceb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Server.hs
+++ /dev/null
@@ -1,66 +0,0 @@
-{-# LANGUAGE ScopedTypeVariables #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Server
-    ( runBasicServer
-    , runThreadedServer
-    ) where
-
-import Control.Concurrent ( forkIO )
-import Control.Exception
-import Control.Monad ( forever, when )
-
-import Network
-
-import System.IO
-
-import Thrift
-import Thrift.Transport.Handle()
-import Thrift.Protocol.Binary
-
-
--- | A threaded sever that is capable of using any Transport or Protocol
--- instances.
-runThreadedServer :: (Transport t, Protocol i, Protocol o)
-                  => (Socket -> IO (i t, o t))
-                  -> h
-                  -> (h -> (i t, o t) -> IO Bool)
-                  -> PortID
-                  -> IO a
-runThreadedServer accepter hand proc_ port = do
-    socket <- listenOn port
-    acceptLoop (accepter socket) (proc_ hand)
-
--- | A basic threaded binary protocol socket server.
-runBasicServer :: h
-               -> (h -> (BinaryProtocol Handle, BinaryProtocol Handle) -> IO Bool)
-               -> PortNumber
-               -> IO a
-runBasicServer hand proc_ port = runThreadedServer binaryAccept hand proc_ (PortNumber port)
-  where binaryAccept s = do
-            (h, _, _) <- accept s
-            return (BinaryProtocol h, BinaryProtocol h)
-
-acceptLoop :: IO t -> (t -> IO Bool) -> IO a
-acceptLoop accepter proc_ = forever $
-    do ps <- accepter
-       forkIO $ handle (\(_ :: SomeException) -> return ())
-                  (loop $ proc_ ps)
-  where loop m = do { continue <- m; when continue (loop m) }
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport.hs
deleted file mode 100644
index 306edc2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport.hs
+++ /dev/null
@@ -1,65 +0,0 @@
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Transport
-  ( Transport(..)
-  , TransportExn(..)
-  , TransportExnType(..)
-  ) where
-
-import Control.Monad ( when )
-import Control.Exception ( Exception, throw )
-import Data.Functor ( (<$>) )
-import Data.Typeable ( Typeable )
-import Data.Word
-
-import qualified Data.ByteString.Lazy as LBS
-import Data.Monoid
-
-class Transport a where
-    tIsOpen :: a -> IO Bool
-    tClose  :: a -> IO ()
-    tRead   :: a -> Int -> IO LBS.ByteString
-    tPeek   :: a -> IO (Maybe Word8)
-    tWrite  :: a -> LBS.ByteString -> IO ()
-    tFlush  :: a -> IO ()
-    tReadAll :: a -> Int -> IO LBS.ByteString
-
-    tReadAll _ 0 = return mempty
-    tReadAll a len = do
-        result <- tRead a len
-        let rlen = fromIntegral $ LBS.length result
-        when (rlen == 0) (throw $ TransportExn "Cannot read. Remote side has closed." TE_UNKNOWN)
-        if len <= rlen
-          then return result
-          else (result `mappend`) <$> tReadAll a (len - rlen)
-
-data TransportExn = TransportExn String TransportExnType
-  deriving ( Show, Typeable )
-instance Exception TransportExn
-
-data TransportExnType
-    = TE_UNKNOWN
-    | TE_NOT_OPEN
-    | TE_ALREADY_OPEN
-    | TE_TIMED_OUT
-    | TE_END_OF_FILE
-      deriving ( Eq, Show, Typeable )
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Empty.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Empty.hs
deleted file mode 100644
index 47af5fe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Empty.hs
+++ /dev/null
@@ -1,36 +0,0 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE OverloadedStrings #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Transport.Empty
-       ( EmptyTransport(..)
-       ) where
-
-import Thrift.Transport
-
-data EmptyTransport = EmptyTransport
-
-instance Transport EmptyTransport where
-    tIsOpen = const $ return False
-    tClose  = const $ return ()
-    tRead _ _ = return ""
-    tPeek = const $ return Nothing
-    tWrite _ _ = return ()
-    tFlush = const$ return ()
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Framed.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Framed.hs
deleted file mode 100644
index 42fc43f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Framed.hs
+++ /dev/null
@@ -1,99 +0,0 @@
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Transport.Framed
-    ( module Thrift.Transport
-    , FramedTransport
-    , openFramedTransport
-    ) where
-
-import Thrift.Transport
-import Thrift.Transport.IOBuffer
-
-import Data.Int (Int32)
-import qualified Data.Binary as B
-import qualified Data.ByteString.Lazy as LBS
-
-
--- | FramedTransport wraps a given transport in framed mode.
-data FramedTransport t = FramedTransport {
-      wrappedTrans :: t,           -- ^ Underlying transport.
-      writeBuffer  :: WriteBuffer, -- ^ Write buffer.
-      readBuffer   :: ReadBuffer   -- ^ Read buffer.
-    }
-
--- | Create a new framed transport which wraps the given transport.
-openFramedTransport :: Transport t => t -> IO (FramedTransport t)
-openFramedTransport trans = do
-  wbuf <- newWriteBuffer
-  rbuf <- newReadBuffer
-  return FramedTransport{ wrappedTrans = trans, writeBuffer = wbuf, readBuffer = rbuf }
-
-instance Transport t => Transport (FramedTransport t) where
-
-    tClose = tClose . wrappedTrans
-
-    tRead trans n = do
-      -- First, check the read buffer for any data.
-      bs <- readBuf (readBuffer trans) n
-      if LBS.null bs
-         then
-         -- When the buffer is empty, read another frame from the
-         -- underlying transport.
-           do len <- readFrame trans
-              if len > 0
-                 then tRead trans n
-                 else return bs
-         else return bs
-    tPeek trans = do
-      mw <- peekBuf (readBuffer trans)
-      case mw of
-        Just _ -> return mw
-        Nothing -> do
-          len <- readFrame trans
-          if len > 0
-             then tPeek trans
-             else return Nothing
-
-    tWrite = writeBuf . writeBuffer
-
-    tFlush trans = do
-      bs <- flushBuf (writeBuffer trans)
-      let szBs = B.encode $ (fromIntegral $ LBS.length bs :: Int32)
-      tWrite (wrappedTrans trans) szBs
-      tWrite (wrappedTrans trans) bs
-      tFlush (wrappedTrans trans)
-
-    tIsOpen = tIsOpen . wrappedTrans
-
-readFrame :: Transport t => FramedTransport t -> IO Int
-readFrame trans = do
-  -- Read and decode the frame size.
-  szBs <- tRead (wrappedTrans trans) 4
-  let sz = fromIntegral (B.decode szBs :: Int32)
-
-  -- Read the frame and stuff it into the read buffer.
-  bs <- tRead (wrappedTrans trans) sz
-  fillBuf (readBuffer trans) bs
-
-  -- Return the frame size so that the caller knows whether to expect
-  -- something in the read buffer or not.
-  return sz
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Handle.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Handle.hs
deleted file mode 100644
index b7d16e4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Handle.hs
+++ /dev/null
@@ -1,68 +0,0 @@
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeSynonymInstances #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Transport.Handle
-    ( module Thrift.Transport
-    , HandleSource(..)
-    ) where
-
-import Control.Exception ( catch, throw )
-import Data.ByteString.Internal (c2w)
-import Data.Functor
-
-import Network
-
-import System.IO
-import System.IO.Error ( isEOFError )
-
-import Thrift.Transport
-
-import qualified Data.ByteString.Lazy as LBS
-import Data.Monoid
-
-instance Transport Handle where
-    tIsOpen = hIsOpen
-    tClose = hClose
-    tRead h n = LBS.hGet h n `Control.Exception.catch` handleEOF mempty
-    tPeek h = (Just . c2w <$> hLookAhead h) `Control.Exception.catch` handleEOF Nothing
-    tWrite = LBS.hPut
-    tFlush = hFlush
-
-
--- | Type class for all types that can open a Handle. This class is used to
--- replace tOpen in the Transport type class.
-class HandleSource s where
-    hOpen :: s -> IO Handle
-
-instance HandleSource FilePath where
-    hOpen s = openFile s ReadWriteMode
-
-instance HandleSource (HostName, PortID) where
-    hOpen = uncurry connectTo
-
-
-handleEOF :: a -> IOError -> IO a
-handleEOF a e = if isEOFError e
-    then return a
-    else throw $ TransportExn "TChannelTransport: Could not read" TE_UNKNOWN
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/HttpClient.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/HttpClient.hs
deleted file mode 100644
index edeb320..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/HttpClient.hs
+++ /dev/null
@@ -1,101 +0,0 @@
-{-# LANGUAGE FlexibleInstances #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Transport.HttpClient
-    ( module Thrift.Transport
-    , HttpClient (..)
-    , openHttpClient
-) where
-
-import Thrift.Transport
-import Thrift.Transport.IOBuffer
-import Network.URI
-import Network.HTTP hiding (port, host)
-
-import Data.Maybe (fromJust)
-import Data.Monoid (mempty)
-import Control.Exception (throw)
-import qualified Data.ByteString.Lazy as LBS
-
-
--- | 'HttpClient', or THttpClient implements the Thrift Transport
--- | Layer over http or https.
-data HttpClient =
-    HttpClient {
-      hstream :: HandleStream LBS.ByteString,
-      uri :: URI,
-      writeBuffer :: WriteBuffer,
-      readBuffer :: ReadBuffer
-    }
-
-uriAuth :: URI -> URIAuth
-uriAuth = fromJust . uriAuthority
-
-host :: URI -> String
-host = uriRegName . uriAuth
-
-port :: URI -> Int
-port uri_ =
-    if portStr == mempty then
-        httpPort
-    else
-        read portStr
-    where
-      portStr = dropWhile (== ':') $ uriPort $ uriAuth uri_
-      httpPort = 80
-
--- | Use 'openHttpClient' to create an HttpClient connected to @uri@
-openHttpClient :: URI -> IO HttpClient
-openHttpClient uri_ = do
-  stream <- openTCPConnection (host uri_) (port uri_)
-  wbuf <- newWriteBuffer
-  rbuf <- newReadBuffer
-  return $ HttpClient stream uri_ wbuf rbuf
-
-instance Transport HttpClient where
-
-    tClose = close . hstream
-
-    tPeek = peekBuf . readBuffer
-
-    tRead = readBuf . readBuffer
-
-    tWrite = writeBuf . writeBuffer
-
-    tFlush hclient = do
-      body <- flushBuf $ writeBuffer hclient
-      let request = Request {
-                      rqURI = uri hclient,
-                      rqHeaders = [
-                       mkHeader HdrContentType "application/x-thrift",
-                       mkHeader HdrContentLength $  show $ LBS.length body],
-                      rqMethod = POST,
-                      rqBody = body
-                    }
-
-      res <- sendHTTP (hstream hclient) request
-      case res of
-        Right response ->
-          fillBuf (readBuffer hclient) (rspBody response)
-        Left _ ->
-            throw $ TransportExn "THttpConnection: HTTP failure from server" TE_UNKNOWN
-      return ()
-
-    tIsOpen _ = return True
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/IOBuffer.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/IOBuffer.hs
deleted file mode 100644
index 7ebd7d8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/IOBuffer.hs
+++ /dev/null
@@ -1,69 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Transport.IOBuffer
-       ( WriteBuffer
-       , newWriteBuffer
-       , writeBuf
-       , flushBuf
-       , ReadBuffer
-       , newReadBuffer
-       , fillBuf
-       , readBuf
-       , peekBuf
-       ) where
-
-import Data.ByteString.Lazy.Builder
-import Data.Functor
-import Data.IORef
-import Data.Monoid
-import Data.Word
-
-import qualified Data.ByteString.Lazy as LBS
-
-type WriteBuffer = IORef Builder
-type ReadBuffer = IORef LBS.ByteString
-
-newWriteBuffer :: IO WriteBuffer
-newWriteBuffer = newIORef mempty
-
-writeBuf :: WriteBuffer -> LBS.ByteString -> IO ()
-writeBuf w s = modifyIORef w ( <> lazyByteString s)
-
-flushBuf :: WriteBuffer -> IO LBS.ByteString
-flushBuf w = do
-  buf <- readIORef w
-  writeIORef w mempty
-  return $ toLazyByteString buf
-
-newReadBuffer :: IO ReadBuffer
-newReadBuffer = newIORef mempty
-
-fillBuf :: ReadBuffer -> LBS.ByteString -> IO ()
-fillBuf = writeIORef
-
-readBuf :: ReadBuffer -> Int -> IO LBS.ByteString
-readBuf r n = do
-  bs <- readIORef r
-  let (hd, tl) = LBS.splitAt (fromIntegral n) bs
-  writeIORef r tl
-  return hd
-
-peekBuf :: ReadBuffer -> IO (Maybe Word8)
-peekBuf r = (fmap fst . LBS.uncons) <$> readIORef r
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Memory.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Memory.hs
deleted file mode 100644
index 1c93af6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Transport/Memory.hs
+++ /dev/null
@@ -1,77 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Thrift.Transport.Memory
-       ( openMemoryBuffer
-       , MemoryBuffer(..)
-       ) where
-
-import Data.ByteString.Lazy.Builder
-import Data.Functor
-import Data.IORef
-import Data.Monoid
-import qualified Data.ByteString.Lazy as LBS
-
-import Thrift.Transport
-
-
-data MemoryBuffer = MemoryBuffer {
-  writeBuffer :: IORef Builder,
-  readBuffer :: IORef LBS.ByteString
-}
-
-openMemoryBuffer :: IO MemoryBuffer
-openMemoryBuffer = do
-  wbuf <- newIORef mempty
-  rbuf <- newIORef mempty
-  return MemoryBuffer {
-    writeBuffer = wbuf,
-    readBuffer = rbuf
-  }
-
-instance Transport MemoryBuffer where
-  tIsOpen = const $ return False
-  tClose  = const $ return ()
-  tFlush trans = do
-    let wBuf = writeBuffer trans
-    wb <- readIORef wBuf
-    modifyIORef (readBuffer trans) $ \rb -> mappend rb $ toLazyByteString wb
-    writeIORef wBuf mempty
-
-  tRead _ 0 = return mempty
-  tRead trans n = do
-    let rbuf = readBuffer trans
-    rb <- readIORef rbuf
-    let len = fromIntegral $ LBS.length rb
-    if len == 0
-      then do
-        tFlush trans
-        rb2 <- readIORef (readBuffer trans)
-        if (fromIntegral $ LBS.length rb2) == 0
-          then return mempty
-          else tRead trans n
-      else do
-        let (ret, remain) = LBS.splitAt (fromIntegral n) rb
-        writeIORef rbuf remain
-        return ret
-
-  tPeek trans = (fmap fst . LBS.uncons) <$> readIORef (readBuffer trans)
-
-  tWrite trans v = do
-    modifyIORef (writeBuffer trans) (<> lazyByteString v)
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Types.hs b/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Types.hs
deleted file mode 100644
index 2a20025..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/src/Thrift/Types.hs
+++ /dev/null
@@ -1,130 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-
-module Thrift.Types where
-
-import Data.Foldable (foldl')
-import Data.Hashable ( Hashable, hashWithSalt )
-import Data.Int
-import Test.QuickCheck.Arbitrary
-import Test.QuickCheck.Gen (elements)
-import Data.Text.Lazy (Text)
-import qualified Data.ByteString.Lazy as LBS
-import qualified Data.HashMap.Strict as Map
-import qualified Data.HashSet as Set
-import qualified Data.Vector as Vector
-
-instance (Hashable a) => Hashable (Vector.Vector a) where
-  hashWithSalt = Vector.foldl' hashWithSalt
-
-
-type TypeMap = Map.HashMap Int16 (Text, ThriftType)
-
-data ThriftVal = TStruct (Map.HashMap Int16 (Text, ThriftVal))
-               | TMap ThriftType ThriftType [(ThriftVal, ThriftVal)]
-               | TList ThriftType [ThriftVal]
-               | TSet ThriftType [ThriftVal]
-               | TBool Bool
-               | TByte Int8
-               | TI16 Int16
-               | TI32 Int32
-               | TI64 Int64
-               | TString LBS.ByteString
-               | TBinary LBS.ByteString
-               | TDouble Double
-                 deriving (Eq, Show)
-
--- Information is needed here for collection types (ie T_STRUCT, T_MAP,
--- T_LIST, and T_SET) so that we know what types those collections are
--- parameterized by.  In most protocols, this cannot be discerned directly
--- from the data being read.
-data ThriftType
-    = T_STOP
-    | T_VOID
-    | T_BOOL
-    | T_BYTE
-    | T_DOUBLE
-    | T_I16
-    | T_I32
-    | T_I64
-    | T_STRING
-    | T_BINARY
-    | T_STRUCT TypeMap
-    | T_MAP ThriftType ThriftType
-    | T_SET ThriftType
-    | T_LIST ThriftType
-      deriving ( Eq, Show )
-
--- NOTE: when using toEnum information about parametized types is NOT preserved.
--- This design choice is consistent woth the Thrift implementation in other
--- languages
-instance Enum ThriftType where
-    fromEnum T_STOP       = 0
-    fromEnum T_VOID       = 1
-    fromEnum T_BOOL       = 2
-    fromEnum T_BYTE       = 3
-    fromEnum T_DOUBLE     = 4
-    fromEnum T_I16        = 6
-    fromEnum T_I32        = 8
-    fromEnum T_I64        = 10
-    fromEnum T_STRING     = 11
-    fromEnum T_BINARY     = 11
-    fromEnum (T_STRUCT _) = 12
-    fromEnum (T_MAP _ _)  = 13
-    fromEnum (T_SET _)    = 14
-    fromEnum (T_LIST _)   = 15
-
-    toEnum 0  = T_STOP
-    toEnum 1  = T_VOID
-    toEnum 2  = T_BOOL
-    toEnum 3  = T_BYTE
-    toEnum 4  = T_DOUBLE
-    toEnum 6  = T_I16
-    toEnum 8  = T_I32
-    toEnum 10 = T_I64
-    toEnum 11 = T_STRING
-    -- toEnum 11 = T_BINARY
-    toEnum 12 = T_STRUCT Map.empty
-    toEnum 13 = T_MAP T_VOID T_VOID
-    toEnum 14 = T_SET T_VOID
-    toEnum 15 = T_LIST T_VOID
-    toEnum t = error $ "Invalid ThriftType " ++ show t
-
-data MessageType
-    = M_CALL
-    | M_REPLY
-    | M_EXCEPTION
-    | M_ONEWAY
-      deriving ( Eq, Show )
-
-instance Enum MessageType where
-    fromEnum M_CALL      =  1
-    fromEnum M_REPLY     =  2
-    fromEnum M_EXCEPTION =  3
-    fromEnum M_ONEWAY    =  4
-
-    toEnum 1 = M_CALL
-    toEnum 2 = M_REPLY
-    toEnum 3 = M_EXCEPTION
-    toEnum 4 = M_ONEWAY
-    toEnum t = error $ "Invalid MessageType " ++ show t
-
-instance Arbitrary MessageType where
-  arbitrary = elements [M_CALL, M_REPLY, M_EXCEPTION, M_ONEWAY]
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/test/BinarySpec.hs b/vendor/git.apache.org/thrift.git/lib/hs/test/BinarySpec.hs
deleted file mode 100644
index d692fab..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/test/BinarySpec.hs
+++ /dev/null
@@ -1,91 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module BinarySpec where
-
-import Test.Hspec
-import Test.Hspec.QuickCheck (prop)
-
-import qualified Data.ByteString.Lazy as LBS
-import qualified Data.ByteString.Lazy.Char8 as C
-
-import Thrift.Types
-import Thrift.Transport
-import Thrift.Transport.Memory
-import Thrift.Protocol
-import Thrift.Protocol.Binary
-
-spec :: Spec
-spec = do
-  describe "BinaryProtocol" $ do
-    describe "double" $ do
-      it "writes in big endian order" $ do
-        let val = 2 ** 53
-        trans <- openMemoryBuffer
-        let proto = BinaryProtocol trans
-        writeVal proto (TDouble val)
-        bin <- tRead trans 8
-        (LBS.unpack bin) `shouldBe`[67, 64, 0, 0, 0, 0, 0, 0]
-
-      it "reads in big endian order" $ do
-        let bin = LBS.pack [67, 64, 0, 0, 0, 0, 0, 0]
-        trans <- openMemoryBuffer
-        let proto = BinaryProtocol trans
-        tWrite trans bin
-        val <- readVal proto T_DOUBLE
-        val `shouldBe` (TDouble $ 2 ** 53)
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = BinaryProtocol trans
-        writeVal proto $ TDouble val
-        val2 <- readVal proto T_DOUBLE
-        val2 `shouldBe` (TDouble val)
-
-    describe "string" $ do
-      it "writes" $ do
-        let val = C.pack "aaa"
-        trans <- openMemoryBuffer
-        let proto = BinaryProtocol trans
-        writeVal proto (TString val)
-        bin <- tRead trans 7
-        (LBS.unpack bin) `shouldBe` [0, 0, 0, 3, 97, 97, 97]
-
-    describe "binary" $ do
-      it "writes" $ do
-        trans <- openMemoryBuffer
-        let proto = BinaryProtocol trans
-        writeVal proto (TBinary $ LBS.pack [42, 43, 44])
-        bin <- tRead trans 100
-        (LBS.unpack bin) `shouldBe` [0, 0, 0, 3, 42, 43, 44]
-
-      it "reads" $ do
-        trans <- openMemoryBuffer
-        let proto = BinaryProtocol trans
-        tWrite trans $ LBS.pack [0, 0, 0, 3, 42, 43, 44]
-        val <- readVal proto (T_BINARY)
-        val `shouldBe` (TBinary $ LBS.pack [42, 43, 44])
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = BinaryProtocol trans
-        writeVal proto (TBinary $ LBS.pack val)
-        val2 <- readVal proto (T_BINARY)
-        val2 `shouldBe` (TBinary $ LBS.pack val)
-
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/test/CompactSpec.hs b/vendor/git.apache.org/thrift.git/lib/hs/test/CompactSpec.hs
deleted file mode 100644
index 5540e7b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/test/CompactSpec.hs
+++ /dev/null
@@ -1,81 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module CompactSpec where
-
-import Test.Hspec
-import Test.Hspec.QuickCheck (prop)
-
-import qualified Data.ByteString.Lazy as LBS
-
-import Thrift.Types
-import Thrift.Transport
-import Thrift.Transport.Memory
-import Thrift.Protocol
-import Thrift.Protocol.Compact
-
-spec :: Spec
-spec = do
-  describe "CompactProtocol" $ do
-    describe "double" $ do
-      it "writes in little endian order" $ do
-        let val = 2 ** 53
-        trans <- openMemoryBuffer
-        let proto = CompactProtocol trans
-        writeVal proto (TDouble val)
-        bin <- tReadAll trans 8
-        (LBS.unpack bin) `shouldBe`[0, 0, 0, 0, 0, 0, 64, 67]
-
-      it "reads in little endian order" $ do
-        let bin = LBS.pack [0, 0, 0, 0, 0, 0, 64, 67]
-        trans <- openMemoryBuffer
-        let proto = CompactProtocol trans
-        tWrite trans bin
-        val <- readVal proto T_DOUBLE
-        val `shouldBe` (TDouble $ 2 ** 53)
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = CompactProtocol trans
-        writeVal proto $ TDouble val
-        val2 <- readVal proto T_DOUBLE
-        val2 `shouldBe` (TDouble val)
-
-    describe "binary" $ do
-      it "writes" $ do
-        trans <- openMemoryBuffer
-        let proto = CompactProtocol trans
-        writeVal proto (TBinary $ LBS.pack [42, 43, 44])
-        bin <- tRead trans 100
-        (LBS.unpack bin) `shouldBe` [3, 42, 43, 44]
-
-      it "reads" $ do
-        trans <- openMemoryBuffer
-        let proto = CompactProtocol trans
-        tWrite trans $ LBS.pack [3, 42, 43, 44]
-        val <- readVal proto (T_BINARY)
-        val `shouldBe` (TBinary $ LBS.pack [42, 43, 44])
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = CompactProtocol trans
-        writeVal proto (TBinary $ LBS.pack val)
-        val2 <- readVal proto (T_BINARY)
-        val2 `shouldBe` (TBinary $ LBS.pack val)
-
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/test/JSONSpec.hs b/vendor/git.apache.org/thrift.git/lib/hs/test/JSONSpec.hs
deleted file mode 100644
index 022c826..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/test/JSONSpec.hs
+++ /dev/null
@@ -1,225 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module JSONSpec where
-
-import Test.Hspec
-import Test.Hspec.QuickCheck (prop)
-
-import qualified Data.ByteString.Lazy as LBS
-import qualified Data.ByteString.Lazy.Char8 as C
-
-import Thrift.Types
-import Thrift.Transport
-import Thrift.Transport.Memory
-import Thrift.Protocol
-import Thrift.Protocol.JSON
-
-tString :: [Char] -> ThriftVal
-tString = TString . C.pack
-
-spec :: Spec
-spec = do
-  describe "JSONProtocol" $ do
-    describe "bool" $ do
-      it "writes true as 1" $ do
-        let val = True
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TBool val)
-        bin <-tRead trans 100
-        (C.unpack bin) `shouldBe` ['1']
-
-      it "writes false as 0" $ do
-        let val = False
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TBool val)
-        bin <- tRead trans 100
-        (C.unpack bin) `shouldBe` ['0']
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto $ TBool val
-        val2 <- readVal proto T_BOOL
-        val2 `shouldBe` (TBool val)
-
-    describe "string" $ do
-      it "writes" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TString $ C.pack "\"a")
-        bin <- tRead trans 100
-        (C.unpack bin) `shouldBe` "\"\\\"a\""
-
-      it "reads" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans $ C.pack "\"\\\"a\""
-        val <- readVal proto (T_STRING)
-        val `shouldBe` (TString $ C.pack "\"a")
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TString $ C.pack val)
-        val2 <- readVal proto (T_STRING)
-        val2 `shouldBe` (TString $ C.pack val)
-
-    describe "binary" $ do
-      it "writes with padding" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TBinary $ LBS.pack [1])
-        bin <- tRead trans 100
-        (C.unpack bin) `shouldBe` "\"AQ==\""
-
-      it "reads with padding" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans $ C.pack "\"AQ==\""
-        val <- readVal proto (T_BINARY)
-        val `shouldBe` (TBinary $ LBS.pack [1])
-
-      it "reads without padding" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans $ C.pack "\"AQ\""
-        val <- readVal proto (T_BINARY)
-        val `shouldBe` (TBinary $ LBS.pack [1])
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TBinary $ LBS.pack val)
-        val2 <- readVal proto (T_BINARY)
-        val2 `shouldBe` (TBinary $ LBS.pack val)
-
-    describe "list" $ do
-      it "writes empty list" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TList T_BYTE [])
-        bin <- tRead trans 100
-        (C.unpack bin) `shouldBe` "[\"i8\",0]"
-
-      it "reads empty" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans (C.pack "[\"i8\",0]")
-        val <- readVal proto (T_LIST T_BYTE)
-        val `shouldBe` (TList T_BYTE [])
-
-      it "writes single element" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TList T_BYTE [TByte 0])
-        bin <- tRead trans 100
-        (C.unpack bin) `shouldBe` "[\"i8\",1,0]"
-
-      it "reads single element" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans (C.pack "[\"i8\",1,0]")
-        val <- readVal proto (T_LIST T_BYTE)
-        val `shouldBe` (TList T_BYTE [TByte 0])
-
-      it "reads elements" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans (C.pack "[\"i8\",2,42, 43]")
-        val <- readVal proto (T_LIST T_BYTE)
-        val `shouldBe` (TList T_BYTE [TByte 42, TByte 43])
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto $ (TList T_STRING $ map tString val)
-        val2 <- readVal proto $ T_LIST T_STRING
-        val2 `shouldBe` (TList T_STRING $ map tString val)
-
-    describe "set" $ do
-      it "writes empty" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TSet T_BYTE [])
-        bin <- tRead trans 100
-        (C.unpack bin) `shouldBe` "[\"i8\",0]"
-
-      it "reads empty" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans (C.pack "[\"i8\",0]")
-        val <- readVal proto (T_SET T_BYTE)
-        val `shouldBe` (TSet T_BYTE [])
-
-      it "reads single element" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans (C.pack "[\"i8\",1,0]")
-        val <- readVal proto (T_SET T_BYTE)
-        val `shouldBe` (TSet T_BYTE [TByte 0])
-
-      it "reads elements" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans (C.pack "[\"i8\",2,42, 43]")
-        val <- readVal proto (T_SET T_BYTE)
-        val `shouldBe` (TSet T_BYTE [TByte 42, TByte 43])
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto $ (TSet T_STRING $ map tString val)
-        val2 <- readVal proto $ T_SET T_STRING
-        val2 `shouldBe` (TSet T_STRING $ map tString val)
-
-    describe "map" $ do
-      it "writes empty" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto (TMap T_BYTE T_BYTE [])
-        bin <- tRead trans 100
-        (C.unpack bin) `shouldBe`"[\"i8\",\"i8\",0,{}]"
-
-      it "reads empty" $ do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans (C.pack "[\"i8\",\"i8\",0,{}]")
-        val <- readVal proto (T_MAP T_BYTE T_BYTE)
-        val `shouldBe` (TMap T_BYTE T_BYTE [])
-
-      it "reads string-string" $ do
-        let bin = "[\"str\",\"str\",2,{\"a\":\"2\",\"b\":\"blah\"}]"
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        tWrite trans (C.pack bin)
-        val <- readVal proto (T_MAP T_STRING T_STRING)
-        val`shouldBe` (TMap T_STRING T_STRING [(tString "a", tString "2"), (tString "b", tString "blah")])
-
-      prop "round trip" $ \val -> do
-        trans <- openMemoryBuffer
-        let proto = JSONProtocol trans
-        writeVal proto $ (TMap T_STRING T_STRING $ map toKV val)
-        val2 <- readVal proto $ T_MAP T_STRING T_STRING
-        val2 `shouldBe` (TMap T_STRING T_STRING $ map toKV val)
-        where
-          toKV v = (tString v, tString v)
-
diff --git a/vendor/git.apache.org/thrift.git/lib/hs/test/Spec.hs b/vendor/git.apache.org/thrift.git/lib/hs/test/Spec.hs
deleted file mode 100644
index 7ec9a99..0000000
--- a/vendor/git.apache.org/thrift.git/lib/hs/test/Spec.hs
+++ /dev/null
@@ -1,38 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
--- Our CI does not work well with auto discover.
--- Need to add build-time PATH variable to hspec-discover dir from CMake
--- or install hspec system-wide for the following to work.
--- {-# OPTIONS_GHC -F -pgmF hspec-discover #-}
-
-import Test.Hspec
-
-import qualified BinarySpec
-import qualified CompactSpec
-import qualified JSONSpec
-
-main :: IO ()
-main = hspec spec
-
-spec :: Spec
-spec = do
-  describe "Binary" BinarySpec.spec
-  describe "Compact" CompactSpec.spec
-  describe "JSON" JSONSpec.spec
diff --git a/vendor/git.apache.org/thrift.git/lib/java/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/java/CMakeLists.txt
deleted file mode 100644
index 57b97f1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/CMakeLists.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-file(GLOB java_sources src/**/*.java)
-
-if(ANDROID)
-    set(android_sources
-        android/build.gradle
-        android/settings.gradle
-        android/src/main/AndroidManifest.xml
-    )
-    set(THRIFT_AAR outputs/aar/thrift-debug.aar outputs/aar/thrift-release.aar)
-    add_custom_command(
-        OUTPUT ${THRIFT_AAR}
-        COMMAND ${GRADLE_EXECUTABLE} -p"${CMAKE_CURRENT_SOURCE_DIR}/android" -PbuildDir="${CMAKE_CURRENT_BINARY_DIR}" assemble
-        DEPENDS ${java_sources} ${android_sources})
-    add_custom_target(thrift_aar ALL DEPENDS ${THRIFT_AAR})
-
-else(ANDROID)
-
-    if(IS_ABSOLUTE "${LIB_INSTALL_DIR}")
-        set(JAVA_INSTALL_DIR "${LIB_INSTALL_DIR}/java")
-    else()
-        set(JAVA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/java")
-    endif()
-
-    if(IS_ABSOLUTE "${DOC_INSTALL_DIR}")
-        set(JAVA_DOC_INSTALL_DIR "${DOC_INSTALL_DIR}/java")
-    else()
-        set(JAVA_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}/java")
-    endif()
-
-    file(GLOB_RECURSE ThriftJava_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.java)
-    set(ThriftJava_ARTIFACTS
-        libthrift-${thrift_VERSION}.jar
-        libthrift-${thrift_VERSION}.pom
-    )
-    add_custom_command(
-        OUTPUT ${ThriftJava_ARTIFACTS}
-        COMMAND ${Ant_EXECUTABLE} ${ANT_FLAGS} -Dbuild.dir="${CMAKE_CURRENT_BINARY_DIR}" -f build.xml
-        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/build.xml
-        DEPENDS ${ThriftJava_SOURCES}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-
-    add_custom_target(ThriftJava ALL
-        COMMENT "Building Java library using Ant"
-        DEPENDS ${ThriftJava_ARTIFACTS}
-    )
-
-    # Hook the ant install task into CMake install
-    install(CODE "execute_process(
-        COMMAND ${Ant_EXECUTABLE} ${ANT_FLAGS} install
-        -Dbuild.dir=\"${CMAKE_CURRENT_BINARY_DIR}\"
-        -Dinstall.path=\"${JAVA_INSTALL_DIR}\" -Dinstall.javadoc.path=\"${JAVA_DOC_INSTALL_DIR}\" -f build.xml
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )")
-
-    if(BUILD_TESTING)
-        add_test(NAME JavaTest
-                 COMMAND ${Ant_EXECUTABLE} ${ANT_FLAGS} -Dbuild.dir="${CMAKE_CURRENT_BINARY_DIR}" -Dthrift.compiler="${THRIFT_COMPILER}" -f build.xml test
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-    endif()
-endif(ANDROID)
diff --git a/vendor/git.apache.org/thrift.git/lib/java/Makefile.am b/vendor/git.apache.org/thrift.git/lib/java/Makefile.am
deleted file mode 100644
index ab130f5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-export CLASSPATH
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-all-local:
-	$(ANT) $(ANT_FLAGS)
-
-install-exec-hook:
-	$(ANT) $(ANT_FLAGS) install -Dinstall.path=$(DESTDIR)$(JAVA_PREFIX) \
-		-Dinstall.javadoc.path=$(DESTDIR)$(docdir)/java
-
-# Make sure this doesn't fail if ant is not configured.
-clean-local:
-	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT $(ANT_FLAGS) clean
-
-precross: $(THRIFT)
-	$(ANT) $(ANT_FLAGS) compile-test
-
-check-local: all
-	$(ANT) $(ANT_FLAGS) test
-
-EXTRA_DIST = \
-	build.xml \
-	build.properties \
-	CMakeLists.txt \
-	coding_standards.md \
-	android \
-	src \
-	test \
-	README.md
diff --git a/vendor/git.apache.org/thrift.git/lib/java/README.md b/vendor/git.apache.org/thrift.git/lib/java/README.md
deleted file mode 100644
index 66bcfa5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Thrift Java Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with Java
-======================
-
-The Thrift Java source is not build using the GNU tools, but rather uses
-the Apache Ant build system, which tends to be predominant amongst Java
-developers.
-
-To compile the Java Thrift libraries, simply do the following:
-
-    ant
-
-Yep, that's easy. Look for libthrift.jar in the base directory.
-
-To include Thrift in your applications simply add libthrift.jar to your
-classpath, or install if in your default system classpath of choice.
-
-
-Build Thrift behind a proxy:
-
-    ant -Dproxy.enabled=1 -Dproxy.host=myproxyhost -Dproxy.user=thriftuser -Dproxy.pass=topsecret
-
-or via
-
-    ./configure --with-java ANT_FLAGS='-Dproxy.enabled=1 -Dproxy.host=myproxyhost -Dproxy.user=thriftuser -Dproxy.pass=topsecret'
-
-
-Dependencies
-============
-
-Apache Ant
-http://ant.apache.org/
diff --git a/vendor/git.apache.org/thrift.git/lib/java/android/build.gradle b/vendor/git.apache.org/thrift.git/lib/java/android/build.gradle
deleted file mode 100644
index 4aa2864..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/android/build.gradle
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-apply plugin: 'com.android.library'
-
-android {
-  compileSdkVersion 23
-  buildToolsVersion "23.0.1"
-  useLibrary 'org.apache.http.legacy'
-  sourceSets.main.java {
-    srcDir '../src'
-    exclude 'org/apache/thrift/transport/TSaslClientTransport.java'
-    exclude 'org/apache/thrift/transport/TSaslServerTransport.java'
-    exclude 'org/apache/thrift/transport/TSaslTransport.java'
-  }
-}
-
-repositories {
-  mavenCentral()
-}
-dependencies {
-  compile 'org.slf4j:slf4j-api:1.7.13'
-  compile 'javax.servlet:servlet-api:2.5'
-  compile 'org.apache.httpcomponents:httpcore:4.4.4'
-}
-
-buildscript {
-  repositories {
-    mavenCentral()
-  }
-  dependencies {
-    classpath 'com.android.tools.build:gradle:1.5.0'
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/android/settings.gradle b/vendor/git.apache.org/thrift.git/lib/java/android/settings.gradle
deleted file mode 100644
index 75e97be..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name='thrift'
diff --git a/vendor/git.apache.org/thrift.git/lib/java/android/src/main/AndroidManifest.xml b/vendor/git.apache.org/thrift.git/lib/java/android/src/main/AndroidManifest.xml
deleted file mode 100644
index 43abdb7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.apache.thrift">
-  <application />
-</manifest>
diff --git a/vendor/git.apache.org/thrift.git/lib/java/build.properties b/vendor/git.apache.org/thrift.git/lib/java/build.properties
deleted file mode 100644
index a3f2de5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/build.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-thrift.version=0.10.0
-thrift.groupid=org.apache.thrift
-release=false
-
-# Jar Versions
-mvn.ant.task.version=2.1.3
-
-# Local Install paths
-install.path=/usr/local/lib
-install.javadoc.path=${install.path}
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-apache.repo=https://repository.apache.org/content/repositories/releases
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
-
-# Apache Maven publish
-license=http://www.apache.org/licenses/LICENSE-2.0.txt
-maven-repository-url=https://repository.apache.org/service/local/staging/deploy/maven2
-maven-repository-id=apache.releases.https
-
-# Jar Versions
-mvn.ant.task.version=2.1.3
-
-# Dependency versions
-httpclient.version=4.4.1
-httpcore.version=4.4.1
-slf4j.version=1.7.12
-servlet.version=2.5
-
diff --git a/vendor/git.apache.org/thrift.git/lib/java/build.xml b/vendor/git.apache.org/thrift.git/lib/java/build.xml
deleted file mode 100644
index 40e5284..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/build.xml
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<project name="libthrift" default="dist" basedir="."
-  xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <description>Thrift Build File</description>
-  <property name="thrift.root" location="../../"/>
-  <property name="thrift.artifactid" value="libthrift"/>
-
-  <!-- Include the base properties file -->
-  <property file="${basedir}/build.properties" />
-
-  <property environment="env"/>
-
-  <condition property="version" value="${thrift.version}">
-    <isset property="release"/>
-  </condition>
-  <property name="version" value="${thrift.version}-snapshot"/>
-
-  <property name="final.name" value="${thrift.artifactid}-${version}"/>
-
-  <property name="thrift.compiler" location="../../compiler/cpp/thrift"/>
-  <property name="src" location="${basedir}/src"/>
-  <property name="build.dir" location="${basedir}/build"/>
-  <property name="build.lib.dir" location="${build.dir}/lib"/>
-  <property name="build.tools.dir" location="${build.dir}/tools"/>
-  <property name="src.test" location="test"/>
-  <property name="javadoc.dir" location="${build.dir}/javadoc"/>
-  <property name="build.test.dir" location="${build.dir}/test"/>
-  <property name="test.thrift.home" location="${thrift.root}/test"/>
-
-  <property name="gen" location="gen-java"/>
-  <property name="genbean" location="gen-javabean"/>
-  <property name="genreuse" location="gen-javareuse"/>
-  <property name="genfullcamel" location="gen-fullcamel"/>
-
-  <property name="jar.file" location="${build.dir}/${final.name}.jar"/>
-  <property name="test.jar.file" location="${build.dir}/${final.name}-test.jar"/>
-  <property name="javadoc.jar.file" location="${build.dir}/${final.name}-javadoc.jar"/>
-  <property name="source.jar.file" location="${build.dir}/${final.name}-sources.jar"/>
-
-  <!-- Junit properties -->
-  <property name="test.junit.output.format" value="plain"/>
-  <property name="test.timeout" value="2000000"/>
-  <property name="test.src.dir" location="${basedir}/test"/>
-  <property name="test.log.dir" value="${build.test.dir}/log"/>
-  <property name="test.port" value="9090"/>
-
-  <!-- maven properties -->
-  <property name="pom.xml" location="${build.dir}/${final.name}.pom"/>
-
-  <path id="compile.classpath">
-    <fileset dir="${build.lib.dir}">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
-
-  <path id="test.classpath">
-    <path refid="compile.classpath"/>
-    <pathelement path="${env.CLASSPATH}"/>
-    <pathelement location="${build.test.dir}"/>
-    <pathelement location="${jar.file}"/>
-    <pathelement location="${test.jar.file}"/>
-
-  </path>
-
-  <!-- Tasks -->
-  <target name="init" depends="setup.init,mvn.init" unless="init.finished">
-    <property name="init.finished" value="true"/>
-  </target>
-
-  <target name="setup.init">
-    <tstamp/>
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${build.lib.dir}"/>
-    <mkdir dir="${build.tools.dir}"/>
-    <mkdir dir="${build.test.dir}"/>
-  </target>
-
-  <target name="compile" depends="init">
-    <javac srcdir="${src}" destdir="${build.dir}" source="1.5" target="1.5"
-    debug="true" classpathref="compile.classpath" includeantruntime="false" encoding="UTF-8">
-      <compilerarg value="-Xlint:unchecked"/>
-    </javac>
-  </target>
-
-  <target name="javadoc" depends="init">
-    <javadoc sourcepath="${src}" destdir="${javadoc.dir}"
-      version="true" windowtitle="Thrift Java API" doctitle="Thrift Java API"
-      classpathref="test.classpath">
-    </javadoc>
-    <jar jarfile="${javadoc.jar.file}" basedir="${javadoc.dir}">
-      <manifest>
-        <attribute name="Implementation-Version" value="${version}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="dist" depends="compile">
-    <mkdir dir="${build.dir}/META-INF"/>
-    <copy file="${thrift.root}/LICENSE" tofile="${build.dir}/META-INF/LICENSE.txt"/>
-    <copy file="${thrift.root}/NOTICE" tofile="${build.dir}/META-INF/NOTICE.txt"/>
-    <jar jarfile="${jar.file}">
-      <manifest>
-        <attribute name="Implementation-Version" value="${version}"/>
-        <attribute name="Bundle-ManifestVersion" value="2"/>
-        <attribute name="Bundle-SymbolicName" value="${thrift.groupid}"/>
-        <attribute name="Bundle-Name" value="Apache Thrift"/>
-        <attribute name="Bundle-Version" value="${version}"/>
-        <attribute name="Bundle-Description" value="Apache Thrift library"/>
-        <attribute name="Bundle-License" value="${license}"/>
-        <attribute name="Bundle-ActivationPolicy" value="lazy"/>
-        <attribute name="Export-Package" value="${thrift.groupid}.async;uses:=&quot;${thrift.groupid}.protocol,${thrift.groupid}.transport,org.slf4j,${thrift.groupid}&quot;;version=&quot;${version}&quot;,${thrift.groupid}.protocol;uses:=&quot;${thrift.groupid}.transport,${thrift.groupid},${thrift.groupid}.scheme&quot;;version=&quot;${version}&quot;,${thrift.groupid}.server;uses:=&quot;${thrift.groupid}.transport,${thrift.groupid}.protocol,${thrift.groupid},org.slf4j,javax.servlet,javax.servlet.http&quot;;version=&quot;${version}&quot;,${thrift.groupid}.transport;uses:=&quot;${thrift.groupid}.protocol,${thrift.groupid},org.apache.http.client,org.apache.http.params,org.apache.http.entity,org.apache.http.client.methods,org.apache.http,org.slf4j,javax.net.ssl,javax.net,javax.security.sasl,javax.security.auth.callback&quot;;version=&quot;${version}&quot;,${thrift.groupid};uses:=&quot;${thrift.groupid}.protocol,${thrift.groupid}.async,${thrift.groupid}.server,${thrift.groupid}.transport,org.slf4j,org.apache.log4j,${thrift.groupid}.scheme&quot;;version=&quot;${version}&quot;,${thrift.groupid}.meta_data;uses:=&quot;${thrift.groupid}&quot;;version=&quot;${version}&quot;,${thrift.groupid}.scheme;uses:=&quot;${thrift.groupid}.protocol,${thrift.groupid}&quot;;version=&quot;${version}&quot;"/>
-       <attribute name="Import-Package" value="javax.net,javax.net.ssl,javax.security.auth.callback,javax.security.sasl,javax.servlet;resolution:=optional,javax.servlet.http;resolution:=optional,org.slf4j;resolution:=optional;version=&quot;[1.4,2)&quot;,org.apache.http.client;resolution:=optional,org.apache.http.params;resolution:=optional,org.apache.http.entity;resolution:=optional,org.apache.http.client.methods;resolution:=optional,org.apache.http;resolution:=optional"/>
-      </manifest>
-      <fileset dir="${build.dir}">
-        <include name="org/apache/thrift/**/*.class"/>
-        <include name="META-INF/*.txt"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="pack.src">
-    <jar jarfile="${source.jar.file}">
-      <fileset dir="${src}">
-        <include name="**/*.java"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="install" depends="dist,javadoc">
-    <copy todir="${install.path}">
-      <fileset dir="${build.dir}" includes="*.jar"/>
-      <fileset dir="${build.lib.dir}" includes="*.jar"/>
-    </copy>
-    <copy todir="${install.javadoc.path}">
-      <fileset dir="${javadoc.dir}" includes="**/*"/>
-    </copy>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build.dir}"/>
-    <delete dir="${gen}"/>
-    <delete dir="${genbean}"/>
-    <delete dir="${genreuse}"/>
-    <delete dir="${genfullcamel}"/>
-  </target>
-
-  <target name="optional-generate" unless="no-gen-thrift">
-    <antcall target="generate">
-    </antcall>
-  </target>
-
-  <target name="compile-test" description="Build the test suite classes" depends="optional-generate,dist">
-    <javac debug="true" srcdir="${gen}" destdir="${build.test.dir}" classpathref="test.classpath" includeantruntime="false" encoding="UTF-8">
-      <compilerarg value="-Xlint:deprecation"/>
-      <!--<compilerarg value="-Xlint:unchecked"/>-->
-    </javac>
-    <javac debug="true" srcdir="${genbean}" destdir="${build.test.dir}" classpathref="test.classpath" includeantruntime="false" encoding="UTF-8">
-      <compilerarg value="-Xlint:deprecation"/>
-      <!--<compilerarg value="-Xlint:unchecked"/>-->
-    </javac>
-    <javac debug="true" srcdir="${genreuse}" destdir="${build.test.dir}" classpathref="test.classpath" includeantruntime="false" encoding="UTF-8">
-      <compilerarg value="-Xlint:deprecation"/>
-      <!--<compilerarg value="-Xlint:unchecked"/>-->
-    </javac>
-    <javac debug="true" srcdir="${genfullcamel}" destdir="${build.test.dir}" classpathref="test.classpath" includeantruntime="false" encoding="UTF-8">
-      <compilerarg value="-Xlint:deprecation"/>
-      <!--<compilerarg value="-Xlint:unchecked"/>-->
-    </javac>
-    <javac debug="true" srcdir="${src.test}" destdir="${build.test.dir}" classpathref="test.classpath" includeantruntime="false" encoding="UTF-8">
-      <compilerarg value="-Xlint:deprecation"/>
-      <!--<compilerarg value="-Xlint:unchecked"/>-->
-    </javac>
-    <copy todir="${build.test.dir}">
-      <fileset dir="${src.test}" includes="log4j.properties"/>
-    </copy>
-    <jar jarfile="${test.jar.file}" basedir="${build.test.dir}"/>
-  </target>
-
-  <target name="junit-test" description="Run the JUnit test suite" depends="compile-test">
-    <mkdir dir="${test.log.dir}"/>
-    <junit printsummary="true" showoutput="${test.output}" timeout="${test.timeout}"
-      haltonfailure="true" errorProperty="tests.failed" failureProperty="tests.failed"
-      fork="true" forkmode="perTest" maxmemory="512m"
-    >
-      <sysproperty key="build.test" value="${build.test.dir}"/>
-      <sysproperty key="test.port" value="${test.port}"/>
-      <sysproperty key="javax.net.ssl.trustStore" value="${src.test}/.truststore"/>
-      <sysproperty key="javax.net.ssl.trustStorePassword" value="thrift"/>
-      <sysproperty key="javax.net.ssl.keyStore" value="${src.test}/.keystore"/>
-      <sysproperty key="javax.net.ssl.keyStorePassword" value="thrift"/>
-      <classpath refid="test.classpath"/>
-      <formatter type="${test.junit.output.format}"/>
-      <batchtest todir="${test.log.dir}" unless="testcase">
-        <fileset dir="${test.src.dir}">
-          <include name="**/Test*.java"/>
-          <exclude name="**/TestClient.java"/>
-          <exclude name="**/TestServer.java"/>
-          <exclude name="**/TestNonblockingServer.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${test.log.dir}" if="testcase">
-        <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
-      </batchtest>
-    </junit>
-    <fail if="tests.failed">Tests failed!</fail>
-  </target>
-
-  <target name="deprecated-test" description="Run the non-JUnit test suite" depends="compile-test">
-    <java classname="org.apache.thrift.test.EqualityTest" classpathref="test.classpath" failonerror="true"/>
-    <java classname="org.apache.thrift.test.JavaBeansTest" classpathref="test.classpath" failonerror="true"/>
-  </target>
-
-  <target name="test" description="Run the full test suite" depends="junit-test,deprecated-test"/>
-
-  <target name="testclient" description="Run a test client" depends="compile-test, run-testclient"/>
-  <target name="run-testclient" description="Run a test client">
-    <java classname="org.apache.thrift.test.TestClient"
-      classpathref="test.classpath" failonerror="true" fork="true">
-      <sysproperty key="javax.net.ssl.trustStore" value="${src.test}/.truststore"/>
-      <sysproperty key="javax.net.ssl.trustStorePassword" value="thrift"/>
-      <arg line="${testargs}"/>
-    </java>
-  </target>
-
-  <target name="testserver" description="Run a test server" depends="compile-test, run-testserver"/>
-  <target name="run-testserver" description="Run a test server">
-    <java classname="org.apache.thrift.test.TestServer"
-      classpathref="test.classpath" failonerror="true" fork="true">
-      <sysproperty key="javax.net.ssl.keyStore" value="${src.test}/.keystore"/>
-      <sysproperty key="javax.net.ssl.keyStorePassword" value="thrift"/>
-      <arg line="${testargs}"/>
-    </java>
-  </target>
-
-  <target name="testnonblockingserver" description="Run a test nonblocking server" depends="compile-test, run-testnonblockingserver"/>
-  <target name="run-testnonblockingserver" description="Run a test nonblocking server">
-    <java classname="org.apache.thrift.test.TestNonblockingServer"
-      classpathref="test.classpath" failonerror="true">
-      <arg line="${testargs}"/>
-    </java>
-  </target>
-
-  <target name="generate">
-    <!-- Generate the thrift gen-java source -->
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java ${test.thrift.home}/ThriftTest.thrift"/>
-    </exec>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java ${test.thrift.home}/JavaTypes.thrift"/>
-    </exec>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java ${test.thrift.home}/DebugProtoTest.thrift"/>
-    </exec>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java ${test.thrift.home}/OptionalRequiredTest.thrift"/>
-    </exec>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java:beans,nocamel ${test.thrift.home}/JavaBeansTest.thrift"/>
-    </exec>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java ${test.thrift.home}/ManyOptionals.thrift"/>
-    </exec>
-  	<mkdir dir="${genfullcamel}"/>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java:fullcamel -out ${genfullcamel} ${test.thrift.home}/FullCamelTest.thrift"/>
-    </exec>
-  	<mkdir dir="${genreuse}"/>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java:reuse-objects -out ${genreuse} ${test.thrift.home}/ReuseObjects.thrift"/>
-    </exec>
-  </target>
-
-  <target name="proxy" if="proxy.enabled">
-    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-      proxyuser="${proxy.user}" proxypassword="${proxy.pass}"/>
-  </target>
-
-  <target name="mvn.ant.tasks.download" depends="setup.init,mvn.ant.tasks.check,proxy" unless="mvn.ant.tasks.found">
-    <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}" dest="${build.tools.dir}/${mvn.ant.task.jar}" usetimestamp="true"/>
-  </target>
-
-  <target name="mvn.ant.tasks.check">
-    <condition property="mvn.ant.tasks.found">
-      <typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/>
-    </condition>
-  </target>
-
-  <target name="mvn.init" depends="mvn.ant.tasks.download" unless="mvn.finished">
-    <!-- Download mvn ant tasks, download dependencies, and setup pom file -->
-    <typedef uri="antlib:org.apache.maven.artifact.ant" classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
-
-    <!-- remote repositories used to download dependencies from -->
-    <artifact:remoteRepository id="central" url="${mvn.repo}"/>
-    <artifact:remoteRepository id="apache" url="${apache.repo}"/>
-
-    <!-- Pom file information -->
-    <artifact:pom id="pom"
-      groupId="${thrift.groupid}"
-      artifactId="${thrift.artifactid}"
-      version="${version}"
-      url="http://thrift.apache.org"
-      name="Apache Thrift"
-      description="Thrift is a software framework for scalable cross-language services development."
-      packaging="pom"
-    >
-      <remoteRepository refid="central"/>
-      <remoteRepository refid="apache"/>
-      <license name="The Apache Software License, Version 2.0" url="${license}"/>
-      <scm connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git"
-      developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git"
-      url="https://git-wip-us.apache.org/repos/asf?p=thrift.git"
-      />
-      <!-- Thrift Developers -->
-      <developer id="mcslee" name="Mark Slee"/>
-      <developer id="dreiss" name="David Reiss"/>
-      <developer id="aditya" name="Aditya Agarwal"/>
-      <developer id="marck" name="Marc Kwiatkowski"/>
-      <developer id="jwang" name="James Wang"/>
-      <developer id="cpiro" name="Chris Piro"/>
-      <developer id="bmaurer" name="Ben Maurer"/>
-      <developer id="kclark" name="Kevin Clark"/>
-      <developer id="jake" name="Jake Luciani"/>
-      <developer id="bryanduxbury" name="Bryan Duxbury"/>
-      <developer id="esteve" name="Esteve Fernandez"/>
-      <developer id="todd" name="Todd Lipcon"/>
-      <developer id="geechorama" name="Andrew McGeachie"/>
-      <developer id="molinaro" name="Anthony Molinaro"/>
-      <developer id="roger" name="Roger Meier"/>
-      <developer id="jfarrell" name="Jake Farrell"/>
-      <developer id="jensg" name="Jens Geyer"/>
-      <developer id="carl" name="Carl Yeksigian"/>
-
-      <!-- Thrift dependencies list -->
-      <dependency groupId="org.slf4j" artifactId="slf4j-api" version="${slf4j.version}"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" version="${servlet.version}" scope="provided"/>
-      <dependency groupId="org.apache.httpcomponents" artifactId="httpclient" version="${httpclient.version}"/>
-      <dependency groupId="org.apache.httpcomponents" artifactId="httpcore" version="${httpcore.version}"/>
-    </artifact:pom>
-
-    <!-- Generate the pom file -->
-    <artifact:writepom pomRefId="pom" file="${pom.xml}"/>
-
-    <!-- Download the dependencies -->
-    <artifact:dependencies filesetId="build-dependency-jars" pomRefId="pom"/>
-
-    <!-- Copy the dependencies to the build/lib dir -->
-    <copy todir="${build.dir}/lib">
-      <fileset refid="build-dependency-jars"/>
-      <mapper type="flatten"/>
-    </copy>
-
-    <!-- Dependencies needed for testing -->
-    <artifact:dependencies filesetId="test-dependency-jars" useScope="runtime">
-      <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="${slf4j.version}"/>
-      <dependency groupId="junit" artifactId="junit" version="4.4"/>
-    </artifact:dependencies>
-
-    <!-- Copy the test dependencies to the build/lib dir -->
-    <copy todir="${build.dir}/lib">
-      <fileset refid="test-dependency-jars"/>
-      <mapper type="flatten"/>
-    </copy>
-
-    <property name="mvn.finished" value="true"/>
-  </target>
-
-  <macrodef name="signAndDeploy">
-    <!-- Sign and deploy jars to apache repo -->
-    <attribute name="file"/>
-    <attribute name="classifier" default=""/>
-    <attribute name="packaging" default="jar"/>
-    <attribute name="pom" default=""/>
-    <sequential>
-      <artifact:mvn fork="true">
-        <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file"/>
-        <arg value="-DrepositoryId=${maven-repository-id}"/>
-        <arg value="-Durl=${maven-repository-url}"/>
-        <arg value="-DpomFile=@{pom}"/>
-        <arg value="-Dfile=@{file}"/>
-        <arg value="-Dclassifier=@{classifier}"/>
-        <arg value="-Dpackaging=@{packaging}"/>
-        <arg value="-Pgpg"/>
-      </artifact:mvn>
-    </sequential>
-  </macrodef>
-
-  <target name="publish" depends="clean,init,test,dist,javadoc,pack.src">
-    <!-- Compile, package, test and then send release to apache maven repo -->
-    <!-- run with: ant -Drelease=true publish-->
-    <signAndDeploy file="${pom.xml}" packaging="pom" classifier="" pom="${pom.xml}"/>
-    <signAndDeploy file="${jar.file}" classifier="" pom="${pom.xml}"/>
-    <signAndDeploy file="${javadoc.jar.file}" classifier="javadoc" pom="${pom.xml}"/>
-    <signAndDeploy file="${source.jar.file}" classifier="sources" pom="${pom.xml}"/>
-  </target>
-</project>
diff --git a/vendor/git.apache.org/thrift.git/lib/java/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/java/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/AsyncProcessFunction.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/AsyncProcessFunction.java
deleted file mode 100644
index 550ebd5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/AsyncProcessFunction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.protocol.TMessage;
-import org.apache.thrift.protocol.TMessageType;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.server.AbstractNonblockingServer;
-
-public abstract class AsyncProcessFunction<I, T extends TBase, R> {
-    final String methodName;
-
-    public AsyncProcessFunction(String methodName) {
-        this.methodName = methodName;
-    }
-
-    protected abstract boolean isOneway();
-
-    public abstract void start(I iface, T args, AsyncMethodCallback<R> resultHandler) throws TException;
-
-    public abstract T getEmptyArgsInstance();
-
-    public abstract AsyncMethodCallback<R> getResultHandler(final AbstractNonblockingServer.AsyncFrameBuffer fb, int seqid);
-
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void sendResponse(final AbstractNonblockingServer.AsyncFrameBuffer fb, final TSerializable result, final byte type, final int seqid) throws TException {
-        TProtocol oprot = fb.getOutputProtocol();
-
-        oprot.writeMessageBegin(new TMessage(getMethodName(), type, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-
-        fb.responseReady();
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/EncodingUtils.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/EncodingUtils.java
deleted file mode 100644
index bf14ef5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/EncodingUtils.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-/**
- * Utility methods for use when encoding/decoding raw data as byte arrays.
- */
-public class EncodingUtils {
-
-  /**
-   * Encode <code>integer</code> as a series of 4 bytes into <code>buf</code>
-   * starting at position 0 within that buffer.
-   * 
-   * @param integer
-   *          The integer to encode.
-   * @param buf
-   *          The buffer to write to.
-   */
-  public static final void encodeBigEndian(final int integer, final byte[] buf) {
-    encodeBigEndian(integer, buf, 0);
-  }
-
-  /**
-   * Encode <code>integer</code> as a series of 4 bytes into <code>buf</code>
-   * starting at position <code>offset</code>.
-   * 
-   * @param integer
-   *          The integer to encode.
-   * @param buf
-   *          The buffer to write to.
-   * @param offset
-   *          The offset within <code>buf</code> to start the encoding.
-   */
-  public static final void encodeBigEndian(final int integer, final byte[] buf, int offset) {
-    buf[offset] = (byte) (0xff & (integer >> 24));
-    buf[offset + 1] = (byte) (0xff & (integer >> 16));
-    buf[offset + 2] = (byte) (0xff & (integer >> 8));
-    buf[offset + 3] = (byte) (0xff & (integer));
-  }
-
-  /**
-   * Decode a series of 4 bytes from <code>buf</code>, starting at position 0,
-   * and interpret them as an integer.
-   * 
-   * @param buf
-   *          The buffer to read from.
-   * @return An integer, as read from the buffer.
-   */
-  public static final int decodeBigEndian(final byte[] buf) {
-    return decodeBigEndian(buf, 0);
-  }
-
-  /**
-   * Decode a series of 4 bytes from <code>buf</code>, start at
-   * <code>offset</code>, and interpret them as an integer.
-   * 
-   * @param buf
-   *          The buffer to read from.
-   * @param offset
-   *          The offset with <code>buf</code> to start the decoding.
-   * @return An integer, as read from the buffer.
-   */
-  public static final int decodeBigEndian(final byte[] buf, int offset) {
-    return ((buf[offset] & 0xff) << 24) | ((buf[offset + 1] & 0xff) << 16)
-        | ((buf[offset + 2] & 0xff) << 8) | ((buf[offset + 3] & 0xff));
-  }
-
-  /**
-   * Bitfield utilities.
-   * Returns true if the bit at position is set in v.
-   */
-  public static final boolean testBit(byte v, int position) {
-    return testBit((int)v, position);
-  }
-
-  public static final boolean testBit(short v, int position) {
-    return testBit((int)v, position);
-  }
-
-  public static final boolean testBit(int v, int position) {
-    return (v & (1 << position)) != 0;
-  }
-
-  public static final boolean testBit(long v, int position) {
-    return (v & (1L << position)) != 0L;
-  }
-
-  /**
-   * Returns v, with the bit at position set to zero.
-   */
-  public static final byte clearBit(byte v, int position) {
-    return (byte)clearBit((int)v, position);
-  }
-
-  public static final short clearBit(short v, int position) {
-    return (short)clearBit((int)v, position);
-  }
-
-  public static final int clearBit(int v, int position) {
-    return v & ~(1 << position);
-  }
-
-  public static final long clearBit(long v, int position) {
-    return v & ~(1L << position);
-  }
-
-  /**
-   * Returns v, with the bit at position set to 1 or 0 depending on value.
-   */
-  public static final byte setBit(byte v, int position, boolean value) {
-    return (byte)setBit((int)v, position, value);
-  }
-
-  public static final short setBit(short v, int position, boolean value) {
-    return (short)setBit((int)v, position, value);
-  }
-
-  public static final int setBit(int v, int position, boolean value) {
-    if(value)
-      return v | (1 << position);
-    else
-      return clearBit(v, position);
-  }
-
-  public static final long setBit(long v, int position, boolean value) {
-    if(value)
-      return v | (1L << position);
-    else
-      return clearBit(v, position);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/Option.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/Option.java
deleted file mode 100644
index db25ec5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/Option.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-/**
- * Implementation of the Option type pattern
- */
-public abstract class Option<T> {
-
-    /**
-     * Whether the Option is defined or not
-     * @return
-     *         true if the Option is defined (of type Some)
-     *         false if the Option is not defined (of type None)
-     */
-    public abstract boolean isDefined();
-
-    /**
-     * Get the value of the Option (if it is defined)
-     * @return the value
-     * @throws IllegalStateException if called on a None
-     */
-    public abstract T get();
-
-    /**
-     * Get the contained value (if defined) or else return a default value
-     * @param other what to return if the value is not defined (a None)
-     * @return either the value, or other if the value is not defined
-     */
-    public T or(T other) {
-        if (isDefined()) {
-            return get();
-        } else {
-            return other;
-        }
-    }
-    /**
-     * The None type, representing an absent value (instead of "null")
-     */
-    public static class None<T> extends Option<T> {
-        public boolean isDefined() {
-            return false;
-        }
-
-        public T get() {
-            throw new IllegalStateException("Cannot call get() on None");
-        }
-
-        public String toString() {
-            return "None";
-        }
-    }
-
-    /**
-     * The Some type, representing an existence of some value
-     * @param <T> The type of value
-     */
-    public static class Some<T> extends Option<T> {
-        private final T value;
-        public Some(T value) {
-            this.value = value;
-        }
-
-        public boolean isDefined() {
-            return true;
-        }
-
-        public T get() {
-            return value;
-        }
-
-        public String toString() {
-            return "Some("+value.toString()+")";
-        }
-    }
-
-    /**
-     * Wraps value in an Option type, depending on whether or not value is null
-     * @param value
-     * @param <T> type of value
-     * @return Some(value) if value is not null, None if value is null
-     */
-    public static <T> Option<T> fromNullable(T value) {
-        if (value != null) {
-            return new Some<T>(value);
-        } else {
-            return new None<T>();
-        }
-    }
-
-    /**
-     * Wrap value in a Some type (NB! value must not be null!)
-     * @param value
-     * @param <T> type of value
-     * @return a new Some(value)
-     */
-    public static <T> Some<T> some(T value) {
-        return new Some<T>(value);
-    }
-
-    public static <T> None<T> none() {
-        return new None<T>();
-    }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/ProcessFunction.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/ProcessFunction.java
deleted file mode 100644
index 992e859..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/ProcessFunction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * 
- */
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TMessage;
-import org.apache.thrift.protocol.TMessageType;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class ProcessFunction<I, T extends TBase> {
-  private final String methodName;
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(ProcessFunction.class.getName());
-
-  public ProcessFunction(String methodName) {
-    this.methodName = methodName;
-  }
-
-  public final void process(int seqid, TProtocol iprot, TProtocol oprot, I iface) throws TException {
-    T args = getEmptyArgsInstance();
-    try {
-      args.read(iprot);
-    } catch (TProtocolException e) {
-      iprot.readMessageEnd();
-      TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage());
-      oprot.writeMessageBegin(new TMessage(getMethodName(), TMessageType.EXCEPTION, seqid));
-      x.write(oprot);
-      oprot.writeMessageEnd();
-      oprot.getTransport().flush();
-      return;
-    }
-    iprot.readMessageEnd();
-    TBase result = null;
-
-    try {
-      result = getResult(iface, args);
-    } catch(TException tex) {
-      LOGGER.error("Internal error processing " + getMethodName(), tex);
-      if (!isOneway()) {
-        TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, 
-          "Internal error processing " + getMethodName());
-        oprot.writeMessageBegin(new TMessage(getMethodName(), TMessageType.EXCEPTION, seqid));
-        x.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
-      return;
-    }
-
-    if(!isOneway()) {
-      oprot.writeMessageBegin(new TMessage(getMethodName(), TMessageType.REPLY, seqid));
-      result.write(oprot);
-      oprot.writeMessageEnd();
-      oprot.getTransport().flush();
-    }
-  }
-
-  protected abstract boolean isOneway();
-
-  public abstract TBase getResult(I iface, T args) throws TException;
-
-  public abstract T getEmptyArgsInstance();
-
-  public String getMethodName() {
-    return methodName;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/ShortStack.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/ShortStack.java
deleted file mode 100644
index 4957d1c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/ShortStack.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-/**
- * ShortStack is a short-specific Stack implementation written for the express
- * purpose of very fast operations on TCompactProtocol's field id stack. This
- * implementation performs at least 10x faster than java.util.Stack.
- */
-public class ShortStack {
-
-  private short[] vector;
-  private int top = -1;
-
-  public ShortStack(int initialCapacity) {
-    vector = new short[initialCapacity];
-  }
-
-  public short pop() {
-    return vector[top--];
-  }
-
-  public void push(short pushed) {
-    if (vector.length == top + 1) {
-      grow();
-    }
-    vector[++top] = pushed;
-  }
-
-  private void grow() {
-    short[] newVector = new short[vector.length * 2];
-    System.arraycopy(vector, 0, newVector, 0, vector.length);
-    vector = newVector;
-  }
-
-  public short peek() {
-    return vector[top];
-  }
-
-  public void clear() {
-    top = -1;
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("<ShortStack vector:[");
-    for (int i = 0; i < vector.length; i++) {
-      if (i != 0) {
-        sb.append(" ");
-      }
-
-      if (i == top) {
-        sb.append(">>");
-      }
-
-      sb.append(vector[i]);
-
-      if (i == top) {
-        sb.append("<<");
-      }
-    }
-    sb.append("]>");
-    return sb.toString();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TApplicationException.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TApplicationException.java
deleted file mode 100644
index 4d693d9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TApplicationException.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TField;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolUtil;
-import org.apache.thrift.protocol.TStruct;
-import org.apache.thrift.protocol.TType;
-
-/**
- * Application level exception
- *
- */
-public class TApplicationException extends TException implements TSerializable {
-
-  private static final TStruct TAPPLICATION_EXCEPTION_STRUCT = new TStruct("TApplicationException");
-  private static final TField MESSAGE_FIELD = new TField("message", TType.STRING, (short)1);
-  private static final TField TYPE_FIELD = new TField("type", TType.I32, (short)2);
-
-  private static final long serialVersionUID = 1L;
-
-  public static final int UNKNOWN = 0;
-  public static final int UNKNOWN_METHOD = 1;
-  public static final int INVALID_MESSAGE_TYPE = 2;
-  public static final int WRONG_METHOD_NAME = 3;
-  public static final int BAD_SEQUENCE_ID = 4;
-  public static final int MISSING_RESULT = 5;
-  public static final int INTERNAL_ERROR = 6;
-  public static final int PROTOCOL_ERROR = 7;
-  public static final int INVALID_TRANSFORM = 8;
-  public static final int INVALID_PROTOCOL = 9;
-  public static final int UNSUPPORTED_CLIENT_TYPE = 10;
-
-  protected int type_ = UNKNOWN;
-  private String message_ = null;
-
-  public TApplicationException() {
-    super();
-  }
-
-  public TApplicationException(int type) {
-    super();
-    type_ = type;
-  }
-
-  public TApplicationException(int type, String message) {
-    super(message);
-    type_ = type;
-  }
-
-  public TApplicationException(String message) {
-    super(message);
-  }
-
-  public int getType() {
-    return type_;
-  }
-
-  @Override
-  public String getMessage() {
-    if (message_ == null) {
-      return super.getMessage();
-    }
-    else {
-      return message_;
-    }
-  }
-
-  public void read(TProtocol iprot) throws TException
-  {
-    TField field;
-    iprot.readStructBegin();
-
-    String message = null;
-    int type = UNKNOWN;
-
-    while (true) {
-      field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) {
-        break;
-      }
-      switch (field.id) {
-        case 1:
-          if (field.type == TType.STRING) {
-            message = iprot.readString();
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2:
-          if (field.type == TType.I32) {
-            type = iprot.readI32();
-          } else {
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-    type_ = type;
-    message_ = message;
-  }
-
-  /**
-   * Convenience factory method for constructing a TApplicationException given a TProtocol input
-   */
-  public static TApplicationException readFrom(TProtocol iprot) throws TException
-  {
-    TApplicationException result = new TApplicationException();
-    result.read(iprot);
-    return result;
-  }
-
-  public void write(TProtocol oprot) throws TException
-  {
-    oprot.writeStructBegin(TAPPLICATION_EXCEPTION_STRUCT);
-    if (getMessage() != null) {
-      oprot.writeFieldBegin(MESSAGE_FIELD);
-      oprot.writeString(getMessage());
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldBegin(TYPE_FIELD);
-    oprot.writeI32(type_);
-    oprot.writeFieldEnd();
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TAsyncProcessor.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TAsyncProcessor.java
deleted file mode 100644
index 0a069ea..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TAsyncProcessor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.*;
-
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collections;
-import java.util.Map;
-
-public interface TAsyncProcessor {
-    /**
-     * Implementations must call fb.responseReady() once processing is complete
-     */
-    public boolean process(final AsyncFrameBuffer fb) throws TException;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBase.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBase.java
deleted file mode 100644
index e1489d5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBase.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.io.Serializable;
-
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * Generic base interface for generated Thrift objects.
- *
- */
-public interface TBase<T extends TBase<T,F>, F extends TFieldIdEnum> extends Comparable<T>,  TSerializable, Serializable {
-
-  /**
-   * Get the F instance that corresponds to fieldId.
-   */
-  public F fieldForId(int fieldId);
-
-  /**
-   * Check if a field is currently set or unset.
-   *
-   * @param field
-   */
-  public boolean isSet(F field);
-
-  /**
-   * Get a field's value by field variable. Primitive types will be wrapped in
-   * the appropriate "boxed" types.
-   *
-   * @param field
-   */
-  public Object getFieldValue(F field);
-
-  /**
-   * Set a field's value by field variable. Primitive types must be "boxed" in
-   * the appropriate object wrapper type.
-   *
-   * @param field
-   */
-  public void setFieldValue(F field, Object value);
-
-  public T deepCopy();
-
-  /**
-   * Return to the state of having just been initialized, as though you had just
-   * called the default constructor.
-   */
-  public void clear();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseAsyncProcessor.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseAsyncProcessor.java
deleted file mode 100644
index 9459c1a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseAsyncProcessor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.async.AsyncMethodCallback;
-
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collections;
-import java.util.Map;
-
-public class TBaseAsyncProcessor<I> implements TAsyncProcessor, TProcessor {
-    protected final Logger LOGGER = LoggerFactory.getLogger(getClass().getName());
-
-    final I iface;
-    final Map<String,AsyncProcessFunction<I, ? extends TBase,?>> processMap;
-
-    public TBaseAsyncProcessor(I iface, Map<String, AsyncProcessFunction<I, ? extends TBase,?>> processMap) {
-        this.iface = iface;
-        this.processMap = processMap;
-    }
-
-    public Map<String,AsyncProcessFunction<I, ? extends TBase,?>> getProcessMapView() {
-        return Collections.unmodifiableMap(processMap);
-    }
-
-    public boolean process(final AsyncFrameBuffer fb) throws TException {
-
-        final TProtocol in = fb.getInputProtocol();
-        final TProtocol out = fb.getOutputProtocol();
-
-        //Find processing function
-        final TMessage msg = in.readMessageBegin();
-        AsyncProcessFunction fn = processMap.get(msg.name);
-        if (fn == null) {
-            TProtocolUtil.skip(in, TType.STRUCT);
-            in.readMessageEnd();
-            if (!fn.isOneway()) {
-              TApplicationException x = new TApplicationException(TApplicationException.UNKNOWN_METHOD, "Invalid method name: '"+msg.name+"'");
-              out.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));
-              x.write(out);
-              out.writeMessageEnd();
-              out.getTransport().flush();
-            }
-            fb.responseReady();
-            return true;
-        }
-
-        //Get Args
-        TBase args = fn.getEmptyArgsInstance();
-
-        try {
-            args.read(in);
-        } catch (TProtocolException e) {
-            in.readMessageEnd();
-            if (!fn.isOneway()) {
-              TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage());
-              out.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));
-              x.write(out);
-              out.writeMessageEnd();
-              out.getTransport().flush();
-            }
-            fb.responseReady();
-            return true;
-        }
-        in.readMessageEnd();
-
-        if (fn.isOneway()) {
-          fb.responseReady();
-        }
-
-        //start off processing function
-        AsyncMethodCallback resultHandler = fn.getResultHandler(fb, msg.seqid);
-        try {
-          fn.start(iface, args, resultHandler);
-        } catch (Exception e) {
-          resultHandler.onError(e);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean process(TProtocol in, TProtocol out) throws TException {
-        return false;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseHelper.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseHelper.java
deleted file mode 100644
index 559df33..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseHelper.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.thrift;
-
-import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.Collection;
-
-public final class TBaseHelper {
-
-  private TBaseHelper(){}
-
-  private static final Comparator comparator = new NestedStructureComparator();
-
-  public static int compareTo(Object o1, Object o2) {
-    if (o1 instanceof Comparable) {
-      return compareTo((Comparable)o1, (Comparable)o2);
-    } else if (o1 instanceof List) {
-      return compareTo((List)o1, (List)o2);
-    } else if (o1 instanceof Set) {
-      return compareTo((Set)o1, (Set)o2);
-    } else if (o1 instanceof Map) {
-      return compareTo((Map)o1, (Map)o2);
-    } else if (o1 instanceof byte[]) {
-      return compareTo((byte[])o1, (byte[])o2);
-    } else {
-      throw new IllegalArgumentException("Cannot compare objects of type " + o1.getClass());
-    }
-  }
-
-  public static int compareTo(boolean a, boolean b) {
-    return Boolean.valueOf(a).compareTo(b);
-  }
-
-  public static int compareTo(byte a, byte b) {
-    if (a < b) {
-      return -1;
-    } else if (b < a) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  public static int compareTo(short a, short b) {
-    if (a < b) {
-      return -1;
-    } else if (b < a) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  public static int compareTo(int a, int b) {
-    if (a < b) {
-      return -1;
-    } else if (b < a) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  public static int compareTo(long a, long b) {
-    if (a < b) {
-      return -1;
-    } else if (b < a) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  public static int compareTo(double a, double b) {
-    if (a < b) {
-      return -1;
-    } else if (b < a) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  public static int compareTo(String a, String b) {
-    return a.compareTo(b);
-  }
-
-  public static int compareTo(byte[] a, byte[] b) {
-    int sizeCompare = compareTo(a.length, b.length);
-    if (sizeCompare != 0) {
-      return sizeCompare;
-    }
-    for (int i = 0; i < a.length; i++) {
-      int byteCompare = compareTo(a[i], b[i]);
-      if (byteCompare != 0) {
-        return byteCompare;
-      }
-    }
-    return 0;
-  }
-
-  public static int compareTo(Comparable a, Comparable b) {
-    return a.compareTo(b);
-  }
-
-  public static int compareTo(List a, List b) {
-    int lastComparison = compareTo(a.size(), b.size());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    for (int i = 0; i < a.size(); i++) {
-      lastComparison = comparator.compare(a.get(i), b.get(i));
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public static int compareTo(Set a, Set b) {
-    int lastComparison = compareTo(a.size(), b.size());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    SortedSet sortedA = new TreeSet(comparator);
-    sortedA.addAll(a);
-    SortedSet sortedB = new TreeSet(comparator);
-    sortedB.addAll(b);
-
-    Iterator iterA = sortedA.iterator();
-    Iterator iterB = sortedB.iterator();
-
-    // Compare each item.
-    while (iterA.hasNext() && iterB.hasNext()) {
-      lastComparison = comparator.compare(iterA.next(), iterB.next());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-
-    return 0;
-  }
-
-  public static int compareTo(Map a, Map b) {
-    int lastComparison = compareTo(a.size(), b.size());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-
-    // Sort a and b so we can compare them.
-    SortedMap sortedA = new TreeMap(comparator);
-    sortedA.putAll(a);
-    Iterator<Map.Entry> iterA = sortedA.entrySet().iterator();
-    SortedMap sortedB = new TreeMap(comparator);
-    sortedB.putAll(b);
-    Iterator<Map.Entry> iterB = sortedB.entrySet().iterator();
-
-    // Compare each item.
-    while (iterA.hasNext() && iterB.hasNext()) {
-      Map.Entry entryA = iterA.next();
-      Map.Entry entryB = iterB.next();
-      lastComparison = comparator.compare(entryA.getKey(), entryB.getKey());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      lastComparison = comparator.compare(entryA.getValue(), entryB.getValue());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-
-    return 0;
-  }
-
-  /**
-   * Comparator to compare items inside a structure (e.g. a list, set, or map).
-   */
-  private static class NestedStructureComparator implements Comparator, Serializable {
-    public int compare(Object oA, Object oB) {
-      if (oA == null && oB == null) {
-        return 0;
-      } else if (oA == null) {
-        return -1;
-      } else if (oB == null) {
-        return 1;
-      } else if (oA instanceof List) {
-        return compareTo((List)oA, (List)oB);
-      } else if (oA instanceof Set) {
-        return compareTo((Set)oA, (Set)oB);
-      } else if (oA instanceof Map) {
-        return compareTo((Map)oA, (Map)oB);
-      } else if (oA instanceof byte[]) {
-        return compareTo((byte[])oA, (byte[])oB);
-      } else {
-        return compareTo((Comparable)oA, (Comparable)oB);
-      }
-    }
-  }
-
-  public static void toString(Collection<ByteBuffer> bbs, StringBuilder sb) {
-    Iterator<ByteBuffer> it = bbs.iterator();
-    if (!it.hasNext()) {
-      sb.append("[]");
-    } else {
-      sb.append("[");
-      while (true) {
-        ByteBuffer bb = it.next();
-        org.apache.thrift.TBaseHelper.toString(bb, sb);
-        if (!it.hasNext()) {
-          sb.append("]");
-          return;
-        } else {
-          sb.append(", ");
-        }
-      }
-    }
-  }
-
-  public static void toString(ByteBuffer bb, StringBuilder sb) {
-    byte[] buf = bb.array();
-
-    int arrayOffset = bb.arrayOffset();
-    int offset = arrayOffset + bb.position();
-    int origLimit = arrayOffset + bb.limit();
-    int limit = (origLimit - offset > 128) ? offset + 128 : origLimit;
-
-    for (int i = offset; i < limit; i++) {
-      if (i > offset) {
-        sb.append(" ");
-      }
-      sb.append(paddedByteString(buf[i]));
-    }
-    if (origLimit != limit) {
-      sb.append("...");
-    }
-  }
-
-  public static String paddedByteString(byte b) {
-    int extended = (b | 0x100) & 0x1ff;
-    return Integer.toHexString(extended).toUpperCase().substring(1);
-  }
-
-  public static byte[] byteBufferToByteArray(ByteBuffer byteBuffer) {
-    if (wrapsFullArray(byteBuffer)) {
-      return byteBuffer.array();
-    }
-    byte[] target = new byte[byteBuffer.remaining()];
-    byteBufferToByteArray(byteBuffer, target, 0);
-    return target;
-  }
-
-  public static boolean wrapsFullArray(ByteBuffer byteBuffer) {
-    return byteBuffer.hasArray()
-      && byteBuffer.position() == 0
-      && byteBuffer.arrayOffset() == 0
-      && byteBuffer.remaining() == byteBuffer.capacity();
-  }
-
-  public static int byteBufferToByteArray(ByteBuffer byteBuffer, byte[] target, int offset) {
-    int remaining = byteBuffer.remaining();
-    System.arraycopy(byteBuffer.array(),
-        byteBuffer.arrayOffset() + byteBuffer.position(),
-        target,
-        offset,
-        remaining);
-    return remaining;
-  }
-
-  public static ByteBuffer rightSize(ByteBuffer in) {
-    if (in == null) {
-      return null;
-    }
-    if (wrapsFullArray(in)) {
-      return in;
-    }
-    return ByteBuffer.wrap(byteBufferToByteArray(in));
-  }
-
-  public static ByteBuffer copyBinary(final ByteBuffer orig) {
-    if (orig == null) {
-      return null;
-    }
-    ByteBuffer copy = ByteBuffer.wrap(new byte[orig.remaining()]);
-    if (orig.hasArray()) {
-      System.arraycopy(orig.array(), orig.arrayOffset() + orig.position(), copy.array(), 0, orig.remaining());
-    } else {
-      orig.slice().get(copy.array());
-    }
-
-    return copy;
-  }
-
-  public static byte[] copyBinary(final byte[] orig) {
-    if (orig == null) {
-      return null;
-    }
-
-    byte[] copy = new byte[orig.length];
-    System.arraycopy(orig, 0, copy, 0, orig.length);
-    return copy;
-  }
-
-  public static int hashCode(long value) {
-    int low = (int) value;
-    int high = (int) (value >>> 32);
-    return high * 127 + low;
-  }
-
-  public static int hashCode(double value) {
-    return hashCode(Double.doubleToRawLongBits(value));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseProcessor.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseProcessor.java
deleted file mode 100644
index f9a9a9e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TBaseProcessor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.thrift;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.thrift.protocol.TMessage;
-import org.apache.thrift.protocol.TMessageType;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolUtil;
-import org.apache.thrift.protocol.TType;
-
-public abstract class TBaseProcessor<I> implements TProcessor {
-  private final I iface;
-  private final Map<String,ProcessFunction<I, ? extends TBase>> processMap;
-
-  protected TBaseProcessor(I iface, Map<String, ProcessFunction<I, ? extends TBase>> processFunctionMap) {
-    this.iface = iface;
-    this.processMap = processFunctionMap;
-  }
-
-  public Map<String,ProcessFunction<I, ? extends TBase>> getProcessMapView() {
-    return Collections.unmodifiableMap(processMap);
-  }
-
-  @Override
-  public boolean process(TProtocol in, TProtocol out) throws TException {
-    TMessage msg = in.readMessageBegin();
-    ProcessFunction fn = processMap.get(msg.name);
-    if (fn == null) {
-      TProtocolUtil.skip(in, TType.STRUCT);
-      in.readMessageEnd();
-      TApplicationException x = new TApplicationException(TApplicationException.UNKNOWN_METHOD, "Invalid method name: '"+msg.name+"'");
-      out.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid));
-      x.write(out);
-      out.writeMessageEnd();
-      out.getTransport().flush();
-      return true;
-    }
-    fn.process(msg.seqid, in, out, iface);
-    return true;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
deleted file mode 100644
index 1c37ecd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * Class that allows access to the underlying buf without doing deep
- * copies on it.
- *
- */
-public class TByteArrayOutputStream extends ByteArrayOutputStream {
-
-  private final int initialSize;
-
-  public TByteArrayOutputStream(int size) {
-    super(size);
-    this.initialSize = size;
-  }
-
-  public TByteArrayOutputStream() {
-    this(32);
-  }
-
-  public byte[] get() {
-    return buf;
-  }
-
-  public void reset() {
-    super.reset();
-    if (buf.length > initialSize) {
-      buf = new byte[initialSize];
-    }
-  }
-
-  public int len() {
-    return count;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TDeserializer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TDeserializer.java
deleted file mode 100644
index bf6c97c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TDeserializer.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TField;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.protocol.TProtocolUtil;
-import org.apache.thrift.protocol.TType;
-import org.apache.thrift.transport.TMemoryInputTransport;
-
-/**
- * Generic utility for easily deserializing objects from a byte array or Java
- * String.
- *
- */
-public class TDeserializer {
-  private final TProtocol protocol_;
-  private final TMemoryInputTransport trans_;
-
-  /**
-   * Create a new TDeserializer that uses the TBinaryProtocol by default.
-   */
-  public TDeserializer() {
-    this(new TBinaryProtocol.Factory());
-  }
-
-  /**
-   * Create a new TDeserializer. It will use the TProtocol specified by the
-   * factory that is passed in.
-   *
-   * @param protocolFactory Factory to create a protocol
-   */
-  public TDeserializer(TProtocolFactory protocolFactory) {
-    trans_ = new TMemoryInputTransport();
-    protocol_ = protocolFactory.getProtocol(trans_);
-  }
-
-  /**
-   * Deserialize the Thrift object from a byte array.
-   *
-   * @param base The object to read into
-   * @param bytes The array to read from
-   */
-  public void deserialize(TBase base, byte[] bytes) throws TException {
-      deserialize(base, bytes, 0, bytes.length);
-  }
-
-  /**
-   * Deserialize the Thrift object from a byte array.
-   *
-   * @param base The object to read into
-   * @param bytes The array to read from
-   * @param offset The offset into {@code bytes}
-   * @param length The length to read from {@code bytes}
-   */
-  public void deserialize(TBase base, byte[] bytes, int offset, int length) throws TException {
-    try {
-      trans_.reset(bytes, offset, length);
-      base.read(protocol_);
-    } finally {
-      trans_.clear();
-      protocol_.reset();
-    }
-  }
-
-  /**
-   * Deserialize the Thrift object from a Java string, using a specified
-   * character set for decoding.
-   *
-   * @param base The object to read into
-   * @param data The string to read from
-   * @param charset Valid JVM charset
-   */
-  public void deserialize(TBase base, String data, String charset) throws TException {
-    try {
-      deserialize(base, data.getBytes(charset));
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT ENCODING: " + charset);
-    } finally {
-      protocol_.reset();
-    }
-  }
-
-  /**
-   * Deserialize only a single Thrift object (addressed by recursively using field id)
-   * from a byte record.   
-   * @param tb The object to read into
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path tb
-   * @param fieldIdPathRest The rest FieldId's that define a path tb
-   * @throws TException 
-   */
-  public void partialDeserialize(TBase tb, byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    try {
-      if (locateField(bytes, fieldIdPathFirst, fieldIdPathRest) != null) {
-        // if this line is reached, iprot will be positioned at the start of tb.
-        tb.read(protocol_);
-      }      
-    } catch (Exception e) {
-      throw new TException(e);
-    } finally {
-      trans_.clear();
-      protocol_.reset();
-    }
-  }
-
-  /**
-   * Deserialize only a boolean field (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to a boolean field
-   * @param fieldIdPathRest The rest FieldId's that define a path to a boolean field
-   * @throws TException
-   */
-  public Boolean partialDeserializeBool(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    return (Boolean) partialDeserializeField(TType.BOOL, bytes, fieldIdPathFirst, fieldIdPathRest);
-  }
-
-  /**
-   * Deserialize only a byte field (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to a byte field
-   * @param fieldIdPathRest The rest FieldId's that define a path to a byte field
-   * @throws TException
-   */
-  public Byte partialDeserializeByte(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    return (Byte) partialDeserializeField(TType.BYTE, bytes, fieldIdPathFirst, fieldIdPathRest);
-  }
-
-  /**
-   * Deserialize only a double field (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to a double field
-   * @param fieldIdPathRest The rest FieldId's that define a path to a double field
-   * @throws TException
-   */
-  public Double partialDeserializeDouble(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    return (Double) partialDeserializeField(TType.DOUBLE, bytes, fieldIdPathFirst, fieldIdPathRest);
-  }
-
-  /**
-   * Deserialize only an i16 field (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to an i16 field
-   * @param fieldIdPathRest The rest FieldId's that define a path to an i16 field
-   * @throws TException
-   */
-  public Short partialDeserializeI16(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    return (Short) partialDeserializeField(TType.I16, bytes, fieldIdPathFirst, fieldIdPathRest);
-  }
-
-  /**
-   * Deserialize only an i32 field (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to an i32 field
-   * @param fieldIdPathRest The rest FieldId's that define a path to an i32 field
-   * @throws TException
-   */
-  public Integer partialDeserializeI32(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    return (Integer) partialDeserializeField(TType.I32, bytes, fieldIdPathFirst, fieldIdPathRest);
-  }
-
-  /**
-   * Deserialize only an i64 field (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to an i64 field
-   * @param fieldIdPathRest The rest FieldId's that define a path to an i64 field
-   * @throws TException
-   */
-  public Long partialDeserializeI64(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    return (Long) partialDeserializeField(TType.I64, bytes, fieldIdPathFirst, fieldIdPathRest);
-  }
-
-  /**
-   * Deserialize only a string field (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to a string field
-   * @param fieldIdPathRest The rest FieldId's that define a path to a string field
-   * @throws TException
-   */
-  public String partialDeserializeString(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    return (String) partialDeserializeField(TType.STRING, bytes, fieldIdPathFirst, fieldIdPathRest);
-  }
-
-  /**
-   * Deserialize only a binary field (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to a binary field
-   * @param fieldIdPathRest The rest FieldId's that define a path to a binary field
-   * @throws TException
-   */
-  public ByteBuffer partialDeserializeByteArray(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    // TType does not have binary, so we use the arbitrary num 100
-    return (ByteBuffer) partialDeserializeField((byte)100, bytes, fieldIdPathFirst, fieldIdPathRest);
-  }
-
-  /**
-   * Deserialize only the id of the field set in a TUnion (addressed by recursively using field id)
-   * from a byte record.
-   * @param bytes The serialized object to read from
-   * @param fieldIdPathFirst First of the FieldId's that define a path to a TUnion
-   * @param fieldIdPathRest The rest FieldId's that define a path to a TUnion
-   * @throws TException
-   */
-  public Short partialDeserializeSetFieldIdInUnion(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest)  throws TException {
-    try {
-      TField field = locateField(bytes, fieldIdPathFirst, fieldIdPathRest);
-      if (field != null){
-        protocol_.readStructBegin(); // The Union
-        return protocol_.readFieldBegin().id; // The field set in the union
-      }
-      return null;
-    } catch (Exception e) {
-      throw new TException(e);
-    } finally {
-      trans_.clear();
-      protocol_.reset();
-    }
-  }
-
-  private Object partialDeserializeField(byte ttype, byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    try {
-      TField field = locateField(bytes, fieldIdPathFirst, fieldIdPathRest);
-      if (field != null) {
-        // if this point is reached, iprot will be positioned at the start of the field.
-        switch(ttype){
-          case TType.BOOL:
-            if (field.type == TType.BOOL){
-              return protocol_.readBool();
-            }
-            break;
-          case TType.BYTE:
-            if (field.type == TType.BYTE) {
-              return protocol_.readByte();
-            }
-            break;
-          case TType.DOUBLE:
-            if (field.type == TType.DOUBLE) {
-              return protocol_.readDouble();
-            }
-            break;
-          case TType.I16:
-            if (field.type == TType.I16) {
-              return protocol_.readI16();
-            }
-            break;
-          case TType.I32:
-            if (field.type == TType.I32) {
-              return protocol_.readI32();
-            }
-            break;
-          case TType.I64:
-            if (field.type == TType.I64) {
-              return protocol_.readI64();
-            }
-            break;
-          case TType.STRING:
-            if (field.type == TType.STRING) {
-              return protocol_.readString();
-            }
-            break;
-          case 100: // hack to differentiate between string and binary
-            if (field.type == TType.STRING) {
-              return protocol_.readBinary();
-            }
-            break;
-        }
-      }
-      return null;
-    } catch (Exception e) {
-      throw new TException(e);
-    } finally {
-      trans_.clear();
-      protocol_.reset();
-    }
-  }
-
-  private TField locateField(byte[] bytes, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    trans_.reset(bytes);
-
-    TFieldIdEnum[] fieldIdPath= new TFieldIdEnum[fieldIdPathRest.length + 1];
-    fieldIdPath[0] = fieldIdPathFirst;
-    for (int i = 0; i < fieldIdPathRest.length; i++){
-      fieldIdPath[i + 1] = fieldIdPathRest[i];
-    }
-
-    // index into field ID path being currently searched for
-    int curPathIndex = 0;
-
-    // this will be the located field, or null if it is not located
-    TField field = null;
-
-    protocol_.readStructBegin();
-
-    while (curPathIndex < fieldIdPath.length) {
-      field = protocol_.readFieldBegin();
-      // we can stop searching if we either see a stop or we go past the field
-      // id we're looking for (since fields should now be serialized in asc
-      // order).
-      if (field.type == TType.STOP || field.id > fieldIdPath[curPathIndex].getThriftFieldId()) {
-        return null;
-      }
-
-      if (field.id != fieldIdPath[curPathIndex].getThriftFieldId()) {
-        // Not the field we're looking for. Skip field.
-        TProtocolUtil.skip(protocol_, field.type);
-        protocol_.readFieldEnd();
-      } else {
-        // This field is the next step in the path. Step into field.
-        curPathIndex++;
-        if (curPathIndex < fieldIdPath.length) {
-          protocol_.readStructBegin();
-        }
-      }
-    }
-    return field;
-  }
-
-  /**
-   * Deserialize the Thrift object from a Java string, using the default JVM
-   * charset encoding.
-   *
-   * @param base The object to read into
-   * @param data The string to read from
-   */
-  public void fromString(TBase base, String data) throws TException {
-    deserialize(base, data.getBytes());
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TEnum.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TEnum.java
deleted file mode 100644
index 325fdec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TEnum.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-public interface TEnum {
-  public int getValue();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TEnumHelper.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TEnumHelper.java
deleted file mode 100644
index c17d661..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TEnumHelper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.lang.InstantiationException;
-import java.lang.NoSuchMethodException;
-import java.lang.IllegalAccessException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Utility class with static methods for interacting with TEnum
- */
-public class TEnumHelper {
-
-  /**
-   * Given a TEnum class and integer value, this method will return
-   * the associated constant from the given TEnum class.
-   * This method MUST be modified should the name of the 'findByValue' method
-   * change.
-   *
-   * @param enumClass TEnum from which to return a matching constant.
-   * @param value Value for which to return the constant.
-   *
-   * @return The constant in 'enumClass' whose value is 'value' or null if
-   *         something went wrong.
-   */
-  public static TEnum getByValue(Class<? extends TEnum> enumClass, int value) {
-    try {
-      Method method = enumClass.getMethod("findByValue", int.class);
-      return (TEnum) method.invoke(null, value);
-    } catch (NoSuchMethodException nsme) {
-      return null;
-    } catch (IllegalAccessException iae) {
-      return null;
-    } catch (InvocationTargetException ite) {
-      return null;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TException.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TException.java
deleted file mode 100644
index f84f481..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-/**
- * Generic exception class for Thrift.
- *
- */
-public class TException extends Exception {
-
-  private static final long serialVersionUID = 1L;
-
-  public TException() {
-    super();
-  }
-
-  public TException(String message) {
-    super(message);
-  }
-
-  public TException(Throwable cause) {
-    super(cause);
-  }
-
-  public TException(String message, Throwable cause) {
-    super(message, cause);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TFieldIdEnum.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TFieldIdEnum.java
deleted file mode 100644
index 2956fba..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TFieldIdEnum.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-/**
- * Interface for all generated struct Fields objects.
- */
-public interface TFieldIdEnum {
-  /**
-   * Get the Thrift field id for the named field.
-   */
-  public short getThriftFieldId();
-
-  /**
-   * Get the field's name, exactly as in the IDL.
-   */
-  public String getFieldName();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TFieldRequirementType.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TFieldRequirementType.java
deleted file mode 100644
index 74bac4e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TFieldRequirementType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-/**
- * Requirement type constants.
- *
- */
-public final class TFieldRequirementType {
-  public static final byte REQUIRED  = 1;
-  public static final byte OPTIONAL = 2;
-  public static final byte DEFAULT = 3;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TMultiplexedProcessor.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TMultiplexedProcessor.java
deleted file mode 100644
index f6547ac..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TMultiplexedProcessor.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.*;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * <code>TMultiplexedProcessor</code> is a <code>TProcessor</code> allowing
- * a single <code>TServer</code> to provide multiple services.
- *
- * <p>To do so, you instantiate the processor and then register additional
- * processors with it, as shown in the following example:</p>
- *
- * <blockquote><code>
- *     TMultiplexedProcessor processor = new TMultiplexedProcessor();
- *
- *     processor.registerProcessor(
- *         "Calculator",
- *         new Calculator.Processor(new CalculatorHandler()));
- *
- *     processor.registerProcessor(
- *         "WeatherReport",
- *         new WeatherReport.Processor(new WeatherReportHandler()));
- *
- *     TServerTransport t = new TServerSocket(9090);
- *     TSimpleServer server = new TSimpleServer(processor, t);
- *
- *     server.serve();
- * </code></blockquote>
- */
-public class TMultiplexedProcessor implements TProcessor {
-
-    private final Map<String,TProcessor> SERVICE_PROCESSOR_MAP
-            = new HashMap<String,TProcessor>();
-
-    /**
-     * 'Register' a service with this <code>TMultiplexedProcessor</code>.  This
-     * allows us to broker requests to individual services by using the service
-     * name to select them at request time.
-     *
-     * @param serviceName Name of a service, has to be identical to the name
-     * declared in the Thrift IDL, e.g. "WeatherReport".
-     * @param processor Implementation of a service, usually referred to
-     * as "handlers", e.g. WeatherReportHandler implementing WeatherReport.Iface.
-     */
-    public void registerProcessor(String serviceName, TProcessor processor) {
-        SERVICE_PROCESSOR_MAP.put(serviceName, processor);
-    }
-
-    /**
-     * This implementation of <code>process</code> performs the following steps:
-     *
-     * <ol>
-     *     <li>Read the beginning of the message.</li>
-     *     <li>Extract the service name from the message.</li>
-     *     <li>Using the service name to locate the appropriate processor.</li>
-     *     <li>Dispatch to the processor, with a decorated instance of TProtocol
-     *         that allows readMessageBegin() to return the original TMessage.</li>
-     * </ol>
-     *  
-     * @throws TException If the message type is not CALL or ONEWAY, if
-     * the service name was not found in the message, or if the service
-     * name was not found in the service map.  You called {@link #registerProcessor(String, TProcessor) registerProcessor}
-     * during initialization, right? :)
-     */
-    public boolean process(TProtocol iprot, TProtocol oprot) throws TException {
-        /*
-            Use the actual underlying protocol (e.g. TBinaryProtocol) to read the
-            message header.  This pulls the message "off the wire", which we'll
-            deal with at the end of this method.
-        */
-        TMessage message = iprot.readMessageBegin();
-
-        if (message.type != TMessageType.CALL && message.type != TMessageType.ONEWAY) {
-            // TODO Apache Guys - Can the server ever get an EXCEPTION or REPLY?
-            // TODO Should we check for this here?
-            throw new TException("This should not have happened!?");
-        }
-
-        // Extract the service name
-        int index = message.name.indexOf(TMultiplexedProtocol.SEPARATOR);
-        if (index < 0) {
-            throw new TException("Service name not found in message name: " + message.name + ".  Did you " +
-                    "forget to use a TMultiplexProtocol in your client?");
-        }
-
-        // Create a new TMessage, something that can be consumed by any TProtocol
-        String serviceName = message.name.substring(0, index);
-        TProcessor actualProcessor = SERVICE_PROCESSOR_MAP.get(serviceName);
-        if (actualProcessor == null) {
-            throw new TException("Service name not found: " + serviceName + ".  Did you forget " +
-                    "to call registerProcessor()?");
-        }
-
-        // Create a new TMessage, removing the service name
-        TMessage standardMessage = new TMessage(
-                message.name.substring(serviceName.length()+TMultiplexedProtocol.SEPARATOR.length()),
-                message.type,
-                message.seqid
-        );
-
-        // Dispatch processing to the stored processor
-        return actualProcessor.process(new StoredMessageProtocol(iprot, standardMessage), oprot);
-    }
-
-    /**
-     *  Our goal was to work with any protocol.  In order to do that, we needed
-     *  to allow them to call readMessageBegin() and get a TMessage in exactly
-     *  the standard format, without the service name prepended to TMessage.name.
-     */
-    private static class StoredMessageProtocol extends TProtocolDecorator {
-        TMessage messageBegin;
-        public StoredMessageProtocol(TProtocol protocol, TMessage messageBegin) {
-            super(protocol);
-            this.messageBegin = messageBegin;
-        }
-        @Override
-        public TMessage readMessageBegin() throws TException {
-            return messageBegin;
-        }
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TNonblockingMultiFetchClient.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TNonblockingMultiFetchClient.java
deleted file mode 100644
index 382d978..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TNonblockingMultiFetchClient.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.thrift;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.SocketChannel;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-
-/**
- * This class uses a single thread to set up non-blocking sockets to a set
- * of remote servers (hostname and port pairs), and sends a same request to
- * all these servers. It then fetches responses from servers.
- *
- * Parameters:
- *   int maxRecvBufBytesPerServer - an upper limit for receive buffer size
- * per server (in byte). If a response from a server exceeds this limit, the
- * client will not allocate memory or read response data for it.
- *
- *   int fetchTimeoutSeconds - time limit for fetching responses from all
- * servers (in second). After the timeout, the fetch job is stopped and
- * available responses are returned.
- *
- *   ByteBuffer requestBuf - request message that is sent to all servers.
- *
- * Output:
- *   Responses are stored in an array of ByteBuffers. Index of elements in
- * this array corresponds to index of servers in the server list. Content in
- * a ByteBuffer may be in one of the following forms:
- *   1. First 4 bytes form an integer indicating length of following data,
- * then followed by the data.
- *   2. First 4 bytes form an integer indicating length of following data,
- * then followed by nothing - this happens when the response data size
- * exceeds maxRecvBufBytesPerServer, and the client will not read any
- * response data.
- *   3. No data in the ByteBuffer - this happens when the server does not
- * return any response within fetchTimeoutSeconds.
- *
- *   In some special cases (no servers are given, fetchTimeoutSeconds less
- * than or equal to 0, requestBuf is null), the return is null.
- *
- * Note:
- *   It assumes all remote servers are TNonblockingServers and use
- * TFramedTransport.
- *
- */
-public class TNonblockingMultiFetchClient {
-  
-  private static final Logger LOGGER = LoggerFactory.getLogger(
-    TNonblockingMultiFetchClient.class.getName()
-  );
-
-  // if the size of the response msg exceeds this limit (in byte), we will
-  // not read the msg
-  private int maxRecvBufBytesPerServer;
-
-  // time limit for fetching data from all servers (in second)
-  private int fetchTimeoutSeconds;
-
-  // store request that will be sent to servers  
-  private ByteBuffer requestBuf;
-  private ByteBuffer requestBufDuplication;
-
-  // a list of remote servers
-  private List<InetSocketAddress> servers;
-
-  // store fetch results
-  private TNonblockingMultiFetchStats stats;
-  private ByteBuffer[] recvBuf;
-
-  public TNonblockingMultiFetchClient(int maxRecvBufBytesPerServer,
-    int fetchTimeoutSeconds, ByteBuffer requestBuf,
-    List<InetSocketAddress> servers) {
-    this.maxRecvBufBytesPerServer = maxRecvBufBytesPerServer;
-    this.fetchTimeoutSeconds = fetchTimeoutSeconds;
-    this.requestBuf = requestBuf;
-    this.servers = servers;
-      
-    stats = new TNonblockingMultiFetchStats();
-    recvBuf = null;
-  }
-
-  public synchronized int getMaxRecvBufBytesPerServer() {
-    return maxRecvBufBytesPerServer;
-  }
-
-  public synchronized int getFetchTimeoutSeconds() {
-    return fetchTimeoutSeconds;
-  }
-
-  /**
-   * return a duplication of requestBuf, so that requestBuf will not
-   * be modified by others.
-   */
-  public synchronized ByteBuffer getRequestBuf() {
-    if (requestBuf == null) {
-      return null;
-    } else {
-      if (requestBufDuplication == null) {
-        requestBufDuplication = requestBuf.duplicate();
-      }
-      return requestBufDuplication;  
-    }
-  }
-
-  public synchronized List<InetSocketAddress> getServerList() {
-    if (servers == null) {
-      return null;
-    }
-    return Collections.unmodifiableList(servers);
-  }
-
-  public synchronized TNonblockingMultiFetchStats getFetchStats() {
-    return stats;
-  }
-
-  /**
-   * main entry function for fetching from servers
-   */
-  public synchronized ByteBuffer[] fetch() {
-    // clear previous results
-    recvBuf = null;
-    stats.clear();
-
-    if (servers == null || servers.size() == 0 ||
-        requestBuf == null || fetchTimeoutSeconds <= 0) {
-      return recvBuf;
-    }
-
-    ExecutorService executor = Executors.newSingleThreadExecutor();
-    MultiFetch multiFetch = new MultiFetch();
-    FutureTask<?> task = new FutureTask(multiFetch, null);
-    executor.execute(task);
-    try {
-      task.get(fetchTimeoutSeconds, TimeUnit.SECONDS);
-    } catch(InterruptedException ie) {
-      // attempt to cancel execution of the task.
-      task.cancel(true);
-      LOGGER.error("interrupted during fetch: "+ie.toString());
-    } catch(ExecutionException ee) {
-      // attempt to cancel execution of the task.
-      task.cancel(true);
-      LOGGER.error("exception during fetch: "+ee.toString());
-    } catch(TimeoutException te) {
-      // attempt to cancel execution of the task.  
-      task.cancel(true);
-      LOGGER.error("timeout for fetch: "+te.toString());
-    }
-
-    executor.shutdownNow();
-    multiFetch.close();
-    return recvBuf;
-  }
-
-  /**
-   * Private class that does real fetch job.
-   * Users are not allowed to directly use this class, as its run()
-   * function may run forever.
-   */
-  private class MultiFetch implements Runnable {
-    private Selector selector;
-
-    /**
-     * main entry function for fetching.
-     *
-     * Server responses are stored in TNonblocingMultiFetchClient.recvBuf,
-     * and fetch statistics is in TNonblockingMultiFetchClient.stats.
-     *
-     * Sanity check for parameters has been done in
-     * TNonblockingMultiFetchClient before calling this function.
-     */
-    public void run() {
-      long t1 = System.currentTimeMillis();
-
-      int numTotalServers = servers.size();
-      stats.setNumTotalServers(numTotalServers);
-
-      // buffer for receiving response from servers
-      recvBuf                     = new ByteBuffer[numTotalServers];
-      // buffer for sending request
-      ByteBuffer sendBuf[]        = new ByteBuffer[numTotalServers];
-      long numBytesRead[]         = new long[numTotalServers];
-      int frameSize[]             = new int[numTotalServers];
-      boolean hasReadFrameSize[]  = new boolean[numTotalServers];
-
-      try {
-        selector = Selector.open();
-      } catch (IOException e) {
-        LOGGER.error("selector opens error: "+e.toString());
-        return;
-      }
-
-      for (int i = 0; i < numTotalServers; i++) {
-        // create buffer to send request to server.
-        sendBuf[i] = requestBuf.duplicate();
-        // create buffer to read response's frame size from server
-        recvBuf[i] = ByteBuffer.allocate(4);
-        stats.incTotalRecvBufBytes(4);
-
-        InetSocketAddress server = servers.get(i);
-        SocketChannel s = null;
-        SelectionKey key = null;
-        try {
-          s = SocketChannel.open();
-          s.configureBlocking(false);
-          // now this method is non-blocking
-          s.connect(server);
-          key = s.register(selector, s.validOps());
-          // attach index of the key
-          key.attach(i);
-        } catch (Exception e) {
-          stats.incNumConnectErrorServers();  
-          String err = String.format("set up socket to server %s error: %s",
-            server.toString(), e.toString());
-          LOGGER.error(err);
-          // free resource
-          if (s != null) {
-            try {s.close();} catch (Exception ex) {}
-          }            
-          if (key != null) {
-             key.cancel();
-          }
-        }
-      }
-
-      // wait for events
-      while (stats.getNumReadCompletedServers() +
-        stats.getNumConnectErrorServers() < stats.getNumTotalServers()) {
-        // if the thread is interrupted (e.g., task is cancelled)  
-        if (Thread.currentThread().isInterrupted()) {
-          return;
-        }
-
-        try{
-          selector.select();
-        } catch (Exception e) {
-          LOGGER.error("selector selects error: "+e.toString());
-          continue;
-        }
-
-        Iterator<SelectionKey> it = selector.selectedKeys().iterator();
-        while (it.hasNext()) {
-          SelectionKey selKey = it.next();
-          it.remove();
-
-          // get previously attached index
-          int index = (Integer)selKey.attachment();
-
-          if (selKey.isValid() && selKey.isConnectable()) {
-            // if this socket throws an exception (e.g., connection refused),
-            // print error msg and skip it.
-            try {
-              SocketChannel sChannel = (SocketChannel)selKey.channel();
-              sChannel.finishConnect();
-            } catch (Exception e) {
-              stats.incNumConnectErrorServers();
-              String err = String.format("socket %d connects to server %s " +
-                "error: %s",
-                index, servers.get(index).toString(), e.toString());
-              LOGGER.error(err);
-            }
-          }
-
-          if (selKey.isValid() && selKey.isWritable()) {
-            if (sendBuf[index].hasRemaining()) {
-              // if this socket throws an exception, print error msg and
-              // skip it.
-              try {
-                SocketChannel sChannel = (SocketChannel)selKey.channel();
-                sChannel.write(sendBuf[index]);
-              } catch (Exception e) {
-                String err = String.format("socket %d writes to server %s " +
-                  "error: %s",
-                  index, servers.get(index).toString(), e.toString());
-                LOGGER.error(err);
-              }
-            }
-          }
-
-          if (selKey.isValid() && selKey.isReadable()) {
-            // if this socket throws an exception, print error msg and
-            // skip it.
-            try {
-              SocketChannel sChannel = (SocketChannel)selKey.channel();
-              int bytesRead = sChannel.read(recvBuf[index]);
-
-              if (bytesRead > 0) {
-                numBytesRead[index] += bytesRead;
-
-                if (!hasReadFrameSize[index] &&
-                    recvBuf[index].remaining()==0) {
-                  // if the frame size has been read completely, then prepare
-                  // to read the actual frame.
-                  frameSize[index] = recvBuf[index].getInt(0);
-
-                  if (frameSize[index] <= 0) {
-                    stats.incNumInvalidFrameSize();
-                    String err = String.format("Read an invalid frame size %d"
-                      + " from %s. Does the server use TFramedTransport? ",
-                      frameSize[index], servers.get(index).toString());
-                    LOGGER.error(err);
-                    sChannel.close();
-                    continue;
-                  }
-
-                  if (frameSize[index] + 4 > stats.getMaxResponseBytes()) {
-                    stats.setMaxResponseBytes(frameSize[index]+4);
-                  }
-
-                  if (frameSize[index] + 4 > maxRecvBufBytesPerServer) {
-                    stats.incNumOverflowedRecvBuf();
-                    String err = String.format("Read frame size %d from %s,"
-                      + " total buffer size would exceed limit %d",
-                      frameSize[index], servers.get(index).toString(),
-                      maxRecvBufBytesPerServer);
-                    LOGGER.error(err);                      
-                    sChannel.close();
-                    continue;
-                  }
-
-                  // reallocate buffer for actual frame data
-                  recvBuf[index] = ByteBuffer.allocate(frameSize[index] + 4);
-                  recvBuf[index].putInt(frameSize[index]);
-
-                  stats.incTotalRecvBufBytes(frameSize[index]);
-                  hasReadFrameSize[index] = true;
-                }
-
-                if (hasReadFrameSize[index] &&
-                  numBytesRead[index] >= frameSize[index]+4) {
-                  // has read all data
-                  sChannel.close();
-                  stats.incNumReadCompletedServers();
-                  long t2 = System.currentTimeMillis();
-                  stats.setReadTime(t2-t1);
-                }
-              }
-            } catch (Exception e) {
-              String err = String.format("socket %d reads from server %s " +
-                "error: %s",
-                index, servers.get(index).toString(), e.toString());
-              LOGGER.error(err);
-            }
-          }
-        }
-      }
-    }
-
-    /**
-     * dispose any resource allocated
-     */
-    public void close() {
-      try {
-        if (selector.isOpen()) {
-          Iterator<SelectionKey> it = selector.keys().iterator();
-          while (it.hasNext()) {
-            SelectionKey selKey = it.next();
-            SocketChannel sChannel = (SocketChannel)selKey.channel();
-            sChannel.close();
-          }
-
-          selector.close();
-        }
-      } catch (IOException e) {
-        LOGGER.error("free resource error: "+e.toString());
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TNonblockingMultiFetchStats.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TNonblockingMultiFetchStats.java
deleted file mode 100644
index 90b8620..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TNonblockingMultiFetchStats.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.thrift;
-
-/**
- * This class keeps track of statistics for TNonblockinMultiFetchClient.
- */
-public class TNonblockingMultiFetchStats {
-  private int    numTotalServers;
-  private int    numReadCompletedServers;
-  private int    numConnectErrorServers;
-  private int    totalRecvBufBytes;
-  private int    maxResponseBytes;
-  private int    numOverflowedRecvBuf;
-  private int    numInvalidFrameSize;
-  // time from the beginning of fetch() function to the reading finish
-  // time of the last socket (in milli-second)
-  private long   readTime;
-
-  public TNonblockingMultiFetchStats() {
-    clear();
-  }
-
-  public void clear() {
-    numTotalServers = 0;
-    numReadCompletedServers = 0;
-    numConnectErrorServers = 0;
-    totalRecvBufBytes = 0;
-    maxResponseBytes = 0;
-    numOverflowedRecvBuf = 0;
-    numInvalidFrameSize = 0;
-    readTime = 0;
-  }
-
-  public String toString() {
-    String stats = String.format("numTotalServers=%d, " +
-      "numReadCompletedServers=%d, numConnectErrorServers=%d, " +
-      "numUnresponsiveServers=%d, totalRecvBufBytes=%fM, " +
-      "maxResponseBytes=%d, numOverflowedRecvBuf=%d, " +
-      "numInvalidFrameSize=%d, readTime=%dms",
-      numTotalServers, numReadCompletedServers, numConnectErrorServers,
-      (numTotalServers-numReadCompletedServers-numConnectErrorServers),
-      totalRecvBufBytes/1024.0/1024, maxResponseBytes, numOverflowedRecvBuf,
-      numInvalidFrameSize, readTime);
-    return stats;
-  }
-
-  public void setNumTotalServers(int val)    { numTotalServers = val; }
-  public void setMaxResponseBytes(int val)   { maxResponseBytes = val; }
-  public void setReadTime(long val)          { readTime = val; }
-  public void incNumReadCompletedServers()   { numReadCompletedServers++; }
-  public void incNumConnectErrorServers()    { numConnectErrorServers++; }
-  public void incNumOverflowedRecvBuf()      { numOverflowedRecvBuf++; }
-  public void incTotalRecvBufBytes(int val)  { totalRecvBufBytes += val; }
-  public void incNumInvalidFrameSize()       { numInvalidFrameSize++; }
-
-  public int getMaxResponseBytes()        { return maxResponseBytes; }
-  public int getNumReadCompletedServers() { return numReadCompletedServers; }
-  public int getNumConnectErrorServers()  { return numConnectErrorServers; }
-  public int getNumTotalServers()         { return numTotalServers; }
-  public int getNumOverflowedRecvBuf()    { return numOverflowedRecvBuf;}
-  public int getTotalRecvBufBytes()       { return totalRecvBufBytes;}
-  public int getNumInvalidFrameSize()     { return numInvalidFrameSize; }
-  public long getReadTime()               { return readTime; }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TProcessor.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TProcessor.java
deleted file mode 100644
index d79522c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TProcessor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * A processor is a generic object which operates upon an input stream and
- * writes to some output stream.
- *
- */
-public interface TProcessor {
-  public boolean process(TProtocol in, TProtocol out)
-    throws TException;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TProcessorFactory.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TProcessorFactory.java
deleted file mode 100644
index 81933a2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TProcessorFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.transport.TTransport;
-
-/**
- * The default processor factory just returns a singleton
- * instance.
- */
-public class TProcessorFactory {
-
-  private final TProcessor processor_;
-
-  public TProcessorFactory(TProcessor processor) {
-    processor_ = processor;
-  }
-
-  public TProcessor getProcessor(TTransport trans) {
-    return processor_;
-  }
-
-  public boolean isAsyncProcessor() {
-      return processor_ instanceof TAsyncProcessor;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TSerializable.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TSerializable.java
deleted file mode 100644
index 80002c7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TSerializable.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * Generic base interface for generated Thrift objects.
- *
- */
-public interface TSerializable {
-
-  /**
-   * Reads the TObject from the given input protocol.
-   *
-   * @param iprot Input protocol
-   */
-  public void read(TProtocol iprot) throws TException;
-
-  /**
-   * Writes the objects out to the protocol
-   *
-   * @param oprot Output protocol
-   */
-  public void write(TProtocol oprot) throws TException;
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TSerializer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TSerializer.java
deleted file mode 100644
index 4e1ce61..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TSerializer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TIOStreamTransport;
-
-/**
- * Generic utility for easily serializing objects into a byte array or Java
- * String.
- *
- */
-public class TSerializer {
-
-  /**
-   * This is the byte array that data is actually serialized into
-   */
-  private final ByteArrayOutputStream baos_ = new ByteArrayOutputStream();
-
-  /**
-   * This transport wraps that byte array
-   */
-  private final TIOStreamTransport transport_ = new TIOStreamTransport(baos_);
-
-  /**
-   * Internal protocol used for serializing objects.
-   */
-  private TProtocol protocol_;
-
-  /**
-   * Create a new TSerializer that uses the TBinaryProtocol by default.
-   */
-  public TSerializer() {
-    this(new TBinaryProtocol.Factory());
-  }
-
-  /**
-   * Create a new TSerializer. It will use the TProtocol specified by the
-   * factory that is passed in.
-   *
-   * @param protocolFactory Factory to create a protocol
-   */
-  public TSerializer(TProtocolFactory protocolFactory) {
-    protocol_ = protocolFactory.getProtocol(transport_);
-  }
-
-  /**
-   * Serialize the Thrift object into a byte array. The process is simple,
-   * just clear the byte array output, write the object into it, and grab the
-   * raw bytes.
-   *
-   * @param base The object to serialize
-   * @return Serialized object in byte[] format
-   */
-  public byte[] serialize(TBase base) throws TException {
-    baos_.reset();
-    base.write(protocol_);
-    return baos_.toByteArray();
-  }
-
-  /**
-   * Serialize the Thrift object into a Java string, using a specified
-   * character set for encoding.
-   *
-   * @param base The object to serialize
-   * @param charset Valid JVM charset
-   * @return Serialized object as a String
-   */
-  public String toString(TBase base, String charset) throws TException {
-    try {
-      return new String(serialize(base), charset);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT ENCODING: " + charset);
-    }
-  }
-
-  /**
-   * Serialize the Thrift object into a Java string, using the default JVM
-   * charset encoding.
-   *
-   * @param base The object to serialize
-   * @return Serialized object as a String
-   */
-  public String toString(TBase base) throws TException {
-    return new String(serialize(base));
-  }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TServiceClient.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TServiceClient.java
deleted file mode 100644
index 6619b9c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TServiceClient.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TMessage;
-import org.apache.thrift.protocol.TMessageType;
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * A TServiceClient is used to communicate with a TService implementation
- * across protocols and transports.
- */
-public abstract class TServiceClient {
-  public TServiceClient(TProtocol prot) {
-    this(prot, prot);
-  }
-
-  public TServiceClient(TProtocol iprot, TProtocol oprot) {
-    iprot_ = iprot;
-    oprot_ = oprot;
-  }
-
-  protected TProtocol iprot_;
-  protected TProtocol oprot_;
-
-  protected int seqid_;
-
-  /**
-   * Get the TProtocol being used as the input (read) protocol.
-   * @return the TProtocol being used as the input (read) protocol.
-   */
-  public TProtocol getInputProtocol() {
-    return this.iprot_;
-  }
-
-  /**
-   * Get the TProtocol being used as the output (write) protocol.
-   * @return the TProtocol being used as the output (write) protocol.
-   */
-  public TProtocol getOutputProtocol() {
-    return this.oprot_;
-  }
-
-  protected void sendBase(String methodName, TBase<?,?> args) throws TException {
-    sendBase(methodName, args, TMessageType.CALL);
-  }
-
-  protected void sendBaseOneway(String methodName, TBase<?,?> args) throws TException {
-    sendBase(methodName, args, TMessageType.ONEWAY);
-  }
-
-  private void sendBase(String methodName, TBase<?,?> args, byte type) throws TException {
-    oprot_.writeMessageBegin(new TMessage(methodName, type, ++seqid_));
-    args.write(oprot_);
-    oprot_.writeMessageEnd();
-    oprot_.getTransport().flush();
-  }
-
-  protected void receiveBase(TBase<?,?> result, String methodName) throws TException {
-    TMessage msg = iprot_.readMessageBegin();
-    if (msg.type == TMessageType.EXCEPTION) {
-      TApplicationException x = new TApplicationException();
-      x.read(iprot_);
-      iprot_.readMessageEnd();
-      throw x;
-    }
-    System.out.format("Received %d%n", msg.seqid);
-    if (msg.seqid != seqid_) {
-      throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID,
-          String.format("%s failed: out of sequence response: expected %d but got %d", methodName, seqid_, msg.seqid));
-    }
-    result.read(iprot_);
-    iprot_.readMessageEnd();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TServiceClientFactory.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TServiceClientFactory.java
deleted file mode 100644
index 988e655..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TServiceClientFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * A TServiceClientFactory provides a general way to get a TServiceClient
- * connected to a remote TService via a protocol.
- * @param <T>
- */
-public interface TServiceClientFactory<T extends TServiceClient> {
-  /**
-   * Get a brand-new T using <i>prot</i> as both the input and output protocol.
-   * @param prot
-   * @return A brand-new T using <i>prot</i> as both the input and output protocol.
-   */
-  public T getClient(TProtocol prot);
-
-  /**
-   * Get a brand new T using the specified input and output protocols. The
-   * input and output protocols may be the same instance.
-   * @param iprot
-   * @param oprot
-   * @return a brand new T using the specified input and output protocols
-   */
-  public T getClient(TProtocol iprot, TProtocol oprot);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TUnion.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TUnion.java
deleted file mode 100644
index 13f9c67..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/TUnion.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.thrift;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.thrift.protocol.TField;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.protocol.TStruct;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-
-public abstract class TUnion<T extends TUnion<T,F>, F extends TFieldIdEnum> implements TBase<T, F> {
-
-  protected Object value_;
-  protected F setField_;
-
-  protected TUnion() {
-    setField_ = null;
-    value_ = null;
-  }
-  
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TUnionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TUnionTupleSchemeFactory());
-  }
-
-  protected TUnion(F setField, Object value) {
-    setFieldValue(setField, value);
-  }
-
-  protected TUnion(TUnion<T, F> other) {
-    if (!other.getClass().equals(this.getClass())) {
-      throw new ClassCastException();
-    }
-    setField_ = other.setField_;
-    value_ = deepCopyObject(other.value_);
-  }
-
-  private static Object deepCopyObject(Object o) {
-    if (o instanceof TBase) {
-      return ((TBase)o).deepCopy();
-    } else if (o instanceof ByteBuffer) {
-      return TBaseHelper.copyBinary((ByteBuffer)o);
-    } else if (o instanceof List) {
-      return deepCopyList((List)o);
-    } else if (o instanceof Set) {
-      return deepCopySet((Set)o);
-    } else if (o instanceof Map) {
-      return deepCopyMap((Map)o);
-    } else {
-      return o;
-    }
-  }
-
-  private static Map deepCopyMap(Map<Object, Object> map) {
-    Map copy = new HashMap();
-    for (Map.Entry<Object, Object> entry : map.entrySet()) {
-      copy.put(deepCopyObject(entry.getKey()), deepCopyObject(entry.getValue()));
-    }
-    return copy;
-  }
-
-  private static Set deepCopySet(Set set) {
-    Set copy = new HashSet();
-    for (Object o : set) {
-      copy.add(deepCopyObject(o));
-    }
-    return copy;
-  }
-
-  private static List deepCopyList(List list) {
-    List copy = new ArrayList(list.size());
-    for (Object o : list) {
-      copy.add(deepCopyObject(o));
-    }
-    return copy;
-  }
-
-  public F getSetField() {
-    return setField_;
-  }
-
-  public Object getFieldValue() {
-    return value_;
-  }
-
-  public Object getFieldValue(F fieldId) {
-    if (fieldId != setField_) {
-      throw new IllegalArgumentException("Cannot get the value of field " + fieldId + " because union's set field is " + setField_);
-    }
-
-    return getFieldValue();
-  }
-
-  public Object getFieldValue(int fieldId) {
-    return getFieldValue(enumForId((short)fieldId));
-  }
-
-  public boolean isSet() {
-    return setField_ != null;
-  }
-
-  public boolean isSet(F fieldId) {
-    return setField_ == fieldId;
-  }
-
-  public boolean isSet(int fieldId) {
-    return isSet(enumForId((short)fieldId));
-  }
-
-  public void read(TProtocol iprot) throws TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void setFieldValue(F fieldId, Object value) {
-    checkType(fieldId, value);
-    setField_ = fieldId;
-    value_ = value;
-  }
-
-  public void setFieldValue(int fieldId, Object value) {
-    setFieldValue(enumForId((short)fieldId), value);
-  }
-
-  public void write(TProtocol oprot) throws TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  /**
-   * Implementation should be generated so that we can efficiently type check 
-   * various values.
-   * @param setField
-   * @param value
-   */
-  protected abstract void checkType(F setField, Object value) throws ClassCastException;
-
-  /**
-   * Implementation should be generated to read the right stuff from the wire 
-   * based on the field header. 
-   * @param field
-   * @return read Object based on the field header, as specified by the argument.
-   */
-  protected abstract Object standardSchemeReadValue(TProtocol iprot, TField field) throws TException;
-  protected abstract void standardSchemeWriteValue(TProtocol oprot) throws TException;
-  
-  protected abstract Object tupleSchemeReadValue(TProtocol iprot, short fieldID) throws TException;
-  protected abstract void tupleSchemeWriteValue(TProtocol oprot) throws TException;
-
-  protected abstract TStruct getStructDesc();
-
-  protected abstract TField getFieldDesc(F setField);
-
-  protected abstract F enumForId(short id);
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("<");
-    sb.append(this.getClass().getSimpleName());
-    sb.append(" ");
-
-    if (getSetField() != null) {
-      Object v = getFieldValue();
-      sb.append(getFieldDesc(getSetField()).name);
-      sb.append(":");
-      if(v instanceof ByteBuffer) {
-        TBaseHelper.toString((ByteBuffer)v, sb);
-      } else {
-        sb.append(v.toString());
-      }
-    }
-    sb.append(">");
-    return sb.toString();
-  }
-
-  public final void clear() {
-    this.setField_ = null;
-    this.value_ = null;
-  }
-  
-  private static class TUnionStandardSchemeFactory implements SchemeFactory {
-    public TUnionStandardScheme getScheme() {
-      return new TUnionStandardScheme();
-    }
-  }
-  
-  private static class TUnionStandardScheme extends StandardScheme<TUnion> {
-
-    @Override
-    public void read(TProtocol iprot, TUnion struct) throws TException {
-      struct.setField_ = null;
-      struct.value_ = null;
-
-      iprot.readStructBegin();
-
-      TField field = iprot.readFieldBegin();
-
-      struct.value_ = struct.standardSchemeReadValue(iprot, field);
-      if (struct.value_ != null) {
-        struct.setField_ = struct.enumForId(field.id);
-      }
-
-      iprot.readFieldEnd();
-      // this is so that we will eat the stop byte. we could put a check here to
-      // make sure that it actually *is* the stop byte, but it's faster to do it
-      // this way.
-      iprot.readFieldBegin();
-      iprot.readStructEnd();
-    }
-
-    @Override
-    public void write(TProtocol oprot, TUnion struct) throws TException {
-      if (struct.getSetField() == null || struct.getFieldValue() == null) {
-        throw new TProtocolException("Cannot write a TUnion with no set value!");
-      }
-      oprot.writeStructBegin(struct.getStructDesc());
-      oprot.writeFieldBegin(struct.getFieldDesc(struct.setField_));
-      struct.standardSchemeWriteValue(oprot);
-      oprot.writeFieldEnd();
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-  }
-  
-  private static class TUnionTupleSchemeFactory implements SchemeFactory {
-    public TUnionTupleScheme getScheme() {
-      return new TUnionTupleScheme();
-    }
-  }
-  
-  private static class TUnionTupleScheme extends TupleScheme<TUnion> {
-
-    @Override
-    public void read(TProtocol iprot, TUnion struct) throws TException {
-      struct.setField_ = null;
-      struct.value_ = null;
-      short fieldID = iprot.readI16();
-      struct.value_ = struct.tupleSchemeReadValue(iprot, fieldID);
-      if (struct.value_ != null) {
-        struct.setField_ = struct.enumForId(fieldID);
-      }
-    }
-
-    @Override
-    public void write(TProtocol oprot, TUnion struct) throws TException {
-      if (struct.getSetField() == null || struct.getFieldValue() == null) {
-        throw new TProtocolException("Cannot write a TUnion with no set value!");
-      }
-      oprot.writeI16(struct.setField_.getThriftFieldId());
-      struct.tupleSchemeWriteValue(oprot);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/AsyncMethodCallback.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/AsyncMethodCallback.java
deleted file mode 100644
index 4ebde07..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/AsyncMethodCallback.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.async;
-
-/**
- * A handler interface asynchronous clients can implement to receive future
- * notice of the results of an asynchronous method call.
- *
- * @param <T> The return type of the asynchronously invoked method.
- */
-public interface AsyncMethodCallback<T> {
-  /**
-   * This method will be called when the remote side has completed invoking
-   * your method call and the result is fully read. For {@code oneway} method
-   * calls, this method will be called as soon as we have completed writing out
-   * the request.
-   *
-   * @param response The return value of the asynchronously invoked method;
-   *                 {@code null} for void methods which includes
-   *                 {@code oneway} methods.
-   */
-  void onComplete(T response);
-
-  /**
-   * This method will be called when there is either an unexpected client-side
-   * exception like an IOException or else when the remote method raises an
-   * exception, either declared in the IDL or due to an unexpected server-side
-   * error.
-   *
-   * @param exception The exception encountered processing the the asynchronous
-   *                  method call, may be a local exception or an unmarshalled
-   *                  remote exception.
-   */
-  void onError(Exception exception);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClient.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClient.java
deleted file mode 100644
index 005018a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClient.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.async;
-
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TNonblockingTransport;
-
-public abstract class TAsyncClient {
-  protected final TProtocolFactory ___protocolFactory;
-  protected final TNonblockingTransport ___transport;
-  protected final TAsyncClientManager ___manager;
-  protected TAsyncMethodCall ___currentMethod;
-  private Exception ___error;
-  private long ___timeout;
-
-  public TAsyncClient(TProtocolFactory protocolFactory, TAsyncClientManager manager, TNonblockingTransport transport) {
-    this(protocolFactory, manager, transport, 0);
-  }
-
-  public TAsyncClient(TProtocolFactory protocolFactory, TAsyncClientManager manager, TNonblockingTransport transport, long timeout) {
-    this.___protocolFactory = protocolFactory;
-    this.___manager = manager;
-    this.___transport = transport;
-    this.___timeout = timeout;
-  }
-
-  public TProtocolFactory getProtocolFactory() {
-    return ___protocolFactory;
-  }
-
-  public long getTimeout() {
-    return ___timeout;
-  }
-
-  public boolean hasTimeout() {
-    return ___timeout > 0;
-  }
-
-  public void setTimeout(long timeout) {
-    this.___timeout = timeout;
-  }
-
-  /**
-   * Is the client in an error state?
-   * @return If client in an error state?
-   */
-  public boolean hasError() {
-    return ___error != null;
-  }
-
-  /**
-   * Get the client's error - returns null if no error
-   * @return Get the client's error. <p> returns null if no error
-   */
-  public Exception getError() {
-    return ___error;
-  }
-
-  protected void checkReady() {
-    // Ensure we are not currently executing a method
-    if (___currentMethod != null) {
-      throw new IllegalStateException("Client is currently executing another method: " + ___currentMethod.getClass().getName());
-    }
-
-    // Ensure we're not in an error state
-    if (___error != null) {
-      throw new IllegalStateException("Client has an error!", ___error);
-    }
-  }
-
-  /**
-   * Called by delegate method when finished
-   */
-  protected void onComplete() {
-    ___currentMethod = null;
-  }
-
-  /**
-   * Called by delegate method on error
-   */
-  protected void onError(Exception exception) {
-    ___transport.close();
-    ___currentMethod = null;
-    ___error = exception;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClientFactory.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClientFactory.java
deleted file mode 100644
index 28feb73..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClientFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.async;
-
-import org.apache.thrift.transport.TNonblockingTransport;
-
-public interface TAsyncClientFactory<T extends TAsyncClient> {
-  public T getAsyncClient(TNonblockingTransport transport);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java
deleted file mode 100644
index c07ccd5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.async;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.nio.channels.ClosedSelectorException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Contains selector thread which transitions method call objects
- */
-public class TAsyncClientManager {
-  private static final Logger LOGGER = LoggerFactory.getLogger(TAsyncClientManager.class.getName());
-
-  private final SelectThread selectThread;
-  private final ConcurrentLinkedQueue<TAsyncMethodCall> pendingCalls = new ConcurrentLinkedQueue<TAsyncMethodCall>();
-
-  public TAsyncClientManager() throws IOException {
-    this.selectThread = new SelectThread();
-    selectThread.start();
-  }
-
-  public void call(TAsyncMethodCall method) throws TException {
-    if (!isRunning()) {
-      throw new TException("SelectThread is not running");
-    }
-    method.prepareMethodCall();
-    pendingCalls.add(method);
-    selectThread.getSelector().wakeup();
-  }
-
-  public void stop() {
-    selectThread.finish();
-  }
-
-  public boolean isRunning() {
-    return selectThread.isAlive();
-  }
-
-  private class SelectThread extends Thread {
-    private final Selector selector;
-    private volatile boolean running;
-    private final TreeSet<TAsyncMethodCall> timeoutWatchSet = new TreeSet<TAsyncMethodCall>(new TAsyncMethodCallTimeoutComparator());
-
-    public SelectThread() throws IOException {
-      this.selector = SelectorProvider.provider().openSelector();
-      this.running = true;
-      this.setName("TAsyncClientManager#SelectorThread " + this.getId());
-
-      // We don't want to hold up the JVM when shutting down
-      setDaemon(true);
-    }
-
-    public Selector getSelector() {
-      return selector;
-    }
-
-    public void finish() {
-      running = false;
-      selector.wakeup();
-    }
-
-    public void run() {
-      while (running) {
-        try {
-          try {
-            if (timeoutWatchSet.size() == 0) {
-              // No timeouts, so select indefinitely
-              selector.select();
-            } else {
-              // We have a timeout pending, so calculate the time until then and select appropriately
-              long nextTimeout = timeoutWatchSet.first().getTimeoutTimestamp();
-              long selectTime = nextTimeout - System.currentTimeMillis();
-              if (selectTime > 0) {
-                // Next timeout is in the future, select and wake up then
-                selector.select(selectTime);
-              } else {
-                // Next timeout is now or in past, select immediately so we can time out
-                selector.selectNow();
-              }
-            }
-          } catch (IOException e) {
-            LOGGER.error("Caught IOException in TAsyncClientManager!", e);
-          }
-          transitionMethods();
-          timeoutMethods();
-          startPendingMethods();
-        } catch (Exception exception) {
-          LOGGER.error("Ignoring uncaught exception in SelectThread", exception);
-        }
-      }
-
-      try {
-        selector.close();
-      } catch (IOException ex) {
-        LOGGER.warn("Could not close selector. This may result in leaked resources!", ex);
-      }
-    }
-
-    // Transition methods for ready keys
-    private void transitionMethods() {
-      try {
-        Iterator<SelectionKey> keys = selector.selectedKeys().iterator();
-        while (keys.hasNext()) {
-          SelectionKey key = keys.next();
-          keys.remove();
-          if (!key.isValid()) {
-            // this can happen if the method call experienced an error and the
-            // key was cancelled. can also happen if we timeout a method, which
-            // results in a channel close.
-            // just skip
-            continue;
-          }
-          TAsyncMethodCall methodCall = (TAsyncMethodCall)key.attachment();
-          methodCall.transition(key);
-
-          // If done or error occurred, remove from timeout watch set
-          if (methodCall.isFinished() || methodCall.getClient().hasError()) {
-            timeoutWatchSet.remove(methodCall);
-          }
-        }
-      } catch (ClosedSelectorException e) {
-        LOGGER.error("Caught ClosedSelectorException in TAsyncClientManager!", e);
-      }
-    }
-
-    // Timeout any existing method calls
-    private void timeoutMethods() {
-      Iterator<TAsyncMethodCall> iterator = timeoutWatchSet.iterator();
-      long currentTime = System.currentTimeMillis();
-      while (iterator.hasNext()) {
-        TAsyncMethodCall methodCall = iterator.next();
-        if (currentTime >= methodCall.getTimeoutTimestamp()) {
-          iterator.remove();
-          methodCall.onError(new TimeoutException("Operation " + methodCall.getClass() + " timed out after " + (currentTime - methodCall.getStartTime()) + " ms."));
-        } else {
-          break;
-        }
-      }
-    }
-
-    // Start any new calls
-    private void startPendingMethods() {
-      TAsyncMethodCall methodCall;
-      while ((methodCall = pendingCalls.poll()) != null) {
-        // Catch registration errors. method will catch transition errors and cleanup.
-        try {
-          methodCall.start(selector);
-
-          // If timeout specified and first transition went smoothly, add to timeout watch set
-          TAsyncClient client = methodCall.getClient();
-          if (client.hasTimeout() && !client.hasError()) {
-            timeoutWatchSet.add(methodCall);
-          }
-        } catch (Exception exception) {
-          LOGGER.warn("Caught exception in TAsyncClientManager!", exception);
-          methodCall.onError(exception);
-        }
-      }
-    }
-  }
-
-  /** Comparator used in TreeSet */
-  private static class TAsyncMethodCallTimeoutComparator implements Comparator<TAsyncMethodCall>, Serializable {
-    public int compare(TAsyncMethodCall left, TAsyncMethodCall right) {
-      if (left.getTimeoutTimestamp() == right.getTimeoutTimestamp()) {
-        return (int)(left.getSequenceId() - right.getSequenceId());
-      } else {
-        return (int)(left.getTimeoutTimestamp() - right.getTimeoutTimestamp());
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncMethodCall.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncMethodCall.java
deleted file mode 100644
index 3bf1747..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/async/TAsyncMethodCall.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.async;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TMemoryBuffer;
-import org.apache.thrift.transport.TNonblockingTransport;
-import org.apache.thrift.transport.TTransportException;
-
-/**
- * Encapsulates an async method call.
- * <p>
- * Need to generate:
- * <ul>
- *   <li>protected abstract void write_args(TProtocol protocol)</li>
- *   <li>protected abstract T getResult() throws &lt;Exception_1&gt;, &lt;Exception_2&gt;, ...</li>
- * </ul>
- *
- * @param <T> The return type of the encapsulated method call.
- */
-public abstract class TAsyncMethodCall<T> {
-
-  private static final int INITIAL_MEMORY_BUFFER_SIZE = 128;
-  private static AtomicLong sequenceIdCounter = new AtomicLong(0);
-
-  public static enum State {
-    CONNECTING,
-    WRITING_REQUEST_SIZE,
-    WRITING_REQUEST_BODY,
-    READING_RESPONSE_SIZE,
-    READING_RESPONSE_BODY,
-    RESPONSE_READ,
-    ERROR;
-  }
-
-  /**
-   * Next step in the call, initialized by start()
-   */
-  private State state = null;
-
-  protected final TNonblockingTransport transport;
-  private final TProtocolFactory protocolFactory;
-  protected final TAsyncClient client;
-  private final AsyncMethodCallback<T> callback;
-  private final boolean isOneway;
-  private long sequenceId;
-  private final long timeout;
-
-  private ByteBuffer sizeBuffer;
-  private final byte[] sizeBufferArray = new byte[4];
-  private ByteBuffer frameBuffer;
-
-  private long startTime = System.currentTimeMillis();
-
-  protected TAsyncMethodCall(TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport, AsyncMethodCallback<T> callback, boolean isOneway) {
-    this.transport = transport;
-    this.callback = callback;
-    this.protocolFactory = protocolFactory;
-    this.client = client;
-    this.isOneway = isOneway;
-    this.sequenceId = TAsyncMethodCall.sequenceIdCounter.getAndIncrement();
-    this.timeout = client.getTimeout();
-  }
-
-  protected State getState() {
-    return state;
-  }
-
-  protected boolean isFinished() {
-    return state == State.RESPONSE_READ;
-  }
-
-  protected long getStartTime() {
-    return startTime;
-  }
-  
-  protected long getSequenceId() {
-    return sequenceId;
-  }
-
-  public TAsyncClient getClient() {
-    return client;
-  }
-  
-  public boolean hasTimeout() {
-    return timeout > 0;
-  }
-  
-  public long getTimeoutTimestamp() {
-    return timeout + startTime;
-  }
-
-  protected abstract void write_args(TProtocol protocol) throws TException;
-
-  protected abstract T getResult() throws Exception;
-
-  /**
-   * Initialize buffers.
-   * @throws TException if buffer initialization fails
-   */
-  protected void prepareMethodCall() throws TException {
-    TMemoryBuffer memoryBuffer = new TMemoryBuffer(INITIAL_MEMORY_BUFFER_SIZE);
-    TProtocol protocol = protocolFactory.getProtocol(memoryBuffer);
-    write_args(protocol);
-
-    int length = memoryBuffer.length();
-    frameBuffer = ByteBuffer.wrap(memoryBuffer.getArray(), 0, length);
-
-    TFramedTransport.encodeFrameSize(length, sizeBufferArray);
-    sizeBuffer = ByteBuffer.wrap(sizeBufferArray);
-  }
-
-  /**
-   * Register with selector and start first state, which could be either connecting or writing.
-   * @throws IOException if register or starting fails
-   */
-  void start(Selector sel) throws IOException {
-    SelectionKey key;
-    if (transport.isOpen()) {
-      state = State.WRITING_REQUEST_SIZE;
-      key = transport.registerSelector(sel, SelectionKey.OP_WRITE);
-    } else {
-      state = State.CONNECTING;
-      key = transport.registerSelector(sel, SelectionKey.OP_CONNECT);
-
-      // non-blocking connect can complete immediately,
-      // in which case we should not expect the OP_CONNECT
-      if (transport.startConnect()) {
-        registerForFirstWrite(key);
-      }
-    }
-
-    key.attach(this);
-  }
-
-  void registerForFirstWrite(SelectionKey key) throws IOException {
-    state = State.WRITING_REQUEST_SIZE;
-    key.interestOps(SelectionKey.OP_WRITE);
-  }
-
-  protected ByteBuffer getFrameBuffer() {
-    return frameBuffer;
-  }
-
-  /**
-   * Transition to next state, doing whatever work is required. Since this
-   * method is only called by the selector thread, we can make changes to our
-   * select interests without worrying about concurrency.
-   * @param key
-   */
-  void transition(SelectionKey key) {
-    // Ensure key is valid
-    if (!key.isValid()) {
-      key.cancel();
-      Exception e = new TTransportException("Selection key not valid!");
-      onError(e);
-      return;
-    }
-
-    // Transition function
-    try {
-      switch (state) {
-        case CONNECTING:
-          doConnecting(key);
-          break;
-        case WRITING_REQUEST_SIZE:
-          doWritingRequestSize();
-          break;
-        case WRITING_REQUEST_BODY:
-          doWritingRequestBody(key);
-          break;
-        case READING_RESPONSE_SIZE:
-          doReadingResponseSize();
-          break;
-        case READING_RESPONSE_BODY:
-          doReadingResponseBody(key);
-          break;
-        default: // RESPONSE_READ, ERROR, or bug
-          throw new IllegalStateException("Method call in state " + state
-              + " but selector called transition method. Seems like a bug...");
-      }
-    } catch (Exception e) {
-      key.cancel();
-      key.attach(null);
-      onError(e);
-    }
-  }
-
-  protected void onError(Exception e) {
-    client.onError(e);
-    callback.onError(e);
-    state = State.ERROR;
-  }
-
-  private void doReadingResponseBody(SelectionKey key) throws IOException {
-    if (transport.read(frameBuffer) < 0) {
-      throw new IOException("Read call frame failed");
-    }
-    if (frameBuffer.remaining() == 0) {
-      cleanUpAndFireCallback(key);
-    }
-  }
-
-  private void cleanUpAndFireCallback(SelectionKey key) {
-    state = State.RESPONSE_READ;
-    key.interestOps(0);
-    // this ensures that the TAsyncMethod instance doesn't hang around
-    key.attach(null);
-    try {
-      T result = this.getResult();
-      client.onComplete();
-      callback.onComplete(result);
-    } catch (Exception e) {
-      key.cancel();
-      onError(e);
-    }
-  }
-
-  private void doReadingResponseSize() throws IOException {
-    if (transport.read(sizeBuffer) < 0) {
-      throw new IOException("Read call frame size failed");
-    }
-    if (sizeBuffer.remaining() == 0) {
-      state = State.READING_RESPONSE_BODY;
-      frameBuffer = ByteBuffer.allocate(TFramedTransport.decodeFrameSize(sizeBufferArray));
-    }
-  }
-
-  private void doWritingRequestBody(SelectionKey key) throws IOException {
-    if (transport.write(frameBuffer) < 0) {
-      throw new IOException("Write call frame failed");
-    }
-    if (frameBuffer.remaining() == 0) {
-      if (isOneway) {
-        cleanUpAndFireCallback(key);
-      } else {
-        state = State.READING_RESPONSE_SIZE;
-        sizeBuffer.rewind();  // Prepare to read incoming frame size
-        key.interestOps(SelectionKey.OP_READ);
-      }
-    }
-  }
-
-  private void doWritingRequestSize() throws IOException {
-    if (transport.write(sizeBuffer) < 0) {
-      throw new IOException("Write call frame size failed");
-    }
-    if (sizeBuffer.remaining() == 0) {
-      state = State.WRITING_REQUEST_BODY;
-    }
-  }
-
-  private void doConnecting(SelectionKey key) throws IOException {
-    if (!key.isConnectable() || !transport.finishConnect()) {
-      throw new IOException("not connectable or finishConnect returned false after we got an OP_CONNECT");
-    }
-    registerForFirstWrite(key);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/EnumMetaData.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/EnumMetaData.java
deleted file mode 100644
index be49cb9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/EnumMetaData.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.TEnum;
-
-public class EnumMetaData extends FieldValueMetaData {
-  public final Class<? extends TEnum> enumClass;
-  
-  public EnumMetaData(byte type, Class<? extends TEnum> sClass){
-    super(type);
-    this.enumClass = sClass;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/FieldMetaData.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/FieldMetaData.java
deleted file mode 100644
index 445f7e4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/FieldMetaData.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TFieldIdEnum;
-
-/**
- * This class is used to store meta data about thrift fields. Every field in a
- * a struct should have a corresponding instance of this class describing it.
- *
- */
-public class FieldMetaData implements java.io.Serializable {
-  public final String fieldName;
-  public final byte requirementType;
-  public final FieldValueMetaData valueMetaData;
-  private static Map<Class<? extends TBase>, Map<? extends TFieldIdEnum, FieldMetaData>> structMap;
-  
-  static {
-    structMap = new HashMap<Class<? extends TBase>, Map<? extends TFieldIdEnum, FieldMetaData>>();
-  }
-  
-  public FieldMetaData(String name, byte req, FieldValueMetaData vMetaData){
-    this.fieldName = name;
-    this.requirementType = req;
-    this.valueMetaData = vMetaData;
-  }
-  
-  public static synchronized void addStructMetaDataMap(Class<? extends TBase> sClass, Map<? extends TFieldIdEnum, FieldMetaData> map){
-    structMap.put(sClass, map);
-  }
-
-  /**
-   * Returns a map with metadata (i.e. instances of FieldMetaData) that
-   * describe the fields of the given class.
-   *
-   * @param sClass The TBase class for which the metadata map is requested
-   */
-  public static synchronized Map<? extends TFieldIdEnum, FieldMetaData> getStructMetaDataMap(Class<? extends TBase> sClass){
-    if (!structMap.containsKey(sClass)){ // Load class if it hasn't been loaded
-      try{
-        sClass.newInstance();
-      } catch (InstantiationException e){
-        throw new RuntimeException("InstantiationException for TBase class: " + sClass.getName() + ", message: " + e.getMessage());
-      } catch (IllegalAccessException e){
-        throw new RuntimeException("IllegalAccessException for TBase class: " + sClass.getName() + ", message: " + e.getMessage());
-      }
-    }
-    return structMap.get(sClass);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/FieldValueMetaData.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/FieldValueMetaData.java
deleted file mode 100644
index 2180b08..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/FieldValueMetaData.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.protocol.TType;
-
-/**
- * FieldValueMetaData and collection of subclasses to store metadata about
- * the value(s) of a field
- */
-public class FieldValueMetaData implements java.io.Serializable {
-  public final byte type;  
-
-  private final boolean isTypedefType;
-  private final String typedefName;
-  private final boolean isBinary;
-
-  public FieldValueMetaData(byte type, boolean binary) {
-    this.type = type;
-    this.isTypedefType = false;
-    this.typedefName = null;
-    this.isBinary = binary;
-  }
-
-  public FieldValueMetaData(byte type) {
-    this(type, false);
-  }
-
-  public FieldValueMetaData(byte type, String typedefName) {
-    this.type = type;
-    this.isTypedefType = true;
-    this.typedefName = typedefName;
-    this.isBinary = false;
-  }
-
-  public boolean isTypedef() {
-    return isTypedefType;
-  }
-
-  public String getTypedefName() {
-    return typedefName;
-  }
-
-  public boolean isStruct() {
-    return type == TType.STRUCT; 
-  }
-
-  public boolean isContainer() {
-    return type == TType.LIST || type == TType.MAP || type == TType.SET;
-  }
-
-  public boolean isBinary() {
-    return isBinary;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/ListMetaData.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/ListMetaData.java
deleted file mode 100644
index 8e7073b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/ListMetaData.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-public class ListMetaData extends FieldValueMetaData {
-  public final FieldValueMetaData elemMetaData;
-  
-  public ListMetaData(byte type, FieldValueMetaData eMetaData){
-    super(type);
-    this.elemMetaData = eMetaData;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/MapMetaData.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/MapMetaData.java
deleted file mode 100644
index e7c408c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/MapMetaData.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-public class MapMetaData extends FieldValueMetaData {
-  public final FieldValueMetaData keyMetaData;
-  public final FieldValueMetaData valueMetaData;
-  
-  public MapMetaData(byte type, FieldValueMetaData kMetaData, FieldValueMetaData vMetaData){
-    super(type);
-    this.keyMetaData = kMetaData;
-    this.valueMetaData = vMetaData;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/SetMetaData.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/SetMetaData.java
deleted file mode 100644
index cf4b96a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/SetMetaData.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-public class SetMetaData extends FieldValueMetaData {
-  public final FieldValueMetaData elemMetaData;
-  
-  public SetMetaData(byte type, FieldValueMetaData eMetaData){
-    super(type);
-    this.elemMetaData = eMetaData;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/StructMetaData.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/StructMetaData.java
deleted file mode 100644
index b37d21d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/meta_data/StructMetaData.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.TBase;
-
-public class StructMetaData extends FieldValueMetaData {
-  public final Class<? extends TBase> structClass;
-  
-  public StructMetaData(byte type, Class<? extends TBase> sClass){
-    super(type);
-    this.structClass = sClass;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
deleted file mode 100644
index abfc965..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Class for encoding and decoding Base64 data.
- *
- * This class is kept at package level because the interface does no input
- * validation and is therefore too low-level for generalized reuse.
- *
- * Note also that the encoding does not pad with equal signs , as discussed in
- * section 2.2 of the RFC (http://www.faqs.org/rfcs/rfc3548.html). Furthermore,
- * bad data encountered when decoding is neither rejected or ignored but simply
- * results in bad decoded data -- this is not in compliance with the RFC but is
- * done in the interest of performance.
- *
- */
-class TBase64Utils {
-
-  private static final String ENCODE_TABLE =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  /**
-   * Encode len bytes of data in src at offset srcOff, storing the result into
-   * dst at offset dstOff. len must be 1, 2, or 3. dst must have at least len+1
-   * bytes of space at dstOff. src and dst should not be the same object. This
-   * method does no validation of the input values in the interest of
-   * performance.
-   *
-   * @param src  the source of bytes to encode
-   * @param srcOff  the offset into the source to read the unencoded bytes
-   * @param len  the number of bytes to encode (must be 1, 2, or 3).
-   * @param dst  the destination for the encoding
-   * @param dstOff  the offset into the destination to place the encoded bytes
-   */
-  static final void encode(byte[] src, int srcOff, int len,  byte[] dst,
-                           int dstOff) {
-    dst[dstOff] = (byte)ENCODE_TABLE.charAt((src[srcOff] >> 2) & 0x3F);
-    if (len == 3) {
-      dst[dstOff + 1] =
-        (byte)ENCODE_TABLE.charAt(
-                         ((src[srcOff] << 4) & 0x30) | ((src[srcOff+1] >> 4) & 0x0F));
-      dst[dstOff + 2] =
-        (byte)ENCODE_TABLE.charAt(
-                         ((src[srcOff+1] << 2) & 0x3C) | ((src[srcOff+2] >> 6) & 0x03));
-      dst[dstOff + 3] =
-        (byte)ENCODE_TABLE.charAt(src[srcOff+2] & 0x3F);
-    }
-    else if (len == 2) {
-      dst[dstOff+1] =
-        (byte)ENCODE_TABLE.charAt(
-                          ((src[srcOff] << 4) & 0x30) | ((src[srcOff+1] >> 4) & 0x0F));
-      dst[dstOff + 2] =
-        (byte)ENCODE_TABLE.charAt((src[srcOff+1] << 2) & 0x3C);
-    }
-    else { // len == 1) {
-      dst[dstOff + 1] =
-        (byte)ENCODE_TABLE.charAt((src[srcOff] << 4) & 0x30);
-    }
-  }
-
-  private static final byte[] DECODE_TABLE = {
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
-    52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,
-    -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,
-    15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
-    -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
-    41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-  };
-
-  /**
-   * Decode len bytes of data in src at offset srcOff, storing the result into
-   * dst at offset dstOff. len must be 2, 3, or 4. dst must have at least len-1
-   * bytes of space at dstOff. src and dst may be the same object as long as
-   * dstoff <= srcOff. This method does no validation of the input values in
-   * the interest of performance.
-   *
-   * @param src  the source of bytes to decode
-   * @param srcOff  the offset into the source to read the encoded bytes
-   * @param len  the number of bytes to decode (must be 2, 3, or 4)
-   * @param dst  the destination for the decoding
-   * @param dstOff  the offset into the destination to place the decoded bytes
-   */
-  static final void decode(byte[] src, int srcOff, int len,  byte[] dst,
-                           int dstOff) {
-    dst[dstOff] = (byte)
-      ((DECODE_TABLE[src[srcOff] & 0x0FF] << 2) |
-       (DECODE_TABLE[src[srcOff+1] & 0x0FF] >> 4));
-    if (len > 2) {
-      dst[dstOff+1] = (byte)
-        (((DECODE_TABLE[src[srcOff+1] & 0x0FF] << 4) & 0xF0) |
-         (DECODE_TABLE[src[srcOff+2] & 0x0FF] >> 2));
-      if (len > 3) {
-        dst[dstOff+2] = (byte)
-          (((DECODE_TABLE[src[srcOff+2] & 0x0FF] << 6) & 0xC0) |
-           DECODE_TABLE[src[srcOff+3] & 0x0FF]);
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
deleted file mode 100644
index d7f8b83..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Binary protocol implementation for thrift.
- *
- */
-public class TBinaryProtocol extends TProtocol {
-  private static final TStruct ANONYMOUS_STRUCT = new TStruct();
-  private static final long NO_LENGTH_LIMIT = -1;
-
-  protected static final int VERSION_MASK = 0xffff0000;
-  protected static final int VERSION_1 = 0x80010000;
-
-  /**
-   * The maximum number of bytes to read from the transport for
-   * variable-length fields (such as strings or binary) or {@link #NO_LENGTH_LIMIT} for
-   * unlimited.
-   */
-  private final long stringLengthLimit_;
-
-  /**
-   * The maximum number of elements to read from the network for
-   * containers (maps, sets, lists), or {@link #NO_LENGTH_LIMIT} for unlimited.
-   */
-  private final long containerLengthLimit_;
-
-  protected boolean strictRead_;
-  protected boolean strictWrite_;
-
-  private final byte[] inoutTemp = new byte[8];
-
-  /**
-   * Factory
-   */
-  public static class Factory implements TProtocolFactory {
-    protected long stringLengthLimit_;
-    protected long containerLengthLimit_;
-    protected boolean strictRead_;
-    protected boolean strictWrite_;
-
-    public Factory() {
-      this(false, true);
-    }
-
-    public Factory(boolean strictRead, boolean strictWrite) {
-      this(strictRead, strictWrite, NO_LENGTH_LIMIT, NO_LENGTH_LIMIT);
-    }
-
-    public Factory(long stringLengthLimit, long containerLengthLimit) {
-      this(false, true, stringLengthLimit, containerLengthLimit);
-    }
-
-    public Factory(boolean strictRead, boolean strictWrite, long stringLengthLimit, long containerLengthLimit) {
-      stringLengthLimit_ = stringLengthLimit;
-      containerLengthLimit_ = containerLengthLimit;
-      strictRead_ = strictRead;
-      strictWrite_ = strictWrite;
-    }
-
-    public TProtocol getProtocol(TTransport trans) {
-      return new TBinaryProtocol(trans, stringLengthLimit_, containerLengthLimit_, strictRead_, strictWrite_);
-    }
-  }
-
-  /**
-   * Constructor
-   */
-  public TBinaryProtocol(TTransport trans) {
-    this(trans, false, true);
-  }
-
-  public TBinaryProtocol(TTransport trans, boolean strictRead, boolean strictWrite) {
-    this(trans, NO_LENGTH_LIMIT, NO_LENGTH_LIMIT, strictRead, strictWrite);
-  }
-
-  public TBinaryProtocol(TTransport trans, long stringLengthLimit, long containerLengthLimit) {
-    this(trans, stringLengthLimit, containerLengthLimit, false, true);
-  }
-
-  public TBinaryProtocol(TTransport trans, long stringLengthLimit, long containerLengthLimit, boolean strictRead, boolean strictWrite) {
-    super(trans);
-    stringLengthLimit_ = stringLengthLimit;
-    containerLengthLimit_ = containerLengthLimit;
-    strictRead_ = strictRead;
-    strictWrite_ = strictWrite;
-  }
-
-  public void writeMessageBegin(TMessage message) throws TException {
-    if (strictWrite_) {
-      int version = VERSION_1 | message.type;
-      writeI32(version);
-      writeString(message.name);
-      writeI32(message.seqid);
-    } else {
-      writeString(message.name);
-      writeByte(message.type);
-      writeI32(message.seqid);
-    }
-  }
-
-  public void writeMessageEnd() {}
-
-  public void writeStructBegin(TStruct struct) {}
-
-  public void writeStructEnd() {}
-
-  public void writeFieldBegin(TField field) throws TException {
-    writeByte(field.type);
-    writeI16(field.id);
-  }
-
-  public void writeFieldEnd() {}
-
-  public void writeFieldStop() throws TException {
-    writeByte(TType.STOP);
-  }
-
-  public void writeMapBegin(TMap map) throws TException {
-    writeByte(map.keyType);
-    writeByte(map.valueType);
-    writeI32(map.size);
-  }
-
-  public void writeMapEnd() {}
-
-  public void writeListBegin(TList list) throws TException {
-    writeByte(list.elemType);
-    writeI32(list.size);
-  }
-
-  public void writeListEnd() {}
-
-  public void writeSetBegin(TSet set) throws TException {
-    writeByte(set.elemType);
-    writeI32(set.size);
-  }
-
-  public void writeSetEnd() {}
-
-  public void writeBool(boolean b) throws TException {
-    writeByte(b ? (byte)1 : (byte)0);
-  }
-
-  public void writeByte(byte b) throws TException {
-    inoutTemp[0] = b;
-    trans_.write(inoutTemp, 0, 1);
-  }
-
-  public void writeI16(short i16) throws TException {
-    inoutTemp[0] = (byte)(0xff & (i16 >> 8));
-    inoutTemp[1] = (byte)(0xff & (i16));
-    trans_.write(inoutTemp, 0, 2);
-  }
-
-  public void writeI32(int i32) throws TException {
-    inoutTemp[0] = (byte)(0xff & (i32 >> 24));
-    inoutTemp[1] = (byte)(0xff & (i32 >> 16));
-    inoutTemp[2] = (byte)(0xff & (i32 >> 8));
-    inoutTemp[3] = (byte)(0xff & (i32));
-    trans_.write(inoutTemp, 0, 4);
-  }
-
-  public void writeI64(long i64) throws TException {
-    inoutTemp[0] = (byte)(0xff & (i64 >> 56));
-    inoutTemp[1] = (byte)(0xff & (i64 >> 48));
-    inoutTemp[2] = (byte)(0xff & (i64 >> 40));
-    inoutTemp[3] = (byte)(0xff & (i64 >> 32));
-    inoutTemp[4] = (byte)(0xff & (i64 >> 24));
-    inoutTemp[5] = (byte)(0xff & (i64 >> 16));
-    inoutTemp[6] = (byte)(0xff & (i64 >> 8));
-    inoutTemp[7] = (byte)(0xff & (i64));
-    trans_.write(inoutTemp, 0, 8);
-  }
-
-  public void writeDouble(double dub) throws TException {
-    writeI64(Double.doubleToLongBits(dub));
-  }
-
-  public void writeString(String str) throws TException {
-    try {
-      byte[] dat = str.getBytes("UTF-8");
-      writeI32(dat.length);
-      trans_.write(dat, 0, dat.length);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  public void writeBinary(ByteBuffer bin) throws TException {
-    int length = bin.limit() - bin.position();
-    writeI32(length);
-    trans_.write(bin.array(), bin.position() + bin.arrayOffset(), length);
-  }
-
-  /**
-   * Reading methods.
-   */
-
-  public TMessage readMessageBegin() throws TException {
-    int size = readI32();
-    if (size < 0) {
-      int version = size & VERSION_MASK;
-      if (version != VERSION_1) {
-        throw new TProtocolException(TProtocolException.BAD_VERSION, "Bad version in readMessageBegin");
-      }
-      return new TMessage(readString(), (byte)(size & 0x000000ff), readI32());
-    } else {
-      if (strictRead_) {
-        throw new TProtocolException(TProtocolException.BAD_VERSION, "Missing version in readMessageBegin, old client?");
-      }
-      return new TMessage(readStringBody(size), readByte(), readI32());
-    }
-  }
-
-  public void readMessageEnd() {}
-
-  public TStruct readStructBegin() {
-    return ANONYMOUS_STRUCT;
-  }
-
-  public void readStructEnd() {}
-
-  public TField readFieldBegin() throws TException {
-    byte type = readByte();
-    short id = type == TType.STOP ? 0 : readI16();
-    return new TField("", type, id);
-  }
-
-  public void readFieldEnd() {}
-
-  public TMap readMapBegin() throws TException {
-    TMap map = new TMap(readByte(), readByte(), readI32());
-    checkContainerReadLength(map.size);
-    return map;
-  }
-
-  public void readMapEnd() {}
-
-  public TList readListBegin() throws TException {
-    TList list = new TList(readByte(), readI32());
-    checkContainerReadLength(list.size);
-    return list;
-  }
-
-  public void readListEnd() {}
-
-  public TSet readSetBegin() throws TException {
-    TSet set = new TSet(readByte(), readI32());
-    checkContainerReadLength(set.size);
-    return set;
-  }
-
-  public void readSetEnd() {}
-
-  public boolean readBool() throws TException {
-    return (readByte() == 1);
-  }
-
-  public byte readByte() throws TException {
-    if (trans_.getBytesRemainingInBuffer() >= 1) {
-      byte b = trans_.getBuffer()[trans_.getBufferPosition()];
-      trans_.consumeBuffer(1);
-      return b;
-    }
-    readAll(inoutTemp, 0, 1);
-    return inoutTemp[0];
-  }
-
-  public short readI16() throws TException {
-    byte[] buf = inoutTemp;
-    int off = 0;
-
-    if (trans_.getBytesRemainingInBuffer() >= 2) {
-      buf = trans_.getBuffer();
-      off = trans_.getBufferPosition();
-      trans_.consumeBuffer(2);
-    } else {
-      readAll(inoutTemp, 0, 2);
-    }
-
-    return
-      (short)
-      (((buf[off] & 0xff) << 8) |
-       ((buf[off+1] & 0xff)));
-  }
-
-  public int readI32() throws TException {
-    byte[] buf = inoutTemp;
-    int off = 0;
-
-    if (trans_.getBytesRemainingInBuffer() >= 4) {
-      buf = trans_.getBuffer();
-      off = trans_.getBufferPosition();
-      trans_.consumeBuffer(4);
-    } else {
-      readAll(inoutTemp, 0, 4);
-    }
-    return
-      ((buf[off] & 0xff) << 24) |
-      ((buf[off+1] & 0xff) << 16) |
-      ((buf[off+2] & 0xff) <<  8) |
-      ((buf[off+3] & 0xff));
-  }
-
-  public long readI64() throws TException {
-    byte[] buf = inoutTemp;
-    int off = 0;
-
-    if (trans_.getBytesRemainingInBuffer() >= 8) {
-      buf = trans_.getBuffer();
-      off = trans_.getBufferPosition();
-      trans_.consumeBuffer(8);
-    } else {
-      readAll(inoutTemp, 0, 8);
-    }
-
-    return
-      ((long)(buf[off]   & 0xff) << 56) |
-      ((long)(buf[off+1] & 0xff) << 48) |
-      ((long)(buf[off+2] & 0xff) << 40) |
-      ((long)(buf[off+3] & 0xff) << 32) |
-      ((long)(buf[off+4] & 0xff) << 24) |
-      ((long)(buf[off+5] & 0xff) << 16) |
-      ((long)(buf[off+6] & 0xff) <<  8) |
-      ((long)(buf[off+7] & 0xff));
-  }
-
-  public double readDouble() throws TException {
-    return Double.longBitsToDouble(readI64());
-  }
-
-  public String readString() throws TException {
-    int size = readI32();
-
-    checkStringReadLength(size);
-
-    if (trans_.getBytesRemainingInBuffer() >= size) {
-      try {
-        String s = new String(trans_.getBuffer(), trans_.getBufferPosition(), size, "UTF-8");
-        trans_.consumeBuffer(size);
-        return s;
-      } catch (UnsupportedEncodingException e) {
-        throw new TException("JVM DOES NOT SUPPORT UTF-8");
-      }
-    }
-
-    return readStringBody(size);
-  }
-
-  public String readStringBody(int size) throws TException {
-    try {
-      byte[] buf = new byte[size];
-      trans_.readAll(buf, 0, size);
-      return new String(buf, "UTF-8");
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  public ByteBuffer readBinary() throws TException {
-    int size = readI32();
-
-    checkStringReadLength(size);
-
-    if (trans_.getBytesRemainingInBuffer() >= size) {
-      ByteBuffer bb = ByteBuffer.wrap(trans_.getBuffer(), trans_.getBufferPosition(), size);
-      trans_.consumeBuffer(size);
-      return bb;
-    }
-
-    byte[] buf = new byte[size];
-    trans_.readAll(buf, 0, size);
-    return ByteBuffer.wrap(buf);
-  }
-
-  private void checkStringReadLength(int length) throws TProtocolException {
-    if (length < 0) {
-      throw new TProtocolException(TProtocolException.NEGATIVE_SIZE,
-                                   "Negative length: " + length);
-    }
-    if (stringLengthLimit_ != NO_LENGTH_LIMIT && length > stringLengthLimit_) {
-      throw new TProtocolException(TProtocolException.SIZE_LIMIT,
-                                   "Length exceeded max allowed: " + length);
-    }
-  }
-
-  private void checkContainerReadLength(int length) throws TProtocolException {
-    if (length < 0) {
-      throw new TProtocolException(TProtocolException.NEGATIVE_SIZE,
-                                   "Negative length: " + length);
-    }
-    if (containerLengthLimit_ != NO_LENGTH_LIMIT && length > containerLengthLimit_) {
-      throw new TProtocolException(TProtocolException.SIZE_LIMIT,
-                                   "Length exceeded max allowed: " + length);
-    }
-  }
-
-  private int readAll(byte[] buf, int off, int len) throws TException {
-    return trans_.readAll(buf, off, len);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TCompactProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TCompactProtocol.java
deleted file mode 100644
index 56c349a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TCompactProtocol.java
+++ /dev/null
@@ -1,908 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.protocol;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-
-import org.apache.thrift.ShortStack;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * TCompactProtocol2 is the Java implementation of the compact protocol specified
- * in THRIFT-110. The fundamental approach to reducing the overhead of
- * structures is a) use variable-length integers all over the place and b) make
- * use of unused bits wherever possible. Your savings will obviously vary
- * based on the specific makeup of your structs, but in general, the more
- * fields, nested structures, short strings and collections, and low-value i32
- * and i64 fields you have, the more benefit you'll see.
- */
-public class TCompactProtocol extends TProtocol {
-  private final static byte[] EMPTY_BYTES = new byte[0];
-  private final static ByteBuffer EMPTY_BUFFER = ByteBuffer.wrap(EMPTY_BYTES);
-
-  private final static long NO_LENGTH_LIMIT = -1;
-
-  private final static TStruct ANONYMOUS_STRUCT = new TStruct("");
-  private final static TField TSTOP = new TField("", TType.STOP, (short)0);
-
-  private final static byte[] ttypeToCompactType = new byte[16];
-
-  static {
-    ttypeToCompactType[TType.STOP] = TType.STOP;
-    ttypeToCompactType[TType.BOOL] = Types.BOOLEAN_TRUE;
-    ttypeToCompactType[TType.BYTE] = Types.BYTE;
-    ttypeToCompactType[TType.I16] = Types.I16;
-    ttypeToCompactType[TType.I32] = Types.I32;
-    ttypeToCompactType[TType.I64] = Types.I64;
-    ttypeToCompactType[TType.DOUBLE] = Types.DOUBLE;
-    ttypeToCompactType[TType.STRING] = Types.BINARY;
-    ttypeToCompactType[TType.LIST] = Types.LIST;
-    ttypeToCompactType[TType.SET] = Types.SET;
-    ttypeToCompactType[TType.MAP] = Types.MAP;
-    ttypeToCompactType[TType.STRUCT] = Types.STRUCT;
-  }
-
-  /**
-   * TProtocolFactory that produces TCompactProtocols.
-   */
-  public static class Factory implements TProtocolFactory {
-    private final long stringLengthLimit_;
-    private final long containerLengthLimit_;
-
-    public Factory() {
-      this(NO_LENGTH_LIMIT, NO_LENGTH_LIMIT);
-    }
-
-    public Factory(long stringLengthLimit) {
-      this(stringLengthLimit, NO_LENGTH_LIMIT);
-    }
-
-    public Factory(long stringLengthLimit, long containerLengthLimit) {
-      this.containerLengthLimit_ = containerLengthLimit;
-      this.stringLengthLimit_ = stringLengthLimit;
-    }
-
-    public TProtocol getProtocol(TTransport trans) {
-      return new TCompactProtocol(trans, stringLengthLimit_, containerLengthLimit_);
-    }
-  }
-
-  private static final byte PROTOCOL_ID = (byte)0x82;
-  private static final byte VERSION = 1;
-  private static final byte VERSION_MASK = 0x1f; // 0001 1111
-  private static final byte TYPE_MASK = (byte)0xE0; // 1110 0000
-  private static final byte TYPE_BITS = 0x07; // 0000 0111
-  private static final int  TYPE_SHIFT_AMOUNT = 5;
-
-  /**
-   * All of the on-wire type codes.
-   */
-  private static class Types {
-    public static final byte BOOLEAN_TRUE   = 0x01;
-    public static final byte BOOLEAN_FALSE  = 0x02;
-    public static final byte BYTE           = 0x03;
-    public static final byte I16            = 0x04;
-    public static final byte I32            = 0x05;
-    public static final byte I64            = 0x06;
-    public static final byte DOUBLE         = 0x07;
-    public static final byte BINARY         = 0x08;
-    public static final byte LIST           = 0x09;
-    public static final byte SET            = 0x0A;
-    public static final byte MAP            = 0x0B;
-    public static final byte STRUCT         = 0x0C;
-  }
-
-  /**
-   * Used to keep track of the last field for the current and previous structs,
-   * so we can do the delta stuff.
-   */
-  private ShortStack lastField_ = new ShortStack(15);
-
-  private short lastFieldId_ = 0;
-
-  /**
-   * If we encounter a boolean field begin, save the TField here so it can
-   * have the value incorporated.
-   */
-  private TField booleanField_ = null;
-
-  /**
-   * If we read a field header, and it's a boolean field, save the boolean
-   * value here so that readBool can use it.
-   */
-  private Boolean boolValue_ = null;
-
-  /**
-   * The maximum number of bytes to read from the transport for
-   * variable-length fields (such as strings or binary) or {@link #NO_LENGTH_LIMIT} for
-   * unlimited.
-   */
-  private final long stringLengthLimit_;
-
-  /**
-   * The maximum number of elements to read from the network for
-   * containers (maps, sets, lists), or {@link #NO_LENGTH_LIMIT} for unlimited.
-   */
-  private final long containerLengthLimit_;
-
-  /**
-   * Temporary buffer used for various operations that would otherwise require a
-   * small allocation.
-   */
-  private final byte[] temp = new byte[10];
-
-  /**
-   * Create a TCompactProtocol.
-   *
-   * @param transport the TTransport object to read from or write to.
-   * @param stringLengthLimit the maximum number of bytes to read for
-   *     variable-length fields.
-   * @param containerLengthLimit the maximum number of elements to read
-   *     for containers.
-   */
-  public TCompactProtocol(TTransport transport, long stringLengthLimit, long containerLengthLimit) {
-    super(transport);
-    this.stringLengthLimit_ = stringLengthLimit;
-    this.containerLengthLimit_ = containerLengthLimit;
-  }
-
-  /**
-   * Create a TCompactProtocol.
-   *
-   * @param transport the TTransport object to read from or write to.
-   * @param stringLengthLimit the maximum number of bytes to read for
-   *     variable-length fields.
-   * @deprecated Use constructor specifying both string limit and container limit instead
-   */
-  @Deprecated
-  public TCompactProtocol(TTransport transport, long stringLengthLimit) {
-    this(transport, stringLengthLimit, NO_LENGTH_LIMIT);
-  }
-
-  /**
-   * Create a TCompactProtocol.
-   *
-   * @param transport the TTransport object to read from or write to.
-   */
-  public TCompactProtocol(TTransport transport) {
-    this(transport, NO_LENGTH_LIMIT, NO_LENGTH_LIMIT);
-  }
-
-  @Override
-  public void reset() {
-    lastField_.clear();
-    lastFieldId_ = 0;
-  }
-
-  //
-  // Public Writing methods.
-  //
-
-  /**
-   * Write a message header to the wire. Compact Protocol messages contain the
-   * protocol version so we can migrate forwards in the future if need be.
-   */
-  public void writeMessageBegin(TMessage message) throws TException {
-    writeByteDirect(PROTOCOL_ID);
-    writeByteDirect((VERSION & VERSION_MASK) | ((message.type << TYPE_SHIFT_AMOUNT) & TYPE_MASK));
-    writeVarint32(message.seqid);
-    writeString(message.name);
-  }
-
-  /**
-   * Write a struct begin. This doesn't actually put anything on the wire. We
-   * use it as an opportunity to put special placeholder markers on the field
-   * stack so we can get the field id deltas correct.
-   */
-  public void writeStructBegin(TStruct struct) throws TException {
-    lastField_.push(lastFieldId_);
-    lastFieldId_ = 0;
-  }
-
-  /**
-   * Write a struct end. This doesn't actually put anything on the wire. We use
-   * this as an opportunity to pop the last field from the current struct off
-   * of the field stack.
-   */
-  public void writeStructEnd() throws TException {
-    lastFieldId_ = lastField_.pop();
-  }
-
-  /**
-   * Write a field header containing the field id and field type. If the
-   * difference between the current field id and the last one is small (&lt; 15),
-   * then the field id will be encoded in the 4 MSB as a delta. Otherwise, the
-   * field id will follow the type header as a zigzag varint.
-   */
-  public void writeFieldBegin(TField field) throws TException {
-    if (field.type == TType.BOOL) {
-      // we want to possibly include the value, so we'll wait.
-      booleanField_ = field;
-    } else {
-      writeFieldBeginInternal(field, (byte)-1);
-    }
-  }
-
-  /**
-   * The workhorse of writeFieldBegin. It has the option of doing a
-   * 'type override' of the type header. This is used specifically in the
-   * boolean field case.
-   */
-  private void writeFieldBeginInternal(TField field, byte typeOverride) throws TException {
-    // short lastField = lastField_.pop();
-
-    // if there's a type override, use that.
-    byte typeToWrite = typeOverride == -1 ? getCompactType(field.type) : typeOverride;
-
-    // check if we can use delta encoding for the field id
-    if (field.id > lastFieldId_ && field.id - lastFieldId_ <= 15) {
-      // write them together
-      writeByteDirect((field.id - lastFieldId_) << 4 | typeToWrite);
-    } else {
-      // write them separate
-      writeByteDirect(typeToWrite);
-      writeI16(field.id);
-    }
-
-    lastFieldId_ = field.id;
-    // lastField_.push(field.id);
-  }
-
-  /**
-   * Write the STOP symbol so we know there are no more fields in this struct.
-   */
-  public void writeFieldStop() throws TException {
-    writeByteDirect(TType.STOP);
-  }
-
-  /**
-   * Write a map header. If the map is empty, omit the key and value type
-   * headers, as we don't need any additional information to skip it.
-   */
-  public void writeMapBegin(TMap map) throws TException {
-    if (map.size == 0) {
-      writeByteDirect(0);
-    } else {
-      writeVarint32(map.size);
-      writeByteDirect(getCompactType(map.keyType) << 4 | getCompactType(map.valueType));
-    }
-  }
-
-  /**
-   * Write a list header.
-   */
-  public void writeListBegin(TList list) throws TException {
-    writeCollectionBegin(list.elemType, list.size);
-  }
-
-  /**
-   * Write a set header.
-   */
-  public void writeSetBegin(TSet set) throws TException {
-    writeCollectionBegin(set.elemType, set.size);
-  }
-
-  /**
-   * Write a boolean value. Potentially, this could be a boolean field, in
-   * which case the field header info isn't written yet. If so, decide what the
-   * right type header is for the value and then write the field header.
-   * Otherwise, write a single byte.
-   */
-  public void writeBool(boolean b) throws TException {
-    if (booleanField_ != null) {
-      // we haven't written the field header yet
-      writeFieldBeginInternal(booleanField_, b ? Types.BOOLEAN_TRUE : Types.BOOLEAN_FALSE);
-      booleanField_ = null;
-    } else {
-      // we're not part of a field, so just write the value.
-      writeByteDirect(b ? Types.BOOLEAN_TRUE : Types.BOOLEAN_FALSE);
-    }
-  }
-
-  /**
-   * Write a byte. Nothing to see here!
-   */
-  public void writeByte(byte b) throws TException {
-    writeByteDirect(b);
-  }
-
-  /**
-   * Write an I16 as a zigzag varint.
-   */
-  public void writeI16(short i16) throws TException {
-    writeVarint32(intToZigZag(i16));
-  }
-
-  /**
-   * Write an i32 as a zigzag varint.
-   */
-  public void writeI32(int i32) throws TException {
-    writeVarint32(intToZigZag(i32));
-  }
-
-  /**
-   * Write an i64 as a zigzag varint.
-   */
-  public void writeI64(long i64) throws TException {
-    writeVarint64(longToZigzag(i64));
-  }
-
-  /**
-   * Write a double to the wire as 8 bytes.
-   */
-  public void writeDouble(double dub) throws TException {
-    fixedLongToBytes(Double.doubleToLongBits(dub), temp, 0);
-    trans_.write(temp, 0, 8);
-  }
-
-  /**
-   * Write a string to the wire with a varint size preceding.
-   */
-  public void writeString(String str) throws TException {
-    try {
-      byte[] bytes = str.getBytes("UTF-8");
-      writeBinary(bytes, 0, bytes.length);
-    } catch (UnsupportedEncodingException e) {
-      throw new TException("UTF-8 not supported!");
-    }
-  }
-
-  /**
-   * Write a byte array, using a varint for the size.
-   */
-  public void writeBinary(ByteBuffer bin) throws TException {
-    int length = bin.limit() - bin.position();
-    writeBinary(bin.array(), bin.position() + bin.arrayOffset(), length);
-  }
-
-  private void writeBinary(byte[] buf, int offset, int length) throws TException {
-    writeVarint32(length);
-    trans_.write(buf, offset, length);
-  }
-
-  //
-  // These methods are called by structs, but don't actually have any wire
-  // output or purpose.
-  //
-
-  public void writeMessageEnd() throws TException {}
-  public void writeMapEnd() throws TException {}
-  public void writeListEnd() throws TException {}
-  public void writeSetEnd() throws TException {}
-  public void writeFieldEnd() throws TException {}
-
-  //
-  // Internal writing methods
-  //
-
-  /**
-   * Abstract method for writing the start of lists and sets. List and sets on
-   * the wire differ only by the type indicator.
-   */
-  protected void writeCollectionBegin(byte elemType, int size) throws TException {
-    if (size <= 14) {
-      writeByteDirect(size << 4 | getCompactType(elemType));
-    } else {
-      writeByteDirect(0xf0 | getCompactType(elemType));
-      writeVarint32(size);
-    }
-  }
-
-  /**
-   * Write an i32 as a varint. Results in 1-5 bytes on the wire.
-   * TODO: make a permanent buffer like writeVarint64?
-   */
-  private void writeVarint32(int n) throws TException {
-    int idx = 0;
-    while (true) {
-      if ((n & ~0x7F) == 0) {
-        temp[idx++] = (byte)n;
-        // writeByteDirect((byte)n);
-        break;
-        // return;
-      } else {
-        temp[idx++] = (byte)((n & 0x7F) | 0x80);
-        // writeByteDirect((byte)((n & 0x7F) | 0x80));
-        n >>>= 7;
-      }
-    }
-    trans_.write(temp, 0, idx);
-  }
-
-  /**
-   * Write an i64 as a varint. Results in 1-10 bytes on the wire.
-   */
-  private void writeVarint64(long n) throws TException {
-    int idx = 0;
-    while (true) {
-      if ((n & ~0x7FL) == 0) {
-        temp[idx++] = (byte)n;
-        break;
-      } else {
-        temp[idx++] = ((byte)((n & 0x7F) | 0x80));
-        n >>>= 7;
-      }
-    }
-    trans_.write(temp, 0, idx);
-  }
-
-  /**
-   * Convert l into a zigzag long. This allows negative numbers to be
-   * represented compactly as a varint.
-   */
-  private long longToZigzag(long l) {
-    return (l << 1) ^ (l >> 63);
-  }
-
-  /**
-   * Convert n into a zigzag int. This allows negative numbers to be
-   * represented compactly as a varint.
-   */
-  private int intToZigZag(int n) {
-    return (n << 1) ^ (n >> 31);
-  }
-
-  /**
-   * Convert a long into little-endian bytes in buf starting at off and going
-   * until off+7.
-   */
-  private void fixedLongToBytes(long n, byte[] buf, int off) {
-    buf[off+0] = (byte)( n        & 0xff);
-    buf[off+1] = (byte)((n >> 8 ) & 0xff);
-    buf[off+2] = (byte)((n >> 16) & 0xff);
-    buf[off+3] = (byte)((n >> 24) & 0xff);
-    buf[off+4] = (byte)((n >> 32) & 0xff);
-    buf[off+5] = (byte)((n >> 40) & 0xff);
-    buf[off+6] = (byte)((n >> 48) & 0xff);
-    buf[off+7] = (byte)((n >> 56) & 0xff);
-  }
-
-  /**
-   * Writes a byte without any possibility of all that field header nonsense.
-   * Used internally by other writing methods that know they need to write a byte.
-   */
-  private void writeByteDirect(byte b) throws TException {
-    temp[0] = b;
-    trans_.write(temp, 0, 1);
-  }
-
-  /**
-   * Writes a byte without any possibility of all that field header nonsense.
-   */
-  private void writeByteDirect(int n) throws TException {
-    writeByteDirect((byte)n);
-  }
-
-
-  //
-  // Reading methods.
-  //
-
-  /**
-   * Read a message header.
-   */
-  public TMessage readMessageBegin() throws TException {
-    byte protocolId = readByte();
-    if (protocolId != PROTOCOL_ID) {
-      throw new TProtocolException("Expected protocol id " + Integer.toHexString(PROTOCOL_ID) + " but got " + Integer.toHexString(protocolId));
-    }
-    byte versionAndType = readByte();
-    byte version = (byte)(versionAndType & VERSION_MASK);
-    if (version != VERSION) {
-      throw new TProtocolException("Expected version " + VERSION + " but got " + version);
-    }
-    byte type = (byte)((versionAndType >> TYPE_SHIFT_AMOUNT) & TYPE_BITS);
-    int seqid = readVarint32();
-    String messageName = readString();
-    return new TMessage(messageName, type, seqid);
-  }
-
-  /**
-   * Read a struct begin. There's nothing on the wire for this, but it is our
-   * opportunity to push a new struct begin marker onto the field stack.
-   */
-  public TStruct readStructBegin() throws TException {
-    lastField_.push(lastFieldId_);
-    lastFieldId_ = 0;
-    return ANONYMOUS_STRUCT;
-  }
-
-  /**
-   * Doesn't actually consume any wire data, just removes the last field for
-   * this struct from the field stack.
-   */
-  public void readStructEnd() throws TException {
-    // consume the last field we read off the wire.
-    lastFieldId_ = lastField_.pop();
-  }
-
-  /**
-   * Read a field header off the wire.
-   */
-  public TField readFieldBegin() throws TException {
-    byte type = readByte();
-
-    // if it's a stop, then we can return immediately, as the struct is over.
-    if (type == TType.STOP) {
-      return TSTOP;
-    }
-
-    short fieldId;
-
-    // mask off the 4 MSB of the type header. it could contain a field id delta.
-    short modifier = (short)((type & 0xf0) >> 4);
-    if (modifier == 0) {
-      // not a delta. look ahead for the zigzag varint field id.
-      fieldId = readI16();
-    } else {
-      // has a delta. add the delta to the last read field id.
-      fieldId = (short)(lastFieldId_ + modifier);
-    }
-
-    TField field = new TField("", getTType((byte)(type & 0x0f)), fieldId);
-
-    // if this happens to be a boolean field, the value is encoded in the type
-    if (isBoolType(type)) {
-      // save the boolean value in a special instance variable.
-      boolValue_ = (byte)(type & 0x0f) == Types.BOOLEAN_TRUE ? Boolean.TRUE : Boolean.FALSE;
-    }
-
-    // push the new field onto the field stack so we can keep the deltas going.
-    lastFieldId_ = field.id;
-    return field;
-  }
-
-  /**
-   * Read a map header off the wire. If the size is zero, skip reading the key
-   * and value type. This means that 0-length maps will yield TMaps without the
-   * "correct" types.
-   */
-  public TMap readMapBegin() throws TException {
-    int size = readVarint32();
-    checkContainerReadLength(size);
-    byte keyAndValueType = size == 0 ? 0 : readByte();
-    return new TMap(getTType((byte)(keyAndValueType >> 4)), getTType((byte)(keyAndValueType & 0xf)), size);
-  }
-
-  /**
-   * Read a list header off the wire. If the list size is 0-14, the size will
-   * be packed into the element type header. If it's a longer list, the 4 MSB
-   * of the element type header will be 0xF, and a varint will follow with the
-   * true size.
-   */
-  public TList readListBegin() throws TException {
-    byte size_and_type = readByte();
-    int size = (size_and_type >> 4) & 0x0f;
-    if (size == 15) {
-      size = readVarint32();
-    }
-    checkContainerReadLength(size);
-    byte type = getTType(size_and_type);
-    return new TList(type, size);
-  }
-
-  /**
-   * Read a set header off the wire. If the set size is 0-14, the size will
-   * be packed into the element type header. If it's a longer set, the 4 MSB
-   * of the element type header will be 0xF, and a varint will follow with the
-   * true size.
-   */
-  public TSet readSetBegin() throws TException {
-    return new TSet(readListBegin());
-  }
-
-  /**
-   * Read a boolean off the wire. If this is a boolean field, the value should
-   * already have been read during readFieldBegin, so we'll just consume the
-   * pre-stored value. Otherwise, read a byte.
-   */
-  public boolean readBool() throws TException {
-    if (boolValue_ != null) {
-      boolean result = boolValue_.booleanValue();
-      boolValue_ = null;
-      return result;
-    }
-    return readByte() == Types.BOOLEAN_TRUE;
-  }
-
-  /**
-   * Read a single byte off the wire. Nothing interesting here.
-   */
-  public byte readByte() throws TException {
-    byte b;
-    if (trans_.getBytesRemainingInBuffer() > 0) {
-      b = trans_.getBuffer()[trans_.getBufferPosition()];
-      trans_.consumeBuffer(1);
-    } else {
-      trans_.readAll(temp, 0, 1);
-      b = temp[0];
-    }
-    return b;
-  }
-
-  /**
-   * Read an i16 from the wire as a zigzag varint.
-   */
-  public short readI16() throws TException {
-    return (short)zigzagToInt(readVarint32());
-  }
-
-  /**
-   * Read an i32 from the wire as a zigzag varint.
-   */
-  public int readI32() throws TException {
-    return zigzagToInt(readVarint32());
-  }
-
-  /**
-   * Read an i64 from the wire as a zigzag varint.
-   */
-  public long readI64() throws TException {
-    return zigzagToLong(readVarint64());
-  }
-
-  /**
-   * No magic here - just read a double off the wire.
-   */
-  public double readDouble() throws TException {
-    trans_.readAll(temp, 0, 8);
-    return Double.longBitsToDouble(bytesToLong(temp));
-  }
-
-  /**
-   * Reads a byte[] (via readBinary), and then UTF-8 decodes it.
-   */
-  public String readString() throws TException {
-    int length = readVarint32();
-    checkStringReadLength(length);
-
-    if (length == 0) {
-      return "";
-    }
-
-    try {
-      if (trans_.getBytesRemainingInBuffer() >= length) {
-        String str = new String(trans_.getBuffer(), trans_.getBufferPosition(), length, "UTF-8");
-        trans_.consumeBuffer(length);
-        return str;
-      } else {
-        return new String(readBinary(length), "UTF-8");
-      }
-    } catch (UnsupportedEncodingException e) {
-      throw new TException("UTF-8 not supported!");
-    }
-  }
-
-  /**
-   * Read a byte[] from the wire.
-   */
-  public ByteBuffer readBinary() throws TException {
-    int length = readVarint32();
-    checkStringReadLength(length);
-    if (length == 0) return EMPTY_BUFFER;
-
-    if (trans_.getBytesRemainingInBuffer() >= length) {
-      ByteBuffer bb = ByteBuffer.wrap(trans_.getBuffer(), trans_.getBufferPosition(), length);
-      trans_.consumeBuffer(length);
-      return bb;
-    }
-
-    byte[] buf = new byte[length];
-    trans_.readAll(buf, 0, length);
-    return ByteBuffer.wrap(buf);
-  }
-
-  /**
-   * Read a byte[] of a known length from the wire.
-   */
-  private byte[] readBinary(int length) throws TException {
-    if (length == 0) return EMPTY_BYTES;
-
-    byte[] buf = new byte[length];
-    trans_.readAll(buf, 0, length);
-    return buf;
-  }
-
-  private void checkStringReadLength(int length) throws TProtocolException {
-    if (length < 0) {
-      throw new TProtocolException(TProtocolException.NEGATIVE_SIZE,
-                                   "Negative length: " + length);
-    }
-    if (stringLengthLimit_ != NO_LENGTH_LIMIT && length > stringLengthLimit_) {
-      throw new TProtocolException(TProtocolException.SIZE_LIMIT,
-                                   "Length exceeded max allowed: " + length);
-    }
-  }
-
-  private void checkContainerReadLength(int length) throws TProtocolException {
-    if (length < 0) {
-      throw new TProtocolException(TProtocolException.NEGATIVE_SIZE,
-                                   "Negative length: " + length);
-    }
-    if (containerLengthLimit_ != NO_LENGTH_LIMIT && length > containerLengthLimit_) {
-      throw new TProtocolException(TProtocolException.SIZE_LIMIT,
-                                   "Length exceeded max allowed: " + length);
-    }
-  }
-
-  //
-  // These methods are here for the struct to call, but don't have any wire
-  // encoding.
-  //
-  public void readMessageEnd() throws TException {}
-  public void readFieldEnd() throws TException {}
-  public void readMapEnd() throws TException {}
-  public void readListEnd() throws TException {}
-  public void readSetEnd() throws TException {}
-
-  //
-  // Internal reading methods
-  //
-
-  /**
-   * Read an i32 from the wire as a varint. The MSB of each byte is set
-   * if there is another byte to follow. This can read up to 5 bytes.
-   */
-  private int readVarint32() throws TException {
-    int result = 0;
-    int shift = 0;
-    if (trans_.getBytesRemainingInBuffer() >= 5) {
-      byte[] buf = trans_.getBuffer();
-      int pos = trans_.getBufferPosition();
-      int off = 0;
-      while (true) {
-        byte b = buf[pos+off];
-        result |= (int) (b & 0x7f) << shift;
-        if ((b & 0x80) != 0x80) break;
-        shift += 7;
-        off++;
-      }
-      trans_.consumeBuffer(off+1);
-    } else {
-      while (true) {
-        byte b = readByte();
-        result |= (int) (b & 0x7f) << shift;
-        if ((b & 0x80) != 0x80) break;
-        shift += 7;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Read an i64 from the wire as a proper varint. The MSB of each byte is set
-   * if there is another byte to follow. This can read up to 10 bytes.
-   */
-  private long readVarint64() throws TException {
-    int shift = 0;
-    long result = 0;
-    if (trans_.getBytesRemainingInBuffer() >= 10) {
-      byte[] buf = trans_.getBuffer();
-      int pos = trans_.getBufferPosition();
-      int off = 0;
-      while (true) {
-        byte b = buf[pos+off];
-        result |= (long) (b & 0x7f) << shift;
-        if ((b & 0x80) != 0x80) break;
-        shift += 7;
-        off++;
-      }
-      trans_.consumeBuffer(off+1);
-    } else {
-      while (true) {
-        byte b = readByte();
-        result |= (long) (b & 0x7f) << shift;
-        if ((b & 0x80) != 0x80) break;
-        shift +=7;
-      }
-    }
-    return result;
-  }
-
-  //
-  // encoding helpers
-  //
-
-  /**
-   * Convert from zigzag int to int.
-   */
-  private int zigzagToInt(int n) {
-    return (n >>> 1) ^ -(n & 1);
-  }
-
-  /**
-   * Convert from zigzag long to long.
-   */
-  private long zigzagToLong(long n) {
-    return (n >>> 1) ^ -(n & 1);
-  }
-
-  /**
-   * Note that it's important that the mask bytes are long literals,
-   * otherwise they'll default to ints, and when you shift an int left 56 bits,
-   * you just get a messed up int.
-   */
-  private long bytesToLong(byte[] bytes) {
-    return
-      ((bytes[7] & 0xffL) << 56) |
-      ((bytes[6] & 0xffL) << 48) |
-      ((bytes[5] & 0xffL) << 40) |
-      ((bytes[4] & 0xffL) << 32) |
-      ((bytes[3] & 0xffL) << 24) |
-      ((bytes[2] & 0xffL) << 16) |
-      ((bytes[1] & 0xffL) <<  8) |
-      ((bytes[0] & 0xffL));
-  }
-
-  //
-  // type testing and converting
-  //
-
-  private boolean isBoolType(byte b) {
-    int lowerNibble = b & 0x0f;
-    return lowerNibble == Types.BOOLEAN_TRUE || lowerNibble == Types.BOOLEAN_FALSE;
-  }
-
-  /**
-   * Given a TCompactProtocol.Types constant, convert it to its corresponding
-   * TType value.
-   */
-  private byte getTType(byte type) throws TProtocolException {
-    switch ((byte)(type & 0x0f)) {
-      case TType.STOP:
-        return TType.STOP;
-      case Types.BOOLEAN_FALSE:
-      case Types.BOOLEAN_TRUE:
-        return TType.BOOL;
-      case Types.BYTE:
-        return TType.BYTE;
-      case Types.I16:
-        return TType.I16;
-      case Types.I32:
-        return TType.I32;
-      case Types.I64:
-        return TType.I64;
-      case Types.DOUBLE:
-        return TType.DOUBLE;
-      case Types.BINARY:
-        return TType.STRING;
-      case Types.LIST:
-        return TType.LIST;
-      case Types.SET:
-        return TType.SET;
-      case Types.MAP:
-        return TType.MAP;
-      case Types.STRUCT:
-        return TType.STRUCT;
-      default:
-        throw new TProtocolException("don't know what type: " + (byte)(type & 0x0f));
-    }
-  }
-
-  /**
-   * Given a TType value, find the appropriate TCompactProtocol.Types constant.
-   */
-  private byte getCompactType(byte ttype) {
-    return ttypeToCompactType[ttype];
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TField.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TField.java
deleted file mode 100644
index 31331bb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TField.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates field metadata.
- *
- */
-public class TField {
-  public TField() {
-    this("", TType.STOP, (short)0);
-  }
-
-  public TField(String n, byte t, short i) {
-    name = n;
-    type = t;
-    id = i;
-  }
-
-  public final String name;
-  public final byte   type;
-  public final short  id;
-
-  public String toString() {
-    return "<TField name:'" + name + "' type:" + type + " field-id:" + id + ">";
-  }
-
-  @Override
-  public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + id;
-    result = prime * result + ((name == null) ? 0 : name.hashCode());
-    result = prime * result + type;
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj)
-      return true;
-    if (obj == null)
-      return false;
-    if (getClass() != obj.getClass())
-      return false;
-    TField otherField = (TField) obj;
-    return type == otherField.type && id == otherField.id;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
deleted file mode 100644
index fd54fdf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
+++ /dev/null
@@ -1,1007 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Stack;
-
-import org.apache.thrift.TByteArrayOutputStream;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * JSON protocol implementation for thrift.
- *
- * This is a full-featured protocol supporting write and read.
- *
- * Please see the C++ class header for a detailed description of the
- * protocol's wire format.
- *
- */
-public class TJSONProtocol extends TProtocol {
-
-  /**
-   * Factory for JSON protocol objects
-   */
-  public static class Factory implements TProtocolFactory {
-    protected boolean fieldNamesAsString_ = false;
-
-    public Factory() {}
-
-    public Factory(boolean fieldNamesAsString) {
-      fieldNamesAsString_ = fieldNamesAsString;
-    }
-
-    public TProtocol getProtocol(TTransport trans) {
-      return new TJSONProtocol(trans, fieldNamesAsString_);
-    }
-
-  }
-
-  private static final byte[] COMMA = new byte[] {','};
-  private static final byte[] COLON = new byte[] {':'};
-  private static final byte[] LBRACE = new byte[] {'{'};
-  private static final byte[] RBRACE = new byte[] {'}'};
-  private static final byte[] LBRACKET = new byte[] {'['};
-  private static final byte[] RBRACKET = new byte[] {']'};
-  private static final byte[] QUOTE = new byte[] {'"'};
-  private static final byte[] BACKSLASH = new byte[] {'\\'};
-  private static final byte[] ZERO = new byte[] {'0'};
-
-  private static final byte[] ESCSEQ = new byte[] {'\\','u','0','0'};
-
-  private static final long  VERSION = 1;
-
-  private static final byte[] JSON_CHAR_TABLE = {
-    /*  0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F */
-    0,  0,  0,  0,  0,  0,  0,  0,'b','t','n',  0,'f','r',  0,  0, // 0
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, // 1
-    1,  1,'"',  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, // 2
-  };
-
-  private static final String ESCAPE_CHARS = "\"\\/bfnrt";
-
-  private static final byte[] ESCAPE_CHAR_VALS = {
-    '"', '\\', '/', '\b', '\f', '\n', '\r', '\t',
-  };
-
-  private static final int  DEF_STRING_SIZE = 16;
-
-  private static final byte[] NAME_BOOL = new byte[] {'t', 'f'};
-  private static final byte[] NAME_BYTE = new byte[] {'i','8'};
-  private static final byte[] NAME_I16 = new byte[] {'i','1','6'};
-  private static final byte[] NAME_I32 = new byte[] {'i','3','2'};
-  private static final byte[] NAME_I64 = new byte[] {'i','6','4'};
-  private static final byte[] NAME_DOUBLE = new byte[] {'d','b','l'};
-  private static final byte[] NAME_STRUCT = new byte[] {'r','e','c'};
-  private static final byte[] NAME_STRING = new byte[] {'s','t','r'};
-  private static final byte[] NAME_MAP = new byte[] {'m','a','p'};
-  private static final byte[] NAME_LIST = new byte[] {'l','s','t'};
-  private static final byte[] NAME_SET = new byte[] {'s','e','t'};
-
-  private static final TStruct ANONYMOUS_STRUCT = new TStruct();
-
-  private static final byte[] getTypeNameForTypeID(byte typeID)
-    throws TException {
-    switch (typeID) {
-    case TType.BOOL:
-      return NAME_BOOL;
-    case TType.BYTE:
-      return NAME_BYTE;
-    case TType.I16:
-      return NAME_I16;
-    case TType.I32:
-      return NAME_I32;
-    case TType.I64:
-      return NAME_I64;
-    case TType.DOUBLE:
-      return NAME_DOUBLE;
-    case TType.STRING:
-      return NAME_STRING;
-    case TType.STRUCT:
-      return NAME_STRUCT;
-    case TType.MAP:
-      return NAME_MAP;
-    case TType.SET:
-      return NAME_SET;
-    case TType.LIST:
-      return NAME_LIST;
-    default:
-      throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED,
-                                   "Unrecognized type");
-    }
-  }
-
-  private static final byte getTypeIDForTypeName(byte[] name)
-    throws TException {
-    byte result = TType.STOP;
-    if (name.length > 1) {
-      switch (name[0]) {
-      case 'd':
-        result = TType.DOUBLE;
-        break;
-      case 'i':
-        switch (name[1]) {
-        case '8':
-          result = TType.BYTE;
-          break;
-        case '1':
-          result = TType.I16;
-          break;
-        case '3':
-          result = TType.I32;
-          break;
-        case '6':
-          result = TType.I64;
-          break;
-        }
-        break;
-      case 'l':
-        result = TType.LIST;
-        break;
-      case 'm':
-        result = TType.MAP;
-        break;
-      case 'r':
-        result = TType.STRUCT;
-        break;
-      case 's':
-        if (name[1] == 't') {
-          result = TType.STRING;
-        }
-        else if (name[1] == 'e') {
-          result = TType.SET;
-        }
-        break;
-      case 't':
-        result = TType.BOOL;
-        break;
-      }
-    }
-    if (result == TType.STOP) {
-      throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED,
-                                   "Unrecognized type");
-    }
-    return result;
-  }
-
-  // Base class for tracking JSON contexts that may require inserting/reading
-  // additional JSON syntax characters
-  // This base context does nothing.
-  protected class JSONBaseContext {
-    protected void write() throws TException {}
-
-    protected void read() throws TException {}
-
-    protected boolean escapeNum() { return false; }
-  }
-
-  // Context for JSON lists. Will insert/read commas before each item except
-  // for the first one
-  protected class JSONListContext extends JSONBaseContext {
-    private boolean first_ = true;
-
-    @Override
-    protected void write() throws TException {
-      if (first_) {
-        first_ = false;
-      } else {
-        trans_.write(COMMA);
-      }
-    }
-
-    @Override
-    protected void read() throws TException {
-      if (first_) {
-        first_ = false;
-      } else {
-        readJSONSyntaxChar(COMMA);
-      }
-    }
-  }
-
-  // Context for JSON records. Will insert/read colons before the value portion
-  // of each record pair, and commas before each key except the first. In
-  // addition, will indicate that numbers in the key position need to be
-  // escaped in quotes (since JSON keys must be strings).
-  protected class JSONPairContext extends JSONBaseContext {
-    private boolean first_ = true;
-    private boolean colon_ = true;
-
-    @Override
-    protected void write() throws TException {
-      if (first_) {
-        first_ = false;
-        colon_ = true;
-      } else {
-        trans_.write(colon_ ? COLON : COMMA);
-        colon_ = !colon_;
-      }
-    }
-
-    @Override
-    protected void read() throws TException {
-      if (first_) {
-        first_ = false;
-        colon_ = true;
-      } else {
-        readJSONSyntaxChar(colon_ ? COLON : COMMA);
-        colon_ = !colon_;
-      }
-    }
-
-    @Override
-    protected boolean escapeNum() {
-      return colon_;
-    }
-  }
-
-  // Holds up to one byte from the transport
-  protected class LookaheadReader {
-
-    private boolean hasData_;
-    private byte[] data_ = new byte[1];
-
-    // Return and consume the next byte to be read, either taking it from the
-    // data buffer if present or getting it from the transport otherwise.
-    protected byte read() throws TException {
-      if (hasData_) {
-        hasData_ = false;
-      }
-      else {
-        trans_.readAll(data_, 0, 1);
-      }
-      return data_[0];
-    }
-
-    // Return the next byte to be read without consuming, filling the data
-    // buffer if it has not been filled already.
-    protected byte peek() throws TException {
-      if (!hasData_) {
-        trans_.readAll(data_, 0, 1);
-      }
-      hasData_ = true;
-      return data_[0];
-    }
-  }
-
-  // Stack of nested contexts that we may be in
-  private Stack<JSONBaseContext> contextStack_ = new Stack<JSONBaseContext>();
-
-  // Current context that we are in
-  private JSONBaseContext context_ = new JSONBaseContext();
-
-  // Reader that manages a 1-byte buffer
-  private LookaheadReader reader_ = new LookaheadReader();
-
-  // Write out the TField names as a string instead of the default integer value
-  private boolean fieldNamesAsString_ = false;
-
-  // Push a new JSON context onto the stack.
-  private void pushContext(JSONBaseContext c) {
-    contextStack_.push(context_);
-    context_ = c;
-  }
-
-  // Pop the last JSON context off the stack
-  private void popContext() {
-    context_ = contextStack_.pop();
-  }
-
-  // Reset the context stack to its initial state
-  private void resetContext() {
-    while (!contextStack_.isEmpty()) {
-      popContext();
-    }
-  }
-
-  /**
-   * Constructor
-   */
-  public TJSONProtocol(TTransport trans) {
-    super(trans);
-  }
-
-  public TJSONProtocol(TTransport trans, boolean fieldNamesAsString) {
-    super(trans);
-    fieldNamesAsString_ = fieldNamesAsString;
-  }
-
-  @Override
-  public void reset() {
-    contextStack_.clear();
-    context_ = new JSONBaseContext();
-    reader_ = new LookaheadReader();
-  }
-
-  // Temporary buffer used by several methods
-  private byte[] tmpbuf_ = new byte[4];
-
-  // Read a byte that must match b[0]; otherwise an exception is thrown.
-  // Marked protected to avoid synthetic accessor in JSONListContext.read
-  // and JSONPairContext.read
-  protected void readJSONSyntaxChar(byte[] b) throws TException {
-    byte ch = reader_.read();
-    if (ch != b[0]) {
-      throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                   "Unexpected character:" + (char)ch);
-    }
-  }
-
-  // Convert a byte containing a hex char ('0'-'9' or 'a'-'f') into its
-  // corresponding hex value
-  private static final byte hexVal(byte ch) throws TException {
-    if ((ch >= '0') && (ch <= '9')) {
-      return (byte)((char)ch - '0');
-    }
-    else if ((ch >= 'a') && (ch <= 'f')) {
-      return (byte)((char)ch - 'a' + 10);
-    }
-    else {
-      throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                   "Expected hex character");
-    }
-  }
-
-  // Convert a byte containing a hex value to its corresponding hex character
-  private static final byte hexChar(byte val) {
-    val &= 0x0F;
-    if (val < 10) {
-      return (byte)((char)val + '0');
-    }
-    else {
-      return (byte)((char)(val - 10) + 'a');
-    }
-  }
-
-  // Write the bytes in array buf as a JSON characters, escaping as needed
-  private void writeJSONString(byte[] b) throws TException {
-    context_.write();
-    trans_.write(QUOTE);
-    int len = b.length;
-    for (int i = 0; i < len; i++) {
-      if ((b[i] & 0x00FF) >= 0x30) {
-        if (b[i] == BACKSLASH[0]) {
-          trans_.write(BACKSLASH);
-          trans_.write(BACKSLASH);
-        }
-        else {
-          trans_.write(b, i, 1);
-        }
-      }
-      else {
-        tmpbuf_[0] = JSON_CHAR_TABLE[b[i]];
-        if (tmpbuf_[0] == 1) {
-          trans_.write(b, i, 1);
-        }
-        else if (tmpbuf_[0] > 1) {
-          trans_.write(BACKSLASH);
-          trans_.write(tmpbuf_, 0, 1);
-        }
-        else {
-          trans_.write(ESCSEQ);
-          tmpbuf_[0] = hexChar((byte)(b[i] >> 4));
-          tmpbuf_[1] = hexChar(b[i]);
-          trans_.write(tmpbuf_, 0, 2);
-        }
-      }
-    }
-    trans_.write(QUOTE);
-  }
-
-  // Write out number as a JSON value. If the context dictates so, it will be
-  // wrapped in quotes to output as a JSON string.
-  private void writeJSONInteger(long num) throws TException {
-    context_.write();
-    String str = Long.toString(num);
-    boolean escapeNum = context_.escapeNum();
-    if (escapeNum) {
-      trans_.write(QUOTE);
-    }
-    try {
-      byte[] buf = str.getBytes("UTF-8");
-      trans_.write(buf);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-    if (escapeNum) {
-      trans_.write(QUOTE);
-    }
-  }
-
-  // Write out a double as a JSON value. If it is NaN or infinity or if the
-  // context dictates escaping, write out as JSON string.
-  private void writeJSONDouble(double num) throws TException {
-    context_.write();
-    String str = Double.toString(num);
-    boolean special = false;
-    switch (str.charAt(0)) {
-    case 'N': // NaN
-    case 'I': // Infinity
-      special = true;
-      break;
-    case '-':
-      if (str.charAt(1) == 'I') { // -Infinity
-        special = true;
-      }
-      break;
-    default:
-      break;
-  }
-
-    boolean escapeNum = special || context_.escapeNum();
-    if (escapeNum) {
-      trans_.write(QUOTE);
-    }
-    try {
-      byte[] b = str.getBytes("UTF-8");
-      trans_.write(b, 0, b.length);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-    if (escapeNum) {
-      trans_.write(QUOTE);
-    }
-  }
-
-  // Write out contents of byte array b as a JSON string with base-64 encoded
-  // data
-  private void writeJSONBase64(byte[] b, int offset, int length) throws TException {
-    context_.write();
-    trans_.write(QUOTE);
-    int len = length;
-    int off = offset;
-    while (len >= 3) {
-      // Encode 3 bytes at a time
-      TBase64Utils.encode(b, off, 3, tmpbuf_, 0);
-      trans_.write(tmpbuf_, 0, 4);
-      off += 3;
-      len -= 3;
-    }
-    if (len > 0) {
-      // Encode remainder
-      TBase64Utils.encode(b, off, len, tmpbuf_, 0);
-      trans_.write(tmpbuf_, 0, len + 1);
-    }
-    trans_.write(QUOTE);
-  }
-
-  private void writeJSONObjectStart() throws TException {
-    context_.write();
-    trans_.write(LBRACE);
-    pushContext(new JSONPairContext());
-  }
-
-  private void writeJSONObjectEnd() throws TException {
-    popContext();
-    trans_.write(RBRACE);
-  }
-
-  private void writeJSONArrayStart() throws TException {
-    context_.write();
-    trans_.write(LBRACKET);
-    pushContext(new JSONListContext());
-  }
-
-  private void writeJSONArrayEnd() throws TException {
-    popContext();
-    trans_.write(RBRACKET);
-  }
-
-  @Override
-  public void writeMessageBegin(TMessage message) throws TException {
-    resetContext(); // THRIFT-3743
-    writeJSONArrayStart();
-    writeJSONInteger(VERSION);
-    try {
-      byte[] b = message.name.getBytes("UTF-8");
-      writeJSONString(b);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-    writeJSONInteger(message.type);
-    writeJSONInteger(message.seqid);
-  }
-
-  @Override
-  public void writeMessageEnd() throws TException {
-    writeJSONArrayEnd();
-  }
-
-  @Override
-  public void writeStructBegin(TStruct struct) throws TException {
-    writeJSONObjectStart();
-  }
-
-  @Override
-  public void writeStructEnd() throws TException {
-    writeJSONObjectEnd();
-  }
-
-  @Override
-  public void writeFieldBegin(TField field) throws TException {
-    if (fieldNamesAsString_) {
-      writeString(field.name);
-    } else {
-      writeJSONInteger(field.id);
-    }
-    writeJSONObjectStart();
-    writeJSONString(getTypeNameForTypeID(field.type));
-  }
-
-  @Override
-  public void writeFieldEnd() throws TException {
-    writeJSONObjectEnd();
-  }
-
-  @Override
-  public void writeFieldStop() {}
-
-  @Override
-  public void writeMapBegin(TMap map) throws TException {
-    writeJSONArrayStart();
-    writeJSONString(getTypeNameForTypeID(map.keyType));
-    writeJSONString(getTypeNameForTypeID(map.valueType));
-    writeJSONInteger(map.size);
-    writeJSONObjectStart();
-  }
-
-  @Override
-  public void writeMapEnd() throws TException {
-    writeJSONObjectEnd();
-    writeJSONArrayEnd();
-  }
-
-  @Override
-  public void writeListBegin(TList list) throws TException {
-    writeJSONArrayStart();
-    writeJSONString(getTypeNameForTypeID(list.elemType));
-    writeJSONInteger(list.size);
-  }
-
-  @Override
-  public void writeListEnd() throws TException {
-    writeJSONArrayEnd();
-  }
-
-  @Override
-  public void writeSetBegin(TSet set) throws TException {
-    writeJSONArrayStart();
-    writeJSONString(getTypeNameForTypeID(set.elemType));
-    writeJSONInteger(set.size);
-  }
-
-  @Override
-  public void writeSetEnd() throws TException {
-    writeJSONArrayEnd();
-  }
-
-  @Override
-  public void writeBool(boolean b) throws TException {
-    writeJSONInteger(b ? (long)1 : (long)0);
-  }
-
-  @Override
-  public void writeByte(byte b) throws TException {
-    writeJSONInteger((long)b);
-  }
-
-  @Override
-  public void writeI16(short i16) throws TException {
-    writeJSONInteger((long)i16);
-  }
-
-  @Override
-  public void writeI32(int i32) throws TException {
-    writeJSONInteger((long)i32);
-  }
-
-  @Override
-  public void writeI64(long i64) throws TException {
-    writeJSONInteger(i64);
-  }
-
-  @Override
-  public void writeDouble(double dub) throws TException {
-    writeJSONDouble(dub);
-  }
-
-  @Override
-  public void writeString(String str) throws TException {
-    try {
-      byte[] b = str.getBytes("UTF-8");
-      writeJSONString(b);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  @Override
-  public void writeBinary(ByteBuffer bin) throws TException {
-    writeJSONBase64(bin.array(), bin.position() + bin.arrayOffset(), bin.limit() - bin.position() - bin.arrayOffset());
-  }
-
-  /**
-   * Reading methods.
-   */
-
-  // Read in a JSON string, unescaping as appropriate.. Skip reading from the
-  // context if skipContext is true.
-  private TByteArrayOutputStream readJSONString(boolean skipContext)
-    throws TException {
-    TByteArrayOutputStream arr = new TByteArrayOutputStream(DEF_STRING_SIZE);
-    ArrayList<Character> codeunits = new ArrayList<Character>();
-    if (!skipContext) {
-      context_.read();
-    }
-    readJSONSyntaxChar(QUOTE);
-    while (true) {
-      byte ch = reader_.read();
-      if (ch == QUOTE[0]) {
-        break;
-      }
-      if (ch == ESCSEQ[0]) {
-        ch = reader_.read();
-        if (ch == ESCSEQ[1]) {
-          trans_.readAll(tmpbuf_, 0, 4);
-          short cu = (short)(
-              ((short)hexVal(tmpbuf_[0]) << 12) +
-              ((short)hexVal(tmpbuf_[1]) << 8) +
-              ((short)hexVal(tmpbuf_[2]) << 4) +
-              (short)hexVal(tmpbuf_[3]));
-          try {
-            if (Character.isHighSurrogate((char)cu)) {
-              if (codeunits.size() > 0) {
-                throw new TProtocolException(TProtocolException.INVALID_DATA,
-                    "Expected low surrogate char");
-              }
-              codeunits.add((char)cu);
-            }
-            else if (Character.isLowSurrogate((char)cu)) {
-              if (codeunits.size() == 0) {
-                throw new TProtocolException(TProtocolException.INVALID_DATA,
-                    "Expected high surrogate char");
-              }
-
-              codeunits.add((char)cu);
-              arr.write((new String(new int[] { codeunits.get(0), codeunits.get(1) }, 0, 2)).getBytes("UTF-8"));
-              codeunits.clear();
-            }
-            else {
-              arr.write((new String(new int[] { cu }, 0, 1)).getBytes("UTF-8"));
-            }
-            continue;
-          }
-          catch (UnsupportedEncodingException ex) {
-            throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED,
-                "JVM does not support UTF-8");
-          }
-          catch (IOException ex) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA,
-                "Invalid unicode sequence");
-          }
-        }
-        else {
-          int off = ESCAPE_CHARS.indexOf(ch);
-          if (off == -1) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                         "Expected control char");
-          }
-          ch = ESCAPE_CHAR_VALS[off];
-        }
-      }
-      arr.write(ch);
-    }
-    return arr;
-  }
-
-  // Return true if the given byte could be a valid part of a JSON number.
-  private boolean isJSONNumeric(byte b) {
-    switch (b) {
-    case '+':
-    case '-':
-    case '.':
-    case '0':
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9':
-    case 'E':
-    case 'e':
-      return true;
-    }
-    return false;
-  }
-
-  // Read in a sequence of characters that are all valid in JSON numbers. Does
-  // not do a complete regex check to validate that this is actually a number.
-  private String readJSONNumericChars() throws TException {
-    StringBuilder strbld = new StringBuilder();
-    while (true) {
-      byte ch = reader_.peek();
-      if (!isJSONNumeric(ch)) {
-        break;
-      }
-      strbld.append((char)reader_.read());
-    }
-    return strbld.toString();
-  }
-
-  // Read in a JSON number. If the context dictates, read in enclosing quotes.
-  private long readJSONInteger() throws TException {
-    context_.read();
-    if (context_.escapeNum()) {
-      readJSONSyntaxChar(QUOTE);
-    }
-    String str = readJSONNumericChars();
-    if (context_.escapeNum()) {
-      readJSONSyntaxChar(QUOTE);
-    }
-    try {
-      return Long.valueOf(str);
-    }
-    catch (NumberFormatException ex) {
-      throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                   "Bad data encounted in numeric data");
-    }
-  }
-
-  // Read in a JSON double value. Throw if the value is not wrapped in quotes
-  // when expected or if wrapped in quotes when not expected.
-  private double readJSONDouble() throws TException {
-    context_.read();
-    if (reader_.peek() == QUOTE[0]) {
-      TByteArrayOutputStream arr = readJSONString(true);
-      try {
-        double dub = Double.valueOf(arr.toString("UTF-8"));
-        if (!context_.escapeNum() && !Double.isNaN(dub) &&
-            !Double.isInfinite(dub)) {
-          // Throw exception -- we should not be in a string in this case
-          throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                       "Numeric data unexpectedly quoted");
-        }
-        return dub;
-      }
-      catch (UnsupportedEncodingException ex) {
-        throw new TException("JVM DOES NOT SUPPORT UTF-8");
-      }
-    }
-    else {
-      if (context_.escapeNum()) {
-        // This will throw - we should have had a quote if escapeNum == true
-        readJSONSyntaxChar(QUOTE);
-      }
-      try {
-        return Double.valueOf(readJSONNumericChars());
-      }
-      catch (NumberFormatException ex) {
-        throw new TProtocolException(TProtocolException.INVALID_DATA,
-                                     "Bad data encounted in numeric data");
-      }
-    }
-  }
-
-  // Read in a JSON string containing base-64 encoded data and decode it.
-  private byte[] readJSONBase64() throws TException {
-    TByteArrayOutputStream arr = readJSONString(false);
-    byte[] b = arr.get();
-    int len = arr.len();
-    int off = 0;
-    int size = 0;
-    // Ignore padding
-    int bound = len >= 2 ? len - 2 : 0;
-    for (int i = len - 1; i >= bound && b[i] == '='; --i) {
-      --len;
-    }
-    while (len >= 4) {
-      // Decode 4 bytes at a time
-      TBase64Utils.decode(b, off, 4, b, size); // NB: decoded in place
-      off += 4;
-      len -= 4;
-      size += 3;
-    }
-    // Don't decode if we hit the end or got a single leftover byte (invalid
-    // base64 but legal for skip of regular string type)
-    if (len > 1) {
-      // Decode remainder
-      TBase64Utils.decode(b, off, len, b, size); // NB: decoded in place
-      size += len - 1;
-    }
-    // Sadly we must copy the byte[] (any way around this?)
-    byte [] result = new byte[size];
-    System.arraycopy(b, 0, result, 0, size);
-    return result;
-  }
-
-  private void readJSONObjectStart() throws TException {
-    context_.read();
-    readJSONSyntaxChar(LBRACE);
-    pushContext(new JSONPairContext());
-  }
-
-  private void readJSONObjectEnd() throws TException {
-    readJSONSyntaxChar(RBRACE);
-    popContext();
-  }
-
-  private void readJSONArrayStart() throws TException {
-    context_.read();
-    readJSONSyntaxChar(LBRACKET);
-    pushContext(new JSONListContext());
-  }
-
-  private void readJSONArrayEnd() throws TException {
-    readJSONSyntaxChar(RBRACKET);
-    popContext();
-  }
-
-  @Override
-  public TMessage readMessageBegin() throws TException {
-    resetContext(); // THRIFT-3743
-    readJSONArrayStart();
-    if (readJSONInteger() != VERSION) {
-      throw new TProtocolException(TProtocolException.BAD_VERSION,
-                                   "Message contained bad version.");
-    }
-    String name;
-    try {
-      name = readJSONString(false).toString("UTF-8");
-    }
-    catch (UnsupportedEncodingException ex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-    byte type = (byte) readJSONInteger();
-    int seqid = (int) readJSONInteger();
-    return new TMessage(name, type, seqid);
-  }
-
-  @Override
-  public void readMessageEnd() throws TException {
-    readJSONArrayEnd();
-  }
-
-  @Override
-  public TStruct readStructBegin() throws TException {
-    readJSONObjectStart();
-    return ANONYMOUS_STRUCT;
-  }
-
-  @Override
-  public void readStructEnd() throws TException {
-    readJSONObjectEnd();
-  }
-
-  @Override
-  public TField readFieldBegin() throws TException {
-    byte ch = reader_.peek();
-    byte type;
-    short id = 0;
-    if (ch == RBRACE[0]) {
-      type = TType.STOP;
-    }
-    else {
-      id = (short) readJSONInteger();
-      readJSONObjectStart();
-      type = getTypeIDForTypeName(readJSONString(false).get());
-    }
-    return new TField("", type, id);
-  }
-
-  @Override
-  public void readFieldEnd() throws TException {
-    readJSONObjectEnd();
-  }
-
-  @Override
-  public TMap readMapBegin() throws TException {
-    readJSONArrayStart();
-    byte keyType = getTypeIDForTypeName(readJSONString(false).get());
-    byte valueType = getTypeIDForTypeName(readJSONString(false).get());
-    int size = (int)readJSONInteger();
-    readJSONObjectStart();
-    return new TMap(keyType, valueType, size);
-  }
-
-  @Override
-  public void readMapEnd() throws TException {
-    readJSONObjectEnd();
-    readJSONArrayEnd();
-  }
-
-  @Override
-  public TList readListBegin() throws TException {
-    readJSONArrayStart();
-    byte elemType = getTypeIDForTypeName(readJSONString(false).get());
-    int size = (int)readJSONInteger();
-    return new TList(elemType, size);
-  }
-
-  @Override
-  public void readListEnd() throws TException {
-    readJSONArrayEnd();
-  }
-
-  @Override
-  public TSet readSetBegin() throws TException {
-    readJSONArrayStart();
-    byte elemType = getTypeIDForTypeName(readJSONString(false).get());
-    int size = (int)readJSONInteger();
-    return new TSet(elemType, size);
-  }
-
-  @Override
-  public void readSetEnd() throws TException {
-    readJSONArrayEnd();
-  }
-
-  @Override
-  public boolean readBool() throws TException {
-    return (readJSONInteger() == 0 ? false : true);
-  }
-
-  @Override
-  public byte readByte() throws TException {
-    return (byte) readJSONInteger();
-  }
-
-  @Override
-  public short readI16() throws TException {
-    return (short) readJSONInteger();
-  }
-
-  @Override
-  public int readI32() throws TException {
-    return (int) readJSONInteger();
-  }
-
-  @Override
-  public long readI64() throws TException {
-    return (long) readJSONInteger();
-  }
-
-  @Override
-  public double readDouble() throws TException {
-    return readJSONDouble();
-  }
-
-  @Override
-  public String readString() throws TException {
-    try {
-      return readJSONString(false).toString("UTF-8");
-    }
-    catch (UnsupportedEncodingException ex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  @Override
-  public ByteBuffer readBinary() throws TException {
-    return ByteBuffer.wrap(readJSONBase64());
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TList.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TList.java
deleted file mode 100644
index 0d36e83..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TList.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates list metadata.
- *
- */
-public final class TList {
-  public TList() {
-    this(TType.STOP, 0);
-  }
-
-  public TList(byte t, int s) {
-    elemType = t;
-    size = s;
-  }
-
-  public final byte elemType;
-  public final int  size;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMap.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMap.java
deleted file mode 100644
index 20881f7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMap.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates map metadata.
- *
- */
-public final class TMap {
-  public TMap() {
-    this(TType.STOP, TType.STOP, 0);
-  }
-
-  public TMap(byte k, byte v, int s) {
-    keyType = k;
-    valueType = v;
-    size = s;
-  }
-
-  public final byte  keyType;
-  public final byte  valueType;
-  public final int   size;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMessage.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMessage.java
deleted file mode 100644
index f13b8ca..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMessage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates struct metadata.
- *
- */
-public final class TMessage {
-  public TMessage() {
-    this("", TType.STOP, 0);
-  }
-
-  public TMessage(String n, byte t, int s) {
-    name = n;
-    type = t;
-    seqid = s;
-  }
-
-  public final String name;
-  public final byte type;
-  public final int seqid;
-
-  @Override
-  public String toString() {
-    return "<TMessage name:'" + name + "' type: " + type + " seqid:" + seqid + ">";
-  }
-
-  @Override
-  public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + ((name == null) ? 0 : name.hashCode());
-    result = prime * result + seqid;
-    result = prime * result + type;
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj)
-      return true;
-    if (obj == null)
-      return false;
-    if (getClass() != obj.getClass())
-      return false;
-    TMessage other = (TMessage) obj;
-    if (name == null) {
-      if (other.name != null)
-        return false;
-    } else if (!name.equals(other.name))
-      return false;
-    if (seqid != other.seqid)
-      return false;
-    if (type != other.type)
-      return false;
-    return true;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMessageType.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMessageType.java
deleted file mode 100644
index aa3f931..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMessageType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Message type constants in the Thrift protocol.
- *
- */
-public final class TMessageType {
-  public static final byte CALL  = 1;
-  public static final byte REPLY = 2;
-  public static final byte EXCEPTION = 3;
-  public static final byte ONEWAY = 4;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMultiplexedProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMultiplexedProtocol.java
deleted file mode 100644
index 0ea566b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TMultiplexedProtocol.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TException;
-
-/**
- * <code>TMultiplexedProtocol</code> is a protocol-independent concrete decorator
- * that allows a Thrift client to communicate with a multiplexing Thrift server,
- * by prepending the service name to the function name during function calls.
- *
- * <p>NOTE: THIS IS NOT USED BY SERVERS.  On the server, use {@link org.apache.thrift.TMultiplexedProcessor TMultiplexedProcessor} to handle requests
- * from a multiplexing client.
- *
- * <p>This example uses a single socket transport to invoke two services:
- *
- * <pre>
- * {@code
- *     TSocket transport = new TSocket("localhost", 9090);
- *     transport.open();
- *
- *     TBinaryProtocol protocol = new TBinaryProtocol(transport);
- *
- *     TMultiplexedProtocol mp = new TMultiplexedProtocol(protocol, "Calculator");
- *     Calculator.Client service = new Calculator.Client(mp);
- *
- *     TMultiplexedProtocol mp2 = new TMultiplexedProtocol(protocol, "WeatherReport");
- *     WeatherReport.Client service2 = new WeatherReport.Client(mp2);
- *
- *     System.out.println(service.add(2,2));
- *     System.out.println(service2.getTemperature());
- * }
- * </pre>
- *
- * @see org.apache.thrift.protocol.TProtocolDecorator
- */
-public class TMultiplexedProtocol extends TProtocolDecorator {
-
-    /** Used to delimit the service name from the function name */
-    public static final String SEPARATOR = ":";
-
-    private final String SERVICE_NAME;
-
-    /**
-     * Wrap the specified protocol, allowing it to be used to communicate with a
-     * multiplexing server.  The <code>serviceName</code> is required as it is
-     * prepended to the message header so that the multiplexing server can broker
-     * the function call to the proper service.
-     *
-     * @param protocol Your communication protocol of choice, e.g. <code>TBinaryProtocol</code>.
-     * @param serviceName The service name of the service communicating via this protocol.
-     */
-    public TMultiplexedProtocol(TProtocol protocol, String serviceName) {
-        super(protocol);
-        SERVICE_NAME = serviceName;
-    }
-
-    /**
-     * Prepends the service name to the function name, separated by TMultiplexedProtocol.SEPARATOR.
-     *
-     * @param tMessage The original message.
-     * @throws TException Passed through from wrapped <code>TProtocol</code> instance.
-     */
-    @Override
-    public void writeMessageBegin(TMessage tMessage) throws TException {
-        if (tMessage.type == TMessageType.CALL || tMessage.type == TMessageType.ONEWAY) {
-            super.writeMessageBegin(new TMessage(
-                    SERVICE_NAME + SEPARATOR + tMessage.name,
-                    tMessage.type,
-                    tMessage.seqid
-            ));
-        } else {
-            super.writeMessageBegin(tMessage);
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocol.java
deleted file mode 100644
index 0e96368..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocol.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import java.nio.ByteBuffer;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Protocol interface definition.
- *
- */
-public abstract class TProtocol {
-
-  /**
-   * Prevent direct instantiation
-   */
-  @SuppressWarnings("unused")
-  private TProtocol() {}
-
-  /**
-   * Transport
-   */
-  protected TTransport trans_;
-
-  /**
-   * Constructor
-   */
-  protected TProtocol(TTransport trans) {
-    trans_ = trans;
-  }
-
-  /**
-   * Transport accessor
-   */
-  public TTransport getTransport() {
-    return trans_;
-  }
-
-  /**
-   * Writing methods.
-   */
-
-  public abstract void writeMessageBegin(TMessage message) throws TException;
-
-  public abstract void writeMessageEnd() throws TException;
-
-  public abstract void writeStructBegin(TStruct struct) throws TException;
-
-  public abstract void writeStructEnd() throws TException;
-
-  public abstract void writeFieldBegin(TField field) throws TException;
-
-  public abstract void writeFieldEnd() throws TException;
-
-  public abstract void writeFieldStop() throws TException;
-
-  public abstract void writeMapBegin(TMap map) throws TException;
-
-  public abstract void writeMapEnd() throws TException;
-
-  public abstract void writeListBegin(TList list) throws TException;
-
-  public abstract void writeListEnd() throws TException;
-
-  public abstract void writeSetBegin(TSet set) throws TException;
-
-  public abstract void writeSetEnd() throws TException;
-
-  public abstract void writeBool(boolean b) throws TException;
-
-  public abstract void writeByte(byte b) throws TException;
-
-  public abstract void writeI16(short i16) throws TException;
-
-  public abstract void writeI32(int i32) throws TException;
-
-  public abstract void writeI64(long i64) throws TException;
-
-  public abstract void writeDouble(double dub) throws TException;
-
-  public abstract void writeString(String str) throws TException;
-
-  public abstract void writeBinary(ByteBuffer buf) throws TException;
-
-  /**
-   * Reading methods.
-   */
-
-  public abstract TMessage readMessageBegin() throws TException;
-
-  public abstract void readMessageEnd() throws TException;
-
-  public abstract TStruct readStructBegin() throws TException;
-
-  public abstract void readStructEnd() throws TException;
-
-  public abstract TField readFieldBegin() throws TException;
-
-  public abstract void readFieldEnd() throws TException;
-
-  public abstract TMap readMapBegin() throws TException;
-
-  public abstract void readMapEnd() throws TException;
-
-  public abstract TList readListBegin() throws TException;
-
-  public abstract void readListEnd() throws TException;
-
-  public abstract TSet readSetBegin() throws TException;
-
-  public abstract void readSetEnd() throws TException;
-
-  public abstract boolean readBool() throws TException;
-
-  public abstract byte readByte() throws TException;
-
-  public abstract short readI16() throws TException;
-
-  public abstract int readI32() throws TException;
-
-  public abstract long readI64() throws TException;
-
-  public abstract double readDouble() throws TException;
-
-  public abstract String readString() throws TException;
-
-  public abstract ByteBuffer readBinary() throws TException;
-
-  /**
-   * Reset any internal state back to a blank slate. This method only needs to
-   * be implemented for stateful protocols.
-   */
-  public void reset() {}
-  
-  /**
-   * Scheme accessor
-   */
-  public Class<? extends IScheme> getScheme() {
-    return StandardScheme.class;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolDecorator.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolDecorator.java
deleted file mode 100644
index 2d29cd2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolDecorator.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TException;
-
-import java.nio.ByteBuffer;
-
-/**
- * <code>TProtocolDecorator</code> forwards all requests to an enclosed
- * <code>TProtocol</code> instance, providing a way to author concise
- * concrete decorator subclasses.  While it has no abstract methods, it
- * is marked abstract as a reminder that by itself, it does not modify
- * the behaviour of the enclosed <code>TProtocol</code>.
- *
- * <p>See p.175 of Design Patterns (by Gamma et al.)</p>
- * 
- * @see org.apache.thrift.protocol.TMultiplexedProtocol
- */
-public abstract class TProtocolDecorator extends TProtocol {
-
-    private final TProtocol concreteProtocol;
-
-    /**
-     * Encloses the specified protocol.
-     * @param protocol All operations will be forward to this protocol.  Must be non-null.
-     */
-    public TProtocolDecorator(TProtocol protocol) {
-        super(protocol.getTransport());
-        concreteProtocol = protocol;
-    }
-
-    public void writeMessageBegin(TMessage tMessage) throws TException {
-        concreteProtocol.writeMessageBegin(tMessage);
-    }
-
-    public void writeMessageEnd() throws TException {
-        concreteProtocol.writeMessageEnd();
-    }
-
-    public void writeStructBegin(TStruct tStruct) throws TException {
-        concreteProtocol.writeStructBegin(tStruct);
-    }
-
-    public void writeStructEnd() throws TException {
-        concreteProtocol.writeStructEnd();
-    }
-
-    public void writeFieldBegin(TField tField) throws TException {
-        concreteProtocol.writeFieldBegin(tField);
-    }
-
-    public void writeFieldEnd() throws TException {
-        concreteProtocol.writeFieldEnd();
-    }
-
-    public void writeFieldStop() throws TException {
-        concreteProtocol.writeFieldStop();
-    }
-
-    public void writeMapBegin(TMap tMap) throws TException {
-        concreteProtocol.writeMapBegin(tMap);
-    }
-
-    public void writeMapEnd() throws TException {
-        concreteProtocol.writeMapEnd();
-    }
-
-    public void writeListBegin(TList tList) throws TException {
-        concreteProtocol.writeListBegin(tList);
-    }
-
-    public void writeListEnd() throws TException {
-        concreteProtocol.writeListEnd();
-    }
-
-    public void writeSetBegin(TSet tSet) throws TException {
-        concreteProtocol.writeSetBegin(tSet);
-    }
-
-    public void writeSetEnd() throws TException {
-        concreteProtocol.writeSetEnd();
-    }
-
-    public void writeBool(boolean b) throws TException {
-        concreteProtocol.writeBool(b);
-    }
-
-    public void writeByte(byte b) throws TException {
-        concreteProtocol.writeByte(b);
-    }
-
-    public void writeI16(short i) throws TException {
-        concreteProtocol.writeI16(i);
-    }
-
-    public void writeI32(int i) throws TException {
-        concreteProtocol.writeI32(i);
-    }
-
-    public void writeI64(long l) throws TException {
-        concreteProtocol.writeI64(l);
-    }
-
-    public void writeDouble(double v) throws TException {
-        concreteProtocol.writeDouble(v);
-    }
-
-    public void writeString(String s) throws TException {
-        concreteProtocol.writeString(s);
-    }
-
-    public void writeBinary(ByteBuffer buf) throws TException {
-        concreteProtocol.writeBinary(buf);
-    }
-
-    public TMessage readMessageBegin() throws TException {
-        return concreteProtocol.readMessageBegin();
-    }
-
-    public void readMessageEnd() throws TException {
-        concreteProtocol.readMessageEnd();
-    }
-
-    public TStruct readStructBegin() throws TException {
-        return concreteProtocol.readStructBegin();
-    }
-
-    public void readStructEnd() throws TException {
-        concreteProtocol.readStructEnd();
-    }
-
-    public TField readFieldBegin() throws TException {
-        return concreteProtocol.readFieldBegin();
-    }
-
-    public void readFieldEnd() throws TException {
-        concreteProtocol.readFieldEnd();
-    }
-
-    public TMap readMapBegin() throws TException {
-        return concreteProtocol.readMapBegin();
-    }
-
-    public void readMapEnd() throws TException {
-        concreteProtocol.readMapEnd();
-    }
-
-    public TList readListBegin() throws TException {
-        return concreteProtocol.readListBegin();
-    }
-
-    public void readListEnd() throws TException {
-        concreteProtocol.readListEnd();
-    }
-
-    public TSet readSetBegin() throws TException {
-        return concreteProtocol.readSetBegin();
-    }
-
-    public void readSetEnd() throws TException {
-        concreteProtocol.readSetEnd();
-    }
-
-    public boolean readBool() throws TException {
-        return concreteProtocol.readBool();
-    }
-
-    public byte readByte() throws TException {
-        return concreteProtocol.readByte();
-    }
-
-    public short readI16() throws TException {
-        return concreteProtocol.readI16();
-    }
-
-    public int readI32() throws TException {
-        return concreteProtocol.readI32();
-    }
-
-    public long readI64() throws TException {
-        return concreteProtocol.readI64();
-    }
-
-    public double readDouble() throws TException {
-        return concreteProtocol.readDouble();
-    }
-
-    public String readString() throws TException {
-        return concreteProtocol.readString();
-    }
-
-    public ByteBuffer readBinary() throws TException {
-        return concreteProtocol.readBinary();
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolException.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolException.java
deleted file mode 100644
index 870f1b9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolException.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TException;
-
-/**
- * Protocol exceptions.
- *
- */
-public class TProtocolException extends TException {
-
-
-  private static final long serialVersionUID = 1L;
-  public static final int UNKNOWN = 0;
-  public static final int INVALID_DATA = 1;
-  public static final int NEGATIVE_SIZE = 2;
-  public static final int SIZE_LIMIT = 3;
-  public static final int BAD_VERSION = 4;
-  public static final int NOT_IMPLEMENTED = 5;
-  public static final int DEPTH_LIMIT = 6;
-
-  protected int type_ = UNKNOWN;
-
-  public TProtocolException() {
-    super();
-  }
-
-  public TProtocolException(int type) {
-    super();
-    type_ = type;
-  }
-
-  public TProtocolException(int type, String message) {
-    super(message);
-    type_ = type;
-  }
-
-  public TProtocolException(String message) {
-    super(message);
-  }
-
-  public TProtocolException(int type, Throwable cause) {
-    super(cause);
-    type_ = type;
-  }
-
-  public TProtocolException(Throwable cause) {
-    super(cause);
-  }
-
-  public TProtocolException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  public TProtocolException(int type, String message, Throwable cause) {
-    super(message, cause);
-    type_ = type;
-  }
-
-  public int getType() {
-    return type_;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
deleted file mode 100644
index b72e87b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import java.io.Serializable;
-
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Factory interface for constructing protocol instances.
- */
-public interface TProtocolFactory extends Serializable {
-  public TProtocol getProtocol(TTransport trans);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
deleted file mode 100644
index b76f8ea..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TException;
-
-/**
- * Utility class with static methods for interacting with protocol data
- * streams.
- *
- */
-public class TProtocolUtil {
-
-  /**
-   * The maximum recursive depth the skip() function will traverse before
-   * throwing a TException.
-   */
-  private static int maxSkipDepth = Integer.MAX_VALUE;
-
-  /**
-   * Specifies the maximum recursive depth that the skip function will
-   * traverse before throwing a TException.  This is a global setting, so
-   * any call to skip in this JVM will enforce this value.
-   *
-   * @param depth  the maximum recursive depth.  A value of 2 would allow
-   *    the skip function to skip a structure or collection with basic children,
-   *    but it would not permit skipping a struct that had a field containing
-   *    a child struct.  A value of 1 would only allow skipping of simple
-   *    types and empty structs/collections.
-   */
-  public static void setMaxSkipDepth(int depth) {
-    maxSkipDepth = depth;
-  }
-
-  /**
-   * Skips over the next data element from the provided input TProtocol object.
-   *
-   * @param prot  the protocol object to read from
-   * @param type  the next value will be interpreted as this TType value.
-   */
-  public static void skip(TProtocol prot, byte type)
-    throws TException {
-    skip(prot, type, maxSkipDepth);
-  }
-
-  /**
-   * Skips over the next data element from the provided input TProtocol object.
-   *
-   * @param prot  the protocol object to read from
-   * @param type  the next value will be interpreted as this TType value.
-   * @param maxDepth  this function will only skip complex objects to this
-   *   recursive depth, to prevent Java stack overflow.
-   */
-  public static void skip(TProtocol prot, byte type, int maxDepth)
-  throws TException {
-    if (maxDepth <= 0) {
-      throw new TException("Maximum skip depth exceeded");
-    }
-    switch (type) {
-      case TType.BOOL:
-        prot.readBool();
-        break;
-
-      case TType.BYTE:
-        prot.readByte();
-        break;
-
-      case TType.I16:
-        prot.readI16();
-        break;
-
-      case TType.I32:
-        prot.readI32();
-        break;
-
-      case TType.I64:
-        prot.readI64();
-        break;
-
-      case TType.DOUBLE:
-        prot.readDouble();
-        break;
-
-      case TType.STRING:
-        prot.readBinary();
-        break;
-
-      case TType.STRUCT:
-        prot.readStructBegin();
-        while (true) {
-          TField field = prot.readFieldBegin();
-          if (field.type == TType.STOP) {
-            break;
-          }
-          skip(prot, field.type, maxDepth - 1);
-          prot.readFieldEnd();
-        }
-        prot.readStructEnd();
-        break;
-
-      case TType.MAP:
-        TMap map = prot.readMapBegin();
-        for (int i = 0; i < map.size; i++) {
-          skip(prot, map.keyType, maxDepth - 1);
-          skip(prot, map.valueType, maxDepth - 1);
-        }
-        prot.readMapEnd();
-        break;
-
-      case TType.SET:
-        TSet set = prot.readSetBegin();
-        for (int i = 0; i < set.size; i++) {
-          skip(prot, set.elemType, maxDepth - 1);
-        }
-        prot.readSetEnd();
-        break;
-
-      case TType.LIST:
-        TList list = prot.readListBegin();
-        for (int i = 0; i < list.size; i++) {
-          skip(prot, list.elemType, maxDepth - 1);
-        }
-        prot.readListEnd();
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  /**
-   * Attempt to determine the protocol used to serialize some data.
-   *
-   * The guess is based on known specificities of supported protocols.
-   * In some cases, no guess can be done, in that case we return the
-   * fallback TProtocolFactory.
-   * To be certain to correctly detect the protocol, the first encoded
-   * field should have a field id &lt; 256
-   *
-   * @param data The serialized data to guess the protocol for.
-   * @param fallback The TProtocol to return if no guess can be made.
-   * @return a Class implementing TProtocolFactory which can be used to create a deserializer.
-   */
-  public static TProtocolFactory guessProtocolFactory(byte[] data, TProtocolFactory fallback) {
-    //
-    // If the first and last bytes are opening/closing curly braces we guess the protocol as
-    // being TJSONProtocol.
-    // It could not be a TCompactBinary encoding for a field of type 0xb (Map)
-    // with delta id 7 as the last byte for TCompactBinary is always 0.
-    //
-
-    if ('{' == data[0] && '}' == data[data.length - 1]) {
-      return new TJSONProtocol.Factory();
-    }
-
-    //
-    // If the last byte is not 0, then it cannot be TCompactProtocol, it must be
-    // TBinaryProtocol.
-    //
-
-    if (data[data.length - 1] != 0) {
-      return new TBinaryProtocol.Factory();
-    }
-
-    //
-    // A first byte of value > 16 indicates TCompactProtocol was used, and the first byte
-    // encodes a delta field id (id <= 15) and a field type.
-    //
-
-    if (data[0] > 0x10) {
-      return new TCompactProtocol.Factory();
-    }
-
-    //
-    // If the second byte is 0 then it is a field id < 256 encoded by TBinaryProtocol.
-    // It cannot possibly be TCompactProtocol since a value of 0 would imply a field id
-    // of 0 as the zig zag varint encoding would end.
-    //
-
-    if (data.length > 1 && 0 == data[1]) {
-      return new TBinaryProtocol.Factory();
-    }
-
-    //
-    // If bit 7 of the first byte of the field id is set then we have two choices:
-    // 1. A field id > 63 was encoded with TCompactProtocol.
-    // 2. A field id > 0x7fff (32767) was encoded with TBinaryProtocol and the last byte of the
-    //    serialized data is 0.
-    // Option 2 is impossible since field ids are short and thus limited to 32767.
-    //
-
-    if (data.length > 1 && (data[1] & 0x80) != 0) {
-      return new TCompactProtocol.Factory();
-    }
-
-    //
-    // The remaining case is either a field id <= 63 encoded as TCompactProtocol,
-    // one >= 256 encoded with TBinaryProtocol with a last byte at 0, or an empty structure.
-    // As we cannot really decide, we return the fallback protocol.
-    //
-    return fallback;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TSet.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TSet.java
deleted file mode 100644
index 38be9a9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TSet.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates set metadata.
- *
- */
-public final class TSet {
-  public TSet() {
-    this(TType.STOP, 0);
-  }
-
-  public TSet(byte t, int s) {
-    elemType = t;
-    size = s;
-  }
-
-  public TSet(TList list) {
-    this(list.elemType, list.size);
-  }
-
-  public final byte elemType;
-  public final int  size;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
deleted file mode 100644
index b24e421..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.util.Stack;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * JSON protocol implementation for thrift.
- *
- * This protocol is write-only and produces a simple output format
- * suitable for parsing by scripting languages.  It should not be
- * confused with the full-featured TJSONProtocol.
- *
- */
-public class TSimpleJSONProtocol extends TProtocol {
-
-  /**
-   * Factory
-   */
-  public static class Factory implements TProtocolFactory {
-    public TProtocol getProtocol(TTransport trans) {
-      return new TSimpleJSONProtocol(trans);
-    }
-  }
-
-  private static final byte[] COMMA = new byte[] {','};
-  private static final byte[] COLON = new byte[] {':'};
-  private static final byte[] LBRACE = new byte[] {'{'};
-  private static final byte[] RBRACE = new byte[] {'}'};
-  private static final byte[] LBRACKET = new byte[] {'['};
-  private static final byte[] RBRACKET = new byte[] {']'};
-  private static final char QUOTE = '"';
-
-  private static final TStruct ANONYMOUS_STRUCT = new TStruct();
-  private static final TField ANONYMOUS_FIELD = new TField();
-  private static final TMessage EMPTY_MESSAGE = new TMessage();
-  private static final TSet EMPTY_SET = new TSet();
-  private static final TList EMPTY_LIST = new TList();
-  private static final TMap EMPTY_MAP = new TMap();
-  private static final String LIST = "list";
-  private static final String SET = "set";
-  private static final String MAP = "map";
-
-  protected class Context {
-    protected void write() throws TException {}
-
-    /**
-     * Returns whether the current value is a key in a map
-     */
-    protected boolean isMapKey() { return  false; }
-  }
-
-  protected class ListContext extends Context {
-    protected boolean first_ = true;
-
-    protected void write() throws TException {
-      if (first_) {
-        first_ = false;
-      } else {
-        trans_.write(COMMA);
-      }
-    }
-  }
-
-  protected class StructContext extends Context {
-    protected boolean first_ = true;
-    protected boolean colon_ = true;
-
-    protected void write() throws TException {
-      if (first_) {
-        first_ = false;
-        colon_ = true;
-      } else {
-        trans_.write(colon_ ? COLON : COMMA);
-        colon_ = !colon_;
-      }
-    }
-  }
-
-  protected class MapContext extends StructContext {
-    protected boolean isKey = true;
-
-    @Override
-    protected void write() throws TException {
-      super.write();
-      isKey = !isKey;
-    }
-
-    protected boolean isMapKey() {
-      // we want to coerce map keys to json strings regardless
-      // of their type
-      return isKey;
-    }
-  }
-
-  protected final Context BASE_CONTEXT = new Context();
-
-  /**
-   * Stack of nested contexts that we may be in.
-   */
-  protected Stack<Context> writeContextStack_ = new Stack<Context>();
-
-  /**
-   * Current context that we are in
-   */
-  protected Context writeContext_ = BASE_CONTEXT;
-
-  /**
-   * Push a new write context onto the stack.
-   */
-  protected void pushWriteContext(Context c) {
-    writeContextStack_.push(writeContext_);
-    writeContext_ = c;
-  }
-
-  /**
-   * Pop the last write context off the stack
-   */
-  protected void popWriteContext() {
-    writeContext_ = writeContextStack_.pop();
-  }
-
-  /**
-   * Reset the write context stack to its initial state.
-   */
-  protected void resetWriteContext() {
-    while (!writeContextStack_.isEmpty()) {
-      popWriteContext();
-    }
-  }
-
-  /**
-   * Used to make sure that we are not encountering a map whose keys are containers
-   */
-  protected void assertContextIsNotMapKey(String invalidKeyType) throws CollectionMapKeyException {
-    if (writeContext_.isMapKey()) {
-      throw new CollectionMapKeyException("Cannot serialize a map with keys that are of type " + invalidKeyType);
-    }
-  }
-
-  /**
-   * Constructor
-   */
-  public TSimpleJSONProtocol(TTransport trans) {
-    super(trans);
-  }
-
-  public void writeMessageBegin(TMessage message) throws TException {
-    resetWriteContext(); // THRIFT-3743
-    trans_.write(LBRACKET);
-    pushWriteContext(new ListContext());
-    writeString(message.name);
-    writeByte(message.type);
-    writeI32(message.seqid);
-  }
-
-  public void writeMessageEnd() throws TException {
-    popWriteContext();
-    trans_.write(RBRACKET);
-  }
-
-  public void writeStructBegin(TStruct struct) throws TException {
-    writeContext_.write();
-    trans_.write(LBRACE);
-    pushWriteContext(new StructContext());
-  }
-
-  public void writeStructEnd() throws TException {
-    popWriteContext();
-    trans_.write(RBRACE);
-  }
-
-  public void writeFieldBegin(TField field) throws TException {
-    // Note that extra type information is omitted in JSON!
-    writeString(field.name);
-  }
-
-  public void writeFieldEnd() {}
-
-  public void writeFieldStop() {}
-
-  public void writeMapBegin(TMap map) throws TException {
-    assertContextIsNotMapKey(MAP);
-    writeContext_.write();
-    trans_.write(LBRACE);
-    pushWriteContext(new MapContext());
-    // No metadata!
-  }
-
-  public void writeMapEnd() throws TException {
-    popWriteContext();
-    trans_.write(RBRACE);
-  }
-
-  public void writeListBegin(TList list) throws TException {
-    assertContextIsNotMapKey(LIST);
-    writeContext_.write();
-    trans_.write(LBRACKET);
-    pushWriteContext(new ListContext());
-    // No metadata!
-  }
-
-  public void writeListEnd() throws TException {
-    popWriteContext();
-    trans_.write(RBRACKET);
-  }
-
-  public void writeSetBegin(TSet set) throws TException {
-    assertContextIsNotMapKey(SET);
-    writeContext_.write();
-    trans_.write(LBRACKET);
-    pushWriteContext(new ListContext());
-    // No metadata!
-  }
-
-  public void writeSetEnd() throws TException {
-    popWriteContext();
-    trans_.write(RBRACKET);
-  }
-
-  public void writeBool(boolean b) throws TException {
-    writeByte(b ? (byte)1 : (byte)0);
-  }
-
-  public void writeByte(byte b) throws TException {
-    writeI32(b);
-  }
-
-  public void writeI16(short i16) throws TException {
-    writeI32(i16);
-  }
-
-  public void writeI32(int i32) throws TException {
-    if(writeContext_.isMapKey()) {
-      writeString(Integer.toString(i32));
-    } else {
-      writeContext_.write();
-      _writeStringData(Integer.toString(i32));
-    }
-  }
-
-  public void _writeStringData(String s) throws TException {
-    try {
-      byte[] b = s.getBytes("UTF-8");
-      trans_.write(b);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  public void writeI64(long i64) throws TException {
-    if(writeContext_.isMapKey()) {
-      writeString(Long.toString(i64));
-    } else {
-      writeContext_.write();
-      _writeStringData(Long.toString(i64));
-    }
-  }
-
-  public void writeDouble(double dub) throws TException {
-    if(writeContext_.isMapKey()) {
-      writeString(Double.toString(dub));
-    } else {
-      writeContext_.write();
-      _writeStringData(Double.toString(dub));
-    }
-  }
-
-  public void writeString(String str) throws TException {
-    writeContext_.write();
-    int length = str.length();
-    StringBuffer escape = new StringBuffer(length + 16);
-    escape.append(QUOTE);
-    for (int i = 0; i < length; ++i) {
-      char c = str.charAt(i);
-      switch (c) {
-      case '"':
-      case '\\':
-        escape.append('\\');
-        escape.append(c);
-        break;
-      case '\b':
-        escape.append('\\');
-        escape.append('b');
-        break;
-      case '\f':
-        escape.append('\\');
-        escape.append('f');
-        break;
-      case '\n':
-        escape.append('\\');
-        escape.append('n');
-        break;
-      case '\r':
-        escape.append('\\');
-        escape.append('r');
-        break;
-      case '\t':
-        escape.append('\\');
-        escape.append('t');
-        break;
-      default:
-        // Control characters! According to JSON RFC u0020 (space)
-        if (c < ' ') {
-          String hex = Integer.toHexString(c);
-          escape.append('\\');
-          escape.append('u');
-          for (int j = 4; j > hex.length(); --j) {
-            escape.append('0');
-          }
-          escape.append(hex);
-        } else {
-          escape.append(c);
-        }
-        break;
-      }
-    }
-    escape.append(QUOTE);
-    _writeStringData(escape.toString());
-  }
-
-  public void writeBinary(ByteBuffer bin) throws TException {
-    try {
-      // TODO(mcslee): Fix this
-      writeString(new String(bin.array(), bin.position() + bin.arrayOffset(), bin.limit() - bin.position() - bin.arrayOffset(), "UTF-8"));
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  /**
-   * Reading methods.
-   */
-
-  public TMessage readMessageBegin() throws TException {
-    // TODO(mcslee): implement
-    return EMPTY_MESSAGE;
-  }
-
-  public void readMessageEnd() {}
-
-  public TStruct readStructBegin() {
-    // TODO(mcslee): implement
-    return ANONYMOUS_STRUCT;
-  }
-
-  public void readStructEnd() {}
-
-  public TField readFieldBegin() throws TException {
-    // TODO(mcslee): implement
-    return ANONYMOUS_FIELD;
-  }
-
-  public void readFieldEnd() {}
-
-  public TMap readMapBegin() throws TException {
-    // TODO(mcslee): implement
-    return EMPTY_MAP;
-  }
-
-  public void readMapEnd() {}
-
-  public TList readListBegin() throws TException {
-    // TODO(mcslee): implement
-    return EMPTY_LIST;
-  }
-
-  public void readListEnd() {}
-
-  public TSet readSetBegin() throws TException {
-    // TODO(mcslee): implement
-    return EMPTY_SET;
-  }
-
-  public void readSetEnd() {}
-
-  public boolean readBool() throws TException {
-    return (readByte() == 1);
-  }
-
-  public byte readByte() throws TException {
-    // TODO(mcslee): implement
-    return 0;
-  }
-
-  public short readI16() throws TException {
-    // TODO(mcslee): implement
-    return 0;
-  }
-
-  public int readI32() throws TException {
-    // TODO(mcslee): implement
-    return 0;
-  }
-
-  public long readI64() throws TException {
-    // TODO(mcslee): implement
-    return 0;
-  }
-
-  public double readDouble() throws TException {
-    // TODO(mcslee): implement
-    return 0;
-  }
-
-  public String readString() throws TException {
-    // TODO(mcslee): implement
-    return "";
-  }
-
-  public String readStringBody(int size) throws TException {
-    // TODO(mcslee): implement
-    return "";
-  }
-
-  public ByteBuffer readBinary() throws TException {
-    // TODO(mcslee): implement
-    return ByteBuffer.wrap(new byte[0]);
-  }
-
-  public static class CollectionMapKeyException extends TException {
-    public CollectionMapKeyException(String message) {
-      super(message);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TStruct.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TStruct.java
deleted file mode 100644
index a0f7901..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TStruct.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates struct metadata.
- *
- */
-public final class TStruct {
-  public TStruct() {
-    this("");
-  }
-
-  public TStruct(String n) {
-    name = n;
-  }
-
-  public final String name;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TTupleProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TTupleProtocol.java
deleted file mode 100644
index 74f5226..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TTupleProtocol.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.protocol;
-
-import java.util.BitSet;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.transport.TTransport;
-
-public final class TTupleProtocol extends TCompactProtocol {
-  public static class Factory implements TProtocolFactory {
-    public Factory() {}
-
-    public TProtocol getProtocol(TTransport trans) {
-      return new TTupleProtocol(trans);
-    }
-  }
-
-  public TTupleProtocol(TTransport transport) {
-    super(transport);
-  }
-
-  @Override
-  public Class<? extends IScheme> getScheme() {
-    return TupleScheme.class;
-  }
-
-  public void writeBitSet(BitSet bs, int vectorWidth) throws TException {
-    byte[] bytes = toByteArray(bs, vectorWidth);
-    for (byte b : bytes) {
-      writeByte(b);
-    }
-  }
-
-  public BitSet readBitSet(int i) throws TException {
-    int length = (int) Math.ceil(i/8.0);
-    byte[] bytes = new byte[length];
-    for (int j = 0; j < length; j++) {
-      bytes[j] = readByte();
-    }
-    BitSet bs = fromByteArray(bytes);
-    return bs;
-  }
-
-  /**
-   * Returns a bitset containing the values in bytes. The byte-ordering must be
-   * big-endian.
-   */
-  public static BitSet fromByteArray(byte[] bytes) {
-    BitSet bits = new BitSet();
-    for (int i = 0; i < bytes.length * 8; i++) {
-      if ((bytes[bytes.length - i / 8 - 1] & (1 << (i % 8))) > 0) {
-        bits.set(i);
-      }
-    }
-    return bits;
-  }
-
-  /**
-   * Returns a byte array of at least length 1. The most significant bit in the
-   * result is guaranteed not to be a 1 (since BitSet does not support sign
-   * extension). The byte-ordering of the result is big-endian which means the
-   * most significant bit is in element 0. The bit at index 0 of the bit set is
-   * assumed to be the least significant bit.
-   * 
-   * @param bits
-   * @param vectorWidth 
-   * @return a byte array of at least length 1
-   */
-  public static byte[] toByteArray(BitSet bits, int vectorWidth) {
-    byte[] bytes = new byte[(int) Math.ceil(vectorWidth/8.0)];
-    for (int i = 0; i < bits.length(); i++) {
-      if (bits.get(i)) {
-        bytes[bytes.length - i / 8 - 1] |= 1 << (i % 8);
-      }
-    }
-    return bytes;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TType.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TType.java
deleted file mode 100644
index c3c1a0a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/protocol/TType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Type constants in the Thrift protocol.
- */
-public final class TType {
-  public static final byte STOP   = 0;
-  public static final byte VOID   = 1;
-  public static final byte BOOL   = 2;
-  public static final byte BYTE   = 3;
-  public static final byte DOUBLE = 4;
-  public static final byte I16    = 6;
-  public static final byte I32    = 8;
-  public static final byte I64    = 10;
-  public static final byte STRING = 11;
-  public static final byte STRUCT = 12;
-  public static final byte MAP    = 13;
-  public static final byte SET    = 14;
-  public static final byte LIST   = 15;
-  public static final byte ENUM   = 16;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/IScheme.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/IScheme.java
deleted file mode 100644
index aa35507..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/IScheme.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.scheme;
-
-import org.apache.thrift.TBase;
-
-public interface IScheme<T extends TBase> {
-
-  public void read(org.apache.thrift.protocol.TProtocol iproto, T struct) throws org.apache.thrift.TException;
-
-  public void write(org.apache.thrift.protocol.TProtocol oproto, T struct) throws org.apache.thrift.TException;
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/SchemeFactory.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/SchemeFactory.java
deleted file mode 100644
index 006a668..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/SchemeFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.scheme;
-
-public interface SchemeFactory {
-
-  public <S extends IScheme> S getScheme();
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/StandardScheme.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/StandardScheme.java
deleted file mode 100644
index ffab04d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/StandardScheme.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.scheme;
-
-import org.apache.thrift.TBase;
-
-public abstract class StandardScheme<T extends TBase> implements IScheme<T> {
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/TupleScheme.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/TupleScheme.java
deleted file mode 100644
index 365242b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/scheme/TupleScheme.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.scheme;
-
-import org.apache.thrift.TBase;
-
-public abstract class TupleScheme<T extends TBase> implements IScheme<T> {
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java
deleted file mode 100644
index 0c492cc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.thrift.TAsyncProcessor;
-import org.apache.thrift.TByteArrayOutputStream;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TIOStreamTransport;
-import org.apache.thrift.transport.TMemoryInputTransport;
-import org.apache.thrift.transport.TNonblockingServerTransport;
-import org.apache.thrift.transport.TNonblockingTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Provides common methods and classes used by nonblocking TServer
- * implementations.
- */
-public abstract class AbstractNonblockingServer extends TServer {
-  protected final Logger LOGGER = LoggerFactory.getLogger(getClass().getName());
-
-  public static abstract class AbstractNonblockingServerArgs<T extends AbstractNonblockingServerArgs<T>> extends AbstractServerArgs<T> {
-    public long maxReadBufferBytes = Long.MAX_VALUE;
-
-    public AbstractNonblockingServerArgs(TNonblockingServerTransport transport) {
-      super(transport);
-      transportFactory(new TFramedTransport.Factory());
-    }
-  }
-
-  /**
-   * The maximum amount of memory we will allocate to client IO buffers at a
-   * time. Without this limit, the server will gladly allocate client buffers
-   * right into an out of memory exception, rather than waiting.
-   */
-  final long MAX_READ_BUFFER_BYTES;
-
-  /**
-   * How many bytes are currently allocated to read buffers.
-   */
-  final AtomicLong readBufferBytesAllocated = new AtomicLong(0);
-
-  public AbstractNonblockingServer(AbstractNonblockingServerArgs args) {
-    super(args);
-    MAX_READ_BUFFER_BYTES = args.maxReadBufferBytes;
-  }
-
-  /**
-   * Begin accepting connections and processing invocations.
-   */
-  public void serve() {
-    // start any IO threads
-    if (!startThreads()) {
-      return;
-    }
-
-    // start listening, or exit
-    if (!startListening()) {
-      return;
-    }
-
-    setServing(true);
-
-    // this will block while we serve
-    waitForShutdown();
-
-    setServing(false);
-
-    // do a little cleanup
-    stopListening();
-  }
-
-  /**
-   * Starts any threads required for serving.
-   * 
-   * @return true if everything went ok, false if threads could not be started.
-   */
-  protected abstract boolean startThreads();
-
-  /**
-   * A method that will block until when threads handling the serving have been
-   * shut down.
-   */
-  protected abstract void waitForShutdown();
-
-  /**
-   * Have the server transport start accepting connections.
-   * 
-   * @return true if we started listening successfully, false if something went
-   *         wrong.
-   */
-  protected boolean startListening() {
-    try {
-      serverTransport_.listen();
-      return true;
-    } catch (TTransportException ttx) {
-      LOGGER.error("Failed to start listening on server socket!", ttx);
-      return false;
-    }
-  }
-
-  /**
-   * Stop listening for connections.
-   */
-  protected void stopListening() {
-    serverTransport_.close();
-  }
-
-  /**
-   * Perform an invocation. This method could behave several different ways -
-   * invoke immediately inline, queue for separate execution, etc.
-   * 
-   * @return true if invocation was successfully requested, which is not a
-   *         guarantee that invocation has completed. False if the request
-   *         failed.
-   */
-  protected abstract boolean requestInvoke(FrameBuffer frameBuffer);
-
-  /**
-   * An abstract thread that handles selecting on a set of transports and
-   * {@link FrameBuffer FrameBuffers} associated with selected keys
-   * corresponding to requests.
-   */
-  protected abstract class AbstractSelectThread extends Thread {
-    protected final Selector selector;
-
-    // List of FrameBuffers that want to change their selection interests.
-    protected final Set<FrameBuffer> selectInterestChanges = new HashSet<FrameBuffer>();
-
-    public AbstractSelectThread() throws IOException {
-      this.selector = SelectorProvider.provider().openSelector();
-    }
-
-    /**
-     * If the selector is blocked, wake it up.
-     */
-    public void wakeupSelector() {
-      selector.wakeup();
-    }
-
-    /**
-     * Add FrameBuffer to the list of select interest changes and wake up the
-     * selector if it's blocked. When the select() call exits, it'll give the
-     * FrameBuffer a chance to change its interests.
-     */
-    public void requestSelectInterestChange(FrameBuffer frameBuffer) {
-      synchronized (selectInterestChanges) {
-        selectInterestChanges.add(frameBuffer);
-      }
-      // wakeup the selector, if it's currently blocked.
-      selector.wakeup();
-    }
-
-    /**
-     * Check to see if there are any FrameBuffers that have switched their
-     * interest type from read to write or vice versa.
-     */
-    protected void processInterestChanges() {
-      synchronized (selectInterestChanges) {
-        for (FrameBuffer fb : selectInterestChanges) {
-          fb.changeSelectInterests();
-        }
-        selectInterestChanges.clear();
-      }
-    }
-
-    /**
-     * Do the work required to read from a readable client. If the frame is
-     * fully read, then invoke the method call.
-     */
-    protected void handleRead(SelectionKey key) {
-      FrameBuffer buffer = (FrameBuffer) key.attachment();
-      if (!buffer.read()) {
-        cleanupSelectionKey(key);
-        return;
-      }
-
-      // if the buffer's frame read is complete, invoke the method.
-      if (buffer.isFrameFullyRead()) {
-        if (!requestInvoke(buffer)) {
-          cleanupSelectionKey(key);
-        }
-      }
-    }
-
-    /**
-     * Let a writable client get written, if there's data to be written.
-     */
-    protected void handleWrite(SelectionKey key) {
-      FrameBuffer buffer = (FrameBuffer) key.attachment();
-      if (!buffer.write()) {
-        cleanupSelectionKey(key);
-      }
-    }
-
-    /**
-     * Do connection-close cleanup on a given SelectionKey.
-     */
-    protected void cleanupSelectionKey(SelectionKey key) {
-      // remove the records from the two maps
-      FrameBuffer buffer = (FrameBuffer) key.attachment();
-      if (buffer != null) {
-        // close the buffer
-        buffer.close();
-      }
-      // cancel the selection key
-      key.cancel();
-    }
-  } // SelectThread
-
-  /**
-   * Possible states for the FrameBuffer state machine.
-   */
-  private enum FrameBufferState {
-    // in the midst of reading the frame size off the wire
-    READING_FRAME_SIZE,
-    // reading the actual frame data now, but not all the way done yet
-    READING_FRAME,
-    // completely read the frame, so an invocation can now happen
-    READ_FRAME_COMPLETE,
-    // waiting to get switched to listening for write events
-    AWAITING_REGISTER_WRITE,
-    // started writing response data, not fully complete yet
-    WRITING,
-    // another thread wants this framebuffer to go back to reading
-    AWAITING_REGISTER_READ,
-    // we want our transport and selection key invalidated in the selector
-    // thread
-    AWAITING_CLOSE
-  }
-
-  /**
-   * Class that implements a sort of state machine around the interaction with a
-   * client and an invoker. It manages reading the frame size and frame data,
-   * getting it handed off as wrapped transports, and then the writing of
-   * response data back to the client. In the process it manages flipping the
-   * read and write bits on the selection key for its client.
-   */
-   public class FrameBuffer {
-    private final Logger LOGGER = LoggerFactory.getLogger(getClass().getName());
-
-    // the actual transport hooked up to the client.
-    protected final TNonblockingTransport trans_;
-
-    // the SelectionKey that corresponds to our transport
-    protected final SelectionKey selectionKey_;
-
-    // the SelectThread that owns the registration of our transport
-    protected final AbstractSelectThread selectThread_;
-
-    // where in the process of reading/writing are we?
-    protected FrameBufferState state_ = FrameBufferState.READING_FRAME_SIZE;
-
-    // the ByteBuffer we'll be using to write and read, depending on the state
-    protected ByteBuffer buffer_;
-
-    protected final TByteArrayOutputStream response_;
-    
-    // the frame that the TTransport should wrap.
-    protected final TMemoryInputTransport frameTrans_;
-    
-    // the transport that should be used to connect to clients
-    protected final TTransport inTrans_;
-    
-    protected final TTransport outTrans_;
-    
-    // the input protocol to use on frames
-    protected final TProtocol inProt_;
-    
-    // the output protocol to use on frames
-    protected final TProtocol outProt_;
-    
-    // context associated with this connection
-    protected final ServerContext context_;
-
-    public FrameBuffer(final TNonblockingTransport trans,
-        final SelectionKey selectionKey,
-        final AbstractSelectThread selectThread) {
-      trans_ = trans;
-      selectionKey_ = selectionKey;
-      selectThread_ = selectThread;
-      buffer_ = ByteBuffer.allocate(4);
-
-      frameTrans_ = new TMemoryInputTransport();
-      response_ = new TByteArrayOutputStream();
-      inTrans_ = inputTransportFactory_.getTransport(frameTrans_);
-      outTrans_ = outputTransportFactory_.getTransport(new TIOStreamTransport(response_));
-      inProt_ = inputProtocolFactory_.getProtocol(inTrans_);
-      outProt_ = outputProtocolFactory_.getProtocol(outTrans_);
-
-      if (eventHandler_ != null) {
-        context_ = eventHandler_.createContext(inProt_, outProt_);
-      } else {
-        context_  = null;
-      }
-    }
-
-    /**
-     * Give this FrameBuffer a chance to read. The selector loop should have
-     * received a read event for this FrameBuffer.
-     * 
-     * @return true if the connection should live on, false if it should be
-     *         closed
-     */
-    public boolean read() {
-      if (state_ == FrameBufferState.READING_FRAME_SIZE) {
-        // try to read the frame size completely
-        if (!internalRead()) {
-          return false;
-        }
-
-        // if the frame size has been read completely, then prepare to read the
-        // actual frame.
-        if (buffer_.remaining() == 0) {
-          // pull out the frame size as an integer.
-          int frameSize = buffer_.getInt(0);
-          if (frameSize <= 0) {
-            LOGGER.error("Read an invalid frame size of " + frameSize
-                + ". Are you using TFramedTransport on the client side?");
-            return false;
-          }
-
-          // if this frame will always be too large for this server, log the
-          // error and close the connection.
-          if (frameSize > MAX_READ_BUFFER_BYTES) {
-            LOGGER.error("Read a frame size of " + frameSize
-                + ", which is bigger than the maximum allowable buffer size for ALL connections.");
-            return false;
-          }
-
-          // if this frame will push us over the memory limit, then return.
-          // with luck, more memory will free up the next time around.
-          if (readBufferBytesAllocated.get() + frameSize > MAX_READ_BUFFER_BYTES) {
-            return true;
-          }
-
-          // increment the amount of memory allocated to read buffers
-          readBufferBytesAllocated.addAndGet(frameSize + 4);
-
-          // reallocate the readbuffer as a frame-sized buffer
-          buffer_ = ByteBuffer.allocate(frameSize + 4);
-          buffer_.putInt(frameSize);
-
-          state_ = FrameBufferState.READING_FRAME;
-        } else {
-          // this skips the check of READING_FRAME state below, since we can't
-          // possibly go on to that state if there's data left to be read at
-          // this one.
-          return true;
-        }
-      }
-
-      // it is possible to fall through from the READING_FRAME_SIZE section
-      // to READING_FRAME if there's already some frame data available once
-      // READING_FRAME_SIZE is complete.
-
-      if (state_ == FrameBufferState.READING_FRAME) {
-        if (!internalRead()) {
-          return false;
-        }
-
-        // since we're already in the select loop here for sure, we can just
-        // modify our selection key directly.
-        if (buffer_.remaining() == 0) {
-          // get rid of the read select interests
-          selectionKey_.interestOps(0);
-          state_ = FrameBufferState.READ_FRAME_COMPLETE;
-        }
-
-        return true;
-      }
-
-      // if we fall through to this point, then the state must be invalid.
-      LOGGER.error("Read was called but state is invalid (" + state_ + ")");
-      return false;
-    }
-
-    /**
-     * Give this FrameBuffer a chance to write its output to the final client.
-     */
-    public boolean write() {
-      if (state_ == FrameBufferState.WRITING) {
-        try {
-          if (trans_.write(buffer_) < 0) {
-            return false;
-          }
-        } catch (IOException e) {
-          LOGGER.warn("Got an IOException during write!", e);
-          return false;
-        }
-
-        // we're done writing. now we need to switch back to reading.
-        if (buffer_.remaining() == 0) {
-          prepareRead();
-        }
-        return true;
-      }
-
-      LOGGER.error("Write was called, but state is invalid (" + state_ + ")");
-      return false;
-    }
-
-    /**
-     * Give this FrameBuffer a chance to set its interest to write, once data
-     * has come in.
-     */
-    public void changeSelectInterests() {
-      if (state_ == FrameBufferState.AWAITING_REGISTER_WRITE) {
-        // set the OP_WRITE interest
-        selectionKey_.interestOps(SelectionKey.OP_WRITE);
-        state_ = FrameBufferState.WRITING;
-      } else if (state_ == FrameBufferState.AWAITING_REGISTER_READ) {
-        prepareRead();
-      } else if (state_ == FrameBufferState.AWAITING_CLOSE) {
-        close();
-        selectionKey_.cancel();
-      } else {
-        LOGGER.error("changeSelectInterest was called, but state is invalid (" + state_ + ")");
-      }
-    }
-
-    /**
-     * Shut the connection down.
-     */
-    public void close() {
-      // if we're being closed due to an error, we might have allocated a
-      // buffer that we need to subtract for our memory accounting.
-      if (state_ == FrameBufferState.READING_FRAME || 
-          state_ == FrameBufferState.READ_FRAME_COMPLETE ||
-          state_ == FrameBufferState.AWAITING_CLOSE) {
-        readBufferBytesAllocated.addAndGet(-buffer_.array().length);
-      }
-      trans_.close();
-      if (eventHandler_ != null) {
-        eventHandler_.deleteContext(context_, inProt_, outProt_);
-      }
-    }
-
-    /**
-     * Check if this FrameBuffer has a full frame read.
-     */
-    public boolean isFrameFullyRead() {
-      return state_ == FrameBufferState.READ_FRAME_COMPLETE;
-    }
-
-    /**
-     * After the processor has processed the invocation, whatever thread is
-     * managing invocations should call this method on this FrameBuffer so we
-     * know it's time to start trying to write again. Also, if it turns out that
-     * there actually isn't any data in the response buffer, we'll skip trying
-     * to write and instead go back to reading.
-     */
-    public void responseReady() {
-      // the read buffer is definitely no longer in use, so we will decrement
-      // our read buffer count. we do this here as well as in close because
-      // we'd like to free this read memory up as quickly as possible for other
-      // clients.
-      readBufferBytesAllocated.addAndGet(-buffer_.array().length);
-
-      if (response_.len() == 0) {
-        // go straight to reading again. this was probably an oneway method
-        state_ = FrameBufferState.AWAITING_REGISTER_READ;
-        buffer_ = null;
-      } else {
-        buffer_ = ByteBuffer.wrap(response_.get(), 0, response_.len());
-
-        // set state that we're waiting to be switched to write. we do this
-        // asynchronously through requestSelectInterestChange() because there is
-        // a possibility that we're not in the main thread, and thus currently
-        // blocked in select(). (this functionality is in place for the sake of
-        // the HsHa server.)
-        state_ = FrameBufferState.AWAITING_REGISTER_WRITE;
-      }
-      requestSelectInterestChange();
-    }
-
-    /**
-     * Actually invoke the method signified by this FrameBuffer.
-     */
-    public void invoke() {
-      frameTrans_.reset(buffer_.array());
-      response_.reset();
-      
-      try {
-        if (eventHandler_ != null) {
-          eventHandler_.processContext(context_, inTrans_, outTrans_);
-        }
-        processorFactory_.getProcessor(inTrans_).process(inProt_, outProt_);
-        responseReady();
-        return;
-      } catch (TException te) {
-        LOGGER.warn("Exception while invoking!", te);
-      } catch (Throwable t) {
-        LOGGER.error("Unexpected throwable while invoking!", t);
-      }
-      // This will only be reached when there is a throwable.
-      state_ = FrameBufferState.AWAITING_CLOSE;
-      requestSelectInterestChange();
-    }
-
-    /**
-     * Perform a read into buffer.
-     * 
-     * @return true if the read succeeded, false if there was an error or the
-     *         connection closed.
-     */
-    private boolean internalRead() {
-      try {
-        if (trans_.read(buffer_) < 0) {
-          return false;
-        }
-        return true;
-      } catch (IOException e) {
-        LOGGER.warn("Got an IOException in internalRead!", e);
-        return false;
-      }
-    }
-
-    /**
-     * We're done writing, so reset our interest ops and change state
-     * accordingly.
-     */
-    private void prepareRead() {
-      // we can set our interest directly without using the queue because
-      // we're in the select thread.
-      selectionKey_.interestOps(SelectionKey.OP_READ);
-      // get ready for another go-around
-      buffer_ = ByteBuffer.allocate(4);
-      state_ = FrameBufferState.READING_FRAME_SIZE;
-    }
-
-    /**
-     * When this FrameBuffer needs to change its select interests and execution
-     * might not be in its select thread, then this method will make sure the
-     * interest change gets done when the select thread wakes back up. When the
-     * current thread is this FrameBuffer's select thread, then it just does the
-     * interest change immediately.
-     */
-    protected void requestSelectInterestChange() {
-      if (Thread.currentThread() == this.selectThread_) {
-        changeSelectInterests();
-      } else {
-        this.selectThread_.requestSelectInterestChange(this);
-      }
-    }
-  } // FrameBuffer
-
-  public class AsyncFrameBuffer extends FrameBuffer {
-    public AsyncFrameBuffer(TNonblockingTransport trans, SelectionKey selectionKey, AbstractSelectThread selectThread) {
-      super(trans, selectionKey, selectThread);
-    }
-
-    public TProtocol getInputProtocol() {
-      return  inProt_;
-    }
-
-    public TProtocol getOutputProtocol() {
-      return outProt_;
-    }
-
-
-    public void invoke() {
-      frameTrans_.reset(buffer_.array());
-      response_.reset();
-
-      try {
-        if (eventHandler_ != null) {
-          eventHandler_.processContext(context_, inTrans_, outTrans_);
-        }
-        ((TAsyncProcessor)processorFactory_.getProcessor(inTrans_)).process(this);
-        return;
-      } catch (TException te) {
-        LOGGER.warn("Exception while invoking!", te);
-      } catch (Throwable t) {
-        LOGGER.error("Unexpected throwable while invoking!", t);
-      }
-      // This will only be reached when there is a throwable.
-      state_ = FrameBufferState.AWAITING_CLOSE;
-      requestSelectInterestChange();
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/Invocation.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/Invocation.java
deleted file mode 100644
index e8210f4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/Invocation.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.apache.thrift.server;
-
-import org.apache.thrift.server.AbstractNonblockingServer.FrameBuffer;
-
-/**
- * An Invocation represents a method call that is prepared to execute, given
- * an idle worker thread. It contains the input and output protocols the
- * thread's processor should use to perform the usual Thrift invocation.
- */
-class Invocation implements Runnable {
-  private final FrameBuffer frameBuffer;
-
-  public Invocation(final FrameBuffer frameBuffer) {
-    this.frameBuffer = frameBuffer;
-  }
-
-  public void run() {
-    frameBuffer.invoke();
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/ServerContext.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/ServerContext.java
deleted file mode 100644
index 9b0b99e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/ServerContext.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Interface for storing server's connection context
- */
- 
-package org.apache.thrift.server;
-
-public interface ServerContext {}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TExtensibleServlet.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TExtensibleServlet.java
deleted file mode 100644
index d328dd6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TExtensibleServlet.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TIOStreamTransport;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Servlet implementation class ThriftServer, that allows {@link TProcessor} and
- * {@link TProtocolFactory} to be supplied after the {@link #init()} method has
- * finished. <br>
- * Subclasses must implement the abstract methods that return the TProcessor and
- * two TProtocolFactory. Those methods are guaranteed to be called exactly once,
- * and that {@link ServletContext} is available.
- */
-public abstract class TExtensibleServlet extends HttpServlet {
-  private static final long serialVersionUID = 1L;
-
-  private TProcessor processor;
-
-  private TProtocolFactory inFactory;
-
-  private TProtocolFactory outFactory;
-
-  private Collection<Map.Entry<String, String>> customHeaders;
-
-  /**
-   * Returns the appropriate {@link TProcessor}. This will be called <b>once</b> just
-   * after the {@link #init()} method
-   * 
-   * @return
-   */
-  protected abstract TProcessor getProcessor();
-
-  /**
-   * Returns the appropriate in {@link TProtocolFactory}. This will be called
-   * <b>once</b> just after the {@link #init()} method
-   * 
-   * @return
-   */
-  protected abstract TProtocolFactory getInProtocolFactory();
-
-  /**
-   * Returns the appropriate out {@link TProtocolFactory}. This will be called
-   * <b>once</b> just after the {@link #init()} method
-   * 
-   * @return
-   */
-  protected abstract TProtocolFactory getOutProtocolFactory();
-
-  @Override
-  public final void init(ServletConfig config) throws ServletException {
-    super.init(config); //no-args init() happens here
-    this.processor = getProcessor();
-    this.inFactory = getInProtocolFactory();
-    this.outFactory = getOutProtocolFactory();
-    this.customHeaders = new ArrayList<Map.Entry<String, String>>();
-
-    if (processor == null) {
-      throw new ServletException("processor must be set");
-    }
-    if (inFactory == null) {
-      throw new ServletException("inFactory must be set");
-    }
-    if (outFactory == null) {
-      throw new ServletException("outFactory must be set");
-    }
-  }
-
-  /**
-   * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
-   *      response)
-   */
-  @Override
-  protected void doPost(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-    TTransport inTransport = null;
-    TTransport outTransport = null;
-
-    try {
-      response.setContentType("application/x-thrift");
-
-      if (null != this.customHeaders) {
-	for (Map.Entry<String, String> header : this.customHeaders) {
-	  response.addHeader(header.getKey(), header.getValue());
-	}
-      }
-
-      InputStream in = request.getInputStream();
-      OutputStream out = response.getOutputStream();
-
-      TTransport transport = new TIOStreamTransport(in, out);
-      inTransport = transport;
-      outTransport = transport;
-
-      TProtocol inProtocol = inFactory.getProtocol(inTransport);
-      TProtocol outProtocol = inFactory.getProtocol(outTransport);
-
-      processor.process(inProtocol, outProtocol);
-      out.flush();
-    } catch (TException te) {
-      throw new ServletException(te);
-    }
-  }
-
-  /**
-   * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
-   *      response)
-   */
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
-    doPost(req, resp);
-  }
-
-  public void addCustomHeader(final String key, final String value) {
-    this.customHeaders.add(new Map.Entry<String, String>() {
-      public String getKey() {
-	return key;
-      }
-
-      public String getValue() {
-	return value;
-      }
-
-      public String setValue(String value) {
-	return null;
-      }
-    });
-  }
-
-  public void setCustomHeaders(Collection<Map.Entry<String, String>> headers) {
-    this.customHeaders.clear();
-    this.customHeaders.addAll(headers);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/THsHaServer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/THsHaServer.java
deleted file mode 100644
index 3b8fb35..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/THsHaServer.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.server;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.thrift.transport.TNonblockingServerTransport;
-
-/**
- * An extension of the TNonblockingServer to a Half-Sync/Half-Async server.
- * Like TNonblockingServer, it relies on the use of TFramedTransport.
- */
-public class THsHaServer extends TNonblockingServer {
-
-  public static class Args extends AbstractNonblockingServerArgs<Args> {
-    public int minWorkerThreads = 5;
-    public int maxWorkerThreads = Integer.MAX_VALUE;
-    private int stopTimeoutVal = 60;
-    private TimeUnit stopTimeoutUnit = TimeUnit.SECONDS;
-    private ExecutorService executorService = null;
-
-    public Args(TNonblockingServerTransport transport) {
-      super(transport);
-    }
-
-
-    /**
-     * Sets the min and max threads.
-     *
-     * @deprecated use {@link #minWorkerThreads(int)} and {@link #maxWorkerThreads(int)}  instead.
-     */
-    @Deprecated
-    public Args workerThreads(int n) {
-      minWorkerThreads = n;
-      maxWorkerThreads = n;
-      return this;
-    }
-
-    /**
-     * @return what the min threads was set to.
-     * @deprecated use {@link #getMinWorkerThreads()} and {@link #getMaxWorkerThreads()} instead.
-     */
-    @Deprecated
-    public int getWorkerThreads() {
-      return minWorkerThreads;
-    }
-
-    public Args minWorkerThreads(int n) {
-      minWorkerThreads = n;
-      return this;
-    }
-
-    public Args maxWorkerThreads(int n) {
-      maxWorkerThreads = n;
-      return this;
-    }
-
-    public int getMinWorkerThreads() {
-      return minWorkerThreads;
-    }
-
-    public int getMaxWorkerThreads() {
-      return maxWorkerThreads;
-    }
-
-    public int getStopTimeoutVal() {
-      return stopTimeoutVal;
-    }
-
-    public Args stopTimeoutVal(int stopTimeoutVal) {
-      this.stopTimeoutVal = stopTimeoutVal;
-      return this;
-    }
-
-    public TimeUnit getStopTimeoutUnit() {
-      return stopTimeoutUnit;
-    }
-
-    public Args stopTimeoutUnit(TimeUnit stopTimeoutUnit) {
-      this.stopTimeoutUnit = stopTimeoutUnit;
-      return this;
-    }
-
-    public ExecutorService getExecutorService() {
-      return executorService;
-    }
-
-    public Args executorService(ExecutorService executorService) {
-      this.executorService = executorService;
-      return this;
-    }
-  }
-
-
-  // This wraps all the functionality of queueing and thread pool management
-  // for the passing of Invocations from the Selector to workers.
-  private final ExecutorService invoker;
-
-  private final Args args;
-
-  /**
-   * Create the server with the specified Args configuration
-   */
-  public THsHaServer(Args args) {
-    super(args);
-
-    invoker = args.executorService == null ? createInvokerPool(args) : args.executorService;
-    this.args = args;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  protected void waitForShutdown() {
-    joinSelector();
-    gracefullyShutdownInvokerPool();
-  }
-
-  /**
-   * Helper to create an invoker pool
-   */
-  protected static ExecutorService createInvokerPool(Args options) {
-    int minWorkerThreads = options.minWorkerThreads;
-    int maxWorkerThreads = options.maxWorkerThreads;
-    int stopTimeoutVal = options.stopTimeoutVal;
-    TimeUnit stopTimeoutUnit = options.stopTimeoutUnit;
-
-    LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>();
-    ExecutorService invoker = new ThreadPoolExecutor(minWorkerThreads,
-      maxWorkerThreads, stopTimeoutVal, stopTimeoutUnit, queue);
-
-    return invoker;
-  }
-
-
-  protected void gracefullyShutdownInvokerPool() {
-    // try to gracefully shut down the executor service
-    invoker.shutdown();
-
-    // Loop until awaitTermination finally does return without a interrupted
-    // exception. If we don't do this, then we'll shut down prematurely. We want
-    // to let the executorService clear it's task queue, closing client sockets
-    // appropriately.
-    long timeoutMS = args.stopTimeoutUnit.toMillis(args.stopTimeoutVal);
-    long now = System.currentTimeMillis();
-    while (timeoutMS >= 0) {
-      try {
-        invoker.awaitTermination(timeoutMS, TimeUnit.MILLISECONDS);
-        break;
-      } catch (InterruptedException ix) {
-        long newnow = System.currentTimeMillis();
-        timeoutMS -= (newnow - now);
-        now = newnow;
-      }
-    }
-  }
-
-  /**
-   * We override the standard invoke method here to queue the invocation for
-   * invoker service instead of immediately invoking. The thread pool takes care
-   * of the rest.
-   */
-  @Override
-  protected boolean requestInvoke(FrameBuffer frameBuffer) {
-    try {
-      Runnable invocation = getRunnable(frameBuffer);
-      invoker.execute(invocation);
-      return true;
-    } catch (RejectedExecutionException rx) {
-      LOGGER.warn("ExecutorService rejected execution!", rx);
-      return false;
-    }
-  }
-
-  protected Runnable getRunnable(FrameBuffer frameBuffer){
-    return new Invocation(frameBuffer);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TNonblockingServer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
deleted file mode 100644
index fe0365a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.server;
-
-import org.apache.thrift.transport.TNonblockingServerTransport;
-import org.apache.thrift.transport.TNonblockingTransport;
-import org.apache.thrift.transport.TTransportException;
-
-import java.io.IOException;
-import java.nio.channels.SelectionKey;
-import java.util.Iterator;
-
-/**
- * A nonblocking TServer implementation. This allows for fairness amongst all
- * connected clients in terms of invocations.
- *
- * This server is inherently single-threaded. If you want a limited thread pool
- * coupled with invocation-fairness, see THsHaServer.
- *
- * To use this server, you MUST use a TFramedTransport at the outermost
- * transport, otherwise this server will be unable to determine when a whole
- * method call has been read off the wire. Clients must also use TFramedTransport.
- */
-public class TNonblockingServer extends AbstractNonblockingServer {
-
-  public static class Args extends AbstractNonblockingServerArgs<Args> {
-    public Args(TNonblockingServerTransport transport) {
-      super(transport);
-    }
-  }
-
-  private SelectAcceptThread selectAcceptThread_;
-
-  public TNonblockingServer(AbstractNonblockingServerArgs args) {
-    super(args);
-  }
-
-
-  /**
-   * Start the selector thread to deal with accepts and client messages.
-   *
-   * @return true if everything went ok, false if we couldn't start for some
-   * reason.
-   */
-  @Override
-  protected boolean startThreads() {
-    // start the selector
-    try {
-      selectAcceptThread_ = new SelectAcceptThread((TNonblockingServerTransport)serverTransport_);
-      selectAcceptThread_.start();
-      return true;
-    } catch (IOException e) {
-      LOGGER.error("Failed to start selector thread!", e);
-      return false;
-    }
-  }
-
-  @Override
-  protected void waitForShutdown() {
-    joinSelector();
-  }
-
-  /**
-   * Block until the selector thread exits.
-   */
-  protected void joinSelector() {
-    // wait until the selector thread exits
-    try {
-      selectAcceptThread_.join();
-    } catch (InterruptedException e) {
-      // for now, just silently ignore. technically this means we'll have less of
-      // a graceful shutdown as a result.
-    }
-  }
-
-  /**
-   * Stop serving and shut everything down.
-   */
-  @Override
-  public void stop() {
-    stopped_ = true;
-    if (selectAcceptThread_ != null) {
-      selectAcceptThread_.wakeupSelector();
-    }
-  }
-
-  /**
-   * Perform an invocation. This method could behave several different ways
-   * - invoke immediately inline, queue for separate execution, etc.
-   */
-  @Override
-  protected boolean requestInvoke(FrameBuffer frameBuffer) {
-    frameBuffer.invoke();
-    return true;
-  }
-
-
-  public boolean isStopped() {
-    return selectAcceptThread_.isStopped();
-  }
-
-  /**
-   * The thread that will be doing all the selecting, managing new connections
-   * and those that still need to be read.
-   */
-  protected class SelectAcceptThread extends AbstractSelectThread {
-
-    // The server transport on which new client transports will be accepted
-    private final TNonblockingServerTransport serverTransport;
-
-    /**
-     * Set up the thread that will handle the non-blocking accepts, reads, and
-     * writes.
-     */
-    public SelectAcceptThread(final TNonblockingServerTransport serverTransport)
-    throws IOException {
-      this.serverTransport = serverTransport;
-      serverTransport.registerSelector(selector);
-    }
-
-    public boolean isStopped() {
-      return stopped_;
-    }
-
-    /**
-     * The work loop. Handles both selecting (all IO operations) and managing
-     * the selection preferences of all existing connections.
-     */
-    public void run() {
-      try {
-        if (eventHandler_ != null) {
-          eventHandler_.preServe();
-        }
-
-        while (!stopped_) {
-          select();
-          processInterestChanges();
-        }
-        for (SelectionKey selectionKey : selector.keys()) {
-          cleanupSelectionKey(selectionKey);
-        }
-      } catch (Throwable t) {
-        LOGGER.error("run() exiting due to uncaught error", t);
-      } finally {
-        try {
-          selector.close();
-        } catch (IOException e) {
-          LOGGER.error("Got an IOException while closing selector!", e);
-        }
-        stopped_ = true;
-      }
-    }
-
-    /**
-     * Select and process IO events appropriately:
-     * If there are connections to be accepted, accept them.
-     * If there are existing connections with data waiting to be read, read it,
-     * buffering until a whole frame has been read.
-     * If there are any pending responses, buffer them until their target client
-     * is available, and then send the data.
-     */
-    private void select() {
-      try {
-        // wait for io events.
-        selector.select();
-
-        // process the io events we received
-        Iterator<SelectionKey> selectedKeys = selector.selectedKeys().iterator();
-        while (!stopped_ && selectedKeys.hasNext()) {
-          SelectionKey key = selectedKeys.next();
-          selectedKeys.remove();
-
-          // skip if not valid
-          if (!key.isValid()) {
-            cleanupSelectionKey(key);
-            continue;
-          }
-
-          // if the key is marked Accept, then it has to be the server
-          // transport.
-          if (key.isAcceptable()) {
-            handleAccept();
-          } else if (key.isReadable()) {
-            // deal with reads
-            handleRead(key);
-          } else if (key.isWritable()) {
-            // deal with writes
-            handleWrite(key);
-          } else {
-            LOGGER.warn("Unexpected state in select! " + key.interestOps());
-          }
-        }
-      } catch (IOException e) {
-        LOGGER.warn("Got an IOException while selecting!", e);
-      }
-    }
-
-    protected FrameBuffer createFrameBuffer(final TNonblockingTransport trans,
-        final SelectionKey selectionKey,
-        final AbstractSelectThread selectThread) {
-        return processorFactory_.isAsyncProcessor() ?
-                  new AsyncFrameBuffer(trans, selectionKey, selectThread) :
-                  new FrameBuffer(trans, selectionKey, selectThread);
-    }
-
-    /**
-     * Accept a new connection.
-     */
-    private void handleAccept() throws IOException {
-      SelectionKey clientKey = null;
-      TNonblockingTransport client = null;
-      try {
-        // accept the connection
-        client = (TNonblockingTransport)serverTransport.accept();
-        clientKey = client.registerSelector(selector, SelectionKey.OP_READ);
-
-        // add this key to the map
-          FrameBuffer frameBuffer = createFrameBuffer(client, clientKey, SelectAcceptThread.this);
-
-          clientKey.attach(frameBuffer);
-      } catch (TTransportException tte) {
-        // something went wrong accepting.
-        LOGGER.warn("Exception trying to accept!", tte);
-        tte.printStackTrace();
-        if (clientKey != null) cleanupSelectionKey(clientKey);
-        if (client != null) client.close();
-      }
-    }
-  } // SelectAcceptThread
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServer.java
deleted file mode 100644
index 80f4f86..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServer.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.TProcessorFactory;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TServerTransport;
-import org.apache.thrift.transport.TTransportFactory;
-
-/**
- * Generic interface for a Thrift server.
- *
- */
-public abstract class TServer {
-
-  public static class Args extends AbstractServerArgs<Args> {
-    public Args(TServerTransport transport) {
-      super(transport);
-    }
-  }
-
-  public static abstract class AbstractServerArgs<T extends AbstractServerArgs<T>> {
-    final TServerTransport serverTransport;
-    TProcessorFactory processorFactory;
-    TTransportFactory inputTransportFactory = new TTransportFactory();
-    TTransportFactory outputTransportFactory = new TTransportFactory();
-    TProtocolFactory inputProtocolFactory = new TBinaryProtocol.Factory();
-    TProtocolFactory outputProtocolFactory = new TBinaryProtocol.Factory();
-
-    public AbstractServerArgs(TServerTransport transport) {
-      serverTransport = transport;
-    }
-
-    public T processorFactory(TProcessorFactory factory) {
-      this.processorFactory = factory;
-      return (T) this;
-    }
-
-    public T processor(TProcessor processor) {
-      this.processorFactory = new TProcessorFactory(processor);
-      return (T) this;
-    }
-
-    public T transportFactory(TTransportFactory factory) {
-      this.inputTransportFactory = factory;
-      this.outputTransportFactory = factory;
-      return (T) this;
-    }
-
-    public T inputTransportFactory(TTransportFactory factory) {
-      this.inputTransportFactory = factory;
-      return (T) this;
-    }
-
-    public T outputTransportFactory(TTransportFactory factory) {
-      this.outputTransportFactory = factory;
-      return (T) this;
-    }
-
-    public T protocolFactory(TProtocolFactory factory) {
-      this.inputProtocolFactory = factory;
-      this.outputProtocolFactory = factory;
-      return (T) this;
-    }
-
-    public T inputProtocolFactory(TProtocolFactory factory) {
-      this.inputProtocolFactory = factory;
-      return (T) this;
-    }
-
-    public T outputProtocolFactory(TProtocolFactory factory) {
-      this.outputProtocolFactory = factory;
-      return (T) this;
-    }
-  }
-
-  /**
-   * Core processor
-   */
-  protected TProcessorFactory processorFactory_;
-
-  /**
-   * Server transport
-   */
-  protected TServerTransport serverTransport_;
-
-  /**
-   * Input Transport Factory
-   */
-  protected TTransportFactory inputTransportFactory_;
-
-  /**
-   * Output Transport Factory
-   */
-  protected TTransportFactory outputTransportFactory_;
-
-  /**
-   * Input Protocol Factory
-   */
-  protected TProtocolFactory inputProtocolFactory_;
-
-  /**
-   * Output Protocol Factory
-   */
-  protected TProtocolFactory outputProtocolFactory_;
-
-  private boolean isServing;
-
-  protected TServerEventHandler eventHandler_;
-
-  // Flag for stopping the server
-  // Please see THRIFT-1795 for the usage of this flag
-  protected volatile boolean stopped_ = false;
-
-  protected TServer(AbstractServerArgs args) {
-    processorFactory_ = args.processorFactory;
-    serverTransport_ = args.serverTransport;
-    inputTransportFactory_ = args.inputTransportFactory;
-    outputTransportFactory_ = args.outputTransportFactory;
-    inputProtocolFactory_ = args.inputProtocolFactory;
-    outputProtocolFactory_ = args.outputProtocolFactory;
-  }
-
-  /**
-   * The run method fires up the server and gets things going.
-   */
-  public abstract void serve();
-
-  /**
-   * Stop the server. This is optional on a per-implementation basis. Not
-   * all servers are required to be cleanly stoppable.
-   */
-  public void stop() {}
-
-  public boolean isServing() {
-    return isServing;
-  }
-
-  protected void setServing(boolean serving) {
-    isServing = serving;
-  }
-
-  public void setServerEventHandler(TServerEventHandler eventHandler) {
-    eventHandler_ = eventHandler;
-  }
-
-  public TServerEventHandler getEventHandler() {
-    return eventHandler_;
-  }
-
-  public boolean getShouldStop() {
-    return this.stopped_;
-  }
-
-  public void setShouldStop(boolean shouldStop) {
-    this.stopped_ = shouldStop;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServerEventHandler.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServerEventHandler.java
deleted file mode 100644
index f069b9b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServerEventHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Interface that can handle events from the server core. To
- * use this you should subclass it and implement the methods that you care
- * about. Your subclass can also store local data that you may care about,
- * such as additional "arguments" to these methods (stored in the object
- * instance's state).
- */
-public interface TServerEventHandler {
-
-  /**
-   * Called before the server begins.
-   */
-  void preServe();
-
-  /**
-   * Called when a new client has connected and is about to being processing.
-   */
-  ServerContext createContext(TProtocol input,
-                              TProtocol output);
-
-  /**
-   * Called when a client has finished request-handling to delete server
-   * context.
-   */
-  void deleteContext(ServerContext serverContext,
-                             TProtocol input,
-                             TProtocol output);
-
-  /**
-   * Called when a client is about to call the processor.
-   */
-  void processContext(ServerContext serverContext,
-                              TTransport inputTransport, TTransport outputTransport);
-
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServlet.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServlet.java
deleted file mode 100644
index c1ab9df..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TServlet.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.apache.thrift.server;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TIOStreamTransport;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Servlet implementation class ThriftServer
- */
-public class TServlet extends HttpServlet {
-
-  private final TProcessor processor;
-
-  private final TProtocolFactory inProtocolFactory;
-
-  private final TProtocolFactory outProtocolFactory;
-
-  private final Collection<Map.Entry<String, String>> customHeaders;
-
-  /**
-   * @see HttpServlet#HttpServlet()
-   */
-  public TServlet(TProcessor processor, TProtocolFactory inProtocolFactory,
-      TProtocolFactory outProtocolFactory) {
-    super();
-    this.processor = processor;
-    this.inProtocolFactory = inProtocolFactory;
-    this.outProtocolFactory = outProtocolFactory;
-    this.customHeaders = new ArrayList<Map.Entry<String, String>>();
-  }
-
-  /**
-   * @see HttpServlet#HttpServlet()
-   */
-  public TServlet(TProcessor processor, TProtocolFactory protocolFactory) {
-    this(processor, protocolFactory, protocolFactory);
-  }
-
-  /**
-   * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
-   *      response)
-   */
-  @Override
-  protected void doPost(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-
-    TTransport inTransport = null;
-    TTransport outTransport = null;
-
-    try {
-      response.setContentType("application/x-thrift");
-
-      if (null != this.customHeaders) {
-        for (Map.Entry<String, String> header : this.customHeaders) {
-          response.addHeader(header.getKey(), header.getValue());
-        }
-      }
-      InputStream in = request.getInputStream();
-      OutputStream out = response.getOutputStream();
-
-      TTransport transport = new TIOStreamTransport(in, out);
-      inTransport = transport;
-      outTransport = transport;
-
-      TProtocol inProtocol = inProtocolFactory.getProtocol(inTransport);
-      TProtocol outProtocol = outProtocolFactory.getProtocol(outTransport);
-
-      processor.process(inProtocol, outProtocol);
-      out.flush();
-    } catch (TException te) {
-      throw new ServletException(te);
-    }
-  }
-
-  /**
-   * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
-   *      response)
-   */
-  protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-    doPost(request, response);
-  }
-
-  public void addCustomHeader(final String key, final String value) {
-    this.customHeaders.add(new Map.Entry<String, String>() {
-      public String getKey() {
-        return key;
-      }
-
-      public String getValue() {
-        return value;
-      }
-
-      public String setValue(String value) {
-        return null;
-      }
-    });
-  }
-
-  public void setCustomHeaders(Collection<Map.Entry<String, String>> headers) {
-    this.customHeaders.clear();
-    this.customHeaders.addAll(headers);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TSimpleServer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TSimpleServer.java
deleted file mode 100644
index e815b2c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TSimpleServer.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Simple singlethreaded server for testing.
- *
- */
-public class TSimpleServer extends TServer {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TSimpleServer.class.getName());
-
-  public TSimpleServer(AbstractServerArgs args) {
-    super(args);
-  }
-
-  public void serve() {
-    try {
-      serverTransport_.listen();
-    } catch (TTransportException ttx) {
-      LOGGER.error("Error occurred during listening.", ttx);
-      return;
-    }
-
-    // Run the preServe event
-    if (eventHandler_ != null) {
-      eventHandler_.preServe();
-    }
-
-    setServing(true);
-
-    while (!stopped_) {
-      TTransport client = null;
-      TProcessor processor = null;
-      TTransport inputTransport = null;
-      TTransport outputTransport = null;
-      TProtocol inputProtocol = null;
-      TProtocol outputProtocol = null;
-      ServerContext connectionContext = null;
-      try {
-        client = serverTransport_.accept();
-        if (client != null) {
-          processor = processorFactory_.getProcessor(client);
-          inputTransport = inputTransportFactory_.getTransport(client);
-          outputTransport = outputTransportFactory_.getTransport(client);
-          inputProtocol = inputProtocolFactory_.getProtocol(inputTransport);
-          outputProtocol = outputProtocolFactory_.getProtocol(outputTransport);
-          if (eventHandler_ != null) {
-            connectionContext = eventHandler_.createContext(inputProtocol, outputProtocol);
-          }
-          while (true) {
-            if (eventHandler_ != null) {
-              eventHandler_.processContext(connectionContext, inputTransport, outputTransport);
-            }
-            if(!processor.process(inputProtocol, outputProtocol)) {
-              break;
-            }
-          }
-        }
-      } catch (TTransportException ttx) {
-        // Client died, just move on
-      } catch (TException tx) {
-        if (!stopped_) {
-          LOGGER.error("Thrift error occurred during processing of message.", tx);
-        }
-      } catch (Exception x) {
-        if (!stopped_) {
-          LOGGER.error("Error occurred during processing of message.", x);
-        }
-      }
-
-      if (eventHandler_ != null) {
-        eventHandler_.deleteContext(connectionContext, inputProtocol, outputProtocol);
-      }
-
-      if (inputTransport != null) {
-        inputTransport.close();
-      }
-
-      if (outputTransport != null) {
-        outputTransport.close();
-      }
-
-    }
-    setServing(false);
-  }
-
-  public void stop() {
-    stopped_ = true;
-    serverTransport_.interrupt();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
deleted file mode 100644
index 0529d72..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import java.util.Random;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TSaslTransportException;
-import org.apache.thrift.transport.TServerTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Server which uses Java's built in ThreadPool management to spawn off
- * a worker pool that
- *
- */
-public class TThreadPoolServer extends TServer {
-  private static final Logger LOGGER = LoggerFactory.getLogger(TThreadPoolServer.class.getName());
-
-  public static class Args extends AbstractServerArgs<Args> {
-    public int minWorkerThreads = 5;
-    public int maxWorkerThreads = Integer.MAX_VALUE;
-    public ExecutorService executorService;
-    public int stopTimeoutVal = 60;
-    public TimeUnit stopTimeoutUnit = TimeUnit.SECONDS;
-    public int requestTimeout = 20;
-    public TimeUnit requestTimeoutUnit = TimeUnit.SECONDS;
-    public int beBackoffSlotLength = 100;
-    public TimeUnit beBackoffSlotLengthUnit = TimeUnit.MILLISECONDS;
-
-    public Args(TServerTransport transport) {
-      super(transport);
-    }
-
-    public Args minWorkerThreads(int n) {
-      minWorkerThreads = n;
-      return this;
-    }
-
-    public Args maxWorkerThreads(int n) {
-      maxWorkerThreads = n;
-      return this;
-    }
-
-    public Args stopTimeoutVal(int n) {
-      stopTimeoutVal = n;
-      return this;
-    }
-
-    public Args requestTimeout(int n) {
-      requestTimeout = n;
-      return this;
-    }
-
-    public Args requestTimeoutUnit(TimeUnit tu) {
-      requestTimeoutUnit = tu;
-      return this;
-    }
-    //Binary exponential backoff slot length
-    public Args beBackoffSlotLength(int n) {
-      beBackoffSlotLength = n;
-      return this;
-    }
-
-    //Binary exponential backoff slot time unit
-    public Args beBackoffSlotLengthUnit(TimeUnit tu) {
-      beBackoffSlotLengthUnit = tu;
-      return this;
-    }
-
-    public Args executorService(ExecutorService executorService) {
-      this.executorService = executorService;
-      return this;
-    }
-  }
-
-  // Executor service for handling client connections
-  private ExecutorService executorService_;
-
-  private final TimeUnit stopTimeoutUnit;
-
-  private final long stopTimeoutVal;
-
-  private final TimeUnit requestTimeoutUnit;
-
-  private final long requestTimeout;
-
-  private final long beBackoffSlotInMillis;
-
-  private Random random = new Random(System.currentTimeMillis());
-
-  public TThreadPoolServer(Args args) {
-    super(args);
-
-    stopTimeoutUnit = args.stopTimeoutUnit;
-    stopTimeoutVal = args.stopTimeoutVal;
-    requestTimeoutUnit = args.requestTimeoutUnit;
-    requestTimeout = args.requestTimeout;
-    beBackoffSlotInMillis = args.beBackoffSlotLengthUnit.toMillis(args.beBackoffSlotLength);
-
-    executorService_ = args.executorService != null ?
-        args.executorService : createDefaultExecutorService(args);
-  }
-
-  private static ExecutorService createDefaultExecutorService(Args args) {
-    SynchronousQueue<Runnable> executorQueue =
-      new SynchronousQueue<Runnable>();
-    return new ThreadPoolExecutor(args.minWorkerThreads,
-                                  args.maxWorkerThreads,
-                                  args.stopTimeoutVal,
-                                  TimeUnit.SECONDS,
-                                  executorQueue);
-  }
-
-
-  public void serve() {
-    try {
-      serverTransport_.listen();
-    } catch (TTransportException ttx) {
-      LOGGER.error("Error occurred during listening.", ttx);
-      return;
-    }
-
-    // Run the preServe event
-    if (eventHandler_ != null) {
-      eventHandler_.preServe();
-    }
-
-    stopped_ = false;
-    setServing(true);
-    int failureCount = 0;
-    while (!stopped_) {
-      try {
-        TTransport client = serverTransport_.accept();
-        WorkerProcess wp = new WorkerProcess(client);
-
-        int retryCount = 0;
-        long remainTimeInMillis = requestTimeoutUnit.toMillis(requestTimeout);
-        while(true) {
-          try {
-            executorService_.execute(wp);
-            break;
-          } catch(Throwable t) {
-            if (t instanceof RejectedExecutionException) {
-              retryCount++;
-              try {
-                if (remainTimeInMillis > 0) {
-                  //do a truncated 20 binary exponential backoff sleep
-                  long sleepTimeInMillis = ((long) (random.nextDouble() *
-                      (1L << Math.min(retryCount, 20)))) * beBackoffSlotInMillis;
-                  sleepTimeInMillis = Math.min(sleepTimeInMillis, remainTimeInMillis);
-                  TimeUnit.MILLISECONDS.sleep(sleepTimeInMillis);
-                  remainTimeInMillis = remainTimeInMillis - sleepTimeInMillis;
-                } else {
-                  client.close();
-                  wp = null;
-                  LOGGER.warn("Task has been rejected by ExecutorService " + retryCount
-                      + " times till timedout, reason: " + t);
-                  break;
-                }
-              } catch (InterruptedException e) {
-                LOGGER.warn("Interrupted while waiting to place client on executor queue.");
-                Thread.currentThread().interrupt();
-                break;
-              }
-            } else if (t instanceof Error) {
-              LOGGER.error("ExecutorService threw error: " + t, t);
-              throw (Error)t;
-            } else {
-              //for other possible runtime errors from ExecutorService, should also not kill serve
-              LOGGER.warn("ExecutorService threw error: " + t, t);
-              break;
-            }
-          }
-        }
-      } catch (TTransportException ttx) {
-        if (!stopped_) {
-          ++failureCount;
-          LOGGER.warn("Transport error occurred during acceptance of message.", ttx);
-        }
-      }
-    }
-
-    executorService_.shutdown();
-
-    // Loop until awaitTermination finally does return without a interrupted
-    // exception. If we don't do this, then we'll shut down prematurely. We want
-    // to let the executorService clear it's task queue, closing client sockets
-    // appropriately.
-    long timeoutMS = stopTimeoutUnit.toMillis(stopTimeoutVal);
-    long now = System.currentTimeMillis();
-    while (timeoutMS >= 0) {
-      try {
-        executorService_.awaitTermination(timeoutMS, TimeUnit.MILLISECONDS);
-        break;
-      } catch (InterruptedException ix) {
-        long newnow = System.currentTimeMillis();
-        timeoutMS -= (newnow - now);
-        now = newnow;
-      }
-    }
-    setServing(false);
-  }
-
-  public void stop() {
-    stopped_ = true;
-    serverTransport_.interrupt();
-  }
-
-  private class WorkerProcess implements Runnable {
-
-    /**
-     * Client that this services.
-     */
-    private TTransport client_;
-
-    /**
-     * Default constructor.
-     *
-     * @param client Transport to process
-     */
-    private WorkerProcess(TTransport client) {
-      client_ = client;
-    }
-
-    /**
-     * Loops on processing a client forever
-     */
-    public void run() {
-      TProcessor processor = null;
-      TTransport inputTransport = null;
-      TTransport outputTransport = null;
-      TProtocol inputProtocol = null;
-      TProtocol outputProtocol = null;
-
-      TServerEventHandler eventHandler = null;
-      ServerContext connectionContext = null;
-
-      try {
-        processor = processorFactory_.getProcessor(client_);
-        inputTransport = inputTransportFactory_.getTransport(client_);
-        outputTransport = outputTransportFactory_.getTransport(client_);
-        inputProtocol = inputProtocolFactory_.getProtocol(inputTransport);
-        outputProtocol = outputProtocolFactory_.getProtocol(outputTransport);	  
-
-        eventHandler = getEventHandler();
-        if (eventHandler != null) {
-          connectionContext = eventHandler.createContext(inputProtocol, outputProtocol);
-        }
-        // we check stopped_ first to make sure we're not supposed to be shutting
-        // down. this is necessary for graceful shutdown.
-        while (true) {
-
-            if (eventHandler != null) {
-              eventHandler.processContext(connectionContext, inputTransport, outputTransport);
-            }
-
-            if(stopped_ || !processor.process(inputProtocol, outputProtocol)) {
-              break;
-            }
-        }
-      } catch (TSaslTransportException ttx) {
-        // Something thats not SASL was in the stream, continue silently 
-      } catch (TTransportException ttx) {
-        // Assume the client died and continue silently
-      } catch (TException tx) {
-        LOGGER.error("Thrift error occurred during processing of message.", tx);
-      } catch (Exception x) {
-        LOGGER.error("Error occurred during processing of message.", x);
-      } finally {
-        if (eventHandler != null) {
-          eventHandler.deleteContext(connectionContext, inputProtocol, outputProtocol);
-        }
-        if (inputTransport != null) {
-          inputTransport.close();
-        }
-        if (outputTransport != null) {
-          outputTransport.close();
-        }
-        if (client_.isOpen()) {
-          client_.close();
-        }
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java
deleted file mode 100644
index 353b8e0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.server;
-
-import java.io.IOException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.thrift.transport.TNonblockingServerTransport;
-import org.apache.thrift.transport.TNonblockingTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A Half-Sync/Half-Async server with a separate pool of threads to handle
- * non-blocking I/O. Accepts are handled on a single thread, and a configurable
- * number of nonblocking selector threads manage reading and writing of client
- * connections. A synchronous worker thread pool handles processing of requests.
- * 
- * Performs better than TNonblockingServer/THsHaServer in multi-core
- * environments when the the bottleneck is CPU on the single selector thread
- * handling I/O. In addition, because the accept handling is decoupled from
- * reads/writes and invocation, the server has better ability to handle back-
- * pressure from new connections (e.g. stop accepting when busy).
- * 
- * Like TNonblockingServer, it relies on the use of TFramedTransport.
- */
-public class TThreadedSelectorServer extends AbstractNonblockingServer {
-  private static final Logger LOGGER = LoggerFactory.getLogger(TThreadedSelectorServer.class.getName());
-
-  public static class Args extends AbstractNonblockingServerArgs<Args> {
-
-    /** The number of threads for selecting on already-accepted connections */
-    public int selectorThreads = 2;
-    /**
-     * The size of the executor service (if none is specified) that will handle
-     * invocations. This may be set to 0, in which case invocations will be
-     * handled directly on the selector threads (as is in TNonblockingServer)
-     */
-    private int workerThreads = 5;
-    /** Time to wait for server to stop gracefully */
-    private int stopTimeoutVal = 60;
-    private TimeUnit stopTimeoutUnit = TimeUnit.SECONDS;
-    /** The ExecutorService for handling dispatched requests */
-    private ExecutorService executorService = null;
-    /**
-     * The size of the blocking queue per selector thread for passing accepted
-     * connections to the selector thread
-     */
-    private int acceptQueueSizePerThread = 4;
-
-    /**
-     * Determines the strategy for handling new accepted connections.
-     */
-    public static enum AcceptPolicy {
-      /**
-       * Require accepted connection registration to be handled by the executor.
-       * If the worker pool is saturated, further accepts will be closed
-       * immediately. Slightly increases latency due to an extra scheduling.
-       */
-      FAIR_ACCEPT,
-      /**
-       * Handle the accepts as fast as possible, disregarding the status of the
-       * executor service.
-       */
-      FAST_ACCEPT
-    }
-
-    private AcceptPolicy acceptPolicy = AcceptPolicy.FAST_ACCEPT;
-
-    public Args(TNonblockingServerTransport transport) {
-      super(transport);
-    }
-
-    public Args selectorThreads(int i) {
-      selectorThreads = i;
-      return this;
-    }
-
-    public int getSelectorThreads() {
-      return selectorThreads;
-    }
-
-    public Args workerThreads(int i) {
-      workerThreads = i;
-      return this;
-    }
-
-    public int getWorkerThreads() {
-      return workerThreads;
-    }
-
-    public int getStopTimeoutVal() {
-      return stopTimeoutVal;
-    }
-
-    public Args stopTimeoutVal(int stopTimeoutVal) {
-      this.stopTimeoutVal = stopTimeoutVal;
-      return this;
-    }
-
-    public TimeUnit getStopTimeoutUnit() {
-      return stopTimeoutUnit;
-    }
-
-    public Args stopTimeoutUnit(TimeUnit stopTimeoutUnit) {
-      this.stopTimeoutUnit = stopTimeoutUnit;
-      return this;
-    }
-
-    public ExecutorService getExecutorService() {
-      return executorService;
-    }
-
-    public Args executorService(ExecutorService executorService) {
-      this.executorService = executorService;
-      return this;
-    }
-
-    public int getAcceptQueueSizePerThread() {
-      return acceptQueueSizePerThread;
-    }
-
-    public Args acceptQueueSizePerThread(int acceptQueueSizePerThread) {
-      this.acceptQueueSizePerThread = acceptQueueSizePerThread;
-      return this;
-    }
-
-    public AcceptPolicy getAcceptPolicy() {
-      return acceptPolicy;
-    }
-
-    public Args acceptPolicy(AcceptPolicy acceptPolicy) {
-      this.acceptPolicy = acceptPolicy;
-      return this;
-    }
-
-    public void validate() {
-      if (selectorThreads <= 0) {
-        throw new IllegalArgumentException("selectorThreads must be positive.");
-      }
-      if (workerThreads < 0) {
-        throw new IllegalArgumentException("workerThreads must be non-negative.");
-      }
-      if (acceptQueueSizePerThread <= 0) {
-        throw new IllegalArgumentException("acceptQueueSizePerThread must be positive.");
-      }
-    }
-  }
-
-  // The thread handling all accepts
-  private AcceptThread acceptThread;
-
-  // Threads handling events on client transports
-  private final Set<SelectorThread> selectorThreads = new HashSet<SelectorThread>();
-
-  // This wraps all the functionality of queueing and thread pool management
-  // for the passing of Invocations from the selector thread(s) to the workers
-  // (if any).
-  private final ExecutorService invoker;
-
-  private final Args args;
-
-  /**
-   * Create the server with the specified Args configuration
-   */
-  public TThreadedSelectorServer(Args args) {
-    super(args);
-    args.validate();
-    invoker = args.executorService == null ? createDefaultExecutor(args) : args.executorService;
-    this.args = args;
-  }
-
-  /**
-   * Start the accept and selector threads running to deal with clients.
-   * 
-   * @return true if everything went ok, false if we couldn't start for some
-   *         reason.
-   */
-  @Override
-  protected boolean startThreads() {
-    try {
-      for (int i = 0; i < args.selectorThreads; ++i) {
-        selectorThreads.add(new SelectorThread(args.acceptQueueSizePerThread));
-      }
-      acceptThread = new AcceptThread((TNonblockingServerTransport) serverTransport_,
-        createSelectorThreadLoadBalancer(selectorThreads));
-      for (SelectorThread thread : selectorThreads) {
-        thread.start();
-      }
-      acceptThread.start();
-      return true;
-    } catch (IOException e) {
-      LOGGER.error("Failed to start threads!", e);
-      return false;
-    }
-  }
-
-  /**
-   * Joins the accept and selector threads and shuts down the executor service.
-   */
-  @Override
-  protected void waitForShutdown() {
-    try {
-      joinThreads();
-    } catch (InterruptedException e) {
-      // Non-graceful shutdown occurred
-      LOGGER.error("Interrupted while joining threads!", e);
-    }
-    gracefullyShutdownInvokerPool();
-  }
-
-  protected void joinThreads() throws InterruptedException {
-    // wait until the io threads exit
-    acceptThread.join();
-    for (SelectorThread thread : selectorThreads) {
-      thread.join();
-    }
-  }
-
-  /**
-   * Stop serving and shut everything down.
-   */
-  @Override
-  public void stop() {
-    stopped_ = true;
-
-    // Stop queuing connect attempts asap
-    stopListening();
-
-    if (acceptThread != null) {
-      acceptThread.wakeupSelector();
-    }
-    if (selectorThreads != null) {
-      for (SelectorThread thread : selectorThreads) {
-        if (thread != null)
-          thread.wakeupSelector();
-      }
-    }
-  }
-
-  protected void gracefullyShutdownInvokerPool() {
-    // try to gracefully shut down the executor service
-    invoker.shutdown();
-
-    // Loop until awaitTermination finally does return without a interrupted
-    // exception. If we don't do this, then we'll shut down prematurely. We want
-    // to let the executorService clear it's task queue, closing client sockets
-    // appropriately.
-    long timeoutMS = args.stopTimeoutUnit.toMillis(args.stopTimeoutVal);
-    long now = System.currentTimeMillis();
-    while (timeoutMS >= 0) {
-      try {
-        invoker.awaitTermination(timeoutMS, TimeUnit.MILLISECONDS);
-        break;
-      } catch (InterruptedException ix) {
-        long newnow = System.currentTimeMillis();
-        timeoutMS -= (newnow - now);
-        now = newnow;
-      }
-    }
-  }
-
-  /**
-   * We override the standard invoke method here to queue the invocation for
-   * invoker service instead of immediately invoking. If there is no thread
-   * pool, handle the invocation inline on this thread
-   */
-  @Override
-  protected boolean requestInvoke(FrameBuffer frameBuffer) {
-    Runnable invocation = getRunnable(frameBuffer);
-    if (invoker != null) {
-      try {
-        invoker.execute(invocation);
-        return true;
-      } catch (RejectedExecutionException rx) {
-        LOGGER.warn("ExecutorService rejected execution!", rx);
-        return false;
-      }
-    } else {
-      // Invoke on the caller's thread
-      invocation.run();
-      return true;
-    }
-  }
-
-  protected Runnable getRunnable(FrameBuffer frameBuffer) {
-    return new Invocation(frameBuffer);
-  }
-
-  /**
-   * Helper to create the invoker if one is not specified
-   */
-  protected static ExecutorService createDefaultExecutor(Args options) {
-    return (options.workerThreads > 0) ? Executors.newFixedThreadPool(options.workerThreads) : null;
-  }
-
-  private static BlockingQueue<TNonblockingTransport> createDefaultAcceptQueue(int queueSize) {
-    if (queueSize == 0) {
-      // Unbounded queue
-      return new LinkedBlockingQueue<TNonblockingTransport>();
-    }
-    return new ArrayBlockingQueue<TNonblockingTransport>(queueSize);
-  }
-
-  /**
-   * The thread that selects on the server transport (listen socket) and accepts
-   * new connections to hand off to the IO selector threads
-   */
-  protected class AcceptThread extends Thread {
-
-    // The listen socket to accept on
-    private final TNonblockingServerTransport serverTransport;
-    private final Selector acceptSelector;
-
-    private final SelectorThreadLoadBalancer threadChooser;
-
-    /**
-     * Set up the AcceptThead
-     * 
-     * @throws IOException
-     */
-    public AcceptThread(TNonblockingServerTransport serverTransport,
-        SelectorThreadLoadBalancer threadChooser) throws IOException {
-      this.serverTransport = serverTransport;
-      this.threadChooser = threadChooser;
-      this.acceptSelector = SelectorProvider.provider().openSelector();
-      this.serverTransport.registerSelector(acceptSelector);
-    }
-
-    /**
-     * The work loop. Selects on the server transport and accepts. If there was
-     * a server transport that had blocking accepts, and returned on blocking
-     * client transports, that should be used instead
-     */
-    public void run() {
-      try {
-        if (eventHandler_ != null) {
-          eventHandler_.preServe();
-        }
-
-        while (!stopped_) {
-          select();
-        }
-      } catch (Throwable t) {
-        LOGGER.error("run() on AcceptThread exiting due to uncaught error", t);
-      } finally {
-        try {
-          acceptSelector.close();
-        } catch (IOException e) {
-          LOGGER.error("Got an IOException while closing accept selector!", e);
-        }
-        // This will wake up the selector threads
-        TThreadedSelectorServer.this.stop();
-      }
-    }
-
-    /**
-     * If the selector is blocked, wake it up.
-     */
-    public void wakeupSelector() {
-      acceptSelector.wakeup();
-    }
-
-    /**
-     * Select and process IO events appropriately: If there are connections to
-     * be accepted, accept them.
-     */
-    private void select() {
-      try {
-        // wait for connect events.
-        acceptSelector.select();
-
-        // process the io events we received
-        Iterator<SelectionKey> selectedKeys = acceptSelector.selectedKeys().iterator();
-        while (!stopped_ && selectedKeys.hasNext()) {
-          SelectionKey key = selectedKeys.next();
-          selectedKeys.remove();
-
-          // skip if not valid
-          if (!key.isValid()) {
-            continue;
-          }
-
-          if (key.isAcceptable()) {
-            handleAccept();
-          } else {
-            LOGGER.warn("Unexpected state in select! " + key.interestOps());
-          }
-        }
-      } catch (IOException e) {
-        LOGGER.warn("Got an IOException while selecting!", e);
-      }
-    }
-
-    /**
-     * Accept a new connection.
-     */
-    private void handleAccept() {
-      final TNonblockingTransport client = doAccept();
-      if (client != null) {
-        // Pass this connection to a selector thread
-        final SelectorThread targetThread = threadChooser.nextThread();
-
-        if (args.acceptPolicy == Args.AcceptPolicy.FAST_ACCEPT || invoker == null) {
-          doAddAccept(targetThread, client);
-        } else {
-          // FAIR_ACCEPT
-          try {
-            invoker.submit(new Runnable() {
-              public void run() {
-                doAddAccept(targetThread, client);
-              }
-            });
-          } catch (RejectedExecutionException rx) {
-            LOGGER.warn("ExecutorService rejected accept registration!", rx);
-            // close immediately
-            client.close();
-          }
-        }
-      }
-    }
-
-    private TNonblockingTransport doAccept() {
-      try {
-        return (TNonblockingTransport) serverTransport.accept();
-      } catch (TTransportException tte) {
-        // something went wrong accepting.
-        LOGGER.warn("Exception trying to accept!", tte);
-        return null;
-      }
-    }
-
-    private void doAddAccept(SelectorThread thread, TNonblockingTransport client) {
-      if (!thread.addAcceptedConnection(client)) {
-        client.close();
-      }
-    }
-  } // AcceptThread
-
-  /**
-   * The SelectorThread(s) will be doing all the selecting on accepted active
-   * connections.
-   */
-  protected class SelectorThread extends AbstractSelectThread {
-
-    // Accepted connections added by the accept thread.
-    private final BlockingQueue<TNonblockingTransport> acceptedQueue;
-
-    /**
-     * Set up the SelectorThread with an unbounded queue for incoming accepts.
-     * 
-     * @throws IOException
-     *           if a selector cannot be created
-     */
-    public SelectorThread() throws IOException {
-      this(new LinkedBlockingQueue<TNonblockingTransport>());
-    }
-
-    /**
-     * Set up the SelectorThread with an bounded queue for incoming accepts.
-     * 
-     * @throws IOException
-     *           if a selector cannot be created
-     */
-    public SelectorThread(int maxPendingAccepts) throws IOException {
-      this(createDefaultAcceptQueue(maxPendingAccepts));
-    }
-
-    /**
-     * Set up the SelectorThread with a specified queue for connections.
-     * 
-     * @param acceptedQueue
-     *          The BlockingQueue implementation for holding incoming accepted
-     *          connections.
-     * @throws IOException
-     *           if a selector cannot be created.
-     */
-    public SelectorThread(BlockingQueue<TNonblockingTransport> acceptedQueue) throws IOException {
-      this.acceptedQueue = acceptedQueue;
-    }
-
-    /**
-     * Hands off an accepted connection to be handled by this thread. This
-     * method will block if the queue for new connections is at capacity.
-     * 
-     * @param accepted
-     *          The connection that has been accepted.
-     * @return true if the connection has been successfully added.
-     */
-    public boolean addAcceptedConnection(TNonblockingTransport accepted) {
-      try {
-        acceptedQueue.put(accepted);
-      } catch (InterruptedException e) {
-        LOGGER.warn("Interrupted while adding accepted connection!", e);
-        return false;
-      }
-      selector.wakeup();
-      return true;
-    }
-
-    /**
-     * The work loop. Handles selecting (read/write IO), dispatching, and
-     * managing the selection preferences of all existing connections.
-     */
-    public void run() {
-      try {
-        while (!stopped_) {
-          select();
-          processAcceptedConnections();
-          processInterestChanges();
-        }
-        for (SelectionKey selectionKey : selector.keys()) {
-          cleanupSelectionKey(selectionKey);
-        }
-      } catch (Throwable t) {
-        LOGGER.error("run() on SelectorThread exiting due to uncaught error", t);
-      } finally {
-        try {
-          selector.close();
-        } catch (IOException e) {
-          LOGGER.error("Got an IOException while closing selector!", e);
-        }
-        // This will wake up the accept thread and the other selector threads
-        TThreadedSelectorServer.this.stop();
-      }
-    }
-
-    /**
-     * Select and process IO events appropriately: If there are existing
-     * connections with data waiting to be read, read it, buffering until a
-     * whole frame has been read. If there are any pending responses, buffer
-     * them until their target client is available, and then send the data.
-     */
-    private void select() {
-      try {
-        // wait for io events.
-        selector.select();
-
-        // process the io events we received
-        Iterator<SelectionKey> selectedKeys = selector.selectedKeys().iterator();
-        while (!stopped_ && selectedKeys.hasNext()) {
-          SelectionKey key = selectedKeys.next();
-          selectedKeys.remove();
-
-          // skip if not valid
-          if (!key.isValid()) {
-            cleanupSelectionKey(key);
-            continue;
-          }
-
-          if (key.isReadable()) {
-            // deal with reads
-            handleRead(key);
-          } else if (key.isWritable()) {
-            // deal with writes
-            handleWrite(key);
-          } else {
-            LOGGER.warn("Unexpected state in select! " + key.interestOps());
-          }
-        }
-      } catch (IOException e) {
-        LOGGER.warn("Got an IOException while selecting!", e);
-      }
-    }
-
-    private void processAcceptedConnections() {
-      // Register accepted connections
-      while (!stopped_) {
-        TNonblockingTransport accepted = acceptedQueue.poll();
-        if (accepted == null) {
-          break;
-        }
-        registerAccepted(accepted);
-      }
-    }
-
-    protected FrameBuffer createFrameBuffer(final TNonblockingTransport trans,
-        final SelectionKey selectionKey,
-        final AbstractSelectThread selectThread) {
-        return processorFactory_.isAsyncProcessor() ?
-                  new AsyncFrameBuffer(trans, selectionKey, selectThread) :
-                  new FrameBuffer(trans, selectionKey, selectThread);
-    }
-
-    private void registerAccepted(TNonblockingTransport accepted) {
-      SelectionKey clientKey = null;
-      try {
-        clientKey = accepted.registerSelector(selector, SelectionKey.OP_READ);
-
-        FrameBuffer frameBuffer = createFrameBuffer(accepted, clientKey, SelectorThread.this);
-
-        clientKey.attach(frameBuffer);
-      } catch (IOException e) {
-        LOGGER.warn("Failed to register accepted connection to selector!", e);
-        if (clientKey != null) {
-          cleanupSelectionKey(clientKey);
-        }
-        accepted.close();
-      }
-    }
-  } // SelectorThread
-
-  /**
-   * Creates a SelectorThreadLoadBalancer to be used by the accept thread for
-   * assigning newly accepted connections across the threads.
-   */
-  protected SelectorThreadLoadBalancer createSelectorThreadLoadBalancer(Collection<? extends SelectorThread> threads) {
-    return new SelectorThreadLoadBalancer(threads);
-  }
-
-  /**
-   * A round robin load balancer for choosing selector threads for new
-   * connections.
-   */
-  protected static class SelectorThreadLoadBalancer {
-    private final Collection<? extends SelectorThread> threads;
-    private Iterator<? extends SelectorThread> nextThreadIterator;
-
-    public <T extends SelectorThread> SelectorThreadLoadBalancer(Collection<T> threads) {
-      if (threads.isEmpty()) {
-        throw new IllegalArgumentException("At least one selector thread is required");
-      }
-      this.threads = Collections.unmodifiableList(new ArrayList<T>(threads));
-      nextThreadIterator = this.threads.iterator();
-    }
-
-    public SelectorThread nextThread() {
-      // Choose a selector thread (round robin)
-      if (!nextThreadIterator.hasNext()) {
-        nextThreadIterator = threads.iterator();
-      }
-      return nextThreadIterator.next();
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBuffer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBuffer.java
deleted file mode 100644
index b02905f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBuffer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-/**
- * Helper class that wraps a byte[] so that it can expand and be reused. Users
- * should call resizeIfNecessary to make sure the buffer has suitable capacity,
- * and then use the array as needed. Note that the internal array will grow at a
- * rate slightly faster than the requested capacity with the (untested)
- * objective of avoiding expensive buffer allocations and copies.
- */
-public class AutoExpandingBuffer {
-  private byte[] array;
-
-  private final double growthCoefficient;
-
-  public AutoExpandingBuffer(int initialCapacity, double growthCoefficient) {
-    if (growthCoefficient < 1.0) {
-      throw new IllegalArgumentException("Growth coefficient must be >= 1.0");
-    }
-    array = new byte[initialCapacity];
-    this.growthCoefficient = growthCoefficient;
-  }
-
-  public void resizeIfNecessary(int size) {
-    if (array.length < size) {
-      byte[] newBuf = new byte[(int)(size * growthCoefficient)];
-      System.arraycopy(array, 0, newBuf, 0, array.length);
-      array = newBuf;
-    }
-  }
-
-  public byte[] array() {
-    return array;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferReadTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferReadTransport.java
deleted file mode 100644
index 081bc48..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferReadTransport.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-/**
- * TTransport for reading from an AutoExpandingBuffer.
- */
-public class AutoExpandingBufferReadTransport extends TTransport {
-
-  private final AutoExpandingBuffer buf;
-
-  private int pos = 0;
-  private int limit = 0;
-
-  public AutoExpandingBufferReadTransport(int initialCapacity, double overgrowthCoefficient) {
-    this.buf = new AutoExpandingBuffer(initialCapacity, overgrowthCoefficient);
-  }
-
-  public void fill(TTransport inTrans, int length) throws TTransportException {
-    buf.resizeIfNecessary(length);
-    inTrans.readAll(buf.array(), 0, length);
-    pos = 0;
-    limit = length;
-  }
-
-  @Override
-  public void close() {}
-
-  @Override
-  public boolean isOpen() { return true; }
-
-  @Override
-  public void open() throws TTransportException {}
-
-  @Override
-  public final int read(byte[] target, int off, int len) throws TTransportException {
-    int amtToRead = Math.min(len, getBytesRemainingInBuffer());
-    System.arraycopy(buf.array(), pos, target, off, amtToRead);
-    consumeBuffer(amtToRead);
-    return amtToRead;
-  }
-
-  @Override
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public final void consumeBuffer(int len) {
-    pos += len;
-  }
-
-  @Override
-  public final byte[] getBuffer() {
-    return buf.array();
-  }
-
-  @Override
-  public final int getBufferPosition() {
-    return pos;
-  }
-
-  @Override
-  public final int getBytesRemainingInBuffer() {
-    return limit - pos;
-  }
-}
-  
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.java
deleted file mode 100644
index 9b35693..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-/**
- * TTransport for writing to an AutoExpandingBuffer.
- */
-public final class AutoExpandingBufferWriteTransport extends TTransport {
-
-  private final AutoExpandingBuffer buf;
-  private int pos;
-
-  public AutoExpandingBufferWriteTransport(int initialCapacity, double growthCoefficient) {
-    this.buf = new AutoExpandingBuffer(initialCapacity, growthCoefficient);
-    this.pos = 0;
-  }
-
-  @Override
-  public void close() {}
-
-  @Override
-  public boolean isOpen() {return true;}
-
-  @Override
-  public void open() throws TTransportException {}
-
-  @Override
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void write(byte[] toWrite, int off, int len) throws TTransportException {
-    buf.resizeIfNecessary(pos + len);
-    System.arraycopy(toWrite, off, buf.array(), pos, len);
-    pos += len;
-  }
-
-  public AutoExpandingBuffer getBuf() {
-    return buf;
-  }
-
-  public int getPos() {
-    return pos;
-  }
-
-  public void reset() {
-    pos = 0;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TByteBuffer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TByteBuffer.java
deleted file mode 100644
index a09f33d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TByteBuffer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.apache.thrift.transport;
-
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-
-/**
- * ByteBuffer-backed implementation of TTransport.
- */
-public final class TByteBuffer extends TTransport {
-  private final ByteBuffer byteBuffer;
-
-  /**
-   * Creates a new TByteBuffer wrapping a given NIO ByteBuffer.
-   */
-  public TByteBuffer(ByteBuffer byteBuffer) {
-    this.byteBuffer = byteBuffer;
-  }
-
-  @Override
-  public boolean isOpen() {
-    return true;
-  }
-
-  @Override
-  public void open() {
-  }
-
-  @Override
-  public void close() {
-  }
-
-  @Override
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    final int n = Math.min(byteBuffer.remaining(), len);
-    if (n > 0) {
-      try {
-        byteBuffer.get(buf, off, len);
-      } catch (BufferUnderflowException e) {
-        throw new TTransportException("Unexpected end of input buffer", e);
-      }
-    }
-    return n;
-  }
-
-  @Override
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    try {
-      byteBuffer.put(buf, off, len);
-    } catch (BufferOverflowException e) {
-      throw new TTransportException("Not enough room in output buffer", e);
-    }
-  }
-
-  /**
-   * Get the underlying NIO ByteBuffer.
-   */
-  public ByteBuffer getByteBuffer() {
-    return byteBuffer;
-  }
-
-  /**
-   * Convenience method to call clear() on the underlying NIO ByteBuffer.
-   */
-  public TByteBuffer clear() {
-    byteBuffer.clear();
-    return this;
-  }
-
-  /**
-   * Convenience method to call flip() on the underlying NIO ByteBuffer.
-     */
-  public TByteBuffer flip() {
-    byteBuffer.flip();
-    return this;
-  }
-
-  /**
-   * Convenience method to convert the underlying NIO ByteBuffer to a
-   * plain old byte array.
-   */
-  public byte[] toByteArray() {
-    final byte[] data = new byte[byteBuffer.remaining()];
-    byteBuffer.slice().get(data);
-    return data;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java
deleted file mode 100644
index 0398ca7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-/**
- * This transport is wire compatible with {@link TFramedTransport}, but makes
- * use of reusable, expanding read and write buffers in order to avoid
- * allocating new byte[]s all the time. Since the buffers only expand, you
- * should probably only use this transport if your messages are not too variably
- * large, unless the persistent memory cost is not an issue.
- *
- * This implementation is NOT threadsafe.
- */
-public class TFastFramedTransport extends TTransport {
-
-  public static class Factory extends TTransportFactory {
-    private final int initialCapacity;
-    private final int maxLength;
-
-    public Factory() {
-      this(DEFAULT_BUF_CAPACITY, DEFAULT_MAX_LENGTH);
-    }
-
-    public Factory(int initialCapacity) {
-      this(initialCapacity, DEFAULT_MAX_LENGTH);
-    }
-
-    public Factory(int initialCapacity, int maxLength) {
-      this.initialCapacity = initialCapacity;
-      this.maxLength = maxLength;
-    }
-
-    @Override
-    public TTransport getTransport(TTransport trans) {
-      return new TFastFramedTransport(trans,
-          initialCapacity,
-          maxLength);
-    }
-  }
-
-  /**
-   * How big should the default read and write buffers be?
-   */
-  public static final int DEFAULT_BUF_CAPACITY = 1024;
-  /**
-   * How big is the largest allowable frame? Defaults to 16MB.
-   */
-  public static final int DEFAULT_MAX_LENGTH = 16384000;
-
-  private final TTransport underlying;
-  private final AutoExpandingBufferWriteTransport writeBuffer;
-  private final AutoExpandingBufferReadTransport readBuffer;
-  private final byte[] i32buf = new byte[4];
-  private final int maxLength;
-
-  /**
-   * Create a new {@link TFastFramedTransport}. Use the defaults
-   * for initial buffer size and max frame length.
-   * @param underlying Transport that real reads and writes will go through to.
-   */
-  public TFastFramedTransport(TTransport underlying) {
-    this(underlying, DEFAULT_BUF_CAPACITY, DEFAULT_MAX_LENGTH);
-  }
-
-  /**
-   * Create a new {@link TFastFramedTransport}. Use the specified
-   * initial buffer capacity and the default max frame length.
-   * @param underlying Transport that real reads and writes will go through to.
-   * @param initialBufferCapacity The initial size of the read and write buffers.
-   * In practice, it's not critical to set this unless you know in advance that
-   * your messages are going to be very large.
-   */
-  public TFastFramedTransport(TTransport underlying, int initialBufferCapacity) {
-    this(underlying, initialBufferCapacity, DEFAULT_MAX_LENGTH);
-  }
-
-  /**
-   *
-   * @param underlying Transport that real reads and writes will go through to.
-   * @param initialBufferCapacity The initial size of the read and write buffers.
-   * In practice, it's not critical to set this unless you know in advance that
-   * your messages are going to be very large. (You can pass
-   * TFramedTransportWithReusableBuffer.DEFAULT_BUF_CAPACITY if you're only
-   * using this constructor because you want to set the maxLength.)
-   * @param maxLength The max frame size you are willing to read. You can use
-   * this parameter to limit how much memory can be allocated.
-   */
-  public TFastFramedTransport(TTransport underlying, int initialBufferCapacity, int maxLength) {
-    this.underlying = underlying;
-    this.maxLength = maxLength;
-    writeBuffer = new AutoExpandingBufferWriteTransport(initialBufferCapacity, 1.5);
-    readBuffer = new AutoExpandingBufferReadTransport(initialBufferCapacity, 1.5);
-  }
-
-  @Override
-  public void close() {
-    underlying.close();
-  }
-
-  @Override
-  public boolean isOpen() {
-    return underlying.isOpen();
-  }
-
-  @Override
-  public void open() throws TTransportException {
-    underlying.open();
-  }
-
-  @Override
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    int got = readBuffer.read(buf, off, len);
-    if (got > 0) {
-      return got;
-    }
-
-    // Read another frame of data
-    readFrame();
-
-    return readBuffer.read(buf, off, len);
-  }
-
-  private void readFrame() throws TTransportException {
-    underlying.readAll(i32buf , 0, 4);
-    int size = TFramedTransport.decodeFrameSize(i32buf);
-
-    if (size < 0) {
-      close();
-      throw new TTransportException(TTransportException.CORRUPTED_DATA, "Read a negative frame size (" + size + ")!");
-    }
-
-    if (size > maxLength) {
-      close();
-      throw new TTransportException(TTransportException.CORRUPTED_DATA,
-          "Frame size (" + size + ") larger than max length (" + maxLength + ")!");
-    }
-
-    readBuffer.fill(underlying, size);
-  }
-
-  @Override
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    writeBuffer.write(buf, off, len);
-  }
-
-  @Override
-  public void consumeBuffer(int len) {
-    readBuffer.consumeBuffer(len);
-  }
-
-  @Override
-  public void flush() throws TTransportException {
-    int length = writeBuffer.getPos();
-    TFramedTransport.encodeFrameSize(length, i32buf);
-    underlying.write(i32buf, 0, 4);
-    underlying.write(writeBuffer.getBuf().array(), 0, length);
-    writeBuffer.reset();
-    underlying.flush();
-  }
-
-  @Override
-  public byte[] getBuffer() {
-    return readBuffer.getBuffer();
-  }
-
-  @Override
-  public int getBufferPosition() {
-    return readBuffer.getBufferPosition();
-  }
-
-  @Override
-  public int getBytesRemainingInBuffer() {
-    return readBuffer.getBytesRemainingInBuffer();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFileProcessor.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFileProcessor.java
deleted file mode 100644
index 96087d1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFileProcessor.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-
-/**
- * FileProcessor: helps in processing files generated by TFileTransport.
- * Port of original cpp implementation
- */
-public class TFileProcessor {
-
-  private TProcessor processor_;
-  private TProtocolFactory inputProtocolFactory_;
-  private TProtocolFactory outputProtocolFactory_;
-  private TFileTransport inputTransport_;
-  private TTransport outputTransport_;
-
-  public TFileProcessor(TProcessor processor, TProtocolFactory protocolFactory,
-                        TFileTransport inputTransport,
-                        TTransport outputTransport) {
-    processor_ = processor;
-    inputProtocolFactory_ = outputProtocolFactory_ = protocolFactory;
-    inputTransport_ = inputTransport;
-    outputTransport_ = outputTransport;
-  }
-
-  public TFileProcessor(TProcessor processor, 
-                        TProtocolFactory inputProtocolFactory,
-                        TProtocolFactory outputProtocolFactory,
-                        TFileTransport inputTransport,
-                        TTransport outputTransport) {
-    processor_ = processor;
-    inputProtocolFactory_ = inputProtocolFactory;
-    outputProtocolFactory_ = outputProtocolFactory;
-    inputTransport_ = inputTransport;
-    outputTransport_ = outputTransport;
-  }
-
-  private void processUntil(int lastChunk) throws TException {
-    TProtocol ip = inputProtocolFactory_.getProtocol(inputTransport_);
-    TProtocol op = outputProtocolFactory_.getProtocol(outputTransport_);
-    int curChunk = inputTransport_.getCurChunk();
-
-    try {
-      while (lastChunk >= curChunk) {
-        processor_.process(ip, op);
-        int newChunk = inputTransport_.getCurChunk();
-        curChunk = newChunk;
-      } 
-    } catch (TTransportException e) {
-      // if we are processing the last chunk - we could have just hit EOF
-      // on EOF - trap the error and stop processing.
-      if(e.getType() != TTransportException.END_OF_FILE)
-        throw e;
-      else {
-        return;
-      }
-    }
-  }
-
-  /**
-   * Process from start to last chunk both inclusive where chunks begin from 0
-
-   * @param startChunkNum first chunk to be processed
-   * @param endChunkNum last chunk to be processed
-   */
-  public void processChunk(int startChunkNum, int endChunkNum) throws TException {
-    int numChunks = inputTransport_.getNumChunks();
-    if(endChunkNum < 0)
-      endChunkNum += numChunks;
-
-    if(startChunkNum < 0)
-      startChunkNum += numChunks;
-
-    if(endChunkNum < startChunkNum)
-      throw new TException("endChunkNum " + endChunkNum + " is less than " + startChunkNum);
-
-    inputTransport_.seekToChunk(startChunkNum);
-    processUntil(endChunkNum);
-  }
-
-  /**
-   * Process a single chunk
-   *
-   * @param chunkNum chunk to be processed
-   */
-  public void processChunk(int chunkNum) throws TException {
-    processChunk(chunkNum, chunkNum);
-  }
-
-  /**
-   * Process a current chunk
-   */
-  public void processChunk() throws TException {
-    processChunk(inputTransport_.getCurChunk());
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFileTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFileTransport.java
deleted file mode 100644
index 915fa73..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFileTransport.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.util.Random;
-
-/**
- * FileTransport implementation of the TTransport interface.
- * Currently this is a straightforward port of the cpp implementation
- * 
- * It may make better sense to provide a basic stream access on top of the framed file format
- * The FileTransport can then be a user of this framed file format with some additional logic
- * for chunking.
- */
-public class TFileTransport extends TTransport {
-
-  public static class TruncableBufferedInputStream extends BufferedInputStream {
-    public void trunc() {
-      pos = count = 0;
-    }        
-    public TruncableBufferedInputStream(InputStream in) {
-      super(in);
-    }
-    public TruncableBufferedInputStream(InputStream in, int size) {
-      super(in, size);
-    }
-  }
-
-
-  public static class Event {
-    private byte[] buf_;
-    private int nread_;
-    private int navailable_;
-
-    /**
-     * Initialize an event. Initially, it has no valid contents
-     *
-     * @param buf byte array buffer to store event 
-     */
-    public Event(byte[] buf) {
-      buf_ = buf;
-      nread_ = navailable_ = 0;
-    }
-
-    public byte[] getBuf() { return buf_;}
-    public int getSize() { return buf_.length; }
-
-
-    public void setAvailable(int sz) { nread_ = 0; navailable_=sz;}
-    public int getRemaining() { return (navailable_ - nread_); }
-
-    public int emit(byte[] buf, int offset, int ndesired) {
-      if((ndesired == 0) || (ndesired > getRemaining()))
-        ndesired = getRemaining();
-
-      if(ndesired <= 0)
-        return (ndesired);
-
-      System.arraycopy(buf_, nread_, buf, offset, ndesired);
-      nread_ += ndesired;
-
-      return(ndesired);
-    }
-  };
-
-  public static class ChunkState {
-    /**
-     * Chunk Size. Must be same across all implementations
-     */
-    public static final int DEFAULT_CHUNK_SIZE = 16 * 1024 * 1024;
-
-    private int chunk_size_ = DEFAULT_CHUNK_SIZE;
-    private long offset_ = 0;
-
-    public ChunkState() {}
-    public ChunkState(int chunk_size) { chunk_size_ = chunk_size; }
-
-    public void skip(int size) {offset_ += size; }
-    public void seek(long offset) {offset_ = offset;}
-
-    public int getChunkSize() { return chunk_size_;}
-    public int getChunkNum() { return ((int)(offset_/chunk_size_));}
-    public int getRemaining() { return (chunk_size_ - ((int)(offset_ % chunk_size_)));}
-    public long getOffset() { return (offset_);}
-  }
-
-  public static enum TailPolicy {
-
-    NOWAIT(0, 0),
-      WAIT_FOREVER(500, -1);
-
-    /**
-     * Time in milliseconds to sleep before next read
-     * If 0, no sleep
-     */
-    public final int timeout_;
-
-    /**
-     * Number of retries before giving up
-     * if 0, no retries
-     * if -1, retry forever
-     */
-    public final int retries_;
-
-    /**
-     * ctor for policy
-     *
-     * @param timeout sleep time for this particular policy
-     * @param retries number of retries
-     */
-
-    TailPolicy(int timeout, int retries) {
-      timeout_ = timeout;
-      retries_ = retries;
-    }
-  }
-
-  /**
-   * Current tailing policy
-   */
-  TailPolicy currentPolicy_ = TailPolicy.NOWAIT;
-
-
-  /** 
-   * Underlying file being read
-   */
-  protected TSeekableFile inputFile_ = null;
-
-  /** 
-   * Underlying outputStream 
-   */
-  protected OutputStream outputStream_ = null;
-
-
-  /**
-   * Event currently read in
-   */
-  Event currentEvent_ = null;
-
-  /**
-   * InputStream currently being used for reading
-   */
-  InputStream inputStream_ = null;
-
-  /**
-   * current Chunk state
-   */
-  ChunkState cs = null;
-
-  /**
-   * is read only?
-   */
-  private boolean readOnly_ = false;
-
-  /**
-   * Get File Tailing Policy
-   * 
-   * @return current read policy
-   */
-  public TailPolicy getTailPolicy() {
-    return (currentPolicy_);
-  }
-
-  /**
-   * Set file Tailing Policy
-   * 
-   * @param policy New policy to set
-   * @return Old policy
-   */
-  public TailPolicy setTailPolicy(TailPolicy policy) {
-    TailPolicy old = currentPolicy_;
-    currentPolicy_ = policy;
-    return (old);
-  }
-
-
-  /**
-   * Initialize read input stream
-   * 
-   * @return input stream to read from file
-   */
-  private InputStream createInputStream() throws TTransportException {
-    InputStream is;
-    try {
-      if(inputStream_ != null) {
-        ((TruncableBufferedInputStream)inputStream_).trunc();
-        is = inputStream_;
-      } else {
-        is = new TruncableBufferedInputStream(inputFile_.getInputStream());
-      }
-    } catch (IOException iox) {
-      System.err.println("createInputStream: "+iox.getMessage());
-      throw new TTransportException(iox.getMessage(), iox);
-    }
-    return(is);
-  }
-
-  /**
-   * Read (potentially tailing) an input stream
-   * 
-   * @param is InputStream to read from
-   * @param buf Buffer to read into
-   * @param off Offset in buffer to read into
-   * @param len Number of bytes to read
-   * @param tp  policy to use if we hit EOF
-   *
-   * @return number of bytes read
-   */
-  private int tailRead(InputStream is, byte[] buf, 
-                       int off, int len, TailPolicy tp) throws TTransportException {
-    int orig_len = len;
-    try {
-      int retries = 0;
-      while(len > 0) {
-        int cnt = is.read(buf, off, len);
-        if(cnt > 0) {
-          off += cnt;
-          len -= cnt;
-          retries = 0;
-          cs.skip(cnt); // remember that we read so many bytes
-        } else if (cnt == -1) {
-          // EOF
-          retries++;
-
-          if((tp.retries_ != -1) && tp.retries_ < retries)
-            return (orig_len - len);
-
-          if(tp.timeout_ > 0) {
-            try {Thread.sleep(tp.timeout_);} catch(InterruptedException e) {}
-          }
-        } else {
-          // either non-zero or -1 is what the contract says!
-          throw new
-            TTransportException("Unexpected return from InputStream.read = "
-                                + cnt);
-        }
-      }
-    } catch (IOException iox) {
-      throw new TTransportException(iox.getMessage(), iox);
-    }
-
-    return(orig_len - len);
-  }
-
-  /**
-   * Event is corrupted. Do recovery
-   *
-   * @return true if recovery could be performed and we can read more data
-   *         false is returned only when nothing more can be read
-   */
-  private boolean performRecovery() throws TTransportException {
-    int numChunks = getNumChunks();
-    int curChunk = cs.getChunkNum();
-
-    if(curChunk >= (numChunks-1)) {
-      return false;
-    }
-    seekToChunk(curChunk+1);
-    return true;
-  }
-
-  /**
-   * Read event from underlying file
-   *
-   * @return true if event could be read, false otherwise (on EOF)
-   */
-  private boolean readEvent() throws TTransportException {
-    byte[] ebytes = new byte[4];
-    int esize;
-    int nread;
-    int nrequested;
-
-    retry:
-    do {
-      // corner case. read to end of chunk
-      nrequested = cs.getRemaining();
-      if(nrequested < 4) {
-        nread = tailRead(inputStream_, ebytes, 0, nrequested, currentPolicy_);
-        if(nread != nrequested) {
-          return(false);
-        }
-      }
-
-      // assuming serialized on little endian machine
-      nread = tailRead(inputStream_, ebytes, 0, 4, currentPolicy_);
-      if(nread != 4) {
-        return(false);
-      }
-
-      esize=0;
-      for(int i=3; i>=0; i--) {
-        int val = (0x000000ff & (int)ebytes[i]);
-        esize |= (val << (i*8));
-      }
-
-      // check if event is corrupted and do recovery as required
-      if(esize > cs.getRemaining()) {
-        throw new TTransportException("FileTransport error: bad event size");
-        /*        
-                  if(performRecovery()) {
-                  esize=0;
-                  } else {
-                  return false;
-                  }
-        */
-      }
-    } while (esize == 0);
-
-    // reset existing event or get a larger one
-    if(currentEvent_.getSize() < esize)
-      currentEvent_ = new Event(new byte [esize]);
-
-    // populate the event
-    byte[] buf = currentEvent_.getBuf();
-    nread = tailRead(inputStream_, buf, 0, esize, currentPolicy_);
-    if(nread != esize) {
-      return(false);
-    }
-    currentEvent_.setAvailable(esize);
-    return(true);
-  }
-
-  /**
-   * open if both input/output open unless readonly
-   *
-   * @return true
-   */
-  public boolean isOpen() {
-    return ((inputStream_ != null) && (readOnly_ || (outputStream_ != null)));
-  }
-
-
-  /**
-   * Diverging from the cpp model and sticking to the TSocket model
-   * Files are not opened in ctor - but in explicit open call
-   */
-  public void open() throws TTransportException {
-    if (isOpen()) 
-      throw new TTransportException(TTransportException.ALREADY_OPEN);
-
-    try {
-      inputStream_ = createInputStream();
-      cs = new ChunkState();
-      currentEvent_ = new Event(new byte [256]);
-
-      if(!readOnly_)
-        outputStream_ = new BufferedOutputStream(inputFile_.getOutputStream(), 8192);
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.NOT_OPEN, iox);
-    }
-  }
-
-  /**
-   * Closes the transport.
-   */
-  public void close() {
-    if (inputFile_ != null) {
-      try {
-        inputFile_.close();
-      } catch (IOException iox) {
-        System.err.println("WARNING: Error closing input file: " +
-                           iox.getMessage());
-      }
-      inputFile_ = null;
-    }
-    if (outputStream_ != null) {
-      try {
-        outputStream_.close();
-      } catch (IOException iox) {
-        System.err.println("WARNING: Error closing output stream: " +
-                           iox.getMessage());
-      }
-      outputStream_ = null;
-    }
-  }
-
-
-  /**
-   * File Transport ctor
-   *
-   * @param path File path to read and write from
-   * @param readOnly Whether this is a read-only transport
-   */ 
-  public TFileTransport(final String path, boolean readOnly) throws IOException {
-    inputFile_ = new TStandardFile(path);
-    readOnly_ = readOnly;
-  }
-
-  /**
-   * File Transport ctor
-   *
-   * @param inputFile open TSeekableFile to read/write from
-   * @param readOnly Whether this is a read-only transport
-   */
-  public TFileTransport(TSeekableFile inputFile, boolean readOnly) {
-    inputFile_ = inputFile;
-    readOnly_ = readOnly;
-  }
-
-
-  /**
-   * Cloned from TTransport.java:readAll(). Only difference is throwing an EOF exception
-   * where one is detected.
-   */
-  public int readAll(byte[] buf, int off, int len)
-    throws TTransportException {
-    int got = 0;
-    int ret = 0;
-    while (got < len) {
-      ret = read(buf, off+got, len-got);
-      if (ret < 0) {
-        throw new TTransportException("Error in reading from file");
-      }
-      if(ret == 0) {
-        throw new TTransportException(TTransportException.END_OF_FILE,
-                                      "End of File reached");
-      }
-      got += ret;
-    }
-    return got;
-  }
-
-
-  /**
-   * Reads up to len bytes into buffer buf, starting at offset off.
-   *
-   * @param buf Array to read into
-   * @param off Index to start reading at
-   * @param len Maximum number of bytes to read
-   * @return The number of bytes actually read
-   * @throws TTransportException if there was an error reading data
-   */
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if(!isOpen()) 
-      throw new TTransportException(TTransportException.NOT_OPEN, 
-                                    "Must open before reading");
-
-    if(currentEvent_.getRemaining() == 0) {
-      if(!readEvent())
-        return(0);
-    }
-
-    int nread = currentEvent_.emit(buf, off, len);
-    return nread;
-  }
-
-  public int getNumChunks() throws TTransportException {
-    if(!isOpen()) 
-      throw new TTransportException(TTransportException.NOT_OPEN, 
-                                    "Must open before getNumChunks");
-    try {
-      long len = inputFile_.length();
-      if(len == 0)
-        return 0;
-      else 
-        return (((int)(len/cs.getChunkSize())) + 1);
-
-    } catch (IOException iox) {
-      throw new TTransportException(iox.getMessage(), iox);
-    }
-  }
-
-  public int getCurChunk() throws TTransportException {
-    if(!isOpen()) 
-      throw new TTransportException(TTransportException.NOT_OPEN, 
-                                    "Must open before getCurChunk");
-    return (cs.getChunkNum());
-
-  }
-
-
-  public void seekToChunk(int chunk) throws TTransportException {
-    if(!isOpen()) 
-      throw new TTransportException(TTransportException.NOT_OPEN, 
-                                    "Must open before seeking");
-
-    int numChunks = getNumChunks();
-
-    // file is empty, seeking to chunk is pointless
-    if (numChunks == 0) {
-      return;
-    }
-
-    // negative indicates reverse seek (from the end)
-    if (chunk < 0) {
-      chunk += numChunks;
-    }
-
-    // too large a value for reverse seek, just seek to beginning
-    if (chunk < 0) {
-      chunk = 0;
-    }
-
-    long eofOffset=0;
-    boolean seekToEnd = (chunk >= numChunks);
-    if(seekToEnd) {
-      chunk = chunk - 1;
-      try { eofOffset = inputFile_.length(); }
-      catch (IOException iox) {throw new TTransportException(iox.getMessage(),
-                                                             iox);}
-    }
-
-    if(chunk*cs.getChunkSize() != cs.getOffset()) {
-      try { inputFile_.seek((long)chunk*cs.getChunkSize()); } 
-      catch (IOException iox) {
-        System.err.println("createInputStream: "+iox.getMessage());
-        throw new TTransportException("Seek to chunk " +
-                                      chunk + " " +iox.getMessage(), iox);
-      }
-
-      cs.seek((long)chunk*cs.getChunkSize());
-      currentEvent_.setAvailable(0);
-      inputStream_ = createInputStream();
-    }
-
-    if(seekToEnd) {
-      // waiting forever here - otherwise we can hit EOF and end up
-      // having consumed partial data from the data stream.
-      TailPolicy old = setTailPolicy(TailPolicy.WAIT_FOREVER);
-      while(cs.getOffset() < eofOffset) { readEvent(); }
-      currentEvent_.setAvailable(0);
-      setTailPolicy(old);
-    }
-  }
-
-  public void seekToEnd() throws TTransportException {
-    if(!isOpen()) 
-      throw new TTransportException(TTransportException.NOT_OPEN, 
-                                    "Must open before seeking");
-    seekToChunk(getNumChunks());
-  }
-
-
-  /**
-   * Writes up to len bytes from the buffer.
-   *
-   * @param buf The output data buffer
-   * @param off The offset to start writing from
-   * @param len The number of bytes to write
-   * @throws TTransportException if there was an error writing data
-   */
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    throw new TTransportException("Not Supported");
-  }
-
-  /**
-   * Flush any pending data out of a transport buffer.
-   *
-   * @throws TTransportException if there was an error writing out data.
-   */
-  public void flush() throws TTransportException {
-    throw new TTransportException("Not Supported");
-  }
-
-  /**
-   * test program
-   * 
-   */
-  public static void main(String[] args) throws Exception {
-
-    int num_chunks = 10;
-
-    if((args.length < 1) || args[0].equals("--help")
-       || args[0].equals("-h") || args[0].equals("-?")) {
-      printUsage();
-    }
-
-    if(args.length > 1) {
-      try {
-        num_chunks = Integer.parseInt(args[1]);
-      } catch (Exception e) {
-        System.err.println("Cannot parse " + args[1]); 
-        printUsage();
-      }
-    }
-
-    TFileTransport t = new TFileTransport(args[0], true);
-    t.open();
-    System.out.println("NumChunks="+t.getNumChunks());
-
-    Random r = new Random();
-    for(int j=0; j<num_chunks; j++) {
-      byte[] buf = new byte[4096];
-      int cnum = r.nextInt(t.getNumChunks()-1);
-      System.out.println("Reading chunk "+cnum);
-      t.seekToChunk(cnum);
-      for(int i=0; i<4096; i++) {
-        t.read(buf, 0, 4096);
-      }
-    }
-  }
-
-  private static void printUsage() {
-    System.err.println("Usage: TFileTransport <filename> [num_chunks]");
-    System.err.println("       (Opens and reads num_chunks chunks from file randomly)");
-    System.exit(1);
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFramedTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
deleted file mode 100644
index f7d220c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.TByteArrayOutputStream;
-
-/**
- * TFramedTransport is a buffered TTransport that ensures a fully read message
- * every time by preceding messages with a 4-byte frame size.
- */
-public class TFramedTransport extends TTransport {
-
-  protected static final int DEFAULT_MAX_LENGTH = 16384000;
-
-  private int maxLength_;
-
-  /**
-   * Underlying transport
-   */
-  private TTransport transport_ = null;
-
-  /**
-   * Buffer for output
-   */
-  private final TByteArrayOutputStream writeBuffer_ =
-    new TByteArrayOutputStream(1024);
-
-  /**
-   * Buffer for input
-   */
-  private TMemoryInputTransport readBuffer_ = new TMemoryInputTransport(new byte[0]);
-
-  public static class Factory extends TTransportFactory {
-    private int maxLength_;
-
-    public Factory() {
-      maxLength_ = TFramedTransport.DEFAULT_MAX_LENGTH;
-    }
-
-    public Factory(int maxLength) {
-      maxLength_ = maxLength;
-    }
-
-    @Override
-    public TTransport getTransport(TTransport base) {
-      return new TFramedTransport(base, maxLength_);
-    }
-  }
-
-  /**
-   * Constructor wraps around another transport
-   */
-  public TFramedTransport(TTransport transport, int maxLength) {
-    transport_ = transport;
-    maxLength_ = maxLength;
-  }
-
-  public TFramedTransport(TTransport transport) {
-    transport_ = transport;
-    maxLength_ = TFramedTransport.DEFAULT_MAX_LENGTH;
-  }
-
-  public void open() throws TTransportException {
-    transport_.open();
-  }
-
-  public boolean isOpen() {
-    return transport_.isOpen();
-  }
-
-  public void close() {
-    transport_.close();
-  }
-
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (readBuffer_ != null) {
-      int got = readBuffer_.read(buf, off, len);
-      if (got > 0) {
-        return got;
-      }
-    }
-
-    // Read another frame of data
-    readFrame();
-
-    return readBuffer_.read(buf, off, len);
-  }
-
-  @Override
-  public byte[] getBuffer() {
-    return readBuffer_.getBuffer();
-  }
-
-  @Override
-  public int getBufferPosition() {
-    return readBuffer_.getBufferPosition();
-  }
-
-  @Override
-  public int getBytesRemainingInBuffer() {
-    return readBuffer_.getBytesRemainingInBuffer();
-  }
-
-  @Override
-  public void consumeBuffer(int len) {
-    readBuffer_.consumeBuffer(len);
-  }
-
-  private final byte[] i32buf = new byte[4];
-
-  private void readFrame() throws TTransportException {
-    transport_.readAll(i32buf, 0, 4);
-    int size = decodeFrameSize(i32buf);
-
-    if (size < 0) {
-      close();
-      throw new TTransportException(TTransportException.CORRUPTED_DATA, "Read a negative frame size (" + size + ")!");
-    }
-
-    if (size > maxLength_) {
-      close();
-      throw new TTransportException(TTransportException.CORRUPTED_DATA,
-          "Frame size (" + size + ") larger than max length (" + maxLength_ + ")!");
-    }
-
-    byte[] buff = new byte[size];
-    transport_.readAll(buff, 0, size);
-    readBuffer_.reset(buff);
-  }
-
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    writeBuffer_.write(buf, off, len);
-  }
-
-  @Override
-  public void flush() throws TTransportException {
-    byte[] buf = writeBuffer_.get();
-    int len = writeBuffer_.len();
-    writeBuffer_.reset();
-
-    encodeFrameSize(len, i32buf);
-    transport_.write(i32buf, 0, 4);
-    transport_.write(buf, 0, len);
-    transport_.flush();
-  }
-
-  public static final void encodeFrameSize(final int frameSize, final byte[] buf) {
-    buf[0] = (byte)(0xff & (frameSize >> 24));
-    buf[1] = (byte)(0xff & (frameSize >> 16));
-    buf[2] = (byte)(0xff & (frameSize >> 8));
-    buf[3] = (byte)(0xff & (frameSize));
-  }
-
-  public static final int decodeFrameSize(final byte[] buf) {
-    return
-      ((buf[0] & 0xff) << 24) |
-      ((buf[1] & 0xff) << 16) |
-      ((buf[2] & 0xff) <<  8) |
-      ((buf[3] & 0xff));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/THttpClient.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/THttpClient.java
deleted file mode 100644
index 5a5b37c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/THttpClient.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.params.CoreConnectionPNames;
-
-/**
- * HTTP implementation of the TTransport interface. Used for working with a
- * Thrift web services implementation (using for example TServlet).
- *
- * This class offers two implementations of the HTTP transport.
- * One uses HttpURLConnection instances, the other HttpClient from Apache
- * Http Components.
- * The chosen implementation depends on the constructor used to
- * create the THttpClient instance.
- * Using the THttpClient(String url) constructor or passing null as the
- * HttpClient to THttpClient(String url, HttpClient client) will create an
- * instance which will use HttpURLConnection.
- *
- * When using HttpClient, the following configuration leads to 5-15% 
- * better performance than the HttpURLConnection implementation:
- *
- * http.protocol.version=HttpVersion.HTTP_1_1
- * http.protocol.content-charset=UTF-8
- * http.protocol.expect-continue=false
- * http.connection.stalecheck=false
- *
- * Also note that under high load, the HttpURLConnection implementation
- * may exhaust the open file descriptor limit.
- *
- * @see <a href="https://issues.apache.org/jira/browse/THRIFT-970">THRIFT-970</a>
- */
-
-public class THttpClient extends TTransport {
-
-  private URL url_ = null;
-
-  private final ByteArrayOutputStream requestBuffer_ = new ByteArrayOutputStream();
-
-  private InputStream inputStream_ = null;
-
-  private int connectTimeout_ = 0;
-
-  private int readTimeout_ = 0;
-
-  private Map<String,String> customHeaders_ = null;
-
-  private final HttpHost host;
-  
-  private final HttpClient client;
-  
-  public static class Factory extends TTransportFactory {
-    
-    private final String url;
-    private final HttpClient client;
-    
-    public Factory(String url) {
-      this.url = url;
-      this.client = null;
-    }
-
-    public Factory(String url, HttpClient client) {
-      this.url = url;
-      this.client = client;
-    }
-    
-    @Override
-    public TTransport getTransport(TTransport trans) {
-      try {
-        if (null != client) {
-          return new THttpClient(url, client);
-        } else {
-          return new THttpClient(url);
-        }
-      } catch (TTransportException tte) {
-        return null;
-      }
-    }
-  }
-
-  public THttpClient(String url) throws TTransportException {
-    try {
-      url_ = new URL(url);
-      this.client = null;
-      this.host = null;
-    } catch (IOException iox) {
-      throw new TTransportException(iox);
-    }
-  }
-
-  public THttpClient(String url, HttpClient client) throws TTransportException {
-    try {
-      url_ = new URL(url);
-      this.client = client;
-      this.host = new HttpHost(url_.getHost(), -1 == url_.getPort() ? url_.getDefaultPort() : url_.getPort(), url_.getProtocol());
-    } catch (IOException iox) {
-      throw new TTransportException(iox);
-    }
-  }
-
-  public void setConnectTimeout(int timeout) {
-    connectTimeout_ = timeout;
-    if (null != this.client) {
-      // WARNING, this modifies the HttpClient params, this might have an impact elsewhere if the
-      // same HttpClient is used for something else.
-      client.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, connectTimeout_);
-    }
-  }
-
-  public void setReadTimeout(int timeout) {
-    readTimeout_ = timeout;
-    if (null != this.client) {
-      // WARNING, this modifies the HttpClient params, this might have an impact elsewhere if the
-      // same HttpClient is used for something else.
-      client.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, readTimeout_);
-    }
-  }
-
-  public void setCustomHeaders(Map<String,String> headers) {
-    customHeaders_ = headers;
-  }
-
-  public void setCustomHeader(String key, String value) {
-    if (customHeaders_ == null) {
-      customHeaders_ = new HashMap<String, String>();
-    }
-    customHeaders_.put(key, value);
-  }
-
-  public void open() {}
-
-  public void close() {
-    if (null != inputStream_) {
-      try {
-        inputStream_.close();
-      } catch (IOException ioe) {
-        ;
-      }
-      inputStream_ = null;
-    }
-  }
-
-  public boolean isOpen() {
-    return true;
-  }
-
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (inputStream_ == null) {
-      throw new TTransportException("Response buffer is empty, no request.");
-    }
-    try {
-      int ret = inputStream_.read(buf, off, len);
-      if (ret == -1) {
-        throw new TTransportException("No more data available.");
-      }
-      return ret;
-    } catch (IOException iox) {
-      throw new TTransportException(iox);
-    }
-  }
-
-  public void write(byte[] buf, int off, int len) {
-    requestBuffer_.write(buf, off, len);
-  }
-
-  /**
-   * copy from org.apache.http.util.EntityUtils#consume. Android has it's own httpcore
-   * that doesn't have a consume.
-   */
-  private static void consume(final HttpEntity entity) throws IOException {
-      if (entity == null) {
-          return;
-      }
-      if (entity.isStreaming()) {
-          InputStream instream = entity.getContent();
-          if (instream != null) {
-              instream.close();
-          }
-      }
-  }
-
-  private void flushUsingHttpClient() throws TTransportException {
-    
-    if (null == this.client) {
-      throw new TTransportException("Null HttpClient, aborting.");
-    }
-
-    // Extract request and reset buffer
-    byte[] data = requestBuffer_.toByteArray();
-    requestBuffer_.reset();
-
-    HttpPost post = null;
-    
-    InputStream is = null;
-    
-    try {      
-      // Set request to path + query string
-      post = new HttpPost(this.url_.getFile());
-      
-      //
-      // Headers are added to the HttpPost instance, not
-      // to HttpClient.
-      //
-      
-      post.setHeader("Content-Type", "application/x-thrift");
-      post.setHeader("Accept", "application/x-thrift");
-      post.setHeader("User-Agent", "Java/THttpClient/HC");
-      
-      if (null != customHeaders_) {
-        for (Map.Entry<String, String> header : customHeaders_.entrySet()) {
-          post.setHeader(header.getKey(), header.getValue());
-        }
-      }
-
-      post.setEntity(new ByteArrayEntity(data));
-      
-      HttpResponse response = this.client.execute(this.host, post);
-      int responseCode = response.getStatusLine().getStatusCode();
-
-      //      
-      // Retrieve the inputstream BEFORE checking the status code so
-      // resources get freed in the finally clause.
-      //
-
-      is = response.getEntity().getContent();
-      
-      if (responseCode != HttpStatus.SC_OK) {
-        throw new TTransportException("HTTP Response code: " + responseCode);
-      }
-
-      // Read the responses into a byte array so we can release the connection
-      // early. This implies that the whole content will have to be read in
-      // memory, and that momentarily we might use up twice the memory (while the
-      // thrift struct is being read up the chain).
-      // Proceeding differently might lead to exhaustion of connections and thus
-      // to app failure.
-      
-      byte[] buf = new byte[1024];
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      
-      int len = 0;
-      do {
-        len = is.read(buf);
-        if (len > 0) {
-          baos.write(buf, 0, len);
-        }
-      } while (-1 != len);
-      
-      try {
-        // Indicate we're done with the content.
-        consume(response.getEntity());
-      } catch (IOException ioe) {
-        // We ignore this exception, it might only mean the server has no
-        // keep-alive capability.
-      }
-            
-      inputStream_ = new ByteArrayInputStream(baos.toByteArray());
-    } catch (IOException ioe) {
-      // Abort method so the connection gets released back to the connection manager
-      if (null != post) {
-        post.abort();
-      }
-      throw new TTransportException(ioe);
-    } finally {
-      if (null != is) {
-        // Close the entity's input stream, this will release the underlying connection
-        try {
-          is.close();
-        } catch (IOException ioe) {
-          throw new TTransportException(ioe);
-        }
-      }
-    }
-  }
-
-  public void flush() throws TTransportException {
-
-    if (null != this.client) {
-      flushUsingHttpClient();
-      return;
-    }
-
-    // Extract request and reset buffer
-    byte[] data = requestBuffer_.toByteArray();
-    requestBuffer_.reset();
-
-    try {
-      // Create connection object
-      HttpURLConnection connection = (HttpURLConnection)url_.openConnection();
-
-      // Timeouts, only if explicitly set
-      if (connectTimeout_ > 0) {
-        connection.setConnectTimeout(connectTimeout_);
-      }
-      if (readTimeout_ > 0) {
-        connection.setReadTimeout(readTimeout_);
-      }
-
-      // Make the request
-      connection.setRequestMethod("POST");
-      connection.setRequestProperty("Content-Type", "application/x-thrift");
-      connection.setRequestProperty("Accept", "application/x-thrift");
-      connection.setRequestProperty("User-Agent", "Java/THttpClient");
-      if (customHeaders_ != null) {
-        for (Map.Entry<String, String> header : customHeaders_.entrySet()) {
-          connection.setRequestProperty(header.getKey(), header.getValue());
-        }
-      }
-      connection.setDoOutput(true);
-      connection.connect();
-      connection.getOutputStream().write(data);
-
-      int responseCode = connection.getResponseCode();
-      if (responseCode != HttpURLConnection.HTTP_OK) {
-        throw new TTransportException("HTTP Response code: " + responseCode);
-      }
-
-      // Read the responses
-      inputStream_ = connection.getInputStream();
-
-    } catch (IOException iox) {
-      throw new TTransportException(iox);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
deleted file mode 100644
index c8cd118..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * This is the most commonly used base transport. It takes an InputStream
- * and an OutputStream and uses those to perform all transport operations.
- * This allows for compatibility with all the nice constructs Java already
- * has to provide a variety of types of streams.
- *
- */
-public class TIOStreamTransport extends TTransport {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TIOStreamTransport.class.getName());
-
-  /** Underlying inputStream */
-  protected InputStream inputStream_ = null;
-
-  /** Underlying outputStream */
-  protected OutputStream outputStream_ = null;
-
-  /**
-   * Subclasses can invoke the default constructor and then assign the input
-   * streams in the open method.
-   */
-  protected TIOStreamTransport() {}
-
-  /**
-   * Input stream constructor.
-   *
-   * @param is Input stream to read from
-   */
-  public TIOStreamTransport(InputStream is) {
-    inputStream_ = is;
-  }
-
-  /**
-   * Output stream constructor.
-   *
-   * @param os Output stream to read from
-   */
-  public TIOStreamTransport(OutputStream os) {
-    outputStream_ = os;
-  }
-
-  /**
-   * Two-way stream constructor.
-   *
-   * @param is Input stream to read from
-   * @param os Output stream to read from
-   */
-  public TIOStreamTransport(InputStream is, OutputStream os) {
-    inputStream_ = is;
-    outputStream_ = os;
-  }
-
-  /**
-   * The streams must already be open at construction time, so this should
-   * always return true.
-   *
-   * @return true
-   */
-  public boolean isOpen() {
-    return true;
-  }
-
-  /**
-   * The streams must already be open. This method does nothing.
-   */
-  public void open() throws TTransportException {}
-
-  /**
-   * Closes both the input and output streams.
-   */
-  public void close() {
-    if (inputStream_ != null) {
-      try {
-        inputStream_.close();
-      } catch (IOException iox) {
-        LOGGER.warn("Error closing input stream.", iox);
-      }
-      inputStream_ = null;
-    }
-    if (outputStream_ != null) {
-      try {
-        outputStream_.close();
-      } catch (IOException iox) {
-        LOGGER.warn("Error closing output stream.", iox);
-      }
-      outputStream_ = null;
-    }
-  }
-
-  /**
-   * Reads from the underlying input stream if not null.
-   */
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (inputStream_ == null) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Cannot read from null inputStream");
-    }
-    int bytesRead;
-    try {
-      bytesRead = inputStream_.read(buf, off, len);
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.UNKNOWN, iox);
-    }
-    if (bytesRead < 0) {
-      throw new TTransportException(TTransportException.END_OF_FILE);
-    }
-    return bytesRead;
-  }
-
-  /**
-   * Writes to the underlying output stream if not null.
-   */
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    if (outputStream_ == null) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Cannot write to null outputStream");
-    }
-    try {
-      outputStream_.write(buf, off, len);
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.UNKNOWN, iox);
-    }
-  }
-
-  /**
-   * Flushes the underlying output stream if not null.
-   */
-  public void flush() throws TTransportException {
-    if (outputStream_ == null) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Cannot flush null outputStream");
-    }
-    try {
-      outputStream_.flush();
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.UNKNOWN, iox);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
deleted file mode 100644
index ef5f5c2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.TByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
-/**
- * Memory buffer-based implementation of the TTransport interface.
- */
-public class TMemoryBuffer extends TTransport {
-  /**
-   * Create a TMemoryBuffer with an initial buffer size of <i>size</i>. The
-   * internal buffer will grow as necessary to accommodate the size of the data
-   * being written to it.
-   */
-  public TMemoryBuffer(int size) {
-    arr_ = new TByteArrayOutputStream(size);
-  }
-
-  @Override
-  public boolean isOpen() {
-    return true;
-  }
-
-  @Override
-  public void open() {
-    /* Do nothing */
-  }
-
-  @Override
-  public void close() {
-    /* Do nothing */
-  }
-
-  @Override
-  public int read(byte[] buf, int off, int len) {
-    byte[] src = arr_.get();
-    int amtToRead = (len > arr_.len() - pos_ ? arr_.len() - pos_ : len);
-    if (amtToRead > 0) {
-      System.arraycopy(src, pos_, buf, off, amtToRead);
-      pos_ += amtToRead;
-    }
-    return amtToRead;
-  }
-
-  @Override
-  public void write(byte[] buf, int off, int len) {
-    arr_.write(buf, off, len);
-  }
-
-  /**
-   * Output the contents of the memory buffer as a String, using the supplied
-   * encoding
-   * @param enc  the encoding to use
-   * @return the contents of the memory buffer as a String
-   */
-  public String toString(String enc) throws UnsupportedEncodingException {
-    return arr_.toString(enc);
-  }
-
-  public String inspect() {
-    StringBuilder buf = new StringBuilder();
-    byte[] bytes = arr_.toByteArray();
-    for (int i = 0; i < bytes.length; i++) {
-      buf.append(pos_ == i ? "==>" : "" ).append(Integer.toHexString(bytes[i] & 0xff)).append(" ");
-    }
-    return buf.toString();
-  }
-
-  // The contents of the buffer
-  private TByteArrayOutputStream arr_;
-
-  // Position to read next byte from
-  private int pos_;
-
-  public int length() {
-    return arr_.size();
-  }
-
-  public byte[] getArray() {
-    return arr_.get();
-  }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java
deleted file mode 100644
index 2530dcc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-public final class TMemoryInputTransport extends TTransport {
-
-  private byte[] buf_;
-  private int pos_;
-  private int endPos_;
-
-  public TMemoryInputTransport() {
-  }
-
-  public TMemoryInputTransport(byte[] buf) {
-    reset(buf);
-  }
-
-  public TMemoryInputTransport(byte[] buf, int offset, int length) {
-    reset(buf, offset, length);
-  }
-
-  public void reset(byte[] buf) {
-    reset(buf, 0, buf.length);
-  }
-
-  public void reset(byte[] buf, int offset, int length) {
-    buf_ = buf;
-    pos_ = offset;
-    endPos_ = offset + length;
-  }
-
-  public void clear() {
-    buf_ = null;
-  }
-
-  @Override
-  public void close() {}
-
-  @Override
-  public boolean isOpen() {
-    return true;
-  }
-
-  @Override
-  public void open() throws TTransportException {}
-
-  @Override
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    int bytesRemaining = getBytesRemainingInBuffer();
-    int amtToRead = (len > bytesRemaining ? bytesRemaining : len);
-    if (amtToRead > 0) {
-      System.arraycopy(buf_, pos_, buf, off, amtToRead);
-      consumeBuffer(amtToRead);
-    }
-    return amtToRead;
-  }
-
-  @Override
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    throw new UnsupportedOperationException("No writing allowed!");
-  }
-
-  @Override
-  public byte[] getBuffer() {
-    return buf_;
-  }
-
-  public int getBufferPosition() {
-    return pos_;
-  }
-
-  public int getBytesRemainingInBuffer() {
-    return endPos_ - pos_;
-  }
-
-  public void consumeBuffer(int len) {
-    pos_ += len;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
deleted file mode 100644
index 44fe273..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.transport;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.SocketException;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Wrapper around ServerSocketChannel
- */
-public class TNonblockingServerSocket extends TNonblockingServerTransport {
-  private static final Logger LOGGER = LoggerFactory.getLogger(TNonblockingServerSocket.class.getName());
-
-  /**
-   * This channel is where all the nonblocking magic happens.
-   */
-  private ServerSocketChannel serverSocketChannel = null;
-
-  /**
-   * Underlying ServerSocket object
-   */
-  private ServerSocket serverSocket_ = null;
-
-  /**
-   * Timeout for client sockets from accept
-   */
-  private int clientTimeout_ = 0;
-
-  public static class NonblockingAbstractServerSocketArgs extends
-      AbstractServerTransportArgs<NonblockingAbstractServerSocketArgs> {}
-
-  /**
-   * Creates just a port listening server socket
-   */
-  public TNonblockingServerSocket(int port) throws TTransportException {
-    this(port, 0);
-  }
-
-  /**
-   * Creates just a port listening server socket
-   */
-  public TNonblockingServerSocket(int port, int clientTimeout) throws TTransportException {
-    this(new NonblockingAbstractServerSocketArgs().port(port).clientTimeout(clientTimeout));
-  }
-
-  public TNonblockingServerSocket(InetSocketAddress bindAddr) throws TTransportException {
-    this(bindAddr, 0);
-  }
-
-  public TNonblockingServerSocket(InetSocketAddress bindAddr, int clientTimeout) throws TTransportException {
-    this(new NonblockingAbstractServerSocketArgs().bindAddr(bindAddr).clientTimeout(clientTimeout));
-  }
-
-  public TNonblockingServerSocket(NonblockingAbstractServerSocketArgs args) throws TTransportException {
-    clientTimeout_ = args.clientTimeout;
-    try {
-      serverSocketChannel = ServerSocketChannel.open();
-      serverSocketChannel.configureBlocking(false);
-
-      // Make server socket
-      serverSocket_ = serverSocketChannel.socket();
-      // Prevent 2MSL delay problem on server restarts
-      serverSocket_.setReuseAddress(true);
-      // Bind to listening port
-      serverSocket_.bind(args.bindAddr, args.backlog);
-    } catch (IOException ioe) {
-      serverSocket_ = null;
-      throw new TTransportException("Could not create ServerSocket on address " + args.bindAddr.toString() + ".");
-    }
-  }
-
-  public void listen() throws TTransportException {
-    // Make sure not to block on accept
-    if (serverSocket_ != null) {
-      try {
-        serverSocket_.setSoTimeout(0);
-      } catch (SocketException sx) {
-        sx.printStackTrace();
-      }
-    }
-  }
-
-  protected TNonblockingSocket acceptImpl() throws TTransportException {
-    if (serverSocket_ == null) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "No underlying server socket.");
-    }
-    try {
-      SocketChannel socketChannel = serverSocketChannel.accept();
-      if (socketChannel == null) {
-        return null;
-      }
-
-      TNonblockingSocket tsocket = new TNonblockingSocket(socketChannel);
-      tsocket.setTimeout(clientTimeout_);
-      return tsocket;
-    } catch (IOException iox) {
-      throw new TTransportException(iox);
-    }
-  }
-
-  public void registerSelector(Selector selector) {
-    try {
-      // Register the server socket channel, indicating an interest in
-      // accepting new connections
-      serverSocketChannel.register(selector, SelectionKey.OP_ACCEPT);
-    } catch (ClosedChannelException e) {
-      // this shouldn't happen, ideally...
-      // TODO: decide what to do with this.
-    }
-  }
-
-  public void close() {
-    if (serverSocket_ != null) {
-      try {
-        serverSocket_.close();
-      } catch (IOException iox) {
-        LOGGER.warn("WARNING: Could not close server socket: " + iox.getMessage());
-      }
-      serverSocket_ = null;
-    }
-  }
-
-  public void interrupt() {
-    // The thread-safeness of this is dubious, but Java documentation suggests
-    // that it is safe to do this from a different thread context
-    close();
-  }
-
-  public int getPort() {
-    if (serverSocket_ == null)
-      return -1;
-    return serverSocket_.getLocalPort();
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingServerTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingServerTransport.java
deleted file mode 100644
index ba45b09..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingServerTransport.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.transport;
-
-import java.nio.channels.Selector;
-
-/**
- * Server transport that can be operated in a nonblocking fashion.
- */
-public abstract class TNonblockingServerTransport extends TServerTransport {
-
-  public abstract void registerSelector(Selector selector);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingSocket.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingSocket.java
deleted file mode 100644
index f86a48b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingSocket.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.transport;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.SocketChannel;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Transport for use with async client.
- */
-public class TNonblockingSocket extends TNonblockingTransport {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TNonblockingSocket.class.getName());
-
-  /**
-   * Host and port if passed in, used for lazy non-blocking connect.
-   */
-  private final SocketAddress socketAddress_;
-
-  private final SocketChannel socketChannel_;
-
-  public TNonblockingSocket(String host, int port) throws IOException {
-    this(host, port, 0);
-  }
-
-  /**
-   * Create a new nonblocking socket transport that will be connected to host:port.
-   * @param host
-   * @param port
-   * @throws IOException
-   */
-  public TNonblockingSocket(String host, int port, int timeout) throws IOException {
-    this(SocketChannel.open(), timeout, new InetSocketAddress(host, port));
-  }
-
-  /**
-   * Constructor that takes an already created socket.
-   *
-   * @param socketChannel Already created SocketChannel object
-   * @throws IOException if there is an error setting up the streams
-   */
-  public TNonblockingSocket(SocketChannel socketChannel) throws IOException {
-    this(socketChannel, 0, null);
-    if (!socketChannel.isConnected()) throw new IOException("Socket must already be connected");
-  }
-
-  private TNonblockingSocket(SocketChannel socketChannel, int timeout, SocketAddress socketAddress)
-      throws IOException {
-    socketChannel_ = socketChannel;
-    socketAddress_ = socketAddress;
-
-    // make it a nonblocking channel
-    socketChannel.configureBlocking(false);
-
-    // set options
-    Socket socket = socketChannel.socket();
-    socket.setSoLinger(false, 0);
-    socket.setTcpNoDelay(true);
-    socket.setKeepAlive(true);
-    setTimeout(timeout);
-  }
-
-  /**
-   * Register the new SocketChannel with our Selector, indicating
-   * we'd like to be notified when it's ready for I/O.
-   *
-   * @param selector
-   * @return the selection key for this socket.
-   */
-  public SelectionKey registerSelector(Selector selector, int interests) throws IOException {
-    return socketChannel_.register(selector, interests);
-  }
-
-  /**
-   * Sets the socket timeout, although this implementation never uses blocking operations so it is unused.
-   *
-   * @param timeout Milliseconds timeout
-   */
-  public void setTimeout(int timeout) {
-    try {
-      socketChannel_.socket().setSoTimeout(timeout);
-    } catch (SocketException sx) {
-      LOGGER.warn("Could not set socket timeout.", sx);
-    }
-  }
-
-  /**
-   * Returns a reference to the underlying SocketChannel.
-   */
-  public SocketChannel getSocketChannel() {
-    return socketChannel_;
-  }
-
-  /**
-   * Checks whether the socket is connected.
-   */
-  public boolean isOpen() {
-    // isConnected() does not return false after close(), but isOpen() does
-    return socketChannel_.isOpen() && socketChannel_.isConnected();
-  }
-
-  /**
-   * Do not call, the implementation provides its own lazy non-blocking connect.
-   */
-  public void open() throws TTransportException {
-    throw new RuntimeException("open() is not implemented for TNonblockingSocket");
-  }
-
-  /**
-   * Perform a nonblocking read into buffer.
-   */
-  public int read(ByteBuffer buffer) throws IOException {
-    return socketChannel_.read(buffer);
-  }
-
-
-  /**
-   * Reads from the underlying input stream if not null.
-   */
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if ((socketChannel_.validOps() & SelectionKey.OP_READ) != SelectionKey.OP_READ) {
-      throw new TTransportException(TTransportException.NOT_OPEN,
-        "Cannot read from write-only socket channel");
-    }
-    try {
-      return socketChannel_.read(ByteBuffer.wrap(buf, off, len));
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.UNKNOWN, iox);
-    }
-  }
-
-  /**
-   * Perform a nonblocking write of the data in buffer;
-   */
-  public int write(ByteBuffer buffer) throws IOException {
-    return socketChannel_.write(buffer);
-  }
-
-  /**
-   * Writes to the underlying output stream if not null.
-   */
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    if ((socketChannel_.validOps() & SelectionKey.OP_WRITE) != SelectionKey.OP_WRITE) {
-      throw new TTransportException(TTransportException.NOT_OPEN,
-        "Cannot write to write-only socket channel");
-    }
-    try {
-      socketChannel_.write(ByteBuffer.wrap(buf, off, len));
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.UNKNOWN, iox);
-    }
-  }
-
-  /**
-   * Noop.
-   */
-  public void flush() throws TTransportException {
-    // Not supported by SocketChannel.
-  }
-
-  /**
-   * Closes the socket.
-   */
-  public void close() {
-    try {
-      socketChannel_.close();
-    } catch (IOException iox) {
-      LOGGER.warn("Could not close socket.", iox);
-    }
-  }
-
-  /** {@inheritDoc} */
-  public boolean startConnect() throws IOException {
-    return socketChannel_.connect(socketAddress_);
-  }
-
-  /** {@inheritDoc} */
-  public boolean finishConnect() throws IOException {
-    return socketChannel_.finishConnect();
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
deleted file mode 100644
index 43c1306..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.IOException;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-
-public abstract class TNonblockingTransport extends TTransport {
-
-  /**
-   * Non-blocking connection initialization.
-   * @see java.nio.channels.SocketChannel#connect(SocketAddress remote)
-   */
-  public abstract boolean startConnect() throws IOException;
-
-  /**
-   * Non-blocking connection completion.
-   * @see java.nio.channels.SocketChannel#finishConnect()
-   */
-  public abstract boolean finishConnect() throws IOException;
-
-  public abstract SelectionKey registerSelector(Selector selector, int interests) throws IOException;
-
-  public abstract int read(ByteBuffer buffer) throws IOException;
-
-  public abstract int write(ByteBuffer buffer) throws IOException;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
deleted file mode 100644
index 9c60ed1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.security.KeyStore;
-import java.util.Arrays;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManagerFactory;
-
-/**
- *  A Factory for providing and setting up Client and Server SSL wrapped
- *  TSocket and TServerSocket
- */
-public class TSSLTransportFactory {
-
-  /**
-   * Get a SSL wrapped TServerSocket bound to the specified port. In this
-   * configuration the default settings are used. Default settings are retrieved
-   * from System properties that are set.
-   *
-   * Example system properties:
-   * -Djavax.net.ssl.trustStore=&lt;truststore location&gt;
-   * -Djavax.net.ssl.trustStorePassword=password
-   * -Djavax.net.ssl.keyStore=&lt;keystore location&gt;
-   * -Djavax.net.ssl.keyStorePassword=password
-   *
-   * @param port
-   * @return A SSL wrapped TServerSocket
-   * @throws TTransportException
-   */
-  public static TServerSocket getServerSocket(int port) throws TTransportException {
-    return getServerSocket(port, 0);
-  }
-
-  /**
-   * Get a default SSL wrapped TServerSocket bound to the specified port
-   *
-   * @param port
-   * @param clientTimeout
-   * @return A SSL wrapped TServerSocket
-   * @throws TTransportException
-   */
-  public static TServerSocket getServerSocket(int port, int clientTimeout) throws TTransportException {
-    return getServerSocket(port, clientTimeout, false, null);
-  }
-
-  /**
-   * Get a default SSL wrapped TServerSocket bound to the specified port and interface
-   *
-   * @param port
-   * @param clientTimeout
-   * @param ifAddress
-   * @return A SSL wrapped TServerSocket
-   * @throws TTransportException
-   */
-  public static TServerSocket getServerSocket(int port, int clientTimeout, boolean clientAuth, InetAddress ifAddress) throws TTransportException {
-    SSLServerSocketFactory factory = (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
-    return createServer(factory, port, clientTimeout, clientAuth, ifAddress, null);
-  }
-
-  /**
-   * Get a configured SSL wrapped TServerSocket bound to the specified port and interface.
-   * Here the TSSLTransportParameters are used to set the values for the algorithms, keystore,
-   * truststore and other settings
-   *
-   * @param port
-   * @param clientTimeout
-   * @param ifAddress
-   * @param params
-   * @return A SSL wrapped TServerSocket
-   * @throws TTransportException
-   */
-  public static TServerSocket getServerSocket(int port, int clientTimeout, InetAddress ifAddress, TSSLTransportParameters params) throws TTransportException {
-    if (params == null || !(params.isKeyStoreSet || params.isTrustStoreSet)) {
-      throw new TTransportException("Either one of the KeyStore or TrustStore must be set for SSLTransportParameters");
-    }
-
-    SSLContext ctx = createSSLContext(params);
-    return createServer(ctx.getServerSocketFactory(), port, clientTimeout, params.clientAuth, ifAddress, params);
-  }
-
-  private static TServerSocket createServer(SSLServerSocketFactory factory, int port, int timeout, boolean clientAuth,
-                                    InetAddress ifAddress, TSSLTransportParameters params) throws TTransportException {
-    try {
-      SSLServerSocket serverSocket = (SSLServerSocket) factory.createServerSocket(port, 100, ifAddress);
-      serverSocket.setSoTimeout(timeout);
-      serverSocket.setNeedClientAuth(clientAuth);
-      if (params != null && params.cipherSuites != null) {
-        serverSocket.setEnabledCipherSuites(params.cipherSuites);
-      }
-      return new TServerSocket(new TServerSocket.ServerSocketTransportArgs().
-        serverSocket(serverSocket).clientTimeout(timeout));
-    } catch (Exception e) {
-      throw new TTransportException("Could not bind to port " + port, e);
-    }
-  }
-
-  /**
-   * Get a default SSL wrapped TSocket connected to the specified host and port. All
-   * the client methods return a bound connection. So there is no need to call open() on the
-   * TTransport.
-   *
-   * @param host
-   * @param port
-   * @param timeout
-   * @return A SSL wrapped TSocket
-   * @throws TTransportException
-   */
-  public static TSocket getClientSocket(String host, int port, int timeout) throws TTransportException {
-    SSLSocketFactory factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
-    return createClient(factory, host, port, timeout);
-  }
-
-  /**
-   * Get a default SSL wrapped TSocket connected to the specified host and port.
-   *
-   * @param host
-   * @param port
-   * @return A SSL wrapped TSocket
-   * @throws TTransportException
-   */
-  public static TSocket getClientSocket(String host, int port) throws TTransportException {
-    return getClientSocket(host, port, 0);
-  }
-
-  /**
-   * Get a custom configured SSL wrapped TSocket. The SSL settings are obtained from the
-   * passed in TSSLTransportParameters.
-   *
-   * @param host
-   * @param port
-   * @param timeout
-   * @param params
-   * @return A SSL wrapped TSocket
-   * @throws TTransportException
-   */
-  public static TSocket getClientSocket(String host, int port, int timeout, TSSLTransportParameters params) throws TTransportException {
-    if (params == null || !(params.isKeyStoreSet || params.isTrustStoreSet)) {
-      throw new TTransportException("Either one of the KeyStore or TrustStore must be set for SSLTransportParameters");
-    }
-
-    SSLContext ctx = createSSLContext(params);
-    return createClient(ctx.getSocketFactory(), host, port, timeout);
-  }
-
-  private static SSLContext createSSLContext(TSSLTransportParameters params) throws TTransportException {
-    SSLContext ctx;
-    InputStream in = null;
-    InputStream is = null;
-
-    try {
-      ctx = SSLContext.getInstance(params.protocol);
-      TrustManagerFactory tmf = null;
-      KeyManagerFactory kmf = null;
-
-      if (params.isTrustStoreSet) {
-        tmf = TrustManagerFactory.getInstance(params.trustManagerType);
-        KeyStore ts = KeyStore.getInstance(params.trustStoreType);
-        in = getStoreAsStream(params.trustStore);
-        ts.load(in,
-                (params.trustPass != null ? params.trustPass.toCharArray() : null));
-        tmf.init(ts);
-      }
-
-      if (params.isKeyStoreSet) {
-        kmf = KeyManagerFactory.getInstance(params.keyManagerType);
-        KeyStore ks = KeyStore.getInstance(params.keyStoreType);
-        is = getStoreAsStream(params.keyStore);
-        ks.load(is, params.keyPass.toCharArray());
-        kmf.init(ks, params.keyPass.toCharArray());
-      }
-
-      if (params.isKeyStoreSet && params.isTrustStoreSet) {
-        ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-      }
-      else if (params.isKeyStoreSet) {
-        ctx.init(kmf.getKeyManagers(), null, null);
-      }
-      else {
-        ctx.init(null, tmf.getTrustManagers(), null);
-      }
-
-    } catch (Exception e) {
-      throw new TTransportException("Error creating the transport", e);
-    } finally {
-      if (in != null) {
-        try {
-          in.close();
-        } catch (IOException e) {
-          e.printStackTrace();
-        }
-      }
-      if (is != null) {
-        try {
-          is.close();
-        } catch (IOException e) {
-          e.printStackTrace();
-        }
-      }
-    }
-
-    return ctx;
-  }
-
-  private static InputStream getStoreAsStream(String store) throws IOException {
-    try {
-      return new FileInputStream(store);
-    } catch(FileNotFoundException e) {
-    }
-
-    InputStream storeStream = null;
-    try {
-      storeStream = new URL(store).openStream();
-      if (storeStream != null) {
-        return storeStream;
-      }
-    } catch(MalformedURLException e) {
-    }
-
-    storeStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(store);
-
-    if (storeStream != null) {
-      return storeStream;
-    } else {
-      throw new IOException("Could not load file: " + store);
-    }
-  }
-
-  private static TSocket createClient(SSLSocketFactory factory, String host, int port, int timeout) throws TTransportException {
-    try {
-      SSLSocket socket = (SSLSocket) factory.createSocket(host, port);
-      socket.setSoTimeout(timeout);
-      return new TSocket(socket);
-    } catch (Exception e) {
-      throw new TTransportException("Could not connect to " + host + " on port " + port, e);
-    }
-  }
-
-
-  /**
-   * A Class to hold all the SSL parameters
-   */
-  public static class TSSLTransportParameters {
-    protected String protocol = "TLS";
-    protected String keyStore;
-    protected String keyPass;
-    protected String keyManagerType = KeyManagerFactory.getDefaultAlgorithm();
-    protected String keyStoreType = "JKS";
-    protected String trustStore;
-    protected String trustPass;
-    protected String trustManagerType = TrustManagerFactory.getDefaultAlgorithm();
-    protected String trustStoreType = "JKS";
-    protected String[] cipherSuites;
-    protected boolean clientAuth = false;
-    protected boolean isKeyStoreSet = false;
-    protected boolean isTrustStoreSet = false;
-
-    public TSSLTransportParameters() {}
-
-    /**
-     * Create parameters specifying the protocol and cipher suites
-     *
-     * @param protocol The specific protocol (TLS/SSL) can be specified with versions
-     * @param cipherSuites
-     */
-    public TSSLTransportParameters(String protocol, String[] cipherSuites) {
-      this(protocol, cipherSuites, false);
-    }
-
-    /**
-     * Create parameters specifying the protocol, cipher suites and if client authentication
-     * is required
-     *
-     * @param protocol The specific protocol (TLS/SSL) can be specified with versions
-     * @param cipherSuites
-     * @param clientAuth
-     */
-    public TSSLTransportParameters(String protocol, String[] cipherSuites, boolean clientAuth) {
-      if (protocol != null) {
-        this.protocol = protocol;
-      }
-      this.cipherSuites = cipherSuites != null ? Arrays.copyOf(cipherSuites, cipherSuites.length) : null;
-      this.clientAuth = clientAuth;
-    }
-
-    /**
-     * Set the keystore, password, certificate type and the store type
-     *
-     * @param keyStore Location of the Keystore on disk
-     * @param keyPass Keystore password
-     * @param keyManagerType The default is X509
-     * @param keyStoreType The default is JKS
-     */
-    public void setKeyStore(String keyStore, String keyPass, String keyManagerType, String keyStoreType) {
-      this.keyStore = keyStore;
-      this.keyPass = keyPass;
-      if (keyManagerType != null) {
-        this.keyManagerType = keyManagerType;
-      }
-      if (keyStoreType != null) {
-        this.keyStoreType = keyStoreType;
-      }
-      isKeyStoreSet = true;
-    }
-
-    /**
-     * Set the keystore and password
-     *
-     * @param keyStore Location of the Keystore on disk
-     * @param keyPass Keystore password
-     */
-    public void setKeyStore(String keyStore, String keyPass) {
-      setKeyStore(keyStore, keyPass, null, null);
-    }
-
-    /**
-     * Set the truststore, password, certificate type and the store type
-     *
-     * @param trustStore Location of the Truststore on disk
-     * @param trustPass Truststore password
-     * @param trustManagerType The default is X509
-     * @param trustStoreType The default is JKS
-     */
-    public void setTrustStore(String trustStore, String trustPass, String trustManagerType, String trustStoreType) {
-      this.trustStore = trustStore;
-      this.trustPass = trustPass;
-      if (trustManagerType != null) {
-        this.trustManagerType = trustManagerType;
-      }
-      if (trustStoreType != null) {
-        this.trustStoreType = trustStoreType;
-      }
-      isTrustStoreSet = true;
-    }
-
-    /**
-     * Set the truststore and password
-     *
-     * @param trustStore Location of the Truststore on disk
-     * @param trustPass Truststore password
-     */
-    public void setTrustStore(String trustStore, String trustPass) {
-      setTrustStore(trustStore, trustPass, null, null);
-    }
-
-    /**
-     * Set if client authentication is required
-     *
-     * @param clientAuth
-     */
-    public void requireClientAuth(boolean clientAuth) {
-      this.clientAuth = clientAuth;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java
deleted file mode 100644
index 8122289..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Map;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Wraps another Thrift <code>TTransport</code>, but performs SASL client
- * negotiation on the call to <code>open()</code>. This class will wrap ensuing
- * communication over it, if a SASL QOP is negotiated with the other party.
- */
-public class TSaslClientTransport extends TSaslTransport {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TSaslClientTransport.class);
-
-  /**
-   * The name of the mechanism this client supports.
-   */
-  private final String mechanism;
-
-  /**
-   * Uses the given <code>SaslClient</code>.
-   * 
-   * @param saslClient
-   *          The <code>SaslClient</code> to use for the subsequent SASL
-   *          negotiation.
-   * @param transport
-   *          Transport underlying this one.
-   */
-  public TSaslClientTransport(SaslClient saslClient, TTransport transport) {
-    super(saslClient, transport);
-    mechanism = saslClient.getMechanismName();
-  }
-
-  /**
-   * Creates a <code>SaslClient</code> using the given SASL-specific parameters.
-   * See the Java documentation for <code>Sasl.createSaslClient</code> for the
-   * details of the parameters.
-   * 
-   * @param transport
-   *          The underlying Thrift transport.
-   * @throws SaslException
-   */
-  public TSaslClientTransport(String mechanism, String authorizationId, String protocol,
-      String serverName, Map<String, String> props, CallbackHandler cbh, TTransport transport)
-      throws SaslException {
-    super(Sasl.createSaslClient(new String[] { mechanism }, authorizationId, protocol, serverName,
-        props, cbh), transport);
-    this.mechanism = mechanism;
-  }
-
-
-  @Override
-  protected SaslRole getRole() {
-    return SaslRole.CLIENT;
-  }
-
-  /**
-   * Performs the client side of the initial portion of the Thrift SASL
-   * protocol. Generates and sends the initial response to the server, including
-   * which mechanism this client wants to use.
-   */
-  @Override
-  protected void handleSaslStartMessage() throws TTransportException, SaslException {
-    SaslClient saslClient = getSaslClient();
-
-    byte[] initialResponse = new byte[0];
-    if (saslClient.hasInitialResponse())
-      initialResponse = saslClient.evaluateChallenge(initialResponse);
-
-    LOGGER.debug("Sending mechanism name {} and initial response of length {}", mechanism,
-        initialResponse.length);
-
-    byte[] mechanismBytes;
-	try {
-		mechanismBytes = mechanism.getBytes("UTF-8");
-	} catch (UnsupportedEncodingException e) {
-		throw new TTransportException(e);
-	}
-    sendSaslMessage(NegotiationStatus.START,
-                    mechanismBytes);
-    // Send initial response
-    sendSaslMessage(saslClient.isComplete() ? NegotiationStatus.COMPLETE : NegotiationStatus.OK,
-                    initialResponse);
-    underlyingTransport.flush();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslServerTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslServerTransport.java
deleted file mode 100644
index e6c0e3e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslServerTransport.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Wraps another Thrift <code>TTransport</code>, but performs SASL server
- * negotiation on the call to <code>open()</code>. This class will wrap ensuing
- * communication over it, if a SASL QOP is negotiated with the other party.
- */
-public class TSaslServerTransport extends TSaslTransport {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TSaslServerTransport.class);
-
-  /**
-   * Mapping from SASL mechanism name -> all the parameters required to
-   * instantiate a SASL server.
-   */
-  private Map<String, TSaslServerDefinition> serverDefinitionMap = new HashMap<String, TSaslServerDefinition>();
-
-  /**
-   * Contains all the parameters used to define a SASL server implementation.
-   */
-  private static class TSaslServerDefinition {
-    public String mechanism;
-    public String protocol;
-    public String serverName;
-    public Map<String, String> props;
-    public CallbackHandler cbh;
-
-    public TSaslServerDefinition(String mechanism, String protocol, String serverName,
-        Map<String, String> props, CallbackHandler cbh) {
-      this.mechanism = mechanism;
-      this.protocol = protocol;
-      this.serverName = serverName;
-      this.props = props;
-      this.cbh = cbh;
-    }
-  }
-
-  /**
-   * Uses the given underlying transport. Assumes that addServerDefinition is
-   * called later.
-   * 
-   * @param transport
-   *          Transport underlying this one.
-   */
-  public TSaslServerTransport(TTransport transport) {
-    super(transport);
-  }
-
-  /**
-   * Creates a <code>SaslServer</code> using the given SASL-specific parameters.
-   * See the Java documentation for <code>Sasl.createSaslServer</code> for the
-   * details of the parameters.
-   * 
-   * @param transport
-   *          The underlying Thrift transport.
-   */
-  public TSaslServerTransport(String mechanism, String protocol, String serverName,
-      Map<String, String> props, CallbackHandler cbh, TTransport transport) {
-    super(transport);
-    addServerDefinition(mechanism, protocol, serverName, props, cbh);
-  }
-
-  private TSaslServerTransport(Map<String, TSaslServerDefinition> serverDefinitionMap, TTransport transport) {
-    super(transport);
-    this.serverDefinitionMap.putAll(serverDefinitionMap);
-  }
-
-  /**
-   * Add a supported server definition to this transport. See the Java
-   * documentation for <code>Sasl.createSaslServer</code> for the details of the
-   * parameters.
-   */
-  public void addServerDefinition(String mechanism, String protocol, String serverName,
-      Map<String, String> props, CallbackHandler cbh) {
-    serverDefinitionMap.put(mechanism, new TSaslServerDefinition(mechanism, protocol, serverName,
-        props, cbh));
-  }
-
-  @Override
-  protected SaslRole getRole() {
-    return SaslRole.SERVER;
-  }
-
-  /**
-   * Performs the server side of the initial portion of the Thrift SASL protocol.
-   * Receives the initial response from the client, creates a SASL server using
-   * the mechanism requested by the client (if this server supports it), and
-   * sends the first challenge back to the client.
-   */
-  @Override
-  protected void handleSaslStartMessage() throws TTransportException, SaslException {
-    SaslResponse message = receiveSaslMessage();
-
-    LOGGER.debug("Received start message with status {}", message.status);
-    if (message.status != NegotiationStatus.START) {
-      throw sendAndThrowMessage(NegotiationStatus.ERROR, "Expecting START status, received " + message.status);
-    }
-
-    // Get the mechanism name.
-    String mechanismName;
-	try {
-		mechanismName = new String(message.payload, "UTF-8");
-    } catch (UnsupportedEncodingException e) {
-        throw new TTransportException("JVM DOES NOT SUPPORT UTF-8");
-      }
-    TSaslServerDefinition serverDefinition = serverDefinitionMap.get(mechanismName);
-    LOGGER.debug("Received mechanism name '{}'", mechanismName);
-
-    if (serverDefinition == null) {
-      throw sendAndThrowMessage(NegotiationStatus.BAD, "Unsupported mechanism type " + mechanismName);
-    }
-    SaslServer saslServer = Sasl.createSaslServer(serverDefinition.mechanism,
-        serverDefinition.protocol, serverDefinition.serverName, serverDefinition.props,
-        serverDefinition.cbh);
-    setSaslServer(saslServer);
-  }
-
-  /**
-   * <code>TTransportFactory</code> to create
-   * <code>TSaslServerTransports</code>. Ensures that a given
-   * underlying <code>TTransport</code> instance receives the same
-   * <code>TSaslServerTransport</code>. This is kind of an awful hack to work
-   * around the fact that Thrift is designed assuming that
-   * <code>TTransport</code> instances are stateless, and thus the existing
-   * <code>TServers</code> use different <code>TTransport</code> instances for
-   * input and output.
-   */
-  public static class Factory extends TTransportFactory {
-
-    /**
-     * This is the implementation of the awful hack described above.
-     * <code>WeakHashMap</code> is used to ensure that we don't leak memory.
-     */
-    private static Map<TTransport, WeakReference<TSaslServerTransport>> transportMap =
-      Collections.synchronizedMap(new WeakHashMap<TTransport, WeakReference<TSaslServerTransport>>());
-
-    /**
-     * Mapping from SASL mechanism name -> all the parameters required to
-     * instantiate a SASL server.
-     */
-    private Map<String, TSaslServerDefinition> serverDefinitionMap = new HashMap<String, TSaslServerDefinition>();
-
-    /**
-     * Create a new Factory. Assumes that <code>addServerDefinition</code> will
-     * be called later.
-     */
-    public Factory() {
-      super();
-    }
-
-    /**
-     * Create a new <code>Factory</code>, initially with the single server
-     * definition given. You may still call <code>addServerDefinition</code>
-     * later. See the Java documentation for <code>Sasl.createSaslServer</code>
-     * for the details of the parameters.
-     */
-    public Factory(String mechanism, String protocol, String serverName,
-        Map<String, String> props, CallbackHandler cbh) {
-      super();
-      addServerDefinition(mechanism, protocol, serverName, props, cbh);
-    }
-
-    /**
-     * Add a supported server definition to the transports created by this
-     * factory. See the Java documentation for
-     * <code>Sasl.createSaslServer</code> for the details of the parameters.
-     */
-    public void addServerDefinition(String mechanism, String protocol, String serverName,
-        Map<String, String> props, CallbackHandler cbh) {
-      serverDefinitionMap.put(mechanism, new TSaslServerDefinition(mechanism, protocol, serverName,
-          props, cbh));
-    }
-
-    /**
-     * Get a new <code>TSaslServerTransport</code> instance, or reuse the
-     * existing one if a <code>TSaslServerTransport</code> has already been
-     * created before using the given <code>TTransport</code> as an underlying
-     * transport. This ensures that a given underlying transport instance
-     * receives the same <code>TSaslServerTransport</code>.
-     */
-    @Override
-    public TTransport getTransport(TTransport base) {
-      WeakReference<TSaslServerTransport> ret = transportMap.get(base);
-      if (ret == null || ret.get() == null) {
-        LOGGER.debug("transport map does not contain key", base);
-        ret = new WeakReference<TSaslServerTransport>(new TSaslServerTransport(serverDefinitionMap, base));
-        try {
-          ret.get().open();
-        } catch (TTransportException e) {
-          LOGGER.debug("failed to open server transport", e);
-          throw new RuntimeException(e);
-        }
-        transportMap.put(base, ret); // No need for putIfAbsent().
-                                     // Concurrent calls to getTransport() will pass in different TTransports.
-      } else {
-        LOGGER.debug("transport map does contain key {}", base);
-      }
-      return ret.get();
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
deleted file mode 100644
index a94d9a7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslTransport.java
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TByteArrayOutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A superclass for SASL client/server thrift transports. A subclass need only
- * implement the <code>open</code> method.
- */
-abstract class TSaslTransport extends TTransport {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TSaslTransport.class);
-
-  protected static final int DEFAULT_MAX_LENGTH = 0x7FFFFFFF;
-
-  protected static final int MECHANISM_NAME_BYTES = 1;
-  protected static final int STATUS_BYTES = 1;
-  protected static final int PAYLOAD_LENGTH_BYTES = 4;
-
-  protected static enum SaslRole {
-    SERVER, CLIENT;
-  }
-
-  /**
-   * Status bytes used during the initial Thrift SASL handshake.
-   */
-  protected static enum NegotiationStatus {
-    START((byte)0x01),
-    OK((byte)0x02),
-    BAD((byte)0x03),
-    ERROR((byte)0x04),
-    COMPLETE((byte)0x05);
-
-    private final byte value;
-
-    private static final Map<Byte, NegotiationStatus> reverseMap =
-      new HashMap<Byte, NegotiationStatus>();
-    static {
-      for (NegotiationStatus s : NegotiationStatus.class.getEnumConstants()) {
-        reverseMap.put(s.getValue(), s);
-      }
-    }
-
-    private NegotiationStatus(byte val) {
-      this.value = val;
-    }
-
-    public byte getValue() {
-      return value;
-    }
-
-    public static NegotiationStatus byValue(byte val) {
-      return reverseMap.get(val);
-    }
-  }
-
-  /**
-   * Transport underlying this one.
-   */
-  protected TTransport underlyingTransport;
-
-  /**
-   * Either a SASL client or a SASL server.
-   */
-  private SaslParticipant sasl;
-
-  /**
-   * Whether or not we should wrap/unwrap reads/writes. Determined by whether or
-   * not a QOP is negotiated during the SASL handshake.
-   */
-  private boolean shouldWrap = false;
-
-  /**
-   * Buffer for input.
-   */
-  private TMemoryInputTransport readBuffer = new TMemoryInputTransport();
-
-  /**
-   * Buffer for output.
-   */
-  private final TByteArrayOutputStream writeBuffer = new TByteArrayOutputStream(1024);
-
-  /**
-   * Create a TSaslTransport. It's assumed that setSaslServer will be called
-   * later to initialize the SASL endpoint underlying this transport.
-   *
-   * @param underlyingTransport
-   *          The thrift transport which this transport is wrapping.
-   */
-  protected TSaslTransport(TTransport underlyingTransport) {
-    this.underlyingTransport = underlyingTransport;
-  }
-
-  /**
-   * Create a TSaslTransport which acts as a client.
-   *
-   * @param saslClient
-   *          The <code>SaslClient</code> which this transport will use for SASL
-   *          negotiation.
-   * @param underlyingTransport
-   *          The thrift transport which this transport is wrapping.
-   */
-  protected TSaslTransport(SaslClient saslClient, TTransport underlyingTransport) {
-    sasl = new SaslParticipant(saslClient);
-    this.underlyingTransport = underlyingTransport;
-  }
-
-  protected void setSaslServer(SaslServer saslServer) {
-    sasl = new SaslParticipant(saslServer);
-  }
-
-  // Used to read the status byte and payload length.
-  private final byte[] messageHeader = new byte[STATUS_BYTES + PAYLOAD_LENGTH_BYTES];
-
-  /**
-   * Send a complete Thrift SASL message.
-   *
-   * @param status
-   *          The status to send.
-   * @param payload
-   *          The data to send as the payload of this message.
-   * @throws TTransportException
-   */
-  protected void sendSaslMessage(NegotiationStatus status, byte[] payload) throws TTransportException {
-    if (payload == null)
-      payload = new byte[0];
-
-    messageHeader[0] = status.getValue();
-    EncodingUtils.encodeBigEndian(payload.length, messageHeader, STATUS_BYTES);
-
-    if (LOGGER.isDebugEnabled())
-      LOGGER.debug(getRole() + ": Writing message with status {} and payload length {}",
-                   status, payload.length);
-    underlyingTransport.write(messageHeader);
-    underlyingTransport.write(payload);
-    underlyingTransport.flush();
-  }
-
-  /**
-   * Read a complete Thrift SASL message.
-   *
-   * @return The SASL status and payload from this message.
-   * @throws TTransportException
-   *           Thrown if there is a failure reading from the underlying
-   *           transport, or if a status code of BAD or ERROR is encountered.
-   */
-  protected SaslResponse receiveSaslMessage() throws TTransportException {
-    underlyingTransport.readAll(messageHeader, 0, messageHeader.length);
-
-    byte statusByte = messageHeader[0];
-
-    NegotiationStatus status = NegotiationStatus.byValue(statusByte);
-    if (status == null) {
-      throw sendAndThrowMessage(NegotiationStatus.ERROR, "Invalid status " + statusByte);
-    }
-
-    int payloadBytes = EncodingUtils.decodeBigEndian(messageHeader, STATUS_BYTES);
-    if (payloadBytes < 0 || payloadBytes > 104857600 /* 100 MB */) {
-      throw sendAndThrowMessage(
-        NegotiationStatus.ERROR, "Invalid payload header length: " + payloadBytes);
-    }
-
-    byte[] payload = new byte[payloadBytes];
-    underlyingTransport.readAll(payload, 0, payload.length);
-
-    if (status == NegotiationStatus.BAD || status == NegotiationStatus.ERROR) {
-      try {
-        String remoteMessage = new String(payload, "UTF-8");
-        throw new TTransportException("Peer indicated failure: " + remoteMessage);
-      } catch (UnsupportedEncodingException e) {
-        throw new TTransportException(e);
-      }
-    }
-
-    if (LOGGER.isDebugEnabled())
-      LOGGER.debug(getRole() + ": Received message with status {} and payload length {}",
-                   status, payload.length);
-    return new SaslResponse(status, payload);
-  }
-
-  /**
-   * Send a Thrift SASL message with the given status (usually BAD or ERROR) and
-   * string message, and then throw a TTransportException with the given
-   * message.
-   *
-   * @param status
-   *          The Thrift SASL status code to send. Usually BAD or ERROR.
-   * @param message
-   *          The optional message to send to the other side.
-   * @throws TTransportException
-   *           Always thrown with the message provided.
-   * @return always throws TTransportException but declares return type to allow
-   *          throw sendAndThrowMessage(...) to inform compiler control flow
-   */
-  protected TTransportException sendAndThrowMessage(NegotiationStatus status, String message) throws TTransportException {
-    try {
-      sendSaslMessage(status, message.getBytes("UTF-8"));
-    } catch (Exception e) {
-      LOGGER.warn("Could not send failure response", e);
-      message += "\nAlso, could not send response: " + e.toString();
-    }
-    throw new TTransportException(message);
-  }
-
-  /**
-   * Implemented by subclasses to start the Thrift SASL handshake process. When
-   * this method completes, the <code>SaslParticipant</code> in this class is
-   * assumed to be initialized.
-   *
-   * @throws TTransportException
-   * @throws SaslException
-   */
-  abstract protected void handleSaslStartMessage() throws TTransportException, SaslException;
-
-  protected abstract SaslRole getRole();
-
-  /**
-   * Opens the underlying transport if it's not already open and then performs
-   * SASL negotiation. If a QOP is negotiated during this SASL handshake, it used
-   * for all communication on this transport after this call is complete.
-   */
-  @Override
-  public void open() throws TTransportException {
-    /*
-     * readSaslHeader is used to tag whether the SASL header has been read properly.
-     * If there is a problem in reading the header, there might not be any
-     * data in the stream, possibly a TCP health check from load balancer.
-     */
-    boolean readSaslHeader = false;
-
-    LOGGER.debug("opening transport {}", this);
-    if (sasl != null && sasl.isComplete())
-      throw new TTransportException("SASL transport already open");
-
-    if (!underlyingTransport.isOpen())
-      underlyingTransport.open();
-
-    try {
-      // Negotiate a SASL mechanism. The client also sends its
-      // initial response, or an empty one.
-      handleSaslStartMessage();
-      readSaslHeader = true;
-      LOGGER.debug("{}: Start message handled", getRole());
-
-      SaslResponse message = null;
-      while (!sasl.isComplete()) {
-        message = receiveSaslMessage();
-        if (message.status != NegotiationStatus.COMPLETE &&
-            message.status != NegotiationStatus.OK) {
-          throw new TTransportException("Expected COMPLETE or OK, got " + message.status);
-        }
-
-        byte[] challenge = sasl.evaluateChallengeOrResponse(message.payload);
-
-        // If we are the client, and the server indicates COMPLETE, we don't need to
-        // send back any further response.
-        if (message.status == NegotiationStatus.COMPLETE &&
-            getRole() == SaslRole.CLIENT) {
-          LOGGER.debug("{}: All done!", getRole());
-          break;
-        }
-
-        sendSaslMessage(sasl.isComplete() ? NegotiationStatus.COMPLETE : NegotiationStatus.OK,
-                        challenge);
-      }
-      LOGGER.debug("{}: Main negotiation loop complete", getRole());
-
-      assert sasl.isComplete();
-
-      // If we're the client, and we're complete, but the server isn't
-      // complete yet, we need to wait for its response. This will occur
-      // with ANONYMOUS auth, for example, where we send an initial response
-      // and are immediately complete.
-      if (getRole() == SaslRole.CLIENT &&
-          (message == null || message.status == NegotiationStatus.OK)) {
-        LOGGER.debug("{}: SASL Client receiving last message", getRole());
-        message = receiveSaslMessage();
-        if (message.status != NegotiationStatus.COMPLETE) {
-          throw new TTransportException(
-            "Expected SASL COMPLETE, but got " + message.status);
-        }
-      }
-    } catch (SaslException e) {
-      try {
-        LOGGER.error("SASL negotiation failure", e);
-        throw sendAndThrowMessage(NegotiationStatus.BAD, e.getMessage());
-      } finally {
-        underlyingTransport.close();
-      }
-    } catch (TTransportException e) {
-      /*
-       * If there is no-data or no-sasl header in the stream, throw a different
-       * type of exception so we can handle this scenario differently.
-       */
-      if (!readSaslHeader && e.getType() == TTransportException.END_OF_FILE) {
-        underlyingTransport.close();
-        LOGGER.debug("No data or no sasl data in the stream");
-        throw new TSaslTransportException("No data or no sasl data in the stream");
-      }
-      throw e;
-    }
-
-    String qop = (String) sasl.getNegotiatedProperty(Sasl.QOP);
-    if (qop != null && !qop.equalsIgnoreCase("auth"))
-      shouldWrap = true;
-  }
-
-  /**
-   * Get the underlying <code>SaslClient</code>.
-   *
-   * @return The <code>SaslClient</code>, or <code>null</code> if this transport
-   *         is backed by a <code>SaslServer</code>.
-   */
-  public SaslClient getSaslClient() {
-    return sasl.saslClient;
-  }
-
-  /**
-   * Get the underlying transport that Sasl is using.
-   * @return The <code>TTransport</code> transport
-   */
-   public TTransport getUnderlyingTransport() {
-     return underlyingTransport;
-   }
-
-  /**
-   * Get the underlying <code>SaslServer</code>.
-   *
-   * @return The <code>SaslServer</code>, or <code>null</code> if this transport
-   *         is backed by a <code>SaslClient</code>.
-   */
-  public SaslServer getSaslServer() {
-    return sasl.saslServer;
-  }
-
-  /**
-   * Read a 4-byte word from the underlying transport and interpret it as an
-   * integer.
-   *
-   * @return The length prefix of the next SASL message to read.
-   * @throws TTransportException
-   *           Thrown if reading from the underlying transport fails.
-   */
-  protected int readLength() throws TTransportException {
-    byte[] lenBuf = new byte[4];
-    underlyingTransport.readAll(lenBuf, 0, lenBuf.length);
-    return EncodingUtils.decodeBigEndian(lenBuf);
-  }
-
-  /**
-   * Write the given integer as 4 bytes to the underlying transport.
-   *
-   * @param length
-   *          The length prefix of the next SASL message to write.
-   * @throws TTransportException
-   *           Thrown if writing to the underlying transport fails.
-   */
-  protected void writeLength(int length) throws TTransportException {
-    byte[] lenBuf = new byte[4];
-    TFramedTransport.encodeFrameSize(length, lenBuf);
-    underlyingTransport.write(lenBuf);
-  }
-
-  // Below is the SASL implementation of the TTransport interface.
-
-  /**
-   * Closes the underlying transport and disposes of the SASL implementation
-   * underlying this transport.
-   */
-  @Override
-  public void close() {
-    underlyingTransport.close();
-    try {
-      sasl.dispose();
-    } catch (SaslException e) {
-      // Not much we can do here.
-    }
-  }
-
-  /**
-   * True if the underlying transport is open and the SASL handshake is
-   * complete.
-   */
-  @Override
-  public boolean isOpen() {
-    return underlyingTransport.isOpen() && sasl != null && sasl.isComplete();
-  }
-
-  /**
-   * Read from the underlying transport. Unwraps the contents if a QOP was
-   * negotiated during the SASL handshake.
-   */
-  @Override
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (!isOpen())
-      throw new TTransportException("SASL authentication not complete");
-
-    int got = readBuffer.read(buf, off, len);
-    if (got > 0) {
-      return got;
-    }
-
-    // Read another frame of data
-    try {
-      readFrame();
-    } catch (SaslException e) {
-      throw new TTransportException(e);
-    }
-
-    return readBuffer.read(buf, off, len);
-  }
-
-  /**
-   * Read a single frame of data from the underlying transport, unwrapping if
-   * necessary.
-   *
-   * @throws TTransportException
-   *           Thrown if there's an error reading from the underlying transport.
-   * @throws SaslException
-   *           Thrown if there's an error unwrapping the data.
-   */
-  private void readFrame() throws TTransportException, SaslException {
-    int dataLength = readLength();
-
-    if (dataLength < 0)
-      throw new TTransportException("Read a negative frame size (" + dataLength + ")!");
-
-    byte[] buff = new byte[dataLength];
-    LOGGER.debug("{}: reading data length: {}", getRole(), dataLength);
-    underlyingTransport.readAll(buff, 0, dataLength);
-    if (shouldWrap) {
-      buff = sasl.unwrap(buff, 0, buff.length);
-      LOGGER.debug("data length after unwrap: {}", buff.length);
-    }
-    readBuffer.reset(buff);
-  }
-
-  /**
-   * Write to the underlying transport.
-   */
-  @Override
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    if (!isOpen())
-      throw new TTransportException("SASL authentication not complete");
-
-    writeBuffer.write(buf, off, len);
-  }
-
-  /**
-   * Flushes to the underlying transport. Wraps the contents if a QOP was
-   * negotiated during the SASL handshake.
-   */
-  @Override
-  public void flush() throws TTransportException {
-    byte[] buf = writeBuffer.get();
-    int dataLength = writeBuffer.len();
-    writeBuffer.reset();
-
-    if (shouldWrap) {
-      LOGGER.debug("data length before wrap: {}", dataLength);
-      try {
-        buf = sasl.wrap(buf, 0, dataLength);
-      } catch (SaslException e) {
-        throw new TTransportException(e);
-      }
-      dataLength = buf.length;
-    }
-    LOGGER.debug("writing data length: {}", dataLength);
-    writeLength(dataLength);
-    underlyingTransport.write(buf, 0, dataLength);
-    underlyingTransport.flush();
-  }
-
-  /**
-   * Used exclusively by readSaslMessage to return both a status and data.
-   */
-  protected static class SaslResponse {
-    public NegotiationStatus status;
-    public byte[] payload;
-
-    public SaslResponse(NegotiationStatus status, byte[] payload) {
-      this.status = status;
-      this.payload = payload;
-    }
-  }
-
-  /**
-   * Used to abstract over the <code>SaslServer</code> and
-   * <code>SaslClient</code> classes, which share a lot of their interface, but
-   * unfortunately don't share a common superclass.
-   */
-  private static class SaslParticipant {
-    // One of these will always be null.
-    public SaslServer saslServer;
-    public SaslClient saslClient;
-
-    public SaslParticipant(SaslServer saslServer) {
-      this.saslServer = saslServer;
-    }
-
-    public SaslParticipant(SaslClient saslClient) {
-      this.saslClient = saslClient;
-    }
-
-    public byte[] evaluateChallengeOrResponse(byte[] challengeOrResponse) throws SaslException {
-      if (saslClient != null) {
-        return saslClient.evaluateChallenge(challengeOrResponse);
-      } else {
-        return saslServer.evaluateResponse(challengeOrResponse);
-      }
-    }
-
-    public boolean isComplete() {
-      if (saslClient != null)
-        return saslClient.isComplete();
-      else
-        return saslServer.isComplete();
-    }
-
-    public void dispose() throws SaslException {
-      if (saslClient != null)
-        saslClient.dispose();
-      else
-        saslServer.dispose();
-    }
-
-    public byte[] unwrap(byte[] buf, int off, int len) throws SaslException {
-      if (saslClient != null)
-        return saslClient.unwrap(buf, off, len);
-      else
-        return saslServer.unwrap(buf, off, len);
-    }
-
-    public byte[] wrap(byte[] buf, int off, int len) throws SaslException {
-      if (saslClient != null)
-        return saslClient.wrap(buf, off, len);
-      else
-        return saslServer.wrap(buf, off, len);
-    }
-
-    public Object getNegotiatedProperty(String propName) {
-      if (saslClient != null)
-        return saslClient.getNegotiatedProperty(propName);
-      else
-        return saslServer.getNegotiatedProperty(propName);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslTransportException.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslTransportException.java
deleted file mode 100644
index 90189f4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSaslTransportException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-/*
- * This exception is used to track exceptions in TSaslTransport
- * that does not have Sasl signature in their stream.
- */
-public class TSaslTransportException extends TTransportException {
-
-  public TSaslTransportException() {
-    super();
-  }
-
-  public TSaslTransportException(String message) {
-    super(message);
-  }
-
-  public TSaslTransportException(Throwable cause) {
-    super(cause);
-  }
-
-  public TSaslTransportException(String message, Throwable cause) {
-    super(message, cause);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSeekableFile.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSeekableFile.java
deleted file mode 100644
index e02d36f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSeekableFile.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-
-public interface TSeekableFile {
-
-  public InputStream getInputStream() throws IOException;
-  public OutputStream getOutputStream() throws IOException;
-  public void close() throws IOException;
-  public long length() throws IOException;
-  public void seek(long pos) throws IOException;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TServerSocket.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TServerSocket.java
deleted file mode 100644
index 7bd87f4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TServerSocket.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-
-/**
- * Wrapper around ServerSocket for Thrift.
- *
- */
-public class TServerSocket extends TServerTransport {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TServerSocket.class.getName());
-
-  /**
-   * Underlying ServerSocket object
-   */
-  private ServerSocket serverSocket_ = null;
-
-  /**
-   * Timeout for client sockets from accept
-   */
-  private int clientTimeout_ = 0;
-
-  public static class ServerSocketTransportArgs extends AbstractServerTransportArgs<ServerSocketTransportArgs> {
-    ServerSocket serverSocket;
-
-    public ServerSocketTransportArgs serverSocket(ServerSocket serverSocket) {
-      this.serverSocket = serverSocket;
-      return this;
-    }
-  }
-
-  /**
-   * Creates a server socket from underlying socket object
-   */
-  public TServerSocket(ServerSocket serverSocket) throws TTransportException {
-    this(serverSocket, 0);
-  }
-
-  /**
-   * Creates a server socket from underlying socket object
-   */
-  public TServerSocket(ServerSocket serverSocket, int clientTimeout) throws TTransportException {
-    this(new ServerSocketTransportArgs().serverSocket(serverSocket).clientTimeout(clientTimeout));
-  }
-
-  /**
-   * Creates just a port listening server socket
-   */
-  public TServerSocket(int port) throws TTransportException {
-    this(port, 0);
-  }
-
-  /**
-   * Creates just a port listening server socket
-   */
-  public TServerSocket(int port, int clientTimeout) throws TTransportException {
-    this(new InetSocketAddress(port), clientTimeout);
-  }
-
-  public TServerSocket(InetSocketAddress bindAddr) throws TTransportException {
-    this(bindAddr, 0);
-  }
-
-  public TServerSocket(InetSocketAddress bindAddr, int clientTimeout) throws TTransportException {
-    this(new ServerSocketTransportArgs().bindAddr(bindAddr).clientTimeout(clientTimeout));
-  }
-
-  public TServerSocket(ServerSocketTransportArgs args) throws TTransportException {
-    clientTimeout_ = args.clientTimeout;
-    if (args.serverSocket != null) {
-      this.serverSocket_ = args.serverSocket;
-      return;
-    }
-    try {
-      // Make server socket
-      serverSocket_ = new ServerSocket();
-      // Prevent 2MSL delay problem on server restarts
-      serverSocket_.setReuseAddress(true);
-      // Bind to listening port
-      serverSocket_.bind(args.bindAddr, args.backlog);
-    } catch (IOException ioe) {
-      close();
-      throw new TTransportException("Could not create ServerSocket on address " + args.bindAddr.toString() + ".", ioe);
-    }
-  }
-
-  public void listen() throws TTransportException {
-    // Make sure not to block on accept
-    if (serverSocket_ != null) {
-      try {
-        serverSocket_.setSoTimeout(0);
-      } catch (SocketException sx) {
-        LOGGER.error("Could not set socket timeout.", sx);
-      }
-    }
-  }
-
-  protected TSocket acceptImpl() throws TTransportException {
-    if (serverSocket_ == null) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "No underlying server socket.");
-    }
-    try {
-      Socket result = serverSocket_.accept();
-      TSocket result2 = new TSocket(result);
-      result2.setTimeout(clientTimeout_);
-      return result2;
-    } catch (IOException iox) {
-      throw new TTransportException(iox);
-    }
-  }
-
-  public void close() {
-    if (serverSocket_ != null) {
-      try {
-        serverSocket_.close();
-      } catch (IOException iox) {
-        LOGGER.warn("Could not close server socket.", iox);
-      }
-      serverSocket_ = null;
-    }
-  }
-
-  public void interrupt() {
-    // The thread-safeness of this is dubious, but Java documentation suggests
-    // that it is safe to do this from a different thread context
-    close();
-  }
-
-  public ServerSocket getServerSocket() {
-    return serverSocket_;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TServerTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TServerTransport.java
deleted file mode 100644
index 424e4fa..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TServerTransport.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.Closeable;
-import java.net.InetSocketAddress;
-
-/**
- * Server transport. Object which provides client transports.
- *
- */
-public abstract class TServerTransport implements Closeable {
-
-  public static abstract class AbstractServerTransportArgs<T extends AbstractServerTransportArgs<T>> {
-    int backlog = 0; // A value of 0 means the default value will be used (currently set at 50)
-    int clientTimeout = 0;
-    InetSocketAddress bindAddr;
-
-    public T backlog(int backlog) {
-      this.backlog = backlog;
-      return (T) this;
-    }
-
-    public T clientTimeout(int clientTimeout) {
-      this.clientTimeout = clientTimeout;
-      return (T) this;
-    }
-
-    public T port(int port) {
-      this.bindAddr = new InetSocketAddress(port);
-      return (T) this;
-    }
-
-    public T bindAddr(InetSocketAddress bindAddr) {
-      this.bindAddr = bindAddr;
-      return (T) this;
-    }
-  }
-
-  public abstract void listen() throws TTransportException;
-
-  public final TTransport accept() throws TTransportException {
-    TTransport transport = acceptImpl();
-    if (transport == null) {
-      throw new TTransportException("accept() may not return NULL");
-    }
-    return transport;
-  }
-
-  public abstract void close();
-
-  protected abstract TTransport acceptImpl() throws TTransportException;
-
-  /**
-   * Optional method implementation. This signals to the server transport
-   * that it should break out of any accept() or listen() that it is currently
-   * blocked on. This method, if implemented, MUST be thread safe, as it may
-   * be called from a different thread context than the other TServerTransport
-   * methods.
-   */
-  public void interrupt() {}
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSimpleFileTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSimpleFileTransport.java
deleted file mode 100644
index 42102d9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSimpleFileTransport.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-
-/**
- * Basic file support for the TTransport interface
- */
-public final class TSimpleFileTransport extends TTransport {
-
-  private RandomAccessFile file = null;   
-  private boolean readable;               
-  private boolean writable;               
-  private String path_;               
-
-
-  /**
-   * Create a transport backed by a simple file 
-   * 
-   * @param path the path to the file to open/create
-   * @param read true to support read operations
-   * @param write true to support write operations
-   * @param openFile true to open the file on construction
-   * @throws TTransportException if file open fails
-   */
-  public TSimpleFileTransport(String path, boolean read, 
-                              boolean write, boolean openFile)
-          throws TTransportException {
-    if (path.length() <= 0) {
-      throw new TTransportException("No path specified");
-    }
-    if (!read && !write) {
-      throw new TTransportException("Neither READ nor WRITE specified");
-    }
-    readable = read;
-    writable = write;
-    path_ = path;
-    if (openFile) {
-      open();
-    }
-  }
-  
-  /**
-   * Create a transport backed by a simple file 
-   * Implicitly opens file to conform to C++ behavior.
-   * 
-   * @param path the path to the file to open/create
-   * @param read true to support read operations
-   * @param write true to support write operations
-   * @throws TTransportException if file open fails
-   */
-  public TSimpleFileTransport(String path, boolean read, boolean write)
-          throws TTransportException {
-    this(path, read, write, true);
-  }
-  
-  /**
-   * Create a transport backed by a simple read only disk file (implicitly opens
-   * file)
-   *
-   * @param path the path to the file to open/create
-   * @throws TTransportException if file open fails
-   */
-  public TSimpleFileTransport(String path) throws TTransportException {
-    this(path, true, false, true);
-  }
-
-  /**
-   * Test file status
-   *
-   * @return true if open, otherwise false
-   */
-  @Override
-  public boolean isOpen() {
-    return (file != null);
-  }
-
-  /**
-   * Open file if not previously opened. 
-   *
-   * @throws TTransportException if open fails
-   */
-  @Override
-  public void open() throws TTransportException {
-    if (file == null){
-      try {
-        String access = "r";       //RandomAccessFile objects must be readable
-        if (writable) {
-          access += "w";
-        }
-        file = new RandomAccessFile(path_, access);
-      } catch (IOException ioe) {
-        file = null;
-        throw new TTransportException(ioe.getMessage());
-      }      
-    }
-  }
-
-  /**
-   * Close file, subsequent read/write activity will throw exceptions
-   */
-  @Override
-  public void close() {
-    if (file != null) {
-      try {
-        file.close();
-      } catch (Exception e) {
-        //Nothing to do
-      }
-      file = null;
-    }
-  }
-
-  /**
-   * Read up to len many bytes into buf at offset 
-   *
-   * @param buf houses bytes read
-   * @param off offset into buff to begin writing to
-   * @param len maximum number of bytes to read
-   * @return number of bytes actually read
-   * @throws TTransportException on read failure
-   */
-  @Override
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (!readable) {
-      throw new TTransportException("Read operation on write only file");
-    }
-    int iBytesRead = 0;
-    try {
-      iBytesRead = file.read(buf, off, len);
-    } catch (IOException ioe) {
-      file = null;
-      throw new TTransportException(ioe.getMessage());
-    }
-    return iBytesRead;
-  }
-
-  /**
-   * Write len many bytes from buff starting at offset 
-   *
-   * @param buf buffer containing bytes to write
-   * @param off offset into buffer to begin writing from
-   * @param len number of bytes to write
-   * @throws TTransportException on write failure
-   */
-  @Override
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    try {
-      file.write(buf, off, len);
-    } catch (IOException ioe) {
-      file = null;
-      throw new TTransportException(ioe.getMessage());
-    }
-  }
-
-  /**
-   * Move file pointer to specified offset, new read/write calls will act here
-   *
-   * @param offset bytes from beginning of file to move pointer to
-   * @throws TTransportException is seek fails
-   */
-  public void seek(long offset) throws TTransportException {
-    try {
-      file.seek(offset);
-    } catch (IOException ex) {
-      throw new TTransportException(ex.getMessage());
-    }
-  }
-
-  /**
-   * Return the length of the file in bytes
-   *
-   * @return length of the file in bytes
-   * @throws TTransportException if file access fails
-   */
-  public long length() throws TTransportException {
-    try {
-      return file.length();
-    } catch (IOException ex) {
-      throw new TTransportException(ex.getMessage());
-    }
-  }
-
-  /**
-   * Return current file pointer position in bytes from beginning of file
-   *
-   * @return file pointer position
-   * @throws TTransportException if file access fails
-   */
-  public long getFilePointer() throws TTransportException {
-    try {
-      return file.getFilePointer();
-    } catch (IOException ex) {
-      throw new TTransportException(ex.getMessage());
-    }
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSocket.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSocket.java
deleted file mode 100644
index 148122f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TSocket.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketException;
-
-/**
- * Socket implementation of the TTransport interface. To be commented soon!
- *
- */
-public class TSocket extends TIOStreamTransport {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TSocket.class.getName());
-
-  /**
-   * Wrapped Socket object
-   */
-  private Socket socket_;
-
-  /**
-   * Remote host
-   */
-  private String host_;
-
-  /**
-   * Remote port
-   */
-  private int port_;
-
-  /**
-   * Socket timeout - read timeout on the socket
-   */
-  private int socketTimeout_;
-
-  /**
-   * Connection timeout
-   */
-  private int connectTimeout_;
-
-  /**
-   * Constructor that takes an already created socket.
-   *
-   * @param socket Already created socket object
-   * @throws TTransportException if there is an error setting up the streams
-   */
-  public TSocket(Socket socket) throws TTransportException {
-    socket_ = socket;
-    try {
-      socket_.setSoLinger(false, 0);
-      socket_.setTcpNoDelay(true);
-      socket_.setKeepAlive(true);
-    } catch (SocketException sx) {
-      LOGGER.warn("Could not configure socket.", sx);
-    }
-
-    if (isOpen()) {
-      try {
-        inputStream_ = new BufferedInputStream(socket_.getInputStream(), 1024);
-        outputStream_ = new BufferedOutputStream(socket_.getOutputStream(), 1024);
-      } catch (IOException iox) {
-        close();
-        throw new TTransportException(TTransportException.NOT_OPEN, iox);
-      }
-    }
-  }
-
-  /**
-   * Creates a new unconnected socket that will connect to the given host
-   * on the given port.
-   *
-   * @param host Remote host
-   * @param port Remote port
-   */
-  public TSocket(String host, int port) {
-    this(host, port, 0);
-  }
-
-  /**
-   * Creates a new unconnected socket that will connect to the given host
-   * on the given port.
-   *
-   * @param host    Remote host
-   * @param port    Remote port
-   * @param timeout Socket timeout and connection timeout
-   */
-  public TSocket(String host, int port, int timeout) {
-    this(host, port, timeout, timeout);
-  }
-
-  /**
-   * Creates a new unconnected socket that will connect to the given host
-   * on the given port, with a specific connection timeout and a
-   * specific socket timeout.
-   *
-   * @param host            Remote host
-   * @param port            Remote port
-   * @param socketTimeout   Socket timeout
-   * @param connectTimeout  Connection timeout
-   */
-  public TSocket(String host, int port, int socketTimeout, int connectTimeout) {
-    host_ = host;
-    port_ = port;
-    socketTimeout_ = socketTimeout;
-    connectTimeout_ = connectTimeout;
-    initSocket();
-  }
-
-  /**
-   * Initializes the socket object
-   */
-  private void initSocket() {
-    socket_ = new Socket();
-    try {
-      socket_.setSoLinger(false, 0);
-      socket_.setTcpNoDelay(true);
-      socket_.setKeepAlive(true);
-      socket_.setSoTimeout(socketTimeout_);
-    } catch (SocketException sx) {
-      LOGGER.error("Could not configure socket.", sx);
-    }
-  }
-
-  /**
-   * Sets the socket timeout and connection timeout.
-   *
-   * @param timeout Milliseconds timeout
-   */
-  public void setTimeout(int timeout) {
-    this.setConnectTimeout(timeout);
-    this.setSocketTimeout(timeout);
-  }
-
-  /**
-   * Sets the time after which the connection attempt will time out
-   *
-   * @param timeout Milliseconds timeout
-   */
-  public void setConnectTimeout(int timeout) {
-    connectTimeout_ = timeout;
-  }
-
-  /**
-   * Sets the socket timeout
-   *
-   * @param timeout Milliseconds timeout
-   */
-  public void setSocketTimeout(int timeout) {
-    socketTimeout_ = timeout;
-    try {
-      socket_.setSoTimeout(timeout);
-    } catch (SocketException sx) {
-      LOGGER.warn("Could not set socket timeout.", sx);
-    }
-  }
-
-  /**
-   * Returns a reference to the underlying socket.
-   */
-  public Socket getSocket() {
-    if (socket_ == null) {
-      initSocket();
-    }
-    return socket_;
-  }
-
-  /**
-   * Checks whether the socket is connected.
-   */
-  public boolean isOpen() {
-    if (socket_ == null) {
-      return false;
-    }
-    return socket_.isConnected();
-  }
-
-  /**
-   * Connects the socket, creating a new socket object if necessary.
-   */
-  public void open() throws TTransportException {
-    if (isOpen()) {
-      throw new TTransportException(TTransportException.ALREADY_OPEN, "Socket already connected.");
-    }
-
-    if (host_ == null || host_.length() == 0) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Cannot open null host.");
-    }
-    if (port_ <= 0 || port_ > 65535) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Invalid port " + port_);
-    }
-
-    if (socket_ == null) {
-      initSocket();
-    }
-
-    try {
-      socket_.connect(new InetSocketAddress(host_, port_), connectTimeout_);
-      inputStream_ = new BufferedInputStream(socket_.getInputStream(), 1024);
-      outputStream_ = new BufferedOutputStream(socket_.getOutputStream(), 1024);
-    } catch (IOException iox) {
-      close();
-      throw new TTransportException(TTransportException.NOT_OPEN, iox);
-    }
-  }
-
-  /**
-   * Closes the socket.
-   */
-  public void close() {
-    // Close the underlying streams
-    super.close();
-
-    // Close the socket
-    if (socket_ != null) {
-      try {
-        socket_.close();
-      } catch (IOException iox) {
-        LOGGER.warn("Could not close socket.", iox);
-      }
-      socket_ = null;
-    }
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TStandardFile.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TStandardFile.java
deleted file mode 100644
index 7a33af8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TStandardFile.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
-public class TStandardFile implements TSeekableFile {
-
-  protected String path_ = null;
-  protected RandomAccessFile inputFile_ = null;
-
-  public TStandardFile(String path) throws IOException {
-    path_ = path;
-    inputFile_ = new RandomAccessFile(path_, "r");
-  }
-
-  public InputStream getInputStream() throws IOException {
-    return new FileInputStream(inputFile_.getFD());
-  }
-
-  public OutputStream getOutputStream() throws IOException {
-    return new FileOutputStream(path_);
-  }
-
-  public void close() throws IOException {
-    if(inputFile_ != null) {
-      inputFile_.close();
-    }
-  }
-
-  public long length() throws IOException {
-    return inputFile_.length();
-  }
-
-  public void seek(long pos) throws IOException {
-    inputFile_.seek(pos);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransport.java
deleted file mode 100644
index 73ad730..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransport.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.Closeable;
-
-/**
- * Generic class that encapsulates the I/O layer. This is basically a thin
- * wrapper around the combined functionality of Java input/output streams.
- *
- */
-public abstract class TTransport implements Closeable {
-
-  /**
-   * Queries whether the transport is open.
-   *
-   * @return True if the transport is open.
-   */
-  public abstract boolean isOpen();
-
-  /**
-   * Is there more data to be read?
-   *
-   * @return True if the remote side is still alive and feeding us
-   */
-  public boolean peek() {
-    return isOpen();
-  }
-
-  /**
-   * Opens the transport for reading/writing.
-   *
-   * @throws TTransportException if the transport could not be opened
-   */
-  public abstract void open()
-    throws TTransportException;
-
-  /**
-   * Closes the transport.
-   */
-  public abstract void close();
-
-  /**
-   * Reads up to len bytes into buffer buf, starting at offset off.
-   *
-   * @param buf Array to read into
-   * @param off Index to start reading at
-   * @param len Maximum number of bytes to read
-   * @return The number of bytes actually read
-   * @throws TTransportException if there was an error reading data
-   */
-  public abstract int read(byte[] buf, int off, int len)
-    throws TTransportException;
-
-  /**
-   * Guarantees that all of len bytes are actually read off the transport.
-   *
-   * @param buf Array to read into
-   * @param off Index to start reading at
-   * @param len Maximum number of bytes to read
-   * @return The number of bytes actually read, which must be equal to len
-   * @throws TTransportException if there was an error reading data
-   */
-  public int readAll(byte[] buf, int off, int len)
-    throws TTransportException {
-    int got = 0;
-    int ret = 0;
-    while (got < len) {
-      ret = read(buf, off+got, len-got);
-      if (ret <= 0) {
-        throw new TTransportException(
-            "Cannot read. Remote side has closed. Tried to read "
-                + len
-                + " bytes, but only got "
-                + got
-                + " bytes. (This is often indicative of an internal error on the server side. Please check your server logs.)");
-      }
-      got += ret;
-    }
-    return got;
-  }
-
-  /**
-   * Writes the buffer to the output
-   *
-   * @param buf The output data buffer
-   * @throws TTransportException if an error occurs writing data
-   */
-  public void write(byte[] buf) throws TTransportException {
-    write(buf, 0, buf.length);
-  }
-
-  /**
-   * Writes up to len bytes from the buffer.
-   *
-   * @param buf The output data buffer
-   * @param off The offset to start writing from
-   * @param len The number of bytes to write
-   * @throws TTransportException if there was an error writing data
-   */
-  public abstract void write(byte[] buf, int off, int len)
-    throws TTransportException;
-
-  /**
-   * Flush any pending data out of a transport buffer.
-   *
-   * @throws TTransportException if there was an error writing out data.
-   */
-  public void flush()
-    throws TTransportException {}
-
-  /**
-   * Access the protocol's underlying buffer directly. If this is not a
-   * buffered transport, return null.
-   * @return protocol's Underlying buffer
-   */
-  public byte[] getBuffer() {
-    return null;
-  }
-
-  /**
-   * Return the index within the underlying buffer that specifies the next spot
-   * that should be read from.
-   * @return index within the underlying buffer that specifies the next spot
-   * that should be read from
-   */
-  public int getBufferPosition() {
-    return 0;
-  }
-
-  /**
-   * Get the number of bytes remaining in the underlying buffer. Returns -1 if
-   * this is a non-buffered transport.
-   * @return the number of bytes remaining in the underlying buffer. <br> Returns -1 if
-   * this is a non-buffered transport.
-   */
-  public int getBytesRemainingInBuffer() {
-    return -1;
-  }
-
-  /**
-   * Consume len bytes from the underlying buffer.
-   * @param len
-   */
-  public void consumeBuffer(int len) {}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransportException.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransportException.java
deleted file mode 100644
index b886bc2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransportException.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.TException;
-
-/**
- * Transport exceptions.
- *
- */
-public class TTransportException extends TException {
-
-  private static final long serialVersionUID = 1L;
-
-  public static final int UNKNOWN = 0;
-  public static final int NOT_OPEN = 1;
-  public static final int ALREADY_OPEN = 2;
-  public static final int TIMED_OUT = 3;
-  public static final int END_OF_FILE = 4;
-  public static final int CORRUPTED_DATA = 5;
-
-  protected int type_ = UNKNOWN;
-
-  public TTransportException() {
-    super();
-  }
-
-  public TTransportException(int type) {
-    super();
-    type_ = type;
-  }
-
-  public TTransportException(int type, String message) {
-    super(message);
-    type_ = type;
-  }
-
-  public TTransportException(String message) {
-    super(message);
-  }
-
-  public TTransportException(int type, Throwable cause) {
-    super(cause);
-    type_ = type;
-  }
-
-  public TTransportException(Throwable cause) {
-    super(cause);
-  }
-
-  public TTransportException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  public TTransportException(int type, String message, Throwable cause) {
-    super(message, cause);
-    type_ = type;
-  }
-
-  public int getType() {
-    return type_;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransportFactory.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransportFactory.java
deleted file mode 100644
index 3e71630..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TTransportFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-/**
- * Factory class used to create wrapped instance of Transports.
- * This is used primarily in servers, which get Transports from
- * a ServerTransport and then may want to mutate them (i.e. create
- * a BufferedTransport from the underlying base transport)
- *
- */
-public class TTransportFactory {
-
-  /**
-   * Return a wrapped instance of the base Transport.
-   *
-   * @param trans The base transport
-   * @return Wrapped Transport
-   */
-  public TTransport getTransport(TTransport trans) {
-    return trans;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TZlibTransport.java b/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TZlibTransport.java
deleted file mode 100644
index e755aa5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/src/org/apache/thrift/transport/TZlibTransport.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
-
-/**
- * TZlibTransport deflates on write and inflates on read.
- */
-public class TZlibTransport extends TIOStreamTransport {
-
-    private TTransport transport_ = null;
-
-    public static class Factory extends TTransportFactory {
-        public Factory() {
-        }
-
-        @Override
-        public TTransport getTransport(TTransport base) {
-            return new TZlibTransport(base);
-        }
-    }
-
-    /**
-     * Constructs a new TZlibTransport instance.
-     * @param  transport the underlying transport to read from and write to
-     */
-    public TZlibTransport(TTransport transport) {
-        this(transport, Deflater.BEST_COMPRESSION);
-    }
-
-    /**
-     * Constructs a new TZlibTransport instance.
-     * @param  transport the underlying transport to read from and write to
-     * @param  compressionLevel 0 for no compression, 9 for maximum compression
-     */
-    public TZlibTransport(TTransport transport, int compressionLevel) {
-        transport_ = transport;
-        inputStream_ = new InflaterInputStream(new TTransportInputStream(transport_), new Inflater());
-        outputStream_ = new DeflaterOutputStream(new TTransportOutputStream(transport_), new Deflater(compressionLevel, false), true);
-    }
-
-    @Override
-    public boolean isOpen() {
-        return transport_.isOpen();
-    }
-
-    @Override
-    public void open() throws TTransportException {
-        transport_.open();
-    }
-
-    @Override
-    public void close() {
-        super.close();
-        if (transport_.isOpen()) {
-            transport_.close();
-        }
-    }
-}
-
-class TTransportInputStream extends InputStream {
-
-    private TTransport transport = null;
-
-    public TTransportInputStream(TTransport transport) {
-        this.transport = transport;
-    }
-
-    @Override
-    public int read() throws IOException {
-        try {
-            byte[] buf = new byte[1];
-            transport.read(buf, 0, 1);
-            return buf[0];
-        } catch (TTransportException e) {
-            throw new IOException(e);
-        }
-    }
-
-    @Override
-    public int read(byte b[], int off, int len) throws IOException {
-        try {
-            return transport.read(b, off, len);
-        } catch (TTransportException e) {
-            throw new IOException(e);
-        }
-    }
-}
-
-class TTransportOutputStream extends OutputStream {
-
-    private TTransport transport = null;
-
-    public TTransportOutputStream(TTransport transport) {
-        this.transport = transport;
-    }
-
-    @Override
-    public void write(final int b) throws IOException {
-        try {
-            transport.write(new byte[]{(byte) b});
-        } catch (TTransportException e) {
-            throw new IOException(e);
-        }
-    }
-
-    @Override
-    public void write(byte b[], int off, int len) throws IOException {
-        try {
-            transport.write(b, off, len);
-        } catch (TTransportException e) {
-            throw new IOException(e);
-        }
-    }
-
-    @Override
-    public void flush() throws IOException {
-        try {
-            transport.flush();
-        } catch (TTransportException e) {
-            throw new IOException(e);
-        }
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/.keystore b/vendor/git.apache.org/thrift.git/lib/java/test/.keystore
deleted file mode 100644
index 4dd66ac07ef1a09dedc8695eaf70ba6dbbe172bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2429
zcmdT_`8(8W8=vnOV;Mu1Okq%D3FA8qhHO(fI`%acV<t@Yv5c`4AruFROxd?WBuhxh
zHuj{voFoyIh9ilTMj9`@=X$U6!}|}sKit>-+@I%jUH9|c_w#&i&I)G*0)aqx4ftgM
zc6ViJQ1GY;0^x>$@vv=B5YDdx2VlTas4xI<Ltyc+#h&r9@qvd-_LBZtps(>Mo<|3E
z{<#{5N@-9VWQt_Goj)d3^JJ-qI;n5Tjy1fXgC1&?4x@hX8>1cTJubvH$Qub*6D(d1
z?QwH=d9SagzvF5}Rk($kS2e$Hr`OUA$w%gnxT91QOcJBdP}`{OTWGeev#P?@3dfkp
zsLY2mRqc873OsS>4^17ZOCnx`5|s6CHiM8A{BtR#Lo5e)L9f~@jlaHb)+E0u>Y}s#
z^=|*@tDVl8l)4PwXxUeVS6M}I-PIyy`hBC*vt8$s&N?M>_T8V~|Jk$jrmpCdGNxEh
z-iOs%0!}c`_h?SkL*^8szQ9HHYPuebj9O(`JzS1z(Z#R1<w)mt@yd94CybI_OZAM8
zb@|1pwV@n8Sxg5<`e(eXYzuO2c2XbGt$Y;D9bDKll;d-Sct95?EDuMx#GQ^=du%r;
zbGScY%Gs{i-p_-VyXn@s3hp}AxJPG;I>LGOn&DOrOeL2*rkLv?DHQbO_N$Nr+)&TK
z3-YBYwcb{5`-u_9I&1oo#`5aX4y5p+UdK1%RS+A}X8t1!|A>)CDG%BTH&miotrsm8
z`#1`iVnN*{r5nC(SES~2><z1h0@1!o%UVnLj^_Mtlg$Rt9e9yeEltXORd=q94px2j
zx<o@58|k@}jm+Qd^zf$8#Un8#jIvR2$pdH2zvanzKq6C5zEYadzEp<UKpQv5kVsRr
z)hl<QUtheQqsMfGz8jH(N?l#})457-nCo^zhncFq1s_Sa(t1*T?PugrE%{?(c^~tK
zuBK+oOojao<w*~@5}1~(CF2SQxu))Fddf7(lKWij!MSZB!9gS1VZ^5H<AODJeS#tC
z?1uUs`pZDXO?Lz=^#LOWEt)mPZW*g@&(~(8RQJop7G(vGGemSL_sbgziwndLOhVbD
zXIbW4ofWxIUhQ0zo1@IA)GJ0cYy7hD=);XokNJGf@{d(NQ(RS94W}8!_0@}*jD~E5
zi{Y;DeTNz|4w2q6XzLn-@|D#fbGZH9&`gC`>rOy|wJwJ+;WgU8^rlPL-Cnb6!K=Rs
ztB5G7kUry?qZ1#qn117Avaf$&a0PjVZs0#^c*NzdDZ9gyF`v$px4@q32%ZVcwk3-8
zE1TV`pwDcGtYl}M&+^+M)7XA@ni{&w1JDm_1e_KH*RD<mxP88fk<=%B;`y}j4AEH9
zQ(6*amh-Ub_zqJ6@o4sEZRlY8yKp!WZ(AJ#5!abNy_PhWiD&T5Cs;@5!#8J^Og;_=
z(${;X#-T3kfRs;0844G#<vOb5x2SMB`qq67kvl`R%k&rRbq-M5%B~z0?C9usX{Rb>
zq@ie$+3b^jish0|?WdBRTQypHnHiVp)mhxf^PhEH*W6HTXD4EULkc4*`vSunAJ_qp
z&$0+=OxWP$>91<113SaMyBr#}xDLv(((s*>v2OVFgF}vp#m_|So93s1qw;fWd}At>
zUM5=bo#iEk>?Z>`k)ff+7i)fBy%Y6V#qoj29GafC0!y`D#mQD-Ojo)upK4n3<{gf{
zl0x^OekE9WW|X-sZeon$RAk<s98RMm@^pXxh6Q{!(n<jl?&YZcsW6&W-1wrO^^xI|
z78?r8Q_<PCUT_pASb0|4U~rw#@_?wbpzx8}T=49*)!SK5-uV7U61iP4TA(fj0z0-V
zhdN+9mrOAi6o5kcARlDN+sANn`5+R`cQna7X%o3Ckh`iGSC2)2d~hx&7+e(U<bV|h
zh4uno0bVO|NTfeG&=V^LitIr=0tho|h*v00*4)S6AFBu+*+cmSq#eDzWC=lJk6q_L
zrO?93Azrd()UZHLGR=n?h!qFL_J{}p<liJm?+_mf4J!if+rzm8`249JWPfjJC=DwQ
z9{%s~_yF<!o?dig+AlhW{3`>78gd?#Mj^2{5C`gD@mhEgJcB}NXn@)pxWB{y%R9vb
zhyU4{-QmR*4+!l}HGm%)4*-xV(TUzo09BDW*4Vfoc_`x`ar;MefYG{<S83FVa<lC1
z6XM@I#E6^q@5oU0@7c+nX>4<JJPSA1VE%@8>Y|?dxFlk6wTHkT&5w`J!%{+XQpX|{
z-4`g&iF&C5nFm5)-Cs?oby)5Lsb!?4%;J~IZsF!X&~+;!s@53jw1EU6xLgJEz|wbM
z6MZ*k;Mw##tNDveI9eW%pisa>5USkUw)xa3*+Rm7<2vKVlJ2@0L&P9Ot_c%gNZ=SZ
zE7psdxH3Q?r}u3&f28D~x|D^j>5&B%T-caI{Yp7wN2rTd|MrZ*^1CrR2sBAzvaYBY
z73zED`G@8fCu5=_lna0WWwxL-h~9lQXhE1bOiXG0C-{_W?KMHVH>>}q=<viA=_n|(
zw=D-d0E)-{Z-T%cK@`Rfasj~3KWo1G9d>IDK+N_ZNNzZV8Y}he&JDGJ-JtWxD7R8^
zW<A<}dM9q|w@jDdT#j`3ScS|a&3?(%Ta2aLyAqUqdi`EuoszIlbc8k0=!j4UA64O~
z0VNWzv=A2@%uukI{wNpJp`*J!r-6*UMj5zwyYY{3<F`2`dZB}Cv1gJRiain2b+1xL
z%W1fnXnn2;JZ%$Is6oqR>10m?a}D13i|;~>+H%l|b&VJgAR#rT@N?v)`%BN*9fF+f
ze?1<oi0cWSV%lPp1GZ{Pt04expUW!a%reMxH$6dn)j*$Y#_(O_lRZ=Y-D3HnCON$}
yH(I=o<og+1Xh>(pHkLr|>Tukf?t3ly;e_8$F&I_yK8jUSV?86vEvK~q8u~XNbR22`

diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/.truststore b/vendor/git.apache.org/thrift.git/lib/java/test/.truststore
deleted file mode 100644
index 26fbd195f38cb2035e6bedc67eafde4a7c1ffc44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1149
zcmezO_TO6u1_mY|W(3omIr+(nIT`uIB|s5Z+u8YT46G4)rUsS_3@p|LO)TaHP0aEO
zn3))vm^c}p$tV7?Hc_5qz{|#|)#lOmotKf3m6gGuaibx(0Vf-CC<~h~Q)sZEpaDOK
z!@<Mhn^;ttlbDxcC}JQ45@P4!cFQkHEiO^;$jr$xR5wrsiE{DCg=C~EI2I%(1F7Kr
zw370~qErR9{L;LX#FEVXJVP-95s*S|9$u)Tkc^_tv=T!h0|AgYGY`TahAIY1aOZI{
ziixJAmN}GwmFp#fZP3dvN;i-b=QT7jFflMUv@o?WFo+W8H8L_VGctj4hoqmH7?qHt
zhLM$lxrvdV!Jvtei>Zl`kztkal_TF7#g|XIxMhndui^yBxIe$Q<=TI;PhC{yyv%Lt
zA7`;|$s%#zH$F~e`sp>bbARto580;YCJ#1w+~>GiW2Jvtn)}83LylavTox5phH1q!
zdoEV0$3IQG5NFlHGfASD<=|J>+vd;XkM}H2csXgo4b9kckKeKz-U{jX=`r25m2xax
zrmeTxC+qlk*_Cz2&)@#^eA{RFa#<BdskAhMRs$x@BfGz!weR$nivKck+V7W^pWLPi
z*>)*!)oYsP_|IXR`bH6#m}v(5p-*<N?e3Z>en3;uudH&eH?v_~tIY~!hY+R+(_??`
z+P;2#F_3|&P3roF`3uC0v!X6M+qNUrAx@o%nUR5Uae#rJfh;i9$nvp>v507V`fG5O
z`Qsf&xg(R0O&30O<yV51fjmfBnMJ}ttO2_M9*_cI7FGjhM#lfhVGhg=z%XZIa1)j2
z+!QW;aZ$>_S;hV=Q_9%oHFxEkxE(UPn$h}2)TdACUvp*fn^nA%67GGTW%Z&VZB2VY
zXXK|f^EPM*n%7qN#o4R!@8ir@)3Qygw9t6kSXeks&Hwfr<$`_YmVX`?@iz3Q9bdC#
zOLw`$qnR#N#V3A>oR>CIKU8sh!>z7_*S#inwKmLGEK0tM&oe5S_1t{wl|tqdQ(kda
zuho5B;QYy`E}5~Vr*7Vd%KCLL&;Q)V_iyT@y(gA89xA+fIKZ$o_t)A*s~H$g1R~x~
zi+XLqzOt{y?7gi`qT95r7n}-FtABXE-fo=Ow|-Ww*oK6x4+c*+^*wLcvXE(|`M>zB
f>r!84n|u)Okd#_+%H@{m*TDNT?}>9?o%9d@>=~cF

diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/log4j.properties b/vendor/git.apache.org/thrift.git/lib/java/test/log4j.properties
deleted file mode 100644
index ab9beba..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# log4j configuration used during build and unit tests
-log4j.rootLogger=debug,stdout
-log4j.threshold=ALL
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/Fixtures.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/Fixtures.java
deleted file mode 100644
index 9f28124..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/Fixtures.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-import thrift.test.Bonk;
-import thrift.test.CompactProtoTestStruct;
-import thrift.test.HolyMoley;
-import thrift.test.Nesting;
-import thrift.test.OneOfEach;
-
-public class Fixtures {
-  public static final OneOfEach oneOfEach;
-  public static final Nesting nesting;
-  public static final HolyMoley holyMoley;
-  public static final CompactProtoTestStruct compactProtoTestStruct;
-
-  // These byte arrays are serialized versions of the above structs.
-  // They were serialized in binary protocol using thrift 0.6.x and are used to
-  // test backwards compatibility with respect to the standard scheme.
-  public static final byte[] persistentBytesOneOfEach = new byte[] { (byte) 0x02, (byte) 0x00,
-    (byte) 0x01, (byte) 0x01, (byte) 0x02, (byte) 0x00, (byte) 0x02,
-    (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x03, (byte) 0xD6,
-    (byte) 0x06, (byte) 0x00, (byte) 0x04, (byte) 0x69, (byte) 0x78,
-    (byte) 0x08, (byte) 0x00, (byte) 0x05, (byte) 0x01, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x0A, (byte) 0x00, (byte) 0x06,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x65,
-    (byte) 0xA0, (byte) 0xBC, (byte) 0x00, (byte) 0x04, (byte) 0x00,
-    (byte) 0x07, (byte) 0x40, (byte) 0x09, (byte) 0x21, (byte) 0xFB,
-    (byte) 0x54, (byte) 0x44, (byte) 0x2D, (byte) 0x18, (byte) 0x0B,
-    (byte) 0x00, (byte) 0x08, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x0D, (byte) 0x4A, (byte) 0x53, (byte) 0x4F, (byte) 0x4E,
-    (byte) 0x20, (byte) 0x54, (byte) 0x48, (byte) 0x49, (byte) 0x53,
-    (byte) 0x21, (byte) 0x20, (byte) 0x22, (byte) 0x01, (byte) 0x0B,
-    (byte) 0x00, (byte) 0x09, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x2E, (byte) 0xD3, (byte) 0x80, (byte) 0xE2, (byte) 0x85,
-    (byte) 0xAE, (byte) 0xCE, (byte) 0x9D, (byte) 0x20, (byte) 0xD0,
-    (byte) 0x9D, (byte) 0xCE, (byte) 0xBF, (byte) 0xE2, (byte) 0x85,
-    (byte) 0xBF, (byte) 0xD0, (byte) 0xBE, (byte) 0xC9, (byte) 0xA1,
-    (byte) 0xD0, (byte) 0xB3, (byte) 0xD0, (byte) 0xB0, (byte) 0xCF,
-    (byte) 0x81, (byte) 0xE2, (byte) 0x84, (byte) 0x8E, (byte) 0x20,
-    (byte) 0xCE, (byte) 0x91, (byte) 0x74, (byte) 0x74, (byte) 0xCE,
-    (byte) 0xB1, (byte) 0xE2, (byte) 0x85, (byte) 0xBD, (byte) 0xCE,
-    (byte) 0xBA, (byte) 0xEF, (byte) 0xBF, (byte) 0xBD, (byte) 0xE2,
-    (byte) 0x80, (byte) 0xBC, (byte) 0x02, (byte) 0x00, (byte) 0x0A,
-    (byte) 0x00, (byte) 0x0B, (byte) 0x00, (byte) 0x0B, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x62, (byte) 0x61,
-    (byte) 0x73, (byte) 0x65, (byte) 0x36, (byte) 0x34, (byte) 0x0F,
-    (byte) 0x00, (byte) 0x0C, (byte) 0x03, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x03, (byte) 0x01, (byte) 0x02, (byte) 0x03,
-    (byte) 0x0F, (byte) 0x00, (byte) 0x0D, (byte) 0x06, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x01,
-    (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x03, (byte) 0x0F,
-    (byte) 0x00, (byte) 0x0E, (byte) 0x0A, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x03, (byte) 0x00 };
-  public static final byte[] persistentBytesNesting = new byte[] { (byte) 0x0C, (byte) 0x00,
-    (byte) 0x01, (byte) 0x08, (byte) 0x00, (byte) 0x01, (byte) 0x00,
-    (byte) 0x00, (byte) 0x7A, (byte) 0x69, (byte) 0x0B, (byte) 0x00,
-    (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x13,
-    (byte) 0x49, (byte) 0x20, (byte) 0x61, (byte) 0x6D, (byte) 0x20,
-    (byte) 0x61, (byte) 0x20, (byte) 0x62, (byte) 0x6F, (byte) 0x6E,
-    (byte) 0x6B, (byte) 0x2E, (byte) 0x2E, (byte) 0x2E, (byte) 0x20,
-    (byte) 0x78, (byte) 0x6F, (byte) 0x72, (byte) 0x21, (byte) 0x00,
-    (byte) 0x0C, (byte) 0x00, (byte) 0x02, (byte) 0x02, (byte) 0x00,
-    (byte) 0x01, (byte) 0x01, (byte) 0x02, (byte) 0x00, (byte) 0x02,
-    (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x03, (byte) 0xD6,
-    (byte) 0x06, (byte) 0x00, (byte) 0x04, (byte) 0x69, (byte) 0x78,
-    (byte) 0x08, (byte) 0x00, (byte) 0x05, (byte) 0x01, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x0A, (byte) 0x00, (byte) 0x06,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x65,
-    (byte) 0xA0, (byte) 0xBC, (byte) 0x00, (byte) 0x04, (byte) 0x00,
-    (byte) 0x07, (byte) 0x40, (byte) 0x09, (byte) 0x21, (byte) 0xFB,
-    (byte) 0x54, (byte) 0x44, (byte) 0x2D, (byte) 0x18, (byte) 0x0B,
-    (byte) 0x00, (byte) 0x08, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x0D, (byte) 0x4A, (byte) 0x53, (byte) 0x4F, (byte) 0x4E,
-    (byte) 0x20, (byte) 0x54, (byte) 0x48, (byte) 0x49, (byte) 0x53,
-    (byte) 0x21, (byte) 0x20, (byte) 0x22, (byte) 0x01, (byte) 0x0B,
-    (byte) 0x00, (byte) 0x09, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x2E, (byte) 0xD3, (byte) 0x80, (byte) 0xE2, (byte) 0x85,
-    (byte) 0xAE, (byte) 0xCE, (byte) 0x9D, (byte) 0x20, (byte) 0xD0,
-    (byte) 0x9D, (byte) 0xCE, (byte) 0xBF, (byte) 0xE2, (byte) 0x85,
-    (byte) 0xBF, (byte) 0xD0, (byte) 0xBE, (byte) 0xC9, (byte) 0xA1,
-    (byte) 0xD0, (byte) 0xB3, (byte) 0xD0, (byte) 0xB0, (byte) 0xCF,
-    (byte) 0x81, (byte) 0xE2, (byte) 0x84, (byte) 0x8E, (byte) 0x20,
-    (byte) 0xCE, (byte) 0x91, (byte) 0x74, (byte) 0x74, (byte) 0xCE,
-    (byte) 0xB1, (byte) 0xE2, (byte) 0x85, (byte) 0xBD, (byte) 0xCE,
-    (byte) 0xBA, (byte) 0xEF, (byte) 0xBF, (byte) 0xBD, (byte) 0xE2,
-    (byte) 0x80, (byte) 0xBC, (byte) 0x02, (byte) 0x00, (byte) 0x0A,
-    (byte) 0x00, (byte) 0x0B, (byte) 0x00, (byte) 0x0B, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x06, (byte) 0x62, (byte) 0x61,
-    (byte) 0x73, (byte) 0x65, (byte) 0x36, (byte) 0x34, (byte) 0x0F,
-    (byte) 0x00, (byte) 0x0C, (byte) 0x03, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x03, (byte) 0x01, (byte) 0x02, (byte) 0x03,
-    (byte) 0x0F, (byte) 0x00, (byte) 0x0D, (byte) 0x06, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x01,
-    (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x03, (byte) 0x0F,
-    (byte) 0x00, (byte) 0x0E, (byte) 0x0A, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x03, (byte) 0x00, (byte) 0x00 };
-  public static final byte[] persistentBytesHolyMoley = new byte[] { (byte) 0x0F, (byte) 0x00,
-    (byte) 0x01, (byte) 0x0C, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x02, (byte) 0x02, (byte) 0x00, (byte) 0x01, (byte) 0x01,
-    (byte) 0x02, (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x03,
-    (byte) 0x00, (byte) 0x03, (byte) 0x23, (byte) 0x06, (byte) 0x00,
-    (byte) 0x04, (byte) 0x69, (byte) 0x78, (byte) 0x08, (byte) 0x00,
-    (byte) 0x05, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x0A, (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x01, (byte) 0x65, (byte) 0xA0, (byte) 0xBC,
-    (byte) 0x00, (byte) 0x04, (byte) 0x00, (byte) 0x07, (byte) 0x40,
-    (byte) 0x09, (byte) 0x21, (byte) 0xFB, (byte) 0x54, (byte) 0x44,
-    (byte) 0x2D, (byte) 0x18, (byte) 0x0B, (byte) 0x00, (byte) 0x08,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x0D, (byte) 0x4A,
-    (byte) 0x53, (byte) 0x4F, (byte) 0x4E, (byte) 0x20, (byte) 0x54,
-    (byte) 0x48, (byte) 0x49, (byte) 0x53, (byte) 0x21, (byte) 0x20,
-    (byte) 0x22, (byte) 0x01, (byte) 0x0B, (byte) 0x00, (byte) 0x09,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x2E, (byte) 0xD3,
-    (byte) 0x80, (byte) 0xE2, (byte) 0x85, (byte) 0xAE, (byte) 0xCE,
-    (byte) 0x9D, (byte) 0x20, (byte) 0xD0, (byte) 0x9D, (byte) 0xCE,
-    (byte) 0xBF, (byte) 0xE2, (byte) 0x85, (byte) 0xBF, (byte) 0xD0,
-    (byte) 0xBE, (byte) 0xC9, (byte) 0xA1, (byte) 0xD0, (byte) 0xB3,
-    (byte) 0xD0, (byte) 0xB0, (byte) 0xCF, (byte) 0x81, (byte) 0xE2,
-    (byte) 0x84, (byte) 0x8E, (byte) 0x20, (byte) 0xCE, (byte) 0x91,
-    (byte) 0x74, (byte) 0x74, (byte) 0xCE, (byte) 0xB1, (byte) 0xE2,
-    (byte) 0x85, (byte) 0xBD, (byte) 0xCE, (byte) 0xBA, (byte) 0xEF,
-    (byte) 0xBF, (byte) 0xBD, (byte) 0xE2, (byte) 0x80, (byte) 0xBC,
-    (byte) 0x02, (byte) 0x00, (byte) 0x0A, (byte) 0x00, (byte) 0x0B,
-    (byte) 0x00, (byte) 0x0B, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x06, (byte) 0x62, (byte) 0x61, (byte) 0x73, (byte) 0x65,
-    (byte) 0x36, (byte) 0x34, (byte) 0x0F, (byte) 0x00, (byte) 0x0C,
-    (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03,
-    (byte) 0x01, (byte) 0x02, (byte) 0x03, (byte) 0x0F, (byte) 0x00,
-    (byte) 0x0D, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x03, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x02,
-    (byte) 0x00, (byte) 0x03, (byte) 0x0F, (byte) 0x00, (byte) 0x0E,
-    (byte) 0x0A, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x00,
-    (byte) 0x02, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x02,
-    (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x03, (byte) 0x00,
-    (byte) 0x03, (byte) 0xD6, (byte) 0x06, (byte) 0x00, (byte) 0x04,
-    (byte) 0x69, (byte) 0x78, (byte) 0x08, (byte) 0x00, (byte) 0x05,
-    (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x0A,
-    (byte) 0x00, (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x01, (byte) 0x65, (byte) 0xA0, (byte) 0xBC, (byte) 0x00,
-    (byte) 0x04, (byte) 0x00, (byte) 0x07, (byte) 0x40, (byte) 0x09,
-    (byte) 0x21, (byte) 0xFB, (byte) 0x54, (byte) 0x44, (byte) 0x2D,
-    (byte) 0x18, (byte) 0x0B, (byte) 0x00, (byte) 0x08, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x0D, (byte) 0x4A, (byte) 0x53,
-    (byte) 0x4F, (byte) 0x4E, (byte) 0x20, (byte) 0x54, (byte) 0x48,
-    (byte) 0x49, (byte) 0x53, (byte) 0x21, (byte) 0x20, (byte) 0x22,
-    (byte) 0x01, (byte) 0x0B, (byte) 0x00, (byte) 0x09, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x2E, (byte) 0xD3, (byte) 0x80,
-    (byte) 0xE2, (byte) 0x85, (byte) 0xAE, (byte) 0xCE, (byte) 0x9D,
-    (byte) 0x20, (byte) 0xD0, (byte) 0x9D, (byte) 0xCE, (byte) 0xBF,
-    (byte) 0xE2, (byte) 0x85, (byte) 0xBF, (byte) 0xD0, (byte) 0xBE,
-    (byte) 0xC9, (byte) 0xA1, (byte) 0xD0, (byte) 0xB3, (byte) 0xD0,
-    (byte) 0xB0, (byte) 0xCF, (byte) 0x81, (byte) 0xE2, (byte) 0x84,
-    (byte) 0x8E, (byte) 0x20, (byte) 0xCE, (byte) 0x91, (byte) 0x74,
-    (byte) 0x74, (byte) 0xCE, (byte) 0xB1, (byte) 0xE2, (byte) 0x85,
-    (byte) 0xBD, (byte) 0xCE, (byte) 0xBA, (byte) 0xEF, (byte) 0xBF,
-    (byte) 0xBD, (byte) 0xE2, (byte) 0x80, (byte) 0xBC, (byte) 0x02,
-    (byte) 0x00, (byte) 0x0A, (byte) 0x00, (byte) 0x0B, (byte) 0x00,
-    (byte) 0x0B, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06,
-    (byte) 0x62, (byte) 0x61, (byte) 0x73, (byte) 0x65, (byte) 0x36,
-    (byte) 0x34, (byte) 0x0F, (byte) 0x00, (byte) 0x0C, (byte) 0x03,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x01,
-    (byte) 0x02, (byte) 0x03, (byte) 0x0F, (byte) 0x00, (byte) 0x0D,
-    (byte) 0x06, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03,
-    (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x02, (byte) 0x00,
-    (byte) 0x03, (byte) 0x0F, (byte) 0x00, (byte) 0x0E, (byte) 0x0A,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x0E,
-    (byte) 0x00, (byte) 0x02, (byte) 0x0F, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x03, (byte) 0x0B, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x0B, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x0F, (byte) 0x74, (byte) 0x68, (byte) 0x65, (byte) 0x6E,
-    (byte) 0x20, (byte) 0x61, (byte) 0x20, (byte) 0x6F, (byte) 0x6E,
-    (byte) 0x65, (byte) 0x2C, (byte) 0x20, (byte) 0x74, (byte) 0x77,
-    (byte) 0x6F, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06,
-    (byte) 0x74, (byte) 0x68, (byte) 0x72, (byte) 0x65, (byte) 0x65,
-    (byte) 0x21, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x06,
-    (byte) 0x46, (byte) 0x4F, (byte) 0x55, (byte) 0x52, (byte) 0x21,
-    (byte) 0x21, (byte) 0x0B, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x09,
-    (byte) 0x61, (byte) 0x6E, (byte) 0x64, (byte) 0x20, (byte) 0x61,
-    (byte) 0x20, (byte) 0x6F, (byte) 0x6E, (byte) 0x65, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x09, (byte) 0x61, (byte) 0x6E,
-    (byte) 0x64, (byte) 0x20, (byte) 0x61, (byte) 0x20, (byte) 0x74,
-    (byte) 0x77, (byte) 0x6F, (byte) 0x0D, (byte) 0x00, (byte) 0x03,
-    (byte) 0x0B, (byte) 0x0F, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x03, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03,
-    (byte) 0x74, (byte) 0x77, (byte) 0x6F, (byte) 0x0C, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0x08, (byte) 0x00,
-    (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01,
-    (byte) 0x0B, (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x05, (byte) 0x57, (byte) 0x61, (byte) 0x69,
-    (byte) 0x74, (byte) 0x2E, (byte) 0x00, (byte) 0x08, (byte) 0x00,
-    (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02,
-    (byte) 0x0B, (byte) 0x00, (byte) 0x02, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x05, (byte) 0x57, (byte) 0x68, (byte) 0x61,
-    (byte) 0x74, (byte) 0x3F, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x05, (byte) 0x74, (byte) 0x68, (byte) 0x72,
-    (byte) 0x65, (byte) 0x65, (byte) 0x0C, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x04, (byte) 0x7A, (byte) 0x65, (byte) 0x72, (byte) 0x6F,
-    (byte) 0x0C, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-    (byte) 0x00 };
-
-  private static final byte[] kUnicodeBytes = { (byte) 0xd3, (byte) 0x80,
-      (byte) 0xe2, (byte) 0x85, (byte) 0xae, (byte) 0xce, (byte) 0x9d,
-      (byte) 0x20, (byte) 0xd0, (byte) 0x9d, (byte) 0xce, (byte) 0xbf,
-      (byte) 0xe2, (byte) 0x85, (byte) 0xbf, (byte) 0xd0, (byte) 0xbe,
-      (byte) 0xc9, (byte) 0xa1, (byte) 0xd0, (byte) 0xb3, (byte) 0xd0,
-      (byte) 0xb0, (byte) 0xcf, (byte) 0x81, (byte) 0xe2, (byte) 0x84,
-      (byte) 0x8e, (byte) 0x20, (byte) 0xce, (byte) 0x91, (byte) 0x74,
-      (byte) 0x74, (byte) 0xce, (byte) 0xb1, (byte) 0xe2, (byte) 0x85,
-      (byte) 0xbd, (byte) 0xce, (byte) 0xba, (byte) 0x83, (byte) 0xe2,
-      (byte) 0x80, (byte) 0xbc };
-
-  static {
-    try {
-      oneOfEach = new OneOfEach();
-      oneOfEach.setIm_true(true);
-      oneOfEach.setIm_false(false);
-      oneOfEach.setA_bite((byte) 0xd6);
-      oneOfEach.setInteger16((short) 27000);
-      oneOfEach.setInteger32(1 << 24);
-      oneOfEach.setInteger64((long) 6000 * 1000 * 1000);
-      oneOfEach.setDouble_precision(Math.PI);
-      oneOfEach.setSome_characters("JSON THIS! \"\1");
-      oneOfEach.setZomg_unicode(new String(kUnicodeBytes, "UTF-8"));
-      oneOfEach.setBase64(ByteBuffer.wrap("base64".getBytes()));
-      // byte, i16, and i64 lists are populated by default constructor
-
-      Bonk bonk = new Bonk();
-      bonk.setType(31337);
-      bonk.setMessage("I am a bonk... xor!");
-      nesting = new Nesting(bonk, oneOfEach);
-
-      holyMoley = new HolyMoley();
-      ArrayList big = new ArrayList<OneOfEach>();
-      big.add(new OneOfEach(oneOfEach));
-      big.add(nesting.my_ooe);
-      holyMoley.setBig(big);
-      holyMoley.getBig().get(0).setA_bite((byte) 0x22);
-      holyMoley.getBig().get(0).setA_bite((byte) 0x23);
-
-      holyMoley.setContain(new HashSet<List<String>>());
-      ArrayList<String> stage1 = new ArrayList<String>(2);
-      stage1.add("and a one");
-      stage1.add("and a two");
-      holyMoley.getContain().add(stage1);
-      stage1 = new ArrayList<String>(3);
-      stage1.add("then a one, two");
-      stage1.add("three!");
-      stage1.add("FOUR!!");
-      holyMoley.getContain().add(stage1);
-      stage1 = new ArrayList<String>(0);
-      holyMoley.getContain().add(stage1);
-
-      ArrayList<Bonk> stage2 = new ArrayList<Bonk>();
-      holyMoley.setBonks(new HashMap<String, List<Bonk>>());
-      // one empty
-      holyMoley.getBonks().put("zero", stage2);
-
-      // one with two
-      stage2 = new ArrayList<Bonk>();
-      Bonk b = new Bonk();
-      b.setType(1);
-      b.setMessage("Wait.");
-      stage2.add(b);
-      b = new Bonk();
-      b.setType(2);
-      b.setMessage("What?");
-      stage2.add(b);
-      holyMoley.getBonks().put("two", stage2);
-
-      // one with three
-      stage2 = new ArrayList<Bonk>();
-      b = new Bonk();
-      b.setType(3);
-      b.setMessage("quoth");
-      b = new Bonk();
-      b.setType(4);
-      b.setMessage("the raven");
-      b = new Bonk();
-      b.setType(5);
-      b.setMessage("nevermore");
-      holyMoley.getBonks().put("three", stage2);
-
-      // superhuge compact proto test struct
-      compactProtoTestStruct = new CompactProtoTestStruct(
-          thrift.test.DebugProtoTestConstants.COMPACT_TEST);
-      compactProtoTestStruct.setA_binary(ByteBuffer.wrap(new byte[] { 0, 1, 2,
-          3, 4, 5, 6, 7, 8 }));
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestFullCamel.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestFullCamel.java
deleted file mode 100644
index fc98898..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestFullCamel.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.util.HashSet;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TType;
-
-import thrift.test.fullcamel.OneOfEachZZ;
-import thrift.test.fullcamel.UnderscoreSrv;
-
-// Sanity check for the code generated by 'fullcamel'.
-//
-public class TestFullCamel extends TestCase {
-
-  public void testCamelCaseSyntax() throws Exception {
-    TSerializer   binarySerializer   = new   TSerializer(new TBinaryProtocol.Factory());
-    TDeserializer binaryDeserializer = new TDeserializer(new TBinaryProtocol.Factory());
-
-    OneOfEachZZ obj = new OneOfEachZZ();
-    obj.setABite((byte) 0xae);
-    obj.setImFalse(true);
-    byte[] serBytes = binarySerializer.serialize(obj);
-    binaryDeserializer.deserialize(obj, serBytes);
-    assertTrue( obj.getABite() == (byte) 0xae );
-    assertTrue( obj.isImFalse() == true );
-  }
-
-  public void testCamelCaseRpcMethods() throws Exception {
-    final UnderscoreSrv.Iface srv = new UnderscoreSrv.Iface() {
-      @Override
-      public long someRpcCall(String message) {
-        return 1l;
-      }
-    };
-    assertTrue(1l == srv.someRpcCall("test"));
-  }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestOptionType.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestOptionType.java
deleted file mode 100644
index f70285f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestOptionType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import junit.framework.TestCase;
-import org.apache.thrift.Option;
-
-// Tests and documents behavior for the "Option<T>" type
-public class TestOptionType extends TestCase {
-    public void testSome() throws Exception {
-        String name = "Chuck Norris";
-        Option<String> option = Option.fromNullable(name);
-
-        assertTrue(option instanceof Option.Some);
-        assertTrue(option.isDefined());
-        assertEquals("Some(Chuck Norris)", option.toString());
-        assertEquals(option.or("default value"), "Chuck Norris");
-        assertEquals(option.get(),"Chuck Norris");
-    }
-
-    public void testNone() throws Exception {
-        String name = null;
-        Option<String> option = Option.fromNullable(name);
-
-        assertTrue(option instanceof Option.None);
-        assertFalse(option.isDefined());
-        assertEquals("None", option.toString());
-        assertEquals(option.or("default value"), "default value");
-        // Expect exception
-        try {
-            Object value = option.get();
-            fail("Expected IllegalStateException, got no exception");
-        } catch (IllegalStateException ex) {
-
-        } catch(Exception ex) {
-            fail("Expected IllegalStateException, got some other exception: "+ex.toString());
-        }
-    }
-
-    public void testMakeSome() throws Exception {
-        Option<String> some = Option.some("wee");
-        assertTrue(some instanceof Option.Some);
-    }
-
-    public void testMakeNone() throws Exception {
-        Option<Integer> none = Option.none();
-        assertTrue(none instanceof Option.None);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestOptionals.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestOptionals.java
deleted file mode 100644
index d1591ee..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestOptionals.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import junit.framework.TestCase;
-
-import thrift.test.Opt4;
-import thrift.test.Opt30;
-import thrift.test.Opt64;
-import thrift.test.Opt80;
-
-// Exercises the isSet methods using structs from from ManyOptionals.thrift
-public class TestOptionals extends TestCase {
-  public void testEncodingUtils() throws Exception {
-    assertEquals((short)0x8, EncodingUtils.setBit((short)0, 3, true));
-    assertEquals((short)0, EncodingUtils.setBit((short)0x8, 3, false));
-    assertEquals(true, EncodingUtils.testBit((short)0x8, 3));
-    assertEquals(false, EncodingUtils.testBit((short)0x8, 4));
-
-    assertEquals((short)Short.MIN_VALUE, EncodingUtils.setBit((short)0, 15, true));
-    assertEquals((short)0, EncodingUtils.setBit((short)Short.MIN_VALUE, 15, false));
-    assertEquals(true, EncodingUtils.testBit(Short.MIN_VALUE, 15));
-    assertEquals(false, EncodingUtils.testBit(Short.MIN_VALUE, 14));
-  }
-
-  public void testOpt4() throws Exception {
-    Opt4 x = new Opt4();
-    assertEquals(false, x.isSetDef1());
-    x.setDef1(3);
-    assertEquals(true, x.isSetDef1());
-    assertEquals(false, x.isSetDef2());
-
-    Opt4 copy = new Opt4(x);
-    assertEquals(true, copy.isSetDef1());
-    copy.unsetDef1();
-    assertEquals(false, copy.isSetDef1());
-    assertEquals(true, x.isSetDef1());
-  }
-
-  public void testOpt30() throws Exception {
-    Opt30 x = new Opt30();
-    assertEquals(false, x.isSetDef1());
-    x.setDef1(3);
-    assertEquals(true, x.isSetDef1());
-    assertEquals(false, x.isSetDef2());
-  }
-
-  public void testOpt64() throws Exception {
-    Opt64 x = new Opt64();
-    assertEquals(false, x.isSetDef1());
-    x.setDef1(3);
-    assertEquals(true, x.isSetDef1());
-    assertEquals(false, x.isSetDef2());
-    x.setDef64(22);
-    assertEquals(true, x.isSetDef64());
-    assertEquals(false, x.isSetDef63());
-  }
-
-  public void testOpt80() throws Exception {
-    Opt80 x = new Opt80();
-    assertEquals(false, x.isSetDef1());
-    x.setDef1(3);
-    assertEquals(true, x.isSetDef1());
-    assertEquals(false, x.isSetDef2());
-
-    Opt80 copy = new Opt80(x);
-    copy.unsetDef1();
-    assertEquals(false, copy.isSetDef1());
-    assertEquals(true, x.isSetDef1());
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestReuse.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestReuse.java
deleted file mode 100644
index db16c74..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestReuse.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.util.HashSet;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TType;
-
-import thrift.test.Reuse;
-
-// Tests reusing objects for deserialization.
-//
-public class TestReuse extends TestStruct {
-
-  public void testReuseObject() throws Exception {
-    TSerializer   binarySerializer   = new   TSerializer(new TBinaryProtocol.Factory());
-    TDeserializer binaryDeserializer = new TDeserializer(new TBinaryProtocol.Factory());
-
-    Reuse ru1 = new Reuse();
-    HashSet<String> hs1 = new HashSet<String>();
-    byte[] serBytes;    
-    String st1 = new String("string1");
-    String st2 = new String("string2");
-
-    ru1.setVal1(11);
-    ru1.setVal2(hs1);
-    ru1.addToVal2(st1);
-    
-    serBytes = binarySerializer.serialize(ru1);
-
-    // update hash set after serialization
-    hs1.add(st2);
-
-    binaryDeserializer.deserialize(ru1, serBytes);
-   
-    assertTrue( ru1.getVal2() == hs1 );
-    assertTrue( hs1.size() == 2 );
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestShortStack.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestShortStack.java
deleted file mode 100644
index 07831e5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestShortStack.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import java.util.Stack;
-
-import junit.framework.TestCase;
-
-public class TestShortStack extends TestCase {
-  private static final int NUM_TRIALS = 5;
-  private static final int NUM_REPS = 10000000;
-
-  public void testOps() throws Exception {
-    ShortStack s = new ShortStack(10);
-    s.push((short)10);
-    s.push((short)11);
-    s.push((short)12);
-    assertEquals((short)12, s.peek());
-    assertEquals((short)12, s.peek());
-    assertEquals((short)12, s.pop());
-    assertEquals((short)11, s.pop());
-    s.push((short)40);
-    assertEquals((short)40, s.peek());
-    assertEquals((short)40, s.pop());
-    assertEquals((short)10, s.peek());
-    assertEquals((short)10, s.pop());
-    try {
-      s.peek();
-      fail("should have thrown an exception!");
-    } catch (Exception e) {
-      // yay
-    }
-
-    try {
-      s.pop();
-      fail("should have thrown an exception!");
-    } catch (Exception e) {
-      // yay
-    }
-  }
-
-  public void testGrow() throws Exception {
-    ShortStack s = new ShortStack(1);
-    s.push((short)1);
-    s.push((short)1);
-    s.push((short)1);
-    s.push((short)1);
-    s.push((short)1);
-  }
-
-  public static void main(String[] args) throws Exception {
-    for (int trial = 0; trial < NUM_TRIALS; trial++) {
-      long start = System.currentTimeMillis();
-      ShortStack s = new ShortStack(10);
-      for (int rep = 0; rep < NUM_REPS; rep++) {
-        s.push((short)1);
-        s.push((short)11);
-        s.push((short)111);
-        s.pop();
-        s.pop();
-        s.push((short)12);
-        s.push((short)121);
-        s.push((short)1211);
-        s.push((short)12111);
-        s.pop();
-        s.pop();
-        s.pop();
-        s.pop();
-        s.push((short)5);
-        s.pop();
-        s.pop();
-      }
-      long end = System.currentTimeMillis();
-      System.out.println("ShortStack: " + (end-start));
-
-      start = System.currentTimeMillis();
-      Stack<Short> stdStack = new Stack<Short>();
-      for (int rep = 0; rep < NUM_REPS; rep++) {
-        stdStack.push((short)1);
-        stdStack.push((short)11);
-        stdStack.push((short)111);
-        stdStack.pop();
-        stdStack.pop();
-        stdStack.push((short)12);
-        stdStack.push((short)121);
-        stdStack.push((short)1211);
-        stdStack.push((short)12111);
-        stdStack.pop();
-        stdStack.pop();
-        stdStack.pop();
-        stdStack.pop();
-        stdStack.push((short)5);
-        stdStack.pop();
-        stdStack.pop();
-      }
-      end = System.currentTimeMillis();
-      System.out.println("Built-in stack: " + (end-start));
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestStruct.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestStruct.java
deleted file mode 100644
index 3379ed1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestStruct.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.meta_data.FieldMetaData;
-import org.apache.thrift.meta_data.ListMetaData;
-import org.apache.thrift.meta_data.MapMetaData;
-import org.apache.thrift.meta_data.SetMetaData;
-import org.apache.thrift.meta_data.StructMetaData;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TType;
-
-import thrift.test.Bonk;
-import thrift.test.CrazyNesting;
-import thrift.test.HolyMoley;
-import thrift.test.Insanity;
-import thrift.test.JavaTestHelper;
-import thrift.test.Nesting;
-import thrift.test.Numberz;
-import thrift.test.OneOfEach;
-import thrift.test.StructA;
-import thrift.test.StructB;
-import thrift.test.Xtruct;
-
-public class TestStruct extends TestCase {
-  public void testIdentity() throws Exception {
-    TSerializer   binarySerializer   = new   TSerializer(new TBinaryProtocol.Factory());
-    TDeserializer binaryDeserializer = new TDeserializer(new TBinaryProtocol.Factory());
-
-    OneOfEach ooe = Fixtures.oneOfEach;
-
-    Nesting n = new Nesting();
-    n.my_ooe = ooe;
-    n.my_ooe.integer16 = 16;
-    n.my_ooe.integer32 = 32;
-    n.my_ooe.integer64 = 64;
-    n.my_ooe.double_precision = (Math.sqrt(5)+1)/2;
-    n.my_ooe.some_characters  = ":R (me going \"rrrr\")";
-    n.my_ooe.zomg_unicode     = "\u04c0\u216e\u039d\u0020\u041d\u03bf\u217f"+
-                                "\u043e\u0261\u0433\u0430\u03c1\u210e\u0020"+
-                                "\u0391\u0074\u0074\u03b1\u217d\u03ba\u01c3"+
-                                "\u203c";
-    n.my_bonk = Fixtures.nesting.my_bonk;
-
-    HolyMoley hm = Fixtures.holyMoley;
-
-    OneOfEach ooe2 = new OneOfEach();
-    binaryDeserializer.deserialize(
-        ooe2,
-        binarySerializer.serialize(ooe));
-
-    assertEquals(ooe, ooe2);
-    assertEquals(ooe.hashCode(), ooe2.hashCode());
-
-
-    Nesting n2 = new Nesting();
-    binaryDeserializer.deserialize(
-        n2,
-        binarySerializer.serialize(n));
-
-    assertEquals(n, n2);
-    assertEquals(n.hashCode(), n2.hashCode());
-
-    HolyMoley hm2 = new HolyMoley();
-    binaryDeserializer.deserialize(
-        hm2,
-        binarySerializer.serialize(hm));
-
-    assertEquals(hm, hm2);
-    assertEquals(hm.hashCode(), hm2.hashCode());
-  }
-
-  public void testDeepCopy() throws Exception {
-    TSerializer   binarySerializer   = new   TSerializer(new TBinaryProtocol.Factory());
-    TDeserializer binaryDeserializer = new TDeserializer(new TBinaryProtocol.Factory());
-
-    HolyMoley hm = Fixtures.holyMoley;
-
-    byte[] binaryCopy = binarySerializer.serialize(hm);
-    HolyMoley hmCopy = new HolyMoley();
-    binaryDeserializer.deserialize(hmCopy, binaryCopy);
-    HolyMoley hmCopy2 = new HolyMoley(hm);
-
-    assertEquals(hm, hmCopy);
-    assertEquals(hmCopy, hmCopy2);
-
-    // change binary value in original object
-    hm.big.get(0).base64.array()[0]++;
-    // make sure the change didn't propagate to the copied object
-    assertFalse(hm.equals(hmCopy2));
-    hm.big.get(0).base64.array()[0]--; // undo change
-
-    hmCopy2.bonks.get("two").get(1).message = "What else?";
-
-    assertFalse(hm.equals(hmCopy2));
-  }
-
-  public void testCompareTo() throws Exception {
-    Bonk bonk1 = new Bonk();
-    Bonk bonk2 = new Bonk();
-
-    // Compare empty thrift objects.
-    assertEquals(0, bonk1.compareTo(bonk2));
-
-    bonk1.setMessage("m");
-
-    // Compare one thrift object with a filled in field and another without it.
-    assertTrue(bonk1.compareTo(bonk2) > 0);
-    assertTrue(bonk2.compareTo(bonk1) < 0);
-
-    // Compare both have filled-in fields.
-    bonk2.setMessage("z");
-    assertTrue(bonk1.compareTo(bonk2) < 0);
-    assertTrue(bonk2.compareTo(bonk1) > 0);
-
-    // Compare bonk1 has a field filled in that bonk2 doesn't.
-    bonk1.setType(123);
-    assertTrue(bonk1.compareTo(bonk2) > 0);
-    assertTrue(bonk2.compareTo(bonk1) < 0);
-
-    // Compare bonk1 and bonk2 equal.
-    bonk2.setType(123);
-    bonk2.setMessage("m");
-    assertEquals(0, bonk1.compareTo(bonk2));
-  }
-
-  public void testCompareToWithDataStructures() {
-    Insanity insanity1 = new Insanity();
-    Insanity insanity2 = new Insanity();
-
-    // Both empty.
-    expectEquals(insanity1, insanity2);
-
-    insanity1.setUserMap(new HashMap<Numberz, Long>());
-    // insanity1.map = {}, insanity2.map = null
-    expectGreaterThan(insanity1, insanity2);
-
-    // insanity1.map = {2:1}, insanity2.map = null
-    insanity1.getUserMap().put(Numberz.TWO, 1l);
-    expectGreaterThan(insanity1, insanity2);
-
-    // insanity1.map = {2:1}, insanity2.map = {}
-    insanity2.setUserMap(new HashMap<Numberz, Long>());
-    expectGreaterThan(insanity1, insanity2);
-
-    // insanity1.map = {2:1}, insanity2.map = {2:2}
-    insanity2.getUserMap().put(Numberz.TWO, 2l);
-    expectLessThan(insanity1, insanity2);
-
-    // insanity1.map = {2:1, 3:5}, insanity2.map = {2:2}
-    insanity1.getUserMap().put(Numberz.THREE, 5l);
-    expectGreaterThan(insanity1, insanity2);
-
-    // insanity1.map = {2:1, 3:5}, insanity2.map = {2:1, 4:5}
-    insanity2.getUserMap().put(Numberz.TWO, 1l);
-    insanity2.getUserMap().put(Numberz.FIVE, 5l);
-    expectLessThan(insanity1, insanity2);
-  }
-
-  private void expectLessThan(Insanity insanity1, Insanity insanity2) {
-    int compareTo = insanity1.compareTo(insanity2);
-    assertTrue(insanity1 + " should be less than " + insanity2 + ", but is: " + compareTo, compareTo < 0);
-  }
-
-  private void expectGreaterThan(Insanity insanity1, Insanity insanity2) {
-    int compareTo = insanity1.compareTo(insanity2);
-    assertTrue(insanity1 + " should be greater than " + insanity2 + ", but is: " + compareTo, compareTo > 0);
-  }
-
-  private void expectEquals(Insanity insanity1, Insanity insanity2) {
-    int compareTo = insanity1.compareTo(insanity2);
-    assertEquals(insanity1 + " should be equal to " + insanity2 + ", but is: " + compareTo, 0, compareTo);
-  }
-
-  public void testMetaData() throws Exception {
-    Map<CrazyNesting._Fields, FieldMetaData> mdMap = CrazyNesting.metaDataMap;
-
-    // Check for struct fields existence
-    assertEquals(4, mdMap.size());
-    assertTrue(mdMap.containsKey(CrazyNesting._Fields.SET_FIELD));
-    assertTrue(mdMap.containsKey(CrazyNesting._Fields.LIST_FIELD));
-    assertTrue(mdMap.containsKey(CrazyNesting._Fields.STRING_FIELD));
-    assertTrue(mdMap.containsKey(CrazyNesting._Fields.BINARY_FIELD));
-
-    // Check for struct fields contents
-    assertEquals("string_field", mdMap.get(CrazyNesting._Fields.STRING_FIELD).fieldName);
-    assertEquals("list_field", mdMap.get(CrazyNesting._Fields.LIST_FIELD).fieldName);
-    assertEquals("set_field", mdMap.get(CrazyNesting._Fields.SET_FIELD).fieldName);
-    assertEquals("binary_field", mdMap.get(CrazyNesting._Fields.BINARY_FIELD).fieldName);
-
-    assertEquals(TFieldRequirementType.DEFAULT, mdMap.get(CrazyNesting._Fields.STRING_FIELD).requirementType);
-    assertEquals(TFieldRequirementType.REQUIRED, mdMap.get(CrazyNesting._Fields.LIST_FIELD).requirementType);
-    assertEquals(TFieldRequirementType.OPTIONAL, mdMap.get(CrazyNesting._Fields.SET_FIELD).requirementType);
-
-    assertEquals(TType.STRING, mdMap.get(CrazyNesting._Fields.STRING_FIELD).valueMetaData.type);
-    assertFalse(mdMap.get(CrazyNesting._Fields.STRING_FIELD).valueMetaData.isBinary());
-    assertEquals(TType.LIST, mdMap.get(CrazyNesting._Fields.LIST_FIELD).valueMetaData.type);
-    assertEquals(TType.SET, mdMap.get(CrazyNesting._Fields.SET_FIELD).valueMetaData.type);
-    assertEquals(TType.STRING, mdMap.get(CrazyNesting._Fields.BINARY_FIELD).valueMetaData.type);
-    assertTrue(mdMap.get(CrazyNesting._Fields.BINARY_FIELD).valueMetaData.isBinary());
-
-    // Check nested structures
-    assertTrue(mdMap.get(CrazyNesting._Fields.LIST_FIELD).valueMetaData.isContainer());
-
-    assertFalse(mdMap.get(CrazyNesting._Fields.LIST_FIELD).valueMetaData.isStruct());
-
-    assertEquals(TType.STRUCT, ((MapMetaData)((ListMetaData)((SetMetaData)((MapMetaData)((MapMetaData)((ListMetaData)mdMap.get(CrazyNesting._Fields.LIST_FIELD).valueMetaData).elemMetaData).valueMetaData).valueMetaData).elemMetaData).elemMetaData).keyMetaData.type);
-
-    assertEquals(Insanity.class, ((StructMetaData)((MapMetaData)((ListMetaData)((SetMetaData)((MapMetaData)((MapMetaData)((ListMetaData)mdMap.get(CrazyNesting._Fields.LIST_FIELD).valueMetaData).elemMetaData).valueMetaData).valueMetaData).elemMetaData).elemMetaData).keyMetaData).structClass);
-
-    // Check that FieldMetaData contains a map with metadata for all generated struct classes
-    assertNotNull(FieldMetaData.getStructMetaDataMap(CrazyNesting.class));
-    assertNotNull(FieldMetaData.getStructMetaDataMap(Insanity.class));
-    assertNotNull(FieldMetaData.getStructMetaDataMap(Xtruct.class));
-
-    assertEquals(CrazyNesting.metaDataMap, FieldMetaData.getStructMetaDataMap(CrazyNesting.class));
-    assertEquals(Insanity.metaDataMap, FieldMetaData.getStructMetaDataMap(Insanity.class));
-
-    for (Map.Entry<? extends TFieldIdEnum, FieldMetaData> mdEntry : mdMap.entrySet()) {
-      assertEquals(mdEntry.getKey(), CrazyNesting._Fields.findByName(mdEntry.getValue().fieldName));
-    }
-
-    MapMetaData vmd = (MapMetaData)Insanity.metaDataMap.get(Insanity._Fields.USER_MAP).valueMetaData;
-    assertTrue(vmd.valueMetaData.isTypedef());
-    assertFalse(vmd.keyMetaData.isTypedef());
-  }
-
-  public void testToString() throws Exception {
-    JavaTestHelper object = new JavaTestHelper();
-    object.req_int = 0;
-    object.req_obj = "";
-
-    object.req_bin = ByteBuffer.wrap(new byte[] {
-      0, -1, 2, -3, 4, -5, 6, -7, 8, -9, 10, -11, 12, -13, 14, -15,
-      16, -17, 18, -19, 20, -21, 22, -23, 24, -25, 26, -27, 28, -29,
-      30, -31, 32, -33, 34, -35, 36, -37, 38, -39, 40, -41, 42, -43, 44,
-      -45, 46, -47, 48, -49, 50, -51, 52, -53, 54, -55, 56, -57, 58, -59,
-      60, -61, 62, -63, 64, -65, 66, -67, 68, -69, 70, -71, 72, -73, 74,
-      -75, 76, -77, 78, -79, 80, -81, 82, -83, 84, -85, 86, -87, 88, -89,
-      90, -91, 92, -93, 94, -95, 96, -97, 98, -99, 100, -101, 102, -103,
-      104, -105, 106, -107, 108, -109, 110, -111, 112, -113, 114, -115,
-      116, -117, 118, -119, 120, -121, 122, -123, 124, -125, 126, -127,
-    });
-
-    assertEquals("JavaTestHelper(req_int:0, req_obj:, req_bin:"+
-        "00 FF 02 FD 04 FB 06 F9 08 F7 0A F5 0C F3 0E F1 10 EF 12 ED 14 "+
-        "EB 16 E9 18 E7 1A E5 1C E3 1E E1 20 DF 22 DD 24 DB 26 D9 28 D7 "+
-        "2A D5 2C D3 2E D1 30 CF 32 CD 34 CB 36 C9 38 C7 3A C5 3C C3 3E "+
-        "C1 40 BF 42 BD 44 BB 46 B9 48 B7 4A B5 4C B3 4E B1 50 AF 52 AD "+
-        "54 AB 56 A9 58 A7 5A A5 5C A3 5E A1 60 9F 62 9D 64 9B 66 99 68 "+
-        "97 6A 95 6C 93 6E 91 70 8F 72 8D 74 8B 76 89 78 87 7A 85 7C 83 "+
-        "7E 81)",
-        object.toString());
- 
-    object.req_bin = ByteBuffer.wrap(new byte[] {
-      0, -1, 2, -3, 4, -5, 6, -7, 8, -9, 10, -11, 12, -13, 14, -15,
-      16, -17, 18, -19, 20, -21, 22, -23, 24, -25, 26, -27, 28, -29,
-      30, -31, 32, -33, 34, -35, 36, -37, 38, -39, 40, -41, 42, -43, 44,
-      -45, 46, -47, 48, -49, 50, -51, 52, -53, 54, -55, 56, -57, 58, -59,
-      60, -61, 62, -63, 64, -65, 66, -67, 68, -69, 70, -71, 72, -73, 74,
-      -75, 76, -77, 78, -79, 80, -81, 82, -83, 84, -85, 86, -87, 88, -89,
-      90, -91, 92, -93, 94, -95, 96, -97, 98, -99, 100, -101, 102, -103,
-      104, -105, 106, -107, 108, -109, 110, -111, 112, -113, 114, -115,
-      116, -117, 118, -119, 120, -121, 122, -123, 124, -125, 126, -127,
-      0,
-    });
-
-    assertEquals("JavaTestHelper(req_int:0, req_obj:, req_bin:"+
-        "00 FF 02 FD 04 FB 06 F9 08 F7 0A F5 0C F3 0E F1 10 EF 12 ED 14 "+
-        "EB 16 E9 18 E7 1A E5 1C E3 1E E1 20 DF 22 DD 24 DB 26 D9 28 D7 "+
-        "2A D5 2C D3 2E D1 30 CF 32 CD 34 CB 36 C9 38 C7 3A C5 3C C3 3E "+
-        "C1 40 BF 42 BD 44 BB 46 B9 48 B7 4A B5 4C B3 4E B1 50 AF 52 AD "+
-        "54 AB 56 A9 58 A7 5A A5 5C A3 5E A1 60 9F 62 9D 64 9B 66 99 68 "+
-        "97 6A 95 6C 93 6E 91 70 8F 72 8D 74 8B 76 89 78 87 7A 85 7C 83 "+
-        "7E 81...)",
-        object.toString());
-
-    object.req_bin = ByteBuffer.wrap(new byte[] {});
-    object.setOpt_binIsSet(true);
-
-    assertEquals("JavaTestHelper(req_int:0, req_obj:, req_bin:)", 
-        object.toString());
-  }
-
-  private static void assertArrayEquals(byte[] expected, byte[] actual) {
-    if (!java.util.Arrays.equals(expected, actual)) {
-      fail("Expected byte array did not match actual.");
-    }
-  }
-
-  public void testBytesBufferFeatures() throws Exception {
-    
-    final String testString = "testBytesBufferFeatures";
-    final JavaTestHelper o = new JavaTestHelper();
-
-    o.setReq_bin((ByteBuffer)null);
-    assertNull(o.getReq_bin());
-
-    o.setReq_bin(ByteBuffer.wrap(testString.getBytes()));
-    assertArrayEquals(testString.getBytes(), o.getReq_bin());
-
-    o.setReq_bin((byte[])null);
-    assertNull(o.getReq_bin());
-
-    o.setReq_bin(testString.getBytes());
-    assertArrayEquals(testString.getBytes(), o.getReq_bin());
-
-    o.setFieldValue(JavaTestHelper._Fields.REQ_BIN, null);
-    assertNull(o.getReq_bin());
-
-    o.setFieldValue(JavaTestHelper._Fields.REQ_BIN, testString.getBytes());
-    assertArrayEquals(testString.getBytes(), o.getReq_bin());
-
-    o.setFieldValue(JavaTestHelper._Fields.REQ_BIN, null);
-    assertNull(o.getReq_bin());
-
-    o.setFieldValue(JavaTestHelper._Fields.REQ_BIN, ByteBuffer.wrap(testString.getBytes()));
-    assertArrayEquals(testString.getBytes(), o.getReq_bin());
-  }
-
-  public void testJavaSerializable() throws Exception {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(baos);
-    
-    OneOfEach ooe = Fixtures.oneOfEach;
-
-    // Serialize ooe the Java way...
-    oos.writeObject(ooe);
-    byte[] serialized = baos.toByteArray();
-
-    // Attempt to deserialize it
-    ByteArrayInputStream bais = new ByteArrayInputStream(serialized);
-    ObjectInputStream ois = new ObjectInputStream(bais);
-    OneOfEach ooe2 = (OneOfEach) ois.readObject();
-
-    assertEquals(ooe, ooe2);
-  }
-
-  public void testSubStructValidation() throws Exception {
-    StructA valid = new StructA("valid");
-    StructA invalid = new StructA();
-
-    StructB b = new StructB();
-    try {
-      b.validate();
-      fail();
-    } catch (TException e) {
-      // expected
-    }
-
-    b = new StructB().setAb(valid);
-    b.validate();
-
-    b = new StructB().setAb(invalid);
-    try {
-      b.validate();
-      fail();
-    } catch (TException e) {
-      // expected
-    }
-
-    b = new StructB().setAb(valid).setAa(invalid);
-    try {
-      b.validate();
-      fail();
-    } catch (TException e) {
-      // expected
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTBaseHelper.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTBaseHelper.java
deleted file mode 100644
index 8b08555..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTBaseHelper.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-public class TestTBaseHelper extends TestCase {
-  public void testByteArrayComparison() {
-    assertTrue(TBaseHelper.compareTo(new byte[]{'a','b'}, new byte[]{'a','c'}) < 0);
-  }
-
-  public void testSets() {
-    Set<String> a = new HashSet<String>();
-    Set<String> b = new HashSet<String>();
-
-    assertTrue(TBaseHelper.compareTo(a, b) == 0);
-
-    a.add("test");
-
-    assertTrue(TBaseHelper.compareTo(a, b) > 0);
-
-    b.add("test");
-
-    assertTrue(TBaseHelper.compareTo(a, b) == 0);
-
-    b.add("aardvark");
-
-    assertTrue(TBaseHelper.compareTo(a, b) < 0);
-
-    a.add("test2");
-
-    assertTrue(TBaseHelper.compareTo(a, b) > 0);
-  }
-
-  public void testNestedStructures() {
-    Set<List<String>> a = new HashSet<List<String>>();
-    Set<List<String>> b = new HashSet<List<String>>();
-
-    a.add(Arrays.asList(new String[] {"a","b"}));
-    b.add(Arrays.asList(new String[] {"a","b", "c"}));
-    a.add(Arrays.asList(new String[] {"a","b"}));
-    b.add(Arrays.asList(new String[] {"a","b", "c"}));
-
-    assertTrue(TBaseHelper.compareTo(a, b) < 0);
-  }
-
-  public void testMapsInSets() {
-    Set<Map<String, Long>> a = new HashSet<Map<String, Long>>();
-    Set<Map<String, Long>> b = new HashSet<Map<String, Long>>();
-
-    assertTrue(TBaseHelper.compareTo(a, b) == 0);
-
-    Map<String, Long> innerA = new HashMap<String, Long>();
-    Map<String, Long> innerB = new HashMap<String, Long>();
-    a.add(innerA);
-    b.add(innerB);
-
-    innerA.put("a", 1l);
-    innerB.put("a", 2l);
-
-    assertTrue(TBaseHelper.compareTo(a, b) < 0);
-  }
-
-  public void testByteArraysInMaps() {
-    Map<byte[], Long> a = new HashMap<byte[], Long>();
-    Map<byte[], Long> b = new HashMap<byte[], Long>();
-
-    assertTrue(TBaseHelper.compareTo(a, b) == 0);
-
-    a.put(new byte[]{'a','b'}, 1000L);
-    b.put(new byte[]{'a','b'}, 1000L);
-    a.put(new byte[]{'a','b', 'd'}, 1000L);
-    b.put(new byte[]{'a','b', 'a'}, 1000L);
-    assertTrue(TBaseHelper.compareTo(a, b) > 0);
-  }
-
-  public void testMapsWithNulls() {
-    Map<String, String> a = new HashMap<String, String>();
-    Map<String, String> b = new HashMap<String, String>();
-    a.put("a", null);
-    a.put("b", null);
-    b.put("a", null);
-    b.put("b", null);
-
-    assertTrue(TBaseHelper.compareTo(a, b) == 0);
-  }
-
-  public void testMapKeyComparison() {
-    Map<String, String> a = new HashMap<String, String>();
-    Map<String, String> b = new HashMap<String, String>();
-    a.put("a", "a");
-    b.put("b", "a");
-
-    assertTrue(TBaseHelper.compareTo(a, b) < 0);
-  }
-
-  public void testMapValueComparison() {
-    Map<String, String> a = new HashMap<String, String>();
-    Map<String, String> b = new HashMap<String, String>();
-    a.put("a", "b");
-    b.put("a", "a");
-
-    assertTrue(TBaseHelper.compareTo(a, b) > 0);
-  }
-
-  public void testByteArraysInSets() {
-    Set<byte[]> a = new HashSet<byte[]>();
-    Set<byte[]> b = new HashSet<byte[]>();
-
-    if (TBaseHelper.compareTo(a, b) != 0)
-      throw new RuntimeException("Set compare failed:" + a + " vs. " + b);
-
-    a.add(new byte[]{'a','b'});
-    b.add(new byte[]{'a','b'});
-    a.add(new byte[]{'a','b', 'd'});
-    b.add(new byte[]{'a','b', 'a'});
-    assertTrue(TBaseHelper.compareTo(a, b) > 0);
-  }
-
-  public void testByteBufferToByteArray() throws Exception {
-    byte[] b1 = {10,9,8,7,6,5,4,3,2,1,0};
-    byte[] b2 = TBaseHelper.byteBufferToByteArray(ByteBuffer.wrap(b1));
-    assertEquals("b1 and b2 should be the exact same array (identity) due to fast path", b1, b2);
-
-    byte[] b3 = TBaseHelper.byteBufferToByteArray(ByteBuffer.wrap(b1, 1, 3));
-    assertEquals(3, b3.length);
-    assertEquals(ByteBuffer.wrap(b1, 1, 3), ByteBuffer.wrap(b3));
-  }
-
-  public void testRightSize() throws Exception {
-    assertNull(TBaseHelper.rightSize(null));
-  }
-
-  public void testByteBufferToString() {
-    byte[] array = new byte[]{1, 2, 3};
-    ByteBuffer bb = ByteBuffer.wrap(array, 1, 2);
-    StringBuilder sb = new StringBuilder();
-    TBaseHelper.toString(bb, sb);
-    assertEquals("02 03", sb.toString());
-    bb = ByteBuffer.wrap(array, 0, array.length);
-    bb.position(1);
-    bb = bb.slice();
-    assertEquals(1, bb.arrayOffset());
-    assertEquals(0, bb.position());
-    assertEquals(2, bb.limit());
-    sb = new StringBuilder();
-    TBaseHelper.toString(bb, sb);
-    assertEquals("02 03", sb.toString());
-  }
-
-  public void testCopyBinaryWithByteBuffer() throws Exception {
-    byte[] bytes = new byte[]{0, 1, 2, 3, 4, 5};
-    ByteBuffer b = ByteBuffer.wrap(bytes);
-    ByteBuffer bCopy = TBaseHelper.copyBinary(b);
-    assertEquals(b, bCopy);
-    assertEquals(0, b.position());
-
-    b = ByteBuffer.allocateDirect(6);
-    b.put(bytes);
-    b.position(0);
-    bCopy = TBaseHelper.copyBinary(b);
-    assertEquals(6, b.remaining());
-    assertEquals(0, b.position());
-    assertEquals(b, bCopy);
-
-    b.mark();
-    b.get();
-    bCopy = TBaseHelper.copyBinary(b);
-    assertEquals(ByteBuffer.wrap(bytes, 1, 5), bCopy);
-    assertEquals(1, b.position());
-    b.reset();
-    assertEquals(0, b.position());
-
-    assertNull(TBaseHelper.copyBinary((ByteBuffer)null));
-  }
-
-  public void testCopyBinaryWithByteArray() throws Exception {
-    byte[] bytes = new byte[]{0, 1, 2, 3, 4, 5};
-    byte[] copy = TBaseHelper.copyBinary(bytes);
-    assertEquals(ByteBuffer.wrap(bytes), ByteBuffer.wrap(copy));
-    assertNotSame(bytes, copy);
-
-    assertNull(TBaseHelper.copyBinary((byte[])null));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTDeserializer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTDeserializer.java
deleted file mode 100644
index a4a353d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTDeserializer.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import java.nio.ByteBuffer;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TCompactProtocol;
-import org.apache.thrift.protocol.TJSONProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-
-import thrift.test.Backwards;
-import thrift.test.OneOfEach;
-import thrift.test.PrimitiveThenStruct;
-import thrift.test.StructWithAUnion;
-import thrift.test.TestUnion;
-
-public class TestTDeserializer extends TestCase {
-
-  private static final TProtocolFactory[] PROTOCOLS = new TProtocolFactory[] {
-    new TBinaryProtocol.Factory(), 
-    new TCompactProtocol.Factory(), 
-    new TJSONProtocol.Factory()
-  };
-
-  public void testPartialDeserialize() throws Exception {
-    //Root:StructWithAUnion
-    //  1:Union
-    //    1.3:OneOfEach
-    OneOfEach level3OneOfEach = Fixtures.oneOfEach;
-    TestUnion level2TestUnion = new TestUnion(TestUnion._Fields.STRUCT_FIELD, level3OneOfEach);
-    StructWithAUnion level1SWU = new StructWithAUnion(level2TestUnion);
-
-    Backwards bw = new Backwards(2, 1);
-    PrimitiveThenStruct pts = new PrimitiveThenStruct(12345, 67890, bw);
-
-    for (TProtocolFactory factory : PROTOCOLS) {
-
-      //Level 2 test
-      testPartialDeserialize(factory, level1SWU, new TestUnion(), level2TestUnion, StructWithAUnion._Fields.TEST_UNION);
-
-      //Level 3 on 3rd field test
-      testPartialDeserialize(factory, level1SWU, new OneOfEach(), level3OneOfEach, StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD);
-
-      //Test early termination when traversed path Field.id exceeds the one being searched for
-      testPartialDeserialize(factory, level1SWU, new OneOfEach(), new OneOfEach(), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.I32_FIELD);
-
-      //Test that readStructBegin isn't called on primitive
-      testPartialDeserialize(factory, pts, new Backwards(), bw, PrimitiveThenStruct._Fields.BW);
-
-      //Test primitive types
-      TDeserializer deserializer = new TDeserializer(factory);
-
-      Boolean expectedBool = level3OneOfEach.isIm_true();
-      Boolean resultBool = deserializer.partialDeserializeBool(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.IM_TRUE);
-      assertEquals(expectedBool, resultBool);
-
-      Byte expectedByte = level3OneOfEach.getA_bite();
-      Byte resultByte = deserializer.partialDeserializeByte(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.A_BITE);
-      assertEquals(expectedByte, resultByte);
-
-      Double expectedDouble = level3OneOfEach.getDouble_precision();
-      Double resultDouble = deserializer.partialDeserializeDouble(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.DOUBLE_PRECISION);
-      assertEquals(expectedDouble, resultDouble);
-
-      Short expectedI16 = level3OneOfEach.getInteger16();
-      Short resultI16 = deserializer.partialDeserializeI16(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.INTEGER16);
-      assertEquals(expectedI16, resultI16);
-
-      Integer expectedI32 = level3OneOfEach.getInteger32();
-      Integer resultI32 = deserializer.partialDeserializeI32(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.INTEGER32);
-      assertEquals(expectedI32, resultI32);
-
-      Long expectedI64 = level3OneOfEach.getInteger64();
-      Long resultI64= deserializer.partialDeserializeI64(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.INTEGER64);
-      assertEquals(expectedI64, resultI64);
-
-      String expectedString = level3OneOfEach.getSome_characters();
-      String resultString = deserializer.partialDeserializeString(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.SOME_CHARACTERS);
-      assertEquals(expectedString, resultString);
-
-      byte[] expectedBinary = level3OneOfEach.getBase64();
-      ByteBuffer resultBinary = deserializer.partialDeserializeByteArray(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION, TestUnion._Fields.STRUCT_FIELD, OneOfEach._Fields.BASE64);
-      assertEquals(expectedBinary.length, resultBinary.limit() - resultBinary.position() - resultBinary.arrayOffset());
-      assertEquals(ByteBuffer.wrap(expectedBinary), resultBinary);
-
-      // Test field id in Union
-      short id = deserializer.partialDeserializeSetFieldIdInUnion(serialize(level1SWU, factory), StructWithAUnion._Fields.TEST_UNION);
-      assertEquals(level2TestUnion.getSetField().getThriftFieldId(), id);
-    }
-  }
-
-  public static void testPartialDeserialize(TProtocolFactory protocolFactory, TBase input, TBase output, TBase expected, TFieldIdEnum fieldIdPathFirst, TFieldIdEnum ... fieldIdPathRest) throws TException {
-    byte[] record = serialize(input, protocolFactory);
-    TDeserializer deserializer = new TDeserializer(protocolFactory);
-    for (int i = 0; i < 2; i++) {
-      TBase outputCopy = output.deepCopy();
-      deserializer.partialDeserialize(outputCopy, record, fieldIdPathFirst, fieldIdPathRest);
-      assertEquals("on attempt " + i + ", with " + protocolFactory.toString() 
-          + ", expected " + expected + " but got " + outputCopy,
-          expected, outputCopy);
-    }
-  }
-
-  private static byte[] serialize(TBase input, TProtocolFactory protocolFactory) throws TException{
-    return new TSerializer(protocolFactory).serialize(input);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTEnumHelper.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTEnumHelper.java
deleted file mode 100644
index e2cca40..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTEnumHelper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import thrift.test.Numberz;
-
-import junit.framework.TestCase;
-
-public class TestTEnumHelper extends TestCase {
-
-  public void testGetByValue_ValidValues() {
-    for (Numberz n: Numberz.values()) {
-      int value = n.getValue();
-      assertEquals(n, TEnumHelper.getByValue(Numberz.class, value));
-    } 
-  }
-
-  public void testGetByValue_InvalidValue() {
-    assertEquals(null, TEnumHelper.getByValue(Numberz.class, 0));
-  }
-
-  public void testGetByValue_InvalidClass() {
-    assertEquals(null, TEnumHelper.getByValue(TEnum.class, 0));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTUnion.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTUnion.java
deleted file mode 100644
index f1e6f0e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/TestTUnion.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-import thrift.test.ComparableUnion;
-import thrift.test.Empty;
-import thrift.test.RandomStuff;
-import thrift.test.SomeEnum;
-import thrift.test.StructWithAUnion;
-import thrift.test.TestUnion;
-import thrift.test.TestUnionMinusStringField;
-
-public class TestTUnion extends TestCase {
-
-  public void testBasic() throws Exception {
-    TestUnion union = new TestUnion();
-
-    assertFalse(union.isSet());
-    assertFalse(union.isSetI32_field());
-    assertNull(union.getFieldValue());
-
-    union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
-
-    assertEquals(Integer.valueOf(25), union.getFieldValue());
-  
-    assertEquals(Integer.valueOf(25), union.getFieldValue(TestUnion._Fields.I32_FIELD));
-    
-    assertTrue(union.isSetI32_field());
-  
-    try {
-      union.getFieldValue(TestUnion._Fields.STRING_FIELD);
-      fail("should have thrown an exception");
-    } catch (IllegalArgumentException e) {
-      // cool!
-    }
-
-    union = new TestUnion();
-
-    // should not throw an exception here
-    union.hashCode();
-
-    union.setI32_field(1);
-    assertEquals(1, union.getI32_field());
-    union.hashCode();
-
-    assertFalse(union.isSetString_field());
-    
-    try {
-      union.getString_field();
-      fail("should have thrown an exception");
-    } catch (Exception e) {
-      // sweet
-    }
-
-    union = TestUnion.i32_field(1);
-
-    assertFalse(union.equals((TestUnion)null));
-
-    union = TestUnion.enum_field(SomeEnum.ONE);
-    union.hashCode();
-
-    union = new TestUnion();
-    // should not throw an exception
-    union.toString();
-  }
-
-  public void testCompareTo() throws Exception {
-    ComparableUnion cu = ComparableUnion.string_field("a");
-    ComparableUnion cu2 = ComparableUnion.string_field("b");
-
-    assertTrue(cu.compareTo(cu) == 0);
-    assertTrue(cu2.compareTo(cu2) == 0);
-
-    assertTrue(cu.compareTo(cu2) < 0);
-    assertTrue(cu2.compareTo(cu) > 0);
-
-    cu2 = ComparableUnion.binary_field(ByteBuffer.wrap(new byte[]{2}));
-
-    assertTrue(cu.compareTo(cu2) < 0);
-    assertTrue(cu2.compareTo(cu) > 0);
-
-    cu = ComparableUnion.binary_field(ByteBuffer.wrap(new byte[]{1}));
-
-    assertTrue(cu.compareTo(cu2) < 0);
-    assertTrue(cu2.compareTo(cu) > 0);
-    
-    TestUnion union1 = new TestUnion(TestUnion._Fields.STRUCT_LIST, new ArrayList<RandomStuff>());
-    TestUnion union2 = new TestUnion(TestUnion._Fields.STRUCT_LIST, new ArrayList<RandomStuff>());
-    assertTrue(union1.compareTo(union2) == 0);
-
-    TestUnion union3 = new TestUnion(TestUnion._Fields.I32_SET, new HashSet<Integer>());
-    Set<Integer> i32_set = new HashSet<Integer>();
-    i32_set.add(1);
-    TestUnion union4 = new TestUnion(TestUnion._Fields.I32_SET, i32_set);
-    assertTrue(union3.compareTo(union4) < 0);
-
-    Map<Integer, Integer> i32_map = new HashMap<Integer, Integer>();
-    i32_map.put(1,1);
-    TestUnion union5 = new TestUnion(TestUnion._Fields.I32_MAP, i32_map);
-    TestUnion union6 = new TestUnion(TestUnion._Fields.I32_MAP, new HashMap<Integer, Integer>());
-    assertTrue(union5.compareTo(union6) > 0);
-  }
-
-  public void testEquality() throws Exception {
-    TestUnion union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
-
-    TestUnion otherUnion = new TestUnion(TestUnion._Fields.STRING_FIELD, "blah!!!");
-
-    assertFalse(union.equals(otherUnion));
-
-    otherUnion = new TestUnion(TestUnion._Fields.I32_FIELD, 400);
-
-    assertFalse(union.equals(otherUnion));
-
-    otherUnion = new TestUnion(TestUnion._Fields.OTHER_I32_FIELD, 25);
-
-    assertFalse(union.equals(otherUnion));
-  }
-
-  public void testSerialization() throws Exception {
-    TestUnion union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
-    union.setI32_set(Collections.singleton(42));
-
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = new TBinaryProtocol(buf);
-
-    union.write(proto);
-
-    TestUnion u2 = new TestUnion();
-
-    u2.read(proto);
-
-    assertEquals(u2, union);
-
-    StructWithAUnion swau = new StructWithAUnion(u2);
-
-    buf = new TMemoryBuffer(0);
-    proto = new TBinaryProtocol(buf);
-
-    swau.write(proto);
-
-    StructWithAUnion swau2 = new StructWithAUnion();
-    assertFalse(swau2.equals(swau));
-    swau2.read(proto);
-    assertEquals(swau2, swau);
-
-    // this should NOT throw an exception.
-    buf = new TMemoryBuffer(0);
-    proto = new TBinaryProtocol(buf);
-
-    swau.write(proto);
-    new Empty().read(proto);
-  }
-  
-  public void testTupleProtocolSerialization () throws Exception {
-    TestUnion union = new TestUnion(TestUnion._Fields.I32_FIELD, 25);
-    union.setI32_set(Collections.singleton(42));
-
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = new TTupleProtocol(buf);
-
-    union.write(proto);
-
-    TestUnion u2 = new TestUnion();
-
-    u2.read(proto);
-
-    assertEquals(u2, union);
-
-    StructWithAUnion swau = new StructWithAUnion(u2);
-
-    buf = new TMemoryBuffer(0);
-    proto = new TBinaryProtocol(buf);
-
-    swau.write(proto);
-
-    StructWithAUnion swau2 = new StructWithAUnion();
-    assertFalse(swau2.equals(swau));
-    swau2.read(proto);
-    assertEquals(swau2, swau);
-
-    // this should NOT throw an exception.
-    buf = new TMemoryBuffer(0);
-    proto = new TTupleProtocol(buf);
-
-    swau.write(proto);
-    new Empty().read(proto);
-  }
-
-  public void testSkip() throws Exception {
-    TestUnion tu = TestUnion.string_field("string");
-    byte[] tuSerialized = new TSerializer().serialize(tu);
-    TestUnionMinusStringField tums = new TestUnionMinusStringField();
-    new TDeserializer().deserialize(tums, tuSerialized);
-    assertNull(tums.getSetField());
-    assertNull(tums.getFieldValue());
-  }
-
-  public void testDeepCopy() throws Exception {
-    byte[] bytes = {1, 2, 3};
-    ByteBuffer value = ByteBuffer.wrap(bytes);
-    ComparableUnion cu = ComparableUnion.binary_field(value);
-    ComparableUnion copy = cu.deepCopy();
-    assertEquals(cu, copy);
-    assertNotSame(cu.bufferForBinary_field().array(), copy.bufferForBinary_field().array());
-  }
-  
-  public void testToString() throws Exception {
-    byte[] bytes = {1, 2, 3};
-    ByteBuffer value = ByteBuffer.wrap(bytes);
-    ComparableUnion cu = ComparableUnion.binary_field(value);
-    String expectedString = "<ComparableUnion binary_field:01 02 03>";
-    assertEquals(expectedString, cu.toString());
-  }
-
-  public void testJavaSerializable() throws Exception {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(baos);
-    
-    TestUnion tu = TestUnion.string_field("string");
-
-    // Serialize tu the Java way...
-    oos.writeObject(tu);
-    byte[] serialized = baos.toByteArray();
-
-    // Attempt to deserialize it
-    ByteArrayInputStream bais = new ByteArrayInputStream(serialized);
-    ObjectInputStream ois = new ObjectInputStream(bais);
-    TestUnion tu2 = (TestUnion) ois.readObject();
-
-    assertEquals(tu, tu2);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java
deleted file mode 100644
index 392ca22..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.thrift.async;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.TException;
-
-import thrift.test.Srv;
-import thrift.test.Srv.AsyncClient;
-
-public class TestTAsyncClient extends TestCase {
-  public void testRaisesExceptionWhenUsedConcurrently() throws Exception {
-    TAsyncClientManager mockClientManager = new TAsyncClientManager() {
-      @Override
-      public void call(TAsyncMethodCall method) throws TException {
-        // do nothing
-      }
-    };
-
-    Srv.AsyncClient c = new AsyncClient(null, mockClientManager, null);
-    c.Janky(0, null);
-    try {
-      c.checkReady();
-      fail("should have hit an exception");
-    } catch (Exception e) {
-      // awesome
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/async/TestTAsyncClientManager.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/async/TestTAsyncClientManager.java
deleted file mode 100644
index c483cf2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/async/TestTAsyncClientManager.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.async;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.server.ServerTestBase;
-import org.apache.thrift.server.THsHaServer;
-import org.apache.thrift.server.THsHaServer.Args;
-import org.apache.thrift.transport.TNonblockingServerSocket;
-import org.apache.thrift.transport.TNonblockingSocket;
-
-import thrift.test.CompactProtoTestStruct;
-import thrift.test.ExceptionWithAMap;
-import thrift.test.Srv;
-import thrift.test.Srv.Iface;
-
-public class TestTAsyncClientManager extends TestCase {
-
-  private THsHaServer server_;
-  private Thread serverThread_;
-  private TAsyncClientManager clientManager_;
-
-  public void setUp() throws Exception {
-    server_ = new THsHaServer(new Args(new TNonblockingServerSocket(
-      new TNonblockingServerSocket.NonblockingAbstractServerSocketArgs().port(ServerTestBase.PORT))).
-      processor(new Srv.Processor(new SrvHandler())));
-    serverThread_ = new Thread(new Runnable() {
-      public void run() {
-        server_.serve();
-      }
-    });
-    serverThread_.start();
-    clientManager_ = new TAsyncClientManager();
-    Thread.sleep(500);
-  }
-
-  public void tearDown() throws Exception {
-    server_.stop();
-    clientManager_.stop();
-    serverThread_.join();
-  }
-
-  public void testBasicCall() throws Exception {
-    Srv.AsyncClient client = getClient();
-    basicCall(client);
-  }
-
-  public void testBasicCallWithTimeout() throws Exception {
-    Srv.AsyncClient client = getClient();
-    client.setTimeout(5000);
-    basicCall(client);
-  }
-
-  private static abstract class ErrorCallTest<C extends TAsyncClient, R> {
-    final void runTest() throws Exception {
-      final CountDownLatch latch = new CountDownLatch(1);
-      final AtomicReference<Exception> error = new AtomicReference<Exception>();
-      C client = executeErroringCall(new AsyncMethodCallback<R>() {
-        @Override
-        public void onComplete(R response) {
-          latch.countDown();
-        }
-
-        @Override
-        public void onError(Exception exception) {
-          error.set(exception);
-          latch.countDown();
-        }
-      });
-      latch.await(2, TimeUnit.SECONDS);
-      assertTrue(client.hasError());
-      Exception exception = error.get();
-      assertNotNull(exception);
-      assertSame(exception, client.getError());
-      validateError(client, exception);
-    }
-
-    /**
-     * Executes a call that is expected to raise an exception.
-     *
-     * @param callback The testing callback that should be installed.
-     * @return The client the call was made against.
-     * @throws Exception if there was a problem setting up the client or making the call.
-     */
-    abstract C executeErroringCall(AsyncMethodCallback<R> callback) throws Exception;
-
-    /**
-     * Further validates the properties of the error raised in the remote call and the state of the
-     * client after that call.
-     *
-     * @param client The client returned from {@link #executeErroringCall(AsyncMethodCallback)}.
-     * @param error The exception raised by the remote call.
-     */
-    abstract void validateError(C client, Exception error);
-  }
-
-  public void testUnexpectedRemoteExceptionCall() throws Exception {
-    new ErrorCallTest<Srv.AsyncClient, Boolean>() {
-      @Override
-      Srv.AsyncClient executeErroringCall(AsyncMethodCallback<Boolean> callback) throws Exception {
-        Srv.AsyncClient client = getClient();
-        client.declaredExceptionMethod(false, callback);
-        return client;
-      }
-
-      @Override
-      void validateError(Srv.AsyncClient client, Exception error) {
-        assertFalse(client.hasTimeout());
-        assertTrue(error instanceof TException);
-      }
-    }.runTest();
-  }
-
-  public void testDeclaredRemoteExceptionCall() throws Exception {
-    new ErrorCallTest<Srv.AsyncClient, Boolean>() {
-      @Override
-      Srv.AsyncClient executeErroringCall(AsyncMethodCallback<Boolean> callback) throws Exception {
-        Srv.AsyncClient client = getClient();
-        client.declaredExceptionMethod(true, callback);
-        return client;
-      }
-
-      @Override
-      void validateError(Srv.AsyncClient client, Exception error) {
-        assertFalse(client.hasTimeout());
-        assertEquals(ExceptionWithAMap.class, error.getClass());
-        ExceptionWithAMap exceptionWithAMap = (ExceptionWithAMap) error;
-        assertEquals("blah", exceptionWithAMap.getBlah());
-        assertEquals(new HashMap<String, String>(), exceptionWithAMap.getMap_field());
-      }
-    }.runTest();
-  }
-
-  public void testTimeoutCall() throws Exception {
-    new ErrorCallTest<Srv.AsyncClient, Integer>() {
-      @Override
-      Srv.AsyncClient executeErroringCall(AsyncMethodCallback<Integer> callback) throws Exception {
-        Srv.AsyncClient client = getClient();
-        client.setTimeout(100);
-        client.primitiveMethod(callback);
-        return client;
-      }
-
-      @Override
-      void validateError(Srv.AsyncClient client, Exception error) {
-        assertTrue(client.hasTimeout());
-        assertTrue(error instanceof TimeoutException);
-      }
-    }.runTest();
-  }
-
-  public void testVoidCall() throws Exception {
-    final CountDownLatch latch = new CountDownLatch(1);
-    final AtomicBoolean returned = new AtomicBoolean(false);
-    Srv.AsyncClient client = getClient();
-    client.voidMethod(new FailureLessCallback<Void>() {
-      @Override
-      public void onComplete(Void response) {
-        returned.set(true);
-        latch.countDown();
-      }
-    });
-    latch.await(1, TimeUnit.SECONDS);
-    assertTrue(returned.get());
-  }
-
-  public void testOnewayCall() throws Exception {
-    final CountDownLatch latch = new CountDownLatch(1);
-    final AtomicBoolean returned = new AtomicBoolean(false);
-    Srv.AsyncClient client = getClient();
-    client.onewayMethod(new FailureLessCallback<Void>() {
-      @Override
-      public void onComplete(Void response) {
-        returned.set(true);
-        latch.countDown();
-      }
-    });
-    latch.await(1, TimeUnit.SECONDS);
-    assertTrue(returned.get());
-  }
-
-  public void testParallelCalls() throws Exception {
-    // make multiple calls with deserialization in the selector thread (repro Eric's issue)
-    int numThreads = 50;
-    int numCallsPerThread = 100;
-    List<JankyRunnable> runnables = new ArrayList<JankyRunnable>();
-    List<Thread> threads = new ArrayList<Thread>();
-    for (int i = 0; i < numThreads; i++) {
-      JankyRunnable runnable = new JankyRunnable(numCallsPerThread);
-      Thread thread = new Thread(runnable);
-      thread.start();
-      threads.add(thread);
-      runnables.add(runnable);
-    }
-    for (Thread thread : threads) {
-      thread.join();
-    }
-    int numSuccesses = 0;
-    for (JankyRunnable runnable : runnables) {
-      numSuccesses += runnable.getNumSuccesses();
-    }
-    assertEquals(numThreads * numCallsPerThread, numSuccesses);
-  }
-
-  private Srv.AsyncClient getClient() throws IOException {
-    TNonblockingSocket clientSocket = new TNonblockingSocket(ServerTestBase.HOST, ServerTestBase.PORT);
-    return new Srv.AsyncClient(new TBinaryProtocol.Factory(), clientManager_, clientSocket);
-  }
-
-  private void basicCall(Srv.AsyncClient client) throws Exception {
-    final CountDownLatch latch = new CountDownLatch(1);
-    final AtomicBoolean returned = new AtomicBoolean(false);
-    client.Janky(1, new FailureLessCallback<Integer>() {
-      @Override
-      public void onComplete(Integer response) {
-        assertEquals(3, response.intValue());
-        returned.set(true);
-        latch.countDown();
-      }
-
-      @Override
-      public void onError(Exception exception) {
-        try {
-          StringWriter sink = new StringWriter();
-          exception.printStackTrace(new PrintWriter(sink, true));
-          fail("unexpected onError with exception " + sink.toString());
-        } finally {
-          latch.countDown();
-        }
-      }
-    });
-    latch.await(100, TimeUnit.SECONDS);
-    assertTrue(returned.get());
-  }
-
-  public class SrvHandler implements Iface {
-    // Use this method for a standard call testing
-    @Override
-    public int Janky(int arg) throws TException {
-      assertEquals(1, arg);
-      return 3;
-    }
-
-    // Using this method for timeout testing - sleeps for 1 second before returning
-    @Override
-    public int primitiveMethod() throws TException {
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-      return 0;
-    }
-
-    @Override
-    public void methodWithDefaultArgs(int something) throws TException { }
-
-    @Override
-    public CompactProtoTestStruct structMethod() throws TException {
-      return null;
-    }
-
-    @Override
-    public void voidMethod() throws TException {
-    }
-
-    @Override
-    public void onewayMethod() throws TException {
-    }
-
-    @Override
-    public boolean declaredExceptionMethod(boolean shouldThrowDeclared) throws TException {
-      if (shouldThrowDeclared) {
-        throw new ExceptionWithAMap("blah", new HashMap<String, String>());
-      } else {
-        throw new TException("Unexpected!");
-      }
-    }
-  }
-
-  private static abstract class FailureLessCallback<T> implements AsyncMethodCallback<T> {
-    @Override
-    public void onError(Exception exception) {
-      fail(exception);
-    }
-  }
-
-  private static void fail(Exception exception) {
-    StringWriter sink = new StringWriter();
-    exception.printStackTrace(new PrintWriter(sink, true));
-    fail("unexpected error " + sink.toString());
-  }
-
-  private class JankyRunnable implements Runnable {
-    private int numCalls_;
-    private int numSuccesses_ = 0;
-    private Srv.AsyncClient client_;
-
-    public JankyRunnable(int numCalls) throws Exception {
-      numCalls_ = numCalls;
-      client_ = getClient();
-      client_.setTimeout(20000);
-    }
-
-    public int getNumSuccesses() {
-      return numSuccesses_;
-    }
-
-    public void run() {
-      for (int i = 0; i < numCalls_ && !client_.hasError(); i++) {
-        final int iteration = i;
-        try {
-          // connect an async client
-          final CountDownLatch latch = new CountDownLatch(1);
-          final AtomicBoolean returned = new AtomicBoolean(false);
-          client_.Janky(1, new AsyncMethodCallback<Integer>() {
-
-            @Override
-            public void onComplete(Integer result) {
-              assertEquals(3, result.intValue());
-              returned.set(true);
-              latch.countDown();
-            }
-
-            @Override
-            public void onError(Exception exception) {
-              try {
-                StringWriter sink = new StringWriter();
-                exception.printStackTrace(new PrintWriter(sink, true));
-                fail("unexpected onError on iteration " + iteration + ": " + sink.toString());
-              } finally {
-                latch.countDown();
-              }
-            }
-          });
-
-          boolean calledBack = latch.await(30, TimeUnit.SECONDS);
-          assertTrue("wasn't called back in time on iteration " + iteration, calledBack);
-          assertTrue("onComplete not called on iteration " + iteration, returned.get());
-          this.numSuccesses_++;
-        } catch (Exception e) {
-          fail(e);
-        }
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/BenchmarkProtocols.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/BenchmarkProtocols.java
deleted file mode 100644
index e881607..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/BenchmarkProtocols.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.apache.thrift.protocol;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.thrift.Fixtures;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-public class BenchmarkProtocols {
-
-  private static final Set<TProtocolFactory> FACTORIES = new LinkedHashSet<TProtocolFactory>(){{
-    add(new TTupleProtocol.Factory());
-    add(new TCompactProtocol.Factory());
-    add(new TBinaryProtocol.Factory());
-  }};
-
-  private static final int NUM_REPS = 100000;
-  private static final int NUM_TRIALS = 10;
-
-  public static void main(String[] args) throws TException {
-    Map<TProtocolFactory, List<Long>> timesByFactory = new HashMap<TProtocolFactory, List<Long>>();
-
-    for (int trial = 0; trial < NUM_TRIALS; trial++) {
-      for (int i = 0; i < 16; i++) {
-        System.gc();
-      }
-//      TProtocol proto = factory.getProtocol(new TTransport() {
-//        @Override
-//        public void write(byte[] buf, int off, int len) throws TTransportException {
-//        }
-//
-//        @Override
-//        public int read(byte[] buf, int off, int len) throws TTransportException {
-//          return 0;
-//        }
-//
-//        @Override
-//        public void open() throws TTransportException {
-//        }
-//
-//        @Override
-//        public boolean isOpen() {
-//          return true;
-//        }
-//
-//        @Override
-//        public void close() {
-//        }
-//      });
-
-
-      for (TProtocolFactory factory : FACTORIES) {
-        if (timesByFactory.get(factory) == null) {
-          timesByFactory.put(factory, new ArrayList<Long>());
-        }
-
-        long start = System.currentTimeMillis();
-        for (int rep = 0; rep < NUM_REPS; rep++) {
-          TProtocol proto = factory.getProtocol(new TMemoryBuffer(128*1024));
-          Fixtures.compactProtoTestStruct.write(proto);
-          Fixtures.nesting.write(proto);
-        }
-        long end = System.currentTimeMillis();
-        timesByFactory.get(factory).add(end-start);
-      }
-    }
-
-    for (TProtocolFactory factory : FACTORIES) {
-      List<Long> times = timesByFactory.get(factory);
-//      System.out.println("raw times pre-drop: " + times );
-      times.remove(Collections.max(times));
-      long total = 0;
-      for (long t : times) {
-        total += t;
-      }
-      Collections.sort(times);
-      System.out.println(factory.getClass().getName() + " average time: " + (total / times.size()) + "ms");
-      System.out.println("raw times: " + times);
-    }
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java
deleted file mode 100644
index 0386d83..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.protocol;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.Fixtures;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TException;
-import org.apache.thrift.TSerializer;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-import thrift.test.CompactProtoTestStruct;
-import thrift.test.HolyMoley;
-import thrift.test.Nesting;
-import thrift.test.OneOfEach;
-import thrift.test.Srv;
-
-public abstract class ProtocolTestBase extends TestCase {
-
-  /** Does it make sense to call methods like writeI32 directly on your protocol? */
-  protected abstract boolean canBeUsedNaked();
-
-  /** The protocol factory for the protocol being tested. */
-  protected abstract TProtocolFactory getFactory();
-
-  public void testDouble() throws Exception {
-    if (canBeUsedNaked()) {
-      TMemoryBuffer buf = new TMemoryBuffer(1000);
-      TProtocol proto = getFactory().getProtocol(buf);
-      proto.writeDouble(123.456);
-      assertEquals(123.456, proto.readDouble());
-    }
-
-    internalTestStructField(new StructFieldTestCase(TType.DOUBLE, (short)15) {
-      @Override
-      public void readMethod(TProtocol proto) throws TException {
-        assertEquals(123.456, proto.readDouble());
-      }
-
-      @Override
-      public void writeMethod(TProtocol proto) throws TException {
-        proto.writeDouble(123.456);
-      }
-    });
-  }
-
-  public void testSerialization() throws Exception {
-    internalTestSerialization(OneOfEach.class, Fixtures.oneOfEach);
-    internalTestSerialization(Nesting.class, Fixtures.nesting);
-    internalTestSerialization(HolyMoley.class, Fixtures.holyMoley);
-    internalTestSerialization(CompactProtoTestStruct.class, Fixtures.compactProtoTestStruct);
-  }
-
-  public void testBinary() throws Exception {
-    for (byte[] b : Arrays.asList(new byte[0],
-                                  new byte[]{0,1,2,3,4,5,6,7,8,9,10},
-                                  new byte[]{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14},
-                                  new byte[]{0x5D},
-                                  new byte[]{(byte)0xD5,(byte)0x5D},
-                                  new byte[]{(byte)0xFF,(byte)0xD5,(byte)0x5D},
-                                  new byte[128])) {
-      if (canBeUsedNaked()) {
-        internalTestNakedBinary(b);
-      }
-      internalTestBinaryField(b);
-    }
-
-    if (canBeUsedNaked()) {
-      byte[] data = {1, 2, 3, 4, 5, 6};
-
-      TMemoryBuffer buf = new TMemoryBuffer(0);
-      TProtocol proto = getFactory().getProtocol(buf);
-      ByteBuffer bb = ByteBuffer.wrap(data);
-      bb.get();
-      proto.writeBinary(bb.slice());
-      assertEquals(ByteBuffer.wrap(data, 1, 5), proto.readBinary());
-    }
-  }
-
-  public void testString() throws Exception {
-    for (String s : Arrays.asList("", "short", "borderlinetiny", "a bit longer than the smallest possible")) {
-      if (canBeUsedNaked()) {
-        internalTestNakedString(s);
-      }
-      internalTestStringField(s);
-    }
-  }
-
-  public void testLong() throws Exception {
-    if (canBeUsedNaked()) {
-      internalTestNakedI64(0);
-    }
-    internalTestI64Field(0);
-    for (int i = 0; i < 62; i++) {
-      if (canBeUsedNaked()) {
-        internalTestNakedI64(1L << i);
-        internalTestNakedI64(-(1L << i));
-      }
-      internalTestI64Field(1L << i);
-      internalTestI64Field(-(1L << i));
-    }
-  }
-
-  public void testInt() throws Exception {
-    for (int i : Arrays.asList(0, 1, 7, 150, 15000, 31337, 0xffff, 0xffffff, -1, -7, -150, -15000, -0xffff, -0xffffff)) {
-      if (canBeUsedNaked()) {
-        internalTestNakedI32(i);
-      }
-      internalTestI32Field(i);
-    }
-  }
-
-  public void testShort() throws Exception {
-    for (int s : Arrays.asList(0, 1, 7, 150, 15000, 0x7fff, -1, -7, -150, -15000, -0x7fff)) {
-      if (canBeUsedNaked()) {
-        internalTestNakedI16((short)s);
-      }
-      internalTestI16Field((short)s);
-    }
-  }
-
-  public void testByte() throws Exception {
-    if (canBeUsedNaked()) {
-      internalTestNakedByte();
-    }
-    for (int i = 0; i < 128; i++) {
-      internalTestByteField((byte)i);
-      internalTestByteField((byte)-i);
-    }
-  }
-
-  private void internalTestNakedByte() throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(1000);
-    TProtocol proto = getFactory().getProtocol(buf);
-    proto.writeByte((byte)123);
-    assertEquals((byte) 123, proto.readByte());
-  }
-
-  private void internalTestByteField(final byte b) throws Exception {
-    internalTestStructField(new StructFieldTestCase(TType.BYTE, (short)15) {
-      public void writeMethod(TProtocol proto) throws TException {
-        proto.writeByte(b);
-      }
-
-      public void readMethod(TProtocol proto) throws TException {
-        assertEquals((byte)b, proto.readByte());
-      }
-    });
-  }
-
-  private void internalTestNakedI16(short n) throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = getFactory().getProtocol(buf);
-    proto.writeI16(n);
-    assertEquals(n, proto.readI16());
-  }
-
-  private void internalTestI16Field(final short n) throws Exception {
-    internalTestStructField(new StructFieldTestCase(TType.I16, (short)15) {
-      public void writeMethod(TProtocol proto) throws TException {
-        proto.writeI16(n);
-      }
-
-      public void readMethod(TProtocol proto) throws TException {
-        assertEquals(n, proto.readI16());
-      }
-    });
-  }
-
-  private void internalTestNakedI32(int n) throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = getFactory().getProtocol(buf);
-    proto.writeI32(n);
-    assertEquals(n, proto.readI32());
-  }
-
-  private void internalTestI32Field(final int n) throws Exception {
-    internalTestStructField(new StructFieldTestCase(TType.I32, (short)15) {
-      public void writeMethod(TProtocol proto) throws TException {
-        proto.writeI32(n);
-      }
-
-      public void readMethod(TProtocol proto) throws TException {
-        assertEquals(n, proto.readI32());
-      }
-    });
-  }
-
-  private void internalTestNakedI64(long n) throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = getFactory().getProtocol(buf);
-    proto.writeI64(n);
-    assertEquals(n, proto.readI64());
-  }
-
-  private void internalTestI64Field(final long n) throws Exception {
-    internalTestStructField(new StructFieldTestCase(TType.I64, (short)15) {
-      public void writeMethod(TProtocol proto) throws TException {
-        proto.writeI64(n);
-      }
-
-      public void readMethod(TProtocol proto) throws TException {
-        assertEquals(n, proto.readI64());
-      }
-    });
-  }
-
-  private void internalTestNakedString(String str) throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = getFactory().getProtocol(buf);
-    proto.writeString(str);
-    assertEquals(str, proto.readString());
-  }
-
-  private void internalTestStringField(final String str) throws Exception {
-    internalTestStructField(new StructFieldTestCase(TType.STRING, (short)15) {
-      public void writeMethod(TProtocol proto) throws TException {
-        proto.writeString(str);
-      }
-
-      public void readMethod(TProtocol proto) throws TException {
-        assertEquals(str, proto.readString());
-      }
-    });
-  }
-
-  private void internalTestNakedBinary(byte[] data) throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = getFactory().getProtocol(buf);
-    proto.writeBinary(ByteBuffer.wrap(data));
-    assertEquals(ByteBuffer.wrap(data), proto.readBinary());
-  }
-
-  private void internalTestBinaryField(final byte[] data) throws Exception {
-    internalTestStructField(new StructFieldTestCase(TType.STRING, (short)15) {
-      public void writeMethod(TProtocol proto) throws TException {
-        proto.writeBinary(ByteBuffer.wrap(data));
-      }
-
-      public void readMethod(TProtocol proto) throws TException {
-        assertEquals(ByteBuffer.wrap(data), proto.readBinary());
-      }
-    });
-  }
-
-  private <T extends TBase> void internalTestSerialization(Class<T> klass, T expected) throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TBinaryProtocol binproto = new TBinaryProtocol(buf);
-
-    expected.write(binproto);
-
-    buf = new TMemoryBuffer(0);
-    TProtocol proto = getFactory().getProtocol(buf);
-
-    expected.write(proto);
-    System.out.println("Size in " +  proto.getClass().getSimpleName() + ": " + buf.length());
-
-    T actual = klass.newInstance();
-    actual.read(proto);
-    assertEquals(expected, actual);
-  }
-
-  public void testMessage() throws Exception {
-    List<TMessage> msgs = Arrays.asList(new TMessage[]{
-      new TMessage("short message name", TMessageType.CALL, 0),
-      new TMessage("1", TMessageType.REPLY, 12345),
-      new TMessage("loooooooooooooooooooooooooooooooooong", TMessageType.EXCEPTION, 1 << 16),
-      new TMessage("Janky", TMessageType.CALL, 0),
-    });
-
-    for (TMessage msg : msgs) {
-      TMemoryBuffer buf = new TMemoryBuffer(0);
-      TProtocol proto = getFactory().getProtocol(buf);
-      TMessage output = null;
-
-      proto.writeMessageBegin(msg);
-      proto.writeMessageEnd();
-
-      output = proto.readMessageBegin();
-
-      assertEquals(msg, output);
-    }
-  }
-
-  public void testServerRequest() throws Exception {
-    Srv.Iface handler = new Srv.Iface() {
-      public int Janky(int i32arg) throws TException {
-        return i32arg * 2;
-      }
-
-      public int primitiveMethod() throws TException {
-        return 0;
-      }
-
-      public CompactProtoTestStruct structMethod() throws TException {
-        return null;
-      }
-
-      public void voidMethod() throws TException {
-      }
-
-      public void methodWithDefaultArgs(int something) throws TException {
-      }
-
-      @Override
-      public void onewayMethod() throws TException {
-      }
-
-      @Override
-      public boolean declaredExceptionMethod(boolean shouldThrow) throws TException {
-        return shouldThrow;
-      }
-    };
-
-    Srv.Processor testProcessor = new Srv.Processor(handler);
-
-    TMemoryBuffer clientOutTrans = new TMemoryBuffer(0);
-    TProtocol clientOutProto = getFactory().getProtocol(clientOutTrans);
-    TMemoryBuffer clientInTrans = new TMemoryBuffer(0);
-    TProtocol clientInProto = getFactory().getProtocol(clientInTrans);
-
-    Srv.Client testClient = new Srv.Client(clientInProto, clientOutProto);
-
-    testClient.send_Janky(1);
-    // System.out.println(clientOutTrans.inspect());
-    testProcessor.process(clientOutProto, clientInProto);
-    // System.out.println(clientInTrans.inspect());
-    assertEquals(2, testClient.recv_Janky());
-  }
-
-  public void testTDeserializer() throws TException {
-    TSerializer ser = new TSerializer(getFactory());
-    byte[] bytes = ser.serialize(Fixtures.compactProtoTestStruct);
-
-    TDeserializer deser = new TDeserializer(getFactory());
-    CompactProtoTestStruct cpts = new CompactProtoTestStruct();
-    deser.deserialize(cpts, bytes);
-
-    assertEquals(Fixtures.compactProtoTestStruct, cpts);
-  }
-
-  //
-  // Helper methods
-  //
-
-  private void internalTestStructField(StructFieldTestCase testCase) throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    TProtocol proto = getFactory().getProtocol(buf);
-
-    TField field = new TField("test_field", testCase.type_, testCase.id_);
-    proto.writeStructBegin(new TStruct("test_struct"));
-    proto.writeFieldBegin(field);
-    testCase.writeMethod(proto);
-    proto.writeFieldEnd();
-    proto.writeStructEnd();
-
-    proto.readStructBegin();
-    TField readField = proto.readFieldBegin();
-    assertEquals(testCase.id_, readField.id);
-    assertEquals(testCase.type_, readField.type);
-    testCase.readMethod(proto);
-    proto.readStructEnd();
-  }
-
-  private static abstract class StructFieldTestCase {
-    byte type_;
-    short id_;
-    public StructFieldTestCase(byte type, short id) {
-      type_ = type;
-      id_ = id;
-    }
-
-    public abstract void writeMethod(TProtocol proto) throws TException;
-    public abstract void readMethod(TProtocol proto) throws TException;
-  }
-
-  private static final int NUM_TRIALS = 5;
-  private static final int NUM_REPS = 10000;
-
-  protected void benchmark() throws Exception {
-    for (int trial = 0; trial < NUM_TRIALS; trial++) {
-      TSerializer ser = new TSerializer(getFactory());
-      byte[] serialized = null;
-      long serStart = System.currentTimeMillis();
-      for (int rep = 0; rep < NUM_REPS; rep++) {
-        serialized = ser.serialize(Fixtures.holyMoley);
-      }
-      long serEnd = System.currentTimeMillis();
-      long serElapsed = serEnd - serStart;
-      System.out.println("Ser:\t" + serElapsed + "ms\t" 
-          + ((double)serElapsed / NUM_REPS) + "ms per serialization");
-
-      HolyMoley cpts = new HolyMoley();
-      TDeserializer deser = new TDeserializer(getFactory());
-      long deserStart = System.currentTimeMillis();
-      for (int rep = 0; rep < NUM_REPS; rep++) {
-        deser.deserialize(cpts, serialized);
-      }
-      long deserEnd = System.currentTimeMillis();
-      long deserElapsed = deserEnd - deserStart;
-      System.out.println("Des:\t" + deserElapsed + "ms\t" 
-          + ((double)deserElapsed / NUM_REPS) + "ms per deserialization");
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java
deleted file mode 100644
index b4c0888..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TException;
-
-import thrift.test.Bonk;
-
-public class TestTCompactProtocol extends ProtocolTestBase {
-  @Override
-  protected TProtocolFactory getFactory() {
-    return new TCompactProtocol.Factory();
-  }
-
-  @Override
-  protected boolean canBeUsedNaked() {
-    return true;
-  }
-
-  public void testOOMDenialOfService() throws Exception {
-    // Struct header, Integer.MAX_VALUE length, and only one real
-    // byte of data
-    byte [] bytes = {24, -1, -1, -1, -17, 49};
-    TDeserializer deser = new TDeserializer(new TCompactProtocol
-					    .Factory(1000));
-    Bonk bonk = new Bonk();
-    try {
-	deser.deserialize(bonk, bytes);
-    } catch (TException e) {
-	// Ignore as we are only checking for OOM in the failure case
-    }
-  }
-
-  public static void main(String args[]) throws Exception {
-    new TestTCompactProtocol().benchmark();
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTJSONProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTJSONProtocol.java
deleted file mode 100644
index 1320749..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTJSONProtocol.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.protocol;
-
-import java.io.IOException;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TJSONProtocol;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-public class TestTJSONProtocol extends ProtocolTestBase {
-  @Override
-  protected TProtocolFactory getFactory() {
-    return new TJSONProtocol.Factory();
-  }
-
-  @Override
-  protected boolean canBeUsedNaked() {
-    return false;
-  }
-
-  public void testEscapedUnicode() throws TException, IOException {
-    String jsonString = "\"hello unicode \\u0e01\\ud834\\udd1e world\"";
-    String expectedString = "hello unicode \u0e01\ud834\udd1e world";
-
-    TMemoryBuffer buffer = new TMemoryBuffer(1000);
-    TJSONProtocol protocol = new TJSONProtocol(buffer);
-    buffer.write(jsonString.getBytes("UTF-8"));
-
-    assertEquals(expectedString, protocol.readString());
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTProtocolUtil.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTProtocolUtil.java
deleted file mode 100644
index 199c707..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTProtocolUtil.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.protocol;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.Fixtures;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TException;
-import org.apache.thrift.TSerializer;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-import thrift.test.CompactProtoTestStruct;
-import thrift.test.HolyMoley;
-import thrift.test.Nesting;
-import thrift.test.OneOfEach;
-import thrift.test.Srv;
-import thrift.test.GuessProtocolStruct;
-
-public class TestTProtocolUtil extends TestCase {
-
-  public void testGuessProtocolFactory_JSON() throws Exception {
-
-    byte[] data = "{foo}".getBytes();
-    TProtocolFactory factory = TProtocolUtil.guessProtocolFactory(data, new TCompactProtocol.Factory());
-    assertTrue(factory instanceof TJSONProtocol.Factory);
-
-    // Make sure data serialized with TCompact and which starts with '{'
-    // is not mistakenly guessed as serialized with JSON.
-
-    GuessProtocolStruct s = new GuessProtocolStruct();
-    s.putToMap_field("}","}");
-    byte[] ser = new TSerializer(new TCompactProtocol.Factory()).serialize(s);
-    factory = TProtocolUtil.guessProtocolFactory(ser, new TCompactProtocol.Factory());
-    assertFalse(factory instanceof TJSONProtocol.Factory);
-  }
-
-  public void testGuessProtocolFactory_Binary() throws Exception {
-    // Check that a last byte != 0 is correctly reported as Binary
-
-    byte[] buf = new byte[1];
-    for (int i = 1; i < 256; i++) {
-      buf[0] = (byte) i;
-      TProtocolFactory factory = TProtocolUtil.guessProtocolFactory(buf, new TCompactProtocol.Factory());
-      assertTrue(factory instanceof TBinaryProtocol.Factory);
-    }
-
-    // Check that a second byte set to 0 is reported as Binary
-    buf = new byte[2];
-    TProtocolFactory factory = TProtocolUtil.guessProtocolFactory(buf, new TCompactProtocol.Factory());
-    assertTrue(factory instanceof TBinaryProtocol.Factory);
-  }
-
-  public void testGuessProtocolFactory_Compact() throws Exception {
-    // Check that a first byte > 0x10 is reported as Compact
-    byte[] buf = new byte[3];
-    buf[0] = 0x11; 
-    TProtocolFactory factory = TProtocolUtil.guessProtocolFactory(buf, new TBinaryProtocol.Factory());
-    assertTrue(factory instanceof TCompactProtocol.Factory);
-
-    // Check that second byte >= 0x80 is reported as Compact
-    buf[0] = 0;
-    for (int i = 0x80; i < 0x100; i++) {
-      buf[1] = (byte) i;
-      factory = TProtocolUtil.guessProtocolFactory(buf, new TBinaryProtocol.Factory());
-      assertTrue(factory instanceof TCompactProtocol.Factory);
-    }
-  }
-
-  public void testGuessProtocolFactory_Undecided() throws Exception {
-    byte[] buf = new byte[3];
-    buf[1] = 0x7e;
-    TProtocolFactory factory = TProtocolUtil.guessProtocolFactory(buf, new TSimpleJSONProtocol.Factory());
-    assertTrue(factory instanceof TSimpleJSONProtocol.Factory);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTSimpleJSONProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTSimpleJSONProtocol.java
deleted file mode 100644
index 0b9c732..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTSimpleJSONProtocol.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.protocol;
-
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.Fixtures;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-import thrift.test.CompactProtoTestStruct;
-import thrift.test.HolyMoley;
-
-public class TestTSimpleJSONProtocol extends TestCase {
-  private TMemoryBuffer buf;
-  private TSimpleJSONProtocol proto;
-
-  @Override
-  protected void setUp() throws Exception {
-    buf = new TMemoryBuffer(1000);
-    proto = new TSimpleJSONProtocol(buf);
-  }
-
-  private String bufToString() {
-    try {
-      return buf.toString("UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public void testHolyMoley() throws TException {
-    final HolyMoley holyMoley = Fixtures.holyMoley.deepCopy();
-    // unset sets that produce inconsistent ordering between JDK7/8
-    holyMoley.unsetBonks();
-    holyMoley.unsetContain();
-    holyMoley.write(proto);
-    assertEquals("{\"big\":[{\"im_true\":1,\"im_false\":0,\"a_bite\":35,\"integer16\":27000,\"integer32\":16777216,\"integer64\":6000000000,\"double_precision\":3.141592653589793,\"some_characters\":\"JSON THIS! \\\"\\u0001\",\"zomg_unicode\":\"ӀⅮΝ Нοⅿоɡгаρℎ Αttαⅽκ�‼\",\"what_who\":0,\"base64\":\"base64\",\"byte_list\":[1,2,3],\"i16_list\":[1,2,3],\"i64_list\":[1,2,3]},{\"im_true\":1,\"im_false\":0,\"a_bite\":-42,\"integer16\":27000,\"integer32\":16777216,\"integer64\":6000000000,\"double_precision\":3.141592653589793,\"some_characters\":\"JSON THIS! \\\"\\u0001\",\"zomg_unicode\":\"ӀⅮΝ Нοⅿоɡгаρℎ Αttαⅽκ�‼\",\"what_who\":0,\"base64\":\"base64\",\"byte_list\":[1,2,3],\"i16_list\":[1,2,3],\"i64_list\":[1,2,3]}]}", bufToString());
-  }
-
-  public void testNesting() throws TException {
-    Fixtures.nesting.write(proto);
-    assertEquals("{\"my_bonk\":{\"type\":31337,\"message\":\"I am a bonk... xor!\"},\"my_ooe\":{\"im_true\":1,\"im_false\":0,\"a_bite\":-42,\"integer16\":27000,\"integer32\":16777216,\"integer64\":6000000000,\"double_precision\":3.141592653589793,\"some_characters\":\"JSON THIS! \\\"\\u0001\",\"zomg_unicode\":\"ӀⅮΝ Нοⅿоɡгаρℎ Αttαⅽκ�‼\",\"what_who\":0,\"base64\":\"base64\",\"byte_list\":[1,2,3],\"i16_list\":[1,2,3],\"i64_list\":[1,2,3]}}", bufToString());
-  }
-
-  public void testOneOfEach() throws TException {
-    Fixtures.oneOfEach.write(proto);
-    assertEquals("{\"im_true\":1,\"im_false\":0,\"a_bite\":-42,\"integer16\":27000,\"integer32\":16777216,\"integer64\":6000000000,\"double_precision\":3.141592653589793,\"some_characters\":\"JSON THIS! \\\"\\u0001\",\"zomg_unicode\":\"ӀⅮΝ Нοⅿоɡгаρℎ Αttαⅽκ�‼\",\"what_who\":0,\"base64\":\"base64\",\"byte_list\":[1,2,3],\"i16_list\":[1,2,3],\"i64_list\":[1,2,3]}", bufToString());
-  }
-
-  public void testSanePartsOfCompactProtoTestStruct() throws TException {
-    // unset all the maps with container keys
-    CompactProtoTestStruct struct = Fixtures.compactProtoTestStruct.deepCopy();
-    struct.unsetList_byte_map();
-    struct.unsetSet_byte_map();
-    struct.unsetMap_byte_map();
-    // unset sets and maps that produce inconsistent ordering between JDK7/8
-    struct.unsetByte_set();
-    struct.unsetI16_set();
-    struct.unsetI64_set();
-    struct.unsetDouble_set();
-    struct.unsetString_set();
-    struct.unsetI16_byte_map();
-    struct.unsetI32_byte_map();
-    struct.unsetI64_byte_map();
-    struct.unsetDouble_byte_map();
-    struct.unsetString_byte_map();
-    struct.write(proto);
-    assertEquals("{\"a_byte\":127,\"a_i16\":32000,\"a_i32\":1000000000,\"a_i64\":1099511627775,\"a_double\":5.6789,\"a_string\":\"my string\",\"a_binary\":\"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\",\"true_field\":1,\"false_field\":0,\"empty_struct_field\":{},\"byte_list\":[-127,-1,0,1,127],\"i16_list\":[-1,0,1,32767],\"i32_list\":[-1,0,255,65535,16777215,2147483647],\"i64_list\":[-1,0,255,65535,16777215,4294967295,1099511627775,281474976710655,72057594037927935,9223372036854775807],\"double_list\":[0.1,0.2,0.3],\"string_list\":[\"first\",\"second\",\"third\"],\"boolean_list\":[1,1,1,0,0,0],\"struct_list\":[{},{}],\"i32_set\":[1,2,3],\"boolean_set\":[0,1],\"struct_set\":[{}],\"byte_byte_map\":{\"1\":2},\"boolean_byte_map\":{\"0\":0,\"1\":1},\"byte_i16_map\":{\"1\":1,\"2\":-1,\"3\":32767},\"byte_i32_map\":{\"1\":1,\"2\":-1,\"3\":2147483647},\"byte_i64_map\":{\"1\":1,\"2\":-1,\"3\":9223372036854775807},\"byte_double_map\":{\"1\":0.1,\"2\":-0.1,\"3\":1000000.0},\"byte_string_map\":{\"1\":\"\",\"2\":\"blah\",\"3\":\"loooooooooooooong string\"},\"byte_boolean_map\":{\"1\":1,\"2\":0},\"byte_map_map\":{\"0\":{},\"1\":{\"1\":1},\"2\":{\"1\":1,\"2\":2}},\"byte_set_map\":{\"0\":[],\"1\":[1],\"2\":[1,2]},\"byte_list_map\":{\"0\":[],\"1\":[1],\"2\":[1,2]}}", bufToString());
-  }
-
-  public void testThrowsOnCollectionKeys() throws TException {
-    try {
-      Fixtures.compactProtoTestStruct.write(proto);
-      fail("this should throw a CollectionMapKeyException");
-    } catch (TSimpleJSONProtocol.CollectionMapKeyException e) {
-      //
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTTupleProtocol.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTTupleProtocol.java
deleted file mode 100644
index b654db3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/protocol/TestTTupleProtocol.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TSerializer;
-
-import thrift.test.TupleProtocolTestStruct;
-
-
-public class TestTTupleProtocol extends ProtocolTestBase {
-
-  @Override
-  protected boolean canBeUsedNaked() {
-    return false;
-  }
-
-  @Override
-  protected TProtocolFactory getFactory() {
-    return new TTupleProtocol.Factory();
-  }
-
-  public void testBitsetLengthIssue() throws Exception {
-    final TupleProtocolTestStruct t1 = new TupleProtocolTestStruct();
-    t1.setField1(0);
-    t1.setField2(12);
-    new TDeserializer(new TTupleProtocol.Factory()).deserialize(new TupleProtocolTestStruct(), new TSerializer(new TTupleProtocol.Factory()).serialize(t1));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/scheme/TestStandardScheme.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/scheme/TestStandardScheme.java
deleted file mode 100644
index 33f229e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/scheme/TestStandardScheme.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.thrift.scheme;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.Fixtures;
-import org.apache.thrift.TBase;
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TException;
-import org.apache.thrift.TSerializer;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TMemoryBuffer;
-import org.apache.thrift.transport.TTransport;
-
-import thrift.test.HolyMoley;
-import thrift.test.Nesting;
-import thrift.test.OneOfEach;
-
-public class TestStandardScheme extends TestCase {
-  TSerializer serializer = new TSerializer();
-  TDeserializer deserializer = new TDeserializer();
-
-  /**
-   * This tests whether the Standard Scheme properly reads structs serialized
-   * using an older version of thrift.
-   */
-  public void testPersistentStructs() throws TException {
-    readAndCompare(new OneOfEach(), Fixtures.oneOfEach, Fixtures.persistentBytesOneOfEach);
-    readAndCompare(new HolyMoley(), Fixtures.holyMoley, Fixtures.persistentBytesHolyMoley);
-    readAndCompare(new Nesting(), Fixtures.nesting, Fixtures.persistentBytesNesting);
-  }
-
-  public void readAndCompare(TBase struct, TBase fixture, byte[] inputBytes) throws TException {
-    TTransport trans = new TMemoryBuffer(0);
-    trans.write(inputBytes, 0, inputBytes.length);
-    TProtocol iprot = new TBinaryProtocol(trans);
-    struct.read(iprot);
-    assertEquals(fixture, struct);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/ServerTestBase.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/ServerTestBase.java
deleted file mode 100644
index c2d2952..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/ServerTestBase.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.server;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import java.nio.ByteBuffer;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TCompactProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportFactory;
-import org.apache.thrift.transport.TFramedTransport.Factory;
-
-import thrift.test.Insanity;
-import thrift.test.Numberz;
-import thrift.test.ThriftTest;
-import thrift.test.Xception;
-import thrift.test.Xception2;
-import thrift.test.Xtruct;
-import thrift.test.Xtruct2;
-
-public abstract class ServerTestBase extends TestCase {
-
-  public static class TestHandler implements ThriftTest.Iface {
-  
-    public TestHandler() {}
-  
-    public void testVoid() {
-      System.out.print("testVoid()\n");
-    }
-  
-    public String testString(String thing) {
-      System.out.print("testString(\"" + thing + "\")\n");
-      return thing;
-    }
-
-    public boolean testBool(boolean thing) {
-      System.out.print("testBool(" + thing + ")\n");
-      return thing;
-    }
-  
-    public byte testByte(byte thing) {
-      System.out.print("testByte(" + thing + ")\n");
-      return thing;
-    }
-  
-    public int testI32(int thing) {
-      System.out.print("testI32(" + thing + ")\n");
-      return thing;
-    }
-  
-    public long testI64(long thing) {
-      System.out.print("testI64(" + thing + ")\n");
-      return thing;
-    }
-  
-    public double testDouble(double thing) {
-      System.out.print("testDouble(" + thing + ")\n");
-      return thing;
-    }
-
-    public ByteBuffer testBinary(ByteBuffer thing) {
-      StringBuilder sb = new StringBuilder(thing.remaining() * 3);
-      thing.mark();
-      while (thing.remaining() > 0) {
-        sb.append(String.format("%02X ", thing.get()));
-      }
-      System.out.print("testBinary(" + sb.toString() + ")\n");
-      thing.reset();
-      return thing;
-    }
-
-    public Xtruct testStruct(Xtruct thing) {
-      System.out.print("testStruct({" +
-                       "\"" + thing.string_thing + "\", " +
-                       thing.byte_thing + ", " +
-                       thing.i32_thing + ", " +
-                       thing.i64_thing + "})\n");
-      return thing;
-    }
-  
-    public Xtruct2 testNest(Xtruct2 nest) {
-      Xtruct thing = nest.struct_thing;
-      System.out.print("testNest({" +
-                       nest.byte_thing + ", {" +
-                       "\"" + thing.string_thing + "\", " +
-                       thing.byte_thing + ", " +
-                       thing.i32_thing + ", " +
-                       thing.i64_thing + "}, " +
-                       nest.i32_thing + "})\n");
-      return nest;
-    }
-  
-    public Map<Integer,Integer> testMap(Map<Integer,Integer> thing) {
-      System.out.print("testMap({");
-      System.out.print(thing);
-      System.out.print("})\n");
-      return thing;
-    }
-
-    public Map<String,String> testStringMap(Map<String,String> thing) {
-      System.out.print("testStringMap({");
-      System.out.print(thing);
-      System.out.print("})\n");
-      return thing;
-    }
-  
-    public Set<Integer> testSet(Set<Integer> thing) {
-      System.out.print("testSet({");
-      boolean first = true;
-      for (int elem : thing) {
-        if (first) {
-          first = false;
-        } else {
-          System.out.print(", ");
-        }
-        System.out.print(elem);
-      }
-      System.out.print("})\n");
-      return thing;
-    }
-  
-    public List<Integer> testList(List<Integer> thing) {
-      System.out.print("testList({");
-      boolean first = true;
-      for (int elem : thing) {
-        if (first) {
-          first = false;
-        } else {
-          System.out.print(", ");
-        }
-        System.out.print(elem);
-      }
-      System.out.print("})\n");
-      return thing;
-    }
-  
-    public Numberz testEnum(Numberz thing) {
-      System.out.print("testEnum(" + thing + ")\n");
-      return thing;
-    }
-  
-    public long testTypedef(long thing) {
-      System.out.print("testTypedef(" + thing + ")\n");
-      return thing;
-    }
-  
-    public Map<Integer,Map<Integer,Integer>> testMapMap(int hello) {
-      System.out.print("testMapMap(" + hello + ")\n");
-      Map<Integer,Map<Integer,Integer>> mapmap =
-        new HashMap<Integer,Map<Integer,Integer>>();
-  
-      HashMap<Integer,Integer> pos = new HashMap<Integer,Integer>();
-      HashMap<Integer,Integer> neg = new HashMap<Integer,Integer>();
-      for (int i = 1; i < 5; i++) {
-        pos.put(i, i);
-        neg.put(-i, -i);
-      }
-  
-      mapmap.put(4, pos);
-      mapmap.put(-4, neg);
-  
-      return mapmap;
-    }
-  
-    public Map<Long, Map<Numberz,Insanity>> testInsanity(Insanity argument) {
-      System.out.print("testInsanity()\n");
-  
-      HashMap<Numberz,Insanity> first_map = new HashMap<Numberz, Insanity>();
-      HashMap<Numberz,Insanity> second_map = new HashMap<Numberz, Insanity>();;
-  
-      first_map.put(Numberz.TWO, argument);
-      first_map.put(Numberz.THREE, argument);
-  
-      Insanity looney = new Insanity();
-      second_map.put(Numberz.SIX, looney);
-  
-      Map<Long,Map<Numberz,Insanity>> insane =
-        new HashMap<Long, Map<Numberz,Insanity>>();
-      insane.put((long)1, first_map);
-      insane.put((long)2, second_map);
-  
-      return insane;
-    }
-  
-    public Xtruct testMulti(byte arg0, int arg1, long arg2, Map<Short,String> arg3, Numberz arg4, long arg5) {
-      System.out.print("testMulti()\n");
-  
-      Xtruct hello = new Xtruct();;
-      hello.string_thing = "Hello2";
-      hello.byte_thing = arg0;
-      hello.i32_thing = arg1;
-      hello.i64_thing = arg2;
-      return hello;
-    }
-  
-    public void testException(String arg) throws Xception, TException {
-      System.out.print("testException("+arg+")\n");
-      if ("Xception".equals(arg)) {
-        Xception x = new Xception();
-        x.errorCode = 1001;
-        x.message = arg;
-        throw x;
-      } else if ("TException".equals(arg)) {
-        throw new TException(arg);
-      } else {
-        Xtruct result = new Xtruct();
-        result.string_thing = arg;
-      }
-      return;
-    }
-  
-    public Xtruct testMultiException(String arg0, String arg1) throws Xception, Xception2 {
-      System.out.print("testMultiException(" + arg0 + ", " + arg1 + ")\n");
-      if (arg0.equals("Xception")) {
-        Xception x = new Xception();
-        x.errorCode = 1001;
-        x.message = "This is an Xception";
-        throw x;
-      } else if (arg0.equals("Xception2")) {
-        Xception2 x = new Xception2();
-        x.errorCode = 2002;
-        x.struct_thing = new Xtruct();
-        x.struct_thing.string_thing = "This is an Xception2";
-        throw x;
-      }
-  
-      Xtruct result = new Xtruct();
-      result.string_thing = arg1;
-      return result;
-    }
-  
-    public void testOneway(int sleepFor) {
-      System.out.println("testOneway(" + Integer.toString(sleepFor) +
-                         ") => sleeping...");
-      try {
-        Thread.sleep(sleepFor * 1000);
-        System.out.println("Done sleeping!");
-      } catch (InterruptedException ie) {
-        throw new RuntimeException(ie);
-      }
-    }
-  } // class TestHandler
-
-  private static final List<TProtocolFactory> PROTOCOLS = Arrays.asList(
-      new TBinaryProtocol.Factory(),
-      new TCompactProtocol.Factory());
-
-  public static final String HOST = "localhost";
-  public static final int PORT = Integer.valueOf(
-    System.getProperty("test.port", "9090"));
-  protected static final int SOCKET_TIMEOUT = 1500;
-  private static final Xtruct XSTRUCT = new Xtruct("Zero", (byte) 1, -3, -5);
-  private static final Xtruct2 XSTRUCT2 = new Xtruct2((byte)1, XSTRUCT, 5);
-
-  public void startServer(TProcessor processor, TProtocolFactory protoFactory) throws Exception{
-    startServer(processor, protoFactory, null);
-  }
-
-  public abstract void startServer(TProcessor processor, TProtocolFactory protoFactory, TTransportFactory factory) throws Exception;
-
-  public abstract void stopServer() throws Exception;
-
-  public abstract TTransport getClientTransport(TTransport underlyingTransport) throws Exception;
-
-  private void testBool(ThriftTest.Client testClient) throws TException {
-    boolean t = testClient.testBool(true);
-    assertEquals(true, t);
-    boolean f = testClient.testBool(false);
-    assertEquals(false, f);
-  }
-
-  private void testByte(ThriftTest.Client testClient) throws TException {
-    byte i8 = testClient.testByte((byte)1);
-    assertEquals(1, i8);
-  }
-
-  private void testDouble(ThriftTest.Client testClient) throws TException {
-    double dub = testClient.testDouble(5.325098235);
-    assertEquals(5.325098235, dub);
-  }
-
-  private void testEnum(ThriftTest.Client testClient) throws TException {
-    assertEquals(Numberz.ONE, testClient.testEnum(Numberz.ONE));
-    assertEquals(Numberz.TWO, testClient.testEnum(Numberz.TWO));
-    assertEquals(Numberz.THREE, testClient.testEnum(Numberz.THREE));
-    assertEquals(Numberz.FIVE, testClient.testEnum(Numberz.FIVE));
-    assertEquals(Numberz.EIGHT, testClient.testEnum(Numberz.EIGHT));
-  }
-
-  private void testI32(ThriftTest.Client testClient) throws TException {
-    int i32 = testClient.testI32(-1);
-    assertEquals(i32, -1);
-  }
-
-  private void testI64(ThriftTest.Client testClient) throws TException {
-    long i64 = testClient.testI64(-34359738368L);
-    assertEquals(i64, -34359738368L);
-  }
-
-  // todo: add assertions
-  private void testInsanity(ThriftTest.Client testClient) throws TException {
-    Insanity insane;
-  
-    insane = new Insanity();
-    insane.userMap = new HashMap<Numberz, Long>();
-    insane.userMap.put(Numberz.FIVE, (long)5000);
-    Xtruct truck = new Xtruct();
-    truck.string_thing = "Truck";
-    truck.byte_thing = (byte)8;
-    truck.i32_thing = 8;
-    truck.i64_thing = 8;
-    insane.xtructs = new ArrayList<Xtruct>();
-    insane.xtructs.add(truck);
-    System.out.print("testInsanity()");
-    Map<Long,Map<Numberz,Insanity>> whoa =
-      testClient.testInsanity(insane);
-    System.out.print(" = {");
-    for (long key : whoa.keySet()) {
-      Map<Numberz,Insanity> val = whoa.get(key);
-      System.out.print(key + " => {");
-  
-      for (Numberz k2 : val.keySet()) {
-        Insanity v2 = val.get(k2);
-        System.out.print(k2 + " => {");
-        Map<Numberz, Long> userMap = v2.userMap;
-        System.out.print("{");
-        if (userMap != null) {
-          for (Numberz k3 : userMap.keySet()) {
-            System.out.print(k3 + " => " + userMap.get(k3) + ", ");
-          }
-        }
-        System.out.print("}, ");
-  
-        List<Xtruct> xtructs = v2.xtructs;
-        System.out.print("{");
-        if (xtructs != null) {
-          for (Xtruct x : xtructs) {
-            System.out.print("{" + "\"" + x.string_thing + "\", " + x.byte_thing + ", " + x.i32_thing + ", "+ x.i64_thing + "}, ");
-          }
-        }
-        System.out.print("}");
-  
-        System.out.print("}, ");
-      }
-      System.out.print("}, ");
-    }
-    System.out.print("}\n");
-  }
-
-  public boolean useAsyncProcessor() {
-      return false;
-  }
-
-  public void testIt() throws Exception {
-
-    for (TProtocolFactory protoFactory : getProtocols()) {
-      TProcessor processor = useAsyncProcessor() ? new ThriftTest.AsyncProcessor(new AsyncTestHandler()) : new ThriftTest.Processor(new TestHandler());
-
-      startServer(processor, protoFactory);
-
-      TSocket socket = new TSocket(HOST, PORT);
-      socket.setTimeout(SOCKET_TIMEOUT);
-      TTransport transport = getClientTransport(socket);
-
-      TProtocol protocol = protoFactory.getProtocol(transport);
-      ThriftTest.Client testClient = new ThriftTest.Client(protocol);
-
-      open(transport);
-      testVoid(testClient);
-      testString(testClient);
-      testBool(testClient);
-      testByte(testClient);
-      testI32(testClient);
-      testI64(testClient);
-      testDouble(testClient);
-      testStruct(testClient);
-      testNestedStruct(testClient);
-      testMap(testClient);
-      testStringMap(testClient);
-      testSet(testClient);
-      testList(testClient);
-      testEnum(testClient);
-      testTypedef(testClient);
-      testNestedMap(testClient);
-      testInsanity(testClient);
-      testException(testClient);
-      testOneway(testClient);
-      testI32(testClient);
-      transport.close();
-
-      stopServer();
-    }
-  }
-
-  public void open(TTransport transport) throws Exception {
-    transport.open();
-  }
-
-  public List<TProtocolFactory> getProtocols() {
-    return PROTOCOLS;  
-  }
-
-  private void testList(ThriftTest.Client testClient) throws TException {
-    List<Integer> listout = new ArrayList<Integer>();
-    for (int i = -2; i < 3; ++i) {
-      listout.add(i);
-    }
-    List<Integer> listin = testClient.testList(listout);
-    assertEquals(listout, listin);
-  }
-
-  private void testMap(ThriftTest.Client testClient) throws TException {
-    Map<Integer,Integer> mapout = new HashMap<Integer,Integer>();
-    for (int i = 0; i < 5; ++i) {
-      mapout.put(i, i-10);
-    }
-    Map<Integer,Integer> mapin = testClient.testMap(mapout);
-    assertEquals(mapout, mapin);
-  }
-
-  private void testStringMap(ThriftTest.Client testClient) throws TException {
-    Map<String,String> mapout = new HashMap<String,String>();
-    mapout.put("a", "123");
-    mapout.put(" x y ", " with spaces ");
-    mapout.put("same", "same");
-    mapout.put("0", "numeric key");
-    Map<String,String> mapin = testClient.testStringMap(mapout);
-    assertEquals(mapout, mapin);
-  }
-
-  private void testNestedMap(ThriftTest.Client testClient) throws TException {
-    Map<Integer,Map<Integer,Integer>> mm =
-      testClient.testMapMap(1);
-    Map<Integer,Map<Integer,Integer>> mapmap =
-      new HashMap<Integer,Map<Integer,Integer>>();
-  
-    HashMap<Integer,Integer> pos = new HashMap<Integer,Integer>();
-    HashMap<Integer,Integer> neg = new HashMap<Integer,Integer>();
-    for (int i = 1; i < 5; i++) {
-      pos.put(i, i);
-      neg.put(-i, -i);
-    }
-  
-    mapmap.put(4, pos);
-    mapmap.put(-4, neg);
-    assertEquals(mapmap, mm);
-  }
-
-  private void testNestedStruct(ThriftTest.Client testClient) throws TException {
-    Xtruct2 in2 = testClient.testNest(XSTRUCT2);
-    assertEquals(XSTRUCT2, in2);
-  }
-
-  private void testOneway(ThriftTest.Client testClient) throws Exception {
-    long begin = System.currentTimeMillis();
-    testClient.testOneway(1);
-    long elapsed = System.currentTimeMillis() - begin;
-    assertTrue(elapsed < 500);
-  }
-
-  private void testSet(ThriftTest.Client testClient) throws TException {
-    Set<Integer> setout = new HashSet<Integer>();
-    for (int i = -2; i < 3; ++i) {
-      setout.add(i);
-    }
-    Set<Integer> setin = testClient.testSet(setout);
-    assertEquals(setout, setin);
-  }
-
-  private void testString(ThriftTest.Client testClient) throws TException {
-    String s = testClient.testString("Test");
-    assertEquals("Test", s);
-  }
-
-  private void testStruct(ThriftTest.Client testClient) throws TException {
-    assertEquals(XSTRUCT, testClient.testStruct(XSTRUCT));
-  }
-
-  private void testTypedef(ThriftTest.Client testClient) throws TException {
-    assertEquals(309858235082523L, testClient.testTypedef(309858235082523L));
-  }
-
-  private void testVoid(ThriftTest.Client testClient) throws TException {
-    testClient.testVoid();
-  }
-
-  private static class CallCountingTransportFactory extends TTransportFactory {
-    public int count = 0;
-    private final Factory factory;
-
-    public CallCountingTransportFactory(Factory factory) {
-      this.factory = factory;
-    }
-
-    @Override
-    public TTransport getTransport(TTransport trans) {
-      count++;
-      return factory.getTransport(trans);
-    }
-  }
-
-  public void testTransportFactory() throws Exception {
-    for (TProtocolFactory protoFactory : getProtocols()) {
-      TestHandler handler = new TestHandler();
-      ThriftTest.Processor processor = new ThriftTest.Processor(handler);
-
-      final CallCountingTransportFactory factory = new CallCountingTransportFactory(new TFramedTransport.Factory());
-
-      startServer(processor, protoFactory, factory);
-      assertEquals(0, factory.count);
-
-      TSocket socket = new TSocket(HOST, PORT);
-      socket.setTimeout(SOCKET_TIMEOUT);
-      TTransport transport = getClientTransport(socket);
-      open(transport);
-
-      TProtocol protocol = protoFactory.getProtocol(transport);
-      ThriftTest.Client testClient = new ThriftTest.Client(protocol);
-      assertEquals(0, testClient.testByte((byte) 0));
-      assertEquals(2, factory.count);
-      stopServer();
-    }
-  }
-
-  private void testException(ThriftTest.Client testClient) throws TException, Xception {
-    try {
-      testClient.testException("Xception");
-      assert false;
-    } catch(Xception e) {
-      assertEquals(e.message, "Xception");
-      assertEquals(e.errorCode, 1001);
-    }
-    try {
-      testClient.testException("TException");
-      assert false;
-    } catch(TException e) {
-    }
-    testClient.testException("no Exception");
-  }
-
-
-  public static class AsyncTestHandler implements ThriftTest.AsyncIface {
-
-    TestHandler handler = new TestHandler();
-
-    @Override
-    public void testVoid(AsyncMethodCallback<Void> resultHandler) throws TException {
-      resultHandler.onComplete(null);
-    }
-
-    @Override
-    public void testString(String thing, AsyncMethodCallback<String> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testString(thing));
-    }
-
-    @Override
-    public void testBool(boolean thing, AsyncMethodCallback<Boolean> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testBool(thing));
-    }
-
-    @Override
-    public void testByte(byte thing, AsyncMethodCallback<Byte> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testByte(thing));
-    }
-
-    @Override
-    public void testI32(int thing, AsyncMethodCallback<Integer> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testI32(thing));
-    }
-
-    @Override
-    public void testI64(long thing, AsyncMethodCallback<Long> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testI64(thing));
-    }
-
-    @Override
-    public void testDouble(double thing, AsyncMethodCallback<Double> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testDouble(thing));
-    }
-
-    @Override
-    public void testBinary(ByteBuffer thing, AsyncMethodCallback<ByteBuffer> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testBinary(thing));
-    }
-
-    @Override
-    public void testStruct(Xtruct thing, AsyncMethodCallback<Xtruct> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testStruct(thing));
-    }
-
-    @Override
-    public void testNest(Xtruct2 thing, AsyncMethodCallback<Xtruct2> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testNest(thing));
-    }
-
-    @Override
-    public void testMap(Map<Integer, Integer> thing, AsyncMethodCallback<Map<Integer, Integer>> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testMap(thing));
-    }
-
-    @Override
-    public void testStringMap(Map<String, String> thing, AsyncMethodCallback<Map<String, String>> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testStringMap(thing));
-    }
-
-    @Override
-    public void testSet(Set<Integer> thing, AsyncMethodCallback<Set<Integer>> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testSet(thing));
-    }
-
-    @Override
-    public void testList(List<Integer> thing, AsyncMethodCallback<List<Integer>> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testList(thing));
-    }
-
-    @Override
-    public void testEnum(Numberz thing, AsyncMethodCallback<Numberz> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testEnum(thing));
-    }
-
-    @Override
-    public void testTypedef(long thing, AsyncMethodCallback<Long> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testTypedef(thing));
-    }
-
-    @Override
-    public void testMapMap(int hello, AsyncMethodCallback<Map<Integer,Map<Integer,Integer>>> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testMapMap(hello));
-    }
-
-    @Override
-    public void testInsanity(Insanity argument, AsyncMethodCallback<Map<Long, Map<Numberz,Insanity>>> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testInsanity(argument));
-    }
-
-    @Override
-    public void testMulti(byte arg0, int arg1, long arg2, Map<Short, String> arg3, Numberz arg4, long arg5, AsyncMethodCallback<Xtruct> resultHandler) throws TException {
-      resultHandler.onComplete(handler.testMulti(arg0,arg1,arg2,arg3,arg4,arg5));
-    }
-
-    @Override
-    public void testException(String arg, AsyncMethodCallback<Void> resultHandler) throws TException {
-      System.out.print("testException("+arg+")\n");
-      if ("Xception".equals(arg)) {
-        Xception x = new Xception();
-        x.errorCode = 1001;
-        x.message = arg;
-        // throw and onError yield the same result.
-        // resultHandler.onError(x);
-        // return;
-        throw x;
-      } else if ("TException".equals(arg)) {
-        // throw new TException(arg);
-        resultHandler.onError(new TException(arg));
-        return;
-      }
-      resultHandler.onComplete(null);
-    }
-
-    @Override
-    public void testMultiException(String arg0, String arg1, AsyncMethodCallback<Xtruct> resultHandler) throws TException {
-      //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public void testOneway(int secondsToSleep, AsyncMethodCallback<Void> resultHandler) throws TException {
-      handler.testOneway(secondsToSleep);
-      resultHandler.onComplete(null);
-    }
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestAsyncServer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestAsyncServer.java
deleted file mode 100644
index 29c54cb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestAsyncServer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.server;
-
-public class TestAsyncServer extends TestNonblockingServer {
-
-   @Override
-   public boolean useAsyncProcessor(){
-       return true;
-   }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestHsHaServer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestHsHaServer.java
deleted file mode 100644
index 6638a33..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestHsHaServer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.server;
-
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.THsHaServer.Args;
-import org.apache.thrift.transport.TNonblockingServerSocket;
-
-public class TestHsHaServer extends TestNonblockingServer {
-  protected TServer getServer(TProcessor processor, TNonblockingServerSocket socket, TProtocolFactory protoFactory) {
-    return new THsHaServer(new Args(socket).processor(processor).protocolFactory(protoFactory));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java
deleted file mode 100644
index 3df3bd8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.server;
-
-
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.TNonblockingServer.Args;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TNonblockingServerSocket;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TTransportFactory;
-
-import thrift.test.ThriftTest;
-
-public class TestNonblockingServer extends ServerTestBase {
-
-  private Thread serverThread;
-  private TServer server;
-  private static final int NUM_QUERIES = 1000;
-
-  protected TServer getServer(TProcessor processor, TNonblockingServerSocket socket, TProtocolFactory protoFactory, TTransportFactory factory) {
-    final Args args = new Args(socket).processor(processor).protocolFactory(protoFactory);
-    if (factory != null) {
-      args.transportFactory(factory);
-    }
-    return new TNonblockingServer(args);
-  }
-
-  @Override
-  public void startServer(final TProcessor processor, final TProtocolFactory protoFactory, final TTransportFactory factory) throws Exception {
-    serverThread = new Thread() {
-      public void run() {
-        try {
-          // Transport
-          TNonblockingServerSocket tServerSocket =
-            new TNonblockingServerSocket(new TNonblockingServerSocket.NonblockingAbstractServerSocketArgs().port(PORT));
-
-          server = getServer(processor, tServerSocket, protoFactory, factory);
-
-          // Run it
-          System.out.println("Starting the server on port " + PORT + "...");
-          server.serve();
-        } catch (Exception e) {
-          e.printStackTrace();
-          fail();
-        }
-      }
-    };
-    serverThread.start();
-    Thread.sleep(1000);
-  }
-
-  @Override
-  public void stopServer() throws Exception {
-    server.stop();
-    try {
-      serverThread.join();
-    } catch (InterruptedException e) {}
-  }
-
-  @Override
-  public TTransport getClientTransport(TTransport underlyingTransport) throws Exception {
-    return new TFramedTransport(underlyingTransport);
-  }
-
-
-  public void testCleanupAllSelectionKeys() throws Exception {
-    for (TProtocolFactory protoFactory : getProtocols()) {
-      TestHandler handler = new TestHandler();
-      ThriftTest.Processor processor = new ThriftTest.Processor(handler);
-
-      startServer(processor, protoFactory);
-
-      TSocket socket = new TSocket(HOST, PORT);
-      socket.setTimeout(SOCKET_TIMEOUT);
-      TTransport transport = getClientTransport(socket);
-
-      TProtocol protocol = protoFactory.getProtocol(transport);
-      ThriftTest.Client testClient = new ThriftTest.Client(protocol);
-
-      open(transport);
-
-      for (int i = 0; i < NUM_QUERIES; ++i) {
-        testClient.testI32(1);
-      }
-      server.stop();
-      for (int i = 0; i < NUM_QUERIES; ++i) {
-        try {
-          testClient.testI32(1);
-        } catch(TTransportException e) {
-          System.err.println(e);
-          e.printStackTrace();
-          if (e.getCause() instanceof java.net.SocketTimeoutException) {
-            fail("timed out when it should have thrown another kind of error!");
-          }
-        }
-      }
-
-      transport.close();
-      stopServer();
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestThreadedSelectorServer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestThreadedSelectorServer.java
deleted file mode 100644
index ed729a2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/server/TestThreadedSelectorServer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.server;
-
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.TThreadedSelectorServer.Args;
-import org.apache.thrift.transport.TNonblockingServerSocket;
-
-public class TestThreadedSelectorServer extends TestNonblockingServer {
-  protected TServer getServer(TProcessor processor, TNonblockingServerSocket socket, TProtocolFactory protoFactory) {
-    return new TThreadedSelectorServer(new Args(socket).processor(processor).protocolFactory(protoFactory));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/EqualityTest.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/EqualityTest.java
deleted file mode 100644
index 94ba543..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/EqualityTest.java
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
-This program was generated by the following Python script:
-
-#!/usr/bin/python2.5
-
-# Remove this when Python 2.6 hits the streets.
-from __future__ import with_statement
-
-import sys
-import os.path
-
-
-# Quines the easy way.
-with open(sys.argv[0], 'r') as handle:
-  source = handle.read()
-
-with open(os.path.join(os.path.dirname(sys.argv[0]), 'EqualityTest.java'), 'w') as out:
-  print >> out, ("/""*" r"""
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- """ "*""/")
-  print >> out
-  print >> out, "/""*"
-  print >> out, "This program was generated by the following Python script:"
-  print >> out
-  out.write(source)
-  print >> out, "*""/"
-
-  print >> out, r'''
-package org.apache.thrift.test;
-
-// Generated code
-import thrift.test.*;
-
-/'''r'''**
- *'''r'''/
-public class EqualityTest {
-  public static void main(String[] args) throws Exception {
-    JavaTestHelper lhs, rhs;
-'''
-
-  vals = {
-    'int': ("1", "2"),
-    'obj': ("\"foo\"", "\"bar\""),
-    'bin': ("new byte[]{1,2}", "new byte[]{3,4}"),
-  }
-  matrix = (
-    (False,False),
-    (False,True ),
-    (True ,False),
-    (True ,True ),
-  )
-
-  for type in ('int', 'obj', 'bin'):
-    for option in ('req', 'opt'):
-      nulls = matrix[0:1] if type == 'int' else matrix[-1::-1]
-      issets = matrix
-      for is_null in nulls:
-        for is_set in issets:
-          # isset is implied for non-primitives, so only consider the case
-          # where isset and non-null match.
-          if type != 'int' and list(is_set) != [ not null for null in is_null ]:
-            continue
-          for equal in (True, False):
-            print >> out
-            print >> out, "    lhs = new JavaTestHelper();"
-            print >> out, "    rhs = new JavaTestHelper();"
-            print >> out, "    lhs." + option + "_" + type, "=", vals[type][0] + ";"
-            print >> out, "    rhs." + option + "_" + type, "=", vals[type][0 if equal else 1] + ";"
-            isset_setter = "set" + option[0].upper() + option[1:] + "_" + type + "IsSet"
-            if (type == 'int' and is_set[0]): print >> out, "    lhs." + isset_setter + "(true);"
-            if (type == 'int' and is_set[1]): print >> out, "    rhs." + isset_setter + "(true);"
-            if (is_null[0]): print >> out, "    lhs." + option + "_" + type, "= null;"
-            if (is_null[1]): print >> out, "    rhs." + option + "_" + type, "= null;"
-            this_present = not is_null[0] and (option == 'req' or is_set[0])
-            that_present = not is_null[1] and (option == 'req' or is_set[1])
-            print >> out, "    // this_present = " + repr(this_present)
-            print >> out, "    // that_present = " + repr(that_present)
-            is_equal = \
-                (not this_present and not that_present) or \
-                (this_present and that_present and equal)
-            eq_str = 'true' if is_equal else 'false'
-
-            print >> out, "    if (lhs.equals(rhs) != "+eq_str+")"
-            print >> out, "      throw new RuntimeException(\"Failure\");"
-            if is_equal:
-              print >> out, "    if (lhs.hashCode() != rhs.hashCode())"
-              print >> out, "      throw new RuntimeException(\"Failure\");"
-
-  print >> out, r'''
-  }
-}
-'''
-*/
-
-package org.apache.thrift.test;
-
-// Generated code
-import java.nio.ByteBuffer;
-
-import thrift.test.JavaTestHelper;
-
-/**
- */
-public class EqualityTest {
-  public static void main(String[] args) throws Exception {
-    JavaTestHelper lhs, rhs;
-
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_int = 1;
-    rhs.req_int = 1;
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_int = 1;
-    rhs.req_int = 2;
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_int = 1;
-    rhs.req_int = 1;
-    rhs.setReq_intIsSet(true);
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_int = 1;
-    rhs.req_int = 2;
-    rhs.setReq_intIsSet(true);
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_int = 1;
-    rhs.req_int = 1;
-    lhs.setReq_intIsSet(true);
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_int = 1;
-    rhs.req_int = 2;
-    lhs.setReq_intIsSet(true);
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_int = 1;
-    rhs.req_int = 1;
-    lhs.setReq_intIsSet(true);
-    rhs.setReq_intIsSet(true);
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_int = 1;
-    rhs.req_int = 2;
-    lhs.setReq_intIsSet(true);
-    rhs.setReq_intIsSet(true);
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_int = 1;
-    rhs.opt_int = 1;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_int = 1;
-    rhs.opt_int = 2;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_int = 1;
-    rhs.opt_int = 1;
-    rhs.setOpt_intIsSet(true);
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_int = 1;
-    rhs.opt_int = 2;
-    rhs.setOpt_intIsSet(true);
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_int = 1;
-    rhs.opt_int = 1;
-    lhs.setOpt_intIsSet(true);
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_int = 1;
-    rhs.opt_int = 2;
-    lhs.setOpt_intIsSet(true);
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_int = 1;
-    rhs.opt_int = 1;
-    lhs.setOpt_intIsSet(true);
-    rhs.setOpt_intIsSet(true);
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_int = 1;
-    rhs.opt_int = 2;
-    lhs.setOpt_intIsSet(true);
-    rhs.setOpt_intIsSet(true);
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_obj = "foo";
-    rhs.req_obj = "foo";
-    lhs.req_obj = null;
-    rhs.req_obj = null;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_obj = "foo";
-    rhs.req_obj = "bar";
-    lhs.req_obj = null;
-    rhs.req_obj = null;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_obj = "foo";
-    rhs.req_obj = "foo";
-    lhs.req_obj = null;
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_obj = "foo";
-    rhs.req_obj = "bar";
-    lhs.req_obj = null;
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_obj = "foo";
-    rhs.req_obj = "foo";
-    rhs.req_obj = null;
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_obj = "foo";
-    rhs.req_obj = "bar";
-    rhs.req_obj = null;
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_obj = "foo";
-    rhs.req_obj = "foo";
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_obj = "foo";
-    rhs.req_obj = "bar";
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_obj = "foo";
-    rhs.opt_obj = "foo";
-    lhs.opt_obj = null;
-    rhs.opt_obj = null;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_obj = "foo";
-    rhs.opt_obj = "bar";
-    lhs.opt_obj = null;
-    rhs.opt_obj = null;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_obj = "foo";
-    rhs.opt_obj = "foo";
-    lhs.opt_obj = null;
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_obj = "foo";
-    rhs.opt_obj = "bar";
-    lhs.opt_obj = null;
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_obj = "foo";
-    rhs.opt_obj = "foo";
-    rhs.opt_obj = null;
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_obj = "foo";
-    rhs.opt_obj = "bar";
-    rhs.opt_obj = null;
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_obj = "foo";
-    rhs.opt_obj = "foo";
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_obj = "foo";
-    rhs.opt_obj = "bar";
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    lhs.req_bin = null;
-    rhs.req_bin = null;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = ByteBuffer.wrap(new byte[]{3,4});
-    lhs.req_bin = null;
-    rhs.req_bin = null;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    lhs.req_bin = null;
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = ByteBuffer.wrap(new byte[]{3,4});
-    lhs.req_bin = null;
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = null;
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = ByteBuffer.wrap(new byte[]{3,4});
-    rhs.req_bin = null;
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.req_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.req_bin = ByteBuffer.wrap(new byte[]{3,4});
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    lhs.opt_bin = null;
-    rhs.opt_bin = null;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = ByteBuffer.wrap(new byte[]{3,4});
-    lhs.opt_bin = null;
-    rhs.opt_bin = null;
-    // this_present = False
-    // that_present = False
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    lhs.opt_bin = null;
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = ByteBuffer.wrap(new byte[]{3,4});
-    lhs.opt_bin = null;
-    // this_present = False
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = null;
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = ByteBuffer.wrap(new byte[]{3,4});
-    rhs.opt_bin = null;
-    // this_present = True
-    // that_present = False
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != true)
-      throw new RuntimeException("Failure");
-    if (lhs.hashCode() != rhs.hashCode())
-      throw new RuntimeException("Failure");
-
-    lhs = new JavaTestHelper();
-    rhs = new JavaTestHelper();
-    lhs.opt_bin = ByteBuffer.wrap(new byte[]{1,2});
-    rhs.opt_bin = ByteBuffer.wrap(new byte[]{3,4});
-    // this_present = True
-    // that_present = True
-    if (lhs.equals(rhs) != false)
-      throw new RuntimeException("Failure");
-
-  }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/JavaBeansTest.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/JavaBeansTest.java
deleted file mode 100644
index 6a2a0ed..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/JavaBeansTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.test;
-
-import java.nio.ByteBuffer;
-import java.util.LinkedList;
-
-import thrift.test.OneOfEachBeans;
-
-public class JavaBeansTest {
-  public static void main(String[] args) throws Exception {
-    // Test isSet methods
-    OneOfEachBeans ooe = new OneOfEachBeans();
-
-    // Nothing should be set
-    if (ooe.is_set_a_bite())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_base64())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_byte_list())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_double_precision())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_i16_list())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_i64_list())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_boolean_field())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_integer16())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_integer32())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_integer64())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-    if (ooe.is_set_some_characters())
-      throw new RuntimeException("isSet method error: unset field returned as set!");
-
-    for (int i = 1; i < 12; i++){
-      if (ooe.isSet(ooe.fieldForId(i)))
-        throw new RuntimeException("isSet method error: unset field " + i + " returned as set!");
-    }
-
-    // Everything is set
-    ooe.set_a_bite((byte) 1);
-    ooe.set_base64(ByteBuffer.wrap("bytes".getBytes()));
-    ooe.set_byte_list(new LinkedList<Byte>());
-    ooe.set_double_precision(1);
-    ooe.set_i16_list(new LinkedList<Short>());
-    ooe.set_i64_list(new LinkedList<Long>());
-    ooe.set_boolean_field(true);
-    ooe.set_integer16((short) 1);
-    ooe.set_integer32(1);
-    ooe.set_integer64(1);
-    ooe.set_some_characters("string");
-
-    if (!ooe.is_set_a_bite())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_base64())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_byte_list())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_double_precision())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_i16_list())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_i64_list())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_boolean_field())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_integer16())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_integer32())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_integer64())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-    if (!ooe.is_set_some_characters())
-      throw new RuntimeException("isSet method error: set field returned as unset!");
-
-    for (int i = 1; i < 12; i++){
-      if (!ooe.isSet(ooe.fieldForId(i)))
-        throw new RuntimeException("isSet method error: set field " + i + " returned as unset!");
-    }
-
-    // Should throw exception when field doesn't exist
-    boolean exceptionThrown = false;
-    try{
-      if (ooe.isSet(ooe.fieldForId(100)));
-    } catch (IllegalArgumentException e){
-      exceptionThrown = true;
-    }
-    if (!exceptionThrown)
-      throw new RuntimeException("isSet method error: non-existent field provided as agument but no exception thrown!");
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/ReadStruct.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/ReadStruct.java
deleted file mode 100644
index 7e3b091..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/ReadStruct.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.test;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-
-import org.apache.thrift.Fixtures;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TIOStreamTransport;
-import org.apache.thrift.transport.TTransport;
-
-import thrift.test.CompactProtoTestStruct;
-
-public class ReadStruct {
-  public static void main(String[] args) throws Exception {
-    if (args.length != 2) {
-      System.out.println("usage: java -cp build/classes org.apache.thrift.test.ReadStruct filename proto_factory_class");
-      System.out.println("Read in an instance of CompactProtocolTestStruct from 'file', making sure that it is equivalent to Fixtures.compactProtoTestStruct. Use a protocol from 'proto_factory_class'.");
-    }
-
-    TTransport trans = new TIOStreamTransport(new BufferedInputStream(new FileInputStream(args[0])));
-
-    TProtocolFactory factory = (TProtocolFactory)Class.forName(args[1]).newInstance();
-
-    TProtocol proto = factory.getProtocol(trans);
-
-    CompactProtoTestStruct cpts = new CompactProtoTestStruct();
-
-    for (CompactProtoTestStruct._Fields fid : CompactProtoTestStruct.metaDataMap.keySet()) {
-      cpts.setFieldValue(fid, null);
-    }
-
-    cpts.read(proto);
-
-    if (cpts.equals(Fixtures.compactProtoTestStruct)) {
-      System.out.println("Object verified successfully!");
-    } else {
-      System.out.println("Object failed verification!");
-      System.out.println("Expected: " + Fixtures.compactProtoTestStruct + " but got " + cpts);
-    }
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java
deleted file mode 100644
index 2b0db31..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.thrift.test;
-
-import org.apache.thrift.Fixtures;
-import org.apache.thrift.TBase;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TMemoryBuffer;
-import org.apache.thrift.transport.TMemoryInputTransport;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-
-import thrift.test.OneOfEach;
-
-public class SerializationBenchmark {
-  private final static int HOW_MANY = 10000000;
-  
-  public static void main(String[] args) throws Exception {
-    TProtocolFactory factory = new TBinaryProtocol.Factory();
-
-    testSerialization(factory, Fixtures.oneOfEach);
-    testDeserialization(factory, Fixtures.oneOfEach, OneOfEach.class);
-  }
-  
-  public static void testSerialization(TProtocolFactory factory, TBase object) throws Exception {
-    TTransport trans = new TTransport() {
-      public void write(byte[] bin, int x, int y) throws TTransportException {}
-      public int read(byte[] bin, int x, int y) throws TTransportException {return 0;}
-      public void close() {}
-      public void open() {}
-      public boolean isOpen() {return true;}
-    };
-    
-    TProtocol proto = factory.getProtocol(trans);
-    
-    long startTime = System.currentTimeMillis();
-    for (int i = 0; i < HOW_MANY; i++) {
-      object.write(proto);
-    }
-    long endTime = System.currentTimeMillis();
-    
-    System.out.println("Serialization test time: " + (endTime - startTime) + " ms");
-  }
-  
-  public static <T extends TBase> void testDeserialization(TProtocolFactory factory, T object, Class<T> klass) throws Exception {
-    TMemoryBuffer buf = new TMemoryBuffer(0);
-    object.write(factory.getProtocol(buf));
-    byte[] serialized = new byte[100*1024];
-    buf.read(serialized, 0, 100*1024);
-
-    long startTime = System.currentTimeMillis();
-    for (int i = 0; i < HOW_MANY; i++) {
-      T o2 = klass.newInstance();
-      o2.read(factory.getProtocol(new TMemoryInputTransport(serialized)));
-    }
-    long endTime = System.currentTimeMillis();
-
-    System.out.println("Deserialization test time: " + (endTime - startTime) + " ms");
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestClient.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestClient.java
deleted file mode 100644
index b2ce1e6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestClient.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.test;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.thrift.TApplicationException;
-import org.apache.thrift.TException;
-import org.apache.thrift.TSerializer;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TCompactProtocol;
-import org.apache.thrift.protocol.TJSONProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TSimpleJSONProtocol;
-import org.apache.thrift.transport.TFastFramedTransport;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.THttpClient;
-import org.apache.thrift.transport.TSSLTransportFactory;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-
-// Generated code
-import thrift.test.Insanity;
-import thrift.test.Numberz;
-import thrift.test.ThriftTest;
-import thrift.test.Xception;
-import thrift.test.Xception2;
-import thrift.test.Xtruct;
-import thrift.test.Xtruct2;
-
-/**
- * Test Java client for thrift. Essentially just a copy of the C++ version,
- * this makes a variety of requests to enable testing for both performance and
- * correctness of the output.
- *
- */
-public class TestClient {
-
-  private static int ERR_BASETYPES = 1;
-  private static int ERR_STRUCTS = 2;
-  private static int ERR_CONTAINERS = 4;
-  private static int ERR_EXCEPTIONS = 8;
-  private static int ERR_UNKNOWN = 64;
-
-  public static void main(String [] args) {
-    String host = "localhost";
-    int port = 9090;
-    int numTests = 1;
-    String protocol_type = "binary";
-    String transport_type = "buffered";
-    boolean ssl = false;
-
-    int socketTimeout = 1000;
-
-    try {
-      for (int i = 0; i < args.length; ++i) {
-        if (args[i].startsWith("--host")) {
-          host = args[i].split("=")[1];
-          host.trim();
-        } else if (args[i].startsWith("--port")) {
-          port = Integer.valueOf(args[i].split("=")[1]);
-        } else if (args[i].startsWith("--n") ||
-            args[i].startsWith("--testloops")){
-          numTests = Integer.valueOf(args[i].split("=")[1]);
-        } else if (args[i].equals("--timeout")) {
-          socketTimeout = Integer.valueOf(args[i].split("=")[1]);
-        } else if (args[i].startsWith("--protocol")) {
-          protocol_type = args[i].split("=")[1];
-          protocol_type.trim();
-        } else if (args[i].startsWith("--transport")) {
-          transport_type = args[i].split("=")[1];
-          transport_type.trim();
-        } else if (args[i].equals("--ssl")) {
-          ssl = true;
-        } else if (args[i].equals("--help")) {
-          System.out.println("Allowed options:");
-          System.out.println("  --help\t\t\tProduce help message");
-          System.out.println("  --host=arg (=" + host + ")\tHost to connect");
-          System.out.println("  --port=arg (=" + port + ")\tPort number to connect");
-          System.out.println("  --transport=arg (=" + transport_type + ")\n\t\t\t\tTransport: buffered, framed, fastframed, http");
-          System.out.println("  --protocol=arg (=" + protocol_type + ")\tProtocol: binary, json, compact");
-          System.out.println("  --ssl\t\t\tEncrypted Transport using SSL");
-          System.out.println("  --testloops[--n]=arg (=" + numTests + ")\tNumber of Tests");
-          System.exit(0);
-        }
-      }
-    } catch (Exception x) {
-      System.err.println("Can not parse arguments! See --help");
-      System.exit(ERR_UNKNOWN);
-    }
-
-    try {
-      if (protocol_type.equals("binary")) {
-      } else if (protocol_type.equals("compact")) {
-      } else if (protocol_type.equals("json")) {
-      } else {
-        throw new Exception("Unknown protocol type! " + protocol_type);
-      }
-      if (transport_type.equals("buffered")) {
-      } else if (transport_type.equals("framed")) {
-      } else if (transport_type.equals("fastframed")) {
-      } else if (transport_type.equals("http")) {
-      } else {
-        throw new Exception("Unknown transport type! " + transport_type);
-      }
-      if (transport_type.equals("http") && ssl == true) {
-        throw new Exception("SSL is not supported over http.");
-      }
-    } catch (Exception e) {
-      System.err.println("Error: " + e.getMessage());
-      System.exit(ERR_UNKNOWN);
-    }
-
-    TTransport transport = null;
-
-    try {
-      if (transport_type.equals("http")) {
-        String url = "http://" + host + ":" + port + "/service";
-        transport = new THttpClient(url);
-      } else {
-        TSocket socket = null;
-        if (ssl == true) {
-          socket = TSSLTransportFactory.getClientSocket(host, port, 0);
-        } else {
-          socket = new TSocket(host, port);
-        }
-        socket.setTimeout(socketTimeout);
-        transport = socket;
-        if (transport_type.equals("buffered")) {
-        } else if (transport_type.equals("framed")) {
-          transport = new TFramedTransport(transport);
-        } else if (transport_type.equals("fastframed")) {
-          transport = new TFastFramedTransport(transport);
-        }
-      }
-    } catch (Exception x) {
-      x.printStackTrace();
-      System.exit(ERR_UNKNOWN);
-    }
-
-    TProtocol tProtocol = null;
-    if (protocol_type.equals("json")) {
-      tProtocol = new TJSONProtocol(transport);
-    } else if (protocol_type.equals("compact")) {
-      tProtocol = new TCompactProtocol(transport);
-    } else {
-      tProtocol = new TBinaryProtocol(transport);
-    }
-
-    ThriftTest.Client testClient =
-      new ThriftTest.Client(tProtocol);
-    Insanity insane = new Insanity();
-
-    long timeMin = 0;
-    long timeMax = 0;
-    long timeTot = 0;
-
-    int returnCode = 0;
-    for (int test = 0; test < numTests; ++test) {
-      try {
-        /**
-         * CONNECT TEST
-         */
-        System.out.println("Test #" + (test+1) + ", " + "connect " + host + ":" + port);
-
-        if (transport.isOpen() == false) {
-          try {
-            transport.open();
-          } catch (TTransportException ttx) {
-            ttx.printStackTrace();
-            System.out.println("Connect failed: " + ttx.getMessage());
-            System.exit(ERR_UNKNOWN);
-          }
-        }
-
-        long start = System.nanoTime();
-
-        /**
-         * VOID TEST
-         */
-        try {
-          System.out.print("testVoid()");
-          testClient.testVoid();
-          System.out.print(" = void\n");
-        } catch (TApplicationException tax) {
-          tax.printStackTrace();
-          returnCode |= ERR_BASETYPES;
-        }
-
-        /**
-         * STRING TEST
-         */
-        System.out.print("testString(\"Test\")");
-        String s = testClient.testString("Test");
-        System.out.print(" = \"" + s + "\"\n");
-        if (!s.equals("Test")) {
-          returnCode |= ERR_BASETYPES;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * BYTE TEST
-         */
-        System.out.print("testByte(1)");
-        byte i8 = testClient.testByte((byte)1);
-        System.out.print(" = " + i8 + "\n");
-        if (i8 != 1) {
-          returnCode |= ERR_BASETYPES;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * I32 TEST
-         */
-        System.out.print("testI32(-1)");
-        int i32 = testClient.testI32(-1);
-        System.out.print(" = " + i32 + "\n");
-        if (i32 != -1) {
-          returnCode |= ERR_BASETYPES;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * I64 TEST
-         */
-        System.out.print("testI64(-34359738368)");
-        long i64 = testClient.testI64(-34359738368L);
-        System.out.print(" = " + i64 + "\n");
-        if (i64 != -34359738368L) {
-          returnCode |= ERR_BASETYPES;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * DOUBLE TEST
-         */
-        System.out.print("testDouble(-5.325098235)");
-        double dub = testClient.testDouble(-5.325098235);
-        System.out.print(" = " + dub + "\n");
-        if (Math.abs(dub - (-5.325098235)) > 0.001) {
-          returnCode |= ERR_BASETYPES;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * BINARY TEST
-         */
-        try {
-          System.out.print("testBinary(-128...127) = ");
-          byte[] data = new byte[] {-128, -127, -126, -125, -124, -123, -122, -121, -120, -119, -118, -117, -116, -115, -114, -113, -112, -111, -110, -109, -108, -107, -106, -105, -104, -103, -102, -101, -100, -99, -98, -97, -96, -95, -94, -93, -92, -91, -90, -89, -88, -87, -86, -85, -84, -83, -82, -81, -80, -79, -78, -77, -76, -75, -74, -73, -72, -71, -70, -69, -68, -67, -66, -65, -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53, -52, -51, -50, -49, -48, -47, -46, -45, -44, -43, -42, -41, -40, -39, -38, -37, -36, -35, -34, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127};
-          ByteBuffer bin = testClient.testBinary(ByteBuffer.wrap(data));
-          bin.mark();
-          byte[] bytes = new byte[bin.limit() - bin.position()];
-          bin.get(bytes);
-          bin.reset();
-          System.out.print("{");
-          boolean first = true;
-          for (int i = 0; i < bytes.length; ++i) {
-            if (first)
-              first = false;
-            else
-              System.out.print(", ");
-            System.out.print(bytes[i]);
-          }
-          System.out.println("}");
-          if (!ByteBuffer.wrap(data).equals(bin)) {
-            returnCode |= ERR_BASETYPES;
-            System.out.println("*** FAILURE ***\n");
-          }
-        } catch (Exception ex) {
-          returnCode |= ERR_BASETYPES;
-          System.out.println("\n*** FAILURE ***\n");
-          ex.printStackTrace(System.out);
-        }
-
-        /**
-         * STRUCT TEST
-         */
-        System.out.print("testStruct({\"Zero\", 1, -3, -5})");
-        Xtruct out = new Xtruct();
-        out.string_thing = "Zero";
-        out.byte_thing = (byte) 1;
-        out.i32_thing = -3;
-        out.i64_thing = -5;
-        Xtruct in = testClient.testStruct(out);
-        System.out.print(" = {" + "\"" +
-                         in.string_thing + "\"," +
-                         in.byte_thing + ", " +
-                         in.i32_thing + ", " +
-                         in.i64_thing + "}\n");
-        if (!in.equals(out)) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * NESTED STRUCT TEST
-         */
-        System.out.print("testNest({1, {\"Zero\", 1, -3, -5}), 5}");
-        Xtruct2 out2 = new Xtruct2();
-        out2.byte_thing = (short)1;
-        out2.struct_thing = out;
-        out2.i32_thing = 5;
-        Xtruct2 in2 = testClient.testNest(out2);
-        in = in2.struct_thing;
-        System.out.print(" = {" + in2.byte_thing + ", {" + "\"" +
-                         in.string_thing + "\", " +
-                         in.byte_thing + ", " +
-                         in.i32_thing + ", " +
-                         in.i64_thing + "}, " +
-                         in2.i32_thing + "}\n");
-        if (!in2.equals(out2)) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * MAP TEST
-         */
-        Map<Integer,Integer> mapout = new HashMap<Integer,Integer>();
-        for (int i = 0; i < 5; ++i) {
-          mapout.put(i, i-10);
-        }
-        System.out.print("testMap({");
-        boolean first = true;
-        for (int key : mapout.keySet()) {
-          if (first) {
-            first = false;
-          } else {
-            System.out.print(", ");
-          }
-          System.out.print(key + " => " + mapout.get(key));
-        }
-        System.out.print("})");
-        Map<Integer,Integer> mapin = testClient.testMap(mapout);
-        System.out.print(" = {");
-        first = true;
-        for (int key : mapin.keySet()) {
-          if (first) {
-            first = false;
-          } else {
-            System.out.print(", ");
-          }
-          System.out.print(key + " => " + mapout.get(key));
-        }
-        System.out.print("}\n");
-        if (!mapout.equals(mapin)) {
-          returnCode |= ERR_CONTAINERS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * STRING MAP TEST
-         */
-        try {
-          Map<String, String> smapout = new HashMap<String, String>();
-          smapout.put("a", "2");
-          smapout.put("b", "blah");
-          smapout.put("some", "thing");
-          for (String key : smapout.keySet()) {
-            if (first) {
-              first = false;
-            } else {
-              System.out.print(", ");
-            }
-            System.out.print(key + " => " + smapout.get(key));
-          }
-          System.out.print("})");
-          Map<String, String> smapin = testClient.testStringMap(smapout);
-          System.out.print(" = {");
-          first = true;
-          for (String key : smapin.keySet()) {
-            if (first) {
-              first = false;
-            } else {
-              System.out.print(", ");
-            }
-            System.out.print(key + " => " + smapout.get(key));
-          }
-          System.out.print("}\n");
-          if (!smapout.equals(smapin)) {
-            returnCode |= ERR_CONTAINERS;
-            System.out.println("*** FAILURE ***\n");
-          }
-        } catch (Exception ex) {
-          returnCode |= ERR_CONTAINERS;
-          System.out.println("*** FAILURE ***\n");
-          ex.printStackTrace(System.out);
-        }
-
-        /**
-         * SET TEST
-         */
-        Set<Integer> setout = new HashSet<Integer>();
-        for (int i = -2; i < 3; ++i) {
-          setout.add(i);
-        }
-        System.out.print("testSet({");
-        first = true;
-        for (int elem : setout) {
-          if (first) {
-            first = false;
-          } else {
-            System.out.print(", ");
-          }
-          System.out.print(elem);
-        }
-        System.out.print("})");
-        Set<Integer> setin = testClient.testSet(setout);
-        System.out.print(" = {");
-        first = true;
-        for (int elem : setin) {
-          if (first) {
-            first = false;
-          } else {
-            System.out.print(", ");
-          }
-          System.out.print(elem);
-        }
-        System.out.print("}\n");
-        if (!setout.equals(setin)) {
-          returnCode |= ERR_CONTAINERS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * LIST TEST
-         */
-        List<Integer> listout = new ArrayList<Integer>();
-        for (int i = -2; i < 3; ++i) {
-          listout.add(i);
-        }
-        System.out.print("testList({");
-        first = true;
-        for (int elem : listout) {
-          if (first) {
-            first = false;
-          } else {
-            System.out.print(", ");
-          }
-          System.out.print(elem);
-        }
-        System.out.print("})");
-        List<Integer> listin = testClient.testList(listout);
-        System.out.print(" = {");
-        first = true;
-        for (int elem : listin) {
-          if (first) {
-            first = false;
-          } else {
-            System.out.print(", ");
-          }
-          System.out.print(elem);
-        }
-        System.out.print("}\n");
-        if (!listout.equals(listin)) {
-          returnCode |= ERR_CONTAINERS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * ENUM TEST
-         */
-        System.out.print("testEnum(ONE)");
-        Numberz ret = testClient.testEnum(Numberz.ONE);
-        System.out.print(" = " + ret + "\n");
-        if (ret != Numberz.ONE) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        System.out.print("testEnum(TWO)");
-        ret = testClient.testEnum(Numberz.TWO);
-        System.out.print(" = " + ret + "\n");
-        if (ret != Numberz.TWO) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        System.out.print("testEnum(THREE)");
-        ret = testClient.testEnum(Numberz.THREE);
-        System.out.print(" = " + ret + "\n");
-        if (ret != Numberz.THREE) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        System.out.print("testEnum(FIVE)");
-        ret = testClient.testEnum(Numberz.FIVE);
-        System.out.print(" = " + ret + "\n");
-        if (ret != Numberz.FIVE) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        System.out.print("testEnum(EIGHT)");
-        ret = testClient.testEnum(Numberz.EIGHT);
-        System.out.print(" = " + ret + "\n");
-        if (ret != Numberz.EIGHT) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * TYPEDEF TEST
-         */
-        System.out.print("testTypedef(309858235082523)");
-        long uid = testClient.testTypedef(309858235082523L);
-        System.out.print(" = " + uid + "\n");
-        if (uid != 309858235082523L) {
-          returnCode |= ERR_BASETYPES;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * NESTED MAP TEST
-         */
-        System.out.print("testMapMap(1)");
-        Map<Integer,Map<Integer,Integer>> mm =
-          testClient.testMapMap(1);
-        System.out.print(" = {");
-        for (int key : mm.keySet()) {
-          System.out.print(key + " => {");
-          Map<Integer,Integer> m2 = mm.get(key);
-          for (int k2 : m2.keySet()) {
-            System.out.print(k2 + " => " + m2.get(k2) + ", ");
-          }
-          System.out.print("}, ");
-        }
-        System.out.print("}\n");
-        if (mm.size() != 2 || !mm.containsKey(4) || !mm.containsKey(-4)) {
-          returnCode |= ERR_CONTAINERS;
-          System.out.println("*** FAILURE ***\n");
-        } else {
-          Map<Integer, Integer> m1 = mm.get(4);
-          Map<Integer, Integer> m2 = mm.get(-4);
-          if (m1.get(1) != 1 || m1.get(2) != 2 || m1.get(3) != 3 || m1.get(4) != 4 ||
-              m2.get(-1) != -1 || m2.get(-2) != -2 || m2.get(-3) != -3 || m2.get(-4) != -4) {
-            returnCode |= ERR_CONTAINERS;
-            System.out.println("*** FAILURE ***\n");
-          }
-        }
-
-        /**
-         * INSANITY TEST
-         */
-
-        boolean insanityFailed = true;
-        try {
-          Xtruct hello = new Xtruct();
-          hello.string_thing = "Hello2";
-          hello.byte_thing = 2;
-          hello.i32_thing = 2;
-          hello.i64_thing = 2;
-
-          Xtruct goodbye = new Xtruct();
-          goodbye.string_thing = "Goodbye4";
-          goodbye.byte_thing = (byte)4;
-          goodbye.i32_thing = 4;
-          goodbye.i64_thing = (long)4;
-
-          insane.userMap = new HashMap<Numberz, Long>();
-          insane.userMap.put(Numberz.EIGHT, (long)8);
-          insane.userMap.put(Numberz.FIVE, (long)5);
-          insane.xtructs = new ArrayList<Xtruct>();
-          insane.xtructs.add(goodbye);
-          insane.xtructs.add(hello);
-
-          System.out.print("testInsanity()");
-          Map<Long,Map<Numberz,Insanity>> whoa =
-            testClient.testInsanity(insane);
-          System.out.print(" = {");
-          for (long key : whoa.keySet()) {
-            Map<Numberz,Insanity> val = whoa.get(key);
-            System.out.print(key + " => {");
-
-            for (Numberz k2 : val.keySet()) {
-              Insanity v2 = val.get(k2);
-              System.out.print(k2 + " => {");
-              Map<Numberz, Long> userMap = v2.userMap;
-              System.out.print("{");
-              if (userMap != null) {
-                for (Numberz k3 : userMap.keySet()) {
-                  System.out.print(k3 + " => " + userMap.get(k3) + ", ");
-                }
-              }
-              System.out.print("}, ");
-
-              List<Xtruct> xtructs = v2.xtructs;
-              System.out.print("{");
-              if (xtructs != null) {
-                for (Xtruct x : xtructs) {
-                  System.out.print("{" + "\"" + x.string_thing + "\", " + x.byte_thing + ", " + x.i32_thing + ", "+ x.i64_thing + "}, ");
-                }
-              }
-              System.out.print("}");
-
-              System.out.print("}, ");
-            }
-            System.out.print("}, ");
-          }
-          System.out.print("}\n");
-          if (whoa.size() == 2 && whoa.containsKey(1L) && whoa.containsKey(2L)) {
-            Map<Numberz, Insanity> first_map = whoa.get(1L);
-            Map<Numberz, Insanity> second_map = whoa.get(2L);
-            if (first_map.size() == 2 &&
-                first_map.containsKey(Numberz.TWO) &&
-                first_map.containsKey(Numberz.THREE) &&
-                second_map.size() == 1 &&
-                second_map.containsKey(Numberz.SIX) &&
-                insane.equals(first_map.get(Numberz.TWO)) &&
-                insane.equals(first_map.get(Numberz.THREE))) {
-              Insanity six =second_map.get(Numberz.SIX);
-              // Cannot use "new Insanity().equals(six)" because as of now, struct/container
-              // fields with default requiredness have isset=false for local instances and yet
-              // received empty values from other languages like C++ have isset=true .
-              if (six.getUserMapSize() == 0 && six.getXtructsSize() == 0) {
-                // OK
-                insanityFailed = false;
-              }
-            }
-          }
-        } catch (Exception ex) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-          ex.printStackTrace(System.out);
-          insanityFailed = false;
-        }
-        if (insanityFailed) {
-          returnCode |= ERR_STRUCTS;
-          System.out.println("*** FAILURE ***\n");
-        }
-
-        /**
-         * EXECPTION TEST
-         */
-        try {
-          System.out.print("testClient.testException(\"Xception\") =>");
-          testClient.testException("Xception");
-          System.out.print("  void\n*** FAILURE ***\n");
-          returnCode |= ERR_EXCEPTIONS;
-        } catch(Xception e) {
-          System.out.printf("  {%d, \"%s\"}\n", e.errorCode, e.message);
-        }
-
-        try {
-          System.out.print("testClient.testException(\"TException\") =>");
-          testClient.testException("TException");
-          System.out.print("  void\n*** FAILURE ***\n");
-          returnCode |= ERR_EXCEPTIONS;
-        } catch(TException e) {
-          System.out.printf("  {\"%s\"}\n", e.getMessage());
-        }
-
-        try {
-          System.out.print("testClient.testException(\"success\") =>");
-          testClient.testException("success");
-          System.out.print("  void\n");
-        }catch(Exception e) {
-          System.out.printf("  exception\n*** FAILURE ***\n");
-          returnCode |= ERR_EXCEPTIONS;
-        }
-
-
-        /**
-         * MULTI EXCEPTION TEST
-         */
-
-        try {
-          System.out.printf("testClient.testMultiException(\"Xception\", \"test 1\") =>");
-          testClient.testMultiException("Xception", "test 1");
-          System.out.print("  result\n*** FAILURE ***\n");
-          returnCode |= ERR_EXCEPTIONS;
-        } catch(Xception e) {
-          System.out.printf("  {%d, \"%s\"}\n", e.errorCode, e.message);
-        }
-
-        try {
-          System.out.printf("testClient.testMultiException(\"Xception2\", \"test 2\") =>");
-          testClient.testMultiException("Xception2", "test 2");
-          System.out.print("  result\n*** FAILURE ***\n");
-          returnCode |= ERR_EXCEPTIONS;
-        } catch(Xception2 e) {
-          System.out.printf("  {%d, {\"%s\"}}\n", e.errorCode, e.struct_thing.string_thing);
-        }
-
-        try {
-          System.out.print("testClient.testMultiException(\"success\", \"test 3\") =>");
-          Xtruct result;
-          result = testClient.testMultiException("success", "test 3");
-          System.out.printf("  {{\"%s\"}}\n", result.string_thing);
-        } catch(Exception e) {
-          System.out.printf("  exception\n*** FAILURE ***\n");
-          returnCode |= ERR_EXCEPTIONS;
-        }
-
-
-
-        /**
-         * ONEWAY TEST
-         */
-        System.out.print("testOneway(3)...");
-        long startOneway = System.nanoTime();
-        testClient.testOneway(3);
-        long onewayElapsedMillis = (System.nanoTime() - startOneway) / 1000000;
-        if (onewayElapsedMillis > 200) {
-          System.out.println("Oneway test failed: took " +
-                             Long.toString(onewayElapsedMillis) +
-                             "ms");
-          System.out.printf("*** FAILURE ***\n");
-          returnCode |= ERR_BASETYPES;
-        } else {
-          System.out.println("Success - took " +
-                             Long.toString(onewayElapsedMillis) +
-                             "ms");
-        }
-
-
-        long stop = System.nanoTime();
-        long tot = stop-start;
-
-        System.out.println("Total time: " + tot/1000 + "us");
-
-        if (timeMin == 0 || tot < timeMin) {
-          timeMin = tot;
-        }
-        if (tot > timeMax) {
-          timeMax = tot;
-        }
-        timeTot += tot;
-
-        transport.close();
-      } catch (Exception x) {
-        System.out.printf("*** FAILURE ***\n");
-        x.printStackTrace();
-        returnCode |= ERR_UNKNOWN;
-      }
-    }
-
-    long timeAvg = timeTot / numTests;
-
-    System.out.println("Min time: " + timeMin/1000 + "us");
-    System.out.println("Max time: " + timeMax/1000 + "us");
-    System.out.println("Avg time: " + timeAvg/1000 + "us");
-
-    try {
-      String json = (new TSerializer(new TSimpleJSONProtocol.Factory())).toString(insane);
-      System.out.println("\nSample TSimpleJSONProtocol output:\n" + json);
-    } catch (TException x) {
-      System.out.println("*** FAILURE ***");
-      x.printStackTrace();
-      returnCode |= ERR_BASETYPES;
-    }
-
-
-    System.exit(returnCode);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
deleted file mode 100644
index 41c4b65..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.test;
-
-import org.apache.thrift.server.THsHaServer;
-import org.apache.thrift.server.TNonblockingServer;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.THsHaServer.Args;
-import org.apache.thrift.transport.TNonblockingServerSocket;
-import org.apache.thrift.server.ServerTestBase.TestHandler;
-
-import thrift.test.ThriftTest;
-
-
-public class TestNonblockingServer extends TestServer {
-  public static void main(String [] args) {
-    try {
-      int port = 9090;
-      boolean hsha = false;
-
-      for (int i = 0; i < args.length; i++) {
-        if (args[i].equals("-p")) {
-          port = Integer.valueOf(args[i++]);
-        } else if (args[i].equals("-hsha")) {
-          hsha = true;
-        }
-      }
-      //@TODO add other protocol and transport types
-
-      // Processor
-      TestHandler testHandler =
-        new TestHandler();
-      ThriftTest.Processor testProcessor =
-        new ThriftTest.Processor(testHandler);
-
-      // Transport
-      TNonblockingServerSocket tServerSocket =
-        new TNonblockingServerSocket(new TNonblockingServerSocket.NonblockingAbstractServerSocketArgs().port(port));
-
-      TServer serverEngine;
-
-      if (hsha) {
-        // HsHa Server
-        serverEngine = new THsHaServer(new Args(tServerSocket).processor(testProcessor));
-      } else {
-        // Nonblocking Server
-        serverEngine = new TNonblockingServer(new Args(tServerSocket).processor(testProcessor));
-      }
-
-      // Run it
-      System.out.println("Starting the server on port " + port + "...");
-      serverEngine.serve();
-
-    } catch (Exception x) {
-      x.printStackTrace();
-    }
-    System.out.println("done.");
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestServer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestServer.java
deleted file mode 100644
index 14cd2ab..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/TestServer.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TCompactProtocol;
-import org.apache.thrift.protocol.TJSONProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.ServerContext;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TServer.Args;
-import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.server.TThreadPoolServer;
-import org.apache.thrift.server.ServerTestBase.TestHandler;
-import org.apache.thrift.server.TServerEventHandler;
-import org.apache.thrift.server.TThreadedSelectorServer;
-import org.apache.thrift.server.TNonblockingServer;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TFastFramedTransport;
-import org.apache.thrift.transport.TServerSocket;
-import org.apache.thrift.transport.TSSLTransportFactory;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportFactory;
-import org.apache.thrift.transport.TNonblockingServerSocket;
-
-
-import thrift.test.Insanity;
-import thrift.test.Numberz;
-import thrift.test.ThriftTest;
-import thrift.test.Xception;
-import thrift.test.Xception2;
-import thrift.test.Xtruct;
-import thrift.test.Xtruct2;
-
-public class TestServer {
-
-  static class TestServerContext implements ServerContext {
-
-        int connectionId;
-
-        public TestServerContext(int connectionId) {
-            this.connectionId = connectionId;
-        }
-
-        public int getConnectionId() {
-            return connectionId;
-        }
-
-        public void setConnectionId(int connectionId) {
-            this.connectionId = connectionId;
-        }
-
-  }
-
-  static class TestServerEventHandler implements TServerEventHandler {
-
-        private int nextConnectionId = 1;
-
-        public void preServe() {
-            System.out.println("TServerEventHandler.preServe - called only once before server starts accepting connections");
-        }
-
-        public ServerContext createContext(TProtocol input, TProtocol output) {
-            //we can create some connection level data which is stored while connection is alive & served
-            TestServerContext ctx = new TestServerContext(nextConnectionId++);
-            System.out.println("TServerEventHandler.createContext - connection #"+ctx.getConnectionId()+" established");
-            return ctx;
-        }
-
-        public void deleteContext(ServerContext serverContext, TProtocol input, TProtocol output) {
-            TestServerContext ctx = (TestServerContext)serverContext;
-            System.out.println("TServerEventHandler.deleteContext - connection #"+ctx.getConnectionId()+" terminated");
-        }
-
-        public void processContext(ServerContext serverContext, TTransport inputTransport, TTransport outputTransport) {
-            TestServerContext ctx = (TestServerContext)serverContext;
-            System.out.println("TServerEventHandler.processContext - connection #"+ctx.getConnectionId()+" is ready to process next request");
-        }
-
-  }
-
-  public static void main(String [] args) {
-    try {
-      int port = 9090;
-      boolean ssl = false;
-      String transport_type = "buffered";
-      String protocol_type = "binary";
-      String server_type = "thread-pool";
-      String domain_socket = "";
-      int string_limit = -1;
-      int container_limit = -1;
-      try {
-        for (int i = 0; i < args.length; i++) {
-          if (args[i].startsWith("--port")) {
-            port = Integer.valueOf(args[i].split("=")[1]);
-          } else if (args[i].startsWith("--server-type")) {
-            server_type = args[i].split("=")[1];
-            server_type.trim();
-          } else if (args[i].startsWith("--port")) {
-            port=Integer.parseInt(args[i].split("=")[1]);
-          } else if (args[i].startsWith("--protocol")) {
-            protocol_type = args[i].split("=")[1];
-            protocol_type.trim();
-          } else if (args[i].startsWith("--transport")) {
-            transport_type = args[i].split("=")[1];
-            transport_type.trim();
-          } else if (args[i].equals("--ssl")) {
-            ssl = true;
-          } else if (args[i].startsWith("--string-limit")) {
-            string_limit = Integer.valueOf(args[i].split("=")[1]);
-          } else if (args[i].startsWith("--container-limit")) {
-            container_limit = Integer.valueOf(args[i].split("=")[1]);
-          } else if (args[i].equals("--help")) {
-            System.out.println("Allowed options:");
-            System.out.println("  --help\t\t\tProduce help message");
-            System.out.println("  --port=arg (=" + port + ")\tPort number to connect");
-            System.out.println("  --transport=arg (=" + transport_type + ")\n\t\t\t\tTransport: buffered, framed, fastframed");
-            System.out.println("  --protocol=arg (=" + protocol_type + ")\tProtocol: binary, json, compact");
-            System.out.println("  --ssl\t\t\tEncrypted Transport using SSL");
-            System.out.println("  --server-type=arg (=" + server_type +")\n\t\t\t\tType of server: simple, thread-pool, nonblocking, threaded-selector");
-            System.out.println("  --string-limit=arg (=" + string_limit + ")\tString read length limit");
-            System.out.println("  --container-limit=arg (=" + container_limit + ")\tContainer read length limit");
-            System.exit(0);
-          }
-        }
-      } catch (Exception e) {
-        System.err.println("Can not parse arguments! See --help");
-        System.exit(1);
-      }
-
-      try {
-        if (server_type.equals("simple")) {
-        } else if (server_type.equals("thread-pool")) {
-        } else if (server_type.equals("nonblocking")) {
-          if (ssl == true) {
-            throw new Exception("SSL is not supported over nonblocking servers!");
-          }
-        } else if (server_type.equals("threaded-selector")) {
-          if (ssl == true) {
-            throw new Exception("SSL is not supported over nonblocking servers!");
-          }
-        } else {
-          throw new Exception("Unknown server type! " + server_type);
-        }
-        if (protocol_type.equals("binary")) {
-        } else if (protocol_type.equals("json")) {
-        } else if (protocol_type.equals("compact")) {
-        } else {
-          throw new Exception("Unknown protocol type! " + protocol_type);
-        }
-        if (transport_type.equals("buffered")) {
-        } else if (transport_type.equals("framed")) {
-        } else if (transport_type.equals("fastframed")) {
-        } else {
-          throw new Exception("Unknown transport type! " + transport_type);
-        }
-      } catch (Exception e) {
-        System.err.println("Error: " + e.getMessage());
-        System.exit(1);
-      }
-
-      // Processor
-      TestHandler testHandler =
-        new TestHandler();
-      ThriftTest.Processor testProcessor =
-        new ThriftTest.Processor(testHandler);
-
-      // Protocol factory
-      TProtocolFactory tProtocolFactory = null;
-      if (protocol_type.equals("json")) {
-        tProtocolFactory = new TJSONProtocol.Factory();
-      } else if (protocol_type.equals("compact")) {
-        tProtocolFactory = new TCompactProtocol.Factory(string_limit, container_limit);
-      } else {
-        tProtocolFactory = new TBinaryProtocol.Factory(string_limit, container_limit);
-      }
-
-      TTransportFactory tTransportFactory = null;
-
-      if (transport_type.equals("framed")) {
-        tTransportFactory = new TFramedTransport.Factory();
-      } else if (transport_type.equals("fastframed")) {
-        tTransportFactory = new TFastFramedTransport.Factory();
-      } else { // .equals("buffered") => default value
-        tTransportFactory = new TTransportFactory();
-      }
-
-      TServer serverEngine = null;
-
-
-      if (server_type.equals("nonblocking") ||
-          server_type.equals("threaded-selector")) {
-        // Nonblocking servers
-        TNonblockingServerSocket tNonblockingServerSocket =
-          new TNonblockingServerSocket(new TNonblockingServerSocket.NonblockingAbstractServerSocketArgs().port(port));
-
-        if (server_type.equals("nonblocking")) {
-          // Nonblocking Server
-          TNonblockingServer.Args tNonblockingServerArgs
-              = new TNonblockingServer.Args(tNonblockingServerSocket);
-          tNonblockingServerArgs.processor(testProcessor);
-          tNonblockingServerArgs.protocolFactory(tProtocolFactory);
-          tNonblockingServerArgs.transportFactory(tTransportFactory);
-
-          serverEngine = new TNonblockingServer(tNonblockingServerArgs);
-        } else { // server_type.equals("threaded-selector")
-          // ThreadedSelector Server
-          TThreadedSelectorServer.Args tThreadedSelectorServerArgs
-              = new TThreadedSelectorServer.Args(tNonblockingServerSocket);
-          tThreadedSelectorServerArgs.processor(testProcessor);
-          tThreadedSelectorServerArgs.protocolFactory(tProtocolFactory);
-          tThreadedSelectorServerArgs.transportFactory(tTransportFactory);
-
-          serverEngine = new TThreadedSelectorServer(tThreadedSelectorServerArgs);
-        }
-      } else {
-        // Blocking servers
-
-        // SSL socket
-        TServerSocket tServerSocket = null;
-        if (ssl) {
-          tServerSocket = TSSLTransportFactory.getServerSocket(port, 0);
-        } else {
-          tServerSocket = new TServerSocket(new TServerSocket.ServerSocketTransportArgs().port(port));
-        }
-
-        if (server_type.equals("simple")) {
-          // Simple Server
-          TServer.Args tServerArgs = new TServer.Args(tServerSocket);
-          tServerArgs.processor(testProcessor);
-          tServerArgs.protocolFactory(tProtocolFactory);
-          tServerArgs.transportFactory(tTransportFactory);
-
-          serverEngine = new TSimpleServer(tServerArgs);
-        } else { // server_type.equals("threadpool")
-          // ThreadPool Server
-          TThreadPoolServer.Args tThreadPoolServerArgs
-              = new TThreadPoolServer.Args(tServerSocket);
-          tThreadPoolServerArgs.processor(testProcessor);
-          tThreadPoolServerArgs.protocolFactory(tProtocolFactory);
-          tThreadPoolServerArgs.transportFactory(tTransportFactory);
-
-          serverEngine = new TThreadPoolServer(tThreadPoolServerArgs);
-        }
-      }
-
-
-      //Set server event handler
-      serverEngine.setServerEventHandler(new TestServerEventHandler());
-
-      // Run it
-      System.out.println("Starting the server on port " + port + "...");
-      serverEngine.serve();
-
-    } catch (Exception x) {
-      x.printStackTrace();
-    }
-    System.out.println("done.");
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/WriteStruct.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/WriteStruct.java
deleted file mode 100644
index a0013a9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/test/WriteStruct.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.test;
-
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-
-import org.apache.thrift.Fixtures;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TIOStreamTransport;
-import org.apache.thrift.transport.TTransport;
-
-public class WriteStruct {
-  public static void main(String[] args) throws Exception {
-    if (args.length != 2) {
-      System.out.println("usage: java -cp build/classes org.apache.thrift.test.WriteStruct filename proto_factory_class");
-      System.out.println("Write out an instance of Fixtures.compactProtocolTestStruct to 'file'. Use a protocol from 'proto_factory_class'.");
-    }
-    
-    TTransport trans = new TIOStreamTransport(new BufferedOutputStream(new FileOutputStream(args[0])));
-    
-    TProtocolFactory factory = (TProtocolFactory)Class.forName(args[1]).newInstance();
-    
-    TProtocol proto = factory.getProtocol(trans);
-    
-    Fixtures.compactProtoTestStruct.write(proto);
-    trans.flush();
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java
deleted file mode 100644
index 3c749f9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-
-public class ReadCountingTransport extends TTransport {
-  public int readCount = 0;
-  private TTransport trans;
-  private boolean open = true;
-
-  public ReadCountingTransport(TTransport underlying) {
-    trans = underlying;
-  }
-
-  @Override
-  public void close() {
-    open = false;
-  }
-
-  @Override
-  public boolean isOpen() {
-    return open;
-  }
-
-  @Override
-  public void open() throws TTransportException {
-    open = true;
-  }
-
-  @Override
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (!isOpen()) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Transport is closed");
-    }
-    readCount++;
-    return trans.read(buf, off, len);
-  }
-
-  @Override
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    if (!isOpen()) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Transport is closed");
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBuffer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBuffer.java
deleted file mode 100644
index 337dcf8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBuffer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import junit.framework.TestCase;
-
-public class TestAutoExpandingBuffer extends TestCase {
-  public void testExpands() throws Exception {
-    // has expected initial capacity
-    AutoExpandingBuffer b = new AutoExpandingBuffer(10, 1.5);
-    assertEquals(10, b.array().length);
-
-    // doesn't shrink
-    b.resizeIfNecessary(8);
-    assertEquals(10, b.array().length);
-
-    // grows when more capacity is needed
-    b.resizeIfNecessary(100);
-    assertTrue(b.array().length >= 100);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferReadTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferReadTransport.java
deleted file mode 100644
index 2e1f947..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferReadTransport.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import java.nio.ByteBuffer;
-
-import junit.framework.TestCase;
-
-public class TestAutoExpandingBufferReadTransport extends TestCase {
-  private static final byte[] HUNDRED_BYTES = new byte[100];
-
-  static {
-    for (byte i = 0; i < 100; i++) {
-      HUNDRED_BYTES[i] = i;
-    }
-  }
-
-  public void testIt() throws Exception {
-    AutoExpandingBufferReadTransport t = new AutoExpandingBufferReadTransport(150, 1.5);
-
-    TMemoryInputTransport membuf = new TMemoryInputTransport(HUNDRED_BYTES);
-
-    t.fill(membuf, 100);
-    assertEquals(100, t.getBytesRemainingInBuffer());
-    assertEquals(0, t.getBufferPosition());
-
-    byte[] target = new byte[10];
-    assertEquals(10, t.read(target, 0, 10));
-    assertEquals(ByteBuffer.wrap(HUNDRED_BYTES, 0, 10), ByteBuffer.wrap(target));
-
-    assertEquals(90, t.getBytesRemainingInBuffer());
-    assertEquals(10, t.getBufferPosition());
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferWriteTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferWriteTransport.java
deleted file mode 100644
index d5f239d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferWriteTransport.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import java.nio.ByteBuffer;
-
-import junit.framework.TestCase;
-
-public class TestAutoExpandingBufferWriteTransport extends TestCase {
-
-  public void testIt() throws Exception {
-    AutoExpandingBufferWriteTransport t = new AutoExpandingBufferWriteTransport(1, 1.5);
-    assertEquals(1, t.getBuf().array().length);
-    byte[] b1 = new byte[]{1,2,3};
-    t.write(b1);
-    assertEquals(3, t.getPos());
-    assertTrue(t.getBuf().array().length >= 3);
-    assertEquals(ByteBuffer.wrap(b1), ByteBuffer.wrap(t.getBuf().array(), 0, 3));
-
-    t.reset();
-    assertTrue(t.getBuf().array().length >= 3);
-    assertEquals(0, t.getPos());
-    byte[] b2 = new byte[]{4,5};
-    t.write(b2);
-    assertEquals(2, t.getPos());
-    assertEquals(ByteBuffer.wrap(b2), ByteBuffer.wrap(t.getBuf().array(), 0, 2));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTByteBuffer.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTByteBuffer.java
deleted file mode 100644
index a73075b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTByteBuffer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.thrift.transport;
-
-import junit.framework.TestCase;
-import org.apache.commons.codec.Charsets;
-import org.apache.thrift.TException;
-
-import java.nio.ByteBuffer;
-
-public class TestTByteBuffer extends TestCase {
-  public void testReadWrite() throws Exception {
-    final TByteBuffer byteBuffer = new TByteBuffer(ByteBuffer.allocate(16));
-    byteBuffer.write("Hello World".getBytes(Charsets.UTF_8));
-    assertEquals("Hello World", new String(byteBuffer.flip().toByteArray(), Charsets.UTF_8));
-  }
-
-  public void testReuseReadWrite() throws Exception {
-    final TByteBuffer byteBuffer = new TByteBuffer(ByteBuffer.allocate(16));
-    byteBuffer.write("Hello World".getBytes(Charsets.UTF_8));
-    assertEquals("Hello World", new String(byteBuffer.flip().toByteArray(), Charsets.UTF_8));
-
-    byteBuffer.clear();
-
-    byteBuffer.write("Goodbye Horses".getBytes(Charsets.UTF_8));
-    assertEquals("Goodbye Horses", new String(byteBuffer.flip().toByteArray(), Charsets.UTF_8));
-  }
-
-  public void testOverflow() throws Exception {
-    final TByteBuffer byteBuffer = new TByteBuffer(ByteBuffer.allocate(4));
-    try {
-      byteBuffer.write("Hello World".getBytes(Charsets.UTF_8));
-      fail("Expected write operation to fail with TTransportException");
-    } catch (TTransportException e) {
-      assertEquals("Not enough room in output buffer", e.getMessage());
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTFastFramedTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTFastFramedTransport.java
deleted file mode 100644
index 11fbdf4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTFastFramedTransport.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-public class TestTFastFramedTransport extends TestTFramedTransport {
-  @Override
-  protected TTransport getTransport(TTransport underlying) {
-    return new TFastFramedTransport(underlying, 50, 10 * 1024 * 1024);
-  }
-
-  @Override
-  protected TTransport getTransport(TTransport underlying, int maxLength) {
-    return new TFastFramedTransport(underlying, 50, maxLength);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTFramedTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTFramedTransport.java
deleted file mode 100644
index 6cebd3c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTFramedTransport.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-public class TestTFramedTransport extends TestCase {
-
-  protected TTransport getTransport(TTransport underlying) {
-    return new TFramedTransport(underlying);
-  }
-
-  protected TTransport getTransport(TTransport underlying, int maxLength) {
-    return new TFramedTransport(underlying, maxLength);
-  }
-
-  public static byte[] byteSequence(int start, int end) {
-    byte[] result = new byte[end-start+1];
-    for (int i = 0; i <= (end-start); i++) {
-      result[i] = (byte)(start+i);
-    }
-    return result;
-  }
-
-  public void testRead() throws IOException, TTransportException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DataOutputStream dos = new DataOutputStream(baos);
-    dos.writeInt(50);
-    dos.write(byteSequence(0, 49));
-
-    dos.writeInt(220);
-    dos.write(byteSequence(0, 219));
-
-    TMemoryBuffer membuf = new TMemoryBuffer(0);
-    membuf.write(baos.toByteArray());
-
-    ReadCountingTransport countTrans = new ReadCountingTransport(membuf);
-    TTransport trans = getTransport(countTrans);
-
-    byte[] readBuf = new byte[10];
-    trans.read(readBuf, 0, 10);
-    assertTrue(Arrays.equals(readBuf, byteSequence(0,9)));
-    assertEquals(2, countTrans.readCount);
-
-    trans.read(readBuf, 0, 10);
-    assertTrue(Arrays.equals(readBuf, byteSequence(10,19)));
-    assertEquals(2, countTrans.readCount);
-
-    assertEquals(30, trans.read(new byte[30], 0, 30));
-    assertEquals(2, countTrans.readCount);
-
-    readBuf = new byte[220];
-    assertEquals(220, trans.read(readBuf, 0, 220));
-    assertTrue(Arrays.equals(readBuf, byteSequence(0, 219)));
-    assertEquals(4, countTrans.readCount);
-  }
-
-  public void testInvalidFrameSize() throws IOException, TTransportException {
-    int maxLength = 128;
-
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DataOutputStream dos = new DataOutputStream(baos);
-    dos.writeInt(130);
-    dos.write(byteSequence(0, 129));
-
-    TMemoryBuffer membuf = new TMemoryBuffer(0);
-    membuf.write(baos.toByteArray());
-
-    ReadCountingTransport countTrans = new ReadCountingTransport(membuf);
-    TTransport trans = getTransport(countTrans, maxLength);
-
-    byte[] readBuf = new byte[10];
-    try {
-      trans.read(readBuf, 0, 4);
-      fail("Expected a TTransportException");
-    } catch (TTransportException e) {
-      // We expect this exception because the frame we're trying to read is larger than our max frame length
-      assertEquals(TTransportException.CORRUPTED_DATA, e.getType());
-    }
-
-    assertFalse(trans.isOpen());
-
-    try {
-      trans.read(readBuf, 0, 4);
-      fail("Expected a TTransportException");
-    } catch (TTransportException e) {
-      // This time we get an exception indicating the connection was closed
-      assertEquals(TTransportException.NOT_OPEN, e.getType());
-    }
-  }
-
-  public void testWrite() throws TTransportException, IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    WriteCountingTransport countingTrans = new WriteCountingTransport(new TIOStreamTransport(new BufferedOutputStream(baos)));
-    TTransport trans = getTransport(countingTrans);
-
-    trans.write(byteSequence(0,100));
-    assertEquals(0, countingTrans.writeCount);
-    trans.write(byteSequence(101,200));
-    trans.write(byteSequence(201,255));
-    assertEquals(0, countingTrans.writeCount);
-
-    trans.flush();
-    assertEquals(2, countingTrans.writeCount);
-
-    trans.write(byteSequence(0, 245));
-    trans.flush();
-    assertEquals(4, countingTrans.writeCount);
-
-    DataInputStream din = new DataInputStream(new ByteArrayInputStream(baos.toByteArray()));
-    assertEquals(256, din.readInt());
-
-    byte[] buf = new byte[256];
-    din.read(buf, 0, 256);
-    assertTrue(Arrays.equals(byteSequence(0,255), buf));
-
-    assertEquals(246, din.readInt());
-    buf = new byte[246];
-    din.read(buf, 0, 246);
-    assertTrue(Arrays.equals(byteSequence(0,245), buf));
-  }
-
-  public void testDirectRead() throws IOException, TTransportException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DataOutputStream dos = new DataOutputStream(baos);
-    dos.writeInt(50);
-    dos.write(byteSequence(0, 49));
-    dos.writeInt(75);
-    dos.write(byteSequence(125, 200));
-
-    TMemoryBuffer membuf = new TMemoryBuffer(0);
-    membuf.write(baos.toByteArray());
-
-    ReadCountingTransport countTrans = new ReadCountingTransport(membuf);
-    TTransport trans = getTransport(countTrans);
-
-    assertEquals(0, trans.getBytesRemainingInBuffer());
-
-    byte[] readBuf = new byte[10];
-    trans.read(readBuf, 0, 10);
-    assertTrue(Arrays.equals(readBuf, byteSequence(0,9)));
-
-    assertEquals(40, trans.getBytesRemainingInBuffer());
-    assertEquals(10, trans.getBufferPosition());
-
-    trans.consumeBuffer(5);
-    assertEquals(35, trans.getBytesRemainingInBuffer());
-    assertEquals(15, trans.getBufferPosition());
-
-    assertEquals(2, countTrans.readCount);
-
-    assertEquals(35, trans.read(new byte[35], 0, 35));
-    assertEquals(0, trans.getBytesRemainingInBuffer());
-    assertEquals(50, trans.getBufferPosition());
-
-    trans.read(readBuf, 0, 10);
-    assertEquals(4, countTrans.readCount);
-    assertTrue(Arrays.equals(readBuf, byteSequence(125,134)));
-    assertEquals(65, trans.getBytesRemainingInBuffer());
-    assertEquals(10, trans.getBufferPosition());
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTMemoryInputTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTMemoryInputTransport.java
deleted file mode 100644
index 273145b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTMemoryInputTransport.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-public class TestTMemoryInputTransport extends TestCase {
-  public void testFresh() throws Exception {
-    byte[] input_buf = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    TMemoryInputTransport trans = new TMemoryInputTransport(input_buf);
-    assertEquals(0, trans.getBufferPosition());
-    assertEquals(input_buf, trans.getBuffer());
-    assertEquals(10, trans.getBytesRemainingInBuffer());
-
-    byte[] buf1 = new byte[4];
-    trans.readAll(buf1, 0, 4);
-    assertTrue(Arrays.equals(new byte[]{1, 2, 3, 4}, buf1));
-    assertEquals(4, trans.getBufferPosition());
-    assertEquals(6, trans.getBytesRemainingInBuffer());
-
-    trans.consumeBuffer(2);
-
-    assertEquals(6, trans.getBufferPosition());
-    assertEquals(4, trans.getBytesRemainingInBuffer());
-
-    trans.readAll(buf1, 0, 4);
-    assertTrue(Arrays.equals(new byte[]{7, 8, 9, 10}, buf1));
-    assertEquals(10, trans.getBufferPosition());
-    assertEquals(0, trans.getBytesRemainingInBuffer());
-  }
-
-  public void testReused() throws Exception {
-    byte[] input_buf = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    TMemoryInputTransport trans = new TMemoryInputTransport(input_buf);
-    assertEquals(0, trans.getBufferPosition());
-    assertEquals(input_buf, trans.getBuffer());
-    assertEquals(10, trans.getBytesRemainingInBuffer());
-
-    byte[] new_buf = new byte[]{10, 9, 8};
-    trans.reset(new_buf);
-    assertEquals(0, trans.getBufferPosition());
-    assertEquals(new_buf, trans.getBuffer());
-    assertEquals(3, trans.getBytesRemainingInBuffer());
-  }
-
-  public void testWithOffsetAndLength() throws Exception {
-    byte[] input_buf = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    TMemoryInputTransport trans = new TMemoryInputTransport(input_buf, 1, 3);
-    assertEquals(1, trans.getBufferPosition());
-    assertEquals(3, trans.getBytesRemainingInBuffer());
-    byte[] readBuffer = new byte[3];
-    trans.readAll(readBuffer, 0, 3);
-    assertTrue(Arrays.equals(new byte[]{2, 3, 4}, readBuffer));
-
-    try {
-      assertEquals(0, trans.readAll(readBuffer, 0, 3));
-      fail("should have thrown an exception");
-    } catch (Exception e) {
-      // yay
-    }
-
-    trans.reset(input_buf, 3, 4);
-    readBuffer = new byte[4];
-    trans.readAll(readBuffer, 0, 4);
-    assertTrue(Arrays.equals(new byte[]{4, 5, 6, 7}, readBuffer));
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactory.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactory.java
deleted file mode 100644
index 478407a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.ServerTestBase;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.server.TServer.Args;
-
-public class TestTSSLTransportFactory extends ServerTestBase {
-  private Thread serverThread;
-  private TServer server;
-
-  private static final List<TProtocolFactory> protocols = new ArrayList<TProtocolFactory>();
-  static {
-    // TODO: Only supported on TBinaryProtocol. Doesn't work for TCompactProtocol
-    protocols.add(new TBinaryProtocol.Factory());
-  }
-
-  @Override
-  public TTransport getClientTransport(TTransport underlyingTransport)
-  throws Exception {
-    return TSSLTransportFactory.getClientSocket(HOST, PORT);
-  }
-
-  @Override
-  public void startServer(final TProcessor processor, final TProtocolFactory protoFactory, final TTransportFactory factory)
-  throws Exception {
-    serverThread = new Thread() {
-      public void run() {
-        try {
-          TServerTransport serverTransport = TSSLTransportFactory.getServerSocket(PORT);
-          final Args args = new Args(serverTransport).processor(processor);
-          server = new TSimpleServer(args);
-          server.serve();
-        } catch (TTransportException e) {
-          e.printStackTrace();
-          assert false;
-        }
-      }
-    };
-
-    serverThread.start();
-    Thread.sleep(1000);
-  }
-
-  @Override
-  public void stopServer() throws Exception {
-    server.stop();
-    serverThread.join();
-  }
-
-  @Override
-  public void open(TTransport transport) throws Exception {}
-
-  @Override
-  public List<TProtocolFactory> getProtocols() {
-    return protocols;
-  }
-
-  @Override
-  public void testTransportFactory() throws Exception {
-    // this test doesn't really apply to this suite, so let's skip it.
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient1.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient1.java
deleted file mode 100644
index da1659f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-public class TestTSSLTransportFactoryCustomClient1 extends TestTSSLTransportFactory {
-
-  @Override
-  public TTransport getClientTransport(TTransport underlyingTransport)
-  throws Exception {
-    TSSLTransportFactory.TSSLTransportParameters params = new
-      TSSLTransportFactory.TSSLTransportParameters();
-
-    params.setTrustStore(System.getProperty("javax.net.ssl.trustStore"),
-      System.getProperty("javax.net.ssl.trustStorePassword"));
-
-    return TSSLTransportFactory.getClientSocket(HOST, PORT, 0/*timeout*/, params);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient2.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient2.java
deleted file mode 100644
index eaed460..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-public class TestTSSLTransportFactoryCustomClient2 extends TestTSSLTransportFactory {
-
-  @Override
-  public TTransport getClientTransport(TTransport underlyingTransport)
-  throws Exception {
-    TSSLTransportFactory.TSSLTransportParameters params = new
-      TSSLTransportFactory.TSSLTransportParameters();
-
-    params.setTrustStore(System.getProperty("javax.net.ssl.trustStore"), null);
-
-    return TSSLTransportFactory.getClientSocket(HOST, PORT, 0/*timeout*/, params);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java
deleted file mode 100644
index 788395f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.sasl.AuthorizeCallback;
-import javax.security.sasl.RealmCallback;
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslClientFactory;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-import javax.security.sasl.SaslServerFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.ServerTestBase;
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.server.TServer.Args;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestTSaslTransports extends TestCase {
-
-  private static final Logger LOGGER = LoggerFactory.getLogger(TestTSaslTransports.class);
-
-  private static final String HOST = "localhost";
-  private static final String SERVICE = "thrift-test";
-  private static final String PRINCIPAL = "thrift-test-principal";
-  private static final String PASSWORD = "super secret password";
-  private static final String REALM = "thrift-test-realm";
-
-  private static final String UNWRAPPED_MECHANISM = "CRAM-MD5";
-  private static final Map<String, String> UNWRAPPED_PROPS = null;
-
-  private static final String WRAPPED_MECHANISM = "DIGEST-MD5";
-  private static final Map<String, String> WRAPPED_PROPS = new HashMap<String, String>();
-
-  static {
-    WRAPPED_PROPS.put(Sasl.QOP, "auth-int");
-    WRAPPED_PROPS.put("com.sun.security.sasl.digest.realm", REALM);
-  }
-
-  private static final String testMessage1 = "Hello, world! Also, four "
-      + "score and seven years ago our fathers brought forth on this "
-      + "continent a new nation, conceived in liberty, and dedicated to the "
-      + "proposition that all men are created equal.";
-
-  private static final String testMessage2 = "I have a dream that one day "
-      + "this nation will rise up and live out the true meaning of its creed: "
-      + "'We hold these truths to be self-evident, that all men are created equal.'";
-
-
-  private static class TestSaslCallbackHandler implements CallbackHandler {
-    private final String password;
-
-    public TestSaslCallbackHandler(String password) {
-      this.password = password;
-    }
-
-    @Override
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-      for (Callback c : callbacks) {
-        if (c instanceof NameCallback) {
-          ((NameCallback) c).setName(PRINCIPAL);
-        } else if (c instanceof PasswordCallback) {
-          ((PasswordCallback) c).setPassword(password.toCharArray());
-        } else if (c instanceof AuthorizeCallback) {
-          ((AuthorizeCallback) c).setAuthorized(true);
-        } else if (c instanceof RealmCallback) {
-          ((RealmCallback) c).setText(REALM);
-        } else {
-          throw new UnsupportedCallbackException(c);
-        }
-      }
-    }
-  }
-
-  private class ServerThread extends Thread {
-    final String mechanism;
-    final Map<String, String> props;
-    volatile Throwable thrown;
-
-    public ServerThread(String mechanism, Map<String, String> props) {
-      this.mechanism = mechanism;
-      this.props = props;
-    }
-
-    public void run() {
-      try {
-        internalRun();
-      } catch (Throwable t) {
-        thrown = t;
-      }
-    }
-
-    private void internalRun() throws Exception {
-      TServerSocket serverSocket = new TServerSocket(
-        new TServerSocket.ServerSocketTransportArgs().
-          port(ServerTestBase.PORT));
-      try {
-        acceptAndWrite(serverSocket);
-      } finally {
-        serverSocket.close();
-      }
-    }
-
-    private void acceptAndWrite(TServerSocket serverSocket)
-      throws Exception {
-      TTransport serverTransport = serverSocket.accept();
-      TTransport saslServerTransport = new TSaslServerTransport(
-        mechanism, SERVICE, HOST,
-        props, new TestSaslCallbackHandler(PASSWORD), serverTransport);
-
-      saslServerTransport.open();
-
-      byte[] inBuf = new byte[testMessage1.getBytes().length];
-      // Deliberately read less than the full buffer to ensure
-      // that TSaslTransport is correctly buffering reads. This
-      // will fail for the WRAPPED test, if it doesn't work.
-      saslServerTransport.readAll(inBuf, 0, 5);
-      saslServerTransport.readAll(inBuf, 5, 10);
-      saslServerTransport.readAll(inBuf, 15, inBuf.length - 15);
-      LOGGER.debug("server got: {}", new String(inBuf));
-      assertEquals(new String(inBuf), testMessage1);
-
-      LOGGER.debug("server writing: {}", testMessage2);
-      saslServerTransport.write(testMessage2.getBytes());
-      saslServerTransport.flush();
-
-      saslServerTransport.close();
-    }
-  }
-
-  private void testSaslOpen(final String mechanism, final Map<String, String> props)
-      throws Exception {
-    ServerThread serverThread = new ServerThread(mechanism, props);
-    serverThread.start();
-
-    try {
-      Thread.sleep(1000);
-    } catch (InterruptedException e) {
-      // Ah well.
-    }
-
-    try {
-      TSocket clientSocket = new TSocket(HOST, ServerTestBase.PORT);
-      TTransport saslClientTransport = new TSaslClientTransport(mechanism,
-                                                                PRINCIPAL, SERVICE, HOST, props, new TestSaslCallbackHandler(PASSWORD), clientSocket);
-      saslClientTransport.open();
-      LOGGER.debug("client writing: {}", testMessage1);
-      saslClientTransport.write(testMessage1.getBytes());
-      saslClientTransport.flush();
-
-      byte[] inBuf = new byte[testMessage2.getBytes().length];
-      saslClientTransport.readAll(inBuf, 0, inBuf.length);
-      LOGGER.debug("client got: {}", new String(inBuf));
-      assertEquals(new String(inBuf), testMessage2);
-
-      TTransportException expectedException = null;
-      try {
-        saslClientTransport.open();
-      } catch (TTransportException e) {
-        expectedException = e;
-      }
-      assertNotNull(expectedException);
-
-      saslClientTransport.close();
-    } catch (Exception e) {
-      LOGGER.warn("Exception caught", e);
-      throw e;
-    } finally {
-      serverThread.interrupt();
-      try {
-        serverThread.join();
-      } catch (InterruptedException e) {
-        // Ah well.
-      }
-      assertNull(serverThread.thrown);
-    }
-  }
-
-  public void testUnwrappedOpen() throws Exception {
-    testSaslOpen(UNWRAPPED_MECHANISM, UNWRAPPED_PROPS);
-  }
-
-  public void testWrappedOpen() throws Exception {
-    testSaslOpen(WRAPPED_MECHANISM, WRAPPED_PROPS);
-  }
-
-  public void testAnonymousOpen() throws Exception {
-    testSaslOpen("ANONYMOUS", null);
-  }
-
-  /**
-   * Test that we get the proper exceptions thrown back the server when
-   * the client provides invalid password.
-   */
-  public void testBadPassword() throws Exception {
-    ServerThread serverThread = new ServerThread(UNWRAPPED_MECHANISM, UNWRAPPED_PROPS);
-    serverThread.start();
-
-    try {
-      Thread.sleep(1000);
-    } catch (InterruptedException e) {
-      // Ah well.
-    }
-
-    boolean clientSidePassed = true;
-
-    try {
-      TSocket clientSocket = new TSocket(HOST, ServerTestBase.PORT);
-      TTransport saslClientTransport = new TSaslClientTransport(
-        UNWRAPPED_MECHANISM, PRINCIPAL, SERVICE, HOST, UNWRAPPED_PROPS,
-        new TestSaslCallbackHandler("NOT THE PASSWORD"), clientSocket);
-      saslClientTransport.open();
-      clientSidePassed = false;
-      fail("Was able to open transport with bad password");
-    } catch (TTransportException tte) {
-      LOGGER.error("Exception for bad password", tte);
-      assertNotNull(tte.getMessage());
-      assertTrue(tte.getMessage().contains("Invalid response"));
-
-    } finally {
-      serverThread.interrupt();
-      serverThread.join();
-
-      if (clientSidePassed) {
-        assertNotNull(serverThread.thrown);
-        assertTrue(serverThread.thrown.getMessage().contains("Invalid response"));
-      }
-    }
-  }
-
-  public void testWithServer() throws Exception {
-    new TestTSaslTransportsWithServer().testIt();
-  }
-
-  private static class TestTSaslTransportsWithServer extends ServerTestBase {
-
-    private Thread serverThread;
-    private TServer server;
-
-    @Override
-    public TTransport getClientTransport(TTransport underlyingTransport) throws Exception {
-      return new TSaslClientTransport(
-        WRAPPED_MECHANISM, PRINCIPAL, SERVICE, HOST, WRAPPED_PROPS,
-        new TestSaslCallbackHandler(PASSWORD), underlyingTransport);
-    }
-
-    @Override
-    public void startServer(final TProcessor processor, final TProtocolFactory protoFactory, final TTransportFactory factory) throws Exception {
-      serverThread = new Thread() {
-        public void run() {
-          try {
-            // Transport
-            TServerSocket socket = new TServerSocket(new TServerSocket.ServerSocketTransportArgs().port(PORT));
-
-            TTransportFactory factory = new TSaslServerTransport.Factory(
-              WRAPPED_MECHANISM, SERVICE, HOST, WRAPPED_PROPS,
-              new TestSaslCallbackHandler(PASSWORD));
-            server = new TSimpleServer(new Args(socket).processor(processor).transportFactory(factory).protocolFactory(protoFactory));
-
-            // Run it
-            LOGGER.debug("Starting the server on port {}", PORT);
-            server.serve();
-          } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-          }
-        }
-      };
-      serverThread.start();
-      Thread.sleep(1000);
-    }
-
-    @Override
-    public void stopServer() throws Exception {
-      server.stop();
-      try {
-        serverThread.join();
-      } catch (InterruptedException e) {}
-    }
-
-  }
-
-
-  /**
-   * Implementation of SASL ANONYMOUS, used for testing client-side
-   * initial responses.
-   */
-  private static class AnonymousClient implements SaslClient {
-    private final String username;
-    private boolean hasProvidedInitialResponse;
-
-    public AnonymousClient(String username) {
-      this.username = username;
-    }
-
-    public String getMechanismName() { return "ANONYMOUS"; }
-    public boolean hasInitialResponse() { return true; }
-    public byte[] evaluateChallenge(byte[] challenge) throws SaslException {
-      if (hasProvidedInitialResponse) {
-        throw new SaslException("Already complete!");
-      }
-
-      try {
-        hasProvidedInitialResponse = true;
-        return username.getBytes("UTF-8");
-      } catch (IOException e) {
-        throw new SaslException(e.toString());
-      }
-    }
-    public boolean isComplete() { return hasProvidedInitialResponse; }
-    public byte[] unwrap(byte[] incoming, int offset, int len) {
-      throw new UnsupportedOperationException();
-    }
-    public byte[] wrap(byte[] outgoing, int offset, int len) {
-      throw new UnsupportedOperationException();
-    }
-    public Object getNegotiatedProperty(String propName) { return null; }
-    public void dispose() {}
-  }
-
-  private static class AnonymousServer implements SaslServer {
-    private String user;
-    public String getMechanismName() { return "ANONYMOUS"; }
-    public byte[] evaluateResponse(byte[] response) throws SaslException {
-      try {
-        this.user = new String(response, "UTF-8");
-      } catch (IOException e) {
-        throw new SaslException(e.toString());
-      }
-      return null;
-    }
-    public boolean isComplete() { return user != null; }
-    public String getAuthorizationID() { return user; }
-    public byte[] unwrap(byte[] incoming, int offset, int len) {
-      throw new UnsupportedOperationException();
-    }
-    public byte[] wrap(byte[] outgoing, int offset, int len) {
-      throw new UnsupportedOperationException();
-    }
-    public Object getNegotiatedProperty(String propName) { return null; }
-    public void dispose() {}
-
-  }
-
-  public static class SaslAnonymousFactory
-    implements SaslClientFactory, SaslServerFactory {
-
-    public SaslClient createSaslClient(
-      String[] mechanisms, String authorizationId, String protocol,
-      String serverName, Map<String,?> props, CallbackHandler cbh)
-    {
-      for (String mech : mechanisms) {
-        if ("ANONYMOUS".equals(mech)) {
-          return new AnonymousClient(authorizationId);
-        }
-      }
-      return null;
-    }
-
-    public SaslServer createSaslServer(
-      String mechanism, String protocol, String serverName, Map<String,?> props, CallbackHandler cbh)
-    {
-      if ("ANONYMOUS".equals(mechanism)) {
-        return new AnonymousServer();
-      }
-      return null;
-    }
-    public String[] getMechanismNames(Map<String, ?> props) {
-      return new String[] { "ANONYMOUS" };
-    }
-  }
-
-  static {
-    java.security.Security.addProvider(new SaslAnonymousProvider());
-  }
-  public static class SaslAnonymousProvider extends java.security.Provider {
-    public SaslAnonymousProvider() {
-      super("ThriftSaslAnonymous", 1.0, "Thrift Anonymous SASL provider");
-      put("SaslClientFactory.ANONYMOUS", SaslAnonymousFactory.class.getName());
-      put("SaslServerFactory.ANONYMOUS", SaslAnonymousFactory.class.getName());
-    }
-  }
-
-  private static class MockTTransport extends TTransport {
-
-    byte[] badHeader = null;
-    private TMemoryInputTransport readBuffer = new TMemoryInputTransport();
-
-    public MockTTransport(int mode) {
-      if (mode==1) {
-        // Invalid status byte
-        badHeader = new byte[] { (byte)0xFF, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x05 };
-      } else if (mode == 2) {
-        // Valid status byte, negative payload length
-        badHeader = new byte[] { (byte)0x01, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF };
-      } else if (mode == 3) {
-        // Valid status byte, excessively large, bogus payload length
-        badHeader = new byte[] { (byte)0x01, (byte)0x64, (byte)0x00, (byte)0x00, (byte)0x00 };
-      }
-      readBuffer.reset(badHeader);
-    }
-
-    @Override
-    public boolean isOpen() {
-      return true;
-    }
-
-    @Override
-    public void open() throws TTransportException {}
-
-    @Override
-    public void close() {}
-
-    @Override
-    public int read(byte[] buf, int off, int len) throws TTransportException {
-      return readBuffer.read(buf, off, len);
-    }
-
-    @Override
-    public void write(byte[] buf, int off, int len) throws TTransportException {}
-  }
-
-  public void testBadHeader() {
-    TSaslTransport saslTransport = new TSaslServerTransport(new MockTTransport(1));
-    try {
-      saslTransport.receiveSaslMessage();
-      fail("Should have gotten an error due to incorrect status byte value.");
-    } catch (TTransportException e) {
-      assertEquals(e.getMessage(), "Invalid status -1");
-    }
-    saslTransport = new TSaslServerTransport(new MockTTransport(2));
-    try {
-      saslTransport.receiveSaslMessage();
-      fail("Should have gotten an error due to negative payload length.");
-    } catch (TTransportException e) {
-      assertEquals(e.getMessage(), "Invalid payload header length: -1");
-    }
-    saslTransport = new TSaslServerTransport(new MockTTransport(3));
-    try {
-      saslTransport.receiveSaslMessage();
-      fail("Should have gotten an error due to bogus (large) payload length.");
-    } catch (TTransportException e) {
-      assertEquals(e.getMessage(), "Invalid payload header length: 1677721600");
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSimpleFileTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSimpleFileTransport.java
deleted file mode 100644
index 5d2fb45..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTSimpleFileTransport.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import junit.framework.TestCase;
-
-public class TestTSimpleFileTransport extends TestCase {
-  public void testFresh() throws Exception {
-    //Test write side
-    Path tempFilePathName = Files.createTempFile("TSimpleFileTransportTest", null);
-    Files.delete(tempFilePathName);        
-    byte[] input_buf = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    TSimpleFileTransport trans_write = new TSimpleFileTransport(tempFilePathName.toString(),false, true, false);
-    assert (!trans_write.isOpen());
-    trans_write.open();
-    assert(trans_write.isOpen());
-    trans_write.write(input_buf);
-    trans_write.write(input_buf,2,2);    
-    trans_write.flush();
-    trans_write.close();
-    
-    //Test read side
-    TSimpleFileTransport trans = new TSimpleFileTransport(tempFilePathName.toString(),true, false);
-    assert(trans_write.isOpen());
-    
-    //Simple file trans provides no buffer access
-    assert(0 == trans.getBufferPosition());
-    assert(null == trans.getBuffer());
-    assert(-1 == trans.getBytesRemainingInBuffer());
-
-    //Test file pointer operations
-    assert(0 == trans.getFilePointer());
-    assert(12 == trans.length());
-
-    final int BUFSIZ = 4;
-    byte[] buf1 = new byte[BUFSIZ];
-    trans.readAll(buf1, 0, BUFSIZ);
-    assert(BUFSIZ == trans.getFilePointer());
-    assert(Arrays.equals(new byte[]{1, 2, 3, 4}, buf1));
-    
-    int bytesRead = trans.read(buf1, 0, BUFSIZ);
-    assert(bytesRead > 0);
-    for (int i = 0; i < bytesRead; ++i) {
-      assert(buf1[i] == i+5);    
-    }
-    
-    trans.seek(0);
-    assert(0 == trans.getFilePointer());
-    trans.readAll(buf1, 0, BUFSIZ);
-    assert(Arrays.equals(new byte[]{1, 2, 3, 4}, buf1));
-    assert(BUFSIZ == trans.getFilePointer());
-    trans.close();
-    Files.delete(tempFilePathName);      
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTZlibTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTZlibTransport.java
deleted file mode 100644
index 3d7f9c1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/TestTZlibTransport.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.zip.DataFormatException;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.InflaterInputStream;
-
-import junit.framework.TestCase;
-
-public class TestTZlibTransport extends TestCase {
-
-  protected TTransport getTransport(TTransport underlying) {
-    return new TZlibTransport(underlying);
-  }
-
-  public static byte[] byteSequence(int start, int end) {
-    byte[] result = new byte[end-start+1];
-    for (int i = 0; i <= (end-start); i++) {
-      result[i] = (byte)(start+i);
-    }
-    return result;
-  }
-
-  public void testClose() throws TTransportException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    WriteCountingTransport countingTrans = new WriteCountingTransport(new TIOStreamTransport(new BufferedOutputStream
-        (baos)));
-    TTransport trans = getTransport(countingTrans);
-    trans.write(byteSequence(0, 245));
-    countingTrans.close();
-    trans.close();
-  }
-
-  public void testCloseOpen() throws TTransportException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    TTransport trans = getTransport(new TIOStreamTransport(baos));
-    byte[] uncompressed = byteSequence(0, 245);
-    trans.write(uncompressed);
-    trans.close();
-    final byte[] compressed = baos.toByteArray();
-
-    final byte[] buf = new byte[255];
-    TTransport transRead = getTransport(new TIOStreamTransport(new ByteArrayInputStream(compressed)));
-    int readBytes = transRead.read(buf, 0, buf.length);
-    assertEquals(uncompressed.length, readBytes);
-    transRead.close();
-  }
-
-  public void testRead() throws IOException, TTransportException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DeflaterOutputStream deflaterOutputStream = new DeflaterOutputStream(baos);
-    DataOutputStream dos = new DataOutputStream(deflaterOutputStream);
-    dos.write(byteSequence(0, 49));
-    dos.write(byteSequence(0, 219));
-
-    deflaterOutputStream.finish();
-
-    TMemoryBuffer membuf = new TMemoryBuffer(0);
-    membuf.write(baos.toByteArray());
-
-    ReadCountingTransport countTrans = new ReadCountingTransport(membuf);
-    TTransport trans = getTransport(countTrans);
-
-    byte[] readBuf = new byte[10];
-    trans.read(readBuf, 0, 10);
-    assertTrue(Arrays.equals(readBuf, byteSequence(0,9)));
-    assertEquals(1, countTrans.readCount);
-
-    trans.read(readBuf, 0, 10);
-    assertTrue(Arrays.equals(readBuf, byteSequence(10,19)));
-    assertEquals(1, countTrans.readCount);
-
-    assertEquals(30, trans.read(new byte[30], 0, 30));
-    assertEquals(1, countTrans.readCount);
-
-    readBuf = new byte[220];
-    assertEquals(220, trans.read(readBuf, 0, 220));
-    assertTrue(Arrays.equals(readBuf, byteSequence(0, 219)));
-    assertEquals(1, countTrans.readCount);
-  }
-
-  public void testWrite() throws TTransportException, IOException, DataFormatException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    WriteCountingTransport countingTrans = new WriteCountingTransport(new TIOStreamTransport(new BufferedOutputStream(baos)));
-    TTransport trans = getTransport(countingTrans);
-
-    trans.write(byteSequence(0, 100));
-    assertEquals(1, countingTrans.writeCount);
-    trans.write(byteSequence(101, 200));
-    trans.write(byteSequence(201, 255));
-    assertEquals(1, countingTrans.writeCount);
-
-    trans.flush();
-    assertEquals(2, countingTrans.writeCount);
-
-    trans.write(byteSequence(0, 245));
-    trans.flush();
-    assertEquals(3, countingTrans.writeCount);
-
-    DataInputStream din = new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(baos.toByteArray())));
-    byte[] buf = new byte[256];
-    int n = din.read(buf, 0, 256);
-    assertEquals(n, 256);
-    assertTrue(Arrays.equals(byteSequence(0, 255), buf));
-
-    buf = new byte[246];
-    n = din.read(buf, 0, 246);
-    assertEquals(n, 246);
-    for (int i = 0; i<buf.length; i++) {
-      assertEquals("for "+i, byteSequence(0,245)[i], buf[i]);
-    }
-
-    assertTrue(Arrays.equals(byteSequence(0,245), buf));
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java b/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java
deleted file mode 100644
index 358f5c6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift.transport;
-
-
-public class WriteCountingTransport extends TTransport {
-  public int writeCount = 0;
-  private final TTransport trans;
-
-  public WriteCountingTransport(TTransport underlying) {
-    trans = underlying;
-  }
-
-  @Override
-  public void close() {}
-
-  @Override
-  public boolean isOpen() {return true;}
-
-  @Override
-  public void open() throws TTransportException {}
-
-  @Override
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    return 0;
-  }
-
-  @Override
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    writeCount ++;
-    trans.write(buf, off, len);
-  }
-
-  @Override
-  public void flush() throws TTransportException {
-    trans.flush();
-  }
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/javame/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TApplicationException.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TApplicationException.java
deleted file mode 100644
index 2f8612a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TApplicationException.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TField;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolUtil;
-import org.apache.thrift.protocol.TStruct;
-import org.apache.thrift.protocol.TType;
-
-/**
- * Application level exception
- *
- */
-public class TApplicationException extends TException {
-
-  private static final long serialVersionUID = 1L;
-
-  public static final int UNKNOWN = 0;
-  public static final int UNKNOWN_METHOD = 1;
-  public static final int INVALID_MESSAGE_TYPE = 2;
-  public static final int WRONG_METHOD_NAME = 3;
-  public static final int BAD_SEQUENCE_ID = 4;
-  public static final int MISSING_RESULT = 5;
-  public static final int INTERNAL_ERROR = 6;
-  public static final int PROTOCOL_ERROR = 7;
-  public static final int INVALID_TRANSFORM = 8;
-  public static final int INVALID_PROTOCOL = 9;
-  public static final int UNSUPPORTED_CLIENT_TYPE = 10;
-
-  protected int type_ = UNKNOWN;
-
-  public TApplicationException() {
-    super();
-  }
-
-  public TApplicationException(int type) {
-    super();
-    type_ = type;
-  }
-
-  public TApplicationException(int type, String message) {
-    super(message);
-    type_ = type;
-  }
-
-  public TApplicationException(String message) {
-    super(message);
-  }
-
-  public int getType() {
-    return type_;
-  }
-
-  public static TApplicationException read(TProtocol iprot) throws TException {
-    TField field;
-    iprot.readStructBegin();
-
-    String message = null;
-    int type = UNKNOWN;
-
-    while (true) {
-      field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) {
-        break;
-      }
-      switch (field.id) {
-      case 1:
-        if (field.type == TType.STRING) {
-          message = iprot.readString();
-        } else {
-          TProtocolUtil.skip(iprot, field.type);
-        }
-        break;
-      case 2:
-        if (field.type == TType.I32) {
-          type = iprot.readI32();
-        } else {
-          TProtocolUtil.skip(iprot, field.type);
-        }
-        break;
-      default:
-        TProtocolUtil.skip(iprot, field.type);
-        break;
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    return new TApplicationException(type, message);
-  }
-
-  public void write(TProtocol oprot) throws TException {
-    TStruct struct = new TStruct("TApplicationException");
-    TField field = new TField();
-    oprot.writeStructBegin(struct);
-    if (getMessage() != null) {
-      field.name = "message";
-      field.type = TType.STRING;
-      field.id = 1;
-      oprot.writeFieldBegin(field);
-      oprot.writeString(getMessage());
-      oprot.writeFieldEnd();
-    }
-    field.name = "type";
-    field.type = TType.I32;
-    field.id = 2;
-    oprot.writeFieldBegin(field);
-    oprot.writeI32(type_);
-    oprot.writeFieldEnd();
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TBase.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TBase.java
deleted file mode 100644
index 13ea024..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TBase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * Generic base interface for generated Thrift objects.
- *
- */
-public interface TBase  {
-
-  /**
-   * Reads the TObject from the given input protocol.
-   *
-   * @param iprot Input protocol
-   */
-  public void read(TProtocol iprot) throws TException;
-
-  /**
-   * Writes the objects out to the protocol
-   *
-   * @param oprot Output protocol
-   */
-  public void write(TProtocol oprot) throws TException;
-
-  public int compareTo(Object other);
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TBaseHelper.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TBaseHelper.java
deleted file mode 100644
index 2f31d31..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TBaseHelper.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.thrift;
-
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-public class TBaseHelper {
-
-    public static int compareTo(boolean a, boolean b) {
-         return (a == b) ? 0 : (a ? 1 : -1);
-    
-
-    }
-     public static int compareTo(Boolean a, Boolean b) {
-         return (a.booleanValue() == b.booleanValue()) ? 0 : (a.booleanValue() ? 1 : -1);
-
-
-    }
-     public static int compareTo(Boolean a, boolean b) {
-         return (a.booleanValue() == b) ? 0 : (a.booleanValue() ? 1 : -1);
-
-
-    }
-
-    public static Boolean booleanValueOf(boolean b) {
-        return (b ? Boolean.TRUE : Boolean.FALSE);
-    }
-
-    public static int compareTo(byte a, byte b) {
-        if (a < b) {
-            return -1;
-        } else if (b < a) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-    public static int compareTo(short a, short b) {
-        if (a < b) {
-            return -1;
-        } else if (b < a) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-    public static int compareTo(int a, int b) {
-        if (a < b) {
-            return -1;
-        } else if (b < a) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-    public static int compareTo(long a, long b) {
-        if (a < b) {
-            return -1;
-        } else if (b < a) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-    public static int compareTo(double a, double b) {
-        if (a < b) {
-            return -1;
-        } else if (b < a) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-    public static int compareTo(String a, String b) {
-        return a.compareTo(b);
-    }
-
-    public static int compareTo(byte[] a, byte[] b) {
-        int sizeCompare = compareTo(a.length, b.length);
-        if (sizeCompare != 0) {
-            return sizeCompare;
-        }
-        for (int i = 0; i < a.length; i++) {
-            int byteCompare = compareTo(a, b);
-            if (byteCompare != 0) {
-                return byteCompare;
-            }
-        }
-        return 0;
-    }
-
-    public static int compareTo(Object a, Object b) {
-        if (a instanceof Vector) {
-            return compareTo((Vector)a, (Vector)b);
-        } if (a instanceof Hashtable) {
-            return compareTo((Hashtable)a, (Hashtable)b);
-        } else {
-            return ((TBase)a).compareTo(b);
-        }
-    }
-
-    public static int compareTo(Vector a, Vector b) {
-        int lastComparison = compareTo(a.size(), b.size());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        for (int i = 0; i < a.size(); i++) {
-            Object oA = a.elementAt(i);
-            Object oB = b.elementAt(i);
-            lastComparison = compareTo(oA, oB);
-            if (lastComparison != 0) {
-                return lastComparison;
-            }
-
-        }
-        return 0;
-    }
-
-    public static int compareTo(Hashtable a, Hashtable b) {
-        int lastComparison = compareTo(a.size(), b.size());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        Enumeration enumA = a.keys();
-        Enumeration enumB = b.keys();
-        while (lastComparison == 0 && enumA.hasMoreElements()) {
-            Object keyA = enumA.nextElement();
-            Object keyB = enumB.nextElement();
-            lastComparison = compareTo(keyA, keyB);
-            if (lastComparison == 0) {
-                lastComparison = compareTo(a.get(keyA), b.get(keyB));
-            }
-        }
-        return lastComparison;
-    }
-
-    public static int compareTo(TEnum a, TEnum b) {
-        return compareTo(a.getValue(), b.getValue());
-    }
-
-    /*
-    public static int compareTo(List a, List b) {
-        int lastComparison = compareTo(a.size(), b.size());
-        if (lastComparison != 0) {
-            return lastComparison;
-        }
-        for (int i = 0; i < a.size(); i++) {
-            Object oA = a.get(i);
-            Object oB = b.get(i);
-            if (oA instanceof List) {
-                lastComparison = compareTo((List) oA, (List) oB);
-            } else {
-                lastComparison = compareTo((Comparable) oA, (Comparable) oB);
-            }
-            if (lastComparison != 0) {
-                return lastComparison;
-            }
-        }
-        return 0;
-    }
-     */
-
-  public static void toString(byte[] bytes, StringBuffer sb) {
-    toString(bytes, 0, bytes.length, sb);
-  }
-
-  public static void toString(byte[] buf, int arrayOffset, int origLimit, StringBuffer sb) {
-    int limit = (origLimit - arrayOffset > 128) ? arrayOffset + 128 : origLimit;
-
-    for (int i = arrayOffset; i < limit; i++) {
-      if (i > arrayOffset) {
-        sb.append(" ");
-      }
-      sb.append(paddedByteString(buf[i]));
-    }
-    if (origLimit != limit) {
-      sb.append("...");
-    }
-  }
-
-  public static String paddedByteString(byte b) {
-    int extended = (b | 0x100) & 0x1ff;
-    return Integer.toHexString(extended).toUpperCase().substring(1);
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TByteArrayOutputStream.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TByteArrayOutputStream.java
deleted file mode 100644
index 077c2e6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TByteArrayOutputStream.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * Class that allows access to the underlying buf without doing deep
- * copies on it.
- *
- */
-public class TByteArrayOutputStream extends ByteArrayOutputStream {
-  public TByteArrayOutputStream(int size) {
-    super(size);
-  }
-
-  public byte[] get() {
-    return buf;
-  }
-
-  public int len() {
-    return count;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TDeserializer.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TDeserializer.java
deleted file mode 100644
index 8eceae7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TDeserializer.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TIOStreamTransport;
-
-/**
- * Generic utility for easily deserializing objects from a byte array or Java
- * String.
- *
- */
-public class TDeserializer {
-  private final TProtocolFactory protocolFactory_;
-
-  /**
-   * Create a new TDeserializer that uses the TBinaryProtocol by default.
-   */
-  public TDeserializer() {
-    this(new TBinaryProtocol.Factory());
-  }
-
-  /**
-   * Create a new TDeserializer. It will use the TProtocol specified by the
-   * factory that is passed in.
-   *
-   * @param protocolFactory Factory to create a protocol
-   */
-  public TDeserializer(TProtocolFactory protocolFactory) {
-    protocolFactory_ = protocolFactory;
-  }
-
-  /**
-   * Deserialize the Thrift object from a byte array.
-   *
-   * @param base The object to read into
-   * @param bytes The array to read from
-   */
-  public void deserialize(TBase base, byte[] bytes) throws TException {
-    base.read(
-        protocolFactory_.getProtocol(
-          new TIOStreamTransport(
-            new ByteArrayInputStream(bytes))));
-  }
-
-  /**
-   * Deserialize the Thrift object from a Java string, using a specified
-   * character set for decoding.
-   *
-   * @param base The object to read into
-   * @param data The string to read from
-   * @param charset Valid JVM charset
-   */
-  public void deserialize(TBase base, String data, String charset) throws TException {
-    try {
-      deserialize(base, data.getBytes(charset));
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT ENCODING: " + charset);
-    }
-  }
-
-  /**
-   * Deerialize the Thrift object from a Java string, using the default JVM
-   * charset encoding.
-   *
-   * @param base The object to read into
-   * @param data The string to read from
-   * @return Serialized object as a String
-   */
-  public void toString(TBase base, String data) throws TException {
-    deserialize(base, data.getBytes());
-  }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TEnum.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TEnum.java
deleted file mode 100644
index 325fdec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TEnum.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-public interface TEnum {
-  public int getValue();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TException.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TException.java
deleted file mode 100644
index 7f375b8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-/**
- * Generic exception class for Thrift.
- *
- */
-public class TException extends Exception {
-
-  private static final long serialVersionUID = 1L;
-
-  public TException() {
-    super();
-  }
-
-  public TException(String message) {
-    super(message);
-  }
-
-  public TException(Throwable cause) {
-	super(cause.getMessage());
-  }
-
-  public TException(String message, Throwable cause) {
-	  super(message);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TFieldRequirementType.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TFieldRequirementType.java
deleted file mode 100644
index 104a391..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TFieldRequirementType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-/**
- * Requirement type constants.
- *
- */
-public final class TFieldRequirementType {
-  public static final byte REQUIRED  = 1;
-  public static final byte OPTIONAL = 2;
-  public static final byte DEFAULT = 3;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TProcessor.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TProcessor.java
deleted file mode 100644
index d79522c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TProcessor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * A processor is a generic object which operates upon an input stream and
- * writes to some output stream.
- *
- */
-public interface TProcessor {
-  public boolean process(TProtocol in, TProtocol out)
-    throws TException;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TProcessorFactory.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TProcessorFactory.java
deleted file mode 100644
index bcd8a38..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TProcessorFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.transport.TTransport;
-
-/**
- * The default processor factory just returns a singleton
- * instance.
- */
-public class TProcessorFactory {
-
-  private final TProcessor processor_;
-
-  public TProcessorFactory(TProcessor processor) {
-    processor_ = processor;
-  }
-
-  public TProcessor getProcessor(TTransport trans) {
-    return processor_;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TSerializer.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TSerializer.java
deleted file mode 100644
index 4e1ce61..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TSerializer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TIOStreamTransport;
-
-/**
- * Generic utility for easily serializing objects into a byte array or Java
- * String.
- *
- */
-public class TSerializer {
-
-  /**
-   * This is the byte array that data is actually serialized into
-   */
-  private final ByteArrayOutputStream baos_ = new ByteArrayOutputStream();
-
-  /**
-   * This transport wraps that byte array
-   */
-  private final TIOStreamTransport transport_ = new TIOStreamTransport(baos_);
-
-  /**
-   * Internal protocol used for serializing objects.
-   */
-  private TProtocol protocol_;
-
-  /**
-   * Create a new TSerializer that uses the TBinaryProtocol by default.
-   */
-  public TSerializer() {
-    this(new TBinaryProtocol.Factory());
-  }
-
-  /**
-   * Create a new TSerializer. It will use the TProtocol specified by the
-   * factory that is passed in.
-   *
-   * @param protocolFactory Factory to create a protocol
-   */
-  public TSerializer(TProtocolFactory protocolFactory) {
-    protocol_ = protocolFactory.getProtocol(transport_);
-  }
-
-  /**
-   * Serialize the Thrift object into a byte array. The process is simple,
-   * just clear the byte array output, write the object into it, and grab the
-   * raw bytes.
-   *
-   * @param base The object to serialize
-   * @return Serialized object in byte[] format
-   */
-  public byte[] serialize(TBase base) throws TException {
-    baos_.reset();
-    base.write(protocol_);
-    return baos_.toByteArray();
-  }
-
-  /**
-   * Serialize the Thrift object into a Java string, using a specified
-   * character set for encoding.
-   *
-   * @param base The object to serialize
-   * @param charset Valid JVM charset
-   * @return Serialized object as a String
-   */
-  public String toString(TBase base, String charset) throws TException {
-    try {
-      return new String(serialize(base), charset);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT ENCODING: " + charset);
-    }
-  }
-
-  /**
-   * Serialize the Thrift object into a Java string, using the default JVM
-   * charset encoding.
-   *
-   * @param base The object to serialize
-   * @return Serialized object as a String
-   */
-  public String toString(TBase base) throws TException {
-    return new String(serialize(base));
-  }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TServiceClient.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TServiceClient.java
deleted file mode 100644
index ee07b78..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/TServiceClient.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift;
-
-import org.apache.thrift.protocol.TProtocol;
-
-/**
- * A TServiceClient is used to communicate with a TService implementation
- * across protocols and transports.
- */
-public interface TServiceClient {
-  /**
-   * Get the TProtocol being used as the input (read) protocol.
-   * @return
-   */
-  public TProtocol getInputProtocol();
-  /**
-   * Get the TProtocol being used as the output (write) protocol.
-   * @return
-   */
-  public TProtocol getOutputProtocol();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/FieldMetaData.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/FieldMetaData.java
deleted file mode 100644
index bce02c7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/FieldMetaData.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.TBase;
-
-import java.util.Hashtable;
-
-
-/**
- * This class is used to store meta data about thrift fields. Every field in a
- * a struct should have a corresponding instance of this class describing it.
- *
- */
-public class FieldMetaData  {
-  public final String fieldName;
-  public final byte requirementType;
-  public final FieldValueMetaData valueMetaData;
-  private static Hashtable structMap;
-  
-  static {
-    structMap = new Hashtable();
-  }
-  
-  public FieldMetaData(String name, byte req, FieldValueMetaData vMetaData){
-    this.fieldName = name;
-    this.requirementType = req;
-    this.valueMetaData = vMetaData;
-  }
-  
-  public static synchronized void addStructMetaDataMap(Class sClass, Hashtable map){
-    structMap.put(sClass, map);
-  }
-
-  /**
-   * Returns a map with metadata (i.e. instances of FieldMetaData) that
-   * describe the fields of the given class.
-   *
-   * @param sClass The TBase class for which the metadata map is requested
-   */
-  public static synchronized Hashtable getStructMetaDataMap(Class sClass){
-    if (!structMap.containsKey(sClass)){ // Load class if it hasn't been loaded
-      try{
-        sClass.newInstance();
-      } catch (InstantiationException e){
-        throw new RuntimeException("InstantiationException for TBase class: " + sClass.getName() + ", message: " + e.getMessage());
-      } catch (IllegalAccessException e){
-        throw new RuntimeException("IllegalAccessException for TBase class: " + sClass.getName() + ", message: " + e.getMessage());
-      }
-    }
-    return (Hashtable) structMap.get(sClass);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/FieldValueMetaData.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/FieldValueMetaData.java
deleted file mode 100644
index 4c017b6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/FieldValueMetaData.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.protocol.TType;
-
-
-/**
- * FieldValueMetaData and collection of subclasses to store metadata about
- * the value(s) of a field
- */
-public class FieldValueMetaData {
-  public final byte type;  
- 
-  public FieldValueMetaData(byte type){
-    this.type = type;
-  }
-  
-  public boolean isStruct() {
-    return type == TType.STRUCT; 
-  }
-  
-  public boolean isContainer() {
-    return type == TType.LIST || type == TType.MAP || type == TType.SET;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/ListMetaData.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/ListMetaData.java
deleted file mode 100644
index 5cd7194..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/ListMetaData.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.meta_data.FieldValueMetaData;
-
-public class ListMetaData extends FieldValueMetaData {
-  public final FieldValueMetaData elemMetaData;
-  
-  public ListMetaData(byte type, FieldValueMetaData eMetaData){
-    super(type);
-    this.elemMetaData = eMetaData;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/MapMetaData.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/MapMetaData.java
deleted file mode 100644
index 0d1d6f6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/MapMetaData.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.meta_data.FieldValueMetaData;
-
-public class MapMetaData extends FieldValueMetaData {
-  public final FieldValueMetaData keyMetaData;
-  public final FieldValueMetaData valueMetaData;
-  
-  public MapMetaData(byte type, FieldValueMetaData kMetaData, FieldValueMetaData vMetaData){
-    super(type);
-    this.keyMetaData = kMetaData;
-    this.valueMetaData = vMetaData;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/SetMetaData.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/SetMetaData.java
deleted file mode 100644
index 3ec6868..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/SetMetaData.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-public class SetMetaData extends FieldValueMetaData {
-  public final FieldValueMetaData elemMetaData;
-  
-  public SetMetaData(byte type, FieldValueMetaData eMetaData){
-    super(type);
-    this.elemMetaData = eMetaData;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/StructMetaData.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/StructMetaData.java
deleted file mode 100644
index e30d908..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/meta_data/StructMetaData.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.meta_data;
-
-import org.apache.thrift.TBase;
-import org.apache.thrift.meta_data.FieldValueMetaData;
-
-
-public class StructMetaData extends FieldValueMetaData {
-  public final Class structClass;
-  
-  public StructMetaData(byte type, Class sClass){
-    super(type);
-    this.structClass = sClass;
-  }    
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TBase64Utils.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TBase64Utils.java
deleted file mode 100644
index abfc965..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TBase64Utils.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Class for encoding and decoding Base64 data.
- *
- * This class is kept at package level because the interface does no input
- * validation and is therefore too low-level for generalized reuse.
- *
- * Note also that the encoding does not pad with equal signs , as discussed in
- * section 2.2 of the RFC (http://www.faqs.org/rfcs/rfc3548.html). Furthermore,
- * bad data encountered when decoding is neither rejected or ignored but simply
- * results in bad decoded data -- this is not in compliance with the RFC but is
- * done in the interest of performance.
- *
- */
-class TBase64Utils {
-
-  private static final String ENCODE_TABLE =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-  /**
-   * Encode len bytes of data in src at offset srcOff, storing the result into
-   * dst at offset dstOff. len must be 1, 2, or 3. dst must have at least len+1
-   * bytes of space at dstOff. src and dst should not be the same object. This
-   * method does no validation of the input values in the interest of
-   * performance.
-   *
-   * @param src  the source of bytes to encode
-   * @param srcOff  the offset into the source to read the unencoded bytes
-   * @param len  the number of bytes to encode (must be 1, 2, or 3).
-   * @param dst  the destination for the encoding
-   * @param dstOff  the offset into the destination to place the encoded bytes
-   */
-  static final void encode(byte[] src, int srcOff, int len,  byte[] dst,
-                           int dstOff) {
-    dst[dstOff] = (byte)ENCODE_TABLE.charAt((src[srcOff] >> 2) & 0x3F);
-    if (len == 3) {
-      dst[dstOff + 1] =
-        (byte)ENCODE_TABLE.charAt(
-                         ((src[srcOff] << 4) & 0x30) | ((src[srcOff+1] >> 4) & 0x0F));
-      dst[dstOff + 2] =
-        (byte)ENCODE_TABLE.charAt(
-                         ((src[srcOff+1] << 2) & 0x3C) | ((src[srcOff+2] >> 6) & 0x03));
-      dst[dstOff + 3] =
-        (byte)ENCODE_TABLE.charAt(src[srcOff+2] & 0x3F);
-    }
-    else if (len == 2) {
-      dst[dstOff+1] =
-        (byte)ENCODE_TABLE.charAt(
-                          ((src[srcOff] << 4) & 0x30) | ((src[srcOff+1] >> 4) & 0x0F));
-      dst[dstOff + 2] =
-        (byte)ENCODE_TABLE.charAt((src[srcOff+1] << 2) & 0x3C);
-    }
-    else { // len == 1) {
-      dst[dstOff + 1] =
-        (byte)ENCODE_TABLE.charAt((src[srcOff] << 4) & 0x30);
-    }
-  }
-
-  private static final byte[] DECODE_TABLE = {
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
-    52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,
-    -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,
-    15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
-    -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
-    41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-  };
-
-  /**
-   * Decode len bytes of data in src at offset srcOff, storing the result into
-   * dst at offset dstOff. len must be 2, 3, or 4. dst must have at least len-1
-   * bytes of space at dstOff. src and dst may be the same object as long as
-   * dstoff <= srcOff. This method does no validation of the input values in
-   * the interest of performance.
-   *
-   * @param src  the source of bytes to decode
-   * @param srcOff  the offset into the source to read the encoded bytes
-   * @param len  the number of bytes to decode (must be 2, 3, or 4)
-   * @param dst  the destination for the decoding
-   * @param dstOff  the offset into the destination to place the decoded bytes
-   */
-  static final void decode(byte[] src, int srcOff, int len,  byte[] dst,
-                           int dstOff) {
-    dst[dstOff] = (byte)
-      ((DECODE_TABLE[src[srcOff] & 0x0FF] << 2) |
-       (DECODE_TABLE[src[srcOff+1] & 0x0FF] >> 4));
-    if (len > 2) {
-      dst[dstOff+1] = (byte)
-        (((DECODE_TABLE[src[srcOff+1] & 0x0FF] << 4) & 0xF0) |
-         (DECODE_TABLE[src[srcOff+2] & 0x0FF] >> 2));
-      if (len > 3) {
-        dst[dstOff+2] = (byte)
-          (((DECODE_TABLE[src[srcOff+2] & 0x0FF] << 6) & 0xC0) |
-           DECODE_TABLE[src[srcOff+3] & 0x0FF]);
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TBinaryProtocol.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TBinaryProtocol.java
deleted file mode 100644
index f6fe765..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TBinaryProtocol.java
+++ /dev/null
@@ -1,329 +0,0 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import java.io.UnsupportedEncodingException;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Binary protocol implementation for thrift.
- *
- */
-public class TBinaryProtocol extends TProtocol {
-
-  protected static final int VERSION_MASK = 0xffff0000;
-  protected static final int VERSION_1 = 0x80010000;
-
-  protected boolean strictRead_ = false;
-  protected boolean strictWrite_ = true;
-
-  /**
-   * Factory
-   */
-  public static class Factory implements TProtocolFactory {
-    protected boolean strictRead_ = false;
-    protected boolean strictWrite_ = true;
-
-    public Factory() {
-      this(false, true);
-    }
-
-    public Factory(boolean strictRead, boolean strictWrite) {
-      strictRead_ = strictRead;
-      strictWrite_ = strictWrite;
-    }
-
-    public TProtocol getProtocol(TTransport trans) {
-      return new TBinaryProtocol(trans, strictRead_, strictWrite_);
-    }
-  }
-
-  /**
-   * Constructor
-   */
-  public TBinaryProtocol(TTransport trans) {
-    this(trans, false, true);
-  }
-
-  public TBinaryProtocol(TTransport trans, boolean strictRead, boolean strictWrite) {
-    super(trans);
-    strictRead_ = strictRead;
-    strictWrite_ = strictWrite;
-  }
-
-  public void writeMessageBegin(TMessage message) throws TException {
-    if (strictWrite_) {
-      int version = VERSION_1 | message.type;
-      writeI32(version);
-      writeString(message.name);
-      writeI32(message.seqid);
-    } else {
-      writeString(message.name);
-      writeByte(message.type);
-      writeI32(message.seqid);
-    }
-  }
-
-  public void writeMessageEnd() {}
-
-  public void writeStructBegin(TStruct struct) {}
-
-  public void writeStructEnd() {}
-
-  public void writeFieldBegin(TField field) throws TException {
-    writeByte(field.type);
-    writeI16(field.id);
-  }
-
-  public void writeFieldEnd() {}
-
-  public void writeFieldStop() throws TException {
-    writeByte(TType.STOP);
-  }
-
-  public void writeMapBegin(TMap map) throws TException {
-    writeByte(map.keyType);
-    writeByte(map.valueType);
-    writeI32(map.size);
-  }
-
-  public void writeMapEnd() {}
-
-  public void writeListBegin(TList list) throws TException {
-    writeByte(list.elemType);
-    writeI32(list.size);
-  }
-
-  public void writeListEnd() {}
-
-  public void writeSetBegin(TSet set) throws TException {
-    writeByte(set.elemType);
-    writeI32(set.size);
-  }
-
-  public void writeSetEnd() {}
-
-  public void writeBool(boolean b) throws TException {
-    writeByte(b ? (byte)1 : (byte)0);
-  }
-
-  private byte [] bout = new byte[1];
-  public void writeByte(byte b) throws TException {
-    bout[0] = b;
-    trans_.write(bout, 0, 1);
-  }
-
-  private byte[] i16out = new byte[2];
-  public void writeI16(short i16) throws TException {
-    i16out[0] = (byte)(0xff & (i16 >> 8));
-    i16out[1] = (byte)(0xff & (i16));
-    trans_.write(i16out, 0, 2);
-  }
-
-  private byte[] i32out = new byte[4];
-  public void writeI32(int i32) throws TException {
-    i32out[0] = (byte)(0xff & (i32 >> 24));
-    i32out[1] = (byte)(0xff & (i32 >> 16));
-    i32out[2] = (byte)(0xff & (i32 >> 8));
-    i32out[3] = (byte)(0xff & (i32));
-    trans_.write(i32out, 0, 4);
-  }
-
-  private byte[] i64out = new byte[8];
-  public void writeI64(long i64) throws TException {
-    i64out[0] = (byte)(0xff & (i64 >> 56));
-    i64out[1] = (byte)(0xff & (i64 >> 48));
-    i64out[2] = (byte)(0xff & (i64 >> 40));
-    i64out[3] = (byte)(0xff & (i64 >> 32));
-    i64out[4] = (byte)(0xff & (i64 >> 24));
-    i64out[5] = (byte)(0xff & (i64 >> 16));
-    i64out[6] = (byte)(0xff & (i64 >> 8));
-    i64out[7] = (byte)(0xff & (i64));
-    trans_.write(i64out, 0, 8);
-  }
-
-  public void writeDouble(double dub) throws TException {
-    writeI64(Double.doubleToLongBits(dub));
-  }
-
-  public void writeString(String str) throws TException {
-    try {
-      byte[] dat = str.getBytes("UTF-8");
-      writeI32(dat.length);
-      trans_.write(dat, 0, dat.length);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  public void writeBinary(byte[] bin) throws TException {
-    writeI32(bin.length);
-    trans_.write(bin, 0, bin.length);
-  }
-
-  /**
-   * Reading methods.
-   */
-
-  public TMessage readMessageBegin() throws TException {
-    TMessage message = new TMessage();
-
-    int size = readI32();
-    if (size < 0) {
-      int version = size & VERSION_MASK;
-      if (version != VERSION_1) {
-        throw new TProtocolException(TProtocolException.BAD_VERSION, "Bad version in readMessageBegin");
-      }
-      message.type = (byte)(size & 0x000000ff);
-      message.name = readString();
-      message.seqid = readI32();
-    } else {
-      if (strictRead_) {
-        throw new TProtocolException(TProtocolException.BAD_VERSION, "Missing version in readMessageBegin, old client?");
-      }
-      message.name = readStringBody(size);
-      message.type = readByte();
-      message.seqid = readI32();
-    }
-    return message;
-  }
-
-  public void readMessageEnd() {}
-
-  public TStruct readStructBegin() {
-    return new TStruct();
-  }
-
-  public void readStructEnd() {}
-
-  public TField readFieldBegin() throws TException {
-    TField field = new TField();
-    field.type = readByte();
-    if (field.type != TType.STOP) {
-      field.id = readI16();
-    }
-    return field;
-  }
-
-  public void readFieldEnd() {}
-
-  public TMap readMapBegin() throws TException {
-    TMap map = new TMap();
-    map.keyType = readByte();
-    map.valueType = readByte();
-    map.size = readI32();
-    return map;
-  }
-
-  public void readMapEnd() {}
-
-  public TList readListBegin() throws TException {
-    TList list = new TList();
-    list.elemType = readByte();
-    list.size = readI32();
-    return list;
-  }
-
-  public void readListEnd() {}
-
-  public TSet readSetBegin() throws TException {
-    TSet set = new TSet();
-    set.elemType = readByte();
-    set.size = readI32();
-    return set;
-  }
-
-  public void readSetEnd() {}
-
-  public boolean readBool() throws TException {
-    return (readByte() == 1);
-  }
-
-  private byte[] bin = new byte[1];
-  public byte readByte() throws TException {
-    readAll(bin, 0, 1);
-    return bin[0];
-  }
-
-  private byte[] i16rd = new byte[2];
-  public short readI16() throws TException {
-    readAll(i16rd, 0, 2);
-    return
-      (short)
-      (((i16rd[0] & 0xff) << 8) |
-       ((i16rd[1] & 0xff)));
-  }
-
-  private byte[] i32rd = new byte[4];
-  public int readI32() throws TException {
-    readAll(i32rd, 0, 4);
-    return
-      ((i32rd[0] & 0xff) << 24) |
-      ((i32rd[1] & 0xff) << 16) |
-      ((i32rd[2] & 0xff) <<  8) |
-      ((i32rd[3] & 0xff));
-  }
-
-  private byte[] i64rd = new byte[8];
-  public long readI64() throws TException {
-    readAll(i64rd, 0, 8);
-    return
-      ((long)(i64rd[0] & 0xff) << 56) |
-      ((long)(i64rd[1] & 0xff) << 48) |
-      ((long)(i64rd[2] & 0xff) << 40) |
-      ((long)(i64rd[3] & 0xff) << 32) |
-      ((long)(i64rd[4] & 0xff) << 24) |
-      ((long)(i64rd[5] & 0xff) << 16) |
-      ((long)(i64rd[6] & 0xff) <<  8) |
-      ((long)(i64rd[7] & 0xff));
-  }
-
-  public double readDouble() throws TException {
-    return Double.longBitsToDouble(readI64());
-  }
-
-  public String readString() throws TException {
-    int size = readI32();
-    return readStringBody(size);
-  }
-
-  public String readStringBody(int size) throws TException {
-    try {
-      byte[] buf = new byte[size];
-      trans_.readAll(buf, 0, size);
-      return new String(buf, "UTF-8");
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  public byte[] readBinary() throws TException {
-    int size = readI32();
-    byte[] buf = new byte[size];
-    trans_.readAll(buf, 0, size);
-    return buf;
-  }
-
-  private int readAll(byte[] buf, int off, int len) throws TException {
-    return trans_.readAll(buf, off, len);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TField.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TField.java
deleted file mode 100644
index 061140f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TField.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates field metadata.
- *
- */
-public class TField {
-  public TField() {}
-
-  public TField(String n, byte t, short i) {
-    name = n;
-    type = t;
-    id = i;
-  }
-
-  public String name = "";
-  public byte   type = TType.STOP;
-  public short  id   = 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
deleted file mode 100644
index d391686..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
+++ /dev/null
@@ -1,973 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Stack;
-
-import org.apache.thrift.TByteArrayOutputStream;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * JSON protocol implementation for thrift.
- * This is a full-featured protocol supporting write and read.
- * Please see the C++ class header for a detailed description of the
- * protocol's wire format.
- */
-public class TJSONProtocol extends TProtocol {
-
-  /**
-   * Factory for JSON protocol objects
-   */
-  public static class Factory implements TProtocolFactory {
-
-    public TProtocol getProtocol(TTransport trans) {
-      return new TJSONProtocol(trans);
-    }
-
-  }
-
-  private static final byte[]  COMMA            = new byte[] { ',' };
-  private static final byte[]  COLON            = new byte[] { ':' };
-  private static final byte[]  LBRACE           = new byte[] { '{' };
-  private static final byte[]  RBRACE           = new byte[] { '}' };
-  private static final byte[]  LBRACKET         = new byte[] { '[' };
-  private static final byte[]  RBRACKET         = new byte[] { ']' };
-  private static final byte[]  QUOTE            = new byte[] { '"' };
-  private static final byte[]  BACKSLASH        = new byte[] { '\\' };
-  private static final byte[]  ZERO             = new byte[] { '0' };
-
-  private static final byte[]  ESCSEQ           = new byte[] { '\\', 'u', '0', '0' };
-
-  private static final long    VERSION          = 1;
-
-  private static final byte[]  JSON_CHAR_TABLE  = {
-                                                /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
-                                                0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0, // 0
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1
-      1, 1, '"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2
-                                                };
-
-  private static final String  ESCAPE_CHARS     = "\"\\/bfnrt";
-
-  private static final byte[]  ESCAPE_CHAR_VALS = {
-                                                '"', '\\', '/', '\b', '\f', '\n', '\r', '\t',
-                                                };
-
-  private static final int     DEF_STRING_SIZE  = 16;
-
-  private static final byte[]  NAME_BOOL        = new byte[] { 't', 'f' };
-  private static final byte[]  NAME_BYTE        = new byte[] { 'i', '8' };
-  private static final byte[]  NAME_I16         = new byte[] { 'i', '1', '6' };
-  private static final byte[]  NAME_I32         = new byte[] { 'i', '3', '2' };
-  private static final byte[]  NAME_I64         = new byte[] { 'i', '6', '4' };
-  private static final byte[]  NAME_DOUBLE      = new byte[] { 'd', 'b', 'l' };
-  private static final byte[]  NAME_STRUCT      = new byte[] { 'r', 'e', 'c' };
-  private static final byte[]  NAME_STRING      = new byte[] { 's', 't', 'r' };
-  private static final byte[]  NAME_MAP         = new byte[] { 'm', 'a', 'p' };
-  private static final byte[]  NAME_LIST        = new byte[] { 'l', 's', 't' };
-  private static final byte[]  NAME_SET         = new byte[] { 's', 'e', 't' };
-
-  private static final TStruct ANONYMOUS_STRUCT = new TStruct();
-
-  private static final byte[] getTypeNameForTypeID(byte typeID)
-                                                               throws TException {
-    switch (typeID) {
-    case TType.BOOL:
-      return NAME_BOOL;
-    case TType.BYTE:
-      return NAME_BYTE;
-    case TType.I16:
-      return NAME_I16;
-    case TType.I32:
-      return NAME_I32;
-    case TType.I64:
-      return NAME_I64;
-    case TType.DOUBLE:
-      return NAME_DOUBLE;
-    case TType.STRING:
-      return NAME_STRING;
-    case TType.STRUCT:
-      return NAME_STRUCT;
-    case TType.MAP:
-      return NAME_MAP;
-    case TType.SET:
-      return NAME_SET;
-    case TType.LIST:
-      return NAME_LIST;
-    default:
-      throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED,
-          "Unrecognized type");
-    }
-  }
-
-  private static final byte getTypeIDForTypeName(byte[] name)
-                                                             throws TException {
-    byte result = TType.STOP;
-    if (name.length > 1) {
-      switch (name[0]) {
-      case 'd':
-        result = TType.DOUBLE;
-        break;
-      case 'i':
-        switch (name[1]) {
-        case '8':
-          result = TType.BYTE;
-          break;
-        case '1':
-          result = TType.I16;
-          break;
-        case '3':
-          result = TType.I32;
-          break;
-        case '6':
-          result = TType.I64;
-          break;
-        }
-        break;
-      case 'l':
-        result = TType.LIST;
-        break;
-      case 'm':
-        result = TType.MAP;
-        break;
-      case 'r':
-        result = TType.STRUCT;
-        break;
-      case 's':
-        if (name[1] == 't') {
-          result = TType.STRING;
-        }
-        else if (name[1] == 'e') {
-          result = TType.SET;
-        }
-        break;
-      case 't':
-        result = TType.BOOL;
-        break;
-      }
-    }
-    if (result == TType.STOP) {
-      throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED,
-          "Unrecognized type");
-    }
-    return result;
-  }
-
-  // Base class for tracking JSON contexts that may require inserting/reading
-  // additional JSON syntax characters
-  // This base context does nothing.
-  protected class JSONBaseContext {
-    /**
-     * @throws TException
-     */
-    protected void write() throws TException {}
-
-    /**
-     * @throws TException
-     */
-    protected void read() throws TException {}
-
-    protected boolean escapeNum() {
-      return false;
-    }
-  }
-
-  // Context for JSON lists. Will insert/read commas before each item except
-  // for the first one
-  protected class JSONListContext extends JSONBaseContext {
-    private boolean first_ = true;
-
-    protected void write() throws TException {
-      if (first_) {
-        first_ = false;
-      } else {
-        trans_.write(COMMA);
-      }
-    }
-
-    protected void read() throws TException {
-      if (first_) {
-        first_ = false;
-      } else {
-        readJSONSyntaxChar(COMMA);
-      }
-    }
-  }
-
-  // Context for JSON records. Will insert/read colons before the value portion
-  // of each record pair, and commas before each key except the first. In
-  // addition, will indicate that numbers in the key position need to be
-  // escaped in quotes (since JSON keys must be strings).
-  protected class JSONPairContext extends JSONBaseContext {
-    private boolean first_ = true;
-    private boolean colon_ = true;
-
-    protected void write() throws TException {
-      if (first_) {
-        first_ = false;
-        colon_ = true;
-      } else {
-        trans_.write(colon_ ? COLON : COMMA);
-        colon_ = !colon_;
-      }
-    }
-
-    protected void read() throws TException {
-      if (first_) {
-        first_ = false;
-        colon_ = true;
-      } else {
-        readJSONSyntaxChar(colon_ ? COLON : COMMA);
-        colon_ = !colon_;
-      }
-    }
-
-    protected boolean escapeNum() {
-      return colon_;
-    }
-  }
-
-  // Holds up to one byte from the transport
-  protected class LookaheadReader {
-
-    private boolean hasData_;
-    private byte[]  data_ = new byte[1];
-
-    // Return and consume the next byte to be read, either taking it from the
-    // data buffer if present or getting it from the transport otherwise.
-    protected byte read() throws TException {
-      if (hasData_) {
-        hasData_ = false;
-      }
-      else {
-        trans_.readAll(data_, 0, 1);
-      }
-      return data_[0];
-    }
-
-    // Return the next byte to be read without consuming, filling the data
-    // buffer if it has not been filled already.
-    protected byte peek() throws TException {
-      if (!hasData_) {
-        trans_.readAll(data_, 0, 1);
-      }
-      hasData_ = true;
-      return data_[0];
-    }
-  }
-
-  // Stack of nested contexts of type JSONBaseContext that we may be in
-  private Stack           contextStack_ = new Stack();
-
-  // Current context that we are in
-  private JSONBaseContext context_      = new JSONBaseContext();
-
-  // Reader that manages a 1-byte buffer
-  private LookaheadReader reader_       = new LookaheadReader();
-
-  // Push a new JSON context onto the stack.
-  private void pushContext(JSONBaseContext c) {
-    contextStack_.push(context_);
-    context_ = c;
-  }
-
-  // Pop the last JSON context off the stack
-  private void popContext() {
-    context_ = (JSONBaseContext)contextStack_.pop();
-  }
-
-  /**
-   * Constructor
-   */
-  public TJSONProtocol(TTransport trans) {
-    super(trans);
-  }
-
-  public void reset() {
-    contextStack_.clear();
-    context_ = new JSONBaseContext();
-    reader_ = new LookaheadReader();
-  }
-
-  // Temporary buffer used by several methods
-  private byte[] tmpbuf_ = new byte[4];
-
-  // Read a byte that must match b[0]; otherwise an exception is thrown.
-  // Marked protected to avoid synthetic accessor in JSONListContext.read
-  // and JSONPairContext.read
-  protected void readJSONSyntaxChar(byte[] b) throws TException {
-    byte ch = reader_.read();
-    if (ch != b[0]) {
-      throw new TProtocolException(TProtocolException.INVALID_DATA,
-          "Unexpected character:" + (char)ch);
-    }
-  }
-
-  // Convert a byte containing a hex char ('0'-'9' or 'a'-'f') into its
-  // corresponding hex value
-  private static final byte hexVal(byte ch) throws TException {
-    if ((ch >= '0') && (ch <= '9')) {
-      return (byte)((char)ch - '0');
-    }
-    else if ((ch >= 'a') && (ch <= 'f')) {
-      return (byte)((char)ch - 'a' + 10);
-    }
-    else {
-      throw new TProtocolException(TProtocolException.INVALID_DATA,
-          "Expected hex character");
-    }
-  }
-
-  // Convert a byte containing a hex value to its corresponding hex character
-  private static final byte hexChar(byte val) {
-    val &= 0x0F;
-    if (val < 10) {
-      return (byte)((char)val + '0');
-    }
-    else {
-      return (byte)((char)(val - 10) + 'a');
-    }
-  }
-
-  private static boolean isHighSurrogate(char c) {
-    return c >= '\uD800' && c <= '\uDBFF';
-  }
-
-  private static boolean isLowSurrogate(char c) {
-    return c >= '\uDC00' && c <= '\uDFFF';
-  }
-
-  private static byte[] toUTF8(int codepoint) {
-    final int[] FIRST_BYTE_MASK = { 0, 0xc0, 0xe0, 0xf0 };
-    int length = 0;
-    if (codepoint <= 0x7f) length = 1;
-    else if (codepoint <= 0x7ff) length = 2;
-    else if (codepoint <= 0xffff) length = 3;
-    else if (codepoint <= 0x1fffff) length = 4;
-    else throw new RuntimeException("Code point over U+1FFFFF is not supported");
-
-    byte[] bytes = new byte[length];
-    switch (length) {
-    case 4:
-      bytes[3] = (byte)((codepoint & 0x3f) | 0x80);
-      codepoint >>= 6;
-    case 3:
-      bytes[2] = (byte)((codepoint & 0x3f) | 0x80);
-      codepoint >>= 6;
-    case 2:
-      bytes[1] = (byte)((codepoint & 0x3f) | 0x80);
-      codepoint >>= 6;
-    case 1:
-      bytes[0] = (byte)(codepoint | FIRST_BYTE_MASK[length - 1]);
-    }
-
-    return bytes;
-  }
-
-  private static byte[] toUTF8(int high, int low) {
-    int codepoint = (1 << 16) + ((high & 0x3ff) << 10);
-    codepoint += low & 0x3ff;
-    return toUTF8(codepoint);
-  }
-
-  // Write the bytes in array buf as a JSON characters, escaping as needed
-  private void writeJSONString(byte[] b) throws TException {
-    context_.write();
-    trans_.write(QUOTE);
-    int len = b.length;
-    for (int i = 0; i < len; i++) {
-      if ((b[i] & 0x00FF) >= 0x30) {
-        if (b[i] == BACKSLASH[0]) {
-          trans_.write(BACKSLASH);
-          trans_.write(BACKSLASH);
-        }
-        else {
-          trans_.write(b, i, 1);
-        }
-      }
-      else {
-        tmpbuf_[0] = JSON_CHAR_TABLE[b[i]];
-        if (tmpbuf_[0] == 1) {
-          trans_.write(b, i, 1);
-        }
-        else if (tmpbuf_[0] > 1) {
-          trans_.write(BACKSLASH);
-          trans_.write(tmpbuf_, 0, 1);
-        }
-        else {
-          trans_.write(ESCSEQ);
-          tmpbuf_[0] = hexChar((byte)(b[i] >> 4));
-          tmpbuf_[1] = hexChar(b[i]);
-          trans_.write(tmpbuf_, 0, 2);
-        }
-      }
-    }
-    trans_.write(QUOTE);
-  }
-
-  // Write out number as a JSON value. If the context dictates so, it will be
-  // wrapped in quotes to output as a JSON string.
-  private void writeJSONInteger(long num) throws TException {
-    context_.write();
-    String str = Long.toString(num);
-    boolean escapeNum = context_.escapeNum();
-    if (escapeNum) {
-      trans_.write(QUOTE);
-    }
-    try {
-      byte[] buf = str.getBytes("UTF-8");
-      trans_.write(buf);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-    if (escapeNum) {
-      trans_.write(QUOTE);
-    }
-  }
-
-  // Write out a double as a JSON value. If it is NaN or infinity or if the
-  // context dictates escaping, write out as JSON string.
-  private void writeJSONDouble(double num) throws TException {
-    context_.write();
-    String str = Double.toString(num);
-    boolean special = false;
-    switch (str.charAt(0)) {
-    case 'N': // NaN
-    case 'I': // Infinity
-      special = true;
-      break;
-    case '-':
-      if (str.charAt(1) == 'I') { // -Infinity
-        special = true;
-      }
-      break;
-    }
-
-    boolean escapeNum = special || context_.escapeNum();
-    if (escapeNum) {
-      trans_.write(QUOTE);
-    }
-    try {
-      byte[] b = str.getBytes("UTF-8");
-      trans_.write(b, 0, b.length);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-    if (escapeNum) {
-      trans_.write(QUOTE);
-    }
-  }
-
-  // Write out contents of byte array b as a JSON string with base-64 encoded
-  // data
-  private void writeJSONBase64(byte[] b, int offset, int length) throws TException {
-    context_.write();
-    trans_.write(QUOTE);
-    int len = length;
-    int off = offset;
-    while (len >= 3) {
-      // Encode 3 bytes at a time
-      TBase64Utils.encode(b, off, 3, tmpbuf_, 0);
-      trans_.write(tmpbuf_, 0, 4);
-      off += 3;
-      len -= 3;
-    }
-    if (len > 0) {
-      // Encode remainder
-      TBase64Utils.encode(b, off, len, tmpbuf_, 0);
-      trans_.write(tmpbuf_, 0, len + 1);
-    }
-    trans_.write(QUOTE);
-  }
-
-  private void writeJSONObjectStart() throws TException {
-    context_.write();
-    trans_.write(LBRACE);
-    pushContext(new JSONPairContext());
-  }
-
-  private void writeJSONObjectEnd() throws TException {
-    popContext();
-    trans_.write(RBRACE);
-  }
-
-  private void writeJSONArrayStart() throws TException {
-    context_.write();
-    trans_.write(LBRACKET);
-    pushContext(new JSONListContext());
-  }
-
-  private void writeJSONArrayEnd() throws TException {
-    popContext();
-    trans_.write(RBRACKET);
-  }
-
-  public void writeMessageBegin(TMessage message) throws TException {
-    writeJSONArrayStart();
-    writeJSONInteger(VERSION);
-    try {
-      byte[] b = message.name.getBytes("UTF-8");
-      writeJSONString(b);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-    writeJSONInteger(message.type);
-    writeJSONInteger(message.seqid);
-  }
-
-  public void writeMessageEnd() throws TException {
-    writeJSONArrayEnd();
-  }
-
-  public void writeStructBegin(TStruct struct) throws TException {
-    writeJSONObjectStart();
-  }
-
-  public void writeStructEnd() throws TException {
-    writeJSONObjectEnd();
-  }
-
-  public void writeFieldBegin(TField field) throws TException {
-    writeJSONInteger(field.id);
-    writeJSONObjectStart();
-    writeJSONString(getTypeNameForTypeID(field.type));
-  }
-
-  public void writeFieldEnd() throws TException {
-    writeJSONObjectEnd();
-  }
-
-  public void writeFieldStop() {}
-
-  public void writeMapBegin(TMap map) throws TException {
-    writeJSONArrayStart();
-    writeJSONString(getTypeNameForTypeID(map.keyType));
-    writeJSONString(getTypeNameForTypeID(map.valueType));
-    writeJSONInteger(map.size);
-    writeJSONObjectStart();
-  }
-
-  public void writeMapEnd() throws TException {
-    writeJSONObjectEnd();
-    writeJSONArrayEnd();
-  }
-
-  public void writeListBegin(TList list) throws TException {
-    writeJSONArrayStart();
-    writeJSONString(getTypeNameForTypeID(list.elemType));
-    writeJSONInteger(list.size);
-  }
-
-  public void writeListEnd() throws TException {
-    writeJSONArrayEnd();
-  }
-
-  public void writeSetBegin(TSet set) throws TException {
-    writeJSONArrayStart();
-    writeJSONString(getTypeNameForTypeID(set.elemType));
-    writeJSONInteger(set.size);
-  }
-
-  public void writeSetEnd() throws TException {
-    writeJSONArrayEnd();
-  }
-
-  public void writeBool(boolean b) throws TException {
-    writeJSONInteger(b ? (long)1 : (long)0);
-  }
-
-  public void writeByte(byte b) throws TException {
-    writeJSONInteger(b);
-  }
-
-  public void writeI16(short i16) throws TException {
-    writeJSONInteger(i16);
-  }
-
-  public void writeI32(int i32) throws TException {
-    writeJSONInteger(i32);
-  }
-
-  public void writeI64(long i64) throws TException {
-    writeJSONInteger(i64);
-  }
-
-  public void writeDouble(double dub) throws TException {
-    writeJSONDouble(dub);
-  }
-
-  public void writeString(String str) throws TException {
-    try {
-      byte[] b = str.getBytes("UTF-8");
-      writeJSONString(b);
-    } catch (UnsupportedEncodingException uex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  public void writeBinary(byte[] bin) throws TException {
-    writeJSONBase64(bin, 0, bin.length);
-  }
-
-  /**
-   * Reading methods.
-   */
-
-  // Read in a JSON string, unescaping as appropriate.. Skip reading from the
-  // context if skipContext is true.
-  private TByteArrayOutputStream readJSONString(boolean skipContext)
-                                                                    throws TException {
-    TByteArrayOutputStream arr = new TByteArrayOutputStream(DEF_STRING_SIZE);
-    int highSurrogate = 0;
-    if (!skipContext) {
-      context_.read();
-    }
-    readJSONSyntaxChar(QUOTE);
-    while (true) {
-      byte ch = reader_.read();
-      if (ch == QUOTE[0]) {
-        break;
-      }
-      if (ch == ESCSEQ[0]) {
-        ch = reader_.read();
-        if (ch == ESCSEQ[1]) {
-          trans_.readAll(tmpbuf_, 0, 4);
-          short cu = (short)(
-              ((short)hexVal(tmpbuf_[0]) << 12) +
-              ((short)hexVal(tmpbuf_[1]) << 8) +
-              ((short)hexVal(tmpbuf_[2]) << 4) +
-              (short)hexVal(tmpbuf_[3]));
-          try {
-            if (isHighSurrogate((char)cu)) {
-              if (highSurrogate != 0) {
-                throw new TProtocolException(TProtocolException.INVALID_DATA,
-                    "Expected low surrogate char");
-              }
-              highSurrogate = cu;
-            }
-            else if (isLowSurrogate((char)cu)) {
-              if (highSurrogate == 0) {
-                throw new TProtocolException(TProtocolException.INVALID_DATA,
-                    "Expected high surrogate char");
-              }
-
-              arr.write(toUTF8(highSurrogate, cu));
-              highSurrogate = 0;
-            }
-            else {
-              arr.write(toUTF8(cu));
-            }
-            continue;
-          }
-          catch (UnsupportedEncodingException ex) {
-            throw new TProtocolException(TProtocolException.NOT_IMPLEMENTED,
-                "JVM does not support UTF-8");
-          }
-          catch (IOException ex) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA,
-                "Invalid unicode sequence");
-          }
-        }
-        else {
-          int off = ESCAPE_CHARS.indexOf(ch);
-          if (off == -1) {
-            throw new TProtocolException(TProtocolException.INVALID_DATA,
-                "Expected control char");
-          }
-          ch = ESCAPE_CHAR_VALS[off];
-        }
-      }
-      arr.write(ch);
-    }
-
-    if (highSurrogate != 0) {
-      throw new TProtocolException(TProtocolException.INVALID_DATA,
-          "Expected low surrogate char");
-    }
-    return arr;
-  }
-
-  // Return true if the given byte could be a valid part of a JSON number.
-  private boolean isJSONNumeric(byte b) {
-    switch (b) {
-    case '+':
-    case '-':
-    case '.':
-    case '0':
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9':
-    case 'E':
-    case 'e':
-      return true;
-    }
-    return false;
-  }
-
-  // Read in a sequence of characters that are all valid in JSON numbers. Does
-  // not do a complete regex check to validate that this is actually a number.
-  private String readJSONNumericChars() throws TException {
-    StringBuffer strbuf = new StringBuffer();
-    while (true) {
-      byte ch = reader_.peek();
-      if (!isJSONNumeric(ch)) {
-        break;
-      }
-      strbuf.append((char)reader_.read());
-    }
-    return strbuf.toString();
-  }
-
-  // Read in a JSON number. If the context dictates, read in enclosing quotes.
-  private long readJSONInteger() throws TException {
-    context_.read();
-    if (context_.escapeNum()) {
-      readJSONSyntaxChar(QUOTE);
-    }
-    String str = readJSONNumericChars();
-    if (context_.escapeNum()) {
-      readJSONSyntaxChar(QUOTE);
-    }
-    try {
-      return Long.valueOf(str).longValue();
-    } catch (NumberFormatException ex) {
-      throw new TProtocolException(TProtocolException.INVALID_DATA,
-          "Bad data encounted in numeric data");
-    }
-  }
-
-  // Read in a JSON double value. Throw if the value is not wrapped in quotes
-  // when expected or if wrapped in quotes when not expected.
-  private double readJSONDouble() throws TException {
-    context_.read();
-    if (reader_.peek() == QUOTE[0]) {
-      TByteArrayOutputStream arr = readJSONString(true);
-      try {
-        double dub = Double.valueOf(arr.toString("UTF-8")).doubleValue();
-        if (!context_.escapeNum() && !Double.isNaN(dub) &&
-            !Double.isInfinite(dub)) {
-          // Throw exception -- we should not be in a string in this case
-          throw new TProtocolException(TProtocolException.INVALID_DATA,
-              "Numeric data unexpectedly quoted");
-        }
-        return dub;
-      } catch (UnsupportedEncodingException ex) {
-        throw new TException("JVM DOES NOT SUPPORT UTF-8");
-      }
-    }
-    else {
-      if (context_.escapeNum()) {
-        // This will throw - we should have had a quote if escapeNum == true
-        readJSONSyntaxChar(QUOTE);
-      }
-      try {
-        return Double.valueOf(readJSONNumericChars()).doubleValue();
-      } catch (NumberFormatException ex) {
-        throw new TProtocolException(TProtocolException.INVALID_DATA,
-            "Bad data encounted in numeric data");
-      }
-    }
-  }
-
-  // Read in a JSON string containing base-64 encoded data and decode it.
-  private byte[] readJSONBase64() throws TException {
-    TByteArrayOutputStream arr = readJSONString(false);
-    byte[] b = arr.get();
-    int len = arr.len();
-    int off = 0;
-    int size = 0;
-    // Ignore padding
-    int bound = len >= 2 ? len - 2 : 0;
-    for (int i = len - 1; i >= bound && b[i] == '='; --i) {
-      --len;
-    }
-    while (len >= 4) {
-      // Decode 4 bytes at a time
-      TBase64Utils.decode(b, off, 4, b, size); // NB: decoded in place
-      off += 4;
-      len -= 4;
-      size += 3;
-    }
-    // Don't decode if we hit the end or got a single leftover byte (invalid
-    // base64 but legal for skip of regular string type)
-    if (len > 1) {
-      // Decode remainder
-      TBase64Utils.decode(b, off, len, b, size); // NB: decoded in place
-      size += len - 1;
-    }
-    // Sadly we must copy the byte[] (any way around this?)
-    byte[] result = new byte[size];
-    System.arraycopy(b, 0, result, 0, size);
-    return result;
-  }
-
-  private void readJSONObjectStart() throws TException {
-    context_.read();
-    readJSONSyntaxChar(LBRACE);
-    pushContext(new JSONPairContext());
-  }
-
-  private void readJSONObjectEnd() throws TException {
-    readJSONSyntaxChar(RBRACE);
-    popContext();
-  }
-
-  private void readJSONArrayStart() throws TException {
-    context_.read();
-    readJSONSyntaxChar(LBRACKET);
-    pushContext(new JSONListContext());
-  }
-
-  private void readJSONArrayEnd() throws TException {
-    readJSONSyntaxChar(RBRACKET);
-    popContext();
-  }
-
-  public TMessage readMessageBegin() throws TException {
-    readJSONArrayStart();
-    if (readJSONInteger() != VERSION) {
-      throw new TProtocolException(TProtocolException.BAD_VERSION,
-          "Message contained bad version.");
-    }
-    String name;
-    try {
-      name = readJSONString(false).toString("UTF-8");
-    } catch (UnsupportedEncodingException ex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-    byte type = (byte)readJSONInteger();
-    int seqid = (int)readJSONInteger();
-    return new TMessage(name, type, seqid);
-  }
-
-  public void readMessageEnd() throws TException {
-    readJSONArrayEnd();
-  }
-
-  public TStruct readStructBegin() throws TException {
-    readJSONObjectStart();
-    return ANONYMOUS_STRUCT;
-  }
-
-  public void readStructEnd() throws TException {
-    readJSONObjectEnd();
-  }
-
-  public TField readFieldBegin() throws TException {
-    byte ch = reader_.peek();
-    byte type;
-    short id = 0;
-    if (ch == RBRACE[0]) {
-      type = TType.STOP;
-    }
-    else {
-      id = (short)readJSONInteger();
-      readJSONObjectStart();
-      type = getTypeIDForTypeName(readJSONString(false).get());
-    }
-    return new TField("", type, id);
-  }
-
-  public void readFieldEnd() throws TException {
-    readJSONObjectEnd();
-  }
-
-  public TMap readMapBegin() throws TException {
-    readJSONArrayStart();
-    byte keyType = getTypeIDForTypeName(readJSONString(false).get());
-    byte valueType = getTypeIDForTypeName(readJSONString(false).get());
-    int size = (int)readJSONInteger();
-    readJSONObjectStart();
-    return new TMap(keyType, valueType, size);
-  }
-
-  public void readMapEnd() throws TException {
-    readJSONObjectEnd();
-    readJSONArrayEnd();
-  }
-
-  public TList readListBegin() throws TException {
-    readJSONArrayStart();
-    byte elemType = getTypeIDForTypeName(readJSONString(false).get());
-    int size = (int)readJSONInteger();
-    return new TList(elemType, size);
-  }
-
-  public void readListEnd() throws TException {
-    readJSONArrayEnd();
-  }
-
-  public TSet readSetBegin() throws TException {
-    readJSONArrayStart();
-    byte elemType = getTypeIDForTypeName(readJSONString(false).get());
-    int size = (int)readJSONInteger();
-    return new TSet(elemType, size);
-  }
-
-  public void readSetEnd() throws TException {
-    readJSONArrayEnd();
-  }
-
-  public boolean readBool() throws TException {
-    return (readJSONInteger() == 0 ? false : true);
-  }
-
-  public byte readByte() throws TException {
-    return (byte)readJSONInteger();
-  }
-
-  public short readI16() throws TException {
-    return (short)readJSONInteger();
-  }
-
-  public int readI32() throws TException {
-    return (int)readJSONInteger();
-  }
-
-  public long readI64() throws TException {
-    return readJSONInteger();
-  }
-
-  public double readDouble() throws TException {
-    return readJSONDouble();
-  }
-
-  public String readString() throws TException {
-    try {
-      return readJSONString(false).toString("UTF-8");
-    } catch (UnsupportedEncodingException ex) {
-      throw new TException("JVM DOES NOT SUPPORT UTF-8");
-    }
-  }
-
-  public byte[] readBinary() throws TException {
-    return readJSONBase64();
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TList.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TList.java
deleted file mode 100644
index 88f6785..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TList.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates list metadata.
- *
- */
-public class TList {
-  public TList() {}
-
-  public TList(byte t, int s) {
-    elemType = t;
-    size = s;
-  }
-
-  public byte elemType = TType.STOP;
-  public int  size     = 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMap.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMap.java
deleted file mode 100644
index 718a119..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMap.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates map metadata.
- *
- */
-public class TMap {
-  public TMap() {}
-
-  public TMap(byte k, byte v, int s) {
-    keyType = k;
-    valueType = v;
-    size = s;
-  }
-
-  public byte  keyType   = TType.STOP;
-  public byte  valueType = TType.STOP;
-  public int   size      = 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMessage.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMessage.java
deleted file mode 100644
index 408b05a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMessage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates struct metadata.
- *
- */
-public class TMessage {
-  public TMessage() {}
-
-  public TMessage(String n, byte t, int s) {
-    name = n;
-    type = t;
-    seqid = s;
-  }
-
-  public String name = "";
-  public byte type;
-  public int seqid;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMessageType.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMessageType.java
deleted file mode 100644
index 714ea70..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TMessageType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Message type constants in the Thrift protocol.
- *
- */
-public final class TMessageType {
-  public static final byte CALL  = 1;
-  public static final byte REPLY = 2;
-  public static final byte EXCEPTION = 3;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocol.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocol.java
deleted file mode 100644
index 710e6d4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocol.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Protocol interface definition.
- *
- */
-public abstract class TProtocol {
-
-  /**
-   * Prevent direct instantiation
-   */
-  private TProtocol() {}
-
-  /**
-   * Transport
-   */
-  protected TTransport trans_;
-
-  /**
-   * Constructor
-   */
-  protected TProtocol(TTransport trans) {
-    trans_ = trans;
-  }
-
-  /**
-   * Transport accessor
-   */
-  public TTransport getTransport() {
-    return trans_;
-  }
-
-  /**
-   * Writing methods.
-   */
-
-  public abstract void writeMessageBegin(TMessage message) throws TException;
-
-  public abstract void writeMessageEnd() throws TException;
-
-  public abstract void writeStructBegin(TStruct struct) throws TException;
-
-  public abstract void writeStructEnd() throws TException;
-
-  public abstract void writeFieldBegin(TField field) throws TException;
-
-  public abstract void writeFieldEnd() throws TException;
-
-  public abstract void writeFieldStop() throws TException;
-
-  public abstract void writeMapBegin(TMap map) throws TException;
-
-  public abstract void writeMapEnd() throws TException;
-
-  public abstract void writeListBegin(TList list) throws TException;
-
-  public abstract void writeListEnd() throws TException;
-
-  public abstract void writeSetBegin(TSet set) throws TException;
-
-  public abstract void writeSetEnd() throws TException;
-
-  public abstract void writeBool(boolean b) throws TException;
-
-  public void writeBool(Boolean b) throws TException {
-      writeBool(b.booleanValue());
-  }
-
-  public abstract void writeByte(byte b) throws TException;
-
-  public void writeByte(Byte b) throws TException {
-      writeByte(b.byteValue());
-  }
-
-  public abstract void writeI16(short i16) throws TException;
-
-  public void writeI16(Short i16) throws TException {
-      writeI16(i16.shortValue());
-  }
-
-  public abstract void writeI32(int i32) throws TException;
-
-  public void writeI32(Integer i32) throws TException {
-      writeI32(i32.intValue());
-  }
-
-  public abstract void writeI64(long i64) throws TException;
-
-  public void writeI64(Long i64) throws TException {
-      writeI64(i64.longValue());
-  }
-
-  public abstract void writeDouble(double dub) throws TException;
-
-  public void writeDouble(Double d) throws TException {
-      writeDouble(d.doubleValue());
-  }
-
-  public abstract void writeString(String str) throws TException;
-
-  public abstract void writeBinary(byte[] bin) throws TException;
-
-  /**
-   * Reading methods.
-   */
-
-  public abstract TMessage readMessageBegin() throws TException;
-
-  public abstract void readMessageEnd() throws TException;
-
-  public abstract TStruct readStructBegin() throws TException;
-
-  public abstract void readStructEnd() throws TException;
-
-  public abstract TField readFieldBegin() throws TException;
-
-  public abstract void readFieldEnd() throws TException;
-
-  public abstract TMap readMapBegin() throws TException;
-
-  public abstract void readMapEnd() throws TException;
-
-  public abstract TList readListBegin() throws TException;
-
-  public abstract void readListEnd() throws TException;
-
-  public abstract TSet readSetBegin() throws TException;
-
-  public abstract void readSetEnd() throws TException;
-
-  public abstract boolean readBool() throws TException;
-
-  public abstract byte readByte() throws TException;
-
-  public abstract short readI16() throws TException;
-
-  public abstract int readI32() throws TException;
-
-  public abstract long readI64() throws TException;
-
-  public abstract double readDouble() throws TException;
-
-  public abstract String readString() throws TException;
-
-  public abstract byte[] readBinary() throws TException;
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolException.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolException.java
deleted file mode 100644
index 248815b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolException.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TException;
-
-/**
- * Protocol exceptions.
- *
- */
-public class TProtocolException extends TException {
-
-
-  private static final long serialVersionUID = 1L;
-  public static final int UNKNOWN = 0;
-  public static final int INVALID_DATA = 1;
-  public static final int NEGATIVE_SIZE = 2;
-  public static final int SIZE_LIMIT = 3;
-  public static final int BAD_VERSION = 4;
-  public static final int NOT_IMPLEMENTED = 5;
-
-  protected int type_ = UNKNOWN;
-
-  public TProtocolException() {
-    super();
-  }
-
-  public TProtocolException(int type) {
-    super();
-    type_ = type;
-  }
-
-  public TProtocolException(int type, String message) {
-    super(message);
-    type_ = type;
-  }
-
-  public TProtocolException(String message) {
-    super(message);
-  }
-
-  public TProtocolException(int type, Throwable cause) {
-    super(cause);
-    type_ = type;
-  }
-
-  public TProtocolException(Throwable cause) {
-    super(cause);
-  }
-
-  public TProtocolException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  public TProtocolException(int type, String message, Throwable cause) {
-    super(message, cause);
-    type_ = type;
-  }
-
-  public int getType() {
-    return type_;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolFactory.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolFactory.java
deleted file mode 100644
index afa502b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.transport.TTransport;
-
-/**
- * Factory interface for constructing protocol instances.
- *
- */
-public interface TProtocolFactory {
-  public TProtocol getProtocol(TTransport trans);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolUtil.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolUtil.java
deleted file mode 100644
index 9bf10f6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TProtocolUtil.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-import org.apache.thrift.TException;
-
-/**
- * Utility class with static methods for interacting with protocol data
- * streams.
- *
- */
-public class TProtocolUtil {
-
-  /**
-   * The maximum recursive depth the skip() function will traverse before
-   * throwing a TException.
-   */
-  private static int maxSkipDepth = Integer.MAX_VALUE;
-
-  /**
-   * Specifies the maximum recursive depth that the skip function will
-   * traverse before throwing a TException.  This is a global setting, so
-   * any call to skip in this JVM will enforce this value.
-   *
-   * @param depth  the maximum recursive depth.  A value of 2 would allow
-   *    the skip function to skip a structure or collection with basic children,
-   *    but it would not permit skipping a struct that had a field containing
-   *    a child struct.  A value of 1 would only allow skipping of simple
-   *    types and empty structs/collections.
-   */
-  public static void setMaxSkipDepth(int depth) {
-    maxSkipDepth = depth;
-  }
-
-  /**
-   * Skips over the next data element from the provided input TProtocol object.
-   *
-   * @param prot  the protocol object to read from
-   * @param type  the next value will be intepreted as this TType value.
-   */
-  public static void skip(TProtocol prot, byte type)
-    throws TException {
-    skip(prot, type, maxSkipDepth);
-  }
-
-  /**
-   * Skips over the next data element from the provided input TProtocol object.
-   *
-   * @param prot  the protocol object to read from
-   * @param type  the next value will be intepreted as this TType value.
-   * @param maxDepth  this function will only skip complex objects to this
-   *   recursive depth, to prevent Java stack overflow.
-   */
-  public static void skip(TProtocol prot, byte type, int maxDepth)
-  throws TException {
-    if (maxDepth <= 0) {
-      throw new TException("Maximum skip depth exceeded");
-    }
-    switch (type) {
-    case TType.BOOL:
-      {
-        prot.readBool();
-        break;
-      }
-    case TType.BYTE:
-      {
-        prot.readByte();
-        break;
-      }
-    case TType.I16:
-      {
-        prot.readI16();
-        break;
-      }
-    case TType.I32:
-      {
-        prot.readI32();
-        break;
-      }
-    case TType.I64:
-      {
-        prot.readI64();
-        break;
-      }
-    case TType.DOUBLE:
-      {
-        prot.readDouble();
-        break;
-      }
-    case TType.STRING:
-      {
-        prot.readBinary();
-        break;
-      }
-    case TType.STRUCT:
-      {
-        prot.readStructBegin();
-        while (true) {
-          TField field = prot.readFieldBegin();
-          if (field.type == TType.STOP) {
-            break;
-          }
-          skip(prot, field.type, maxDepth - 1);
-          prot.readFieldEnd();
-        }
-        prot.readStructEnd();
-        break;
-      }
-    case TType.MAP:
-      {
-        TMap map = prot.readMapBegin();
-        for (int i = 0; i < map.size; i++) {
-          skip(prot, map.keyType, maxDepth - 1);
-          skip(prot, map.valueType, maxDepth - 1);
-        }
-        prot.readMapEnd();
-        break;
-      }
-    case TType.SET:
-      {
-        TSet set = prot.readSetBegin();
-        for (int i = 0; i < set.size; i++) {
-          skip(prot, set.elemType, maxDepth - 1);
-        }
-        prot.readSetEnd();
-        break;
-      }
-    case TType.LIST:
-      {
-        TList list = prot.readListBegin();
-        for (int i = 0; i < list.size; i++) {
-          skip(prot, list.elemType, maxDepth - 1);
-        }
-        prot.readListEnd();
-        break;
-      }
-    default:
-      break;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TSet.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TSet.java
deleted file mode 100644
index f4e9b1d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TSet.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates set metadata.
- *
- */
-public class TSet {
-  public TSet() {}
-
-  public TSet(byte t, int s) {
-    elemType = t;
-    size = s;
-  }
-
-  public byte elemType = TType.STOP;
-  public int  size     = 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TStruct.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TStruct.java
deleted file mode 100644
index cecbbcf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TStruct.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Helper class that encapsulates struct metadata.
- *
- */
-public class TStruct {
-  public TStruct() {}
-
-  public TStruct(String n) {
-    name = n;
-  }
-
-  public String name = "";
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TType.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TType.java
deleted file mode 100644
index dbdc3ca..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/protocol/TType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.protocol;
-
-/**
- * Type constants in the Thrift protocol.
- *
- */
-public final class TType {
-  public static final byte STOP   = 0;
-  public static final byte VOID   = 1;
-  public static final byte BOOL   = 2;
-  public static final byte BYTE   = 3;
-  public static final byte DOUBLE = 4;
-  public static final byte I16    = 6;
-  public static final byte I32    = 8;
-  public static final byte I64    = 10;
-  public static final byte STRING = 11;
-  public static final byte STRUCT = 12;
-  public static final byte MAP    = 13;
-  public static final byte SET    = 14;
-  public static final byte LIST   = 15;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TFramedTransport.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TFramedTransport.java
deleted file mode 100644
index c83748a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TFramedTransport.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.ByteArrayInputStream;
-
-import org.apache.thrift.TByteArrayOutputStream;
-
-/**
- * Socket implementation of the TTransport interface. To be commented soon!
- *
- */
-public class TFramedTransport extends TTransport {
-
-  /**
-   * Underlying transport
-   */
-  private TTransport transport_ = null;
-
-  /**
-   * Buffer for output
-   */
-  private final TByteArrayOutputStream writeBuffer_ =
-    new TByteArrayOutputStream(1024);
-
-  /**
-   * Buffer for input
-   */
-  private ByteArrayInputStream readBuffer_ = null;
-
-  public static class Factory extends TTransportFactory {
-    public Factory() {
-    }
-
-    public TTransport getTransport(TTransport base) {
-      return new TFramedTransport(base);
-    }
-  }
-
-  /**
-   * Constructor wraps around another tranpsort
-   */
-  public TFramedTransport(TTransport transport) {
-    transport_ = transport;
-  }
-
-  public void open() throws TTransportException {
-    transport_.open();
-  }
-
-  public boolean isOpen() {
-    return transport_.isOpen();
-  }
-
-  public void close() {
-    transport_.close();
-  }
-
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (readBuffer_ != null) {
-      int got = readBuffer_.read(buf, off, len);
-      if (got > 0) {
-        return got;
-      }
-    }
-
-    // Read another frame of data
-    readFrame();
-
-    return readBuffer_.read(buf, off, len);
-  }
-
-  private void readFrame() throws TTransportException {
-    byte[] i32rd = new byte[4];
-    transport_.readAll(i32rd, 0, 4);
-    int size =
-      ((i32rd[0] & 0xff) << 24) |
-      ((i32rd[1] & 0xff) << 16) |
-      ((i32rd[2] & 0xff) <<  8) |
-      ((i32rd[3] & 0xff));
-
-    byte[] buff = new byte[size];
-    transport_.readAll(buff, 0, size);
-    readBuffer_ = new ByteArrayInputStream(buff);
-  }
-
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    writeBuffer_.write(buf, off, len);
-  }
-
-  public void flush() throws TTransportException {
-    byte[] buf = writeBuffer_.get();
-    int len = writeBuffer_.len();
-    writeBuffer_.reset();
-
-    byte[] i32out = new byte[4];
-    i32out[0] = (byte)(0xff & (len >> 24));
-    i32out[1] = (byte)(0xff & (len >> 16));
-    i32out[2] = (byte)(0xff & (len >> 8));
-    i32out[3] = (byte)(0xff & (len));
-    transport_.write(i32out, 0, 4);
-    transport_.write(buf, 0, len);
-    transport_.flush();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/THttpClient.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/THttpClient.java
deleted file mode 100644
index e6ffba4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/THttpClient.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import javax.microedition.io.Connector;
-import javax.microedition.io.HttpConnection;
-
-/**
- * HTTP implementation of the TTransport interface. Used for working with a
- * Thrift web services implementation.
- *
- */
-public class THttpClient extends TTransport {
-
-  private String url_ = null;
-
-  private final ByteArrayOutputStream requestBuffer_ = new ByteArrayOutputStream();
-
-  private InputStream inputStream_ = null;
-
-  private HttpConnection connection = null;
-
-  private int connectTimeout_ = 0;
-
-  private int readTimeout_ = 0;
-
-  private Hashtable customHeaders_ = null;
-
-  public THttpClient(String url) throws TTransportException {
-    url_ = url;
-  }
-
-  public void setConnectTimeout(int timeout) {
-    connectTimeout_ = timeout;
-  }
-
-  public void setReadTimeout(int timeout) {
-    readTimeout_ = timeout;
-  }
-
-  public void setCustomHeaders(Hashtable headers) {
-    customHeaders_ = headers;
-  }
-
-  public void setCustomHeader(String key, String value) {
-    if (customHeaders_ == null) {
-      customHeaders_ = new Hashtable();
-    }
-    customHeaders_.put(key, value);
-  }
-
-  public void open() {}
-
-  public void close() {
-    if (null != inputStream_) {
-      try {
-        inputStream_.close();
-      } catch (IOException ioe) {
-      }
-      inputStream_ = null;
-    }
-
-    if (connection != null) {
-      try {
-        connection.close();
-      } catch (IOException ioe) {
-      }
-      connection = null;
-    }
-  }
-
-  public boolean isOpen() {
-    return true;
-  }
-
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (inputStream_ == null) {
-      throw new TTransportException("Response buffer is empty, no request.");
-    }
-    try {
-      int ret = inputStream_.read(buf, off, len);
-      if (ret == -1) {
-        throw new TTransportException("No more data available.");
-      }
-      return ret;
-    } catch (IOException iox) {
-      throw new TTransportException(iox);
-    }
-  }
-
-  public void write(byte[] buf, int off, int len) {
-    requestBuffer_.write(buf, off, len);
-  }
-  
-  public void flush() throws TTransportException {
-    // Extract request and reset buffer
-    byte[] data = requestBuffer_.toByteArray();
-    requestBuffer_.reset();
-
-    try {
-      // Create connection object
-      connection = (HttpConnection)Connector.open(url_);
-  
-      // Make the request
-      connection.setRequestMethod("POST");
-      connection.setRequestProperty("Content-Type", "application/x-thrift");
-      connection.setRequestProperty("Accept", "application/x-thrift");
-      connection.setRequestProperty("User-Agent", "JavaME/THttpClient");
-
-      connection.setRequestProperty("Connection", "Keep-Alive");
-      connection.setRequestProperty("Keep-Alive", "5000");
-      connection.setRequestProperty("Http-version", "HTTP/1.1");
-      connection.setRequestProperty("Cache-Control", "no-transform");
-
-      if (customHeaders_ != null) {
-        for (Enumeration e = customHeaders_.keys() ; e.hasMoreElements() ;) {
-          String key = (String)e.nextElement();
-          String value = (String)customHeaders_.get(key);
-          connection.setRequestProperty(key, value);
-        }
-      }
-  
-      OutputStream os = connection.openOutputStream();
-      os.write(data);
-      os.close();
-
-      int responseCode = connection.getResponseCode();
-      if (responseCode != HttpConnection.HTTP_OK) {
-        throw new TTransportException("HTTP Response code: " + responseCode);
-      }
-
-      // Read the responses
-      inputStream_ = connection.openInputStream();
-    } catch (IOException iox) {
-      System.out.println(iox.toString());
-      throw new TTransportException(iox);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TIOStreamTransport.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TIOStreamTransport.java
deleted file mode 100644
index ccf7064..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TIOStreamTransport.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * This is the most commonly used base transport. It takes an InputStream
- * and an OutputStream and uses those to perform all transport operations.
- * This allows for compatibility with all the nice constructs Java already
- * has to provide a variety of types of streams.
- *
- */
-public class TIOStreamTransport extends TTransport {
-
-
-  /** Underlying inputStream */
-  protected InputStream inputStream_ = null;
-
-  /** Underlying outputStream */
-  protected OutputStream outputStream_ = null;
-
-  /**
-   * Subclasses can invoke the default constructor and then assign the input
-   * streams in the open method.
-   */
-  protected TIOStreamTransport() {}
-
-  /**
-   * Input stream constructor.
-   *
-   * @param is Input stream to read from
-   */
-  public TIOStreamTransport(InputStream is) {
-    inputStream_ = is;
-  }
-
-  /**
-   * Output stream constructor.
-   *
-   * @param os Output stream to read from
-   */
-  public TIOStreamTransport(OutputStream os) {
-    outputStream_ = os;
-  }
-
-  /**
-   * Two-way stream constructor.
-   *
-   * @param is Input stream to read from
-   * @param os Output stream to read from
-   */
-  public TIOStreamTransport(InputStream is, OutputStream os) {
-    inputStream_ = is;
-    outputStream_ = os;
-  }
-
-  /**
-   * The streams must already be open at construction time, so this should
-   * always return true.
-   *
-   * @return true
-   */
-  public boolean isOpen() {
-    return true;
-  }
-
-  /**
-   * The streams must already be open. This method does nothing.
-   */
-  public void open() throws TTransportException {}
-
-  /**
-   * Closes both the input and output streams.
-   */
-  public void close() {
-    if (inputStream_ != null) {
-      try {
-        inputStream_.close();
-      } catch (IOException iox) {
-      }
-      inputStream_ = null;
-    }
-    if (outputStream_ != null) {
-      try {
-        outputStream_.close();
-      } catch (IOException iox) {
-      }
-      outputStream_ = null;
-    }
-  }
-
-  /**
-   * Reads from the underlying input stream if not null.
-   */
-  public int read(byte[] buf, int off, int len) throws TTransportException {
-    if (inputStream_ == null) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Cannot read from null inputStream");
-    }
-    try {
-      return inputStream_.read(buf, off, len);
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.UNKNOWN, iox);
-    }
-  }
-
-  /**
-   * Writes to the underlying output stream if not null.
-   */
-  public void write(byte[] buf, int off, int len) throws TTransportException {
-    if (outputStream_ == null) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Cannot write to null outputStream");
-    }
-    try {
-      outputStream_.write(buf, off, len);
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.UNKNOWN, iox);
-    }
-  }
-
-  /**
-   * Flushes the underlying output stream if not null.
-   */
-  public void flush() throws TTransportException {
-    if (outputStream_ == null) {
-      throw new TTransportException(TTransportException.NOT_OPEN, "Cannot flush null outputStream");
-    }
-    try {
-      outputStream_.flush();
-    } catch (IOException iox) {
-      throw new TTransportException(TTransportException.UNKNOWN, iox);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TMemoryBuffer.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TMemoryBuffer.java
deleted file mode 100644
index 4ae1ab2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TMemoryBuffer.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.TByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
-/**
- * Memory buffer-based implementation of the TTransport interface.
- */
-public class TMemoryBuffer extends TTransport {
-  /**
-   * Create a TMemoryBuffer with an initial buffer size of <i>size</i>. The
-   * internal buffer will grow as necessary to accommodate the size of the data
-   * being written to it.
-   */
-  public TMemoryBuffer(int size) {
-    arr_ = new TByteArrayOutputStream(size);
-  }
-
-  public boolean isOpen() {
-    return true;
-  }
-
-  public void open() {
-    /* Do nothing */
-  }
-
-  public void close() {
-    /* Do nothing */
-  }
-
-  public int read(byte[] buf, int off, int len) {
-    byte[] src = arr_.get();
-    int amtToRead = (len > arr_.len() - pos_ ? arr_.len() - pos_ : len);
-    if (amtToRead > 0) {
-      System.arraycopy(src, pos_, buf, off, amtToRead);
-      pos_ += amtToRead;
-    }
-    return amtToRead;
-  }
-
-  public void write(byte[] buf, int off, int len) {
-    arr_.write(buf, off, len);
-  }
-
-  /**
-   * Output the contents of the memory buffer as a String, using the supplied
-   * encoding
-   * 
-   * @param enc the encoding to use
-   * @return the contents of the memory buffer as a String
-   */
-  public String toString(String enc) throws UnsupportedEncodingException {
-    return arr_.toString(enc);
-  }
-
-  public String inspect() {
-    String buf = "";
-    byte[] bytes = arr_.toByteArray();
-    for (int i = 0; i < bytes.length; i++) {
-      buf += (pos_ == i ? "==>" : "") + Integer.toHexString(bytes[i] & 0xff) + " ";
-    }
-    return buf;
-  }
-
-  // The contents of the buffer
-  private TByteArrayOutputStream arr_;
-
-  // Position to read next byte from
-  private int                    pos_;
-
-  public int length() {
-    return arr_.size();
-  }
-
-  public byte[] getArray() {
-    return arr_.get();
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransport.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransport.java
deleted file mode 100644
index a6c047b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransport.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-/**
- * Generic class that encapsulates the I/O layer. This is basically a thin
- * wrapper around the combined functionality of Java input/output streams.
- *
- */
-public abstract class TTransport {
-
-  /**
-   * Queries whether the transport is open.
-   *
-   * @return True if the transport is open.
-   */
-  public abstract boolean isOpen();
-
-  /**
-   * Is there more data to be read?
-   *
-   * @return True if the remote side is still alive and feeding us
-   */
-  public boolean peek() {
-    return isOpen();
-  }
-
-  /**
-   * Opens the transport for reading/writing.
-   *
-   * @throws TTransportException if the transport could not be opened
-   */
-  public abstract void open()
-    throws TTransportException;
-
-  /**
-   * Closes the transport.
-   */
-  public abstract void close();
-
-  /**
-   * Reads up to len bytes into buffer buf, starting att offset off.
-   *
-   * @param buf Array to read into
-   * @param off Index to start reading at
-   * @param len Maximum number of bytes to read
-   * @return The number of bytes actually read
-   * @throws TTransportException if there was an error reading data
-   */
-  public abstract int read(byte[] buf, int off, int len)
-    throws TTransportException;
-
-  /**
-   * Guarantees that all of len bytes are actually read off the transport.
-   *
-   * @param buf Array to read into
-   * @param off Index to start reading at
-   * @param len Maximum number of bytes to read
-   * @return The number of bytes actually read, which must be equal to len
-   * @throws TTransportException if there was an error reading data
-   */
-  public int readAll(byte[] buf, int off, int len)
-    throws TTransportException {
-    int got = 0;
-    int ret = 0;
-    while (got < len) {
-      ret = read(buf, off+got, len-got);
-      if (ret <= 0) {
-        throw new TTransportException("Cannot read. Remote side has closed. Tried to read " + len + " bytes, but only got " + got + " bytes.");
-      }
-      got += ret;
-    }
-    return got;
-  }
-
-  /**
-   * Writes the buffer to the output
-   *
-   * @param buf The output data buffer
-   * @throws TTransportException if an error occurs writing data
-   */
-  public void write(byte[] buf) throws TTransportException {
-    write(buf, 0, buf.length);
-  }
-
-  /**
-   * Writes up to len bytes from the buffer.
-   *
-   * @param buf The output data buffer
-   * @param off The offset to start writing from
-   * @param len The number of bytes to write
-   * @throws TTransportException if there was an error writing data
-   */
-  public abstract void write(byte[] buf, int off, int len)
-    throws TTransportException;
-
-  /**
-   * Flush any pending data out of a transport buffer.
-   *
-   * @throws TTransportException if there was an error writing out data.
-   */
-  public void flush()
-    throws TTransportException {}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransportException.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransportException.java
deleted file mode 100644
index d08f3b0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransportException.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-import org.apache.thrift.TException;
-
-/**
- * Transport exceptions.
- *
- */
-public class TTransportException extends TException {
-
-  private static final long serialVersionUID = 1L;
-
-  public static final int UNKNOWN = 0;
-  public static final int NOT_OPEN = 1;
-  public static final int ALREADY_OPEN = 2;
-  public static final int TIMED_OUT = 3;
-  public static final int END_OF_FILE = 4;
-
-  protected int type_ = UNKNOWN;
-
-  public TTransportException() {
-    super();
-  }
-
-  public TTransportException(int type) {
-    super();
-    type_ = type;
-  }
-
-  public TTransportException(int type, String message) {
-    super(message);
-    type_ = type;
-  }
-
-  public TTransportException(String message) {
-    super(message);
-  }
-
-  public TTransportException(int type, Throwable cause) {
-    super(cause);
-    type_ = type;
-  }
-
-  public TTransportException(Throwable cause) {
-    super(cause);
-  }
-
-  public TTransportException(String message, Throwable cause) {
-    super(message, cause);
-  }
-
-  public TTransportException(int type, String message, Throwable cause) {
-    super(message, cause);
-    type_ = type;
-  }
-
-  public int getType() {
-    return type_;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransportFactory.java b/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransportFactory.java
deleted file mode 100644
index 45b607f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/javame/src/org/apache/thrift/transport/TTransportFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.thrift.transport;
-
-/**
- * Factory class used to create wrapped instance of Transports.
- * This is used primarily in servers, which get Transports from
- * a ServerTransport and then may want to mutate them (i.e. create
- * a BufferedTransport from the underlying base transport)
- *
- */
-public class TTransportFactory {
-
-  /**
-   * Return a wrapped instance of the base Transport.
-   *
-   * @param in The base transport
-   * @returns Wrapped Transport
-   */
-  public TTransport getTransport(TTransport trans) {
-    return trans;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/js/Gruntfile.js b/vendor/git.apache.org/thrift.git/lib/js/Gruntfile.js
deleted file mode 100644
index bff250f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/Gruntfile.js
+++ /dev/null
@@ -1,172 +0,0 @@
-//To build dist/thrift.js, dist/thrift.min.js and doc/*
-//run grunt at the command line in this directory.
-//Prerequisites:
-// Node Setup -   nodejs.org
-// Grunt Setup -  npm install  //reads the ./package.json and installs project dependencies
-
-module.exports = function(grunt) {
-  'use strict';
-
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-    concat: {
-      options: {
-        separator: ';'
-      },
-      dist: {
-        src: ['src/**/*.js'],
-        dest: 'dist/<%= pkg.name %>.js'
-      }
-    },
-    jsdoc : {
-        dist : {
-            src: ['src/*.js', './README.md'],
-            options: {
-              destination: 'doc'
-            }
-        }
-    },
-    uglify: {
-      options: {
-        banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
-      },
-      dist: {
-        files: {
-          'dist/<%= pkg.name %>.min.js': ['<%= concat.dist.dest %>']
-        }
-      }
-    },
-    shell: {
-      InstallThriftJS: {
-        command: 'mkdir test/build; mkdir test/build/js; cp src/thrift.js test/build/js/thrift.js'
-      },
-      InstallThriftNodeJSDep: {
-        command: 'cd ../..; npm install'
-      },
-      ThriftGen: {
-        command: '../../compiler/cpp/thrift -gen js -gen js:node -o test ../../test/ThriftTest.thrift'
-      },
-      ThriftGenJQ: {
-        command: '../../compiler/cpp/thrift -gen js:jquery -gen js:node -o test ../../test/ThriftTest.thrift'
-      },
-      ThriftGenDeepConstructor: {
-        command: '../../compiler/cpp/thrift -gen js -o test ../../test/JsDeepConstructorTest.thrift'
-      }
-    },
-    external_daemon: {
-      ThriftTestServer: {
-        options: {
-          startCheck: function(stdout, stderr) {
-            return (/Thrift Server running on port/).test(stdout);
-          },
-          nodeSpawnOptions: {
-                              cwd: "test",
-                              env: {NODE_PATH: "../../nodejs/lib:../../../node_modules"}
-                            }
-        },
-        cmd: "node",
-        args: ["server_http.js"]
-      },
-      ThriftTestServer_TLS: {
-        options: {
-          startCheck: function(stdout, stderr) {
-            return (/Thrift Server running on port/).test(stdout);
-          },
-          nodeSpawnOptions: {
-                              cwd: "test",
-                              env: {NODE_PATH: "../../nodejs/lib:../../../node_modules"}
-                            }
-        },
-        cmd: "node",
-        args: ["server_https.js"]
-      }
-    },
-    qunit: {
-      ThriftJS: {
-        options: {
-          urls: [
-            'http://localhost:8088/test-nojq.html'
-          ]
-        }
-      },
-      ThriftJSJQ: {
-        options: {
-          urls: [
-            'http://localhost:8088/test.html'
-          ]
-        }
-      },
-      ThriftWS: {
-        options: {
-          urls: [
-            'http://localhost:8088/testws.html'
-          ]
-        }
-      },
-      ThriftJS_TLS: {
-        options: {
-          '--ignore-ssl-errors': true,
-          urls: [
-            'https://localhost:8089/test-nojq.html'
-          ]
-        }
-      },
-      ThriftJSJQ_TLS: {
-        options: {
-          '--ignore-ssl-errors': true,
-          urls: [
-            'https://localhost:8089/test.html'
-          ]
-        }
-      },
-      ThriftWS_TLS: {
-        options: {
-          '--ignore-ssl-errors': true,
-          urls: [
-            'https://localhost:8089/testws.html'
-          ]
-        }
-      },
-      ThriftDeepConstructor: {
-        options: {
-          urls: [
-            'http://localhost:8088/test-deep-constructor.html'
-          ]
-        }
-      }
-    },
-    jshint: {
-      files: ['Gruntfile.js', 'src/**/*.js', 'test/*.js'],
-      options: {
-        // options here to override JSHint defaults
-        globals: {
-          jQuery: true,
-          console: true,
-          module: true,
-          document: true
-        }
-      }
-    },
-  });
-
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-qunit');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-jsdoc');
-  grunt.loadNpmTasks('grunt-external-daemon');
-  grunt.loadNpmTasks('grunt-shell');
-
-  grunt.registerTask('test', ['jshint', 'shell:InstallThriftJS', 'shell:InstallThriftNodeJSDep', 'shell:ThriftGen',
-                              'external_daemon:ThriftTestServer', 'external_daemon:ThriftTestServer_TLS',
-                              'shell:ThriftGenDeepConstructor', 'qunit:ThriftDeepConstructor',
-                              'qunit:ThriftJS', 'qunit:ThriftJS_TLS',
-                              'shell:ThriftGenJQ', 'qunit:ThriftJSJQ', 'qunit:ThriftJSJQ_TLS'
-                             ]);
-  grunt.registerTask('default', ['jshint', 'shell:InstallThriftJS', 'shell:InstallThriftNodeJSDep', 'shell:ThriftGen',
-                                 'external_daemon:ThriftTestServer', 'external_daemon:ThriftTestServer_TLS',
-                                 'qunit:ThriftJS', 'qunit:ThriftJS_TLS',
-                                 'shell:ThriftGenJQ', 'qunit:ThriftJSJQ', 'qunit:ThriftJSJQ_TLS',
-                                 'concat', 'uglify', 'jsdoc'
-                                ]);
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/js/Makefile.am b/vendor/git.apache.org/thrift.git/lib/js/Makefile.am
deleted file mode 100644
index 9a27e9d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Make sure this doesn't fail if ant is not configured.
-
-SUBDIRS = test
-
-check-local: all
-	npm install
-	./node_modules/.bin/grunt
-
diff --git a/vendor/git.apache.org/thrift.git/lib/js/README.md b/vendor/git.apache.org/thrift.git/lib/js/README.md
deleted file mode 100644
index dfa6e82..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/README.md
+++ /dev/null
@@ -1,147 +0,0 @@
-Thrift Javascript Library
-=========================
-This browser based Apache Thrift implementation supports
-RPC clients using the JSON protocol over Http[s] with XHR
-and WebSocket.
-
-License
--------
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Grunt Build
-------------
-This is the base directory for the Apache Thrift JavaScript
-library. This directory contains a Gruntfile.js and a
-package.json. Many of the build and test tools used here
-require a recent version of Node.js to be installed. To 
-install the support files for the Grunt build tool execute
-the command:
-
-    npm install
-    
-This reads the package.json and pulls in the appropriate
-sources from the internet. To build the JavaScript branch
-of Apache Thrift execute the command:
-
-    grunt
-    
-This runs the grunt build tool, linting all of the source
-files, setting up and running the tests, concatenating and
-minifying the main libraries and generating the html 
-documentation.
-
-If grunt is not installed you can install it with npm
-like this:
-
-   sudo npm install -g grunt-cli
-   npm install grunt --save-dev
-
-
-Tree
-----
-The following directories are present (some only after the
-grunt build):
-  /src  - The JavaScript Apache Thrift source
-  /doc  - HTML documentation
-  /dist - Distribution files (thrift.js and thrift.min.js)
-  /test - Various tests, this is a good place to look for
-          example code
-  /node_modules - Build support files installed by npm
-
-
-Example JavaScript Client and Server
-------------------------------------
-The listing below demonstrates a simple browser based JavaScript
-Thrift client and Node.js JavaScript server for the hello_svc 
-service. 
-
-### hello.thrift - Service IDL 
-### build with: $ thrift -gen js -gen js:node hello.thrift
-    service hello_svc {
-      string get_message(1: string name)
-    }
-
-### hello.html - Browser Client
-    <!DOCTYPE html>
-    <html lang="en">
-      <head>
-        <meta charset="utf-8">
-        <title>Hello Thrift</title>
-      </head>
-      <body>
-        Name: <input type="text" id="name_in">
-        <input type="button" id="get_msg" value="Get Message" >
-        <div id="output"></div>
-  
-        <script src="thrift.js"></script>
-        <script src="gen-js/hello_svc.js"></script>
-        <script>
-          (function() {
-            var transport = new Thrift.TXHRTransport("/hello");
-            var protocol  = new Thrift.TJSONProtocol(transport);
-            var client    = new hello_svcClient(protocol);
-            var nameElement = document.getElementById("name_in");
-            var outputElement = document.getElementById("output");
-            document.getElementById("get_msg")
-              .addEventListener("click", function(){
-                client.get_message(nameElement.value, function(result) {
-                  outputElement.innerHTML = result;
-                });
-              });
-          })();
-        </script>
-      </body>
-    </html>
-
-### hello.js - Node Server
-    var thrift = require('thrift');
-    var hello_svc = require('./gen-nodejs/hello_svc.js');
-    
-    var hello_handler = {
-      get_message: function(name, result) {
-        var msg = "Hello " + name + "!";
-        result(null, msg);
-      }
-    }
-    
-    var hello_svc_opt = {
-      transport: thrift.TBufferedTransport,
-      protocol: thrift.TJSONProtocol,
-      processor: hello_svc,
-      handler: hello_handler
-    };
-    
-    var server_opt = {
-      staticFilePath: ".",
-      services: {
-        "/hello": hello_svc_opt
-      }
-    }
-    
-    var server = Thrift.createWebServer(server_opt);
-    var port = 9099;
-    server.listen(port);
-    console.log("Http/Thrift Server running on port: " + port);
-
-
-TypeScript
-------------------------------------
-TypeScript definition files can also be generated by running:
-
-    thrift --gen js:ts file.thrift
-
diff --git a/vendor/git.apache.org/thrift.git/lib/js/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/js/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/js/package.json b/vendor/git.apache.org/thrift.git/lib/js/package.json
deleted file mode 100644
index 9491970..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "thrift",
-  "version": "0.10.0",
-  "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-cli": "^1.2.0",
-    "grunt-contrib-uglify": "^1.0.1",
-    "grunt-contrib-jshint": "^1.0.0",
-    "grunt-contrib-qunit": "^1.2.0",
-    "grunt-contrib-concat": "^1.0.1",
-    "grunt-jsdoc": "^2.0.0",
-    "grunt-external-daemon": "^1.1.0",
-    "grunt-shell": "^1.3.0"
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/js/src/thrift.js b/vendor/git.apache.org/thrift.git/lib/js/src/thrift.js
deleted file mode 100644
index 41935c4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/src/thrift.js
+++ /dev/null
@@ -1,1555 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*jshint evil:true*/
-
-/**
- * The Thrift namespace houses the Apache Thrift JavaScript library
- * elements providing JavaScript bindings for the Apache Thrift RPC
- * system. End users will typically only directly make use of the
- * Transport (TXHRTransport/TWebSocketTransport) and Protocol
- * (TJSONPRotocol/TBinaryProtocol) constructors.
- *
- * Object methods beginning with a __ (e.g. __onOpen()) are internal
- * and should not be called outside of the object's own methods.
- *
- * This library creates one global object: Thrift
- * Code in this library must never create additional global identifiers,
- * all features must be scoped within the Thrift namespace.
- * @namespace
- * @example
- *     var transport = new Thrift.Transport("http://localhost:8585");
- *     var protocol  = new Thrift.Protocol(transport);
- *     var client = new MyThriftSvcClient(protocol);
- *     var result = client.MyMethod();
- */
-var Thrift = {
-    /**
-     * Thrift JavaScript library version.
-     * @readonly
-     * @const {string} Version
-     * @memberof Thrift
-     */
-    Version: '0.10.0',
-
-    /**
-     * Thrift IDL type string to Id mapping.
-     * @readonly
-     * @property {number}  STOP   - End of a set of fields.
-     * @property {number}  VOID   - No value (only legal for return types).
-     * @property {number}  BOOL   - True/False integer.
-     * @property {number}  BYTE   - Signed 8 bit integer.
-     * @property {number}  I08    - Signed 8 bit integer.
-     * @property {number}  DOUBLE - 64 bit IEEE 854 floating point.
-     * @property {number}  I16    - Signed 16 bit integer.
-     * @property {number}  I32    - Signed 32 bit integer.
-     * @property {number}  I64    - Signed 64 bit integer.
-     * @property {number}  STRING - Array of bytes representing a string of characters.
-     * @property {number}  UTF7   - Array of bytes representing a string of UTF7 encoded characters.
-     * @property {number}  STRUCT - A multifield type.
-     * @property {number}  MAP    - A collection type (map/associative-array/dictionary).
-     * @property {number}  SET    - A collection type (unordered and without repeated values).
-     * @property {number}  LIST   - A collection type (unordered).
-     * @property {number}  UTF8   - Array of bytes representing a string of UTF8 encoded characters.
-     * @property {number}  UTF16  - Array of bytes representing a string of UTF16 encoded characters.
-     */
-    Type: {
-        'STOP' : 0,
-        'VOID' : 1,
-        'BOOL' : 2,
-        'BYTE' : 3,
-        'I08' : 3,
-        'DOUBLE' : 4,
-        'I16' : 6,
-        'I32' : 8,
-        'I64' : 10,
-        'STRING' : 11,
-        'UTF7' : 11,
-        'STRUCT' : 12,
-        'MAP' : 13,
-        'SET' : 14,
-        'LIST' : 15,
-        'UTF8' : 16,
-        'UTF16' : 17
-    },
-
-    /**
-     * Thrift RPC message type string to Id mapping.
-     * @readonly
-     * @property {number}  CALL      - RPC call sent from client to server.
-     * @property {number}  REPLY     - RPC call normal response from server to client.
-     * @property {number}  EXCEPTION - RPC call exception response from server to client.
-     * @property {number}  ONEWAY    - Oneway RPC call from client to server with no response.
-     */
-    MessageType: {
-        'CALL' : 1,
-        'REPLY' : 2,
-        'EXCEPTION' : 3,
-        'ONEWAY' : 4
-    },
-
-    /**
-     * Utility function returning the count of an object's own properties.
-     * @param {object} obj - Object to test.
-     * @returns {number} number of object's own properties
-     */
-    objectLength: function(obj) {
-        var length = 0;
-        for (var k in obj) {
-            if (obj.hasOwnProperty(k)) {
-                length++;
-            }
-        }
-        return length;
-    },
-
-    /**
-     * Utility function to establish prototype inheritance.
-     * @see {@link http://javascript.crockford.com/prototypal.html|Prototypal Inheritance}
-     * @param {function} constructor - Contstructor function to set as derived.
-     * @param {function} superConstructor - Contstructor function to set as base.
-     * @param {string} [name] - Type name to set as name property in derived prototype.
-     */
-    inherits: function(constructor, superConstructor, name) {
-      function F() {}
-      F.prototype = superConstructor.prototype;
-      constructor.prototype = new F();
-      constructor.prototype.name = name || "";
-    }
-};
-
-/**
- * Initializes a Thrift TException instance.
- * @constructor
- * @augments Error
- * @param {string} message - The TException message (distinct from the Error message).
- * @classdesc TException is the base class for all Thrift exceptions types.
- */
-Thrift.TException = function(message) {
-    this.message = message;
-};
-Thrift.inherits(Thrift.TException, Error, 'TException');
-
-/**
- * Returns the message set on the exception.
- * @readonly
- * @returns {string} exception message
- */
-Thrift.TException.prototype.getMessage = function() {
-    return this.message;
-};
-
-/**
- * Thrift Application Exception type string to Id mapping.
- * @readonly
- * @property {number}  UNKNOWN                 - Unknown/undefined.
- * @property {number}  UNKNOWN_METHOD          - Client attempted to call a method unknown to the server.
- * @property {number}  INVALID_MESSAGE_TYPE    - Client passed an unknown/unsupported MessageType.
- * @property {number}  WRONG_METHOD_NAME       - Unused.
- * @property {number}  BAD_SEQUENCE_ID         - Unused in Thrift RPC, used to flag proprietary sequence number errors.
- * @property {number}  MISSING_RESULT          - Raised by a server processor if a handler fails to supply the required return result.
- * @property {number}  INTERNAL_ERROR          - Something bad happened.
- * @property {number}  PROTOCOL_ERROR          - The protocol layer failed to serialize or deserialize data.
- * @property {number}  INVALID_TRANSFORM       - Unused.
- * @property {number}  INVALID_PROTOCOL        - The protocol (or version) is not supported.
- * @property {number}  UNSUPPORTED_CLIENT_TYPE - Unused.
- */
-Thrift.TApplicationExceptionType = {
-    'UNKNOWN' : 0,
-    'UNKNOWN_METHOD' : 1,
-    'INVALID_MESSAGE_TYPE' : 2,
-    'WRONG_METHOD_NAME' : 3,
-    'BAD_SEQUENCE_ID' : 4,
-    'MISSING_RESULT' : 5,
-    'INTERNAL_ERROR' : 6,
-    'PROTOCOL_ERROR' : 7,
-    'INVALID_TRANSFORM' : 8,
-    'INVALID_PROTOCOL' : 9,
-    'UNSUPPORTED_CLIENT_TYPE' : 10
-};
-
-/**
- * Initializes a Thrift TApplicationException instance.
- * @constructor
- * @augments Thrift.TException
- * @param {string} message - The TApplicationException message (distinct from the Error message).
- * @param {Thrift.TApplicationExceptionType} [code] - The TApplicationExceptionType code.
- * @classdesc TApplicationException is the exception class used to propagate exceptions from an RPC server back to a calling client.
-*/
-Thrift.TApplicationException = function(message, code) {
-    this.message = message;
-    this.code = typeof code === "number" ? code : 0;
-};
-Thrift.inherits(Thrift.TApplicationException, Thrift.TException, 'TApplicationException');
-
-/**
- * Read a TApplicationException from the supplied protocol.
- * @param {object} input - The input protocol to read from.
- */
-Thrift.TApplicationException.prototype.read = function(input) {
-    while (1) {
-        var ret = input.readFieldBegin();
-
-        if (ret.ftype == Thrift.Type.STOP) {
-            break;
-        }
-
-        var fid = ret.fid;
-
-        switch (fid) {
-            case 1:
-                if (ret.ftype == Thrift.Type.STRING) {
-                    ret = input.readString();
-                    this.message = ret.value;
-                } else {
-                    ret = input.skip(ret.ftype);
-                }
-                break;
-            case 2:
-                if (ret.ftype == Thrift.Type.I32) {
-                    ret = input.readI32();
-                    this.code = ret.value;
-                } else {
-                    ret = input.skip(ret.ftype);
-                }
-                break;
-           default:
-                ret = input.skip(ret.ftype);
-                break;
-        }
-
-        input.readFieldEnd();
-    }
-
-    input.readStructEnd();
-};
-
-/**
- * Wite a TApplicationException to the supplied protocol.
- * @param {object} output - The output protocol to write to.
- */
-Thrift.TApplicationException.prototype.write = function(output) {
-    output.writeStructBegin('TApplicationException');
-
-    if (this.message) {
-        output.writeFieldBegin('message', Thrift.Type.STRING, 1);
-        output.writeString(this.getMessage());
-        output.writeFieldEnd();
-    }
-
-    if (this.code) {
-        output.writeFieldBegin('type', Thrift.Type.I32, 2);
-        output.writeI32(this.code);
-        output.writeFieldEnd();
-    }
-
-    output.writeFieldStop();
-    output.writeStructEnd();
-};
-
-/**
- * Returns the application exception code set on the exception.
- * @readonly
- * @returns {Thrift.TApplicationExceptionType} exception code
- */
-Thrift.TApplicationException.prototype.getCode = function() {
-    return this.code;
-};
-
-Thrift.TProtocolExceptionType = {
-    UNKNOWN: 0,
-    INVALID_DATA: 1,
-    NEGATIVE_SIZE: 2,
-    SIZE_LIMIT: 3,
-    BAD_VERSION: 4,
-    NOT_IMPLEMENTED: 5,
-    DEPTH_LIMIT: 6
-};
-
-Thrift.TProtocolException = function TProtocolException(type, message) {
-    Error.call(this);
-    Error.captureStackTrace(this, this.constructor);
-    this.name = this.constructor.name;
-    this.type = type;
-    this.message = message;
-};
-Thrift.inherits(Thrift.TProtocolException, Thrift.TException, 'TProtocolException');
-
-/**
- * Constructor Function for the XHR transport.
- * If you do not specify a url then you must handle XHR operations on
- * your own. This type can also be constructed using the Transport alias
- * for backward compatibility.
- * @constructor
- * @param {string} [url] - The URL to connect to.
- * @classdesc The Apache Thrift Transport layer performs byte level I/O
- * between RPC clients and servers. The JavaScript TXHRTransport object
- * uses Http[s]/XHR. Target servers must implement the http[s] transport
- * (see: node.js example server_http.js).
- * @example
- *     var transport = new Thrift.TXHRTransport("http://localhost:8585");
- */
-Thrift.Transport = Thrift.TXHRTransport = function(url, options) {
-    this.url = url;
-    this.wpos = 0;
-    this.rpos = 0;
-    this.useCORS = (options && options.useCORS);
-    this.customHeaders = options ? (options.customHeaders ? options.customHeaders : {}): {};
-    this.send_buf = '';
-    this.recv_buf = '';
-};
-
-Thrift.TXHRTransport.prototype = {
-    /**
-     * Gets the browser specific XmlHttpRequest Object.
-     * @returns {object} the browser XHR interface object
-     */
-    getXmlHttpRequestObject: function() {
-        try { return new XMLHttpRequest(); } catch (e1) { }
-        try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch (e2) { }
-        try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch (e3) { }
-
-        throw "Your browser doesn't support XHR.";
-    },
-
-    /**
-     * Sends the current XRH request if the transport was created with a URL
-     * and the async parameter is false. If the transport was not created with
-     * a URL, or the async parameter is True and no callback is provided, or
-     * the URL is an empty string, the current send buffer is returned.
-     * @param {object} async - If true the current send buffer is returned.
-     * @param {object} callback - Optional async completion callback
-     * @returns {undefined|string} Nothing or the current send buffer.
-     * @throws {string} If XHR fails.
-     */
-    flush: function(async, callback) {
-        var self = this;
-        if ((async && !callback) || this.url === undefined || this.url === '') {
-            return this.send_buf;
-        }
-
-        var xreq = this.getXmlHttpRequestObject();
-
-        if (xreq.overrideMimeType) {
-            xreq.overrideMimeType('application/vnd.apache.thrift.json; charset=utf-8');
-        }
-
-        if (callback) {
-            //Ignore XHR callbacks until the data arrives, then call the
-            //  client's callback
-            xreq.onreadystatechange =
-              (function() {
-                var clientCallback = callback;
-                return function() {
-                  if (this.readyState == 4 && this.status == 200) {
-                    self.setRecvBuffer(this.responseText);
-                    clientCallback();
-                  }
-                };
-              }());
-
-            // detect net::ERR_CONNECTION_REFUSED and call the callback.
-            xreq.onerror =
-                (function() {
-                  var clientCallback = callback;
-                  return function() {
-                      clientCallback();
-                  };
-                }());
-
-        }
-
-        xreq.open('POST', this.url, !!async);
-
-        // add custom headers
-        Object.keys(self.customHeaders).forEach(function(prop) {
-            xreq.setRequestHeader(prop, self.customHeaders[prop]);
-        });
-
-        if (xreq.setRequestHeader) {
-            xreq.setRequestHeader('Accept', 'application/vnd.apache.thrift.json; charset=utf-8');
-            xreq.setRequestHeader('Content-Type', 'application/vnd.apache.thrift.json; charset=utf-8');
-        }
-
-        xreq.send(this.send_buf);
-        if (async && callback) {
-            return;
-        }
-
-        if (xreq.readyState != 4) {
-            throw 'encountered an unknown ajax ready state: ' + xreq.readyState;
-        }
-
-        if (xreq.status != 200) {
-            throw 'encountered a unknown request status: ' + xreq.status;
-        }
-
-        this.recv_buf = xreq.responseText;
-        this.recv_buf_sz = this.recv_buf.length;
-        this.wpos = this.recv_buf.length;
-        this.rpos = 0;
-    },
-
-    /**
-     * Creates a jQuery XHR object to be used for a Thrift server call.
-     * @param {object} client - The Thrift Service client object generated by the IDL compiler.
-     * @param {object} postData - The message to send to the server.
-     * @param {function} args - The original call arguments with the success call back at the end.
-     * @param {function} recv_method - The Thrift Service Client receive method for the call.
-     * @returns {object} A new jQuery XHR object.
-     * @throws {string} If the jQuery version is prior to 1.5 or if jQuery is not found.
-     */
-    jqRequest: function(client, postData, args, recv_method) {
-        if (typeof jQuery === 'undefined' ||
-            typeof jQuery.Deferred === 'undefined') {
-            throw 'Thrift.js requires jQuery 1.5+ to use asynchronous requests';
-        }
-
-        var thriftTransport = this;
-
-        var jqXHR = jQuery.ajax({
-            url: this.url,
-            data: postData,
-            type: 'POST',
-            cache: false,
-            contentType: 'application/vnd.apache.thrift.json; charset=utf-8',
-            dataType: 'text thrift',
-            converters: {
-                'text thrift' : function(responseData) {
-                    thriftTransport.setRecvBuffer(responseData);
-                    var value = recv_method.call(client);
-                    return value;
-                }
-            },
-            context: client,
-            success: jQuery.makeArray(args).pop()
-        });
-
-        return jqXHR;
-    },
-
-    /**
-     * Sets the buffer to provide the protocol when deserializing.
-     * @param {string} buf - The buffer to supply the protocol.
-     */
-    setRecvBuffer: function(buf) {
-        this.recv_buf = buf;
-        this.recv_buf_sz = this.recv_buf.length;
-        this.wpos = this.recv_buf.length;
-        this.rpos = 0;
-    },
-
-    /**
-     * Returns true if the transport is open, XHR always returns true.
-     * @readonly
-     * @returns {boolean} Always True.
-     */
-    isOpen: function() {
-        return true;
-    },
-
-    /**
-     * Opens the transport connection, with XHR this is a nop.
-     */
-    open: function() {},
-
-    /**
-     * Closes the transport connection, with XHR this is a nop.
-     */
-    close: function() {},
-
-    /**
-     * Returns the specified number of characters from the response
-     * buffer.
-     * @param {number} len - The number of characters to return.
-     * @returns {string} Characters sent by the server.
-     */
-    read: function(len) {
-        var avail = this.wpos - this.rpos;
-
-        if (avail === 0) {
-            return '';
-        }
-
-        var give = len;
-
-        if (avail < len) {
-            give = avail;
-        }
-
-        var ret = this.read_buf.substr(this.rpos, give);
-        this.rpos += give;
-
-        //clear buf when complete?
-        return ret;
-    },
-
-    /**
-     * Returns the entire response buffer.
-     * @returns {string} Characters sent by the server.
-     */
-    readAll: function() {
-        return this.recv_buf;
-    },
-
-    /**
-     * Sets the send buffer to buf.
-     * @param {string} buf - The buffer to send.
-     */
-    write: function(buf) {
-        this.send_buf = buf;
-    },
-
-    /**
-     * Returns the send buffer.
-     * @readonly
-     * @returns {string} The send buffer.
-     */
-    getSendBuffer: function() {
-        return this.send_buf;
-    }
-
-};
-
-
-/**
- * Constructor Function for the WebSocket transport.
- * @constructor
- * @param {string} [url] - The URL to connect to.
- * @classdesc The Apache Thrift Transport layer performs byte level I/O
- * between RPC clients and servers. The JavaScript TWebSocketTransport object
- * uses the WebSocket protocol. Target servers must implement WebSocket.
- * (see: node.js example server_http.js).
- * @example
- *   var transport = new Thrift.TWebSocketTransport("http://localhost:8585");
- */
-Thrift.TWebSocketTransport = function(url) {
-    this.__reset(url);
-};
-
-Thrift.TWebSocketTransport.prototype = {
-    __reset: function(url) {
-      this.url = url;             //Where to connect
-      this.socket = null;         //The web socket
-      this.callbacks = [];        //Pending callbacks
-      this.send_pending = [];     //Buffers/Callback pairs waiting to be sent
-      this.send_buf = '';         //Outbound data, immutable until sent
-      this.recv_buf = '';         //Inbound data
-      this.rb_wpos = 0;           //Network write position in receive buffer
-      this.rb_rpos = 0;           //Client read position in receive buffer
-    },
-
-    /**
-     * Sends the current WS request and registers callback. The async
-     * parameter is ignored (WS flush is always async) and the callback
-     * function parameter is required.
-     * @param {object} async - Ignored.
-     * @param {object} callback - The client completion callback.
-     * @returns {undefined|string} Nothing (undefined)
-     */
-    flush: function(async, callback) {
-      var self = this;
-      if (this.isOpen()) {
-        //Send data and register a callback to invoke the client callback
-        this.socket.send(this.send_buf);
-        this.callbacks.push((function() {
-          var clientCallback = callback;
-          return function(msg) {
-            self.setRecvBuffer(msg);
-            clientCallback();
-          };
-        }()));
-      } else {
-        //Queue the send to go out __onOpen
-        this.send_pending.push({
-          buf: this.send_buf,
-          cb:  callback
-        });
-      }
-    },
-
-    __onOpen: function() {
-       var self = this;
-       if (this.send_pending.length > 0) {
-          //If the user made calls before the connection was fully
-          //open, send them now
-          this.send_pending.forEach(function(elem) {
-             this.socket.send(elem.buf);
-             this.callbacks.push((function() {
-               var clientCallback = elem.cb;
-               return function(msg) {
-                  self.setRecvBuffer(msg);
-                  clientCallback();
-               };
-             }()));
-          });
-          this.send_pending = [];
-       }
-    },
-
-    __onClose: function(evt) {
-      this.__reset(this.url);
-    },
-
-    __onMessage: function(evt) {
-      if (this.callbacks.length) {
-        this.callbacks.shift()(evt.data);
-      }
-    },
-
-    __onError: function(evt) {
-      console.log("Thrift WebSocket Error: " + evt.toString());
-      this.socket.close();
-    },
-
-    /**
-     * Sets the buffer to use when receiving server responses.
-     * @param {string} buf - The buffer to receive server responses.
-     */
-    setRecvBuffer: function(buf) {
-        this.recv_buf = buf;
-        this.recv_buf_sz = this.recv_buf.length;
-        this.wpos = this.recv_buf.length;
-        this.rpos = 0;
-    },
-
-    /**
-     * Returns true if the transport is open
-     * @readonly
-     * @returns {boolean}
-     */
-    isOpen: function() {
-        return this.socket && this.socket.readyState == this.socket.OPEN;
-    },
-
-    /**
-     * Opens the transport connection
-     */
-    open: function() {
-      //If OPEN/CONNECTING/CLOSING ignore additional opens
-      if (this.socket && this.socket.readyState != this.socket.CLOSED) {
-        return;
-      }
-      //If there is no socket or the socket is closed:
-      this.socket = new WebSocket(this.url);
-      this.socket.onopen = this.__onOpen.bind(this);
-      this.socket.onmessage = this.__onMessage.bind(this);
-      this.socket.onerror = this.__onError.bind(this);
-      this.socket.onclose = this.__onClose.bind(this);
-    },
-
-    /**
-     * Closes the transport connection
-     */
-    close: function() {
-      this.socket.close();
-    },
-
-    /**
-     * Returns the specified number of characters from the response
-     * buffer.
-     * @param {number} len - The number of characters to return.
-     * @returns {string} Characters sent by the server.
-     */
-    read: function(len) {
-        var avail = this.wpos - this.rpos;
-
-        if (avail === 0) {
-            return '';
-        }
-
-        var give = len;
-
-        if (avail < len) {
-            give = avail;
-        }
-
-        var ret = this.read_buf.substr(this.rpos, give);
-        this.rpos += give;
-
-        //clear buf when complete?
-        return ret;
-    },
-
-    /**
-     * Returns the entire response buffer.
-     * @returns {string} Characters sent by the server.
-     */
-    readAll: function() {
-        return this.recv_buf;
-    },
-
-    /**
-     * Sets the send buffer to buf.
-     * @param {string} buf - The buffer to send.
-     */
-    write: function(buf) {
-        this.send_buf = buf;
-    },
-
-    /**
-     * Returns the send buffer.
-     * @readonly
-     * @returns {string} The send buffer.
-     */
-    getSendBuffer: function() {
-        return this.send_buf;
-    }
-
-};
-
-/**
- * Initializes a Thrift JSON protocol instance.
- * @constructor
- * @param {Thrift.Transport} transport - The transport to serialize to/from.
- * @classdesc Apache Thrift Protocols perform serialization which enables cross
- * language RPC. The Protocol type is the JavaScript browser implementation
- * of the Apache Thrift TJSONProtocol.
- * @example
- *     var protocol  = new Thrift.Protocol(transport);
- */
-Thrift.TJSONProtocol = Thrift.Protocol = function(transport) {
-    this.tstack = [];
-    this.tpos = [];
-    this.transport = transport;
-};
-
-/**
- * Thrift IDL type Id to string mapping.
- * @readonly
- * @see {@link Thrift.Type}
- */
-Thrift.Protocol.Type = {};
-Thrift.Protocol.Type[Thrift.Type.BOOL] = '"tf"';
-Thrift.Protocol.Type[Thrift.Type.BYTE] = '"i8"';
-Thrift.Protocol.Type[Thrift.Type.I16] = '"i16"';
-Thrift.Protocol.Type[Thrift.Type.I32] = '"i32"';
-Thrift.Protocol.Type[Thrift.Type.I64] = '"i64"';
-Thrift.Protocol.Type[Thrift.Type.DOUBLE] = '"dbl"';
-Thrift.Protocol.Type[Thrift.Type.STRUCT] = '"rec"';
-Thrift.Protocol.Type[Thrift.Type.STRING] = '"str"';
-Thrift.Protocol.Type[Thrift.Type.MAP] = '"map"';
-Thrift.Protocol.Type[Thrift.Type.LIST] = '"lst"';
-Thrift.Protocol.Type[Thrift.Type.SET] = '"set"';
-
-/**
- * Thrift IDL type string to Id mapping.
- * @readonly
- * @see {@link Thrift.Type}
- */
-Thrift.Protocol.RType = {};
-Thrift.Protocol.RType.tf = Thrift.Type.BOOL;
-Thrift.Protocol.RType.i8 = Thrift.Type.BYTE;
-Thrift.Protocol.RType.i16 = Thrift.Type.I16;
-Thrift.Protocol.RType.i32 = Thrift.Type.I32;
-Thrift.Protocol.RType.i64 = Thrift.Type.I64;
-Thrift.Protocol.RType.dbl = Thrift.Type.DOUBLE;
-Thrift.Protocol.RType.rec = Thrift.Type.STRUCT;
-Thrift.Protocol.RType.str = Thrift.Type.STRING;
-Thrift.Protocol.RType.map = Thrift.Type.MAP;
-Thrift.Protocol.RType.lst = Thrift.Type.LIST;
-Thrift.Protocol.RType.set = Thrift.Type.SET;
-
-/**
- * The TJSONProtocol version number.
- * @readonly
- * @const {number} Version
- * @memberof Thrift.Protocol
- */
- Thrift.Protocol.Version = 1;
-
-Thrift.Protocol.prototype = {
-    /**
-     * Returns the underlying transport.
-     * @readonly
-     * @returns {Thrift.Transport} The underlying transport.
-     */
-    getTransport: function() {
-        return this.transport;
-    },
-
-    /**
-     * Serializes the beginning of a Thrift RPC message.
-     * @param {string} name - The service method to call.
-     * @param {Thrift.MessageType} messageType - The type of method call.
-     * @param {number} seqid - The sequence number of this call (always 0 in Apache Thrift).
-     */
-    writeMessageBegin: function(name, messageType, seqid) {
-        this.tstack = [];
-        this.tpos = [];
-
-        this.tstack.push([Thrift.Protocol.Version, '"' +
-            name + '"', messageType, seqid]);
-    },
-
-    /**
-     * Serializes the end of a Thrift RPC message.
-     */
-    writeMessageEnd: function() {
-        var obj = this.tstack.pop();
-
-        this.wobj = this.tstack.pop();
-        this.wobj.push(obj);
-
-        this.wbuf = '[' + this.wobj.join(',') + ']';
-
-        this.transport.write(this.wbuf);
-     },
-
-
-    /**
-     * Serializes the beginning of a struct.
-     * @param {string} name - The name of the struct.
-     */
-    writeStructBegin: function(name) {
-        this.tpos.push(this.tstack.length);
-        this.tstack.push({});
-    },
-
-    /**
-     * Serializes the end of a struct.
-     */
-    writeStructEnd: function() {
-
-        var p = this.tpos.pop();
-        var struct = this.tstack[p];
-        var str = '{';
-        var first = true;
-        for (var key in struct) {
-            if (first) {
-                first = false;
-            } else {
-                str += ',';
-            }
-
-            str += key + ':' + struct[key];
-        }
-
-        str += '}';
-        this.tstack[p] = str;
-    },
-
-    /**
-     * Serializes the beginning of a struct field.
-     * @param {string} name - The name of the field.
-     * @param {Thrift.Protocol.Type} fieldType - The data type of the field.
-     * @param {number} fieldId - The field's unique identifier.
-     */
-    writeFieldBegin: function(name, fieldType, fieldId) {
-        this.tpos.push(this.tstack.length);
-        this.tstack.push({ 'fieldId': '"' +
-            fieldId + '"', 'fieldType': Thrift.Protocol.Type[fieldType]
-        });
-
-    },
-
-    /**
-     * Serializes the end of a field.
-     */
-    writeFieldEnd: function() {
-        var value = this.tstack.pop();
-        var fieldInfo = this.tstack.pop();
-
-        this.tstack[this.tstack.length - 1][fieldInfo.fieldId] = '{' +
-            fieldInfo.fieldType + ':' + value + '}';
-        this.tpos.pop();
-    },
-
-    /**
-     * Serializes the end of the set of fields for a struct.
-     */
-    writeFieldStop: function() {
-        //na
-    },
-
-    /**
-     * Serializes the beginning of a map collection.
-     * @param {Thrift.Type} keyType - The data type of the key.
-     * @param {Thrift.Type} valType - The data type of the value.
-     * @param {number} [size] - The number of elements in the map (ignored).
-     */
-    writeMapBegin: function(keyType, valType, size) {
-        this.tpos.push(this.tstack.length);
-        this.tstack.push([Thrift.Protocol.Type[keyType],
-            Thrift.Protocol.Type[valType], 0]);
-    },
-
-    /**
-     * Serializes the end of a map.
-     */
-    writeMapEnd: function() {
-        var p = this.tpos.pop();
-
-        if (p == this.tstack.length) {
-            return;
-        }
-
-        if ((this.tstack.length - p - 1) % 2 !== 0) {
-            this.tstack.push('');
-        }
-
-        var size = (this.tstack.length - p - 1) / 2;
-
-        this.tstack[p][this.tstack[p].length - 1] = size;
-
-        var map = '}';
-        var first = true;
-        while (this.tstack.length > p + 1) {
-            var v = this.tstack.pop();
-            var k = this.tstack.pop();
-            if (first) {
-                first = false;
-            } else {
-                map = ',' + map;
-            }
-
-            if (! isNaN(k)) { k = '"' + k + '"'; } //json "keys" need to be strings
-            map = k + ':' + v + map;
-        }
-        map = '{' + map;
-
-        this.tstack[p].push(map);
-        this.tstack[p] = '[' + this.tstack[p].join(',') + ']';
-    },
-
-    /**
-     * Serializes the beginning of a list collection.
-     * @param {Thrift.Type} elemType - The data type of the elements.
-     * @param {number} size - The number of elements in the list.
-     */
-    writeListBegin: function(elemType, size) {
-        this.tpos.push(this.tstack.length);
-        this.tstack.push([Thrift.Protocol.Type[elemType], size]);
-    },
-
-    /**
-     * Serializes the end of a list.
-     */
-    writeListEnd: function() {
-        var p = this.tpos.pop();
-
-        while (this.tstack.length > p + 1) {
-            var tmpVal = this.tstack[p + 1];
-            this.tstack.splice(p + 1, 1);
-            this.tstack[p].push(tmpVal);
-        }
-
-        this.tstack[p] = '[' + this.tstack[p].join(',') + ']';
-    },
-
-    /**
-     * Serializes the beginning of a set collection.
-     * @param {Thrift.Type} elemType - The data type of the elements.
-     * @param {number} size - The number of elements in the list.
-     */
-    writeSetBegin: function(elemType, size) {
-        this.tpos.push(this.tstack.length);
-        this.tstack.push([Thrift.Protocol.Type[elemType], size]);
-    },
-
-    /**
-     * Serializes the end of a set.
-     */
-    writeSetEnd: function() {
-        var p = this.tpos.pop();
-
-        while (this.tstack.length > p + 1) {
-            var tmpVal = this.tstack[p + 1];
-            this.tstack.splice(p + 1, 1);
-            this.tstack[p].push(tmpVal);
-        }
-
-        this.tstack[p] = '[' + this.tstack[p].join(',') + ']';
-    },
-
-    /** Serializes a boolean */
-    writeBool: function(value) {
-        this.tstack.push(value ? 1 : 0);
-    },
-
-    /** Serializes a number */
-    writeByte: function(i8) {
-        this.tstack.push(i8);
-    },
-
-    /** Serializes a number */
-    writeI16: function(i16) {
-        this.tstack.push(i16);
-    },
-
-    /** Serializes a number */
-    writeI32: function(i32) {
-        this.tstack.push(i32);
-    },
-
-    /** Serializes a number */
-    writeI64: function(i64) {
-        this.tstack.push(i64);
-    },
-
-    /** Serializes a number */
-    writeDouble: function(dbl) {
-        this.tstack.push(dbl);
-    },
-
-    /** Serializes a string */
-    writeString: function(str) {
-        // We do not encode uri components for wire transfer:
-        if (str === null) {
-            this.tstack.push(null);
-        } else {
-            // concat may be slower than building a byte buffer
-            var escapedString = '';
-            for (var i = 0; i < str.length; i++) {
-                var ch = str.charAt(i);      // a single double quote: "
-                if (ch === '\"') {
-                    escapedString += '\\\"'; // write out as: \"
-                } else if (ch === '\\') {    // a single backslash
-                    escapedString += '\\\\'; // write out as double backslash
-                } else if (ch === '\b') {    // a single backspace: invisible
-                    escapedString += '\\b';  // write out as: \b"
-                } else if (ch === '\f') {    // a single formfeed: invisible
-                    escapedString += '\\f';  // write out as: \f"
-                } else if (ch === '\n') {    // a single newline: invisible
-                    escapedString += '\\n';  // write out as: \n"
-                } else if (ch === '\r') {    // a single return: invisible
-                    escapedString += '\\r';  // write out as: \r"
-                } else if (ch === '\t') {    // a single tab: invisible
-                    escapedString += '\\t';  // write out as: \t"
-                } else {
-                    escapedString += ch;     // Else it need not be escaped
-                }
-            }
-            this.tstack.push('"' + escapedString + '"');
-        }
-    },
-
-    /** Serializes a string */
-    writeBinary: function(binary) {
-        var str = '';
-        if (typeof binary == 'string') {
-            str = binary;
-        } else if (binary instanceof Uint8Array) {
-            var arr = binary;
-            for (var i = 0; i < arr.length; ++i) {
-                str += String.fromCharCode(arr[i]);
-            }
-        } else {
-            throw new TypeError('writeBinary only accepts String or Uint8Array.');
-        }
-        this.tstack.push('"' + btoa(str) + '"');
-    },
-
-    /**
-       @class
-       @name AnonReadMessageBeginReturn
-       @property {string} fname - The name of the service method.
-       @property {Thrift.MessageType} mtype - The type of message call.
-       @property {number} rseqid - The sequence number of the message (0 in Thrift RPC).
-     */
-    /**
-     * Deserializes the beginning of a message.
-     * @returns {AnonReadMessageBeginReturn}
-     */
-    readMessageBegin: function() {
-        this.rstack = [];
-        this.rpos = [];
-
-        if (typeof JSON !== 'undefined' && typeof JSON.parse === 'function') {
-            this.robj = JSON.parse(this.transport.readAll());
-        } else if (typeof jQuery !== 'undefined') {
-            this.robj = jQuery.parseJSON(this.transport.readAll());
-        } else {
-            this.robj = eval(this.transport.readAll());
-        }
-
-        var r = {};
-        var version = this.robj.shift();
-
-        if (version != Thrift.Protocol.Version) {
-            throw 'Wrong thrift protocol version: ' + version;
-        }
-
-        r.fname = this.robj.shift();
-        r.mtype = this.robj.shift();
-        r.rseqid = this.robj.shift();
-
-
-        //get to the main obj
-        this.rstack.push(this.robj.shift());
-
-        return r;
-    },
-
-    /** Deserializes the end of a message. */
-    readMessageEnd: function() {
-    },
-
-    /**
-     * Deserializes the beginning of a struct.
-     * @param {string} [name] - The name of the struct (ignored)
-     * @returns {object} - An object with an empty string fname property
-     */
-    readStructBegin: function(name) {
-        var r = {};
-        r.fname = '';
-
-        //incase this is an array of structs
-        if (this.rstack[this.rstack.length - 1] instanceof Array) {
-            this.rstack.push(this.rstack[this.rstack.length - 1].shift());
-        }
-
-        return r;
-    },
-
-    /** Deserializes the end of a struct. */
-    readStructEnd: function() {
-        if (this.rstack[this.rstack.length - 2] instanceof Array) {
-            this.rstack.pop();
-        }
-    },
-
-    /**
-       @class
-       @name AnonReadFieldBeginReturn
-       @property {string} fname - The name of the field (always '').
-       @property {Thrift.Type} ftype - The data type of the field.
-       @property {number} fid - The unique identifier of the field.
-     */
-    /**
-     * Deserializes the beginning of a field.
-     * @returns {AnonReadFieldBeginReturn}
-     */
-    readFieldBegin: function() {
-        var r = {};
-
-        var fid = -1;
-        var ftype = Thrift.Type.STOP;
-
-        //get a fieldId
-        for (var f in (this.rstack[this.rstack.length - 1])) {
-            if (f === null) {
-              continue;
-            }
-
-            fid = parseInt(f, 10);
-            this.rpos.push(this.rstack.length);
-
-            var field = this.rstack[this.rstack.length - 1][fid];
-
-            //remove so we don't see it again
-            delete this.rstack[this.rstack.length - 1][fid];
-
-            this.rstack.push(field);
-
-            break;
-        }
-
-        if (fid != -1) {
-
-            //should only be 1 of these but this is the only
-            //way to match a key
-            for (var i in (this.rstack[this.rstack.length - 1])) {
-                if (Thrift.Protocol.RType[i] === null) {
-                    continue;
-                }
-
-                ftype = Thrift.Protocol.RType[i];
-                this.rstack[this.rstack.length - 1] =
-                    this.rstack[this.rstack.length - 1][i];
-            }
-        }
-
-        r.fname = '';
-        r.ftype = ftype;
-        r.fid = fid;
-
-        return r;
-    },
-
-    /** Deserializes the end of a field. */
-    readFieldEnd: function() {
-        var pos = this.rpos.pop();
-
-        //get back to the right place in the stack
-        while (this.rstack.length > pos) {
-            this.rstack.pop();
-        }
-
-    },
-
-    /**
-       @class
-       @name AnonReadMapBeginReturn
-       @property {Thrift.Type} ktype - The data type of the key.
-       @property {Thrift.Type} vtype - The data type of the value.
-       @property {number} size - The number of elements in the map.
-     */
-    /**
-     * Deserializes the beginning of a map.
-     * @returns {AnonReadMapBeginReturn}
-     */
-    readMapBegin: function() {
-        var map = this.rstack.pop();
-        var first = map.shift();
-        if (first instanceof Array) {
-          this.rstack.push(map);
-          map = first;
-          first = map.shift();
-        }
-
-        var r = {};
-        r.ktype = Thrift.Protocol.RType[first];
-        r.vtype = Thrift.Protocol.RType[map.shift()];
-        r.size = map.shift();
-
-
-        this.rpos.push(this.rstack.length);
-        this.rstack.push(map.shift());
-
-        return r;
-    },
-
-    /** Deserializes the end of a map. */
-    readMapEnd: function() {
-        this.readFieldEnd();
-    },
-
-    /**
-       @class
-       @name AnonReadColBeginReturn
-       @property {Thrift.Type} etype - The data type of the element.
-       @property {number} size - The number of elements in the collection.
-     */
-    /**
-     * Deserializes the beginning of a list.
-     * @returns {AnonReadColBeginReturn}
-     */
-    readListBegin: function() {
-        var list = this.rstack[this.rstack.length - 1];
-
-        var r = {};
-        r.etype = Thrift.Protocol.RType[list.shift()];
-        r.size = list.shift();
-
-        this.rpos.push(this.rstack.length);
-        this.rstack.push(list.shift());
-
-        return r;
-    },
-
-    /** Deserializes the end of a list. */
-    readListEnd: function() {
-        this.readFieldEnd();
-    },
-
-    /**
-     * Deserializes the beginning of a set.
-     * @returns {AnonReadColBeginReturn}
-     */
-    readSetBegin: function(elemType, size) {
-        return this.readListBegin(elemType, size);
-    },
-
-    /** Deserializes the end of a set. */
-    readSetEnd: function() {
-        return this.readListEnd();
-    },
-
-    /** Returns an object with a value property set to
-     *  False unless the next number in the protocol buffer
-     *  is 1, in which case the value property is True */
-    readBool: function() {
-        var r = this.readI32();
-
-        if (r !== null && r.value == '1') {
-            r.value = true;
-        } else {
-            r.value = false;
-        }
-
-        return r;
-    },
-
-    /** Returns the an object with a value property set to the
-        next value found in the protocol buffer */
-    readByte: function() {
-        return this.readI32();
-    },
-
-    /** Returns the an object with a value property set to the
-        next value found in the protocol buffer */
-    readI16: function() {
-        return this.readI32();
-    },
-
-    /** Returns the an object with a value property set to the
-        next value found in the protocol buffer */
-    readI32: function(f) {
-        if (f === undefined) {
-            f = this.rstack[this.rstack.length - 1];
-        }
-
-        var r = {};
-
-        if (f instanceof Array) {
-            if (f.length === 0) {
-                r.value = undefined;
-            } else {
-                r.value = f.shift();
-            }
-        } else if (f instanceof Object) {
-           for (var i in f) {
-                if (i === null) {
-                  continue;
-                }
-                this.rstack.push(f[i]);
-                delete f[i];
-
-                r.value = i;
-                break;
-           }
-        } else {
-            r.value = f;
-            this.rstack.pop();
-        }
-
-        return r;
-    },
-
-    /** Returns the an object with a value property set to the
-        next value found in the protocol buffer */
-    readI64: function() {
-        return this.readI32();
-    },
-
-    /** Returns the an object with a value property set to the
-        next value found in the protocol buffer */
-    readDouble: function() {
-        return this.readI32();
-    },
-
-    /** Returns the an object with a value property set to the
-        next value found in the protocol buffer */
-    readString: function() {
-        var r = this.readI32();
-        return r;
-    },
-
-    /** Returns the an object with a value property set to the
-        next value found in the protocol buffer */
-    readBinary: function() {
-        var r = this.readI32();
-        r.value = atob(r.value);
-        return r;
-    },
-
-    /**
-     * Method to arbitrarily skip over data */
-    skip: function(type) {
-        var ret, i;
-        switch (type) {
-            case Thrift.Type.STOP:
-                return null;
-
-            case Thrift.Type.BOOL:
-                return this.readBool();
-
-            case Thrift.Type.BYTE:
-                return this.readByte();
-
-            case Thrift.Type.I16:
-                return this.readI16();
-
-            case Thrift.Type.I32:
-                return this.readI32();
-
-            case Thrift.Type.I64:
-                return this.readI64();
-
-            case Thrift.Type.DOUBLE:
-                return this.readDouble();
-
-            case Thrift.Type.STRING:
-                return this.readString();
-
-            case Thrift.Type.STRUCT:
-                this.readStructBegin();
-                while (true) {
-                    ret = this.readFieldBegin();
-                    if (ret.ftype == Thrift.Type.STOP) {
-                        break;
-                    }
-                    this.skip(ret.ftype);
-                    this.readFieldEnd();
-                }
-                this.readStructEnd();
-                return null;
-
-            case Thrift.Type.MAP:
-                ret = this.readMapBegin();
-                for (i = 0; i < ret.size; i++) {
-                    if (i > 0) {
-                        if (this.rstack.length > this.rpos[this.rpos.length - 1] + 1) {
-                            this.rstack.pop();
-                        }
-                    }
-                    this.skip(ret.ktype);
-                    this.skip(ret.vtype);
-                }
-                this.readMapEnd();
-                return null;
-
-            case Thrift.Type.SET:
-                ret = this.readSetBegin();
-                for (i = 0; i < ret.size; i++) {
-                    this.skip(ret.etype);
-                }
-                this.readSetEnd();
-                return null;
-
-            case Thrift.Type.LIST:
-                ret = this.readListBegin();
-                for (i = 0; i < ret.size; i++) {
-                    this.skip(ret.etype);
-                }
-                this.readListEnd();
-                return null;
-        }
-    }
-};
-
-
-/**
- * Initializes a MutilplexProtocol Implementation as a Wrapper for Thrift.Protocol
- * @constructor
- */
-Thrift.MultiplexProtocol = function (srvName, trans, strictRead, strictWrite) {
-    Thrift.Protocol.call(this, trans, strictRead, strictWrite);
-    this.serviceName = srvName;
-};
-Thrift.inherits(Thrift.MultiplexProtocol, Thrift.Protocol, 'multiplexProtocol');
-
-/** Override writeMessageBegin method of prototype*/
-Thrift.MultiplexProtocol.prototype.writeMessageBegin = function (name, type, seqid) {
-
-    if (type === Thrift.MessageType.CALL || type === Thrift.MessageType.ONEWAY) {
-        Thrift.Protocol.prototype.writeMessageBegin.call(this, this.serviceName + ":" + name, type, seqid);
-    } else {
-        Thrift.Protocol.prototype.writeMessageBegin.call(this, name, type, seqid);
-    }
-};
-
-Thrift.Multiplexer = function () {
-    this.seqid = 0;
-};
-
-/** Instantiates a multiplexed client for a specific service
- * @constructor
- * @param {String} serviceName - The transport to serialize to/from.
- * @param {Thrift.ServiceClient} SCl - The Service Client Class
- * @param {Thrift.Transport} transport - Thrift.Transport instance which provides remote host:port
- * @example
- *    var mp = new Thrift.Multiplexer();
- *    var transport = new Thrift.Transport("http://localhost:9090/foo.thrift");
- *    var protocol = new Thrift.Protocol(transport);
- *    var client = mp.createClient('AuthService', AuthServiceClient, transport);
-*/
-Thrift.Multiplexer.prototype.createClient = function (serviceName, SCl, transport) {
-    if (SCl.Client) {
-        SCl = SCl.Client;
-    }
-    var self = this;
-    SCl.prototype.new_seqid = function () {
-        self.seqid += 1;
-        return self.seqid;
-    };
-    var client = new SCl(new Thrift.MultiplexProtocol(serviceName, transport));
-
-    return client;
-};
-
-
-
-var copyList, copyMap;
-
-copyList = function(lst, types) {
-
-  if (!lst) {return lst; }
-
-  var type;
-
-  if (types.shift === undefined) {
-    type = types;
-  }
-  else {
-    type = types[0];
-  }
-  var Type = type;
-
-  var len = lst.length, result = [], i, val;
-  for (i = 0; i < len; i++) {
-    val = lst[i];
-    if (type === null) {
-      result.push(val);
-    }
-    else if (type === copyMap || type === copyList) {
-      result.push(type(val, types.slice(1)));
-    }
-    else {
-      result.push(new Type(val));
-    }
-  }
-  return result;
-};
-
-copyMap = function(obj, types){
-
-  if (!obj) {return obj; }
-
-  var type;
-
-  if (types.shift === undefined) {
-    type = types;
-  }
-  else {
-    type = types[0];
-  }
-  var Type = type;
-
-  var result = {}, val;
-  for(var prop in obj) {
-    if(obj.hasOwnProperty(prop)) {
-      val = obj[prop];
-      if (type === null) {
-        result[prop] = val;
-      }
-      else if (type === copyMap || type === copyList) {
-        result[prop] = type(val, types.slice(1));
-      }
-      else {
-        result[prop] = new Type(val);
-      }
-    }
-  }
-  return result;
-};
-
-Thrift.copyMap = copyMap;
-Thrift.copyList = copyList;
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/js/test/Makefile.am
deleted file mode 100755
index 14927c4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-export CLASSPATH
-
-# Make sure this doesn't fail if ant is not configured.
-clean-local:
-	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT $(ANT_FLAGS) clean
-
-check-local: all
-	$(ANT) $(ANT_FLAGS) test
-
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/README.md b/vendor/git.apache.org/thrift.git/lib/js/test/README.md
deleted file mode 100644
index 9ad140e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-Thrift Javascript Library
-=========================
-This browser based Apache Thrift implementation supports
-RPC clients using the JSON protocol over Http[s] with XHR
-and WebSocket.
-
-License
--------
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Test Servers
-------------
-drwxr-xr-x 2 randy randy  4096 Feb  8 15:44 sec
--rw-r--r-- 1 randy randy  2183 Feb  9 04:01 server_http.js
--rw-r--r-- 1 randy randy  2386 Feb  9 05:39 server_https.js
-
-server_http.js is a Node.js web server which support the
-standard Apache Thrift test suite (thrift/test/ThriftTest.thrift).
-The server supports Apache Thrift XHR and WebSocket clients.
-
-server_https.js is the same but uses SSL/TLS. The server key 
-and cert are pulled from the thrift/test/keys folder.
-
-Both of these servers support WebSocket (the http: supports ws:,
-and the https: support wss:).
-
-To run the client test with the Java test server use: 
-$ make check (requires the Apache Thrift Java branch 
-and make check must have been run in thrift/lib/java 
-previously).
-
-To run the client tests with the Node servers run the grunt
- build in the parent js directory (see README there).
- 
-Test Clients
-------------
--rw-r--r-- 1 randy randy 13558 Feb  9 07:18 test-async.js
--rw-r--r-- 1 randy randy  5724 Feb  9 03:45 test_handler.js
--rwxr-xr-x 1 randy randy  2719 Feb  9 06:04 test.html
--rw-r--r-- 1 randy randy  4611 Feb  9 06:05 test-jq.js
--rwxr-xr-x 1 randy randy 12153 Feb  9 06:04 test.js
--rw-r--r-- 1 randy randy  2593 Feb  9 06:16 test-nojq.html
--rw-r--r-- 1 randy randy  1450 Feb  9 06:14 test-nojq.js
--rw-r--r-- 1 randy randy  2847 Feb  9 06:31 testws.html
-
-There are three html test driver files, all of which are
-QUnit based. test.html tests the Apache Thrift jQuery
-generated code (thrift -gen js:jquery). The test-nojq.html
-runs almost identical tests against normal JavaScript builds
-(thrift -gen js). Both of the previous tests use the XHR 
-transport. The testws.html runs similar tests using the
-WebSocket transport. The test*.js files are loaded by the
-html drivers and contain the actual Apache Thrift tests.
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/build.xml b/vendor/git.apache.org/thrift.git/lib/js/test/build.xml
deleted file mode 100755
index b3a6b3e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/build.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project name="Java Script Test" default="test" basedir="."
-  xmlns:artifact="antlib:org.apache.maven.artifact.ant"
-  xmlns:jsl="antlib:com.googlecode.jslint4java">
-
-  <description>Java Script Test based on Thrift Java Library</description>
-
-  <property name="src" location="src" />
-  <property name="genjava" location="gen-java" />
-  <property name="genjs" location="gen-js" />
-  <property name="build" location="build" />
-  <property name="jar.file" location="${build}/jstest.jar" />
-
-  <!-- the root directory, where you unpack thrift distibution (e.g. thrift-0.x.x.tar.gz) -->
-  <property name="thrift.dir" location="../../../" />
-  <property name="thrift.java.dir" location="${thrift.dir}/lib/java" />
-
-  <!-- Include the base java properties file -->
-  <property file="${thrift.java.dir}/build.properties" />
-
-  <property name="thrift.compiler" location="${thrift.dir}/compiler/cpp/thrift" />
-
-  <path id="libs.classpath">
-    <fileset dir="${thrift.java.dir}/build/">
-      <include name="*.jar" />
-    </fileset>
-    <fileset dir="${thrift.java.dir}/build/lib">
-      <include name="*.jar" />
-    </fileset>
-    <fileset dir="${build}/lib">
-      <include name="*.jar" />
-    </fileset>
-  </path>
-
-  <path id="test.classpath">
-    <path refid="libs.classpath" />
-    <pathelement location="${jar.file}" />
-  </path>
-
-  <target name="dependencies">
-    <fail>
-      <condition>
-        <not>
-          <resourcecount count="2">
-            <fileset id="fs" dir="${thrift.java.dir}/build">
-              <include name="libthrift*.jar" />
-              <exclude name="libthrift*javadoc.jar" />
-            </fileset>
-          </resourcecount>
-        </not>
-      </condition>
-      You need libthrift*.jar and libthrift*test.jar located at
-      ${thrift.java.dir}/build
-      Did you compile Thrift Java library and its test suite by "ant compile-test"?
-    </fail>
-    <fail>
-      <condition>
-        <not>
-          <resourcecount count="1">
-            <fileset id="fs" dir="${thrift.dir}" includes="compiler/cpp/thrift"/>
-          </resourcecount>
-        </not>
-      </condition>
-      Thrift compiler is missing !
-    </fail>
-  </target>
-
-  <target name="init" depends="dependencies">
-    <tstamp />
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build}/js/lib"/>
-    <mkdir dir="${build}/lib"/>
-    <mkdir dir="${build}/log"/>
-    <mkdir dir="${build}/test"/>
-    <mkdir dir="${build}/test/log"/>
-  </target>
-
-  <target name="jslibs" depends="init, proxy">
-    <get src="http://code.jquery.com/jquery-1.11.3.min.js" dest="${build}/js/lib/jquery.js" usetimestamp="true"/>
-    <get src="http://code.jquery.com/qunit/qunit-1.18.0.js" dest="${build}/js/lib/qunit.js" usetimestamp="true"/>
-    <get src="http://code.jquery.com/qunit/qunit-1.18.0.css" dest="${build}/js/lib/qunit.css" usetimestamp="true"/>
-  </target>
-
-  <target name="compile" description="compile the test suite" depends="init, generate, resolve">
-    <!-- //TODO enable <compilerarg value="-Xlint"/>-->
-    <javac includeantruntime="false" srcdir="${genjava}" destdir="${build}/test" classpathref="libs.classpath"/>
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}/test" classpathref="libs.classpath"/>
-  </target>
-
-  <target name="jstest" description="create the test suite jar file" depends="compile">
-    <jar jarfile="${jar.file}" basedir="${build}/test"/>
-  </target>
-
-  <target name="testserver" description="run the test server" depends="jstest, jslibs">
-    <java classname="test.Httpd" fork="true"
-      classpathref="test.classpath" failonerror="true">
-      <arg value="../" />
-    </java>
-  </target>
-
-  <target name="proxy" if="proxy.enabled">
-    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-      proxyuser="${proxy.user}" proxypassword="${proxy.pass}"/>
-  </target>
-
-  <target name="xvfb">
-    <echo>check if Xvfb is available:</echo>
-    <exec executable="Xvfb" failifexecutionfails="no" resultproperty="xvfb.present" failonerror="false" output="${build}/log/xvfb.log">
-      <arg line="--version"/>
-    </exec>
-  </target>
-
-  <target name="phantomjs" depends="xvfb" if="xvfb.present">
-    <echo>check if phantomjs is available:</echo>
-    <exec executable="phantomjs" failifexecutionfails="no" resultproperty="phantomjs.present" failonerror="false" output="${build}/log/phantomjs.log">
-      <arg line="--version"/>
-    </exec>
-  </target>
-
-  <target name="unittest" description="do unit tests with headless browser phantomjs" depends="init, phantomjs, jstest, jslibs" if="phantomjs.present">
-    <parallel>
-      <exec executable="Xvfb" spawn="true" failonerror="false">
-        <arg line=":99" />
-      </exec>
-      <java classname="test.Httpd" fork="true" timeout="10000"
-        classpathref="test.classpath" failonerror="false" output="${build}/log/unittest.log">
-        <arg value="../" />
-      </java>
-      <sequential>
-        <sleep seconds="2"/>
-        <echo>Running Unit Tests with headless browser!</echo>
-        <exec executable="phantomjs" failonerror="true">
-          <env key="DISPLAY" value=":99"/>
-          <arg line="phantomjs-qunit.js http://localhost:8088/test/test.html" />
-        </exec>
-      </sequential>
-    </parallel>
-  </target>
-
-  <target name="generate">
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen java ${thrift.dir}/test/ThriftTest.thrift" />
-    </exec>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen js:jquery ${thrift.dir}/test/ThriftTest.thrift" />
-    </exec>
-  </target>
-
-  <target name="test" description="run test suite (lint, unittest)" depends="lint, unittest"/>
-
-  <target name="lint" description="code quality checks (jslint and gjslint if available)" depends="generate, gjslint, jslint"/>
-
-  <target name="jslint" depends="resolve">
-    <taskdef uri="antlib:com.googlecode.jslint4java" resource="com/googlecode/jslint4java/antlib.xml" classpathref="libs.classpath" />
-    <!--
-         the following options would probably make sense in the future:
-         browser,undef,eqeqeq,plusplus,bitwise,regexp,strict,newcap,immed
-    -->
-    <jsl:jslint options="evil,forin,browser,bitwise,regexp,newcap,immed" encoding="UTF-8">
-      <formatter type="plain" />
-      <fileset dir="${genjs}" includes="**/*.js" />
-      <fileset dir="../src" includes="thrift.js" />
-
-      <!-- issues with unsafe character -->
-      <!-- fileset dir="." includes="*test*.js" /> -->
-    </jsl:jslint>
-  </target>
-
-  <target name="check-gjslint">
-    <echo>check if gjslint is available:</echo>
-    <exec executable="gjslint" failifexecutionfails="no" resultproperty="gjslint.present" failonerror="false">
-      <arg line="--helpshort"/>
-    </exec>
-  </target>
-
-  <target name="gjslint" depends="check-gjslint" if="gjslint.present">
-    <exec executable="gjslint" failifexecutionfails="no">
-      <arg line="--nojsdoc"/>
-      <arg line="${genjs}/*.js"/>
-      <arg line="../src/thrift.js"/>
-
-      <!-- issues with unsafe character, etc. -->
-      <!-- <arg line="*test*.js"/> -->
-    </exec>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build}" />
-    <delete dir="${genjava}" />
-    <delete dir="${genjs}" />
-  </target>
-
-  <target name="resolve" unless="mvn.finished">
-    <typedef uri="antlib:org.apache.maven.artifact.ant" classpath="${thrift.java.dir}/build/tools/${mvn.ant.task.jar}"/>
-
-    <artifact:dependencies filesetId="js.test.dependency.jars">
-      <dependency groupId="org.apache.httpcomponents" artifactId="httpclient" version="4.0.1"/>
-      <dependency groupId="com.googlecode.jslint4java" artifactId="jslint4java-ant" version="1.4.6"/>
-      <dependency groupId="eu.medsea.mimeutil" artifactId="mime-util" version="2.1.3"/>
-    </artifact:dependencies>
-
-    <!-- Copy the dependencies to the build/lib dir -->
-    <copy todir="${build}/lib">
-      <fileset refid="js.test.dependency.jars"/>
-      <mapper type="flatten"/>
-    </copy>
-
-    <property name="mvn.finished" value="true"/>
-  </target>
-</project>
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/deep-constructor.test.js b/vendor/git.apache.org/thrift.git/lib/js/test/deep-constructor.test.js
deleted file mode 100644
index 9a19809..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/deep-constructor.test.js
+++ /dev/null
@@ -1,195 +0,0 @@
-function serialize(data) {
-  var transport = new Thrift.Transport("/service");
-  var protocol  = new Thrift.Protocol(transport);
-  protocol.writeMessageBegin("", 0, 0);
-  data.write(protocol);
-  protocol.writeMessageEnd();
-  return transport.send_buf;
-}
-
-function deserialize(serialized, type) {
-  var transport = new Thrift.Transport("/service");
-  transport.setRecvBuffer(serialized);
-  var protocol  = new Thrift.Protocol(transport);
-  protocol.readMessageBegin();
-  var data = new type();
-  data.read(protocol);
-  protocol.readMessageEnd();
-  return data;
-}
-
-
-function createThriftObj() {
-
-  return new Complex({
-
-    struct_field: new Simple({value: 'a'}),
-
-    struct_list_field: [
-      new Simple({value: 'b'}),
-      new Simple({value: 'c'}),
-    ],
-
-    struct_set_field: [
-      new Simple({value: 'd'}),
-      new Simple({value: 'e'}),
-    ],
-
-    struct_map_field: {
-      A: new Simple({value: 'f'}),
-      B: new Simple({value: 'g'})
-    },
-
-    struct_nested_containers_field: [
-      [
-        {
-          C: [
-            new Simple({value: 'h'}),
-            new Simple({value: 'i'})
-          ]
-        }
-      ]
-    ],
-
-
-    struct_nested_containers_field2: {
-      D: [
-        {
-          DA: new Simple({value: 'j'})
-        },
-        {
-          DB: new Simple({value: 'k'})
-        }
-      ]
-    }
-  }
-  );
-}
-
-
-function createJsObj() {
-
-  return {
-
-    struct_field: {value: 'a'},
-
-    struct_list_field: [
-      {value: 'b'},
-      {value: 'c'},
-    ],
-
-    struct_set_field: [
-      {value: 'd'},
-      {value: 'e'},
-    ],
-
-    struct_map_field: {
-      A: {value: 'f'},
-      B: {value: 'g'}
-    },
-
-    struct_nested_containers_field: [
-      [
-        {
-          C: [
-            {value: 'h'},
-            {value: 'i'}
-          ]
-        }
-      ]
-    ],
-
-    struct_nested_containers_field2: {
-      D: [
-        {
-          DA: {value: 'j'}
-        },
-        {
-          DB: {value: 'k'}
-        }
-      ]
-    }
-  };
-}
-
-
-function assertValues(obj, assert) {
-    assert.equal(obj.struct_field.value, 'a');
-    assert.equal(obj.struct_list_field[0].value, 'b');
-    assert.equal(obj.struct_list_field[1].value, 'c');
-    assert.equal(obj.struct_set_field[0].value, 'd');
-    assert.equal(obj.struct_set_field[1].value, 'e');
-    assert.equal(obj.struct_map_field.A.value, 'f');
-    assert.equal(obj.struct_map_field.B.value, 'g');
-    assert.equal(obj.struct_nested_containers_field[0][0].C[0].value, 'h');
-    assert.equal(obj.struct_nested_containers_field[0][0].C[1].value, 'i');
-    assert.equal(obj.struct_nested_containers_field2.D[0].DA.value, 'j');
-    assert.equal(obj.struct_nested_containers_field2.D[1].DB.value, 'k');
-}
-
-var cases = {
-
-  "Serialize/deserialize simple struct should return equal object": function(assert){
-    var tObj = new Simple({value: 'a'});
-    var received = deserialize(serialize(tObj), Simple);
-    assert.ok(tObj !== received);
-    assert.deepEqual(received, tObj);
-  },
-
-
-  "Serialize/deserialize should return equal object": function(assert){
-    var tObj = createThriftObj();
-    var received = deserialize(serialize(tObj), Complex);
-    assert.ok(tObj !== received);
-    assert.deepEqual(received, tObj);
-  },
-
-  "Nested structs and containers initialized from plain js objects should serialize same as if initialized from thrift objects": function(assert) {
-    var tObj1 = createThriftObj();
-    var tObj2 = new Complex(createJsObj());
-    assertValues(tObj2, assert);
-    assert.equal(serialize(tObj2), serialize(tObj1));
-  },
-
-  "Modifications to args object should not affect constructed Thrift object": function (assert) {
-
-    var args = createJsObj();
-    assertValues(args, assert);
-
-    var tObj = new Complex(args);
-    assertValues(tObj, assert);
-
-    args.struct_field.value = 'ZZZ';
-    args.struct_list_field[0].value = 'ZZZ';
-    args.struct_list_field[1].value = 'ZZZ';
-    args.struct_set_field[0].value = 'ZZZ';
-    args.struct_set_field[1].value = 'ZZZ';
-    args.struct_map_field.A.value = 'ZZZ';
-    args.struct_map_field.B.value = 'ZZZ';
-    args.struct_nested_containers_field[0][0].C[0] = 'ZZZ';
-    args.struct_nested_containers_field[0][0].C[1] = 'ZZZ';
-    args.struct_nested_containers_field2.D[0].DA = 'ZZZ';
-    args.struct_nested_containers_field2.D[0].DB = 'ZZZ';
-
-    assertValues(tObj, assert);
-  },
-
-  "nulls are ok": function(assert) {
-    var tObj = new Complex({
-      struct_field: null,
-      struct_list_field: null,
-      struct_set_field: null,
-      struct_map_field: null,
-      struct_nested_containers_field: null,
-      struct_nested_containers_field2: null
-    });
-    var received = deserialize(serialize(tObj), Complex);
-    assert.ok(tObj !== received);
-    assert.deepEqual(tObj, received);
-  }
-
-};
-
-Object.keys(cases).forEach(function(caseName) {
-  test(caseName, cases[caseName]);
-});
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/jsTestDriver.conf b/vendor/git.apache.org/thrift.git/lib/js/test/jsTestDriver.conf
deleted file mode 100755
index b9702cd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/jsTestDriver.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-server: http://localhost:9876
-
-load:
-# Qunit adapter
-  - build/js/lib/equiv.js
-  - build/js/lib/QUnitAdapter.js
-# dependencies
-  - build/js/lib/jquery.js
-  - build/js/thrift.js
-  - gen-js/ThriftTest_types.js
-  - gen-js/ThriftTest.js
-# the test suite
-  - test.js
-
-# redirect to the Java based Thrift testserver
-proxy:
- - {matcher: "*", server: " http://localhost:8088"}
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/phantom-client.js b/vendor/git.apache.org/thrift.git/lib/js/test/phantom-client.js
deleted file mode 100644
index f75b256..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/phantom-client.js
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- /* jshint -W100 */
-
-(function() {
-  'use strict';
-
-  // Rudimentary test helper functions
-  // TODO: Return error code based on kind of errors rather than throw
-  var ok = function(t, msg) {
-    if (!t) {
-      console.log('*** FAILED ***');
-      throw new Error(msg);
-    }
-  };
-  var equal = function(a, b) {
-    if (a !== b) {
-      console.log('*** FAILED ***');
-      throw new Error();
-    }
-  };
-  var test = function(name, f) {
-    console.log('TEST : ' + name);
-    f();
-    console.log('OK\n');
-  };
-
-  var parseArgs = function(args) {
-    var skips = [
-      '--transport=http',
-      '--protocol=json',
-    ];
-    var opts = {
-      port: '9090',
-      // protocol: 'json',
-    };
-    var keys = {};
-    for (var key in opts) {
-      keys['--' + key + '='] = key;
-    }
-    for (var i in args) {
-      var arg = args[i];
-      if (skips.indexOf(arg) != -1) {
-        continue;
-      }
-      var hit = false;
-      for (var k in keys) {
-        if (arg.slice(0, k.length) === k) {
-          opts[keys[k]] = arg.slice(k.length);
-          hit = true;
-          break;
-        }
-      }
-      if (!hit) {
-        throw new Error('Unknown argument: ' + arg);
-      }
-    }
-    opts.port = parseInt(opts.port, 10);
-    if (!opts.port || opts.port < 1 || opts.port > 65535) {
-      throw new Error('Invalid port number');
-    }
-    return opts;
-  };
-
-  var execute = function() {
-    console.log('### Apache Thrift Javascript standalone test client');
-    console.log('------------------------------------------------------------');
-
-    phantom.page.injectJs('src/thrift.js');
-    phantom.page.injectJs('test/gen-js/ThriftTest_types.js');
-    phantom.page.injectJs('test/gen-js/ThriftTest.js');
-
-    var system = require('system');
-    var opts = parseArgs(system.args.slice(1));
-    var port = opts.port;
-    var transport = new Thrift.Transport('http://localhost:' + port + '/service');
-    var protocol  = new Thrift.Protocol(transport);
-    var client    = new ThriftTest.ThriftTestClient(protocol);
-
-
-    // TODO: Remove duplicate code with test.js.
-    // all Languages in UTF-8
-    var stringTest = "Afrikaans, Alemannisch, Aragonés, العربية, مصرى, Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška, Беларуская, Беларуская (тарашкевіца), Български, Bamanankan, বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн, Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg, Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English, Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt, Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego, Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski, Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia, Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa, ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар, Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino, Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, Bahasa Melayu, مازِرونی, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad, Occitan, Иронау, Papiamentu, Deitsch, Norfuk / Pitkern, Polski, پنجابی, پښتو, Português, Runa Simi, Rumantsch, Romani, Română, Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk, Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog, Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük, Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文, Bân-lâm-gú, 粵語";
-
-    function checkRecursively(map1, map2) {
-      if (typeof map1 !== 'function' && typeof map2 !== 'function') {
-        if (!map1 || typeof map1 !== 'object') {
-          equal(map1, map2);
-        } else {
-          for (var key in map1) {
-            checkRecursively(map1[key], map2[key]);
-          }
-        }
-      }
-    }
-
-    test("Void", function() {
-      equal(client.testVoid(), undefined);
-    });
-    test("Binary (String)", function() {
-      var binary = '';
-      for (var v = 255; v >= 0; --v) {
-        binary += String.fromCharCode(v);
-      }
-      equal(client.testBinary(binary), binary);
-    });
-    test("Binary (Uint8Array)", function() {
-      var binary = '';
-      for (var v = 255; v >= 0; --v) {
-        binary += String.fromCharCode(v);
-      }
-      var arr = new Uint8Array(binary.length);
-      for (var i = 0; i < binary.length; ++i) {
-        arr[i] = binary[i].charCodeAt();
-      }
-      equal(client.testBinary(arr), binary);
-    });
-    test("String", function() {
-      equal(client.testString(''), '');
-      equal(client.testString(stringTest), stringTest);
-
-      var specialCharacters = 'quote: \" backslash:' +
-        ' forwardslash-escaped: \/ ' +
-          ' backspace: \b formfeed: \f newline: \n return: \r tab: ' +
-            ' now-all-of-them-together: "\\\/\b\n\r\t' +
-              ' now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><';
-              equal(client.testString(specialCharacters),specialCharacters);
-    });
-    test("Double", function() {
-      equal(client.testDouble(0), 0);
-      equal(client.testDouble(-1), -1);
-      equal(client.testDouble(3.14), 3.14);
-      equal(client.testDouble(Math.pow(2,60)), Math.pow(2,60));
-    });
-    test("Bool", function() {
-      equal(client.testBool(true), true);
-      equal(client.testBool(false), false);
-    });
-    test("I8", function() {
-      equal(client.testByte(0), 0);
-      equal(client.testByte(0x01), 0x01);
-    });
-    test("I32", function() {
-      equal(client.testI32(0), 0);
-      equal(client.testI32(Math.pow(2,30)), Math.pow(2,30));
-      equal(client.testI32(-Math.pow(2,30)), -Math.pow(2,30));
-    });
-    test("I64", function() {
-      equal(client.testI64(0), 0);
-      //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-      equal(client.testI64(Math.pow(2,52)), Math.pow(2,52));
-      equal(client.testI64(-Math.pow(2,52)), -Math.pow(2,52));
-    });
-
-    test("Struct", function() {
-      var structTestInput = new ThriftTest.Xtruct();
-      structTestInput.string_thing = 'worked';
-      structTestInput.byte_thing = 0x01;
-      structTestInput.i32_thing = Math.pow(2,30);
-      //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-      structTestInput.i64_thing = Math.pow(2,52);
-
-      var structTestOutput = client.testStruct(structTestInput);
-
-      equal(structTestOutput.string_thing, structTestInput.string_thing);
-      equal(structTestOutput.byte_thing, structTestInput.byte_thing);
-      equal(structTestOutput.i32_thing, structTestInput.i32_thing);
-      equal(structTestOutput.i64_thing, structTestInput.i64_thing);
-
-      equal(JSON.stringify(structTestOutput), JSON.stringify(structTestInput));
-    });
-
-    test("Nest", function() {
-      var xtrTestInput = new ThriftTest.Xtruct();
-      xtrTestInput.string_thing = 'worked';
-      xtrTestInput.byte_thing = 0x01;
-      xtrTestInput.i32_thing = Math.pow(2,30);
-      //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-      xtrTestInput.i64_thing = Math.pow(2,52);
-
-      var nestTestInput = new ThriftTest.Xtruct2();
-      nestTestInput.byte_thing = 0x02;
-      nestTestInput.struct_thing = xtrTestInput;
-      nestTestInput.i32_thing = Math.pow(2,15);
-
-      var nestTestOutput = client.testNest(nestTestInput);
-
-      equal(nestTestOutput.byte_thing, nestTestInput.byte_thing);
-      equal(nestTestOutput.struct_thing.string_thing, nestTestInput.struct_thing.string_thing);
-      equal(nestTestOutput.struct_thing.byte_thing, nestTestInput.struct_thing.byte_thing);
-      equal(nestTestOutput.struct_thing.i32_thing, nestTestInput.struct_thing.i32_thing);
-      equal(nestTestOutput.struct_thing.i64_thing, nestTestInput.struct_thing.i64_thing);
-      equal(nestTestOutput.i32_thing, nestTestInput.i32_thing);
-
-      equal(JSON.stringify(nestTestOutput), JSON.stringify(nestTestInput));
-    });
-
-    test("Map", function() {
-      var mapTestInput = {7:77, 8:88, 9:99};
-
-      var mapTestOutput = client.testMap(mapTestInput);
-
-      for (var key in mapTestOutput) {
-        equal(mapTestOutput[key], mapTestInput[key]);
-      }
-    });
-
-    test("StringMap", function() {
-      var mapTestInput = {
-        "a":"123", "a b":"with spaces ", "same":"same", "0":"numeric key",
-        "longValue":stringTest, stringTest:"long key"
-      };
-
-      var mapTestOutput = client.testStringMap(mapTestInput);
-
-      for (var key in mapTestOutput) {
-        equal(mapTestOutput[key], mapTestInput[key]);
-      }
-    });
-
-    test("Set", function() {
-      var setTestInput = [1,2,3];
-      ok(client.testSet(setTestInput), setTestInput);
-    });
-
-    test("List", function() {
-      var listTestInput = [1,2,3];
-      ok(client.testList(listTestInput), listTestInput);
-    });
-
-    test("Enum", function() {
-      equal(client.testEnum(ThriftTest.Numberz.ONE), ThriftTest.Numberz.ONE);
-    });
-
-    test("TypeDef", function() {
-      equal(client.testTypedef(69), 69);
-    });
-
-    test("Skip", function() {
-      var structTestInput = new ThriftTest.Xtruct();
-      var modifiedClient = new ThriftTest.ThriftTestClient(protocol);
-
-      modifiedClient.recv_testStruct = function() {
-        var input  = modifiedClient.input;
-        var xtruct3 = new ThriftTest.Xtruct3();
-
-        input.readMessageBegin();
-        input.readStructBegin();
-
-        // read Xtruct data with Xtruct3
-        input.readFieldBegin();
-        xtruct3.read(input);
-        input.readFieldEnd();
-        // read Thrift.Type.STOP message
-        input.readFieldBegin();
-        input.readFieldEnd();
-
-        input.readStructEnd();
-        input.readMessageEnd();
-
-        return xtruct3;
-      };
-
-      structTestInput.string_thing = 'worked';
-      structTestInput.byte_thing   = 0x01;
-      structTestInput.i32_thing    = Math.pow(2,30);
-      structTestInput.i64_thing    = Math.pow(2,52);
-
-      var structTestOutput = modifiedClient.testStruct(structTestInput);
-
-      equal(structTestOutput instanceof ThriftTest.Xtruct3, true);
-      equal(structTestOutput.string_thing, structTestInput.string_thing);
-      equal(structTestOutput.changed, null);
-      equal(structTestOutput.i32_thing, structTestInput.i32_thing);
-      equal(structTestOutput.i64_thing, structTestInput.i64_thing);
-    });
-
-    test("MapMap", function() {
-      var mapMapTestExpectedResult = {
-        "4":{"1":1,"2":2,"3":3,"4":4},
-        "-4":{"-4":-4, "-3":-3, "-2":-2, "-1":-1}
-      };
-
-      var mapMapTestOutput = client.testMapMap(1);
-
-
-      for (var key in mapMapTestOutput) {
-        for (var key2 in mapMapTestOutput[key]) {
-          equal(mapMapTestOutput[key][key2], mapMapTestExpectedResult[key][key2]);
-        }
-      }
-
-      checkRecursively(mapMapTestOutput, mapMapTestExpectedResult);
-    });
-
-    test("Xception", function() {
-      try {
-        client.testException("Xception");
-        ok(false);
-      } catch (e) {
-        equal(e.errorCode, 1001);
-        equal(e.message, "Xception");
-      }
-    });
-
-    test("no Exception", function() {
-      try {
-        client.testException("no Exception");
-      } catch (e) {
-        ok(false);
-      }
-    });
-
-    test("TException", function() {
-      try {
-        client.testException("TException");
-        ok(false);
-      } catch(e) {
-        ok(ok);
-      }
-    });
-
-    var crazy = {
-      "userMap":{ "5":5, "8":8 },
-      "xtructs":[{
-        "string_thing":"Goodbye4",
-        "byte_thing":4,
-        "i32_thing":4,
-        "i64_thing":4
-      },
-      {
-        "string_thing":"Hello2",
-        "byte_thing":2,
-        "i32_thing":2,
-        "i64_thing":2
-      }]
-    };
-    test("Insanity", function() {
-      var insanity = {
-        "1":{
-          "2":crazy,
-          "3":crazy
-        },
-        "2":{ "6":{ "userMap":null, "xtructs":null } }
-      };
-      var res = client.testInsanity(new ThriftTest.Insanity(crazy));
-      ok(res, JSON.stringify(res));
-      ok(insanity, JSON.stringify(insanity));
-
-      checkRecursively(res, insanity);
-    });
-
-    console.log('------------------------------------------------------------');
-    console.log('### All tests succeeded.');
-    return 0;
-  };
-
-  try {
-    var ret = execute();
-    phantom.exit(ret);
-  } catch (err) {
-    // Catch all and exit to avoid hang.
-    console.error(err);
-    phantom.exit(1);
-  }
-})();
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/phantomjs-qunit.js b/vendor/git.apache.org/thrift.git/lib/js/test/phantomjs-qunit.js
deleted file mode 100755
index a840db6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/phantomjs-qunit.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*jshint evil:true*/
-
-/* This file is only used by the test suite.
- *
- * Origin:  https://github.com/ariya/phantomjs/blob/master/examples/run-qunit.js
- * License: https://github.com/ariya/phantomjs/blob/master/LICENSE.BSD
- *
- * Inclusion into Apache products is allowed according to http://www.apache.org/legal/3party.html
- */
-
-var system = require('system');
-
-
-/**
- * Wait until the test condition is true or a timeout occurs. Useful for waiting
- * on a server response or for a ui change (fadeIn, etc.) to occur.
- *
- * @param testFx javascript condition that evaluates to a boolean,
- * it can be passed in as a string (e.g.: "1 == 1" or "$('#bar').is(':visible')" or
- * as a callback function.
- * @param onReady what to do when testFx condition is fulfilled,
- * it can be passed in as a string (e.g.: "1 == 1" or "$('#bar').is(':visible')" or
- * as a callback function.
- * @param timeOutMillis the max amount of time to wait. If not specified, 3 sec is used.
- */
-function waitFor(testFx, onReady, timeOutMillis) {
-    var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001, //< Default Max Timout is 3s
-        start = new Date().getTime(),
-        condition = false,
-        interval = setInterval(function() {
-            if ( (new Date().getTime() - start < maxtimeOutMillis) && !condition ) {
-                // If not time-out yet and condition not yet fulfilled
-                condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()); //< defensive code
-            } else {
-                if(!condition) {
-                    // If condition still not fulfilled (timeout but condition is 'false')
-                    console.log("'waitFor()' timeout");
-                    phantom.exit(1);
-                } else {
-                    // Condition fulfilled (timeout and/or condition is 'true')
-                    console.log("'waitFor()' finished in " + (new Date().getTime() - start) + "ms.");
-                    if (typeof(onReady) === "string") {
-                        eval(onReady);
-                    } else {
-                        onReady(); //< Do what it's supposed to do once the condition is fulfilled
-                    }
-                    clearInterval(interval); //< Stop this interval
-                }
-            }
-        }, 100); //< repeat check every 250ms
-}
-
-
-if (system.args.length === 1 || system.args.length > 3) {
-    console.log('Usage: phantomjs phantomjs-qunit.js URL');
-    phantom.exit(1);
-}
-
-var page = new WebPage();
-
-// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
-page.onConsoleMessage = function(msg) {
-    console.log(msg);
-};
-
-page.open(system.args[1], function(status){
-    if (status !== "success") {
-        console.log("Unable to access network");
-        phantom.exit(1);
-    } else {
-        waitFor(function(){
-            return page.evaluate(function(){
-                var el = document.getElementById('qunit-testresult');
-                if (el && el.innerText.match('completed')) {
-                    return true;
-                }
-                return false;
-            });
-        }, function(){
-            var failedNum = page.evaluate(function(){
-                var el = document.getElementById('qunit-testresult');
-                console.log(el.innerText);
-                try {
-                    return el.getElementsByClassName('failed')[0].innerHTML;
-                } catch (e) { }
-                return 10000;
-            });
-            phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0);
-        });
-    }
-});
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/server_http.js b/vendor/git.apache.org/thrift.git/lib/js/test/server_http.js
deleted file mode 100644
index e195e80..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/server_http.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//This HTTP server is designed to serve the test.html browser
-//  based JavaScript test page (which must be in the current directory). 
-//  This server also supplies the Thrift based test service, which depends
-//  on the standard ThriftTest.thrift IDL service (which must be compiled
-//  for Node and browser based JavaScript in ./gen-nodejs and ./gen-js
-//  respectively). 
-
-var thrift = require('../../nodejs/lib/thrift');
-var ThriftTestSvc = require('./gen-nodejs/ThriftTest.js');
-var ThriftTestHandler = require('./test_handler').ThriftTestHandler;
-
-var ThriftTestSvcOpt = {
-	transport: thrift.TBufferedTransport,
-	protocol: thrift.TJSONProtocol,
-	processor: ThriftTestSvc,
-	handler: ThriftTestHandler
-};
-
-var ThriftWebServerOptions = {
-	files: ".",
-	services: {
-		"/service": ThriftTestSvcOpt
-	}
-};
-
-var server = thrift.createWebServer(ThriftWebServerOptions);
-var port = 8088;
-server.listen(port);
-console.log("Serving files from: " + __dirname);
-console.log("Http/Thrift Server running on port: " + port);
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/server_https.js b/vendor/git.apache.org/thrift.git/lib/js/test/server_https.js
deleted file mode 100644
index af1745b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/server_https.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//This HTTP server is designed to server the test.html browser
-//  based JavaScript test page (which must be in the current directory). 
-//  This server also supplies the Thrift based test service, which depends
-//  on the standard ThriftTest.thrift IDL service (which must be compiled
-//  for Node and browser based JavaScript in ./gen-nodejs and ./gen-js
-//  respectively). The current directory must also include the browser
-//  support libraries for test.html (jquery.js, qunit.js and qunit.css
-//  in ./build/js/lib).
-
-var fs = require("fs");
-var thrift = require('../../nodejs/lib/thrift');
-var ThriftTestSvc = require('./gen-nodejs/ThriftTest.js');
-var ThriftTestHandler = require('./test_handler').ThriftTestHandler;
-
-//Setup the I/O stack options for the ThriftTest service
-var ThriftTestSvcOpt = {
-  transport: thrift.TBufferedTransport,
-  protocol: thrift.TJSONProtocol,
-  processor: ThriftTestSvc,
-  handler: ThriftTestHandler
-};
-
-var ThriftWebServerOptions = {
-  files: ".",
-  tls: {
-     key: fs.readFileSync("../../../test/keys/server.key"),
-     cert: fs.readFileSync("../../../test/keys/server.crt")
-  },	
-  services: {
-    "/service": ThriftTestSvcOpt
-  }
-};
-
-var server = thrift.createWebServer(ThriftWebServerOptions);
-var port = 8089;
-server.listen(port);
-console.log("Serving files from: " + __dirname);
-console.log("Http/Thrift Server running on port: " + port);
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/src/test/Httpd.java b/vendor/git.apache.org/thrift.git/lib/js/test/src/test/Httpd.java
deleted file mode 100644
index e4fc0cc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/src/test/Httpd.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.URLDecoder;
-import java.util.Locale;
-
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpServerConnection;
-import org.apache.http.HttpStatus;
-import org.apache.http.MethodNotSupportedException;
-import org.apache.http.entity.ContentProducer;
-import org.apache.http.entity.EntityTemplate;
-import org.apache.http.entity.FileEntity;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.DefaultHttpServerConnection;
-import org.apache.http.impl.NoConnectionReuseStrategy;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.BasicHttpProcessor;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.HttpRequestHandlerRegistry;
-import org.apache.http.protocol.HttpService;
-import org.apache.http.util.EntityUtils;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TJSONProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-import thrift.test.ThriftTest;
-import org.apache.thrift.server.ServerTestBase.TestHandler;
-
-import eu.medsea.mimeutil.detector.ExtensionMimeDetector;
-import eu.medsea.mimeutil.MimeUtil2;
-import eu.medsea.mimeutil.MimeType;
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * Basic, yet fully functional and spec compliant, HTTP/1.1 file server.
- * <p>
- * Please note the purpose of this application is demonstrate the usage of
- * HttpCore APIs. It is NOT intended to demonstrate the most efficient way of
- * building an HTTP file server.
- * 
- * 
- */
-public class Httpd {
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 1) {
-            System.err.println("Please specify document root directory");
-            System.exit(1);
-        }
-        Thread t = new RequestListenerThread(8088, args[0]);
-        t.setDaemon(false);
-        t.start();
-    }
-
-    static class HttpFileHandler implements HttpRequestHandler {
-
-        private final String docRoot;
-
-        public HttpFileHandler(final String docRoot) {
-            super();
-            this.docRoot = docRoot;
-        }
-
-        public void handle(final HttpRequest request, final HttpResponse response, final HttpContext context) throws HttpException, IOException {
-
-            String method = request.getRequestLine().getMethod().toUpperCase(Locale.ENGLISH);
-            if (!method.equals("GET") && !method.equals("HEAD") && !method.equals("POST")) {
-                throw new MethodNotSupportedException(method + " method not supported");
-            }
-            String target = request.getRequestLine().getUri();
-
-            if (request instanceof HttpEntityEnclosingRequest && target.equals("/service")) {
-                HttpEntity entity = ((HttpEntityEnclosingRequest) request).getEntity();
-                byte[] entityContent = EntityUtils.toByteArray(entity);
-                System.out.println("Incoming content: " + new String(entityContent));
-                
-                final String output = this.thriftRequest(entityContent);
-                
-                System.out.println("Outgoing content: "+output);
-                
-                EntityTemplate body = new EntityTemplate(new ContentProducer() {
-
-                    public void writeTo(final OutputStream outstream) throws IOException {
-                        OutputStreamWriter writer = new OutputStreamWriter(outstream, "UTF-8");
-                        writer.write(output);
-                        writer.flush();
-                    }
-
-                });
-                body.setContentType("text/html; charset=UTF-8");
-                response.setEntity(body);
-            } else {
-                if(target.indexOf("?") != -1) {
-                 target = target.substring(1, target.indexOf("?"));
-                }
-
-                final File file = new File(this.docRoot, URLDecoder.decode(target, "UTF-8"));
-
-                if (!file.exists()) {
-
-                    response.setStatusCode(HttpStatus.SC_NOT_FOUND);
-                    EntityTemplate body = new EntityTemplate(new ContentProducer() {
-
-                        public void writeTo(final OutputStream outstream) throws IOException {
-                            OutputStreamWriter writer = new OutputStreamWriter(outstream, "UTF-8");
-                            writer.write("<html><body><h1>");
-                            writer.write("File ");
-                            writer.write(file.getPath());
-                            writer.write(" not found");
-                            writer.write("</h1></body></html>");
-                            writer.flush();
-                        }
-
-                    });
-                    body.setContentType("text/html; charset=UTF-8");
-                    response.setEntity(body);
-                    System.out.println("File " + file.getPath() + " not found");
-
-                } else if (!file.canRead() || file.isDirectory()) {
-
-                    response.setStatusCode(HttpStatus.SC_FORBIDDEN);
-                    EntityTemplate body = new EntityTemplate(new ContentProducer() {
-
-                        public void writeTo(final OutputStream outstream) throws IOException {
-                            OutputStreamWriter writer = new OutputStreamWriter(outstream, "UTF-8");
-                            writer.write("<html><body><h1>");
-                            writer.write("Access denied");
-                            writer.write("</h1></body></html>");
-                            writer.flush();
-                        }
-
-                    });
-                    body.setContentType("text/html; charset=UTF-8");
-                    response.setEntity(body);
-                    System.out.println("Cannot read file " + file.getPath());
-
-                } else {
-
-                    String mimeType = "application/octet-stream";
-                    MimeUtil2 mimeUtil = new MimeUtil2();
-                    synchronized (this) {
-                        mimeUtil.registerMimeDetector(ExtensionMimeDetector.class.getName());
-                    }
-                    Collection<MimeType> collection = mimeUtil.getMimeTypes(file);
-                    Iterator<MimeType> iterator = collection.iterator();
-                    while(iterator.hasNext()) {
-                        MimeType mt = iterator.next();
-                        mimeType =  mt.getMediaType() + "/" + mt.getSubType();
-                        break;
-                    }
-
-                    response.setStatusCode(HttpStatus.SC_OK);
-                    FileEntity body = new FileEntity(file, mimeType);
-                    response.addHeader("Content-Type", mimeType);
-                    response.setEntity(body);
-                    System.out.println("Serving file " + file.getPath());
-
-                }
-            }
-        }
-        
-        private String thriftRequest(byte[] input){
-            try{
-            
-                //Input
-                TMemoryBuffer inbuffer = new TMemoryBuffer(input.length);           
-                inbuffer.write(input);              
-                TProtocol  inprotocol   = new TJSONProtocol(inbuffer);                   
-                
-                //Output
-                TMemoryBuffer outbuffer = new TMemoryBuffer(100);           
-                TProtocol outprotocol   = new TJSONProtocol(outbuffer);
-                
-                TProcessor processor = new ThriftTest.Processor(new TestHandler());      
-                processor.process(inprotocol, outprotocol);
-                
-                byte[] output = new byte[outbuffer.length()];
-                outbuffer.readAll(output, 0, output.length);
-            
-                return new String(output,"UTF-8");
-            }catch(Throwable t){
-                return "Error:"+t.getMessage();
-            }
-             
-                     
-        }
-        
-    }
-
-    static class RequestListenerThread extends Thread {
-
-        private final ServerSocket serversocket;
-        private final HttpParams params;
-        private final HttpService httpService;
-
-        public RequestListenerThread(int port, final String docroot) throws IOException {
-            this.serversocket = new ServerSocket(port);
-            this.params = new BasicHttpParams();
-            this.params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 1000).setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
-                    .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false).setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
-                    .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "HttpComponents/1.1");
-
-            // Set up the HTTP protocol processor
-            HttpProcessor httpproc = new BasicHttpProcessor();
-
-            // Set up request handlers
-            HttpRequestHandlerRegistry reqistry = new HttpRequestHandlerRegistry();
-            reqistry.register("*", new HttpFileHandler(docroot));
-
-            // Set up the HTTP service
-            this.httpService = new HttpService(httpproc, new NoConnectionReuseStrategy(), new DefaultHttpResponseFactory());
-            this.httpService.setParams(this.params);
-            this.httpService.setHandlerResolver(reqistry);
-        }
-
-        public void run() {
-            System.out.println("Listening on port " + this.serversocket.getLocalPort());
-            System.out.println("Point your browser to http://localhost:8088/test/test.html");
-            
-            while (!Thread.interrupted()) {
-                try {
-                    // Set up HTTP connection
-                    Socket socket = this.serversocket.accept();
-                    DefaultHttpServerConnection conn = new DefaultHttpServerConnection();
-                    System.out.println("Incoming connection from " + socket.getInetAddress());
-                    conn.bind(socket, this.params);
-
-                    // Start worker thread
-                    Thread t = new WorkerThread(this.httpService, conn);
-                    t.setDaemon(true);
-                    t.start();
-                } catch (InterruptedIOException ex) {
-                    break;
-                } catch (IOException e) {
-                    System.err.println("I/O error initialising connection thread: " + e.getMessage());
-                    break;
-                }
-            }
-        }
-    }
-
-    static class WorkerThread extends Thread {
-
-        private final HttpService httpservice;
-        private final HttpServerConnection conn;
-
-        public WorkerThread(final HttpService httpservice, final HttpServerConnection conn) {
-            super();
-            this.httpservice = httpservice;
-            this.conn = conn;
-        }
-
-        public void run() {
-            System.out.println("New connection thread");
-            HttpContext context = new BasicHttpContext(null);
-            try {
-                while (!Thread.interrupted() && this.conn.isOpen()) {
-                    this.httpservice.handleRequest(this.conn, context);
-                }
-            } catch (ConnectionClosedException ex) {
-                System.err.println("Client closed connection");
-            } catch (IOException ex) {
-                System.err.println("I/O error: " + ex.getMessage());
-            } catch (HttpException ex) {
-                System.err.println("Unrecoverable HTTP protocol violation: " + ex.getMessage());
-            } finally {
-                try {
-                    this.conn.shutdown();
-                } catch (IOException ignore) {
-                }
-            }
-        }
-
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/test-async.js b/vendor/git.apache.org/thrift.git/lib/js/test/test-async.js
deleted file mode 100644
index 336e2bc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/test-async.js
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- /* jshint -W100 */
- 
-/*
- * Fully Async JavaScript test suite for ThriftTest.thrift. 
- * These tests are designed to exercise the WebSocket transport
- * (which is exclusively async).
- *
- * To compile client code for this test use:
- *      $ thrift -gen js ThriftTest.thrift
- */
-
-
-
-// all Languages in UTF-8
-var stringTest = "Afrikaans, Alemannisch, Aragonés, العربية, مصرى, Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška, Беларуская, Беларуская (тарашкевіца), Български, Bamanankan, বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн, Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg, Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English, Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt, Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego, Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski, Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia, Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa, ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар, Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino, Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, Bahasa Melayu, مازِرونی, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad, Occitan, Иронау, Papiamentu, Deitsch, Norfuk / Pitkern, Polski, پنجابی, پښتو, Português, Runa Simi, Rumantsch, Romani, Română, Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk, Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog, Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük, Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文, Bân-lâm-gú, 粵語";
-  
-function checkRecursively(map1, map2) {
-  if (typeof map1 !== 'function' && typeof map2 !== 'function') {
-    if (!map1 || typeof map1 !== 'object') {
-        equal(map1, map2);
-    } else {
-      for (var key in map1) {
-        checkRecursively(map1[key], map2[key]);
-      }
-    }
-  }
-}
-
-module("Base Types");
-
-  asyncTest("Void", function() {
-    expect( 1 );
-    client.testVoid(function(result) {
-      equal(result, undefined);
-      QUnit.start();
-    });
-  });
-  
-  
-  asyncTest("String", function() {
-    expect( 3 );
-    QUnit.stop(2);
-    client.testString('', function(result){
-       equal(result, '');
-       QUnit.start();
-    });
-    client.testString(stringTest, function(result){
-       equal(result, stringTest);
-       QUnit.start();
-    });
-
-    var specialCharacters = 'quote: \" backslash:' +
-          ' forwardslash-escaped: \/ ' +
-          ' backspace: \b formfeed: \f newline: \n return: \r tab: ' +
-          ' now-all-of-them-together: "\\\/\b\n\r\t' +
-          ' now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><';
-    client.testString(specialCharacters, function(result){
-       equal(result, specialCharacters);
-       QUnit.start();
-    });
-  });
-  asyncTest("Double", function() {
-    expect( 4 );
-    QUnit.stop(3);
-    client.testDouble(0, function(result){
-       equal(result, 0);
-       QUnit.start();
-    });
-    client.testDouble(-1, function(result){
-       equal(result, -1);
-       QUnit.start();
-    });
-    client.testDouble(3.14, function(result){
-       equal(result, 3.14);
-       QUnit.start();
-    });
-    client.testDouble(Math.pow(2,60), function(result){
-       equal(result, Math.pow(2,60));
-       QUnit.start();
-    });
-  });
-  // TODO: add testBinary() 
-  asyncTest("Byte", function() {
-    expect( 2 );
-    QUnit.stop();
-    client.testByte(0, function(result) {
-       equal(result, 0);
-       QUnit.start();
-    });
-    client.testByte(0x01, function(result) {
-       equal(result, 0x01);
-       QUnit.start();
-    });
-  });
-  asyncTest("I32", function() {
-    expect( 3 );
-    QUnit.stop(2);
-    client.testI32(0, function(result){
-       equal(result, 0);
-       QUnit.start();
-    });
-    client.testI32(Math.pow(2,30), function(result){
-       equal(result, Math.pow(2,30));
-       QUnit.start();
-    });
-    client.testI32(-Math.pow(2,30), function(result){
-       equal(result, -Math.pow(2,30));
-       QUnit.start();
-    });
-  });
-  asyncTest("I64", function() {
-    expect( 3 );
-    QUnit.stop(2);
-    client.testI64(0, function(result){
-       equal(result, 0);
-       QUnit.start();
-    });
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    client.testI64(Math.pow(2,52), function(result){
-       equal(result, Math.pow(2,52));
-       QUnit.start();
-    });
-    client.testI64(-Math.pow(2,52), function(result){
-       equal(result, -Math.pow(2,52));
-       QUnit.start();
-    });
-  });
-  
-
-  
-
-module("Structured Types");
-
-  asyncTest("Struct", function() {
-    expect( 5 );
-    var structTestInput = new ThriftTest.Xtruct();
-    structTestInput.string_thing = 'worked';
-    structTestInput.byte_thing = 0x01;
-    structTestInput.i32_thing = Math.pow(2,30);
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    structTestInput.i64_thing = Math.pow(2,52);
-
-    client.testStruct(structTestInput, function(result){
-      equal(result.string_thing, structTestInput.string_thing);
-      equal(result.byte_thing, structTestInput.byte_thing);
-      equal(result.i32_thing, structTestInput.i32_thing);
-      equal(result.i64_thing, structTestInput.i64_thing);
-      equal(JSON.stringify(result), JSON.stringify(structTestInput));
-      QUnit.start();      
-    });
-  });
-
-  asyncTest("Nest", function() {
-    expect( 7 );
-    var xtrTestInput = new ThriftTest.Xtruct();
-    xtrTestInput.string_thing = 'worked';
-    xtrTestInput.byte_thing = 0x01;
-    xtrTestInput.i32_thing = Math.pow(2,30);
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    xtrTestInput.i64_thing = Math.pow(2,52);
-    
-    var nestTestInput = new ThriftTest.Xtruct2();
-    nestTestInput.byte_thing = 0x02;
-    nestTestInput.struct_thing = xtrTestInput;
-    nestTestInput.i32_thing = Math.pow(2,15);
-    
-    client.testNest(nestTestInput, function(result){
-      equal(result.byte_thing, nestTestInput.byte_thing);
-      equal(result.struct_thing.string_thing, nestTestInput.struct_thing.string_thing);
-      equal(result.struct_thing.byte_thing, nestTestInput.struct_thing.byte_thing);
-      equal(result.struct_thing.i32_thing, nestTestInput.struct_thing.i32_thing);
-      equal(result.struct_thing.i64_thing, nestTestInput.struct_thing.i64_thing);
-      equal(result.i32_thing, nestTestInput.i32_thing);  
-      equal(JSON.stringify(result), JSON.stringify(nestTestInput));
-      QUnit.start();      
-    });
-  });
-
-  asyncTest("Map", function() {
-    expect( 3 );
-    var mapTestInput = {7:77, 8:88, 9:99};
-
-    client.testMap(mapTestInput, function(result){
-      for (var key in result) {
-        equal(result[key], mapTestInput[key]);
-      }
-      QUnit.start();  
-    });
-  });
-
-  asyncTest("StringMap", function() {
-    expect( 6 );
-    var mapTestInput = {
-      "a":"123", "a b":"with spaces ", "same":"same", "0":"numeric key",
-      "longValue":stringTest, stringTest:"long key"
-    };
-
-    client.testStringMap(mapTestInput, function(result){
-      for (var key in result) {
-        equal(result[key], mapTestInput[key]);
-      }
-      QUnit.start();
-    });
-  });
-
-  asyncTest("Set", function() {
-    expect( 1 );
-    var setTestInput = [1,2,3];
-    client.testSet(setTestInput, function(result){
-      ok(result, setTestInput);
-      QUnit.start();
-    });
-  });
-
-  asyncTest("List", function() {
-    expect( 1 );
-    var listTestInput = [1,2,3];
-    client.testList(listTestInput, function(result){
-      ok(result, listTestInput);
-      QUnit.start();
-    });
-  });
-
-  asyncTest("Enum", function() {
-    expect( 1 );
-    client.testEnum(ThriftTest.Numberz.ONE, function(result){
-      equal(result, ThriftTest.Numberz.ONE);
-      QUnit.start();
-    });
-  });
-
-  asyncTest("TypeDef", function() {
-    expect( 1 );
-    client.testTypedef(69, function(result){
-      equal(result, 69);
-      QUnit.start();
-    });
-  });
-
-
-module("deeper!");
-
-  asyncTest("MapMap", function() {
-    expect( 16 );
-    var mapMapTestExpectedResult = {
-      "4":{"1":1,"2":2,"3":3,"4":4},
-      "-4":{"-4":-4, "-3":-3, "-2":-2, "-1":-1}
-    };
-
-    client.testMapMap(1, function(result){
-      for (var key in result) {
-        for (var key2 in result[key]) {
-          equal(result[key][key2], mapMapTestExpectedResult[key][key2]);
-        }
-      }
-      checkRecursively(result, mapMapTestExpectedResult);
-      QUnit.start();
-    });
-  });
-
-
-module("Exception");
-
-  asyncTest("Xception", function() {
-    expect(2);
-    client.testException("Xception", function(e){
-      equal(e.errorCode, 1001);
-      equal(e.message, "Xception");
-      QUnit.start();
-    });
-  });
-
-  asyncTest("no Exception", 0, function() {
-    expect( 1 );
-    client.testException("no Exception", function(e){
-      ok(!e);
-      QUnit.start();
-    });
-  });
-
-module("Insanity");
-
-  asyncTest("testInsanity", function() {
-    expect( 24 );
-    var insanity = {
-      "1":{
-        "2":{
-          "userMap":{ "5":5, "8":8 },
-          "xtructs":[{
-              "string_thing":"Goodbye4",
-              "byte_thing":4,
-              "i32_thing":4,
-              "i64_thing":4
-            },
-            {
-              "string_thing":"Hello2",
-              "byte_thing":2,
-              "i32_thing":2,
-              "i64_thing":2
-            }
-          ]
-        },
-        "3":{
-          "userMap":{ "5":5, "8":8 },
-          "xtructs":[{
-              "string_thing":"Goodbye4",
-              "byte_thing":4,
-              "i32_thing":4,
-              "i64_thing":4
-            },
-            {
-              "string_thing":"Hello2",
-              "byte_thing":2,
-              "i32_thing":2,
-              "i64_thing":2
-            }
-          ]
-        }
-      },
-      "2":{ "6":{ "userMap":null, "xtructs":null } }
-    };
-    client.testInsanity(new ThriftTest.Insanity(), function(res){
-      ok(res, JSON.stringify(res));
-      ok(insanity, JSON.stringify(insanity));
-      checkRecursively(res, insanity);
-      QUnit.start();
-    });
-  });
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/test-deep-constructor.html b/vendor/git.apache.org/thrift.git/lib/js/test/test-deep-constructor.html
deleted file mode 100755
index 5835dc8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/test-deep-constructor.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Thrift Javascript Bindings: Unit Test</title>
-
-  <script src="build/js/thrift.js"         type="text/javascript" charset="utf-8"></script>
-  <script src="gen-js/JsDeepConstructorTest_types.js" type="text/javascript" charset="utf-8"></script>
-  <!-- jQuery -->
-  <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js" charset="utf-8"></script>
-
-  <!-- QUnit Test framework-->
-  <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.14.0.js" charset="utf-8"></script>
-  <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.14.0.css" type="text/css" media="screen" />
-
-  <!-- the Test Suite-->
-  <script type="text/javascript" src="deep-constructor.test.js" charset="utf-8"></script>
-</head>
-<body>
-  <h1 id="qunit-header">Thrift Javascript Bindings: Deep Constructor Test (<a href="https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob;f=test/JsDeepConstructorTest.thrift;hb=HEAD">JsDeepConstructorTest.thrift</a>)</h1>
-  <h2 id="qunit-banner"></h2>
-  <div id="qunit-testrunner-toolbar"></div>
-  <h2 id="qunit-userAgent"></h2>
-  <ol id="qunit-tests"><li><!-- get valid xhtml strict--></li></ol>
-  <p>
-      <a href="http://validator.w3.org/check/referer"><img
-          src="http://www.w3.org/Icons/valid-xhtml10"
-          alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-  </p>
-</body>
-</html>
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/test-jq.js b/vendor/git.apache.org/thrift.git/lib/js/test/test-jq.js
deleted file mode 100644
index 23ed60f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/test-jq.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- /* jshint -W100 */
-
-/*
- * JavaScript test suite for ThriftTest.thrift. These tests
- * will run only with jQuery (-gen js:jquery) Apache Thrift
- * interfaces. To create client code:
- *      $ thrift -gen js:jquery ThriftTest.thrift
- *
- * See also:
- * ++ test.js for generic tests
- * ++ test-nojq.js for "-gen js" only tests
- */
-
-
-//////////////////////////////////
-//jQuery asynchronous tests
-jQuery.ajaxSetup({ timeout: 0 });
-$(document).ajaxError( function() { QUnit.start(); } );
-
-module("jQ Async Manual");
-
-  test("testI32", function() {
-    expect( 2 );
-    QUnit.stop();
-
-    var transport = new Thrift.Transport();
-    var protocol  = new Thrift.Protocol(transport);
-    var client    = new ThriftTest.ThriftTestClient(protocol);
-
-    var jqxhr = jQuery.ajax({
-      url: "/service",
-      data: client.send_testI32(Math.pow(-2,31)),
-      type: "POST",
-      cache: false,
-      dataType: "text",
-      success: function(res){
-        transport.setRecvBuffer( res );
-        equal(client.recv_testI32(), Math.pow(-2,31));
-      },
-      error: function() { ok(false); },
-      complete: function() {
-        ok(true);
-        QUnit.start();
-      }
-    });
-  });
-
-  test("testI64", function() {
-    expect( 2 );
-    QUnit.stop();
-
-    var transport = new Thrift.Transport();
-    var protocol  = new Thrift.Protocol(transport);
-    var client    = new ThriftTest.ThriftTestClient(protocol);
-
-    jQuery.ajax({
-      url: "/service",
-      //This is usually 2^61 but JS cannot represent anything over 2^52 accurately
-      data: client.send_testI64(Math.pow(-2,52)),
-      type: "POST",
-      cache: false,
-      dataType: "text",
-      success: function(res){
-        transport.setRecvBuffer( res );
-        //This is usually 2^61 but JS cannot represent anything over 2^52 accurately
-        equal(client.recv_testI64(), Math.pow(-2,52));
-      },
-      error: function() { ok(false); },
-      complete: function() {
-        ok(true);
-        QUnit.start();
-      }
-    });
-  });
-
-
-module("jQ Async");
-  test("I32", function() {
-    expect( 3 );
-
-    QUnit.stop();
-    client.testI32(Math.pow(2,30), function(result) {
-      equal(result, Math.pow(2,30));
-      QUnit.start();
-    });
-
-    QUnit.stop();
-    var jqxhr = client.testI32(Math.pow(-2,31), function(result) {
-      equal(result, Math.pow(-2,31));
-    });
-
-    jqxhr.success(function(result) {
-      equal(result, Math.pow(-2,31));
-      QUnit.start();
-    });
-  });
-
-  test("I64", function() {
-    expect( 4 );
-
-    QUnit.stop();
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    client.testI64(Math.pow(2,52), function(result) {
-      equal(result, Math.pow(2,52));
-      QUnit.start();
-    });
-
-    QUnit.stop();
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    client.testI64(Math.pow(-2,52), function(result) {
-      equal(result, Math.pow(-2,52));
-    })
-    .error( function(xhr, status, e) {  ok(false, e.message); } )
-    .success(function(result) {
-      //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-      equal(result, Math.pow(-2,52));
-    })
-    .complete(function() {
-      ok(true);
-      QUnit.start();
-    });
-  });
-
-  test("Xception", function() {
-    expect( 2 );
-
-    QUnit.stop();
-
-    var dfd = client.testException("Xception", function(result) {
-      ok(false);
-      QUnit.start();
-    })
-    .error(function(xhr, status, e){
-      equal(e.errorCode, 1001);
-      equal(e.message, "Xception");
-      //QUnit.start();
-      //Note start is not required here because:
-      //$(document).ajaxError( function() { QUnit.start(); } );
-    });
-  });
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/test-nojq.html b/vendor/git.apache.org/thrift.git/lib/js/test/test-nojq.html
deleted file mode 100644
index 541bffe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/test-nojq.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Thrift Javascript Bindings: Unit Test</title>
-
-  <script src="build/js/thrift.js"         type="text/javascript" charset="utf-8"></script>
-  <script src="gen-js/ThriftTest_types.js" type="text/javascript" charset="utf-8"></script>
-  <script src="gen-js/ThriftTest.js"       type="text/javascript" charset="utf-8"></script>
-
-  <!-- QUnit Test framework-->
-  <script type="text/javascript" src="build/js/lib/qunit.js" charset="utf-8"></script>
-  <link rel="stylesheet" href="build/js/lib/qunit.css" type="text/css" media="screen" />
-  
-  <!-- the Test Suite-->
-  <script type="text/javascript" src="test.js" charset="utf-8"></script>
-  <script type="text/javascript" src="test-nojq.js" charset="utf-8"></script>
-</head>
-<body>
-  <h1 id="qunit-header">Thrift Javascript Bindings: Unit Test (<a href="https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob;f=test/ThriftTest.thrift;hb=HEAD">ThriftTest.thrift</a>)</h1>
-  <h2 id="qunit-banner"></h2>
-  <div id="qunit-testrunner-toolbar"></div> 
-  <h2 id="qunit-userAgent"></h2>
-  <ol id="qunit-tests"><li><!-- get valid xhtml strict--></li></ol>
-  <!-- Uncomment this to check the validity. This significantly slows down the test.
-  <p>
-      <a href="http://validator.w3.org/check/referer"><img
-          src="http://www.w3.org/Icons/valid-xhtml10"
-          alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-  </p>
-  -->
-</body>
-</html>
-
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/test-nojq.js b/vendor/git.apache.org/thrift.git/lib/js/test/test-nojq.js
deleted file mode 100644
index 19f9e61..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/test-nojq.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- /* jshint -W100 */
- 
-/*
- * JavaScript test suite for ThriftTest.thrift. These tests
- * will run only with normal "-gen js" Apache Thrift interfaces.
- * To create client code:
- *      $ thrift -gen js ThriftTest.thrift
- *
- * See also:
- * ++ test.js for generic tests  
- * ++ test-jq.js for "-gen js:jquery" only tests
- */
-
-
-//////////////////////////////////
-//Async exception tests
-
-module("NojQ Async");
-
-  test("Xception", function() {
-    expect( 2 );
-
-    QUnit.stop();
-
-    client.testException("Xception", function(result) {
-      equal(result.errorCode, 1001);
-      equal(result.message, "Xception");
-      QUnit.start();
-    });
-  });
-
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/test.html b/vendor/git.apache.org/thrift.git/lib/js/test/test.html
deleted file mode 100755
index edec3a3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/test.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Thrift Javascript Bindings: Unit Test</title>
-
-  <script src="build/js/thrift.js"         type="text/javascript" charset="utf-8"></script>
-  <script src="gen-js/ThriftTest_types.js" type="text/javascript" charset="utf-8"></script>
-  <script src="gen-js/ThriftTest.js"       type="text/javascript" charset="utf-8"></script>
-
-  <!-- jQuery -->
-  <script type="text/javascript" src="build/js/lib/jquery.js" charset="utf-8"></script>
-
-  <!-- QUnit Test framework-->
-  <script type="text/javascript" src="build/js/lib/qunit.js" charset="utf-8"></script>
-  <link rel="stylesheet" href="build/js/lib/qunit.css" type="text/css" media="screen" />
-
-  <!-- the Test Suite-->
-  <script>
-    var transport = new Thrift.Transport("/service");
-    var protocol  = new Thrift.Protocol(transport);
-    var client    = new ThriftTest.ThriftTestClient(protocol);
-  </script>
-  <script type="text/javascript" src="test.js" charset="utf-8"></script>
-  <script type="text/javascript" src="test-jq.js" charset="utf-8"></script>
-</head>
-<body>
-  <h1 id="qunit-header">Thrift Javascript Bindings: Unit Test (<a href="https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob;f=test/ThriftTest.thrift;hb=HEAD">ThriftTest.thrift</a>)</h1>
-  <h2 id="qunit-banner"></h2>
-  <div id="qunit-testrunner-toolbar"></div>
-  <h2 id="qunit-userAgent"></h2>
-  <ol id="qunit-tests"><li><!-- get valid xhtml strict--></li></ol>
-  <!-- Uncomment this to check the validity. This significantly slows down the test.
-  <p>
-      <a href="http://validator.w3.org/check/referer"><img
-          src="http://www.w3.org/Icons/valid-xhtml10"
-          alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-  </p>
-  -->
-</body>
-</html>
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/test.js b/vendor/git.apache.org/thrift.git/lib/js/test/test.js
deleted file mode 100755
index 2d8ec9b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/test.js
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- /* jshint -W100 */
-
-/*
- * JavaScript test suite for ThriftTest.thrift. These tests
- * will run against Normal (-gen js) and jQuery (-gen js:jquery)
- * Apache Thrift interfaces.
- *
- * Synchronous blocking calls should be identical in both 
- * Normal and jQuery interfaces. All synchronous tests belong
- * here.
- *
- * Asynchronous success callbacks passed as the last parameter
- * of an RPC call should be identical in both Normal and jQuery
- * interfaces. Async success tests belong here.
- *
- * Asynchronous exception processing is different in Normal
- * and jQuery interfaces. Such tests belong in the test-nojq.js
- * or test-jq.js files respectively. jQuery specific XHR object
- * tests also belong in test-jq.js. Do not create any jQuery
- * dependencies in this file or in test-nojq.js
- *
- * To compile client code for this test use:
- *      $ thrift -gen js ThriftTest.thrift
- *      -- or --
- *      $ thrift -gen js:jquery ThriftTest.thrift
- *
- * See also:
- * ++ test-nojq.js for "-gen js" only tests
- * ++ test-jq.js for "-gen js:jquery" only tests
- */
-
-var transport = new Thrift.Transport("/service");
-var protocol  = new Thrift.Protocol(transport);
-var client    = new ThriftTest.ThriftTestClient(protocol);
-
-// Work around for old API used by QUnitAdapter of jsTestDriver
-if (typeof QUnit.log == 'function') {
-  // When using real QUnit (fron PhantomJS) log failures to console
-  QUnit.log(function(details) {
-    if (!details.result) {
-      console.log('======== FAIL ========');
-      console.log('TestName: ' + details.name);
-      if (details.message) console.log(details.message);
-      console.log('Expected: ' + details.expected);
-      console.log('Actual  : ' + details.actual);
-      console.log('======================');
-    }
-  });
-}
-
-// all Languages in UTF-8
-var stringTest = "Afrikaans, Alemannisch, Aragonés, العربية, مصرى, Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška, Беларуская, Беларуская (тарашкевіца), Български, Bamanankan, বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн, Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg, Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English, Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt, Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego, Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski, Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia, Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa, ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар, Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino, Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, Bahasa Melayu, مازِرونی, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad, Occitan, Иронау, Papiamentu, Deitsch, Norfuk / Pitkern, Polski, پنجابی, پښتو, Português, Runa Simi, Rumantsch, Romani, Română, Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk, Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog, Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük, Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文, Bân-lâm-gú, 粵語";
-
-function checkRecursively(map1, map2) {
-  if (typeof map1 !== 'function' && typeof map2 !== 'function') {
-    if (!map1 || typeof map1 !== 'object') {
-        equal(map1, map2);
-    } else {
-      for (var key in map1) {
-        checkRecursively(map1[key], map2[key]);
-      }
-    }
-  }
-}
-
-module("Base Types");
-
-  test("Void", function() {
-    equal(client.testVoid(), undefined);
-  });
-  test("Binary (String)", function() {
-    var binary = '';
-    for (var v = 255; v >= 0; --v) {
-      binary += String.fromCharCode(v);
-    }
-    equal(client.testBinary(binary), binary);
-  });
-  test("Binary (Uint8Array)", function() {
-    var binary = '';
-    for (var v = 255; v >= 0; --v) {
-      binary += String.fromCharCode(v);
-    }
-    var arr = new Uint8Array(binary.length);
-    for (var i = 0; i < binary.length; ++i) {
-      arr[i] = binary[i].charCodeAt();
-    }
-    equal(client.testBinary(arr), binary);
-  });
-  test("String", function() {
-    equal(client.testString(''), '');
-    equal(client.testString(stringTest), stringTest);
-
-    var specialCharacters = 'quote: \" backslash:' +
-          ' forwardslash-escaped: \/ ' +
-          ' backspace: \b formfeed: \f newline: \n return: \r tab: ' +
-          ' now-all-of-them-together: "\\\/\b\n\r\t' +
-          ' now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><';
-    equal(client.testString(specialCharacters),specialCharacters);
-  });
-  test("Double", function() {
-    equal(client.testDouble(0), 0);
-    equal(client.testDouble(-1), -1);
-    equal(client.testDouble(3.14), 3.14);
-    equal(client.testDouble(Math.pow(2,60)), Math.pow(2,60));
-  });
-  test("Byte", function() {
-    equal(client.testByte(0), 0);
-    equal(client.testByte(0x01), 0x01);
-  });
-  test("I32", function() {
-    equal(client.testI32(0), 0);
-    equal(client.testI32(Math.pow(2,30)), Math.pow(2,30));
-    equal(client.testI32(-Math.pow(2,30)), -Math.pow(2,30));
-  });
-  test("I64", function() {
-    equal(client.testI64(0), 0);
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    equal(client.testI64(Math.pow(2,52)), Math.pow(2,52));
-    equal(client.testI64(-Math.pow(2,52)), -Math.pow(2,52));
-  });
-
-
-module("Structured Types");
-
-  test("Struct", function() {
-    var structTestInput = new ThriftTest.Xtruct();
-    structTestInput.string_thing = 'worked';
-    structTestInput.byte_thing = 0x01;
-    structTestInput.i32_thing = Math.pow(2,30);
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    structTestInput.i64_thing = Math.pow(2,52);
-
-    var structTestOutput = client.testStruct(structTestInput);
-
-    equal(structTestOutput.string_thing, structTestInput.string_thing);
-    equal(structTestOutput.byte_thing, structTestInput.byte_thing);
-    equal(structTestOutput.i32_thing, structTestInput.i32_thing);
-    equal(structTestOutput.i64_thing, structTestInput.i64_thing);
-
-    equal(JSON.stringify(structTestOutput), JSON.stringify(structTestInput));
-  });
-
-  test("Nest", function() {
-    var xtrTestInput = new ThriftTest.Xtruct();
-    xtrTestInput.string_thing = 'worked';
-    xtrTestInput.byte_thing = 0x01;
-    xtrTestInput.i32_thing = Math.pow(2,30);
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    xtrTestInput.i64_thing = Math.pow(2,52);
-
-    var nestTestInput = new ThriftTest.Xtruct2();
-    nestTestInput.byte_thing = 0x02;
-    nestTestInput.struct_thing = xtrTestInput;
-    nestTestInput.i32_thing = Math.pow(2,15);
-
-    var nestTestOutput = client.testNest(nestTestInput);
-
-    equal(nestTestOutput.byte_thing, nestTestInput.byte_thing);
-    equal(nestTestOutput.struct_thing.string_thing, nestTestInput.struct_thing.string_thing);
-    equal(nestTestOutput.struct_thing.byte_thing, nestTestInput.struct_thing.byte_thing);
-    equal(nestTestOutput.struct_thing.i32_thing, nestTestInput.struct_thing.i32_thing);
-    equal(nestTestOutput.struct_thing.i64_thing, nestTestInput.struct_thing.i64_thing);
-    equal(nestTestOutput.i32_thing, nestTestInput.i32_thing);
-
-    equal(JSON.stringify(nestTestOutput), JSON.stringify(nestTestInput));
-  });
-
-  test("Map", function() {
-    var mapTestInput = {7:77, 8:88, 9:99};
-
-    var mapTestOutput = client.testMap(mapTestInput);
-
-    for (var key in mapTestOutput) {
-      equal(mapTestOutput[key], mapTestInput[key]);
-    }
-  });
-
-  test("StringMap", function() {
-    var mapTestInput = {
-      "a":"123", "a b":"with spaces ", "same":"same", "0":"numeric key",
-      "longValue":stringTest, stringTest:"long key"
-    };
-
-    var mapTestOutput = client.testStringMap(mapTestInput);
-
-    for (var key in mapTestOutput) {
-      equal(mapTestOutput[key], mapTestInput[key]);
-    }
-  });
-
-  test("Set", function() {
-    var setTestInput = [1,2,3];
-    ok(client.testSet(setTestInput), setTestInput);
-  });
-
-  test("List", function() {
-    var listTestInput = [1,2,3];
-    ok(client.testList(listTestInput), listTestInput);
-  });
-
-  test("Enum", function() {
-    equal(client.testEnum(ThriftTest.Numberz.ONE), ThriftTest.Numberz.ONE);
-  });
-
-  test("TypeDef", function() {
-    equal(client.testTypedef(69), 69);
-  });
-
-  test("Skip", function() {
-    var structTestInput = new ThriftTest.Xtruct();
-    var modifiedClient = new ThriftTest.ThriftTestClient(protocol);
-
-    modifiedClient.recv_testStruct = function() {
-      var input  = modifiedClient.input;
-      var xtruct3 = new ThriftTest.Xtruct3();
-
-      input.readMessageBegin();
-      input.readStructBegin();
-
-      // read Xtruct data with Xtruct3
-      input.readFieldBegin();
-      xtruct3.read(input);
-      input.readFieldEnd();
-      // read Thrift.Type.STOP message
-      input.readFieldBegin();
-      input.readFieldEnd();
-
-      input.readStructEnd();
-      input.readMessageEnd();
-
-      return xtruct3;
-    };
-
-    structTestInput.string_thing = 'worked';
-    structTestInput.byte_thing   = 0x01;
-    structTestInput.i32_thing    = Math.pow(2,30);
-    structTestInput.i64_thing    = Math.pow(2,52);
-
-    var structTestOutput = modifiedClient.testStruct(structTestInput);
-
-    equal(structTestOutput instanceof ThriftTest.Xtruct3, true);
-    equal(structTestOutput.string_thing, structTestInput.string_thing);
-    equal(structTestOutput.changed, null);
-    equal(structTestOutput.i32_thing, structTestInput.i32_thing);
-    equal(structTestOutput.i64_thing, structTestInput.i64_thing);
-  });
-
-
-module("deeper!");
-
-  test("MapMap", function() {
-    var mapMapTestExpectedResult = {
-      "4":{"1":1,"2":2,"3":3,"4":4},
-      "-4":{"-4":-4, "-3":-3, "-2":-2, "-1":-1}
-    };
-
-    var mapMapTestOutput = client.testMapMap(1);
-
-
-    for (var key in mapMapTestOutput) {
-      for (var key2 in mapMapTestOutput[key]) {
-        equal(mapMapTestOutput[key][key2], mapMapTestExpectedResult[key][key2]);
-      }
-    }
-
-    checkRecursively(mapMapTestOutput, mapMapTestExpectedResult);
-  });
-
-
-module("Exception");
-
-  test("Xception", function() {
-    expect(2);
-    try{
-      client.testException("Xception");
-    }catch(e){
-      equal(e.errorCode, 1001);
-      equal(e.message, "Xception");
-    }
-  });
-
-  test("no Exception", 0, function() {
-    try{
-      client.testException("no Exception");
-    }catch(e){
-      ok(false);
-    }
-  });
-
-  test("TException", function() {
-    //ThriftTest does not list TException as a legal exception so it will
-    // generate an exception on the server that does not propagate back to
-    // the client. This test has been modified to equate to "no exception"
-    expect(1);
-    try{
-      client.testException("TException");
-    } catch(e) {
-      //ok(false);
-    }
-    ok(true);
-  });
-
-
-module("Insanity");
-
-  var crazy = {
-    "userMap":{ "5":5, "8":8 },
-    "xtructs":[{
-      "string_thing":"Goodbye4",
-      "byte_thing":4,
-      "i32_thing":4,
-      "i64_thing":4
-    },
-    {
-      "string_thing":"Hello2",
-      "byte_thing":2,
-      "i32_thing":2,
-      "i64_thing":2
-    }]
-  };
-  test("testInsanity", function() {
-    var insanity = {
-      "1":{
-        "2":crazy,
-        "3":crazy
-      },
-      "2":{ "6":{ "userMap":null, "xtructs":null } }
-    };
-    var res = client.testInsanity(new ThriftTest.Insanity(crazy));
-    ok(res, JSON.stringify(res));
-    ok(insanity, JSON.stringify(insanity));
-
-    checkRecursively(res, insanity);
-  });
-
-
-//////////////////////////////////
-//Run same tests asynchronously
-
-module("Async");
-
-  test("Double", function() {
-    expect( 1 );
-
-    QUnit.stop();
-    client.testDouble(3.14159265, function(result) {
-      equal(result, 3.14159265);
-      QUnit.start();
-    });
-  });
-
-  test("Byte", function() {
-    expect( 1 );
-
-    QUnit.stop();
-    client.testByte(0x01, function(result) {
-      equal(result, 0x01);
-      QUnit.start();
-    });
-  });
-
-  test("I32", function() {
-    expect( 2 );
-
-    QUnit.stop();
-    client.testI32(Math.pow(2,30), function(result) {
-      equal(result, Math.pow(2,30));
-      QUnit.start();
-    });
-
-    QUnit.stop();
-    client.testI32(Math.pow(-2,31), function(result) {
-      equal(result, Math.pow(-2,31));
-      QUnit.start();
-    });
-  });
-
-  test("I64", function() {
-    expect( 2 );
-
-    QUnit.stop();
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    client.testI64(Math.pow(2,52), function(result) {
-      equal(result, Math.pow(2,52));
-      QUnit.start();
-    });
-
-    QUnit.stop();
-    //This is usually 2^60 but JS cannot represent anything over 2^52 accurately
-    client.testI64(Math.pow(-2,52), function(result) {
-      equal(result, Math.pow(-2,52));
-      QUnit.start();
-    });
-  });
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/test_handler.js b/vendor/git.apache.org/thrift.git/lib/js/test/test_handler.js
deleted file mode 100644
index e1fa74f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/test_handler.js
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * 'License'); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//This is the server side Node test handler for the standard 
-//  Apache Thrift test service.
-
-var ttypes = require('./gen-nodejs/ThriftTest_types');
-var TException = require('../../nodejs/lib/thrift').TException;
-
-var ThriftTestHandler = exports.ThriftTestHandler = {
-  testVoid: function(result) {
-    console.log('testVoid()');
-    result(null);
-  },
-  testString: function(thing, result) {
-    console.log('testString(\'' + thing + '\')');
-    result(null, thing);
-  },
-  testByte: function(thing, result) {
-    console.log('testByte(' + thing + ')');
-    result(null, thing);
-  },
-  testI32: function(thing, result) {
-    console.log('testI32(' + thing + ')');
-    result(null, thing);
-  },
-  testI64: function(thing, result) {
-    console.log('testI64(' + thing + ')');
-    result(null, thing);
-  },
-  testDouble: function(thing, result) {
-    console.log('testDouble(' + thing + ')');
-    result(null, thing);
-  },
-  testBinary: function(thing, result) {
-    console.log('testBinary(\'' + thing + '\')');
-    result(null, thing);
-  },
-  testStruct: function(thing, result) {
-    console.log('testStruct(');
-    console.log(thing);
-    console.log(')');
-    result(null, thing);
-  },
-  testNest: function(nest, result) {
-    console.log('testNest(');
-    console.log(nest);
-    console.log(')');
-    result(null, nest);
-  },
-  testMap: function(thing, result) {
-    console.log('testMap(');
-    console.log(thing);
-    console.log(')');
-    result(null, thing);
-  },
-  testStringMap: function(thing, result) {
-    console.log('testStringMap(');
-    console.log(thing);
-    console.log(')');
-    result(null, thing);
-  },
-  testSet: function(thing, result) {
-    console.log('testSet(');
-    console.log(thing);
-    console.log(')');
-    result(null, thing);
-  },
-  testList: function(thing, result) {
-    console.log('testList(');
-    console.log(thing);
-    console.log(')');
-    result(null, thing);
-  },
-  testEnum: function(thing, result) {
-    console.log('testEnum(' + thing + ')');
-    result(null, thing);
-  },
-  testTypedef: function(thing, result) {
-    console.log('testTypedef(' + thing + ')');
-    result(null, thing);
-  },
-  testMapMap: function(hello, result) {
-    console.log('testMapMap(' + hello + ')');
-
-    var mapmap = [];
-    var pos = [];
-    var neg = [];
-    for (var i = 1; i < 5; i++) {
-      pos[i] = i;
-      neg[-i] = -i;
-    }
-    mapmap[4] = pos;
-    mapmap[-4] = neg;
-
-    result(null, mapmap);
-  },
-  testInsanity: function(argument, result) {
-    console.log('testInsanity(');
-    console.log(argument);
-    console.log(')');
-
-    var hello = new ttypes.Xtruct();
-    hello.string_thing = 'Hello2';
-    hello.byte_thing = 2;
-    hello.i32_thing = 2;
-    hello.i64_thing = 2;
-
-    var goodbye = new ttypes.Xtruct();
-    goodbye.string_thing = 'Goodbye4';
-    goodbye.byte_thing = 4;
-    goodbye.i32_thing = 4;
-    goodbye.i64_thing = 4;
-
-    var crazy = new ttypes.Insanity();
-    crazy.userMap = [];
-    crazy.userMap[ttypes.Numberz.EIGHT] = 8;
-    crazy.userMap[ttypes.Numberz.FIVE] = 5;
-    crazy.xtructs = [goodbye, hello];
-
-    var first_map = [];
-    var second_map = [];
-
-    first_map[ttypes.Numberz.TWO] = crazy;
-    first_map[ttypes.Numberz.THREE] = crazy;
-
-    var looney = new ttypes.Insanity();
-    second_map[ttypes.Numberz.SIX] = looney;
-
-    var insane = [];
-    insane[1] = first_map;
-    insane[2] = second_map;
-
-    console.log('insane result:');
-    console.log(insane);
-    result(null, insane);
-  },
-  testMulti: function(arg0, arg1, arg2, arg3, arg4, arg5, result) {
-    console.log('testMulti()');
-
-    var hello = new ttypes.Xtruct();
-    hello.string_thing = 'Hello2';
-    hello.byte_thing = arg0;
-    hello.i32_thing = arg1;
-    hello.i64_thing = arg2;
-    result(null, hello);
-  },
-  testException: function(arg, result) {
-    console.log('testException('+arg+')');
-    if (arg === 'Xception') {
-      var x = new ttypes.Xception();
-      x.errorCode = 1001;
-      x.message = arg;
-      result(x);
-    } else if (arg === 'TException') {
-      result(new TException(arg));
-    } else {
-      result(null);
-    }
-  },
-  testMultiException: function(arg0, arg1, result) {
-    console.log('testMultiException(' + arg0 + ', ' + arg1 + ')');
-    if (arg0 === ('Xception')) {
-      var x = new ttypes.Xception();
-      x.errorCode = 1001;
-      x.message = 'This is an Xception';
-      result(x);
-    } else if (arg0 === ('Xception2')) {
-      var x2 = new ttypes.Xception2();
-      x2.errorCode = 2002;
-      x2.struct_thing = new ttypes.Xtruct();
-      x2.struct_thing.string_thing = 'This is an Xception2';
-      result(x2);
-    }
-
-    var res = new ttypes.Xtruct();
-    res.string_thing = arg1;
-    result(null, res);
-  },
-  testOneway: function(sleepFor, result) {
-    console.log('testOneway(' + sleepFor + ') => JavaScript (like Rust) never sleeps!');
-  }
-};   //ThriftTestSvcHandler
diff --git a/vendor/git.apache.org/thrift.git/lib/js/test/testws.html b/vendor/git.apache.org/thrift.git/lib/js/test/testws.html
deleted file mode 100644
index f99a146..0000000
--- a/vendor/git.apache.org/thrift.git/lib/js/test/testws.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Thrift Javascript Bindings: Unit Test</title>
-
-  <script src="build/js/thrift.js"         type="text/javascript" charset="utf-8"></script>
-  <script src="gen-js/ThriftTest_types.js" type="text/javascript" charset="utf-8"></script>
-  <script src="gen-js/ThriftTest.js"       type="text/javascript" charset="utf-8"></script>
-
-  <!-- jQuery -->
-  <script type="text/javascript" src="build/js/lib/jquery.js" charset="utf-8"></script>
-
-  <!-- QUnit Test framework-->
-  <script type="text/javascript" src="build/js/lib/qunit.js" charset="utf-8"></script>
-  <link rel="stylesheet" href="build/js/lib/qunit.css" type="text/css" media="screen" />
-
-  <!-- the Test Suite-->
-  <script>
-    var loc = window.location;
-    var ws_uri = ((loc.protocol === "https:") ? "wss://" : "ws://") +
-                   loc.hostname + ":" + loc.port + loc.pathname;
-    var transport = new Thrift.TWebSocketTransport(ws_uri);
-    var protocol  = new Thrift.Protocol(transport);
-    var client    = new ThriftTest.ThriftTestClient(protocol);
-    transport.open();
-  </script>
-  <script type="text/javascript" src="test-async.js" charset="utf-8"></script>
-</head>
-<body>
-  <h1 id="qunit-header">Thrift Javascript Bindings: Unit Test (<a href="https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob;f=test/ThriftTest.thrift;hb=HEAD">ThriftTest.thrift</a>)</h1>
-  <h2 id="qunit-banner"></h2>
-  <div id="qunit-testrunner-toolbar"></div>
-  <h2 id="qunit-userAgent"></h2>
-  <ol id="qunit-tests"><li><!-- get valid xhtml strict--></li></ol>
-  <!-- Uncomment this to check the validity. This significantly slows down the test.
-  <p>
-      <a href="http://validator.w3.org/check/referer"><img
-          src="http://www.w3.org/Icons/valid-xhtml10"
-          alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-  </p>
-  -->
-</body>
-</html>
diff --git a/vendor/git.apache.org/thrift.git/lib/json/Makefile.am b/vendor/git.apache.org/thrift.git/lib/json/Makefile.am
deleted file mode 100644
index 1051b9b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/json/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SUBDIRS =
-
-if WITH_JAVA
-# Schema validation test depends on java
-SUBDIRS += test
-endif
-
-EXTRA_DIST = \
-    schema.json \
-    test
diff --git a/vendor/git.apache.org/thrift.git/lib/json/schema.json b/vendor/git.apache.org/thrift.git/lib/json/schema.json
deleted file mode 100644
index 011b4d3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/json/schema.json
+++ /dev/null
@@ -1,330 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-
-  "id": "http://thrift.apache.org/schema.json#",
-  "description": "Schema for Apache Thrift protocol descriptors",
-
-  "definitions": {
-    "type-id": {
-      "title": "Any type id (name)",
-      "enum": [
-        "void",
-        "string",
-        "bool",
-        "byte",
-        "i8",
-        "i16",
-        "i32",
-        "i64",
-        "double",
-        "list",
-        "set",
-        "map",
-        "union",
-        "struct",
-        "binary"
-      ]
-    },
-    "base-type": {
-      "title": "Base type schema",
-      "type": "object",
-      "properties": {
-        "typeId": {
-          "enum": ["void", "string", "bool", "byte", "i8", "i16", "i32", "i64", "double", "binary" ]
-        }
-      },
-      "required": [ "typeId" ]
-    },
-    "list-type": {
-      "title": "List and set schema",
-      "type": "object",
-      "properties": {
-        "typeId": {
-          "enum": [ "list", "set" ]
-        },
-        "elemTypeId":  { "$ref": "#/definitions/type-id" },
-        "elemType":    { "$ref": "#/definitions/type-desc" }
-      },
-      "required": [ "typeId", "elemTypeId" ]
-    },
-    "map-type": {
-      "title": "Map schema",
-      "type": "object",
-      "properties": {
-        "typeId": {
-          "enum": [ "map" ]
-        },
-        "keyTypeId":   { "$ref": "#/definitions/type-id" },
-        "keyType":     { "$ref": "#/definitions/type-desc" },
-        "valueTypeId": { "$ref": "#/definitions/type-id" },
-        "valueType":   { "$ref": "#/definitions/type-desc" }
-      },
-      "required": [ "typeId", "keyTypeId", "valueTypeId" ]
-    },
-    "struct-type": {
-      "title": "Struct, union and exception schema",
-      "type": "object",
-      "properties": {
-        "typeId": {
-          "enum": [ "union", "struct", "exception" ]
-        }
-      },
-      "required": [ "typeId", "class" ]
-    },
-    "type-desc": {
-      "title": "Type descriptor schema",
-      "allOf": [
-        {
-            "type": "object",
-            "properties": {
-                "typeId":      { "type": "string" },
-                "class":       { "type": "string" }
-            }
-        },
-        {
-          "oneOf":
-          [
-            { "$ref": "#/definitions/base-type" },
-            { "$ref": "#/definitions/list-type" },
-            { "$ref": "#/definitions/map-type" },
-            { "$ref": "#/definitions/struct-type" }
-          ]
-        }
-      ]
-    },
-    "name-and-doc": {
-      "title": "Name and documentation sub-schema",
-      "type": "object",
-      "properties": {
-        "name": { "type": "string" },
-        "doc": { "type": "string" }
-      },
-      "required": [ "name" ]
-    },
-    "enum": {
-      "title": "Thrift 'enum' definition schema",
-      "type": "object",
-      "allOf": [
-        { "$ref": "#/definitions/name-and-doc" },
-        {
-          "required": [ "members" ],
-          "properties": {
-            "members": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "name": { "type": "string" },
-                  "value": { "type": "integer" }
-                },
-                "required": [ "name", "value" ]
-              }
-            }
-          }
-        }
-      ]
-    },
-    "typedef": {
-      "title": "Thrift typedef definition schema",
-      "type": "object",
-      "allOf": [
-        { "$ref": "#/definitions/name-and-doc" },
-        {
-          "properties": {
-            "typeId": { "$ref": "#/definitions/type-id" },
-            "type": { "$ref": "#/definitions/type-desc" }
-          },
-          "required": [ "typeId" ]
-        }
-      ]
-    },
-    "constant": {
-      "title": "Thrift constant definition schema",
-      "type": "object",
-      "allOf": [
-        { "$ref": "#/definitions/name-and-doc" },
-        { "$ref": "#/definitions/type-desc" },
-        {
-          "properties": {
-            "value": {
-              "oneOf": [
-                { "type": "string" },
-                { "type": "number" },
-                { "type": "array" },
-                { "type": "object" }
-              ]
-            }
-          },
-          "required": [ "value" ]
-        }
-      ]
-    },
-    "field": {
-      "title": "Thrift struct field definition schema",
-      "type": "object",
-      "allOf": [
-        { "$ref": "#/definitions/name-and-doc" },
-        {
-          "properties": {
-            "key": {
-              "type": "integer",
-              "minimum": 1,
-              "maximum": 65535
-            },
-            "required": {
-              "enum": [ "required", "optional", "req_out" ]
-            },
-            "typeId": { "$ref": "#/definitions/type-id" },
-            "type": { "$ref": "#/definitions/type-desc" },
-            "default": {
-              "oneOf": [
-                { "type": "string" },
-                { "type": "number" },
-                { "type": "array" },
-                { "type": "object" }
-              ]
-            }
-          },
-          "required": [ "key", "required" ]
-        }
-      ]
-    },
-    "struct": {
-      "title": "Thrift struct definition schema",
-      "type": "object",
-      "allOf": [
-        { "$ref": "#/definitions/name-and-doc" },
-        {
-          "properties": {
-            "isException": { "type": "boolean" },
-            "isUnion": { "type": "boolean" },
-            "fields": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/field"
-              }
-            }
-          },
-          "required": [ "isException", "isUnion", "fields" ]
-        }
-      ]
-    },
-    "union": {
-      "title": "Thrift union definition schema",
-      "$ref": "#/definitions/struct"
-    },
-    "exception": {
-      "title": "Thrift exception definition schema",
-      "type": "object",
-      "properties": {
-        "key": {
-          "type": "integer",
-          "minimum": 1,
-          "maximum": 65535
-        },
-        "name": { "type": "string" },
-        "typeId": { "enum": [ "exception" ] },
-        "type": { "$ref": "#/definitions/struct-type" }
-      },
-      "required": [ "key", "name", "typeId" ]
-    },
-    "function": {
-      "title": "Thrift service function definition schema",
-      "type": "object",
-      "allOf": [
-        { "$ref": "#/definitions/name-and-doc" },
-        {
-          "properties": {
-            "oneway": {
-              "type": "boolean"
-            },
-            "returnType": {
-              "$ref": "#/definitions/type-desc"
-            },
-            "arguments": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/field"
-              }
-            },
-            "exceptions": {
-              "type": "array",
-              "items": { "$ref": "#/definitions/exception" }
-            }
-          },
-          "required": [ "oneway", "arguments", "exceptions" ]
-        }
-      ]
-    },
-    "service": {
-      "title": "Thrift service definition schema",
-      "type": "object",
-      "allOf": [
-        { "$ref": "#/definitions/name-and-doc" },
-        {
-          "properties": {
-            "functions": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/function"
-              }
-            }
-          },
-          "required": [ "functions" ]
-        }
-      ]
-    }
-  },
-
-  "type": "object",
-  "required": [
-    "name",
-    "enums",
-    "typedefs",
-    "structs",
-    "constants",
-    "services"
-  ],
-  "properties": {
-    "name": {
-      "type": "string"
-    },
-    "includes": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "uniqueItems": true
-    },
-    "enums": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/enum"
-      }
-    },
-    "typedefs": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/typedef"
-      }
-    },
-    "structs": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/struct"
-      }
-    },
-    "constants": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/constant"
-      }
-    },
-    "services": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/service"
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/json/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/json/test/Makefile.am
deleted file mode 100644
index bb87a52..0000000
--- a/vendor/git.apache.org/thrift.git/lib/json/test/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-check:
-	$(ANT) $(ANT_FLAGS) test
-
-# Make sure this doesn't fail if ant is not configured.
-clean-local:
-	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT $(ANT_FLAGS) clean
diff --git a/vendor/git.apache.org/thrift.git/lib/json/test/build.properties b/vendor/git.apache.org/thrift.git/lib/json/test/build.properties
deleted file mode 100644
index 075f640..0000000
--- a/vendor/git.apache.org/thrift.git/lib/json/test/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Jar versions
-mvn.ant.task.version=2.1.3
-
-# Dependency versions
-json-schema-validator.version=2.2.6
-
-# Maven dependency download locations
-mvn.repo=http://repo1.maven.org/maven2
-mvn.ant.task.url=${mvn.repo}/org/apache/maven/maven-ant-tasks/${mvn.ant.task.version}
-mvn.ant.task.jar=maven-ant-tasks-${mvn.ant.task.version}.jar
diff --git a/vendor/git.apache.org/thrift.git/lib/json/test/build.xml b/vendor/git.apache.org/thrift.git/lib/json/test/build.xml
deleted file mode 100644
index 956a238..0000000
--- a/vendor/git.apache.org/thrift.git/lib/json/test/build.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project name="JSON Schema Test" default="test" basedir="."
-  xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
-  <description>JSON Schema Validation Test</description>
-
-  <property name="build.dir" location="${basedir}/build" />
-  <property name="json.dir" location="${basedir}/.." />
-  <property name="gen.json.dir" location="${build.dir}/gen-json" />
-  <property name="json.schema" location="${json.dir}/schema.json" />
-  <property name="build.tools.dir" location="${build.dir}/tools"/>
-  <property name="build.lib.dir" location="${build.dir}/lib"/>
-
-  <!-- the root directory, where you unpack thrift distibution (e.g. thrift-0.x.x.tar.gz) -->
-  <property name="thrift.dir" location="../../../" />
-  <property name="thrift.test.dir" location="${thrift.dir}/test" />
-  <property name="thrift.compiler" location="${thrift.dir}/compiler/cpp/thrift" />
-
-  <!-- Get maven dependency versions from here -->
-  <property file="${basedir}/build.properties" />
-
-  <path id="test.classpath">
-    <fileset dir="${build.lib.dir}">
-      <include name="*.jar" />
-    </fileset>
-  </path>
-
-  <target name="compiler.check">
-    <fail>
-      <condition>
-        <not>
-          <resourcecount count="1">
-            <fileset id="fs" file="${thrift.compiler}"/>
-          </resourcecount>
-        </not>
-      </condition>
-      Thrift compiler is missing !
-    </fail>
-  </target>
-
-  <target name="init" depends="compiler.check, mkdirs, mvn.init">
-    <tstamp />
-  </target>
-
-  <target name="mkdirs">
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${build.lib.dir}"/>
-    <mkdir dir="${build.tools.dir}"/>
-    <mkdir dir="${gen.json.dir}"/>
-  </target>
-
-  <target name="generate" depends="init">
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen json"/>
-      <arg line="-out ${gen.json.dir}"/>
-      <arg line="${thrift.test.dir}/ThriftTest.thrift"/>
-    </exec>
-    <exec executable="${thrift.compiler}" failonerror="true">
-      <arg line="--gen json:merge"/>
-      <arg line="-out ${gen.json.dir}"/>
-      <arg line="${thrift.test.dir}/Include.thrift"/>
-    </exec>
-  </target>
-
-  <target name="test" description="run schema validation"
-          depends="validate-schema, validate-generated-json"/>
-
-  <target name="validate-schema" depends="init">
-    <java classname="com.github.fge.jsonschema.main.cli.Main"
-          classpathref="test.classpath" failonerror="true">
-      <arg value="--syntax"/>
-      <arg value="${json.schema}"/>
-    </java>
-  </target>
-
-  <target name="validate-generated-json" depends="init, generate">
-    <validate-json file="${gen.json.dir}/ThriftTest.json"/>
-    <validate-json file="${gen.json.dir}/Include.json"/>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build.dir}" />
-    <delete dir="${gen.json.dir}" />
-  </target>
-
-  <target name="mvn.ant.tasks.download" depends="mkdirs,mvn.ant.tasks.check" unless="mvn.ant.tasks.found">
-    <get src="${mvn.ant.task.url}/${mvn.ant.task.jar}" dest="${build.tools.dir}/${mvn.ant.task.jar}" usetimestamp="true"/>
-  </target>
-
-  <target name="mvn.ant.tasks.check">
-    <condition property="mvn.ant.tasks.found">
-      <typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/>
-    </condition>
-  </target>
-
-  <target name="mvn.init" depends="mvn.ant.tasks.download" unless="mvn.finished">
-    <typedef uri="antlib:org.apache.maven.artifact.ant" classpath="${build.tools.dir}/${mvn.ant.task.jar}"/>
-
-    <artifact:dependencies filesetId="test.dependency.jars">
-      <dependency groupId="com.github.fge" artifactId="json-schema-validator" version="${json-schema-validator.version}"/>
-    </artifact:dependencies>
-
-    <!-- Copy the dependencies to the build/lib dir -->
-    <copy todir="${build.lib.dir}">
-      <fileset refid="test.dependency.jars"/>
-      <mapper type="flatten"/>
-    </copy>
-
-    <property name="mvn.finished" value="true"/>
-  </target>
-
-  <macrodef name="validate-json">
-    <attribute name="file" default=""/>
-    <sequential>
-      <java failonerror="true"
-            fork="true"
-            dir="${json.dir}"
-            classname="com.github.fge.jsonschema.main.cli.Main"
-            classpathref="test.classpath">
-        <arg line="--fakeroot http://thrift.apache.org/"/>
-        <arg value="${json.schema}"/>
-        <arg value="@{file}"/>
-      </java>
-    </sequential>
-  </macrodef>
-
-</project>
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/Makefile.am b/vendor/git.apache.org/thrift.git/lib/lua/Makefile.am
deleted file mode 100644
index 3dfc27c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-SUBDIRS = .
-
-lib_LTLIBRARIES = \
-			libluasocket.la \
-			libluabpack.la \
-			libluabitwise.la \
-			liblualongnumber.la
-
-libluasocket_la_SOURCES = \
-			src/luasocket.c \
-			src/usocket.c
-
-nobase_include_HEADERS = src/socket.h
-
-libluasocket_la_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDE) -DLUA_COMPAT_MODULE
-libluasocket_la_LDFLAGS = $(AM_LDFLAGS)
-libluasocket_la_LIBADD = $(LUA_LIB) -lm
-
-libluabpack_la_SOURCES = src/luabpack.c
-
-libluabpack_la_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDE) -DLUA_COMPAT_MODULE
-libluabpack_la_LDFLAGS = $(AM_LDFLAGS)
-libluabpack_la_LIBADD = liblualongnumber.la $(LUA_LIB) -lm
-
-libluabitwise_la_SOURCES = src/luabitwise.c
-
-libluabitwise_la_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDE) -DLUA_COMPAT_MODULE
-libluabitwise_la_LDFLAGS = $(AM_LDFLAGS)
-libluabitwise_la_LIBADD = $(LUA_LIB) -lm
-
-liblualongnumber_la_SOURCES = \
-		src/lualongnumber.c \
-		src/longnumberutils.c
-
-liblualongnumber_la_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDE) -DLUA_COMPAT_MODULE
-liblualongnumber_la_LDFLAGS = $(AM_LDFLAGS)
-liblualongnumber_la_LIBADD = $(LUA_LIB) -lm
-
-EXTRA_DIST = \
-		coding_standards.md \
-		TBinaryProtocol.lua \
-		TBufferedTransport.lua \
-		TCompactProtocol.lua \
-		TFramedTransport.lua \
-		Thrift.lua \
-		THttpTransport.lua \
-		TJsonProtocol.lua \
-		TMemoryBuffer.lua \
-		TProtocol.lua \
-		TServer.lua \
-		TSocket.lua \
-		TTransport.lua
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TBinaryProtocol.lua b/vendor/git.apache.org/thrift.git/lib/lua/TBinaryProtocol.lua
deleted file mode 100644
index 4b8e98a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TBinaryProtocol.lua
+++ /dev/null
@@ -1,264 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'TProtocol'
-require 'libluabpack'
-require 'libluabitwise'
-
-TBinaryProtocol = __TObject.new(TProtocolBase, {
-  __type = 'TBinaryProtocol',
-  VERSION_MASK = -65536, -- 0xffff0000
-  VERSION_1    = -2147418112, -- 0x80010000
-  TYPE_MASK    = 0x000000ff,
-  strictRead   = false,
-  strictWrite  = true
-})
-
-function TBinaryProtocol:writeMessageBegin(name, ttype, seqid)
-  if self.strictWrite then
-    self:writeI32(libluabitwise.bor(TBinaryProtocol.VERSION_1, ttype))
-    self:writeString(name)
-    self:writeI32(seqid)
-  else
-    self:writeString(name)
-    self:writeByte(ttype)
-    self:writeI32(seqid)
-  end
-end
-
-function TBinaryProtocol:writeMessageEnd()
-end
-
-function TBinaryProtocol:writeStructBegin(name)
-end
-
-function TBinaryProtocol:writeStructEnd()
-end
-
-function TBinaryProtocol:writeFieldBegin(name, ttype, id)
-  self:writeByte(ttype)
-  self:writeI16(id)
-end
-
-function TBinaryProtocol:writeFieldEnd()
-end
-
-function TBinaryProtocol:writeFieldStop()
-  self:writeByte(TType.STOP);
-end
-
-function TBinaryProtocol:writeMapBegin(ktype, vtype, size)
-  self:writeByte(ktype)
-  self:writeByte(vtype)
-  self:writeI32(size)
-end
-
-function TBinaryProtocol:writeMapEnd()
-end
-
-function TBinaryProtocol:writeListBegin(etype, size)
-  self:writeByte(etype)
-  self:writeI32(size)
-end
-
-function TBinaryProtocol:writeListEnd()
-end
-
-function TBinaryProtocol:writeSetBegin(etype, size)
-  self:writeByte(etype)
-  self:writeI32(size)
-end
-
-function TBinaryProtocol:writeSetEnd()
-end
-
-function TBinaryProtocol:writeBool(bool)
-  if bool then
-    self:writeByte(1)
-  else
-    self:writeByte(0)
-  end
-end
-
-function TBinaryProtocol:writeByte(byte)
-  local buff = libluabpack.bpack('c', byte)
-  self.trans:write(buff)
-end
-
-function TBinaryProtocol:writeI16(i16)
-  local buff = libluabpack.bpack('s', i16)
-  self.trans:write(buff)
-end
-
-function TBinaryProtocol:writeI32(i32)
-  local buff = libluabpack.bpack('i', i32)
-  self.trans:write(buff)
-end
-
-function TBinaryProtocol:writeI64(i64)
-  local buff = libluabpack.bpack('l', i64)
-  self.trans:write(buff)
-end
-
-function TBinaryProtocol:writeDouble(dub)
-  local buff = libluabpack.bpack('d', dub)
-  self.trans:write(buff)
-end
-
-function TBinaryProtocol:writeString(str)
-  -- Should be utf-8
-  self:writeI32(string.len(str))
-  self.trans:write(str)
-end
-
-function TBinaryProtocol:readMessageBegin()
-  local sz, ttype, name, seqid = self:readI32()
-  if sz < 0 then
-    local version = libluabitwise.band(sz, TBinaryProtocol.VERSION_MASK)
-    if version ~= TBinaryProtocol.VERSION_1 then
-      terror(TProtocolException:new{
-        message = 'Bad version in readMessageBegin: ' .. sz
-      })
-    end
-    ttype = libluabitwise.band(sz, TBinaryProtocol.TYPE_MASK)
-    name = self:readString()
-    seqid = self:readI32()
-  else
-    if self.strictRead then
-      terror(TProtocolException:new{message = 'No protocol version header'})
-    end
-    name = self.trans:readAll(sz)
-    ttype = self:readByte()
-    seqid = self:readI32()
-  end
-  return name, ttype, seqid
-end
-
-function TBinaryProtocol:readMessageEnd()
-end
-
-function TBinaryProtocol:readStructBegin()
-  return nil
-end
-
-function TBinaryProtocol:readStructEnd()
-end
-
-function TBinaryProtocol:readFieldBegin()
-  local ttype = self:readByte()
-  if ttype == TType.STOP then
-    return nil, ttype, 0
-  end
-  local id = self:readI16()
-  return nil, ttype, id
-end
-
-function TBinaryProtocol:readFieldEnd()
-end
-
-function TBinaryProtocol:readMapBegin()
-  local ktype = self:readByte()
-  local vtype = self:readByte()
-  local size = self:readI32()
-  return ktype, vtype, size
-end
-
-function TBinaryProtocol:readMapEnd()
-end
-
-function TBinaryProtocol:readListBegin()
-  local etype = self:readByte()
-  local size = self:readI32()
-  return etype, size
-end
-
-function TBinaryProtocol:readListEnd()
-end
-
-function TBinaryProtocol:readSetBegin()
-  local etype = self:readByte()
-  local size = self:readI32()
-  return etype, size
-end
-
-function TBinaryProtocol:readSetEnd()
-end
-
-function TBinaryProtocol:readBool()
-  local byte = self:readByte()
-  if byte == 0 then
-    return false
-  end
-  return true
-end
-
-function TBinaryProtocol:readByte()
-  local buff = self.trans:readAll(1)
-  local val = libluabpack.bunpack('c', buff)
-  return val
-end
-
-function TBinaryProtocol:readI16()
-  local buff = self.trans:readAll(2)
-  local val = libluabpack.bunpack('s', buff)
-  return val
-end
-
-function TBinaryProtocol:readI32()
-  local buff = self.trans:readAll(4)
-  local val = libluabpack.bunpack('i', buff)
-  return val
-end
-
-function TBinaryProtocol:readI64()
-  local buff = self.trans:readAll(8)
-  local val = libluabpack.bunpack('l', buff)
-  return val
-end
-
-function TBinaryProtocol:readDouble()
-  local buff = self.trans:readAll(8)
-  local val = libluabpack.bunpack('d', buff)
-  return val
-end
-
-function TBinaryProtocol:readString()
-  local len = self:readI32()
-  local str = self.trans:readAll(len)
-  return str
-end
-
-TBinaryProtocolFactory = TProtocolFactory:new{
-  __type = 'TBinaryProtocolFactory',
-  strictRead = false
-}
-
-function TBinaryProtocolFactory:getProtocol(trans)
-  -- TODO Enforce that this must be a transport class (ie not a bool)
-  if not trans then
-    terror(TProtocolException:new{
-      message = 'Must supply a transport to ' .. ttype(self)
-    })
-  end
-  return TBinaryProtocol:new{
-    trans = trans,
-    strictRead = self.strictRead,
-    strictWrite = true
-  }
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TBufferedTransport.lua b/vendor/git.apache.org/thrift.git/lib/lua/TBufferedTransport.lua
deleted file mode 100644
index 45ef4b1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TBufferedTransport.lua
+++ /dev/null
@@ -1,91 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'TTransport'
-
-TBufferedTransport = TTransportBase:new{
-  __type = 'TBufferedTransport',
-  rBufSize = 2048,
-  wBufSize = 2048,
-  wBuf = '',
-  rBuf = ''
-}
-
-function TBufferedTransport:new(obj)
-  if ttype(obj) ~= 'table' then
-    error(ttype(self) .. 'must be initialized with a table')
-  end
-
-  -- Ensure a transport is provided
-  if not obj.trans then
-    error('You must provide ' .. ttype(self) .. ' with a trans')
-  end
-
-  return TTransportBase.new(self, obj)
-end
-
-function TBufferedTransport:isOpen()
-  return self.trans:isOpen()
-end
-
-function TBufferedTransport:open()
-  return self.trans:open()
-end
-
-function TBufferedTransport:close()
-  return self.trans:close()
-end
-
-function TBufferedTransport:read(len)
-  return self.trans:read(len)
-end
-
-function TBufferedTransport:readAll(len)
-  return self.trans:readAll(len)
-end
-
-function TBufferedTransport:write(buf)
-  self.wBuf = self.wBuf .. buf
-  if string.len(self.wBuf) >= self.wBufSize then
-    self.trans:write(self.wBuf)
-    self.wBuf = ''
-  end
-end
-
-function TBufferedTransport:flush()
-  if string.len(self.wBuf) > 0 then
-    self.trans:write(self.wBuf)
-    self.wBuf = ''
-  end
-end
-
-TBufferedTransportFactory = TTransportFactoryBase:new{
-  __type = 'TBufferedTransportFactory'
-}
-
-function TBufferedTransportFactory:getTransport(trans)
-  if not trans then
-    terror(TTransportException:new{
-      message = 'Must supply a transport to ' .. ttype(self)
-    })
-  end
-  return TBufferedTransport:new{
-    trans = trans
-  }
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TCompactProtocol.lua b/vendor/git.apache.org/thrift.git/lib/lua/TCompactProtocol.lua
deleted file mode 100644
index 877595a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TCompactProtocol.lua
+++ /dev/null
@@ -1,457 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'TProtocol'
-require 'libluabpack'
-require 'libluabitwise'
-require 'liblualongnumber'
-
-TCompactProtocol = __TObject.new(TProtocolBase, {
-  __type = 'TCompactProtocol',
-  COMPACT_PROTOCOL_ID       = 0x82,
-  COMPACT_VERSION           = 1,
-  COMPACT_VERSION_MASK      = 0x1f,
-  COMPACT_TYPE_MASK         = 0xE0,
-  COMPACT_TYPE_BITS         = 0x07,
-  COMPACT_TYPE_SHIFT_AMOUNT = 5,
-
-  -- Used to keep track of the last field for the current and previous structs,
-  -- so we can do the delta stuff.
-  lastField = {},
-  lastFieldId = 0,
-  lastFieldIndex = 1,
-
-  -- If we encounter a boolean field begin, save the TField here so it can
-  -- have the value incorporated.
-  booleanFieldName    = "",
-  booleanFieldId      = 0,
-  booleanFieldPending = false,
-
-  -- If we read a field header, and it's a boolean field, save the boolean
-  -- value here so that readBool can use it.
-  boolValue          = false,
-  boolValueIsNotNull = false,
-})
-
-TCompactType = {
-  COMPACT_BOOLEAN_TRUE  = 0x01,
-  COMPACT_BOOLEAN_FALSE = 0x02,
-  COMPACT_BYTE          = 0x03,
-  COMPACT_I16           = 0x04,
-  COMPACT_I32           = 0x05,
-  COMPACT_I64           = 0x06,
-  COMPACT_DOUBLE        = 0x07,
-  COMPACT_BINARY        = 0x08,
-  COMPACT_LIST          = 0x09,
-  COMPACT_SET           = 0x0A,
-  COMPACT_MAP           = 0x0B,
-  COMPACT_STRUCT        = 0x0C
-}
-
-TTypeToCompactType = {}
-TTypeToCompactType[TType.STOP]   = TType.STOP
-TTypeToCompactType[TType.BOOL]   = TCompactType.COMPACT_BOOLEAN_TRUE
-TTypeToCompactType[TType.BYTE]   = TCompactType.COMPACT_BYTE
-TTypeToCompactType[TType.I16]    = TCompactType.COMPACT_I16
-TTypeToCompactType[TType.I32]    = TCompactType.COMPACT_I32
-TTypeToCompactType[TType.I64]    = TCompactType.COMPACT_I64
-TTypeToCompactType[TType.DOUBLE] = TCompactType.COMPACT_DOUBLE
-TTypeToCompactType[TType.STRING] = TCompactType.COMPACT_BINARY
-TTypeToCompactType[TType.LIST]   = TCompactType.COMPACT_LIST
-TTypeToCompactType[TType.SET]    = TCompactType.COMPACT_SET
-TTypeToCompactType[TType.MAP]    = TCompactType.COMPACT_MAP
-TTypeToCompactType[TType.STRUCT] = TCompactType.COMPACT_STRUCT
-
-CompactTypeToTType = {}
-CompactTypeToTType[TType.STOP]                        = TType.STOP
-CompactTypeToTType[TCompactType.COMPACT_BOOLEAN_TRUE] = TType.BOOL
-CompactTypeToTType[TCompactType.COMPACT_BOOLEAN_FALSE] = TType.BOOL
-CompactTypeToTType[TCompactType.COMPACT_BYTE]         = TType.BYTE
-CompactTypeToTType[TCompactType.COMPACT_I16]          = TType.I16
-CompactTypeToTType[TCompactType.COMPACT_I32]          = TType.I32
-CompactTypeToTType[TCompactType.COMPACT_I64]          = TType.I64
-CompactTypeToTType[TCompactType.COMPACT_DOUBLE]       = TType.DOUBLE
-CompactTypeToTType[TCompactType.COMPACT_BINARY]       = TType.STRING
-CompactTypeToTType[TCompactType.COMPACT_LIST]         = TType.LIST
-CompactTypeToTType[TCompactType.COMPACT_SET]          = TType.SET
-CompactTypeToTType[TCompactType.COMPACT_MAP]          = TType.MAP
-CompactTypeToTType[TCompactType.COMPACT_STRUCT]       = TType.STRUCT
-
-function TCompactProtocol:resetLastField()
-  self.lastField = {}
-  self.lastFieldId = 0
-  self.lastFieldIndex = 1
-end
-
-function TCompactProtocol:packCompactType(ktype, vtype)
-  return libluabitwise.bor(libluabitwise.shiftl(ktype, 4), vtype)
-end
-
-function TCompactProtocol:writeMessageBegin(name, ttype, seqid)
-  self:writeByte(TCompactProtocol.COMPACT_PROTOCOL_ID)
-  self:writeByte(libluabpack.packMesgType(TCompactProtocol.COMPACT_VERSION,
-    TCompactProtocol.COMPACT_VERSION_MASK,ttype,
-    TCompactProtocol.COMPACT_TYPE_SHIFT_AMOUNT,
-    TCompactProtocol.COMPACT_TYPE_MASK))
-  self:writeVarint32(seqid)
-  self:writeString(name)
-  self:resetLastField()
-end
-
-function TCompactProtocol:writeMessageEnd()
-end
-
-function TCompactProtocol:writeStructBegin(name)
-  self.lastFieldIndex = self.lastFieldIndex + 1
-  self.lastField[self.lastFieldIndex] = self.lastFieldId
-  self.lastFieldId = 0
-end
-
-function TCompactProtocol:writeStructEnd()
-  self.lastFieldIndex = self.lastFieldIndex - 1
-  self.lastFieldId = self.lastField[self.lastFieldIndex]
-end
-
-function TCompactProtocol:writeFieldBegin(name, ttype, id)
-  if ttype == TType.BOOL then
-    self.booleanFieldName = name
-    self.booleanFieldId   = id
-    self.booleanFieldPending = true
-  else
-    self:writeFieldBeginInternal(name, ttype, id, -1)
-  end
-end
-
-function TCompactProtocol:writeFieldEnd()
-end
-
-function TCompactProtocol:writeFieldStop()
-  self:writeByte(TType.STOP);
-end
-
-function TCompactProtocol:writeMapBegin(ktype, vtype, size)
-  if size == 0 then
-    self:writeByte(0)
-  else
-    self:writeVarint32(size)
-    self:writeByte(self:packCompactType(TTypeToCompactType[ktype], TTypeToCompactType[vtype]))
-  end
-end
-
-function TCompactProtocol:writeMapEnd()
-end
-
-function TCompactProtocol:writeListBegin(etype, size)
-  self:writeCollectionBegin(etype, size)
-end
-
-function TCompactProtocol:writeListEnd()
-end
-
-function TCompactProtocol:writeSetBegin(etype, size)
-  self:writeCollectionBegin(etype, size)
-end
-
-function TCompactProtocol:writeSetEnd()
-end
-
-function TCompactProtocol:writeBool(bool)
-  local value = TCompactType.COMPACT_BOOLEAN_FALSE
-  if bool then
-    value = TCompactType.COMPACT_BOOLEAN_TRUE
-  end
-  print(value,self.booleanFieldPending,self.booleanFieldId)
-  if self.booleanFieldPending then
-    self:writeFieldBeginInternal(self.booleanFieldName, TType.BOOL, self.booleanFieldId, value)
-    self.booleanFieldPending = false
-  else
-    self:writeByte(value)
-  end
-end
-
-function TCompactProtocol:writeByte(byte)
-  local buff = libluabpack.bpack('c', byte)
-  self.trans:write(buff)
-end
-
-function TCompactProtocol:writeI16(i16)
-  self:writeVarint32(libluabpack.i32ToZigzag(i16))
-end
-
-function TCompactProtocol:writeI32(i32)
-  self:writeVarint32(libluabpack.i32ToZigzag(i32))
-end
-
-function TCompactProtocol:writeI64(i64)
-  self:writeVarint64(libluabpack.i64ToZigzag(i64))
-end
-
-function TCompactProtocol:writeDouble(dub)
-  local buff = libluabpack.bpack('d', dub)
-  self.trans:write(buff)
-end
-
-function TCompactProtocol:writeString(str)
-  -- Should be utf-8
-  self:writeBinary(str)
-end
-
-function TCompactProtocol:writeBinary(str)
-  -- Should be utf-8
-  self:writeVarint32(string.len(str))
-  self.trans:write(str)
-end
-
-function TCompactProtocol:writeFieldBeginInternal(name, ttype, id, typeOverride)
-  if typeOverride == -1 then
-    typeOverride = TTypeToCompactType[ttype]
-  end
-  local offset = id - self.lastFieldId
-  if id > self.lastFieldId and offset <= 15 then
-    self:writeByte(libluabitwise.bor(libluabitwise.shiftl(offset, 4), typeOverride))
-  else
-    self:writeByte(typeOverride)
-    self:writeI16(id)
-  end
-  self.lastFieldId = id
-end
-
-function TCompactProtocol:writeCollectionBegin(etype, size)
-  if size <= 14 then
-    self:writeByte(libluabitwise.bor(libluabitwise.shiftl(size, 4), TTypeToCompactType[etype]))
-  else
-    self:writeByte(libluabitwise.bor(0xf0, TTypeToCompactType[etype]))
-    self:writeVarint32(size)
-  end
-end
-
-function TCompactProtocol:writeVarint32(i32)
-  -- Should be utf-8
-  local str = libluabpack.toVarint32(i32)
-  self.trans:write(str)
-end
-
-function TCompactProtocol:writeVarint64(i64)
-  -- Should be utf-8
-  local str = libluabpack.toVarint64(i64)
-  self.trans:write(str)
-end
-
-function TCompactProtocol:readMessageBegin()
-  local protocolId = self:readSignByte()
-  if protocolId ~= self.COMPACT_PROTOCOL_ID then
-    terror(TProtocolException:new{
-      message = "Expected protocol id " .. self.COMPACT_PROTOCOL_ID .. " but got " .. protocolId})
-  end
-  local versionAndType = self:readSignByte()
-  local version = libluabitwise.band(versionAndType, self.COMPACT_VERSION_MASK)
-  local ttype = libluabitwise.band(libluabitwise.shiftr(versionAndType,
-    self.COMPACT_TYPE_SHIFT_AMOUNT), self.COMPACT_TYPE_BITS)
-  if version ~= self.COMPACT_VERSION then
-    terror(TProtocolException:new{
-      message = "Expected version " .. self.COMPACT_VERSION .. " but got " .. version})
-  end
-  local seqid = self:readVarint32()
-  local name = self:readString()
-  return name, ttype, seqid
-end
-
-function TCompactProtocol:readMessageEnd()
-end
-
-function TCompactProtocol:readStructBegin()
-  self.lastField[self.lastFieldIndex] = self.lastFieldId
-  self.lastFieldIndex = self.lastFieldIndex + 1
-  self.lastFieldId = 0
-  return nil
-end
-
-function TCompactProtocol:readStructEnd()
-  self.lastFieldIndex = self.lastFieldIndex - 1
-  self.lastFieldId = self.lastField[self.lastFieldIndex]
-end
-
-function TCompactProtocol:readFieldBegin()
-  local field_and_ttype = self:readSignByte()
-  local ttype = self:getTType(field_and_ttype)
-  if ttype == TType.STOP then
-    return nil, ttype, 0
-  end
-  -- mask off the 4 MSB of the type header. it could contain a field id delta.
-  local modifier = libluabitwise.shiftr(libluabitwise.band(field_and_ttype, 0xf0), 4)
-  local id = 0
-  if modifier == 0 then
-    id = self:readI16()
-  else
-    id = self.lastFieldId + modifier
-  end
-  if ttype == TType.BOOL then
-    boolValue = libluabitwise.band(field_and_ttype, 0x0f) == TCompactType.COMPACT_BOOLEAN_TRUE
-    boolValueIsNotNull = true
-  end
-  self.lastFieldId = id
-  return nil, ttype, id
-end
-
-function TCompactProtocol:readFieldEnd()
-end
-
-function TCompactProtocol:readMapBegin()
-  local size = self:readVarint32()
-  if size < 0 then
-    return nil,nil,nil
-  end
-  local kvtype = self:readSignByte()
-  local ktype = self:getTType(libluabitwise.shiftr(kvtype, 4))
-  local vtype = self:getTType(kvtype)
-  return ktype, vtype, size
-end
-
-function TCompactProtocol:readMapEnd()
-end
-
-function TCompactProtocol:readListBegin()
-  local size_and_type = self:readSignByte()
-  local size = libluabitwise.band(libluabitwise.shiftr(size_and_type, 4), 0x0f)
-  if size == 15 then
-    size = self:readVarint32()
-  end
-  if size < 0 then
-    return nil,nil
-  end
-  local etype = self:getTType(libluabitwise.band(size_and_type, 0x0f))
-  return etype, size
-end
-
-function TCompactProtocol:readListEnd()
-end
-
-function TCompactProtocol:readSetBegin()
-  return self:readListBegin()
-end
-
-function TCompactProtocol:readSetEnd()
-end
-
-function TCompactProtocol:readBool()
-  if boolValueIsNotNull then
-    boolValueIsNotNull = true
-    return boolValue
-  end
-  local val = self:readSignByte()
-  if val == TCompactType.COMPACT_BOOLEAN_TRUE then
-    return true
-  end
-  return false
-end
-
-function TCompactProtocol:readByte()
-  local buff = self.trans:readAll(1)
-  local val = libluabpack.bunpack('c', buff)
-  return val
-end
-
-function TCompactProtocol:readSignByte()
-  local buff = self.trans:readAll(1)
-  local val = libluabpack.bunpack('C', buff)
-  return val
-end
-
-function TCompactProtocol:readI16()
-  return self:readI32()
-end
-
-function TCompactProtocol:readI32()
-  local v = self:readVarint32()
-  local value = libluabpack.zigzagToI32(v)
-  return value
-end
-
-function TCompactProtocol:readI64()
-  local value = self:readVarint64()
-  return value
-end
-
-function TCompactProtocol:readDouble()
-  local buff = self.trans:readAll(8)
-  local val = libluabpack.bunpack('d', buff)
-  return val
-end
-
-function TCompactProtocol:readString()
-  return self:readBinary()
-end
-
-function TCompactProtocol:readBinary()
-  local size = self:readVarint32()
-  if size <= 0 then
-    return ""
-  end
-  return self.trans:readAll(size)
-end
-
-function TCompactProtocol:readVarint32()
-  local shiftl = 0
-  local result = 0
-  while true do
-    b = self:readByte()
-    result = libluabitwise.bor(result,
-             libluabitwise.shiftl(libluabitwise.band(b, 0x7f), shiftl))
-    if libluabitwise.band(b, 0x80) ~= 0x80 then
-      break
-    end
-    shiftl = shiftl + 7
-  end
-  return result
-end
-
-function TCompactProtocol:readVarint64()
-  local result = liblualongnumber.new
-  local data = result(0)
-  local shiftl = 0
-  while true do
-    b = self:readByte()
-    endFlag, data = libluabpack.fromVarint64(b, shiftl, data)
-    shiftl = shiftl + 7
-    if endFlag == 0 then
-      break
-    end
-  end
-  return data
-end
-
-function TCompactProtocol:getTType(ctype)
-  return CompactTypeToTType[libluabitwise.band(ctype, 0x0f)]
-end
-
-TCompactProtocolFactory = TProtocolFactory:new{
-  __type = 'TCompactProtocolFactory',
-}
-
-function TCompactProtocolFactory:getProtocol(trans)
-  -- TODO Enforce that this must be a transport class (ie not a bool)
-  if not trans then
-    terror(TProtocolException:new{
-      message = 'Must supply a transport to ' .. ttype(self)
-    })
-  end
-  return TCompactProtocol:new{
-    trans = trans
-  }
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TFramedTransport.lua b/vendor/git.apache.org/thrift.git/lib/lua/TFramedTransport.lua
deleted file mode 100644
index 437b701..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TFramedTransport.lua
+++ /dev/null
@@ -1,118 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'TTransport'
-require 'libluabpack'
-
-TFramedTransport = TTransportBase:new{
-  __type = 'TFramedTransport',
-  doRead = true,
-  doWrite = true,
-  wBuf = '',
-  rBuf = ''
-}
-
-function TFramedTransport:new(obj)
-  if ttype(obj) ~= 'table' then
-    error(ttype(self) .. 'must be initialized with a table')
-  end
-
-  -- Ensure a transport is provided
-  if not obj.trans then
-    error('You must provide ' .. ttype(self) .. ' with a trans')
-  end
-
-  return TTransportBase.new(self, obj)
-end
-
-function TFramedTransport:isOpen()
-  return self.trans:isOpen()
-end
-
-function TFramedTransport:open()
-  return self.trans:open()
-end
-
-function TFramedTransport:close()
-  return self.trans:close()
-end
-
-function TFramedTransport:read(len)
-  if string.len(self.rBuf) == 0 then
-    self:__readFrame()
-  end
-
-  if self.doRead == false then
-    return self.trans:read(len)
-  end
-
-  if len > string.len(self.rBuf) then
-    local val = self.rBuf
-    self.rBuf = ''
-    return val
-  end
-
-  local val = string.sub(self.rBuf, 0, len)
-  self.rBuf = string.sub(self.rBuf, len+1)
-  return val
-end
-
-function TFramedTransport:__readFrame()
-  local buf = self.trans:readAll(4)
-  local frame_len = libluabpack.bunpack('i', buf)
-  self.rBuf = self.trans:readAll(frame_len)
-end
-
-
-function TFramedTransport:write(buf, len)
-  if self.doWrite == false then
-    return self.trans:write(buf, len)
-  end
-
-  if len and len < string.len(buf) then
-    buf = string.sub(buf, 0, len)
-  end
-  self.wBuf = self.wBuf .. buf
-end
-
-function TFramedTransport:flush()
-  if self.doWrite == false then
-    return self.trans:flush()
-  end
-
-  -- If the write fails we still want wBuf to be clear
-  local tmp = self.wBuf
-  self.wBuf = ''
-  local frame_len_buf = libluabpack.bpack("i", string.len(tmp))
-  self.trans:write(frame_len_buf)
-  self.trans:write(tmp)
-  self.trans:flush()
-end
-
-TFramedTransportFactory = TTransportFactoryBase:new{
-  __type = 'TFramedTransportFactory'
-}
-function TFramedTransportFactory:getTransport(trans)
-  if not trans then
-    terror(TProtocolException:new{
-      message = 'Must supply a transport to ' .. ttype(self)
-    })
-  end
-  return TFramedTransport:new{trans = trans}
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/THttpTransport.lua b/vendor/git.apache.org/thrift.git/lib/lua/THttpTransport.lua
deleted file mode 100644
index 19b7705..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/THttpTransport.lua
+++ /dev/null
@@ -1,182 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'TTransport'
-
-THttpTransport = TTransportBase:new{
-  __type = 'THttpTransport',
-  path = '/',
-  wBuf = '',
-  rBuf = '',
-  CRLF = '\r\n',
-  VERSION = '0.10.0',
-  isServer = true
-}
-
-function THttpTransport:new(obj)
-  if ttype(obj) ~= 'table' then
-    error(ttype(self) .. 'must be initialized with a table')
-  end
-
-  -- Ensure a transport is provided
-  if not obj.trans then
-    error('You must provide ' .. ttype(self) .. ' with a trans')
-  end
-
-  return TTransportBase.new(self, obj)
-end
-
-function THttpTransport:isOpen()
-  return self.trans:isOpen()
-end
-
-function THttpTransport:open()
-  return self.trans:open()
-end
-
-function THttpTransport:close()
-  return self.trans:close()
-end
-
-function THttpTransport:readAll(len)
-  return self:read(len)
-end
-
-function THttpTransport:read(len)
-  if string.len(self.rBuf) == 0 then
-    self:_readMsg()
-  end
-  if len > string.len(self.rBuf) then
-    local val = self.rBuf
-    self.rBuf = ''
-    return val
-  end
-
-  local val = string.sub(self.rBuf, 0, len)
-  self.rBuf = string.sub(self.rBuf, len+1)
-  return val
-end
-
-function THttpTransport:_readMsg()
-  while true do
-    self.rBuf = self.rBuf .. self.trans:read(4)
-    if string.find(self.rBuf, self.CRLF .. self.CRLF) then
-      break
-    end
-  end
-  if not self.rBuf then
-    self.rBuf = ""
-    return
-  end
-  self:getLine()
-  local headers = self:_parseHeaders()
-  if not headers then
-    self.rBuf = ""
-    return
-  end
-
-  local length = tonumber(headers["Content-Length"])
-  if length then
-    length = length - string.len(self.rBuf)
-    self.rBuf = self.rBuf .. self.trans:readAll(length)
-  end
-  if self.rBuf == nil then
-    self.rBuf = ""
-  end
-end
-
-function THttpTransport:getLine()
-  local a,b = string.find(self.rBuf, self.CRLF)
-  local line = ""
-  if a and b then
-    line = string.sub(self.rBuf, 0, a-1)
-    self.rBuf = string.sub(self.rBuf, b+1)
-  end
-  return line
-end
-
-function THttpTransport:_parseHeaders()
-  local headers = {}
-
-  repeat
-    local line = self:getLine()
-    for key, val in string.gmatch(line, "([%w%-]+)%s*:%s*(.+)") do
-      if headers[key] then
-        local delimiter = ", "
-        if key == "Set-Cookie" then
-          delimiter = "; "
-        end
-        headers[key] = headers[key] .. delimiter .. tostring(val)
-      else
-        headers[key] = tostring(val)
-      end
-    end
-  until string.find(line, "^%s*$")
-
-  return headers
-end
-
-function THttpTransport:write(buf, len)
-  if len and len < string.len(buf) then
-    buf = string.sub(buf, 0, len)
-  end
-  self.wBuf = self.wBuf .. buf
-end
-
-function THttpTransport:writeHttpHeader(content_len)
-  if self.isServer then
-    local header =  "HTTP/1.1 200 OK" .. self.CRLF
-      .. "Server: Thrift/" .. self.VERSION .. self.CRLF
-      .. "Access-Control-Allow-Origin: *" .. self.CRLF
-      .. "Content-Type: application/x-thrift" .. self.CRLF
-      .. "Content-Length: " .. content_len .. self.CRLF
-      .. "Connection: Keep-Alive" .. self.CRLF .. self.CRLF
-    self.trans:write(header)
-  else
-    local header = "POST " .. self.path .. " HTTP/1.1" .. self.CRLF
-      .. "Host: " .. self.trans.host .. self.CRLF
-      .. "Content-Type: application/x-thrift" .. self.CRLF
-      .. "Content-Length: " .. content_len .. self.CRLF
-      .. "Accept: application/x-thrift " .. self.CRLF
-      .. "User-Agent: Thrift/" .. self.VERSION .. " (Lua/THttpClient)"
-      .. self.CRLF .. self.CRLF
-    self.trans:write(header)
-  end
-end
-
-function THttpTransport:flush()
-  -- If the write fails we still want wBuf to be clear
-  local tmp = self.wBuf
-  self.wBuf = ''
-  self:writeHttpHeader(string.len(tmp))
-  self.trans:write(tmp)
-  self.trans:flush()
-end
-
-THttpTransportFactory = TTransportFactoryBase:new{
-  __type = 'THttpTransportFactory'
-}
-function THttpTransportFactory:getTransport(trans)
-  if not trans then
-    terror(TProtocolException:new{
-      message = 'Must supply a transport to ' .. ttype(self)
-    })
-  end
-  return THttpTransport:new{trans = trans}
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TJsonProtocol.lua b/vendor/git.apache.org/thrift.git/lib/lua/TJsonProtocol.lua
deleted file mode 100644
index db08eec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TJsonProtocol.lua
+++ /dev/null
@@ -1,727 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"), you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'TProtocol'
-require 'libluabpack'
-require 'libluabitwise'
-
-TJSONProtocol = __TObject.new(TProtocolBase, {
-  __type = 'TJSONProtocol',
-  THRIFT_JSON_PROTOCOL_VERSION = 1,
-  jsonContext = {},
-  jsonContextVal = {first = true, colon = true, ttype = 2, null = true},
-  jsonContextIndex = 1,
-  hasReadByte = ""
-})
-
-TTypeToString = {}
-TTypeToString[TType.BOOL]   = "tf"
-TTypeToString[TType.BYTE]   = "i8"
-TTypeToString[TType.I16]    = "i16"
-TTypeToString[TType.I32]    = "i32"
-TTypeToString[TType.I64]    = "i64"
-TTypeToString[TType.DOUBLE] = "dbl"
-TTypeToString[TType.STRING] = "str"
-TTypeToString[TType.STRUCT] = "rec"
-TTypeToString[TType.LIST]   = "lst"
-TTypeToString[TType.SET]    = "set"
-TTypeToString[TType.MAP]    = "map"
-
-StringToTType = {
-  tf  = TType.BOOL,
-  i8  = TType.BYTE,
-  i16 = TType.I16,
-  i32 = TType.I32,
-  i64 = TType.I64,
-  dbl = TType.DOUBLE,
-  str = TType.STRING,
-  rec = TType.STRUCT,
-  map = TType.MAP,
-  set = TType.SET,
-  lst = TType.LIST
-}
-
-JSONNode = {
-  ObjectBegin = '{',
-  ObjectEnd = '}',
-  ArrayBegin = '[',
-  ArrayEnd = ']',
-  PairSeparator = ':',
-  ElemSeparator = ',',
-  Backslash = '\\',
-  StringDelimiter = '"',
-  ZeroChar = '0',
-  EscapeChar = 'u',
-  Nan = 'NaN',
-  Infinity = 'Infinity',
-  NegativeInfinity = '-Infinity',
-  EscapeChars = "\"\\bfnrt",
-  EscapePrefix = "\\u00"
-}
-
-EscapeCharVals = {
-  '"', '\\', '\b', '\f', '\n', '\r', '\t'
-}
-
-JSONCharTable = {
-  --0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-    0,  0,  0,  0,  0,  0,  0,  0, 98,116,110,  0,102,114,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  1,34,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-}
-
--- character table string
-local b='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
-
--- encoding
-function base64_encode(data)
-    return ((data:gsub('.', function(x) 
-        local r,b='',x:byte()
-        for i=8,1,-1 do r=r..(b%2^i-b%2^(i-1)>0 and '1' or '0') end
-        return r;
-    end)..'0000'):gsub('%d%d%d?%d?%d?%d?', function(x)
-        if (#x < 6) then return '' end
-        local c=0
-        for i=1,6 do c=c+(x:sub(i,i)=='1' and 2^(6-i) or 0) end
-        return b:sub(c+1,c+1)
-    end)..({ '', '==', '=' })[#data%3+1])
-end
-
--- decoding
-function base64_decode(data)
-    data = string.gsub(data, '[^'..b..'=]', '')
-    return (data:gsub('.', function(x)
-        if (x == '=') then return '' end
-        local r,f='',(b:find(x)-1)
-        for i=6,1,-1 do r=r..(f%2^i-f%2^(i-1)>0 and '1' or '0') end
-        return r;
-    end):gsub('%d%d%d?%d?%d?%d?%d?%d?', function(x)
-        if (#x ~= 8) then return '' end
-        local c=0
-        for i=1,8 do c=c+(x:sub(i,i)=='1' and 2^(8-i) or 0) end
-        return string.char(c)
-    end))
-end
-
-function TJSONProtocol:resetContext()
-  self.jsonContext = {}
-  self.jsonContextVal = {first = true, colon = true, ttype = 2, null = true}
-  self.jsonContextIndex = 1
-end
-
-function TJSONProtocol:contextPush(context)
-  self.jsonContextIndex = self.jsonContextIndex + 1
-  self.jsonContext[self.jsonContextIndex] = self.jsonContextVal
-  self.jsonContextVal = context
-end
-
-function TJSONProtocol:contextPop()
-  self.jsonContextVal = self.jsonContext[self.jsonContextIndex]
-  self.jsonContextIndex = self.jsonContextIndex - 1
-end
-
-function TJSONProtocol:escapeNum()
-  if self.jsonContextVal.ttype == 1 then
-    return self.jsonContextVal.colon
-  else
-    return false
-  end
-end
-
-function TJSONProtocol:writeElemSeparator()
-  if self.jsonContextVal.null then
-    return
-  end
-  if self.jsonContextVal.first then
-    self.jsonContextVal.first = false
-  else
-    if self.jsonContextVal.ttype == 1 then
-      if self.jsonContextVal.colon then
-        self.trans:write(JSONNode.PairSeparator)
-        self.jsonContextVal.colon = false
-      else
-        self.trans:write(JSONNode.ElemSeparator)
-        self.jsonContextVal.colon = true
-      end
-    else
-      self.trans:write(JSONNode.ElemSeparator)
-    end
-  end
-end
-
-function TJSONProtocol:hexChar(val)
-  val = libluabitwise.band(val, 0x0f)
-  if val < 10 then
-    return val + 48
-  else
-    return val + 87
-  end
-end
-
-function TJSONProtocol:writeJSONEscapeChar(ch)
-  self.trans:write(JSONNode.EscapePrefix)
-  local outCh = hexChar(libluabitwise.shiftr(ch, 4))
-  local buff = libluabpack.bpack('c', outCh)
-  self.trans:write(buff)
-  outCh = hexChar(ch)
-  buff = libluabpack.bpack('c', outCh)
-  self.trans:write(buff)
-end
-
-function TJSONProtocol:writeJSONChar(byte)
-  ch = string.byte(byte)
-  if ch >= 0x30 then
-    if ch == JSONNode.Backslash then
-      self.trans:write(JSONNode.Backslash)
-      self.trans:write(JSONNode.Backslash)
-    else
-      self.trans:write(byte)
-    end
-  else
-    local outCh = JSONCharTable[ch+1]
-    if outCh == 1 then
-      self.trans:write(byte)
-    elseif outCh > 1 then
-      self.trans:write(JSONNode.Backslash)
-      local buff = libluabpack.bpack('c', outCh)
-      self.trans:write(buff)
-    else
-      self:writeJSONEscapeChar(ch)
-    end
-  end
-end
-
-function TJSONProtocol:writeJSONString(str)
-  self:writeElemSeparator()
-  self.trans:write(JSONNode.StringDelimiter)
-  -- TODO escape special characters
-  local length = string.len(str)
-  local ii = 1
-  while ii <= length do
-    self:writeJSONChar(string.sub(str, ii, ii))
-    ii = ii + 1
-  end
-  self.trans:write(JSONNode.StringDelimiter)
-end
-
-function TJSONProtocol:writeJSONBase64(str)
-  self:writeElemSeparator()
-  self.trans:write(JSONNode.StringDelimiter)
-  local length = string.len(str)
-  local offset = 1
-  while length >= 3 do
-    -- Encode 3 bytes at a time
-    local bytes = base64_encode(string.sub(str, offset, offset+3))
-    self.trans:write(bytes)
-    length = length - 3
-    offset = offset + 3
-  end
-  if length > 0 then
-    local bytes = base64_encode(string.sub(str, offset, offset+length))
-    self.trans:write(bytes)
-  end
-  self.trans:write(JSONNode.StringDelimiter)
-end
-
-function TJSONProtocol:writeJSONInteger(num)
-  self:writeElemSeparator()
-  if self:escapeNum() then
-    self.trans:write(JSONNode.StringDelimiter)
-  end
-  local numstr = "" .. num
-  numstr = string.sub(numstr, string.find(numstr, "^[+-]?%d+"))
-  self.trans:write(numstr)
-  if self:escapeNum() then
-    self.trans:write(JSONNode.StringDelimiter)
-  end
-end
-
-function TJSONProtocol:writeJSONDouble(dub)
-  self:writeElemSeparator()
-  local val = "" .. dub
-  local prefix = string.sub(val, 1, 1)
-  local special = false
-  if prefix == 'N' or prefix == 'n' then
-    val = JSONNode.Nan
-    special = true
-  elseif prefix == 'I' or prefix == 'i' then
-    val = JSONNode.Infinity
-    special = true
-  elseif prefix == '-' then
-    local secondByte = string.sub(val, 2, 2)
-    if secondByte == 'I' or secondByte == 'i' then
-      val = JSONNode.NegativeInfinity
-      special = true
-    end
-  end
-
-  if special or self:escapeNum() then
-    self.trans:write(JSONNode.StringDelimiter)
-  end
-  self.trans:write(val)
-  if special or self:escapeNum() then
-    self.trans:write(JSONNode.StringDelimiter)
-  end
-end
-
-function TJSONProtocol:writeJSONObjectBegin()
-  self:writeElemSeparator()
-  self.trans:write(JSONNode.ObjectBegin)
-  self:contextPush({first = true, colon = true, ttype = 1, null = false})
-end
-
-function TJSONProtocol:writeJSONObjectEnd()
-  self:contextPop()
-  self.trans:write(JSONNode.ObjectEnd)
-end
-
-function TJSONProtocol:writeJSONArrayBegin()
-  self:writeElemSeparator()
-  self.trans:write(JSONNode.ArrayBegin)
-  self:contextPush({first = true, colon = true, ttype = 2, null = false})
-end
-
-function TJSONProtocol:writeJSONArrayEnd()
-  self:contextPop()
-  self.trans:write(JSONNode.ArrayEnd)
-end
-
-function TJSONProtocol:writeMessageBegin(name, ttype, seqid)
-  self:resetContext()
-  self:writeJSONArrayBegin()
-  self:writeJSONInteger(TJSONProtocol.THRIFT_JSON_PROTOCOL_VERSION)
-  self:writeJSONString(name)
-  self:writeJSONInteger(ttype)
-  self:writeJSONInteger(seqid)
-end
-
-function TJSONProtocol:writeMessageEnd()
-  self:writeJSONArrayEnd()
-end
-
-function TJSONProtocol:writeStructBegin(name)
-  self:writeJSONObjectBegin()
-end
-
-function TJSONProtocol:writeStructEnd()
-  self:writeJSONObjectEnd()
-end
-
-function TJSONProtocol:writeFieldBegin(name, ttype, id)
-  self:writeJSONInteger(id)
-  self:writeJSONObjectBegin()
-  self:writeJSONString(TTypeToString[ttype])
-end
-
-function TJSONProtocol:writeFieldEnd()
-  self:writeJSONObjectEnd()
-end
-
-function TJSONProtocol:writeFieldStop()
-end
-
-function TJSONProtocol:writeMapBegin(ktype, vtype, size)
-  self:writeJSONArrayBegin()
-  self:writeJSONString(TTypeToString[ktype])
-  self:writeJSONString(TTypeToString[vtype])
-  self:writeJSONInteger(size)
-  return self:writeJSONObjectBegin()
-end
-
-function TJSONProtocol:writeMapEnd()
-  self:writeJSONObjectEnd()
-  self:writeJSONArrayEnd()
-end
-
-function TJSONProtocol:writeListBegin(etype, size)
-  self:writeJSONArrayBegin()
-  self:writeJSONString(TTypeToString[etype])
-  self:writeJSONInteger(size)
-end
-
-function TJSONProtocol:writeListEnd()
-  self:writeJSONArrayEnd()
-end
-
-function TJSONProtocol:writeSetBegin(etype, size)
-  self:writeJSONArrayBegin()
-  self:writeJSONString(TTypeToString[etype])
-  self:writeJSONInteger(size)
-end
-
-function TJSONProtocol:writeSetEnd()
-  self:writeJSONArrayEnd()
-end
-
-function TJSONProtocol:writeBool(bool)
-  if bool then
-    self:writeJSONInteger(1)
-  else
-    self:writeJSONInteger(0)
-  end
-end
-
-function TJSONProtocol:writeByte(byte)
-  local buff = libluabpack.bpack('c', byte)
-  local val = libluabpack.bunpack('c', buff)
-  self:writeJSONInteger(val)
-end
-
-function TJSONProtocol:writeI16(i16)
-  local buff = libluabpack.bpack('s', i16)
-  local val = libluabpack.bunpack('s', buff)
-  self:writeJSONInteger(val)
-end
-
-function TJSONProtocol:writeI32(i32)
-  local buff = libluabpack.bpack('i', i32)
-  local val = libluabpack.bunpack('i', buff)
-  self:writeJSONInteger(val)
-end
-
-function TJSONProtocol:writeI64(i64)
-  local buff = libluabpack.bpack('l', i64)
-  local val = libluabpack.bunpack('l', buff)
-  self:writeJSONInteger(tostring(val))
-end
-
-function TJSONProtocol:writeDouble(dub)
-  self:writeJSONDouble(string.format("%.16f", dub))
-end
-
-function TJSONProtocol:writeString(str)
-  self:writeJSONString(str)
-end
-
-function TJSONProtocol:writeBinary(str)
-  -- Should be utf-8
-  self:writeJSONBase64(str)
-end
-
-function TJSONProtocol:readJSONSyntaxChar(ch)
-  local ch2 = ""
-  if self.hasReadByte ~= "" then
-    ch2 = self.hasReadByte
-    self.hasReadByte = ""
-  else
-    ch2 = self.trans:readAll(1)
-  end
-  if ch2 ~= ch then
-    terror(TProtocolException:new{message = "Expected ".. ch .. ", got " .. ch2})
-  end
-end
-
-function TJSONProtocol:readElemSeparator()
-  if self.jsonContextVal.null then
-    return
-  end
-  if self.jsonContextVal.first then
-    self.jsonContextVal.first = false
-  else
-    if self.jsonContextVal.ttype == 1 then
-      if self.jsonContextVal.colon then
-        self:readJSONSyntaxChar(JSONNode.PairSeparator)
-        self.jsonContextVal.colon = false
-      else
-        self:readJSONSyntaxChar(JSONNode.ElemSeparator)
-        self.jsonContextVal.colon = true
-      end
-    else
-      self:readJSONSyntaxChar(JSONNode.ElemSeparator)
-    end
-  end
-end
-
-function TJSONProtocol:hexVal(ch)
-  local val = string.byte(ch)
-  if val >= 48 and val <= 57 then
-    return val - 48
-  elseif val >= 97 and val <= 102 then
-    return val - 87
-  else
-    terror(TProtocolException:new{message = "Expected hex val ([0-9a-f]); got " .. ch})
-  end
-end
-
-function TJSONProtocol:readJSONEscapeChar(ch)
-  self:readJSONSyntaxChar(JSONNode.ZeroChar)
-  self:readJSONSyntaxChar(JSONNode.ZeroChar)
-  local b1 = self.trans:readAll(1)
-  local b2 = self.trans:readAll(1)
-  return libluabitwise.shiftl(self:hexVal(b1), 4) + self:hexVal(b2)
-end
-
-
-function TJSONProtocol:readJSONString()
-  self:readElemSeparator()
-  self:readJSONSyntaxChar(JSONNode.StringDelimiter)
-  local result = ""
-  while true do
-    local ch = self.trans:readAll(1)
-    if ch == JSONNode.StringDelimiter then
-      break
-    end
-    if ch == JSONNode.Backslash then
-      ch = self.trans:readAll(1)
-      if ch == JSONNode.EscapeChar then
-        self:readJSONEscapeChar(ch)
-      else
-        local pos, _ = string.find(JSONNode.EscapeChars, ch)
-        if pos == nil then
-          terror(TProtocolException:new{message = "Expected control char, got " .. ch})
-        end
-        ch = EscapeCharVals[pos]
-      end
-    end
-    result = result .. ch
-  end
-  return result
-end
-
-function TJSONProtocol:readJSONBase64()
-  local result = self:readJSONString()
-  local length = string.len(result)
-  local str = ""
-  local offset = 1
-  while length >= 4 do
-    local bytes = string.sub(result, offset, offset+4)
-    str = str .. base64_decode(bytes)
-    offset = offset + 4
-    length = length - 4
-  end
-  if length >= 0 then
-    str = str .. base64_decode(string.sub(result, offset, offset + length))
-  end
-  return str
-end
-
-function TJSONProtocol:readJSONNumericChars()
-  local result = ""
-  while true do
-    local ch = self.trans:readAll(1)
-    if string.find(ch, '[-+0-9.Ee]') then
-      result = result .. ch
-    else
-      self.hasReadByte = ch
-      break
-    end
-  end
-  return result
-end
-
-function TJSONProtocol:readJSONLongInteger()
-  self:readElemSeparator()
-  if self:escapeNum() then
-    self:readJSONSyntaxChar(JSONNode.StringDelimiter)
-  end
-  local result = self:readJSONNumericChars()
-  if self:escapeNum() then
-    self:readJSONSyntaxChar(JSONNode.StringDelimiter)
-  end
-  return result
-end
-
-function TJSONProtocol:readJSONInteger()
-  return tonumber(self:readJSONLongInteger())
-end
-
-function TJSONProtocol:readJSONDouble()
-  self:readElemSeparator()
-  local delimiter = self.trans:readAll(1)
-  local num = 0.0
-  if delimiter == JSONNode.StringDelimiter then
-    local str = self:readJSONString()
-    if str == JSONNode.Nan then
-      num = 1.0
-    elseif str == JSONNode.Infinity then
-      num = math.maxinteger
-    elseif str == JSONNode.NegativeInfinity then
-      num = math.mininteger
-    else
-      num = tonumber(str)
-    end
-  else
-    if self:escapeNum() then
-      self:readJSONSyntaxChar(JSONNode.StringDelimiter)
-    end
-    local result = self:readJSONNumericChars()
-    num = tonumber(delimiter.. result)
-  end
-  return num
-end
-
-function TJSONProtocol:readJSONObjectBegin()
-  self:readElemSeparator()
-  self:readJSONSyntaxChar(JSONNode.ObjectBegin)
-  self:contextPush({first = true, colon = true, ttype = 1, null = false})
-end
-
-function TJSONProtocol:readJSONObjectEnd()
-  self:readJSONSyntaxChar(JSONNode.ObjectEnd)
-  self:contextPop()
-end
-
-function TJSONProtocol:readJSONArrayBegin()
-  self:readElemSeparator()
-  self:readJSONSyntaxChar(JSONNode.ArrayBegin)
-  self:contextPush({first = true, colon = true, ttype = 2, null = false})
-end
-
-function TJSONProtocol:readJSONArrayEnd()
-  self:readJSONSyntaxChar(JSONNode.ArrayEnd)
-  self:contextPop()
-end
-
-function TJSONProtocol:readMessageBegin()
-  self:resetContext()
-  self:readJSONArrayBegin()
-  local version = self:readJSONInteger()
-  if version ~= self.THRIFT_JSON_PROTOCOL_VERSION then
-    terror(TProtocolException:new{message = "Message contained bad version."})
-  end
-  local name = self:readJSONString()
-  local ttype = self:readJSONInteger()
-  local seqid = self:readJSONInteger()
-  return name, ttype, seqid
-end
-
-function TJSONProtocol:readMessageEnd()
-  self:readJSONArrayEnd()
-end
-
-function TJSONProtocol:readStructBegin()
-  self:readJSONObjectBegin()
-  return nil
-end
-
-function TJSONProtocol:readStructEnd()
-  self:readJSONObjectEnd()
-end
-
-function TJSONProtocol:readFieldBegin()
-  local ttype = TType.STOP
-  local id = 0
-  local ch = self.trans:readAll(1)
-  self.hasReadByte = ch
-  if ch ~= JSONNode.ObjectEnd then
-    id = self:readJSONInteger()
-    self:readJSONObjectBegin()
-    local typeName = self:readJSONString()
-    ttype = StringToTType[typeName]
-  end
-  return nil, ttype, id
-end
-
-function TJSONProtocol:readFieldEnd()
-  self:readJSONObjectEnd()
-end
-
-function TJSONProtocol:readMapBegin()
-  self:readJSONArrayBegin()
-  local typeName = self:readJSONString()
-  local ktype = StringToTType[typeName]
-  typeName = self:readJSONString()
-  local vtype = StringToTType[typeName]
-  local size = self:readJSONInteger()
-  self:readJSONObjectBegin()
-  return ktype, vtype, size
-end
-
-function TJSONProtocol:readMapEnd()
-  self:readJSONObjectEnd()
-  self:readJSONArrayEnd()
-end
-
-function TJSONProtocol:readListBegin()
-  self:readJSONArrayBegin()
-  local typeName = self:readJSONString()
-  local etype = StringToTType[typeName]
-  local size = self:readJSONInteger()
-  return etype, size
-end
-
-function TJSONProtocol:readListEnd()
-  return self:readJSONArrayEnd()
-end
-
-function TJSONProtocol:readSetBegin()
-  return self:readListBegin()
-end
-
-function TJSONProtocol:readSetEnd()
-  return self:readJSONArrayEnd()
-end
-
-function TJSONProtocol:readBool()
-  local result = self:readJSONInteger()
-  if result == 1 then
-    return true
-  else
-    return false
-  end
-end
-
-function TJSONProtocol:readByte()
-  local result = self:readJSONInteger()
-  if result >= 256 then
-    terror(TProtocolException:new{message = "UnExpected Byte " .. result})
-  end
-  return result
-end
-
-function TJSONProtocol:readI16()
-  return self:readJSONInteger()
-end
-
-function TJSONProtocol:readI32()
-  return self:readJSONInteger()
-end
-
-function TJSONProtocol:readI64()
-  local long = liblualongnumber.new
-  return long(self:readJSONLongInteger())
-end
-
-function TJSONProtocol:readDouble()
-  return self:readJSONDouble()
-end
-
-function TJSONProtocol:readString()
-  return self:readJSONString()
-end
-
-function TJSONProtocol:readBinary()
-  return self:readJSONBase64()
-end
-
-TJSONProtocolFactory = TProtocolFactory:new{
-  __type = 'TJSONProtocolFactory',
-}
-
-function TJSONProtocolFactory:getProtocol(trans)
-  -- TODO Enforce that this must be a transport class (ie not a bool)
-  if not trans then
-    terror(TProtocolException:new{
-      message = 'Must supply a transport to ' .. ttype(self)
-    })
-  end
-  return TJSONProtocol:new{
-    trans = trans
-  }
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TMemoryBuffer.lua b/vendor/git.apache.org/thrift.git/lib/lua/TMemoryBuffer.lua
deleted file mode 100644
index 78b2f5c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TMemoryBuffer.lua
+++ /dev/null
@@ -1,91 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'TTransport'
-
-TMemoryBuffer = TTransportBase:new{
-  __type = 'TMemoryBuffer',
-  buffer = '',
-  bufferSize = 1024,
-  wPos = 0,
-  rPos = 0
-}
-function TMemoryBuffer:isOpen()
-  return 1
-end
-function TMemoryBuffer:open() end
-function TMemoryBuffer:close() end
-
-function TMemoryBuffer:peak()
-  return self.rPos < self.wPos
-end
-
-function TMemoryBuffer:getBuffer()
-  return self.buffer
-end
-
-function TMemoryBuffer:resetBuffer(buf)
-  if buf then
-    self.buffer = buf
-    self.bufferSize = string.len(buf)
-  else
-    self.buffer = ''
-    self.bufferSize = 1024
-  end
-  self.wPos = string.len(buf)
-  self.rPos = 0
-end
-
-function TMemoryBuffer:available()
-  return self.wPos - self.rPos
-end
-
-function TMemoryBuffer:read(len)
-  local avail = self:available()
-  if avail == 0 then
-    return ''
-  end
-
-  if avail < len then
-    len = avail
-  end
-
-  local val = string.sub(self.buffer, self.rPos + 1, self.rPos + len)
-  self.rPos = self.rPos + len
-  return val
-end
-
-function TMemoryBuffer:readAll(len)
-  local avail = self:available()
-
-  if avail < len then
-    local msg = string.format('Attempt to readAll(%d) found only %d available',
-                              len, avail)
-    terror(TTransportException:new{message = msg})
-  end
-  -- read should block so we don't need a loop here
-  return self:read(len)
-end
-
-function TMemoryBuffer:write(buf)
-  self.buffer = self.buffer .. buf
-  self.wPos = self.wPos + string.len(buf)
-end
-
-function TMemoryBuffer:flush() end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TProtocol.lua b/vendor/git.apache.org/thrift.git/lib/lua/TProtocol.lua
deleted file mode 100644
index 616e167..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TProtocol.lua
+++ /dev/null
@@ -1,162 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'Thrift'
-
-TProtocolException = TException:new {
-  UNKNOWN          = 0,
-  INVALID_DATA     = 1,
-  NEGATIVE_SIZE    = 2,
-  SIZE_LIMIT       = 3,
-  BAD_VERSION      = 4,
-  INVALID_PROTOCOL = 5,
-  DEPTH_LIMIT      = 6,
-  errorCode        = 0,
-  __type = 'TProtocolException'
-}
-function TProtocolException:__errorCodeToString()
-  if self.errorCode == self.INVALID_DATA then
-    return 'Invalid data'
-  elseif self.errorCode == self.NEGATIVE_SIZE then
-    return 'Negative size'
-  elseif self.errorCode == self.SIZE_LIMIT then
-    return 'Size limit'
-  elseif self.errorCode == self.BAD_VERSION then
-    return 'Bad version'
-  elseif self.errorCode == self.INVALID_PROTOCOL then
-    return 'Invalid protocol'
-  elseif self.errorCode == self.DEPTH_LIMIT then
-    return 'Exceeded size limit'
-  else
-    return 'Default (unknown)'
-  end
-end
-
-TProtocolBase = __TObject:new{
-  __type = 'TProtocolBase',
-  trans
-}
-
-function TProtocolBase:new(obj)
-  if ttype(obj) ~= 'table' then
-    error(ttype(self) .. 'must be initialized with a table')
-  end
-
-  -- Ensure a transport is provided
-  if not obj.trans then
-    error('You must provide ' .. ttype(self) .. ' with a trans')
-  end
-
-  return __TObject.new(self, obj)
-end
-
-function TProtocolBase:writeMessageBegin(name, ttype, seqid) end
-function TProtocolBase:writeMessageEnd() end
-function TProtocolBase:writeStructBegin(name) end
-function TProtocolBase:writeStructEnd() end
-function TProtocolBase:writeFieldBegin(name, ttype, id) end
-function TProtocolBase:writeFieldEnd() end
-function TProtocolBase:writeFieldStop() end
-function TProtocolBase:writeMapBegin(ktype, vtype, size) end
-function TProtocolBase:writeMapEnd() end
-function TProtocolBase:writeListBegin(ttype, size) end
-function TProtocolBase:writeListEnd() end
-function TProtocolBase:writeSetBegin(ttype, size) end
-function TProtocolBase:writeSetEnd() end
-function TProtocolBase:writeBool(bool) end
-function TProtocolBase:writeByte(byte) end
-function TProtocolBase:writeI16(i16) end
-function TProtocolBase:writeI32(i32) end
-function TProtocolBase:writeI64(i64) end
-function TProtocolBase:writeDouble(dub) end
-function TProtocolBase:writeString(str) end
-function TProtocolBase:readMessageBegin() end
-function TProtocolBase:readMessageEnd() end
-function TProtocolBase:readStructBegin() end
-function TProtocolBase:readStructEnd() end
-function TProtocolBase:readFieldBegin() end
-function TProtocolBase:readFieldEnd() end
-function TProtocolBase:readMapBegin() end
-function TProtocolBase:readMapEnd() end
-function TProtocolBase:readListBegin() end
-function TProtocolBase:readListEnd() end
-function TProtocolBase:readSetBegin() end
-function TProtocolBase:readSetEnd() end
-function TProtocolBase:readBool() end
-function TProtocolBase:readByte() end
-function TProtocolBase:readI16() end
-function TProtocolBase:readI32() end
-function TProtocolBase:readI64() end
-function TProtocolBase:readDouble() end
-function TProtocolBase:readString() end
-
-function TProtocolBase:skip(ttype)
-  if type == TType.STOP then
-    return
-  elseif ttype == TType.BOOL then
-    self:readBool()
-  elseif ttype == TType.BYTE then
-    self:readByte()
-  elseif ttype == TType.I16 then
-    self:readI16()
-  elseif ttype == TType.I32 then
-    self:readI32()
-  elseif ttype == TType.I64 then
-    self:readI64()
-  elseif ttype == TType.DOUBLE then
-    self:readDouble()
-  elseif ttype == TType.STRING then
-    self:readString()
-  elseif ttype == TType.STRUCT then
-    local name = self:readStructBegin()
-    while true do
-      local name, ttype, id = self:readFieldBegin()
-      if ttype == TType.STOP then
-        break
-      end
-      self:skip(ttype)
-      self:readFieldEnd()
-    end
-    self:readStructEnd()
-  elseif ttype == TType.MAP then
-    local kttype, vttype, size = self:readMapBegin()
-    for i = 1, size, 1 do
-      self:skip(kttype)
-      self:skip(vttype)
-    end
-    self:readMapEnd()
-  elseif ttype == TType.SET then
-    local ettype, size = self:readSetBegin()
-    for i = 1, size, 1 do
-      self:skip(ettype)
-    end
-    self:readSetEnd()
-  elseif ttype == TType.LIST then
-    local ettype, size = self:readListBegin()
-    for i = 1, size, 1 do
-      self:skip(ettype)
-    end
-    self:readListEnd()
-  end
-end
-
-TProtocolFactory = __TObject:new{
-  __type = 'TProtocolFactory',
-}
-function TProtocolFactory:getProtocol(trans) end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TServer.lua b/vendor/git.apache.org/thrift.git/lib/lua/TServer.lua
deleted file mode 100644
index 4e37d58..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TServer.lua
+++ /dev/null
@@ -1,140 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'Thrift'
-require 'TFramedTransport'
-require 'TBinaryProtocol'
-
--- TServer
-TServer = __TObject:new{
-  __type = 'TServer'
-}
-
--- 2 possible constructors
---   1. {processor, serverTransport}
---   2. {processor, serverTransport, transportFactory, protocolFactory}
-function TServer:new(args)
-  if ttype(args) ~= 'table' then
-    error('TServer must be initialized with a table')
-  end
-  if args.processor == nil then
-    terror('You must provide ' .. ttype(self) .. ' with a processor')
-  end
-  if args.serverTransport == nil then
-    terror('You must provide ' .. ttype(self) .. ' with a serverTransport')
-  end
-
-  -- Create the object
-  local obj = __TObject.new(self, args)
-
-  if obj.transportFactory then
-    obj.inputTransportFactory = obj.transportFactory
-    obj.outputTransportFactory = obj.transportFactory
-    obj.transportFactory = nil
-  else
-    obj.inputTransportFactory = TFramedTransportFactory:new{}
-    obj.outputTransportFactory = obj.inputTransportFactory
-  end
-
-  if obj.protocolFactory then
-    obj.inputProtocolFactory = obj.protocolFactory
-    obj.outputProtocolFactory = obj.protocolFactory
-    obj.protocolFactory = nil
-  else
-    obj.inputProtocolFactory = TBinaryProtocolFactory:new{}
-    obj.outputProtocolFactory = obj.inputProtocolFactory
-  end
-
-  -- Set the __server variable in the handler so we can stop the server
-  obj.processor.handler.__server = self
-
-  return obj
-end
-
-function TServer:setServerEventHandler(handler)
-  self.serverEventHandler = handler
-end
-
-function TServer:_clientBegin(content, iprot, oprot)
-  if self.serverEventHandler and
-    type(self.serverEventHandler.clientBegin) == 'function' then
-    self.serverEventHandler:clientBegin(iprot, oprot)
-  end
-end
-
-function TServer:_preServe()
-  if self.serverEventHandler and
-    type(self.serverEventHandler.preServe) == 'function' then
-    self.serverEventHandler:preServe(self.serverTransport:getSocketInfo())
-  end
-end
-
-function TServer:_handleException(err)
-  if string.find(err, 'TTransportException') == nil then
-    print(err)
-  end
-end
-
-function TServer:serve() end
-function TServer:handle(client)
-  local itrans, otrans =
-    self.inputTransportFactory:getTransport(client),
-    self.outputTransportFactory:getTransport(client)
-  local iprot, oprot =
-    self.inputProtocolFactory:getProtocol(itrans),
-    self.outputProtocolFactory:getProtocol(otrans)
-
-  self:_clientBegin(iprot, oprot)
-  while true do
-    local ret, err = pcall(self.processor.process, self.processor, iprot, oprot)
-    if ret == false and err then
-      if not string.find(err, "TTransportException") then
-        self:_handleException(err)
-      end
-      break
-    end
-  end
-  itrans:close()
-  otrans:close()
-end
-
-function TServer:close()
-  self.serverTransport:close()
-end
-
--- TSimpleServer
---  Single threaded server that handles one transport (connection)
-TSimpleServer = __TObject:new(TServer, {
-  __type = 'TSimpleServer',
-  __stop = false
-})
-
-function TSimpleServer:serve()
-  self.serverTransport:listen()
-  self:_preServe()
-  while not self.__stop do
-    client = self.serverTransport:accept()
-    self:handle(client)
-  end
-  self:close()
-end
-
-function TSimpleServer:stop()
-  self.__stop = true
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TSocket.lua b/vendor/git.apache.org/thrift.git/lib/lua/TSocket.lua
deleted file mode 100644
index d71fc1f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TSocket.lua
+++ /dev/null
@@ -1,132 +0,0 @@
----- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'TTransport'
-require 'libluasocket'
-
--- TSocketBase
-TSocketBase = TTransportBase:new{
-  __type = 'TSocketBase',
-  timeout = 1000,
-  host = 'localhost',
-  port = 9090,
-  handle
-}
-
-function TSocketBase:close()
-  if self.handle then
-    self.handle:destroy()
-    self.handle = nil
-  end
-end
-
--- Returns a table with the fields host and port
-function TSocketBase:getSocketInfo()
-  if self.handle then
-    return self.handle:getsockinfo()
-  end
-  terror(TTransportException:new{errorCode = TTransportException.NOT_OPEN})
-end
-
-function TSocketBase:setTimeout(timeout)
-  if timeout and ttype(timeout) == 'number' then
-    if self.handle then
-      self.handle:settimeout(timeout)
-    end
-    self.timeout = timeout
-  end
-end
-
--- TSocket
-TSocket = TSocketBase:new{
-  __type = 'TSocket',
-  host = 'localhost',
-  port = 9090
-}
-
-function TSocket:isOpen()
-  if self.handle then
-    return true
-  end
-  return false
-end
-
-function TSocket:open()
-  if self.handle then
-    self:close()
-  end
-
-  -- Create local handle
-  local sock, err = luasocket.create_and_connect(
-    self.host, self.port, self.timeout)
-  if err == nil then
-    self.handle = sock
-  end
-
-  if err then
-    terror(TTransportException:new{
-      message = 'Could not connect to ' .. self.host .. ':' .. self.port
-        .. ' (' .. err .. ')'
-    })
-  end
-end
-
-function TSocket:read(len)
-  local buf = self.handle:receive(self.handle, len)
-  if not buf or string.len(buf) ~= len then
-    terror(TTransportException:new{errorCode = TTransportException.UNKNOWN})
-  end
-  return buf
-end
-
-function TSocket:write(buf)
-  self.handle:send(self.handle, buf)
-end
-
-function TSocket:flush()
-end
-
--- TServerSocket
-TServerSocket = TSocketBase:new{
-  __type = 'TServerSocket',
-  host = 'localhost',
-  port = 9090
-}
-
-function TServerSocket:listen()
-  if self.handle then
-    self:close()
-  end
-
-  local sock, err = luasocket.create(self.host, self.port)
-  if not err then
-    self.handle = sock
-  else
-    terror(err)
-  end
-  self.handle:settimeout(self.timeout)
-  self.handle:listen()
-end
-
-function TServerSocket:accept()
-  local client, err = self.handle:accept()
-  if err then
-    terror(err)
-  end
-  return TSocket:new({handle = client})
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/TTransport.lua b/vendor/git.apache.org/thrift.git/lib/lua/TTransport.lua
deleted file mode 100644
index 01c7e59..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/TTransport.lua
+++ /dev/null
@@ -1,93 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-require 'Thrift'
-
-TTransportException = TException:new {
-  UNKNOWN             = 0,
-  NOT_OPEN            = 1,
-  ALREADY_OPEN        = 2,
-  TIMED_OUT           = 3,
-  END_OF_FILE         = 4,
-  INVALID_FRAME_SIZE  = 5,
-  INVALID_TRANSFORM   = 6,
-  INVALID_CLIENT_TYPE = 7,
-  errorCode        = 0,
-  __type = 'TTransportException'
-}
-
-function TTransportException:__errorCodeToString()
-  if self.errorCode == self.NOT_OPEN then
-    return 'Transport not open'
-  elseif self.errorCode == self.ALREADY_OPEN then
-    return 'Transport already open'
-  elseif self.errorCode == self.TIMED_OUT then
-    return 'Transport timed out'
-  elseif self.errorCode == self.END_OF_FILE then
-    return 'End of file'
-  elseif self.errorCode == self.INVALID_FRAME_SIZE then
-    return 'Invalid frame size'
-  elseif self.errorCode == self.INVALID_TRANSFORM then
-    return 'Invalid transform'
-  elseif self.errorCode == self.INVALID_CLIENT_TYPE then
-    return 'Invalid client type'
-  else
-    return 'Default (unknown)'
-  end
-end
-
-TTransportBase = __TObject:new{
-  __type = 'TTransportBase'
-}
-
-function TTransportBase:isOpen() end
-function TTransportBase:open() end
-function TTransportBase:close() end
-function TTransportBase:read(len) end
-function TTransportBase:readAll(len)
-  local buf, have, chunk = '', 0
-  while have < len do
-    chunk = self:read(len - have)
-    have = have + string.len(chunk)
-    buf = buf .. chunk
-
-    if string.len(chunk) == 0 then
-      terror(TTransportException:new{
-        errorCode = TTransportException.END_OF_FILE
-      })
-    end
-  end
-  return buf
-end
-function TTransportBase:write(buf) end
-function TTransportBase:flush() end
-
-TServerTransportBase = __TObject:new{
-  __type = 'TServerTransportBase'
-}
-function TServerTransportBase:listen() end
-function TServerTransportBase:accept() end
-function TServerTransportBase:close() end
-
-TTransportFactoryBase = __TObject:new{
-  __type = 'TTransportFactoryBase'
-}
-function TTransportFactoryBase:getTransport(trans)
-  return trans
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/Thrift.lua b/vendor/git.apache.org/thrift.git/lib/lua/Thrift.lua
deleted file mode 100644
index 3eddb64..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/Thrift.lua
+++ /dev/null
@@ -1,281 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
----- namespace thrift
---thrift = {}
---setmetatable(thrift, {__index = _G}) --> perf hit for accessing global methods
---setfenv(1, thrift)
-
-package.cpath = package.cpath .. ';bin/?.so' -- TODO FIX
-function ttype(obj)
-  if type(obj) == 'table' and
-    obj.__type and
-    type(obj.__type) == 'string' then
-      return obj.__type
-  end
-  return type(obj)
-end
-
-function terror(e)
-  if e and e.__tostring then
-    error(e:__tostring())
-    return
-  end
-  error(e)
-end
-
-function ttable_size(t)
-  local count = 0
-  for k, v in pairs(t) do
-    count = count + 1
-  end
-  return count
-end
-
-version = 0.10
-
-TType = {
-  STOP   = 0,
-  VOID   = 1,
-  BOOL   = 2,
-  BYTE   = 3,
-  I08    = 3,
-  DOUBLE = 4,
-  I16    = 6,
-  I32    = 8,
-  I64    = 10,
-  STRING = 11,
-  UTF7   = 11,
-  STRUCT = 12,
-  MAP    = 13,
-  SET    = 14,
-  LIST   = 15,
-  UTF8   = 16,
-  UTF16  = 17
-}
-
-TMessageType = {
-  CALL  = 1,
-  REPLY = 2,
-  EXCEPTION = 3,
-  ONEWAY = 4
-}
-
--- Recursive __index function to achieve inheritance
-function __tobj_index(self, key)
-  local v = rawget(self, key)
-  if v ~= nil then
-    return v
-  end
-
-  local p = rawget(self, '__parent')
-  if p then
-    return __tobj_index(p, key)
-  end
-
-  return nil
-end
-
--- Basic Thrift-Lua Object
-__TObject = {
-  __type = '__TObject',
-  __mt = {
-    __index = __tobj_index
-  }
-}
-function __TObject:new(init_obj)
-  local obj = {}
-  if ttype(obj) == 'table' then
-    obj = init_obj
-  end
-
-  -- Use the __parent key and the __index function to achieve inheritance
-  obj.__parent = self
-  setmetatable(obj, __TObject.__mt)
-  return obj
-end
-
--- Return a string representation of any lua variable
-function thrift_print_r(t)
-  local ret = ''
-  local ltype = type(t)
-  if (ltype == 'table') then
-    ret = ret .. '{ '
-    for key,value in pairs(t) do
-      ret = ret .. tostring(key) .. '=' .. thrift_print_r(value) .. ' '
-    end
-    ret = ret .. '}'
-  elseif ltype == 'string' then
-    ret = ret .. "'" .. tostring(t) .. "'"
-  else
-    ret = ret .. tostring(t)
-  end
-  return ret
-end
-
--- Basic Exception
-TException = __TObject:new{
-  message,
-  errorCode,
-  __type = 'TException'
-}
-function TException:__tostring()
-  if self.message then
-    return string.format('%s: %s', self.__type, self.message)
-  else
-    local message
-    if self.errorCode and self.__errorCodeToString then
-      message = string.format('%d: %s', self.errorCode, self:__errorCodeToString())
-    else
-      message = thrift_print_r(self)
-    end
-    return string.format('%s:%s', self.__type, message)
-  end
-end
-
-TApplicationException = TException:new{
-  UNKNOWN                 = 0,
-  UNKNOWN_METHOD          = 1,
-  INVALID_MESSAGE_TYPE    = 2,
-  WRONG_METHOD_NAME       = 3,
-  BAD_SEQUENCE_ID         = 4,
-  MISSING_RESULT          = 5,
-  INTERNAL_ERROR          = 6,
-  PROTOCOL_ERROR          = 7,
-  INVALID_TRANSFORM       = 8,
-  INVALID_PROTOCOL        = 9,
-  UNSUPPORTED_CLIENT_TYPE = 10,
-  errorCode               = 0,
-  __type = 'TApplicationException'
-}
-
-function TApplicationException:__errorCodeToString()
-  if self.errorCode == self.UNKNOWN_METHOD then
-    return 'Unknown method'
-  elseif self.errorCode == self.INVALID_MESSAGE_TYPE then
-    return 'Invalid message type'
-  elseif self.errorCode == self.WRONG_METHOD_NAME then
-    return 'Wrong method name'
-  elseif self.errorCode == self.BAD_SEQUENCE_ID then
-    return 'Bad sequence ID'
-  elseif self.errorCode == self.MISSING_RESULT then
-    return 'Missing result'
-  elseif self.errorCode == self.INTERNAL_ERROR then
-    return 'Internal error'
-  elseif self.errorCode == self.PROTOCOL_ERROR then
-    return 'Protocol error'
-  elseif self.errorCode == self.INVALID_TRANSFORM then
-    return 'Invalid transform'
-  elseif self.errorCode == self.INVALID_PROTOCOL then
-    return 'Invalid protocol'
-  elseif self.errorCode == self.UNSUPPORTED_CLIENT_TYPE then
-    return 'Unsupported client type'
-  else
-    return 'Default (unknown)'
-  end
-end
-
-function TException:read(iprot)
-  iprot:readStructBegin()
-  while true do
-    local fname, ftype, fid = iprot:readFieldBegin()
-    if ftype == TType.STOP then
-      break
-    elseif fid == 1 then
-      if ftype == TType.STRING then
-        self.message = iprot:readString()
-      else
-        iprot:skip(ftype)
-      end
-    elseif fid == 2 then
-      if ftype == TType.I32 then
-        self.errorCode = iprot:readI32()
-      else
-        iprot:skip(ftype)
-      end
-    else
-      iprot:skip(ftype)
-    end
-    iprot:readFieldEnd()
-  end
-  iprot:readStructEnd()
-end
-
-function TException:write(oprot)
-  oprot:writeStructBegin('TApplicationException')
-  if self.message then
-    oprot:writeFieldBegin('message', TType.STRING, 1)
-    oprot:writeString(self.message)
-    oprot:writeFieldEnd()
-  end
-  if self.errorCode then
-    oprot:writeFieldBegin('type', TType.I32, 2)
-    oprot:writeI32(self.errorCode)
-    oprot:writeFieldEnd()
-  end
-  oprot:writeFieldStop()
-  oprot:writeStructEnd()
-end
-
--- Basic Client (used in generated lua code)
-__TClient = __TObject:new{
-  __type = '__TClient',
-  _seqid = 0
-}
-function __TClient:new(obj)
-  if ttype(obj) ~= 'table' then
-    error('TClient must be initialized with a table')
-  end
-
-  -- Set iprot & oprot
-  if obj.protocol then
-    obj.iprot = obj.protocol
-    obj.oprot = obj.protocol
-    obj.protocol = nil
-  elseif not obj.iprot then
-    error('You must provide ' .. ttype(self) .. ' with an iprot')
-  end
-  if not obj.oprot then
-    obj.oprot = obj.iprot
-  end
-
-  return __TObject.new(self, obj)
-end
-
-function __TClient:close()
-  self.iprot.trans:close()
-  self.oprot.trans:close()
-end
-
--- Basic Processor (used in generated lua code)
-__TProcessor = __TObject:new{
-  __type = '__TProcessor'
-}
-function __TProcessor:new(obj)
-  if ttype(obj) ~= 'table' then
-    error('TProcessor must be initialized with a table')
-  end
-
-  -- Ensure a handler is provided
-  if not obj.handler then
-    error('You must provide ' .. ttype(self) .. ' with a handler')
-  end
-
-  return __TObject.new(self, obj)
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/lua/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/src/longnumberutils.c b/vendor/git.apache.org/thrift.git/lib/lua/src/longnumberutils.c
deleted file mode 100644
index fbc6789..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/src/longnumberutils.c
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-#include <lua.h>
-#include <lauxlib.h>
-#include <stdlib.h>
-#include <inttypes.h>
-
-const char * LONG_NUM_TYPE = "__thrift_longnumber";
-int64_t lualongnumber_checklong(lua_State *L, int index) {
-  switch (lua_type(L, index)) {
-    case LUA_TNUMBER:
-      return (int64_t)lua_tonumber(L, index);
-    case LUA_TSTRING:
-      return atoll(lua_tostring(L, index));
-    default:
-      return *((int64_t *)luaL_checkudata(L, index, LONG_NUM_TYPE));
-  }
-}
-
-// Creates a new longnumber and pushes it onto the statck
-int64_t * lualongnumber_pushlong(lua_State *L, int64_t *val) {
-  int64_t *data = (int64_t *)lua_newuserdata(L, sizeof(int64_t)); // longnum
-  luaL_getmetatable(L, LONG_NUM_TYPE);                            // longnum, mt
-  lua_setmetatable(L, -2);                                        // longnum
-  if (val) {
-    *data = *val;
-  }
-  return data;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/src/luabitwise.c b/vendor/git.apache.org/thrift.git/lib/lua/src/luabitwise.c
deleted file mode 100644
index 2e07e17..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/src/luabitwise.c
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-#include <lua.h>
-#include <lauxlib.h>
-
-static int l_not(lua_State *L) {
-  int a = luaL_checkinteger(L, 1);
-  a = ~a;
-  lua_pushnumber(L, a);
-  return 1;
-}
-
-static int l_xor(lua_State *L) {
-  int a = luaL_checkinteger(L, 1);
-  int b = luaL_checkinteger(L, 2);
-  a ^= b;
-  lua_pushnumber(L, a);
-  return 1;
-}
-
-static int l_and(lua_State *L) {
-  int a = luaL_checkinteger(L, 1);
-  int b = luaL_checkinteger(L, 2);
-  a &= b;
-  lua_pushnumber(L, a);
-  return 1;
-}
-
-static int l_or(lua_State *L) {
-  int a = luaL_checkinteger(L, 1);
-  int b = luaL_checkinteger(L, 2);
-  a |= b;
-  lua_pushnumber(L, a);
-  return 1;
-}
-
-static int l_shiftr(lua_State *L) {
-  int a = luaL_checkinteger(L, 1);
-  int b = luaL_checkinteger(L, 2);
-  a = a >> b;
-  lua_pushnumber(L, a);
-  return 1;
-}
-
-static int l_shiftl(lua_State *L) {
-  int a = luaL_checkinteger(L, 1);
-  int b = luaL_checkinteger(L, 2);
-  a = a << b;
-  lua_pushnumber(L, a);
-  return 1;
-}
-
-static const struct luaL_Reg funcs[] = {
-  {"band", l_and},
-  {"bor", l_or},
-  {"bxor", l_xor},
-  {"bnot", l_not},
-  {"shiftl", l_shiftl},
-  {"shiftr", l_shiftr},
-  {NULL, NULL}
-};
-
-int luaopen_libluabitwise(lua_State *L) {
-  luaL_register(L, "libluabitwise", funcs);
-  return 1;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/src/luabpack.c b/vendor/git.apache.org/thrift.git/lib/lua/src/luabpack.c
deleted file mode 100644
index a86fc3e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/src/luabpack.c
+++ /dev/null
@@ -1,308 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-#include <lua.h>
-#include <lauxlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <netinet/in.h>
-
-extern int64_t lualongnumber_checklong(lua_State *L, int index);
-extern int64_t lualongnumber_pushlong(lua_State *L, int64_t *val);
-
-// host order to network order (64-bit)
-static int64_t T_htonll(uint64_t data) {
-  uint32_t d1 = htonl((uint32_t)data);
-  uint32_t d2 = htonl((uint32_t)(data >> 32));
-  return ((uint64_t)d1 << 32) + (uint64_t)d2;
-}
-
-// network order to host order (64-bit)
-static int64_t T_ntohll(uint64_t data) {
-  uint32_t d1 = ntohl((uint32_t)data);
-  uint32_t d2 = ntohl((uint32_t)(data >> 32));
-  return ((uint64_t)d1 << 32) + (uint64_t)d2;
-}
-
-/**
- * bpack(type, data)
- *  c - Signed Byte
- *  s - Signed Short
- *  i - Signed Int
- *  l - Signed Long
- *  d - Double
- */
-static int l_bpack(lua_State *L) {
-  const char *code = luaL_checkstring(L, 1);
-  luaL_argcheck(L, code[1] == '\0', 0, "Format code must be one character.");
-  luaL_Buffer buf;
-  luaL_buffinit(L, &buf);
-
-  switch (code[0]) {
-    case 'c': {
-      int8_t data = luaL_checknumber(L, 2);
-      luaL_addlstring(&buf, (void*)&data, sizeof(data));
-      break;
-    }
-    case 's': {
-      int16_t data = luaL_checknumber(L, 2);
-      data = (int16_t)htons(data);
-      luaL_addlstring(&buf, (void*)&data, sizeof(data));
-      break;
-    }
-    case 'i': {
-      int32_t data = luaL_checkinteger(L, 2);
-      data = (int32_t)htonl(data);
-      luaL_addlstring(&buf, (void*)&data, sizeof(data));
-      break;
-    }
-    case 'l': {
-      int64_t data = lualongnumber_checklong(L, 2);
-      data = (int64_t)T_htonll(data);
-      luaL_addlstring(&buf, (void*)&data, sizeof(data));
-      break;
-    }
-    case 'd': {
-      double data = luaL_checknumber(L, 2);
-      luaL_addlstring(&buf, (void*)&data, sizeof(data));
-      break;
-    }
-    default:
-      luaL_argcheck(L, 0, 0, "Invalid format code.");
-  }
-
-  luaL_pushresult(&buf);
-  return 1;
-}
-
-/**
- * bunpack(type, data)
- *  c - Signed Byte
- *  C - Unsigned Byte
- *  s - Signed Short
- *  i - Signed Int
- *  l - Signed Long
- *  d - Double
- */
-static int l_bunpack(lua_State *L) {
-  const char *code = luaL_checkstring(L, 1);
-  luaL_argcheck(L, code[1] == '\0', 0, "Format code must be one character.");
-  const char *data = luaL_checkstring(L, 2);
-#ifdef _LUA51_
-  size_t len = lua_objlen(L, 2);
-#else
-  size_t len = lua_rawlen(L, 2);
-#endif
-
-  switch (code[0]) {
-    case 'c': {
-      int8_t val;
-      luaL_argcheck(L, len == sizeof(val), 1, "Invalid input string size.");
-      memcpy(&val, data, sizeof(val));
-      lua_pushnumber(L, val);
-      break;
-    }
-    /**
-     * unpack unsigned Byte.
-     */
-    case 'C': {
-      uint8_t val;
-      luaL_argcheck(L, len == sizeof(val), 1, "Invalid input string size.");
-      memcpy(&val, data, sizeof(val));
-      lua_pushnumber(L, val);
-      break;
-    }
-    case 's': {
-      int16_t val;
-      luaL_argcheck(L, len == sizeof(val), 1, "Invalid input string size.");
-      memcpy(&val, data, sizeof(val));
-      val = (int16_t)ntohs(val);
-      lua_pushnumber(L, val);
-      break;
-    }
-    case 'i': {
-      int32_t val;
-      luaL_argcheck(L, len == sizeof(val), 1, "Invalid input string size.");
-      memcpy(&val, data, sizeof(val));
-      val = (int32_t)ntohl(val);
-      lua_pushnumber(L, val);
-      break;
-    }
-    case 'l': {
-      int64_t val;
-      luaL_argcheck(L, len == sizeof(val), 1, "Invalid input string size.");
-      memcpy(&val, data, sizeof(val));
-      val = (int64_t)T_ntohll(val);
-      lualongnumber_pushlong(L, &val);
-      break;
-    }
-    case 'd': {
-      double val;
-      luaL_argcheck(L, len == sizeof(val), 1, "Invalid input string size.");
-      memcpy(&val, data, sizeof(val));
-      lua_pushnumber(L, val);
-      break;
-    }
-    default:
-      luaL_argcheck(L, 0, 0, "Invalid format code.");
-  }
-  return 1;
-}
-
-/**
- * Convert l into a zigzag long. This allows negative numbers to be
- * represented compactly as a varint.
- */
-static int l_i64ToZigzag(lua_State *L) {
-  int64_t n = lualongnumber_checklong(L, 1);
-  int64_t result = (n << 1) ^ (n >> 63);
-  lualongnumber_pushlong(L, &result);
-  return 1;
-}
-/**
- * Convert n into a zigzag int. This allows negative numbers to be
- * represented compactly as a varint.
- */
-static int l_i32ToZigzag(lua_State *L) {
-  int32_t n = luaL_checkinteger(L, 1);
-  uint32_t result = (uint32_t)(n << 1) ^ (n >> 31);
-  lua_pushnumber(L, result);
-  return 1;
-}
-
-/**
- * Convert from zigzag int to int.
- */
-static int l_zigzagToI32(lua_State *L) {
-  uint32_t n = luaL_checkinteger(L, 1);
-  int32_t result = (int32_t)(n >> 1) ^ (uint32_t)(-(int32_t)(n & 1));
-  lua_pushnumber(L, result);
-  return 1;
-}
-
-/**
- * Convert from zigzag long to long.
- */
-static int l_zigzagToI64(lua_State *L) {
-  int64_t n = lualongnumber_checklong(L, 1);
-  int64_t result = (int64_t)(n >> 1) ^ (uint64_t)(-(int64_t)(n & 1));
-  lualongnumber_pushlong(L, &result);
-  return 1;
-}
-
-/**
- * Convert an i32 to a varint. Results in 1-5 bytes on the buffer.
- */
-static int l_toVarint32(lua_State *L) {
-  uint8_t buf[5];
-  uint32_t n = luaL_checkinteger(L, 1);
-  uint32_t wsize = 0;
-
-  while (1) {
-    if ((n & ~0x7F) == 0) {
-      buf[wsize++] = (int8_t)n;
-      break;
-    } else {
-      buf[wsize++] = (int8_t)((n & 0x7F) | 0x80);
-      n >>= 7;
-    }
-  }
-  lua_pushlstring(L, buf, wsize);
-  return 1;
-}
-
-/**
- * Convert an i64 to a varint. Results in 1-10 bytes on the buffer.
- */
-static int l_toVarint64(lua_State *L) {
-  uint8_t data[10];
-  uint64_t n = lualongnumber_checklong(L, 1);
-  uint32_t wsize = 0;
-  luaL_Buffer buf;
-  luaL_buffinit(L, &buf);
-
-  while (1) {
-    if ((n & ~0x7FL) == 0) {
-      data[wsize++] = (int8_t)n;
-      break;
-    } else {
-      data[wsize++] = (int8_t)((n & 0x7F) | 0x80);
-      n >>= 7;
-    }
-  }
-
-  luaL_addlstring(&buf, (void*)&data, wsize);
-  luaL_pushresult(&buf);
-  return 1;
-}
-
-/**
- * Convert a varint to i64.
- */
-static int l_fromVarint64(lua_State *L) {
-  int64_t result;
-  uint8_t byte = luaL_checknumber(L, 1);
-  int32_t shift = luaL_checknumber(L, 2);
-  uint64_t n = (uint64_t)lualongnumber_checklong(L, 3);
-  n |= (uint64_t)(byte & 0x7f) << shift;
-
-  if (!(byte & 0x80)) {
-    result = (int64_t)(n >> 1) ^ (uint64_t)(-(int64_t)(n & 1));
-    lua_pushnumber(L, 0);
-  } else {
-    result = n;
-    lua_pushnumber(L, 1);
-  }
-  lualongnumber_pushlong(L, &result);
-  return 2;
-}
-
-/**
- * To pack message type of compact protocol.
- */
-static int l_packMesgType(lua_State *L) {
-  int32_t version_n = luaL_checkinteger(L, 1);
-  int32_t version_mask = luaL_checkinteger(L, 2);
-  int32_t messagetype = luaL_checkinteger(L, 3);
-  int32_t type_shift_amount = luaL_checkinteger(L, 4);
-  int32_t type_mask = luaL_checkinteger(L, 5);
-  int32_t to_mesg_type = (version_n & version_mask) |
-    (((int32_t)messagetype << type_shift_amount) & type_mask);
-  lua_pushnumber(L, to_mesg_type);
-  return 1;
-}
-
-static const struct luaL_Reg lua_bpack[] = {
-  {"bpack", l_bpack},
-  {"bunpack", l_bunpack},
-  {"i32ToZigzag", l_i32ToZigzag},
-  {"i64ToZigzag", l_i64ToZigzag},
-  {"zigzagToI32", l_zigzagToI32},
-  {"zigzagToI64", l_zigzagToI64},
-  {"toVarint32", l_toVarint32},
-  {"toVarint64", l_toVarint64},
-  {"fromVarint64", l_fromVarint64},
-  {"packMesgType", l_packMesgType},
-  {NULL, NULL}
-};
-
-int luaopen_libluabpack(lua_State *L) {
-  luaL_register(L, "libluabpack", lua_bpack);
-  return 1;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/src/lualongnumber.c b/vendor/git.apache.org/thrift.git/lib/lua/src/lualongnumber.c
deleted file mode 100644
index 9001e4a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/src/lualongnumber.c
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-#include <lua.h>
-#include <lauxlib.h>
-#include <stdlib.h>
-#include <math.h>
-#include <inttypes.h>
-#include <string.h>
-
-extern const char * LONG_NUM_TYPE;
-extern int64_t lualongnumber_checklong(lua_State *L, int index);
-extern int64_t lualongnumber_pushlong(lua_State *L, int64_t *val);
-
-////////////////////////////////////////////////////////////////////////////////
-
-static void l_serialize(char *buf, int len, int64_t val) {
-  snprintf(buf, len, "%"PRId64, val);
-}
-
-static int64_t l_deserialize(const char *buf) {
-  int64_t data;
-  int rv;
-  // Support hex prefixed with '0x'
-  if (strstr(buf, "0x") == buf) {
-    rv = sscanf(buf, "%"PRIx64, &data);
-  } else {
-    rv = sscanf(buf, "%"PRId64, &data);
-  }
-  if (rv == 1) {
-    return data;
-  }
-  return 0; // Failed
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-static int l_new(lua_State *L) {
-  int64_t val;
-  const char *str = NULL;
-  if (lua_type(L, 1) == LUA_TSTRING) {
-    str = lua_tostring(L, 1);
-    val = l_deserialize(str);
-  } else if (lua_type(L, 1) == LUA_TNUMBER) {
-    val = (int64_t)lua_tonumber(L, 1);
-    str = (const char *)1;
-  }
-  lualongnumber_pushlong(L, (str ? &val : NULL));
-  return 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// a + b
-static int l_add(lua_State *L) {
-  int64_t a, b, c;
-  a = lualongnumber_checklong(L, 1);
-  b = lualongnumber_checklong(L, 2);
-  c = a + b;
-  lualongnumber_pushlong(L, &c);
-  return 1;
-}
-
-// a / b
-static int l_div(lua_State *L) {
-  int64_t a, b, c;
-  a = lualongnumber_checklong(L, 1);
-  b = lualongnumber_checklong(L, 2);
-  c = a / b;
-  lualongnumber_pushlong(L, &c);
-  return 1;
-}
-
-// a == b (both a and b are lualongnumber's)
-static int l_eq(lua_State *L) {
-  int64_t a, b;
-  a = lualongnumber_checklong(L, 1);
-  b = lualongnumber_checklong(L, 2);
-  lua_pushboolean(L, (a == b ? 1 : 0));
-  return 1;
-}
-
-// garbage collection
-static int l_gc(lua_State *L) {
-  lua_pushnil(L);
-  lua_setmetatable(L, 1);
-  return 0;
-}
-
-// a < b
-static int l_lt(lua_State *L) {
-  int64_t a, b;
-  a = lualongnumber_checklong(L, 1);
-  b = lualongnumber_checklong(L, 2);
-  lua_pushboolean(L, (a < b ? 1 : 0));
-  return 1;
-}
-
-// a <= b
-static int l_le(lua_State *L) {
-  int64_t a, b;
-  a = lualongnumber_checklong(L, 1);
-  b = lualongnumber_checklong(L, 2);
-  lua_pushboolean(L, (a <= b ? 1 : 0));
-  return 1;
-}
-
-// a % b
-static int l_mod(lua_State *L) {
-  int64_t a, b, c;
-  a = lualongnumber_checklong(L, 1);
-  b = lualongnumber_checklong(L, 2);
-  c = a % b;
-  lualongnumber_pushlong(L, &c);
-  return 1;
-}
-
-// a * b
-static int l_mul(lua_State *L) {
-  int64_t a, b, c;
-  a = lualongnumber_checklong(L, 1);
-  b = lualongnumber_checklong(L, 2);
-  c = a * b;
-  lualongnumber_pushlong(L, &c);
-  return 1;
-}
-
-// a ^ b
-static int l_pow(lua_State *L) {
-  long double a, b;
-  int64_t c;
-  a = (long double)lualongnumber_checklong(L, 1);
-  b = (long double)lualongnumber_checklong(L, 2);
-  c = (int64_t)pow(a, b);
-  lualongnumber_pushlong(L, &c);
-  return 1;
-}
-
-// a - b
-static int l_sub(lua_State *L) {
-  int64_t a, b, c;
-  a = lualongnumber_checklong(L, 1);
-  b = lualongnumber_checklong(L, 2);
-  c = a - b;
-  lualongnumber_pushlong(L, &c);
-  return 1;
-}
-
-// tostring()
-static int l_tostring(lua_State *L) {
-  int64_t a;
-  char str[256];
-  l_serialize(str, 256, lualongnumber_checklong(L, 1));
-  lua_pushstring(L, str);
-  return 1;
-}
-
-// -a
-static int l_unm(lua_State *L) {
-  int64_t a, c;
-  a = lualongnumber_checklong(L, 1);
-  c = -a;
-  lualongnumber_pushlong(L, &c);
-  return 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-static const luaL_Reg methods[] = {
-  {"__add", l_add},
-  {"__div", l_div},
-  {"__eq", l_eq},
-  {"__gc", l_gc},
-  {"__lt", l_lt},
-  {"__le", l_le},
-  {"__mod", l_mod},
-  {"__mul", l_mul},
-  {"__pow", l_pow},
-  {"__sub", l_sub},
-  {"__tostring", l_tostring},
-  {"__unm", l_unm},
-  {NULL, NULL},
-};
-
-static const luaL_Reg funcs[] = {
-  {"new", l_new},
-  {NULL, NULL}
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-static void set_methods(lua_State *L,
-  const char *metatablename,
-  const struct luaL_Reg *methods) {
-  luaL_getmetatable(L, metatablename);   // mt
-  // No need for a __index table since everything is __*
-  for (; methods->name; methods++) {
-    lua_pushstring(L, methods->name);    // mt, "name"
-    lua_pushcfunction(L, methods->func); // mt, "name", func
-    lua_rawset(L, -3);                   // mt
-  }
-  lua_pop(L, 1);
-}
-
-LUALIB_API int luaopen_liblualongnumber(lua_State *L) {
-  luaL_newmetatable(L, LONG_NUM_TYPE);
-  lua_pop(L, 1);
-  set_methods(L, LONG_NUM_TYPE, methods);
-
-  luaL_register(L, "liblualongnumber", funcs);
-  return 1;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/src/luasocket.c b/vendor/git.apache.org/thrift.git/lib/lua/src/luasocket.c
deleted file mode 100644
index d483510..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/src/luasocket.c
+++ /dev/null
@@ -1,380 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-#include <lua.h>
-#include <lauxlib.h>
-
-#include <unistd.h>
-#include "string.h"
-#include "socket.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-static const char *SOCKET_ANY     = "__thrift_socket_any";
-static const char *SOCKET_CONN    = "__thrift_socket_connected";
-
-static const char *SOCKET_GENERIC = "__thrift_socket_generic";
-static const char *SOCKET_CLIENT  = "__thrift_socket_client";
-static const char *SOCKET_SERVER  = "__thrift_socket_server";
-
-static const char *DEFAULT_HOST   = "localhost";
-
-typedef struct __t_tcp {
-  t_socket sock;
-  int timeout; // Milliseconds
-} t_tcp;
-typedef t_tcp *p_tcp;
-
-////////////////////////////////////////////////////////////////////////////////
-// Util
-
-static void throw_argerror(lua_State *L, int index, const char *expected) {
-  char msg[256];
-  sprintf(msg, "%s expected, got %s", expected, luaL_typename(L, index));
-  luaL_argerror(L, index, msg);
-}
-
-static void *checkgroup(lua_State *L, int index, const char *groupname) {
-  if (!lua_getmetatable(L, index)) {
-    throw_argerror(L, index, groupname);
-  }
-
-  lua_pushstring(L, groupname);
-  lua_rawget(L, -2);
-  if (lua_isnil(L, -1)) {
-    lua_pop(L, 2);
-    throw_argerror(L, index, groupname);
-  } else {
-    lua_pop(L, 2);
-    return lua_touserdata(L, index);
-  }
-  return NULL; // Not reachable
-}
-
-static void *checktype(lua_State *L, int index, const char *typename) {
-  if (strcmp(typename, SOCKET_ANY) == 0 ||
-      strcmp(typename, SOCKET_CONN) == 0) {
-    return checkgroup(L, index, typename);
-  } else {
-    return luaL_checkudata(L, index, typename);
-  }
-}
-
-static void settype(lua_State *L, int index, const char *typename) {
-  luaL_getmetatable(L, typename);
-  lua_setmetatable(L, index);
-}
-
-#define LUA_SUCCESS_RETURN(L) \
-  lua_pushnumber(L, 1); \
-  return 1
-
-#define LUA_CHECK_RETURN(L, err) \
-  if (err) { \
-    lua_pushnil(L); \
-    lua_pushstring(L, err); \
-    return 2; \
-  } \
-  LUA_SUCCESS_RETURN(L)
-
-////////////////////////////////////////////////////////////////////////////////
-
-static int l_socket_create(lua_State *L);
-static int l_socket_destroy(lua_State *L);
-static int l_socket_settimeout(lua_State *L);
-static int l_socket_getsockinfo(lua_State *L);
-
-static int l_socket_accept(lua_State *L);
-static int l_socket_listen(lua_State *L);
-
-static int l_socket_create_and_connect(lua_State *L);
-static int l_socket_connect(lua_State *L);
-static int l_socket_send(lua_State *L);
-static int l_socket_receive(lua_State *L);
-
-////////////////////////////////////////////////////////////////////////////////
-
-static const struct luaL_Reg methods_generic[] = {
-  {"destroy",     l_socket_destroy},
-  {"settimeout",  l_socket_settimeout},
-  {"getsockinfo", l_socket_getsockinfo},
-  {"listen",      l_socket_listen},
-  {"connect",     l_socket_connect},
-  {NULL, NULL}
-};
-
-static const struct luaL_Reg methods_server[] = {
-  {"destroy",     l_socket_destroy},
-  {"getsockinfo", l_socket_getsockinfo},
-  {"accept",      l_socket_accept},
-  {"send",        l_socket_send},
-  {"receive",     l_socket_receive},
-  {NULL, NULL}
-};
-
-static const struct luaL_Reg methods_client[] = {
-  {"destroy",     l_socket_destroy},
-  {"settimeout",  l_socket_settimeout},
-  {"getsockinfo", l_socket_getsockinfo},
-  {"send",        l_socket_send},
-  {"receive",     l_socket_receive},
-  {NULL, NULL}
-};
-
-static const struct luaL_Reg funcs_luasocket[] = {
-  {"create",             l_socket_create},
-  {"create_and_connect", l_socket_create_and_connect},
-  {NULL, NULL}
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Check/enforce inheritance
-static void add_to_group(lua_State *L,
-                  const char *metatablename,
-                  const char *groupname) {
-  luaL_getmetatable(L, metatablename); // mt
-  lua_pushstring(L, groupname);        // mt, "name"
-  lua_pushboolean(L, 1);               // mt, "name", true
-  lua_rawset(L, -3);                   // mt
-  lua_pop(L, 1);
-}
-
-static void set_methods(lua_State *L,
-  const char *metatablename,
-  const struct luaL_Reg *methods) {
-  luaL_getmetatable(L, metatablename);   // mt
-  // Create the __index table
-  lua_pushstring(L, "__index");          // mt, "__index"
-  lua_newtable(L);                       // mt, "__index", t
-  for (; methods->name; methods++) {
-    lua_pushstring(L, methods->name);    // mt, "__index", t, "name"
-    lua_pushcfunction(L, methods->func); // mt, "__index", t, "name", func
-    lua_rawset(L, -3);                   // mt, "__index", t
-  }
-  lua_rawset(L, -3);                     // mt
-  lua_pop(L, 1);
-}
-
-int luaopen_libluasocket(lua_State *L) {
-  luaL_newmetatable(L, SOCKET_GENERIC);
-  luaL_newmetatable(L, SOCKET_CLIENT);
-  luaL_newmetatable(L, SOCKET_SERVER);
-  lua_pop(L, 3);
-  add_to_group(L, SOCKET_GENERIC, SOCKET_ANY);
-  add_to_group(L, SOCKET_CLIENT, SOCKET_ANY);
-  add_to_group(L, SOCKET_SERVER, SOCKET_ANY);
-  add_to_group(L, SOCKET_CLIENT, SOCKET_CONN);
-  add_to_group(L, SOCKET_SERVER, SOCKET_CONN);
-  set_methods(L, SOCKET_GENERIC, methods_generic);
-  set_methods(L, SOCKET_CLIENT, methods_client);
-  set_methods(L, SOCKET_SERVER, methods_server);
-
-  luaL_register(L, "luasocket", funcs_luasocket);
-  return 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// General
-
-// sock,err create(bind_host, bind_port)
-// sock,err create(bind_host) -> any port
-// sock,err create() -> any port on localhost
-static int l_socket_create(lua_State *L) {
-  const char *err;
-  t_socket sock;
-  const char *addr = lua_tostring(L, 1);
-  if (!addr) {
-    addr = DEFAULT_HOST;
-  }
-  unsigned short port = lua_tonumber(L, 2);
-  err = tcp_create(&sock);
-  if (!err) {
-    err = tcp_bind(&sock, addr, port); // bind on create
-    if (err) {
-      tcp_destroy(&sock);
-    } else {
-      p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
-      settype(L, -2, SOCKET_GENERIC);
-      socket_setnonblocking(&sock);
-      tcp->sock = sock;
-      tcp->timeout = 0;
-      return 1; // Return userdata
-    }
-  }
-  LUA_CHECK_RETURN(L, err);
-}
-
-// destroy()
-static int l_socket_destroy(lua_State *L) {
-  p_tcp tcp = (p_tcp) checktype(L, 1, SOCKET_ANY);
-  const char *err = tcp_destroy(&tcp->sock);
-  LUA_CHECK_RETURN(L, err);
-}
-
-// send(socket, data)
-static int l_socket_send(lua_State *L) {
-  p_tcp self = (p_tcp) checktype(L, 1, SOCKET_CONN);
-  p_tcp tcp = (p_tcp) checktype(L, 2, SOCKET_CONN);
-  size_t len;
-  const char *data = luaL_checklstring(L, 3, &len);
-  const char *err =
-    tcp_send(&tcp->sock, data, len, tcp->timeout);
-  LUA_CHECK_RETURN(L, err);
-}
-
-#define LUA_READ_STEP 8192
-static int l_socket_receive(lua_State *L) {
-  p_tcp self = (p_tcp) checktype(L, 1, SOCKET_CONN);
-  p_tcp handle = (p_tcp) checktype(L, 2, SOCKET_CONN);
-  size_t len = luaL_checknumber(L, 3);
-  char buf[LUA_READ_STEP];
-  const char *err = NULL;
-  int received;
-  size_t got = 0, step = 0;
-  luaL_Buffer b;
-
-  luaL_buffinit(L, &b);
-  do {
-    step = (LUA_READ_STEP < len - got ? LUA_READ_STEP : len - got);
-    err = tcp_raw_receive(&handle->sock, buf, step, self->timeout, &received);
-    if (err == NULL) {
-      luaL_addlstring(&b, buf, received);
-      got += received;
-    }
-  } while (err == NULL && got < len);
-
-  if (err) {
-    lua_pushnil(L);
-    lua_pushstring(L, err);
-    return 2;
-  }
-  luaL_pushresult(&b);
-  return 1;
-}
-
-// settimeout(timeout)
-static int l_socket_settimeout(lua_State *L) {
-  p_tcp self = (p_tcp) checktype(L, 1, SOCKET_ANY);
-  int timeout = luaL_checknumber(L, 2);
-  self->timeout = timeout;
-  LUA_SUCCESS_RETURN(L);
-}
-
-// table getsockinfo()
-static int l_socket_getsockinfo(lua_State *L) {
-  char buf[256];
-  short port = 0;
-  p_tcp tcp = (p_tcp) checktype(L, 1, SOCKET_ANY);
-  if (socket_get_info(&tcp->sock, &port, buf, 256) == SUCCESS) {
-    lua_newtable(L);                    // t
-    lua_pushstring(L, "host");          // t, "host"
-    lua_pushstring(L, buf);             // t, "host", buf
-    lua_rawset(L, -3);                  // t
-    lua_pushstring(L, "port");          // t, "port"
-    lua_pushnumber(L, port);            // t, "port", port
-    lua_rawset(L, -3);                  // t
-    return 1;
-  }
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Server
-
-// accept()
-static int l_socket_accept(lua_State *L) {
-  const char *err;
-  p_tcp self = (p_tcp) checktype(L, 1, SOCKET_SERVER);
-  t_socket sock;
-  err = tcp_accept(&self->sock, &sock, self->timeout);
-  if (!err) { // Success
-    // Create a reference to the client
-    p_tcp client = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
-    settype(L, 2, SOCKET_CLIENT);
-    socket_setnonblocking(&sock);
-    client->sock = sock;
-    client->timeout = self->timeout;
-    return 1;
-  }
-  LUA_CHECK_RETURN(L, err);
-}
-
-static int l_socket_listen(lua_State *L) {
-  const char* err;
-  p_tcp tcp = (p_tcp) checktype(L, 1, SOCKET_GENERIC);
-  int backlog = 10;
-  err = tcp_listen(&tcp->sock, backlog);
-  if (!err) {
-    // Set the current as a server
-    settype(L, 1, SOCKET_SERVER); // Now a server
-  }
-  LUA_CHECK_RETURN(L, err);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Client
-
-// create_and_connect(host, port, timeout)
-extern double __gettime();
-static int l_socket_create_and_connect(lua_State *L) {
-  const char* err = NULL;
-  double end;
-  t_socket sock;
-  const char *host = luaL_checkstring(L, 1);
-  unsigned short port = luaL_checknumber(L, 2);
-  int timeout = luaL_checknumber(L, 3);
-
-  // Create and connect loop for timeout milliseconds
-  end = __gettime() + timeout/1000;
-  do {
-    // Create the socket
-    err = tcp_create(&sock);
-    if (!err) {
-        // Connect
-        err = tcp_connect(&sock, host, port, timeout);
-        if (err) {
-          tcp_destroy(&sock);
-          usleep(100000); // sleep for 100ms
-        } else {
-          p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
-          settype(L, -2, SOCKET_CLIENT);
-          socket_setnonblocking(&sock);
-          tcp->sock = sock;
-          tcp->timeout = timeout;
-          return 1; // Return userdata
-        }
-    }
-  } while (err && __gettime() < end);
-
-  LUA_CHECK_RETURN(L, err);
-}
-
-// connect(host, port)
-static int l_socket_connect(lua_State *L) {
-  const char *err;
-  p_tcp tcp = (p_tcp) checktype(L, 1, SOCKET_GENERIC);
-  const char *host = luaL_checkstring(L, 2);
-  unsigned short port = luaL_checknumber(L, 3);
-  err = tcp_connect(&tcp->sock, host, port, tcp->timeout);
-  if (!err) {
-    settype(L, 1, SOCKET_CLIENT); // Now a client
-  }
-  LUA_CHECK_RETURN(L, err);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/src/socket.h b/vendor/git.apache.org/thrift.git/lib/lua/src/socket.h
deleted file mode 100644
index 8019ffe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/src/socket.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-#ifndef LUA_THRIFT_SOCKET_H
-#define LUA_THRIFT_SOCKET_H
-
-#include <sys/socket.h>
-
-#ifdef _WIN32
-// SOL
-#else
-typedef int t_socket;
-typedef t_socket* p_socket;
-#endif
-
-// Error Codes
-enum {
-  SUCCESS = 0,
-  TIMEOUT = -1,
-  CLOSED = -2,
-};
-typedef int T_ERRCODE;
-
-static const char * TIMEOUT_MSG = "Timeout";
-static const char * CLOSED_MSG = "Connection Closed";
-
-typedef struct sockaddr t_sa;
-typedef t_sa * p_sa;
-
-T_ERRCODE socket_create(p_socket sock, int domain, int type, int protocol);
-T_ERRCODE socket_destroy(p_socket sock);
-T_ERRCODE socket_bind(p_socket sock, p_sa addr, int addr_len);
-T_ERRCODE socket_get_info(p_socket sock, short *port, char *buf, size_t len);
-T_ERRCODE socket_send(p_socket sock, const char *data, size_t len, int timeout);
-T_ERRCODE socket_recv(p_socket sock, char *data, size_t len, int timeout,
-                      int *received);
-
-void socket_setblocking(p_socket sock);
-void socket_setnonblocking(p_socket sock);
-
-T_ERRCODE socket_accept(p_socket sock, p_socket sibling,
-                        p_sa addr, socklen_t *addr_len, int timeout);
-T_ERRCODE socket_listen(p_socket sock, int backlog);
-
-T_ERRCODE socket_connect(p_socket sock, p_sa addr, int addr_len, int timeout);
-
-const char * tcp_create(p_socket sock);
-const char * tcp_destroy(p_socket sock);
-const char * tcp_bind(p_socket sock, const char *host, unsigned short port);
-const char * tcp_send(p_socket sock, const char *data, size_t w_len,
-                      int timeout);
-const char * tcp_receive(p_socket sock, char *data, size_t r_len, int timeout);
-const char * tcp_raw_receive(p_socket sock, char * data, size_t r_len,
-                             int timeout, int *received);
-
-const char * tcp_listen(p_socket sock, int backlog);
-const char * tcp_accept(p_socket sock, p_socket client, int timeout);
-
-const char * tcp_connect(p_socket sock, const char *host, unsigned short port,
-                         int timeout);
-
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/lua/src/usocket.c b/vendor/git.apache.org/thrift.git/lib/lua/src/usocket.c
deleted file mode 100644
index 864fa36..0000000
--- a/vendor/git.apache.org/thrift.git/lib/lua/src/usocket.c
+++ /dev/null
@@ -1,370 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <stdio.h> // TODO REMOVE
-
-#include "socket.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// Private
-
-// Num seconds since Jan 1 1970 (UTC)
-#ifdef _WIN32
-// SOL
-#else
-  double __gettime() {
-    struct timeval v;
-    gettimeofday(&v, (struct timezone*) NULL);
-    return v.tv_sec + v.tv_usec/1.0e6;
-  }
-#endif
-
-#define WAIT_MODE_R  1
-#define WAIT_MODE_W  2
-#define WAIT_MODE_C  (WAIT_MODE_R|WAIT_MODE_W)
-T_ERRCODE socket_wait(p_socket sock, int mode, int timeout) {
-  int ret = 0;
-  fd_set rfds, wfds;
-  struct timeval tv;
-  double end, t;
-  if (!timeout) {
-    return TIMEOUT;
-  }
-
-  end = __gettime() + timeout/1000;
-  do {
-    FD_ZERO(&rfds);
-    FD_ZERO(&wfds);
-
-    // Specify what I/O operations we care about
-    if (mode & WAIT_MODE_R) {
-      FD_SET(*sock, &rfds);
-    }
-    if (mode & WAIT_MODE_W) {
-      FD_SET(*sock, &wfds);
-    }
-
-    // Check for timeout
-    t = end - __gettime();
-    if (t < 0.0) {
-      break;
-    }
-
-    // Wait
-    tv.tv_sec = (int)t;
-    tv.tv_usec = (int)((t - tv.tv_sec) * 1.0e6);
-    ret = select(*sock+1, &rfds, &wfds, NULL, &tv);
-  } while (ret == -1 && errno == EINTR);
-  if (ret == -1) {
-    return errno;
-  }
-
-  // Check for timeout
-  if (ret == 0) {
-    return TIMEOUT;
-  }
-
-  // Verify that we can actually read from the remote host
-  if (mode & WAIT_MODE_C && FD_ISSET(*sock, &rfds) &&
-      recv(*sock, (char*) &rfds, 0, 0) != 0) {
-    return errno;
-  }
-
-  return SUCCESS;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// General
-
-T_ERRCODE socket_create(p_socket sock, int domain, int type, int protocol) {
-  *sock = socket(domain, type, protocol);
-  if (*sock > 0) {
-    return SUCCESS;
-  } else {
-    return errno;
-  }
-}
-
-T_ERRCODE socket_destroy(p_socket sock) {
-  // TODO Figure out if I should be free-ing this
-  if (*sock > 0) {
-    socket_setblocking(sock);
-    close(*sock);
-    *sock = -1;
-  }
-  return SUCCESS;
-}
-
-T_ERRCODE socket_bind(p_socket sock, p_sa addr, int addr_len) {
-  int ret = SUCCESS;
-  socket_setblocking(sock);
-  if (bind(*sock, addr, addr_len)) {
-    ret = errno;
-  }
-  socket_setnonblocking(sock);
-  return ret;
-}
-
-T_ERRCODE socket_get_info(p_socket sock, short *port, char *buf, size_t len) {
-  struct sockaddr_storage sa;
-  memset(&sa, 0, sizeof(sa));
-  socklen_t addrlen = sizeof(sa);
-  int rc = getsockname(*sock, (struct sockaddr*)&sa, &addrlen);
-  if (!rc) {
-    if (sa.ss_family == AF_INET6) {
-      struct sockaddr_in6* sin = (struct sockaddr_in6*)(&sa);
-      if (!inet_ntop(AF_INET6, &sin->sin6_addr, buf, len)) {
-        return errno;
-      }
-      *port = ntohs(sin->sin6_port);
-    } else {
-      struct sockaddr_in* sin = (struct sockaddr_in*)(&sa);
-      if (!inet_ntop(AF_INET, &sin->sin_addr, buf, len)) {
-        return errno;
-      }
-      *port = ntohs(sin->sin_port);
-    }
-    return SUCCESS;
-  }
-  return errno;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Server
-
-T_ERRCODE socket_accept(p_socket sock, p_socket client,
-                  p_sa addr, socklen_t *addrlen, int timeout) {
-  int err;
-  if (*sock < 0) {
-    return CLOSED;
-  }
-  do {
-    *client = accept(*sock, addr, addrlen);
-    if (*client > 0) {
-      return SUCCESS;
-    }
-    err = errno;
-  } while (err != EINTR);
-  if (err == EAGAIN || err == ECONNABORTED) {
-    return socket_wait(sock, WAIT_MODE_R, timeout);
-  }
-  return err;
-}
-
-T_ERRCODE socket_listen(p_socket sock, int backlog) {
-  int ret = SUCCESS;
-  socket_setblocking(sock);
-  if (listen(*sock, backlog)) {
-    ret = errno;
-  }
-  socket_setnonblocking(sock);
-  return ret;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Client
-
-T_ERRCODE socket_connect(p_socket sock, p_sa addr, int addr_len, int timeout) {
-  int err;
-  if (*sock < 0) {
-    return CLOSED;
-  }
-
-  do {
-    if (connect(*sock, addr, addr_len) == 0) {
-      return SUCCESS;
-    }
-  } while ((err = errno) == EINTR);
-  if (err != EINPROGRESS && err != EAGAIN) {
-    return err;
-  }
-  return socket_wait(sock, WAIT_MODE_C, timeout);
-}
-
-T_ERRCODE socket_send(
-  p_socket sock, const char *data, size_t len, int timeout) {
-  int err, put = 0;
-  if (*sock < 0) {
-    return CLOSED;
-  }
-  do {
-    put = send(*sock, data, len, 0);
-    if (put > 0) {
-      return SUCCESS;
-    }
-    err = errno;
-  } while (err != EINTR);
-
-  if (err == EAGAIN) {
-    return socket_wait(sock, WAIT_MODE_W, timeout);
-  }
-  return err;
-}
-
-T_ERRCODE socket_recv(
-  p_socket sock, char *data, size_t len, int timeout, int *received) {
-  int err, got = 0;
-  if (*sock < 0) {
-    return CLOSED;
-  }
-
-  int flags = fcntl(*sock, F_GETFL, 0);
-  do {
-    got = recv(*sock, data, len, 0);
-    if (got > 0) {
-      *received = got;
-      return SUCCESS;
-    }
-    err = errno;
-
-    // Connection has been closed by peer
-    if (got == 0) {
-      return CLOSED;
-    }
-  } while (err != EINTR);
-
-  if (err == EAGAIN) {
-    return socket_wait(sock, WAIT_MODE_R, timeout);
-  }
-  return err;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Util
-
-void socket_setnonblocking(p_socket sock) {
-  int flags = fcntl(*sock, F_GETFL, 0);
-  flags |= O_NONBLOCK;
-  fcntl(*sock, F_SETFL, flags);
-}
-
-void socket_setblocking(p_socket sock) {
-  int flags = fcntl(*sock, F_GETFL, 0);
-  flags &= (~(O_NONBLOCK));
-  fcntl(*sock, F_SETFL, flags);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TCP
-
-#define ERRORSTR_RETURN(err) \
-  if (err == SUCCESS) { \
-    return NULL; \
-  } else if (err == TIMEOUT) { \
-    return TIMEOUT_MSG; \
-  } else if (err == CLOSED) { \
-    return CLOSED_MSG; \
-  } \
-  return strerror(err)
-
-const char * tcp_create(p_socket sock) {
-  int err = socket_create(sock, AF_INET, SOCK_STREAM, 0);
-  ERRORSTR_RETURN(err);
-}
-
-const char * tcp_destroy(p_socket sock) {
-  int err = socket_destroy(sock);
-  ERRORSTR_RETURN(err);
-}
-
-const char * tcp_bind(p_socket sock, const char *host, unsigned short port) {
-  int err;
-  struct hostent *h;
-  struct sockaddr_in local;
-  memset(&local, 0, sizeof(local));
-  local.sin_family = AF_INET;
-  local.sin_addr.s_addr = htonl(INADDR_ANY);
-  local.sin_port = htons(port);
-  if (strcmp(host, "*") && !inet_aton(host, &local.sin_addr)) {
-    h = gethostbyname(host);
-    if (!h) {
-      return hstrerror(h_errno);
-    }
-    memcpy(&local.sin_addr,
-           (struct in_addr *)h->h_addr_list[0],
-           sizeof(struct in_addr));
-  }
-  err = socket_bind(sock, (p_sa) &local, sizeof(local));
-  ERRORSTR_RETURN(err);
-}
-
-const char * tcp_listen(p_socket sock, int backlog) {
-  int err = socket_listen(sock, backlog);
-  ERRORSTR_RETURN(err);
-}
-
-const char * tcp_accept(p_socket sock, p_socket client, int timeout) {
-  int err = socket_accept(sock, client, NULL, NULL, timeout);
-  ERRORSTR_RETURN(err);
-}
-
-const char * tcp_connect(p_socket sock,
-                         const char *host,
-                         unsigned short port,
-                         int timeout) {
-  int err;
-  struct hostent *h;
-  struct sockaddr_in remote;
-  memset(&remote, 0, sizeof(remote));
-  remote.sin_family = AF_INET;
-  remote.sin_port = htons(port);
-  if (strcmp(host, "*") && !inet_aton(host, &remote.sin_addr)) {
-    h = gethostbyname(host);
-    if (!h) {
-      return hstrerror(h_errno);
-    }
-    memcpy(&remote.sin_addr,
-           (struct in_addr *)h->h_addr_list[0],
-           sizeof(struct in_addr));
-  }
-  err = socket_connect(sock, (p_sa) &remote, sizeof(remote), timeout);
-  ERRORSTR_RETURN(err);
-}
-
-#define WRITE_STEP 8192
-const char * tcp_send(
-  p_socket sock, const char * data, size_t w_len, int timeout) {
-  int err;
-  size_t put = 0, step;
-  if (!w_len) {
-    return NULL;
-  }
-
-  do {
-    step = (WRITE_STEP < w_len - put ? WRITE_STEP : w_len - put);
-    err = socket_send(sock, data + put, step, timeout);
-    put += step;
-  } while (err == SUCCESS && put < w_len);
-  ERRORSTR_RETURN(err);
-}
-
-const char * tcp_raw_receive(
-  p_socket sock, char * data, size_t r_len, int timeout, int *received) {
-  int err = socket_recv(sock, data, r_len, timeout, received);
-  ERRORSTR_RETURN(err);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/Makefile.am b/vendor/git.apache.org/thrift.git/lib/nodejs/Makefile.am
deleted file mode 100755
index 6d785be..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-stubs: $(top_srcdir)/test/ThriftTest.thrift
-	$(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/ThriftTest.thrift
-
-deps: $(top_srcdir)/package.json
-	$(NPM) install --no-bin-links $(top_srcdir)/
-
-all-local: deps
-
-precross: deps stubs
-
-check: deps
-	cd $(top_srcdir) && $(NPM) test && cd lib/nodejs
-
-clean-local:
-	$(RM) -r test/gen-nodejs
-	$(RM) -r $(top_srcdir)/node_modules
-
-EXTRA_DIST = \
-	examples \
-	lib \
-	test \
-	coding_standards.md \
-	README.md
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/README.md b/vendor/git.apache.org/thrift.git/lib/nodejs/README.md
deleted file mode 100644
index 88499f7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-Thrift Node.js Library
-=========================
-
-License
--------
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-
-## Install
-
-    npm install thrift 
-
-## Thrift Compiler
-
-You can compile IDL sources for Node.js with the following command:
-
-    thrift --gen js:node thrift_file
-
-## Cassandra Client Example:
-
-Here is a Cassandra example:
-
-    var thrift = require('thrift'),
-        Cassandra = require('./gen-nodejs/Cassandra')
-        ttypes = require('./gen-nodejs/cassandra_types');
-
-    var connection = thrift.createConnection("localhost", 9160),
-        client = thrift.createClient(Cassandra, connection);
-
-    connection.on('error', function(err) {
-      console.error(err);
-    });
-
-    client.get_slice("Keyspace", "key", new ttypes.ColumnParent({column_family: "ExampleCF"}), new ttypes.SlicePredicate({slice_range: new ttypes.SliceRange({start: '', finish: ''})}), ttypes.ConsistencyLevel.ONE, function(err, data) {
-      if (err) {
-        // handle err
-      } else {
-        // data == [ttypes.ColumnOrSuperColumn, ...]
-      }
-      connection.end();
-    });
-
-<a name="int64"></a>
-## Int64
-
-Since JavaScript represents all numbers as doubles, int64 values cannot be accurately represented naturally. To solve this, int64 values in responses will be wrapped with Thirft.Int64 objects. The Int64 implementation used is [broofa/node-int64](https://github.com/broofa/node-int64).
-
-## Client and server examples
-
-Several example clients and servers are included in the thrift/lib/nodejs/examples folder and the cross language tutorial thrift/tutorial/nodejs folder.
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/nodejs/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/README.md b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/README.md
deleted file mode 100644
index 7350c10..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Thrift Node.js Examples
-
-## License
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-## Running the user example
-
-Generate the bindings:
-
-    ../../../compiler/cpp/thrift --gen js:node user.thrift
-    ../../../compiler/cpp/thrift --gen js:node --gen py hello.thrift
-
-To run the user example, first start up the server in one terminal:
-
-    NODE_PATH=../lib:../lib/thrift node server.js
-
-Now run the client:
-
-    NODE_PATH=../lib:../lib/thrift node client.js
-
-For an example using JavaScript in the browser to connect to
-a node.js server look at hello.html, hello.js and hello.thrift
-
-HTTP examples are provided also: httpClient.js and httpServer.js
-You can test HTTP cross platform with the httpServer.py Python server
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/client.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/client.js
deleted file mode 100644
index c83b342..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/client.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var thrift = require('thrift');
-
-var UserStorage = require('./gen-nodejs/UserStorage.js'),
-    ttypes = require('./gen-nodejs/user_types');
-
-var connection = thrift.createConnection('localhost', 9090),
-    client = thrift.createClient(UserStorage, connection);
-
-var user = new ttypes.UserProfile({uid: 1,
-                                   name: "Mark Slee",
-                                   blurb: "I'll find something to put here."});
-
-connection.on('error', function(err) {
-  console.error(err);
-});
-
-client.store(user, function(err, response) {
-  if (err) {
-    console.error(err);
-  } else {
-    console.log("client stored:", user.uid);
-    client.retrieve(user.uid, function(err, responseUser) {
-      if (err) {
-        console.error(err);
-      } else {
-        console.log("client retrieved:", responseUser.uid);
-        connection.end();
-      }
-    });
-  }
-});
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/client_multitransport.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/client_multitransport.js
deleted file mode 100644
index 1e37de3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/client_multitransport.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var thrift = require('thrift'),
-    ttransport = require('thrift/transport');
-
-var UserStorage = require('./gen-nodejs/UserStorage'),
-    ttypes = require('./gen-nodejs/user_types');
-
-var f_conn = thrift.createConnection('localhost', 9090), // default: framed
-    f_client = thrift.createClient(UserStorage, f_conn);
-var b_conn = thrift.createConnection('localhost', 9091, {transport: ttransport.TBufferedTransport}),
-    b_client = thrift.createClient(UserStorage, b_conn);
-var user1 = new ttypes.UserProfile({uid: 1,
-                                    name: "Mark Slee",
-                                    blurb: "I'll find something to put here."});
-var user2 = new ttypes.UserProfile({uid: 2,
-                                    name: "Satoshi Tagomori",
-                                    blurb: "ok, let's test with buffered transport."});
-
-f_conn.on('error', function(err) {
-  console.error("framed:", err);
-});
-
-f_client.store(user1, function(err, response) {
-  if (err) { console.error(err); return; }
-
-  console.log("stored:", user1.uid, " as ", user1.name);
-  b_client.retrieve(user1.uid, function(err, responseUser) {
-    if (err) { console.error(err); return; }
-    console.log("retrieved:", responseUser.uid, " as ", responseUser.name);
-  });
-});
-
-b_client.store(user2, function(err, response) {
-  if (err) { console.error(err); return; }
-
-  console.log("stored:", user2.uid, " as ", user2.name);
-  f_client.retrieve(user2.uid, function(err, responseUser) {
-    if (err) { console.error(err); return; }
-    console.log("retrieved:", responseUser.uid, " as ", responseUser.name);
-  });
-});
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.html b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.html
deleted file mode 100644
index fe85a7e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>Apache Thrift JavaScript Browser Client Demo</title>
-    <script src="thrift.js" type="text/javascript"></script>
-    <script src="gen-js/HelloSvc.js" type="text/javascript"></script>
-    <script src="gen-js/TimesTwo.js" type="text/javascript"></script>
-</head>
-<body>
-    <h1>Apache Thrift JavaScript Browser Client Demo</h1>
-    <p>This html file demonstrates Apache Thrift JavaScrpt RPC between a browser client to a node.js server. Clicking the buttons below will call the RPC functions hosted by the Apache Thrift server at localhost:8585. The file hello.js contains the JavaScript node.js server required. Here are the steps to get the example running:</p>
-    <ol>
-        <li>Install Node.js <pre><a href="http://nodejs.org">nodejs.org</a></pre></li>
-        <li>Install Apache Thrift for node (note that the node package manager will create the node_modules folder in the current directory so make sure to run npm from the same directory as hello.js so that the server can find the Thrift libraries. This example requires Apache Thrift 0.9.2+) <pre>$ npm install thrift</pre></li>
-        <li>Compile the hello.idl for JavaScript and Node.js (you'll need to have the Apache Thrift compiler installed for this step. This also needs to be executed in the same directory as hello.js because hello.js and hello.html look for the gen-nodejs and gen-js directories here.)<pre>$ thrift -gen js -gen js:node hello.thrift</pre></li>
-        <li>Run the node server in the directory with the hello.html file<pre>$ node hello.js</pre></li>
-        <li>Copy the Apache Thrift JavaScript library, thrift.js, into the directory with this html file.<pre>$ cp ...../thrift.js . (you should be able to use Bower to install the browser based Apache Thrift library in the near future.)</pre>
-        <li>Reload this page in a browser through the node server using using the URL: <pre>http://localhost:8585/hello.html</pre>then click a button below to make an RPC call</li>
-    </ol>
-    <button id="btn">Get Message from Node Server</button>
-    <button id="btnDbl">Double 25</button>
-    <script type="text/javascript">
-        document.getElementById("btn").addEventListener("click", getMessage, false);
-
-        function getMessage() {
-            var transport = new Thrift.TXHRTransport("http://localhost:8585/hello");
-            var protocol  = new Thrift.TJSONProtocol(transport);
-            var client = new HelloSvcClient(protocol);
-            var msg = client.hello_func();
-            document.getElementById("output").innerHTML = msg;
-        }
-
-        document.getElementById("btnDbl").addEventListener("click", dblMessage, false);
-
-        function dblMessage() {
-            var transport = new Thrift.TXHRTransport("http://localhost:8585/dbl");
-            var protocol  = new Thrift.TJSONProtocol(transport);
-            var client = new TimesTwoClient(protocol);
-            var val = client.dbl(25);
-            document.getElementById("output2").innerHTML = val;
-        }
-    </script>
-    <h2>Server Response: <div id="output"></div></h2>
-    <h2>Server Dbl: <div id="output2"></div></h2>
-</body> 
-</html>
-
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.js
deleted file mode 100644
index 8b7c4e4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var thrift = require('thrift');
-var HelloSvc = require('./gen-nodejs/HelloSvc.js');
-var TimesTwoSvc = require('./gen-nodejs/TimesTwo.js');
-
-var helloHandler = {
-	hello_func: function(result) {
-		this.call_counter = this.call_counter || 0;
-		console.log("Client call: " + (++this.call_counter));
-		result(null, "Hello Apache Thrift for JavaScript " + this.call_counter);
-	}
-}
-
-var timesTwoHandler = {
-	dbl: function(val, result) {
-		console.log("Client call: " + val);
-		result(null, val * 2);
-	}
-}
-
-var helloService = {
-	transport: thrift.TBufferedTransport,
-	protocol: thrift.TJSONProtocol,
-	processor: HelloSvc,
-	handler: helloHandler
-};
-
-var dblService = {
-	transport: thrift.TBufferedTransport,
-	protocol: thrift.TJSONProtocol,
-	processor: TimesTwoSvc,
-	handler: timesTwoHandler
-};
-
-var ServerOptions = {
-	files: ".",
-	services: {
-		"/hello": helloService,
-		"/dbl": dblService,
-	}
-}
-
-var server = thrift.createWebServer(ServerOptions);
-var port = 8585;
-server.listen(port);
-console.log("Http/Thrift Server running on port: " + port);
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.thrift b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.thrift
deleted file mode 100644
index deaf5a5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/hello.thrift
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-service HelloSvc {
-    string hello_func(),
-}
-
-service TimesTwo {
-    i64 dbl(1: i64 val),
-}
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpClient.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpClient.js
deleted file mode 100644
index 19cc0c3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpClient.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var thrift = require('thrift');
-var helloSvc = require('./gen-nodejs/HelloSvc.js');
-
-var options = {
-   transport: thrift.TBufferedTransport,
-   protocol: thrift.TJSONProtocol,
-   path: "/hello",
-   headers: {"Connection": "close"},
-   https: false
-};
-
-var connection = thrift.createHttpConnection("localhost", 9090, options);
-var client = thrift.createHttpClient(helloSvc, connection);
-
-connection.on("error", function(err) {
-   console.log("Error: " + err);
-});
-
-client.hello_func(function(error, result) {
-   console.log("Msg from server: " + result);
-});
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpServer.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpServer.js
deleted file mode 100644
index acae136..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpServer.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var thrift = require('thrift');                 	
-var helloSvc = require('./gen-nodejs/HelloSvc');
-
-//ServiceHandler: Implement the hello service 
-var helloHandler = {
-  hello_func: function (result) {
-    console.log("Received Hello call");
-    result(null, "Hello from Node.js");
-  }
-};
-
-//ServiceOptions: The I/O stack for the service
-var helloSvcOpt = {                       		
-    handler: helloHandler,                      	
-    processor: helloSvc,                         	
-    protocol: thrift.TJSONProtocol,                 
-    transport: thrift.TBufferedTransport 		
-};                                  
-
-//ServerOptions: Define server features
-var serverOpt = {                          	
-   services: {                         
-      "/hello": helloSvcOpt                 
-   }                               
-}                                   
-
-//Create and start the web server 
-var port = 9090;                            		
-thrift.createWebServer(serverOpt).listen(port);                        		
-console.log("Http/Thrift Server running on port: " + port);
-
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpServer.py b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpServer.py
deleted file mode 100644
index b8ba586..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/httpServer.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import sys
-sys.path.append('gen-py')
-
-from hello import HelloSvc
-from thrift.protocol import TJSONProtocol
-from thrift.server import THttpServer
-
-class HelloSvcHandler:
-  def hello_func(self):
-    print "Hello Called"
-    return "hello from Python"
-
-processor = HelloSvc.Processor(HelloSvcHandler())
-protoFactory = TJSONProtocol.TJSONProtocolFactory()
-port = 9090
-server = THttpServer.THttpServer(processor, ("localhost", port), protoFactory)
-print "Python server running on port " + str(port)
-server.serve()
-
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/parse.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/parse.js
deleted file mode 100644
index 168a1ae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/parse.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
-
-  This is a standalone deserialize/parse example if you just want to deserialize
-  thrift decoupled from cassandra server
-
-  1.  acquire thrift template specification files from who ever built it (eg: EXAMPLE.thrift)
-
-  2.  Install thrift on local machine
-
-  3.  generate thrift clients for nodejs using template specification files (#1)
-      thrift --gen js:node schema/EXAMPLE.thrift
-
-      This creates creates gen-node.js directory containing a new file, GENERATED.js
-
-  4.  Inside GENERATED.js is a class you will want to instanciate.  Find this class name and plug 
-      it into the example code below  (ie, "YOUR_CLASS_NAME")
- */
-
-function parseThrift(thriftEncodedData, callback) {
-  var thrift = require('thrift');
-  var transport = new thrift.TFramedTransport(thriftEncodedData);
-  var protocol  = new thrift.TBinaryProtocol(transport);
-
-  var clientClass = require('../gen-nodejs/GENERATED').YOUR_CLASS_NAME;
-  var client = new clientClass();
-  client.read(protocol);
-  callback(null, client);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server.js
deleted file mode 100644
index 1c482fe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var thrift = require('thrift');
-
-var UserStorage = require('./gen-nodejs/UserStorage.js'),
-    ttypes = require('./gen-nodejs/user_types');
-
-var users = {};
-
-var server = thrift.createServer(UserStorage, {
-  store: function(user, result) {
-    console.log("server stored:", user.uid);
-    users[user.uid] = user;
-    result(null);
-  },
-
-  retrieve: function(uid, result) {
-    console.log("server retrieved:", uid);
-    result(null, users[uid]);
-  },
-});
-
-server.listen(9090);
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server_http.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server_http.js
deleted file mode 100644
index ef2dc83..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server_http.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var connect = require('connect');
-var thrift = require('thrift');
-
-var UserStorage = require('./gen-nodejs/UserStorage'),
-    ttypes = require('./gen-nodejs/user_types');
-
-var users = {};
-
-var store = function(user, result) {
-  console.log("stored:", user.uid);
-  users[user.uid] = user;
-  result(null);
-};
-var retrieve = function(uid, result) {
-  console.log("retrieved:", uid);
-  result(null, users[uid]);
-};
-
-var server_http = thrift.createHttpServer(UserStorage, {
-  store: store,
-  retrieve: retrieve
-});
-server_http.listen(9090);
-
-var server_connect = connect(thrift.httpMiddleware(UserStorage, {
- store: store,
- retrieve: retrieve
-}));
-server_http.listen(9091);
-
-var server_connect_json = connect(thrift.httpMiddleware(UserStorage, {
- store: store,
- retrieve: retrieve
-}, {protocol: thrift.TJSONProtocol}));
-server_connect_json.listen(9092);
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server_multitransport.js b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server_multitransport.js
deleted file mode 100644
index a348e68..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/server_multitransport.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var thrift = require('thrift'),
-    ttransport = require('thrift/transport');
-
-var UserStorage = require('./gen-nodejs/UserStorage'),
-    ttypes = require('./gen-nodejs/user_types');
-
-var users = {};
-
-var store = function(user, result) {
-  console.log("stored:", user.uid);
-  users[user.uid] = user;
-  result(null);
-};
-var retrieve = function(uid, result) {
-  console.log("retrieved:", uid);
-  result(null, users[uid]);
-};
-
-var server_framed = thrift.createServer(UserStorage, {
-  store: store,
-  retrieve: retrieve
-});
-server_framed.listen(9090);
-var server_buffered = thrift.createServer(UserStorage, {
- store: store,
- retrieve: retrieve
-}, {transport: ttransport.TBufferedTransport});
-server_buffered.listen(9091);
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/user.thrift b/vendor/git.apache.org/thrift.git/lib/nodejs/examples/user.thrift
deleted file mode 100644
index d087fd4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/examples/user.thrift
+++ /dev/null
@@ -1,27 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-struct UserProfile {
-  1: i32 uid,
-  2: string name,
-  3: string blurb
-}
-
-service UserStorage {
-  void store(1: UserProfile user),
-  UserProfile retrieve(1: i32 uid)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/binary.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/binary.js
deleted file mode 100644
index 9813ffd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/binary.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var POW_8 = Math.pow(2, 8);
-var POW_16 = Math.pow(2, 16);
-var POW_24 = Math.pow(2, 24);
-var POW_32 = Math.pow(2, 32);
-var POW_40 = Math.pow(2, 40);
-var POW_48 = Math.pow(2, 48);
-var POW_52 = Math.pow(2, 52);
-var POW_1022 = Math.pow(2, 1022);
-
-exports.readByte = function(b){
-	return b > 127 ? b-256 : b;
-};
-
-exports.readI16 = function(buff, off) {
-  off = off || 0;
-  var v = buff[off + 1];
-  v += buff[off] << 8;
-  if (buff[off] & 128) {
-    v -= POW_16;
-  }
-  return v;
-};
-
-exports.readI32 = function(buff, off) {
-  off = off || 0;
-  var v = buff[off + 3];
-  v += buff[off + 2] << 8;
-  v += buff[off + 1] << 16;
-  v += buff[off] * POW_24;
-  if (buff[off] & 0x80) {
-    v -= POW_32;
-  }
-  return v;
-};
-
-exports.writeI16 = function(buff, v) {
-  buff[1] = v & 0xff;
-  v >>= 8;
-  buff[0] = v & 0xff;
-  return buff;
-};
-
-exports.writeI32 = function(buff, v) {
-  buff[3] = v & 0xff;
-  v >>= 8;
-  buff[2] = v & 0xff;
-  v >>= 8;
-  buff[1] = v & 0xff;
-  v >>= 8;
-  buff[0] = v & 0xff;
-  return buff;
-};
-
-exports.readDouble = function(buff, off) {
-  off = off || 0;
-  var signed = buff[off] & 0x80;
-  var e = (buff[off+1] & 0xF0) >> 4;
-  e += (buff[off] & 0x7F) << 4;
-
-  var m = buff[off+7];
-  m += buff[off+6] << 8;
-  m += buff[off+5] << 16;
-  m += buff[off+4] * POW_24;
-  m += buff[off+3] * POW_32;
-  m += buff[off+2] * POW_40;
-  m += (buff[off+1] & 0x0F) * POW_48;
-
-  switch (e) {
-    case 0:
-      e = -1022;
-      break;
-    case 2047:
-      return m ? NaN : (signed ? -Infinity : Infinity);
-    default:
-      m += POW_52;
-      e -= 1023;
-  }
-
-  if (signed) {
-    m *= -1;
-  }
-
-  return m * Math.pow(2, e - 52);
-};
-
-/*
- * Based on code from the jspack module:
- * http://code.google.com/p/jspack/
- */
-exports.writeDouble = function(buff, v) {
-  var m, e, c;
-
-  buff[0] = (v < 0 ? 0x80 : 0x00);
-
-  v = Math.abs(v);
-  if (v !== v) {
-    // NaN, use QNaN IEEE format
-    m = 2251799813685248;
-    e = 2047;
-  } else if (v === Infinity) {
-    m = 0;
-    e = 2047;
-  } else {
-    e = Math.floor(Math.log(v) / Math.LN2);
-    c = Math.pow(2, -e);
-    if (v * c < 1) {
-      e--;
-      c *= 2;
-    }
-
-    if (e + 1023 >= 2047)
-    {
-      // Overflow
-      m = 0;
-      e = 2047;
-    }
-    else if (e + 1023 >= 1)
-    {
-      // Normalized - term order matters, as Math.pow(2, 52-e) and v*Math.pow(2, 52) can overflow
-      m = (v*c-1) * POW_52;
-      e += 1023;
-    }
-    else
-    {
-      // Denormalized - also catches the '0' case, somewhat by chance
-      m = (v * POW_1022) * POW_52;
-      e = 0;
-    }
-  }
-
-  buff[1] = (e << 4) & 0xf0;
-  buff[0] |= (e >> 4) & 0x7f;
-
-  buff[7] = m & 0xff;
-  m = Math.floor(m / POW_8);
-  buff[6] = m & 0xff;
-  m = Math.floor(m / POW_8);
-  buff[5] = m & 0xff;
-  m = Math.floor(m / POW_8);
-  buff[4] = m & 0xff;
-  m >>= 8;
-  buff[3] = m & 0xff;
-  m >>= 8;
-  buff[2] = m & 0xff;
-  m >>= 8;
-  buff[1] |= m & 0x0f;
-
-  return buff;
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/binary_protocol.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/binary_protocol.js
deleted file mode 100644
index 6d3918e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/binary_protocol.js
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var log = require('./log');
-var binary = require('./binary');
-var Int64 = require('node-int64');
-var Thrift = require('./thrift');
-var Type = Thrift.Type;
-
-module.exports = TBinaryProtocol;
-
-// JavaScript supports only numeric doubles, therefore even hex values are always signed.
-// The largest integer value which can be represented in JavaScript is +/-2^53.
-// Bitwise operations convert numbers to 32 bit integers but perform sign extension
-// upon assigning values back to variables.
-var VERSION_MASK = -65536,   // 0xffff0000
-    VERSION_1 = -2147418112, // 0x80010000
-    TYPE_MASK = 0x000000ff;
-
-function TBinaryProtocol(trans, strictRead, strictWrite) {
-  this.trans = trans;
-  this.strictRead = (strictRead !== undefined ? strictRead : false);
-  this.strictWrite = (strictWrite !== undefined ? strictWrite : true);
-};
-
-TBinaryProtocol.prototype.flush = function() {
-  return this.trans.flush();
-};
-
-TBinaryProtocol.prototype.writeMessageBegin = function(name, type, seqid) {
-    if (this.strictWrite) {
-      this.writeI32(VERSION_1 | type);
-      this.writeString(name);
-      this.writeI32(seqid);
-    } else {
-      this.writeString(name);
-      this.writeByte(type);
-      this.writeI32(seqid);
-    }
-    // Record client seqid to find callback again
-    if (this._seqid) {
-      // TODO better logging log warning
-      log.warning('SeqId already set', { 'name': name });
-    } else {
-      this._seqid = seqid;
-      this.trans.setCurrSeqId(seqid);
-    }
-};
-
-TBinaryProtocol.prototype.writeMessageEnd = function() {
-    if (this._seqid) {
-        this._seqid = null;
-    } else {
-        log.warning('No seqid to unset');
-    }
-};
-
-TBinaryProtocol.prototype.writeStructBegin = function(name) {
-};
-
-TBinaryProtocol.prototype.writeStructEnd = function() {
-};
-
-TBinaryProtocol.prototype.writeFieldBegin = function(name, type, id) {
-  this.writeByte(type);
-  this.writeI16(id);
-};
-
-TBinaryProtocol.prototype.writeFieldEnd = function() {
-};
-
-TBinaryProtocol.prototype.writeFieldStop = function() {
-  this.writeByte(Type.STOP);
-};
-
-TBinaryProtocol.prototype.writeMapBegin = function(ktype, vtype, size) {
-  this.writeByte(ktype);
-  this.writeByte(vtype);
-  this.writeI32(size);
-};
-
-TBinaryProtocol.prototype.writeMapEnd = function() {
-};
-
-TBinaryProtocol.prototype.writeListBegin = function(etype, size) {
-  this.writeByte(etype);
-  this.writeI32(size);
-};
-
-TBinaryProtocol.prototype.writeListEnd = function() {
-};
-
-TBinaryProtocol.prototype.writeSetBegin = function(etype, size) {
-  this.writeByte(etype);
-  this.writeI32(size);
-};
-
-TBinaryProtocol.prototype.writeSetEnd = function() {
-};
-
-TBinaryProtocol.prototype.writeBool = function(bool) {
-  if (bool) {
-    this.writeByte(1);
-  } else {
-    this.writeByte(0);
-  }
-};
-
-TBinaryProtocol.prototype.writeByte = function(b) {
-  this.trans.write(new Buffer([b]));
-};
-
-TBinaryProtocol.prototype.writeI16 = function(i16) {
-  this.trans.write(binary.writeI16(new Buffer(2), i16));
-};
-
-TBinaryProtocol.prototype.writeI32 = function(i32) {
-  this.trans.write(binary.writeI32(new Buffer(4), i32));
-};
-
-TBinaryProtocol.prototype.writeI64 = function(i64) {
-  if (i64.buffer) {
-    this.trans.write(i64.buffer);
-  } else {
-    this.trans.write(new Int64(i64).buffer);
-  }
-};
-
-TBinaryProtocol.prototype.writeDouble = function(dub) {
-  this.trans.write(binary.writeDouble(new Buffer(8), dub));
-};
-
-TBinaryProtocol.prototype.writeStringOrBinary = function(name, encoding, arg) {
-  if (typeof(arg) === 'string') {
-    this.writeI32(Buffer.byteLength(arg, encoding));
-    this.trans.write(new Buffer(arg, encoding));
-  } else if ((arg instanceof Buffer) ||
-             (Object.prototype.toString.call(arg) == '[object Uint8Array]')) {
-    // Buffers in Node.js under Browserify may extend UInt8Array instead of
-    // defining a new object. We detect them here so we can write them
-    // correctly
-    this.writeI32(arg.length);
-    this.trans.write(arg);
-  } else {
-    throw new Error(name + ' called without a string/Buffer argument: ' + arg);
-  }
-};
-
-TBinaryProtocol.prototype.writeString = function(arg) {
-  this.writeStringOrBinary('writeString', 'utf8', arg);
-};
-
-TBinaryProtocol.prototype.writeBinary = function(arg) {
-  this.writeStringOrBinary('writeBinary', 'binary', arg);
-};
-
-TBinaryProtocol.prototype.readMessageBegin = function() {
-  var sz = this.readI32();
-  var type, name, seqid;
-
-  if (sz < 0) {
-    var version = sz & VERSION_MASK;
-    if (version != VERSION_1) {
-      console.log("BAD: " + version);
-      throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.BAD_VERSION, "Bad version in readMessageBegin: " + sz);
-    }
-    type = sz & TYPE_MASK;
-    name = this.readString();
-    seqid = this.readI32();
-  } else {
-    if (this.strictRead) {
-      throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.BAD_VERSION, "No protocol version header");
-    }
-    name = this.trans.read(sz);
-    type = this.readByte();
-    seqid = this.readI32();
-  }
-  return {fname: name, mtype: type, rseqid: seqid};
-};
-
-TBinaryProtocol.prototype.readMessageEnd = function() {
-};
-
-TBinaryProtocol.prototype.readStructBegin = function() {
-  return {fname: ''};
-};
-
-TBinaryProtocol.prototype.readStructEnd = function() {
-};
-
-TBinaryProtocol.prototype.readFieldBegin = function() {
-  var type = this.readByte();
-  if (type == Type.STOP) {
-    return {fname: null, ftype: type, fid: 0};
-  }
-  var id = this.readI16();
-  return {fname: null, ftype: type, fid: id};
-};
-
-TBinaryProtocol.prototype.readFieldEnd = function() {
-};
-
-TBinaryProtocol.prototype.readMapBegin = function() {
-  var ktype = this.readByte();
-  var vtype = this.readByte();
-  var size = this.readI32();
-  return {ktype: ktype, vtype: vtype, size: size};
-};
-
-TBinaryProtocol.prototype.readMapEnd = function() {
-};
-
-TBinaryProtocol.prototype.readListBegin = function() {
-  var etype = this.readByte();
-  var size = this.readI32();
-  return {etype: etype, size: size};
-};
-
-TBinaryProtocol.prototype.readListEnd = function() {
-};
-
-TBinaryProtocol.prototype.readSetBegin = function() {
-  var etype = this.readByte();
-  var size = this.readI32();
-  return {etype: etype, size: size};
-};
-
-TBinaryProtocol.prototype.readSetEnd = function() {
-};
-
-TBinaryProtocol.prototype.readBool = function() {
-  var b = this.readByte();
-  if (b === 0) {
-    return false;
-  }
-  return true;
-};
-
-TBinaryProtocol.prototype.readByte = function() {
-  return this.trans.readByte();
-};
-
-TBinaryProtocol.prototype.readI16 = function() {
-  return this.trans.readI16();
-};
-
-TBinaryProtocol.prototype.readI32 = function() {
-  return this.trans.readI32();
-};
-
-TBinaryProtocol.prototype.readI64 = function() {
-  var buff = this.trans.read(8);
-  return new Int64(buff);
-};
-
-TBinaryProtocol.prototype.readDouble = function() {
-  return this.trans.readDouble();
-};
-
-TBinaryProtocol.prototype.readBinary = function() {
-  var len = this.readI32();
-  if (len === 0) {
-    return new Buffer(0);
-  }
-
-  if (len < 0) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.NEGATIVE_SIZE, "Negative binary size");
-  }
-  return this.trans.read(len);
-};
-
-TBinaryProtocol.prototype.readString = function() {
-  var len = this.readI32();
-  if (len === 0) {
-    return "";
-  }
-
-  if (len < 0) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.NEGATIVE_SIZE, "Negative string size");
-  }
-  return this.trans.readString(len);
-};
-
-TBinaryProtocol.prototype.getTransport = function() {
-  return this.trans;
-};
-
-TBinaryProtocol.prototype.skip = function(type) {
-  switch (type) {
-    case Type.STOP:
-      return;
-    case Type.BOOL:
-      this.readBool();
-      break;
-    case Type.BYTE:
-      this.readByte();
-      break;
-    case Type.I16:
-      this.readI16();
-      break;
-    case Type.I32:
-      this.readI32();
-      break;
-    case Type.I64:
-      this.readI64();
-      break;
-    case Type.DOUBLE:
-      this.readDouble();
-      break;
-    case Type.STRING:
-      this.readString();
-      break;
-    case Type.STRUCT:
-      this.readStructBegin();
-      while (true) {
-        var r = this.readFieldBegin();
-        if (r.ftype === Type.STOP) {
-          break;
-        }
-        this.skip(r.ftype);
-        this.readFieldEnd();
-      }
-      this.readStructEnd();
-      break;
-    case Type.MAP:
-      var mapBegin = this.readMapBegin();
-      for (var i = 0; i < mapBegin.size; ++i) {
-        this.skip(mapBegin.ktype);
-        this.skip(mapBegin.vtype);
-      }
-      this.readMapEnd();
-      break;
-    case Type.SET:
-      var setBegin = this.readSetBegin();
-      for (var i2 = 0; i2 < setBegin.size; ++i2) {
-        this.skip(setBegin.etype);
-      }
-      this.readSetEnd();
-      break;
-    case Type.LIST:
-      var listBegin = this.readListBegin();
-      for (var i3 = 0; i3 < listBegin.size; ++i3) {
-        this.skip(listBegin.etype);
-      }
-      this.readListEnd();
-      break;
-    default:
-      throw new  Error("Invalid type: " + type);
-  }
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/browser.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/browser.js
deleted file mode 100644
index 4593a8f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/browser.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-exports.Thrift = require('./thrift');
-
-var xhrConnection = require('./xhr_connection');
-exports.XHRConnection = xhrConnection.XHRConnection;
-exports.createXHRConnection = xhrConnection.createXHRConnection;
-exports.createXHRClient = xhrConnection.createXHRClient;
-
-exports.Multiplexer = require('./multiplexed_protocol').Multiplexer;
-
-exports.TWebSocketTransport = require('./ws_transport');
-exports.TBufferedTransport = require('./buffered_transport');
-exports.TFramedTransport = require('./framed_transport');
-
-exports.Protocol = exports.TJSONProtocol = require('./json_protocol');
-exports.TBinaryProtocol = require('./binary_protocol');
-exports.TCompactProtocol = require('./compact_protocol');
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/buffered_transport.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/buffered_transport.js
deleted file mode 100644
index 13636b5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/buffered_transport.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var binary = require('./binary');
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-module.exports = TBufferedTransport;
-
-function TBufferedTransport(buffer, callback) {
-  this.defaultReadBufferSize = 1024;
-  this.writeBufferSize = 512; // Soft Limit
-  this.inBuf = new Buffer(this.defaultReadBufferSize);
-  this.readCursor = 0;
-  this.writeCursor = 0; // for input buffer
-  this.outBuffers = [];
-  this.outCount = 0;
-  this.onFlush = callback;
-};
-
-TBufferedTransport.receiver = function(callback, seqid) {
-  var reader = new TBufferedTransport();
-
-  return function(data) {
-    if (reader.writeCursor + data.length > reader.inBuf.length) {
-      var buf = new Buffer(reader.writeCursor + data.length);
-      reader.inBuf.copy(buf, 0, 0, reader.writeCursor);
-      reader.inBuf = buf;
-    }
-    data.copy(reader.inBuf, reader.writeCursor, 0);
-    reader.writeCursor += data.length;
-
-    callback(reader, seqid);
-  };
-};
-
-
-TBufferedTransport.prototype.commitPosition = function(){
-  var unreadSize = this.writeCursor - this.readCursor;
-  var bufSize = (unreadSize * 2 > this.defaultReadBufferSize) ?
-    unreadSize * 2 : this.defaultReadBufferSize;
-  var buf = new Buffer(bufSize);
-  if (unreadSize > 0) {
-    this.inBuf.copy(buf, 0, this.readCursor, this.writeCursor);
-  }
-  this.readCursor = 0;
-  this.writeCursor = unreadSize;
-  this.inBuf = buf;
-};
-
-TBufferedTransport.prototype.rollbackPosition = function(){
-  this.readCursor = 0;
-}
-
-  // TODO: Implement open/close support
-TBufferedTransport.prototype.isOpen = function() {
-  return true;
-};
-
-TBufferedTransport.prototype.open = function() {
-};
-
-TBufferedTransport.prototype.close = function() {
-};
-
-  // Set the seqid of the message in the client
-  // So that callbacks can be found
-TBufferedTransport.prototype.setCurrSeqId = function(seqid) {
-  this._seqid = seqid;
-};
-
-TBufferedTransport.prototype.ensureAvailable = function(len) {
-  if (this.readCursor + len > this.writeCursor) {
-    throw new InputBufferUnderrunError();
-  }
-};
-
-TBufferedTransport.prototype.read = function(len) {
-  this.ensureAvailable(len);
-  var buf = new Buffer(len);
-  this.inBuf.copy(buf, 0, this.readCursor, this.readCursor + len);
-  this.readCursor += len;
-  return buf;
-};
-
-TBufferedTransport.prototype.readByte = function() {
-  this.ensureAvailable(1);
-  return binary.readByte(this.inBuf[this.readCursor++]);
-};
-
-TBufferedTransport.prototype.readI16 = function() {
-  this.ensureAvailable(2);
-  var i16 = binary.readI16(this.inBuf, this.readCursor);
-  this.readCursor += 2;
-  return i16;
-};
-
-TBufferedTransport.prototype.readI32 = function() {
-  this.ensureAvailable(4);
-  var i32 = binary.readI32(this.inBuf, this.readCursor);
-  this.readCursor += 4;
-  return i32;
-};
-
-TBufferedTransport.prototype.readDouble = function() {
-  this.ensureAvailable(8);
-  var d = binary.readDouble(this.inBuf, this.readCursor);
-  this.readCursor += 8;
-  return d;
-};
-
-TBufferedTransport.prototype.readString = function(len) {
-  this.ensureAvailable(len);
-  var str = this.inBuf.toString('utf8', this.readCursor, this.readCursor + len);
-  this.readCursor += len;
-  return str;
-};
-
-TBufferedTransport.prototype.borrow = function() {
-  var obj = {buf: this.inBuf, readIndex: this.readCursor, writeIndex: this.writeCursor};
-  return obj;
-};
-
-TBufferedTransport.prototype.consume = function(bytesConsumed) {
-  this.readCursor += bytesConsumed;
-};
-
-TBufferedTransport.prototype.write = function(buf) {
-  if (typeof(buf) === "string") {
-    buf = new Buffer(buf, 'utf8');
-  }
-  this.outBuffers.push(buf);
-  this.outCount += buf.length;
-};
-
-TBufferedTransport.prototype.flush = function() {
-  // If the seqid of the callback is available pass it to the onFlush
-  // Then remove the current seqid
-  var seqid = this._seqid;
-  this._seqid = null;
-
-  if (this.outCount < 1) {
-    return;
-  }
-
-  var msg = new Buffer(this.outCount),
-      pos = 0;
-  this.outBuffers.forEach(function(buf) {
-    buf.copy(msg, pos, 0);
-    pos += buf.length;
-  });
-
-  if (this.onFlush) {
-    // Passing seqid through this call to get it to the connection
-    this.onFlush(msg, seqid);
-  }
-
-  this.outBuffers = [];
-  this.outCount = 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/compact_protocol.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/compact_protocol.js
deleted file mode 100644
index b0e9148..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/compact_protocol.js
+++ /dev/null
@@ -1,918 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var log = require('./log');
-var Int64 = require('node-int64');
-var Thrift = require('./thrift');
-var Type = Thrift.Type;
-
-module.exports = TCompactProtocol;
-
-var POW_8 = Math.pow(2, 8);
-var POW_24 = Math.pow(2, 24);
-var POW_32 = Math.pow(2, 32);
-var POW_40 = Math.pow(2, 40);
-var POW_48 = Math.pow(2, 48);
-var POW_52 = Math.pow(2, 52);
-var POW_1022 = Math.pow(2, 1022);
-
-/**
- * Constructor Function for the Compact Protocol.
- * @constructor
- * @param {object} [trans] - The underlying transport to read/write.
- * @classdesc The Apache Thrift Protocol layer performs serialization
- *     of base types, the compact protocol serializes data in binary
- *     form with minimal space used for scalar values.
- */
-function TCompactProtocol(trans) {
-  this.trans = trans;
-  this.lastField_ = [];
-  this.lastFieldId_ = 0;
-  this.string_limit_ = 0;
-  this.string_buf_ = null;
-  this.string_buf_size_ = 0;
-  this.container_limit_ = 0;
-  this.booleanField_ = {
-    name: null,
-    hasBoolValue: false
-  };
-  this.boolValue_ = {
-    hasBoolValue: false,
-    boolValue: false
-  };
-};
-
-
-//
-// Compact Protocol Constants
-//
-
-/**
-  * Compact Protocol ID number.
-  * @readonly
-  * @const {number} PROTOCOL_ID
-  */
-TCompactProtocol.PROTOCOL_ID = -126;  //1000 0010
-
-/**
-  * Compact Protocol version number.
-  * @readonly
-  * @const {number} VERSION_N
-  */
-TCompactProtocol.VERSION_N = 1;
-
-/**
-  * Compact Protocol version mask for combining protocol version and message type in one byte.
-  * @readonly
-  * @const {number} VERSION_MASK
-  */
-TCompactProtocol.VERSION_MASK = 0x1f; //0001 1111
-
-/**
-  * Compact Protocol message type mask for combining protocol version and message type in one byte.
-  * @readonly
-  * @const {number} TYPE_MASK
-  */
-TCompactProtocol.TYPE_MASK = -32;     //1110 0000
-
-/**
-  * Compact Protocol message type bits for ensuring message type bit size.
-  * @readonly
-  * @const {number} TYPE_BITS
-  */
-TCompactProtocol.TYPE_BITS = 7; //0000 0111
-
-/**
-  * Compact Protocol message type shift amount for combining protocol version and message type in one byte.
-  * @readonly
-  * @const {number} TYPE_SHIFT_AMOUNT
-  */
-TCompactProtocol.TYPE_SHIFT_AMOUNT = 5;
-
-/**
- * Compact Protocol type IDs used to keep type data within one nibble.
- * @readonly
- * @property {number}  CT_STOP          - End of a set of fields.
- * @property {number}  CT_BOOLEAN_TRUE  - Flag for Boolean field with true value (packed field and value).
- * @property {number}  CT_BOOLEAN_FALSE - Flag for Boolean field with false value (packed field and value).
- * @property {number}  CT_BYTE          - Signed 8 bit integer.
- * @property {number}  CT_I16           - Signed 16 bit integer.
- * @property {number}  CT_I32           - Signed 32 bit integer.
- * @property {number}  CT_I64           - Signed 64 bit integer (2^53 max in JavaScript).
- * @property {number}  CT_DOUBLE        - 64 bit IEEE 854 floating point.
- * @property {number}  CT_BINARY        - Array of bytes (used for strings also).
- * @property {number}  CT_LIST          - A collection type (unordered).
- * @property {number}  CT_SET           - A collection type (unordered and without repeated values).
- * @property {number}  CT_MAP           - A collection type (map/associative-array/dictionary).
- * @property {number}  CT_STRUCT        - A multifield type.
- */
-TCompactProtocol.Types = {
-  CT_STOP:           0x00,
-  CT_BOOLEAN_TRUE:   0x01,
-  CT_BOOLEAN_FALSE:  0x02,
-  CT_BYTE:           0x03,
-  CT_I16:            0x04,
-  CT_I32:            0x05,
-  CT_I64:            0x06,
-  CT_DOUBLE:         0x07,
-  CT_BINARY:         0x08,
-  CT_LIST:           0x09,
-  CT_SET:            0x0A,
-  CT_MAP:            0x0B,
-  CT_STRUCT:         0x0C
-};
-
-/**
- * Array mapping Compact type IDs to standard Thrift type IDs.
- * @readonly
- */
-TCompactProtocol.TTypeToCType = [
-  TCompactProtocol.Types.CT_STOP,         // T_STOP
-  0,                                      // unused
-  TCompactProtocol.Types.CT_BOOLEAN_TRUE, // T_BOOL
-  TCompactProtocol.Types.CT_BYTE,         // T_BYTE
-  TCompactProtocol.Types.CT_DOUBLE,       // T_DOUBLE
-  0,                                      // unused
-  TCompactProtocol.Types.CT_I16,          // T_I16
-  0,                                      // unused
-  TCompactProtocol.Types.CT_I32,          // T_I32
-  0,                                      // unused
-  TCompactProtocol.Types.CT_I64,          // T_I64
-  TCompactProtocol.Types.CT_BINARY,       // T_STRING
-  TCompactProtocol.Types.CT_STRUCT,       // T_STRUCT
-  TCompactProtocol.Types.CT_MAP,          // T_MAP
-  TCompactProtocol.Types.CT_SET,          // T_SET
-  TCompactProtocol.Types.CT_LIST,         // T_LIST
-];
-
-
-//
-// Compact Protocol Utilities
-//
-
-/**
- * Returns the underlying transport layer.
- * @return {object} The underlying transport layer.
- */TCompactProtocol.prototype.getTransport = function() {
-  return this.trans;
-};
-
-/**
- * Lookup a Compact Protocol Type value for a given Thrift Type value.
- * N.B. Used only internally.
- * @param {number} ttype - Thrift type value
- * @returns {number} Compact protocol type value
- */
-TCompactProtocol.prototype.getCompactType = function(ttype) {
-  return TCompactProtocol.TTypeToCType[ttype];
-};
-
-/**
- * Lookup a Thrift Type value for a given Compact Protocol Type value.
- * N.B. Used only internally.
- * @param {number} type - Compact Protocol type value
- * @returns {number} Thrift Type value
- */
-TCompactProtocol.prototype.getTType = function(type) {
-  switch (type) {
-    case Type.STOP:
-      return Type.STOP;
-    case TCompactProtocol.Types.CT_BOOLEAN_FALSE:
-    case TCompactProtocol.Types.CT_BOOLEAN_TRUE:
-      return Type.BOOL;
-    case TCompactProtocol.Types.CT_BYTE:
-      return Type.BYTE;
-    case TCompactProtocol.Types.CT_I16:
-      return Type.I16;
-    case TCompactProtocol.Types.CT_I32:
-      return Type.I32;
-    case TCompactProtocol.Types.CT_I64:
-      return Type.I64;
-    case TCompactProtocol.Types.CT_DOUBLE:
-      return Type.DOUBLE;
-    case TCompactProtocol.Types.CT_BINARY:
-      return Type.STRING;
-    case TCompactProtocol.Types.CT_LIST:
-      return Type.LIST;
-    case TCompactProtocol.Types.CT_SET:
-      return Type.SET;
-    case TCompactProtocol.Types.CT_MAP:
-      return Type.MAP;
-    case TCompactProtocol.Types.CT_STRUCT:
-      return Type.STRUCT;
-    default:
-      throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.INVALID_DATA, "Unknown type: " + type);
-  }
-  return Type.STOP;
-};
-
-
-//
-// Compact Protocol write operations
-//
-
-/**
- * Send any buffered bytes to the end point.
- */
-TCompactProtocol.prototype.flush = function() {
-  return this.trans.flush();
-};
-
-/**
- * Writes an RPC message header
- * @param {string} name - The method name for the message.
- * @param {number} type - The type of message (CALL, REPLY, EXCEPTION, ONEWAY).
- * @param {number} seqid - The call sequence number (if any).
- */
-TCompactProtocol.prototype.writeMessageBegin = function(name, type, seqid) {
-  this.writeByte(TCompactProtocol.PROTOCOL_ID);
-  this.writeByte((TCompactProtocol.VERSION_N & TCompactProtocol.VERSION_MASK) |
-                     ((type << TCompactProtocol.TYPE_SHIFT_AMOUNT) & TCompactProtocol.TYPE_MASK));
-  this.writeVarint32(seqid);
-  this.writeString(name);
-
-  // Record client seqid to find callback again
-  if (this._seqid) {
-    // TODO better logging log warning
-    log.warning('SeqId already set', { 'name': name });
-  } else {
-    this._seqid = seqid;
-    this.trans.setCurrSeqId(seqid);
-  }
-};
-
-TCompactProtocol.prototype.writeMessageEnd = function() {
-};
-
-TCompactProtocol.prototype.writeStructBegin = function(name) {
-  this.lastField_.push(this.lastFieldId_);
-  this.lastFieldId_ = 0;
-};
-
-TCompactProtocol.prototype.writeStructEnd = function() {
-  this.lastFieldId_ = this.lastField_.pop();
-};
-
-/**
- * Writes a struct field header
- * @param {string} name - The field name (not written with the compact protocol).
- * @param {number} type - The field data type (a normal Thrift field Type).
- * @param {number} id - The IDL field Id.
- */
-TCompactProtocol.prototype.writeFieldBegin = function(name, type, id) {
-  if (type != Type.BOOL) {
-    return this.writeFieldBeginInternal(name, type, id, -1);
-  }
-
-  this.booleanField_.name = name;
-  this.booleanField_.fieldType = type;
-  this.booleanField_.fieldId = id;
-};
-
-TCompactProtocol.prototype.writeFieldEnd = function() {
-};
-
-TCompactProtocol.prototype.writeFieldStop = function() {
-  this.writeByte(TCompactProtocol.Types.CT_STOP);
-};
-
-/**
- * Writes a map collection header
- * @param {number} keyType - The Thrift type of the map keys.
- * @param {number} valType - The Thrift type of the map values.
- * @param {number} size - The number of k/v pairs in the map.
- */
-TCompactProtocol.prototype.writeMapBegin = function(keyType, valType, size) {
-  if (size === 0) {
-    this.writeByte(0);
-  } else {
-    this.writeVarint32(size);
-    this.writeByte(this.getCompactType(keyType) << 4 | this.getCompactType(valType));
-  }
-};
-
-TCompactProtocol.prototype.writeMapEnd = function() {
-};
-
-/**
- * Writes a list collection header
- * @param {number} elemType - The Thrift type of the list elements.
- * @param {number} size - The number of elements in the list.
- */
-TCompactProtocol.prototype.writeListBegin = function(elemType, size) {
-  this.writeCollectionBegin(elemType, size);
-};
-
-TCompactProtocol.prototype.writeListEnd = function() {
-};
-
-/**
- * Writes a set collection header
- * @param {number} elemType - The Thrift type of the set elements.
- * @param {number} size - The number of elements in the set.
- */
-TCompactProtocol.prototype.writeSetBegin = function(elemType, size) {
-  this.writeCollectionBegin(elemType, size);
-};
-
-TCompactProtocol.prototype.writeSetEnd = function() {
-};
-
-TCompactProtocol.prototype.writeBool = function(value) {
-  if (this.booleanField_.name !== null) {
-    // we haven't written the field header yet
-    this.writeFieldBeginInternal(this.booleanField_.name,
-                                 this.booleanField_.fieldType,
-                                 this.booleanField_.fieldId,
-                                 (value ? TCompactProtocol.Types.CT_BOOLEAN_TRUE
-                                          : TCompactProtocol.Types.CT_BOOLEAN_FALSE));
-    this.booleanField_.name = null;
-  } else {
-    // we're not part of a field, so just write the value
-    this.writeByte((value ? TCompactProtocol.Types.CT_BOOLEAN_TRUE
-                            : TCompactProtocol.Types.CT_BOOLEAN_FALSE));
-  }
-};
-
-TCompactProtocol.prototype.writeByte = function(b) {
-  this.trans.write(new Buffer([b]));
-};
-
-TCompactProtocol.prototype.writeI16 = function(i16) {
-  this.writeVarint32(this.i32ToZigzag(i16));
-};
-
-TCompactProtocol.prototype.writeI32 = function(i32) {
-  this.writeVarint32(this.i32ToZigzag(i32));
-};
-
-TCompactProtocol.prototype.writeI64 = function(i64) {
-  this.writeVarint64(this.i64ToZigzag(i64));
-};
-
-// Little-endian, unlike TBinaryProtocol
-TCompactProtocol.prototype.writeDouble = function(v) {
-  var buff = new Buffer(8);
-  var m, e, c;
-
-  buff[7] = (v < 0 ? 0x80 : 0x00);
-
-  v = Math.abs(v);
-  if (v !== v) {
-    // NaN, use QNaN IEEE format
-    m = 2251799813685248;
-    e = 2047;
-  } else if (v === Infinity) {
-    m = 0;
-    e = 2047;
-  } else {
-    e = Math.floor(Math.log(v) / Math.LN2);
-    c = Math.pow(2, -e);
-    if (v * c < 1) {
-      e--;
-      c *= 2;
-    }
-
-    if (e + 1023 >= 2047)
-    {
-      // Overflow
-      m = 0;
-      e = 2047;
-    }
-    else if (e + 1023 >= 1)
-    {
-      // Normalized - term order matters, as Math.pow(2, 52-e) and v*Math.pow(2, 52) can overflow
-      m = (v*c-1) * POW_52;
-      e += 1023;
-    }
-    else
-    {
-      // Denormalized - also catches the '0' case, somewhat by chance
-      m = (v * POW_1022) * POW_52;
-      e = 0;
-    }
-  }
-
-  buff[6] = (e << 4) & 0xf0;
-  buff[7] |= (e >> 4) & 0x7f;
-
-  buff[0] = m & 0xff;
-  m = Math.floor(m / POW_8);
-  buff[1] = m & 0xff;
-  m = Math.floor(m / POW_8);
-  buff[2] = m & 0xff;
-  m = Math.floor(m / POW_8);
-  buff[3] = m & 0xff;
-  m >>= 8;
-  buff[4] = m & 0xff;
-  m >>= 8;
-  buff[5] = m & 0xff;
-  m >>= 8;
-  buff[6] |= m & 0x0f;
-
-  this.trans.write(buff);
-};
-
-TCompactProtocol.prototype.writeStringOrBinary = function(name, encoding, arg) {
-  if (typeof arg === 'string') {
-    this.writeVarint32(Buffer.byteLength(arg, encoding)) ;
-    this.trans.write(new Buffer(arg, encoding));
-  } else if (arg instanceof Buffer ||
-             Object.prototype.toString.call(arg) == '[object Uint8Array]') {
-    // Buffers in Node.js under Browserify may extend UInt8Array instead of
-    // defining a new object. We detect them here so we can write them
-    // correctly
-    this.writeVarint32(arg.length);
-    this.trans.write(arg);
-  } else {
-    throw new Error(name + ' called without a string/Buffer argument: ' + arg);
-  }
-};
-
-TCompactProtocol.prototype.writeString = function(arg) {
-  this.writeStringOrBinary('writeString', 'utf8', arg);
-};
-
-TCompactProtocol.prototype.writeBinary = function(arg) {
-  this.writeStringOrBinary('writeBinary', 'binary', arg);
-};
-
-
-//
-// Compact Protocol internal write methods
-//
-
-TCompactProtocol.prototype.writeFieldBeginInternal = function(name,
-                                                              fieldType,
-                                                              fieldId,
-                                                              typeOverride) {
-  //If there's a type override, use that.
-  var typeToWrite = (typeOverride == -1 ? this.getCompactType(fieldType) : typeOverride);
-  //Check if we can delta encode the field id
-  if (fieldId > this.lastFieldId_ && fieldId - this.lastFieldId_ <= 15) {
-    //Include the type delta with the field ID
-    this.writeByte((fieldId - this.lastFieldId_) << 4 | typeToWrite);
-  } else {
-    //Write separate type and ID values
-    this.writeByte(typeToWrite);
-    this.writeI16(fieldId);
-  }
-  this.lastFieldId_ = fieldId;
-};
-
-TCompactProtocol.prototype.writeCollectionBegin = function(elemType, size) {
-  if (size <= 14) {
-    //Combine size and type in one byte if possible
-    this.writeByte(size << 4 | this.getCompactType(elemType));
-  } else {
-    this.writeByte(0xf0 | this.getCompactType(elemType));
-    this.writeVarint32(size);
-  }
-};
-
-/**
- * Write an i32 as a varint. Results in 1-5 bytes on the wire.
- */
-TCompactProtocol.prototype.writeVarint32 = function(n) {
-  var buf = new Buffer(5);
-  var wsize = 0;
-  while (true) {
-    if ((n & ~0x7F) === 0) {
-      buf[wsize++] = n;
-      break;
-    } else {
-      buf[wsize++] = ((n & 0x7F) | 0x80);
-      n = n >>> 7;
-    }
-  }
-  var wbuf = new Buffer(wsize);
-  buf.copy(wbuf,0,0,wsize);
-  this.trans.write(wbuf);
-};
-
-/**
- * Write an i64 as a varint. Results in 1-10 bytes on the wire.
- * N.B. node-int64 is always big endian
- */
-TCompactProtocol.prototype.writeVarint64 = function(n) {
-  if (typeof n === "number"){
-    n = new Int64(n);
-  }
-  if (! (n instanceof Int64)) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.INVALID_DATA, "Expected Int64 or Number, found: " + n);
-  }
-
-  var buf = new Buffer(10);
-  var wsize = 0;
-  var hi = n.buffer.readUInt32BE(0, true);
-  var lo = n.buffer.readUInt32BE(4, true);
-  var mask = 0;
-  while (true) {
-    if (((lo & ~0x7F) === 0) && (hi === 0)) {
-      buf[wsize++] = lo;
-      break;
-    } else {
-      buf[wsize++] = ((lo & 0x7F) | 0x80);
-      mask = hi << 25;
-      lo = lo >>> 7;
-      hi = hi >>> 7;
-      lo = lo | mask;
-    }
-  }
-  var wbuf = new Buffer(wsize);
-  buf.copy(wbuf,0,0,wsize);
-  this.trans.write(wbuf);
-};
-
-/**
- * Convert l into a zigzag long. This allows negative numbers to be
- * represented compactly as a varint.
- */
-TCompactProtocol.prototype.i64ToZigzag = function(l) {
-  if (typeof l === 'string') {
-    l = new Int64(parseInt(l, 10));
-  } else if (typeof l === 'number') {
-    l = new Int64(l);
-  }
-  if (! (l instanceof Int64)) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.INVALID_DATA, "Expected Int64 or Number, found: " + l);
-  }
-  var hi = l.buffer.readUInt32BE(0, true);
-  var lo = l.buffer.readUInt32BE(4, true);
-  var sign = hi >>> 31;
-  hi = ((hi << 1) | (lo >>> 31)) ^ ((!!sign) ? 0xFFFFFFFF : 0);
-  lo = (lo << 1) ^ ((!!sign) ? 0xFFFFFFFF : 0);
-  return new Int64(hi, lo);
-};
-
-/**
- * Convert n into a zigzag int. This allows negative numbers to be
- * represented compactly as a varint.
- */
-TCompactProtocol.prototype.i32ToZigzag = function(n) {
-  return (n << 1) ^ ((n & 0x80000000) ? 0xFFFFFFFF : 0);
-};
-
-
-//
-// Compact Protocol read operations
-//
-
-TCompactProtocol.prototype.readMessageBegin = function() {
-  //Read protocol ID
-  var protocolId = this.trans.readByte();
-  if (protocolId != TCompactProtocol.PROTOCOL_ID) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.BAD_VERSION, "Bad protocol identifier " + protocolId);
-  }
-
-  //Read Version and Type
-  var versionAndType = this.trans.readByte();
-  var version = (versionAndType & TCompactProtocol.VERSION_MASK);
-  if (version != TCompactProtocol.VERSION_N) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.BAD_VERSION, "Bad protocol version " + version);
-  }
-  var type = ((versionAndType >> TCompactProtocol.TYPE_SHIFT_AMOUNT) & TCompactProtocol.TYPE_BITS);
-
-  //Read SeqId
-  var seqid = this.readVarint32();
-
-  //Read name
-  var name = this.readString();
-
-  return {fname: name, mtype: type, rseqid: seqid};
-};
-
-TCompactProtocol.prototype.readMessageEnd = function() {
-};
-
-TCompactProtocol.prototype.readStructBegin = function() {
-  this.lastField_.push(this.lastFieldId_);
-  this.lastFieldId_ = 0;
-  return {fname: ''};
-};
-
-TCompactProtocol.prototype.readStructEnd = function() {
-  this.lastFieldId_ = this.lastField_.pop();
-};
-
-TCompactProtocol.prototype.readFieldBegin = function() {
-  var fieldId = 0;
-  var b = this.trans.readByte(b);
-  var type = (b & 0x0f);
-
-  if (type == TCompactProtocol.Types.CT_STOP) {
-    return {fname: null, ftype: Thrift.Type.STOP, fid: 0};
-  }
-
-  //Mask off the 4 MSB of the type header to check for field id delta.
-  var modifier = ((b & 0x000000f0) >>> 4);
-  if (modifier === 0) {
-    //If not a delta read the field id.
-    fieldId = this.readI16();
-  } else {
-    //Recover the field id from the delta
-    fieldId = (this.lastFieldId_ + modifier);
-  }
-  var fieldType = this.getTType(type);
-
-  //Boolean are encoded with the type
-  if (type == TCompactProtocol.Types.CT_BOOLEAN_TRUE ||
-      type == TCompactProtocol.Types.CT_BOOLEAN_FALSE) {
-    this.boolValue_.hasBoolValue = true;
-    this.boolValue_.boolValue =
-      (type == TCompactProtocol.Types.CT_BOOLEAN_TRUE ? true : false);
-  }
-
-  //Save the new field for the next delta computation.
-  this.lastFieldId_ = fieldId;
-  return {fname: null, ftype: fieldType, fid: fieldId};
-};
-
-TCompactProtocol.prototype.readFieldEnd = function() {
-};
-
-TCompactProtocol.prototype.readMapBegin = function() {
-  var msize = this.readVarint32();
-  if (msize < 0) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.NEGATIVE_SIZE, "Negative map size");
-  }
-
-  var kvType = 0;
-  if (msize !== 0) {
-    kvType = this.trans.readByte();
-  }
-
-  var keyType = this.getTType((kvType & 0xf0) >>> 4);
-  var valType = this.getTType(kvType & 0xf);
-  return {ktype: keyType, vtype: valType, size: msize};
-};
-
-TCompactProtocol.prototype.readMapEnd = function() {
-};
-
-TCompactProtocol.prototype.readListBegin = function() {
-  var size_and_type = this.trans.readByte();
-
-  var lsize = (size_and_type >>> 4) & 0x0000000f;
-  if (lsize == 15) {
-    lsize = this.readVarint32();
-  }
-
-  if (lsize < 0) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.NEGATIVE_SIZE, "Negative list size");
-  }
-
-  var elemType = this.getTType(size_and_type & 0x0000000f);
-
-  return {etype: elemType, size: lsize};
-};
-
-TCompactProtocol.prototype.readListEnd = function() {
-};
-
-TCompactProtocol.prototype.readSetBegin = function() {
-  return this.readListBegin();
-};
-
-TCompactProtocol.prototype.readSetEnd = function() {
-};
-
-TCompactProtocol.prototype.readBool = function() {
-  var value = false;
-  var rsize = 0;
-  if (this.boolValue_.hasBoolValue === true) {
-    value = this.boolValue_.boolValue;
-    this.boolValue_.hasBoolValue = false;
-  } else {
-    var res = this.trans.readByte();
-    rsize = res.rsize;
-    value = (res.value == TCompactProtocol.Types.CT_BOOLEAN_TRUE);
-  }
-  return value;
-};
-
-TCompactProtocol.prototype.readByte = function() {
-  return this.trans.readByte();
-};
-
-TCompactProtocol.prototype.readI16 = function() {
-  return this.readI32();
-};
-
-TCompactProtocol.prototype.readI32 = function() {
-  return this.zigzagToI32(this.readVarint32());
-};
-
-TCompactProtocol.prototype.readI64 = function() {
-  return this.zigzagToI64(this.readVarint64());
-};
-
-// Little-endian, unlike TBinaryProtocol
-TCompactProtocol.prototype.readDouble = function() {
-  var buff = this.trans.read(8);
-  var off = 0;
-
-  var signed = buff[off + 7] & 0x80;
-  var e = (buff[off+6] & 0xF0) >> 4;
-  e += (buff[off+7] & 0x7F) << 4;
-
-  var m = buff[off];
-  m += buff[off+1] << 8;
-  m += buff[off+2] << 16;
-  m += buff[off+3] * POW_24;
-  m += buff[off+4] * POW_32;
-  m += buff[off+5] * POW_40;
-  m += (buff[off+6] & 0x0F) * POW_48;
-
-  switch (e) {
-    case 0:
-      e = -1022;
-      break;
-    case 2047:
-      return m ? NaN : (signed ? -Infinity : Infinity);
-    default:
-      m += POW_52;
-      e -= 1023;
-  }
-
-  if (signed) {
-    m *= -1;
-  }
-
-  return m * Math.pow(2, e - 52);
-};
-
-TCompactProtocol.prototype.readBinary = function() {
-  var size = this.readVarint32();
-  if (size === 0) {
-    return new Buffer(0);
-  }
-
-  if (size < 0) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.NEGATIVE_SIZE, "Negative binary size");
-  }
-  return this.trans.read(size);
-};
-
-TCompactProtocol.prototype.readString = function() {
-  var size = this.readVarint32();
-  // Catch empty string case
-  if (size === 0) {
-    return "";
-  }
-
-  // Catch error cases
-  if (size < 0) {
-    throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.NEGATIVE_SIZE, "Negative string size");
-  }
-  return this.trans.readString(size);
-};
-
-
-//
-// Compact Protocol internal read operations
-//
-
-/**
- * Read an i32 from the wire as a varint. The MSB of each byte is set
- * if there is another byte to follow. This can read up to 5 bytes.
- */
-TCompactProtocol.prototype.readVarint32 = function() {
-  return this.readVarint64().toNumber();
-};
-
-/**
- * Read an i64 from the wire as a proper varint. The MSB of each byte is set
- * if there is another byte to follow. This can read up to 10 bytes.
- */
-TCompactProtocol.prototype.readVarint64 = function() {
-  var rsize = 0;
-  var lo = 0;
-  var hi = 0;
-  var shift = 0;
-  while (true) {
-    var b = this.trans.readByte();
-    rsize ++;
-    if (shift <= 25) {
-      lo = lo | ((b & 0x7f) << shift);
-    } else if (25 < shift && shift < 32) {
-      lo = lo | ((b & 0x7f) << shift);
-      hi = hi | ((b & 0x7f) >>> (32-shift));
-    } else {
-      hi = hi | ((b & 0x7f) << (shift-32));
-    }
-    shift += 7;
-    if (!(b & 0x80)) {
-      break;
-    }
-    if (rsize >= 10) {
-      throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.INVALID_DATA, "Variable-length int over 10 bytes.");
-    }
-  }
-  return new Int64(hi, lo);
-};
-
-/**
- * Convert from zigzag int to int.
- */
-TCompactProtocol.prototype.zigzagToI32 = function(n) {
-  return (n >>> 1) ^ (-1 * (n & 1));
-};
-
-/**
- * Convert from zigzag long to long.
- */
-TCompactProtocol.prototype.zigzagToI64 = function(n) {
-  var hi = n.buffer.readUInt32BE(0, true);
-  var lo = n.buffer.readUInt32BE(4, true);
-
-  var neg = new Int64(hi & 0, lo & 1);
-  neg._2scomp();
-  var hi_neg = neg.buffer.readUInt32BE(0, true);
-  var lo_neg = neg.buffer.readUInt32BE(4, true);
-
-  var hi_lo = (hi << 31);
-  hi = (hi >>> 1) ^ (hi_neg);
-  lo = ((lo >>> 1) | hi_lo) ^ (lo_neg);
-  return new Int64(hi, lo);
-};
-
-TCompactProtocol.prototype.skip = function(type) {
-  switch (type) {
-    case Type.STOP:
-      return;
-    case Type.BOOL:
-      this.readBool();
-      break;
-    case Type.BYTE:
-      this.readByte();
-      break;
-    case Type.I16:
-      this.readI16();
-      break;
-    case Type.I32:
-      this.readI32();
-      break;
-    case Type.I64:
-      this.readI64();
-      break;
-    case Type.DOUBLE:
-      this.readDouble();
-      break;
-    case Type.STRING:
-      this.readString();
-      break;
-    case Type.STRUCT:
-      this.readStructBegin();
-      while (true) {
-        var r = this.readFieldBegin();
-        if (r.ftype === Type.STOP) {
-          break;
-        }
-        this.skip(r.ftype);
-        this.readFieldEnd();
-      }
-      this.readStructEnd();
-      break;
-    case Type.MAP:
-      var mapBegin = this.readMapBegin();
-      for (var i = 0; i < mapBegin.size; ++i) {
-        this.skip(mapBegin.ktype);
-        this.skip(mapBegin.vtype);
-      }
-      this.readMapEnd();
-      break;
-    case Type.SET:
-      var setBegin = this.readSetBegin();
-      for (var i2 = 0; i2 < setBegin.size; ++i2) {
-        this.skip(setBegin.etype);
-      }
-      this.readSetEnd();
-      break;
-    case Type.LIST:
-      var listBegin = this.readListBegin();
-      for (var i3 = 0; i3 < listBegin.size; ++i3) {
-        this.skip(listBegin.etype);
-      }
-      this.readListEnd();
-      break;
-    default:
-      throw new  Error("Invalid type: " + type);
-  }
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/connection.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/connection.js
deleted file mode 100644
index 575d516..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/connection.js
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var util = require('util');
-var EventEmitter = require("events").EventEmitter;
-var net = require('net');
-var tls = require('tls');
-var thrift = require('./thrift');
-
-var TBufferedTransport = require('./buffered_transport');
-var TBinaryProtocol = require('./binary_protocol');
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-var createClient = require('./create_client');
-
-var binary = require('./binary');
-
-var Connection = exports.Connection = function(stream, options) {
-  var self = this;
-  EventEmitter.call(this);
-
-  this.seqId2Service = {};
-  this.connection = stream;
-  this.ssl = (stream.encrypted);
-  this.options = options || {};
-  this.transport = this.options.transport || TBufferedTransport;
-  this.protocol = this.options.protocol || TBinaryProtocol;
-  this.offline_queue = [];
-  this.connected = false;
-  this.initialize_retry_vars();
-
-  this._debug = this.options.debug || false;
-  if (this.options.max_attempts &&
-      !isNaN(this.options.max_attempts) &&
-      this.options.max_attempts > 0) {
-     this.max_attempts = +this.options.max_attempts;
-  }
-  this.retry_max_delay = null;
-  if (this.options.retry_max_delay !== undefined &&
-      !isNaN(this.options.retry_max_delay) &&
-      this.options.retry_max_delay > 0) {
-     this.retry_max_delay = this.options.retry_max_delay;
-  }
-  this.connect_timeout = false;
-  if (this.options.connect_timeout &&
-      !isNaN(this.options.connect_timeout) &&
-      this.options.connect_timeout > 0) {
-     this.connect_timeout = +this.options.connect_timeout;
-  }
-
-  this.connection.addListener(this.ssl ? "secureConnect" : "connect", function() {
-    self.connected = true;
-
-    this.setTimeout(self.options.timeout || 0);
-    this.setNoDelay();
-    this.frameLeft = 0;
-    this.framePos = 0;
-    this.frame = null;
-    self.initialize_retry_vars();
-
-    self.offline_queue.forEach(function(data) {
-      self.connection.write(data);
-    });
-
-    self.emit("connect");
-  });
-
-  this.connection.addListener("error", function(err) {
-    // Only emit the error if no-one else is listening on the connection
-    // or if someone is listening on us, because Node turns unhandled
-    // 'error' events into exceptions.
-    if (self.connection.listeners('error').length === 1 ||
-        self.listeners('error').length > 0) {
-      self.emit("error", err);
-    }
-  });
-
-  // Add a close listener
-  this.connection.addListener("close", function() {
-    self.connection_gone(); // handle close event. try to reconnect
-  });
-
-  this.connection.addListener("timeout", function() {
-    self.emit("timeout");
-  });
-
-  this.connection.addListener("data", self.transport.receiver(function(transport_with_data) {
-    var message = new self.protocol(transport_with_data);
-    try {
-      while (true) {
-        var header = message.readMessageBegin();
-        var dummy_seqid = header.rseqid * -1;
-        var client = self.client;
-        //The Multiplexed Protocol stores a hash of seqid to service names
-        //  in seqId2Service. If the SeqId is found in the hash we need to
-        //  lookup the appropriate client for this call.
-        //  The connection.client object is a single client object when not
-        //  multiplexing, when using multiplexing it is a service name keyed
-        //  hash of client objects.
-        //NOTE: The 2 way interdependencies between protocols, transports,
-        //  connections and clients in the Node.js implementation are irregular
-        //  and make the implementation difficult to extend and maintain. We
-        //  should bring this stuff inline with typical thrift I/O stack
-        //  operation soon.
-        //  --ra
-        var service_name = self.seqId2Service[header.rseqid];
-        if (service_name) {
-          client = self.client[service_name];
-          delete self.seqId2Service[header.rseqid];
-        }
-        /*jshint -W083 */
-        client._reqs[dummy_seqid] = function(err, success){
-          transport_with_data.commitPosition();
-
-          var callback = client._reqs[header.rseqid];
-          delete client._reqs[header.rseqid];
-          if (callback) {
-            callback(err, success);
-          }
-        };
-        /*jshint +W083 */
-
-        if(client['recv_' + header.fname]) {
-          client['recv_' + header.fname](message, header.mtype, dummy_seqid);
-        } else {
-          delete client._reqs[dummy_seqid];
-          self.emit("error",
-                    new thrift.TApplicationException(thrift.TApplicationExceptionType.WRONG_METHOD_NAME,
-                             "Received a response to an unknown RPC function"));
-        }
-      }
-    }
-    catch (e) {
-      if (e instanceof InputBufferUnderrunError) {
-        transport_with_data.rollbackPosition();
-      }
-      else {
-        self.emit('error', e);
-      }
-    }
-  }));
-};
-util.inherits(Connection, EventEmitter);
-
-Connection.prototype.end = function() {
-  this.connection.end();
-};
-
-Connection.prototype.destroy = function() {
-  this.connection.destroy();
-};
-
-Connection.prototype.initialize_retry_vars = function () {
-  this.retry_timer = null;
-  this.retry_totaltime = 0;
-  this.retry_delay = 150;
-  this.retry_backoff = 1.7;
-  this.attempts = 0;
-};
-
-Connection.prototype.write = function(data) {
-  if (!this.connected) {
-    this.offline_queue.push(data);
-    return;
-  }
-  this.connection.write(data);
-};
-
-Connection.prototype.connection_gone = function () {
-  var self = this;
-  this.connected = false;
-
-  // If a retry is already in progress, just let that happen
-  if (this.retry_timer) {
-    return;
-  }
-  // We cannot reconnect a secure socket.
-  if (!this.max_attempts || this.ssl) {
-    self.emit("close");
-    return;
-  }
-
-  if (this.retry_max_delay !== null && this.retry_delay >= this.retry_max_delay) {
-    this.retry_delay = this.retry_max_delay;
-  } else {
-    this.retry_delay = Math.floor(this.retry_delay * this.retry_backoff);
-  }
-
-  if (self._debug) {
-    console.log("Retry connection in " + this.retry_delay + " ms");
-  }
-
-  if (this.max_attempts && this.attempts >= this.max_attempts) {
-    this.retry_timer = null;
-    console.error("thrift: Couldn't get thrift connection after " + this.max_attempts + " attempts.");
-    self.emit("close");
-    return;
-  }
-
-  this.attempts += 1;
-  this.emit("reconnecting", {
-    delay: self.retry_delay,
-    attempt: self.attempts
-  });
-
-  this.retry_timer = setTimeout(function () {
-    if (self._debug) {
-       console.log("Retrying connection...");
-	}
-
-    self.retry_totaltime += self.retry_delay;
-
-    if (self.connect_timeout && self.retry_totaltime >= self.connect_timeout) {
-       self.retry_timer = null;
-       console.error("thrift: Couldn't get thrift connection after " + self.retry_totaltime + "ms.");
-       self.emit("close");
-       return;
-    }
-
-    self.connection.connect(self.port, self.host);
-    self.retry_timer = null;
-  }, this.retry_delay);
-};
-
-exports.createConnection = function(host, port, options) {
-  var stream = net.createConnection(port, host);
-  var connection = new Connection(stream, options);
-  connection.host = host;
-  connection.port = port;
-
-  return connection;
-};
-
-exports.createSSLConnection = function(host, port, options) {
-  var stream = tls.connect(port, host, options);
-  var connection = new Connection(stream, options);
-  connection.host = host;
-  connection.port = port;
-
-  return connection;
-};
-
-
-exports.createClient = createClient;
-
-var child_process = require('child_process');
-var StdIOConnection = exports.StdIOConnection = function(command, options) {
-  var command_parts = command.split(' ');
-  command = command_parts[0];
-  var args = command_parts.splice(1,command_parts.length -1);
-  var child = this.child = child_process.spawn(command,args);
-
-  var self = this;
-  EventEmitter.call(this);
-
-  this._debug = options.debug || false;
-  this.connection = child.stdin;
-  this.options = options || {};
-  this.transport = this.options.transport || TBufferedTransport;
-  this.protocol = this.options.protocol || TBinaryProtocol;
-  this.offline_queue = [];
-
-  if(this._debug === true){
-    this.child.stderr.on('data',function(err){
-      console.log(err.toString(),'CHILD ERROR');
-    });
-
-    this.child.on('exit',function(code,signal){
-      console.log(code+':'+signal,'CHILD EXITED');
-    });
-  }
-
-  this.frameLeft = 0;
-  this.framePos = 0;
-  this.frame = null;
-  this.connected = true;
-
-  self.offline_queue.forEach(function(data) {
-      self.connection.write(data);
-  });
-
-
-  this.connection.addListener("error", function(err) {
-    self.emit("error", err);
-  });
-
-  // Add a close listener
-  this.connection.addListener("close", function() {
-    self.emit("close");
-  });
-
-  child.stdout.addListener("data", self.transport.receiver(function(transport_with_data) {
-    var message = new self.protocol(transport_with_data);
-    try {
-      var header = message.readMessageBegin();
-      var dummy_seqid = header.rseqid * -1;
-      var client = self.client;
-      client._reqs[dummy_seqid] = function(err, success){
-        transport_with_data.commitPosition();
-
-        var callback = client._reqs[header.rseqid];
-        delete client._reqs[header.rseqid];
-        if (callback) {
-          callback(err, success);
-        }
-      };
-      client['recv_' + header.fname](message, header.mtype, dummy_seqid);
-    }
-    catch (e) {
-      if (e instanceof InputBufferUnderrunError) {
-        transport_with_data.rollbackPosition();
-      }
-      else {
-        throw e;
-      }
-    }
-  }));
-};
-
-util.inherits(StdIOConnection, EventEmitter);
-
-StdIOConnection.prototype.end = function() {
-  this.connection.end();
-};
-
-StdIOConnection.prototype.write = function(data) {
-  if (!this.connected) {
-    this.offline_queue.push(data);
-    return;
-  }
-  this.connection.write(data);
-};
-
-exports.createStdIOConnection = function(command,options){
-  return new StdIOConnection(command,options);
-};
-
-exports.createStdIOClient = createClient;
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/create_client.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/create_client.js
deleted file mode 100644
index d6b77a8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/create_client.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = createClient;
-
-/**
- * Creates a new client object for the specified Thrift service.
- * @param {object} ServiceClient - The module containing the generated service client
- * @param {Connection} Connection - The connection to use.
- * @returns {object} The client object.
- */
-function createClient(ServiceClient, connection) {
-  // TODO validate required options and throw otherwise
-  if (ServiceClient.Client) {
-    ServiceClient = ServiceClient.Client;
-  }
-  // TODO detangle these initialization calls
-  // creating "client" requires
-  //   - new service client instance
-  //
-  // New service client instance requires
-  //   - new transport instance
-  //   - protocol class reference
-  //
-  // New transport instance requires
-  //   - Buffer to use (or none)
-  //   - Callback to call on flush
-
-  // Wrap the write method
-  var writeCb = function(buf, seqid) {
-    connection.write(buf, seqid);
-  };
-  var transport = new connection.transport(undefined, writeCb);
-  var client = new ServiceClient(transport, connection.protocol);
-  transport.client = client;
-  connection.client = client;
-  return client;
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/framed_transport.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/framed_transport.js
deleted file mode 100644
index 6947925..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/framed_transport.js
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var binary = require('./binary');
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-module.exports = TFramedTransport;
-
-function TFramedTransport(buffer, callback) {
-  this.inBuf = buffer || new Buffer(0);
-  this.outBuffers = [];
-  this.outCount = 0;
-  this.readPos = 0;
-  this.onFlush = callback;
-};
-
-TFramedTransport.receiver = function(callback, seqid) {
-  var residual = null;
-
-  return function(data) {
-    // Prepend any residual data from our previous read
-    if (residual) {
-      data = Buffer.concat([residual, data]);
-      residual = null;
-    }
-
-    // framed transport
-    while (data.length) {
-      if (data.length < 4) {
-        // Not enough bytes to continue, save and resume on next packet
-        residual = data;
-        return;
-      }
-      var frameSize = binary.readI32(data, 0);
-      if (data.length < 4 + frameSize) {
-        // Not enough bytes to continue, save and resume on next packet
-        residual = data;
-        return;
-      }
-
-      var frame = data.slice(4, 4 + frameSize);
-      residual = data.slice(4 + frameSize);
-
-      callback(new TFramedTransport(frame), seqid);
-
-      data = residual;
-      residual = null;
-    }
-  };
-};
-
-TFramedTransport.prototype.commitPosition = function(){},
-TFramedTransport.prototype.rollbackPosition = function(){},
-
-  // TODO: Implement open/close support
-TFramedTransport.prototype.isOpen = function() {
-  return true;
-};
-TFramedTransport.prototype.open = function() {};
-TFramedTransport.prototype.close =  function() {};
-
-  // Set the seqid of the message in the client
-  // So that callbacks can be found
-TFramedTransport.prototype.setCurrSeqId = function(seqid) {
-  this._seqid = seqid;
-};
-
-TFramedTransport.prototype.ensureAvailable = function(len) {
-  if (this.readPos + len > this.inBuf.length) {
-    throw new InputBufferUnderrunError();
-  }
-};
-
-TFramedTransport.prototype.read = function(len) { // this function will be used for each frames.
-  this.ensureAvailable(len);
-  var end = this.readPos + len;
-
-  if (this.inBuf.length < end) {
-    throw new Error('read(' + len + ') failed - not enough data');
-  }
-
-  var buf = this.inBuf.slice(this.readPos, end);
-  this.readPos = end;
-  return buf;
-};
-
-TFramedTransport.prototype.readByte = function() {
-  this.ensureAvailable(1);
-  return binary.readByte(this.inBuf[this.readPos++]);
-};
-
-TFramedTransport.prototype.readI16 = function() {
-  this.ensureAvailable(2);
-  var i16 = binary.readI16(this.inBuf, this.readPos);
-  this.readPos += 2;
-  return i16;
-};
-
-TFramedTransport.prototype.readI32 = function() {
-  this.ensureAvailable(4);
-  var i32 = binary.readI32(this.inBuf, this.readPos);
-  this.readPos += 4;
-  return i32;
-};
-
-TFramedTransport.prototype.readDouble = function() {
-  this.ensureAvailable(8);
-  var d = binary.readDouble(this.inBuf, this.readPos);
-  this.readPos += 8;
-  return d;
-};
-
-TFramedTransport.prototype.readString = function(len) {
-  this.ensureAvailable(len);
-  var str = this.inBuf.toString('utf8', this.readPos, this.readPos + len);
-  this.readPos += len;
-  return str;
-};
-
-TFramedTransport.prototype.borrow = function() {
-  return {
-    buf: this.inBuf,
-    readIndex: this.readPos,
-    writeIndex: this.inBuf.length
-  };
-};
-
-TFramedTransport.prototype.consume = function(bytesConsumed) {
-  this.readPos += bytesConsumed;
-};
-
-TFramedTransport.prototype.write = function(buf, encoding) {
-  if (typeof(buf) === "string") {
-    buf = new Buffer(buf, encoding || 'utf8');
-  }
-  this.outBuffers.push(buf);
-  this.outCount += buf.length;
-};
-
-TFramedTransport.prototype.flush = function() {
-  // If the seqid of the callback is available pass it to the onFlush
-  // Then remove the current seqid
-  var seqid = this._seqid;
-  this._seqid = null;
-
-  var out = new Buffer(this.outCount),
-      pos = 0;
-  this.outBuffers.forEach(function(buf) {
-    buf.copy(out, pos, 0);
-    pos += buf.length;
-  });
-
-  if (this.onFlush) {
-    // TODO: optimize this better, allocate one buffer instead of both:
-    var msg = new Buffer(out.length + 4);
-    binary.writeI32(msg, out.length);
-    out.copy(msg, 4, 0, out.length);
-    if (this.onFlush) {
-      // Passing seqid through this call to get it to the connection
-      this.onFlush(msg, seqid);
-    }
-  }
-
-  this.outBuffers = [];
-  this.outCount = 0;
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/http_connection.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/http_connection.js
deleted file mode 100644
index 18bfadb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/http_connection.js
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var util = require('util');
-var http = require('http');
-var https = require('https');
-var EventEmitter = require('events').EventEmitter;
-var thrift = require('./thrift');
-
-var TBufferedTransport = require('./buffered_transport');
-var TBinaryProtocol = require('./binary_protocol');
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-var createClient = require('./create_client');
-
-/**
- * @class
- * @name ConnectOptions
- * @property {string} transport - The Thrift layered transport to use (TBufferedTransport, etc).
- * @property {string} protocol - The Thrift serialization protocol to use (TBinaryProtocol, etc.).
- * @property {string} path - The URL path to POST to (e.g. "/", "/mySvc", "/thrift/quoteSvc", etc.).
- * @property {object} headers - A standard Node.js header hash, an object hash containing key/value
- *        pairs where the key is the header name string and the value is the header value string.
- * @property {boolean} https - True causes the connection to use https, otherwise http is used.
- * @property {object} nodeOptions - Options passed on to node.
- * @example
- *     //Use a connection that requires ssl/tls, closes the connection after each request,
- *     //  uses the buffered transport layer, uses the JSON protocol and directs RPC traffic
- *     //  to https://thrift.example.com:9090/hello
- *     var thrift = require('thrift');
- *     var options = {
- *        transport: thrift.TBufferedTransport,
- *        protocol: thrift.TJSONProtocol,
- *        path: "/hello",
- *        headers: {"Connection": "close"},
- *        https: true
- *     };
- *     var con = thrift.createHttpConnection("thrift.example.com", 9090, options);
- *     var client = thrift.createHttpClient(myService, connection);
- *     client.myServiceFunction();
- */
-
-/**
- * Initializes a Thrift HttpConnection instance (use createHttpConnection() rather than
- *    instantiating directly).
- * @constructor
- * @param {string} host - The host name or IP to connect to.
- * @param {number} port - The TCP port to connect to.
- * @param {ConnectOptions} options - The configuration options to use.
- * @throws {error} Exceptions other than InputBufferUnderrunError are rethrown
- * @event {error} The "error" event is fired when a Node.js error event occurs during
- *     request or response processing, in which case the node error is passed on. An "error"
- *     event may also be fired when the connection can not map a response back to the
- *     appropriate client (an internal error), generating a TApplicationException.
- * @classdesc HttpConnection objects provide Thrift end point transport
- *     semantics implemented over the Node.js http.request() method.
- * @see {@link createHttpConnection}
- */
-var HttpConnection = exports.HttpConnection = function(host, port, options) {
-  //Initialize the emitter base object
-  EventEmitter.call(this);
-
-  //Set configuration
-  var self = this;
-  this.options = options || {};
-  this.host = host;
-  this.port = port;
-  this.https = this.options.https || false;
-  this.transport = this.options.transport || TBufferedTransport;
-  this.protocol = this.options.protocol || TBinaryProtocol;
-
-  //Prepare Node.js options
-  this.nodeOptions = {
-    host: this.host,
-    port: this.port || 80,
-    path: this.options.path || '/',
-    method: 'POST',
-    headers: this.options.headers || {},
-    responseType: this.options.responseType || null
-  };
-  for (var attrname in this.options.nodeOptions) {
-    this.nodeOptions[attrname] = this.options.nodeOptions[attrname];
-  }
-  /*jshint -W069 */
-  if (! this.nodeOptions.headers['Connection']) {
-    this.nodeOptions.headers['Connection'] = 'keep-alive';
-  }
-  /*jshint +W069 */
-
-  //The sequence map is used to map seqIDs back to the
-  //  calling client in multiplexed scenarios
-  this.seqId2Service = {};
-
-  function decodeCallback(transport_with_data) {
-    var proto = new self.protocol(transport_with_data);
-    try {
-      while (true) {
-        var header = proto.readMessageBegin();
-        var dummy_seqid = header.rseqid * -1;
-        var client = self.client;
-        //The Multiplexed Protocol stores a hash of seqid to service names
-        //  in seqId2Service. If the SeqId is found in the hash we need to
-        //  lookup the appropriate client for this call.
-        //  The client var is a single client object when not multiplexing,
-        //  when using multiplexing it is a service name keyed hash of client
-        //  objects.
-        //NOTE: The 2 way interdependencies between protocols, transports,
-        //  connections and clients in the Node.js implementation are irregular
-        //  and make the implementation difficult to extend and maintain. We
-        //  should bring this stuff inline with typical thrift I/O stack
-        //  operation soon.
-        //  --ra
-        var service_name = self.seqId2Service[header.rseqid];
-        if (service_name) {
-          client = self.client[service_name];
-          delete self.seqId2Service[header.rseqid];
-        }
-        /*jshint -W083 */
-        client._reqs[dummy_seqid] = function(err, success){
-          transport_with_data.commitPosition();
-          var clientCallback = client._reqs[header.rseqid];
-          delete client._reqs[header.rseqid];
-          if (clientCallback) {
-            process.nextTick(function() {
-              clientCallback(err, success);
-            });
-          }
-        };
-        /*jshint +W083 */
-        if(client['recv_' + header.fname]) {
-          client['recv_' + header.fname](proto, header.mtype, dummy_seqid);
-        } else {
-          delete client._reqs[dummy_seqid];
-          self.emit("error",
-                    new thrift.TApplicationException(
-                       thrift.TApplicationExceptionType.WRONG_METHOD_NAME,
-                       "Received a response to an unknown RPC function"));
-        }
-      }
-    }
-    catch (e) {
-      if (e instanceof InputBufferUnderrunError) {
-        transport_with_data.rollbackPosition();
-      } else {
-        self.emit('error', e);
-      }
-    }
-  }
-
-
-  //Response handler
-  //////////////////////////////////////////////////
-  this.responseCallback = function(response) {
-    var data = [];
-    var dataLen = 0;
-
-    response.on('error', function (e) {
-      self.emit("error", e);
-    });
-
-    // When running directly under node, chunk will be a buffer,
-    // however, when running in a Browser (e.g. Browserify), chunk
-    // will be a string or an ArrayBuffer.
-    response.on('data', function (chunk) {
-      if ((typeof chunk == 'string') ||
-          (Object.prototype.toString.call(chunk) == '[object Uint8Array]')) {
-        // Wrap ArrayBuffer/string in a Buffer so data[i].copy will work
-        data.push(new Buffer(chunk));
-      } else {
-        data.push(chunk);
-      }
-      dataLen += chunk.length;
-    });
-
-    response.on('end', function(){
-      var buf = new Buffer(dataLen);
-      for (var i=0, len=data.length, pos=0; i<len; i++) {
-        data[i].copy(buf, pos);
-        pos += data[i].length;
-      }
-      //Get the receiver function for the transport and
-      //  call it with the buffer
-      self.transport.receiver(decodeCallback)(buf);
-    });
-  };
-};
-util.inherits(HttpConnection, EventEmitter);
-
-/**
- * Writes Thrift message data to the connection
- * @param {Buffer} data - A Node.js Buffer containing the data to write
- * @returns {void} No return value.
- * @event {error} the "error" event is raised upon request failure passing the
- *     Node.js error object to the listener.
- */
-HttpConnection.prototype.write = function(data) {
-  var self = this;
-  self.nodeOptions.headers["Content-length"] = data.length;
-  var req = (self.https) ?
-      https.request(self.nodeOptions, self.responseCallback) :
-      http.request(self.nodeOptions, self.responseCallback);
-  req.on('error', function(err) {
-    self.emit("error", err);
-  });
-  req.write(data);
-  req.end();
-};
-
-/**
- * Creates a new HttpConnection object, used by Thrift clients to connect
- *    to Thrift HTTP based servers.
- * @param {string} host - The host name or IP to connect to.
- * @param {number} port - The TCP port to connect to.
- * @param {ConnectOptions} options - The configuration options to use.
- * @returns {HttpConnection} The connection object.
- * @see {@link ConnectOptions}
- */
-exports.createHttpConnection = function(host, port, options) {
-  return new HttpConnection(host, port, options);
-};
-
-exports.createHttpClient = createClient
-
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/index.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/index.js
deleted file mode 100644
index 61e5cbd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/index.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-exports.Thrift = require('./thrift');
-
-var connection = require('./connection');
-exports.Connection = connection.Connection;
-exports.createClient = connection.createClient;
-exports.createConnection = connection.createConnection;
-exports.createSSLConnection = connection.createSSLConnection;
-exports.createStdIOClient = connection.createStdIOClient;
-exports.createStdIOConnection = connection.createStdIOConnection;
-
-var httpConnection = require('./http_connection');
-exports.HttpConnection = httpConnection.HttpConnection;
-exports.createHttpConnection = httpConnection.createHttpConnection;
-exports.createHttpClient = httpConnection.createHttpClient;
-
-var wsConnection = require('./ws_connection');
-exports.WSConnection = wsConnection.WSConnection;
-exports.createWSConnection = wsConnection.createWSConnection;
-exports.createWSClient = wsConnection.createWSClient;
-
-var xhrConnection = require('./xhr_connection');
-exports.XHRConnection = xhrConnection.XHRConnection;
-exports.createXHRConnection = xhrConnection.createXHRConnection;
-exports.createXHRClient = xhrConnection.createXHRClient;
-
-var server = require('./server');
-exports.createServer = server.createServer;
-exports.createMultiplexServer = server.createMultiplexServer;
-
-var web_server = require('./web_server');
-exports.createWebServer = web_server.createWebServer;
-
-exports.Int64 = require('node-int64');
-exports.Q = require('q');
-
-var mprocessor = require('./multiplexed_processor');
-var mprotocol = require('./multiplexed_protocol');
-exports.Multiplexer = mprotocol.Multiplexer;
-exports.MultiplexedProcessor = mprocessor.MultiplexedProcessor;
-
-/*
- * Export transport and protocol so they can be used outside of a
- * cassandra/server context
- */
-exports.TFramedTransport = require('./framed_transport');
-exports.TBufferedTransport = require('./buffered_transport');
-exports.TBinaryProtocol = require('./binary_protocol');
-exports.TJSONProtocol = require('./json_protocol');
-exports.TCompactProtocol = require('./compact_protocol');
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/input_buffer_underrun_error.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/input_buffer_underrun_error.js
deleted file mode 100644
index 72555e5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/input_buffer_underrun_error.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var util = require("util");
-
-module.exports = InputBufferUnderrunError;
-
-function InputBufferUnderrunError(message) {
-  Error.call(this);
-  Error.captureStackTrace(this, this.constructor);
-  this.name = this.constructor.name;
-  this.message = message;
-};
-
-util.inherits(InputBufferUnderrunError, Error);
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/int64_util.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/int64_util.js
deleted file mode 100644
index e8d707d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/int64_util.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var Int64 = require('node-int64');
-
-var Int64Util = module.exports = {};
-
-var POW2_24 = Math.pow(2, 24);
-var POW2_31 = Math.pow(2, 31);
-var POW2_32 = Math.pow(2, 32);
-var POW10_11 = Math.pow(10, 11);
-
-Int64Util.toDecimalString = function(i64) {
-  var b = i64.buffer;
-  var o = i64.offset;
-  if ((!b[o] && !(b[o + 1] & 0xe0)) ||
-      (!~b[o] && !~(b[o + 1] & 0xe0))) {
-    // The magnitude is small enough.
-    return i64.toString();
-  } else {
-    var negative = b[o] & 0x80;
-    if (negative) {
-      // 2's complement
-      var incremented = false;
-      var buffer = new Buffer(8);
-      for (var i = 7; i >= 0; --i) {
-        buffer[i] = (~b[o + i] + (incremented ? 0 : 1)) & 0xff;
-        incremented |= b[o + i];
-      }
-      b = buffer;
-    }
-    var high2 = b[o + 1] + (b[o] << 8);
-    // Lesser 11 digits with exceeding values but is under 53 bits capacity.
-    var low = b[o + 7] + (b[o + 6] << 8) + (b[o + 5] << 16)
-        + b[o + 4] * POW2_24  // Bit shift renders 32th bit as sign, so use multiplication
-        + (b[o + 3] + (b[o + 2] << 8)) * POW2_32 + high2 * 74976710656;  // The literal is 2^48 % 10^11
-    // 12th digit and greater.
-    var high = Math.floor(low / POW10_11) + high2 * 2814;  // The literal is 2^48 / 10^11
-    // Make it exactly 11 with leading zeros.
-    low = ('00000000000' + String(low % POW10_11)).slice(-11);
-    return (negative ? '-' : '') + String(high) + low;
-  }
-};
-
-Int64Util.fromDecimalString = function(text) {
-  var negative = text.charAt(0) === '-';
-  if (text.length < (negative ? 17 : 16)) {
-    // The magnitude is smaller than 2^53.
-    return new Int64(+text);
-  } else if (text.length > (negative ? 20 : 19)) {
-    throw new RangeError('Too many digits for Int64: ' + text);
-  } else {
-    // Most significant (up to 5) digits
-    var high5 = +text.slice(negative ? 1 : 0, -15);
-    var low = +text.slice(-15) + high5 * 2764472320;  // The literal is 10^15 % 2^32
-    var high = Math.floor(low / POW2_32) + high5 * 232830;  // The literal is 10^15 / 2^&32
-    low = low % POW2_32;
-    if (high >= POW2_31 &&
-        !(negative && high == POW2_31 && low == 0)  // Allow minimum Int64
-       ) {
-      throw new RangeError('The magnitude is too large for Int64.');
-    }
-    if (negative) {
-      // 2's complement
-      high = ~high;
-      if (low === 0) {
-        high = (high + 1) & 0xffffffff;
-      } else {
-        low = ~low + 1;
-      }
-      high = 0x80000000 | high;
-    }
-    return new Int64(high, low);
-  }
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/json_parse.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/json_parse.js
deleted file mode 100644
index 93b0bf2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/json_parse.js
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Imported from Douglas Crockford's reference implementation with minimum modification
- * to handle Int64.
- *
- * https://github.com/douglascrockford/JSON-js/blob/c98948ae1944a28e2e8ebc3717894e580aeaaa05/json_parse.js
- *
- * Original license header:
- *
- * json_parse.js
- * 2015-05-02
- * Public Domain.
- * NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
- */
-
-
-/*jslint for */
-
-/*property
-    at, b, call, charAt, f, fromCharCode, hasOwnProperty, message, n, name,
-    prototype, push, r, t, text
-*/
-
-var Int64 = require('node-int64');
-var Int64Util = require('./int64_util');
-
-var json_parse = module.exports = (function () {
-    "use strict";
-
-// This is a function that can parse a JSON text, producing a JavaScript
-// data structure. It is a simple, recursive descent parser. It does not use
-// eval or regular expressions, so it can be used as a model for implementing
-// a JSON parser in other languages.
-
-// We are defining the function inside of another function to avoid creating
-// global variables.
-
-    var at,     // The index of the current character
-        ch,     // The current character
-        escapee = {
-            '"': '"',
-            '\\': '\\',
-            '/': '/',
-            b: '\b',
-            f: '\f',
-            n: '\n',
-            r: '\r',
-            t: '\t'
-        },
-        text,
-
-        error = function (m) {
-
-// Call error when something is wrong.
-
-            throw new SyntaxError(m);
-        },
-
-        next = function (c) {
-
-// If a c parameter is provided, verify that it matches the current character.
-
-            if (c && c !== ch) {
-                error("Expected '" + c + "' instead of '" + ch + "'");
-            }
-
-// Get the next character. When there are no more characters,
-// return the empty string.
-
-            ch = text.charAt(at);
-            at += 1;
-            return ch;
-        },
-
-        number = function () {
-
-// Parse a number value.
-
-            var number,
-                string = '';
-
-            if (ch === '-') {
-                string = '-';
-                next('-');
-            }
-            while (ch >= '0' && ch <= '9') {
-                string += ch;
-                next();
-            }
-            if (ch === '.') {
-                string += '.';
-                while (next() && ch >= '0' && ch <= '9') {
-                    string += ch;
-                }
-            }
-            if (ch === 'e' || ch === 'E') {
-                string += ch;
-                next();
-                if (ch === '-' || ch === '+') {
-                    string += ch;
-                    next();
-                }
-                while (ch >= '0' && ch <= '9') {
-                    string += ch;
-                    next();
-                }
-            }
-            number = +string;
-            if (!isFinite(number)) {
-                error("Bad number");
-            } else if (number >= Int64.MAX_INT || number <= Int64.MIN_INT) {
-                // Return raw string for further process in TJSONProtocol
-                return string;
-            } else {
-                return number;
-            }
-        },
-
-        string = function () {
-
-// Parse a string value.
-
-            var hex,
-                i,
-                string = '',
-                uffff;
-
-// When parsing for string values, we must look for " and \ characters.
-
-            if (ch === '"') {
-                while (next()) {
-                    if (ch === '"') {
-                        next();
-                        return string;
-                    }
-                    if (ch === '\\') {
-                        next();
-                        if (ch === 'u') {
-                            uffff = 0;
-                            for (i = 0; i < 4; i += 1) {
-                                hex = parseInt(next(), 16);
-                                if (!isFinite(hex)) {
-                                    break;
-                                }
-                                uffff = uffff * 16 + hex;
-                            }
-                            string += String.fromCharCode(uffff);
-                        } else if (typeof escapee[ch] === 'string') {
-                            string += escapee[ch];
-                        } else {
-                            break;
-                        }
-                    } else {
-                        string += ch;
-                    }
-                }
-            }
-            error("Bad string");
-        },
-
-        white = function () {
-
-// Skip whitespace.
-
-            while (ch && ch <= ' ') {
-                next();
-            }
-        },
-
-        word = function () {
-
-// true, false, or null.
-
-            switch (ch) {
-            case 't':
-                next('t');
-                next('r');
-                next('u');
-                next('e');
-                return true;
-            case 'f':
-                next('f');
-                next('a');
-                next('l');
-                next('s');
-                next('e');
-                return false;
-            case 'n':
-                next('n');
-                next('u');
-                next('l');
-                next('l');
-                return null;
-            }
-            error("Unexpected '" + ch + "'");
-        },
-
-        value,  // Place holder for the value function.
-
-        array = function () {
-
-// Parse an array value.
-
-            var array = [];
-
-            if (ch === '[') {
-                next('[');
-                white();
-                if (ch === ']') {
-                    next(']');
-                    return array;   // empty array
-                }
-                while (ch) {
-                    array.push(value());
-                    white();
-                    if (ch === ']') {
-                        next(']');
-                        return array;
-                    }
-                    next(',');
-                    white();
-                }
-            }
-            error("Bad array");
-        },
-
-        object = function () {
-
-// Parse an object value.
-
-            var key,
-                object = {};
-
-            if (ch === '{') {
-                next('{');
-                white();
-                if (ch === '}') {
-                    next('}');
-                    return object;   // empty object
-                }
-                while (ch) {
-                    key = string();
-                    white();
-                    next(':');
-                    if (Object.hasOwnProperty.call(object, key)) {
-                        error('Duplicate key "' + key + '"');
-                    }
-                    object[key] = value();
-                    white();
-                    if (ch === '}') {
-                        next('}');
-                        return object;
-                    }
-                    next(',');
-                    white();
-                }
-            }
-            error("Bad object");
-        };
-
-    value = function () {
-
-// Parse a JSON value. It could be an object, an array, a string, a number,
-// or a word.
-
-        white();
-        switch (ch) {
-        case '{':
-            return object();
-        case '[':
-            return array();
-        case '"':
-            return string();
-        case '-':
-            return number();
-        default:
-            return ch >= '0' && ch <= '9'
-                ? number()
-                : word();
-        }
-    };
-
-// Return the json_parse function. It will have access to all of the above
-// functions and variables.
-
-    return function (source) {
-        var result;
-
-        text = source;
-        at = 0;
-        ch = ' ';
-        result = value();
-        white();
-        if (ch) {
-            error("Syntax error");
-        }
-
-        return result;
-    };
-}());
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/json_protocol.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/json_protocol.js
deleted file mode 100644
index f31e3b2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/json_protocol.js
+++ /dev/null
@@ -1,743 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var log = require('./log');
-var Int64 = require('node-int64');
-var InputBufferUnderrunError = require('./transport').InputBufferUnderrunError;
-var Thrift = require('./thrift');
-var Type = Thrift.Type;
-var util = require("util");
-
-var Int64Util = require('./int64_util');
-var json_parse = require('./json_parse');
-
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-module.exports = TJSONProtocol;
-
-/**
- * Initializes a Thrift JSON protocol instance.
- * @constructor
- * @param {Thrift.Transport} trans - The transport to serialize to/from.
- * @classdesc Apache Thrift Protocols perform serialization which enables cross
- * language RPC. The Protocol type is the JavaScript browser implementation
- * of the Apache Thrift TJSONProtocol.
- * @example
- *     var protocol  = new Thrift.Protocol(transport);
- */
-function TJSONProtocol(trans) {
-  this.tstack = [];
-  this.tpos = [];
-  this.trans = trans;
-};
-
-/**
- * Thrift IDL type Id to string mapping.
- * @readonly
- * @see {@link Thrift.Type}
- */
-TJSONProtocol.Type = {};
-TJSONProtocol.Type[Type.BOOL] = '"tf"';
-TJSONProtocol.Type[Type.BYTE] = '"i8"';
-TJSONProtocol.Type[Type.I16] = '"i16"';
-TJSONProtocol.Type[Type.I32] = '"i32"';
-TJSONProtocol.Type[Type.I64] = '"i64"';
-TJSONProtocol.Type[Type.DOUBLE] = '"dbl"';
-TJSONProtocol.Type[Type.STRUCT] = '"rec"';
-TJSONProtocol.Type[Type.STRING] = '"str"';
-TJSONProtocol.Type[Type.MAP] = '"map"';
-TJSONProtocol.Type[Type.LIST] = '"lst"';
-TJSONProtocol.Type[Type.SET] = '"set"';
-
-/**
- * Thrift IDL type string to Id mapping.
- * @readonly
- * @see {@link Thrift.Type}
- */
-TJSONProtocol.RType = {};
-TJSONProtocol.RType.tf = Type.BOOL;
-TJSONProtocol.RType.i8 = Type.BYTE;
-TJSONProtocol.RType.i16 = Type.I16;
-TJSONProtocol.RType.i32 = Type.I32;
-TJSONProtocol.RType.i64 = Type.I64;
-TJSONProtocol.RType.dbl = Type.DOUBLE;
-TJSONProtocol.RType.rec = Type.STRUCT;
-TJSONProtocol.RType.str = Type.STRING;
-TJSONProtocol.RType.map = Type.MAP;
-TJSONProtocol.RType.lst = Type.LIST;
-TJSONProtocol.RType.set = Type.SET;
-
-/**
- * The TJSONProtocol version number.
- * @readonly
- * @const {number} Version
- * @memberof Thrift.Protocol
- */
-TJSONProtocol.Version = 1;
-
-TJSONProtocol.prototype.flush = function() {
-  this.writeToTransportIfStackIsFlushable();
-  return this.trans.flush();
-};
-
-TJSONProtocol.prototype.writeToTransportIfStackIsFlushable = function() {
-  if (this.tstack.length === 1) {
-    this.trans.write(this.tstack.pop());
-  }
-};
-
-/**
- * Serializes the beginning of a Thrift RPC message.
- * @param {string} name - The service method to call.
- * @param {Thrift.MessageType} messageType - The type of method call.
- * @param {number} seqid - The sequence number of this call (always 0 in Apache Thrift).
- */
-TJSONProtocol.prototype.writeMessageBegin = function(name, messageType, seqid) {
-  this.tstack.push([TJSONProtocol.Version, '"' + name + '"', messageType, seqid]);
-};
-
-/**
- * Serializes the end of a Thrift RPC message.
- */
-TJSONProtocol.prototype.writeMessageEnd = function() {
-  var obj = this.tstack.pop();
-
-  this.wobj = this.tstack.pop();
-  this.wobj.push(obj);
-
-  this.wbuf = '[' + this.wobj.join(',') + ']';
-
-  // we assume there is nothing more to come so we write
-  this.trans.write(this.wbuf);
-};
-
-/**
- * Serializes the beginning of a struct.
- * @param {string} name - The name of the struct.
- */
-TJSONProtocol.prototype.writeStructBegin = function(name) {
-  this.tpos.push(this.tstack.length);
-  this.tstack.push({});
-};
-
-/**
- * Serializes the end of a struct.
- */
-TJSONProtocol.prototype.writeStructEnd = function() {
-  var p = this.tpos.pop();
-  var struct = this.tstack[p];
-  var str = '{';
-  var first = true;
-  for (var key in struct) {
-    if (first) {
-      first = false;
-    } else {
-      str += ',';
-    }
-
-    str += key + ':' + struct[key];
-  }
-
-  str += '}';
-  this.tstack[p] = str;
-
-  this.writeToTransportIfStackIsFlushable();
-};
-
-/**
- * Serializes the beginning of a struct field.
- * @param {string} name - The name of the field.
- * @param {Thrift.Protocol.Type} fieldType - The data type of the field.
- * @param {number} fieldId - The field's unique identifier.
- */
-TJSONProtocol.prototype.writeFieldBegin = function(name, fieldType, fieldId) {
-  this.tpos.push(this.tstack.length);
-  this.tstack.push({ 'fieldId': '"' +
-    fieldId + '"', 'fieldType': TJSONProtocol.Type[fieldType]
-  });
-};
-
-/**
- * Serializes the end of a field.
- */
-TJSONProtocol.prototype.writeFieldEnd = function() {
-  var value = this.tstack.pop();
-  var fieldInfo = this.tstack.pop();
-
-  if (':' + value === ":[object Object]") {
-    this.tstack[this.tstack.length - 1][fieldInfo.fieldId] = '{' +
-      fieldInfo.fieldType + ':' + JSON.stringify(value) + '}';
-  } else {
-    this.tstack[this.tstack.length - 1][fieldInfo.fieldId] = '{' +
-      fieldInfo.fieldType + ':' + value + '}';
-  }
-  this.tpos.pop();
-
-  this.writeToTransportIfStackIsFlushable();
-};
-
-/**
- * Serializes the end of the set of fields for a struct.
- */
-TJSONProtocol.prototype.writeFieldStop = function() {
-};
-
-/**
- * Serializes the beginning of a map collection.
- * @param {Thrift.Type} keyType - The data type of the key.
- * @param {Thrift.Type} valType - The data type of the value.
- * @param {number} [size] - The number of elements in the map (ignored).
- */
-TJSONProtocol.prototype.writeMapBegin = function(keyType, valType, size) {
-  //size is invalid, we'll set it on end.
-  this.tpos.push(this.tstack.length);
-  this.tstack.push([TJSONProtocol.Type[keyType], TJSONProtocol.Type[valType], 0]);
-};
-
-/**
- * Serializes the end of a map.
- */
-TJSONProtocol.prototype.writeMapEnd = function() {
-  var p = this.tpos.pop();
-
-  if (p == this.tstack.length) {
-    return;
-  }
-
-  if ((this.tstack.length - p - 1) % 2 !== 0) {
-    this.tstack.push('');
-  }
-
-  var size = (this.tstack.length - p - 1) / 2;
-
-  this.tstack[p][this.tstack[p].length - 1] = size;
-
-  var map = '}';
-  var first = true;
-  while (this.tstack.length > p + 1) {
-    var v = this.tstack.pop();
-    var k = this.tstack.pop();
-    if (first) {
-      first = false;
-    } else {
-      map = ',' + map;
-    }
-
-    if (! isNaN(k)) { k = '"' + k + '"'; } //json "keys" need to be strings
-    map = k + ':' + v + map;
-  }
-  map = '{' + map;
-
-  this.tstack[p].push(map);
-  this.tstack[p] = '[' + this.tstack[p].join(',') + ']';
-
-  this.writeToTransportIfStackIsFlushable();
-};
-
-/**
- * Serializes the beginning of a list collection.
- * @param {Thrift.Type} elemType - The data type of the elements.
- * @param {number} size - The number of elements in the list.
- */
-TJSONProtocol.prototype.writeListBegin = function(elemType, size) {
-  this.tpos.push(this.tstack.length);
-  this.tstack.push([TJSONProtocol.Type[elemType], size]);
-};
-
-/**
- * Serializes the end of a list.
- */
-TJSONProtocol.prototype.writeListEnd = function() {
-  var p = this.tpos.pop();
-
-  while (this.tstack.length > p + 1) {
-    var tmpVal = this.tstack[p + 1];
-    this.tstack.splice(p + 1, 1);
-    this.tstack[p].push(tmpVal);
-  }
-
-  this.tstack[p] = '[' + this.tstack[p].join(',') + ']';
-
-  this.writeToTransportIfStackIsFlushable();
-};
-
-/**
- * Serializes the beginning of a set collection.
- * @param {Thrift.Type} elemType - The data type of the elements.
- * @param {number} size - The number of elements in the list.
- */
-TJSONProtocol.prototype.writeSetBegin = function(elemType, size) {
-    this.tpos.push(this.tstack.length);
-    this.tstack.push([TJSONProtocol.Type[elemType], size]);
-};
-
-/**
- * Serializes the end of a set.
- */
-TJSONProtocol.prototype.writeSetEnd = function() {
-  var p = this.tpos.pop();
-
-  while (this.tstack.length > p + 1) {
-    var tmpVal = this.tstack[p + 1];
-    this.tstack.splice(p + 1, 1);
-    this.tstack[p].push(tmpVal);
-  }
-
-  this.tstack[p] = '[' + this.tstack[p].join(',') + ']';
-
-  this.writeToTransportIfStackIsFlushable();
-};
-
-/** Serializes a boolean */
-TJSONProtocol.prototype.writeBool = function(bool) {
-  this.tstack.push(bool ? 1 : 0);
-};
-
-/** Serializes a number */
-TJSONProtocol.prototype.writeByte = function(byte) {
-  this.tstack.push(byte);
-};
-
-/** Serializes a number */
-TJSONProtocol.prototype.writeI16 = function(i16) {
-  this.tstack.push(i16);
-};
-
-/** Serializes a number */
-TJSONProtocol.prototype.writeI32 = function(i32) {
-  this.tstack.push(i32);
-};
-
-/** Serializes a number */
-TJSONProtocol.prototype.writeI64 = function(i64) {
-  if (i64 instanceof Int64) {
-    this.tstack.push(Int64Util.toDecimalString(i64));
-  } else {
-    this.tstack.push(i64);
-  }
-};
-
-/** Serializes a number */
-TJSONProtocol.prototype.writeDouble = function(dub) {
-  this.tstack.push(dub);
-};
-
-/** Serializes a string */
-TJSONProtocol.prototype.writeString = function(arg) {
-  // We do not encode uri components for wire transfer:
-  if (arg === null) {
-      this.tstack.push(null);
-  } else {
-      if (typeof arg === 'string') {
-        var str = arg;
-      } else if (arg instanceof Buffer) {
-        var str = arg.toString('utf8');
-      } else {
-        throw new Error('writeString called without a string/Buffer argument: ' + arg);
-      }
-
-      // concat may be slower than building a byte buffer
-      var escapedString = '';
-      for (var i = 0; i < str.length; i++) {
-          var ch = str.charAt(i);      // a single double quote: "
-          if (ch === '\"') {
-              escapedString += '\\\"'; // write out as: \"
-          } else if (ch === '\\') {    // a single backslash: \
-              escapedString += '\\\\'; // write out as: \\
-          /* Currently escaped forward slashes break TJSONProtocol.
-           * As it stands, we can simply pass forward slashes into
-           * our strings across the wire without being escaped.
-           * I think this is the protocol's bug, not thrift.js
-           * } else if(ch === '/') {   // a single forward slash: /
-           *  escapedString += '\\/';  // write out as \/
-           * }
-           */
-          } else if (ch === '\b') {    // a single backspace: invisible
-              escapedString += '\\b';  // write out as: \b"
-          } else if (ch === '\f') {    // a single formfeed: invisible
-              escapedString += '\\f';  // write out as: \f"
-          } else if (ch === '\n') {    // a single newline: invisible
-              escapedString += '\\n';  // write out as: \n"
-          } else if (ch === '\r') {    // a single return: invisible
-              escapedString += '\\r';  // write out as: \r"
-          } else if (ch === '\t') {    // a single tab: invisible
-              escapedString += '\\t';  // write out as: \t"
-          } else {
-              escapedString += ch;     // Else it need not be escaped
-          }
-      }
-      this.tstack.push('"' + escapedString + '"');
-  }
-};
-
-/** Serializes a string */
-TJSONProtocol.prototype.writeBinary = function(arg) {
-  if (typeof arg === 'string') {
-    var buf = new Buffer(arg, 'binary');
-  } else if (arg instanceof Buffer ||
-             Object.prototype.toString.call(arg) == '[object Uint8Array]')  {
-    var buf = arg;
-  } else {
-    throw new Error('writeBinary called without a string/Buffer argument: ' + arg);
-  }
-  this.tstack.push('"' + buf.toString('base64') + '"');
-};
-
-/**
- * @class
- * @name AnonReadMessageBeginReturn
- * @property {string} fname - The name of the service method.
- * @property {Thrift.MessageType} mtype - The type of message call.
- * @property {number} rseqid - The sequence number of the message (0 in Thrift RPC).
- */
-/**
- * Deserializes the beginning of a message.
- * @returns {AnonReadMessageBeginReturn}
- */
-TJSONProtocol.prototype.readMessageBegin = function() {
-  this.rstack = [];
-  this.rpos = [];
-
-  //Borrow the inbound transport buffer and ensure data is present/consistent
-  var transBuf = this.trans.borrow();
-  if (transBuf.readIndex >= transBuf.writeIndex) {
-    throw new InputBufferUnderrunError();
-  }
-  var cursor = transBuf.readIndex;
-
-  if (transBuf.buf[cursor] !== 0x5B) { //[
-    throw new Error("Malformed JSON input, no opening bracket");
-  }
-
-  //Parse a single message (there may be several in the buffer)
-  //  TODO: Handle characters using multiple code units
-  cursor++;
-  var openBracketCount = 1;
-  var inString = false;
-  for (; cursor < transBuf.writeIndex; cursor++) {
-    var chr = transBuf.buf[cursor];
-    //we use hexa charcode here because data[i] returns an int and not a char
-    if (inString) {
-      if (chr === 0x22) { //"
-        inString = false;
-      } else if (chr === 0x5C) { //\
-        //escaped character, skip
-        cursor += 1;
-      }
-    } else {
-      if (chr === 0x5B) { //[
-        openBracketCount += 1;
-      } else if (chr === 0x5D) { //]
-        openBracketCount -= 1;
-        if (openBracketCount === 0) {
-          //end of json message detected
-          break;
-        }
-      } else if (chr === 0x22) { //"
-        inString = true;
-      }
-    }
-  }
-
-  if (openBracketCount !== 0) {
-    // Missing closing bracket. Can be buffer underrun.
-    throw new InputBufferUnderrunError();
-  }
-
-  //Reconstitute the JSON object and conume the necessary bytes
-  this.robj = json_parse(transBuf.buf.slice(transBuf.readIndex, cursor+1).toString());
-  this.trans.consume(cursor + 1 - transBuf.readIndex);
-
-  //Verify the protocol version
-  var version = this.robj.shift();
-  if (version != TJSONProtocol.Version) {
-    throw new Error('Wrong thrift protocol version: ' + version);
-  }
-
-  //Objectify the thrift message {name/type/sequence-number} for return
-  // and then save the JSON object in rstack
-  var r = {};
-  r.fname = this.robj.shift();
-  r.mtype = this.robj.shift();
-  r.rseqid = this.robj.shift();
-  this.rstack.push(this.robj.shift());
-  return r;
-};
-
-/** Deserializes the end of a message. */
-TJSONProtocol.prototype.readMessageEnd = function() {
-};
-
-/**
- * Deserializes the beginning of a struct.
- * @param {string} [name] - The name of the struct (ignored)
- * @returns {object} - An object with an empty string fname property
- */
-TJSONProtocol.prototype.readStructBegin = function() {
-  var r = {};
-  r.fname = '';
-
-  //incase this is an array of structs
-  if (this.rstack[this.rstack.length - 1] instanceof Array) {
-    this.rstack.push(this.rstack[this.rstack.length - 1].shift());
-  }
-
-  return r;
-};
-
-/** Deserializes the end of a struct. */
-TJSONProtocol.prototype.readStructEnd = function() {
-  this.rstack.pop();
-};
-
-/**
- * @class
- * @name AnonReadFieldBeginReturn
- * @property {string} fname - The name of the field (always '').
- * @property {Thrift.Type} ftype - The data type of the field.
- * @property {number} fid - The unique identifier of the field.
- */
-/**
- * Deserializes the beginning of a field.
- * @returns {AnonReadFieldBeginReturn}
- */
-TJSONProtocol.prototype.readFieldBegin = function() {
-  var r = {};
-
-  var fid = -1;
-  var ftype = Type.STOP;
-
-  //get a fieldId
-  for (var f in (this.rstack[this.rstack.length - 1])) {
-    if (f === null) {
-      continue;
-    }
-
-    fid = parseInt(f, 10);
-    this.rpos.push(this.rstack.length);
-
-    var field = this.rstack[this.rstack.length - 1][fid];
-
-    //remove so we don't see it again
-    delete this.rstack[this.rstack.length - 1][fid];
-
-    this.rstack.push(field);
-
-    break;
-  }
-
-  if (fid != -1) {
-    //should only be 1 of these but this is the only
-    //way to match a key
-    for (var i in (this.rstack[this.rstack.length - 1])) {
-      if (TJSONProtocol.RType[i] === null) {
-        continue;
-      }
-
-      ftype = TJSONProtocol.RType[i];
-      this.rstack[this.rstack.length - 1] = this.rstack[this.rstack.length - 1][i];
-    }
-  }
-
-  r.fname = '';
-  r.ftype = ftype;
-  r.fid = fid;
-
-  return r;
-};
-
-/** Deserializes the end of a field. */
-TJSONProtocol.prototype.readFieldEnd = function() {
-  var pos = this.rpos.pop();
-
-  //get back to the right place in the stack
-  while (this.rstack.length > pos) {
-    this.rstack.pop();
-  }
-};
-
-/**
- * @class
- * @name AnonReadMapBeginReturn
- * @property {Thrift.Type} ktype - The data type of the key.
- * @property {Thrift.Type} vtype - The data type of the value.
- * @property {number} size - The number of elements in the map.
- */
-/**
- * Deserializes the beginning of a map.
- * @returns {AnonReadMapBeginReturn}
- */
-TJSONProtocol.prototype.readMapBegin = function() {
-  var map = this.rstack.pop();
-  var first = map.shift();
-  if (first instanceof Array) {
-    this.rstack.push(map);
-    map = first;
-    first = map.shift();
-  }
-
-  var r = {};
-  r.ktype = TJSONProtocol.RType[first];
-  r.vtype = TJSONProtocol.RType[map.shift()];
-  r.size = map.shift();
-
-
-  this.rpos.push(this.rstack.length);
-  this.rstack.push(map.shift());
-
-  return r;
-};
-
-/** Deserializes the end of a map. */
-TJSONProtocol.prototype.readMapEnd = function() {
-  this.readFieldEnd();
-};
-
-/**
- * @class
- * @name AnonReadColBeginReturn
- * @property {Thrift.Type} etype - The data type of the element.
- * @property {number} size - The number of elements in the collection.
- */
-/**
- * Deserializes the beginning of a list.
- * @returns {AnonReadColBeginReturn}
- */
-TJSONProtocol.prototype.readListBegin = function() {
-  var list = this.rstack[this.rstack.length - 1];
-
-  var r = {};
-  r.etype = TJSONProtocol.RType[list.shift()];
-  r.size = list.shift();
-
-  this.rpos.push(this.rstack.length);
-  this.rstack.push(list.shift());
-
-  return r;
-};
-
-/** Deserializes the end of a list. */
-TJSONProtocol.prototype.readListEnd = function() {
-  var pos = this.rpos.pop() - 2;
-  var st = this.rstack;
-  st.pop();
-  if (st instanceof Array && st.length > pos && st[pos].length > 0) {
-    st.push(st[pos].shift());
-  }
-};
-
-/**
- * Deserializes the beginning of a set.
- * @returns {AnonReadColBeginReturn}
- */
-TJSONProtocol.prototype.readSetBegin = function() {
-  return this.readListBegin();
-};
-
-/** Deserializes the end of a set. */
-TJSONProtocol.prototype.readSetEnd = function() {
-  return this.readListEnd();
-};
-
-TJSONProtocol.prototype.readBool = function() {
-  return this.readValue() == '1';
-};
-
-TJSONProtocol.prototype.readByte = function() {
-  return this.readI32();
-};
-
-TJSONProtocol.prototype.readI16 = function() {
-  return this.readI32();
-};
-
-TJSONProtocol.prototype.readI32 = function(f) {
-  return +this.readValue();
-}
-
-/** Returns the next value found in the protocol buffer */
-TJSONProtocol.prototype.readValue = function(f) {
-  if (f === undefined) {
-    f = this.rstack[this.rstack.length - 1];
-  }
-
-  var r = {};
-
-  if (f instanceof Array) {
-    if (f.length === 0) {
-      r.value = undefined;
-    } else {
-      r.value = f.shift();
-    }
-  } else if (!(f instanceof Int64) && f instanceof Object) {
-    for (var i in f) {
-      if (i === null) {
-        continue;
-      }
-      this.rstack.push(f[i]);
-      delete f[i];
-
-      r.value = i;
-      break;
-    }
-  } else {
-    r.value = f;
-    this.rstack.pop();
-  }
-
-  return r.value;
-};
-
-TJSONProtocol.prototype.readI64 = function() {
-  var n = this.readValue()
-  if (typeof n === 'string') {
-    // Assuming no one is sending in 1.11111e+33 format
-    return Int64Util.fromDecimalString(n);
-  } else {
-    return new Int64(n);
-  }
-};
-
-TJSONProtocol.prototype.readDouble = function() {
-  return this.readI32();
-};
-
-TJSONProtocol.prototype.readBinary = function() {
-  return new Buffer(this.readValue(), 'base64');
-};
-
-TJSONProtocol.prototype.readString = function() {
-  return this.readValue();
-};
-
-/**
- * Returns the underlying transport.
- * @readonly
- * @returns {Thrift.Transport} The underlying transport.
- */
-TJSONProtocol.prototype.getTransport = function() {
-  return this.trans;
-};
-
-/**
- * Method to arbitrarily skip over data
- */
-TJSONProtocol.prototype.skip = function(type) {
-  throw new Error('skip not supported yet');
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/log.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/log.js
deleted file mode 100644
index 0e13ea8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/log.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = {
-  'info' : function logInfo() {},
-  'warning' : function logWarning() {},
-  'error' : function logError() {},
-  'debug' : function logDebug() {},
-  'trace' : function logTrace() {}
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/multiplexed_processor.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/multiplexed_processor.js
deleted file mode 100644
index 67b62f7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/multiplexed_processor.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var Thrift = require('./thrift');
-
-exports.MultiplexedProcessor = MultiplexedProcessor;
-
-function MultiplexedProcessor(stream, options) {
-  this.services = {};
-};
-
-MultiplexedProcessor.prototype.registerProcessor = function(name, handler) {
-  this.services[name] = handler;
-};
-
-MultiplexedProcessor.prototype.process = function(inp, out) {
-  var begin = inp.readMessageBegin();
-
-  if (begin.mtype != Thrift.MessageType.CALL && begin.mtype != Thrift.MessageType.ONEWAY) {
-    throw new Thrift.TException('TMultiplexedProcessor: Unexpected message type');
-  }
-
-  var p = begin.fname.split(':');
-  var sname = p[0];
-  var fname = p[1];
-
-  if (! (sname in this.services)) {
-    throw new Thrift.TException('TMultiplexedProcessor: Unknown service: ' + sname);
-  }
-
-  //construct a proxy object which stubs the readMessageBegin
-  //for the service
-  var inpProxy = {};
-
-  for (var attr in inp) {
-    inpProxy[attr] = inp[attr];
-  }
-
-  inpProxy.readMessageBegin = function() {
-    return {
-      fname: fname,
-      mtype: begin.mtype,
-      rseqid: begin.rseqid
-    };
-  };
-
-  this.services[sname].process(inpProxy, out);
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/multiplexed_protocol.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/multiplexed_protocol.js
deleted file mode 100644
index 9caf6ab..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/multiplexed_protocol.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var util = require('util');
-var Thrift = require('./thrift');
-
-exports.Multiplexer = Multiplexer;
-
-function Wrapper(serviceName, protocol, connection) {
-
-  function MultiplexProtocol(trans, strictRead, strictWrite) {
-    protocol.call(this, trans, strictRead, strictWrite);
-  };
-
-  util.inherits(MultiplexProtocol, protocol);
-
-  MultiplexProtocol.prototype.writeMessageBegin = function(name, type, seqid) {
-    if (type == Thrift.MessageType.CALL || type == Thrift.MessageType.ONEWAY) {
-      connection.seqId2Service[seqid] = serviceName;
-      MultiplexProtocol.super_.prototype.writeMessageBegin.call(this,
-                                                                serviceName + ":" + name,
-                                                                type,
-                                                                seqid);
-    } else {
-      MultiplexProtocol.super_.prototype.writeMessageBegin.call(this, name, type, seqid);
-    }
-  };
-
-  return MultiplexProtocol;
-};
-
-function Multiplexer() {
-  this.seqid = 0;
-};
-
-Multiplexer.prototype.createClient = function(serviceName, ServiceClient, connection) {
-  if (ServiceClient.Client) {
-    ServiceClient = ServiceClient.Client;
-  }
-  var self = this;
-  ServiceClient.prototype.new_seqid = function() {
-    self.seqid += 1;
-    return self.seqid;
-  };
-  var writeCb = function(buf, seqid) {
-    connection.write(buf,seqid);
-  };
-  var transport = new connection.transport(undefined, writeCb);
-  var protocolWrapper = new Wrapper(serviceName, connection.protocol, connection);
-  var client = new ServiceClient(transport, protocolWrapper);
-
-  if (typeof connection.client !== 'object') {
-    connection.client = {};
-  }
-  connection.client[serviceName] = client;
-
-  return client;
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/protocol.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/protocol.js
deleted file mode 100644
index a70ebe2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/protocol.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports.TBinaryProtocol = require('./binary_protocol');
-module.exports.TCompactProtocol = require('./compact_protocol');
-module.exports.TJSONProtocol = require('./json_protocol');
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/server.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/server.js
deleted file mode 100644
index 921bb86..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/server.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var net = require('net');
-var tls = require('tls');
-
-var TBufferedTransport = require('./buffered_transport');
-var TBinaryProtocol = require('./binary_protocol');
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-/**
- * Create a Thrift server which can serve one or multiple services.
- * @param {object} processor - A normal or multiplexedProcessor (must
- *                             be preconstructed with the desired handler).
- * @param {ServerOptions} options - Optional additional server configuration.
- * @returns {object} - The Apache Thrift Multiplex Server.
- */
-exports.createMultiplexServer = function(processor, options) {
-  var transport = (options && options.transport) ? options.transport : TBufferedTransport;
-  var protocol = (options && options.protocol) ? options.protocol : TBinaryProtocol;
-
-  function serverImpl(stream) {
-    var self = this;
-    stream.on('error', function(err) {
-        self.emit('error', err);
-    });
-    stream.on('data', transport.receiver(function(transportWithData) {
-      var input = new protocol(transportWithData);
-      var output = new protocol(new transport(undefined, function(buf) {
-        try {
-            stream.write(buf);
-        } catch (err) {
-            self.emit('error', err);
-            stream.end();
-        }
-      }));
-
-      try {
-        do {
-          processor.process(input, output);
-          transportWithData.commitPosition();
-        } while (true);
-      } catch (err) {
-        if (err instanceof InputBufferUnderrunError) {
-          //The last data in the buffer was not a complete message, wait for the rest
-          transportWithData.rollbackPosition();
-        }
-        else if (err.message === "Invalid type: undefined") {
-          //No more data in the buffer
-          //This trap is a bit hackish
-          //The next step to improve the node behavior here is to have
-          //  the compiler generated process method throw a more explicit
-          //  error when the network buffer is empty (regardles of the
-          //  protocol/transport stack in use) and replace this heuristic.
-          //  Also transports should probably not force upper layers to
-          //  manage their buffer positions (i.e. rollbackPosition() and
-          //  commitPosition() should be eliminated in lieu of a transport
-          //  encapsulated buffer management strategy.)
-          transportWithData.rollbackPosition();
-        }
-        else {
-          //Unexpected error
-          self.emit('error', err);
-          stream.end();
-        }
-      }
-    }));
-
-    stream.on('end', function() {
-      stream.end();
-    });
-  }
-
-  if (options && options.tls) {
-    return tls.createServer(options.tls, serverImpl);
-  } else {
-    return net.createServer(serverImpl);
-  }
-};
-
-/**
- * Create a single service Apache Thrift server.
- * @param {object} processor - A service class or processor function.
- * @param {ServerOptions} options - Optional additional server configuration.
- * @returns {object} - The Apache Thrift Multiplex Server.
- */
-exports.createServer = function(processor, handler, options) {
-  if (processor.Processor) {
-    processor = processor.Processor;
-  }
-  return exports.createMultiplexServer(new processor(handler), options);
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/thrift.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/thrift.js
deleted file mode 100644
index f2b2896..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/thrift.js
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var util = require('util');
-
-var Type = exports.Type = {
-  STOP: 0,
-  VOID: 1,
-  BOOL: 2,
-  BYTE: 3,
-  I08: 3,
-  DOUBLE: 4,
-  I16: 6,
-  I32: 8,
-  I64: 10,
-  STRING: 11,
-  UTF7: 11,
-  STRUCT: 12,
-  MAP: 13,
-  SET: 14,
-  LIST: 15,
-  UTF8: 16,
-  UTF16: 17
-};
-
-exports.MessageType = {
-  CALL: 1,
-  REPLY: 2,
-  EXCEPTION: 3,
-  ONEWAY: 4
-};
-
-exports.TException = TException;
-
-function TException(message) {
-  Error.call(this);
-  Error.captureStackTrace(this, this.constructor);
-  this.name = this.constructor.name;
-  this.message = message;
-};
-util.inherits(TException, Error);
-
-var TApplicationExceptionType = exports.TApplicationExceptionType = {
-  UNKNOWN: 0,
-  UNKNOWN_METHOD: 1,
-  INVALID_MESSAGE_TYPE: 2,
-  WRONG_METHOD_NAME: 3,
-  BAD_SEQUENCE_ID: 4,
-  MISSING_RESULT: 5,
-  INTERNAL_ERROR: 6,
-  PROTOCOL_ERROR: 7,
-  INVALID_TRANSFORM: 8,
-  INVALID_PROTOCOL: 9,
-  UNSUPPORTED_CLIENT_TYPE: 10
-};
-
-exports.TApplicationException = TApplicationException;
-
-function TApplicationException(type, message) {
-  TException.call(this);
-  Error.captureStackTrace(this, this.constructor);
-  this.type = type || TApplicationExceptionType.UNKNOWN;
-  this.name = this.constructor.name;
-  this.message = message;
-};
-util.inherits(TApplicationException, TException);
-
-TApplicationException.prototype.read = function(input) {
-  var ftype;
-  var ret = input.readStructBegin('TApplicationException');
-
-  while(1){
-      ret = input.readFieldBegin();
-      if(ret.ftype == Type.STOP)
-          break;
-
-      switch(ret.fid){
-          case 1:
-              if( ret.ftype == Type.STRING ){
-                  ret = input.readString();
-                  this.message = ret;
-              } else {
-                  ret = input.skip(ret.ftype);
-              }
-              break;
-          case 2:
-              if( ret.ftype == Type.I32 ){
-                  ret = input.readI32();
-                  this.type = ret;
-              } else {
-                  ret   = input.skip(ret.ftype);
-              }
-              break;
-          default:
-              ret = input.skip(ret.ftype);
-              break;
-      }
-      input.readFieldEnd();
-  }
-  input.readStructEnd();
-};
-
-TApplicationException.prototype.write = function(output){
-  output.writeStructBegin('TApplicationException');
-
-  if (this.message) {
-      output.writeFieldBegin('message', Type.STRING, 1);
-      output.writeString(this.message);
-      output.writeFieldEnd();
-  }
-
-  if (this.code) {
-      output.writeFieldBegin('type', Type.I32, 2);
-      output.writeI32(this.code);
-      output.writeFieldEnd();
-  }
-
-  output.writeFieldStop();
-  output.writeStructEnd();
-};
-
-var TProtocolExceptionType = exports.TProtocolExceptionType = {
-  UNKNOWN: 0,
-  INVALID_DATA: 1,
-  NEGATIVE_SIZE: 2,
-  SIZE_LIMIT: 3,
-  BAD_VERSION: 4,
-  NOT_IMPLEMENTED: 5,
-  DEPTH_LIMIT: 6
-};
-
-
-exports.TProtocolException = TProtocolException;
-
-function TProtocolException(type, message) {
-  Error.call(this);
-  Error.captureStackTrace(this, this.constructor);
-  this.name = this.constructor.name;
-  this.type = type;
-  this.message = message;
-};
-util.inherits(TProtocolException, Error);
-
-exports.objectLength = function(obj) {
-  return Object.keys(obj).length;
-};
-
-exports.inherits = function(constructor, superConstructor) {
-  util.inherits(constructor, superConstructor);
-};
-
-var copyList, copyMap;
-
-copyList = function(lst, types) {
-
-  if (!lst) {return lst; }
-
-  var type;
-
-  if (types.shift === undefined) {
-    type = types;
-  }
-  else {
-    type = types[0];
-  }
-  var Type = type;
-
-  var len = lst.length, result = [], i, val;
-  for (i = 0; i < len; i++) {
-    val = lst[i];
-    if (type === null) {
-      result.push(val);
-    }
-    else if (type === copyMap || type === copyList) {
-      result.push(type(val, types.slice(1)));
-    }
-    else {
-      result.push(new Type(val));
-    }
-  }
-  return result;
-};
-
-copyMap = function(obj, types){
-
-  if (!obj) {return obj; }
-
-  var type;
-
-  if (types.shift === undefined) {
-    type = types;
-  }
-  else {
-    type = types[0];
-  }
-  var Type = type;
-
-  var result = {}, val;
-  for(var prop in obj) {
-    if(obj.hasOwnProperty(prop)) {
-      val = obj[prop];
-      if (type === null) {
-        result[prop] = val;
-      }
-      else if (type === copyMap || type === copyList) {
-        result[prop] = type(val, types.slice(1));
-      }
-      else {
-        result[prop] = new Type(val);
-      }
-    }
-  }
-  return result;
-};
-
-module.exports.copyMap = copyMap;
-module.exports.copyList = copyList;
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/transport.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/transport.js
deleted file mode 100644
index 59daa98..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/transport.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports.TBufferedTransport = require('./buffered_transport');
-module.exports.TFramedTransport = require('./framed_transport');
-module.exports.InputBufferUnderrunError = require('./input_buffer_underrun_error');
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/web_server.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/web_server.js
deleted file mode 100644
index 37159ea..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/web_server.js
+++ /dev/null
@@ -1,564 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var http = require('http');
-var https = require('https');
-var url = require("url");
-var path = require("path");
-var fs = require("fs");
-var crypto = require("crypto");
-
-var MultiplexedProcessor = require('./multiplexed_processor').MultiplexedProcessor;
-
-var TBufferedTransport = require('./buffered_transport');
-var TBinaryProtocol = require('./binary_protocol');
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-// WSFrame constructor and prototype
-/////////////////////////////////////////////////////////////////////
-
-/** Apache Thrift RPC Web Socket Transport
- *  Frame layout conforming to RFC 6455 circa 12/2011
- *
- * Theoretical frame size limit is 4GB*4GB, however the Node Buffer
- * limit is 1GB as of v0.10. The frame length encoding is also
- * configured for a max of 4GB presently and needs to be adjusted
- * if Node/Browsers become capabile of > 4GB frames.
- *
- *  - FIN is 1 if the message is complete
- *  - RSV1/2/3 are always 0
- *  - Opcode is 1(TEXT) for TJSONProtocol and 2(BIN) for TBinaryProtocol
- *  - Mask Present bit is 1 sending to-server and 0 sending to-client
- *  - Payload Len:
- *        + If < 126: then represented directly
- *        + If >=126: but within range of an unsigned 16 bit integer
- *             then Payload Len is 126 and the two following bytes store
- *             the length
- *        + Else: Payload Len is 127 and the following 8 bytes store the
- *             length as an unsigned 64 bit integer
- *  - Masking key is a 32 bit key only present when sending to the server
- *  - Payload follows the masking key or length
- *
- *     0                   1                   2                   3
- *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *    +-+-+-+-+-------+-+-------------+-------------------------------+
- *    |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
- *    |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           |
- *    |N|V|V|V|       |S|             |   (if payload len==126/127)   |
- *    | |1|2|3|       |K|             |                               |
- *    +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - +
- *    |     Extended payload length continued, if payload len == 127  |
- *    + - - - - - - - - - - - - - - - +-------------------------------+
- *    |                               |Masking-key, if MASK set to 1  |
- *    +-------------------------------+-------------------------------+
- *    | Masking-key (continued)       |          Payload Data         |
- *    +-------------------------------- - - - - - - - - - - - - - - - +
- *    :                     Payload Data continued ...                :
- *    + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- *    |                     Payload Data continued ...                |
- *    +---------------------------------------------------------------+
- */
-var wsFrame = {
-  /** Encodes a WebSocket frame
-   *
-   * @param {Buffer} data - The raw data to encode
-   * @param {Buffer} mask - The mask to apply when sending to server, null for no mask
-   * @param {Boolean} binEncoding - True for binary encoding, false for text encoding
-   * @returns {Buffer} - The WebSocket frame, ready to send
-   */
-  encode: function(data, mask, binEncoding) {
-      var frame = new Buffer(wsFrame.frameSizeFromData(data, mask));
-      //Byte 0 - FIN & OPCODE
-      frame[0] = wsFrame.fin.FIN +
-          (binEncoding ? wsFrame.frameOpCodes.BIN : wsFrame.frameOpCodes.TEXT);
-      //Byte 1 or 1-3 or 1-9 - MASK FLAG & SIZE
-      var payloadOffset = 2;
-      if (data.length < 0x7E) {
-        frame[1] = data.length + (mask ? wsFrame.mask.TO_SERVER : wsFrame.mask.TO_CLIENT);
-      } else if (data.length < 0xFFFF) {
-        frame[1] = 0x7E + (mask ? wsFrame.mask.TO_SERVER : wsFrame.mask.TO_CLIENT);
-        frame.writeUInt16BE(data.length, 2, true);
-        payloadOffset = 4;
-      } else {
-        frame[1] = 0x7F + (mask ? wsFrame.mask.TO_SERVER : wsFrame.mask.TO_CLIENT);
-        frame.writeUInt32BE(0, 2, true);
-        frame.writeUInt32BE(data.length, 6, true);
-        payloadOffset = 10;
-      }
-      //MASK
-      if (mask) {
-        mask.copy(frame, payloadOffset, 0, 4);
-        payloadOffset += 4;
-      }
-      //Payload
-      data.copy(frame, payloadOffset);
-      if (mask) {
-        wsFrame.applyMask(frame.slice(payloadOffset), frame.slice(payloadOffset-4,payloadOffset));
-      }
-      return frame;
-  },
-
-  /**
-   * @class
-   * @name WSDecodeResult
-   * @property {Buffer} data - The decoded data for the first ATRPC message
-   * @property {Buffer} mask - The frame mask
-   * @property {Boolean} binEncoding - True if binary (TBinaryProtocol),
-   *                                   False if text (TJSONProtocol)
-   * @property {Buffer} nextFrame - Multiple ATRPC messages may be sent in a
-   *                                single WebSocket frame, this Buffer contains
-   *                                any bytes remaining to be decoded
-   * @property {Boolean} FIN - True is the message is complete
-   */
-
-   /** Decodes a WebSocket frame
-   *
-   * @param {Buffer} frame - The raw inbound frame, if this is a continuation
-   *                         frame it must have a mask property with the mask.
-   * @returns {WSDecodeResult} - The decoded payload
-   *
-   * @see {@link WSDecodeResult}
-   */
-  decode: function(frame) {
-      var result = {
-        data: null,
-        mask: null,
-        binEncoding: false,
-        nextFrame: null,
-        FIN: true
-      };
-
-      //Byte 0 - FIN & OPCODE
-      if (wsFrame.fin.FIN != (frame[0] & wsFrame.fin.FIN)) {
-        result.FIN = false;
-      }
-      result.binEncoding = (wsFrame.frameOpCodes.BIN == (frame[0] & wsFrame.frameOpCodes.BIN));
-      //Byte 1 or 1-3 or 1-9 - SIZE
-      var lenByte = (frame[1] & 0x0000007F);
-      var len = lenByte;
-      var dataOffset = 2;
-      if (lenByte == 0x7E) {
-        len = frame.readUInt16BE(2);
-        dataOffset = 4;
-      } else if (lenByte == 0x7F) {
-        len = frame.readUInt32BE(6);
-        dataOffset = 10;
-      }
-      //MASK
-      if (wsFrame.mask.TO_SERVER == (frame[1] & wsFrame.mask.TO_SERVER)) {
-        result.mask = new Buffer(4);
-        frame.copy(result.mask, 0, dataOffset, dataOffset + 4);
-        dataOffset += 4;
-      }
-      //Payload
-      result.data = new Buffer(len);
-      frame.copy(result.data, 0, dataOffset, dataOffset+len);
-      if (result.mask) {
-        wsFrame.applyMask(result.data, result.mask);
-      }
-      //Next Frame
-      if (frame.length > dataOffset+len) {
-        result.nextFrame = new Buffer(frame.length - (dataOffset+len));
-        frame.copy(result.nextFrame, 0, dataOffset+len, frame.length);
-      }
-      //Don't forward control frames
-      if (frame[0] & wsFrame.frameOpCodes.FINCTRL) {
-        result.data = null;
-      }
-
-      return result;
-  },
-
-  /** Masks/Unmasks data
-   *
-   * @param {Buffer} data - data to mask/unmask in place
-   * @param {Buffer} mask - the mask
-   */
-  applyMask: function(data, mask){
-    //TODO: look into xoring words at a time
-    var dataLen = data.length;
-    var maskLen = mask.length;
-    for (var i = 0; i < dataLen; i++) {
-      data[i] = data[i] ^ mask[i%maskLen];
-    }
-  },
-
-  /** Computes frame size on the wire from data to be sent
-   *
-   * @param {Buffer} data - data.length is the assumed payload size
-   * @param {Boolean} mask - true if a mask will be sent (TO_SERVER)
-   */
-  frameSizeFromData: function(data, mask) {
-    var headerSize = 10;
-    if (data.length < 0x7E) {
-      headerSize = 2;
-    } else if (data.length < 0xFFFF) {
-      headerSize = 4;
-    }
-    return headerSize + data.length + (mask ? 4 : 0);
-  },
-
-  frameOpCodes: {
-    CONT:     0x00,
-    TEXT:     0x01,
-    BIN:      0x02,
-    CTRL:     0x80
-  },
-
-  mask: {
-    TO_SERVER: 0x80,
-    TO_CLIENT: 0x00
-  },
-
-  fin: {
-    CONT: 0x00,
-    FIN: 0x80
-  }
-};
-
-
-// createWebServer constructor and options
-/////////////////////////////////////////////////////////////////////
-
-/**
- * @class
- * @name ServerOptions
- * @property {array} cors - Array of CORS origin strings to permit requests from.
- * @property {string} files - Path to serve static files from, if absent or ""
- *                               static file service is disabled.
- * @property {object} headers - An object hash mapping header strings to header value
- *                              strings, these headers are transmitted in response to
- *                              static file GET operations.
- * @property {object} services - An object hash mapping service URI strings
- *                               to ServiceOptions objects
- * @property {object} tls - Node.js TLS options (see: nodejs.org/api/tls.html),
- *                          if not present or null regular http is used,
- *                          at least a key and a cert must be defined to use SSL/TLS
- * @see {@link ServiceOptions}
- */
-
-/**
- * @class
- * @name ServiceOptions
- * @property {object} transport - The layered transport to use (defaults
- *                                to TBufferedTransport).
- * @property {object} protocol - The serialization Protocol to use (defaults to
- *                               TBinaryProtocol).
- * @property {object} processor - The Thrift Service class/processor generated
- *                                by the IDL Compiler for the service (the "cls"
- *                                key can also be used for this attribute).
- * @property {object} handler - The handler methods for the Thrift Service.
- */
-
-/**
- * Create a Thrift server which can serve static files and/or one or
- * more Thrift Services.
- * @param {ServerOptions} options - The server configuration.
- * @returns {object} - The Apache Thrift Web Server.
- */
-exports.createWebServer = function(options) {
-  var baseDir = options.files;
-  var contentTypesByExtension = {
-    '.txt': 'text/plain',
-    '.html': 'text/html',
-    '.css': 'text/css',
-    '.xml': 'application/xml',
-    '.json': 'application/json',
-    '.js': 'application/javascript',
-    '.jpg': 'image/jpeg',
-    '.jpeg': 'image/jpeg',
-    '.gif': 'image/gif',
-    '.png': 'image/png',
-    '.svg': 'image/svg+xml'
-  };
-
-  //Setup all of the services
-  var services = options.services;
-  for (var uri in services) {
-    var svcObj = services[uri];
-
-    //Setup the processor
-    if (svcObj.processor instanceof MultiplexedProcessor) {
-      //Multiplex processors have pre embedded processor/handler pairs, save as is
-      svcObj.processor = svcObj.processor;
-    } else {
-      //For historical reasons Node.js supports processors passed in directly or via the
-      //  IDL Compiler generated class housing the processor. Also, the options property
-      //  for a Processor has been called both cls and processor at different times. We
-      //  support any of the four possibilities here.
-      var processor = (svcObj.processor) ? (svcObj.processor.Processor || svcObj.processor) :
-                                           (svcObj.cls.Processor || svcObj.cls);
-      //Processors can be supplied as constructed objects with handlers already embedded,
-      //  if a handler is provided we construct a new processor, if not we use the processor
-      //  object directly
-      if (svcObj.handler) {
-        svcObj.processor = new processor(svcObj.handler);
-      } else {
-        svcObj.processor = processor;
-      }
-    }
-    svcObj.transport = svcObj.transport ? svcObj.transport : TBufferedTransport;
-    svcObj.protocol = svcObj.protocol ? svcObj.protocol : TBinaryProtocol;
-  }
-
-  //Verify CORS requirements
-  function VerifyCORSAndSetHeaders(request, response) {
-    if (request.headers.origin && options.cors) {
-      if (options.cors["*"] || options.cors[request.headers.origin]) {
-        //Allow, origin allowed
-        response.setHeader("access-control-allow-origin", request.headers.origin);
-        response.setHeader("access-control-allow-methods", "GET, POST, OPTIONS");
-        response.setHeader("access-control-allow-headers", "content-type, accept");
-        response.setHeader("access-control-max-age", "60");
-        return true;
-      } else {
-        //Disallow, origin denied
-        return false;
-      }
-    }
-    //Allow, CORS is not in use
-    return true;
-  }
-
-
-  //Handle OPTIONS method (CORS)
-  ///////////////////////////////////////////////////
-  function processOptions(request, response) {
-    if (VerifyCORSAndSetHeaders(request, response)) {
-      response.writeHead("204", "No Content", {"content-length": 0});
-    } else {
-      response.writeHead("403", "Origin " + request.headers.origin + " not allowed", {});
-    }
-    response.end();
-  }
-
-
-  //Handle POST methods (TXHRTransport)
-  ///////////////////////////////////////////////////
-  function processPost(request, response) {
-    //Lookup service
-    var uri = url.parse(request.url).pathname;
-    var svc = services[uri];
-    if (!svc) {
-      response.writeHead("403", "No Apache Thrift Service at " + uri, {});
-      response.end();
-      return;
-    }
-
-    //Verify CORS requirements
-    if (!VerifyCORSAndSetHeaders(request, response)) {
-      response.writeHead("403", "Origin " + request.headers.origin + " not allowed", {});
-      response.end();
-      return;
-    }
-
-    //Process XHR payload
-    request.on('data', svc.transport.receiver(function(transportWithData) {
-      var input = new svc.protocol(transportWithData);
-      var output = new svc.protocol(new svc.transport(undefined, function(buf) {
-        try {
-          response.writeHead(200);
-          response.end(buf);
-        } catch (err) {
-          response.writeHead(500);
-          response.end();
-        }
-      }));
-
-      try {
-        svc.processor.process(input, output);
-        transportWithData.commitPosition();
-      } catch (err) {
-        if (err instanceof InputBufferUnderrunError) {
-          transportWithData.rollbackPosition();
-        } else {
-          response.writeHead(500);
-          response.end();
-        }
-      }
-    }));
-  }
-
-
-  //Handle GET methods (Static Page Server)
-  ///////////////////////////////////////////////////
-  function processGet(request, response) {
-    //Undefined or empty base directory means do not serve static files
-    if (!baseDir || "" === baseDir) {
-      response.writeHead(404);
-      response.end();
-      return;
-    }
-
-    //Verify CORS requirements
-    if (!VerifyCORSAndSetHeaders(request, response)) {
-      response.writeHead("403", "Origin " + request.headers.origin + " not allowed", {});
-      response.end();
-      return;
-    }
-
-    //Locate the file requested and send it
-    var uri = url.parse(request.url).pathname;
-    var filename = path.join(baseDir, uri);
-    fs.exists(filename, function(exists) {
-      if(!exists) {
-        response.writeHead(404);
-        response.end();
-        return;
-      }
-
-      if (fs.statSync(filename).isDirectory()) {
-        filename += '/index.html';
-      }
-
-      fs.readFile(filename, "binary", function(err, file) {
-        if (err) {
-          response.writeHead(500);
-          response.end(err + "\n");
-          return;
-        }
-        var headers = {};
-        var contentType = contentTypesByExtension[path.extname(filename)];
-        if (contentType) {
-          headers["Content-Type"] = contentType;
-        }
-        for (var k in options.headers) {
-          headers[k] = options.headers[k];
-        }
-        response.writeHead(200, headers);
-        response.write(file, "binary");
-        response.end();
-      });
-    });
-  }
-
-
-  //Handle WebSocket calls (TWebSocketTransport)
-  ///////////////////////////////////////////////////
-  function processWS(data, socket, svc, binEncoding) {
-    svc.transport.receiver(function(transportWithData) {
-      var input = new svc.protocol(transportWithData);
-      var output = new svc.protocol(new svc.transport(undefined, function(buf) {
-        try {
-          var frame = wsFrame.encode(buf, null, binEncoding);
-          socket.write(frame);
-        } catch (err) {
-          //TODO: Add better error processing
-        }
-      }));
-
-      try {
-        svc.processor.process(input, output);
-        transportWithData.commitPosition();
-      }
-      catch (err) {
-        if (err instanceof InputBufferUnderrunError) {
-          transportWithData.rollbackPosition();
-        }
-        else {
-          //TODO: Add better error processing
-        }
-      }
-    })(data);
-  }
-
-  //Create the server (HTTP or HTTPS)
-  var server = null;
-  if (options.tls) {
-    server = https.createServer(options.tls);
-  } else {
-    server = http.createServer();
-  }
-
-  //Wire up listeners for upgrade(to WebSocket) & request methods for:
-  //   - GET static files,
-  //   - POST XHR Thrift services
-  //   - OPTIONS CORS requests
-  server.on('request', function(request, response) {
-    if (request.method === 'POST') {
-      processPost(request, response);
-    } else if (request.method === 'GET') {
-      processGet(request, response);
-    } else if (request.method === 'OPTIONS') {
-      processOptions(request, response);
-    } else {
-      response.writeHead(500);
-      response.end();
-    }
-  }).on('upgrade', function(request, socket, head) {
-    //Lookup service
-    var svc;
-    try {
-      svc = services[Object.keys(services)[0]];
-    } catch(e) {
-      socket.write("HTTP/1.1 403 No Apache Thrift Service available\r\n\r\n");
-      return;
-    }
-    //Perform upgrade
-    var hash = crypto.createHash("sha1");
-    hash.update(request.headers['sec-websocket-key'] + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
-    socket.write("HTTP/1.1 101 Switching Protocols\r\n" +
-                   "Upgrade: websocket\r\n" +
-                   "Connection: Upgrade\r\n" +
-                   "Sec-WebSocket-Accept: " + hash.digest("base64") + "\r\n" +
-                   "Sec-WebSocket-Origin: " + request.headers.origin + "\r\n" +
-                   "Sec-WebSocket-Location: ws://" + request.headers.host + request.url + "\r\n" +
-                   "\r\n");
-    //Handle WebSocket traffic
-    var data = null;
-    socket.on('data', function(frame) {
-      try {
-        while (frame) {
-          var result = wsFrame.decode(frame);
-          //Prepend any existing decoded data
-          if (data) {
-            if (result.data) {
-              var newData = new Buffer(data.length + result.data.length);
-              data.copy(newData);
-              result.data.copy(newData, data.length);
-              result.data = newData;
-            } else {
-              result.data = data;
-            }
-            data = null;
-          }
-          //If this completes a message process it
-          if (result.FIN) {
-            processWS(result.data, socket, svc, result.binEncoding);
-          } else {
-            data = result.data;
-          }
-          //Prepare next frame for decoding (if any)
-          frame = result.nextFrame;
-        }
-      } catch(e) {
-        console.log("TWebSocketTransport Exception: " + e);
-        socket.destroy();
-      }
-    });
-  });
-
-  //Return the server
-  return server;
-};
-
-
-
-
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/ws_connection.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/ws_connection.js
deleted file mode 100644
index 052cbd4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/ws_connection.js
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var util = require('util');
-var WebSocket = require('ws');
-var EventEmitter = require("events").EventEmitter;
-var thrift = require('./thrift');
-var ttransport = require('./transport');
-var tprotocol = require('./protocol');
-
-var TBufferedTransport = require('./buffered_transport');
-var TJSONProtocol = require('./json_protocol');
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-var createClient = require('./create_client');
-
-exports.WSConnection = WSConnection;
-
-/**
- * @class
- * @name WSConnectOptions
- * @property {string} transport - The Thrift layered transport to use (TBufferedTransport, etc).
- * @property {string} protocol - The Thrift serialization protocol to use (TJSONProtocol, etc.).
- * @property {string} path - The URL path to connect to (e.g. "/", "/mySvc", "/thrift/quoteSvc", etc.).
- * @property {object} headers - A standard Node.js header hash, an object hash containing key/value
- *        pairs where the key is the header name string and the value is the header value string.
- * @property {boolean} secure - True causes the connection to use wss, otherwise ws is used.
- * @property {object} wsOptions - Options passed on to WebSocket.
- * @example
- *     //Use a secured websocket connection
- *     //  uses the buffered transport layer, uses the JSON protocol and directs RPC traffic
- *     //  to wss://thrift.example.com:9090/hello
- *     var thrift = require('thrift');
- *     var options = {
- *        transport: thrift.TBufferedTransport,
- *        protocol: thrift.TJSONProtocol,
- *        path: "/hello",
- *        secure: true
- *     };
- *     var con = thrift.createWSConnection("thrift.example.com", 9090, options);
- *     con.open()
- *     var client = thrift.createWSClient(myService, connection);
- *     client.myServiceFunction();
- *     con.close()
- */
-
-/**
- * Initializes a Thrift WSConnection instance (use createWSConnection() rather than
- *    instantiating directly).
- * @constructor
- * @param {string} host - The host name or IP to connect to.
- * @param {number} port - The TCP port to connect to.
- * @param {WSConnectOptions} options - The configuration options to use.
- * @throws {error} Exceptions other than ttransport.InputBufferUnderrunError are rethrown
- * @event {error} The "error" event is fired when a Node.js error event occurs during
- *     request or response processing, in which case the node error is passed on. An "error"
- *     event may also be fired when the connectison can not map a response back to the
- *     appropriate client (an internal error), generating a TApplicationException.
- * @classdesc WSConnection objects provide Thrift end point transport
- *     semantics implemented using Websockets.
- * @see {@link createWSConnection}
- */
-function WSConnection(host, port, options) {
-  //Initialize the emitter base object
-  EventEmitter.call(this);
-
-  //Set configuration
-  var self = this;
-  this.options = options || {};
-  this.host = host;
-  this.port = port;
-  this.secure = this.options.secure || false;
-  this.transport = this.options.transport || TBufferedTransport;
-  this.protocol = this.options.protocol || TJSONProtocol;
-  this.path = this.options.path;
-  this.send_pending = [];
-
-  //The sequence map is used to map seqIDs back to the
-  //  calling client in multiplexed scenarios
-  this.seqId2Service = {};
-
-  //Prepare WebSocket options
-  this.wsOptions = {
-    host: this.host,
-    port: this.port || 80,
-    path: this.options.path || '/',
-    headers: this.options.headers || {}
-  };
-  for (var attrname in this.options.wsOptions) {
-    this.wsOptions[attrname] = this.options.wsOptions[attrname];
-  }
-};
-util.inherits(WSConnection, EventEmitter);
-
-WSConnection.prototype.__reset = function() {
-  this.socket = null; //The web socket
-  this.send_pending = []; //Buffers/Callback pairs waiting to be sent
-};
-
-WSConnection.prototype.__onOpen = function() {
-  var self = this;
-  this.emit("open");
-  if (this.send_pending.length > 0) {
-    //If the user made calls before the connection was fully
-    //open, send them now
-    this.send_pending.forEach(function(data) {
-      self.socket.send(data);
-    });
-    this.send_pending = [];
-  }
-};
-
-WSConnection.prototype.__onClose = function(evt) {
-  this.emit("close");
-  this.__reset();
-};
-
-WSConnection.prototype.__decodeCallback = function(transport_with_data) {
-  var proto = new this.protocol(transport_with_data);
-  try {
-    while (true) {
-      var header = proto.readMessageBegin();
-      var dummy_seqid = header.rseqid * -1;
-      var client = this.client;
-      //The Multiplexed Protocol stores a hash of seqid to service names
-      //  in seqId2Service. If the SeqId is found in the hash we need to
-      //  lookup the appropriate client for this call.
-      //  The client var is a single client object when not multiplexing,
-      //  when using multiplexing it is a service name keyed hash of client
-      //  objects.
-      //NOTE: The 2 way interdependencies between protocols, transports,
-      //  connections and clients in the Node.js implementation are irregular
-      //  and make the implementation difficult to extend and maintain. We
-      //  should bring this stuff inline with typical thrift I/O stack
-      //  operation soon.
-      //  --ra
-      var service_name = this.seqId2Service[header.rseqid];
-      if (service_name) {
-        client = this.client[service_name];
-        delete this.seqId2Service[header.rseqid];
-      }
-      /*jshint -W083 */
-      client._reqs[dummy_seqid] = function(err, success) {
-        transport_with_data.commitPosition();
-        var clientCallback = client._reqs[header.rseqid];
-        delete client._reqs[header.rseqid];
-        if (clientCallback) {
-          clientCallback(err, success);
-        }
-      };
-      /*jshint +W083 */
-      if (client['recv_' + header.fname]) {
-        client['recv_' + header.fname](proto, header.mtype, dummy_seqid);
-      } else {
-        delete client._reqs[dummy_seqid];
-        this.emit("error",
-          new thrift.TApplicationException(
-            thrift.TApplicationExceptionType.WRONG_METHOD_NAME,
-            "Received a response to an unknown RPC function"));
-      }
-    }
-  } catch (e) {
-    if (e instanceof InputBufferUnderrunError) {
-      transport_with_data.rollbackPosition();
-    } else {
-      throw e;
-    }
-  }
-};
-
-WSConnection.prototype.__onData = function(data) {
-  if (Object.prototype.toString.call(data) == "[object ArrayBuffer]") {
-    data = new Uint8Array(data);
-  }
-  var buf = new Buffer(data);
-  this.transport.receiver(this.__decodeCallback.bind(this))(buf);
-
-};
-
-WSConnection.prototype.__onMessage = function(evt) {
-  this.__onData(evt.data);
-};
-
-WSConnection.prototype.__onError = function(evt) {
-  this.emit("error", evt);
-  this.socket.close();
-};
-
-/**
- * Returns true if the transport is open
- * @readonly
- * @returns {boolean}
- */
-WSConnection.prototype.isOpen = function() {
-  return this.socket && this.socket.readyState == this.socket.OPEN;
-};
-
-/**
- * Opens the transport connection
- */
-WSConnection.prototype.open = function() {
-  //If OPEN/CONNECTING/CLOSING ignore additional opens
-  if (this.socket && this.socket.readyState != this.socket.CLOSED) {
-    return;
-  }
-  //If there is no socket or the socket is closed:
-  this.socket = new WebSocket(this.uri(), "", this.wsOptions);
-  this.socket.binaryType = 'arraybuffer';
-  this.socket.onopen = this.__onOpen.bind(this);
-  this.socket.onmessage = this.__onMessage.bind(this);
-  this.socket.onerror = this.__onError.bind(this);
-  this.socket.onclose = this.__onClose.bind(this);
-};
-
-/**
- * Closes the transport connection
- */
-WSConnection.prototype.close = function() {
-  this.socket.close();
-};
-
-/**
- * Return URI for the connection
- * @returns {string} URI
- */
-WSConnection.prototype.uri = function() {
-  var schema = this.secure ? 'wss' : 'ws';
-  var port = '';
-  var path = this.path || '/';
-  var host = this.host;
-
-  // avoid port if default for schema
-  if (this.port && (('wss' == schema && this.port != 443) ||
-    ('ws' == schema && this.port != 80))) {
-    port = ':' + this.port;
-  }
-
-  return schema + '://' + host + port + path;
-};
-
-/**
- * Writes Thrift message data to the connection
- * @param {Buffer} data - A Node.js Buffer containing the data to write
- * @returns {void} No return value.
- * @event {error} the "error" event is raised upon request failure passing the
- *     Node.js error object to the listener.
- */
-WSConnection.prototype.write = function(data) {
-  if (this.isOpen()) {
-    //Send data and register a callback to invoke the client callback
-    this.socket.send(data);
-  } else {
-    //Queue the send to go out __onOpen
-    this.send_pending.push(data);
-  }
-};
-
-/**
- * Creates a new WSConnection object, used by Thrift clients to connect
- *    to Thrift HTTP based servers.
- * @param {string} host - The host name or IP to connect to.
- * @param {number} port - The TCP port to connect to.
- * @param {WSConnectOptions} options - The configuration options to use.
- * @returns {WSConnection} The connection object.
- * @see {@link WSConnectOptions}
- */
-exports.createWSConnection = function(host, port, options) {
-  return new WSConnection(host, port, options);
-};
-
-exports.createWSClient = createClient;
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/ws_transport.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/ws_transport.js
deleted file mode 100644
index 8e750e2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/ws_transport.js
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = TWebSocketTransport;
-
-/**
- * Constructor Function for the WebSocket transport.
- * @constructor
- * @param {string} [url] - The URL to connect to.
- * @classdesc The Apache Thrift Transport layer performs byte level I/O
- * between RPC clients and servers. The JavaScript TWebSocketTransport object
- * uses the WebSocket protocol. Target servers must implement WebSocket.
- * (see: node.js example server_http.js).
- * @example
- *   var transport = new Thrift.TWebSocketTransport("http://localhost:8585");
- */
-function TWebSocketTransport(url) {
-    this.__reset(url);
-};
-
-
-TWebSocketTransport.prototype.__reset = function(url) {
-  this.url = url;             //Where to connect
-  this.socket = null;         //The web socket
-  this.callbacks = [];        //Pending callbacks
-  this.send_pending = [];     //Buffers/Callback pairs waiting to be sent
-  this.send_buf = '';         //Outbound data, immutable until sent
-  this.recv_buf = '';         //Inbound data
-  this.rb_wpos = 0;           //Network write position in receive buffer
-  this.rb_rpos = 0;           //Client read position in receive buffer
-};
-
-/**
- * Sends the current WS request and registers callback. The async
- * parameter is ignored (WS flush is always async) and the callback
- * function parameter is required.
- * @param {object} async - Ignored.
- * @param {object} callback - The client completion callback.
- * @returns {undefined|string} Nothing (undefined)
- */
-TWebSocketTransport.prototype.flush = function(async, callback) {
-  var self = this;
-  if (this.isOpen()) {
-    //Send data and register a callback to invoke the client callback
-    this.socket.send(this.send_buf);
-    this.callbacks.push((function() {
-      var clientCallback = callback;
-      return function(msg) {
-        self.setRecvBuffer(msg);
-        clientCallback();
-      };
-    }()));
-  } else {
-    //Queue the send to go out __onOpen
-    this.send_pending.push({
-      buf: this.send_buf,
-      cb:  callback
-    });
-  }
-};
-
-TWebSocketTransport.prototype.__onOpen = function() {
-   var self = this;
-   if (this.send_pending.length > 0) {
-      //If the user made calls before the connection was fully
-      //open, send them now
-      this.send_pending.forEach(function(elem) {
-         this.socket.send(elem.buf);
-         this.callbacks.push((function() {
-           var clientCallback = elem.cb;
-           return function(msg) {
-              self.setRecvBuffer(msg);
-              clientCallback();
-           };
-         }()));
-      });
-      this.send_pending = [];
-   }
-};
-
-TWebSocketTransport.prototype.__onClose = function(evt) {
-  this.__reset(this.url);
-};
-
-TWebSocketTransport.prototype.__onMessage = function(evt) {
-  if (this.callbacks.length) {
-    this.callbacks.shift()(evt.data);
-  }
-};
-
-TWebSocketTransport.prototype.__onError = function(evt) {
-  console.log("Thrift WebSocket Error: " + evt.toString());
-  this.socket.close();
-};
-
-/**
- * Sets the buffer to use when receiving server responses.
- * @param {string} buf - The buffer to receive server responses.
- */
-TWebSocketTransport.prototype.setRecvBuffer = function(buf) {
-  this.recv_buf = buf;
-  this.recv_buf_sz = this.recv_buf.length;
-  this.wpos = this.recv_buf.length;
-  this.rpos = 0;
-};
-
-/**
- * Returns true if the transport is open
- * @readonly
- * @returns {boolean}
- */
-TWebSocketTransport.prototype.isOpen = function() {
-  return this.socket && this.socket.readyState == this.socket.OPEN;
-};
-
-/**
- * Opens the transport connection
- */
-TWebSocketTransport.prototype.open = function() {
-  //If OPEN/CONNECTING/CLOSING ignore additional opens
-  if (this.socket && this.socket.readyState != this.socket.CLOSED) {
-    return;
-  }
-  //If there is no socket or the socket is closed:
-  this.socket = new WebSocket(this.url);
-  this.socket.onopen = this.__onOpen.bind(this);
-  this.socket.onmessage = this.__onMessage.bind(this);
-  this.socket.onerror = this.__onError.bind(this);
-  this.socket.onclose = this.__onClose.bind(this);
-};
-
-/**
- * Closes the transport connection
- */
-TWebSocketTransport.prototype.close = function() {
-  this.socket.close();
-};
-
-/**
- * Returns the specified number of characters from the response
- * buffer.
- * @param {number} len - The number of characters to return.
- * @returns {string} Characters sent by the server.
- */
-TWebSocketTransport.prototype.read = function(len) {
-  var avail = this.wpos - this.rpos;
-
-  if (avail === 0) {
-    return '';
-  }
-
-  var give = len;
-
-  if (avail < len) {
-    give = avail;
-  }
-
-  var ret = this.read_buf.substr(this.rpos, give);
-  this.rpos += give;
-
-  //clear buf when complete?
-  return ret;
-};
-
-/**
- * Returns the entire response buffer.
- * @returns {string} Characters sent by the server.
- */
-TWebSocketTransport.prototype.readAll = function() {
-  return this.recv_buf;
-};
-
-/**
- * Sets the send buffer to buf.
- * @param {string} buf - The buffer to send.
- */
-TWebSocketTransport.prototype.write = function(buf) {
-  this.send_buf = buf;
-};
-
-/**
- * Returns the send buffer.
- * @readonly
- * @returns {string} The send buffer.
- */
-TWebSocketTransport.prototype.getSendBuffer = function() {
-  return this.send_buf;
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/xhr_connection.js b/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/xhr_connection.js
deleted file mode 100644
index 6459c90..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/lib/thrift/xhr_connection.js
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var util = require('util');
-var EventEmitter = require("events").EventEmitter;
-var thrift = require('./thrift');
-
-var TBufferedTransport = require('./buffered_transport');
-var TJSONProtocol = require('./json_protocol');
-var InputBufferUnderrunError = require('./input_buffer_underrun_error');
-
-var createClient = require('./create_client');
-
-exports.XHRConnection = XHRConnection;
-
-/**
- * Constructor Function for the XHR Connection.
- * If you do not specify a host and port then XHRConnection will default to the
- * host and port of the page from which this javascript is served.
- * @constructor
- * @param {string} [url] - The URL to connect to.
- * @classdesc TXHRConnection objects provide Thrift end point transport
- *     semantics implemented using XHR.
- * @example
- *     var transport = new Thrift.TXHRConnection('localhost', 9099, {});
- */
-function XHRConnection(host, port, options) {
-  this.options = options || {};
-  this.wpos = 0;
-  this.rpos = 0;
-  this.useCORS = (options && options.useCORS);
-  this.send_buf = '';
-  this.recv_buf = '';
-  this.transport = options.transport || TBufferedTransport;
-  this.protocol = options.protocol || TJSONProtocol;
-  this.headers = options.headers || {};
-
-  host = host || window.location.host;
-  port = port || window.location.port;
-  var prefix = options.https ? 'https://' : 'http://';
-  var path = options.path || '/';
-
-  if (port === '') {
-    port = undefined;
-  }
-
-  if (!port || port === 80 || port === '80') {
-    this.url = prefix + host + path;
-  } else {
-    this.url = prefix + host + ':' + port + path;
-  }
-
-  //The sequence map is used to map seqIDs back to the
-  //  calling client in multiplexed scenarios
-  this.seqId2Service = {};
-};
-
-util.inherits(XHRConnection, EventEmitter);
-
-/**
-* Gets the browser specific XmlHttpRequest Object.
-* @returns {object} the browser XHR interface object
-*/
-XHRConnection.prototype.getXmlHttpRequestObject = function() {
-  try { return new XMLHttpRequest(); } catch (e1) { }
-  try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch (e2) { }
-  try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch (e3) { }
-
-  throw "Your browser doesn't support XHR.";
-};
-
-/**
- * Sends the current XRH request if the transport was created with a URL
- * and the async parameter is false. If the transport was not created with
- * a URL, or the async parameter is True and no callback is provided, or
- * the URL is an empty string, the current send buffer is returned.
- * @param {object} async - If true the current send buffer is returned.
- * @param {object} callback - Optional async completion callback
- * @returns {undefined|string} Nothing or the current send buffer.
- * @throws {string} If XHR fails.
- */
-XHRConnection.prototype.flush = function() {
-  var self = this;
-  if (this.url === undefined || this.url === '') {
-    return this.send_buf;
-  }
-
-  var xreq = this.getXmlHttpRequestObject();
-
-  if (xreq.overrideMimeType) {
-    xreq.overrideMimeType('application/json');
-  }
-
-  xreq.onreadystatechange = function() {
-    if (this.readyState == 4 && this.status == 200) {
-      self.setRecvBuffer(this.responseText);
-    }
-  };
-
-  xreq.open('POST', this.url, true);
-
-  Object.keys(this.headers).forEach(function(headerKey) {
-    xreq.setRequestHeader(headerKey, self.headers[headerKey]);
-  });
-
-  xreq.send(this.send_buf);
-};
-
-/**
- * Sets the buffer to provide the protocol when deserializing.
- * @param {string} buf - The buffer to supply the protocol.
- */
-XHRConnection.prototype.setRecvBuffer = function(buf) {
-  this.recv_buf = buf;
-  this.recv_buf_sz = this.recv_buf.length;
-  this.wpos = this.recv_buf.length;
-  this.rpos = 0;
-
-  if (Object.prototype.toString.call(buf) == "[object ArrayBuffer]") {
-    var data = new Uint8Array(buf);
-  }
-  var thing = new Buffer(data || buf);
-
-  this.transport.receiver(this.__decodeCallback.bind(this))(thing);
-
-};
-
-XHRConnection.prototype.__decodeCallback = function(transport_with_data) {
-  var proto = new this.protocol(transport_with_data);
-  try {
-    while (true) {
-      var header = proto.readMessageBegin();
-      var dummy_seqid = header.rseqid * -1;
-      var client = this.client;
-      //The Multiplexed Protocol stores a hash of seqid to service names
-      //  in seqId2Service. If the SeqId is found in the hash we need to
-      //  lookup the appropriate client for this call.
-      //  The client var is a single client object when not multiplexing,
-      //  when using multiplexing it is a service name keyed hash of client
-      //  objects.
-      //NOTE: The 2 way interdependencies between protocols, transports,
-      //  connections and clients in the Node.js implementation are irregular
-      //  and make the implementation difficult to extend and maintain. We
-      //  should bring this stuff inline with typical thrift I/O stack
-      //  operation soon.
-      //  --ra
-      var service_name = this.seqId2Service[header.rseqid];
-      if (service_name) {
-        client = this.client[service_name];
-        delete this.seqId2Service[header.rseqid];
-      }
-      /*jshint -W083 */
-      client._reqs[dummy_seqid] = function(err, success) {
-        transport_with_data.commitPosition();
-        var clientCallback = client._reqs[header.rseqid];
-        delete client._reqs[header.rseqid];
-        if (clientCallback) {
-          clientCallback(err, success);
-        }
-      };
-      /*jshint +W083 */
-      if (client['recv_' + header.fname]) {
-        client['recv_' + header.fname](proto, header.mtype, dummy_seqid);
-      } else {
-        delete client._reqs[dummy_seqid];
-        this.emit("error",
-          new thrift.TApplicationException(
-            thrift.TApplicationExceptionType.WRONG_METHOD_NAME,
-            "Received a response to an unknown RPC function"));
-      }
-    }
-  } catch (e) {
-    if (e instanceof InputBufferUnderrunError) {
-      transport_with_data.rollbackPosition();
-    } else {
-      throw e;
-    }
-  }
-};
-
-/**
- * Returns true if the transport is open, XHR always returns true.
- * @readonly
- * @returns {boolean} Always True.
- */
-XHRConnection.prototype.isOpen = function() {
-  return true;
-};
-
-/**
- * Opens the transport connection, with XHR this is a nop.
- */
-XHRConnection.prototype.open = function() {};
-
-/**
- * Closes the transport connection, with XHR this is a nop.
- */
-XHRConnection.prototype.close = function() {};
-
-/**
- * Returns the specified number of characters from the response
- * buffer.
- * @param {number} len - The number of characters to return.
- * @returns {string} Characters sent by the server.
- */
-XHRConnection.prototype.read = function(len) {
-  var avail = this.wpos - this.rpos;
-
-  if (avail === 0) {
-    return '';
-  }
-
-  var give = len;
-
-  if (avail < len) {
-    give = avail;
-  }
-
-  var ret = this.read_buf.substr(this.rpos, give);
-  this.rpos += give;
-
-  //clear buf when complete?
-  return ret;
-};
-
-/**
- * Returns the entire response buffer.
- * @returns {string} Characters sent by the server.
- */
-XHRConnection.prototype.readAll = function() {
-  return this.recv_buf;
-};
-
-/**
- * Sets the send buffer to buf.
- * @param {string} buf - The buffer to send.
- */
-XHRConnection.prototype.write = function(buf) {
-  this.send_buf = buf;
-  this.flush();
-};
-
-/**
- * Returns the send buffer.
- * @readonly
- * @returns {string} The send buffer.
- */
-XHRConnection.prototype.getSendBuffer = function() {
-  return this.send_buf;
-};
-
-/**
- * Creates a new TXHRTransport object, used by Thrift clients to connect
- *    to Thrift HTTP based servers.
- * @param {string} host - The host name or IP to connect to.
- * @param {number} port - The TCP port to connect to.
- * @param {XHRConnectOptions} options - The configuration options to use.
- * @returns {XHRConnection} The connection object.
- * @see {@link XHRConnectOptions}
- */
-exports.createXHRConnection = function(host, port, options) {
-  return new XHRConnection(host, port, options);
-};
-
-exports.createXHRClient = createClient;
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/binary.test.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/binary.test.js
deleted file mode 100644
index 38ba634..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/binary.test.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var test = require('tape');
-var binary = require('thrift/binary');
-
-var cases = {
-  "Should read signed byte": function(assert){
-    assert.equal(1, binary.readByte(0x01));
-    assert.equal(-1, binary.readByte(0xFF));
-
-    assert.equal(127, binary.readByte(0x7F));
-    assert.equal(-128, binary.readByte(0x80));
-    assert.end();
-  },
-  "Should write byte": function(assert){
-    //Protocol simply writes to the buffer. Nothing to test.. yet.
-    assert.ok(true);
-    assert.end();
-  },
-  "Should read I16": function(assert) {
-    assert.equal(0, binary.readI16([0x00, 0x00]));
-    assert.equal(1, binary.readI16([0x00, 0x01]));
-    assert.equal(-1, binary.readI16([0xff, 0xff]));
-
-    // Min I16
-    assert.equal(-32768, binary.readI16([0x80, 0x00]));
-    // Max I16
-    assert.equal(32767, binary.readI16([0x7f, 0xff]));
-    assert.end();
-  },
-
-  "Should write I16": function(assert) {
-    assert.deepEqual([0x00, 0x00], binary.writeI16([], 0));
-    assert.deepEqual([0x00, 0x01], binary.writeI16([], 1));
-    assert.deepEqual([0xff, 0xff], binary.writeI16([], -1));
-
-    // Min I16
-    assert.deepEqual([0x80, 0x00], binary.writeI16([], -32768));
-    // Max I16
-    assert.deepEqual([0x7f, 0xff], binary.writeI16([], 32767));
-    assert.end();
-  },
-
-  "Should read I32": function(assert) {
-    assert.equal(0, binary.readI32([0x00, 0x00, 0x00, 0x00]));
-    assert.equal(1, binary.readI32([0x00, 0x00, 0x00, 0x01]));
-    assert.equal(-1, binary.readI32([0xff, 0xff, 0xff, 0xff]));
-
-    // Min I32
-    assert.equal(-2147483648, binary.readI32([0x80, 0x00, 0x00, 0x00]));
-    // Max I32
-    assert.equal(2147483647, binary.readI32([0x7f, 0xff, 0xff, 0xff]));
-    assert.end();
-  },
-
-  "Should write I32": function(assert) {
-    assert.deepEqual([0x00, 0x00, 0x00, 0x00], binary.writeI32([], 0));
-    assert.deepEqual([0x00, 0x00, 0x00, 0x01], binary.writeI32([], 1));
-    assert.deepEqual([0xff, 0xff, 0xff, 0xff], binary.writeI32([], -1));
-
-    // Min I32
-    assert.deepEqual([0x80, 0x00, 0x00, 0x00], binary.writeI32([], -2147483648));
-    // Max I32
-    assert.deepEqual([0x7f, 0xff, 0xff, 0xff], binary.writeI32([], 2147483647));
-    assert.end();
-  },
-
-  "Should read doubles": function(assert) {
-    assert.equal(0, binary.readDouble([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
-    assert.equal(0, binary.readDouble([0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
-    assert.equal(1, binary.readDouble([0x3f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
-    assert.equal(2, binary.readDouble([0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
-    assert.equal(-2, binary.readDouble([0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
-
-    assert.equal(Math.PI, binary.readDouble([0x40, 0x9, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18]))
-
-    assert.equal(Infinity, binary.readDouble([0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
-    assert.equal(-Infinity, binary.readDouble([0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
-
-    assert.ok(isNaN(binary.readDouble([0x7f, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])))
-
-    assert.equal(1/3, binary.readDouble([0x3f, 0xd5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55]))
-
-    // Min subnormal positive double
-    assert.equal(4.9406564584124654e-324, binary.readDouble([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]))
-    // Min normal positive double
-    assert.equal(2.2250738585072014e-308, binary.readDouble([0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]))
-    // Max positive double
-    assert.equal(1.7976931348623157e308, binary.readDouble([0x7f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]))
-    assert.end();
-  },
-
-  "Should write doubles": function(assert) {
-    assert.deepEqual([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], binary.writeDouble([], 0));
-    assert.deepEqual([0x3f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], binary.writeDouble([], 1));
-    assert.deepEqual([0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], binary.writeDouble([], 2));
-    assert.deepEqual([0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], binary.writeDouble([], -2));
-
-    assert.deepEqual([0x40, 0x9, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18], binary.writeDouble([], Math.PI));
-
-    assert.deepEqual([0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], binary.writeDouble([], Infinity));
-    assert.deepEqual([0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], binary.writeDouble([], -Infinity));
-
-    assert.deepEqual([0x7f, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], binary.writeDouble([], NaN));
-
-    assert.deepEqual([0x3f, 0xd5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55], binary.writeDouble([], 1/3));
-
-    // Min subnormal positive double
-    assert.deepEqual([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01], binary.writeDouble([], 4.9406564584124654e-324));
-    // Min normal positive double
-    assert.deepEqual([0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], binary.writeDouble([], 2.2250738585072014e-308));
-    // Max positive double
-    assert.deepEqual([0x7f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff], binary.writeDouble([], 1.7976931348623157e308));
-    assert.end();
-  }
-};
-
-Object.keys(cases).forEach(function(caseName) {
-  test(caseName, cases[caseName]);
-});
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/browser_client.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/browser_client.js
deleted file mode 100644
index 27db543..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/browser_client.js
+++ /dev/null
@@ -1,27 +0,0 @@
-
-var assert = require('assert');
-var thrift = require('thrift');
-var helpers = require('./helpers');
-var ThriftTest = require('./gen-nodejs/ThriftTest');
-var ThriftTestDriver = require('./test_driver').ThriftTestDriver;
-
-// createXHRConnection createWSConnection
-var connection = thrift.createXHRConnection("localhost", 9090, {
-    transport: helpers.transports['buffered'],
-    protocol: helpers.protocols['json'],
-    path: '/test'
-});
-
-connection.on('error', function(err) {
-    assert(false, err);
-});
-
-// Uncomment the following line to start a websockets connection
-// connection.open();
-
-// createWSClient createXHRClient
-var client = thrift.createXHRClient(ThriftTest, connection);
-
-ThriftTestDriver(client, function (status) {
-    console.log('Browser:', status);
-});
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/certificates.README b/vendor/git.apache.org/thrift.git/lib/nodejs/test/certificates.README
deleted file mode 100644
index 06c507e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/certificates.README
+++ /dev/null
@@ -1,7 +0,0 @@
-server.crt AND server.key ARE PROVIDED FOR TEST PURPOSE AND SHOULD *NEVER* BE USED IN PRODUCTION
-
-
-Origin of the test key and cert is the folder test/keys of Apache Thrift source code distribution
-
-We need copies for npm deployment
-
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/client.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/client.js
deleted file mode 100644
index a38a66b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/client.js
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env node
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var fs = require('fs');
-var assert = require('assert');
-var thrift = require('thrift');
-var helpers = require('./helpers');
-var ThriftTest = require('./gen-nodejs/ThriftTest');
-var ThriftTestDriver = require('./test_driver').ThriftTestDriver;
-var ThriftTestDriverPromise = require('./test_driver').ThriftTestDriverPromise;
-var SecondService = require('./gen-nodejs/SecondService');
-var ttypes = require('./gen-nodejs/ThriftTest_types');
-
-var program = require('commander');
-
-program
-  .option('-p, --protocol <protocol>', 'Set thrift protocol (binary|json) [protocol]')
-  .option('-t, --transport <transport>', 'Set thrift transport (buffered|framed) [transport]')
-  .option('--port <port>', 'Set thrift server port number to connect', 9090)
-  .option('--host <host>', 'Set thrift server host to connect', 'localhost')
-  .option('--ssl', 'use SSL transport')
-  .option('--promise', 'test with promise style functions')
-  .option('-t, --type <type>', 'Select server type (tcp|multiplex|http)', 'tcp')
-  .parse(process.argv);
-
-var host = program.host;
-var port = program.port;
-var type = program.type;
-var ssl = program.ssl;
-var promise = program.promise;
-
-var options = {
-  transport: helpers.transports[program.transport],
-  protocol: helpers.protocols[program.protocol]
-};
-
-if (type === 'http' || type === 'websocket') {
-  options.path = '/test';
-}
-
-if (type === 'http') {
-  options.headers = {"Connection": "close"};
-}
-
-if (ssl) {
-  if (type === 'tcp' || type === 'multiplex') {
-    options.rejectUnauthorized = false;
-  } else if (type === 'http') {
-    options.nodeOptions = { rejectUnauthorized: false };
-    options.https = true;
-  } else if (type === 'websocket') {
-    options.wsOptions = { rejectUnauthorized: false };
-    options.secure = true;
-  }
-}
-
-var connection;
-var client;
-var testDriver = promise ? ThriftTestDriverPromise : ThriftTestDriver;
-
-if (type === 'tcp' || type === 'multiplex') {
-  connection = ssl ?
-    thrift.createSSLConnection(host, port, options) :
-    thrift.createConnection(host, port, options);
-} else if (type === 'http') {
-  connection = thrift.createHttpConnection(host, port, options);
-} else if (type === 'websocket') {
-  connection = thrift.createWSConnection(host, port, options);
-  connection.open();
-}
-
-connection.on('error', function(err) {
-    assert(false, err);
-});
-
-if (type === 'tcp') {
-  client = thrift.createClient(ThriftTest, connection);
-  runTests();
-} else if (type === 'multiplex') {
-  var mp = new thrift.Multiplexer();
-  client = mp.createClient("ThriftTest", ThriftTest, connection);
-  secondclient = mp.createClient("SecondService", SecondService, connection);
-
-  connection.on('connect', function() {
-    secondclient.secondtestString("Test", function(err, response) {
-      assert(!err);
-      assert.equal("Test", response);
-    });
-
-    runTests();
-  });
-} else if (type === 'http') {
-  client = thrift.createHttpClient(ThriftTest, connection);
-  runTests();
-} else if (type === 'websocket') {
-  client = thrift.createWSClient(ThriftTest, connection);
-  runTests();
-}
-
-function runTests() {
-  testDriver(client, function (status) {
-    console.log(status);
-    if (type !== 'http' && type !== 'websocket') {
-      connection.end();
-    }
-    if (type !== 'multiplex') {
-      process.exit(0);
-    }
-  });
-}
-
-exports.expressoTest = function() {};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/deep-constructor.test.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/deep-constructor.test.js
deleted file mode 100644
index 2caeb82..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/deep-constructor.test.js
+++ /dev/null
@@ -1,314 +0,0 @@
-var ttypes = require('./gen-nodejs/JsDeepConstructorTest_types');
-var thrift = require('thrift');
-var test = require('tape');
-var bufferEquals = require('buffer-equals');
-
-function serializeBinary(data) {
-  var buff;
-  var transport = new thrift.TBufferedTransport(null, function(msg){
-    buff = msg;
-  });
-  var prot = new thrift.TBinaryProtocol(transport);
-  data.write(prot);
-  prot.flush();
-  return buff;
-
-}
-
-
-function deserializeBinary(serialized, type) {
-  var t = new thrift.TFramedTransport(serialized);
-  var p = new thrift.TBinaryProtocol(t);
-  var data = new type();
-  data.read(p);
-  return data;
-}
-
-
-function serializeJSON(data) {
-  var buff;
-  var transport = new thrift.TBufferedTransport(null, function(msg){
-    buff = msg;
-  });
-  var protocol  = new thrift.TJSONProtocol(transport);
-  protocol.writeMessageBegin("", 0, 0);
-  data.write(protocol);
-  protocol.writeMessageEnd();
-  protocol.flush();
-  return buff;
-}
-
-
-function deserializeJSON(serialized, type) {
-  var transport = new thrift.TFramedTransport(serialized);
-  var protocol  = new thrift.TJSONProtocol(transport);
-  protocol.readMessageBegin();
-  var data = new type();
-  data.read(protocol);
-  protocol.readMessageEnd();
-  return data;
-}
-
-
-function createThriftObj() {
-
-  return new ttypes.Complex({
-
-    struct_field: new ttypes.Simple({value: 'a'}),
-
-    struct_list_field: [
-      new ttypes.Simple({value: 'b'}),
-      new ttypes.Simple({value: 'c'}),
-    ],
-
-    struct_set_field: [
-      new ttypes.Simple({value: 'd'}),
-      new ttypes.Simple({value: 'e'}),
-    ],
-
-    struct_map_field: {
-      A: new ttypes.Simple({value: 'f'}),
-      B: new ttypes.Simple({value: 'g'})
-    },
-
-    struct_nested_containers_field: [
-      [
-        {
-          C: [
-            new ttypes.Simple({value: 'h'}),
-            new ttypes.Simple({value: 'i'})
-          ]
-        }
-      ]
-    ],
-
-    struct_nested_containers_field2: {
-      D: [
-        {
-          DA: new ttypes.Simple({value: 'j'})
-        },
-        {
-          DB: new ttypes.Simple({value: 'k'})
-        }
-      ]
-    },
-
-    list_of_list_field: [
-      ['l00', 'l01', 'l02'],
-      ['l10', 'l11', 'l12'],
-      ['l20', 'l21', 'l22'],
-    ],
-
-    list_of_list_of_list_field: [
-      [['m000', 'm001', 'm002'], ['m010', 'm011', 'm012'], ['m020', 'm021', 'm022']],
-      [['m100', 'm101', 'm102'], ['m110', 'm111', 'm112'], ['m120', 'm121', 'm122']],
-      [['m200', 'm201', 'm202'], ['m210', 'm211', 'm212'], ['m220', 'm221', 'm222']],
-    ],
-
-
-  });
-}
-
-
-function createJsObj() {
-
-  return {
-
-    struct_field: {value: 'a'},
-
-    struct_list_field: [
-      {value: 'b'},
-      {value: 'c'},
-    ],
-
-    struct_set_field: [
-      {value: 'd'},
-      {value: 'e'},
-    ],
-
-    struct_map_field: {
-      A: {value: 'f'},
-      B: {value: 'g'}
-    },
-
-    struct_nested_containers_field: [
-      [
-        {
-          C: [
-            {value: 'h'},
-            {value: 'i'}
-          ]
-        }
-      ]
-    ],
-
-    struct_nested_containers_field2: {
-      D: [
-        {
-          DA: {value: 'j'}
-        },
-        {
-          DB: {value: 'k'}
-        }
-      ]
-    },
-
-    list_of_list_field: [
-      ['l00', 'l01', 'l02'],
-      ['l10', 'l11', 'l12'],
-      ['l20', 'l21', 'l22'],
-    ],
-
-    list_of_list_of_list_field: [
-      [['m000', 'm001', 'm002'], ['m010', 'm011', 'm012'], ['m020', 'm021', 'm022']],
-      [['m100', 'm101', 'm102'], ['m110', 'm111', 'm112'], ['m120', 'm121', 'm122']],
-      [['m200', 'm201', 'm202'], ['m210', 'm211', 'm212'], ['m220', 'm221', 'm222']],
-    ],
-
-  };
-}
-
-
-function assertValues(obj, assert) {
-    assert.equals(obj.struct_field.value, 'a');
-    assert.equals(obj.struct_list_field[0].value, 'b');
-    assert.equals(obj.struct_list_field[1].value, 'c');
-    assert.equals(obj.struct_set_field[0].value, 'd');
-    assert.equals(obj.struct_set_field[1].value, 'e');
-    assert.equals(obj.struct_map_field.A.value, 'f');
-    assert.equals(obj.struct_map_field.B.value, 'g');
-    assert.equals(obj.struct_nested_containers_field[0][0].C[0].value, 'h');
-    assert.equals(obj.struct_nested_containers_field[0][0].C[1].value, 'i');
-    assert.equals(obj.struct_nested_containers_field2.D[0].DA.value, 'j');
-    assert.equals(obj.struct_nested_containers_field2.D[1].DB.value, 'k');
-    assert.equals(obj.list_of_list_field[0][0], 'l00');
-    assert.equals(obj.list_of_list_field[0][1], 'l01');
-    assert.equals(obj.list_of_list_field[0][2], 'l02');
-    assert.equals(obj.list_of_list_field[1][0], 'l10');
-    assert.equals(obj.list_of_list_field[1][1], 'l11');
-    assert.equals(obj.list_of_list_field[1][2], 'l12');
-    assert.equals(obj.list_of_list_field[2][0], 'l20');
-    assert.equals(obj.list_of_list_field[2][1], 'l21');
-    assert.equals(obj.list_of_list_field[2][2], 'l22');
-
-    assert.equals(obj.list_of_list_of_list_field[0][0][0], 'm000');
-    assert.equals(obj.list_of_list_of_list_field[0][0][1], 'm001');
-    assert.equals(obj.list_of_list_of_list_field[0][0][2], 'm002');
-    assert.equals(obj.list_of_list_of_list_field[0][1][0], 'm010');
-    assert.equals(obj.list_of_list_of_list_field[0][1][1], 'm011');
-    assert.equals(obj.list_of_list_of_list_field[0][1][2], 'm012');
-    assert.equals(obj.list_of_list_of_list_field[0][2][0], 'm020');
-    assert.equals(obj.list_of_list_of_list_field[0][2][1], 'm021');
-    assert.equals(obj.list_of_list_of_list_field[0][2][2], 'm022');
-
-    assert.equals(obj.list_of_list_of_list_field[1][0][0], 'm100');
-    assert.equals(obj.list_of_list_of_list_field[1][0][1], 'm101');
-    assert.equals(obj.list_of_list_of_list_field[1][0][2], 'm102');
-    assert.equals(obj.list_of_list_of_list_field[1][1][0], 'm110');
-    assert.equals(obj.list_of_list_of_list_field[1][1][1], 'm111');
-    assert.equals(obj.list_of_list_of_list_field[1][1][2], 'm112');
-    assert.equals(obj.list_of_list_of_list_field[1][2][0], 'm120');
-    assert.equals(obj.list_of_list_of_list_field[1][2][1], 'm121');
-    assert.equals(obj.list_of_list_of_list_field[1][2][2], 'm122');
-
-    assert.equals(obj.list_of_list_of_list_field[2][0][0], 'm200');
-    assert.equals(obj.list_of_list_of_list_field[2][0][1], 'm201');
-    assert.equals(obj.list_of_list_of_list_field[2][0][2], 'm202');
-    assert.equals(obj.list_of_list_of_list_field[2][1][0], 'm210');
-    assert.equals(obj.list_of_list_of_list_field[2][1][1], 'm211');
-    assert.equals(obj.list_of_list_of_list_field[2][1][2], 'm212');
-    assert.equals(obj.list_of_list_of_list_field[2][2][0], 'm220');
-    assert.equals(obj.list_of_list_of_list_field[2][2][1], 'm221');
-    assert.equals(obj.list_of_list_of_list_field[2][2][2], 'm222');
-}
-
-function createTestCases(serialize, deserialize) {
-
-  var cases = {
-
-    "Serialize/deserialize should return equal object": function(assert){
-      var tObj = createThriftObj();
-      var received = deserialize(serialize(tObj), ttypes.Complex);
-      assert.ok(tObj !== received, 'not the same object');
-      assert.deepEqual(tObj, received);
-      assert.end();
-    },
-
-    "Nested structs and containers initialized from plain js objects should serialize same as if initialized from thrift objects": function(assert) {
-      var tObj1 = createThriftObj();
-      var tObj2 = new ttypes.Complex(createJsObj());
-      assertValues(tObj2, assert);
-      var s1 = serialize(tObj1);
-      var s2 = serialize(tObj2);
-      assert.ok(bufferEquals(s1, s2));
-      assert.end();
-    },
-
-    "Modifications to args object should not affect constructed Thrift object": function (assert) {
-
-      var args = createJsObj();
-      assertValues(args, assert);
-
-      var tObj = new ttypes.Complex(args);
-      assertValues(tObj, assert);
-
-      args.struct_field.value = 'ZZZ';
-      args.struct_list_field[0].value = 'ZZZ';
-      args.struct_list_field[1].value = 'ZZZ';
-      args.struct_set_field[0].value = 'ZZZ';
-      args.struct_set_field[1].value = 'ZZZ';
-      args.struct_map_field.A.value = 'ZZZ';
-      args.struct_map_field.B.value = 'ZZZ';
-      args.struct_nested_containers_field[0][0].C[0] = 'ZZZ';
-      args.struct_nested_containers_field[0][0].C[1] = 'ZZZ';
-      args.struct_nested_containers_field2.D[0].DA = 'ZZZ';
-      args.struct_nested_containers_field2.D[0].DB = 'ZZZ';
-
-      assertValues(tObj, assert);
-      assert.end();
-    },
-
-    "nulls are ok": function(assert) {
-      var tObj = new ttypes.Complex({
-        struct_field: null,
-        struct_list_field: null,
-        struct_set_field: null,
-        struct_map_field: null,
-        struct_nested_containers_field: null,
-        struct_nested_containers_field2: null
-      });
-      var received = deserialize(serialize(tObj), ttypes.Complex);
-      assert.strictEqual(tObj.struct_field, null);
-      assert.ok(tObj !== received);
-      assert.deepEqual(tObj, received);
-      assert.end();
-    },
-
-    "Can make list with objects": function(assert) {
-      var tObj = new ttypes.ComplexList({
-	      "struct_list_field": [new ttypes.Complex({})]
-      });
-      var innerObj = tObj.struct_list_field[0];
-      assert.ok(innerObj instanceof ttypes.Complex)
-      assert.strictEqual(innerObj.struct_field, null);
-      assert.strictEqual(innerObj.struct_list_field, null);
-      assert.strictEqual(innerObj.struct_set_field, null);
-      assert.strictEqual(innerObj.struct_map_field, null);
-      assert.strictEqual(innerObj.struct_nested_containers_field, null);
-      assert.strictEqual(innerObj.struct_nested_containers_field2, null);
-      assert.end();
-    }
-
-  };
-  return cases;
-}
-
-
-function run(name, cases){
-  Object.keys(cases).forEach(function(caseName) {
-    test(name + ': ' + caseName, cases[caseName]);
-  });
-}
-
-run('binary', createTestCases(serializeBinary, deserializeBinary));
-run('json', createTestCases(serializeJSON, deserializeJSON));
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/exceptions.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/exceptions.js
deleted file mode 100644
index c6f2e4d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/exceptions.js
+++ /dev/null
@@ -1,55 +0,0 @@
-'use strict';
-var test = require('tape');
-var thrift = require('../lib/thrift/thrift.js');
-var InputBufferUnderrunError = require('../lib/thrift/input_buffer_underrun_error');
-
-test('TApplicationException', function t(assert) {
-  var e = new thrift.TApplicationException(1, 'foo');
-  assert.ok(e instanceof thrift.TApplicationException, 'is instanceof TApplicationException');
-  assert.ok(e instanceof thrift.TException, 'is instanceof TException');
-  assert.ok(e instanceof Error, 'is instanceof Error');
-  assert.equal(typeof e.stack, 'string', 'has stack trace');
-  assert.ok(/^TApplicationException: foo/.test(e.stack), 'Stack trace has correct error name and message');
-  assert.ok(e.stack.indexOf('test/exceptions.js:7:11') !== -1, 'stack trace starts on correct line and column');
-  assert.equal(e.name, 'TApplicationException', 'has function name TApplicationException');
-  assert.equal(e.message, 'foo', 'has error message "foo"');
-  assert.equal(e.type, 1, 'has type 1');
-  assert.end();
-});
-
-test('TException', function t(assert) {
-  var e = new thrift.TException('foo');
-  assert.ok(e instanceof thrift.TException, 'is instanceof TException');
-  assert.ok(e instanceof Error, 'is instanceof Error');
-  assert.equal(typeof e.stack, 'string', 'has stack trace');
-  assert.ok(/^TException: foo/.test(e.stack), 'Stack trace has correct error name and message');
-  assert.ok(e.stack.indexOf('test/exceptions.js:21:11') !== -1, 'stack trace starts on correct line and column');
-  assert.equal(e.name, 'TException', 'has function name TException');
-  assert.equal(e.message, 'foo', 'has error message "foo"');
-  assert.end();
-});
-
-test('TProtocolException', function t(assert) {
-  var e = new thrift.TProtocolException(1, 'foo');
-  assert.ok(e instanceof thrift.TProtocolException, 'is instanceof TProtocolException');
-  assert.ok(e instanceof Error, 'is instanceof Error');
-  assert.equal(typeof e.stack, 'string', 'has stack trace');
-  assert.ok(/^TProtocolException: foo/.test(e.stack), 'Stack trace has correct error name and message');
-  assert.ok(e.stack.indexOf('test/exceptions.js:33:11') !== -1, 'stack trace starts on correct line and column');
-  assert.equal(e.name, 'TProtocolException', 'has function name TProtocolException');
-  assert.equal(e.message, 'foo', 'has error message "foo"');
-  assert.equal(e.type, 1, 'has type 1');
-  assert.end();
-});
-
-test('InputBufferUnderrunError', function t(assert) {
-  var e = new InputBufferUnderrunError('foo');
-  assert.ok(e instanceof InputBufferUnderrunError, 'is instanceof InputBufferUnderrunError');
-  assert.ok(e instanceof Error, 'is instanceof Error');
-  assert.equal(typeof e.stack, 'string', 'has stack trace');
-  assert.ok(/^InputBufferUnderrunError: foo/.test(e.stack), 'Stack trace has correct error name and message');
-  assert.ok(e.stack.indexOf('test/exceptions.js:46:11') !== -1, 'stack trace starts on correct line and column');
-  assert.equal(e.name, 'InputBufferUnderrunError', 'has function name InputBufferUnderrunError');
-  assert.equal(e.message, 'foo', 'has error message "foo"');
-  assert.end();
-});
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/helpers.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/helpers.js
deleted file mode 100644
index c850c46..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/helpers.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-var thrift = require('../lib/thrift');
-
-module.exports.transports = {
-  'buffered': thrift.TBufferedTransport,
-  'framed': thrift.TFramedTransport
-};
-
-module.exports.protocols = {
-  'json': thrift.TJSONProtocol,
-  'binary': thrift.TBinaryProtocol,
-  'compact': thrift.TCompactProtocol
-};
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.crt b/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.crt
deleted file mode 100644
index 8a5ef3c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENzCCAx+gAwIBAgIJAOYfYfw7NCOcMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITWFyeWxhbmQxFDASBgNVBAcMC0ZvcmVzdCBIaWxs
-MScwJQYDVQQKDB5UaGUgQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xFjAUBgNV
-BAsMDUFwYWNoZSBUaHJpZnQxEjAQBgNVBAMMCWxvY2FsaG9zdDEkMCIGCSqGSIb3
-DQEJARYVZGV2QHRocmlmdC5hcGFjaGUub3JnMB4XDTE0MDQwNzE4NTgwMFoXDTIy
-MDYyNDE4NTgwMFowgbExCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhNYXJ5bGFuZDEU
-MBIGA1UEBwwLRm9yZXN0IEhpbGwxJzAlBgNVBAoMHlRoZSBBcGFjaGUgU29mdHdh
-cmUgRm91bmRhdGlvbjEWMBQGA1UECwwNQXBhY2hlIFRocmlmdDESMBAGA1UEAwwJ
-bG9jYWxob3N0MSQwIgYJKoZIhvcNAQkBFhVkZXZAdGhyaWZ0LmFwYWNoZS5vcmcw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqE9TE9wEXp5LRtLQVDSGQ
-GV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCySN8I2Xw6
-L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/HjKNg6ZKg
-2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQBGmZmMIUw
-AinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xku62LipkX
-wCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDmtrhVQF4n
-AgMBAAGjUDBOMB0GA1UdDgQWBBQo8v0wzQPx3EEexJPGlxPK1PpgKjAfBgNVHSME
-GDAWgBQo8v0wzQPx3EEexJPGlxPK1PpgKjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBGFRiJslcX0aJkwZpzTwSUdgcfKbpvNEbCNtVohfQVTI4a/oN5
-U+yqDZJg3vOaOuiAZqyHcIlZ8qyesCgRN314Tl4/JQ++CW8mKj1meTgo5YFxcZYm
-T9vsI3C+Nzn84DINgI9mx6yktIt3QOKZRDpzyPkUzxsyJ8J427DaimDrjTR+fTwD
-1Dh09xeeMnSa5zeV1HEDyJTqCXutLetwQ/IyfmMBhIx+nvB5f67pz/m+Dv6V0r3I
-p4HCcdnDUDGJbfqtoqsAATQQWO+WWuswB6mOhDbvPTxhRpZq6AkgWqv4S+u3M2GO
-r5p9FrBgavAw5bKO54C0oQKpN/5fta5l6Ws0
------END CERTIFICATE-----
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.js
deleted file mode 100644
index 6e5cdfa..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.js
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env node
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * 'License'); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var fs = require('fs');
-var path = require('path');
-var thrift = require('../lib/thrift');
-var program = require('commander');
-var helpers = require('./helpers');
-
-var ThriftTest = require('./gen-nodejs/ThriftTest');
-var SecondService = require('./gen-nodejs/SecondService');
-var ThriftTestHandler = require('./test_handler').AsyncThriftTestHandler;
-var ThriftTestHandlerPromise = require('./test_handler').SyncThriftTestHandler;
-var ttypes = require('./gen-nodejs/ThriftTest_types');
-
-program
-  .option('-p, --protocol <protocol>', 'Set thrift protocol (binary|json|compact)', 'binary')
-  .option('-t, --transport <transport>', 'Set thrift transport (buffered|framed)', 'buffered')
-  .option('--ssl', 'use ssl transport')
-  .option('--port <port>', 'Set thrift server port', 9090)
-  .option('--promise', 'test with promise style functions')
-  .option('-t, --type <type>', 'Select server type (tcp|multiplex|http)', 'tcp')
-  .parse(process.argv);
-
-var port = program.port;
-var type = program.type;
-var ssl = program.ssl;
-var promise = program.promise;
-
-var handler = program.promise ? ThriftTestHandler : ThriftTestHandlerPromise;
-
-var options = {
-  transport: helpers.transports[program.transport],
-  protocol: helpers.protocols[program.protocol]
-};
-
-if (type === 'http' || type ==='websocket') {
-  options.handler = handler;
-  options.processor = ThriftTest;
-
-  options = {
-    services: { "/test": options },
-    cors: {
-      '*': true
-    }
-  }
-}
-
-if (type === 'multiplex') {
-  var SecondServiceHandler = {
-    secondtestString: function(thing, result) {
-      console.log('testString(\'' + thing + '\')');
-      result(null, thing);
-    }
-  };
-
-  var processor = new thrift.MultiplexedProcessor();
-
-  processor.registerProcessor("ThriftTest",
-    new ThriftTest.Processor(ThriftTestHandler));
-
-  processor.registerProcessor("SecondService",
-    new SecondService.Processor(SecondServiceHandler));
-
-}
-
-if (ssl) {
-  options.tls = {
-    key: fs.readFileSync(path.resolve(__dirname, 'server.key')),
-    cert: fs.readFileSync(path.resolve(__dirname, 'server.crt'))
-  };
-}
-
-var server;
-if (type === 'tcp') {
-  server = thrift.createServer(ThriftTest, handler, options);
-} else if (type === 'multiplex') {
-  server = thrift.createMultiplexServer(processor, options);
-} else if (type === 'http' || type === 'websocket') {
-  server = thrift.createWebServer(options);
-}
-
-server.listen(port);
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.key b/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.key
deleted file mode 100644
index 263cfce..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/server.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCqE9TE9wEXp5LR
-tLQVDSGQGV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCy
-SN8I2Xw6L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/H
-jKNg6ZKg2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQB
-GmZmMIUwAinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xk
-u62LipkXwCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDm
-trhVQF4nAgMBAAECggEAW/y52YYW6ypROGbZ94DQpFV0kLO7qT8q0Ksxw5sPNaIt
-fEPRIymDa8ikyHWJS5Oxmw84wo5jnJV26jaLmwe2Lupq7Xf1lqej8f5LJtuv7cQR
-xfzp1vM65KJFFJHp6WqjGqJ6HSSZOpVDsnQYcXQjQCdpyAmaSWd3p+FqYSZ1mQmD
-bFNI7jqpczWSZhTdotQ7p7Hn9TVCehflP3yGIB3bQ+wCcCB85dOBz201L+YgaIck
-Sz43A4NvWaQIRLRDw7s9GW4jY5T0Jv282WIeAlVpVxLIwu48r4R4yGTIx9Ydowvq
-57+Y5iPPjAXxu0V9t00oS3bYxDaKh2DUfc/5zowq8QKBgQDYNVPXmaG0aIH4vjQ9
-7fRdw/UDkYcQbn6CnglQOu77/S8ogQzpKCVJgJgkZNqOVtQMEPzekGEcLTbje1gU
-8Bky2k+PL9UwbFy0emnOVh4rqrNXHsRvJcehNT/PRb5hjF3MUMFV/0iD4b+naFaE
-jrSWiZ2ZXj2qfwAK52GFbtOuBQKBgQDJYQuGiY0r22E4waJmCSKczoBT3cwlVzWj
-V2ljgA9RHLNTVkvNNYQLGu2qngFrtwpeaSnsMDerVG4wKAQWyCnYzxVrlnC4uDrJ
-HXuFEltBWi9Ffbgfsnd3749AT0oBP1NT2tMleguyf5DFgjCR3VRJLdrVaaZ8row/
-LqKcFMqnOwKBgB+OIO99l7E584Y3VG6ZdSneOLtNmRXX2pT7tcZE465ZdHGH7Dd3
-SYHhx9K/+Xn+yDH+pLli/xlarAEldmSP6k2WuTfftlC78AfTOfAId5zN7CDR9791
-Fx67I9X/itq33tS8EIuZl57P6uXm/4GXRloWOa8xpvRkVsBApuYPl8t1AoGATQDS
-y2sllDObBXzlgGbV2WgNIgSZ311toTv3jJiXQsjauW8yJRHln+l4H9mzaWDgkiFc
-ang1kUoDqF5k0eFQPxtQcYdhKwEnWWfwp33RbzfxA32DPnubuzzbZhfrkHaKgnIW
-cyor9uFYlm2l7ODZLfJez2RKyTplXnOSsmQw6akCgYAz3dj9Hskyj+HVJ+ht1OcE
-c7ai/ESkSA7Vajp0tjJp0EKjW/zq8DvUSXOtcdnJgkKycFluLwbmnaN4txBds1C1
-Qr8Rt2sUCCBNZe1L6DHe3XBdbkJe9sgZVNTjtUSQrzy8UhvsCqG4YWeCu07Szcbc
-rdPUV9/uQkdx8VrShxlD8A==
------END PRIVATE KEY-----
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/test-cases.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/test-cases.js
deleted file mode 100644
index 13722be..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/test-cases.js
+++ /dev/null
@@ -1,144 +0,0 @@
-'use strict';
-
-var ttypes = require('./gen-nodejs/ThriftTest_types');
-var Int64 = require('node-int64');
-
-//all Languages in UTF-8
-/*jshint -W100 */
-var stringTest = module.exports.stringTest = "Afrikaans, Alemannisch, Aragonés, العربية, مصرى, " +
-    "Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška, " +
-    "Беларуская, Беларуская (тарашкевіца), Български, Bamanankan, " +
-    "বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн, " +
-    "Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg, " +
-    "Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English, " +
-    "Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt, " +
-    "Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego, " +
-    "Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski, " +
-    "Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia, " +
-    "Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa, " +
-    "ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар, " +
-    "Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino, " +
-    "Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa " +
-    "Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, مازِرونی, Bahasa " +
-    "Melayu, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪" +
-    "Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad, " +
-    "Occitan, Иронау, Papiamentu, Deitsch, Polski, پنجابی, پښتو, " +
-    "Norfuk / Pitkern, Português, Runa Simi, Rumantsch, Romani, Română, " +
-    "Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple " +
-    "English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk, " +
-    "Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog, " +
-    "Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük, " +
-    "Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文, " +
-    "Bân-lâm-gú, 粵語";
-/*jshint +W100 */
-
-var specialCharacters = module.exports.specialCharacters = 'quote: \" backslash:' +
-    ' forwardslash-escaped: \/ ' +
-    ' backspace: \b formfeed: \f newline: \n return: \r tab: ' +
-    ' now-all-of-them-together: "\\\/\b\n\r\t' +
-    ' now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><' +
-    ' char-to-test-json-parsing: ]] \"]] \\" }}}{ [[[ ';
-
-var mapTestInput = module.exports.mapTestInput = {
-  "a":"123", "a b":"with spaces ", "same":"same", "0":"numeric key",
-  "longValue":stringTest, stringTest:"long key"
-};
-
-var simple = [
-  ['testVoid', undefined],
-  ['testString', 'Test'],
-  ['testString', ''],
-  ['testString', stringTest],
-  ['testString', specialCharacters],
-  ['testBool', true],
-  ['testBool', false],
-  ['testByte', 1],
-  ['testByte', 0],
-  ['testByte', -1],
-  ['testByte', -127],
-  ['testI32', -1],
-  ['testDouble', -5.2098523],
-  ['testDouble', 7.012052175215044],
-  ['testEnum', ttypes.Numberz.ONE],
-  ['testI64', 5],
-  ['testI64', -5],
-  ['testI64', 734359738368],
-  ['testI64', -734359738368],
-  ['testI64', new Int64(new Buffer([0, 0x20, 0, 0, 0, 0, 0, 1]))],  // 2^53+1
-  ['testI64', new Int64(
-      new Buffer([0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]))],  // -2^53-1
-  ['testTypedef', 69]
-]
-
-var mapout = {};
-for (var i = 0; i < 5; ++i) {
-  mapout[i] = i-10;
-}
-
-var deep = [
-  ['testList', [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]],
-];
-
-var deepUnordered = [
-  ['testMap', mapout],
-  ['testSet', [1,2,3]],
-  ['testStringMap', mapTestInput]
-];
-
-var out = new ttypes.Xtruct({
-  string_thing: 'Zero',
-  byte_thing: 1,
-  i32_thing: -3,
-  i64_thing: 1000000
-});
-
-var out2 = new ttypes.Xtruct2();
-out2.byte_thing = 1;
-out2.struct_thing = out;
-out2.i32_thing = 5;
-
-var crazy = new ttypes.Insanity({
-  "userMap":{ "5":5, "8":8 },
-  "xtructs":[new ttypes.Xtruct({
-      "string_thing":"Goodbye4",
-      "byte_thing":4,
-      "i32_thing":4,
-      "i64_thing":4
-    }), new ttypes.Xtruct({
-      "string_thing":"Hello2",
-      "byte_thing":2,
-      "i32_thing":2,
-      "i64_thing":2
-    })]
-});
-
-var crazy2 = new ttypes.Insanity({
-  "userMap":{ "5":5, "8":8 },
-  "xtructs":[{
-      "string_thing":"Goodbye4",
-      "byte_thing":4,
-      "i32_thing":4,
-      "i64_thing":4
-    }, {
-      "string_thing":"Hello2",
-      "byte_thing":2,
-      "i32_thing":2,
-      "i64_thing":2
-    }]
-});
-
-
-var insanity = {
-  "1":{ "2": crazy, "3": crazy },
-  "2":{ "6":{ "userMap":{}, "xtructs":[] } }
-};
-
-module.exports.simple = simple;
-module.exports.deep = deep;
-module.exports.deepUnordered = deepUnordered;
-
-module.exports.out = out;
-module.exports.out2 = out2;
-module.exports.crazy = crazy;
-module.exports.crazy2 = crazy2;
-module.exports.insanity = insanity;
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/testAll.sh b/vendor/git.apache.org/thrift.git/lib/nodejs/test/testAll.sh
deleted file mode 100755
index 38b284a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/testAll.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#! /bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-if [ -n "${1}" ]; then
-  COVER=${1};
-fi
-
-DIR="$( cd "$( dirname "$0" )" && pwd )"
-
-ISTANBUL="$DIR/../../../node_modules/istanbul/lib/cli.js"
-RUNBROWSER="$DIR/../../../node_modules/run-browser/bin/cli.js"
-
-REPORT_PREFIX="${DIR}/../coverage/report"
-
-COUNT=0
-
-export NODE_PATH="${DIR}:${DIR}/../lib:${NODE_PATH}"
-
-testServer()
-{
-  echo "   Testing $1 Client/Server with protocol $2 and transport $3 $4";
-  RET=0
-  if [ -n "${COVER}" ]; then
-    ${ISTANBUL} cover ${DIR}/server.js --dir ${REPORT_PREFIX}${COUNT} --handle-sigint -- --type $1 -p $2 -t $3 $4 &
-    COUNT=$((COUNT+1))
-  else
-    node ${DIR}/server.js --type $1 -p $2 -t $3 $4 &
-  fi
-  SERVERPID=$!
-  sleep 1
-  if [ -n "${COVER}" ]; then
-    ${ISTANBUL} cover ${DIR}/client.js --dir ${REPORT_PREFIX}${COUNT} -- --type $1 -p $2 -t $3 $4 || RET=1
-    COUNT=$((COUNT+1))
-  else
-    node ${DIR}/client.js --type $1 -p $2 -t $3 $4 || RET=1
-  fi
-  kill -2 $SERVERPID || RET=1
-  return $RET
-}
-
-testBrowser()
-{
-  echo "   Testing browser client with http server with json protocol and buffered transport";
-  RET=0
-  node ${DIR}/server.js --type http -p json -t buffered &
-  SERVERPID=$!
-  sleep 1
-  ${RUNBROWSER} ${DIR}/browser_client.js --phantom || RET=1
-  kill -2 $SERVERPID || RET=1
-  return $RET
-}
-
-TESTOK=0
-
-#generating thrift code
-
-${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node ${DIR}/../../../test/ThriftTest.thrift
-${DIR}/../../../compiler/cpp/thrift -o ${DIR} --gen js:node ${DIR}/../../../test/JsDeepConstructorTest.thrift
-
-#unit tests
-
-node ${DIR}/binary.test.js || TESTOK=1
-node ${DIR}/deep-constructor.test.js || TESTOK=1
-
-#integration tests
-
-for type in tcp multiplex websocket http
-do
-
-  for protocol in compact binary json
-  do
-
-    for transport in buffered framed
-    do
-      testServer $type $protocol $transport || TESTOK=1
-      testServer $type $protocol $transport --ssl || TESTOK=1
-      testServer $type $protocol $transport --promise || TESTOK=1
-    done
-  done
-done
-
-# XHR only until phantomjs 2 is released.
-testBrowser
-
-if [ -n "${COVER}" ]; then
-  ${ISTANBUL} report --dir "${DIR}/../coverage" --include "${DIR}/../coverage/report*/coverage.json" lcov cobertura html
-  rm -r ${DIR}/../coverage/report*/*
-  rmdir ${DIR}/../coverage/report*
-fi
-
-exit $TESTOK
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/test_driver.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/test_driver.js
deleted file mode 100644
index 03ec513..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/test_driver.js
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * 'License'); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- // This is the Node.js test driver for the standard Apache Thrift
- // test service. The driver invokes every function defined in the
- // Thrift Test service with a representative range of parameters.
- //
- // The ThriftTestDriver function requires a client object
- // connected to a server hosting the Thrift Test service and
- // supports an optional callback function which is called with
- // a status message when the test is complete.
-
-var test = require('tape');
-//var assert = require('assert');
-var ttypes = require('./gen-nodejs/ThriftTest_types');
-var TException = require('thrift').Thrift.TException;
-var Int64 = require('node-int64');
-var testCases = require('./test-cases');
-
-exports.ThriftTestDriver = function(client, callback) {
-
-  test('NodeJS Style Callback Client Tests', function(assert) {
-
-    var checkRecursively = makeRecursiveCheck(assert);
-
-    function makeAsserter(assertionFn) {
-      return function(c) {
-        var fnName = c[0];
-        var expected = c[1];
-        client[fnName](expected, function(err, actual) {
-          assert.error(err, fnName + ': no callback error');
-          assertionFn(actual, expected, fnName);
-        })
-      };
-    }
-
-    testCases.simple.forEach(makeAsserter(function(a, e, m){
-      if (a instanceof Int64) {
-        var e64 = e instanceof Int64 ? e : new Int64(e);
-        assert.deepEqual(a.buffer, e64.buffer, m);
-      } else {
-        assert.equal(a, e, m);
-      }
-    }));
-    testCases.deep.forEach(makeAsserter(assert.deepEqual));
-    testCases.deepUnordered.forEach(makeAsserter(makeUnorderedDeepEqual(assert)));
-
-    var arr = [];
-    for (var i = 0; i < 256; ++i) {
-      arr[i] = 255 - i;
-    }
-    var buf = new Buffer(arr);
-    client.testBinary(buf, function(err, response) {
-      assert.error(err, 'testBinary: no callback error');
-      assert.equal(response.length, 256, 'testBinary');
-      assert.deepEqual(response, buf, 'testBinary(Buffer)');
-    });
-    var buf = new Buffer(arr);
-    client.testBinary(buf.toString('binary'), function(err, response) {
-      assert.error(err, 'testBinary: no callback error');
-      assert.equal(response.length, 256, 'testBinary');
-      assert.deepEqual(response, buf, 'testBinary(string)');
-    });
-
-    client.testMapMap(42, function(err, response) {
-      var expected = {
-        "4": {"1":1, "2":2, "3":3, "4":4},
-        "-4": {"-4":-4, "-3":-3, "-2":-2, "-1":-1}
-      };
-      assert.error(err, 'testMapMap: no callback error');
-      assert.deepEqual(expected, response, 'testMapMap');
-    });
-
-    client.testStruct(testCases.out, function(err, response) {
-      assert.error(err, 'testStruct: no callback error');
-      checkRecursively(testCases.out, response, 'testStruct');
-    });
-
-    client.testNest(testCases.out2, function(err, response) {
-      assert.error(err, 'testNest: no callback error');
-      checkRecursively(testCases.out2, response, 'testNest');
-    });
-
-    client.testInsanity(testCases.crazy, function(err, response) {
-      assert.error(err, 'testInsanity: no callback error');
-      checkRecursively(testCases.insanity, response, 'testInsanity');
-    });
-
-    client.testInsanity(testCases.crazy2, function(err, response) {
-      assert.error(err, 'testInsanity2: no callback error');
-      checkRecursively(testCases.insanity, response, 'testInsanity2');
-    });
-
-    client.testException('TException', function(err, response) {
-      assert.ok(err instanceof TException, 'testException: correct error type');
-      assert.ok(!response, 'testException: no response');
-    });
-
-    client.testException('Xception', function(err, response) {
-      assert.ok(err instanceof ttypes.Xception, 'testException: correct error type');
-      assert.ok(!response, 'testException: no response');
-      assert.equal(err.errorCode, 1001, 'testException: correct error code');
-      assert.equal('Xception', err.message, 'testException: correct error message');
-    });
-
-    client.testException('no Exception', function(err, response) {
-      assert.error(err, 'testException: no callback error');
-      assert.ok(!response, 'testException: no response');
-    });
-
-    client.testOneway(0, function(err, response) {
-      assert.fail('testOneway should not answer');
-    });
-
-    checkOffByOne(function(done) {
-      client.testI32(-1, function(err, response) {
-        assert.error(err, 'checkOffByOne: no callback error');
-        assert.equal(-1, response);
-        assert.end();
-        done();
-      });
-    }, callback);
-
-  });
-};
-
-exports.ThriftTestDriverPromise = function(client, callback) {
-
-  test('Q Promise Client Tests', function(assert) {
-
-    var checkRecursively = makeRecursiveCheck(assert);
-
-    function fail(msg) {
-      return function() {
-        assert.fail(msg);
-      }
-    }
-
-    function makeAsserter(assertionFn) {
-      return function(c) {
-        var fnName = c[0];
-        var expected = c[1];
-        client[fnName](expected)
-          .then(function(actual) {
-            assertionFn(actual, expected, fnName);
-          })
-          .fail(fail('fnName'));
-      };
-    }
-
-    testCases.simple.forEach(makeAsserter(function(a, e, m){
-      if (a instanceof Int64) {
-        var e64 = e instanceof Int64 ? e : new Int64(e);
-        assert.deepEqual(a.buffer, e64.buffer, m);
-      } else {
-        assert.equal(a, e, m);
-      }
-    }));
-    testCases.deep.forEach(makeAsserter(assert.deepEqual));
-    testCases.deepUnordered.forEach(makeAsserter(makeUnorderedDeepEqual(assert)));
-
-    client.testStruct(testCases.out)
-      .then(function(response) {
-        checkRecursively(testCases.out, response, 'testStruct');
-      })
-      .fail(fail('testStruct'));
-
-    client.testNest(testCases.out2)
-      .then(function(response) {
-        checkRecursively(testCases.out2, response, 'testNest');
-      })
-      .fail(fail('testNest'));
-
-    client.testInsanity(testCases.crazy)
-      .then(function(response) {
-        checkRecursively(testCases.insanity, response, 'testInsanity');
-      })
-      .fail(fail('testInsanity'));
-
-    client.testInsanity(testCases.crazy2)
-      .then(function(response) {
-        checkRecursively(testCases.insanity, response, 'testInsanity2');
-      })
-      .fail(fail('testInsanity2'));
-
-    client.testException('TException')
-      .then(function(response) {
-        fail('testException: TException');
-      })
-      .fail(function(err) {
-        assert.ok(err instanceof TException);
-      });
-
-    client.testException('Xception')
-      .then(function(response) {
-        fail('testException: Xception');
-      })
-      .fail(function(err) {
-        assert.ok(err instanceof ttypes.Xception);
-        assert.equal(err.errorCode, 1001);
-        assert.equal('Xception', err.message);
-      });
-
-    client.testException('no Exception')
-      .then(function(response) {
-        assert.equal(undefined, response); //void
-      })
-      .fail(fail('testException'));
-
-    client.testOneway(0, fail('testOneway: should not answer'));
-
-    checkOffByOne(function(done) {
-      client.testI32(-1)
-        .then(function(response) {
-            assert.equal(-1, response);
-            assert.end();
-            done();
-        })
-        .fail(fail('checkOffByOne'));
-    }, callback);
-  });
-};
-
-
-// Helper Functions
-// =========================================================
-
-function makeRecursiveCheck(assert) {
-
-  return function (map1, map2, msg) {
-    var equal = true;
-
-    var equal = checkRecursively(map1, map2);
-
-    assert.ok(equal, msg);
-
-    // deepEqual doesn't work with fields using node-int64
-    function checkRecursively(map1, map2) {
-      if (typeof map1 !== 'function' && typeof map2 !== 'function') {
-        if (!map1 || typeof map1 !== 'object') {
-          //Handle int64 types (which use node-int64 in Node.js JavaScript)
-          if ((typeof map1 === "number") && (typeof map2 === "object") &&
-              (map2.buffer) && (map2.buffer instanceof Buffer) && (map2.buffer.length === 8)) {
-            var n = new Int64(map2.buffer);
-            return map1 === n.toNumber();
-          } else {
-            return map1 == map2;
-          }
-        } else {
-          return Object.keys(map1).every(function(key) {
-            return checkRecursively(map1[key], map2[key]);
-          });
-        }
-      }
-    }
-  }
-}
-
-function checkOffByOne(done, callback) {
-
-  var retry_limit = 30;
-  var retry_interval = 100;
-  var test_complete = false;
-  var retrys = 0;
-
-  /**
-   * redo a simple test after the oneway to make sure we aren't "off by one" --
-   * if the server treated oneway void like normal void, this next test will
-   * fail since it will get the void confirmation rather than the correct
-   * result. In this circumstance, the client will throw the exception:
-   *
-   * Because this is the last test against the server, when it completes
-   * the entire suite is complete by definition (the tests run serially).
-   */
-  done(function() {
-    test_complete = true;
-  });
-
-  //We wait up to retry_limit * retry_interval for the test suite to complete
-  function TestForCompletion() {
-    if(test_complete && callback) {
-      callback("Server successfully tested!");
-    } else {
-      if (++retrys < retry_limit) {
-        setTimeout(TestForCompletion, retry_interval);
-      } else if (callback) {
-        callback("Server test failed to complete after " +
-                 (retry_limit * retry_interval / 1000) + " seconds");
-      }
-    }
-  }
-
-  setTimeout(TestForCompletion, retry_interval);
-}
-
-function makeUnorderedDeepEqual(assert) {
-  return function(actual, expected, name) {
-    assert.equal(actual.length, expected.length, name);
-    for (var k in actual) {
-      var found = false;
-      for (var k2 in expected) {
-        if (actual[k] === expected[k2]) {
-          found = true;
-        }
-      }
-      if (!found) {
-        assert.fail('Unexpected value ' + actual[k] + ' with key ' + k);
-      }
-    }
-  };
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/nodejs/test/test_handler.js b/vendor/git.apache.org/thrift.git/lib/nodejs/test/test_handler.js
deleted file mode 100644
index 5c89f7a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/nodejs/test/test_handler.js
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * 'License'); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//This is the server side Node test handler for the standard
-//  Apache Thrift test service.
-
-var ttypes = require('./gen-nodejs/ThriftTest_types');
-var TException = require('thrift').Thrift.TException;
-
-function makeSyncHandler(label) {
-  return function(thing) {
-    //console.log(label + '(\'' + thing + '\')');
-    return thing;
-  }
-}
-
-var syncHandlers = {
-  testVoid: testVoid,
-  testMapMap: testMapMap,
-  testInsanity: testInsanity,
-  testMulti: testMulti,
-  testException: testException,
-  testMultiException: testMultiException,
-  testOneway: testOneway
-};
-
-function makeAsyncHandler(label) {
-  return function(thing, result) {
-    thing = syncHandlers[label](thing);
-    result(null, thing);
-  }
-}
-
-var asyncHandlers = {
-  testVoid: testVoidAsync,
-  testMulti: testMultiAsync,
-  testException: testExceptionAsync,
-  testMultiException: testMultiExceptionAsync,
-  testOneway: testOnewayAsync
-};
-
-var identityHandlers = [
-  'testString',
-  'testBool',
-  'testByte',
-  'testI32',
-  'testI64',
-  'testDouble',
-  'testBinary',
-  'testStruct',
-  'testNest',
-  'testMap',
-  'testStringMap',
-  'testSet',
-  'testList',
-  'testEnum',
-  'testTypedef'
-];
-
-function testVoid() {
-  //console.log('testVoid()');
-}
-
-function testVoidAsync(result) {
-  result(testVoid());
-}
-
-function testMapMap(hello) {
-  //console.log('testMapMap(' + hello + ')');
-
-  var mapmap = [];
-  var pos = [];
-  var neg = [];
-  for (var i = 1; i < 5; i++) {
-    pos[i] = i;
-    neg[-i] = -i;
-  }
-  mapmap[4] = pos;
-  mapmap[-4] = neg;
-
-  return mapmap;
-}
-
-function testInsanity(argument) {
-  //console.log('testInsanity(');
-  //console.log(argument);
-  //console.log(')');
-
-  var first_map = [];
-  var second_map = [];
-
-  first_map[ttypes.Numberz.TWO] = argument;
-  first_map[ttypes.Numberz.THREE] = argument;
-
-  var looney = new ttypes.Insanity();
-  second_map[ttypes.Numberz.SIX] = looney;
-
-  var insane = [];
-  insane[1] = first_map;
-  insane[2] = second_map;
-
-  //console.log('insane result:');
-  //console.log(insane);
-  return insane;
-}
-
-function testMulti(arg0, arg1, arg2, arg3, arg4, arg5) {
-  //console.log('testMulti()');
-
-  var hello = new ttypes.Xtruct();
-  hello.string_thing = 'Hello2';
-  hello.byte_thing = arg0;
-  hello.i32_thing = arg1;
-  hello.i64_thing = arg2;
-  return hello;
-}
-
-function testMultiAsync(arg0, arg1, arg2, arg3, arg4, arg5, result) {
-  var hello = testMulti(arg0, arg1, arg2, arg3, arg4, arg5);
-  result(null, hello);
-}
-
-function testException(arg) {
-  //console.log('testException('+arg+')');
-  if (arg === 'Xception') {
-    var x = new ttypes.Xception();
-    x.errorCode = 1001;
-    x.message = arg;
-    throw x;
-  } else if (arg === 'TException') {
-    throw new TException(arg);
-  } else {
-    return;
-  }
-}
-
-function testExceptionAsync(arg, result) {
-  //console.log('testException('+arg+')');
-  if (arg === 'Xception') {
-    var x = new ttypes.Xception();
-    x.errorCode = 1001;
-    x.message = arg;
-    result(x);
-  } else if (arg === 'TException') {
-    result(new TException(arg));
-  } else {
-    result(null);
-  }
-}
-
-function testMultiException(arg0, arg1) {
-  //console.log('testMultiException(' + arg0 + ', ' + arg1 + ')');
-  if (arg0 === ('Xception')) {
-    var x = new ttypes.Xception();
-    x.errorCode = 1001;
-    x.message = 'This is an Xception';
-    throw x;
-  } else if (arg0 === ('Xception2')) {
-    var x2 = new ttypes.Xception2();
-    x2.errorCode = 2002;
-    x2.struct_thing = new ttypes.Xtruct();
-    x2.struct_thing.string_thing = 'This is an Xception2';
-    throw x2;
-  }
-
-  var res = new ttypes.Xtruct();
-  res.string_thing = arg1;
-  return res;
-}
-
-function testMultiExceptionAsync(arg0, arg1, result) {
-  //console.log('testMultiException(' + arg0 + ', ' + arg1 + ')');
-  if (arg0 === ('Xception')) {
-    var x = new ttypes.Xception();
-    x.errorCode = 1001;
-    x.message = 'This is an Xception';
-    result(x);
-  } else if (arg0 === ('Xception2')) {
-    var x2 = new ttypes.Xception2();
-    x2.errorCode = 2002;
-    x2.struct_thing = new ttypes.Xtruct();
-    x2.struct_thing.string_thing = 'This is an Xception2';
-    result(x2);
-  } else {
-    var res = new ttypes.Xtruct();
-    res.string_thing = arg1;
-    result(null, res);
-  }
-}
-
-function testOneway(sleepFor) {
-  //console.log('testOneway(' + sleepFor + ') => JavaScript (like Rust) never sleeps!');
-}
-
-function testOnewayAsync(sleepFor, result) {
-  testOneway(sleepFor);
-}
-
-identityHandlers.forEach(function(label) {
-  syncHandlers[label] = makeSyncHandler(label);
-  asyncHandlers[label] = makeAsyncHandler(label);
-});
-
-['testMapMap', 'testInsanity'].forEach(function(label) {
-  asyncHandlers[label] = makeAsyncHandler(label);
-});
-
-exports.ThriftTestHandler = asyncHandlers;
-
-exports.AsyncThriftTestHandler = asyncHandlers;
-exports.SyncThriftTestHandler = asyncHandlers;
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/OCamlMakefile b/vendor/git.apache.org/thrift.git/lib/ocaml/OCamlMakefile
deleted file mode 100644
index b0b9252..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/OCamlMakefile
+++ /dev/null
@@ -1,1231 +0,0 @@
-###########################################################################
-#                              OCamlMakefile
-#                  Copyright (C) 1999-2007  Markus Mottl
-#
-#                             For updates see:
-#                http://www.ocaml.info/home/ocaml_sources.html
-#
-###########################################################################
-
-# Modified by damien for .glade.ml compilation
-
-# Set these variables to the names of the sources to be processed and
-# the result variable. Order matters during linkage!
-
-ifndef SOURCES
-  SOURCES := foo.ml
-endif
-export SOURCES
-
-ifndef RES_CLIB_SUF
-  RES_CLIB_SUF := _stubs
-endif
-export RES_CLIB_SUF
-
-ifndef RESULT
-  RESULT := foo
-endif
-export RESULT := $(strip $(RESULT))
-
-export LIB_PACK_NAME
-
-ifndef DOC_FILES
-  DOC_FILES := $(filter %.mli, $(SOURCES))
-endif
-export DOC_FILES
-FIRST_DOC_FILE := $(firstword $(DOC_FILES))
-
-export BCSUFFIX
-export NCSUFFIX
-
-ifndef TOPSUFFIX
-  TOPSUFFIX := .top
-endif
-export TOPSUFFIX
-
-# Eventually set include- and library-paths, libraries to link,
-# additional compilation-, link- and ocamlyacc-flags
-# Path- and library information needs not be written with "-I" and such...
-# Define THREADS if you need it, otherwise leave it unset (same for
-# USE_CAMLP4)!
-
-export THREADS
-export VMTHREADS
-export ANNOTATE
-export USE_CAMLP4
-
-export INCDIRS
-export LIBDIRS
-export EXTLIBDIRS
-export RESULTDEPS
-export OCAML_DEFAULT_DIRS
-
-export LIBS
-export CLIBS
-export CFRAMEWORKS
-
-export OCAMLFLAGS
-export OCAMLNCFLAGS
-export OCAMLBCFLAGS
-
-export OCAMLLDFLAGS
-export OCAMLNLDFLAGS
-export OCAMLBLDFLAGS
-
-export OCAMLMKLIB_FLAGS
-
-ifndef OCAMLCPFLAGS
-  OCAMLCPFLAGS := a
-endif
-export OCAMLCPFLAGS
-
-ifndef DOC_DIR
-  DOC_DIR := doc
-endif
-export DOC_DIR
-
-export PPFLAGS
-
-export LFLAGS
-export YFLAGS
-export IDLFLAGS
-
-export OCAMLDOCFLAGS
-
-export OCAMLFIND_INSTFLAGS
-
-export DVIPSFLAGS
-
-export STATIC
-
-# Add a list of optional trash files that should be deleted by "make clean"
-export TRASH
-
-ECHO := echo
-
-ifdef REALLY_QUIET
-  export REALLY_QUIET
-  ECHO := true
-  LFLAGS := $(LFLAGS) -q
-  YFLAGS := $(YFLAGS) -q
-endif
-
-####################  variables depending on your OCaml-installation
-
-ifdef MINGW
-  export MINGW
-  WIN32   := 1
-  CFLAGS_WIN32 := -mno-cygwin
-endif
-ifdef MSVC
-  export MSVC
-  WIN32   := 1
-  ifndef STATIC
-    CPPFLAGS_WIN32 := -DCAML_DLL
-  endif
-  CFLAGS_WIN32 += -nologo
-  EXT_OBJ := obj
-  EXT_LIB := lib
-  ifeq ($(CC),gcc)
-    # work around GNU Make default value
-    ifdef THREADS
-      CC := cl -MT
-    else
-      CC := cl
-    endif
-  endif
-  ifeq ($(CXX),g++)
-    # work around GNU Make default value
-    CXX := $(CC)
-  endif
-  CFLAG_O := -Fo
-endif
-ifdef WIN32
-  EXT_CXX := cpp
-  EXE     := .exe
-endif
-
-ifndef EXT_OBJ
-  EXT_OBJ := o
-endif
-ifndef EXT_LIB
-  EXT_LIB := a
-endif
-ifndef EXT_CXX
-  EXT_CXX := cc
-endif
-ifndef EXE
-  EXE := # empty
-endif
-ifndef CFLAG_O
-  CFLAG_O := -o # do not delete this comment (preserves trailing whitespace)!
-endif
-
-export CC
-export CXX
-export CFLAGS
-export CXXFLAGS
-export LDFLAGS
-export CPPFLAGS
-
-ifndef RPATH_FLAG
-  ifdef ELF_RPATH_FLAG
-    RPATH_FLAG := $(ELF_RPATH_FLAG)
-  else
-    RPATH_FLAG := -R
-  endif
-endif
-export RPATH_FLAG
-
-ifndef MSVC
-ifndef PIC_CFLAGS
-  PIC_CFLAGS := -fPIC
-endif
-ifndef PIC_CPPFLAGS
-  PIC_CPPFLAGS := -DPIC
-endif
-endif
-
-export PIC_CFLAGS
-export PIC_CPPFLAGS
-
-BCRESULT  := $(addsuffix $(BCSUFFIX), $(RESULT))
-NCRESULT  := $(addsuffix $(NCSUFFIX), $(RESULT))
-TOPRESULT := $(addsuffix $(TOPSUFFIX), $(RESULT))
-
-ifndef OCAMLFIND
-  OCAMLFIND := ocamlfind
-endif
-export OCAMLFIND
-
-ifndef OCAMLC
-  OCAMLC := ocamlc
-endif
-export OCAMLC
-
-ifndef OCAMLOPT
-  OCAMLOPT := ocamlopt
-endif
-export OCAMLOPT
-
-ifndef OCAMLMKTOP
-  OCAMLMKTOP := ocamlmktop
-endif
-export OCAMLMKTOP
-
-ifndef OCAMLCP
-  OCAMLCP := ocamlcp
-endif
-export OCAMLCP
-
-ifndef OCAMLDEP
-  OCAMLDEP := ocamldep
-endif
-export OCAMLDEP
-
-ifndef OCAMLLEX
-  OCAMLLEX := ocamllex
-endif
-export OCAMLLEX
-
-ifndef OCAMLYACC
-  OCAMLYACC := ocamlyacc
-endif
-export OCAMLYACC
-
-ifndef OCAMLMKLIB
-  OCAMLMKLIB := ocamlmklib
-endif
-export OCAMLMKLIB
-
-ifndef OCAML_GLADECC
-  OCAML_GLADECC := lablgladecc2
-endif
-export OCAML_GLADECC
-
-ifndef OCAML_GLADECC_FLAGS
-  OCAML_GLADECC_FLAGS :=
-endif
-export OCAML_GLADECC_FLAGS
-
-ifndef CAMELEON_REPORT
-  CAMELEON_REPORT := report
-endif
-export CAMELEON_REPORT
-
-ifndef CAMELEON_REPORT_FLAGS
-  CAMELEON_REPORT_FLAGS :=
-endif
-export CAMELEON_REPORT_FLAGS
-
-ifndef CAMELEON_ZOGGY
-  CAMELEON_ZOGGY := camlp4o pa_zog.cma pr_o.cmo
-endif
-export CAMELEON_ZOGGY
-
-ifndef CAMELEON_ZOGGY_FLAGS
-  CAMELEON_ZOGGY_FLAGS :=
-endif
-export CAMELEON_ZOGGY_FLAGS
-
-ifndef OXRIDL
-  OXRIDL := oxridl
-endif
-export OXRIDL
-
-ifndef CAMLIDL
-  CAMLIDL := camlidl
-endif
-export CAMLIDL
-
-ifndef CAMLIDLDLL
-  CAMLIDLDLL := camlidldll
-endif
-export CAMLIDLDLL
-
-ifndef NOIDLHEADER
-  MAYBE_IDL_HEADER := -header
-endif
-export NOIDLHEADER
-
-export NO_CUSTOM
-
-ifndef CAMLP4
-  CAMLP4 := camlp4
-endif
-export CAMLP4
-
-ifndef REAL_OCAMLFIND
-  ifdef PACKS
-    ifndef CREATE_LIB
-      ifdef THREADS
-	PACKS += threads
-      endif
-    endif
-    empty :=
-    space := $(empty) $(empty)
-    comma := ,
-    ifdef PREDS
-      PRE_OCAML_FIND_PREDICATES := $(subst $(space),$(comma),$(PREDS))
-      PRE_OCAML_FIND_PACKAGES := $(subst $(space),$(comma),$(PACKS))
-      OCAML_FIND_PREDICATES := -predicates $(PRE_OCAML_FIND_PREDICATES)
-  #    OCAML_DEP_PREDICATES := -syntax $(PRE_OCAML_FIND_PREDICATES)
-      OCAML_FIND_PACKAGES := $(OCAML_FIND_PREDICATES) -package $(PRE_OCAML_FIND_PACKAGES)
-      OCAML_DEP_PACKAGES := $(OCAML_DEP_PREDICATES) -package $(PRE_OCAML_FIND_PACKAGES)
-    else
-      OCAML_FIND_PACKAGES := -package $(subst $(space),$(comma),$(PACKS))
-      OCAML_DEP_PACKAGES :=
-    endif
-    OCAML_FIND_LINKPKG := -linkpkg
-    REAL_OCAMLFIND := $(OCAMLFIND)
-  endif
-endif
-
-export OCAML_FIND_PACKAGES
-export OCAML_DEP_PACKAGES
-export OCAML_FIND_LINKPKG
-export REAL_OCAMLFIND
-
-ifndef OCAMLDOC
-  OCAMLDOC := ocamldoc
-endif
-export OCAMLDOC
-
-ifndef LATEX
-  LATEX := latex
-endif
-export LATEX
-
-ifndef DVIPS
-  DVIPS := dvips
-endif
-export DVIPS
-
-ifndef PS2PDF
-  PS2PDF := ps2pdf
-endif
-export PS2PDF
-
-ifndef OCAMLMAKEFILE
-  OCAMLMAKEFILE := OCamlMakefile
-endif
-export OCAMLMAKEFILE
-
-ifndef OCAMLLIBPATH
-  OCAMLLIBPATH := \
-    $(shell $(OCAMLC) 2>/dev/null -where || echo /usr/local/lib/ocaml)
-endif
-export OCAMLLIBPATH
-
-ifndef OCAML_LIB_INSTALL
-  OCAML_LIB_INSTALL := $(OCAMLLIBPATH)/contrib
-endif
-export OCAML_LIB_INSTALL
-
-###########################################################################
-
-####################  change following sections only if
-####################    you know what you are doing!
-
-# delete target files when a build command fails
-.PHONY: .DELETE_ON_ERROR
-.DELETE_ON_ERROR:
-
-# for pedants using "--warn-undefined-variables"
-export MAYBE_IDL
-export REAL_RESULT
-export CAMLIDLFLAGS
-export THREAD_FLAG
-export RES_CLIB
-export MAKEDLL
-export ANNOT_FLAG
-export C_OXRIDL
-export SUBPROJS
-export CFLAGS_WIN32
-export CPPFLAGS_WIN32
-
-INCFLAGS :=
-
-SHELL := /bin/sh
-
-MLDEPDIR := ._d
-BCDIDIR  := ._bcdi
-NCDIDIR  := ._ncdi
-
-FILTER_EXTNS := %.mli %.ml %.mll %.mly %.idl %.oxridl %.c %.m %.$(EXT_CXX) %.rep %.zog %.glade
-
-FILTERED     := $(filter $(FILTER_EXTNS), $(SOURCES))
-SOURCE_DIRS  := $(filter-out ./, $(sort $(dir $(FILTERED))))
-
-FILTERED_REP := $(filter %.rep, $(FILTERED))
-DEP_REP      := $(FILTERED_REP:%.rep=$(MLDEPDIR)/%.d)
-AUTO_REP     := $(FILTERED_REP:.rep=.ml)
-
-FILTERED_ZOG := $(filter %.zog, $(FILTERED))
-DEP_ZOG      := $(FILTERED_ZOG:%.zog=$(MLDEPDIR)/%.d)
-AUTO_ZOG     := $(FILTERED_ZOG:.zog=.ml)
-
-FILTERED_GLADE := $(filter %.glade, $(FILTERED))
-DEP_GLADE      := $(FILTERED_GLADE:%.glade=$(MLDEPDIR)/%.d)
-AUTO_GLADE     := $(FILTERED_GLADE:.glade=.ml)
-
-FILTERED_ML  := $(filter %.ml, $(FILTERED))
-DEP_ML       := $(FILTERED_ML:%.ml=$(MLDEPDIR)/%.d)
-
-FILTERED_MLI := $(filter %.mli, $(FILTERED))
-DEP_MLI      := $(FILTERED_MLI:.mli=.di)
-
-FILTERED_MLL := $(filter %.mll, $(FILTERED))
-DEP_MLL      := $(FILTERED_MLL:%.mll=$(MLDEPDIR)/%.d)
-AUTO_MLL     := $(FILTERED_MLL:.mll=.ml)
-
-FILTERED_MLY := $(filter %.mly, $(FILTERED))
-DEP_MLY      := $(FILTERED_MLY:%.mly=$(MLDEPDIR)/%.d) $(FILTERED_MLY:.mly=.di)
-AUTO_MLY     := $(FILTERED_MLY:.mly=.mli) $(FILTERED_MLY:.mly=.ml)
-
-FILTERED_IDL := $(filter %.idl, $(FILTERED))
-DEP_IDL      := $(FILTERED_IDL:%.idl=$(MLDEPDIR)/%.d) $(FILTERED_IDL:.idl=.di)
-C_IDL        := $(FILTERED_IDL:%.idl=%_stubs.c)
-ifndef NOIDLHEADER
- C_IDL += $(FILTERED_IDL:.idl=.h)
-endif
-OBJ_C_IDL    := $(FILTERED_IDL:%.idl=%_stubs.$(EXT_OBJ))
-AUTO_IDL     := $(FILTERED_IDL:.idl=.mli) $(FILTERED_IDL:.idl=.ml) $(C_IDL)
-
-FILTERED_OXRIDL := $(filter %.oxridl, $(FILTERED))
-DEP_OXRIDL      := $(FILTERED_OXRIDL:%.oxridl=$(MLDEPDIR)/%.d) $(FILTERED_OXRIDL:.oxridl=.di)
-AUTO_OXRIDL     := $(FILTERED_OXRIDL:.oxridl=.mli) $(FILTERED_OXRIDL:.oxridl=.ml) $(C_OXRIDL)
-
-FILTERED_C_CXX := $(filter %.c %.m %.$(EXT_CXX), $(FILTERED))
-OBJ_C_CXX      := $(FILTERED_C_CXX:.c=.$(EXT_OBJ))
-OBJ_C_CXX      := $(OBJ_C_CXX:.m=.$(EXT_OBJ))
-OBJ_C_CXX      := $(OBJ_C_CXX:.$(EXT_CXX)=.$(EXT_OBJ))
-
-PRE_TARGETS  += $(AUTO_MLL) $(AUTO_MLY) $(AUTO_IDL) $(AUTO_OXRIDL) $(AUTO_ZOG) $(AUTO_REP) $(AUTO_GLADE)
-
-ALL_DEPS     := $(DEP_ML) $(DEP_MLI) $(DEP_MLL) $(DEP_MLY) $(DEP_IDL) $(DEP_OXRIDL) $(DEP_ZOG) $(DEP_REP) $(DEP_GLADE)
-
-MLDEPS       := $(filter %.d, $(ALL_DEPS))
-MLIDEPS      := $(filter %.di, $(ALL_DEPS))
-BCDEPIS      := $(MLIDEPS:%.di=$(BCDIDIR)/%.di)
-NCDEPIS      := $(MLIDEPS:%.di=$(NCDIDIR)/%.di)
-
-ALLML        := $(filter %.mli %.ml %.mll %.mly %.idl %.oxridl %.rep %.zog %.glade, $(FILTERED))
-
-IMPLO_INTF   := $(ALLML:%.mli=%.mli.__)
-IMPLO_INTF   := $(foreach file, $(IMPLO_INTF), \
-                  $(basename $(file)).cmi $(basename $(file)).cmo)
-IMPLO_INTF   := $(filter-out %.mli.cmo, $(IMPLO_INTF))
-IMPLO_INTF   := $(IMPLO_INTF:%.mli.cmi=%.cmi)
-
-IMPLX_INTF   := $(IMPLO_INTF:.cmo=.cmx)
-
-INTF         := $(filter %.cmi, $(IMPLO_INTF))
-IMPL_CMO     := $(filter %.cmo, $(IMPLO_INTF))
-IMPL_CMX     := $(IMPL_CMO:.cmo=.cmx)
-IMPL_ASM     := $(IMPL_CMO:.cmo=.asm)
-IMPL_S       := $(IMPL_CMO:.cmo=.s)
-
-OBJ_LINK     := $(OBJ_C_IDL) $(OBJ_C_CXX)
-OBJ_FILES    := $(IMPL_CMO:.cmo=.$(EXT_OBJ)) $(OBJ_LINK)
-
-EXECS        := $(addsuffix $(EXE), \
-                            $(sort $(TOPRESULT) $(BCRESULT) $(NCRESULT)))
-ifdef WIN32
-  EXECS      += $(BCRESULT).dll $(NCRESULT).dll
-endif
-
-CLIB_BASE    := $(RESULT)$(RES_CLIB_SUF)
-ifneq ($(strip $(OBJ_LINK)),)
-  RES_CLIB     := lib$(CLIB_BASE).$(EXT_LIB)
-endif
-
-ifdef WIN32
-DLLSONAME := $(CLIB_BASE).dll
-else
-DLLSONAME := dll$(CLIB_BASE).so
-endif
-
-NONEXECS     := $(INTF) $(IMPL_CMO) $(IMPL_CMX) $(IMPL_ASM) $(IMPL_S) \
-		$(OBJ_FILES) $(PRE_TARGETS) $(BCRESULT).cma $(NCRESULT).cmxa \
-		$(NCRESULT).$(EXT_LIB) $(BCRESULT).cmi $(BCRESULT).cmo \
-		$(NCRESULT).cmi $(NCRESULT).cmx $(NCRESULT).o \
-		$(RES_CLIB) $(IMPL_CMO:.cmo=.annot) \
-		$(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmo $(LIB_PACK_NAME).cmx $(LIB_PACK_NAME).o
-
-ifndef STATIC
-  NONEXECS += $(DLLSONAME)
-endif
-
-ifndef LIBINSTALL_FILES
-  LIBINSTALL_FILES := $(RESULT).mli $(RESULT).cmi $(RESULT).cma \
-		      $(RESULT).cmxa $(RESULT).$(EXT_LIB) $(RES_CLIB)
-  ifndef STATIC
-    ifneq ($(strip $(OBJ_LINK)),)
-      LIBINSTALL_FILES += $(DLLSONAME)
-    endif
-  endif
-endif
-
-export LIBINSTALL_FILES
-
-ifdef WIN32
-  # some extra stuff is created while linking DLLs
-  NONEXECS   += $(BCRESULT).$(EXT_LIB) $(BCRESULT).exp $(NCRESULT).exp $(CLIB_BASE).exp $(CLIB_BASE).lib
-endif
-
-TARGETS      := $(EXECS) $(NONEXECS)
-
-# If there are IDL-files
-ifneq ($(strip $(FILTERED_IDL)),)
-  MAYBE_IDL := -cclib -lcamlidl
-endif
-
-ifdef USE_CAMLP4
-  CAMLP4PATH := \
-    $(shell $(CAMLP4) -where 2>/dev/null || echo /usr/local/lib/camlp4)
-  INCFLAGS := -I $(CAMLP4PATH)
-  CINCFLAGS := -I$(CAMLP4PATH)
-endif
-
-DINCFLAGS := $(INCFLAGS) $(SOURCE_DIRS:%=-I %) $(OCAML_DEFAULT_DIRS:%=-I %)
-INCFLAGS := $(DINCFLAGS) $(INCDIRS:%=-I %)
-CINCFLAGS += $(SOURCE_DIRS:%=-I%) $(INCDIRS:%=-I%) $(OCAML_DEFAULT_DIRS:%=-I%)
-
-ifndef MSVC
-  CLIBFLAGS += $(SOURCE_DIRS:%=-L%) $(LIBDIRS:%=-L%) \
-               $(EXTLIBDIRS:%=-L%) $(OCAML_DEFAULT_DIRS:%=-L%)
-
-  ifeq ($(ELF_RPATH), yes)
-    CLIBFLAGS += $(EXTLIBDIRS:%=-Wl,$(RPATH_FLAG)%)
-  endif
-endif
-
-ifndef PROFILING
-  INTF_OCAMLC := $(OCAMLC)
-else
-  ifndef THREADS
-    INTF_OCAMLC := $(OCAMLCP) -p $(OCAMLCPFLAGS)
-  else
-    # OCaml does not support profiling byte code
-    # with threads (yet), therefore we force an error.
-    ifndef REAL_OCAMLC
-      $(error Profiling of multithreaded byte code not yet supported by OCaml)
-    endif
-    INTF_OCAMLC := $(OCAMLC)
-  endif
-endif
-
-ifndef MSVC
-  COMMON_LDFLAGS := $(LDFLAGS:%=-ccopt %) $(SOURCE_DIRS:%=-ccopt -L%) \
-		    $(LIBDIRS:%=-ccopt -L%) $(EXTLIBDIRS:%=-ccopt -L%) \
-		    $(EXTLIBDIRS:%=-ccopt -Wl $(OCAML_DEFAULT_DIRS:%=-ccopt -L%))
-
-  ifeq ($(ELF_RPATH),yes)
-    COMMON_LDFLAGS += $(EXTLIBDIRS:%=-ccopt -Wl,$(RPATH_FLAG)%)
-  endif
-else
-  COMMON_LDFLAGS := -ccopt "/link -NODEFAULTLIB:LIBC $(LDFLAGS:%=%) $(SOURCE_DIRS:%=-LIBPATH:%) \
-		    $(LIBDIRS:%=-LIBPATH:%) $(EXTLIBDIRS:%=-LIBPATH:%) \
-		    $(OCAML_DEFAULT_DIRS:%=-LIBPATH:%) "
-endif
-
-CLIBS_OPTS := $(CLIBS:%=-cclib -l%) $(CFRAMEWORKS:%=-cclib '-framework %')
-ifdef MSVC
-  ifndef STATIC
-  # MSVC libraries do not have 'lib' prefix
-  CLIBS_OPTS := $(CLIBS:%=-cclib %.lib)
-  endif
-endif
-
-ifneq ($(strip $(OBJ_LINK)),)
-  ifdef CREATE_LIB
-    OBJS_LIBS := -cclib -l$(CLIB_BASE) $(CLIBS_OPTS) $(MAYBE_IDL)
-  else
-    OBJS_LIBS := $(OBJ_LINK) $(CLIBS_OPTS) $(MAYBE_IDL)
-  endif
-else
-  OBJS_LIBS := $(CLIBS_OPTS) $(MAYBE_IDL)
-endif
-
-# If we have to make byte-code
-ifndef REAL_OCAMLC
-  BYTE_OCAML := y
-
-  # EXTRADEPS is added dependencies we have to insert for all
-  # executable files we generate.  Ideally it should be all of the
-  # libraries we use, but it's hard to find the ones that get searched on
-  # the path since I don't know the paths built into the compiler, so
-  # just include the ones with slashes in their names.
-  EXTRADEPS := $(addsuffix .cma,$(foreach i,$(LIBS),$(if $(findstring /,$(i)),$(i))))
-  SPECIAL_OCAMLFLAGS := $(OCAMLBCFLAGS)
-
-  REAL_OCAMLC := $(INTF_OCAMLC)
-
-  REAL_IMPL := $(IMPL_CMO)
-  REAL_IMPL_INTF := $(IMPLO_INTF)
-  IMPL_SUF := .cmo
-
-  DEPFLAGS  :=
-  MAKE_DEPS := $(MLDEPS) $(BCDEPIS)
-
-  ifdef CREATE_LIB
-    override CFLAGS := $(PIC_CFLAGS) $(CFLAGS)
-    override CPPFLAGS := $(PIC_CPPFLAGS) $(CPPFLAGS)
-    ifndef STATIC
-      ifneq ($(strip $(OBJ_LINK)),)
-	MAKEDLL := $(DLLSONAME)
-	ALL_LDFLAGS := -dllib $(DLLSONAME)
-      endif
-    endif
-  endif
-
-  ifndef NO_CUSTOM
-    ifneq "$(strip $(OBJ_LINK) $(THREADS) $(MAYBE_IDL) $(CLIBS) $(CFRAMEWORKS))" ""
-      ALL_LDFLAGS += -custom
-    endif
-  endif
-
-  ALL_LDFLAGS += $(INCFLAGS) $(OCAMLLDFLAGS) $(OCAMLBLDFLAGS) \
-                 $(COMMON_LDFLAGS) $(LIBS:%=%.cma)
-  CAMLIDLDLLFLAGS :=
-
-  ifdef THREADS
-    ifdef VMTHREADS
-      THREAD_FLAG := -vmthread
-    else
-      THREAD_FLAG := -thread
-    endif
-    ALL_LDFLAGS := $(THREAD_FLAG) $(ALL_LDFLAGS)
-    ifndef CREATE_LIB
-      ifndef REAL_OCAMLFIND
-        ALL_LDFLAGS := unix.cma threads.cma $(ALL_LDFLAGS)
-      endif
-    endif
-  endif
-
-# we have to make native-code
-else
-  EXTRADEPS := $(addsuffix .cmxa,$(foreach i,$(LIBS),$(if $(findstring /,$(i)),$(i))))
-  ifndef PROFILING
-    SPECIAL_OCAMLFLAGS := $(OCAMLNCFLAGS)
-    PLDFLAGS :=
-  else
-    SPECIAL_OCAMLFLAGS := -p $(OCAMLNCFLAGS)
-    PLDFLAGS := -p
-  endif
-
-  REAL_IMPL := $(IMPL_CMX)
-  REAL_IMPL_INTF := $(IMPLX_INTF)
-  IMPL_SUF := .cmx
-
-  override CPPFLAGS := -DNATIVE_CODE $(CPPFLAGS)
-
-  DEPFLAGS  := -native
-  MAKE_DEPS := $(MLDEPS) $(NCDEPIS)
-
-  ALL_LDFLAGS := $(PLDFLAGS) $(INCFLAGS) $(OCAMLLDFLAGS) \
-                 $(OCAMLNLDFLAGS) $(COMMON_LDFLAGS)
-  CAMLIDLDLLFLAGS := -opt
-
-  ifndef CREATE_LIB
-    ALL_LDFLAGS += $(LIBS:%=%.cmxa)
-  else
-    override CFLAGS := $(PIC_CFLAGS) $(CFLAGS)
-    override CPPFLAGS := $(PIC_CPPFLAGS) $(CPPFLAGS)
-  endif
-
-  ifdef THREADS
-    THREAD_FLAG := -thread
-    ALL_LDFLAGS := $(THREAD_FLAG) $(ALL_LDFLAGS)
-    ifndef CREATE_LIB
-      ifndef REAL_OCAMLFIND
-        ALL_LDFLAGS := unix.cmxa threads.cmxa $(ALL_LDFLAGS)
-      endif
-    endif
-  endif
-endif
-
-export MAKE_DEPS
-
-ifdef ANNOTATE
-  ANNOT_FLAG := -dtypes
-else
-endif
-
-ALL_OCAMLCFLAGS := $(THREAD_FLAG) $(ANNOT_FLAG) $(OCAMLFLAGS) \
-                   $(INCFLAGS) $(SPECIAL_OCAMLFLAGS)
-
-ifdef make_deps
-  -include $(MAKE_DEPS)
-  PRE_TARGETS :=
-endif
-
-###########################################################################
-# USER RULES
-
-# Call "OCamlMakefile QUIET=" to get rid of all of the @'s.
-QUIET=@
-
-# generates byte-code (default)
-byte-code:		$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) $(BCRESULT) \
-				REAL_RESULT="$(BCRESULT)" make_deps=yes
-bc:	byte-code
-
-byte-code-nolink:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) nolink \
-				REAL_RESULT="$(BCRESULT)" make_deps=yes
-bcnl:	byte-code-nolink
-
-top:			$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) $(TOPRESULT) \
-				REAL_RESULT="$(BCRESULT)" make_deps=yes
-
-# generates native-code
-
-native-code:		$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) $(NCRESULT) \
-				REAL_RESULT="$(NCRESULT)" \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				make_deps=yes
-nc:	native-code
-
-native-code-nolink:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) nolink \
-				REAL_RESULT="$(NCRESULT)" \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				make_deps=yes
-ncnl:	native-code-nolink
-
-# generates byte-code libraries
-byte-code-library:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(RES_CLIB) $(BCRESULT).cma \
-				REAL_RESULT="$(BCRESULT)" \
-				CREATE_LIB=yes \
-				make_deps=yes
-bcl:	byte-code-library
-
-# generates native-code libraries
-native-code-library:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(RES_CLIB) $(NCRESULT).cmxa \
-				REAL_RESULT="$(NCRESULT)" \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				CREATE_LIB=yes \
-				make_deps=yes
-ncl:	native-code-library
-
-ifdef WIN32
-# generates byte-code dll
-byte-code-dll:		$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(RES_CLIB) $(BCRESULT).dll \
-				REAL_RESULT="$(BCRESULT)" \
-				make_deps=yes
-bcd:	byte-code-dll
-
-# generates native-code dll
-native-code-dll:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(RES_CLIB) $(NCRESULT).dll \
-				REAL_RESULT="$(NCRESULT)" \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				make_deps=yes
-ncd:	native-code-dll
-endif
-
-# generates byte-code with debugging information
-debug-code:		$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) $(BCRESULT) \
-				REAL_RESULT="$(BCRESULT)" make_deps=yes \
-				OCAMLFLAGS="-g $(OCAMLFLAGS)" \
-				OCAMLLDFLAGS="-g $(OCAMLLDFLAGS)"
-dc:	debug-code
-
-debug-code-nolink:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) nolink \
-				REAL_RESULT="$(BCRESULT)" make_deps=yes \
-				OCAMLFLAGS="-g $(OCAMLFLAGS)" \
-				OCAMLLDFLAGS="-g $(OCAMLLDFLAGS)"
-dcnl:	debug-code-nolink
-
-# generates byte-code with debugging information (native code)
-debug-native-code:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) $(NCRESULT) \
-				REAL_RESULT="$(NCRESULT)" make_deps=yes \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				OCAMLFLAGS="-g $(OCAMLFLAGS)" \
-				OCAMLLDFLAGS="-g $(OCAMLLDFLAGS)"
-dnc:	debug-native-code
-
-debug-native-code-nolink:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) nolink \
-				REAL_RESULT="$(NCRESULT)" make_deps=yes \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				OCAMLFLAGS="-g $(OCAMLFLAGS)" \
-				OCAMLLDFLAGS="-g $(OCAMLLDFLAGS)"
-dncnl:	debug-native-code-nolink
-
-# generates byte-code libraries with debugging information
-debug-code-library:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(RES_CLIB) $(BCRESULT).cma \
-				REAL_RESULT="$(BCRESULT)" make_deps=yes \
-				CREATE_LIB=yes \
-				OCAMLFLAGS="-g $(OCAMLFLAGS)" \
-				OCAMLLDFLAGS="-g $(OCAMLLDFLAGS)"
-dcl:	debug-code-library
-
-# generates byte-code libraries with debugging information (native code)
-debug-native-code-library:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(RES_CLIB) $(NCRESULT).cma \
-				REAL_RESULT="$(NCRESULT)" make_deps=yes \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				CREATE_LIB=yes \
-				OCAMLFLAGS="-g $(OCAMLFLAGS)" \
-				OCAMLLDFLAGS="-g $(OCAMLLDFLAGS)"
-dncl:	debug-native-code-library
-
-# generates byte-code for profiling
-profiling-byte-code:		$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) $(BCRESULT) \
-				REAL_RESULT="$(BCRESULT)" PROFILING="y" \
-				make_deps=yes
-pbc:	profiling-byte-code
-
-# generates native-code
-
-profiling-native-code:		$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) $(NCRESULT) \
-				REAL_RESULT="$(NCRESULT)" \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				PROFILING="y" \
-				make_deps=yes
-pnc:	profiling-native-code
-
-# generates byte-code libraries
-profiling-byte-code-library:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(RES_CLIB) $(BCRESULT).cma \
-				REAL_RESULT="$(BCRESULT)" PROFILING="y" \
-				CREATE_LIB=yes \
-				make_deps=yes
-pbcl:	profiling-byte-code-library
-
-# generates native-code libraries
-profiling-native-code-library:	$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(RES_CLIB) $(NCRESULT).cmxa \
-				REAL_RESULT="$(NCRESULT)" PROFILING="y" \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				CREATE_LIB=yes \
-				make_deps=yes
-pncl:	profiling-native-code-library
-
-# packs byte-code objects
-pack-byte-code:			$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) $(BCRESULT).cmo \
-				REAL_RESULT="$(BCRESULT)" \
-				PACK_LIB=yes make_deps=yes
-pabc:	pack-byte-code
-
-# packs native-code objects
-pack-native-code:		$(PRE_TARGETS)
-			$(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
-				$(NCRESULT).cmx $(NCRESULT).o \
-				REAL_RESULT="$(NCRESULT)" \
-				REAL_OCAMLC="$(OCAMLOPT)" \
-				PACK_LIB=yes make_deps=yes
-panc:	pack-native-code
-
-# generates HTML-documentation
-htdoc:	$(DOC_DIR)/$(RESULT)/html/index.html
-
-# generates Latex-documentation
-ladoc:	$(DOC_DIR)/$(RESULT)/latex/doc.tex
-
-# generates PostScript-documentation
-psdoc:	$(DOC_DIR)/$(RESULT)/latex/doc.ps
-
-# generates PDF-documentation
-pdfdoc:	$(DOC_DIR)/$(RESULT)/latex/doc.pdf
-
-# generates all supported forms of documentation
-doc: htdoc ladoc psdoc pdfdoc
-
-###########################################################################
-# LOW LEVEL RULES
-
-$(REAL_RESULT):		$(REAL_IMPL_INTF) $(OBJ_LINK) $(EXTRADEPS) $(RESULTDEPS)
-			$(REAL_OCAMLFIND) $(REAL_OCAMLC) \
-				$(OCAML_FIND_PACKAGES) $(OCAML_FIND_LINKPKG) \
-				$(ALL_LDFLAGS) $(OBJS_LIBS) -o $@$(EXE) \
-				$(REAL_IMPL)
-
-nolink:			$(REAL_IMPL_INTF) $(OBJ_LINK)
-
-ifdef WIN32
-$(REAL_RESULT).dll:	$(REAL_IMPL_INTF) $(OBJ_LINK)
-			$(CAMLIDLDLL) $(CAMLIDLDLLFLAGS) $(OBJ_LINK) $(CLIBS) \
-				-o $@ $(REAL_IMPL)
-endif
-
-%$(TOPSUFFIX):		$(REAL_IMPL_INTF) $(OBJ_LINK) $(EXTRADEPS)
-			$(REAL_OCAMLFIND) $(OCAMLMKTOP) \
-				$(OCAML_FIND_PACKAGES) $(OCAML_FIND_LINKPKG) \
-				$(ALL_LDFLAGS) $(OBJS_LIBS) -o $@$(EXE) \
-				$(REAL_IMPL)
-
-.SUFFIXES:		.mli .ml .cmi .cmo .cmx .cma .cmxa .$(EXT_OBJ) \
-                        .mly .di .d .$(EXT_LIB) .idl %.oxridl .c .m .$(EXT_CXX) .h .so \
-                        .rep .zog .glade
-
-ifndef STATIC
-ifdef MINGW
-$(DLLSONAME):		$(OBJ_LINK)
-			$(CC) $(CFLAGS) $(CFLAGS_WIN32) $(OBJ_LINK) -shared -o $@ \
-			-Wl,--whole-archive $(wildcard $(foreach dir,$(LIBDIRS),$(CLIBS:%=$(dir)/lib%.a))) \
-			 $(OCAMLLIBPATH)/ocamlrun.a \
-			-Wl,--export-all-symbols \
-			-Wl,--no-whole-archive
-else
-ifdef MSVC
-$(DLLSONAME):		$(OBJ_LINK)
-			link /NOLOGO /DLL /OUT:$@ $(OBJ_LINK) \
-			 $(wildcard $(foreach dir,$(LIBDIRS),$(CLIBS:%=$(dir)/%.lib))) \
-			 $(OCAMLLIBPATH)/ocamlrun.lib
-
-else
-$(DLLSONAME):		$(OBJ_LINK)
-			$(OCAMLMKLIB) $(INCFLAGS) $(CLIBFLAGS) \
-				-o $(CLIB_BASE) $(OBJ_LINK) $(CLIBS:%=-l%) $(CFRAMEWORKS:%=-framework %) \
-				$(OCAMLMKLIB_FLAGS)
-endif
-endif
-endif
-
-ifndef LIB_PACK_NAME
-$(RESULT).cma:		$(REAL_IMPL_INTF) $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)
-			$(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) $(OBJS_LIBS) -o $@ $(REAL_IMPL)
-
-$(RESULT).cmxa $(RESULT).$(EXT_LIB):	$(REAL_IMPL_INTF) $(EXTRADEPS) $(RESULTDEPS)
-			$(REAL_OCAMLFIND) $(OCAMLOPT) -a $(ALL_LDFLAGS) $(OBJS_LIBS) -o $@ $(REAL_IMPL)
-else
-ifdef BYTE_OCAML
-$(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmo: $(REAL_IMPL_INTF)
-			$(REAL_OCAMLFIND) $(REAL_OCAMLC) -pack -o $(LIB_PACK_NAME).cmo $(OCAMLLDFLAGS) $(REAL_IMPL)
-else
-$(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmx: $(REAL_IMPL_INTF)
-			$(REAL_OCAMLFIND) $(OCAMLOPT) -pack -o $(LIB_PACK_NAME).cmx  $(OCAMLLDFLAGS) $(REAL_IMPL)
-endif
-
-$(RESULT).cma:		$(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmo $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS)
-			$(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) $(OBJS_LIBS) -o $@ $(LIB_PACK_NAME).cmo
-
-$(RESULT).cmxa $(RESULT).$(EXT_LIB):	$(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmx $(EXTRADEPS) $(RESULTDEPS)
-			$(REAL_OCAMLFIND) $(OCAMLOPT) -a $(filter-out -custom, $(ALL_LDFLAGS)) $(OBJS_LIBS) -o $@ $(LIB_PACK_NAME).cmx
-endif
-
-$(RES_CLIB): 		$(OBJ_LINK)
-ifndef MSVC
-  ifneq ($(strip $(OBJ_LINK)),)
-		      $(AR) rcs $@ $(OBJ_LINK)
-  endif
-else
-  ifneq ($(strip $(OBJ_LINK)),)
-			lib -nologo -debugtype:cv -out:$(RES_CLIB) $(OBJ_LINK)
-  endif
-endif
-
-.mli.cmi: $(EXTRADEPS)
-			$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \
-			if [ -z "$$pp" ]; then \
-			  $(ECHO) $(REAL_OCAMLFIND) $(INTF_OCAMLC) $(OCAML_FIND_PACKAGES) \
-				-c $(THREAD_FLAG) $(ANNOT_FLAG) \
-				$(OCAMLFLAGS) $(INCFLAGS) $<; \
-			  $(REAL_OCAMLFIND) $(INTF_OCAMLC) $(OCAML_FIND_PACKAGES) \
-				-c $(THREAD_FLAG) $(ANNOT_FLAG) \
-				$(OCAMLFLAGS) $(INCFLAGS) $<; \
-			else \
-			    $(ECHO) $(REAL_OCAMLFIND) $(INTF_OCAMLC) $(OCAML_FIND_PACKAGES) \
-				-c -pp \"$$pp $(PPFLAGS)\" $(THREAD_FLAG) $(ANNOT_FLAG) \
-				$(OCAMLFLAGS) $(INCFLAGS) $<; \
-			    $(REAL_OCAMLFIND) $(INTF_OCAMLC) $(OCAML_FIND_PACKAGES) \
-				-c -pp "$$pp $(PPFLAGS)" $(THREAD_FLAG) $(ANNOT_FLAG) \
-				$(OCAMLFLAGS) $(INCFLAGS) $<; \
-			fi
-
-.ml.cmi .ml.$(EXT_OBJ) .ml.cmx .ml.cmo: $(EXTRADEPS)
-			$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \
-			if [ -z "$$pp" ]; then \
-			  $(ECHO) $(REAL_OCAMLFIND) $(REAL_OCAMLC) $(OCAML_FIND_PACKAGES) \
-				-c $(ALL_OCAMLCFLAGS) $<; \
-			  $(REAL_OCAMLFIND) $(REAL_OCAMLC) $(OCAML_FIND_PACKAGES) \
-				-c $(ALL_OCAMLCFLAGS) $<; \
-			else \
-			  $(ECHO) $(REAL_OCAMLFIND) $(REAL_OCAMLC) $(OCAML_FIND_PACKAGES) \
-				-c -pp \"$$pp $(PPFLAGS)\" $(ALL_OCAMLCFLAGS) $<; \
-			  $(REAL_OCAMLFIND) $(REAL_OCAMLC) $(OCAML_FIND_PACKAGES) \
-				-c -pp "$$pp $(PPFLAGS)" $(ALL_OCAMLCFLAGS) $<; \
-			fi
-
-ifdef PACK_LIB
-$(REAL_RESULT).cmo $(REAL_RESULT).cmx $(REAL_RESULT).o: $(REAL_IMPL_INTF) $(OBJ_LINK) $(EXTRADEPS)
-			$(REAL_OCAMLFIND) $(REAL_OCAMLC) -pack $(ALL_LDFLAGS) \
-				$(OBJS_LIBS) -o $@ $(REAL_IMPL)
-endif
-
-.PRECIOUS:		%.ml
-%.ml:			%.mll
-			$(OCAMLLEX) $(LFLAGS) $<
-
-.PRECIOUS:              %.ml %.mli
-%.ml %.mli:             %.mly
-			$(OCAMLYACC) $(YFLAGS) $<
-			$(QUIET)pp=`sed -n -e 's/.*(\*pp \([^*]*\) \*).*/\1/p;q' $<`; \
-			if [ ! -z "$$pp" ]; then \
-			  mv $*.ml $*.ml.temporary; \
-			  echo "(*pp $$pp $(PPFLAGS)*)" > $*.ml; \
-			  cat $*.ml.temporary >> $*.ml; \
-			  rm $*.ml.temporary; \
-			  mv $*.mli $*.mli.temporary; \
-			  echo "(*pp $$pp $(PPFLAGS)*)" > $*.mli; \
-			  cat $*.mli.temporary >> $*.mli; \
-			  rm $*.mli.temporary; \
-			fi
-
-
-.PRECIOUS:		%.ml
-%.ml:			%.rep
-			$(CAMELEON_REPORT) $(CAMELEON_REPORT_FLAGS) -gen $<
-
-.PRECIOUS:		%.ml
-%.ml:			%.zog
-			$(CAMELEON_ZOGGY)  $(CAMELEON_ZOGGY_FLAGS) -impl $< > $@
-
-.PRECIOUS:		%.ml
-%.ml:			%.glade
-			$(OCAML_GLADECC)  $(OCAML_GLADECC_FLAGS) $< > $@
-
-.PRECIOUS:		%.ml %.mli
-%.ml %.mli:		%.oxridl
-			$(OXRIDL) $<
-
-.PRECIOUS:		%.ml %.mli %_stubs.c %.h
-%.ml %.mli %_stubs.c %.h:		%.idl
-			$(CAMLIDL) $(MAYBE_IDL_HEADER) $(IDLFLAGS) \
-				$(CAMLIDLFLAGS) $<
-			$(QUIET)if [ $(NOIDLHEADER) ]; then touch $*.h; fi
-
-.c.$(EXT_OBJ):
-			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
-				$(CPPFLAGS) $(CPPFLAGS_WIN32) \
-				$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $<
-
-.m.$(EXT_OBJ):
-			$(CC) -c $(CFLAGS) $(CINCFLAGS) $(CPPFLAGS) \
-				-I'$(OCAMLLIBPATH)' \
-				$< $(CFLAG_O)$@
-
-.$(EXT_CXX).$(EXT_OBJ):
-			$(CXX) -c $(CXXFLAGS) $(CINCFLAGS) $(CPPFLAGS) \
-				-I'$(OCAMLLIBPATH)' \
-				$< $(CFLAG_O)$@
-
-$(MLDEPDIR)/%.d:	%.ml
-			$(QUIET)if [ ! -d $(@D) ]; then mkdir -p $(@D); fi
-			$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \
-			if [ -z "$$pp" ]; then \
-			  $(ECHO) $(REAL_OCAMLFIND) $(OCAMLDEP) $(OCAML_DEP_PACKAGES) \
-				$(DINCFLAGS) $< \> $@; \
-			  $(REAL_OCAMLFIND) $(OCAMLDEP) $(OCAML_DEP_PACKAGES) \
-				$(DINCFLAGS) $< > $@; \
-			else \
-			  $(ECHO) $(REAL_OCAMLFIND) $(OCAMLDEP) $(OCAML_DEP_PACKAGES) \
-				-pp \"$$pp $(PPFLAGS)\" $(DINCFLAGS) $< \> $@; \
-			  $(REAL_OCAMLFIND) $(OCAMLDEP) $(OCAML_DEP_PACKAGES) \
-				-pp "$$pp $(PPFLAGS)" $(DINCFLAGS) $< > $@; \
-			fi
-
-$(BCDIDIR)/%.di $(NCDIDIR)/%.di:	%.mli
-			$(QUIET)if [ ! -d $(@D) ]; then mkdir -p $(@D); fi
-			$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \
-			if [ -z "$$pp" ]; then \
-			  $(ECHO) $(REAL_OCAMLFIND) $(OCAMLDEP) $(DEPFLAGS) $(DINCFLAGS) $< \> $@; \
-			  $(REAL_OCAMLFIND) $(OCAMLDEP) $(DEPFLAGS) $(DINCFLAGS) $< > $@; \
-			else \
-			  $(ECHO) $(REAL_OCAMLFIND) $(OCAMLDEP) $(DEPFLAGS) \
-			    -pp \"$$pp $(PPFLAGS)\" $(DINCFLAGS) $< \> $@; \
-			  $(REAL_OCAMLFIND) $(OCAMLDEP) $(DEPFLAGS) \
-			    -pp "$$pp $(PPFLAGS)" $(DINCFLAGS) $< > $@; \
-			fi
-
-$(DOC_DIR)/$(RESULT)/html:
-	mkdir -p $@
-
-$(DOC_DIR)/$(RESULT)/html/index.html: $(DOC_DIR)/$(RESULT)/html $(DOC_FILES)
-	rm -rf $</*
-	$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $(FIRST_DOC_FILE)`; \
-	if [ -z "$$pp" ]; then \
-	  $(ECHO) $(REAL_OCAMLFIND) $(OCAMLDOC) $(OCAML_FIND_PACKAGES) -html -d $< $(OCAMLDOCFLAGS) $(INCFLAGS) $(DOC_FILES); \
-	  $(REAL_OCAMLFIND) $(OCAMLDOC) $(OCAML_FIND_PACKAGES) -html -d $< $(OCAMLDOCFLAGS) $(INCFLAGS) $(DOC_FILES); \
-	else \
-	  $(ECHO) $(REAL_OCAMLFIND) $(OCAMLDOC) $(OCAML_FIND_PACKAGES) -pp \"$$pp $(PPFLAGS)\" -html -d $< $(OCAMLDOCFLAGS) \
-	  	$(INCFLAGS) $(DOC_FILES); \
-	  $(REAL_OCAMLFIND) $(OCAMLDOC) $(OCAML_FIND_PACKAGES) -pp "$$pp $(PPFLAGS)" -html -d $< $(OCAMLDOCFLAGS) \
-	  	$(INCFLAGS) $(DOC_FILES); \
-	fi
-
-$(DOC_DIR)/$(RESULT)/latex:
-	mkdir -p $@
-
-$(DOC_DIR)/$(RESULT)/latex/doc.tex: $(DOC_DIR)/$(RESULT)/latex $(DOC_FILES)
-	rm -rf $</*
-	$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $(FIRST_DOC_FILE)`; \
-	if [ -z "$$pp" ]; then \
-	  $(ECHO) $(REAL_OCAMLFIND) $(OCAMLDOC) $(OCAML_FIND_PACKAGES) -latex $(OCAMLDOCFLAGS) $(INCFLAGS) \
-	  	$(DOC_FILES) -o $@; \
-	  $(REAL_OCAMLFIND) $(OCAMLDOC) $(OCAML_FIND_PACKAGES) -latex $(OCAMLDOCFLAGS) $(INCFLAGS) $(DOC_FILES) \
-	  	-o $@; \
-	else \
-	  $(ECHO) $(REAL_OCAMLFIND) $(OCAMLDOC) $(OCAML_FIND_PACKAGES) -pp \"$$pp $(PPFLAGS)\" -latex $(OCAMLDOCFLAGS) \
-	  	$(INCFLAGS) $(DOC_FILES) -o $@; \
-	  $(REAL_OCAMLFIND) $(OCAMLDOC) $(OCAML_FIND_PACKAGES) -pp "$$pp $(PPFLAGS)" -latex $(OCAMLDOCFLAGS) \
-	  	$(INCFLAGS) $(DOC_FILES) -o $@; \
-	fi
-
-$(DOC_DIR)/$(RESULT)/latex/doc.ps: $(DOC_DIR)/$(RESULT)/latex/doc.tex
-	cd $(DOC_DIR)/$(RESULT)/latex && \
-	  $(LATEX) doc.tex && \
-	  $(LATEX) doc.tex && \
-	  $(DVIPS) $(DVIPSFLAGS) doc.dvi -o $(@F)
-
-$(DOC_DIR)/$(RESULT)/latex/doc.pdf: $(DOC_DIR)/$(RESULT)/latex/doc.ps
-	cd $(DOC_DIR)/$(RESULT)/latex && $(PS2PDF) $(<F)
-
-define make_subproj
-.PHONY:
-subproj_$(1):
-	$$(eval $$(call PROJ_$(1)))
-	$(QUIET)if [ "$(SUBTARGET)" != "all" ]; then \
-	  $(MAKE) -f $(OCAMLMAKEFILE) $(SUBTARGET); \
-	fi
-endef
-
-$(foreach subproj,$(SUBPROJS),$(eval $(call make_subproj,$(subproj))))
-
-.PHONY:
-subprojs: $(SUBPROJS:%=subproj_%)
-
-###########################################################################
-# (UN)INSTALL RULES FOR LIBRARIES
-
-.PHONY: libinstall
-libinstall:	all
-	$(QUIET)printf "\nInstalling library with ocamlfind\n"
-	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
-	$(QUIET)printf "\nInstallation successful.\n"
-
-.PHONY: libinstall-byte-code
-libinstall-byte-code:	all
-	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
-	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
-	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
-	$(QUIET)printf "\nInstallation successful.\n"
-
-.PHONY: libinstall-native-code
-libinstall-native-code:	all
-	$(QUIET)printf "\nInstalling native-code library with ocamlfind\n"
-	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
-	  $(filter-out $(DLLSONAME) $(RESULT).cma, $(LIBINSTALL_FILES))
-	$(QUIET)printf "\nInstallation successful.\n"
-
-.PHONY: libuninstall
-libuninstall:
-	$(QUIET)printf "\nUninstalling library with ocamlfind\n"
-	$(OCAMLFIND) remove $(OCAMLFIND_INSTFLAGS) $(RESULT)
-	$(QUIET)printf "\nUninstallation successful.\n"
-
-.PHONY: rawinstall
-rawinstall:	all
-	$(QUIET)printf "\nInstalling library to: $(OCAML_LIB_INSTALL)\n"
-	-install -d $(OCAML_LIB_INSTALL)
-	for i in $(LIBINSTALL_FILES); do \
-	  if [ -f $$i ]; then \
-	    install -c -m 0644 $$i $(OCAML_LIB_INSTALL); \
-	  fi; \
-	done
-	$(QUIET)printf "\nInstallation successful.\n"
-
-.PHONY: rawuninstall
-rawuninstall:
-	$(QUIET)printf "\nUninstalling library from: $(OCAML_LIB_INSTALL)\n"
-	cd $(OCAML_LIB_INSTALL) && rm $(notdir $(LIBINSTALL_FILES))
-	$(QUIET)printf "\nUninstallation successful.\n"
-
-###########################################################################
-# MAINTENANCE RULES
-
-.PHONY:	clean
-clean::
-	rm -f $(TARGETS) $(TRASH)
-	rm -rf $(BCDIDIR) $(NCDIDIR) $(MLDEPDIR)
-
-.PHONY:	cleanup
-cleanup::
-	rm -f $(NONEXECS) $(TRASH)
-	rm -rf $(BCDIDIR) $(NCDIDIR) $(MLDEPDIR)
-
-.PHONY: clean-doc
-clean-doc::
-	rm -rf $(DOC_DIR)/$(RESULT)
-
-.PHONY: clean-all
-clean-all:: clean clean-doc
-
-.PHONY: nobackup
-nobackup:
-	rm -f *.bak *~ *.dup
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/README-OCamlMakefile b/vendor/git.apache.org/thrift.git/lib/ocaml/README-OCamlMakefile
deleted file mode 100644
index 57ef019..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/README-OCamlMakefile
+++ /dev/null
@@ -1,643 +0,0 @@
-NOTE (bryanduxbury): OCamlMakefile is safe to include in the project after
-https://issues.apache.org/jira/browse/LEGAL-58.
-
----------------------------------------------------------------------------
-
-                        Distribution of "ocaml_make"
-     Copyright (C) 1999 - 2006  Markus Mottl - free to copy and modify!
-                           USE AT YOUR OWN RISK!
-
----------------------------------------------------------------------------
-
-                            PREREQUISITES
-
-             *** YOU WILL NEED GNU-MAKE VERSION >3.80 ***
-
----------------------------------------------------------------------------
-
-                    Contents of this distribution
-
-Changes        - guess what? ;-)
-
-OCamlMakefile  - Makefile for easy handling of compilation of not so easy
-                 OCaml-projects.  It generates dependencies of OCaml-files
-                 automatically, is able to handle "ocamllex"-,
-                 "ocamlyacc"-, IDL- and C-files, knows how to run
-                 preprocessors and generates native- or byte-code, as
-                 executable or as library - with thread-support if you
-                 want! Profiling and debugging support can be added on
-                 the fly!  There is also support for installing libraries.
-                 Ah, yes, and you can also create toplevels from any
-                 sources: this allows you immediate interactive testing.
-                 Automatic generation of documentation is easy due to
-                 integration of support for OCamldoc.
-
-README         - this file
-
-calc/          - Directory containing a quite fully-featured example
-                 of what "OCamlMakefile" can do for you. This example
-                 makes use of "ocamllex", "ocamlyacc", IDL + C and
-                 threads.
-
-camlp4/        - This simple example demonstrates how to automatically
-                 preprocess files with the camlp4-preprocessor.
-
-gtk/           - Demonstration of how to use OCamlMakefile with GTK
-                 and threads. Courtesy of Tim Freeman <tim@fungible.com>.
-
-idl/           - Contains a very small example of how to use
-                 "camlidl" together with "OCamlMakefile". Also intended
-                 to show, how easy it is to interface OCaml and C.
-
-threads/       - Two examples of how to use threads (originally
-                 posted by Xavier Leroy some time ago). Shows the use of
-                 "OCamlMakefile" in an environment of multiple compilation
-                 targets.
-
----------------------------------------------------------------------------
-
-                      Why should you use it?
-
-For several reasons:
-
-  * It is well-tested (I use it in all of my projects).
-
-  * In contrast to most other approaches it generates dependencies
-    correctly by ensuring that all automatically generated OCaml-files
-    exist before dependency calculation.  This is the only way to
-    guarantee that "ocamldep" works correctly.
-
-  * It is extremely convenient (at least I think so ;-).
-    Even quite complex compilation processes (see example "calc.ml")
-    need very little information to work correctly - actually just about
-    the minimum (file names of sources).
-
----------------------------------------------------------------------------
-
-                     When you shouldn't use it...
-
-In projects where every compilation unit needs different flags - but
-in such complicated cases you will be on your own anyway. Luckily,
-this doesn't happen too frequently...
-
----------------------------------------------------------------------------
-
-             How to use "OCamlMakefile" in your own project
-         (Take a look at the examples for a quick introduction!)
-
-Create your project-specific "Makefile" in the appropriate directory.
-
-Now there are two ways of making use of "OCamlMakefile":
-
-  1) Have a look at the default settings in "OCamlMakefile" and set
-     them to the values that are vaild on your system - whether the
-     path to the standard libraries is ok, what executables shall be
-     used, etc...
-
-  2) Copy it into the directory of the project to be compiled.
-     Add "-include OCamlMakefile" as a last line of your "Makefile".
-
-  3) Put it somewhere else on the system. In this case you will have to
-     set a variable "OCAMLMAKEFILE" in your project-specific "Makefile".
-     This is the way in which the examples are written: so you need
-     only one version of "OCamlMakefile" to manage all your projects!
-     See the examples for details.
-
-You should usually specify two further variables for your project:
-
-  * SOURCES  (default: foo.ml)
-  * RESULT   (default: foo)
-
-Put all the sources necessary for a target into variable "SOURCES".
-Then set "RESULT" to the name of the target. If you want to generate
-libraries, you should *not* specify the suffix (".cma", ".cmxa", ".a")
-- it will be added automatically if you specify that you want to build
-a library.
-
-      **      Don't forget to add the ".mli"-files, too!        **
-      **  Don't forget that order of the source files matters!  **
-
-The order is important, because it matters during linking anyway
-due to potential side effects caused at program startup. This is
-why OCamlMakefile does not attempt to partially order dependencies by
-itself, which might confuse users even more. It just compiles and links
-OCaml-sources in the order specified by the user, even if it could
-determine automatically that the order cannot be correct.
-
-The minimum of your "Makefile" looks like this (assuming that
-"OCamlMakefile" is in the search path of "make"):
-
-  -include OCamlMakefile
-
-This will assume that you want to compile a file "foo.ml" to a binary
-"foo".
-
-Otherwise, your Makefile will probably contain something like this:
-
-  SOURCES = foo.ml
-  RESULT  = foo
-  -include OCamlMakefile
-
-Be careful with the names you put into these variables: if they are wrong,
-a "make clean" might erase the wrong files - but I know you will not do
-that ;-)
-
-A simple "make" will generate a byte-code executable. If you want to
-change this, you may add an "all"-rule that generates something else.
-
-E.g.:
-
-  SOURCES = foo.ml
-  RESULT  = foo
-  all: native-code-library
-  -include OCamlMakefile
-
-This will build a native-code library "foo.cmxa" (+ "foo.a") from file
-"foo.ml".
-
-You may even build several targets at once. To produce byte- and native-code
-executables with one "make", add the following rule:
-
-    all: byte-code native-code
-
-You will probably want to use a different suffix for each of these targets
-so that the result will not be overwritten (see optional variables below
-for details).
-
-You may also tell "make" at the command-line what kind of target to
-produce (e.g. "make nc").  Here all the possibilities with shortcuts
-between parenthesis:
-
-   * byte-code                     (bc)
-   * byte-code-nolink              (bcnl)   - no linking stage
-   * byte-code-library             (bcl)
-   * native-code                   (nc)
-   * native-code-nolink            (ncnl)   - no linking stage
-   * native-code-library           (ncl)
-   * debug-code                    (dc)
-   * debug-code-nolink             (dcnl)   - no linking stage
-   * debug-code-library            (dcl)
-   * profiling-byte-code           (pbc)
-   * profiling-byte-code-library   (pbcl)
-   * profiling-native-code         (pnc)
-   * profiling-native-code-library (pncl)
-   * byte-code-dll                 (bcd)
-   * native-code-dll               (ncd)
-   * pack-byte-code                (pabc)
-   * pack-native-code              (panc)
-   * toplevel interpreter          (top)
-   * subprojs
-
-Here a short note concerning building and linking byte code libraries
-with C-files:
-
-  OCaml links C-object files only when they are used in an executable.
-  After compilation they should be placed in some directory that is in
-  your include path if you link your library against an executable.
-
-  It is sometimes more convenient to link all C-object files into a
-  single C-library. Then you have to override the automatic link flags
-  of your library using "-noautolink" and add another linkflag that
-  links in your C-library explicitly.
-
-What concerns maintenance:
-
-  "make clean" removes all (all!) automatically generated files - so
-  again: make sure your variables are ok!
-
-  "make cleanup" is similar to "make clean" but leaves executables.
-
-Another way to destroy some important files is by having "OCamlMakefile"
-automatically generate files with the same name. Read the documentation
-about the tools in the OCaml-distribution to see what kind of files are
-generated. "OCamlMakefile" additionally generates ('%' is basename of
-source file):
-
-  %_idl.c  - "camlidl" generates a file "%.c" from "%.idl", but this is
-             not such a good idea, because when generating native-code,
-             both the file "%.c" and "%.ml" would generate files "%.o"
-             which would overwrite each other. Thus, "OCamlMakefile"
-             renames "%.c" to "%_idl.c" to work around this problem.
-
-The dependencies are stored in three different subdirectories (dot dirs):
-
-  ._d    - contains dependencies for .ml-files
-  ._bcdi - contains byte code dependencies for .mli-files
-  ._ncdi - contains native code dependencies for .mli-files
-
-The endings of the dependency files are: "%.d" for those generated from
-"%.ml"-files, "%.di" for ones derived from "%.mli"-files.
-
----------------------------------------------------------------------------
-
-                                 Debugging
-
-  This is easy: if you discover a bug, just do a "make clean; make dc"
-  to recompile your project with debugging information. Then you can
-  immediately apply "ocamldebug" to the executable.
-
----------------------------------------------------------------------------
-
-                                 Profiling
-
-  For generating code that can be profiled with "ocamlprof" (byte code)
-  or "gprof" (native code), compile your project with one of the profiling
-  targets (see targets above). E.g.:
-
-    * "make pbc" will build byte code that can be profiled with
-      "ocamlprof".
-
-    * "make pnc" will build native code that can be profiled with
-      "gprof".
-
-  Please note that it is not currently possible to profile byte code with
-  threads. OCamlMakefile will force an error if you try to do this.
-
-  A short hint for DEC Alpha-users (under Digital Unix): you may also
-  compile your sources to native code without any further profiling
-  options/targets. Then call "pixie my_exec", "my_exec" being your
-  executable. This will produce (among other files) an executable
-  "my_exec.pixie". Call it and it will produce profiling information which
-  can be analysed using "prof -pixie my_exec". The resulting information
-  is extremely detailed and allows analysis up to the clock cycle level...
-
----------------------------------------------------------------------------
-
-                             Using Preprocessors
-
-  Because one could employ any kind of program that reads from standard
-  input and prints to standard output as preprocessor, there cannot be any
-  default way to handle all of them correctly without further knowledge.
-
-  Therefore you have to cooperate a bit with OCamlMakefile to let
-  preprocessing happen automatically. Basically, this only requires
-  that you put a comment into the first line of files that should be
-  preprocessed, e.g.:
-
-    (*pp cat *)
-    ... rest of program ...
-
-  OCamlMakefile looks at the first line of your files, and if it finds
-  a comment that starts with "(*pp", then it will assume that the
-  rest of the comment tells it how to correctly call the appropriate
-  preprocessor. In this case the program "cat" will be called, which will,
-  of course, just output the source text again without changing it.
-
-  If you are, for example, an advocate of the new "revised syntax",
-  which is supported by the camlp4 preprocessor, you could simply write:
-
-    (*pp camlp4r *)
-    ... rest of program in revised syntax ...
-
-  Simple, isn't it?
-
-  If you want to write your own syntax extensions, just take a look at the
-  example in the directory "camlp4": it implements the "repeat ... until"
-  extension as described in the camlp4-tutorial.
-
----------------------------------------------------------------------------
-
-                     Library (Un-)Installation Support
-
-  OCamlMakefile contains two targets using "ocamlfind" for this purpose:
-
-    * libinstall
-    * libuninstall
-
-  These two targets require the existence of the variable
-  "LIBINSTALL_FILES", which should be set to all the files that you
-  want to install in the library directory (usually %.mli, %.cmi, %.cma,
-  %.cmxa, %.a and possibly further C-libraries). The target "libinstall"
-  has the dependency "all" to force compilation of the library so make
-  sure you define target "all" in your Makefile appropriately.
-
-  The targets inform the user about the configured install path and ask
-  for confirmation to (un)install there. If you want to use them, it
-  is often a good idea to just alias them in your Makefile to "install"
-  and "uninstall" respectively.
-
-  Two other targets allow installation of files into a particular
-  directory (without using ocamlfind):
-
-    * rawinstall
-    * rawuninstall
-
----------------------------------------------------------------------------
-
-                            Building toplevels
-
-  There is just one target for this:
-
-    * top
-
-  The generated file can be used immediately for interactive sessions -
-  even with scanners, parsers, C-files, etc.!
-
----------------------------------------------------------------------------
-
-                         Generating documentation
-
-  The following targets are supported:
-
-   * htdoc      - generates HTML-documentation
-   * ladoc      - generates Latex-documentation
-   * psdoc      - generates PostScript-documentation
-   * pdfdoc     - generates PDF-documentation
-   * doc        - generates all supported forms of documentation
-   * clean-doc  - generates all supported forms of documentation
-
-  All of them generate a sub-directory "doc". More precisely, for HTML it
-  is "doc/$(RESULT)/html" and for Latex, PostScript and PDF the directory
-  "doc/$(RESULT)/latex". See the OCamldoc-manual for details and the
-  optional variables below for settings you can control.
-
----------------------------------------------------------------------------
-
-                           Handling subprojects
-
-  You can have several targets in the same directory and manage them
-  from within an single Makefile.
-
-  Give each subproject a name, e.g. "p1", "p2", etc. Then you export
-  settings specific to each project by using variables of the form
-  "PROJ_p1", "PROJ_p2", etc.  E.g.:
-
-    define PROJ_p1
-      SOURCES="foo.ml main.ml"
-      RESULT="p1"
-      OCAMLFLAGS="-unsafe"
-    endef
-    export PROJ_p1
-
-    define PROJ_p2
-      ...
-    endef
-    export PROJ_p2
-
-  You may also export common settings used by all projects directly, e.g.
-  "export THREADS = y".
-
-  Now it is a good idea to define, which projects should be affected by
-  commands by default.  E.g.:
-
-    ifndef SUBPROJS
-      export SUBPROJS = p1 p2
-    endif
-
-  This will automatically generate a given target for all those
-  subprojects if this variable has not been defined in the shell
-  environment or in the command line of the make-invocation by the user.
-  E.g., "make dc" will generate debug code for all subprojects.
-
-  Then you need to define a default action for your subprojects if "make"
-  has been called without arguments:
-
-    all: bc
-
-  This will build byte code by default for all subprojects.
-
-  Finally, you'll have to define a catch-all target that uses the target
-  provided by the user for all subprojects. Just add (assuming that
-  OCAMLMAKEFILE has been defined appropriately):
-
-    %:
-            @make -f $(OCAMLMAKEFILE) subprojs SUBTARGET=$@
-
-  See the "threads"-directory in the distribution for a short example!
-
----------------------------------------------------------------------------
-
-         Optional variables that may be passed to "OCamlMakefile"
-
-  * LIB_PACK_NAME - packs all modules of a library into a module whose
-                    name is given in variable "LIB_PACK_NAME".
-
-  * RES_CLIB_SUF  - when building a library that contains C-stubs, this
-                    variable controls the suffix appended to the name
-                    of the C-library (default: "_stubs").
-
-  * THREADS       - say "THREADS = yes" if you need thread support compiled in,
-                    otherwise leave it away.
-
-  * VMTHREADS     - say "VMTHREADS = yes" if you want to force VM-level
-                    scheduling of threads (byte-code only).
-
-  * ANNOTATE      - say "ANNOTATE = yes" to generate type annotation files
-                    (.annot) to support displaying of type information
-                    in editors.
-
-  * USE_CAMLP4    - say "USE_CAMLP4 = yes" in your "Makefile" if you
-                    want to include the camlp4 directory during the
-                    build process, otherwise leave it away.
-
-  * INCDIRS       - directories that should be searched for ".cmi"- and
-                    ".cmo"-files.  You need not write "-I ..." - just the
-                    plain names.
-  * LIBDIRS       - directories that should be searched for libraries
-                    Also just put the plain paths into this variable
-  * EXTLIBDIRS    - Same as "LIBDIRS", but paths in this variable are
-                    also added to the binary via the "-R"-flag so that
-                    dynamic libraries in non-standard places can be found.
-  * RESULTDEPS    - Targets on which results (executables or libraries)
-                    should additionally depend.
-
-  * PACKS         - adds packages under control of "findlib".
-
-  * PREDS         - specifies "findlib"-predicates.
-
-  * LIBS          - OCaml-libraries that should be linked (just plain names).
-                    E.g. if you want to link the Str-library, just write
-                    "str" (without quotes).
-                    The new OCaml-compiler handles libraries in such
-                    a way that they "remember" whether they have to
-                    be linked against a C-library and it gets linked
-                    in automatically.
-                    If there is a slash in the library name (such as
-                    "./str" or "lib/foo") then make is told that the
-                    generated files depend on the library.  This
-                    helps to ensure that changes to your libraries are
-                    taken into account, which is important if you are
-                    regenerating your libraries frequently.
-  * CLIBS         - C-libraries that should be linked (just plain names).
-
-  * PRE_TARGETS   - set this to a list of target files that you want
-                    to have buildt before dependency calculation actually
-                    takes place. E.g. use this to automatically compile
-                    modules needed by camlp4, which have to be available
-                    before other modules can be parsed at all.
-
-                    ** WARNING **: the files mentioned in this variable
-                    will be removed when "make clean" is executed!
-
-  * LIBINSTALL_FILES - the files of a library that should be installed
-                       using "findlib". Default:
-
-                         $(RESULT).mli $(RESULT).cmi $(RESULT).cma
-                         $(RESULT).cmxa $(RESULT).a lib$(RESULT).a
-
-  * OCAML_LIB_INSTALL - target directory for "rawinstall/rawuninstall".
-                        (default: $(OCAMLLIBPATH)/contrib)
-
-  * DOC_FILES     - names of files from which documentation is generated.
-                    (default: all .mli-files in your $(SOURCES)).
-
-  * DOC_DIR       - name of directory where documentation should be stored.
-
-  * OCAMLFLAGS    - flags passed to the compilers
-  * OCAMLBCFLAGS  - flags passed to the byte code compiler only
-  * OCAMLNCFLAGS  - flags passed to the native code compiler only
-
-  * OCAMLLDFLAGS  - flags passed to the OCaml-linker
-  * OCAMLBLDFLAGS - flags passed to the OCaml-linker when linking byte code
-  * OCAMLNLDFLAGS - flags passed to the OCaml-linker when linking
-                    native code
-
-  * OCAMLMKLIB_FLAGS - flags passed to the OCaml library tool
-
-  * OCAMLCPFLAGS  - profiling flags passed to "ocamlcp" (default: "a")
-
-  * PPFLAGS       - additional flags passed to the preprocessor (default: none)
-
-  * LFLAGS        - flags passed to "ocamllex"
-  * YFLAGS        - flags passed to "ocamlyacc"
-  * IDLFLAGS      - flags passed to "camlidl"
-
-  * OCAMLDOCFLAGS - flags passed to "ocamldoc"
-
-  * OCAMLFIND_INSTFLAGS - flags passed to "ocamlfind" during installation
-                          (default: none)
-
-  * DVIPSFLAGS    - flags passed to dvips
-                    (when generating documentation in PostScript).
-
-  * STATIC        - set this variable if you want to force creation
-                    of static libraries
-
-  * CC            - the C-compiler to be used
-  * CXX           - the C++-compiler to be used
-
-  * CFLAGS        - additional flags passed to the C-compiler.
-                    The flag "-DNATIVE_CODE" will be passed automatically
-                    if you choose to build native code. This allows you
-                    to compile your C-files conditionally. But please
-                    note: You should do a "make clean" or remove the
-                    object files manually or touch the %.c-files:
-                    otherwise, they may not be correctly recompiled
-                    between different builds.
-
-  * CXXFLAGS      - additional flags passed to the C++-compiler.
-
-  * CPPFLAGS      - additional flags passed to the C-preprocessor.
-
-  * CFRAMEWORKS   - Objective-C framework to pass to linker on MacOS X.
-
-  * LDFLAGS       - additional flags passed to the C-linker
-
-  * RPATH_FLAG    - flag passed through to the C-linker to set a path for
-                    dynamic libraries.  May need to be set by user on
-                    exotic platforms.  (default: "-R").
-
-  * ELF_RPATH_FLAG - this flag is used to set the rpath on ELF-platforms.
-                     (default: "-R")
-
-  * ELF_RPATH     - if this flag is "yes", then the RPATH_FLAG will be
-                    passed by "-Wl" to the linker as normal on
-                    ELF-platforms.
-
-  * OCAMLLIBPATH  - path to the OCaml-standard-libraries
-                    (first default: `$(OCAMLC) -where`)
-                    (second default: "/usr/local/lib/ocaml")
-
-  * OCAML_DEFAULT_DIRS - additional path in which the user can supply
-                         default directories to his own collection of
-                         libraries.  The idea is to pass this as an environment
-                         variable so that the Makefiles do not have to contain
-                         this path all the time.
-
-  * OCAMLFIND     - ocamlfind from findlib       (default: "ocamlfind")
-  * OCAMLC        - byte-code compiler           (default: "ocamlc")
-  * OCAMLOPT      - native-code compiler         (default: "ocamlopt")
-  * OCAMLMKTOP    - top-level compiler           (default: "ocamlmktop")
-  * OCAMLCP       - profiling byte-code compiler (default: "ocamlcp")
-  * OCAMLDEP      - dependency generator         (default: "ocamldep")
-  * OCAMLLEX      - scanner generator            (default: "ocamllex")
-  * OCAMLYACC     - parser generator             (default: "ocamlyacc")
-  * OCAMLMKLIB    - tool to create libraries     (default: "ocamlmklib")
-  * CAMLIDL       - IDL-code generator           (default: "camlidl")
-  * CAMLIDLDLL    - IDL-utility                  (default: "camlidldll")
-  * CAMLP4        - camlp4 preprocessor          (default: "camlp4")
-  * OCAMLDOC      - OCamldoc-command             (default: "ocamldoc")
-
-  * LATEX         - Latex-processor              (default: "latex")
-  * DVIPS         - dvips-command                (default: "dvips")
-  * PS2PDF        - PostScript-to-PDF converter  (default: "ps2pdf")
-
-  * CAMELEON_REPORT - report tool of Cameleon  (default: "report")
-  * CAMELEON_REPORT_FLAGS - flags for the report tool of Cameleon
-
-  * CAMELEON_ZOGGY - zoggy tool of Cameleon
-                     (default: "camlp4o pa_zog.cma pr_o.cmo")
-  * CAMELEON_ZOGGY_FLAGS - flags for the zoggy tool of Cameleon
-
-  * OCAML_GLADECC - Glade compiler for OCaml     (default: "lablgladecc2")
-  * OCAML_GLADECC_FLAGS - flags for the Glade compiler
-
-  * OXRIDL        - OXRIDL-generator  (default: "oxridl")
-
-  * NOIDLHEADER   - set to "yes" to prohibit "OCamlMakefile" from using
-                    the default camlidl-flag "-header".
-
-  * NO_CUSTOM     - Prevent linking in custom mode.
-
-  * QUIET         - unsetting this variable (e.g. "make QUIET=")
-                    will print all executed commands, including
-                    intermediate ones. This allows more comfortable
-                    debugging when things go wrong during a build.
-
-  * REALLY_QUIET  - when set this flag turns off output from some commands.
-
-  * OCAMLMAKEFILE - location of (=path to) this "OCamlMakefile".
-                    Because it calles itself recursively, it has to
-                    know where it is. (default: "OCamlMakefile" =
-                    local directory)
-
-  * BCSUFFIX      - Suffix for all byte-code files. E.g.:
-
-                      RESULT   = foo
-                      BCSUFFIX = _bc
-
-                    This will produce byte-code executables/libraries
-                    with basename "foo_bc".
-
-  * NCSUFFIX      - Similar to "BCSUFFIX", but for native-code files.
-  * TOPSUFFIX     - Suffix added to toplevel interpreters (default: ".top")
-
-  * SUBPROJS      - variable containing the names of subprojects to be
-                    compiled.
-
-  * SUBTARGET     - target to be built for all projects in variable
-                    SUBPROJS.
-
----------------------------------------------------------------------------
-
-                    Optional variables for Windows users
-
-  * MINGW         - variable to detect the MINGW-environment
-  * MSVC          - variable to detect the MSVC-compiler
-
----------------------------------------------------------------------------
-
-Up-to-date information (newest release of distribution) can always be
-found at:
-
-  http://www.ocaml.info/home/ocaml_sources.html
-
----------------------------------------------------------------------------
-
-Enjoy!
-
-New York, 2007-04-22
-Markus Mottl
-
-e-mail: markus.mottl@gmail.com
-WWW:    http://www.ocaml.info
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/README.md b/vendor/git.apache.org/thrift.git/lib/ocaml/README.md
deleted file mode 100644
index 5a47a42..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/README.md
+++ /dev/null
@@ -1,119 +0,0 @@
-Thrift OCaml Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-
-Library
-=======
-
-The library abstract classes, exceptions, and general use functions
-are mostly jammed in Thrift.ml (an exception being
-TServer).
-
-Generally, classes are used, however they are often put in their own
-module along with other relevant types and functions. The classes
-often called t, exceptions are called E.
-
-Implementations live in their own files. There is TBinaryProtocol,
-TSocket, TThreadedServer, TSimpleServer, and TServerSocket.
-
-A note on making the library: Running make should create native, debug
-code libraries, and a toplevel.
-
-
-Struct format
--------------
-Structs are turned into classes. The fields are all option types and
-are initially None. Write is a method, but reading is done by a
-separate function (since there is no such thing as a static
-class). The class type is t and is in a module with the name of the
-struct.
-
-
-enum format
------------
-Enums are put in their own module along with
-functions to_i and of_i which convert the ocaml types into ints. For
-example:
-
-enum Numberz
-{
-  ONE = 1,
-  TWO,
-  THREE,
-  FIVE = 5,
-  SIX,
-  EIGHT = 8
-}
-
-==>
-
-module Numberz =
-struct
-type t =
-| ONE
-| TWO
-| THREE
-| FIVE
-| SIX
-| EIGHT
-
-let of_i = ...
-let to_i = ...
-end
-
-typedef format
---------------
-Typedef turns into the type declaration:
-typedef i64 UserId
-
-==>
-
-type userid Int64.t
-
-exception format
-----------------
-The same as structs except that the module also has an exception type
-E of t that is raised/caught.
-
-For example, with an exception Xception,
-raise (Xception.E (new Xception.t))
-and
-try
-  ...
-with Xception.E e -> ...
-
-list format
------------
-Lists are turned into OCaml native lists.
-
-Map/Set formats
----------------
-These are both turned into Hashtbl.t's. Set values are bool.
-
-Services
---------
-The client is a class "client" parametrized on input and output
-protocols. The processor is a class parametrized on a handler. A
-handler is a class inheriting the iface abstract class. Unlike other
-implementations, client does not implement iface since iface functions
-must take option arguments so as to deal with the case where a client
-does not send all the arguments.
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/TODO b/vendor/git.apache.org/thrift.git/lib/ocaml/TODO
deleted file mode 100644
index 4d1dc77..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-Write interfaces
-Clean up the code generator
-Avoid capture properly instead of relying on the user not to use _
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/_oasis b/vendor/git.apache.org/thrift.git/lib/ocaml/_oasis
deleted file mode 100644
index 95536f0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/_oasis
+++ /dev/null
@@ -1,19 +0,0 @@
-Name: libthrift-ocaml
-Version: 0.10.0
-OASISFormat: 0.3
-Synopsis: OCaml bindings for the Apache Thrift RPC system
-Authors: Apache Thrift Developers <dev@thrift.apache.org>
-License: Apache-2.0
-Homepage: http://thrift.apache.org
-BuildTools: ocamlbuild
-Plugins:     META (0.3),
-  DevFiles (0.3)
-
-Library "libthrift-ocaml"
-  Path: src
-  FindlibName: thrift
-  buildTools: ocamlbuild
-  BuildDepends: threads
-  Modules: Thrift,TBinaryProtocol,TSocket,TFramedTransport,TChannelTransport,TServer,TSimpleServer,TServerSocket,TThreadedServer
-  XMETARequires: threads
-
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/ocaml/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TBinaryProtocol.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/TBinaryProtocol.ml
deleted file mode 100644
index 6d7500e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TBinaryProtocol.ml
+++ /dev/null
@@ -1,171 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift
-
-module P = Protocol
-
-let get_byte i b = 255 land (i lsr (8*b))
-let get_byte32 i b = 255 land (Int32.to_int (Int32.shift_right i (8*b)))
-let get_byte64 i b = 255 land (Int64.to_int (Int64.shift_right i (8*b)))
-
-
-let tv = P.t_type_to_i
-let vt = P.t_type_of_i
-
-
-let comp_int b n =
-  let s = ref 0l in
-  let sb = 32 - 8*n in
-    for i=0 to (n-1) do
-      s:= Int32.logor !s (Int32.shift_left (Int32.of_int (int_of_char b.[i])) (8*(n-1-i)))
-    done;
-    Int32.shift_right (Int32.shift_left !s sb) sb
-
-let comp_int64 b n =
-  let s = ref 0L in
-    for i=0 to (n-1) do
-      s:=Int64.logor !s (Int64.shift_left (Int64.of_int (int_of_char b.[i])) (8*(n-1-i)))
-    done;
-    !s
-
-let version_mask = 0xffff0000l
-let version_1 = 0x80010000l
-
-class t trans =
-object (self)
-  inherit P.t trans
-  val ibyte = String.create 8
-  method writeBool b =
-    ibyte.[0] <- char_of_int (if b then 1 else 0);
-    trans#write ibyte 0 1
-  method writeByte i =
-    ibyte.[0] <- char_of_int (get_byte i 0);
-    trans#write ibyte 0 1
-  method writeI16 i =
-    let gb = get_byte i in
-      ibyte.[1] <- char_of_int (gb 0);
-      ibyte.[0] <- char_of_int (gb 1);
-      trans#write ibyte 0 2
-  method writeI32 i =
-    let gb = get_byte32 i in
-      for i=0 to 3 do
-        ibyte.[3-i] <- char_of_int (gb i)
-      done;
-      trans#write ibyte 0 4
-  method writeI64 i=
-    let gb = get_byte64 i in
-      for i=0 to 7 do
-        ibyte.[7-i] <- char_of_int (gb i)
-      done;
-      trans#write ibyte 0 8
-  method writeDouble d =
-    self#writeI64 (Int64.bits_of_float d)
-  method writeString s=
-    let n = String.length s in
-      self#writeI32 (Int32.of_int n);
-      trans#write s 0 n
-  method writeBinary a = self#writeString a
-  method writeMessageBegin (n,t,s) =
-    self#writeI32 (Int32.logor version_1 (Int32.of_int (P.message_type_to_i t)));
-    self#writeString n;
-    self#writeI32 (Int32.of_int s)
-  method writeMessageEnd = ()
-  method writeStructBegin s = ()
-  method writeStructEnd = ()
-  method writeFieldBegin (n,t,i) =
-    self#writeByte (tv t);
-    self#writeI16 i
-  method writeFieldEnd = ()
-  method writeFieldStop =
-    self#writeByte (tv (P.T_STOP))
-  method writeMapBegin (k,v,s) =
-    self#writeByte (tv k);
-    self#writeByte (tv v);
-    self#writeI32 (Int32.of_int s)
-  method writeMapEnd = ()
-  method writeListBegin (t,s) =
-    self#writeByte (tv t);
-    self#writeI32 (Int32.of_int s)
-  method writeListEnd = ()
-  method writeSetBegin (t,s) =
-    self#writeByte (tv t);
-    self#writeI32 (Int32.of_int s)
-  method writeSetEnd = ()
-  method readByte =
-    ignore (trans#readAll ibyte 0 1);
-    Int32.to_int (comp_int ibyte 1)
-  method readI16 =
-    ignore (trans#readAll ibyte 0 2);
-    Int32.to_int (comp_int ibyte 2)
-  method readI32 =
-    ignore (trans#readAll ibyte 0 4);
-    comp_int ibyte 4
-  method readI64 =
-    ignore (trans#readAll ibyte 0 8);
-    comp_int64 ibyte 8
-  method readDouble =
-    Int64.float_of_bits (self#readI64)
-  method readBool =
-    self#readByte = 1
-  method readString =
-    let sz = Int32.to_int (self#readI32) in
-    let buf = String.create sz in
-      ignore (trans#readAll buf 0 sz);
-      buf
-  method readBinary = self#readString
-  method readMessageBegin =
-    let ver = self#readI32 in
-      if Int32.compare (Int32.logand ver version_mask) version_1 != 0 then
-        raise (P.E (P.BAD_VERSION, "Missing version identifier"))
-      else
-        let s = self#readString in
-        let mt = P.message_type_of_i (Int32.to_int (Int32.logand ver 0xFFl)) in
-          (s,mt, Int32.to_int self#readI32)
-  method readMessageEnd = ()
-  method readStructBegin =
-    ""
-  method readStructEnd = ()
-  method readFieldBegin =
-    let t = (vt (self#readByte))
-    in
-      if t != P.T_STOP then
-        ("",t,self#readI16)
-      else ("",t,0);
-  method readFieldEnd = ()
-  method readMapBegin =
-    let kt = vt (self#readByte) in
-    let vt = vt (self#readByte) in
-      (kt,vt, Int32.to_int self#readI32)
-  method readMapEnd = ()
-  method readListBegin =
-    let t = vt (self#readByte) in
-    (t, Int32.to_int self#readI32)
-  method readListEnd = ()
-  method readSetBegin =
-    let t = vt (self#readByte) in
-    (t, Int32.to_int self#readI32);
-  method readSetEnd = ()
-end
-
-class factory =
-object
-  inherit P.factory
-  method getProtocol tr = new t tr
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TChannelTransport.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/TChannelTransport.ml
deleted file mode 100644
index 0f7d616..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TChannelTransport.ml
+++ /dev/null
@@ -1,39 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift
-module T = Transport
-
-class t (i,o) =
-object (self)
-  val mutable opened = true
-  inherit Transport.t
-  method isOpen = opened
-  method opn = ()
-  method close = close_in i; opened <- false
-  method read buf off len =
-    if opened then
-      try
-        really_input i buf off len; len
-      with _ -> raise (T.E (T.UNKNOWN, ("TChannelTransport: Could not read "^(string_of_int len))))
-    else
-      raise (T.E (T.NOT_OPEN, "TChannelTransport: Channel was closed"))
-  method write buf off len = output o buf off len
-  method flush = flush o
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TFramedTransport.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/TFramedTransport.ml
deleted file mode 100644
index 1be51e7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TFramedTransport.ml
+++ /dev/null
@@ -1,93 +0,0 @@
-open Thrift
-
-module T = Transport
-
-let c_0xff_32 = Int32.of_string "0xff"
-
-(* Copied from OCamlnet rtypes.ml *)
-let encode_frame_size x =
-	let s = String.create 4 in
-	let n3 = Int32.to_int (Int32.shift_right_logical x 24) land 0xff in
-	let n2 = Int32.to_int (Int32.shift_right_logical x 16) land 0xff in
-	let n1 = Int32.to_int (Int32.shift_right_logical x 8) land 0xff in
-	let n0 = Int32.to_int (Int32.logand x c_0xff_32) in
-		String.unsafe_set s 0 (Char.unsafe_chr n3);
-		String.unsafe_set s 1 (Char.unsafe_chr n2);
-		String.unsafe_set s 2 (Char.unsafe_chr n1);
-		String.unsafe_set s 3 (Char.unsafe_chr n0);
-		s
-		
-let decode_frame_size s = 
-	let n3 = Int32.of_int (Char.code s.[0]) in
-	let n2 = Int32.of_int (Char.code s.[1]) in
-	let n1 = Int32.of_int (Char.code s.[2]) in
-	let n0 = Int32.of_int (Char.code s.[3]) in
-		Int32.logor
-		(Int32.shift_left n3 24)
-		(Int32.logor
-			(Int32.shift_left n2 16)
-			(Int32.logor
-				(Int32.shift_left n1 8)
-				n0))
-
-class t ?(max_length=Sys.max_string_length) (transport: T.t) =
-object (self)
-	inherit T.t
-
-	method isOpen = transport#isOpen
-	method opn = transport#opn
-	method close = transport#close
- 
-	val mutable read_buf = None
-	val mutable read_buf_offset = 0
-	val mutable write_buf = ""
-
-	method private read_frame =
-		let len_buf = String.create 4 in
-		assert (transport#readAll len_buf 0 4 = 4); 
-		
-		let size = Int32.to_int (decode_frame_size len_buf) in
-		
-		(if size < 0
-		then failwith (Printf.sprintf "Read a negative frame size (%i)!" size));
-		
-		(if size > max_length
-		then failwith (Printf.sprintf "Frame size (%i) larger than max length (%i)!" size max_length));
-
-		let buf = String.create size in
-			assert (transport#readAll buf 0 size = size);
-			read_buf <- Some buf;
-			read_buf_offset <- 0
-
-	method private read_from_frame frame buf off len =
-		let to_copy = min len ((String.length frame) - read_buf_offset) in
-			String.blit frame read_buf_offset buf off to_copy;
-			read_buf_offset <- read_buf_offset + to_copy;
-			to_copy
-
-	method read buf off len = 
-		match read_buf with
-		| Some frame -> 
-			let i = self#read_from_frame frame buf off len in
-			if i > 0
-			then i
-			else begin
-				self#read_frame; 
-				self#read_from_frame frame buf off len
-			end
-		| None ->
-				self#read_frame;
-				self#read buf off len 
-	 
-	method write buf off len = 
-		write_buf <- write_buf ^ (String.sub buf off len)
-
-	method flush = 
-		let encoded_size = encode_frame_size (Int32.of_int (String.length write_buf)) in
-			transport#write encoded_size 0 (String.length encoded_size);
-			transport#write write_buf 0 (String.length write_buf);
-			transport#flush; 
-			write_buf <- ""
-end
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TServer.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/TServer.ml
deleted file mode 100644
index fc51efa..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TServer.ml
+++ /dev/null
@@ -1,42 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift
-
-class virtual t
-    (pf : Processor.t)
-    (st : Transport.server_t)
-    (tf : Transport.factory)
-    (ipf : Protocol.factory)
-    (opf : Protocol.factory)=
-object
-  method virtual serve : unit
-end;;
-
-
-
-let run_basic_server proc port =
-  Unix.establish_server (fun inp -> fun out ->
-                           let trans = new TChannelTransport.t (inp,out) in
-                           let proto = new TBinaryProtocol.t (trans :> Transport.t) in
-                             try
-                               while proc#process proto proto do () done; ()
-                             with e -> ()) (Unix.ADDR_INET (Unix.inet_addr_of_string "127.0.0.1",port))
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TServerSocket.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/TServerSocket.ml
deleted file mode 100644
index 405ef82..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TServerSocket.ml
+++ /dev/null
@@ -1,41 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift
-
-class t port =
-object
-  inherit Transport.server_t
-  val mutable sock = None
-  method listen =
-    let s = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
-      sock <- Some s;
-      Unix.bind s (Unix.ADDR_INET (Unix.inet_addr_any, port));
-      Unix.listen s 256
-  method close =
-    match sock with
-        Some s -> Unix.shutdown s Unix.SHUTDOWN_ALL; Unix.close s;
-          sock <- None
-      | _ -> ()
-  method acceptImpl =
-    match sock with
-        Some s -> let (fd,_) = Unix.accept s in
-                    new TChannelTransport.t (Unix.in_channel_of_descr fd,Unix.out_channel_of_descr fd)
-      | _ -> raise (Transport.E (Transport.NOT_OPEN,"TServerSocket: Not listening but tried to accept"))
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TSimpleServer.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/TSimpleServer.ml
deleted file mode 100644
index 2927c08..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TSimpleServer.ml
+++ /dev/null
@@ -1,40 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift
-module S = TServer
-
-class t pf st tf ipf opf =
-object
-  inherit S.t pf st tf ipf opf
-  method serve =
-    try
-      st#listen;
-      while true do
-        let c = st#accept in
-        let trans = tf#getTransport c in
-        let inp = ipf#getProtocol trans in
-        let op = opf#getProtocol trans in
-          try
-            while (pf#process inp op) do () done;
-            trans#close
-          with e -> trans#close; raise e
-      done
-    with _ -> ()
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TSocket.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/TSocket.ml
deleted file mode 100644
index 109e11c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TSocket.ml
+++ /dev/null
@@ -1,59 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift
-
-module T = Transport
-
-class t host port=
-object (self)
-  inherit T.t
-  val mutable chans = None
-  method isOpen = chans != None
-  method opn =
-    try
-      let addr = (let {Unix.h_addr_list=x} = Unix.gethostbyname host in x.(0)) in
-        chans <- Some(Unix.open_connection (Unix.ADDR_INET (addr,port)))
-    with
-        Unix.Unix_error (e,fn,_) -> raise (T.E (T.NOT_OPEN, ("TSocket: Could not connect to "^host^":"^(string_of_int port)^" because: "^fn^":"^(Unix.error_message e))))
-      | _ -> raise (T.E (T.NOT_OPEN, ("TSocket: Could not connect to "^host^":"^(string_of_int port))))
-
-  method close =
-    match chans with
-        None -> ()
-      | Some(inc,out) -> (Unix.shutdown_connection inc;
-                          close_in inc;
-                          chans <- None)
-  method read buf off len = match chans with
-      None -> raise (T.E (T.NOT_OPEN, "TSocket: Socket not open"))
-    | Some(i,o) ->
-        try
-          really_input i buf off len; len
-        with
-            Unix.Unix_error (e,fn,_) -> raise (T.E (T.UNKNOWN, ("TSocket: Could not read "^(string_of_int len)^" from "^host^":"^(string_of_int port)^" because: "^fn^":"^(Unix.error_message e))))
-          | _ -> raise (T.E (T.UNKNOWN, ("TSocket: Could not read "^(string_of_int len)^" from "^host^":"^(string_of_int port))))
-  method write buf off len = match chans with
-      None -> raise (T.E (T.NOT_OPEN, "TSocket: Socket not open"))
-    | Some(i,o) -> output o buf off len
-  method flush = match chans with
-      None -> raise (T.E (T.NOT_OPEN, "TSocket: Socket not open"))
-    | Some(i,o) -> flush o
-end
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TThreadedServer.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/TThreadedServer.ml
deleted file mode 100644
index 4462dbd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/TThreadedServer.ml
+++ /dev/null
@@ -1,45 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift
-
-class t
-  (pf : Processor.t)
-  (st : Transport.server_t)
-  (tf : Transport.factory)
-  (ipf : Protocol.factory)
-  (opf : Protocol.factory)=
-object
-  inherit TServer.t pf st tf ipf opf
-  method serve =
-    st#listen;
-    while true do
-      let tr = tf#getTransport (st#accept) in
-        ignore (Thread.create
-          (fun _ ->
-             let ip = ipf#getProtocol tr in
-             let op = opf#getProtocol tr in
-               try
-                 while pf#process ip op do
-                   ()
-                 done
-               with _ -> ()) ())
-    done
-end
-
diff --git a/vendor/git.apache.org/thrift.git/lib/ocaml/src/Thrift.ml b/vendor/git.apache.org/thrift.git/lib/ocaml/src/Thrift.ml
deleted file mode 100644
index f0d7a42..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ocaml/src/Thrift.ml
+++ /dev/null
@@ -1,383 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-exception Break;;
-exception Thrift_error;;
-exception Field_empty of string;;
-
-class t_exn =
-object
-  val mutable message = ""
-  method get_message = message
-  method set_message s = message <- s
-end;;
-
-module Transport =
-struct
-  type exn_type =
-      | UNKNOWN
-      | NOT_OPEN
-      | ALREADY_OPEN
-      | TIMED_OUT
-      | END_OF_FILE;;
-
-  exception E of exn_type * string
-
-  class virtual t =
-  object (self)
-    method virtual isOpen : bool
-    method virtual opn : unit
-    method virtual close : unit
-    method virtual read : string -> int -> int -> int
-    method readAll buf off len =
-      let got = ref 0 in
-      let ret = ref 0 in
-        while !got < len do
-          ret := self#read buf (off+(!got)) (len - (!got));
-          if !ret <= 0 then
-            raise (E (UNKNOWN, "Cannot read. Remote side has closed."));
-          got := !got + !ret
-        done;
-        !got
-    method virtual write : string -> int -> int -> unit
-    method virtual flush : unit
-  end
-
-  class factory =
-  object
-    method getTransport (t : t) = t
-  end
-
-  class virtual server_t =
-  object (self)
-    method virtual listen : unit
-    method accept = self#acceptImpl
-    method virtual close : unit
-    method virtual acceptImpl : t
-  end
-
-end;;
-
-
-
-module Protocol =
-struct
-  type t_type =
-      | T_STOP
-      | T_VOID
-      | T_BOOL
-      | T_BYTE
-      | T_I08
-      | T_I16
-      | T_I32
-      | T_U64
-      | T_I64
-      | T_DOUBLE
-      | T_STRING
-      | T_UTF7
-      | T_STRUCT
-      | T_MAP
-      | T_SET
-      | T_LIST
-      | T_UTF8
-      | T_UTF16
-
-  let t_type_to_i = function
-      T_STOP       -> 0
-    | T_VOID       -> 1
-    | T_BOOL       -> 2
-    | T_BYTE       -> 3
-    | T_I08        -> 3
-    | T_I16        -> 6
-    | T_I32        -> 8
-    | T_U64        -> 9
-    | T_I64        -> 10
-    | T_DOUBLE     -> 4
-    | T_STRING     -> 11
-    | T_UTF7       -> 11
-    | T_STRUCT     -> 12
-    | T_MAP        -> 13
-    | T_SET        -> 14
-    | T_LIST       -> 15
-    | T_UTF8       -> 16
-    | T_UTF16      -> 17
-
-  let t_type_of_i = function
-      0 -> T_STOP
-    | 1 -> T_VOID
-    | 2 -> T_BOOL
-    | 3 ->  T_BYTE
-    | 6-> T_I16
-    | 8 -> T_I32
-    | 9 -> T_U64
-    | 10 -> T_I64
-    | 4 -> T_DOUBLE
-    | 11 -> T_STRING
-    | 12 -> T_STRUCT
-    | 13 -> T_MAP
-    | 14 -> T_SET
-    | 15 -> T_LIST
-    | 16 -> T_UTF8
-    | 17 -> T_UTF16
-    | _ -> raise Thrift_error
-
-  type message_type =
-    | CALL
-    | REPLY
-    | EXCEPTION
-    | ONEWAY
-
-  let message_type_to_i = function
-    | CALL -> 1
-    | REPLY -> 2
-    | EXCEPTION -> 3
-    | ONEWAY -> 4
-
-  let message_type_of_i = function
-    | 1 -> CALL
-    | 2 -> REPLY
-    | 3 -> EXCEPTION
-    | 4 -> ONEWAY
-    | _ -> raise Thrift_error
-
-  class virtual t (trans: Transport.t) =
-  object (self)
-    val mutable trans_ = trans
-    method getTransport = trans_
-      (* writing methods *)
-    method virtual writeMessageBegin : string * message_type * int -> unit
-    method virtual writeMessageEnd : unit
-    method virtual writeStructBegin : string -> unit
-    method virtual writeStructEnd : unit
-    method virtual writeFieldBegin : string * t_type * int -> unit
-    method virtual writeFieldEnd : unit
-    method virtual writeFieldStop : unit
-    method virtual writeMapBegin : t_type * t_type * int -> unit
-    method virtual writeMapEnd : unit
-    method virtual writeListBegin : t_type * int -> unit
-    method virtual writeListEnd : unit
-    method virtual writeSetBegin : t_type * int -> unit
-    method virtual writeSetEnd : unit
-    method virtual writeBool : bool -> unit
-    method virtual writeByte : int -> unit
-    method virtual writeI16 : int -> unit
-    method virtual writeI32 : Int32.t -> unit
-    method virtual writeI64 : Int64.t -> unit
-    method virtual writeDouble : float -> unit
-    method virtual writeString : string -> unit
-    method virtual writeBinary : string -> unit
-      (* reading methods *)
-    method virtual readMessageBegin : string * message_type * int
-    method virtual readMessageEnd : unit
-    method virtual readStructBegin : string
-    method virtual readStructEnd : unit
-    method virtual readFieldBegin : string * t_type * int
-    method virtual readFieldEnd : unit
-    method virtual readMapBegin : t_type * t_type * int
-    method virtual readMapEnd : unit
-    method virtual readListBegin : t_type * int
-    method virtual readListEnd : unit
-    method virtual readSetBegin : t_type * int
-    method virtual readSetEnd : unit
-    method virtual readBool : bool
-    method virtual readByte : int
-    method virtual readI16 : int
-    method virtual readI32: Int32.t
-    method virtual readI64 : Int64.t
-    method virtual readDouble : float
-    method virtual readString : string
-    method virtual readBinary : string
-        (* skippage *)
-    method skip typ =
-      match typ with
-        | T_STOP -> ()
-        | T_VOID -> ()
-        | T_BOOL -> ignore self#readBool
-        | T_BYTE
-        | T_I08 -> ignore self#readByte
-        | T_I16 -> ignore self#readI16
-        | T_I32 -> ignore self#readI32
-        | T_U64
-        | T_I64 -> ignore self#readI64
-        | T_DOUBLE -> ignore self#readDouble
-        | T_STRING -> ignore self#readString
-        | T_UTF7 -> ()
-        | T_STRUCT -> ignore ((ignore self#readStructBegin);
-                              (try
-                                   while true do
-                                     let (_,t,_) = self#readFieldBegin in
-                                       if t = T_STOP then
-                                         raise Break
-                                       else
-                                         (self#skip t;
-                                          self#readFieldEnd)
-                                   done
-                               with Break -> ());
-                              self#readStructEnd)
-        | T_MAP -> ignore (let (k,v,s) = self#readMapBegin in
-                             for i=0 to s do
-                               self#skip k;
-                               self#skip v;
-                             done;
-                             self#readMapEnd)
-        | T_SET -> ignore (let (t,s) = self#readSetBegin in
-                             for i=0 to s do
-                               self#skip t
-                             done;
-                             self#readSetEnd)
-        | T_LIST -> ignore (let (t,s) = self#readListBegin in
-                              for i=0 to s do
-                                self#skip t
-                              done;
-                              self#readListEnd)
-        | T_UTF8 -> ()
-        | T_UTF16 -> ()
-  end
-
-  class virtual factory =
-  object
-    method virtual getProtocol : Transport.t -> t
-  end
-
-  type exn_type =
-      | UNKNOWN
-      | INVALID_DATA
-      | NEGATIVE_SIZE
-      | SIZE_LIMIT
-      | BAD_VERSION
-      | NOT_IMPLEMENTED
-      | DEPTH_LIMIT
-
-  exception E of exn_type * string;;
-
-end;;
-
-
-module Processor =
-struct
-  class virtual t =
-  object
-    method virtual process : Protocol.t -> Protocol.t -> bool
-  end;;
-
-  class factory (processor : t) =
-  object
-    val processor_ = processor
-    method getProcessor (trans : Transport.t) = processor_
-  end;;
-end
-
-
-(* Ugly *)
-module Application_Exn =
-struct
-  type typ=
-      | UNKNOWN
-      | UNKNOWN_METHOD
-      | INVALID_MESSAGE_TYPE
-      | WRONG_METHOD_NAME
-      | BAD_SEQUENCE_ID
-      | MISSING_RESULT
-      | INTERNAL_ERROR
-      | PROTOCOL_ERROR
-      | INVALID_TRANSFORM
-      | INVALID_PROTOCOL
-      | UNSUPPORTED_CLIENT_TYPE
-
-  let typ_of_i = function
-      0l -> UNKNOWN
-    | 1l -> UNKNOWN_METHOD
-    | 2l -> INVALID_MESSAGE_TYPE
-    | 3l -> WRONG_METHOD_NAME
-    | 4l -> BAD_SEQUENCE_ID
-    | 5l -> MISSING_RESULT
-    | 6l -> INTERNAL_ERROR
-    | 7l -> PROTOCOL_ERROR
-    | 8l -> INVALID_TRANSFORM
-    | 9l -> INVALID_PROTOCOL
-    | 10l -> UNSUPPORTED_CLIENT_TYPE
-    | _ -> raise Thrift_error;;
-  let typ_to_i = function
-    | UNKNOWN -> 0l
-    | UNKNOWN_METHOD -> 1l
-    | INVALID_MESSAGE_TYPE -> 2l
-    | WRONG_METHOD_NAME -> 3l
-    | BAD_SEQUENCE_ID -> 4l
-    | MISSING_RESULT -> 5l
-    | INTERNAL_ERROR -> 6l
-    | PROTOCOL_ERROR -> 7l
-    | INVALID_TRANSFORM -> 8l
-    | INVALID_PROTOCOL -> 9l
-    | UNSUPPORTED_CLIENT_TYPE -> 10l
-
-  class t =
-  object (self)
-    inherit t_exn
-    val mutable typ = UNKNOWN
-    method get_type = typ
-    method set_type t = typ <- t
-    method write (oprot : Protocol.t) =
-      oprot#writeStructBegin "TApplicationExeception";
-      if self#get_message != "" then
-        (oprot#writeFieldBegin ("message",Protocol.T_STRING, 1);
-         oprot#writeString self#get_message;
-         oprot#writeFieldEnd)
-      else ();
-      oprot#writeFieldBegin ("type",Protocol.T_I32,2);
-      oprot#writeI32 (typ_to_i typ);
-      oprot#writeFieldEnd;
-      oprot#writeFieldStop;
-      oprot#writeStructEnd
-  end;;
-
-  let create typ msg =
-    let e = new t in
-      e#set_type typ;
-    e#set_message msg;
-    e
-
-  let read (iprot : Protocol.t) =
-    let msg = ref "" in
-    let typ = ref 0l in
-      ignore iprot#readStructBegin;
-      (try
-           while true do
-             let (name,ft,id) =iprot#readFieldBegin in
-               if ft = Protocol.T_STOP
-               then raise Break
-               else ();
-               (match id with
-             | 1 -> (if ft = Protocol.T_STRING
-               then msg := (iprot#readString)
-               else iprot#skip ft)
-             | 2 -> (if ft = Protocol.T_I32
-               then typ := iprot#readI32
-               else iprot#skip ft)
-             | _ -> iprot#skip ft);
-               iprot#readFieldEnd
-      done
-       with Break -> ());
-      iprot#readStructEnd;
-      let e = new t in
-        e#set_type (typ_of_i !typ);
-        e#set_message !msg;
-        e;;
-
-  exception E of t
-end;;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/Makefile.PL b/vendor/git.apache.org/thrift.git/lib/perl/Makefile.PL
deleted file mode 100644
index ceca86f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/Makefile.PL
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use ExtUtils::MakeMaker;
-WriteMakefile( 'NAME' => 'Thrift',
-               'VERSION_FROM' => 'lib/Thrift.pm',
-               'PREREQ_PM'              => {
-                   'Bit::Vector' => 0,
-                   'Class::Accessor' => 0
-               },
-               ($] >= 5.005 ?
- (                AUTHOR     => 'Apache Thrift <dev@thrift.apache.org>') : ()),
-               );
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/Makefile.am b/vendor/git.apache.org/thrift.git/lib/perl/Makefile.am
deleted file mode 100644
index 0d2c8d3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/Makefile.am
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SUBDIRS = test
-
-Makefile-perl.mk : Makefile.PL
-	$(PERL) Makefile.PL MAKEFILE=Makefile-perl.mk INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(PERL_PREFIX)
-
-all-local: Makefile-perl.mk
-	$(MAKE) -f $<
-	find blib -name 'Makefile*' -exec rm -f {} \;
-
-install-exec-local: Makefile-perl.mk
-	$(MAKE) -f $< install DESTDIR=$(DESTDIR)/
-
-clean-local:
-	if test -f Makefile-perl.mk ; then \
-		$(MAKE) -f Makefile-perl.mk clean ; \
-	fi
-	$(RM) Makefile-perl.mk.old
-	$(RM) -r gen-perl gen-perl2
-
-EXTRA_DIST = \
-	coding_standards.md \
-	Makefile.PL \
-	test.pl \
-	lib/Thrift.pm \
-	lib/Thrift.pm \
-	lib/Thrift/BinaryProtocol.pm \
-	lib/Thrift/BufferedTransport.pm \
-	lib/Thrift/FramedTransport.pm \
-	lib/Thrift/HttpClient.pm \
-	lib/Thrift/MemoryBuffer.pm \
-	lib/Thrift/MessageType.pm \
-	lib/Thrift/MultiplexedProcessor.pm \
-	lib/Thrift/MultiplexedProtocol.pm \
-	lib/Thrift/Protocol.pm \
-	lib/Thrift/ProtocolDecorator.pm \
-	lib/Thrift/Server.pm \
-	lib/Thrift/ServerSocket.pm \
-	lib/Thrift/Socket.pm \
-	lib/Thrift/SSLSocket.pm \
-	lib/Thrift/SSLServerSocket.pm \
-	lib/Thrift/UnixServerSocket.pm \
-	lib/Thrift/UnixSocket.pm \
-	lib/Thrift/Transport.pm \
-	README.md
-
-THRIFT = @top_builddir@/compiler/cpp/thrift
-THRIFT_IF = @top_srcdir@/test/ThriftTest.thrift
-NAME_BENCHMARKSERVICE =  @top_srcdir@/lib/rb/benchmark/Benchmark.thrift
-NAME_AGGR = @top_srcdir@/contrib/async-test/aggr.thrift
-
-THRIFTTEST_GEN = \
-	gen-perl/ThriftTest/Constants.pm \
-	gen-perl/ThriftTest/SecondService.pm \
-	gen-perl/ThriftTest/ThriftTest.pm \
-	gen-perl/ThriftTest/Types.pm
-
-BENCHMARK_GEN = \
-	gen-perl/BenchmarkService.pm \
-	gen-perl/Constants.pm \
-	gen-perl/Types.pm
-
-AGGR_GEN = \
-	gen-perl2/Aggr.pm \
-	gen-perl2/Constants.pm \
-	gen-perl2/Types.pm
-
-PERL_GEN = \
-	$(THRIFTTEST_GEN) \
-	$(BENCHMARK_GEN) \
-	$(AGGR_GEN)
-
-BUILT_SOURCES = $(PERL_GEN)
-
-check-local: $(PERL_GEN)
-	$(PERL) -Iblib/lib -I@abs_srcdir@ -I@builddir@/gen-perl2 -I@builddir@/gen-perl \
-		@abs_srcdir@/test.pl @abs_srcdir@/test/*.t
-
-$(THRIFTTEST_GEN): $(THRIFT_IF) $(THRIFT)
-	$(THRIFT) --gen perl $<
-
-$(BENCHMARK_GEN): $(NAME_BENCHMARKSERVICE) $(THRIFT)
-	$(THRIFT) --gen perl $<
-
-$(AGGR_GEN): $(NAME_AGGR) $(THRIFT)
-	$(MKDIR_P) gen-perl2
-	$(THRIFT) -out gen-perl2 --gen perl $<
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/README.md b/vendor/git.apache.org/thrift.git/lib/perl/README.md
deleted file mode 100644
index 51247e0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-Thrift Perl Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with Perl
-=====================
-
-Thrift requires Perl >= 5.6.0
-
-Unexpected exceptions in a service handler are converted to
-TApplicationException with type INTERNAL ERROR and the string
-of the exception is delivered as the message.
-
-On the client side, exceptions are thrown with die, so be sure
-to wrap eval{} statments around any code that contains exceptions.
-
-Please see tutoral and test dirs for examples.
-
-Dependencies
-============
-
-Bit::Vector       - comes with modern perl installations.
-Class::Accessor
-IO::Socket::INET  - comes with modern perl installations.
-IO::Socket::SSL   - required if using SSL/TLS.
-NET::SSLeay
-Crypt::SSLeay     - for make cross
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/perl/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift.pm
deleted file mode 100644
index 152d223..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift.pm
+++ /dev/null
@@ -1,193 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-package Thrift;
-
-our $VERSION = '0.10.0';
-
-require 5.6.0;
-use strict;
-use warnings;
-
-#
-# Data types that can be sent via Thrift
-#
-package TType;
-use constant STOP   => 0;
-use constant VOID   => 1;
-use constant BOOL   => 2;
-use constant BYTE   => 3;
-use constant I08    => 3;
-use constant DOUBLE => 4;
-use constant I16    => 6;
-use constant I32    => 8;
-use constant I64    => 10;
-use constant STRING => 11;
-use constant UTF7   => 11;
-use constant STRUCT => 12;
-use constant MAP    => 13;
-use constant SET    => 14;
-use constant LIST   => 15;
-use constant UTF8   => 16;
-use constant UTF16  => 17;
-1;
-
-#
-# Message types for RPC
-#
-package TMessageType;
-use constant CALL      => 1;
-use constant REPLY     => 2;
-use constant EXCEPTION => 3;
-use constant ONEWAY    => 4;
-1;
-
-package Thrift::TException;
-
-use overload '""' => sub {
-    return
-          ref( $_[0] )
-        . " error: "
-        . ( $_[0]->{message} || 'empty message' )
-        . " (code "
-        . ( defined $_[0]->{code} ? $_[0]->{code} : 'undefined' ) . ")";
-    };
-
-sub new {
-    my $classname = shift;
-    my $self = {message => shift, code => shift || 0};
-
-    return bless($self,$classname);
-}
-1;
-
-package TApplicationException;
-use base('Thrift::TException');
-
-use constant UNKNOWN                 => 0;
-use constant UNKNOWN_METHOD          => 1;
-use constant INVALID_MESSAGE_TYPE    => 2;
-use constant WRONG_METHOD_NAME       => 3;
-use constant BAD_SEQUENCE_ID         => 4;
-use constant MISSING_RESULT          => 5;
-use constant INTERNAL_ERROR          => 6;
-use constant PROTOCOL_ERROR          => 7;
-use constant INVALID_TRANSFORM       => 8;
-use constant INVALID_PROTOCOL        => 9;
-use constant UNSUPPORTED_CLIENT_TYPE => 10;
-
-sub new {
-    my $classname = shift;
-
-    my $self = $classname->SUPER::new(@_);
-
-    return bless($self,$classname);
-}
-
-sub read {
-    my $self  = shift;
-    my $input = shift;
-
-    my $xfer  = 0;
-    my $fname = undef;
-    my $ftype = 0;
-    my $fid   = 0;
-
-    $xfer += $input->readStructBegin(\$fname);
-
-    while (1)
-    {
-        $xfer += $input->readFieldBegin(\$fname, \$ftype, \$fid);
-        if ($ftype == TType::STOP) {
-            last; next;
-        }
-
-      SWITCH: for($fid)
-      {
-          /1/ && do{
-
-              if ($ftype == TType::STRING) {
-                  $xfer += $input->readString(\$self->{message});
-              } else {
-                  $xfer += $input->skip($ftype);
-              }
-
-              last;
-          };
-
-          /2/ && do{
-              if ($ftype == TType::I32) {
-                  $xfer += $input->readI32(\$self->{code});
-              } else {
-                  $xfer += $input->skip($ftype);
-              }
-              last;
-          };
-
-          $xfer += $input->skip($ftype);
-      }
-
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-
-    return $xfer;
-}
-
-sub write {
-    my $self   = shift;
-    my $output = shift;
-
-    my $xfer   = 0;
-
-    $xfer += $output->writeStructBegin('TApplicationException');
-
-    if ($self->getMessage()) {
-        $xfer += $output->writeFieldBegin('message', TType::STRING, 1);
-        $xfer += $output->writeString($self->getMessage());
-        $xfer += $output->writeFieldEnd();
-    }
-
-    if ($self->getCode()) {
-        $xfer += $output->writeFieldBegin('type', TType::I32, 2);
-        $xfer += $output->writeI32($self->getCode());
-        $xfer += $output->writeFieldEnd();
-    }
-
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-
-    return $xfer;
-}
-
-sub getMessage
-{
-    my $self = shift;
-
-    return $self->{message};
-}
-
-sub getCode
-{
-    my $self = shift;
-
-    return $self->{code};
-}
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/BinaryProtocol.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/BinaryProtocol.pm
deleted file mode 100644
index c638ead..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/BinaryProtocol.pm
+++ /dev/null
@@ -1,511 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-
-use strict;
-use warnings;
-
-use utf8;
-use Encode;
-
-use Thrift;
-use Thrift::Protocol;
-
-use Bit::Vector;
-
-#
-# Binary implementation of the Thrift protocol.
-#
-package Thrift::BinaryProtocol;
-use base('Thrift::Protocol');
-
-use constant VERSION_MASK   => 0xffff0000;
-use constant VERSION_1      => 0x80010000;
-use constant IS_BIG_ENDIAN  => unpack("h*", pack("s", 1)) =~ /01/;
-
-sub new
-{
-    my $classname = shift;
-    my $trans     = shift;
-    my $self      = $classname->SUPER::new($trans);
-
-    return bless($self,$classname);
-}
-
-sub writeMessageBegin
-{
-    my $self = shift;
-    my ($name, $type, $seqid) = @_;
-
-    return
-        $self->writeI32(VERSION_1 | $type) +
-        $self->writeString($name) +
-        $self->writeI32($seqid);
-}
-
-sub writeMessageEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub writeStructBegin{
-    my $self = shift;
-    my $name = shift;
-    return 0;
-}
-
-sub writeStructEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub writeFieldBegin
-{
-    my $self = shift;
-    my ($fieldName, $fieldType, $fieldId) = @_;
-
-    return
-        $self->writeByte($fieldType) +
-        $self->writeI16($fieldId);
-}
-
-sub writeFieldEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub writeFieldStop
-{
-    my $self = shift;
-    return $self->writeByte(TType::STOP);
-}
-
-sub writeMapBegin
-{
-    my $self = shift;
-    my ($keyType, $valType, $size) = @_;
-
-    return
-        $self->writeByte($keyType) +
-        $self->writeByte($valType) +
-        $self->writeI32($size);
-}
-
-sub writeMapEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub writeListBegin
-{
-    my $self = shift;
-    my ($elemType, $size) = @_;
-
-    return
-        $self->writeByte($elemType) +
-        $self->writeI32($size);
-}
-
-sub writeListEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub writeSetBegin
-{
-    my $self = shift;
-    my ($elemType, $size) = @_;
-
-    return
-        $self->writeByte($elemType) +
-        $self->writeI32($size);
-}
-
-sub writeSetEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub writeBool
-{
-    my $self = shift;
-    my $value = shift;
-
-    my $data = pack('c', $value ? 1 : 0);
-    $self->{trans}->write($data, 1);
-    return 1;
-}
-
-sub writeByte
-{
-    my $self = shift;
-    my $value= shift;
-
-    my $data = pack('c', $value);
-    $self->{trans}->write($data, 1);
-    return 1;
-}
-
-sub writeI16
-{
-    my $self = shift;
-    my $value= shift;
-
-    my $data = pack('n', $value);
-    $self->{trans}->write($data, 2);
-    return 2;
-}
-
-sub writeI32
-{
-    my $self = shift;
-    my $value= shift;
-
-    my $data = pack('N', $value);
-    $self->{trans}->write($data, 4);
-    return 4;
-}
-
-sub writeI64
-{
-    my $self = shift;
-    my $value= shift;
-    my $data;
-
-    my $vec;
-    #stop annoying error
-    $vec = Bit::Vector->new_Dec(64, $value);
-    $data = pack 'NN', $vec->Chunk_Read(32, 32), $vec->Chunk_Read(32, 0);
-
-    $self->{trans}->write($data, 8);
-
-    return 8;
-}
-
-
-sub writeDouble
-{
-    my $self = shift;
-    my $value= shift;
-
-    my $data = pack('d', $value);
-    if (IS_BIG_ENDIAN) {
-      $self->{trans}->write($data, 8);
-    }
-    else {
-      $self->{trans}->write(scalar reverse($data), 8);
-    }
-    return 8;
-}
-
-sub writeString{
-    my $self = shift;
-    my $value= shift;
-
-    if( utf8::is_utf8($value) ){
-        $value = Encode::encode_utf8($value);
-    }
-
-    my $len = length($value);
-
-    my $result = $self->writeI32($len);
-
-    if ($len) {
-        $self->{trans}->write($value,$len);
-    }
-    return $result + $len;
-  }
-
-
-#
-#All references
-#
-sub readMessageBegin
-{
-    my $self = shift;
-    my ($name, $type, $seqid) = @_;
-
-    my $version = 0;
-    my $result = $self->readI32(\$version);
-    if (($version & VERSION_MASK) > 0) {
-      if (($version & VERSION_MASK) != VERSION_1) {
-        die new Thrift::TException('Missing version identifier')
-      }
-      $$type = $version & 0x000000ff;
-      return
-          $result +
-          $self->readString($name) +
-          $self->readI32($seqid);
-    } else { # old client support code
-      return
-        $result +
-        $self->readStringBody($name, $version) + # version here holds the size of the string
-        $self->readByte($type) +
-        $self->readI32($seqid);
-    }
-}
-
-sub readMessageEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub readStructBegin
-{
-    my $self = shift;
-    my $name = shift;
-
-    $$name = '';
-
-    return 0;
-}
-
-sub readStructEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub readFieldBegin
-{
-    my $self = shift;
-    my ($name, $fieldType, $fieldId) = @_;
-
-    my $result = $self->readByte($fieldType);
-
-    if ($$fieldType == TType::STOP) {
-      $$fieldId = 0;
-      return $result;
-    }
-
-    $result += $self->readI16($fieldId);
-
-    return $result;
-}
-
-sub readFieldEnd() {
-    my $self = shift;
-    return 0;
-}
-
-sub readMapBegin
-{
-    my $self = shift;
-    my ($keyType, $valType, $size) = @_;
-
-    return
-        $self->readByte($keyType) +
-        $self->readByte($valType) +
-        $self->readI32($size);
-}
-
-sub readMapEnd()
-{
-    my $self = shift;
-    return 0;
-}
-
-sub readListBegin
-{
-    my $self = shift;
-    my ($elemType, $size) = @_;
-
-    return
-        $self->readByte($elemType) +
-        $self->readI32($size);
-}
-
-sub readListEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub readSetBegin
-{
-    my $self = shift;
-    my ($elemType, $size) = @_;
-
-    return
-        $self->readByte($elemType) +
-        $self->readI32($size);
-}
-
-sub readSetEnd
-{
-    my $self = shift;
-    return 0;
-}
-
-sub readBool
-{
-    my $self  = shift;
-    my $value = shift;
-
-    my $data = $self->{trans}->readAll(1);
-    my @arr = unpack('c', $data);
-    $$value = $arr[0] == 1;
-    return 1;
-}
-
-sub readByte
-{
-    my $self  = shift;
-    my $value = shift;
-
-    my $data = $self->{trans}->readAll(1);
-    my @arr = unpack('c', $data);
-    $$value = $arr[0];
-    return 1;
-}
-
-sub readI16
-{
-    my $self  = shift;
-    my $value = shift;
-
-    my $data  = $self->{trans}->readAll(2);
-
-    my @arr   = unpack('n', $data);
-
-    $$value = $arr[0];
-
-    if ($$value > 0x7fff) {
-      $$value = 0 - (($$value - 1) ^ 0xffff);
-    }
-
-    return 2;
-}
-
-sub readI32
-{
-    my $self = shift;
-    my $value= shift;
-
-    my $data = $self->{trans}->readAll(4);
-    my @arr = unpack('N', $data);
-
-    $$value = $arr[0];
-    if ($$value > 0x7fffffff) {
-      $$value = 0 - (($$value - 1) ^ 0xffffffff);
-    }
-    return 4;
-}
-
-sub readI64
-{
-    my $self  = shift;
-    my $value = shift;
-
-    my $data = $self->{trans}->readAll(8);
-
-    my ($hi,$lo)=unpack('NN',$data);
-
-    my $vec = new Bit::Vector(64);
-
-    $vec->Chunk_Store(32,32,$hi);
-    $vec->Chunk_Store(32,0,$lo);
-
-    $$value = $vec->to_Dec();
-
-    return 8;
-}
-
-sub readDouble
-{
-    my $self  = shift;
-    my $value = shift;
-
-    my $data;
-    if (IS_BIG_ENDIAN) {
-      $data = $self->{trans}->readAll(8);
-    }
-    else {
-      $data = scalar reverse($self->{trans}->readAll(8));
-    }
-    
-    my @arr = unpack('d', $data);
-
-    $$value = $arr[0];
-
-    return 8;
-}
-
-sub readString
-{
-    my $self  = shift;
-    my $value = shift;
-
-    my $len;
-    my $result = $self->readI32(\$len);
-
-    if ($len) {
-      $$value = $self->{trans}->readAll($len);
-    } else {
-      $$value = '';
-    }
-
-    return $result + $len;
-}
-
-sub readStringBody
-{
-    my $self  = shift;
-    my $value = shift;
-    my $len   = shift;
-
-    if ($len) {
-      $$value = $self->{trans}->readAll($len);
-    } else {
-      $$value = '';
-    }
-
-    return $len;
-}
-
-#
-# Binary Protocol Factory
-#
-package Thrift::BinaryProtocolFactory;
-use base('TProtocolFactory');
-
-sub new
-{
-    my $classname = shift;
-    my $self      = $classname->SUPER::new();
-
-    return bless($self,$classname);
-}
-
-sub getProtocol{
-    my $self  = shift;
-    my $trans = shift;
-
-    return new Thrift::BinaryProtocol($trans);
-}
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/BufferedTransport.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/BufferedTransport.pm
deleted file mode 100644
index 3868ca2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/BufferedTransport.pm
+++ /dev/null
@@ -1,136 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Transport;
-
-package Thrift::BufferedTransport;
-use base('Thrift::Transport');
-
-sub new
-{
-    my $classname = shift;
-    my $transport = shift;
-    my $rBufSize  = shift || 512;
-    my $wBufSize  = shift || 512;
-
-    my $self = {
-        transport => $transport,
-        rBufSize  => $rBufSize,
-        wBufSize  => $wBufSize,
-        wBuf      => '',
-        rBuf      => '',
-    };
-
-    return bless($self,$classname);
-}
-
-sub isOpen
-{
-    my $self = shift;
-
-    return $self->{transport}->isOpen();
-}
-
-sub open
-{
-    my $self = shift;
-    $self->{transport}->open();
-}
-
-sub close()
-{
-    my $self = shift;
-    $self->{transport}->close();
-}
-
-sub readAll
-{
-    my $self = shift;
-    my $len  = shift;
-
-    return $self->{transport}->readAll($len);
-}
-
-sub read
-{
-    my $self = shift;
-    my $len  = shift;
-    my $ret;
-
-    # Methinks Perl is already buffering these for us
-    return $self->{transport}->read($len);
-}
-
-sub write
-{
-    my $self = shift;
-    my $buf  = shift;
-
-    $self->{wBuf} .= $buf;
-    if (length($self->{wBuf}) >= $self->{wBufSize}) {
-        $self->{transport}->write($self->{wBuf});
-        $self->{wBuf} = '';
-    }
-}
-
-sub flush
-{
-    my $self = shift;
-
-    if (length($self->{wBuf}) > 0) {
-        $self->{transport}->write($self->{wBuf});
-        $self->{wBuf} = '';
-    }
-    $self->{transport}->flush();
-}
-
-
-#
-# BufferedTransport factory creates buffered transport objects from transports
-#
-package Thrift::BufferedTransportFactory;
-
-sub new {
-    my $classname = shift;
-    my $self      = {};
-
-    return bless($self,$classname);
-}
-
-#
-# Build a buffered transport from the base transport
-#
-# @return Thrift::BufferedTransport transport
-#
-sub getTransport
-{
-    my $self  = shift;
-    my $trans = shift;
-
-    my $buffered = Thrift::BufferedTransport->new($trans);
-    return $buffered;
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/FramedTransport.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/FramedTransport.pm
deleted file mode 100644
index 6f2d2cf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/FramedTransport.pm
+++ /dev/null
@@ -1,193 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Transport;
-
-#
-# Framed transport. Writes and reads data in chunks that are stamped with
-# their length.
-#
-# @package thrift.transport
-#
-package Thrift::FramedTransport;
-
-use base('Thrift::Transport');
-
-sub new
-{
-    my $classname = shift;
-    my $transport = shift;
-    my $read      = shift || 1;
-    my $write     = shift || 1;
-
-    my $self      = {
-        transport => $transport,
-        read      => $read,
-        write     => $write,
-        wBuf      => '',
-        rBuf      => '',
-    };
-
-    return bless($self,$classname);
-}
-
-sub isOpen
-{
-    my $self = shift;
-    return $self->{transport}->isOpen();
-}
-
-sub open
-{
-    my $self = shift;
-
-    $self->{transport}->open();
-}
-
-sub close
-{
-    my $self = shift;
-
-    if (defined $self->{transport}) {
-      $self->{transport}->close();
-    }
-}
-
-#
-# Reads from the buffer. When more data is required reads another entire
-# chunk and serves future reads out of that.
-#
-# @param int $len How much data
-#
-sub read
-{
-
-    my $self = shift;
-    my $len  = shift;
-
-    if (!$self->{read}) {
-        return $self->{transport}->read($len);
-    }
-
-    if (length($self->{rBuf}) == 0) {
-        $self->_readFrame();
-    }
-
-
-    # Just return full buff
-    if ($len > length($self->{rBuf})) {
-        my $out = $self->{rBuf};
-        $self->{rBuf} = '';
-        return $out;
-    }
-
-    # Return substr
-    my $out = substr($self->{rBuf}, 0, $len);
-    $self->{rBuf} = substr($self->{rBuf}, $len);
-    return $out;
-}
-
-#
-# Reads a chunk of data into the internal read buffer.
-# (private)
-sub _readFrame
-{
-    my $self = shift;
-    my $buf  = $self->{transport}->readAll(4);
-    my @val  = unpack('N', $buf);
-    my $sz   = $val[0];
-
-    $self->{rBuf} = $self->{transport}->readAll($sz);
-}
-
-#
-# Writes some data to the pending output buffer.
-#
-# @param string $buf The data
-# @param int    $len Limit of bytes to write
-#
-sub write
-{
-    my $self = shift;
-    my $buf  = shift;
-    my $len  = shift;
-
-    unless($self->{write}) {
-        return $self->{transport}->write($buf, $len);
-    }
-
-    if ( defined $len && $len < length($buf)) {
-        $buf = substr($buf, 0, $len);
-    }
-
-    $self->{wBuf} .= $buf;
-  }
-
-#
-# Writes the output buffer to the stream in the format of a 4-byte length
-# followed by the actual data.
-#
-sub flush
-{
-    my $self = shift;
-
-    unless ($self->{write}) {
-        return $self->{transport}->flush();
-    }
-
-    my $out = pack('N', length($self->{wBuf}));
-    $out .= $self->{wBuf};
-    $self->{transport}->write($out);
-    $self->{transport}->flush();
-    $self->{wBuf} = '';
-
-}
-
-#
-# FramedTransport factory creates framed transport objects from transports
-#
-package Thrift::FramedTransportFactory;
-
-sub new {
-    my $classname = shift;
-    my $self      = {};
-
-    return bless($self, $classname);
-}
-
-#
-# Build a framed transport from the base transport
-#
-# @return Thrift::FramedTransport transport
-#
-sub getTransport
-{
-    my $self  = shift;
-    my $trans = shift;
-
-    my $buffered = Thrift::FramedTransport->new($trans);
-    return $buffered;
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/HttpClient.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/HttpClient.pm
deleted file mode 100644
index d6fc8be..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/HttpClient.pm
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Transport;
-
-use HTTP::Request;
-use LWP::UserAgent;
-use IO::String;
-
-package Thrift::HttpClient;
-
-use base('Thrift::Transport');
-
-sub new
-{
-    my $classname = shift;
-    my $url       = shift || 'http://localhost:9090';
-    my $debugHandler = shift;
-
-    my $out = IO::String->new;
-    binmode($out);
-
-    my $self = {
-        url          => $url,
-        out          => $out,
-        debugHandler => $debugHandler,
-        debug        => 0,
-        sendTimeout  => 100,
-        recvTimeout  => 750,
-        handle       => undef,
-    };
-
-    return bless($self,$classname);
-}
-
-sub setSendTimeout
-{
-    my $self    = shift;
-    my $timeout = shift;
-
-    $self->{sendTimeout} = $timeout;
-}
-
-sub setRecvTimeout
-{
-    my $self    = shift;
-    my $timeout = shift;
-
-    $self->{recvTimeout} = $timeout;
-}
-
-
-#
-#Sets debugging output on or off
-#
-# @param bool $debug
-#
-sub setDebug
-{
-    my $self  = shift;
-    my $debug = shift;
-
-    $self->{debug} = $debug;
-}
-
-#
-# Tests whether this is open
-#
-# @return bool true if the socket is open
-#
-sub isOpen
-{
-    return 1;
-}
-
-sub open {}
-
-#
-# Cleans up the buffer.
-#
-sub close
-{
-    my $self = shift;
-    if (defined($self->{io})) {
-      close($self->{io});
-      $self->{io} = undef;
-    }
-}
-
-#
-# Guarantees that the full amount of data is read.
-#
-# @return string The data, of exact length
-# @throws TTransportException if cannot read data
-#
-sub readAll
-{
-    my $self = shift;
-    my $len  = shift;
-
-    my $buf = $self->read($len);
-
-    if (!defined($buf)) {
-      die new Thrift::TException('TSocket: Could not read '.$len.' bytes from input buffer');
-    }
-    return $buf;
-}
-
-#
-# Read and return string
-#
-sub read
-{
-    my $self = shift;
-    my $len  = shift;
-
-    my $buf;
-
-    my $in = $self->{in};
-
-    if (!defined($in)) {
-      die new Thrift::TException("Response buffer is empty, no request.");
-    }
-    eval {
-      my $ret = sysread($in, $buf, $len);
-      if (! defined($ret)) {
-        die new Thrift::TException("No more data available.");
-      }
-    }; if($@){
-      die new Thrift::TException($@);
-    }
-
-    return $buf;
-}
-
-#
-# Write string
-#
-sub write
-{
-    my $self = shift;
-    my $buf  = shift;
-    $self->{out}->print($buf);
-}
-
-#
-# Flush output (do the actual HTTP/HTTPS request)
-#
-sub flush
-{
-    my $self = shift;
-
-    my $ua = LWP::UserAgent->new('timeout' => ($self->{sendTimeout} / 1000),
-      'agent' => 'Perl/THttpClient'
-     );
-    $ua->default_header('Accept' => 'application/x-thrift');
-    $ua->default_header('Content-Type' => 'application/x-thrift');
-    $ua->cookie_jar({}); # hash to remember cookies between redirects
-
-    my $out = $self->{out};
-    $out->setpos(0); # rewind
-    my $buf = join('', <$out>);
-
-    my $request = new HTTP::Request(POST => $self->{url}, undef, $buf);
-    my $response = $ua->request($request);
-    my $content_ref = $response->content_ref;
-
-    my $in = IO::String->new($content_ref);
-    binmode($in);
-    $self->{in} = $in;
-    $in->setpos(0); # rewind
-
-    # reset write buffer
-    $out = IO::String->new;
-    binmode($out);
-    $self->{out} = $out;
-}
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MemoryBuffer.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MemoryBuffer.pm
deleted file mode 100644
index 0b28687..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MemoryBuffer.pm
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Transport;
-
-package Thrift::MemoryBuffer;
-use base('Thrift::Transport');
-
-sub new
-{
-    my $classname = shift;
-
-    my $bufferSize= shift || 1024;
-
-    my $self = {
-        buffer    => '',
-        bufferSize=> $bufferSize,
-        wPos      => 0,
-        rPos      => 0,
-    };
-
-    return bless($self,$classname);
-}
-
-sub isOpen
-{
-    return 1;
-}
-
-sub open
-{
-
-}
-
-sub close
-{
-
-}
-
-sub peek
-{
-    my $self = shift;
-    return($self->{rPos} < $self->{wPos});
-}
-
-
-sub getBuffer
-{
-    my $self = shift;
-    return $self->{buffer};
-}
-
-sub resetBuffer
-{
-    my $self = shift;
-
-    my $new_buffer  = shift || '';
-
-    $self->{buffer}     = $new_buffer;
-    $self->{bufferSize} = length($new_buffer);
-    $self->{wPos}       = length($new_buffer);
-    $self->{rPos}       = 0;
-}
-
-sub available
-{
-    my $self = shift;
-    return ($self->{wPos} - $self->{rPos});
-}
-
-sub read
-{
-    my $self = shift;
-    my $len  = shift;
-    my $ret;
-
-    my $avail = ($self->{wPos} - $self->{rPos});
-    return '' if $avail == 0;
-
-    #how much to give
-    my $give = $len;
-    $give = $avail if $avail < $len;
-
-    $ret = substr($self->{buffer},$self->{rPos},$give);
-
-    $self->{rPos} += $give;
-
-    return $ret;
-}
-
-sub readAll
-{
-    my $self = shift;
-    my $len  = shift;
-
-    my $avail = ($self->{wPos} - $self->{rPos});
-    if ($avail < $len) {
-        die new TTransportException("Attempt to readAll($len) found only $avail available");
-    }
-
-    my $data = '';
-    my $got = 0;
-
-    while (($got = length($data)) < $len) {
-        $data .= $self->read($len - $got);
-    }
-
-    return $data;
-}
-
-sub write
-{
-    my $self = shift;
-    my $buf  = shift;
-
-    $self->{buffer} .= $buf;
-    $self->{wPos}   += length($buf);
-}
-
-sub flush
-{
-
-}
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MessageType.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MessageType.pm
deleted file mode 100644
index c8902cc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MessageType.pm
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use strict;
-use warnings;
-
-package Thrift::MessageType;
-
-use strict;
-
-use constant CALL 	=> 1;
-use constant REPLY	=> 2;
-use constant EXCEPTION	=> 3;
-use constant ONEWAY 	=> 4;
-
-1;
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MultiplexedProcessor.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MultiplexedProcessor.pm
deleted file mode 100644
index 421bf73..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MultiplexedProcessor.pm
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Protocol;
-use Thrift::MultiplexedProtocol;
-use Thrift::ProtocolDecorator;
-use Thrift::MessageType;
-
-package Thrift::StoredMessageProtocol;
-use base qw(Thrift::ProtocolDecorator);
-
-use strict;
-
-sub new {
-    my $classname = shift;
-    my $protocol  = shift;
-    my $fname  = shift;
-    my $mtype  = shift;
-    my $rseqid  = shift;
-    my $self  = $classname->SUPER::new($protocol);
-
-    $self->{fname} = $fname;
-    $self->{mtype} = $mtype;
-    $self->{rseqid} = $rseqid;
-
-    return bless($self,$classname);
-}
-
-sub readMessageBegin 
-{
-    my $self = shift;
-    my $name = shift;
-    my $type = shift;
-    my $seqid = shift;
-
-    $$name = $self->{fname};
-    $$type = $self->{mtype};
-    $$seqid = $self->{rseqid};
-}
-
-package Thrift::MultiplexedProcessor;
-
-use strict;
-
-sub new {
-    my $classname = shift;
-    my $self      = {};
-    
-    $self->{serviceProcessorMap} = {};
-
-    return bless($self,$classname);
-}
-
-sub registerProcessor {
-    my $self = shift;
-    my $serviceName = shift;
-    my $processor = shift;
-  
-     $self->{serviceProcessorMap}->{$serviceName} = $processor;
-}
-
-sub process{
-    my $self = shift;
-    my $input = shift;
-    my $output = shift;
-
-    #
-    #  Use the actual underlying protocol (e.g. BinaryProtocol) to read the
-    #  message header. This pulls the message "off the wire", which we'll
-    #  deal with at the end of this method.
-    #
-
-    my ($fname, $mtype, $rseqid);
-    $input->readMessageBegin(\$fname, \$mtype, \$rseqid);
-   	
-
-    if ($mtype ne Thrift::MessageType::CALL && $mtype ne Thrift::MessageType::ONEWAY) {
-  	    die new Thrift::TException("This should not have happened!?");
-    }
-  
-    # Extract the service name and the new Message name.
-    if (index($fname, Thrift::MultiplexedProtocol::SEPARATOR) == -1) {
-  	    die new Thrift::TException("Service name not found in message name: {$fname}. Did you " .
-            "forget to use a MultiplexProtocol in your client?");
-    }
-  
-    (my $serviceName, my $messageName) = split(':', $fname, 2);
-  
-    if (!exists($self->{serviceProcessorMap}->{$serviceName})) {
-  	    die new Thrift::TException("Service name not found: {$serviceName}.  Did you forget " .
-            "to call registerProcessor()?");
-    }
-  
-     #Dispatch processing to the stored processor
-     my $processor = $self->{serviceProcessorMap}->{$serviceName};
-     return $processor->process(
-        new Thrift::StoredMessageProtocol($input, $messageName, $mtype, $rseqid), $output
-     );
-}
-
-1;
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MultiplexedProtocol.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MultiplexedProtocol.pm
deleted file mode 100644
index 83a4eaf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/MultiplexedProtocol.pm
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use strict;
-use warnings;
-
-use Thrift::Protocol;
-use Thrift::ProtocolDecorator;
-use Thrift::MessageType;
-
-package Thrift::MultiplexedProtocol;
-use base qw(Thrift::ProtocolDecorator);
-
-use strict;
-
-use constant SEPARATOR 	=> ':';
-
-sub new {
-    my $classname = shift;
-    my $protocol  = shift;
-    my $serviceName  = shift;
-    my $self      = $classname->SUPER::new($protocol);
-    
-    $self->{serviceName} = $serviceName;
-
-    return bless($self,$classname);
-}
-
-#
-# Writes the message header.
-# Prepends the service name to the function name, separated by MultiplexedProtocol::SEPARATOR.
-#
-# @param string $name  Function name.
-# @param int    $type  Message type.
-# @param int    $seqid The sequence id of this message.
-#
-sub writeMessageBegin 
-{
-	my $self = shift;
-    my ($name, $type, $seqid) = @_;
-
-    if ($type == Thrift::MessageType::CALL || $type == Thrift::MessageType::ONEWAY) {
-        my $nameWithService = $self->{serviceName}.SEPARATOR.$name;
-        $self->SUPER::writeMessageBegin($nameWithService, $type, $seqid);
-    }
-    else {
-        $self->SUPER::writeMessageBegin($name, $type, $seqid);	
-    }
-}
-
-1;
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Protocol.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Protocol.pm
deleted file mode 100644
index 3e9f0dd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Protocol.pm
+++ /dev/null
@@ -1,544 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-
-#
-# Protocol exceptions
-#
-package TProtocolException;
-use base('Thrift::TException');
-
-use constant UNKNOWN       => 0;
-use constant INVALID_DATA  => 1;
-use constant NEGATIVE_SIZE => 2;
-use constant SIZE_LIMIT    => 3;
-use constant BAD_VERSION   => 4;
-use constant NOT_IMPLEMENTED => 5;
-use constant DEPTH_LIMIT   => 6;
-
-
-sub new {
-    my $classname = shift;
-
-    my $self = $classname->SUPER::new();
-
-    return bless($self,$classname);
-}
-
-#
-# Protocol base class module.
-#
-package Thrift::Protocol;
-
-sub new {
-    my $classname = shift;
-    my $self      = {};
-
-    my $trans     = shift;
-    $self->{trans}= $trans;
-
-    return bless($self,$classname);
-}
-
-sub getTransport
-{
-    my $self = shift;
-
-    return $self->{trans};
-}
-
-#
-# Writes the message header
-#
-# @param string $name Function name
-# @param int $type message type TMessageType::CALL or TMessageType::REPLY
-# @param int $seqid The sequence id of this message
-#
-sub writeMessageBegin
-{
-    my ($name, $type, $seqid);
-    die "abstract";
-}
-
-#
-# Close the message
-#
-sub writeMessageEnd {
-    die "abstract";
-}
-
-#
-# Writes a struct header.
-#
-# @param string     $name Struct name
-# @throws TException on write error
-# @return int How many bytes written
-#
-sub writeStructBegin {
-    my ($name);
-
-    die "abstract";
-}
-
-#
-# Close a struct.
-#
-# @throws TException on write error
-# @return int How many bytes written
-#
-sub writeStructEnd {
-    die "abstract";
-}
-
-#
-# Starts a field.
-#
-# @param string     $name Field name
-# @param int        $type Field type
-# @param int        $fid  Field id
-# @throws TException on write error
-# @return int How many bytes written
-#
-sub writeFieldBegin {
-    my ($fieldName, $fieldType, $fieldId);
-
-    die "abstract";
-}
-
-sub writeFieldEnd {
-    die "abstract";
-}
-
-sub writeFieldStop {
-    die "abstract";
-}
-
-sub writeMapBegin {
-    my ($keyType, $valType, $size);
-
-    die "abstract";
-}
-
-sub writeMapEnd {
-    die "abstract";
-}
-
-sub writeListBegin {
-    my ($elemType, $size);
-    die "abstract";
-}
-
-sub writeListEnd {
-    die "abstract";
-}
-
-sub writeSetBegin {
-    my ($elemType, $size);
-    die "abstract";
-}
-
-sub writeSetEnd {
-    die "abstract";
-}
-
-sub writeBool {
-    my ($bool);
-    die "abstract";
-}
-
-sub writeByte {
-    my ($byte);
-    die "abstract";
-}
-
-sub writeI16 {
-    my ($i16);
-    die "abstract";
-}
-
-sub writeI32 {
-    my ($i32);
-    die "abstract";
-}
-
-sub writeI64 {
-    my ($i64);
-    die "abstract";
-}
-
-sub writeDouble {
-    my ($dub);
-    die "abstract";
-}
-
-sub writeString
-{
-    my ($str);
-    die "abstract";
-}
-
-#
-# Reads the message header
-#
-# @param string $name Function name
-# @param int $type message type TMessageType::CALL or TMessageType::REPLY
-# @parem int $seqid The sequence id of this message
-#
-sub readMessageBegin
-{
-    my ($name, $type, $seqid);
-    die "abstract";
-}
-
-#
-# Read the close of message
-#
-sub readMessageEnd
-{
-    die "abstract";
-}
-
-sub readStructBegin
-{
-    my($name);
-
-    die "abstract";
-}
-
-sub readStructEnd
-{
-    die "abstract";
-}
-
-sub readFieldBegin
-{
-    my ($name, $fieldType, $fieldId);
-    die "abstract";
-}
-
-sub readFieldEnd
-{
-    die "abstract";
-}
-
-sub readMapBegin
-{
-    my ($keyType, $valType, $size);
-    die "abstract";
-}
-
-sub readMapEnd
-{
-    die "abstract";
-}
-
-sub readListBegin
-{
-    my ($elemType, $size);
-    die "abstract";
-}
-
-sub readListEnd
-{
-    die "abstract";
-}
-
-sub readSetBegin
-{
-    my ($elemType, $size);
-    die "abstract";
-}
-
-sub readSetEnd
-{
-    die "abstract";
-}
-
-sub readBool
-{
-    my ($bool);
-    die "abstract";
-}
-
-sub readByte
-{
-    my ($byte);
-    die "abstract";
-}
-
-sub readI16
-{
-    my ($i16);
-    die "abstract";
-}
-
-sub readI32
-{
-    my ($i32);
-    die "abstract";
-}
-
-sub readI64
-{
-    my ($i64);
-    die "abstract";
-}
-
-sub readDouble
-{
-    my ($dub);
-    die "abstract";
-}
-
-sub readString
-{
-    my ($str);
-    die "abstract";
-}
-
-#
-# The skip function is a utility to parse over unrecognized data without
-# causing corruption.
-#
-# @param TType $type What type is it
-#
-sub skip
-{
-    my $self = shift;
-    my $type = shift;
-
-    my $ref;
-    my $result;
-    my $i;
-
-    if($type == TType::BOOL)
-    {
-        return $self->readBool(\$ref);
-    }
-    elsif($type == TType::BYTE){
-        return $self->readByte(\$ref);
-    }
-    elsif($type == TType::I16){
-        return $self->readI16(\$ref);
-    }
-    elsif($type == TType::I32){
-        return $self->readI32(\$ref);
-    }
-    elsif($type == TType::I64){
-        return $self->readI64(\$ref);
-    }
-    elsif($type == TType::DOUBLE){
-        return $self->readDouble(\$ref);
-    }
-    elsif($type == TType::STRING)
-    {
-        return $self->readString(\$ref);
-    }
-    elsif($type == TType::STRUCT)
-    {
-        $result = $self->readStructBegin(\$ref);
-        while (1) {
-            my ($ftype,$fid);
-            $result += $self->readFieldBegin(\$ref, \$ftype, \$fid);
-            if ($ftype == TType::STOP) {
-                last;
-            }
-            $result += $self->skip($ftype);
-            $result += $self->readFieldEnd();
-        }
-        $result += $self->readStructEnd();
-        return $result;
-    }
-    elsif($type == TType::MAP)
-    {
-        my($keyType,$valType,$size);
-        $result = $self->readMapBegin(\$keyType, \$valType, \$size);
-        for ($i = 0; $i < $size; $i++) {
-          $result += $self->skip($keyType);
-          $result += $self->skip($valType);
-        }
-        $result += $self->readMapEnd();
-        return $result;
-    }
-    elsif($type == TType::SET)
-    {
-        my ($elemType,$size);
-        $result = $self->readSetBegin(\$elemType, \$size);
-        for ($i = 0; $i < $size; $i++) {
-            $result += $self->skip($elemType);
-        }
-        $result += $self->readSetEnd();
-        return $result;
-    }
-    elsif($type == TType::LIST)
-    {
-        my ($elemType,$size);
-        $result = $self->readListBegin(\$elemType, \$size);
-        for ($i = 0; $i < $size; $i++) {
-            $result += $self->skip($elemType);
-        }
-        $result += $self->readListEnd();
-        return $result;
-    }
-
-    die new Thrift::TException("Type $type not recognised --- corrupt data?");
-
-  }
-
-#
-# Utility for skipping binary data
-#
-# @param TTransport $itrans TTransport object
-# @param int        $type   Field type
-#
-sub skipBinary
-{
-    my $self   = shift;
-    my $itrans = shift;
-    my $type   = shift;
-
-    if($type == TType::BOOL)
-    {
-      return $itrans->readAll(1);
-    }
-    elsif($type == TType::BYTE)
-    {
-        return $itrans->readAll(1);
-    }
-    elsif($type == TType::I16)
-    {
-        return $itrans->readAll(2);
-    }
-    elsif($type == TType::I32)
-    {
-        return $itrans->readAll(4);
-    }
-    elsif($type == TType::I64)
-    {
-        return $itrans->readAll(8);
-    }
-    elsif($type == TType::DOUBLE)
-    {
-        return $itrans->readAll(8);
-    }
-    elsif( $type == TType::STRING )
-    {
-        my @len = unpack('N', $itrans->readAll(4));
-        my $len = $len[0];
-        if ($len > 0x7fffffff) {
-            $len = 0 - (($len - 1) ^ 0xffffffff);
-        }
-        return 4 + $itrans->readAll($len);
-    }
-    elsif( $type == TType::STRUCT )
-    {
-        my $result = 0;
-        while (1) {
-          my $ftype = 0;
-          my $fid = 0;
-          my $data = $itrans->readAll(1);
-          my @arr = unpack('c', $data);
-          $ftype = $arr[0];
-          if ($ftype == TType::STOP) {
-            last;
-          }
-          # I16 field id
-          $result += $itrans->readAll(2);
-          $result += $self->skipBinary($itrans, $ftype);
-        }
-        return $result;
-    }
-    elsif($type == TType::MAP)
-    {
-        # Ktype
-        my $data = $itrans->readAll(1);
-        my @arr = unpack('c', $data);
-        my $ktype = $arr[0];
-        # Vtype
-        $data = $itrans->readAll(1);
-        @arr = unpack('c', $data);
-        my $vtype = $arr[0];
-        # Size
-        $data = $itrans->readAll(4);
-        @arr = unpack('N', $data);
-        my $size = $arr[0];
-        if ($size > 0x7fffffff) {
-            $size = 0 - (($size - 1) ^ 0xffffffff);
-        }
-        my $result = 6;
-        for (my $i = 0; $i < $size; $i++) {
-            $result += $self->skipBinary($itrans, $ktype);
-            $result += $self->skipBinary($itrans, $vtype);
-        }
-        return $result;
-    }
-    elsif($type == TType::SET || $type == TType::LIST)
-    {
-        # Vtype
-        my $data = $itrans->readAll(1);
-        my @arr = unpack('c', $data);
-        my $vtype = $arr[0];
-        # Size
-        $data = $itrans->readAll(4);
-        @arr = unpack('N', $data);
-        my $size = $arr[0];
-        if ($size > 0x7fffffff) {
-            $size = 0 - (($size - 1) ^ 0xffffffff);
-        }
-        my $result = 5;
-        for (my $i = 0; $i < $size; $i++) {
-          $result += $self->skipBinary($itrans, $vtype);
-        }
-        return $result;
-    }
-
-    die new Thrift::TException("Type $type not recognised --- corrupt data?");
-}
-
-#
-# Protocol factory creates protocol objects from transports
-#
-package TProtocolFactory;
-
-
-sub new {
-    my $classname = shift;
-    my $self      = {};
-
-    return bless($self,$classname);
-}
-
-#
-# Build a protocol from the base transport
-#
-# @return TProtcol protocol
-#
-sub getProtocol
-{
-    my ($trans);
-    die "interface";
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/ProtocolDecorator.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/ProtocolDecorator.pm
deleted file mode 100644
index 8120200..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/ProtocolDecorator.pm
+++ /dev/null
@@ -1,360 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use strict;
-use warnings;
-
-use Thrift::Protocol;
-
-package Thrift::ProtocolDecorator;
-use base qw(Thrift::Protocol);
-
-sub new {
-    my $classname = shift;
-    my $protocol  = shift;
-    my $self      = $classname->SUPER::new($protocol->getTransport());
-    
-    $self->{concreteProtocol} = $protocol;
-
-    return bless($self,$classname);
-}
-
-#
-# Writes the message header
-#
-# @param string $name Function name
-# @param int $type message type TMessageType::CALL or TMessageType::REPLY
-# @param int $seqid The sequence id of this message
-#
-sub writeMessageBegin {
-    my $self = shift;
-    my ($name, $type, $seqid) = @_;
-     
-      return  $self->{concreteProtocol}->writeMessageBegin($name, $type, $seqid);
-}
-
-#
-# Close the message
-#
-sub writeMessageEnd {
-     my $self = shift;
-     
-     return $self->{concreteProtocol}->writeMessageEnd();
-}
-
-#
-# Writes a struct header.
-#
-# @param string     $name Struct name
-# @throws TException on write error
-# @return int How many bytes written
-#
-sub writeStructBegin {
-    my $self = shift;
-    my ($name) = @_;
-
-    return $self->{concreteProtocol}->writeStructBegin($name);
-}
-
-#
-# Close a struct.
-#
-# @throws TException on write error
-# @return int How many bytes written
-#
-sub writeStructEnd {
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->writeStructEnd();
-}
-
-#
-# Starts a field.
-#
-# @param string     $name Field name
-# @param int        $type Field type
-# @param int        $fid  Field id
-# @throws TException on write error
-# @return int How many bytes written
-#
-sub writeFieldBegin {
-    my $self = shift;
-    my ($fieldName, $fieldType, $fieldId) = @_;
-
-    return $self->{concreteProtocol}->writeFieldBegin($fieldName, $fieldType, $fieldId);
-}
-
-sub writeFieldEnd {
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->writeFieldEnd();
-}
-
-sub writeFieldStop {
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->writeFieldStop();
-}
-
-sub writeMapBegin {
-    my $self = shift;
-    my ($keyType, $valType, $size) = @_;
-
-    return $self->{concreteProtocol}->writeMapBegin($keyType, $valType, $size);
-}
-
-sub writeMapEnd {
-    my $self = shift;
-    
-    return $self->{concreteProtocol}->writeMapEnd();
-}
-
-sub writeListBegin {
-    my $self = shift;
-    my ($elemType, $size) = @_;
-
-    return $self->{concreteProtocol}->writeListBegin($elemType, $size);
-}
-
-sub writeListEnd {
-    my $self = shift;
-    
-    return $self->{concreteProtocol}->writeListEnd();
-}
-
-sub writeSetBegin {
-    my $self = shift;
-    my ($elemType, $size) = @_;
-
-    return $self->{concreteProtocol}->writeSetBegin($elemType, $size);
-}
-
-sub writeSetEnd {
-    my $self = shift;
-    
-    return $self->{concreteProtocol}->writeListEnd();
-}
-
-sub writeBool {
-    my $self = shift;
-    my $bool = shift;
-
-    return $self->{concreteProtocol}->writeBool($bool);
-}
-
-sub writeByte {
-    my $self = shift;
-    my $byte = shift;
-
-    return $self->{concreteProtocol}->writeByte($byte);
-}
-
-sub writeI16 {
-    my $self = shift;
-    my $i16 = shift;
-
-    return $self->{concreteProtocol}->writeI16($i16);
-}
-
-sub writeI32 {
-    my $self = shift;
-    my ($i32) = @_;
-
-    return $self->{concreteProtocol}->writeI32($i32);
- 
-}
-
-sub writeI64 {
-    my $self = shift;
-    my $i64 = shift;
-
-    return $self->{concreteProtocol}->writeI64($i64);
-}
-
-sub writeDouble {
-    my $self = shift;
-    my $dub = shift;
-
-    return $self->{concreteProtocol}->writeDouble($dub);
-}
-
-sub writeString {
-    my $self = shift;
-    my $str = shift;
-
-    return $self->{concreteProtocol}->writeString($str);
-}
-
-#
-# Reads the message header
-#
-# @param string $name Function name
-# @param int $type message type TMessageType::CALL or TMessageType::REPLY
-# @parem int $seqid The sequence id of this message
-#
-sub readMessageBegin
-{
-    my $self = shift;
-    my ($name, $type, $seqid) = @_;
-
-    return $self->{concreteProtocol}->readMessageBegin($name, $type, $seqid);
-}
-
-#
-# Read the close of message
-#
-sub readMessageEnd
-{
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->readMessageEnd();
-}
-
-sub readStructBegin
-{
-    my $self = shift;
-    my $name = shift;
-
-    return $self->{concreteProtocol}->readStructBegin($name);
-}
-
-sub readStructEnd
-{
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->readStructEnd();
-}
-
-sub readFieldBegin
-{
-    my $self = shift;
-    my ($name, $fieldType, $fieldId) = @_;
-
-    return $self->{concreteProtocol}->readFieldBegin($name, $fieldType, $fieldId);
-}
-
-sub readFieldEnd
-{
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->readFieldEnd();
-}
-
-sub readMapBegin
-{
-    my $self = shift;
-    my ($keyType, $valType, $size) = @_;
-
-    return $self->{concreteProtocol}->readMapBegin($keyType, $valType, $size);
-}
-
-sub readMapEnd
-{
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->readMapEnd();
-}
-
-sub readListBegin
-{
-    my $self = shift;
-    my ($elemType, $size) = @_;
-
-    return $self->{concreteProtocol}->readListBegin($elemType, $size);
-}
-
-sub readListEnd
-{
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->readListEnd();
-}
-
-sub readSetBegin
-{
-    my $self = shift;
-    my ($elemType, $size) = @_;
-
-    return $self->{concreteProtocol}->readSetBegin($elemType, $size);
-}
-
-sub readSetEnd
-{
-    my $self = shift;    
-
-    return $self->{concreteProtocol}->readSetEnd();
-}
-
-sub readBool
-{
-    my $self = shift;
-    my $bool = shift;
-
-    return $self->{concreteProtocol}->readBool($bool);
-}
-
-sub readByte
-{
-    my $self = shift;
-    my $byte = shift;
-
-    return $self->{concreteProtocol}->readByte($byte);
-}
-
-sub readI16
-{
-    my $self = shift;
-    my $i16 = shift;
-
-    return $self->{concreteProtocol}->readI16($i16);
-}
-
-sub readI32
-{
-    my $self = shift;
-    my $i32  = shift;
-
-    return $self->{concreteProtocol}->readI32($i32);
-}
-
-sub readI64
-{
-    my $self = shift;
-    my $i64  = shift;
-
-    return $self->{concreteProtocol}->readI64($i64);
-}
-
-sub readDouble
-{
-    my $self = shift;
-    my $dub  = shift;
-
-    return $self->{concreteProtocol}->readDouble($dub);
-}
-
-sub readString
-{
-    my $self = shift;
-    my $str = shift;
-
-    return $self->{concreteProtocol}->readString($str);
-}
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/SSLServerSocket.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/SSLServerSocket.pm
deleted file mode 100644
index 2efdfff..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/SSLServerSocket.pm
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::SSLSocket;
-
-use IO::Socket::SSL;
-use IO::Select;
-
-package Thrift::SSLServerSocket;
-
-use base qw( Thrift::ServerSocket );
-
-#
-# Constructor.
-# Takes a hash:
-# See Thirft::Socket for base class parameters.
-# @param[in]  ca     certificate authority filename - not required
-# @param[in]  cert   certificate filename; may contain key in which case key is not required
-# @param[in]  key    private key filename for the certificate if it is not inside the cert file
-#
-sub new
-{
-    my $classname = shift;
-    my $self      = $classname->SUPER::new(@_);
-    return bless($self, $classname);
-}
-
-sub __client
-{
-	return new Thrift::SSLSocket();
-}
-
-sub __listen
-{
-    my $self = shift;
-    return IO::Socket::SSL->new(LocalAddr     => $self->{host},
-                                LocalPort     => $self->{port},
-                                Proto         => 'tcp',
-                                Listen        => $self->{queue},
-                                ReuseAddr     => 1,
-                                SSL_cert_file => $self->{cert},
-                                SSL_key_file  => $self->{key},
-                                SSL_ca_file   => $self->{ca});
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/SSLSocket.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/SSLSocket.pm
deleted file mode 100644
index 0d2edf8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/SSLSocket.pm
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Transport;
-
-use IO::Socket::SSL;
-use IO::Select;
-
-package Thrift::SSLSocket;
-
-# TODO: Does not provide cipher selection or authentication hooks yet.
-
-use base qw( Thrift::Socket );
-
-sub new
-{
-    my $classname = shift;
-    my $self      = $classname->SUPER::new(@_);
-
-    return bless($self, $classname);
-}
-
-sub __open
-{
-    my $self = shift;
-    return IO::Socket::SSL->new(PeerAddr => $self->{host},
-                                PeerPort => $self->{port},
-                                Proto    => 'tcp',
-                                Timeout  => $self->{sendTimeout} / 1000);
-}
-
-sub __close
-{
-    my $self = shift;
-    my $sock = ($self->{handle}->handles())[0];
-    if ($sock) {
-      $sock->close(SSL_no_shutdown => 1);
-    }
-}
-
-sub __recv
-{
-	my $self = shift;
-	my $sock = shift;
-	my $len = shift;
-	my $buf = undef;
-  if ($sock) {
-    sysread($sock, $buf, $len);
-  }
-  return $buf;
-}
-
-sub __send
-{
-    my $self = shift;
-    my $sock = shift;
-    my $buf = shift;
-    return syswrite($sock, $buf);
-}
-
-sub __wait
-{
-    my $self = shift;
-    my $sock = ($self->{handle}->handles())[0];
-    if ($sock and $sock->pending() eq 0) {
-        return $self->SUPER::__wait();
-    }
-    return $sock;
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Server.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Server.pm
deleted file mode 100644
index ac1e17d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Server.pm
+++ /dev/null
@@ -1,315 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::BufferedTransport;
-use Thrift::BinaryProtocol;
-
-#
-# Server base class module
-#
-package Thrift::Server;
-
-# 3 possible constructors:
-#   1.  (processor, serverTransport)
-#   2.  (processor, serverTransport, transportFactory, protocolFactory)
-#   3.  (processor, serverTransport,
-#        inputTransportFactory, outputTransportFactory,
-#        inputProtocolFactory, outputProtocolFactory)
-sub new
-{
-    my $classname    = shift;
-    my @args         = @_;
-
-    my $self;
-
-    if (scalar @args == 2)
-    {
-      $self = _init($args[0], $args[1],
-                    Thrift::BufferedTransportFactory->new(),
-                    Thrift::BufferedTransportFactory->new(),
-                    Thrift::BinaryProtocolFactory->new(),
-                    Thrift::BinaryProtocolFactory->new());
-    }
-    elsif (scalar @args == 4)
-    {
-      $self = _init($args[0], $args[1], $args[2], $args[2], $args[3], $args[3]);
-    }
-    elsif (scalar @args == 6)
-    {
-      $self = _init($args[0], $args[1], $args[2], $args[3], $args[4], $args[5]);
-    }
-    else
-    {
-      die "Thrift::Server expects exactly 2, 4, or 6 args";
-    }
-
-    return bless($self,$classname);
-}
-
-sub _init
-{
-    my $processor              = shift;
-    my $serverTransport        = shift;
-    my $inputTransportFactory  = shift;
-    my $outputTransportFactory = shift;
-    my $inputProtocolFactory   = shift;
-    my $outputProtocolFactory  = shift;
-
-    my $self = {
-        processor              => $processor,
-        serverTransport        => $serverTransport,
-        inputTransportFactory  => $inputTransportFactory,
-        outputTransportFactory => $outputTransportFactory,
-        inputProtocolFactory   => $inputProtocolFactory,
-        outputProtocolFactory  => $outputProtocolFactory,
-    };
-}
-
-sub serve
-{
-    die "abstract";
-}
-
-sub _clientBegin
-{
-    my $self  = shift;
-    my $iprot = shift;
-    my $oprot = shift;
-
-    if (exists  $self->{serverEventHandler} and
-        defined $self->{serverEventHandler})
-    {
-        $self->{serverEventHandler}->clientBegin($iprot, $oprot);
-    }
-}
-
-sub _handleException
-{
-    my $self = shift;
-    my $e    = shift;
-
-    if ($e =~ m/TException/ and exists $e->{message}) {
-        my $message = $e->{message};
-        my $code    = $e->{code};
-        my $out     = $code . ':' . $message;
-
-        $message =~ m/TTransportException/ and die $out;
-        if ($message =~ m/Socket/) {
-            # suppress Socket messages
-        } else {
-            warn $out;
-        }
-    } else {
-        warn $e;
-    }
-}
-
-#
-# SimpleServer from the Server base class that handles one connection at a time
-#
-package Thrift::SimpleServer;
-use base qw( Thrift::Server );
-
-sub new
-{
-    my $classname = shift;
-    my @args      = @_;
-
-    my $self      = $classname->SUPER::new(@args);
-    return bless($self,$classname);
-}
-
-sub serve
-{
-    my $self = shift;
-
-    $self->{serverTransport}->listen();
-    while (1)
-    {
-        my $client = $self->{serverTransport}->accept();
-        my $itrans = $self->{inputTransportFactory}->getTransport($client);
-        my $otrans = $self->{outputTransportFactory}->getTransport($client);
-        my $iprot  = $self->{inputProtocolFactory}->getProtocol($itrans);
-        my $oprot  = $self->{outputProtocolFactory}->getProtocol($otrans);
-        eval {
-            $self->_clientBegin($iprot, $oprot);
-            while (1)
-            {
-                $self->{processor}->process($iprot, $oprot);
-            }
-        }; if($@) {
-            $self->_handleException($@);
-        }
-
-        $itrans->close();
-        $otrans->close();
-    }
-}
-
-
-#
-# ForkingServer that forks a new process for each request
-#
-package Thrift::ForkingServer;
-use base qw( Thrift::Server );
-
-use POSIX ":sys_wait_h";
-
-sub new
-{
-    my $classname = shift;
-    my @args      = @_;
-
-    my $self      = $classname->SUPER::new(@args);
-    return bless($self,$classname);
-}
-
-
-sub serve
-{
-    my $self = shift;
-
-    # THRIFT-3848: without ignoring SIGCHLD, perl ForkingServer goes into a tight loop
-    $SIG{CHLD} = 'IGNORE';
-
-    $self->{serverTransport}->listen();
-    while (1)
-    {
-        my $client = $self->{serverTransport}->accept();
-        $self->_client($client);
-    }
-}
-
-sub _client
-{
-    my $self   = shift;
-    my $client = shift;
-
-    eval {
-        my $itrans = $self->{inputTransportFactory}->getTransport($client);
-        my $otrans = $self->{outputTransportFactory}->getTransport($client);
-
-        my $iprot  = $self->{inputProtocolFactory}->getProtocol($itrans);
-        my $oprot  = $self->{outputProtocolFactory}->getProtocol($otrans);
-
-        $self->_clientBegin($iprot, $oprot);
-
-        my $pid = fork();
-
-        if ($pid) #parent
-        {
-            $self->_parent($pid, $itrans, $otrans);
-        } else {
-            $self->_child($itrans, $otrans, $iprot, $oprot);
-        }
-    }; if($@) {
-        $self->_handleException($@);
-    }
-}
-
-sub _parent
-{
-    my $self   = shift;
-    my $pid    = shift;
-    my $itrans = shift;
-    my $otrans = shift;
-
-    # add before collect, otherwise you race w/ waitpid
-    $self->{children}->{$pid} = 1;
-    $self->_collectChildren();
-
-    # Parent must close socket or the connection may not get closed promptly
-    $self->tryClose($itrans);
-    $self->tryClose($otrans);
-}
-
-sub _child
-{
-    my $self   = shift;
-    my $itrans = shift;
-    my $otrans = shift;
-    my $iprot  = shift;
-    my $oprot  = shift;
-
-    my $ecode = 0;
-    eval {
-        while (1)
-        {
-            $self->{processor}->process($iprot, $oprot);
-        }
-    }; if($@) {
-        $ecode = 1;
-        $self->_handleException($@);
-    }
-
-    $self->tryClose($itrans);
-    $self->tryClose($otrans);
-
-    exit($ecode);
-}
-
-sub tryClose
-{
-    my $self = shift;
-    my $file = shift;
-
-    eval {
-        if (defined $file)
-        {
-          $file->close();
-        }
-    }; if($@) {
-        if ($@ =~ m/TException/ and exists $@->{message}) {
-            my $message = $@->{message};
-            my $code    = $@->{code};
-            my $out     = $code . ':' . $message;
-
-            warn $out;
-        } else {
-            warn $@;
-        }
-    }
-}
-
-sub _collectChildren
-{
-    my $self = shift;
-
-    while (scalar keys %{$self->{children}})
-    {
-        my $pid    = waitpid(-1, WNOHANG);
-
-        if ($pid>0)
-        {
-            delete $self->{children}->{$pid};
-        }
-        else
-        {
-            last;
-        }
-    }
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/ServerSocket.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/ServerSocket.pm
deleted file mode 100644
index 89664f6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/ServerSocket.pm
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use IO::Socket::INET;
-use IO::Select;
-use Thrift;
-use Thrift::Socket;
-
-package Thrift::ServerSocket;
-
-use base qw( Thrift::ServerTransport );
-
-#
-# Constructor.
-# Legacy construction takes one argument, port number.
-# New construction takes a hash:
-# @param[in]  host   host interface to listen on (undef = all interfaces)
-# @param[in]  port   port number to listen on (required)
-# @param[in]  queue  the listen queue size (default if not specified is 128)
-# @example    my $serversock = new Thrift::ServerSocket(host => undef, port => port)
-#
-sub new
-{
-    my $classname = shift;
-    my $args      = shift;
-    my $self;
-    
-    # Support both old-style "port number" construction and newer...
-    if (ref($args) eq 'HASH') {
-        $self = $args;
-    } else {
-        $self = { port => $args };
-    }
-
-    if (not defined $self->{queue}) {
-        $self->{queue} = 128;
-    }
-    
-    return bless($self, $classname);
-}
-
-sub listen
-{
-    my $self = shift;
-
-    my $sock = $self->__listen() || do {
-        my $error = ref($self) . ': Could not bind to ' . '*:' . $self->{port} . ' (' . $! . ')';
-
-        if ($self->{debug}) {
-            $self->{debugHandler}->($error);
-        }
-
-        die new Thrift::TException($error);
-    };
-
-    $self->{handle} = $sock;
-}
-
-sub accept
-{
-    my $self = shift;
-
-    if ( exists $self->{handle} and defined $self->{handle} )
-    {
-        my $client        = $self->{handle}->accept();
-        my $result        = $self->__client();
-        $result->{handle} = new IO::Select($client);
-        return $result;
-    }
-
-    return 0;
-}
-
-###
-### Overridable methods
-###
-
-sub __client
-{
-	return new Thrift::Socket();
-}
-
-sub __listen
-{
-    my $self = shift;
-    return IO::Socket::INET->new(LocalAddr => $self->{host},
-                                 LocalPort => $self->{port},
-                                 Proto     => 'tcp',
-                                 Listen    => $self->{queue},
-                                 ReuseAddr => 1);
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Socket.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Socket.pm
deleted file mode 100644
index eaf8b9e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Socket.pm
+++ /dev/null
@@ -1,317 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Transport;
-
-use IO::Socket::INET;
-use IO::Select;
-
-package Thrift::Socket;
-
-use base qw( Thrift::Transport );
-
-sub new
-{
-    my $classname    = shift;
-    my $host         = shift || "localhost";
-    my $port         = shift || 9090;
-    my $debugHandler = shift;
-
-    my $self = {
-        host         => $host,
-        port         => $port,
-        debugHandler => $debugHandler,
-        debug        => 0,
-        sendTimeout  => 10000,
-        recvTimeout  => 10000,
-        handle       => undef,
-    };
-
-    return bless($self,$classname);
-}
-
-
-sub setSendTimeout
-{
-    my $self    = shift;
-    my $timeout = shift;
-
-    $self->{sendTimeout} = $timeout;
-}
-
-sub setRecvTimeout
-{
-    my $self    = shift;
-    my $timeout = shift;
-
-    $self->{recvTimeout} = $timeout;
-}
-
-
-#
-#Sets debugging output on or off
-#
-# @param bool $debug
-#
-sub setDebug
-{
-    my $self  = shift;
-    my $debug = shift;
-
-    $self->{debug} = $debug;
-}
-
-#
-# Tests whether this is open
-#
-# @return bool true if the socket is open
-#
-sub isOpen
-{
-    my $self = shift;
-
-    if( defined $self->{handle} ){
-        return ($self->{handle}->handles())[0]->connected;
-    }
-
-    return 0;
-}
-
-#
-# Connects the socket.
-#
-sub open
-{
-    my $self = shift;
-
-    my $sock = $self->__open() || do {
-        my $error = ref($self).': Could not connect to '.$self->{host}.':'.$self->{port}.' ('.$!.')';
-
-        if ($self->{debug}) {
-            $self->{debugHandler}->($error);
-        }
-
-        die new Thrift::TException($error);
-    };
-
-    $self->{handle} = new IO::Select( $sock );
-}
-
-#
-# Closes the socket.
-#
-sub close
-{
-    my $self = shift;
-    if( defined $self->{handle} ) {
-    	$self->__close();
-    }
-}
-
-#
-# Uses stream get contents to do the reading
-#
-# @param int $len How many bytes
-# @return string Binary data
-#
-sub readAll
-{
-    my $self = shift;
-    my $len  = shift;
-
-
-    return unless defined $self->{handle};
-
-    my $pre = "";
-    while (1) {
-
-        my $sock = $self->__wait();
-        my $buf = $self->__recv($sock, $len);
-
-        if (!defined $buf || $buf eq '') {
-
-            die new Thrift::TException(ref($self).': Could not read '.$len.' bytes from '.
-                               $self->{host}.':'.$self->{port});
-
-        } elsif ((my $sz = length($buf)) < $len) {
-
-            $pre .= $buf;
-            $len -= $sz;
-
-        } else {
-            return $pre.$buf;
-        }
-    }
-}
-
-#
-# Read from the socket
-#
-# @param int $len How many bytes
-# @return string Binary data
-#
-sub read
-{
-    my $self = shift;
-    my $len  = shift;
-
-    return unless defined $self->{handle};
-
-    my $sock = $self->__wait();
-    my $buf = $self->__recv($sock, $len);
-
-    if (!defined $buf || $buf eq '') {
-
-        die new TException(ref($self).': Could not read '.$len.' bytes from '.
-                           $self->{host}.':'.$self->{port});
-
-    }
-
-    return $buf;
-}
-
-
-#
-# Write to the socket.
-#
-# @param string $buf The data to write
-#
-sub write
-{
-    my $self = shift;
-    my $buf  = shift;
-
-    return unless defined $self->{handle};
-
-    while (length($buf) > 0) {
-        #check for timeout
-        my @sockets = $self->{handle}->can_write( $self->{sendTimeout} / 1000 );
-
-        if(@sockets == 0){
-            die new Thrift::TException(ref($self).': timed out writing to bytes from '.
-                                       $self->{host}.':'.$self->{port});
-        }
-
-        my $sent = $self->__send($sockets[0], $buf);
-
-        if (!defined $sent || $sent == 0 ) {
-            
-            die new Thrift::TException(ref($self).': Could not write '.length($buf).' bytes '.
-                                 $self->{host}.':'.$self->{host});
-
-        }
-
-        $buf = substr($buf, $sent);
-    }
-}
-
-#
-# Flush output to the socket.
-#
-sub flush
-{
-    my $self = shift;
-
-    return unless defined $self->{handle};
-
-    my $ret = ($self->{handle}->handles())[0]->flush;
-}
-
-###
-### Overridable methods
-###
-
-#
-# Open a connection to a server.
-#
-sub __open
-{
-    my $self = shift;
-    return IO::Socket::INET->new(PeerAddr => $self->{host},
-                                 PeerPort => $self->{port},
-                                 Proto    => 'tcp',
-                                 Timeout  => $self->{sendTimeout} / 1000);
-}
-
-#
-# Close the connection
-#
-sub __close
-{
-	my $self = shift;
-    CORE::close(($self->{handle}->handles())[0]);
-}
-
-#
-# Read data
-#
-# @param[in] $sock the socket
-# @param[in] $len the length to read
-# @returns the data buffer that was read
-#
-sub __recv
-{
-	my $self = shift;
-	my $sock = shift;
-	my $len = shift;
-	my $buf = undef;
-	$sock->recv($buf, $len);
-	return $buf;
-}
-
-#
-# Send data
-#
-# @param[in] $sock the socket
-# @param[in] $buf the data buffer
-# @returns the number of bytes written
-#
-sub __send
-{
-    my $self = shift;
-    my $sock = shift;
-    my $buf = shift;
-    return $sock->send($buf);
-}
-
-#
-# Wait for data to be readable
-#
-# @returns a socket that can be read
-#
-sub __wait
-{
-    my $self = shift;
-    my @sockets = $self->{handle}->can_read( $self->{recvTimeout} / 1000 );
-
-    if (@sockets == 0) {
-        die new Thrift::TException(ref($self).': timed out reading from '.
-                                   $self->{host}.':'.$self->{port});
-    }
-
-    return $sockets[0];
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Transport.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Transport.pm
deleted file mode 100644
index 5ec6fee..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/Transport.pm
+++ /dev/null
@@ -1,177 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-
-#
-# Transport exceptions
-#
-package TTransportException;
-use base('Thrift::TException');
-
-use constant UNKNOWN      => 0;
-use constant NOT_OPEN     => 1;
-use constant ALREADY_OPEN => 2;
-use constant TIMED_OUT    => 3;
-use constant END_OF_FILE  => 4;
-
-sub new{
-    my $classname = shift;
-    my $self      = $classname->SUPER::new(@_);
-
-    return bless($self,$classname);
-}
-
-package Thrift::Transport;
-
-#
-# Whether this transport is open.
-#
-# @return boolean true if open
-#
-sub isOpen
-{
-    die "abstract";
-}
-
-#
-# Open the transport for reading/writing
-#
-# @throws TTransportException if cannot open
-#
-sub open
-{
-    die "abstract";
-}
-
-#
-# Close the transport.
-#
-sub close
-{
-    die "abstract";
-}
-
-#
-# Read some data into the array.
-#
-# @param int    $len How much to read
-# @return string The data that has been read
-# @throws TTransportException if cannot read any more data
-#
-sub read
-{
-    my ($len);
-    die("abstract");
-}
-
-#
-# Guarantees that the full amount of data is read.
-#
-# @return string The data, of exact length
-# @throws TTransportException if cannot read data
-#
-sub readAll
-{
-    my $self = shift;
-    my $len  = shift;
-
-    my $data = '';
-    my $got = 0;
-
-    while (($got = length($data)) < $len) {
-        $data .= $self->read($len - $got);
-    }
-
-    return $data;
-}
-
-#
-# Writes the given data out.
-#
-# @param string $buf  The data to write
-# @throws TTransportException if writing fails
-#
-sub write
-{
-    my ($buf);
-    die "abstract";
-}
-
-#
-# Flushes any pending data out of a buffer
-#
-# @throws TTransportException if a writing error occurs
-#
-sub flush {}
-
-
-#
-# TransportFactory creates transport objects from transports
-#
-package Thrift::TransportFactory;
-
-sub new {
-    my $classname = shift;
-    my $self      = {};
-
-    return bless($self,$classname);
-}
-
-#
-# Build a transport from the base transport
-#
-# @return Thrift::Transport transport
-#
-sub getTransport
-{
-    my $self  = shift;
-    my $trans = shift;
-
-    return $trans;
-}
-
-
-#
-#  ServerTransport base class module
-#
-package Thrift::ServerTransport;
-
-sub listen
-{
-    die "abstract";
-}
-
-sub accept
-{
-    die "abstract";
-}
-
-sub close
-{
-    die "abstract";
-}
-
-
-1;
-
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/UnixServerSocket.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/UnixServerSocket.pm
deleted file mode 100644
index 3251a00..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/UnixServerSocket.pm
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::UnixSocket;
-
-use IO::Socket::UNIX;
-use IO::Select;
-
-package Thrift::UnixServerSocket;
-
-use base qw( Thrift::ServerSocket );
-
-#
-# Constructor.
-# If a single argument is given that is not a hash, that is the unix domain socket path.
-# If a single argument is given that is a hash:
-# @param[in]  path   unix domain socket file name
-# @param[in]  queue  the listen queue size (default is not specified is supplied by ServerSocket)
-# @example    my $serversock = new Thrift::UnixServerSocket($path);
-# @example    my $serversock = new Thrift::UnixServerSocket(path => "somepath", queue => 64);
-#
-sub new
-{
-    my $classname = shift;
-    my $args      = shift;
-    my $self;
-
-    if (ref($args) eq 'HASH') {
-        $self = $classname->SUPER::new($args);
-    } else {
-        $self = $classname->SUPER::new();
-        $self->{path} = $args;
-    }
-
-    return bless($self, $classname);
-}
-
-sub __client
-{
-	return new Thrift::UnixSocket();
-}
-
-sub __listen
-{
-    my $self = shift;
-
-    my $sock = IO::Socket::UNIX->new(
-        Type      => IO::Socket::SOCK_STREAM,
-        Local     => $self->{path},
-        Listen    => $self->{queue})
-    || do {
-        my $error = 'UnixServerSocket: Could not bind to ' .
-                    $self->{path} . ' (' . $! . ')';
-        if ($self->{debug}) {
-            $self->{debugHandler}->($error);
-        }
-        die new Thrift::TException($error);
-    };
-
-    return $sock;
-}
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/UnixSocket.pm b/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/UnixSocket.pm
deleted file mode 100644
index e8317b6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/lib/Thrift/UnixSocket.pm
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Transport;
-
-use IO::Socket::UNIX;
-use IO::Select;
-
-package Thrift::UnixSocket;
-
-use base qw( Thrift::Socket );
-
-#
-# Constructor.
-# Takes a unix domain socket filename.
-# See Thirft::Socket for base class parameters.
-# @param[in]  path   path to unix socket file
-# @example    my $sock = new Thrift::UnixSocket($path);
-#
-sub new
-{
-    my $classname = shift;
-    my $self      = $classname->SUPER::new();
-    $self->{path} = shift;     
-    return bless($self, $classname);
-}
-
-sub __open
-{
-    my $self = shift;
-
-    my $sock = IO::Socket::UNIX->new(
-        Type      => IO::Socket::SOCK_STREAM,
-        Peer      => $self->{path})
-    || do {
-        my $error = 'UnixSocket: Could not connect to ' .
-            $self->{path} . ' (' . $! . ')';
-        if ($self->{debug}) {
-            $self->{debugHandler}->($error);
-        }
-        die new Thrift::TException($error);
-    };
-
-    return $sock;
-}
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/test.pl b/vendor/git.apache.org/thrift.git/lib/perl/test.pl
deleted file mode 100644
index 7e06840..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/test.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use strict;
-use warnings;
-
-use Test::Harness;
-
-runtests(@ARGV);
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/perl/test/Makefile.am
deleted file mode 100644
index de03971..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/test/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-EXTRA_DIST = memory_buffer.t processor.t multiplex.t
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/test/memory_buffer.t b/vendor/git.apache.org/thrift.git/lib/perl/test/memory_buffer.t
deleted file mode 100644
index 8fa9fd7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/test/memory_buffer.t
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use Test::More tests => 6;
-
-use strict;
-use warnings;
-
-use Data::Dumper;
-
-use Thrift::BinaryProtocol;
-use Thrift::MemoryBuffer;
-
-use ThriftTest::Types;
-
-
-my $transport = Thrift::MemoryBuffer->new();
-my $protocol = Thrift::BinaryProtocol->new($transport);
-
-my $a = ThriftTest::Xtruct->new();
-$a->i32_thing(10);
-$a->i64_thing(30);
-$a->string_thing('Hello, world!');
-$a->write($protocol);
-
-my $b = ThriftTest::Xtruct->new();
-$b->read($protocol);
-is($b->i32_thing, $a->i32_thing);
-is($b->i64_thing, $a->i64_thing);
-is($b->string_thing, $a->string_thing);
-
-$b->write($protocol);
-my $c = ThriftTest::Xtruct->new();
-$c->read($protocol);
-is($c->i32_thing, $a->i32_thing);
-is($c->i64_thing, $a->i64_thing);
-is($c->string_thing, $a->string_thing);
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/test/multiplex.t b/vendor/git.apache.org/thrift.git/lib/perl/test/multiplex.t
deleted file mode 100644
index 76f2706..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/test/multiplex.t
+++ /dev/null
@@ -1,203 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use Test::More tests => 6;
-
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::Socket;
-use Thrift::Server;
-use Thrift::MultiplexedProcessor;
-use Thrift::BinaryProtocol;
-use Thrift::MemoryBuffer;
-use Thrift::FramedTransport;
-use Thrift::MemoryBuffer;
-
-
-use BenchmarkService;
-use Aggr;
-
-use constant NAME_BENCHMARKSERVICE => 'BenchmarkService';
-use constant NAME_AGGR  =>  'Aggr';
-
-my $buffer    = Thrift::MemoryBuffer->new(1024);
-my $aggr_protocol  = Thrift::MultiplexedProtocol->new(Thrift::BinaryProtocol->new($buffer), NAME_AGGR);
-my $aggr_client    = AggrClient->new($aggr_protocol);
-my $benchmark_protocol = Thrift::MultiplexedProtocol->new(Thrift::BinaryProtocol->new($buffer), NAME_BENCHMARKSERVICE);
-my $benchmark_client = BenchmarkServiceClient->new($benchmark_protocol); 
-
-$buffer->open();
-
-for(my $i = 1; $i <= 5; $i++) {
-    $aggr_client->send_addValue($i);
-    $aggr_client->{seqid}++;
-}
-
-$aggr_client->send_getValues();
-
-for(my $i = 1; $i <= 5; $i++) {
-    $benchmark_client->send_fibonacci($i);
-    $benchmark_client->{seqid}++;
-}
-$benchmark_client->{seqid}--;
-
-my $client_command_binary = $buffer->getBuffer;
-$buffer->resetBuffer;
-
-
-# Process by server
-my $server_output_binary;
-{
-    my $benchmark_handler = My::BenchmarkService->new();
-    my $benchmark_processor = BenchmarkServiceProcessor->new($benchmark_handler);
-    my $aggr_handler = My::Aggr->new(); 
-    my $aggr_processor = AggrProcessor->new($aggr_handler);
-    
-    my $protocol_factory = Thrift::BinaryProtocolFactory->new();
-
-    my $input_buffer    = Thrift::MemoryBuffer->new();
-    $input_buffer->write($client_command_binary);
-
-    my $input_protocol  = $protocol_factory->getProtocol($input_buffer);
-
-    my $output_buffer   = Thrift::MemoryBuffer->new();
-    my $output_protocol = $protocol_factory->getProtocol($output_buffer);
-
-    my $processor = Thrift::MultiplexedProcessor->new();
-
-    $processor->registerProcessor(NAME_BENCHMARKSERVICE, $benchmark_processor);
-    $processor->registerProcessor(NAME_AGGR, $aggr_processor);
-    my $result;
-    for(my $i = 1; $i <= 11; $i++) {
-        $result = $processor->process($input_protocol, $output_protocol);
-        print "process resulted in $result\n";
-    }
-
-    $server_output_binary = $output_buffer->getBuffer();
-}
-
-$buffer->write($server_output_binary);
-
-
-
-for(my $i = 1; $i <= 5; $i++) {
-    my ($function_name, $message_type, $sequence_id);
-
-    $aggr_protocol->readMessageBegin(\$function_name, \$message_type, \$sequence_id);
-
-    if ($message_type == TMessageType::EXCEPTION) {
-       die;
-    }
-    
-    my $aggr_result = Aggr_addValue_result->new();
-    $aggr_result->read($aggr_protocol);
-    $aggr_protocol->readMessageEnd();
-}
-
-my ($function_name, $message_type, $sequence_id);
-
-$aggr_protocol->readMessageBegin(\$function_name, \$message_type, \$sequence_id);
-
-if ($message_type == TMessageType::EXCEPTION) {
-    die;
-}
-    
-my $aggr_result = Aggr_getValues_result->new();
-$aggr_result->read($aggr_protocol);
-$aggr_protocol->readMessageEnd();
-
-is_deeply($aggr_result->success(), [1,2,3,4,5]);
- 
-
-foreach my $val((1,2,3,5,8)) {
-    my ($function_name, $message_type, $sequence_id);
-
-    $benchmark_protocol->readMessageBegin(\$function_name, \$message_type, \$sequence_id);
-
-    if ($message_type == TMessageType::EXCEPTION) {
-        die;
-    }
-    my $benchmark_result = BenchmarkService_fibonacci_result->new();
-    $benchmark_result->read($benchmark_protocol);
-    $benchmark_protocol->readMessageEnd();
-    
-    is($benchmark_result->success(), $val);
-}
-
-
-package My::Aggr;
-use base qw(AggrIf); 
-
-use strict;
-use warnings; 
-
-sub new {
-    my $classname = shift;
-    my $self      = {};
-    
-    $self->{values} = ();
-
-    return bless($self,$classname);
-}
-
-sub addValue{
-    my $self = shift;
-    my $value = shift;
-
-    push (@{$self->{values}}, $value);  
-}
-
-sub getValues{
-    my $self = shift;
-    
-   return $self->{values};
-}
-
-
-
-package My::BenchmarkService;
-use base qw(BenchmarkServiceIf);
-
-use strict;
-use warnings;
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-}
-
-sub fibonacci {
-    my ($self, $n) = @_;
-    
-    my $prev = 0;
-    my $next;
-    my $result = 1;
-    
-    while ($n > 0) {
-        $next = $result + $prev;
-        $prev = $result;
-        $result = $next;
-        --$n;
-    }
-    
-    return $result;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/perl/test/processor.t b/vendor/git.apache.org/thrift.git/lib/perl/test/processor.t
deleted file mode 100644
index 1d8be73..0000000
--- a/vendor/git.apache.org/thrift.git/lib/perl/test/processor.t
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use Test::More tests => 2;
-
-use strict;
-use warnings;
-
-use Thrift;
-use Thrift::BinaryProtocol;
-use Thrift::MemoryBuffer;
-
-use ThriftTest::ThriftTest;
-use ThriftTest::Types;
-
-use Data::Dumper;
-
-my $buffer    = Thrift::MemoryBuffer->new(1024);
-my $protocol  = Thrift::BinaryProtocol->new($buffer);
-my $client    = ThriftTest::ThriftTestClient->new($protocol);
-
-$buffer->open();
-$client->send_testString("foo");
-$client->{seqid}++;
-$client->send_testString("bar");
-
-my $client_command_binary = $buffer->getBuffer;
-$buffer->resetBuffer;
-
-# Process by server
-
-my $server_output_binary;
-{
-    my $protocol_factory = Thrift::BinaryProtocolFactory->new();
-
-    my $input_buffer    = Thrift::MemoryBuffer->new();
-    $input_buffer->write($client_command_binary);
-    my $input_protocol  = $protocol_factory->getProtocol($input_buffer);
-
-    my $output_buffer   = Thrift::MemoryBuffer->new();
-    my $output_protocol = $protocol_factory->getProtocol($output_buffer);
-
-    my $processor = ThriftTest::ThriftTestProcessor->new( My::ThriftTest->new() );
-    my $result = $processor->process($input_protocol, $output_protocol);
-    print "process resulted in $result\n";
-    $result = $processor->process($input_protocol, $output_protocol);
-    print "process resulted in $result\n";
-    $server_output_binary = $output_buffer->getBuffer();
-}
-
-$buffer->write($server_output_binary);
-
-foreach my $val (("got foo","got bar")){
-    my ($function_name, $message_type, $sequence_id);
-
-    $protocol->readMessageBegin(\$function_name, \$message_type, \$sequence_id);
-    print "  $function_name, $message_type, $sequence_id\n";
-
-    if ($message_type == TMessageType::EXCEPTION) {
-        die;
-    }
-
-    my $result = ThriftTest::ThriftTest_testString_result->new();
-    $result->read($protocol);
-    $protocol->readMessageEnd();
-
-    is($result->success(),$val);
-}
-
-
-package My::ThriftTest;
-
-use strict;
-use warnings;
-use Data::Dumper;
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-}
-
-sub testString {
-    my ($self, $string) = @_;
-
-    print __PACKAGE__ . "->testString()\n";
-
-    return "got ".$string;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/Makefile.am b/vendor/git.apache.org/thrift.git/lib/php/Makefile.am
deleted file mode 100755
index 8e62960..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/Makefile.am
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-if WITH_TESTS
-SUBDIRS = test
-endif
-
-if WITH_PHP_EXTENSION
-%.so:
-	cd src/ext/thrift_protocol/ && $(MAKE)
-
-phpconfdir=$(PHP_CONFIG_PREFIX)
-phpconf_DATA=thrift_protocol.ini
-
-phpmoduledir = `php-config --extension-dir`
-phpmodule_SCRIPTS = src/ext/thrift_protocol/modules/thrift_protocol.so
-
-distclean-local:
-	cd $(phpmodule_SCRIPTS) && $(PHPIZE) --clean
-
-endif
-
-phpdir = $(PHP_PREFIX)/Thrift
-php_DATA = \
-  lib/Thrift/TMultiplexedProcessor.php
-
-phpbasedir = $(phpdir)/Base
-phpbase_DATA = \
-  lib/Thrift/Base/TBase.php
-
-phpclassloaderdir = $(phpdir)/ClassLoader
-phpclassloader_DATA = \
-  lib/Thrift/ClassLoader/ThriftClassLoader.php
-
-phpexceptiondir = $(phpdir)/Exception
-phpexception_DATA = \
-  lib/Thrift/Exception/TApplicationException.php \
-  lib/Thrift/Exception/TException.php \
-  lib/Thrift/Exception/TProtocolException.php \
-  lib/Thrift/Exception/TTransportException.php
-
-phpfactorydir = $(phpdir)/Factory
-phpfactory_DATA = \
-  lib/Thrift/Factory/TBinaryProtocolFactory.php \
-  lib/Thrift/Factory/TCompactProtocolFactory.php \
-  lib/Thrift/Factory/TJSONProtocolFactory.php \
-  lib/Thrift/Factory/TProtocolFactory.php \
-  lib/Thrift/Factory/TStringFuncFactory.php \
-  lib/Thrift/Factory/TTransportFactory.php
-
-phpprotocoldir = $(phpdir)/Protocol
-phpprotocol_DATA = \
-  lib/Thrift/Protocol/TBinaryProtocolAccelerated.php \
-  lib/Thrift/Protocol/TBinaryProtocol.php \
-  lib/Thrift/Protocol/TCompactProtocol.php \
-  lib/Thrift/Protocol/TJSONProtocol.php \
-  lib/Thrift/Protocol/TMultiplexedProtocol.php \
-  lib/Thrift/Protocol/TProtocol.php \
-  lib/Thrift/Protocol/TProtocolDecorator.php \
-  lib/Thrift/Protocol/TSimpleJSONProtocol.php
-
-phpprotocoljsondir = $(phpprotocoldir)/JSON
-phpprotocoljson_DATA = \
-  lib/Thrift/Protocol/JSON/BaseContext.php \
-  lib/Thrift/Protocol/JSON/ListContext.php \
-  lib/Thrift/Protocol/JSON/LookaheadReader.php \
-  lib/Thrift/Protocol/JSON/PairContext.php
-
-phpprotocolsimplejsondir = $(phpprotocoldir)/SimpleJSON
-phpprotocolsimplejson_DATA = \
-  lib/Thrift/Protocol/SimpleJSON/CollectionMapKeyException.php \
-  lib/Thrift/Protocol/SimpleJSON/Context.php \
-  lib/Thrift/Protocol/SimpleJSON/ListContext.php \
-  lib/Thrift/Protocol/SimpleJSON/MapContext.php \
-  lib/Thrift/Protocol/SimpleJSON/StructContext.php
-
-phpserializerdir = $(phpdir)/Serializer
-phpserializer_DATA = \
-  lib/Thrift/Serializer/TBinarySerializer.php
-
-phpserverdir = $(phpdir)/Server
-phpserver_DATA = \
-  lib/Thrift/Server/TServerSocket.php \
-  lib/Thrift/Server/TForkingServer.php \
-  lib/Thrift/Server/TServer.php \
-  lib/Thrift/Server/TServerTransport.php \
-  lib/Thrift/Server/TSimpleServer.php
-
-phpstringfuncdir = $(phpdir)/StringFunc
-phpstringfunc_DATA = \
-  lib/Thrift/StringFunc/Mbstring.php \
-  lib/Thrift/StringFunc/Core.php \
-  lib/Thrift/StringFunc/TStringFunc.php
-
-phptransportdir = $(phpdir)/Transport
-phptransport_DATA = \
-  lib/Thrift/Transport/TBufferedTransport.php \
-  lib/Thrift/Transport/TCurlClient.php \
-  lib/Thrift/Transport/TFramedTransport.php \
-  lib/Thrift/Transport/THttpClient.php \
-  lib/Thrift/Transport/TMemoryBuffer.php \
-  lib/Thrift/Transport/TNullTransport.php \
-  lib/Thrift/Transport/TPhpStream.php \
-  lib/Thrift/Transport/TSocket.php \
-  lib/Thrift/Transport/TSocketPool.php \
-  lib/Thrift/Transport/TTransport.php
-
-phptypedir = $(phpdir)/Type
-phptype_DATA = \
-  lib/Thrift/Type/TMessageType.php \
-  lib/Thrift/Type/TType.php \
-  lib/Thrift/Type/TConstant.php
-
-EXTRA_DIST = \
-  lib \
-  src/autoload.php \
-  src/ext/thrift_protocol/config.m4 \
-  src/ext/thrift_protocol/config.w32 \
-  src/ext/thrift_protocol/php_thrift_protocol7.cpp \
-  src/ext/thrift_protocol/php_thrift_protocol.cpp \
-  src/ext/thrift_protocol/php_thrift_protocol.h \
-  src/ext/thrift_protocol/run-tests.php \
-  src/Thrift.php \
-  src/TStringUtils.php \
-  coding_standards.md \
-  thrift_protocol.ini \
-  README.apache.md \
-  README.md
-
-MAINTAINERCLEANFILES = \
-  Makefile \
-  Makefile.in
-
diff --git a/vendor/git.apache.org/thrift.git/lib/php/README.apache.md b/vendor/git.apache.org/thrift.git/lib/php/README.apache.md
deleted file mode 100644
index 5e92589..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/README.apache.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Thrift PHP/Apache Integration
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Building PHP Thrift Services with Apache
-========================================
-
-Thrift can be embedded in the Apache webserver with PHP installed. Sample
-code is provided below. Note that to make requests to this type of server
-you must use a THttpClient transport.
-
-Sample Code
-===========
-
-<?php
-
-namespace MyNamespace;
-
-/**
- * Include path
- */
-$THRIFT_ROOT = '/your/thrift/root/lib';
-
-/**
- * Init Autloader
- */
-require_once $THRIFT_ROOT . '/Thrift/ClassLoader/ThriftClassLoader.php';
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', $THRIFT_ROOT);
-$loader->registerDefinition('Thrift', $THRIFT_ROOT . '/packages');
-$loader->register();
-
-use Thrift\Transport\TPhpStream;
-use Thrift\Protocol\TBinaryProtocol;
-
-/**
- * Example of how to build a Thrift server in Apache/PHP
- */
-
-class ServiceHandler implements ServiceIf {
-  // Implement your interface and methods here
-}
-
-header('Content-Type: application/x-thrift');
-
-$handler = new ServiceHandler();
-$processor = new ServiceProcessor($handler);
-
-// Use the TPhpStream transport to read/write directly from HTTP
-$transport = new TPhpStream(TPhpStream::MODE_R | TPhpStream::MODE_W);
-$protocol = new TBinaryProtocol($transport);
-
-$transport->open();
-$processor->process($protocol, $protocol);
-$transport->close();
diff --git a/vendor/git.apache.org/thrift.git/lib/php/README.md b/vendor/git.apache.org/thrift.git/lib/php/README.md
deleted file mode 100644
index c24ee2c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Thrift PHP Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with PHP
-=====================
-
-Thrift requires PHP 5. Thrift makes as few assumptions about your PHP
-environment as possible while trying to make some more advanced PHP
-features (i.e. APC cacheing using asbolute path URLs) as simple as possible.
-
-To use Thrift in your PHP codebase, take the following steps:
-
-#1) Copy all of thrift/lib/php/lib into your PHP codebase
-#2) Configure Symfony Autoloader (or whatever you usually use)
-
-After that, you have to manually include the Thrift package
-created by the compiler:
-
-require_once 'packages/Service/Service.php';
-require_once 'packages/Service/Types.php';
-
-Dependencies
-============
-
-PHP_INT_SIZE
-
-  This built-in signals whether your architecture is 32 or 64 bit and is
-  used by the TBinaryProtocol to properly use pack() and unpack() to
-  serialize data.
-
-apc_fetch(), apc_store()
-
-  APC cache is used by the TSocketPool class. If you do not have APC installed,
-  Thrift will fill in null stub function definitions.
diff --git a/vendor/git.apache.org/thrift.git/lib/php/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/php/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Base/TBase.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Base/TBase.php
deleted file mode 100644
index 4195f75..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Base/TBase.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-namespace Thrift\Base;
-
-use Thrift\Type\TType;
-
-/**
- * Base class from which other Thrift structs extend. This is so that we can
- * cut back on the size of the generated code which is turning out to have a
- * nontrivial cost just to load thanks to the wondrously abysmal implementation
- * of PHP. Note that code is intentionally duplicated in here to avoid making
- * function calls for every field or member of a container..
- */
-abstract class TBase
-{
-  static $tmethod = array(TType::BOOL   => 'Bool',
-                          TType::BYTE   => 'Byte',
-                          TType::I16    => 'I16',
-                          TType::I32    => 'I32',
-                          TType::I64    => 'I64',
-                          TType::DOUBLE => 'Double',
-                          TType::STRING => 'String');
-
-  abstract public function read($input);
-
-  abstract public function write($output);
-
-  public function __construct($spec=null, $vals=null)
-  {
-    if (is_array($spec) && is_array($vals)) {
-      foreach ($spec as $fid => $fspec) {
-        $var = $fspec['var'];
-        if (isset($vals[$var])) {
-          $this->$var = $vals[$var];
-        }
-      }
-    }
-  }
-
-  public function __wakeup()
-  {
-    $this->__construct(get_object_vars($this));
-  }
-
-  private function _readMap(&$var, $spec, $input)
-  {
-    $xfer = 0;
-    $ktype = $spec['ktype'];
-    $vtype = $spec['vtype'];
-    $kread = $vread = null;
-    if (isset(TBase::$tmethod[$ktype])) {
-      $kread = 'read'.TBase::$tmethod[$ktype];
-    } else {
-      $kspec = $spec['key'];
-    }
-    if (isset(TBase::$tmethod[$vtype])) {
-      $vread = 'read'.TBase::$tmethod[$vtype];
-    } else {
-      $vspec = $spec['val'];
-    }
-    $var = array();
-    $_ktype = $_vtype = $size = 0;
-    $xfer += $input->readMapBegin($_ktype, $_vtype, $size);
-    for ($i = 0; $i < $size; ++$i) {
-      $key = $val = null;
-      if ($kread !== null) {
-        $xfer += $input->$kread($key);
-      } else {
-        switch ($ktype) {
-        case TType::STRUCT:
-          $class = $kspec['class'];
-          $key = new $class();
-          $xfer += $key->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($key, $kspec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($key, $kspec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($key, $kspec, $input, true);
-          break;
-        }
-      }
-      if ($vread !== null) {
-        $xfer += $input->$vread($val);
-      } else {
-        switch ($vtype) {
-        case TType::STRUCT:
-          $class = $vspec['class'];
-          $val = new $class();
-          $xfer += $val->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($val, $vspec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($val, $vspec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($val, $vspec, $input, true);
-          break;
-        }
-      }
-      $var[$key] = $val;
-    }
-    $xfer += $input->readMapEnd();
-
-    return $xfer;
-  }
-
-  private function _readList(&$var, $spec, $input, $set=false)
-  {
-    $xfer = 0;
-    $etype = $spec['etype'];
-    $eread = $vread = null;
-    if (isset(TBase::$tmethod[$etype])) {
-      $eread = 'read'.TBase::$tmethod[$etype];
-    } else {
-      $espec = $spec['elem'];
-    }
-    $var = array();
-    $_etype = $size = 0;
-    if ($set) {
-      $xfer += $input->readSetBegin($_etype, $size);
-    } else {
-      $xfer += $input->readListBegin($_etype, $size);
-    }
-    for ($i = 0; $i < $size; ++$i) {
-      $elem = null;
-      if ($eread !== null) {
-        $xfer += $input->$eread($elem);
-      } else {
-        $espec = $spec['elem'];
-        switch ($etype) {
-        case TType::STRUCT:
-          $class = $espec['class'];
-          $elem = new $class();
-          $xfer += $elem->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($elem, $espec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($elem, $espec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($elem, $espec, $input, true);
-          break;
-        }
-      }
-      if ($set) {
-        $var[$elem] = true;
-      } else {
-        $var []= $elem;
-      }
-    }
-    if ($set) {
-      $xfer += $input->readSetEnd();
-    } else {
-      $xfer += $input->readListEnd();
-    }
-
-    return $xfer;
-  }
-
-  protected function _read($class, $spec, $input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true) {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      if (isset($spec[$fid])) {
-        $fspec = $spec[$fid];
-        $var = $fspec['var'];
-        if ($ftype == $fspec['type']) {
-          $xfer = 0;
-          if (isset(TBase::$tmethod[$ftype])) {
-            $func = 'read'.TBase::$tmethod[$ftype];
-            $xfer += $input->$func($this->$var);
-          } else {
-            switch ($ftype) {
-            case TType::STRUCT:
-              $class = $fspec['class'];
-              $this->$var = new $class();
-              $xfer += $this->$var->read($input);
-              break;
-            case TType::MAP:
-              $xfer += $this->_readMap($this->$var, $fspec, $input);
-              break;
-            case TType::LST:
-              $xfer += $this->_readList($this->$var, $fspec, $input, false);
-              break;
-            case TType::SET:
-              $xfer += $this->_readList($this->$var, $fspec, $input, true);
-              break;
-            }
-          }
-        } else {
-          $xfer += $input->skip($ftype);
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-
-    return $xfer;
-  }
-
-  private function _writeMap($var, $spec, $output)
-  {
-    $xfer = 0;
-    $ktype = $spec['ktype'];
-    $vtype = $spec['vtype'];
-    $kwrite = $vwrite = null;
-    if (isset(TBase::$tmethod[$ktype])) {
-      $kwrite = 'write'.TBase::$tmethod[$ktype];
-    } else {
-      $kspec = $spec['key'];
-    }
-    if (isset(TBase::$tmethod[$vtype])) {
-      $vwrite = 'write'.TBase::$tmethod[$vtype];
-    } else {
-      $vspec = $spec['val'];
-    }
-    $xfer += $output->writeMapBegin($ktype, $vtype, count($var));
-    foreach ($var as $key => $val) {
-      if (isset($kwrite)) {
-        $xfer += $output->$kwrite($key);
-      } else {
-        switch ($ktype) {
-        case TType::STRUCT:
-          $xfer += $key->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($key, $kspec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($key, $kspec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($key, $kspec, $output, true);
-          break;
-        }
-      }
-      if (isset($vwrite)) {
-        $xfer += $output->$vwrite($val);
-      } else {
-        switch ($vtype) {
-        case TType::STRUCT:
-          $xfer += $val->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($val, $vspec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($val, $vspec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($val, $vspec, $output, true);
-          break;
-        }
-      }
-    }
-    $xfer += $output->writeMapEnd();
-
-    return $xfer;
-  }
-
-  private function _writeList($var, $spec, $output, $set=false)
-  {
-    $xfer = 0;
-    $etype = $spec['etype'];
-    $ewrite = null;
-    if (isset(TBase::$tmethod[$etype])) {
-      $ewrite = 'write'.TBase::$tmethod[$etype];
-    } else {
-      $espec = $spec['elem'];
-    }
-    if ($set) {
-      $xfer += $output->writeSetBegin($etype, count($var));
-    } else {
-      $xfer += $output->writeListBegin($etype, count($var));
-    }
-    foreach ($var as $key => $val) {
-      $elem = $set ? $key : $val;
-      if (isset($ewrite)) {
-        $xfer += $output->$ewrite($elem);
-      } else {
-        switch ($etype) {
-        case TType::STRUCT:
-          $xfer += $elem->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($elem, $espec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($elem, $espec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($elem, $espec, $output, true);
-          break;
-        }
-      }
-    }
-    if ($set) {
-      $xfer += $output->writeSetEnd();
-    } else {
-      $xfer += $output->writeListEnd();
-    }
-
-    return $xfer;
-  }
-
-  protected function _write($class, $spec, $output)
-  {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin($class);
-    foreach ($spec as $fid => $fspec) {
-      $var = $fspec['var'];
-      if ($this->$var !== null) {
-        $ftype = $fspec['type'];
-        $xfer += $output->writeFieldBegin($var, $ftype, $fid);
-        if (isset(TBase::$tmethod[$ftype])) {
-          $func = 'write'.TBase::$tmethod[$ftype];
-          $xfer += $output->$func($this->$var);
-        } else {
-          switch ($ftype) {
-          case TType::STRUCT:
-            $xfer += $this->$var->write($output);
-            break;
-          case TType::MAP:
-            $xfer += $this->_writeMap($this->$var, $fspec, $output);
-            break;
-          case TType::LST:
-            $xfer += $this->_writeList($this->$var, $fspec, $output, false);
-            break;
-          case TType::SET:
-            $xfer += $this->_writeList($this->$var, $fspec, $output, true);
-            break;
-          }
-        }
-        $xfer += $output->writeFieldEnd();
-      }
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-
-    return $xfer;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php
deleted file mode 100644
index 67575ce..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * ClassLoader to load Thrift library and definitions
- * Inspired from UniversalClassLoader from Symfony 2
- *
- * @package thrift.classloader
- */
-
-namespace Thrift\ClassLoader;
-
-class ThriftClassLoader
-{
-    /**
-     * Namespaces path
-     * @var array
-     */
-    protected $namespaces = array();
-
-    /**
-     * Thrift definition paths
-     * @var type
-     */
-    protected $definitions = array();
-
-    /**
-     * Do we use APC cache ?
-     * @var boolean
-     */
-    protected $apc = false;
-
-    /**
-     * APC Cache prefix
-     * @var string
-     */
-    protected $apc_prefix;
-
-    /**
-     * Set autoloader to use APC cache
-     * @param boolean $apc
-     * @param string  $apc_prefix
-     */
-    public function __construct($apc = false, $apc_prefix = null)
-    {
-        $this->apc = $apc;
-        $this->apc_prefix = $apc_prefix;
-    }
-
-    /**
-     * Registers a namespace.
-     *
-     * @param string       $namespace The namespace
-     * @param array|string $paths     The location(s) of the namespace
-     */
-    public function registerNamespace($namespace, $paths)
-    {
-        $this->namespaces[$namespace] = (array) $paths;
-    }
-
-    /**
-     * Registers a Thrift definition namespace.
-     *
-     * @param string       $namespace The definition namespace
-     * @param array|string $paths     The location(s) of the definition namespace
-     */
-    public function registerDefinition($namespace, $paths)
-    {
-        $this->definitions[$namespace] = (array) $paths;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param Boolean $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Loads the given class, definition or interface.
-     *
-     * @param string $class The name of the class
-     */
-    public function loadClass($class)
-    {
-        if (
-            (true === $this->apc && ($file = $this->findFileInApc($class))) or
-            ($file = $this->findFile($class))
-        )
-        {
-            require_once $file;
-        }
-    }
-
-    /**
-     * Loads the given class or interface in APC.
-     * @param  string $class The name of the class
-     * @return string
-     */
-    protected function findFileInApc($class)
-    {
-        if (false === $file = apc_fetch($this->apc_prefix.$class)) {
-            apc_store($this->apc_prefix.$class, $file = $this->findFile($class));
-        }
-
-        return $file;
-    }
-
-    /**
-     * Find class in namespaces or definitions directories
-     * @param  string $class
-     * @return string
-     */
-    public function findFile($class)
-    {
-        // Remove first backslash
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        if (false !== $pos = strrpos($class, '\\')) {
-            // Namespaced class name
-            $namespace = substr($class, 0, $pos);
-
-            // Iterate in normal namespaces
-            foreach ($this->namespaces as $ns => $dirs) {
-                //Don't interfere with other autoloaders
-                if (0 !== strpos($namespace, $ns)) {
-                    continue;
-                }
-
-                foreach ($dirs as $dir) {
-                    $className = substr($class, $pos + 1);
-
-                    $file = $dir.DIRECTORY_SEPARATOR.
-                                 str_replace('\\', DIRECTORY_SEPARATOR, $namespace).
-                                 DIRECTORY_SEPARATOR.
-                                 $className.'.php';
-
-                    if (file_exists($file)) {
-                        return $file;
-                    }
-                }
-            }
-
-            // Iterate in Thrift namespaces
-
-            // Remove first part of namespace
-            $m = explode('\\', $class);
-
-            // Ignore wrong call
-            if (count($m) <= 1) {
-                return;
-            }
-
-            $class = array_pop($m);
-            $namespace = implode('\\', $m);
-
-            foreach ($this->definitions as $ns => $dirs) {
-                //Don't interfere with other autoloaders
-                if (0 !== strpos($namespace, $ns)) {
-                    continue;
-                }
-
-                foreach ($dirs as $dir) {
-                    /**
-                     * Available in service: Interface, Client, Processor, Rest
-                     * And every service methods (_.+)
-                     */
-                    if(
-                        0 === preg_match('#(.+)(if|client|processor|rest)$#i', $class, $n) and
-                        0 === preg_match('#(.+)_[a-z0-9]+_(args|result)$#i', $class, $n)
-                    )
-                    {
-                        $className = 'Types';
-                    } else {
-                        $className = $n[1];
-                    }
-
-                    $file = $dir.DIRECTORY_SEPARATOR .
-                                 str_replace('\\', DIRECTORY_SEPARATOR, $namespace) .
-                                 DIRECTORY_SEPARATOR .
-                                 $className . '.php';
-
-                    if (file_exists($file)) {
-                        return $file;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TApplicationException.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TApplicationException.php
deleted file mode 100644
index b1689fc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TApplicationException.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-namespace Thrift\Exception;
-
-use Thrift\Type\TType;
-
-class TApplicationException extends TException
-{
-  static $_TSPEC =
-    array(1 => array('var' => 'message',
-                     'type' => TType::STRING),
-          2 => array('var' => 'code',
-                     'type' => TType::I32));
-
-  const UNKNOWN = 0;
-  const UNKNOWN_METHOD = 1;
-  const INVALID_MESSAGE_TYPE = 2;
-  const WRONG_METHOD_NAME = 3;
-  const BAD_SEQUENCE_ID = 4;
-  const MISSING_RESULT = 5;
-  const INTERNAL_ERROR = 6;
-  const PROTOCOL_ERROR = 7;
-  const INVALID_TRANSFORM = 8;
-  const INVALID_PROTOCOL = 9;
-  const UNSUPPORTED_CLIENT_TYPE = 10;
-
-  public function __construct($message=null, $code=0)
-  {
-    parent::__construct($message, $code);
-  }
-
-  public function read($output)
-  {
-    return $this->_read('TApplicationException', self::$_TSPEC, $output);
-  }
-
-  public function write($output)
-  {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('TApplicationException');
-    if ($message = $this->getMessage()) {
-      $xfer += $output->writeFieldBegin('message', TType::STRING, 1);
-      $xfer += $output->writeString($message);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($code = $this->getCode()) {
-      $xfer += $output->writeFieldBegin('type', TType::I32, 2);
-      $xfer += $output->writeI32($code);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-
-    return $xfer;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TException.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TException.php
deleted file mode 100644
index 5c06843..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TException.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-namespace Thrift\Exception;
-
-use Thrift\Type\TType;
-use Thrift\Base\TBase;
-
-/**
- * NOTE(mcslee): This currently contains a ton of duplicated code from TBase
- * because we need to save CPU cycles and this is not yet in an extension.
- * Ideally we'd multiply-inherit TException from both Exception and Base, but
- * that's not possible in PHP and there are no modules either, so for now we
- * apologetically take a trip to HackTown.
- *
- * Can be called with standard Exception constructor (message, code) or with
- * Thrift Base object constructor (spec, vals).
- *
- * @param mixed $p1 Message (string) or type-spec (array)
- * @param mixed $p2 Code (integer) or values (array)
- */
-class TException extends \Exception
-{
-  public function __construct($p1=null, $p2=0)
-  {
-    if (is_array($p1) && is_array($p2)) {
-      $spec = $p1;
-      $vals = $p2;
-      foreach ($spec as $fid => $fspec) {
-        $var = $fspec['var'];
-        if (isset($vals[$var])) {
-          $this->$var = $vals[$var];
-        }
-      }
-    } else {
-      parent::__construct($p1, $p2);
-    }
-  }
-
-  static $tmethod = array(TType::BOOL   => 'Bool',
-                          TType::BYTE   => 'Byte',
-                          TType::I16    => 'I16',
-                          TType::I32    => 'I32',
-                          TType::I64    => 'I64',
-                          TType::DOUBLE => 'Double',
-                          TType::STRING => 'String');
-
-  private function _readMap(&$var, $spec, $input)
-  {
-    $xfer = 0;
-    $ktype = $spec['ktype'];
-    $vtype = $spec['vtype'];
-    $kread = $vread = null;
-    if (isset(TBase::$tmethod[$ktype])) {
-      $kread = 'read'.TBase::$tmethod[$ktype];
-    } else {
-      $kspec = $spec['key'];
-    }
-    if (isset(TBase::$tmethod[$vtype])) {
-      $vread = 'read'.TBase::$tmethod[$vtype];
-    } else {
-      $vspec = $spec['val'];
-    }
-    $var = array();
-    $_ktype = $_vtype = $size = 0;
-    $xfer += $input->readMapBegin($_ktype, $_vtype, $size);
-    for ($i = 0; $i < $size; ++$i) {
-      $key = $val = null;
-      if ($kread !== null) {
-        $xfer += $input->$kread($key);
-      } else {
-        switch ($ktype) {
-        case TType::STRUCT:
-          $class = $kspec['class'];
-          $key = new $class();
-          $xfer += $key->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($key, $kspec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($key, $kspec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($key, $kspec, $input, true);
-          break;
-        }
-      }
-      if ($vread !== null) {
-        $xfer += $input->$vread($val);
-      } else {
-        switch ($vtype) {
-        case TType::STRUCT:
-          $class = $vspec['class'];
-          $val = new $class();
-          $xfer += $val->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($val, $vspec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($val, $vspec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($val, $vspec, $input, true);
-          break;
-        }
-      }
-      $var[$key] = $val;
-    }
-    $xfer += $input->readMapEnd();
-
-    return $xfer;
-  }
-
-  private function _readList(&$var, $spec, $input, $set=false)
-  {
-    $xfer = 0;
-    $etype = $spec['etype'];
-    $eread = $vread = null;
-    if (isset(TBase::$tmethod[$etype])) {
-      $eread = 'read'.TBase::$tmethod[$etype];
-    } else {
-      $espec = $spec['elem'];
-    }
-    $var = array();
-    $_etype = $size = 0;
-    if ($set) {
-      $xfer += $input->readSetBegin($_etype, $size);
-    } else {
-      $xfer += $input->readListBegin($_etype, $size);
-    }
-    for ($i = 0; $i < $size; ++$i) {
-      $elem = null;
-      if ($eread !== null) {
-        $xfer += $input->$eread($elem);
-      } else {
-        $espec = $spec['elem'];
-        switch ($etype) {
-        case TType::STRUCT:
-          $class = $espec['class'];
-          $elem = new $class();
-          $xfer += $elem->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($elem, $espec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($elem, $espec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($elem, $espec, $input, true);
-          break;
-        }
-      }
-      if ($set) {
-        $var[$elem] = true;
-      } else {
-        $var []= $elem;
-      }
-    }
-    if ($set) {
-      $xfer += $input->readSetEnd();
-    } else {
-      $xfer += $input->readListEnd();
-    }
-
-    return $xfer;
-  }
-
-  protected function _read($class, $spec, $input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true) {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      if (isset($spec[$fid])) {
-        $fspec = $spec[$fid];
-        $var = $fspec['var'];
-        if ($ftype == $fspec['type']) {
-          $xfer = 0;
-          if (isset(TBase::$tmethod[$ftype])) {
-            $func = 'read'.TBase::$tmethod[$ftype];
-            $xfer += $input->$func($this->$var);
-          } else {
-            switch ($ftype) {
-            case TType::STRUCT:
-              $class = $fspec['class'];
-              $this->$var = new $class();
-              $xfer += $this->$var->read($input);
-              break;
-            case TType::MAP:
-              $xfer += $this->_readMap($this->$var, $fspec, $input);
-              break;
-            case TType::LST:
-              $xfer += $this->_readList($this->$var, $fspec, $input, false);
-              break;
-            case TType::SET:
-              $xfer += $this->_readList($this->$var, $fspec, $input, true);
-              break;
-            }
-          }
-        } else {
-          $xfer += $input->skip($ftype);
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-
-    return $xfer;
-  }
-
-  private function _writeMap($var, $spec, $output)
-  {
-    $xfer = 0;
-    $ktype = $spec['ktype'];
-    $vtype = $spec['vtype'];
-    $kwrite = $vwrite = null;
-    if (isset(TBase::$tmethod[$ktype])) {
-      $kwrite = 'write'.TBase::$tmethod[$ktype];
-    } else {
-      $kspec = $spec['key'];
-    }
-    if (isset(TBase::$tmethod[$vtype])) {
-      $vwrite = 'write'.TBase::$tmethod[$vtype];
-    } else {
-      $vspec = $spec['val'];
-    }
-    $xfer += $output->writeMapBegin($ktype, $vtype, count($var));
-    foreach ($var as $key => $val) {
-      if (isset($kwrite)) {
-        $xfer += $output->$kwrite($key);
-      } else {
-        switch ($ktype) {
-        case TType::STRUCT:
-          $xfer += $key->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($key, $kspec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($key, $kspec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($key, $kspec, $output, true);
-          break;
-        }
-      }
-      if (isset($vwrite)) {
-        $xfer += $output->$vwrite($val);
-      } else {
-        switch ($vtype) {
-        case TType::STRUCT:
-          $xfer += $val->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($val, $vspec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($val, $vspec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($val, $vspec, $output, true);
-          break;
-        }
-      }
-    }
-    $xfer += $output->writeMapEnd();
-
-    return $xfer;
-  }
-
-  private function _writeList($var, $spec, $output, $set=false)
-  {
-    $xfer = 0;
-    $etype = $spec['etype'];
-    $ewrite = null;
-    if (isset(TBase::$tmethod[$etype])) {
-      $ewrite = 'write'.TBase::$tmethod[$etype];
-    } else {
-      $espec = $spec['elem'];
-    }
-    if ($set) {
-      $xfer += $output->writeSetBegin($etype, count($var));
-    } else {
-      $xfer += $output->writeListBegin($etype, count($var));
-    }
-    foreach ($var as $key => $val) {
-      $elem = $set ? $key : $val;
-      if (isset($ewrite)) {
-        $xfer += $output->$ewrite($elem);
-      } else {
-        switch ($etype) {
-        case TType::STRUCT:
-          $xfer += $elem->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($elem, $espec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($elem, $espec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($elem, $espec, $output, true);
-          break;
-        }
-      }
-    }
-    if ($set) {
-      $xfer += $output->writeSetEnd();
-    } else {
-      $xfer += $output->writeListEnd();
-    }
-
-    return $xfer;
-  }
-
-  protected function _write($class, $spec, $output)
-  {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin($class);
-    foreach ($spec as $fid => $fspec) {
-      $var = $fspec['var'];
-      if ($this->$var !== null) {
-        $ftype = $fspec['type'];
-        $xfer += $output->writeFieldBegin($var, $ftype, $fid);
-        if (isset(TBase::$tmethod[$ftype])) {
-          $func = 'write'.TBase::$tmethod[$ftype];
-          $xfer += $output->$func($this->$var);
-        } else {
-          switch ($ftype) {
-          case TType::STRUCT:
-            $xfer += $this->$var->write($output);
-            break;
-          case TType::MAP:
-            $xfer += $this->_writeMap($this->$var, $fspec, $output);
-            break;
-          case TType::LST:
-            $xfer += $this->_writeList($this->$var, $fspec, $output, false);
-            break;
-          case TType::SET:
-            $xfer += $this->_writeList($this->$var, $fspec, $output, true);
-            break;
-          }
-        }
-        $xfer += $output->writeFieldEnd();
-      }
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-
-    return $xfer;
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TProtocolException.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TProtocolException.php
deleted file mode 100644
index ba7135c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TProtocolException.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- * @author: rmarin (marin.radu@facebook.com)
- */
-
-namespace Thrift\Exception;
-
-/**
- * Protocol module. Contains all the types and definitions needed to implement
- * a protocol encoder/decoder.
- *
- * @package thrift.protocol
- */
-
-/**
- * Protocol exceptions
- */
-class TProtocolException extends TException
-{
-  const UNKNOWN = 0;
-  const INVALID_DATA = 1;
-  const NEGATIVE_SIZE = 2;
-  const SIZE_LIMIT = 3;
-  const BAD_VERSION = 4;
-  const NOT_IMPLEMENTED = 5;
-  const DEPTH_LIMIT = 6;
-
-  public function __construct($message=null, $code=0)
-  {
-    parent::__construct($message, $code);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TTransportException.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TTransportException.php
deleted file mode 100644
index 0074467..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Exception/TTransportException.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Exception;
-
-/**
- * Transport exceptions
- */
-class TTransportException extends TException
-{
-  const UNKNOWN = 0;
-  const NOT_OPEN = 1;
-  const ALREADY_OPEN = 2;
-  const TIMED_OUT = 3;
-  const END_OF_FILE = 4;
-
-  public function __construct($message=null, $code=0)
-  {
-    parent::__construct($message, $code);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TBinaryProtocolFactory.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TBinaryProtocolFactory.php
deleted file mode 100644
index 0c1c4a7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TBinaryProtocolFactory.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Factory;
-
-use Thrift\Protocol\TBinaryProtocol;
-
-/**
- * Binary Protocol Factory
- */
-class TBinaryProtocolFactory implements TProtocolFactory
-{
-  private $strictRead_ = false;
-  private $strictWrite_ = false;
-
-  public function __construct($strictRead=false, $strictWrite=false)
-  {
-    $this->strictRead_ = $strictRead;
-    $this->strictWrite_ = $strictWrite;
-  }
-
-  public function getProtocol($trans)
-  {
-    return new TBinaryProtocol($trans, $this->strictRead_, $this->strictWrite_);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TCompactProtocolFactory.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TCompactProtocolFactory.php
deleted file mode 100644
index f4b4fe3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TCompactProtocolFactory.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Factory;
-
-use Thrift\Protocol\TCompactProtocol;
-
-/**
- * Compact Protocol Factory
- */
-class TCompactProtocolFactory implements TProtocolFactory
-{
-  public function __construct()
-  {
-  }
-
-  public function getProtocol($trans)
-  {
-    return new TCompactProtocol($trans);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TJSONProtocolFactory.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TJSONProtocolFactory.php
deleted file mode 100644
index fbfb1d7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TJSONProtocolFactory.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Factory;
-
-use Thrift\Protocol\TJSONProtocol;
-
-/**
- * JSON Protocol Factory
- */
-class TJSONProtocolFactory implements TProtocolFactory
-{
-    public function __construct()
-    {
-    }
-
-    public function getProtocol($trans)
-    {
-        return new TJSONProtocol($trans);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TProtocolFactory.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TProtocolFactory.php
deleted file mode 100644
index 4c9562d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TProtocolFactory.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Factory;
-
-/**
- * Protocol factory creates protocol objects from transports
- */
-interface TProtocolFactory
-{
-  /**
-   * Build a protocol from the base transport
-   *
-   * @return Thrift\Protocol\TProtocol protocol
-   */
-  public function getProtocol($trans);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TStringFuncFactory.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TStringFuncFactory.php
deleted file mode 100644
index 6ad6839..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TStringFuncFactory.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-namespace Thrift\Factory;
-
-use Thrift\StringFunc\Mbstring;
-use Thrift\StringFunc\Core;
-
-class TStringFuncFactory
-{
-    private static $_instance;
-
-    /**
-     * Get the Singleton instance of TStringFunc implementation that is
-     * compatible with the current system's mbstring.func_overload settings.
-     *
-     * @return TStringFunc
-     */
-    public static function create()
-    {
-        if (!self::$_instance) {
-            self::_setInstance();
-        }
-
-        return self::$_instance;
-    }
-
-    private static function _setInstance()
-    {
-        /**
-         * Cannot use str* functions for byte counting because multibyte
-         * characters will be read a single bytes.
-         *
-         * See: http://us.php.net/manual/en/mbstring.overload.php
-         */
-        if (ini_get('mbstring.func_overload') & 2) {
-            self::$_instance = new Mbstring();
-        }
-        /**
-         * mbstring is not installed or does not have function overloading
-         * of the str* functions enabled so use PHP core str* functions for
-         * byte counting.
-         */
-        else {
-            self::$_instance = new Core();
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TTransportFactory.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TTransportFactory.php
deleted file mode 100644
index b32b5f4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Factory/TTransportFactory.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Thrift\Factory;
-
-use Thrift\Transport\TTransport;
-
-class TTransportFactory
-{
-  /**
-   * @static
-   * @param TTransport $transport
-   * @return TTransport
-   */
-  public static function getTransport(TTransport $transport)
-  {
-    return $transport;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/BaseContext.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/BaseContext.php
deleted file mode 100644
index 31bcb48..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/BaseContext.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\JSON;
-
-class BaseContext
-{
-    public function escapeNum()
-    {
-        return false;
-    }
-
-    public function write()
-    {
-    }
-
-    public function read()
-    {
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/ListContext.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/ListContext.php
deleted file mode 100644
index eef6594..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/ListContext.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\JSON;
-
-use Thrift\Protocol\TJSONProtocol;
-
-class ListContext extends BaseContext
-{
-    private $first_ = true;
-    private $p_;
-
-    public function __construct($p)
-    {
-        $this->p_ = $p;
-    }
-
-    public function write()
-    {
-        if ($this->first_) {
-            $this->first_ = false;
-        } else {
-            $this->p_->getTransport()->write(TJSONProtocol::COMMA);
-        }
-    }
-
-    public function read()
-    {
-        if ($this->first_) {
-            $this->first_ = false;
-        } else {
-            $this->p_->readJSONSyntaxChar(TJSONProtocol::COMMA);
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/LookaheadReader.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/LookaheadReader.php
deleted file mode 100644
index 0b18c40..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/LookaheadReader.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\JSON;
-
-class LookaheadReader
-{
-    private $hasData_ = false;
-    private $data_ = array();
-    private $p_;
-
-    public function __construct($p)
-    {
-        $this->p_ = $p;
-    }
-
-    public function read()
-    {
-        if ($this->hasData_) {
-            $this->hasData_ = false;
-        } else {
-            $this->data_ = $this->p_->getTransport()->readAll(1);
-        }
-
-        return substr($this->data_, 0, 1);
-    }
-
-    public function peek()
-    {
-        if (!$this->hasData_) {
-            $this->data_ = $this->p_->getTransport()->readAll(1);
-        }
-
-        $this->hasData_ = true;
-
-        return substr($this->data_, 0, 1);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/PairContext.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/PairContext.php
deleted file mode 100644
index 7b353c4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/JSON/PairContext.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\JSON;
-
-use Thrift\Protocol\TJSONProtocol;
-
-class PairContext extends BaseContext
-{
-    private $first_ = true;
-    private $colon_ = true;
-    private $p_ = null;
-
-    public function __construct($p)
-    {
-        $this->p_ = $p;
-    }
-
-    public function write()
-    {
-        if ($this->first_) {
-            $this->first_ = false;
-            $this->colon_ = true;
-        } else {
-            $this->p_->getTransport()->write($this->colon_ ? TJSONProtocol::COLON : TJSONProtocol::COMMA);
-            $this->colon_ = !$this->colon_;
-        }
-    }
-
-    public function read()
-    {
-        if ($this->first_) {
-            $this->first_ = false;
-            $this->colon_ = true;
-        } else {
-            $this->p_->readJSONSyntaxChar($this->colon_ ? TJSONProtocol::COLON : TJSONProtocol::COMMA);
-            $this->colon_ = !$this->colon_;
-        }
-    }
-
-    public function escapeNum()
-    {
-        return $this->colon_;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/CollectionMapKeyException.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/CollectionMapKeyException.php
deleted file mode 100644
index 522b85a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/CollectionMapKeyException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\SimpleJSON;
-
-use Thrift\Exception\TException;
-
-class CollectionMapKeyException extends TException
-{
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/Context.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/Context.php
deleted file mode 100644
index dcffbcb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/Context.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\SimpleJSON;
-
-class Context
-{
-    public function write()
-    {
-    }
-
-    public function isMapKey()
-    {
-        return false;
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/ListContext.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/ListContext.php
deleted file mode 100644
index 6f346d8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/ListContext.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\SimpleJSON;
-
-use Thrift\Protocol\TSimpleJSONProtocol;
-
-class ListContext extends Context
-{
-    protected $first_ = true;
-    private $p_;
-
-    public function __construct($p)
-    {
-        $this->p_ = $p;
-    }
-
-    public function write()
-    {
-        if ($this->first_) {
-            $this->first_ = false;
-        } else {
-            $this->p_->getTransport()->write(TSimpleJSONProtocol::COMMA);
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/MapContext.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/MapContext.php
deleted file mode 100644
index bb9a04d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/MapContext.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\SimpleJSON;
-
-use Thrift\Protocol\TSimpleJSONProtocol;
-
-class MapContext extends StructContext
-{
-    protected $isKey = true;
-    private $p_;
-
-    public function __construct($p)
-    {
-        parent::__construct($p);
-    }
-
-    public function write()
-    {
-        parent::write();
-        $this->isKey = !$this->isKey;
-    }
-
-    public function isMapKey()
-    {
-        // we want to coerce map keys to json strings regardless
-        // of their type
-        return $this->isKey;
-    }
-}
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/StructContext.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/StructContext.php
deleted file mode 100644
index 8162f2b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/SimpleJSON/StructContext.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol\SimpleJSON;
-
-use Thrift\Protocol\TSimpleJSONProtocol;
-
-class StructContext extends Context
-{
-    protected $first_ = true;
-    protected $colon_ = true;
-    private $p_;
-
-    public function __construct($p)
-    {
-        $this->p_ = $p;
-    }
-
-    public function write()
-    {
-        if ($this->first_) {
-            $this->first_ = false;
-            $this->colon_ = true;
-        } else {
-            $this->p_->getTransport()->write(
-                $this->colon_ ?
-                TSimpleJSONProtocol::COLON :
-                TSimpleJSONProtocol::COMMA
-            );
-            $this->colon_ = !$this->colon_;
-        }
-    }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TBinaryProtocol.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TBinaryProtocol.php
deleted file mode 100644
index fe6a103..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TBinaryProtocol.php
+++ /dev/null
@@ -1,453 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol;
-
-use Thrift\Type\TType;
-use Thrift\Exception\TProtocolException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Binary implementation of the Thrift protocol.
- *
- */
-class TBinaryProtocol extends TProtocol
-{
-  const VERSION_MASK = 0xffff0000;
-  const VERSION_1 = 0x80010000;
-
-  protected $strictRead_ = false;
-  protected $strictWrite_ = true;
-
-  public function __construct($trans, $strictRead=false, $strictWrite=true)
-  {
-    parent::__construct($trans);
-    $this->strictRead_ = $strictRead;
-    $this->strictWrite_ = $strictWrite;
-  }
-
-  public function writeMessageBegin($name, $type, $seqid)
-  {
-    if ($this->strictWrite_) {
-      $version = self::VERSION_1 | $type;
-
-      return
-        $this->writeI32($version) +
-        $this->writeString($name) +
-        $this->writeI32($seqid);
-    } else {
-      return
-        $this->writeString($name) +
-        $this->writeByte($type) +
-        $this->writeI32($seqid);
-    }
-  }
-
-  public function writeMessageEnd()
-  {
-    return 0;
-  }
-
-  public function writeStructBegin($name)
-  {
-    return 0;
-  }
-
-  public function writeStructEnd()
-  {
-    return 0;
-  }
-
-  public function writeFieldBegin($fieldName, $fieldType, $fieldId)
-  {
-    return
-      $this->writeByte($fieldType) +
-      $this->writeI16($fieldId);
-  }
-
-  public function writeFieldEnd()
-  {
-    return 0;
-  }
-
-  public function writeFieldStop()
-  {
-    return
-      $this->writeByte(TType::STOP);
-  }
-
-  public function writeMapBegin($keyType, $valType, $size)
-  {
-    return
-      $this->writeByte($keyType) +
-      $this->writeByte($valType) +
-      $this->writeI32($size);
-  }
-
-  public function writeMapEnd()
-  {
-    return 0;
-  }
-
-  public function writeListBegin($elemType, $size)
-  {
-    return
-      $this->writeByte($elemType) +
-      $this->writeI32($size);
-  }
-
-  public function writeListEnd()
-  {
-    return 0;
-  }
-
-  public function writeSetBegin($elemType, $size)
-  {
-    return
-      $this->writeByte($elemType) +
-      $this->writeI32($size);
-  }
-
-  public function writeSetEnd()
-  {
-    return 0;
-  }
-
-  public function writeBool($value)
-  {
-    $data = pack('c', $value ? 1 : 0);
-    $this->trans_->write($data, 1);
-
-    return 1;
-  }
-
-  public function writeByte($value)
-  {
-    $data = pack('c', $value);
-    $this->trans_->write($data, 1);
-
-    return 1;
-  }
-
-  public function writeI16($value)
-  {
-    $data = pack('n', $value);
-    $this->trans_->write($data, 2);
-
-    return 2;
-  }
-
-  public function writeI32($value)
-  {
-    $data = pack('N', $value);
-    $this->trans_->write($data, 4);
-
-    return 4;
-  }
-
-  public function writeI64($value)
-  {
-    // If we are on a 32bit architecture we have to explicitly deal with
-    // 64-bit twos-complement arithmetic since PHP wants to treat all ints
-    // as signed and any int over 2^31 - 1 as a float
-    if (PHP_INT_SIZE == 4) {
-      $neg = $value < 0;
-
-      if ($neg) {
-        $value *= -1;
-      }
-
-      $hi = (int) ($value / 4294967296);
-      $lo = (int) $value;
-
-      if ($neg) {
-        $hi = ~$hi;
-        $lo = ~$lo;
-        if (($lo & (int) 0xffffffff) == (int) 0xffffffff) {
-          $lo = 0;
-          $hi++;
-        } else {
-          $lo++;
-        }
-      }
-      $data = pack('N2', $hi, $lo);
-
-    } else {
-      $hi = $value >> 32;
-      $lo = $value & 0xFFFFFFFF;
-      $data = pack('N2', $hi, $lo);
-    }
-
-    $this->trans_->write($data, 8);
-
-    return 8;
-  }
-
-  public function writeDouble($value)
-  {
-    $data = pack('d', $value);
-    $this->trans_->write(strrev($data), 8);
-
-    return 8;
-  }
-
-  public function writeString($value)
-  {
-    $len = TStringFuncFactory::create()->strlen($value);
-    $result = $this->writeI32($len);
-    if ($len) {
-      $this->trans_->write($value, $len);
-    }
-
-    return $result + $len;
-  }
-
-  public function readMessageBegin(&$name, &$type, &$seqid)
-  {
-    $result = $this->readI32($sz);
-    if ($sz < 0) {
-      $version = (int) ($sz & self::VERSION_MASK);
-      if ($version != (int) self::VERSION_1) {
-        throw new TProtocolException('Bad version identifier: '.$sz, TProtocolException::BAD_VERSION);
-      }
-      $type = $sz & 0x000000ff;
-      $result +=
-        $this->readString($name) +
-        $this->readI32($seqid);
-    } else {
-      if ($this->strictRead_) {
-        throw new TProtocolException('No version identifier, old protocol client?', TProtocolException::BAD_VERSION);
-      } else {
-        // Handle pre-versioned input
-        $name = $this->trans_->readAll($sz);
-        $result +=
-          $sz +
-          $this->readByte($type) +
-          $this->readI32($seqid);
-      }
-    }
-
-    return $result;
-  }
-
-  public function readMessageEnd()
-  {
-    return 0;
-  }
-
-  public function readStructBegin(&$name)
-  {
-    $name = '';
-
-    return 0;
-  }
-
-  public function readStructEnd()
-  {
-    return 0;
-  }
-
-  public function readFieldBegin(&$name, &$fieldType, &$fieldId)
-  {
-    $result = $this->readByte($fieldType);
-    if ($fieldType == TType::STOP) {
-      $fieldId = 0;
-
-      return $result;
-    }
-    $result += $this->readI16($fieldId);
-
-    return $result;
-  }
-
-  public function readFieldEnd()
-  {
-    return 0;
-  }
-
-  public function readMapBegin(&$keyType, &$valType, &$size)
-  {
-    return
-      $this->readByte($keyType) +
-      $this->readByte($valType) +
-      $this->readI32($size);
-  }
-
-  public function readMapEnd()
-  {
-    return 0;
-  }
-
-  public function readListBegin(&$elemType, &$size)
-  {
-    return
-      $this->readByte($elemType) +
-      $this->readI32($size);
-  }
-
-  public function readListEnd()
-  {
-    return 0;
-  }
-
-  public function readSetBegin(&$elemType, &$size)
-  {
-    return
-      $this->readByte($elemType) +
-      $this->readI32($size);
-  }
-
-  public function readSetEnd()
-  {
-    return 0;
-  }
-
-  public function readBool(&$value)
-  {
-    $data = $this->trans_->readAll(1);
-    $arr = unpack('c', $data);
-    $value = $arr[1] == 1;
-
-    return 1;
-  }
-
-  public function readByte(&$value)
-  {
-    $data = $this->trans_->readAll(1);
-    $arr = unpack('c', $data);
-    $value = $arr[1];
-
-    return 1;
-  }
-
-  public function readI16(&$value)
-  {
-    $data = $this->trans_->readAll(2);
-    $arr = unpack('n', $data);
-    $value = $arr[1];
-    if ($value > 0x7fff) {
-      $value = 0 - (($value - 1) ^ 0xffff);
-    }
-
-    return 2;
-  }
-
-  public function readI32(&$value)
-  {
-    $data = $this->trans_->readAll(4);
-    $arr = unpack('N', $data);
-    $value = $arr[1];
-    if ($value > 0x7fffffff) {
-      $value = 0 - (($value - 1) ^ 0xffffffff);
-    }
-
-    return 4;
-  }
-
-  public function readI64(&$value)
-  {
-    $data = $this->trans_->readAll(8);
-
-    $arr = unpack('N2', $data);
-
-    // If we are on a 32bit architecture we have to explicitly deal with
-    // 64-bit twos-complement arithmetic since PHP wants to treat all ints
-    // as signed and any int over 2^31 - 1 as a float
-    if (PHP_INT_SIZE == 4) {
-
-      $hi = $arr[1];
-      $lo = $arr[2];
-      $isNeg = $hi  < 0;
-
-      // Check for a negative
-      if ($isNeg) {
-        $hi = ~$hi & (int) 0xffffffff;
-        $lo = ~$lo & (int) 0xffffffff;
-
-        if ($lo == (int) 0xffffffff) {
-          $hi++;
-          $lo = 0;
-        } else {
-          $lo++;
-        }
-      }
-
-      // Force 32bit words in excess of 2G to pe positive - we deal wigh sign
-      // explicitly below
-
-      if ($hi & (int) 0x80000000) {
-        $hi &= (int) 0x7fffffff;
-        $hi += 0x80000000;
-      }
-
-      if ($lo & (int) 0x80000000) {
-        $lo &= (int) 0x7fffffff;
-        $lo += 0x80000000;
-      }
-
-      $value = $hi * 4294967296 + $lo;
-
-      if ($isNeg) {
-        $value = 0 - $value;
-      }
-    } else {
-
-      // Upcast negatives in LSB bit
-      if ($arr[2] & 0x80000000) {
-        $arr[2] = $arr[2] & 0xffffffff;
-      }
-
-      // Check for a negative
-      if ($arr[1] & 0x80000000) {
-        $arr[1] = $arr[1] & 0xffffffff;
-        $arr[1] = $arr[1] ^ 0xffffffff;
-        $arr[2] = $arr[2] ^ 0xffffffff;
-        $value = 0 - $arr[1]*4294967296 - $arr[2] - 1;
-      } else {
-        $value = $arr[1]*4294967296 + $arr[2];
-      }
-    }
-
-    return 8;
-  }
-
-  public function readDouble(&$value)
-  {
-    $data = strrev($this->trans_->readAll(8));
-    $arr = unpack('d', $data);
-    $value = $arr[1];
-
-    return 8;
-  }
-
-  public function readString(&$value)
-  {
-    $result = $this->readI32($len);
-    if ($len) {
-      $value = $this->trans_->readAll($len);
-    } else {
-      $value = '';
-    }
-
-    return $result + $len;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TBinaryProtocolAccelerated.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TBinaryProtocolAccelerated.php
deleted file mode 100644
index f0e0bb9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TBinaryProtocolAccelerated.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol;
-
-use Thrift\Transport\TBufferedTransport;
-
-/**
- * Accelerated binary protocol: used in conjunction with the thrift_protocol
- * extension for faster deserialization
- */
-class TBinaryProtocolAccelerated extends TBinaryProtocol
-{
-  public function __construct($trans, $strictRead=false, $strictWrite=true)
-  {
-    // If the transport doesn't implement putBack, wrap it in a
-    // TBufferedTransport (which does)
-
-    // NOTE (t.heintz): This is very evil to do, because the TBufferedTransport may swallow bytes, which
-    // are then never written to the underlying transport. This happens precisely when a number of bytes
-    // less than the max buffer size (512 by default) is written to the transport and then flush() is NOT
-    // called. In that case the data stays in the writeBuffer of the transport, from where it can never be
-    // accessed again (for example through read()).
-    //
-    // Since the caller of this method does not know about the wrapping transport, this creates bugs which
-    // are very difficult to find. Hence the wrapping of a transport in a buffer should be left to the
-    // calling code. An interface could used to mandate the presence of the putBack() method in the transport.
-    //
-    // I am leaving this code in nonetheless, because there may be applications depending on this behavior.
-    //
-    // @see THRIFT-1579
-
-    if (!method_exists($trans, 'putBack')) {
-      $trans = new TBufferedTransport($trans);
-    }
-    parent::__construct($trans, $strictRead, $strictWrite);
-  }
-  public function isStrictRead()
-  {
-    return $this->strictRead_;
-  }
-  public function isStrictWrite()
-  {
-    return $this->strictWrite_;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TCompactProtocol.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TCompactProtocol.php
deleted file mode 100644
index c25b050..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TCompactProtocol.php
+++ /dev/null
@@ -1,739 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol;
-
-use Thrift\Type\TType;
-use Thrift\Exception\TProtocolException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Compact implementation of the Thrift protocol.
- *
- */
-class TCompactProtocol extends TProtocol
-{
-  const COMPACT_STOP = 0x00;
-  const COMPACT_TRUE = 0x01;
-  const COMPACT_FALSE = 0x02;
-  const COMPACT_BYTE = 0x03;
-  const COMPACT_I16 = 0x04;
-  const COMPACT_I32 = 0x05;
-  const COMPACT_I64 = 0x06;
-  const COMPACT_DOUBLE = 0x07;
-  const COMPACT_BINARY = 0x08;
-  const COMPACT_LIST = 0x09;
-  const COMPACT_SET = 0x0A;
-  const COMPACT_MAP = 0x0B;
-  const COMPACT_STRUCT = 0x0C;
-
-  const STATE_CLEAR = 0;
-  const STATE_FIELD_WRITE = 1;
-  const STATE_VALUE_WRITE = 2;
-  const STATE_CONTAINER_WRITE = 3;
-  const STATE_BOOL_WRITE = 4;
-  const STATE_FIELD_READ = 5;
-  const STATE_CONTAINER_READ = 6;
-  const STATE_VALUE_READ = 7;
-  const STATE_BOOL_READ = 8;
-
-  const VERSION_MASK = 0x1f;
-  const VERSION = 1;
-  const PROTOCOL_ID = 0x82;
-  const TYPE_MASK = 0xe0;
-  const TYPE_BITS = 0x07;
-  const TYPE_SHIFT_AMOUNT = 5;
-
-  protected static $ctypes = array(
-    TType::STOP => TCompactProtocol::COMPACT_STOP,
-    TType::BOOL => TCompactProtocol::COMPACT_TRUE, // used for collection
-    TType::BYTE => TCompactProtocol::COMPACT_BYTE,
-    TType::I16 => TCompactProtocol::COMPACT_I16,
-    TType::I32 => TCompactProtocol::COMPACT_I32,
-    TType::I64 => TCompactProtocol::COMPACT_I64,
-    TType::DOUBLE => TCompactProtocol::COMPACT_DOUBLE,
-    TType::STRING => TCompactProtocol::COMPACT_BINARY,
-    TType::STRUCT => TCompactProtocol::COMPACT_STRUCT,
-    TType::LST => TCompactProtocol::COMPACT_LIST,
-    TType::SET => TCompactProtocol::COMPACT_SET,
-    TType::MAP => TCompactProtocol::COMPACT_MAP,
-  );
-
-  protected static $ttypes = array(
-    TCompactProtocol::COMPACT_STOP => TType::STOP ,
-    TCompactProtocol::COMPACT_TRUE => TType::BOOL, // used for collection
-    TCompactProtocol::COMPACT_FALSE => TType::BOOL,
-    TCompactProtocol::COMPACT_BYTE => TType::BYTE,
-    TCompactProtocol::COMPACT_I16 => TType::I16,
-    TCompactProtocol::COMPACT_I32 => TType::I32,
-    TCompactProtocol::COMPACT_I64 => TType::I64,
-    TCompactProtocol::COMPACT_DOUBLE => TType::DOUBLE,
-    TCompactProtocol::COMPACT_BINARY => TType::STRING,
-    TCompactProtocol::COMPACT_STRUCT => TType::STRUCT,
-    TCompactProtocol::COMPACT_LIST => TType::LST,
-    TCompactProtocol::COMPACT_SET => TType::SET,
-    TCompactProtocol::COMPACT_MAP => TType::MAP,
-  );
-
-  protected $state = TCompactProtocol::STATE_CLEAR;
-  protected $lastFid = 0;
-  protected $boolFid = null;
-  protected $boolValue = null;
-  protected $structs = array();
-  protected $containers = array();
-
-  // Some varint / zigzag helper methods
-  public function toZigZag($n, $bits)
-  {
-    return ($n << 1) ^ ($n >> ($bits - 1));
-  }
-
-  public function fromZigZag($n)
-  {
-    return ($n >> 1) ^ -($n & 1);
-  }
-
-  public function getVarint($data)
-  {
-    $out = "";
-    while (true) {
-      if (($data & ~0x7f) === 0) {
-        $out .= chr($data);
-        break;
-      } else {
-        $out .= chr(($data & 0xff) | 0x80);
-        $data = $data >> 7;
-      }
-    }
-
-    return $out;
-  }
-
-  public function writeVarint($data)
-  {
-    $out = $this->getVarint($data);
-    $result = TStringFuncFactory::create()->strlen($out);
-    $this->trans_->write($out, $result);
-
-    return $result;
-  }
-
-  public function readVarint(&$result)
-  {
-    $idx = 0;
-    $shift = 0;
-    $result = 0;
-    while (true) {
-      $x = $this->trans_->readAll(1);
-      $arr = unpack('C', $x);
-      $byte = $arr[1];
-      $idx += 1;
-      $result |= ($byte & 0x7f) << $shift;
-      if (($byte >> 7) === 0) {
-        return $idx;
-      }
-      $shift += 7;
-    }
-
-    return $idx;
-  }
-
-  public function __construct($trans)
-  {
-    parent::__construct($trans);
-  }
-
-  public function writeMessageBegin($name, $type, $seqid)
-  {
-    $written =
-      $this->writeUByte(TCompactProtocol::PROTOCOL_ID) +
-      $this->writeUByte(TCompactProtocol::VERSION |
-                        ($type << TCompactProtocol::TYPE_SHIFT_AMOUNT)) +
-      $this->writeVarint($seqid) +
-      $this->writeString($name);
-    $this->state = TCompactProtocol::STATE_VALUE_WRITE;
-
-    return $written;
-  }
-
-  public function writeMessageEnd()
-  {
-    $this->state = TCompactProtocol::STATE_CLEAR;
-
-    return 0;
-  }
-
-  public function writeStructBegin($name)
-  {
-    $this->structs[] = array($this->state, $this->lastFid);
-    $this->state = TCompactProtocol::STATE_FIELD_WRITE;
-    $this->lastFid = 0;
-
-    return 0;
-  }
-
-  public function writeStructEnd()
-  {
-    $old_values = array_pop($this->structs);
-    $this->state = $old_values[0];
-    $this->lastFid = $old_values[1];
-
-    return 0;
-  }
-
-  public function writeFieldStop()
-  {
-    return $this->writeByte(0);
-  }
-
-  public function writeFieldHeader($type, $fid)
-  {
-    $written = 0;
-    $delta = $fid - $this->lastFid;
-    if (0 < $delta && $delta <= 15) {
-      $written = $this->writeUByte(($delta << 4) | $type);
-    } else {
-      $written = $this->writeByte($type) +
-        $this->writeI16($fid);
-    }
-    $this->lastFid = $fid;
-
-    return $written;
-  }
-
-  public function writeFieldBegin($field_name, $field_type, $field_id)
-  {
-    if ($field_type == TTYPE::BOOL) {
-      $this->state = TCompactProtocol::STATE_BOOL_WRITE;
-      $this->boolFid = $field_id;
-
-      return 0;
-    } else {
-      $this->state = TCompactProtocol::STATE_VALUE_WRITE;
-
-      return $this->writeFieldHeader(self::$ctypes[$field_type], $field_id);
-    }
-  }
-
-  public function writeFieldEnd()
-  {
-    $this->state = TCompactProtocol::STATE_FIELD_WRITE;
-
-    return 0;
-  }
-
-  public function writeCollectionBegin($etype, $size)
-  {
-    $written = 0;
-    if ($size <= 14) {
-      $written = $this->writeUByte($size << 4 |
-                                    self::$ctypes[$etype]);
-    } else {
-      $written = $this->writeUByte(0xf0 |
-                                   self::$ctypes[$etype]) +
-        $this->writeVarint($size);
-    }
-    $this->containers[] = $this->state;
-    $this->state = TCompactProtocol::STATE_CONTAINER_WRITE;
-
-    return $written;
-  }
-
-  public function writeMapBegin($key_type, $val_type, $size)
-  {
-    $written = 0;
-    if ($size == 0) {
-      $written = $this->writeByte(0);
-    } else {
-      $written = $this->writeVarint($size) +
-        $this->writeUByte(self::$ctypes[$key_type] << 4 |
-                          self::$ctypes[$val_type]);
-    }
-    $this->containers[] = $this->state;
-
-    return $written;
-  }
-
-  public function writeCollectionEnd()
-  {
-    $this->state = array_pop($this->containers);
-
-    return 0;
-  }
-
-  public function writeMapEnd()
-  {
-    return $this->writeCollectionEnd();
-  }
-
-  public function writeListBegin($elem_type, $size)
-  {
-    return $this->writeCollectionBegin($elem_type, $size);
-  }
-
-  public function writeListEnd()
-  {
-    return $this->writeCollectionEnd();
-  }
-
-  public function writeSetBegin($elem_type, $size)
-  {
-    return $this->writeCollectionBegin($elem_type, $size);
-  }
-
-  public function writeSetEnd()
-  {
-    return $this->writeCollectionEnd();
-  }
-
-  public function writeBool($value)
-  {
-    if ($this->state == TCompactProtocol::STATE_BOOL_WRITE) {
-      $ctype = TCompactProtocol::COMPACT_FALSE;
-      if ($value) {
-        $ctype = TCompactProtocol::COMPACT_TRUE;
-      }
-
-      return $this->writeFieldHeader($ctype, $this->boolFid);
-    } elseif ($this->state == TCompactProtocol::STATE_CONTAINER_WRITE) {
-      return $this->writeByte($value ? 1 : 0);
-    } else {
-      throw new TProtocolException('Invalid state in compact protocol');
-    }
-  }
-
-  public function writeByte($value)
-  {
-    $data = pack('c', $value);
-    $this->trans_->write($data, 1);
-
-    return 1;
-  }
-
-  public function writeUByte($byte)
-  {
-    $this->trans_->write(pack('C', $byte), 1);
-
-    return 1;
-  }
-
-  public function writeI16($value)
-  {
-    $thing = $this->toZigZag($value, 16);
-
-    return $this->writeVarint($thing);
-  }
-
-  public function writeI32($value)
-  {
-    $thing = $this->toZigZag($value, 32);
-
-    return $this->writeVarint($thing);
-  }
-
-  public function writeDouble($value)
-  {
-    $data = pack('d', $value);
-    $this->trans_->write($data, 8);
-
-    return 8;
-  }
-
-  public function writeString($value)
-  {
-    $len = TStringFuncFactory::create()->strlen($value);
-    $result = $this->writeVarint($len);
-    if ($len) {
-      $this->trans_->write($value, $len);
-    }
-
-    return $result + $len;
-  }
-
-  public function readFieldBegin(&$name, &$field_type, &$field_id)
-  {
-    $result = $this->readUByte($compact_type_and_delta);
-
-    $compact_type = $compact_type_and_delta & 0x0f;
-
-    if ($compact_type == TType::STOP) {
-      $field_type = $compact_type;
-      $field_id = 0;
-
-      return $result;
-    }
-    $delta = $compact_type_and_delta >> 4;
-    if ($delta == 0) {
-      $result += $this->readI16($field_id);
-    } else {
-      $field_id = $this->lastFid + $delta;
-    }
-    $this->lastFid = $field_id;
-    $field_type = $this->getTType($compact_type);
-
-    if ($compact_type == TCompactProtocol::COMPACT_TRUE) {
-      $this->state = TCompactProtocol::STATE_BOOL_READ;
-      $this->boolValue = true;
-    } elseif ($compact_type == TCompactProtocol::COMPACT_FALSE) {
-      $this->state = TCompactProtocol::STATE_BOOL_READ;
-      $this->boolValue = false;
-    } else {
-      $this->state = TCompactProtocol::STATE_VALUE_READ;
-    }
-
-    return $result;
-  }
-
-  public function readFieldEnd()
-  {
-    $this->state = TCompactProtocol::STATE_FIELD_READ;
-
-    return 0;
-  }
-
-  public function readUByte(&$value)
-  {
-    $data = $this->trans_->readAll(1);
-    $arr = unpack('C', $data);
-    $value = $arr[1];
-
-    return 1;
-  }
-
-  public function readByte(&$value)
-  {
-    $data = $this->trans_->readAll(1);
-    $arr = unpack('c', $data);
-    $value = $arr[1];
-
-    return 1;
-  }
-
-  public function readZigZag(&$value)
-  {
-    $result = $this->readVarint($value);
-    $value = $this->fromZigZag($value);
-
-    return $result;
-  }
-
-  public function readMessageBegin(&$name, &$type, &$seqid)
-  {
-    $protoId = 0;
-    $result = $this->readUByte($protoId);
-    if ($protoId != TCompactProtocol::PROTOCOL_ID) {
-      throw new TProtocolException('Bad protocol id in TCompact message');
-    }
-    $verType = 0;
-    $result += $this->readUByte($verType);
-    $type = ($verType >> TCompactProtocol::TYPE_SHIFT_AMOUNT) & TCompactProtocol::TYPE_BITS;
-    $version = $verType & TCompactProtocol::VERSION_MASK;
-    if ($version != TCompactProtocol::VERSION) {
-      throw new TProtocolException('Bad version in TCompact message');
-    }
-    $result += $this->readVarint($seqid);
-    $result += $this->readString($name);
-
-    return $result;
-  }
-
-  public function readMessageEnd()
-  {
-    return 0;
-  }
-
-  public function readStructBegin(&$name)
-  {
-    $name = ''; // unused
-    $this->structs[] = array($this->state, $this->lastFid);
-    $this->state = TCompactProtocol::STATE_FIELD_READ;
-    $this->lastFid = 0;
-
-    return 0;
-  }
-
-  public function readStructEnd()
-  {
-    $last = array_pop($this->structs);
-    $this->state = $last[0];
-    $this->lastFid = $last[1];
-
-    return 0;
-  }
-
-  public function readCollectionBegin(&$type, &$size)
-  {
-    $sizeType = 0;
-    $result = $this->readUByte($sizeType);
-    $size = $sizeType >> 4;
-    $type = $this->getTType($sizeType);
-    if ($size == 15) {
-      $result += $this->readVarint($size);
-    }
-    $this->containers[] = $this->state;
-    $this->state = TCompactProtocol::STATE_CONTAINER_READ;
-
-    return $result;
-  }
-
-  public function readMapBegin(&$key_type, &$val_type, &$size)
-  {
-    $result = $this->readVarint($size);
-    $types = 0;
-    if ($size > 0) {
-      $result += $this->readUByte($types);
-    }
-    $val_type = $this->getTType($types);
-    $key_type = $this->getTType($types >> 4);
-    $this->containers[] = $this->state;
-    $this->state = TCompactProtocol::STATE_CONTAINER_READ;
-
-    return $result;
-  }
-
-  public function readCollectionEnd()
-  {
-    $this->state = array_pop($this->containers);
-
-    return 0;
-  }
-
-  public function readMapEnd()
-  {
-    return $this->readCollectionEnd();
-  }
-
-  public function readListBegin(&$elem_type, &$size)
-  {
-    return $this->readCollectionBegin($elem_type, $size);
-  }
-
-  public function readListEnd()
-  {
-    return $this->readCollectionEnd();
-  }
-
-  public function readSetBegin(&$elem_type, &$size)
-  {
-    return $this->readCollectionBegin($elem_type, $size);
-  }
-
-  public function readSetEnd()
-  {
-    return $this->readCollectionEnd();
-  }
-
-  public function readBool(&$value)
-  {
-    if ($this->state == TCompactProtocol::STATE_BOOL_READ) {
-      $value = $this->boolValue;
-
-      return 0;
-    } elseif ($this->state == TCompactProtocol::STATE_CONTAINER_READ) {
-      return $this->readByte($value);
-    } else {
-      throw new TProtocolException('Invalid state in compact protocol');
-    }
-  }
-
-  public function readI16(&$value)
-  {
-    return $this->readZigZag($value);
-  }
-
-  public function readI32(&$value)
-  {
-    return $this->readZigZag($value);
-  }
-
-  public function readDouble(&$value)
-  {
-    $data = $this->trans_->readAll(8);
-    $arr = unpack('d', $data);
-    $value = $arr[1];
-
-    return 8;
-  }
-
-  public function readString(&$value)
-  {
-    $result = $this->readVarint($len);
-    if ($len) {
-      $value = $this->trans_->readAll($len);
-    } else {
-      $value = '';
-    }
-
-    return $result + $len;
-  }
-
-  public function getTType($byte)
-  {
-    return self::$ttypes[$byte & 0x0f];
-  }
-
-  // If we are on a 32bit architecture we have to explicitly deal with
-  // 64-bit twos-complement arithmetic since PHP wants to treat all ints
-  // as signed and any int over 2^31 - 1 as a float
-
-  // Read and write I64 as two 32 bit numbers $hi and $lo
-
-  public function readI64(&$value)
-  {
-    // Read varint from wire
-    $hi = 0;
-    $lo = 0;
-
-    $idx = 0;
-    $shift = 0;
-
-    while (true) {
-      $x = $this->trans_->readAll(1);
-      $arr = unpack('C', $x);
-      $byte = $arr[1];
-      $idx += 1;
-      // Shift hi and lo together.
-      if ($shift < 28) {
-        $lo |= (($byte & 0x7f) << $shift);
-      } elseif ($shift == 28) {
-        $lo |= (($byte & 0x0f) << 28);
-        $hi |= (($byte & 0x70) >> 4);
-      } else {
-        $hi |= (($byte & 0x7f) << ($shift - 32));
-      }
-      if (($byte >> 7) === 0) {
-        break;
-      }
-      $shift += 7;
-    }
-
-    // Now, unzig it.
-    $xorer = 0;
-    if ($lo & 1) {
-      $xorer = 0xffffffff;
-    }
-    $lo = ($lo >> 1) & 0x7fffffff;
-    $lo = $lo | (($hi & 1) << 31);
-    $hi = ($hi >> 1) ^ $xorer;
-    $lo = $lo ^ $xorer;
-
-    // Now put $hi and $lo back together
-    $isNeg = $hi < 0 || $hi & 0x80000000;
-
-    // Check for a negative
-    if ($isNeg) {
-      $hi = ~$hi & (int) 0xffffffff;
-      $lo = ~$lo & (int) 0xffffffff;
-
-      if ($lo == (int) 0xffffffff) {
-        $hi++;
-        $lo = 0;
-      } else {
-        $lo++;
-      }
-    }
-
-    // Force 32bit words in excess of 2G to be positive - we deal with sign
-    // explicitly below
-
-    if ($hi & (int) 0x80000000) {
-      $hi &= (int) 0x7fffffff;
-      $hi += 0x80000000;
-    }
-
-    if ($lo & (int) 0x80000000) {
-      $lo &= (int) 0x7fffffff;
-      $lo += 0x80000000;
-    }
-
-    // Create as negative value first, since we can store -2^63 but not 2^63
-    $value = -$hi * 4294967296 - $lo;
-
-    if (!$isNeg) {
-      $value = -$value;
-    }
-
-    return $idx;
-  }
-
-  public function writeI64($value)
-  {
-    // If we are in an I32 range, use the easy method below.
-    if (($value > 4294967296) || ($value < -4294967296)) {
-      // Convert $value to $hi and $lo
-      $neg = $value < 0;
-
-      if ($neg) {
-        $value *= -1;
-      }
-
-      $hi = (int) $value >> 32;
-      $lo = (int) $value & 0xffffffff;
-
-      if ($neg) {
-        $hi = ~$hi;
-        $lo = ~$lo;
-        if (($lo & (int) 0xffffffff) == (int) 0xffffffff) {
-          $lo = 0;
-          $hi++;
-        } else {
-          $lo++;
-        }
-      }
-
-      // Now do the zigging and zagging.
-      $xorer = 0;
-      if ($neg) {
-        $xorer = 0xffffffff;
-      }
-      $lowbit = ($lo >> 31) & 1;
-      $hi = ($hi << 1) | $lowbit;
-      $lo = ($lo << 1);
-      $lo = ($lo ^ $xorer) & 0xffffffff;
-      $hi = ($hi ^ $xorer) & 0xffffffff;
-
-      // now write out the varint, ensuring we shift both hi and lo
-      $out = "";
-      while (true) {
-        if (($lo & ~0x7f) === 0 &&
-           $hi === 0) {
-          $out .= chr($lo);
-          break;
-        } else {
-          $out .= chr(($lo & 0xff) | 0x80);
-          $lo = $lo >> 7;
-          $lo = $lo | ($hi << 25);
-          $hi = $hi >> 7;
-          // Right shift carries sign, but we don't want it to.
-          $hi = $hi & (127 << 25);
-        }
-      }
-
-      $ret = TStringFuncFactory::create()->strlen($out);
-      $this->trans_->write($out, $ret);
-
-      return $ret;
-    } else {
-      return $this->writeVarint($this->toZigZag($value, 64));
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TJSONProtocol.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TJSONProtocol.php
deleted file mode 100644
index 6d8e81f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TJSONProtocol.php
+++ /dev/null
@@ -1,807 +0,0 @@
-<?php
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol;
-
-use Thrift\Type\TType;
-use Thrift\Exception\TProtocolException;
-use Thrift\Protocol\JSON\BaseContext;
-use Thrift\Protocol\JSON\LookaheadReader;
-use Thrift\Protocol\JSON\PairContext;
-use Thrift\Protocol\JSON\ListContext;
-
-/**
- * JSON implementation of thrift protocol, ported from Java.
- */
-class TJSONProtocol extends TProtocol
-{
-    const COMMA = ',';
-    const COLON = ':';
-    const LBRACE = '{';
-    const RBRACE = '}';
-    const LBRACKET = '[';
-    const RBRACKET = ']';
-    const QUOTE = '"';
-    const BACKSLASH = '\\';
-    const ZERO = '0';
-    const ESCSEQ = '\\';
-    const DOUBLEESC = '__DOUBLE_ESCAPE_SEQUENCE__';
-
-    const VERSION = 1;
-
-    public static $JSON_CHAR_TABLE = array(
-        /*  0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F */
-        0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0, // 0
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1
-        1, 1, '"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2
-    );
-
-    public static $ESCAPE_CHARS = array('"', '\\', '/', "b", "f", "n", "r", "t");
-
-    public static $ESCAPE_CHAR_VALS = array(
-        '"', '\\', '/', "\x08", "\f", "\n", "\r", "\t",
-    );
-
-    const NAME_BOOL = "tf";
-    const NAME_BYTE = "i8";
-    const NAME_I16 = "i16";
-    const NAME_I32 = "i32";
-    const NAME_I64 = "i64";
-    const NAME_DOUBLE = "dbl";
-    const NAME_STRUCT = "rec";
-    const NAME_STRING = "str";
-    const NAME_MAP = "map";
-    const NAME_LIST = "lst";
-    const NAME_SET = "set";
-
-    private function getTypeNameForTypeID($typeID)
-    {
-        switch ($typeID) {
-            case TType::BOOL:
-                return self::NAME_BOOL;
-            case TType::BYTE:
-                return self::NAME_BYTE;
-            case TType::I16:
-                return self::NAME_I16;
-            case TType::I32:
-                return self::NAME_I32;
-            case TType::I64:
-                return self::NAME_I64;
-            case TType::DOUBLE:
-                return self::NAME_DOUBLE;
-            case TType::STRING:
-                return self::NAME_STRING;
-            case TType::STRUCT:
-                return self::NAME_STRUCT;
-            case TType::MAP:
-                return self::NAME_MAP;
-            case TType::SET:
-                return self::NAME_SET;
-            case TType::LST:
-                return self::NAME_LIST;
-            default:
-                throw new TProtocolException("Unrecognized type", TProtocolException::UNKNOWN);
-        }
-    }
-
-    private function getTypeIDForTypeName($name)
-    {
-        $result = TType::STOP;
-
-        if (strlen($name) > 1) {
-            switch (substr($name, 0, 1)) {
-                case 'd':
-                    $result = TType::DOUBLE;
-                    break;
-                case 'i':
-                    switch (substr($name, 1, 1)) {
-                        case '8':
-                            $result = TType::BYTE;
-                            break;
-                        case '1':
-                            $result = TType::I16;
-                            break;
-                        case '3':
-                            $result = TType::I32;
-                            break;
-                        case '6':
-                            $result = TType::I64;
-                            break;
-                    }
-                    break;
-                case 'l':
-                    $result = TType::LST;
-                    break;
-                case 'm':
-                    $result = TType::MAP;
-                    break;
-                case 'r':
-                    $result = TType::STRUCT;
-                    break;
-                case 's':
-                    if (substr($name, 1, 1) == 't') {
-                        $result = TType::STRING;
-                    } elseif (substr($name, 1, 1) == 'e') {
-                        $result = TType::SET;
-                    }
-                    break;
-                case 't':
-                    $result = TType::BOOL;
-                    break;
-            }
-        }
-        if ($result == TType::STOP) {
-            throw new TProtocolException("Unrecognized type", TProtocolException::INVALID_DATA);
-        }
-
-        return $result;
-    }
-
-    public $contextStack_ = array();
-    public $context_;
-    public $reader_;
-
-    private function pushContext($c)
-    {
-        array_push($this->contextStack_, $this->context_);
-        $this->context_ = $c;
-    }
-
-    private function popContext()
-    {
-        $this->context_ = array_pop($this->contextStack_);
-    }
-
-    public function __construct($trans)
-    {
-        parent::__construct($trans);
-        $this->context_ = new BaseContext();
-        $this->reader_ = new LookaheadReader($this);
-    }
-
-    public function reset()
-    {
-        $this->contextStack_ = array();
-        $this->context_ = new BaseContext();
-        $this->reader_ = new LookaheadReader($this);
-    }
-
-    private $tmpbuf_ = array(4);
-
-    public function readJSONSyntaxChar($b)
-    {
-        $ch = $this->reader_->read();
-
-        if (substr($ch, 0, 1) != $b) {
-            throw new TProtocolException("Unexpected character: " . $ch, TProtocolException::INVALID_DATA);
-        }
-    }
-
-    private function hexVal($s)
-    {
-        for ($i = 0; $i < strlen($s); $i++) {
-            $ch = substr($s, $i, 1);
-
-            if (!($ch >= "a" && $ch <= "f") && !($ch >= "0" && $ch <= "9")) {
-                throw new TProtocolException("Expected hex character " . $ch, TProtocolException::INVALID_DATA);
-            }
-        }
-
-        return hexdec($s);
-    }
-
-    private function hexChar($val)
-    {
-        return dechex($val);
-    }
-
-    private function hasJSONUnescapedUnicode()
-    {
-        if (PHP_MAJOR_VERSION > 5
-            || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4))
-            return true;
-
-        return false;
-    }
-
-    private function unescapedUnicode($str)
-    {
-        if ($this->hasJSONUnescapedUnicode()) {
-            return json_encode($str, JSON_UNESCAPED_UNICODE);
-        }
-
-        $json = json_encode($str);
-
-        /*
-         * Unescaped character outside the Basic Multilingual Plane
-         * High surrogate: 0xD800 - 0xDBFF
-         * Low surrogate: 0xDC00 - 0xDFFF
-         */
-        $json = preg_replace_callback('/\\\\u(d[89ab][0-9a-f]{2})\\\\u(d[cdef][0-9a-f]{2})/i',
-            function ($matches) {
-                return mb_convert_encoding(pack('H*', $matches[1].$matches[2]), 'UTF-8', 'UTF-16BE');
-            }, $json);
-
-        /*
-         * Unescaped characters within the Basic Multilingual Plane
-         */
-        $json = preg_replace_callback('/\\\\u([0-9a-f]{4})/i',
-            function ($matches) {
-                return mb_convert_encoding(pack('H*', $matches[1]), 'UTF-8', 'UTF-16BE');
-            }, $json);
-
-        return $json;
-    }
-
-    private function writeJSONString($b)
-    {
-        $this->context_->write();
-
-        if (is_numeric($b) && $this->context_->escapeNum()) {
-            $this->trans_->write(self::QUOTE);
-        }
-
-        $this->trans_->write($this->unescapedUnicode($b));
-
-        if (is_numeric($b) && $this->context_->escapeNum()) {
-            $this->trans_->write(self::QUOTE);
-        }
-    }
-
-    private function writeJSONInteger($num)
-    {
-        $this->context_->write();
-
-        if ($this->context_->escapeNum()) {
-            $this->trans_->write(self::QUOTE);
-        }
-
-        $this->trans_->write($num);
-
-        if ($this->context_->escapeNum()) {
-            $this->trans_->write(self::QUOTE);
-        }
-    }
-
-    private function writeJSONDouble($num)
-    {
-        $this->context_->write();
-
-        if ($this->context_->escapeNum()) {
-            $this->trans_->write(self::QUOTE);
-        }
-
-        $this->trans_->write(json_encode($num));
-
-        if ($this->context_->escapeNum()) {
-            $this->trans_->write(self::QUOTE);
-        }
-    }
-
-    private function writeJSONBase64($data)
-    {
-        $this->context_->write();
-        $this->trans_->write(self::QUOTE);
-        $this->trans_->write(json_encode(base64_encode($data)));
-        $this->trans_->write(self::QUOTE);
-    }
-
-    private function writeJSONObjectStart()
-    {
-      $this->context_->write();
-      $this->trans_->write(self::LBRACE);
-      $this->pushContext(new PairContext($this));
-    }
-
-    private function writeJSONObjectEnd()
-    {
-      $this->popContext();
-      $this->trans_->write(self::RBRACE);
-    }
-
-    private function writeJSONArrayStart()
-    {
-      $this->context_->write();
-      $this->trans_->write(self::LBRACKET);
-      $this->pushContext(new ListContext($this));
-    }
-
-    private function writeJSONArrayEnd()
-    {
-      $this->popContext();
-      $this->trans_->write(self::RBRACKET);
-    }
-
-    private function readJSONString($skipContext)
-    {
-      if (!$skipContext) {
-        $this->context_->read();
-      }
-
-      $jsonString = '';
-      $lastChar = null;
-      while (true) {
-        $ch = $this->reader_->read();
-        $jsonString .= $ch;
-        if ($ch == self::QUOTE &&
-          $lastChar !== NULL &&
-            $lastChar !== self::ESCSEQ) {
-          break;
-        }
-        if ($ch == self::ESCSEQ && $lastChar == self::ESCSEQ) {
-          $lastChar = self::DOUBLEESC;
-        } else {
-          $lastChar = $ch;
-        }
-      }
-
-      return json_decode($jsonString);
-    }
-
-    private function isJSONNumeric($b)
-    {
-        switch ($b) {
-            case '+':
-            case '-':
-            case '.':
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            case 'E':
-            case 'e':
-              return true;
-            }
-
-        return false;
-    }
-
-    private function readJSONNumericChars()
-    {
-        $strbld = array();
-
-        while (true) {
-            $ch = $this->reader_->peek();
-
-            if (!$this->isJSONNumeric($ch)) {
-                break;
-            }
-
-            $strbld[] = $this->reader_->read();
-        }
-
-        return implode("", $strbld);
-    }
-
-    private function readJSONInteger()
-    {
-        $this->context_->read();
-
-        if ($this->context_->escapeNum()) {
-            $this->readJSONSyntaxChar(self::QUOTE);
-        }
-
-        $str = $this->readJSONNumericChars();
-
-        if ($this->context_->escapeNum()) {
-            $this->readJSONSyntaxChar(self::QUOTE);
-        }
-
-        if (!is_numeric($str)) {
-            throw new TProtocolException("Invalid data in numeric: " . $str, TProtocolException::INVALID_DATA);
-        }
-
-        return intval($str);
-    }
-
-    /**
-     * Identical to readJSONInteger but without the final cast.
-     * Needed for proper handling of i64 on 32 bit machines.  Why a
-     * separate function?  So we don't have to force the rest of the
-     * use cases through the extra conditional.
-     */
-    private function readJSONIntegerAsString()
-    {
-        $this->context_->read();
-
-        if ($this->context_->escapeNum()) {
-            $this->readJSONSyntaxChar(self::QUOTE);
-        }
-
-        $str = $this->readJSONNumericChars();
-
-        if ($this->context_->escapeNum()) {
-            $this->readJSONSyntaxChar(self::QUOTE);
-        }
-
-        if (!is_numeric($str)) {
-            throw new TProtocolException("Invalid data in numeric: " . $str, TProtocolException::INVALID_DATA);
-        }
-
-        return $str;
-    }
-
-    private function readJSONDouble()
-    {
-        $this->context_->read();
-
-        if (substr($this->reader_->peek(), 0, 1) == self::QUOTE) {
-            $arr = $this->readJSONString(true);
-
-            if ($arr == "NaN") {
-                return NAN;
-            } elseif ($arr == "Infinity") {
-                return INF;
-            } elseif (!$this->context_->escapeNum()) {
-                throw new TProtocolException("Numeric data unexpectedly quoted " . $arr,
-                                              TProtocolException::INVALID_DATA);
-            }
-
-            return floatval($arr);
-        } else {
-            if ($this->context_->escapeNum()) {
-                $this->readJSONSyntaxChar(self::QUOTE);
-            }
-
-            return floatval($this->readJSONNumericChars());
-        }
-    }
-
-    private function readJSONBase64()
-    {
-        $arr = $this->readJSONString(false);
-        $data = base64_decode($arr, true);
-
-        if ($data === false) {
-            throw new TProtocolException("Invalid base64 data " . $arr, TProtocolException::INVALID_DATA);
-        }
-
-        return $data;
-    }
-
-    private function readJSONObjectStart()
-    {
-        $this->context_->read();
-        $this->readJSONSyntaxChar(self::LBRACE);
-        $this->pushContext(new PairContext($this));
-    }
-
-    private function readJSONObjectEnd()
-    {
-        $this->readJSONSyntaxChar(self::RBRACE);
-        $this->popContext();
-    }
-
-    private function readJSONArrayStart()
-    {
-        $this->context_->read();
-        $this->readJSONSyntaxChar(self::LBRACKET);
-        $this->pushContext(new ListContext($this));
-    }
-
-    private function readJSONArrayEnd()
-    {
-        $this->readJSONSyntaxChar(self::RBRACKET);
-        $this->popContext();
-    }
-
-    /**
-     * Writes the message header
-     *
-     * @param string $name  Function name
-     * @param int    $type  message type TMessageType::CALL or TMessageType::REPLY
-     * @param int    $seqid The sequence id of this message
-     */
-    public function writeMessageBegin($name, $type, $seqid)
-    {
-        $this->writeJSONArrayStart();
-        $this->writeJSONInteger(self::VERSION);
-        $this->writeJSONString($name);
-        $this->writeJSONInteger($type);
-        $this->writeJSONInteger($seqid);
-    }
-
-    /**
-     * Close the message
-     */
-    public function writeMessageEnd()
-    {
-        $this->writeJSONArrayEnd();
-    }
-
-    /**
-     * Writes a struct header.
-     *
-     * @param  string     $name Struct name
-     * @throws TException on write error
-     * @return int        How many bytes written
-     */
-    public function writeStructBegin($name)
-    {
-        $this->writeJSONObjectStart();
-    }
-
-    /**
-     * Close a struct.
-     *
-     * @throws TException on write error
-     * @return int        How many bytes written
-     */
-    public function writeStructEnd()
-    {
-        $this->writeJSONObjectEnd();
-    }
-
-    public function writeFieldBegin($fieldName, $fieldType, $fieldId)
-    {
-        $this->writeJSONInteger($fieldId);
-        $this->writeJSONObjectStart();
-        $this->writeJSONString($this->getTypeNameForTypeID($fieldType));
-    }
-
-    public function writeFieldEnd()
-    {
-        $this->writeJsonObjectEnd();
-    }
-
-    public function writeFieldStop()
-    {
-    }
-
-    public function writeMapBegin($keyType, $valType, $size)
-    {
-        $this->writeJSONArrayStart();
-        $this->writeJSONString($this->getTypeNameForTypeID($keyType));
-        $this->writeJSONString($this->getTypeNameForTypeID($valType));
-        $this->writeJSONInteger($size);
-        $this->writeJSONObjectStart();
-    }
-
-    public function writeMapEnd()
-    {
-        $this->writeJSONObjectEnd();
-        $this->writeJSONArrayEnd();
-    }
-
-    public function writeListBegin($elemType, $size)
-    {
-        $this->writeJSONArrayStart();
-        $this->writeJSONString($this->getTypeNameForTypeID($elemType));
-        $this->writeJSONInteger($size);
-    }
-
-    public function writeListEnd()
-    {
-        $this->writeJSONArrayEnd();
-    }
-
-    public function writeSetBegin($elemType, $size)
-    {
-        $this->writeJSONArrayStart();
-        $this->writeJSONString($this->getTypeNameForTypeID($elemType));
-        $this->writeJSONInteger($size);
-    }
-
-    public function writeSetEnd()
-    {
-        $this->writeJSONArrayEnd();
-    }
-
-    public function writeBool($bool)
-    {
-        $this->writeJSONInteger($bool ? 1 : 0);
-    }
-
-    public function writeByte($byte)
-    {
-        $this->writeJSONInteger($byte);
-    }
-
-    public function writeI16($i16)
-    {
-        $this->writeJSONInteger($i16);
-    }
-
-    public function writeI32($i32)
-    {
-        $this->writeJSONInteger($i32);
-    }
-
-    public function writeI64($i64)
-    {
-        $this->writeJSONInteger($i64);
-    }
-
-    public function writeDouble($dub)
-    {
-        $this->writeJSONDouble($dub);
-    }
-
-    public function writeString($str)
-    {
-        $this->writeJSONString($str);
-    }
-
-    /**
-     * Reads the message header
-     *
-     * @param string $name Function name
-     * @param int    $type message type TMessageType::CALL or TMessageType::REPLY
-     * @parem int $seqid The sequence id of this message
-     */
-    public function readMessageBegin(&$name, &$type, &$seqid)
-    {
-        $this->readJSONArrayStart();
-
-        if ($this->readJSONInteger() != self::VERSION) {
-            throw new TProtocolException("Message contained bad version", TProtocolException::BAD_VERSION);
-        }
-
-        $name = $this->readJSONString(false);
-        $type = $this->readJSONInteger();
-        $seqid = $this->readJSONInteger();
-
-        return true;
-    }
-
-    /**
-     * Read the close of message
-     */
-    public function readMessageEnd()
-    {
-        $this->readJSONArrayEnd();
-    }
-
-    public function readStructBegin(&$name)
-    {
-        $this->readJSONObjectStart();
-
-        return 0;
-    }
-
-    public function readStructEnd()
-    {
-        $this->readJSONObjectEnd();
-    }
-
-    public function readFieldBegin(&$name, &$fieldType, &$fieldId)
-    {
-        $ch = $this->reader_->peek();
-        $name = "";
-
-        if (substr($ch, 0, 1) == self::RBRACE) {
-            $fieldType = TType::STOP;
-        } else {
-            $fieldId = $this->readJSONInteger();
-            $this->readJSONObjectStart();
-            $fieldType = $this->getTypeIDForTypeName($this->readJSONString(false));
-        }
-    }
-
-    public function readFieldEnd()
-    {
-        $this->readJSONObjectEnd();
-    }
-
-    public function readMapBegin(&$keyType, &$valType, &$size)
-    {
-        $this->readJSONArrayStart();
-        $keyType = $this->getTypeIDForTypeName($this->readJSONString(false));
-        $valType = $this->getTypeIDForTypeName($this->readJSONString(false));
-        $size = $this->readJSONInteger();
-        $this->readJSONObjectStart();
-    }
-
-    public function readMapEnd()
-    {
-        $this->readJSONObjectEnd();
-        $this->readJSONArrayEnd();
-    }
-
-    public function readListBegin(&$elemType, &$size)
-    {
-        $this->readJSONArrayStart();
-        $elemType = $this->getTypeIDForTypeName($this->readJSONString(false));
-        $size = $this->readJSONInteger();
-
-        return true;
-    }
-
-    public function readListEnd()
-    {
-        $this->readJSONArrayEnd();
-    }
-
-    public function readSetBegin(&$elemType, &$size)
-    {
-        $this->readJSONArrayStart();
-        $elemType = $this->getTypeIDForTypeName($this->readJSONString(false));
-        $size = $this->readJSONInteger();
-
-        return true;
-    }
-
-    public function readSetEnd()
-    {
-        $this->readJSONArrayEnd();
-    }
-
-    public function readBool(&$bool)
-    {
-        $bool = $this->readJSONInteger() == 0 ? false : true;
-
-        return true;
-    }
-
-    public function readByte(&$byte)
-    {
-        $byte = $this->readJSONInteger();
-
-        return true;
-    }
-
-    public function readI16(&$i16)
-    {
-        $i16 = $this->readJSONInteger();
-
-        return true;
-    }
-
-    public function readI32(&$i32)
-    {
-        $i32 = $this->readJSONInteger();
-
-        return true;
-    }
-
-    public function readI64(&$i64)
-    {
-        if (PHP_INT_SIZE === 4) {
-            $i64 = $this->readJSONIntegerAsString();
-        } else {
-            $i64 = $this->readJSONInteger();
-        }
-
-        return true;
-    }
-
-    public function readDouble(&$dub)
-    {
-        $dub = $this->readJSONDouble();
-
-        return true;
-    }
-
-    public function readString(&$str)
-    {
-        $str = $this->readJSONString(false);
-
-        return true;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TMultiplexedProtocol.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TMultiplexedProtocol.php
deleted file mode 100644
index d579c09..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TMultiplexedProtocol.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol;
-
-use Thrift\Type\TMessageType;
-
-/**
- * <code>TMultiplexedProtocol</code> is a protocol-independent concrete decorator
- * that allows a Thrift client to communicate with a multiplexing Thrift server,
- * by prepending the service name to the function name during function calls.
- *
- * @package Thrift\Protocol
- */
-class TMultiplexedProtocol extends TProtocolDecorator
-{
-    /**
-     * Separator between service name and function name.
-     * Should be the same as used at multiplexed Thrift server.
-     *
-     * @var string
-     */
-    const SEPARATOR = ":";
-
-    /**
-     * The name of service.
-     *
-     * @var string
-     */
-    private $serviceName_;
-
-    /**
-     * Constructor of <code>TMultiplexedProtocol</code> class.
-     *
-     * Wrap the specified protocol, allowing it to be used to communicate with a
-     * multiplexing server.  The <code>$serviceName</code> is required as it is
-     * prepended to the message header so that the multiplexing server can broker
-     * the function call to the proper service.
-     *
-     * @param TProtocol $protocol
-     * @param string    $serviceName The name of service.
-     */
-    public function __construct(TProtocol $protocol, $serviceName)
-    {
-        parent::__construct($protocol);
-        $this->serviceName_ = $serviceName;
-    }
-
-    /**
-     * Writes the message header.
-     * Prepends the service name to the function name, separated by <code>TMultiplexedProtocol::SEPARATOR</code>.
-     *
-     * @param string $name  Function name.
-     * @param int    $type  Message type.
-     * @param int    $seqid The sequence id of this message.
-     */
-    public function writeMessageBegin($name, $type, $seqid)
-    {
-        if ($type == TMessageType::CALL || $type == TMessageType::ONEWAY) {
-            $nameWithService = $this->serviceName_ . self::SEPARATOR . $name;
-            parent::writeMessageBegin($nameWithService, $type, $seqid);
-        } else {
-            parent::writeMessageBegin($name, $type, $seqid);
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TProtocol.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TProtocol.php
deleted file mode 100644
index 0e3bc0d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TProtocol.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol;
-
-use Thrift\Type\TType;
-use Thrift\Exception\TProtocolException;
-
-/**
- * Protocol base class module.
- */
-abstract class TProtocol
-{
-  /**
-   * Underlying transport
-   *
-   * @var TTransport
-   */
-  protected $trans_;
-
-  /**
-   * Constructor
-   */
-  protected function __construct($trans)
-  {
-    $this->trans_ = $trans;
-  }
-
-  /**
-   * Accessor for transport
-   *
-   * @return TTransport
-   */
-  public function getTransport()
-  {
-    return $this->trans_;
-  }
-
-  /**
-   * Writes the message header
-   *
-   * @param string $name Function name
-   * @param int $type message type TMessageType::CALL or TMessageType::REPLY
-   * @param int $seqid The sequence id of this message
-   */
-  abstract public function writeMessageBegin($name, $type, $seqid);
-
-  /**
-   * Close the message
-   */
-  abstract public function writeMessageEnd();
-
-  /**
-   * Writes a struct header.
-   *
-   * @param string     $name Struct name
-   * @throws TException on write error
-   * @return int How many bytes written
-   */
-  abstract public function writeStructBegin($name);
-
-  /**
-   * Close a struct.
-   *
-   * @throws TException on write error
-   * @return int How many bytes written
-   */
-  abstract public function writeStructEnd();
-
-  /*
-   * Starts a field.
-   *
-   * @param string     $name Field name
-   * @param int        $type Field type
-   * @param int        $fid  Field id
-   * @throws TException on write error
-   * @return int How many bytes written
-   */
-  abstract public function writeFieldBegin($fieldName, $fieldType, $fieldId);
-
-  abstract public function writeFieldEnd();
-
-  abstract public function writeFieldStop();
-
-  abstract public function writeMapBegin($keyType, $valType, $size);
-
-  abstract public function writeMapEnd();
-
-  abstract public function writeListBegin($elemType, $size);
-
-  abstract public function writeListEnd();
-
-  abstract public function writeSetBegin($elemType, $size);
-
-  abstract public function writeSetEnd();
-
-  abstract public function writeBool($bool);
-
-  abstract public function writeByte($byte);
-
-  abstract public function writeI16($i16);
-
-  abstract public function writeI32($i32);
-
-  abstract public function writeI64($i64);
-
-  abstract public function writeDouble($dub);
-
-  abstract public function writeString($str);
-
-  /**
-   * Reads the message header
-   *
-   * @param string $name Function name
-   * @param int $type message type TMessageType::CALL or TMessageType::REPLY
-   * @parem int $seqid The sequence id of this message
-   */
-  abstract public function readMessageBegin(&$name, &$type, &$seqid);
-
-  /**
-   * Read the close of message
-   */
-  abstract public function readMessageEnd();
-
-  abstract public function readStructBegin(&$name);
-
-  abstract public function readStructEnd();
-
-  abstract public function readFieldBegin(&$name, &$fieldType, &$fieldId);
-
-  abstract public function readFieldEnd();
-
-  abstract public function readMapBegin(&$keyType, &$valType, &$size);
-
-  abstract public function readMapEnd();
-
-  abstract public function readListBegin(&$elemType, &$size);
-
-  abstract public function readListEnd();
-
-  abstract public function readSetBegin(&$elemType, &$size);
-
-  abstract public function readSetEnd();
-
-  abstract public function readBool(&$bool);
-
-  abstract public function readByte(&$byte);
-
-  abstract public function readI16(&$i16);
-
-  abstract public function readI32(&$i32);
-
-  abstract public function readI64(&$i64);
-
-  abstract public function readDouble(&$dub);
-
-  abstract public function readString(&$str);
-
-  /**
-   * The skip function is a utility to parse over unrecognized date without
-   * causing corruption.
-   *
-   * @param TType $type What type is it
-   */
-  public function skip($type)
-  {
-    switch ($type) {
-    case TType::BOOL:
-      return $this->readBool($bool);
-    case TType::BYTE:
-      return $this->readByte($byte);
-    case TType::I16:
-      return $this->readI16($i16);
-    case TType::I32:
-      return $this->readI32($i32);
-    case TType::I64:
-      return $this->readI64($i64);
-    case TType::DOUBLE:
-      return $this->readDouble($dub);
-    case TType::STRING:
-      return $this->readString($str);
-    case TType::STRUCT:
-      {
-        $result = $this->readStructBegin($name);
-        while (true) {
-          $result += $this->readFieldBegin($name, $ftype, $fid);
-          if ($ftype == TType::STOP) {
-            break;
-          }
-          $result += $this->skip($ftype);
-          $result += $this->readFieldEnd();
-        }
-        $result += $this->readStructEnd();
-
-        return $result;
-      }
-    case TType::MAP:
-      {
-        $result = $this->readMapBegin($keyType, $valType, $size);
-        for ($i = 0; $i < $size; $i++) {
-          $result += $this->skip($keyType);
-          $result += $this->skip($valType);
-        }
-        $result += $this->readMapEnd();
-
-        return $result;
-      }
-    case TType::SET:
-      {
-        $result = $this->readSetBegin($elemType, $size);
-        for ($i = 0; $i < $size; $i++) {
-          $result += $this->skip($elemType);
-        }
-        $result += $this->readSetEnd();
-
-        return $result;
-      }
-    case TType::LST:
-      {
-        $result = $this->readListBegin($elemType, $size);
-        for ($i = 0; $i < $size; $i++) {
-          $result += $this->skip($elemType);
-        }
-        $result += $this->readListEnd();
-
-        return $result;
-      }
-    default:
-      throw new TProtocolException('Unknown field type: '.$type,
-                                   TProtocolException::INVALID_DATA);
-    }
-  }
-
-  /**
-   * Utility for skipping binary data
-   *
-   * @param TTransport $itrans TTransport object
-   * @param int        $type   Field type
-   */
-  public static function skipBinary($itrans, $type)
-  {
-    switch ($type) {
-    case TType::BOOL:
-      return $itrans->readAll(1);
-    case TType::BYTE:
-      return $itrans->readAll(1);
-    case TType::I16:
-      return $itrans->readAll(2);
-    case TType::I32:
-      return $itrans->readAll(4);
-    case TType::I64:
-      return $itrans->readAll(8);
-    case TType::DOUBLE:
-      return $itrans->readAll(8);
-    case TType::STRING:
-      $len = unpack('N', $itrans->readAll(4));
-      $len = $len[1];
-      if ($len > 0x7fffffff) {
-        $len = 0 - (($len - 1) ^ 0xffffffff);
-      }
-
-      return 4 + $itrans->readAll($len);
-    case TType::STRUCT:
-      {
-        $result = 0;
-        while (true) {
-          $ftype = 0;
-          $fid = 0;
-          $data = $itrans->readAll(1);
-          $arr = unpack('c', $data);
-          $ftype = $arr[1];
-          if ($ftype == TType::STOP) {
-            break;
-          }
-          // I16 field id
-          $result += $itrans->readAll(2);
-          $result += self::skipBinary($itrans, $ftype);
-        }
-
-        return $result;
-      }
-    case TType::MAP:
-      {
-        // Ktype
-        $data = $itrans->readAll(1);
-        $arr = unpack('c', $data);
-        $ktype = $arr[1];
-        // Vtype
-        $data = $itrans->readAll(1);
-        $arr = unpack('c', $data);
-        $vtype = $arr[1];
-        // Size
-        $data = $itrans->readAll(4);
-        $arr = unpack('N', $data);
-        $size = $arr[1];
-        if ($size > 0x7fffffff) {
-          $size = 0 - (($size - 1) ^ 0xffffffff);
-        }
-        $result = 6;
-        for ($i = 0; $i < $size; $i++) {
-          $result += self::skipBinary($itrans, $ktype);
-          $result += self::skipBinary($itrans, $vtype);
-        }
-
-        return $result;
-      }
-    case TType::SET:
-    case TType::LST:
-      {
-        // Vtype
-        $data = $itrans->readAll(1);
-        $arr = unpack('c', $data);
-        $vtype = $arr[1];
-        // Size
-        $data = $itrans->readAll(4);
-        $arr = unpack('N', $data);
-        $size = $arr[1];
-        if ($size > 0x7fffffff) {
-          $size = 0 - (($size - 1) ^ 0xffffffff);
-        }
-        $result = 5;
-        for ($i = 0; $i < $size; $i++) {
-          $result += self::skipBinary($itrans, $vtype);
-        }
-
-        return $result;
-      }
-    default:
-      throw new TProtocolException('Unknown field type: '.$type,
-                                   TProtocolException::INVALID_DATA);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TProtocolDecorator.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TProtocolDecorator.php
deleted file mode 100644
index c08c4d5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TProtocolDecorator.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol;
-use Thrift\Exception\TException;
-
-/**
- * <code>TProtocolDecorator</code> forwards all requests to an enclosed
- * <code>TProtocol</code> instance, providing a way to author concise
- * concrete decorator subclasses. While it has no abstract methods, it
- * is marked abstract as a reminder that by itself, it does not modify
- * the behaviour of the enclosed <code>TProtocol</code>.
- *
- * @package Thrift\Protocol
- */
-abstract class TProtocolDecorator extends TProtocol
-{
-    /**
-     * Instance of protocol, to which all operations will be forwarded.
-     *
-     * @var TProtocol
-     */
-    private $concreteProtocol_;
-
-    /**
-     * Constructor of <code>TProtocolDecorator</code> class.
-     * Encloses the specified protocol.
-     *
-     * @param TProtocol $protocol All operations will be forward to this instance. Must be non-null.
-     */
-    protected function __construct(TProtocol $protocol)
-    {
-        parent::__construct($protocol->getTransport());
-        $this->concreteProtocol_ = $protocol;
-    }
-
-    /**
-     * Writes the message header.
-     *
-     * @param string $name  Function name
-     * @param int    $type  message type TMessageType::CALL or TMessageType::REPLY
-     * @param int    $seqid The sequence id of this message
-     */
-    public function writeMessageBegin($name, $type, $seqid)
-    {
-        return $this->concreteProtocol_->writeMessageBegin($name, $type, $seqid);
-    }
-
-    /**
-     * Closes the message.
-     */
-    public function writeMessageEnd()
-    {
-        return $this->concreteProtocol_->writeMessageEnd();
-    }
-
-    /**
-     * Writes a struct header.
-     *
-     * @param string $name Struct name
-     *
-     * @throws TException on write error
-     * @return int        How many bytes written
-     */
-    public function writeStructBegin($name)
-    {
-        return $this->concreteProtocol_->writeStructBegin($name);
-    }
-
-    /**
-     * Close a struct.
-     *
-     * @throws TException on write error
-     * @return int        How many bytes written
-     */
-    public function writeStructEnd()
-    {
-        return $this->concreteProtocol_->writeStructEnd();
-    }
-
-    public function writeFieldBegin($fieldName, $fieldType, $fieldId)
-    {
-        return $this->concreteProtocol_->writeFieldBegin($fieldName, $fieldType, $fieldId);
-    }
-
-    public function writeFieldEnd()
-    {
-        return $this->concreteProtocol_->writeFieldEnd();
-    }
-
-    public function writeFieldStop()
-    {
-        return $this->concreteProtocol_->writeFieldStop();
-    }
-
-    public function writeMapBegin($keyType, $valType, $size)
-    {
-        return $this->concreteProtocol_->writeMapBegin($keyType, $valType, $size);
-    }
-
-    public function writeMapEnd()
-    {
-        return $this->concreteProtocol_->writeMapEnd();
-    }
-
-    public function writeListBegin($elemType, $size)
-    {
-        return $this->concreteProtocol_->writeListBegin($elemType, $size);
-    }
-
-    public function writeListEnd()
-    {
-        return $this->concreteProtocol_->writeListEnd();
-    }
-
-    public function writeSetBegin($elemType, $size)
-    {
-        return $this->concreteProtocol_->writeSetBegin($elemType, $size);
-    }
-
-    public function writeSetEnd()
-    {
-        return $this->concreteProtocol_->writeSetEnd();
-    }
-
-    public function writeBool($bool)
-    {
-        return $this->concreteProtocol_->writeBool($bool);
-    }
-
-    public function writeByte($byte)
-    {
-        return $this->concreteProtocol_->writeByte($byte);
-    }
-
-    public function writeI16($i16)
-    {
-        return $this->concreteProtocol_->writeI16($i16);
-    }
-
-    public function writeI32($i32)
-    {
-        return $this->concreteProtocol_->writeI32($i32);
-    }
-
-    public function writeI64($i64)
-    {
-        return $this->concreteProtocol_->writeI64($i64);
-    }
-
-    public function writeDouble($dub)
-    {
-        return $this->concreteProtocol_->writeDouble($dub);
-    }
-
-    public function writeString($str)
-    {
-        return $this->concreteProtocol_->writeString($str);
-    }
-
-    /**
-     * Reads the message header
-     *
-     * @param string $name  Function name
-     * @param int    $type  message type TMessageType::CALL or TMessageType::REPLY
-     * @param int    $seqid The sequence id of this message
-     */
-    public function readMessageBegin(&$name, &$type, &$seqid)
-    {
-        return $this->concreteProtocol_->readMessageBegin($name, $type, $seqid);
-    }
-
-    /**
-     * Read the close of message
-     */
-    public function readMessageEnd()
-    {
-        return $this->concreteProtocol_->readMessageEnd();
-    }
-
-    public function readStructBegin(&$name)
-    {
-        return $this->concreteProtocol_->readStructBegin($name);
-    }
-
-    public function readStructEnd()
-    {
-        return $this->concreteProtocol_->readStructEnd();
-    }
-
-    public function readFieldBegin(&$name, &$fieldType, &$fieldId)
-    {
-        return $this->concreteProtocol_->readFieldBegin($name, $fieldType, $fieldId);
-    }
-
-    public function readFieldEnd()
-    {
-        return $this->concreteProtocol_->readFieldEnd();
-    }
-
-    public function readMapBegin(&$keyType, &$valType, &$size)
-    {
-        $this->concreteProtocol_->readMapBegin($keyType, $valType, $size);
-    }
-
-    public function readMapEnd()
-    {
-        return $this->concreteProtocol_->readMapEnd();
-    }
-
-    public function readListBegin(&$elemType, &$size)
-    {
-        $this->concreteProtocol_->readListBegin($elemType, $size);
-    }
-
-    public function readListEnd()
-    {
-        return $this->concreteProtocol_->readListEnd();
-    }
-
-    public function readSetBegin(&$elemType, &$size)
-    {
-        return $this->concreteProtocol_->readSetBegin($elemType, $size);
-    }
-
-    public function readSetEnd()
-    {
-        return $this->concreteProtocol_->readSetEnd();
-    }
-
-    public function readBool(&$bool)
-    {
-        return $this->concreteProtocol_->readBool($bool);
-    }
-
-    public function readByte(&$byte)
-    {
-        return $this->concreteProtocol_->readByte($byte);
-    }
-
-    public function readI16(&$i16)
-    {
-        return $this->concreteProtocol_->readI16($i16);
-    }
-
-    public function readI32(&$i32)
-    {
-        return $this->concreteProtocol_->readI32($i32);
-    }
-
-    public function readI64(&$i64)
-    {
-        return $this->concreteProtocol_->readI64($i64);
-    }
-
-    public function readDouble(&$dub)
-    {
-        return $this->concreteProtocol_->readDouble($dub);
-    }
-
-    public function readString(&$str)
-    {
-        return $this->concreteProtocol_->readString($str);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TSimpleJSONProtocol.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TSimpleJSONProtocol.php
deleted file mode 100644
index 9cf90bd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Protocol/TSimpleJSONProtocol.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- */
-
-namespace Thrift\Protocol;
-
-use Thrift\Exception\TException;
-use Thrift\Exception\TProtocolException;
-use Thrift\Protocol\SimpleJSON\Context;
-use Thrift\Protocol\SimpleJSON\ListContext;
-use Thrift\Protocol\SimpleJSON\StructContext;
-use Thrift\Protocol\SimpleJSON\MapContext;
-use Thrift\Protocol\SimpleJSON\CollectionMapKeyException;
-
-/**
- * SimpleJSON implementation of thrift protocol, ported from Java.
- */
-class TSimpleJSONProtocol extends TProtocol
-{
-    const COMMA = ',';
-    const COLON = ':';
-    const LBRACE = '{';
-    const RBRACE = '}';
-    const LBRACKET = '[';
-    const RBRACKET = ']';
-    const QUOTE = '"';
-
-    const NAME_MAP = "map";
-    const NAME_LIST = "lst";
-    const NAME_SET = "set";
-
-    protected $writeContext_ = null;
-    protected $writeContextStack_ = [];
-
-    /**
-     * Push a new write context onto the stack.
-     */
-    protected function pushWriteContext(Context $c) {
-        $this->writeContextStack_[] = $this->writeContext_;
-        $this->writeContext_ = $c;
-    }
-
-    /**
-     * Pop the last write context off the stack
-     */
-    protected function popWriteContext() {
-        $this->writeContext_ = array_pop($this->writeContextStack_);
-    }
-
-    /**
-     * Used to make sure that we are not encountering a map whose keys are containers
-     */
-    protected function assertContextIsNotMapKey($invalidKeyType) {
-        if ($this->writeContext_->isMapKey()) {
-            throw new CollectionMapKeyException(
-                "Cannot serialize a map with keys that are of type " .
-                $invalidKeyType
-            );
-        }
-    }
-
-    private function writeJSONString($b)
-    {
-        $this->writeContext_->write();
-
-        $this->trans_->write(json_encode((string)$b));
-    }
-
-    private function writeJSONInteger($num)
-    {
-        $isMapKey = $this->writeContext_->isMapKey();
-
-        $this->writeContext_->write();
-
-        if ($isMapKey) {
-            $this->trans_->write(self::QUOTE);
-        }
-
-        $this->trans_->write((int)$num);
-
-        if ($isMapKey) {
-            $this->trans_->write(self::QUOTE);
-        }
-    }
-
-    private function writeJSONDouble($num)
-    {
-        $isMapKey = $this->writeContext_->isMapKey();
-
-        $this->writeContext_->write();
-
-        if ($isMapKey) {
-            $this->trans_->write(self::QUOTE);
-        }
-
-        $this->trans_->write(json_encode((float)$num));
-
-        if ($isMapKey) {
-            $this->trans_->write(self::QUOTE);
-        }
-    }
-
-    /**
-     * Constructor
-     */
-    public function __construct($trans)
-    {
-        parent::__construct($trans);
-        $this->writeContext_ = new Context();
-    }
-
-    /**
-     * Writes the message header
-     *
-     * @param string $name  Function name
-     * @param int    $type  message type TMessageType::CALL or TMessageType::REPLY
-     * @param int    $seqid The sequence id of this message
-     */
-    public function writeMessageBegin($name, $type, $seqid)
-    {
-        $this->trans_->write(self::LBRACKET);
-        $this->pushWriteContext(new ListContext($this));
-        $this->writeJSONString($name);
-        $this->writeJSONInteger($type);
-        $this->writeJSONInteger($seqid);
-    }
-
-    /**
-     * Close the message
-     */
-    public function writeMessageEnd()
-    {
-        $this->popWriteContext();
-        $this->trans_->write(self::RBRACKET);
-    }
-
-    /**
-     * Writes a struct header.
-     *
-     * @param  string     $name Struct name
-     */
-    public function writeStructBegin($name)
-    {
-        $this->writeContext_->write();
-        $this->trans_->write(self::LBRACE);
-        $this->pushWriteContext(new StructContext($this));
-    }
-
-    /**
-     * Close a struct.
-     */
-    public function writeStructEnd()
-    {
-        $this->popWriteContext();
-        $this->trans_->write(self::RBRACE);
-    }
-
-    public function writeFieldBegin($fieldName, $fieldType, $fieldId)
-    {
-        $this->writeJSONString($fieldName);
-    }
-
-    public function writeFieldEnd()
-    {
-    }
-
-    public function writeFieldStop()
-    {
-    }
-
-    public function writeMapBegin($keyType, $valType, $size)
-    {
-        $this->assertContextIsNotMapKey(self::NAME_MAP);
-        $this->writeContext_->write();
-        $this->trans_->write(self::LBRACE);
-        $this->pushWriteContext(new MapContext($this));
-    }
-
-    public function writeMapEnd()
-    {
-        $this->popWriteContext();
-        $this->trans_->write(self::RBRACE);
-    }
-
-    public function writeListBegin($elemType, $size)
-    {
-        $this->assertContextIsNotMapKey(self::NAME_LIST);
-        $this->writeContext_->write();
-        $this->trans_->write(self::LBRACKET);
-        $this->pushWriteContext(new ListContext($this));
-        // No metadata!
-    }
-
-    public function writeListEnd()
-    {
-        $this->popWriteContext();
-        $this->trans_->write(self::RBRACKET);
-    }
-
-    public function writeSetBegin($elemType, $size)
-    {
-        $this->assertContextIsNotMapKey(self::NAME_SET);
-        $this->writeContext_->write();
-        $this->trans_->write(self::LBRACKET);
-        $this->pushWriteContext(new ListContext($this));
-        // No metadata!
-    }
-
-    public function writeSetEnd()
-    {
-        $this->popWriteContext();
-        $this->trans_->write(self::RBRACKET);
-    }
-
-    public function writeBool($bool)
-    {
-        $this->writeJSONInteger($bool ? 1 : 0);
-    }
-
-    public function writeByte($byte)
-    {
-        $this->writeJSONInteger($byte);
-    }
-
-    public function writeI16($i16)
-    {
-        $this->writeJSONInteger($i16);
-    }
-
-    public function writeI32($i32)
-    {
-        $this->writeJSONInteger($i32);
-    }
-
-    public function writeI64($i64)
-    {
-        $this->writeJSONInteger($i64);
-    }
-
-    public function writeDouble($dub)
-    {
-        $this->writeJSONDouble($dub);
-    }
-
-    public function writeString($str)
-    {
-        $this->writeJSONString($str);
-    }
-
-    /**
-     * Reading methods.
-     *
-     * simplejson is not meant to be read back into thrift
-     * - see http://wiki.apache.org/thrift/ThriftUsageJava
-     * - use JSON instead
-     */
-
-    public function readMessageBegin(&$name, &$type, &$seqid)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readMessageEnd()
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readStructBegin(&$name)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readStructEnd()
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readFieldBegin(&$name, &$fieldType, &$fieldId)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readFieldEnd()
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readMapBegin(&$keyType, &$valType, &$size)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readMapEnd()
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readListBegin(&$elemType, &$size)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readListEnd()
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readSetBegin(&$elemType, &$size)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readSetEnd()
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readBool(&$bool)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readByte(&$byte)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readI16(&$i16)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readI32(&$i32)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readI64(&$i64)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readDouble(&$dub)
-    {
-        throw new TException("Not implemented");
-    }
-
-    public function readString(&$str)
-    {
-        throw new TException("Not implemented");
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Serializer/TBinarySerializer.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Serializer/TBinarySerializer.php
deleted file mode 100644
index aa2f71b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Serializer/TBinarySerializer.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.protocol
- * @author: rmarin (marin.radu@facebook.com)
- */
-
-namespace Thrift\Serializer;
-
-use Thrift\Transport\TMemoryBuffer;
-use Thrift\Protocol\TBinaryProtocolAccelerated;
-use Thrift\Type\TMessageType;
-
-/**
- * Utility class for serializing and deserializing
- * a thrift object using TBinaryProtocolAccelerated.
- */
-class TBinarySerializer
-{
-  // NOTE(rmarin): Because thrift_protocol_write_binary
-  // adds a begin message prefix, you cannot specify
-  // a transport in which to serialize an object. It has to
-  // be a string. Otherwise we will break the compatibility with
-  // normal deserialization.
-  public static function serialize($object)
-  {
-    $transport = new TMemoryBuffer();
-    $protocol = new TBinaryProtocolAccelerated($transport);
-    if (function_exists('thrift_protocol_write_binary')) {
-      thrift_protocol_write_binary($protocol, $object->getName(),
-                                   TMessageType::REPLY, $object,
-                                   0, $protocol->isStrictWrite());
-
-      $protocol->readMessageBegin($unused_name, $unused_type,
-                                  $unused_seqid);
-    } else {
-      $object->write($protocol);
-    }
-    $protocol->getTransport()->flush();
-
-    return $transport->getBuffer();
-  }
-
-  public static function deserialize($string_object, $class_name, $buffer_size  = 8192)
-  {
-     $transport = new TMemoryBuffer();
-     $protocol = new TBinaryProtocolAccelerated($transport);
-     if (function_exists('thrift_protocol_read_binary')) {
-       // NOTE (t.heintz) TBinaryProtocolAccelerated internally wraps our TMemoryBuffer in a
-       // TBufferedTransport, so we have to retrieve it again or risk losing data when writing
-       // less than 512 bytes to the transport (see the comment there as well).
-       // @see THRIFT-1579
-       $protocol->writeMessageBegin('', TMessageType::REPLY, 0);
-       $protocolTransport = $protocol->getTransport();
-       $protocolTransport->write($string_object);
-       $protocolTransport->flush();
-
-       return thrift_protocol_read_binary($protocol, $class_name,
-                                          $protocol->isStrictRead(),
-                                          $buffer_size);
-     } else {
-       $transport->write($string_object);
-       $object = new $class_name();
-       $object->read($protocol);
-
-       return $object;
-     }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TForkingServer.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TForkingServer.php
deleted file mode 100644
index 7f6e541..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TForkingServer.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Thrift\Server;
-
-use Thrift\Transport\TTransport;
-use Thrift\Exception\TException;
-use Thrift\Exception\TTransportException;
-
-/**
- * A forking implementation of a Thrift server.
- *
- * @package thrift.server
- */
-class TForkingServer extends TServer
-{
-  /**
-   * Flag for the main serving loop
-   *
-   * @var bool
-   */
-  private $stop_ = false;
-
-  /**
-   * List of children.
-   *
-   * @var array
-   */
-  protected $children_ = array();
-
-  /**
-   * Listens for new client using the supplied
-   * transport. We fork when a new connection
-   * arrives.
-   *
-   * @return void
-   */
-  public function serve()
-  {
-    $this->transport_->listen();
-
-    while (!$this->stop_) {
-      try {
-        $transport = $this->transport_->accept();
-
-        if ($transport != null) {
-          $pid = pcntl_fork();
-
-          if ($pid > 0) {
-            $this->handleParent($transport, $pid);
-          } elseif ($pid === 0) {
-            $this->handleChild($transport);
-          } else {
-            throw new TException('Failed to fork');
-          }
-        }
-      } catch (TTransportException $e) { }
-
-      $this->collectChildren();
-    }
-  }
-
-  /**
-   * Code run by the parent
-   *
-   * @param TTransport $transport
-   * @param int $pid
-   * @return void
-   */
-  private function handleParent(TTransport $transport, $pid)
-  {
-    $this->children_[$pid] = $transport;
-  }
-
-  /**
-   * Code run by the child.
-   *
-   * @param TTransport $transport
-   * @return void
-   */
-  private function handleChild(TTransport $transport)
-  {
-    try {
-      $inputTransport = $this->inputTransportFactory_->getTransport($transport);
-      $outputTransport = $this->outputTransportFactory_->getTransport($transport);
-      $inputProtocol = $this->inputProtocolFactory_->getProtocol($inputTransport);
-      $outputProtocol = $this->outputProtocolFactory_->getProtocol($outputTransport);
-      while ($this->processor_->process($inputProtocol, $outputProtocol)) { }
-      @$transport->close();
-    } catch (TTransportException $e) { }
-
-    exit(0);
-  }
-
-  /**
-   * Collects any children we may have
-   *
-   * @return void
-   */
-  private function collectChildren()
-  {
-    foreach ($this->children_ as $pid => $transport) {
-      if (pcntl_waitpid($pid, $status, WNOHANG) > 0) {
-        unset($this->children_[$pid]);
-        if ($transport) @$transport->close();
-      }
-    }
-  }
-
-  /**
-   * Stops the server running. Kills the transport
-   * and then stops the main serving loop
-   *
-   * @return void
-   */
-  public function stop()
-  {
-    $this->transport_->close();
-    $this->stop_ = true;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TSSLServerSocket.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TSSLServerSocket.php
deleted file mode 100644
index dfc4704..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TSSLServerSocket.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-namespace Thrift\Server;
-
-use Thrift\Transport\TSSLSocket;
-
-/**
- * Socket implementation of a server agent.
- *
- * @package thrift.transport
- */
-class TSSLServerSocket extends TServerSocket
-{
-  /**
-   * Remote port
-   *
-   * @var resource
-   */
-  protected $context_ = null;
-
-  /**
-   * ServerSocket constructor
-   *
-   * @param string $host        Host to listen on
-   * @param int $port           Port to listen on
-   * @param resource   $context      Stream context
-   * @return void
-   */
-  public function __construct($host = 'localhost', $port = 9090, $context = null)
-  {
-    $ssl_host = $this->getSSLHost($host);
-    parent::__construct($ssl_host, $port);
-    $this->context_ = $context;
-  }
-
-  public function getSSLHost($host)
-  {
-    $transport_protocol_loc = strpos($host, "://");
-    if ($transport_protocol_loc === false) {
-      $host = 'ssl://'.$host;
-    }
-    return $host;
-  }
-
-  /**
-   * Opens a new socket server handle
-   *
-   * @return void
-   */
-  public function listen()
-  {
-    $this->listener_ = @stream_socket_server(
-      $this->host_ . ':' . $this->port_,
-      $errno,
-      $errstr,
-      STREAM_SERVER_BIND|STREAM_SERVER_LISTEN,
-      $this->context_);
-  }
-
-  /**
-   * Implementation of accept. If not client is accepted in the given time
-   *
-   * @return TSocket
-   */
-  protected function acceptImpl()
-  {
-    $handle = @stream_socket_accept($this->listener_, $this->acceptTimeout_ / 1000.0);
-    if(!$handle) return null;
-
-    $socket = new TSSLSocket();
-    $socket->setHandle($handle);
-
-    return $socket;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServer.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServer.php
deleted file mode 100644
index f4d76cc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServer.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace Thrift\Server;
-
-use Thrift\Factory\TTransportFactory;
-use Thrift\Factory\TProtocolFactory;
-
-/**
- * Generic class for a Thrift server.
- *
- * @package thrift.server
- */
-abstract class TServer
-{
-  /**
-   * Processor to handle new clients
-   *
-   * @var TProcessor
-   */
-  protected $processor_;
-
-  /**
-   * Server transport to be used for listening
-   * and accepting new clients
-   *
-   * @var TServerTransport
-   */
-  protected $transport_;
-
-  /**
-   * Input transport factory
-   *
-   * @var TTransportFactory
-   */
-  protected $inputTransportFactory_;
-
-  /**
-   * Output transport factory
-   *
-   * @var TTransportFactory
-   */
-  protected $outputTransportFactory_;
-
-  /**
-   * Input protocol factory
-   *
-   * @var TProtocolFactory
-   */
-  protected $inputProtocolFactory_;
-
-  /**
-   * Output protocol factory
-   *
-   * @var TProtocolFactory
-   */
-  protected $outputProtocolFactory_;
-
-  /**
-   * Sets up all the factories, etc
-   *
-   * @param object $processor
-   * @param TServerTransport $transport
-   * @param TTransportFactory $inputTransportFactory
-   * @param TTransportFactory $outputTransportFactory
-   * @param TProtocolFactory $inputProtocolFactory
-   * @param TProtocolFactory $outputProtocolFactory
-   * @return void
-   */
-  public function __construct($processor,
-                              TServerTransport $transport,
-                              TTransportFactory $inputTransportFactory,
-                              TTransportFactory $outputTransportFactory,
-                              TProtocolFactory $inputProtocolFactory,
-                              TProtocolFactory $outputProtocolFactory) {
-    $this->processor_ = $processor;
-    $this->transport_ = $transport;
-    $this->inputTransportFactory_ = $inputTransportFactory;
-    $this->outputTransportFactory_ = $outputTransportFactory;
-    $this->inputProtocolFactory_ = $inputProtocolFactory;
-    $this->outputProtocolFactory_ = $outputProtocolFactory;
-  }
-
-  /**
-   * Serves the server. This should never return
-   * unless a problem permits it to do so or it
-   * is interrupted intentionally
-   *
-   * @abstract
-   * @return void
-   */
-  abstract public function serve();
-
-  /**
-   * Stops the server serving
-   *
-   * @abstract
-   * @return void
-   */
-  abstract public function stop();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServerSocket.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServerSocket.php
deleted file mode 100644
index da8e226..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServerSocket.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Server;
-
-use Thrift\Transport\TSocket;
-
-/**
- * Socket implementation of a server agent.
- *
- * @package thrift.transport
- */
-class TServerSocket extends TServerTransport
-{
-  /**
-   * Handle for the listener socket
-   *
-   * @var resource
-   */
-  protected $listener_;
-
-  /**
-   * Port for the listener to listen on
-   *
-   * @var int
-   */
-  protected $port_;
-
-  /**
-   * Timeout when listening for a new client
-   *
-   * @var int
-   */
-  protected $acceptTimeout_ = 30000;
-
-  /**
-   * Host to listen on
-   *
-   * @var string
-   */
-  protected $host_;
-
-  /**
-   * ServerSocket constructor
-   *
-   * @param string $host        Host to listen on
-   * @param int $port           Port to listen on
-   * @return void
-   */
-  public function __construct($host = 'localhost', $port = 9090)
-  {
-    $this->host_ = $host;
-    $this->port_ = $port;
-  }
-
-  /**
-   * Sets the accept timeout
-   *
-   * @param int $acceptTimeout
-   * @return void
-   */
-  public function setAcceptTimeout($acceptTimeout)
-  {
-    $this->acceptTimeout_ = $acceptTimeout;
-  }
-
-  /**
-   * Opens a new socket server handle
-   *
-   * @return void
-   */
-  public function listen()
-  {
-    $this->listener_ = stream_socket_server('tcp://' . $this->host_ . ':' . $this->port_);
-  }
-
-  /**
-   * Closes the socket server handle
-   *
-   * @return void
-   */
-  public function close()
-  {
-    @fclose($this->listener_);
-    $this->listener_ = null;
-  }
-
-  /**
-   * Implementation of accept. If not client is accepted in the given time
-   *
-   * @return TSocket
-   */
-  protected function acceptImpl()
-  {
-    $handle = @stream_socket_accept($this->listener_, $this->acceptTimeout_ / 1000.0);
-    if(!$handle) return null;
-
-    $socket = new TSocket();
-    $socket->setHandle($handle);
-
-    return $socket;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServerTransport.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServerTransport.php
deleted file mode 100644
index f82d06d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TServerTransport.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Thrift\Server;
-
-use Thrift\Exception\TTransportException;
-
-/**
- * Generic class for Server agent.
- *
- * @package thrift.transport
- */
-abstract class TServerTransport
-{
-  /**
-   * List for new clients
-   *
-   * @abstract
-   * @return void
-   */
-  abstract public function listen();
-
-  /**
-   * Close the server
-   *
-   * @abstract
-   * @return void
-   */
-  abstract public function close();
-
-  /**
-   * Subclasses should use this to implement
-   * accept.
-   *
-   * @abstract
-   * @return TTransport
-   */
-  abstract protected function acceptImpl();
-
-  /**
-   * Uses the accept implemtation. If null is returned, an
-   * exception is thrown.
-   *
-   * @throws TTransportException
-   * @return TTransport
-   */
-  public function accept()
-  {
-    $transport = $this->acceptImpl();
-
-    if ($transport == null) {
-      throw new TTransportException("accept() may not return NULL");
-    }
-
-    return $transport;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TSimpleServer.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TSimpleServer.php
deleted file mode 100644
index e277700..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Server/TSimpleServer.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Thrift\Server;
-
-use Thrift\Exception\TTransportException;
-
-/**
- * Simple implemtation of a Thrift server.
- *
- * @package thrift.server
- */
-class TSimpleServer extends TServer
-{
-  /**
-   * Flag for the main serving loop
-   *
-   * @var bool
-   */
-  private $stop_ = false;
-
-  /**
-   * Listens for new client using the supplied
-   * transport. It handles TTransportExceptions
-   * to avoid timeouts etc killing it
-   *
-   * @return void
-   */
-  public function serve()
-  {
-    $this->transport_->listen();
-
-    while (!$this->stop_) {
-      try {
-        $transport = $this->transport_->accept();
-
-        if ($transport != null) {
-          $inputTransport = $this->inputTransportFactory_->getTransport($transport);
-          $outputTransport = $this->outputTransportFactory_->getTransport($transport);
-          $inputProtocol = $this->inputProtocolFactory_->getProtocol($inputTransport);
-          $outputProtocol = $this->outputProtocolFactory_->getProtocol($outputTransport);
-          while ($this->processor_->process($inputProtocol, $outputProtocol)) { }
-        }
-      } catch (TTransportException $e) { }
-    }
-  }
-
-  /**
-   * Stops the server running. Kills the transport
-   * and then stops the main serving loop
-   *
-   * @return void
-   */
-  public function stop()
-  {
-    $this->transport_->close();
-    $this->stop_ = true;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/Core.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/Core.php
deleted file mode 100644
index 39a75b3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/Core.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-namespace Thrift\StringFunc;
-
-class Core implements TStringFunc
-{
-    public function substr($str, $start, $length = null)
-    {
-        // specifying a null $length would return an empty string
-        if ($length === null) {
-            return substr($str, $start);
-        }
-
-        return substr($str, $start, $length);
-    }
-
-    public function strlen($str)
-    {
-        return strlen($str);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/Mbstring.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/Mbstring.php
deleted file mode 100644
index 968ff18..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/Mbstring.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-namespace Thrift\StringFunc;
-
-class Mbstring implements TStringFunc
-{
-    public function substr($str, $start, $length = null)
-    {
-        /**
-         * We need to set the charset parameter, which is the second
-         * optional parameter and the first optional parameter can't
-         * be null or false as a "magic" value because that would
-         * cause an empty string to be returned, so we need to
-         * actually calculate the proper length value.
-         */
-        if ($length === null) {
-            $length = $this->strlen($str) - $start;
-        }
-
-        return mb_substr($str, $start, $length, '8bit');
-    }
-
-    public function strlen($str)
-    {
-        return mb_strlen($str, '8bit');
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/TStringFunc.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/TStringFunc.php
deleted file mode 100644
index dea497f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/StringFunc/TStringFunc.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-namespace Thrift\StringFunc;
-
-interface TStringFunc
-{
-    public function substr($str, $start, $length = null);
-    public function strlen($str);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/TMultiplexedProcessor.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/TMultiplexedProcessor.php
deleted file mode 100644
index 138f95b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/TMultiplexedProcessor.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.processor
- */
-
-namespace Thrift;
-
-use Thrift\Exception\TException;
-use Thrift\Protocol\TProtocol;
-use Thrift\Protocol\TMultiplexedProtocol;
-use Thrift\Protocol\TProtocolDecorator;
-use Thrift\Type\TMessageType;
-
-/**
- * <code>TMultiplexedProcessor</code> is a Processor allowing
- * a single <code>TServer</code> to provide multiple services.
- *
- * <p>To do so, you instantiate the processor and then register additional
- * processors with it, as shown in the following example:</p>
- *
- * <blockquote><code>
- *     $processor = new TMultiplexedProcessor();
- *
- *     processor->registerProcessor(
- *         "Calculator",
- *         new \tutorial\CalculatorProcessor(new CalculatorHandler()));
- *
- *     processor->registerProcessor(
- *         "WeatherReport",
- *         new \tutorial\WeatherReportProcessor(new WeatherReportHandler()));
- *
- *     $processor->process($protocol, $protocol);
- * </code></blockquote>
- */
-
-class TMultiplexedProcessor
-{
-    private $serviceProcessorMap_;
-
-    /**
-     * 'Register' a service with this <code>TMultiplexedProcessor</code>.  This
-     * allows us to broker requests to individual services by using the service
-     * name to select them at request time.
-     *
-     * @param serviceName Name of a service, has to be identical to the name
-     * declared in the Thrift IDL, e.g. "WeatherReport".
-     * @param processor Implementation of a service, usually referred to
-     * as "handlers", e.g. WeatherReportHandler implementing WeatherReport.Iface.
-     */
-    public function registerProcessor($serviceName, $processor)
-    {
-        $this->serviceProcessorMap_[$serviceName] = $processor;
-    }
-
-    /**
-     * This implementation of <code>process</code> performs the following steps:
-     *
-     * <ol>
-     *     <li>Read the beginning of the message.</li>
-     *     <li>Extract the service name from the message.</li>
-     *     <li>Using the service name to locate the appropriate processor.</li>
-     *     <li>Dispatch to the processor, with a decorated instance of TProtocol
-     *         that allows readMessageBegin() to return the original Message.</li>
-     * </ol>
-     *
-     * @throws TException If the message type is not CALL or ONEWAY, if
-     *                    the service name was not found in the message, or if the service
-     *                    name was not found in the service map.
-     */
-    public function process(TProtocol $input, TProtocol $output)
-    {
-        /*
-            Use the actual underlying protocol (e.g. TBinaryProtocol) to read the
-            message header. This pulls the message "off the wire", which we'll
-            deal with at the end of this method.
-        */
-        $input->readMessageBegin($fname, $mtype, $rseqid);
-
-        if ($mtype !== TMessageType::CALL && $mtype != TMessageType::ONEWAY) {
-            throw new TException("This should not have happened!?");
-        }
-
-        // Extract the service name and the new Message name.
-        if (strpos($fname, TMultiplexedProtocol::SEPARATOR) === false) {
-            throw new TException("Service name not found in message name: {$fname}. Did you " .
-                "forget to use a TMultiplexProtocol in your client?");
-        }
-        list($serviceName, $messageName) = explode(':', $fname, 2);
-        if (!array_key_exists($serviceName, $this->serviceProcessorMap_)) {
-            throw new TException("Service name not found: {$serviceName}.  Did you forget " .
-                "to call registerProcessor()?");
-        }
-
-        // Dispatch processing to the stored processor
-        $processor = $this->serviceProcessorMap_[$serviceName];
-
-        return $processor->process(
-            new StoredMessageProtocol($input, $messageName, $mtype, $rseqid), $output
-        );
-    }
-}
-
-/**
- *  Our goal was to work with any protocol. In order to do that, we needed
- *  to allow them to call readMessageBegin() and get the Message in exactly
- *  the standard format, without the service name prepended to the Message name.
- */
-class StoredMessageProtocol extends TProtocolDecorator
-{
-    private $fname_, $mtype_, $rseqid_;
-
-    public function __construct(TProtocol $protocol, $fname, $mtype, $rseqid)
-    {
-        parent::__construct($protocol);
-        $this->fname_  = $fname;
-        $this->mtype_  = $mtype;
-        $this->rseqid_ = $rseqid;
-    }
-
-    public function readMessageBegin(&$name, &$type, &$seqid)
-    {
-        $name  = $this->fname_;
-        $type  = $this->mtype_;
-        $seqid = $this->rseqid_;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TBufferedTransport.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TBufferedTransport.php
deleted file mode 100644
index f654ad3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TBufferedTransport.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Buffered transport. Stores data to an internal buffer that it doesn't
- * actually write out until flush is called. For reading, we do a greedy
- * read and then serve data out of the internal buffer.
- *
- * @package thrift.transport
- */
-class TBufferedTransport extends TTransport
-{
-  /**
-   * Constructor. Creates a buffered transport around an underlying transport
-   */
-  public function __construct($transport=null, $rBufSize=512, $wBufSize=512)
-  {
-    $this->transport_ = $transport;
-    $this->rBufSize_ = $rBufSize;
-    $this->wBufSize_ = $wBufSize;
-  }
-
-  /**
-   * The underlying transport
-   *
-   * @var TTransport
-   */
-  protected $transport_ = null;
-
-  /**
-   * The receive buffer size
-   *
-   * @var int
-   */
-  protected $rBufSize_ = 512;
-
-  /**
-   * The write buffer size
-   *
-   * @var int
-   */
-  protected $wBufSize_ = 512;
-
-  /**
-   * The write buffer.
-   *
-   * @var string
-   */
-  protected $wBuf_ = '';
-
-  /**
-   * The read buffer.
-   *
-   * @var string
-   */
-  protected $rBuf_ = '';
-
-  public function isOpen()
-  {
-    return $this->transport_->isOpen();
-  }
-
-  public function open()
-  {
-    $this->transport_->open();
-  }
-
-  public function close()
-  {
-    $this->transport_->close();
-  }
-
-  public function putBack($data)
-  {
-    if (TStringFuncFactory::create()->strlen($this->rBuf_) === 0) {
-      $this->rBuf_ = $data;
-    } else {
-      $this->rBuf_ = ($data . $this->rBuf_);
-    }
-  }
-
-  /**
-   * The reason that we customize readAll here is that the majority of PHP
-   * streams are already internally buffered by PHP. The socket stream, for
-   * example, buffers internally and blocks if you call read with $len greater
-   * than the amount of data available, unlike recv() in C.
-   *
-   * Therefore, use the readAll method of the wrapped transport inside
-   * the buffered readAll.
-   */
-  public function readAll($len)
-  {
-    $have = TStringFuncFactory::create()->strlen($this->rBuf_);
-    if ($have == 0) {
-      $data = $this->transport_->readAll($len);
-    } elseif ($have < $len) {
-      $data = $this->rBuf_;
-      $this->rBuf_ = '';
-      $data .= $this->transport_->readAll($len - $have);
-    } elseif ($have == $len) {
-      $data = $this->rBuf_;
-      $this->rBuf_ = '';
-    } elseif ($have > $len) {
-      $data = TStringFuncFactory::create()->substr($this->rBuf_, 0, $len);
-      $this->rBuf_ = TStringFuncFactory::create()->substr($this->rBuf_, $len);
-    }
-
-    return $data;
-  }
-
-  public function read($len)
-  {
-    if (TStringFuncFactory::create()->strlen($this->rBuf_) === 0) {
-      $this->rBuf_ = $this->transport_->read($this->rBufSize_);
-    }
-
-    if (TStringFuncFactory::create()->strlen($this->rBuf_) <= $len) {
-      $ret = $this->rBuf_;
-      $this->rBuf_ = '';
-
-      return $ret;
-    }
-
-    $ret = TStringFuncFactory::create()->substr($this->rBuf_, 0, $len);
-    $this->rBuf_ = TStringFuncFactory::create()->substr($this->rBuf_, $len);
-
-    return $ret;
-  }
-
-  public function write($buf)
-  {
-    $this->wBuf_ .= $buf;
-    if (TStringFuncFactory::create()->strlen($this->wBuf_) >= $this->wBufSize_) {
-      $out = $this->wBuf_;
-
-      // Note that we clear the internal wBuf_ prior to the underlying write
-      // to ensure we're in a sane state (i.e. internal buffer cleaned)
-      // if the underlying write throws up an exception
-      $this->wBuf_ = '';
-      $this->transport_->write($out);
-    }
-  }
-
-  public function flush()
-  {
-    if (TStringFuncFactory::create()->strlen($this->wBuf_) > 0) {
-      $out = $this->wBuf_;
-
-      // Note that we clear the internal wBuf_ prior to the underlying write
-      // to ensure we're in a sane state (i.e. internal buffer cleaned)
-      // if the underlying write throws up an exception
-      $this->wBuf_ = '';
-      $this->transport_->write($out);
-    }
-    $this->transport_->flush();
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TCurlClient.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TCurlClient.php
deleted file mode 100644
index 4b3e694..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TCurlClient.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * HTTP client for Thrift
- *
- * @package thrift.transport
- */
-class TCurlClient extends TTransport
-{
-  private static $curlHandle;
-
-  /**
-   * The host to connect to
-   *
-   * @var string
-   */
-  protected $host_;
-
-  /**
-   * The port to connect on
-   *
-   * @var int
-   */
-  protected $port_;
-
-  /**
-   * The URI to request
-   *
-   * @var string
-   */
-  protected $uri_;
-
-  /**
-   * The scheme to use for the request, i.e. http, https
-   *
-   * @var string
-   */
-  protected $scheme_;
-
-  /**
-   * Buffer for the HTTP request data
-   *
-   * @var string
-   */
-  protected $request_;
-
-  /**
-   * Buffer for the HTTP response data.
-   *
-   * @var binary string
-   */
-  protected $response_;
-
-  /**
-   * Read timeout
-   *
-   * @var float
-   */
-  protected $timeout_;
-
-  /**
-   * Make a new HTTP client.
-   *
-   * @param string $host
-   * @param int    $port
-   * @param string $uri
-   */
-  public function __construct($host, $port=80, $uri='', $scheme = 'http')
-  {
-    if ((TStringFuncFactory::create()->strlen($uri) > 0) && ($uri{0} != '/')) {
-      $uri = '/'.$uri;
-    }
-    $this->scheme_ = $scheme;
-    $this->host_ = $host;
-    $this->port_ = $port;
-    $this->uri_ = $uri;
-    $this->request_ = '';
-    $this->response_ = null;
-    $this->timeout_ = null;
-  }
-
-  /**
-   * Set read timeout
-   *
-   * @param float $timeout
-   */
-  public function setTimeoutSecs($timeout)
-  {
-    $this->timeout_ = $timeout;
-  }
-
-  /**
-   * Whether this transport is open.
-   *
-   * @return boolean true if open
-   */
-  public function isOpen()
-  {
-    return true;
-  }
-
-  /**
-   * Open the transport for reading/writing
-   *
-   * @throws TTransportException if cannot open
-   */
-  public function open()
-  {
-  }
-
-  /**
-   * Close the transport.
-   */
-  public function close()
-  {
-    $this->request_ = '';
-    $this->response_ = null;
-  }
-
-  /**
-   * Read some data into the array.
-   *
-   * @param int    $len How much to read
-   * @return string The data that has been read
-   * @throws TTransportException if cannot read any more data
-   */
-  public function read($len)
-  {
-    if ($len >= strlen($this->response_)) {
-      return $this->response_;
-    } else {
-      $ret = substr($this->response_, 0, $len);
-      $this->response_ = substr($this->response_, $len);
-
-      return $ret;
-    }
-  }
-
-  /**
-   * Writes some data into the pending buffer
-   *
-   * @param string $buf  The data to write
-   * @throws TTransportException if writing fails
-   */
-  public function write($buf)
-  {
-    $this->request_ .= $buf;
-  }
-
-  /**
-   * Opens and sends the actual request over the HTTP connection
-   *
-   * @throws TTransportException if a writing error occurs
-   */
-  public function flush()
-  {
-    if (!self::$curlHandle) {
-      register_shutdown_function(array('Thrift\\Transport\\TCurlClient', 'closeCurlHandle'));
-      self::$curlHandle = curl_init();
-      curl_setopt(self::$curlHandle, CURLOPT_RETURNTRANSFER, true);
-      curl_setopt(self::$curlHandle, CURLOPT_BINARYTRANSFER, true);
-      curl_setopt(self::$curlHandle, CURLOPT_USERAGENT, 'PHP/TCurlClient');
-      curl_setopt(self::$curlHandle, CURLOPT_CUSTOMREQUEST, 'POST');
-      curl_setopt(self::$curlHandle, CURLOPT_FOLLOWLOCATION, true);
-      curl_setopt(self::$curlHandle, CURLOPT_MAXREDIRS, 1);
-    }
-    // God, PHP really has some esoteric ways of doing simple things.
-    $host = $this->host_.($this->port_ != 80 ? ':'.$this->port_ : '');
-    $fullUrl = $this->scheme_."://".$host.$this->uri_;
-
-    $headers = array('Accept: application/x-thrift',
-                     'Content-Type: application/x-thrift',
-                     'Content-Length: '.TStringFuncFactory::create()->strlen($this->request_));
-    curl_setopt(self::$curlHandle, CURLOPT_HTTPHEADER, $headers);
-
-    if ($this->timeout_ > 0) {
-      curl_setopt(self::$curlHandle, CURLOPT_TIMEOUT, $this->timeout_);
-    }
-    curl_setopt(self::$curlHandle, CURLOPT_POSTFIELDS, $this->request_);
-    $this->request_ = '';
-
-    curl_setopt(self::$curlHandle, CURLOPT_URL, $fullUrl);
-    $this->response_ = curl_exec(self::$curlHandle);
-
-    // Connect failed?
-    if (!$this->response_) {
-      curl_close(self::$curlHandle);
-      self::$curlHandle = null;
-      $error = 'TCurlClient: Could not connect to '.$fullUrl;
-      throw new TTransportException($error, TTransportException::NOT_OPEN);
-    }
-  }
-
-  public static function closeCurlHandle()
-  {
-    try {
-      if (self::$curlHandle) {
-        curl_close(self::$curlHandle);
-        self::$curlHandle = null;
-      }
-    } catch (\Exception $x) {
-      error_log('There was an error closing the curl handle: ' . $x->getMessage());
-    }
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TFramedTransport.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TFramedTransport.php
deleted file mode 100644
index b8a64a9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TFramedTransport.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Framed transport. Writes and reads data in chunks that are stamped with
- * their length.
- *
- * @package thrift.transport
- */
-class TFramedTransport extends TTransport
-{
-  /**
-   * Underlying transport object.
-   *
-   * @var TTransport
-   */
-  private $transport_;
-
-  /**
-   * Buffer for read data.
-   *
-   * @var string
-   */
-  private $rBuf_;
-
-  /**
-   * Buffer for queued output data
-   *
-   * @var string
-   */
-  private $wBuf_;
-
-  /**
-   * Whether to frame reads
-   *
-   * @var bool
-   */
-  private $read_;
-
-  /**
-   * Whether to frame writes
-   *
-   * @var bool
-   */
-  private $write_;
-
-  /**
-   * Constructor.
-   *
-   * @param TTransport $transport Underlying transport
-   */
-  public function __construct($transport=null, $read=true, $write=true)
-  {
-    $this->transport_ = $transport;
-    $this->read_ = $read;
-    $this->write_ = $write;
-  }
-
-  public function isOpen()
-  {
-    return $this->transport_->isOpen();
-  }
-
-  public function open()
-  {
-    $this->transport_->open();
-  }
-
-  public function close()
-  {
-    $this->transport_->close();
-  }
-
-  /**
-   * Reads from the buffer. When more data is required reads another entire
-   * chunk and serves future reads out of that.
-   *
-   * @param int $len How much data
-   */
-  public function read($len)
-  {
-    if (!$this->read_) {
-      return $this->transport_->read($len);
-    }
-
-    if (TStringFuncFactory::create()->strlen($this->rBuf_) === 0) {
-      $this->readFrame();
-    }
-
-    // Just return full buff
-    if ($len >= TStringFuncFactory::create()->strlen($this->rBuf_)) {
-      $out = $this->rBuf_;
-      $this->rBuf_ = null;
-
-      return $out;
-    }
-
-    // Return TStringFuncFactory::create()->substr
-    $out = TStringFuncFactory::create()->substr($this->rBuf_, 0, $len);
-    $this->rBuf_ = TStringFuncFactory::create()->substr($this->rBuf_, $len);
-
-    return $out;
-  }
-
-  /**
-   * Put previously read data back into the buffer
-   *
-   * @param string $data data to return
-   */
-  public function putBack($data)
-  {
-    if (TStringFuncFactory::create()->strlen($this->rBuf_) === 0) {
-      $this->rBuf_ = $data;
-    } else {
-      $this->rBuf_ = ($data . $this->rBuf_);
-    }
-  }
-
-  /**
-   * Reads a chunk of data into the internal read buffer.
-   */
-  private function readFrame()
-  {
-    $buf = $this->transport_->readAll(4);
-    $val = unpack('N', $buf);
-    $sz = $val[1];
-
-    $this->rBuf_ = $this->transport_->readAll($sz);
-  }
-
-  /**
-   * Writes some data to the pending output buffer.
-   *
-   * @param string $buf The data
-   * @param int    $len Limit of bytes to write
-   */
-  public function write($buf, $len=null)
-  {
-    if (!$this->write_) {
-      return $this->transport_->write($buf, $len);
-    }
-
-    if ($len !== null && $len < TStringFuncFactory::create()->strlen($buf)) {
-      $buf = TStringFuncFactory::create()->substr($buf, 0, $len);
-    }
-    $this->wBuf_ .= $buf;
-  }
-
-  /**
-   * Writes the output buffer to the stream in the format of a 4-byte length
-   * followed by the actual data.
-   */
-  public function flush()
-  {
-    if (!$this->write_ || TStringFuncFactory::create()->strlen($this->wBuf_) == 0) {
-      return $this->transport_->flush();
-    }
-
-    $out = pack('N', TStringFuncFactory::create()->strlen($this->wBuf_));
-    $out .= $this->wBuf_;
-
-    // Note that we clear the internal wBuf_ prior to the underlying write
-    // to ensure we're in a sane state (i.e. internal buffer cleaned)
-    // if the underlying write throws up an exception
-    $this->wBuf_ = '';
-    $this->transport_->write($out);
-    $this->transport_->flush();
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/THttpClient.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/THttpClient.php
deleted file mode 100644
index b372ab7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/THttpClient.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * HTTP client for Thrift
- *
- * @package thrift.transport
- */
-class THttpClient extends TTransport
-{
-  /**
-   * The host to connect to
-   *
-   * @var string
-   */
-  protected $host_;
-
-  /**
-   * The port to connect on
-   *
-   * @var int
-   */
-  protected $port_;
-
-  /**
-   * The URI to request
-   *
-   * @var string
-   */
-  protected $uri_;
-
-  /**
-   * The scheme to use for the request, i.e. http, https
-   *
-   * @var string
-   */
-  protected $scheme_;
-
-  /**
-   * Buffer for the HTTP request data
-   *
-   * @var string
-   */
-  protected $buf_;
-
-  /**
-   * Input socket stream.
-   *
-   * @var resource
-   */
-  protected $handle_;
-
-  /**
-   * Read timeout
-   *
-   * @var float
-   */
-  protected $timeout_;
-
-  /**
-   * http headers
-   *
-   * @var array
-   */
-  protected $headers_;
-
-  /**
-   * Make a new HTTP client.
-   *
-   * @param string $host
-   * @param int    $port
-   * @param string $uri
-   */
-  public function __construct($host, $port=80, $uri='', $scheme = 'http')
-  {
-    if ((TStringFuncFactory::create()->strlen($uri) > 0) && ($uri{0} != '/')) {
-      $uri = '/'.$uri;
-    }
-    $this->scheme_ = $scheme;
-    $this->host_ = $host;
-    $this->port_ = $port;
-    $this->uri_ = $uri;
-    $this->buf_ = '';
-    $this->handle_ = null;
-    $this->timeout_ = null;
-    $this->headers_ = array();
-  }
-
-  /**
-   * Set read timeout
-   *
-   * @param float $timeout
-   */
-  public function setTimeoutSecs($timeout)
-  {
-    $this->timeout_ = $timeout;
-  }
-
-  /**
-   * Whether this transport is open.
-   *
-   * @return boolean true if open
-   */
-  public function isOpen()
-  {
-    return true;
-  }
-
-  /**
-   * Open the transport for reading/writing
-   *
-   * @throws TTransportException if cannot open
-   */
-  public function open() {}
-
-  /**
-   * Close the transport.
-   */
-  public function close()
-  {
-    if ($this->handle_) {
-      @fclose($this->handle_);
-      $this->handle_ = null;
-    }
-  }
-
-  /**
-   * Read some data into the array.
-   *
-   * @param int    $len How much to read
-   * @return string The data that has been read
-   * @throws TTransportException if cannot read any more data
-   */
-  public function read($len)
-  {
-    $data = @fread($this->handle_, $len);
-    if ($data === FALSE || $data === '') {
-      $md = stream_get_meta_data($this->handle_);
-      if ($md['timed_out']) {
-        throw new TTransportException('THttpClient: timed out reading '.$len.' bytes from '.$this->host_.':'.$this->port_.$this->uri_, TTransportException::TIMED_OUT);
-      } else {
-        throw new TTransportException('THttpClient: Could not read '.$len.' bytes from '.$this->host_.':'.$this->port_.$this->uri_, TTransportException::UNKNOWN);
-      }
-    }
-
-    return $data;
-  }
-
-  /**
-   * Writes some data into the pending buffer
-   *
-   * @param string $buf  The data to write
-   * @throws TTransportException if writing fails
-   */
-  public function write($buf)
-  {
-    $this->buf_ .= $buf;
-  }
-
-  /**
-   * Opens and sends the actual request over the HTTP connection
-   *
-   * @throws TTransportException if a writing error occurs
-   */
-  public function flush()
-  {
-    // God, PHP really has some esoteric ways of doing simple things.
-    $host = $this->host_.($this->port_ != 80 ? ':'.$this->port_ : '');
-
-    $headers = array();
-    $defaultHeaders = array('Host' => $host,
-                            'Accept' => 'application/x-thrift',
-                            'User-Agent' => 'PHP/THttpClient',
-                            'Content-Type' => 'application/x-thrift',
-                            'Content-Length' => TStringFuncFactory::create()->strlen($this->buf_));
-    foreach (array_merge($defaultHeaders, $this->headers_) as $key => $value) {
-        $headers[] = "$key: $value";
-    }
-
-    $options = array('method' => 'POST',
-                     'header' => implode("\r\n", $headers),
-                     'max_redirects' => 1,
-                     'content' => $this->buf_);
-    if ($this->timeout_ > 0) {
-      $options['timeout'] = $this->timeout_;
-    }
-    $this->buf_ = '';
-
-    $contextid = stream_context_create(array('http' => $options));
-    $this->handle_ = @fopen($this->scheme_.'://'.$host.$this->uri_, 'r', false, $contextid);
-
-    // Connect failed?
-    if ($this->handle_ === FALSE) {
-      $this->handle_ = null;
-      $error = 'THttpClient: Could not connect to '.$host.$this->uri_;
-      throw new TTransportException($error, TTransportException::NOT_OPEN);
-    }
-  }
-
-  public function addHeaders($headers)
-  {
-    $this->headers_ = array_merge($this->headers_, $headers);
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TMemoryBuffer.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TMemoryBuffer.php
deleted file mode 100644
index ca31c57..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TMemoryBuffer.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * A memory buffer is a tranpsort that simply reads from and writes to an
- * in-memory string buffer. Anytime you call write on it, the data is simply
- * placed into a buffer, and anytime you call read, data is read from that
- * buffer.
- *
- * @package thrift.transport
- */
-class TMemoryBuffer extends TTransport
-{
-  /**
-   * Constructor. Optionally pass an initial value
-   * for the buffer.
-   */
-  public function __construct($buf = '')
-  {
-    $this->buf_ = $buf;
-  }
-
-  protected $buf_ = '';
-
-  public function isOpen()
-  {
-    return true;
-  }
-
-  public function open() {}
-
-  public function close() {}
-
-  public function write($buf)
-  {
-    $this->buf_ .= $buf;
-  }
-
-  public function read($len)
-  {
-    $bufLength = TStringFuncFactory::create()->strlen($this->buf_);
-
-    if ($bufLength === 0) {
-      throw new TTransportException('TMemoryBuffer: Could not read ' .
-                                    $len . ' bytes from buffer.',
-                                    TTransportException::UNKNOWN);
-    }
-
-    if ($bufLength <= $len) {
-      $ret = $this->buf_;
-      $this->buf_ = '';
-
-      return $ret;
-    }
-
-    $ret = TStringFuncFactory::create()->substr($this->buf_, 0, $len);
-    $this->buf_ = TStringFuncFactory::create()->substr($this->buf_, $len);
-
-    return $ret;
-  }
-
-  public function getBuffer()
-  {
-    return $this->buf_;
-  }
-
-  public function available()
-  {
-    return TStringFuncFactory::create()->strlen($this->buf_);
-  }
-
-  public function putBack($data)
-  {
-    $this->buf_ = $data.$this->buf_;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TNullTransport.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TNullTransport.php
deleted file mode 100644
index feeb7a4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TNullTransport.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TTransportException;
-
-/**
- * Transport that only accepts writes and ignores them.
- * This is useful for measuring the serialized size of structures.
- *
- * @package thrift.transport
- */
-class TNullTransport extends TTransport
-{
-  public function isOpen()
-  {
-    return true;
-  }
-
-  public function open() {}
-
-  public function close() {}
-
-  public function read($len)
-  {
-    throw new TTransportException("Can't read from TNullTransport.");
-  }
-
-  public function write($buf) {}
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TPhpStream.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TPhpStream.php
deleted file mode 100644
index 4c14cdf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TPhpStream.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Php stream transport. Reads to and writes from the php standard streams
- * php://input and php://output
- *
- * @package thrift.transport
- */
-class TPhpStream extends TTransport
-{
-  const MODE_R = 1;
-  const MODE_W = 2;
-
-  private $inStream_ = null;
-
-  private $outStream_ = null;
-
-  private $read_ = false;
-
-  private $write_ = false;
-
-  public function __construct($mode)
-  {
-    $this->read_ = $mode & self::MODE_R;
-    $this->write_ = $mode & self::MODE_W;
-  }
-
-  public function open()
-  {
-    if ($this->read_) {
-      $this->inStream_ = @fopen(self::inStreamName(), 'r');
-      if (!is_resource($this->inStream_)) {
-        throw new TException('TPhpStream: Could not open php://input');
-      }
-    }
-    if ($this->write_) {
-      $this->outStream_ = @fopen('php://output', 'w');
-      if (!is_resource($this->outStream_)) {
-        throw new TException('TPhpStream: Could not open php://output');
-      }
-    }
-  }
-
-  public function close()
-  {
-    if ($this->read_) {
-      @fclose($this->inStream_);
-      $this->inStream_ = null;
-    }
-    if ($this->write_) {
-      @fclose($this->outStream_);
-      $this->outStream_ = null;
-    }
-  }
-
-  public function isOpen()
-  {
-    return
-      (!$this->read_ || is_resource($this->inStream_)) &&
-      (!$this->write_ || is_resource($this->outStream_));
-  }
-
-  public function read($len)
-  {
-    $data = @fread($this->inStream_, $len);
-    if ($data === FALSE || $data === '') {
-      throw new TException('TPhpStream: Could not read '.$len.' bytes');
-    }
-
-    return $data;
-  }
-
-  public function write($buf)
-  {
-    while (TStringFuncFactory::create()->strlen($buf) > 0) {
-      $got = @fwrite($this->outStream_, $buf);
-      if ($got === 0 || $got === FALSE) {
-        throw new TException('TPhpStream: Could not write '.TStringFuncFactory::create()->strlen($buf).' bytes');
-      }
-      $buf = TStringFuncFactory::create()->substr($buf, $got);
-    }
-  }
-
-  public function flush()
-  {
-    @fflush($this->outStream_);
-  }
-
-  private static function inStreamName()
-  {
-    if (php_sapi_name() == 'cli') {
-      return 'php://stdin';
-    }
-
-    return 'php://input';
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSSLSocket.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSSLSocket.php
deleted file mode 100644
index 533b7bb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSSLSocket.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TException;
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Sockets implementation of the TTransport interface.
- *
- * @package thrift.transport
- */
-class TSSLSocket extends TSocket
-{
-  /**
-   * Remote port
-   *
-   * @var resource
-   */
-  protected $context_ = null;
-
-  /**
-   * Socket constructor
-   *
-   * @param string     $host         Remote hostname
-   * @param int        $port         Remote port
-   * @param resource   $context      Stream context
-   * @param bool       $persist      Whether to use a persistent socket
-   * @param string     $debugHandler Function to call for error logging
-   */
-  public function __construct($host='localhost',
-                              $port=9090,
-                              $context=null,
-                              $debugHandler=null) {
-    $this->host_ = $this->getSSLHost($host);
-    $this->port_ = $port;
-    $this->context_ = $context;
-    $this->debugHandler_ = $debugHandler ? $debugHandler : 'error_log';
-  }
-
-  /**
-   * Creates a host name with SSL transport protocol
-   * if no transport protocol already specified in
-   * the host name.
-   *
-   * @param string $host    Host to listen on
-   * @return string $host   Host name with transport protocol
-   */
-  private function getSSLHost($host)
-  {
-    $transport_protocol_loc = strpos($host, "://");
-    if ($transport_protocol_loc === false) {
-      $host = 'ssl://'.$host;
-    }
-    return $host;
-  }
-
-  /**
-   * Connects the socket.
-   */
-  public function open()
-  {
-    if ($this->isOpen()) {
-      throw new TTransportException('Socket already connected', TTransportException::ALREADY_OPEN);
-    }
-
-    if (empty($this->host_)) {
-      throw new TTransportException('Cannot open null host', TTransportException::NOT_OPEN);
-    }
-
-    if ($this->port_ <= 0) {
-      throw new TTransportException('Cannot open without port', TTransportException::NOT_OPEN);
-    }
-
-    $this->handle_ = @stream_socket_client($this->host_.':'.$this->port_,
-                                          $errno,
-                                          $errstr,
-                                          $this->sendTimeoutSec_ + ($this->sendTimeoutUsec_ / 1000000),
-                                          STREAM_CLIENT_CONNECT,
-                                          $this->context_);
-
-    // Connect failed?
-    if ($this->handle_ === FALSE) {
-      $error = 'TSocket: Could not connect to '.$this->host_.':'.$this->port_.' ('.$errstr.' ['.$errno.'])';
-      if ($this->debug_) {
-        call_user_func($this->debugHandler_, $error);
-      }
-      throw new TException($error);
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSocket.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSocket.php
deleted file mode 100644
index 10d5115..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSocket.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TException;
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Sockets implementation of the TTransport interface.
- *
- * @package thrift.transport
- */
-class TSocket extends TTransport
-{
-  /**
-   * Handle to PHP socket
-   *
-   * @var resource
-   */
-  protected $handle_ = null;
-
-  /**
-   * Remote hostname
-   *
-   * @var string
-   */
-  protected $host_ = 'localhost';
-
-  /**
-   * Remote port
-   *
-   * @var int
-   */
-  protected $port_ = '9090';
-
-  /**
-   * Send timeout in seconds.
-   *
-   * Combined with sendTimeoutUsec this is used for send timeouts.
-   *
-   * @var int
-   */
-  protected $sendTimeoutSec_ = 0;
-
-  /**
-   * Send timeout in microseconds.
-   *
-   * Combined with sendTimeoutSec this is used for send timeouts.
-   *
-   * @var int
-   */
-  protected $sendTimeoutUsec_ = 100000;
-
-  /**
-   * Recv timeout in seconds
-   *
-   * Combined with recvTimeoutUsec this is used for recv timeouts.
-   *
-   * @var int
-   */
-  protected $recvTimeoutSec_ = 0;
-
-  /**
-   * Recv timeout in microseconds
-   *
-   * Combined with recvTimeoutSec this is used for recv timeouts.
-   *
-   * @var int
-   */
-  protected $recvTimeoutUsec_ = 750000;
-
-  /**
-   * Persistent socket or plain?
-   *
-   * @var bool
-   */
-  protected $persist_ = false;
-
-  /**
-   * Debugging on?
-   *
-   * @var bool
-   */
-  protected $debug_ = false;
-
-  /**
-   * Debug handler
-   *
-   * @var mixed
-   */
-  protected $debugHandler_ = null;
-
-  /**
-   * Socket constructor
-   *
-   * @param string $host         Remote hostname
-   * @param int    $port         Remote port
-   * @param bool   $persist      Whether to use a persistent socket
-   * @param string $debugHandler Function to call for error logging
-   */
-  public function __construct($host='localhost',
-                              $port=9090,
-                              $persist=false,
-                              $debugHandler=null) {
-    $this->host_ = $host;
-    $this->port_ = $port;
-    $this->persist_ = $persist;
-    $this->debugHandler_ = $debugHandler ? $debugHandler : 'error_log';
-  }
-
-  /**
-   * @param resource $handle
-   * @return void
-   */
-  public function setHandle($handle)
-  {
-    $this->handle_ = $handle;
-  }
-
-  /**
-   * Sets the send timeout.
-   *
-   * @param int $timeout  Timeout in milliseconds.
-   */
-  public function setSendTimeout($timeout)
-  {
-    $this->sendTimeoutSec_ = floor($timeout / 1000);
-    $this->sendTimeoutUsec_ =
-            ($timeout - ($this->sendTimeoutSec_ * 1000)) * 1000;
-  }
-
-  /**
-   * Sets the receive timeout.
-   *
-   * @param int $timeout  Timeout in milliseconds.
-   */
-  public function setRecvTimeout($timeout)
-  {
-    $this->recvTimeoutSec_ = floor($timeout / 1000);
-    $this->recvTimeoutUsec_ =
-            ($timeout - ($this->recvTimeoutSec_ * 1000)) * 1000;
-  }
-
-  /**
-   * Sets debugging output on or off
-   *
-   * @param bool $debug
-   */
-  public function setDebug($debug)
-  {
-    $this->debug_ = $debug;
-  }
-
-  /**
-   * Get the host that this socket is connected to
-   *
-   * @return string host
-   */
-  public function getHost()
-  {
-    return $this->host_;
-  }
-
-  /**
-   * Get the remote port that this socket is connected to
-   *
-   * @return int port
-   */
-  public function getPort()
-  {
-    return $this->port_;
-  }
-
-  /**
-   * Tests whether this is open
-   *
-   * @return bool true if the socket is open
-   */
-  public function isOpen()
-  {
-    return is_resource($this->handle_);
-  }
-
-  /**
-   * Connects the socket.
-   */
-  public function open()
-  {
-    if ($this->isOpen()) {
-      throw new TTransportException('Socket already connected', TTransportException::ALREADY_OPEN);
-    }
-
-    if (empty($this->host_)) {
-      throw new TTransportException('Cannot open null host', TTransportException::NOT_OPEN);
-    }
-
-    if ($this->port_ <= 0) {
-      throw new TTransportException('Cannot open without port', TTransportException::NOT_OPEN);
-    }
-
-    if ($this->persist_) {
-      $this->handle_ = @pfsockopen($this->host_,
-                                   $this->port_,
-                                   $errno,
-                                   $errstr,
-                                   $this->sendTimeoutSec_ + ($this->sendTimeoutUsec_ / 1000000));
-    } else {
-      $this->handle_ = @fsockopen($this->host_,
-                                  $this->port_,
-                                  $errno,
-                                  $errstr,
-                                  $this->sendTimeoutSec_ + ($this->sendTimeoutUsec_ / 1000000));
-    }
-
-    // Connect failed?
-    if ($this->handle_ === FALSE) {
-      $error = 'TSocket: Could not connect to '.$this->host_.':'.$this->port_.' ('.$errstr.' ['.$errno.'])';
-      if ($this->debug_) {
-        call_user_func($this->debugHandler_, $error);
-      }
-      throw new TException($error);
-    }
-  }
-
-  /**
-   * Closes the socket.
-   */
-  public function close()
-  {
-    if (!$this->persist_) {
-      @fclose($this->handle_);
-      $this->handle_ = null;
-    }
-  }
-
-  /**
-   * Read from the socket at most $len bytes.
-   *
-   * This method will not wait for all the requested data, it will return as
-   * soon as any data is received.
-   *
-   * @param int $len Maximum number of bytes to read.
-   * @return string Binary data
-   */
-  public function read($len)
-  {
-    $null = null;
-    $read = array($this->handle_);
-    $readable = @stream_select($read, $null, $null, $this->recvTimeoutSec_, $this->recvTimeoutUsec_);
-
-    if ($readable > 0) {
-      $data = fread($this->handle_, $len);
-      if ($data === false) {
-          throw new TTransportException('TSocket: Could not read '.$len.' bytes from '.
-                               $this->host_.':'.$this->port_);
-      } elseif ($data == '' && feof($this->handle_)) {
-          throw new TTransportException('TSocket read 0 bytes');
-        }
-
-      return $data;
-    } elseif ($readable === 0) {
-        throw new TTransportException('TSocket: timed out reading '.$len.' bytes from '.
-                             $this->host_.':'.$this->port_);
-      } else {
-        throw new TTransportException('TSocket: Could not read '.$len.' bytes from '.
-                             $this->host_.':'.$this->port_);
-      }
-    }
-
-  /**
-   * Write to the socket.
-   *
-   * @param string $buf The data to write
-   */
-  public function write($buf)
-  {
-    $null = null;
-    $write = array($this->handle_);
-
-    // keep writing until all the data has been written
-    while (TStringFuncFactory::create()->strlen($buf) > 0) {
-      // wait for stream to become available for writing
-      $writable = @stream_select($null, $write, $null, $this->sendTimeoutSec_, $this->sendTimeoutUsec_);
-      if ($writable > 0) {
-        // write buffer to stream
-        $written = fwrite($this->handle_, $buf);
-        if ($written === -1 || $written === false) {
-          throw new TTransportException('TSocket: Could not write '.TStringFuncFactory::create()->strlen($buf).' bytes '.
-                                   $this->host_.':'.$this->port_);
-        }
-        // determine how much of the buffer is left to write
-        $buf = TStringFuncFactory::create()->substr($buf, $written);
-      } elseif ($writable === 0) {
-          throw new TTransportException('TSocket: timed out writing '.TStringFuncFactory::create()->strlen($buf).' bytes from '.
-                               $this->host_.':'.$this->port_);
-        } else {
-            throw new TTransportException('TSocket: Could not write '.TStringFuncFactory::create()->strlen($buf).' bytes '.
-                                 $this->host_.':'.$this->port_);
-        }
-      }
-    }
-
-  /**
-   * Flush output to the socket.
-   *
-   * Since read(), readAll() and write() operate on the sockets directly,
-   * this is a no-op
-   *
-   * If you wish to have flushable buffering behaviour, wrap this TSocket
-   * in a TBufferedTransport.
-   */
-  public function flush()
-  {
-    // no-op
-    }
-  }
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSocketPool.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSocketPool.php
deleted file mode 100644
index 18ffd8d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TSocketPool.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TException;
-
-/**
- * This library makes use of APC cache to make hosts as down in a web
- * environment. If you are running from the CLI or on a system without APC
- * installed, then these null functions will step in and act like cache
- * misses.
- */
-if (!function_exists('apc_fetch')) {
-  function apc_fetch($key) { return FALSE; }
-  function apc_store($key, $var, $ttl=0) { return FALSE; }
-}
-
-/**
- * Sockets implementation of the TTransport interface that allows connection
- * to a pool of servers.
- *
- * @package thrift.transport
- */
-class TSocketPool extends TSocket
-{
-  /**
-   * Remote servers. Array of associative arrays with 'host' and 'port' keys
-   */
-  private $servers_ = array();
-
-  /**
-   * How many times to retry each host in connect
-   *
-   * @var int
-   */
-  private $numRetries_ = 1;
-
-  /**
-   * Retry interval in seconds, how long to not try a host if it has been
-   * marked as down.
-   *
-   * @var int
-   */
-  private $retryInterval_ = 60;
-
-  /**
-   * Max consecutive failures before marking a host down.
-   *
-   * @var int
-   */
-  private $maxConsecutiveFailures_ = 1;
-
-  /**
-   * Try hosts in order? or Randomized?
-   *
-   * @var bool
-   */
-  private $randomize_ = true;
-
-  /**
-   * Always try last host, even if marked down?
-   *
-   * @var bool
-   */
-  private $alwaysTryLast_ = true;
-
-  /**
-   * Socket pool constructor
-   *
-   * @param array  $hosts        List of remote hostnames
-   * @param mixed  $ports        Array of remote ports, or a single common port
-   * @param bool   $persist      Whether to use a persistent socket
-   * @param mixed  $debugHandler Function for error logging
-   */
-  public function __construct($hosts=array('localhost'),
-                              $ports=array(9090),
-                              $persist=false,
-                              $debugHandler=null) {
-    parent::__construct(null, 0, $persist, $debugHandler);
-
-    if (!is_array($ports)) {
-      $port = $ports;
-      $ports = array();
-      foreach ($hosts as $key => $val) {
-        $ports[$key] = $port;
-      }
-    }
-
-    foreach ($hosts as $key => $host) {
-      $this->servers_ []= array('host' => $host,
-                                'port' => $ports[$key]);
-    }
-  }
-
-  /**
-   * Add a server to the pool
-   *
-   * This function does not prevent you from adding a duplicate server entry.
-   *
-   * @param string $host hostname or IP
-   * @param int $port port
-   */
-  public function addServer($host, $port)
-  {
-    $this->servers_[] = array('host' => $host, 'port' => $port);
-  }
-
-  /**
-   * Sets how many time to keep retrying a host in the connect function.
-   *
-   * @param int $numRetries
-   */
-  public function setNumRetries($numRetries)
-  {
-    $this->numRetries_ = $numRetries;
-  }
-
-  /**
-   * Sets how long to wait until retrying a host if it was marked down
-   *
-   * @param int $numRetries
-   */
-  public function setRetryInterval($retryInterval)
-  {
-    $this->retryInterval_ = $retryInterval;
-  }
-
-  /**
-   * Sets how many time to keep retrying a host before marking it as down.
-   *
-   * @param int $numRetries
-   */
-  public function setMaxConsecutiveFailures($maxConsecutiveFailures)
-  {
-    $this->maxConsecutiveFailures_ = $maxConsecutiveFailures;
-  }
-
-  /**
-   * Turns randomization in connect order on or off.
-   *
-   * @param bool $randomize
-   */
-  public function setRandomize($randomize)
-  {
-    $this->randomize_ = $randomize;
-  }
-
-  /**
-   * Whether to always try the last server.
-   *
-   * @param bool $alwaysTryLast
-   */
-  public function setAlwaysTryLast($alwaysTryLast)
-  {
-    $this->alwaysTryLast_ = $alwaysTryLast;
-  }
-
-  /**
-   * Connects the socket by iterating through all the servers in the pool
-   * and trying to find one that works.
-   */
-  public function open()
-  {
-    // Check if we want order randomization
-    if ($this->randomize_) {
-      shuffle($this->servers_);
-    }
-
-    // Count servers to identify the "last" one
-    $numServers = count($this->servers_);
-
-    for ($i = 0; $i < $numServers; ++$i) {
-
-      // This extracts the $host and $port variables
-      extract($this->servers_[$i]);
-
-      // Check APC cache for a record of this server being down
-      $failtimeKey = 'thrift_failtime:'.$host.':'.$port.'~';
-
-      // Cache miss? Assume it's OK
-      $lastFailtime = apc_fetch($failtimeKey);
-      if ($lastFailtime === FALSE) {
-        $lastFailtime = 0;
-      }
-
-      $retryIntervalPassed = false;
-
-      // Cache hit...make sure enough the retry interval has elapsed
-      if ($lastFailtime > 0) {
-        $elapsed = time() - $lastFailtime;
-        if ($elapsed > $this->retryInterval_) {
-          $retryIntervalPassed = true;
-          if ($this->debug_) {
-            call_user_func($this->debugHandler_,
-                           'TSocketPool: retryInterval '.
-                           '('.$this->retryInterval_.') '.
-                           'has passed for host '.$host.':'.$port);
-          }
-        }
-      }
-
-      // Only connect if not in the middle of a fail interval, OR if this
-      // is the LAST server we are trying, just hammer away on it
-      $isLastServer = false;
-      if ($this->alwaysTryLast_) {
-        $isLastServer = ($i == ($numServers - 1));
-      }
-
-      if (($lastFailtime === 0) ||
-          ($isLastServer) ||
-          ($lastFailtime > 0 && $retryIntervalPassed)) {
-
-        // Set underlying TSocket params to this one
-        $this->host_ = $host;
-        $this->port_ = $port;
-
-        // Try up to numRetries_ connections per server
-        for ($attempt = 0; $attempt < $this->numRetries_; $attempt++) {
-          try {
-            // Use the underlying TSocket open function
-            parent::open();
-
-            // Only clear the failure counts if required to do so
-            if ($lastFailtime > 0) {
-              apc_store($failtimeKey, 0);
-            }
-
-            // Successful connection, return now
-            return;
-
-          } catch (TException $tx) {
-            // Connection failed
-          }
-        }
-
-        // Mark failure of this host in the cache
-        $consecfailsKey = 'thrift_consecfails:'.$host.':'.$port.'~';
-
-        // Ignore cache misses
-        $consecfails = apc_fetch($consecfailsKey);
-        if ($consecfails === FALSE) {
-          $consecfails = 0;
-        }
-
-        // Increment by one
-        $consecfails++;
-
-        // Log and cache this failure
-        if ($consecfails >= $this->maxConsecutiveFailures_) {
-          if ($this->debug_) {
-            call_user_func($this->debugHandler_,
-                           'TSocketPool: marking '.$host.':'.$port.
-                           ' as down for '.$this->retryInterval_.' secs '.
-                           'after '.$consecfails.' failed attempts.');
-          }
-          // Store the failure time
-          apc_store($failtimeKey, time());
-
-          // Clear the count of consecutive failures
-          apc_store($consecfailsKey, 0);
-        } else {
-          apc_store($consecfailsKey, $consecfails);
-        }
-      }
-    }
-
-    // Oh no; we failed them all. The system is totally ill!
-    $error = 'TSocketPool: All hosts in pool are down. ';
-    $hosts = array();
-    foreach ($this->servers_ as $server) {
-      $hosts []= $server['host'].':'.$server['port'];
-    }
-    $hostlist = implode(',', $hosts);
-    $error .= '('.$hostlist.')';
-    if ($this->debug_) {
-      call_user_func($this->debugHandler_, $error);
-    }
-    throw new TException($error);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TTransport.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TTransport.php
deleted file mode 100644
index 99c39ff..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Transport/TTransport.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.transport
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Base interface for a transport agent.
- *
- * @package thrift.transport
- */
-abstract class TTransport
-{
-  /**
-   * Whether this transport is open.
-   *
-   * @return boolean true if open
-   */
-  abstract public function isOpen();
-
-  /**
-   * Open the transport for reading/writing
-   *
-   * @throws TTransportException if cannot open
-   */
-  abstract public function open();
-
-  /**
-   * Close the transport.
-   */
-  abstract public function close();
-
-  /**
-   * Read some data into the array.
-   *
-   * @param int    $len How much to read
-   * @return string The data that has been read
-   * @throws TTransportException if cannot read any more data
-   */
-  abstract public function read($len);
-
-  /**
-   * Guarantees that the full amount of data is read.
-   *
-   * @return string The data, of exact length
-   * @throws TTransportException if cannot read data
-   */
-  public function readAll($len)
-  {
-    // return $this->read($len);
-
-    $data = '';
-    $got = 0;
-    while (($got = TStringFuncFactory::create()->strlen($data)) < $len) {
-      $data .= $this->read($len - $got);
-    }
-
-    return $data;
-  }
-
-  /**
-   * Writes the given data out.
-   *
-   * @param string $buf  The data to write
-   * @throws TTransportException if writing fails
-   */
-  abstract public function write($buf);
-
-  /**
-   * Flushes any pending data out of a buffer
-   *
-   * @throws TTransportException if a writing error occurs
-   */
-  public function flush() {}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TConstant.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TConstant.php
deleted file mode 100644
index 7c8eceb..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TConstant.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-namespace Thrift\Type;
-
-/**
- * Base class for constant Management
- */
-abstract class TConstant
-{
-    /**
-     * Don't instanciate this class
-     */
-    protected function __construct() {}
-
-    /**
-     * Get a constant value
-     * @param  string $constant
-     * @return mixed
-     */
-    public static function get($constant)
-    {
-        if (is_null(static::$$constant)) {
-            static::$$constant = call_user_func(
-                    sprintf('static::init_%s', $constant)
-                );
-        }
-
-        return static::$$constant;
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TMessageType.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TMessageType.php
deleted file mode 100644
index bff224f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TMessageType.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-namespace Thrift\Type;
-
-/**
- * Message types for RPC
- */
-class TMessageType
-{
-  const CALL  = 1;
-  const REPLY = 2;
-  const EXCEPTION = 3;
-  const ONEWAY = 4;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TType.php b/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TType.php
deleted file mode 100644
index 71219c2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/lib/Thrift/Type/TType.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-namespace Thrift\Type;
-
-/**
- * Data types that can be sent via Thrift
- */
-class TType
-{
-  const STOP   = 0;
-  const VOID   = 1;
-  const BOOL   = 2;
-  const BYTE   = 3;
-  const I08    = 3;
-  const DOUBLE = 4;
-  const I16    = 6;
-  const I32    = 8;
-  const I64    = 10;
-  const STRING = 11;
-  const UTF7   = 11;
-  const STRUCT = 12;
-  const MAP    = 13;
-  const SET    = 14;
-  const LST    = 15;    // N.B. cannot use LIST keyword in PHP!
-  const UTF8   = 16;
-  const UTF16  = 17;
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/src/TStringUtils.php b/vendor/git.apache.org/thrift.git/lib/php/src/TStringUtils.php
deleted file mode 100644
index 894baf8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/src/TStringUtils.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-interface TStringFunc
-{
-    public function substr($str, $start, $length = null);
-    public function strlen($str);
-}
-
-class TStringFunc_Core
-implements TStringFunc {
-    public function substr($str, $start, $length = null)
-    {
-        // specifying a null $length would return an empty string
-        if ($length === null) {
-            return substr($str, $start);
-        }
-
-        return substr($str, $start, $length);
-    }
-
-    public function strlen($str)
-    {
-        return strlen($str);
-    }
-}
-
-class TStringFunc_Mbstring
-implements TStringFunc {
-    public function substr($str, $start, $length = null)
-    {
-        /**
-         * We need to set the charset parameter, which is the second
-         * optional parameter and the first optional parameter can't
-         * be null or false as a "magic" value because that would
-         * cause an empty string to be returned, so we need to
-         * actually calculate the proper length value.
-         */
-        if ($length === null) {
-            $length = $this->strlen($str) - $start;
-        }
-
-        return mb_substr($str, $start, $length, '8bit');
-    }
-
-    public function strlen($str)
-    {
-        return mb_strlen($str, '8bit');
-    }
-}
-
-class TStringFuncFactory
-{
-    private static $_instance;
-
-    /**
-     * Get the Singleton instance of TStringFunc implementation that is
-     * compatible with the current system's mbstring.func_overload settings.
-     *
-     * @return TStringFunc
-     */
-    public static function create()
-    {
-        if (!self::$_instance) {
-            self::_setInstance();
-        }
-
-        return self::$_instance;
-    }
-
-    private static function _setInstance()
-    {
-        /**
-         * Cannot use str* functions for byte counting because multibyte
-         * characters will be read a single bytes.
-         *
-         * See: http://us.php.net/manual/en/mbstring.overload.php
-         */
-        if (ini_get('mbstring.func_overload') & 2) {
-            self::$_instance = new TStringFunc_Mbstring();
-        }
-        /**
-         * mbstring is not installed or does not have function overloading
-         * of the str* functions enabled so use PHP core str* functions for
-         * byte counting.
-         */
-        else {
-            self::$_instance = new TStringFunc_Core();
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/src/Thrift.php b/vendor/git.apache.org/thrift.git/lib/php/src/Thrift.php
deleted file mode 100644
index 4fe4392..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/src/Thrift.php
+++ /dev/null
@@ -1,821 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-/**
- * Data types that can be sent via Thrift
- */
-class TType
-{
-  const STOP   = 0;
-  const VOID   = 1;
-  const BOOL   = 2;
-  const BYTE   = 3;
-  const I08    = 3;
-  const DOUBLE = 4;
-  const I16    = 6;
-  const I32    = 8;
-  const I64    = 10;
-  const STRING = 11;
-  const UTF7   = 11;
-  const STRUCT = 12;
-  const MAP    = 13;
-  const SET    = 14;
-  const LST    = 15;    // N.B. cannot use LIST keyword in PHP!
-  const UTF8   = 16;
-  const UTF16  = 17;
-}
-
-/**
- * Message types for RPC
- */
-class TMessageType
-{
-  const CALL  = 1;
-  const REPLY = 2;
-  const EXCEPTION = 3;
-  const ONEWAY = 4;
-}
-
-/**
- * NOTE(mcslee): This currently contains a ton of duplicated code from TBase
- * because we need to save CPU cycles and this is not yet in an extension.
- * Ideally we'd multiply-inherit TException from both Exception and Base, but
- * that's not possible in PHP and there are no modules either, so for now we
- * apologetically take a trip to HackTown.
- *
- * Can be called with standard Exception constructor (message, code) or with
- * Thrift Base object constructor (spec, vals).
- *
- * @param mixed $p1 Message (string) or type-spec (array)
- * @param mixed $p2 Code (integer) or values (array)
- */
-class TException extends Exception
-{
-  public function __construct($p1=null, $p2=0)
-  {
-    if (is_array($p1) && is_array($p2)) {
-      $spec = $p1;
-      $vals = $p2;
-      foreach ($spec as $fid => $fspec) {
-        $var = $fspec['var'];
-        if (isset($vals[$var])) {
-          $this->$var = $vals[$var];
-        }
-      }
-    } else {
-      parent::__construct($p1, $p2);
-    }
-  }
-
-  static $tmethod = array(TType::BOOL   => 'Bool',
-                          TType::BYTE   => 'Byte',
-                          TType::I16    => 'I16',
-                          TType::I32    => 'I32',
-                          TType::I64    => 'I64',
-                          TType::DOUBLE => 'Double',
-                          TType::STRING => 'String');
-
-  private function _readMap(&$var, $spec, $input)
-  {
-    $xfer = 0;
-    $ktype = $spec['ktype'];
-    $vtype = $spec['vtype'];
-    $kread = $vread = null;
-    if (isset(TBase::$tmethod[$ktype])) {
-      $kread = 'read'.TBase::$tmethod[$ktype];
-    } else {
-      $kspec = $spec['key'];
-    }
-    if (isset(TBase::$tmethod[$vtype])) {
-      $vread = 'read'.TBase::$tmethod[$vtype];
-    } else {
-      $vspec = $spec['val'];
-    }
-    $var = array();
-    $_ktype = $_vtype = $size = 0;
-    $xfer += $input->readMapBegin($_ktype, $_vtype, $size);
-    for ($i = 0; $i < $size; ++$i) {
-      $key = $val = null;
-      if ($kread !== null) {
-        $xfer += $input->$kread($key);
-      } else {
-        switch ($ktype) {
-        case TType::STRUCT:
-          $class = $kspec['class'];
-          $key = new $class();
-          $xfer += $key->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($key, $kspec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($key, $kspec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($key, $kspec, $input, true);
-          break;
-        }
-      }
-      if ($vread !== null) {
-        $xfer += $input->$vread($val);
-      } else {
-        switch ($vtype) {
-        case TType::STRUCT:
-          $class = $vspec['class'];
-          $val = new $class();
-          $xfer += $val->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($val, $vspec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($val, $vspec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($val, $vspec, $input, true);
-          break;
-        }
-      }
-      $var[$key] = $val;
-    }
-    $xfer += $input->readMapEnd();
-
-    return $xfer;
-  }
-
-  private function _readList(&$var, $spec, $input, $set=false)
-  {
-    $xfer = 0;
-    $etype = $spec['etype'];
-    $eread = $vread = null;
-    if (isset(TBase::$tmethod[$etype])) {
-      $eread = 'read'.TBase::$tmethod[$etype];
-    } else {
-      $espec = $spec['elem'];
-    }
-    $var = array();
-    $_etype = $size = 0;
-    if ($set) {
-      $xfer += $input->readSetBegin($_etype, $size);
-    } else {
-      $xfer += $input->readListBegin($_etype, $size);
-    }
-    for ($i = 0; $i < $size; ++$i) {
-      $elem = null;
-      if ($eread !== null) {
-        $xfer += $input->$eread($elem);
-      } else {
-        $espec = $spec['elem'];
-        switch ($etype) {
-        case TType::STRUCT:
-          $class = $espec['class'];
-          $elem = new $class();
-          $xfer += $elem->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($elem, $espec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($elem, $espec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($elem, $espec, $input, true);
-          break;
-        }
-      }
-      if ($set) {
-        $var[$elem] = true;
-      } else {
-        $var []= $elem;
-      }
-    }
-    if ($set) {
-      $xfer += $input->readSetEnd();
-    } else {
-      $xfer += $input->readListEnd();
-    }
-
-    return $xfer;
-  }
-
-  protected function _read($class, $spec, $input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true) {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      if (isset($spec[$fid])) {
-        $fspec = $spec[$fid];
-        $var = $fspec['var'];
-        if ($ftype == $fspec['type']) {
-          $xfer = 0;
-          if (isset(TBase::$tmethod[$ftype])) {
-            $func = 'read'.TBase::$tmethod[$ftype];
-            $xfer += $input->$func($this->$var);
-          } else {
-            switch ($ftype) {
-            case TType::STRUCT:
-              $class = $fspec['class'];
-              $this->$var = new $class();
-              $xfer += $this->$var->read($input);
-              break;
-            case TType::MAP:
-              $xfer += $this->_readMap($this->$var, $fspec, $input);
-              break;
-            case TType::LST:
-              $xfer += $this->_readList($this->$var, $fspec, $input, false);
-              break;
-            case TType::SET:
-              $xfer += $this->_readList($this->$var, $fspec, $input, true);
-              break;
-            }
-          }
-        } else {
-          $xfer += $input->skip($ftype);
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-
-    return $xfer;
-  }
-
-  private function _writeMap($var, $spec, $output)
-  {
-    $xfer = 0;
-    $ktype = $spec['ktype'];
-    $vtype = $spec['vtype'];
-    $kwrite = $vwrite = null;
-    if (isset(TBase::$tmethod[$ktype])) {
-      $kwrite = 'write'.TBase::$tmethod[$ktype];
-    } else {
-      $kspec = $spec['key'];
-    }
-    if (isset(TBase::$tmethod[$vtype])) {
-      $vwrite = 'write'.TBase::$tmethod[$vtype];
-    } else {
-      $vspec = $spec['val'];
-    }
-    $xfer += $output->writeMapBegin($ktype, $vtype, count($var));
-    foreach ($var as $key => $val) {
-      if (isset($kwrite)) {
-        $xfer += $output->$kwrite($key);
-      } else {
-        switch ($ktype) {
-        case TType::STRUCT:
-          $xfer += $key->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($key, $kspec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($key, $kspec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($key, $kspec, $output, true);
-          break;
-        }
-      }
-      if (isset($vwrite)) {
-        $xfer += $output->$vwrite($val);
-      } else {
-        switch ($vtype) {
-        case TType::STRUCT:
-          $xfer += $val->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($val, $vspec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($val, $vspec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($val, $vspec, $output, true);
-          break;
-        }
-      }
-    }
-    $xfer += $output->writeMapEnd();
-
-    return $xfer;
-  }
-
-  private function _writeList($var, $spec, $output, $set=false)
-  {
-    $xfer = 0;
-    $etype = $spec['etype'];
-    $ewrite = null;
-    if (isset(TBase::$tmethod[$etype])) {
-      $ewrite = 'write'.TBase::$tmethod[$etype];
-    } else {
-      $espec = $spec['elem'];
-    }
-    if ($set) {
-      $xfer += $output->writeSetBegin($etype, count($var));
-    } else {
-      $xfer += $output->writeListBegin($etype, count($var));
-    }
-    foreach ($var as $key => $val) {
-      $elem = $set ? $key : $val;
-      if (isset($ewrite)) {
-        $xfer += $output->$ewrite($elem);
-      } else {
-        switch ($etype) {
-        case TType::STRUCT:
-          $xfer += $elem->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($elem, $espec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($elem, $espec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($elem, $espec, $output, true);
-          break;
-        }
-      }
-    }
-    if ($set) {
-      $xfer += $output->writeSetEnd();
-    } else {
-      $xfer += $output->writeListEnd();
-    }
-
-    return $xfer;
-  }
-
-  protected function _write($class, $spec, $output)
-  {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin($class);
-    foreach ($spec as $fid => $fspec) {
-      $var = $fspec['var'];
-      if ($this->$var !== null) {
-        $ftype = $fspec['type'];
-        $xfer += $output->writeFieldBegin($var, $ftype, $fid);
-        if (isset(TBase::$tmethod[$ftype])) {
-          $func = 'write'.TBase::$tmethod[$ftype];
-          $xfer += $output->$func($this->$var);
-        } else {
-          switch ($ftype) {
-          case TType::STRUCT:
-            $xfer += $this->$var->write($output);
-            break;
-          case TType::MAP:
-            $xfer += $this->_writeMap($this->$var, $fspec, $output);
-            break;
-          case TType::LST:
-            $xfer += $this->_writeList($this->$var, $fspec, $output, false);
-            break;
-          case TType::SET:
-            $xfer += $this->_writeList($this->$var, $fspec, $output, true);
-            break;
-          }
-        }
-        $xfer += $output->writeFieldEnd();
-      }
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-
-    return $xfer;
-  }
-
-}
-
-/**
- * Base class from which other Thrift structs extend. This is so that we can
- * cut back on the size of the generated code which is turning out to have a
- * nontrivial cost just to load thanks to the wondrously abysmal implementation
- * of PHP. Note that code is intentionally duplicated in here to avoid making
- * function calls for every field or member of a container..
- */
-abstract class TBase
-{
-  static $tmethod = array(TType::BOOL   => 'Bool',
-                          TType::BYTE   => 'Byte',
-                          TType::I16    => 'I16',
-                          TType::I32    => 'I32',
-                          TType::I64    => 'I64',
-                          TType::DOUBLE => 'Double',
-                          TType::STRING => 'String');
-
-  abstract public function read($input);
-
-  abstract public function write($output);
-
-  public function __construct($spec=null, $vals=null)
-  {
-    if (is_array($spec) && is_array($vals)) {
-      foreach ($spec as $fid => $fspec) {
-        $var = $fspec['var'];
-        if (isset($vals[$var])) {
-          $this->$var = $vals[$var];
-        }
-      }
-    }
-  }
-
-  private function _readMap(&$var, $spec, $input)
-  {
-    $xfer = 0;
-    $ktype = $spec['ktype'];
-    $vtype = $spec['vtype'];
-    $kread = $vread = null;
-    if (isset(TBase::$tmethod[$ktype])) {
-      $kread = 'read'.TBase::$tmethod[$ktype];
-    } else {
-      $kspec = $spec['key'];
-    }
-    if (isset(TBase::$tmethod[$vtype])) {
-      $vread = 'read'.TBase::$tmethod[$vtype];
-    } else {
-      $vspec = $spec['val'];
-    }
-    $var = array();
-    $_ktype = $_vtype = $size = 0;
-    $xfer += $input->readMapBegin($_ktype, $_vtype, $size);
-    for ($i = 0; $i < $size; ++$i) {
-      $key = $val = null;
-      if ($kread !== null) {
-        $xfer += $input->$kread($key);
-      } else {
-        switch ($ktype) {
-        case TType::STRUCT:
-          $class = $kspec['class'];
-          $key = new $class();
-          $xfer += $key->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($key, $kspec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($key, $kspec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($key, $kspec, $input, true);
-          break;
-        }
-      }
-      if ($vread !== null) {
-        $xfer += $input->$vread($val);
-      } else {
-        switch ($vtype) {
-        case TType::STRUCT:
-          $class = $vspec['class'];
-          $val = new $class();
-          $xfer += $val->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($val, $vspec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($val, $vspec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($val, $vspec, $input, true);
-          break;
-        }
-      }
-      $var[$key] = $val;
-    }
-    $xfer += $input->readMapEnd();
-
-    return $xfer;
-  }
-
-  private function _readList(&$var, $spec, $input, $set=false)
-  {
-    $xfer = 0;
-    $etype = $spec['etype'];
-    $eread = $vread = null;
-    if (isset(TBase::$tmethod[$etype])) {
-      $eread = 'read'.TBase::$tmethod[$etype];
-    } else {
-      $espec = $spec['elem'];
-    }
-    $var = array();
-    $_etype = $size = 0;
-    if ($set) {
-      $xfer += $input->readSetBegin($_etype, $size);
-    } else {
-      $xfer += $input->readListBegin($_etype, $size);
-    }
-    for ($i = 0; $i < $size; ++$i) {
-      $elem = null;
-      if ($eread !== null) {
-        $xfer += $input->$eread($elem);
-      } else {
-        $espec = $spec['elem'];
-        switch ($etype) {
-        case TType::STRUCT:
-          $class = $espec['class'];
-          $elem = new $class();
-          $xfer += $elem->read($input);
-          break;
-        case TType::MAP:
-          $xfer += $this->_readMap($elem, $espec, $input);
-          break;
-        case TType::LST:
-          $xfer += $this->_readList($elem, $espec, $input, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_readList($elem, $espec, $input, true);
-          break;
-        }
-      }
-      if ($set) {
-        $var[$elem] = true;
-      } else {
-        $var []= $elem;
-      }
-    }
-    if ($set) {
-      $xfer += $input->readSetEnd();
-    } else {
-      $xfer += $input->readListEnd();
-    }
-
-    return $xfer;
-  }
-
-  protected function _read($class, $spec, $input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true) {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      if (isset($spec[$fid])) {
-        $fspec = $spec[$fid];
-        $var = $fspec['var'];
-        if ($ftype == $fspec['type']) {
-          $xfer = 0;
-          if (isset(TBase::$tmethod[$ftype])) {
-            $func = 'read'.TBase::$tmethod[$ftype];
-            $xfer += $input->$func($this->$var);
-          } else {
-            switch ($ftype) {
-            case TType::STRUCT:
-              $class = $fspec['class'];
-              $this->$var = new $class();
-              $xfer += $this->$var->read($input);
-              break;
-            case TType::MAP:
-              $xfer += $this->_readMap($this->$var, $fspec, $input);
-              break;
-            case TType::LST:
-              $xfer += $this->_readList($this->$var, $fspec, $input, false);
-              break;
-            case TType::SET:
-              $xfer += $this->_readList($this->$var, $fspec, $input, true);
-              break;
-            }
-          }
-        } else {
-          $xfer += $input->skip($ftype);
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-
-    return $xfer;
-  }
-
-  private function _writeMap($var, $spec, $output)
-  {
-    $xfer = 0;
-    $ktype = $spec['ktype'];
-    $vtype = $spec['vtype'];
-    $kwrite = $vwrite = null;
-    if (isset(TBase::$tmethod[$ktype])) {
-      $kwrite = 'write'.TBase::$tmethod[$ktype];
-    } else {
-      $kspec = $spec['key'];
-    }
-    if (isset(TBase::$tmethod[$vtype])) {
-      $vwrite = 'write'.TBase::$tmethod[$vtype];
-    } else {
-      $vspec = $spec['val'];
-    }
-    $xfer += $output->writeMapBegin($ktype, $vtype, count($var));
-    foreach ($var as $key => $val) {
-      if (isset($kwrite)) {
-        $xfer += $output->$kwrite($key);
-      } else {
-        switch ($ktype) {
-        case TType::STRUCT:
-          $xfer += $key->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($key, $kspec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($key, $kspec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($key, $kspec, $output, true);
-          break;
-        }
-      }
-      if (isset($vwrite)) {
-        $xfer += $output->$vwrite($val);
-      } else {
-        switch ($vtype) {
-        case TType::STRUCT:
-          $xfer += $val->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($val, $vspec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($val, $vspec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($val, $vspec, $output, true);
-          break;
-        }
-      }
-    }
-    $xfer += $output->writeMapEnd();
-
-    return $xfer;
-  }
-
-  private function _writeList($var, $spec, $output, $set=false)
-  {
-    $xfer = 0;
-    $etype = $spec['etype'];
-    $ewrite = null;
-    if (isset(TBase::$tmethod[$etype])) {
-      $ewrite = 'write'.TBase::$tmethod[$etype];
-    } else {
-      $espec = $spec['elem'];
-    }
-    if ($set) {
-      $xfer += $output->writeSetBegin($etype, count($var));
-    } else {
-      $xfer += $output->writeListBegin($etype, count($var));
-    }
-    foreach ($var as $key => $val) {
-      $elem = $set ? $key : $val;
-      if (isset($ewrite)) {
-        $xfer += $output->$ewrite($elem);
-      } else {
-        switch ($etype) {
-        case TType::STRUCT:
-          $xfer += $elem->write($output);
-          break;
-        case TType::MAP:
-          $xfer += $this->_writeMap($elem, $espec, $output);
-          break;
-        case TType::LST:
-          $xfer += $this->_writeList($elem, $espec, $output, false);
-          break;
-        case TType::SET:
-          $xfer += $this->_writeList($elem, $espec, $output, true);
-          break;
-        }
-      }
-    }
-    if ($set) {
-      $xfer += $output->writeSetEnd();
-    } else {
-      $xfer += $output->writeListEnd();
-    }
-
-    return $xfer;
-  }
-
-  protected function _write($class, $spec, $output)
-  {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin($class);
-    foreach ($spec as $fid => $fspec) {
-      $var = $fspec['var'];
-      if ($this->$var !== null) {
-        $ftype = $fspec['type'];
-        $xfer += $output->writeFieldBegin($var, $ftype, $fid);
-        if (isset(TBase::$tmethod[$ftype])) {
-          $func = 'write'.TBase::$tmethod[$ftype];
-          $xfer += $output->$func($this->$var);
-        } else {
-          switch ($ftype) {
-          case TType::STRUCT:
-            $xfer += $this->$var->write($output);
-            break;
-          case TType::MAP:
-            $xfer += $this->_writeMap($this->$var, $fspec, $output);
-            break;
-          case TType::LST:
-            $xfer += $this->_writeList($this->$var, $fspec, $output, false);
-            break;
-          case TType::SET:
-            $xfer += $this->_writeList($this->$var, $fspec, $output, true);
-            break;
-          }
-        }
-        $xfer += $output->writeFieldEnd();
-      }
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-
-    return $xfer;
-  }
-}
-
-class TApplicationException extends TException
-{
-  static $_TSPEC =
-    array(1 => array('var' => 'message',
-                     'type' => TType::STRING),
-          2 => array('var' => 'code',
-                     'type' => TType::I32));
-
-  const UNKNOWN = 0;
-  const UNKNOWN_METHOD = 1;
-  const INVALID_MESSAGE_TYPE = 2;
-  const WRONG_METHOD_NAME = 3;
-  const BAD_SEQUENCE_ID = 4;
-  const MISSING_RESULT = 5;
-  const INTERNAL_ERROR = 6;
-  const PROTOCOL_ERROR = 7;
-
-  public function __construct($message=null, $code=0)
-  {
-    parent::__construct($message, $code);
-  }
-
-  public function read($output)
-  {
-    return $this->_read('TApplicationException', self::$_TSPEC, $output);
-  }
-
-  public function write($output)
-  {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('TApplicationException');
-    if ($message = $this->getMessage()) {
-      $xfer += $output->writeFieldBegin('message', TType::STRING, 1);
-      $xfer += $output->writeString($message);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($code = $this->getCode()) {
-      $xfer += $output->writeFieldBegin('type', TType::I32, 2);
-      $xfer += $output->writeI32($code);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-
-    return $xfer;
-  }
-}
-
-/**
- * Set global THRIFT ROOT automatically via inclusion here
- */
-if (!isset($GLOBALS['THRIFT_ROOT'])) {
-  $GLOBALS['THRIFT_ROOT'] = dirname(__FILE__);
-}
-include_once $GLOBALS['THRIFT_ROOT'].'/protocol/TProtocol.php';
-include_once $GLOBALS['THRIFT_ROOT'].'/transport/TTransport.php';
-include_once $GLOBALS['THRIFT_ROOT'].'/TStringUtils.php';
diff --git a/vendor/git.apache.org/thrift.git/lib/php/src/autoload.php b/vendor/git.apache.org/thrift.git/lib/php/src/autoload.php
deleted file mode 100644
index 85bd797..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/src/autoload.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-/**
- * Include this file if you wish to use autoload with your PHP generated Thrift
- * code. The generated code will *not* include any defined Thrift classes by
- * default, except for the service interfaces. The generated code will populate
- * values into $GLOBALS['THRIFT_AUTOLOAD'] which can be used by the autoload
- * method below. If you have your own autoload system already in place, rename your
- * __autoload function to something else and then do:
- * $GLOBALS['AUTOLOAD_HOOKS'][] = 'my_autoload_func';
- *
- * Generate this code using the --gen php:autoload Thrift generator flag.
- */
-
-$GLOBALS['THRIFT_AUTOLOAD'] = array();
-$GLOBALS['AUTOLOAD_HOOKS'] = array();
-
-if (!function_exists('__autoload')) {
-  function __autoload($class)
-  {
-    global $THRIFT_AUTOLOAD;
-    $classl = strtolower($class);
-    if (isset($THRIFT_AUTOLOAD[$classl])) {
-      include_once $GLOBALS['THRIFT_ROOT'].'/packages/'.$THRIFT_AUTOLOAD[$classl];
-    } elseif (!empty($GLOBALS['AUTOLOAD_HOOKS'])) {
-      foreach ($GLOBALS['AUTOLOAD_HOOKS'] as $hook) {
-        $hook($class);
-      }
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp b/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
deleted file mode 100644
index a0de645..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
+++ /dev/null
@@ -1,1084 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "zend_interfaces.h"
-#include "zend_exceptions.h"
-#include "php_thrift_protocol.h"
-
-/* GUARD FOR PHP 5 */
-#if PHP_VERSION_ID < 70000 && PHP_VERSION_ID > 50000
-
-#include <sys/types.h>
-#if defined( WIN32 ) || defined( _WIN64 )
-typedef int  int32_t; 
-typedef signed char int8_t;
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef long long  int64_t;
-typedef unsigned   uint32_t; 
-typedef short  int16_t; 
-typedef unsigned long long   uint64_t;
-#else
-#include <arpa/inet.h> 
-#endif
-#include <stdexcept>
-
-#ifndef bswap_64
-#define	bswap_64(x)     (((uint64_t)(x) << 56) | \
-                        (((uint64_t)(x) << 40) & 0xff000000000000ULL) | \
-                        (((uint64_t)(x) << 24) & 0xff0000000000ULL) | \
-                        (((uint64_t)(x) << 8)  & 0xff00000000ULL) | \
-                        (((uint64_t)(x) >> 8)  & 0xff000000ULL) | \
-                        (((uint64_t)(x) >> 24) & 0xff0000ULL) | \
-                        (((uint64_t)(x) >> 40) & 0xff00ULL) | \
-                        ((uint64_t)(x)  >> 56))
-#endif
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define htonll(x) bswap_64(x)
-#define ntohll(x) bswap_64(x)
-#elif __BYTE_ORDER == __BIG_ENDIAN
-#define htonll(x) x
-#define ntohll(x) x
-#else
-#error Unknown __BYTE_ORDER
-#endif
-
-enum TType {
-  T_STOP       = 0,
-  T_VOID       = 1,
-  T_BOOL       = 2,
-  T_BYTE       = 3,
-  T_I08        = 3,
-  T_I16        = 6,
-  T_I32        = 8,
-  T_U64        = 9,
-  T_I64        = 10,
-  T_DOUBLE     = 4,
-  T_STRING     = 11,
-  T_UTF7       = 11,
-  T_STRUCT     = 12,
-  T_MAP        = 13,
-  T_SET        = 14,
-  T_LIST       = 15,
-  T_UTF8       = 16,
-  T_UTF16      = 17
-};
-
-const int32_t VERSION_MASK = 0xffff0000;
-const int32_t VERSION_1 = 0x80010000;
-const int8_t T_CALL = 1;
-const int8_t T_REPLY = 2;
-const int8_t T_EXCEPTION = 3;
-// tprotocolexception
-const int INVALID_DATA = 1;
-const int BAD_VERSION = 4;
-
-static zend_function_entry thrift_protocol_functions[] = {
-  PHP_FE(thrift_protocol_write_binary, NULL)
-  PHP_FE(thrift_protocol_read_binary, NULL)
-  {NULL, NULL, NULL}
-} ;
-
-zend_module_entry thrift_protocol_module_entry = {
-  STANDARD_MODULE_HEADER,
-  "thrift_protocol",
-  thrift_protocol_functions,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  "1.0",
-  STANDARD_MODULE_PROPERTIES
-};
-
-#ifdef COMPILE_DL_THRIFT_PROTOCOL
-ZEND_GET_MODULE(thrift_protocol)
-#endif
-
-class PHPExceptionWrapper : public std::exception {
-public:
-  PHPExceptionWrapper(zval* _ex) throw() : ex(_ex) {
-    snprintf(_what, 40, "PHP exception zval=%p", ex);
-  }
-  const char* what() const throw() { return _what; }
-  ~PHPExceptionWrapper() throw() {}
-  operator zval*() const throw() { return const_cast<zval*>(ex); } // Zend API doesn't do 'const'...
-protected:
-  zval* ex;
-  char _what[40];
-} ;
-
-class PHPTransport {
-public:
-  zval* protocol() { return p; }
-  zval* transport() { return t; }
-protected:
-  PHPTransport() {}
-
-  void construct_with_zval(zval* _p, size_t _buffer_size) {
-    buffer = reinterpret_cast<char*>(emalloc(_buffer_size));
-    buffer_ptr = buffer;
-    buffer_used = 0;
-    buffer_size = _buffer_size;
-    p = _p;
-
-    // Get the transport for the passed protocol
-    zval gettransport;
-    ZVAL_STRING(&gettransport, "getTransport", 0);
-    MAKE_STD_ZVAL(t);
-    ZVAL_NULL(t);
-    TSRMLS_FETCH();
-    call_user_function(EG(function_table), &p, &gettransport, t, 0, NULL TSRMLS_CC);
-  }
-  ~PHPTransport() {
-    efree(buffer);
-    zval_ptr_dtor(&t);
-  }
-
-  char* buffer;
-  char* buffer_ptr;
-  size_t buffer_used;
-  size_t buffer_size;
-
-  zval* p;
-  zval* t;
-};
-
-
-class PHPOutputTransport : public PHPTransport {
-public:
-  PHPOutputTransport(zval* _p, size_t _buffer_size = 8192) {
-    construct_with_zval(_p, _buffer_size);
-  }
-
-  ~PHPOutputTransport() {
-    //flush();
-  }
-
-  void write(const char* data, size_t len) {
-    if ((len + buffer_used) > buffer_size) {
-      internalFlush();
-    }
-    if (len > buffer_size) {
-      directWrite(data, len);
-    } else {
-      memcpy(buffer_ptr, data, len);
-      buffer_used += len;
-      buffer_ptr += len;
-    }
-  }
-
-  void writeI64(int64_t i) {
-    i = htonll(i);
-    write((const char*)&i, 8);
-  }
-
-  void writeU32(uint32_t i) {
-    i = htonl(i);
-    write((const char*)&i, 4);
-  }
-
-  void writeI32(int32_t i) {
-    i = htonl(i);
-    write((const char*)&i, 4);
-  }
-
-  void writeI16(int16_t i) {
-    i = htons(i);
-    write((const char*)&i, 2);
-  }
-
-  void writeI8(int8_t i) {
-    write((const char*)&i, 1);
-  }
-
-  void writeString(const char* str, size_t len) {
-    writeU32(len);
-    write(str, len);
-  }
-
-  void flush() {
-    internalFlush();
-    directFlush();
-  }
-
-protected:
-  void internalFlush() {
-     if (buffer_used) {
-      directWrite(buffer, buffer_used);
-      buffer_ptr = buffer;
-      buffer_used = 0;
-    }
-  }
-  void directFlush() {
-    zval ret;
-    ZVAL_NULL(&ret);
-    zval flushfn;
-    ZVAL_STRING(&flushfn, "flush", 0);
-    TSRMLS_FETCH();
-    call_user_function(EG(function_table), &t, &flushfn, &ret, 0, NULL TSRMLS_CC);
-    zval_dtor(&ret);
-  }
-  void directWrite(const char* data, size_t len) {
-    zval writefn;
-    ZVAL_STRING(&writefn, "write", 0);
-    char* newbuf = (char*)emalloc(len + 1);
-    memcpy(newbuf, data, len);
-    newbuf[len] = '\0';
-    zval *args[1];
-    MAKE_STD_ZVAL(args[0]);
-    ZVAL_STRINGL(args[0], newbuf, len, 0);
-    TSRMLS_FETCH();
-    zval ret;
-    ZVAL_NULL(&ret);
-    call_user_function(EG(function_table), &t, &writefn, &ret, 1, args TSRMLS_CC);
-    zval_ptr_dtor(args);
-    zval_dtor(&ret);
-    if (EG(exception)) {
-      zval* ex = EG(exception);
-      EG(exception) = NULL;
-      throw PHPExceptionWrapper(ex);
-    }
-  }
-};
-
-class PHPInputTransport : public PHPTransport {
-public:
-  PHPInputTransport(zval* _p, size_t _buffer_size = 8192) {
-    construct_with_zval(_p, _buffer_size);
-  }
-
-  ~PHPInputTransport() {
-    put_back();
-  }
-
-  void put_back() {
-    if (buffer_used) {
-      zval putbackfn;
-      ZVAL_STRING(&putbackfn, "putBack", 0);
-
-      char* newbuf = (char*)emalloc(buffer_used + 1);
-      memcpy(newbuf, buffer_ptr, buffer_used);
-      newbuf[buffer_used] = '\0';
-
-      zval *args[1];
-      MAKE_STD_ZVAL(args[0]);
-      ZVAL_STRINGL(args[0], newbuf, buffer_used, 0);
-
-      TSRMLS_FETCH();
-
-      zval ret;
-      ZVAL_NULL(&ret);
-      call_user_function(EG(function_table), &t, &putbackfn, &ret, 1, args TSRMLS_CC);
-      zval_ptr_dtor(args);
-      zval_dtor(&ret);
-    }
-    buffer_used = 0;
-    buffer_ptr = buffer;
-  }
-
-  void skip(size_t len) {
-    while (len) {
-      size_t chunk_size = MIN(len, buffer_used);
-      if (chunk_size) {
-        buffer_ptr = reinterpret_cast<char*>(buffer_ptr) + chunk_size;
-        buffer_used -= chunk_size;
-        len -= chunk_size;
-      }
-      if (! len) break;
-      refill();
-    }
-  }
-
-  void readBytes(void* buf, size_t len) {
-    while (len) {
-      size_t chunk_size = MIN(len, buffer_used);
-      if (chunk_size) {
-        memcpy(buf, buffer_ptr, chunk_size);
-        buffer_ptr = reinterpret_cast<char*>(buffer_ptr) + chunk_size;
-        buffer_used -= chunk_size;
-        buf = reinterpret_cast<char*>(buf) + chunk_size;
-        len -= chunk_size;
-      }
-      if (! len) break;
-      refill();
-    }
-  }
-
-  int8_t readI8() {
-    int8_t c;
-    readBytes(&c, 1);
-    return c;
-  }
-
-  int16_t readI16() {
-    int16_t c;
-    readBytes(&c, 2);
-    return (int16_t)ntohs(c);
-  }
-
-  uint32_t readU32() {
-    uint32_t c;
-    readBytes(&c, 4);
-    return (uint32_t)ntohl(c);
-  }
-
-  int32_t readI32() {
-    int32_t c;
-    readBytes(&c, 4);
-    return (int32_t)ntohl(c);
-  }
-
-protected:
-  void refill() {
-    assert(buffer_used == 0);
-    zval retval;
-    ZVAL_NULL(&retval);
-
-    zval *args[1];
-    MAKE_STD_ZVAL(args[0]);
-    ZVAL_LONG(args[0], buffer_size);
-
-    TSRMLS_FETCH();
-
-    zval funcname;
-    ZVAL_STRING(&funcname, "read", 0);
-
-    call_user_function(EG(function_table), &t, &funcname, &retval, 1, args TSRMLS_CC);
-    zval_ptr_dtor(args);
-
-    if (EG(exception)) {
-      zval_dtor(&retval);
-      zval* ex = EG(exception);
-      EG(exception) = NULL;
-      throw PHPExceptionWrapper(ex);
-    }
-
-    buffer_used = Z_STRLEN(retval);
-    memcpy(buffer, Z_STRVAL(retval), buffer_used);
-    zval_dtor(&retval);
-
-    buffer_ptr = buffer;
-  }
-
-};
-
-void binary_deserialize_spec(zval* zthis, PHPInputTransport& transport, HashTable* spec);
-void binary_serialize_spec(zval* zthis, PHPOutputTransport& transport, HashTable* spec);
-void binary_serialize(int8_t thrift_typeID, PHPOutputTransport& transport, zval** value, HashTable* fieldspec);
-void skip_element(long thrift_typeID, PHPInputTransport& transport);
-void protocol_writeMessageBegin(zval *transport, const char* method_name, int32_t msgtype, int32_t seqID);
-
-
-// Create a PHP object given a typename and call the ctor, optionally passing up to 2 arguments
-void createObject(const char* obj_typename, zval* return_value, int nargs = 0, zval* arg1 = NULL, zval* arg2 = NULL) {
-  TSRMLS_FETCH();
-  size_t obj_typename_len = strlen(obj_typename);
-  zend_class_entry* ce = zend_fetch_class(obj_typename, obj_typename_len, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC);
-  if (! ce) {
-    php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s does not exist", obj_typename);
-    RETURN_NULL();
-  }
-
-  object_and_properties_init(return_value, ce, NULL);
-  zend_function* constructor = zend_std_get_constructor(return_value TSRMLS_CC);
-  zval* ctor_rv = NULL;
-  zend_call_method(&return_value, ce, &constructor, NULL, 0, &ctor_rv, nargs, arg1, arg2 TSRMLS_CC);
-  zval_ptr_dtor(&ctor_rv);
-}
-
-void throw_tprotocolexception(const char* what, long errorcode) {
-  TSRMLS_FETCH();
-
-  zval *zwhat, *zerrorcode;
-  MAKE_STD_ZVAL(zwhat);
-  MAKE_STD_ZVAL(zerrorcode);
-
-  ZVAL_STRING(zwhat, what, 1);
-  ZVAL_LONG(zerrorcode, errorcode);
-
-  zval* ex;
-  MAKE_STD_ZVAL(ex);
-  createObject("\\Thrift\\Exception\\TProtocolException", ex, 2, zwhat, zerrorcode);
-  zval_ptr_dtor(&zwhat);
-  zval_ptr_dtor(&zerrorcode);
-  throw PHPExceptionWrapper(ex);
-}
-
-// Sets EG(exception), call this and then RETURN_NULL();
-void throw_zend_exception_from_std_exception(const std::exception& ex TSRMLS_DC) {
-  zend_throw_exception(zend_exception_get_default(TSRMLS_C), const_cast<char*>(ex.what()), 0 TSRMLS_CC);
-}
-
-
-void binary_deserialize(int8_t thrift_typeID, PHPInputTransport& transport, zval* return_value, HashTable* fieldspec) {
-  zval** val_ptr;
-  Z_TYPE_P(return_value) = IS_NULL; // just in case
-
-  switch (thrift_typeID) {
-    case T_STOP:
-    case T_VOID:
-      RETURN_NULL();
-      return;
-    case T_STRUCT: {
-      if (zend_hash_find(fieldspec, "class", 6, (void**)&val_ptr) != SUCCESS) {
-        throw_tprotocolexception("no class type in spec", INVALID_DATA);
-        skip_element(T_STRUCT, transport);
-        RETURN_NULL();
-      }
-      char* structType = Z_STRVAL_PP(val_ptr);
-      createObject(structType, return_value);
-      if (Z_TYPE_P(return_value) == IS_NULL) {
-        // unable to create class entry
-        skip_element(T_STRUCT, transport);
-        RETURN_NULL();
-      }
-      TSRMLS_FETCH();
-      zval* spec = zend_read_static_property(zend_get_class_entry(return_value TSRMLS_CC), "_TSPEC", 6, false TSRMLS_CC);
-      if (Z_TYPE_P(spec) != IS_ARRAY) {
-        char errbuf[128];
-        snprintf(errbuf, 128, "spec for %s is wrong type: %d\n", structType, Z_TYPE_P(spec));
-        throw_tprotocolexception(errbuf, INVALID_DATA);
-        RETURN_NULL();
-      }
-      binary_deserialize_spec(return_value, transport, Z_ARRVAL_P(spec));
-      return;
-    } break;
-    case T_BOOL: {
-      uint8_t c;
-      transport.readBytes(&c, 1);
-      RETURN_BOOL(c != 0);
-    }
-  //case T_I08: // same numeric value as T_BYTE
-    case T_BYTE: {
-      uint8_t c;
-      transport.readBytes(&c, 1);
-      RETURN_LONG((int8_t)c);
-    }
-    case T_I16: {
-      uint16_t c;
-      transport.readBytes(&c, 2);
-      RETURN_LONG((int16_t)ntohs(c));
-    }
-    case T_I32: {
-      uint32_t c;
-      transport.readBytes(&c, 4);
-      RETURN_LONG((int32_t)ntohl(c));
-    }
-    case T_U64:
-    case T_I64: {
-      uint64_t c;
-      transport.readBytes(&c, 8);
-      RETURN_LONG((int64_t)ntohll(c));
-    }
-    case T_DOUBLE: {
-      union {
-        uint64_t c;
-        double d;
-      } a;
-      transport.readBytes(&(a.c), 8);
-      a.c = ntohll(a.c);
-      RETURN_DOUBLE(a.d);
-    }
-    //case T_UTF7: // aliases T_STRING
-    case T_UTF8:
-    case T_UTF16:
-    case T_STRING: {
-      uint32_t size = transport.readU32();
-      if (size) {
-        char* strbuf = (char*) emalloc(size + 1);
-        transport.readBytes(strbuf, size);
-        strbuf[size] = '\0';
-        ZVAL_STRINGL(return_value, strbuf, size, 0);
-      } else {
-        ZVAL_EMPTY_STRING(return_value);
-      }
-      return;
-    }
-    case T_MAP: { // array of key -> value
-      uint8_t types[2];
-      transport.readBytes(types, 2);
-      uint32_t size = transport.readU32();
-      array_init(return_value);
-
-      zend_hash_find(fieldspec, "key", 4, (void**)&val_ptr);
-      HashTable* keyspec = Z_ARRVAL_PP(val_ptr);
-      zend_hash_find(fieldspec, "val", 4, (void**)&val_ptr);
-      HashTable* valspec = Z_ARRVAL_PP(val_ptr);
-
-      for (uint32_t s = 0; s < size; ++s) {
-        zval *value;
-        MAKE_STD_ZVAL(value);
-
-        zval* key;
-        MAKE_STD_ZVAL(key);
-
-        binary_deserialize(types[0], transport, key, keyspec);
-        binary_deserialize(types[1], transport, value, valspec);
-        if (Z_TYPE_P(key) == IS_LONG) {
-          zend_hash_index_update(return_value->value.ht, Z_LVAL_P(key), &value, sizeof(zval *), NULL);
-        }
-        else {
-          if (Z_TYPE_P(key) != IS_STRING) convert_to_string(key);
-          zend_hash_update(return_value->value.ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &value, sizeof(zval *), NULL);
-        }
-        zval_ptr_dtor(&key);
-      }
-      return; // return_value already populated
-    }
-    case T_LIST: { // array with autogenerated numeric keys
-      int8_t type = transport.readI8();
-      uint32_t size = transport.readU32();
-      zend_hash_find(fieldspec, "elem", 5, (void**)&val_ptr);
-      HashTable* elemspec = Z_ARRVAL_PP(val_ptr);
-
-      array_init(return_value);
-      for (uint32_t s = 0; s < size; ++s) {
-        zval *value;
-        MAKE_STD_ZVAL(value);
-        binary_deserialize(type, transport, value, elemspec);
-        zend_hash_next_index_insert(return_value->value.ht, &value, sizeof(zval *), NULL);
-      }
-      return;
-    }
-    case T_SET: { // array of key -> TRUE
-      uint8_t type;
-      uint32_t size;
-      transport.readBytes(&type, 1);
-      transport.readBytes(&size, 4);
-      size = ntohl(size);
-      zend_hash_find(fieldspec, "elem", 5, (void**)&val_ptr);
-      HashTable* elemspec = Z_ARRVAL_PP(val_ptr);
-
-      array_init(return_value);
-
-      for (uint32_t s = 0; s < size; ++s) {
-        zval* key;
-        zval* value;
-        MAKE_STD_ZVAL(key);
-        MAKE_STD_ZVAL(value);
-        ZVAL_TRUE(value);
-
-        binary_deserialize(type, transport, key, elemspec);
-
-        if (Z_TYPE_P(key) == IS_LONG) {
-          zend_hash_index_update(return_value->value.ht, Z_LVAL_P(key), &value, sizeof(zval *), NULL);
-        }
-        else {
-          if (Z_TYPE_P(key) != IS_STRING) convert_to_string(key);
-          zend_hash_update(return_value->value.ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &value, sizeof(zval *), NULL);
-        }
-        zval_ptr_dtor(&key);
-      }
-      return;
-    }
-  };
-
-  char errbuf[128];
-  sprintf(errbuf, "Unknown thrift typeID %d", thrift_typeID);
-  throw_tprotocolexception(errbuf, INVALID_DATA);
-}
-
-void skip_element(long thrift_typeID, PHPInputTransport& transport) {
-  switch (thrift_typeID) {
-    case T_STOP:
-    case T_VOID:
-      return;
-    case T_STRUCT:
-      while (true) {
-        int8_t ttype = transport.readI8(); // get field type
-        if (ttype == T_STOP) break;
-        transport.skip(2); // skip field number, I16
-        skip_element(ttype, transport); // skip field payload
-      }
-      return;
-    case T_BOOL:
-    case T_BYTE:
-      transport.skip(1);
-      return;
-    case T_I16:
-      transport.skip(2);
-      return;
-    case T_I32:
-      transport.skip(4);
-      return;
-    case T_U64:
-    case T_I64:
-    case T_DOUBLE:
-      transport.skip(8);
-      return;
-    //case T_UTF7: // aliases T_STRING
-    case T_UTF8:
-    case T_UTF16:
-    case T_STRING: {
-      uint32_t len = transport.readU32();
-      transport.skip(len);
-      } return;
-    case T_MAP: {
-      int8_t keytype = transport.readI8();
-      int8_t valtype = transport.readI8();
-      uint32_t size = transport.readU32();
-      for (uint32_t i = 0; i < size; ++i) {
-        skip_element(keytype, transport);
-        skip_element(valtype, transport);
-      }
-    } return;
-    case T_LIST:
-    case T_SET: {
-      int8_t valtype = transport.readI8();
-      uint32_t size = transport.readU32();
-      for (uint32_t i = 0; i < size; ++i) {
-        skip_element(valtype, transport);
-      }
-    } return;
-  };
-
-  char errbuf[128];
-  sprintf(errbuf, "Unknown thrift typeID %ld", thrift_typeID);
-  throw_tprotocolexception(errbuf, INVALID_DATA);
-}
-
-void protocol_writeMessageBegin(zval* transport, const char* method_name, int32_t msgtype, int32_t seqID) {
-  TSRMLS_FETCH();
-  zval *args[3];
-
-  MAKE_STD_ZVAL(args[0]);
-  ZVAL_STRINGL(args[0], (char*)method_name, strlen(method_name), 1);
-
-  MAKE_STD_ZVAL(args[1]);
-  ZVAL_LONG(args[1], msgtype);
-
-  MAKE_STD_ZVAL(args[2]);
-  ZVAL_LONG(args[2], seqID);
-
-  zval ret;
-  ZVAL_NULL(&ret);
-
-  zval writeMessagefn;
-  ZVAL_STRING(&writeMessagefn, "writeMessageBegin", 0);
-
-  call_user_function(EG(function_table), &transport, &writeMessagefn, &ret, 3, args TSRMLS_CC);
-
-  zval_ptr_dtor(&args[0]);
-  zval_ptr_dtor(&args[1]);
-  zval_ptr_dtor(&args[2]);
-  zval_dtor(&ret);
-}
-
-void binary_serialize_hashtable_key(int8_t keytype, PHPOutputTransport& transport, HashTable* ht, HashPosition& ht_pos) {
-  bool keytype_is_numeric = (!((keytype == T_STRING) || (keytype == T_UTF8) || (keytype == T_UTF16)));
-
-  char* key;
-  uint key_len;
-  long index = 0;
-
-  zval* z;
-  MAKE_STD_ZVAL(z);
-
-  int res = zend_hash_get_current_key_ex(ht, &key, &key_len, (ulong*)&index, 0, &ht_pos);
-  if (keytype_is_numeric) {
-    if (res == HASH_KEY_IS_STRING) {
-      index = strtol(key, NULL, 10);
-    }
-    ZVAL_LONG(z, index);
-  } else {
-    char buf[64];
-    if (res == HASH_KEY_IS_STRING) {
-      key_len -= 1; // skip the null terminator
-    } else {
-      sprintf(buf, "%ld", index);
-      key = buf; key_len = strlen(buf);
-    }
-    ZVAL_STRINGL(z, key, key_len, 1);
-  }
-  binary_serialize(keytype, transport, &z, NULL);
-  zval_ptr_dtor(&z);
-}
-
-inline bool ttype_is_int(int8_t t) {
-  return ((t == T_BYTE) || ((t >= T_I16)  && (t <= T_I64)));
-}
-
-inline bool ttypes_are_compatible(int8_t t1, int8_t t2) {
-  // Integer types of different widths are considered compatible;
-  // otherwise the typeID must match.
-  return ((t1 == t2) || (ttype_is_int(t1) && ttype_is_int(t2)));
-}
-
-void binary_deserialize_spec(zval* zthis, PHPInputTransport& transport, HashTable* spec) {
-  // SET and LIST have 'elem' => array('type', [optional] 'class')
-  // MAP has 'val' => array('type', [optiona] 'class')
-  TSRMLS_FETCH();
-  zend_class_entry* ce = zend_get_class_entry(zthis TSRMLS_CC);
-  while (true) {
-    zval** val_ptr = NULL;
-
-    int8_t ttype = transport.readI8();
-    if (ttype == T_STOP) return;
-    int16_t fieldno = transport.readI16();
-    if (zend_hash_index_find(spec, fieldno, (void**)&val_ptr) == SUCCESS) {
-      HashTable* fieldspec = Z_ARRVAL_PP(val_ptr);
-      // pull the field name
-      // zend hash tables use the null at the end in the length... so strlen(hash key) + 1.
-      zend_hash_find(fieldspec, "var", 4, (void**)&val_ptr);
-      char* varname = Z_STRVAL_PP(val_ptr);
-
-      // and the type
-      zend_hash_find(fieldspec, "type", 5, (void**)&val_ptr);
-      if (Z_TYPE_PP(val_ptr) != IS_LONG) convert_to_long(*val_ptr);
-      int8_t expected_ttype = Z_LVAL_PP(val_ptr);
-
-      if (ttypes_are_compatible(ttype, expected_ttype)) {
-        zval* rv = NULL;
-        MAKE_STD_ZVAL(rv);
-        binary_deserialize(ttype, transport, rv, fieldspec);
-        zend_update_property(ce, zthis, varname, strlen(varname), rv TSRMLS_CC);
-        zval_ptr_dtor(&rv);
-      } else {
-        skip_element(ttype, transport);
-      }
-    } else {
-      skip_element(ttype, transport);
-    }
-  }
-}
-
-void binary_serialize(int8_t thrift_typeID, PHPOutputTransport& transport, zval** value, HashTable* fieldspec) {
-  // At this point the typeID (and field num, if applicable) should've already been written to the output so all we need to do is write the payload.
-  switch (thrift_typeID) {
-    case T_STOP:
-    case T_VOID:
-      return;
-    case T_STRUCT: {
-      TSRMLS_FETCH();
-      if (Z_TYPE_PP(value) != IS_OBJECT) {
-        throw_tprotocolexception("Attempt to send non-object type as a T_STRUCT", INVALID_DATA);
-      }
-      zval* spec = zend_read_static_property(zend_get_class_entry(*value TSRMLS_CC), "_TSPEC", 6, false TSRMLS_CC);
-      if (Z_TYPE_P(spec) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send non-Thrift object as a T_STRUCT", INVALID_DATA);
-      }
-      binary_serialize_spec(*value, transport, Z_ARRVAL_P(spec));
-    } return;
-    case T_BOOL:
-      if (Z_TYPE_PP(value) != IS_BOOL) convert_to_boolean(*value);
-      transport.writeI8(Z_BVAL_PP(value) ? 1 : 0);
-      return;
-    case T_BYTE:
-      if (Z_TYPE_PP(value) != IS_LONG) convert_to_long(*value);
-      transport.writeI8(Z_LVAL_PP(value));
-      return;
-    case T_I16:
-      if (Z_TYPE_PP(value) != IS_LONG) convert_to_long(*value);
-      transport.writeI16(Z_LVAL_PP(value));
-      return;
-    case T_I32:
-      if (Z_TYPE_PP(value) != IS_LONG) convert_to_long(*value);
-      transport.writeI32(Z_LVAL_PP(value));
-      return;
-    case T_I64:
-    case T_U64: {
-      int64_t l_data;
-#if defined(_LP64) || defined(_WIN64)
-      if (Z_TYPE_PP(value) != IS_LONG) convert_to_long(*value);
-      l_data = Z_LVAL_PP(value);
-#else
-      if (Z_TYPE_PP(value) != IS_DOUBLE) convert_to_double(*value);
-      l_data = (int64_t)Z_DVAL_PP(value);
-#endif
-      transport.writeI64(l_data);
-    } return;
-    case T_DOUBLE: {
-      union {
-        int64_t c;
-        double d;
-      } a;
-      if (Z_TYPE_PP(value) != IS_DOUBLE) convert_to_double(*value);
-      a.d = Z_DVAL_PP(value);
-      transport.writeI64(a.c);
-    } return;
-    //case T_UTF7:
-    case T_UTF8:
-    case T_UTF16:
-    case T_STRING:
-      if (Z_TYPE_PP(value) != IS_STRING) convert_to_string(*value);
-      transport.writeString(Z_STRVAL_PP(value), Z_STRLEN_PP(value));
-      return;
-    case T_MAP: {
-      if (Z_TYPE_PP(value) != IS_ARRAY) convert_to_array(*value);
-      if (Z_TYPE_PP(value) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send an incompatible type as an array (T_MAP)", INVALID_DATA);
-      }
-      HashTable* ht = Z_ARRVAL_PP(value);
-      zval** val_ptr;
-
-      zend_hash_find(fieldspec, "ktype", 6, (void**)&val_ptr);
-      if (Z_TYPE_PP(val_ptr) != IS_LONG) convert_to_long(*val_ptr);
-      uint8_t keytype = Z_LVAL_PP(val_ptr);
-      transport.writeI8(keytype);
-      zend_hash_find(fieldspec, "vtype", 6, (void**)&val_ptr);
-      if (Z_TYPE_PP(val_ptr) != IS_LONG) convert_to_long(*val_ptr);
-      uint8_t valtype = Z_LVAL_PP(val_ptr);
-      transport.writeI8(valtype);
-
-      zend_hash_find(fieldspec, "val", 4, (void**)&val_ptr);
-      HashTable* valspec = Z_ARRVAL_PP(val_ptr);
-
-      transport.writeI32(zend_hash_num_elements(ht));
-      HashPosition key_ptr;
-      for (zend_hash_internal_pointer_reset_ex(ht, &key_ptr); zend_hash_get_current_data_ex(ht, (void**)&val_ptr, &key_ptr) == SUCCESS; zend_hash_move_forward_ex(ht, &key_ptr)) {
-        binary_serialize_hashtable_key(keytype, transport, ht, key_ptr);
-        binary_serialize(valtype, transport, val_ptr, valspec);
-      }
-    } return;
-    case T_LIST: {
-      if (Z_TYPE_PP(value) != IS_ARRAY) convert_to_array(*value);
-      if (Z_TYPE_PP(value) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send an incompatible type as an array (T_LIST)", INVALID_DATA);
-      }
-      HashTable* ht = Z_ARRVAL_PP(value);
-      zval** val_ptr;
-
-      zend_hash_find(fieldspec, "etype", 6, (void**)&val_ptr);
-      if (Z_TYPE_PP(val_ptr) != IS_LONG) convert_to_long(*val_ptr);
-      uint8_t valtype = Z_LVAL_PP(val_ptr);
-      transport.writeI8(valtype);
-
-      zend_hash_find(fieldspec, "elem", 5, (void**)&val_ptr);
-      HashTable* valspec = Z_ARRVAL_PP(val_ptr);
-
-      transport.writeI32(zend_hash_num_elements(ht));
-      HashPosition key_ptr;
-      for (zend_hash_internal_pointer_reset_ex(ht, &key_ptr); zend_hash_get_current_data_ex(ht, (void**)&val_ptr, &key_ptr) == SUCCESS; zend_hash_move_forward_ex(ht, &key_ptr)) {
-        binary_serialize(valtype, transport, val_ptr, valspec);
-      }
-    } return;
-    case T_SET: {
-      if (Z_TYPE_PP(value) != IS_ARRAY) convert_to_array(*value);
-      if (Z_TYPE_PP(value) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send an incompatible type as an array (T_SET)", INVALID_DATA);
-      }
-      HashTable* ht = Z_ARRVAL_PP(value);
-      zval** val_ptr;
-
-      zend_hash_find(fieldspec, "etype", 6, (void**)&val_ptr);
-      if (Z_TYPE_PP(val_ptr) != IS_LONG) convert_to_long(*val_ptr);
-      uint8_t keytype = Z_LVAL_PP(val_ptr);
-      transport.writeI8(keytype);
-
-      transport.writeI32(zend_hash_num_elements(ht));
-      HashPosition key_ptr;
-      for (zend_hash_internal_pointer_reset_ex(ht, &key_ptr); zend_hash_get_current_data_ex(ht, (void**)&val_ptr, &key_ptr) == SUCCESS; zend_hash_move_forward_ex(ht, &key_ptr)) {
-        binary_serialize_hashtable_key(keytype, transport, ht, key_ptr);
-      }
-    } return;
-  };
-  char errbuf[128];
-  sprintf(errbuf, "Unknown thrift typeID %d", thrift_typeID);
-  throw_tprotocolexception(errbuf, INVALID_DATA);
-}
-
-
-void binary_serialize_spec(zval* zthis, PHPOutputTransport& transport, HashTable* spec) {
-  HashPosition key_ptr;
-  zval** val_ptr;
-
-  TSRMLS_FETCH();
-  zend_class_entry* ce = zend_get_class_entry(zthis TSRMLS_CC);
-
-  for (zend_hash_internal_pointer_reset_ex(spec, &key_ptr); zend_hash_get_current_data_ex(spec, (void**)&val_ptr, &key_ptr) == SUCCESS; zend_hash_move_forward_ex(spec, &key_ptr)) {
-    ulong fieldno;
-    if (zend_hash_get_current_key_ex(spec, NULL, NULL, &fieldno, 0, &key_ptr) != HASH_KEY_IS_LONG) {
-      throw_tprotocolexception("Bad keytype in TSPEC (expected 'long')", INVALID_DATA);
-      return;
-    }
-    HashTable* fieldspec = Z_ARRVAL_PP(val_ptr);
-
-    // field name
-    zend_hash_find(fieldspec, "var", 4, (void**)&val_ptr);
-    char* varname = Z_STRVAL_PP(val_ptr);
-
-    // thrift type
-    zend_hash_find(fieldspec, "type", 5, (void**)&val_ptr);
-    if (Z_TYPE_PP(val_ptr) != IS_LONG) convert_to_long(*val_ptr);
-    int8_t ttype = Z_LVAL_PP(val_ptr);
-
-    zval* prop = zend_read_property(ce, zthis, varname, strlen(varname), false TSRMLS_CC);
-    if (Z_TYPE_P(prop) != IS_NULL) {
-      transport.writeI8(ttype);
-      transport.writeI16(fieldno);
-      binary_serialize(ttype, transport, &prop, fieldspec);
-    }
-  }
-  transport.writeI8(T_STOP); // struct end
-}
-
-// 6 params: $transport $method_name $ttype $request_struct $seqID $strict_write
-PHP_FUNCTION(thrift_protocol_write_binary) {
-  int argc = ZEND_NUM_ARGS();
-  if (argc < 6) {
-    WRONG_PARAM_COUNT;
-  }
-
-  zval ***args = (zval***) emalloc(argc * sizeof(zval**));
-  zend_get_parameters_array_ex(argc, args);
-
-  if (Z_TYPE_PP(args[0]) != IS_OBJECT) {
-    php_error_docref(NULL TSRMLS_CC, E_ERROR, "1st parameter is not an object (transport)");
-    efree(args);
-    RETURN_NULL();
-  }
-
-  if (Z_TYPE_PP(args[1]) != IS_STRING) {
-    php_error_docref(NULL TSRMLS_CC, E_ERROR, "2nd parameter is not a string (method name)");
-    efree(args);
-    RETURN_NULL();
-  }
-
-  if (Z_TYPE_PP(args[3]) != IS_OBJECT) {
-    php_error_docref(NULL TSRMLS_CC, E_ERROR, "4th parameter is not an object (request struct)");
-    efree(args);
-    RETURN_NULL();
-  }
-
-
-  try {
-    PHPOutputTransport transport(*args[0]);
-    zval *protocol = *args[0];
-    const char* method_name = Z_STRVAL_PP(args[1]);
-    convert_to_long(*args[2]);
-    int32_t msgtype = Z_LVAL_PP(args[2]);
-    zval* request_struct = *args[3];
-    convert_to_long(*args[4]);
-    int32_t seqID = Z_LVAL_PP(args[4]);
-    convert_to_boolean(*args[5]);
-    bool strictWrite = Z_BVAL_PP(args[5]);
-    efree(args);
-    args = NULL;
-    protocol_writeMessageBegin(protocol, method_name, msgtype, seqID);
-    zval* spec = zend_read_static_property(zend_get_class_entry(request_struct TSRMLS_CC), "_TSPEC", 6, false TSRMLS_CC);
-    if (Z_TYPE_P(spec) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send non-Thrift object", INVALID_DATA);
-    }
-    binary_serialize_spec(request_struct, transport, Z_ARRVAL_P(spec));
-    transport.flush();
-  } catch (const PHPExceptionWrapper& ex) {
-    zend_throw_exception_object(ex TSRMLS_CC);
-    RETURN_NULL();
-  } catch (const std::exception& ex) {
-    throw_zend_exception_from_std_exception(ex TSRMLS_CC);
-    RETURN_NULL();
-  }
-}
-
-// 4 params: $transport $response_Typename $strict_read $buffer_size
-PHP_FUNCTION(thrift_protocol_read_binary) {
-  int argc = ZEND_NUM_ARGS();
-
-  if (argc < 3) {
-    WRONG_PARAM_COUNT;
-  }
-
-  zval ***args = (zval***) emalloc(argc * sizeof(zval**));
-  zend_get_parameters_array_ex(argc, args);
-
-  if (Z_TYPE_PP(args[0]) != IS_OBJECT) {
-    php_error_docref(NULL TSRMLS_CC, E_ERROR, "1st parameter is not an object (transport)");
-    efree(args);
-    RETURN_NULL();
-  }
-
-  if (Z_TYPE_PP(args[1]) != IS_STRING) {
-    php_error_docref(NULL TSRMLS_CC, E_ERROR, "2nd parameter is not a string (typename of expected response struct)");
-    efree(args);
-    RETURN_NULL();
-  }
-
-  if (argc == 4 && Z_TYPE_PP(args[3]) != IS_LONG) {
-    php_error_docref(NULL TSRMLS_CC, E_ERROR, "4nd parameter is not an integer (typename of expected buffer size)");
-    efree(args);
-    RETURN_NULL();
-  }
-
-  try {
-    size_t buffer_size = 8192;
-    if (argc == 4) {
-      buffer_size = Z_LVAL_PP(args[3]);
-    }
-
-    PHPInputTransport transport(*args[0], buffer_size);
-    char* obj_typename = Z_STRVAL_PP(args[1]);
-    convert_to_boolean(*args[2]);
-    bool strict_read = Z_BVAL_PP(args[2]);
-    efree(args);
-    args = NULL;
-
-    int8_t messageType = 0;
-    int32_t sz = transport.readI32();
-
-    if (sz < 0) {
-      // Check for correct version number
-      int32_t version = sz & VERSION_MASK;
-      if (version != VERSION_1) {
-        throw_tprotocolexception("Bad version identifier", BAD_VERSION);
-      }
-      messageType = (sz & 0x000000ff);
-      int32_t namelen = transport.readI32();
-      // skip the name string and the sequence ID, we don't care about those
-      transport.skip(namelen + 4);
-    } else {
-      if (strict_read) {
-        throw_tprotocolexception("No version identifier... old protocol client in strict mode?", BAD_VERSION);
-      } else {
-        // Handle pre-versioned input
-        transport.skip(sz); // skip string body
-        messageType = transport.readI8();
-        transport.skip(4); // skip sequence number
-      }
-    }
-
-    if (messageType == T_EXCEPTION) {
-      zval* ex;
-      MAKE_STD_ZVAL(ex);
-      createObject("\\Thrift\\Exception\\TApplicationException", ex);
-      zval* spec = zend_read_static_property(zend_get_class_entry(ex TSRMLS_CC), "_TSPEC", 6, false TSRMLS_CC);
-      binary_deserialize_spec(ex, transport, Z_ARRVAL_P(spec));
-      throw PHPExceptionWrapper(ex);
-    }
-
-    createObject(obj_typename, return_value);
-    zval* spec = zend_read_static_property(zend_get_class_entry(return_value TSRMLS_CC), "_TSPEC", 6, false TSRMLS_CC);
-    binary_deserialize_spec(return_value, transport, Z_ARRVAL_P(spec));
-  } catch (const PHPExceptionWrapper& ex) {
-    zend_throw_exception_object(ex TSRMLS_CC);
-    RETURN_NULL();
-  } catch (const std::exception& ex) {
-    throw_zend_exception_from_std_exception(ex TSRMLS_CC);
-    RETURN_NULL();
-  }
-}
-
-#endif /* PHP_VERSION_ID < 70000 && PHP_VERSION_ID > 50000 */
diff --git a/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol.h b/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol.h
deleted file mode 100644
index 44d03cc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#pragma once
-
-PHP_FUNCTION(thrift_protocol_write_binary);
-PHP_FUNCTION(thrift_protocol_read_binary);
-
-extern zend_module_entry thrift_protocol_module_entry;
-#define phpext_thrift_protocol_ptr &thrift_protocol_module_entry
-
diff --git a/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol7.cpp b/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol7.cpp
deleted file mode 100644
index 59fa30a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/src/ext/thrift_protocol/php_thrift_protocol7.cpp
+++ /dev/null
@@ -1,1020 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "zend_interfaces.h"
-#include "zend_exceptions.h"
-#include "php_thrift_protocol.h"
-
-#if PHP_VERSION_ID >= 70000
-
-#include <sys/types.h>
-#include <arpa/inet.h>
-
-#include <cstdint>
-#include <stdexcept>
-#include <algorithm>
-
-#ifndef bswap_64
-#define	bswap_64(x)     (((uint64_t)(x) << 56) | \
-                        (((uint64_t)(x) << 40) & 0xff000000000000ULL) | \
-                        (((uint64_t)(x) << 24) & 0xff0000000000ULL) | \
-                        (((uint64_t)(x) << 8)  & 0xff00000000ULL) | \
-                        (((uint64_t)(x) >> 8)  & 0xff000000ULL) | \
-                        (((uint64_t)(x) >> 24) & 0xff0000ULL) | \
-                        (((uint64_t)(x) >> 40) & 0xff00ULL) | \
-                        ((uint64_t)(x)  >> 56))
-#endif
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define htonll(x) bswap_64(x)
-#define ntohll(x) bswap_64(x)
-#elif __BYTE_ORDER == __BIG_ENDIAN
-#define htonll(x) x
-#define ntohll(x) x
-#else
-#error Unknown __BYTE_ORDER
-#endif
-
-enum TType {
-  T_STOP       = 0,
-  T_VOID       = 1,
-  T_BOOL       = 2,
-  T_BYTE       = 3,
-  T_I08        = 3,
-  T_I16        = 6,
-  T_I32        = 8,
-  T_U64        = 9,
-  T_I64        = 10,
-  T_DOUBLE     = 4,
-  T_STRING     = 11,
-  T_UTF7       = 11,
-  T_STRUCT     = 12,
-  T_MAP        = 13,
-  T_SET        = 14,
-  T_LIST       = 15,
-  T_UTF8       = 16,
-  T_UTF16      = 17
-};
-
-const int32_t VERSION_MASK = 0xffff0000;
-const int32_t VERSION_1 = 0x80010000;
-const int8_t T_CALL = 1;
-const int8_t T_REPLY = 2;
-const int8_t T_EXCEPTION = 3;
-// tprotocolexception
-const int INVALID_DATA = 1;
-const int BAD_VERSION = 4;
-
-static zend_function_entry thrift_protocol_functions[] = {
-  PHP_FE(thrift_protocol_write_binary, nullptr)
-  PHP_FE(thrift_protocol_read_binary, nullptr)
-  {nullptr, nullptr, nullptr}
-};
-
-zend_module_entry thrift_protocol_module_entry = {
-  STANDARD_MODULE_HEADER,
-  "thrift_protocol",
-  thrift_protocol_functions,
-  nullptr,
-  nullptr,
-  nullptr,
-  nullptr,
-  nullptr,
-  "1.0",
-  STANDARD_MODULE_PROPERTIES
-};
-
-#ifdef COMPILE_DL_THRIFT_PROTOCOL
-ZEND_GET_MODULE(thrift_protocol)
-#endif
-
-class PHPExceptionWrapper : public std::exception {
-public:
-  PHPExceptionWrapper(zval* _ex) throw() {
-    ZVAL_COPY(&ex, _ex);
-    snprintf(_what, 40, "PHP exception zval=%p", _ex);
-  }
-
-  PHPExceptionWrapper(zend_object* _exobj) throw() {
-    ZVAL_OBJ(&ex, _exobj);
-    snprintf(_what, 40, "PHP exception zval=%p", _exobj);
-  }
-  ~PHPExceptionWrapper() throw() {
-    zval_dtor(&ex);
-  }
-
-  const char* what() const throw() {
-    return _what;
-  }
-  operator zval*() const throw() {
-    return const_cast<zval*>(&ex);
-  } // Zend API doesn't do 'const'...
-protected:
-  zval ex;
-  char _what[40];
-} ;
-
-class PHPTransport {
-protected:
-  PHPTransport(zval* _p, size_t _buffer_size) {
-    assert(Z_TYPE_P(_p) == IS_OBJECT);
-
-    ZVAL_UNDEF(&t);
-
-    buffer = reinterpret_cast<char*>(emalloc(_buffer_size));
-    buffer_ptr = buffer;
-    buffer_used = 0;
-    buffer_size = _buffer_size;
-
-    // Get the transport for the passed protocol
-    zval gettransport;
-    ZVAL_STRING(&gettransport, "getTransport");
-    call_user_function(nullptr, _p, &gettransport, &t, 0, nullptr);
-
-    zval_dtor(&gettransport);
-
-    assert(Z_TYPE(t) == IS_OBJECT);
-  }
-
-  ~PHPTransport() {
-    efree(buffer);
-    zval_dtor(&t);
-  }
-
-  char* buffer;
-  char* buffer_ptr;
-  size_t buffer_used;
-  size_t buffer_size;
-
-  zval t;
-};
-
-
-class PHPOutputTransport : public PHPTransport {
-public:
-  PHPOutputTransport(zval* _p, size_t _buffer_size = 8192) : PHPTransport(_p, _buffer_size) { }
-  ~PHPOutputTransport() { }
-
-  void write(const char* data, size_t len) {
-    if ((len + buffer_used) > buffer_size) {
-      internalFlush();
-    }
-    if (len > buffer_size) {
-      directWrite(data, len);
-    } else {
-      memcpy(buffer_ptr, data, len);
-      buffer_used += len;
-      buffer_ptr += len;
-    }
-  }
-
-  void writeI64(int64_t i) {
-    i = htonll(i);
-    write((const char*)&i, 8);
-  }
-
-  void writeU32(uint32_t i) {
-    i = htonl(i);
-    write((const char*)&i, 4);
-  }
-
-  void writeI32(int32_t i) {
-    i = htonl(i);
-    write((const char*)&i, 4);
-  }
-
-  void writeI16(int16_t i) {
-    i = htons(i);
-    write((const char*)&i, 2);
-  }
-
-  void writeI8(int8_t i) {
-    write((const char*)&i, 1);
-  }
-
-  void writeString(const char* str, size_t len) {
-    writeU32(len);
-    write(str, len);
-  }
-
-  void flush() {
-    internalFlush();
-    directFlush();
-  }
-
-protected:
-  void internalFlush() {
-     if (buffer_used) {
-      directWrite(buffer, buffer_used);
-      buffer_ptr = buffer;
-      buffer_used = 0;
-    }
-  }
-  void directFlush() {
-    zval ret, flushfn;
-    ZVAL_NULL(&ret);
-    ZVAL_STRING(&flushfn, "flush");
-
-    call_user_function(EG(function_table), &(this->t), &flushfn, &ret, 0, nullptr);
-    zval_dtor(&flushfn);
-    zval_dtor(&ret);
-  }
-  void directWrite(const char* data, size_t len) {
-    zval args[1], ret, writefn;
-
-    ZVAL_STRING(&writefn, "write");
-    ZVAL_STRINGL(&args[0], data, len);
-
-    ZVAL_NULL(&ret);
-    call_user_function(EG(function_table), &(this->t), &writefn, &ret, 1, args);
-
-    zval_dtor(&writefn);
-    zval_dtor(&ret);
-    zval_dtor(&args[0]);
-
-    if (EG(exception)) {
-      zend_object *ex = EG(exception);
-      EG(exception) = nullptr;
-      throw PHPExceptionWrapper(ex);
-    }
-  }
-};
-
-class PHPInputTransport : public PHPTransport {
-public:
-  PHPInputTransport(zval* _p, size_t _buffer_size = 8192) : PHPTransport(_p, _buffer_size) {
-  }
-
-  ~PHPInputTransport() {
-    put_back();
-  }
-
-  void put_back() {
-    if (buffer_used) {
-      zval args[1], ret, putbackfn;
-      ZVAL_STRINGL(&args[0], buffer_ptr, buffer_used);
-      ZVAL_STRING(&putbackfn, "putBack");
-      ZVAL_NULL(&ret);
-
-      call_user_function(EG(function_table), &(this->t), &putbackfn, &ret, 1, args);
-
-      zval_dtor(&putbackfn);
-      zval_dtor(&ret);
-      zval_dtor(&args[0]);
-    }
-    buffer_used = 0;
-    buffer_ptr = buffer;
-  }
-
-  void skip(size_t len) {
-    while (len) {
-      size_t chunk_size = std::min(len, buffer_used);
-      if (chunk_size) {
-        buffer_ptr = reinterpret_cast<char*>(buffer_ptr) + chunk_size;
-        buffer_used -= chunk_size;
-        len -= chunk_size;
-      }
-      if (! len) break;
-      refill();
-    }
-  }
-
-  void readBytes(void* buf, size_t len) {
-    while (len) {
-      size_t chunk_size = std::min(len, buffer_used);
-      if (chunk_size) {
-        memcpy(buf, buffer_ptr, chunk_size);
-        buffer_ptr = reinterpret_cast<char*>(buffer_ptr) + chunk_size;
-        buffer_used -= chunk_size;
-        buf = reinterpret_cast<char*>(buf) + chunk_size;
-        len -= chunk_size;
-      }
-      if (! len) break;
-      refill();
-    }
-  }
-
-  int8_t readI8() {
-    int8_t c;
-    readBytes(&c, 1);
-    return c;
-  }
-
-  int16_t readI16() {
-    int16_t c;
-    readBytes(&c, 2);
-    return (int16_t)ntohs(c);
-  }
-
-  uint32_t readU32() {
-    uint32_t c;
-    readBytes(&c, 4);
-    return (uint32_t)ntohl(c);
-  }
-
-  int32_t readI32() {
-    int32_t c;
-    readBytes(&c, 4);
-    return (int32_t)ntohl(c);
-  }
-
-protected:
-  void refill() {
-    assert(buffer_used == 0);
-    zval retval;
-    zval args[1];
-    zval funcname;
-
-    ZVAL_NULL(&retval);
-    ZVAL_LONG(&args[0], buffer_size);
-
-    ZVAL_STRING(&funcname, "read");
-
-    call_user_function(EG(function_table), &(this->t), &funcname, &retval, 1, args);
-    zval_dtor(&args[0]);
-    zval_dtor(&funcname);
-
-    if (EG(exception)) {
-      zval_dtor(&retval);
-
-      zend_object *ex = EG(exception);
-      EG(exception) = nullptr;
-      throw PHPExceptionWrapper(ex);
-    }
-
-    buffer_used = Z_STRLEN(retval);
-    memcpy(buffer, Z_STRVAL(retval), buffer_used);
-
-    zval_dtor(&retval);
-
-    buffer_ptr = buffer;
-  }
-
-};
-
-static
-void binary_deserialize_spec(zval* zthis, PHPInputTransport& transport, HashTable* spec);
-static
-void binary_serialize_spec(zval* zthis, PHPOutputTransport& transport, HashTable* spec);
-static
-void binary_serialize(int8_t thrift_typeID, PHPOutputTransport& transport, zval* value, HashTable* fieldspec);
-
-// Create a PHP object given a typename and call the ctor, optionally passing up to 2 arguments
-static
-void createObject(const char* obj_typename, zval* return_value, int nargs = 0, zval* arg1 = nullptr, zval* arg2 = nullptr) {
-  /* is there a better way to do that on the stack ? */
-  zend_string *obj_name = zend_string_init(obj_typename, strlen(obj_typename), 0);
-  zend_class_entry* ce = zend_fetch_class(obj_name, ZEND_FETCH_CLASS_DEFAULT);
-  zend_string_release(obj_name);
-
-  if (! ce) {
-    php_error_docref(nullptr, E_ERROR, "Class %s does not exist", obj_typename);
-    RETURN_NULL();
-  }
-
-  object_and_properties_init(return_value, ce, nullptr);
-  zend_function* constructor = zend_std_get_constructor(Z_OBJ_P(return_value));
-  zval ctor_rv;
-  zend_call_method(return_value, ce, &constructor, NULL, 0, &ctor_rv, nargs, arg1, arg2);
-  zval_dtor(&ctor_rv);
-}
-
-static
-void throw_tprotocolexception(const char* what, long errorcode) {
-  zval zwhat, zerrorcode;
-
-  ZVAL_STRING(&zwhat, what);
-  ZVAL_LONG(&zerrorcode, errorcode);
-
-  zval ex;
-  createObject("\\Thrift\\Exception\\TProtocolException", &ex, 2, &zwhat, &zerrorcode);
-
-  zval_dtor(&zwhat);
-  zval_dtor(&zerrorcode);
-
-  throw PHPExceptionWrapper(&ex);
-}
-
-// Sets EG(exception), call this and then RETURN_NULL();
-static
-void throw_zend_exception_from_std_exception(const std::exception& ex) {
-  zend_throw_exception(zend_exception_get_default(), const_cast<char*>(ex.what()), 0);
-}
-
-static
-void skip_element(long thrift_typeID, PHPInputTransport& transport) {
-  switch (thrift_typeID) {
-    case T_STOP:
-    case T_VOID:
-      return;
-    case T_STRUCT:
-      while (true) {
-        int8_t ttype = transport.readI8(); // get field type
-        if (ttype == T_STOP) break;
-        transport.skip(2); // skip field number, I16
-        skip_element(ttype, transport); // skip field payload
-      }
-      return;
-    case T_BOOL:
-    case T_BYTE:
-      transport.skip(1);
-      return;
-    case T_I16:
-      transport.skip(2);
-      return;
-    case T_I32:
-      transport.skip(4);
-      return;
-    case T_U64:
-    case T_I64:
-    case T_DOUBLE:
-      transport.skip(8);
-      return;
-    //case T_UTF7: // aliases T_STRING
-    case T_UTF8:
-    case T_UTF16:
-    case T_STRING: {
-      uint32_t len = transport.readU32();
-      transport.skip(len);
-      } return;
-    case T_MAP: {
-      int8_t keytype = transport.readI8();
-      int8_t valtype = transport.readI8();
-      uint32_t size = transport.readU32();
-      for (uint32_t i = 0; i < size; ++i) {
-        skip_element(keytype, transport);
-        skip_element(valtype, transport);
-      }
-    } return;
-    case T_LIST:
-    case T_SET: {
-      int8_t valtype = transport.readI8();
-      uint32_t size = transport.readU32();
-      for (uint32_t i = 0; i < size; ++i) {
-        skip_element(valtype, transport);
-      }
-    } return;
-  };
-
-  char errbuf[128];
-  sprintf(errbuf, "Unknown thrift typeID %ld", thrift_typeID);
-  throw_tprotocolexception(errbuf, INVALID_DATA);
-}
-
-static inline
-bool zval_is_bool(zval* v) {
-  return Z_TYPE_P(v) == IS_TRUE || Z_TYPE_P(v) == IS_FALSE;
-}
-
-static
-void binary_deserialize(int8_t thrift_typeID, PHPInputTransport& transport, zval* return_value, HashTable* fieldspec) {
-  ZVAL_NULL(return_value);
-
-  switch (thrift_typeID) {
-    case T_STOP:
-    case T_VOID:
-      RETURN_NULL();
-      return;
-    case T_STRUCT: {
-      zval* val_ptr = zend_hash_str_find(fieldspec, "class", sizeof("class")-1);
-      if (val_ptr == nullptr) {
-        throw_tprotocolexception("no class type in spec", INVALID_DATA);
-        skip_element(T_STRUCT, transport);
-        RETURN_NULL();
-      }
-
-      char* structType = Z_STRVAL_P(val_ptr);
-      // Create an object in PHP userland based on our spec
-      createObject(structType, return_value);
-      if (Z_TYPE_P(return_value) == IS_NULL) {
-        // unable to create class entry
-        skip_element(T_STRUCT, transport);
-        RETURN_NULL();
-      }
-
-      zval* spec = zend_read_static_property(Z_OBJCE_P(return_value), "_TSPEC", sizeof("_TSPEC")-1, false);
-      if (Z_TYPE_P(spec) != IS_ARRAY) {
-        char errbuf[128];
-        snprintf(errbuf, 128, "spec for %s is wrong type: %d\n", structType, Z_TYPE_P(spec));
-        throw_tprotocolexception(errbuf, INVALID_DATA);
-        RETURN_NULL();
-      }
-      binary_deserialize_spec(return_value, transport, Z_ARRVAL_P(spec));
-      return;
-    } break;
-    case T_BOOL: {
-      uint8_t c;
-      transport.readBytes(&c, 1);
-      RETURN_BOOL(c != 0);
-    }
-  //case T_I08: // same numeric value as T_BYTE
-    case T_BYTE: {
-      uint8_t c;
-      transport.readBytes(&c, 1);
-      RETURN_LONG((int8_t)c);
-    }
-    case T_I16: {
-      uint16_t c;
-      transport.readBytes(&c, 2);
-      RETURN_LONG((int16_t)ntohs(c));
-    }
-    case T_I32: {
-      uint32_t c;
-      transport.readBytes(&c, 4);
-      RETURN_LONG((int32_t)ntohl(c));
-    }
-    case T_U64:
-    case T_I64: {
-      uint64_t c;
-      transport.readBytes(&c, 8);
-      RETURN_LONG((int64_t)ntohll(c));
-    }
-    case T_DOUBLE: {
-      union {
-        uint64_t c;
-        double d;
-      } a;
-      transport.readBytes(&(a.c), 8);
-      a.c = ntohll(a.c);
-      RETURN_DOUBLE(a.d);
-    }
-    //case T_UTF7: // aliases T_STRING
-    case T_UTF8:
-    case T_UTF16:
-    case T_STRING: {
-      uint32_t size = transport.readU32();
-      if (size) {
-        char strbuf[size+1];
-        transport.readBytes(strbuf, size);
-        strbuf[size] = '\0';
-        ZVAL_STRINGL(return_value, strbuf, size);
-      } else {
-        ZVAL_EMPTY_STRING(return_value);
-      }
-      return;
-    }
-    case T_MAP: { // array of key -> value
-      uint8_t types[2];
-      transport.readBytes(types, 2);
-      uint32_t size = transport.readU32();
-      array_init(return_value);
-
-      zval *val_ptr;
-      val_ptr = zend_hash_str_find(fieldspec, "key", sizeof("key")-1);
-      HashTable* keyspec = Z_ARRVAL_P(val_ptr);
-      val_ptr = zend_hash_str_find(fieldspec, "val", sizeof("val")-1);
-      HashTable* valspec = Z_ARRVAL_P(val_ptr);
-
-      for (uint32_t s = 0; s < size; ++s) {
-        zval key, value;
-
-        binary_deserialize(types[0], transport, &key, keyspec);
-        binary_deserialize(types[1], transport, &value, valspec);
-        if (Z_TYPE(key) == IS_LONG) {
-          zend_hash_index_update(Z_ARR_P(return_value), Z_LVAL(key), &value);
-        } else {
-          if (Z_TYPE(key) != IS_STRING) convert_to_string(&key);
-          zend_hash_update(Z_ARR_P(return_value), Z_STR(key), &value);
-        }
-      }
-      return; // return_value already populated
-    }
-    case T_LIST: { // array with autogenerated numeric keys
-      int8_t type = transport.readI8();
-      uint32_t size = transport.readU32();
-      zval *val_ptr = zend_hash_str_find(fieldspec, "elem", sizeof("elem")-1);
-      HashTable* elemspec = Z_ARRVAL_P(val_ptr);
-
-      array_init(return_value);
-      for (uint32_t s = 0; s < size; ++s) {
-        zval value;
-        binary_deserialize(type, transport, &value, elemspec);
-        zend_hash_next_index_insert(Z_ARR_P(return_value), &value);
-      }
-      return;
-    }
-    case T_SET: { // array of key -> TRUE
-      uint8_t type;
-      uint32_t size;
-      transport.readBytes(&type, 1);
-      transport.readBytes(&size, 4);
-      size = ntohl(size);
-      zval *val_ptr = zend_hash_str_find(fieldspec, "elem", sizeof("elem")-1);
-      HashTable* elemspec = Z_ARRVAL_P(val_ptr);
-
-      array_init(return_value);
-
-      for (uint32_t s = 0; s < size; ++s) {
-        zval key, value;
-        ZVAL_TRUE(&value);
-
-        binary_deserialize(type, transport, &key, elemspec);
-
-        if (Z_TYPE(key) == IS_LONG) {
-          zend_hash_index_update(Z_ARR_P(return_value), Z_LVAL(key), &value);
-        } else {
-          if (Z_TYPE(key) != IS_STRING) convert_to_string(&key);
-          zend_hash_update(Z_ARR_P(return_value), Z_STR(key), &value);
-        }
-      }
-      return;
-    }
-  };
-
-  char errbuf[128];
-  sprintf(errbuf, "Unknown thrift typeID %d", thrift_typeID);
-  throw_tprotocolexception(errbuf, INVALID_DATA);
-}
-
-static
-void binary_serialize_hashtable_key(int8_t keytype, PHPOutputTransport& transport, HashTable* ht, HashPosition& ht_pos) {
-  bool keytype_is_numeric = (!((keytype == T_STRING) || (keytype == T_UTF8) || (keytype == T_UTF16)));
-
-  zend_string* key;
-  uint key_len;
-  long index = 0;
-
-  zval z;
-
-  int res = zend_hash_get_current_key_ex(ht, &key, (zend_ulong*)&index, &ht_pos);
-  if (keytype_is_numeric) {
-    if (res == HASH_KEY_IS_STRING) {
-      index = strtol(ZSTR_VAL(key), nullptr, 10);
-    }
-    ZVAL_LONG(&z, index);
-  } else {
-    char buf[64];
-    if (res == HASH_KEY_IS_STRING) {
-      ZVAL_STR(&z, key);
-    } else {
-      snprintf(buf, 64, "%ld", index);
-      ZVAL_STRING(&z, buf);
-    }
-  }
-  binary_serialize(keytype, transport, &z, nullptr);
-  zval_dtor(&z);
-}
-
-static
-void binary_serialize(int8_t thrift_typeID, PHPOutputTransport& transport, zval* value, HashTable* fieldspec) {
-  // At this point the typeID (and field num, if applicable) should've already been written to the output so all we need to do is write the payload.
-  switch (thrift_typeID) {
-    case T_STOP:
-    case T_VOID:
-      return;
-    case T_STRUCT: {
-      if (Z_TYPE_P(value) != IS_OBJECT) {
-        throw_tprotocolexception("Attempt to send non-object type as a T_STRUCT", INVALID_DATA);
-      }
-      zval* spec = zend_read_static_property(Z_OBJCE_P(value), "_TSPEC", sizeof("_TSPEC")-1, false);
-      if (Z_TYPE_P(spec) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send non-Thrift object as a T_STRUCT", INVALID_DATA);
-      }
-      binary_serialize_spec(value, transport, Z_ARRVAL_P(spec));
-    } return;
-    case T_BOOL:
-      if (!zval_is_bool(value)) convert_to_boolean(value);
-      transport.writeI8(Z_TYPE_INFO_P(value) == IS_TRUE ? 1 : 0);
-      return;
-    case T_BYTE:
-      if (Z_TYPE_P(value) != IS_LONG) convert_to_long(value);
-      transport.writeI8(Z_LVAL_P(value));
-      return;
-    case T_I16:
-      if (Z_TYPE_P(value) != IS_LONG) convert_to_long(value);
-      transport.writeI16(Z_LVAL_P(value));
-      return;
-    case T_I32:
-      if (Z_TYPE_P(value) != IS_LONG) convert_to_long(value);
-      transport.writeI32(Z_LVAL_P(value));
-      return;
-    case T_I64:
-    case T_U64: {
-      int64_t l_data;
-#if defined(_LP64) || defined(_WIN64)
-      if (Z_TYPE_P(value) != IS_LONG) convert_to_long(value);
-      l_data = Z_LVAL_P(value);
-#else
-      if (Z_TYPE_P(value) != IS_DOUBLE) convert_to_double(value);
-      l_data = (int64_t)Z_DVAL_P(value);
-#endif
-      transport.writeI64(l_data);
-    } return;
-    case T_DOUBLE: {
-      union {
-        int64_t c;
-        double d;
-      } a;
-      if (Z_TYPE_P(value) != IS_DOUBLE) convert_to_double(value);
-      a.d = Z_DVAL_P(value);
-      transport.writeI64(a.c);
-    } return;
-    case T_UTF8:
-    case T_UTF16:
-    case T_STRING:
-      if (Z_TYPE_P(value) != IS_STRING) convert_to_string(value);
-      transport.writeString(Z_STRVAL_P(value), Z_STRLEN_P(value));
-      return;
-    case T_MAP: {
-      if (Z_TYPE_P(value) != IS_ARRAY) convert_to_array(value);
-      if (Z_TYPE_P(value) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send an incompatible type as an array (T_MAP)", INVALID_DATA);
-      }
-      HashTable* ht = Z_ARRVAL_P(value);
-      zval* val_ptr;
-
-      val_ptr = zend_hash_str_find(fieldspec, "ktype", sizeof("ktype")-1);
-      if (Z_TYPE_P(val_ptr) != IS_LONG) convert_to_long(val_ptr);
-      uint8_t keytype = Z_LVAL_P(val_ptr);
-      transport.writeI8(keytype);
-      val_ptr = zend_hash_str_find(fieldspec, "vtype", sizeof("vtype")-1);
-      if (Z_TYPE_P(val_ptr) != IS_LONG) convert_to_long(val_ptr);
-      uint8_t valtype = Z_LVAL_P(val_ptr);
-      transport.writeI8(valtype);
-
-      val_ptr = zend_hash_str_find(fieldspec, "val", sizeof("val")-1);
-      HashTable* valspec = Z_ARRVAL_P(val_ptr);
-
-      transport.writeI32(zend_hash_num_elements(ht));
-      HashPosition key_ptr;
-      for (zend_hash_internal_pointer_reset_ex(ht, &key_ptr);
-           (val_ptr = zend_hash_get_current_data_ex(ht, &key_ptr)) != nullptr;
-           zend_hash_move_forward_ex(ht, &key_ptr)) {
-        binary_serialize_hashtable_key(keytype, transport, ht, key_ptr);
-        binary_serialize(valtype, transport, val_ptr, valspec);
-      }
-    } return;
-    case T_LIST: {
-      if (Z_TYPE_P(value) != IS_ARRAY) convert_to_array(value);
-      if (Z_TYPE_P(value) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send an incompatible type as an array (T_LIST)", INVALID_DATA);
-      }
-      HashTable* ht = Z_ARRVAL_P(value);
-      zval* val_ptr;
-
-      val_ptr = zend_hash_str_find(fieldspec, "etype", sizeof("etype")-1);
-      if (Z_TYPE_P(val_ptr) != IS_LONG) convert_to_long(val_ptr);
-      uint8_t valtype = Z_LVAL_P(val_ptr);
-      transport.writeI8(valtype);
-
-      val_ptr = zend_hash_str_find(fieldspec, "elem", sizeof("elem")-1);
-      HashTable* valspec = Z_ARRVAL_P(val_ptr);
-
-      transport.writeI32(zend_hash_num_elements(ht));
-      HashPosition key_ptr;
-      for (zend_hash_internal_pointer_reset_ex(ht, &key_ptr);
-           (val_ptr = zend_hash_get_current_data_ex(ht, &key_ptr)) != nullptr;
-           zend_hash_move_forward_ex(ht, &key_ptr)) {
-        binary_serialize(valtype, transport, val_ptr, valspec);
-      }
-    } return;
-    case T_SET: {
-      if (Z_TYPE_P(value) != IS_ARRAY) convert_to_array(value);
-      if (Z_TYPE_P(value) != IS_ARRAY) {
-        throw_tprotocolexception("Attempt to send an incompatible type as an array (T_SET)", INVALID_DATA);
-      }
-      HashTable* ht = Z_ARRVAL_P(value);
-      zval* val_ptr;
-
-      val_ptr = zend_hash_str_find(fieldspec, "etype", sizeof("etype")-1);
-      if (Z_TYPE_P(val_ptr) != IS_LONG) convert_to_long(val_ptr);
-      uint8_t keytype = Z_LVAL_P(val_ptr);
-      transport.writeI8(keytype);
-
-      transport.writeI32(zend_hash_num_elements(ht));
-      HashPosition key_ptr;
-      for (zend_hash_internal_pointer_reset_ex(ht, &key_ptr);
-           (val_ptr = zend_hash_get_current_data_ex(ht, &key_ptr)) != nullptr;
-           zend_hash_move_forward_ex(ht, &key_ptr)) {
-        binary_serialize_hashtable_key(keytype, transport, ht, key_ptr);
-      }
-    } return;
-  };
-
-  char errbuf[128];
-  snprintf(errbuf, 128, "Unknown thrift typeID %d", thrift_typeID);
-  throw_tprotocolexception(errbuf, INVALID_DATA);
-}
-
-static
-void protocol_writeMessageBegin(zval* transport, zend_string* method_name, int32_t msgtype, int32_t seqID) {
-  zval args[3];
-  zval ret;
-  zval writeMessagefn;
-
-  ZVAL_STR(&args[0], method_name);
-  ZVAL_LONG(&args[1], msgtype);
-  ZVAL_LONG(&args[2], seqID);
-  ZVAL_NULL(&ret);
-  ZVAL_STRING(&writeMessagefn, "writeMessageBegin");
-
-  call_user_function(EG(function_table), transport, &writeMessagefn, &ret, 3, args);
-
-  zval_dtor(&writeMessagefn);
-  zval_dtor(&args[2]); zval_dtor(&args[1]); zval_dtor(&args[0]);
-  zval_dtor(&ret);
-}
-
-static inline
-bool ttype_is_int(int8_t t) {
-  return ((t == T_BYTE) || ((t >= T_I16)  && (t <= T_I64)));
-}
-
-static inline
-bool ttypes_are_compatible(int8_t t1, int8_t t2) {
-  // Integer types of different widths are considered compatible;
-  // otherwise the typeID must match.
-  return ((t1 == t2) || (ttype_is_int(t1) && ttype_is_int(t2)));
-}
-
-static
-void binary_deserialize_spec(zval* zthis, PHPInputTransport& transport, HashTable* spec) {
-  // SET and LIST have 'elem' => array('type', [optional] 'class')
-  // MAP has 'val' => array('type', [optiona] 'class')
-  zend_class_entry* ce = Z_OBJCE_P(zthis);
-  while (true) {
-    int8_t ttype = transport.readI8();
-    if (ttype == T_STOP) {
-      return;
-    }
-
-    int16_t fieldno = transport.readI16();
-    zval* val_ptr = zend_hash_index_find(spec, fieldno);
-    if (val_ptr != nullptr) {
-      HashTable* fieldspec = Z_ARRVAL_P(val_ptr);
-      // pull the field name
-      val_ptr = zend_hash_str_find(fieldspec, "var", sizeof("var")-1);
-      char* varname = Z_STRVAL_P(val_ptr);
-
-      // and the type
-      val_ptr = zend_hash_str_find(fieldspec, "type", sizeof("type")-1);
-      if (Z_TYPE_P(val_ptr) != IS_LONG) convert_to_long(val_ptr);
-      int8_t expected_ttype = Z_LVAL_P(val_ptr);
-
-      if (ttypes_are_compatible(ttype, expected_ttype)) {
-        zval rv;
-        ZVAL_UNDEF(&rv);
-
-        binary_deserialize(ttype, transport, &rv, fieldspec);
-        zend_update_property(ce, zthis, varname, strlen(varname), &rv);
-
-        zval_ptr_dtor(&rv);
-      } else {
-        skip_element(ttype, transport);
-      }
-    } else {
-      skip_element(ttype, transport);
-    }
-  }
-}
-
-static
-void binary_serialize_spec(zval* zthis, PHPOutputTransport& transport, HashTable* spec) {
-  HashPosition key_ptr;
-  zval* val_ptr;
-
-  for (zend_hash_internal_pointer_reset_ex(spec, &key_ptr);
-       (val_ptr = zend_hash_get_current_data_ex(spec, &key_ptr)) != nullptr;
-       zend_hash_move_forward_ex(spec, &key_ptr)) {
-
-    zend_ulong fieldno;
-    if (zend_hash_get_current_key_ex(spec, nullptr, &fieldno, &key_ptr) != HASH_KEY_IS_LONG) {
-      throw_tprotocolexception("Bad keytype in TSPEC (expected 'long')", INVALID_DATA);
-      return;
-    }
-    HashTable* fieldspec = Z_ARRVAL_P(val_ptr);
-
-    // field name
-    val_ptr = zend_hash_str_find(fieldspec, "var", sizeof("var")-1);
-    char* varname = Z_STRVAL_P(val_ptr);
-
-    // thrift type
-    val_ptr = zend_hash_str_find(fieldspec, "type", sizeof("type")-1);
-    if (Z_TYPE_P(val_ptr) != IS_LONG) convert_to_long(val_ptr);
-    int8_t ttype = Z_LVAL_P(val_ptr);
-
-    zval rv;
-    zval* prop = zend_read_property(Z_OBJCE_P(zthis), zthis, varname, strlen(varname), false, &rv);
-    if (Z_TYPE_P(prop) != IS_NULL) {
-      transport.writeI8(ttype);
-      transport.writeI16(fieldno);
-      binary_serialize(ttype, transport, prop, fieldspec);
-    }
-  }
-  transport.writeI8(T_STOP); // struct end
-}
-
-// 6 params: $transport $method_name $ttype $request_struct $seqID $strict_write
-PHP_FUNCTION(thrift_protocol_write_binary) {
-  zval *protocol;
-  zval *request_struct;
-  zend_string *method_name;
-  long msgtype, seqID;
-  zend_bool strict_write;
-
-	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "oSlolb",
-        &protocol, &method_name, &msgtype,
-        &request_struct, &seqID, &strict_write) == FAILURE) {
-		return;
-	}
-
-  try {
-    zval* spec = zend_read_static_property(Z_OBJCE_P(request_struct), "_TSPEC", sizeof("_TSPEC")-1, false);
-
-    if (Z_TYPE_P(spec) != IS_ARRAY) {
-       throw_tprotocolexception("Attempt to send non-Thrift object", INVALID_DATA);
-    }
-
-    PHPOutputTransport transport(protocol);
-    protocol_writeMessageBegin(protocol, method_name, (int32_t) msgtype, (int32_t) seqID);
-    binary_serialize_spec(request_struct, transport, Z_ARRVAL_P(spec));
-    transport.flush();
-
-  } catch (const PHPExceptionWrapper& ex) {
-    zend_throw_exception_object(ex);
-    RETURN_NULL();
-  } catch (const std::exception& ex) {
-    throw_zend_exception_from_std_exception(ex);
-    RETURN_NULL();
-  }
-}
-
-
-// 4 params: $transport $response_Typename $strict_read $buffer_size
-PHP_FUNCTION(thrift_protocol_read_binary) {
-  zval *protocol;
-  zend_string *obj_typename;
-  zend_bool strict_read;
-  size_t buffer_size = 8192;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "oSb|l", &protocol, &obj_typename, &strict_read, &buffer_size) == FAILURE) {
-    return;
-  }
-
-  try {
-    PHPInputTransport transport(protocol, buffer_size);
-    int8_t messageType = 0;
-    int32_t sz = transport.readI32();
-
-    if (sz < 0) {
-      // Check for correct version number
-      int32_t version = sz & VERSION_MASK;
-      if (version != VERSION_1) {
-        throw_tprotocolexception("Bad version identifier", BAD_VERSION);
-      }
-      messageType = (sz & 0x000000ff);
-      int32_t namelen = transport.readI32();
-      // skip the name string and the sequence ID, we don't care about those
-      transport.skip(namelen + 4);
-    } else {
-      if (strict_read) {
-        throw_tprotocolexception("No version identifier... old protocol client in strict mode?", BAD_VERSION);
-      } else {
-        // Handle pre-versioned input
-        transport.skip(sz); // skip string body
-        messageType = transport.readI8();
-        transport.skip(4); // skip sequence number
-      }
-    }
-
-    if (messageType == T_EXCEPTION) {
-      zval ex;
-      createObject("\\Thrift\\Exception\\TApplicationException", &ex);
-      zval* spec = zend_read_static_property(Z_OBJCE(ex), "_TSPEC", sizeof("_TPSEC")-1, false);
-      binary_deserialize_spec(&ex, transport, Z_ARRVAL_P(spec));
-      throw PHPExceptionWrapper(&ex);
-    }
-
-    createObject(ZSTR_VAL(obj_typename), return_value);
-    zval* spec = zend_read_static_property(Z_OBJCE_P(return_value), "_TSPEC", sizeof("_TSPEC")-1, false);
-    binary_deserialize_spec(return_value, transport, Z_ARRVAL_P(spec));
-  } catch (const PHPExceptionWrapper& ex) {
-    zend_throw_exception_object(ex);
-    RETURN_NULL();
-  } catch (const std::exception& ex) {
-    throw_zend_exception_from_std_exception(ex);
-    RETURN_NULL();
-  }
-}
-
-#endif /* PHP_VERSION_ID >= 70000 */
diff --git a/vendor/git.apache.org/thrift.git/lib/php/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/php/test/Makefile.am
deleted file mode 100755
index d966246..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/test/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-stubs: ../../../test/ThriftTest.thrift  TestValidators.thrift
-	mkdir -p ./packages
-	$(THRIFT) --gen php -r --out ./packages ../../../test/ThriftTest.thrift
-	mkdir -p ./packages/phpv
-	mkdir -p ./packages/phpvo
-	mkdir -p ./packages/phpjs
-	$(THRIFT) --gen php:validate     -r --out ./packages/phpv   TestValidators.thrift
-	$(THRIFT) --gen php:validate,oop -r --out ./packages/phpvo  TestValidators.thrift
-	$(THRIFT) --gen php:json         -r --out ./packages/phpjs  TestValidators.thrift
-
-check-json-serializer: stubs
-if HAVE_PHPUNIT
-	$(PHPUNIT) --log-junit=TEST-json-serializer.xml Test/Thrift/JsonSerialize/
-endif
-
-check-validator: stubs
-	php Test/Thrift/TestValidators.php
-	php Test/Thrift/TestValidators.php -oop
-
-check-protocol:	stubs
-if HAVE_PHPUNIT
-	$(PHPUNIT) --log-junit=TEST-log-json-protocol.xml Test/Thrift/Protocol/TestTJSONProtocol.php
-	$(PHPUNIT) --log-junit=TEST-binary-serializer.xml Test/Thrift/Protocol/TestBinarySerializer.php
-	$(PHPUNIT) --log-junit=TEST-log-simple-json-protocol.xml Test/Thrift/Protocol/TestTSimpleJSONProtocol.php
-endif
-
-check: stubs \
-  check-protocol \
-  check-validator \
-  check-json-serializer
-
-clean-local:
-	$(RM) -r ./packages
-	$(RM) TEST-*.xml
-
-EXTRA_DIST = \
-	Test \
-	TestValidators.thrift
-
-
diff --git a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Fixtures.php b/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Fixtures.php
deleted file mode 100644
index 2c60a08..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Fixtures.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.test
- */
-
-namespace Test\Thrift;
-
-use ThriftTest\Xtruct;
-use ThriftTest\Xtruct2;
-use ThriftTest\Numberz;
-use ThriftTest\Insanity;
-
-class Fixtures
-{
-  public static $testArgs = array();
-
-  public static function populateTestArgs()
-  {
-    self::$testArgs['testString1'] = "Afrikaans, Alemannisch, Aragonés, العربية, مصرى, Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška, Беларуская, Беларуская (тарашкевіца), Български, Bamanankan, বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн, Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg, Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English, Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt, Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego, Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski, Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia, Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa, ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар, Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino, Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, Bahasa Melayu, مازِرونی, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad, Occitan, Иронау, Papiamentu, Deitsch, Norfuk / Pitkern, Polski, پنجابی, پښتو, Português, Runa Simi, Rumantsch, Romani, Română, Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk, Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog, Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük, Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文, Bân-lâm-gú, 粵語";
-
-    self::$testArgs['testString2'] =
-      "quote: \\\" backslash:" .
-      " forwardslash-escaped: \\/ " .
-      " backspace: \b formfeed: \f newline: \n return: \r tab: " .
-      " now-all-of-them-together: \"\\\/\b\n\r\t" .
-      " now-a-bunch-of-junk: !@#\$%&()(&%$#{}{}<><><";
-
-    self::$testArgs['testString3'] =
-      "string that ends in double-backslash \\\\";
-
-    self::$testArgs['testUnicodeStringWithNonBMP'] =
-      "สวัสดี/𝒯";
-
-    self::$testArgs['testDouble'] = 3.1415926535898;
-
-	// TODO: add testBinary() call
-	
-    self::$testArgs['testByte'] = 0x01;
-
-    self::$testArgs['testI32'] = pow( 2, 30 );
-
-    if (PHP_INT_SIZE == 8) {
-      self::$testArgs['testI64'] = pow( 2, 60 );
-    } else {
-      self::$testArgs['testI64'] = "1152921504606847000";
-    }
-
-    self::$testArgs['testStruct'] =
-      new Xtruct(
-            array(
-                    'string_thing' => 'worked',
-                    'byte_thing' => 0x01,
-                    'i32_thing' => pow( 2, 30 ),
-                    'i64_thing' => self::$testArgs['testI64']
-                    )
-            );
-
-    self::$testArgs['testNestNested'] =
-      new Xtruct(
-            array(
-                    'string_thing' => 'worked',
-                    'byte_thing' => 0x01,
-                    'i32_thing' => pow( 2, 30 ),
-                    'i64_thing' => self::$testArgs['testI64']
-                    )
-            );
-
-    self::$testArgs['testNest'] =
-      new Xtruct2(
-            array(
-                'byte_thing' => 0x01,
-                'struct_thing' => self::$testArgs['testNestNested'],
-                'i32_thing' => pow( 2, 15 )
-                )
-            );
-
-    self::$testArgs['testMap'] =
-      array(
-            7 => 77,
-            8 => 88,
-            9 => 99
-            );
-
-    self::$testArgs['testStringMap'] =
-      array(
-            "a" => "123",
-            "a b" => "with spaces ",
-            "same" => "same",
-            "0" => "numeric key",
-            "longValue" => self::$testArgs['testString1'],
-            self::$testArgs['testString1'] => "long key"
-            );
-
-    self::$testArgs['testSet'] = array( 1 => true, 5 => true, 6 => true );
-
-    self::$testArgs['testList'] = array( 1, 2, 3 );
-
-    self::$testArgs['testEnum'] = Numberz::ONE;
-
-    self::$testArgs['testTypedef'] = 69;
-
-    self::$testArgs['testMapMapExpectedResult'] =
-      array(
-            4 => array(
-                       1 => 1,
-                       2 => 2,
-                       3 => 3,
-                       4 => 4,
-                       ),
-            -4 => array(
-                        -4 => -4,
-                        -3 => -3,
-                        -2 => -2,
-                        -1 => -1
-                        )
-            );
-
-    // testInsanity ... takes a few steps to set up!
-
-    $xtruct1 =
-      new Xtruct(
-            array(
-                'string_thing' => 'Goodbye4',
-                'byte_thing' => 4,
-                'i32_thing' => 4,
-                'i64_thing' => 4
-                )
-            );
-
-    $xtruct2 =
-      new Xtruct(
-            array(
-                'string_thing' => 'Hello2',
-                'byte_thing' =>2,
-                'i32_thing' => 2,
-                'i64_thing' => 2
-                )
-            );
-
-    $userMap =
-      array(
-            Numberz::FIVE => 5,
-            Numberz::EIGHT => 8
-            );
-
-    $insanity2 =
-      new Insanity(
-            array(
-                'userMap' => $userMap,
-                'xtructs' => array($xtruct1,$xtruct2)
-                )
-            );
-
-    $insanity3 = $insanity2;
-
-    $insanity6 =
-      new Insanity(
-            array(
-                'userMap' => null,
-                'xtructs' => null
-                )
-            );
-
-    self::$testArgs['testInsanityExpectedResult'] =
-      array(
-            "1" => array(
-                         Numberz::TWO => $insanity2,
-                         Numberz::THREE => $insanity3
-                    ),
-            "2" => array(
-                         Numberz::SIX => $insanity6
-                    )
-            );
-
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/JsonSerialize/JsonSerializeTest.php b/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/JsonSerialize/JsonSerializeTest.php
deleted file mode 100644
index 2471b52..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/JsonSerialize/JsonSerializeTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace Test\Thrift\JsonSerialize;
-
-use stdClass;
-use Thrift\ClassLoader\ThriftClassLoader;
-
-require_once __DIR__.'/../../../../lib/Thrift/ClassLoader/ThriftClassLoader.php';
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', __DIR__ . '/../../../../lib');
-$loader->registerNamespace('Test', __DIR__ . '/../../..');
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../../packages/phpjs');
-$loader->register();
-
-class JsonSerializeTest extends \PHPUnit_Framework_TestCase
-{
-  protected function setUp() {
-    if (version_compare(phpversion(), '5.4', '<')) {
-      $this->markTestSkipped('Requires PHP 5.4 or newer!');
-    }
-  }
-
-  public function testEmptyStruct()
-  {
-    $empty = new \ThriftTest\EmptyStruct(array('non_existing_key' => 'bar'));
-    $this->assertEquals(new stdClass(), json_decode(json_encode($empty)));
-  }
-
-  public function testStringsAndInts()
-  {
-    $input = array(
-      'string_thing' => 'foo',
-      'i64_thing' => 1234567890,
-    );
-    $xtruct = new \ThriftTest\Xtruct($input);
-
-    // Xtruct's 'i32_thing' and 'byte_thing' fields should not be present here!
-    $expected = new stdClass();
-    $expected->string_thing = $input['string_thing'];
-    $expected->i64_thing = $input['i64_thing'];
-    $this->assertEquals($expected, json_decode(json_encode($xtruct)));
-  }
-
-  public function testNestedStructs()
-  {
-    $xtruct2 = new \ThriftTest\Xtruct2(array(
-      'byte_thing' => 42,
-      'struct_thing' => new \ThriftTest\Xtruct(array(
-        'i32_thing' => 123456,
-      )),
-    ));
-
-    $expected = new stdClass();
-    $expected->byte_thing = $xtruct2->byte_thing;
-    $expected->struct_thing = new stdClass();
-    $expected->struct_thing->i32_thing = $xtruct2->struct_thing->i32_thing;
-    $this->assertEquals($expected, json_decode(json_encode($xtruct2)));
-  }
-
-  public function testInsanity()
-  {
-    $xinput = array('string_thing' => 'foo');
-    $xtruct = new \ThriftTest\Xtruct($xinput);
-    $insanity = new \ThriftTest\Insanity(array(
-      'xtructs' => array($xtruct, $xtruct, $xtruct)
-    ));
-    $expected = new stdClass();
-    $expected->xtructs = array((object) $xinput, (object) $xinput, (object) $xinput);
-    $this->assertEquals($expected, json_decode(json_encode($insanity)));
-  }
-
-  public function testNestedLists()
-  {
-    $bonk = new \ThriftTest\Bonk(array('message' => 'foo'));
-    $nested = new \ThriftTest\NestedListsBonk(array('bonk' => array(array(array($bonk)))));
-    $expected = new stdClass();
-    $expected->bonk = array(array(array((object) array('message' => 'foo'))));
-    $this->assertEquals($expected, json_decode(json_encode($nested)));
-  }
-
-  public function testMaps()
-  {
-    $intmap = new \ThriftTest\ThriftTest_testMap_args(['thing' => [0 => 'zero']]);
-    $emptymap = new \ThriftTest\ThriftTest_testMap_args([]);
-    $this->assertEquals('{"thing":{"0":"zero"}}', json_encode($intmap));
-    $this->assertEquals('{}', json_encode($emptymap));
-  }
-
-  public function testScalarTypes()
-  {
-    $b = new \ThriftTest\Bools(['im_true' => '1', 'im_false' => '0']);
-    $this->assertEquals('{"im_true":true,"im_false":false}', json_encode($b));
-    $s = new \ThriftTest\StructA(['s' => 42]);
-    $this->assertEquals('{"s":"42"}', json_encode($s));
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestBinarySerializer.php b/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestBinarySerializer.php
deleted file mode 100644
index a983216..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestBinarySerializer.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.test
- */
-
-namespace Test\Thrift\Protocol;
-
-use Thrift\ClassLoader\ThriftClassLoader;
-use Thrift\Serializer\TBinarySerializer;
-
-require_once __DIR__.'/../../../../lib/Thrift/ClassLoader/ThriftClassLoader.php';
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', __DIR__ . '/../../../../lib');
-$loader->registerNamespace('Test', __DIR__ . '/../../..');
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../../packages');
-$loader->register();
-
-/***
- * This test suite depends on running the compiler against the
- * standard ThriftTest.thrift file:
- *
- * lib/php/test$ ../../../compiler/cpp/thrift --gen php -r \
- *   --out ./packages ../../../test/ThriftTest.thrift
- */
-
-class TestBinarySerializer extends \PHPUnit_Framework_TestCase
-{
-
-  public function setUp()
-  {
-  }
-
-  /**
-    * We try to serialize and deserialize a random object to make sure no exceptions are thrown.
-    * @see THRIFT-1579
-    */
-  public function testBinarySerializer()
-  {
-    $struct = new \ThriftTest\Xtruct(array('string_thing' => 'abc'));
-    $serialized = TBinarySerializer::serialize($struct, 'ThriftTest\\Xtruct');
-    $deserialized = TBinarySerializer::deserialize($serialized, 'ThriftTest\\Xtruct');
-    $this->assertEquals($struct, $deserialized);
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestTJSONProtocol.php b/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestTJSONProtocol.php
deleted file mode 100755
index a4ca9d5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestTJSONProtocol.php
+++ /dev/null
@@ -1,583 +0,0 @@
-<?php
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.test
- */
-
-namespace test\Thrift\Protocol;
-
-use Thrift\ClassLoader\ThriftClassLoader;
-use Test\Thrift\Fixtures;
-use Thrift\Transport\TMemoryBuffer;
-use Thrift\Protocol\TJSONProtocol;
-
-define( 'BUFSIZ', 8192 ); //big enough to read biggest serialized Fixture arg.
-
-require_once __DIR__.'/../../../../lib/Thrift/ClassLoader/ThriftClassLoader.php';
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', __DIR__ . '/../../../../lib');
-$loader->registerNamespace('Test', __DIR__ . '/../../..');
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../../packages');
-$loader->register();
-
-/***
- * This test suite depends on running the compiler against the
- * standard ThriftTest.thrift file:
- *
- * lib/php/test$ ../../../compiler/cpp/thrift --gen php -r \
- *   --out ./packages ../../../test/ThriftTest.thrift
- */
-
-class TestTJSONProtocol extends \PHPUnit_Framework_TestCase
-{
-  private $transport;
-  private $protocol;
-
-  public static function setUpBeforeClass()
-  {
-    Fixtures::populateTestArgs();
-    TestTJSONProtocol_Fixtures::populateTestArgsJSON();
-  }
-
-  public function setUp()
-  {
-    $this->transport = new TMemoryBuffer();
-    $this->protocol = new TJSONProtocol($this->transport);
-    $this->transport->open();
-  }
-
-  /***
-   * WRITE TESTS
-   */
-
-  public function testVoid_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testVoid_args();
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testVoid'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testString1_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testString_args();
-    $args->thing = Fixtures::$testArgs['testString1'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testString1'];
-
-    #$this->assertEquals( $expected, $actual );
-  }
-
-  public function testString2_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testString_args();
-    $args->thing = Fixtures::$testArgs['testString2'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testString2'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testDouble_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testDouble_args();
-    $args->thing = Fixtures::$testArgs['testDouble'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testDouble'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testByte_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testByte_args();
-    $args->thing = Fixtures::$testArgs['testByte'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testByte'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testI32_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testI32_args();
-    $args->thing = Fixtures::$testArgs['testI32'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testI32'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testI64_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testI64_args();
-    $args->thing = Fixtures::$testArgs['testI64'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testI64'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testStruct_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testStruct_args();
-    $args->thing = Fixtures::$testArgs['testStruct'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testStruct'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testNest_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testNest_args();
-    $args->thing = Fixtures::$testArgs['testNest'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testNest'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testMap_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testMap_args();
-    $args->thing = Fixtures::$testArgs['testMap'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testMap'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testStringMap_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testStringMap_args();
-    $args->thing = Fixtures::$testArgs['testStringMap'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testStringMap'];
-
-    /*
-     * The $actual returns unescaped string.
-     * It is required to to decode then encode it again
-     * to get the expected escaped unicode.
-     */
-    $this->assertEquals( $expected, json_encode(json_decode($actual)) );
-  }
-
-  public function testSet_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testSet_args();
-    $args->thing = Fixtures::$testArgs['testSet'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testSet'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testList_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testList_args();
-    $args->thing = Fixtures::$testArgs['testList'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testList'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testEnum_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testEnum_args();
-    $args->thing = Fixtures::$testArgs['testEnum'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testEnum'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testTypedef_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testTypedef_args();
-    $args->thing = Fixtures::$testArgs['testTypedef'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testTypedef'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  /***
-   * READ TESTS
-   */
-
-  public function testVoid_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testVoid']
-                );
-    $args = new \ThriftTest\ThriftTest_testVoid_args();
-    $args->read( $this->protocol );
-  }
-
-  public function testString1_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testString1']
-                );
-    $args = new \ThriftTest\ThriftTest_testString_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testString1'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testString2_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testString2']
-                );
-    $args = new \ThriftTest\ThriftTest_testString_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testString2'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testString3_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testString_args();
-    $args->thing = Fixtures::$testArgs['testString3'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testString3'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testString4_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testString_args();
-    $args->thing = Fixtures::$testArgs['testUnicodeStringWithNonBMP'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTJSONProtocol_Fixtures::$testArgsJSON['testUnicodeStringWithNonBMP'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testDouble_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testDouble']
-                );
-    $args = new \ThriftTest\ThriftTest_testDouble_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testDouble'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testByte_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testByte']
-                );
-    $args = new \ThriftTest\ThriftTest_testByte_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testByte'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testI32_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testI32']
-                );
-    $args = new \ThriftTest\ThriftTest_testI32_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testI32'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testI64_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testI64']
-                );
-    $args = new \ThriftTest\ThriftTest_testI64_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testI64'];
-
-    $this->assertEquals( $expected, $actual );
-
-  }
-
-  public function testStruct_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testStruct']
-                );
-    $args = new \ThriftTest\ThriftTest_testStruct_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testStruct'];
-
-    $this->assertEquals( $expected, $actual );
-
-  }
-
-  public function testNest_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testNest']
-                );
-    $args = new \ThriftTest\ThriftTest_testNest_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testNest'];
-
-    $this->assertEquals( $expected, $actual );
-
-  }
-
-  public function testMap_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testMap']
-                );
-    $args = new \ThriftTest\ThriftTest_testMap_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testMap'];
-
-    $this->assertEquals( $expected, $actual );
-
-  }
-
-  public function testStringMap_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testStringMap']
-                );
-    $args = new \ThriftTest\ThriftTest_testStringMap_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testStringMap'];
-
-    $this->assertEquals( $expected, $actual );
-
-  }
-
-  public function testSet_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testSet']
-                );
-    $args = new \ThriftTest\ThriftTest_testSet_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testSet'];
-
-    $this->assertEquals( $expected, $actual );
-
-  }
-
-  public function testList_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testList']
-                );
-    $args = new \ThriftTest\ThriftTest_testList_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testList'];
-
-    $this->assertEquals( $expected, $actual );
-
-  }
-
-  public function testEnum_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testEnum']
-                );
-    $args = new \ThriftTest\ThriftTest_testEnum_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testEnum'];
-
-    $this->assertEquals( $expected, $actual );
-
-  }
-
-  public function testTypedef_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testTypedef']
-                );
-    $args = new \ThriftTest\ThriftTest_testTypedef_args();
-    $args->read( $this->protocol );
-
-    $actual = $args->thing;
-    $expected = Fixtures::$testArgs['testTypedef'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testMapMap_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testMapMap']
-                );
-    $result = new \ThriftTest\ThriftTest_testMapMap_result();
-    $result->read( $this->protocol );
-
-    $actual = $result->success;
-    $expected = Fixtures::$testArgs['testMapMapExpectedResult'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testInsanity_Read()
-  {
-    $this->transport->write(
-                TestTJSONProtocol_Fixtures::$testArgsJSON['testInsanity']
-                );
-    $result = new \ThriftTest\ThriftTest_testInsanity_result();
-    $result->read( $this->protocol );
-
-    $actual = $result->success;
-    $expected = Fixtures::$testArgs['testInsanityExpectedResult'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-}
-
-class TestTJSONProtocol_Fixtures
-{
-  public static $testArgsJSON = array();
-
-  public static function populateTestArgsJSON()
-  {
-    self::$testArgsJSON['testVoid'] = '{}';
-
-    self::$testArgsJSON['testString1'] = '{"1":{"str":"Afrikaans, Alemannisch, Aragon\u00e9s, \u0627\u0644\u0639\u0631\u0628\u064a\u0629, \u0645\u0635\u0631\u0649, Asturianu, Aymar aru, Az\u0259rbaycan, \u0411\u0430\u0448\u04a1\u043e\u0440\u0442, Boarisch, \u017demait\u0117\u0161ka, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f (\u0442\u0430\u0440\u0430\u0448\u043a\u0435\u0432\u0456\u0446\u0430), \u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438, Bamanankan, \u09ac\u09be\u0982\u09b2\u09be, Brezhoneg, Bosanski, Catal\u00e0, M\u00ecng-d\u0115\u0324ng-ng\u1e73\u0304, \u041d\u043e\u0445\u0447\u0438\u0439\u043d, Cebuano, \u13e3\u13b3\u13a9, \u010cesky, \u0421\u043b\u043e\u0432\u0463\u0301\u043d\u044c\u0441\u043a\u044a \/ \u2c14\u2c0e\u2c11\u2c02\u2c21\u2c10\u2c20\u2c14\u2c0d\u2c1f, \u0427\u04d1\u0432\u0430\u0448\u043b\u0430, Cymraeg, Dansk, Zazaki, \u078b\u07a8\u0788\u07ac\u0780\u07a8\u0784\u07a6\u0790\u07b0, \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac, Emili\u00e0n e rumagn\u00f2l, English, Esperanto, Espa\u00f1ol, Eesti, Euskara, \u0641\u0627\u0631\u0633\u06cc, Suomi, V\u00f5ro, F\u00f8royskt, Fran\u00e7ais, Arpetan, Furlan, Frysk, Gaeilge, \u8d1b\u8a9e, G\u00e0idhlig, Galego, Ava\u00f1e\'\u1ebd, \u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0, Gaelg, \u05e2\u05d1\u05e8\u05d9\u05ea, \u0939\u093f\u0928\u094d\u0926\u0940, Fiji Hindi, Hrvatski, Krey\u00f2l ayisyen, Magyar, \u0540\u0561\u0575\u0565\u0580\u0565\u0576, Interlingua, Bahasa Indonesia, Ilokano, Ido, \u00cdslenska, Italiano, \u65e5\u672c\u8a9e, Lojban, Basa Jawa, \u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8, Kongo, Kalaallisut, \u0c95\u0ca8\u0ccd\u0ca8\u0ca1, \ud55c\uad6d\uc5b4, \u041a\u044a\u0430\u0440\u0430\u0447\u0430\u0439-\u041c\u0430\u043b\u043a\u044a\u0430\u0440, Ripoarisch, Kurd\u00ee, \u041a\u043e\u043c\u0438, Kernewek, \u041a\u044b\u0440\u0433\u044b\u0437\u0447\u0430, Latina, Ladino, L\u00ebtzebuergesch, Limburgs, Ling\u00e1la, \u0ea5\u0eb2\u0ea7, Lietuvi\u0173, Latvie\u0161u, Basa Banyumasan, Malagasy, \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438, \u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02, \u092e\u0930\u093e\u0920\u0940, Bahasa Melayu, \u0645\u0627\u0632\u0650\u0631\u0648\u0646\u06cc, Nnapulitano, Nedersaksisch, \u0928\u0947\u092a\u093e\u0932 \u092d\u093e\u0937\u093e, Nederlands, \u202aNorsk (nynorsk)\u202c, \u202aNorsk (bokm\u00e5l)\u202c, Nouormand, Din\u00e9 bizaad, Occitan, \u0418\u0440\u043e\u043d\u0430\u0443, Papiamentu, Deitsch, Norfuk \/ Pitkern, Polski, \u067e\u0646\u062c\u0627\u0628\u06cc, \u067e\u069a\u062a\u0648, Portugu\u00eas, Runa Simi, Rumantsch, Romani, Rom\u00e2n\u0103, \u0420\u0443\u0441\u0441\u043a\u0438\u0439, \u0421\u0430\u0445\u0430 \u0442\u044b\u043b\u0430, Sardu, Sicilianu, Scots, S\u00e1megiella, Simple English, Sloven\u010dina, Sloven\u0161\u010dina, \u0421\u0440\u043f\u0441\u043a\u0438 \/ Srpski, Seeltersk, Svenska, Kiswahili, \u0ba4\u0bae\u0bbf\u0bb4\u0bcd, \u0c24\u0c46\u0c32\u0c41\u0c17\u0c41, \u0422\u043e\u04b7\u0438\u043a\u04e3, \u0e44\u0e17\u0e22, T\u00fcrkmen\u00e7e, Tagalog, T\u00fcrk\u00e7e, \u0422\u0430\u0442\u0430\u0440\u0447\u0430\/Tatar\u00e7a, \u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430, \u0627\u0631\u062f\u0648, Ti\u1ebfng Vi\u1ec7t, Volap\u00fck, Walon, Winaray, \u5434\u8bed, isiXhosa, \u05d9\u05d9\u05b4\u05d3\u05d9\u05e9, Yor\u00f9b\u00e1, Ze\u00eauws, \u4e2d\u6587, B\u00e2n-l\u00e2m-g\u00fa, \u7cb5\u8a9e"}}';
-
-    self::$testArgsJSON['testString2'] = '{"1":{"str":"quote: \\\\\" backslash: forwardslash-escaped: \\\\\/  backspace: \\\\b formfeed: \f newline: \n return: \r tab:  now-all-of-them-together: \"\\\\\\\\\/\\\\b\n\r\t now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><"}}';
-
-    self::$testArgsJSON['testString3'] = '{"1":{"str":"string that ends in double-backslash \\\\\\\\"}}';
-
-    self::$testArgsJSON['testUnicodeStringWithNonBMP'] = '{"1":{"str":"สวัสดี\/𝒯"}}';
-
-    self::$testArgsJSON['testDouble'] = '{"1":{"dbl":3.1415926535898}}';
-
-    self::$testArgsJSON['testByte'] = '{"1":{"i8":1}}';
-
-    self::$testArgsJSON['testI32'] = '{"1":{"i32":1073741824}}';
-
-    if (PHP_INT_SIZE == 8) {
-      self::$testArgsJSON['testI64'] = '{"1":{"i64":'.pow( 2, 60 ).'}}';
-      self::$testArgsJSON['testStruct'] = '{"1":{"rec":{"1":{"str":"worked"},"4":{"i8":1},"9":{"i32":1073741824},"11":{"i64":'.pow( 2, 60 ).'}}}}';
-      self::$testArgsJSON['testNest'] = '{"1":{"rec":{"1":{"i8":1},"2":{"rec":{"1":{"str":"worked"},"4":{"i8":1},"9":{"i32":1073741824},"11":{"i64":'.pow( 2, 60 ).'}}},"3":{"i32":32768}}}}';
-    } else {
-      self::$testArgsJSON['testI64'] = '{"1":{"i64":1152921504606847000}}';
-      self::$testArgsJSON['testStruct'] = '{"1":{"rec":{"1":{"str":"worked"},"4":{"i8":1},"9":{"i32":1073741824},"11":{"i64":1152921504606847000}}}}';
-      self::$testArgsJSON['testNest'] = '{"1":{"rec":{"1":{"i8":1},"2":{"rec":{"1":{"str":"worked"},"4":{"i8":1},"9":{"i32":1073741824},"11":{"i64":1152921504606847000}}},"3":{"i32":32768}}}}';
-    }
-
-    self::$testArgsJSON['testMap'] = '{"1":{"map":["i32","i32",3,{"7":77,"8":88,"9":99}]}}';
-
-    self::$testArgsJSON['testStringMap'] = '{"1":{"map":["str","str",6,{"a":"123","a b":"with spaces ","same":"same","0":"numeric key","longValue":"Afrikaans, Alemannisch, Aragon\u00e9s, \u0627\u0644\u0639\u0631\u0628\u064a\u0629, \u0645\u0635\u0631\u0649, Asturianu, Aymar aru, Az\u0259rbaycan, \u0411\u0430\u0448\u04a1\u043e\u0440\u0442, Boarisch, \u017demait\u0117\u0161ka, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f (\u0442\u0430\u0440\u0430\u0448\u043a\u0435\u0432\u0456\u0446\u0430), \u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438, Bamanankan, \u09ac\u09be\u0982\u09b2\u09be, Brezhoneg, Bosanski, Catal\u00e0, M\u00ecng-d\u0115\u0324ng-ng\u1e73\u0304, \u041d\u043e\u0445\u0447\u0438\u0439\u043d, Cebuano, \u13e3\u13b3\u13a9, \u010cesky, \u0421\u043b\u043e\u0432\u0463\u0301\u043d\u044c\u0441\u043a\u044a \/ \u2c14\u2c0e\u2c11\u2c02\u2c21\u2c10\u2c20\u2c14\u2c0d\u2c1f, \u0427\u04d1\u0432\u0430\u0448\u043b\u0430, Cymraeg, Dansk, Zazaki, \u078b\u07a8\u0788\u07ac\u0780\u07a8\u0784\u07a6\u0790\u07b0, \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac, Emili\u00e0n e rumagn\u00f2l, English, Esperanto, Espa\u00f1ol, Eesti, Euskara, \u0641\u0627\u0631\u0633\u06cc, Suomi, V\u00f5ro, F\u00f8royskt, Fran\u00e7ais, Arpetan, Furlan, Frysk, Gaeilge, \u8d1b\u8a9e, G\u00e0idhlig, Galego, Ava\u00f1e\'\u1ebd, \u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0, Gaelg, \u05e2\u05d1\u05e8\u05d9\u05ea, \u0939\u093f\u0928\u094d\u0926\u0940, Fiji Hindi, Hrvatski, Krey\u00f2l ayisyen, Magyar, \u0540\u0561\u0575\u0565\u0580\u0565\u0576, Interlingua, Bahasa Indonesia, Ilokano, Ido, \u00cdslenska, Italiano, \u65e5\u672c\u8a9e, Lojban, Basa Jawa, \u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8, Kongo, Kalaallisut, \u0c95\u0ca8\u0ccd\u0ca8\u0ca1, \ud55c\uad6d\uc5b4, \u041a\u044a\u0430\u0440\u0430\u0447\u0430\u0439-\u041c\u0430\u043b\u043a\u044a\u0430\u0440, Ripoarisch, Kurd\u00ee, \u041a\u043e\u043c\u0438, Kernewek, \u041a\u044b\u0440\u0433\u044b\u0437\u0447\u0430, Latina, Ladino, L\u00ebtzebuergesch, Limburgs, Ling\u00e1la, \u0ea5\u0eb2\u0ea7, Lietuvi\u0173, Latvie\u0161u, Basa Banyumasan, Malagasy, \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438, \u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02, \u092e\u0930\u093e\u0920\u0940, Bahasa Melayu, \u0645\u0627\u0632\u0650\u0631\u0648\u0646\u06cc, Nnapulitano, Nedersaksisch, \u0928\u0947\u092a\u093e\u0932 \u092d\u093e\u0937\u093e, Nederlands, \u202aNorsk (nynorsk)\u202c, \u202aNorsk (bokm\u00e5l)\u202c, Nouormand, Din\u00e9 bizaad, Occitan, \u0418\u0440\u043e\u043d\u0430\u0443, Papiamentu, Deitsch, Norfuk \/ Pitkern, Polski, \u067e\u0646\u062c\u0627\u0628\u06cc, \u067e\u069a\u062a\u0648, Portugu\u00eas, Runa Simi, Rumantsch, Romani, Rom\u00e2n\u0103, \u0420\u0443\u0441\u0441\u043a\u0438\u0439, \u0421\u0430\u0445\u0430 \u0442\u044b\u043b\u0430, Sardu, Sicilianu, Scots, S\u00e1megiella, Simple English, Sloven\u010dina, Sloven\u0161\u010dina, \u0421\u0440\u043f\u0441\u043a\u0438 \/ Srpski, Seeltersk, Svenska, Kiswahili, \u0ba4\u0bae\u0bbf\u0bb4\u0bcd, \u0c24\u0c46\u0c32\u0c41\u0c17\u0c41, \u0422\u043e\u04b7\u0438\u043a\u04e3, \u0e44\u0e17\u0e22, T\u00fcrkmen\u00e7e, Tagalog, T\u00fcrk\u00e7e, \u0422\u0430\u0442\u0430\u0440\u0447\u0430\/Tatar\u00e7a, \u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430, \u0627\u0631\u062f\u0648, Ti\u1ebfng Vi\u1ec7t, Volap\u00fck, Walon, Winaray, \u5434\u8bed, isiXhosa, \u05d9\u05d9\u05b4\u05d3\u05d9\u05e9, Yor\u00f9b\u00e1, Ze\u00eauws, \u4e2d\u6587, B\u00e2n-l\u00e2m-g\u00fa, \u7cb5\u8a9e","Afrikaans, Alemannisch, Aragon\u00e9s, \u0627\u0644\u0639\u0631\u0628\u064a\u0629, \u0645\u0635\u0631\u0649, Asturianu, Aymar aru, Az\u0259rbaycan, \u0411\u0430\u0448\u04a1\u043e\u0440\u0442, Boarisch, \u017demait\u0117\u0161ka, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f (\u0442\u0430\u0440\u0430\u0448\u043a\u0435\u0432\u0456\u0446\u0430), \u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438, Bamanankan, \u09ac\u09be\u0982\u09b2\u09be, Brezhoneg, Bosanski, Catal\u00e0, M\u00ecng-d\u0115\u0324ng-ng\u1e73\u0304, \u041d\u043e\u0445\u0447\u0438\u0439\u043d, Cebuano, \u13e3\u13b3\u13a9, \u010cesky, \u0421\u043b\u043e\u0432\u0463\u0301\u043d\u044c\u0441\u043a\u044a \/ \u2c14\u2c0e\u2c11\u2c02\u2c21\u2c10\u2c20\u2c14\u2c0d\u2c1f, \u0427\u04d1\u0432\u0430\u0448\u043b\u0430, Cymraeg, Dansk, Zazaki, \u078b\u07a8\u0788\u07ac\u0780\u07a8\u0784\u07a6\u0790\u07b0, \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac, Emili\u00e0n e rumagn\u00f2l, English, Esperanto, Espa\u00f1ol, Eesti, Euskara, \u0641\u0627\u0631\u0633\u06cc, Suomi, V\u00f5ro, F\u00f8royskt, Fran\u00e7ais, Arpetan, Furlan, Frysk, Gaeilge, \u8d1b\u8a9e, G\u00e0idhlig, Galego, Ava\u00f1e\'\u1ebd, \u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0, Gaelg, \u05e2\u05d1\u05e8\u05d9\u05ea, \u0939\u093f\u0928\u094d\u0926\u0940, Fiji Hindi, Hrvatski, Krey\u00f2l ayisyen, Magyar, \u0540\u0561\u0575\u0565\u0580\u0565\u0576, Interlingua, Bahasa Indonesia, Ilokano, Ido, \u00cdslenska, Italiano, \u65e5\u672c\u8a9e, Lojban, Basa Jawa, \u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8, Kongo, Kalaallisut, \u0c95\u0ca8\u0ccd\u0ca8\u0ca1, \ud55c\uad6d\uc5b4, \u041a\u044a\u0430\u0440\u0430\u0447\u0430\u0439-\u041c\u0430\u043b\u043a\u044a\u0430\u0440, Ripoarisch, Kurd\u00ee, \u041a\u043e\u043c\u0438, Kernewek, \u041a\u044b\u0440\u0433\u044b\u0437\u0447\u0430, Latina, Ladino, L\u00ebtzebuergesch, Limburgs, Ling\u00e1la, \u0ea5\u0eb2\u0ea7, Lietuvi\u0173, Latvie\u0161u, Basa Banyumasan, Malagasy, \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438, \u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02, \u092e\u0930\u093e\u0920\u0940, Bahasa Melayu, \u0645\u0627\u0632\u0650\u0631\u0648\u0646\u06cc, Nnapulitano, Nedersaksisch, \u0928\u0947\u092a\u093e\u0932 \u092d\u093e\u0937\u093e, Nederlands, \u202aNorsk (nynorsk)\u202c, \u202aNorsk (bokm\u00e5l)\u202c, Nouormand, Din\u00e9 bizaad, Occitan, \u0418\u0440\u043e\u043d\u0430\u0443, Papiamentu, Deitsch, Norfuk \/ Pitkern, Polski, \u067e\u0646\u062c\u0627\u0628\u06cc, \u067e\u069a\u062a\u0648, Portugu\u00eas, Runa Simi, Rumantsch, Romani, Rom\u00e2n\u0103, \u0420\u0443\u0441\u0441\u043a\u0438\u0439, \u0421\u0430\u0445\u0430 \u0442\u044b\u043b\u0430, Sardu, Sicilianu, Scots, S\u00e1megiella, Simple English, Sloven\u010dina, Sloven\u0161\u010dina, \u0421\u0440\u043f\u0441\u043a\u0438 \/ Srpski, Seeltersk, Svenska, Kiswahili, \u0ba4\u0bae\u0bbf\u0bb4\u0bcd, \u0c24\u0c46\u0c32\u0c41\u0c17\u0c41, \u0422\u043e\u04b7\u0438\u043a\u04e3, \u0e44\u0e17\u0e22, T\u00fcrkmen\u00e7e, Tagalog, T\u00fcrk\u00e7e, \u0422\u0430\u0442\u0430\u0440\u0447\u0430\/Tatar\u00e7a, \u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430, \u0627\u0631\u062f\u0648, Ti\u1ebfng Vi\u1ec7t, Volap\u00fck, Walon, Winaray, \u5434\u8bed, isiXhosa, \u05d9\u05d9\u05b4\u05d3\u05d9\u05e9, Yor\u00f9b\u00e1, Ze\u00eauws, \u4e2d\u6587, B\u00e2n-l\u00e2m-g\u00fa, \u7cb5\u8a9e":"long key"}]}}';
-
-    self::$testArgsJSON['testSet'] = '{"1":{"set":["i32",3,1,5,6]}}';
-
-    self::$testArgsJSON['testList'] = '{"1":{"lst":["i32",3,1,2,3]}}';
-
-    self::$testArgsJSON['testEnum'] = '{"1":{"i32":1}}';
-
-    self::$testArgsJSON['testTypedef'] = '{"1":{"i64":69}}';
-
-    self::$testArgsJSON['testMapMap'] = '{"0":{"map":["i32","map",2,{"4":["i32","i32",4,{"1":1,"2":2,"3":3,"4":4}],"-4":["i32","i32",4,{"-4":-4,"-3":-3,"-2":-2,"-1":-1}]}]}}';
-
-    self::$testArgsJSON['testInsanity'] = '{"0":{"map":["i64","map",2,{"1":["i32","rec",2,{"2":{"1":{"map":["i32","i64",2,{"5":5,"8":8}]},"2":{"lst":["rec",2,{"1":{"str":"Goodbye4"},"4":{"i8":4},"9":{"i32":4},"11":{"i64":4}},{"1":{"str":"Hello2"},"4":{"i8":2},"9":{"i32":2},"11":{"i64":2}}]}},"3":{"1":{"map":["i32","i64",2,{"5":5,"8":8}]},"2":{"lst":["rec",2,{"1":{"str":"Goodbye4"},"4":{"i8":4},"9":{"i32":4},"11":{"i64":4}},{"1":{"str":"Hello2"},"4":{"i8":2},"9":{"i32":2},"11":{"i64":2}}]}}}],"2":["i32","rec",1,{"6":{}}]}]}}';
-
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestTSimpleJSONProtocol.php b/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestTSimpleJSONProtocol.php
deleted file mode 100755
index 973f55c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/Protocol/TestTSimpleJSONProtocol.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift.test
- */
-
-namespace test\Thrift\Protocol;
-
-use Thrift\ClassLoader\ThriftClassLoader;
-use Test\Thrift\Fixtures;
-use Thrift\Transport\TMemoryBuffer;
-use Thrift\Protocol\TSimpleJSONProtocol;
-
-define( 'BUFSIZ', 8192 ); //big enough to read biggest serialized Fixture arg.
-
-require_once __DIR__.'/../../../../lib/Thrift/ClassLoader/ThriftClassLoader.php';
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', __DIR__ . '/../../../../lib');
-$loader->registerNamespace('Test', __DIR__ . '/../../..');
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../../packages');
-$loader->register();
-
-/***
- * This test suite depends on running the compiler against the
- * standard ThriftTest.thrift file:
- *
- * lib/php/test$ ../../../compiler/cpp/thrift --gen php -r \
- *   --out ./packages ../../../test/ThriftTest.thrift
- */
-
-class TestTSimpleJSONProtocol extends \PHPUnit_Framework_TestCase
-{
-  private $transport;
-  private $protocol;
-
-  public static function setUpBeforeClass()
-  {
-    Fixtures::populateTestArgs();
-    TestTSimpleJSONProtocol_Fixtures::populateTestArgsSimpleJSON();
-  }
-
-  public function setUp()
-  {
-    $this->transport = new TMemoryBuffer();
-    $this->protocol = new TSimpleJSONProtocol($this->transport);
-    $this->transport->open();
-  }
-
-  /***
-   * WRITE TESTS
-   */
-
-  public function testVoid_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testVoid_args();
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testVoid'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testString1_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testString_args();
-    $args->thing = Fixtures::$testArgs['testString1'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testString1'];
-
-    #$this->assertEquals( $expected, $actual );
-  }
-
-  public function testString2_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testString_args();
-    $args->thing = Fixtures::$testArgs['testString2'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testString2'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testDouble_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testDouble_args();
-    $args->thing = Fixtures::$testArgs['testDouble'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testDouble'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testByte_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testByte_args();
-    $args->thing = Fixtures::$testArgs['testByte'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testByte'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testI32_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testI32_args();
-    $args->thing = Fixtures::$testArgs['testI32'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testI32'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testI64_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testI64_args();
-    $args->thing = Fixtures::$testArgs['testI64'];
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testI64'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testStruct_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testStruct_args();
-    $args->thing = Fixtures::$testArgs['testStruct'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testStruct'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testNest_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testNest_args();
-    $args->thing = Fixtures::$testArgs['testNest'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testNest'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testMap_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testMap_args();
-    $args->thing = Fixtures::$testArgs['testMap'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testMap'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testStringMap_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testStringMap_args();
-    $args->thing = Fixtures::$testArgs['testStringMap'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testStringMap'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testSet_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testSet_args();
-    $args->thing = Fixtures::$testArgs['testSet'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testSet'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testList_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testList_args();
-    $args->thing = Fixtures::$testArgs['testList'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testList'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testEnum_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testEnum_args();
-    $args->thing = Fixtures::$testArgs['testEnum'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testEnum'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-
-  public function testTypedef_Write()
-  {
-    $args = new \ThriftTest\ThriftTest_testTypedef_args();
-    $args->thing = Fixtures::$testArgs['testTypedef'];
-
-    $args->write( $this->protocol );
-
-    $actual = $this->transport->read( BUFSIZ );
-    $expected = TestTSimpleJSONProtocol_Fixtures::$testArgsJSON['testTypedef'];
-
-    $this->assertEquals( $expected, $actual );
-  }
-}
-
-class TestTSimpleJSONProtocol_Fixtures
-{
-  public static $testArgsJSON = array();
-
-  public static function populateTestArgsSimpleJSON()
-  {
-    self::$testArgsJSON['testVoid'] = '{}';
-
-    self::$testArgsJSON['testString1'] = '{"1":{"str":"Afrikaans, Alemannisch, Aragon\u00e9s, \u0627\u0644\u0639\u0631\u0628\u064a\u0629, \u0645\u0635\u0631\u0649, Asturianu, Aymar aru, Az\u0259rbaycan, \u0411\u0430\u0448\u04a1\u043e\u0440\u0442, Boarisch, \u017demait\u0117\u0161ka, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f (\u0442\u0430\u0440\u0430\u0448\u043a\u0435\u0432\u0456\u0446\u0430), \u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438, Bamanankan, \u09ac\u09be\u0982\u09b2\u09be, Brezhoneg, Bosanski, Catal\u00e0, M\u00ecng-d\u0115\u0324ng-ng\u1e73\u0304, \u041d\u043e\u0445\u0447\u0438\u0439\u043d, Cebuano, \u13e3\u13b3\u13a9, \u010cesky, \u0421\u043b\u043e\u0432\u0463\u0301\u043d\u044c\u0441\u043a\u044a \/ \u2c14\u2c0e\u2c11\u2c02\u2c21\u2c10\u2c20\u2c14\u2c0d\u2c1f, \u0427\u04d1\u0432\u0430\u0448\u043b\u0430, Cymraeg, Dansk, Zazaki, \u078b\u07a8\u0788\u07ac\u0780\u07a8\u0784\u07a6\u0790\u07b0, \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac, Emili\u00e0n e rumagn\u00f2l, English, Esperanto, Espa\u00f1ol, Eesti, Euskara, \u0641\u0627\u0631\u0633\u06cc, Suomi, V\u00f5ro, F\u00f8royskt, Fran\u00e7ais, Arpetan, Furlan, Frysk, Gaeilge, \u8d1b\u8a9e, G\u00e0idhlig, Galego, Ava\u00f1e\'\u1ebd, \u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0, Gaelg, \u05e2\u05d1\u05e8\u05d9\u05ea, \u0939\u093f\u0928\u094d\u0926\u0940, Fiji Hindi, Hrvatski, Krey\u00f2l ayisyen, Magyar, \u0540\u0561\u0575\u0565\u0580\u0565\u0576, Interlingua, Bahasa Indonesia, Ilokano, Ido, \u00cdslenska, Italiano, \u65e5\u672c\u8a9e, Lojban, Basa Jawa, \u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8, Kongo, Kalaallisut, \u0c95\u0ca8\u0ccd\u0ca8\u0ca1, \ud55c\uad6d\uc5b4, \u041a\u044a\u0430\u0440\u0430\u0447\u0430\u0439-\u041c\u0430\u043b\u043a\u044a\u0430\u0440, Ripoarisch, Kurd\u00ee, \u041a\u043e\u043c\u0438, Kernewek, \u041a\u044b\u0440\u0433\u044b\u0437\u0447\u0430, Latina, Ladino, L\u00ebtzebuergesch, Limburgs, Ling\u00e1la, \u0ea5\u0eb2\u0ea7, Lietuvi\u0173, Latvie\u0161u, Basa Banyumasan, Malagasy, \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438, \u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02, \u092e\u0930\u093e\u0920\u0940, Bahasa Melayu, \u0645\u0627\u0632\u0650\u0631\u0648\u0646\u06cc, Nnapulitano, Nedersaksisch, \u0928\u0947\u092a\u093e\u0932 \u092d\u093e\u0937\u093e, Nederlands, \u202aNorsk (nynorsk)\u202c, \u202aNorsk (bokm\u00e5l)\u202c, Nouormand, Din\u00e9 bizaad, Occitan, \u0418\u0440\u043e\u043d\u0430\u0443, Papiamentu, Deitsch, Norfuk \/ Pitkern, Polski, \u067e\u0646\u062c\u0627\u0628\u06cc, \u067e\u069a\u062a\u0648, Portugu\u00eas, Runa Simi, Rumantsch, Romani, Rom\u00e2n\u0103, \u0420\u0443\u0441\u0441\u043a\u0438\u0439, \u0421\u0430\u0445\u0430 \u0442\u044b\u043b\u0430, Sardu, Sicilianu, Scots, S\u00e1megiella, Simple English, Sloven\u010dina, Sloven\u0161\u010dina, \u0421\u0440\u043f\u0441\u043a\u0438 \/ Srpski, Seeltersk, Svenska, Kiswahili, \u0ba4\u0bae\u0bbf\u0bb4\u0bcd, \u0c24\u0c46\u0c32\u0c41\u0c17\u0c41, \u0422\u043e\u04b7\u0438\u043a\u04e3, \u0e44\u0e17\u0e22, T\u00fcrkmen\u00e7e, Tagalog, T\u00fcrk\u00e7e, \u0422\u0430\u0442\u0430\u0440\u0447\u0430\/Tatar\u00e7a, \u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430, \u0627\u0631\u062f\u0648, Ti\u1ebfng Vi\u1ec7t, Volap\u00fck, Walon, Winaray, \u5434\u8bed, isiXhosa, \u05d9\u05d9\u05b4\u05d3\u05d9\u05e9, Yor\u00f9b\u00e1, Ze\u00eauws, \u4e2d\u6587, B\u00e2n-l\u00e2m-g\u00fa, \u7cb5\u8a9e"}}';
-
-    self::$testArgsJSON['testString2'] = '{"thing":"quote: \\\\\" backslash: forwardslash-escaped: \\\\\/  backspace: \\\\b formfeed: \f newline: \n return: \r tab:  now-all-of-them-together: \"\\\\\\\\\/\\\\b\n\r\t now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><"}';
-
-    self::$testArgsJSON['testDouble'] = '{"thing":3.1415926535898}';
-
-    self::$testArgsJSON['testByte'] = '{"thing":1}';
-
-    self::$testArgsJSON['testI32'] = '{"thing":1073741824}';
-
-    if (PHP_INT_SIZE == 8) {
-      self::$testArgsJSON['testI64'] = '{"thing":'.pow( 2, 60 ).'}';
-      self::$testArgsJSON['testStruct'] = '{"thing":{"string_thing":"worked","byte_thing":1,"i32_thing":1073741824,"i64_thing":'.pow( 2, 60 ).'}}';
-      self::$testArgsJSON['testNest'] = '{"thing":{"byte_thing":1,"struct_thing":{"string_thing":"worked","byte_thing":1,"i32_thing":1073741824,"i64_thing":'.pow( 2, 60 ).'},"i32_thing":32768}}';
-    } else {
-      self::$testArgsJSON['testI64'] = '{"thing":1152921504606847000}';
-
-      self::$testArgsJSON['testStruct'] = '{"thing":{"string_thing":"worked","byte_thing":1,"i32_thing":1073741824,"i64_thing":1152921504606847000}}';
-      self::$testArgsJSON['testNest'] = '{"thing":{"byte_thing":1,"struct_thing":{"string_thing":"worked","byte_thing":1,"i32_thing":1073741824,"i64_thing":1152921504606847000},"i32_thing":32768}}';
-    }
-
-    self::$testArgsJSON['testMap'] = '{"thing":{"7":77,"8":88,"9":99}}';
-
-    self::$testArgsJSON['testStringMap'] = '{"thing":{"a":"123","a b":"with spaces ","same":"same","0":"numeric key","longValue":"Afrikaans, Alemannisch, Aragon\u00e9s, \u0627\u0644\u0639\u0631\u0628\u064a\u0629, \u0645\u0635\u0631\u0649, Asturianu, Aymar aru, Az\u0259rbaycan, \u0411\u0430\u0448\u04a1\u043e\u0440\u0442, Boarisch, \u017demait\u0117\u0161ka, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f (\u0442\u0430\u0440\u0430\u0448\u043a\u0435\u0432\u0456\u0446\u0430), \u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438, Bamanankan, \u09ac\u09be\u0982\u09b2\u09be, Brezhoneg, Bosanski, Catal\u00e0, M\u00ecng-d\u0115\u0324ng-ng\u1e73\u0304, \u041d\u043e\u0445\u0447\u0438\u0439\u043d, Cebuano, \u13e3\u13b3\u13a9, \u010cesky, \u0421\u043b\u043e\u0432\u0463\u0301\u043d\u044c\u0441\u043a\u044a \/ \u2c14\u2c0e\u2c11\u2c02\u2c21\u2c10\u2c20\u2c14\u2c0d\u2c1f, \u0427\u04d1\u0432\u0430\u0448\u043b\u0430, Cymraeg, Dansk, Zazaki, \u078b\u07a8\u0788\u07ac\u0780\u07a8\u0784\u07a6\u0790\u07b0, \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac, Emili\u00e0n e rumagn\u00f2l, English, Esperanto, Espa\u00f1ol, Eesti, Euskara, \u0641\u0627\u0631\u0633\u06cc, Suomi, V\u00f5ro, F\u00f8royskt, Fran\u00e7ais, Arpetan, Furlan, Frysk, Gaeilge, \u8d1b\u8a9e, G\u00e0idhlig, Galego, Ava\u00f1e\'\u1ebd, \u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0, Gaelg, \u05e2\u05d1\u05e8\u05d9\u05ea, \u0939\u093f\u0928\u094d\u0926\u0940, Fiji Hindi, Hrvatski, Krey\u00f2l ayisyen, Magyar, \u0540\u0561\u0575\u0565\u0580\u0565\u0576, Interlingua, Bahasa Indonesia, Ilokano, Ido, \u00cdslenska, Italiano, \u65e5\u672c\u8a9e, Lojban, Basa Jawa, \u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8, Kongo, Kalaallisut, \u0c95\u0ca8\u0ccd\u0ca8\u0ca1, \ud55c\uad6d\uc5b4, \u041a\u044a\u0430\u0440\u0430\u0447\u0430\u0439-\u041c\u0430\u043b\u043a\u044a\u0430\u0440, Ripoarisch, Kurd\u00ee, \u041a\u043e\u043c\u0438, Kernewek, \u041a\u044b\u0440\u0433\u044b\u0437\u0447\u0430, Latina, Ladino, L\u00ebtzebuergesch, Limburgs, Ling\u00e1la, \u0ea5\u0eb2\u0ea7, Lietuvi\u0173, Latvie\u0161u, Basa Banyumasan, Malagasy, \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438, \u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02, \u092e\u0930\u093e\u0920\u0940, Bahasa Melayu, \u0645\u0627\u0632\u0650\u0631\u0648\u0646\u06cc, Nnapulitano, Nedersaksisch, \u0928\u0947\u092a\u093e\u0932 \u092d\u093e\u0937\u093e, Nederlands, \u202aNorsk (nynorsk)\u202c, \u202aNorsk (bokm\u00e5l)\u202c, Nouormand, Din\u00e9 bizaad, Occitan, \u0418\u0440\u043e\u043d\u0430\u0443, Papiamentu, Deitsch, Norfuk \/ Pitkern, Polski, \u067e\u0646\u062c\u0627\u0628\u06cc, \u067e\u069a\u062a\u0648, Portugu\u00eas, Runa Simi, Rumantsch, Romani, Rom\u00e2n\u0103, \u0420\u0443\u0441\u0441\u043a\u0438\u0439, \u0421\u0430\u0445\u0430 \u0442\u044b\u043b\u0430, Sardu, Sicilianu, Scots, S\u00e1megiella, Simple English, Sloven\u010dina, Sloven\u0161\u010dina, \u0421\u0440\u043f\u0441\u043a\u0438 \/ Srpski, Seeltersk, Svenska, Kiswahili, \u0ba4\u0bae\u0bbf\u0bb4\u0bcd, \u0c24\u0c46\u0c32\u0c41\u0c17\u0c41, \u0422\u043e\u04b7\u0438\u043a\u04e3, \u0e44\u0e17\u0e22, T\u00fcrkmen\u00e7e, Tagalog, T\u00fcrk\u00e7e, \u0422\u0430\u0442\u0430\u0440\u0447\u0430\/Tatar\u00e7a, \u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430, \u0627\u0631\u062f\u0648, Ti\u1ebfng Vi\u1ec7t, Volap\u00fck, Walon, Winaray, \u5434\u8bed, isiXhosa, \u05d9\u05d9\u05b4\u05d3\u05d9\u05e9, Yor\u00f9b\u00e1, Ze\u00eauws, \u4e2d\u6587, B\u00e2n-l\u00e2m-g\u00fa, \u7cb5\u8a9e","Afrikaans, Alemannisch, Aragon\u00e9s, \u0627\u0644\u0639\u0631\u0628\u064a\u0629, \u0645\u0635\u0631\u0649, Asturianu, Aymar aru, Az\u0259rbaycan, \u0411\u0430\u0448\u04a1\u043e\u0440\u0442, Boarisch, \u017demait\u0117\u0161ka, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f, \u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f (\u0442\u0430\u0440\u0430\u0448\u043a\u0435\u0432\u0456\u0446\u0430), \u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438, Bamanankan, \u09ac\u09be\u0982\u09b2\u09be, Brezhoneg, Bosanski, Catal\u00e0, M\u00ecng-d\u0115\u0324ng-ng\u1e73\u0304, \u041d\u043e\u0445\u0447\u0438\u0439\u043d, Cebuano, \u13e3\u13b3\u13a9, \u010cesky, \u0421\u043b\u043e\u0432\u0463\u0301\u043d\u044c\u0441\u043a\u044a \/ \u2c14\u2c0e\u2c11\u2c02\u2c21\u2c10\u2c20\u2c14\u2c0d\u2c1f, \u0427\u04d1\u0432\u0430\u0448\u043b\u0430, Cymraeg, Dansk, Zazaki, \u078b\u07a8\u0788\u07ac\u0780\u07a8\u0784\u07a6\u0790\u07b0, \u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac, Emili\u00e0n e rumagn\u00f2l, English, Esperanto, Espa\u00f1ol, Eesti, Euskara, \u0641\u0627\u0631\u0633\u06cc, Suomi, V\u00f5ro, F\u00f8royskt, Fran\u00e7ais, Arpetan, Furlan, Frysk, Gaeilge, \u8d1b\u8a9e, G\u00e0idhlig, Galego, Ava\u00f1e\'\u1ebd, \u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0, Gaelg, \u05e2\u05d1\u05e8\u05d9\u05ea, \u0939\u093f\u0928\u094d\u0926\u0940, Fiji Hindi, Hrvatski, Krey\u00f2l ayisyen, Magyar, \u0540\u0561\u0575\u0565\u0580\u0565\u0576, Interlingua, Bahasa Indonesia, Ilokano, Ido, \u00cdslenska, Italiano, \u65e5\u672c\u8a9e, Lojban, Basa Jawa, \u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8, Kongo, Kalaallisut, \u0c95\u0ca8\u0ccd\u0ca8\u0ca1, \ud55c\uad6d\uc5b4, \u041a\u044a\u0430\u0440\u0430\u0447\u0430\u0439-\u041c\u0430\u043b\u043a\u044a\u0430\u0440, Ripoarisch, Kurd\u00ee, \u041a\u043e\u043c\u0438, Kernewek, \u041a\u044b\u0440\u0433\u044b\u0437\u0447\u0430, Latina, Ladino, L\u00ebtzebuergesch, Limburgs, Ling\u00e1la, \u0ea5\u0eb2\u0ea7, Lietuvi\u0173, Latvie\u0161u, Basa Banyumasan, Malagasy, \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438, \u0d2e\u0d32\u0d2f\u0d3e\u0d33\u0d02, \u092e\u0930\u093e\u0920\u0940, Bahasa Melayu, \u0645\u0627\u0632\u0650\u0631\u0648\u0646\u06cc, Nnapulitano, Nedersaksisch, \u0928\u0947\u092a\u093e\u0932 \u092d\u093e\u0937\u093e, Nederlands, \u202aNorsk (nynorsk)\u202c, \u202aNorsk (bokm\u00e5l)\u202c, Nouormand, Din\u00e9 bizaad, Occitan, \u0418\u0440\u043e\u043d\u0430\u0443, Papiamentu, Deitsch, Norfuk \/ Pitkern, Polski, \u067e\u0646\u062c\u0627\u0628\u06cc, \u067e\u069a\u062a\u0648, Portugu\u00eas, Runa Simi, Rumantsch, Romani, Rom\u00e2n\u0103, \u0420\u0443\u0441\u0441\u043a\u0438\u0439, \u0421\u0430\u0445\u0430 \u0442\u044b\u043b\u0430, Sardu, Sicilianu, Scots, S\u00e1megiella, Simple English, Sloven\u010dina, Sloven\u0161\u010dina, \u0421\u0440\u043f\u0441\u043a\u0438 \/ Srpski, Seeltersk, Svenska, Kiswahili, \u0ba4\u0bae\u0bbf\u0bb4\u0bcd, \u0c24\u0c46\u0c32\u0c41\u0c17\u0c41, \u0422\u043e\u04b7\u0438\u043a\u04e3, \u0e44\u0e17\u0e22, T\u00fcrkmen\u00e7e, Tagalog, T\u00fcrk\u00e7e, \u0422\u0430\u0442\u0430\u0440\u0447\u0430\/Tatar\u00e7a, \u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430, \u0627\u0631\u062f\u0648, Ti\u1ebfng Vi\u1ec7t, Volap\u00fck, Walon, Winaray, \u5434\u8bed, isiXhosa, \u05d9\u05d9\u05b4\u05d3\u05d9\u05e9, Yor\u00f9b\u00e1, Ze\u00eauws, \u4e2d\u6587, B\u00e2n-l\u00e2m-g\u00fa, \u7cb5\u8a9e":"long key"}}';
-
-    self::$testArgsJSON['testSet'] = '{"thing":[1,5,6]}';
-
-    self::$testArgsJSON['testList'] = '{"thing":[1,2,3]}';
-
-    self::$testArgsJSON['testEnum'] = '{"thing":1}';
-
-    self::$testArgsJSON['testTypedef'] = '{"thing":69}';
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/TestValidators.php b/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/TestValidators.php
deleted file mode 100644
index 36cf000..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/test/Test/Thrift/TestValidators.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace test\php;
-
-require_once __DIR__.'/../../../lib/Thrift/ClassLoader/ThriftClassLoader.php';
-
-use Thrift\ClassLoader\ThriftClassLoader;
-use Thrift\Exception\TProtocolException;
-use Thrift\Protocol\TBinaryProtocol;
-use Thrift\Transport\TMemoryBuffer;
-
-$oop_mode = (isset($argv[1]) && $argv[1] === '-oop');
-$GEN_DIR = $oop_mode ? 'phpvo' : 'phpv';
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', __DIR__ . '/../../../lib');
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../packages/' . $GEN_DIR);
-$loader->registerDefinition('TestValidators', __DIR__ . '/../../packages/' . $GEN_DIR);
-$loader->register();
-
-// Would be nice to have PHPUnit here, but for now just hack it.
-
-set_exception_handler(function ($e) {
-    my_assert(false, "Unexpected exception caught: " . $e->getMessage());
-});
-
-set_error_handler(function ($errno, $errmsg) {
-    my_assert(false, "Unexpected PHP error: " . $errmsg);
-});
-
-// Empty structs should not have validators
-assert_has_no_read_validator('ThriftTest\EmptyStruct');
-assert_has_no_write_validator('ThriftTest\EmptyStruct');
-
-// Bonk has only opt_in_req_out fields
-{
-    assert_has_no_read_validator('ThriftTest\Bonk');
-    assert_has_a_write_validator('ThriftTest\Bonk');
-    {
-        // Check that we can read an empty object
-        $bonk = new \ThriftTest\Bonk();
-        $transport = new TMemoryBuffer("\000");
-        $protocol = new TBinaryProtocol($transport);
-        $bonk->read($protocol);
-    }
-    {
-        // ...but not write an empty object
-        $bonk = new \ThriftTest\Bonk();
-        $transport = new TMemoryBuffer();
-        $protocol = new TBinaryProtocol($transport);
-        assert_protocol_exception_thrown(function () use ($bonk, $protocol) { $bonk->write($protocol); },
-                                         'Bonk was able to write an empty object');
-    }
-}
-
-// StructA has a single required field
-{
-    assert_has_a_read_validator('ThriftTest\StructA');
-    assert_has_a_write_validator('ThriftTest\StructA');
-    {
-        // Check that we are not able to write StructA with a missing required field
-        $structa = new \ThriftTest\StructA();
-        $transport = new TMemoryBuffer();
-        $protocol = new TBinaryProtocol($transport);
-        assert_protocol_exception_thrown(function () use ($structa, $protocol) { $structa->write($protocol); },
-                                         'StructA was able to write an empty object');
-    }
-    {
-        // Check that we are able to read and write a message with a good StructA
-        $transport = new TMemoryBuffer(base64_decode('CwABAAAAA2FiYwA='));
-        $protocol = new TBinaryProtocol($transport);
-        $structa = new \ThriftTest\StructA();
-        $structa->read($protocol);
-        $structa->write($protocol);
-    }
-}
-
-// Unions should not get write validators
-assert_has_no_write_validator('TestValidators\UnionOfStrings');
-
-// Service _result classes should not get any validators
-assert_has_no_read_validator('TestValidators\TestService_test_result');
-assert_has_no_write_validator('TestValidators\TestService_test_result');
-
-function assert_has_a_read_validator($class)
-{
-    my_assert(has_read_validator_method($class),
-              $class . ' class should have a read validator');
-}
-
-function assert_has_no_read_validator($class)
-{
-    my_assert(!has_read_validator_method($class),
-              $class . ' class should not have a read validator');
-}
-
-function assert_has_a_write_validator($class)
-{
-    my_assert(has_write_validator_method($class),
-              $class . ' class should have a write validator');
-}
-
-function assert_has_no_write_validator($class)
-{
-    my_assert(!has_write_validator_method($class),
-              $class . ' class should not have a write validator');
-}
-
-function assert_protocol_exception_thrown($callable, $message)
-{
-    try {
-        call_user_func($callable);
-        my_assert(false, $message);
-    } catch (TProtocolException $e) {
-    }
-}
-
-function has_write_validator_method($class)
-{
-    $rc = new \ReflectionClass($class);
-
-    return $rc->hasMethod('_validateForWrite');
-}
-
-function has_read_validator_method($class)
-{
-    $rc = new \ReflectionClass($class);
-
-    return $rc->hasMethod('_validateForRead');
-}
-
-function my_assert($something, $message)
-{
-    if (!$something) {
-        fwrite(STDERR, basename(__FILE__) . " FAILED: $message\n");
-        exit(1);
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/test/TestValidators.thrift b/vendor/git.apache.org/thrift.git/lib/php/test/TestValidators.thrift
deleted file mode 100644
index 9c38d92..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/test/TestValidators.thrift
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace php TestValidators
-
-include "../../../test/ThriftTest.thrift"
-
-union UnionOfStrings {
-  1: string aa;
-  2: string bb;
-}
-
-service TestService {
-    void test() throws(1: ThriftTest.Xception xception);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/php/thrift_protocol.ini b/vendor/git.apache.org/thrift.git/lib/php/thrift_protocol.ini
deleted file mode 100644
index a260d83..0000000
--- a/vendor/git.apache.org/thrift.git/lib/php/thrift_protocol.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=thrift_protocol.so
diff --git a/vendor/git.apache.org/thrift.git/lib/py/CMakeLists.txt b/vendor/git.apache.org/thrift.git/lib/py/CMakeLists.txt
deleted file mode 100644
index 7bb91fe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-include_directories(${PYTHON_INCLUDE_DIRS})
-
-add_custom_target(python_build ALL
-    COMMAND ${PYTHON_EXECUTABLE} setup.py build
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT "Building Python library"
-)
-
-if(BUILD_TESTING)
-    add_test(PythonTestSSLSocket ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/test_sslsocket.py)
-    add_test(PythonThriftJson ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_json.py)
-endif()
diff --git a/vendor/git.apache.org/thrift.git/lib/py/Makefile.am b/vendor/git.apache.org/thrift.git/lib/py/Makefile.am
deleted file mode 100644
index fd9ce25..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = serial-tests
-DESTDIR ?= /
-
-if WITH_PY3
-py3-build:
-	$(PYTHON3) setup.py build
-py3-test: py3-build
-	$(PYTHON3) test/thrift_json.py
-	$(PYTHON3) test/test_sslsocket.py
-else
-py3-build:
-py3-test:
-endif
-
-all-local: py3-build
-	$(PYTHON) setup.py build
-
-# We're ignoring prefix here because site-packages seems to be
-# the equivalent of /usr/local/lib in Python land.
-# Old version (can't put inline because it's not portable).
-#$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) $(PYTHON_SETUPUTIL_ARGS)
-install-exec-hook:
-	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PY_PREFIX) $(PYTHON_SETUPUTIL_ARGS)
-
-clean-local:
-	$(RM) -r build
-
-check-local: all py3-test
-	$(PYTHON) test/thrift_json.py
-	$(PYTHON) test/test_sslsocket.py
-
-EXTRA_DIST = \
-	CMakeLists.txt \
-	coding_standards.md \
-	compat \
-	setup.py \
-	setup.cfg \
-	src \
-	test \
-	README.md
diff --git a/vendor/git.apache.org/thrift.git/lib/py/README.md b/vendor/git.apache.org/thrift.git/lib/py/README.md
deleted file mode 100644
index 29b8c73..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Thrift Python Software Library
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Using Thrift with Python
-========================
-
-Thrift is provided as a set of Python packages. The top level package is
-thrift, and there are subpackages for the protocol, transport, and server
-code. Each package contains modules using standard Thrift naming conventions
-(i.e. TProtocol, TTransport) and implementations in corresponding modules
-(i.e. TSocket).  There is also a subpackage reflection, which contains
-the generated code for the reflection structures.
-
-The Python libraries can be installed manually using the provided setup.py
-file, or automatically using the install hook provided via autoconf/automake.
-To use the latter, become superuser and do make install.
diff --git a/vendor/git.apache.org/thrift.git/lib/py/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/py/coding_standards.md
deleted file mode 100644
index 4c560b5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/coding_standards.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Python Coding Standards
-
-Please follow:
- * [Thrift General Coding Standards](/doc/coding_standards.md)
- * Code Style for Python Code [PEP8](http://legacy.python.org/dev/peps/pep-0008/)
-
-When in doubt - check with <http://www.pylint.org/> or online with <http://pep8online.com>.
diff --git a/vendor/git.apache.org/thrift.git/lib/py/compat/win32/stdint.h b/vendor/git.apache.org/thrift.git/lib/py/compat/win32/stdint.h
deleted file mode 100644
index d02608a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/compat/win32/stdint.h
+++ /dev/null
@@ -1,247 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2008 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. The name of the author may be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#ifdef __cplusplus
-extern "C" {
-#endif
-#  include <wchar.h>
-#ifdef __cplusplus
-}
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
-   typedef signed char       int8_t;
-   typedef signed short      int16_t;
-   typedef signed int        int32_t;
-   typedef unsigned char     uint8_t;
-   typedef unsigned short    uint16_t;
-   typedef unsigned int      uint32_t;
-#else
-   typedef signed __int8     int8_t;
-   typedef signed __int16    int16_t;
-   typedef signed __int32    int32_t;
-   typedef unsigned __int8   uint8_t;
-   typedef unsigned __int16  uint16_t;
-   typedef unsigned __int32  uint32_t;
-#endif
-typedef signed __int64       int64_t;
-typedef unsigned __int64     uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef signed __int64    intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef _W64 signed int   intptr_t;
-   typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-#define INTMAX_C   INT64_C
-#define UINTMAX_C  UINT64_C
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-
-#endif // _MSC_STDINT_H_ ]
diff --git a/vendor/git.apache.org/thrift.git/lib/py/setup.cfg b/vendor/git.apache.org/thrift.git/lib/py/setup.cfg
deleted file mode 100644
index c9ed0ae..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[install]
-optimize = 1
-[metadata]
-description-file = README.md
-[flake8]
-max-line-length = 100
diff --git a/vendor/git.apache.org/thrift.git/lib/py/setup.py b/vendor/git.apache.org/thrift.git/lib/py/setup.py
deleted file mode 100644
index 1fdfe72..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/setup.py
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-try:
-    from setuptools import setup, Extension
-except:
-    from distutils.core import setup, Extension
-
-from distutils.command.build_ext import build_ext
-from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError
-
-# Fix to build sdist under vagrant
-import os
-if 'vagrant' in str(os.environ):
-    del os.link
-
-include_dirs = ['src']
-if sys.platform == 'win32':
-    include_dirs.append('compat/win32')
-    ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError, IOError)
-else:
-    ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)
-
-
-class BuildFailed(Exception):
-    pass
-
-
-class ve_build_ext(build_ext):
-    def run(self):
-        try:
-            build_ext.run(self)
-        except DistutilsPlatformError:
-            raise BuildFailed()
-
-    def build_extension(self, ext):
-        try:
-            build_ext.build_extension(self, ext)
-        except ext_errors:
-            raise BuildFailed()
-
-
-def run_setup(with_binary):
-    if with_binary:
-        extensions = dict(
-            ext_modules=[
-                Extension('thrift.protocol.fastbinary',
-                          sources=[
-                              'src/ext/module.cpp',
-                              'src/ext/types.cpp',
-                              'src/ext/binary.cpp',
-                              'src/ext/compact.cpp',
-                          ],
-                          include_dirs=include_dirs,
-                          )
-            ],
-            cmdclass=dict(build_ext=ve_build_ext)
-        )
-    else:
-        extensions = dict()
-
-    ssl_deps = []
-    if sys.version_info[0] == 2:
-        ssl_deps.append('ipaddress')
-    if sys.hexversion < 0x03050000:
-        ssl_deps.append('backports.ssl_match_hostname>=3.5')
-    tornado_deps = ['tornado>=4.0']
-    twisted_deps = ['twisted']
-
-    setup(name='thrift',
-          version='0.10.0',
-          description='Python bindings for the Apache Thrift RPC system',
-          author='Thrift Developers',
-          author_email='dev@thrift.apache.org',
-          url='http://thrift.apache.org',
-          license='Apache License 2.0',
-          install_requires=['six>=1.7.2'],
-          extras_require={
-              'ssl': ssl_deps,
-              'tornado': tornado_deps,
-              'twisted': twisted_deps,
-              'all': ssl_deps + tornado_deps + twisted_deps,
-          },
-          packages=[
-              'thrift',
-              'thrift.protocol',
-              'thrift.transport',
-              'thrift.server',
-          ],
-          package_dir={'thrift': 'src'},
-          classifiers=[
-              'Development Status :: 5 - Production/Stable',
-              'Environment :: Console',
-              'Intended Audience :: Developers',
-              'Programming Language :: Python',
-              'Programming Language :: Python :: 2',
-              'Programming Language :: Python :: 3',
-              'Topic :: Software Development :: Libraries',
-              'Topic :: System :: Networking'
-          ],
-          **extensions
-          )
-
-try:
-    with_binary = True
-    run_setup(with_binary)
-except BuildFailed:
-    print()
-    print('*' * 80)
-    print("An error occurred while trying to compile with the C extension enabled")
-    print("Attempting to build without the extension now")
-    print('*' * 80)
-    print()
-
-    run_setup(False)
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/TMultiplexedProcessor.py b/vendor/git.apache.org/thrift.git/lib/py/src/TMultiplexedProcessor.py
deleted file mode 100644
index 605aa1f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/TMultiplexedProcessor.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from thrift.Thrift import TProcessor, TMessageType, TException
-from thrift.protocol import TProtocolDecorator, TMultiplexedProtocol
-
-
-class TMultiplexedProcessor(TProcessor):
-    def __init__(self):
-        self.services = {}
-
-    def registerProcessor(self, serviceName, processor):
-        self.services[serviceName] = processor
-
-    def process(self, iprot, oprot):
-        (name, type, seqid) = iprot.readMessageBegin()
-        if type != TMessageType.CALL and type != TMessageType.ONEWAY:
-            raise TException("TMultiplex protocol only supports CALL & ONEWAY")
-
-        index = name.find(TMultiplexedProtocol.SEPARATOR)
-        if index < 0:
-            raise TException("Service name not found in message name: " + name + ". Did you forget to use TMultiplexProtocol in your client?")
-
-        serviceName = name[0:index]
-        call = name[index + len(TMultiplexedProtocol.SEPARATOR):]
-        if serviceName not in self.services:
-            raise TException("Service name not found: " + serviceName + ". Did you forget to call registerProcessor()?")
-
-        standardMessage = (call, type, seqid)
-        return self.services[serviceName].process(StoredMessageProtocol(iprot, standardMessage), oprot)
-
-
-class StoredMessageProtocol(TProtocolDecorator.TProtocolDecorator):
-    def __init__(self, protocol, messageBegin):
-        TProtocolDecorator.TProtocolDecorator.__init__(self, protocol)
-        self.messageBegin = messageBegin
-
-    def readMessageBegin(self):
-        return self.messageBegin
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/TSCons.py b/vendor/git.apache.org/thrift.git/lib/py/src/TSCons.py
deleted file mode 100644
index bc67d70..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/TSCons.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from os import path
-from SCons.Builder import Builder
-from six.moves import map
-
-
-def scons_env(env, add=''):
-    opath = path.dirname(path.abspath('$TARGET'))
-    lstr = 'thrift --gen cpp -o ' + opath + ' ' + add + ' $SOURCE'
-    cppbuild = Builder(action=lstr)
-    env.Append(BUILDERS={'ThriftCpp': cppbuild})
-
-
-def gen_cpp(env, dir, file):
-    scons_env(env)
-    suffixes = ['_types.h', '_types.cpp']
-    targets = map(lambda s: 'gen-cpp/' + file + s, suffixes)
-    return env.ThriftCpp(targets, dir + file + '.thrift')
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/TSerialization.py b/vendor/git.apache.org/thrift.git/lib/py/src/TSerialization.py
deleted file mode 100644
index fbbe768..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/TSerialization.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from .protocol import TBinaryProtocol
-from .transport import TTransport
-
-
-def serialize(thrift_object,
-              protocol_factory=TBinaryProtocol.TBinaryProtocolFactory()):
-    transport = TTransport.TMemoryBuffer()
-    protocol = protocol_factory.getProtocol(transport)
-    thrift_object.write(protocol)
-    return transport.getvalue()
-
-
-def deserialize(base,
-                buf,
-                protocol_factory=TBinaryProtocol.TBinaryProtocolFactory()):
-    transport = TTransport.TMemoryBuffer(buf)
-    protocol = protocol_factory.getProtocol(transport)
-    base.read(protocol)
-    return base
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/TTornado.py b/vendor/git.apache.org/thrift.git/lib/py/src/TTornado.py
deleted file mode 100644
index 5eff11d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/TTornado.py
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from __future__ import absolute_import
-import logging
-import socket
-import struct
-
-from .transport.TTransport import TTransportException, TTransportBase, TMemoryBuffer
-
-from io import BytesIO
-from collections import deque
-from contextlib import contextmanager
-from tornado import gen, iostream, ioloop, tcpserver, concurrent
-
-__all__ = ['TTornadoServer', 'TTornadoStreamTransport']
-
-logger = logging.getLogger(__name__)
-
-
-class _Lock(object):
-    def __init__(self):
-        self._waiters = deque()
-
-    def acquired(self):
-        return len(self._waiters) > 0
-
-    @gen.coroutine
-    def acquire(self):
-        blocker = self._waiters[-1] if self.acquired() else None
-        future = concurrent.Future()
-        self._waiters.append(future)
-        if blocker:
-            yield blocker
-
-        raise gen.Return(self._lock_context())
-
-    def release(self):
-        assert self.acquired(), 'Lock not aquired'
-        future = self._waiters.popleft()
-        future.set_result(None)
-
-    @contextmanager
-    def _lock_context(self):
-        try:
-            yield
-        finally:
-            self.release()
-
-
-class TTornadoStreamTransport(TTransportBase):
-    """a framed, buffered transport over a Tornado stream"""
-    def __init__(self, host, port, stream=None, io_loop=None):
-        self.host = host
-        self.port = port
-        self.io_loop = io_loop or ioloop.IOLoop.current()
-        self.__wbuf = BytesIO()
-        self._read_lock = _Lock()
-
-        # servers provide a ready-to-go stream
-        self.stream = stream
-
-    def with_timeout(self, timeout, future):
-        return gen.with_timeout(timeout, future, self.io_loop)
-
-    @gen.coroutine
-    def open(self, timeout=None):
-        logger.debug('socket connecting')
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0)
-        self.stream = iostream.IOStream(sock)
-
-        try:
-            connect = self.stream.connect((self.host, self.port))
-            if timeout is not None:
-                yield self.with_timeout(timeout, connect)
-            else:
-                yield connect
-        except (socket.error, IOError, ioloop.TimeoutError) as e:
-            message = 'could not connect to {}:{} ({})'.format(self.host, self.port, e)
-            raise TTransportException(
-                type=TTransportException.NOT_OPEN,
-                message=message)
-
-        raise gen.Return(self)
-
-    def set_close_callback(self, callback):
-        """
-        Should be called only after open() returns
-        """
-        self.stream.set_close_callback(callback)
-
-    def close(self):
-        # don't raise if we intend to close
-        self.stream.set_close_callback(None)
-        self.stream.close()
-
-    def read(self, _):
-        # The generated code for Tornado shouldn't do individual reads -- only
-        # frames at a time
-        assert False, "you're doing it wrong"
-
-    @contextmanager
-    def io_exception_context(self):
-        try:
-            yield
-        except (socket.error, IOError) as e:
-            raise TTransportException(
-                type=TTransportException.END_OF_FILE,
-                message=str(e))
-        except iostream.StreamBufferFullError as e:
-            raise TTransportException(
-                type=TTransportException.UNKNOWN,
-                message=str(e))
-
-    @gen.coroutine
-    def readFrame(self):
-        # IOStream processes reads one at a time
-        with (yield self._read_lock.acquire()):
-            with self.io_exception_context():
-                frame_header = yield self.stream.read_bytes(4)
-                if len(frame_header) == 0:
-                    raise iostream.StreamClosedError('Read zero bytes from stream')
-                frame_length, = struct.unpack('!i', frame_header)
-                frame = yield self.stream.read_bytes(frame_length)
-                raise gen.Return(frame)
-
-    def write(self, buf):
-        self.__wbuf.write(buf)
-
-    def flush(self):
-        frame = self.__wbuf.getvalue()
-        # reset wbuf before write/flush to preserve state on underlying failure
-        frame_length = struct.pack('!i', len(frame))
-        self.__wbuf = BytesIO()
-        with self.io_exception_context():
-            return self.stream.write(frame_length + frame)
-
-
-class TTornadoServer(tcpserver.TCPServer):
-    def __init__(self, processor, iprot_factory, oprot_factory=None,
-                 *args, **kwargs):
-        super(TTornadoServer, self).__init__(*args, **kwargs)
-
-        self._processor = processor
-        self._iprot_factory = iprot_factory
-        self._oprot_factory = (oprot_factory if oprot_factory is not None
-                               else iprot_factory)
-
-    @gen.coroutine
-    def handle_stream(self, stream, address):
-        host, port = address[:2]
-        trans = TTornadoStreamTransport(host=host, port=port, stream=stream,
-                                        io_loop=self.io_loop)
-        oprot = self._oprot_factory.getProtocol(trans)
-
-        try:
-            while not trans.stream.closed():
-                try:
-                    frame = yield trans.readFrame()
-                except TTransportException as e:
-                    if e.type == TTransportException.END_OF_FILE:
-                        break
-                    else:
-                        raise
-                tr = TMemoryBuffer(frame)
-                iprot = self._iprot_factory.getProtocol(tr)
-                yield self._processor.process(iprot, oprot)
-        except Exception:
-            logger.exception('thrift exception in handle_stream')
-            trans.close()
-
-        logger.info('client disconnected %s:%d', host, port)
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/Thrift.py b/vendor/git.apache.org/thrift.git/lib/py/src/Thrift.py
deleted file mode 100644
index c4dabdc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/Thrift.py
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-
-
-class TType(object):
-    STOP = 0
-    VOID = 1
-    BOOL = 2
-    BYTE = 3
-    I08 = 3
-    DOUBLE = 4
-    I16 = 6
-    I32 = 8
-    I64 = 10
-    STRING = 11
-    UTF7 = 11
-    STRUCT = 12
-    MAP = 13
-    SET = 14
-    LIST = 15
-    UTF8 = 16
-    UTF16 = 17
-
-    _VALUES_TO_NAMES = (
-        'STOP',
-        'VOID',
-        'BOOL',
-        'BYTE',
-        'DOUBLE',
-        None,
-        'I16',
-        None,
-        'I32',
-        None,
-        'I64',
-        'STRING',
-        'STRUCT',
-        'MAP',
-        'SET',
-        'LIST',
-        'UTF8',
-        'UTF16',
-    )
-
-
-class TMessageType(object):
-    CALL = 1
-    REPLY = 2
-    EXCEPTION = 3
-    ONEWAY = 4
-
-
-class TProcessor(object):
-    """Base class for procsessor, which works on two streams."""
-
-    def process(iprot, oprot):
-        pass
-
-
-class TException(Exception):
-    """Base class for all thrift exceptions."""
-
-    # BaseException.message is deprecated in Python v[2.6,3.0)
-    if (2, 6, 0) <= sys.version_info < (3, 0):
-        def _get_message(self):
-            return self._message
-
-        def _set_message(self, message):
-            self._message = message
-        message = property(_get_message, _set_message)
-
-    def __init__(self, message=None):
-        Exception.__init__(self, message)
-        self.message = message
-
-
-class TApplicationException(TException):
-    """Application level thrift exceptions."""
-
-    UNKNOWN = 0
-    UNKNOWN_METHOD = 1
-    INVALID_MESSAGE_TYPE = 2
-    WRONG_METHOD_NAME = 3
-    BAD_SEQUENCE_ID = 4
-    MISSING_RESULT = 5
-    INTERNAL_ERROR = 6
-    PROTOCOL_ERROR = 7
-    INVALID_TRANSFORM = 8
-    INVALID_PROTOCOL = 9
-    UNSUPPORTED_CLIENT_TYPE = 10
-
-    def __init__(self, type=UNKNOWN, message=None):
-        TException.__init__(self, message)
-        self.type = type
-
-    def __str__(self):
-        if self.message:
-            return self.message
-        elif self.type == self.UNKNOWN_METHOD:
-            return 'Unknown method'
-        elif self.type == self.INVALID_MESSAGE_TYPE:
-            return 'Invalid message type'
-        elif self.type == self.WRONG_METHOD_NAME:
-            return 'Wrong method name'
-        elif self.type == self.BAD_SEQUENCE_ID:
-            return 'Bad sequence ID'
-        elif self.type == self.MISSING_RESULT:
-            return 'Missing result'
-        elif self.type == self.INTERNAL_ERROR:
-            return 'Internal error'
-        elif self.type == self.PROTOCOL_ERROR:
-            return 'Protocol error'
-        elif self.type == self.INVALID_TRANSFORM:
-            return 'Invalid transform'
-        elif self.type == self.INVALID_PROTOCOL:
-            return 'Invalid protocol'
-        elif self.type == self.UNSUPPORTED_CLIENT_TYPE:
-            return 'Unsupported client type'
-        else:
-            return 'Default (unknown) TApplicationException'
-
-    def read(self, iprot):
-        iprot.readStructBegin()
-        while True:
-            (fname, ftype, fid) = iprot.readFieldBegin()
-            if ftype == TType.STOP:
-                break
-            if fid == 1:
-                if ftype == TType.STRING:
-                    self.message = iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 2:
-                if ftype == TType.I32:
-                    self.type = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
-            else:
-                iprot.skip(ftype)
-            iprot.readFieldEnd()
-        iprot.readStructEnd()
-
-    def write(self, oprot):
-        oprot.writeStructBegin('TApplicationException')
-        if self.message is not None:
-            oprot.writeFieldBegin('message', TType.STRING, 1)
-            oprot.writeString(self.message)
-            oprot.writeFieldEnd()
-        if self.type is not None:
-            oprot.writeFieldBegin('type', TType.I32, 2)
-            oprot.writeI32(self.type)
-            oprot.writeFieldEnd()
-        oprot.writeFieldStop()
-        oprot.writeStructEnd()
-
-
-class TFrozenDict(dict):
-    """A dictionary that is "frozen" like a frozenset"""
-
-    def __init__(self, *args, **kwargs):
-        super(TFrozenDict, self).__init__(*args, **kwargs)
-        # Sort the items so they will be in a consistent order.
-        # XOR in the hash of the class so we don't collide with
-        # the hash of a list of tuples.
-        self.__hashval = hash(TFrozenDict) ^ hash(tuple(sorted(self.items())))
-
-    def __setitem__(self, *args):
-        raise TypeError("Can't modify frozen TFreezableDict")
-
-    def __delitem__(self, *args):
-        raise TypeError("Can't modify frozen TFreezableDict")
-
-    def __hash__(self):
-        return self.__hashval
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/__init__.py b/vendor/git.apache.org/thrift.git/lib/py/src/__init__.py
deleted file mode 100644
index 48d659c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-__all__ = ['Thrift', 'TSCons']
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/compat.py b/vendor/git.apache.org/thrift.git/lib/py/src/compat.py
deleted file mode 100644
index 41bcf35..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/compat.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-
-if sys.version_info[0] == 2:
-
-    from cStringIO import StringIO as BufferIO
-
-    def binary_to_str(bin_val):
-        return bin_val
-
-    def str_to_binary(str_val):
-        return str_val
-
-else:
-
-    from io import BytesIO as BufferIO  # noqa
-
-    def binary_to_str(bin_val):
-        return bin_val.decode('utf8')
-
-    def str_to_binary(str_val):
-        return bytes(str_val, 'utf8')
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/binary.cpp b/vendor/git.apache.org/thrift.git/lib/py/src/ext/binary.cpp
deleted file mode 100644
index 85d8d92..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/binary.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "ext/binary.h"
-namespace apache {
-namespace thrift {
-namespace py {
-
-bool BinaryProtocol::readFieldBegin(TType& type, int16_t& tag) {
-  uint8_t b = 0;
-  if (!readByte(b)) {
-    return false;
-  }
-  type = static_cast<TType>(b);
-  if (type == T_STOP) {
-    return true;
-  }
-  return readI16(tag);
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/binary.h b/vendor/git.apache.org/thrift.git/lib/py/src/ext/binary.h
deleted file mode 100644
index dedeec3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/binary.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_PY_BINARY_H
-#define THRIFT_PY_BINARY_H
-
-#include <Python.h>
-#include "ext/protocol.h"
-#include "ext/endian.h"
-#include <stdint.h>
-
-namespace apache {
-namespace thrift {
-namespace py {
-
-class BinaryProtocol : public ProtocolBase<BinaryProtocol> {
-public:
-  virtual ~BinaryProtocol() {}
-
-  void writeI8(int8_t val) { writeBuffer(reinterpret_cast<char*>(&val), sizeof(int8_t)); }
-
-  void writeI16(int16_t val) {
-    int16_t net = static_cast<int16_t>(htons(val));
-    writeBuffer(reinterpret_cast<char*>(&net), sizeof(int16_t));
-  }
-
-  void writeI32(int32_t val) {
-    int32_t net = static_cast<int32_t>(htonl(val));
-    writeBuffer(reinterpret_cast<char*>(&net), sizeof(int32_t));
-  }
-
-  void writeI64(int64_t val) {
-    int64_t net = static_cast<int64_t>(htonll(val));
-    writeBuffer(reinterpret_cast<char*>(&net), sizeof(int64_t));
-  }
-
-  void writeDouble(double dub) {
-    // Unfortunately, bitwise_cast doesn't work in C.  Bad C!
-    union {
-      double f;
-      int64_t t;
-    } transfer;
-    transfer.f = dub;
-    writeI64(transfer.t);
-  }
-
-  void writeBool(int v) { writeByte(static_cast<uint8_t>(v)); }
-
-  void writeString(PyObject* value, int32_t len) {
-    writeI32(len);
-    writeBuffer(PyBytes_AS_STRING(value), len);
-  }
-
-  bool writeListBegin(PyObject* value, const SetListTypeArgs& parsedargs, int32_t len) {
-    writeByte(parsedargs.element_type);
-    writeI32(len);
-    return true;
-  }
-
-  bool writeMapBegin(PyObject* value, const MapTypeArgs& parsedargs, int32_t len) {
-    writeByte(parsedargs.ktag);
-    writeByte(parsedargs.vtag);
-    writeI32(len);
-    return true;
-  }
-
-  bool writeStructBegin() { return true; }
-  bool writeStructEnd() { return true; }
-  bool writeField(PyObject* value, const StructItemSpec& parsedspec) {
-    writeByte(static_cast<uint8_t>(parsedspec.type));
-    writeI16(parsedspec.tag);
-    return encodeValue(value, parsedspec.type, parsedspec.typeargs);
-  }
-
-  void writeFieldStop() { writeByte(static_cast<uint8_t>(T_STOP)); }
-
-  bool readBool(bool& val) {
-    char* buf;
-    if (!readBytes(&buf, 1)) {
-      return false;
-    }
-    val = buf[0] == 1;
-    return true;
-  }
-
-  bool readI8(int8_t& val) {
-    char* buf;
-    if (!readBytes(&buf, 1)) {
-      return false;
-    }
-    val = buf[0];
-    return true;
-  }
-
-  bool readI16(int16_t& val) {
-    char* buf;
-    if (!readBytes(&buf, sizeof(int16_t))) {
-      return false;
-    }
-    val = static_cast<int16_t>(ntohs(*reinterpret_cast<int16_t*>(buf)));
-    return true;
-  }
-
-  bool readI32(int32_t& val) {
-    char* buf;
-    if (!readBytes(&buf, sizeof(int32_t))) {
-      return false;
-    }
-    val = static_cast<int32_t>(ntohl(*reinterpret_cast<int32_t*>(buf)));
-    return true;
-  }
-
-  bool readI64(int64_t& val) {
-    char* buf;
-    if (!readBytes(&buf, sizeof(int64_t))) {
-      return false;
-    }
-    val = static_cast<int64_t>(ntohll(*reinterpret_cast<int64_t*>(buf)));
-    return true;
-  }
-
-  bool readDouble(double& val) {
-    union {
-      int64_t f;
-      double t;
-    } transfer;
-
-    if (!readI64(transfer.f)) {
-      return false;
-    }
-    val = transfer.t;
-    return true;
-  }
-
-  int32_t readString(char** buf) {
-    int32_t len = 0;
-    if (!readI32(len) || !checkLengthLimit(len, stringLimit()) || !readBytes(buf, len)) {
-      return -1;
-    }
-    return len;
-  }
-
-  int32_t readListBegin(TType& etype) {
-    int32_t len;
-    uint8_t b = 0;
-    if (!readByte(b) || !readI32(len) || !checkLengthLimit(len, containerLimit())) {
-      return -1;
-    }
-    etype = static_cast<TType>(b);
-    return len;
-  }
-
-  int32_t readMapBegin(TType& ktype, TType& vtype) {
-    int32_t len;
-    uint8_t k, v;
-    if (!readByte(k) || !readByte(v) || !readI32(len) || !checkLengthLimit(len, containerLimit())) {
-      return -1;
-    }
-    ktype = static_cast<TType>(k);
-    vtype = static_cast<TType>(v);
-    return len;
-  }
-
-  bool readStructBegin() { return true; }
-  bool readStructEnd() { return true; }
-
-  bool readFieldBegin(TType& type, int16_t& tag);
-
-#define SKIPBYTES(n)                                                                               \
-  do {                                                                                             \
-    if (!readBytes(&dummy_buf_, (n))) {                                                            \
-      return false;                                                                                \
-    }                                                                                              \
-    return true;                                                                                   \
-  } while (0)
-
-  bool skipBool() { SKIPBYTES(1); }
-  bool skipByte() { SKIPBYTES(1); }
-  bool skipI16() { SKIPBYTES(2); }
-  bool skipI32() { SKIPBYTES(4); }
-  bool skipI64() { SKIPBYTES(8); }
-  bool skipDouble() { SKIPBYTES(8); }
-  bool skipString() {
-    int32_t len;
-    if (!readI32(len)) {
-      return false;
-    }
-    SKIPBYTES(len);
-  }
-#undef SKIPBYTES
-
-private:
-  char* dummy_buf_;
-};
-}
-}
-}
-#endif // THRIFT_PY_BINARY_H
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/compact.cpp b/vendor/git.apache.org/thrift.git/lib/py/src/ext/compact.cpp
deleted file mode 100644
index 15a99a0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/compact.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "ext/compact.h"
-
-namespace apache {
-namespace thrift {
-namespace py {
-
-const uint8_t CompactProtocol::TTypeToCType[] = {
-    CT_STOP,         // T_STOP
-    0,               // unused
-    CT_BOOLEAN_TRUE, // T_BOOL
-    CT_BYTE,         // T_BYTE
-    CT_DOUBLE,       // T_DOUBLE
-    0,               // unused
-    CT_I16,          // T_I16
-    0,               // unused
-    CT_I32,          // T_I32
-    0,               // unused
-    CT_I64,          // T_I64
-    CT_BINARY,       // T_STRING
-    CT_STRUCT,       // T_STRUCT
-    CT_MAP,          // T_MAP
-    CT_SET,          // T_SET
-    CT_LIST,         // T_LIST
-};
-
-bool CompactProtocol::readFieldBegin(TType& type, int16_t& tag) {
-  uint8_t b;
-  if (!readByte(b)) {
-    return false;
-  }
-  uint8_t ctype = b & 0xf;
-  type = getTType(ctype);
-  if (type == -1) {
-    return false;
-  } else if (type == T_STOP) {
-    tag = 0;
-    return true;
-  }
-  uint8_t diff = (b & 0xf0) >> 4;
-  if (diff) {
-    tag = readTags_.top() + diff;
-  } else if (!readI16(tag)) {
-    readTags_.top() = -1;
-    return false;
-  }
-  if (ctype == CT_BOOLEAN_FALSE || ctype == CT_BOOLEAN_TRUE) {
-    readBool_.exists = true;
-    readBool_.value = ctype == CT_BOOLEAN_TRUE;
-  }
-  readTags_.top() = tag;
-  return true;
-}
-
-TType CompactProtocol::getTType(uint8_t type) {
-  switch (type) {
-  case T_STOP:
-    return T_STOP;
-  case CT_BOOLEAN_FALSE:
-  case CT_BOOLEAN_TRUE:
-    return T_BOOL;
-  case CT_BYTE:
-    return T_BYTE;
-  case CT_I16:
-    return T_I16;
-  case CT_I32:
-    return T_I32;
-  case CT_I64:
-    return T_I64;
-  case CT_DOUBLE:
-    return T_DOUBLE;
-  case CT_BINARY:
-    return T_STRING;
-  case CT_LIST:
-    return T_LIST;
-  case CT_SET:
-    return T_SET;
-  case CT_MAP:
-    return T_MAP;
-  case CT_STRUCT:
-    return T_STRUCT;
-  default:
-    PyErr_Format(PyExc_TypeError, "don't know what type: %d", type);
-    return static_cast<TType>(-1);
-  }
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/compact.h b/vendor/git.apache.org/thrift.git/lib/py/src/ext/compact.h
deleted file mode 100644
index 5bba237..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/compact.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_PY_COMPACT_H
-#define THRIFT_PY_COMPACT_H
-
-#include <Python.h>
-#include "ext/protocol.h"
-#include "ext/endian.h"
-#include <stdint.h>
-#include <stack>
-
-namespace apache {
-namespace thrift {
-namespace py {
-
-class CompactProtocol : public ProtocolBase<CompactProtocol> {
-public:
-  CompactProtocol() { readBool_.exists = false; }
-
-  virtual ~CompactProtocol() {}
-
-  void writeI8(int8_t val) { writeBuffer(reinterpret_cast<char*>(&val), 1); }
-
-  void writeI16(int16_t val) { writeVarint(toZigZag(val)); }
-
-  int writeI32(int32_t val) { return writeVarint(toZigZag(val)); }
-
-  void writeI64(int64_t val) { writeVarint64(toZigZag64(val)); }
-
-  void writeDouble(double dub) {
-    union {
-      double f;
-      int64_t t;
-    } transfer;
-    transfer.f = htolell(dub);
-    writeBuffer(reinterpret_cast<char*>(&transfer.t), sizeof(int64_t));
-  }
-
-  void writeBool(int v) { writeByte(static_cast<uint8_t>(v ? CT_BOOLEAN_TRUE : CT_BOOLEAN_FALSE)); }
-
-  void writeString(PyObject* value, int32_t len) {
-    writeVarint(len);
-    writeBuffer(PyBytes_AS_STRING(value), len);
-  }
-
-  bool writeListBegin(PyObject* value, const SetListTypeArgs& args, int32_t len) {
-    int ctype = toCompactType(args.element_type);
-    if (len <= 14) {
-      writeByte(static_cast<uint8_t>(len << 4 | ctype));
-    } else {
-      writeByte(0xf0 | ctype);
-      writeVarint(len);
-    }
-    return true;
-  }
-
-  bool writeMapBegin(PyObject* value, const MapTypeArgs& args, int32_t len) {
-    if (len == 0) {
-      writeByte(0);
-      return true;
-    }
-    int ctype = toCompactType(args.ktag) << 4 | toCompactType(args.vtag);
-    writeVarint(len);
-    writeByte(ctype);
-    return true;
-  }
-
-  bool writeStructBegin() {
-    writeTags_.push(0);
-    return true;
-  }
-  bool writeStructEnd() {
-    writeTags_.pop();
-    return true;
-  }
-
-  bool writeField(PyObject* value, const StructItemSpec& spec) {
-    if (spec.type == T_BOOL) {
-      doWriteFieldBegin(spec, PyObject_IsTrue(value) ? CT_BOOLEAN_TRUE : CT_BOOLEAN_FALSE);
-      return true;
-    } else {
-      doWriteFieldBegin(spec, toCompactType(spec.type));
-      return encodeValue(value, spec.type, spec.typeargs);
-    }
-  }
-
-  void writeFieldStop() { writeByte(0); }
-
-  bool readBool(bool& val) {
-    if (readBool_.exists) {
-      readBool_.exists = false;
-      val = readBool_.value;
-      return true;
-    }
-    char* buf;
-    if (!readBytes(&buf, 1)) {
-      return false;
-    }
-    val = buf[0] == CT_BOOLEAN_TRUE;
-    return true;
-  }
-  bool readI8(int8_t& val) {
-    char* buf;
-    if (!readBytes(&buf, 1)) {
-      return false;
-    }
-    val = buf[0];
-    return true;
-  }
-
-  bool readI16(int16_t& val) {
-    uint16_t uval;
-    if (readVarint<uint16_t, 3>(uval)) {
-      val = fromZigZag<int16_t, uint16_t>(uval);
-      return true;
-    }
-    return false;
-  }
-
-  bool readI32(int32_t& val) {
-    uint32_t uval;
-    if (readVarint<uint32_t, 5>(uval)) {
-      val = fromZigZag<int32_t, uint32_t>(uval);
-      return true;
-    }
-    return false;
-  }
-
-  bool readI64(int64_t& val) {
-    uint64_t uval;
-    if (readVarint<uint64_t, 10>(uval)) {
-      val = fromZigZag<int64_t, uint64_t>(uval);
-      return true;
-    }
-    return false;
-  }
-
-  bool readDouble(double& val) {
-    union {
-      int64_t f;
-      double t;
-    } transfer;
-
-    char* buf;
-    if (!readBytes(&buf, 8)) {
-      return false;
-    }
-    transfer.f = letohll(*reinterpret_cast<int64_t*>(buf));
-    val = transfer.t;
-    return true;
-  }
-
-  int32_t readString(char** buf) {
-    uint32_t len;
-    if (!readVarint<uint32_t, 5>(len) || !checkLengthLimit(len, stringLimit())) {
-      return -1;
-    }
-    if (len == 0) {
-      return 0;
-    }
-    if (!readBytes(buf, len)) {
-      return -1;
-    }
-    return len;
-  }
-
-  int32_t readListBegin(TType& etype) {
-    uint8_t b;
-    if (!readByte(b)) {
-      return -1;
-    }
-    etype = getTType(b & 0xf);
-    if (etype == -1) {
-      return -1;
-    }
-    uint32_t len = (b >> 4) & 0xf;
-    if (len == 15 && !readVarint<uint32_t, 5>(len)) {
-      return -1;
-    }
-    if (!checkLengthLimit(len, containerLimit())) {
-      return -1;
-    }
-    return len;
-  }
-
-  int32_t readMapBegin(TType& ktype, TType& vtype) {
-    uint32_t len;
-    if (!readVarint<uint32_t, 5>(len) || !checkLengthLimit(len, containerLimit())) {
-      return -1;
-    }
-    if (len != 0) {
-      uint8_t kvType;
-      if (!readByte(kvType)) {
-        return -1;
-      }
-      ktype = getTType(kvType >> 4);
-      vtype = getTType(kvType & 0xf);
-      if (ktype == -1 || vtype == -1) {
-        return -1;
-      }
-    }
-    return len;
-  }
-
-  bool readStructBegin() {
-    readTags_.push(0);
-    return true;
-  }
-  bool readStructEnd() {
-    readTags_.pop();
-    return true;
-  }
-  bool readFieldBegin(TType& type, int16_t& tag);
-
-  bool skipBool() {
-    bool val;
-    return readBool(val);
-  }
-#define SKIPBYTES(n)                                                                               \
-  do {                                                                                             \
-    if (!readBytes(&dummy_buf_, (n))) {                                                            \
-      return false;                                                                                \
-    }                                                                                              \
-    return true;                                                                                   \
-  } while (0)
-  bool skipByte() { SKIPBYTES(1); }
-  bool skipDouble() { SKIPBYTES(8); }
-  bool skipI16() {
-    int16_t val;
-    return readI16(val);
-  }
-  bool skipI32() {
-    int32_t val;
-    return readI32(val);
-  }
-  bool skipI64() {
-    int64_t val;
-    return readI64(val);
-  }
-  bool skipString() {
-    uint32_t len;
-    if (!readVarint<uint32_t, 5>(len)) {
-      return false;
-    }
-    SKIPBYTES(len);
-  }
-#undef SKIPBYTES
-
-private:
-  enum Types {
-    CT_STOP = 0x00,
-    CT_BOOLEAN_TRUE = 0x01,
-    CT_BOOLEAN_FALSE = 0x02,
-    CT_BYTE = 0x03,
-    CT_I16 = 0x04,
-    CT_I32 = 0x05,
-    CT_I64 = 0x06,
-    CT_DOUBLE = 0x07,
-    CT_BINARY = 0x08,
-    CT_LIST = 0x09,
-    CT_SET = 0x0A,
-    CT_MAP = 0x0B,
-    CT_STRUCT = 0x0C
-  };
-
-  static const uint8_t TTypeToCType[];
-
-  TType getTType(uint8_t type);
-
-  int toCompactType(TType type) {
-    int i = static_cast<int>(type);
-    return i < 16 ? TTypeToCType[i] : -1;
-  }
-
-  uint32_t toZigZag(int32_t val) { return (val >> 31) ^ (val << 1); }
-
-  uint64_t toZigZag64(int64_t val) { return (val >> 63) ^ (val << 1); }
-
-  int writeVarint(uint32_t val) {
-    int cnt = 1;
-    while (val & ~0x7fU) {
-      writeByte(static_cast<char>((val & 0x7fU) | 0x80U));
-      val >>= 7;
-      ++cnt;
-    }
-    writeByte(static_cast<char>(val));
-    return cnt;
-  }
-
-  int writeVarint64(uint64_t val) {
-    int cnt = 1;
-    while (val & ~0x7fULL) {
-      writeByte(static_cast<char>((val & 0x7fULL) | 0x80ULL));
-      val >>= 7;
-      ++cnt;
-    }
-    writeByte(static_cast<char>(val));
-    return cnt;
-  }
-
-  template <typename T, int Max>
-  bool readVarint(T& result) {
-    uint8_t b;
-    T val = 0;
-    int shift = 0;
-    for (int i = 0; i < Max; ++i) {
-      if (!readByte(b)) {
-        return false;
-      }
-      if (b & 0x80) {
-        val |= static_cast<T>(b & 0x7f) << shift;
-      } else {
-        val |= static_cast<T>(b) << shift;
-        result = val;
-        return true;
-      }
-      shift += 7;
-    }
-    PyErr_Format(PyExc_OverflowError, "varint exceeded %d bytes", Max);
-    return false;
-  }
-
-  template <typename S, typename U>
-  S fromZigZag(U val) {
-    return (val >> 1) ^ static_cast<U>(-static_cast<S>(val & 1));
-  }
-
-  void doWriteFieldBegin(const StructItemSpec& spec, int ctype) {
-    int diff = spec.tag - writeTags_.top();
-    if (diff > 0 && diff <= 15) {
-      writeByte(static_cast<uint8_t>(diff << 4 | ctype));
-    } else {
-      writeByte(static_cast<uint8_t>(ctype));
-      writeI16(spec.tag);
-    }
-    writeTags_.top() = spec.tag;
-  }
-
-  std::stack<int> writeTags_;
-  std::stack<int> readTags_;
-  struct {
-    bool exists;
-    bool value;
-  } readBool_;
-  char* dummy_buf_;
-};
-}
-}
-}
-#endif // THRIFT_PY_COMPACT_H
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/endian.h b/vendor/git.apache.org/thrift.git/lib/py/src/ext/endian.h
deleted file mode 100644
index 91372a7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/endian.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_PY_ENDIAN_H
-#define THRIFT_PY_ENDIAN_H
-
-#include <Python.h>
-
-#ifndef _WIN32
-#include <netinet/in.h>
-#else
-#include <WinSock2.h>
-#pragma comment(lib, "ws2_32.lib")
-#define BIG_ENDIAN (4321)
-#define LITTLE_ENDIAN (1234)
-#define BYTE_ORDER LITTLE_ENDIAN
-#define inline __inline
-#endif
-
-/* Fix endianness issues on Solaris */
-#if defined(__SVR4) && defined(__sun)
-#if defined(__i386) && !defined(__i386__)
-#define __i386__
-#endif
-
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN (4321)
-#endif
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN (1234)
-#endif
-
-/* I386 is LE, even on Solaris */
-#if !defined(BYTE_ORDER) && defined(__i386__)
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-#endif
-
-#ifndef __BYTE_ORDER
-#if defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN)
-#define __BYTE_ORDER BYTE_ORDER
-#define __LITTLE_ENDIAN LITTLE_ENDIAN
-#define __BIG_ENDIAN BIG_ENDIAN
-#else
-#error "Cannot determine endianness"
-#endif
-#endif
-
-// Same comment as the enum.  Sorry.
-#if __BYTE_ORDER == __BIG_ENDIAN
-#define ntohll(n) (n)
-#define htonll(n) (n)
-#if defined(__GNUC__) && defined(__GLIBC__)
-#include <byteswap.h>
-#define letohll(n) bswap_64(n)
-#define htolell(n) bswap_64(n)
-#else /* GNUC & GLIBC */
-#define letohll(n) ((((unsigned long long)ntohl(n)) << 32) + ntohl(n >> 32))
-#define htolell(n) ((((unsigned long long)htonl(n)) << 32) + htonl(n >> 32))
-#endif
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-#if defined(__GNUC__) && defined(__GLIBC__)
-#include <byteswap.h>
-#define ntohll(n) bswap_64(n)
-#define htonll(n) bswap_64(n)
-#else /* GNUC & GLIBC */
-#define ntohll(n) ((((unsigned long long)ntohl(n)) << 32) + ntohl(n >> 32))
-#define htonll(n) ((((unsigned long long)htonl(n)) << 32) + htonl(n >> 32))
-#endif /* GNUC & GLIBC */
-#define letohll(n) (n)
-#define htolell(n) (n)
-#else /* __BYTE_ORDER */
-#error "Can't define htonll or ntohll!"
-#endif
-
-#endif // THRIFT_PY_ENDIAN_H
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/module.cpp b/vendor/git.apache.org/thrift.git/lib/py/src/ext/module.cpp
deleted file mode 100644
index 34ec7f6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/module.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <Python.h>
-#include "types.h"
-#include "binary.h"
-#include "compact.h"
-#include <limits>
-#include <stdint.h>
-
-// TODO(dreiss): defval appears to be unused.  Look into removing it.
-// TODO(dreiss): Make parse_spec_args recursive, and cache the output
-//               permanently in the object.  (Malloc and orphan.)
-// TODO(dreiss): Why do we need cStringIO for reading, why not just char*?
-//               Can cStringIO let us work with a BufferedTransport?
-// TODO(dreiss): Don't ignore the rv from cwrite (maybe).
-
-// Doing a benchmark shows that interning actually makes a difference, amazingly.
-
-/** Pointer to interned string to speed up attribute lookup. */
-PyObject* INTERN_STRING(TFrozenDict);
-PyObject* INTERN_STRING(cstringio_buf);
-PyObject* INTERN_STRING(cstringio_refill);
-static PyObject* INTERN_STRING(string_length_limit);
-static PyObject* INTERN_STRING(container_length_limit);
-static PyObject* INTERN_STRING(trans);
-
-namespace apache {
-namespace thrift {
-namespace py {
-
-template <typename T>
-static PyObject* encode_impl(PyObject* args) {
-  if (!args)
-    return NULL;
-
-  PyObject* enc_obj = NULL;
-  PyObject* type_args = NULL;
-  if (!PyArg_ParseTuple(args, "OO", &enc_obj, &type_args)) {
-    return NULL;
-  }
-  if (!enc_obj || !type_args) {
-    return NULL;
-  }
-
-  T protocol;
-  if (!protocol.prepareEncodeBuffer() || !protocol.encodeValue(enc_obj, T_STRUCT, type_args)) {
-    return NULL;
-  }
-
-  return protocol.getEncodedValue();
-}
-
-static inline long as_long_then_delete(PyObject* value, long default_value) {
-  ScopedPyObject scope(value);
-  long v = PyInt_AsLong(value);
-  if (INT_CONV_ERROR_OCCURRED(v)) {
-    PyErr_Clear();
-    return default_value;
-  }
-  return v;
-}
-
-template <typename T>
-static PyObject* decode_impl(PyObject* args) {
-  PyObject* output_obj = NULL;
-  PyObject* oprot = NULL;
-  PyObject* typeargs = NULL;
-  if (!PyArg_ParseTuple(args, "OOO", &output_obj, &oprot, &typeargs)) {
-    return NULL;
-  }
-
-  T protocol;
-#ifdef _MSC_VER
-  // workaround strange VC++ 2015 bug where #else path does not compile
-  int32_t default_limit = INT32_MAX;
-#else
-  int32_t default_limit = std::numeric_limits<int32_t>::max();
-#endif
-  protocol.setStringLengthLimit(
-      as_long_then_delete(PyObject_GetAttr(oprot, INTERN_STRING(string_length_limit)),
-                          default_limit));
-  protocol.setContainerLengthLimit(
-      as_long_then_delete(PyObject_GetAttr(oprot, INTERN_STRING(container_length_limit)),
-                          default_limit));
-  ScopedPyObject transport(PyObject_GetAttr(oprot, INTERN_STRING(trans)));
-  if (!transport) {
-    return NULL;
-  }
-
-  StructTypeArgs parsedargs;
-  if (!parse_struct_args(&parsedargs, typeargs)) {
-    return NULL;
-  }
-
-  if (!protocol.prepareDecodeBufferFromTransport(transport.get())) {
-    return NULL;
-  }
-
-  return protocol.readStruct(output_obj, parsedargs.klass, parsedargs.spec);
-}
-}
-}
-}
-
-using namespace apache::thrift::py;
-
-/* -- PYTHON MODULE SETUP STUFF --- */
-
-extern "C" {
-
-static PyObject* encode_binary(PyObject*, PyObject* args) {
-  return encode_impl<BinaryProtocol>(args);
-}
-
-static PyObject* decode_binary(PyObject*, PyObject* args) {
-  return decode_impl<BinaryProtocol>(args);
-}
-
-static PyObject* encode_compact(PyObject*, PyObject* args) {
-  return encode_impl<CompactProtocol>(args);
-}
-
-static PyObject* decode_compact(PyObject*, PyObject* args) {
-  return decode_impl<CompactProtocol>(args);
-}
-
-static PyMethodDef ThriftFastBinaryMethods[] = {
-    {"encode_binary", encode_binary, METH_VARARGS, ""},
-    {"decode_binary", decode_binary, METH_VARARGS, ""},
-    {"encode_compact", encode_compact, METH_VARARGS, ""},
-    {"decode_compact", decode_compact, METH_VARARGS, ""},
-    {NULL, NULL, 0, NULL} /* Sentinel */
-};
-
-#if PY_MAJOR_VERSION >= 3
-
-static struct PyModuleDef ThriftFastBinaryDef = {PyModuleDef_HEAD_INIT,
-                                                 "thrift.protocol.fastbinary",
-                                                 NULL,
-                                                 0,
-                                                 ThriftFastBinaryMethods,
-                                                 NULL,
-                                                 NULL,
-                                                 NULL,
-                                                 NULL};
-
-#define INITERROR return NULL;
-
-PyObject* PyInit_fastbinary() {
-
-#else
-
-#define INITERROR return;
-
-void initfastbinary() {
-
-  PycString_IMPORT;
-  if (PycStringIO == NULL)
-    INITERROR
-
-#endif
-
-#define INIT_INTERN_STRING(value)                                                                  \
-  do {                                                                                             \
-    INTERN_STRING(value) = PyString_InternFromString(#value);                                      \
-    if (!INTERN_STRING(value))                                                                     \
-      INITERROR                                                                                    \
-  } while (0)
-
-  INIT_INTERN_STRING(TFrozenDict);
-  INIT_INTERN_STRING(cstringio_buf);
-  INIT_INTERN_STRING(cstringio_refill);
-  INIT_INTERN_STRING(string_length_limit);
-  INIT_INTERN_STRING(container_length_limit);
-  INIT_INTERN_STRING(trans);
-#undef INIT_INTERN_STRING
-
-  PyObject* module =
-#if PY_MAJOR_VERSION >= 3
-      PyModule_Create(&ThriftFastBinaryDef);
-#else
-      Py_InitModule("thrift.protocol.fastbinary", ThriftFastBinaryMethods);
-#endif
-  if (module == NULL)
-    INITERROR;
-
-#if PY_MAJOR_VERSION >= 3
-  return module;
-#endif
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/protocol.h b/vendor/git.apache.org/thrift.git/lib/py/src/ext/protocol.h
deleted file mode 100644
index 126dbc3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/protocol.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_PY_PROTOCOL_H
-#define THRIFT_PY_PROTOCOL_H
-
-#include "ext/types.h"
-#include <limits>
-#include <stdint.h>
-
-namespace apache {
-namespace thrift {
-namespace py {
-
-template <typename Impl>
-class ProtocolBase {
-
-public:
-  ProtocolBase()
-    : stringLimit_(std::numeric_limits<int32_t>::max()),
-      containerLimit_(std::numeric_limits<int32_t>::max()),
-      output_(NULL) {}
-  inline virtual ~ProtocolBase();
-
-  bool prepareDecodeBufferFromTransport(PyObject* trans);
-
-  PyObject* readStruct(PyObject* output, PyObject* klass, PyObject* spec_seq);
-
-  bool prepareEncodeBuffer();
-
-  bool encodeValue(PyObject* value, TType type, PyObject* typeargs);
-
-  PyObject* getEncodedValue();
-
-  long stringLimit() const { return stringLimit_; }
-  void setStringLengthLimit(long limit) { stringLimit_ = limit; }
-
-  long containerLimit() const { return containerLimit_; }
-  void setContainerLengthLimit(long limit) { containerLimit_ = limit; }
-
-protected:
-  bool readBytes(char** output, int len);
-
-  bool readByte(uint8_t& val) {
-    char* buf;
-    if (!readBytes(&buf, 1)) {
-      return false;
-    }
-    val = static_cast<uint8_t>(buf[0]);
-    return true;
-  }
-
-  bool writeBuffer(char* data, size_t len);
-
-  void writeByte(uint8_t val) { writeBuffer(reinterpret_cast<char*>(&val), 1); }
-
-  PyObject* decodeValue(TType type, PyObject* typeargs);
-
-  bool skip(TType type);
-
-  inline bool checkType(TType got, TType expected);
-  inline bool checkLengthLimit(int32_t len, long limit);
-
-  inline bool isUtf8(PyObject* typeargs);
-
-private:
-  Impl* impl() { return static_cast<Impl*>(this); }
-
-  long stringLimit_;
-  long containerLimit_;
-  EncodeBuffer* output_;
-  DecodeBuffer input_;
-};
-}
-}
-}
-
-#include "ext/protocol.tcc"
-
-#endif // THRIFT_PY_PROTOCOL_H
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/protocol.tcc b/vendor/git.apache.org/thrift.git/lib/py/src/ext/protocol.tcc
deleted file mode 100644
index 6e978d7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/protocol.tcc
+++ /dev/null
@@ -1,913 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_PY_PROTOCOL_TCC
-#define THRIFT_PY_PROTOCOL_TCC
-
-#include <iterator>
-
-#define CHECK_RANGE(v, min, max) (((v) <= (max)) && ((v) >= (min)))
-#define INIT_OUTBUF_SIZE 128
-
-#if PY_MAJOR_VERSION < 3
-#include <cStringIO.h>
-#else
-#include <algorithm>
-#endif
-
-namespace apache {
-namespace thrift {
-namespace py {
-
-#if PY_MAJOR_VERSION < 3
-
-namespace detail {
-
-inline bool input_check(PyObject* input) {
-  return PycStringIO_InputCheck(input);
-}
-
-inline EncodeBuffer* new_encode_buffer(size_t size) {
-  if (!PycStringIO) {
-    PycString_IMPORT;
-  }
-  if (!PycStringIO) {
-    return NULL;
-  }
-  return PycStringIO->NewOutput(size);
-}
-
-inline int read_buffer(PyObject* buf, char** output, int len) {
-  if (!PycStringIO) {
-    PycString_IMPORT;
-  }
-  if (!PycStringIO) {
-    PyErr_SetString(PyExc_ImportError, "failed to import native cStringIO");
-    return -1;
-  }
-  return PycStringIO->cread(buf, output, len);
-}
-}
-
-template <typename Impl>
-inline ProtocolBase<Impl>::~ProtocolBase() {
-  if (output_) {
-    Py_CLEAR(output_);
-  }
-}
-
-template <typename Impl>
-inline bool ProtocolBase<Impl>::isUtf8(PyObject* typeargs) {
-  return PyString_Check(typeargs) && !strncmp(PyString_AS_STRING(typeargs), "UTF8", 4);
-}
-
-template <typename Impl>
-PyObject* ProtocolBase<Impl>::getEncodedValue() {
-  if (!PycStringIO) {
-    PycString_IMPORT;
-  }
-  if (!PycStringIO) {
-    return NULL;
-  }
-  return PycStringIO->cgetvalue(output_);
-}
-
-template <typename Impl>
-inline bool ProtocolBase<Impl>::writeBuffer(char* data, size_t size) {
-  if (!PycStringIO) {
-    PycString_IMPORT;
-  }
-  if (!PycStringIO) {
-    PyErr_SetString(PyExc_ImportError, "failed to import native cStringIO");
-    return false;
-  }
-  int len = PycStringIO->cwrite(output_, data, size);
-  if (len < 0) {
-    PyErr_SetString(PyExc_IOError, "failed to write to cStringIO object");
-    return false;
-  }
-  if (len != size) {
-    PyErr_Format(PyExc_EOFError, "write length mismatch: expected %lu got %d", size, len);
-    return false;
-  }
-  return true;
-}
-
-#else
-
-namespace detail {
-
-inline bool input_check(PyObject* input) {
-  // TODO: Check for BytesIO type
-  return true;
-}
-
-inline EncodeBuffer* new_encode_buffer(size_t size) {
-  EncodeBuffer* buffer = new EncodeBuffer;
-  buffer->buf.reserve(size);
-  buffer->pos = 0;
-  return buffer;
-}
-
-struct bytesio {
-  PyObject_HEAD
-#if PY_MINOR_VERSION < 5
-      char* buf;
-#else
-      PyObject* buf;
-#endif
-  Py_ssize_t pos;
-  Py_ssize_t string_size;
-};
-
-inline int read_buffer(PyObject* buf, char** output, int len) {
-  bytesio* buf2 = reinterpret_cast<bytesio*>(buf);
-#if PY_MINOR_VERSION < 5
-  *output = buf2->buf + buf2->pos;
-#else
-  *output = PyBytes_AS_STRING(buf2->buf) + buf2->pos;
-#endif
-  Py_ssize_t pos0 = buf2->pos;
-  buf2->pos = std::min(buf2->pos + static_cast<Py_ssize_t>(len), buf2->string_size);
-  return static_cast<int>(buf2->pos - pos0);
-}
-}
-
-template <typename Impl>
-inline ProtocolBase<Impl>::~ProtocolBase() {
-  if (output_) {
-    delete output_;
-  }
-}
-
-template <typename Impl>
-inline bool ProtocolBase<Impl>::isUtf8(PyObject* typeargs) {
-  // while condition for py2 is "arg == 'UTF8'", it should be "arg != 'BINARY'" for py3.
-  // HACK: check the length and don't bother reading the value
-  return !PyUnicode_Check(typeargs) || PyUnicode_GET_LENGTH(typeargs) != 6;
-}
-
-template <typename Impl>
-PyObject* ProtocolBase<Impl>::getEncodedValue() {
-  return PyBytes_FromStringAndSize(output_->buf.data(), output_->buf.size());
-}
-
-template <typename Impl>
-inline bool ProtocolBase<Impl>::writeBuffer(char* data, size_t size) {
-  size_t need = size + output_->pos;
-  if (output_->buf.capacity() < need) {
-    try {
-      output_->buf.reserve(need);
-    } catch (std::bad_alloc& ex) {
-      PyErr_SetString(PyExc_MemoryError, "Failed to allocate write buffer");
-      return false;
-    }
-  }
-  std::copy(data, data + size, std::back_inserter(output_->buf));
-  return true;
-}
-
-#endif
-
-namespace detail {
-
-#define DECLARE_OP_SCOPE(name, op)                                                                 \
-  template <typename Impl>                                                                         \
-  struct name##Scope {                                                                             \
-    Impl* impl;                                                                                    \
-    bool valid;                                                                                    \
-    name##Scope(Impl* thiz) : impl(thiz), valid(impl->op##Begin()) {}                              \
-    ~name##Scope() {                                                                               \
-      if (valid)                                                                                   \
-        impl->op##End();                                                                           \
-    }                                                                                              \
-    operator bool() { return valid; }                                                              \
-  };                                                                                               \
-  template <typename Impl, template <typename> class T>                                            \
-  name##Scope<Impl> op##Scope(T<Impl>* thiz) {                                                     \
-    return name##Scope<Impl>(static_cast<Impl*>(thiz));                                            \
-  }
-DECLARE_OP_SCOPE(WriteStruct, writeStruct)
-DECLARE_OP_SCOPE(ReadStruct, readStruct)
-#undef DECLARE_OP_SCOPE
-
-inline bool check_ssize_t_32(Py_ssize_t len) {
-  // error from getting the int
-  if (INT_CONV_ERROR_OCCURRED(len)) {
-    return false;
-  }
-  if (!CHECK_RANGE(len, 0, std::numeric_limits<int32_t>::max())) {
-    PyErr_SetString(PyExc_OverflowError, "size out of range: exceeded INT32_MAX");
-    return false;
-  }
-  return true;
-}
-}
-
-template <typename T>
-bool parse_pyint(PyObject* o, T* ret, int32_t min, int32_t max) {
-  long val = PyInt_AsLong(o);
-
-  if (INT_CONV_ERROR_OCCURRED(val)) {
-    return false;
-  }
-  if (!CHECK_RANGE(val, min, max)) {
-    PyErr_SetString(PyExc_OverflowError, "int out of range");
-    return false;
-  }
-
-  *ret = static_cast<T>(val);
-  return true;
-}
-
-template <typename Impl>
-inline bool ProtocolBase<Impl>::checkType(TType got, TType expected) {
-  if (expected != got) {
-    PyErr_SetString(PyExc_TypeError, "got wrong ttype while reading field");
-    return false;
-  }
-  return true;
-}
-
-template <typename Impl>
-bool ProtocolBase<Impl>::checkLengthLimit(int32_t len, long limit) {
-  if (len < 0) {
-    PyErr_Format(PyExc_OverflowError, "negative length: %ld", limit);
-    return false;
-  }
-  if (len > limit) {
-    PyErr_Format(PyExc_OverflowError, "size exceeded specified limit: %ld", limit);
-    return false;
-  }
-  return true;
-}
-
-template <typename Impl>
-bool ProtocolBase<Impl>::readBytes(char** output, int len) {
-  if (len < 0) {
-    PyErr_Format(PyExc_ValueError, "attempted to read negative length: %d", len);
-    return false;
-  }
-  // TODO(dreiss): Don't fear the malloc.  Think about taking a copy of
-  //               the partial read instead of forcing the transport
-  //               to prepend it to its buffer.
-
-  int rlen = detail::read_buffer(input_.stringiobuf.get(), output, len);
-
-  if (rlen == len) {
-    return true;
-  } else if (rlen == -1) {
-    return false;
-  } else {
-    // using building functions as this is a rare codepath
-    ScopedPyObject newiobuf(PyObject_CallFunction(input_.refill_callable.get(), refill_signature,
-                                                  *output, rlen, len, NULL));
-    if (!newiobuf) {
-      return false;
-    }
-
-    // must do this *AFTER* the call so that we don't deref the io buffer
-    input_.stringiobuf.reset(newiobuf.release());
-
-    rlen = detail::read_buffer(input_.stringiobuf.get(), output, len);
-
-    if (rlen == len) {
-      return true;
-    } else if (rlen == -1) {
-      return false;
-    } else {
-      // TODO(dreiss): This could be a valid code path for big binary blobs.
-      PyErr_SetString(PyExc_TypeError, "refill claimed to have refilled the buffer, but didn't!!");
-      return false;
-    }
-  }
-}
-
-template <typename Impl>
-bool ProtocolBase<Impl>::prepareDecodeBufferFromTransport(PyObject* trans) {
-  if (input_.stringiobuf) {
-    PyErr_SetString(PyExc_ValueError, "decode buffer is already initialized");
-    return false;
-  }
-
-  ScopedPyObject stringiobuf(PyObject_GetAttr(trans, INTERN_STRING(cstringio_buf)));
-  if (!stringiobuf) {
-    return false;
-  }
-  if (!detail::input_check(stringiobuf.get())) {
-    PyErr_SetString(PyExc_TypeError, "expecting stringio input_");
-    return false;
-  }
-
-  ScopedPyObject refill_callable(PyObject_GetAttr(trans, INTERN_STRING(cstringio_refill)));
-  if (!refill_callable) {
-    return false;
-  }
-  if (!PyCallable_Check(refill_callable.get())) {
-    PyErr_SetString(PyExc_TypeError, "expecting callable");
-    return false;
-  }
-
-  input_.stringiobuf.swap(stringiobuf);
-  input_.refill_callable.swap(refill_callable);
-  return true;
-}
-
-template <typename Impl>
-bool ProtocolBase<Impl>::prepareEncodeBuffer() {
-  output_ = detail::new_encode_buffer(INIT_OUTBUF_SIZE);
-  return output_ != NULL;
-}
-
-template <typename Impl>
-bool ProtocolBase<Impl>::encodeValue(PyObject* value, TType type, PyObject* typeargs) {
-  /*
-   * Refcounting Strategy:
-   *
-   * We assume that elements of the thrift_spec tuple are not going to be
-   * mutated, so we don't ref count those at all. Other than that, we try to
-   * keep a reference to all the user-created objects while we work with them.
-   * encodeValue assumes that a reference is already held. The *caller* is
-   * responsible for handling references
-   */
-
-  switch (type) {
-
-  case T_BOOL: {
-    int v = PyObject_IsTrue(value);
-    if (v == -1) {
-      return false;
-    }
-    impl()->writeBool(v);
-    return true;
-  }
-  case T_I08: {
-    int8_t val;
-
-    if (!parse_pyint(value, &val, std::numeric_limits<int8_t>::min(),
-                     std::numeric_limits<int8_t>::max())) {
-      return false;
-    }
-
-    impl()->writeI8(val);
-    return true;
-  }
-  case T_I16: {
-    int16_t val;
-
-    if (!parse_pyint(value, &val, std::numeric_limits<int16_t>::min(),
-                     std::numeric_limits<int16_t>::max())) {
-      return false;
-    }
-
-    impl()->writeI16(val);
-    return true;
-  }
-  case T_I32: {
-    int32_t val;
-
-    if (!parse_pyint(value, &val, std::numeric_limits<int32_t>::min(),
-                     std::numeric_limits<int32_t>::max())) {
-      return false;
-    }
-
-    impl()->writeI32(val);
-    return true;
-  }
-  case T_I64: {
-    int64_t nval = PyLong_AsLongLong(value);
-
-    if (INT_CONV_ERROR_OCCURRED(nval)) {
-      return false;
-    }
-
-    if (!CHECK_RANGE(nval, std::numeric_limits<int64_t>::min(),
-                     std::numeric_limits<int64_t>::max())) {
-      PyErr_SetString(PyExc_OverflowError, "int out of range");
-      return false;
-    }
-
-    impl()->writeI64(nval);
-    return true;
-  }
-
-  case T_DOUBLE: {
-    double nval = PyFloat_AsDouble(value);
-    if (nval == -1.0 && PyErr_Occurred()) {
-      return false;
-    }
-
-    impl()->writeDouble(nval);
-    return true;
-  }
-
-  case T_STRING: {
-    ScopedPyObject nval;
-
-    if (PyUnicode_Check(value)) {
-      nval.reset(PyUnicode_AsUTF8String(value));
-      if (!nval) {
-        return false;
-      }
-    } else {
-      Py_INCREF(value);
-      nval.reset(value);
-    }
-
-    Py_ssize_t len = PyBytes_Size(nval.get());
-    if (!detail::check_ssize_t_32(len)) {
-      return false;
-    }
-
-    impl()->writeString(nval.get(), static_cast<int32_t>(len));
-    return true;
-  }
-
-  case T_LIST:
-  case T_SET: {
-    SetListTypeArgs parsedargs;
-    if (!parse_set_list_args(&parsedargs, typeargs)) {
-      return false;
-    }
-
-    Py_ssize_t len = PyObject_Length(value);
-    if (!detail::check_ssize_t_32(len)) {
-      return false;
-    }
-
-    if (!impl()->writeListBegin(value, parsedargs, static_cast<int32_t>(len)) || PyErr_Occurred()) {
-      return false;
-    }
-    ScopedPyObject iterator(PyObject_GetIter(value));
-    if (!iterator) {
-      return false;
-    }
-
-    while (PyObject* rawItem = PyIter_Next(iterator.get())) {
-      ScopedPyObject item(rawItem);
-      if (!encodeValue(item.get(), parsedargs.element_type, parsedargs.typeargs)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  case T_MAP: {
-    Py_ssize_t len = PyDict_Size(value);
-    if (!detail::check_ssize_t_32(len)) {
-      return false;
-    }
-
-    MapTypeArgs parsedargs;
-    if (!parse_map_args(&parsedargs, typeargs)) {
-      return false;
-    }
-
-    if (!impl()->writeMapBegin(value, parsedargs, static_cast<int32_t>(len)) || PyErr_Occurred()) {
-      return false;
-    }
-    Py_ssize_t pos = 0;
-    PyObject* k = NULL;
-    PyObject* v = NULL;
-    // TODO(bmaurer): should support any mapping, not just dicts
-    while (PyDict_Next(value, &pos, &k, &v)) {
-      if (!encodeValue(k, parsedargs.ktag, parsedargs.ktypeargs)
-          || !encodeValue(v, parsedargs.vtag, parsedargs.vtypeargs)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  case T_STRUCT: {
-    StructTypeArgs parsedargs;
-    if (!parse_struct_args(&parsedargs, typeargs)) {
-      return false;
-    }
-
-    Py_ssize_t nspec = PyTuple_Size(parsedargs.spec);
-    if (nspec == -1) {
-      PyErr_SetString(PyExc_TypeError, "spec is not a tuple");
-      return false;
-    }
-
-    detail::WriteStructScope<Impl> scope = detail::writeStructScope(this);
-    if (!scope) {
-      return false;
-    }
-    for (Py_ssize_t i = 0; i < nspec; i++) {
-      PyObject* spec_tuple = PyTuple_GET_ITEM(parsedargs.spec, i);
-      if (spec_tuple == Py_None) {
-        continue;
-      }
-
-      StructItemSpec parsedspec;
-      if (!parse_struct_item_spec(&parsedspec, spec_tuple)) {
-        return false;
-      }
-
-      ScopedPyObject instval(PyObject_GetAttr(value, parsedspec.attrname));
-
-      if (!instval) {
-        return false;
-      }
-
-      if (instval.get() == Py_None) {
-        continue;
-      }
-
-      bool res = impl()->writeField(instval.get(), parsedspec);
-      if (!res) {
-        return false;
-      }
-    }
-    impl()->writeFieldStop();
-    return true;
-  }
-
-  case T_STOP:
-  case T_VOID:
-  case T_UTF16:
-  case T_UTF8:
-  case T_U64:
-  default:
-    PyErr_Format(PyExc_TypeError, "Unexpected TType for encodeValue: %d", type);
-    return false;
-  }
-
-  return true;
-}
-
-template <typename Impl>
-bool ProtocolBase<Impl>::skip(TType type) {
-  switch (type) {
-  case T_BOOL:
-    return impl()->skipBool();
-  case T_I08:
-    return impl()->skipByte();
-  case T_I16:
-    return impl()->skipI16();
-  case T_I32:
-    return impl()->skipI32();
-  case T_I64:
-    return impl()->skipI64();
-  case T_DOUBLE:
-    return impl()->skipDouble();
-
-  case T_STRING: {
-    return impl()->skipString();
-  }
-
-  case T_LIST:
-  case T_SET: {
-    TType etype = T_STOP;
-    int32_t len = impl()->readListBegin(etype);
-    if (len < 0) {
-      return false;
-    }
-    for (int32_t i = 0; i < len; i++) {
-      if (!skip(etype)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  case T_MAP: {
-    TType ktype = T_STOP;
-    TType vtype = T_STOP;
-    int32_t len = impl()->readMapBegin(ktype, vtype);
-    if (len < 0) {
-      return false;
-    }
-    for (int32_t i = 0; i < len; i++) {
-      if (!skip(ktype) || !skip(vtype)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  case T_STRUCT: {
-    detail::ReadStructScope<Impl> scope = detail::readStructScope(this);
-    if (!scope) {
-      return false;
-    }
-    while (true) {
-      TType type = T_STOP;
-      int16_t tag;
-      if (!impl()->readFieldBegin(type, tag)) {
-        return false;
-      }
-      if (type == T_STOP) {
-        return true;
-      }
-      if (!skip(type)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  case T_STOP:
-  case T_VOID:
-  case T_UTF16:
-  case T_UTF8:
-  case T_U64:
-  default:
-    PyErr_Format(PyExc_TypeError, "Unexpected TType for skip: %d", type);
-    return false;
-  }
-
-  return true;
-}
-
-// Returns a new reference.
-template <typename Impl>
-PyObject* ProtocolBase<Impl>::decodeValue(TType type, PyObject* typeargs) {
-  switch (type) {
-
-  case T_BOOL: {
-    bool v = 0;
-    if (!impl()->readBool(v)) {
-      return NULL;
-    }
-    if (v) {
-      Py_RETURN_TRUE;
-    } else {
-      Py_RETURN_FALSE;
-    }
-  }
-  case T_I08: {
-    int8_t v = 0;
-    if (!impl()->readI8(v)) {
-      return NULL;
-    }
-    return PyInt_FromLong(v);
-  }
-  case T_I16: {
-    int16_t v = 0;
-    if (!impl()->readI16(v)) {
-      return NULL;
-    }
-    return PyInt_FromLong(v);
-  }
-  case T_I32: {
-    int32_t v = 0;
-    if (!impl()->readI32(v)) {
-      return NULL;
-    }
-    return PyInt_FromLong(v);
-  }
-
-  case T_I64: {
-    int64_t v = 0;
-    if (!impl()->readI64(v)) {
-      return NULL;
-    }
-    // TODO(dreiss): Find out if we can take this fastpath always when
-    //               sizeof(long) == sizeof(long long).
-    if (CHECK_RANGE(v, LONG_MIN, LONG_MAX)) {
-      return PyInt_FromLong((long)v);
-    }
-    return PyLong_FromLongLong(v);
-  }
-
-  case T_DOUBLE: {
-    double v = 0.0;
-    if (!impl()->readDouble(v)) {
-      return NULL;
-    }
-    return PyFloat_FromDouble(v);
-  }
-
-  case T_STRING: {
-    char* buf = NULL;
-    int len = impl()->readString(&buf);
-    if (len < 0) {
-      return NULL;
-    }
-    if (isUtf8(typeargs)) {
-      return PyUnicode_DecodeUTF8(buf, len, 0);
-    } else {
-      return PyBytes_FromStringAndSize(buf, len);
-    }
-  }
-
-  case T_LIST:
-  case T_SET: {
-    SetListTypeArgs parsedargs;
-    if (!parse_set_list_args(&parsedargs, typeargs)) {
-      return NULL;
-    }
-
-    TType etype = T_STOP;
-    int32_t len = impl()->readListBegin(etype);
-    if (len < 0) {
-      return NULL;
-    }
-    if (len > 0 && !checkType(etype, parsedargs.element_type)) {
-      return NULL;
-    }
-
-    bool use_tuple = type == T_LIST && parsedargs.immutable;
-    ScopedPyObject ret(use_tuple ? PyTuple_New(len) : PyList_New(len));
-    if (!ret) {
-      return NULL;
-    }
-
-    for (int i = 0; i < len; i++) {
-      PyObject* item = decodeValue(etype, parsedargs.typeargs);
-      if (!item) {
-        return NULL;
-      }
-      if (use_tuple) {
-        PyTuple_SET_ITEM(ret.get(), i, item);
-      } else {
-        PyList_SET_ITEM(ret.get(), i, item);
-      }
-    }
-
-    // TODO(dreiss): Consider biting the bullet and making two separate cases
-    //               for list and set, avoiding this post facto conversion.
-    if (type == T_SET) {
-      PyObject* setret;
-      setret = parsedargs.immutable ? PyFrozenSet_New(ret.get()) : PySet_New(ret.get());
-      return setret;
-    }
-    return ret.release();
-  }
-
-  case T_MAP: {
-    MapTypeArgs parsedargs;
-    if (!parse_map_args(&parsedargs, typeargs)) {
-      return NULL;
-    }
-
-    TType ktype = T_STOP;
-    TType vtype = T_STOP;
-    uint32_t len = impl()->readMapBegin(ktype, vtype);
-    if (len > 0 && (!checkType(ktype, parsedargs.ktag) || !checkType(vtype, parsedargs.vtag))) {
-      return NULL;
-    }
-
-    ScopedPyObject ret(PyDict_New());
-    if (!ret) {
-      return NULL;
-    }
-
-    for (uint32_t i = 0; i < len; i++) {
-      ScopedPyObject k(decodeValue(ktype, parsedargs.ktypeargs));
-      if (!k) {
-        return NULL;
-      }
-      ScopedPyObject v(decodeValue(vtype, parsedargs.vtypeargs));
-      if (!v) {
-        return NULL;
-      }
-      if (PyDict_SetItem(ret.get(), k.get(), v.get()) == -1) {
-        return NULL;
-      }
-    }
-
-    if (parsedargs.immutable) {
-      if (!ThriftModule) {
-        ThriftModule = PyImport_ImportModule("thrift.Thrift");
-      }
-      if (!ThriftModule) {
-        return NULL;
-      }
-
-      ScopedPyObject cls(PyObject_GetAttr(ThriftModule, INTERN_STRING(TFrozenDict)));
-      if (!cls) {
-        return NULL;
-      }
-
-      ScopedPyObject arg(PyTuple_New(1));
-      PyTuple_SET_ITEM(arg.get(), 0, ret.release());
-      ret.reset(PyObject_CallObject(cls.get(), arg.get()));
-    }
-
-    return ret.release();
-  }
-
-  case T_STRUCT: {
-    StructTypeArgs parsedargs;
-    if (!parse_struct_args(&parsedargs, typeargs)) {
-      return NULL;
-    }
-    return readStruct(Py_None, parsedargs.klass, parsedargs.spec);
-  }
-
-  case T_STOP:
-  case T_VOID:
-  case T_UTF16:
-  case T_UTF8:
-  case T_U64:
-  default:
-    PyErr_Format(PyExc_TypeError, "Unexpected TType for decodeValue: %d", type);
-    return NULL;
-  }
-}
-
-template <typename Impl>
-PyObject* ProtocolBase<Impl>::readStruct(PyObject* output, PyObject* klass, PyObject* spec_seq) {
-  int spec_seq_len = PyTuple_Size(spec_seq);
-  bool immutable = output == Py_None;
-  ScopedPyObject kwargs;
-  if (spec_seq_len == -1) {
-    return NULL;
-  }
-
-  if (immutable) {
-    kwargs.reset(PyDict_New());
-    if (!kwargs) {
-      PyErr_SetString(PyExc_TypeError, "failed to prepare kwargument storage");
-      return NULL;
-    }
-  }
-
-  detail::ReadStructScope<Impl> scope = detail::readStructScope(this);
-  if (!scope) {
-    return NULL;
-  }
-  while (true) {
-    TType type = T_STOP;
-    int16_t tag;
-    if (!impl()->readFieldBegin(type, tag)) {
-      return NULL;
-    }
-    if (type == T_STOP) {
-      break;
-    }
-    if (tag < 0 || tag >= spec_seq_len) {
-      if (!skip(type)) {
-        PyErr_SetString(PyExc_TypeError, "Error while skipping unknown field");
-        return NULL;
-      }
-      continue;
-    }
-
-    PyObject* item_spec = PyTuple_GET_ITEM(spec_seq, tag);
-    if (item_spec == Py_None) {
-      if (!skip(type)) {
-        PyErr_SetString(PyExc_TypeError, "Error while skipping unknown field");
-        return NULL;
-      }
-      continue;
-    }
-    StructItemSpec parsedspec;
-    if (!parse_struct_item_spec(&parsedspec, item_spec)) {
-      return NULL;
-    }
-    if (parsedspec.type != type) {
-      if (!skip(type)) {
-        PyErr_Format(PyExc_TypeError, "struct field had wrong type: expected %d but got %d",
-                     parsedspec.type, type);
-        return NULL;
-      }
-      continue;
-    }
-
-    ScopedPyObject fieldval(decodeValue(parsedspec.type, parsedspec.typeargs));
-    if (!fieldval) {
-      return NULL;
-    }
-
-    if ((immutable && PyDict_SetItem(kwargs.get(), parsedspec.attrname, fieldval.get()) == -1)
-        || (!immutable && PyObject_SetAttr(output, parsedspec.attrname, fieldval.get()) == -1)) {
-      return NULL;
-    }
-  }
-  if (immutable) {
-    ScopedPyObject args(PyTuple_New(0));
-    if (!args) {
-      PyErr_SetString(PyExc_TypeError, "failed to prepare argument storage");
-      return NULL;
-    }
-    return PyObject_Call(klass, args.get(), kwargs.get());
-  }
-  Py_INCREF(output);
-  return output;
-}
-}
-}
-}
-#endif // THRIFT_PY_PROTOCOL_H
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/types.cpp b/vendor/git.apache.org/thrift.git/lib/py/src/ext/types.cpp
deleted file mode 100644
index 849ab2f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/types.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "ext/types.h"
-#include "ext/protocol.h"
-
-namespace apache {
-namespace thrift {
-namespace py {
-
-PyObject* ThriftModule = NULL;
-
-#if PY_MAJOR_VERSION < 3
-char refill_signature[] = {'s', '#', 'i'};
-#else
-const char* refill_signature = "y#i";
-#endif
-
-bool parse_struct_item_spec(StructItemSpec* dest, PyObject* spec_tuple) {
-  // i'd like to use ParseArgs here, but it seems to be a bottleneck.
-  if (PyTuple_Size(spec_tuple) != 5) {
-    PyErr_Format(PyExc_TypeError, "expecting 5 arguments for spec tuple but got %d",
-                 static_cast<int>(PyTuple_Size(spec_tuple)));
-    return false;
-  }
-
-  dest->tag = static_cast<TType>(PyInt_AsLong(PyTuple_GET_ITEM(spec_tuple, 0)));
-  if (INT_CONV_ERROR_OCCURRED(dest->tag)) {
-    return false;
-  }
-
-  dest->type = static_cast<TType>(PyInt_AsLong(PyTuple_GET_ITEM(spec_tuple, 1)));
-  if (INT_CONV_ERROR_OCCURRED(dest->type)) {
-    return false;
-  }
-
-  dest->attrname = PyTuple_GET_ITEM(spec_tuple, 2);
-  dest->typeargs = PyTuple_GET_ITEM(spec_tuple, 3);
-  dest->defval = PyTuple_GET_ITEM(spec_tuple, 4);
-  return true;
-}
-
-bool parse_set_list_args(SetListTypeArgs* dest, PyObject* typeargs) {
-  if (PyTuple_Size(typeargs) != 3) {
-    PyErr_SetString(PyExc_TypeError, "expecting tuple of size 3 for list/set type args");
-    return false;
-  }
-
-  dest->element_type = static_cast<TType>(PyInt_AsLong(PyTuple_GET_ITEM(typeargs, 0)));
-  if (INT_CONV_ERROR_OCCURRED(dest->element_type)) {
-    return false;
-  }
-
-  dest->typeargs = PyTuple_GET_ITEM(typeargs, 1);
-
-  dest->immutable = Py_True == PyTuple_GET_ITEM(typeargs, 2);
-
-  return true;
-}
-
-bool parse_map_args(MapTypeArgs* dest, PyObject* typeargs) {
-  if (PyTuple_Size(typeargs) != 5) {
-    PyErr_SetString(PyExc_TypeError, "expecting 5 arguments for typeargs to map");
-    return false;
-  }
-
-  dest->ktag = static_cast<TType>(PyInt_AsLong(PyTuple_GET_ITEM(typeargs, 0)));
-  if (INT_CONV_ERROR_OCCURRED(dest->ktag)) {
-    return false;
-  }
-
-  dest->vtag = static_cast<TType>(PyInt_AsLong(PyTuple_GET_ITEM(typeargs, 2)));
-  if (INT_CONV_ERROR_OCCURRED(dest->vtag)) {
-    return false;
-  }
-
-  dest->ktypeargs = PyTuple_GET_ITEM(typeargs, 1);
-  dest->vtypeargs = PyTuple_GET_ITEM(typeargs, 3);
-  dest->immutable = Py_True == PyTuple_GET_ITEM(typeargs, 4);
-
-  return true;
-}
-
-bool parse_struct_args(StructTypeArgs* dest, PyObject* typeargs) {
-  if (PyTuple_Size(typeargs) != 2) {
-    PyErr_SetString(PyExc_TypeError, "expecting tuple of size 2 for struct args");
-    return false;
-  }
-
-  dest->klass = PyTuple_GET_ITEM(typeargs, 0);
-  dest->spec = PyTuple_GET_ITEM(typeargs, 1);
-
-  return true;
-}
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/ext/types.h b/vendor/git.apache.org/thrift.git/lib/py/src/ext/types.h
deleted file mode 100644
index 2fc9d9c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/ext/types.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef THRIFT_PY_TYPES_H
-#define THRIFT_PY_TYPES_H
-
-#include <Python.h>
-
-#ifdef _MSC_VER
-#define __STDC_LIMIT_MACROS
-#endif
-#include <stdint.h>
-
-#if PY_MAJOR_VERSION >= 3
-
-#include <vector>
-
-// TODO: better macros
-#define PyInt_AsLong(v) PyLong_AsLong(v)
-#define PyInt_FromLong(v) PyLong_FromLong(v)
-
-#define PyString_InternFromString(v) PyUnicode_InternFromString(v)
-
-#endif
-
-#define INTERN_STRING(value) _intern_##value
-
-#define INT_CONV_ERROR_OCCURRED(v) (((v) == -1) && PyErr_Occurred())
-
-extern "C" {
-extern PyObject* INTERN_STRING(TFrozenDict);
-extern PyObject* INTERN_STRING(cstringio_buf);
-extern PyObject* INTERN_STRING(cstringio_refill);
-}
-
-namespace apache {
-namespace thrift {
-namespace py {
-
-extern PyObject* ThriftModule;
-
-// Stolen out of TProtocol.h.
-// It would be a huge pain to have both get this from one place.
-enum TType {
-  T_INVALID = -1,
-  T_STOP = 0,
-  T_VOID = 1,
-  T_BOOL = 2,
-  T_BYTE = 3,
-  T_I08 = 3,
-  T_I16 = 6,
-  T_I32 = 8,
-  T_U64 = 9,
-  T_I64 = 10,
-  T_DOUBLE = 4,
-  T_STRING = 11,
-  T_UTF7 = 11,
-  T_STRUCT = 12,
-  T_MAP = 13,
-  T_SET = 14,
-  T_LIST = 15,
-  T_UTF8 = 16,
-  T_UTF16 = 17
-};
-
-// replace with unique_ptr when we're OK with C++11
-class ScopedPyObject {
-public:
-  ScopedPyObject() : obj_(NULL) {}
-  explicit ScopedPyObject(PyObject* py_object) : obj_(py_object) {}
-  ~ScopedPyObject() {
-    if (obj_)
-      Py_DECREF(obj_);
-  }
-  PyObject* get() throw() { return obj_; }
-  operator bool() { return obj_; }
-  void reset(PyObject* py_object) throw() {
-    if (obj_)
-      Py_DECREF(obj_);
-    obj_ = py_object;
-  }
-  PyObject* release() throw() {
-    PyObject* tmp = obj_;
-    obj_ = NULL;
-    return tmp;
-  }
-  void swap(ScopedPyObject& other) throw() {
-    ScopedPyObject tmp(other.release());
-    other.reset(release());
-    reset(tmp.release());
-  }
-
-private:
-  ScopedPyObject(const ScopedPyObject&) {}
-  ScopedPyObject& operator=(const ScopedPyObject&) { return *this; }
-
-  PyObject* obj_;
-};
-
-/**
- * A cache of the two key attributes of a CReadableTransport,
- * so we don't have to keep calling PyObject_GetAttr.
- */
-struct DecodeBuffer {
-  ScopedPyObject stringiobuf;
-  ScopedPyObject refill_callable;
-};
-
-#if PY_MAJOR_VERSION < 3
-extern char refill_signature[3];
-typedef PyObject EncodeBuffer;
-#else
-extern const char* refill_signature;
-struct EncodeBuffer {
-  std::vector<char> buf;
-  size_t pos;
-};
-#endif
-
-/**
- * A cache of the spec_args for a set or list,
- * so we don't have to keep calling PyTuple_GET_ITEM.
- */
-struct SetListTypeArgs {
-  TType element_type;
-  PyObject* typeargs;
-  bool immutable;
-};
-
-/**
- * A cache of the spec_args for a map,
- * so we don't have to keep calling PyTuple_GET_ITEM.
- */
-struct MapTypeArgs {
-  TType ktag;
-  TType vtag;
-  PyObject* ktypeargs;
-  PyObject* vtypeargs;
-  bool immutable;
-};
-
-/**
- * A cache of the spec_args for a struct,
- * so we don't have to keep calling PyTuple_GET_ITEM.
- */
-struct StructTypeArgs {
-  PyObject* klass;
-  PyObject* spec;
-  bool immutable;
-};
-
-/**
- * A cache of the item spec from a struct specification,
- * so we don't have to keep calling PyTuple_GET_ITEM.
- */
-struct StructItemSpec {
-  int tag;
-  TType type;
-  PyObject* attrname;
-  PyObject* typeargs;
-  PyObject* defval;
-};
-
-bool parse_set_list_args(SetListTypeArgs* dest, PyObject* typeargs);
-
-bool parse_map_args(MapTypeArgs* dest, PyObject* typeargs);
-
-bool parse_struct_args(StructTypeArgs* dest, PyObject* typeargs);
-
-bool parse_struct_item_spec(StructItemSpec* dest, PyObject* spec_tuple);
-}
-}
-}
-
-#endif // THRIFT_PY_TYPES_H
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TBase.py b/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TBase.py
deleted file mode 100644
index 55da19e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TBase.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from thrift.transport import TTransport
-
-
-class TBase(object):
-    __slots__ = ()
-
-    def __repr__(self):
-        L = ['%s=%r' % (key, getattr(self, key)) for key in self.__slots__]
-        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
-    def __eq__(self, other):
-        if not isinstance(other, self.__class__):
-            return False
-        for attr in self.__slots__:
-            my_val = getattr(self, attr)
-            other_val = getattr(other, attr)
-            if my_val != other_val:
-                return False
-        return True
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def read(self, iprot):
-        if (iprot._fast_decode is not None and
-                isinstance(iprot.trans, TTransport.CReadableTransport) and
-                self.thrift_spec is not None):
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
-        else:
-            iprot.readStruct(self, self.thrift_spec)
-
-    def write(self, oprot):
-        if (oprot._fast_encode is not None and self.thrift_spec is not None):
-            oprot.trans.write(
-                oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
-        else:
-            oprot.writeStruct(self, self.thrift_spec)
-
-
-class TExceptionBase(TBase, Exception):
-    pass
-
-
-class TFrozenBase(TBase):
-    def __setitem__(self, *args):
-        raise TypeError("Can't modify frozen struct")
-
-    def __delitem__(self, *args):
-        raise TypeError("Can't modify frozen struct")
-
-    def __hash__(self, *args):
-        return hash(self.__class__) ^ hash(self.__slots__)
-
-    @classmethod
-    def read(cls, iprot):
-        if (iprot._fast_decode is not None and
-                isinstance(iprot.trans, TTransport.CReadableTransport) and
-                cls.thrift_spec is not None):
-            self = cls()
-            return iprot._fast_decode(None, iprot,
-                                      (self.__class__, self.thrift_spec))
-        else:
-            return iprot.readStruct(cls, cls.thrift_spec, True)
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TBinaryProtocol.py b/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TBinaryProtocol.py
deleted file mode 100644
index f6be772..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TBinaryProtocol.py
+++ /dev/null
@@ -1,301 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from .TProtocol import TType, TProtocolBase, TProtocolException
-from struct import pack, unpack
-
-
-class TBinaryProtocol(TProtocolBase):
-    """Binary implementation of the Thrift protocol driver."""
-
-    # NastyHaxx. Python 2.4+ on 32-bit machines forces hex constants to be
-    # positive, converting this into a long. If we hardcode the int value
-    # instead it'll stay in 32 bit-land.
-
-    # VERSION_MASK = 0xffff0000
-    VERSION_MASK = -65536
-
-    # VERSION_1 = 0x80010000
-    VERSION_1 = -2147418112
-
-    TYPE_MASK = 0x000000ff
-
-    def __init__(self, trans, strictRead=False, strictWrite=True, **kwargs):
-        TProtocolBase.__init__(self, trans)
-        self.strictRead = strictRead
-        self.strictWrite = strictWrite
-        self.string_length_limit = kwargs.get('string_length_limit', None)
-        self.container_length_limit = kwargs.get('container_length_limit', None)
-
-    def _check_string_length(self, length):
-        self._check_length(self.string_length_limit, length)
-
-    def _check_container_length(self, length):
-        self._check_length(self.container_length_limit, length)
-
-    def writeMessageBegin(self, name, type, seqid):
-        if self.strictWrite:
-            self.writeI32(TBinaryProtocol.VERSION_1 | type)
-            self.writeString(name)
-            self.writeI32(seqid)
-        else:
-            self.writeString(name)
-            self.writeByte(type)
-            self.writeI32(seqid)
-
-    def writeMessageEnd(self):
-        pass
-
-    def writeStructBegin(self, name):
-        pass
-
-    def writeStructEnd(self):
-        pass
-
-    def writeFieldBegin(self, name, type, id):
-        self.writeByte(type)
-        self.writeI16(id)
-
-    def writeFieldEnd(self):
-        pass
-
-    def writeFieldStop(self):
-        self.writeByte(TType.STOP)
-
-    def writeMapBegin(self, ktype, vtype, size):
-        self.writeByte(ktype)
-        self.writeByte(vtype)
-        self.writeI32(size)
-
-    def writeMapEnd(self):
-        pass
-
-    def writeListBegin(self, etype, size):
-        self.writeByte(etype)
-        self.writeI32(size)
-
-    def writeListEnd(self):
-        pass
-
-    def writeSetBegin(self, etype, size):
-        self.writeByte(etype)
-        self.writeI32(size)
-
-    def writeSetEnd(self):
-        pass
-
-    def writeBool(self, bool):
-        if bool:
-            self.writeByte(1)
-        else:
-            self.writeByte(0)
-
-    def writeByte(self, byte):
-        buff = pack("!b", byte)
-        self.trans.write(buff)
-
-    def writeI16(self, i16):
-        buff = pack("!h", i16)
-        self.trans.write(buff)
-
-    def writeI32(self, i32):
-        buff = pack("!i", i32)
-        self.trans.write(buff)
-
-    def writeI64(self, i64):
-        buff = pack("!q", i64)
-        self.trans.write(buff)
-
-    def writeDouble(self, dub):
-        buff = pack("!d", dub)
-        self.trans.write(buff)
-
-    def writeBinary(self, str):
-        self.writeI32(len(str))
-        self.trans.write(str)
-
-    def readMessageBegin(self):
-        sz = self.readI32()
-        if sz < 0:
-            version = sz & TBinaryProtocol.VERSION_MASK
-            if version != TBinaryProtocol.VERSION_1:
-                raise TProtocolException(
-                    type=TProtocolException.BAD_VERSION,
-                    message='Bad version in readMessageBegin: %d' % (sz))
-            type = sz & TBinaryProtocol.TYPE_MASK
-            name = self.readString()
-            seqid = self.readI32()
-        else:
-            if self.strictRead:
-                raise TProtocolException(type=TProtocolException.BAD_VERSION,
-                                         message='No protocol version header')
-            name = self.trans.readAll(sz)
-            type = self.readByte()
-            seqid = self.readI32()
-        return (name, type, seqid)
-
-    def readMessageEnd(self):
-        pass
-
-    def readStructBegin(self):
-        pass
-
-    def readStructEnd(self):
-        pass
-
-    def readFieldBegin(self):
-        type = self.readByte()
-        if type == TType.STOP:
-            return (None, type, 0)
-        id = self.readI16()
-        return (None, type, id)
-
-    def readFieldEnd(self):
-        pass
-
-    def readMapBegin(self):
-        ktype = self.readByte()
-        vtype = self.readByte()
-        size = self.readI32()
-        self._check_container_length(size)
-        return (ktype, vtype, size)
-
-    def readMapEnd(self):
-        pass
-
-    def readListBegin(self):
-        etype = self.readByte()
-        size = self.readI32()
-        self._check_container_length(size)
-        return (etype, size)
-
-    def readListEnd(self):
-        pass
-
-    def readSetBegin(self):
-        etype = self.readByte()
-        size = self.readI32()
-        self._check_container_length(size)
-        return (etype, size)
-
-    def readSetEnd(self):
-        pass
-
-    def readBool(self):
-        byte = self.readByte()
-        if byte == 0:
-            return False
-        return True
-
-    def readByte(self):
-        buff = self.trans.readAll(1)
-        val, = unpack('!b', buff)
-        return val
-
-    def readI16(self):
-        buff = self.trans.readAll(2)
-        val, = unpack('!h', buff)
-        return val
-
-    def readI32(self):
-        buff = self.trans.readAll(4)
-        val, = unpack('!i', buff)
-        return val
-
-    def readI64(self):
-        buff = self.trans.readAll(8)
-        val, = unpack('!q', buff)
-        return val
-
-    def readDouble(self):
-        buff = self.trans.readAll(8)
-        val, = unpack('!d', buff)
-        return val
-
-    def readBinary(self):
-        size = self.readI32()
-        self._check_string_length(size)
-        s = self.trans.readAll(size)
-        return s
-
-
-class TBinaryProtocolFactory(object):
-    def __init__(self, strictRead=False, strictWrite=True, **kwargs):
-        self.strictRead = strictRead
-        self.strictWrite = strictWrite
-        self.string_length_limit = kwargs.get('string_length_limit', None)
-        self.container_length_limit = kwargs.get('container_length_limit', None)
-
-    def getProtocol(self, trans):
-        prot = TBinaryProtocol(trans, self.strictRead, self.strictWrite,
-                               string_length_limit=self.string_length_limit,
-                               container_length_limit=self.container_length_limit)
-        return prot
-
-
-class TBinaryProtocolAccelerated(TBinaryProtocol):
-    """C-Accelerated version of TBinaryProtocol.
-
-    This class does not override any of TBinaryProtocol's methods,
-    but the generated code recognizes it directly and will call into
-    our C module to do the encoding, bypassing this object entirely.
-    We inherit from TBinaryProtocol so that the normal TBinaryProtocol
-    encoding can happen if the fastbinary module doesn't work for some
-    reason.  (TODO(dreiss): Make this happen sanely in more cases.)
-    To disable this behavior, pass fallback=False constructor argument.
-
-    In order to take advantage of the C module, just use
-    TBinaryProtocolAccelerated instead of TBinaryProtocol.
-
-    NOTE:  This code was contributed by an external developer.
-           The internal Thrift team has reviewed and tested it,
-           but we cannot guarantee that it is production-ready.
-           Please feel free to report bugs and/or success stories
-           to the public mailing list.
-    """
-    pass
-
-    def __init__(self, *args, **kwargs):
-        fallback = kwargs.pop('fallback', True)
-        super(TBinaryProtocolAccelerated, self).__init__(*args, **kwargs)
-        try:
-            from thrift.protocol import fastbinary
-        except ImportError:
-            if not fallback:
-                raise
-        else:
-            self._fast_decode = fastbinary.decode_binary
-            self._fast_encode = fastbinary.encode_binary
-
-
-class TBinaryProtocolAcceleratedFactory(object):
-    def __init__(self,
-                 string_length_limit=None,
-                 container_length_limit=None,
-                 fallback=True):
-        self.string_length_limit = string_length_limit
-        self.container_length_limit = container_length_limit
-        self._fallback = fallback
-
-    def getProtocol(self, trans):
-        return TBinaryProtocolAccelerated(
-            trans,
-            string_length_limit=self.string_length_limit,
-            container_length_limit=self.container_length_limit,
-            fallback=self._fallback)
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TCompactProtocol.py b/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TCompactProtocol.py
deleted file mode 100644
index 16fd9be..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TCompactProtocol.py
+++ /dev/null
@@ -1,472 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from .TProtocol import TType, TProtocolBase, TProtocolException, checkIntegerLimits
-from struct import pack, unpack
-
-from ..compat import binary_to_str, str_to_binary
-
-__all__ = ['TCompactProtocol', 'TCompactProtocolFactory']
-
-CLEAR = 0
-FIELD_WRITE = 1
-VALUE_WRITE = 2
-CONTAINER_WRITE = 3
-BOOL_WRITE = 4
-FIELD_READ = 5
-CONTAINER_READ = 6
-VALUE_READ = 7
-BOOL_READ = 8
-
-
-def make_helper(v_from, container):
-    def helper(func):
-        def nested(self, *args, **kwargs):
-            assert self.state in (v_from, container), (self.state, v_from, container)
-            return func(self, *args, **kwargs)
-        return nested
-    return helper
-writer = make_helper(VALUE_WRITE, CONTAINER_WRITE)
-reader = make_helper(VALUE_READ, CONTAINER_READ)
-
-
-def makeZigZag(n, bits):
-    checkIntegerLimits(n, bits)
-    return (n << 1) ^ (n >> (bits - 1))
-
-
-def fromZigZag(n):
-    return (n >> 1) ^ -(n & 1)
-
-
-def writeVarint(trans, n):
-    out = bytearray()
-    while True:
-        if n & ~0x7f == 0:
-            out.append(n)
-            break
-        else:
-            out.append((n & 0xff) | 0x80)
-            n = n >> 7
-    trans.write(bytes(out))
-
-
-def readVarint(trans):
-    result = 0
-    shift = 0
-    while True:
-        x = trans.readAll(1)
-        byte = ord(x)
-        result |= (byte & 0x7f) << shift
-        if byte >> 7 == 0:
-            return result
-        shift += 7
-
-
-class CompactType(object):
-    STOP = 0x00
-    TRUE = 0x01
-    FALSE = 0x02
-    BYTE = 0x03
-    I16 = 0x04
-    I32 = 0x05
-    I64 = 0x06
-    DOUBLE = 0x07
-    BINARY = 0x08
-    LIST = 0x09
-    SET = 0x0A
-    MAP = 0x0B
-    STRUCT = 0x0C
-
-CTYPES = {
-    TType.STOP: CompactType.STOP,
-    TType.BOOL: CompactType.TRUE,  # used for collection
-    TType.BYTE: CompactType.BYTE,
-    TType.I16: CompactType.I16,
-    TType.I32: CompactType.I32,
-    TType.I64: CompactType.I64,
-    TType.DOUBLE: CompactType.DOUBLE,
-    TType.STRING: CompactType.BINARY,
-    TType.STRUCT: CompactType.STRUCT,
-    TType.LIST: CompactType.LIST,
-    TType.SET: CompactType.SET,
-    TType.MAP: CompactType.MAP,
-}
-
-TTYPES = {}
-for k, v in CTYPES.items():
-    TTYPES[v] = k
-TTYPES[CompactType.FALSE] = TType.BOOL
-del k
-del v
-
-
-class TCompactProtocol(TProtocolBase):
-    """Compact implementation of the Thrift protocol driver."""
-
-    PROTOCOL_ID = 0x82
-    VERSION = 1
-    VERSION_MASK = 0x1f
-    TYPE_MASK = 0xe0
-    TYPE_BITS = 0x07
-    TYPE_SHIFT_AMOUNT = 5
-
-    def __init__(self, trans,
-                 string_length_limit=None,
-                 container_length_limit=None):
-        TProtocolBase.__init__(self, trans)
-        self.state = CLEAR
-        self.__last_fid = 0
-        self.__bool_fid = None
-        self.__bool_value = None
-        self.__structs = []
-        self.__containers = []
-        self.string_length_limit = string_length_limit
-        self.container_length_limit = container_length_limit
-
-    def _check_string_length(self, length):
-        self._check_length(self.string_length_limit, length)
-
-    def _check_container_length(self, length):
-        self._check_length(self.container_length_limit, length)
-
-    def __writeVarint(self, n):
-        writeVarint(self.trans, n)
-
-    def writeMessageBegin(self, name, type, seqid):
-        assert self.state == CLEAR
-        self.__writeUByte(self.PROTOCOL_ID)
-        self.__writeUByte(self.VERSION | (type << self.TYPE_SHIFT_AMOUNT))
-        self.__writeVarint(seqid)
-        self.__writeBinary(str_to_binary(name))
-        self.state = VALUE_WRITE
-
-    def writeMessageEnd(self):
-        assert self.state == VALUE_WRITE
-        self.state = CLEAR
-
-    def writeStructBegin(self, name):
-        assert self.state in (CLEAR, CONTAINER_WRITE, VALUE_WRITE), self.state
-        self.__structs.append((self.state, self.__last_fid))
-        self.state = FIELD_WRITE
-        self.__last_fid = 0
-
-    def writeStructEnd(self):
-        assert self.state == FIELD_WRITE
-        self.state, self.__last_fid = self.__structs.pop()
-
-    def writeFieldStop(self):
-        self.__writeByte(0)
-
-    def __writeFieldHeader(self, type, fid):
-        delta = fid - self.__last_fid
-        if 0 < delta <= 15:
-            self.__writeUByte(delta << 4 | type)
-        else:
-            self.__writeByte(type)
-            self.__writeI16(fid)
-        self.__last_fid = fid
-
-    def writeFieldBegin(self, name, type, fid):
-        assert self.state == FIELD_WRITE, self.state
-        if type == TType.BOOL:
-            self.state = BOOL_WRITE
-            self.__bool_fid = fid
-        else:
-            self.state = VALUE_WRITE
-            self.__writeFieldHeader(CTYPES[type], fid)
-
-    def writeFieldEnd(self):
-        assert self.state in (VALUE_WRITE, BOOL_WRITE), self.state
-        self.state = FIELD_WRITE
-
-    def __writeUByte(self, byte):
-        self.trans.write(pack('!B', byte))
-
-    def __writeByte(self, byte):
-        self.trans.write(pack('!b', byte))
-
-    def __writeI16(self, i16):
-        self.__writeVarint(makeZigZag(i16, 16))
-
-    def __writeSize(self, i32):
-        self.__writeVarint(i32)
-
-    def writeCollectionBegin(self, etype, size):
-        assert self.state in (VALUE_WRITE, CONTAINER_WRITE), self.state
-        if size <= 14:
-            self.__writeUByte(size << 4 | CTYPES[etype])
-        else:
-            self.__writeUByte(0xf0 | CTYPES[etype])
-            self.__writeSize(size)
-        self.__containers.append(self.state)
-        self.state = CONTAINER_WRITE
-    writeSetBegin = writeCollectionBegin
-    writeListBegin = writeCollectionBegin
-
-    def writeMapBegin(self, ktype, vtype, size):
-        assert self.state in (VALUE_WRITE, CONTAINER_WRITE), self.state
-        if size == 0:
-            self.__writeByte(0)
-        else:
-            self.__writeSize(size)
-            self.__writeUByte(CTYPES[ktype] << 4 | CTYPES[vtype])
-        self.__containers.append(self.state)
-        self.state = CONTAINER_WRITE
-
-    def writeCollectionEnd(self):
-        assert self.state == CONTAINER_WRITE, self.state
-        self.state = self.__containers.pop()
-    writeMapEnd = writeCollectionEnd
-    writeSetEnd = writeCollectionEnd
-    writeListEnd = writeCollectionEnd
-
-    def writeBool(self, bool):
-        if self.state == BOOL_WRITE:
-            if bool:
-                ctype = CompactType.TRUE
-            else:
-                ctype = CompactType.FALSE
-            self.__writeFieldHeader(ctype, self.__bool_fid)
-        elif self.state == CONTAINER_WRITE:
-            if bool:
-                self.__writeByte(CompactType.TRUE)
-            else:
-                self.__writeByte(CompactType.FALSE)
-        else:
-            raise AssertionError("Invalid state in compact protocol")
-
-    writeByte = writer(__writeByte)
-    writeI16 = writer(__writeI16)
-
-    @writer
-    def writeI32(self, i32):
-        self.__writeVarint(makeZigZag(i32, 32))
-
-    @writer
-    def writeI64(self, i64):
-        self.__writeVarint(makeZigZag(i64, 64))
-
-    @writer
-    def writeDouble(self, dub):
-        self.trans.write(pack('<d', dub))
-
-    def __writeBinary(self, s):
-        self.__writeSize(len(s))
-        self.trans.write(s)
-    writeBinary = writer(__writeBinary)
-
-    def readFieldBegin(self):
-        assert self.state == FIELD_READ, self.state
-        type = self.__readUByte()
-        if type & 0x0f == TType.STOP:
-            return (None, 0, 0)
-        delta = type >> 4
-        if delta == 0:
-            fid = self.__readI16()
-        else:
-            fid = self.__last_fid + delta
-        self.__last_fid = fid
-        type = type & 0x0f
-        if type == CompactType.TRUE:
-            self.state = BOOL_READ
-            self.__bool_value = True
-        elif type == CompactType.FALSE:
-            self.state = BOOL_READ
-            self.__bool_value = False
-        else:
-            self.state = VALUE_READ
-        return (None, self.__getTType(type), fid)
-
-    def readFieldEnd(self):
-        assert self.state in (VALUE_READ, BOOL_READ), self.state
-        self.state = FIELD_READ
-
-    def __readUByte(self):
-        result, = unpack('!B', self.trans.readAll(1))
-        return result
-
-    def __readByte(self):
-        result, = unpack('!b', self.trans.readAll(1))
-        return result
-
-    def __readVarint(self):
-        return readVarint(self.trans)
-
-    def __readZigZag(self):
-        return fromZigZag(self.__readVarint())
-
-    def __readSize(self):
-        result = self.__readVarint()
-        if result < 0:
-            raise TProtocolException("Length < 0")
-        return result
-
-    def readMessageBegin(self):
-        assert self.state == CLEAR
-        proto_id = self.__readUByte()
-        if proto_id != self.PROTOCOL_ID:
-            raise TProtocolException(TProtocolException.BAD_VERSION,
-                                     'Bad protocol id in the message: %d' % proto_id)
-        ver_type = self.__readUByte()
-        type = (ver_type >> self.TYPE_SHIFT_AMOUNT) & self.TYPE_BITS
-        version = ver_type & self.VERSION_MASK
-        if version != self.VERSION:
-            raise TProtocolException(TProtocolException.BAD_VERSION,
-                                     'Bad version: %d (expect %d)' % (version, self.VERSION))
-        seqid = self.__readVarint()
-        name = binary_to_str(self.__readBinary())
-        return (name, type, seqid)
-
-    def readMessageEnd(self):
-        assert self.state == CLEAR
-        assert len(self.__structs) == 0
-
-    def readStructBegin(self):
-        assert self.state in (CLEAR, CONTAINER_READ, VALUE_READ), self.state
-        self.__structs.append((self.state, self.__last_fid))
-        self.state = FIELD_READ
-        self.__last_fid = 0
-
-    def readStructEnd(self):
-        assert self.state == FIELD_READ
-        self.state, self.__last_fid = self.__structs.pop()
-
-    def readCollectionBegin(self):
-        assert self.state in (VALUE_READ, CONTAINER_READ), self.state
-        size_type = self.__readUByte()
-        size = size_type >> 4
-        type = self.__getTType(size_type)
-        if size == 15:
-            size = self.__readSize()
-        self._check_container_length(size)
-        self.__containers.append(self.state)
-        self.state = CONTAINER_READ
-        return type, size
-    readSetBegin = readCollectionBegin
-    readListBegin = readCollectionBegin
-
-    def readMapBegin(self):
-        assert self.state in (VALUE_READ, CONTAINER_READ), self.state
-        size = self.__readSize()
-        self._check_container_length(size)
-        types = 0
-        if size > 0:
-            types = self.__readUByte()
-        vtype = self.__getTType(types)
-        ktype = self.__getTType(types >> 4)
-        self.__containers.append(self.state)
-        self.state = CONTAINER_READ
-        return (ktype, vtype, size)
-
-    def readCollectionEnd(self):
-        assert self.state == CONTAINER_READ, self.state
-        self.state = self.__containers.pop()
-    readSetEnd = readCollectionEnd
-    readListEnd = readCollectionEnd
-    readMapEnd = readCollectionEnd
-
-    def readBool(self):
-        if self.state == BOOL_READ:
-            return self.__bool_value == CompactType.TRUE
-        elif self.state == CONTAINER_READ:
-            return self.__readByte() == CompactType.TRUE
-        else:
-            raise AssertionError("Invalid state in compact protocol: %d" %
-                                 self.state)
-
-    readByte = reader(__readByte)
-    __readI16 = __readZigZag
-    readI16 = reader(__readZigZag)
-    readI32 = reader(__readZigZag)
-    readI64 = reader(__readZigZag)
-
-    @reader
-    def readDouble(self):
-        buff = self.trans.readAll(8)
-        val, = unpack('<d', buff)
-        return val
-
-    def __readBinary(self):
-        size = self.__readSize()
-        self._check_string_length(size)
-        return self.trans.readAll(size)
-    readBinary = reader(__readBinary)
-
-    def __getTType(self, byte):
-        return TTYPES[byte & 0x0f]
-
-
-class TCompactProtocolFactory(object):
-    def __init__(self,
-                 string_length_limit=None,
-                 container_length_limit=None):
-        self.string_length_limit = string_length_limit
-        self.container_length_limit = container_length_limit
-
-    def getProtocol(self, trans):
-        return TCompactProtocol(trans,
-                                self.string_length_limit,
-                                self.container_length_limit)
-
-
-class TCompactProtocolAccelerated(TCompactProtocol):
-    """C-Accelerated version of TCompactProtocol.
-
-    This class does not override any of TCompactProtocol's methods,
-    but the generated code recognizes it directly and will call into
-    our C module to do the encoding, bypassing this object entirely.
-    We inherit from TCompactProtocol so that the normal TCompactProtocol
-    encoding can happen if the fastbinary module doesn't work for some
-    reason.
-    To disable this behavior, pass fallback=False constructor argument.
-
-    In order to take advantage of the C module, just use
-    TCompactProtocolAccelerated instead of TCompactProtocol.
-    """
-    pass
-
-    def __init__(self, *args, **kwargs):
-        fallback = kwargs.pop('fallback', True)
-        super(TCompactProtocolAccelerated, self).__init__(*args, **kwargs)
-        try:
-            from thrift.protocol import fastbinary
-        except ImportError:
-            if not fallback:
-                raise
-        else:
-            self._fast_decode = fastbinary.decode_compact
-            self._fast_encode = fastbinary.encode_compact
-
-
-class TCompactProtocolAcceleratedFactory(object):
-    def __init__(self,
-                 string_length_limit=None,
-                 container_length_limit=None,
-                 fallback=True):
-        self.string_length_limit = string_length_limit
-        self.container_length_limit = container_length_limit
-        self._fallback = fallback
-
-    def getProtocol(self, trans):
-        return TCompactProtocolAccelerated(
-            trans,
-            string_length_limit=self.string_length_limit,
-            container_length_limit=self.container_length_limit,
-            fallback=self._fallback)
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TJSONProtocol.py b/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TJSONProtocol.py
deleted file mode 100644
index db2099a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TJSONProtocol.py
+++ /dev/null
@@ -1,677 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from .TProtocol import (TType, TProtocolBase, TProtocolException,
-                        checkIntegerLimits)
-import base64
-import math
-import sys
-
-from ..compat import str_to_binary
-
-
-__all__ = ['TJSONProtocol',
-           'TJSONProtocolFactory',
-           'TSimpleJSONProtocol',
-           'TSimpleJSONProtocolFactory']
-
-VERSION = 1
-
-COMMA = b','
-COLON = b':'
-LBRACE = b'{'
-RBRACE = b'}'
-LBRACKET = b'['
-RBRACKET = b']'
-QUOTE = b'"'
-BACKSLASH = b'\\'
-ZERO = b'0'
-
-ESCSEQ0 = ord('\\')
-ESCSEQ1 = ord('u')
-ESCAPE_CHAR_VALS = {
-    '"': '\\"',
-    '\\': '\\\\',
-    '\b': '\\b',
-    '\f': '\\f',
-    '\n': '\\n',
-    '\r': '\\r',
-    '\t': '\\t',
-    # '/': '\\/',
-}
-ESCAPE_CHARS = {
-    b'"': '"',
-    b'\\': '\\',
-    b'b': '\b',
-    b'f': '\f',
-    b'n': '\n',
-    b'r': '\r',
-    b't': '\t',
-    b'/': '/',
-}
-NUMERIC_CHAR = b'+-.0123456789Ee'
-
-CTYPES = {
-    TType.BOOL: 'tf',
-    TType.BYTE: 'i8',
-    TType.I16: 'i16',
-    TType.I32: 'i32',
-    TType.I64: 'i64',
-    TType.DOUBLE: 'dbl',
-    TType.STRING: 'str',
-    TType.STRUCT: 'rec',
-    TType.LIST: 'lst',
-    TType.SET: 'set',
-    TType.MAP: 'map',
-}
-
-JTYPES = {}
-for key in CTYPES.keys():
-    JTYPES[CTYPES[key]] = key
-
-
-class JSONBaseContext(object):
-
-    def __init__(self, protocol):
-        self.protocol = protocol
-        self.first = True
-
-    def doIO(self, function):
-        pass
-
-    def write(self):
-        pass
-
-    def read(self):
-        pass
-
-    def escapeNum(self):
-        return False
-
-    def __str__(self):
-        return self.__class__.__name__
-
-
-class JSONListContext(JSONBaseContext):
-
-    def doIO(self, function):
-        if self.first is True:
-            self.first = False
-        else:
-            function(COMMA)
-
-    def write(self):
-        self.doIO(self.protocol.trans.write)
-
-    def read(self):
-        self.doIO(self.protocol.readJSONSyntaxChar)
-
-
-class JSONPairContext(JSONBaseContext):
-
-    def __init__(self, protocol):
-        super(JSONPairContext, self).__init__(protocol)
-        self.colon = True
-
-    def doIO(self, function):
-        if self.first:
-            self.first = False
-            self.colon = True
-        else:
-            function(COLON if self.colon else COMMA)
-            self.colon = not self.colon
-
-    def write(self):
-        self.doIO(self.protocol.trans.write)
-
-    def read(self):
-        self.doIO(self.protocol.readJSONSyntaxChar)
-
-    def escapeNum(self):
-        return self.colon
-
-    def __str__(self):
-        return '%s, colon=%s' % (self.__class__.__name__, self.colon)
-
-
-class LookaheadReader():
-    hasData = False
-    data = ''
-
-    def __init__(self, protocol):
-        self.protocol = protocol
-
-    def read(self):
-        if self.hasData is True:
-            self.hasData = False
-        else:
-            self.data = self.protocol.trans.read(1)
-        return self.data
-
-    def peek(self):
-        if self.hasData is False:
-            self.data = self.protocol.trans.read(1)
-        self.hasData = True
-        return self.data
-
-
-class TJSONProtocolBase(TProtocolBase):
-
-    def __init__(self, trans):
-        TProtocolBase.__init__(self, trans)
-        self.resetWriteContext()
-        self.resetReadContext()
-
-    # We don't have length limit implementation for JSON protocols
-    @property
-    def string_length_limit(senf):
-        return None
-
-    @property
-    def container_length_limit(senf):
-        return None
-
-    def resetWriteContext(self):
-        self.context = JSONBaseContext(self)
-        self.contextStack = [self.context]
-
-    def resetReadContext(self):
-        self.resetWriteContext()
-        self.reader = LookaheadReader(self)
-
-    def pushContext(self, ctx):
-        self.contextStack.append(ctx)
-        self.context = ctx
-
-    def popContext(self):
-        self.contextStack.pop()
-        if self.contextStack:
-            self.context = self.contextStack[-1]
-        else:
-            self.context = JSONBaseContext(self)
-
-    def writeJSONString(self, string):
-        self.context.write()
-        json_str = ['"']
-        for s in string:
-            escaped = ESCAPE_CHAR_VALS.get(s, s)
-            json_str.append(escaped)
-        json_str.append('"')
-        self.trans.write(str_to_binary(''.join(json_str)))
-
-    def writeJSONNumber(self, number, formatter='{0}'):
-        self.context.write()
-        jsNumber = str(formatter.format(number)).encode('ascii')
-        if self.context.escapeNum():
-            self.trans.write(QUOTE)
-            self.trans.write(jsNumber)
-            self.trans.write(QUOTE)
-        else:
-            self.trans.write(jsNumber)
-
-    def writeJSONBase64(self, binary):
-        self.context.write()
-        self.trans.write(QUOTE)
-        self.trans.write(base64.b64encode(binary))
-        self.trans.write(QUOTE)
-
-    def writeJSONObjectStart(self):
-        self.context.write()
-        self.trans.write(LBRACE)
-        self.pushContext(JSONPairContext(self))
-
-    def writeJSONObjectEnd(self):
-        self.popContext()
-        self.trans.write(RBRACE)
-
-    def writeJSONArrayStart(self):
-        self.context.write()
-        self.trans.write(LBRACKET)
-        self.pushContext(JSONListContext(self))
-
-    def writeJSONArrayEnd(self):
-        self.popContext()
-        self.trans.write(RBRACKET)
-
-    def readJSONSyntaxChar(self, character):
-        current = self.reader.read()
-        if character != current:
-            raise TProtocolException(TProtocolException.INVALID_DATA,
-                                     "Unexpected character: %s" % current)
-
-    def _isHighSurrogate(self, codeunit):
-        return codeunit >= 0xd800 and codeunit <= 0xdbff
-
-    def _isLowSurrogate(self, codeunit):
-        return codeunit >= 0xdc00 and codeunit <= 0xdfff
-
-    def _toChar(self, high, low=None):
-        if not low:
-            if sys.version_info[0] == 2:
-                return ("\\u%04x" % high).decode('unicode-escape') \
-                                         .encode('utf-8')
-            else:
-                return chr(high)
-        else:
-            codepoint = (1 << 16) + ((high & 0x3ff) << 10)
-            codepoint += low & 0x3ff
-            if sys.version_info[0] == 2:
-                s = "\\U%08x" % codepoint
-                return s.decode('unicode-escape').encode('utf-8')
-            else:
-                return chr(codepoint)
-
-    def readJSONString(self, skipContext):
-        highSurrogate = None
-        string = []
-        if skipContext is False:
-            self.context.read()
-        self.readJSONSyntaxChar(QUOTE)
-        while True:
-            character = self.reader.read()
-            if character == QUOTE:
-                break
-            if ord(character) == ESCSEQ0:
-                character = self.reader.read()
-                if ord(character) == ESCSEQ1:
-                    character = self.trans.read(4).decode('ascii')
-                    codeunit = int(character, 16)
-                    if self._isHighSurrogate(codeunit):
-                        if highSurrogate:
-                            raise TProtocolException(
-                                TProtocolException.INVALID_DATA,
-                                "Expected low surrogate char")
-                        highSurrogate = codeunit
-                        continue
-                    elif self._isLowSurrogate(codeunit):
-                        if not highSurrogate:
-                            raise TProtocolException(
-                                TProtocolException.INVALID_DATA,
-                                "Expected high surrogate char")
-                        character = self._toChar(highSurrogate, codeunit)
-                        highSurrogate = None
-                    else:
-                        character = self._toChar(codeunit)
-                else:
-                    if character not in ESCAPE_CHARS:
-                        raise TProtocolException(
-                            TProtocolException.INVALID_DATA,
-                            "Expected control char")
-                    character = ESCAPE_CHARS[character]
-            elif character in ESCAPE_CHAR_VALS:
-                raise TProtocolException(TProtocolException.INVALID_DATA,
-                                         "Unescaped control char")
-            elif sys.version_info[0] > 2:
-                utf8_bytes = bytearray([ord(character)])
-                while ord(self.reader.peek()) >= 0x80:
-                    utf8_bytes.append(ord(self.reader.read()))
-                character = utf8_bytes.decode('utf8')
-            string.append(character)
-
-            if highSurrogate:
-                raise TProtocolException(TProtocolException.INVALID_DATA,
-                                         "Expected low surrogate char")
-        return ''.join(string)
-
-    def isJSONNumeric(self, character):
-        return (True if NUMERIC_CHAR.find(character) != - 1 else False)
-
-    def readJSONQuotes(self):
-        if (self.context.escapeNum()):
-            self.readJSONSyntaxChar(QUOTE)
-
-    def readJSONNumericChars(self):
-        numeric = []
-        while True:
-            character = self.reader.peek()
-            if self.isJSONNumeric(character) is False:
-                break
-            numeric.append(self.reader.read())
-        return b''.join(numeric).decode('ascii')
-
-    def readJSONInteger(self):
-        self.context.read()
-        self.readJSONQuotes()
-        numeric = self.readJSONNumericChars()
-        self.readJSONQuotes()
-        try:
-            return int(numeric)
-        except ValueError:
-            raise TProtocolException(TProtocolException.INVALID_DATA,
-                                     "Bad data encounted in numeric data")
-
-    def readJSONDouble(self):
-        self.context.read()
-        if self.reader.peek() == QUOTE:
-            string = self.readJSONString(True)
-            try:
-                double = float(string)
-                if (self.context.escapeNum is False and
-                        not math.isinf(double) and
-                        not math.isnan(double)):
-                    raise TProtocolException(
-                        TProtocolException.INVALID_DATA,
-                        "Numeric data unexpectedly quoted")
-                return double
-            except ValueError:
-                raise TProtocolException(TProtocolException.INVALID_DATA,
-                                         "Bad data encounted in numeric data")
-        else:
-            if self.context.escapeNum() is True:
-                self.readJSONSyntaxChar(QUOTE)
-            try:
-                return float(self.readJSONNumericChars())
-            except ValueError:
-                raise TProtocolException(TProtocolException.INVALID_DATA,
-                                         "Bad data encounted in numeric data")
-
-    def readJSONBase64(self):
-        string = self.readJSONString(False)
-        size = len(string)
-        m = size % 4
-        # Force padding since b64encode method does not allow it
-        if m != 0:
-            for i in range(4 - m):
-                string += '='
-        return base64.b64decode(string)
-
-    def readJSONObjectStart(self):
-        self.context.read()
-        self.readJSONSyntaxChar(LBRACE)
-        self.pushContext(JSONPairContext(self))
-
-    def readJSONObjectEnd(self):
-        self.readJSONSyntaxChar(RBRACE)
-        self.popContext()
-
-    def readJSONArrayStart(self):
-        self.context.read()
-        self.readJSONSyntaxChar(LBRACKET)
-        self.pushContext(JSONListContext(self))
-
-    def readJSONArrayEnd(self):
-        self.readJSONSyntaxChar(RBRACKET)
-        self.popContext()
-
-
-class TJSONProtocol(TJSONProtocolBase):
-
-    def readMessageBegin(self):
-        self.resetReadContext()
-        self.readJSONArrayStart()
-        if self.readJSONInteger() != VERSION:
-            raise TProtocolException(TProtocolException.BAD_VERSION,
-                                     "Message contained bad version.")
-        name = self.readJSONString(False)
-        typen = self.readJSONInteger()
-        seqid = self.readJSONInteger()
-        return (name, typen, seqid)
-
-    def readMessageEnd(self):
-        self.readJSONArrayEnd()
-
-    def readStructBegin(self):
-        self.readJSONObjectStart()
-
-    def readStructEnd(self):
-        self.readJSONObjectEnd()
-
-    def readFieldBegin(self):
-        character = self.reader.peek()
-        ttype = 0
-        id = 0
-        if character == RBRACE:
-            ttype = TType.STOP
-        else:
-            id = self.readJSONInteger()
-            self.readJSONObjectStart()
-            ttype = JTYPES[self.readJSONString(False)]
-        return (None, ttype, id)
-
-    def readFieldEnd(self):
-        self.readJSONObjectEnd()
-
-    def readMapBegin(self):
-        self.readJSONArrayStart()
-        keyType = JTYPES[self.readJSONString(False)]
-        valueType = JTYPES[self.readJSONString(False)]
-        size = self.readJSONInteger()
-        self.readJSONObjectStart()
-        return (keyType, valueType, size)
-
-    def readMapEnd(self):
-        self.readJSONObjectEnd()
-        self.readJSONArrayEnd()
-
-    def readCollectionBegin(self):
-        self.readJSONArrayStart()
-        elemType = JTYPES[self.readJSONString(False)]
-        size = self.readJSONInteger()
-        return (elemType, size)
-    readListBegin = readCollectionBegin
-    readSetBegin = readCollectionBegin
-
-    def readCollectionEnd(self):
-        self.readJSONArrayEnd()
-    readSetEnd = readCollectionEnd
-    readListEnd = readCollectionEnd
-
-    def readBool(self):
-        return (False if self.readJSONInteger() == 0 else True)
-
-    def readNumber(self):
-        return self.readJSONInteger()
-    readByte = readNumber
-    readI16 = readNumber
-    readI32 = readNumber
-    readI64 = readNumber
-
-    def readDouble(self):
-        return self.readJSONDouble()
-
-    def readString(self):
-        return self.readJSONString(False)
-
-    def readBinary(self):
-        return self.readJSONBase64()
-
-    def writeMessageBegin(self, name, request_type, seqid):
-        self.resetWriteContext()
-        self.writeJSONArrayStart()
-        self.writeJSONNumber(VERSION)
-        self.writeJSONString(name)
-        self.writeJSONNumber(request_type)
-        self.writeJSONNumber(seqid)
-
-    def writeMessageEnd(self):
-        self.writeJSONArrayEnd()
-
-    def writeStructBegin(self, name):
-        self.writeJSONObjectStart()
-
-    def writeStructEnd(self):
-        self.writeJSONObjectEnd()
-
-    def writeFieldBegin(self, name, ttype, id):
-        self.writeJSONNumber(id)
-        self.writeJSONObjectStart()
-        self.writeJSONString(CTYPES[ttype])
-
-    def writeFieldEnd(self):
-        self.writeJSONObjectEnd()
-
-    def writeFieldStop(self):
-        pass
-
-    def writeMapBegin(self, ktype, vtype, size):
-        self.writeJSONArrayStart()
-        self.writeJSONString(CTYPES[ktype])
-        self.writeJSONString(CTYPES[vtype])
-        self.writeJSONNumber(size)
-        self.writeJSONObjectStart()
-
-    def writeMapEnd(self):
-        self.writeJSONObjectEnd()
-        self.writeJSONArrayEnd()
-
-    def writeListBegin(self, etype, size):
-        self.writeJSONArrayStart()
-        self.writeJSONString(CTYPES[etype])
-        self.writeJSONNumber(size)
-
-    def writeListEnd(self):
-        self.writeJSONArrayEnd()
-
-    def writeSetBegin(self, etype, size):
-        self.writeJSONArrayStart()
-        self.writeJSONString(CTYPES[etype])
-        self.writeJSONNumber(size)
-
-    def writeSetEnd(self):
-        self.writeJSONArrayEnd()
-
-    def writeBool(self, boolean):
-        self.writeJSONNumber(1 if boolean is True else 0)
-
-    def writeByte(self, byte):
-        checkIntegerLimits(byte, 8)
-        self.writeJSONNumber(byte)
-
-    def writeI16(self, i16):
-        checkIntegerLimits(i16, 16)
-        self.writeJSONNumber(i16)
-
-    def writeI32(self, i32):
-        checkIntegerLimits(i32, 32)
-        self.writeJSONNumber(i32)
-
-    def writeI64(self, i64):
-        checkIntegerLimits(i64, 64)
-        self.writeJSONNumber(i64)
-
-    def writeDouble(self, dbl):
-        # 17 significant digits should be just enough for any double precision
-        # value.
-        self.writeJSONNumber(dbl, '{0:.17g}')
-
-    def writeString(self, string):
-        self.writeJSONString(string)
-
-    def writeBinary(self, binary):
-        self.writeJSONBase64(binary)
-
-
-class TJSONProtocolFactory(object):
-    def getProtocol(self, trans):
-        return TJSONProtocol(trans)
-
-    @property
-    def string_length_limit(senf):
-        return None
-
-    @property
-    def container_length_limit(senf):
-        return None
-
-
-class TSimpleJSONProtocol(TJSONProtocolBase):
-    """Simple, readable, write-only JSON protocol.
-
-    Useful for interacting with scripting languages.
-    """
-
-    def readMessageBegin(self):
-        raise NotImplementedError()
-
-    def readMessageEnd(self):
-        raise NotImplementedError()
-
-    def readStructBegin(self):
-        raise NotImplementedError()
-
-    def readStructEnd(self):
-        raise NotImplementedError()
-
-    def writeMessageBegin(self, name, request_type, seqid):
-        self.resetWriteContext()
-
-    def writeMessageEnd(self):
-        pass
-
-    def writeStructBegin(self, name):
-        self.writeJSONObjectStart()
-
-    def writeStructEnd(self):
-        self.writeJSONObjectEnd()
-
-    def writeFieldBegin(self, name, ttype, fid):
-        self.writeJSONString(name)
-
-    def writeFieldEnd(self):
-        pass
-
-    def writeMapBegin(self, ktype, vtype, size):
-        self.writeJSONObjectStart()
-
-    def writeMapEnd(self):
-        self.writeJSONObjectEnd()
-
-    def _writeCollectionBegin(self, etype, size):
-        self.writeJSONArrayStart()
-
-    def _writeCollectionEnd(self):
-        self.writeJSONArrayEnd()
-    writeListBegin = _writeCollectionBegin
-    writeListEnd = _writeCollectionEnd
-    writeSetBegin = _writeCollectionBegin
-    writeSetEnd = _writeCollectionEnd
-
-    def writeByte(self, byte):
-        checkIntegerLimits(byte, 8)
-        self.writeJSONNumber(byte)
-
-    def writeI16(self, i16):
-        checkIntegerLimits(i16, 16)
-        self.writeJSONNumber(i16)
-
-    def writeI32(self, i32):
-        checkIntegerLimits(i32, 32)
-        self.writeJSONNumber(i32)
-
-    def writeI64(self, i64):
-        checkIntegerLimits(i64, 64)
-        self.writeJSONNumber(i64)
-
-    def writeBool(self, boolean):
-        self.writeJSONNumber(1 if boolean is True else 0)
-
-    def writeDouble(self, dbl):
-        self.writeJSONNumber(dbl)
-
-    def writeString(self, string):
-        self.writeJSONString(string)
-
-    def writeBinary(self, binary):
-        self.writeJSONBase64(binary)
-
-
-class TSimpleJSONProtocolFactory(object):
-
-    def getProtocol(self, trans):
-        return TSimpleJSONProtocol(trans)
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TMultiplexedProtocol.py b/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TMultiplexedProtocol.py
deleted file mode 100644
index 309f896..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TMultiplexedProtocol.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from thrift.Thrift import TMessageType
-from thrift.protocol import TProtocolDecorator
-
-SEPARATOR = ":"
-
-
-class TMultiplexedProtocol(TProtocolDecorator.TProtocolDecorator):
-    def __init__(self, protocol, serviceName):
-        TProtocolDecorator.TProtocolDecorator.__init__(self, protocol)
-        self.serviceName = serviceName
-
-    def writeMessageBegin(self, name, type, seqid):
-        if (type == TMessageType.CALL or
-                type == TMessageType.ONEWAY):
-            self.protocol.writeMessageBegin(
-                self.serviceName + SEPARATOR + name,
-                type,
-                seqid
-            )
-        else:
-            self.protocol.writeMessageBegin(name, type, seqid)
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TProtocol.py b/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TProtocol.py
deleted file mode 100644
index f29c58d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TProtocol.py
+++ /dev/null
@@ -1,419 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from thrift.Thrift import TException, TType, TFrozenDict
-from thrift.transport.TTransport import TTransportException
-from ..compat import binary_to_str, str_to_binary
-
-import six
-import sys
-from itertools import islice
-from six.moves import zip
-
-
-class TProtocolException(TException):
-    """Custom Protocol Exception class"""
-
-    UNKNOWN = 0
-    INVALID_DATA = 1
-    NEGATIVE_SIZE = 2
-    SIZE_LIMIT = 3
-    BAD_VERSION = 4
-    NOT_IMPLEMENTED = 5
-    DEPTH_LIMIT = 6
-
-    def __init__(self, type=UNKNOWN, message=None):
-        TException.__init__(self, message)
-        self.type = type
-
-
-class TProtocolBase(object):
-    """Base class for Thrift protocol driver."""
-
-    def __init__(self, trans):
-        self.trans = trans
-        self._fast_decode = None
-        self._fast_encode = None
-
-    @staticmethod
-    def _check_length(limit, length):
-        if length < 0:
-            raise TTransportException(TTransportException.NEGATIVE_SIZE,
-                                      'Negative length: %d' % length)
-        if limit is not None and length > limit:
-            raise TTransportException(TTransportException.SIZE_LIMIT,
-                                      'Length exceeded max allowed: %d' % limit)
-
-    def writeMessageBegin(self, name, ttype, seqid):
-        pass
-
-    def writeMessageEnd(self):
-        pass
-
-    def writeStructBegin(self, name):
-        pass
-
-    def writeStructEnd(self):
-        pass
-
-    def writeFieldBegin(self, name, ttype, fid):
-        pass
-
-    def writeFieldEnd(self):
-        pass
-
-    def writeFieldStop(self):
-        pass
-
-    def writeMapBegin(self, ktype, vtype, size):
-        pass
-
-    def writeMapEnd(self):
-        pass
-
-    def writeListBegin(self, etype, size):
-        pass
-
-    def writeListEnd(self):
-        pass
-
-    def writeSetBegin(self, etype, size):
-        pass
-
-    def writeSetEnd(self):
-        pass
-
-    def writeBool(self, bool_val):
-        pass
-
-    def writeByte(self, byte):
-        pass
-
-    def writeI16(self, i16):
-        pass
-
-    def writeI32(self, i32):
-        pass
-
-    def writeI64(self, i64):
-        pass
-
-    def writeDouble(self, dub):
-        pass
-
-    def writeString(self, str_val):
-        self.writeBinary(str_to_binary(str_val))
-
-    def writeBinary(self, str_val):
-        pass
-
-    def writeUtf8(self, str_val):
-        self.writeString(str_val.encode('utf8'))
-
-    def readMessageBegin(self):
-        pass
-
-    def readMessageEnd(self):
-        pass
-
-    def readStructBegin(self):
-        pass
-
-    def readStructEnd(self):
-        pass
-
-    def readFieldBegin(self):
-        pass
-
-    def readFieldEnd(self):
-        pass
-
-    def readMapBegin(self):
-        pass
-
-    def readMapEnd(self):
-        pass
-
-    def readListBegin(self):
-        pass
-
-    def readListEnd(self):
-        pass
-
-    def readSetBegin(self):
-        pass
-
-    def readSetEnd(self):
-        pass
-
-    def readBool(self):
-        pass
-
-    def readByte(self):
-        pass
-
-    def readI16(self):
-        pass
-
-    def readI32(self):
-        pass
-
-    def readI64(self):
-        pass
-
-    def readDouble(self):
-        pass
-
-    def readString(self):
-        return binary_to_str(self.readBinary())
-
-    def readBinary(self):
-        pass
-
-    def readUtf8(self):
-        return self.readString().decode('utf8')
-
-    def skip(self, ttype):
-        if ttype == TType.STOP:
-            return
-        elif ttype == TType.BOOL:
-            self.readBool()
-        elif ttype == TType.BYTE:
-            self.readByte()
-        elif ttype == TType.I16:
-            self.readI16()
-        elif ttype == TType.I32:
-            self.readI32()
-        elif ttype == TType.I64:
-            self.readI64()
-        elif ttype == TType.DOUBLE:
-            self.readDouble()
-        elif ttype == TType.STRING:
-            self.readString()
-        elif ttype == TType.STRUCT:
-            name = self.readStructBegin()
-            while True:
-                (name, ttype, id) = self.readFieldBegin()
-                if ttype == TType.STOP:
-                    break
-                self.skip(ttype)
-                self.readFieldEnd()
-            self.readStructEnd()
-        elif ttype == TType.MAP:
-            (ktype, vtype, size) = self.readMapBegin()
-            for i in range(size):
-                self.skip(ktype)
-                self.skip(vtype)
-            self.readMapEnd()
-        elif ttype == TType.SET:
-            (etype, size) = self.readSetBegin()
-            for i in range(size):
-                self.skip(etype)
-            self.readSetEnd()
-        elif ttype == TType.LIST:
-            (etype, size) = self.readListBegin()
-            for i in range(size):
-                self.skip(etype)
-            self.readListEnd()
-
-    # tuple of: ( 'reader method' name, is_container bool, 'writer_method' name )
-    _TTYPE_HANDLERS = (
-        (None, None, False),  # 0 TType.STOP
-        (None, None, False),  # 1 TType.VOID # TODO: handle void?
-        ('readBool', 'writeBool', False),  # 2 TType.BOOL
-        ('readByte', 'writeByte', False),  # 3 TType.BYTE and I08
-        ('readDouble', 'writeDouble', False),  # 4 TType.DOUBLE
-        (None, None, False),  # 5 undefined
-        ('readI16', 'writeI16', False),  # 6 TType.I16
-        (None, None, False),  # 7 undefined
-        ('readI32', 'writeI32', False),  # 8 TType.I32
-        (None, None, False),  # 9 undefined
-        ('readI64', 'writeI64', False),  # 10 TType.I64
-        ('readString', 'writeString', False),  # 11 TType.STRING and UTF7
-        ('readContainerStruct', 'writeContainerStruct', True),  # 12 *.STRUCT
-        ('readContainerMap', 'writeContainerMap', True),  # 13 TType.MAP
-        ('readContainerSet', 'writeContainerSet', True),  # 14 TType.SET
-        ('readContainerList', 'writeContainerList', True),  # 15 TType.LIST
-        (None, None, False),  # 16 TType.UTF8 # TODO: handle utf8 types?
-        (None, None, False)  # 17 TType.UTF16 # TODO: handle utf16 types?
-    )
-
-    def _ttype_handlers(self, ttype, spec):
-        if spec == 'BINARY':
-            if ttype != TType.STRING:
-                raise TProtocolException(type=TProtocolException.INVALID_DATA,
-                                         message='Invalid binary field type %d' % ttype)
-            return ('readBinary', 'writeBinary', False)
-        if sys.version_info[0] == 2 and spec == 'UTF8':
-            if ttype != TType.STRING:
-                raise TProtocolException(type=TProtocolException.INVALID_DATA,
-                                         message='Invalid string field type %d' % ttype)
-            return ('readUtf8', 'writeUtf8', False)
-        return self._TTYPE_HANDLERS[ttype] if ttype < len(self._TTYPE_HANDLERS) else (None, None, False)
-
-    def _read_by_ttype(self, ttype, spec, espec):
-        reader_name, _, is_container = self._ttype_handlers(ttype, spec)
-        if reader_name is None:
-            raise TProtocolException(type=TProtocolException.INVALID_DATA,
-                                     message='Invalid type %d' % (ttype))
-        reader_func = getattr(self, reader_name)
-        read = (lambda: reader_func(espec)) if is_container else reader_func
-        while True:
-            yield read()
-
-    def readFieldByTType(self, ttype, spec):
-        return next(self._read_by_ttype(ttype, spec, spec))
-
-    def readContainerList(self, spec):
-        ttype, tspec, is_immutable = spec
-        (list_type, list_len) = self.readListBegin()
-        # TODO: compare types we just decoded with thrift_spec
-        elems = islice(self._read_by_ttype(ttype, spec, tspec), list_len)
-        results = (tuple if is_immutable else list)(elems)
-        self.readListEnd()
-        return results
-
-    def readContainerSet(self, spec):
-        ttype, tspec, is_immutable = spec
-        (set_type, set_len) = self.readSetBegin()
-        # TODO: compare types we just decoded with thrift_spec
-        elems = islice(self._read_by_ttype(ttype, spec, tspec), set_len)
-        results = (frozenset if is_immutable else set)(elems)
-        self.readSetEnd()
-        return results
-
-    def readContainerStruct(self, spec):
-        (obj_class, obj_spec) = spec
-        obj = obj_class()
-        obj.read(self)
-        return obj
-
-    def readContainerMap(self, spec):
-        ktype, kspec, vtype, vspec, is_immutable = spec
-        (map_ktype, map_vtype, map_len) = self.readMapBegin()
-        # TODO: compare types we just decoded with thrift_spec and
-        # abort/skip if types disagree
-        keys = self._read_by_ttype(ktype, spec, kspec)
-        vals = self._read_by_ttype(vtype, spec, vspec)
-        keyvals = islice(zip(keys, vals), map_len)
-        results = (TFrozenDict if is_immutable else dict)(keyvals)
-        self.readMapEnd()
-        return results
-
-    def readStruct(self, obj, thrift_spec, is_immutable=False):
-        if is_immutable:
-            fields = {}
-        self.readStructBegin()
-        while True:
-            (fname, ftype, fid) = self.readFieldBegin()
-            if ftype == TType.STOP:
-                break
-            try:
-                field = thrift_spec[fid]
-            except IndexError:
-                self.skip(ftype)
-            else:
-                if field is not None and ftype == field[1]:
-                    fname = field[2]
-                    fspec = field[3]
-                    val = self.readFieldByTType(ftype, fspec)
-                    if is_immutable:
-                        fields[fname] = val
-                    else:
-                        setattr(obj, fname, val)
-                else:
-                    self.skip(ftype)
-            self.readFieldEnd()
-        self.readStructEnd()
-        if is_immutable:
-            return obj(**fields)
-
-    def writeContainerStruct(self, val, spec):
-        val.write(self)
-
-    def writeContainerList(self, val, spec):
-        ttype, tspec, _ = spec
-        self.writeListBegin(ttype, len(val))
-        for _ in self._write_by_ttype(ttype, val, spec, tspec):
-            pass
-        self.writeListEnd()
-
-    def writeContainerSet(self, val, spec):
-        ttype, tspec, _ = spec
-        self.writeSetBegin(ttype, len(val))
-        for _ in self._write_by_ttype(ttype, val, spec, tspec):
-            pass
-        self.writeSetEnd()
-
-    def writeContainerMap(self, val, spec):
-        ktype, kspec, vtype, vspec, _ = spec
-        self.writeMapBegin(ktype, vtype, len(val))
-        for _ in zip(self._write_by_ttype(ktype, six.iterkeys(val), spec, kspec),
-                     self._write_by_ttype(vtype, six.itervalues(val), spec, vspec)):
-            pass
-        self.writeMapEnd()
-
-    def writeStruct(self, obj, thrift_spec):
-        self.writeStructBegin(obj.__class__.__name__)
-        for field in thrift_spec:
-            if field is None:
-                continue
-            fname = field[2]
-            val = getattr(obj, fname)
-            if val is None:
-                # skip writing out unset fields
-                continue
-            fid = field[0]
-            ftype = field[1]
-            fspec = field[3]
-            self.writeFieldBegin(fname, ftype, fid)
-            self.writeFieldByTType(ftype, val, fspec)
-            self.writeFieldEnd()
-        self.writeFieldStop()
-        self.writeStructEnd()
-
-    def _write_by_ttype(self, ttype, vals, spec, espec):
-        _, writer_name, is_container = self._ttype_handlers(ttype, spec)
-        writer_func = getattr(self, writer_name)
-        write = (lambda v: writer_func(v, espec)) if is_container else writer_func
-        for v in vals:
-            yield write(v)
-
-    def writeFieldByTType(self, ttype, val, spec):
-        next(self._write_by_ttype(ttype, [val], spec, spec))
-
-
-def checkIntegerLimits(i, bits):
-    if bits == 8 and (i < -128 or i > 127):
-        raise TProtocolException(TProtocolException.INVALID_DATA,
-                                 "i8 requires -128 <= number <= 127")
-    elif bits == 16 and (i < -32768 or i > 32767):
-        raise TProtocolException(TProtocolException.INVALID_DATA,
-                                 "i16 requires -32768 <= number <= 32767")
-    elif bits == 32 and (i < -2147483648 or i > 2147483647):
-        raise TProtocolException(TProtocolException.INVALID_DATA,
-                                 "i32 requires -2147483648 <= number <= 2147483647")
-    elif bits == 64 and (i < -9223372036854775808 or i > 9223372036854775807):
-        raise TProtocolException(TProtocolException.INVALID_DATA,
-                                 "i64 requires -9223372036854775808 <= number <= 9223372036854775807")
-
-
-class TProtocolFactory(object):
-    def getProtocol(self, trans):
-        pass
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TProtocolDecorator.py b/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TProtocolDecorator.py
deleted file mode 100644
index 8b270a4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/TProtocolDecorator.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import types
-
-from thrift.protocol.TProtocol import TProtocolBase
-
-
-class TProtocolDecorator():
-    def __init__(self, protocol):
-        TProtocolBase(protocol)
-        self.protocol = protocol
-
-    def __getattr__(self, name):
-        if hasattr(self.protocol, name):
-            member = getattr(self.protocol, name)
-            if type(member) in [
-                types.MethodType,
-                types.FunctionType,
-                types.LambdaType,
-                types.BuiltinFunctionType,
-                types.BuiltinMethodType,
-            ]:
-                return lambda *args, **kwargs: self._wrap(member, args, kwargs)
-            else:
-                return member
-        raise AttributeError(name)
-
-    def _wrap(self, func, args, kwargs):
-        if isinstance(func, types.MethodType):
-            result = func(*args, **kwargs)
-        else:
-            result = func(self.protocol, *args, **kwargs)
-        return result
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/__init__.py b/vendor/git.apache.org/thrift.git/lib/py/src/protocol/__init__.py
deleted file mode 100644
index 7148f66..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/protocol/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-__all__ = ['fastbinary', 'TBase', 'TBinaryProtocol', 'TCompactProtocol',
-           'TJSONProtocol', 'TProtocol']
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/server/THttpServer.py b/vendor/git.apache.org/thrift.git/lib/py/src/server/THttpServer.py
deleted file mode 100644
index 1b501a7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/server/THttpServer.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from six.moves import BaseHTTPServer
-
-from thrift.server import TServer
-from thrift.transport import TTransport
-
-
-class ResponseException(Exception):
-    """Allows handlers to override the HTTP response
-
-    Normally, THttpServer always sends a 200 response.  If a handler wants
-    to override this behavior (e.g., to simulate a misconfigured or
-    overloaded web server during testing), it can raise a ResponseException.
-    The function passed to the constructor will be called with the
-    RequestHandler as its only argument.
-    """
-    def __init__(self, handler):
-        self.handler = handler
-
-
-class THttpServer(TServer.TServer):
-    """A simple HTTP-based Thrift server
-
-    This class is not very performant, but it is useful (for example) for
-    acting as a mock version of an Apache-based PHP Thrift endpoint.
-    """
-    def __init__(self,
-                 processor,
-                 server_address,
-                 inputProtocolFactory,
-                 outputProtocolFactory=None,
-                 server_class=BaseHTTPServer.HTTPServer):
-        """Set up protocol factories and HTTP server.
-
-        See BaseHTTPServer for server_address.
-        See TServer for protocol factories.
-        """
-        if outputProtocolFactory is None:
-            outputProtocolFactory = inputProtocolFactory
-
-        TServer.TServer.__init__(self, processor, None, None, None,
-                                 inputProtocolFactory, outputProtocolFactory)
-
-        thttpserver = self
-
-        class RequestHander(BaseHTTPServer.BaseHTTPRequestHandler):
-            def do_POST(self):
-                # Don't care about the request path.
-                itrans = TTransport.TFileObjectTransport(self.rfile)
-                otrans = TTransport.TFileObjectTransport(self.wfile)
-                itrans = TTransport.TBufferedTransport(
-                    itrans, int(self.headers['Content-Length']))
-                otrans = TTransport.TMemoryBuffer()
-                iprot = thttpserver.inputProtocolFactory.getProtocol(itrans)
-                oprot = thttpserver.outputProtocolFactory.getProtocol(otrans)
-                try:
-                    thttpserver.processor.process(iprot, oprot)
-                except ResponseException as exn:
-                    exn.handler(self)
-                else:
-                    self.send_response(200)
-                    self.send_header("content-type", "application/x-thrift")
-                    self.end_headers()
-                    self.wfile.write(otrans.getvalue())
-
-        self.httpd = server_class(server_address, RequestHander)
-
-    def serve(self):
-        self.httpd.serve_forever()
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/server/TNonblockingServer.py b/vendor/git.apache.org/thrift.git/lib/py/src/server/TNonblockingServer.py
deleted file mode 100644
index 87031c1..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/server/TNonblockingServer.py
+++ /dev/null
@@ -1,350 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-"""Implementation of non-blocking server.
-
-The main idea of the server is to receive and send requests
-only from the main thread.
-
-The thread poool should be sized for concurrent tasks, not
-maximum connections
-"""
-
-import logging
-import select
-import socket
-import struct
-import threading
-
-from six.moves import queue
-
-from thrift.transport import TTransport
-from thrift.protocol.TBinaryProtocol import TBinaryProtocolFactory
-
-__all__ = ['TNonblockingServer']
-
-logger = logging.getLogger(__name__)
-
-
-class Worker(threading.Thread):
-    """Worker is a small helper to process incoming connection."""
-
-    def __init__(self, queue):
-        threading.Thread.__init__(self)
-        self.queue = queue
-
-    def run(self):
-        """Process queries from task queue, stop if processor is None."""
-        while True:
-            try:
-                processor, iprot, oprot, otrans, callback = self.queue.get()
-                if processor is None:
-                    break
-                processor.process(iprot, oprot)
-                callback(True, otrans.getvalue())
-            except Exception:
-                logger.exception("Exception while processing request")
-                callback(False, b'')
-
-WAIT_LEN = 0
-WAIT_MESSAGE = 1
-WAIT_PROCESS = 2
-SEND_ANSWER = 3
-CLOSED = 4
-
-
-def locked(func):
-    """Decorator which locks self.lock."""
-    def nested(self, *args, **kwargs):
-        self.lock.acquire()
-        try:
-            return func(self, *args, **kwargs)
-        finally:
-            self.lock.release()
-    return nested
-
-
-def socket_exception(func):
-    """Decorator close object on socket.error."""
-    def read(self, *args, **kwargs):
-        try:
-            return func(self, *args, **kwargs)
-        except socket.error:
-            self.close()
-    return read
-
-
-class Connection(object):
-    """Basic class is represented connection.
-
-    It can be in state:
-        WAIT_LEN --- connection is reading request len.
-        WAIT_MESSAGE --- connection is reading request.
-        WAIT_PROCESS --- connection has just read whole request and
-                         waits for call ready routine.
-        SEND_ANSWER --- connection is sending answer string (including length
-                        of answer).
-        CLOSED --- socket was closed and connection should be deleted.
-    """
-    def __init__(self, new_socket, wake_up):
-        self.socket = new_socket
-        self.socket.setblocking(False)
-        self.status = WAIT_LEN
-        self.len = 0
-        self.message = b''
-        self.lock = threading.Lock()
-        self.wake_up = wake_up
-
-    def _read_len(self):
-        """Reads length of request.
-
-        It's a safer alternative to self.socket.recv(4)
-        """
-        read = self.socket.recv(4 - len(self.message))
-        if len(read) == 0:
-            # if we read 0 bytes and self.message is empty, then
-            # the client closed the connection
-            if len(self.message) != 0:
-                logger.error("can't read frame size from socket")
-            self.close()
-            return
-        self.message += read
-        if len(self.message) == 4:
-            self.len, = struct.unpack('!i', self.message)
-            if self.len < 0:
-                logger.error("negative frame size, it seems client "
-                             "doesn't use FramedTransport")
-                self.close()
-            elif self.len == 0:
-                logger.error("empty frame, it's really strange")
-                self.close()
-            else:
-                self.message = b''
-                self.status = WAIT_MESSAGE
-
-    @socket_exception
-    def read(self):
-        """Reads data from stream and switch state."""
-        assert self.status in (WAIT_LEN, WAIT_MESSAGE)
-        if self.status == WAIT_LEN:
-            self._read_len()
-            # go back to the main loop here for simplicity instead of
-            # falling through, even though there is a good chance that
-            # the message is already available
-        elif self.status == WAIT_MESSAGE:
-            read = self.socket.recv(self.len - len(self.message))
-            if len(read) == 0:
-                logger.error("can't read frame from socket (get %d of "
-                             "%d bytes)" % (len(self.message), self.len))
-                self.close()
-                return
-            self.message += read
-            if len(self.message) == self.len:
-                self.status = WAIT_PROCESS
-
-    @socket_exception
-    def write(self):
-        """Writes data from socket and switch state."""
-        assert self.status == SEND_ANSWER
-        sent = self.socket.send(self.message)
-        if sent == len(self.message):
-            self.status = WAIT_LEN
-            self.message = b''
-            self.len = 0
-        else:
-            self.message = self.message[sent:]
-
-    @locked
-    def ready(self, all_ok, message):
-        """Callback function for switching state and waking up main thread.
-
-        This function is the only function witch can be called asynchronous.
-
-        The ready can switch Connection to three states:
-            WAIT_LEN if request was oneway.
-            SEND_ANSWER if request was processed in normal way.
-            CLOSED if request throws unexpected exception.
-
-        The one wakes up main thread.
-        """
-        assert self.status == WAIT_PROCESS
-        if not all_ok:
-            self.close()
-            self.wake_up()
-            return
-        self.len = 0
-        if len(message) == 0:
-            # it was a oneway request, do not write answer
-            self.message = b''
-            self.status = WAIT_LEN
-        else:
-            self.message = struct.pack('!i', len(message)) + message
-            self.status = SEND_ANSWER
-        self.wake_up()
-
-    @locked
-    def is_writeable(self):
-        """Return True if connection should be added to write list of select"""
-        return self.status == SEND_ANSWER
-
-    # it's not necessary, but...
-    @locked
-    def is_readable(self):
-        """Return True if connection should be added to read list of select"""
-        return self.status in (WAIT_LEN, WAIT_MESSAGE)
-
-    @locked
-    def is_closed(self):
-        """Returns True if connection is closed."""
-        return self.status == CLOSED
-
-    def fileno(self):
-        """Returns the file descriptor of the associated socket."""
-        return self.socket.fileno()
-
-    def close(self):
-        """Closes connection"""
-        self.status = CLOSED
-        self.socket.close()
-
-
-class TNonblockingServer(object):
-    """Non-blocking server."""
-
-    def __init__(self,
-                 processor,
-                 lsocket,
-                 inputProtocolFactory=None,
-                 outputProtocolFactory=None,
-                 threads=10):
-        self.processor = processor
-        self.socket = lsocket
-        self.in_protocol = inputProtocolFactory or TBinaryProtocolFactory()
-        self.out_protocol = outputProtocolFactory or self.in_protocol
-        self.threads = int(threads)
-        self.clients = {}
-        self.tasks = queue.Queue()
-        self._read, self._write = socket.socketpair()
-        self.prepared = False
-        self._stop = False
-
-    def setNumThreads(self, num):
-        """Set the number of worker threads that should be created."""
-        # implement ThreadPool interface
-        assert not self.prepared, "Can't change number of threads after start"
-        self.threads = num
-
-    def prepare(self):
-        """Prepares server for serve requests."""
-        if self.prepared:
-            return
-        self.socket.listen()
-        for _ in range(self.threads):
-            thread = Worker(self.tasks)
-            thread.setDaemon(True)
-            thread.start()
-        self.prepared = True
-
-    def wake_up(self):
-        """Wake up main thread.
-
-        The server usually waits in select call in we should terminate one.
-        The simplest way is using socketpair.
-
-        Select always wait to read from the first socket of socketpair.
-
-        In this case, we can just write anything to the second socket from
-        socketpair.
-        """
-        self._write.send(b'1')
-
-    def stop(self):
-        """Stop the server.
-
-        This method causes the serve() method to return.  stop() may be invoked
-        from within your handler, or from another thread.
-
-        After stop() is called, serve() will return but the server will still
-        be listening on the socket.  serve() may then be called again to resume
-        processing requests.  Alternatively, close() may be called after
-        serve() returns to close the server socket and shutdown all worker
-        threads.
-        """
-        self._stop = True
-        self.wake_up()
-
-    def _select(self):
-        """Does select on open connections."""
-        readable = [self.socket.handle.fileno(), self._read.fileno()]
-        writable = []
-        for i, connection in list(self.clients.items()):
-            if connection.is_readable():
-                readable.append(connection.fileno())
-            if connection.is_writeable():
-                writable.append(connection.fileno())
-            if connection.is_closed():
-                del self.clients[i]
-        return select.select(readable, writable, readable)
-
-    def handle(self):
-        """Handle requests.
-
-        WARNING! You must call prepare() BEFORE calling handle()
-        """
-        assert self.prepared, "You have to call prepare before handle"
-        rset, wset, xset = self._select()
-        for readable in rset:
-            if readable == self._read.fileno():
-                # don't care i just need to clean readable flag
-                self._read.recv(1024)
-            elif readable == self.socket.handle.fileno():
-                client = self.socket.accept().handle
-                self.clients[client.fileno()] = Connection(client,
-                                                           self.wake_up)
-            else:
-                connection = self.clients[readable]
-                connection.read()
-                if connection.status == WAIT_PROCESS:
-                    itransport = TTransport.TMemoryBuffer(connection.message)
-                    otransport = TTransport.TMemoryBuffer()
-                    iprot = self.in_protocol.getProtocol(itransport)
-                    oprot = self.out_protocol.getProtocol(otransport)
-                    self.tasks.put([self.processor, iprot, oprot,
-                                    otransport, connection.ready])
-        for writeable in wset:
-            self.clients[writeable].write()
-        for oob in xset:
-            self.clients[oob].close()
-            del self.clients[oob]
-
-    def close(self):
-        """Closes the server."""
-        for _ in range(self.threads):
-            self.tasks.put([None, None, None, None, None])
-        self.socket.close()
-        self.prepared = False
-
-    def serve(self):
-        """Serve requests.
-
-        Serve requests forever, or until stop() is called.
-        """
-        self._stop = False
-        self.prepare()
-        while not self._stop:
-            self.handle()
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/server/TProcessPoolServer.py b/vendor/git.apache.org/thrift.git/lib/py/src/server/TProcessPoolServer.py
deleted file mode 100644
index fe6dc81..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/server/TProcessPoolServer.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-import logging
-
-from multiprocessing import Process, Value, Condition
-
-from .TServer import TServer
-from thrift.transport.TTransport import TTransportException
-
-logger = logging.getLogger(__name__)
-
-
-class TProcessPoolServer(TServer):
-    """Server with a fixed size pool of worker subprocesses to service requests
-
-    Note that if you need shared state between the handlers - it's up to you!
-    Written by Dvir Volk, doat.com
-    """
-    def __init__(self, *args):
-        TServer.__init__(self, *args)
-        self.numWorkers = 10
-        self.workers = []
-        self.isRunning = Value('b', False)
-        self.stopCondition = Condition()
-        self.postForkCallback = None
-
-    def setPostForkCallback(self, callback):
-        if not callable(callback):
-            raise TypeError("This is not a callback!")
-        self.postForkCallback = callback
-
-    def setNumWorkers(self, num):
-        """Set the number of worker threads that should be created"""
-        self.numWorkers = num
-
-    def workerProcess(self):
-        """Loop getting clients from the shared queue and process them"""
-        if self.postForkCallback:
-            self.postForkCallback()
-
-        while self.isRunning.value:
-            try:
-                client = self.serverTransport.accept()
-                if not client:
-                    continue
-                self.serveClient(client)
-            except (KeyboardInterrupt, SystemExit):
-                return 0
-            except Exception as x:
-                logger.exception(x)
-
-    def serveClient(self, client):
-        """Process input/output from a client for as long as possible"""
-        itrans = self.inputTransportFactory.getTransport(client)
-        otrans = self.outputTransportFactory.getTransport(client)
-        iprot = self.inputProtocolFactory.getProtocol(itrans)
-        oprot = self.outputProtocolFactory.getProtocol(otrans)
-
-        try:
-            while True:
-                self.processor.process(iprot, oprot)
-        except TTransportException:
-            pass
-        except Exception as x:
-            logger.exception(x)
-
-        itrans.close()
-        otrans.close()
-
-    def serve(self):
-        """Start workers and put into queue"""
-        # this is a shared state that can tell the workers to exit when False
-        self.isRunning.value = True
-
-        # first bind and listen to the port
-        self.serverTransport.listen()
-
-        # fork the children
-        for i in range(self.numWorkers):
-            try:
-                w = Process(target=self.workerProcess)
-                w.daemon = True
-                w.start()
-                self.workers.append(w)
-            except Exception as x:
-                logger.exception(x)
-
-        # wait until the condition is set by stop()
-        while True:
-            self.stopCondition.acquire()
-            try:
-                self.stopCondition.wait()
-                break
-            except (SystemExit, KeyboardInterrupt):
-                break
-            except Exception as x:
-                logger.exception(x)
-
-        self.isRunning.value = False
-
-    def stop(self):
-        self.isRunning.value = False
-        self.stopCondition.acquire()
-        self.stopCondition.notify()
-        self.stopCondition.release()
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/server/TServer.py b/vendor/git.apache.org/thrift.git/lib/py/src/server/TServer.py
deleted file mode 100644
index d5d9c98..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/server/TServer.py
+++ /dev/null
@@ -1,276 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from six.moves import queue
-import logging
-import os
-import threading
-
-from thrift.protocol import TBinaryProtocol
-from thrift.transport import TTransport
-
-logger = logging.getLogger(__name__)
-
-
-class TServer(object):
-    """Base interface for a server, which must have a serve() method.
-
-    Three constructors for all servers:
-    1) (processor, serverTransport)
-    2) (processor, serverTransport, transportFactory, protocolFactory)
-    3) (processor, serverTransport,
-        inputTransportFactory, outputTransportFactory,
-        inputProtocolFactory, outputProtocolFactory)
-    """
-    def __init__(self, *args):
-        if (len(args) == 2):
-            self.__initArgs__(args[0], args[1],
-                              TTransport.TTransportFactoryBase(),
-                              TTransport.TTransportFactoryBase(),
-                              TBinaryProtocol.TBinaryProtocolFactory(),
-                              TBinaryProtocol.TBinaryProtocolFactory())
-        elif (len(args) == 4):
-            self.__initArgs__(args[0], args[1], args[2], args[2], args[3], args[3])
-        elif (len(args) == 6):
-            self.__initArgs__(args[0], args[1], args[2], args[3], args[4], args[5])
-
-    def __initArgs__(self, processor, serverTransport,
-                     inputTransportFactory, outputTransportFactory,
-                     inputProtocolFactory, outputProtocolFactory):
-        self.processor = processor
-        self.serverTransport = serverTransport
-        self.inputTransportFactory = inputTransportFactory
-        self.outputTransportFactory = outputTransportFactory
-        self.inputProtocolFactory = inputProtocolFactory
-        self.outputProtocolFactory = outputProtocolFactory
-
-    def serve(self):
-        pass
-
-
-class TSimpleServer(TServer):
-    """Simple single-threaded server that just pumps around one transport."""
-
-    def __init__(self, *args):
-        TServer.__init__(self, *args)
-
-    def serve(self):
-        self.serverTransport.listen()
-        while True:
-            client = self.serverTransport.accept()
-            if not client:
-                continue
-            itrans = self.inputTransportFactory.getTransport(client)
-            otrans = self.outputTransportFactory.getTransport(client)
-            iprot = self.inputProtocolFactory.getProtocol(itrans)
-            oprot = self.outputProtocolFactory.getProtocol(otrans)
-            try:
-                while True:
-                    self.processor.process(iprot, oprot)
-            except TTransport.TTransportException:
-                pass
-            except Exception as x:
-                logger.exception(x)
-
-            itrans.close()
-            otrans.close()
-
-
-class TThreadedServer(TServer):
-    """Threaded server that spawns a new thread per each connection."""
-
-    def __init__(self, *args, **kwargs):
-        TServer.__init__(self, *args)
-        self.daemon = kwargs.get("daemon", False)
-
-    def serve(self):
-        self.serverTransport.listen()
-        while True:
-            try:
-                client = self.serverTransport.accept()
-                if not client:
-                    continue
-                t = threading.Thread(target=self.handle, args=(client,))
-                t.setDaemon(self.daemon)
-                t.start()
-            except KeyboardInterrupt:
-                raise
-            except Exception as x:
-                logger.exception(x)
-
-    def handle(self, client):
-        itrans = self.inputTransportFactory.getTransport(client)
-        otrans = self.outputTransportFactory.getTransport(client)
-        iprot = self.inputProtocolFactory.getProtocol(itrans)
-        oprot = self.outputProtocolFactory.getProtocol(otrans)
-        try:
-            while True:
-                self.processor.process(iprot, oprot)
-        except TTransport.TTransportException:
-            pass
-        except Exception as x:
-            logger.exception(x)
-
-        itrans.close()
-        otrans.close()
-
-
-class TThreadPoolServer(TServer):
-    """Server with a fixed size pool of threads which service requests."""
-
-    def __init__(self, *args, **kwargs):
-        TServer.__init__(self, *args)
-        self.clients = queue.Queue()
-        self.threads = 10
-        self.daemon = kwargs.get("daemon", False)
-
-    def setNumThreads(self, num):
-        """Set the number of worker threads that should be created"""
-        self.threads = num
-
-    def serveThread(self):
-        """Loop around getting clients from the shared queue and process them."""
-        while True:
-            try:
-                client = self.clients.get()
-                self.serveClient(client)
-            except Exception as x:
-                logger.exception(x)
-
-    def serveClient(self, client):
-        """Process input/output from a client for as long as possible"""
-        itrans = self.inputTransportFactory.getTransport(client)
-        otrans = self.outputTransportFactory.getTransport(client)
-        iprot = self.inputProtocolFactory.getProtocol(itrans)
-        oprot = self.outputProtocolFactory.getProtocol(otrans)
-        try:
-            while True:
-                self.processor.process(iprot, oprot)
-        except TTransport.TTransportException:
-            pass
-        except Exception as x:
-            logger.exception(x)
-
-        itrans.close()
-        otrans.close()
-
-    def serve(self):
-        """Start a fixed number of worker threads and put client into a queue"""
-        for i in range(self.threads):
-            try:
-                t = threading.Thread(target=self.serveThread)
-                t.setDaemon(self.daemon)
-                t.start()
-            except Exception as x:
-                logger.exception(x)
-
-        # Pump the socket for clients
-        self.serverTransport.listen()
-        while True:
-            try:
-                client = self.serverTransport.accept()
-                if not client:
-                    continue
-                self.clients.put(client)
-            except Exception as x:
-                logger.exception(x)
-
-
-class TForkingServer(TServer):
-    """A Thrift server that forks a new process for each request
-
-    This is more scalable than the threaded server as it does not cause
-    GIL contention.
-
-    Note that this has different semantics from the threading server.
-    Specifically, updates to shared variables will no longer be shared.
-    It will also not work on windows.
-
-    This code is heavily inspired by SocketServer.ForkingMixIn in the
-    Python stdlib.
-    """
-    def __init__(self, *args):
-        TServer.__init__(self, *args)
-        self.children = []
-
-    def serve(self):
-        def try_close(file):
-            try:
-                file.close()
-            except IOError as e:
-                logger.warning(e, exc_info=True)
-
-        self.serverTransport.listen()
-        while True:
-            client = self.serverTransport.accept()
-            if not client:
-                continue
-            try:
-                pid = os.fork()
-
-                if pid:  # parent
-                    # add before collect, otherwise you race w/ waitpid
-                    self.children.append(pid)
-                    self.collect_children()
-
-                    # Parent must close socket or the connection may not get
-                    # closed promptly
-                    itrans = self.inputTransportFactory.getTransport(client)
-                    otrans = self.outputTransportFactory.getTransport(client)
-                    try_close(itrans)
-                    try_close(otrans)
-                else:
-                    itrans = self.inputTransportFactory.getTransport(client)
-                    otrans = self.outputTransportFactory.getTransport(client)
-
-                    iprot = self.inputProtocolFactory.getProtocol(itrans)
-                    oprot = self.outputProtocolFactory.getProtocol(otrans)
-
-                    ecode = 0
-                    try:
-                        try:
-                            while True:
-                                self.processor.process(iprot, oprot)
-                        except TTransport.TTransportException:
-                            pass
-                        except Exception as e:
-                            logger.exception(e)
-                            ecode = 1
-                    finally:
-                        try_close(itrans)
-                        try_close(otrans)
-
-                    os._exit(ecode)
-
-            except TTransport.TTransportException:
-                pass
-            except Exception as x:
-                logger.exception(x)
-
-    def collect_children(self):
-        while self.children:
-            try:
-                pid, status = os.waitpid(0, os.WNOHANG)
-            except os.error:
-                pid = None
-
-            if pid:
-                self.children.remove(pid)
-            else:
-                break
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/server/__init__.py b/vendor/git.apache.org/thrift.git/lib/py/src/server/__init__.py
deleted file mode 100644
index 1bf6e25..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/server/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-__all__ = ['TServer', 'TNonblockingServer']
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/transport/THttpClient.py b/vendor/git.apache.org/thrift.git/lib/py/src/transport/THttpClient.py
deleted file mode 100644
index fb33421..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/transport/THttpClient.py
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from io import BytesIO
-import os
-import socket
-import sys
-import warnings
-import base64
-
-from six.moves import urllib
-from six.moves import http_client
-
-from .TTransport import TTransportBase
-import six
-
-
-class THttpClient(TTransportBase):
-    """Http implementation of TTransport base."""
-
-    def __init__(self, uri_or_host, port=None, path=None):
-        """THttpClient supports two different types constructor parameters.
-
-        THttpClient(host, port, path) - deprecated
-        THttpClient(uri)
-
-        Only the second supports https.
-        """
-        if port is not None:
-            warnings.warn(
-                "Please use the THttpClient('http://host:port/path') syntax",
-                DeprecationWarning,
-                stacklevel=2)
-            self.host = uri_or_host
-            self.port = port
-            assert path
-            self.path = path
-            self.scheme = 'http'
-        else:
-            parsed = urllib.parse.urlparse(uri_or_host)
-            self.scheme = parsed.scheme
-            assert self.scheme in ('http', 'https')
-            if self.scheme == 'http':
-                self.port = parsed.port or http_client.HTTP_PORT
-            elif self.scheme == 'https':
-                self.port = parsed.port or http_client.HTTPS_PORT
-            self.host = parsed.hostname
-            self.path = parsed.path
-            if parsed.query:
-                self.path += '?%s' % parsed.query
-        try:
-            proxy = urllib.request.getproxies()[self.scheme]
-        except KeyError:
-            proxy = None
-        else:
-            if urllib.request.proxy_bypass(self.host):
-                proxy = None
-        if proxy:
-            parsed = urllib.parse.urlparse(proxy)
-            self.realhost = self.host
-            self.realport = self.port
-            self.host = parsed.hostname
-            self.port = parsed.port
-            self.proxy_auth = self.basic_proxy_auth_header(parsed)
-        else:
-            self.realhost = self.realport = self.proxy_auth = None
-        self.__wbuf = BytesIO()
-        self.__http = None
-        self.__http_response = None
-        self.__timeout = None
-        self.__custom_headers = None
-
-    @staticmethod
-    def basic_proxy_auth_header(proxy):
-        if proxy is None or not proxy.username:
-            return None
-        ap = "%s:%s" % (urllib.parse.unquote(proxy.username),
-                        urllib.parse.unquote(proxy.password))
-        cr = base64.b64encode(ap).strip()
-        return "Basic " + cr
-
-    def using_proxy(self):
-        return self.realhost is not None
-
-    def open(self):
-        if self.scheme == 'http':
-            self.__http = http_client.HTTPConnection(self.host, self.port)
-        elif self.scheme == 'https':
-            self.__http = http_client.HTTPSConnection(self.host, self.port)
-            if self.using_proxy():
-                self.__http.set_tunnel(self.realhost, self.realport,
-                                       {"Proxy-Authorization": self.proxy_auth})
-
-    def close(self):
-        self.__http.close()
-        self.__http = None
-        self.__http_response = None
-
-    def isOpen(self):
-        return self.__http is not None
-
-    def setTimeout(self, ms):
-        if not hasattr(socket, 'getdefaulttimeout'):
-            raise NotImplementedError
-
-        if ms is None:
-            self.__timeout = None
-        else:
-            self.__timeout = ms / 1000.0
-
-    def setCustomHeaders(self, headers):
-        self.__custom_headers = headers
-
-    def read(self, sz):
-        return self.__http_response.read(sz)
-
-    def write(self, buf):
-        self.__wbuf.write(buf)
-
-    def __withTimeout(f):
-        def _f(*args, **kwargs):
-            orig_timeout = socket.getdefaulttimeout()
-            socket.setdefaulttimeout(args[0].__timeout)
-            try:
-                result = f(*args, **kwargs)
-            finally:
-                socket.setdefaulttimeout(orig_timeout)
-            return result
-        return _f
-
-    def flush(self):
-        if self.isOpen():
-            self.close()
-        self.open()
-
-        # Pull data out of buffer
-        data = self.__wbuf.getvalue()
-        self.__wbuf = BytesIO()
-
-        # HTTP request
-        if self.using_proxy() and self.scheme == "http":
-            # need full URL of real host for HTTP proxy here (HTTPS uses CONNECT tunnel)
-            self.__http.putrequest('POST', "http://%s:%s%s" %
-                                   (self.realhost, self.realport, self.path))
-        else:
-            self.__http.putrequest('POST', self.path)
-
-        # Write headers
-        self.__http.putheader('Content-Type', 'application/x-thrift')
-        self.__http.putheader('Content-Length', str(len(data)))
-        if self.using_proxy() and self.scheme == "http" and self.proxy_auth is not None:
-            self.__http.putheader("Proxy-Authorization", self.proxy_auth)
-
-        if not self.__custom_headers or 'User-Agent' not in self.__custom_headers:
-            user_agent = 'Python/THttpClient'
-            script = os.path.basename(sys.argv[0])
-            if script:
-                user_agent = '%s (%s)' % (user_agent, urllib.parse.quote(script))
-            self.__http.putheader('User-Agent', user_agent)
-
-        if self.__custom_headers:
-            for key, val in six.iteritems(self.__custom_headers):
-                self.__http.putheader(key, val)
-
-        self.__http.endheaders()
-
-        # Write payload
-        self.__http.send(data)
-
-        # Get reply to flush the request
-        self.__http_response = self.__http.getresponse()
-        self.code = self.__http_response.status
-        self.message = self.__http_response.reason
-        self.headers = self.__http_response.msg
-
-    # Decorate if we know how to timeout
-    if hasattr(socket, 'getdefaulttimeout'):
-        flush = __withTimeout(flush)
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TSSLSocket.py b/vendor/git.apache.org/thrift.git/lib/py/src/transport/TSSLSocket.py
deleted file mode 100644
index 0f7d45e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TSSLSocket.py
+++ /dev/null
@@ -1,396 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import logging
-import os
-import socket
-import ssl
-import sys
-import warnings
-
-from .sslcompat import _match_hostname, _match_has_ipaddress
-from thrift.transport import TSocket
-from thrift.transport.TTransport import TTransportException
-
-logger = logging.getLogger(__name__)
-warnings.filterwarnings(
-    'default', category=DeprecationWarning, module=__name__)
-
-
-class TSSLBase(object):
-    # SSLContext is not available for Python < 2.7.9
-    _has_ssl_context = sys.hexversion >= 0x020709F0
-
-    # ciphers argument is not available for Python < 2.7.0
-    _has_ciphers = sys.hexversion >= 0x020700F0
-
-    # For pythoon >= 2.7.9, use latest TLS that both client and server
-    # supports.
-    # SSL 2.0 and 3.0 are disabled via ssl.OP_NO_SSLv2 and ssl.OP_NO_SSLv3.
-    # For pythoon < 2.7.9, use TLS 1.0 since TLSv1_X nor OP_NO_SSLvX is
-    # unavailable.
-    _default_protocol = ssl.PROTOCOL_SSLv23 if _has_ssl_context else \
-        ssl.PROTOCOL_TLSv1
-
-    def _init_context(self, ssl_version):
-        if self._has_ssl_context:
-            self._context = ssl.SSLContext(ssl_version)
-            if self._context.protocol == ssl.PROTOCOL_SSLv23:
-                self._context.options |= ssl.OP_NO_SSLv2
-                self._context.options |= ssl.OP_NO_SSLv3
-        else:
-            self._context = None
-            self._ssl_version = ssl_version
-
-    @property
-    def _should_verify(self):
-        if self._has_ssl_context:
-            return self._context.verify_mode != ssl.CERT_NONE
-        else:
-            return self.cert_reqs != ssl.CERT_NONE
-
-    @property
-    def ssl_version(self):
-        if self._has_ssl_context:
-            return self.ssl_context.protocol
-        else:
-            return self._ssl_version
-
-    @property
-    def ssl_context(self):
-        return self._context
-
-    SSL_VERSION = _default_protocol
-    """
-  Default SSL version.
-  For backword compatibility, it can be modified.
-  Use __init__ keywoard argument "ssl_version" instead.
-  """
-
-    def _deprecated_arg(self, args, kwargs, pos, key):
-        if len(args) <= pos:
-            return
-        real_pos = pos + 3
-        warnings.warn(
-            '%dth positional argument is deprecated.'
-            'please use keyward argument insteand.'
-            % real_pos, DeprecationWarning, stacklevel=3)
-
-        if key in kwargs:
-            raise TypeError(
-                'Duplicate argument: %dth argument and %s keyward argument.'
-                % (real_pos, key))
-        kwargs[key] = args[pos]
-
-    def _unix_socket_arg(self, host, port, args, kwargs):
-        key = 'unix_socket'
-        if host is None and port is None and len(args) == 1 and key not in kwargs:
-            kwargs[key] = args[0]
-            return True
-        return False
-
-    def __getattr__(self, key):
-        if key == 'SSL_VERSION':
-            warnings.warn(
-                'SSL_VERSION is deprecated.'
-                'please use ssl_version attribute instead.',
-                DeprecationWarning, stacklevel=2)
-            return self.ssl_version
-
-    def __init__(self, server_side, host, ssl_opts):
-        self._server_side = server_side
-        if TSSLBase.SSL_VERSION != self._default_protocol:
-            warnings.warn(
-                'SSL_VERSION is deprecated.'
-                'please use ssl_version keyward argument instead.',
-                DeprecationWarning, stacklevel=2)
-        self._context = ssl_opts.pop('ssl_context', None)
-        self._server_hostname = None
-        if not self._server_side:
-            self._server_hostname = ssl_opts.pop('server_hostname', host)
-        if self._context:
-            self._custom_context = True
-            if ssl_opts:
-                raise ValueError(
-                    'Incompatible arguments: ssl_context and %s'
-                    % ' '.join(ssl_opts.keys()))
-            if not self._has_ssl_context:
-                raise ValueError(
-                    'ssl_context is not available for this version of Python')
-        else:
-            self._custom_context = False
-            ssl_version = ssl_opts.pop('ssl_version', TSSLBase.SSL_VERSION)
-            self._init_context(ssl_version)
-            self.cert_reqs = ssl_opts.pop('cert_reqs', ssl.CERT_REQUIRED)
-            self.ca_certs = ssl_opts.pop('ca_certs', None)
-            self.keyfile = ssl_opts.pop('keyfile', None)
-            self.certfile = ssl_opts.pop('certfile', None)
-            self.ciphers = ssl_opts.pop('ciphers', None)
-
-            if ssl_opts:
-                raise ValueError(
-                    'Unknown keyword arguments: ', ' '.join(ssl_opts.keys()))
-
-            if self._should_verify:
-                if not self.ca_certs:
-                    raise ValueError(
-                        'ca_certs is needed when cert_reqs is not ssl.CERT_NONE')
-                if not os.access(self.ca_certs, os.R_OK):
-                    raise IOError('Certificate Authority ca_certs file "%s" '
-                                  'is not readable, cannot validate SSL '
-                                  'certificates.' % (self.ca_certs))
-
-    @property
-    def certfile(self):
-        return self._certfile
-
-    @certfile.setter
-    def certfile(self, certfile):
-        if self._server_side and not certfile:
-            raise ValueError('certfile is needed for server-side')
-        if certfile and not os.access(certfile, os.R_OK):
-            raise IOError('No such certfile found: %s' % (certfile))
-        self._certfile = certfile
-
-    def _wrap_socket(self, sock):
-        if self._has_ssl_context:
-            if not self._custom_context:
-                self.ssl_context.verify_mode = self.cert_reqs
-                if self.certfile:
-                    self.ssl_context.load_cert_chain(self.certfile,
-                                                     self.keyfile)
-                if self.ciphers:
-                    self.ssl_context.set_ciphers(self.ciphers)
-                if self.ca_certs:
-                    self.ssl_context.load_verify_locations(self.ca_certs)
-            return self.ssl_context.wrap_socket(
-                sock, server_side=self._server_side,
-                server_hostname=self._server_hostname)
-        else:
-            ssl_opts = {
-                'ssl_version': self._ssl_version,
-                'server_side': self._server_side,
-                'ca_certs': self.ca_certs,
-                'keyfile': self.keyfile,
-                'certfile': self.certfile,
-                'cert_reqs': self.cert_reqs,
-            }
-            if self.ciphers:
-                if self._has_ciphers:
-                    ssl_opts['ciphers'] = self.ciphers
-                else:
-                    logger.warning(
-                        'ciphers is specified but ignored due to old Python version')
-            return ssl.wrap_socket(sock, **ssl_opts)
-
-
-class TSSLSocket(TSocket.TSocket, TSSLBase):
-    """
-    SSL implementation of TSocket
-
-    This class creates outbound sockets wrapped using the
-    python standard ssl module for encrypted connections.
-    """
-
-    # New signature
-    # def __init__(self, host='localhost', port=9090, unix_socket=None,
-    #              **ssl_args):
-    # Deprecated signature
-    # def __init__(self, host='localhost', port=9090, validate=True,
-    #              ca_certs=None, keyfile=None, certfile=None,
-    #              unix_socket=None, ciphers=None):
-    def __init__(self, host='localhost', port=9090, *args, **kwargs):
-        """Positional arguments: ``host``, ``port``, ``unix_socket``
-
-        Keyword arguments: ``keyfile``, ``certfile``, ``cert_reqs``,
-                           ``ssl_version``, ``ca_certs``,
-                           ``ciphers`` (Python 2.7.0 or later),
-                           ``server_hostname`` (Python 2.7.9 or later)
-        Passed to ssl.wrap_socket. See ssl.wrap_socket documentation.
-
-        Alternative keyword arguments: (Python 2.7.9 or later)
-          ``ssl_context``: ssl.SSLContext to be used for SSLContext.wrap_socket
-          ``server_hostname``: Passed to SSLContext.wrap_socket
-
-        Common keyword argument:
-          ``validate_callback`` (cert, hostname) -> None:
-              Called after SSL handshake. Can raise when hostname does not
-              match the cert.
-        """
-        self.is_valid = False
-        self.peercert = None
-
-        if args:
-            if len(args) > 6:
-                raise TypeError('Too many positional argument')
-            if not self._unix_socket_arg(host, port, args, kwargs):
-                self._deprecated_arg(args, kwargs, 0, 'validate')
-            self._deprecated_arg(args, kwargs, 1, 'ca_certs')
-            self._deprecated_arg(args, kwargs, 2, 'keyfile')
-            self._deprecated_arg(args, kwargs, 3, 'certfile')
-            self._deprecated_arg(args, kwargs, 4, 'unix_socket')
-            self._deprecated_arg(args, kwargs, 5, 'ciphers')
-
-        validate = kwargs.pop('validate', None)
-        if validate is not None:
-            cert_reqs_name = 'CERT_REQUIRED' if validate else 'CERT_NONE'
-            warnings.warn(
-                'validate is deprecated. please use cert_reqs=ssl.%s instead'
-                % cert_reqs_name,
-                DeprecationWarning, stacklevel=2)
-            if 'cert_reqs' in kwargs:
-                raise TypeError('Cannot specify both validate and cert_reqs')
-            kwargs['cert_reqs'] = ssl.CERT_REQUIRED if validate else ssl.CERT_NONE
-
-        unix_socket = kwargs.pop('unix_socket', None)
-        self._validate_callback = kwargs.pop('validate_callback', _match_hostname)
-        TSSLBase.__init__(self, False, host, kwargs)
-        TSocket.TSocket.__init__(self, host, port, unix_socket)
-
-    @property
-    def validate(self):
-        warnings.warn('validate is deprecated. please use cert_reqs instead',
-                      DeprecationWarning, stacklevel=2)
-        return self.cert_reqs != ssl.CERT_NONE
-
-    @validate.setter
-    def validate(self, value):
-        warnings.warn('validate is deprecated. please use cert_reqs instead',
-                      DeprecationWarning, stacklevel=2)
-        self.cert_reqs = ssl.CERT_REQUIRED if value else ssl.CERT_NONE
-
-    def _do_open(self, family, socktype):
-        plain_sock = socket.socket(family, socktype)
-        try:
-            return self._wrap_socket(plain_sock)
-        except Exception:
-            plain_sock.close()
-            msg = 'failed to initialize SSL'
-            logger.exception(msg)
-            raise TTransportException(TTransportException.NOT_OPEN, msg)
-
-    def open(self):
-        super(TSSLSocket, self).open()
-        if self._should_verify:
-            self.peercert = self.handle.getpeercert()
-            try:
-                self._validate_callback(self.peercert, self._server_hostname)
-                self.is_valid = True
-            except TTransportException:
-                raise
-            except Exception as ex:
-                raise TTransportException(TTransportException.UNKNOWN, str(ex))
-
-
-class TSSLServerSocket(TSocket.TServerSocket, TSSLBase):
-    """SSL implementation of TServerSocket
-
-    This uses the ssl module's wrap_socket() method to provide SSL
-    negotiated encryption.
-    """
-
-    # New signature
-    # def __init__(self, host='localhost', port=9090, unix_socket=None, **ssl_args):
-    # Deprecated signature
-    # def __init__(self, host=None, port=9090, certfile='cert.pem', unix_socket=None, ciphers=None):
-    def __init__(self, host=None, port=9090, *args, **kwargs):
-        """Positional arguments: ``host``, ``port``, ``unix_socket``
-
-        Keyword arguments: ``keyfile``, ``certfile``, ``cert_reqs``, ``ssl_version``,
-                           ``ca_certs``, ``ciphers`` (Python 2.7.0 or later)
-        See ssl.wrap_socket documentation.
-
-        Alternative keyword arguments: (Python 2.7.9 or later)
-          ``ssl_context``: ssl.SSLContext to be used for SSLContext.wrap_socket
-          ``server_hostname``: Passed to SSLContext.wrap_socket
-
-        Common keyword argument:
-          ``validate_callback`` (cert, hostname) -> None:
-              Called after SSL handshake. Can raise when hostname does not
-              match the cert.
-        """
-        if args:
-            if len(args) > 3:
-                raise TypeError('Too many positional argument')
-            if not self._unix_socket_arg(host, port, args, kwargs):
-                self._deprecated_arg(args, kwargs, 0, 'certfile')
-            self._deprecated_arg(args, kwargs, 1, 'unix_socket')
-            self._deprecated_arg(args, kwargs, 2, 'ciphers')
-
-        if 'ssl_context' not in kwargs:
-            # Preserve existing behaviors for default values
-            if 'cert_reqs' not in kwargs:
-                kwargs['cert_reqs'] = ssl.CERT_NONE
-            if'certfile' not in kwargs:
-                kwargs['certfile'] = 'cert.pem'
-
-        unix_socket = kwargs.pop('unix_socket', None)
-        self._validate_callback = \
-            kwargs.pop('validate_callback', _match_hostname)
-        TSSLBase.__init__(self, True, None, kwargs)
-        TSocket.TServerSocket.__init__(self, host, port, unix_socket)
-        if self._should_verify and not _match_has_ipaddress:
-            raise ValueError('Need ipaddress and backports.ssl_match_hostname '
-                             'module to verify client certificate')
-
-    def setCertfile(self, certfile):
-        """Set or change the server certificate file used to wrap new
-        connections.
-
-        @param certfile: The filename of the server certificate,
-                         i.e. '/etc/certs/server.pem'
-        @type certfile: str
-
-        Raises an IOError exception if the certfile is not present or unreadable.
-        """
-        warnings.warn(
-            'setCertfile is deprecated. please use certfile property instead.',
-            DeprecationWarning, stacklevel=2)
-        self.certfile = certfile
-
-    def accept(self):
-        plain_client, addr = self.handle.accept()
-        try:
-            client = self._wrap_socket(plain_client)
-        except ssl.SSLError:
-            logger.exception('Error while accepting from %s', addr)
-            # failed handshake/ssl wrap, close socket to client
-            plain_client.close()
-            # raise
-            # We can't raise the exception, because it kills most TServer derived
-            # serve() methods.
-            # Instead, return None, and let the TServer instance deal with it in
-            # other exception handling.  (but TSimpleServer dies anyway)
-            return None
-
-        if self._should_verify:
-            client.peercert = client.getpeercert()
-            try:
-                self._validate_callback(client.peercert, addr[0])
-                client.is_valid = True
-            except Exception:
-                logger.warn('Failed to validate client certificate address: %s',
-                            addr[0], exc_info=True)
-                client.close()
-                plain_client.close()
-                return None
-
-        result = TSocket.TSocket()
-        result.handle = client
-        return result
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TSocket.py b/vendor/git.apache.org/thrift.git/lib/py/src/transport/TSocket.py
deleted file mode 100644
index c91de9d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TSocket.py
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import errno
-import logging
-import os
-import socket
-import sys
-
-from .TTransport import TTransportBase, TTransportException, TServerTransportBase
-
-logger = logging.getLogger(__name__)
-
-
-class TSocketBase(TTransportBase):
-    def _resolveAddr(self):
-        if self._unix_socket is not None:
-            return [(socket.AF_UNIX, socket.SOCK_STREAM, None, None,
-                     self._unix_socket)]
-        else:
-            return socket.getaddrinfo(self.host,
-                                      self.port,
-                                      self._socket_family,
-                                      socket.SOCK_STREAM,
-                                      0,
-                                      socket.AI_PASSIVE | socket.AI_ADDRCONFIG)
-
-    def close(self):
-        if self.handle:
-            self.handle.close()
-            self.handle = None
-
-
-class TSocket(TSocketBase):
-    """Socket implementation of TTransport base."""
-
-    def __init__(self, host='localhost', port=9090, unix_socket=None, socket_family=socket.AF_UNSPEC):
-        """Initialize a TSocket
-
-        @param host(str)  The host to connect to.
-        @param port(int)  The (TCP) port to connect to.
-        @param unix_socket(str)  The filename of a unix socket to connect to.
-                                 (host and port will be ignored.)
-        @param socket_family(int)  The socket family to use with this socket.
-        """
-        self.host = host
-        self.port = port
-        self.handle = None
-        self._unix_socket = unix_socket
-        self._timeout = None
-        self._socket_family = socket_family
-
-    def setHandle(self, h):
-        self.handle = h
-
-    def isOpen(self):
-        return self.handle is not None
-
-    def setTimeout(self, ms):
-        if ms is None:
-            self._timeout = None
-        else:
-            self._timeout = ms / 1000.0
-
-        if self.handle is not None:
-            self.handle.settimeout(self._timeout)
-
-    def _do_open(self, family, socktype):
-        return socket.socket(family, socktype)
-
-    @property
-    def _address(self):
-        return self._unix_socket if self._unix_socket else '%s:%d' % (self.host, self.port)
-
-    def open(self):
-        if self.handle:
-            raise TTransportException(TTransportException.ALREADY_OPEN)
-        try:
-            addrs = self._resolveAddr()
-        except socket.gaierror:
-            msg = 'failed to resolve sockaddr for ' + str(self._address)
-            logger.exception(msg)
-            raise TTransportException(TTransportException.NOT_OPEN, msg)
-        for family, socktype, _, _, sockaddr in addrs:
-            handle = self._do_open(family, socktype)
-            handle.settimeout(self._timeout)
-            try:
-                handle.connect(sockaddr)
-                self.handle = handle
-                return
-            except socket.error:
-                handle.close()
-                logger.info('Could not connect to %s', sockaddr, exc_info=True)
-        msg = 'Could not connect to any of %s' % list(map(lambda a: a[4],
-                                                          addrs))
-        logger.error(msg)
-        raise TTransportException(TTransportException.NOT_OPEN, msg)
-
-    def read(self, sz):
-        try:
-            buff = self.handle.recv(sz)
-        except socket.error as e:
-            if (e.args[0] == errno.ECONNRESET and
-                    (sys.platform == 'darwin' or sys.platform.startswith('freebsd'))):
-                # freebsd and Mach don't follow POSIX semantic of recv
-                # and fail with ECONNRESET if peer performed shutdown.
-                # See corresponding comment and code in TSocket::read()
-                # in lib/cpp/src/transport/TSocket.cpp.
-                self.close()
-                # Trigger the check to raise the END_OF_FILE exception below.
-                buff = ''
-            else:
-                raise
-        if len(buff) == 0:
-            raise TTransportException(type=TTransportException.END_OF_FILE,
-                                      message='TSocket read 0 bytes')
-        return buff
-
-    def write(self, buff):
-        if not self.handle:
-            raise TTransportException(type=TTransportException.NOT_OPEN,
-                                      message='Transport not open')
-        sent = 0
-        have = len(buff)
-        while sent < have:
-            plus = self.handle.send(buff)
-            if plus == 0:
-                raise TTransportException(type=TTransportException.END_OF_FILE,
-                                          message='TSocket sent 0 bytes')
-            sent += plus
-            buff = buff[plus:]
-
-    def flush(self):
-        pass
-
-
-class TServerSocket(TSocketBase, TServerTransportBase):
-    """Socket implementation of TServerTransport base."""
-
-    def __init__(self, host=None, port=9090, unix_socket=None, socket_family=socket.AF_UNSPEC):
-        self.host = host
-        self.port = port
-        self._unix_socket = unix_socket
-        self._socket_family = socket_family
-        self.handle = None
-
-    def listen(self):
-        res0 = self._resolveAddr()
-        socket_family = self._socket_family == socket.AF_UNSPEC and socket.AF_INET6 or self._socket_family
-        for res in res0:
-            if res[0] is socket_family or res is res0[-1]:
-                break
-
-        # We need remove the old unix socket if the file exists and
-        # nobody is listening on it.
-        if self._unix_socket:
-            tmp = socket.socket(res[0], res[1])
-            try:
-                tmp.connect(res[4])
-            except socket.error as err:
-                eno, message = err.args
-                if eno == errno.ECONNREFUSED:
-                    os.unlink(res[4])
-
-        self.handle = socket.socket(res[0], res[1])
-        self.handle.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        if hasattr(self.handle, 'settimeout'):
-            self.handle.settimeout(None)
-        self.handle.bind(res[4])
-        self.handle.listen(128)
-
-    def accept(self):
-        client, addr = self.handle.accept()
-        result = TSocket()
-        result.setHandle(client)
-        return result
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TTransport.py b/vendor/git.apache.org/thrift.git/lib/py/src/transport/TTransport.py
deleted file mode 100644
index 5283fce..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TTransport.py
+++ /dev/null
@@ -1,452 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from struct import pack, unpack
-from thrift.Thrift import TException
-from ..compat import BufferIO
-
-
-class TTransportException(TException):
-    """Custom Transport Exception class"""
-
-    UNKNOWN = 0
-    NOT_OPEN = 1
-    ALREADY_OPEN = 2
-    TIMED_OUT = 3
-    END_OF_FILE = 4
-    NEGATIVE_SIZE = 5
-    SIZE_LIMIT = 6
-
-    def __init__(self, type=UNKNOWN, message=None):
-        TException.__init__(self, message)
-        self.type = type
-
-
-class TTransportBase(object):
-    """Base class for Thrift transport layer."""
-
-    def isOpen(self):
-        pass
-
-    def open(self):
-        pass
-
-    def close(self):
-        pass
-
-    def read(self, sz):
-        pass
-
-    def readAll(self, sz):
-        buff = b''
-        have = 0
-        while (have < sz):
-            chunk = self.read(sz - have)
-            have += len(chunk)
-            buff += chunk
-
-            if len(chunk) == 0:
-                raise EOFError()
-
-        return buff
-
-    def write(self, buf):
-        pass
-
-    def flush(self):
-        pass
-
-
-# This class should be thought of as an interface.
-class CReadableTransport(object):
-    """base class for transports that are readable from C"""
-
-    # TODO(dreiss): Think about changing this interface to allow us to use
-    #               a (Python, not c) StringIO instead, because it allows
-    #               you to write after reading.
-
-    # NOTE: This is a classic class, so properties will NOT work
-    #       correctly for setting.
-    @property
-    def cstringio_buf(self):
-        """A cStringIO buffer that contains the current chunk we are reading."""
-        pass
-
-    def cstringio_refill(self, partialread, reqlen):
-        """Refills cstringio_buf.
-
-        Returns the currently used buffer (which can but need not be the same as
-        the old cstringio_buf). partialread is what the C code has read from the
-        buffer, and should be inserted into the buffer before any more reads.  The
-        return value must be a new, not borrowed reference.  Something along the
-        lines of self._buf should be fine.
-
-        If reqlen bytes can't be read, throw EOFError.
-        """
-        pass
-
-
-class TServerTransportBase(object):
-    """Base class for Thrift server transports."""
-
-    def listen(self):
-        pass
-
-    def accept(self):
-        pass
-
-    def close(self):
-        pass
-
-
-class TTransportFactoryBase(object):
-    """Base class for a Transport Factory"""
-
-    def getTransport(self, trans):
-        return trans
-
-
-class TBufferedTransportFactory(object):
-    """Factory transport that builds buffered transports"""
-
-    def getTransport(self, trans):
-        buffered = TBufferedTransport(trans)
-        return buffered
-
-
-class TBufferedTransport(TTransportBase, CReadableTransport):
-    """Class that wraps another transport and buffers its I/O.
-
-    The implementation uses a (configurable) fixed-size read buffer
-    but buffers all writes until a flush is performed.
-    """
-    DEFAULT_BUFFER = 4096
-
-    def __init__(self, trans, rbuf_size=DEFAULT_BUFFER):
-        self.__trans = trans
-        self.__wbuf = BufferIO()
-        # Pass string argument to initialize read buffer as cStringIO.InputType
-        self.__rbuf = BufferIO(b'')
-        self.__rbuf_size = rbuf_size
-
-    def isOpen(self):
-        return self.__trans.isOpen()
-
-    def open(self):
-        return self.__trans.open()
-
-    def close(self):
-        return self.__trans.close()
-
-    def read(self, sz):
-        ret = self.__rbuf.read(sz)
-        if len(ret) != 0:
-            return ret
-        self.__rbuf = BufferIO(self.__trans.read(max(sz, self.__rbuf_size)))
-        return self.__rbuf.read(sz)
-
-    def write(self, buf):
-        try:
-            self.__wbuf.write(buf)
-        except Exception as e:
-            # on exception reset wbuf so it doesn't contain a partial function call
-            self.__wbuf = BufferIO()
-            raise e
-        self.__wbuf.getvalue()
-
-    def flush(self):
-        out = self.__wbuf.getvalue()
-        # reset wbuf before write/flush to preserve state on underlying failure
-        self.__wbuf = BufferIO()
-        self.__trans.write(out)
-        self.__trans.flush()
-
-    # Implement the CReadableTransport interface.
-    @property
-    def cstringio_buf(self):
-        return self.__rbuf
-
-    def cstringio_refill(self, partialread, reqlen):
-        retstring = partialread
-        if reqlen < self.__rbuf_size:
-            # try to make a read of as much as we can.
-            retstring += self.__trans.read(self.__rbuf_size)
-
-        # but make sure we do read reqlen bytes.
-        if len(retstring) < reqlen:
-            retstring += self.__trans.readAll(reqlen - len(retstring))
-
-        self.__rbuf = BufferIO(retstring)
-        return self.__rbuf
-
-
-class TMemoryBuffer(TTransportBase, CReadableTransport):
-    """Wraps a cBytesIO object as a TTransport.
-
-    NOTE: Unlike the C++ version of this class, you cannot write to it
-          then immediately read from it.  If you want to read from a
-          TMemoryBuffer, you must either pass a string to the constructor.
-    TODO(dreiss): Make this work like the C++ version.
-    """
-
-    def __init__(self, value=None):
-        """value -- a value to read from for stringio
-
-        If value is set, this will be a transport for reading,
-        otherwise, it is for writing"""
-        if value is not None:
-            self._buffer = BufferIO(value)
-        else:
-            self._buffer = BufferIO()
-
-    def isOpen(self):
-        return not self._buffer.closed
-
-    def open(self):
-        pass
-
-    def close(self):
-        self._buffer.close()
-
-    def read(self, sz):
-        return self._buffer.read(sz)
-
-    def write(self, buf):
-        self._buffer.write(buf)
-
-    def flush(self):
-        pass
-
-    def getvalue(self):
-        return self._buffer.getvalue()
-
-    # Implement the CReadableTransport interface.
-    @property
-    def cstringio_buf(self):
-        return self._buffer
-
-    def cstringio_refill(self, partialread, reqlen):
-        # only one shot at reading...
-        raise EOFError()
-
-
-class TFramedTransportFactory(object):
-    """Factory transport that builds framed transports"""
-
-    def getTransport(self, trans):
-        framed = TFramedTransport(trans)
-        return framed
-
-
-class TFramedTransport(TTransportBase, CReadableTransport):
-    """Class that wraps another transport and frames its I/O when writing."""
-
-    def __init__(self, trans,):
-        self.__trans = trans
-        self.__rbuf = BufferIO(b'')
-        self.__wbuf = BufferIO()
-
-    def isOpen(self):
-        return self.__trans.isOpen()
-
-    def open(self):
-        return self.__trans.open()
-
-    def close(self):
-        return self.__trans.close()
-
-    def read(self, sz):
-        ret = self.__rbuf.read(sz)
-        if len(ret) != 0:
-            return ret
-
-        self.readFrame()
-        return self.__rbuf.read(sz)
-
-    def readFrame(self):
-        buff = self.__trans.readAll(4)
-        sz, = unpack('!i', buff)
-        self.__rbuf = BufferIO(self.__trans.readAll(sz))
-
-    def write(self, buf):
-        self.__wbuf.write(buf)
-
-    def flush(self):
-        wout = self.__wbuf.getvalue()
-        wsz = len(wout)
-        # reset wbuf before write/flush to preserve state on underlying failure
-        self.__wbuf = BufferIO()
-        # N.B.: Doing this string concatenation is WAY cheaper than making
-        # two separate calls to the underlying socket object. Socket writes in
-        # Python turn out to be REALLY expensive, but it seems to do a pretty
-        # good job of managing string buffer operations without excessive copies
-        buf = pack("!i", wsz) + wout
-        self.__trans.write(buf)
-        self.__trans.flush()
-
-    # Implement the CReadableTransport interface.
-    @property
-    def cstringio_buf(self):
-        return self.__rbuf
-
-    def cstringio_refill(self, prefix, reqlen):
-        # self.__rbuf will already be empty here because fastbinary doesn't
-        # ask for a refill until the previous buffer is empty.  Therefore,
-        # we can start reading new frames immediately.
-        while len(prefix) < reqlen:
-            self.readFrame()
-            prefix += self.__rbuf.getvalue()
-        self.__rbuf = BufferIO(prefix)
-        return self.__rbuf
-
-
-class TFileObjectTransport(TTransportBase):
-    """Wraps a file-like object to make it work as a Thrift transport."""
-
-    def __init__(self, fileobj):
-        self.fileobj = fileobj
-
-    def isOpen(self):
-        return True
-
-    def close(self):
-        self.fileobj.close()
-
-    def read(self, sz):
-        return self.fileobj.read(sz)
-
-    def write(self, buf):
-        self.fileobj.write(buf)
-
-    def flush(self):
-        self.fileobj.flush()
-
-
-class TSaslClientTransport(TTransportBase, CReadableTransport):
-    """
-    SASL transport
-    """
-
-    START = 1
-    OK = 2
-    BAD = 3
-    ERROR = 4
-    COMPLETE = 5
-
-    def __init__(self, transport, host, service, mechanism='GSSAPI',
-                 **sasl_kwargs):
-        """
-        transport: an underlying transport to use, typically just a TSocket
-        host: the name of the server, from a SASL perspective
-        service: the name of the server's service, from a SASL perspective
-        mechanism: the name of the preferred mechanism to use
-
-        All other kwargs will be passed to the puresasl.client.SASLClient
-        constructor.
-        """
-
-        from puresasl.client import SASLClient
-
-        self.transport = transport
-        self.sasl = SASLClient(host, service, mechanism, **sasl_kwargs)
-
-        self.__wbuf = BufferIO()
-        self.__rbuf = BufferIO(b'')
-
-    def open(self):
-        if not self.transport.isOpen():
-            self.transport.open()
-
-        self.send_sasl_msg(self.START, self.sasl.mechanism)
-        self.send_sasl_msg(self.OK, self.sasl.process())
-
-        while True:
-            status, challenge = self.recv_sasl_msg()
-            if status == self.OK:
-                self.send_sasl_msg(self.OK, self.sasl.process(challenge))
-            elif status == self.COMPLETE:
-                if not self.sasl.complete:
-                    raise TTransportException(
-                        TTransportException.NOT_OPEN,
-                        "The server erroneously indicated "
-                        "that SASL negotiation was complete")
-                else:
-                    break
-            else:
-                raise TTransportException(
-                    TTransportException.NOT_OPEN,
-                    "Bad SASL negotiation status: %d (%s)"
-                    % (status, challenge))
-
-    def send_sasl_msg(self, status, body):
-        header = pack(">BI", status, len(body))
-        self.transport.write(header + body)
-        self.transport.flush()
-
-    def recv_sasl_msg(self):
-        header = self.transport.readAll(5)
-        status, length = unpack(">BI", header)
-        if length > 0:
-            payload = self.transport.readAll(length)
-        else:
-            payload = ""
-        return status, payload
-
-    def write(self, data):
-        self.__wbuf.write(data)
-
-    def flush(self):
-        data = self.__wbuf.getvalue()
-        encoded = self.sasl.wrap(data)
-        self.transport.write(''.join((pack("!i", len(encoded)), encoded)))
-        self.transport.flush()
-        self.__wbuf = BufferIO()
-
-    def read(self, sz):
-        ret = self.__rbuf.read(sz)
-        if len(ret) != 0:
-            return ret
-
-        self._read_frame()
-        return self.__rbuf.read(sz)
-
-    def _read_frame(self):
-        header = self.transport.readAll(4)
-        length, = unpack('!i', header)
-        encoded = self.transport.readAll(length)
-        self.__rbuf = BufferIO(self.sasl.unwrap(encoded))
-
-    def close(self):
-        self.sasl.dispose()
-        self.transport.close()
-
-    # based on TFramedTransport
-    @property
-    def cstringio_buf(self):
-        return self.__rbuf
-
-    def cstringio_refill(self, prefix, reqlen):
-        # self.__rbuf will already be empty here because fastbinary doesn't
-        # ask for a refill until the previous buffer is empty.  Therefore,
-        # we can start reading new frames immediately.
-        while len(prefix) < reqlen:
-            self._read_frame()
-            prefix += self.__rbuf.getvalue()
-        self.__rbuf = BufferIO(prefix)
-        return self.__rbuf
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TTwisted.py b/vendor/git.apache.org/thrift.git/lib/py/src/transport/TTwisted.py
deleted file mode 100644
index 5710b57..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TTwisted.py
+++ /dev/null
@@ -1,331 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from io import BytesIO
-import struct
-
-from zope.interface import implements, Interface, Attribute
-from twisted.internet.protocol import ServerFactory, ClientFactory, \
-    connectionDone
-from twisted.internet import defer
-from twisted.internet.threads import deferToThread
-from twisted.protocols import basic
-from twisted.web import server, resource, http
-
-from thrift.transport import TTransport
-
-
-class TMessageSenderTransport(TTransport.TTransportBase):
-
-    def __init__(self):
-        self.__wbuf = BytesIO()
-
-    def write(self, buf):
-        self.__wbuf.write(buf)
-
-    def flush(self):
-        msg = self.__wbuf.getvalue()
-        self.__wbuf = BytesIO()
-        return self.sendMessage(msg)
-
-    def sendMessage(self, message):
-        raise NotImplementedError
-
-
-class TCallbackTransport(TMessageSenderTransport):
-
-    def __init__(self, func):
-        TMessageSenderTransport.__init__(self)
-        self.func = func
-
-    def sendMessage(self, message):
-        return self.func(message)
-
-
-class ThriftClientProtocol(basic.Int32StringReceiver):
-
-    MAX_LENGTH = 2 ** 31 - 1
-
-    def __init__(self, client_class, iprot_factory, oprot_factory=None):
-        self._client_class = client_class
-        self._iprot_factory = iprot_factory
-        if oprot_factory is None:
-            self._oprot_factory = iprot_factory
-        else:
-            self._oprot_factory = oprot_factory
-
-        self.recv_map = {}
-        self.started = defer.Deferred()
-
-    def dispatch(self, msg):
-        self.sendString(msg)
-
-    def connectionMade(self):
-        tmo = TCallbackTransport(self.dispatch)
-        self.client = self._client_class(tmo, self._oprot_factory)
-        self.started.callback(self.client)
-
-    def connectionLost(self, reason=connectionDone):
-        # the called errbacks can add items to our client's _reqs,
-        # so we need to use a tmp, and iterate until no more requests
-        # are added during errbacks
-        if self.client:
-            tex = TTransport.TTransportException(
-                type=TTransport.TTransportException.END_OF_FILE,
-                message='Connection closed (%s)' % reason)
-            while self.client._reqs:
-                _, v = self.client._reqs.popitem()
-                v.errback(tex)
-            del self.client._reqs
-            self.client = None
-
-    def stringReceived(self, frame):
-        tr = TTransport.TMemoryBuffer(frame)
-        iprot = self._iprot_factory.getProtocol(tr)
-        (fname, mtype, rseqid) = iprot.readMessageBegin()
-
-        try:
-            method = self.recv_map[fname]
-        except KeyError:
-            method = getattr(self.client, 'recv_' + fname)
-            self.recv_map[fname] = method
-
-        method(iprot, mtype, rseqid)
-
-
-class ThriftSASLClientProtocol(ThriftClientProtocol):
-
-    START = 1
-    OK = 2
-    BAD = 3
-    ERROR = 4
-    COMPLETE = 5
-
-    MAX_LENGTH = 2 ** 31 - 1
-
-    def __init__(self, client_class, iprot_factory, oprot_factory=None,
-                 host=None, service=None, mechanism='GSSAPI', **sasl_kwargs):
-        """
-        host: the name of the server, from a SASL perspective
-        service: the name of the server's service, from a SASL perspective
-        mechanism: the name of the preferred mechanism to use
-
-        All other kwargs will be passed to the puresasl.client.SASLClient
-        constructor.
-        """
-
-        from puresasl.client import SASLClient
-        self.SASLCLient = SASLClient
-
-        ThriftClientProtocol.__init__(self, client_class, iprot_factory, oprot_factory)
-
-        self._sasl_negotiation_deferred = None
-        self._sasl_negotiation_status = None
-        self.client = None
-
-        if host is not None:
-            self.createSASLClient(host, service, mechanism, **sasl_kwargs)
-
-    def createSASLClient(self, host, service, mechanism, **kwargs):
-        self.sasl = self.SASLClient(host, service, mechanism, **kwargs)
-
-    def dispatch(self, msg):
-        encoded = self.sasl.wrap(msg)
-        len_and_encoded = ''.join((struct.pack('!i', len(encoded)), encoded))
-        ThriftClientProtocol.dispatch(self, len_and_encoded)
-
-    @defer.inlineCallbacks
-    def connectionMade(self):
-        self._sendSASLMessage(self.START, self.sasl.mechanism)
-        initial_message = yield deferToThread(self.sasl.process)
-        self._sendSASLMessage(self.OK, initial_message)
-
-        while True:
-            status, challenge = yield self._receiveSASLMessage()
-            if status == self.OK:
-                response = yield deferToThread(self.sasl.process, challenge)
-                self._sendSASLMessage(self.OK, response)
-            elif status == self.COMPLETE:
-                if not self.sasl.complete:
-                    msg = "The server erroneously indicated that SASL " \
-                          "negotiation was complete"
-                    raise TTransport.TTransportException(msg, message=msg)
-                else:
-                    break
-            else:
-                msg = "Bad SASL negotiation status: %d (%s)" % (status, challenge)
-                raise TTransport.TTransportException(msg, message=msg)
-
-        self._sasl_negotiation_deferred = None
-        ThriftClientProtocol.connectionMade(self)
-
-    def _sendSASLMessage(self, status, body):
-        if body is None:
-            body = ""
-        header = struct.pack(">BI", status, len(body))
-        self.transport.write(header + body)
-
-    def _receiveSASLMessage(self):
-        self._sasl_negotiation_deferred = defer.Deferred()
-        self._sasl_negotiation_status = None
-        return self._sasl_negotiation_deferred
-
-    def connectionLost(self, reason=connectionDone):
-        if self.client:
-            ThriftClientProtocol.connectionLost(self, reason)
-
-    def dataReceived(self, data):
-        if self._sasl_negotiation_deferred:
-            # we got a sasl challenge in the format (status, length, challenge)
-            # save the status, let IntNStringReceiver piece the challenge data together
-            self._sasl_negotiation_status, = struct.unpack("B", data[0])
-            ThriftClientProtocol.dataReceived(self, data[1:])
-        else:
-            # normal frame, let IntNStringReceiver piece it together
-            ThriftClientProtocol.dataReceived(self, data)
-
-    def stringReceived(self, frame):
-        if self._sasl_negotiation_deferred:
-            # the frame is just a SASL challenge
-            response = (self._sasl_negotiation_status, frame)
-            self._sasl_negotiation_deferred.callback(response)
-        else:
-            # there's a second 4 byte length prefix inside the frame
-            decoded_frame = self.sasl.unwrap(frame[4:])
-            ThriftClientProtocol.stringReceived(self, decoded_frame)
-
-
-class ThriftServerProtocol(basic.Int32StringReceiver):
-
-    MAX_LENGTH = 2 ** 31 - 1
-
-    def dispatch(self, msg):
-        self.sendString(msg)
-
-    def processError(self, error):
-        self.transport.loseConnection()
-
-    def processOk(self, _, tmo):
-        msg = tmo.getvalue()
-
-        if len(msg) > 0:
-            self.dispatch(msg)
-
-    def stringReceived(self, frame):
-        tmi = TTransport.TMemoryBuffer(frame)
-        tmo = TTransport.TMemoryBuffer()
-
-        iprot = self.factory.iprot_factory.getProtocol(tmi)
-        oprot = self.factory.oprot_factory.getProtocol(tmo)
-
-        d = self.factory.processor.process(iprot, oprot)
-        d.addCallbacks(self.processOk, self.processError,
-                       callbackArgs=(tmo,))
-
-
-class IThriftServerFactory(Interface):
-
-    processor = Attribute("Thrift processor")
-
-    iprot_factory = Attribute("Input protocol factory")
-
-    oprot_factory = Attribute("Output protocol factory")
-
-
-class IThriftClientFactory(Interface):
-
-    client_class = Attribute("Thrift client class")
-
-    iprot_factory = Attribute("Input protocol factory")
-
-    oprot_factory = Attribute("Output protocol factory")
-
-
-class ThriftServerFactory(ServerFactory):
-
-    implements(IThriftServerFactory)
-
-    protocol = ThriftServerProtocol
-
-    def __init__(self, processor, iprot_factory, oprot_factory=None):
-        self.processor = processor
-        self.iprot_factory = iprot_factory
-        if oprot_factory is None:
-            self.oprot_factory = iprot_factory
-        else:
-            self.oprot_factory = oprot_factory
-
-
-class ThriftClientFactory(ClientFactory):
-
-    implements(IThriftClientFactory)
-
-    protocol = ThriftClientProtocol
-
-    def __init__(self, client_class, iprot_factory, oprot_factory=None):
-        self.client_class = client_class
-        self.iprot_factory = iprot_factory
-        if oprot_factory is None:
-            self.oprot_factory = iprot_factory
-        else:
-            self.oprot_factory = oprot_factory
-
-    def buildProtocol(self, addr):
-        p = self.protocol(self.client_class, self.iprot_factory,
-                          self.oprot_factory)
-        p.factory = self
-        return p
-
-
-class ThriftResource(resource.Resource):
-
-    allowedMethods = ('POST',)
-
-    def __init__(self, processor, inputProtocolFactory,
-                 outputProtocolFactory=None):
-        resource.Resource.__init__(self)
-        self.inputProtocolFactory = inputProtocolFactory
-        if outputProtocolFactory is None:
-            self.outputProtocolFactory = inputProtocolFactory
-        else:
-            self.outputProtocolFactory = outputProtocolFactory
-        self.processor = processor
-
-    def getChild(self, path, request):
-        return self
-
-    def _cbProcess(self, _, request, tmo):
-        msg = tmo.getvalue()
-        request.setResponseCode(http.OK)
-        request.setHeader("content-type", "application/x-thrift")
-        request.write(msg)
-        request.finish()
-
-    def render_POST(self, request):
-        request.content.seek(0, 0)
-        data = request.content.read()
-        tmi = TTransport.TMemoryBuffer(data)
-        tmo = TTransport.TMemoryBuffer()
-
-        iprot = self.inputProtocolFactory.getProtocol(tmi)
-        oprot = self.outputProtocolFactory.getProtocol(tmo)
-
-        d = self.processor.process(iprot, oprot)
-        d.addCallback(self._cbProcess, request, tmo)
-        return server.NOT_DONE_YET
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TZlibTransport.py b/vendor/git.apache.org/thrift.git/lib/py/src/transport/TZlibTransport.py
deleted file mode 100644
index e848579..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/transport/TZlibTransport.py
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-"""TZlibTransport provides a compressed transport and transport factory
-class, using the python standard library zlib module to implement
-data compression.
-"""
-
-from __future__ import division
-import zlib
-from .TTransport import TTransportBase, CReadableTransport
-from ..compat import BufferIO
-
-
-class TZlibTransportFactory(object):
-    """Factory transport that builds zlib compressed transports.
-
-    This factory caches the last single client/transport that it was passed
-    and returns the same TZlibTransport object that was created.
-
-    This caching means the TServer class will get the _same_ transport
-    object for both input and output transports from this factory.
-    (For non-threaded scenarios only, since the cache only holds one object)
-
-    The purpose of this caching is to allocate only one TZlibTransport where
-    only one is really needed (since it must have separate read/write buffers),
-    and makes the statistics from getCompSavings() and getCompRatio()
-    easier to understand.
-    """
-    # class scoped cache of last transport given and zlibtransport returned
-    _last_trans = None
-    _last_z = None
-
-    def getTransport(self, trans, compresslevel=9):
-        """Wrap a transport, trans, with the TZlibTransport
-        compressed transport class, returning a new
-        transport to the caller.
-
-        @param compresslevel: The zlib compression level, ranging
-        from 0 (no compression) to 9 (best compression).  Defaults to 9.
-        @type compresslevel: int
-
-        This method returns a TZlibTransport which wraps the
-        passed C{trans} TTransport derived instance.
-        """
-        if trans == self._last_trans:
-            return self._last_z
-        ztrans = TZlibTransport(trans, compresslevel)
-        self._last_trans = trans
-        self._last_z = ztrans
-        return ztrans
-
-
-class TZlibTransport(TTransportBase, CReadableTransport):
-    """Class that wraps a transport with zlib, compressing writes
-    and decompresses reads, using the python standard
-    library zlib module.
-    """
-    # Read buffer size for the python fastbinary C extension,
-    # the TBinaryProtocolAccelerated class.
-    DEFAULT_BUFFSIZE = 4096
-
-    def __init__(self, trans, compresslevel=9):
-        """Create a new TZlibTransport, wrapping C{trans}, another
-        TTransport derived object.
-
-        @param trans: A thrift transport object, i.e. a TSocket() object.
-        @type trans: TTransport
-        @param compresslevel: The zlib compression level, ranging
-        from 0 (no compression) to 9 (best compression).  Default is 9.
-        @type compresslevel: int
-        """
-        self.__trans = trans
-        self.compresslevel = compresslevel
-        self.__rbuf = BufferIO()
-        self.__wbuf = BufferIO()
-        self._init_zlib()
-        self._init_stats()
-
-    def _reinit_buffers(self):
-        """Internal method to initialize/reset the internal StringIO objects
-        for read and write buffers.
-        """
-        self.__rbuf = BufferIO()
-        self.__wbuf = BufferIO()
-
-    def _init_stats(self):
-        """Internal method to reset the internal statistics counters
-        for compression ratios and bandwidth savings.
-        """
-        self.bytes_in = 0
-        self.bytes_out = 0
-        self.bytes_in_comp = 0
-        self.bytes_out_comp = 0
-
-    def _init_zlib(self):
-        """Internal method for setting up the zlib compression and
-        decompression objects.
-        """
-        self._zcomp_read = zlib.decompressobj()
-        self._zcomp_write = zlib.compressobj(self.compresslevel)
-
-    def getCompRatio(self):
-        """Get the current measured compression ratios (in,out) from
-        this transport.
-
-        Returns a tuple of:
-        (inbound_compression_ratio, outbound_compression_ratio)
-
-        The compression ratios are computed as:
-            compressed / uncompressed
-
-        E.g., data that compresses by 10x will have a ratio of: 0.10
-        and data that compresses to half of ts original size will
-        have a ratio of 0.5
-
-        None is returned if no bytes have yet been processed in
-        a particular direction.
-        """
-        r_percent, w_percent = (None, None)
-        if self.bytes_in > 0:
-            r_percent = self.bytes_in_comp / self.bytes_in
-        if self.bytes_out > 0:
-            w_percent = self.bytes_out_comp / self.bytes_out
-        return (r_percent, w_percent)
-
-    def getCompSavings(self):
-        """Get the current count of saved bytes due to data
-        compression.
-
-        Returns a tuple of:
-        (inbound_saved_bytes, outbound_saved_bytes)
-
-        Note: if compression is actually expanding your
-        data (only likely with very tiny thrift objects), then
-        the values returned will be negative.
-        """
-        r_saved = self.bytes_in - self.bytes_in_comp
-        w_saved = self.bytes_out - self.bytes_out_comp
-        return (r_saved, w_saved)
-
-    def isOpen(self):
-        """Return the underlying transport's open status"""
-        return self.__trans.isOpen()
-
-    def open(self):
-        """Open the underlying transport"""
-        self._init_stats()
-        return self.__trans.open()
-
-    def listen(self):
-        """Invoke the underlying transport's listen() method"""
-        self.__trans.listen()
-
-    def accept(self):
-        """Accept connections on the underlying transport"""
-        return self.__trans.accept()
-
-    def close(self):
-        """Close the underlying transport,"""
-        self._reinit_buffers()
-        self._init_zlib()
-        return self.__trans.close()
-
-    def read(self, sz):
-        """Read up to sz bytes from the decompressed bytes buffer, and
-        read from the underlying transport if the decompression
-        buffer is empty.
-        """
-        ret = self.__rbuf.read(sz)
-        if len(ret) > 0:
-            return ret
-        # keep reading from transport until something comes back
-        while True:
-            if self.readComp(sz):
-                break
-        ret = self.__rbuf.read(sz)
-        return ret
-
-    def readComp(self, sz):
-        """Read compressed data from the underlying transport, then
-        decompress it and append it to the internal StringIO read buffer
-        """
-        zbuf = self.__trans.read(sz)
-        zbuf = self._zcomp_read.unconsumed_tail + zbuf
-        buf = self._zcomp_read.decompress(zbuf)
-        self.bytes_in += len(zbuf)
-        self.bytes_in_comp += len(buf)
-        old = self.__rbuf.read()
-        self.__rbuf = BufferIO(old + buf)
-        if len(old) + len(buf) == 0:
-            return False
-        return True
-
-    def write(self, buf):
-        """Write some bytes, putting them into the internal write
-        buffer for eventual compression.
-        """
-        self.__wbuf.write(buf)
-
-    def flush(self):
-        """Flush any queued up data in the write buffer and ensure the
-        compression buffer is flushed out to the underlying transport
-        """
-        wout = self.__wbuf.getvalue()
-        if len(wout) > 0:
-            zbuf = self._zcomp_write.compress(wout)
-            self.bytes_out += len(wout)
-            self.bytes_out_comp += len(zbuf)
-        else:
-            zbuf = ''
-        ztail = self._zcomp_write.flush(zlib.Z_SYNC_FLUSH)
-        self.bytes_out_comp += len(ztail)
-        if (len(zbuf) + len(ztail)) > 0:
-            self.__wbuf = BufferIO()
-            self.__trans.write(zbuf + ztail)
-        self.__trans.flush()
-
-    @property
-    def cstringio_buf(self):
-        """Implement the CReadableTransport interface"""
-        return self.__rbuf
-
-    def cstringio_refill(self, partialread, reqlen):
-        """Implement the CReadableTransport interface for refill"""
-        retstring = partialread
-        if reqlen < self.DEFAULT_BUFFSIZE:
-            retstring += self.read(self.DEFAULT_BUFFSIZE)
-        while len(retstring) < reqlen:
-            retstring += self.read(reqlen - len(retstring))
-        self.__rbuf = BufferIO(retstring)
-        return self.__rbuf
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/transport/__init__.py b/vendor/git.apache.org/thrift.git/lib/py/src/transport/__init__.py
deleted file mode 100644
index c9596d9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/transport/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-__all__ = ['TTransport', 'TSocket', 'THttpClient', 'TZlibTransport']
diff --git a/vendor/git.apache.org/thrift.git/lib/py/src/transport/sslcompat.py b/vendor/git.apache.org/thrift.git/lib/py/src/transport/sslcompat.py
deleted file mode 100644
index 7bf5e06..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/src/transport/sslcompat.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# licensed to the apache software foundation (asf) under one
-# or more contributor license agreements. see the notice file
-# distributed with this work for additional information
-# regarding copyright ownership. the asf licenses this file
-# to you under the apache license, version 2.0 (the
-# "license"); you may not use this file except in compliance
-# with the license. you may obtain a copy of the license at
-#
-#   http://www.apache.org/licenses/license-2.0
-#
-# unless required by applicable law or agreed to in writing,
-# software distributed under the license is distributed on an
-# "as is" basis, without warranties or conditions of any
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import logging
-import sys
-
-from thrift.transport.TTransport import TTransportException
-
-logger = logging.getLogger(__name__)
-
-
-def legacy_validate_callback(self, cert, hostname):
-    """legacy method to validate the peer's SSL certificate, and to check
-    the commonName of the certificate to ensure it matches the hostname we
-    used to make this connection.  Does not support subjectAltName records
-    in certificates.
-
-    raises TTransportException if the certificate fails validation.
-    """
-    if 'subject' not in cert:
-        raise TTransportException(
-            TTransportException.NOT_OPEN,
-            'No SSL certificate found from %s:%s' % (self.host, self.port))
-    fields = cert['subject']
-    for field in fields:
-        # ensure structure we get back is what we expect
-        if not isinstance(field, tuple):
-            continue
-        cert_pair = field[0]
-        if len(cert_pair) < 2:
-            continue
-        cert_key, cert_value = cert_pair[0:2]
-        if cert_key != 'commonName':
-            continue
-        certhost = cert_value
-        # this check should be performed by some sort of Access Manager
-        if certhost == hostname:
-            # success, cert commonName matches desired hostname
-            return
-        else:
-            raise TTransportException(
-                TTransportException.UNKNOWN,
-                'Hostname we connected to "%s" doesn\'t match certificate '
-                'provided commonName "%s"' % (self.host, certhost))
-    raise TTransportException(
-        TTransportException.UNKNOWN,
-        'Could not validate SSL certificate from host "%s".  Cert=%s'
-        % (hostname, cert))
-
-
-def _optional_dependencies():
-    try:
-        import ipaddress  # noqa
-        logger.debug('ipaddress module is available')
-        ipaddr = True
-    except ImportError:
-        logger.warn('ipaddress module is unavailable')
-        ipaddr = False
-
-    if sys.hexversion < 0x030500F0:
-        try:
-            from backports.ssl_match_hostname import match_hostname, __version__ as ver
-            ver = list(map(int, ver.split('.')))
-            logger.debug('backports.ssl_match_hostname module is available')
-            match = match_hostname
-            if ver[0] * 10 + ver[1] >= 35:
-                return ipaddr, match
-            else:
-                logger.warn('backports.ssl_match_hostname module is too old')
-                ipaddr = False
-        except ImportError:
-            logger.warn('backports.ssl_match_hostname is unavailable')
-            ipaddr = False
-    try:
-        from ssl import match_hostname
-        logger.debug('ssl.match_hostname is available')
-        match = match_hostname
-    except ImportError:
-        logger.warn('using legacy validation callback')
-        match = legacy_validate_callback
-    return ipaddr, match
-
-_match_has_ipaddress, _match_hostname = _optional_dependencies()
diff --git a/vendor/git.apache.org/thrift.git/lib/py/test/_import_local_thrift.py b/vendor/git.apache.org/thrift.git/lib/py/test/_import_local_thrift.py
deleted file mode 100644
index d223122..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/test/_import_local_thrift.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import os
-import sys
-
-SCRIPT_DIR = os.path.realpath(os.path.dirname(__file__))
-ROOT_DIR = os.path.dirname(os.path.dirname(os.path.dirname(SCRIPT_DIR)))
-
-for libpath in glob.glob(os.path.join(ROOT_DIR, 'lib', 'py', 'build', 'lib.*')):
-    if libpath.endswith('-%d.%d' % (sys.version_info[0], sys.version_info[1])):
-        sys.path.insert(0, libpath)
-        break
diff --git a/vendor/git.apache.org/thrift.git/lib/py/test/test_sslsocket.py b/vendor/git.apache.org/thrift.git/lib/py/test/test_sslsocket.py
deleted file mode 100644
index 3e4b266..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/test/test_sslsocket.py
+++ /dev/null
@@ -1,339 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import inspect
-import logging
-import os
-import platform
-import ssl
-import sys
-import tempfile
-import threading
-import unittest
-import warnings
-from contextlib import contextmanager
-
-import _import_local_thrift  # noqa
-
-SCRIPT_DIR = os.path.realpath(os.path.dirname(__file__))
-ROOT_DIR = os.path.dirname(os.path.dirname(os.path.dirname(SCRIPT_DIR)))
-SERVER_PEM = os.path.join(ROOT_DIR, 'test', 'keys', 'server.pem')
-SERVER_CERT = os.path.join(ROOT_DIR, 'test', 'keys', 'server.crt')
-SERVER_KEY = os.path.join(ROOT_DIR, 'test', 'keys', 'server.key')
-CLIENT_CERT_NO_IP = os.path.join(ROOT_DIR, 'test', 'keys', 'client.crt')
-CLIENT_KEY_NO_IP = os.path.join(ROOT_DIR, 'test', 'keys', 'client.key')
-CLIENT_CERT = os.path.join(ROOT_DIR, 'test', 'keys', 'client_v3.crt')
-CLIENT_KEY = os.path.join(ROOT_DIR, 'test', 'keys', 'client_v3.key')
-CLIENT_CA = os.path.join(ROOT_DIR, 'test', 'keys', 'CA.pem')
-
-TEST_CIPHERS = 'DES-CBC3-SHA'
-
-
-class ServerAcceptor(threading.Thread):
-    def __init__(self, server, expect_failure=False):
-        super(ServerAcceptor, self).__init__()
-        self.daemon = True
-        self._server = server
-        self._listening = threading.Event()
-        self._port = None
-        self._port_bound = threading.Event()
-        self._client = None
-        self._client_accepted = threading.Event()
-        self._expect_failure = expect_failure
-        frame = inspect.stack(3)[2]
-        self.name = frame[3]
-        del frame
-
-    def run(self):
-        self._server.listen()
-        self._listening.set()
-
-        try:
-            address = self._server.handle.getsockname()
-            if len(address) > 1:
-                # AF_INET addresses are 2-tuples (host, port) and AF_INET6 are
-                # 4-tuples (host, port, ...), but in each case port is in the second slot.
-                self._port = address[1]
-        finally:
-            self._port_bound.set()
-
-        try:
-            self._client = self._server.accept()
-        except Exception:
-            logging.exception('error on server side (%s):' % self.name)
-            if not self._expect_failure:
-                raise
-        finally:
-            self._client_accepted.set()
-
-    def await_listening(self):
-        self._listening.wait()
-
-    @property
-    def port(self):
-        self._port_bound.wait()
-        return self._port
-
-    @property
-    def client(self):
-        self._client_accepted.wait()
-        return self._client
-
-
-# Python 2.6 compat
-class AssertRaises(object):
-    def __init__(self, expected):
-        self._expected = expected
-
-    def __enter__(self):
-        pass
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        if not exc_type or not issubclass(exc_type, self._expected):
-            raise Exception('fail')
-        return True
-
-
-class TSSLSocketTest(unittest.TestCase):
-    def _server_socket(self, **kwargs):
-        return TSSLServerSocket(port=0, **kwargs)
-
-    @contextmanager
-    def _connectable_client(self, server, expect_failure=False, path=None, **client_kwargs):
-        acc = ServerAcceptor(server, expect_failure)
-        try:
-            acc.start()
-            acc.await_listening()
-
-            host, port = ('localhost', acc.port) if path is None else (None, None)
-            client = TSSLSocket(host, port, unix_socket=path, **client_kwargs)
-            yield acc, client
-        finally:
-            if acc.client:
-                acc.client.close()
-            server.close()
-
-    def _assert_connection_failure(self, server, path=None, **client_args):
-        logging.disable(logging.CRITICAL)
-        try:
-            with self._connectable_client(server, True, path=path, **client_args) as (acc, client):
-                # We need to wait for a connection failure, but not too long.  20ms is a tunable
-                # compromise between test speed and stability
-                client.setTimeout(20)
-                with self._assert_raises(TTransportException):
-                    client.open()
-                self.assertTrue(acc.client is None)
-        finally:
-            logging.disable(logging.NOTSET)
-
-    def _assert_raises(self, exc):
-        if sys.hexversion >= 0x020700F0:
-            return self.assertRaises(exc)
-        else:
-            return AssertRaises(exc)
-
-    def _assert_connection_success(self, server, path=None, **client_args):
-        with self._connectable_client(server, path=path, **client_args) as (acc, client):
-            client.open()
-            try:
-                self.assertTrue(acc.client is not None)
-            finally:
-                client.close()
-
-    # deprecated feature
-    def test_deprecation(self):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.filterwarnings('always', category=DeprecationWarning, module=self.__module__)
-            TSSLSocket('localhost', 0, validate=True, ca_certs=SERVER_CERT)
-            self.assertEqual(len(w), 1)
-
-        with warnings.catch_warnings(record=True) as w:
-            warnings.filterwarnings('always', category=DeprecationWarning, module=self.__module__)
-            # Deprecated signature
-            # def __init__(self, host='localhost', port=9090, validate=True, ca_certs=None, keyfile=None, certfile=None, unix_socket=None, ciphers=None):
-            TSSLSocket('localhost', 0, True, SERVER_CERT, CLIENT_KEY, CLIENT_CERT, None, TEST_CIPHERS)
-            self.assertEqual(len(w), 7)
-
-        with warnings.catch_warnings(record=True) as w:
-            warnings.filterwarnings('always', category=DeprecationWarning, module=self.__module__)
-            # Deprecated signature
-            # def __init__(self, host=None, port=9090, certfile='cert.pem', unix_socket=None, ciphers=None):
-            TSSLServerSocket(None, 0, SERVER_PEM, None, TEST_CIPHERS)
-            self.assertEqual(len(w), 3)
-
-    # deprecated feature
-    def test_set_cert_reqs_by_validate(self):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.filterwarnings('always', category=DeprecationWarning, module=self.__module__)
-            c1 = TSSLSocket('localhost', 0, validate=True, ca_certs=SERVER_CERT)
-            self.assertEqual(c1.cert_reqs, ssl.CERT_REQUIRED)
-
-            c1 = TSSLSocket('localhost', 0, validate=False)
-            self.assertEqual(c1.cert_reqs, ssl.CERT_NONE)
-
-            self.assertEqual(len(w), 2)
-
-    # deprecated feature
-    def test_set_validate_by_cert_reqs(self):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.filterwarnings('always', category=DeprecationWarning, module=self.__module__)
-            c1 = TSSLSocket('localhost', 0, cert_reqs=ssl.CERT_NONE)
-            self.assertFalse(c1.validate)
-
-            c2 = TSSLSocket('localhost', 0, cert_reqs=ssl.CERT_REQUIRED, ca_certs=SERVER_CERT)
-            self.assertTrue(c2.validate)
-
-            c3 = TSSLSocket('localhost', 0, cert_reqs=ssl.CERT_OPTIONAL, ca_certs=SERVER_CERT)
-            self.assertTrue(c3.validate)
-
-            self.assertEqual(len(w), 3)
-
-    def test_unix_domain_socket(self):
-        if platform.system() == 'Windows':
-            print('skipping test_unix_domain_socket')
-            return
-        fd, path = tempfile.mkstemp()
-        os.close(fd)
-        try:
-            server = self._server_socket(unix_socket=path, keyfile=SERVER_KEY, certfile=SERVER_CERT)
-            self._assert_connection_success(server, path=path, cert_reqs=ssl.CERT_NONE)
-        finally:
-            os.unlink(path)
-
-    def test_server_cert(self):
-        server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT)
-        self._assert_connection_success(server, cert_reqs=ssl.CERT_REQUIRED, ca_certs=SERVER_CERT)
-
-        server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT)
-        # server cert not in ca_certs
-        self._assert_connection_failure(server, cert_reqs=ssl.CERT_REQUIRED, ca_certs=CLIENT_CERT)
-
-        server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT)
-        self._assert_connection_success(server, cert_reqs=ssl.CERT_NONE)
-
-    def test_set_server_cert(self):
-        server = self._server_socket(keyfile=SERVER_KEY, certfile=CLIENT_CERT)
-        with self._assert_raises(Exception):
-            server.certfile = 'foo'
-        with self._assert_raises(Exception):
-            server.certfile = None
-        server.certfile = SERVER_CERT
-        self._assert_connection_success(server, cert_reqs=ssl.CERT_REQUIRED, ca_certs=SERVER_CERT)
-
-    def test_client_cert(self):
-        server = self._server_socket(
-            cert_reqs=ssl.CERT_REQUIRED, keyfile=SERVER_KEY,
-            certfile=SERVER_CERT, ca_certs=CLIENT_CERT)
-        self._assert_connection_failure(server, cert_reqs=ssl.CERT_NONE, certfile=SERVER_CERT, keyfile=SERVER_KEY)
-
-        server = self._server_socket(
-            cert_reqs=ssl.CERT_REQUIRED, keyfile=SERVER_KEY,
-            certfile=SERVER_CERT, ca_certs=CLIENT_CA)
-        self._assert_connection_failure(server, cert_reqs=ssl.CERT_NONE, certfile=CLIENT_CERT_NO_IP, keyfile=CLIENT_KEY_NO_IP)
-
-        server = self._server_socket(
-            cert_reqs=ssl.CERT_REQUIRED, keyfile=SERVER_KEY,
-            certfile=SERVER_CERT, ca_certs=CLIENT_CA)
-        self._assert_connection_success(server, cert_reqs=ssl.CERT_NONE, certfile=CLIENT_CERT, keyfile=CLIENT_KEY)
-
-        server = self._server_socket(
-            cert_reqs=ssl.CERT_OPTIONAL, keyfile=SERVER_KEY,
-            certfile=SERVER_CERT, ca_certs=CLIENT_CA)
-        self._assert_connection_success(server, cert_reqs=ssl.CERT_NONE, certfile=CLIENT_CERT, keyfile=CLIENT_KEY)
-
-    def test_ciphers(self):
-        server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT, ciphers=TEST_CIPHERS)
-        self._assert_connection_success(server, ca_certs=SERVER_CERT, ciphers=TEST_CIPHERS)
-
-        if not TSSLSocket._has_ciphers:
-            # unittest.skip is not available for Python 2.6
-            print('skipping test_ciphers')
-            return
-        server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT)
-        self._assert_connection_failure(server, ca_certs=SERVER_CERT, ciphers='NULL')
-
-        server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT, ciphers=TEST_CIPHERS)
-        self._assert_connection_failure(server, ca_certs=SERVER_CERT, ciphers='NULL')
-
-    def test_ssl2_and_ssl3_disabled(self):
-        if not hasattr(ssl, 'PROTOCOL_SSLv3'):
-            print('PROTOCOL_SSLv3 is not available')
-        else:
-            server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT)
-            self._assert_connection_failure(server, ca_certs=SERVER_CERT, ssl_version=ssl.PROTOCOL_SSLv3)
-
-            server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT, ssl_version=ssl.PROTOCOL_SSLv3)
-            self._assert_connection_failure(server, ca_certs=SERVER_CERT)
-
-        if not hasattr(ssl, 'PROTOCOL_SSLv2'):
-            print('PROTOCOL_SSLv2 is not available')
-        else:
-            server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT)
-            self._assert_connection_failure(server, ca_certs=SERVER_CERT, ssl_version=ssl.PROTOCOL_SSLv2)
-
-            server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT, ssl_version=ssl.PROTOCOL_SSLv2)
-            self._assert_connection_failure(server, ca_certs=SERVER_CERT)
-
-    def test_newer_tls(self):
-        if not TSSLSocket._has_ssl_context:
-            # unittest.skip is not available for Python 2.6
-            print('skipping test_newer_tls')
-            return
-        if not hasattr(ssl, 'PROTOCOL_TLSv1_2'):
-            print('PROTOCOL_TLSv1_2 is not available')
-        else:
-            server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT, ssl_version=ssl.PROTOCOL_TLSv1_2)
-            self._assert_connection_success(server, ca_certs=SERVER_CERT, ssl_version=ssl.PROTOCOL_TLSv1_2)
-
-        if not hasattr(ssl, 'PROTOCOL_TLSv1_1'):
-            print('PROTOCOL_TLSv1_1 is not available')
-        else:
-            server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT, ssl_version=ssl.PROTOCOL_TLSv1_1)
-            self._assert_connection_success(server, ca_certs=SERVER_CERT, ssl_version=ssl.PROTOCOL_TLSv1_1)
-
-        if not hasattr(ssl, 'PROTOCOL_TLSv1_1') or not hasattr(ssl, 'PROTOCOL_TLSv1_2'):
-            print('PROTOCOL_TLSv1_1 and/or PROTOCOL_TLSv1_2 is not available')
-        else:
-            server = self._server_socket(keyfile=SERVER_KEY, certfile=SERVER_CERT, ssl_version=ssl.PROTOCOL_TLSv1_2)
-            self._assert_connection_failure(server, ca_certs=SERVER_CERT, ssl_version=ssl.PROTOCOL_TLSv1_1)
-
-    def test_ssl_context(self):
-        if not TSSLSocket._has_ssl_context:
-            # unittest.skip is not available for Python 2.6
-            print('skipping test_ssl_context')
-            return
-        server_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
-        server_context.load_cert_chain(SERVER_CERT, SERVER_KEY)
-        server_context.load_verify_locations(CLIENT_CA)
-        server_context.verify_mode = ssl.CERT_REQUIRED
-        server = self._server_socket(ssl_context=server_context)
-
-        client_context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
-        client_context.load_cert_chain(CLIENT_CERT, CLIENT_KEY)
-        client_context.load_verify_locations(SERVER_CERT)
-        client_context.verify_mode = ssl.CERT_REQUIRED
-
-        self._assert_connection_success(server, ssl_context=client_context)
-
-if __name__ == '__main__':
-    logging.basicConfig(level=logging.WARN)
-    from thrift.transport.TSSLSocket import TSSLSocket, TSSLServerSocket
-    from thrift.transport.TTransport import TTransportException
-
-    unittest.main()
diff --git a/vendor/git.apache.org/thrift.git/lib/py/test/thrift_json.py b/vendor/git.apache.org/thrift.git/lib/py/test/thrift_json.py
deleted file mode 100644
index fc1e79c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/py/test/thrift_json.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-import unittest
-
-import _import_local_thrift  # noqa
-from thrift.protocol.TJSONProtocol import TJSONProtocol
-from thrift.transport import TTransport
-
-#
-# In order to run the test under Windows. We need to create symbolic link
-# name 'thrift' to '../src' folder by using:
-#
-# mklink /D thrift ..\src
-#
-
-
-class TestJSONString(unittest.TestCase):
-
-    def test_escaped_unicode_string(self):
-        unicode_json = b'"hello \\u0e01\\u0e02\\u0e03\\ud835\\udcab\\udb40\\udc70 unicode"'
-        unicode_text = u'hello \u0e01\u0e02\u0e03\U0001D4AB\U000E0070 unicode'
-
-        buf = TTransport.TMemoryBuffer(unicode_json)
-        transport = TTransport.TBufferedTransportFactory().getTransport(buf)
-        protocol = TJSONProtocol(transport)
-
-        if sys.version_info[0] == 2:
-            unicode_text = unicode_text.encode('utf8')
-        self.assertEqual(protocol.readString(), unicode_text)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/Gemfile b/vendor/git.apache.org/thrift.git/lib/rb/Gemfile
deleted file mode 100644
index 1c86af9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/Makefile.am b/vendor/git.apache.org/thrift.git/lib/rb/Makefile.am
deleted file mode 100755
index 137edb4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-DESTDIR ?= /
-
-if HAVE_BUNDLER
-
-all-local:
-	$(BUNDLER) install
-	$(BUNDLER) exec rake build_ext
-
-install-exec-hook:
-	$(BUNDLER) exec rake install
-
-clean-local:
-	$(BUNDLER) install
-	$(BUNDLER) exec rake clean
-
-check-local: all
-	$(BUNDLER) install
-	$(BUNDLER) exec rake
-
-endif
-
-EXTRA_DIST = \
-	coding_standards.md \
-	Rakefile \
-	Gemfile \
-	thrift.gemspec \
-	lib \
-	ext \
-	benchmark \
-	script \
-	spec \
-	README.md
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/README.md b/vendor/git.apache.org/thrift.git/lib/rb/README.md
deleted file mode 100644
index b6e9a07..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Thrift Ruby Software Library
-    http://thrift.apache.org
-
-== LICENSE:
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-== DESCRIPTION:
-
-Thrift is a strongly-typed language-agnostic RPC system.
-This library is the ruby implementation for both clients and servers.
-
-== INSTALL:
-
-  $ gem install thrift
-
-== CAVEATS:
-
-This library provides the client and server implementations of thrift.
-It does <em>not</em> provide the compiler for the .thrift files. To compile
-.thrift files into language-specific implementations, please download the full
-thrift software package.
-
-== USAGE:
-
-This section should get written by someone with the time and inclination.
-In the meantime, look at existing code, such as the benchmark or the tutorial
-in the full thrift distribution.
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/Rakefile b/vendor/git.apache.org/thrift.git/lib/rb/Rakefile
deleted file mode 100644
index cdecaa6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/Rakefile
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rspec/core/rake_task'
-
-THRIFT = '../../compiler/cpp/thrift'
-
-task :default => [:gem]
-task :spec => [:'gen-rb', :build_ext, :realspec]
-
-RSpec::Core::RakeTask.new(:realspec) do |t|
-  t.rspec_opts = ['--color', '--format d']
-end
-
-RSpec::Core::RakeTask.new(:'spec:rcov') do |t|
-  t.rspec_opts = ['--color', '--format d']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', '^spec,/gems/']
-end
-
-desc 'Compile the .thrift files for the specs'
-task :'gen-rb' => [:'gen-rb:spec', :'gen-rb:namespaced_spec', :'gen-rb:flat_spec', :'gen-rb:benchmark', :'gen-rb:debug_proto']
-namespace :'gen-rb' do
-  task :'spec' do
-    dir = File.dirname(__FILE__) + '/spec'
-    sh THRIFT, '--gen', 'rb', '-o', dir, "#{dir}/ThriftSpec.thrift"
-  end
-
-  task :'namespaced_spec' do
-    dir = File.dirname(__FILE__) + '/spec'
-    sh THRIFT, '--gen', 'rb:namespaced', '--recurse', '-o', dir, "#{dir}/ThriftNamespacedSpec.thrift"
-    sh THRIFT, '--gen', 'rb:namespaced', '--recurse', '-o', dir, "#{dir}/BaseService.thrift"
-    sh THRIFT, '--gen', 'rb:namespaced', '--recurse', '-o', dir, "#{dir}/ExtendedService.thrift"
-  end
-
-  task :'flat_spec' do
-    dir = File.dirname(__FILE__) + '/spec'
-    mkdir_p("#{dir}/gen-rb/flat")
-    sh THRIFT, '--gen', 'rb', '--recurse', '-out', "#{dir}/gen-rb/flat", "#{dir}/ThriftNamespacedSpec.thrift"
-  end
-
-  task :'benchmark' do
-    dir = File.dirname(__FILE__) + '/benchmark'
-    sh THRIFT, '--gen', 'rb', '-o', dir, "#{dir}/Benchmark.thrift"
-  end
-  
-  task :'debug_proto' do
-    sh "mkdir", "-p", "test/debug_proto"
-    sh THRIFT, '--gen', 'rb', "-o", "test/debug_proto", "../../test/DebugProtoTest.thrift"
-  end
-end
-
-desc "Build the native library"
-task :build_ext => :'gen-rb' do
-   Dir::chdir(File::dirname('ext/extconf.rb')) do
-      unless sh "ruby #{File::basename('ext/extconf.rb')}"
-        $stderr.puts "Failed to run extconf"
-          break
-      end
-      unless sh "make"
-        $stderr.puts "make failed"
-        break
-      end
-    end
-end
-
-desc 'Run the compiler tests (requires full thrift checkout)'
-task :test do
-  # ensure this is a full thrift checkout and not a tarball of the ruby libs
-  cmd = 'head -1 ../../README.md 2>/dev/null | grep Thrift >/dev/null 2>/dev/null'
-  system(cmd) or fail "rake test requires a full thrift checkout"
-  sh 'make', '-C', File.dirname(__FILE__) + "/../../test/rb", "check"
-end
-
-desc 'Run benchmarking of NonblockingServer'
-task :benchmark do
-  ruby 'benchmark/benchmark.rb'
-end
-
-desc 'Builds the thrift gem'
-task :gem => [:spec, :build_ext] do
-  unless sh 'gem', 'build', 'thrift.gemspec'
-    $stderr.puts "Failed to build thrift gem"
-    break
-  end
-end
-
-desc 'Install the thrift gem'
-task :install => [:gem] do
-  unless sh 'gem', 'install', Dir.glob('thrift-*.gem').last
-    $stderr.puts "Failed to install thrift gem"
-    break
-  end
-end
-
-CLEAN.include [
-  '.bundle', 'benchmark/gen-rb', 'coverage', 'ext/*.{o,bundle,so,dll}', 'ext/mkmf.log',
-  'ext/Makefile', 'ext/conftest.dSYM', 'Gemfile.lock', 'mkmf.log', 'pkg',  'spec/gen-rb',
-  'test', 'thrift-*.gem'
-]
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/Benchmark.thrift b/vendor/git.apache.org/thrift.git/lib/rb/benchmark/Benchmark.thrift
deleted file mode 100644
index eb5ae38..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/Benchmark.thrift
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-namespace rb ThriftBenchmark
-
-service BenchmarkService {
-  i32 fibonacci(1:byte n)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/benchmark.rb b/vendor/git.apache.org/thrift.git/lib/rb/benchmark/benchmark.rb
deleted file mode 100644
index 3dc67dd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/benchmark.rb
+++ /dev/null
@@ -1,271 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'rubygems'
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'thrift'
-require 'stringio'
-
-HOST = '127.0.0.1'
-PORT = 42587
-
-###############
-## Server
-###############
-
-class Server
-  attr_accessor :serverclass
-  attr_accessor :interpreter
-  attr_accessor :host
-  attr_accessor :port
-
-  def initialize(opts)
-    @serverclass = opts.fetch(:class, Thrift::NonblockingServer)
-    @interpreter = opts.fetch(:interpreter, "ruby")
-    @host = opts.fetch(:host, ::HOST)
-    @port = opts.fetch(:port, ::PORT)
-  end
-
-  def start
-    return if @serverclass == Object
-    args = (File.basename(@interpreter) == "jruby" ? "-J-server" : "")
-    @pipe = IO.popen("#{@interpreter} #{args} #{File.dirname(__FILE__)}/server.rb #{@host} #{@port} #{@serverclass.name}", "r+")
-    Marshal.load(@pipe) # wait until the server has started
-    sleep 0.4 # give the server time to actually start spawning sockets
-  end
-
-  def shutdown
-    return unless @pipe
-    Marshal.dump(:shutdown, @pipe)
-    begin
-      @pipe.read(10) # block until the server shuts down
-    rescue EOFError
-    end
-    @pipe.close
-    @pipe = nil
-  end
-end
-
-class BenchmarkManager
-  def initialize(opts, server)
-    @socket = opts.fetch(:socket) do
-      @host = opts.fetch(:host, 'localhost')
-      @port = opts.fetch(:port)
-      nil
-    end
-    @num_processes = opts.fetch(:num_processes, 40)
-    @clients_per_process = opts.fetch(:clients_per_process, 10)
-    @calls_per_client = opts.fetch(:calls_per_client, 50)
-    @interpreter = opts.fetch(:interpreter, "ruby")
-    @server = server
-    @log_exceptions = opts.fetch(:log_exceptions, false)
-  end
-
-  def run
-    @pool = []
-    @benchmark_start = Time.now
-    puts "Spawning benchmark processes..."
-    @num_processes.times do
-      spawn
-      sleep 0.02 # space out spawns
-    end
-    collect_output
-    @benchmark_end = Time.now # we know the procs are done here
-    translate_output
-    analyze_output
-    report_output
-  end
-
-  def spawn
-    pipe = IO.popen("#{@interpreter} #{File.dirname(__FILE__)}/client.rb #{"-log-exceptions" if @log_exceptions} #{@host} #{@port} #{@clients_per_process} #{@calls_per_client}")
-    @pool << pipe
-  end
-
-  def socket_class
-    if @socket
-      Thrift::UNIXSocket
-    else
-      Thrift::Socket
-    end
-  end
-
-  def collect_output
-    puts "Collecting output..."
-    # read from @pool until all sockets are closed
-    @buffers = Hash.new { |h,k| h[k] = '' }
-    until @pool.empty?
-      rd, = select(@pool)
-      next if rd.nil?
-      rd.each do |fd|
-        begin
-          @buffers[fd] << fd.readpartial(4096)
-        rescue EOFError
-          @pool.delete fd
-        end
-      end
-    end
-  end
-
-  def translate_output
-    puts "Translating output..."
-    @output = []
-    @buffers.each do |fd, buffer|
-      strio = StringIO.new(buffer)
-      logs = []
-      begin
-        loop do
-          logs << Marshal.load(strio)
-        end
-      rescue EOFError
-        @output << logs
-      end
-    end
-  end
-
-  def analyze_output
-    puts "Analyzing output..."
-    call_times = []
-    client_times = []
-    connection_failures = []
-    connection_errors = []
-    shortest_call = 0
-    shortest_client = 0
-    longest_call = 0
-    longest_client = 0
-    @output.each do |logs|
-      cur_call, cur_client = nil
-      logs.each do |tok, time|
-        case tok
-        when :start
-          cur_client = time
-        when :call_start
-          cur_call = time
-        when :call_end
-          delta = time - cur_call
-          call_times << delta
-          longest_call = delta unless longest_call > delta
-          shortest_call = delta if shortest_call == 0 or delta < shortest_call
-          cur_call = nil
-        when :end
-          delta = time - cur_client
-          client_times << delta
-          longest_client = delta unless longest_client > delta
-          shortest_client = delta if shortest_client == 0 or delta < shortest_client
-          cur_client = nil
-        when :connection_failure
-          connection_failures << time
-        when :connection_error
-          connection_errors << time
-        end
-      end
-    end
-    @report = {}
-    @report[:total_calls] = call_times.inject(0.0) { |a,t| a += t }
-    @report[:avg_calls] = @report[:total_calls] / call_times.size
-    @report[:total_clients] = client_times.inject(0.0) { |a,t| a += t }
-    @report[:avg_clients] = @report[:total_clients] / client_times.size
-    @report[:connection_failures] = connection_failures.size
-    @report[:connection_errors] = connection_errors.size
-    @report[:shortest_call] = shortest_call
-    @report[:shortest_client] = shortest_client
-    @report[:longest_call] = longest_call
-    @report[:longest_client] = longest_client
-    @report[:total_benchmark_time] = @benchmark_end - @benchmark_start
-    @report[:fastthread] = $".include?('fastthread.bundle')
-  end
-
-  def report_output
-    fmt = "%.4f seconds"
-    puts
-    tabulate "%d",
-             [["Server class", "%s"], @server.serverclass == Object ? "" : @server.serverclass],
-             [["Server interpreter", "%s"], @server.interpreter],
-             [["Client interpreter", "%s"], @interpreter],
-             [["Socket class", "%s"], socket_class],
-             ["Number of processes", @num_processes],
-             ["Clients per process", @clients_per_process],
-             ["Calls per client", @calls_per_client],
-             [["Using fastthread", "%s"], @report[:fastthread] ? "yes" : "no"]
-    puts
-    failures = (@report[:connection_failures] > 0)
-    tabulate fmt,
-             [["Connection failures", "%d", [:red, :bold]], @report[:connection_failures]],
-             [["Connection errors", "%d", [:red, :bold]], @report[:connection_errors]],
-             ["Average time per call", @report[:avg_calls]],
-             ["Average time per client (%d calls)" % @calls_per_client, @report[:avg_clients]],
-             ["Total time for all calls", @report[:total_calls]],
-             ["Real time for benchmarking", @report[:total_benchmark_time]],
-             ["Shortest call time", @report[:shortest_call]],
-             ["Longest call time", @report[:longest_call]],
-             ["Shortest client time (%d calls)" % @calls_per_client, @report[:shortest_client]],
-             ["Longest client time (%d calls)" % @calls_per_client, @report[:longest_client]]
-  end
-
-  ANSI = {
-    :reset => 0,
-    :bold => 1,
-    :black => 30,
-    :red => 31,
-    :green => 32,
-    :yellow => 33,
-    :blue => 34,
-    :magenta => 35,
-    :cyan => 36,
-    :white => 37
-  }
-
-  def tabulate(fmt, *labels_and_values)
-    labels = labels_and_values.map { |l| Array === l ? l.first : l }
-    label_width = labels.inject(0) { |w,l| l.size > w ? l.size : w }
-    labels_and_values.each do |(l,v)|
-      f = fmt
-      l, f, c = l if Array === l
-      fmtstr = "%-#{label_width+1}s #{f}"
-      if STDOUT.tty? and c and v.to_i > 0
-        fmtstr = "\e[#{[*c].map { |x| ANSI[x] } * ";"}m" + fmtstr + "\e[#{ANSI[:reset]}m"
-      end
-      puts fmtstr % [l+":", v]
-    end
-  end
-end
-
-def resolve_const(const)
-  const and const.split('::').inject(Object) { |k,c| k.const_get(c) }
-end
-
-puts "Starting server..."
-args = {}
-args[:interpreter] = ENV['THRIFT_SERVER_INTERPRETER'] || ENV['THRIFT_INTERPRETER'] || "ruby"
-args[:class] = resolve_const(ENV['THRIFT_SERVER']) || Thrift::NonblockingServer
-args[:host] = ENV['THRIFT_HOST'] || HOST
-args[:port] = (ENV['THRIFT_PORT'] || PORT).to_i
-server = Server.new(args)
-server.start
-
-args = {}
-args[:host] = ENV['THRIFT_HOST'] || HOST
-args[:port] = (ENV['THRIFT_PORT'] || PORT).to_i
-args[:num_processes] = (ENV['THRIFT_NUM_PROCESSES'] || 40).to_i
-args[:clients_per_process] = (ENV['THRIFT_NUM_CLIENTS'] || 5).to_i
-args[:calls_per_client] = (ENV['THRIFT_NUM_CALLS'] || 50).to_i
-args[:interpreter] = ENV['THRIFT_CLIENT_INTERPRETER'] || ENV['THRIFT_INTERPRETER'] || "ruby"
-args[:log_exceptions] = !!ENV['THRIFT_LOG_EXCEPTIONS']
-BenchmarkManager.new(args, server).run
-
-server.shutdown
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/client.rb b/vendor/git.apache.org/thrift.git/lib/rb/benchmark/client.rb
deleted file mode 100644
index 703dc8f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/client.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'thrift'
-$:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'benchmark_service'
-
-class Client
-  def initialize(host, port, clients_per_process, calls_per_client, log_exceptions)
-    @host = host
-    @port = port
-    @clients_per_process = clients_per_process
-    @calls_per_client = calls_per_client
-    @log_exceptions = log_exceptions
-  end
-
-  def run
-    @clients_per_process.times do
-      socket = Thrift::Socket.new(@host, @port)
-      transport = Thrift::FramedTransport.new(socket)
-      protocol = Thrift::BinaryProtocol.new(transport)
-      client = ThriftBenchmark::BenchmarkService::Client.new(protocol)
-      begin
-        start = Time.now
-        transport.open
-        Marshal.dump [:start, start], STDOUT
-      rescue => e
-        Marshal.dump [:connection_failure, Time.now], STDOUT
-        print_exception e if @log_exceptions
-      else
-        begin
-          @calls_per_client.times do
-            Marshal.dump [:call_start, Time.now], STDOUT
-            client.fibonacci(15)
-            Marshal.dump [:call_end, Time.now], STDOUT
-          end
-          transport.close
-          Marshal.dump [:end, Time.now], STDOUT
-        rescue Thrift::TransportException => e
-          Marshal.dump [:connection_error, Time.now], STDOUT
-          print_exception e if @log_exceptions
-        end
-      end
-    end
-  end
-
-  def print_exception(e)
-    STDERR.puts "ERROR: #{e.message}"
-    STDERR.puts "\t#{e.backtrace * "\n\t"}"
-  end
-end
-
-log_exceptions = true if ARGV[0] == '-log-exceptions' and ARGV.shift
-
-host, port, clients_per_process, calls_per_client = ARGV
-
-Client.new(host, port.to_i, clients_per_process.to_i, calls_per_client.to_i, log_exceptions).run
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/server.rb b/vendor/git.apache.org/thrift.git/lib/rb/benchmark/server.rb
deleted file mode 100644
index 74e13f4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/server.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'thrift'
-$:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'benchmark_service'
-
-module Server
-  include Thrift
-
-  class BenchmarkHandler
-    # 1-based index into the fibonacci sequence
-    def fibonacci(n)
-      seq = [1, 1]
-      3.upto(n) do
-        seq << seq[-1] + seq[-2]
-      end
-      seq[n-1] # n is 1-based
-    end
-  end
-
-  def self.start_server(host, port, serverClass)
-    handler = BenchmarkHandler.new
-    processor = ThriftBenchmark::BenchmarkService::Processor.new(handler)
-    transport = ServerSocket.new(host, port)
-    transport_factory = FramedTransportFactory.new
-    args = [processor, transport, transport_factory, nil, 20]
-    if serverClass == NonblockingServer
-      logger = Logger.new(STDERR)
-      logger.level = Logger::WARN
-      args << logger
-    end
-    server = serverClass.new(*args)
-    @server_thread = Thread.new do
-      server.serve
-    end
-    @server = server
-  end
-
-  def self.shutdown
-    return if @server.nil?
-    if @server.respond_to? :shutdown
-      @server.shutdown
-    else
-      @server_thread.kill
-    end
-  end
-end
-
-def resolve_const(const)
-  const and const.split('::').inject(Object) { |k,c| k.const_get(c) }
-end
-
-host, port, serverklass = ARGV
-
-Server.start_server(host, port.to_i, resolve_const(serverklass))
-
-# let our host know that the interpreter has started
-# ideally we'd wait until the server was serving, but we don't have a hook for that
-Marshal.dump(:started, STDOUT)
-STDOUT.flush
-
-Marshal.load(STDIN) # wait until we're instructed to shut down
-
-Server.shutdown
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/thin_server.rb b/vendor/git.apache.org/thrift.git/lib/rb/benchmark/thin_server.rb
deleted file mode 100644
index 4de2eef..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/benchmark/thin_server.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'thrift'
-$:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'benchmark_service'
-HOST = 'localhost'
-PORT = 42587
-
-class BenchmarkHandler
-  # 1-based index into the fibonacci sequence
-  def fibonacci(n)
-    seq = [1, 1]
-    3.upto(n) do
-      seq << seq[-1] + seq[-2]
-    end
-    seq[n-1] # n is 1-based
-  end
-end
-
-handler = BenchmarkHandler.new
-processor = ThriftBenchmark::BenchmarkService::Processor.new(handler)
-transport = Thrift::ServerSocket.new(HOST, PORT)
-transport_factory = Thrift::FramedTransportFactory.new
-logger = Logger.new(STDERR)
-logger.level = Logger::WARN
-Thrift::NonblockingServer.new(processor, transport, transport_factory, nil, 20, logger).serve
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/rb/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/binary_protocol_accelerated.c b/vendor/git.apache.org/thrift.git/lib/rb/ext/binary_protocol_accelerated.c
deleted file mode 100644
index 65cbe5f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/binary_protocol_accelerated.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <ruby.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <constants.h>
-#include <struct.h>
-#include <macros.h>
-#include <bytes.h>
-
-VALUE rb_thrift_binary_proto_native_qmark(VALUE self) {
-  return Qtrue;
-}
-
-
-
-static int VERSION_1;
-static int VERSION_MASK;
-static int TYPE_MASK;
-static int BAD_VERSION;
-static ID rbuf_ivar_id;
-
-static void write_byte_direct(VALUE trans, int8_t b) {
-  WRITE(trans, (char*)&b, 1);
-}
-
-static void write_i16_direct(VALUE trans, int16_t value) {
-  char data[2];
-  
-  data[1] = value;
-  data[0] = (value >> 8);
-
-  WRITE(trans, data, 2);
-}
-
-static void write_i32_direct(VALUE trans, int32_t value) {
-  char data[4];
-
-  data[3] = value;
-  data[2] = (value >> 8);
-  data[1] = (value >> 16);
-  data[0] = (value >> 24);
-
-  WRITE(trans, data, 4);
-}
-
-
-static void write_i64_direct(VALUE trans, int64_t value) {
-  char data[8];
-
-  data[7] = value;
-  data[6] = (value >> 8);
-  data[5] = (value >> 16);
-  data[4] = (value >> 24);
-  data[3] = (value >> 32);
-  data[2] = (value >> 40);
-  data[1] = (value >> 48);
-  data[0] = (value >> 56);
-
-  WRITE(trans, data, 8);
-}
-
-static void write_string_direct(VALUE trans, VALUE str) {
-  if (TYPE(str) != T_STRING) {
-    rb_raise(rb_eStandardError, "Value should be a string");
-  }
-  str = convert_to_utf8_byte_buffer(str);
-  write_i32_direct(trans, RSTRING_LEN(str));
-  rb_funcall(trans, write_method_id, 1, str);
-}
-
-//--------------------------------
-// interface writing methods
-//--------------------------------
-
-VALUE rb_thrift_binary_proto_write_message_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_struct_begin(VALUE self, VALUE name) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_struct_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_field_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_map_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_list_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_set_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_message_begin(VALUE self, VALUE name, VALUE type, VALUE seqid) {
-  VALUE trans = GET_TRANSPORT(self);
-  VALUE strict_write = GET_STRICT_WRITE(self);
-
-  if (strict_write == Qtrue) {
-    write_i32_direct(trans, VERSION_1 | FIX2INT(type));
-    write_string_direct(trans, name);
-    write_i32_direct(trans, FIX2INT(seqid));
-  } else {
-    write_string_direct(trans, name);
-    write_byte_direct(trans, FIX2INT(type));
-    write_i32_direct(trans, FIX2INT(seqid));
-  }
-  
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_field_begin(VALUE self, VALUE name, VALUE type, VALUE id) {
-  VALUE trans = GET_TRANSPORT(self);
-  write_byte_direct(trans, FIX2INT(type));
-  write_i16_direct(trans, FIX2INT(id));
-  
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_field_stop(VALUE self) {
-  write_byte_direct(GET_TRANSPORT(self), TTYPE_STOP);
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_map_begin(VALUE self, VALUE ktype, VALUE vtype, VALUE size) {
-  VALUE trans = GET_TRANSPORT(self);
-  write_byte_direct(trans, FIX2INT(ktype));
-  write_byte_direct(trans, FIX2INT(vtype));
-  write_i32_direct(trans, FIX2INT(size));
-  
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_list_begin(VALUE self, VALUE etype, VALUE size) {
-  VALUE trans = GET_TRANSPORT(self);
-  write_byte_direct(trans, FIX2INT(etype));
-  write_i32_direct(trans, FIX2INT(size));
-  
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_set_begin(VALUE self, VALUE etype, VALUE size) {
-  rb_thrift_binary_proto_write_list_begin(self, etype, size);
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_bool(VALUE self, VALUE b) {
-  write_byte_direct(GET_TRANSPORT(self), RTEST(b) ? 1 : 0);
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_byte(VALUE self, VALUE byte) {
-  CHECK_NIL(byte);
-  write_byte_direct(GET_TRANSPORT(self), NUM2INT(byte));
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_i16(VALUE self, VALUE i16) {
-  CHECK_NIL(i16);
-  write_i16_direct(GET_TRANSPORT(self), FIX2INT(i16));
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_i32(VALUE self, VALUE i32) {
-  CHECK_NIL(i32);
-  write_i32_direct(GET_TRANSPORT(self), NUM2INT(i32));
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_i64(VALUE self, VALUE i64) {
-  CHECK_NIL(i64);
-  write_i64_direct(GET_TRANSPORT(self), NUM2LL(i64));
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_double(VALUE self, VALUE dub) {
-  CHECK_NIL(dub);
-  // Unfortunately, bitwise_cast doesn't work in C.  Bad C!
-  union {
-    double f;
-    int64_t t;
-  } transfer;
-  transfer.f = RFLOAT_VALUE(rb_Float(dub));
-  write_i64_direct(GET_TRANSPORT(self), transfer.t);
-
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_string(VALUE self, VALUE str) {
-  CHECK_NIL(str);
-  VALUE trans = GET_TRANSPORT(self);
-  write_string_direct(trans, str);
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_write_binary(VALUE self, VALUE buf) {
-  CHECK_NIL(buf);
-  VALUE trans = GET_TRANSPORT(self);
-  buf = force_binary_encoding(buf);
-  write_i32_direct(trans, RSTRING_LEN(buf));
-  rb_funcall(trans, write_method_id, 1, buf);
-  return Qnil;
-}
-
-//---------------------------------------
-// interface reading methods
-//---------------------------------------
-
-VALUE rb_thrift_binary_proto_read_string(VALUE self);
-VALUE rb_thrift_binary_proto_read_binary(VALUE self);
-VALUE rb_thrift_binary_proto_read_byte(VALUE self);
-VALUE rb_thrift_binary_proto_read_i32(VALUE self);
-VALUE rb_thrift_binary_proto_read_i16(VALUE self);
-
-static char read_byte_direct(VALUE self) {
-  VALUE byte = rb_funcall(GET_TRANSPORT(self), read_byte_method_id, 0);
-  return (char)(FIX2INT(byte));
-}
-
-static int16_t read_i16_direct(VALUE self) {
-  VALUE rbuf = rb_ivar_get(self, rbuf_ivar_id);
-  rb_funcall(GET_TRANSPORT(self), read_into_buffer_method_id, 2, rbuf, INT2FIX(2));
-  return (int16_t)(((uint8_t)(RSTRING_PTR(rbuf)[1])) | ((uint16_t)((RSTRING_PTR(rbuf)[0]) << 8)));
-}
-
-static int32_t read_i32_direct(VALUE self) {
-  VALUE rbuf = rb_ivar_get(self, rbuf_ivar_id);
-  rb_funcall(GET_TRANSPORT(self), read_into_buffer_method_id, 2, rbuf, INT2FIX(4));
-  return ((uint8_t)(RSTRING_PTR(rbuf)[3])) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[2])) << 8) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[1])) << 16) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[0])) << 24);
-}
-
-static int64_t read_i64_direct(VALUE self) {
-  VALUE rbuf = rb_ivar_get(self, rbuf_ivar_id);
-  rb_funcall(GET_TRANSPORT(self), read_into_buffer_method_id, 2, rbuf, INT2FIX(8));
-  uint64_t hi = ((uint8_t)(RSTRING_PTR(rbuf)[3])) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[2])) << 8) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[1])) << 16) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[0])) << 24);
-  uint32_t lo = ((uint8_t)(RSTRING_PTR(rbuf)[7])) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[6])) << 8) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[5])) << 16) |
-    (((uint8_t)(RSTRING_PTR(rbuf)[4])) << 24);
-  return (hi << 32) | lo;
-}
-
-static VALUE get_protocol_exception(VALUE code, VALUE message) {
-  VALUE args[2];
-  args[0] = code;
-  args[1] = message;
-  return rb_class_new_instance(2, (VALUE*)&args, protocol_exception_class);
-}
-
-VALUE rb_thrift_binary_proto_read_message_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_read_struct_begin(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_read_struct_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_read_field_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_read_map_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_read_list_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_read_set_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_binary_proto_read_message_begin(VALUE self) {
-  VALUE strict_read = GET_STRICT_READ(self);
-  VALUE name, seqid;
-  int type;
-  
-  int version = read_i32_direct(self);
-  
-  if (version < 0) {
-    if ((version & VERSION_MASK) != VERSION_1) {
-      rb_exc_raise(get_protocol_exception(INT2FIX(BAD_VERSION), rb_str_new2("Missing version identifier")));
-    }
-    type = version & TYPE_MASK;
-    name = rb_thrift_binary_proto_read_string(self);
-    seqid = rb_thrift_binary_proto_read_i32(self);
-  } else {
-    if (strict_read == Qtrue) {
-      rb_exc_raise(get_protocol_exception(INT2FIX(BAD_VERSION), rb_str_new2("No version identifier, old protocol client?")));
-    }
-    name = READ(self, version);
-    type = read_byte_direct(self);
-    seqid = rb_thrift_binary_proto_read_i32(self);
-  }
-  
-  return rb_ary_new3(3, name, INT2FIX(type), seqid);
-}
-
-VALUE rb_thrift_binary_proto_read_field_begin(VALUE self) {
-  int type = read_byte_direct(self);
-  if (type == TTYPE_STOP) {
-    return rb_ary_new3(3, Qnil, INT2FIX(type), INT2FIX(0));
-  } else {
-    VALUE id = rb_thrift_binary_proto_read_i16(self);
-    return rb_ary_new3(3, Qnil, INT2FIX(type), id);
-  }
-}
-
-VALUE rb_thrift_binary_proto_read_map_begin(VALUE self) {
-  VALUE ktype = rb_thrift_binary_proto_read_byte(self);
-  VALUE vtype = rb_thrift_binary_proto_read_byte(self);
-  VALUE size = rb_thrift_binary_proto_read_i32(self);
-  return rb_ary_new3(3, ktype, vtype, size);
-}
-
-VALUE rb_thrift_binary_proto_read_list_begin(VALUE self) {
-  VALUE etype = rb_thrift_binary_proto_read_byte(self);
-  VALUE size = rb_thrift_binary_proto_read_i32(self);
-  return rb_ary_new3(2, etype, size);
-}
-
-VALUE rb_thrift_binary_proto_read_set_begin(VALUE self) {
-  return rb_thrift_binary_proto_read_list_begin(self);
-}
-
-VALUE rb_thrift_binary_proto_read_bool(VALUE self) {
-  char byte = read_byte_direct(self);
-  return byte != 0 ? Qtrue : Qfalse;
-}
-
-VALUE rb_thrift_binary_proto_read_byte(VALUE self) {
-  return INT2FIX(read_byte_direct(self));
-}
-
-VALUE rb_thrift_binary_proto_read_i16(VALUE self) {
-  return INT2FIX(read_i16_direct(self));
-}
-
-VALUE rb_thrift_binary_proto_read_i32(VALUE self) {
-  return INT2NUM(read_i32_direct(self));
-}
-
-VALUE rb_thrift_binary_proto_read_i64(VALUE self) {
-  return LL2NUM(read_i64_direct(self));
-}
-
-VALUE rb_thrift_binary_proto_read_double(VALUE self) {
-  union {
-    double f;
-    int64_t t;
-  } transfer;
-  transfer.t = read_i64_direct(self);
-  return rb_float_new(transfer.f);
-}
-
-VALUE rb_thrift_binary_proto_read_string(VALUE self) {
-  VALUE buffer = rb_thrift_binary_proto_read_binary(self);
-  return convert_to_string(buffer);
-}
-
-VALUE rb_thrift_binary_proto_read_binary(VALUE self) {
-  int size = read_i32_direct(self);
-  return READ(self, size);
-}
-
-void Init_binary_protocol_accelerated() {
-  VALUE thrift_binary_protocol_class = rb_const_get(thrift_module, rb_intern("BinaryProtocol"));
-
-  VERSION_1 = rb_num2ll(rb_const_get(thrift_binary_protocol_class, rb_intern("VERSION_1")));
-  VERSION_MASK = rb_num2ll(rb_const_get(thrift_binary_protocol_class, rb_intern("VERSION_MASK")));
-  TYPE_MASK = rb_num2ll(rb_const_get(thrift_binary_protocol_class, rb_intern("TYPE_MASK")));
-
-  VALUE bpa_class = rb_define_class_under(thrift_module, "BinaryProtocolAccelerated", thrift_binary_protocol_class);
-
-  rb_define_method(bpa_class, "native?", rb_thrift_binary_proto_native_qmark, 0);
-
-  rb_define_method(bpa_class, "write_message_begin", rb_thrift_binary_proto_write_message_begin, 3);
-  rb_define_method(bpa_class, "write_field_begin",   rb_thrift_binary_proto_write_field_begin, 3);
-  rb_define_method(bpa_class, "write_field_stop",    rb_thrift_binary_proto_write_field_stop, 0);
-  rb_define_method(bpa_class, "write_map_begin",     rb_thrift_binary_proto_write_map_begin, 3);
-  rb_define_method(bpa_class, "write_list_begin",    rb_thrift_binary_proto_write_list_begin, 2);
-  rb_define_method(bpa_class, "write_set_begin",     rb_thrift_binary_proto_write_set_begin, 2);
-  rb_define_method(bpa_class, "write_byte",          rb_thrift_binary_proto_write_byte, 1);
-  rb_define_method(bpa_class, "write_bool",          rb_thrift_binary_proto_write_bool, 1);
-  rb_define_method(bpa_class, "write_i16",           rb_thrift_binary_proto_write_i16, 1);
-  rb_define_method(bpa_class, "write_i32",           rb_thrift_binary_proto_write_i32, 1);
-  rb_define_method(bpa_class, "write_i64",           rb_thrift_binary_proto_write_i64, 1);
-  rb_define_method(bpa_class, "write_double",        rb_thrift_binary_proto_write_double, 1);
-  rb_define_method(bpa_class, "write_string",        rb_thrift_binary_proto_write_string, 1);
-  rb_define_method(bpa_class, "write_binary",        rb_thrift_binary_proto_write_binary, 1);
-  // unused methods
-  rb_define_method(bpa_class, "write_message_end", rb_thrift_binary_proto_write_message_end, 0);
-  rb_define_method(bpa_class, "write_struct_begin", rb_thrift_binary_proto_write_struct_begin, 1);
-  rb_define_method(bpa_class, "write_struct_end", rb_thrift_binary_proto_write_struct_end, 0);
-  rb_define_method(bpa_class, "write_field_end", rb_thrift_binary_proto_write_field_end, 0);
-  rb_define_method(bpa_class, "write_map_end", rb_thrift_binary_proto_write_map_end, 0);
-  rb_define_method(bpa_class, "write_list_end", rb_thrift_binary_proto_write_list_end, 0);
-  rb_define_method(bpa_class, "write_set_end", rb_thrift_binary_proto_write_set_end, 0);
-
-  rb_define_method(bpa_class, "read_message_begin",  rb_thrift_binary_proto_read_message_begin, 0);
-  rb_define_method(bpa_class, "read_field_begin",    rb_thrift_binary_proto_read_field_begin, 0);
-  rb_define_method(bpa_class, "read_map_begin",      rb_thrift_binary_proto_read_map_begin, 0);
-  rb_define_method(bpa_class, "read_list_begin",     rb_thrift_binary_proto_read_list_begin, 0);
-  rb_define_method(bpa_class, "read_set_begin",      rb_thrift_binary_proto_read_set_begin, 0);
-  rb_define_method(bpa_class, "read_byte",           rb_thrift_binary_proto_read_byte, 0);
-  rb_define_method(bpa_class, "read_bool",           rb_thrift_binary_proto_read_bool, 0);
-  rb_define_method(bpa_class, "read_i16",            rb_thrift_binary_proto_read_i16, 0);
-  rb_define_method(bpa_class, "read_i32",            rb_thrift_binary_proto_read_i32, 0);
-  rb_define_method(bpa_class, "read_i64",            rb_thrift_binary_proto_read_i64, 0);
-  rb_define_method(bpa_class, "read_double",         rb_thrift_binary_proto_read_double, 0);
-  rb_define_method(bpa_class, "read_string",         rb_thrift_binary_proto_read_string, 0);
-  rb_define_method(bpa_class, "read_binary",         rb_thrift_binary_proto_read_binary, 0);
-  // unused methods
-  rb_define_method(bpa_class, "read_message_end", rb_thrift_binary_proto_read_message_end, 0);
-  rb_define_method(bpa_class, "read_struct_begin", rb_thrift_binary_proto_read_struct_begin, 0);
-  rb_define_method(bpa_class, "read_struct_end", rb_thrift_binary_proto_read_struct_end, 0);
-  rb_define_method(bpa_class, "read_field_end", rb_thrift_binary_proto_read_field_end, 0);
-  rb_define_method(bpa_class, "read_map_end", rb_thrift_binary_proto_read_map_end, 0);
-  rb_define_method(bpa_class, "read_list_end", rb_thrift_binary_proto_read_list_end, 0);
-  rb_define_method(bpa_class, "read_set_end", rb_thrift_binary_proto_read_set_end, 0);
-
-  rbuf_ivar_id = rb_intern("@rbuf");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/binary_protocol_accelerated.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/binary_protocol_accelerated.h
deleted file mode 100644
index 37baf41..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/binary_protocol_accelerated.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-void Init_binary_protocol_accelerated();
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/bytes.c b/vendor/git.apache.org/thrift.git/lib/rb/ext/bytes.c
deleted file mode 100644
index 8a6fac4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/bytes.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <ruby.h>
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-#endif
-#include <constants.h>
-
-VALUE force_binary_encoding(VALUE buffer) {
-  return rb_funcall(thrift_bytes_module, force_binary_encoding_id, 1, buffer);
-}
-
-VALUE convert_to_utf8_byte_buffer(VALUE string) {
-  return rb_funcall(thrift_bytes_module, convert_to_utf8_byte_buffer_id, 1, string);
-}
-
-VALUE convert_to_string(VALUE utf8_buffer) {
-  return rb_funcall(thrift_bytes_module, convert_to_string_id, 1, utf8_buffer);
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/bytes.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/bytes.h
deleted file mode 100644
index 7108d83..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/bytes.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <ruby.h>
-
-/*
- * A collection of utilities for working with bytes and byte buffers.
- *
- * These methods are the native analogies to some of the methods in
- * Thrift::Bytes (thrift/bytes.rb).
- */
-
-VALUE force_binary_encoding(VALUE buffer);
-VALUE convert_to_utf8_byte_buffer(VALUE string);
-VALUE convert_to_string(VALUE utf8_buffer);
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/compact_protocol.c b/vendor/git.apache.org/thrift.git/lib/rb/ext/compact_protocol.c
deleted file mode 100644
index c0f46b9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/compact_protocol.c
+++ /dev/null
@@ -1,637 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <ruby.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <constants.h>
-#include <struct.h>
-#include <macros.h>
-#include <bytes.h>
-
-#define LAST_ID(obj) FIX2INT(rb_ary_pop(rb_ivar_get(obj, last_field_id)))
-#define SET_LAST_ID(obj, val) rb_ary_push(rb_ivar_get(obj, last_field_id), val)
-
-VALUE rb_thrift_compact_proto_native_qmark(VALUE self) {
-  return Qtrue;
-}
-
-static ID last_field_id;
-static ID boolean_field_id;
-static ID bool_value_id;
-static ID rbuf_ivar_id;
-
-static int VERSION;
-static int VERSION_MASK;
-static int TYPE_MASK;
-static int TYPE_BITS;
-static int TYPE_SHIFT_AMOUNT;
-static int PROTOCOL_ID;
-
-static VALUE thrift_compact_protocol_class;
-
-static int CTYPE_BOOLEAN_TRUE   = 0x01;
-static int CTYPE_BOOLEAN_FALSE  = 0x02;
-static int CTYPE_BYTE           = 0x03;
-static int CTYPE_I16            = 0x04;
-static int CTYPE_I32            = 0x05;
-static int CTYPE_I64            = 0x06;
-static int CTYPE_DOUBLE         = 0x07;
-static int CTYPE_BINARY         = 0x08;
-static int CTYPE_LIST           = 0x09;
-static int CTYPE_SET            = 0x0A;
-static int CTYPE_MAP            = 0x0B;
-static int CTYPE_STRUCT         = 0x0C;
-
-VALUE rb_thrift_compact_proto_write_i16(VALUE self, VALUE i16);
-
-// TODO: implement this
-static int get_compact_type(VALUE type_value) {
-  int type = FIX2INT(type_value);
-  if (type == TTYPE_BOOL) {
-    return CTYPE_BOOLEAN_TRUE;
-  } else if (type == TTYPE_BYTE) {
-    return CTYPE_BYTE;
-  } else if (type == TTYPE_I16) {
-    return CTYPE_I16;
-  } else if (type == TTYPE_I32) {
-    return CTYPE_I32;
-  } else if (type == TTYPE_I64) {
-    return CTYPE_I64;
-  } else if (type == TTYPE_DOUBLE) {
-    return CTYPE_DOUBLE;
-  } else if (type == TTYPE_STRING) {
-    return CTYPE_BINARY;
-  } else if (type == TTYPE_LIST) {
-    return CTYPE_LIST;
-  } else if (type == TTYPE_SET) {
-    return CTYPE_SET;
-  } else if (type == TTYPE_MAP) {
-    return CTYPE_MAP;
-  } else if (type == TTYPE_STRUCT) {
-    return CTYPE_STRUCT;
-  } else {
-    char str[50];
-    sprintf(str, "don't know what type: %d", type);
-    rb_raise(rb_eStandardError, "%s", str);
-    return 0;
-  }
-}
-
-static void write_byte_direct(VALUE transport, int8_t b) {
-  WRITE(transport, (char*)&b, 1);
-}
-
-static void write_field_begin_internal(VALUE self, VALUE type, VALUE id_value, VALUE type_override) {
-  int id = FIX2INT(id_value);
-  int last_id = LAST_ID(self);
-  VALUE transport = GET_TRANSPORT(self);
-  
-  // if there's a type override, use that.
-  int8_t type_to_write = RTEST(type_override) ? FIX2INT(type_override) : get_compact_type(type);
-  // check if we can use delta encoding for the field id
-  int diff = id - last_id;
-  if (diff > 0 && diff <= 15) {
-    // write them together
-    write_byte_direct(transport, diff << 4 | (type_to_write & 0x0f));
-  } else {
-    // write them separate
-    write_byte_direct(transport, type_to_write & 0x0f);
-    rb_thrift_compact_proto_write_i16(self, id_value);
-  }
-
-  SET_LAST_ID(self, id_value);
-}
-
-static int32_t int_to_zig_zag(int32_t n) {
-  return (n << 1) ^ (n >> 31);
-}
-
-static uint64_t ll_to_zig_zag(int64_t n) {
-  return (n << 1) ^ (n >> 63);
-}
-
-static void write_varint32(VALUE transport, uint32_t n) {
-  while (true) {
-    if ((n & ~0x7F) == 0) {
-      write_byte_direct(transport, n & 0x7f);
-      break;
-    } else {
-      write_byte_direct(transport, (n & 0x7F) | 0x80);
-      n = n >> 7;
-    }
-  }
-}
-
-static void write_varint64(VALUE transport, uint64_t n) {
-  while (true) {
-    if ((n & ~0x7F) == 0) {
-      write_byte_direct(transport, n & 0x7f);
-      break;
-    } else {
-      write_byte_direct(transport, (n & 0x7F) | 0x80);
-      n = n >> 7;
-    }
-  }
-}
-
-static void write_collection_begin(VALUE transport, VALUE elem_type, VALUE size_value) {
-  int size = FIX2INT(size_value);
-  if (size <= 14) {
-    write_byte_direct(transport, size << 4 | get_compact_type(elem_type));
-  } else {
-    write_byte_direct(transport, 0xf0 | get_compact_type(elem_type));
-    write_varint32(transport, size);
-  }
-}
-
-
-//--------------------------------
-// interface writing methods
-//--------------------------------
-
-VALUE rb_thrift_compact_proto_write_i32(VALUE self, VALUE i32);
-VALUE rb_thrift_compact_proto_write_string(VALUE self, VALUE str);
-VALUE rb_thrift_compact_proto_write_binary(VALUE self, VALUE buf);
-
-VALUE rb_thrift_compact_proto_write_message_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_struct_begin(VALUE self, VALUE name) {
-  rb_ary_push(rb_ivar_get(self, last_field_id), INT2FIX(0));
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_struct_end(VALUE self) {
-  rb_ary_pop(rb_ivar_get(self, last_field_id));
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_field_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_map_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_list_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_set_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_message_begin(VALUE self, VALUE name, VALUE type, VALUE seqid) {
-  VALUE transport = GET_TRANSPORT(self);
-  write_byte_direct(transport, PROTOCOL_ID);
-  write_byte_direct(transport, (VERSION & VERSION_MASK) | ((FIX2INT(type) << TYPE_SHIFT_AMOUNT) & TYPE_MASK));
-  write_varint32(transport, FIX2INT(seqid));
-  rb_thrift_compact_proto_write_string(self, name);
-  
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_field_begin(VALUE self, VALUE name, VALUE type, VALUE id) {
-  if (FIX2INT(type) == TTYPE_BOOL) {
-    // we want to possibly include the value, so we'll wait.
-    rb_ivar_set(self, boolean_field_id, rb_ary_new3(2, type, id));
-  } else {
-    write_field_begin_internal(self, type, id, Qnil);
-  }
-
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_field_stop(VALUE self) {
-  write_byte_direct(GET_TRANSPORT(self), TTYPE_STOP);
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_map_begin(VALUE self, VALUE ktype, VALUE vtype, VALUE size_value) {
-  int size = FIX2INT(size_value);
-  VALUE transport = GET_TRANSPORT(self);
-  if (size == 0) {
-    write_byte_direct(transport, 0);
-  } else {
-    write_varint32(transport, size);
-    write_byte_direct(transport, get_compact_type(ktype) << 4 | get_compact_type(vtype));
-  }
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_list_begin(VALUE self, VALUE etype, VALUE size) {
-  write_collection_begin(GET_TRANSPORT(self), etype, size);
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_set_begin(VALUE self, VALUE etype, VALUE size) {
-  write_collection_begin(GET_TRANSPORT(self), etype, size);
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_bool(VALUE self, VALUE b) {
-  int8_t type = b == Qtrue ? CTYPE_BOOLEAN_TRUE : CTYPE_BOOLEAN_FALSE;
-  VALUE boolean_field = rb_ivar_get(self, boolean_field_id);
-  if (NIL_P(boolean_field)) {
-    // we're not part of a field, so just write the value.
-    write_byte_direct(GET_TRANSPORT(self), type);
-  } else {
-    // we haven't written the field header yet
-    write_field_begin_internal(self, rb_ary_entry(boolean_field, 0), rb_ary_entry(boolean_field, 1), INT2FIX(type));
-    rb_ivar_set(self, boolean_field_id, Qnil);
-  }
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_byte(VALUE self, VALUE byte) {
-  CHECK_NIL(byte);
-  write_byte_direct(GET_TRANSPORT(self), FIX2INT(byte));
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_i16(VALUE self, VALUE i16) {
-  rb_thrift_compact_proto_write_i32(self, i16);
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_i32(VALUE self, VALUE i32) {
-  CHECK_NIL(i32);
-  write_varint32(GET_TRANSPORT(self), int_to_zig_zag(NUM2INT(i32)));
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_i64(VALUE self, VALUE i64) {
-  CHECK_NIL(i64);
-  write_varint64(GET_TRANSPORT(self), ll_to_zig_zag(NUM2LL(i64)));
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_double(VALUE self, VALUE dub) {
-  CHECK_NIL(dub);
-  // Unfortunately, bitwise_cast doesn't work in C.  Bad C!
-  union {
-    double f;
-    int64_t l;
-  } transfer;
-  transfer.f = RFLOAT_VALUE(rb_Float(dub));
-  char buf[8];
-  buf[0] = transfer.l & 0xff;
-  buf[1] = (transfer.l >> 8) & 0xff;
-  buf[2] = (transfer.l >> 16) & 0xff;
-  buf[3] = (transfer.l >> 24) & 0xff;
-  buf[4] = (transfer.l >> 32) & 0xff;
-  buf[5] = (transfer.l >> 40) & 0xff;
-  buf[6] = (transfer.l >> 48) & 0xff;
-  buf[7] = (transfer.l >> 56) & 0xff;
-  WRITE(GET_TRANSPORT(self), buf, 8);
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_string(VALUE self, VALUE str) {
-  str = convert_to_utf8_byte_buffer(str);
-  rb_thrift_compact_proto_write_binary(self, str);
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_write_binary(VALUE self, VALUE buf) {
-  buf = force_binary_encoding(buf);
-  VALUE transport = GET_TRANSPORT(self);
-  write_varint32(transport, RSTRING_LEN(buf));
-  WRITE(transport, StringValuePtr(buf), RSTRING_LEN(buf));
-  return Qnil;
-}
-
-//---------------------------------------
-// interface reading methods
-//---------------------------------------
-
-#define is_bool_type(ctype) (((ctype) & 0x0F) == CTYPE_BOOLEAN_TRUE || ((ctype) & 0x0F) == CTYPE_BOOLEAN_FALSE)
-
-VALUE rb_thrift_compact_proto_read_string(VALUE self);
-VALUE rb_thrift_compact_proto_read_binary(VALUE self);
-VALUE rb_thrift_compact_proto_read_byte(VALUE self);
-VALUE rb_thrift_compact_proto_read_i32(VALUE self);
-VALUE rb_thrift_compact_proto_read_i16(VALUE self);
-
-static int8_t get_ttype(int8_t ctype) {
-  if (ctype == TTYPE_STOP) {
-    return TTYPE_STOP;
-  } else if (ctype == CTYPE_BOOLEAN_TRUE || ctype == CTYPE_BOOLEAN_FALSE) {
-    return TTYPE_BOOL;
-  } else if (ctype == CTYPE_BYTE) {
-    return TTYPE_BYTE;
-  } else if (ctype == CTYPE_I16) {
-    return TTYPE_I16;
-  } else if (ctype == CTYPE_I32) {
-    return TTYPE_I32;
-  } else if (ctype == CTYPE_I64) {
-    return TTYPE_I64;
-  } else if (ctype == CTYPE_DOUBLE) {
-    return TTYPE_DOUBLE;
-  } else if (ctype == CTYPE_BINARY) {
-    return TTYPE_STRING;
-  } else if (ctype == CTYPE_LIST) {
-    return TTYPE_LIST;
-  } else if (ctype == CTYPE_SET) {
-    return TTYPE_SET;
-  } else if (ctype == CTYPE_MAP) {
-    return TTYPE_MAP;
-  } else if (ctype == CTYPE_STRUCT) {
-    return TTYPE_STRUCT;
-  } else {
-    char str[50];
-    sprintf(str, "don't know what type: %d", ctype);
-    rb_raise(rb_eStandardError, "%s", str);
-    return 0;
-  }
-}
-
-static char read_byte_direct(VALUE self) {
-  VALUE byte = rb_funcall(GET_TRANSPORT(self), read_byte_method_id, 0);
-  return (char)(FIX2INT(byte));
-}
-
-static int64_t zig_zag_to_ll(int64_t n) {
-  return (((uint64_t)n) >> 1) ^ -(n & 1);
-}
-
-static int32_t zig_zag_to_int(int32_t n) {
-  return (((uint32_t)n) >> 1) ^ -(n & 1);
-}
-
-static int64_t read_varint64(VALUE self) {
-  int shift = 0;
-  int64_t result = 0;
-  while (true) {
-    int8_t b = read_byte_direct(self);
-    result = result | ((uint64_t)(b & 0x7f) << shift);
-    if ((b & 0x80) != 0x80) {
-      break;
-    }
-    shift += 7;
-  }
-  return result;
-}
-
-static int16_t read_i16(VALUE self) {
-  return zig_zag_to_int((int32_t)read_varint64(self));
-}
-
-static VALUE get_protocol_exception(VALUE code, VALUE message) {
-  VALUE args[2];
-  args[0] = code;
-  args[1] = message;
-  return rb_class_new_instance(2, (VALUE*)&args, protocol_exception_class);
-}
-
-VALUE rb_thrift_compact_proto_read_message_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_read_struct_begin(VALUE self) {
-  rb_ary_push(rb_ivar_get(self, last_field_id), INT2FIX(0));
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_read_struct_end(VALUE self) {
-  rb_ary_pop(rb_ivar_get(self, last_field_id));
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_read_field_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_read_map_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_read_list_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_read_set_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_compact_proto_read_message_begin(VALUE self) {
-  int8_t protocol_id = read_byte_direct(self);
-  if (protocol_id != PROTOCOL_ID) {
-    char buf[100];
-    int len = sprintf(buf, "Expected protocol id %d but got %d", PROTOCOL_ID, protocol_id);
-    buf[len] = 0;
-    rb_exc_raise(get_protocol_exception(INT2FIX(-1), rb_str_new2(buf)));
-  }
-  
-  int8_t version_and_type = read_byte_direct(self);
-  int8_t version = version_and_type & VERSION_MASK;
-  if (version != VERSION) {
-    char buf[100];
-    int len = sprintf(buf, "Expected version id %d but got %d", version, VERSION);
-    buf[len] = 0;
-    rb_exc_raise(get_protocol_exception(INT2FIX(-1), rb_str_new2(buf)));
-  }
-  
-  int8_t type = (version_and_type >> TYPE_SHIFT_AMOUNT) & TYPE_BITS;
-  int32_t seqid = read_varint64(self);
-  VALUE messageName = rb_thrift_compact_proto_read_string(self);
-  return rb_ary_new3(3, messageName, INT2FIX(type), INT2NUM(seqid));
-}
-
-VALUE rb_thrift_compact_proto_read_field_begin(VALUE self) {
-  int8_t type = read_byte_direct(self);
-  // if it's a stop, then we can return immediately, as the struct is over.
-  if ((type & 0x0f) == TTYPE_STOP) {
-    return rb_ary_new3(3, Qnil, INT2FIX(0), INT2FIX(0));
-  } else {
-    int field_id = 0;
-
-    // mask off the 4 MSB of the type header. it could contain a field id delta.
-    uint8_t modifier = ((type & 0xf0) >> 4);
-    
-    if (modifier == 0) {
-      // not a delta. look ahead for the zigzag varint field id.
-      (void) LAST_ID(self);
-      field_id = read_i16(self);
-    } else {
-      // has a delta. add the delta to the last read field id.
-      field_id = LAST_ID(self) + modifier;
-    }
-
-    // if this happens to be a boolean field, the value is encoded in the type
-    if (is_bool_type(type)) {
-      // save the boolean value in a special instance variable.
-      rb_ivar_set(self, bool_value_id, (type & 0x0f) == CTYPE_BOOLEAN_TRUE ? Qtrue : Qfalse);
-    }
-
-    // push the new field onto the field stack so we can keep the deltas going.
-    SET_LAST_ID(self, INT2FIX(field_id));
-    return rb_ary_new3(3, Qnil, INT2FIX(get_ttype(type & 0x0f)), INT2FIX(field_id));
-  }
-}
-
-VALUE rb_thrift_compact_proto_read_map_begin(VALUE self) {
-  int32_t size = read_varint64(self);
-  uint8_t key_and_value_type = size == 0 ? 0 : read_byte_direct(self);
-  return rb_ary_new3(3, INT2FIX(get_ttype(key_and_value_type >> 4)), INT2FIX(get_ttype(key_and_value_type & 0xf)), INT2FIX(size));
-}
-
-VALUE rb_thrift_compact_proto_read_list_begin(VALUE self) {
-  uint8_t size_and_type = read_byte_direct(self);
-  int32_t size = (size_and_type >> 4) & 0x0f;
-  if (size == 15) {
-    size = read_varint64(self);
-  }
-  uint8_t type = get_ttype(size_and_type & 0x0f);
-  return rb_ary_new3(2, INT2FIX(type), INT2FIX(size));
-}
-
-VALUE rb_thrift_compact_proto_read_set_begin(VALUE self) {
-  return rb_thrift_compact_proto_read_list_begin(self);
-}
-
-VALUE rb_thrift_compact_proto_read_bool(VALUE self) {
-  VALUE bool_value = rb_ivar_get(self, bool_value_id);
-  if (NIL_P(bool_value)) {
-    return read_byte_direct(self) == CTYPE_BOOLEAN_TRUE ? Qtrue : Qfalse;
-  } else {
-    rb_ivar_set(self, bool_value_id, Qnil);
-    return bool_value;
-  }
-}
-
-VALUE rb_thrift_compact_proto_read_byte(VALUE self) {
-  return INT2FIX(read_byte_direct(self));
-}
-
-VALUE rb_thrift_compact_proto_read_i16(VALUE self) {
-  return INT2FIX(read_i16(self));
-}
-
-VALUE rb_thrift_compact_proto_read_i32(VALUE self) {
-  return INT2NUM(zig_zag_to_int(read_varint64(self)));
-}
-
-VALUE rb_thrift_compact_proto_read_i64(VALUE self) {
-  return LL2NUM(zig_zag_to_ll(read_varint64(self)));
-}
-
-VALUE rb_thrift_compact_proto_read_double(VALUE self) {
-  union {
-    double f;
-    int64_t l;
-  } transfer;
-  VALUE rbuf = rb_ivar_get(self, rbuf_ivar_id);
-  rb_funcall(GET_TRANSPORT(self), read_into_buffer_method_id, 2, rbuf, INT2FIX(8));
-  uint32_t lo = ((uint8_t)(RSTRING_PTR(rbuf)[0]))
-    | (((uint8_t)(RSTRING_PTR(rbuf)[1])) << 8)
-    | (((uint8_t)(RSTRING_PTR(rbuf)[2])) << 16)
-    | (((uint8_t)(RSTRING_PTR(rbuf)[3])) << 24);
-  uint64_t hi = (((uint8_t)(RSTRING_PTR(rbuf)[4])))
-    | (((uint8_t)(RSTRING_PTR(rbuf)[5])) << 8)
-    | (((uint8_t)(RSTRING_PTR(rbuf)[6])) << 16)
-    | (((uint8_t)(RSTRING_PTR(rbuf)[7])) << 24);
-  transfer.l = (hi << 32) | lo;
-
-  return rb_float_new(transfer.f);
-}
-
-VALUE rb_thrift_compact_proto_read_string(VALUE self) {
-  VALUE buffer = rb_thrift_compact_proto_read_binary(self);
-  return convert_to_string(buffer);
-}
-
-VALUE rb_thrift_compact_proto_read_binary(VALUE self) {
-  int64_t size = read_varint64(self);
-  return READ(self, size);
-}
-
-static void Init_constants() {
-  thrift_compact_protocol_class = rb_const_get(thrift_module, rb_intern("CompactProtocol"));
-
-  VERSION = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("VERSION")));
-  VERSION_MASK = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("VERSION_MASK")));
-  TYPE_MASK = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("TYPE_MASK")));
-  TYPE_BITS = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("TYPE_BITS")));
-  TYPE_SHIFT_AMOUNT = FIX2INT(rb_const_get(thrift_compact_protocol_class, rb_intern("TYPE_SHIFT_AMOUNT")));
-  PROTOCOL_ID = FIX2INT(rb_const_get(thrift_compact_protocol_class, rb_intern("PROTOCOL_ID")));
-
-  last_field_id = rb_intern("@last_field");
-  boolean_field_id = rb_intern("@boolean_field");
-  bool_value_id = rb_intern("@bool_value");
-  rbuf_ivar_id = rb_intern("@rbuf");
-}
-
-static void Init_rb_methods() {
-  rb_define_method(thrift_compact_protocol_class, "native?", rb_thrift_compact_proto_native_qmark, 0);
-
-  rb_define_method(thrift_compact_protocol_class, "write_message_begin", rb_thrift_compact_proto_write_message_begin, 3);
-  rb_define_method(thrift_compact_protocol_class, "write_field_begin",   rb_thrift_compact_proto_write_field_begin, 3);
-  rb_define_method(thrift_compact_protocol_class, "write_field_stop",    rb_thrift_compact_proto_write_field_stop, 0);
-  rb_define_method(thrift_compact_protocol_class, "write_map_begin",     rb_thrift_compact_proto_write_map_begin, 3);
-  rb_define_method(thrift_compact_protocol_class, "write_list_begin",    rb_thrift_compact_proto_write_list_begin, 2);
-  rb_define_method(thrift_compact_protocol_class, "write_set_begin",     rb_thrift_compact_proto_write_set_begin, 2);
-  rb_define_method(thrift_compact_protocol_class, "write_byte",          rb_thrift_compact_proto_write_byte, 1);
-  rb_define_method(thrift_compact_protocol_class, "write_bool",          rb_thrift_compact_proto_write_bool, 1);
-  rb_define_method(thrift_compact_protocol_class, "write_i16",           rb_thrift_compact_proto_write_i16, 1);
-  rb_define_method(thrift_compact_protocol_class, "write_i32",           rb_thrift_compact_proto_write_i32, 1);
-  rb_define_method(thrift_compact_protocol_class, "write_i64",           rb_thrift_compact_proto_write_i64, 1);
-  rb_define_method(thrift_compact_protocol_class, "write_double",        rb_thrift_compact_proto_write_double, 1);
-  rb_define_method(thrift_compact_protocol_class, "write_string",        rb_thrift_compact_proto_write_string, 1);
-  rb_define_method(thrift_compact_protocol_class, "write_binary",        rb_thrift_compact_proto_write_binary, 1);
-
-  rb_define_method(thrift_compact_protocol_class, "write_message_end", rb_thrift_compact_proto_write_message_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "write_struct_begin", rb_thrift_compact_proto_write_struct_begin, 1);
-  rb_define_method(thrift_compact_protocol_class, "write_struct_end", rb_thrift_compact_proto_write_struct_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "write_field_end", rb_thrift_compact_proto_write_field_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "write_map_end", rb_thrift_compact_proto_write_map_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "write_list_end", rb_thrift_compact_proto_write_list_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "write_set_end", rb_thrift_compact_proto_write_set_end, 0);
-
-
-  rb_define_method(thrift_compact_protocol_class, "read_message_begin",  rb_thrift_compact_proto_read_message_begin, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_field_begin",    rb_thrift_compact_proto_read_field_begin, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_map_begin",      rb_thrift_compact_proto_read_map_begin, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_list_begin",     rb_thrift_compact_proto_read_list_begin, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_set_begin",      rb_thrift_compact_proto_read_set_begin, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_byte",           rb_thrift_compact_proto_read_byte, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_bool",           rb_thrift_compact_proto_read_bool, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_i16",            rb_thrift_compact_proto_read_i16, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_i32",            rb_thrift_compact_proto_read_i32, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_i64",            rb_thrift_compact_proto_read_i64, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_double",         rb_thrift_compact_proto_read_double, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_string",         rb_thrift_compact_proto_read_string, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_binary",         rb_thrift_compact_proto_read_binary, 0);
-
-  rb_define_method(thrift_compact_protocol_class, "read_message_end", rb_thrift_compact_proto_read_message_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_struct_begin",  rb_thrift_compact_proto_read_struct_begin, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_struct_end",    rb_thrift_compact_proto_read_struct_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_field_end",     rb_thrift_compact_proto_read_field_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_map_end",       rb_thrift_compact_proto_read_map_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_list_end",      rb_thrift_compact_proto_read_list_end, 0);
-  rb_define_method(thrift_compact_protocol_class, "read_set_end",       rb_thrift_compact_proto_read_set_end, 0);
-}
-
-void Init_compact_protocol() {
-  Init_constants();
-  Init_rb_methods();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/compact_protocol.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/compact_protocol.h
deleted file mode 100644
index 163915e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/compact_protocol.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-void Init_compact_protocol();
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/constants.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/constants.h
deleted file mode 100644
index e7aec44..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/constants.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-extern int TTYPE_STOP;
-extern int TTYPE_BOOL;
-extern int TTYPE_BYTE;
-extern int TTYPE_I16;
-extern int TTYPE_I32;
-extern int TTYPE_I64;
-extern int TTYPE_DOUBLE;
-extern int TTYPE_STRING;
-extern int TTYPE_MAP;
-extern int TTYPE_SET;
-extern int TTYPE_LIST;
-extern int TTYPE_STRUCT;
-
-extern ID validate_method_id;
-extern ID write_struct_begin_method_id;
-extern ID write_struct_end_method_id;
-extern ID write_field_begin_method_id;
-extern ID write_field_end_method_id;
-extern ID write_boolean_method_id;
-extern ID write_byte_method_id;
-extern ID write_i16_method_id;
-extern ID write_i32_method_id;
-extern ID write_i64_method_id;
-extern ID write_double_method_id;
-extern ID write_string_method_id;
-extern ID write_binary_method_id;
-extern ID write_map_begin_method_id;
-extern ID write_map_end_method_id;
-extern ID write_list_begin_method_id;
-extern ID write_list_end_method_id;
-extern ID write_set_begin_method_id;
-extern ID write_set_end_method_id;
-extern ID read_bool_method_id;
-extern ID read_byte_method_id;
-extern ID read_i16_method_id;
-extern ID read_i32_method_id;
-extern ID read_i64_method_id;
-extern ID read_string_method_id;
-extern ID read_binary_method_id;
-extern ID read_double_method_id;
-extern ID read_map_begin_method_id;
-extern ID read_map_end_method_id;
-extern ID read_list_begin_method_id;
-extern ID read_list_end_method_id;
-extern ID read_set_begin_method_id;
-extern ID read_set_end_method_id;
-extern ID read_struct_begin_method_id;
-extern ID read_struct_end_method_id;
-extern ID read_field_begin_method_id;
-extern ID read_field_end_method_id;
-extern ID keys_method_id;
-extern ID entries_method_id;
-extern ID write_field_stop_method_id;
-extern ID skip_method_id;
-extern ID write_method_id;
-extern ID read_all_method_id;
-extern ID read_into_buffer_method_id;
-extern ID force_binary_encoding_id;
-extern ID convert_to_utf8_byte_buffer_id;
-extern ID convert_to_string_id;
-
-extern ID fields_const_id;
-extern ID transport_ivar_id;
-extern ID strict_read_ivar_id;
-extern ID strict_write_ivar_id;
-
-extern VALUE type_sym;
-extern VALUE name_sym;
-extern VALUE key_sym;
-extern VALUE value_sym;
-extern VALUE element_sym;
-extern VALUE class_sym;
-extern VALUE binary_sym;
-
-extern VALUE rb_cSet;
-extern VALUE thrift_module;
-extern VALUE thrift_types_module;
-extern VALUE thrift_bytes_module;
-extern VALUE class_thrift_protocol;
-extern VALUE protocol_exception_class;
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/extconf.rb b/vendor/git.apache.org/thrift.git/lib/rb/ext/extconf.rb
deleted file mode 100644
index b35f60b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/extconf.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
-  File.open('Makefile', 'w'){|f| f.puts "all:\n\ninstall:\n" }
-else
-  require 'mkmf'
-  require 'rbconfig'
-
-  $ARCH_FLAGS = RbConfig::CONFIG['CFLAGS'].scan( /(-arch )(\S+)/ ).map{|x,y| x + y + ' ' }.join('')
-
-
-  $CFLAGS = "-fsigned-char -g -O2 -Wall -Werror " + $ARCH_FLAGS
-
-  have_func("strlcpy", "string.h")
-
-  create_makefile 'thrift_native'
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/macros.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/macros.h
deleted file mode 100644
index 265f693..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/macros.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define GET_TRANSPORT(obj) rb_ivar_get(obj, transport_ivar_id)
-#define GET_STRICT_READ(obj) rb_ivar_get(obj, strict_read_ivar_id)
-#define GET_STRICT_WRITE(obj) rb_ivar_get(obj, strict_write_ivar_id)
-#define WRITE(obj, data, length) rb_funcall(obj, write_method_id, 1, rb_str_new(data, length))
-#define CHECK_NIL(obj) if (NIL_P(obj)) { rb_raise(rb_eStandardError, "nil argument not allowed!");}
-#define READ(obj, length) rb_funcall(GET_TRANSPORT(obj), read_all_method_id, 1, INT2FIX(length))
-
-#ifndef RFLOAT_VALUE
-#  define RFLOAT_VALUE(v) RFLOAT(rb_Float(v))->value
-#endif
-
-#ifndef RSTRING_LEN
-#  define RSTRING_LEN(v) RSTRING(rb_String(v))->len
-#endif
-
-#ifndef RSTRING_PTR
-#  define RSTRING_PTR(v) RSTRING(rb_String(v))->ptr
-#endif
-
-#ifndef RARRAY_LEN
-#  define RARRAY_LEN(v) RARRAY(rb_Array(v))->len
-#endif
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/memory_buffer.c b/vendor/git.apache.org/thrift.git/lib/rb/ext/memory_buffer.c
deleted file mode 100644
index 8b52c4a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/memory_buffer.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <ruby.h>
-#include <constants.h>
-#include <bytes.h>
-#include <macros.h>
-
-ID buf_ivar_id;
-ID index_ivar_id;
-
-ID slice_method_id;
-
-int GARBAGE_BUFFER_SIZE;
-
-#define GET_BUF(self) rb_ivar_get(self, buf_ivar_id)
-
-VALUE rb_thrift_memory_buffer_write(VALUE self, VALUE str);
-VALUE rb_thrift_memory_buffer_read(VALUE self, VALUE length_value);
-VALUE rb_thrift_memory_buffer_read_byte(VALUE self);
-VALUE rb_thrift_memory_buffer_read_into_buffer(VALUE self, VALUE buffer_value, VALUE size_value);
-
-VALUE rb_thrift_memory_buffer_write(VALUE self, VALUE str) {
-  VALUE buf = GET_BUF(self);
-  str = force_binary_encoding(str);
-  rb_str_buf_cat(buf, StringValuePtr(str), RSTRING_LEN(str));
-  return Qnil;
-}
-
-VALUE rb_thrift_memory_buffer_read(VALUE self, VALUE length_value) {
-  int length = FIX2INT(length_value);
-  
-  VALUE index_value = rb_ivar_get(self, index_ivar_id);
-  int index = FIX2INT(index_value);
-  
-  VALUE buf = GET_BUF(self);
-  VALUE data = rb_funcall(buf, slice_method_id, 2, index_value, length_value);
-  
-  index += length;
-  if (index > RSTRING_LEN(buf)) {
-    index = RSTRING_LEN(buf);
-  }
-  if (index >= GARBAGE_BUFFER_SIZE) {
-    rb_ivar_set(self, buf_ivar_id, rb_funcall(buf, slice_method_id, 2, INT2FIX(index), INT2FIX(RSTRING_LEN(buf) - 1)));
-    index = 0;
-  }
-  rb_ivar_set(self, index_ivar_id, INT2FIX(index));
-
-  if (RSTRING_LEN(data) < length) {
-    rb_raise(rb_eEOFError, "Not enough bytes remain in memory buffer");
-  }
-
-  return data;
-}
-
-VALUE rb_thrift_memory_buffer_read_byte(VALUE self) {
-  VALUE index_value = rb_ivar_get(self, index_ivar_id);
-  int index = FIX2INT(index_value);
-
-  VALUE buf = GET_BUF(self);
-  if (index >= RSTRING_LEN(buf)) {
-    rb_raise(rb_eEOFError, "Not enough bytes remain in memory buffer");
-  }
-  char byte = RSTRING_PTR(buf)[index++];
-
-  if (index >= GARBAGE_BUFFER_SIZE) {
-    rb_ivar_set(self, buf_ivar_id, rb_funcall(buf, slice_method_id, 2, INT2FIX(index), INT2FIX(RSTRING_LEN(buf) - 1)));
-    index = 0;
-  }
-  rb_ivar_set(self, index_ivar_id, INT2FIX(index));
-
-  int result = (int) byte;
-  return INT2FIX(result);
-}
-
-VALUE rb_thrift_memory_buffer_read_into_buffer(VALUE self, VALUE buffer_value, VALUE size_value) {
-  int i = 0;
-  int size = FIX2INT(size_value);
-  int index;
-  VALUE buf = GET_BUF(self);
-
-  index = FIX2INT(rb_ivar_get(self, index_ivar_id));
-  while (i < size) {
-    if (index >= RSTRING_LEN(buf)) {
-      rb_raise(rb_eEOFError, "Not enough bytes remain in memory buffer");
-    }
-    char byte = RSTRING_PTR(buf)[index++];
-
-    if (i >= RSTRING_LEN(buffer_value)) {
-      rb_raise(rb_eIndexError, "index %d out of string", i);
-    }
-    ((char*)RSTRING_PTR(buffer_value))[i] = byte;
-    i++;
-  }
-
-  if (index >= GARBAGE_BUFFER_SIZE) {
-    rb_ivar_set(self, buf_ivar_id, rb_funcall(buf, slice_method_id, 2, INT2FIX(index), INT2FIX(RSTRING_LEN(buf) - 1)));
-    index = 0;
-  }
-  rb_ivar_set(self, index_ivar_id, INT2FIX(index));
-
-  return INT2FIX(i);
-}
-
-void Init_memory_buffer() {
-  VALUE thrift_memory_buffer_class = rb_const_get(thrift_module, rb_intern("MemoryBufferTransport"));
-  rb_define_method(thrift_memory_buffer_class, "write", rb_thrift_memory_buffer_write, 1);
-  rb_define_method(thrift_memory_buffer_class, "read", rb_thrift_memory_buffer_read, 1);
-  rb_define_method(thrift_memory_buffer_class, "read_byte", rb_thrift_memory_buffer_read_byte, 0);
-  rb_define_method(thrift_memory_buffer_class, "read_into_buffer", rb_thrift_memory_buffer_read_into_buffer, 2);
-  
-  buf_ivar_id = rb_intern("@buf");
-  index_ivar_id = rb_intern("@index");
-  
-  slice_method_id = rb_intern("slice");
-  
-  GARBAGE_BUFFER_SIZE = FIX2INT(rb_const_get(thrift_memory_buffer_class, rb_intern("GARBAGE_BUFFER_SIZE")));
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/memory_buffer.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/memory_buffer.h
deleted file mode 100644
index b277fa6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/memory_buffer.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-void Init_memory_buffer();
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/protocol.c b/vendor/git.apache.org/thrift.git/lib/rb/ext/protocol.c
deleted file mode 100644
index e69de29..0000000
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/protocol.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/protocol.h
deleted file mode 100644
index e69de29..0000000
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/strlcpy.c b/vendor/git.apache.org/thrift.git/lib/rb/ext/strlcpy.c
deleted file mode 100644
index 6700ff2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/strlcpy.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "strlcpy.h"
-
-#ifndef HAVE_STRLCPY
-#define HAVE_STRLCPY
-size_t
-strlcpy (char *dst, const char *src, size_t dst_sz)
-{
-    size_t n;
-
-    for (n = 0; n < dst_sz; n++) {
-      if ((*dst++ = *src++) == '\0')
-        break;
-    }
-
-    if (n < dst_sz)
-      return n;
-    if (n > 0)
-      *(dst - 1) = '\0';
-    return n + strlen (src);
-}
-#endif
-
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/strlcpy.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/strlcpy.h
deleted file mode 100644
index f6fe0fe..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/strlcpy.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <sys/types.h>
-#include <string.h>
-
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
-#ifndef HAVE_STRLCPY
-size_t strlcpy (char *dst, const char *src, size_t dst_sz);
-#else
-#if !__has_builtin(strlcpy)
-extern size_t strlcpy(char *, const char *, size_t);
-#endif
-#endif
-
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/struct.c b/vendor/git.apache.org/thrift.git/lib/rb/ext/struct.c
deleted file mode 100644
index e3aa855..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/struct.c
+++ /dev/null
@@ -1,711 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "struct.h"
-#include "constants.h"
-#include "macros.h"
-#include "strlcpy.h"
-
-VALUE thrift_union_class;
-
-ID setfield_id;
-ID setvalue_id;
-
-ID to_s_method_id;
-ID name_to_id_method_id;
-static ID sorted_field_ids_method_id;
-
-#define IS_CONTAINER(ttype) ((ttype) == TTYPE_MAP || (ttype) == TTYPE_LIST || (ttype) == TTYPE_SET)
-#define STRUCT_FIELDS(obj) rb_const_get(CLASS_OF(obj), fields_const_id)
-
-//-------------------------------------------
-// Writing section
-//-------------------------------------------
-
-// default fn pointers for protocol stuff here
-
-VALUE default_write_bool(VALUE protocol, VALUE value) {
-  rb_funcall(protocol, write_boolean_method_id, 1, value);
-  return Qnil;
-}
-
-VALUE default_write_byte(VALUE protocol, VALUE value) {
-  rb_funcall(protocol, write_byte_method_id, 1, value);
-  return Qnil;
-}
-
-VALUE default_write_i16(VALUE protocol, VALUE value) {
-  rb_funcall(protocol, write_i16_method_id, 1, value);
-  return Qnil;
-}
-
-VALUE default_write_i32(VALUE protocol, VALUE value) {
-  rb_funcall(protocol, write_i32_method_id, 1, value);
-  return Qnil;
-}
-
-VALUE default_write_i64(VALUE protocol, VALUE value) {
-  rb_funcall(protocol, write_i64_method_id, 1, value);
-  return Qnil;
-}
-
-VALUE default_write_double(VALUE protocol, VALUE value) {
-  rb_funcall(protocol, write_double_method_id, 1, value);
-  return Qnil;
-}
-
-VALUE default_write_string(VALUE protocol, VALUE value) {
-  rb_funcall(protocol, write_string_method_id, 1, value);
-  return Qnil;
-}
-
-VALUE default_write_binary(VALUE protocol, VALUE value) {
-  rb_funcall(protocol, write_binary_method_id, 1, value);
-  return Qnil;
-}
-
-VALUE default_write_list_begin(VALUE protocol, VALUE etype, VALUE length) {
-  rb_funcall(protocol, write_list_begin_method_id, 2, etype, length);
-  return Qnil;
-}
-
-VALUE default_write_list_end(VALUE protocol) {
-  rb_funcall(protocol, write_list_end_method_id, 0);
-  return Qnil;
-}
-
-VALUE default_write_set_begin(VALUE protocol, VALUE etype, VALUE length) {
-  rb_funcall(protocol, write_set_begin_method_id, 2, etype, length);
-  return Qnil;
-}
-
-VALUE default_write_set_end(VALUE protocol) {
-  rb_funcall(protocol, write_set_end_method_id, 0);
-  return Qnil;
-}
-
-VALUE default_write_map_begin(VALUE protocol, VALUE ktype, VALUE vtype, VALUE length) {
-  rb_funcall(protocol, write_map_begin_method_id, 3, ktype, vtype, length);
-  return Qnil;
-}
-
-VALUE default_write_map_end(VALUE protocol) {
-  rb_funcall(protocol, write_map_end_method_id, 0);
-  return Qnil;
-}
-
-VALUE default_write_struct_begin(VALUE protocol, VALUE struct_name) {
-  rb_funcall(protocol, write_struct_begin_method_id, 1, struct_name);
-  return Qnil;
-}
-
-VALUE default_write_struct_end(VALUE protocol) {
-  rb_funcall(protocol, write_struct_end_method_id, 0);
-  return Qnil;
-}
-
-VALUE default_write_field_begin(VALUE protocol, VALUE name, VALUE type, VALUE id) {
-  rb_funcall(protocol, write_field_begin_method_id, 3, name, type, id);
-  return Qnil;
-}
-
-VALUE default_write_field_end(VALUE protocol) {
-  rb_funcall(protocol, write_field_end_method_id, 0);
-  return Qnil;
-}
-
-VALUE default_write_field_stop(VALUE protocol) {
-  rb_funcall(protocol, write_field_stop_method_id, 0);
-  return Qnil;
-}
-
-VALUE default_read_field_begin(VALUE protocol) {
-  return rb_funcall(protocol, read_field_begin_method_id, 0);
-}
-
-VALUE default_read_field_end(VALUE protocol) {
-  return rb_funcall(protocol, read_field_end_method_id, 0);
-}
-
-VALUE default_read_map_begin(VALUE protocol) {
-  return rb_funcall(protocol, read_map_begin_method_id, 0);
-}
-
-VALUE default_read_map_end(VALUE protocol) {
-  return rb_funcall(protocol, read_map_end_method_id, 0);
-}
-
-VALUE default_read_list_begin(VALUE protocol) {
-  return rb_funcall(protocol, read_list_begin_method_id, 0);
-}
-
-VALUE default_read_list_end(VALUE protocol) {
-  return rb_funcall(protocol, read_list_end_method_id, 0);
-}
-
-VALUE default_read_set_begin(VALUE protocol) {
-  return rb_funcall(protocol, read_set_begin_method_id, 0);
-}
-
-VALUE default_read_set_end(VALUE protocol) {
-  return rb_funcall(protocol, read_set_end_method_id, 0);
-}
-
-VALUE default_read_byte(VALUE protocol) {
-  return rb_funcall(protocol, read_byte_method_id, 0);
-}
-
-VALUE default_read_bool(VALUE protocol) {
-  return rb_funcall(protocol, read_bool_method_id, 0);
-}
-
-VALUE default_read_i16(VALUE protocol) {
-  return rb_funcall(protocol, read_i16_method_id, 0);
-}
-
-VALUE default_read_i32(VALUE protocol) {
-  return rb_funcall(protocol, read_i32_method_id, 0);
-}
-
-VALUE default_read_i64(VALUE protocol) {
-  return rb_funcall(protocol, read_i64_method_id, 0);
-}
-
-VALUE default_read_double(VALUE protocol) {
-  return rb_funcall(protocol, read_double_method_id, 0);
-}
-
-VALUE default_read_string(VALUE protocol) {
-  return rb_funcall(protocol, read_string_method_id, 0);
-}
-
-VALUE default_read_binary(VALUE protocol) {
-  return rb_funcall(protocol, read_binary_method_id, 0);
-}
-
-VALUE default_read_struct_begin(VALUE protocol) {
-  return rb_funcall(protocol, read_struct_begin_method_id, 0);
-}
-
-VALUE default_read_struct_end(VALUE protocol) {
-  return rb_funcall(protocol, read_struct_end_method_id, 0);
-}
-
-// end default protocol methods
-
-static VALUE rb_thrift_union_write (VALUE self, VALUE protocol);
-static VALUE rb_thrift_struct_write(VALUE self, VALUE protocol);
-static void write_anything(int ttype, VALUE value, VALUE protocol, VALUE field_info);
-
-VALUE get_field_value(VALUE obj, VALUE field_name) {
-  char name_buf[RSTRING_LEN(field_name) + 2];
-
-  name_buf[0] = '@';
-  strlcpy(&name_buf[1], RSTRING_PTR(field_name), RSTRING_LEN(field_name) + 1);
-
-  VALUE value = rb_ivar_get(obj, rb_intern(name_buf));
-
-  return value;
-}
-
-static void write_container(int ttype, VALUE field_info, VALUE value, VALUE protocol) {
-  int sz, i;
-
-  if (ttype == TTYPE_MAP) {
-    VALUE keys;
-    VALUE key;
-    VALUE val;
-
-    Check_Type(value, T_HASH);
-
-    VALUE key_info = rb_hash_aref(field_info, key_sym);
-    VALUE keytype_value = rb_hash_aref(key_info, type_sym);
-    int keytype = FIX2INT(keytype_value);
-
-    VALUE value_info = rb_hash_aref(field_info, value_sym);
-    VALUE valuetype_value = rb_hash_aref(value_info, type_sym);
-    int valuetype = FIX2INT(valuetype_value);
-
-    keys = rb_funcall(value, keys_method_id, 0);
-
-    sz = RARRAY_LEN(keys);
-
-    default_write_map_begin(protocol, keytype_value, valuetype_value, INT2FIX(sz));
-
-    for (i = 0; i < sz; i++) {
-      key = rb_ary_entry(keys, i);
-      val = rb_hash_aref(value, key);
-
-      if (IS_CONTAINER(keytype)) {
-        write_container(keytype, key_info, key, protocol);
-      } else {
-        write_anything(keytype, key, protocol, key_info);
-      }
-
-      if (IS_CONTAINER(valuetype)) {
-        write_container(valuetype, value_info, val, protocol);
-      } else {
-        write_anything(valuetype, val, protocol, value_info);
-      }
-    }
-
-    default_write_map_end(protocol);
-  } else if (ttype == TTYPE_LIST) {
-    Check_Type(value, T_ARRAY);
-
-    sz = RARRAY_LEN(value);
-
-    VALUE element_type_info = rb_hash_aref(field_info, element_sym);
-    VALUE element_type_value = rb_hash_aref(element_type_info, type_sym);
-    int element_type = FIX2INT(element_type_value);
-
-    default_write_list_begin(protocol, element_type_value, INT2FIX(sz));
-    for (i = 0; i < sz; ++i) {
-      VALUE val = rb_ary_entry(value, i);
-      if (IS_CONTAINER(element_type)) {
-        write_container(element_type, element_type_info, val, protocol);
-      } else {
-        write_anything(element_type, val, protocol, element_type_info);
-      }
-    }
-    default_write_list_end(protocol);
-  } else if (ttype == TTYPE_SET) {
-    VALUE items;
-
-    if (TYPE(value) == T_ARRAY) {
-      items = value;
-    } else {
-      if (rb_cSet == CLASS_OF(value)) {
-        items = rb_funcall(value, entries_method_id, 0);
-      } else {
-        Check_Type(value, T_HASH);
-        items = rb_funcall(value, keys_method_id, 0);
-      }
-    }
-
-    sz = RARRAY_LEN(items);
-
-    VALUE element_type_info = rb_hash_aref(field_info, element_sym);
-    VALUE element_type_value = rb_hash_aref(element_type_info, type_sym);
-    int element_type = FIX2INT(element_type_value);
-
-    default_write_set_begin(protocol, element_type_value, INT2FIX(sz));
-
-    for (i = 0; i < sz; i++) {
-      VALUE val = rb_ary_entry(items, i);
-      if (IS_CONTAINER(element_type)) {
-        write_container(element_type, element_type_info, val, protocol);
-      } else {
-        write_anything(element_type, val, protocol, element_type_info);
-      }
-    }
-
-    default_write_set_end(protocol);
-  } else {
-    rb_raise(rb_eNotImpError, "can't write container of type: %d", ttype);
-  }
-}
-
-static void write_anything(int ttype, VALUE value, VALUE protocol, VALUE field_info) {
-  if (ttype == TTYPE_BOOL) {
-    default_write_bool(protocol, value);
-  } else if (ttype == TTYPE_BYTE) {
-    default_write_byte(protocol, value);
-  } else if (ttype == TTYPE_I16) {
-    default_write_i16(protocol, value);
-  } else if (ttype == TTYPE_I32) {
-    default_write_i32(protocol, value);
-  } else if (ttype == TTYPE_I64) {
-    default_write_i64(protocol, value);
-  } else if (ttype == TTYPE_DOUBLE) {
-    default_write_double(protocol, value);
-  } else if (ttype == TTYPE_STRING) {
-    VALUE is_binary = rb_hash_aref(field_info, binary_sym);
-    if (is_binary != Qtrue) {
-      default_write_string(protocol, value);
-    } else {
-      default_write_binary(protocol, value);
-    }
-  } else if (IS_CONTAINER(ttype)) {
-    write_container(ttype, field_info, value, protocol);
-  } else if (ttype == TTYPE_STRUCT) {
-    if (rb_obj_is_kind_of(value, thrift_union_class)) {
-      rb_thrift_union_write(value, protocol);
-    } else {
-      rb_thrift_struct_write(value, protocol);
-    }
-  } else {
-    rb_raise(rb_eNotImpError, "Unknown type for binary_encoding: %d", ttype);
-  }
-}
-
-static VALUE rb_thrift_struct_write(VALUE self, VALUE protocol) {
-  // call validate
-  rb_funcall(self, validate_method_id, 0);
-
-  // write struct begin
-  default_write_struct_begin(protocol, rb_class_name(CLASS_OF(self)));
-
-  // iterate through all the fields here
-  VALUE struct_fields = STRUCT_FIELDS(self);
-  VALUE sorted_field_ids = rb_funcall(self, sorted_field_ids_method_id, 0);
-
-  int i = 0;
-  for (i=0; i < RARRAY_LEN(sorted_field_ids); i++) {
-    VALUE field_id = rb_ary_entry(sorted_field_ids, i);
-
-    VALUE field_info = rb_hash_aref(struct_fields, field_id);
-
-    VALUE ttype_value = rb_hash_aref(field_info, type_sym);
-    int ttype = FIX2INT(ttype_value);
-    VALUE field_name = rb_hash_aref(field_info, name_sym);
-
-    VALUE field_value = get_field_value(self, field_name);
-
-    if (!NIL_P(field_value)) {
-      default_write_field_begin(protocol, field_name, ttype_value, field_id);
-
-      write_anything(ttype, field_value, protocol, field_info);
-
-      default_write_field_end(protocol);
-    }
-  }
-
-  default_write_field_stop(protocol);
-
-  // write struct end
-  default_write_struct_end(protocol);
-
-  return Qnil;
-}
-
-//-------------------------------------------
-// Reading section
-//-------------------------------------------
-
-static VALUE rb_thrift_union_read(VALUE self, VALUE protocol);
-static VALUE rb_thrift_struct_read(VALUE self, VALUE protocol);
-static void skip_map_contents(VALUE protocol, VALUE key_type_value, VALUE value_type_value, int size);
-static void skip_list_or_set_contents(VALUE protocol, VALUE element_type_value, int size);
-
-static void set_field_value(VALUE obj, VALUE field_name, VALUE value) {
-  char name_buf[RSTRING_LEN(field_name) + 2];
-
-  name_buf[0] = '@';
-  strlcpy(&name_buf[1], RSTRING_PTR(field_name), RSTRING_LEN(field_name)+1);
-
-  rb_ivar_set(obj, rb_intern(name_buf), value);
-}
-
-// Helper method to skip the contents of a map (assumes the map header has been read).
-static void skip_map_contents(VALUE protocol, VALUE key_type_value, VALUE value_type_value, int size) {
-  int i;
-  for (i = 0; i < size; i++) {
-    rb_funcall(protocol, skip_method_id, 1, key_type_value);
-    rb_funcall(protocol, skip_method_id, 1, value_type_value);
-  }
-}
-
-// Helper method to skip the contents of a list or set (assumes the list/set header has been read).
-static void skip_list_or_set_contents(VALUE protocol, VALUE element_type_value, int size) {
-  int i;
-  for (i = 0; i < size; i++) {
-    rb_funcall(protocol, skip_method_id, 1, element_type_value);
-  }
-}
-
-static VALUE read_anything(VALUE protocol, int ttype, VALUE field_info) {
-  VALUE result = Qnil;
-
-  if (ttype == TTYPE_BOOL) {
-    result = default_read_bool(protocol);
-  } else if (ttype == TTYPE_BYTE) {
-    result = default_read_byte(protocol);
-  } else if (ttype == TTYPE_I16) {
-    result = default_read_i16(protocol);
-  } else if (ttype == TTYPE_I32) {
-    result = default_read_i32(protocol);
-  } else if (ttype == TTYPE_I64) {
-    result = default_read_i64(protocol);
-  } else if (ttype == TTYPE_STRING) {
-    VALUE is_binary = rb_hash_aref(field_info, binary_sym);
-    if (is_binary != Qtrue) {
-      result = default_read_string(protocol);
-    } else {
-      result = default_read_binary(protocol);
-    }
-  } else if (ttype == TTYPE_DOUBLE) {
-    result = default_read_double(protocol);
-  } else if (ttype == TTYPE_STRUCT) {
-    VALUE klass = rb_hash_aref(field_info, class_sym);
-    result = rb_class_new_instance(0, NULL, klass);
-
-    if (rb_obj_is_kind_of(result, thrift_union_class)) {
-      rb_thrift_union_read(result, protocol);
-    } else {
-      rb_thrift_struct_read(result, protocol);
-    }
-  } else if (ttype == TTYPE_MAP) {
-    int i;
-
-    VALUE map_header = default_read_map_begin(protocol);
-    int key_ttype = FIX2INT(rb_ary_entry(map_header, 0));
-    int value_ttype = FIX2INT(rb_ary_entry(map_header, 1));
-    int num_entries = FIX2INT(rb_ary_entry(map_header, 2));
-
-    // Check the declared key and value types against the expected ones and skip the map contents
-    // if the types don't match.
-    VALUE key_info = rb_hash_aref(field_info, key_sym);
-    VALUE value_info = rb_hash_aref(field_info, value_sym);
-
-    if (!NIL_P(key_info) && !NIL_P(value_info)) {
-      int specified_key_type = FIX2INT(rb_hash_aref(key_info, type_sym));
-      int specified_value_type = FIX2INT(rb_hash_aref(value_info, type_sym));
-      if (num_entries == 0 || (specified_key_type == key_ttype && specified_value_type == value_ttype)) {
-        result = rb_hash_new();
-
-        for (i = 0; i < num_entries; ++i) {
-          VALUE key, val;
-
-          key = read_anything(protocol, key_ttype, key_info);
-          val = read_anything(protocol, value_ttype, value_info);
-
-          rb_hash_aset(result, key, val);
-        }
-      } else {
-        skip_map_contents(protocol, INT2FIX(key_ttype), INT2FIX(value_ttype), num_entries);
-      }
-    } else {
-      skip_map_contents(protocol, INT2FIX(key_ttype), INT2FIX(value_ttype), num_entries);
-    }
-
-    default_read_map_end(protocol);
-  } else if (ttype == TTYPE_LIST) {
-    int i;
-
-    VALUE list_header = default_read_list_begin(protocol);
-    int element_ttype = FIX2INT(rb_ary_entry(list_header, 0));
-    int num_elements = FIX2INT(rb_ary_entry(list_header, 1));
-
-    // Check the declared element type against the expected one and skip the list contents
-    // if the types don't match.
-    VALUE element_info = rb_hash_aref(field_info, element_sym);
-    if (!NIL_P(element_info)) {
-      int specified_element_type = FIX2INT(rb_hash_aref(element_info, type_sym));
-      if (specified_element_type == element_ttype) {
-        result = rb_ary_new2(num_elements);
-
-        for (i = 0; i < num_elements; ++i) {
-          rb_ary_push(result, read_anything(protocol, element_ttype, rb_hash_aref(field_info, element_sym)));
-        }
-      } else {
-        skip_list_or_set_contents(protocol, INT2FIX(element_ttype), num_elements);
-      }
-    } else {
-      skip_list_or_set_contents(protocol, INT2FIX(element_ttype), num_elements);
-    }
-
-    default_read_list_end(protocol);
-  } else if (ttype == TTYPE_SET) {
-    VALUE items;
-    int i;
-
-    VALUE set_header = default_read_set_begin(protocol);
-    int element_ttype = FIX2INT(rb_ary_entry(set_header, 0));
-    int num_elements = FIX2INT(rb_ary_entry(set_header, 1));
-
-    // Check the declared element type against the expected one and skip the set contents
-    // if the types don't match.
-    VALUE element_info = rb_hash_aref(field_info, element_sym);
-    if (!NIL_P(element_info)) {
-      int specified_element_type = FIX2INT(rb_hash_aref(element_info, type_sym));
-      if (specified_element_type == element_ttype) {
-        items = rb_ary_new2(num_elements);
-
-        for (i = 0; i < num_elements; ++i) {
-          rb_ary_push(items, read_anything(protocol, element_ttype, rb_hash_aref(field_info, element_sym)));
-        }
-
-        result = rb_class_new_instance(1, &items, rb_cSet);
-      } else {
-        skip_list_or_set_contents(protocol, INT2FIX(element_ttype), num_elements);
-      }
-    } else {
-      skip_list_or_set_contents(protocol, INT2FIX(element_ttype), num_elements);
-    }
-
-    default_read_set_end(protocol);
-  } else {
-    rb_raise(rb_eNotImpError, "read_anything not implemented for type %d!", ttype);
-  }
-
-  return result;
-}
-
-static VALUE rb_thrift_struct_read(VALUE self, VALUE protocol) {
-  // read struct begin
-  default_read_struct_begin(protocol);
-
-  VALUE struct_fields = STRUCT_FIELDS(self);
-
-  // read each field
-  while (true) {
-    VALUE field_header = default_read_field_begin(protocol);
-    VALUE field_type_value = rb_ary_entry(field_header, 1);
-    int field_type = FIX2INT(field_type_value);
-
-    if (field_type == TTYPE_STOP) {
-      break;
-    }
-
-    // make sure we got a type we expected
-    VALUE field_info = rb_hash_aref(struct_fields, rb_ary_entry(field_header, 2));
-
-    if (!NIL_P(field_info)) {
-      int specified_type = FIX2INT(rb_hash_aref(field_info, type_sym));
-      if (field_type == specified_type) {
-        // read the value
-        VALUE name = rb_hash_aref(field_info, name_sym);
-        set_field_value(self, name, read_anything(protocol, field_type, field_info));
-      } else {
-        rb_funcall(protocol, skip_method_id, 1, field_type_value);
-      }
-    } else {
-      rb_funcall(protocol, skip_method_id, 1, field_type_value);
-    }
-
-    // read field end
-    default_read_field_end(protocol);
-  }
-
-  // read struct end
-  default_read_struct_end(protocol);
-
-  // call validate
-  rb_funcall(self, validate_method_id, 0);
-
-  return Qnil;
-}
-
-
-// --------------------------------
-// Union section
-// --------------------------------
-
-static VALUE rb_thrift_union_read(VALUE self, VALUE protocol) {
-  // read struct begin
-  default_read_struct_begin(protocol);
-
-  VALUE struct_fields = STRUCT_FIELDS(self);
-
-  VALUE field_header = default_read_field_begin(protocol);
-  VALUE field_type_value = rb_ary_entry(field_header, 1);
-  int field_type = FIX2INT(field_type_value);
-
-  // make sure we got a type we expected
-  VALUE field_info = rb_hash_aref(struct_fields, rb_ary_entry(field_header, 2));
-
-  if (!NIL_P(field_info)) {
-    int specified_type = FIX2INT(rb_hash_aref(field_info, type_sym));
-    if (field_type == specified_type) {
-      // read the value
-      VALUE name = rb_hash_aref(field_info, name_sym);
-      rb_iv_set(self, "@setfield", rb_str_intern(name));
-      rb_iv_set(self, "@value", read_anything(protocol, field_type, field_info));
-    } else {
-      rb_funcall(protocol, skip_method_id, 1, field_type_value);
-    }
-  } else {
-    rb_funcall(protocol, skip_method_id, 1, field_type_value);
-  }
-
-  // read field end
-  default_read_field_end(protocol);
-
-  field_header = default_read_field_begin(protocol);
-  field_type_value = rb_ary_entry(field_header, 1);
-  field_type = FIX2INT(field_type_value);
-
-  if (field_type != TTYPE_STOP) {
-    rb_raise(rb_eRuntimeError, "too many fields in union!");
-  }
-
-  // read struct end
-  default_read_struct_end(protocol);
-
-  // call validate
-  rb_funcall(self, validate_method_id, 0);
-
-  return Qnil;
-}
-
-static VALUE rb_thrift_union_write(VALUE self, VALUE protocol) {
-  // call validate
-  rb_funcall(self, validate_method_id, 0);
-
-  // write struct begin
-  default_write_struct_begin(protocol, rb_class_name(CLASS_OF(self)));
-
-  VALUE struct_fields = STRUCT_FIELDS(self);
-
-  VALUE setfield = rb_ivar_get(self, setfield_id);
-  VALUE setvalue = rb_ivar_get(self, setvalue_id);
-  VALUE field_id = rb_funcall(self, name_to_id_method_id, 1, rb_funcall(setfield, to_s_method_id, 0));
-
-  VALUE field_info = rb_hash_aref(struct_fields, field_id);
-
-  if(NIL_P(field_info)) {
-    rb_raise(rb_eRuntimeError, "set_field is not valid for this union!");
-  }
-
-  VALUE ttype_value = rb_hash_aref(field_info, type_sym);
-  int ttype = FIX2INT(ttype_value);
-
-  default_write_field_begin(protocol, setfield, ttype_value, field_id);
-
-  write_anything(ttype, setvalue, protocol, field_info);
-
-  default_write_field_end(protocol);
-
-  default_write_field_stop(protocol);
-
-  // write struct end
-  default_write_struct_end(protocol);
-
-  return Qnil;
-}
-
-void Init_struct() {
-  VALUE struct_module = rb_const_get(thrift_module, rb_intern("Struct"));
-
-  rb_define_method(struct_module, "write", rb_thrift_struct_write, 1);
-  rb_define_method(struct_module, "read", rb_thrift_struct_read, 1);
-
-  thrift_union_class = rb_const_get(thrift_module, rb_intern("Union"));
-
-  rb_define_method(thrift_union_class, "write", rb_thrift_union_write, 1);
-  rb_define_method(thrift_union_class, "read", rb_thrift_union_read, 1);
-
-  setfield_id = rb_intern("@setfield");
-  setvalue_id = rb_intern("@value");
-
-  to_s_method_id = rb_intern("to_s");
-  name_to_id_method_id = rb_intern("name_to_id");
-  sorted_field_ids_method_id = rb_intern("sorted_field_ids");
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/struct.h b/vendor/git.apache.org/thrift.git/lib/rb/ext/struct.h
deleted file mode 100644
index 4748be5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/struct.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-#include <stdbool.h>
-#include <ruby.h>
-
-void Init_struct();
-void Init_union();
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/ext/thrift_native.c b/vendor/git.apache.org/thrift.git/lib/rb/ext/thrift_native.c
deleted file mode 100644
index 3430b7c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/ext/thrift_native.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <ruby.h>
-#include <bytes.h>
-#include <struct.h>
-#include <binary_protocol_accelerated.h>
-#include <compact_protocol.h>
-#include <memory_buffer.h>
-
-// cached classes/modules
-VALUE rb_cSet;
-VALUE thrift_module;
-VALUE thrift_bytes_module;
-VALUE thrift_types_module;
-
-// TType constants
-int TTYPE_STOP;
-int TTYPE_BOOL;
-int TTYPE_BYTE;
-int TTYPE_I16;
-int TTYPE_I32;
-int TTYPE_I64;
-int TTYPE_DOUBLE;
-int TTYPE_STRING;
-int TTYPE_MAP;
-int TTYPE_SET;
-int TTYPE_LIST;
-int TTYPE_STRUCT;
-
-// method ids
-ID validate_method_id;
-ID write_struct_begin_method_id;
-ID write_struct_end_method_id;
-ID write_field_begin_method_id;
-ID write_field_end_method_id;
-ID write_boolean_method_id;
-ID write_byte_method_id;
-ID write_i16_method_id;
-ID write_i32_method_id;
-ID write_i64_method_id;
-ID write_double_method_id;
-ID write_string_method_id;
-ID write_binary_method_id;
-ID write_map_begin_method_id;
-ID write_map_end_method_id;
-ID write_list_begin_method_id;
-ID write_list_end_method_id;
-ID write_set_begin_method_id;
-ID write_set_end_method_id;
-ID read_bool_method_id;
-ID read_byte_method_id;
-ID read_i16_method_id;
-ID read_i32_method_id;
-ID read_i64_method_id;
-ID read_string_method_id;
-ID read_binary_method_id;
-ID read_double_method_id;
-ID read_map_begin_method_id;
-ID read_map_end_method_id;
-ID read_list_begin_method_id;
-ID read_list_end_method_id;
-ID read_set_begin_method_id;
-ID read_set_end_method_id;
-ID read_struct_begin_method_id;
-ID read_struct_end_method_id;
-ID read_field_begin_method_id;
-ID read_field_end_method_id;
-ID keys_method_id;
-ID entries_method_id;
-ID write_field_stop_method_id;
-ID skip_method_id;
-ID write_method_id;
-ID read_all_method_id;
-ID read_into_buffer_method_id;
-ID force_binary_encoding_id;
-ID convert_to_utf8_byte_buffer_id;
-ID convert_to_string_id;
-
-// constant ids
-ID fields_const_id;
-ID transport_ivar_id;
-ID strict_read_ivar_id;
-ID strict_write_ivar_id;
-
-// cached symbols
-VALUE type_sym;
-VALUE name_sym;
-VALUE key_sym;
-VALUE value_sym;
-VALUE element_sym;
-VALUE class_sym;
-VALUE binary_sym;
-VALUE protocol_exception_class;
-
-void Init_thrift_native() {
-  // cached classes
-  thrift_module = rb_const_get(rb_cObject, rb_intern("Thrift"));
-  thrift_bytes_module = rb_const_get(thrift_module, rb_intern("Bytes"));
-  thrift_types_module = rb_const_get(thrift_module, rb_intern("Types"));
-  rb_cSet = rb_const_get(rb_cObject, rb_intern("Set"));
-  protocol_exception_class = rb_const_get(thrift_module, rb_intern("ProtocolException"));
-
-  // Init ttype constants
-  TTYPE_BOOL = FIX2INT(rb_const_get(thrift_types_module, rb_intern("BOOL")));
-  TTYPE_BYTE = FIX2INT(rb_const_get(thrift_types_module, rb_intern("BYTE")));
-  TTYPE_I16 = FIX2INT(rb_const_get(thrift_types_module, rb_intern("I16")));
-  TTYPE_I32 = FIX2INT(rb_const_get(thrift_types_module, rb_intern("I32")));
-  TTYPE_I64 = FIX2INT(rb_const_get(thrift_types_module, rb_intern("I64")));
-  TTYPE_DOUBLE = FIX2INT(rb_const_get(thrift_types_module, rb_intern("DOUBLE")));
-  TTYPE_STRING = FIX2INT(rb_const_get(thrift_types_module, rb_intern("STRING")));
-  TTYPE_MAP = FIX2INT(rb_const_get(thrift_types_module, rb_intern("MAP")));
-  TTYPE_SET = FIX2INT(rb_const_get(thrift_types_module, rb_intern("SET")));
-  TTYPE_LIST = FIX2INT(rb_const_get(thrift_types_module, rb_intern("LIST")));
-  TTYPE_STRUCT = FIX2INT(rb_const_get(thrift_types_module, rb_intern("STRUCT")));
-
-  // method ids
-  validate_method_id = rb_intern("validate");
-  write_struct_begin_method_id = rb_intern("write_struct_begin");
-  write_struct_end_method_id = rb_intern("write_struct_end");
-  write_field_begin_method_id = rb_intern("write_field_begin");
-  write_field_end_method_id = rb_intern("write_field_end");
-  write_boolean_method_id = rb_intern("write_bool");
-  write_byte_method_id = rb_intern("write_byte");
-  write_i16_method_id = rb_intern("write_i16");
-  write_i32_method_id = rb_intern("write_i32");
-  write_i64_method_id = rb_intern("write_i64");
-  write_double_method_id = rb_intern("write_double");
-  write_string_method_id = rb_intern("write_string");
-  write_binary_method_id = rb_intern("write_binary");
-  write_map_begin_method_id = rb_intern("write_map_begin");
-  write_map_end_method_id = rb_intern("write_map_end");
-  write_list_begin_method_id = rb_intern("write_list_begin");
-  write_list_end_method_id = rb_intern("write_list_end");
-  write_set_begin_method_id = rb_intern("write_set_begin");
-  write_set_end_method_id = rb_intern("write_set_end");
-  read_bool_method_id = rb_intern("read_bool");
-  read_byte_method_id = rb_intern("read_byte");
-  read_i16_method_id = rb_intern("read_i16");
-  read_i32_method_id = rb_intern("read_i32");
-  read_i64_method_id = rb_intern("read_i64");
-  read_string_method_id = rb_intern("read_string");
-  read_binary_method_id = rb_intern("read_binary");
-  read_double_method_id = rb_intern("read_double");
-  read_map_begin_method_id = rb_intern("read_map_begin");
-  read_map_end_method_id = rb_intern("read_map_end");  
-  read_list_begin_method_id = rb_intern("read_list_begin");
-  read_list_end_method_id = rb_intern("read_list_end");
-  read_set_begin_method_id = rb_intern("read_set_begin");
-  read_set_end_method_id = rb_intern("read_set_end");
-  read_struct_begin_method_id = rb_intern("read_struct_begin");
-  read_struct_end_method_id = rb_intern("read_struct_end");
-  read_field_begin_method_id = rb_intern("read_field_begin");
-  read_field_end_method_id = rb_intern("read_field_end");
-  keys_method_id = rb_intern("keys");
-  entries_method_id = rb_intern("entries");
-  write_field_stop_method_id = rb_intern("write_field_stop");
-  skip_method_id = rb_intern("skip");
-  write_method_id = rb_intern("write");
-  read_all_method_id = rb_intern("read_all");
-  read_into_buffer_method_id = rb_intern("read_into_buffer");
-  force_binary_encoding_id = rb_intern("force_binary_encoding");
-  convert_to_utf8_byte_buffer_id = rb_intern("convert_to_utf8_byte_buffer");
-  convert_to_string_id = rb_intern("convert_to_string");
-
-  // constant ids
-  fields_const_id = rb_intern("FIELDS");
-  transport_ivar_id = rb_intern("@trans");
-  strict_read_ivar_id = rb_intern("@strict_read");
-  strict_write_ivar_id = rb_intern("@strict_write");  
-
-  // cached symbols
-  type_sym = ID2SYM(rb_intern("type"));
-  name_sym = ID2SYM(rb_intern("name"));
-  key_sym = ID2SYM(rb_intern("key"));
-  value_sym = ID2SYM(rb_intern("value"));
-  element_sym = ID2SYM(rb_intern("element"));
-  class_sym = ID2SYM(rb_intern("class"));
-  binary_sym = ID2SYM(rb_intern("binary"));
-
-  Init_struct();
-  Init_binary_protocol_accelerated();
-  Init_compact_protocol();
-  Init_memory_buffer();
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift.rb
deleted file mode 100644
index 0f58122..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Contains some contributions under the Thrift Software License.
-# Please see doc/old-thrift-license.txt in the Thrift distribution for
-# details.
-
-$:.unshift File.dirname(__FILE__)
-
-require 'thrift/bytes'
-require 'thrift/core_ext'
-require 'thrift/exceptions'
-require 'thrift/types'
-require 'thrift/processor'
-require 'thrift/multiplexed_processor'
-require 'thrift/client'
-require 'thrift/struct'
-require 'thrift/union'
-require 'thrift/struct_union'
-
-# serializer
-require 'thrift/serializer/serializer'
-require 'thrift/serializer/deserializer'
-
-# protocol
-require 'thrift/protocol/base_protocol'
-require 'thrift/protocol/binary_protocol'
-require 'thrift/protocol/binary_protocol_accelerated'
-require 'thrift/protocol/compact_protocol'
-require 'thrift/protocol/json_protocol'
-require 'thrift/protocol/multiplexed_protocol'
-
-# transport
-require 'thrift/transport/base_transport'
-require 'thrift/transport/base_server_transport'
-require 'thrift/transport/socket'
-require 'thrift/transport/ssl_socket'
-require 'thrift/transport/server_socket'
-require 'thrift/transport/ssl_server_socket'
-require 'thrift/transport/unix_socket'
-require 'thrift/transport/unix_server_socket'
-require 'thrift/transport/buffered_transport'
-require 'thrift/transport/framed_transport'
-require 'thrift/transport/http_client_transport'
-require 'thrift/transport/io_stream_transport'
-require 'thrift/transport/memory_buffer_transport'
-
-# server
-require 'thrift/server/base_server'
-require 'thrift/server/nonblocking_server'
-require 'thrift/server/simple_server'
-require 'thrift/server/threaded_server'
-require 'thrift/server/thread_pool_server'
-
-require 'thrift/thrift_native'
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/bytes.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/bytes.rb
deleted file mode 100644
index efd4f64..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/bytes.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-module Thrift
-  # A collection of utilities for working with bytes and byte buffers.
-  module Bytes
-    if RUBY_VERSION >= '1.9'
-      # Creates and empty byte buffer (String with BINARY encoding)
-      #
-      # size - The Integer size of the buffer (default: nil) to create
-      #
-      # Returns a String with BINARY encoding, filled with null characters 
-      # if size is greater than zero
-      def self.empty_byte_buffer(size = nil)
-        if (size && size > 0)
-          "\0".force_encoding(Encoding::BINARY) * size
-        else
-          ''.force_encoding(Encoding::BINARY)
-        end
-      end
-
-      # Forces the encoding of the buffer to BINARY. If the buffer
-      # passed is frozen, then it will be duplicated.
-      #
-      # buffer - The String to force the encoding of.
-      #
-      # Returns the String passed with an encoding of BINARY; returned
-      # String may be a duplicate.
-      def self.force_binary_encoding(buffer)
-        buffer = buffer.dup if buffer.frozen?
-        buffer.force_encoding(Encoding::BINARY)
-      end
-
-      # Gets the byte value of a given position in a String.
-      #
-      # string - The String to retrive the byte value from.
-      # index  - The Integer location of the byte value to retrieve.
-      #
-      # Returns an Integer value between 0 and 255.
-      def self.get_string_byte(string, index)
-        string.getbyte(index)
-      end
-
-      # Sets the byte value given to a given index in a String.
-      #
-      # string - The String to set the byte value in.
-      # index  - The Integer location to set the byte value at.
-      # byte   - The Integer value (0 to 255) to set in the string.
-      #
-      # Returns an Integer value of the byte value to set.
-      def self.set_string_byte(string, index, byte)
-        string.setbyte(index, byte)
-      end
-
-      # Converts the given String to a UTF-8 byte buffer.
-      #
-      # string - The String to convert.
-      #
-      # Returns a new String with BINARY encoding, containing the UTF-8
-      # bytes of the original string.
-      def self.convert_to_utf8_byte_buffer(string)
-        if string.encoding != Encoding::UTF_8
-          # transcode to UTF-8
-          string = string.encode(Encoding::UTF_8)
-        else
-          # encoding is already UTF-8, but a duplicate is needed
-          string = string.dup
-        end
-        string.force_encoding(Encoding::BINARY)
-      end
-
-      # Converts the given UTF-8 byte buffer into a String
-      #
-      # utf8_buffer - A String, with BINARY encoding, containing UTF-8 bytes
-      #
-      # Returns a new String with UTF-8 encoding,
-      def self.convert_to_string(utf8_buffer)
-        # duplicate the buffer, force encoding to UTF-8
-        utf8_buffer.dup.force_encoding(Encoding::UTF_8)
-      end
-    else
-      def self.empty_byte_buffer(size = nil)
-        if (size && size > 0)
-          "\0" * size
-        else
-          ''
-        end
-      end
-
-      def self.force_binary_encoding(buffer)
-        buffer
-      end
-
-      def self.get_string_byte(string, index)
-        string[index]
-      end
-
-      def self.set_string_byte(string, index, byte)
-        string[index] = byte
-      end
-
-      def self.convert_to_utf8_byte_buffer(string)
-        # This assumes $KCODE is 'UTF8'/'U', which would mean the String is already a UTF-8 byte buffer
-        # TODO consider handling other $KCODE values and transcoding with iconv
-        string
-      end
-
-      def self.convert_to_string(utf8_buffer)
-        # See comment in 'convert_to_utf8_byte_buffer' for relevant assumptions.
-        utf8_buffer
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/client.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/client.rb
deleted file mode 100644
index 64ef059..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/client.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-module Thrift
-  module Client
-    def initialize(iprot, oprot=nil)
-      @iprot = iprot
-      @oprot = oprot || iprot
-      @seqid = 0
-    end
-
-    def send_message(name, args_class, args = {})
-      @oprot.write_message_begin(name, MessageTypes::CALL, @seqid)
-      send_message_args(args_class, args)
-    end
-
-    def send_oneway_message(name, args_class, args = {})
-      @oprot.write_message_begin(name, MessageTypes::ONEWAY, @seqid)
-      send_message_args(args_class, args)
-    end
-
-    def send_message_args(args_class, args)
-      data = args_class.new
-      args.each do |k, v|
-        data.send("#{k.to_s}=", v)
-      end
-      begin
-        data.write(@oprot)
-      rescue StandardError => e
-        @oprot.trans.close
-        raise e
-      end
-      @oprot.write_message_end
-      @oprot.trans.flush
-    end
-
-    def receive_message(result_klass)
-      fname, mtype, rseqid = @iprot.read_message_begin
-      handle_exception(mtype)
-      result = result_klass.new
-      result.read(@iprot)
-      @iprot.read_message_end
-      result
-    end
-
-    def handle_exception(mtype)
-      if mtype == MessageTypes::EXCEPTION
-        x = ApplicationException.new
-        x.read(@iprot)
-        @iprot.read_message_end
-        raise x
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/core_ext.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/core_ext.rb
deleted file mode 100644
index f763cd5..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/core_ext.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].each do |file|
-  name = File.basename(file, '.rb')
-  require "thrift/core_ext/#{name}"
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/core_ext/fixnum.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/core_ext/fixnum.rb
deleted file mode 100644
index b4fc90d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/core_ext/fixnum.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Versions of ruby pre 1.8.7 do not have an .ord method available in the Fixnum
-# class.
-#
-if RUBY_VERSION < "1.8.7"
-  class Fixnum
-    def ord
-      self
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/exceptions.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/exceptions.rb
deleted file mode 100644
index 68cb9e0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/exceptions.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  class Exception < StandardError
-    def initialize(message)
-      super
-      @message = message
-    end
-
-    attr_reader :message
-  end
-
-  class ApplicationException < Exception
-
-    UNKNOWN = 0
-    UNKNOWN_METHOD = 1
-    INVALID_MESSAGE_TYPE = 2
-    WRONG_METHOD_NAME = 3
-    BAD_SEQUENCE_ID = 4
-    MISSING_RESULT = 5
-    INTERNAL_ERROR = 6
-    PROTOCOL_ERROR = 7
-    INVALID_TRANSFORM = 8
-    INVALID_PROTOCOL = 9
-    UNSUPPORTED_CLIENT_TYPE = 10
-
-    attr_reader :type
-
-    def initialize(type=UNKNOWN, message=nil)
-      super(message)
-      @type = type
-    end
-
-    def read(iprot)
-      iprot.read_struct_begin
-      while true
-        fname, ftype, fid = iprot.read_field_begin
-        if ftype == Types::STOP
-          break
-        end
-        if fid == 1 and ftype == Types::STRING
-          @message = iprot.read_string
-        elsif fid == 2 and ftype == Types::I32
-          @type = iprot.read_i32
-        else
-          iprot.skip(ftype)
-        end
-        iprot.read_field_end
-      end
-      iprot.read_struct_end
-    end
-
-    def write(oprot)
-      oprot.write_struct_begin('Thrift::ApplicationException')
-      unless @message.nil?
-        oprot.write_field_begin('message', Types::STRING, 1)
-        oprot.write_string(@message)
-        oprot.write_field_end
-      end
-      unless @type.nil?
-        oprot.write_field_begin('type', Types::I32, 2)
-        oprot.write_i32(@type)
-        oprot.write_field_end
-      end
-      oprot.write_field_stop
-      oprot.write_struct_end
-    end
-
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/multiplexed_processor.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/multiplexed_processor.rb
deleted file mode 100644
index c734c04..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/multiplexed_processor.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-require 'thrift/protocol/protocol_decorator'
-require 'thrift/protocol/base_protocol'
-
-module Thrift
-  class MultiplexedProcessor
-    def initialize
-      @actual_processors = {}
-    end
- 
-    def register_processor(service_name, processor)
-      @actual_processors[service_name] = processor
-    end
- 
-    def process(iprot, oprot)
-      name, type, seqid = iprot.read_message_begin
-      check_type(type)
-      check_separator(name)
-      service_name, method = name.split(':')
-      processor(service_name).process(StoredMessageProtocol.new(iprot, [method, type, seqid]), oprot)
-    end
-
-    protected
-
-    def processor(service_name)
-      if @actual_processors.has_key?(service_name)
-        @actual_processors[service_name]
-      else
-        raise Thrift::Exception.new("Service name not found: #{service_name}. Did you forget to call #{self.class.name}#register_processor?")
-      end
-    end
-
-    def check_type(type)
-      unless [MessageTypes::CALL, MessageTypes::ONEWAY].include?(type)
-        raise Thrift::Exception.new('This should not have happened!?')
-      end
-    end
-
-    def check_separator(name)
-      if name.count(':') < 1
-        raise Thrift::Exception.new("Service name not found in message name: #{name}. Did you forget to use a Thrift::Protocol::MultiplexedProtocol in your client?")
-      end
-    end
-  end
-
-  class StoredMessageProtocol < BaseProtocol
-
-    include ProtocolDecorator
-    
-    def initialize(protocol, message_begin)
-      super(protocol)
-      @message_begin = message_begin
-    end
-
-    def read_message_begin
-      @message_begin
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/processor.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/processor.rb
deleted file mode 100644
index fd312ee..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/processor.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  module Processor
-    def initialize(handler)
-      @handler = handler
-    end
-
-    def process(iprot, oprot)
-      name, type, seqid  = iprot.read_message_begin
-      if respond_to?("process_#{name}")
-        begin
-          send("process_#{name}", seqid, iprot, oprot)
-        rescue => e
-          x = ApplicationException.new(ApplicationException::INTERNAL_ERROR, 'Internal error')
-          write_error(x, oprot, name, seqid)
-        end
-        true
-      else
-        iprot.skip(Types::STRUCT)
-        iprot.read_message_end
-        x = ApplicationException.new(ApplicationException::UNKNOWN_METHOD, 'Unknown function '+name)
-        write_error(x, oprot, name, seqid)
-        false
-      end
-    end
-
-    def read_args(iprot, args_class)
-      args = args_class.new
-      args.read(iprot)
-      iprot.read_message_end
-      args
-    end
-
-    def write_result(result, oprot, name, seqid)
-      oprot.write_message_begin(name, MessageTypes::REPLY, seqid)
-      result.write(oprot)
-      oprot.write_message_end
-      oprot.trans.flush
-    end
-
-    def write_error(err, oprot, name, seqid)
-      oprot.write_message_begin(name, MessageTypes::EXCEPTION, seqid)
-      err.write(oprot)
-      oprot.write_message_end
-      oprot.trans.flush
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/base_protocol.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/base_protocol.rb
deleted file mode 100644
index 88f44d4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/base_protocol.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-# this require is to make generated struct definitions happy
-require 'set'
-
-module Thrift
-  class ProtocolException < Exception
-
-    UNKNOWN = 0
-    INVALID_DATA = 1
-    NEGATIVE_SIZE = 2
-    SIZE_LIMIT = 3
-    BAD_VERSION = 4
-    NOT_IMPLEMENTED = 5
-    DEPTH_LIMIT = 6
-
-    attr_reader :type
-
-    def initialize(type=UNKNOWN, message=nil)
-      super(message)
-      @type = type
-    end
-  end
-
-  class BaseProtocol
-
-    attr_reader :trans
-
-    def initialize(trans)
-      @trans = trans
-    end
-
-    def native?
-      puts "wrong method is being called!"
-      false
-    end
-
-    def write_message_begin(name, type, seqid)
-      raise NotImplementedError
-    end
-
-    def write_message_end; nil; end
-
-    def write_struct_begin(name)
-      raise NotImplementedError
-    end
-
-    def write_struct_end; nil; end
-
-    def write_field_begin(name, type, id)
-      raise NotImplementedError
-    end
-
-    def write_field_end; nil; end
-
-    def write_field_stop
-      raise NotImplementedError
-    end
-
-    def write_map_begin(ktype, vtype, size)
-      raise NotImplementedError
-    end
-
-    def write_map_end; nil; end
-
-    def write_list_begin(etype, size)
-      raise NotImplementedError
-    end
-
-    def write_list_end; nil; end
-
-    def write_set_begin(etype, size)
-      raise NotImplementedError
-    end
-
-    def write_set_end; nil; end
-
-    def write_bool(bool)
-      raise NotImplementedError
-    end
-
-    def write_byte(byte)
-      raise NotImplementedError
-    end
-
-    def write_i16(i16)
-      raise NotImplementedError
-    end
-
-    def write_i32(i32)
-      raise NotImplementedError
-    end
-
-    def write_i64(i64)
-      raise NotImplementedError
-    end
-
-    def write_double(dub)
-      raise NotImplementedError
-    end
-
-    # Writes a Thrift String. In Ruby 1.9+, the String passed will be transcoded to UTF-8.
-    #
-    # str - The String to write.
-    #
-    # Raises EncodingError if the transcoding to UTF-8 fails.
-    #
-    # Returns nothing.
-    def write_string(str)
-      raise NotImplementedError
-    end
-
-    # Writes a Thrift Binary (Thrift String with no encoding). In Ruby 1.9+, the String passed
-    # will forced into BINARY encoding.
-    #
-    # buf - The String to write.
-    #
-    # Returns nothing.
-    def write_binary(buf)
-      raise NotImplementedError
-    end
-
-    def read_message_begin
-      raise NotImplementedError
-    end
-
-    def read_message_end; nil; end
-
-    def read_struct_begin
-      raise NotImplementedError
-    end
-
-    def read_struct_end; nil; end
-
-    def read_field_begin
-      raise NotImplementedError
-    end
-
-    def read_field_end; nil; end
-
-    def read_map_begin
-      raise NotImplementedError
-    end
-
-    def read_map_end; nil; end
-
-    def read_list_begin
-      raise NotImplementedError
-    end
-
-    def read_list_end; nil; end
-
-    def read_set_begin
-      raise NotImplementedError
-    end
-
-    def read_set_end; nil; end
-
-    def read_bool
-      raise NotImplementedError
-    end
-
-    def read_byte
-      raise NotImplementedError
-    end
-
-    def read_i16
-      raise NotImplementedError
-    end
-
-    def read_i32
-      raise NotImplementedError
-    end
-
-    def read_i64
-      raise NotImplementedError
-    end
-
-    def read_double
-      raise NotImplementedError
-    end
-
-    # Reads a Thrift String. In Ruby 1.9+, all Strings will be returned with an Encoding of UTF-8.
-    #
-    # Returns a String.
-    def read_string
-      raise NotImplementedError
-    end
-
-    # Reads a Thrift Binary (Thrift String without encoding). In Ruby 1.9+, all Strings will be returned
-    # with an Encoding of BINARY.
-    #
-    # Returns a String.
-    def read_binary
-      raise NotImplementedError
-    end
-
-    # Writes a field based on the field information, field ID and value.
-    #
-    # field_info - A Hash containing the definition of the field:
-    #              :name   - The name of the field.
-    #              :type   - The type of the field, which must be a Thrift::Types constant.
-    #              :binary - A Boolean flag that indicates if Thrift::Types::STRING is a binary string (string without encoding).
-    # fid        - The ID of the field.
-    # value      - The field's value to write; object type varies based on :type.
-    #
-    # Returns nothing.
-    def write_field(*args)
-      if args.size == 3
-        # handles the documented method signature - write_field(field_info, fid, value)
-        field_info = args[0]
-        fid = args[1]
-        value = args[2]
-      elsif args.size == 4
-        # handles the deprecated method signature - write_field(name, type, fid, value)
-        field_info = {:name => args[0], :type => args[1]}
-        fid = args[2]
-        value = args[3]
-      else
-        raise ArgumentError, "wrong number of arguments (#{args.size} for 3)"
-      end
-
-      write_field_begin(field_info[:name], field_info[:type], fid)
-      write_type(field_info, value)
-      write_field_end
-    end
-
-    # Writes a field value based on the field information.
-    #
-    # field_info - A Hash containing the definition of the field:
-    #              :type   - The Thrift::Types constant that determines how the value is written.
-    #              :binary - A Boolean flag that indicates if Thrift::Types::STRING is a binary string (string without encoding).
-    # value      - The field's value to write; object type varies based on field_info[:type].
-    #
-    # Returns nothing.
-    def write_type(field_info, value)
-      # if field_info is a Fixnum, assume it is a Thrift::Types constant
-      # convert it into a field_info Hash for backwards compatibility
-      if field_info.is_a? Fixnum
-        field_info = {:type => field_info}
-      end
-
-      case field_info[:type]
-      when Types::BOOL
-        write_bool(value)
-      when Types::BYTE
-        write_byte(value)
-      when Types::DOUBLE
-        write_double(value)
-      when Types::I16
-        write_i16(value)
-      when Types::I32
-        write_i32(value)
-      when Types::I64
-        write_i64(value)
-      when Types::STRING
-        if field_info[:binary]
-          write_binary(value)
-        else
-          write_string(value)
-        end
-      when Types::STRUCT
-        value.write(self)
-      else
-        raise NotImplementedError
-      end
-    end
-
-    # Reads a field value based on the field information.
-    #
-    # field_info - A Hash containing the pertinent data to write:
-    #              :type   - The Thrift::Types constant that determines how the value is written.
-    #              :binary - A flag that indicates if Thrift::Types::STRING is a binary string (string without encoding).
-    #
-    # Returns the value read; object type varies based on field_info[:type].
-    def read_type(field_info)
-      # if field_info is a Fixnum, assume it is a Thrift::Types constant
-      # convert it into a field_info Hash for backwards compatibility
-      if field_info.is_a? Fixnum
-        field_info = {:type => field_info}
-      end
-
-      case field_info[:type]
-      when Types::BOOL
-        read_bool
-      when Types::BYTE
-        read_byte
-      when Types::DOUBLE
-        read_double
-      when Types::I16
-        read_i16
-      when Types::I32
-        read_i32
-      when Types::I64
-        read_i64
-      when Types::STRING
-        if field_info[:binary]
-          read_binary
-        else
-          read_string
-        end
-      else
-        raise NotImplementedError
-      end
-    end
-
-    def skip(type)
-      case type
-      when Types::STOP
-        nil
-      when Types::BOOL
-        read_bool
-      when Types::BYTE
-        read_byte
-      when Types::I16
-        read_i16
-      when Types::I32
-        read_i32
-      when Types::I64
-        read_i64
-      when Types::DOUBLE
-        read_double
-      when Types::STRING
-        read_string
-      when Types::STRUCT
-        read_struct_begin
-        while true
-          name, type, id = read_field_begin
-          break if type == Types::STOP
-          skip(type)
-          read_field_end
-        end
-        read_struct_end
-      when Types::MAP
-        ktype, vtype, size = read_map_begin
-        size.times do
-          skip(ktype)
-          skip(vtype)
-        end
-        read_map_end
-      when Types::SET
-        etype, size = read_set_begin
-        size.times do
-          skip(etype)
-        end
-        read_set_end
-      when Types::LIST
-        etype, size = read_list_begin
-        size.times do
-          skip(etype)
-        end
-        read_list_end
-      end
-    end
-  end
-
-  class BaseProtocolFactory
-    def get_protocol(trans)
-      raise NotImplementedError
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/binary_protocol.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/binary_protocol.rb
deleted file mode 100644
index e70b1e3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/binary_protocol.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  class BinaryProtocol < BaseProtocol
-    VERSION_MASK = 0xffff0000
-    VERSION_1 = 0x80010000
-    TYPE_MASK = 0x000000ff
-    
-    attr_reader :strict_read, :strict_write
-
-    def initialize(trans, strict_read=true, strict_write=true)
-      super(trans)
-      @strict_read = strict_read
-      @strict_write = strict_write
-
-      # Pre-allocated read buffer for fixed-size read methods. Needs to be at least 8 bytes long for
-      # read_i64() and read_double().
-      @rbuf = Bytes.empty_byte_buffer(8)
-    end
-
-    def write_message_begin(name, type, seqid)
-      # this is necessary because we added (needed) bounds checking to 
-      # write_i32, and 0x80010000 is too big for that.
-      if strict_write
-        write_i16(VERSION_1 >> 16)
-        write_i16(type)
-        write_string(name)
-        write_i32(seqid)
-      else
-        write_string(name)
-        write_byte(type)
-        write_i32(seqid)
-      end
-    end
-
-    def write_struct_begin(name); nil; end
-
-    def write_field_begin(name, type, id)
-      write_byte(type)
-      write_i16(id)
-    end
-
-    def write_field_stop
-      write_byte(Thrift::Types::STOP)
-    end
-
-    def write_map_begin(ktype, vtype, size)
-      write_byte(ktype)
-      write_byte(vtype)
-      write_i32(size)
-    end
-
-    def write_list_begin(etype, size)
-      write_byte(etype)
-      write_i32(size)
-    end
-
-    def write_set_begin(etype, size)
-      write_byte(etype)
-      write_i32(size)
-    end
-
-    def write_bool(bool)
-      write_byte(bool ? 1 : 0)
-    end
-
-    def write_byte(byte)
-      raise RangeError if byte < -2**31 || byte >= 2**32
-      trans.write([byte].pack('c'))
-    end
-
-    def write_i16(i16)
-      trans.write([i16].pack('n'))
-    end
-
-    def write_i32(i32)
-      raise RangeError if i32 < -2**31 || i32 >= 2**31
-      trans.write([i32].pack('N'))
-    end
-
-    def write_i64(i64)
-      raise RangeError if i64 < -2**63 || i64 >= 2**64
-      hi = i64 >> 32
-      lo = i64 & 0xffffffff
-      trans.write([hi, lo].pack('N2'))
-    end
-
-    def write_double(dub)
-      trans.write([dub].pack('G'))
-    end
-
-    def write_string(str)
-      buf = Bytes.convert_to_utf8_byte_buffer(str)
-      write_binary(buf)
-    end
-
-    def write_binary(buf)
-      write_i32(buf.bytesize)
-      trans.write(buf)
-    end
-
-    def read_message_begin
-      version = read_i32
-      if version < 0
-        if (version & VERSION_MASK != VERSION_1)
-          raise ProtocolException.new(ProtocolException::BAD_VERSION, 'Missing version identifier')
-        end
-        type = version & TYPE_MASK
-        name = read_string
-        seqid = read_i32
-        [name, type, seqid]
-      else
-        if strict_read
-          raise ProtocolException.new(ProtocolException::BAD_VERSION, 'No version identifier, old protocol client?')
-        end
-        name = trans.read_all(version)
-        type = read_byte
-        seqid = read_i32
-        [name, type, seqid]
-      end
-    end
-
-    def read_struct_begin; nil; end
-
-    def read_field_begin
-      type = read_byte
-      if (type == Types::STOP)
-        [nil, type, 0]
-      else
-        id = read_i16
-        [nil, type, id]
-      end
-    end
-
-    def read_map_begin
-      ktype = read_byte
-      vtype = read_byte
-      size = read_i32
-      [ktype, vtype, size]
-    end
-
-    def read_list_begin
-      etype = read_byte
-      size = read_i32
-      [etype, size]
-    end
-
-    def read_set_begin
-      etype = read_byte
-      size = read_i32
-      [etype, size]
-    end
-
-    def read_bool
-      byte = read_byte
-      byte != 0
-    end
-
-    def read_byte
-      val = trans.read_byte
-      if (val > 0x7f)
-        val = 0 - ((val - 1) ^ 0xff)
-      end
-      val
-    end
-
-    def read_i16
-      trans.read_into_buffer(@rbuf, 2)
-      val, = @rbuf.unpack('n')
-      if (val > 0x7fff)
-        val = 0 - ((val - 1) ^ 0xffff)
-      end
-      val
-    end
-
-    def read_i32
-      trans.read_into_buffer(@rbuf, 4)
-      val, = @rbuf.unpack('N')
-      if (val > 0x7fffffff)
-        val = 0 - ((val - 1) ^ 0xffffffff)
-      end
-      val
-    end
-
-    def read_i64
-      trans.read_into_buffer(@rbuf, 8)
-      hi, lo = @rbuf.unpack('N2')
-      if (hi > 0x7fffffff)
-        hi ^= 0xffffffff
-        lo ^= 0xffffffff
-        0 - (hi << 32) - lo - 1
-      else
-        (hi << 32) + lo
-      end
-    end
-
-    def read_double
-      trans.read_into_buffer(@rbuf, 8)
-      val = @rbuf.unpack('G').first
-      val
-    end
-
-    def read_string
-      buffer = read_binary
-      Bytes.convert_to_string(buffer)
-    end
-
-    def read_binary
-      size = read_i32
-      trans.read_all(size)
-    end
-
-  end
-
-  class BinaryProtocolFactory < BaseProtocolFactory
-    def get_protocol(trans)
-      return Thrift::BinaryProtocol.new(trans)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/binary_protocol_accelerated.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/binary_protocol_accelerated.rb
deleted file mode 100644
index 70ea652..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/binary_protocol_accelerated.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-=begin
-The only change required for a transport to support BinaryProtocolAccelerated is to implement 2 methods:
-  * borrow(size), which takes an optional argument and returns atleast _size_ bytes from the transport, 
-                  or the default buffer size if no argument is given
-  * consume!(size), which removes size bytes from the front of the buffer
-
-See MemoryBuffer and BufferedTransport for examples.
-=end
-
-module Thrift
-  class BinaryProtocolAcceleratedFactory < BaseProtocolFactory
-    def get_protocol(trans)
-      if (defined? BinaryProtocolAccelerated)
-        BinaryProtocolAccelerated.new(trans)
-      else
-        BinaryProtocol.new(trans)
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/compact_protocol.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/compact_protocol.rb
deleted file mode 100644
index 605eea6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/compact_protocol.rb
+++ /dev/null
@@ -1,435 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  class CompactProtocol < BaseProtocol
-
-    PROTOCOL_ID = [0x82].pack('c').unpack('c').first
-    VERSION = 1
-    VERSION_MASK = 0x1f
-    TYPE_MASK = 0xE0
-    TYPE_BITS = 0x07
-    TYPE_SHIFT_AMOUNT = 5
-
-    TSTOP = ["", Types::STOP, 0]
-
-    # 
-    # All of the on-wire type codes.
-    # 
-    class CompactTypes
-      BOOLEAN_TRUE   = 0x01
-      BOOLEAN_FALSE  = 0x02
-      BYTE           = 0x03
-      I16            = 0x04
-      I32            = 0x05
-      I64            = 0x06
-      DOUBLE         = 0x07
-      BINARY         = 0x08
-      LIST           = 0x09
-      SET            = 0x0A
-      MAP            = 0x0B
-      STRUCT         = 0x0C
-      
-      def self.is_bool_type?(b)
-        (b & 0x0f) == BOOLEAN_TRUE || (b & 0x0f) == BOOLEAN_FALSE
-      end
-      
-      COMPACT_TO_TTYPE = {
-        Types::STOP   => Types::STOP,
-        BOOLEAN_FALSE => Types::BOOL,
-        BOOLEAN_TRUE  => Types::BOOL,
-        BYTE          => Types::BYTE,
-        I16           => Types::I16,
-        I32           => Types::I32,
-        I64           => Types::I64,
-        DOUBLE        => Types::DOUBLE,
-        BINARY        => Types::STRING,
-        LIST          => Types::LIST,
-        SET           => Types::SET,
-        MAP           => Types::MAP,
-        STRUCT        => Types::STRUCT
-      }
-
-      TTYPE_TO_COMPACT = {
-        Types::STOP           => Types::STOP,
-        Types::BOOL           => BOOLEAN_TRUE,
-        Types::BYTE           => BYTE,
-        Types::I16            => I16,
-        Types::I32            => I32,
-        Types::I64            => I64,
-        Types::DOUBLE         => DOUBLE,
-        Types::STRING         => BINARY,
-        Types::LIST           => LIST,
-        Types::SET            => SET,
-        Types::MAP            => MAP,
-        Types::STRUCT         => STRUCT
-      }
-      
-      def self.get_ttype(compact_type)
-        val = COMPACT_TO_TTYPE[compact_type & 0x0f]
-        raise "don't know what type: #{compact_type & 0x0f}" unless val
-        val
-      end
-      
-      def self.get_compact_type(ttype)
-        val = TTYPE_TO_COMPACT[ttype]
-        raise "don't know what type: #{ttype & 0x0f}" unless val
-        val
-      end
-    end
-
-    def initialize(transport)
-      super(transport)
-
-      @last_field = [0]
-      @boolean_value = nil
-
-      # Pre-allocated read buffer for read_double().
-      @rbuf = Bytes.empty_byte_buffer(8)
-    end
-
-    def write_message_begin(name, type, seqid)
-      write_byte(PROTOCOL_ID)
-      write_byte((VERSION & VERSION_MASK) | ((type << TYPE_SHIFT_AMOUNT) & TYPE_MASK))
-      write_varint32(seqid)
-      write_string(name)
-      nil
-    end
-
-    def write_struct_begin(name)
-      @last_field.push(0)
-      nil
-    end
-
-    def write_struct_end
-      @last_field.pop
-      nil
-    end
-
-    def write_field_begin(name, type, id)
-      if type == Types::BOOL
-        # we want to possibly include the value, so we'll wait.
-        @boolean_field = [type, id]
-      else
-        write_field_begin_internal(type, id)
-      end
-      nil
-    end
-
-    # 
-    # The workhorse of writeFieldBegin. It has the option of doing a 
-    # 'type override' of the type header. This is used specifically in the 
-    # boolean field case.
-    # 
-    def write_field_begin_internal(type, id, type_override=nil)
-      last_id = @last_field.pop
-      
-      # if there's a type override, use that.
-      typeToWrite = type_override || CompactTypes.get_compact_type(type)
-
-      # check if we can use delta encoding for the field id
-      if id > last_id && id - last_id <= 15
-        # write them together
-        write_byte((id - last_id) << 4 | typeToWrite)
-      else
-        # write them separate
-        write_byte(typeToWrite)
-        write_i16(id)
-      end
-
-      @last_field.push(id)
-      nil
-    end
-
-    def write_field_stop
-      write_byte(Types::STOP)
-    end
-
-    def write_map_begin(ktype, vtype, size)
-      if (size == 0)
-        write_byte(0)
-      else
-        write_varint32(size)
-        write_byte(CompactTypes.get_compact_type(ktype) << 4 | CompactTypes.get_compact_type(vtype))
-      end
-    end
-
-    def write_list_begin(etype, size)
-      write_collection_begin(etype, size)
-    end
-
-    def write_set_begin(etype, size)
-      write_collection_begin(etype, size);
-    end
-
-    def write_bool(bool)
-      type = bool ? CompactTypes::BOOLEAN_TRUE : CompactTypes::BOOLEAN_FALSE
-      unless @boolean_field.nil?
-        # we haven't written the field header yet
-        write_field_begin_internal(@boolean_field.first, @boolean_field.last, type)
-        @boolean_field = nil
-      else
-        # we're not part of a field, so just write the value.
-        write_byte(type)
-      end
-    end
-
-    def write_byte(byte)
-      @trans.write([byte].pack('c'))
-    end
-
-    def write_i16(i16)
-      write_varint32(int_to_zig_zag(i16))
-    end
-
-    def write_i32(i32)
-      write_varint32(int_to_zig_zag(i32))
-    end
-
-    def write_i64(i64)
-      write_varint64(long_to_zig_zag(i64))
-    end
-
-    def write_double(dub)
-      @trans.write([dub].pack("G").reverse)
-    end
-
-    def write_string(str)
-      buf = Bytes.convert_to_utf8_byte_buffer(str)
-      write_binary(buf)
-    end
-
-    def write_binary(buf)
-      write_varint32(buf.bytesize)
-      @trans.write(buf)
-    end
-
-    def read_message_begin
-      protocol_id = read_byte()
-      if protocol_id != PROTOCOL_ID
-        raise ProtocolException.new("Expected protocol id #{PROTOCOL_ID} but got #{protocol_id}")
-      end
-      
-      version_and_type = read_byte()
-      version = version_and_type & VERSION_MASK
-      if (version != VERSION)
-        raise ProtocolException.new("Expected version #{VERSION} but got #{version}");
-      end
-      
-      type = (version_and_type >> TYPE_SHIFT_AMOUNT) & TYPE_BITS
-      seqid = read_varint32()
-      messageName = read_string()
-      [messageName, type, seqid]
-    end
-
-    def read_struct_begin
-      @last_field.push(0)
-      ""
-    end
-
-    def read_struct_end
-      @last_field.pop()
-      nil
-    end
-
-    def read_field_begin
-      type = read_byte()
-
-      # if it's a stop, then we can return immediately, as the struct is over.
-      if (type & 0x0f) == Types::STOP
-        TSTOP
-      else
-        field_id = nil
-
-        # mask off the 4 MSB of the type header. it could contain a field id delta.
-        modifier = (type & 0xf0) >> 4
-        if modifier == 0
-          # not a delta. look ahead for the zigzag varint field id.
-          @last_field.pop
-          field_id = read_i16()
-        else
-          # has a delta. add the delta to the last read field id.
-          field_id = @last_field.pop + modifier
-        end
-
-        # if this happens to be a boolean field, the value is encoded in the type
-        if CompactTypes.is_bool_type?(type)
-          # save the boolean value in a special instance variable.
-          @bool_value = (type & 0x0f) == CompactTypes::BOOLEAN_TRUE
-        end
-
-        # push the new field onto the field stack so we can keep the deltas going.
-        @last_field.push(field_id)
-        ["", CompactTypes.get_ttype(type & 0x0f), field_id]
-      end
-    end
-
-    def read_map_begin
-      size = read_varint32()
-      key_and_value_type = size == 0 ? 0 : read_byte()
-      [CompactTypes.get_ttype(key_and_value_type >> 4), CompactTypes.get_ttype(key_and_value_type & 0xf), size]
-    end
-
-    def read_list_begin
-      size_and_type = read_byte()
-      size = (size_and_type >> 4) & 0x0f
-      if size == 15
-        size = read_varint32()
-      end
-      type = CompactTypes.get_ttype(size_and_type)
-      [type, size]
-    end
-
-    def read_set_begin
-      read_list_begin
-    end
-
-    def read_bool
-      unless @bool_value.nil?
-        bv = @bool_value
-        @bool_value = nil
-        bv
-      else
-        read_byte() == CompactTypes::BOOLEAN_TRUE
-      end
-    end
-
-    def read_byte
-      val = trans.read_byte
-      if (val > 0x7f)
-        val = 0 - ((val - 1) ^ 0xff)
-      end
-      val
-    end
-
-    def read_i16
-      zig_zag_to_int(read_varint32())
-    end
-
-    def read_i32
-      zig_zag_to_int(read_varint32())
-    end
-
-    def read_i64
-      zig_zag_to_long(read_varint64())
-    end
-
-    def read_double
-      trans.read_into_buffer(@rbuf, 8)
-      val = @rbuf.reverse.unpack('G').first
-      val
-    end
-
-    def read_string
-      buffer = read_binary
-      Bytes.convert_to_string(buffer)
-    end
-
-    def read_binary
-      size = read_varint32()
-      trans.read_all(size)
-    end
-
-    private
-    
-    # 
-    # Abstract method for writing the start of lists and sets. List and sets on 
-    # the wire differ only by the type indicator.
-    # 
-    def write_collection_begin(elem_type, size)
-      if size <= 14
-        write_byte(size << 4 | CompactTypes.get_compact_type(elem_type))
-      else
-        write_byte(0xf0 | CompactTypes.get_compact_type(elem_type))
-        write_varint32(size)
-      end
-    end
-
-    def write_varint32(n)
-      # int idx = 0;
-      while true
-        if (n & ~0x7F) == 0
-          # i32buf[idx++] = (byte)n;
-          write_byte(n)
-          break
-          # return;
-        else
-          # i32buf[idx++] = (byte)((n & 0x7F) | 0x80);
-          write_byte((n & 0x7F) | 0x80)
-          n = n >> 7
-        end
-      end
-      # trans_.write(i32buf, 0, idx);
-    end
-
-    SEVEN_BIT_MASK = 0x7F
-    EVERYTHING_ELSE_MASK = ~SEVEN_BIT_MASK
-
-    def write_varint64(n)
-      while true
-        if (n & EVERYTHING_ELSE_MASK) == 0 #TODO need to find a way to make this into a long...
-          write_byte(n)
-          break
-        else
-          write_byte((n & SEVEN_BIT_MASK) | 0x80)
-          n >>= 7
-        end
-      end
-    end
-    
-    def read_varint32()
-      read_varint64()
-    end
-    
-    def read_varint64()
-      shift = 0
-      result = 0
-      while true
-        b = read_byte()
-        result |= (b & 0x7f) << shift
-        break if (b & 0x80) != 0x80
-        shift += 7
-      end
-      result
-    end
-    
-    def int_to_zig_zag(n)
-      (n << 1) ^ (n >> 31)
-    end
-    
-    def long_to_zig_zag(l)
-      # puts "zz encoded #{l} to #{(l << 1) ^ (l >> 63)}"
-      (l << 1) ^ (l >> 63)
-    end
-    
-    def zig_zag_to_int(n)
-      (n >> 1) ^ -(n & 1)
-    end
-    
-    def zig_zag_to_long(n)
-      (n >> 1) ^ -(n & 1)
-    end
-  end
-
-  class CompactProtocolFactory < BaseProtocolFactory
-    def get_protocol(trans)
-      CompactProtocol.new(trans)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/json_protocol.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/json_protocol.rb
deleted file mode 100644
index 2b8ac15..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/json_protocol.rb
+++ /dev/null
@@ -1,778 +0,0 @@
-# encoding: UTF-8
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'base64'
-
-module Thrift
-  class LookaheadReader
-    def initialize(trans)
-      @trans = trans
-      @hasData = false
-      @data = nil
-    end
-
-    def read
-      if @hasData
-        @hasData = false
-      else
-        @data = @trans.read(1)
-      end
-
-      return @data
-    end
-
-    def peek
-      if !@hasData
-        @data = @trans.read(1)
-      end
-      @hasData = true
-      return @data
-    end
-  end
-
-  #
-  # Class to serve as base JSON context and as base class for other context
-  # implementations
-  #
-  class JSONContext
-    @@kJSONElemSeparator = ','
-    #
-    # Write context data to the trans. Default is to do nothing.
-    #
-    def write(trans)
-    end
-
-    #
-    # Read context data from the trans. Default is to do nothing.
-    #
-    def read(reader)
-    end
-
-    #
-    # Return true if numbers need to be escaped as strings in this context.
-    # Default behavior is to return false.
-    #
-    def escapeNum
-      return false
-    end
-  end
-
-  # Context class for object member key-value pairs
-  class JSONPairContext < JSONContext
-    @@kJSONPairSeparator = ':'
-
-    def initialize
-      @first = true
-      @colon = true
-    end
-
-    def write(trans)
-      if (@first)
-        @first = false
-        @colon = true
-      else
-        trans.write(@colon ? @@kJSONPairSeparator : @@kJSONElemSeparator)
-        @colon = !@colon
-      end
-    end
-
-    def read(reader)
-      if (@first)
-        @first = false
-        @colon = true
-      else
-        ch = (@colon ? @@kJSONPairSeparator : @@kJSONElemSeparator)
-        @colon = !@colon
-        JsonProtocol::read_syntax_char(reader, ch)
-      end
-    end
-
-    # Numbers must be turned into strings if they are the key part of a pair
-    def escapeNum
-      return @colon
-    end
-  end
-
-  # Context class for lists
-  class JSONListContext < JSONContext
-
-    def initialize
-      @first = true
-    end
-
-    def write(trans)
-      if (@first)
-        @first = false
-      else
-        trans.write(@@kJSONElemSeparator)
-      end
-    end
-
-    def read(reader)
-      if (@first)
-        @first = false
-      else
-        JsonProtocol::read_syntax_char(reader, @@kJSONElemSeparator)
-      end
-    end
-  end
-
-  class JsonProtocol < BaseProtocol
-
-    @@kJSONObjectStart = '{'
-    @@kJSONObjectEnd = '}'
-    @@kJSONArrayStart = '['
-    @@kJSONArrayEnd = ']'
-    @@kJSONNewline = '\n'
-    @@kJSONBackslash = '\\'
-    @@kJSONStringDelimiter = '"'
-
-    @@kThriftVersion1 = 1
-
-    @@kThriftNan = "NaN"
-    @@kThriftInfinity = "Infinity"
-    @@kThriftNegativeInfinity = "-Infinity"
-
-    def initialize(trans)
-      super(trans)
-      @context = JSONContext.new
-      @contexts = Array.new
-      @reader = LookaheadReader.new(trans)
-    end
-
-    def get_type_name_for_type_id(id)
-      case id
-      when Types::BOOL
-        "tf"
-      when Types::BYTE
-        "i8"
-      when Types::I16
-        "i16"
-      when Types::I32
-        "i32"
-      when Types::I64
-        "i64"
-      when Types::DOUBLE
-        "dbl"
-      when Types::STRING
-        "str"
-      when Types::STRUCT
-        "rec"
-      when Types::MAP
-        "map"
-      when Types::SET
-        "set"
-      when Types::LIST
-        "lst"
-      else
-        raise NotImplementedError
-      end
-    end
-
-    def get_type_id_for_type_name(name)
-      if (name == "tf")
-        result = Types::BOOL
-      elsif (name == "i8")
-        result = Types::BYTE
-      elsif (name == "i16")
-        result = Types::I16
-      elsif (name == "i32")
-        result = Types::I32
-      elsif (name == "i64")
-        result = Types::I64
-      elsif (name == "dbl")
-        result = Types::DOUBLE
-      elsif (name == "str")
-        result = Types::STRING
-      elsif (name == "rec")
-        result = Types::STRUCT
-      elsif (name == "map")
-        result = Types::MAP
-      elsif (name == "set")
-        result = Types::SET
-      elsif (name == "lst")
-        result = Types::LIST
-      else
-        result = Types::STOP
-      end
-      if (result == Types::STOP)
-        raise NotImplementedError
-      end
-      return result
-    end
-
-    # Static helper functions
-
-    # Read 1 character from the trans and verify that it is the expected character ch.
-    # Throw a protocol exception if it is not.
-    def self.read_syntax_char(reader, ch)
-      ch2 = reader.read
-      if (ch2 != ch)
-        raise ProtocolException.new(ProtocolException::INVALID_DATA, "Expected \'#{ch}\' got \'#{ch2}\'.")
-      end
-    end
-
-   # Return true if the character ch is in [-+0-9.Ee]; false otherwise
-    def is_json_numeric(ch)
-      case ch
-      when '+', '-', '.', '0' .. '9', 'E', "e"
-        return true
-      else
-        return false
-      end
-    end
-
-    def push_context(context)
-      @contexts.push(@context)
-      @context = context
-    end
-
-    def pop_context
-      @context = @contexts.pop
-    end
-
-    # Write the character ch as a JSON escape sequence ("\u00xx")
-    def write_json_escape_char(ch)
-      trans.write('\\u')
-      ch_value = ch[0]
-      if (ch_value.kind_of? String)
-        ch_value = ch.bytes.first
-      end
-      trans.write(ch_value.to_s(16).rjust(4,'0'))
-    end
-
-    # Write the character ch as part of a JSON string, escaping as appropriate.
-    def write_json_char(ch)
-      # This table describes the handling for the first 0x30 characters
-      # 0 : escape using "\u00xx" notation
-      # 1 : just output index
-      # <other> : escape using "\<other>" notation
-      kJSONCharTable = [
-          # 0 1 2 3 4 5 6 7 8 9 A B C D E F
-          0, 0, 0, 0, 0, 0, 0, 0,'b','t','n', 0,'f','r', 0, 0, # 0
-          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # 1
-          1, 1,'"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, # 2
-      ]
-
-      ch_value = ch[0]
-      if (ch_value.kind_of? String)
-        ch_value = ch.bytes.first
-      end
-      if (ch_value >= 0x30)
-        if (ch == @@kJSONBackslash) # Only special character >= 0x30 is '\'
-          trans.write(@@kJSONBackslash)
-          trans.write(@@kJSONBackslash)
-        else
-          trans.write(ch)
-        end
-      else
-        outCh = kJSONCharTable[ch_value];
-        # Check if regular character, backslash escaped, or JSON escaped
-        if outCh.kind_of? String
-          trans.write(@@kJSONBackslash)
-          trans.write(outCh)
-        elsif outCh == 1
-          trans.write(ch)
-        else
-          write_json_escape_char(ch)
-        end
-      end
-    end
-
-    # Write out the contents of the string str as a JSON string, escaping characters as appropriate.
-    def write_json_string(str)
-      @context.write(trans)
-      trans.write(@@kJSONStringDelimiter)
-      str.split('').each do |ch|
-        write_json_char(ch)
-      end
-      trans.write(@@kJSONStringDelimiter)
-    end
-
-    # Write out the contents of the string as JSON string, base64-encoding
-    # the string's contents, and escaping as appropriate
-    def write_json_base64(str)
-      @context.write(trans)
-      trans.write(@@kJSONStringDelimiter)
-      trans.write(Base64.strict_encode64(str))
-      trans.write(@@kJSONStringDelimiter)
-    end
-
-    # Convert the given integer type to a JSON number, or a string
-    # if the context requires it (eg: key in a map pair).
-    def write_json_integer(num)
-      @context.write(trans)
-      escapeNum = @context.escapeNum
-      if (escapeNum)
-        trans.write(@@kJSONStringDelimiter)
-      end
-      trans.write(num.to_s);
-      if (escapeNum)
-        trans.write(@@kJSONStringDelimiter)
-      end
-    end
-
-    # Convert the given double to a JSON string, which is either the number,
-    # "NaN" or "Infinity" or "-Infinity".
-    def write_json_double(num)
-      @context.write(trans)
-      # Normalize output of boost::lexical_cast for NaNs and Infinities
-      special = false;
-      if (num.nan?)
-        special = true;
-        val = @@kThriftNan;
-      elsif (num.infinite?)
-        special = true;
-        val = @@kThriftInfinity;
-        if (num < 0.0)
-          val = @@kThriftNegativeInfinity;
-        end
-      else
-        val = num.to_s
-      end
-
-      escapeNum = special || @context.escapeNum
-      if (escapeNum)
-        trans.write(@@kJSONStringDelimiter)
-      end
-      trans.write(val)
-      if (escapeNum)
-        trans.write(@@kJSONStringDelimiter)
-      end
-    end
-
-    def write_json_object_start
-      @context.write(trans)
-      trans.write(@@kJSONObjectStart)
-      push_context(JSONPairContext.new);
-    end
-
-    def write_json_object_end
-      pop_context
-      trans.write(@@kJSONObjectEnd)
-    end
-
-    def write_json_array_start
-      @context.write(trans)
-      trans.write(@@kJSONArrayStart)
-      push_context(JSONListContext.new);
-    end
-
-    def write_json_array_end
-      pop_context
-      trans.write(@@kJSONArrayEnd)
-    end
-
-    def write_message_begin(name, type, seqid)
-      write_json_array_start
-      write_json_integer(@@kThriftVersion1)
-      write_json_string(name)
-      write_json_integer(type)
-      write_json_integer(seqid)
-    end
-
-    def write_message_end
-      write_json_array_end
-    end
-
-    def write_struct_begin(name)
-      write_json_object_start
-    end
-
-    def write_struct_end
-      write_json_object_end
-    end
-
-    def write_field_begin(name, type, id)
-      write_json_integer(id)
-      write_json_object_start
-      write_json_string(get_type_name_for_type_id(type))
-    end
-
-    def write_field_end
-      write_json_object_end
-    end
-
-    def write_field_stop; nil; end
-
-    def write_map_begin(ktype, vtype, size)
-      write_json_array_start
-      write_json_string(get_type_name_for_type_id(ktype))
-      write_json_string(get_type_name_for_type_id(vtype))
-      write_json_integer(size)
-      write_json_object_start
-    end
-
-    def write_map_end
-      write_json_object_end
-      write_json_array_end
-    end
-
-    def write_list_begin(etype, size)
-      write_json_array_start
-      write_json_string(get_type_name_for_type_id(etype))
-      write_json_integer(size)
-    end
-
-    def write_list_end
-      write_json_array_end
-    end
-
-    def write_set_begin(etype, size)
-      write_json_array_start
-      write_json_string(get_type_name_for_type_id(etype))
-      write_json_integer(size)
-    end
-
-    def write_set_end
-      write_json_array_end
-    end
-
-    def write_bool(bool)
-      write_json_integer(bool ? 1 : 0)
-    end
-
-    def write_byte(byte)
-      write_json_integer(byte)
-    end
-
-    def write_i16(i16)
-      write_json_integer(i16)
-    end
-
-    def write_i32(i32)
-      write_json_integer(i32)
-    end
-
-    def write_i64(i64)
-      write_json_integer(i64)
-    end
-
-    def write_double(dub)
-      write_json_double(dub)
-    end
-
-    def write_string(str)
-      write_json_string(str)
-    end
-
-    def write_binary(str)
-      write_json_base64(str)
-    end
-
-    ##
-    # Reading functions
-    ##
-
-    # Reads 1 byte and verifies that it matches ch.
-    def read_json_syntax_char(ch)
-      JsonProtocol::read_syntax_char(@reader, ch)
-    end
-
-    # Decodes the four hex parts of a JSON escaped string character and returns
-    # the character via out.
-    #
-    # Note - this only supports Unicode characters in the BMP (U+0000 to U+FFFF);
-    # characters above the BMP are encoded as two escape sequences (surrogate pairs),
-    # which is not yet implemented
-    def read_json_escape_char
-      str = @reader.read
-      str += @reader.read
-      str += @reader.read
-      str += @reader.read
-      if RUBY_VERSION >= '1.9'
-        str.hex.chr(Encoding::UTF_8)
-      else
-        str.hex.chr
-      end
-    end
-
-    # Decodes a JSON string, including unescaping, and returns the string via str
-    def read_json_string(skipContext = false)
-      # This string's characters must match up with the elements in escape_char_vals.
-      # I don't have '/' on this list even though it appears on www.json.org --
-      # it is not in the RFC -> it is. See RFC 4627
-      escape_chars = "\"\\/bfnrt"
-
-      # The elements of this array must match up with the sequence of characters in
-      # escape_chars
-      escape_char_vals = [
-        "\"", "\\", "\/", "\b", "\f", "\n", "\r", "\t",
-      ]
-
-      if !skipContext
-        @context.read(@reader)
-      end
-      read_json_syntax_char(@@kJSONStringDelimiter)
-      ch = ""
-      str = ""
-      while (true)
-        ch = @reader.read
-        if (ch == @@kJSONStringDelimiter)
-          break
-        end
-        if (ch == @@kJSONBackslash)
-          ch = @reader.read
-          if (ch == 'u')
-            ch = read_json_escape_char
-          else
-            pos = escape_chars.index(ch);
-            if (pos.nil?) # not found
-              raise ProtocolException.new(ProtocolException::INVALID_DATA, "Expected control char, got \'#{ch}\'.")
-            end
-            ch = escape_char_vals[pos]
-          end
-        end
-        str += ch
-      end
-      return str
-    end
-
-    # Reads a block of base64 characters, decoding it, and returns via str
-    def read_json_base64
-      str = read_json_string
-      m = str.length % 4
-      if m != 0
-        # Add missing padding
-        (4 - m).times do
-          str += '='
-        end
-      end
-      Base64.strict_decode64(str)
-    end
-
-    # Reads a sequence of characters, stopping at the first one that is not
-    # a valid JSON numeric character.
-    def read_json_numeric_chars
-      str = ""
-      while (true)
-        ch = @reader.peek
-        if (!is_json_numeric(ch))
-          break;
-        end
-        ch = @reader.read
-        str += ch
-      end
-      return str
-    end
-
-    # Reads a sequence of characters and assembles them into a number,
-    # returning them via num
-    def read_json_integer
-      @context.read(@reader)
-      if (@context.escapeNum)
-        read_json_syntax_char(@@kJSONStringDelimiter)
-      end
-      str = read_json_numeric_chars
-
-      begin
-        num = Integer(str);
-      rescue
-        raise ProtocolException.new(ProtocolException::INVALID_DATA, "Expected numeric value; got \"#{str}\"")
-      end
-
-      if (@context.escapeNum)
-        read_json_syntax_char(@@kJSONStringDelimiter)
-      end
-
-      return num
-    end
-
-    # Reads a JSON number or string and interprets it as a double.
-    def read_json_double
-      @context.read(@reader)
-      num = 0
-      if (@reader.peek == @@kJSONStringDelimiter)
-        str = read_json_string(true)
-        # Check for NaN, Infinity and -Infinity
-        if (str == @@kThriftNan)
-          num = (+1.0/0.0)/(+1.0/0.0)
-        elsif (str == @@kThriftInfinity)
-          num = +1.0/0.0
-        elsif (str == @@kThriftNegativeInfinity)
-          num = -1.0/0.0
-        else
-          if (!@context.escapeNum)
-            # Raise exception -- we should not be in a string in this case
-            raise ProtocolException.new(ProtocolException::INVALID_DATA, "Numeric data unexpectedly quoted")
-          end
-          begin
-            num = Float(str)
-          rescue
-            raise ProtocolException.new(ProtocolException::INVALID_DATA, "Expected numeric value; got \"#{str}\"")
-          end
-        end
-      else
-        if (@context.escapeNum)
-          # This will throw - we should have had a quote if escapeNum == true
-          read_json_syntax_char(@@kJSONStringDelimiter)
-        end
-        str = read_json_numeric_chars
-        begin
-          num = Float(str)
-        rescue
-          raise ProtocolException.new(ProtocolException::INVALID_DATA, "Expected numeric value; got \"#{str}\"")
-        end
-      end
-      return num
-    end
-
-    def read_json_object_start
-      @context.read(@reader)
-      read_json_syntax_char(@@kJSONObjectStart)
-      push_context(JSONPairContext.new)
-      nil
-    end
-
-    def read_json_object_end
-      read_json_syntax_char(@@kJSONObjectEnd)
-      pop_context
-      nil
-    end
-
-    def read_json_array_start
-      @context.read(@reader)
-      read_json_syntax_char(@@kJSONArrayStart)
-      push_context(JSONListContext.new)
-      nil
-    end
-
-    def read_json_array_end
-      read_json_syntax_char(@@kJSONArrayEnd)
-      pop_context
-      nil
-    end
-
-    def read_message_begin
-      read_json_array_start
-      version = read_json_integer
-      if (version != @@kThriftVersion1)
-        raise ProtocolException.new(ProtocolException::BAD_VERSION, 'Message contained bad version.')
-      end
-      name = read_json_string
-      message_type = read_json_integer
-      seqid = read_json_integer
-      [name, message_type, seqid]
-    end
-
-    def read_message_end
-      read_json_array_end
-      nil
-    end
-
-    def read_struct_begin
-      read_json_object_start
-      nil
-    end
-
-    def read_struct_end
-      read_json_object_end
-      nil
-    end
-
-    def read_field_begin
-      # Check if we hit the end of the list
-      ch = @reader.peek
-      if (ch == @@kJSONObjectEnd)
-        field_type = Types::STOP
-      else
-        field_id = read_json_integer
-        read_json_object_start
-        field_type = get_type_id_for_type_name(read_json_string)
-      end
-      [nil, field_type, field_id]
-    end
-
-    def read_field_end
-      read_json_object_end
-    end
-
-    def read_map_begin
-      read_json_array_start
-      key_type = get_type_id_for_type_name(read_json_string)
-      val_type = get_type_id_for_type_name(read_json_string)
-      size = read_json_integer
-      read_json_object_start
-      [key_type, val_type, size]
-    end
-
-    def read_map_end
-      read_json_object_end
-      read_json_array_end
-    end
-
-    def read_list_begin
-      read_json_array_start
-      [get_type_id_for_type_name(read_json_string), read_json_integer]
-    end
-
-    def read_list_end
-      read_json_array_end
-    end
-
-    def read_set_begin
-      read_json_array_start
-      [get_type_id_for_type_name(read_json_string), read_json_integer]
-    end
-
-    def read_set_end
-      read_json_array_end
-    end
-
-    def read_bool
-      byte = read_byte
-      byte != 0
-    end
-
-    def read_byte
-      read_json_integer
-    end
-
-    def read_i16
-      read_json_integer
-    end
-
-    def read_i32
-      read_json_integer
-    end
-
-    def read_i64
-      read_json_integer
-    end
-
-    def read_double
-      read_json_double
-    end
-
-    def read_string
-      read_json_string
-    end
-
-    def read_binary
-      read_json_base64
-    end
-  end
-
-  class JsonProtocolFactory < BaseProtocolFactory
-    def get_protocol(trans)
-      return Thrift::JsonProtocol.new(trans)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/multiplexed_protocol.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/multiplexed_protocol.rb
deleted file mode 100644
index 13c9d93..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/multiplexed_protocol.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-require 'thrift/protocol/protocol_decorator'
-
-module Thrift
-  class MultiplexedProtocol < BaseProtocol
-
-    include ProtocolDecorator
-
-    def initialize(protocol, service_name)
-      super(protocol)
-      @service_name = service_name
-    end
-
-    def write_message_begin(name, type, seqid)
-      case type
-      when MessageTypes::CALL, MessageTypes::ONEWAY
-        @protocol.write_message_begin("#{@service_name}:#{name}", type, seqid)
-      else
-        @protocol.write_message_begin(name, type, seqid)
-      end 
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/protocol_decorator.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/protocol_decorator.rb
deleted file mode 100644
index b1e3c15..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/protocol/protocol_decorator.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-module Thrift
-  module ProtocolDecorator
-
-    def initialize(protocol)
-      @protocol = protocol
-    end
-
-    def trans
-      @protocol.trans
-    end
-
-    def write_message_begin(name, type, seqid)
-      @protocol.write_message_begin
-    end
-
-    def write_message_end
-      @protocol.write_message_end
-    end
-
-    def write_struct_begin(name)
-      @protocol.write_struct_begin(name)
-    end
-
-    def write_struct_end
-      @protocol.write_struct_end
-    end
-
-    def write_field_begin(name, type, id)
-      @protocol.write_field_begin(name, type, id)
-    end
-
-    def write_field_end
-      @protocol.write_field_end
-    end
-
-    def write_field_stop
-      @protocol.write_field_stop
-    end
-
-    def write_map_begin(ktype, vtype, size)
-      @protocol.write_map_begin(ktype, vtype, size)
-    end
-
-    def write_map_end
-      @protocol.write_map_end
-    end
-
-    def write_list_begin(etype, size)
-      @protocol.write_list_begin(etype, size)
-    end
-
-    def write_list_end
-      @protocol.write_list_end
-    end
-
-    def write_set_begin(etype, size)
-      @protocol.write_set_begin(etype, size)
-    end
-
-    def write_set_end
-      @protocol.write_set_end
-    end
-
-    def write_bool(bool)
-      @protocol.write_bool(bool)
-    end
-
-    def write_byte(byte)
-      @protocol.write_byte(byte)
-    end
-
-    def write_i16(i16)
-      @protocol.write_i16(i16)
-    end
-
-    def write_i32(i32)
-      @protocol.write_i32(i32)
-    end
-
-    def write_i64(i64)
-      @protocol.write_i64(i64)
-    end
-
-    def write_double(dub)
-      @protocol.write_double(dub)
-    end
-
-    def write_string(str)
-      @protocol.write_string(str)
-    end
-
-    def write_binary(buf)
-      @protocol.write_binary(buf)
-    end
-
-    def read_message_begin
-      @protocol.read_message_begin
-    end
-
-    def read_message_end
-      @protocol.read_message_end
-    end
-
-    def read_struct_begin
-      @protocol.read_struct_begin
-    end
-
-    def read_struct_end
-      @protocol.read_struct_end
-    end
-
-    def read_field_begin
-      @protocol.read_field_begin
-    end
-
-    def read_field_end
-      @protocol.read_field_end
-    end
-
-    def read_map_begin
-      @protocol.read_map_begin
-    end
-
-    def read_map_end
-      @protocol.read_map_end
-    end
-
-    def read_list_begin
-      @protocol.read_list_begin
-    end
-
-    def read_list_end
-      @protocol.read_list_end
-    end
-
-    def read_set_begin
-      @protocol.read_set_begin
-    end
-
-    def read_set_end
-      @protocol.read_set_end
-    end
-
-    def read_bool
-      @protocol.read_bool
-    end
-
-    def read_byte
-      @protocol.read_byte
-    end
-
-    def read_i16
-      @protocol.read_i16
-    end
-
-    def read_i32
-      @protocol.read_i32
-    end
-
-    def read_i64
-      @protocol.read_i64
-    end
-
-    def read_double
-      @protocol.read_double
-    end
-
-    def read_string
-      @protocol.read_string
-    end
-
-    def read_binary
-      @protocol.read_binary
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/serializer/deserializer.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/serializer/deserializer.rb
deleted file mode 100644
index d2ee325..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/serializer/deserializer.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  class Deserializer
-    def initialize(protocol_factory = BinaryProtocolFactory.new)
-      @transport = MemoryBufferTransport.new
-      @protocol = protocol_factory.get_protocol(@transport)
-    end
-
-    def deserialize(base, buffer)
-      @transport.reset_buffer(buffer)
-      base.read(@protocol)
-      base
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/serializer/serializer.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/serializer/serializer.rb
deleted file mode 100644
index 2231639..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/serializer/serializer.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  class Serializer
-    def initialize(protocol_factory = BinaryProtocolFactory.new)
-      @transport = MemoryBufferTransport.new
-      @protocol = protocol_factory.get_protocol(@transport)
-    end
-
-    def serialize(base)
-      @transport.reset_buffer
-      base.write(@protocol)
-      @transport.read(@transport.available)
-    end
-  end
-end
-
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/base_server.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/base_server.rb
deleted file mode 100644
index 1ee1213..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/base_server.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-module Thrift
-  class BaseServer
-    def initialize(processor, server_transport, transport_factory=nil, protocol_factory=nil)
-      @processor = processor
-      @server_transport = server_transport
-      @transport_factory = transport_factory ? transport_factory : Thrift::BaseTransportFactory.new
-      @protocol_factory = protocol_factory ? protocol_factory : Thrift::BinaryProtocolFactory.new
-    end
-
-    def serve; nil; end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/mongrel_http_server.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/mongrel_http_server.rb
deleted file mode 100644
index de354c8..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/mongrel_http_server.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'mongrel'
-
-## Sticks a service on a URL, using mongrel to do the HTTP work
-# <b>DEPRECATED:</b> Please use <tt>Thrift::ThinHTTPServer</tt> instead.
-module Thrift
-  class MongrelHTTPServer < BaseServer
-    class Handler < Mongrel::HttpHandler
-      def initialize(processor, protocol_factory)
-        @processor = processor
-        @protocol_factory = protocol_factory
-      end
-
-      def process(request, response)
-        if request.params["REQUEST_METHOD"] == "POST"
-          response.start(200) do |head, out|
-            head["Content-Type"] = "application/x-thrift"
-            transport = IOStreamTransport.new request.body, out
-            protocol = @protocol_factory.get_protocol transport
-            @processor.process protocol, protocol
-          end
-        else
-          response.start(404) { }
-        end
-      end
-    end
-
-    def initialize(processor, opts={})
-      Kernel.warn "[DEPRECATION WARNING] `Thrift::MongrelHTTPServer` is deprecated.  Please use `Thrift::ThinHTTPServer` instead."
-      port = opts[:port] || 80
-      ip = opts[:ip] || "0.0.0.0"
-      path = opts[:path] || ""
-      protocol_factory = opts[:protocol_factory] || BinaryProtocolFactory.new
-      @server = Mongrel::HttpServer.new ip, port
-      @server.register "/#{path}", Handler.new(processor, protocol_factory)
-    end
-
-    def serve
-      @server.run.join
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/nonblocking_server.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/nonblocking_server.rb
deleted file mode 100644
index 740f341..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/nonblocking_server.rb
+++ /dev/null
@@ -1,305 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'logger'
-require 'thread'
-
-module Thrift
-  # this class expects to always use a FramedTransport for reading messages
-  class NonblockingServer < BaseServer
-    def initialize(processor, server_transport, transport_factory=nil, protocol_factory=nil, num=20, logger=nil)
-      super(processor, server_transport, transport_factory, protocol_factory)
-      @num_threads = num
-      if logger.nil?
-        @logger = Logger.new(STDERR)
-        @logger.level = Logger::WARN
-      else
-        @logger = logger
-      end
-      @shutdown_semaphore = Mutex.new
-      @transport_semaphore = Mutex.new
-    end
-
-    def serve
-      @logger.info "Starting #{self}"
-      @server_transport.listen
-      @io_manager = start_io_manager
-
-      begin
-        loop do
-          break if @server_transport.closed?
-          begin
-            rd, = select([@server_transport], nil, nil, 0.1)
-          rescue Errno::EBADF => e
-            # In Ruby 1.9, calling @server_transport.close in shutdown paths causes the select() to raise an
-            # Errno::EBADF. If this happens, ignore it and retry the loop.
-            break
-          end
-          next if rd.nil?
-          socket = @server_transport.accept
-          @logger.debug "Accepted socket: #{socket.inspect}"
-          @io_manager.add_connection socket
-        end
-      rescue IOError => e
-      end
-      # we must be shutting down
-      @logger.info "#{self} is shutting down, goodbye"
-    ensure
-      @transport_semaphore.synchronize do
-        @server_transport.close
-      end
-      @io_manager.ensure_closed unless @io_manager.nil?
-    end
-
-    def shutdown(timeout = 0, block = true)
-      @shutdown_semaphore.synchronize do
-        return if @is_shutdown
-        @is_shutdown = true
-      end
-      # nonblocking is intended for calling from within a Handler
-      # but we can't change the order of operations here, so lets thread
-      shutdown_proc = lambda do
-        @io_manager.shutdown(timeout)
-        @transport_semaphore.synchronize do
-          @server_transport.close # this will break the accept loop
-        end
-      end
-      if block
-        shutdown_proc.call
-      else
-        Thread.new &shutdown_proc
-      end
-    end
-
-    private
-
-    def start_io_manager
-      iom = IOManager.new(@processor, @server_transport, @transport_factory, @protocol_factory, @num_threads, @logger)
-      iom.spawn
-      iom
-    end
-
-    class IOManager # :nodoc:
-      DEFAULT_BUFFER = 2**20
-      
-      def initialize(processor, server_transport, transport_factory, protocol_factory, num, logger)
-        @processor = processor
-        @server_transport = server_transport
-        @transport_factory = transport_factory
-        @protocol_factory = protocol_factory
-        @num_threads = num
-        @logger = logger
-        @connections = []
-        @buffers = Hash.new { |h,k| h[k] = '' }
-        @signal_queue = Queue.new
-        @signal_pipes = IO.pipe
-        @signal_pipes[1].sync = true
-        @worker_queue = Queue.new
-        @shutdown_queue = Queue.new
-      end
-
-      def add_connection(socket)
-        signal [:connection, socket]
-      end
-
-      def spawn
-        @iom_thread = Thread.new do
-          @logger.debug "Starting #{self}"
-          run
-        end
-      end
-
-      def shutdown(timeout = 0)
-        @logger.debug "#{self} is shutting down workers"
-        @worker_queue.clear
-        @num_threads.times { @worker_queue.push [:shutdown] }
-        signal [:shutdown, timeout]
-        @shutdown_queue.pop
-        @signal_pipes[0].close
-        @signal_pipes[1].close
-        @logger.debug "#{self} is shutting down, goodbye"
-      end
-
-      def ensure_closed
-        kill_worker_threads if @worker_threads
-        @iom_thread.kill
-      end
-
-      private
-      
-      def run
-        spin_worker_threads
-
-        loop do
-          rd, = select([@signal_pipes[0], *@connections])
-          if rd.delete @signal_pipes[0]
-            break if read_signals == :shutdown
-          end
-          rd.each do |fd|
-            begin
-              if fd.handle.eof?
-                remove_connection fd
-              else
-                read_connection fd
-              end
-            rescue Errno::ECONNRESET
-              remove_connection fd
-            end
-          end
-        end
-        join_worker_threads(@shutdown_timeout)
-      ensure
-        @shutdown_queue.push :shutdown
-      end
-
-      def read_connection(fd)
-        @buffers[fd] << fd.read(DEFAULT_BUFFER)
-        while(frame = slice_frame!(@buffers[fd]))
-          @logger.debug "#{self} is processing a frame"
-          @worker_queue.push [:frame, fd, frame]
-        end
-      end
-
-      def spin_worker_threads
-        @logger.debug "#{self} is spinning up worker threads"
-        @worker_threads = []
-        @num_threads.times do
-          @worker_threads << spin_thread
-        end
-      end
-
-      def spin_thread
-        Worker.new(@processor, @transport_factory, @protocol_factory, @logger, @worker_queue).spawn
-      end
-
-      def signal(msg)
-        @signal_queue << msg
-        @signal_pipes[1].write " "
-      end
-
-      def read_signals
-        # clear the signal pipe
-        # note that since read_nonblock is broken in jruby,
-        # we can only read up to a set number of signals at once
-        sigstr = @signal_pipes[0].readpartial(1024)
-        # now read the signals
-        begin
-          sigstr.length.times do
-            signal, obj = @signal_queue.pop(true)
-            case signal
-            when :connection
-              @connections << obj
-            when :shutdown
-              @shutdown_timeout = obj
-              return :shutdown
-            end
-          end
-        rescue ThreadError
-          # out of signals
-          # note that in a perfect world this would never happen, since we're
-          # only reading the number of signals pushed on the pipe, but given the lack
-          # of locks, in theory we could clear the pipe/queue while a new signal is being
-          # placed on the pipe, at which point our next read_signals would hit this error
-        end
-      end
-
-      def remove_connection(fd)
-        # don't explicitly close it, a thread may still be writing to it
-        @connections.delete fd
-        @buffers.delete fd
-      end
-
-      def join_worker_threads(shutdown_timeout)
-        start = Time.now
-        @worker_threads.each do |t|
-          if shutdown_timeout > 0
-            timeout = (start + shutdown_timeout) - Time.now
-            break if timeout <= 0
-            t.join(timeout)
-          else
-            t.join
-          end
-        end
-        kill_worker_threads
-      end
-
-      def kill_worker_threads
-        @worker_threads.each do |t|
-          t.kill if t.status
-        end
-        @worker_threads.clear
-      end
-
-      def slice_frame!(buf)
-        if buf.length >= 4
-          size = buf.unpack('N').first
-          if buf.length >= size + 4
-            buf.slice!(0, size + 4)
-          else
-            nil
-          end
-        else
-          nil
-        end
-      end
-
-      class Worker # :nodoc:
-        def initialize(processor, transport_factory, protocol_factory, logger, queue)
-          @processor = processor
-          @transport_factory = transport_factory
-          @protocol_factory = protocol_factory
-          @logger = logger
-          @queue = queue
-        end
-
-        def spawn
-          Thread.new do
-            @logger.debug "#{self} is spawning"
-            run
-          end
-        end
-
-        private
-
-        def run
-          loop do
-            cmd, *args = @queue.pop
-            case cmd
-            when :shutdown
-              @logger.debug "#{self} is shutting down, goodbye"
-              break
-            when :frame
-              fd, frame = args
-              begin
-                otrans = @transport_factory.get_transport(fd)
-                oprot = @protocol_factory.get_protocol(otrans)
-                membuf = MemoryBufferTransport.new(frame)
-                itrans = @transport_factory.get_transport(membuf)
-                iprot = @protocol_factory.get_protocol(itrans)
-                @processor.process(iprot, oprot)
-              rescue => e
-                @logger.error "#{Thread.current.inspect} raised error: #{e.inspect}\n#{e.backtrace.join("\n")}"
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/simple_server.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/simple_server.rb
deleted file mode 100644
index 21e8659..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/simple_server.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-module Thrift
-  class SimpleServer < BaseServer
-    def serve
-      begin
-        @server_transport.listen
-        loop do
-          client = @server_transport.accept
-          trans = @transport_factory.get_transport(client)
-          prot = @protocol_factory.get_protocol(trans)
-          begin
-            loop do
-              @processor.process(prot, prot)
-            end
-          rescue Thrift::TransportException, Thrift::ProtocolException
-          ensure
-            trans.close
-          end
-        end
-      ensure
-        @server_transport.close
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/thin_http_server.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/thin_http_server.rb
deleted file mode 100644
index 4a81c6d..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/thin_http_server.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'rack'
-require 'thin'
-
-##
-# Wraps the Thin web server to provide a Thrift server over HTTP.
-module Thrift
-  class ThinHTTPServer < BaseServer
-
-    ##
-    # Accepts a Thrift::Processor
-    # Options include:
-    # * :port
-    # * :ip
-    # * :path
-    # * :protocol_factory
-    def initialize(processor, options={})
-      port = options[:port] || 80
-      ip = options[:ip] || "0.0.0.0"
-      path = options[:path] || "/"
-      protocol_factory = options[:protocol_factory] || BinaryProtocolFactory.new
-      app = RackApplication.for(path, processor, protocol_factory)
-      @server = Thin::Server.new(ip, port, app)
-    end
-
-    ##
-    # Starts the server
-    def serve
-      @server.start
-    end
-
-    class RackApplication
-
-      THRIFT_HEADER = "application/x-thrift"
-
-      def self.for(path, processor, protocol_factory)
-        Rack::Builder.new do
-          use Rack::CommonLogger
-          use Rack::ShowExceptions
-          use Rack::Lint
-          map path do
-            run lambda { |env|
-              request = Rack::Request.new(env)
-              if RackApplication.valid_thrift_request?(request)
-                RackApplication.successful_request(request, processor, protocol_factory)
-              else
-                RackApplication.failed_request
-              end
-            }
-          end
-        end
-      end
-
-      def self.successful_request(rack_request, processor, protocol_factory)
-        response = Rack::Response.new([], 200, {'Content-Type' => THRIFT_HEADER})
-        transport = IOStreamTransport.new rack_request.body, response
-        protocol = protocol_factory.get_protocol transport
-        processor.process protocol, protocol
-        response
-      end
-
-      def self.failed_request
-        Rack::Response.new(['Not Found'], 404, {'Content-Type' => THRIFT_HEADER})
-      end
-
-      def self.valid_thrift_request?(rack_request)
-        rack_request.post? && rack_request.env["CONTENT_TYPE"] == THRIFT_HEADER
-      end
-
-    end
-
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/thread_pool_server.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/thread_pool_server.rb
deleted file mode 100644
index 8cec805..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/thread_pool_server.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'thread'
-
-module Thrift
-  class ThreadPoolServer < BaseServer
-    def initialize(processor, server_transport, transport_factory=nil, protocol_factory=nil, num=20)
-      super(processor, server_transport, transport_factory, protocol_factory)
-      @thread_q = SizedQueue.new(num)
-      @exception_q = Queue.new
-      @running = false
-    end
-
-    ## exceptions that happen in worker threads will be relayed here and
-    ## must be caught. 'retry' can be used to continue. (threads will
-    ## continue to run while the exception is being handled.)
-    def rescuable_serve
-      Thread.new { serve } unless @running
-      @running = true
-      raise @exception_q.pop
-    end
-
-    ## exceptions that happen in worker threads simply cause that thread
-    ## to die and another to be spawned in its place.
-    def serve
-      @server_transport.listen
-
-      begin
-        loop do
-          @thread_q.push(:token)
-          Thread.new do
-            begin
-              loop do
-                client = @server_transport.accept
-                trans = @transport_factory.get_transport(client)
-                prot = @protocol_factory.get_protocol(trans)
-                begin
-                  loop do
-                    @processor.process(prot, prot)
-                  end
-                rescue Thrift::TransportException, Thrift::ProtocolException => e
-                ensure
-                  trans.close
-                end
-              end
-            rescue => e
-              @exception_q.push(e)
-            ensure
-              @thread_q.pop # thread died!
-            end
-          end
-        end
-      ensure
-        @server_transport.close
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/threaded_server.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/threaded_server.rb
deleted file mode 100644
index a2c917c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/server/threaded_server.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'thread'
-
-module Thrift
-  class ThreadedServer < BaseServer
-    def serve
-      begin
-        @server_transport.listen
-        loop do
-          client = @server_transport.accept
-          trans = @transport_factory.get_transport(client)
-          prot = @protocol_factory.get_protocol(trans)
-          Thread.new(prot, trans) do |p, t|
-            begin
-              loop do
-                @processor.process(p, p)
-              end
-            rescue Thrift::TransportException, Thrift::ProtocolException
-            ensure
-              t.close
-            end
-          end
-        end
-      ensure
-        @server_transport.close
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/struct.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/struct.rb
deleted file mode 100644
index df9d656..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/struct.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'set'
-
-module Thrift
-  module Struct
-    def initialize(d={}, &block)
-      # get a copy of the default values to work on, removing defaults in favor of arguments
-      fields_with_defaults = fields_with_default_values.dup
-      
-      # check if the defaults is empty, or if there are no parameters for this 
-      # instantiation, and if so, don't bother overriding defaults.
-      unless fields_with_defaults.empty? || d.empty?
-        d.each_key do |name|
-          fields_with_defaults.delete(name.to_s)
-        end
-      end
-      
-      # assign all the user-specified arguments
-      unless d.empty?
-        d.each do |name, value|
-          unless name_to_id(name.to_s)
-            raise Exception, "Unknown key given to #{self.class}.new: #{name}"
-          end
-          Thrift.check_type(value, struct_fields[name_to_id(name.to_s)], name) if Thrift.type_checking
-          instance_variable_set("@#{name}", value)
-        end
-      end
-      
-      # assign all the default values
-      unless fields_with_defaults.empty?
-        fields_with_defaults.each do |name, default_value|
-          instance_variable_set("@#{name}", (default_value.dup rescue default_value))
-        end
-      end
-      
-      yield self if block_given?
-    end
-
-    def fields_with_default_values
-      fields_with_default_values = self.class.instance_variable_get(:@fields_with_default_values)
-      unless fields_with_default_values
-        fields_with_default_values = {}
-        struct_fields.each do |fid, field_def|
-          unless field_def[:default].nil?
-            fields_with_default_values[field_def[:name]] = field_def[:default]
-          end
-        end
-        self.class.instance_variable_set(:@fields_with_default_values, fields_with_default_values)
-      end
-      fields_with_default_values
-    end
-    
-    def inspect(skip_optional_nulls = true)
-      fields = []
-      each_field do |fid, field_info|
-        name = field_info[:name]
-        value = instance_variable_get("@#{name}")
-        unless skip_optional_nulls && field_info[:optional] && value.nil?
-          fields << "#{name}:#{inspect_field(value, field_info)}"
-        end
-      end
-      "<#{self.class} #{fields.join(", ")}>"
-    end
-
-    def read(iprot)
-      iprot.read_struct_begin
-      loop do
-        fname, ftype, fid = iprot.read_field_begin
-        break if (ftype == Types::STOP)
-        handle_message(iprot, fid, ftype)
-        iprot.read_field_end
-      end
-      iprot.read_struct_end
-      validate
-    end
-
-    def write(oprot)
-      validate
-      oprot.write_struct_begin(self.class.name)
-      each_field do |fid, field_info|
-        name = field_info[:name]
-        type = field_info[:type]
-        value = instance_variable_get("@#{name}")
-        unless value.nil?
-          if is_container? type
-            oprot.write_field_begin(name, type, fid)
-            write_container(oprot, value, field_info)
-            oprot.write_field_end
-          else
-            oprot.write_field(field_info, fid, value)
-          end
-        end
-      end
-      oprot.write_field_stop
-      oprot.write_struct_end
-    end
-
-    def ==(other)
-      return false if other.nil?
-      each_field do |fid, field_info|
-        name = field_info[:name]
-        return false unless other.respond_to?(name) && self.send(name) == other.send(name)
-      end
-      true
-    end
-
-    def eql?(other)
-      self.class == other.class && self == other
-    end
-
-    # This implementation of hash() is inspired by Apache's Java HashCodeBuilder class.
-    def hash
-      total = 17
-      each_field do |fid, field_info|
-        name = field_info[:name]
-        value = self.send(name)
-        total = (total * 37 + value.hash) & 0xffffffff
-      end
-      total
-    end
-
-    def differences(other)
-      diffs = []
-      unless other.is_a?(self.class)
-        diffs << "Different class!"
-      else
-        each_field do |fid, field_info|
-          name = field_info[:name]
-          diffs << "#{name} differs!" unless self.instance_variable_get("@#{name}") == other.instance_variable_get("@#{name}")
-        end
-      end
-      diffs
-    end
-
-    def self.field_accessor(klass, field_info)
-      field_name_sym = field_info[:name].to_sym
-      klass.send :attr_reader, field_name_sym
-      klass.send :define_method, "#{field_info[:name]}=" do |value|
-        Thrift.check_type(value, field_info, field_info[:name]) if Thrift.type_checking
-        instance_variable_set("@#{field_name_sym}", value)
-      end
-    end
-
-    def self.generate_accessors(klass)
-      klass::FIELDS.values.each do |field_info|
-        field_accessor(klass, field_info)
-        qmark_isset_method(klass, field_info)
-      end
-    end
-
-    def self.qmark_isset_method(klass, field_info)
-      klass.send :define_method, "#{field_info[:name]}?" do
-        !self.send(field_info[:name].to_sym).nil?
-      end
-    end
-
-    def <=>(other)
-      if self.class == other.class
-        each_field do |fid, field_info|
-          v1 = self.send(field_info[:name])
-          v1_set = !v1.nil?
-          v2 = other.send(field_info[:name])
-          v2_set = !v2.nil?
-          if v1_set && !v2_set
-            return -1
-          elsif !v1_set && v2_set
-            return 1
-          elsif v1_set && v2_set
-            cmp = v1 <=> v2
-            if cmp != 0
-              return cmp
-            end
-          end
-        end
-        0
-      else
-        self.class <=> other.class
-      end
-    end
-
-    protected
-
-    def self.append_features(mod)
-      if mod.ancestors.include? ::Exception
-        mod.send :class_variable_set, :'@@__thrift_struct_real_initialize', mod.instance_method(:initialize)
-        super
-        # set up our custom initializer so `raise Xception, 'message'` works
-        mod.send :define_method, :struct_initialize, mod.instance_method(:initialize)
-        mod.send :define_method, :initialize, mod.instance_method(:exception_initialize)
-      else
-        super
-      end
-    end
-
-    def exception_initialize(*args, &block)
-      if args.size == 1 and args.first.is_a? Hash
-        # looks like it's a regular Struct initialize
-        method(:struct_initialize).call(args.first)
-      else
-        # call the Struct initializer first with no args
-        # this will set our field default values
-        method(:struct_initialize).call()
-        # now give it to the exception
-        self.class.send(:class_variable_get, :'@@__thrift_struct_real_initialize').bind(self).call(*args, &block) if args.size > 0
-        # self.class.instance_method(:initialize).bind(self).call(*args, &block)
-      end
-    end
-
-    def handle_message(iprot, fid, ftype)
-      field = struct_fields[fid]
-      if field and field[:type] == ftype
-        value = read_field(iprot, field)
-        instance_variable_set("@#{field[:name]}", value)
-      else
-        iprot.skip(ftype)
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/struct_union.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/struct_union.rb
deleted file mode 100644
index e21b39e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/struct_union.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-require 'set'
-
-module Thrift
-  module Struct_Union
-    def name_to_id(name)
-      names_to_ids = self.class.instance_variable_get(:@names_to_ids)
-      unless names_to_ids
-        names_to_ids = {}
-        struct_fields.each do |fid, field_def|
-          names_to_ids[field_def[:name]] = fid
-        end
-        self.class.instance_variable_set(:@names_to_ids, names_to_ids)
-      end
-      names_to_ids[name]
-    end
-
-    def sorted_field_ids
-      sorted_field_ids = self.class.instance_variable_get(:@sorted_field_ids)
-      unless sorted_field_ids
-        sorted_field_ids = struct_fields.keys.sort
-        self.class.instance_variable_set(:@sorted_field_ids, sorted_field_ids)
-      end
-      sorted_field_ids
-    end
-
-    def each_field
-      sorted_field_ids.each do |fid|
-        data = struct_fields[fid]
-        yield fid, data
-      end
-    end
-
-    def read_field(iprot, field = {})
-      case field[:type]
-      when Types::STRUCT
-        value = field[:class].new
-        value.read(iprot)
-      when Types::MAP
-        key_type, val_type, size = iprot.read_map_begin
-        # Skip the map contents if the declared key or value types don't match the expected ones.
-        if (size != 0 && (key_type != field[:key][:type] || val_type != field[:value][:type]))
-          size.times do
-            iprot.skip(key_type)
-            iprot.skip(val_type)
-          end
-          value = nil
-        else
-          value = {}
-          size.times do
-            k = read_field(iprot, field_info(field[:key]))
-            v = read_field(iprot, field_info(field[:value]))
-            value[k] = v
-          end
-        end
-        iprot.read_map_end
-      when Types::LIST
-        e_type, size = iprot.read_list_begin
-        # Skip the list contents if the declared element type doesn't match the expected one.
-        if (e_type != field[:element][:type])
-          size.times do
-            iprot.skip(e_type)
-          end
-          value = nil
-        else
-          value = Array.new(size) do |n|
-            read_field(iprot, field_info(field[:element]))
-          end
-        end
-        iprot.read_list_end
-      when Types::SET
-        e_type, size = iprot.read_set_begin
-        # Skip the set contents if the declared element type doesn't match the expected one.
-        if (e_type != field[:element][:type])
-          size.times do
-            iprot.skip(e_type)
-          end
-        else
-          value = Set.new
-          size.times do
-            element = read_field(iprot, field_info(field[:element]))
-            value << element
-          end
-        end
-        iprot.read_set_end
-      else
-        value = iprot.read_type(field)
-      end
-      value
-    end
-
-    def write_data(oprot, value, field)
-      if is_container? field[:type]
-        write_container(oprot, value, field)
-      else
-        oprot.write_type(field, value)
-      end
-    end
-
-    def write_container(oprot, value, field = {})
-      case field[:type]
-      when Types::MAP
-        oprot.write_map_begin(field[:key][:type], field[:value][:type], value.size)
-        value.each do |k, v|
-          write_data(oprot, k, field[:key])
-          write_data(oprot, v, field[:value])
-        end
-        oprot.write_map_end
-      when Types::LIST
-        oprot.write_list_begin(field[:element][:type], value.size)
-        value.each do |elem|
-          write_data(oprot, elem, field[:element])
-        end
-        oprot.write_list_end
-      when Types::SET
-        oprot.write_set_begin(field[:element][:type], value.size)
-        value.each do |v,| # the , is to preserve compatibility with the old Hash-style sets
-          write_data(oprot, v, field[:element])
-        end
-        oprot.write_set_end
-      else
-        raise "Not a container type: #{field[:type]}"
-      end
-    end
-
-    CONTAINER_TYPES = []
-    CONTAINER_TYPES[Types::LIST] = true
-    CONTAINER_TYPES[Types::MAP] = true
-    CONTAINER_TYPES[Types::SET] = true
-    def is_container?(type)
-      CONTAINER_TYPES[type]
-    end
-
-    def field_info(field)
-      { :type => field[:type],
-        :class => field[:class],
-        :key => field[:key],
-        :value => field[:value],
-        :element => field[:element] }
-    end
-
-    def inspect_field(value, field_info)
-      if enum_class = field_info[:enum_class]
-        "#{enum_class.const_get(:VALUE_MAP)[value]} (#{value})"
-      elsif value.is_a? Hash 
-        if field_info[:type] == Types::MAP
-          map_buf = []
-          value.each do |k, v|
-            map_buf << inspect_field(k, field_info[:key]) + ": " + inspect_field(v, field_info[:value])
-          end
-          "{" + map_buf.join(", ") + "}"
-        else
-          # old-style set
-          inspect_collection(value.keys, field_info)
-        end
-      elsif value.is_a? Array
-        inspect_collection(value, field_info)
-      elsif value.is_a? Set
-        inspect_collection(value, field_info)
-      elsif value.is_a?(String) && field_info[:binary]
-        value.unpack("H*").first
-      else
-        value.inspect
-      end
-    end
-    
-    def inspect_collection(collection, field_info)
-      buf = []
-      collection.each do |k|
-        buf << inspect_field(k, field_info[:element])
-      end
-      "[" + buf.join(", ") + "]"      
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/thrift_native.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/thrift_native.rb
deleted file mode 100644
index 4d8df61..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/thrift_native.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-begin
-  require "thrift_native"
-rescue LoadError
-  puts "Unable to load thrift_native extension. Defaulting to pure Ruby libraries."
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/base_server_transport.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/base_server_transport.rb
deleted file mode 100644
index 68c5af0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/base_server_transport.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  class BaseServerTransport
-    def listen
-      raise NotImplementedError
-    end
-
-    def accept
-      raise NotImplementedError
-    end
-      
-    def close; nil; end
-
-    def closed?
-      raise NotImplementedError
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/base_transport.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/base_transport.rb
deleted file mode 100644
index 8790326..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/base_transport.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  class TransportException < Exception
-    UNKNOWN = 0
-    NOT_OPEN = 1
-    ALREADY_OPEN = 2
-    TIMED_OUT = 3
-    END_OF_FILE = 4
-
-    attr_reader :type
-
-    def initialize(type=UNKNOWN, message=nil)
-      super(message)
-      @type = type
-    end
-  end
-
-  module TransportUtils
-    # Deprecated: Use Thrift::Bytes instead
-    def self.get_string_byte(string, index)
-      Bytes.get_string_byte(string, index)
-    end
-
-    # Deprecated: Use Thrift::Bytes instead
-    def self.set_string_byte(string, index, byte)
-      Bytes.set_string_byte(string, index, byte)
-    end
-  end
-
-  class BaseTransport
-    def open?; end
-    
-    def open; end
-
-    def close; end
-
-    # Reads a number of bytes from the transports. In Ruby 1.9+, the String returned will have a BINARY (aka ASCII8BIT) encoding.
-    #
-    # sz - The number of bytes to read from the transport.
-    #
-    # Returns a String acting as a byte buffer.
-    def read(sz)
-      raise NotImplementedError
-    end
-
-    # Returns an unsigned byte as a Fixnum in the range (0..255).
-    def read_byte
-      buf = read_all(1)
-      return Bytes.get_string_byte(buf, 0)
-    end
-
-    # Reads size bytes and copies them into buffer[0..size].
-    def read_into_buffer(buffer, size)
-      tmp = read_all(size)
-      i = 0
-      tmp.each_byte do |byte|
-        Bytes.set_string_byte(buffer, i, byte)
-        i += 1
-      end
-      i
-    end
-
-    def read_all(size)
-      return Bytes.empty_byte_buffer if size <= 0
-      buf = read(size)
-      while (buf.length < size)
-        chunk = read(size - buf.length)
-        buf << chunk
-      end
-    
-      buf
-    end
-
-    # Writes the byte buffer to the transport. In Ruby 1.9+, the buffer will be forced into BINARY encoding.
-    #
-    # buf - A String acting as a byte buffer.
-    #
-    # Returns nothing.
-    def write(buf); end
-    alias_method :<<, :write
-
-    def flush; end
-  end
-  
-  class BaseTransportFactory
-    def get_transport(trans)
-      return trans
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/buffered_transport.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/buffered_transport.rb
deleted file mode 100644
index 781d3c6..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/buffered_transport.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-module Thrift
-  class BufferedTransport < BaseTransport
-    DEFAULT_BUFFER = 4096
-    
-    def initialize(transport)
-      @transport = transport
-      @wbuf = Bytes.empty_byte_buffer
-      @rbuf = Bytes.empty_byte_buffer
-      @index = 0
-    end
-
-    def open?
-      return @transport.open?
-    end
-
-    def open
-      @transport.open
-    end
-
-    def close
-      flush
-      @transport.close
-    end
-
-    def read(sz)
-      @index += sz
-      ret = @rbuf.slice(@index - sz, sz) || Bytes.empty_byte_buffer
-
-      if ret.length == 0
-        @rbuf = @transport.read([sz, DEFAULT_BUFFER].max)
-        @index = sz
-        ret = @rbuf.slice(0, sz) || Bytes.empty_byte_buffer
-      end
-
-      ret
-    end
-
-    def read_byte
-      # If the read buffer is exhausted, try to read up to DEFAULT_BUFFER more bytes into it.
-      if @index >= @rbuf.size
-        @rbuf = @transport.read(DEFAULT_BUFFER)
-        @index = 0
-      end
-
-      # The read buffer has some data now, read a single byte. Using get_string_byte() avoids
-      # allocating a temp string of size 1 unnecessarily.
-      @index += 1
-      return Bytes.get_string_byte(@rbuf, @index - 1)
-    end
-
-    # Reads a number of bytes from the transport into the buffer passed.
-    #
-    # buffer - The String (byte buffer) to write data to; this is assumed to have a BINARY encoding.
-    # size   - The number of bytes to read from the transport and write to the buffer.
-    #
-    # Returns the number of bytes read.
-    def read_into_buffer(buffer, size)
-      i = 0
-      while i < size
-        # If the read buffer is exhausted, try to read up to DEFAULT_BUFFER more bytes into it.
-        if @index >= @rbuf.size
-          @rbuf = @transport.read(DEFAULT_BUFFER)
-          @index = 0
-        end
-
-        # The read buffer has some data now, so copy bytes over to the output buffer.
-        byte = Bytes.get_string_byte(@rbuf, @index)
-        Bytes.set_string_byte(buffer, i, byte)
-        @index += 1
-        i += 1
-      end
-      i
-    end
-
-    def write(buf)
-      @wbuf << Bytes.force_binary_encoding(buf)
-    end
-
-    def flush
-      unless @wbuf.empty?
-        @transport.write(@wbuf)
-        @wbuf = Bytes.empty_byte_buffer
-      end
-      
-      @transport.flush
-    end
-  end
-
-  class BufferedTransportFactory < BaseTransportFactory
-    def get_transport(transport)
-      return BufferedTransport.new(transport)
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/framed_transport.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/framed_transport.rb
deleted file mode 100644
index d806ce0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/framed_transport.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-module Thrift
-  class FramedTransport < BaseTransport
-    def initialize(transport, read=true, write=true)
-      @transport = transport
-      @rbuf      = Bytes.empty_byte_buffer
-      @wbuf      = Bytes.empty_byte_buffer
-      @read      = read
-      @write     = write
-      @index      = 0
-    end
-
-    def open?
-      @transport.open?
-    end
-
-    def open
-      @transport.open
-    end
-
-    def close
-      @transport.close
-    end
-
-    def read(sz)
-      return @transport.read(sz) unless @read
-
-      return Bytes.empty_byte_buffer if sz <= 0
-
-      read_frame if @index >= @rbuf.length
-
-      @index += sz
-      @rbuf.slice(@index - sz, sz) || Bytes.empty_byte_buffer
-    end
-
-    def read_byte
-      return @transport.read_byte() unless @read
-
-      read_frame if @index >= @rbuf.length
-
-      # The read buffer has some data now, read a single byte. Using get_string_byte() avoids
-      # allocating a temp string of size 1 unnecessarily.
-      @index += 1
-      return Bytes.get_string_byte(@rbuf, @index - 1)
-    end
-
-    def read_into_buffer(buffer, size)
-      i = 0
-      while i < size
-        read_frame if @index >= @rbuf.length
-
-        # The read buffer has some data now, so copy bytes over to the output buffer.
-        byte = Bytes.get_string_byte(@rbuf, @index)
-        Bytes.set_string_byte(buffer, i, byte)
-        @index += 1
-        i += 1
-      end
-      i
-    end
-
-    def write(buf, sz=nil)
-      return @transport.write(buf) unless @write
-
-      buf = Bytes.force_binary_encoding(buf)
-      @wbuf << (sz ? buf[0...sz] : buf)
-    end
-
-    #
-    # Writes the output buffer to the stream in the format of a 4-byte length
-    # followed by the actual data.
-    #
-    def flush
-      return @transport.flush unless @write
-
-      out = [@wbuf.length].pack('N')
-      # Array#pack should return a BINARY encoded String, so it shouldn't be necessary to force encoding
-      out << @wbuf
-      @transport.write(out)
-      @transport.flush
-      @wbuf = Bytes.empty_byte_buffer
-    end
-
-    private
-
-    def read_frame
-      sz = @transport.read_all(4).unpack('N').first
-
-      @index = 0
-      @rbuf = @transport.read_all(sz)
-    end
-  end
-
-  class FramedTransportFactory < BaseTransportFactory
-    def get_transport(transport)
-      return FramedTransport.new(transport)
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/http_client_transport.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/http_client_transport.rb
deleted file mode 100644
index c9c4fec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/http_client_transport.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# encoding: ascii-8bit
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'net/http'
-require 'net/https'
-require 'openssl'
-require 'uri'
-require 'stringio'
-
-module Thrift
-  class HTTPClientTransport < BaseTransport
-
-    def initialize(url, opts = {})
-      @url = URI url
-      @headers = {'Content-Type' => 'application/x-thrift'}
-      @outbuf = Bytes.empty_byte_buffer
-      @ssl_verify_mode = opts.fetch(:ssl_verify_mode, OpenSSL::SSL::VERIFY_PEER)
-    end
-
-    def open?; true end
-    def read(sz); @inbuf.read sz end
-    def write(buf); @outbuf << Bytes.force_binary_encoding(buf) end
-
-    def add_headers(headers)
-      @headers = @headers.merge(headers)
-    end
-
-    def flush
-      http = Net::HTTP.new @url.host, @url.port
-      http.use_ssl = @url.scheme == 'https'
-      http.verify_mode = @ssl_verify_mode if @url.scheme == 'https'
-      resp = http.post(@url.request_uri, @outbuf, @headers)
-      data = resp.body
-      data = Bytes.force_binary_encoding(data)
-      @inbuf = StringIO.new data
-    ensure
-      @outbuf = Bytes.empty_byte_buffer
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/io_stream_transport.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/io_stream_transport.rb
deleted file mode 100644
index e3c8379..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/io_stream_transport.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Very very simple implementation of wrapping two objects, one with a #read
-# method and one with a #write method, into a transport for thrift.
-#
-# Assumes both objects are open, remain open, don't require flushing, etc.
-#
-module Thrift
-  class IOStreamTransport < BaseTransport
-    def initialize(input, output)
-      @input = input
-      @output = output
-    end
-
-    def open?; not @input.closed? or not @output.closed? end
-    def read(sz); @input.read(sz) end
-    def write(buf); @output.write(Bytes.force_binary_encoding(buf)) end
-    def close; @input.close; @output.close end
-    def to_io; @input end # we're assuming this is used in a IO.select for reading
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/memory_buffer_transport.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/memory_buffer_transport.rb
deleted file mode 100644
index ad5ad85..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/memory_buffer_transport.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-module Thrift
-  class MemoryBufferTransport < BaseTransport
-    GARBAGE_BUFFER_SIZE = 4*(2**10) # 4kB
-
-    # If you pass a string to this, you should #dup that string
-    # unless you want it to be modified by #read and #write
-    #--
-    # this behavior is no longer required. If you wish to change it
-    # go ahead, just make sure the specs pass
-    def initialize(buffer = nil)
-      @buf = buffer ? Bytes.force_binary_encoding(buffer) : Bytes.empty_byte_buffer
-      @index = 0
-    end
-
-    def open?
-      return true
-    end
-
-    def open
-    end
-
-    def close
-    end
-
-    def peek
-      @index < @buf.size
-    end
-
-    # this method does not use the passed object directly but copies it
-    def reset_buffer(new_buf = '')
-      @buf.replace Bytes.force_binary_encoding(new_buf)
-      @index = 0
-    end
-
-    def available
-      @buf.length - @index
-    end
-
-    def read(len)
-      data = @buf.slice(@index, len)
-      @index += len
-      @index = @buf.size if @index > @buf.size
-      if @index >= GARBAGE_BUFFER_SIZE
-        @buf = @buf.slice(@index..-1)
-        @index = 0
-      end
-      if data.size < len
-        raise EOFError, "Not enough bytes remain in buffer"
-      end
-      data
-    end
-
-    def read_byte
-      raise EOFError.new("Not enough bytes remain in buffer") if @index >= @buf.size
-      val = Bytes.get_string_byte(@buf, @index)
-      @index += 1
-      if @index >= GARBAGE_BUFFER_SIZE
-        @buf = @buf.slice(@index..-1)
-        @index = 0
-      end
-      val
-    end
-
-    def read_into_buffer(buffer, size)
-      i = 0
-      while i < size
-        raise EOFError.new("Not enough bytes remain in buffer") if @index >= @buf.size
-
-        # The read buffer has some data now, so copy bytes over to the output buffer.
-        byte = Bytes.get_string_byte(@buf, @index)
-        Bytes.set_string_byte(buffer, i, byte)
-        @index += 1
-        i += 1
-      end
-      if @index >= GARBAGE_BUFFER_SIZE
-        @buf = @buf.slice(@index..-1)
-        @index = 0
-      end
-      i
-    end
-
-    def write(wbuf)
-      @buf << Bytes.force_binary_encoding(wbuf)
-    end
-
-    def flush
-    end
-
-    def inspect_buffer
-      out = []
-      for idx in 0...(@buf.size)
-        # if idx != 0
-        #   out << " "
-        # end
-      
-        if idx == @index
-          out << ">"
-        end
-      
-        out << @buf[idx].ord.to_s(16)
-      end
-      out.join(" ")
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/server_socket.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/server_socket.rb
deleted file mode 100644
index 7feb9ab..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/server_socket.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'socket'
-
-module Thrift
-  class ServerSocket < BaseServerTransport
-    # call-seq: initialize(host = nil, port)
-    def initialize(host_or_port, port = nil)
-      if port
-        @host = host_or_port
-        @port = port
-      else
-        @host = nil
-        @port = host_or_port
-      end
-      @handle = nil
-    end
-
-    attr_reader :handle
-
-    def listen
-      @handle = TCPServer.new(@host, @port)
-    end
-
-    def accept
-      unless @handle.nil?
-        sock = @handle.accept
-        trans = Socket.new
-        trans.handle = sock
-        trans
-      end
-    end
-
-    def close
-     @handle.close unless @handle.nil? or @handle.closed?
-     @handle = nil
-    end
-
-    def closed?
-      @handle.nil? or @handle.closed?
-    end
-
-    alias to_io handle
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/socket.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/socket.rb
deleted file mode 100644
index 517d112..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/socket.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'socket'
-
-module Thrift
-  class Socket < BaseTransport
-    def initialize(host='localhost', port=9090, timeout=nil)
-      @host = host
-      @port = port
-      @timeout = timeout
-      @desc = "#{host}:#{port}"
-      @handle = nil
-    end
-
-    attr_accessor :handle, :timeout
-
-    def open
-      for addrinfo in ::Socket::getaddrinfo(@host, @port, nil, ::Socket::SOCK_STREAM) do
-        begin
-          socket = ::Socket.new(addrinfo[4], ::Socket::SOCK_STREAM, 0)
-          socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)
-          sockaddr = ::Socket.sockaddr_in(addrinfo[1], addrinfo[3])
-          begin
-            socket.connect_nonblock(sockaddr)
-          rescue Errno::EINPROGRESS
-            unless IO.select(nil, [ socket ], nil, @timeout)
-              next
-            end
-            begin
-              socket.connect_nonblock(sockaddr)
-            rescue Errno::EISCONN
-            end
-          end
-          return @handle = socket
-        rescue StandardError => e
-          next
-        end
-      end
-      raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}: #{e}")
-    end
-
-    def open?
-      !@handle.nil? and !@handle.closed?
-    end
-
-    def write(str)
-      raise IOError, "closed stream" unless open?
-      str = Bytes.force_binary_encoding(str)
-      begin
-        if @timeout.nil? or @timeout == 0
-          @handle.write(str)
-        else
-          len = 0
-          start = Time.now
-          while Time.now - start < @timeout
-            rd, wr, = IO.select(nil, [@handle], nil, @timeout)
-            if wr and not wr.empty?
-              len += @handle.write_nonblock(str[len..-1])
-              break if len >= str.length
-            end
-          end
-          if len < str.length
-            raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out writing #{str.length} bytes to #{@desc}")
-          else
-            len
-          end
-        end
-      rescue TransportException => e
-        # pass this on
-        raise e
-      rescue StandardError => e
-        @handle.close
-        @handle = nil
-        raise TransportException.new(TransportException::NOT_OPEN, e.message)
-      end
-    end
-
-    def read(sz)
-      raise IOError, "closed stream" unless open?
-
-      begin
-        if @timeout.nil? or @timeout == 0
-          data = @handle.readpartial(sz)
-        else
-          # it's possible to interrupt select for something other than the timeout
-          # so we need to ensure we've waited long enough, but not too long
-          start = Time.now
-          timespent = 0
-          rd = loop do
-            rd, = IO.select([@handle], nil, nil, @timeout - timespent)
-            timespent = Time.now - start
-            break rd if (rd and not rd.empty?) or timespent >= @timeout
-          end
-          if rd.nil? or rd.empty?
-            raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out reading #{sz} bytes from #{@desc}")
-          else
-            data = @handle.readpartial(sz)
-          end
-        end
-      rescue TransportException => e
-        # don't let this get caught by the StandardError handler
-        raise e
-      rescue StandardError => e
-        @handle.close unless @handle.closed?
-        @handle = nil
-        raise TransportException.new(TransportException::NOT_OPEN, e.message)
-      end
-      if (data.nil? or data.length == 0)
-        raise TransportException.new(TransportException::UNKNOWN, "Socket: Could not read #{sz} bytes from #{@desc}")
-      end
-      data
-    end
-
-    def close
-      @handle.close unless @handle.nil? or @handle.closed?
-      @handle = nil
-    end
-
-    def to_io
-      @handle
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/ssl_server_socket.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/ssl_server_socket.rb
deleted file mode 100644
index abc1343..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/ssl_server_socket.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# encoding: ascii-8bit
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'socket'
-
-module Thrift
-  class SSLServerSocket < ServerSocket
-    def initialize(host_or_port, port = nil, ssl_context = nil)
-      super(host_or_port, port)
-      @ssl_context = ssl_context
-    end
-
-    attr_accessor :ssl_context
-
-    def listen
-      socket = TCPServer.new(@host, @port)
-      @handle = OpenSSL::SSL::SSLServer.new(socket, @ssl_context)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/ssl_socket.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/ssl_socket.rb
deleted file mode 100644
index dbbcc94..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/ssl_socket.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# encoding: ascii-8bit
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-module Thrift
-  class SSLSocket < Socket
-    def initialize(host='localhost', port=9090, timeout=nil, ssl_context=nil)
-      super(host, port, timeout)
-      @ssl_context = ssl_context
-    end
-
-    attr_accessor :ssl_context
-
-    def open
-      socket = super
-      @handle = OpenSSL::SSL::SSLSocket.new(socket, @ssl_context)
-      begin
-        @handle.connect_nonblock
-        @handle.post_connection_check(@host)
-        @handle
-      rescue IO::WaitReadable
-        IO.select([ @handle ], nil, nil, @timeout)
-        retry
-      rescue IO::WaitWritable
-        IO.select(nil, [ @handle ], nil, @timeout)
-        retry
-      rescue StandardError => e
-        raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}: #{e}")
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/unix_server_socket.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/unix_server_socket.rb
deleted file mode 100644
index a135d25..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/unix_server_socket.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'socket'
-
-module Thrift
-  class UNIXServerSocket < BaseServerTransport
-    def initialize(path)
-      @path = path
-      @handle = nil
-    end
-
-    attr_accessor :handle
-
-    def listen
-      @handle = ::UNIXServer.new(@path)
-    end
-
-    def accept
-      unless @handle.nil?
-        sock = @handle.accept
-        trans = UNIXSocket.new(nil)
-        trans.handle = sock
-        trans
-      end
-    end
-
-    def close
-      if @handle
-        @handle.close unless @handle.closed?
-        @handle = nil
-        # UNIXServer doesn't delete the socket file, so we have to do it ourselves
-        File.delete(@path)
-      end
-    end
-
-    def closed?
-      @handle.nil? or @handle.closed?
-    end
-
-    alias to_io handle
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/unix_socket.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/unix_socket.rb
deleted file mode 100644
index 8f692e4..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/transport/unix_socket.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# encoding: ascii-8bit
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'socket'
-
-module Thrift
-  class UNIXSocket < Socket
-    def initialize(path, timeout=nil)
-      @path = path
-      @timeout = timeout
-      @desc = @path # for read()'s error
-      @handle = nil
-    end
-
-    def open
-      begin
-        @handle = ::UNIXSocket.new(@path)
-      rescue StandardError
-        raise TransportException.new(TransportException::NOT_OPEN, "Could not open UNIX socket at #{@path}")
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/types.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/types.rb
deleted file mode 100644
index cac5269..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/types.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-require 'set'
-
-module Thrift
-  module Types
-    STOP = 0
-    VOID = 1
-    BOOL = 2
-    BYTE = 3
-    DOUBLE = 4
-    I16 = 6
-    I32 = 8
-    I64 = 10
-    STRING = 11
-    STRUCT = 12
-    MAP = 13
-    SET = 14
-    LIST = 15
-  end
-
-  class << self
-    attr_accessor :type_checking
-  end
-
-  class TypeError < Exception
-  end
-
-  def self.check_type(value, field, name, skip_nil=true)
-    return if value.nil? and skip_nil
-    klasses = case field[:type]
-              when Types::VOID
-                NilClass
-              when Types::BOOL
-                [TrueClass, FalseClass]
-              when Types::BYTE, Types::I16, Types::I32, Types::I64
-                Integer
-              when Types::DOUBLE
-                Float
-              when Types::STRING
-                String
-              when Types::STRUCT
-                [Struct, Union]
-              when Types::MAP
-                Hash
-              when Types::SET
-                Set
-              when Types::LIST
-                Array
-              end
-    valid = klasses && [*klasses].any? { |klass| klass === value }
-    raise TypeError, "Expected #{type_name(field[:type])}, received #{value.class} for field #{name}" unless valid
-    # check elements now
-    case field[:type]
-    when Types::MAP
-      value.each_pair do |k,v|
-        check_type(k, field[:key], "#{name}.key", false)
-        check_type(v, field[:value], "#{name}.value", false)
-      end
-    when Types::SET, Types::LIST
-      value.each do |el|
-        check_type(el, field[:element], "#{name}.element", false)
-      end
-    when Types::STRUCT
-      raise TypeError, "Expected #{field[:class]}, received #{value.class} for field #{name}" unless field[:class] == value.class
-    end
-  end
-
-  def self.type_name(type)
-    Types.constants.each do |const|
-      return "Types::#{const}" if Types.const_get(const) == type
-    end
-    nil
-  end
-
-  module MessageTypes
-    CALL = 1
-    REPLY = 2
-    EXCEPTION = 3
-    ONEWAY = 4
-  end
-end
-
-Thrift.type_checking = false if Thrift.type_checking.nil?
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/union.rb b/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/union.rb
deleted file mode 100644
index 490c55c..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/lib/thrift/union.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-# 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-module Thrift
-  class Union
-    def initialize(name=nil, value=nil)
-      if name
-        if name.is_a? Hash
-          if name.size > 1
-            raise "#{self.class} cannot be instantiated with more than one field!"
-          end
-
-          name, value = name.keys.first, name.values.first
-        end
-
-        if Thrift.type_checking
-          raise Exception, "#{self.class} does not contain a field named #{name}!" unless name_to_id(name.to_s)
-        end
-
-        if value.nil?
-          raise Exception, "Union #{self.class} cannot be instantiated with setfield and nil value!"
-        end
-
-        Thrift.check_type(value, struct_fields[name_to_id(name.to_s)], name) if Thrift.type_checking
-      elsif !value.nil?
-        raise Exception, "Value provided, but no name!"
-      end
-      @setfield = name
-      @value = value
-    end
-
-    def inspect
-      if get_set_field
-        "<#{self.class} #{@setfield}: #{inspect_field(@value, struct_fields[name_to_id(@setfield.to_s)])}>"
-      else
-        "<#{self.class} >"
-      end
-    end
-
-    def read(iprot)
-      iprot.read_struct_begin
-      fname, ftype, fid = iprot.read_field_begin
-      handle_message(iprot, fid, ftype)
-      iprot.read_field_end
-
-      fname, ftype, fid = iprot.read_field_begin
-      raise "Too many fields for union" unless (ftype == Types::STOP) 
-
-      iprot.read_struct_end
-      validate
-    end
-
-    def write(oprot)
-      validate
-      oprot.write_struct_begin(self.class.name)
-
-      fid = self.name_to_id(@setfield.to_s)
-
-      field_info = struct_fields[fid]
-      type = field_info[:type]
-      if is_container? type
-        oprot.write_field_begin(@setfield, type, fid)
-        write_container(oprot, @value, field_info)
-        oprot.write_field_end
-      else
-        oprot.write_field(@setfield, type, fid, @value)
-      end
-
-      oprot.write_field_stop
-      oprot.write_struct_end
-    end
-
-    def ==(other)
-      other.equal?(self) || other.instance_of?(self.class) && @setfield == other.get_set_field && @value == other.get_value
-    end
-    alias_method :eql?, :==
-
-    def hash
-      [self.class.name, @setfield, @value].hash
-    end
-
-    def self.field_accessor(klass, field_info)
-      klass.send :define_method, field_info[:name] do
-        if field_info[:name].to_sym == @setfield
-          @value
-        else 
-          raise RuntimeError, "#{field_info[:name]} is not union's set field."
-        end
-      end
-
-      klass.send :define_method, "#{field_info[:name]}=" do |value|
-        Thrift.check_type(value, field_info, field_info[:name]) if Thrift.type_checking
-        @setfield = field_info[:name].to_sym
-        @value = value
-      end
-    end
-
-    def self.qmark_isset_method(klass, field_info)
-      klass.send :define_method, "#{field_info[:name]}?" do
-        get_set_field == field_info[:name].to_sym && !get_value.nil?
-      end
-    end
-
-    def self.generate_accessors(klass)
-      klass::FIELDS.values.each do |field_info|
-        field_accessor(klass, field_info)
-        qmark_isset_method(klass, field_info)
-      end
-    end
-
-    # get the symbol that indicates what the currently set field type is. 
-    def get_set_field
-      @setfield
-    end
-
-    # get the current value of this union, regardless of what the set field is.
-    # generally, you should only use this method when you don't know in advance
-    # what field to expect.
-    def get_value
-      @value
-    end
-
-    def <=>(other)
-      if self.class == other.class
-        if get_set_field == other.get_set_field
-          if get_set_field.nil?
-            0
-          else
-            get_value <=> other.get_value
-          end
-        else
-          if get_set_field && other.get_set_field.nil?
-            -1
-          elsif get_set_field.nil? && other.get_set_field
-            1
-          elsif get_set_field.nil? && other.get_set_field.nil?
-            0
-          else
-            name_to_id(get_set_field.to_s) <=> name_to_id(other.get_set_field.to_s)
-          end
-        end
-      else
-        self.class <=> other.class
-      end
-    end
-
-    protected
-
-    def handle_message(iprot, fid, ftype)
-      field = struct_fields[fid]
-      if field and field[:type] == ftype
-        @value = read_field(iprot, field)
-        name = field[:name].to_sym
-        @setfield = name
-      else
-        iprot.skip(ftype)
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/script/proto_benchmark.rb b/vendor/git.apache.org/thrift.git/lib/rb/script/proto_benchmark.rb
deleted file mode 100644
index bb49e2e..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/script/proto_benchmark.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require File.dirname(__FILE__) + "/../spec/spec_helper.rb"
-
-require "benchmark"
-# require "ruby-prof"
-
-obj = Fixtures::COMPACT_PROTOCOL_TEST_STRUCT
-
-HOW_MANY = 1_000
-
-binser = Thrift::Serializer.new
-bin_data = binser.serialize(obj)
-bindeser = Thrift::Deserializer.new
-accel_bin_ser = Thrift::Serializer.new(Thrift::BinaryProtocolAcceleratedFactory.new)
-accel_bin_deser = Thrift::Deserializer.new(Thrift::BinaryProtocolAcceleratedFactory.new)
-
-compact_ser = Thrift::Serializer.new(Thrift::CompactProtocolFactory.new)
-compact_data = compact_ser.serialize(obj)
-compact_deser = Thrift::Deserializer.new(Thrift::CompactProtocolFactory.new)
-
-Benchmark.bm(60) do |reporter|
-  reporter.report("binary protocol, write") do
-    HOW_MANY.times do
-      binser.serialize(obj)
-    end
-  end
-  
-  reporter.report("accelerated binary protocol, write") do
-    HOW_MANY.times do
-      accel_bin_ser.serialize(obj)
-    end
-  end
-  
-  reporter.report("compact protocol, write") do
-    # RubyProf.start
-    HOW_MANY.times do
-      compact_ser.serialize(obj)
-    end
-    # result = RubyProf.stop
-    # printer = RubyProf::GraphHtmlPrinter.new(result)
-    # file = File.open("profile.html", "w+")
-    # printer.print(file, 0)
-    # file.close
-  end
-  
-  reporter.report("binary protocol, read") do
-    HOW_MANY.times do
-      bindeser.deserialize(obj, bin_data)
-    end
-  end
-  
-  reporter.report("accelerated binary protocol, read") do
-    HOW_MANY.times do
-      accel_bin_deser.deserialize(obj, bin_data)
-    end
-  end
-  
-  reporter.report("compact protocol, read") do
-    HOW_MANY.times do
-      compact_deser.deserialize(obj, compact_data)
-    end
-  end
-
-
-  # f = File.new("/tmp/testfile", "w")
-  # proto = Thrift::BinaryProtocolAccelerated.new(Thrift::IOStreamTransport.new(Thrift::MemoryBufferTransport.new, f))
-  # reporter.report("accelerated binary protocol, write (to disk)") do
-  #   HOW_MANY.times do
-  #     obj.write(proto)
-  #   end
-  #   f.flush
-  # end
-  # f.close
-  #   
-  # f = File.new("/tmp/testfile", "r")
-  # proto = Thrift::BinaryProtocolAccelerated.new(Thrift::IOStreamTransport.new(f, Thrift::MemoryBufferTransport.new))
-  # reporter.report("accelerated binary protocol, read (from disk)") do
-  #   HOW_MANY.times do
-  #     obj.read(proto)
-  #   end
-  # end
-  # f.close
-  # 
-  # f = File.new("/tmp/testfile", "w")
-  # reporter.report("compact protocol, write (to disk)") do
-  #   proto = Thrift::CompactProtocol.new(Thrift::IOStreamTransport.new(Thrift::MemoryBufferTransport.new, f))
-  #   HOW_MANY.times do
-  #     obj.write(proto)
-  #   end
-  #   f.flush
-  # end
-  # f.close
-  # 
-  # f = File.new("/tmp/testfile", "r")
-  # reporter.report("compact protocol, read (from disk)") do
-  #   proto = Thrift::CompactProtocol.new(Thrift::IOStreamTransport.new(f, Thrift::MemoryBufferTransport.new))
-  #   HOW_MANY.times do
-  #     obj.read(proto)
-  #   end
-  # end
-  # f.close
-
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/script/read_struct.rb b/vendor/git.apache.org/thrift.git/lib/rb/script/read_struct.rb
deleted file mode 100644
index 831fcec..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/script/read_struct.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require "spec/spec_helper"
-
-path, factory_class = ARGV
-
-factory = eval(factory_class).new
-
-deser = Thrift::Deserializer.new(factory)
-
-cpts = CompactProtoTestStruct.new
-CompactProtoTestStruct.constants.each do |const|
-  cpts.instance_variable_set("@#{const}", nil)
-end
-
-data = File.read(path)
-
-deser.deserialize(cpts, data)
-
-if cpts == Fixtures::COMPACT_PROTOCOL_TEST_STRUCT
-  puts "Object verified successfully!"
-else
-  puts "Object failed verification! Expected #{Fixtures::COMPACT_PROTOCOL_TEST_STRUCT.inspect} but got #{cpts.inspect}"
-  
-  puts cpts.differences(Fixtures::COMPACT_PROTOCOL_TEST_STRUCT)
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/script/write_struct.rb b/vendor/git.apache.org/thrift.git/lib/rb/script/write_struct.rb
deleted file mode 100644
index da14219..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/script/write_struct.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require "spec/spec_helper"
-
-path, factory_class = ARGV
-
-factory = eval(factory_class).new
-
-ser = Thrift::Serializer.new(factory)
-
-File.open(path, "w") do |file|
-  file.write(ser.serialize(Fixtures::COMPACT_PROTOCOL_TEST_STRUCT))
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/BaseService.thrift b/vendor/git.apache.org/thrift.git/lib/rb/spec/BaseService.thrift
deleted file mode 100644
index 5c7d32a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/BaseService.thrift
+++ /dev/null
@@ -1,27 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-namespace rb Base
-
-struct Hello {
-  1: string greeting = "hello world"
-}
-
-service BaseService {
-  Hello greeting(1:bool english)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/ExtendedService.thrift b/vendor/git.apache.org/thrift.git/lib/rb/spec/ExtendedService.thrift
deleted file mode 100644
index 1a6b705..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/ExtendedService.thrift
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-namespace rb Extended
-
-include "BaseService.thrift"
-
-service ExtendedService extends BaseService.BaseService {
-  void ping()
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/Referenced.thrift b/vendor/git.apache.org/thrift.git/lib/rb/spec/Referenced.thrift
deleted file mode 100644
index 98f183f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/Referenced.thrift
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-namespace rb OtherNamespace
-
-enum SomeEnum {
-  ONE
-  TWO
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/ThriftNamespacedSpec.thrift b/vendor/git.apache.org/thrift.git/lib/rb/spec/ThriftNamespacedSpec.thrift
deleted file mode 100644
index 02f2889..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/ThriftNamespacedSpec.thrift
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-namespace rb NamespacedSpecNamespace
-
-include "Referenced.thrift"
-
-struct Hello {
-  1: string greeting = "hello world"
-}
-
-service NamespacedNonblockingService {
-  Hello greeting(1:bool english)
-  bool block()
-  oneway void unblock(1:i32 n)
-  oneway void shutdown()
-  void sleep(1:double seconds)
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/ThriftSpec.thrift b/vendor/git.apache.org/thrift.git/lib/rb/spec/ThriftSpec.thrift
deleted file mode 100644
index b42481b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/ThriftSpec.thrift
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-namespace rb SpecNamespace
-
-struct Hello {
-  1: string greeting = "hello world"
-}
-
-enum SomeEnum {
-  ONE
-  TWO
-}
-
-struct StructWithSomeEnum {
-  1: SomeEnum some_enum;
-}
-
-union TestUnion {
-  /**
-   * A doc string
-   */
-  1: string string_field;
-  2: i32 i32_field;
-  3: i32 other_i32_field;
-  4: SomeEnum enum_field;
-  5: binary binary_field;
-}
-
-struct Foo {
-  1: i32 simple = 53,
-  2: string words = "words",
-  3: Hello hello = {'greeting' : "hello, world!"},
-  4: list<i32> ints = [1, 2, 2, 3],
-  5: map<i32, map<string, double>> complex,
-  6: set<i16> shorts = [5, 17, 239],
-  7: optional string opt_string
-  8: bool my_bool
-}
-
-struct Foo2 {
-  1: binary my_binary
-}
-
-struct BoolStruct {
-  1: bool yesno = 1
-}
-
-struct SimpleList {
-  1: list<bool> bools,
-  2: list<byte> bytes,
-  3: list<i16> i16s,
-  4: list<i32> i32s,
-  5: list<i64> i64s,
-  6: list<double> doubles,
-  7: list<string> strings,
-  8: list<map<i16, i16>> maps,
-  9: list<list<i16>> lists,
-  10: list<set<i16>> sets,
-  11: list<Hello> hellos
-}
-
-exception Xception {
-  1: string message,
-  2: i32 code = 1
-}
-
-service NonblockingService {
-  Hello greeting(1:bool english)
-  bool block()
-  oneway void unblock(1:i32 n)
-  oneway void shutdown()
-  void sleep(1:double seconds)
-}
-
-union My_union {
-  1: bool im_true,
-  2: byte a_bite,
-  3: i16 integer16,
-  4: i32 integer32,
-  5: i64 integer64,
-  6: double double_precision,
-  7: string some_characters,
-  8: i32 other_i32
-  9: SomeEnum some_enum;
-  10: map<SomeEnum, list<SomeEnum>> my_map;
-}
-
-struct Struct_with_union {
-  1: My_union fun_union
-  2: i32 integer32
-  3: string some_characters
-}
-
-struct StructWithEnumMap {
-  1: map<SomeEnum, list<SomeEnum>> my_map;
-}
-
-# Nested lists
-struct NestedListInList {
-  1: list<list<byte>> value
-}
-
-struct NestedListInSet {
-  1: set<list<byte>> value
-}
-
-struct NestedListInMapKey {
-  1: map<list<byte>, byte> value
-}
-
-struct NestedListInMapValue {
-  1: map<byte, list<byte>> value
-}
-
-# Nested sets
-struct NestedSetInList {
-  1: list<set<byte>> value
-}
-
-struct NestedSetInSet {
-  1: set<set<byte>> value
-}
-
-struct NestedSetInMapKey {
-  1: map<set<byte>, byte> value
-}
-
-struct NestedSetInMapValue {
-  1: map<byte, set<byte>> value
-}
-
-# Nested maps
-struct NestedMapInList {
-  1: list<map<byte, byte>> value
-}
-
-struct NestedMapInSet {
-  1: set<map<byte, byte>> value
-}
-
-struct NestedMapInMapKey {
-  2: map<map<byte, byte>, byte> value
-}
-
-struct NestedMapInMapValue {
-  2: map<byte, map<byte, byte>> value
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/base_protocol_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/base_protocol_spec.rb
deleted file mode 100644
index ec50c48..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/base_protocol_spec.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'BaseProtocol' do
-
-  before(:each) do
-    @trans = mock("MockTransport")
-    @prot = Thrift::BaseProtocol.new(@trans)
-  end
-
-  describe Thrift::BaseProtocol do
-    # most of the methods are stubs, so we can ignore them
-
-    it "should make trans accessible" do
-      @prot.trans.should eql(@trans)
-    end
-
-    it 'should write out a field nicely (deprecated write_field signature)' do
-      @prot.should_receive(:write_field_begin).with('field', 'type', 'fid').ordered
-      @prot.should_receive(:write_type).with({:name => 'field', :type => 'type'}, 'value').ordered
-      @prot.should_receive(:write_field_end).ordered
-      @prot.write_field('field', 'type', 'fid', 'value')
-    end
-
-    it 'should write out a field nicely' do
-      @prot.should_receive(:write_field_begin).with('field', 'type', 'fid').ordered
-      @prot.should_receive(:write_type).with({:name => 'field', :type => 'type', :binary => false}, 'value').ordered
-      @prot.should_receive(:write_field_end).ordered
-      @prot.write_field({:name => 'field', :type => 'type', :binary => false}, 'fid', 'value')
-    end
-
-    it 'should write out the different types (deprecated write_type signature)' do
-      @prot.should_receive(:write_bool).with('bool').ordered
-      @prot.should_receive(:write_byte).with('byte').ordered
-      @prot.should_receive(:write_double).with('double').ordered
-      @prot.should_receive(:write_i16).with('i16').ordered
-      @prot.should_receive(:write_i32).with('i32').ordered
-      @prot.should_receive(:write_i64).with('i64').ordered
-      @prot.should_receive(:write_string).with('string').ordered
-      struct = mock('Struct')
-      struct.should_receive(:write).with(@prot).ordered
-      @prot.write_type(Thrift::Types::BOOL, 'bool')
-      @prot.write_type(Thrift::Types::BYTE, 'byte')
-      @prot.write_type(Thrift::Types::DOUBLE, 'double')
-      @prot.write_type(Thrift::Types::I16, 'i16')
-      @prot.write_type(Thrift::Types::I32, 'i32')
-      @prot.write_type(Thrift::Types::I64, 'i64')
-      @prot.write_type(Thrift::Types::STRING, 'string')
-      @prot.write_type(Thrift::Types::STRUCT, struct)
-      # all other types are not implemented
-      [Thrift::Types::STOP, Thrift::Types::VOID, Thrift::Types::MAP, Thrift::Types::SET, Thrift::Types::LIST].each do |type|
-        expect { @prot.write_type(type, type.to_s) }.to raise_error(NotImplementedError)
-      end
-    end
-
-    it 'should write out the different types' do
-      @prot.should_receive(:write_bool).with('bool').ordered
-      @prot.should_receive(:write_byte).with('byte').ordered
-      @prot.should_receive(:write_double).with('double').ordered
-      @prot.should_receive(:write_i16).with('i16').ordered
-      @prot.should_receive(:write_i32).with('i32').ordered
-      @prot.should_receive(:write_i64).with('i64').ordered
-      @prot.should_receive(:write_string).with('string').ordered
-      @prot.should_receive(:write_binary).with('binary').ordered
-      struct = mock('Struct')
-      struct.should_receive(:write).with(@prot).ordered
-      @prot.write_type({:type => Thrift::Types::BOOL}, 'bool')
-      @prot.write_type({:type => Thrift::Types::BYTE}, 'byte')
-      @prot.write_type({:type => Thrift::Types::DOUBLE}, 'double')
-      @prot.write_type({:type => Thrift::Types::I16}, 'i16')
-      @prot.write_type({:type => Thrift::Types::I32}, 'i32')
-      @prot.write_type({:type => Thrift::Types::I64}, 'i64')
-      @prot.write_type({:type => Thrift::Types::STRING}, 'string')
-      @prot.write_type({:type => Thrift::Types::STRING, :binary => true}, 'binary')
-      @prot.write_type({:type => Thrift::Types::STRUCT}, struct)
-      # all other types are not implemented
-      [Thrift::Types::STOP, Thrift::Types::VOID, Thrift::Types::MAP, Thrift::Types::SET, Thrift::Types::LIST].each do |type|
-        expect { @prot.write_type({:type => type}, type.to_s) }.to raise_error(NotImplementedError)
-      end
-    end
-
-    it 'should read the different types (deprecated read_type signature)' do
-      @prot.should_receive(:read_bool).ordered
-      @prot.should_receive(:read_byte).ordered
-      @prot.should_receive(:read_i16).ordered
-      @prot.should_receive(:read_i32).ordered
-      @prot.should_receive(:read_i64).ordered
-      @prot.should_receive(:read_double).ordered
-      @prot.should_receive(:read_string).ordered
-      @prot.read_type(Thrift::Types::BOOL)
-      @prot.read_type(Thrift::Types::BYTE)
-      @prot.read_type(Thrift::Types::I16)
-      @prot.read_type(Thrift::Types::I32)
-      @prot.read_type(Thrift::Types::I64)
-      @prot.read_type(Thrift::Types::DOUBLE)
-      @prot.read_type(Thrift::Types::STRING)
-      # all other types are not implemented
-      [Thrift::Types::STOP, Thrift::Types::VOID, Thrift::Types::MAP,
-       Thrift::Types::SET, Thrift::Types::LIST, Thrift::Types::STRUCT].each do |type|
-        expect { @prot.read_type(type) }.to raise_error(NotImplementedError)
-      end
-    end
-
-    it 'should read the different types' do
-      @prot.should_receive(:read_bool).ordered
-      @prot.should_receive(:read_byte).ordered
-      @prot.should_receive(:read_i16).ordered
-      @prot.should_receive(:read_i32).ordered
-      @prot.should_receive(:read_i64).ordered
-      @prot.should_receive(:read_double).ordered
-      @prot.should_receive(:read_string).ordered
-      @prot.should_receive(:read_binary).ordered
-      @prot.read_type({:type => Thrift::Types::BOOL})
-      @prot.read_type({:type => Thrift::Types::BYTE})
-      @prot.read_type({:type => Thrift::Types::I16})
-      @prot.read_type({:type => Thrift::Types::I32})
-      @prot.read_type({:type => Thrift::Types::I64})
-      @prot.read_type({:type => Thrift::Types::DOUBLE})
-      @prot.read_type({:type => Thrift::Types::STRING})
-      @prot.read_type({:type => Thrift::Types::STRING, :binary => true})
-      # all other types are not implemented
-      [Thrift::Types::STOP, Thrift::Types::VOID, Thrift::Types::MAP,
-       Thrift::Types::SET, Thrift::Types::LIST, Thrift::Types::STRUCT].each do |type|
-        expect { @prot.read_type({:type => type}) }.to raise_error(NotImplementedError)
-      end
-    end
-
-    it "should skip the basic types" do
-      @prot.should_receive(:read_bool).ordered
-      @prot.should_receive(:read_byte).ordered
-      @prot.should_receive(:read_i16).ordered
-      @prot.should_receive(:read_i32).ordered
-      @prot.should_receive(:read_i64).ordered
-      @prot.should_receive(:read_double).ordered
-      @prot.should_receive(:read_string).ordered
-      @prot.skip(Thrift::Types::BOOL)
-      @prot.skip(Thrift::Types::BYTE)
-      @prot.skip(Thrift::Types::I16)
-      @prot.skip(Thrift::Types::I32)
-      @prot.skip(Thrift::Types::I64)
-      @prot.skip(Thrift::Types::DOUBLE)
-      @prot.skip(Thrift::Types::STRING)
-      @prot.skip(Thrift::Types::STOP) # should do absolutely nothing
-    end
-
-    it "should skip structs" do
-      real_skip = @prot.method(:skip)
-      @prot.should_receive(:read_struct_begin).ordered
-      @prot.should_receive(:read_field_begin).exactly(4).times.and_return(
-        ['field 1', Thrift::Types::STRING, 1],
-        ['field 2', Thrift::Types::I32, 2],
-        ['field 3', Thrift::Types::MAP, 3],
-        [nil, Thrift::Types::STOP, 0]
-      )
-      @prot.should_receive(:read_field_end).exactly(3).times
-      @prot.should_receive(:read_string).exactly(3).times
-      @prot.should_receive(:read_i32).ordered
-      @prot.should_receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRING, 1])
-      # @prot.should_receive(:read_string).exactly(2).times
-      @prot.should_receive(:read_map_end).ordered
-      @prot.should_receive(:read_struct_end).ordered
-      real_skip.call(Thrift::Types::STRUCT)
-    end
-
-    it "should skip maps" do
-      real_skip = @prot.method(:skip)
-      @prot.should_receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRUCT, 1])
-      @prot.should_receive(:read_string).ordered
-      @prot.should_receive(:read_struct_begin).ordered.and_return(["some_struct"])
-      @prot.should_receive(:read_field_begin).ordered.and_return([nil, Thrift::Types::STOP, nil]);
-      @prot.should_receive(:read_struct_end).ordered
-      @prot.should_receive(:read_map_end).ordered
-      real_skip.call(Thrift::Types::MAP)
-    end
-
-    it "should skip sets" do
-      real_skip = @prot.method(:skip)
-      @prot.should_receive(:read_set_begin).ordered.and_return([Thrift::Types::I64, 9])
-      @prot.should_receive(:read_i64).ordered.exactly(9).times
-      @prot.should_receive(:read_set_end)
-      real_skip.call(Thrift::Types::SET)
-    end
-
-    it "should skip lists" do
-      real_skip = @prot.method(:skip)
-      @prot.should_receive(:read_list_begin).ordered.and_return([Thrift::Types::DOUBLE, 11])
-      @prot.should_receive(:read_double).ordered.exactly(11).times
-      @prot.should_receive(:read_list_end)
-      real_skip.call(Thrift::Types::LIST)
-    end
-  end
-
-  describe Thrift::BaseProtocolFactory do
-    it "should raise NotImplementedError" do
-      # returning nil since Protocol is just an abstract class
-      lambda {Thrift::BaseProtocolFactory.new.get_protocol(mock("MockTransport"))}.should raise_error(NotImplementedError)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/base_transport_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/base_transport_spec.rb
deleted file mode 100644
index 4196572..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/base_transport_spec.rb
+++ /dev/null
@@ -1,350 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'BaseTransport' do
-
-  describe Thrift::TransportException do
-    it "should make type accessible" do
-      exc = Thrift::TransportException.new(Thrift::TransportException::ALREADY_OPEN, "msg")
-      exc.type.should == Thrift::TransportException::ALREADY_OPEN
-      exc.message.should == "msg"
-    end
-  end
-
-  describe Thrift::BaseTransport do
-    it "should read the specified size" do
-      transport = Thrift::BaseTransport.new
-      transport.should_receive(:read).with(40).ordered.and_return("10 letters")
-      transport.should_receive(:read).with(30).ordered.and_return("fifteen letters")
-      transport.should_receive(:read).with(15).ordered.and_return("more characters")
-      transport.read_all(40).should == "10 lettersfifteen lettersmore characters"
-    end
-
-    it "should stub out the rest of the methods" do
-      # can't test for stubbiness, so just make sure they're defined
-      [:open?, :open, :close, :read, :write, :flush].each do |sym|
-        Thrift::BaseTransport.method_defined?(sym).should be_true
-      end
-    end
-
-    it "should alias << to write" do
-      Thrift::BaseTransport.instance_method(:<<).should == Thrift::BaseTransport.instance_method(:write)
-    end
-  end
-
-  describe Thrift::BaseServerTransport do
-    it "should stub out its methods" do
-      [:listen, :accept, :close].each do |sym|
-        Thrift::BaseServerTransport.method_defined?(sym).should be_true
-      end
-    end
-  end
-
-  describe Thrift::BaseTransportFactory do
-    it "should return the transport it's given" do
-      transport = mock("Transport")
-      Thrift::BaseTransportFactory.new.get_transport(transport).should eql(transport)
-    end
-  end
-
-  describe Thrift::BufferedTransport do
-    it "should pass through everything but write/flush/read" do
-      trans = mock("Transport")
-      trans.should_receive(:open?).ordered.and_return("+ open?")
-      trans.should_receive(:open).ordered.and_return("+ open")
-      trans.should_receive(:flush).ordered # from the close
-      trans.should_receive(:close).ordered.and_return("+ close")
-      btrans = Thrift::BufferedTransport.new(trans)
-      btrans.open?.should == "+ open?"
-      btrans.open.should == "+ open"
-      btrans.close.should == "+ close"
-    end
-
-    it "should buffer reads in chunks of #{Thrift::BufferedTransport::DEFAULT_BUFFER}" do
-      trans = mock("Transport")
-      trans.should_receive(:read).with(Thrift::BufferedTransport::DEFAULT_BUFFER).and_return("lorum ipsum dolor emet")
-      btrans = Thrift::BufferedTransport.new(trans)
-      btrans.read(6).should == "lorum "
-      btrans.read(6).should == "ipsum "
-      btrans.read(6).should == "dolor "
-      btrans.read(6).should == "emet"
-    end
-
-    it "should buffer writes and send them on flush" do
-      trans = mock("Transport")
-      btrans = Thrift::BufferedTransport.new(trans)
-      btrans.write("one/")
-      btrans.write("two/")
-      btrans.write("three/")
-      trans.should_receive(:write).with("one/two/three/").ordered
-      trans.should_receive(:flush).ordered
-      btrans.flush
-    end
-
-    it "should only send buffered data once" do
-      trans = mock("Transport")
-      btrans = Thrift::BufferedTransport.new(trans)
-      btrans.write("one/")
-      btrans.write("two/")
-      btrans.write("three/")
-      trans.should_receive(:write).with("one/two/three/")
-      trans.stub!(:flush)
-      btrans.flush
-      # Nothing to flush with no data
-      btrans.flush
-    end
-
-    it "should flush on close" do
-      trans = mock("Transport")
-      trans.should_receive(:close)
-      btrans = Thrift::BufferedTransport.new(trans)
-      btrans.should_receive(:flush)
-      btrans.close
-    end
-
-    it "should not write to socket if there's no data" do
-      trans = mock("Transport")
-      trans.should_receive(:flush)
-      btrans = Thrift::BufferedTransport.new(trans)
-      btrans.flush
-    end
-  end
-
-  describe Thrift::BufferedTransportFactory do
-    it "should wrap the given transport in a BufferedTransport" do
-      trans = mock("Transport")
-      btrans = mock("BufferedTransport")
-      Thrift::BufferedTransport.should_receive(:new).with(trans).and_return(btrans)
-      Thrift::BufferedTransportFactory.new.get_transport(trans).should == btrans
-    end
-  end
-
-  describe Thrift::FramedTransport do
-    before(:each) do
-      @trans = mock("Transport")
-    end
-
-    it "should pass through open?/open/close" do
-      ftrans = Thrift::FramedTransport.new(@trans)
-      @trans.should_receive(:open?).ordered.and_return("+ open?")
-      @trans.should_receive(:open).ordered.and_return("+ open")
-      @trans.should_receive(:close).ordered.and_return("+ close")
-      ftrans.open?.should == "+ open?"
-      ftrans.open.should == "+ open"
-      ftrans.close.should == "+ close"
-    end
-
-    it "should pass through read when read is turned off" do
-      ftrans = Thrift::FramedTransport.new(@trans, false, true)
-      @trans.should_receive(:read).with(17).ordered.and_return("+ read")
-      ftrans.read(17).should == "+ read"
-    end
-
-    it "should pass through write/flush when write is turned off" do
-      ftrans = Thrift::FramedTransport.new(@trans, true, false)
-      @trans.should_receive(:write).with("foo").ordered.and_return("+ write")
-      @trans.should_receive(:flush).ordered.and_return("+ flush")
-      ftrans.write("foo").should == "+ write"
-      ftrans.flush.should == "+ flush"
-    end
-
-    it "should return a full frame if asked for >= the frame's length" do
-      frame = "this is a frame"
-      @trans.should_receive(:read_all).with(4).and_return("\000\000\000\017")
-      @trans.should_receive(:read_all).with(frame.length).and_return(frame)
-      Thrift::FramedTransport.new(@trans).read(frame.length + 10).should == frame
-    end
-
-    it "should return slices of the frame when asked for < the frame's length" do
-      frame = "this is a frame"
-      @trans.should_receive(:read_all).with(4).and_return("\000\000\000\017")
-      @trans.should_receive(:read_all).with(frame.length).and_return(frame)
-      ftrans = Thrift::FramedTransport.new(@trans)
-      ftrans.read(4).should == "this"
-      ftrans.read(4).should == " is "
-      ftrans.read(16).should == "a frame"
-    end
-
-    it "should return nothing if asked for <= 0" do
-      Thrift::FramedTransport.new(@trans).read(-2).should == ""
-    end
-
-    it "should pull a new frame when the first is exhausted" do
-      frame = "this is a frame"
-      frame2 = "yet another frame"
-      @trans.should_receive(:read_all).with(4).and_return("\000\000\000\017", "\000\000\000\021")
-      @trans.should_receive(:read_all).with(frame.length).and_return(frame)
-      @trans.should_receive(:read_all).with(frame2.length).and_return(frame2)
-      ftrans = Thrift::FramedTransport.new(@trans)
-      ftrans.read(4).should == "this"
-      ftrans.read(8).should == " is a fr"
-      ftrans.read(6).should == "ame"
-      ftrans.read(4).should == "yet "
-      ftrans.read(16).should == "another frame"
-    end
-
-    it "should buffer writes" do
-      ftrans = Thrift::FramedTransport.new(@trans)
-      @trans.should_not_receive(:write)
-      ftrans.write("foo")
-      ftrans.write("bar")
-      ftrans.write("this is a frame")
-    end
-
-    it "should write slices of the buffer" do
-      ftrans = Thrift::FramedTransport.new(@trans)
-      ftrans.write("foobar", 3)
-      ftrans.write("barfoo", 1)
-      @trans.stub!(:flush)
-      @trans.should_receive(:write).with("\000\000\000\004foob")
-      ftrans.flush
-    end
-
-    it "should flush frames with a 4-byte header" do
-      ftrans = Thrift::FramedTransport.new(@trans)
-      @trans.should_receive(:write).with("\000\000\000\035one/two/three/this is a frame").ordered
-      @trans.should_receive(:flush).ordered
-      ftrans.write("one/")
-      ftrans.write("two/")
-      ftrans.write("three/")
-      ftrans.write("this is a frame")
-      ftrans.flush
-    end
-
-    it "should not flush the same buffered data twice" do
-      ftrans = Thrift::FramedTransport.new(@trans)
-      @trans.should_receive(:write).with("\000\000\000\007foo/bar")
-      @trans.stub!(:flush)
-      ftrans.write("foo")
-      ftrans.write("/bar")
-      ftrans.flush
-      @trans.should_receive(:write).with("\000\000\000\000")
-      ftrans.flush
-    end
-  end
-
-  describe Thrift::FramedTransportFactory do
-    it "should wrap the given transport in a FramedTransport" do
-      trans = mock("Transport")
-      Thrift::FramedTransport.should_receive(:new).with(trans)
-      Thrift::FramedTransportFactory.new.get_transport(trans)
-    end
-  end
-
-  describe Thrift::MemoryBufferTransport do
-    before(:each) do
-      @buffer = Thrift::MemoryBufferTransport.new
-    end
-
-    it "should accept a buffer on input and use it directly" do
-      s = "this is a test"
-      @buffer = Thrift::MemoryBufferTransport.new(s)
-      @buffer.read(4).should == "this"
-      s.slice!(-4..-1)
-      @buffer.read(@buffer.available).should == " is a "
-    end
-
-    it "should always remain open" do
-      @buffer.should be_open
-      @buffer.close
-      @buffer.should be_open
-    end
-
-    it "should respond to peek and available" do
-      @buffer.write "some data"
-      @buffer.peek.should be_true
-      @buffer.available.should == 9
-      @buffer.read(4)
-      @buffer.peek.should be_true
-      @buffer.available.should == 5
-      @buffer.read(5)
-      @buffer.peek.should be_false
-      @buffer.available.should == 0
-    end
-
-    it "should be able to reset the buffer" do
-      @buffer.write "test data"
-      @buffer.reset_buffer("foobar")
-      @buffer.available.should == 6
-      @buffer.read(@buffer.available).should == "foobar"
-      @buffer.reset_buffer
-      @buffer.available.should == 0
-    end
-
-    it "should copy the given string when resetting the buffer" do
-      s = "this is a test"
-      @buffer.reset_buffer(s)
-      @buffer.available.should == 14
-      @buffer.read(10)
-      @buffer.available.should == 4
-      s.should == "this is a test"
-    end
-
-    it "should return from read what was given in write" do
-      @buffer.write "test data"
-      @buffer.read(4).should == "test"
-      @buffer.read(@buffer.available).should == " data"
-      @buffer.write "foo"
-      @buffer.write " bar"
-      @buffer.read(@buffer.available).should == "foo bar"
-    end
-
-    it "should throw an EOFError when there isn't enough data in the buffer" do
-      @buffer.reset_buffer("")
-      lambda{@buffer.read(1)}.should raise_error(EOFError)
-
-      @buffer.reset_buffer("1234")
-      lambda{@buffer.read(5)}.should raise_error(EOFError)
-    end
-  end
-
-  describe Thrift::IOStreamTransport do
-    before(:each) do
-      @input = mock("Input", :closed? => false)
-      @output = mock("Output", :closed? => false)
-      @trans = Thrift::IOStreamTransport.new(@input, @output)
-    end
-
-    it "should be open as long as both input or output are open" do
-      @trans.should be_open
-      @input.stub!(:closed?).and_return(true)
-      @trans.should be_open
-      @input.stub!(:closed?).and_return(false)
-      @output.stub!(:closed?).and_return(true)
-      @trans.should be_open
-      @input.stub!(:closed?).and_return(true)
-      @trans.should_not be_open
-    end
-
-    it "should pass through read/write to input/output" do
-      @input.should_receive(:read).with(17).and_return("+ read")
-      @output.should_receive(:write).with("foobar").and_return("+ write")
-      @trans.read(17).should == "+ read"
-      @trans.write("foobar").should == "+ write"
-    end
-
-    it "should close both input and output when closed" do
-      @input.should_receive(:close)
-      @output.should_receive(:close)
-      @trans.close
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_accelerated_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_accelerated_spec.rb
deleted file mode 100644
index bac9ea7..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_accelerated_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-require File.expand_path("#{File.dirname(__FILE__)}/binary_protocol_spec_shared")
-
-if defined? Thrift::BinaryProtocolAccelerated
-
-  describe 'BinaryProtocolAccelerated' do
-    # since BinaryProtocolAccelerated should be directly equivalent to
-    # BinaryProtocol, we don't need any custom specs!
-    it_should_behave_like 'a binary protocol'
-
-    def protocol_class
-      Thrift::BinaryProtocolAccelerated
-    end
-
-    describe Thrift::BinaryProtocolAcceleratedFactory do
-      it "should create a BinaryProtocolAccelerated" do
-        Thrift::BinaryProtocolAcceleratedFactory.new.get_protocol(mock("MockTransport")).should be_instance_of(Thrift::BinaryProtocolAccelerated)
-      end
-    end
-  end
-else
-  puts "skipping BinaryProtocolAccelerated spec because it is not defined."
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_spec.rb
deleted file mode 100644
index 32772d3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-require File.expand_path("#{File.dirname(__FILE__)}/binary_protocol_spec_shared")
-
-describe 'BinaryProtocol' do
-
-  it_should_behave_like 'a binary protocol'
-
-  def protocol_class
-    Thrift::BinaryProtocol
-  end
-
-  describe Thrift::BinaryProtocol do
-
-    before(:each) do
-      @trans = Thrift::MemoryBufferTransport.new
-      @prot = protocol_class.new(@trans)
-    end
-
-    it "should read a message header" do
-      @trans.write([protocol_class.const_get(:VERSION_1) | Thrift::MessageTypes::REPLY].pack('N'))
-      @trans.write([42].pack('N'))
-      @prot.should_receive(:read_string).and_return('testMessage')
-      @prot.read_message_begin.should == ['testMessage', Thrift::MessageTypes::REPLY, 42]
-    end
-
-    it "should raise an exception if the message header has the wrong version" do
-      @prot.should_receive(:read_i32).and_return(-1)
-      lambda { @prot.read_message_begin }.should raise_error(Thrift::ProtocolException, 'Missing version identifier') do |e|
-        e.type == Thrift::ProtocolException::BAD_VERSION
-      end
-    end
-
-    it "should raise an exception if the message header does not exist and strict_read is enabled" do
-      @prot.should_receive(:read_i32).and_return(42)
-      @prot.should_receive(:strict_read).and_return(true)
-      lambda { @prot.read_message_begin }.should raise_error(Thrift::ProtocolException, 'No version identifier, old protocol client?') do |e|
-        e.type == Thrift::ProtocolException::BAD_VERSION
-      end
-    end
-  end
-
-  describe Thrift::BinaryProtocolFactory do
-    it "should create a BinaryProtocol" do
-      Thrift::BinaryProtocolFactory.new.get_protocol(mock("MockTransport")).should be_instance_of(Thrift::BinaryProtocol)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_spec_shared.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_spec_shared.rb
deleted file mode 100644
index 7a9d028..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/binary_protocol_spec_shared.rb
+++ /dev/null
@@ -1,455 +0,0 @@
-# encoding: ascii-8bit
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-shared_examples_for 'a binary protocol' do
-  before(:each) do
-    @trans = Thrift::MemoryBufferTransport.new
-    @prot = protocol_class.new(@trans)
-  end
-
-  it "should define the proper VERSION_1, VERSION_MASK AND TYPE_MASK" do
-    protocol_class.const_get(:VERSION_MASK).should == 0xffff0000
-    protocol_class.const_get(:VERSION_1).should == 0x80010000
-    protocol_class.const_get(:TYPE_MASK).should == 0x000000ff
-  end
-
-  it "should make strict_read readable" do
-    @prot.strict_read.should eql(true)
-  end
-
-  it "should make strict_write readable" do
-    @prot.strict_write.should eql(true)
-  end    
-
-  it "should write the message header" do
-    @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
-    @trans.read(@trans.available).should == [protocol_class.const_get(:VERSION_1) | Thrift::MessageTypes::CALL, "testMessage".size, "testMessage", 17].pack("NNa11N")
-  end
-  
-  it "should write the message header without version when writes are not strict" do
-    @prot = protocol_class.new(@trans, true, false) # no strict write
-    @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
-    @trans.read(@trans.available).should == "\000\000\000\vtestMessage\001\000\000\000\021"
-  end
-  
-  it "should write the message header with a version when writes are strict" do
-    @prot = protocol_class.new(@trans) # strict write
-    @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
-    @trans.read(@trans.available).should == "\200\001\000\001\000\000\000\vtestMessage\000\000\000\021"
-  end
-  
-
-  # message footer is a noop
-
-  it "should write the field header" do
-    @prot.write_field_begin('foo', Thrift::Types::DOUBLE, 3)
-    @trans.read(@trans.available).should == [Thrift::Types::DOUBLE, 3].pack("cn")
-  end
-  
-  # field footer is a noop
-  
-  it "should write the STOP field" do
-    @prot.write_field_stop
-    @trans.read(1).should == "\000"
-  end
-  
-  it "should write the map header" do
-    @prot.write_map_begin(Thrift::Types::STRING, Thrift::Types::LIST, 17)
-    @trans.read(@trans.available).should == [Thrift::Types::STRING, Thrift::Types::LIST, 17].pack("ccN");
-  end
-   
-  # map footer is a noop
-  
-  it "should write the list header" do
-    @prot.write_list_begin(Thrift::Types::I16, 42)
-    @trans.read(@trans.available).should == [Thrift::Types::I16, 42].pack("cN")
-  end
-  
-  # list footer is a noop
-  
-  it "should write the set header" do
-    @prot.write_set_begin(Thrift::Types::I16, 42)
-    @trans.read(@trans.available).should == [Thrift::Types::I16, 42].pack("cN")
-  end
-  
-  it "should write a bool" do
-    @prot.write_bool(true)
-    @prot.write_bool(false)
-    @trans.read(@trans.available).should == "\001\000"
-  end
-  
-  it "should treat a nil bool as false" do
-    @prot.write_bool(nil)
-    @trans.read(1).should == "\000"
-  end
-  
-  it "should write a byte" do
-    # byte is small enough, let's check -128..127
-    (-128..127).each do |i|
-      @prot.write_byte(i)
-      @trans.read(1).should == [i].pack('c')
-    end
-    # handing it numbers out of signed range should clip
-    @trans.rspec_verify
-    (128..255).each do |i|
-      @prot.write_byte(i)
-      @trans.read(1).should == [i].pack('c')
-    end
-    # and lastly, a Bignum is going to error out
-    lambda { @prot.write_byte(2**65) }.should raise_error(RangeError)
-  end
-  
-  it "should error gracefully when trying to write a nil byte" do
-    lambda { @prot.write_byte(nil) }.should raise_error
-  end
-  
-  it "should write an i16" do
-    # try a random scattering of values
-    # include the signed i16 minimum/maximum
-    [-2**15, -1024, 17, 0, -10000, 1723, 2**15-1].each do |i|
-      @prot.write_i16(i)
-    end
-    # and try something out of signed range, it should clip
-    @prot.write_i16(2**15 + 5)
-    
-    @trans.read(@trans.available).should == "\200\000\374\000\000\021\000\000\330\360\006\273\177\377\200\005"
-    
-    # a Bignum should error
-    # lambda { @prot.write_i16(2**65) }.should raise_error(RangeError)
-  end
-  
-  it "should error gracefully when trying to write a nil i16" do
-    lambda { @prot.write_i16(nil) }.should raise_error
-  end
-  
-  it "should write an i32" do
-    # try a random scattering of values
-    # include the signed i32 minimum/maximum
-    [-2**31, -123123, -2532, -3, 0, 2351235, 12331, 2**31-1].each do |i|
-      @prot.write_i32(i)
-    end
-    # try something out of signed range, it should clip
-    @trans.read(@trans.available).should == "\200\000\000\000" + "\377\376\037\r" + "\377\377\366\034" + "\377\377\377\375" + "\000\000\000\000" + "\000#\340\203" + "\000\0000+" + "\177\377\377\377"
-    [2 ** 31 + 5, 2 ** 65 + 5].each do |i|
-      lambda { @prot.write_i32(i) }.should raise_error(RangeError)  
-    end
-  end
-  
-  it "should error gracefully when trying to write a nil i32" do
-    lambda { @prot.write_i32(nil) }.should raise_error
-  end
-  
-  it "should write an i64" do
-    # try a random scattering of values
-    # try the signed i64 minimum/maximum
-    [-2**63, -12356123612323, -23512351, -234, 0, 1231, 2351236, 12361236213, 2**63-1].each do |i|
-      @prot.write_i64(i)
-    end
-    # try something out of signed range, it should clip
-    @trans.read(@trans.available).should == ["\200\000\000\000\000\000\000\000",
-      "\377\377\364\303\035\244+]",
-      "\377\377\377\377\376\231:\341",
-      "\377\377\377\377\377\377\377\026",
-      "\000\000\000\000\000\000\000\000",
-      "\000\000\000\000\000\000\004\317",
-      "\000\000\000\000\000#\340\204",
-      "\000\000\000\002\340\311~\365",
-      "\177\377\377\377\377\377\377\377"].join("")
-    lambda { @prot.write_i64(2 ** 65 + 5) }.should raise_error(RangeError)
-  end
-  
-  it "should error gracefully when trying to write a nil i64" do
-    lambda { @prot.write_i64(nil) }.should raise_error
-  end
-  
-  it "should write a double" do
-    # try a random scattering of values, including min/max
-    values = [Float::MIN,-1231.15325, -123123.23, -23.23515123, 0, 12351.1325, 523.23, Float::MAX]
-    values.each do |f|
-      @prot.write_double(f)
-      @trans.read(@trans.available).should == [f].pack("G")
-    end
-  end
-  
-  it "should error gracefully when trying to write a nil double" do
-    lambda { @prot.write_double(nil) }.should raise_error
-  end
-
-  if RUBY_VERSION >= '1.9'
-    it 'should write a string' do
-      str = 'abc'
-      @prot.write_string(str)
-      a = @trans.read(@trans.available)
-      a.encoding.should == Encoding::BINARY
-      a.unpack('C*').should == [0x00, 0x00, 0x00, 0x03, 0x61, 0x62, 0x63]
-    end
-
-    it 'should write a string with unicode characters' do
-      str = "abc \u20AC \u20AD".encode('UTF-8')
-      @prot.write_string(str)
-      a = @trans.read(@trans.available)
-      a.encoding.should == Encoding::BINARY
-      a.unpack('C*').should == [0x00, 0x00, 0x00, 0x0B, 0x61, 0x62, 0x63, 0x20,
-                                0xE2, 0x82, 0xAC, 0x20, 0xE2, 0x82, 0xAD]
-    end
-
-    it 'should write should write a string with unicode characters and transcoding' do
-      str = "abc \u20AC".encode('ISO-8859-15')
-      @prot.write_string(str)
-      a = @trans.read(@trans.available)
-      a.encoding.should == Encoding::BINARY
-      a.unpack('C*').should == [0x00, 0x00, 0x00, 0x07, 0x61, 0x62, 0x63, 0x20, 0xE2, 0x82, 0xAC]
-    end
-
-    it 'should write a binary string' do
-      buffer = [0, 1, 2, 3].pack('C*')
-      @prot.write_binary(buffer)
-      a = @trans.read(@trans.available)
-      a.encoding.should == Encoding::BINARY
-      a.unpack('C*').should == [0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x02, 0x03]
-    end
-  else
-    it 'should write a string' do
-      str = 'abc'
-      @prot.write_string(str)
-      a = @trans.read(@trans.available)
-      a.unpack('C*').should == [0x00, 0x00, 0x00, 0x03, 0x61, 0x62, 0x63]
-    end
-
-    it 'should write a binary string' do
-      buffer = [0, 1, 2, 3].pack('C*')
-      @prot.write_binary(buffer)
-      a = @trans.read(@trans.available)
-      a.unpack('C*').should == [0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x02, 0x03]
-    end
-  end
-
-  it "should error gracefully when trying to write a nil string" do
-    lambda { @prot.write_string(nil) }.should raise_error
-  end
-  
-  it "should write the message header without version when writes are not strict" do
-    @prot = protocol_class.new(@trans, true, false) # no strict write
-    @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
-    @trans.read(@trans.available).should == "\000\000\000\vtestMessage\001\000\000\000\021"
-  end
-    
-  it "should write the message header with a version when writes are strict" do
-    @prot = protocol_class.new(@trans) # strict write
-    @prot.write_message_begin('testMessage', Thrift::MessageTypes::CALL, 17)
-    @trans.read(@trans.available).should == "\200\001\000\001\000\000\000\vtestMessage\000\000\000\021"
-  end
-  
-  # message footer is a noop
-  
-  it "should read a field header" do
-    @trans.write([Thrift::Types::STRING, 3].pack("cn"))
-    @prot.read_field_begin.should == [nil, Thrift::Types::STRING, 3]
-  end
-  
-  # field footer is a noop
-  
-  it "should read a stop field" do
-    @trans.write([Thrift::Types::STOP].pack("c"));
-    @prot.read_field_begin.should == [nil, Thrift::Types::STOP, 0]
-  end
-
-  it "should read a map header" do
-    @trans.write([Thrift::Types::DOUBLE, Thrift::Types::I64, 42].pack("ccN"))
-    @prot.read_map_begin.should == [Thrift::Types::DOUBLE, Thrift::Types::I64, 42]
-  end
-  
-  # map footer is a noop
-  
-  it "should read a list header" do
-    @trans.write([Thrift::Types::STRING, 17].pack("cN"))
-    @prot.read_list_begin.should == [Thrift::Types::STRING, 17]
-  end
-  
-  # list footer is a noop
-  
-  it "should read a set header" do
-    @trans.write([Thrift::Types::STRING, 17].pack("cN"))
-    @prot.read_set_begin.should == [Thrift::Types::STRING, 17]
-  end
-  
-  # set footer is a noop
-  
-  it "should read a bool" do
-    @trans.write("\001\000");
-    @prot.read_bool.should == true
-    @prot.read_bool.should == false
-  end
-  
-  it "should read a byte" do
-    [-128, -57, -3, 0, 17, 24, 127].each do |i|
-      @trans.write([i].pack("c"))
-      @prot.read_byte.should == i
-    end
-  end
-  
-  it "should read an i16" do
-    # try a scattering of values, including min/max
-    [-2**15, -5237, -353, 0, 1527, 2234, 2**15-1].each do |i|
-      @trans.write([i].pack("n"));
-      @prot.read_i16.should == i
-    end
-  end
-  
-  it "should read an i32" do
-    # try a scattering of values, including min/max
-    [-2**31, -235125, -6236, 0, 2351, 123123, 2**31-1].each do |i|
-      @trans.write([i].pack("N"))
-      @prot.read_i32.should == i
-    end
-  end
-  
-  it "should read an i64" do
-    # try a scattering of values, including min/max
-    [-2**63, -123512312, -6346, 0, 32, 2346322323, 2**63-1].each do |i|
-      @trans.write([i >> 32, i & 0xFFFFFFFF].pack("NN"))
-      @prot.read_i64.should == i
-    end
-  end
-  
-  it "should read a double" do
-    # try a random scattering of values, including min/max
-    [Float::MIN, -231231.12351, -323.233513, 0, 123.2351235, 2351235.12351235, Float::MAX].each do |f|
-      @trans.write([f].pack("G"));
-      @prot.read_double.should == f
-    end
-  end
-
-  if RUBY_VERSION >= '1.9'
-    it 'should read a string' do
-      # i32 of value 3, followed by three characters/UTF-8 bytes 'a', 'b', 'c'
-      buffer = [0x00, 0x00, 0x00, 0x03, 0x61, 0x62, 0x63].pack('C*')
-      @trans.write(buffer)
-      a = @prot.read_string
-      a.should == 'abc'.encode('UTF-8')
-      a.encoding.should == Encoding::UTF_8
-    end
-
-    it 'should read a string containing unicode characters from UTF-8 encoded buffer' do
-      # i32 of value 3, followed by one character U+20AC made up of three bytes
-      buffer = [0x00, 0x00, 0x00, 0x03, 0xE2, 0x82, 0xAC].pack('C*')
-      @trans.write(buffer)
-      a = @prot.read_string
-      a.should == "\u20AC".encode('UTF-8')
-      a.encoding.should == Encoding::UTF_8
-    end
-
-    it 'should read a binary string' do
-      buffer = [0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x02, 0x03].pack('C*')
-      @trans.write(buffer)
-      a = @prot.read_binary
-      a.should == [0x00, 0x01, 0x02, 0x03].pack('C*')
-      a.encoding.should == Encoding::BINARY
-    end
-  else
-    it 'should read a string' do
-      # i32 of value 3, followed by three characters/UTF-8 bytes 'a', 'b', 'c'
-      buffer = [0x00, 0x00, 0x00, 0x03, 0x61, 0x62, 0x63].pack('C*')
-      @trans.write(buffer)
-      @prot.read_string.should == 'abc'
-    end
-
-    it 'should read a binary string' do
-      buffer = [0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x02, 0x03].pack('C*')
-      @trans.write(buffer)
-      a = @prot.read_binary
-      a.should == [0x00, 0x01, 0x02, 0x03].pack('C*')
-    end
-  end
-
-  it "should perform a complete rpc with no args or return" do
-    srv_test(
-      proc {|client| client.send_voidMethod()},
-      proc {|client| client.recv_voidMethod.should == nil}
-    )
-  end
-
-  it "should perform a complete rpc with a primitive return type" do
-    srv_test(
-      proc {|client| client.send_primitiveMethod()},
-      proc {|client| client.recv_primitiveMethod.should == 1}
-    )
-  end
-
-  it "should perform a complete rpc with a struct return type" do
-    srv_test(
-      proc {|client| client.send_structMethod()},
-      proc {|client|
-        result = client.recv_structMethod
-        result.set_byte_map = nil
-        result.map_byte_map = nil
-        result.should == Fixtures::COMPACT_PROTOCOL_TEST_STRUCT
-      }
-    )
-  end
-
-  def get_socket_connection
-    server = Thrift::ServerSocket.new("localhost", 9090)
-    server.listen
-    
-    clientside = Thrift::Socket.new("localhost", 9090)
-    clientside.open
-    serverside = server.accept
-    [clientside, serverside, server]
-  end
-
-  def srv_test(firstblock, secondblock)
-    clientside, serverside, server = get_socket_connection
-
-    clientproto = protocol_class.new(clientside)
-    serverproto = protocol_class.new(serverside)
-
-    processor = Thrift::Test::Srv::Processor.new(SrvHandler.new)
-
-    client = Thrift::Test::Srv::Client.new(clientproto, clientproto)
-
-    # first block
-    firstblock.call(client)
-
-    processor.process(serverproto, serverproto)
-
-    # second block
-    secondblock.call(client)
-  ensure
-    clientside.close
-    serverside.close
-    server.close
-  end
-
-  class SrvHandler 
-    def voidMethod()
-    end
-    
-    def primitiveMethod
-      1
-    end
-    
-    def structMethod
-      Fixtures::COMPACT_PROTOCOL_TEST_STRUCT
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/bytes_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/bytes_spec.rb
deleted file mode 100644
index b82e304..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/bytes_spec.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-# encoding: UTF-8
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe Thrift::Bytes do
-  if RUBY_VERSION >= '1.9'
-    describe '.empty_byte_buffer' do
-      it 'should create an empty buffer' do
-        b = Thrift::Bytes.empty_byte_buffer
-        b.length.should == 0
-        b.encoding.should == Encoding::BINARY
-      end
-
-      it 'should create an empty buffer of given size' do
-        b = Thrift::Bytes.empty_byte_buffer 2
-        b.length.should == 2
-        b.getbyte(0).should == 0
-        b.getbyte(1).should == 0
-        b.encoding.should == Encoding::BINARY
-      end
-    end
-
-    describe '.force_binary_encoding' do
-      it 'should change encoding' do
-        e = 'STRING'.encode('UTF-8')
-        e.encoding.should_not == Encoding::BINARY
-        a = Thrift::Bytes.force_binary_encoding e
-        a.encoding.should == Encoding::BINARY
-      end
-    end
-
-    describe '.get_string_byte' do
-      it 'should get the byte at index' do
-        s = "\x41\x42"
-        Thrift::Bytes.get_string_byte(s, 0).should == 0x41
-        Thrift::Bytes.get_string_byte(s, 1).should == 0x42
-      end
-    end
-
-    describe '.set_string_byte' do
-      it 'should set byte value at index' do
-        s = "\x41\x42"
-        Thrift::Bytes.set_string_byte(s, 0, 0x43)
-        s.getbyte(0).should == 0x43
-        s.should == 'CB'
-      end
-    end
-
-    describe '.convert_to_utf8_byte_buffer' do
-      it 'should convert UTF-8 String to byte buffer' do
-        e = "\u20AC".encode('UTF-8') # a string with euro sign character U+20AC
-        e.length.should == 1
-
-        a = Thrift::Bytes.convert_to_utf8_byte_buffer e
-        a.encoding.should == Encoding::BINARY
-        a.length.should == 3
-        a.unpack('C*').should == [0xE2, 0x82, 0xAC]
-      end
-
-      it 'should convert ISO-8859-15 String to UTF-8 byte buffer' do
-        # Assumptions
-        e = "\u20AC".encode('ISO-8859-15') # a string with euro sign character U+20AC, then converted to ISO-8859-15
-        e.length.should == 1
-        e.unpack('C*').should == [0xA4] # euro sign is a different code point in ISO-8859-15
-
-        a = Thrift::Bytes.convert_to_utf8_byte_buffer e
-        a.encoding.should == Encoding::BINARY
-        a.length.should == 3
-        a.unpack('C*').should == [0xE2, 0x82, 0xAC]
-      end
-    end
-
-    describe '.convert_to_string' do
-      it 'should convert UTF-8 byte buffer to a UTF-8 String' do
-        e = [0xE2, 0x82, 0xAC].pack("C*")
-        e.encoding.should == Encoding::BINARY
-        a = Thrift::Bytes.convert_to_string e
-        a.encoding.should == Encoding::UTF_8
-        a.should == "\u20AC"
-      end
-    end
-
-  else # RUBY_VERSION
-    describe '.empty_byte_buffer' do
-      it 'should create an empty buffer' do
-        b = Thrift::Bytes.empty_byte_buffer
-        b.length.should == 0
-      end
-
-      it 'should create an empty buffer of given size' do
-        b = Thrift::Bytes.empty_byte_buffer 2
-        b.length.should == 2
-        b[0].should == 0
-        b[1].should == 0
-      end
-    end
-
-    describe '.force_binary_encoding' do
-      it 'should be a no-op' do
-        e = 'STRING'
-        a = Thrift::Bytes.force_binary_encoding e
-        a.should == e
-        a.should be(e)
-      end
-    end
-
-    describe '.get_string_byte' do
-      it 'should get the byte at index' do
-        s = "\x41\x42"
-        Thrift::Bytes.get_string_byte(s, 0).should == 0x41
-        Thrift::Bytes.get_string_byte(s, 1).should == 0x42
-      end
-    end
-
-    describe '.set_string_byte' do
-      it 'should set byte value at index' do
-        s = "\x41\x42"
-        Thrift::Bytes.set_string_byte(s, 0, 0x43)
-        s[0].should == 0x43
-        s.should == 'CB'
-      end
-    end
-
-    describe '.convert_to_utf8_byte_buffer' do
-      it 'should be a no-op' do
-        e = 'STRING'
-        a = Thrift::Bytes.convert_to_utf8_byte_buffer e
-        a.should == e
-        a.should be(e)
-      end
-    end
-
-    describe '.convert_to_string' do
-      it 'should be a no-op' do
-        e = 'STRING'
-        a = Thrift::Bytes.convert_to_string e
-        a.should == e
-        a.should be(e)
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/client_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/client_spec.rb
deleted file mode 100644
index f8ffe8a..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/client_spec.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'Client' do
-
-  class ClientSpec
-    include Thrift::Client
-  end
-
-  before(:each) do
-    @prot = mock("MockProtocol")
-    @client = ClientSpec.new(@prot)
-  end
-
-  describe Thrift::Client do
-    it "should re-use iprot for oprot if not otherwise specified" do
-      @client.instance_variable_get(:'@iprot').should eql(@prot)
-      @client.instance_variable_get(:'@oprot').should eql(@prot)
-    end
-
-    it "should send a test message" do
-      @prot.should_receive(:write_message_begin).with('testMessage', Thrift::MessageTypes::CALL, 0)
-      mock_args = mock('#<TestMessage_args:mock>')
-      mock_args.should_receive(:foo=).with('foo')
-      mock_args.should_receive(:bar=).with(42)
-      mock_args.should_receive(:write).with(@prot)
-      @prot.should_receive(:write_message_end)
-      @prot.should_receive(:trans) do
-        mock('trans').tap do |trans|
-          trans.should_receive(:flush)
-        end
-      end
-      klass = stub("TestMessage_args", :new => mock_args)
-      @client.send_message('testMessage', klass, :foo => 'foo', :bar => 42)
-    end
-
-    it "should increment the sequence id when sending messages" do
-      pending "it seems sequence ids are completely ignored right now" do
-        @prot.should_receive(:write_message_begin).with('testMessage',  Thrift::MessageTypes::CALL, 0).ordered
-        @prot.should_receive(:write_message_begin).with('testMessage2', Thrift::MessageTypes::CALL, 1).ordered
-        @prot.should_receive(:write_message_begin).with('testMessage3', Thrift::MessageTypes::CALL, 2).ordered
-        @prot.stub!(:write_message_end)
-        @prot.stub!(:trans).and_return mock("trans").as_null_object
-        @client.send_message('testMessage', mock("args class").as_null_object)
-        @client.send_message('testMessage2', mock("args class").as_null_object)
-        @client.send_message('testMessage3', mock("args class").as_null_object)
-      end
-    end
-
-    it "should receive a test message" do
-      @prot.should_receive(:read_message_begin).and_return [nil, Thrift::MessageTypes::CALL, 0]
-      @prot.should_receive(:read_message_end)
-      mock_klass = mock("#<MockClass:mock>")
-      mock_klass.should_receive(:read).with(@prot)
-      @client.receive_message(stub("MockClass", :new => mock_klass))
-    end
-
-    it "should handle received exceptions" do
-      @prot.should_receive(:read_message_begin).and_return [nil, Thrift::MessageTypes::EXCEPTION, 0]
-      @prot.should_receive(:read_message_end)
-      Thrift::ApplicationException.should_receive(:new).and_return do
-        StandardError.new.tap do |mock_exc|
-          mock_exc.should_receive(:read).with(@prot)
-        end
-      end
-      lambda { @client.receive_message(nil) }.should raise_error(StandardError)
-    end
-
-    it "should close the transport if an error occurs while sending a message" do
-      @prot.stub!(:write_message_begin)
-      @prot.should_not_receive(:write_message_end)
-      mock_args = mock("#<TestMessage_args:mock>")
-      mock_args.should_receive(:write).with(@prot).and_raise(StandardError)
-      trans = mock("MockTransport")
-      @prot.stub!(:trans).and_return(trans)
-      trans.should_receive(:close)
-      klass = mock("TestMessage_args", :new => mock_args)
-      lambda { @client.send_message("testMessage", klass) }.should raise_error(StandardError)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/compact_protocol_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/compact_protocol_spec.rb
deleted file mode 100644
index 8a1a228..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/compact_protocol_spec.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-# encoding: UTF-8
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe Thrift::CompactProtocol do
-  TESTS = {
-    :byte => (-127..127).to_a,
-    :i16 => (0..14).map {|shift| [1 << shift, -(1 << shift)]}.flatten.sort,
-    :i32 => (0..30).map {|shift| [1 << shift, -(1 << shift)]}.flatten.sort,
-    :i64 => (0..62).map {|shift| [1 << shift, -(1 << shift)]}.flatten.sort,
-    :string => ["", "1", "short", "fourteen123456", "fifteen12345678", "unicode characters: \u20AC \u20AD", "1" * 127, "1" * 3000],
-    :binary => ["", "\001", "\001" * 5, "\001" * 14, "\001" * 15, "\001" * 127, "\001" * 3000],
-    :double => [0.0, 1.0, -1.0, 1.1, -1.1, 10000000.1, 1.0/0.0, -1.0/0.0],
-    :bool => [true, false]
-  }
-  
-  it "should encode and decode naked primitives correctly" do
-    TESTS.each_pair do |primitive_type, test_values|
-      test_values.each do |value|
-        # puts "testing #{value}" if primitive_type == :i64
-        trans = Thrift::MemoryBufferTransport.new
-        proto = Thrift::CompactProtocol.new(trans)
-        
-        proto.send(writer(primitive_type), value)
-        # puts "buf: #{trans.inspect_buffer}" if primitive_type == :i64
-        read_back = proto.send(reader(primitive_type))
-        read_back.should == value
-      end
-    end
-  end
-  
-  it "should encode and decode primitives in fields correctly" do
-    TESTS.each_pair do |primitive_type, test_values|
-      final_primitive_type = primitive_type == :binary ? :string : primitive_type
-      thrift_type = Thrift::Types.const_get(final_primitive_type.to_s.upcase)
-      # puts primitive_type
-      test_values.each do |value|
-        trans = Thrift::MemoryBufferTransport.new
-        proto = Thrift::CompactProtocol.new(trans)
-
-        proto.write_field_begin(nil, thrift_type, 15)
-        proto.send(writer(primitive_type), value)
-        proto.write_field_end
-
-        proto = Thrift::CompactProtocol.new(trans)
-        name, type, id = proto.read_field_begin
-        type.should == thrift_type
-        id.should == 15
-        read_back = proto.send(reader(primitive_type))
-        read_back.should == value
-        proto.read_field_end
-      end
-    end
-  end
-
-  it "should encode and decode a monster struct correctly" do
-    trans = Thrift::MemoryBufferTransport.new
-    proto = Thrift::CompactProtocol.new(trans)
-
-    struct = Thrift::Test::CompactProtoTestStruct.new
-    # sets and maps don't hash well... not sure what to do here.
-    struct.write(proto)
-
-    struct2 = Thrift::Test::CompactProtoTestStruct.new
-    struct2.read(proto)    
-    struct2.should == struct
-  end
-
-  it "should make method calls correctly" do
-    client_out_trans = Thrift::MemoryBufferTransport.new
-    client_out_proto = Thrift::CompactProtocol.new(client_out_trans)
-
-    client_in_trans = Thrift::MemoryBufferTransport.new
-    client_in_proto = Thrift::CompactProtocol.new(client_in_trans)
-
-    processor = Thrift::Test::Srv::Processor.new(JankyHandler.new)
-
-    client = Thrift::Test::Srv::Client.new(client_in_proto, client_out_proto)
-    client.send_Janky(1)
-    # puts client_out_trans.inspect_buffer
-    processor.process(client_out_proto, client_in_proto)
-    client.recv_Janky.should == 2
-  end
-  
-  it "should deal with fields following fields that have non-delta ids" do
-    brcp = Thrift::Test::BreaksRubyCompactProtocol.new(
-      :field1 => "blah", 
-      :field2 => Thrift::Test::BigFieldIdStruct.new(
-        :field1 => "string1", 
-        :field2 => "string2"), 
-      :field3 => 3)
-    ser = Thrift::Serializer.new(Thrift::CompactProtocolFactory.new)
-    bytes = ser.serialize(brcp)
-
-    deser = Thrift::Deserializer.new(Thrift::CompactProtocolFactory.new)
-    brcp2 = Thrift::Test::BreaksRubyCompactProtocol.new
-    deser.deserialize(brcp2, bytes)
-    brcp2.should == brcp
-  end
-  
-  it "should deserialize an empty map to an empty hash" do
-    struct = Thrift::Test::SingleMapTestStruct.new(:i32_map => {})
-    ser = Thrift::Serializer.new(Thrift::CompactProtocolFactory.new)
-    bytes = ser.serialize(struct)
-
-    deser = Thrift::Deserializer.new(Thrift::CompactProtocolFactory.new)
-    struct2 = Thrift::Test::SingleMapTestStruct.new
-    deser.deserialize(struct2, bytes)
-    struct.should == struct2
-  end
-  
-  class JankyHandler
-    def Janky(i32arg)
-      i32arg * 2
-    end
-  end
-  
-  def writer(sym)
-    "write_#{sym.to_s}"
-  end
-  
-  def reader(sym)
-    "read_#{sym.to_s}"
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/exception_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/exception_spec.rb
deleted file mode 100644
index d1da621..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/exception_spec.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'Exception' do
-
-  describe Thrift::Exception do
-    it "should have an accessible message" do
-      e = Thrift::Exception.new("test message")
-      e.message.should == "test message"
-    end
-  end
-
-  describe Thrift::ApplicationException do
-    it "should inherit from Thrift::Exception" do
-      Thrift::ApplicationException.superclass.should == Thrift::Exception
-    end
-
-    it "should have an accessible type and message" do
-      e = Thrift::ApplicationException.new
-      e.type.should == Thrift::ApplicationException::UNKNOWN
-      e.message.should be_nil
-      e = Thrift::ApplicationException.new(Thrift::ApplicationException::UNKNOWN_METHOD, "test message")
-      e.type.should == Thrift::ApplicationException::UNKNOWN_METHOD
-      e.message.should == "test message"
-    end
-
-    it "should read a struct off of a protocol" do
-      prot = mock("MockProtocol")
-      prot.should_receive(:read_struct_begin).ordered
-      prot.should_receive(:read_field_begin).exactly(3).times.and_return(
-        ["message", Thrift::Types::STRING, 1],
-        ["type", Thrift::Types::I32, 2],
-        [nil, Thrift::Types::STOP, 0]
-      )
-      prot.should_receive(:read_string).ordered.and_return "test message"
-      prot.should_receive(:read_i32).ordered.and_return Thrift::ApplicationException::BAD_SEQUENCE_ID
-      prot.should_receive(:read_field_end).exactly(2).times
-      prot.should_receive(:read_struct_end).ordered
-
-      e = Thrift::ApplicationException.new
-      e.read(prot)
-      e.message.should == "test message"
-      e.type.should == Thrift::ApplicationException::BAD_SEQUENCE_ID
-    end
-
-    it "should skip bad fields when reading a struct" do
-      prot = mock("MockProtocol")
-      prot.should_receive(:read_struct_begin).ordered
-      prot.should_receive(:read_field_begin).exactly(5).times.and_return(
-        ["type", Thrift::Types::I32, 2],
-        ["type", Thrift::Types::STRING, 2],
-        ["message", Thrift::Types::MAP, 1],
-        ["message", Thrift::Types::STRING, 3],
-        [nil, Thrift::Types::STOP, 0]
-      )
-      prot.should_receive(:read_i32).and_return Thrift::ApplicationException::INVALID_MESSAGE_TYPE
-      prot.should_receive(:skip).with(Thrift::Types::STRING).twice
-      prot.should_receive(:skip).with(Thrift::Types::MAP)
-      prot.should_receive(:read_field_end).exactly(4).times
-      prot.should_receive(:read_struct_end).ordered
-
-      e = Thrift::ApplicationException.new
-      e.read(prot)
-      e.message.should be_nil
-      e.type.should == Thrift::ApplicationException::INVALID_MESSAGE_TYPE
-    end
-
-    it "should write a Thrift::ApplicationException struct to the oprot" do
-      prot = mock("MockProtocol")
-      prot.should_receive(:write_struct_begin).with("Thrift::ApplicationException").ordered
-      prot.should_receive(:write_field_begin).with("message", Thrift::Types::STRING, 1).ordered
-      prot.should_receive(:write_string).with("test message").ordered
-      prot.should_receive(:write_field_begin).with("type", Thrift::Types::I32, 2).ordered
-      prot.should_receive(:write_i32).with(Thrift::ApplicationException::UNKNOWN_METHOD).ordered
-      prot.should_receive(:write_field_end).twice
-      prot.should_receive(:write_field_stop).ordered
-      prot.should_receive(:write_struct_end).ordered
-
-      e = Thrift::ApplicationException.new(Thrift::ApplicationException::UNKNOWN_METHOD, "test message")
-      e.write(prot)
-    end
-
-    it "should skip nil fields when writing to the oprot" do
-      prot = mock("MockProtocol")
-      prot.should_receive(:write_struct_begin).with("Thrift::ApplicationException").ordered
-      prot.should_receive(:write_field_begin).with("message", Thrift::Types::STRING, 1).ordered
-      prot.should_receive(:write_string).with("test message").ordered
-      prot.should_receive(:write_field_end).ordered
-      prot.should_receive(:write_field_stop).ordered
-      prot.should_receive(:write_struct_end).ordered
-
-      e = Thrift::ApplicationException.new(nil, "test message")
-      e.write(prot)
-
-      prot = mock("MockProtocol")
-      prot.should_receive(:write_struct_begin).with("Thrift::ApplicationException").ordered
-      prot.should_receive(:write_field_begin).with("type", Thrift::Types::I32, 2).ordered
-      prot.should_receive(:write_i32).with(Thrift::ApplicationException::BAD_SEQUENCE_ID).ordered
-      prot.should_receive(:write_field_end).ordered
-      prot.should_receive(:write_field_stop).ordered
-      prot.should_receive(:write_struct_end).ordered
-
-      e = Thrift::ApplicationException.new(Thrift::ApplicationException::BAD_SEQUENCE_ID)
-      e.write(prot)
-
-      prot = mock("MockProtocol")
-      prot.should_receive(:write_struct_begin).with("Thrift::ApplicationException").ordered
-      prot.should_receive(:write_field_stop).ordered
-      prot.should_receive(:write_struct_end).ordered
-
-      e = Thrift::ApplicationException.new(nil)
-      e.write(prot)
-    end
-  end
-
-  describe Thrift::ProtocolException do
-    it "should have an accessible type" do
-      prot = Thrift::ProtocolException.new(Thrift::ProtocolException::SIZE_LIMIT, "message")
-      prot.type.should == Thrift::ProtocolException::SIZE_LIMIT
-      prot.message.should == "message"
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/flat_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/flat_spec.rb
deleted file mode 100644
index f378782..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/flat_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'generation' do
-  before do
-    require 'namespaced_nonblocking_service'
-  end
-
-  it "did not generate the wrong files" do
-    prefix = File.expand_path("../gen-rb/flat", __FILE__)
-    ["namespaced_spec_namespace/namespaced_nonblocking_service.rb",
-     "namespaced_spec_namespace/thrift_namespaced_spec_constants.rb",
-     "namespaced_spec_namespace/thrift_namespaced_spec_types.rb",
-     "other_namespace/referenced_constants.rb",
-     "other_namespace/referenced_types.rb"
-    ].each do |name|
-      File.exist?(File.join(prefix, name)).should_not be_true
-    end
-  end
-
-  it "generated the right files" do
-    prefix = File.expand_path("../gen-rb/flat", __FILE__)
-    ["namespaced_nonblocking_service.rb",
-     "thrift_namespaced_spec_constants.rb",
-     "thrift_namespaced_spec_types.rb",
-     "referenced_constants.rb",
-     "referenced_types.rb"
-    ].each do |name|
-      File.exist?(File.join(prefix, name)).should be_true
-    end
-  end
-
-  it "has a service class in the right place" do
-    defined?(NamespacedSpecNamespace::NamespacedNonblockingService).should be_true
-  end
-
-  it "has a struct in the right place" do
-    defined?(NamespacedSpecNamespace::Hello).should be_true
-  end
-
-  it "required an included file" do
-    defined?(OtherNamespace::SomeEnum).should be_true
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/http_client_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/http_client_spec.rb
deleted file mode 100644
index 5e8da24..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/http_client_spec.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'Thrift::HTTPClientTransport' do
-
-  describe Thrift::HTTPClientTransport do
-    before(:each) do
-      @client = Thrift::HTTPClientTransport.new("http://my.domain.com/path/to/service?param=value")
-    end
-
-    it "should always be open" do
-      @client.should be_open
-      @client.close
-      @client.should be_open
-    end
-
-    it "should post via HTTP and return the results" do
-      @client.write "a test"
-      @client.write " frame"
-      Net::HTTP.should_receive(:new).with("my.domain.com", 80).and_return do
-        mock("Net::HTTP").tap do |http|
-          http.should_receive(:use_ssl=).with(false)
-          http.should_receive(:post).with("/path/to/service?param=value", "a test frame", {"Content-Type"=>"application/x-thrift"}).and_return do
-            mock("Net::HTTPOK").tap do |response|
-              response.should_receive(:body).and_return "data"
-            end
-          end
-        end
-      end
-      @client.flush
-      @client.read(10).should == "data"
-    end
-
-    it "should send custom headers if defined" do
-      @client.write "test"
-      custom_headers = {"Cookie" => "Foo"}
-      headers = {"Content-Type"=>"application/x-thrift"}.merge(custom_headers)
-
-      @client.add_headers(custom_headers)
-      Net::HTTP.should_receive(:new).with("my.domain.com", 80).and_return do
-        mock("Net::HTTP").tap do |http|
-          http.should_receive(:use_ssl=).with(false)
-          http.should_receive(:post).with("/path/to/service?param=value", "test", headers).and_return do
-            mock("Net::HTTPOK").tap do |response|
-              response.should_receive(:body).and_return "data"
-            end
-          end
-        end
-      end
-      @client.flush
-    end
-
-    it 'should reset the outbuf on HTTP failures' do
-      @client.write "test"
-
-      Net::HTTP.should_receive(:new).with("my.domain.com", 80).and_return do
-        mock("Net::HTTP").tap do |http|
-          http.should_receive(:use_ssl=).with(false)
-          http.should_receive(:post).with("/path/to/service?param=value", "test", {"Content-Type"=>"application/x-thrift"}) { raise Net::ReadTimeout }
-        end
-      end
-
-      @client.flush  rescue
-      @client.instance_variable_get(:@outbuf).should eq(Thrift::Bytes.empty_byte_buffer)
-    end
-
-  end
-
-  describe 'ssl enabled' do
-    before(:each) do
-      @service_path = "/path/to/service?param=value"
-      @server_uri = "https://my.domain.com"
-    end
-
-    it "should use SSL for https" do
-      client = Thrift::HTTPClientTransport.new("#{@server_uri}#{@service_path}")
-
-      client.write "test"
-
-      Net::HTTP.should_receive(:new).with("my.domain.com", 443).and_return do
-        mock("Net::HTTP").tap do |http|
-          http.should_receive(:use_ssl=).with(true)
-          http.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
-          http.should_receive(:post).with(@service_path, "test",
-              "Content-Type" => "application/x-thrift").and_return do
-            mock("Net::HTTPOK").tap do |response|
-              response.should_receive(:body).and_return "data"
-            end
-          end
-        end
-      end
-      client.flush
-      client.read(4).should == "data"
-    end
-
-    it "should set SSL verify mode when specified" do
-      client = Thrift::HTTPClientTransport.new("#{@server_uri}#{@service_path}",
-          :ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE)
-
-      client.write "test"
-      Net::HTTP.should_receive(:new).with("my.domain.com", 443).and_return do
-        mock("Net::HTTP").tap do |http|
-          http.should_receive(:use_ssl=).with(true)
-          http.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
-          http.should_receive(:post).with(@service_path, "test",
-              "Content-Type" => "application/x-thrift").and_return do
-            mock("Net::HTTPOK").tap do |response|
-              response.should_receive(:body).and_return "data"
-            end
-          end
-        end
-      end
-      client.flush
-      client.read(4).should == "data"
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/json_protocol_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/json_protocol_spec.rb
deleted file mode 100644
index b6b46bf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/json_protocol_spec.rb
+++ /dev/null
@@ -1,544 +0,0 @@
-# encoding: UTF-8
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'JsonProtocol' do
-
-  describe Thrift::JsonProtocol do
-    before(:each) do
-      @trans = Thrift::MemoryBufferTransport.new
-      @prot = Thrift::JsonProtocol.new(@trans)
-    end
-
-    it "should write json escaped char" do
-      @prot.write_json_escape_char("\n")
-      @trans.read(@trans.available).should == '\u000a'
-
-      @prot.write_json_escape_char(" ")
-      @trans.read(@trans.available).should == '\u0020'
-    end
-
-    it "should write json char" do
-      @prot.write_json_char("\n")
-      @trans.read(@trans.available).should == '\\n'
-
-      @prot.write_json_char(" ")
-      @trans.read(@trans.available).should == ' '
-
-      @prot.write_json_char("\\")
-      @trans.read(@trans.available).should == "\\\\"
-
-      @prot.write_json_char("@")
-      @trans.read(@trans.available).should == '@'
-    end
-
-    it "should write json string" do
-      @prot.write_json_string("this is a \\ json\nstring")
-      @trans.read(@trans.available).should == "\"this is a \\\\ json\\nstring\""
-    end
-
-    it "should write json base64" do
-      @prot.write_json_base64("this is a base64 string")
-      @trans.read(@trans.available).should == "\"dGhpcyBpcyBhIGJhc2U2NCBzdHJpbmc=\""
-    end
-
-    it "should write json integer" do
-      @prot.write_json_integer(45)
-      @trans.read(@trans.available).should == "45"
-
-      @prot.write_json_integer(33000)
-      @trans.read(@trans.available).should == "33000"
-
-      @prot.write_json_integer(3000000000)
-      @trans.read(@trans.available).should == "3000000000"
-
-      @prot.write_json_integer(6000000000)
-      @trans.read(@trans.available).should == "6000000000"
-    end
-
-    it "should write json double" do
-      @prot.write_json_double(12.3)
-      @trans.read(@trans.available).should == "12.3"
-
-      @prot.write_json_double(-3.21)
-      @trans.read(@trans.available).should == "-3.21"
-
-      @prot.write_json_double(((+1.0/0.0)/(+1.0/0.0)))
-      @trans.read(@trans.available).should == "\"NaN\""
-
-      @prot.write_json_double((+1.0/0.0))
-      @trans.read(@trans.available).should == "\"Infinity\""
-
-      @prot.write_json_double((-1.0/0.0))
-      @trans.read(@trans.available).should == "\"-Infinity\""
-    end
-
-    it "should write json object start" do
-      @prot.write_json_object_start
-      @trans.read(@trans.available).should == "{"
-    end
-
-    it "should write json object end" do
-      @prot.write_json_object_end
-      @trans.read(@trans.available).should == "}"
-    end
-
-    it "should write json array start" do
-      @prot.write_json_array_start
-      @trans.read(@trans.available).should == "["
-    end
-
-    it "should write json array end" do
-      @prot.write_json_array_end
-      @trans.read(@trans.available).should == "]"
-    end
-
-    it "should write message begin" do
-      @prot.write_message_begin("name", 12, 32)
-      @trans.read(@trans.available).should == "[1,\"name\",12,32"
-    end
-
-    it "should write message end" do
-      @prot.write_message_end
-      @trans.read(@trans.available).should == "]"
-    end
-
-    it "should write struct begin" do
-      @prot.write_struct_begin("name")
-      @trans.read(@trans.available).should == "{"
-    end
-
-    it "should write struct end" do
-      @prot.write_struct_end
-      @trans.read(@trans.available).should == "}"
-    end
-
-    it "should write field begin" do
-      @prot.write_field_begin("name", Thrift::Types::STRUCT, 32)
-      @trans.read(@trans.available).should == "32{\"rec\""
-    end
-
-    it "should write field end" do
-      @prot.write_field_end
-      @trans.read(@trans.available).should == "}"
-    end
-
-    it "should write field stop" do
-      @prot.write_field_stop
-      @trans.read(@trans.available).should == ""
-    end
-
-    it "should write map begin" do
-      @prot.write_map_begin(Thrift::Types::STRUCT, Thrift::Types::LIST, 32)
-      @trans.read(@trans.available).should == "[\"rec\",\"lst\",32,{"
-    end
-
-    it "should write map end" do
-      @prot.write_map_end
-      @trans.read(@trans.available).should == "}]"
-    end
-
-    it "should write list begin" do
-      @prot.write_list_begin(Thrift::Types::STRUCT, 32)
-      @trans.read(@trans.available).should == "[\"rec\",32"
-    end
-
-    it "should write list end" do
-      @prot.write_list_end
-      @trans.read(@trans.available).should == "]"
-    end
-
-    it "should write set begin" do
-      @prot.write_set_begin(Thrift::Types::STRUCT, 32)
-      @trans.read(@trans.available).should == "[\"rec\",32"
-    end
-
-    it "should write set end" do
-      @prot.write_set_end
-      @trans.read(@trans.available).should == "]"
-    end
-
-    it "should write bool" do
-      @prot.write_bool(true)
-      @trans.read(@trans.available).should == "1"
-
-      @prot.write_bool(false)
-      @trans.read(@trans.available).should == "0"
-    end
-
-    it "should write byte" do
-      @prot.write_byte(100)
-      @trans.read(@trans.available).should == "100"
-    end
-
-    it "should write i16" do
-      @prot.write_i16(1000)
-      @trans.read(@trans.available).should == "1000"
-    end
-
-    it "should write i32" do
-      @prot.write_i32(3000000000)
-      @trans.read(@trans.available).should == "3000000000"
-    end
-
-    it "should write i64" do
-      @prot.write_i64(6000000000)
-      @trans.read(@trans.available).should == "6000000000"
-    end
-
-    it "should write double" do
-      @prot.write_double(1.23)
-      @trans.read(@trans.available).should == "1.23"
-
-      @prot.write_double(-32.1)
-      @trans.read(@trans.available).should == "-32.1"
-
-      @prot.write_double(((+1.0/0.0)/(+1.0/0.0)))
-      @trans.read(@trans.available).should == "\"NaN\""
-
-      @prot.write_double((+1.0/0.0))
-      @trans.read(@trans.available).should == "\"Infinity\""
-
-      @prot.write_double((-1.0/0.0))
-      @trans.read(@trans.available).should == "\"-Infinity\""
-    end
-
-    if RUBY_VERSION >= '1.9'
-      it 'should write string' do
-        @prot.write_string('this is a test string')
-        a = @trans.read(@trans.available)
-        a.should == '"this is a test string"'.force_encoding(Encoding::BINARY)
-        a.encoding.should == Encoding::BINARY
-      end
-
-      it 'should write string with unicode characters' do
-        @prot.write_string("this is a test string with unicode characters: \u20AC \u20AD")
-        a = @trans.read(@trans.available)
-        a.should == "\"this is a test string with unicode characters: \u20AC \u20AD\"".force_encoding(Encoding::BINARY)
-        a.encoding.should == Encoding::BINARY
-      end
-    else
-      it 'should write string' do
-        @prot.write_string('this is a test string')
-        @trans.read(@trans.available).should == '"this is a test string"'
-      end
-    end
-
-    it "should write binary" do
-      @prot.write_binary("this is a base64 string")
-      @trans.read(@trans.available).should == "\"dGhpcyBpcyBhIGJhc2U2NCBzdHJpbmc=\""
-    end
-
-    it "should write long binary" do
-      @prot.write_binary((0...256).to_a.pack('C*'))
-      @trans.read(@trans.available).should == "\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==\""
-    end
-
-    it "should get type name for type id" do
-      expect {@prot.get_type_name_for_type_id(Thrift::Types::STOP)}.to raise_error(NotImplementedError)
-      expect {@prot.get_type_name_for_type_id(Thrift::Types::VOID)}.to raise_error(NotImplementedError)
-      @prot.get_type_name_for_type_id(Thrift::Types::BOOL).should == "tf"
-      @prot.get_type_name_for_type_id(Thrift::Types::BYTE).should == "i8"
-      @prot.get_type_name_for_type_id(Thrift::Types::DOUBLE).should == "dbl"
-      @prot.get_type_name_for_type_id(Thrift::Types::I16).should == "i16"
-      @prot.get_type_name_for_type_id(Thrift::Types::I32).should == "i32"
-      @prot.get_type_name_for_type_id(Thrift::Types::I64).should == "i64"
-      @prot.get_type_name_for_type_id(Thrift::Types::STRING).should == "str"
-      @prot.get_type_name_for_type_id(Thrift::Types::STRUCT).should == "rec"
-      @prot.get_type_name_for_type_id(Thrift::Types::MAP).should == "map"
-      @prot.get_type_name_for_type_id(Thrift::Types::SET).should == "set"
-      @prot.get_type_name_for_type_id(Thrift::Types::LIST).should == "lst"
-    end
-
-    it "should get type id for type name" do
-      expect {@prot.get_type_id_for_type_name("pp")}.to raise_error(NotImplementedError)
-      @prot.get_type_id_for_type_name("tf").should == Thrift::Types::BOOL
-      @prot.get_type_id_for_type_name("i8").should == Thrift::Types::BYTE
-      @prot.get_type_id_for_type_name("dbl").should == Thrift::Types::DOUBLE
-      @prot.get_type_id_for_type_name("i16").should == Thrift::Types::I16
-      @prot.get_type_id_for_type_name("i32").should == Thrift::Types::I32
-      @prot.get_type_id_for_type_name("i64").should == Thrift::Types::I64
-      @prot.get_type_id_for_type_name("str").should == Thrift::Types::STRING
-      @prot.get_type_id_for_type_name("rec").should == Thrift::Types::STRUCT
-      @prot.get_type_id_for_type_name("map").should == Thrift::Types::MAP
-      @prot.get_type_id_for_type_name("set").should == Thrift::Types::SET
-      @prot.get_type_id_for_type_name("lst").should == Thrift::Types::LIST
-    end
-
-    it "should read json syntax char" do
-      @trans.write('F')
-      expect {@prot.read_json_syntax_char('G')}.to raise_error(Thrift::ProtocolException)
-      @trans.write('H')
-      @prot.read_json_syntax_char('H')
-    end
-
-    it "should read json escape char" do
-      @trans.write('0054')
-      @prot.read_json_escape_char.should == 'T'
-
-      @trans.write("\"\\\"\"")
-      @prot.read_json_string(false).should == "\""
-
-      @trans.write("\"\\\\\"")
-      @prot.read_json_string(false).should == "\\"
-
-      @trans.write("\"\\/\"")
-      @prot.read_json_string(false).should == "\/"
-
-      @trans.write("\"\\b\"")
-      @prot.read_json_string(false).should == "\b"
-
-      @trans.write("\"\\f\"")
-      @prot.read_json_string(false).should == "\f"
-
-      @trans.write("\"\\n\"")
-      @prot.read_json_string(false).should == "\n"
-
-      @trans.write("\"\\r\"")
-      @prot.read_json_string(false).should == "\r"
-
-      @trans.write("\"\\t\"")
-      @prot.read_json_string(false).should == "\t"
-    end
-
-    it "should read json string" do
-      @trans.write("\"\\P")
-      expect {@prot.read_json_string(false)}.to raise_error(Thrift::ProtocolException)
-
-      @trans.write("\"this is a test string\"")
-      @prot.read_json_string.should == "this is a test string"
-    end
-
-    it "should read json base64" do
-      @trans.write("\"dGhpcyBpcyBhIHRlc3Qgc3RyaW5n\"")
-      @prot.read_json_base64.should == "this is a test string"
-    end
-
-    it "should is json numeric" do
-      @prot.is_json_numeric("A").should == false
-      @prot.is_json_numeric("+").should == true
-      @prot.is_json_numeric("-").should == true
-      @prot.is_json_numeric(".").should == true
-      @prot.is_json_numeric("0").should == true
-      @prot.is_json_numeric("1").should == true
-      @prot.is_json_numeric("2").should == true
-      @prot.is_json_numeric("3").should == true
-      @prot.is_json_numeric("4").should == true
-      @prot.is_json_numeric("5").should == true
-      @prot.is_json_numeric("6").should == true
-      @prot.is_json_numeric("7").should == true
-      @prot.is_json_numeric("8").should == true
-      @prot.is_json_numeric("9").should == true
-      @prot.is_json_numeric("E").should == true
-      @prot.is_json_numeric("e").should == true
-    end
-
-    it "should read json numeric chars" do
-      @trans.write("1.453E45T")
-      @prot.read_json_numeric_chars.should == "1.453E45"
-    end
-
-    it "should read json integer" do
-      @trans.write("1.45\"\"")
-      expect {@prot.read_json_integer}.to raise_error(Thrift::ProtocolException)
-      @prot.read_string
-
-      @trans.write("1453T")
-      @prot.read_json_integer.should == 1453
-    end
-
-    it "should read json double" do
-      @trans.write("1.45e3e01\"\"")
-      expect {@prot.read_json_double}.to raise_error(Thrift::ProtocolException)
-      @prot.read_string
-
-      @trans.write("\"1.453e01\"")
-      expect {@prot.read_json_double}.to raise_error(Thrift::ProtocolException)
-
-      @trans.write("1.453e01\"\"")
-      @prot.read_json_double.should == 14.53
-      @prot.read_string
-
-      @trans.write("\"NaN\"")
-      @prot.read_json_double.nan?.should == true
-
-      @trans.write("\"Infinity\"")
-      @prot.read_json_double.should == +1.0/0.0
-
-      @trans.write("\"-Infinity\"")
-      @prot.read_json_double.should == -1.0/0.0
-    end
-
-    it "should read json object start" do
-      @trans.write("{")
-      @prot.read_json_object_start.should == nil
-    end
-
-    it "should read json object end" do
-      @trans.write("}")
-      @prot.read_json_object_end.should == nil
-    end
-
-    it "should read json array start" do
-      @trans.write("[")
-      @prot.read_json_array_start.should == nil
-    end
-
-    it "should read json array end" do
-      @trans.write("]")
-      @prot.read_json_array_end.should == nil
-    end
-
-    it "should read_message_begin" do
-      @trans.write("[2,")
-      expect {@prot.read_message_begin}.to raise_error(Thrift::ProtocolException)
-
-      @trans.write("[1,\"name\",12,32\"\"")
-      @prot.read_message_begin.should == ["name", 12, 32]
-    end
-
-    it "should read message end" do
-      @trans.write("]")
-      @prot.read_message_end.should == nil
-    end
-
-    it "should read struct begin" do
-      @trans.write("{")
-      @prot.read_struct_begin.should == nil
-    end
-
-    it "should read struct end" do
-      @trans.write("}")
-      @prot.read_struct_end.should == nil
-    end
-
-    it "should read field begin" do
-      @trans.write("1{\"rec\"")
-      @prot.read_field_begin.should == [nil, 12, 1]
-    end
-
-    it "should read field end" do
-      @trans.write("}")
-      @prot.read_field_end.should == nil
-    end
-
-    it "should read map begin" do
-      @trans.write("[\"rec\",\"lst\",2,{")
-      @prot.read_map_begin.should == [12, 15, 2]
-    end
-
-    it "should read map end" do
-      @trans.write("}]")
-      @prot.read_map_end.should == nil
-    end
-
-    it "should read list begin" do
-      @trans.write("[\"rec\",2\"\"")
-      @prot.read_list_begin.should == [12, 2]
-    end
-
-    it "should read list end" do
-      @trans.write("]")
-      @prot.read_list_end.should == nil
-    end
-
-    it "should read set begin" do
-      @trans.write("[\"rec\",2\"\"")
-      @prot.read_set_begin.should == [12, 2]
-    end
-
-    it "should read set end" do
-      @trans.write("]")
-      @prot.read_set_end.should == nil
-    end
-
-    it "should read bool" do
-      @trans.write("0\"\"")
-      @prot.read_bool.should == false
-      @prot.read_string
-
-      @trans.write("1\"\"")
-      @prot.read_bool.should == true
-    end
-
-    it "should read byte" do
-      @trans.write("60\"\"")
-      @prot.read_byte.should == 60
-    end
-
-    it "should read i16" do
-      @trans.write("1000\"\"")
-      @prot.read_i16.should == 1000
-    end
-
-    it "should read i32" do
-      @trans.write("3000000000\"\"")
-      @prot.read_i32.should == 3000000000
-    end
-
-    it "should read i64" do
-      @trans.write("6000000000\"\"")
-      @prot.read_i64.should == 6000000000
-    end
-
-    it "should read double" do
-      @trans.write("12.23\"\"")
-      @prot.read_double.should == 12.23
-    end
-
-    if RUBY_VERSION >= '1.9'
-      it 'should read string' do
-        @trans.write('"this is a test string"'.force_encoding(Encoding::BINARY))
-        a = @prot.read_string
-        a.should == 'this is a test string'
-        a.encoding.should == Encoding::UTF_8
-      end
-
-      it 'should read string with unicode characters' do
-        @trans.write('"this is a test string with unicode characters: \u20AC \u20AD"'.force_encoding(Encoding::BINARY))
-        a = @prot.read_string
-        a.should == "this is a test string with unicode characters: \u20AC \u20AD"
-        a.encoding.should == Encoding::UTF_8
-      end
-    else
-      it 'should read string' do
-        @trans.write('"this is a test string"')
-        @prot.read_string.should == 'this is a test string'
-      end
-    end
-
-    it "should read binary" do
-      @trans.write("\"dGhpcyBpcyBhIHRlc3Qgc3RyaW5n\"")
-      @prot.read_binary.should == "this is a test string"
-    end
-
-    it "should read long binary" do
-      @trans.write("\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==\"")
-      @prot.read_binary.bytes.to_a.should == (0...256).to_a
-    end
-  end
-
-  describe Thrift::JsonProtocolFactory do
-    it "should create a JsonProtocol" do
-      Thrift::JsonProtocolFactory.new.get_protocol(mock("MockTransport")).should be_instance_of(Thrift::JsonProtocol)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/namespaced_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/namespaced_spec.rb
deleted file mode 100644
index 31379d9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/namespaced_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'namespaced generation' do
-  before do
-    require 'namespaced_spec_namespace/namespaced_nonblocking_service'
-  end
-
-  it "generated the right files" do
-    prefix = File.expand_path("../gen-rb", __FILE__)
-    ["namespaced_spec_namespace/namespaced_nonblocking_service.rb",
-     "namespaced_spec_namespace/thrift_namespaced_spec_constants.rb",
-     "namespaced_spec_namespace/thrift_namespaced_spec_types.rb",
-     "other_namespace/referenced_constants.rb",
-     "other_namespace/referenced_types.rb"
-    ].each do |name|
-      File.exist?(File.join(prefix, name)).should be_true
-    end
-  end
-
-  it "did not generate the wrong files" do
-    prefix = File.expand_path("../gen-rb", __FILE__)
-    ["namespaced_nonblocking_service.rb",
-     "thrift_namespaced_spec_constants.rb",
-     "thrift_namespaced_spec_types.rb",
-     "referenced_constants.rb",
-     "referenced_types.rb"
-    ].each do |name|
-      File.exist?(File.join(prefix, name)).should_not be_true
-    end
-  end
-
-  it "has a service class in the right place" do
-    defined?(NamespacedSpecNamespace::NamespacedNonblockingService).should be_true
-  end
-
-  it "has a struct in the right place" do
-    defined?(NamespacedSpecNamespace::Hello).should be_true
-  end
-
-  it "required an included file" do
-    defined?(OtherNamespace::SomeEnum).should be_true
-  end
-
-  it "extended a service" do
-    require "extended/extended_service"
-  end
-
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/nonblocking_server_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/nonblocking_server_spec.rb
deleted file mode 100644
index 712cf45..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/nonblocking_server_spec.rb
+++ /dev/null
@@ -1,263 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'NonblockingServer' do
-
-  class Handler
-    def initialize
-      @queue = Queue.new
-    end
-
-    attr_accessor :server
-
-    def greeting(english)
-      if english
-        SpecNamespace::Hello.new
-      else
-        SpecNamespace::Hello.new(:greeting => "Aloha!")
-      end
-    end
-
-    def block
-      @queue.pop
-    end
-
-    def unblock(n)
-      n.times { @queue.push true }
-    end
-
-    def sleep(time)
-      Kernel.sleep time
-    end
-
-    def shutdown
-      @server.shutdown(0, false)
-    end
-  end
-
-  class SpecTransport < Thrift::BaseTransport
-    def initialize(transport, queue)
-      @transport = transport
-      @queue = queue
-      @flushed = false
-    end
-
-    def open?
-      @transport.open?
-    end
-
-    def open
-      @transport.open
-    end
-
-    def close
-      @transport.close
-    end
-
-    def read(sz)
-      @transport.read(sz)
-    end
-
-    def write(buf,sz=nil)
-      @transport.write(buf, sz)
-    end
-
-    def flush
-      @queue.push :flushed unless @flushed or @queue.nil?
-      @flushed = true
-      @transport.flush
-    end
-  end
-
-  class SpecServerSocket < Thrift::ServerSocket
-    def initialize(host, port, queue)
-      super(host, port)
-      @queue = queue
-    end
-
-    def listen
-      super
-      @queue.push :listen
-    end
-  end
-
-  describe Thrift::NonblockingServer do
-    before(:each) do
-      @port = 43251
-      handler = Handler.new
-      processor = SpecNamespace::NonblockingService::Processor.new(handler)
-      queue = Queue.new
-      @transport = SpecServerSocket.new('localhost', @port, queue)
-      transport_factory = Thrift::FramedTransportFactory.new
-      logger = Logger.new(STDERR)
-      logger.level = Logger::WARN
-      @server = Thrift::NonblockingServer.new(processor, @transport, transport_factory, nil, 5, logger)
-      handler.server = @server
-      @server_thread = Thread.new(Thread.current) do |master_thread|
-        begin
-          @server.serve
-        rescue => e
-          p e
-          puts e.backtrace * "\n"
-          master_thread.raise e
-        end
-      end
-      queue.pop
-
-      @clients = []
-      @catch_exceptions = false
-    end
-
-    after(:each) do
-      @clients.each { |client, trans| trans.close }
-      # @server.shutdown(1)
-      @server_thread.kill
-      @transport.close
-    end
-
-    def setup_client(queue = nil)
-      transport = SpecTransport.new(Thrift::FramedTransport.new(Thrift::Socket.new('localhost', @port)), queue)
-      protocol = Thrift::BinaryProtocol.new(transport)
-      client = SpecNamespace::NonblockingService::Client.new(protocol)
-      transport.open
-      @clients << [client, transport]
-      client
-    end
-
-    def setup_client_thread(result)
-      queue = Queue.new
-      Thread.new do
-        begin
-          client = setup_client
-          while (cmd = queue.pop)
-            msg, *args = cmd
-            case msg
-            when :block
-              result << client.block
-            when :unblock
-              client.unblock(args.first)
-            when :hello
-              result << client.greeting(true) # ignore result
-            when :sleep
-              client.sleep(args[0] || 0.5)
-              result << :slept
-            when :shutdown
-              client.shutdown
-            when :exit
-              result << :done
-              break
-            end
-          end
-          @clients.each { |c,t| t.close and break if c == client } #close the transport
-        rescue => e
-          raise e unless @catch_exceptions
-        end
-      end
-      queue
-    end
-
-    it "should handle basic message passing" do
-      client = setup_client
-      client.greeting(true).should == SpecNamespace::Hello.new
-      client.greeting(false).should == SpecNamespace::Hello.new(:greeting => 'Aloha!')
-      @server.shutdown
-    end
-
-    it "should handle concurrent clients" do
-      queue = Queue.new
-      trans_queue = Queue.new
-      4.times do
-        Thread.new(Thread.current) do |main_thread|
-          begin
-            queue.push setup_client(trans_queue).block
-          rescue => e
-            main_thread.raise e
-          end
-        end
-      end
-      4.times { trans_queue.pop }
-      setup_client.unblock(4)
-      4.times { queue.pop.should be_true }
-      @server.shutdown
-    end
-
-    it "should handle messages from more than 5 long-lived connections" do
-      queues = []
-      result = Queue.new
-      7.times do |i|
-        queues << setup_client_thread(result)
-        Thread.pass if i == 4 # give the server time to accept connections
-      end
-      client = setup_client
-      # block 4 connections
-      4.times { |i| queues[i] << :block }
-      queues[4] << :hello
-      queues[5] << :hello
-      queues[6] << :hello
-      3.times { result.pop.should == SpecNamespace::Hello.new }
-      client.greeting(true).should == SpecNamespace::Hello.new
-      queues[5] << [:unblock, 4]
-      4.times { result.pop.should be_true }
-      queues[2] << :hello
-      result.pop.should == SpecNamespace::Hello.new
-      client.greeting(false).should == SpecNamespace::Hello.new(:greeting => 'Aloha!')
-      7.times { queues.shift << :exit }
-      client.greeting(true).should == SpecNamespace::Hello.new
-      @server.shutdown
-    end
-
-    it "should shut down when asked" do
-      # connect first to ensure it's running
-      client = setup_client
-      client.greeting(false) # force a message pass
-      @server.shutdown
-      @server_thread.join(2).should be_an_instance_of(Thread)
-    end
-
-    it "should continue processing active messages when shutting down" do
-      result = Queue.new
-      client = setup_client_thread(result)
-      client << :sleep
-      sleep 0.1 # give the server time to start processing the client's message
-      @server.shutdown
-      @server_thread.join(2).should be_an_instance_of(Thread)
-      result.pop.should == :slept
-    end
-
-    it "should kill active messages when they don't expire while shutting down" do
-      result = Queue.new
-      client = setup_client_thread(result)
-      client << [:sleep, 10]
-      sleep 0.1 # start processing the client's message
-      @server.shutdown(1)
-      @catch_exceptions = true
-      @server_thread.join(3).should_not be_nil
-      result.should be_empty
-    end
-
-    it "should allow shutting down in response to a message" do
-      client = setup_client
-      client.greeting(true).should == SpecNamespace::Hello.new
-      client.shutdown
-      @server_thread.join(2).should_not be_nil
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/processor_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/processor_spec.rb
deleted file mode 100644
index 989f5cc..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/processor_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'Processor' do
-
-  class ProcessorSpec
-    include Thrift::Processor
-  end
-
-  describe Thrift::Processor do
-    before(:each) do
-      @processor = ProcessorSpec.new(mock("MockHandler"))
-      @prot = mock("MockProtocol")
-    end
-
-    def mock_trans(obj)
-      obj.should_receive(:trans).ordered.and_return do
-        mock("trans").tap do |trans|
-          trans.should_receive(:flush).ordered
-        end
-      end
-    end
-
-    it "should call process_<message> when it receives that message" do
-      @prot.should_receive(:read_message_begin).ordered.and_return ['testMessage', Thrift::MessageTypes::CALL, 17]
-      @processor.should_receive(:process_testMessage).with(17, @prot, @prot).ordered
-      @processor.process(@prot, @prot).should == true
-    end
-
-    it "should raise an ApplicationException when the received message cannot be processed" do
-      @prot.should_receive(:read_message_begin).ordered.and_return ['testMessage', Thrift::MessageTypes::CALL, 4]
-      @prot.should_receive(:skip).with(Thrift::Types::STRUCT).ordered
-      @prot.should_receive(:read_message_end).ordered
-      @prot.should_receive(:write_message_begin).with('testMessage', Thrift::MessageTypes::EXCEPTION, 4).ordered
-      e = mock(Thrift::ApplicationException)
-      e.should_receive(:write).with(@prot).ordered
-      Thrift::ApplicationException.should_receive(:new).with(Thrift::ApplicationException::UNKNOWN_METHOD, "Unknown function testMessage").and_return(e)
-      @prot.should_receive(:write_message_end).ordered
-      mock_trans(@prot)
-      @processor.process(@prot, @prot)
-    end
-
-    it "should pass args off to the args class" do
-      args_class = mock("MockArgsClass")
-      args = mock("#<MockArgsClass:mock>").tap do |args|
-        args.should_receive(:read).with(@prot).ordered
-      end
-      args_class.should_receive(:new).and_return args
-      @prot.should_receive(:read_message_end).ordered
-      @processor.read_args(@prot, args_class).should eql(args)
-    end
-
-    it "should write out a reply when asked" do
-      @prot.should_receive(:write_message_begin).with('testMessage', Thrift::MessageTypes::REPLY, 23).ordered
-      result = mock("MockResult")
-      result.should_receive(:write).with(@prot).ordered
-      @prot.should_receive(:write_message_end).ordered
-      mock_trans(@prot)
-      @processor.write_result(result, @prot, 'testMessage', 23)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/serializer_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/serializer_spec.rb
deleted file mode 100644
index 599b454..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/serializer_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'Serializer' do
-
-  describe Thrift::Serializer do
-    it "should serialize structs to binary by default" do
-      serializer = Thrift::Serializer.new(Thrift::BinaryProtocolAcceleratedFactory.new)
-      data = serializer.serialize(SpecNamespace::Hello.new(:greeting => "'Ello guv'nor!"))
-      data.should == "\x0B\x00\x01\x00\x00\x00\x0E'Ello guv'nor!\x00"
-    end
-
-    it "should serialize structs to the given protocol" do
-      protocol = Thrift::BaseProtocol.new(mock("transport"))
-      protocol.should_receive(:write_struct_begin).with("SpecNamespace::Hello")
-      protocol.should_receive(:write_field_begin).with("greeting", Thrift::Types::STRING, 1)
-      protocol.should_receive(:write_string).with("Good day")
-      protocol.should_receive(:write_field_end)
-      protocol.should_receive(:write_field_stop)
-      protocol.should_receive(:write_struct_end)
-      protocol_factory = mock("ProtocolFactory")
-      protocol_factory.stub!(:get_protocol).and_return(protocol)
-      serializer = Thrift::Serializer.new(protocol_factory)
-      serializer.serialize(SpecNamespace::Hello.new(:greeting => "Good day"))
-    end
-  end
-
-  describe Thrift::Deserializer do
-    it "should deserialize structs from binary by default" do
-      deserializer = Thrift::Deserializer.new
-      data = "\x0B\x00\x01\x00\x00\x00\x0E'Ello guv'nor!\x00"
-      deserializer.deserialize(SpecNamespace::Hello.new, data).should == SpecNamespace::Hello.new(:greeting => "'Ello guv'nor!")
-    end
-
-    it "should deserialize structs from the given protocol" do
-      protocol = Thrift::BaseProtocol.new(mock("transport"))
-      protocol.should_receive(:read_struct_begin).and_return("SpecNamespace::Hello")
-      protocol.should_receive(:read_field_begin).and_return(["greeting", Thrift::Types::STRING, 1],
-                                                            [nil, Thrift::Types::STOP, 0])
-      protocol.should_receive(:read_string).and_return("Good day")
-      protocol.should_receive(:read_field_end)
-      protocol.should_receive(:read_struct_end)
-      protocol_factory = mock("ProtocolFactory")
-      protocol_factory.stub!(:get_protocol).and_return(protocol)
-      deserializer = Thrift::Deserializer.new(protocol_factory)
-      deserializer.deserialize(SpecNamespace::Hello.new, "").should == SpecNamespace::Hello.new(:greeting => "Good day")
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/server_socket_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/server_socket_spec.rb
deleted file mode 100644
index 1301d54..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/server_socket_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
-
-describe 'Thrift::ServerSocket' do
-
-  describe Thrift::ServerSocket do
-    before(:each) do
-      @socket = Thrift::ServerSocket.new(1234)
-    end
-
-    it "should create a handle when calling listen" do
-      TCPServer.should_receive(:new).with(nil, 1234)
-      @socket.listen
-    end
-
-    it "should accept an optional host argument" do
-      @socket = Thrift::ServerSocket.new('localhost', 1234)
-      TCPServer.should_receive(:new).with('localhost', 1234)
-      @socket.listen
-    end
-
-    it "should create a Thrift::Socket to wrap accepted sockets" do
-      handle = mock("TCPServer")
-      TCPServer.should_receive(:new).with(nil, 1234).and_return(handle)
-      @socket.listen
-      sock = mock("sock")
-      handle.should_receive(:accept).and_return(sock)
-      trans = mock("Socket")
-      Thrift::Socket.should_receive(:new).and_return(trans)
-      trans.should_receive(:handle=).with(sock)
-      @socket.accept.should == trans
-    end
-
-    it "should close the handle when closed" do
-      handle = mock("TCPServer", :closed? => false)
-      TCPServer.should_receive(:new).with(nil, 1234).and_return(handle)
-      @socket.listen
-      handle.should_receive(:close)
-      @socket.close
-    end
-
-    it "should return nil when accepting if there is no handle" do
-      @socket.accept.should be_nil
-    end
-
-    it "should return true for closed? when appropriate" do
-      handle = mock("TCPServer", :closed? => false)
-      TCPServer.stub!(:new).and_return(handle)
-      @socket.listen
-      @socket.should_not be_closed
-      handle.stub!(:close)
-      @socket.close
-      @socket.should be_closed
-      @socket.listen
-      @socket.should_not be_closed
-      handle.stub!(:closed?).and_return(true)
-      @socket.should be_closed
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/server_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/server_spec.rb
deleted file mode 100644
index eaecbda..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/server_spec.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-require 'spec_helper'
-
-describe 'Server' do
-
-  describe Thrift::BaseServer do
-    it "should default to BaseTransportFactory and BinaryProtocolFactory when not specified" do
-      server = Thrift::BaseServer.new(mock("Processor"), mock("BaseServerTransport"))
-      server.instance_variable_get(:'@transport_factory').should be_an_instance_of(Thrift::BaseTransportFactory)
-      server.instance_variable_get(:'@protocol_factory').should be_an_instance_of(Thrift::BinaryProtocolFactory)
-    end
-
-    # serve is a noop, so can't test that
-  end
-
-  describe Thrift::SimpleServer do
-    before(:each) do
-      @processor = mock("Processor")
-      @serverTrans = mock("ServerTransport")
-      @trans = mock("BaseTransport")
-      @prot = mock("BaseProtocol")
-      @client = mock("Client")
-      @server = described_class.new(@processor, @serverTrans, @trans, @prot)
-    end
-    
-    it "should serve in the main thread" do
-      @serverTrans.should_receive(:listen).ordered
-      @serverTrans.should_receive(:accept).exactly(3).times.and_return(@client)
-      @trans.should_receive(:get_transport).exactly(3).times.with(@client).and_return(@trans)
-      @prot.should_receive(:get_protocol).exactly(3).times.with(@trans).and_return(@prot)
-      x = 0
-      @processor.should_receive(:process).exactly(3).times.with(@prot, @prot).and_return do
-        case (x += 1)
-        when 1 then raise Thrift::TransportException
-        when 2 then raise Thrift::ProtocolException
-        when 3 then throw :stop
-        end
-      end
-      @trans.should_receive(:close).exactly(3).times
-      @serverTrans.should_receive(:close).ordered
-      lambda { @server.serve }.should throw_symbol(:stop)
-    end
-  end
-
-  describe Thrift::ThreadedServer do
-    before(:each) do
-      @processor = mock("Processor")
-      @serverTrans = mock("ServerTransport")
-      @trans = mock("BaseTransport")
-      @prot = mock("BaseProtocol")
-      @client = mock("Client")
-      @server = described_class.new(@processor, @serverTrans, @trans, @prot)
-    end
-
-    it "should serve using threads" do
-      @serverTrans.should_receive(:listen).ordered
-      @serverTrans.should_receive(:accept).exactly(3).times.and_return(@client)
-      @trans.should_receive(:get_transport).exactly(3).times.with(@client).and_return(@trans)
-      @prot.should_receive(:get_protocol).exactly(3).times.with(@trans).and_return(@prot)
-      Thread.should_receive(:new).with(@prot, @trans).exactly(3).times.and_yield(@prot, @trans)
-      x = 0
-      @processor.should_receive(:process).exactly(3).times.with(@prot, @prot).and_return do
-        case (x += 1)
-        when 1 then raise Thrift::TransportException
-        when 2 then raise Thrift::ProtocolException
-        when 3 then throw :stop
-        end
-      end
-      @trans.should_receive(:close).exactly(3).times
-      @serverTrans.should_receive(:close).ordered
-      lambda { @server.serve }.should throw_symbol(:stop)
-    end
-  end
-
-  describe Thrift::ThreadPoolServer do
-    before(:each) do
-      @processor = mock("Processor")
-      @server_trans = mock("ServerTransport")
-      @trans = mock("BaseTransport")
-      @prot = mock("BaseProtocol")
-      @client = mock("Client")
-      @server = described_class.new(@processor, @server_trans, @trans, @prot)
-    end
-
-    it "should serve inside a thread" do
-      exception_q = @server.instance_variable_get(:@exception_q)
-      described_class.any_instance.should_receive(:serve) do 
-        exception_q.push(StandardError.new('ERROR'))
-      end
-      expect { @server.rescuable_serve }.to(raise_error('ERROR'))
-    end
-
-    it "should avoid running the server twice when retrying rescuable_serve" do
-      exception_q = @server.instance_variable_get(:@exception_q)
-      described_class.any_instance.should_receive(:serve) do 
-        exception_q.push(StandardError.new('ERROR1'))
-        exception_q.push(StandardError.new('ERROR2'))
-      end
-      expect { @server.rescuable_serve }.to(raise_error('ERROR1'))
-      expect { @server.rescuable_serve }.to(raise_error('ERROR2'))
-    end
-
-    it "should serve using a thread pool" do
-      thread_q = mock("SizedQueue")
-      exception_q = mock("Queue")
-      @server.instance_variable_set(:@thread_q, thread_q)
-      @server.instance_variable_set(:@exception_q, exception_q)
-      @server_trans.should_receive(:listen).ordered
-      thread_q.should_receive(:push).with(:token)
-      thread_q.should_receive(:pop)
-      Thread.should_receive(:new).and_yield
-      @server_trans.should_receive(:accept).exactly(3).times.and_return(@client)
-      @trans.should_receive(:get_transport).exactly(3).times.and_return(@trans)
-      @prot.should_receive(:get_protocol).exactly(3).times.and_return(@prot)
-      x = 0
-      error = RuntimeError.new("Stopped")
-      @processor.should_receive(:process).exactly(3).times.with(@prot, @prot).and_return do
-        case (x += 1)
-        when 1 then raise Thrift::TransportException
-        when 2 then raise Thrift::ProtocolException
-        when 3 then raise error
-        end
-      end
-      @trans.should_receive(:close).exactly(3).times
-      exception_q.should_receive(:push).with(error).and_throw(:stop)
-      @server_trans.should_receive(:close)
-      expect { @server.serve }.to(throw_symbol(:stop))
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/socket_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/socket_spec.rb
deleted file mode 100644
index 8e1ef50..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/socket_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
-
-describe 'Socket' do
-
-  describe Thrift::Socket do
-    before(:each) do
-      @socket = Thrift::Socket.new
-      @handle = mock("Handle", :closed? => false)
-      @handle.stub!(:close)
-      @handle.stub!(:connect_nonblock)
-      @handle.stub!(:setsockopt)
-      ::Socket.stub!(:new).and_return(@handle)
-    end
-
-    it_should_behave_like "a socket"
-
-    it "should raise a TransportException when it cannot open a socket" do
-      ::Socket.should_receive(:getaddrinfo).with("localhost", 9090, nil, ::Socket::SOCK_STREAM).and_return([[]])
-      lambda { @socket.open }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
-    end
-
-    it "should open a ::Socket with default args" do
-      ::Socket.should_receive(:new).and_return(mock("Handle", :connect_nonblock => true, :setsockopt => nil))
-      ::Socket.should_receive(:getaddrinfo).with("localhost", 9090, nil, ::Socket::SOCK_STREAM).and_return([[]])
-      ::Socket.should_receive(:sockaddr_in)
-      @socket.open
-    end
-
-    it "should accept host/port options" do
-      ::Socket.should_receive(:new).and_return(mock("Handle", :connect_nonblock => true, :setsockopt => nil))
-      ::Socket.should_receive(:getaddrinfo).with("my.domain", 1234, nil, ::Socket::SOCK_STREAM).and_return([[]])
-      ::Socket.should_receive(:sockaddr_in)
-      Thrift::Socket.new('my.domain', 1234).open
-    end
-
-    it "should accept an optional timeout" do
-      ::Socket.stub!(:new)
-      Thrift::Socket.new('localhost', 8080, 5).timeout.should == 5
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/socket_spec_shared.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/socket_spec_shared.rb
deleted file mode 100644
index 5fddc16..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/socket_spec_shared.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-shared_examples_for "a socket" do
-  it "should open a socket" do
-    @socket.open.should == @handle
-  end
-
-  it "should be open whenever it has a handle" do
-    @socket.should_not be_open
-    @socket.open
-    @socket.should be_open
-    @socket.handle = nil
-    @socket.should_not be_open
-    @socket.handle = @handle
-    @socket.close
-    @socket.should_not be_open
-  end
-
-  it "should write data to the handle" do
-    @socket.open
-    @handle.should_receive(:write).with("foobar")
-    @socket.write("foobar")
-    @handle.should_receive(:write).with("fail").and_raise(StandardError)
-    lambda { @socket.write("fail") }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
-  end
-
-  it "should raise an error when it cannot read from the handle" do
-    @socket.open
-    @handle.should_receive(:readpartial).with(17).and_raise(StandardError)
-    lambda { @socket.read(17) }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
-  end
-
-  it "should return the data read when reading from the handle works" do
-    @socket.open
-    @handle.should_receive(:readpartial).with(17).and_return("test data")
-    @socket.read(17).should == "test data"
-  end
-
-  it "should declare itself as closed when it has an error" do
-    @socket.open
-    @handle.should_receive(:write).with("fail").and_raise(StandardError)
-    @socket.should be_open
-    lambda { @socket.write("fail") }.should raise_error
-    @socket.should_not be_open
-  end
-
-  it "should raise an error when the stream is closed" do
-    @socket.open
-    @handle.stub!(:closed?).and_return(true)
-    @socket.should_not be_open
-    lambda { @socket.write("fail") }.should raise_error(IOError, "closed stream")
-    lambda { @socket.read(10) }.should raise_error(IOError, "closed stream")
-  end
-
-  it "should support the timeout accessor for read" do
-    @socket.timeout = 3
-    @socket.open
-    IO.should_receive(:select).with([@handle], nil, nil, 3).and_return([[@handle], [], []])
-    @handle.should_receive(:readpartial).with(17).and_return("test data")
-    @socket.read(17).should == "test data"
-  end
-
-  it "should support the timeout accessor for write" do
-    @socket.timeout = 3
-    @socket.open
-    IO.should_receive(:select).with(nil, [@handle], nil, 3).twice.and_return([[], [@handle], []])
-    @handle.should_receive(:write_nonblock).with("test data").and_return(4)
-    @handle.should_receive(:write_nonblock).with(" data").and_return(5)
-    @socket.write("test data").should == 9
-  end
-
-  it "should raise an error when read times out" do
-    @socket.timeout = 0.5
-    @socket.open
-    IO.should_receive(:select).once {sleep(0.5); nil}
-    lambda { @socket.read(17) }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::TIMED_OUT }
-  end
-
-  it "should raise an error when write times out" do
-    @socket.timeout = 0.5
-    @socket.open
-    IO.should_receive(:select).with(nil, [@handle], nil, 0.5).any_number_of_times.and_return(nil)
-    lambda { @socket.write("test data") }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::TIMED_OUT }
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/spec_helper.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/spec_helper.rb
deleted file mode 100644
index 5bf98d0..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/spec_helper.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# encoding: UTF-8
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'rubygems'
-require 'rspec'
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. ext])
-
-# pretend we already loaded fastthread, otherwise the nonblocking_server_spec
-# will get screwed up
-# $" << 'fastthread.bundle'
-
-require 'thrift'
-
-unless Object.method_defined? :tap
-  # if Object#tap isn't defined, then add it; this should only happen in Ruby < 1.8.7
-  class Object
-    def tap(&block)
-      block.call(self)
-      self
-    end
-  end
-end
-
-RSpec.configure do |configuration|
-  configuration.before(:each) do
-    Thrift.type_checking = true
-  end
-end
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. test debug_proto gen-rb])
-require 'srv'
-require 'debug_proto_test_constants'
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb])
-require 'thrift_spec_types'
-require 'nonblocking_service'
-
-module Fixtures
-  COMPACT_PROTOCOL_TEST_STRUCT = Thrift::Test::COMPACT_TEST.dup
-  COMPACT_PROTOCOL_TEST_STRUCT.a_binary = [0,1,2,3,4,5,6,7,8].pack('c*')
-  COMPACT_PROTOCOL_TEST_STRUCT.set_byte_map = nil
-  COMPACT_PROTOCOL_TEST_STRUCT.map_byte_map = nil
-end
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb/flat])
-
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/ssl_socket_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/ssl_socket_spec.rb
deleted file mode 100644
index a8bc785..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/ssl_socket_spec.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
-
-describe 'SSLSocket' do
-
-  describe Thrift::SSLSocket do
-    before(:each) do
-      @context = OpenSSL::SSL::SSLContext.new
-      @socket = Thrift::SSLSocket.new
-      @simple_socket_handle = mock("Handle", :closed? => false)
-      @simple_socket_handle.stub!(:close)
-      @simple_socket_handle.stub!(:connect_nonblock)
-      @simple_socket_handle.stub!(:setsockopt)
-
-      @handle = mock(mock("SSLHandle", :connect_nonblock => true, :post_connection_check => true), :closed? => false)
-      @handle.stub!(:connect_nonblock)
-      @handle.stub!(:close)
-      @handle.stub!(:post_connection_check)
-
-      ::Socket.stub!(:new).and_return(@simple_socket_handle)
-      OpenSSL::SSL::SSLSocket.stub!(:new).and_return(@handle)
-    end
-
-    it_should_behave_like "a socket"
-
-    it "should raise a TransportException when it cannot open a ssl socket" do
-      ::Socket.should_receive(:getaddrinfo).with("localhost", 9090, nil, ::Socket::SOCK_STREAM).and_return([[]])
-      lambda { @socket.open }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
-    end
-
-    it "should open a ::Socket with default args" do
-      OpenSSL::SSL::SSLSocket.should_receive(:new).with(@simple_socket_handle, nil).and_return(@handle)
-      @handle.should_receive(:post_connection_check).with('localhost')
-      @socket.open
-    end
-
-    it "should accept host/port options" do
-      handle = mock("Handle", :connect_nonblock => true, :setsockopt => nil)
-      ::Socket.stub!(:new).and_return(handle)
-      ::Socket.should_receive(:getaddrinfo).with("my.domain", 1234, nil, ::Socket::SOCK_STREAM).and_return([[]])
-      ::Socket.should_receive(:sockaddr_in)
-      OpenSSL::SSL::SSLSocket.should_receive(:new).with(handle, nil).and_return(@handle)
-      @handle.should_receive(:post_connection_check).with('my.domain')
-      Thrift::SSLSocket.new('my.domain', 1234, 6000, nil).open
-    end
-
-    it "should accept an optional timeout" do
-      Thrift::SSLSocket.new('localhost', 8080, 5).timeout.should == 5
-    end
-
-    it "should accept an optional context" do
-      Thrift::SSLSocket.new('localhost', 8080, 5, @context).ssl_context.should == @context
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/struct_nested_containers_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/struct_nested_containers_spec.rb
deleted file mode 100644
index dc8ce5f..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/struct_nested_containers_spec.rb
+++ /dev/null
@@ -1,191 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'StructNestedContainers' do
-
-  def with_type_checking
-    saved_type_checking, Thrift.type_checking = Thrift.type_checking, true
-    begin
-      yield
-    ensure
-      Thrift.type_checking = saved_type_checking
-    end
-  end
-
-  describe Thrift::Struct do
-    # Nested container tests, see THRIFT-369.
-    it "should support nested lists inside lists" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedListInList.new, SpecNamespace::NestedListInList.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = [ [1, 2, 3], [2, 3, 4] ]
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value.push [3, 4, 5]
-        a.should_not == b
-      end
-    end
-
-    it "should support nested lists inside sets" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedListInSet.new, SpecNamespace::NestedListInSet.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = [ [1, 2, 3], [2, 3, 4] ].to_set
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value.add [3, 4, 5]
-        a.should_not == b
-      end
-    end
-
-    it "should support nested lists in map keys" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedListInMapKey.new, SpecNamespace::NestedListInMapKey.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = { [1, 2, 3] => 1, [2, 3, 4] => 2 }
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value[[3, 4, 5]] = 3
-        a.should_not == b
-      end
-    end
-
-    it "should support nested lists in map values" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedListInMapValue.new, SpecNamespace::NestedListInMapValue.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = { 1 => [1, 2, 3], 2 => [2, 3, 4] }
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value[3] = [3, 4, 5]
-        a.should_not == b
-      end
-    end
-
-    it "should support nested sets inside lists" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedSetInList.new, SpecNamespace::NestedSetInList.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = [ [1, 2, 3].to_set, [2, 3, 4].to_set ]
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value.push([3, 4, 5].to_set)
-        a.should_not == b
-      end
-    end
-
-    it "should support nested sets inside sets" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedSetInSet.new, SpecNamespace::NestedSetInSet.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = [ [1, 2, 3].to_set, [2, 3, 4].to_set ].to_set
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value.add([3, 4, 5].to_set)
-        a.should_not == b
-      end
-    end
-
-    it "should support nested sets in map keys" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedSetInMapKey.new, SpecNamespace::NestedSetInMapKey.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = { [1, 2, 3].to_set => 1, [2, 3, 4].to_set => 2 }
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value[[3, 4, 5].to_set] = 3
-        a.should_not == b
-      end
-    end
-
-    it "should support nested sets in map values" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedSetInMapValue.new, SpecNamespace::NestedSetInMapValue.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = { 1 => [1, 2, 3].to_set, 2 => [2, 3, 4].to_set }
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value[3] = [3, 4, 5].to_set
-        a.should_not == b
-      end
-    end
-
-    it "should support nested maps inside lists" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedMapInList.new, SpecNamespace::NestedMapInList.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = [ {1 => 2, 3 => 4}, {2 => 3, 4 => 5} ]
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value.push({ 3 => 4, 5 => 6 })
-        a.should_not == b
-      end
-    end
-
-    it "should support nested maps inside sets" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedMapInSet.new, SpecNamespace::NestedMapInSet.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = [ {1 => 2, 3 => 4}, {2 => 3, 4 => 5} ].to_set
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value.add({ 3 => 4, 5 => 6 })
-        a.should_not == b
-      end
-    end
-
-    it "should support nested maps in map keys" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedMapInMapKey.new, SpecNamespace::NestedMapInMapKey.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = { { 1 => 2, 3 => 4} => 1, {2 => 3, 4 => 5}  => 2 }
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value[{3 => 4, 5 => 6}] = 3
-        a.should_not == b
-      end
-    end
-
-    it "should support nested maps in map values" do
-      with_type_checking do
-        a, b = SpecNamespace::NestedMapInMapValue.new, SpecNamespace::NestedMapInMapValue.new
-        [a, b].each do |thrift_struct|
-          thrift_struct.value = { 1 => { 1 => 2, 3 => 4}, 2 => {2 => 3, 4 => 5} }
-          thrift_struct.validate
-        end
-        a.should == b
-        b.value[3] = { 3 => 4, 5 => 6 }
-        a.should_not == b
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/struct_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/struct_spec.rb
deleted file mode 100644
index 6534d61..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/struct_spec.rb
+++ /dev/null
@@ -1,293 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'Struct' do
-
-  describe Thrift::Struct do
-    it "should iterate over all fields properly" do
-      fields = {}
-      SpecNamespace::Foo.new.each_field { |fid,field_info| fields[fid] = field_info }
-      fields.should == SpecNamespace::Foo::FIELDS
-    end
-
-    it "should initialize all fields to defaults" do
-      validate_default_arguments(SpecNamespace::Foo.new)
-    end
-
-    it "should initialize all fields to defaults and accept a block argument" do
-      SpecNamespace::Foo.new do |f|
-        validate_default_arguments(f)
-      end
-    end
-
-    def validate_default_arguments(object)
-      object.simple.should == 53
-      object.words.should == "words"
-      object.hello.should == SpecNamespace::Hello.new(:greeting => 'hello, world!')
-      object.ints.should == [1, 2, 2, 3]
-      object.complex.should be_nil
-      object.shorts.should == Set.new([5, 17, 239])
-    end
-
-    it "should not share default values between instances" do
-      begin
-        struct = SpecNamespace::Foo.new
-        struct.ints << 17
-        SpecNamespace::Foo.new.ints.should == [1,2,2,3]
-      ensure
-        # ensure no leakage to other tests
-        SpecNamespace::Foo::FIELDS[4][:default] = [1,2,2,3]
-      end
-    end
-
-    it "should properly initialize boolean values" do
-      struct = SpecNamespace::BoolStruct.new(:yesno => false)
-      struct.yesno.should be_false
-    end
-
-    it "should have proper == semantics" do
-      SpecNamespace::Foo.new.should_not == SpecNamespace::Hello.new
-      SpecNamespace::Foo.new.should == SpecNamespace::Foo.new
-      SpecNamespace::Foo.new(:simple => 52).should_not == SpecNamespace::Foo.new
-    end
-
-    it "should print enum value names in inspect" do
-      SpecNamespace::StructWithSomeEnum.new(:some_enum => SpecNamespace::SomeEnum::ONE).inspect.should == "<SpecNamespace::StructWithSomeEnum some_enum:ONE (0)>"
-
-      SpecNamespace::StructWithEnumMap.new(:my_map => {SpecNamespace::SomeEnum::ONE => [SpecNamespace::SomeEnum::TWO]}).inspect.should == "<SpecNamespace::StructWithEnumMap my_map:{ONE (0): [TWO (1)]}>"
-    end
-
-    it "should pretty print binary fields" do
-      SpecNamespace::Foo2.new(:my_binary => "\001\002\003").inspect.should == "<SpecNamespace::Foo2 my_binary:010203>"
-    end
-
-    it "should offer field? methods" do
-      SpecNamespace::Foo.new.opt_string?.should be_false
-      SpecNamespace::Foo.new(:simple => 52).simple?.should be_true
-      SpecNamespace::Foo.new(:my_bool => false).my_bool?.should be_true
-      SpecNamespace::Foo.new(:my_bool => true).my_bool?.should be_true
-    end
-
-    it "should be comparable" do
-      s1 = SpecNamespace::StructWithSomeEnum.new(:some_enum => SpecNamespace::SomeEnum::ONE)
-      s2 = SpecNamespace::StructWithSomeEnum.new(:some_enum => SpecNamespace::SomeEnum::TWO)
-
-      (s1 <=> s2).should == -1
-      (s2 <=> s1).should == 1
-      (s1 <=> s1).should == 0
-      (s1 <=> SpecNamespace::StructWithSomeEnum.new()).should == -1
-    end
-
-    it "should read itself off the wire" do
-      struct = SpecNamespace::Foo.new
-      prot = Thrift::BaseProtocol.new(mock("transport"))
-      prot.should_receive(:read_struct_begin).twice
-      prot.should_receive(:read_struct_end).twice
-      prot.should_receive(:read_field_begin).and_return(
-        ['complex', Thrift::Types::MAP, 5], # Foo
-        ['words', Thrift::Types::STRING, 2], # Foo
-        ['hello', Thrift::Types::STRUCT, 3], # Foo
-          ['greeting', Thrift::Types::STRING, 1], # Hello
-          [nil, Thrift::Types::STOP, 0], # Hello
-        ['simple', Thrift::Types::I32, 1], # Foo
-        ['ints', Thrift::Types::LIST, 4], # Foo
-        ['shorts', Thrift::Types::SET, 6], # Foo
-        [nil, Thrift::Types::STOP, 0] # Hello
-      )
-      prot.should_receive(:read_field_end).exactly(7).times
-      prot.should_receive(:read_map_begin).and_return(
-        [Thrift::Types::I32, Thrift::Types::MAP, 2], # complex
-          [Thrift::Types::STRING, Thrift::Types::DOUBLE, 2], # complex/1/value
-          [Thrift::Types::STRING, Thrift::Types::DOUBLE, 1] # complex/2/value
-      )
-      prot.should_receive(:read_map_end).exactly(3).times
-      prot.should_receive(:read_list_begin).and_return([Thrift::Types::I32, 4])
-      prot.should_receive(:read_list_end)
-      prot.should_receive(:read_set_begin).and_return([Thrift::Types::I16, 2])
-      prot.should_receive(:read_set_end)
-      prot.should_receive(:read_i32).and_return(
-        1, 14,        # complex keys
-        42,           # simple
-        4, 23, 4, 29  # ints
-      )
-      prot.should_receive(:read_string).and_return("pi", "e", "feigenbaum", "apple banana", "what's up?")
-      prot.should_receive(:read_double).and_return(Math::PI, Math::E, 4.669201609)
-      prot.should_receive(:read_i16).and_return(2, 3)
-      prot.should_not_receive(:skip)
-      struct.read(prot)
-
-      struct.simple.should == 42
-      struct.complex.should == {1 => {"pi" => Math::PI, "e" => Math::E}, 14 => {"feigenbaum" => 4.669201609}}
-      struct.hello.should == SpecNamespace::Hello.new(:greeting => "what's up?")
-      struct.words.should == "apple banana"
-      struct.ints.should == [4, 23, 4, 29]
-      struct.shorts.should == Set.new([3, 2])
-    end
-
-    it "should serialize false boolean fields correctly" do
-      b = SpecNamespace::BoolStruct.new(:yesno => false)
-      prot = Thrift::BinaryProtocol.new(Thrift::MemoryBufferTransport.new)
-      prot.should_receive(:write_bool).with(false)
-      b.write(prot)
-    end
-
-    it "should skip unexpected fields in structs and use default values" do
-      struct = SpecNamespace::Foo.new
-      prot = Thrift::BaseProtocol.new(mock("transport"))
-      prot.should_receive(:read_struct_begin)
-      prot.should_receive(:read_struct_end)
-      prot.should_receive(:read_field_begin).and_return(
-        ['simple', Thrift::Types::I32, 1],
-        ['complex', Thrift::Types::STRUCT, 5],
-        ['thinz', Thrift::Types::MAP, 7],
-        ['foobar', Thrift::Types::I32, 3],
-        ['words', Thrift::Types::STRING, 2],
-        [nil, Thrift::Types::STOP, 0]
-      )
-      prot.should_receive(:read_field_end).exactly(5).times
-      prot.should_receive(:read_i32).and_return(42)
-      prot.should_receive(:read_string).and_return("foobar")
-      prot.should_receive(:skip).with(Thrift::Types::STRUCT)
-      prot.should_receive(:skip).with(Thrift::Types::MAP)
-      # prot.should_receive(:read_map_begin).and_return([Thrift::Types::I32, Thrift::Types::I32, 0])
-      # prot.should_receive(:read_map_end)
-      prot.should_receive(:skip).with(Thrift::Types::I32)
-      struct.read(prot)
-
-      struct.simple.should == 42
-      struct.complex.should be_nil
-      struct.words.should == "foobar"
-      struct.hello.should == SpecNamespace::Hello.new(:greeting => 'hello, world!')
-      struct.ints.should == [1, 2, 2, 3]
-      struct.shorts.should == Set.new([5, 17, 239])
-    end
-
-    it "should write itself to the wire" do
-      prot = Thrift::BaseProtocol.new(mock("transport")) #mock("Protocol")
-      prot.should_receive(:write_struct_begin).with("SpecNamespace::Foo")
-      prot.should_receive(:write_struct_begin).with("SpecNamespace::Hello")
-      prot.should_receive(:write_struct_end).twice
-      prot.should_receive(:write_field_begin).with('ints', Thrift::Types::LIST, 4)
-      prot.should_receive(:write_i32).with(1)
-      prot.should_receive(:write_i32).with(2).twice
-      prot.should_receive(:write_i32).with(3)
-      prot.should_receive(:write_field_begin).with('complex', Thrift::Types::MAP, 5)
-      prot.should_receive(:write_i32).with(5)
-      prot.should_receive(:write_string).with('foo')
-      prot.should_receive(:write_double).with(1.23)
-      prot.should_receive(:write_field_begin).with('shorts', Thrift::Types::SET, 6)
-      prot.should_receive(:write_i16).with(5)
-      prot.should_receive(:write_i16).with(17)
-      prot.should_receive(:write_i16).with(239)
-      prot.should_receive(:write_field_stop).twice
-      prot.should_receive(:write_field_end).exactly(6).times
-      prot.should_receive(:write_field_begin).with('simple', Thrift::Types::I32, 1)
-      prot.should_receive(:write_i32).with(53)
-      prot.should_receive(:write_field_begin).with('hello', Thrift::Types::STRUCT, 3)
-      prot.should_receive(:write_field_begin).with('greeting', Thrift::Types::STRING, 1)
-      prot.should_receive(:write_string).with('hello, world!')
-      prot.should_receive(:write_map_begin).with(Thrift::Types::I32, Thrift::Types::MAP, 1)
-      prot.should_receive(:write_map_begin).with(Thrift::Types::STRING, Thrift::Types::DOUBLE, 1)
-      prot.should_receive(:write_map_end).twice
-      prot.should_receive(:write_list_begin).with(Thrift::Types::I32, 4)
-      prot.should_receive(:write_list_end)
-      prot.should_receive(:write_set_begin).with(Thrift::Types::I16, 3)
-      prot.should_receive(:write_set_end)
-
-      struct = SpecNamespace::Foo.new
-      struct.words = nil
-      struct.complex = {5 => {"foo" => 1.23}}
-      struct.write(prot)
-    end
-
-    it "should raise an exception if presented with an unknown container" do
-      # yeah this is silly, but I'm going for code coverage here
-      struct = SpecNamespace::Foo.new
-      lambda { struct.send :write_container, nil, nil, {:type => "foo"} }.should raise_error(StandardError, "Not a container type: foo")
-    end
-
-    it "should support optional type-checking in Thrift::Struct.new" do
-      Thrift.type_checking = true
-      begin
-        lambda { SpecNamespace::Hello.new(:greeting => 3) }.should raise_error(Thrift::TypeError, "Expected Types::STRING, received Fixnum for field greeting")
-      ensure
-        Thrift.type_checking = false
-      end
-      lambda { SpecNamespace::Hello.new(:greeting => 3) }.should_not raise_error(Thrift::TypeError)
-    end
-
-    it "should support optional type-checking in field accessors" do
-      Thrift.type_checking = true
-      begin
-        hello = SpecNamespace::Hello.new
-        lambda { hello.greeting = 3 }.should raise_error(Thrift::TypeError, "Expected Types::STRING, received Fixnum for field greeting")
-      ensure
-        Thrift.type_checking = false
-      end
-      lambda { hello.greeting = 3 }.should_not raise_error(Thrift::TypeError)
-    end
-
-    it "should raise an exception when unknown types are given to Thrift::Struct.new" do
-      lambda { SpecNamespace::Hello.new(:fish => 'salmon') }.should raise_error(Exception, "Unknown key given to SpecNamespace::Hello.new: fish")
-    end
-
-    it "should support `raise Xception, 'message'` for Exception structs" do
-      begin
-        raise SpecNamespace::Xception, "something happened"
-      rescue Thrift::Exception => e
-        e.message.should == "something happened"
-        e.code.should == 1
-        # ensure it gets serialized properly, this is the really important part
-        prot = Thrift::BaseProtocol.new(mock("trans"))
-        prot.should_receive(:write_struct_begin).with("SpecNamespace::Xception")
-        prot.should_receive(:write_struct_end)
-        prot.should_receive(:write_field_begin).with('message', Thrift::Types::STRING, 1)#, "something happened")
-        prot.should_receive(:write_string).with("something happened")
-        prot.should_receive(:write_field_begin).with('code', Thrift::Types::I32, 2)#, 1)
-        prot.should_receive(:write_i32).with(1)
-        prot.should_receive(:write_field_stop)
-        prot.should_receive(:write_field_end).twice
-
-        e.write(prot)
-      end
-    end
-
-    it "should support the regular initializer for exception structs" do
-      begin
-        raise SpecNamespace::Xception, :message => "something happened", :code => 5
-      rescue Thrift::Exception => e
-        e.message.should == "something happened"
-        e.code.should == 5
-        prot = Thrift::BaseProtocol.new(mock("trans"))
-        prot.should_receive(:write_struct_begin).with("SpecNamespace::Xception")
-        prot.should_receive(:write_struct_end)
-        prot.should_receive(:write_field_begin).with('message', Thrift::Types::STRING, 1)
-        prot.should_receive(:write_string).with("something happened")
-        prot.should_receive(:write_field_begin).with('code', Thrift::Types::I32, 2)
-        prot.should_receive(:write_i32).with(5)
-        prot.should_receive(:write_field_stop)
-        prot.should_receive(:write_field_end).twice
-
-        e.write(prot)
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/thin_http_server_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/thin_http_server_spec.rb
deleted file mode 100644
index 5520839..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/thin_http_server_spec.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-require 'rack/test'
-require 'thrift/server/thin_http_server'
-
-describe Thrift::ThinHTTPServer do
-
-  let(:processor) { mock('processor') }
-
-  describe "#initialize" do
-
-    context "when using the defaults" do
-
-      it "binds to port 80, with host 0.0.0.0, a path of '/'" do
-        Thin::Server.should_receive(:new).with('0.0.0.0', 80, an_instance_of(Rack::Builder))
-        Thrift::ThinHTTPServer.new(processor)
-      end
-
-      it 'creates a ThinHTTPServer::RackApplicationContext' do
-        Thrift::ThinHTTPServer::RackApplication.should_receive(:for).with("/", processor, an_instance_of(Thrift::BinaryProtocolFactory)).and_return(anything)
-        Thrift::ThinHTTPServer.new(processor)
-      end
-
-      it "uses the BinaryProtocolFactory" do
-        Thrift::BinaryProtocolFactory.should_receive(:new)
-        Thrift::ThinHTTPServer.new(processor)
-      end
-
-    end
-
-    context "when using the options" do
-
-      it 'accepts :ip, :port, :path' do
-        ip = "192.168.0.1"
-        port = 3000
-        path = "/thin"
-        Thin::Server.should_receive(:new).with(ip, port, an_instance_of(Rack::Builder))
-        Thrift::ThinHTTPServer.new(processor,
-                           :ip => ip,
-                           :port => port,
-                           :path => path)
-      end
-
-      it 'creates a ThinHTTPServer::RackApplicationContext with a different protocol factory' do
-        Thrift::ThinHTTPServer::RackApplication.should_receive(:for).with("/", processor, an_instance_of(Thrift::JsonProtocolFactory)).and_return(anything)
-        Thrift::ThinHTTPServer.new(processor,
-                           :protocol_factory => Thrift::JsonProtocolFactory.new)
-      end
-
-    end
-
-  end
-
-  describe "#serve" do
-
-    it 'starts the Thin server' do
-      underlying_thin_server = mock('thin server', :start => true)
-      Thin::Server.stub(:new).and_return(underlying_thin_server)
-
-      thin_thrift_server = Thrift::ThinHTTPServer.new(processor)
-
-      underlying_thin_server.should_receive(:start)
-      thin_thrift_server.serve
-    end
-  end
-
-end
-
-describe Thrift::ThinHTTPServer::RackApplication do
-  include Rack::Test::Methods
-
-  let(:processor) { mock('processor') }
-  let(:protocol_factory) { mock('protocol factory') }
-
-  def app
-    Thrift::ThinHTTPServer::RackApplication.for("/", processor, protocol_factory)
-  end
-
-  context "404 response" do
-
-    it 'receives a non-POST' do
-      header('Content-Type', "application/x-thrift")
-      get "/"
-      last_response.status.should be 404
-    end
-
-    it 'receives a header other than application/x-thrift' do
-      header('Content-Type', "application/json")
-      post "/"
-      last_response.status.should be 404
-    end
-
-  end
-
-  context "200 response" do
-
-    before do
-      protocol_factory.stub(:get_protocol)
-      processor.stub(:process)
-    end
-
-    it 'creates an IOStreamTransport' do
-      header('Content-Type', "application/x-thrift")
-      Thrift::IOStreamTransport.should_receive(:new).with(an_instance_of(Rack::Lint::InputWrapper), an_instance_of(Rack::Response))
-      post "/"
-    end
-
-    it 'fetches the right protocol based on the Transport' do
-      header('Content-Type', "application/x-thrift")
-      protocol_factory.should_receive(:get_protocol).with(an_instance_of(Thrift::IOStreamTransport))
-      post "/"
-    end
-
-    it 'status code 200' do
-      header('Content-Type', "application/x-thrift")
-      post "/"
-      last_response.ok?.should be_true
-    end
-
-  end
-
-end
-
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/types_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/types_spec.rb
deleted file mode 100644
index b2c3a20..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/types_spec.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe Thrift::Types do
-
-  before(:each) do
-    Thrift.type_checking = true
-  end
-
-  after(:each) do
-    Thrift.type_checking = false
-  end
-
-  context 'type checking' do
-    it "should return the proper name for each type" do
-      Thrift.type_name(Thrift::Types::I16).should == "Types::I16"
-      Thrift.type_name(Thrift::Types::VOID).should == "Types::VOID"
-      Thrift.type_name(Thrift::Types::LIST).should == "Types::LIST"
-      Thrift.type_name(42).should be_nil
-    end
-
-    it "should check types properly" do
-      # lambda { Thrift.check_type(nil, Thrift::Types::STOP) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(3,              {:type => Thrift::Types::STOP},   :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil,            {:type => Thrift::Types::VOID},   :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(3,              {:type => Thrift::Types::VOID},   :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(true,           {:type => Thrift::Types::BOOL},   :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(3,              {:type => Thrift::Types::BOOL},   :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(42,             {:type => Thrift::Types::BYTE},   :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(42,             {:type => Thrift::Types::I16},    :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(42,             {:type => Thrift::Types::I32},    :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(42,             {:type => Thrift::Types::I64},    :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(3.14,           {:type => Thrift::Types::I32},    :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(3.14,           {:type => Thrift::Types::DOUBLE}, :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(3,              {:type => Thrift::Types::DOUBLE}, :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type("3",            {:type => Thrift::Types::STRING}, :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(3,              {:type => Thrift::Types::STRING}, :foo) }.should raise_error(Thrift::TypeError)
-      hello = SpecNamespace::Hello.new
-      lambda { Thrift.check_type(hello,          {:type => Thrift::Types::STRUCT, :class => SpecNamespace::Hello}, :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type("foo",          {:type => Thrift::Types::STRUCT}, :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type({:foo => 1},    {:type => Thrift::Types::MAP},    :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type([1],            {:type => Thrift::Types::MAP},    :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type([1],            {:type => Thrift::Types::LIST},   :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type({:foo => 1},    {:type => Thrift::Types::LIST},   :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(Set.new([1,2]), {:type => Thrift::Types::SET},    :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type([1,2],          {:type => Thrift::Types::SET},    :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type({:foo => true}, {:type => Thrift::Types::SET},    :foo) }.should raise_error(Thrift::TypeError)
-    end
-
-    it "should error out if nil is passed and skip_types is false" do
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::BOOL},   :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::BYTE},   :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::I16},    :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::I32},    :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::I64},    :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::DOUBLE}, :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::STRING}, :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::STRUCT}, :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::LIST},   :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::SET},    :foo, false) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(nil, {:type => Thrift::Types::MAP},    :foo, false) }.should raise_error(Thrift::TypeError)
-    end
-
-    it "should check element types on containers" do
-      field = {:type => Thrift::Types::LIST, :element => {:type => Thrift::Types::I32}}
-      lambda { Thrift.check_type([1, 2], field, :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type([1, nil, 2], field, :foo) }.should raise_error(Thrift::TypeError)
-      field = {:type => Thrift::Types::MAP, :key => {:type => Thrift::Types::I32}, :value => {:type => Thrift::Types::STRING}}
-      lambda { Thrift.check_type({1 => "one", 2 => "two"}, field, :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type({1 => "one", nil => "nil"}, field, :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type({1 => nil, 2 => "two"}, field, :foo) }.should raise_error(Thrift::TypeError)
-      field = {:type => Thrift::Types::SET, :element => {:type => Thrift::Types::I32}}
-      lambda { Thrift.check_type(Set.new([1, 2]), field, :foo) }.should_not raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(Set.new([1, nil, 2]), field, :foo) }.should raise_error(Thrift::TypeError)
-      lambda { Thrift.check_type(Set.new([1, 2.3, 2]), field, :foo) }.should raise_error(Thrift::TypeError)
-
-      field = {:type => Thrift::Types::STRUCT, :class => SpecNamespace::Hello}
-      lambda { Thrift.check_type(SpecNamespace::BoolStruct, field, :foo) }.should raise_error(Thrift::TypeError)
-    end
-
-    it "should give the Thrift::TypeError a readable message" do
-      msg = "Expected Types::STRING, received Fixnum for field foo"
-      lambda { Thrift.check_type(3, {:type => Thrift::Types::STRING}, :foo) }.should raise_error(Thrift::TypeError, msg)
-      msg = "Expected Types::STRING, received Fixnum for field foo.element"
-      field = {:type => Thrift::Types::LIST, :element => {:type => Thrift::Types::STRING}}
-      lambda { Thrift.check_type([3], field, :foo) }.should raise_error(Thrift::TypeError, msg)
-      msg = "Expected Types::I32, received NilClass for field foo.element.key"
-      field = {:type => Thrift::Types::LIST,
-               :element => {:type => Thrift::Types::MAP,
-                            :key => {:type => Thrift::Types::I32},
-                            :value => {:type => Thrift::Types::I32}}}
-      lambda { Thrift.check_type([{nil => 3}], field, :foo) }.should raise_error(Thrift::TypeError, msg)
-      msg = "Expected Types::I32, received NilClass for field foo.element.value"
-      lambda { Thrift.check_type([{1 => nil}], field, :foo) }.should raise_error(Thrift::TypeError, msg)
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/union_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/union_spec.rb
deleted file mode 100644
index 6ad3194..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/union_spec.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-
-describe 'Union' do
-
-  describe Thrift::Union do
-    it "should return nil value in unset union" do
-      union = SpecNamespace::My_union.new
-      union.get_set_field.should == nil
-      union.get_value.should == nil
-    end
-
-    it "should set a field and be accessible through get_value and the named field accessor" do
-      union = SpecNamespace::My_union.new
-      union.integer32 = 25
-      union.get_set_field.should == :integer32
-      union.get_value.should == 25
-      union.integer32.should == 25
-    end
-
-    it "should work correctly when instantiated with static field constructors" do
-      union = SpecNamespace::My_union.integer32(5)
-      union.get_set_field.should == :integer32
-      union.integer32.should == 5
-    end
-
-    it "should raise for wrong set field" do
-      union = SpecNamespace::My_union.new
-      union.integer32 = 25
-      lambda { union.some_characters }.should raise_error(RuntimeError, "some_characters is not union's set field.")
-    end
-
-    it "should raise for wrong set field when hash initialized and type checking is off" do
-      Thrift.type_checking = false
-      union = SpecNamespace::My_union.new({incorrect_field: :incorrect})
-      example = lambda { Thrift::Serializer.new.serialize(union) }
-      example.should raise_error(RuntimeError, "set_field is not valid for this union!")
-    end
-
-    it "should not be equal to nil" do
-      union = SpecNamespace::My_union.new
-      union.should_not == nil
-    end
-
-    it "should not be equal with an empty String" do
-      union = SpecNamespace::My_union.new
-      union.should_not == ''
-    end
-
-    it "should not equate two different unions, i32 vs. string" do
-      union = SpecNamespace::My_union.new(:integer32, 25)
-      other_union = SpecNamespace::My_union.new(:some_characters, "blah!")
-      union.should_not == other_union
-    end
-
-    it "should properly reset setfield and setvalue" do
-      union = SpecNamespace::My_union.new(:integer32, 25)
-      union.get_set_field.should == :integer32
-      union.some_characters = "blah!"
-      union.get_set_field.should == :some_characters
-      union.get_value.should == "blah!"
-      lambda { union.integer32 }.should raise_error(RuntimeError, "integer32 is not union's set field.")
-    end
-
-    it "should not equate two different unions with different values" do
-      union = SpecNamespace::My_union.new(:integer32, 25)
-      other_union = SpecNamespace::My_union.new(:integer32, 400)
-      union.should_not == other_union
-    end
-
-    it "should not equate two different unions with different fields" do
-      union = SpecNamespace::My_union.new(:integer32, 25)
-      other_union = SpecNamespace::My_union.new(:other_i32, 25)
-      union.should_not == other_union
-    end
-
-    it "should inspect properly" do
-      union = SpecNamespace::My_union.new(:integer32, 25)
-      union.inspect.should == "<SpecNamespace::My_union integer32: 25>"
-    end
-
-    it "should not allow setting with instance_variable_set" do
-      union = SpecNamespace::My_union.new(:integer32, 27)
-      union.instance_variable_set(:@some_characters, "hallo!")
-      union.get_set_field.should == :integer32
-      union.get_value.should == 27
-      lambda { union.some_characters }.should raise_error(RuntimeError, "some_characters is not union's set field.")
-    end
-
-    it "should serialize to binary correctly" do
-      trans = Thrift::MemoryBufferTransport.new
-      proto = Thrift::BinaryProtocol.new(trans)
-
-      union = SpecNamespace::My_union.new(:integer32, 25)
-      union.write(proto)
-
-      other_union = SpecNamespace::My_union.new(:integer32, 25)
-      other_union.read(proto)
-      other_union.should == union
-    end
-
-    it "should serialize to json correctly" do
-      trans = Thrift::MemoryBufferTransport.new
-      proto = Thrift::JsonProtocol.new(trans)
-
-      union = SpecNamespace::My_union.new(:integer32, 25)
-      union.write(proto)
-
-      other_union = SpecNamespace::My_union.new(:integer32, 25)
-      other_union.read(proto)
-      other_union.should == union
-    end
-
-    it "should raise when validating unset union" do
-      union = SpecNamespace::My_union.new
-      lambda { union.validate }.should raise_error(StandardError, "Union fields are not set.")
-
-      other_union = SpecNamespace::My_union.new(:integer32, 1)
-      lambda { other_union.validate }.should_not raise_error(StandardError, "Union fields are not set.")
-    end
-
-    it "should validate an enum field properly" do
-      union = SpecNamespace::TestUnion.new(:enum_field, 3)
-      union.get_set_field.should == :enum_field
-      lambda { union.validate }.should raise_error(Thrift::ProtocolException, "Invalid value of field enum_field!")
-
-      other_union = SpecNamespace::TestUnion.new(:enum_field, 1)
-      lambda { other_union.validate }.should_not raise_error(Thrift::ProtocolException, "Invalid value of field enum_field!")
-    end
-
-    it "should properly serialize and match structs with a union" do
-      union = SpecNamespace::My_union.new(:integer32, 26)
-      swu = SpecNamespace::Struct_with_union.new(:fun_union => union)
-
-      trans = Thrift::MemoryBufferTransport.new
-      proto = Thrift::CompactProtocol.new(trans)
-
-      swu.write(proto)
-
-      other_union = SpecNamespace::My_union.new(:some_characters, "hello there")
-      swu2 = SpecNamespace::Struct_with_union.new(:fun_union => other_union)
-
-      swu2.should_not == swu
-
-      swu2.read(proto)
-      swu2.should == swu
-    end
-
-    it "should support old style constructor" do
-      union = SpecNamespace::My_union.new(:integer32 => 26)
-      union.get_set_field.should == :integer32
-      union.get_value.should == 26
-    end
-
-    it "should not throw an error when inspected and unset" do
-      lambda{SpecNamespace::TestUnion.new().inspect}.should_not raise_error
-    end
-
-    it "should print enum value name when inspected" do
-      SpecNamespace::My_union.new(:some_enum => SpecNamespace::SomeEnum::ONE).inspect.should == "<SpecNamespace::My_union some_enum: ONE (0)>"
-
-      SpecNamespace::My_union.new(:my_map => {SpecNamespace::SomeEnum::ONE => [SpecNamespace::SomeEnum::TWO]}).inspect.should == "<SpecNamespace::My_union my_map: {ONE (0): [TWO (1)]}>"
-    end
-
-    it "should offer field? methods" do
-      SpecNamespace::My_union.new.some_enum?.should be_false
-      SpecNamespace::My_union.new(:some_enum => SpecNamespace::SomeEnum::ONE).some_enum?.should be_true
-      SpecNamespace::My_union.new(:im_true => false).im_true?.should be_true
-      SpecNamespace::My_union.new(:im_true => true).im_true?.should be_true
-    end
-
-    it "should pretty print binary fields" do
-      SpecNamespace::TestUnion.new(:binary_field => "\001\002\003").inspect.should == "<SpecNamespace::TestUnion binary_field: 010203>"
-    end
-
-    it "should be comparable" do
-      relationships = [
-        [0,   -1, -1, -1],
-        [1,   0,  -1, -1],
-        [1,   1,  0,  -1],
-        [1,   1,  1,  0]]
-
-      objs = [
-        SpecNamespace::TestUnion.new(:string_field, "blah"),
-        SpecNamespace::TestUnion.new(:string_field, "blahblah"),
-        SpecNamespace::TestUnion.new(:i32_field, 1),
-        SpecNamespace::TestUnion.new()]
-
-      for y in 0..3
-        for x in 0..3
-          # puts "#{objs[y].inspect} <=> #{objs[x].inspect} should == #{relationships[y][x]}"
-          (objs[y] <=> objs[x]).should == relationships[y][x]
-        end
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/spec/unix_socket_spec.rb b/vendor/git.apache.org/thrift.git/lib/rb/spec/unix_socket_spec.rb
deleted file mode 100644
index cb6cff3..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/spec/unix_socket_spec.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'spec_helper'
-require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
-
-describe 'UNIXSocket' do
-
-  describe Thrift::UNIXSocket do
-    before(:each) do
-      @path = '/tmp/thrift_spec_socket'
-      @socket = Thrift::UNIXSocket.new(@path)
-      @handle = mock("Handle", :closed? => false)
-      @handle.stub!(:close)
-      ::UNIXSocket.stub!(:new).and_return(@handle)
-    end
-
-    it_should_behave_like "a socket"
-
-    it "should raise a TransportException when it cannot open a socket" do
-      ::UNIXSocket.should_receive(:new).and_raise(StandardError)
-      lambda { @socket.open }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::NOT_OPEN }
-    end
-
-    it "should accept an optional timeout" do
-      ::UNIXSocket.stub!(:new)
-      Thrift::UNIXSocket.new(@path, 5).timeout.should == 5
-    end
-  end
-
-  describe Thrift::UNIXServerSocket do
-    before(:each) do
-      @path = '/tmp/thrift_spec_socket'
-      @socket = Thrift::UNIXServerSocket.new(@path)
-    end
-
-    it "should create a handle when calling listen" do
-      UNIXServer.should_receive(:new).with(@path)
-      @socket.listen
-    end
-
-    it "should create a Thrift::UNIXSocket to wrap accepted sockets" do
-      handle = mock("UNIXServer")
-      UNIXServer.should_receive(:new).with(@path).and_return(handle)
-      @socket.listen
-      sock = mock("sock")
-      handle.should_receive(:accept).and_return(sock)
-      trans = mock("UNIXSocket")
-      Thrift::UNIXSocket.should_receive(:new).and_return(trans)
-      trans.should_receive(:handle=).with(sock)
-      @socket.accept.should == trans
-    end
-
-    it "should close the handle when closed" do
-      handle = mock("UNIXServer", :closed? => false)
-      UNIXServer.should_receive(:new).with(@path).and_return(handle)
-      @socket.listen
-      handle.should_receive(:close)
-      File.stub!(:delete)
-      @socket.close
-    end
-
-    it "should delete the socket when closed" do
-      handle = mock("UNIXServer", :closed? => false)
-      UNIXServer.should_receive(:new).with(@path).and_return(handle)
-      @socket.listen
-      handle.stub!(:close)
-      File.should_receive(:delete).with(@path)
-      @socket.close
-    end
-
-    it "should return nil when accepting if there is no handle" do
-      @socket.accept.should be_nil
-    end
-
-    it "should return true for closed? when appropriate" do
-      handle = mock("UNIXServer", :closed? => false)
-      UNIXServer.stub!(:new).and_return(handle)
-      File.stub!(:delete)
-      @socket.listen
-      @socket.should_not be_closed
-      handle.stub!(:close)
-      @socket.close
-      @socket.should be_closed
-      @socket.listen
-      @socket.should_not be_closed
-      handle.stub!(:closed?).and_return(true)
-      @socket.should be_closed
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/lib/rb/thrift.gemspec b/vendor/git.apache.org/thrift.git/lib/rb/thrift.gemspec
deleted file mode 100644
index 0ceebd2..0000000
--- a/vendor/git.apache.org/thrift.git/lib/rb/thrift.gemspec
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = 'thrift'
-  s.version     = '0.10.0.0'
-  s.authors     = ['Thrift Developers']
-  s.email       = ['dev@thrift.apache.org']
-  s.homepage    = 'http://thrift.apache.org'
-  s.summary     = %q{Ruby bindings for Apache Thrift}
-  s.description = %q{Ruby bindings for the Apache Thrift RPC system}
-  s.license = 'Apache 2.0'
-  s.extensions = ['ext/extconf.rb']
-
-  s.has_rdoc      = true
-  s.rdoc_options  = %w[--line-numbers --inline-source --title Thrift --main README]
-
-  s.rubyforge_project = 'thrift'
-
-  dir = File.expand_path(File.dirname(__FILE__))
-
-  s.files = Dir.glob("{lib,spec}/**/*")
-  s.test_files = Dir.glob("{test,spec,benchmark}/**/*")
-  s.executables =  Dir.glob("{bin}/**/*")
-
-  s.extra_rdoc_files  = %w[README.md] + Dir.glob("{ext,lib}/**/*.{c,h,rb}")
-
-  s.require_paths = %w[lib ext]
-
-  s.add_development_dependency 'rspec', ['>= 2.10.0', '< 2.14.0']
-  s.add_development_dependency "rack", "~> 1.5"
-  s.add_development_dependency "rack-test", "~> 0.6"
-  s.add_development_dependency "thin", "~> 1.5"
-  s.add_development_dependency "bundler", "~> 1"
-  s.add_development_dependency 'rake', '~> 10.5'
-end
-
diff --git a/vendor/git.apache.org/thrift.git/lib/st/README.md b/vendor/git.apache.org/thrift.git/lib/st/README.md
deleted file mode 100644
index 5b5fdee..0000000
--- a/vendor/git.apache.org/thrift.git/lib/st/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Thrift SmallTalk Software Library
-
-Last updated Nov 2007
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Contains some contributions under the Thrift Software License.
-Please see doc/old-thrift-license.txt in the Thrift distribution for
-details.
-
-Library
-=======
-
-To get started, just file in thrift.st with Squeak, run thrift -st
-on the tutorial .thrift files (and file in the resulting code), and
-then:
-
-calc := CalculatorClient binaryOnHost: 'localhost' port: '9090'
-calc addNum1: 10 num2: 15
-
-Tested in Squeak 3.7, but should work fine with anything later.
diff --git a/vendor/git.apache.org/thrift.git/lib/st/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/st/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/st/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/st/package.xml b/vendor/git.apache.org/thrift.git/lib/st/package.xml
deleted file mode 100644
index 8a7fe17..0000000
--- a/vendor/git.apache.org/thrift.git/lib/st/package.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<!-- Apache Thrift Smalltalk library version 0.10.0 -->
-<package>
-  <name>libthrift-st</name>
-  <file>thrift.st</file>
-  <filein>thrift.st</filein>
-</package>
-
diff --git a/vendor/git.apache.org/thrift.git/lib/st/thrift.st b/vendor/git.apache.org/thrift.git/lib/st/thrift.st
deleted file mode 100644
index fdb66df..0000000
--- a/vendor/git.apache.org/thrift.git/lib/st/thrift.st
+++ /dev/null
@@ -1,815 +0,0 @@
-"
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-License); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Contains some contributions under the Thrift Software License.
-Please see doc/old-thrift-license.txt in the Thrift distribution for
-details. 
-"
-
-SystemOrganization addCategory: #Thrift!
-SystemOrganization addCategory: #'Thrift-Protocol'!
-SystemOrganization addCategory: #'Thrift-Transport'!
-
-Error subclass: #TError
-	instanceVariableNames: 'code'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift'!
-
-!TError class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:28'!
-signalWithCode: anInteger
-	self new code: anInteger; signal! !
-
-!TError methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:28'!
-code
-	^ code! !
-
-!TError methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:28'!
-code: anInteger
-	code := anInteger! !
-
-TError subclass: #TProtocolError
-	instanceVariableNames: ''
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-!TProtocolError class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 18:39'!
-badVersion
-	^ 4! !
-
-!TProtocolError class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 18:39'!
-invalidData
-	^ 1! !
-
-!TProtocolError class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 18:39'!
-negativeSize
-	^ 2! !
-
-!TProtocolError class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 18:40'!
-sizeLimit
-	^ 3! !
-
-!TProtocolError class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 18:40'!
-unknown
-	^ 0! !
-
-TError subclass: #TTransportError
-	instanceVariableNames: ''
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Transport'!
-
-TTransportError subclass: #TTransportClosedError
-	instanceVariableNames: ''
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Transport'!
-
-Object subclass: #TClient
-	instanceVariableNames: 'iprot oprot seqid remoteSeqid'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift'!
-
-!TClient class methodsFor: 'as yet unclassified' stamp: 'pc 11/7/2007 06:00'!
-binaryOnHost: aString port: anInteger
-	| sock |
-	sock := TSocket new host: aString; port: anInteger; open; yourself.
-	^ self new
-		inProtocol: (TBinaryProtocol new transport: sock);
-		yourself! !
-
-!TClient methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 23:03'!
-inProtocol: aProtocol
-	iprot := aProtocol.
-	oprot ifNil: [oprot := aProtocol]! !
-
-!TClient methodsFor: 'as yet unclassified' stamp: 'pc 10/26/2007 04:28'!
-nextSeqid
-	^ seqid
-		ifNil: [seqid := 0]
-		ifNotNil: [seqid := seqid + 1]! !
-
-!TClient methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 22:51'!
-outProtocol: aProtocol
-	oprot := aProtocol! !
-
-!TClient methodsFor: 'as yet unclassified' stamp: 'pc 10/28/2007 15:32'!
-validateRemoteMessage: aMsg
-	remoteSeqid
-		ifNil: [remoteSeqid := aMsg seqid]
-		ifNotNil:
-			[(remoteSeqid + 1) = aMsg seqid ifFalse:
-				[TProtocolError signal: 'Bad seqid: ', aMsg seqid asString,
-							'; wanted: ', remoteSeqid asString].
-			remoteSeqid := aMsg seqid]! !
-
-Object subclass: #TField
-	instanceVariableNames: 'name type id'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-!TField methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:05'!
-id
-	^ id ifNil: [0]! !
-
-!TField methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:44'!
-id: anInteger
-	id := anInteger! !
-
-!TField methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:04'!
-name
-	^ name ifNil: ['']! !
-
-!TField methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:44'!
-name: anObject
-	name := anObject! !
-
-!TField methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:05'!
-type
-	^ type ifNil: [TType stop]! !
-
-!TField methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:44'!
-type: anInteger
-	type := anInteger! !
-
-Object subclass: #TMessage
-	instanceVariableNames: 'name seqid type'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-TMessage subclass: #TCallMessage
-	instanceVariableNames: ''
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-!TCallMessage methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 22:53'!
-type
-	^ 1! !
-
-!TMessage methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:05'!
-name
-	^ name ifNil: ['']! !
-
-!TMessage methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:35'!
-name: aString
-	name := aString! !
-
-!TMessage methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:05'!
-seqid
-	^ seqid ifNil: [0]! !
-
-!TMessage methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:35'!
-seqid: anInteger
-	seqid := anInteger! !
-
-!TMessage methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:06'!
-type
-	^ type ifNil: [0]! !
-
-!TMessage methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:35'!
-type: anInteger
-	type := anInteger! !
-
-Object subclass: #TProtocol
-	instanceVariableNames: 'transport'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-TProtocol subclass: #TBinaryProtocol
-	instanceVariableNames: ''
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 11/1/2007 04:24'!
-intFromByteArray: buf
-	| vals |
-	vals := Array new: buf size.
-	1 to: buf size do: [:n | vals at: n put: ((buf at: n) bitShift: (buf size - n) * 8)].
-	^ vals sum! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 18:46'!
-readBool
-	^ self readByte isZero not! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/25/2007 00:02'!
-readByte
-	^ (self transport read: 1) first! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/28/2007 16:24'!
-readDouble
-	| val |
-	val := Float new: 2.
-	^ val basicAt: 1 put: (self readRawInt: 4);
-		basicAt: 2 put: (self readRawInt: 4);
-		yourself! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 20:02'!
-readFieldBegin
-	| field |
-	field := TField new type: self readByte.
-
-	^ field type = TType stop
-		ifTrue: [field]
-		ifFalse: [field id: self readI16; yourself]! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:15'!
-readI16
-	^ self readInt: 2! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:20'!
-readI32
-	^ self readInt: 4! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:20'!
-readI64
-	^ self readInt: 8! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 11/1/2007 02:35'!
-readInt: size
-	| buf val |
-	buf := transport read: size.
-	val := self intFromByteArray: buf.
-	^ buf first > 16r7F
-		ifTrue: [self unsignedInt: val size: size]
-		ifFalse: [val]! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:57'!
-readListBegin
-	^ TList new
-		elemType: self readByte;
-		size: self readI32! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:58'!
-readMapBegin
-	^ TMap new
-		keyType: self readByte;
-		valueType: self readByte;
-		size: self readI32! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 11/1/2007 04:22'!
-readMessageBegin
-	| version |
-	version := self readI32.
-
-	(version bitAnd: self versionMask) = self version1
-		ifFalse: [TProtocolError signalWithCode: TProtocolError badVersion].
-
-	^ TMessage new
-		type: (version bitAnd: 16r000000FF);
-		name: self readString;
-		seqid: self readI32! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 10/28/2007 16:24'!
-readRawInt: size
-	^ self intFromByteArray: (transport read: size)! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 11/1/2007 00:59'!
-readSetBegin
-	"element type, size"
-	^ TSet new
-		elemType: self readByte;
-		size: self readI32! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 02/07/2009 19:00'!
-readString
-	| sz |
-	sz := self readI32.
-	^ sz > 0 ifTrue: [(transport read: sz) asString] ifFalse: ['']! !
-
-!TBinaryProtocol methodsFor: 'reading' stamp: 'pc 11/1/2007 04:22'!
-unsignedInt: val size: size
-	^ 0 - ((val - 1) bitXor: ((2 raisedTo: (size * 8)) - 1))! !
-
-!TBinaryProtocol methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 22:13'!
-version1
-	^ 16r80010000 ! !
-
-!TBinaryProtocol methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 18:01'!
-versionMask
-	^ 16rFFFF0000! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 18:35'!
-write: aString
-	transport write: aString! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:23'!
-writeBool: bool
-	bool ifTrue: [self writeByte: 1]
-		ifFalse: [self writeByte: 0]! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/26/2007 09:31'!
-writeByte: aNumber
-	aNumber > 16rFF ifTrue: [TError signal: 'writeByte too big'].
-	transport write: (Array with: aNumber)! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/28/2007 16:16'!
-writeDouble: aDouble
-	self writeI32: (aDouble basicAt: 1);
-		writeI32: (aDouble basicAt: 2)! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:56'!
-writeField: aField
-	self writeByte: aField type;
-		writeI16: aField id! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/25/2007 00:01'!
-writeFieldBegin: aField
-	self writeByte: aField type.
-	self writeI16: aField id! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 18:04'!
-writeFieldStop
-	self writeByte: TType stop! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 11/1/2007 02:06'!
-writeI16: i16
-	self writeInt: i16 size: 2! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 11/1/2007 02:06'!
-writeI32: i32
-	self writeInt: i32 size: 4! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 11/1/2007 02:06'!
-writeI64: i64
-	self writeInt: i64 size: 8! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 11/1/2007 04:23'!
-writeInt: val size: size
-	1 to: size do: [:n | self writeByte: ((val bitShift: (size negated + n) * 8) bitAnd: 16rFF)]! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 11/1/2007 00:48'!
-writeListBegin: aList
-	self writeByte: aList elemType; writeI32: aList size! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:55'!
-writeMapBegin: aMap
-	self writeByte: aMap keyType;
-		writeByte: aMap valueType;
-		writeI32: aMap size! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 20:36'!
-writeMessageBegin: msg
-	self writeI32: (self version1 bitOr: msg type);
-		writeString: msg name;
-		writeI32: msg seqid! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 11/1/2007 00:56'!
-writeSetBegin: aSet
-	self writeByte: aSet elemType; writeI32: aSet size! !
-
-!TBinaryProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 18:35'!
-writeString: aString
-	self writeI32: aString size;
-		write: aString! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readBool! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readByte! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readDouble! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readFieldBegin! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readFieldEnd! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readI16! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readI32! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readI64! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readListBegin! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readListEnd! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readMapBegin! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readMapEnd! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:39'!
-readMessageBegin! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:39'!
-readMessageEnd! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readSetBegin! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readSetEnd! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/25/2007 16:10'!
-readSimpleType: aType
-	aType = TType bool ifTrue: [^ self readBool].
-	aType = TType byte ifTrue: [^ self readByte].
-	aType = TType double ifTrue: [^ self readDouble].
-	aType = TType i16 ifTrue: [^ self readI16].
-	aType = TType i32 ifTrue: [^ self readI32].
-	aType = TType i64 ifTrue: [^ self readI64].
-	aType = TType list ifTrue: [^ self readBool].! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readString! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readStructBegin
-	! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/24/2007 19:40'!
-readStructEnd! !
-
-!TProtocol methodsFor: 'reading' stamp: 'pc 10/26/2007 21:34'!
-skip: aType
-	aType = TType stop ifTrue: [^ self].
-	aType = TType bool ifTrue: [^ self readBool].
-	aType = TType byte ifTrue: [^ self readByte].
-	aType = TType i16 ifTrue: [^ self readI16].
-	aType = TType i32 ifTrue: [^ self readI32].
-	aType = TType i64 ifTrue: [^ self readI64].
-	aType = TType string ifTrue: [^ self readString].
-	aType = TType double ifTrue: [^ self readDouble].
-	aType = TType struct ifTrue:
-		[| field |
-		self readStructBegin.
-		[(field := self readFieldBegin) type = TType stop] whileFalse:
-			[self skip: field type. self readFieldEnd].
-		^ self readStructEnd].
-	aType = TType map ifTrue:
-		[| map |
-		map := self readMapBegin.
-		map size timesRepeat: [self skip: map keyType. self skip: map valueType].
-		^ self readMapEnd].
-	aType = TType list ifTrue:
-		[| list |
-		list := self readListBegin.
-		list size timesRepeat: [self skip: list elemType].
-		^ self readListEnd].
-	aType = TType set ifTrue:
-		[| set |
-		set := self readSetBegin.
-		set size timesRepeat: [self skip: set elemType].
-		^ self readSetEnd].
-
-	self error: 'Unknown type'! !
-
-!TProtocol methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 23:02'!
-transport
-	^ transport! !
-
-!TProtocol methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:28'!
-transport: aTransport
-	transport := aTransport! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeBool: aBool! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeByte: aByte! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:38'!
-writeDouble: aFloat! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:38'!
-writeFieldBegin: aField! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeFieldEnd! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeFieldStop! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeI16: i16! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeI32: i32! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeI64: i64! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:39'!
-writeListBegin: aList! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeListEnd! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:39'!
-writeMapBegin: aMap! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeMapEnd! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:36'!
-writeMessageBegin! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:36'!
-writeMessageEnd! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:39'!
-writeSetBegin: aSet! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeSetEnd! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:38'!
-writeString: aString! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:38'!
-writeStructBegin: aStruct! !
-
-!TProtocol methodsFor: 'writing' stamp: 'pc 10/24/2007 19:37'!
-writeStructEnd! !
-
-Object subclass: #TResult
-	instanceVariableNames: 'success oprot iprot exception'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift'!
-
-!TResult methodsFor: 'as yet unclassified' stamp: 'pc 10/26/2007 21:35'!
-exception
-	^ exception! !
-
-!TResult methodsFor: 'as yet unclassified' stamp: 'pc 10/26/2007 21:35'!
-exception: anError
-	exception := anError! !
-
-!TResult methodsFor: 'as yet unclassified' stamp: 'pc 10/26/2007 14:43'!
-success
-	^ success! !
-
-!TResult methodsFor: 'as yet unclassified' stamp: 'pc 10/26/2007 14:43'!
-success: anObject
-	success := anObject! !
-
-Object subclass: #TSizedObject
-	instanceVariableNames: 'size'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-TSizedObject subclass: #TList
-	instanceVariableNames: 'elemType'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-!TList methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:04'!
-elemType
-	^ elemType ifNil: [TType stop]! !
-
-!TList methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:42'!
-elemType: anInteger
-	elemType := anInteger! !
-
-TList subclass: #TSet
-	instanceVariableNames: ''
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-TSizedObject subclass: #TMap
-	instanceVariableNames: 'keyType valueType'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-!TMap methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:04'!
-keyType
-	^ keyType ifNil: [TType stop]! !
-
-!TMap methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:45'!
-keyType: anInteger
-	keyType := anInteger! !
-
-!TMap methodsFor: 'accessing' stamp: 'pc 10/24/2007 20:04'!
-valueType
-	^ valueType ifNil: [TType stop]! !
-
-!TMap methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:45'!
-valueType: anInteger
-	valueType := anInteger! !
-
-!TSizedObject methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 20:03'!
-size
-	^ size ifNil: [0]! !
-
-!TSizedObject methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 20:06'!
-size: anInteger
-	size := anInteger! !
-
-Object subclass: #TSocket
-	instanceVariableNames: 'host port stream'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Transport'!
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 22:34'!
-close
-	self isOpen ifTrue: [stream close]! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 22:23'!
-connect
-	^ (self socketStream openConnectionToHost:
-		(NetNameResolver addressForName: host) port: port)
-			timeout: 180;
-			binary;
-			yourself! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 20:35'!
-flush
-	stream flush! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:08'!
-host: aString
-	host := aString! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 20:34'!
-isOpen
-	^ stream isNil not
-		and: [stream socket isConnected]
-		and: [stream socket isOtherEndClosed not]! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 22:22'!
-open
-	stream := self connect! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:09'!
-port: anInteger
-	port := anInteger! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:17'!
-read: size
-	| data |
-	[data := stream next: size.
-	data isEmpty ifTrue: [TTransportError signal: 'Could not read ', size asString, ' bytes'].
-	^ data]
-		on: ConnectionClosed
-		do: [TTransportClosedError signal]! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 22:18'!
-socketStream
-	^ Smalltalk at: #FastSocketStream ifAbsent: [SocketStream] ! !
-
-!TSocket methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 22:17'!
-write: aCollection
-	[stream nextPutAll: aCollection]
-		on: ConnectionClosed
-		do: [TTransportClosedError signal]! !
-
-Object subclass: #TStruct
-	instanceVariableNames: 'name'
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Protocol'!
-
-!TStruct methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:47'!
-name
-	^ name! !
-
-!TStruct methodsFor: 'accessing' stamp: 'pc 10/24/2007 19:47'!
-name: aString
-	name := aString! !
-
-Object subclass: #TTransport
-	instanceVariableNames: ''
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift-Transport'!
-
-!TTransport methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:18'!
-close
-	self subclassResponsibility! !
-
-!TTransport methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:22'!
-flush
-	self subclassResponsibility! !
-
-!TTransport methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:18'!
-isOpen
-	self subclassResponsibility! !
-
-!TTransport methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:18'!
-open
-	self subclassResponsibility! !
-
-!TTransport methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:18'!
-read: anInteger
-	self subclassResponsibility! !
-
-!TTransport methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:22'!
-readAll: anInteger
-	^ String streamContents: [:str |
-		[str size < anInteger] whileTrue:
-			[str nextPutAll: (self read: anInteger - str size)]]! !
-
-!TTransport methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:22'!
-write: aString
-	self subclassResponsibility! !
-
-Object subclass: #TType
-	instanceVariableNames: ''
-	classVariableNames: ''
-	poolDictionaries: ''
-	category: 'Thrift'!
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:03'!
-bool
-	^ 2! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:03'!
-byte
-	^ 3! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/25/2007 15:55'!
-codeOf: aTypeName
-	self typeMap do: [:each | each first = aTypeName ifTrue: [^ each second]].
-	^ nil! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:03'!
-double
-	^ 4! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:04'!
-i16
-	^ 6! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:04'!
-i32
-	^ 8! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:04'!
-i64
-	^ 10! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:04'!
-list
-	^ 15! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:04'!
-map
-	^ 13! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/25/2007 15:56'!
-nameOf: aTypeCode
-	self typeMap do: [:each | each second = aTypeCode ifTrue: [^ each first]].
-	^ nil! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:04'!
-set
-	^ 14! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:03'!
-stop
-	^ 0! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:04'!
-string
-	^ 11! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:04'!
-struct
-	^ 12! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/25/2007 15:51'!
-typeMap
-	^ #((bool 2) (byte 3) (double 4) (i16 6) (i32 8) (i64 10) (list 15)
-	   (map 13) (set 15) (stop 0) (string 11) (struct 12) (void 1))! !
-
-!TType class methodsFor: 'as yet unclassified' stamp: 'pc 10/24/2007 17:03'!
-void
-	^ 1! !
diff --git a/vendor/git.apache.org/thrift.git/lib/ts/coding_standards.md b/vendor/git.apache.org/thrift.git/lib/ts/coding_standards.md
deleted file mode 100644
index fa0390b..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ts/coding_standards.md
+++ /dev/null
@@ -1 +0,0 @@
-Please follow [General Coding Standards](/doc/coding_standards.md)
diff --git a/vendor/git.apache.org/thrift.git/lib/ts/thrift.d.ts b/vendor/git.apache.org/thrift.git/lib/ts/thrift.d.ts
deleted file mode 100644
index 0ba46c9..0000000
--- a/vendor/git.apache.org/thrift.git/lib/ts/thrift.d.ts
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-declare module Thrift {
-  /**
-   * Thrift JavaScript library version.
-   */
-  var Version: string;
-
-  /**
-   * Thrift IDL type string to Id mapping.
-   * @property {number}  STOP   - End of a set of fields.
-   * @property {number}  VOID   - No value (only legal for return types).
-   * @property {number}  BOOL   - True/False integer.
-   * @property {number}  BYTE   - Signed 8 bit integer.
-   * @property {number}  I08    - Signed 8 bit integer.     
-   * @property {number}  DOUBLE - 64 bit IEEE 854 floating point.
-   * @property {number}  I16    - Signed 16 bit integer.
-   * @property {number}  I32    - Signed 32 bit integer.
-   * @property {number}  I64    - Signed 64 bit integer.
-   * @property {number}  STRING - Array of bytes representing a string of characters.
-   * @property {number}  UTF7   - Array of bytes representing a string of UTF7 encoded characters.
-   * @property {number}  STRUCT - A multifield type.
-   * @property {number}  MAP    - A collection type (map/associative-array/dictionary).
-   * @property {number}  SET    - A collection type (unordered and without repeated values).
-   * @property {number}  LIST   - A collection type (unordered).
-   * @property {number}  UTF8   - Array of bytes representing a string of UTF8 encoded characters.
-   * @property {number}  UTF16  - Array of bytes representing a string of UTF16 encoded characters.
-   */
-  interface Type {
-    'STOP': number;
-    'VOID': number;
-    'BOOL': number;
-    'BYTE': number;
-    'I08': number;
-    'DOUBLE': number;
-    'I16': number;
-    'I32': number;
-    'I64': number;
-    'STRING': number;
-    'UTF7': number;
-    'STRUCT': number;
-    'MAP': number;
-    'SET': number;
-    'LIST': number;
-    'UTF8': number;
-    'UTF16': number;
-  }
-  var Type: Type;
-
-  /**
-   * Thrift RPC message type string to Id mapping.
-   * @property {number}  CALL      - RPC call sent from client to server.
-   * @property {number}  REPLY     - RPC call normal response from server to client.
-   * @property {number}  EXCEPTION - RPC call exception response from server to client.
-   * @property {number}  ONEWAY    - Oneway RPC call from client to server with no response.
-   */
-  interface MessageType {
-    'CALL': number;
-    'REPLY': number;
-    'EXCEPTION': number;
-    'ONEWAY': number;
-  }
-  var MessageType: MessageType;
-
-  /**
-   * Utility function returning the count of an object's own properties.
-   * @param {object} obj - Object to test.
-   * @returns {number} number of object's own properties
-   */
-  function objectLength(obj: Object): number;
-
-  /**
-   * Utility function to establish prototype inheritance.
-   * @param {function} constructor - Contstructor function to set as derived.
-   * @param {function} superConstructor - Contstructor function to set as base.
-   * @param {string} [name] - Type name to set as name property in derived prototype.
-   */
-  function inherits(constructor: Function, superConstructor: Function, name?: string): void;
-
-  /**
-   * TException is the base class for all Thrift exceptions types.
-   */
-  class TException implements Error {
-    name: string;
-    message: string;
-
-    /**
-     * Initializes a Thrift TException instance.
-     * @param {string} message - The TException message (distinct from the Error message).
-     */
-    constructor(message: string);
-
-    /**
-     * Returns the message set on the exception.
-     * @returns {string} exception message
-     */
-    getMessage(): string;
-  }
-
-  /**
-   * Thrift Application Exception type string to Id mapping.
-   * @property {number}  UNKNOWN                 - Unknown/undefined.
-   * @property {number}  UNKNOWN_METHOD          - Client attempted to call a method unknown to the server.
-   * @property {number}  INVALID_MESSAGE_TYPE    - Client passed an unknown/unsupported MessageType.
-   * @property {number}  WRONG_METHOD_NAME       - Unused.
-   * @property {number}  BAD_SEQUENCE_ID         - Unused in Thrift RPC, used to flag proprietary sequence number errors.
-   * @property {number}  MISSING_RESULT          - Raised by a server processor if a handler fails to supply the required return result.
-   * @property {number}  INTERNAL_ERROR          - Something bad happened.
-   * @property {number}  PROTOCOL_ERROR          - The protocol layer failed to serialize or deserialize data.
-   * @property {number}  INVALID_TRANSFORM       - Unused.
-   * @property {number}  INVALID_PROTOCOL        - The protocol (or version) is not supported.
-   * @property {number}  UNSUPPORTED_CLIENT_TYPE - Unused.
-   */
-  interface TApplicationExceptionType {
-    'UNKNOWN': number;
-    'UNKNOWN_METHOD': number;
-    'INVALID_MESSAGE_TYPE': number;
-    'WRONG_METHOD_NAME': number;
-    'BAD_SEQUENCE_ID': number;
-    'MISSING_RESULT': number;
-    'INTERNAL_ERROR': number;
-    'PROTOCOL_ERROR': number;
-    'INVALID_TRANSFORM': number;
-    'INVALID_PROTOCOL': number;
-    'UNSUPPORTED_CLIENT_TYPE': number;
-  }
-  var TApplicationExceptionType: TApplicationExceptionType;
-
-  /**
-   * TApplicationException is the exception class used to propagate exceptions from an RPC server back to a calling client.
-   */
-  class TApplicationException extends TException {
-    message: string;
-    code: number;
-
-    /**
-     * Initializes a Thrift TApplicationException instance.
-     * @param {string} message - The TApplicationException message (distinct from the Error message).
-     * @param {Thrift.TApplicationExceptionType} [code] - The TApplicationExceptionType code.
-     */
-    constructor(message: string, code?: number);
-
-    /**
-     * Read a TApplicationException from the supplied protocol.
-     * @param {object} input - The input protocol to read from.
-     */
-    read(input: Object): void;
-
-    /**
-     * Write a TApplicationException to the supplied protocol.
-     * @param {object} output - The output protocol to write to.
-     */
-    write(output: Object): void;
-
-    /**
-     * Returns the application exception code set on the exception.
-     * @returns {Thrift.TApplicationExceptionType} exception code
-     */
-    getCode(): number;
-  }
-
-  /**
-   * The Apache Thrift Transport layer performs byte level I/O between RPC
-   * clients and servers. The JavaScript Transport object type uses Http[s]/XHR and is
-   * the sole browser based Thrift transport. Target servers must implement the http[s] 
-   * transport (see: node.js example server).
-   */
-  class TXHRTransport {
-    url: string;
-    wpos: number;
-    rpos: number;
-    useCORS: any;
-    send_buf: string;
-    recv_buf: string;
-
-    /**
-     * If you do not specify a url then you must handle XHR operations on
-     * your own. This type can also be constructed using the Transport alias
-     * for backward compatibility.
-     * @param {string} [url] - The URL to connect to.
-     * @param {object} [options] - Options.
-     */
-    constructor(url?: string, options?: Object);
-
-    /**
-     * Gets the browser specific XmlHttpRequest Object.
-     * @returns {object} the browser XHR interface object
-     */
-    getXmlHttpRequestObject(): Object;
-
-    /**
-     * Sends the current XRH request if the transport was created with a URL and
-     * the async parameter if false. If the transport was not created with a URL
-     * or the async parameter is True or the URL is an empty string, the current 
-     * send buffer is returned.
-     * @param {object} async - If true the current send buffer is returned.
-     * @param {function} callback - Optional async completion callback.
-     * @returns {undefined|string} Nothing or the current send buffer.
-     */
-    flush(async: any, callback?: Function): string;
-
-    /**
-     * Creates a jQuery XHR object to be used for a Thrift server call.
-     * @param {object} client - The Thrift Service client object generated by the IDL compiler.
-     * @param {object} postData - The message to send to the server.
-     * @param {function} args - The function to call if the request succeeds.
-     * @param {function} recv_method - The Thrift Service Client receive method for the call.
-     * @returns {object} A new jQuery XHR object.
-     */
-    jqRequest(client: Object, postData: any, args: Function, recv_method: Function): Object;
-
-    /**
-     * Sets the buffer to use when receiving server responses.
-     * @param {string} buf - The buffer to receive server responses.
-     */
-    setRecvBuffer(buf: string): void;
-
-    /**
-     * Returns true if the transport is open, in browser based JavaScript
-     * this function always returns true.
-     * @returns {boolean} Always True.
-     */
-    isOpen(): boolean;
-
-    /**
-     * Opens the transport connection, in browser based JavaScript
-     * this function is a nop.
-     */
-    open(): void;
-
-    /**
-     * Closes the transport connection, in browser based JavaScript
-     * this function is a nop.
-     */
-    close(): void;
-
-    /**
-     * Returns the specified number of characters from the response
-     * buffer.
-     * @param {number} len - The number of characters to return.
-     * @returns {string} Characters sent by the server.
-     */
-    read(len: number): string;
-
-    /**
-     * Returns the entire response buffer.
-     * @returns {string} Characters sent by the server.
-     */
-    readAll(): string;
-
-    /**
-     * Sets the send buffer to buf.
-     * @param {string} buf - The buffer to send.
-     */
-    write(buf: string): void;
-
-    /**
-     * Returns the send buffer.
-     * @returns {string} The send buffer.
-     */
-    getSendBuffer(): string;
-  }
-
-  /**
-   * Old alias of the TXHRTransport for backwards compatibility.
-   */
-  class Transport extends TXHRTransport { }
-
-  /**
-   * The Apache Thrift Transport layer performs byte level I/O 
-   * between RPC clients and servers. The JavaScript TWebSocketTransport object 
-   * uses the WebSocket protocol. Target servers must implement WebSocket.
-   */
-  class TWebSocketTransport {
-    url: string;           //Where to connect
-    socket: any;           //The web socket
-    callbacks: Function[]; //Pending callbacks
-    send_pending: any[];   //Buffers/Callback pairs waiting to be sent
-    send_buf: string;      //Outbound data, immutable until sent
-    recv_buf: string;      //Inbound data
-    rb_wpos: number;       //Network write position in receive buffer
-    rb_rpos: number;       //Client read position in receive buffer
-
-    /**
-     * Constructor Function for the WebSocket transport.
-     * @param {string } [url] - The URL to connect to.
-     */
-    constructor(url: string);
-
-    __reset(url: string): void;
-
-    /**
-     * Sends the current WS request and registers callback. The async 
-     * parameter is ignored (WS flush is always async) and the callback 
-     * function parameter is required.
-     * @param {object} async - Ignored.
-     * @param {function} callback - The client completion callback.
-     * @returns {undefined|string} Nothing (undefined) 
-     */
-    flush(async: any, callback: Function): string;
-
-    __onOpen(): void;
-
-    __onClose(): void;
-
-    __onMessage(): void;
-
-    __onError(): void;
-
-    /**
-     * Sets the buffer to use when receiving server responses.
-     * @param {string} buf - The buffer to receive server responses.
-     */
-    setRecvBuffer(buf: string): void;
-
-    /**
-     * Returns true if the transport is open
-     * @returns {boolean} 
-     */
-    isOpen(): boolean;
-
-    /**
-     * Opens the transport connection
-     */
-    open(): void;
-
-    /**
-     * Closes the transport connection
-     */
-    close(): void;
-
-    /**
-     * Returns the specified number of characters from the response
-     * buffer.
-     * @param {number} len - The number of characters to return.
-     * @returns {string} Characters sent by the server.
-     */
-    read(len: number): string;
-
-    /**
-     * Returns the entire response buffer.
-     * @returns {string} Characters sent by the server.
-     */
-    readAll(): string;
-
-    /**
-     * Sets the send buffer to buf.
-     * @param {string} buf - The buffer to send.
-     */
-    write(buf: string): void;
-
-    /**
-     * Returns the send buffer.
-     * @returns {string} The send buffer.
-     */
-    getSendBuffer(): string;
-  }
-
-  /**
-   * Apache Thrift Protocols perform serialization which enables cross 
-   * language RPC. The Protocol type is the JavaScript browser implementation 
-   * of the Apache Thrift TJSONProtocol.
-   */
-  class TJSONProtocol {
-    transport: Object;
-
-    /**
-     * Thrift IDL type Id to string mapping.
-     * The mapping table looks as follows:
-     * Thrift.Type.BOOL   -> "tf": True/False integer.
-     * Thrift.Type.BYTE   -> "i8": Signed 8 bit integer.
-     * Thrift.Type.I16    -> "i16": Signed 16 bit integer.
-     * Thrift.Type.I32    -> "i32": Signed 32 bit integer.
-     * Thrift.Type.I64    -> "i64": Signed 64 bit integer.
-     * Thrift.Type.DOUBLE -> "dbl": 64 bit IEEE 854 floating point.
-     * Thrift.Type.STRUCT -> "rec": A multifield type.
-     * Thrift.Type.STRING -> "str": Array of bytes representing a string of characters.
-     * Thrift.Type.MAP    -> "map": A collection type (map/associative-array/dictionary).
-     * Thrift.Type.LIST   -> "lst": A collection type (unordered).
-     * Thrift.Type.SET    -> "set": A collection type (unordered and without repeated values).
-     */
-    Type: { [k: number]: string };
-
-    /**
-     * Thrift IDL type string to Id mapping.
-     * The mapping table looks as follows:
-     * "tf"  -> Thrift.Type.BOOL  
-     * "i8"  -> Thrift.Type.BYTE  
-     * "i16" -> Thrift.Type.I16   
-     * "i32" -> Thrift.Type.I32   
-     * "i64" -> Thrift.Type.I64   
-     * "dbl" -> Thrift.Type.DOUBLE
-     * "rec" -> Thrift.Type.STRUCT
-     * "str" -> Thrift.Type.STRING
-     * "map" -> Thrift.Type.MAP   
-     * "lst" -> Thrift.Type.LIST  
-     * "set" -> Thrift.Type.SET   
-     */
-    RType: { [k: string]: number };
-
-    /**
-     * The TJSONProtocol version number.
-     */
-    Version: number;
-
-    /**
-     * Initializes a Thrift JSON protocol instance.
-     * @param {Thrift.Transport} transport - The transport to serialize to/from.
-     */
-    constructor(transport: Object);
-
-    /**
-     * Returns the underlying transport.
-     * @returns {Thrift.Transport} The underlying transport.
-     */
-    getTransport(): Object;
-
-    /**
-     * Serializes the beginning of a Thrift RPC message.
-     * @param {string} name - The service method to call.
-     * @param {Thrift.MessageType} messageType - The type of method call.
-     * @param {number} seqid - The sequence number of this call (always 0 in Apache Thrift).
-     */
-    writeMessageBegin(name: string, messageType: number, seqid: number): void;
-
-    /**
-     * Serializes the end of a Thrift RPC message.
-     */
-    writeMessageEnd(): void;
-
-    /**
-     * Serializes the beginning of a struct.
-     * @param {string} name - The name of the struct.
-     */
-    writeStructBegin(name?: string): void;
-
-    /**
-     * Serializes the end of a struct.
-     */
-    writeStructEnd(): void;
-
-    /**
-     * Serializes the beginning of a struct field.
-     * @param {string} name - The name of the field.
-     * @param {Thrift.Protocol.Type} fieldType - The data type of the field.
-     * @param {number} fieldId - The field's unique identifier.
-     */
-    writeFieldBegin(name: string, fieldType: number, fieldId: number): void;
-
-    /**
-     * Serializes the end of a field.
-     */
-    writeFieldEnd(): void;
-
-    /**
-     * Serializes the end of the set of fields for a struct.
-     */
-    writeFieldStop(): void;
-
-    /**
-     * Serializes the beginning of a map collection.
-     * @param {Thrift.Type} keyType - The data type of the key.
-     * @param {Thrift.Type} valType - The data type of the value.
-     * @param {number} [size] - The number of elements in the map (ignored).
-     */
-    writeMapBegin(keyType: number, valType: number, size?: number): void;
-
-    /**
-     * Serializes the end of a map.
-     */
-    writeMapEnd(): void;
-
-    /**
-     * Serializes the beginning of a list collection.
-     * @param {Thrift.Type} elemType - The data type of the elements.
-     * @param {number} size - The number of elements in the list.
-     */
-    writeListBegin(elemType: number, size: number): void;
-
-    /**
-     * Serializes the end of a list.
-     */
-    writeListEnd(): void;
-
-    /**
-     * Serializes the beginning of a set collection.
-     * @param {Thrift.Type} elemType - The data type of the elements.
-     * @param {number} size - The number of elements in the list.
-     */
-    writeSetBegin(elemType: number, size: number): void;
-
-    /**
-     * Serializes the end of a set.
-     */
-    writeSetEnd(): void;
-
-    /** Serializes a boolean */
-    writeBool(value: boolean): void;
-
-    /** Serializes a number */
-    writeByte(i8: number): void;
-
-    /** Serializes a number */
-    writeI16(i16: number): void;
-
-    /** Serializes a number */
-    writeI32(i32: number): void;
-
-    /** Serializes a number */
-    writeI64(i64: number): void;
-
-    /** Serializes a number */
-    writeDouble(dbl: number): void;
-
-    /** Serializes a string */
-    writeString(str: string): void;
-
-    /** Serializes a string */
-    writeBinary(str: string): void;
-
-    /**
-       @class
-       @name AnonReadMessageBeginReturn
-       @property {string} fname - The name of the service method.
-       @property {Thrift.MessageType} mtype - The type of message call.
-       @property {number} rseqid - The sequence number of the message (0 in Thrift RPC).
-     */
-    /** 
-     * Deserializes the beginning of a message. 
-     * @returns {AnonReadMessageBeginReturn}
-     */
-    readMessageBegin(): { fname: string; mtype: number; rseqid: number };
-
-    /** Deserializes the end of a message. */
-    readMessageEnd(): void;
-
-    /** 
-     * Deserializes the beginning of a struct. 
-     * @param {string} [name] - The name of the struct (ignored).
-     * @returns {object} - An object with an empty string fname property.
-     */
-    readStructBegin(name?: string): { fname: string };
-
-    /** Deserializes the end of a struct. */
-    readStructEnd(): void;
-
-    /**
-       @class
-       @name AnonReadFieldBeginReturn
-       @property {string} fname - The name of the field (always '').
-       @property {Thrift.Type} ftype - The data type of the field.
-       @property {number} fid - The unique identifier of the field.
-     */
-    /** 
-     * Deserializes the beginning of a field. 
-     * @returns {AnonReadFieldBeginReturn}
-     */
-    readFieldBegin(): { fname: string; ftype: number; fid: number };
-
-    /** Deserializes the end of a field. */
-    readFieldEnd(): void;
-
-    /**
-       @class
-       @name AnonReadMapBeginReturn
-       @property {Thrift.Type} ktype - The data type of the key.
-       @property {Thrift.Type} vtype - The data type of the value.
-       @property {number} size - The number of elements in the map.
-     */
-    /** 
-     * Deserializes the beginning of a map. 
-     * @returns {AnonReadMapBeginReturn}
-     */
-    readMapBegin(): { ktype: number; vtype: number; size: number };
-
-    /** Deserializes the end of a map. */
-    readMapEnd(): void;
-
-    /**
-       @class
-       @name AnonReadColBeginReturn
-       @property {Thrift.Type} etype - The data type of the element.
-       @property {number} size - The number of elements in the collection.
-     */
-    /** 
-     * Deserializes the beginning of a list. 
-     * @returns {AnonReadColBeginReturn}
-     */
-    readListBegin(): { etype: number; size: number };
-
-    /** Deserializes the end of a list. */
-    readListEnd(): void;
-
-    /** 
-     * Deserializes the beginning of a set. 
-     * @param {Thrift.Type} elemType - The data type of the elements (ignored).
-     * @param {number} size - The number of elements in the list (ignored).
-     * @returns {AnonReadColBeginReturn}
-     */
-    readSetBegin(elemType?: number, size?: number): { etype: number; size: number };
-
-    /** Deserializes the end of a set. */
-    readSetEnd(): void;
-
-    /** Returns an object with a value property set to 
-     *  False unless the next number in the protocol buffer 
-     *  is 1, in which case the value property is True. */
-    readBool(): Object;
-
-    /** Returns an object with a value property set to the 
-        next value found in the protocol buffer. */
-    readByte(): Object;
-
-    /** Returns an object with a value property set to the 
-        next value found in the protocol buffer. */
-    readI16(): Object;
-
-    /** Returns an object with a value property set to the 
-        next value found in the protocol buffer. */
-    readI32(f?: any): Object;
-
-    /** Returns an object with a value property set to the 
-        next value found in the protocol buffer. */
-    readI64(): Object;
-
-    /** Returns an object with a value property set to the 
-        next value found in the protocol buffer. */
-    readDouble(): Object;
-
-    /** Returns an object with a value property set to the 
-        next value found in the protocol buffer. */
-    readString(): Object;
-
-    /** Returns an object with a value property set to the 
-        next value found in the protocol buffer. */
-    readBinary(): Object;
-
-    /** 
-     * Method to arbitrarily skip over data (not implemented).
-     */
-    skip(type: number): void;
-  }
-
-  /**
-   * Old alias of the TXHRTransport for backwards compatibility.
-   */
-  class Protocol extends TJSONProtocol { }
-
-  class MultiplexProtocol extends TJSONProtocol {
-    serviceName: string;
-
-    /**
-     * Initializes a MutilplexProtocol Implementation as a Wrapper for Thrift.Protocol.
-     * @param {string} srvName
-     * @param {Thrift.Transport} trans
-     * @param {any} [strictRead]
-     * @param {any} [strictWrite]
-     */
-    constructor(srvName: string, trans: Object, strictRead?: any, strictWrite?: any);
-
-    /**
-     * Override writeMessageBegin method of prototype
-     * Serializes the beginning of a Thrift RPC message.
-     * @param {string} name - The service method to call.
-     * @param {Thrift.MessageType} messageType - The type of method call.
-     * @param {number} seqid - The sequence number of this call (always 0 in Apache Thrift).
-     */
-    writeMessageBegin(name: string, type: number, seqid: number): void;
-  }
-
-  class Multiplexer {
-    seqid: number;
-
-    /**
-     * Instantiates a multiplexed client for a specific service.
-     * @param {String} serviceName - The transport to serialize to/from.
-     * @param {Thrift.ServiceClient} SCl - The Service Client Class.
-     * @param {Thrift.Transport} transport - Thrift.Transport instance which provides remote host:port.
-     */
-    createClient(serviceName: string, SCl: any, transport: Object): any;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/lib/xml/Makefile.am b/vendor/git.apache.org/thrift.git/lib/xml/Makefile.am
deleted file mode 100644
index bcad6bd..0000000
--- a/vendor/git.apache.org/thrift.git/lib/xml/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SUBDIRS =
-
-if WITH_JAVA
-# Schema validation test depends on java
-SUBDIRS += test
-endif
-
-EXTRA_DIST = \
-  thrift-idl.xsd \
-  test
diff --git a/vendor/git.apache.org/thrift.git/lib/xml/test/Makefile.am b/vendor/git.apache.org/thrift.git/lib/xml/test/Makefile.am
deleted file mode 100644
index bb87a52..0000000
--- a/vendor/git.apache.org/thrift.git/lib/xml/test/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-check:
-	$(ANT) $(ANT_FLAGS) test
-
-# Make sure this doesn't fail if ant is not configured.
-clean-local:
-	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT $(ANT_FLAGS) clean
diff --git a/vendor/git.apache.org/thrift.git/lib/xml/test/build.xml b/vendor/git.apache.org/thrift.git/lib/xml/test/build.xml
deleted file mode 100644
index f0e95cf..0000000
--- a/vendor/git.apache.org/thrift.git/lib/xml/test/build.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project name="XML Schema Test" default="test" basedir=".">
-
-  <description>XML Schema Validation Test</description>
-
-  <property name="xml.dir" location="${basedir}/.." />
-  <property name="gen.xml.dir" location="${basedir}/../gen-xml" />
-  <property name="idl.xml.schema" location="${xml.dir}/thrift-idl.xsd" />
-
-  <property name="thrift.dir" location="../../../" />
-  <property name="thrift.test.dir" location="${thrift.dir}/test" />
-  <property name="thrift.compiler" location="${thrift.dir}/compiler/cpp/thrift" />
-
-  <property file="${basedir}/build.properties" />
-
-  <target name="compiler.check">
-    <fail>
-      <condition>
-        <not>
-          <resourcecount count="1">
-            <fileset id="fs" file="${thrift.compiler}"/>
-          </resourcecount>
-        </not>
-      </condition>
-      Thrift compiler is missing !
-    </fail>
-  </target>
-
-  <target name="init" depends="compiler.check, mkdirs">
-    <tstamp />
-  </target>
-
-  <target name="mkdirs">
-    <mkdir dir="${gen.xml.dir}"/>
-  </target>
-
-  <target name="generate" depends="init">
-    <generate-xml file="${thrift.test.dir}/ThriftTest.thrift"/>
-    <generate-xml file="${thrift.test.dir}/Include.thrift"/>
-    <generate-xml file="${thrift.test.dir}/Recursive.thrift"/>
-    <generate-xml file="${thrift.test.dir}/ManyOptionals.thrift"/>
-    <generate-xml file="${thrift.test.dir}/OptionalRequiredTest.thrift"/>
-    <generate-xml file="${thrift.test.dir}/ConstantsDemo.thrift"/>
-    <generate-xml file="${thrift.test.dir}/TypedefTest.thrift" />
-    <generate-xml file="${thrift.test.dir}/AnnotationTest.thrift" />
-    <generate-xml file="${thrift.test.dir}/DocTest.thrift" />
-    <generate-xml file="${thrift.test.dir}/EnumTest.thrift" />
-    <generate-xml file="${thrift.test.dir}/ManyTypedefs.thrift" />
-  </target>
-
-  <target name="test" description="run schema validation"
-          depends="validate-generated-xml"/>
-    
-  <target name="validate-generated-xml" depends="init, generate">
-    <validate-xml file="${gen.xml.dir}/ThriftTest.xml"/>
-    <validate-xml file="${gen.xml.dir}/Include.xml"/>
-    <validate-xml file="${gen.xml.dir}/Recursive.xml"/>
-    <validate-xml file="${gen.xml.dir}/ManyOptionals.xml"/>
-    <validate-xml file="${gen.xml.dir}/OptionalRequiredTest.xml"/>
-    <validate-xml file="${gen.xml.dir}/ConstantsDemo.xml"/>
-    <validate-xml file="${gen.xml.dir}/TypedefTest.xml"/>
-    <validate-xml file="${gen.xml.dir}/AnnotationTest.xml"/>
-    <validate-xml file="${gen.xml.dir}/DocTest.xml"/>
-    <validate-xml file="${gen.xml.dir}/EnumTest.xml"/>
-    <validate-xml file="${gen.xml.dir}/ManyTypedefs.xml"/>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build.dir}" />
-    <delete dir="${gen.xml.dir}" />
-  </target>
-
-  <macrodef name="generate-xml">
-    <attribute name="file" />
-    <sequential>
-      <exec executable="${thrift.compiler}" failonerror="true">
-        <arg line="-gen xml:merge"/>
-        <arg line="-out ${gen.xml.dir}"/>
-        <arg line="@{file}"/>
-      </exec>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="validate-xml">
-    <attribute name="file" />
-    <sequential>
-      <echo message="validating generated XML: @{file}" />
-      <schemavalidate file="@{file}">
-        <schema namespace="http://thrift.apache.org/xml/idl" 
-                file="${idl.xml.schema}" />
-      </schemavalidate>
-    </sequential>
-  </macrodef>
-
-</project>
diff --git a/vendor/git.apache.org/thrift.git/lib/xml/thrift-idl.xsd b/vendor/git.apache.org/thrift.git/lib/xml/thrift-idl.xsd
deleted file mode 100644
index 09dd695..0000000
--- a/vendor/git.apache.org/thrift.git/lib/xml/thrift-idl.xsd
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://thrift.apache.org/xml/idl" 
-        xmlns:tns="http://thrift.apache.org/xml/idl" 
-        elementFormDefault="qualified">
-
-  <element name="idl" type="tns:IDL" />
-  <element name="document" type="tns:Document" />
-
-  <complexType name="IDL">
-    <sequence>
-      <element ref="tns:document" minOccurs="1" maxOccurs="unbounded"/>
-    </sequence>
-  </complexType>
-
-  <complexType name="Document">
-    <sequence>
-      <choice minOccurs="0" maxOccurs="unbounded">
-        <element name="include" type="tns:Include" />
-        <element name="namespace" type="tns:Namespace" />
-      </choice>
-      <choice minOccurs="0" maxOccurs="unbounded">
-        <element name="exception" type="tns:Exception" />
-        <element name="typedef" type="tns:Typedef" />
-        <element name="service" type="tns:Service" />
-        <element name="struct" type="tns:Struct" />
-        <element name="const" type="tns:Const" />
-        <element name="union" type="tns:Union" />
-        <element name="enum" type="tns:Enum" />
-      </choice>
-    </sequence>
-    <attribute name="name" type="string" use="required" />
-    <attribute name="targetNamespace" type="anyURI" use="optional" />
-    <attribute name="doc" type="string" use="optional" />
-  </complexType>
-
-  <complexType name="Include">
-    <attribute name="file" type="string" use="optional" />
-    <attribute name="name" type="string" use="required" />
-  </complexType>
-
-  <complexType name="Namespace">
-    <sequence>
-      <element name="annotation" type="tns:Annotation" 
-               minOccurs="0" maxOccurs="unbounded" />
-    </sequence>
-    <attribute name="name" type="string" use="required" />
-    <attribute name="value" type="string" use="required" />
-    <attribute name="doc" type="string" use="optional" />
-  </complexType>
-
-  <group name="AbstractStruct">
-    <sequence>
-      <element name="field" type="tns:Field" 
-               minOccurs="0" maxOccurs="unbounded" />
-      <element name="annotation" type="tns:Annotation" 
-               minOccurs="0" maxOccurs="unbounded" />
-    </sequence>
-  </group>
-
-  <attributeGroup name="StructAttributes">
-    <attribute name="name" type="string" use="required" />
-    <attribute name="doc" type="string" use="optional" />
-  </attributeGroup>
-
-  <complexType name="Exception">
-    <group ref="tns:AbstractStruct" />
-    <attributeGroup ref="tns:StructAttributes" />
-  </complexType>
-
-  <complexType name="Service">
-    <sequence>
-      <element name="method" type="tns:Method" 
-               minOccurs="0" maxOccurs="unbounded" />
-      <element name="annotation" type="tns:Annotation" 
-               minOccurs="0" maxOccurs="unbounded" />
-    </sequence>
-    <attribute name="name" type="string" use="required" />
-    <attribute name="targetNamespace" type="string" use="required" />
-    <attribute name="parent-module" type="string" use="optional" />
-    <attribute name="parent-id" type="string" use="optional" /> 
-    <attribute name="doc" type="string" use="optional" />
-  </complexType>
-
-  <complexType name="Method">
-    <sequence>
-      <element name="returns" type="tns:ThriftType" />
-      <element name="arg" type="tns:Field" 
-               minOccurs="0" maxOccurs="unbounded" />
-      <element name="throws" type="tns:Field" 
-               minOccurs="0" maxOccurs="unbounded" />
-      <element name="annotation" type="tns:Annotation" 
-               minOccurs="0" maxOccurs="unbounded" />
-    </sequence>
-    <attribute name="name" type="string" use="required" />
-    <attribute name="oneway" type="boolean" use="optional" />
-    <attribute name="doc" type="string" use="optional" />
-  </complexType>
-
-  <complexType name="Typedef">
-    <complexContent>
-      <extension base="tns:ThriftType">
-        <sequence>
-          <element name="annotation" type="tns:Annotation" 
-                   minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-        <attribute name="name" type="string" use="required" />
-        <attribute name="doc" type="string" use="optional" />
-      </extension>
-    </complexContent>
-  </complexType>
-
-  <complexType name="Struct">
-    <group ref="tns:AbstractStruct" />
-    <attributeGroup ref="tns:StructAttributes" />
-  </complexType>
-
-  <complexType name="Union">
-    <group ref="tns:AbstractStruct" />
-    <attributeGroup ref="tns:StructAttributes" />
-  </complexType>
-
-  <complexType name="Enum">
-    <sequence>
-      <element name="member" minOccurs="1" maxOccurs="unbounded">
-        <complexType>
-          <sequence>
-            <element name="annotation" type="tns:Annotation" 
-                     minOccurs="0" maxOccurs="unbounded" />
-          </sequence>
-          <attribute name="name" type="string" use="required" />
-          <attribute name="value" type="int" />
-          <attribute name="explicit" type="boolean" />
-          <attribute name="doc" type="string" />
-        </complexType>
-      </element>
-      <element name="annotation" type="tns:Annotation" 
-                minOccurs="0" maxOccurs="unbounded" />
-    </sequence>
-    <attribute name="name" type="string" use="required" />
-    <attribute name="doc" type="string" />
-  </complexType>
-
-  <complexType name="Field">
-    <complexContent>
-      <extension base="tns:ThriftType">
-        <sequence>
-          <element name="default" minOccurs="0" maxOccurs="1">
-            <complexType>
-              <group ref="tns:ConstValue" />
-            </complexType>
-          </element>
-          <element name="annotation" type="tns:Annotation" 
-                   minOccurs="0" maxOccurs="unbounded" />
-        </sequence>
-        <attribute name="field-id" type="long" />
-        <attribute name="name" type="string" use="required" />
-        <attribute name="required" type="tns:Requiredness" />
-        <attribute name="doc" type="string" />
-      </extension>
-    </complexContent>
-  </complexType>
-
-  <simpleType name="Requiredness">
-    <restriction base="string">
-      <enumeration value="required" />
-      <enumeration value="optional" />
-    </restriction>
-  </simpleType>
-
-  <complexType name="Annotation">
-    <attribute name="key" type="string" />
-    <attribute name="value" type="string" />
-  </complexType>
-
-  <complexType name="Const">
-    <complexContent>
-      <extension base="tns:ThriftType">
-        <sequence>
-          <group ref="tns:ConstValue" />
-        </sequence>
-        <attribute name="name" type="string" use="required" />
-        <attribute name="doc" type="string" />
-      </extension>
-    </complexContent>
-  </complexType>
-
-  <complexType name="ConstList">
-    <sequence>
-      <element name="entry" minOccurs="0" maxOccurs="unbounded">
-        <complexType>
-          <group ref="tns:ConstValue" />
-        </complexType>
-      </element>
-    </sequence>
-  </complexType>
-
-  <complexType name="ConstMap">
-    <sequence>
-      <element name="entry" minOccurs="0" maxOccurs="unbounded">
-        <complexType>
-          <sequence>
-            <element name="key">
-              <complexType>
-                <group ref="tns:ConstValue" />
-              </complexType>
-            </element>
-            <element name="value">
-              <complexType>
-                <group ref="tns:ConstValue" />
-              </complexType>
-            </element>
-          </sequence>
-        </complexType>
-      </element>
-    </sequence>
-  </complexType>
-
-  <group name="ConstValue">
-    <choice>
-      <element name="string" type="string" />
-      <element name="double" type="double" />
-      <element name="list" type="tns:ConstList" />
-      <element name="map" type="tns:ConstMap" />
-      <element name="int" type="long" />
-    </choice>
-  </group>
-
-  <complexType name="ThriftType">
-    <sequence>
-      <choice minOccurs="0" maxOccurs="1">
-        <element name="elemType" type="tns:ThriftType" />
-        <sequence>
-          <element name="keyType" type="tns:ThriftType" 
-                   minOccurs="1" maxOccurs="1" />
-          <element name="valueType" type="tns:ThriftType" 
-                   minOccurs="1" maxOccurs="1" />
-        </sequence>
-      </choice>
-    </sequence>
-    <attribute name="type" type="tns:TypeIdentifier" use="required" />
-    <attribute name="type-module" type="string" />
-    <attribute name="type-id" type="string" />
-  </complexType>
-
-  <simpleType name="TypeIdentifier">
-    <restriction base="string">
-      <enumeration value="void" />
-      <enumeration value="bool" />
-      <enumeration value="byte" />
-      <enumeration value="i8" />
-      <enumeration value="i16" />
-      <enumeration value="i32" />
-      <enumeration value="i64" />
-      <enumeration value="double" />
-      <enumeration value="binary" />
-      <enumeration value="string" />
-      <enumeration value="id" />
-      <enumeration value="map" />
-      <enumeration value="set" />
-      <enumeration value="list" />
-    </restriction>
-  </simpleType>
-
-</schema>
diff --git a/vendor/git.apache.org/thrift.git/package.json b/vendor/git.apache.org/thrift.git/package.json
deleted file mode 100644
index edfc355..0000000
--- a/vendor/git.apache.org/thrift.git/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "thrift",
-  "description": "node.js bindings for the Apache Thrift RPC system",
-  "homepage": "http://thrift.apache.org/",
-  "repository": {
-    "type": "git",
-    "url": "https://git-wip-us.apache.org/repos/asf/thrift.git"
-  },
-  "version": "0.10.0",
-  "author": {
-    "name": "Apache Thrift Developers",
-    "email": "dev@thrift.apache.org",
-    "url": "http://thrift.apache.org"
-  },
-  "license": "Apache-2.0",
-  "licenses": [
-    {
-      "type": "Apache-2.0",
-      "url": "http://www.apache.org/licenses/LICENSE-2.0"
-    }
-  ],
-  "bugs": {
-    "mail": "dev@thrift.apache.org",
-    "url": "https://issues.apache.org/jira/browse/THRIFT"
-  },
-  "files": [
-    "lib/nodejs/lib/thrift",
-    "lib/nodejs/README.md"
-  ],
-  "directories": {
-    "lib": "./lib/nodejs/lib/thrift"
-  },
-  "main": "./lib/nodejs/lib/thrift",
-  "engines": {
-    "node": ">= 0.2.4"
-  },
-  "dependencies": {
-    "node-int64": "~0.3.0",
-    "q": "1.0.x",
-    "ws": "~0.4.32"
-  },
-  "devDependencies": {
-    "buffer-equals": "^1.0.3",
-    "commander": "2.1.x",
-    "connect": "2.7.x",
-    "istanbul": "^0.3.5",
-    "run-browser": "^2.0.1",
-    "tape": "~3.5.0"
-  },
-  "scripts": {
-    "cover": "lib/nodejs/test/testAll.sh COVER",
-    "test": "lib/nodejs/test/testAll.sh"
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/sonar-project.properties b/vendor/git.apache.org/thrift.git/sonar-project.properties
deleted file mode 100755
index 6e6c5db..0000000
--- a/vendor/git.apache.org/thrift.git/sonar-project.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-# Apache Thrift © The Apache Software Foundation
-# http://www.apache.org/licenses/LICENSE-2.0
-# SPDX-License-Identifier: Apache-2.0
-
-# File: sonar-project.properties
-# Apache Thrift configuration file for Sonar https://analysis.apache.org/
-# Sonar is an open platform to manage code quality http://www.sonarsource.org/
-
-
-# required metadata
-sonar.projectKey=org.apache.thrift
-sonar.projectName=Apache Thrift
-sonar.projectDescription=
-The Apache Thrift software framework, for scalable cross-language services
-development, combines a software stack with a code generation engine to build
-services that work efficiently and seamlessly between all major languages.
-
-# Apache Thrift Version
-sonar.projectVersion=0.10.0
-# use this to set another version string
-# $ sonar-runner -D sonar.projectVersion=`git rev-parse HEAD`
-# set projectDate in combination with projectVersion for imports of old releases
-#sonar.projectDate=yyyy-MM-dd
-
-# TODO add website (sonar.projectUrl does not work)
-#sonar.XXXX=http//thrift.apache.org
-
-# Some properties that will be inherited by the modules
-sonar.sources=src
-sonar.language=java,js,c++,py,c
-sonar.sourceEncoding=UTF-8
-
-# scm
-sonar.scm.url=scm:git:https://git-wip-us.apache.org/repos/asf/thrift
-
-# cppcheck -q --error-exitcode=0 --xml . 2> cppcheck-result.xml
-sonar.cxx.cppcheck.reportPath=cppcheck-result.xml
-
-# List of the module identifiers
-sonar.modules=module1,module3,module4,module5,module6,module7,module8,module9,module10,module11,module12,module14
-
-
-
-# we need sonar-runner 2.1 for this, see http://jira.codehaus.org/browse/SONARPLUGINS-2421
-#sonar.modules=module2
-
-# delph plugin is broken
-#sonar.modules=module13
-
-# phpunit plugin is broken
-#sonar.modules=module15
-
-module1.sonar.projectName=Apache Thrift - Java Library
-module1.sonar.projectBaseDir=lib/java
-module1.sonar.sources=src
-module1.sonar.tests=test
-module1.sonar.binaries=build/libthrift-0.10.0.jar
-module1.sonar.libraries=build/lib/*.jar
-module1.sonar.language=java
-
-module2.sonar.projectName=Apache Thrift - Java Tutorial
-module2.sonar.projectBaseDir=.
-module2.sonar.sources=tutorial/java/src, tutorial/java/gen-java
-module2.sonar.binaries=tutorial/java/tutorial.jar
-module2.sonar.libraries=lib/java/build/lib/*.jar,lib/java/build/libthrift-1.0.0.jar
-module2.sonar.language=java
-
-module3.sonar.projectName=Apache Thrift - JavaScript Library
-module3.sonar.projectBaseDir=lib/js
-module3.sonar.sources=.
-module3.sonar.exclusions=test/**/*
-module3.sonar.language=js
-
-module4.sonar.projectName=Apache Thrift - JavaScript Tutorial
-module4.sonar.projectBaseDir=tutorial/js
-module4.sonar.sources=.
-module4.sonar.language=web
-
-module5.sonar.projectName=Apache Thrift - C++ Library
-module5.sonar.projectBaseDir=lib/cpp
-module5.sonar.sources=src
-module5.sonar.tests=test
-module5.sonar.language=c++
-
-module6.sonar.projectName=Apache Thrift - C++ Tutorial
-module6.sonar.projectBaseDir=tutorial/cpp
-module6.sonar.sources=.
-module6.sonar.exclusions=gen-cpp/**/*
-module6.sonar.language=c++
-
-module7.sonar.projectName=Apache Thrift - C++ Cross Language Test
-module7.sonar.projectBaseDir=test/cpp
-module7.sonar.sources=src
-module7.sonar.language=c++
-
-module8.sonar.projectName=Apache Thrift - Compiler
-module8.sonar.projectBaseDir=compiler/cpp
-module8.sonar.sources=src
-module8.sonar.language=c++
-
-module9.sonar.projectName=Apache Thrift - Python Library
-module9.sonar.projectBaseDir=lib/py
-module9.sonar.sources=src
-module9.sonar.language=py
-
-module10.sonar.projectName=Apache Thrift - Python Tutorial
-module10.sonar.projectBaseDir=tutorial/py
-module10.sonar.sources=.
-module10.sonar.exclusions=gen-py/**/*
-module10.sonar.language=py
-
-module11.sonar.projectName=Apache Thrift - Python Cross Language Test
-module11.sonar.projectBaseDir=test/py
-module11.sonar.sources=.
-module11.sonar.exclusions=gen-*/**/*
-module11.sonar.language=py
-
-module12.sonar.projectName=Apache Thrift - c_glib Library
-module12.sonar.projectBaseDir=lib/c_glib
-module12.sonar.sources=src
-module12.sonar.language=c
-
-module13.sonar.projectName=Apache Thrift - Delphi Library
-module13.sonar.projectBaseDir=lib/delphi
-module13.sonar.sources=src
-module13.sonar.tests=test
-module13.sonar.language=delph
-
-module14.sonar.projectName=Apache Thrift - Flex (as3) Library
-module14.sonar.projectBaseDir=lib/as3
-module14.sonar.sources=src
-module14.sonar.language=flex
-
-module15.sonar.projectName=Apache Thrift - PHP Library
-module15.sonar.projectBaseDir=lib/php
-module15.sonar.sources=src
-module15.sonar.language=php
-
-# TODO add some more languages here
-
diff --git a/vendor/git.apache.org/thrift.git/test/AnnotationTest.thrift b/vendor/git.apache.org/thrift.git/test/AnnotationTest.thrift
deleted file mode 100644
index 191995a..0000000
--- a/vendor/git.apache.org/thrift.git/test/AnnotationTest.thrift
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-typedef list<i32> ( cpp.template = "std::list" ) int_linked_list
-
-struct foo {
-  1: i32 bar ( presence = "required" );
-  2: i32 baz ( presence = "manual", cpp.use_pointer = "", );
-  3: i32 qux;
-  4: i32 bop;
-} (
-  cpp.type = "DenseFoo",
-  python.type = "DenseFoo",
-  java.final = "",
-  annotation.without.value,
-)
-
-exception foo_error {
-  1: i32 error_code ( foo="bar" )
-  2: string error_msg
-} (foo = "bar")
-
-typedef string ( unicode.encoding = "UTF-16" ) non_latin_string (foo="bar")
-typedef list< double ( cpp.fixed_point = "16" ) > tiny_float_list
-
-enum weekdays {
-  SUNDAY ( weekend = "yes" ),
-  MONDAY,
-  TUESDAY,
-  WEDNESDAY,
-  THURSDAY,
-  FRIDAY,
-  SATURDAY ( weekend = "yes" )
-} (foo.bar="baz")
-
-/* Note that annotations on senum values are not supported. */
-senum seasons {
-  "Spring",
-  "Summer",
-  "Fall",
-  "Winter"
-} ( foo = "bar" )
-
-service foo_service {
-  void foo() ( foo = "bar" )
-} (a.b="c")
-
diff --git a/vendor/git.apache.org/thrift.git/test/BrokenConstants.thrift b/vendor/git.apache.org/thrift.git/test/BrokenConstants.thrift
deleted file mode 100644
index c5aab4a..0000000
--- a/vendor/git.apache.org/thrift.git/test/BrokenConstants.thrift
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-const i64 myint = 68719476736
-const i64 broken = 9876543210987654321  // A little over 2^63
-
-enum foo {
-  bar = 68719476736
-}
diff --git a/vendor/git.apache.org/thrift.git/test/ConstantsDemo.thrift b/vendor/git.apache.org/thrift.git/test/ConstantsDemo.thrift
deleted file mode 100644
index b99bdb2..0000000
--- a/vendor/git.apache.org/thrift.git/test/ConstantsDemo.thrift
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace cpp yozone
-
-struct thing {
-  1: i32 hello,
-  2: i32 goodbye
-}
-
-enum enumconstants {
-  ONE = 1,
-  TWO = 2
-}
-
-// struct thing2 {
-//   /** standard docstring */
-//   1: enumconstants val = TWO
-// }
-
-typedef i32 myIntType
-const myIntType myInt = 3
-
-//const map<enumconstants,string> GEN_ENUM_NAMES = {ONE : "HOWDY", TWO: "PARTNER"}
-
-const i32 hex_const = 0x0001F
-const i32 negative_hex_constant = -0x0001F
-
-const i32 GEN_ME = -3523553
-const double GEn_DUB = 325.532
-const double GEn_DU = 085.2355
-const string GEN_STRING = "asldkjasfd"
-
-const double e10 = 1e10   // fails with 0.9.3 and earlier
-const double e11 = -1e10  
-
-const map<i32,i32> GEN_MAP = { 35532 : 233, 43523 : 853 }
-const list<i32> GEN_LIST = [ 235235, 23598352, 3253523 ]
-
-const map<i32, map<i32, i32>> GEN_MAPMAP = { 235 : { 532 : 53255, 235:235}}
-
-const map<string,i32> GEN_MAP2 = { "hello" : 233, "lkj98d" : 853, 'lkjsdf' : 098325 }
-
-const thing GEN_THING = { 'hello' : 325, 'goodbye' : 325352 }
-
-const map<i32,thing> GEN_WHAT = { 35 : { 'hello' : 325, 'goodbye' : 325352 } }
-
-const set<i32> GEN_SET = [ 235, 235, 53235 ]
-
-exception Blah {
-  1:  i32 bing }
-
-exception Gak {}
-
-service yowza {
-  void blingity(),
-  i32 blangity() throws (1: Blah hoot )
-}
diff --git a/vendor/git.apache.org/thrift.git/test/DebugProtoTest.thrift b/vendor/git.apache.org/thrift.git/test/DebugProtoTest.thrift
deleted file mode 100644
index b6a7659..0000000
--- a/vendor/git.apache.org/thrift.git/test/DebugProtoTest.thrift
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace c_glib TTest
-namespace cpp thrift.test.debug
-namespace java thrift.test
-namespace rb thrift.test
-
-struct Doubles {
- 1: double nan,
- 2: double inf,
- 3: double neginf,
- 4: double repeating,
- 5: double big,
- 6: double tiny,
- 7: double zero,
- 8: double negzero,
-}
-
-struct OneOfEach {
-  1: bool im_true,
-  2: bool im_false,
-  3: i8 a_bite = 0x7f,
-  4: i16 integer16 = 0x7fff,
-  5: i32 integer32,
-  6: i64 integer64 = 10000000000,
-  7: double double_precision,
-  8: string some_characters,
-  9: string zomg_unicode,
-  10: bool what_who,
-  11: binary base64,
-  12: list<i8> byte_list = [1, 2, 3],
-  13: list<i16> i16_list = [1,2,3],
-  14: list<i64> i64_list = [1,2,3]
-}
-
-struct Bonk {
-  1: i32 type,
-  2: string message,
-}
-
-struct Nesting {
-  1: Bonk my_bonk,
-  2: OneOfEach my_ooe,
-}
-
-struct HolyMoley {
-  1: list<OneOfEach> big,
-  2: set<list<string> (python.immutable = "")> contain,
-  3: map<string,list<Bonk>> bonks,
-}
-
-struct Backwards {
-  2: i32 first_tag2,
-  1: i32 second_tag1,
-}
-
-struct Empty {
-} (
-  python.immutable = "",
-)
-
-struct Wrapper {
-  1: Empty foo
-} (
-  python.immutable = "",
-)
-
-struct RandomStuff {
-  1: i32 a,
-  2: i32 b,
-  3: i32 c,
-  4: i32 d,
-  5: list<i32> myintlist,
-  6: map<i32,Wrapper> maps,
-  7: i64 bigint,
-  8: double triple,
-}
-
-struct Base64 {
-  1: i32 a,
-  2: binary b1,
-  3: binary b2,
-  4: binary b3,
-  5: binary b4,
-  6: binary b5,
-  7: binary b6,
-}
-
-struct CompactProtoTestStruct {
-  // primitive fields
-  1: i8     a_byte;
-  2: i16    a_i16;
-  3: i32    a_i32;
-  4: i64    a_i64;
-  5: double a_double;
-  6: string a_string;
-  7: binary a_binary;
-  8: bool   true_field;
-  9: bool   false_field;
-  10: Empty empty_struct_field;
-
-  // primitives in lists
-  11: list<i8>      byte_list;
-  12: list<i16>     i16_list;
-  13: list<i32>     i32_list;
-  14: list<i64>     i64_list;
-  15: list<double>  double_list;
-  16: list<string>  string_list;
-  17: list<binary>  binary_list;
-  18: list<bool>    boolean_list;
-  19: list<Empty>   struct_list;
-
-  // primitives in sets
-  20: set<i8>       byte_set;
-  21: set<i16>      i16_set;
-  22: set<i32>      i32_set;
-  23: set<i64>      i64_set;
-  24: set<double>   double_set;
-  25: set<string>   string_set;
-  26: set<binary>   binary_set;
-  27: set<bool>     boolean_set;
-  28: set<Empty>    struct_set;
-
-  // maps
-  // primitives as keys
-  29: map<i8, i8>               byte_byte_map;
-  30: map<i16, i8>              i16_byte_map;
-  31: map<i32, i8>              i32_byte_map;
-  32: map<i64, i8>              i64_byte_map;
-  33: map<double, i8>           double_byte_map;
-  34: map<string, i8>           string_byte_map;
-  35: map<binary, i8>           binary_byte_map;
-  36: map<bool, i8>             boolean_byte_map;
-  // primitives as values
-  37: map<i8, i16>              byte_i16_map;
-  38: map<i8, i32>              byte_i32_map;
-  39: map<i8, i64>              byte_i64_map;
-  40: map<i8, double>           byte_double_map;
-  41: map<i8, string>           byte_string_map;
-  42: map<i8, binary>           byte_binary_map;
-  43: map<i8, bool>             byte_boolean_map;
-  // collections as keys
-  44: map<list<i8> (python.immutable = ""), i8>       list_byte_map;
-  45: map<set<i8> (python.immutable = ""), i8>        set_byte_map;
-  46: map<map<i8,i8> (python.immutable = ""), i8>     map_byte_map;
-  // collections as values
-  47: map<i8, map<i8,i8>>     byte_map_map;
-  48: map<i8, set<i8>>        byte_set_map;
-  49: map<i8, list<i8>>       byte_list_map;
-}
-
-// To be used to test the serialization of an empty map
-struct SingleMapTestStruct {
-  1: required map<i32, i32>       i32_map;
-}
-
-const CompactProtoTestStruct COMPACT_TEST = {
-  'a_byte'             : 127,
-  'a_i16'              : 32000,
-  'a_i32'              : 1000000000,
-  'a_i64'              : 0xffffffffff,
-  'a_double'           : 5.6789,
-  'a_string'           : "my string",
-//'a_binary,'
-  'true_field'         : 1,
-  'false_field'        : 0,
-  'empty_struct_field' : {},
-  'byte_list'          : [-127, -1, 0, 1, 127],
-  'i16_list'           : [-1, 0, 1, 0x7fff],
-  'i32_list'           : [-1, 0, 0xff, 0xffff, 0xffffff, 0x7fffffff],
-  'i64_list'           : [-1, 0, 0xff, 0xffff, 0xffffff, 0xffffffff, 0xffffffffff, 0xffffffffffff, 0xffffffffffffff, 0x7fffffffffffffff],
-  'double_list'        : [0.1, 0.2, 0.3],
-  'string_list'        : ["first", "second", "third"],
-//'binary_list,'
-  'boolean_list'       : [1, 1, 1, 0, 0, 0],
-  'struct_list'        : [{}, {}],
-  'byte_set'           : [-127, -1, 0, 1, 127],
-  'i16_set'            : [-1, 0, 1, 0x7fff],
-  'i32_set'            : [1, 2, 3],
-  'i64_set'            : [-1, 0, 0xff, 0xffff, 0xffffff, 0xffffffff, 0xffffffffff, 0xffffffffffff, 0xffffffffffffff, 0x7fffffffffffffff],
-  'double_set'         : [0.1, 0.2, 0.3],
-  'string_set'         : ["first", "second", "third"],
-//'binary_set,'
-  'boolean_set'        : [1, 0],
-  'struct_set'         : [{}],
-  'byte_byte_map'      : {1 : 2},
-  'i16_byte_map'       : {1 : 1, -1 : 1, 0x7fff : 1},
-  'i32_byte_map'       : {1 : 1, -1 : 1, 0x7fffffff : 1},
-  'i64_byte_map'       : {0 : 1,  1 : 1, -1 : 1, 0x7fffffffffffffff : 1},
-  'double_byte_map'    : {-1.1 : 1, 1.1 : 1},
-  'string_byte_map'    : {"first" : 1, "second" : 2, "third" : 3, "" : 0},
-//'binary_byte_map,'
-  'boolean_byte_map'   : {1 : 1, 0 : 0},
-  'byte_i16_map'       : {1 : 1, 2 : -1, 3 : 0x7fff},
-  'byte_i32_map'       : {1 : 1, 2 : -1, 3 : 0x7fffffff},
-  'byte_i64_map'       : {1 : 1, 2 : -1, 3 : 0x7fffffffffffffff},
-  'byte_double_map'    : {1 : 0.1, 2 : -0.1, 3 : 1000000.1},
-  'byte_string_map'    : {1 : "", 2 : "blah", 3 : "loooooooooooooong string"},
-//'byte_binary_map,'
-  'byte_boolean_map'   : {1 : 1, 2 : 0},
-  'list_byte_map'      : {[1, 2, 3] : 1, [0, 1] : 2, [] : 0},
-  'set_byte_map'       : {[1, 2, 3] : 1, [0, 1] : 2, [] : 0},
-  'map_byte_map'       : {{1 : 1} : 1, {2 : 2} : 2, {} : 0},
-  'byte_map_map'       : {0 : {}, 1 : {1 : 1}, 2 : {1 : 1, 2 : 2}},
-  'byte_set_map'       : {0 : [], 1 : [1], 2 : [1, 2]},
-  'byte_list_map'      : {0 : [], 1 : [1], 2 : [1, 2]},
-}
-
-
-const i32 MYCONST = 2
-
-
-exception ExceptionWithAMap {
-  1: string blah;
-  2: map<string, string> map_field;
-}
-
-service ServiceForExceptionWithAMap {
-  void methodThatThrowsAnException() throws (1: ExceptionWithAMap xwamap);
-}
-
-service Srv {
-  i32 Janky(1: i32 arg);
-
-  // return type only methods
-
-  void voidMethod();
-  i32 primitiveMethod();
-  CompactProtoTestStruct structMethod();
-
-  void methodWithDefaultArgs(1: i32 something = MYCONST);
-
-  oneway void onewayMethod();
-
-  bool declaredExceptionMethod(1: bool shouldThrow) throws (1: ExceptionWithAMap xwamap);
-}
-
-service Inherited extends Srv {
-  i32 identity(1: i32 arg)
-}
-
-service EmptyService {}
-
-// The only purpose of this thing is to increase the size of the generated code
-// so that ZlibTest has more highly compressible data to play with.
-struct BlowUp {
-  1: map<list<i32>(python.immutable = ""),set<map<i32,string> (python.immutable = "")>> b1;
-  2: map<list<i32>(python.immutable = ""),set<map<i32,string> (python.immutable = "")>> b2;
-  3: map<list<i32>(python.immutable = ""),set<map<i32,string> (python.immutable = "")>> b3;
-  4: map<list<i32>(python.immutable = ""),set<map<i32,string> (python.immutable = "")>> b4;
-}
-
-
-struct ReverseOrderStruct {
-  4: string first;
-  3: i16 second;
-  2: i32 third;
-  1: i64 fourth;
-}
-
-service ReverseOrderService {
-  void myMethod(4: string first, 3: i16 second, 2: i32 third, 1: i64 fourth);
-}
-
-enum SomeEnum {
-  ONE = 1
-  TWO = 2
-}
-
-/** This is a docstring on a constant! */
-const SomeEnum MY_SOME_ENUM = SomeEnum.ONE
-
-const SomeEnum MY_SOME_ENUM_1 = 1
-/*const SomeEnum MY_SOME_ENUM_2 = 7*/
-
-const map<SomeEnum,SomeEnum> MY_ENUM_MAP = {
-  SomeEnum.ONE : SomeEnum.TWO
-}
-
-struct StructWithSomeEnum {
-  1: SomeEnum blah;
-}
-
-const map<SomeEnum,StructWithSomeEnum> EXTRA_CRAZY_MAP = {
-  SomeEnum.ONE : {"blah" : SomeEnum.TWO}
-}
-
-union TestUnion {
-  /**
-   * A doc string
-   */
-  1: string string_field;
-  2: i32 i32_field;
-  3: OneOfEach struct_field;
-  4: list<RandomStuff> struct_list;
-  5: i32 other_i32_field;
-  6: SomeEnum enum_field;
-  7: set<i32> i32_set;
-  8: map<i32, i32> i32_map;
-}
-
-union TestUnionMinusStringField {
-  2: i32 i32_field;
-  3: OneOfEach struct_field;
-  4: list<RandomStuff> struct_list;
-  5: i32 other_i32_field;
-  6: SomeEnum enum_field;
-  7: set<i32> i32_set;
-  8: map<i32, i32> i32_map;
-}
-
-union ComparableUnion {
-  1: string string_field;
-  2: binary binary_field;
-}
-
-struct StructWithAUnion {
-  1: TestUnion test_union;
-}
-
-struct PrimitiveThenStruct {
-  1: i32 blah;
-  2: i32 blah2;
-  3: Backwards bw;
-}
-
-typedef map<i32,i32> SomeMap
-
-struct StructWithASomemap {
-  1: required SomeMap somemap_field;
-}
-
-struct BigFieldIdStruct {
-  1: string field1;
-  45: string field2;
-}
-
-struct BreaksRubyCompactProtocol {
-  1: string field1;
-  2: BigFieldIdStruct field2;
-  3: i32 field3;
-}
-
-struct TupleProtocolTestStruct {
-  optional i32 field1;
-  optional i32 field2;
-  optional i32 field3;
-  optional i32 field4;
-  optional i32 field5;
-  optional i32 field6;
-  optional i32 field7;
-  optional i32 field8;
-  optional i32 field9;
-  optional i32 field10;
-  optional i32 field11;
-  optional i32 field12;
-}
-
-struct ListDoublePerf {
-  1: list<double> field;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/DenseLinkingTest.thrift b/vendor/git.apache.org/thrift.git/test/DenseLinkingTest.thrift
deleted file mode 100644
index 3a5b957..0000000
--- a/vendor/git.apache.org/thrift.git/test/DenseLinkingTest.thrift
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
-../compiler/cpp/thrift -gen cpp:dense DebugProtoTest.thrift
-../compiler/cpp/thrift -gen cpp:dense DenseLinkingTest.thrift
-g++ -Wall -g -I../lib/cpp/src -I/usr/local/include/boost-1_33_1 \
-  DebugProtoTest.cpp gen-cpp/DebugProtoTest_types.cpp \
-  gen-cpp/DenseLinkingTest_types.cpp \
-  ../lib/cpp/.libs/libthrift.a -o DebugProtoTest
-./DebugProtoTest
-*/
-
-/*
-The idea of this test is that everything is structurally identical to DebugProtoTest.
-If I messed up the naming of the reflection local typespecs,
-then compiling this should give errors because of doubly defined symbols.
-*/
-
-namespace cpp thrift.test
-namespace java thrift.test
-
-struct OneOfEachZZ {
-  1: bool im_true,
-  2: bool im_false,
-  3: byte a_bite,
-  4: i16 integer16,
-  5: i32 integer32,
-  6: i64 integer64,
-  7: double double_precision,
-  8: string some_characters,
-  9: string zomg_unicode,
-  10: bool what_who,
-}
-
-struct BonkZZ {
-  1: i32 type,
-  2: string message,
-}
-
-struct NestingZZ {
-  1: BonkZZ my_bonk,
-  2: OneOfEachZZ my_ooe,
-}
-
-struct HolyMoleyZZ {
-  1: list<OneOfEachZZ> big,
-  2: set<list<string>> contain,
-  3: map<string,list<BonkZZ>> bonks,
-}
-
-struct BackwardsZZ {
-  2: i32 first_tag2,
-  1: i32 second_tag1,
-}
-
-struct EmptyZZ {
-}
-
-struct WrapperZZ {
-  1: EmptyZZ foo
-}
-
-struct RandomStuffZZ {
-  1: i32 a,
-  2: i32 b,
-  3: i32 c,
-  4: i32 d,
-  5: list<i32> myintlist,
-  6: map<i32,WrapperZZ> maps,
-  7: i64 bigint,
-  8: double triple,
-}
-
-service Srv {
-  i32 Janky(1: i32 arg)
-}
-
-service UnderscoreSrv {
-  i64 some_rpc_call(1: string message)
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/DocTest.thrift b/vendor/git.apache.org/thrift.git/test/DocTest.thrift
deleted file mode 100644
index d702b2c..0000000
--- a/vendor/git.apache.org/thrift.git/test/DocTest.thrift
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Program doctext.
- *
- * Seriously, this is the documentation for this whole program.
- */
-
-namespace java thrift.test
-namespace cpp thrift.test
-
-// C++ comment
-/* c style comment */
-
-# the new unix comment
-
-/** Some doc text goes here.  Wow I am [nesting these] (no more nesting.) */
-enum Numberz
-{
-
-  /** This is how to document a parameter */
-  ONE = 1,
-
-  /** And this is a doc for a parameter that has no specific value assigned */
-  TWO,
-
-  THREE,
-  FIVE = 5,
-  SIX,
-  EIGHT = 8
-}
-
-/** This is how you would do a typedef doc */
-typedef i64 UserId
-
-/** And this is where you would document a struct */
-struct Xtruct
-{
-
-  /** And the members of a struct */
-  1:  string string_thing
-
-  /** doct text goes before a comma */
-  4:  i8     byte_thing,
-
-  9:  i32    i32_thing,
-  11: i64    i64_thing
-}
-
-/**
- * You can document constants now too.  Yeehaw!
- */
-const i32 INT32CONSTANT = 9853
-const i16 INT16CONSTANT = 1616
-/** Everyone get in on the docu-action! */
-const map<string,string> MAPCONSTANT = {'hello':'world', 'goodnight':'moon'}
-
-struct Xtruct2
-{
-  1: i8     byte_thing,
-  2: Xtruct struct_thing,
-  3: i32    i32_thing
-}
-
-/** Struct insanity */
-struct Insanity
-{
-
-  /** This is doc for field 1 */
-  1: map<Numberz, UserId> userMap,
-
-  /** And this is doc for field 2 */
-  2: list<Xtruct> xtructs
-}
-
-exception Xception {
-  1: i32 errorCode,
-  2: string message
-}
-
-exception Xception2 {
-  1: i32 errorCode,
-  2: Xtruct struct_thing
-}
-
-/* C1 */
-/** Doc */
-/* C2 */
-/* C3 */
-struct EmptyStruct {}
-
-struct OneField {
-  1: EmptyStruct field
-}
-
-/** This is where you would document a Service */
-service ThriftTest
-{
-
-  /** And this is how you would document functions in a service */
-  void         testVoid(),
-  string       testString(1: string thing),
-  i8           testByte(1: byte thing),
-  i32          testI32(1: i32 thing),
-
-  /** Like this one */
-  i64          testI64(1: i64 thing),
-  double       testDouble(1: double thing),
-  Xtruct       testStruct(1: Xtruct thing),
-  Xtruct2      testNest(1: Xtruct2 thing),
-  map<i32,i32> testMap(1: map<i32,i32> thing),
-  set<i32>     testSet(1: set<i32> thing),
-  list<i32>    testList(1: list<i32> thing),
-
-  /** This is an example of a function with params documented */
-  Numberz      testEnum(
-
-    /** This param is a thing */
-    1: Numberz thing
-
-  ),
-
-  UserId       testTypedef(1: UserId thing),
-
-  map<i32,map<i32,i32>> testMapMap(1: i32 hello),
-
-  /* So you think you've got this all worked, out eh? */
-  map<UserId, map<Numberz,Insanity>> testInsanity(1: Insanity argument),
-
-}
-
-/// This style of Doxy-comment doesn't work.
-typedef i32 SorryNoGo
-
-/**
- * This is a trivial example of a multiline docstring.
- */
-typedef i32 TrivialMultiLine
-
-/**
- * This is the canonical example
- * of a multiline docstring.
- */
-typedef i32 StandardMultiLine
-
-/**
- * The last line is non-blank.
- * I said non-blank! */
-typedef i32 LastLine
-
-/** Both the first line
- * are non blank. ;-)
- * and the last line */
-typedef i32 FirstAndLastLine
-
-/**
- *    INDENTED TITLE
- * The text is less indented.
- */
-typedef i32 IndentedTitle
-
-/**       First line indented.
- * Unfortunately, this does not get indented.
- */
-typedef i32 FirstLineIndent
-
-
-/**
- * void code_in_comment() {
- *   printf("hooray code!");
- * }
- */
-typedef i32 CodeInComment
-
-    /**
-     * Indented Docstring.
-     * This whole docstring is indented.
-     *   This line is indented further.
-     */
-typedef i32 IndentedDocstring
-
-/** Irregular docstring.
- * We will have to punt
-  * on this thing */
-typedef i32 Irregular1
-
-/**
- * note the space
- * before these lines
-* but not this
- * one
- */
-typedef i32 Irregular2
-
-/**
-* Flush against
-* the left.
-*/
-typedef i32 Flush
-
-/**
-  No stars in this one.
-  It should still work fine, though.
-    Including indenting.
-    */
-typedef i32 NoStars
-
-/** Trailing whitespace   
-Sloppy trailing whitespace   
-is truncated.   */
-typedef i32 TrailingWhitespace
-
-/**
- * This is a big one.
- *
- * We'll have some blank lines in it.
- * 
- * void as_well_as(some code) {
- *   puts("YEEHAW!");
- * }
- */
-typedef i32 BigDog
-
-/**
-*
-*
-*/
-typedef i32 TotallyDegenerate
-
-/**no room for newline here*/
-
-/* * / */
-typedef i32 TestFor3501a
-
-/**
- * /
- */
-typedef i32 TestFor3501b
-
-
-/* Comment-end tokens can of course have more than one asterisk */
-struct TestFor3709_00 { /* ? */ 1: i32 foo }
-/* Comment-end tokens can of course have more than one asterisk **/
-struct TestFor3709_01 { /* ? */ 1: i32 foo }
-/* Comment-end tokens can of course have more than one asterisk ***/
-struct TestFor3709_02 { /* ? */ 1: i32 foo }
-/** Comment-end tokens can of course have more than one asterisk */
-struct TestFor3709_03 { /* ? */ 1: i32 foo }
-/** Comment-end tokens can of course have more than one asterisk **/
-struct TestFor3709_04 { /* ? */ 1: i32 foo }
-/** Comment-end tokens can of course have more than one asterisk ***/
-struct TestFor3709_05 { /* ? */ 1: i32 foo }
-/*** Comment-end tokens can of course have more than one asterisk */
-struct TestFor3709_06 { /* ? */ 1: i32 foo }
-/*** Comment-end tokens can of course have more than one asterisk **/
-struct TestFor3709_07 { /* ? */ 1: i32 foo }
-/*** Comment-end tokens can of course have more than one asterisk ***/
-struct TestFor3709_08 { /* ? */ 1: i32 foo }
-
-struct TestFor3709 {
-  /** This is a comment */
-  1: required string id,
-  /** This is also a comment **/
-  2: required string typeId,
-  /** Yet another comment! */
-  3: required i32 endTimestamp
-}
-
-
-/* THE END */
diff --git a/vendor/git.apache.org/thrift.git/test/EnumTest.thrift b/vendor/git.apache.org/thrift.git/test/EnumTest.thrift
deleted file mode 100644
index f38cec3..0000000
--- a/vendor/git.apache.org/thrift.git/test/EnumTest.thrift
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-namespace c_glib TTest
-
-enum MyEnum1 {
-  ME1_0 = 0,
-  ME1_1 = 1,
-  ME1_2,
-  ME1_3,
-  ME1_5 = 5,
-  ME1_6,
-}
-
-enum MyEnum2 {
-  ME2_0,
-  ME2_1,
-  ME2_2,
-}
-
-enum MyEnum2_again {
-  // enum value identifiers may appear again in another enum type
-  ME0_1,
-  ME1_1,
-  ME2_1,
-  ME3_1,
-}
-
-enum MyEnum3 {
-  ME3_0,
-  ME3_1,
-  ME3_N2 = -2,
-  ME3_N1,
-  ME3_D0,
-  ME3_D1,
-  ME3_9 = 9,
-  ME3_10,
-}
-
-enum MyEnum4 {
-  ME4_A = 0x7ffffffd
-  ME4_B
-  ME4_C
-  // attempting to define another enum value here fails
-  // with an overflow error, as we overflow values that can be
-  // represented with an i32.
-}
-
-enum MyEnum5 {
-  e1        // fails with 0.9.3 and earlier
-  e2 = 42   // fails with 0.9.3 and earlier
-}
-
-struct MyStruct {
-  1: MyEnum2 me2_2 = MyEnum1.ME2_2
-  2: MyEnum3 me3_n2 = MyEnum3.ME3_N2
-  3: MyEnum3 me3_d1 = MyEnum3.ME3_D1
-}
-
-struct EnumTestStruct {
-  1: MyEnum3 a_enum;
-  2: list<MyEnum3> enum_list;
-  3: set<MyEnum3> enum_set;
-  4: map<MyEnum3, MyEnum3> enum_enum_map;
-  // collections as keys
-  44: map<list<MyEnum3> (python.immutable = ""), MyEnum3> list_enum_map;
-  45: map<set<MyEnum3> (python.immutable = ""), MyEnum3> set_enum_map;
-  46: map<map<MyEnum3,MyEnum3> (python.immutable = ""), MyEnum3> map_enum_map;
-  // collections as values
-  47: map<MyEnum3, map<MyEnum3, MyEnum3>> enum_map_map;
-  48: map<MyEnum3, set<MyEnum3>> enum_set_map;
-  49: map<MyEnum3, list<MyEnum3>> enum_list_map;
-}
-
-const EnumTestStruct ENUM_TEST = {
-  'a_enum': MyEnum3.ME3_D1,
-  'enum_list': [MyEnum3.ME3_D1, MyEnum3.ME3_0, MyEnum3.ME3_N2],
-  'enum_set': [MyEnum3.ME3_D1, MyEnum3.ME3_N1],
-  'enum_enum_map': {MyEnum3.ME3_D1: MyEnum3.ME3_0, MyEnum3.ME3_0: MyEnum3.ME3_D1},
-  'list_enum_map': {[MyEnum3.ME3_D1, MyEnum3.ME3_0]: MyEnum3.ME3_0, [MyEnum3.ME3_D1]: MyEnum3.ME3_0, [MyEnum3.ME3_0]: MyEnum3.ME3_D1},
-  'set_enum_map': {[MyEnum3.ME3_D1, MyEnum3.ME3_0]: MyEnum3.ME3_0, [MyEnum3.ME3_D1]: MyEnum3.ME3_0},
-  'map_enum_map': {{MyEnum3.ME3_N1: MyEnum3.ME3_10}: MyEnum3.ME3_1},
-  'enum_map_map': {MyEnum3.ME3_N1: {MyEnum3.ME3_D1: MyEnum3.ME3_D1}},
-  'enum_set_map': {MyEnum3.ME3_N2: [MyEnum3.ME3_D1, MyEnum3.ME3_N1], MyEnum3.ME3_10: [MyEnum3.ME3_D1, MyEnum3.ME3_N1]},
-  'enum_list_map': {MyEnum3.ME3_D1: [MyEnum3.ME3_10], MyEnum3.ME3_0: [MyEnum3.ME3_9, MyEnum3.ME3_10]},
-}
-
-service EnumTestService {
-  MyEnum3 testEnum(1: MyEnum3 enum1),
-  list<MyEnum3> testEnumList(1: list<MyEnum3> enum1),
-  set<MyEnum3> testEnumSet(1: set<MyEnum3> enum1),
-  map<MyEnum3, MyEnum3> testEnumMap(1: map<MyEnum3, MyEnum3> enum1),
-  EnumTestStruct testEnumStruct(1: EnumTestStruct enum1),
-}
diff --git a/vendor/git.apache.org/thrift.git/test/FullCamelTest.thrift b/vendor/git.apache.org/thrift.git/test/FullCamelTest.thrift
deleted file mode 100644
index cee4dd8..0000000
--- a/vendor/git.apache.org/thrift.git/test/FullCamelTest.thrift
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace java thrift.test.fullcamel
-
-struct OneOfEachZZ {
-  1: bool im_true,
-  2: bool im_false,
-  3: byte a_bite,
-  4: i16 integer16,
-  5: i32 integer32,
-  6: i64 integer64,
-  7: double double_precision,
-  8: string some_characters,
-  9: string zomg_unicode,
-  10: bool what_who,
-}
-
-service UnderscoreSrv {
-  i64 some_rpc_call(1: string message)
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/Include.thrift b/vendor/git.apache.org/thrift.git/test/Include.thrift
deleted file mode 100644
index 562319b..0000000
--- a/vendor/git.apache.org/thrift.git/test/Include.thrift
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-include "ThriftTest.thrift"
-
-struct IncludeTest {
-  1: required ThriftTest.Bools bools
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/JavaBeansTest.thrift b/vendor/git.apache.org/thrift.git/test/JavaBeansTest.thrift
deleted file mode 100644
index b6c3ea8..0000000
--- a/vendor/git.apache.org/thrift.git/test/JavaBeansTest.thrift
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace java thrift.test
-
-struct OneOfEachBeans {
-  1: bool boolean_field,
-  2: byte a_bite,
-  3: i16 integer16,
-  4: i32 integer32,
-  5: i64 integer64,
-  6: double double_precision,
-  7: string some_characters,
-  8: binary base64,
-  9: list<byte> byte_list,
-  10: list<i16> i16_list,
-  11: list<i64> i64_list
-}
-
-
-service Service {
-  i64 mymethod(i64 blah);
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/JavaTypes.thrift b/vendor/git.apache.org/thrift.git/test/JavaTypes.thrift
deleted file mode 100644
index fcb0ab2..0000000
--- a/vendor/git.apache.org/thrift.git/test/JavaTypes.thrift
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace java thrift.test
-
-struct Integer {
-  1: i32 val
-}
-
-struct String {
-  1: string val
-}
-
-struct Boolean {
-  1: bool val
-}
-
-struct Double {
-  1: double val
-}
-
-struct Long {
-  1: i64 val
-}
-
-struct Byte {
-  1: byte val
-}
-
-struct Float {
-  1: double val
-}
-
-struct List {
-  1: list<string> vals
-}
-
-struct ArrayList {
-  1: list<string> vals
-}
-
-struct SortedMap {
-  1: map<string, string> vals
-}
-
-struct TreeMap {
-  1: map<string, string> vals
-}
-
-struct HashMap {
-  1: map<string, String> vals
-}
-
-struct Map {
-  1: map<double, Double> vals
-}
-
-struct Object {
-  1: Integer integer,
-  2: String str,
-  3: Boolean boolean_field,
-  4: Double dbl,
-  5: Byte bite,
-  6: map<i32, Integer> intmap,
-  7: Map somemap,
-}
-
-exception Exception {
-  1: string msg
-}
-
-service AsyncNonblockingService {
-  Object mymethod(
-    1: Integer integer,
-    2: String str,
-    3: Boolean boolean_field,
-    4: Double dbl,
-    5: Byte bite,
-    6: map<i32, Integer> intmap,
-    7: Map somemap,
-  ) throws (1:Exception ex);
-}
diff --git a/vendor/git.apache.org/thrift.git/test/JsDeepConstructorTest.thrift b/vendor/git.apache.org/thrift.git/test/JsDeepConstructorTest.thrift
deleted file mode 100644
index ef5126f..0000000
--- a/vendor/git.apache.org/thrift.git/test/JsDeepConstructorTest.thrift
+++ /dev/null
@@ -1,18 +0,0 @@
-struct Simple {
-  1: string value
-}
-
-struct Complex {
-  1: Simple struct_field
-  2: list<Simple> struct_list_field
-  3: set<Simple> struct_set_field
-  4: map<string,Simple> struct_map_field
-  5: list<set<map<string,list<Simple>>>> struct_nested_containers_field
-  6: map<string, list<map<string,Simple>> > struct_nested_containers_field2
-  7: list<list<string>> list_of_list_field
-  8: list<list<list<string>>> list_of_list_of_list_field
-}
-
-struct ComplexList {
-  1: list<Complex> struct_list_field;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/Makefile.am b/vendor/git.apache.org/thrift.git/test/Makefile.am
deleted file mode 100755
index ff780c3..0000000
--- a/vendor/git.apache.org/thrift.git/test/Makefile.am
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SUBDIRS = features
-PRECROSS_TARGET =
-
-if WITH_C_GLIB
-SUBDIRS += c_glib
-PRECROSS_TARGET += precross-c_glib
-endif
-
-if WITH_MONO
-SUBDIRS += csharp
-PRECROSS_TARGET += precross-csharp
-endif
-
-if WITH_CPP
-SUBDIRS += cpp
-PRECROSS_TARGET += precross-cpp
-endif
-
-if WITH_PERL
-SUBDIRS += perl
-PRECROSS_TARGET += precross-perl
-endif
-
-if WITH_PHP
-SUBDIRS += php
-PRECROSS_TARGET += precross-php
-endif
-
-if WITH_DART
-SUBDIRS += dart
-PRECROSS_TARGET += precross-dart
-endif
-
-if WITH_PYTHON
-SUBDIRS += py
-PRECROSS_TARGET += precross-py
-SUBDIRS += py.tornado
-if WITH_TWISTED_TEST
-SUBDIRS += py.twisted
-endif
-endif
-
-if WITH_RUBY
-SUBDIRS += rb
-PRECROSS_TARGET += precross-rb
-endif
-
-if WITH_HASKELL
-SUBDIRS += hs
-endif
-
-if WITH_HAXE
-SUBDIRS += haxe
-endif
-
-if WITH_GO
-SUBDIRS += go
-PRECROSS_TARGET += precross-go
-endif
-
-if WITH_ERLANG
-SUBDIRS += erl
-PRECROSS_TARGET += precross-erl
-endif
-
-if WITH_LUA
-SUBDIRS += lua
-PRECROSS_TARGET += precross-lua
-endif
-
-#
-# generate html for ThriftTest.thrift
-#
-check-local:
-	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
-
-clean-local:
-	rm -rf $(top_srcdir)/test/gen-html
-
-EXTRA_DIST = \
-	audit \
-	crossrunner \
-	keys \
-	c_glib \
-	cpp \
-	dart \
-	erl \
-	hs \
-	lua \
-	ocaml \
-	perl \
-	php \
-	py \
-	py.twisted \
-	py.tornado \
-	rb \
-	threads \
-	AnnotationTest.thrift \
-	BrokenConstants.thrift \
-	ConstantsDemo.thrift \
-	DebugProtoTest.thrift \
-	DenseLinkingTest.thrift \
-	DocTest.thrift \
-	EnumTest.thrift \
-	FullCamelTest.thrift \
-	Include.thrift \
-	JavaBeansTest.thrift \
-	JavaTypes.thrift \
-	JsDeepConstructorTest.thrift \
-	ManyOptionals.thrift \
-	ManyTypedefs.thrift \
-	NameConflictTest.thrift \
-	OptionalRequiredTest.thrift \
-	Recursive.thrift \
-	ReuseObjects.thrift \
-	SmallTest.thrift \
-	StressTest.thrift \
-	ThriftTest.thrift \
-	TypedefTest.thrift \
-	known_failures_Linux.json \
-	test.py \
-	tests.json \
-	rebuild_known_failures.sh \
-	result.js \
-	index.html \
-	README.md \
-	valgrind.suppress
-
-precross-%:
-	$(MAKE) -C $* precross
-precross: $(PRECROSS_TARGET)
diff --git a/vendor/git.apache.org/thrift.git/test/ManyOptionals.thrift b/vendor/git.apache.org/thrift.git/test/ManyOptionals.thrift
deleted file mode 100644
index 3fb1d68..0000000
--- a/vendor/git.apache.org/thrift.git/test/ManyOptionals.thrift
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// The java codegenerator has a few different codepaths depending
-// on how many optionals the struct has; this attempts to exercise
-// them.
-
-namespace java thrift.test
-
-struct Opt4 {
-  1: i32 def1;
-  2: i32 def2;
-  3: i32 def3;
-  4: i32 def4;
-}
-
-struct Opt13 {
-  1: i32 def1;
-  2: i32 def2;
-  3: i32 def3;
-  4: i32 def4;
-  5: i32 def5;
-  6: i32 def6;
-  7: i32 def7;
-  8: i32 def8;
-  9: i32 def9;
-  10: i32 def10;
-  11: i32 def11;
-  12: i32 def12;
-  13: i32 def13;
-}
-
-struct Opt30 {
-  1: i32 def1;
-  2: i32 def2;
-  3: i32 def3;
-  4: i32 def4;
-  5: i32 def5;
-  6: i32 def6;
-  7: i32 def7;
-  8: i32 def8;
-  9: i32 def9;
-  10: i32 def10;
-  11: i32 def11;
-  12: i32 def12;
-  13: i32 def13;
-  14: i32 def14;
-  15: i32 def15;
-  16: i32 def16;
-  17: i32 def17;
-  18: i32 def18;
-  19: i32 def19;
-  20: i32 def20;
-  21: i32 def21;
-  22: i32 def22;
-  23: i32 def23;
-  24: i32 def24;
-  25: i32 def25;
-  26: i32 def26;
-  27: i32 def27;
-  28: i32 def28;
-  29: i32 def29;
-  30: i32 def30;
-}
-
-struct Opt64 {
-  1: i32 def1;
-  2: i32 def2;
-  3: i32 def3;
-  4: i32 def4;
-  5: i32 def5;
-  6: i32 def6;
-  7: i32 def7;
-  8: i32 def8;
-  9: i32 def9;
-  10: i32 def10;
-  11: i32 def11;
-  12: i32 def12;
-  13: i32 def13;
-  14: i32 def14;
-  15: i32 def15;
-  16: i32 def16;
-  17: i32 def17;
-  18: i32 def18;
-  19: i32 def19;
-  20: i32 def20;
-  21: i32 def21;
-  22: i32 def22;
-  23: i32 def23;
-  24: i32 def24;
-  25: i32 def25;
-  26: i32 def26;
-  27: i32 def27;
-  28: i32 def28;
-  29: i32 def29;
-  30: i32 def30;
-  31: i32 def31;
-  32: i32 def32;
-  33: i32 def33;
-  34: i32 def34;
-  35: i32 def35;
-  36: i32 def36;
-  37: i32 def37;
-  38: i32 def38;
-  39: i32 def39;
-  40: i32 def40;
-  41: i32 def41;
-  42: i32 def42;
-  43: i32 def43;
-  44: i32 def44;
-  45: i32 def45;
-  46: i32 def46;
-  47: i32 def47;
-  48: i32 def48;
-  49: i32 def49;
-  50: i32 def50;
-  51: i32 def51;
-  52: i32 def52;
-  53: i32 def53;
-  54: i32 def54;
-  55: i32 def55;
-  56: i32 def56;
-  57: i32 def57;
-  58: i32 def58;
-  59: i32 def59;
-  60: i32 def60;
-  61: i32 def61;
-  62: i32 def62;
-  63: i32 def63;
-  64: i32 def64;
-}
-
-struct Opt80 {
-  1: i32 def1;
-  2: i32 def2;
-  3: i32 def3;
-  4: i32 def4;
-  5: i32 def5;
-  6: i32 def6;
-  7: i32 def7;
-  8: i32 def8;
-  9: i32 def9;
-  10: i32 def10;
-  11: i32 def11;
-  12: i32 def12;
-  13: i32 def13;
-  14: i32 def14;
-  15: i32 def15;
-  16: i32 def16;
-  17: i32 def17;
-  18: i32 def18;
-  19: i32 def19;
-  20: i32 def20;
-  21: i32 def21;
-  22: i32 def22;
-  23: i32 def23;
-  24: i32 def24;
-  25: i32 def25;
-  26: i32 def26;
-  27: i32 def27;
-  28: i32 def28;
-  29: i32 def29;
-  30: i32 def30;
-  31: i32 def31;
-  32: i32 def32;
-  33: i32 def33;
-  34: i32 def34;
-  35: i32 def35;
-  36: i32 def36;
-  37: i32 def37;
-  38: i32 def38;
-  39: i32 def39;
-  40: i32 def40;
-  41: i32 def41;
-  42: i32 def42;
-  43: i32 def43;
-  44: i32 def44;
-  45: i32 def45;
-  46: i32 def46;
-  47: i32 def47;
-  48: i32 def48;
-  49: i32 def49;
-  50: i32 def50;
-  51: i32 def51;
-  52: i32 def52;
-  53: i32 def53;
-  54: i32 def54;
-  55: i32 def55;
-  56: i32 def56;
-  57: i32 def57;
-  58: i32 def58;
-  59: i32 def59;
-  60: i32 def60;
-  61: i32 def61;
-  62: i32 def62;
-  63: i32 def63;
-  64: i32 def64;
-  65: i32 def65;
-  66: i32 def66;
-  67: i32 def67;
-  68: i32 def68;
-  69: i32 def69;
-  70: i32 def70;
-  71: i32 def71;
-  72: i32 def72;
-  73: i32 def73;
-  74: i32 def74;
-  75: i32 def75;
-  76: i32 def76;
-  77: i32 def77;
-  78: i32 def78;
-  79: i32 def79;
-  80: i32 def80;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/ManyTypedefs.thrift b/vendor/git.apache.org/thrift.git/test/ManyTypedefs.thrift
deleted file mode 100644
index d194b63..0000000
--- a/vendor/git.apache.org/thrift.git/test/ManyTypedefs.thrift
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// This is to make sure you don't mess something up when you change typedef code.
-// Generate it with the old and new thrift and make sure they are the same.
-/*
-rm -rf gen-* orig-*
-mkdir old new
-thrift --gen cpp --gen java --gen php --gen phpi --gen py --gen rb --gen xsd --gen perl --gen ocaml --gen erl --gen hs --strict ManyTypedefs.thrift
-mv gen-* old
-../compiler/cpp/thrift --gen cpp --gen java --gen php --gen phpi --gen py --gen rb --gen xsd --gen perl --gen ocaml --gen erl --gen hs --strict ManyTypedefs.thrift
-mv gen-* new
-diff -ur old new
-rm -rf old new
-# There should be no output.
-*/
-
-typedef i32 int32
-typedef list<map<int32, string>> biglist
-
-struct struct1 {
-  1: int32 myint;
-  2: biglist mylist;
-}
-
-exception exception1 {
-  1: biglist alist;
-  2: struct1 mystruct;
-}
-
-service AService {
-  struct1 method1(1: int32 myint) throws (1: exception1 exn);
-  biglist method2();
-}
diff --git a/vendor/git.apache.org/thrift.git/test/NameConflictTest.thrift b/vendor/git.apache.org/thrift.git/test/NameConflictTest.thrift
deleted file mode 100644
index d3efb47..0000000
--- a/vendor/git.apache.org/thrift.git/test/NameConflictTest.thrift
+++ /dev/null
@@ -1,110 +0,0 @@
-// Naming testcases, sepcifically for these tickets (but not limited to them)
-// THRIFT-2508 Uncompileable C# code due to language keywords in IDL
-// THRIFT-2557 error CS0542 member names cannot be the same as their enclosing type
-
-
-struct using {
-    1: double single
-    2: double integer
-}
-
-struct delegate {
-    1: string partial
-    2: delegate delegate
-}
-
-struct get {
-    1: bool sbyte
-}
-
-struct partial {
-    1: using using
-    2: bool read
-    3: bool write
-}
-
-enum Maybe {
-  JUST = 1,
-  TRUE = 2,
-  FALSE = 3
-}
-
-enum Either {
-  LEFT = 1,
-  RIGHT = 2
-}
-
-struct foldr {
-  1: string id
-}
-
-struct of {
-  1: string let
-  2: string where
-}
-
-struct ofOf {
-  1: of Of
-}
-
-
-struct ClassAndProp {
-  1: bool ClassAndProp
-  2: bool ClassAndProp_
-  3: bool ClassAndProp__
-  4: bool ClassAndProper
-}
-
-struct second_chance {
-  1: bool SECOND_CHANCE
-  2: bool SECOND_CHANCE_
-  3: bool SECOND_CHANCE__
-  4: bool SECOND_CHANCES
-}
-
-struct NOW_EAT_THIS {
-  1: bool now_eat_this
-  2: bool now_eat_this_
-  3: bool now_eat_this__
-  4: bool now_eat_this_and_this
-}
-
-struct TheEdgeCase {
-  1: bool theEdgeCase
-  2: bool theEdgeCase_
-  3: bool theEdgeCase__
-  4: bool TheEdgeCase
-  5: bool TheEdgeCase_
-  6: bool TheEdgeCase__
-}
-
-struct Tricky_ {
-  1: bool tricky
-  2: bool Tricky
-}
-
-struct Nested {
-  1: ClassAndProp ClassAndProp
-  2: second_chance second_chance
-  3: NOW_EAT_THIS NOW_EAT_THIS
-  4: TheEdgeCase TheEdgeCase
-  5: Tricky_ Tricky_
-  6: Nested Nested
-}
-
-exception Problem_ {
-  1: bool problem
-  2: bool Problem
-}
-
-
-service extern {
-    delegate event(1: partial get)
-    void Foo(1: Nested Foo_args) throws (1: Problem_ Foo_result)
-}
-
-service qualified {
-    Maybe maybe(1: Maybe foldr)
-    Either either(1: foldr of)
-}
-// eof
diff --git a/vendor/git.apache.org/thrift.git/test/OptionalRequiredTest.thrift b/vendor/git.apache.org/thrift.git/test/OptionalRequiredTest.thrift
deleted file mode 100644
index a608898..0000000
--- a/vendor/git.apache.org/thrift.git/test/OptionalRequiredTest.thrift
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-namespace c_glib TTest
-namespace cpp thrift.test
-namespace java thrift.test
-
-struct OldSchool {
-  1: i16    im_int;
-  2: string im_str;
-  3: list<map<i32,string>> im_big;
-}
-
-struct Simple {
-  1: /* :) */ i16 im_default;
-  2: required i16 im_required;
-  3: optional i16 im_optional;
-}
-
-struct Tricky1 {
-  1: /* :) */ i16 im_default;
-}
-
-struct Tricky2 {
-  1: optional i16 im_optional;
-}
-
-struct Tricky3 {
-  1: required i16 im_required;
-}
-
-struct OptionalDefault {
-  1: optional i16 opt_int = 1234;
-  2: optional string opt_str = "default";
-}
-
-struct Complex {
-  1:          i16 cp_default;
-  2: required i16 cp_required;
-  3: optional i16 cp_optional;
-  4:          map<i16,Simple> the_map;
-  5: required Simple req_simp;
-  6: optional Simple opt_simp;
-}
-
-struct ManyOpt {
-  1: optional i32 opt1;
-  2: optional i32 opt2;
-  3: optional i32 opt3;
-  4:          i32 def4;
-  5: optional i32 opt5;
-  6: optional i32 opt6;
-}
-
-struct JavaTestHelper {
-  1: required i32    req_int;
-  2: optional i32    opt_int;
-  3: required string req_obj;
-  4: optional string opt_obj;
-  5: required binary req_bin;
-  6: optional binary opt_bin;
-}
-
-struct Binaries {
-  4: binary bin;
-  5: required binary req_bin;
-  6: optional binary opt_bin;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/README.md b/vendor/git.apache.org/thrift.git/test/README.md
deleted file mode 100755
index 0682f5d..0000000
--- a/vendor/git.apache.org/thrift.git/test/README.md
+++ /dev/null
@@ -1,185 +0,0 @@
-# Apache Thrift - integration test suite
-
-This is the cross everything integration test suite for Apache Thrift.
-
-## Run
-
-### A. Using Make
-
-The test can be executed by:
-
-    make cross
-
-This starts the [test.py](test.py) script which does the real cross test with
-different transports, protocols and languages.
-
-Note that this skips any language that is not built locally. It also skips
-tests that are known to be failing. If you need more control over which tests
-to run, read following section.
-
-### B. Using test script directly
-
-Alternatively, you can invoke [test.py](test.py) directly. You need to run`make
-precross` once before executing it for the first time.
-
-For example, if you changed something in `nodejs` library and need to verify
-the patch, you can skip everything except `nodejs` itself and some reference
-implementation (currently `cpp` and `java` are recommended) like this:
-
-    ./configure --without-c_glib -without-csharp --without-erlang --without-lua ...
-    make precross -j8
-    test/test.py --server cpp,java --client nodejs
-    test/test.py --server nodejs --client cpp,java
-
-Another useful flag is --regex. For example, to run all tests that involve
-Java TBinaryProtocol:
-
-    test/test.py --regex "java.*binary"
-
-## Test case definition file
-
-The cross test cases are defined in [tests.json](tests.json).
-The root element is collection of test target definitions.
-Each test target definition looks like this:
-
-    {
-      "name": "somelib",
-
-      "client": {
-        "command": ["somelib_client_executable"],
-        "workdir": "somelib/bin",
-        "protocols": ["binary"],
-        "transports": ["buffered"],
-        "sockets": ["ip"],
-      },
-      "server": {
-        "command": ["somelib_server_executable"],
-        "workdir": "somelib/bin",
-        "protocols": ["binary"],
-        "transports": ["buffered"],
-        "sockets": ["ip", "ip-ssl"],
-      }
-    }
-
-Either client or server definition or both should be present.
-
-Parameters that are common to both `client` and `server` can be put to target
-definition root:
-
-    {
-      "name": "somelib",
-
-      "workdir": "somelib/bin",
-      "protocols": ["binary"],
-      "transports": ["buffered"],
-      "sockets": ["ip"],
-
-      "client": { "command": ["somelib_client_executable"] },
-      "server": {
-        "command": ["somelib_server_executable"],
-        "sockets": ["ip-ssl"]
-      }
-    }
-
-For the complete list of supported keys and their effect, see source code
-comment at the opt of [crossrunner/collect.py](crossrunner/collect.py).
-
-
-## List of known failures
-
-Since many cross tests currently fail (mainly due to partial incompatibility
-around exception handling), the test script specifically report for "not known
-before" failures.
-
-For this purpose, test cases known to (occasionally) fail are listed in
-`known_failures_<platform>.json` where `<platform>` matches with python
-`platform.system()` string.
-
-Currently, only Linux version is included.
-
-FYI, the file is initially generated by
-
-    test/test.py --update-expected-failures=overwrite
-
-after a full test run, then repeatedly
-
-    test/test.py --skip-known-failures
-    test/test.py --update-expected-failures=merge
-
-to update the known failures, run
-
-    make fail
-
-## Test executable specification
-
-### Command line parameters
-
-Unit tests for languages are usually located under lib/<lang>/test/
-cross language tests according to [ThriftTest.thrift](ThriftTest.thrift) shall be
-provided for every language including executables with the following command
-line interface:
-
-**Server command line interface:**
-
-    $ ./cpp/TestServer -h
-    Allowed options:
-      -h [ --help ]               produce help message
-      --port arg (=9090)          Port number to listen
-      --domain-socket arg         Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)
-      --named-pipe arg            Windows Named Pipe (e.g. MyThriftPipe)
-      --server-type arg (=simple) type of server, "simple", "thread-pool",
-                                  "threaded", or "nonblocking"
-      --transport arg (=buffered) transport: buffered, framed, http, anonpipe
-      --protocol arg (=binary)    protocol: binary, compact, json
-      --ssl                       Encrypted Transport using SSL
-      --processor-events          processor-events
-      -n [ --workers ] arg (=4)   Number of thread pools workers. Only valid for
-                              thread-pool server type
-
-**Client command line interface:**
-
-    $ ./cpp/TestClient -h
-    Allowed options:
-      -h [ --help ]               produce help message
-      --host arg (=localhost)     Host to connect
-      --port arg (=9090)          Port number to connect
-      --domain-socket arg         Domain Socket (e.g. /tmp/ThriftTest.thrift),
-                                  instead of host and port
-      --named-pipe arg            Windows Named Pipe (e.g. MyThriftPipe)
-      --anon-pipes hRead hWrite   Windows Anonymous Pipes pair (handles)
-      --transport arg (=buffered) Transport: buffered, framed, http, evhttp
-      --protocol arg (=binary)    Protocol: binary, compact, json
-      --ssl                       Encrypted Transport using SSL
-      -n [ --testloops ] arg (=1) Number of Tests
-      -t [ --threads ] arg (=1)   Number of Test threads
-
-If you have executed the **make check** or **make cross** then you will be able to browse
-[gen-html/ThriftTest.html](gen-html/ThriftTest.html) with the test documentation.
-
-### Return code
-
-The return code (exit code) shall be 0 on success, or an integer in the range 1 - 255 on errors.
-In order to signal failed tests, the return code shall be composed from these bits to indicate
-failing tests:
-
-      #define TEST_BASETYPES     1  // 0000 0001
-      #define TEST_STRUCTS       2  // 0000 0010
-      #define TEST_CONTAINERS    4  // 0000 0100
-      #define TEST_EXCEPTIONS    8  // 0000 1000
-      #define TEST_UNKNOWN      64  // 0100 0000 (Failed to prepare environemt etc.)
-      #define TEST_TIMEOUT     128  // 1000 0000
-      #define TEST_NOTUSED      48  // 0011 0000 (reserved bits)
-
-Tests that have not been executed at all count as errors.
-
-**Example:**
-
-During tests, the test client notices that some of the Struct tests fail.
-Furthermore, due to some other problem none of the Exception tests is executed.
-Therefore, the test client returns the code `10 = 2 | 8`, indicating the failure
-of both test 2 (TEST_STRUCTS) and test 8 (TEST_EXCEPTIONS).
-
-
-## SSL
-Test Keys and Certificates are provided in multiple formats under the following
-directory [test/keys](keys)
diff --git a/vendor/git.apache.org/thrift.git/test/Recursive.thrift b/vendor/git.apache.org/thrift.git/test/Recursive.thrift
deleted file mode 100644
index c982582..0000000
--- a/vendor/git.apache.org/thrift.git/test/Recursive.thrift
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-struct RecTree {
-  1: list<RecTree> children
-  2: i16 item
-}
-
-struct RecList {
-  1: RecList & nextitem
-  3: i16 item
-}
-
-struct CoRec {
-  1:  CoRec2 & other
-}
-
-struct CoRec2 {
-  1: CoRec other
-}
-
-struct VectorTest {
-  1: list<RecList> lister;
-}
-
-service TestService
-{
-  RecTree echoTree(1:RecTree tree)
-  RecList echoList(1:RecList lst)
-  CoRec echoCoRec(1:CoRec item)
-}
diff --git a/vendor/git.apache.org/thrift.git/test/ReuseObjects.thrift b/vendor/git.apache.org/thrift.git/test/ReuseObjects.thrift
deleted file mode 100644
index 2dd6c6e..0000000
--- a/vendor/git.apache.org/thrift.git/test/ReuseObjects.thrift
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// The java codegenerator has option to reuse objects for deserialization
-
-namespace java thrift.test
-
-include "ThriftTest.thrift"
-
-struct Reuse {
-  1: i32 val1;
-  2: set<string> val2;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/SmallTest.thrift b/vendor/git.apache.org/thrift.git/test/SmallTest.thrift
deleted file mode 100644
index d0821c7..0000000
--- a/vendor/git.apache.org/thrift.git/test/SmallTest.thrift
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-namespace rb TestNamespace
-
-struct Goodbyez {
-  1: i32 val = 325;
-}
-
-senum Thinger {
-  "ASDFKJ",
-  "r32)*F#@",
-  "ASDFLJASDF"
-}
-
-struct BoolPasser {
-  1: bool value = 1
-}
-
-struct Hello {
-  1: i32 simple = 53,
-  2: map<i32,i32> complex = {23:532, 6243:632, 2355:532},
-  3: map<i32, map<i32,i32>> complexer,
-  4: string words = "words",
-  5: Goodbyez thinz = {'val' : 36632}
-}
-
-const map<i32,map<i32,i32>> CMAP = { 235: {235:235}, 53:{53:53} }
-const i32 CINT = 325;
-const Hello WHOA = {'simple' : 532}
-
-exception Goodbye {
-  1: i32 simple,
-  2: map<i32,i32> complex,
-  3: map<i32, map<i32,i32>> complexer,
-}
-
-service SmallService {
-  Thinger testThinger(1:Thinger bootz),
-  Hello testMe(1:i32 hello=64, 2: Hello wonk) throws (1: Goodbye g),
-  void testVoid() throws (1: Goodbye g),
-  i32 testI32(1:i32 boo)
-}
diff --git a/vendor/git.apache.org/thrift.git/test/StressTest.thrift b/vendor/git.apache.org/thrift.git/test/StressTest.thrift
deleted file mode 100644
index 431811b..0000000
--- a/vendor/git.apache.org/thrift.git/test/StressTest.thrift
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace cpp test.stress
-namespace d thrift.test.stress
-namespace go stress
-
-service Service {
-
-  void echoVoid(),
-  i8 echoByte(1: i8 arg),
-  i32 echoI32(1: i32 arg),
-  i64 echoI64(1: i64 arg),
-  string echoString(1: string arg),
-  list<i8>  echoList(1: list<i8> arg),
-  set<i8>  echoSet(1: set<i8> arg),
-  map<i8, i8>  echoMap(1: map<i8, i8> arg),
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/ThriftTest.thrift b/vendor/git.apache.org/thrift.git/test/ThriftTest.thrift
deleted file mode 100644
index ca70873..0000000
--- a/vendor/git.apache.org/thrift.git/test/ThriftTest.thrift
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-namespace c_glib TTest
-namespace java thrift.test
-namespace cpp thrift.test
-namespace rb Thrift.Test
-namespace perl ThriftTest
-namespace csharp Thrift.Test
-namespace js ThriftTest
-namespace st ThriftTest
-namespace py ThriftTest
-namespace py.twisted ThriftTest
-namespace go thrifttest
-namespace php ThriftTest
-namespace delphi Thrift.Test
-namespace cocoa ThriftTest
-namespace lua ThriftTest
-namespace xsd test (uri = 'http://thrift.apache.org/ns/ThriftTest')
-
-// Presence of namespaces and sub-namespaces for which there is
-// no generator should compile with warnings only
-namespace noexist ThriftTest
-namespace cpp.noexist ThriftTest
-
-namespace * thrift.test
-
-/**
- * Docstring!
- */
-enum Numberz
-{
-  ONE = 1,
-  TWO,
-  THREE,
-  FIVE = 5,
-  SIX,
-  EIGHT = 8
-}
-
-const Numberz myNumberz = Numberz.ONE;
-// the following is expected to fail:
-// const Numberz urNumberz = ONE;
-
-typedef i64 UserId
-
-struct Bonk
-{
-  1: string message,
-  2: i32 type
-}
-
-typedef map<string,Bonk> MapType
-
-struct Bools {
-  1: bool im_true,
-  2: bool im_false,
-}
-
-struct Xtruct
-{
-  1:  string string_thing,
-  4:  i8     byte_thing,
-  9:  i32    i32_thing,
-  11: i64    i64_thing
-}
-
-struct Xtruct2
-{
-  1: i8     byte_thing,  // used to be byte, hence the name
-  2: Xtruct struct_thing,
-  3: i32    i32_thing
-}
-
-struct Xtruct3
-{
-  1:  string string_thing,
-  4:  i32    changed,
-  9:  i32    i32_thing,
-  11: i64    i64_thing
-}
-
-
-struct Insanity
-{
-  1: map<Numberz, UserId> userMap,
-  2: list<Xtruct> xtructs
-} (python.immutable= "")
-
-struct CrazyNesting {
-  1: string string_field,
-  2: optional set<Insanity> set_field,
-  // Do not insert line break as test/go/Makefile.am is removing this line with pattern match
-  3: required list<map<set<i32> (python.immutable = ""), map<i32,set<list<map<Insanity,string>(python.immutable = "")> (python.immutable = "")>>>> list_field,
-  4: binary binary_field
-}
-
-union SomeUnion {
-  1: map<Numberz, UserId> map_thing,
-  2: string string_thing,
-  3: i32 i32_thing,
-  4: Xtruct3 xtruct_thing,
-  5: Insanity insanity_thing
-}
-
-exception Xception {
-  1: i32 errorCode,
-  2: string message
-}
-
-exception Xception2 {
-  1: i32 errorCode,
-  2: Xtruct struct_thing
-}
-
-struct EmptyStruct {}
-
-struct OneField {
-  1: EmptyStruct field
-}
-
-service ThriftTest
-{
-  /**
-   * Prints "testVoid()" and returns nothing.
-   */
-  void         testVoid(),
-
-  /**
-   * Prints 'testString("%s")' with thing as '%s'
-   * @param string thing - the string to print
-   * @return string - returns the string 'thing'
-   */
-  string       testString(1: string thing),
-
-  /**
-   * Prints 'testBool("%s")' where '%s' with thing as 'true' or 'false'
-   * @param bool  thing - the bool data to print
-   * @return bool  - returns the bool 'thing'
-   */
-  bool         testBool(1: bool thing),
-
-  /**
-   * Prints 'testByte("%d")' with thing as '%d'
-   * The types i8 and byte are synonyms, use of i8 is encouraged, byte still exists for the sake of compatibility.
-   * @param byte thing - the i8/byte to print
-   * @return i8 - returns the i8/byte 'thing'
-   */
-  i8           testByte(1: i8 thing),
-
-  /**
-   * Prints 'testI32("%d")' with thing as '%d'
-   * @param i32 thing - the i32 to print
-   * @return i32 - returns the i32 'thing'
-   */
-  i32          testI32(1: i32 thing),
-
-  /**
-   * Prints 'testI64("%d")' with thing as '%d'
-   * @param i64 thing - the i64 to print
-   * @return i64 - returns the i64 'thing'
-   */
-  i64          testI64(1: i64 thing),
-
-  /**
-   * Prints 'testDouble("%f")' with thing as '%f'
-   * @param double thing - the double to print
-   * @return double - returns the double 'thing'
-   */
-  double       testDouble(1: double thing),
-
-  /**
-   * Prints 'testBinary("%s")' where '%s' is a hex-formatted string of thing's data
-   * @param binary  thing - the binary data to print
-   * @return binary  - returns the binary 'thing'
-   */
-  binary       testBinary(1: binary thing),
-  
-  /**
-   * Prints 'testStruct("{%s}")' where thing has been formatted into a string of comma separated values
-   * @param Xtruct thing - the Xtruct to print
-   * @return Xtruct - returns the Xtruct 'thing'
-   */
-  Xtruct       testStruct(1: Xtruct thing),
-
-  /**
-   * Prints 'testNest("{%s}")' where thing has been formatted into a string of the nested struct
-   * @param Xtruct2 thing - the Xtruct2 to print
-   * @return Xtruct2 - returns the Xtruct2 'thing'
-   */
-  Xtruct2      testNest(1: Xtruct2 thing),
-
-  /**
-   * Prints 'testMap("{%s")' where thing has been formatted into a string of  'key => value' pairs
-   *  separated by commas and new lines
-   * @param map<i32,i32> thing - the map<i32,i32> to print
-   * @return map<i32,i32> - returns the map<i32,i32> 'thing'
-   */
-  map<i32,i32> testMap(1: map<i32,i32> thing),
-
-  /**
-   * Prints 'testStringMap("{%s}")' where thing has been formatted into a string of  'key => value' pairs
-   *  separated by commas and new lines
-   * @param map<string,string> thing - the map<string,string> to print
-   * @return map<string,string> - returns the map<string,string> 'thing'
-   */
-  map<string,string> testStringMap(1: map<string,string> thing),
-
-  /**
-   * Prints 'testSet("{%s}")' where thing has been formatted into a string of  values
-   *  separated by commas and new lines
-   * @param set<i32> thing - the set<i32> to print
-   * @return set<i32> - returns the set<i32> 'thing'
-   */
-  set<i32>     testSet(1: set<i32> thing),
-
-  /**
-   * Prints 'testList("{%s}")' where thing has been formatted into a string of  values
-   *  separated by commas and new lines
-   * @param list<i32> thing - the list<i32> to print
-   * @return list<i32> - returns the list<i32> 'thing'
-   */
-  list<i32>    testList(1: list<i32> thing),
-
-  /**
-   * Prints 'testEnum("%d")' where thing has been formatted into it's numeric value
-   * @param Numberz thing - the Numberz to print
-   * @return Numberz - returns the Numberz 'thing'
-   */
-  Numberz      testEnum(1: Numberz thing),
-
-  /**
-   * Prints 'testTypedef("%d")' with thing as '%d'
-   * @param UserId thing - the UserId to print
-   * @return UserId - returns the UserId 'thing'
-   */
-  UserId       testTypedef(1: UserId thing),
-
-  /**
-   * Prints 'testMapMap("%d")' with hello as '%d'
-   * @param i32 hello - the i32 to print
-   * @return map<i32,map<i32,i32>> - returns a dictionary with these values:
-   *   {-4 => {-4 => -4, -3 => -3, -2 => -2, -1 => -1, }, 4 => {1 => 1, 2 => 2, 3 => 3, 4 => 4, }, }
-   */
-  map<i32,map<i32,i32>> testMapMap(1: i32 hello),
-
-  /**
-   * So you think you've got this all worked, out eh?
-   *
-   * Creates a the returned map with these values and prints it out:
-   *   { 1 => { 2 => argument,
-   *            3 => argument,
-   *          },
-   *     2 => { 6 => <empty Insanity struct>, },
-   *   }
-   * @return map<UserId, map<Numberz,Insanity>> - a map with the above values
-   */
-  map<UserId, map<Numberz,Insanity>> testInsanity(1: Insanity argument),
-
-  /**
-   * Prints 'testMulti()'
-   * @param i8 arg0 -
-   * @param i32 arg1 -
-   * @param i64 arg2 -
-   * @param map<i16, string> arg3 -
-   * @param Numberz arg4 -
-   * @param UserId arg5 -
-   * @return Xtruct - returns an Xtruct with string_thing = "Hello2, byte_thing = arg0, i32_thing = arg1
-   *    and i64_thing = arg2
-   */
-  Xtruct testMulti(1: i8 arg0, 2: i32 arg1, 3: i64 arg2, 4: map<i16, string> arg3, 5: Numberz arg4, 6: UserId arg5),
-
-  /**
-   * Print 'testException(%s)' with arg as '%s'
-   * @param string arg - a string indication what type of exception to throw
-   * if arg == "Xception" throw Xception with errorCode = 1001 and message = arg
-   * elsen if arg == "TException" throw TException
-   * else do not throw anything
-   */
-  void testException(1: string arg) throws(1: Xception err1),
-
-  /**
-   * Print 'testMultiException(%s, %s)' with arg0 as '%s' and arg1 as '%s'
-   * @param string arg - a string indication what type of exception to throw
-   * if arg0 == "Xception" throw Xception with errorCode = 1001 and message = "This is an Xception"
-   * elsen if arg0 == "Xception2" throw Xception2 with errorCode = 2002 and struct_thing.string_thing = "This is an Xception2"
-   * else do not throw anything
-   * @return Xtruct - an Xtruct with string_thing = arg1
-   */
-  Xtruct testMultiException(1: string arg0, 2: string arg1) throws(1: Xception err1, 2: Xception2 err2)
-
-  /**
-   * Print 'testOneway(%d): Sleeping...' with secondsToSleep as '%d'
-   * sleep 'secondsToSleep'
-   * Print 'testOneway(%d): done sleeping!' with secondsToSleep as '%d'
-   * @param i32 secondsToSleep - the number of seconds to sleep
-   */
-  oneway void testOneway(1:i32 secondsToSleep)
-}
-
-service SecondService
-{
-  void blahBlah()
-  /**
-   * Prints 'testString("%s")' with thing as '%s'
-   * @param string thing - the string to print
-   * @return string - returns the string 'thing'
-   */
-  string       secondtestString(1: string thing),
-}
-
-struct VersioningTestV1 {
-       1: i32 begin_in_both,
-       3: string old_string,
-       12: i32 end_in_both
-}
-
-struct VersioningTestV2 {
-       1: i32 begin_in_both,
-
-       2: i32 newint,
-       3: i8 newbyte,
-       4: i16 newshort,
-       5: i64 newlong,
-       6: double newdouble
-       7: Bonk newstruct,
-       8: list<i32> newlist,
-       9: set<i32> newset,
-       10: map<i32, i32> newmap,
-       11: string newstring,
-       12: i32 end_in_both
-}
-
-struct ListTypeVersioningV1 {
-       1: list<i32> myints;
-       2: string hello;
-}
-
-struct ListTypeVersioningV2 {
-       1: list<string> strings;
-       2: string hello;
-}
-
-struct GuessProtocolStruct {
-  7: map<string,string> map_field,
-}
-
-struct LargeDeltas {
-  1: Bools b1,
-  10: Bools b10,
-  100: Bools b100,
-  500: bool check_true,
-  1000: Bools b1000,
-  1500: bool check_false,
-  2000: VersioningTestV2 vertwo2000,
-  2500: set<string> a_set2500,
-  3000: VersioningTestV2 vertwo3000,
-  4000: list<i32> big_numbers
-}
-
-struct NestedListsI32x2 {
-  1: list<list<i32>> integerlist
-}
-struct NestedListsI32x3 {
-  1: list<list<list<i32>>> integerlist
-}
-struct NestedMixedx2 {
-  1: list<set<i32>> int_set_list
-  2: map<i32,set<string>> map_int_strset
-  3: list<map<i32,set<string>>> map_int_strset_list
-}
-struct ListBonks {
-  1: list<Bonk> bonk
-}
-struct NestedListsBonk {
-  1: list<list<list<Bonk>>> bonk
-}
-
-struct BoolTest {
-  1: optional bool b = true;
-  2: optional string s = "true";
-}
-
-struct StructA {
-  1: required string s;
-}
-
-struct StructB {
-  1: optional StructA aa;
-  2: required StructA ab;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/TypedefTest.thrift b/vendor/git.apache.org/thrift.git/test/TypedefTest.thrift
deleted file mode 100644
index 9437478..0000000
--- a/vendor/git.apache.org/thrift.git/test/TypedefTest.thrift
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-namespace cpp thrift.test
-
-typedef i32 MyInt32
-typedef string MyString;
-
-struct TypedefTestStruct {
-  1: MyInt32 field_MyInt32;
-  2: MyString field_MyString;
-  3: i32 field_Int32;
-  4: string field_String;
-}
-
-typedef TypedefTestStruct MyStruct,
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/audit/README.md b/vendor/git.apache.org/thrift.git/test/audit/README.md
deleted file mode 100644
index 412f8d5..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-Typical usage
-=============
-```
-thrift.exe --audit <oldFile> <newFile>
-```
-Example run
-===========
-```
-> thrift.exe --audit test.thrift break1.thrift
-[Thrift Audit Failure:break1.thrift] New Thrift File has missing function base_function3
-[Thrift Audit Warning:break1.thrift] Constant const3 has different value
-```
-
-Problems that the audit tool can catch
-======================================
-Errors
-* Removing an enum value
-* Changing the type of a struct field
-* Changing the required-ness of a struct field
-* Removing a struct field
-* Adding a required struct field
-* Adding a struct field 'in the middle'.  This usually indicates an old ID has been recycled
-* Struct removed
-* Oneway-ness change
-* Return type change
-* Missing function
-* Missing service
-* Change in service inheritance
-
-Warnings
-* Removing a language namespace declaration
-* Changing a namespace
-* Changing an enum value's name
-* Removing an enum class
-* Default value changed
-* Struct field name change
-* Removed constant
-* Type of constant changed
-* Value of constant changed
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break1.thrift b/vendor/git.apache.org/thrift.git/test/audit/break1.thrift
deleted file mode 100644
index f77f672..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break1.thrift
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//Thrift Method removed from service base.
-
-namespace cpp test
-
-//constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3= [23, 32],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break10.thrift b/vendor/git.apache.org/thrift.git/test/audit/break10.thrift
deleted file mode 100644
index 00690aa..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break10.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break10 - Struct field removed from struct2 id =1
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break11.thrift b/vendor/git.apache.org/thrift.git/test/audit/break11.thrift
deleted file mode 100644
index a4e0a7d..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break11.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break11 - Struct field removed from struct3 id =7
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break12.thrift b/vendor/git.apache.org/thrift.git/test/audit/break12.thrift
deleted file mode 100644
index e5522ed..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break12.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// derived1_function1 return type changed from enum1 to enum2
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum2 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break13.thrift b/vendor/git.apache.org/thrift.git/test/audit/break13.thrift
deleted file mode 100644
index 66975cd..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break13.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// derived1_function6 return type changed from struct1 to struct2
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct2 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break14.thrift b/vendor/git.apache.org/thrift.git/test/audit/break14.thrift
deleted file mode 100644
index 4ccd503..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break14.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// derived1_function6 return type changed from string to double 
-
-namespace cpp test
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    double derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break15.thrift b/vendor/git.apache.org/thrift.git/test/audit/break15.thrift
deleted file mode 100644
index 95f69e6..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break15.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// break15 - derived2_function1 return type changed from list<i32> to list<i16>
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i16> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break16.thrift b/vendor/git.apache.org/thrift.git/test/audit/break16.thrift
deleted file mode 100644
index cdcff7d..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break16.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// break 16 - derived2_function5 return type changed from map<test_enum1, test_enum2> to map<test_enum3, test_enum2>
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum3, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break17.thrift b/vendor/git.apache.org/thrift.git/test/audit/break17.thrift
deleted file mode 100644
index 353b142..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break17.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break17 - derived2_function6 return type changed from map<struct1,struct2> to map<struct1, struct3>
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct3> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break18.thrift b/vendor/git.apache.org/thrift.git/test/audit/break18.thrift
deleted file mode 100644
index c778b6a..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break18.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break18- oneway removed from base_oneway
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break19.thrift b/vendor/git.apache.org/thrift.git/test/audit/break19.thrift
deleted file mode 100644
index 1a0b229..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break19.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break19 - oneway added to base_function1
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    oneway void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break2.thrift b/vendor/git.apache.org/thrift.git/test/audit/break2.thrift
deleted file mode 100644
index 6f4fe2d..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break2.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//Struct field changed in test_struct1
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i32 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break20.thrift b/vendor/git.apache.org/thrift.git/test/audit/break20.thrift
deleted file mode 100644
index 9ae5f00..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break20.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// break 20 - first enum value removed from enum1
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break21.thrift b/vendor/git.apache.org/thrift.git/test/audit/break21.thrift
deleted file mode 100644
index f7da400..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break21.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break21- last enum value removed from enum2
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break22.thrift b/vendor/git.apache.org/thrift.git/test/audit/break22.thrift
deleted file mode 100644
index 3808349..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break22.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break22 - in-between enum value removed from enum1
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break23.thrift b/vendor/git.apache.org/thrift.git/test/audit/break23.thrift
deleted file mode 100644
index ff95a42..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break23.thrift
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break23 - required struct field added to struct4
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2,
-    3: required i64 struct4_member3
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break24.thrift b/vendor/git.apache.org/thrift.git/test/audit/break24.thrift
deleted file mode 100644
index bb4d5b9..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break24.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break24 - removed inheritance from derived1.
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break25.thrift b/vendor/git.apache.org/thrift.git/test/audit/break25.thrift
deleted file mode 100644
index 6efe97e..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break25.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//Changed inheritance of derived2
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends derived1 {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break26.thrift b/vendor/git.apache.org/thrift.git/test/audit/break26.thrift
deleted file mode 100644
index 6576d9b..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break26.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break26 - Field type changed in base_function1 argument id=3
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: double function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break27.thrift b/vendor/git.apache.org/thrift.git/test/audit/break27.thrift
deleted file mode 100644
index b556706..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break27.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// break27 - argument changed base_function2 list<enum1> to list<enum3> id =8
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum3> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break28.thrift b/vendor/git.apache.org/thrift.git/test/audit/break28.thrift
deleted file mode 100644
index c64e558..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break28.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break28- derived1_function5 arguement type changed map<i64, double> to list<i64>
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: list<i64> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break29.thrift b/vendor/git.apache.org/thrift.git/test/audit/break29.thrift
deleted file mode 100644
index 52f3081..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break29.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break29 - base_function2 arguemnt type changed list<string> to string
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: string function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break3.thrift b/vendor/git.apache.org/thrift.git/test/audit/break3.thrift
deleted file mode 100644
index ded9972..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break3.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break3 - Struct field changed in test_struct1(enum1 to enum2)
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum2 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break30.thrift b/vendor/git.apache.org/thrift.git/test/audit/break30.thrift
deleted file mode 100644
index 818dd6e..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break30.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// break30- derived1_function6 argument changed struct1 to map<struct1,struct1>
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    map<test_struct1,test_struct1> derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break31.thrift b/vendor/git.apache.org/thrift.git/test/audit/break31.thrift
deleted file mode 100644
index 7ca3804..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break31.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break31 - Exception removed to base_function2
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break32.thrift b/vendor/git.apache.org/thrift.git/test/audit/break32.thrift
deleted file mode 100644
index ca3f8a8..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break32.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break32- Exception1 field type changed for id =1
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i64 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break33.thrift b/vendor/git.apache.org/thrift.git/test/audit/break33.thrift
deleted file mode 100644
index 42dbb82..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break33.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break33 - derived1_function1 exception type changed.
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception1 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break34.thrift b/vendor/git.apache.org/thrift.git/test/audit/break34.thrift
deleted file mode 100644
index af93e65..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break34.thrift
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break34 - Field added to struct with Field ID being in between two existing field IDs
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    6: map<test_enum1, test_enum2> struct3_member6,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break4.thrift b/vendor/git.apache.org/thrift.git/test/audit/break4.thrift
deleted file mode 100644
index 6a28ec0..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break4.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//Field type changed in test_struct1(bool to string)
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: string struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 =[23, 32],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break5.thrift b/vendor/git.apache.org/thrift.git/test/audit/break5.thrift
deleted file mode 100644
index 18c22d1..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break5.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// member field type changed in test_struct1(bool to list<bool>)
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: list<bool> struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break6.thrift b/vendor/git.apache.org/thrift.git/test/audit/break6.thrift
deleted file mode 100644
index 9b7a300..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break6.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Field type changed in test_struct2 (list<double> to list<i16>)
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<i16> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break7.thrift b/vendor/git.apache.org/thrift.git/test/audit/break7.thrift
deleted file mode 100644
index b31c2df..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break7.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break7 - requiredness removed in struct6
-
-namespace cpp test
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break8.thrift b/vendor/git.apache.org/thrift.git/test/audit/break8.thrift
deleted file mode 100644
index 9acac09..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break8.thrift
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break8 - requiredness addedd in struct5
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: required string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/break9.thrift b/vendor/git.apache.org/thrift.git/test/audit/break9.thrift
deleted file mode 100644
index 62b319d..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/break9.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//break9 - Struct field removed from struct1
-
-
-namespace cpp test
-//Constants
-
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/test.thrift b/vendor/git.apache.org/thrift.git/test/audit/test.thrift
deleted file mode 100644
index e9834b3..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/test.thrift
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace cpp test
-
-//Constants
-const i32 const1 = 123;
-const double const2 = 23.3;
-const map<string,string> const3 = {"hello":"world", "thrift":"audit"};
-
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.5,
-    5: string struct1_member5 = "Audit test",
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 struct1_member9
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> struct2_member2,
-    3: list<i64> struct2_member3 = [23, 32 ],
-    4: list<double> struct2_member4,
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:2, 3:4},
-    2: map<i64, double> struct3_member2 = {10:1.1, 20:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1,
-    2: string struct5_member2 = "Thrift Audit Test"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base {
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/thrift_audit_test.pl b/vendor/git.apache.org/thrift.git/test/audit/thrift_audit_test.pl
deleted file mode 100644
index 69ed4dc..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/thrift_audit_test.pl
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/usr/bin/perl -w
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#break1 - Thrift method removed from service base
-#break2 - Struct field changed in test_struct1(i16 to i32)
-#break3 - Struct field changed in test_struct1(enum1 to enum2)
-#break4 - Field type changed in test_struct1(bool to string)
-#break5- member field type changed in test_struct1(bool to list<bool>)
-#break6-  Field type changed in test_struct2 (list<double> to list<i16>)
-#break7 - requiredness removed in struct6
-#break8 - requiredness addedd in struct5
-#break9 - Struct field removed from struct1
-#break10 - Struct field removed from struct2 id = 1
-#break11 - Struct field removed from struct3 last id
-#break12 -  derived1_function1 return type changed from enum1 to enum2
-#break13 - derived1_function6 return type changed from struct1 to struct2
-#break14 -  derived1_function4 return type changed from string to double 
-#break15 - derived2_function1 return type changed from list<i32> to list<i16>
-#break16 - derived2_function5 return type changed from map<test_enum1,test_enum2> to map<test_enum3, test_enum2>
-#break17 - derived2_function6 return type changed from map<struct1,struct2> to map<struct1, struct3>
-#break18- oneway removed from base_oneway
-#break19 - oneway added to base_function1
-#break20 - first enum value removed from enum1
-#break21- last enum value removed from enum2
-#break22 - in-between enum value removed from enum1
-#break23 - required struct field added to struct4
-#break24 - removed inheritance of derived1.
-#break25 - changed inheritance of derived2.
-#break26 - Field type changed in base_function1 argument id=3
-#break27 - argument changed base_function2 list<enum1> to list<enum3> id =8
-#break28- derived1_function5 arguement type changed map<i64, double> to list<i64>
-#break29 - base_function2 arguemnt type changed list<string> to string
-#break30- derived1_function6 argument changed struct1 to map<struct1,struct1>
-#break31 - Exception removed to base_function2
-#break32- Exception1 field type changed for id =1
-#break33 - derived1_function1 exception type changed.
-#break34 - Field added to struct with Field ID being in between two existing field IDs
-
-#warning.thrift
-#Changing defaults
-#Id=1 struct5
-#id=2 struct5 
-#id=4 struct2(list<double>)
-#id=3 struct2(list<i64>  default values removed)
-#id 4 struct1 change in double value
-#id 5 struct1 (default string value removed)
-#id=1 struct3 (change in map values)
-#id2 struct3 (change in map keys)
-
-#change in inheritance for derived1 and derived2
-
-#change in struct field names
-#id9 struct1
-#id2 struct2
-
-use strict;
-use warnings;
-use Getopt::Std;
-
-# globals
-my $gArguments = "";                # arguments that will be passed to AuditTool
-my $gAuditToolPath = "";
-my $gPreviousThriftPath;            # previous thrift path
-my $gCurrentThriftPath;             # current thrift path
-my $gThriftFileFolder;
-my $gBreakingFilesCount =34; 
-
-my $gVerbose = 0;
-#functions
-sub auditBreakingChanges;
-sub auditNonBreakingChanges;
-
-main();
-
-sub main
-{
-    parseOptions();
-    auditBreakingChanges();
-    auditNonBreakingChanges();
-}
-
-sub parseOptions
-{
-    my %options = ();
-    if ( getopts ('vf:o:t:',\%options) )
-    {
-        # current (new) thrift folder
-        if ($options{'f'})
-        {
-            $gThriftFileFolder = $options{'f'};
-            $gPreviousThriftPath = $gThriftFileFolder."/test.thrift";
-        }
-        else
-        {
-            die "Missing Folder containing thrift files\n";
-        }
-
-        if($options{'t'})
-        {
-            $gAuditToolPath = $options{'t'};
-        }
-        else
-        {
-            die "Audit Tool Path required \n";
-        }
-
-        if ($options{'v'})
-        {
-            $gVerbose = 1;
-        }
-
-    }
-}
-
-sub auditBreakingChanges
-{
-    my $breakingFileBaseName = $gThriftFileFolder."/break";
-    my $newThriftFile;
-    for(my $i=1; $i <= $gBreakingFilesCount; $i++)
-    {
-        $newThriftFile = $breakingFileBaseName."$i.thrift";
-        my $arguments =  $gPreviousThriftPath." ".$newThriftFile;
-        my ($exitCode, $output) = callThriftAuditTool($arguments);
-        print $output if $gVerbose eq 1;
-
-        if($exitCode == 1)
-        {
-            # thrift_audit returns 1 when it is not able to find files or other non-audit failures
-            print "exiting with exit code =1 i = ".$i."\n";
-            print $output;
-            exit $exitCode;
-        }
-        if($exitCode != 2)
-        {
-            # thrift-audit return 2 for audit failures. So for Breaking changes we should get 2 as return value.
-            print $output;
-            die "\nTEST FAILURE: Breaking Change not detected for thrift file $newThriftFile, code=$exitCode \n";
-        }
-        if(index($output,getMessageSubString("break$i")) == -1)
-        {
-            #Audit tool detected failure, but not the expected one. The change in breaking thrift file does not match getMessageSubString()
-            print $output;
-            die "\nTest FAILURE: Audit tool detected failure, but not the expected one!\n";
-        }
-        else
-        {
-            #Thrift audit tool has detected audit failure and has returned exited to status code 2
-            print "Test Pass: Audit Failure detected for thrift file break$i.thrift \n";
-        }
-    }
-
-}
-
-sub auditNonBreakingChanges
-{
-    my $breakingFileBaseName = $gThriftFileFolder."/warning";
-    my $newThriftFile;
-    $newThriftFile = $breakingFileBaseName.".thrift";
-    my $arguments =  $gPreviousThriftPath." ".$newThriftFile;
-    my ($exitCode, $output) = callThriftAuditTool($arguments);
-    print $output if $gVerbose eq 1;
-
-    if($exitCode == 1)
-    {
-        # thrift_audit returns 1 when it is not able to find files or other non-audit failures
-        print "exiting with exit code = 1  for file warning.thrift\n";
-        exit $exitCode;
-    }
-    elsif($exitCode != 0)
-    {
-        # thrift-audit return 0 if there are no audit failures.
-        die "\nTEST FAILURE: Non Breaking changes returned failure for thrift file $newThriftFile \n";
-    }
-    else
-    {
-        #Thrift audit tool has exited with status 0. 
-        print "Test Pass: Audit tool exits with success for warnings \n";
-    }
-
-
-}
-
-# -----------------------------------------------------------------------------------------------------
-# call thriftAuditTool script
-sub callThriftAuditTool ( $ )
-{
-    my $args = shift;
-
-    my $command = "$gAuditToolPath --audit $args";
-    my $output = `$command 2>&1`;
-    my $exitCode = $? >> 8;
-
-    return ($exitCode,$output);
-}
-
-sub getMessageSubString( $ )
-{
-    my $fileName = shift;
-    my %lookupTable = (
-        "break1"  => "base_function3",
-        "break2"  => "test_struct1",
-        "break3"  => "test_struct1",
-        "break4"  => "test_struct1",
-        "break5"  => "test_struct1",
-        "break6"  => "test_struct2",
-        "break7"  => "test_struct6",
-        "break8"  => "test_struct5",
-        "break9"  => "test_struct1",
-        "break10" => "test_struct2",
-        "break11" => "test_struct3",
-        "break12" => "derived1_function1",
-        "break13" => "derived1_function6",
-        "break14" => "derived1_function4",
-        "break15" => "derived2_function1",
-        "break16" => "derived2_function5",
-        "break17" => "derived2_function6",
-        "break18" => "base_oneway",
-        "break19" => "base_function1",
-        "break20" => "test_enum1",
-        "break21" => "test_enum2",
-        "break22" => "test_enum1",
-        "break23" => "test_struct4",
-        "break24" => "derived1",
-        "break25" => "derived2",
-        "break26" => "base_function1",
-        "break27" => "base_function2_args",
-        "break28" => "derived1_function5_args",
-        "break29" => "base_function2_args",
-        "break30" => "derived1_function6",
-        "break31" => "base_function2_exception",
-        "break32" => "test_exception1",
-        "break33" => "derived1_function1_exception",
-        "break34" => "test_struct3",
-    );
-    if (not exists $lookupTable{ $fileName })
-    {
-        print "in the null case\n";
-        return "NULL";
-    }
-    
-    my $retval = $lookupTable{ $fileName };
-    print "$fileName => $retval\n";
-    return $lookupTable{ $fileName };
-}
diff --git a/vendor/git.apache.org/thrift.git/test/audit/warning.thrift b/vendor/git.apache.org/thrift.git/test/audit/warning.thrift
deleted file mode 100644
index 5392d5c..0000000
--- a/vendor/git.apache.org/thrift.git/test/audit/warning.thrift
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-namespace cpp test
-
-//Constants
-
-const i32 const1 = 123;
-const double const2 = 23.2;
-const map<string,string> const3 = {"hello":"class", "thrift":"audit"};
-
-//Exception
-exception test_exception1 {
-    1: i32 code;
-    2: string json;
-}
-exception test_exception2 {
-    1: i32 code;
-    2: string json;
-}
-
-//Enums
-
-enum test_enum1 {
-    enum1_value0 = 0,
-    enum1_value1 = 1,
-    enum1_value2 = 2,
-    enum1_value5 = 5,
-    enum1_value7 = 7,
-    enum1_value8 = 8
-}
-
-enum test_enum2 {
-    enum2_value0 = 0,
-    enum2_value1 = 1,
-    enum2_value2 = 2,
-    enum2_value3 = 3
-}
-
-enum test_enum3 {
-    enum3_value1 = 0,
-    enum3_value2 = 1
-}
-
-struct test_struct1 {
-    1: i16 struct1_member1,
-    2: i32 struct1_member2,
-    3: i64 struct1_member3,
-    4: double struct1_member4 = 2.4,
-    5: string struct1_member5,
-    6: bool struct1_member6,
-    7: byte struct1_member7,
-    8: binary struct1_member8,
-    9: test_enum1 changed19
-}
-
-struct test_struct2 {
-    1: list<i16> struct2_member1,
-    2: list<i32> changed22,
-    3: list<i64> struct2_member3,
-    4: list<double> struct2_member4 =[1.0, 2.1],
-    5: list<string> struct2_member5,
-    6: list<bool> struct2_member6,
-    7: list<byte> struct2_member7,
-    8: list<binary> struct2_member8,
-    9: list<test_enum1> struct2_member9
-}
-
-struct test_struct3 {
-    1: map<i16, i32> struct3_member1 = {1:10, 2:20},
-    2: map<i64, double> struct3_member2 = {1:1.1, 2:2.1},
-    3: map<string, bool> struct3_member3,
-    4: map<byte, test_enum1> struct3_member4,
-    5: map<test_enum2, test_enum3 > struct3_member5,
-    7: map<double, string> struct3_member7
-}
-
-struct test_struct4 {
-    1: i32 struct4_member1,
-    2: optional i32 struct4_member2
-}
-
-struct test_struct5{
-    1: double struct5_member1 = 1.1,
-    2: string struct5_member2 = "Thrift Audit Tess"
-}
-struct test_struct6 {
-    1: i32 struct6_member1,
-    2: required i32 struct6_member2
-}
-
-service base {
-    oneway void base_oneway(
-        1: i32 arg1),
-
-    void base_function1(
-        1: i16 function1_arg1,
-        2: i32 function1_arg2,
-        3: i64 function1_arg3,
-        4: double function1_arg4,
-        5: string function1_arg5,
-        6: bool function1_arg6,
-        7: test_enum1 function1_arg7,
-        8: test_struct1 function1_arg8),
-
-    void base_function2(
-        1: list<i16> function2_arg1,
-        2: list<i32> function2_arg2,
-        3: list<i64> function2_arg3,
-        4: list<double> function2_arg4,
-        5: list<string> function2_arg5,
-        6: list<bool> function2_arg6,
-        7: list<byte> function2_arg7,
-        8: list<test_enum1> function2_arg8,
-        9: list<test_struct1> function2_arg9) throws (1:test_exception2 e),
-
-    void base_function3(),
-
-}
-
-service derived1 extends base{
-    
-    test_enum1 derived1_function1(
-        1: i64 function1_arg1,
-        2: double function1_arg2,
-        3: test_enum1 function1_arg3) throws (1:test_exception2 e),
-
-    i64 derived1_function2(
-        1: list<i64> function2_arg1,
-        2: list<double> function2_arg2,
-        3: list<string> function2_arg3,
-        4: list<byte> function2_arg4,
-        5: list<test_enum1> function2_arg5) throws (1:test_exception2 e),
-
-    double derived1_function3(
-        1: string function3_arg1,
-        2: bool function3_arg2) throws (1:test_exception2 e),
-
-    string derived1_function4(
-        1: string function4_arg1,
-        2: bool function4_arg2) throws (1:test_exception2 e),
-
-
-    bool derived1_function5(
-        1: map<i64, double> function5_arg1,
-        2: map<string, bool> function5_arg2,
-        3: map<test_enum1, test_enum2> function5_arg3) throws (1:test_exception2 e),
-
-    test_struct1 derived1_function6(
-        1: double function6_arg1) throws (1:test_exception2 e),
-}
-
-service derived2 extends base {
-
-    list<i32> derived2_function1(
-        1: i32 function1_arg1) throws (1:test_exception2 e),
-    
-    list<test_enum1> derived2_function2(
-        1:i64 function2_arg2) throws (1:test_exception2 e),
-
-    list<test_struct1> derived2_function3(
-        1:double function3_arg1) throws(1:test_exception2 e),
-
-    map<double, string> derived2_function4(
-        1:string function4_arg1) throws(1:test_exception2 e),
-
-    map<test_enum1, test_enum2> derived2_function5(
-        1:bool function5_arg1) throws(1:test_exception2 e),
-
-    map<test_struct1, test_struct2> derived2_function6(
-        1:bool function6_arg1) throws(1:test_exception2 e),
-    
-}
diff --git a/vendor/git.apache.org/thrift.git/test/c_glib/Makefile.am b/vendor/git.apache.org/thrift.git/test/c_glib/Makefile.am
deleted file mode 100755
index 4f9a119..0000000
--- a/vendor/git.apache.org/thrift.git/test/c_glib/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = subdir-objects serial-tests
-
-noinst_LTLIBRARIES = libtestcglib.la
-nodist_libtestcglib_la_SOURCES = \
-	gen-c_glib/t_test_second_service.c \
-	gen-c_glib/t_test_second_service.h \
-	gen-c_glib/t_test_thrift_test.c \
-	gen-c_glib/t_test_thrift_test.h \
-	gen-c_glib/t_test_thrift_test_types.c \
-	gen-c_glib/t_test_thrift_test_types.h
-
-libtestcglib_la_LIBADD = $(top_builddir)/lib/c_glib/libthrift_c_glib.la
-
-precross: libtestcglib.la test_client test_server
-
-check_PROGRAMS = \
-	test_client \
-	test_server
-
-test_client_SOURCES = \
-	src/test_client.c
-
-test_client_LDADD = \
-	libtestcglib.la \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
-
-test_server_SOURCES = \
-	src/thrift_test_handler.c \
-	src/thrift_test_handler.h \
-	src/test_server.c
-
-test_server_LDADD = \
-	libtestcglib.la \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
-
-#
-# Common thrift code generation rules
-#
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-c_glib/t_test_second_service.c  gen-c_glib/t_test_second_service.h  gen-c_glib/t_test_thrift_test.c  gen-c_glib/t_test_thrift_test.h  gen-c_glib/t_test_thrift_test_types.c  gen-c_glib/t_test_thrift_test_types.h: $(top_srcdir)/test/ThriftTest.thrift $(THRIFT)
-	$(THRIFT) --gen c_glib -r $<
-
-AM_CFLAGS = -g -Wall -Wextra $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
-AM_CXXFLAGS = $(AM_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/lib/c_glib/src -Igen-c_glib
-AM_LDFLAGS = $(GLIB_LIBS) $(GOBJECT_LIBS) @GCOV_LDFLAGS@
-
-clean-local:
-	$(RM) gen-c_glib/*
-
-EXTRA_DIST = \
-	src/test_client.c \
-	src/thrift_test_handler.c \
-	src/thrift_test_handler.h \
-	src/test_server.c
diff --git a/vendor/git.apache.org/thrift.git/test/c_glib/src/test_client.c b/vendor/git.apache.org/thrift.git/test/c_glib/src/test_client.c
deleted file mode 100644
index 3ae9325..0000000
--- a/vendor/git.apache.org/thrift.git/test/c_glib/src/test_client.c
+++ /dev/null
@@ -1,1600 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <glib-object.h>
-#include <inttypes.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/time.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-#include <thrift/c_glib/protocol/thrift_compact_protocol.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport.h>
-#include <thrift/c_glib/transport/thrift_framed_transport.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-
-#include "../gen-c_glib/t_test_thrift_test.h"
-
-/* Handle SIGPIPE signals (indicating the server has closed the
-   connection prematurely) by outputting an error message before
-   exiting. */
-static void
-sigpipe_handler (int signal_number)
-{
-  THRIFT_UNUSED_VAR (signal_number);
-
-  /* Flush standard output to make sure the test results so far are
-     logged */
-  fflush (stdout);
-
-  fputs ("Broken pipe (server closed connection prematurely)\n", stderr);
-  fflush (stderr);
-
-  /* Re-raise the signal, this time invoking the default signal
-     handler, to terminate the program */
-  raise (SIGPIPE);
-}
-
-/* Compare two gint32 values. Used for sorting and finding integer
-   values within a GList. */
-static gint
-gint32_compare (gconstpointer a, gconstpointer b)
-{
-  gint32 int32_a = *(gint32 *)a;
-  gint32 int32_b = *(gint32 *)b;
-  int result = 0;
-
-  if (int32_a < int32_b)
-    result = -1;
-  else if (int32_a > int32_b)
-    result = 1;
-
-  return result;
-}
-
-int
-main (int argc, char **argv)
-{
-  static gchar *host = NULL;
-  static gint   port = 9090;
-  static gchar *transport_option = NULL;
-  static gchar *protocol_option = NULL;
-  static gint   num_tests = 1;
-
-  static
-    GOptionEntry option_entries[] ={
-    { "host",            0, 0, G_OPTION_ARG_STRING,   &host,
-      "Host to connect (=localhost)", NULL },
-    { "port",            0, 0, G_OPTION_ARG_INT,      &port,
-      "Port number to connect (=9090)", NULL },
-    { "transport",       0, 0, G_OPTION_ARG_STRING,   &transport_option,
-      "Transport: buffered, framed (=buffered)", NULL },
-    { "protocol",        0, 0, G_OPTION_ARG_STRING,   &protocol_option,
-      "Protocol: binary, compact (=binary)", NULL },
-    { "testloops",     'n', 0, G_OPTION_ARG_INT,      &num_tests,
-      "Number of tests (=1)", NULL },
-    { NULL }
-  };
-
-  struct sigaction sigpipe_action;
-
-  GType  transport_type = THRIFT_TYPE_BUFFERED_TRANSPORT;
-  gchar *transport_name = "buffered";
-  GType  protocol_type  = THRIFT_TYPE_BINARY_PROTOCOL;
-  gchar *protocol_name  = "binary";
-
-  ThriftSocket    *socket;
-  ThriftTransport *transport;
-  ThriftProtocol  *protocol;
-
-  TTestThriftTestIf *test_client;
-
-  struct timeval time_start, time_stop, time_elapsed;
-  guint64 time_elapsed_usec, time_total_usec = 0;
-  guint64 time_min_usec = G_MAXUINT64, time_max_usec = 0, time_avg_usec;
-
-  GOptionContext *option_context;
-  gboolean options_valid = TRUE;
-  int test_num = 0;
-  int fail_count = 0;
-  GError *error = NULL;
-
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  /* Configure and parse our command-line options */
-  option_context = g_option_context_new (NULL);
-  g_option_context_add_main_entries (option_context,
-                                     option_entries,
-                                     NULL);
-  if (!g_option_context_parse (option_context,
-                               &argc,
-                               &argv,
-                               &error)) {
-    fprintf (stderr, "%s\n", error->message);
-    return 255;
-  }
-  g_option_context_free (option_context);
-
-  /* Set remaining default values for unspecified options */
-  if (host == NULL)
-    host = g_strdup ("localhost");
-
-  /* Validate the parsed options */
-  if (protocol_option != NULL) {
-    if (strncmp (protocol_option, "compact", 8) == 0) {
-      protocol_type = THRIFT_TYPE_COMPACT_PROTOCOL;
-      protocol_name = "compact";
-    }
-    else if (strncmp (protocol_option, "binary", 7) != 0) {
-      fprintf (stderr, "Unknown protocol type %s\n", protocol_option);
-      options_valid = FALSE;
-    }
-  }
-
-  if (transport_option != NULL) {
-    if (strncmp (transport_option, "framed", 7) == 0) {
-      transport_type = THRIFT_TYPE_FRAMED_TRANSPORT;
-      transport_name = "framed";
-    }
-    else if (strncmp (transport_option, "buffered", 9) != 0) {
-      fprintf (stderr, "Unknown transport type %s\n", transport_option);
-      options_valid = FALSE;
-    }
-  }
-
-  if (!options_valid)
-    return 254;
-
-  printf ("Connecting (%s/%s) to: %s:%d\n",
-          transport_name,
-          protocol_name,
-          host,
-          port);
-
-  /* Install our SIGPIPE handler, which outputs an error message to
-     standard error before exiting so testers can know what
-     happened */
-  memset (&sigpipe_action, 0, sizeof (sigpipe_action));
-  sigpipe_action.sa_handler = sigpipe_handler;
-  sigpipe_action.sa_flags = SA_RESETHAND;
-  sigaction (SIGPIPE, &sigpipe_action, NULL);
-
-  /* Establish all our connection objects */
-  socket = g_object_new (THRIFT_TYPE_SOCKET,
-                         "hostname", host,
-                         "port",     port,
-                         NULL);
-  transport = g_object_new (transport_type,
-                            "transport", socket,
-                            NULL);
-  protocol = g_object_new (protocol_type,
-                           "transport", transport,
-                           NULL);
-  test_client = g_object_new (T_TEST_TYPE_THRIFT_TEST_CLIENT,
-                              "input_protocol",  protocol,
-                              "output_protocol", protocol,
-                              NULL);
-
-  /* Execute the actual tests */
-  for (test_num = 0; test_num < num_tests; ++test_num) {
-    if (thrift_transport_open (transport, &error)) {
-      gchar   *string  = NULL;
-      gboolean boolean = 0;
-      gint8    byte    = 0;
-      gint32   int32   = 0;
-      gint64   int64   = 0;
-      gdouble  dub     = 0;
-
-      gint byte_thing, i32_thing, inner_byte_thing, inner_i32_thing;
-      gint64 i64_thing, inner_i64_thing;
-
-      TTestXtruct  *xtruct_out,  *xtruct_out2, *xtruct_in,  *inner_xtruct_in;
-      TTestXtruct2 *xtruct2_out, *xtruct2_in;
-
-      GHashTable *map_out, *map_in, *inner_map_in;
-      GHashTable *set_out, *set_in;
-      gpointer key, value;
-      gint32 *i32_key_ptr, *i32_value_ptr;
-      GHashTableIter hash_table_iter, inner_hash_table_iter;
-      GList *keys_out, *keys_in, *keys_elem;
-
-      GArray *list_out, *list_in;
-
-      TTestNumberz numberz;
-      TTestNumberz numberz2;
-
-      TTestUserId user_id, *user_id_ptr, *user_id_ptr2;
-
-      TTestInsanity *insanity_out, *insanity_in;
-      GHashTable *user_map;
-      GHashTableIter user_map_iter;
-      GPtrArray *xtructs;
-
-      TTestXception  *xception  = NULL;
-      TTestXception2 *xception2 = NULL;
-
-      gboolean oneway_result;
-      struct timeval oneway_start, oneway_end, oneway_elapsed;
-      gint oneway_elapsed_usec;
-
-      gboolean first;
-      gint32 i, j;
-
-      printf ("Test #%d, connect %s:%d\n", test_num + 1, host, port);
-      gettimeofday (&time_start, NULL);
-
-      /* These test routines have been ported from the C++ test
-         client, care being taken to ensure their output remains as
-         close as possible to the original to facilitate diffs.
-
-         For simplicity comments have been omitted, but every routine
-         has the same basic structure:
-
-         - Create and populate data structures as necessary.
-
-         - Format and output (to the console) a representation of the
-           outgoing data.
-
-         - Issue the remote method call to the server.
-
-         - Format and output a representation of the returned data.
-
-         - Verify the returned data matches what was expected.
-
-         - Deallocate any created data structures.
-
-         Note the recognized values and expected behaviour of each
-         remote method are described in ThriftTest.thrift, which
-         you'll find in the top-level "test" folder. */
-
-      /**
-       * VOID TEST
-       */
-      printf ("testVoid()");
-      if (t_test_thrift_test_if_test_void (test_client, &error)) {
-        printf (" = void\n");
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * STRING TEST
-       */
-      printf ("testString(\"Test\")");
-      if (t_test_thrift_test_if_test_string (test_client,
-                                             &string,
-                                             "Test",
-                                             &error)) {
-        printf (" = \"%s\"\n", string);
-        if (strncmp (string, "Test", 5) != 0)
-          fail_count++;
-
-        g_free (string);
-        string = NULL;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * BOOL TEST
-       */
-      printf ("testByte(true)");
-      if (t_test_thrift_test_if_test_bool (test_client,
-                                           &boolean,
-                                           1,
-                                           &error)) {
-        printf (" = %s\n", boolean ? "true" : "false");
-        if (boolean != 1)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-      printf ("testByte(false)");
-      if (t_test_thrift_test_if_test_bool (test_client,
-                                           &boolean,
-                                           0,
-                                           &error)) {
-        printf (" = %s\n", boolean ? "true" : "false");
-        if (boolean != 0)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * BYTE TEST
-       */
-      printf ("testByte(1)");
-      if (t_test_thrift_test_if_test_byte (test_client,
-                                           &byte,
-                                           1,
-                                           &error)) {
-        printf (" = %d\n", byte);
-        if (byte != 1)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-      printf ("testByte(-1)");
-      if (t_test_thrift_test_if_test_byte (test_client,
-                                           &byte,
-                                           -1,
-                                           &error)) {
-        printf (" = %d\n", byte);
-        if (byte != -1)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * I32 TEST
-       */
-      printf ("testI32(-1)");
-      if (t_test_thrift_test_if_test_i32 (test_client,
-                                          &int32,
-                                          -1,
-                                          &error)) {
-        printf (" = %d\n", int32);
-        if (int32 != -1)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * I64 TEST
-       */
-      printf ("testI64(-34359738368)");
-      if (t_test_thrift_test_if_test_i64 (test_client,
-                                          &int64,
-                                          (gint64)-34359738368,
-                                          &error)) {
-        printf (" = %" PRId64 "\n", int64);
-        if (int64 != (gint64)-34359738368)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * DOUBLE TEST
-       */
-      printf("testDouble(-5.2098523)");
-      if (t_test_thrift_test_if_test_double (test_client,
-                                             &dub,
-                                             -5.2098523,
-                                             &error)) {
-        printf (" = %f\n", dub);
-        if ((dub - (-5.2098523)) > 0.001)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      // TODO: add testBinary() 	  
-	  
-      /**
-       * STRUCT TEST
-       */
-      printf ("testStruct({\"Zero\", 1, -3, -5})");
-      xtruct_out = g_object_new (T_TEST_TYPE_XTRUCT,
-                                 "string_thing", "Zero",
-                                 "byte_thing",        1,
-                                 "i32_thing",        -3,
-                                 "i64_thing",      -5LL,
-                                 NULL);
-      xtruct_in = g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-
-      if (t_test_thrift_test_if_test_struct (test_client,
-                                             &xtruct_in,
-                                             xtruct_out,
-                                             &error)) {
-        g_object_get (xtruct_in,
-                      "string_thing", &string,
-                      "byte_thing",   &byte_thing,
-                      "i32_thing",    &i32_thing,
-                      "i64_thing",    &i64_thing,
-                      NULL);
-
-        printf (" = {\"%s\", %d, %d, %" PRId64 "}\n",
-                string,
-                byte_thing,
-                i32_thing,
-                i64_thing);
-        if ((string == NULL || strncmp (string, "Zero", 5) != 0) ||
-            byte_thing != 1 ||
-            i32_thing != -3 ||
-            i64_thing != (gint64)-5)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-      g_object_unref (xtruct_in);
-
-      /**
-       * NESTED STRUCT TEST
-       */
-      printf ("testNest({1, {\"Zero\", 1, -3, -5}), 5}");
-      xtruct2_out = g_object_new (T_TEST_TYPE_XTRUCT2,
-                                  "byte_thing",            1,
-                                  "struct_thing", xtruct_out,
-                                  "i32_thing",             5,
-                                  NULL);
-      xtruct2_in = g_object_new (T_TEST_TYPE_XTRUCT2, NULL);
-
-      if (t_test_thrift_test_if_test_nest (test_client,
-                                           &xtruct2_in,
-                                           xtruct2_out,
-                                           &error)) {
-        g_object_get (xtruct2_in,
-                      "byte_thing",   &byte_thing,
-                      "struct_thing", &xtruct_in,
-                      "i32_thing",    &i32_thing,
-                      NULL);
-        g_object_get (xtruct_in,
-                      "string_thing", &string,
-                      "byte_thing",   &inner_byte_thing,
-                      "i32_thing",    &inner_i32_thing,
-                      "i64_thing",    &inner_i64_thing,
-                      NULL);
-
-        printf (" = {%d, {\"%s\", %d, %d, %" PRId64 "}, %d}\n",
-                byte_thing,
-                string,
-                inner_byte_thing,
-                inner_i32_thing,
-                inner_i64_thing,
-                i32_thing);
-        if (byte_thing != 1 ||
-            (string == NULL || strncmp (string, "Zero", 5) != 0) ||
-            inner_byte_thing != 1 ||
-            inner_i32_thing != -3 ||
-            inner_i64_thing != (gint64)-5 ||
-            i32_thing != 5)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      g_object_unref (xtruct_in);
-      g_object_unref (xtruct2_in);
-      g_object_unref (xtruct2_out);
-      g_object_unref (xtruct_out);
-
-      /**
-       * MAP TEST
-       */
-      map_out = g_hash_table_new_full (g_int_hash,
-                                       g_int_equal,
-                                       g_free,
-                                       g_free);
-      for (i = 0; i < 5; ++i) {
-        i32_key_ptr   = g_malloc (sizeof *i32_key_ptr);
-        i32_value_ptr = g_malloc (sizeof *i32_value_ptr);
-
-        *i32_key_ptr   = i;
-        *i32_value_ptr = i - 10;
-
-        g_hash_table_insert (map_out, i32_key_ptr, i32_value_ptr);
-      }
-      printf ("testMap({");
-      first = TRUE;
-      g_hash_table_iter_init (&hash_table_iter, map_out);
-      while (g_hash_table_iter_next (&hash_table_iter,
-                                     &key,
-                                     &value)) {
-        if (first)
-          first = FALSE;
-        else
-          printf (", ");
-
-        printf ("%d => %d", *(gint32 *)key, *(gint32 *)value);
-      }
-      printf ("})");
-
-      map_in = g_hash_table_new_full (g_int_hash,
-                                      g_int_equal,
-                                      g_free,
-                                      g_free);
-
-      if (t_test_thrift_test_if_test_map (test_client,
-                                          &map_in,
-                                          map_out,
-                                          &error)) {
-        printf (" = {");
-        first = TRUE;
-        g_hash_table_iter_init (&hash_table_iter, map_in);
-        while (g_hash_table_iter_next (&hash_table_iter,
-                                       &key,
-                                       &value)) {
-          if (first)
-            first = FALSE;
-          else
-            printf (", ");
-
-          printf ("%d => %d", *(gint32 *)key, *(gint32 *)value);
-        }
-        printf ("}\n");
-
-        if (g_hash_table_size (map_in) != g_hash_table_size (map_out))
-          fail_count++;
-        else {
-          g_hash_table_iter_init (&hash_table_iter, map_out);
-          while (g_hash_table_iter_next (&hash_table_iter,
-                                         &key,
-                                         &value)) {
-            gpointer in_value = g_hash_table_lookup (map_in, key);
-            if (in_value == NULL ||
-                *(gint32 *)in_value != *(gint32 *)value) {
-              fail_count++;
-              break;
-            }
-          }
-        }
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      g_hash_table_unref (map_in);
-      g_hash_table_unref (map_out);
-
-      /**
-       * STRING MAP TEST
-       */
-      map_out = g_hash_table_new_full (g_str_hash,
-                                       g_str_equal,
-                                       NULL,
-                                       NULL);
-      g_hash_table_insert (map_out, "a",    "2");
-      g_hash_table_insert (map_out, "b",    "blah");
-      g_hash_table_insert (map_out, "some", "thing");
-      printf ("testStringMap({");
-      first = TRUE;
-      g_hash_table_iter_init (&hash_table_iter, map_out);
-      while (g_hash_table_iter_next (&hash_table_iter,
-                                     &key,
-                                     &value)) {
-        if (first)
-          first = FALSE;
-        else
-          printf (", ");
-
-        printf ("\"%s\" => \"%s\"", (gchar *)key, (gchar *)value);
-      }
-      printf (")}");
-
-      map_in = g_hash_table_new_full (g_str_hash,
-                                      g_str_equal,
-                                      g_free,
-                                      g_free);
-
-      if (t_test_thrift_test_if_test_string_map (test_client,
-                                                 &map_in,
-                                                 map_out,
-                                                 &error)) {
-        printf (" = {");
-        first = TRUE;
-        g_hash_table_iter_init (&hash_table_iter, map_in);
-        while (g_hash_table_iter_next (&hash_table_iter,
-                                       &key,
-                                       &value)) {
-          if (first)
-            first = FALSE;
-          else
-            printf (", ");
-
-          printf ("\"%s\" => \"%s\"", (gchar *)key, (gchar *)value);
-        }
-        printf ("}\n");
-
-        if (g_hash_table_size (map_in) != g_hash_table_size (map_out))
-          fail_count++;
-        else {
-          g_hash_table_iter_init (&hash_table_iter, map_out);
-          while (g_hash_table_iter_next (&hash_table_iter,
-                                         &key,
-                                         &value)) {
-            gpointer in_value = g_hash_table_lookup (map_in, key);
-            if (in_value == NULL ||
-                strcmp ((gchar *)in_value, (gchar *)value) != 0) {
-              fail_count++;
-              break;
-            }
-          }
-        }
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      g_hash_table_unref (map_in);
-      g_hash_table_unref (map_out);
-
-      /**
-       * SET TEST
-       */
-      set_out = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, NULL);
-      for (i = -2; i < 3; ++i) {
-        i32_key_ptr = g_malloc (sizeof *i32_key_ptr);
-        *i32_key_ptr = i;
-
-        g_hash_table_insert (set_out, i32_key_ptr, NULL);
-      }
-      printf ("testSet({");
-      first = TRUE;
-      keys_out = g_hash_table_get_keys (set_out);
-      keys_elem = keys_out;
-      while (keys_elem != NULL) {
-        if (first)
-          first = FALSE;
-        else
-          printf (", ");
-
-        printf ("%d", *(gint32 *)keys_elem->data);
-
-        keys_elem = keys_elem->next;
-      }
-      printf ("})");
-
-      set_in = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, NULL);
-
-      if (t_test_thrift_test_if_test_set (test_client,
-                                          &set_in,
-                                          set_out,
-                                          &error)) {
-        printf(" = {");
-        first = TRUE;
-        keys_in = g_hash_table_get_keys (set_in);
-        keys_elem = keys_in;
-        while (keys_elem != NULL) {
-          if (first)
-            first = FALSE;
-          else
-            printf (", ");
-
-          printf ("%d", *(gint32 *)keys_elem->data);
-
-          keys_elem = keys_elem->next;
-        }
-        printf ("}\n");
-
-        if (g_list_length (keys_in) != g_list_length (keys_out))
-          fail_count++;
-        else {
-          keys_elem = keys_out;
-          while (keys_elem != NULL) {
-            if (g_list_find_custom (keys_in,
-                                    keys_elem->data,
-                                    gint32_compare) == NULL) {
-              fail_count++;
-              break;
-            }
-
-            keys_elem = keys_elem->next;
-          }
-        }
-
-        g_list_free (keys_in);
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      g_hash_table_unref (set_in);
-      g_list_free (keys_out);
-      g_hash_table_unref (set_out);
-
-      /**
-       * LIST TEST
-       */
-      list_out = g_array_new (FALSE, TRUE, sizeof (gint32));
-      for (i = -2; i < 3; ++i) {
-        g_array_append_val (list_out, i);
-      }
-      printf ("testList({");
-      first = TRUE;
-      for (i = 0; i < (gint32)list_out->len; ++i) {
-        if (first)
-          first = FALSE;
-        else
-          printf (", ");
-
-        printf ("%d", g_array_index (list_out, gint32, i));
-      }
-      printf ("})");
-
-      list_in = g_array_new (FALSE, TRUE, sizeof (gint32));
-
-      if (t_test_thrift_test_if_test_list (test_client,
-                                           &list_in,
-                                           list_out,
-                                           &error)) {
-        printf (" = {");
-        first = TRUE;
-        for (i = 0; i < (gint32)list_in->len; ++i) {
-          if (first)
-            first = FALSE;
-          else
-            printf (", ");
-
-          printf ("%d", g_array_index (list_in, gint32, i));
-        }
-        printf ("}\n");
-
-        if (list_in->len != list_out->len ||
-            memcmp (list_in->data,
-                    list_out->data,
-                    list_in->len * sizeof (gint32)) != 0)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      g_array_unref (list_in);
-      g_array_unref (list_out);
-
-      /**
-       * ENUM TEST
-       */
-      printf("testEnum(ONE)");
-      if (t_test_thrift_test_if_test_enum (test_client,
-                                           &numberz,
-                                           T_TEST_NUMBERZ_ONE,
-                                           &error)) {
-        printf(" = %d\n", numberz);
-        if (numberz != T_TEST_NUMBERZ_ONE)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      printf("testEnum(TWO)");
-      if (t_test_thrift_test_if_test_enum (test_client,
-                                           &numberz,
-                                           T_TEST_NUMBERZ_TWO,
-                                           &error)) {
-        printf(" = %d\n", numberz);
-        if (numberz != T_TEST_NUMBERZ_TWO)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      printf("testEnum(THREE)");
-      if (t_test_thrift_test_if_test_enum (test_client,
-                                           &numberz,
-                                           T_TEST_NUMBERZ_THREE,
-                                           &error)) {
-        printf(" = %d\n", numberz);
-        if (numberz != T_TEST_NUMBERZ_THREE)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      printf("testEnum(FIVE)");
-      if (t_test_thrift_test_if_test_enum (test_client,
-                                           &numberz,
-                                           T_TEST_NUMBERZ_FIVE,
-                                           &error)) {
-        printf(" = %d\n", numberz);
-        if (numberz != T_TEST_NUMBERZ_FIVE)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      printf("testEnum(EIGHT)");
-      if (t_test_thrift_test_if_test_enum (test_client,
-                                           &numberz,
-                                           T_TEST_NUMBERZ_EIGHT,
-                                           &error)) {
-        printf(" = %d\n", numberz);
-        if (numberz != T_TEST_NUMBERZ_EIGHT)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * TYPEDEF TEST
-       */
-      printf ("testTypedef(309858235082523)");
-      if (t_test_thrift_test_if_test_typedef (test_client,
-                                              &user_id,
-                                              309858235082523LL,
-                                              &error)) {
-        printf(" = %" PRId64 "\n", user_id);
-        if (user_id != 309858235082523LL)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * NESTED MAP TEST
-       */
-      printf ("testMapMap(1)");
-      map_in = g_hash_table_new_full (g_int_hash,
-                                      g_int_equal,
-                                      g_free,
-                                      (GDestroyNotify)g_hash_table_unref);
-      if (t_test_thrift_test_if_test_map_map (test_client,
-                                              &map_in,
-                                              1,
-                                              &error)) {
-        g_hash_table_iter_init (&hash_table_iter, map_in);
-
-        printf (" = {");
-        while (g_hash_table_iter_next (&hash_table_iter,
-                                       &key,
-                                       &value)) {
-          printf ("%d => {", *(gint32 *)key);
-
-          g_hash_table_iter_init (&inner_hash_table_iter,
-                                  (GHashTable *)value);
-          while (g_hash_table_iter_next (&inner_hash_table_iter,
-                                         &key,
-                                         &value)) {
-            printf ("%d => %d, ", *(gint32 *)key, *(gint32 *)value);
-          }
-
-          printf ("}, ");
-        }
-        printf ("}\n");
-
-        if (g_hash_table_size (map_in) != 2)
-          fail_count++;
-        else {
-          gint32 inner_keys[] = {1, 2, 3, 4};
-          gint32 i32_key;
-
-          i32_key = -4;
-          inner_map_in = g_hash_table_lookup (map_in, &i32_key);
-          if (inner_map_in == NULL ||
-              g_hash_table_size (inner_map_in) != 4)
-            fail_count++;
-          else {
-            keys_in = g_hash_table_get_keys (inner_map_in);
-            keys_in = g_list_sort (keys_in, gint32_compare);
-
-            for (i = 0; i < 4; i++) {
-              keys_elem = g_list_nth (keys_in, 3 - i);
-
-              if (*(gint32 *)keys_elem->data != (-1 * inner_keys[i]) ||
-                  *(gint32 *)g_hash_table_lookup (inner_map_in,
-                                                  keys_elem->data) !=
-                  (-1 * inner_keys[i])) {
-                fail_count++;
-                break;
-              }
-            }
-
-            g_list_free (keys_in);
-          }
-
-          i32_key = 4;
-          inner_map_in = g_hash_table_lookup (map_in, &i32_key);
-          if (inner_map_in == NULL ||
-              g_hash_table_size (inner_map_in) != 4)
-            fail_count++;
-          else {
-            keys_in = g_hash_table_get_keys (inner_map_in);
-            keys_in = g_list_sort (keys_in, gint32_compare);
-
-            for (i = 0; i < 4; i++) {
-              keys_elem = g_list_nth (keys_in, i);
-
-              if (*(gint32 *)keys_elem->data != inner_keys[i] ||
-                  *(gint32 *)g_hash_table_lookup (inner_map_in,
-                                                  keys_elem->data) !=
-                  inner_keys[i]) {
-                fail_count++;
-                break;
-              }
-            }
-
-            g_list_free (keys_in);
-          }
-        }
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      g_hash_table_unref (map_in);
-
-      /**
-       * INSANITY TEST
-       */
-      insanity_out = g_object_new (T_TEST_TYPE_INSANITY, NULL);
-      g_object_get (insanity_out,
-                    "userMap", &user_map,
-                    "xtructs", &xtructs,
-                    NULL);
-
-      numberz = T_TEST_NUMBERZ_FIVE;
-      numberz2 = T_TEST_NUMBERZ_EIGHT;
-      user_id_ptr = g_malloc (sizeof *user_id_ptr);
-      *user_id_ptr = 5;
-      user_id_ptr2 = g_malloc (sizeof *user_id_ptr);
-      *user_id_ptr2 = 8;
-      g_hash_table_insert (user_map, (gpointer)numberz, user_id_ptr);
-      g_hash_table_insert (user_map, (gpointer)numberz2, user_id_ptr2);
-      g_hash_table_unref (user_map);
-
-      xtruct_out = g_object_new (T_TEST_TYPE_XTRUCT,
-                                 "string_thing", "Hello2",
-                                 "byte_thing",   2,
-                                 "i32_thing",    2,
-                                 "i64_thing",    2LL,
-                                 NULL);
-      xtruct_out2 = g_object_new (T_TEST_TYPE_XTRUCT,
-                                 "string_thing", "Goodbye4",
-                                 "byte_thing",   4,
-                                 "i32_thing",    4,
-                                 "i64_thing",    4LL,
-                                 NULL);
-      g_ptr_array_add (xtructs, xtruct_out2);
-      g_ptr_array_add (xtructs, xtruct_out);
-      g_ptr_array_unref (xtructs);
-
-      map_in = g_hash_table_new_full (g_int64_hash,
-                                      g_int64_equal,
-                                      g_free,
-                                      (GDestroyNotify)g_hash_table_unref);
-
-      printf("testInsanity()");
-      if (t_test_thrift_test_if_test_insanity (test_client,
-                                               &map_in,
-                                               insanity_out,
-                                               &error)) {
-        printf (" = {");
-        g_hash_table_iter_init (&hash_table_iter, map_in);
-        while (g_hash_table_iter_next (&hash_table_iter,
-                                       &key,
-                                       &value)) {
-          printf ("%" PRId64 " => {", *(TTestUserId *)key);
-
-          g_hash_table_iter_init (&inner_hash_table_iter,
-                                  (GHashTable *)value);
-          while (g_hash_table_iter_next (&inner_hash_table_iter,
-                                         &key,
-                                         &value)) {
-            printf ("%d => {", (TTestNumberz)key);
-
-            g_object_get ((TTestInsanity *)value,
-                          "userMap", &user_map,
-                          "xtructs", &xtructs,
-                          NULL);
-
-            printf ("{");
-            g_hash_table_iter_init (&user_map_iter, user_map);
-            while (g_hash_table_iter_next (&user_map_iter,
-                                           &key,
-                                           &value)) {
-              printf ("%d => %" PRId64 ", ",
-                      (TTestNumberz)key,
-                      *(TTestUserId *)value);
-            }
-            printf ("}, ");
-            g_hash_table_unref (user_map);
-
-            printf("{");
-            for (i = 0; i < (gint32)xtructs->len; ++i) {
-              xtruct_in = g_ptr_array_index (xtructs, i);
-              g_object_get (xtruct_in,
-                            "string_thing", &string,
-                            "byte_thing",   &byte_thing,
-                            "i32_thing",    &i32_thing,
-                            "i64_thing",    &i64_thing,
-                            NULL);
-
-              printf ("{\"%s\", %d, %d, %" PRId64 "}, ",
-                      string,
-                      byte_thing,
-                      i32_thing,
-                      i64_thing);
-            }
-            printf ("}");
-            g_ptr_array_unref (xtructs);
-
-            printf ("}, ");
-          }
-          printf("}, ");
-        }
-        printf("}\n");
-
-        if (g_hash_table_size (map_in) != 2)
-          fail_count++;
-        else {
-          TTestNumberz numberz_key_values[] = {
-            T_TEST_NUMBERZ_TWO, T_TEST_NUMBERZ_THREE
-          };
-          gint user_map_values[] = { 5, 8 };
-          TTestUserId user_id_key;
-
-          user_id_key = 1;
-          inner_map_in = g_hash_table_lookup (map_in, &user_id_key);
-          if (inner_map_in == NULL ||
-              g_hash_table_size (inner_map_in) != 2)
-            fail_count++;
-          else {
-            TTestNumberz numberz_key;
-
-            for (i = 0; i < 2; ++i) {
-              numberz_key = numberz_key_values[i];
-              insanity_in =
-                g_hash_table_lookup (inner_map_in,
-                                     (gconstpointer)numberz_key);
-              if (insanity_in == NULL)
-                fail_count++;
-              else {
-                g_object_get (insanity_in,
-                              "userMap", &user_map,
-                              "xtructs", &xtructs,
-                              NULL);
-
-                if (user_map == NULL)
-                  fail_count++;
-                else {
-                  if (g_hash_table_size (user_map) != 2)
-                    fail_count++;
-                  else {
-                    for (j = 0; j < 2; ++j) {
-                      numberz_key = (TTestNumberz)user_map_values[j];
-
-                      value =
-                        g_hash_table_lookup (user_map,
-                                             (gconstpointer)numberz_key);
-                      if (value == NULL ||
-                          *(TTestUserId *)value != (TTestUserId)user_map_values[j])
-                        fail_count++;
-                    }
-                  }
-
-                  g_hash_table_unref (user_map);
-                }
-
-                if (xtructs == NULL)
-                  fail_count++;
-                else {
-                  if (xtructs->len != 2)
-                    fail_count++;
-                  else {
-                    xtruct_in = g_ptr_array_index (xtructs, 0);
-                    g_object_get (xtruct_in,
-                                  "string_thing", &string,
-                                  "byte_thing",   &byte_thing,
-                                  "i32_thing",    &i32_thing,
-                                  "i64_thing",    &i64_thing,
-                                  NULL);
-                    if ((string == NULL ||
-                         strncmp (string, "Goodbye4", 9) != 0) ||
-                        byte_thing != 4 ||
-                        i32_thing != 4 ||
-                        i64_thing != 4)
-                      fail_count++;
-
-                    if (string != NULL)
-                      g_free (string);
-
-                    xtruct_in = g_ptr_array_index (xtructs, 1);
-                    g_object_get (xtruct_in,
-                                  "string_thing", &string,
-                                  "byte_thing",   &byte_thing,
-                                  "i32_thing",    &i32_thing,
-                                  "i64_thing",    &i64_thing,
-                                  NULL);
-                    if ((string == NULL ||
-                         strncmp (string, "Hello2", 7) != 0) ||
-                        byte_thing != 2 ||
-                        i32_thing != 2 ||
-                        i64_thing != 2)
-                      fail_count++;
-
-                    if (string != NULL)
-                      g_free (string);
-                  }
-
-                  g_ptr_array_unref (xtructs);
-                }
-              }
-            }
-          }
-
-          user_id_key = 2;
-          inner_map_in = g_hash_table_lookup (map_in, &user_id_key);
-          if (inner_map_in == NULL ||
-              g_hash_table_size (inner_map_in) != 1)
-            fail_count++;
-          else {
-            insanity_in =
-              g_hash_table_lookup (inner_map_in,
-                                   (gconstpointer)T_TEST_NUMBERZ_SIX);
-            if (insanity_in == NULL)
-              fail_count++;
-            else {
-              g_object_get (insanity_in,
-                            "userMap", &user_map,
-                            "xtructs", &xtructs,
-                            NULL);
-
-              if (user_map == NULL)
-                fail_count++;
-              else {
-                if (g_hash_table_size (user_map) != 0)
-                  fail_count++;
-
-                g_hash_table_unref (user_map);
-              }
-
-              if (xtructs == NULL)
-                fail_count++;
-              else {
-                if (xtructs->len != 0)
-                  fail_count++;
-
-                g_ptr_array_unref (xtructs);
-              }
-            }
-          }
-        }
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      g_hash_table_unref (map_in);
-      g_object_unref (insanity_out);
-
-      /* test exception */
-      printf ("testClient.testException(\"Xception\") =>");
-      if (!t_test_thrift_test_if_test_exception (test_client,
-                                                 "Xception",
-                                                 &xception,
-                                                 &error) &&
-          xception != NULL) {
-        g_object_get (xception,
-                      "errorCode", &int32,
-                      "message",   &string,
-                      NULL);
-        printf ("  {%u, \"%s\"}\n", int32, string);
-        g_free (string);
-
-        g_object_unref (xception);
-        xception = NULL;
-
-        g_error_free (error);
-        error = NULL;
-      }
-      else {
-        printf ("  void\nFAILURE\n");
-        fail_count++;
-
-        if (xception != NULL) {
-          g_object_unref (xception);
-          xception = NULL;
-        }
-
-        if (error != NULL) {
-          g_error_free (error);
-          error = NULL;
-        }
-      }
-
-      printf ("testClient.testException(\"TException\") =>");
-      if (!t_test_thrift_test_if_test_exception (test_client,
-                                                 "TException",
-                                                 &xception,
-                                                 &error) &&
-          xception == NULL &&
-          error != NULL) {
-        printf ("  Caught TException\n");
-
-        g_error_free (error);
-        error = NULL;
-      }
-      else {
-        printf ("  void\nFAILURE\n");
-        fail_count++;
-
-        if (xception != NULL) {
-          g_object_unref (xception);
-          xception = NULL;
-        }
-
-        if (error != NULL) {
-          g_error_free (error);
-          error = NULL;
-        }
-      }
-
-      printf ("testClient.testException(\"success\") =>");
-      if (t_test_thrift_test_if_test_exception (test_client,
-                                                "success",
-                                                &xception,
-                                                &error))
-        printf ("  void\n");
-      else {
-        printf ("  void\nFAILURE\n");
-        fail_count++;
-
-        if (xception != NULL) {
-          g_object_unref (xception);
-          xception = NULL;
-        }
-
-        g_error_free (error);
-        error = NULL;
-      }
-
-      g_assert (error == NULL);
-
-      /* test multi exception */
-      printf ("testClient.testMultiException(\"Xception\", \"test 1\") =>");
-      xtruct_in = g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-      if (!t_test_thrift_test_if_test_multi_exception (test_client,
-                                                       &xtruct_in,
-                                                       "Xception",
-                                                       "test 1",
-                                                       &xception,
-                                                       &xception2,
-                                                       &error) &&
-          xception != NULL &&
-          xception2 == NULL) {
-        g_object_get (xception,
-                      "errorCode", &int32,
-                      "message",   &string,
-                      NULL);
-        printf ("  {%u, \"%s\"}\n", int32, string);
-        g_free (string);
-
-        g_object_unref (xception);
-        xception = NULL;
-
-        g_error_free (error);
-        error = NULL;
-      }
-      else {
-        printf ("  result\nFAILURE\n");
-        fail_count++;
-
-        if (xception != NULL) {
-          g_object_unref (xception);
-          xception = NULL;
-        }
-
-        if (xception2 != NULL) {
-          g_object_unref (xception2);
-          xception = NULL;
-        }
-
-        if (error != NULL) {
-          g_error_free (error);
-          error = NULL;
-        }
-      }
-      g_object_unref (xtruct_in);
-
-      printf ("testClient.testMultiException(\"Xception2\", \"test 2\") =>");
-      xtruct_in = g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-      if (!t_test_thrift_test_if_test_multi_exception (test_client,
-                                                       &xtruct_in,
-                                                       "Xception2",
-                                                       "test 2",
-                                                       &xception,
-                                                       &xception2,
-                                                       &error) &&
-          xception == NULL &&
-          xception2 != NULL) {
-        g_object_get (xception2,
-                      "errorCode",    &int32,
-                      "struct_thing", &inner_xtruct_in,
-                      NULL);
-        g_object_get (inner_xtruct_in,
-                      "string_thing", &string,
-                      NULL);
-        printf ("  {%u, {\"%s\"}}\n", int32, string);
-        g_free (string);
-
-        g_object_unref (inner_xtruct_in);
-        inner_xtruct_in = NULL;
-
-        g_object_unref (xception2);
-        xception2 = NULL;
-
-        g_error_free (error);
-        error = NULL;
-      }
-      else {
-        printf ("  result\nFAILURE\n");
-        fail_count++;
-
-        if (xception != NULL) {
-          g_object_unref (xception);
-          xception = NULL;
-        }
-
-        if (xception2 != NULL) {
-          g_object_unref (xception2);
-          xception = NULL;
-        }
-
-        if (error != NULL) {
-          g_error_free (error);
-          error = NULL;
-        }
-      }
-      g_object_unref (xtruct_in);
-
-      printf ("testClient.testMultiException(\"success\", \"test 3\") =>");
-      xtruct_in = g_object_new (T_TEST_TYPE_XTRUCT, NULL);
-      if (t_test_thrift_test_if_test_multi_exception (test_client,
-                                                      &xtruct_in,
-                                                      "success",
-                                                      "test 3",
-                                                      &xception,
-                                                      &xception2,
-                                                      &error) &&
-          xception == NULL &&
-          xception2 == NULL) {
-        g_object_get (xtruct_in,
-                      "string_thing", &string,
-                      NULL);
-        printf ("  {{\"%s\"}}\n", string);
-        g_free (string);
-      }
-      else {
-        printf ("  result\nFAILURE\n");
-        fail_count++;
-
-        if (xception != NULL) {
-          g_object_unref (xception);
-          xception = NULL;
-        }
-
-        if (xception2 != NULL) {
-          g_object_unref (xception2);
-          xception = NULL;
-        }
-
-        if (error != NULL) {
-          g_error_free (error);
-          error = NULL;
-        }
-      }
-      g_object_unref (xtruct_in);
-
-      /* test oneway void */
-      printf ("testClient.testOneway(1) =>");
-      gettimeofday (&oneway_start, NULL);
-      oneway_result = t_test_thrift_test_if_test_oneway (test_client,
-                                                         1,
-                                                         &error);
-      gettimeofday (&oneway_end, NULL);
-      timersub (&oneway_end, &oneway_start, &oneway_elapsed);
-      oneway_elapsed_usec =
-        oneway_elapsed.tv_sec * 1000 * 1000 + oneway_elapsed.tv_usec;
-
-      if (oneway_result) {
-        if (oneway_elapsed_usec > 200 * 1000) {
-          printf ("  FAILURE - took %.2f ms\n",
-                  (double)oneway_elapsed_usec / 1000.0);
-          fail_count++;
-        }
-        else
-          printf ("  success - took %.2f ms\n",
-                  (double)oneway_elapsed_usec / 1000.0);
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      /**
-       * redo a simple test after the oneway to make sure we aren't "off by
-       * one" -- if the server treated oneway void like normal void, this next
-       * test will fail since it will get the void confirmation rather than
-       * the correct result. In this circumstance, the client will receive the
-       * error:
-       *
-       *   application error: Wrong method name
-       */
-      /**
-       * I32 TEST
-       */
-      printf ("re-test testI32(-1)");
-      if (t_test_thrift_test_if_test_i32 (test_client,
-                                          &int32,
-                                          -1,
-                                          &error)) {
-        printf (" = %d\n", int32);
-        if (int32 != -1)
-          fail_count++;
-      }
-      else {
-        printf ("%s\n", error->message);
-        g_error_free (error);
-        error = NULL;
-
-        fail_count++;
-      }
-
-      gettimeofday (&time_stop, NULL);
-      timersub (&time_stop, &time_start, &time_elapsed);
-      time_elapsed_usec =
-        time_elapsed.tv_sec * 1000 * 1000 + time_elapsed.tv_usec;
-
-      printf("Total time: %" PRIu64 " us\n", time_elapsed_usec);
-
-      time_total_usec += time_elapsed_usec;
-      if (time_elapsed_usec < time_min_usec)
-        time_min_usec = time_elapsed_usec;
-      if (time_elapsed_usec > time_max_usec)
-        time_max_usec = time_elapsed_usec;
-
-      thrift_transport_close (transport, &error);
-    }
-    else {
-      printf ("Connect failed: %s\n", error->message);
-      g_error_free (error);
-      error = NULL;
-
-      return 1;
-    }
-  }
-
-  /* All done---output statistics */
-  puts ("\nAll tests done.");
-
-  time_avg_usec = time_total_usec / num_tests;
-
-  printf ("Min time: %" PRIu64 " us\n", time_min_usec);
-  printf ("Max time: %" PRIu64 " us\n", time_max_usec);
-  printf ("Avg time: %" PRIu64 " us\n", time_avg_usec);
-
-  g_object_unref (test_client);
-  g_object_unref (protocol);
-  g_object_unref (transport);
-  g_free (host);
-
-  return fail_count;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/c_glib/src/test_server.c b/vendor/git.apache.org/thrift.git/test/c_glib/src/test_server.c
deleted file mode 100644
index 7f41d3f..0000000
--- a/vendor/git.apache.org/thrift.git/test/c_glib/src/test_server.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <glib-object.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol_factory.h>
-#include <thrift/c_glib/protocol/thrift_compact_protocol_factory.h>
-#include <thrift/c_glib/server/thrift_server.h>
-#include <thrift/c_glib/server/thrift_simple_server.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport_factory.h>
-#include <thrift/c_glib/transport/thrift_framed_transport.h>
-#include <thrift/c_glib/transport/thrift_framed_transport_factory.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-#include <thrift/c_glib/transport/thrift_transport.h>
-#include <thrift/c_glib/transport/thrift_transport_factory.h>
-
-#include "../gen-c_glib/t_test_thrift_test.h"
-
-#include "thrift_test_handler.h"
-
-/* Our server object, declared globally so it is accessible within the SIGINT
-   signal handler */
-ThriftServer *server = NULL;
-
-/* A flag that indicates whether the server was interrupted with SIGINT
-   (i.e. Ctrl-C) so we can tell whether its termination was abnormal */
-gboolean sigint_received = FALSE;
-
-/* Handle SIGINT ("Ctrl-C") signals by gracefully stopping the server */
-static void
-sigint_handler (int signal_number)
-{
-  THRIFT_UNUSED_VAR (signal_number);
-
-  /* Take note we were called */
-  sigint_received = TRUE;
-
-  /* Shut down the server gracefully */
-  if (server != NULL)
-    thrift_server_stop (server);
-}
-
-int
-main (int argc, char **argv)
-{
-  static gint   port = 9090;
-  static gchar *server_type_option = NULL;
-  static gchar *transport_option = NULL;
-  static gchar *protocol_option = NULL;
-  static gint   string_limit = 0;
-  static gint   container_limit = 0;
-
-  static
-    GOptionEntry option_entries[] = {
-    { "port",            0, 0, G_OPTION_ARG_INT,      &port,
-      "Port number to connect (=9090)", NULL },
-    { "server-type",     0, 0, G_OPTION_ARG_STRING,   &server_type_option,
-      "Type of server: simple (=simple)", NULL },
-    { "transport",       0, 0, G_OPTION_ARG_STRING,   &transport_option,
-      "Transport: buffered, framed (=buffered)", NULL },
-    { "protocol",        0, 0, G_OPTION_ARG_STRING,   &protocol_option,
-      "Protocol: binary, compact (=binary)", NULL },
-    { "string-limit",    0, 0, G_OPTION_ARG_INT,      &string_limit,
-      "Max string length (=none)", NULL },
-    { "container-limit", 0, 0, G_OPTION_ARG_INT,      &container_limit,
-      "Max container length (=none)", NULL },
-    { NULL }
-  };
-
-  gchar *server_name            = "simple";
-  gchar *transport_name         = "buffered";
-  GType  transport_factory_type = THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY;
-  gchar *protocol_name          = "binary";
-  GType  protocol_factory_type  = THRIFT_TYPE_BINARY_PROTOCOL_FACTORY;
-
-  TTestThriftTestHandler *handler;
-  ThriftProcessor        *processor;
-  ThriftServerTransport  *server_transport;
-  ThriftTransportFactory *transport_factory;
-  ThriftProtocolFactory  *protocol_factory;
-
-  struct sigaction sigint_action;
-
-  GOptionContext *option_context;
-  gboolean        options_valid = TRUE;
-
-  GError *error = NULL;
-
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  /* Configure and parse our command-line options */
-  option_context = g_option_context_new (NULL);
-  g_option_context_add_main_entries (option_context,
-                                     option_entries,
-                                     NULL);
-  if (g_option_context_parse (option_context,
-                              &argc,
-                              &argv,
-                              &error) == FALSE) {
-    fprintf (stderr, "%s\n", error->message);
-    return 255;
-  }
-  g_option_context_free (option_context);
-
-  /* Validate the parsed options */
-  if (server_type_option != NULL &&
-      strncmp (server_type_option, "simple", 7) != 0) {
-    fprintf (stderr, "Unknown server type %s\n", protocol_option);
-    options_valid = FALSE;
-  }
-
-  if (protocol_option != NULL) {
-    if (strncmp (protocol_option, "compact", 8) == 0) {
-      protocol_factory_type = THRIFT_TYPE_COMPACT_PROTOCOL_FACTORY;
-      protocol_name = "compact";
-    }
-    else if (strncmp (protocol_option, "binary", 7) != 0) {
-      fprintf (stderr, "Unknown protocol type %s\n", protocol_option);
-      options_valid = FALSE;
-    }
-  }
-
-  if (transport_option != NULL) {
-    if (strncmp (transport_option, "framed", 7) == 0) {
-      transport_factory_type = THRIFT_TYPE_FRAMED_TRANSPORT_FACTORY;
-      transport_name = "framed";
-    }
-    else if (strncmp (transport_option, "buffered", 9) != 0) {
-      fprintf (stderr, "Unknown transport type %s\n", transport_option);
-      options_valid = FALSE;
-    }
-  }
-
-  if (!options_valid)
-    return 254;
-
-  /* Establish all our connection objects */
-  handler           = g_object_new (TYPE_THRIFT_TEST_HANDLER,
-                                    NULL);
-  processor         = g_object_new (T_TEST_TYPE_THRIFT_TEST_PROCESSOR,
-                                    "handler", handler,
-                                    NULL);
-  server_transport  = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                    "port", port,
-                                    NULL);
-  transport_factory = g_object_new (transport_factory_type,
-                                    NULL);
-
-  if (strncmp (protocol_name, "compact", 8) == 0) {
-    protocol_factory  = g_object_new (protocol_factory_type,
-                                      "string_limit", string_limit,
-                                      "container_limit", container_limit,
-                                      NULL);
-  } else {
-    protocol_factory  = g_object_new (protocol_factory_type,
-                                      NULL);
-  }
-
-  server = g_object_new (THRIFT_TYPE_SIMPLE_SERVER,
-                         "processor",                processor,
-                         "server_transport",         server_transport,
-                         "input_transport_factory",  transport_factory,
-                         "output_transport_factory", transport_factory,
-                         "input_protocol_factory",   protocol_factory,
-                         "output_protocol_factory",  protocol_factory,
-                         NULL);
-
-  /* Install our SIGINT handler, which handles Ctrl-C being pressed by stopping
-     the server gracefully */
-  memset (&sigint_action, 0, sizeof (sigint_action));
-  sigint_action.sa_handler = sigint_handler;
-  sigint_action.sa_flags = SA_RESETHAND;
-  sigaction (SIGINT, &sigint_action, NULL);
-
-  printf ("Starting \"%s\" server (%s/%s) listen on: %d\n",
-          server_name,
-          transport_name,
-          protocol_name,
-          port);
-  fflush (stdout);
-
-  /* Serve clients until SIGINT is received (Ctrl-C is pressed) */
-  thrift_server_serve (server, &error);
-
-  /* If the server stopped for any reason other than being interrupted by the
-     user, report the error */
-  if (!sigint_received) {
-    g_message ("thrift_server_serve: %s",
-               error != NULL ? error->message : "(null)");
-    g_clear_error (&error);
-  }
-
-  puts ("done.");
-
-  g_object_unref (server);
-  g_object_unref (protocol_factory);
-  g_object_unref (transport_factory);
-  g_object_unref (server_transport);
-  g_object_unref (processor);
-  g_object_unref (handler);
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/c_glib/src/thrift_test_handler.c b/vendor/git.apache.org/thrift.git/test/c_glib/src/thrift_test_handler.c
deleted file mode 100644
index 1d8bcb2..0000000
--- a/vendor/git.apache.org/thrift.git/test/c_glib/src/thrift_test_handler.c
+++ /dev/null
@@ -1,837 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <inttypes.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/thrift_application_exception.h>
-
-#include "thrift_test_handler.h"
-
-/* A handler that implements the TTestThriftTestIf interface */
-
-G_DEFINE_TYPE (ThriftTestHandler,
-               thrift_test_handler,
-               T_TEST_TYPE_THRIFT_TEST_HANDLER);
-
-gboolean
-thrift_test_handler_test_void (TTestThriftTestIf  *iface,
-                               GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testVoid()\n");
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_string (TTestThriftTestIf  *iface,
-                                 gchar             **_return,
-                                 const gchar        *thing,
-                                 GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testString(\"%s\")\n", thing);
-  *_return = g_strdup (thing);
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_bool (TTestThriftTestIf  *iface,
-                               gboolean           *_return,
-                               const gboolean      thing,
-                               GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testBool(%s)\n", thing ? "true" : "false");
-  *_return = thing;
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_byte (TTestThriftTestIf  *iface,
-                               gint8              *_return,
-                               const gint8         thing,
-                               GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testByte(%d)\n", (gint)thing);
-  *_return = thing;
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_i32 (TTestThriftTestIf  *iface,
-                              gint32             *_return,
-                              const gint32        thing,
-                              GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testI32(%d)\n", thing);
-  *_return = thing;
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_i64 (TTestThriftTestIf  *iface,
-                              gint64             *_return,
-                              const gint64        thing,
-                              GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testI64(%" PRId64 ")\n", thing);
-  *_return = thing;
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_double (TTestThriftTestIf  *iface,
-                                 gdouble            *_return,
-                                 const gdouble       thing,
-                                 GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testDouble(%f)\n", thing);
-  *_return = thing;
-
-  return TRUE;
-}
-
-gboolean 
-thrift_test_handler_test_binary (TTestThriftTestIf *iface,
-                                 GByteArray ** _return,
-                                 const GByteArray * thing,
-                                 GError **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testBinary()\n");  // TODO: hex output
-  g_byte_array_ref((GByteArray *)thing);
-  *_return = (GByteArray *)thing;
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_struct (TTestThriftTestIf  *iface,
-                                 TTestXtruct       **_return,
-                                 const TTestXtruct  *thing,
-                                 GError            **error)
-{
-  gchar *string_thing = NULL;
-  gint   byte_thing;
-  gint   i32_thing;
-  gint64 i64_thing;
-
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  g_object_get ((TTestXtruct *)thing,
-                "string_thing", &string_thing,
-                "byte_thing",   &byte_thing,
-                "i32_thing",    &i32_thing,
-                "i64_thing",    &i64_thing,
-                NULL);
-
-  printf ("testStruct({\"%s\", %d, %d, %" PRId64 "})\n",
-          string_thing,
-          (gint)byte_thing,
-          i32_thing,
-          i64_thing);
-
-  g_object_set (*_return,
-                "string_thing", string_thing,
-                "byte_thing",   byte_thing,
-                "i32_thing",    i32_thing,
-                "i64_thing",    i64_thing,
-                NULL);
-
-  if (string_thing != NULL)
-    g_free (string_thing);
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_nest (TTestThriftTestIf   *iface,
-                               TTestXtruct2       **_return,
-                               const TTestXtruct2  *thing,
-                               GError             **error)
-{
-  gchar *inner_string_thing = NULL;
-  gint   byte_thing, inner_byte_thing;
-  gint   i32_thing, inner_i32_thing;
-  gint64 inner_i64_thing;
-  TTestXtruct *struct_thing;
-
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  g_object_get ((TTestXtruct2 *)thing,
-                "byte_thing",   &byte_thing,
-                "struct_thing", &struct_thing,
-                "i32_thing",    &i32_thing,
-                NULL);
-  g_object_get (struct_thing,
-                "string_thing", &inner_string_thing,
-                "byte_thing",   &inner_byte_thing,
-                "i32_thing",    &inner_i32_thing,
-                "i64_thing",    &inner_i64_thing,
-                NULL);
-
-  printf ("testNest({%d, {\"%s\", %d, %d, %" PRId64 "}, %d})\n",
-          byte_thing,
-          inner_string_thing,
-          inner_byte_thing,
-          inner_i32_thing,
-          inner_i64_thing,
-          i32_thing);
-
-  g_object_set (*_return,
-                "byte_thing",   byte_thing,
-                "struct_thing", struct_thing,
-                "i32_thing",    i32_thing,
-                NULL);
-
-  if (inner_string_thing != NULL)
-    g_free (inner_string_thing);
-  g_object_unref (struct_thing);
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_map (TTestThriftTestIf  *iface,
-                              GHashTable        **_return,
-                              const GHashTable   *thing,
-                              GError            **error)
-{
-  GHashTableIter hash_table_iter;
-  gpointer key;
-  gpointer value;
-  gboolean first = TRUE;
-
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testMap({");
-  g_hash_table_iter_init (&hash_table_iter, (GHashTable *)thing);
-  while (g_hash_table_iter_next (&hash_table_iter,
-                                 &key,
-                                 &value)) {
-    gint32 *new_key;
-    gint32 *new_value;
-
-    if (first)
-      first = FALSE;
-    else
-      printf (", ");
-
-    printf ("%d => %d", *(gint32 *)key, *(gint32 *)value);
-
-    new_key = g_malloc (sizeof *new_key);
-    *new_key = *(gint32 *)key;
-    new_value = g_malloc (sizeof *new_value);
-    *new_value = *(gint32 *)value;
-    g_hash_table_insert (*_return, new_key, new_value);
-  }
-  printf ("})\n");
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_string_map (TTestThriftTestIf  *iface,
-                                     GHashTable        **_return,
-                                     const GHashTable   *thing,
-                                     GError            **error)
-{
-  GHashTableIter hash_table_iter;
-  gpointer key;
-  gpointer value;
-  gboolean first = TRUE;
-
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testStringMap({");
-  g_hash_table_iter_init (&hash_table_iter, (GHashTable *)thing);
-  while (g_hash_table_iter_next (&hash_table_iter,
-                                 &key,
-                                 &value)) {
-    gchar *new_key;
-    gchar *new_value;
-
-    if (first)
-      first = FALSE;
-    else
-      printf (", ");
-
-    printf ("%s => %s", (gchar *)key, (gchar *)value);
-
-    new_key = g_strdup ((gchar *)key);
-    new_value = g_strdup ((gchar *)value);
-    g_hash_table_insert (*_return, new_key, new_value);
-  }
-  printf ("})\n");
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_set (TTestThriftTestIf  *iface,
-                              GHashTable        **_return,
-                              const GHashTable   *thing,
-                              GError            **error)
-{
-  GHashTableIter hash_table_iter;
-  gpointer key;
-  gboolean first = TRUE;
-
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testSet({");
-  g_hash_table_iter_init (&hash_table_iter, (GHashTable *)thing);
-  while (g_hash_table_iter_next (&hash_table_iter,
-                                 &key,
-                                 NULL)) {
-    gint32 *new_key;
-
-    if (first)
-      first = FALSE;
-    else
-      printf (", ");
-
-    printf ("%d", *(gint32 *)key);
-
-    new_key = g_malloc (sizeof *new_key);
-    *new_key = *(gint32 *)key;
-    g_hash_table_insert (*_return, new_key, NULL);
-  }
-  printf ("})\n");
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_list (TTestThriftTestIf  *iface,
-                               GArray            **_return,
-                               const GArray       *thing,
-                               GError            **error)
-{
-  guint i;
-  gboolean first = TRUE;
-
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testList({");
-  for (i = 0; i < thing->len; i += 1) {
-    gint32 value;
-    gint32 *new_value;
-
-    if (first)
-      first = FALSE;
-    else
-      printf (", ");
-
-    value = g_array_index (thing, gint32, i);
-    printf ("%d", value);
-
-    new_value = g_malloc (sizeof *new_value);
-    *new_value = value;
-    g_array_append_val (*_return, *new_value);
-  }
-  printf ("})\n");
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_enum (TTestThriftTestIf   *iface,
-                               TTestNumberz        *_return,
-                               const TTestNumberz   thing,
-                               GError             **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testEnum(%d)\n", thing);
-  *_return = thing;
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_typedef (TTestThriftTestIf  *iface,
-                                  TTestUserId        *_return,
-                                  const TTestUserId   thing,
-                                  GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testTypedef(%" PRId64 ")\n", thing);
-  *_return = thing;
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_map_map (TTestThriftTestIf  *iface,
-                                  GHashTable        **_return,
-                                  const gint32        hello,
-                                  GError            **error)
-{
-  GHashTable *positive;
-  GHashTable *negative;
-  gint32 *key;
-  gint32 *value;
-  guint i;
-
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testMapMap(%d)\n", hello);
-
-  positive = g_hash_table_new_full (g_int_hash,
-                                    g_int_equal,
-                                    g_free,
-                                    g_free);
-  negative = g_hash_table_new_full (g_int_hash,
-                                    g_int_equal,
-                                    g_free,
-                                    g_free);
-
-  for (i = 1; i < 5; i += 1) {
-    key = g_malloc (sizeof *key);
-    value = g_malloc (sizeof *value);
-    *key = i;
-    *value = i;
-    g_hash_table_insert (positive, key, value);
-
-    key = g_malloc (sizeof *key);
-    value = g_malloc (sizeof *value);
-    *key = -i;
-    *value = -i;
-    g_hash_table_insert (negative, key, value);
-  }
-
-  key = g_malloc (sizeof *key);
-  *key = 4;
-  g_hash_table_insert (*_return, key, positive);
-
-  key = g_malloc (sizeof *key);
-  *key = -4;
-  g_hash_table_insert (*_return, key, negative);
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_insanity (TTestThriftTestIf    *iface,
-                                   GHashTable          **_return,
-                                   const TTestInsanity  *argument,
-                                   GError              **error)
-{
-  TTestXtruct *xtruct_in;
-
-  gchar *string_thing = NULL;
-  gint   byte_thing;
-  gint   i32_thing;
-  gint64 i64_thing;
-
-  GPtrArray *xtructs;
-
-  TTestInsanity *looney;
-
-  GHashTable *user_map;
-  GHashTable *first_map;
-  GHashTable *second_map;
-
-  GHashTableIter hash_table_iter;
-  GHashTableIter inner_hash_table_iter;
-  GHashTableIter user_map_iter;
-
-  gpointer key;
-  gpointer value;
-
-  TTestUserId *user_id;
-
-  guint i;
-
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testInsanity()\n");
-
-  first_map = g_hash_table_new_full (g_direct_hash,
-                                     g_direct_equal,
-                                     NULL,
-                                     g_object_unref);
-  second_map = g_hash_table_new_full (g_direct_hash,
-                                      g_direct_equal,
-                                      NULL,
-                                      g_object_unref);
-
-  g_hash_table_insert (first_map,
-                       GINT_TO_POINTER (T_TEST_NUMBERZ_TWO),
-                       (gpointer)argument);
-  g_hash_table_insert (first_map,
-                       GINT_TO_POINTER (T_TEST_NUMBERZ_THREE),
-                       (gpointer)argument);
-
-  /* Increment argument's ref count by two because first_map now holds
-     two references to it and the caller is not aware we have made any
-     additional references to argument.  (That is, caller owns argument
-     and will unref it explicitly in addition to unref-ing *_return.)
-
-     We do this instead of creating a copy of argument in order to mimic
-     the C++ implementation (and since, frankly, the world needs less
-     argument, not more). */
-  g_object_ref ((gpointer)argument);
-  g_object_ref ((gpointer)argument);
-
-  looney = g_object_new (T_TEST_TYPE_INSANITY, NULL);
-  g_hash_table_insert (second_map,
-                       GINT_TO_POINTER (T_TEST_NUMBERZ_SIX),
-                       looney);
-
-  user_id = g_malloc (sizeof *user_id);
-  *user_id = 1;
-  g_hash_table_insert (*_return, user_id, first_map);
-
-  user_id = g_malloc (sizeof *user_id);
-  *user_id = 2;
-  g_hash_table_insert (*_return, user_id, second_map);
-
-  printf ("return");
-  printf (" = {");
-  g_hash_table_iter_init (&hash_table_iter, *_return);
-  while (g_hash_table_iter_next (&hash_table_iter,
-                                 &key,
-                                 &value)) {
-    printf ("%" PRId64 " => {", *(TTestUserId *)key);
-
-    g_hash_table_iter_init (&inner_hash_table_iter,
-                            (GHashTable *)value);
-    while (g_hash_table_iter_next (&inner_hash_table_iter,
-                                   &key,
-                                   &value)) {
-      printf ("%d => {", (TTestNumberz)key);
-
-      g_object_get ((TTestInsanity *)value,
-                    "userMap", &user_map,
-                    "xtructs", &xtructs,
-                    NULL);
-
-      printf ("{");
-      g_hash_table_iter_init (&user_map_iter, user_map);
-      while (g_hash_table_iter_next (&user_map_iter,
-                                     &key,
-                                     &value)) {
-        printf ("%d => %" PRId64 ", ",
-                (TTestNumberz)key,
-                *(TTestUserId *)value);
-      }
-      printf ("}, ");
-      g_hash_table_unref (user_map);
-
-      printf ("{");
-      for (i = 0; i < xtructs->len; ++i) {
-        xtruct_in = g_ptr_array_index (xtructs, i);
-        g_object_get (xtruct_in,
-                      "string_thing", &string_thing,
-                      "byte_thing",   &byte_thing,
-                      "i32_thing",    &i32_thing,
-                      "i64_thing",    &i64_thing,
-                      NULL);
-
-        printf ("{\"%s\", %d, %d, %" PRId64 "}, ",
-                string_thing,
-                byte_thing,
-                i32_thing,
-                i64_thing);
-      }
-      printf ("}");
-      g_ptr_array_unref (xtructs);
-
-      printf ("}, ");
-    }
-    printf ("}, ");
-  }
-  printf ("}\n");
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_multi (TTestThriftTestIf   *iface,
-                                TTestXtruct        **_return,
-                                const gint8          arg0,
-                                const gint32         arg1,
-                                const gint64         arg2,
-                                const GHashTable    *arg3,
-                                const TTestNumberz   arg4,
-                                const TTestUserId    arg5,
-                                GError             **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-  THRIFT_UNUSED_VAR (arg3);
-  THRIFT_UNUSED_VAR (arg4);
-  THRIFT_UNUSED_VAR (arg5);
-
-  printf ("testMulti()\n");
-
-  g_object_set (*_return,
-                "string_thing", g_strdup ("Hello2"),
-                "byte_thing",   arg0,
-                "i32_thing",    arg1,
-                "i64_thing",    arg2,
-                NULL);
-
-  return TRUE;
-}
-
-gboolean
-thrift_test_handler_test_exception (TTestThriftTestIf  *iface,
-                                    const gchar        *arg,
-                                    TTestXception     **err1,
-                                    GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-
-  TTestXtruct *xtruct;
-  gboolean result;
-
-  printf ("testException(%s)\n", arg);
-
-  /* Unlike argument objects, exception objects are not pre-created */
-  g_assert (*err1 == NULL);
-
-  if (strncmp (arg, "Xception", 9) == 0) {
-    /* "Throw" a custom exception: Set the corresponding exception
-       argument, set *error to NULL and return FALSE */
-    *err1 = g_object_new (T_TEST_TYPE_XCEPTION,
-                          "errorCode", 1001,
-                          "message",   g_strdup (arg),
-                          NULL);
-    *error = NULL;
-    result = FALSE;
-  }
-  else if (strncmp (arg, "TException", 11) == 0) {
-    /* "Throw" a generic TException (ThriftApplicationException): Set
-       all exception arguments to NULL, set *error and return FALSE */
-    *err1 = NULL;
-    g_set_error (error,
-                 thrift_application_exception_error_quark (),
-                 THRIFT_APPLICATION_EXCEPTION_ERROR_UNKNOWN,
-                 "Default TException.");
-    result = FALSE;
-  }
-  else {
-    *err1 = NULL;
-    *error = NULL;
-
-    /* This code is duplicated from the C++ test suite, though it
-       appears to serve no purpose */
-    xtruct = g_object_new (T_TEST_TYPE_XTRUCT,
-                           "string_thing", g_strdup (arg),
-                           NULL);
-    g_object_unref (xtruct);
-
-    result = TRUE;
-  }
-
-  return result;
-}
-
-gboolean
-thrift_test_handler_test_multi_exception (TTestThriftTestIf  *iface,
-                                          TTestXtruct       **_return,
-                                          const gchar        *arg0,
-                                          const gchar        *arg1,
-                                          TTestXception     **err1,
-                                          TTestXception2    **err2,
-                                          GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  TTestXtruct *struct_thing;
-  gboolean result;
-
-  printf ("testMultiException(%s, %s)\n", arg0, arg1);
-
-  g_assert (*err1 == NULL);
-  g_assert (*err2 == NULL);
-
-  if (strncmp (arg0, "Xception", 8) == 0 && strlen(arg0) == 8) {
-    *err1 = g_object_new (T_TEST_TYPE_XCEPTION,
-                          "errorCode", 1001,
-                          "message",   g_strdup ("This is an Xception"),
-                          NULL);
-    result = FALSE;
-  }
-  else if (strncmp (arg0, "Xception2", 9) == 0) {
-    *err2 = g_object_new (T_TEST_TYPE_XCEPTION2,
-                          "errorCode", 2002,
-                          NULL);
-
-    g_object_get (*err2,
-                  "struct_thing", &struct_thing,
-                  NULL);
-    g_object_set (struct_thing,
-                  "string_thing", g_strdup ("This is an Xception2"),
-                  NULL);
-    g_object_set (*err2,
-                  "struct_thing", struct_thing,
-                  NULL);
-    g_object_unref (struct_thing);
-
-    result = FALSE;
-  }
-  else {
-    g_object_set (*_return,
-                  "string_thing", g_strdup (arg1),
-                  NULL);
-    result = TRUE;
-  }
-
-  return result;
-}
-
-gboolean
-thrift_test_handler_test_oneway (TTestThriftTestIf  *iface,
-                                 const gint32        secondsToSleep,
-                                 GError            **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("testOneway(%d): Sleeping...\n", secondsToSleep);
-  sleep (secondsToSleep);
-  printf ("testOneway(%d): done sleeping!\n", secondsToSleep);
-
-  return TRUE;
-}
-
-static void
-thrift_test_handler_init (ThriftTestHandler *self)
-{
-  THRIFT_UNUSED_VAR (self);
-}
-
-static void
-thrift_test_handler_class_init (ThriftTestHandlerClass *klass)
-{
-  TTestThriftTestHandlerClass *base_class =
-    T_TEST_THRIFT_TEST_HANDLER_CLASS (klass);
-
-  base_class->test_void =
-    klass->test_void =
-    thrift_test_handler_test_void;
-  base_class->test_string =
-    klass->test_string =
-    thrift_test_handler_test_string;
-  base_class->test_bool =
-    klass->test_bool =
-    thrift_test_handler_test_bool;
-  base_class->test_byte =
-    klass->test_byte =
-    thrift_test_handler_test_byte;
-  base_class->test_i32 =
-    klass->test_i32 =
-    thrift_test_handler_test_i32;
-  base_class->test_i64 =
-    klass->test_i64 =
-    thrift_test_handler_test_i64;
-  base_class->test_double =
-    klass->test_double =
-    thrift_test_handler_test_double;
-  base_class->test_binary =
-    klass->test_binary =
-    thrift_test_handler_test_binary;
-  base_class->test_struct =
-    klass->test_struct =
-    thrift_test_handler_test_struct;
-  base_class->test_nest =
-    klass->test_nest =
-    thrift_test_handler_test_nest;
-  base_class->test_map =
-    klass->test_map =
-    thrift_test_handler_test_map;
-  base_class->test_string_map =
-    klass->test_string_map =
-    thrift_test_handler_test_string_map;
-  base_class->test_set =
-    klass->test_set =
-    thrift_test_handler_test_set;
-  base_class->test_list =
-    klass->test_list =
-    thrift_test_handler_test_list;
-  base_class->test_enum =
-    klass->test_enum =
-    thrift_test_handler_test_enum;
-  base_class->test_typedef =
-    klass->test_typedef =
-    thrift_test_handler_test_typedef;
-  base_class->test_map_map =
-    klass->test_map_map =
-    thrift_test_handler_test_map_map;
-  base_class->test_insanity =
-    klass->test_insanity =
-    thrift_test_handler_test_insanity;
-  base_class->test_multi =
-    klass->test_multi =
-    thrift_test_handler_test_multi;
-  base_class->test_exception =
-    klass->test_exception =
-    thrift_test_handler_test_exception;
-  base_class->test_multi_exception =
-    klass->test_multi_exception =
-    thrift_test_handler_test_multi_exception;
-  base_class->test_oneway =
-    klass->test_oneway =
-    thrift_test_handler_test_oneway;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/c_glib/src/thrift_test_handler.h b/vendor/git.apache.org/thrift.git/test/c_glib/src/thrift_test_handler.h
deleted file mode 100644
index b64cb16..0000000
--- a/vendor/git.apache.org/thrift.git/test/c_glib/src/thrift_test_handler.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef _THRIFT_TEST_HANDLER_H
-#define _THRIFT_TEST_HANDLER_H
-
-#include <glib-object.h>
-#include <stdio.h>
-
-#include "../gen-c_glib/t_test_thrift_test.h"
-
-G_BEGIN_DECLS
-
-/* A handler that implements the TTestThriftTestIf interface */
-
-#define TYPE_THRIFT_TEST_HANDLER (thrift_test_handler_get_type ())
-
-#define THRIFT_TEST_HANDLER(obj)                                \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                           \
-                               TYPE_THRIFT_TEST_HANDLER,        \
-                               ThriftTestHandler))
-#define IS_THRIFT_TEST_HANDLER(obj)                             \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                           \
-                               TYPE_THRIFT_TEST_HANDLER))
-#define THRIFT_TEST_HANDLER_CLASS(c)                    \
-  (G_TYPE_CHECK_CLASS_CAST ((c),                        \
-                            TYPE_THRIFT_TEST_HANDLER,   \
-                            ThriftTestHandlerClass))
-#define IS_THRIFT_TEST_HANDLER_CLASS(c)                 \
-  (G_TYPE_CHECK_CLASS_TYPE ((c),                        \
-                            TYPE_THRIFT_TEST_HANDLER))
-#define THRIFT_TEST_HANDLER_GET_CLASS(obj)              \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                    \
-                              TYPE_THRIFT_TEST_HANDLER, \
-                              ThriftTestHandlerClass))
-
-typedef struct _ThriftTestHandler ThriftTestHandler;
-typedef struct _ThriftTestHandlerClass ThriftTestHandlerClass;
-
-struct _ThriftTestHandler {
-  TTestThriftTestHandler parent;
-};
-
-struct _ThriftTestHandlerClass {
-  TTestThriftTestHandlerClass parent;
-
-  gboolean (*test_void)            (TTestThriftTestIf    *iface,
-                                    GError              **error);
-  gboolean (*test_string)          (TTestThriftTestIf    *iface,
-                                    gchar               **_return,
-                                    const gchar          *thing,
-                                    GError              **error);
-  gboolean (*test_bool)            (TTestThriftTestIf    *iface,
-                                    gboolean*_return,
-                                    const gboolean        thing,
-                                    GError              **error);
-  gboolean (*test_byte)            (TTestThriftTestIf    *iface,
-                                    gint8*_return,
-                                    const gint8           thing,
-                                    GError              **error);
-  gboolean (*test_i32)             (TTestThriftTestIf    *iface,
-                                    gint32*_return,
-                                    const gint32          thing,
-                                    GError              **error);
-  gboolean (*test_i64)             (TTestThriftTestIf    *iface,
-                                    gint64*_return,
-                                    const gint64          thing,
-                                    GError              **error);
-  gboolean (*test_double)          (TTestThriftTestIf    *iface,
-                                    gdouble*_return,
-                                    const gdouble         thing,
-                                    GError              **error);
-  gboolean (*test_binary)          (TTestThriftTestIf    *iface,
-                                    GByteArray        **_return,
-                                    const GByteArray     *thing,
-                                    GError              **error);
-  gboolean (*test_struct)          (TTestThriftTestIf    *iface,
-                                    TTestXtruct         **_return,
-                                    const TTestXtruct    *thing,
-                                    GError              **error);
-  gboolean (*test_nest)            (TTestThriftTestIf    *iface,
-                                    TTestXtruct2        **_return,
-                                    const TTestXtruct2   *thing,
-                                    GError              **error);
-  gboolean (*test_map)             (TTestThriftTestIf    *iface,
-                                    GHashTable          **_return,
-                                    const GHashTable     *thing,
-                                    GError              **error);
-  gboolean (*test_string_map)      (TTestThriftTestIf    *iface,
-                                    GHashTable          **_return,
-                                    const GHashTable     *thing,
-                                    GError              **error);
-  gboolean (*test_set)             (TTestThriftTestIf    *iface,
-                                    GHashTable          **_return,
-                                    const GHashTable     *thing,
-                                    GError              **error);
-  gboolean (*test_list)            (TTestThriftTestIf    *iface,
-                                    GArray              **_return,
-                                    const GArray         *thing,
-                                    GError              **error);
-  gboolean (*test_enum)            (TTestThriftTestIf    *iface,
-                                    TTestNumberz*_return,
-                                    const TTestNumberz    thing,
-                                    GError              **error);
-  gboolean (*test_typedef)         (TTestThriftTestIf    *iface,
-                                    TTestUserId*_return,
-                                    const TTestUserId     thing,
-                                    GError              **error);
-  gboolean (*test_map_map)         (TTestThriftTestIf    *iface,
-                                    GHashTable          **_return,
-                                    const gint32          hello,
-                                    GError              **error);
-  gboolean (*test_insanity)        (TTestThriftTestIf    *iface,
-                                    GHashTable          **_return,
-                                    const TTestInsanity  *argument,
-                                    GError              **error);
-  gboolean (*test_multi)           (TTestThriftTestIf    *iface,
-                                    TTestXtruct         **_return,
-                                    const gint8           arg0,
-                                    const gint32          arg1,
-                                    const gint64          arg2,
-                                    const GHashTable     *arg3,
-                                    const TTestNumberz    arg4,
-                                    const TTestUserId     arg5,
-                                    GError              **error);
-  gboolean (*test_exception)       (TTestThriftTestIf    *iface,
-                                    const gchar          *arg,
-                                    TTestXception       **err1,
-                                    GError              **error);
-  gboolean (*test_multi_exception) (TTestThriftTestIf    *iface,
-                                    TTestXtruct         **_return,
-                                    const gchar          *arg0,
-                                    const gchar          *arg1,
-                                    TTestXception       **err1,
-                                    TTestXception2      **err2,
-                                    GError              **error);
-  gboolean (*test_oneway)          (TTestThriftTestIf    *iface,
-                                    const gint32          secondsToSleep,
-                                    GError              **error);
-};
-
-/* Used by THRIFT_TEST_HANDLER_GET_TYPE */
-GType thrift_test_handler_get_type (void);
-
-gboolean thrift_test_handler_test_void            (TTestThriftTestIf    *iface,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_string          (TTestThriftTestIf    *iface,
-                                                   gchar               **_return,
-                                                   const gchar          *thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_byte            (TTestThriftTestIf    *iface,
-                                                   gint8*_return,
-                                                   const gint8           thing,
-                                                   GError              **error);
-gboolean t_test_thrift_test_if_test_i32           (TTestThriftTestIf    *iface,
-                                                   gint32*_return,
-                                                   const gint32          thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_i64             (TTestThriftTestIf    *iface,
-                                                   gint64*_return,
-                                                   const gint64          thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_double          (TTestThriftTestIf    *iface,
-                                                   gdouble*_return,
-                                                   const gdouble         thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_struct          (TTestThriftTestIf    *iface,
-                                                   TTestXtruct         **_return,
-                                                   const TTestXtruct    *thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_nest            (TTestThriftTestIf    *iface,
-                                                   TTestXtruct2        **_return,
-                                                   const TTestXtruct2   *thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_map             (TTestThriftTestIf    *iface,
-                                                   GHashTable          **_return,
-                                                   const GHashTable     *thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_string_map      (TTestThriftTestIf    *iface,
-                                                   GHashTable          **_return,
-                                                   const GHashTable     *thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_set             (TTestThriftTestIf    *iface,
-                                                   GHashTable          **_return,
-                                                   const GHashTable     *thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_list            (TTestThriftTestIf    *iface,
-                                                   GArray              **_return,
-                                                   const GArray         *thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_typedef         (TTestThriftTestIf    *iface,
-                                                   TTestUserId*_return,
-                                                   const TTestUserId     thing,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_map_map         (TTestThriftTestIf    *iface,
-                                                   GHashTable          **_return,
-                                                   const gint32          hello,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_insanity        (TTestThriftTestIf    *iface,
-                                                   GHashTable          **_return,
-                                                   const TTestInsanity  *argument,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_multi           (TTestThriftTestIf    *iface,
-                                                   TTestXtruct         **_return,
-                                                   const gint8           arg0,
-                                                   const gint32          arg1,
-                                                   const gint64          arg2,
-                                                   const GHashTable     *arg3,
-                                                   const TTestNumberz    arg4,
-                                                   const TTestUserId     arg5,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_exception       (TTestThriftTestIf    *iface,
-                                                   const gchar          *arg,
-                                                   TTestXception       **err1,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_multi_exception (TTestThriftTestIf    *iface,
-                                                   TTestXtruct         **_return,
-                                                   const gchar          *arg0,
-                                                   const gchar          *arg1,
-                                                   TTestXception       **err1,
-                                                   TTestXception2      **err2,
-                                                   GError              **error);
-gboolean thrift_test_handler_test_oneway          (TTestThriftTestIf    *iface,
-                                                   const gint32          secondsToSleep,
-                                                   GError              **error);
-
-G_END_DECLS
-
-#endif /* _THRIFT_TEST_HANDLER_H */
diff --git a/vendor/git.apache.org/thrift.git/test/cpp/CMakeLists.txt b/vendor/git.apache.org/thrift.git/test/cpp/CMakeLists.txt
deleted file mode 100755
index 09850a8..0000000
--- a/vendor/git.apache.org/thrift.git/test/cpp/CMakeLists.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Contains the thrift specific LINK_AGAINST_THRIFT_LIBRARY
-include(ThriftMacros)
-
-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
-
-find_package(OpenSSL REQUIRED)
-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-
-find_package(Libevent REQUIRED)  # Libevent comes with CMake support from upstream
-include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS})
-
-#Make sure gen-cpp files can be included
-include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-cpp")
-include_directories("${PROJECT_SOURCE_DIR}/lib/cpp/src")
-
-
-set(crosstestgencpp_SOURCES
-    gen-cpp/ThriftTest.cpp
-    gen-cpp/ThriftTest_types.cpp
-    gen-cpp/ThriftTest_constants.cpp
-    src/ThriftTest_extras.cpp
-)
-add_library(crosstestgencpp STATIC ${crosstestgencpp_SOURCES})
-LINK_AGAINST_THRIFT_LIBRARY(crosstestgencpp thrift)
-
-set(crossstressgencpp_SOURCES
-    gen-cpp/Service.cpp
-    #gen-cpp/StressTest_types.cpp #basically empty, so omitting
-    gen-cpp/StressTest_constants.cpp
-)
-add_library(crossstressgencpp STATIC ${crossstressgencpp_SOURCES})
-LINK_AGAINST_THRIFT_LIBRARY(crossstressgencpp thrift)
-
-add_executable(TestServer src/TestServer.cpp)
-target_link_libraries(TestServer crosstestgencpp ${Boost_LIBRARIES} ${LIBEVENT_LIB})
-LINK_AGAINST_THRIFT_LIBRARY(TestServer thrift)
-LINK_AGAINST_THRIFT_LIBRARY(TestServer thriftnb)
-LINK_AGAINST_THRIFT_LIBRARY(TestServer thriftz)
-
-add_executable(TestClient src/TestClient.cpp)
-target_link_libraries(TestClient crosstestgencpp ${Boost_LIBRARIES} ${LIBEVENT_LIB})
-LINK_AGAINST_THRIFT_LIBRARY(TestClient thrift)
-LINK_AGAINST_THRIFT_LIBRARY(TestClient thriftnb)
-LINK_AGAINST_THRIFT_LIBRARY(TestClient thriftz)
-
-add_executable(StressTest src/StressTest.cpp)
-target_link_libraries(StressTest crossstressgencpp ${Boost_LIBRARIES} ${LIBEVENT_LIB})
-LINK_AGAINST_THRIFT_LIBRARY(StressTest thrift)
-LINK_AGAINST_THRIFT_LIBRARY(StressTest thriftnb)
-add_test(NAME StressTest COMMAND StressTest)
-
-add_executable(StressTestNonBlocking src/StressTestNonBlocking.cpp)
-target_link_libraries(StressTestNonBlocking crossstressgencpp ${Boost_LIBRARIES} ${LIBEVENT_LIB})
-LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thrift)
-LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thriftnb)
-LINK_AGAINST_THRIFT_LIBRARY(StressTestNonBlocking thriftz)
-add_test(NAME StressTestNonBlocking COMMAND StressTestNonBlocking)
-
-#
-# Common thrift code generation rules
-#
-
-add_custom_command(OUTPUT gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants.cpp
-    COMMAND ${THRIFT_COMPILER} --gen cpp:templates,cob_style -r ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift
-)
-
-add_custom_command(OUTPUT gen-cpp/StressTest_types.cpp gen-cpp/StressTest_constants.cpp gen-cpp/Service.cpp
-    COMMAND ${THRIFT_COMPILER} --gen cpp ${PROJECT_SOURCE_DIR}/test/StressTest.thrift
-)
diff --git a/vendor/git.apache.org/thrift.git/test/cpp/Makefile.am b/vendor/git.apache.org/thrift.git/test/cpp/Makefile.am
deleted file mode 100755
index 9c4ac07..0000000
--- a/vendor/git.apache.org/thrift.git/test/cpp/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = subdir-objects serial-tests
-
-BUILT_SOURCES = gen-cpp/ThriftTest.cpp \
-                gen-cpp/ThriftTest_types.cpp \
-                gen-cpp/ThriftTest_constants.cpp \
-                gen-cpp/StressTest_types.cpp \
-                gen-cpp/StressTest_constants.cpp \
-                gen-cpp/Service.cpp
-
-noinst_LTLIBRARIES = libtestgencpp.la libstresstestgencpp.la
-nodist_libtestgencpp_la_SOURCES = \
-	gen-cpp/ThriftTest_constants.cpp \
-	gen-cpp/ThriftTest_constants.h \
-	gen-cpp/ThriftTest_types.cpp \
-	gen-cpp/ThriftTest_types.h \
-	gen-cpp/ThriftTest_types.tcc \
-	gen-cpp/ThriftTest.cpp \
-	gen-cpp/ThriftTest.h \
-	gen-cpp/ThriftTest.tcc \
-	src/ThriftTest_extras.cpp
-
-libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
-
-nodist_libstresstestgencpp_la_SOURCES = \
-	gen-cpp/StressTest_constants.cpp \
-	gen-cpp/StressTest_types.cpp \
-	gen-cpp/StressTest_constants.h \
-	gen-cpp/StressTest_types.h \
-	gen-cpp/Service.cpp \
-	gen-cpp/Service.h
-
-libstresstestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
-
-precross: TestServer TestClient
-
-check_PROGRAMS = \
-	TestServer \
-	TestClient \
-	StressTest \
-	StressTestNonBlocking
-
-# we currently do not run the testsuite, stop c++ server issue
-# TESTS = \
-#	$(check_PROGRAMS)
-
-TestServer_SOURCES = \
-	src/TestServer.cpp
-
-TestServer_LDADD = \
-	libtestgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la \
-	$(top_builddir)/lib/cpp/libthriftz.la \
-	$(top_builddir)/lib/cpp/libthriftnb.la \
-	-levent -lboost_program_options -lboost_system -lboost_filesystem $(ZLIB_LIBS)
-
-TestClient_SOURCES = \
-	src/TestClient.cpp
-
-TestClient_LDADD = \
-	libtestgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la \
-	$(top_builddir)/lib/cpp/libthriftz.la \
-	$(top_builddir)/lib/cpp/libthriftnb.la \
-	-levent -lboost_program_options -lboost_system -lboost_filesystem $(ZLIB_LIBS)
-
-StressTest_SOURCES = \
-	src/StressTest.cpp
-
-StressTest_LDADD = \
-	libstresstestgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la
-
-StressTestNonBlocking_SOURCES = \
-	src/StressTestNonBlocking.cpp
-
-StressTestNonBlocking_LDADD = \
-	libstresstestgencpp.la \
-	$(top_builddir)/lib/cpp/libthriftnb.la \
-	-levent
-#
-# Common thrift code generation rules
-#
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants.cpp: $(top_srcdir)/test/ThriftTest.thrift $(THRIFT)
-	$(THRIFT) --gen cpp:templates,cob_style -r $<
-
-gen-cpp/StressTest_types.cpp gen-cpp/StressTest_constants.cpp gen-cpp/Service.cpp: $(top_srcdir)/test/StressTest.thrift $(THRIFT)
-	$(THRIFT) --gen cpp $<
-
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
-AM_CXXFLAGS = -Wall -Wextra -pedantic
-AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS) $(ZLIB_LIBS)
-
-clean-local:
-	$(RM) gen-cpp/*
-
-style-local:
-	$(CPPSTYLE_CMD)
-
-EXTRA_DIST = \
-	src/TestClient.cpp \
-	src/TestServer.cpp \
-	src/StressTest.cpp \
-	src/StressTestNonBlocking.cpp \
-	realloc/realloc_test.c \
-	realloc/Makefile
diff --git a/vendor/git.apache.org/thrift.git/test/cpp/realloc/realloc_test.c b/vendor/git.apache.org/thrift.git/test/cpp/realloc/realloc_test.c
deleted file mode 100644
index f9763ad..0000000
--- a/vendor/git.apache.org/thrift.git/test/cpp/realloc/realloc_test.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <dlfcn.h>
-
-int copies;
-int non_copies;
-
-void *realloc(void *ptr, size_t size) {
-  static void *(*real_realloc)(void*, size_t) = NULL;
-  if (real_realloc == NULL) {
-    real_realloc = (void* (*) (void*, size_t)) dlsym(RTLD_NEXT, "realloc");
-  }
-
-  void *ret_ptr = (*real_realloc)(ptr, size);
-
-  if (ret_ptr == ptr) {
-    non_copies++;
-  } else {
-    copies++;
-  }
-
-  return ret_ptr;
-}
-
-
-struct TMemoryBuffer {
-  void* ptr;
-  int size;
-};
-
-int main(int argc, char *argv[]) {
-  int num_buffers;
-  int init_size;
-  int max_size;
-  int doublings;
-  int iterations;
-
-  if (argc < 6 ||
-      argc > 7 ||
-      (num_buffers = atoi(argv[1])) == 0 ||
-      (init_size = atoi(argv[2])) == 0 ||
-      (max_size = atoi(argv[3])) == 0 ||
-      init_size > max_size ||
-      (iterations = atoi(argv[4])) == 0 ||
-      (doublings = atoi(argv[5])) == 0 ||
-      (argc == 7 && atoi(argv[6]) == 0)) {
-    fprintf(stderr, "usage: realloc_test <num_buffers> <init_size> <max_size> <doublings> <iterations> [seed]\n");
-    exit(EXIT_FAILURE);
-  }
-
-  for ( int i = 0 ; i < argc ; i++ ) {
-    printf("%s ", argv[i]);
-  }
-  printf("\n");
-
-  if (argc == 7) {
-    srand(atoi(argv[6]));
-  } else {
-    srand(time(NULL));
-  }
-
-  struct TMemoryBuffer* buffers = calloc(num_buffers, sizeof(*buffers));
-  if (buffers == NULL) abort();
-
-  for ( int i = 0 ; i < num_buffers ; i++ ) {
-    buffers[i].size = max_size;
-  }
-
-  while (iterations --> 0) {
-    for ( int i = 0 ; i < doublings * num_buffers ; i++ ) {
-      struct TMemoryBuffer* buf = &buffers[rand() % num_buffers];
-      buf->size *= 2;
-      if (buf->size <= max_size) {
-        buf->ptr = realloc(buf->ptr, buf->size);
-      } else {
-        free(buf->ptr);
-        buf->size = init_size;
-        buf->ptr = malloc(buf->size);
-      }
-      if (buf->ptr == NULL) abort();
-    }
-  }
-
-  printf("Non-copied %d/%d (%.2f%%)\n", non_copies, copies + non_copies, 100.0 * non_copies / (copies + non_copies));
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/cpp/src/StressTest.cpp b/vendor/git.apache.org/thrift.git/test/cpp/src/StressTest.cpp
deleted file mode 100644
index 9371bce..0000000
--- a/vendor/git.apache.org/thrift.git/test/cpp/src/StressTest.cpp
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#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 <thrift/TLogging.h>
-
-#include "Service.h"
-#include <iostream>
-#include <set>
-#include <stdexcept>
-#include <sstream>
-#include <map>
-#if _WIN32
-#include <thrift/windows/TWinsockSingleton.h>
-#endif
-
-using namespace std;
-
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::server;
-using namespace apache::thrift::concurrency;
-
-using namespace test::stress;
-
-struct eqstr {
-  bool operator()(const char* s1, const char* s2) const { return strcmp(s1, s2) == 0; }
-};
-
-struct ltstr {
-  bool operator()(const char* s1, const char* s2) const { return strcmp(s1, s2) < 0; }
-};
-
-// typedef hash_map<const char*, int, hash<const char*>, eqstr> count_map;
-typedef map<const char*, int, ltstr> count_map;
-
-class Server : public ServiceIf {
-public:
-  Server() {}
-
-  void count(const char* method) {
-    Guard m(lock_);
-    int ct = counts_[method];
-    counts_[method] = ++ct;
-  }
-
-  void echoVoid() {
-    count("echoVoid");
-    return;
-  }
-
-  count_map getCount() {
-    Guard m(lock_);
-    return counts_;
-  }
-
-  int8_t echoByte(const int8_t arg) { return arg; }
-  int32_t echoI32(const int32_t arg) { return arg; }
-  int64_t echoI64(const int64_t arg) { return arg; }
-  void echoString(string& out, const string& arg) {
-    if (arg != "hello") {
-      T_ERROR_ABORT("WRONG STRING (%s)!!!!", arg.c_str());
-    }
-    out = arg;
-  }
-  void echoList(vector<int8_t>& out, const vector<int8_t>& arg) { out = arg; }
-  void echoSet(set<int8_t>& out, const set<int8_t>& arg) { out = arg; }
-  void echoMap(map<int8_t, int8_t>& out, const map<int8_t, int8_t>& arg) { out = arg; }
-
-private:
-  count_map counts_;
-  Mutex lock_;
-};
-
-enum TransportOpenCloseBehavior {
-  OpenAndCloseTransportInThread,
-  DontOpenAndCloseTransportInThread
-};
-class ClientThread : public Runnable {
-public:
-  ClientThread(boost::shared_ptr<TTransport> transport,
-               boost::shared_ptr<ServiceIf> client,
-               Monitor& monitor,
-               size_t& workerCount,
-               size_t loopCount,
-               TType loopType,
-               TransportOpenCloseBehavior behavior)
-    : _transport(transport),
-      _client(client),
-      _monitor(monitor),
-      _workerCount(workerCount),
-      _loopCount(loopCount),
-      _loopType(loopType),
-      _behavior(behavior) {}
-
-  void run() {
-
-    // Wait for all worker threads to start
-
-    {
-      Synchronized s(_monitor);
-      while (_workerCount == 0) {
-        _monitor.wait();
-      }
-    }
-
-    _startTime = Util::currentTime();
-    if(_behavior == OpenAndCloseTransportInThread) {
-      _transport->open();
-    }
-
-    switch (_loopType) {
-    case T_VOID:
-      loopEchoVoid();
-      break;
-    case T_BYTE:
-      loopEchoByte();
-      break;
-    case T_I32:
-      loopEchoI32();
-      break;
-    case T_I64:
-      loopEchoI64();
-      break;
-    case T_STRING:
-      loopEchoString();
-      break;
-    default:
-      cerr << "Unexpected loop type" << _loopType << endl;
-      break;
-    }
-
-    _endTime = Util::currentTime();
-
-    if(_behavior == OpenAndCloseTransportInThread) {
-      _transport->close();
-    }
-
-    _done = true;
-
-    {
-      Synchronized s(_monitor);
-
-      _workerCount--;
-
-      if (_workerCount == 0) {
-
-        _monitor.notify();
-      }
-    }
-  }
-
-  void loopEchoVoid() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      _client->echoVoid();
-    }
-  }
-
-  void loopEchoByte() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      int8_t arg = 1;
-      int8_t result;
-      result = _client->echoByte(arg);
-      (void)result;
-      assert(result == arg);
-    }
-  }
-
-  void loopEchoI32() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      int32_t arg = 1;
-      int32_t result;
-      result = _client->echoI32(arg);
-      (void)result;
-      assert(result == arg);
-    }
-  }
-
-  void loopEchoI64() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      int64_t arg = 1;
-      int64_t result;
-      result = _client->echoI64(arg);
-      (void)result;
-      assert(result == arg);
-    }
-  }
-
-  void loopEchoString() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      string arg = "hello";
-      string result;
-      _client->echoString(result, arg);
-      assert(result == arg);
-    }
-  }
-
-  boost::shared_ptr<TTransport> _transport;
-  boost::shared_ptr<ServiceIf> _client;
-  Monitor& _monitor;
-  size_t& _workerCount;
-  size_t _loopCount;
-  TType _loopType;
-  int64_t _startTime;
-  int64_t _endTime;
-  bool _done;
-  Monitor _sleep;
-  TransportOpenCloseBehavior _behavior;
-};
-
-class TStartObserver : public apache::thrift::server::TServerEventHandler {
-public:
-  TStartObserver() : awake_(false) {}
-  virtual void preServe() {
-    apache::thrift::concurrency::Synchronized s(m_);
-    awake_ = true;
-    m_.notifyAll();
-  }
-  void waitForService() {
-    apache::thrift::concurrency::Synchronized s(m_);
-    while (!awake_)
-      m_.waitForever();
-  }
-
-private:
-  apache::thrift::concurrency::Monitor m_;
-  bool awake_;
-};
-
-int main(int argc, char** argv) {
-#if _WIN32
-  transport::TWinsockSingleton::create();
-#endif
-
-  int port = 9091;
-  string clientType = "regular";
-  string serverType = "thread-pool";
-  string protocolType = "binary";
-  size_t workerCount = 4;
-  size_t clientCount = 20;
-  size_t loopCount = 50000;
-  TType loopType = T_VOID;
-  string callName = "echoVoid";
-  bool runServer = true;
-  bool logRequests = false;
-  string requestLogPath = "./requestlog.tlog";
-  bool replayRequests = false;
-
-  ostringstream usage;
-
-  usage << argv[0] << " [--port=<port number>] [--server] [--server-type=<server-type>] "
-                      "[--protocol-type=<protocol-type>] [--workers=<worker-count>] "
-                      "[--clients=<client-count>] [--loop=<loop-count>] "
-                      "[--client-type=<client-type>]" << endl
-        << "\tclients        Number of client threads to create - 0 implies no clients, i.e. "
-                            "server only.  Default is " << clientCount << endl
-        << "\thelp           Prints this help text." << endl
-        << "\tcall           Service method to call.  Default is " << callName << endl
-        << "\tloop           The number of remote thrift calls each client makes.  Default is " << loopCount << endl 
-        << "\tport           The port the server and clients should bind to "
-                            "for thrift network connections.  Default is " << port << endl
-        << "\tserver         Run the Thrift server in this process.  Default is " << runServer << endl 
-        << "\tserver-type    Type of server, \"simple\" or \"thread-pool\".  Default is " << serverType << endl
-        << "\tprotocol-type  Type of protocol, \"binary\", \"ascii\", or \"xml\".  Default is " << protocolType << endl
-        << "\tlog-request    Log all request to ./requestlog.tlog. Default is " << logRequests << endl 
-        << "\treplay-request Replay requests from log file (./requestlog.tlog) Default is " << replayRequests << endl 
-        << "\tworkers        Number of thread pools workers.  Only valid "
-                            "for thread-pool server type.  Default is " << workerCount << endl
-        << "\tclient-type    Type of client, \"regular\" or \"concurrent\".  Default is " << clientType << endl
-        << endl;
-
-  map<string, string> args;
-
-  for (int ix = 1; ix < argc; ix++) {
-
-    string arg(argv[ix]);
-
-    if (arg.compare(0, 2, "--") == 0) {
-
-      size_t end = arg.find_first_of("=", 2);
-
-      string key = string(arg, 2, end - 2);
-
-      if (end != string::npos) {
-        args[key] = string(arg, end + 1);
-      } else {
-        args[key] = "true";
-      }
-    } else {
-      throw invalid_argument("Unexcepted command line token: " + arg);
-    }
-  }
-
-  try {
-
-    if (!args["clients"].empty()) {
-      clientCount = atoi(args["clients"].c_str());
-    }
-
-    if (!args["help"].empty()) {
-      cerr << usage.str();
-      return 0;
-    }
-
-    if (!args["loop"].empty()) {
-      loopCount = atoi(args["loop"].c_str());
-    }
-
-    if (!args["call"].empty()) {
-      callName = args["call"];
-    }
-
-    if (!args["port"].empty()) {
-      port = atoi(args["port"].c_str());
-    }
-
-    if (!args["server"].empty()) {
-      runServer = args["server"] == "true";
-    }
-
-    if (!args["log-request"].empty()) {
-      logRequests = args["log-request"] == "true";
-    }
-
-    if (!args["replay-request"].empty()) {
-      replayRequests = args["replay-request"] == "true";
-    }
-
-    if (!args["server-type"].empty()) {
-      serverType = args["server-type"];
-
-      if (serverType == "simple") {
-
-      } else if (serverType == "thread-pool") {
-
-      } else if (serverType == "threaded") {
-
-      } else {
-
-        throw invalid_argument("Unknown server type " + serverType);
-      }
-    }
-    if (!args["client-type"].empty()) {
-      clientType = args["client-type"];
-
-      if (clientType == "regular") {
-
-      } else if (clientType == "concurrent") {
-
-      } else {
-
-        throw invalid_argument("Unknown client type " + clientType);
-      }
-    }
-    if (!args["workers"].empty()) {
-      workerCount = atoi(args["workers"].c_str());
-    }
-
-  } catch (std::exception& e) {
-    cerr << e.what() << endl;
-    cerr << usage.str();
-  }
-
-  boost::shared_ptr<PlatformThreadFactory> threadFactory
-      = boost::shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory());
-
-  // Dispatcher
-  boost::shared_ptr<Server> serviceHandler(new Server());
-
-  if (replayRequests) {
-    boost::shared_ptr<Server> serviceHandler(new Server());
-    boost::shared_ptr<ServiceProcessor> serviceProcessor(new ServiceProcessor(serviceHandler));
-
-    // Transports
-    boost::shared_ptr<TFileTransport> fileTransport(new TFileTransport(requestLogPath));
-    fileTransport->setChunkSize(2 * 1024 * 1024);
-    fileTransport->setMaxEventSize(1024 * 16);
-    fileTransport->seekToEnd();
-
-    // Protocol Factory
-    boost::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
-
-    TFileProcessor fileProcessor(serviceProcessor, protocolFactory, fileTransport);
-
-    fileProcessor.process(0, true);
-    exit(0);
-  }
-
-  if (runServer) {
-
-    boost::shared_ptr<ServiceProcessor> serviceProcessor(new ServiceProcessor(serviceHandler));
-
-    // Transport
-    boost::shared_ptr<TServerSocket> serverSocket(new TServerSocket(port));
-
-    // Transport Factory
-    boost::shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
-
-    // Protocol Factory
-    boost::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
-
-    if (logRequests) {
-      // initialize the log file
-      boost::shared_ptr<TFileTransport> fileTransport(new TFileTransport(requestLogPath));
-      fileTransport->setChunkSize(2 * 1024 * 1024);
-      fileTransport->setMaxEventSize(1024 * 16);
-
-      transportFactory
-          = boost::shared_ptr<TTransportFactory>(new TPipedTransportFactory(fileTransport));
-    }
-
-    boost::shared_ptr<TServer> server;
-
-    if (serverType == "simple") {
-
-      server.reset(
-          new TSimpleServer(serviceProcessor, serverSocket, transportFactory, protocolFactory));
-
-    } else if (serverType == "threaded") {
-
-      server.reset(
-          new TThreadedServer(serviceProcessor, serverSocket, transportFactory, protocolFactory));
-
-    } else if (serverType == "thread-pool") {
-
-      boost::shared_ptr<ThreadManager> threadManager
-          = ThreadManager::newSimpleThreadManager(workerCount);
-
-      threadManager->threadFactory(threadFactory);
-      threadManager->start();
-      server.reset(new TThreadPoolServer(serviceProcessor,
-                                         serverSocket,
-                                         transportFactory,
-                                         protocolFactory,
-                                         threadManager));
-    }
-
-    boost::shared_ptr<TStartObserver> observer(new TStartObserver);
-    server->setServerEventHandler(observer);
-    boost::shared_ptr<Thread> serverThread = threadFactory->newThread(server);
-
-    cerr << "Starting the server on port " << port << endl;
-
-    serverThread->start();
-    observer->waitForService();
-
-    // If we aren't running clients, just wait forever for external clients
-    if (clientCount == 0) {
-      serverThread->join();
-    }
-  }
-
-  if (clientCount > 0) { //FIXME: start here for client type?
-
-    Monitor monitor;
-
-    size_t threadCount = 0;
-
-    set<boost::shared_ptr<Thread> > clientThreads;
-
-    if (callName == "echoVoid") {
-      loopType = T_VOID;
-    } else if (callName == "echoByte") {
-      loopType = T_BYTE;
-    } else if (callName == "echoI32") {
-      loopType = T_I32;
-    } else if (callName == "echoI64") {
-      loopType = T_I64;
-    } else if (callName == "echoString") {
-      loopType = T_STRING;
-    } else {
-      throw invalid_argument("Unknown service call " + callName);
-    }
-
-    if(clientType == "regular") {
-      for (size_t ix = 0; ix < clientCount; ix++) {
-
-        boost::shared_ptr<TSocket> socket(new TSocket("127.0.0.1", port));
-        boost::shared_ptr<TBufferedTransport> bufferedSocket(new TBufferedTransport(socket, 2048));
-        boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(bufferedSocket));
-        boost::shared_ptr<ServiceClient> serviceClient(new ServiceClient(protocol));
-
-        clientThreads.insert(threadFactory->newThread(boost::shared_ptr<ClientThread>(
-            new ClientThread(socket, serviceClient, monitor, threadCount, loopCount, loopType, OpenAndCloseTransportInThread))));
-      }
-    } else if(clientType == "concurrent") {
-      boost::shared_ptr<TSocket> socket(new TSocket("127.0.0.1", port));
-      boost::shared_ptr<TBufferedTransport> bufferedSocket(new TBufferedTransport(socket, 2048));
-      boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(bufferedSocket));
-      //boost::shared_ptr<ServiceClient> serviceClient(new ServiceClient(protocol));
-      boost::shared_ptr<ServiceConcurrentClient> serviceClient(new ServiceConcurrentClient(protocol));
-      socket->open();
-      for (size_t ix = 0; ix < clientCount; ix++) {
-        clientThreads.insert(threadFactory->newThread(boost::shared_ptr<ClientThread>(
-            new ClientThread(socket, serviceClient, monitor, threadCount, loopCount, loopType, DontOpenAndCloseTransportInThread))));
-      }
-    }
-
-    for (std::set<boost::shared_ptr<Thread> >::const_iterator thread = clientThreads.begin();
-         thread != clientThreads.end();
-         thread++) {
-      (*thread)->start();
-    }
-
-    int64_t time00;
-    int64_t time01;
-
-    {
-      Synchronized s(monitor);
-      threadCount = clientCount;
-
-      cerr << "Launch " << clientCount << " " << clientType << " client threads" << endl;
-
-      time00 = Util::currentTime();
-
-      monitor.notifyAll();
-
-      while (threadCount > 0) {
-        monitor.wait();
-      }
-
-      time01 = Util::currentTime();
-    }
-
-    int64_t firstTime = 9223372036854775807LL;
-    int64_t lastTime = 0;
-
-    double averageTime = 0;
-    int64_t minTime = 9223372036854775807LL;
-    int64_t maxTime = 0;
-
-    for (set<boost::shared_ptr<Thread> >::iterator ix = clientThreads.begin();
-         ix != clientThreads.end();
-         ix++) {
-
-      boost::shared_ptr<ClientThread> client
-          = boost::dynamic_pointer_cast<ClientThread>((*ix)->runnable());
-
-      int64_t delta = client->_endTime - client->_startTime;
-
-      assert(delta > 0);
-
-      if (client->_startTime < firstTime) {
-        firstTime = client->_startTime;
-      }
-
-      if (client->_endTime > lastTime) {
-        lastTime = client->_endTime;
-      }
-
-      if (delta < minTime) {
-        minTime = delta;
-      }
-
-      if (delta > maxTime) {
-        maxTime = delta;
-      }
-
-      averageTime += delta;
-    }
-
-    averageTime /= clientCount;
-
-    cout << "workers :" << workerCount << ", client : " << clientCount << ", loops : " << loopCount
-         << ", rate : " << (clientCount * loopCount * 1000) / ((double)(time01 - time00)) << endl;
-
-    count_map count = serviceHandler->getCount();
-    count_map::iterator iter;
-    for (iter = count.begin(); iter != count.end(); ++iter) {
-      printf("%s => %d\n", iter->first, iter->second);
-    }
-    cerr << "done." << endl;
-  }
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/cpp/src/StressTestNonBlocking.cpp b/vendor/git.apache.org/thrift.git/test/cpp/src/StressTestNonBlocking.cpp
deleted file mode 100644
index 8f161c0..0000000
--- a/vendor/git.apache.org/thrift.git/test/cpp/src/StressTestNonBlocking.cpp
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#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 <thrift/TLogging.h>
-
-#include "Service.h"
-
-#include <boost/shared_ptr.hpp>
-
-#include <iostream>
-#include <set>
-#include <stdexcept>
-#include <sstream>
-#include <map>
-#if _WIN32
-#include <thrift/windows/TWinsockSingleton.h>
-#endif
-
-using namespace std;
-
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::server;
-using namespace apache::thrift::concurrency;
-
-using namespace test::stress;
-
-struct eqstr {
-  bool operator()(const char* s1, const char* s2) const { return strcmp(s1, s2) == 0; }
-};
-
-struct ltstr {
-  bool operator()(const char* s1, const char* s2) const { return strcmp(s1, s2) < 0; }
-};
-
-// typedef hash_map<const char*, int, hash<const char*>, eqstr> count_map;
-typedef map<const char*, int, ltstr> count_map;
-
-class Server : public ServiceIf {
-public:
-  Server() {}
-
-  void count(const char* method) {
-    Guard m(lock_);
-    int ct = counts_[method];
-    counts_[method] = ++ct;
-  }
-
-  void echoVoid() {
-    count("echoVoid");
-    // Sleep to simulate work
-    THRIFT_SLEEP_USEC(1);
-    return;
-  }
-
-  count_map getCount() {
-    Guard m(lock_);
-    return counts_;
-  }
-
-  int8_t echoByte(const int8_t arg) { return arg; }
-  int32_t echoI32(const int32_t arg) { return arg; }
-  int64_t echoI64(const int64_t arg) { return arg; }
-  void echoString(string& out, const string& arg) {
-    if (arg != "hello") {
-      T_ERROR_ABORT("WRONG STRING (%s)!!!!", arg.c_str());
-    }
-    out = arg;
-  }
-  void echoList(vector<int8_t>& out, const vector<int8_t>& arg) { out = arg; }
-  void echoSet(set<int8_t>& out, const set<int8_t>& arg) { out = arg; }
-  void echoMap(map<int8_t, int8_t>& out, const map<int8_t, int8_t>& arg) { out = arg; }
-
-private:
-  count_map counts_;
-  Mutex lock_;
-};
-
-class ClientThread : public Runnable {
-public:
-  ClientThread(boost::shared_ptr<TTransport> transport,
-               boost::shared_ptr<ServiceClient> client,
-               Monitor& monitor,
-               size_t& workerCount,
-               size_t loopCount,
-               TType loopType)
-    : _transport(transport),
-      _client(client),
-      _monitor(monitor),
-      _workerCount(workerCount),
-      _loopCount(loopCount),
-      _loopType(loopType) {}
-
-  void run() {
-
-    // Wait for all worker threads to start
-
-    {
-      Synchronized s(_monitor);
-      while (_workerCount == 0) {
-        _monitor.wait();
-      }
-    }
-
-    _startTime = Util::currentTime();
-
-    _transport->open();
-
-    switch (_loopType) {
-    case T_VOID:
-      loopEchoVoid();
-      break;
-    case T_BYTE:
-      loopEchoByte();
-      break;
-    case T_I32:
-      loopEchoI32();
-      break;
-    case T_I64:
-      loopEchoI64();
-      break;
-    case T_STRING:
-      loopEchoString();
-      break;
-    default:
-      cerr << "Unexpected loop type" << _loopType << endl;
-      break;
-    }
-
-    _endTime = Util::currentTime();
-
-    _transport->close();
-
-    _done = true;
-
-    {
-      Synchronized s(_monitor);
-
-      _workerCount--;
-
-      if (_workerCount == 0) {
-
-        _monitor.notify();
-      }
-    }
-  }
-
-  void loopEchoVoid() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      _client->echoVoid();
-    }
-  }
-
-  void loopEchoByte() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      int8_t arg = 1;
-      int8_t result;
-      result = _client->echoByte(arg);
-      (void)result;
-      assert(result == arg);
-    }
-  }
-
-  void loopEchoI32() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      int32_t arg = 1;
-      int32_t result;
-      result = _client->echoI32(arg);
-      (void)result;
-      assert(result == arg);
-    }
-  }
-
-  void loopEchoI64() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      int64_t arg = 1;
-      int64_t result;
-      result = _client->echoI64(arg);
-      (void)result;
-      assert(result == arg);
-    }
-  }
-
-  void loopEchoString() {
-    for (size_t ix = 0; ix < _loopCount; ix++) {
-      string arg = "hello";
-      string result;
-      _client->echoString(result, arg);
-      assert(result == arg);
-    }
-  }
-
-  boost::shared_ptr<TTransport> _transport;
-  boost::shared_ptr<ServiceClient> _client;
-  Monitor& _monitor;
-  size_t& _workerCount;
-  size_t _loopCount;
-  TType _loopType;
-  int64_t _startTime;
-  int64_t _endTime;
-  bool _done;
-  Monitor _sleep;
-};
-
-int main(int argc, char** argv) {
-#if _WIN32
-  transport::TWinsockSingleton::create();
-#endif
-
-  int port = 9091;
-  string serverType = "simple";
-  string protocolType = "binary";
-  uint32_t workerCount = 4;
-  uint32_t clientCount = 20;
-  uint32_t loopCount = 1000;
-  TType loopType = T_VOID;
-  string callName = "echoVoid";
-  bool runServer = true;
-  bool logRequests = false;
-  string requestLogPath = "./requestlog.tlog";
-  bool replayRequests = false;
-
-  ostringstream usage;
-
-  usage << argv[0] << " [--port=<port number>] [--server] [--server-type=<server-type>] "
-                      "[--protocol-type=<protocol-type>] [--workers=<worker-count>] "
-                      "[--clients=<client-count>] [--loop=<loop-count>]" << endl
-        << "\tclients        Number of client threads to create - 0 implies no clients, i.e. "
-           "server only.  Default is " << clientCount << endl
-        << "\thelp           Prints this help text." << endl
-        << "\tcall           Service method to call.  Default is " << callName << endl
-        << "\tloop           The number of remote thrift calls each client makes.  Default is "
-        << loopCount << endl << "\tport           The port the server and clients should bind to "
-                                "for thrift network connections.  Default is " << port << endl
-        << "\tserver         Run the Thrift server in this process.  Default is " << runServer
-        << endl << "\tserver-type    Type of server, \"simple\" or \"thread-pool\".  Default is "
-        << serverType << endl
-        << "\tprotocol-type  Type of protocol, \"binary\", \"ascii\", or \"xml\".  Default is "
-        << protocolType << endl
-        << "\tlog-request    Log all request to ./requestlog.tlog. Default is " << logRequests
-        << endl << "\treplay-request Replay requests from log file (./requestlog.tlog) Default is "
-        << replayRequests << endl << "\tworkers        Number of thread pools workers.  Only valid "
-                                     "for thread-pool server type.  Default is " << workerCount
-        << endl;
-
-  map<string, string> args;
-
-  for (int ix = 1; ix < argc; ix++) {
-
-    string arg(argv[ix]);
-
-    if (arg.compare(0, 2, "--") == 0) {
-
-      size_t end = arg.find_first_of("=", 2);
-
-      string key = string(arg, 2, end - 2);
-
-      if (end != string::npos) {
-        args[key] = string(arg, end + 1);
-      } else {
-        args[key] = "true";
-      }
-    } else {
-      throw invalid_argument("Unexcepted command line token: " + arg);
-    }
-  }
-
-  try {
-
-    if (!args["clients"].empty()) {
-      clientCount = atoi(args["clients"].c_str());
-    }
-
-    if (!args["help"].empty()) {
-      cerr << usage.str();
-      return 0;
-    }
-
-    if (!args["loop"].empty()) {
-      loopCount = atoi(args["loop"].c_str());
-    }
-
-    if (!args["call"].empty()) {
-      callName = args["call"];
-    }
-
-    if (!args["port"].empty()) {
-      port = atoi(args["port"].c_str());
-    }
-
-    if (!args["server"].empty()) {
-      runServer = args["server"] == "true";
-    }
-
-    if (!args["log-request"].empty()) {
-      logRequests = args["log-request"] == "true";
-    }
-
-    if (!args["replay-request"].empty()) {
-      replayRequests = args["replay-request"] == "true";
-    }
-
-    if (!args["server-type"].empty()) {
-      serverType = args["server-type"];
-    }
-
-    if (!args["workers"].empty()) {
-      workerCount = atoi(args["workers"].c_str());
-    }
-
-  } catch (std::exception& e) {
-    cerr << e.what() << endl;
-    cerr << usage.str();
-  }
-
-  boost::shared_ptr<PlatformThreadFactory> threadFactory
-      = boost::shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory());
-
-  // Dispatcher
-  boost::shared_ptr<Server> serviceHandler(new Server());
-
-  if (replayRequests) {
-    boost::shared_ptr<Server> serviceHandler(new Server());
-    boost::shared_ptr<ServiceProcessor> serviceProcessor(new ServiceProcessor(serviceHandler));
-
-    // Transports
-    boost::shared_ptr<TFileTransport> fileTransport(new TFileTransport(requestLogPath));
-    fileTransport->setChunkSize(2 * 1024 * 1024);
-    fileTransport->setMaxEventSize(1024 * 16);
-    fileTransport->seekToEnd();
-
-    // Protocol Factory
-    boost::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
-
-    TFileProcessor fileProcessor(serviceProcessor, protocolFactory, fileTransport);
-
-    fileProcessor.process(0, true);
-    exit(0);
-  }
-
-  if (runServer) {
-
-    boost::shared_ptr<ServiceProcessor> serviceProcessor(new ServiceProcessor(serviceHandler));
-
-    // Protocol Factory
-    boost::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
-
-    // Transport Factory
-    boost::shared_ptr<TTransportFactory> transportFactory;
-
-    if (logRequests) {
-      // initialize the log file
-      boost::shared_ptr<TFileTransport> fileTransport(new TFileTransport(requestLogPath));
-      fileTransport->setChunkSize(2 * 1024 * 1024);
-      fileTransport->setMaxEventSize(1024 * 16);
-
-      transportFactory
-          = boost::shared_ptr<TTransportFactory>(new TPipedTransportFactory(fileTransport));
-    }
-
-    boost::shared_ptr<Thread> serverThread;
-    boost::shared_ptr<Thread> serverThread2;
-
-    if (serverType == "simple") {
-
-      serverThread = threadFactory->newThread(boost::shared_ptr<TServer>(
-          new TNonblockingServer(serviceProcessor, protocolFactory, port)));
-      serverThread2 = threadFactory->newThread(boost::shared_ptr<TServer>(
-          new TNonblockingServer(serviceProcessor, protocolFactory, port + 1)));
-
-    } else if (serverType == "thread-pool") {
-
-      boost::shared_ptr<ThreadManager> threadManager
-          = ThreadManager::newSimpleThreadManager(workerCount);
-
-      threadManager->threadFactory(threadFactory);
-      threadManager->start();
-      serverThread = threadFactory->newThread(boost::shared_ptr<TServer>(
-          new TNonblockingServer(serviceProcessor, protocolFactory, port, threadManager)));
-      serverThread2 = threadFactory->newThread(boost::shared_ptr<TServer>(
-          new TNonblockingServer(serviceProcessor, protocolFactory, port + 1, threadManager)));
-    }
-
-    cerr << "Starting the server on port " << port << " and " << (port + 1) << endl;
-    serverThread->start();
-    serverThread2->start();
-
-    // If we aren't running clients, just wait forever for external clients
-
-    if (clientCount == 0) {
-      serverThread->join();
-      serverThread2->join();
-    }
-  }
-  THRIFT_SLEEP_SEC(1);
-
-  if (clientCount > 0) {
-
-    Monitor monitor;
-
-    size_t threadCount = 0;
-
-    set<boost::shared_ptr<Thread> > clientThreads;
-
-    if (callName == "echoVoid") {
-      loopType = T_VOID;
-    } else if (callName == "echoByte") {
-      loopType = T_BYTE;
-    } else if (callName == "echoI32") {
-      loopType = T_I32;
-    } else if (callName == "echoI64") {
-      loopType = T_I64;
-    } else if (callName == "echoString") {
-      loopType = T_STRING;
-    } else {
-      throw invalid_argument("Unknown service call " + callName);
-    }
-
-    for (uint32_t ix = 0; ix < clientCount; ix++) {
-
-      boost::shared_ptr<TSocket> socket(new TSocket("127.0.0.1", port + (ix % 2)));
-      boost::shared_ptr<TFramedTransport> framedSocket(new TFramedTransport(socket));
-      boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(framedSocket));
-      boost::shared_ptr<ServiceClient> serviceClient(new ServiceClient(protocol));
-
-      clientThreads.insert(threadFactory->newThread(boost::shared_ptr<ClientThread>(
-          new ClientThread(socket, serviceClient, monitor, threadCount, loopCount, loopType))));
-    }
-
-    for (std::set<boost::shared_ptr<Thread> >::const_iterator thread = clientThreads.begin();
-         thread != clientThreads.end();
-         thread++) {
-      (*thread)->start();
-    }
-
-    int64_t time00;
-    int64_t time01;
-
-    {
-      Synchronized s(monitor);
-      threadCount = clientCount;
-
-      cerr << "Launch " << clientCount << " client threads" << endl;
-
-      time00 = Util::currentTime();
-
-      monitor.notifyAll();
-
-      while (threadCount > 0) {
-        monitor.wait();
-      }
-
-      time01 = Util::currentTime();
-    }
-
-    int64_t firstTime = 9223372036854775807LL;
-    int64_t lastTime = 0;
-
-    double averageTime = 0;
-    int64_t minTime = 9223372036854775807LL;
-    int64_t maxTime = 0;
-
-    for (set<boost::shared_ptr<Thread> >::iterator ix = clientThreads.begin();
-         ix != clientThreads.end();
-         ix++) {
-
-      boost::shared_ptr<ClientThread> client
-          = boost::dynamic_pointer_cast<ClientThread>((*ix)->runnable());
-
-      int64_t delta = client->_endTime - client->_startTime;
-
-      assert(delta > 0);
-
-      if (client->_startTime < firstTime) {
-        firstTime = client->_startTime;
-      }
-
-      if (client->_endTime > lastTime) {
-        lastTime = client->_endTime;
-      }
-
-      if (delta < minTime) {
-        minTime = delta;
-      }
-
-      if (delta > maxTime) {
-        maxTime = delta;
-      }
-
-      averageTime += delta;
-    }
-
-    averageTime /= clientCount;
-
-    cout << "workers :" << workerCount << ", client : " << clientCount << ", loops : " << loopCount
-         << ", rate : " << (clientCount * loopCount * 1000) / ((double)(time01 - time00)) << endl;
-
-    count_map count = serviceHandler->getCount();
-    count_map::iterator iter;
-    for (iter = count.begin(); iter != count.end(); ++iter) {
-      printf("%s => %d\n", iter->first, iter->second);
-    }
-    cerr << "done." << endl;
-  }
-
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/cpp/src/TestClient.cpp b/vendor/git.apache.org/thrift.git/test/cpp/src/TestClient.cpp
deleted file mode 100644
index c16d045..0000000
--- a/vendor/git.apache.org/thrift.git/test/cpp/src/TestClient.cpp
+++ /dev/null
@@ -1,1110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-#include <limits>
-#include <locale>
-#include <ios>
-#include <iostream>
-#include <sstream>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TCompactProtocol.h>
-#include <thrift/protocol/THeaderProtocol.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>
-#include <boost/filesystem.hpp>
-#include <thrift/cxxfunctional.h>
-#if _WIN32
-#include <thrift/windows/TWinsockSingleton.h>
-#endif
-
-#include "ThriftTest.h"
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace thrift::test;
-using namespace apache::thrift::async;
-
-// Current time, microseconds since the epoch
-uint64_t now() {
-  int64_t ret;
-  struct timeval tv;
-
-  THRIFT_GETTIMEOFDAY(&tv, NULL);
-  ret = tv.tv_sec;
-  ret = ret * 1000 * 1000 + tv.tv_usec;
-  return ret;
-}
-
-static void testString_clientReturn(event_base* base,
-                                    int testNr,
-                                    ThriftTestCobClient* client) {
-  try {
-    string s;
-    client->recv_testString(s);
-    std::ostringstream os;
-    os << "test" << testNr;
-    const bool ok = (s == os.str());
-    cout << "testString: " << s << " " << ((ok) ? "ok" : "failed") << endl;
-  } catch (TException& exn) {
-    cout << "Error: " << exn.what() << endl;
-  }
-
-  if (testNr == 9)
-    event_base_loopbreak(base); // end test
-}
-
-static void testVoid_clientReturn(event_base* base, ThriftTestCobClient* client) {
-  try {
-    client->recv_testVoid();
-    cout << "testVoid" << endl;
-
-    for (int testNr = 0; testNr < 10; ++testNr) {
-      std::ostringstream os;
-      os << "test" << testNr;
-      client->testString(tcxx::bind(testString_clientReturn,
-                                    base,
-                                    testNr,
-                                    tcxx::placeholders::_1),
-                       os.str());
-    }
-  } catch (TException& exn) {
-    cout << "Error: " << exn.what() << endl;
-  }
-}
-
-// Workaround for absense of C++11 "auto" keyword.
-template <typename T>
-bool print_eq(T expected, T actual) {
-  cout << "(" << actual << ")" << endl;
-  if (expected != actual) {
-    cout << "*** FAILED ***" << endl << "Expected: " << expected << " but got: " << actual << endl;
-    return false;
-  }
-  return true;
-}
-
-#define BASETYPE_IDENTITY_TEST(func, value)                                                        \
-  cout << #func "(" << value << ") = ";                                                            \
-  try {                                                                                            \
-    if (!print_eq(value, testClient.func(value)))                                                  \
-      return_code |= ERR_BASETYPES;                                                                \
-  } catch (TTransportException&) {                                                                 \
-    throw;                                                                                         \
-  } catch (exception & ex) {                                                                       \
-    cout << "*** FAILED ***" << endl << ex.what() << endl;                                         \
-    return_code |= ERR_BASETYPES;                                                                  \
-  }
-
-int main(int argc, char** argv) {
-  cout.precision(19);
-  int ERR_BASETYPES = 1;
-  int ERR_STRUCTS = 2;
-  int ERR_CONTAINERS = 4;
-  int ERR_EXCEPTIONS = 8;
-  int ERR_UNKNOWN = 64;
-
-  string testDir = boost::filesystem::system_complete(argv[0]).parent_path().parent_path().parent_path().string();
-  string pemPath = testDir + "/keys/CA.pem";
-#if _WIN32
-  transport::TWinsockSingleton::create();
-#endif
-  string host = "localhost";
-  int port = 9090;
-  int numTests = 1;
-  bool ssl = false;
-  string transport_type = "buffered";
-  string protocol_type = "binary";
-  string domain_socket = "";
-  bool abstract_namespace = false;
-  bool noinsane = false;
-
-  int return_code = 0;
-
-  boost::program_options::options_description desc("Allowed options");
-  desc.add_options()("help,h",
-                     "produce help message")("host",
-                                             boost::program_options::value<string>(&host)
-                                                 ->default_value(host),
-                                             "Host to connect")("port",
-                                                                boost::program_options::value<int>(
-                                                                    &port)->default_value(port),
-                                                                "Port number to connect")(
-      "domain-socket",
-      boost::program_options::value<string>(&domain_socket)->default_value(domain_socket),
-      "Domain Socket (e.g. /tmp/ThriftTest.thrift), instead of host and port")(
-      "abstract-namespace",
-      "Look for the domain socket in the Abstract Namespace (no connection with filesystem pathnames)")(
-      "transport",
-      boost::program_options::value<string>(&transport_type)->default_value(transport_type),
-      "Transport: buffered, framed, http, evhttp")(
-      "protocol",
-      boost::program_options::value<string>(&protocol_type)->default_value(protocol_type),
-      "Protocol: binary, header, compact, json")("ssl", "Encrypted Transport using SSL")(
-      "testloops,n",
-      boost::program_options::value<int>(&numTests)->default_value(numTests),
-      "Number of Tests")("noinsane", "Do not run insanity test");
-
-  boost::program_options::variables_map vm;
-  boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
-  boost::program_options::notify(vm);
-
-  if (vm.count("help")) {
-    cout << desc << endl;
-    return ERR_UNKNOWN;
-  }
-
-  try {
-    if (!protocol_type.empty()) {
-      if (protocol_type == "binary") {
-      } else if (protocol_type == "compact") {
-      } else if (protocol_type == "header") {
-      } else if (protocol_type == "json") {
-      } else {
-        throw invalid_argument("Unknown protocol type " + protocol_type);
-      }
-    }
-
-    if (!transport_type.empty()) {
-      if (transport_type == "buffered") {
-      } else if (transport_type == "framed") {
-      } else if (transport_type == "http") {
-      } else if (transport_type == "evhttp") {
-      } else {
-        throw invalid_argument("Unknown transport type " + transport_type);
-      }
-    }
-
-  } catch (exception& e) {
-    cerr << e.what() << endl;
-    cout << desc << endl;
-    return ERR_UNKNOWN;
-  }
-
-  if (vm.count("ssl")) {
-    ssl = true;
-  }
-
-  if (vm.count("abstract-namespace")) {
-    abstract_namespace = true;
-  }
-
-  if (vm.count("noinsane")) {
-    noinsane = true;
-  }
-
-  boost::shared_ptr<TTransport> transport;
-  boost::shared_ptr<TProtocol> protocol;
-
-  boost::shared_ptr<TSocket> socket;
-  boost::shared_ptr<TSSLSocketFactory> factory;
-
-  if (ssl) {
-    factory = boost::shared_ptr<TSSLSocketFactory>(new TSSLSocketFactory());
-    factory->ciphers("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
-    factory->loadTrustedCertificates(pemPath.c_str());
-    factory->authenticate(true);
-    socket = factory->createSocket(host, port);
-  } else {
-    if (domain_socket != "") {
-      if (abstract_namespace) {
-        std::string abstract_socket("\0", 1);
-        abstract_socket += domain_socket;
-        socket = boost::shared_ptr<TSocket>(new TSocket(abstract_socket));
-      } else {
-        socket = boost::shared_ptr<TSocket>(new TSocket(domain_socket));
-      }
-      port = 0;
-    } else {
-      socket = boost::shared_ptr<TSocket>(new TSocket(host, port));
-    }
-  }
-
-  if (transport_type.compare("http") == 0) {
-    boost::shared_ptr<TTransport> httpSocket(new THttpClient(socket, host, "/service"));
-    transport = httpSocket;
-  } else if (transport_type.compare("framed") == 0) {
-    boost::shared_ptr<TFramedTransport> framedSocket(new TFramedTransport(socket));
-    transport = framedSocket;
-  } else {
-    boost::shared_ptr<TBufferedTransport> bufferedSocket(new TBufferedTransport(socket));
-    transport = bufferedSocket;
-  }
-
-  if (protocol_type.compare("json") == 0) {
-    boost::shared_ptr<TProtocol> jsonProtocol(new TJSONProtocol(transport));
-    protocol = jsonProtocol;
-  } else if (protocol_type.compare("compact") == 0) {
-    boost::shared_ptr<TProtocol> compactProtocol(new TCompactProtocol(transport));
-    protocol = compactProtocol;
-  } else if (protocol_type == "header") {
-    boost::shared_ptr<TProtocol> headerProtocol(new THeaderProtocol(transport));
-    protocol = headerProtocol;
-  } else {
-    boost::shared_ptr<TBinaryProtocol> binaryProtocol(new TBinaryProtocol(transport));
-    protocol = binaryProtocol;
-  }
-
-  // Connection info
-  cout << "Connecting (" << transport_type << "/" << protocol_type << ") to: ";
-  if (abstract_namespace) {
-    cout << '@';
-  }
-  cout << domain_socket;
-  if (port != 0) {
-    cout << host << ":" << port;
-  }
-  cout << endl;
-
-  if (transport_type.compare("evhttp") == 0) {
-    event_base* base = event_base_new();
-    cout << "Libevent Version: " << event_get_version() << endl;
-    cout << "Libevent Method: " << event_base_get_method(base) << endl;
-#if LIBEVENT_VERSION_NUMBER >= 0x02000000
-    cout << "Libevent Features: 0x" << hex << event_base_get_features(base) << endl;
-#endif
-
-    boost::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
-
-    boost::shared_ptr<TAsyncChannel> channel(
-        new TEvhttpClientChannel(host.c_str(), "/", host.c_str(), port, base));
-    ThriftTestCobClient* client = new ThriftTestCobClient(channel, protocolFactory.get());
-    client->testVoid(tcxx::bind(testVoid_clientReturn,
-                                base,
-                                tcxx::placeholders::_1));
-
-    event_base_loop(base, 0);
-    return 0;
-  }
-
-  ThriftTestClient testClient(protocol);
-
-  uint64_t time_min = 0;
-  uint64_t time_max = 0;
-  uint64_t time_tot = 0;
-
-  int test = 0;
-  for (test = 0; test < numTests; ++test) {
-
-    try {
-      transport->open();
-    } catch (TTransportException& ex) {
-      cout << "Connect failed: " << ex.what() << endl;
-      return ERR_UNKNOWN;
-    }
-
-    /**
-     * CONNECT TEST
-     */
-    printf("Test #%d, connect %s:%d\n", test + 1, host.c_str(), port);
-
-    uint64_t start = now();
-
-    /**
-     * VOID TEST
-     */
-    try {
-      cout << "testVoid()" << flush;
-      testClient.testVoid();
-      cout << " = void" << endl;
-    } catch (TTransportException&) {
-      // Stop here if transport got broken
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_BASETYPES;
-    }
-
-    /**
-     * STRING TEST
-     */
-    cout << "testString(\"Test\")" << flush;
-    string s;
-    testClient.testString(s, "Test");
-    cout << " = " << s << endl;
-    if (s != "Test") {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_BASETYPES;
-    }
-
-    try {
-      string str(
-          "}{Afrikaans, Alemannisch, Aragonés, العربية, مصرى, "
-          "Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška, "
-          "Беларуская, Беларуская (тарашкевіца), Български, Bamanankan, "
-          "বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн, "
-          "Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg, "
-          "Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English, "
-          "Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt, "
-          "Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego, "
-          "Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski, "
-          "Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia, "
-          "Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa, "
-          "ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар, "
-          "Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino, "
-          "Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa "
-          "Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, مازِرونی, Bahasa "
-          "Melayu, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪"
-          "Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad, "
-          "Occitan, Иронау, Papiamentu, Deitsch, Polski, پنجابی, پښتو, "
-          "Norfuk / Pitkern, Português, Runa Simi, Rumantsch, Romani, Română, "
-          "Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple "
-          "English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk, "
-          "Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog, "
-          "Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük, "
-          "Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文, "
-          "Bân-lâm-gú, 粵語");
-      cout << "testString(" << str << ") = " << flush;
-      testClient.testString(s, str);
-      cout << s << endl;
-      if (s != str) {
-        cout.imbue(locale("en_US.UTF8"));
-        cout << "*** FAILED ***" << endl << "Expected string: " << str << " but got: " << s << endl << "CLEAR";
-        return_code |= ERR_BASETYPES;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_BASETYPES;
-      return return_code;
-    }
-    try {
-      string str(
-          "quote: \" backslash:"
-          " forwardslash-escaped: \\/ "
-          " backspace: \b formfeed: \f newline: \n return: \r tab: "
-          " now-all-of-them-together: \"\\\\/\b\n\r\t"
-          " now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><"
-          " char-to-test-json-parsing: ]] \"]] \\\" }}}{ [[[ ");
-      cout << "testString(" << str << ") = " << flush;
-      testClient.testString(s, str);
-      cout << s << endl;
-      if (s != str) {
-        cout.imbue(locale("en_US.UTF8"));
-        cout << "*** FAILED ***" << endl
-             << "Expected string: " << str << " but got: " << s << endl
-             << "CLEAR";
-        ;
-        return_code |= ERR_BASETYPES;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_BASETYPES;
-      return return_code;
-    }
-
-    /**
-     * BOOL TEST
-     */
-    cout << boolalpha;
-    BASETYPE_IDENTITY_TEST(testBool, true);
-    BASETYPE_IDENTITY_TEST(testBool, false);
-
-    /**
-     * BYTE TEST
-     */
-    BASETYPE_IDENTITY_TEST(testByte, (int8_t)0);
-    BASETYPE_IDENTITY_TEST(testByte, (int8_t)-1);
-    BASETYPE_IDENTITY_TEST(testByte, (int8_t)42);
-    BASETYPE_IDENTITY_TEST(testByte, (int8_t)-42);
-    BASETYPE_IDENTITY_TEST(testByte, (int8_t)127);
-    BASETYPE_IDENTITY_TEST(testByte, (int8_t)-128);
-
-    /**
-     * I32 TEST
-     */
-    BASETYPE_IDENTITY_TEST(testI32, 0);
-    BASETYPE_IDENTITY_TEST(testI32, -1);
-    BASETYPE_IDENTITY_TEST(testI32, 190000013);
-    BASETYPE_IDENTITY_TEST(testI32, -190000013);
-    BASETYPE_IDENTITY_TEST(testI32, numeric_limits<int32_t>::max());
-    BASETYPE_IDENTITY_TEST(testI32, numeric_limits<int32_t>::min());
-
-    /**
-     * I64 TEST
-     */
-    BASETYPE_IDENTITY_TEST(testI64, (int64_t)0);
-    BASETYPE_IDENTITY_TEST(testI64, (int64_t)-1);
-    BASETYPE_IDENTITY_TEST(testI64, (int64_t)7000000000000000123LL);
-    BASETYPE_IDENTITY_TEST(testI64, (int64_t)-7000000000000000123LL);
-    BASETYPE_IDENTITY_TEST(testI64, (int64_t)pow(2LL, 32));
-    BASETYPE_IDENTITY_TEST(testI64, (int64_t)-pow(2LL, 32));
-    BASETYPE_IDENTITY_TEST(testI64, (int64_t)pow(2LL, 32) + 1);
-    BASETYPE_IDENTITY_TEST(testI64, (int64_t)-pow(2LL, 32) - 1);
-    BASETYPE_IDENTITY_TEST(testI64, numeric_limits<int64_t>::max());
-    BASETYPE_IDENTITY_TEST(testI64, numeric_limits<int64_t>::min());
-
-    /**
-     * DOUBLE TEST
-     */
-    // Comparing double values with plain equality because Thrift handles full precision of double
-    BASETYPE_IDENTITY_TEST(testDouble, 0.0);
-    BASETYPE_IDENTITY_TEST(testDouble, -1.0);
-    BASETYPE_IDENTITY_TEST(testDouble, -5.2098523);
-    BASETYPE_IDENTITY_TEST(testDouble, -0.000341012439638598279);
-    BASETYPE_IDENTITY_TEST(testDouble, pow(2, 32));
-    BASETYPE_IDENTITY_TEST(testDouble, pow(2, 32) + 1);
-    BASETYPE_IDENTITY_TEST(testDouble, pow(2, 53) - 1);
-    BASETYPE_IDENTITY_TEST(testDouble, -pow(2, 32));
-    BASETYPE_IDENTITY_TEST(testDouble, -pow(2, 32) - 1);
-    BASETYPE_IDENTITY_TEST(testDouble, -pow(2, 53) + 1);
-
-    try {
-      double expected = pow(10, 307);
-      cout << "testDouble(" << expected << ") = " << flush;
-      double actual = testClient.testDouble(expected);
-      cout << "(" << actual << ")" << endl;
-      if (expected - actual > pow(10, 292)) {
-        cout << "*** FAILED ***" << endl
-             << "Expected: " << expected << " but got: " << actual << endl;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_BASETYPES;
-    }
-
-    try {
-      double expected = pow(10, -292);
-      cout << "testDouble(" << expected << ") = " << flush;
-      double actual = testClient.testDouble(expected);
-      cout << "(" << actual << ")" << endl;
-      if (expected - actual > pow(10, -307)) {
-        cout << "*** FAILED ***" << endl
-             << "Expected: " << expected << " but got: " << actual << endl;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_BASETYPES;
-    }
-
-    /**
-     * BINARY TEST
-     */
-    cout << "testBinary(empty)" << endl;
-    try {
-      string bin_result;
-      testClient.testBinary(bin_result, string());
-      if (!bin_result.empty()) {
-        cout << endl << "*** FAILED ***" << endl;
-        cout << "invalid length: " << bin_result.size() << endl;
-        return_code |= ERR_BASETYPES;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_BASETYPES;
-    }
-    cout << "testBinary([-128..127]) = {" << flush;
-    const signed char bin_data[256]
-        = {-128, -127, -126, -125, -124, -123, -122, -121, -120, -119, -118, -117, -116, -115, -114,
-           -113, -112, -111, -110, -109, -108, -107, -106, -105, -104, -103, -102, -101, -100, -99,
-           -98,  -97,  -96,  -95,  -94,  -93,  -92,  -91,  -90,  -89,  -88,  -87,  -86,  -85,  -84,
-           -83,  -82,  -81,  -80,  -79,  -78,  -77,  -76,  -75,  -74,  -73,  -72,  -71,  -70,  -69,
-           -68,  -67,  -66,  -65,  -64,  -63,  -62,  -61,  -60,  -59,  -58,  -57,  -56,  -55,  -54,
-           -53,  -52,  -51,  -50,  -49,  -48,  -47,  -46,  -45,  -44,  -43,  -42,  -41,  -40,  -39,
-           -38,  -37,  -36,  -35,  -34,  -33,  -32,  -31,  -30,  -29,  -28,  -27,  -26,  -25,  -24,
-           -23,  -22,  -21,  -20,  -19,  -18,  -17,  -16,  -15,  -14,  -13,  -12,  -11,  -10,  -9,
-           -8,   -7,   -6,   -5,   -4,   -3,   -2,   -1,   0,    1,    2,    3,    4,    5,    6,
-           7,    8,    9,    10,   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-           22,   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,
-           37,   38,   39,   40,   41,   42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-           52,   53,   54,   55,   56,   57,   58,   59,   60,   61,   62,   63,   64,   65,   66,
-           67,   68,   69,   70,   71,   72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
-           82,   83,   84,   85,   86,   87,   88,   89,   90,   91,   92,   93,   94,   95,   96,
-           97,   98,   99,   100,  101,  102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
-           112,  113,  114,  115,  116,  117,  118,  119,  120,  121,  122,  123,  124,  125,  126,
-           127};
-    try {
-      string bin_result;
-      testClient.testBinary(bin_result, string(reinterpret_cast<const char *>(bin_data), 256));
-      if (bin_result.size() != 256) {
-        cout << endl << "*** FAILED ***" << endl;
-        cout << "invalid length: " << bin_result.size() << endl;
-        return_code |= ERR_BASETYPES;
-      } else {
-        bool first = true;
-        bool failed = false;
-        for (int i = 0; i < 256; ++i) {
-          if (!first)
-            cout << ",";
-          else
-            first = false;
-          cout << static_cast<int>(bin_result[i]);
-          if (!failed && bin_result[i] != i - 128) {
-            failed = true;
-          }
-        }
-        cout << "}" << endl;
-        if (failed) {
-          cout << "*** FAILED ***" << endl;
-          return_code |= ERR_BASETYPES;
-        }
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_BASETYPES;
-    }
-
-
-    /**
-     * STRUCT TEST
-     */
-    cout << "testStruct({\"Zero\", 1, -3, -5})" << flush;
-    Xtruct out;
-    out.string_thing = "Zero";
-    out.byte_thing = 1;
-    out.i32_thing = -3;
-    out.i64_thing = -5;
-    Xtruct in;
-    testClient.testStruct(in, out);
-    printf(" = {\"%s\", %d, %d, %" PRId64 "}\n",
-           in.string_thing.c_str(),
-           (int)in.byte_thing,
-           in.i32_thing,
-           in.i64_thing);
-    if (in != out) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    /**
-     * NESTED STRUCT TEST
-     */
-    cout << "testNest({1, {\"Zero\", 1, -3, -5}), 5}" << flush;
-    Xtruct2 out2;
-    out2.byte_thing = 1;
-    out2.struct_thing = out;
-    out2.i32_thing = 5;
-    Xtruct2 in2;
-    testClient.testNest(in2, out2);
-    in = in2.struct_thing;
-    printf(" = {%d, {\"%s\", %d, %d, %" PRId64 "}, %d}\n",
-           in2.byte_thing,
-           in.string_thing.c_str(),
-           (int)in.byte_thing,
-           in.i32_thing,
-           in.i64_thing,
-           in2.i32_thing);
-    if (in2 != out2) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    /**
-     * MAP TEST
-     */
-    map<int32_t, int32_t> mapout;
-    for (int32_t i = 0; i < 5; ++i) {
-      mapout.insert(make_pair(i, i - 10));
-    }
-    cout << "testMap({" << flush;
-    map<int32_t, int32_t>::const_iterator m_iter;
-    bool first = true;
-    for (m_iter = mapout.begin(); m_iter != mapout.end(); ++m_iter) {
-      if (first) {
-        first = false;
-      } else {
-        cout << ",";
-      }
-      cout << m_iter->first << " => " << m_iter->second;
-    }
-    cout << "})";
-    map<int32_t, int32_t> mapin;
-    testClient.testMap(mapin, mapout);
-    cout << " = {";
-    first = true;
-    for (m_iter = mapin.begin(); m_iter != mapin.end(); ++m_iter) {
-      if (first) {
-        first = false;
-      } else {
-        cout << ",";
-      }
-      cout << m_iter->first << " => " << m_iter->second;
-    }
-    cout << "}" << endl;
-    if (mapin != mapout) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_CONTAINERS;
-    }
-
-    /**
-     * STRING MAP TEST
-     */
-    cout << "testStringMap({a => 2, b => blah, some => thing}) = {" << flush;
-    map<string, string> smapin;
-    map<string, string> smapout;
-    smapin["a"] = "2";
-    smapin["b"] = "blah";
-    smapin["some"] = "thing";
-    try {
-      testClient.testStringMap(smapout, smapin);
-      first = true;
-      for (map<string, string>::const_iterator it = smapout.begin(); it != smapout.end(); ++it) {
-        if (first)
-          cout << ",";
-        else
-          first = false;
-        cout << it->first << " => " << it->second;
-      }
-      cout << "}" << endl;
-      if (smapin != smapout) {
-        cout << "*** FAILED ***" << endl;
-        return_code |= ERR_CONTAINERS;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_CONTAINERS;
-    }
-
-    /**
-     * SET TEST
-     */
-    set<int32_t> setout;
-    for (int32_t i = -2; i < 3; ++i) {
-      setout.insert(i);
-    }
-    cout << "testSet({" << flush;
-    set<int32_t>::const_iterator s_iter;
-    first = true;
-    for (s_iter = setout.begin(); s_iter != setout.end(); ++s_iter) {
-      if (first) {
-        first = false;
-      } else {
-        cout << ",";
-      }
-      cout << *s_iter;
-    }
-    cout << "})";
-    set<int32_t> setin;
-    testClient.testSet(setin, setout);
-    cout << " = {";
-    first = true;
-    for (s_iter = setin.begin(); s_iter != setin.end(); ++s_iter) {
-      if (first) {
-        first = false;
-      } else {
-        cout << ",";
-      }
-      cout << *s_iter;
-    }
-    cout << "}" << endl;
-    if (setin != setout) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_CONTAINERS;
-    }
-
-    /**
-     * LIST TEST
-     */
-    cout << "testList(empty)" << flush;
-    try {
-      vector<int32_t> listout;
-      testClient.testList(listout, vector<int32_t>());
-      if (!listout.empty()) {
-        cout << "*** FAILED ***" << endl;
-        cout << "invalid length: " << listout.size() << endl;
-        return_code |= ERR_CONTAINERS;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_CONTAINERS;
-    }
-    try {
-      vector<int32_t> listout;
-      for (int32_t i = -2; i < 3; ++i) {
-        listout.push_back(i);
-      }
-      cout << "testList({" << flush;
-      vector<int32_t>::const_iterator l_iter;
-      first = true;
-      for (l_iter = listout.begin(); l_iter != listout.end(); ++l_iter) {
-        if (first) {
-          first = false;
-        } else {
-          cout << ",";
-        }
-        cout << *l_iter;
-      }
-      cout << "})";
-      vector<int32_t> listin;
-      testClient.testList(listin, listout);
-      cout << " = {";
-      first = true;
-      for (l_iter = listin.begin(); l_iter != listin.end(); ++l_iter) {
-        if (first) {
-          first = false;
-        } else {
-          cout << ",";
-        }
-        cout << *l_iter;
-      }
-      cout << "}" << endl;
-      if (listin != listout) {
-        cout << "*** FAILED ***" << endl;
-        return_code |= ERR_CONTAINERS;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_CONTAINERS;
-    }
-
-    /**
-     * ENUM TEST
-     */
-    cout << "testEnum(ONE)" << flush;
-    Numberz::type ret = testClient.testEnum(Numberz::ONE);
-    cout << " = " << ret << endl;
-    if (ret != Numberz::ONE) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    cout << "testEnum(TWO)" << flush;
-    ret = testClient.testEnum(Numberz::TWO);
-    cout << " = " << ret << endl;
-    if (ret != Numberz::TWO) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    cout << "testEnum(THREE)" << flush;
-    ret = testClient.testEnum(Numberz::THREE);
-    cout << " = " << ret << endl;
-    if (ret != Numberz::THREE) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    cout << "testEnum(FIVE)" << flush;
-    ret = testClient.testEnum(Numberz::FIVE);
-    cout << " = " << ret << endl;
-    if (ret != Numberz::FIVE) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    cout << "testEnum(EIGHT)" << flush;
-    ret = testClient.testEnum(Numberz::EIGHT);
-    cout << " = " << ret << endl;
-    if (ret != Numberz::EIGHT) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    /**
-     * TYPEDEF TEST
-     */
-    cout << "testTypedef(309858235082523)" << flush;
-    UserId uid = testClient.testTypedef(309858235082523LL);
-    cout << " = " << uid << endl;
-    if (uid != 309858235082523LL) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    /**
-     * NESTED MAP TEST
-     */
-    cout << "testMapMap(1)" << flush;
-    map<int32_t, map<int32_t, int32_t> > mm;
-    testClient.testMapMap(mm, 1);
-    cout << " = {";
-    map<int32_t, map<int32_t, int32_t> >::const_iterator mi;
-    for (mi = mm.begin(); mi != mm.end(); ++mi) {
-      printf("%d => {", mi->first);
-      map<int32_t, int32_t>::const_iterator mi2;
-      for (mi2 = mi->second.begin(); mi2 != mi->second.end(); ++mi2) {
-        cout << mi2->first << " => " << mi2->second;
-      }
-      cout << "}, ";
-    }
-    cout << "}" << endl;
-    if (mm.size() != 2 ||
-        mm[-4][-4] != -4 ||
-        mm[-4][-3] != -3 ||
-        mm[-4][-2] != -2 ||
-        mm[-4][-1] != -1 ||
-        mm[4][4] != 4 ||
-        mm[4][3] != 3 ||
-        mm[4][2] != 2 ||
-        mm[4][1] != 1) {
-      cout << "*** FAILED ***" << endl;
-      return_code |= ERR_CONTAINERS;
-    }
-
-    /**
-     * INSANITY TEST
-     */
-    if (!noinsane) {
-      Insanity insane;
-      insane.userMap.insert(make_pair(Numberz::FIVE, 5));
-      insane.userMap.insert(make_pair(Numberz::EIGHT, 8));
-      Xtruct truck;
-      truck.string_thing = "Goodbye4";
-      truck.byte_thing = 4;
-      truck.i32_thing = 4;
-      truck.i64_thing = 4;
-      Xtruct truck2;
-      truck2.string_thing = "Hello2";
-      truck2.byte_thing = 2;
-      truck2.i32_thing = 2;
-      truck2.i64_thing = 2;
-      insane.xtructs.push_back(truck);
-      insane.xtructs.push_back(truck2);
-      cout << "testInsanity()" << flush;
-      map<UserId, map<Numberz::type, Insanity> > whoa;
-      testClient.testInsanity(whoa, insane);
-      cout << " = {";
-      map<UserId, map<Numberz::type, Insanity> >::const_iterator i_iter;
-      for (i_iter = whoa.begin(); i_iter != whoa.end(); ++i_iter) {
-        printf("%" PRId64 " => {", i_iter->first);
-        map<Numberz::type, Insanity>::const_iterator i2_iter;
-        for (i2_iter = i_iter->second.begin(); i2_iter != i_iter->second.end(); ++i2_iter) {
-          printf("%d => {", i2_iter->first);
-          map<Numberz::type, UserId> userMap = i2_iter->second.userMap;
-          map<Numberz::type, UserId>::const_iterator um;
-          cout << "{";
-          for (um = userMap.begin(); um != userMap.end(); ++um) {
-            cout << um->first << " => " << um->second;
-          }
-          cout << "}, ";
-
-          vector<Xtruct> xtructs = i2_iter->second.xtructs;
-          vector<Xtruct>::const_iterator x;
-          cout << "{";
-          for (x = xtructs.begin(); x != xtructs.end(); ++x) {
-            printf("{\"%s\", %d, %d, %" PRId64 "}, ",
-                   x->string_thing.c_str(),
-                   (int)x->byte_thing,
-                   x->i32_thing,
-                   x->i64_thing);
-          }
-          cout << "}";
-
-          cout << "}, ";
-        }
-        cout << "}, ";
-      }
-      cout << "}" << endl;
-      bool failed = false;
-      map<UserId, map<Numberz::type, Insanity> >::const_iterator it1 = whoa.find(UserId(1));
-      if (whoa.size() != 2) {
-        failed = true;
-      }
-      if (it1 == whoa.end()) {
-        failed = true;
-      } else {
-        map<Numberz::type, Insanity>::const_iterator it12 = it1->second.find(Numberz::TWO);
-        if (it12 == it1->second.end() || it12->second != insane) {
-          failed = true;
-        }
-        map<Numberz::type, Insanity>::const_iterator it13 = it1->second.find(Numberz::THREE);
-        if (it13 == it1->second.end() || it13->second != insane) {
-          failed = true;
-        }
-      }
-      map<UserId, map<Numberz::type, Insanity> >::const_iterator it2 = whoa.find(UserId(2));
-      if (it2 == whoa.end()) {
-        failed = true;
-      } else {
-        map<Numberz::type, Insanity>::const_iterator it26 = it2->second.find(Numberz::SIX);
-        if (it26 == it1->second.end() || it26->second != Insanity()) {
-          failed = true;
-        }
-      }
-      if (failed) {
-        cout << "*** FAILED ***" << endl;
-        return_code |= ERR_STRUCTS;
-      }
-    }
-
-    /**
-     * MULTI TEST
-     */
-    cout << "testMulti()" << endl;
-    try {
-      map<int16_t, string> mul_map;
-      Xtruct mul_result;
-      mul_map[1] = "blah";
-      mul_map[2] = "thing";
-      testClient.testMulti(mul_result, 42, 4242, 424242, mul_map, Numberz::EIGHT, UserId(24));
-      Xtruct xxs;
-      xxs.string_thing = "Hello2";
-      xxs.byte_thing = 42;
-      xxs.i32_thing = 4242;
-      xxs.i64_thing = 424242;
-      if (mul_result != xxs) {
-        cout << "*** FAILED ***" << endl;
-        return_code |= ERR_STRUCTS;
-      }
-    } catch (TTransportException&) {
-      throw;
-    } catch (exception& ex) {
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_STRUCTS;
-    }
-
-    /* test exception */
-
-    try {
-      cout << "testClient.testException(\"Xception\") =>" << flush;
-      testClient.testException("Xception");
-      cout << "  void\n*** FAILED ***" << endl;
-      return_code |= ERR_EXCEPTIONS;
-
-    } catch (Xception& e) {
-      printf("  {%u, \"%s\"}\n", e.errorCode, e.message.c_str());
-    }
-
-    try {
-      cout << "testClient.testException(\"TException\") =>" << flush;
-      testClient.testException("TException");
-      cout << "  void\n*** FAILED ***" << endl;
-      return_code |= ERR_EXCEPTIONS;
-
-    } catch (const TException&) {
-      cout << "  Caught TException" << endl;
-    }
-
-    try {
-      cout << "testClient.testException(\"success\") =>" << flush;
-      testClient.testException("success");
-      cout << "  void" << endl;
-    } catch (exception & ex) {                                                                       \
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_EXCEPTIONS;
-    }
-
-    /* test multi exception */
-
-    try {
-      cout << "testClient.testMultiException(\"Xception\", \"test 1\") =>" << flush;
-      Xtruct result;
-      testClient.testMultiException(result, "Xception", "test 1");
-      cout << "  result\n*** FAILED ***" << endl;
-      return_code |= ERR_EXCEPTIONS;
-    } catch (Xception& e) {
-      printf("  {%u, \"%s\"}\n", e.errorCode, e.message.c_str());
-    }
-
-    try {
-      cout << "testClient.testMultiException(\"Xception2\", \"test 2\") =>" << flush;
-      Xtruct result;
-      testClient.testMultiException(result, "Xception2", "test 2");
-      cout << "  result\n*** FAILED ***" << endl;
-      return_code |= ERR_EXCEPTIONS;
-
-    } catch (Xception2& e) {
-      printf("  {%u, {\"%s\"}}\n", e.errorCode, e.struct_thing.string_thing.c_str());
-    }
-
-    try {
-      cout << "testClient.testMultiException(\"success\", \"test 3\") =>" << flush;
-      Xtruct result;
-      testClient.testMultiException(result, "success", "test 3");
-      printf("  {{\"%s\"}}\n", result.string_thing.c_str());
-    } catch (exception & ex) {                                                                       \
-      cout << "*** FAILED ***" << endl << ex.what() << endl;
-      return_code |= ERR_EXCEPTIONS;
-    }
-
-    /* test oneway void */
-    {
-      cout << "testClient.testOneway(1) =>" << flush;
-      uint64_t startOneway = now();
-      testClient.testOneway(1);
-      uint64_t elapsed = now() - startOneway;
-      if (elapsed > 200 * 1000) { // 0.2 seconds
-        printf("*** FAILED *** - took %.2f ms\n", (double)elapsed / 1000.0);
-      return_code |= ERR_BASETYPES;
-      } else {
-        printf("  success - took %.2f ms\n", (double)elapsed / 1000.0);
-      }
-    }
-
-    /**
-     * redo a simple test after the oneway to make sure we aren't "off by one" --
-     * if the server treated oneway void like normal void, this next test will
-     * fail since it will get the void confirmation rather than the correct
-     * result. In this circumstance, the client will throw the exception:
-     *
-     *   TApplicationException: Wrong method namea
-     */
-    /**
-     * I32 TEST
-     */
-    cout << "re-test testI32(-1)";
-    int i32 = testClient.testI32(-1);
-    cout << " = " << i32 << endl;
-    if (i32 != -1)
-      return_code |= ERR_BASETYPES;
-
-    uint64_t stop = now();
-    uint64_t tot = stop - start;
-
-    cout << "Total time: " << stop - start << " us" << endl;
-
-    time_tot += tot;
-    if (time_min == 0 || tot < time_min) {
-      time_min = tot;
-    }
-    if (tot > time_max) {
-      time_max = tot;
-    }
-
-    transport->close();
-  }
-
-  cout << endl << "All tests done." << endl;
-
-  uint64_t time_avg = time_tot / numTests;
-
-  cout << "Min time: " << time_min << " us" << endl;
-  cout << "Max time: " << time_max << " us" << endl;
-  cout << "Avg time: " << time_avg << " us" << endl;
-
-  return return_code;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/cpp/src/TestServer.cpp b/vendor/git.apache.org/thrift.git/test/cpp/src/TestServer.cpp
deleted file mode 100644
index b437860..0000000
--- a/vendor/git.apache.org/thrift.git/test/cpp/src/TestServer.cpp
+++ /dev/null
@@ -1,775 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/concurrency/PlatformThreadFactory.h>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TCompactProtocol.h>
-#include <thrift/protocol/THeaderProtocol.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>
-#include <stdexcept>
-#include <sstream>
-
-#include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
-#include <thrift/cxxfunctional.h>
-
-#include <signal.h>
-#if _WIN32
-#include <thrift/windows/TWinsockSingleton.h>
-#endif
-
-using namespace std;
-
-using namespace apache::thrift;
-using namespace apache::thrift::concurrency;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::server;
-using namespace apache::thrift::async;
-
-using namespace thrift::test;
-
-class TestHandler : public ThriftTestIf {
-public:
-  TestHandler() {}
-
-  void testVoid() { printf("testVoid()\n"); }
-
-  void testString(string& out, const string& thing) {
-    printf("testString(\"%s\")\n", thing.c_str());
-    out = thing;
-  }
-
-  bool testBool(const bool thing) {
-    printf("testBool(%s)\n", thing ? "true" : "false");
-    return thing;
-  }
-
-  int8_t testByte(const int8_t thing) {
-    printf("testByte(%d)\n", (int)thing);
-    return thing;
-  }
-
-  int32_t testI32(const int32_t thing) {
-    printf("testI32(%d)\n", thing);
-    return thing;
-  }
-
-  int64_t testI64(const int64_t thing) {
-    printf("testI64(%" PRId64 ")\n", thing);
-    return thing;
-  }
-
-  double testDouble(const double thing) {
-    printf("testDouble(%f)\n", thing);
-    return thing;
-  }
-
-  void testBinary(std::string& _return, const std::string& thing) {
-    std::ostringstream hexstr;
-    hexstr << std::hex << thing;
-    printf("testBinary(%s)\n", hexstr.str().c_str());
-    _return = thing;
-  }
-
-  void testStruct(Xtruct& out, const Xtruct& thing) {
-    printf("testStruct({\"%s\", %d, %d, %" PRId64 "})\n",
-           thing.string_thing.c_str(),
-           (int)thing.byte_thing,
-           thing.i32_thing,
-           thing.i64_thing);
-    out = thing;
-  }
-
-  void testNest(Xtruct2& out, const Xtruct2& nest) {
-    const Xtruct& thing = nest.struct_thing;
-    printf("testNest({%d, {\"%s\", %d, %d, %" PRId64 "}, %d})\n",
-           (int)nest.byte_thing,
-           thing.string_thing.c_str(),
-           (int)thing.byte_thing,
-           thing.i32_thing,
-           thing.i64_thing,
-           nest.i32_thing);
-    out = nest;
-  }
-
-  void testMap(map<int32_t, int32_t>& out, const map<int32_t, int32_t>& thing) {
-    printf("testMap({");
-    map<int32_t, int32_t>::const_iterator m_iter;
-    bool first = true;
-    for (m_iter = thing.begin(); m_iter != thing.end(); ++m_iter) {
-      if (first) {
-        first = false;
-      } else {
-        printf(", ");
-      }
-      printf("%d => %d", m_iter->first, m_iter->second);
-    }
-    printf("})\n");
-    out = thing;
-  }
-
-  void testStringMap(map<std::string, std::string>& out,
-                     const map<std::string, std::string>& thing) {
-    printf("testMap({");
-    map<std::string, std::string>::const_iterator m_iter;
-    bool first = true;
-    for (m_iter = thing.begin(); m_iter != thing.end(); ++m_iter) {
-      if (first) {
-        first = false;
-      } else {
-        printf(", ");
-      }
-      printf("%s => %s", (m_iter->first).c_str(), (m_iter->second).c_str());
-    }
-    printf("})\n");
-    out = thing;
-  }
-
-  void testSet(set<int32_t>& out, const set<int32_t>& thing) {
-    printf("testSet({");
-    set<int32_t>::const_iterator s_iter;
-    bool first = true;
-    for (s_iter = thing.begin(); s_iter != thing.end(); ++s_iter) {
-      if (first) {
-        first = false;
-      } else {
-        printf(", ");
-      }
-      printf("%d", *s_iter);
-    }
-    printf("})\n");
-    out = thing;
-  }
-
-  void testList(vector<int32_t>& out, const vector<int32_t>& thing) {
-    printf("testList({");
-    vector<int32_t>::const_iterator l_iter;
-    bool first = true;
-    for (l_iter = thing.begin(); l_iter != thing.end(); ++l_iter) {
-      if (first) {
-        first = false;
-      } else {
-        printf(", ");
-      }
-      printf("%d", *l_iter);
-    }
-    printf("})\n");
-    out = thing;
-  }
-
-  Numberz::type testEnum(const Numberz::type thing) {
-    printf("testEnum(%d)\n", thing);
-    return thing;
-  }
-
-  UserId testTypedef(const UserId thing) {
-    printf("testTypedef(%" PRId64 ")\n", thing);
-    return thing;
-  }
-
-  void testMapMap(map<int32_t, map<int32_t, int32_t> >& mapmap, const int32_t hello) {
-    printf("testMapMap(%d)\n", hello);
-
-    map<int32_t, int32_t> pos;
-    map<int32_t, int32_t> neg;
-    for (int i = 1; i < 5; i++) {
-      pos.insert(make_pair(i, i));
-      neg.insert(make_pair(-i, -i));
-    }
-
-    mapmap.insert(make_pair(4, pos));
-    mapmap.insert(make_pair(-4, neg));
-  }
-
-  void testInsanity(map<UserId, map<Numberz::type, Insanity> >& insane, const Insanity& argument) {
-    printf("testInsanity()\n");
-
-    Insanity looney;
-    map<Numberz::type, Insanity> first_map;
-    map<Numberz::type, Insanity> second_map;
-
-    first_map.insert(make_pair(Numberz::TWO, argument));
-    first_map.insert(make_pair(Numberz::THREE, argument));
-
-    second_map.insert(make_pair(Numberz::SIX, looney));
-
-    insane.insert(make_pair(1, first_map));
-    insane.insert(make_pair(2, second_map));
-
-    printf("return");
-    printf(" = {");
-    map<UserId, map<Numberz::type, Insanity> >::const_iterator i_iter;
-    for (i_iter = insane.begin(); i_iter != insane.end(); ++i_iter) {
-      printf("%" PRId64 " => {", i_iter->first);
-      map<Numberz::type, Insanity>::const_iterator i2_iter;
-      for (i2_iter = i_iter->second.begin(); i2_iter != i_iter->second.end(); ++i2_iter) {
-        printf("%d => {", i2_iter->first);
-        map<Numberz::type, UserId> userMap = i2_iter->second.userMap;
-        map<Numberz::type, UserId>::const_iterator um;
-        printf("{");
-        for (um = userMap.begin(); um != userMap.end(); ++um) {
-          printf("%d => %" PRId64 ", ", um->first, um->second);
-        }
-        printf("}, ");
-
-        vector<Xtruct> xtructs = i2_iter->second.xtructs;
-        vector<Xtruct>::const_iterator x;
-        printf("{");
-        for (x = xtructs.begin(); x != xtructs.end(); ++x) {
-          printf("{\"%s\", %d, %d, %" PRId64 "}, ",
-                 x->string_thing.c_str(),
-                 (int)x->byte_thing,
-                 x->i32_thing,
-                 x->i64_thing);
-        }
-        printf("}");
-
-        printf("}, ");
-      }
-      printf("}, ");
-    }
-    printf("}\n");
-  }
-
-  void testMulti(Xtruct& hello,
-                 const int8_t arg0,
-                 const int32_t arg1,
-                 const int64_t arg2,
-                 const std::map<int16_t, std::string>& arg3,
-                 const Numberz::type arg4,
-                 const UserId arg5) {
-    (void)arg3;
-    (void)arg4;
-    (void)arg5;
-
-    printf("testMulti()\n");
-
-    hello.string_thing = "Hello2";
-    hello.byte_thing = arg0;
-    hello.i32_thing = arg1;
-    hello.i64_thing = (int64_t)arg2;
-  }
-
-  void testException(const std::string& arg) {
-    printf("testException(%s)\n", arg.c_str());
-    if (arg.compare("Xception") == 0) {
-      Xception e;
-      e.errorCode = 1001;
-      e.message = arg;
-      throw e;
-    } else if (arg.compare("TException") == 0) {
-      apache::thrift::TException e;
-      throw e;
-    } else {
-      Xtruct result;
-      result.string_thing = arg;
-      return;
-    }
-  }
-
-  void testMultiException(Xtruct& result,
-                          const std::string& arg0,
-                          const std::string& arg1) {
-
-    printf("testMultiException(%s, %s)\n", arg0.c_str(), arg1.c_str());
-
-    if (arg0.compare("Xception") == 0) {
-      Xception e;
-      e.errorCode = 1001;
-      e.message = "This is an Xception";
-      throw e;
-    } else if (arg0.compare("Xception2") == 0) {
-      Xception2 e;
-      e.errorCode = 2002;
-      e.struct_thing.string_thing = "This is an Xception2";
-      throw e;
-    } else {
-      result.string_thing = arg1;
-      return;
-    }
-  }
-
-  void testOneway(const int32_t sleepFor) {
-    printf("testOneway(%d): Sleeping...\n", sleepFor);
-    THRIFT_SLEEP_SEC(sleepFor);
-    printf("testOneway(%d): done sleeping!\n", sleepFor);
-  }
-};
-
-class TestProcessorEventHandler : public TProcessorEventHandler {
-  virtual void* getContext(const char* fn_name, void* serverContext) {
-    (void)serverContext;
-    return new std::string(fn_name);
-  }
-  virtual void freeContext(void* ctx, const char* fn_name) {
-    (void)fn_name;
-    delete static_cast<std::string*>(ctx);
-  }
-  virtual void preRead(void* ctx, const char* fn_name) { communicate("preRead", ctx, fn_name); }
-  virtual void postRead(void* ctx, const char* fn_name, uint32_t bytes) {
-    (void)bytes;
-    communicate("postRead", ctx, fn_name);
-  }
-  virtual void preWrite(void* ctx, const char* fn_name) { communicate("preWrite", ctx, fn_name); }
-  virtual void postWrite(void* ctx, const char* fn_name, uint32_t bytes) {
-    (void)bytes;
-    communicate("postWrite", ctx, fn_name);
-  }
-  virtual void asyncComplete(void* ctx, const char* fn_name) {
-    communicate("asyncComplete", ctx, fn_name);
-  }
-  virtual void handlerError(void* ctx, const char* fn_name) {
-    communicate("handlerError", ctx, fn_name);
-  }
-
-  void communicate(const char* event, void* ctx, const char* fn_name) {
-    std::cout << event << ": " << *static_cast<std::string*>(ctx) << " = " << fn_name << std::endl;
-  }
-};
-
-class TestHandlerAsync : public ThriftTestCobSvIf {
-public:
-  TestHandlerAsync(boost::shared_ptr<TestHandler>& handler) : _delegate(handler) {}
-  virtual ~TestHandlerAsync() {}
-
-  virtual void testVoid(tcxx::function<void()> cob) {
-    _delegate->testVoid();
-    cob();
-  }
-
-  virtual void testString(tcxx::function<void(std::string const& _return)> cob,
-                          const std::string& thing) {
-    std::string res;
-    _delegate->testString(res, thing);
-    cob(res);
-  }
-
-  virtual void testBool(tcxx::function<void(bool const& _return)> cob, const bool thing) {
-    bool res = _delegate->testBool(thing);
-    cob(res);
-  }
-
-  virtual void testByte(tcxx::function<void(int8_t const& _return)> cob, const int8_t thing) {
-    int8_t res = _delegate->testByte(thing);
-    cob(res);
-  }
-
-  virtual void testI32(tcxx::function<void(int32_t const& _return)> cob, const int32_t thing) {
-    int32_t res = _delegate->testI32(thing);
-    cob(res);
-  }
-
-  virtual void testI64(tcxx::function<void(int64_t const& _return)> cob, const int64_t thing) {
-    int64_t res = _delegate->testI64(thing);
-    cob(res);
-  }
-
-  virtual void testDouble(tcxx::function<void(double const& _return)> cob, const double thing) {
-    double res = _delegate->testDouble(thing);
-    cob(res);
-  }
-
-  virtual void testBinary(tcxx::function<void(std::string const& _return)> cob,
-                          const std::string& thing) {
-    std::string res;
-    _delegate->testBinary(res, thing);
-    cob(res);
-  }
-
-  virtual void testStruct(tcxx::function<void(Xtruct const& _return)> cob, const Xtruct& thing) {
-    Xtruct res;
-    _delegate->testStruct(res, thing);
-    cob(res);
-  }
-
-  virtual void testNest(tcxx::function<void(Xtruct2 const& _return)> cob, const Xtruct2& thing) {
-    Xtruct2 res;
-    _delegate->testNest(res, thing);
-    cob(res);
-  }
-
-  virtual void testMap(tcxx::function<void(std::map<int32_t, int32_t> const& _return)> cob,
-                       const std::map<int32_t, int32_t>& thing) {
-    std::map<int32_t, int32_t> res;
-    _delegate->testMap(res, thing);
-    cob(res);
-  }
-
-  virtual void testStringMap(
-      tcxx::function<void(std::map<std::string, std::string> const& _return)> cob,
-      const std::map<std::string, std::string>& thing) {
-    std::map<std::string, std::string> res;
-    _delegate->testStringMap(res, thing);
-    cob(res);
-  }
-
-  virtual void testSet(tcxx::function<void(std::set<int32_t> const& _return)> cob,
-                       const std::set<int32_t>& thing) {
-    std::set<int32_t> res;
-    _delegate->testSet(res, thing);
-    cob(res);
-  }
-
-  virtual void testList(tcxx::function<void(std::vector<int32_t> const& _return)> cob,
-                        const std::vector<int32_t>& thing) {
-    std::vector<int32_t> res;
-    _delegate->testList(res, thing);
-    cob(res);
-  }
-
-  virtual void testEnum(tcxx::function<void(Numberz::type const& _return)> cob,
-                        const Numberz::type thing) {
-    Numberz::type res = _delegate->testEnum(thing);
-    cob(res);
-  }
-
-  virtual void testTypedef(tcxx::function<void(UserId const& _return)> cob, const UserId thing) {
-    UserId res = _delegate->testTypedef(thing);
-    cob(res);
-  }
-
-  virtual void testMapMap(
-      tcxx::function<void(std::map<int32_t, std::map<int32_t, int32_t> > const& _return)> cob,
-      const int32_t hello) {
-    std::map<int32_t, std::map<int32_t, int32_t> > res;
-    _delegate->testMapMap(res, hello);
-    cob(res);
-  }
-
-  virtual void testInsanity(
-      tcxx::function<void(std::map<UserId, std::map<Numberz::type, Insanity> > const& _return)> cob,
-      const Insanity& argument) {
-    std::map<UserId, std::map<Numberz::type, Insanity> > res;
-    _delegate->testInsanity(res, argument);
-    cob(res);
-  }
-
-  virtual void testMulti(tcxx::function<void(Xtruct const& _return)> cob,
-                         const int8_t arg0,
-                         const int32_t arg1,
-                         const int64_t arg2,
-                         const std::map<int16_t, std::string>& arg3,
-                         const Numberz::type arg4,
-                         const UserId arg5) {
-    Xtruct res;
-    _delegate->testMulti(res, arg0, arg1, arg2, arg3, arg4, arg5);
-    cob(res);
-  }
-
-  virtual void testException(
-      tcxx::function<void()> cob,
-      tcxx::function<void(::apache::thrift::TDelayedException* _throw)> exn_cob,
-      const std::string& arg) {
-    try {
-      _delegate->testException(arg);
-    } catch (const apache::thrift::TException& e) {
-      exn_cob(apache::thrift::TDelayedException::delayException(e));
-      return;
-    }
-    cob();
-  }
-
-  virtual void testMultiException(
-      tcxx::function<void(Xtruct const& _return)> cob,
-      tcxx::function<void(::apache::thrift::TDelayedException* _throw)> exn_cob,
-      const std::string& arg0,
-      const std::string& arg1) {
-    Xtruct res;
-    try {
-      _delegate->testMultiException(res, arg0, arg1);
-    } catch (const apache::thrift::TException& e) {
-      exn_cob(apache::thrift::TDelayedException::delayException(e));
-      return;
-    }
-    cob(res);
-  }
-
-  virtual void testOneway(tcxx::function<void()> cob, const int32_t secondsToSleep) {
-    _delegate->testOneway(secondsToSleep);
-    cob();
-  }
-
-protected:
-  boost::shared_ptr<TestHandler> _delegate;
-};
-
-namespace po = boost::program_options;
-
-int main(int argc, char** argv) {
-
-  string testDir = boost::filesystem::system_complete(argv[0]).parent_path().parent_path().parent_path().string();
-  string certPath = testDir + "/keys/server.crt";
-  string keyPath = testDir + "/keys/server.key";
-
-#if _WIN32
-  transport::TWinsockSingleton::create();
-#endif
-  int port = 9090;
-  bool ssl = false;
-  string transport_type = "buffered";
-  string protocol_type = "binary";
-  string server_type = "simple";
-  string domain_socket = "";
-  bool abstract_namespace = false;
-  size_t workers = 4;
-  int string_limit = 0;
-  int container_limit = 0;
-
-  po::options_description desc("Allowed options");
-  desc.add_options()
-    ("help,h", "produce help message")
-    ("port", po::value<int>(&port)->default_value(port), "Port number to listen")
-    ("domain-socket", po::value<string>(&domain_socket) ->default_value(domain_socket), "Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)")
-    ("abstract-namespace", "Create the domain socket in the Abstract Namespace (no connection with filesystem pathnames)")
-    ("server-type", po::value<string>(&server_type)->default_value(server_type), "type of server, \"simple\", \"thread-pool\", \"threaded\", or \"nonblocking\"")
-    ("transport", po::value<string>(&transport_type)->default_value(transport_type), "transport: buffered, framed, http")
-    ("protocol", po::value<string>(&protocol_type)->default_value(protocol_type), "protocol: binary, compact, header, json")
-    ("ssl", "Encrypted Transport using SSL")
-    ("processor-events", "processor-events")
-    ("workers,n", po::value<size_t>(&workers)->default_value(workers), "Number of thread pools workers. Only valid for thread-pool server type")
-    ("string-limit", po::value<int>(&string_limit))
-    ("container-limit", po::value<int>(&container_limit));
-
-  po::variables_map vm;
-  po::store(po::parse_command_line(argc, argv, desc), vm);
-  po::notify(vm);
-
-  if (vm.count("help")) {
-    cout << desc << "\n";
-    return 1;
-  }
-
-  try {
-    if (!server_type.empty()) {
-      if (server_type == "simple") {
-      } else if (server_type == "thread-pool") {
-      } else if (server_type == "threaded") {
-      } else if (server_type == "nonblocking") {
-      } else {
-        throw invalid_argument("Unknown server type " + server_type);
-      }
-    }
-
-    if (!protocol_type.empty()) {
-      if (protocol_type == "binary") {
-      } else if (protocol_type == "compact") {
-      } else if (protocol_type == "json") {
-      } else if (protocol_type == "header") {
-      } else {
-        throw invalid_argument("Unknown protocol type " + protocol_type);
-      }
-    }
-
-    if (!transport_type.empty()) {
-      if (transport_type == "buffered") {
-      } else if (transport_type == "framed") {
-      } else if (transport_type == "http") {
-      } else {
-        throw invalid_argument("Unknown transport type " + transport_type);
-      }
-    }
-
-  } catch (std::exception& e) {
-    cerr << e.what() << endl;
-    cout << desc << "\n";
-    return 1;
-  }
-
-  if (vm.count("ssl")) {
-    ssl = true;
-  }
-
-  if (vm.count("abstract-namespace")) {
-    abstract_namespace = true;
-  }
-
-  // Dispatcher
-  boost::shared_ptr<TProtocolFactory> protocolFactory;
-  if (protocol_type == "json") {
-    boost::shared_ptr<TProtocolFactory> jsonProtocolFactory(new TJSONProtocolFactory());
-    protocolFactory = jsonProtocolFactory;
-  } else if (protocol_type == "compact") {
-    TCompactProtocolFactoryT<TBufferBase> *compactProtocolFactory = new TCompactProtocolFactoryT<TBufferBase>();
-    compactProtocolFactory->setContainerSizeLimit(container_limit);
-    compactProtocolFactory->setStringSizeLimit(string_limit);
-    protocolFactory.reset(compactProtocolFactory);
-  } else if (protocol_type == "header") {
-    boost::shared_ptr<TProtocolFactory> headerProtocolFactory(new THeaderProtocolFactory());
-    protocolFactory = headerProtocolFactory;
-  } else {
-    TBinaryProtocolFactoryT<TBufferBase>* binaryProtocolFactory = new TBinaryProtocolFactoryT<TBufferBase>();
-    binaryProtocolFactory->setContainerSizeLimit(container_limit);
-    binaryProtocolFactory->setStringSizeLimit(string_limit);
-    protocolFactory.reset(binaryProtocolFactory);
-  }
-
-  // Processor
-  boost::shared_ptr<TestHandler> testHandler(new TestHandler());
-  boost::shared_ptr<ThriftTestProcessor> testProcessor(new ThriftTestProcessor(testHandler));
-
-  if (vm.count("processor-events")) {
-    testProcessor->setEventHandler(
-        boost::shared_ptr<TProcessorEventHandler>(new TestProcessorEventHandler()));
-  }
-
-  // Transport
-  boost::shared_ptr<TSSLSocketFactory> sslSocketFactory;
-  boost::shared_ptr<TServerSocket> serverSocket;
-
-  if (ssl) {
-    sslSocketFactory = boost::shared_ptr<TSSLSocketFactory>(new TSSLSocketFactory());
-    sslSocketFactory->loadCertificate(certPath.c_str());
-    sslSocketFactory->loadPrivateKey(keyPath.c_str());
-    sslSocketFactory->ciphers("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
-    serverSocket = boost::shared_ptr<TServerSocket>(new TSSLServerSocket(port, sslSocketFactory));
-  } else {
-    if (domain_socket != "") {
-      if (abstract_namespace) {
-        std::string abstract_socket("\0", 1);
-        abstract_socket += domain_socket;
-        serverSocket = boost::shared_ptr<TServerSocket>(new TServerSocket(abstract_socket));
-      } else {
-        unlink(domain_socket.c_str());
-        serverSocket = boost::shared_ptr<TServerSocket>(new TServerSocket(domain_socket));
-      }
-      port = 0;
-    } else {
-      serverSocket = boost::shared_ptr<TServerSocket>(new TServerSocket(port));
-    }
-  }
-
-  // Factory
-  boost::shared_ptr<TTransportFactory> transportFactory;
-
-  if (transport_type == "http" && server_type != "nonblocking") {
-    boost::shared_ptr<TTransportFactory> httpTransportFactory(new THttpServerTransportFactory());
-    transportFactory = httpTransportFactory;
-  } else if (transport_type == "framed") {
-    boost::shared_ptr<TTransportFactory> framedTransportFactory(new TFramedTransportFactory());
-    transportFactory = framedTransportFactory;
-  } else {
-    boost::shared_ptr<TTransportFactory> bufferedTransportFactory(new TBufferedTransportFactory());
-    transportFactory = bufferedTransportFactory;
-  }
-
-  // Server Info
-  cout << "Starting \"" << server_type << "\" server (" << transport_type << "/" << protocol_type
-       << ") listen on: ";
-  if (abstract_namespace) {
-    cout << '@';
-  }
-  cout << domain_socket;
-  if (port != 0) {
-    cout << port;
-  }
-  cout << endl;
-
-  // Server
-  boost::shared_ptr<apache::thrift::server::TServer> server;
-
-  if (server_type == "simple") {
-    server.reset(new TSimpleServer(testProcessor, serverSocket, transportFactory, protocolFactory));
-  } else if (server_type == "thread-pool") {
-
-    boost::shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(workers);
-
-    boost::shared_ptr<PlatformThreadFactory> threadFactory
-        = boost::shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory());
-
-    threadManager->threadFactory(threadFactory);
-
-    threadManager->start();
-
-    server.reset(new TThreadPoolServer(testProcessor,
-                                       serverSocket,
-                                       transportFactory,
-                                       protocolFactory,
-                                       threadManager));
-  } else if (server_type == "threaded") {
-
-    server.reset(
-        new TThreadedServer(testProcessor, serverSocket, transportFactory, protocolFactory));
-  } else if (server_type == "nonblocking") {
-    if (transport_type == "http") {
-      boost::shared_ptr<TestHandlerAsync> testHandlerAsync(new TestHandlerAsync(testHandler));
-      boost::shared_ptr<TAsyncProcessor> testProcessorAsync(
-          new ThriftTestAsyncProcessor(testHandlerAsync));
-      boost::shared_ptr<TAsyncBufferProcessor> testBufferProcessor(
-          new TAsyncProtocolProcessor(testProcessorAsync, protocolFactory));
-
-      // not loading nonblockingServer into "server" because
-      // TEvhttpServer doesn't inherit from TServer, and doesn't
-      // provide a stop method.
-      TEvhttpServer nonblockingServer(testBufferProcessor, port);
-      nonblockingServer.serve();
-    } else {
-      server.reset(new TNonblockingServer(testProcessor, protocolFactory, port));
-    }
-  }
-
-  if (server.get() != NULL) {
-    if (protocol_type == "header") {
-      // Tell the server to use the same protocol for input / output
-      // if using header
-      server->setOutputProtocolFactory(boost::shared_ptr<TProtocolFactory>());
-    }
-    apache::thrift::concurrency::PlatformThreadFactory factory;
-    factory.setDetached(false);
-    boost::shared_ptr<apache::thrift::concurrency::Runnable> serverThreadRunner(server);
-    boost::shared_ptr<apache::thrift::concurrency::Thread> thread
-        = factory.newThread(serverThreadRunner);
-    thread->start();
-
-    // HACK: cross language test suite is unable to handle cin properly
-    //       that's why we stay in a endless loop here
-    while (1) {
-    }
-    // FIXME: find another way to stop the server (e.g. a signal)
-    // cout<<"Press enter to stop the server."<<endl;
-    // cin.ignore(); //wait until a key is pressed
-
-    server->stop();
-    thread->join();
-    server.reset();
-  }
-
-  cout << "done." << endl;
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/cpp/src/ThriftTest_extras.cpp b/vendor/git.apache.org/thrift.git/test/cpp/src/ThriftTest_extras.cpp
deleted file mode 100644
index af5606e..0000000
--- a/vendor/git.apache.org/thrift.git/test/cpp/src/ThriftTest_extras.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Extra functions required for ThriftTest_types to work
-
-#include <thrift/protocol/TDebugProtocol.h>
-#include "gen-cpp/ThriftTest_types.h"
-
-namespace thrift {
-namespace test {
-
-bool Insanity::operator<(thrift::test::Insanity const& other) const {
-  using apache::thrift::ThriftDebugString;
-  return ThriftDebugString(*this) < ThriftDebugString(other);
-}
-}
-}
diff --git a/vendor/git.apache.org/thrift.git/test/crossrunner/__init__.py b/vendor/git.apache.org/thrift.git/test/crossrunner/__init__.py
deleted file mode 100644
index 9d0b83a..0000000
--- a/vendor/git.apache.org/thrift.git/test/crossrunner/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from .test import test_name  # noqa
-from .collect import collect_cross_tests, collect_feature_tests  # noqa
-from .run import TestDispatcher  # noqa
-from .report import generate_known_failures, load_known_failures  # noqa
diff --git a/vendor/git.apache.org/thrift.git/test/crossrunner/collect.py b/vendor/git.apache.org/thrift.git/test/crossrunner/collect.py
deleted file mode 100644
index 03b0c36..0000000
--- a/vendor/git.apache.org/thrift.git/test/crossrunner/collect.py
+++ /dev/null
@@ -1,162 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import platform
-import re
-from itertools import product
-
-from .util import merge_dict
-from .test import TestEntry
-
-# Those keys are passed to execution as is.
-# Note that there are keys other than these, namely:
-# delay: After server is started, client start is delayed for the value
-# (seconds).
-# timeout: Test timeout after client is started (seconds).
-# platforms: Supported platforms. Should match platform.system() value.
-# protocols: list of supported protocols
-# transports: list of supported transports
-# sockets: list of supported sockets
-#
-# protocols and transports entries can be colon separated "spec:impl" pair
-# (e.g. binary:accel) where test is run for any matching "spec" while actual
-# argument passed to test executable is "impl".
-# Otherwise "spec" is equivalent to "spec:spec" pair.
-# (e.g. "binary" is equivalent to "binary:binary" in tests.json)
-#
-VALID_JSON_KEYS = [
-    'name',  # name of the library, typically a language name
-    'workdir',  # work directory where command is executed
-    'command',  # test command
-    'extra_args',  # args appended to command after other args are appended
-    'remote_args',  # args added to the other side of the program
-    'join_args',  # whether args should be passed as single concatenated string
-    'env',  # additional environmental variable
-]
-
-DEFAULT_MAX_DELAY = 5
-DEFAULT_TIMEOUT = 5
-
-
-def _collect_testlibs(config, server_match, client_match=[None]):
-    """Collects server/client configurations from library configurations"""
-    def expand_libs(config):
-        for lib in config:
-            sv = lib.pop('server', None)
-            cl = lib.pop('client', None)
-            yield lib, sv, cl
-
-    def yield_testlibs(base_configs, configs, match):
-        for base, conf in zip(base_configs, configs):
-            if conf:
-                if not match or base['name'] in match:
-                    platforms = conf.get('platforms') or base.get('platforms')
-                    if not platforms or platform.system() in platforms:
-                        yield merge_dict(base, conf)
-
-    libs, svs, cls = zip(*expand_libs(config))
-    servers = list(yield_testlibs(libs, svs, server_match))
-    clients = list(yield_testlibs(libs, cls, client_match))
-    return servers, clients
-
-
-def collect_features(config, match):
-    res = list(map(re.compile, match))
-    return list(filter(lambda c: any(map(lambda r: r.search(c['name']), res)), config))
-
-
-def _do_collect_tests(servers, clients):
-    def intersection(key, o1, o2):
-        """intersection of two collections.
-        collections are replaced with sets the first time"""
-        def cached_set(o, key):
-            v = o[key]
-            if not isinstance(v, set):
-                v = set(v)
-                o[key] = v
-            return v
-        return cached_set(o1, key) & cached_set(o2, key)
-
-    def intersect_with_spec(key, o1, o2):
-        # store as set of (spec, impl) tuple
-        def cached_set(o):
-            def to_spec_impl_tuples(values):
-                for v in values:
-                    spec, _, impl = v.partition(':')
-                    yield spec, impl or spec
-            v = o[key]
-            if not isinstance(v, set):
-                v = set(to_spec_impl_tuples(set(v)))
-                o[key] = v
-            return v
-        for spec1, impl1 in cached_set(o1):
-            for spec2, impl2 in cached_set(o2):
-                if spec1 == spec2:
-                    name = impl1 if impl1 == impl2 else '%s-%s' % (impl1, impl2)
-                    yield name, impl1, impl2
-
-    def maybe_max(key, o1, o2, default):
-        """maximum of two if present, otherwise defult value"""
-        v1 = o1.get(key)
-        v2 = o2.get(key)
-        return max(v1, v2) if v1 and v2 else v1 or v2 or default
-
-    def filter_with_validkeys(o):
-        ret = {}
-        for key in VALID_JSON_KEYS:
-            if key in o:
-                ret[key] = o[key]
-        return ret
-
-    def merge_metadata(o, **ret):
-        for key in VALID_JSON_KEYS:
-            if key in o:
-                ret[key] = o[key]
-        return ret
-
-    for sv, cl in product(servers, clients):
-        for proto, proto1, proto2 in intersect_with_spec('protocols', sv, cl):
-            for trans, trans1, trans2 in intersect_with_spec('transports', sv, cl):
-                for sock in intersection('sockets', sv, cl):
-                    yield {
-                        'server': merge_metadata(sv, **{'protocol': proto1, 'transport': trans1}),
-                        'client': merge_metadata(cl, **{'protocol': proto2, 'transport': trans2}),
-                        'delay': maybe_max('delay', sv, cl, DEFAULT_MAX_DELAY),
-                        'timeout': maybe_max('timeout', sv, cl, DEFAULT_TIMEOUT),
-                        'protocol': proto,
-                        'transport': trans,
-                        'socket': sock
-                    }
-
-
-def _filter_entries(tests, regex):
-    if regex:
-        return filter(lambda t: re.search(regex, TestEntry.get_name(**t)), tests)
-    return tests
-
-
-def collect_cross_tests(tests_dict, server_match, client_match, regex):
-    sv, cl = _collect_testlibs(tests_dict, server_match, client_match)
-    return list(_filter_entries(_do_collect_tests(sv, cl), regex))
-
-
-def collect_feature_tests(tests_dict, features_dict, server_match, feature_match, regex):
-    sv, _ = _collect_testlibs(tests_dict, server_match)
-    ft = collect_features(features_dict, feature_match)
-    return list(_filter_entries(_do_collect_tests(sv, ft), regex))
diff --git a/vendor/git.apache.org/thrift.git/test/crossrunner/compat.py b/vendor/git.apache.org/thrift.git/test/crossrunner/compat.py
deleted file mode 100644
index f1ca91b..0000000
--- a/vendor/git.apache.org/thrift.git/test/crossrunner/compat.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import os
-import sys
-
-if sys.version_info[0] == 2:
-    _ENCODE = sys.getfilesystemencoding()
-
-    def path_join(*args):
-        bin_args = map(lambda a: a.decode(_ENCODE), args)
-        return os.path.join(*bin_args).encode(_ENCODE)
-
-    def str_join(s, l):
-        bin_args = map(lambda a: a.decode(_ENCODE), l)
-        b = s.decode(_ENCODE)
-        return b.join(bin_args).encode(_ENCODE)
-
-    logfile_open = open
-
-else:
-
-    path_join = os.path.join
-    str_join = str.join
-
-    def logfile_open(*args):
-        return open(*args, errors='replace')
diff --git a/vendor/git.apache.org/thrift.git/test/crossrunner/report.py b/vendor/git.apache.org/thrift.git/test/crossrunner/report.py
deleted file mode 100644
index cc5f26f..0000000
--- a/vendor/git.apache.org/thrift.git/test/crossrunner/report.py
+++ /dev/null
@@ -1,434 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from __future__ import print_function
-import datetime
-import json
-import multiprocessing
-import os
-import platform
-import re
-import subprocess
-import sys
-import time
-import traceback
-
-from .compat import logfile_open, path_join, str_join
-from .test import TestEntry
-
-LOG_DIR = 'log'
-RESULT_HTML = 'index.html'
-RESULT_JSON = 'results.json'
-FAIL_JSON = 'known_failures_%s.json'
-
-
-def generate_known_failures(testdir, overwrite, save, out):
-    def collect_failures(results):
-        success_index = 5
-        for r in results:
-            if not r[success_index]:
-                yield TestEntry.get_name(*r)
-    try:
-        with logfile_open(path_join(testdir, RESULT_JSON), 'r') as fp:
-            results = json.load(fp)
-    except IOError:
-        sys.stderr.write('Unable to load last result. Did you run tests ?\n')
-        return False
-    fails = collect_failures(results['results'])
-    if not overwrite:
-        known = load_known_failures(testdir)
-        known.extend(fails)
-        fails = known
-    fails_json = json.dumps(sorted(set(fails)), indent=2, separators=(',', ': '))
-    if save:
-        with logfile_open(os.path.join(testdir, FAIL_JSON % platform.system()), 'w+') as fp:
-            fp.write(fails_json)
-        sys.stdout.write('Successfully updated known failures.\n')
-    if out:
-        sys.stdout.write(fails_json)
-        sys.stdout.write('\n')
-    return True
-
-
-def load_known_failures(testdir):
-    try:
-        with logfile_open(path_join(testdir, FAIL_JSON % platform.system()), 'r') as fp:
-            return json.load(fp)
-    except IOError:
-        return []
-
-
-class TestReporter(object):
-    # Unfortunately, standard library doesn't handle timezone well
-    # DATETIME_FORMAT = '%a %b %d %H:%M:%S %Z %Y'
-    DATETIME_FORMAT = '%a %b %d %H:%M:%S %Y'
-
-    def __init__(self):
-        self._log = multiprocessing.get_logger()
-        self._lock = multiprocessing.Lock()
-
-    @classmethod
-    def test_logfile(cls, test_name, prog_kind, dir=None):
-        relpath = path_join('log', '%s_%s.log' % (test_name, prog_kind))
-        return relpath if not dir else os.path.realpath(path_join(dir, relpath))
-
-    def _start(self):
-        self._start_time = time.time()
-
-    @property
-    def _elapsed(self):
-        return time.time() - self._start_time
-
-    @classmethod
-    def _format_date(cls):
-        return '%s' % datetime.datetime.now().strftime(cls.DATETIME_FORMAT)
-
-    def _print_date(self):
-        print(self._format_date(), file=self.out)
-
-    def _print_bar(self, out=None):
-        print(
-            '==========================================================================',
-            file=(out or self.out))
-
-    def _print_exec_time(self):
-        print('Test execution took {:.1f} seconds.'.format(self._elapsed), file=self.out)
-
-
-class ExecReporter(TestReporter):
-    def __init__(self, testdir, test, prog):
-        super(ExecReporter, self).__init__()
-        self._test = test
-        self._prog = prog
-        self.logpath = self.test_logfile(test.name, prog.kind, testdir)
-        self.out = None
-
-    def begin(self):
-        self._start()
-        self._open()
-        if self.out and not self.out.closed:
-            self._print_header()
-        else:
-            self._log.debug('Output stream is not available.')
-
-    def end(self, returncode):
-        self._lock.acquire()
-        try:
-            if self.out and not self.out.closed:
-                self._print_footer(returncode)
-                self._close()
-                self.out = None
-            else:
-                self._log.debug('Output stream is not available.')
-        finally:
-            self._lock.release()
-
-    def killed(self):
-        print(file=self.out)
-        print('Server process is successfully killed.', file=self.out)
-        self.end(None)
-
-    def died(self):
-        print(file=self.out)
-        print('*** Server process has died unexpectedly ***', file=self.out)
-        self.end(None)
-
-    _init_failure_exprs = {
-        'server': list(map(re.compile, [
-            '[Aa]ddress already in use',
-            'Could not bind',
-            'EADDRINUSE',
-        ])),
-        'client': list(map(re.compile, [
-            '[Cc]onnection refused',
-            'Could not connect to localhost',
-            'ECONNREFUSED',
-            'No such file or directory',  # domain socket
-        ])),
-    }
-
-    def maybe_false_positive(self):
-        """Searches through log file for socket bind error.
-        Returns True if suspicious expression is found, otherwise False"""
-        try:
-            if self.out and not self.out.closed:
-                self.out.flush()
-            exprs = self._init_failure_exprs[self._prog.kind]
-
-            def match(line):
-                for expr in exprs:
-                    if expr.search(line):
-                        return True
-
-            with logfile_open(self.logpath, 'r') as fp:
-                if any(map(match, fp)):
-                    return True
-        except (KeyboardInterrupt, SystemExit):
-            raise
-        except Exception as ex:
-            self._log.warn('[%s]: Error while detecting false positive: %s' % (self._test.name, str(ex)))
-            self._log.info(traceback.print_exc())
-        return False
-
-    def _open(self):
-        self.out = logfile_open(self.logpath, 'w+')
-
-    def _close(self):
-        self.out.close()
-
-    def _print_header(self):
-        self._print_date()
-        print('Executing: %s' % str_join(' ', self._prog.command), file=self.out)
-        print('Directory: %s' % self._prog.workdir, file=self.out)
-        print('config:delay: %s' % self._test.delay, file=self.out)
-        print('config:timeout: %s' % self._test.timeout, file=self.out)
-        self._print_bar()
-        self.out.flush()
-
-    def _print_footer(self, returncode=None):
-        self._print_bar()
-        if returncode is not None:
-            print('Return code: %d' % returncode, file=self.out)
-        else:
-            print('Process is killed.', file=self.out)
-        self._print_exec_time()
-        self._print_date()
-
-
-class SummaryReporter(TestReporter):
-    def __init__(self, basedir, testdir_relative, concurrent=True):
-        super(SummaryReporter, self).__init__()
-        self._basedir = basedir
-        self._testdir_rel = testdir_relative
-        self.logdir = path_join(self.testdir, LOG_DIR)
-        self.out_path = path_join(self.testdir, RESULT_JSON)
-        self.concurrent = concurrent
-        self.out = sys.stdout
-        self._platform = platform.system()
-        self._revision = self._get_revision()
-        self._tests = []
-        if not os.path.exists(self.logdir):
-            os.mkdir(self.logdir)
-        self._known_failures = load_known_failures(self.testdir)
-        self._unexpected_success = []
-        self._flaky_success = []
-        self._unexpected_failure = []
-        self._expected_failure = []
-        self._print_header()
-
-    @property
-    def testdir(self):
-        return path_join(self._basedir, self._testdir_rel)
-
-    def _result_string(self, test):
-        if test.success:
-            if test.retry_count == 0:
-                return 'success'
-            elif test.retry_count == 1:
-                return 'flaky(1 retry)'
-            else:
-                return 'flaky(%d retries)' % test.retry_count
-        elif test.expired:
-            return 'failure(timeout)'
-        else:
-            return 'failure(%d)' % test.returncode
-
-    def _get_revision(self):
-        p = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'],
-                             cwd=self.testdir, stdout=subprocess.PIPE)
-        out, _ = p.communicate()
-        return out.strip()
-
-    def _format_test(self, test, with_result=True):
-        name = '%s-%s' % (test.server.name, test.client.name)
-        trans = '%s-%s' % (test.transport, test.socket)
-        if not with_result:
-            return '{:24s}{:13s}{:25s}'.format(name[:23], test.protocol[:12], trans[:24])
-        else:
-            return '{:24s}{:13s}{:25s}{:s}\n'.format(name[:23], test.protocol[:12], trans[:24], self._result_string(test))
-
-    def _print_test_header(self):
-        self._print_bar()
-        print(
-            '{:24s}{:13s}{:25s}{:s}'.format('server-client:', 'protocol:', 'transport:', 'result:'),
-            file=self.out)
-
-    def _print_header(self):
-        self._start()
-        print('Apache Thrift - Integration Test Suite', file=self.out)
-        self._print_date()
-        self._print_test_header()
-
-    def _print_unexpected_failure(self):
-        if len(self._unexpected_failure) > 0:
-            self.out.writelines([
-                '*** Following %d failures were unexpected ***:\n' % len(self._unexpected_failure),
-                'If it is introduced by you, please fix it before submitting the code.\n',
-                # 'If not, please report at https://issues.apache.org/jira/browse/THRIFT\n',
-            ])
-            self._print_test_header()
-            for i in self._unexpected_failure:
-                self.out.write(self._format_test(self._tests[i]))
-            self._print_bar()
-        else:
-            print('No unexpected failures.', file=self.out)
-
-    def _print_flaky_success(self):
-        if len(self._flaky_success) > 0:
-            print(
-                'Following %d tests were expected to cleanly succeed but needed retry:' % len(self._flaky_success),
-                file=self.out)
-            self._print_test_header()
-            for i in self._flaky_success:
-                self.out.write(self._format_test(self._tests[i]))
-            self._print_bar()
-
-    def _print_unexpected_success(self):
-        if len(self._unexpected_success) > 0:
-            print(
-                'Following %d tests were known to fail but succeeded (maybe flaky):' % len(self._unexpected_success),
-                file=self.out)
-            self._print_test_header()
-            for i in self._unexpected_success:
-                self.out.write(self._format_test(self._tests[i]))
-            self._print_bar()
-
-    def _http_server_command(self, port):
-        if sys.version_info[0] < 3:
-            return 'python -m SimpleHTTPServer %d' % port
-        else:
-            return 'python -m http.server %d' % port
-
-    def _print_footer(self):
-        fail_count = len(self._expected_failure) + len(self._unexpected_failure)
-        self._print_bar()
-        self._print_unexpected_success()
-        self._print_flaky_success()
-        self._print_unexpected_failure()
-        self._write_html_data()
-        self._assemble_log('unexpected failures', self._unexpected_failure)
-        self._assemble_log('known failures', self._expected_failure)
-        self.out.writelines([
-            'You can browse results at:\n',
-            '\tfile://%s/%s\n' % (self.testdir, RESULT_HTML),
-            '# If you use Chrome, run:\n',
-            '# \tcd %s\n#\t%s\n' % (self._basedir, self._http_server_command(8001)),
-            '# then browse:\n',
-            '# \thttp://localhost:%d/%s/\n' % (8001, self._testdir_rel),
-            'Full log for each test is here:\n',
-            '\ttest/log/client_server_protocol_transport_client.log\n',
-            '\ttest/log/client_server_protocol_transport_server.log\n',
-            '%d failed of %d tests in total.\n' % (fail_count, len(self._tests)),
-        ])
-        self._print_exec_time()
-        self._print_date()
-
-    def _render_result(self, test):
-        return [
-            test.server.name,
-            test.client.name,
-            test.protocol,
-            test.transport,
-            test.socket,
-            test.success,
-            test.as_expected,
-            test.returncode,
-            {
-                'server': self.test_logfile(test.name, test.server.kind),
-                'client': self.test_logfile(test.name, test.client.kind),
-            },
-        ]
-
-    def _write_html_data(self):
-        """Writes JSON data to be read by result html"""
-        results = [self._render_result(r) for r in self._tests]
-        with logfile_open(self.out_path, 'w+') as fp:
-            fp.write(json.dumps({
-                'date': self._format_date(),
-                'revision': str(self._revision),
-                'platform': self._platform,
-                'duration': '{:.1f}'.format(self._elapsed),
-                'results': results,
-            }, indent=2))
-
-    def _assemble_log(self, title, indexes):
-        if len(indexes) > 0:
-            def add_prog_log(fp, test, prog_kind):
-                print('*************************** %s message ***************************' % prog_kind,
-                      file=fp)
-                path = self.test_logfile(test.name, prog_kind, self.testdir)
-                if os.path.exists(path):
-                    with logfile_open(path, 'r') as prog_fp:
-                        print(prog_fp.read(), file=fp)
-            filename = title.replace(' ', '_') + '.log'
-            with logfile_open(os.path.join(self.logdir, filename), 'w+') as fp:
-                for test in map(self._tests.__getitem__, indexes):
-                    fp.write('TEST: [%s]\n' % test.name)
-                    add_prog_log(fp, test, test.server.kind)
-                    add_prog_log(fp, test, test.client.kind)
-                    fp.write('**********************************************************************\n\n')
-            print('%s are logged to %s/%s/%s' % (title.capitalize(), self._testdir_rel, LOG_DIR, filename))
-
-    def end(self):
-        self._print_footer()
-        return len(self._unexpected_failure) == 0
-
-    def add_test(self, test_dict):
-        test = TestEntry(self.testdir, **test_dict)
-        self._lock.acquire()
-        try:
-            if not self.concurrent:
-                self.out.write(self._format_test(test, False))
-                self.out.flush()
-            self._tests.append(test)
-            return len(self._tests) - 1
-        finally:
-            self._lock.release()
-
-    def add_result(self, index, returncode, expired, retry_count):
-        self._lock.acquire()
-        try:
-            failed = returncode is None or returncode != 0
-            flaky = not failed and retry_count != 0
-            test = self._tests[index]
-            known = test.name in self._known_failures
-            if failed:
-                if known:
-                    self._log.debug('%s failed as expected' % test.name)
-                    self._expected_failure.append(index)
-                else:
-                    self._log.info('unexpected failure: %s' % test.name)
-                    self._unexpected_failure.append(index)
-            elif flaky and not known:
-                self._log.info('unexpected flaky success: %s' % test.name)
-                self._flaky_success.append(index)
-            elif not flaky and known:
-                self._log.info('unexpected success: %s' % test.name)
-                self._unexpected_success.append(index)
-            test.success = not failed
-            test.returncode = returncode
-            test.retry_count = retry_count
-            test.expired = expired
-            test.as_expected = known == failed
-            if not self.concurrent:
-                self.out.write(self._result_string(test) + '\n')
-            else:
-                self.out.write(self._format_test(test))
-        finally:
-            self._lock.release()
diff --git a/vendor/git.apache.org/thrift.git/test/crossrunner/run.py b/vendor/git.apache.org/thrift.git/test/crossrunner/run.py
deleted file mode 100644
index f522bb1..0000000
--- a/vendor/git.apache.org/thrift.git/test/crossrunner/run.py
+++ /dev/null
@@ -1,389 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import contextlib
-import multiprocessing
-import multiprocessing.managers
-import os
-import platform
-import random
-import signal
-import socket
-import subprocess
-import sys
-import threading
-import time
-
-from .compat import str_join
-from .test import TestEntry, domain_socket_path
-from .report import ExecReporter, SummaryReporter
-
-RESULT_TIMEOUT = 128
-RESULT_ERROR = 64
-
-# globals
-ports = None
-stop = None
-
-
-class ExecutionContext(object):
-    def __init__(self, cmd, cwd, env, report):
-        self._log = multiprocessing.get_logger()
-        self.report = report
-        self.cmd = cmd
-        self.cwd = cwd
-        self.env = env
-        self.timer = None
-        self.expired = False
-        self.killed = False
-        self.proc = None
-
-    def _expire(self):
-        self._log.info('Timeout')
-        self.expired = True
-        self.kill()
-
-    def kill(self):
-        self._log.debug('Killing process : %d' % self.proc.pid)
-        self.killed = True
-        if platform.system() != 'Windows':
-            try:
-                os.killpg(self.proc.pid, signal.SIGKILL)
-            except Exception:
-                self._log.info('Failed to kill process group', exc_info=sys.exc_info())
-        try:
-            self.proc.kill()
-        except Exception:
-            self._log.info('Failed to kill process', exc_info=sys.exc_info())
-
-    def _popen_args(self):
-        args = {
-            'cwd': self.cwd,
-            'env': self.env,
-            'stdout': self.report.out,
-            'stderr': subprocess.STDOUT,
-        }
-        # make sure child processes doesn't remain after killing
-        if platform.system() == 'Windows':
-            DETACHED_PROCESS = 0x00000008
-            args.update(creationflags=DETACHED_PROCESS | subprocess.CREATE_NEW_PROCESS_GROUP)
-        else:
-            args.update(preexec_fn=os.setsid)
-        return args
-
-    def start(self, timeout=0):
-        joined = str_join(' ', self.cmd)
-        self._log.debug('COMMAND: %s', joined)
-        self._log.debug('WORKDIR: %s', self.cwd)
-        self._log.debug('LOGFILE: %s', self.report.logpath)
-        self.report.begin()
-        self.proc = subprocess.Popen(self.cmd, **self._popen_args())
-        if timeout > 0:
-            self.timer = threading.Timer(timeout, self._expire)
-            self.timer.start()
-        return self._scoped()
-
-    @contextlib.contextmanager
-    def _scoped(self):
-        yield self
-        self._log.debug('Killing scoped process')
-        if self.proc.poll() is None:
-            self.kill()
-            self.report.killed()
-        else:
-            self._log.debug('Process died unexpectedly')
-            self.report.died()
-
-    def wait(self):
-        self.proc.communicate()
-        if self.timer:
-            self.timer.cancel()
-        self.report.end(self.returncode)
-
-    @property
-    def returncode(self):
-        return self.proc.returncode if self.proc else None
-
-
-def exec_context(port, logdir, test, prog):
-    report = ExecReporter(logdir, test, prog)
-    prog.build_command(port)
-    return ExecutionContext(prog.command, prog.workdir, prog.env, report)
-
-
-def run_test(testdir, logdir, test_dict, max_retry, async=True):
-    logger = multiprocessing.get_logger()
-
-    def ensure_socket_open(proc, port, max_delay):
-        sleeped = 0.1
-        time.sleep(sleeped)
-        sleep_step = 0.2
-        while True:
-            # Create sockets every iteration because refused sockets cannot be
-            # reused on some systems.
-            sock4 = socket.socket()
-            sock6 = socket.socket(family=socket.AF_INET6)
-            try:
-                if sock4.connect_ex(('127.0.0.1', port)) == 0 \
-                        or sock6.connect_ex(('::1', port)) == 0:
-                    return True
-                if proc.poll() is not None:
-                    logger.warn('server process is exited')
-                    return False
-                if sleeped > max_delay:
-                    logger.warn('sleeped for %f seconds but server port is not open' % sleeped)
-                    return False
-                time.sleep(sleep_step)
-                sleeped += sleep_step
-            finally:
-                sock4.close()
-                sock6.close()
-        logger.debug('waited %f sec for server port open' % sleeped)
-        return True
-
-    try:
-        max_bind_retry = 3
-        retry_count = 0
-        bind_retry_count = 0
-        test = TestEntry(testdir, **test_dict)
-        while True:
-            if stop.is_set():
-                logger.debug('Skipping because shutting down')
-                return (retry_count, None)
-            logger.debug('Start')
-            with PortAllocator.alloc_port_scoped(ports, test.socket) as port:
-                logger.debug('Start with port %d' % port)
-                sv = exec_context(port, logdir, test, test.server)
-                cl = exec_context(port, logdir, test, test.client)
-
-                logger.debug('Starting server')
-                with sv.start():
-                    if test.socket in ('domain', 'abstract'):
-                        time.sleep(0.1)
-                        port_ok = True
-                    else:
-                        port_ok = ensure_socket_open(sv.proc, port, test.delay)
-                    if port_ok:
-                        connect_retry_count = 0
-                        max_connect_retry = 3
-                        connect_retry_wait = 0.5
-                        while True:
-                            if sv.proc.poll() is not None:
-                                logger.info('not starting client because server process is absent')
-                                break
-                            logger.debug('Starting client')
-                            cl.start(test.timeout)
-                            logger.debug('Waiting client')
-                            cl.wait()
-                            if not cl.report.maybe_false_positive() or connect_retry_count >= max_connect_retry:
-                                if connect_retry_count > 0 and connect_retry_count < max_connect_retry:
-                                    logger.warn('[%s]: Connected after %d retry (%.2f sec each)' % (test.server.name, connect_retry_count, connect_retry_wait))
-                                # Wait for 50ms to see if server does not die at the end.
-                                time.sleep(0.05)
-                                break
-                            logger.debug('Server may not be ready, waiting %.2f second...' % connect_retry_wait)
-                            time.sleep(connect_retry_wait)
-                            connect_retry_count += 1
-
-            if sv.report.maybe_false_positive() and bind_retry_count < max_bind_retry:
-                logger.warn('[%s]: Detected socket bind failure, retrying...', test.server.name)
-                bind_retry_count += 1
-            else:
-                if cl.expired:
-                    result = RESULT_TIMEOUT
-                else:
-                    result = cl.proc.returncode if cl.proc else RESULT_ERROR
-                    if not sv.killed:
-                        # Server died without being killed.
-                        result |= RESULT_ERROR
-
-                if result == 0 or retry_count >= max_retry:
-                    return (retry_count, result)
-                else:
-                    logger.info('[%s-%s]: test failed, retrying...', test.server.name, test.client.name)
-                    retry_count += 1
-    except Exception:
-        if not async:
-            raise
-        logger.warn('Error executing [%s]', test.name, exc_info=True)
-        return (retry_count, RESULT_ERROR)
-    except:
-        logger.info('Interrupted execution', exc_info=True)
-        if not async:
-            raise
-        stop.set()
-        return (retry_count, RESULT_ERROR)
-
-
-class PortAllocator(object):
-    def __init__(self):
-        self._log = multiprocessing.get_logger()
-        self._lock = multiprocessing.Lock()
-        self._ports = set()
-        self._dom_ports = set()
-        self._last_alloc = 0
-
-    def _get_tcp_port(self):
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        sock.bind(('', 0))
-        port = sock.getsockname()[1]
-        self._lock.acquire()
-        try:
-            ok = port not in self._ports
-            if ok:
-                self._ports.add(port)
-                self._last_alloc = time.time()
-        finally:
-            self._lock.release()
-            sock.close()
-        return port if ok else self._get_tcp_port()
-
-    def _get_domain_port(self):
-        port = random.randint(1024, 65536)
-        self._lock.acquire()
-        try:
-            ok = port not in self._dom_ports
-            if ok:
-                self._dom_ports.add(port)
-        finally:
-            self._lock.release()
-        return port if ok else self._get_domain_port()
-
-    def alloc_port(self, socket_type):
-        if socket_type in ('domain', 'abstract'):
-            return self._get_domain_port()
-        else:
-            return self._get_tcp_port()
-
-    # static method for inter-process invokation
-    @staticmethod
-    @contextlib.contextmanager
-    def alloc_port_scoped(allocator, socket_type):
-        port = allocator.alloc_port(socket_type)
-        yield port
-        allocator.free_port(socket_type, port)
-
-    def free_port(self, socket_type, port):
-        self._log.debug('free_port')
-        self._lock.acquire()
-        try:
-            if socket_type == 'domain':
-                self._dom_ports.remove(port)
-                path = domain_socket_path(port)
-                if os.path.exists(path):
-                    os.remove(path)
-            elif socket_type == 'abstract':
-                self._dom_ports.remove(port)
-            else:
-                self._ports.remove(port)
-        except IOError:
-            self._log.info('Error while freeing port', exc_info=sys.exc_info())
-        finally:
-            self._lock.release()
-
-
-class NonAsyncResult(object):
-    def __init__(self, value):
-        self._value = value
-
-    def get(self, timeout=None):
-        return self._value
-
-    def wait(self, timeout=None):
-        pass
-
-    def ready(self):
-        return True
-
-    def successful(self):
-        return self._value == 0
-
-
-class TestDispatcher(object):
-    def __init__(self, testdir, basedir, logdir_rel, concurrency):
-        self._log = multiprocessing.get_logger()
-        self.testdir = testdir
-        self._report = SummaryReporter(basedir, logdir_rel, concurrency > 1)
-        self.logdir = self._report.testdir
-        # seems needed for python 2.x to handle keyboard interrupt
-        self._stop = multiprocessing.Event()
-        self._async = concurrency > 1
-        if not self._async:
-            self._pool = None
-            global stop
-            global ports
-            stop = self._stop
-            ports = PortAllocator()
-        else:
-            self._m = multiprocessing.managers.BaseManager()
-            self._m.register('ports', PortAllocator)
-            self._m.start()
-            self._pool = multiprocessing.Pool(concurrency, self._pool_init, (self._m.address,))
-        self._log.debug(
-            'TestDispatcher started with %d concurrent jobs' % concurrency)
-
-    def _pool_init(self, address):
-        global stop
-        global m
-        global ports
-        stop = self._stop
-        m = multiprocessing.managers.BaseManager(address)
-        m.connect()
-        ports = m.ports()
-
-    def _dispatch_sync(self, test, cont, max_retry):
-        r = run_test(self.testdir, self.logdir, test, max_retry, False)
-        cont(r)
-        return NonAsyncResult(r)
-
-    def _dispatch_async(self, test, cont, max_retry):
-        self._log.debug('_dispatch_async')
-        return self._pool.apply_async(func=run_test, args=(self.testdir, self.logdir, test, max_retry), callback=cont)
-
-    def dispatch(self, test, max_retry):
-        index = self._report.add_test(test)
-
-        def cont(result):
-            if not self._stop.is_set():
-                if result and len(result) == 2:
-                    retry_count, returncode = result
-                else:
-                    retry_count = 0
-                    returncode = RESULT_ERROR
-                self._log.debug('freeing port')
-                self._log.debug('adding result')
-                self._report.add_result(index, returncode, returncode == RESULT_TIMEOUT, retry_count)
-                self._log.debug('finish continuation')
-        fn = self._dispatch_async if self._async else self._dispatch_sync
-        return fn(test, cont, max_retry)
-
-    def wait(self):
-        if self._async:
-            self._pool.close()
-            self._pool.join()
-            self._m.shutdown()
-        return self._report.end()
-
-    def terminate(self):
-        self._stop.set()
-        if self._async:
-            self._pool.terminate()
-            self._pool.join()
-            self._m.shutdown()
diff --git a/vendor/git.apache.org/thrift.git/test/crossrunner/setup.cfg b/vendor/git.apache.org/thrift.git/test/crossrunner/setup.cfg
deleted file mode 100644
index 7da1f96..0000000
--- a/vendor/git.apache.org/thrift.git/test/crossrunner/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[flake8]
-max-line-length = 100
diff --git a/vendor/git.apache.org/thrift.git/test/crossrunner/test.py b/vendor/git.apache.org/thrift.git/test/crossrunner/test.py
deleted file mode 100644
index 74fd916..0000000
--- a/vendor/git.apache.org/thrift.git/test/crossrunner/test.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import copy
-import multiprocessing
-import os
-import sys
-from .compat import path_join
-from .util import merge_dict
-
-
-def domain_socket_path(port):
-    return '/tmp/ThriftTest.thrift.%d' % port
-
-
-class TestProgram(object):
-    def __init__(self, kind, name, protocol, transport, socket, workdir, command, env=None,
-                 extra_args=[], extra_args2=[], join_args=False, **kwargs):
-        self.kind = kind
-        self.name = name
-        self.protocol = protocol
-        self.transport = transport
-        self.socket = socket
-        self.workdir = workdir
-        self.command = None
-        self._base_command = self._fix_cmd_path(command)
-        if env:
-            self.env = copy.copy(os.environ)
-            self.env.update(env)
-        else:
-            self.env = os.environ
-        self._extra_args = extra_args
-        self._extra_args2 = extra_args2
-        self._join_args = join_args
-
-    def _fix_cmd_path(self, cmd):
-        # if the arg is a file in the current directory, make it path
-        def abs_if_exists(arg):
-            p = path_join(self.workdir, arg)
-            return p if os.path.exists(p) else arg
-
-        if cmd[0] == 'python':
-            cmd[0] = sys.executable
-        else:
-            cmd[0] = abs_if_exists(cmd[0])
-        return cmd
-
-    def _socket_args(self, socket, port):
-        return {
-            'ip-ssl': ['--ssl'],
-            'domain': ['--domain-socket=%s' % domain_socket_path(port)],
-            'abstract': ['--abstract-namespace', '--domain-socket=%s' % domain_socket_path(port)],
-        }.get(socket, None)
-
-    def build_command(self, port):
-        cmd = copy.copy(self._base_command)
-        args = copy.copy(self._extra_args2)
-        args.append('--protocol=' + self.protocol)
-        args.append('--transport=' + self.transport)
-        socket_args = self._socket_args(self.socket, port)
-        if socket_args:
-            args += socket_args
-        args.append('--port=%d' % port)
-        if self._join_args:
-            cmd.append('%s' % " ".join(args))
-        else:
-            cmd.extend(args)
-        if self._extra_args:
-            cmd.extend(self._extra_args)
-        self.command = cmd
-        return self.command
-
-
-class TestEntry(object):
-    def __init__(self, testdir, server, client, delay, timeout, **kwargs):
-        self.testdir = testdir
-        self._log = multiprocessing.get_logger()
-        self._config = kwargs
-        self.protocol = kwargs['protocol']
-        self.transport = kwargs['transport']
-        self.socket = kwargs['socket']
-        srv_dict = self._fix_workdir(merge_dict(self._config, server))
-        cli_dict = self._fix_workdir(merge_dict(self._config, client))
-        cli_dict['extra_args2'] = srv_dict.pop('remote_args', [])
-        srv_dict['extra_args2'] = cli_dict.pop('remote_args', [])
-        self.server = TestProgram('server', **srv_dict)
-        self.client = TestProgram('client', **cli_dict)
-        self.delay = delay
-        self.timeout = timeout
-        self._name = None
-        # results
-        self.success = None
-        self.as_expected = None
-        self.returncode = None
-        self.expired = False
-        self.retry_count = 0
-
-    def _fix_workdir(self, config):
-        key = 'workdir'
-        path = config.get(key, None)
-        if not path:
-            path = self.testdir
-        if os.path.isabs(path):
-            path = os.path.realpath(path)
-        else:
-            path = os.path.realpath(path_join(self.testdir, path))
-        config.update({key: path})
-        return config
-
-    @classmethod
-    def get_name(cls, server, client, protocol, transport, socket, *args, **kwargs):
-        return '%s-%s_%s_%s-%s' % (server, client, protocol, transport, socket)
-
-    @property
-    def name(self):
-        if not self._name:
-            self._name = self.get_name(
-                self.server.name, self.client.name, self.protocol, self.transport, self.socket)
-        return self._name
-
-    @property
-    def transport_name(self):
-        return '%s-%s' % (self.transport, self.socket)
-
-
-def test_name(server, client, protocol, transport, socket, **kwargs):
-    return TestEntry.get_name(server['name'], client['name'], protocol, transport, socket)
diff --git a/vendor/git.apache.org/thrift.git/test/crossrunner/util.py b/vendor/git.apache.org/thrift.git/test/crossrunner/util.py
deleted file mode 100644
index e2d195a..0000000
--- a/vendor/git.apache.org/thrift.git/test/crossrunner/util.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import copy
-
-
-def merge_dict(base, update):
-    """Update dict concatenating list values"""
-    res = copy.deepcopy(base)
-    for k, v in list(update.items()):
-        if k in list(res.keys()) and isinstance(v, list):
-            res[k].extend(v)
-        else:
-            res[k] = v
-    return res
diff --git a/vendor/git.apache.org/thrift.git/test/csharp/Makefile.am b/vendor/git.apache.org/thrift.git/test/csharp/Makefile.am
deleted file mode 100644
index 7aa332c..0000000
--- a/vendor/git.apache.org/thrift.git/test/csharp/Makefile.am
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-GENERATED = \
-	gen-csharp/Thrift/Test/Bonk.cs \
-	gen-csharp/Thrift/Test/Bools.cs \
-	gen-csharp/Thrift/Test/BoolTest.cs \
-	gen-csharp/Thrift/Test/CrazyNesting.cs \
-	gen-csharp/Thrift/Test/EmptyStruct.cs \
-	gen-csharp/Thrift/Test/GuessProtocolStruct.cs \
-	gen-csharp/Thrift/Test/Insanity.cs \
-	gen-csharp/Thrift/Test/LargeDeltas.cs \
-	gen-csharp/Thrift/Test/ListBonks.cs \
-	gen-csharp/Thrift/Test/ListTypeVersioningV1.cs \
-	gen-csharp/Thrift/Test/ListTypeVersioningV2.cs \
-	gen-csharp/Thrift/Test/NestedListsBonk.cs \
-	gen-csharp/Thrift/Test/NestedListsI32x2.cs \
-	gen-csharp/Thrift/Test/NestedListsI32x3.cs \
-	gen-csharp/Thrift/Test/NestedMixedx2.cs \
-	gen-csharp/Thrift/Test/Numberz.cs \
-	gen-csharp/Thrift/Test/OneField.cs \
-	gen-csharp/Thrift/Test/SecondService.cs \
-	gen-csharp/Thrift/Test/StructA.cs \
-	gen-csharp/Thrift/Test/StructB.cs \
-	gen-csharp/Thrift/Test/ThriftTest.Constants.cs \
-	gen-csharp/Thrift/Test/ThriftTest.cs \
-	gen-csharp/Thrift/Test/VersioningTestV1.cs \
-	gen-csharp/Thrift/Test/VersioningTestV2.cs \
-	gen-csharp/Thrift/Test/Xception.cs \
-	gen-csharp/Thrift/Test/Xception2.cs \
-	gen-csharp/Thrift/Test/Xtruct.cs \
-	gen-csharp/Thrift/Test/Xtruct2.cs \
-	gen-csharp/Thrift/Test/Xtruct3.cs
-
-BUILT_SOURCES = $(GENERATED)
-
-if MONO_MCS
-CSC = mcs
-else
-CSC = gmcs
-endif
-
-if NET_2_0
-CSC_DEFINES = -d:NET_2_0
-endif
-
-LIBDIR = $(top_builddir)/lib/csharp
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-$(GENERATED): $(top_srcdir)/test/ThriftTest.thrift $(THRIFT)
-	$(THRIFT) --gen csharp -o . $<
-
-precross: TestClientServer.exe
-
-ThriftImpl.dll: $(GENERATED) $(LIBDIR)/Thrift.dll
-	$(CSC) $(CSC_DEFINES) -t:library -out:$@ -reference:$(LIBDIR)/Thrift.dll $(GENERATED)
-
-SRCS = TestClient.cs TestServer.cs Program.cs
-
-TestClientServer.exe: $(SRCS) ThriftImpl.dll
-	$(CSC) $(CSC_DEFINES) -out:$@ -reference:$(LIBDIR)/Thrift.dll -reference:ThriftImpl.dll $(SRCS)
-
-clean-local:
-	$(RM) -rf gen-csharp *.exe *.dll
-
-TESTPORT = 9500
-check-local: TestClientServer.exe
-	MONO_PATH=$(LIBDIR) timeout 10 mono TestClientServer.exe server --port=$(TESTPORT) &
-	sleep 1
-	MONO_PATH=$(LIBDIR) mono TestClientServer.exe client --port=$(TESTPORT)
diff --git a/vendor/git.apache.org/thrift.git/test/csharp/Program.cs b/vendor/git.apache.org/thrift.git/test/csharp/Program.cs
deleted file mode 100644
index 8ec00e3..0000000
--- a/vendor/git.apache.org/thrift.git/test/csharp/Program.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Distributed under the Thrift Software License
-//
-// See accompanying file LICENSE or visit the Thrift site at:
-// http://developers.facebook.com/thrift/
-
-using System;
-using Thrift.Transport;
-using Thrift.Protocol;
-using Thrift.Test; //generated code
-
-namespace Test
-{
-    class Program
-    {
-        static int Main(string[] args)
-        {
-            if (args.Length == 0)
-            {
-                Console.WriteLine("must provide 'server' or 'client' arg");
-                return -1;
-            }
-
-            try
-            {
-                Console.SetBufferSize(Console.BufferWidth, 4096);
-            }
-            catch (Exception)
-            {
-                Console.WriteLine("Failed to grow scroll-back buffer");
-            }
-
-            string[] subArgs = new string[args.Length - 1];
-            for(int i = 1; i < args.Length; i++)
-            {
-                subArgs[i-1] = args[i];
-            }
-            if (args[0] == "client")
-            {
-                return TestClient.Execute(subArgs);
-            }
-            else if (args[0] == "server")
-            {
-                return TestServer.Execute(subArgs) ? 0 : 1;
-            }
-            else
-            {
-                Console.WriteLine("first argument must be 'server' or 'client'");
-            }
-            return 0;
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/test/csharp/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/test/csharp/Properties/AssemblyInfo.cs
deleted file mode 100644
index 504ca8d..0000000
--- a/vendor/git.apache.org/thrift.git/test/csharp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ThriftTest")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ThriftTest")]
-[assembly: AssemblyCopyright("Copyright © 2009 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f41b193b-f1ab-48ee-8843-f88e43084e26")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/vendor/git.apache.org/thrift.git/test/csharp/TestClient.cs b/vendor/git.apache.org/thrift.git/test/csharp/TestClient.cs
deleted file mode 100644
index 67673ec..0000000
--- a/vendor/git.apache.org/thrift.git/test/csharp/TestClient.cs
+++ /dev/null
@@ -1,836 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Linq;
-using System.Diagnostics;
-using System.Collections.Generic;
-using System.Threading;
-using System.Security.Cryptography.X509Certificates;
-using Thrift.Collections;
-using Thrift.Protocol;
-using Thrift.Transport;
-using Thrift.Test;
-using System.Security.Authentication;
-
-namespace Test
-{
-    public class TestClient
-    {
-        private class TestParams
-        {
-            public int numIterations = 1;
-            public string host = "localhost";
-            public int port = 9090;
-            public string url;
-            public string pipe;
-            public bool buffered;
-            public bool framed;
-            public string protocol;
-            public bool encrypted = false;
-            protected bool _isFirstTransport = true;
-
-
-            public TTransport CreateTransport()
-            {
-                if (url == null)
-                {
-                    // endpoint transport
-                    TTransport trans = null;
-                    if (pipe != null)
-                        trans = new TNamedPipeClientTransport(pipe);
-                    else
-                    {
-                        if (encrypted)
-                        {
-                            string certPath = "../keys/client.p12";
-                            X509Certificate cert = new X509Certificate2(certPath, "thrift");
-                            trans = new TTLSSocket(host, port, 0, cert, (o, c, chain, errors) => true, null, SslProtocols.Tls);
-                        }
-                        else
-                        {
-                            trans = new TSocket(host, port);
-                        }
-                    }
-
-                    // layered transport
-                    if (buffered)
-                        trans = new TBufferedTransport(trans);
-                    if (framed)
-                        trans = new TFramedTransport(trans);
-
-                    if (_isFirstTransport)
-                    {
-                        //ensure proper open/close of transport
-                        trans.Open();
-                        trans.Close();
-                        _isFirstTransport = false;
-                    }
-                    return trans;
-                }
-                else
-                {
-                    return new THttpClient(new Uri(url));
-                }
-            }
-
-            public TProtocol CreateProtocol(TTransport transport)
-            {
-                if (protocol == "compact")
-                    return new TCompactProtocol(transport);
-                else if (protocol == "json")
-                    return new TJSONProtocol(transport);
-                else
-                    return new TBinaryProtocol(transport);
-            }
-        };
-
-        private const int ErrorBaseTypes = 1;
-        private const int ErrorStructs = 2;
-        private const int ErrorContainers = 4;
-        private const int ErrorExceptions = 8;
-        private const int ErrorUnknown = 64;
-
-        private class ClientTest
-        {
-            private readonly TTransport transport;
-            private readonly ThriftTest.Client client;
-            private readonly int numIterations;
-            private bool done;
-
-            public int ReturnCode { get; set; }
-
-            public ClientTest(TestParams param)
-            {
-                transport = param.CreateTransport();
-                client = new ThriftTest.Client(param.CreateProtocol(transport));
-                numIterations = param.numIterations;
-            }
-            public void Execute()
-            {
-                if (done)
-                {
-                    Console.WriteLine("Execute called more than once");
-                    throw new InvalidOperationException();
-                }
-
-                for (int i = 0; i < numIterations; i++)
-                {
-                    try
-                    {
-                        if (!transport.IsOpen)
-                            transport.Open();
-                    }
-                    catch (TTransportException ex)
-                    {
-                        Console.WriteLine("*** FAILED ***");
-                        Console.WriteLine("Connect failed: " + ex.Message);
-                        ReturnCode |= ErrorUnknown;
-                        Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-                        continue;
-                    }
-
-                    try
-                    {
-                        ReturnCode |= ExecuteClientTest(client);
-                    }
-                    catch (Exception ex)
-                    {
-                        Console.WriteLine("*** FAILED ***");
-                        Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-                        ReturnCode |= ErrorUnknown;
-                    }
-                }
-                try
-                {
-                    transport.Close();
-                }
-                catch(Exception ex)
-                {
-                    Console.WriteLine("Error while closing transport");
-                    Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-                }
-                done = true;
-            }
-        }
-
-        public static int Execute(string[] args)
-        {
-            try
-            {
-                TestParams param = new TestParams();
-                int numThreads = 1;
-                try
-                {
-                    for (int i = 0; i < args.Length; i++)
-                    {
-                        if (args[i] == "-u")
-                        {
-                            param.url = args[++i];
-                        }
-                        else if (args[i] == "-n")
-                        {
-                            param.numIterations = Convert.ToInt32(args[++i]);
-                        }
-                        else if (args[i] == "-pipe")  // -pipe <name>
-                        {
-                            param.pipe = args[++i];
-                            Console.WriteLine("Using named pipes transport");
-                        }
-                        else if (args[i].Contains("--host="))
-                        {
-                            param.host = args[i].Substring(args[i].IndexOf("=") + 1);
-                        }
-                        else if (args[i].Contains("--port="))
-                        {
-                            param.port = int.Parse(args[i].Substring(args[i].IndexOf("=")+1));
-                        }
-                        else if (args[i] == "-b" || args[i] == "--buffered" || args[i] == "--transport=buffered")
-                        {
-                            param.buffered = true;
-                            Console.WriteLine("Using buffered sockets");
-                        }
-                        else if (args[i] == "-f" || args[i] == "--framed"  || args[i] == "--transport=framed")
-                        {
-                            param.framed = true;
-                            Console.WriteLine("Using framed transport");
-                        }
-                        else if (args[i] == "-t")
-                        {
-                            numThreads = Convert.ToInt32(args[++i]);
-                        }
-                        else if (args[i] == "--compact" || args[i] == "--protocol=compact")
-                        {
-                            param.protocol = "compact";
-                            Console.WriteLine("Using compact protocol");
-                        }
-                        else if (args[i] == "--json" || args[i] == "--protocol=json")
-                        {
-                            param.protocol = "json";
-                            Console.WriteLine("Using JSON protocol");
-                        }
-                        else if (args[i] == "--ssl")
-                        {
-                            param.encrypted = true;
-                            Console.WriteLine("Using encrypted transport");
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("*** FAILED ***");
-                    Console.WriteLine("Error while  parsing arguments");
-                    Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-                    return ErrorUnknown;
-                }
-
-                var tests = Enumerable.Range(0, numThreads).Select(_ => new ClientTest(param)).ToArray();
-                //issue tests on separate threads simultaneously
-                var threads = tests.Select(test => new Thread(test.Execute)).ToArray();
-                DateTime start = DateTime.Now;
-                foreach (var t in threads)
-                    t.Start();
-                foreach (var t in threads)
-                    t.Join();
-                Console.WriteLine("Total time: " + (DateTime.Now - start));
-                Console.WriteLine();
-                return tests.Select(t => t.ReturnCode).Aggregate((r1, r2) => r1 | r2);
-            }
-            catch (Exception outerEx)
-            {
-                Console.WriteLine("*** FAILED ***");
-                Console.WriteLine("Unexpected error");
-                Console.WriteLine(outerEx.Message + " ST: " + outerEx.StackTrace);
-                return ErrorUnknown;
-            }
-        }
-
-        public static string BytesToHex(byte[] data) {
-            return BitConverter.ToString(data).Replace("-", string.Empty);
-        }
-
-        public static byte[] PrepareTestData(bool randomDist)
-        {
-            byte[] retval = new byte[0x100];
-            int initLen = Math.Min(0x100,retval.Length);
-
-            // linear distribution, unless random is requested
-            if (!randomDist) {
-                for (var i = 0; i < initLen; ++i) {
-                    retval[i] = (byte)i;
-                }
-                return retval;
-            }
-
-            // random distribution
-            for (var i = 0; i < initLen; ++i) {
-                retval[i] = (byte)0;
-            }
-            var rnd = new Random();
-            for (var i = 1; i < initLen; ++i) {
-                while( true) {
-                    int nextPos = rnd.Next() % initLen;
-                    if (retval[nextPos] == 0) {
-                        retval[nextPos] = (byte)i;
-                        break;
-                    }
-                }
-            }
-            return retval;
-        }
-
-        public static int ExecuteClientTest(ThriftTest.Client client)
-        {
-            int returnCode = 0;
-
-            Console.Write("testVoid()");
-            client.testVoid();
-            Console.WriteLine(" = void");
-
-            Console.Write("testString(\"Test\")");
-            string s = client.testString("Test");
-            Console.WriteLine(" = \"" + s + "\"");
-            if ("Test" != s)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-
-            Console.Write("testBool(true)");
-            bool t = client.testBool((bool)true);
-            Console.WriteLine(" = " + t);
-            if (!t)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-            Console.Write("testBool(false)");
-            bool f = client.testBool((bool)false);
-            Console.WriteLine(" = " + f);
-            if (f)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-
-            Console.Write("testByte(1)");
-            sbyte i8 = client.testByte((sbyte)1);
-            Console.WriteLine(" = " + i8);
-            if (1 != i8)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-
-            Console.Write("testI32(-1)");
-            int i32 = client.testI32(-1);
-            Console.WriteLine(" = " + i32);
-            if (-1 != i32)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-
-            Console.Write("testI64(-34359738368)");
-            long i64 = client.testI64(-34359738368);
-            Console.WriteLine(" = " + i64);
-            if (-34359738368 != i64)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-
-            // TODO: Validate received message
-            Console.Write("testDouble(5.325098235)");
-            double dub = client.testDouble(5.325098235);
-            Console.WriteLine(" = " + dub);
-            if (5.325098235 != dub)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-            Console.Write("testDouble(-0.000341012439638598279)");
-            dub = client.testDouble(-0.000341012439638598279);
-            Console.WriteLine(" = " + dub);
-            if (-0.000341012439638598279 != dub)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-
-            byte[] binOut = PrepareTestData(true);
-            Console.Write("testBinary(" + BytesToHex(binOut) + ")");
-            try
-            {
-                byte[] binIn = client.testBinary(binOut);
-                Console.WriteLine(" = " + BytesToHex(binIn));
-                if (binIn.Length != binOut.Length)
-                {
-                    Console.WriteLine("*** FAILED ***");
-                    returnCode |= ErrorBaseTypes;
-                }
-                for (int ofs = 0; ofs < Math.Min(binIn.Length, binOut.Length); ++ofs)
-                    if (binIn[ofs] != binOut[ofs])
-                    {
-                        Console.WriteLine("*** FAILED ***");
-                        returnCode |= ErrorBaseTypes;
-                    }
-            }
-            catch (Thrift.TApplicationException ex)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-                Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-            }
-
-            // binary equals? only with hashcode option enabled ...
-            Console.WriteLine("Test CrazyNesting");
-            if( typeof(CrazyNesting).GetMethod("Equals").DeclaringType == typeof(CrazyNesting))
-            {
-                CrazyNesting one = new CrazyNesting();
-                CrazyNesting two = new CrazyNesting();
-                one.String_field = "crazy";
-                two.String_field = "crazy";
-                one.Binary_field = new byte[10] { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0xFF };
-                two.Binary_field = new byte[10] { 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0xFF };
-                if (!one.Equals(two))
-                {
-                    Console.WriteLine("*** FAILED ***");
-                    returnCode |= ErrorContainers;
-                    throw new Exception("CrazyNesting.Equals failed");
-                }
-            }
-
-            // TODO: Validate received message
-            Console.Write("testStruct({\"Zero\", 1, -3, -5})");
-            Xtruct o = new Xtruct();
-            o.String_thing = "Zero";
-            o.Byte_thing = (sbyte)1;
-            o.I32_thing = -3;
-            o.I64_thing = -5;
-            Xtruct i = client.testStruct(o);
-            Console.WriteLine(" = {\"" + i.String_thing + "\", " + i.Byte_thing + ", " + i.I32_thing + ", " + i.I64_thing + "}");
-
-            // TODO: Validate received message
-            Console.Write("testNest({1, {\"Zero\", 1, -3, -5}, 5})");
-            Xtruct2 o2 = new Xtruct2();
-            o2.Byte_thing = (sbyte)1;
-            o2.Struct_thing = o;
-            o2.I32_thing = 5;
-            Xtruct2 i2 = client.testNest(o2);
-            i = i2.Struct_thing;
-            Console.WriteLine(" = {" + i2.Byte_thing + ", {\"" + i.String_thing + "\", " + i.Byte_thing + ", " + i.I32_thing + ", " + i.I64_thing + "}, " + i2.I32_thing + "}");
-
-            Dictionary<int, int> mapout = new Dictionary<int, int>();
-            for (int j = 0; j < 5; j++)
-            {
-                mapout[j] = j - 10;
-            }
-            Console.Write("testMap({");
-            bool first = true;
-            foreach (int key in mapout.Keys)
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    Console.Write(", ");
-                }
-                Console.Write(key + " => " + mapout[key]);
-            }
-            Console.Write("})");
-
-            Dictionary<int, int> mapin = client.testMap(mapout);
-
-            Console.Write(" = {");
-            first = true;
-            foreach (int key in mapin.Keys)
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    Console.Write(", ");
-                }
-                Console.Write(key + " => " + mapin[key]);
-            }
-            Console.WriteLine("}");
-
-            // TODO: Validate received message
-            List<int> listout = new List<int>();
-            for (int j = -2; j < 3; j++)
-            {
-                listout.Add(j);
-            }
-            Console.Write("testList({");
-            first = true;
-            foreach (int j in listout)
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    Console.Write(", ");
-                }
-                Console.Write(j);
-            }
-            Console.Write("})");
-
-            List<int> listin = client.testList(listout);
-
-            Console.Write(" = {");
-            first = true;
-            foreach (int j in listin)
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    Console.Write(", ");
-                }
-                Console.Write(j);
-            }
-            Console.WriteLine("}");
-
-            //set
-            // TODO: Validate received message
-            THashSet<int> setout = new THashSet<int>();
-            for (int j = -2; j < 3; j++)
-            {
-                setout.Add(j);
-            }
-            Console.Write("testSet({");
-            first = true;
-            foreach (int j in setout)
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    Console.Write(", ");
-                }
-                Console.Write(j);
-            }
-            Console.Write("})");
-
-            THashSet<int> setin = client.testSet(setout);
-
-            Console.Write(" = {");
-            first = true;
-            foreach (int j in setin)
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    Console.Write(", ");
-                }
-                Console.Write(j);
-            }
-            Console.WriteLine("}");
-
-
-            Console.Write("testEnum(ONE)");
-            Numberz ret = client.testEnum(Numberz.ONE);
-            Console.WriteLine(" = " + ret);
-            if (Numberz.ONE != ret)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorStructs;
-            }
-
-            Console.Write("testEnum(TWO)");
-            ret = client.testEnum(Numberz.TWO);
-            Console.WriteLine(" = " + ret);
-            if (Numberz.TWO != ret)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorStructs;
-            }
-
-            Console.Write("testEnum(THREE)");
-            ret = client.testEnum(Numberz.THREE);
-            Console.WriteLine(" = " + ret);
-            if (Numberz.THREE != ret)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorStructs;
-            }
-
-            Console.Write("testEnum(FIVE)");
-            ret = client.testEnum(Numberz.FIVE);
-            Console.WriteLine(" = " + ret);
-            if (Numberz.FIVE != ret)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorStructs;
-            }
-
-            Console.Write("testEnum(EIGHT)");
-            ret = client.testEnum(Numberz.EIGHT);
-            Console.WriteLine(" = " + ret);
-            if (Numberz.EIGHT != ret)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorStructs;
-            }
-
-            Console.Write("testTypedef(309858235082523)");
-            long uid = client.testTypedef(309858235082523L);
-            Console.WriteLine(" = " + uid);
-            if (309858235082523L != uid)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorStructs;
-            }
-
-            // TODO: Validate received message
-            Console.Write("testMapMap(1)");
-            Dictionary<int, Dictionary<int, int>> mm = client.testMapMap(1);
-            Console.Write(" = {");
-            foreach (int key in mm.Keys)
-            {
-                Console.Write(key + " => {");
-                Dictionary<int, int> m2 = mm[key];
-                foreach (int k2 in m2.Keys)
-                {
-                    Console.Write(k2 + " => " + m2[k2] + ", ");
-                }
-                Console.Write("}, ");
-            }
-            Console.WriteLine("}");
-
-            // TODO: Validate received message
-            Insanity insane = new Insanity();
-            insane.UserMap = new Dictionary<Numberz, long>();
-            insane.UserMap[Numberz.FIVE] = 5000L;
-            Xtruct truck = new Xtruct();
-            truck.String_thing = "Truck";
-            truck.Byte_thing = (sbyte)8;
-            truck.I32_thing = 8;
-            truck.I64_thing = 8;
-            insane.Xtructs = new List<Xtruct>();
-            insane.Xtructs.Add(truck);
-            Console.Write("testInsanity()");
-            Dictionary<long, Dictionary<Numberz, Insanity>> whoa = client.testInsanity(insane);
-            Console.Write(" = {");
-            foreach (long key in whoa.Keys)
-            {
-                Dictionary<Numberz, Insanity> val = whoa[key];
-                Console.Write(key + " => {");
-
-                foreach (Numberz k2 in val.Keys)
-                {
-                    Insanity v2 = val[k2];
-
-                    Console.Write(k2 + " => {");
-                    Dictionary<Numberz, long> userMap = v2.UserMap;
-
-                    Console.Write("{");
-                    if (userMap != null)
-                    {
-                        foreach (Numberz k3 in userMap.Keys)
-                        {
-                            Console.Write(k3 + " => " + userMap[k3] + ", ");
-                        }
-                    }
-                    else
-                    {
-                        Console.Write("null");
-                    }
-                    Console.Write("}, ");
-
-                    List<Xtruct> xtructs = v2.Xtructs;
-
-                    Console.Write("{");
-                    if (xtructs != null)
-                    {
-                        foreach (Xtruct x in xtructs)
-                        {
-                            Console.Write("{\"" + x.String_thing + "\", " + x.Byte_thing + ", " + x.I32_thing + ", " + x.I32_thing + "}, ");
-                        }
-                    }
-                    else
-                    {
-                        Console.Write("null");
-                    }
-                    Console.Write("}");
-
-                    Console.Write("}, ");
-                }
-                Console.Write("}, ");
-            }
-            Console.WriteLine("}");
-
-            sbyte arg0 = 1;
-            int arg1 = 2;
-            long arg2 = long.MaxValue;
-            Dictionary<short, string> multiDict = new Dictionary<short, string>();
-            multiDict[1] = "one";
-            Numberz arg4 = Numberz.FIVE;
-            long arg5 = 5000000;
-            Console.Write("Test Multi(" + arg0 + "," + arg1 + "," + arg2 + "," + multiDict + "," + arg4 + "," + arg5 + ")");
-            Xtruct multiResponse = client.testMulti(arg0, arg1, arg2, multiDict, arg4, arg5);
-            Console.Write(" = Xtruct(byte_thing:" + multiResponse.Byte_thing + ",String_thing:" + multiResponse.String_thing
-                        + ",i32_thing:" + multiResponse.I32_thing + ",i64_thing:" + multiResponse.I64_thing + ")\n");
-
-            try
-            {
-                Console.WriteLine("testException(\"Xception\")");
-                client.testException("Xception");
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-            }
-            catch (Xception ex)
-            {
-                if (ex.ErrorCode != 1001 || ex.Message != "Xception")
-                {
-                    Console.WriteLine("*** FAILED ***");
-                    returnCode |= ErrorExceptions;
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-                Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-            }
-            try
-            {
-                Console.WriteLine("testException(\"TException\")");
-                client.testException("TException");
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-            }
-            catch (Thrift.TException)
-            {
-                // OK
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-                Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-            }
-            try
-            {
-                Console.WriteLine("testException(\"ok\")");
-                client.testException("ok");
-                // OK
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-                Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-            }
-
-            try
-            {
-                Console.WriteLine("testMultiException(\"Xception\", ...)");
-                client.testMultiException("Xception", "ignore");
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-            }
-            catch (Xception ex)
-            {
-                if (ex.ErrorCode != 1001 || ex.Message != "This is an Xception")
-                {
-                    Console.WriteLine("*** FAILED ***");
-                    returnCode |= ErrorExceptions;
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-                Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-            }
-            try
-            {
-                Console.WriteLine("testMultiException(\"Xception2\", ...)");
-                client.testMultiException("Xception2", "ignore");
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-            }
-            catch (Xception2 ex)
-            {
-                if (ex.ErrorCode != 2002 || ex.Struct_thing.String_thing != "This is an Xception2")
-                {
-                    Console.WriteLine("*** FAILED ***");
-                    returnCode |= ErrorExceptions;
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-                Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-            }
-            try
-            {
-                Console.WriteLine("testMultiException(\"success\", \"OK\")");
-                if ("OK" != client.testMultiException("success", "OK").String_thing)
-                {
-                    Console.WriteLine("*** FAILED ***");
-                    returnCode |= ErrorExceptions;
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorExceptions;
-                Console.WriteLine(ex.Message + " ST: " + ex.StackTrace);
-            }
-
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
-            Console.WriteLine("Test Oneway(1)");
-            client.testOneway(1);
-            sw.Stop();
-            if (sw.ElapsedMilliseconds > 1000)
-            {
-                Console.WriteLine("*** FAILED ***");
-                returnCode |= ErrorBaseTypes;
-            }
-
-            Console.Write("Test Calltime()");
-            var times = 50;
-            sw.Reset();
-            sw.Start();
-            for (int k = 0; k < times; ++k)
-                client.testVoid();
-            sw.Stop();
-            Console.WriteLine(" = {0} ms a testVoid() call", sw.ElapsedMilliseconds / times);
-            return returnCode;
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/test/csharp/TestServer.cs b/vendor/git.apache.org/thrift.git/test/csharp/TestServer.cs
deleted file mode 100644
index a9af715..0000000
--- a/vendor/git.apache.org/thrift.git/test/csharp/TestServer.cs
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Distributed under the Thrift Software License
-//
-// See accompanying file LICENSE or visit the Thrift site at:
-// http://developers.facebook.com/thrift/
-using System;
-using System.Collections.Generic;
-using System.Security.Cryptography.X509Certificates;
-using Thrift.Collections;
-using Thrift.Test; //generated code
-using Thrift.Transport;
-using Thrift.Protocol;
-using Thrift.Server;
-using Thrift;
-using System.Threading;
-using System.Text;
-using System.Security.Authentication;
-
-namespace Test
-{
-    public class TestServer
-    {
-        public static int _clientID = -1;
-        public delegate void TestLogDelegate(string msg, params object[] values);
-
-    public class TradeServerEventHandler : TServerEventHandler
-    {
-      public int callCount = 0;
-      public void preServe()
-      {
-        callCount++;
-      }
-      public Object createContext(Thrift.Protocol.TProtocol input, Thrift.Protocol.TProtocol output)
-      {
-        callCount++;
-        return null;
-      }
-      public void deleteContext(Object serverContext, Thrift.Protocol.TProtocol input, Thrift.Protocol.TProtocol output)
-      {
-        callCount++;
-      }
-      public void processContext(Object serverContext, Thrift.Transport.TTransport transport)
-      {
-        callCount++;
-      }
-    };
-
-        public class TestHandler : ThriftTest.Iface, Thrift.TControllingHandler
-        {
-            public TServer server { get; set; }
-            private int handlerID;
-            private StringBuilder reusableStringBuilder = new StringBuilder();
-            private TestLogDelegate testLogDelegate;
-
-            public TestHandler()
-            {
-                handlerID = Interlocked.Increment(ref _clientID);
-                testLogDelegate += testConsoleLogger;
-                testLogDelegate.Invoke("New TestHandler instance created");
-            }
-
-            public void testConsoleLogger(string msg, params object[] values)
-            {
-                reusableStringBuilder.Clear();
-                reusableStringBuilder.AppendFormat("handler{0:D3}:",handlerID);
-                reusableStringBuilder.AppendFormat(msg, values);
-                reusableStringBuilder.AppendLine();
-                Console.Write( reusableStringBuilder.ToString() );
-            }
-
-            public void testVoid()
-            {
-                testLogDelegate.Invoke("testVoid()");
-            }
-
-            public string testString(string thing)
-            {
-                testLogDelegate.Invoke("testString({0})", thing);
-                return thing;
-            }
-
-            public bool testBool(bool thing)
-            {
-                testLogDelegate.Invoke("testBool({0})", thing);
-                return thing;
-            }
-
-            public sbyte testByte(sbyte thing)
-            {
-                testLogDelegate.Invoke("testByte({0})", thing);
-                return thing;
-            }
-
-            public int testI32(int thing)
-            {
-                testLogDelegate.Invoke("testI32({0})", thing);
-                return thing;
-            }
-
-            public long testI64(long thing)
-            {
-                testLogDelegate.Invoke("testI64({0})", thing);
-                return thing;
-            }
-
-            public double testDouble(double thing)
-            {
-                testLogDelegate.Invoke("testDouble({0})", thing);
-                return thing;
-            }
-
-            public byte[] testBinary(byte[] thing)
-            {
-                string hex = BitConverter.ToString(thing).Replace("-", string.Empty);
-                testLogDelegate.Invoke("testBinary({0:X})", hex);
-                return thing;
-            }
-
-            public Xtruct testStruct(Xtruct thing)
-            {
-                testLogDelegate.Invoke("testStruct({{\"{0}\", {1}, {2}, {3}}})", thing.String_thing, thing.Byte_thing, thing.I32_thing, thing.I64_thing);
-                return thing;
-            }
-
-            public Xtruct2 testNest(Xtruct2 nest)
-            {
-                Xtruct thing = nest.Struct_thing;
-                testLogDelegate.Invoke("testNest({{{0}, {{\"{1}\", {2}, {3}, {4}, {5}}}}})",
-                                 nest.Byte_thing,
-                                 thing.String_thing,
-                                 thing.Byte_thing,
-                                 thing.I32_thing,
-                                 thing.I64_thing,
-                                 nest.I32_thing);
-                return nest;
-            }
-
-            public Dictionary<int, int> testMap(Dictionary<int, int> thing)
-            {
-                reusableStringBuilder.Clear();
-                reusableStringBuilder.Append("testMap({{");
-                bool first = true;
-                foreach (int key in thing.Keys)
-                {
-                    if (first)
-                    {
-                        first = false;
-                    }
-                    else
-                    {
-                        reusableStringBuilder.Append(", ");
-                    }
-                    reusableStringBuilder.AppendFormat("{0} => {1}", key, thing[key]);
-                }
-                reusableStringBuilder.Append("}})");
-                testLogDelegate.Invoke(reusableStringBuilder.ToString());
-                return thing;
-            }
-
-            public Dictionary<string, string> testStringMap(Dictionary<string, string> thing)
-            {
-                reusableStringBuilder.Clear();
-                reusableStringBuilder.Append("testStringMap({{");
-                bool first = true;
-                foreach (string key in thing.Keys)
-                {
-                    if (first)
-                    {
-                        first = false;
-                    }
-                    else
-                    {
-                        reusableStringBuilder.Append(", ");
-                    }
-                    reusableStringBuilder.AppendFormat("{0} => {1}", key, thing[key]);
-                }
-                reusableStringBuilder.Append("}})");
-                testLogDelegate.Invoke(reusableStringBuilder.ToString());
-                return thing;
-            }
-
-            public THashSet<int> testSet(THashSet<int> thing)
-            {
-                reusableStringBuilder.Clear();
-                reusableStringBuilder.Append("testSet({{");
-                bool first = true;
-                foreach (int elem in thing)
-                {
-                    if (first)
-                    {
-                        first = false;
-                    }
-                    else
-                    {
-                        reusableStringBuilder.Append(", ");
-                    }
-                    reusableStringBuilder.AppendFormat("{0}", elem);
-                }
-                reusableStringBuilder.Append("}})");
-                testLogDelegate.Invoke(reusableStringBuilder.ToString());
-                return thing;
-            }
-
-            public List<int> testList(List<int> thing)
-            {
-                reusableStringBuilder.Clear();
-                reusableStringBuilder.Append("testList({{");
-                bool first = true;
-                foreach (int elem in thing)
-                {
-                    if (first)
-                    {
-                        first = false;
-                    }
-                    else
-                    {
-                        reusableStringBuilder.Append(", ");
-                    }
-                    reusableStringBuilder.AppendFormat("{0}", elem);
-                }
-                reusableStringBuilder.Append("}})");
-                testLogDelegate.Invoke(reusableStringBuilder.ToString());
-                return thing;
-            }
-
-            public Numberz testEnum(Numberz thing)
-            {
-                testLogDelegate.Invoke("testEnum({0})", thing);
-                return thing;
-            }
-
-            public long testTypedef(long thing)
-            {
-                testLogDelegate.Invoke("testTypedef({0})", thing);
-                return thing;
-            }
-
-            public Dictionary<int, Dictionary<int, int>> testMapMap(int hello)
-            {
-                testLogDelegate.Invoke("testMapMap({0})", hello);
-                Dictionary<int, Dictionary<int, int>> mapmap =
-                  new Dictionary<int, Dictionary<int, int>>();
-
-                Dictionary<int, int> pos = new Dictionary<int, int>();
-                Dictionary<int, int> neg = new Dictionary<int, int>();
-                for (int i = 1; i < 5; i++)
-                {
-                    pos[i] = i;
-                    neg[-i] = -i;
-                }
-
-                mapmap[4] = pos;
-                mapmap[-4] = neg;
-
-                return mapmap;
-            }
-
-            public Dictionary<long, Dictionary<Numberz, Insanity>> testInsanity(Insanity argument)
-            {
-                testLogDelegate.Invoke("testInsanity()");
-
-                Xtruct hello = new Xtruct();
-                hello.String_thing = "Hello2";
-                hello.Byte_thing = 2;
-                hello.I32_thing = 2;
-                hello.I64_thing = 2;
-
-                Xtruct goodbye = new Xtruct();
-                goodbye.String_thing = "Goodbye4";
-                goodbye.Byte_thing = (sbyte)4;
-                goodbye.I32_thing = 4;
-                goodbye.I64_thing = (long)4;
-
-                Insanity crazy = new Insanity();
-                crazy.UserMap = new Dictionary<Numberz, long>();
-                crazy.UserMap[Numberz.EIGHT] = (long)8;
-                crazy.Xtructs = new List<Xtruct>();
-                crazy.Xtructs.Add(goodbye);
-
-                Insanity looney = new Insanity();
-                crazy.UserMap[Numberz.FIVE] = (long)5;
-                crazy.Xtructs.Add(hello);
-
-                Dictionary<Numberz, Insanity> first_map = new Dictionary<Numberz, Insanity>();
-                Dictionary<Numberz, Insanity> second_map = new Dictionary<Numberz, Insanity>(); ;
-
-                first_map[Numberz.TWO] = crazy;
-                first_map[Numberz.THREE] = crazy;
-
-                second_map[Numberz.SIX] = looney;
-
-                Dictionary<long, Dictionary<Numberz, Insanity>> insane =
-                  new Dictionary<long, Dictionary<Numberz, Insanity>>();
-                insane[(long)1] = first_map;
-                insane[(long)2] = second_map;
-
-                return insane;
-            }
-
-            public Xtruct testMulti(sbyte arg0, int arg1, long arg2, Dictionary<short, string> arg3, Numberz arg4, long arg5)
-            {
-                testLogDelegate.Invoke("testMulti()");
-
-                Xtruct hello = new Xtruct(); ;
-                hello.String_thing = "Hello2";
-                hello.Byte_thing = arg0;
-                hello.I32_thing = arg1;
-                hello.I64_thing = arg2;
-                return hello;
-            }
-
-            /**
-             * Print 'testException(%s)' with arg as '%s'
-             * @param string arg - a string indication what type of exception to throw
-             * if arg == "Xception" throw Xception with errorCode = 1001 and message = arg
-             * elsen if arg == "TException" throw TException
-             * else do not throw anything
-             */
-            public void testException(string arg)
-            {
-                testLogDelegate.Invoke("testException({0})", arg);
-                if (arg == "Xception")
-                {
-                    Xception x = new Xception();
-                    x.ErrorCode = 1001;
-                    x.Message = arg;
-                    throw x;
-                }
-                if (arg == "TException")
-                {
-                    throw new Thrift.TException();
-                }
-                return;
-            }
-
-            public Xtruct testMultiException(string arg0, string arg1)
-            {
-                testLogDelegate.Invoke("testMultiException({0}, {1})", arg0,arg1);
-                if (arg0 == "Xception")
-                {
-                    Xception x = new Xception();
-                    x.ErrorCode = 1001;
-                    x.Message = "This is an Xception";
-                    throw x;
-                }
-                else if (arg0 == "Xception2")
-                {
-                    Xception2 x = new Xception2();
-                    x.ErrorCode = 2002;
-                    x.Struct_thing = new Xtruct();
-                    x.Struct_thing.String_thing = "This is an Xception2";
-                    throw x;
-                }
-
-                Xtruct result = new Xtruct();
-                result.String_thing = arg1;
-                return result;
-            }
-
-            public void testStop()
-            {
-                if (server != null)
-                {
-                    server.Stop();
-                }
-            }
-
-            public void testOneway(int arg)
-            {
-                testLogDelegate.Invoke("testOneway({0}), sleeping...", arg);
-                System.Threading.Thread.Sleep(arg * 1000);
-                testLogDelegate.Invoke("testOneway finished");
-            }
-
-        } // class TestHandler
-
-        private enum ServerType
-        {
-            TSimpleServer,
-            TThreadedServer,
-            TThreadPoolServer,
-        }
-
-        private enum ProcessorFactoryType
-        {
-            TSingletonProcessorFactory,
-            TPrototypeProcessorFactory,
-        }
-
-        public static bool Execute(string[] args)
-        {
-            try
-            {
-                bool useBufferedSockets = false, useFramed = false, useEncryption = false, compact = false, json = false;
-                ServerType serverType = ServerType.TSimpleServer;
-                ProcessorFactoryType processorFactoryType = ProcessorFactoryType.TSingletonProcessorFactory;
-                int port = 9090;
-                string pipe = null;
-                for (int i = 0; i < args.Length; i++)
-                {
-                    if (args[i] == "-pipe")  // -pipe name
-                    {
-                        pipe = args[++i];
-                    }
-                    else if (args[i].Contains("--port="))
-                    {
-                        port = int.Parse(args[i].Substring(args[i].IndexOf("=") + 1));
-                    }
-                    else if (args[i] == "-b" || args[i] == "--buffered" || args[i] == "--transport=buffered")
-                    {
-                        useBufferedSockets = true;
-                    }
-                    else if (args[i] == "-f" || args[i] == "--framed" || args[i] == "--transport=framed")
-                    {
-                        useFramed = true;
-                    }
-                    else if (args[i] == "--compact" || args[i] == "--protocol=compact")
-                    {
-                        compact = true;
-                    }
-                    else if (args[i] == "--json" || args[i] == "--protocol=json")
-                    {
-                        json = true;
-                    }
-                    else if (args[i] == "--threaded" || args[i] == "--server-type=threaded")
-                    {
-                        serverType = ServerType.TThreadedServer;
-                    }
-                    else if (args[i] == "--threadpool" || args[i] == "--server-type=threadpool")
-                    {
-                        serverType = ServerType.TThreadPoolServer;
-                    }
-                    else if (args[i] == "--prototype" || args[i] == "--processor=prototype")
-                    {
-                        processorFactoryType = ProcessorFactoryType.TPrototypeProcessorFactory;
-                    }
-                    else if (args[i] == "--ssl")
-                    {
-                        useEncryption = true;
-                    }
-                }
-
-                // Transport
-                TServerTransport trans;
-                if (pipe != null)
-                {
-                    trans = new TNamedPipeServerTransport(pipe);
-                }
-                else
-                {
-                    if (useEncryption)
-                    {
-                        string certPath = "../keys/server.p12";
-                        trans = new TTLSServerSocket(port, 0, useBufferedSockets, new X509Certificate2(certPath, "thrift"), null, null, SslProtocols.Tls);
-                    }
-                    else
-                    {
-                        trans = new TServerSocket(port, 0, useBufferedSockets);
-                    }
-                }
-
-                TProtocolFactory proto;
-                if (compact)
-                    proto = new TCompactProtocol.Factory();
-                else if (json)
-                    proto = new TJSONProtocol.Factory();
-                else
-                    proto = new TBinaryProtocol.Factory();
-
-                TProcessorFactory processorFactory;
-                if (processorFactoryType == ProcessorFactoryType.TPrototypeProcessorFactory)
-                {
-                    processorFactory = new TPrototypeProcessorFactory<ThriftTest.Processor, TestHandler>();
-                }
-                else
-                {
-                    // Processor
-                    TestHandler testHandler = new TestHandler();
-                    ThriftTest.Processor testProcessor = new ThriftTest.Processor(testHandler);
-                    processorFactory = new TSingletonProcessorFactory(testProcessor);
-                }
-
-                TTransportFactory transFactory;
-                if (useFramed)
-                    transFactory = new TFramedTransport.Factory();
-                else
-                    transFactory = new TTransportFactory();
-
-                TServer serverEngine;
-                switch (serverType)
-                {
-                    case ServerType.TThreadPoolServer:
-                        serverEngine = new TThreadPoolServer(processorFactory, trans, transFactory, proto);
-                        break;
-                    case ServerType.TThreadedServer:
-                        serverEngine = new TThreadedServer(processorFactory, trans, transFactory, proto);
-                        break;
-                    default:
-                        serverEngine = new TSimpleServer(processorFactory, trans, transFactory, proto);
-                        break;
-                }
-
-                //Server event handler
-                TradeServerEventHandler serverEvents = new TradeServerEventHandler();
-                serverEngine.setEventHandler(serverEvents);
-
-                // Run it
-                string where = (pipe != null ? "on pipe " + pipe : "on port " + port);
-                Console.WriteLine("Starting the " + serverType.ToString() + " " + where +
-                    (processorFactoryType == ProcessorFactoryType.TPrototypeProcessorFactory ? " with processor prototype factory " : "") +
-                    (useBufferedSockets ? " with buffered socket" : "") +
-                    (useFramed ? " with framed transport" : "") +
-                    (useEncryption ? " with encryption" : "") +
-                    (compact ? " with compact protocol" : "") +
-                    (json ? " with json protocol" : "") +
-                    "...");
-                serverEngine.Serve();
-
-            }
-            catch (Exception x)
-            {
-                Console.Error.Write(x);
-                return false;
-            }
-            Console.WriteLine("done.");
-            return true;
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/test/csharp/ThriftTest.csproj b/vendor/git.apache.org/thrift.git/test/csharp/ThriftTest.csproj
deleted file mode 100644
index 65c0daf..0000000
--- a/vendor/git.apache.org/thrift.git/test/csharp/ThriftTest.csproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ThriftTest</RootNamespace>
-    <AssemblyName>ThriftTest</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="ThriftImpl, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\ThriftImpl.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestClient.cs" />
-    <Compile Include="TestServer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\lib\csharp\Thrift.csproj">
-      <Project>{499EB63C-D74C-47E8-AE48-A2FC94538E9D}</Project>
-      <Name>Thrift</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>rmdir /s /q "$(ProjectDir)gen-csharp"
-del /f /q "$(ProjectDir)ThriftImpl.dll"
-SET OUTPUT_DIR=$(ProjectDir)
-SET THRIFT_FILE=$(ProjectDir)\..\ThriftTest.thrift
-for %25%25I in ("%25OUTPUT_DIR%25") do set SHORT_DIR=%25%25~fsI
-for %25%25I in ("%25THRIFT_FILE%25") do set THRIFT_SHORT=%25%25~fsI
-"$(ProjectDir)\..\..\compiler\cpp\thrift.exe" --gen csharp -o %25SHORT_DIR%25 %25THRIFT_SHORT%25
-$(MSBuildToolsPath)\Csc.exe /t:library /out:"$(ProjectDir)ThriftImpl.dll" /recurse:"$(ProjectDir)gen-csharp"\* /reference:"$(ProjectDir)..\..\lib\csharp\bin\Debug\Thrift.dll"</PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/csharp/ThriftTest.sln b/vendor/git.apache.org/thrift.git/test/csharp/ThriftTest.sln
deleted file mode 100644
index 1765a03..0000000
--- a/vendor/git.apache.org/thrift.git/test/csharp/ThriftTest.sln
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThriftTest", "ThriftTest.csproj", "{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48DD757F-CA95-4DD7-BDA4-58DB6F108C2C}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/vendor/git.apache.org/thrift.git/test/dart/Makefile.am b/vendor/git.apache.org/thrift.git/test/dart/Makefile.am
deleted file mode 100644
index 6f97de9..0000000
--- a/vendor/git.apache.org/thrift.git/test/dart/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-dart/thrift_test/lib/thrift_test.dart: ../ThriftTest.thrift
-	$(THRIFT) --gen dart ../ThriftTest.thrift
-
-pub-get-gen: gen-dart/thrift_test/lib/thrift_test.dart
-	cd gen-dart/thrift_test; ${DARTPUB} get
-
-pub-get: pub-get-gen
-	cd test_client; ${DARTPUB} get
-
-stubs: gen-dart/thrift_test/lib/thrift_test.dart pub-get
-
-precross: stubs
-
-check: stubs
-
-clean-local:
-	$(RM) -r gen-dart test_client/.pub
-	find . -type d -name "packages" | xargs $(RM) -r
-	find . -type f -name ".packages" | xargs $(RM)
-
-client: stubs
-	${DART} test_client/bin/main.dart
diff --git a/vendor/git.apache.org/thrift.git/test/dart/test_client/.analysis_options b/vendor/git.apache.org/thrift.git/test/dart/test_client/.analysis_options
deleted file mode 100644
index a10d4c5..0000000
--- a/vendor/git.apache.org/thrift.git/test/dart/test_client/.analysis_options
+++ /dev/null
@@ -1,2 +0,0 @@
-analyzer:
-  strong-mode: true
diff --git a/vendor/git.apache.org/thrift.git/test/dart/test_client/bin/main.dart b/vendor/git.apache.org/thrift.git/test/dart/test_client/bin/main.dart
deleted file mode 100644
index 996844b..0000000
--- a/vendor/git.apache.org/thrift.git/test/dart/test_client/bin/main.dart
+++ /dev/null
@@ -1,337 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// 'License'); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:args/args.dart';
-import 'package:collection/collection.dart';
-import 'package:http/http.dart' as http;
-import 'package:thrift/thrift.dart';
-import 'package:thrift/thrift_console.dart';
-import 'package:thrift_test/thrift_test.dart';
-
-const TEST_BASETYPES = 1; // 0000 0001
-const TEST_STRUCTS = 2; // 0000 0010
-const TEST_CONTAINERS = 4; // 0000 0100
-const TEST_EXCEPTIONS = 8; // 0000 1000
-const TEST_UNKNOWN = 64; // 0100 0000 (Failed to prepare environemt etc.)
-const TEST_TIMEOUT = 128; // 1000 0000
-const TEST_NOTUSED = 48; // 0011 0000 (reserved bits)
-
-typedef Future FutureFunction();
-
-class TTest {
-  final int errorCode;
-  final String name;
-  final FutureFunction func;
-
-  TTest(this.errorCode, this.name, this.func);
-}
-
-class TTestError extends Error {
-  final actual;
-  final expected;
-
-  TTestError(this.actual, this.expected);
-
-  String toString() => '$actual != $expected';
-}
-
-List<TTest> _tests;
-ThriftTestClient client;
-bool verbose;
-
-/// Adapted from TestClient.php
-main(List<String> args) async {
-  ArgResults results = _parseArgs(args);
-
-  if (results == null) {
-    exit(TEST_UNKNOWN);
-  }
-
-  verbose = results['verbose'] == true;
-
-  await _initTestClient(
-      host: results['host'],
-      port: int.parse(results['port']),
-      transportType: results['transport'],
-      protocolType: results['protocol']).catchError((e) {
-    stdout.writeln('Error:');
-    stdout.writeln('$e');
-    if (e is Error) {
-      stdout.writeln('${e.stackTrace}');
-    }
-    exit(TEST_UNKNOWN);
-  });
-
-  // run tests
-  _tests = _createTests();
-
-  int result = 0;
-
-  for (TTest test in _tests) {
-    if (verbose) stdout.write('${test.name}... ');
-    try {
-      await test.func();
-      if (verbose) stdout.writeln('success!');
-    } catch (e) {
-      if (verbose) stdout.writeln('$e');
-      result = result | test.errorCode;
-    }
-  }
-
-  exit(result);
-}
-
-ArgResults _parseArgs(List<String> args) {
-  var parser = new ArgParser();
-  parser.addOption('host', defaultsTo: 'localhost', help: 'The server host');
-  parser.addOption('port', defaultsTo: '9090', help: 'The port to connect to');
-  parser.addOption('transport',
-      defaultsTo: 'buffered',
-      allowed: ['buffered', 'framed', 'http'],
-      help: 'The transport name',
-      allowedHelp: {
-        'buffered': 'TBufferedTransport',
-        'framed': 'TFramedTransport'
-      });
-  parser.addOption('protocol',
-      defaultsTo: 'binary',
-      allowed: ['binary', 'compact', 'json'],
-      help: 'The protocol name',
-      allowedHelp: {
-        'binary': 'TBinaryProtocol',
-        'compact': 'TCompactProtocol',
-        'json': 'TJsonProtocol'
-      });
-  parser.addFlag('verbose', defaultsTo: false);
-
-  ArgResults results;
-  try {
-    results = parser.parse(args);
-  } catch (e) {
-    stdout.writeln('$e\n');
-  }
-
-  if (results == null) stdout.write(parser.usage);
-
-  return results;
-}
-
-TProtocolFactory getProtocolFactory(String protocolType) {
-  if (protocolType == 'binary') {
-    return new TBinaryProtocolFactory();
-  } else if (protocolType == 'compact') {
-    return new TCompactProtocolFactory();
-  } else if (protocolType == 'json') {
-    return new TJsonProtocolFactory();
-  }
-
-  throw new ArgumentError.value(protocolType);
-}
-
-Future _initTestClient(
-    {String host, int port, String transportType, String protocolType}) async {
-  TTransport transport;
-  var protocolFactory = getProtocolFactory(protocolType);
-
-  if (transportType == 'http') {
-    var httpClient = new http.IOClient();
-    var uri = Uri.parse('http://$host:$port');
-    var config = new THttpConfig(uri, {});
-    transport = new THttpClientTransport(httpClient, config);
-  } else {
-    var socket = await Socket.connect(host, port);
-    transport = new TClientSocketTransport(new TTcpSocket(socket));
-    if (transportType == 'framed') {
-      transport = new TFramedTransport(transport);
-    }
-  }
-
-  var protocol = protocolFactory.getProtocol(transport);
-  client = new ThriftTestClient(protocol);
-
-  await transport.open();
-}
-
-List<TTest> _createTests() {
-  List<TTest> tests = [];
-
-  var xtruct = new Xtruct()
-    ..string_thing = 'Zero'
-    ..byte_thing = 1
-    ..i32_thing = -3
-    ..i64_thing = -5;
-
-  tests.add(new TTest(TEST_BASETYPES, 'testVoid', () async {
-    await client.testVoid();
-  }));
-
-  tests.add(new TTest(TEST_BASETYPES, 'testString', () async {
-    var input = 'Test';
-    var result = await client.testString(input);
-    if (result != input) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_BASETYPES, 'testBool', () async {
-    var input = true;
-    var result = await client.testBool(input);
-    if (result != input) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_BASETYPES, 'testByte', () async {
-    var input = 64;
-    var result = await client.testByte(input);
-    if (result != input) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_BASETYPES, 'testI32', () async {
-    var input = 2147483647;
-    var result = await client.testI32(input);
-    if (result != input) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_BASETYPES, 'testI64', () async {
-    var input = 9223372036854775807;
-    var result = await client.testI64(input);
-    if (result != input) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_BASETYPES, 'testDouble', () async {
-    var input = 3.1415926;
-    var result = await client.testDouble(input);
-    if (result != input) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_BASETYPES, 'testBinary', () async {
-    var utf8Codec = const Utf8Codec();
-    var input = utf8Codec.encode('foo');
-    var result = await client.testBinary(input);
-    var equality = const ListEquality();
-    if (!equality.equals(result, input)) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testStruct', () async {
-    var result = await client.testStruct(xtruct);
-    if ('$result' != '$xtruct') throw new TTestError(result, xtruct);
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testNest', () async {
-    var input = new Xtruct2()
-      ..byte_thing = 1
-      ..struct_thing = xtruct
-      ..i32_thing = -3;
-
-    var result = await client.testNest(input);
-    if ('$result' != '$input') throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testMap', () async {
-    Map<int, int> input = {1: -10, 2: -9, 3: -8, 4: -7, 5: -6};
-
-    var result = await client.testMap(input);
-    var equality = const MapEquality();
-    if (!equality.equals(result, input)) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testSet', () async {
-    var input = new Set<int>.from([-2, -1, 0, 1, 2]);
-    var result = await client.testSet(input);
-    var equality = const SetEquality();
-    if (!equality.equals(result, input)) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testList', () async {
-    var input = [-2, -1, 0, 1, 2];
-    var result = await client.testList(input);
-    var equality = const ListEquality();
-    if (!equality.equals(result, input)) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testEnum', () async {
-    await _testEnum(Numberz.ONE);
-    await _testEnum(Numberz.TWO);
-    await _testEnum(Numberz.THREE);
-    await _testEnum(Numberz.FIVE);
-    await _testEnum(Numberz.EIGHT);
-  }));
-
-  tests.add(new TTest(TEST_BASETYPES, 'testTypedef', () async {
-    var input = 309858235082523;
-    var result = await client.testTypedef(input);
-    if (result != input) throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testMapMap', () async {
-    Map<int, Map<int, int>> result = await client.testMapMap(1);
-    if (result.isEmpty || result[result.keys.first].isEmpty) {
-      throw new TTestError(result, 'Map<int, Map<int, int>>');
-    }
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testInsanity', () async {
-    var input = new Insanity();
-    input.userMap = {Numberz.FIVE: 5000};
-    input.xtructs = [xtruct];
-
-    Map<int, Map<int, Insanity>> result = await client.testInsanity(input);
-    if (result.isEmpty || result[result.keys.first].isEmpty) {
-      throw new TTestError(result, 'Map<int, Map<int, Insanity>>');
-    }
-  }));
-
-  tests.add(new TTest(TEST_CONTAINERS, 'testMulti', () async {
-    var input = new Xtruct()
-      ..string_thing = 'Hello2'
-      ..byte_thing = 123
-      ..i32_thing = 456
-      ..i64_thing = 789;
-
-    var result = await client.testMulti(input.byte_thing, input.i32_thing,
-        input.i64_thing, {1: 'one'}, Numberz.EIGHT, 5678);
-    if ('$result' != '$input') throw new TTestError(result, input);
-  }));
-
-  tests.add(new TTest(TEST_EXCEPTIONS, 'testException', () async {
-    try {
-      await client.testException('Xception');
-    } on Xception catch (_) {
-      return;
-    }
-
-    throw new TTestError(null, 'Xception');
-  }));
-
-  tests.add(new TTest(TEST_EXCEPTIONS, 'testMultiException', () async {
-    try {
-      await client.testMultiException('Xception2', 'foo');
-    } on Xception2 catch (_) {
-      return;
-    }
-
-    throw new TTestError(null, 'Xception2');
-  }));
-
-  return tests;
-}
-
-Future _testEnum(int input) async {
-  var result = await client.testEnum(input);
-  if (result != input) throw new TTestError(result, input);
-}
diff --git a/vendor/git.apache.org/thrift.git/test/dart/test_client/pubspec.yaml b/vendor/git.apache.org/thrift.git/test/dart/test_client/pubspec.yaml
deleted file mode 100644
index 0b6bda2..0000000
--- a/vendor/git.apache.org/thrift.git/test/dart/test_client/pubspec.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# 'License'); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: thrift_test_client
-version: 0.10.0
-description: A client integration test for the Dart Thrift library
-author: Apache Thrift Developers <dev@thrift.apache.org>
-homepage: http://thrift.apache.org
-
-environment:
-  sdk: ">=1.13.0 <2.0.0"
-
-dependencies:
-  args: ^0.13.0
-  http: ^0.11.0
-  thrift:
-    path: ../../../lib/dart
-  thrift_test:
-    path: ../gen-dart/thrift_test
-
-dev_dependencies:
-  test: "^0.12.0"
diff --git a/vendor/git.apache.org/thrift.git/test/erl/Makefile.am b/vendor/git.apache.org/thrift.git/test/erl/Makefile.am
deleted file mode 100644
index be8b4f5..0000000
--- a/vendor/git.apache.org/thrift.git/test/erl/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-THRIFT_FILES = $(wildcard ../*.thrift)
-
-if ERLANG_OTP16
-ERL_FLAG = erl:otp16
-else
-ERL_FLAG = erl
-endif
-# make sure ThriftTest.thrift is generated last to prevent conflicts with other *.thrift files
-.generated: $(THRIFT_FILES)
-	for f in $(THRIFT_FILES) ; do \
-	  $(THRIFT) --gen $(ERL_FLAG) -o src $$f ; \
-	done ; \
-	$(THRIFT) --gen $(ERL_FLAG) -o src ../ThriftTest.thrift
-	touch .generated
-
-precross: .generated
-	$(REBAR) compile
-
-clean:
-	rm -f .generated
-	rm -rf src/gen-erl
-	$(REBAR) clean
diff --git a/vendor/git.apache.org/thrift.git/test/erl/rebar.config b/vendor/git.apache.org/thrift.git/test/erl/rebar.config
deleted file mode 100644
index 59a0788..0000000
--- a/vendor/git.apache.org/thrift.git/test/erl/rebar.config
+++ /dev/null
@@ -1,6 +0,0 @@
-{sub_dirs, ["../../lib/erl"]}.
-
-{erl_opts, [
-  debug_info,
-  {i, "../../lib/erl/include"}
-]}.
diff --git a/vendor/git.apache.org/thrift.git/test/erl/src/test_client.erl b/vendor/git.apache.org/thrift.git/test/erl/src/test_client.erl
deleted file mode 100644
index 50ffc64..0000000
--- a/vendor/git.apache.org/thrift.git/test/erl/src/test_client.erl
+++ /dev/null
@@ -1,174 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_client).
-
--export([start/0, start/1]).
-
--include("gen-erl/thrift_test_types.hrl").
-
--record(options, {port = 9090,
-                  client_opts = []}).
-
-parse_args(Args) -> parse_args(Args, #options{}).
-parse_args([], Opts) ->
-  Opts;
-parse_args([Head | Rest], Opts) ->
-    NewOpts =
-        case Head of
-            "--port=" ++ Port ->
-                case string:to_integer(Port) of
-                  {IntPort,_} when is_integer(IntPort) ->
-                    Opts#options{port = IntPort};
-                  _Else ->
-                    erlang:error({bad_arg, Head})
-                end;
-            "--transport=" ++ Trans ->
-                % TODO: Enable Buffered and HTTP transport
-                case Trans of
-                    "framed" ->
-                        Opts#options{client_opts = [{framed, true} | Opts#options.client_opts]};
-                    _Else ->
-                        Opts
-                end;
-            "--ssl" ->
-                ssl:start(),
-                SslOptions =
-                    {ssloptions, [
-                        {certfile, "../keys/client.crt"}
-                        ,{keyfile, "../keys/server.key"}
-                    ]},
-                Opts#options{client_opts = [{ssltransport, true} | [SslOptions | Opts#options.client_opts]]};
-            "--protocol=" ++ Proto ->
-                Opts#options{client_opts = [{protocol, list_to_atom(Proto)}]};
-            _Else ->
-                erlang:error({bad_arg, Head})
-        end,
-    parse_args(Rest, NewOpts).
-
-start() -> start(init:get_plain_arguments()).
-start(Args) ->
-  #options{port = Port, client_opts = ClientOpts} = parse_args(Args),
-  {ok, Client0} = thrift_client_util:new(
-    "127.0.0.1", Port, thrift_test_thrift, ClientOpts),
-
-  DemoXtruct = #'thrift.test.Xtruct'{
-                  string_thing = <<"Zero">>,
-                  byte_thing = 1,
-                  i32_thing = 9128361,
-                  i64_thing = 9223372036854775807},
-
-  DemoNest = #'thrift.test.Xtruct2'{
-    byte_thing = 7,
-    struct_thing = DemoXtruct,
-    % Note that we don't set i32_thing, it will come back as undefined
-    % from the Python server, but 0 from the C++ server, since it is not
-    % optional
-    i32_thing = 2},
-
-  % Is it safe to match these things?
-  DemoDict = dict:from_list([ {Key, Key-10} || Key <- lists:seq(0,10) ]),
-  DemoSet = sets:from_list([ Key || Key <- lists:seq(-3,3) ]),
-
-  DemoInsane = #'thrift.test.Insanity'{
-    userMap = dict:from_list([{?THRIFT_TEST_NUMBERZ_FIVE, 5000}]),
-    xtructs = [#'thrift.test.Xtruct'{ string_thing = <<"Truck">>, byte_thing = 8, i32_thing = 8, i64_thing = 8}]},
-
-  error_logger:info_msg("testVoid"),
-  {Client01, {ok, ok}} = thrift_client:call(Client0, testVoid, []),
-
-  error_logger:info_msg("testString"),
-  {Client02, {ok, <<"Test">>}}      = thrift_client:call(Client01, testString, ["Test"]),
-  error_logger:info_msg("testString"),
-  {Client03, {ok, <<"Test">>}}      = thrift_client:call(Client02, testString, [<<"Test">>]),
-  error_logger:info_msg("testByte"),
-  {Client04, {ok, 63}}              = thrift_client:call(Client03, testByte, [63]),
-  error_logger:info_msg("testI32"),
-  {Client05, {ok, -1}}              = thrift_client:call(Client04, testI32, [-1]),
-  error_logger:info_msg("testI32"),
-  {Client06, {ok, 0}}               = thrift_client:call(Client05, testI32, [0]),
-  error_logger:info_msg("testI64"),
-  {Client07, {ok, -34359738368}}    = thrift_client:call(Client06, testI64, [-34359738368]),
-  error_logger:info_msg("testDouble"),
-  {Client08, {ok, -5.2098523}}      = thrift_client:call(Client07, testDouble, [-5.2098523]),
-  %% TODO: add testBinary() call
-  error_logger:info_msg("testStruct"),
-  {Client09, {ok, DemoXtruct}}      = thrift_client:call(Client08, testStruct, [DemoXtruct]),
-  error_logger:info_msg("testNest"),
-  {Client10, {ok, DemoNest}}        = thrift_client:call(Client09, testNest, [DemoNest]),
-  error_logger:info_msg("testMap"),
-  {Client11, {ok, DemoDict}}        = thrift_client:call(Client10, testMap, [DemoDict]),
-  error_logger:info_msg("testSet"),
-  {Client12, {ok, DemoSet}}         = thrift_client:call(Client11, testSet, [DemoSet]),
-  error_logger:info_msg("testList"),
-  {Client13, {ok, [-1,2,3]}}        = thrift_client:call(Client12, testList, [[-1,2,3]]),
-  error_logger:info_msg("testEnum"),
-  {Client14, {ok, 1}}               = thrift_client:call(Client13, testEnum, [?THRIFT_TEST_NUMBERZ_ONE]),
-  error_logger:info_msg("testTypedef"),
-  {Client15, {ok, 309858235082523}} = thrift_client:call(Client14, testTypedef, [309858235082523]),
-  error_logger:info_msg("testInsanity"),
-  {Client16, {ok, InsaneResult}}    = thrift_client:call(Client15, testInsanity, [DemoInsane]),
-  io:format("~p~n", [InsaneResult]),
-
-  {Client17, {ok, #'thrift.test.Xtruct'{string_thing = <<"Message">>}}} =
-    thrift_client:call(Client16, testMultiException, ["Safe", "Message"]),
-
-  Client18 =
-    try
-      {ClientS1, Result1} = thrift_client:call(Client17, testMultiException, ["Xception", "Message"]),
-      io:format("Unexpected return! ~p~n", [Result1]),
-      ClientS1
-    catch
-      throw:{ClientS2, {exception, ExnS1 = #'thrift.test.Xception'{}}} ->
-        #'thrift.test.Xception'{errorCode = 1001, message = <<"This is an Xception">>} = ExnS1,
-        ClientS2;
-      throw:{ClientS2, {exception, _ExnS1 = #'thrift.test.Xception2'{}}} ->
-        io:format("Wrong exception type!~n", []),
-        ClientS2
-    end,
-
-  Client19 =
-    try
-      {ClientS3, Result2} = thrift_client:call(Client18, testMultiException, ["Xception2", "Message"]),
-      io:format("Unexpected return! ~p~n", [Result2]),
-      ClientS3
-    catch
-      throw:{ClientS4, {exception, _ExnS2 = #'thrift.test.Xception'{}}} ->
-        io:format("Wrong exception type!~n", []),
-        ClientS4;
-      throw:{ClientS4, {exception, ExnS2 = #'thrift.test.Xception2'{}}} ->
-        #'thrift.test.Xception2'{errorCode = 2002,
-                   struct_thing = #'thrift.test.Xtruct'{
-                     string_thing = <<"This is an Xception2">>}} = ExnS2,
-        ClientS4
-    end,
-
-  %% Use deprecated erlang:now until we start requiring OTP18
-  %% Started = erlang:monotonic_time(milli_seconds),
-  {_, StartSec, StartUSec} = erlang:now(),
-  error_logger:info_msg("testOneway"),
-  {Client20, {ok, ok}} = thrift_client:call(Client19, testOneway, [1]),
-  {_, EndSec, EndUSec} = erlang:now(),
-  Elapsed = (EndSec - StartSec) * 1000 + (EndUSec - StartUSec) / 1000,
-  if
-    Elapsed > 1000 -> exit(1);
-    true -> true
-  end,
-
-  thrift_client:close(Client20).
diff --git a/vendor/git.apache.org/thrift.git/test/erl/src/test_thrift_server.erl b/vendor/git.apache.org/thrift.git/test/erl/src/test_thrift_server.erl
deleted file mode 100644
index f3ed2f7..0000000
--- a/vendor/git.apache.org/thrift.git/test/erl/src/test_thrift_server.erl
+++ /dev/null
@@ -1,233 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(test_thrift_server).
-
--export([start/0, start/1, start_link/2, handle_function/2]).
-
--include("thrift_constants.hrl").
--include("gen-erl/thrift_test_types.hrl").
-
--record(options, {port = 9090,
-                  server_opts = []}).
-
-parse_args(Args) -> parse_args(Args, #options{}).
-parse_args([], Opts) ->
-  Opts;
-parse_args([Head | Rest], Opts) ->
-    NewOpts =
-        case Head of
-            "--port=" ++ Port ->
-                case string:to_integer(Port) of
-                  {IntPort,_} when is_integer(IntPort) ->
-                    Opts#options{port = IntPort};
-                  _Else ->
-                    erlang:error({bad_arg, Head})
-                end;
-            "--transport=" ++ Trans ->
-                case Trans of
-                    "framed" ->
-                        Opts#options{server_opts = [{framed, true} | Opts#options.server_opts]};
-                    _Else ->
-                        Opts
-                end;
-            "--ssl" ->
-                ssl:start(),
-                SslOptions =
-                    {ssloptions, [
-                         {certfile, "../keys/server.crt"}
-                        ,{keyfile,  "../keys/server.key"}
-                    ]},
-                Opts#options{server_opts = [{ssltransport, true} | [SslOptions | Opts#options.server_opts]]};
-            "--protocol=" ++ Proto ->
-                Opts#options{server_opts = [{protocol, list_to_atom(Proto)} | Opts#options.server_opts]};
-            _Else ->
-                erlang:error({bad_arg, Head})
-        end,
-    parse_args(Rest, NewOpts).
-
-start() -> start(init:get_plain_arguments()).
-start(Args) ->
-    #options{port = Port, server_opts = ServerOpts} = parse_args(Args),
-    spawn(fun() -> start_link(Port, ServerOpts), receive after infinity -> ok end end).
-
-start_link(Port, ServerOpts) ->
-    thrift_socket_server:start([{handler, ?MODULE},
-                                {service, thrift_test_thrift},
-                                {port, Port}] ++
-                               ServerOpts).
-
-
-handle_function(testVoid, {}) ->
-    io:format("testVoid~n"),
-    ok;
-
-handle_function(testString, {S}) when is_binary(S) ->
-    io:format("testString: ~p~n", [S]),
-    {reply, S};
-
-handle_function(testBool, {B}) when is_boolean(B) ->
-    io:format("testBool: ~p~n", [B]),
-    {reply, B};
-
-handle_function(testByte, {I8}) when is_integer(I8) ->
-    io:format("testByte: ~p~n", [I8]),
-    {reply, I8};
-
-handle_function(testI32, {I32}) when is_integer(I32) ->
-    io:format("testI32: ~p~n", [I32]),
-    {reply, I32};
-
-handle_function(testI64, {I64}) when is_integer(I64) ->
-    io:format("testI64: ~p~n", [I64]),
-    {reply, I64};
-
-handle_function(testDouble, {Double}) when is_float(Double) ->
-    io:format("testDouble: ~p~n", [Double]),
-    {reply, Double};
-
-handle_function(testBinary, {S}) when is_binary(S) ->
-    io:format("testBinary: ~p~n", [S]),
-    {reply, S};
-
-handle_function(testStruct,
-                {Struct = #'thrift.test.Xtruct'{string_thing = String,
-                                                byte_thing = Byte,
-                                                i32_thing = I32,
-                                                i64_thing = I64}})
-when is_binary(String),
-     is_integer(Byte),
-     is_integer(I32),
-     is_integer(I64) ->
-    io:format("testStruct: ~p~n", [Struct]),
-    {reply, Struct};
-
-handle_function(testNest,
-                {Nest}) when is_record(Nest, 'thrift.test.Xtruct2'),
-                             is_record(Nest#'thrift.test.Xtruct2'.struct_thing, 'thrift.test.Xtruct') ->
-    io:format("testNest: ~p~n", [Nest]),
-    {reply, Nest};
-
-handle_function(testMap, {Map}) ->
-    io:format("testMap: ~p~n", [dict:to_list(Map)]),
-    {reply, Map};
-
-handle_function(testStringMap, {Map}) ->
-    io:format("testStringMap: ~p~n", [dict:to_list(Map)]),
-    {reply, Map};
-
-handle_function(testSet, {Set}) ->
-    true = sets:is_set(Set),
-    io:format("testSet: ~p~n", [sets:to_list(Set)]),
-    {reply, Set};
-
-handle_function(testList, {List}) when is_list(List) ->
-    io:format("testList: ~p~n", [List]),
-    {reply, List};
-
-handle_function(testEnum, {Enum}) when is_integer(Enum) ->
-    io:format("testEnum: ~p~n", [Enum]),
-    {reply, Enum};
-
-handle_function(testTypedef, {UserID}) when is_integer(UserID) ->
-    io:format("testTypedef: ~p~n", [UserID]),
-    {reply, UserID};
-
-handle_function(testMapMap, {Hello}) ->
-    io:format("testMapMap: ~p~n", [Hello]),
-
-    PosList = [{I, I}   || I <- lists:seq(1, 4)],
-    NegList = [{-I, -I} || I <- lists:seq(1, 4)],
-
-    MapMap = dict:from_list([{4,  dict:from_list(PosList)},
-                             {-4, dict:from_list(NegList)}]),
-    {reply, MapMap};
-
-handle_function(testInsanity, {Insanity}) when is_record(Insanity, 'thrift.test.Insanity') ->
-    Hello = #'thrift.test.Xtruct'{string_thing = <<"Hello2">>,
-                                  byte_thing = 2,
-                                  i32_thing = 2,
-                                  i64_thing = 2},
-
-    Goodbye = #'thrift.test.Xtruct'{string_thing = <<"Goodbye4">>,
-                                   byte_thing = 4,
-                                    i32_thing = 4,
-                                    i64_thing = 4},
-    Crazy = #'thrift.test.Insanity'{
-               userMap = dict:from_list([{?THRIFT_TEST_NUMBERZ_EIGHT, 8}]),
-               xtructs = [Goodbye]
-              },
-
-    Looney = #'thrift.test.Insanity'{},
-
-    FirstMap = dict:from_list([{?THRIFT_TEST_NUMBERZ_TWO, Insanity},
-                               {?THRIFT_TEST_NUMBERZ_THREE, Insanity}]),
-
-    SecondMap = dict:from_list([{?THRIFT_TEST_NUMBERZ_SIX, Looney}]),
-
-    Insane = dict:from_list([{1, FirstMap},
-                             {2, SecondMap}]),
-
-    io:format("Return = ~p~n", [Insane]),
-
-    {reply, Insane};
-
-handle_function(testMulti, Args = {Arg0, Arg1, Arg2, _Arg3, Arg4, Arg5})
-  when is_integer(Arg0),
-       is_integer(Arg1),
-       is_integer(Arg2),
-       is_integer(Arg4),
-       is_integer(Arg5) ->
-
-    io:format("testMulti(~p)~n", [Args]),
-    {reply, #'thrift.test.Xtruct'{string_thing = <<"Hello2">>,
-                                  byte_thing = Arg0,
-                                  i32_thing = Arg1,
-                                  i64_thing = Arg2}};
-
-handle_function(testException, {String}) when is_binary(String) ->
-    io:format("testException(~p)~n", [String]),
-    case String of
-        <<"Xception">> ->
-            throw(#'thrift.test.Xception'{errorCode = 1001,
-                            message = String});
-        <<"TException">> ->
-            throw({?TApplicationException_Structure});
-        _ ->
-            ok
-    end;
-
-handle_function(testMultiException, {Arg0, Arg1}) ->
-    io:format("testMultiException(~p, ~p)~n", [Arg0, Arg1]),
-    case Arg0 of
-        <<"Xception">> ->
-            throw(#'thrift.test.Xception'{errorCode = 1001,
-                                   message = <<"This is an Xception">>});
-        <<"Xception2">> ->
-            throw(#'thrift.test.Xception2'{errorCode = 2002,
-                                    struct_thing =
-                                    #'thrift.test.Xtruct'{string_thing = <<"This is an Xception2">>}});
-        _ ->
-            {reply, #'thrift.test.Xtruct'{string_thing = Arg1}}
-    end;
-
-handle_function(testOneway, {Seconds}) ->
-    io:format("testOneway: ~p~n", [Seconds]),
-    timer:sleep(1000 * Seconds),
-    ok.
diff --git a/vendor/git.apache.org/thrift.git/test/erl/src/thrift_test.app.src b/vendor/git.apache.org/thrift.git/test/erl/src/thrift_test.app.src
deleted file mode 100644
index 6653639..0000000
--- a/vendor/git.apache.org/thrift.git/test/erl/src/thrift_test.app.src
+++ /dev/null
@@ -1,54 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-%%% -*- mode:erlang -*-
-{application, thrift_test, [
-  % A quick description of the application.
-  {description, "Thrift cross language test"},
-
-  % The version of the applicaton
-  {vsn, "0.10.0"},
-
-  % All modules used by the application.
-  {modules, [
-    test_client,
-    test_thrift_server
-  ]},
-
-  % All of the registered names the application uses. This can be ignored.
-  {registered, []},
-
-  % Applications that are to be started prior to this one. This can be ignored
-  % leave it alone unless you understand it well and let the .rel files in
-  % your release handle this.
-  {applications, [kernel, stdlib]},
-
-  % OTP application loader will load, but not start, included apps. Again
-  % this can be ignored as well.  To load but not start an application it
-  % is easier to include it in the .rel file followed by the atom 'none'
-  {included_applications, []},
-
-  % configuration parameters similar to those in the config file specified
-  % on the command line. can be fetched with gas:get_env
-  {env, [
-    % If an error/crash occurs during processing of a function,
-    % should the TApplicationException serialized back to the client
-    % include the erlang backtrace?
-    {exceptions_include_traces, true}
-  ]}
-]}.
diff --git a/vendor/git.apache.org/thrift.git/test/features/Makefile.am b/vendor/git.apache.org/thrift.git/test/features/Makefile.am
deleted file mode 100644
index f8d6538..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-EXTRA_DIST = \
-	local_thrift \
-	index.html \
-	container_limit.py \
-	index.html \
-	known_failures_Linux.json \
-	Makefile.am \
-	string_limit.py \
-	tests.json \
-	theader_binary.py \
-	setup.cfg \
-	util.py
diff --git a/vendor/git.apache.org/thrift.git/test/features/container_limit.py b/vendor/git.apache.org/thrift.git/test/features/container_limit.py
deleted file mode 100644
index a16e364..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/container_limit.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import sys
-
-from util import add_common_args, init_protocol
-from local_thrift import thrift  # noqa
-from thrift.Thrift import TMessageType, TType
-
-
-# TODO: generate from ThriftTest.thrift
-def test_list(proto, value):
-    method_name = 'testList'
-    ttype = TType.LIST
-    etype = TType.I32
-    proto.writeMessageBegin(method_name, TMessageType.CALL, 3)
-    proto.writeStructBegin(method_name + '_args')
-    proto.writeFieldBegin('thing', ttype, 1)
-    proto.writeListBegin(etype, len(value))
-    for e in value:
-        proto.writeI32(e)
-    proto.writeListEnd()
-    proto.writeFieldEnd()
-    proto.writeFieldStop()
-    proto.writeStructEnd()
-    proto.writeMessageEnd()
-    proto.trans.flush()
-
-    _, mtype, _ = proto.readMessageBegin()
-    assert mtype == TMessageType.REPLY
-    proto.readStructBegin()
-    _, ftype, fid = proto.readFieldBegin()
-    assert fid == 0
-    assert ftype == ttype
-    etype2, len2 = proto.readListBegin()
-    assert etype == etype2
-    assert len2 == len(value)
-    for i in range(len2):
-        v = proto.readI32()
-        assert v == value[i]
-    proto.readListEnd()
-    proto.readFieldEnd()
-    _, ftype, _ = proto.readFieldBegin()
-    assert ftype == TType.STOP
-    proto.readStructEnd()
-    proto.readMessageEnd()
-
-
-def main(argv):
-    p = argparse.ArgumentParser()
-    add_common_args(p)
-    p.add_argument('--limit', type=int)
-    args = p.parse_args()
-    proto = init_protocol(args)
-    # TODO: test set and map
-    test_list(proto, list(range(args.limit - 1)))
-    test_list(proto, list(range(args.limit - 1)))
-    print('[OK]: limit - 1')
-    test_list(proto, list(range(args.limit)))
-    test_list(proto, list(range(args.limit)))
-    print('[OK]: just limit')
-    try:
-        test_list(proto, list(range(args.limit + 1)))
-    except:
-        print('[OK]: limit + 1')
-    else:
-        print('[ERROR]: limit + 1')
-        assert False
-
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
diff --git a/vendor/git.apache.org/thrift.git/test/features/index.html b/vendor/git.apache.org/thrift.git/test/features/index.html
deleted file mode 100644
index 34a0010..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/index.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Apache Thrift - integration test suite</title>
-<link rel="stylesheet" type="text/css" href="http://cdn.datatables.net/1.10.4/css/jquery.dataTables.css">
-<script type="text/javascript" charset="utf-8" src="http://code.jquery.com/jquery-2.1.3.min.js"></script>
-<script type="text/javascript" charset="utf-8" src="http://cdn.datatables.net/1.10.4/js/jquery.dataTables.js"></script>
-<script src="../result.js">
-</script>
-</head>
-<body>
-<h2>Apache Thrift - integration test suite: Results</h2>
-<table id="test_results" class="display">
-    <thead>
-        <tr>
-            <th>Server</th>
-            <th>Client</th>
-            <th>Protocol</th>
-            <th>Transport</th>
-            <th>Result (log)</th>
-            <th>Expected</th>
-        </tr>
-    </thead>
-</table>
-<h2>Test Information</h2>
-<pre id="test_info"></pre>
-
-<a href="log">browse raw log files</a>
-
-</body>
-</html>
diff --git a/vendor/git.apache.org/thrift.git/test/features/known_failures_Linux.json b/vendor/git.apache.org/thrift.git/test/features/known_failures_Linux.json
deleted file mode 100644
index 257095d..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/known_failures_Linux.json
+++ /dev/null
@@ -1,36 +0,0 @@
-[
-  "c_glib-limit_container_length_binary_buffered-ip",
-  "c_glib-limit_string_length_binary_buffered-ip",
-  "csharp-limit_container_length_binary_buffered-ip",
-  "csharp-limit_container_length_compact_buffered-ip",
-  "csharp-limit_string_length_binary_buffered-ip",
-  "csharp-limit_string_length_compact_buffered-ip",
-  "d-limit_container_length_binary_buffered-ip",
-  "d-limit_container_length_compact_buffered-ip",
-  "d-limit_string_length_binary_buffered-ip",
-  "d-limit_string_length_compact_buffered-ip",
-  "erl-limit_container_length_binary_buffered-ip",
-  "erl-limit_container_length_compact_buffered-ip",
-  "erl-limit_string_length_binary_buffered-ip",
-  "erl-limit_string_length_compact_buffered-ip",
-  "go-limit_container_length_binary_buffered-ip",
-  "go-limit_container_length_compact_buffered-ip",
-  "go-limit_string_length_binary_buffered-ip",
-  "go-limit_string_length_compact_buffered-ip",
-  "hs-limit_container_length_binary_buffered-ip",
-  "hs-limit_container_length_compact_buffered-ip",
-  "hs-limit_string_length_binary_buffered-ip",
-  "hs-limit_string_length_compact_buffered-ip",
-  "nodejs-limit_container_length_binary_buffered-ip",
-  "nodejs-limit_container_length_compact_buffered-ip",
-  "nodejs-limit_string_length_binary_buffered-ip",
-  "nodejs-limit_string_length_compact_buffered-ip",
-  "perl-limit_container_length_binary_buffered-ip",
-  "perl-limit_string_length_binary_buffered-ip",
-  "rb-limit_container_length_accel-binary_buffered-ip",
-  "rb-limit_container_length_binary_buffered-ip",
-  "rb-limit_container_length_compact_buffered-ip",
-  "rb-limit_string_length_accel-binary_buffered-ip",
-  "rb-limit_string_length_binary_buffered-ip",
-  "rb-limit_string_length_compact_buffered-ip"
-]
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/features/local_thrift/__init__.py b/vendor/git.apache.org/thrift.git/test/features/local_thrift/__init__.py
deleted file mode 100644
index c85cebe..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/local_thrift/__init__.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import os
-import sys
-
-_SCRIPT_DIR = os.path.realpath(os.path.dirname(__file__))
-_ROOT_DIR = os.path.dirname(os.path.dirname(os.path.dirname(_SCRIPT_DIR)))
-_LIBDIR = os.path.join(_ROOT_DIR, 'lib', 'py', 'build', 'lib.*')
-
-for libpath in glob.glob(_LIBDIR):
-    if libpath.endswith('-%d.%d' % (sys.version_info[0], sys.version_info[1])):
-        sys.path.insert(0, libpath)
-        thrift = __import__('thrift')
-        break
diff --git a/vendor/git.apache.org/thrift.git/test/features/setup.cfg b/vendor/git.apache.org/thrift.git/test/features/setup.cfg
deleted file mode 100644
index 7da1f96..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[flake8]
-max-line-length = 100
diff --git a/vendor/git.apache.org/thrift.git/test/features/string_limit.py b/vendor/git.apache.org/thrift.git/test/features/string_limit.py
deleted file mode 100644
index 695d965..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/string_limit.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import sys
-
-from util import add_common_args, init_protocol
-from local_thrift import thrift  # noqa
-from thrift.Thrift import TMessageType, TType
-
-
-# TODO: generate from ThriftTest.thrift
-def test_string(proto, value):
-    method_name = 'testString'
-    ttype = TType.STRING
-    proto.writeMessageBegin(method_name, TMessageType.CALL, 3)
-    proto.writeStructBegin(method_name + '_args')
-    proto.writeFieldBegin('thing', ttype, 1)
-    proto.writeString(value)
-    proto.writeFieldEnd()
-    proto.writeFieldStop()
-    proto.writeStructEnd()
-    proto.writeMessageEnd()
-    proto.trans.flush()
-
-    _, mtype, _ = proto.readMessageBegin()
-    assert mtype == TMessageType.REPLY
-    proto.readStructBegin()
-    _, ftype, fid = proto.readFieldBegin()
-    assert fid == 0
-    assert ftype == ttype
-    result = proto.readString()
-    proto.readFieldEnd()
-    _, ftype, _ = proto.readFieldBegin()
-    assert ftype == TType.STOP
-    proto.readStructEnd()
-    proto.readMessageEnd()
-    assert value == result
-
-
-def main(argv):
-    p = argparse.ArgumentParser()
-    add_common_args(p)
-    p.add_argument('--limit', type=int)
-    args = p.parse_args()
-    proto = init_protocol(args)
-    test_string(proto, 'a' * (args.limit - 1))
-    test_string(proto, 'a' * (args.limit - 1))
-    print('[OK]: limit - 1')
-    test_string(proto, 'a' * args.limit)
-    test_string(proto, 'a' * args.limit)
-    print('[OK]: just limit')
-    try:
-        test_string(proto, 'a' * (args.limit + 1))
-    except:
-        print('[OK]: limit + 1')
-    else:
-        print('[ERROR]: limit + 1')
-        assert False
-
-if __name__ == '__main__':
-    main(sys.argv[1:])
diff --git a/vendor/git.apache.org/thrift.git/test/features/tests.json b/vendor/git.apache.org/thrift.git/test/features/tests.json
deleted file mode 100644
index cfcb4b6..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/tests.json
+++ /dev/null
@@ -1,94 +0,0 @@
-[
-  {
-    "description": "THeader detects unframed binary wire format",
-    "name": "theader_unframed_binary",
-    "command": [
-      "python",
-      "theader_binary.py",
-      "--override-protocol=binary",
-      "--override-transport=buffered"
-    ],
-    "protocols": ["header"],
-    "transports": ["buffered"],
-    "sockets": ["ip"],
-    "workdir": "features"
-  },
-  {
-    "description": "THeader detects framed binary wire format",
-    "name": "theader_framed_binary",
-    "command": [
-      "python",
-      "theader_binary.py",
-      "--override-protocol=binary",
-      "--override-transport=framed"
-    ],
-    "protocols": ["header"],
-    "transports": ["buffered"],
-    "sockets": ["ip"],
-    "workdir": "features"
-  },
-  {
-    "description": "THeader detects unframed compact wire format",
-    "name": "theader_unframed_compact",
-    "command": [
-      "python",
-      "theader_binary.py",
-      "--override-protocol=compact",
-      "--override-transport=buffered"
-    ],
-    "protocols": ["header"],
-    "transports": ["buffered"],
-    "sockets": ["ip"],
-    "workdir": "features"
-  },
-  {
-    "description": "THeader detects framed compact wire format",
-    "name": "theader_framed_compact",
-    "command": [
-      "python",
-      "theader_binary.py",
-      "--override-protocol=compact",
-      "--override-transport=framed"
-    ],
-    "protocols": ["header"],
-    "transports": ["buffered"],
-    "sockets": ["ip"],
-    "workdir": "features"
-  },
-  {
-    "name": "limit_string_length",
-    "command": [
-      "python",
-      "string_limit.py",
-      "--limit=50"
-    ],
-    "remote_args": [
-      "--string-limit=50"
-    ],
-    "protocols": [
-      "binary",
-      "compact"
-    ],
-    "transports": ["buffered"],
-    "sockets": ["ip"],
-    "workdir": "features"
-  },
-  {
-    "name": "limit_container_length",
-    "command": [
-      "python",
-      "container_limit.py",
-      "--limit=50"
-    ],
-    "remote_args": [
-      "--container-limit=50"
-    ],
-    "protocols": [
-      "binary",
-      "compact"
-    ],
-    "transports": ["buffered"],
-    "sockets": ["ip"],
-    "workdir": "features"
-  }
-]
diff --git a/vendor/git.apache.org/thrift.git/test/features/theader_binary.py b/vendor/git.apache.org/thrift.git/test/features/theader_binary.py
deleted file mode 100644
index 451399a..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/theader_binary.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import socket
-import sys
-
-from util import add_common_args
-from local_thrift import thrift  # noqa
-from thrift.Thrift import TMessageType, TType
-from thrift.transport.TSocket import TSocket
-from thrift.transport.TTransport import TBufferedTransport, TFramedTransport
-from thrift.protocol.TBinaryProtocol import TBinaryProtocol
-from thrift.protocol.TCompactProtocol import TCompactProtocol
-
-
-def test_void(proto):
-    proto.writeMessageBegin('testVoid', TMessageType.CALL, 3)
-    proto.writeStructBegin('testVoid_args')
-    proto.writeFieldStop()
-    proto.writeStructEnd()
-    proto.writeMessageEnd()
-    proto.trans.flush()
-
-    _, mtype, _ = proto.readMessageBegin()
-    assert mtype == TMessageType.REPLY
-    proto.readStructBegin()
-    _, ftype, _ = proto.readFieldBegin()
-    assert ftype == TType.STOP
-    proto.readStructEnd()
-    proto.readMessageEnd()
-
-
-# THeader stack should accept binary protocol with optionally framed transport
-def main(argv):
-    p = argparse.ArgumentParser()
-    add_common_args(p)
-    # Since THeaderTransport acts as framed transport when detected frame, we
-    # cannot use --transport=framed as it would result in 2 layered frames.
-    p.add_argument('--override-transport')
-    p.add_argument('--override-protocol')
-    args = p.parse_args()
-    assert args.protocol == 'header'
-    assert args.transport == 'buffered'
-    assert not args.ssl
-
-    sock = TSocket(args.host, args.port, socket_family=socket.AF_INET)
-    if not args.override_transport or args.override_transport == 'buffered':
-        trans = TBufferedTransport(sock)
-    elif args.override_transport == 'framed':
-        print('TFRAMED')
-        trans = TFramedTransport(sock)
-    else:
-        raise ValueError('invalid transport')
-    trans.open()
-
-    if not args.override_protocol or args.override_protocol == 'binary':
-        proto = TBinaryProtocol(trans)
-    elif args.override_protocol == 'compact':
-        proto = TCompactProtocol(trans)
-    else:
-        raise ValueError('invalid transport')
-
-    test_void(proto)
-    test_void(proto)
-
-    trans.close()
-
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
diff --git a/vendor/git.apache.org/thrift.git/test/features/util.py b/vendor/git.apache.org/thrift.git/test/features/util.py
deleted file mode 100644
index 3abbbbd..0000000
--- a/vendor/git.apache.org/thrift.git/test/features/util.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import argparse
-import socket
-
-from local_thrift import thrift  # noqa
-from thrift.transport.TSocket import TSocket
-from thrift.transport.TTransport import TBufferedTransport, TFramedTransport
-from thrift.transport.THttpClient import THttpClient
-from thrift.protocol.TBinaryProtocol import TBinaryProtocol
-from thrift.protocol.TCompactProtocol import TCompactProtocol
-from thrift.protocol.TJSONProtocol import TJSONProtocol
-
-
-def add_common_args(p):
-    p.add_argument('--host', default='localhost')
-    p.add_argument('--port', type=int, default=9090)
-    p.add_argument('--protocol', default='binary')
-    p.add_argument('--transport', default='buffered')
-    p.add_argument('--ssl', action='store_true')
-
-
-def parse_common_args(argv):
-    p = argparse.ArgumentParser()
-    add_common_args(p)
-    return p.parse_args(argv)
-
-
-def init_protocol(args):
-    sock = TSocket(args.host, args.port, socket_family=socket.AF_INET)
-    sock.setTimeout(500)
-    trans = {
-        'buffered': TBufferedTransport,
-        'framed': TFramedTransport,
-        'http': THttpClient,
-    }[args.transport](sock)
-    trans.open()
-    return {
-        'binary': TBinaryProtocol,
-        'compact': TCompactProtocol,
-        'json': TJSONProtocol,
-    }[args.protocol](trans)
diff --git a/vendor/git.apache.org/thrift.git/test/go/Makefile.am b/vendor/git.apache.org/thrift.git/test/go/Makefile.am
deleted file mode 100644
index 2b2dbce..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-BUILT_SOURCES = gopath
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-THRIFTCMD = $(THRIFT) -out src/gen --gen go:thrift_import=thrift
-THRIFTTEST = $(top_srcdir)/test/ThriftTest.thrift
-
-precross: bin/testclient bin/testserver
-
-ThriftTest.thrift: $(THRIFTTEST)
-	grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift
-
-# Thrift for GO has problems with complex map keys: THRIFT-2063
-gopath: $(THRIFT) ThriftTest.thrift
-	mkdir -p src/gen
-	$(THRIFTCMD) ThriftTest.thrift
-	$(THRIFTCMD) ../StressTest.thrift
-	ln -nfs ../../../lib/go/thrift src/thrift
-	GOPATH=`pwd` $(GO) get github.com/golang/mock/gomock
-	touch gopath
-
-bin/testclient: gopath
-	GOPATH=`pwd` $(GO) install bin/testclient
-
-bin/testserver: gopath
-	GOPATH=`pwd` $(GO) install bin/testserver
-
-bin/stress: gopath
-	GOPATH=`pwd` $(GO) install bin/stress
-
-clean-local:
-	$(RM) -r src/gen src/github.com/golang src/thrift bin pkg gopath ThriftTest.thrift
-
-check_PROGRAMS: bin/testclient bin/testserver bin/stress
-
-check: gopath
-	GOPATH=`pwd` $(GO) test -v common/...
-
-genmock: gopath
-	GOPATH=`pwd` $(GO) install github.com/golang/mock/mockgen
-	GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest
-
-EXTRA_DIST = \
-	src/bin \
-	src/common
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/bin/stress/main.go b/vendor/git.apache.org/thrift.git/test/go/src/bin/stress/main.go
deleted file mode 100644
index 1f713bb..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/bin/stress/main.go
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"gen/stress"
-	"log"
-	_ "net/http/pprof"
-	"os"
-	"runtime"
-	"runtime/pprof"
-	"sync"
-	"sync/atomic"
-	"thrift"
-	"time"
-)
-
-var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to this file")
-var memprofile = flag.String("memprofile", "", "write memory profile to this file")
-
-var (
-	host      = flag.String("host", "localhost", "Host to connect")
-	port      = flag.Int64("port", 9091, "Port number to connect")
-	loop      = flag.Int("loops", 50000, "The number of remote thrift calls each client makes")
-	runserver = flag.Int("server", 1, "Run the Thrift server in this process")
-	clients   = flag.Int("clients", 20, "Number of client threads to create - 0 implies no clients, i.e. server only")
-	callName  = flag.String("call", "echoVoid", "Service method to call, one of echoVoid, echoByte, echoI32, echoI64, echoString, echiList, echoSet, echoMap")
-	compact   = flag.Bool("compact", false, "Use compact protocol instead of binary.")
-	framed    = flag.Bool("framed", false, "Use framed transport instead of buffered.")
-)
-var hostPort string
-
-type callT int64
-
-const (
-	echoVoid callT = iota
-	echoByte
-	echoI32
-	echoI64
-	echoString
-	echiList
-	echoSet
-	echoMap
-)
-
-var callTMap = map[string]callT{
-	"echoVoid":   echoVoid,
-	"echoByte":   echoByte,
-	"echoI32":    echoI32,
-	"echoI64":    echoI64,
-	"echoString": echoString,
-	"echiList":   echiList,
-	"echoSet":    echoSet,
-	"echoMap":    echoMap,
-}
-var callType callT
-
-var ready, done sync.WaitGroup
-
-var clicounter int64 = 0
-var counter int64 = 0
-
-func main() {
-	flag.Parse()
-	if *memprofile != "" {
-		runtime.MemProfileRate = 100
-	}
-	var ok bool
-	if callType, ok = callTMap[*callName]; !ok {
-		log.Fatal("Unknown service call", *callName)
-	}
-	if *cpuprofile != "" {
-		f, err := os.Create(*cpuprofile)
-		if err != nil {
-			log.Fatal(err)
-		}
-		pprof.StartCPUProfile(f)
-		defer pprof.StopCPUProfile()
-	}
-	hostPort = fmt.Sprintf("%s:%d", *host, *port)
-	var protocolFactory thrift.TProtocolFactory
-	var transportFactory thrift.TTransportFactory
-
-	if *compact {
-		protocolFactory = thrift.NewTCompactProtocolFactory()
-	} else {
-		protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
-	}
-
-	if *framed {
-		transportFactory = thrift.NewTTransportFactory()
-		transportFactory = thrift.NewTFramedTransportFactory(transportFactory)
-	} else {
-		transportFactory = thrift.NewTBufferedTransportFactory(8192)
-	}
-
-	if *runserver > 0 {
-		serverTransport, err := thrift.NewTServerSocket(hostPort)
-		if err != nil {
-			log.Fatalf("Unable to create server socket: %s", err)
-		}
-
-		processor := stress.NewServiceProcessor(&handler{})
-		server := thrift.NewTSimpleServer4(processor, serverTransport, transportFactory, protocolFactory)
-		if *clients == 0 {
-			server.Serve()
-		} else {
-			go server.Serve()
-		}
-	}
-	//start clients
-	if *clients != 0 {
-		ready.Add(*clients + 1)
-		done.Add(*clients)
-		for i := 0; i < *clients; i++ {
-			go client(protocolFactory)
-		}
-		ready.Done()
-		ready.Wait()
-		//run!
-		startTime := time.Now()
-		//wait for completion
-		done.Wait()
-		endTime := time.Now()
-		duration := endTime.Sub(startTime)
-		log.Printf("%d calls in %v (%f calls per second)\n", clicounter, duration, float64(clicounter)/duration.Seconds())
-	}
-	if *memprofile != "" {
-		f, err := os.Create(*memprofile)
-		if err != nil {
-			log.Fatal(err)
-		}
-		pprof.WriteHeapProfile(f)
-		f.Close()
-		return
-	}
-}
-
-func client(protocolFactory thrift.TProtocolFactory) {
-	trans, err := thrift.NewTSocket(hostPort)
-	if err != nil {
-		log.Fatalf("Unable to create server socket: %s", err)
-	}
-	btrans := thrift.NewTBufferedTransport(trans, 2048)
-	client := stress.NewServiceClientFactory(btrans, protocolFactory)
-	err = trans.Open()
-	if err != nil {
-		log.Fatalf("Unable to open connection: %s", err)
-	}
-	ready.Done()
-	ready.Wait()
-	switch callType {
-	case echoVoid:
-		for i := 0; i < *loop; i++ {
-			client.EchoVoid()
-			atomic.AddInt64(&clicounter, 1)
-		}
-	case echoByte:
-		for i := 0; i < *loop; i++ {
-			client.EchoByte(42)
-			atomic.AddInt64(&clicounter, 1)
-		}
-	case echoI32:
-		for i := 0; i < *loop; i++ {
-			client.EchoI32(4242)
-			atomic.AddInt64(&clicounter, 1)
-		}
-	case echoI64:
-		for i := 0; i < *loop; i++ {
-			client.EchoI64(424242)
-			atomic.AddInt64(&clicounter, 1)
-		}
-	case echoString:
-		for i := 0; i < *loop; i++ {
-			client.EchoString("TestString")
-			atomic.AddInt64(&clicounter, 1)
-		}
-	case echiList:
-		l := []int8{-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8}
-		for i := 0; i < *loop; i++ {
-			client.EchoList(l)
-			atomic.AddInt64(&clicounter, 1)
-		}
-	case echoSet:
-		s := map[int8]struct{}{-10: {}, -9: {}, -8: {}, -7: {}, -6: {}, -5: {}, -4: {}, -3: {}, -2: {}, -1: {}, 0: {}, 1: {}, 2: {}, 3: {}, 4: {}, 5: {}, 6: {}, 7: {}, 8: {}}
-		for i := 0; i < *loop; i++ {
-			client.EchoSet(s)
-			atomic.AddInt64(&clicounter, 1)
-		}
-	case echoMap:
-		m := map[int8]int8{-10: 10, -9: 9, -8: 8, -7: 7, -6: 6, -5: 5, -4: 4, -3: 3, -2: 2, -1: 1, 0: 0, 1: 1, 2: 2, 3: 3, 4: 4, 5: 5, 6: 6, 7: 7, 8: 8}
-		for i := 0; i < *loop; i++ {
-			client.EchoMap(m)
-			atomic.AddInt64(&clicounter, 1)
-		}
-	}
-
-	done.Done()
-}
-
-type handler struct{}
-
-func (h *handler) EchoVoid() (err error) {
-	atomic.AddInt64(&counter, 1)
-	return nil
-}
-func (h *handler) EchoByte(arg int8) (r int8, err error) {
-	atomic.AddInt64(&counter, 1)
-	return arg, nil
-}
-func (h *handler) EchoI32(arg int32) (r int32, err error) {
-	atomic.AddInt64(&counter, 1)
-	return arg, nil
-}
-func (h *handler) EchoI64(arg int64) (r int64, err error) {
-	atomic.AddInt64(&counter, 1)
-	return arg, nil
-}
-func (h *handler) EchoString(arg string) (r string, err error) {
-	atomic.AddInt64(&counter, 1)
-	return arg, nil
-}
-func (h *handler) EchoList(arg []int8) (r []int8, err error) {
-	atomic.AddInt64(&counter, 1)
-	return arg, nil
-}
-func (h *handler) EchoSet(arg map[int8]struct{}) (r map[int8]struct{}, err error) {
-	atomic.AddInt64(&counter, 1)
-	return arg, nil
-}
-func (h *handler) EchoMap(arg map[int8]int8) (r map[int8]int8, err error) {
-	atomic.AddInt64(&counter, 1)
-	return arg, nil
-}
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/bin/testclient/main.go b/vendor/git.apache.org/thrift.git/test/go/src/bin/testclient/main.go
deleted file mode 100644
index f4a19dd..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/bin/testclient/main.go
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package main
-
-import (
-	"common"
-	"flag"
-	"gen/thrifttest"
-	t "log"
-	"reflect"
-	"thrift"
-)
-
-var host = flag.String("host", "localhost", "Host to connect")
-var port = flag.Int64("port", 9090, "Port number to connect")
-var domain_socket = flag.String("domain-socket", "", "Domain Socket (e.g. /tmp/thrifttest.thrift), instead of host and port")
-var transport = flag.String("transport", "buffered", "Transport: buffered, framed, http, zlib")
-var protocol = flag.String("protocol", "binary", "Protocol: binary, compact, json")
-var ssl = flag.Bool("ssl", false, "Encrypted Transport using SSL")
-var testloops = flag.Int("testloops", 1, "Number of Tests")
-
-func main() {
-	flag.Parse()
-	client, err := common.StartClient(*host, *port, *domain_socket, *transport, *protocol, *ssl)
-	if err != nil {
-		t.Fatalf("Unable to start client: ", err)
-	}
-	for i := 0; i < *testloops; i++ {
-		callEverything(client)
-	}
-}
-
-var rmapmap = map[int32]map[int32]int32{
-	-4: map[int32]int32{-4: -4, -3: -3, -2: -2, -1: -1},
-	4:  map[int32]int32{4: 4, 3: 3, 2: 2, 1: 1},
-}
-
-var xxs = &thrifttest.Xtruct{
-	StringThing: "Hello2",
-	ByteThing:   42,
-	I32Thing:    4242,
-	I64Thing:    424242,
-}
-
-var xcept = &thrifttest.Xception{ErrorCode: 1001, Message: "Xception"}
-
-func callEverything(client *thrifttest.ThriftTestClient) {
-	var err error
-	if err = client.TestVoid(); err != nil {
-		t.Fatalf("Unexpected error in TestVoid() call: ", err)
-	}
-
-	thing, err := client.TestString("thing")
-	if err != nil {
-		t.Fatalf("Unexpected error in TestString() call: ", err)
-	}
-	if thing != "thing" {
-		t.Fatalf("Unexpected TestString() result, expected 'thing' got '%s' ", thing)
-	}
-
-	bl, err := client.TestBool(true)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestBool() call: ", err)
-	}
-	if !bl {
-		t.Fatalf("Unexpected TestBool() result expected true, got %f ", bl)
-	}
-	bl, err = client.TestBool(false)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestBool() call: ", err)
-	}
-	if bl {
-		t.Fatalf("Unexpected TestBool() result expected false, got %f ", bl)
-	}
-
-	b, err := client.TestByte(42)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestByte() call: ", err)
-	}
-	if b != 42 {
-		t.Fatalf("Unexpected TestByte() result expected 42, got %d ", b)
-	}
-
-	i32, err := client.TestI32(4242)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestI32() call: ", err)
-	}
-	if i32 != 4242 {
-		t.Fatalf("Unexpected TestI32() result expected 4242, got %d ", i32)
-	}
-
-	i64, err := client.TestI64(424242)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestI64() call: ", err)
-	}
-	if i64 != 424242 {
-		t.Fatalf("Unexpected TestI64() result expected 424242, got %d ", i64)
-	}
-
-	d, err := client.TestDouble(42.42)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestDouble() call: ", err)
-	}
-	if d != 42.42 {
-		t.Fatalf("Unexpected TestDouble() result expected 42.42, got %f ", d)
-	}
-
-	binout := make([]byte, 256)
-	for i := 0; i < 256; i++ {
-		binout[i] = byte(i)
-	}
-	bin, err := client.TestBinary(binout)
-	for i := 0; i < 256; i++ {
-		if (binout[i] != bin[i]) {
-			t.Fatalf("Unexpected TestBinary() result expected %d, got %d ", binout[i], bin[i])
-		}
-	}
-	
-	xs := thrifttest.NewXtruct()
-	xs.StringThing = "thing"
-	xs.ByteThing = 42
-	xs.I32Thing = 4242
-	xs.I64Thing = 424242
-	xsret, err := client.TestStruct(xs)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestStruct() call: ", err)
-	}
-	if *xs != *xsret {
-		t.Fatalf("Unexpected TestStruct() result expected %#v, got %#v ", xs, xsret)
-	}
-
-	x2 := thrifttest.NewXtruct2()
-	x2.StructThing = xs
-	x2ret, err := client.TestNest(x2)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestNest() call: ", err)
-	}
-	if !reflect.DeepEqual(x2, x2ret) {
-		t.Fatalf("Unexpected TestNest() result expected %#v, got %#v ", x2, x2ret)
-	}
-
-	m := map[int32]int32{1: 2, 3: 4, 5: 42}
-	mret, err := client.TestMap(m)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestMap() call: ", err)
-	}
-	if !reflect.DeepEqual(m, mret) {
-		t.Fatalf("Unexpected TestMap() result expected %#v, got %#v ", m, mret)
-	}
-
-	sm := map[string]string{"a": "2", "b": "blah", "some": "thing"}
-	smret, err := client.TestStringMap(sm)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestStringMap() call: ", err)
-	}
-	if !reflect.DeepEqual(sm, smret) {
-		t.Fatalf("Unexpected TestStringMap() result expected %#v, got %#v ", sm, smret)
-	}
-
-	s := map[int32]struct{}{1: struct{}{}, 2: struct{}{}, 42: struct{}{}}
-	sret, err := client.TestSet(s)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestSet() call: ", err)
-	}
-	if !reflect.DeepEqual(s, sret) {
-		t.Fatalf("Unexpected TestSet() result expected %#v, got %#v ", s, sret)
-	}
-
-	l := []int32{1, 2, 42}
-	lret, err := client.TestList(l)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestList() call: ", err)
-	}
-	if !reflect.DeepEqual(l, lret) {
-		t.Fatalf("Unexpected TestSet() result expected %#v, got %#v ", l, lret)
-	}
-
-	eret, err := client.TestEnum(thrifttest.Numberz_TWO)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestEnum() call: ", err)
-	}
-	if eret != thrifttest.Numberz_TWO {
-		t.Fatalf("Unexpected TestEnum() result expected %#v, got %#v ", thrifttest.Numberz_TWO, eret)
-	}
-
-	tret, err := client.TestTypedef(thrifttest.UserId(42))
-	if err != nil {
-		t.Fatalf("Unexpected error in TestTypedef() call: ", err)
-	}
-	if tret != thrifttest.UserId(42) {
-		t.Fatalf("Unexpected TestTypedef() result expected %#v, got %#v ", thrifttest.UserId(42), tret)
-	}
-
-	mapmap, err := client.TestMapMap(42)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestMapMap() call: ", err)
-	}
-	if !reflect.DeepEqual(mapmap, rmapmap) {
-		t.Fatalf("Unexpected TestMapMap() result expected %#v, got %#v ", rmapmap, mapmap)
-	}
-
-	crazy := thrifttest.NewInsanity()
-	crazy.UserMap = map[thrifttest.Numberz]thrifttest.UserId {
-		thrifttest.Numberz_FIVE: 5,
-		thrifttest.Numberz_EIGHT: 8,
-	}
-	truck1 := thrifttest.NewXtruct()
-	truck1.StringThing = "Goodbye4"
-	truck1.ByteThing = 4;
-	truck1.I32Thing = 4;
-	truck1.I64Thing = 4;
-	truck2 := thrifttest.NewXtruct()
-	truck2.StringThing = "Hello2"
-	truck2.ByteThing = 2;
-	truck2.I32Thing = 2;
-	truck2.I64Thing = 2;
-	crazy.Xtructs = []*thrifttest.Xtruct {
-		truck1,
-		truck2,
-	}
-	insanity, err := client.TestInsanity(crazy)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestInsanity() call: ", err)
-	}
-	if !reflect.DeepEqual(crazy, insanity[1][2]) {
-		t.Fatalf("Unexpected TestInsanity() first result expected %#v, got %#v ",
-		crazy,
-		insanity[1][2])
-	}
-	if !reflect.DeepEqual(crazy, insanity[1][3]) {
-		t.Fatalf("Unexpected TestInsanity() second result expected %#v, got %#v ",
-		crazy,
-		insanity[1][3])
-	}
-	if len(insanity[2][6].UserMap) > 0 || len(insanity[2][6].Xtructs) > 0 {
-		t.Fatalf("Unexpected TestInsanity() non-empty result got %#v ",
-		insanity[2][6])
-	}
-
-	xxsret, err := client.TestMulti(42, 4242, 424242, map[int16]string{1: "blah", 2: "thing"}, thrifttest.Numberz_EIGHT, thrifttest.UserId(24))
-	if err != nil {
-		t.Fatalf("Unexpected error in TestMulti() call: ", err)
-	}
-	if !reflect.DeepEqual(xxs, xxsret) {
-		t.Fatalf("Unexpected TestMulti() result expected %#v, got %#v ", xxs, xxsret)
-	}
-
-	err = client.TestException("Xception")
-	if err == nil {
-		t.Fatalf("Expecting exception in TestException() call")
-	}
-	if !reflect.DeepEqual(err, xcept) {
-		t.Fatalf("Unexpected TestException() result expected %#v, got %#v ", xcept, err)
-	}
-
-	err = client.TestException("TException")
-	_, ok := err.(thrift.TApplicationException)
-	if err == nil || !ok {
-		t.Fatalf("Unexpected TestException() result expected ApplicationError, got %#v ", err)
-	}
-
-	ign, err := client.TestMultiException("Xception", "ignoreme")
-	if ign != nil || err == nil {
-		t.Fatalf("Expecting exception in TestMultiException() call")
-	}
-	if !reflect.DeepEqual(err, &thrifttest.Xception{ErrorCode: 1001, Message: "This is an Xception"}) {
-		t.Fatalf("Unexpected TestMultiException() %#v ", err)
-	}
-
-	ign, err = client.TestMultiException("Xception2", "ignoreme")
-	if ign != nil || err == nil {
-		t.Fatalf("Expecting exception in TestMultiException() call")
-	}
-	expecting := &thrifttest.Xception2{ErrorCode: 2002, StructThing: &thrifttest.Xtruct{StringThing: "This is an Xception2"}}
-
-	if !reflect.DeepEqual(err, expecting) {
-		t.Fatalf("Unexpected TestMultiException() %#v ", err)
-	}
-
-	err = client.TestOneway(2)
-	if err != nil {
-		t.Fatalf("Unexpected error in TestOneway() call: ", err)
-	}
-
-	//Make sure the connection still alive
-	if err = client.TestVoid(); err != nil {
-		t.Fatalf("Unexpected error in TestVoid() call: ", err)
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/bin/testserver/main.go b/vendor/git.apache.org/thrift.git/test/go/src/bin/testserver/main.go
deleted file mode 100644
index 0bf833d..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/bin/testserver/main.go
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package main
-
-import (
-	"common"
-	"flag"
-	"fmt"
-	"log"
-	"net/http"
-	"thrift"
-)
-
-var host = flag.String("host", "localhost", "Host to connect")
-var port = flag.Int64("port", 9090, "Port number to connect")
-var domain_socket = flag.String("domain-socket", "", "Domain Socket (e.g. /tmp/ThriftTest.thrift), instead of host and port")
-var transport = flag.String("transport", "buffered", "Transport: buffered, framed, http, zlib")
-var protocol = flag.String("protocol", "binary", "Protocol: binary, compact, json")
-var ssl = flag.Bool("ssl", false, "Encrypted Transport using SSL")
-var certPath = flag.String("certPath", "keys", "Directory that contains SSL certificates")
-
-func main() {
-	flag.Parse()
-
-	processor, serverTransport, transportFactory, protocolFactory, err := common.GetServerParams(*host, *port, *domain_socket, *transport, *protocol, *ssl, *certPath, common.PrintingHandler)
-
-	if err != nil {
-		log.Fatalf("Unable to process server params: ", err)
-	}
-
-	if *transport == "http" {
-		http.HandleFunc("/", thrift.NewThriftHandlerFunc(processor, protocolFactory, protocolFactory))
-
-		if *ssl {
-			err := http.ListenAndServeTLS(fmt.Sprintf(":%d", *port),
-				*certPath+"/server.pem", *certPath+"/server.key", nil)
-
-			if err != nil {
-				fmt.Println(err)
-				return
-			}
-		} else {
-			http.ListenAndServe(fmt.Sprintf(":%d", *port), nil)
-		}
-	} else {
-		server := thrift.NewTSimpleServer4(processor, serverTransport, transportFactory, protocolFactory)
-		if err = server.Listen(); err != nil {
-			return
-		}
-		go server.AcceptLoop()
-		server.Serve()
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/common/client.go b/vendor/git.apache.org/thrift.git/test/go/src/common/client.go
deleted file mode 100644
index 4251d91..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/common/client.go
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package common
-
-import (
-	"compress/zlib"
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"gen/thrifttest"
-	"net/http"
-	"thrift"
-)
-
-var debugClientProtocol bool
-
-func init() {
-	flag.BoolVar(&debugClientProtocol, "debug_client_protocol", false, "turn client protocol trace on")
-}
-
-func StartClient(
-	host string,
-	port int64,
-	domain_socket string,
-	transport string,
-	protocol string,
-	ssl bool) (client *thrifttest.ThriftTestClient, err error) {
-
-	hostPort := fmt.Sprintf("%s:%d", host, port)
-
-	var protocolFactory thrift.TProtocolFactory
-	switch protocol {
-	case "compact":
-		protocolFactory = thrift.NewTCompactProtocolFactory()
-	case "simplejson":
-		protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
-	case "json":
-		protocolFactory = thrift.NewTJSONProtocolFactory()
-	case "binary":
-		protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
-	default:
-		return nil, fmt.Errorf("Invalid protocol specified %s", protocol)
-	}
-	if debugClientProtocol {
-		protocolFactory = thrift.NewTDebugProtocolFactory(protocolFactory, "client:")
-	}
-	var trans thrift.TTransport
-	if ssl {
-		trans, err = thrift.NewTSSLSocket(hostPort, &tls.Config{InsecureSkipVerify: true})
-	} else {
-		if domain_socket != "" {
-			trans, err = thrift.NewTSocket(domain_socket)
-		} else {
-			trans, err = thrift.NewTSocket(hostPort)
-		}
-	}
-	if err != nil {
-		return nil, err
-	}
-	switch transport {
-	case "http":
-		if ssl {
-			tr := &http.Transport{
-				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-			}
-			client := &http.Client{Transport: tr}
-			trans, err = thrift.NewTHttpPostClientWithOptions(fmt.Sprintf("https://%s/", hostPort), thrift.THttpClientOptions{Client: client})
-			fmt.Println(hostPort)
-		} else {
-			trans, err = thrift.NewTHttpPostClient(fmt.Sprintf("http://%s/", hostPort))
-		}
-
-		if err != nil {
-			return nil, err
-		}
-
-	case "framed":
-		trans = thrift.NewTFramedTransport(trans)
-	case "buffered":
-		trans = thrift.NewTBufferedTransport(trans, 8192)
-	case "zlib":
-		trans, err = thrift.NewTZlibTransport(trans, zlib.BestCompression)
-		if err != nil {
-			return nil, err
-		}
-	case "":
-		trans = trans
-	default:
-		return nil, fmt.Errorf("Invalid transport specified %s", transport)
-	}
-
-	if err = trans.Open(); err != nil {
-		return nil, err
-	}
-	client = thrifttest.NewThriftTestClientFactory(trans, protocolFactory)
-	return
-}
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/common/clientserver_test.go b/vendor/git.apache.org/thrift.git/test/go/src/common/clientserver_test.go
deleted file mode 100644
index 549e8d1..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/common/clientserver_test.go
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package common
-
-import (
-	"errors"
-	"gen/thrifttest"
-	"reflect"
-	"testing"
-	"thrift"
-
-	"github.com/golang/mock/gomock"
-)
-
-type test_unit struct {
-	host          string
-	port          int64
-	domain_socket string
-	transport     string
-	protocol      string
-	ssl           bool
-}
-
-var units = []test_unit{
-	{"127.0.0.1", 9095, "", "", "binary", false},
-	{"127.0.0.1", 9091, "", "", "compact", false},
-	{"127.0.0.1", 9092, "", "", "binary", true},
-	{"127.0.0.1", 9093, "", "", "compact", true},
-}
-
-func TestAllConnection(t *testing.T) {
-	certPath = "../../../keys"
-	for _, unit := range units {
-		t.Logf("%#v", unit)
-		doUnit(t, &unit)
-	}
-}
-
-func doUnit(t *testing.T, unit *test_unit) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-	handler := NewMockThriftTest(ctrl)
-
-	processor, serverTransport, transportFactory, protocolFactory, err := GetServerParams(unit.host, unit.port, unit.domain_socket, unit.transport, unit.protocol, unit.ssl, "../../../keys", handler)
-
-	server := thrift.NewTSimpleServer4(processor, serverTransport, transportFactory, protocolFactory)
-	if err = server.Listen(); err != nil {
-		t.Errorf("Unable to start server", err)
-		t.FailNow()
-	}
-	go server.AcceptLoop()
-	defer server.Stop()
-	client, err := StartClient(unit.host, unit.port, unit.domain_socket, unit.transport, unit.protocol, unit.ssl)
-	if err != nil {
-		t.Errorf("Unable to start client", err)
-		t.FailNow()
-	}
-	defer client.Transport.Close()
-	callEverythingWithMock(t, client, handler)
-}
-
-var rmapmap = map[int32]map[int32]int32{
-	-4: map[int32]int32{-4: -4, -3: -3, -2: -2, -1: -1},
-	4:  map[int32]int32{4: 4, 3: 3, 2: 2, 1: 1},
-}
-
-var xxs = &thrifttest.Xtruct{
-	StringThing: "Hello2",
-	ByteThing:   42,
-	I32Thing:    4242,
-	I64Thing:    424242,
-}
-
-var xcept = &thrifttest.Xception{ErrorCode: 1001, Message: "some"}
-
-func callEverythingWithMock(t *testing.T, client *thrifttest.ThriftTestClient, handler *MockThriftTest) {
-	gomock.InOrder(
-		handler.EXPECT().TestVoid(),
-		handler.EXPECT().TestString("thing").Return("thing", nil),
-		handler.EXPECT().TestBool(true).Return(true, nil),
-		handler.EXPECT().TestBool(false).Return(false, nil),
-		handler.EXPECT().TestByte(int8(42)).Return(int8(42), nil),
-		handler.EXPECT().TestI32(int32(4242)).Return(int32(4242), nil),
-		handler.EXPECT().TestI64(int64(424242)).Return(int64(424242), nil),
-		// TODO: add TestBinary()
-		handler.EXPECT().TestDouble(float64(42.42)).Return(float64(42.42), nil),
-		handler.EXPECT().TestStruct(&thrifttest.Xtruct{StringThing: "thing", ByteThing: 42, I32Thing: 4242, I64Thing: 424242}).Return(&thrifttest.Xtruct{StringThing: "thing", ByteThing: 42, I32Thing: 4242, I64Thing: 424242}, nil),
-		handler.EXPECT().TestNest(&thrifttest.Xtruct2{StructThing: &thrifttest.Xtruct{StringThing: "thing", ByteThing: 42, I32Thing: 4242, I64Thing: 424242}}).Return(&thrifttest.Xtruct2{StructThing: &thrifttest.Xtruct{StringThing: "thing", ByteThing: 42, I32Thing: 4242, I64Thing: 424242}}, nil),
-		handler.EXPECT().TestMap(map[int32]int32{1: 2, 3: 4, 5: 42}).Return(map[int32]int32{1: 2, 3: 4, 5: 42}, nil),
-		handler.EXPECT().TestStringMap(map[string]string{"a": "2", "b": "blah", "some": "thing"}).Return(map[string]string{"a": "2", "b": "blah", "some": "thing"}, nil),
-		handler.EXPECT().TestSet(map[int32]struct{}{1: struct{}{}, 2: struct{}{}, 42: struct{}{}}).Return(map[int32]struct{}{1: struct{}{}, 2: struct{}{}, 42: struct{}{}}, nil),
-		handler.EXPECT().TestList([]int32{1, 2, 42}).Return([]int32{1, 2, 42}, nil),
-		handler.EXPECT().TestEnum(thrifttest.Numberz_TWO).Return(thrifttest.Numberz_TWO, nil),
-		handler.EXPECT().TestTypedef(thrifttest.UserId(42)).Return(thrifttest.UserId(42), nil),
-		handler.EXPECT().TestMapMap(int32(42)).Return(rmapmap, nil),
-		// TODO: not testing insanity
-		handler.EXPECT().TestMulti(int8(42), int32(4242), int64(424242), map[int16]string{1: "blah", 2: "thing"}, thrifttest.Numberz_EIGHT, thrifttest.UserId(24)).Return(xxs, nil),
-		handler.EXPECT().TestException("some").Return(xcept),
-		handler.EXPECT().TestException("TException").Return(errors.New("Just random exception")),
-		handler.EXPECT().TestMultiException("Xception", "ignoreme").Return(nil, &thrifttest.Xception{ErrorCode: 1001, Message: "This is an Xception"}),
-		handler.EXPECT().TestMultiException("Xception2", "ignoreme").Return(nil, &thrifttest.Xception2{ErrorCode: 2002, StructThing: &thrifttest.Xtruct{StringThing: "This is an Xception2"}}),
-		handler.EXPECT().TestOneway(int32(2)).Return(nil),
-		handler.EXPECT().TestVoid(),
-	)
-	var err error
-	if err = client.TestVoid(); err != nil {
-		t.Errorf("Unexpected error in TestVoid() call: ", err)
-	}
-
-	thing, err := client.TestString("thing")
-	if err != nil {
-		t.Errorf("Unexpected error in TestString() call: ", err)
-	}
-	if thing != "thing" {
-		t.Errorf("Unexpected TestString() result, expected 'thing' got '%s' ", thing)
-	}
-
-	bl, err := client.TestBool(true)
-	if err != nil {
-		t.Errorf("Unexpected error in TestBool() call: ", err)
-	}
-	if !bl {
-		t.Errorf("Unexpected TestBool() result expected true, got %f ", bl)
-	}
-	bl, err = client.TestBool(false)
-	if err != nil {
-		t.Errorf("Unexpected error in TestBool() call: ", err)
-	}
-	if bl {
-		t.Errorf("Unexpected TestBool() result expected false, got %f ", bl)
-	}
-
-	b, err := client.TestByte(42)
-	if err != nil {
-		t.Errorf("Unexpected error in TestByte() call: ", err)
-	}
-	if b != 42 {
-		t.Errorf("Unexpected TestByte() result expected 42, got %d ", b)
-	}
-
-	i32, err := client.TestI32(4242)
-	if err != nil {
-		t.Errorf("Unexpected error in TestI32() call: ", err)
-	}
-	if i32 != 4242 {
-		t.Errorf("Unexpected TestI32() result expected 4242, got %d ", i32)
-	}
-
-	i64, err := client.TestI64(424242)
-	if err != nil {
-		t.Errorf("Unexpected error in TestI64() call: ", err)
-	}
-	if i64 != 424242 {
-		t.Errorf("Unexpected TestI64() result expected 424242, got %d ", i64)
-	}
-
-	d, err := client.TestDouble(42.42)
-	if err != nil {
-		t.Errorf("Unexpected error in TestDouble() call: ", err)
-	}
-	if d != 42.42 {
-		t.Errorf("Unexpected TestDouble() result expected 42.42, got %f ", d)
-	}
-
-	// TODO: add TestBinary() call
-
-	xs := thrifttest.NewXtruct()
-	xs.StringThing = "thing"
-	xs.ByteThing = 42
-	xs.I32Thing = 4242
-	xs.I64Thing = 424242
-	xsret, err := client.TestStruct(xs)
-	if err != nil {
-		t.Errorf("Unexpected error in TestStruct() call: ", err)
-	}
-	if *xs != *xsret {
-		t.Errorf("Unexpected TestStruct() result expected %#v, got %#v ", xs, xsret)
-	}
-
-	x2 := thrifttest.NewXtruct2()
-	x2.StructThing = xs
-	x2ret, err := client.TestNest(x2)
-	if err != nil {
-		t.Errorf("Unexpected error in TestNest() call: ", err)
-	}
-	if !reflect.DeepEqual(x2, x2ret) {
-		t.Errorf("Unexpected TestNest() result expected %#v, got %#v ", x2, x2ret)
-	}
-
-	m := map[int32]int32{1: 2, 3: 4, 5: 42}
-	mret, err := client.TestMap(m)
-	if err != nil {
-		t.Errorf("Unexpected error in TestMap() call: ", err)
-	}
-	if !reflect.DeepEqual(m, mret) {
-		t.Errorf("Unexpected TestMap() result expected %#v, got %#v ", m, mret)
-	}
-
-	sm := map[string]string{"a": "2", "b": "blah", "some": "thing"}
-	smret, err := client.TestStringMap(sm)
-	if err != nil {
-		t.Errorf("Unexpected error in TestStringMap() call: ", err)
-	}
-	if !reflect.DeepEqual(sm, smret) {
-		t.Errorf("Unexpected TestStringMap() result expected %#v, got %#v ", sm, smret)
-	}
-
-	s := map[int32]struct{}{1: struct{}{}, 2: struct{}{}, 42: struct{}{}}
-	sret, err := client.TestSet(s)
-	if err != nil {
-		t.Errorf("Unexpected error in TestSet() call: ", err)
-	}
-	if !reflect.DeepEqual(s, sret) {
-		t.Errorf("Unexpected TestSet() result expected %#v, got %#v ", s, sret)
-	}
-
-	l := []int32{1, 2, 42}
-	lret, err := client.TestList(l)
-	if err != nil {
-		t.Errorf("Unexpected error in TestList() call: ", err)
-	}
-	if !reflect.DeepEqual(l, lret) {
-		t.Errorf("Unexpected TestSet() result expected %#v, got %#v ", l, lret)
-	}
-
-	eret, err := client.TestEnum(thrifttest.Numberz_TWO)
-	if err != nil {
-		t.Errorf("Unexpected error in TestEnum() call: ", err)
-	}
-	if eret != thrifttest.Numberz_TWO {
-		t.Errorf("Unexpected TestEnum() result expected %#v, got %#v ", thrifttest.Numberz_TWO, eret)
-	}
-
-	tret, err := client.TestTypedef(thrifttest.UserId(42))
-	if err != nil {
-		t.Errorf("Unexpected error in TestTypedef() call: ", err)
-	}
-	if tret != thrifttest.UserId(42) {
-		t.Errorf("Unexpected TestTypedef() result expected %#v, got %#v ", thrifttest.UserId(42), tret)
-	}
-
-	mapmap, err := client.TestMapMap(42)
-	if err != nil {
-		t.Errorf("Unexpected error in TestMapmap() call: ", err)
-	}
-	if !reflect.DeepEqual(mapmap, rmapmap) {
-		t.Errorf("Unexpected TestMapmap() result expected %#v, got %#v ", rmapmap, mapmap)
-	}
-
-	xxsret, err := client.TestMulti(42, 4242, 424242, map[int16]string{1: "blah", 2: "thing"}, thrifttest.Numberz_EIGHT, thrifttest.UserId(24))
-	if err != nil {
-		t.Errorf("Unexpected error in TestMulti() call: ", err)
-	}
-	if !reflect.DeepEqual(xxs, xxsret) {
-		t.Errorf("Unexpected TestMulti() result expected %#v, got %#v ", xxs, xxsret)
-	}
-
-	err = client.TestException("some")
-	if err == nil {
-		t.Errorf("Expecting exception in TestException() call")
-	}
-	if !reflect.DeepEqual(err, xcept) {
-		t.Errorf("Unexpected TestException() result expected %#v, got %#v ", xcept, err)
-	}
-
-	// TODO: connection is being closed on this
-	err = client.TestException("TException")
-	tex, ok := err.(thrift.TApplicationException)
-	if err == nil || !ok || tex.TypeId() != thrift.INTERNAL_ERROR {
-		t.Errorf("Unexpected TestException() result expected ApplicationError, got %#v ", err)
-	}
-
-	ign, err := client.TestMultiException("Xception", "ignoreme")
-	if ign != nil || err == nil {
-		t.Errorf("Expecting exception in TestMultiException() call")
-	}
-	if !reflect.DeepEqual(err, &thrifttest.Xception{ErrorCode: 1001, Message: "This is an Xception"}) {
-		t.Errorf("Unexpected TestMultiException() %#v ", err)
-	}
-
-	ign, err = client.TestMultiException("Xception2", "ignoreme")
-	if ign != nil || err == nil {
-		t.Errorf("Expecting exception in TestMultiException() call")
-	}
-	expecting := &thrifttest.Xception2{ErrorCode: 2002, StructThing: &thrifttest.Xtruct{StringThing: "This is an Xception2"}}
-
-	if !reflect.DeepEqual(err, expecting) {
-		t.Errorf("Unexpected TestMultiException() %#v ", err)
-	}
-
-	err = client.TestOneway(2)
-	if err != nil {
-		t.Errorf("Unexpected error in TestOneway() call: ", err)
-	}
-
-	//Make sure the connection still alive
-	if err = client.TestVoid(); err != nil {
-		t.Errorf("Unexpected error in TestVoid() call: ", err)
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/common/mock_handler.go b/vendor/git.apache.org/thrift.git/test/go/src/common/mock_handler.go
deleted file mode 100644
index 6ae8130..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/common/mock_handler.go
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Automatically generated by MockGen. DO NOT EDIT!
-// Source: gen/thrifttest (interfaces: ThriftTest)
-
-package common
-
-import (
-	gomock "github.com/golang/mock/gomock"
-	thrifttest "gen/thrifttest"
-)
-
-// Mock of ThriftTest interface
-type MockThriftTest struct {
-	ctrl     *gomock.Controller
-	recorder *_MockThriftTestRecorder
-}
-
-// Recorder for MockThriftTest (not exported)
-type _MockThriftTestRecorder struct {
-	mock *MockThriftTest
-}
-
-func NewMockThriftTest(ctrl *gomock.Controller) *MockThriftTest {
-	mock := &MockThriftTest{ctrl: ctrl}
-	mock.recorder = &_MockThriftTestRecorder{mock}
-	return mock
-}
-
-func (_m *MockThriftTest) EXPECT() *_MockThriftTestRecorder {
-	return _m.recorder
-}
-
-func (_m *MockThriftTest) TestBool(_param0 bool) (bool, error) {
-	ret := _m.ctrl.Call(_m, "TestBool", _param0)
-	ret0, _ := ret[0].(bool)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestBool(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestBool", arg0)
-}
-
-
-func (_m *MockThriftTest) TestByte(_param0 int8) (int8, error) {
-	ret := _m.ctrl.Call(_m, "TestByte", _param0)
-	ret0, _ := ret[0].(int8)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestByte(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestByte", arg0)
-}
-
-func (_m *MockThriftTest) TestDouble(_param0 float64) (float64, error) {
-	ret := _m.ctrl.Call(_m, "TestDouble", _param0)
-	ret0, _ := ret[0].(float64)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestDouble(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestDouble", arg0)
-}
-
-func (_m *MockThriftTest) TestBinary(_param0 []byte) ([]byte, error) {
-	ret := _m.ctrl.Call(_m, "TestBinary", _param0)
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestBinary(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestBinary", arg0)
-}
-
-func (_m *MockThriftTest) TestEnum(_param0 thrifttest.Numberz) (thrifttest.Numberz, error) {
-	ret := _m.ctrl.Call(_m, "TestEnum", _param0)
-	ret0, _ := ret[0].(thrifttest.Numberz)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestEnum(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestEnum", arg0)
-}
-
-func (_m *MockThriftTest) TestException(_param0 string) error {
-	ret := _m.ctrl.Call(_m, "TestException", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockThriftTestRecorder) TestException(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestException", arg0)
-}
-
-func (_m *MockThriftTest) TestI32(_param0 int32) (int32, error) {
-	ret := _m.ctrl.Call(_m, "TestI32", _param0)
-	ret0, _ := ret[0].(int32)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestI32(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestI32", arg0)
-}
-
-func (_m *MockThriftTest) TestI64(_param0 int64) (int64, error) {
-	ret := _m.ctrl.Call(_m, "TestI64", _param0)
-	ret0, _ := ret[0].(int64)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestI64(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestI64", arg0)
-}
-
-func (_m *MockThriftTest) TestInsanity(_param0 *thrifttest.Insanity) (map[thrifttest.UserId]map[thrifttest.Numberz]*thrifttest.Insanity, error) {
-	ret := _m.ctrl.Call(_m, "TestInsanity", _param0)
-	ret0, _ := ret[0].(map[thrifttest.UserId]map[thrifttest.Numberz]*thrifttest.Insanity)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestInsanity(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestInsanity", arg0)
-}
-
-func (_m *MockThriftTest) TestList(_param0 []int32) ([]int32, error) {
-	ret := _m.ctrl.Call(_m, "TestList", _param0)
-	ret0, _ := ret[0].([]int32)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestList(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestList", arg0)
-}
-
-func (_m *MockThriftTest) TestMap(_param0 map[int32]int32) (map[int32]int32, error) {
-	ret := _m.ctrl.Call(_m, "TestMap", _param0)
-	ret0, _ := ret[0].(map[int32]int32)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestMap(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestMap", arg0)
-}
-
-func (_m *MockThriftTest) TestMapMap(_param0 int32) (map[int32]map[int32]int32, error) {
-	ret := _m.ctrl.Call(_m, "TestMapMap", _param0)
-	ret0, _ := ret[0].(map[int32]map[int32]int32)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestMapMap(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestMapMap", arg0)
-}
-
-func (_m *MockThriftTest) TestMulti(_param0 int8, _param1 int32, _param2 int64, _param3 map[int16]string, _param4 thrifttest.Numberz, _param5 thrifttest.UserId) (*thrifttest.Xtruct, error) {
-	ret := _m.ctrl.Call(_m, "TestMulti", _param0, _param1, _param2, _param3, _param4, _param5)
-	ret0, _ := ret[0].(*thrifttest.Xtruct)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestMulti(arg0, arg1, arg2, arg3, arg4, arg5 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestMulti", arg0, arg1, arg2, arg3, arg4, arg5)
-}
-
-func (_m *MockThriftTest) TestMultiException(_param0 string, _param1 string) (*thrifttest.Xtruct, error) {
-	ret := _m.ctrl.Call(_m, "TestMultiException", _param0, _param1)
-	ret0, _ := ret[0].(*thrifttest.Xtruct)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestMultiException(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestMultiException", arg0, arg1)
-}
-
-func (_m *MockThriftTest) TestNest(_param0 *thrifttest.Xtruct2) (*thrifttest.Xtruct2, error) {
-	ret := _m.ctrl.Call(_m, "TestNest", _param0)
-	ret0, _ := ret[0].(*thrifttest.Xtruct2)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestNest(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestNest", arg0)
-}
-
-func (_m *MockThriftTest) TestOneway(_param0 int32) error {
-	ret := _m.ctrl.Call(_m, "TestOneway", _param0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockThriftTestRecorder) TestOneway(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestOneway", arg0)
-}
-
-func (_m *MockThriftTest) TestSet(_param0 map[int32]struct{}) (map[int32]struct{}, error) {
-	ret := _m.ctrl.Call(_m, "TestSet", _param0)
-	ret0, _ := ret[0].(map[int32]struct{})
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestSet(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestSet", arg0)
-}
-
-func (_m *MockThriftTest) TestString(_param0 string) (string, error) {
-	ret := _m.ctrl.Call(_m, "TestString", _param0)
-	ret0, _ := ret[0].(string)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestString(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestString", arg0)
-}
-
-func (_m *MockThriftTest) TestStringMap(_param0 map[string]string) (map[string]string, error) {
-	ret := _m.ctrl.Call(_m, "TestStringMap", _param0)
-	ret0, _ := ret[0].(map[string]string)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestStringMap(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestStringMap", arg0)
-}
-
-func (_m *MockThriftTest) TestStruct(_param0 *thrifttest.Xtruct) (*thrifttest.Xtruct, error) {
-	ret := _m.ctrl.Call(_m, "TestStruct", _param0)
-	ret0, _ := ret[0].(*thrifttest.Xtruct)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestStruct(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestStruct", arg0)
-}
-
-func (_m *MockThriftTest) TestTypedef(_param0 thrifttest.UserId) (thrifttest.UserId, error) {
-	ret := _m.ctrl.Call(_m, "TestTypedef", _param0)
-	ret0, _ := ret[0].(thrifttest.UserId)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockThriftTestRecorder) TestTypedef(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestTypedef", arg0)
-}
-
-func (_m *MockThriftTest) TestVoid() error {
-	ret := _m.ctrl.Call(_m, "TestVoid")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockThriftTestRecorder) TestVoid() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TestVoid")
-}
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/common/printing_handler.go b/vendor/git.apache.org/thrift.git/test/go/src/common/printing_handler.go
deleted file mode 100644
index afee8da..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/common/printing_handler.go
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package common
-
-import (
-	"errors"
-	"fmt"
-	"encoding/hex"
-	. "gen/thrifttest"
-	"time"
-)
-
-var PrintingHandler = &printingHandler{}
-
-type printingHandler struct{}
-
-// Prints "testVoid()" and returns nothing.
-func (p *printingHandler) TestVoid() (err error) {
-	fmt.Println("testVoid()")
-	return nil
-}
-
-// Prints 'testString("%s")' with thing as '%s'
-// @param string thing - the string to print
-// @return string - returns the string 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestString(thing string) (r string, err error) {
-	fmt.Printf("testString(\"%s\")\n", thing)
-	return thing, nil
-}
-
-// Prints 'testBool("%t")' with thing as 'true' or 'false'
-// @param bool thing - the bool to print
-// @return bool - returns the bool 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestBool(thing bool) (r bool, err error) {
-	fmt.Printf("testBool(%t)\n", thing)
-	return thing, nil
-}
-
-// Prints 'testByte("%d")' with thing as '%d'
-// @param byte thing - the byte to print
-// @return byte - returns the byte 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestByte(thing int8) (r int8, err error) {
-	fmt.Printf("testByte(%d)\n", thing)
-	return thing, nil
-}
-
-// Prints 'testI32("%d")' with thing as '%d'
-// @param i32 thing - the i32 to print
-// @return i32 - returns the i32 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestI32(thing int32) (r int32, err error) {
-	fmt.Printf("testI32(%d)\n", thing)
-	return thing, nil
-}
-
-// Prints 'testI64("%d")' with thing as '%d'
-// @param i64 thing - the i64 to print
-// @return i64 - returns the i64 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestI64(thing int64) (r int64, err error) {
-	fmt.Printf("testI64(%d)\n", thing)
-	return thing, nil
-}
-
-// Prints 'testDouble("%f")' with thing as '%f'
-// @param double thing - the double to print
-// @return double - returns the double 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestDouble(thing float64) (r float64, err error) {
-	fmt.Printf("testDouble(%f)\n", thing)
-	return thing, nil
-}
-
-// Prints 'testBinary("%s")' where '%s' is a hex-formatted string of thing's data
-// @param []byte thing - the binary to print
-// @return []byte - returns the binary 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestBinary(thing []byte) (r []byte, err error) {
-	fmt.Printf("testBinary(%s)\n", hex.EncodeToString(thing))
-	return thing, nil
-}
-
-// Prints 'testStruct("{%s}")' where thing has been formatted into a string of comma separated values
-// @param Xtruct thing - the Xtruct to print
-// @return Xtruct - returns the Xtruct 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestStruct(thing *Xtruct) (r *Xtruct, err error) {
-	fmt.Printf("testStruct({\"%s\", %d, %d, %d})\n", thing.StringThing, thing.ByteThing, thing.I32Thing, thing.I64Thing)
-	return thing, err
-}
-
-// Prints 'testNest("{%s}")' where thing has been formatted into a string of the nested struct
-// @param Xtruct2 thing - the Xtruct2 to print
-// @return Xtruct2 - returns the Xtruct2 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestNest(nest *Xtruct2) (r *Xtruct2, err error) {
-	thing := nest.StructThing
-	fmt.Printf("testNest({%d, {\"%s\", %d, %d, %d}, %d})\n", nest.ByteThing, thing.StringThing, thing.ByteThing, thing.I32Thing, thing.I64Thing, nest.I32Thing)
-	return nest, nil
-}
-
-// Prints 'testMap("{%s")' where thing has been formatted into a string of  'key => value' pairs
-//  separated by commas and new lines
-// @param map<i32,i32> thing - the map<i32,i32> to print
-// @return map<i32,i32> - returns the map<i32,i32> 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestMap(thing map[int32]int32) (r map[int32]int32, err error) {
-	fmt.Printf("testMap({")
-	first := true
-	for k, v := range thing {
-		if first {
-			first = false
-		} else {
-			fmt.Printf(", ")
-		}
-		fmt.Printf("%d => %d", k, v)
-	}
-	fmt.Printf("})\n")
-	return thing, nil
-}
-
-// Prints 'testStringMap("{%s}")' where thing has been formatted into a string of  'key => value' pairs
-//  separated by commas and new lines
-// @param map<string,string> thing - the map<string,string> to print
-// @return map<string,string> - returns the map<string,string> 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestStringMap(thing map[string]string) (r map[string]string, err error) {
-	fmt.Printf("testStringMap({")
-	first := true
-	for k, v := range thing {
-		if first {
-			first = false
-		} else {
-			fmt.Printf(", ")
-		}
-		fmt.Printf("%s => %s", k, v)
-	}
-	fmt.Printf("})\n")
-	return thing, nil
-}
-
-// Prints 'testSet("{%s}")' where thing has been formatted into a string of  values
-//  separated by commas and new lines
-// @param set<i32> thing - the set<i32> to print
-// @return set<i32> - returns the set<i32> 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestSet(thing map[int32]struct{}) (r map[int32]struct{}, err error) {
-	fmt.Printf("testSet({")
-	first := true
-	for k, _ := range thing {
-		if first {
-			first = false
-		} else {
-			fmt.Printf(", ")
-		}
-		fmt.Printf("%d", k)
-	}
-	fmt.Printf("})\n")
-	return thing, nil
-}
-
-// Prints 'testList("{%s}")' where thing has been formatted into a string of  values
-//  separated by commas and new lines
-// @param list<i32> thing - the list<i32> to print
-// @return list<i32> - returns the list<i32> 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestList(thing []int32) (r []int32, err error) {
-	fmt.Printf("testList({")
-	for i, v := range thing {
-		if i != 0 {
-			fmt.Printf(", ")
-		}
-		fmt.Printf("%d", v)
-	}
-	fmt.Printf("})\n")
-	return thing, nil
-}
-
-// Prints 'testEnum("%d")' where thing has been formatted into it's numeric value
-// @param Numberz thing - the Numberz to print
-// @return Numberz - returns the Numberz 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestEnum(thing Numberz) (r Numberz, err error) {
-	fmt.Printf("testEnum(%d)\n", thing)
-	return thing, nil
-}
-
-// Prints 'testTypedef("%d")' with thing as '%d'
-// @param UserId thing - the UserId to print
-// @return UserId - returns the UserId 'thing'
-//
-// Parameters:
-//  - Thing
-func (p *printingHandler) TestTypedef(thing UserId) (r UserId, err error) {
-	fmt.Printf("testTypedef(%d)\n", thing)
-	return thing, nil
-}
-
-// Prints 'testMapMap("%d")' with hello as '%d'
-// @param i32 hello - the i32 to print
-// @return map<i32,map<i32,i32>> - returns a dictionary with these values:
-//   {-4 => {-4 => -4, -3 => -3, -2 => -2, -1 => -1, }, 4 => {1 => 1, 2 => 2, 3 => 3, 4 => 4, }, }
-//
-// Parameters:
-//  - Hello
-func (p *printingHandler) TestMapMap(hello int32) (r map[int32]map[int32]int32, err error) {
-	fmt.Printf("testMapMap(%d)\n", hello)
-
-	r = map[int32]map[int32]int32{
-		-4: map[int32]int32{-4: -4, -3: -3, -2: -2, -1: -1},
-		4:  map[int32]int32{4: 4, 3: 3, 2: 2, 1: 1},
-	}
-	return
-}
-
-// So you think you've got this all worked, out eh?
-//
-// Creates a the returned map with these values and prints it out:
-//   { 1 => { 2 => argument,
-//            3 => argument,
-//          },
-//     2 => { 6 => <empty Insanity struct>, },
-//   }
-// @return map<UserId, map<Numberz,Insanity>> - a map with the above values
-//
-// Parameters:
-//  - Argument
-func (p *printingHandler) TestInsanity(argument *Insanity) (r map[UserId]map[Numberz]*Insanity, err error) {
-	fmt.Printf("testInsanity()\n")
-	r = make(map[UserId]map[Numberz]*Insanity)
-	r[1] = map[Numberz]*Insanity {
-		2: argument,
-		3: argument,
-	}
-	r[2] = map[Numberz]*Insanity {
-		6: NewInsanity(),
-	}
-	return
-}
-
-// Prints 'testMulti()'
-// @param byte arg0 -
-// @param i32 arg1 -
-// @param i64 arg2 -
-// @param map<i16, string> arg3 -
-// @param Numberz arg4 -
-// @param UserId arg5 -
-// @return Xtruct - returns an Xtruct with StringThing = "Hello2, ByteThing = arg0, I32Thing = arg1
-//    and I64Thing = arg2
-//
-// Parameters:
-//  - Arg0
-//  - Arg1
-//  - Arg2
-//  - Arg3
-//  - Arg4
-//  - Arg5
-func (p *printingHandler) TestMulti(arg0 int8, arg1 int32, arg2 int64, arg3 map[int16]string, arg4 Numberz, arg5 UserId) (r *Xtruct, err error) {
-	fmt.Printf("testMulti()\n")
-	r = NewXtruct()
-
-	r.StringThing = "Hello2"
-	r.ByteThing = arg0
-	r.I32Thing = arg1
-	r.I64Thing = arg2
-	return
-}
-
-// Print 'testException(%s)' with arg as '%s'
-// @param string arg - a string indication what type of exception to throw
-// if arg == "Xception" throw Xception with errorCode = 1001 and message = arg
-// elsen if arg == "TException" throw TException
-// else do not throw anything
-//
-// Parameters:
-//  - Arg
-func (p *printingHandler) TestException(arg string) (err error) {
-	fmt.Printf("testException(%s)\n", arg)
-	switch arg {
-	case "Xception":
-		e := NewXception()
-		e.ErrorCode = 1001
-		e.Message = arg
-		return e
-	case "TException":
-		return errors.New("Just TException")
-	}
-	return
-}
-
-// Print 'testMultiException(%s, %s)' with arg0 as '%s' and arg1 as '%s'
-// @param string arg - a string indication what type of exception to throw
-// if arg0 == "Xception" throw Xception with errorCode = 1001 and message = "This is an Xception"
-// elsen if arg0 == "Xception2" throw Xception2 with errorCode = 2002 and message = "This is an Xception2"
-// else do not throw anything
-// @return Xtruct - an Xtruct with StringThing = arg1
-//
-// Parameters:
-//  - Arg0
-//  - Arg1
-func (p *printingHandler) TestMultiException(arg0 string, arg1 string) (r *Xtruct, err error) {
-	fmt.Printf("testMultiException(%s, %s)\n", arg0, arg1)
-	switch arg0 {
-
-	case "Xception":
-		e := NewXception()
-		e.ErrorCode = 1001
-		e.Message = "This is an Xception"
-		return nil, e
-	case "Xception2":
-		e := NewXception2()
-		e.ErrorCode = 2002
-		e.StructThing = NewXtruct()
-		e.StructThing.StringThing = "This is an Xception2"
-		return nil, e
-	default:
-		r = NewXtruct()
-		r.StringThing = arg1
-		return
-	}
-}
-
-// Print 'testOneway(%d): Sleeping...' with secondsToSleep as '%d'
-// sleep 'secondsToSleep'
-// Print 'testOneway(%d): done sleeping!' with secondsToSleep as '%d'
-// @param i32 secondsToSleep - the number of seconds to sleep
-//
-// Parameters:
-//  - SecondsToSleep
-func (p *printingHandler) TestOneway(secondsToSleep int32) (err error) {
-	fmt.Printf("testOneway(%d): Sleeping...\n", secondsToSleep)
-	time.Sleep(time.Second * time.Duration(secondsToSleep))
-	fmt.Printf("testOneway(%d): done sleeping!\n", secondsToSleep)
-	return
-}
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/common/server.go b/vendor/git.apache.org/thrift.git/test/go/src/common/server.go
deleted file mode 100644
index 5ac4400..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/common/server.go
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package common
-
-import (
-	"compress/zlib"
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"gen/thrifttest"
-	"thrift"
-)
-
-var (
-	debugServerProtocol bool
-	certPath            string
-)
-
-func init() {
-	flag.BoolVar(&debugServerProtocol, "debug_server_protocol", false, "turn server protocol trace on")
-}
-
-func GetServerParams(
-	host string,
-	port int64,
-	domain_socket string,
-	transport string,
-	protocol string,
-	ssl bool,
-	certPath string,
-	handler thrifttest.ThriftTest) (thrift.TProcessor, thrift.TServerTransport, thrift.TTransportFactory, thrift.TProtocolFactory, error) {
-
-	var err error
-	hostPort := fmt.Sprintf("%s:%d", host, port)
-
-	var protocolFactory thrift.TProtocolFactory
-	switch protocol {
-	case "compact":
-		protocolFactory = thrift.NewTCompactProtocolFactory()
-	case "simplejson":
-		protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
-	case "json":
-		protocolFactory = thrift.NewTJSONProtocolFactory()
-	case "binary":
-		protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
-	default:
-		return nil, nil, nil, nil, fmt.Errorf("Invalid protocol specified %s", protocol)
-	}
-	if debugServerProtocol {
-		protocolFactory = thrift.NewTDebugProtocolFactory(protocolFactory, "server:")
-	}
-
-	var serverTransport thrift.TServerTransport
-	if ssl {
-		cfg := new(tls.Config)
-		if cert, err := tls.LoadX509KeyPair(certPath+"/server.crt", certPath+"/server.key"); err != nil {
-			return nil, nil, nil, nil, err
-		} else {
-			cfg.Certificates = append(cfg.Certificates, cert)
-		}
-		serverTransport, err = thrift.NewTSSLServerSocket(hostPort, cfg)
-	} else {
-		if domain_socket != "" {
-			serverTransport, err = thrift.NewTServerSocket(domain_socket)
-		} else {
-			serverTransport, err = thrift.NewTServerSocket(hostPort)
-		}
-	}
-	if err != nil {
-		return nil, nil, nil, nil, err
-	}
-
-	var transportFactory thrift.TTransportFactory
-
-	switch transport {
-	case "http":
-		// there is no such factory, and we don't need any
-		transportFactory = nil
-	case "framed":
-		transportFactory = thrift.NewTTransportFactory()
-		transportFactory = thrift.NewTFramedTransportFactory(transportFactory)
-	case "buffered":
-		transportFactory = thrift.NewTBufferedTransportFactory(8192)
-	case "zlib":
-		transportFactory = thrift.NewTZlibTransportFactory(zlib.BestCompression)
-	case "":
-		transportFactory = thrift.NewTTransportFactory()
-	default:
-		return nil, nil, nil, nil, fmt.Errorf("Invalid transport specified %s", transport)
-	}
-	processor := thrifttest.NewThriftTestProcessor(handler)
-
-	return processor, serverTransport, transportFactory, protocolFactory, nil
-}
diff --git a/vendor/git.apache.org/thrift.git/test/go/src/common/simple_handler.go b/vendor/git.apache.org/thrift.git/test/go/src/common/simple_handler.go
deleted file mode 100644
index 7bd3a30..0000000
--- a/vendor/git.apache.org/thrift.git/test/go/src/common/simple_handler.go
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package common
-
-import (
-	"errors"
-	. "gen/thrifttest"
-	"time"
-)
-
-var SimpleHandler = &simpleHandler{}
-
-type simpleHandler struct{}
-
-func (p *simpleHandler) TestVoid() (err error) {
-	return nil
-}
-
-func (p *simpleHandler) TestString(thing string) (r string, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestBool(thing []byte) (r []byte, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestByte(thing int8) (r int8, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestI32(thing int32) (r int32, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestI64(thing int64) (r int64, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestDouble(thing float64) (r float64, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestBinary(thing []byte) (r []byte, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestStruct(thing *Xtruct) (r *Xtruct, err error) {
-	return r, err
-}
-
-func (p *simpleHandler) TestNest(nest *Xtruct2) (r *Xtruct2, err error) {
-	return nest, nil
-}
-
-func (p *simpleHandler) TestMap(thing map[int32]int32) (r map[int32]int32, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestStringMap(thing map[string]string) (r map[string]string, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestSet(thing map[int32]struct{}) (r map[int32]struct{}, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestList(thing []int32) (r []int32, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestEnum(thing Numberz) (r Numberz, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestTypedef(thing UserId) (r UserId, err error) {
-	return thing, nil
-}
-
-func (p *simpleHandler) TestMapMap(hello int32) (r map[int32]map[int32]int32, err error) {
-
-	r = map[int32]map[int32]int32{
-		-4: map[int32]int32{-4: -4, -3: -3, -2: -2, -1: -1},
-		4:  map[int32]int32{4: 4, 3: 3, 2: 2, 1: 1},
-	}
-	return
-}
-
-func (p *simpleHandler) TestInsanity(argument *Insanity) (r map[UserId]map[Numberz]*Insanity, err error) {
-	return nil, errors.New("No Insanity")
-}
-
-func (p *simpleHandler) TestMulti(arg0 int8, arg1 int32, arg2 int64, arg3 map[int16]string, arg4 Numberz, arg5 UserId) (r *Xtruct, err error) {
-	r = NewXtruct()
-
-	r.StringThing = "Hello2"
-	r.ByteThing = arg0
-	r.I32Thing = arg1
-	r.I64Thing = arg2
-	return
-}
-
-func (p *simpleHandler) TestException(arg string) (err error) {
-	switch arg {
-	case "Xception":
-		e := NewXception()
-		e.ErrorCode = 1001
-		e.Message = arg
-		return e
-	case "TException":
-		return errors.New("Just TException")
-	}
-	return
-}
-
-func (p *simpleHandler) TestMultiException(arg0 string, arg1 string) (r *Xtruct, err error) {
-	switch arg0 {
-
-	case "Xception":
-		e := NewXception()
-		e.ErrorCode = 1001
-		e.Message = "This is an Xception"
-		return nil, e
-	case "Xception2":
-		e := NewXception2()
-		e.ErrorCode = 2002
-		e.StructThing.StringThing = "This is an Xception2"
-		return nil, e
-	default:
-		r = NewXtruct()
-		r.StringThing = arg1
-		return
-	}
-}
-
-func (p *simpleHandler) TestOneway(secondsToSleep int32) (err error) {
-	time.Sleep(time.Second * time.Duration(secondsToSleep))
-	return
-}
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/Makefile.am b/vendor/git.apache.org/thrift.git/test/haxe/Makefile.am
deleted file mode 100644
index 1a32185..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-THRIFTCMD = $(THRIFT) --gen haxe -r
-THRIFTTEST = $(top_srcdir)/test/ThriftTest.thrift
-
-BIN_CPP = bin/Main-debug
-BIN_PHP = bin/php/Main-debug.php
-BIN_PHP_WEB = bin/php-web-server/Main-debug.php
-
-gen-haxe/thrift/test/ThriftTest.hx: $(THRIFTTEST)
-	$(THRIFTCMD) $(THRIFTTEST)
-
-all-local: $(BIN_CPP) $(BIN_PHP) $(BIN_PHP_WEB)
-
-$(BIN_CPP): \
-		src/*.hx \
-		../../lib/haxe/src/org/apache/thrift/**/*.hx \
-		gen-haxe/thrift/test/ThriftTest.hx
-	$(HAXE) --cwd .  cpp.hxml
-
-$(BIN_PHP): \
-		src/*.hx \
-		../../lib/haxe/src/org/apache/thrift/**/*.hx \
-		gen-haxe/thrift/test/ThriftTest.hx
-	$(HAXE) --cwd .  php.hxml
-
-$(BIN_PHP_WEB): \
-		src/*.hx \
-		../../lib/haxe/src/org/apache/thrift/**/*.hx \
-		gen-haxe/thrift/test/ThriftTest.hx
-	$(HAXE) --cwd .  php-web-server.hxml
-
-
-
-#TODO: other haxe targets
-#    $(HAXE)  --cwd .  csharp
-#    $(HAXE)  --cwd .  flash
-#    $(HAXE)  --cwd .  java
-#    $(HAXE)  --cwd .  javascript
-#    $(HAXE)  --cwd .  neko
-#    $(HAXE)  --cwd .  python  # needs Haxe 3.2.0
-
-
-clean-local:
-	$(RM) -r gen-haxe bin
-
-.NOTPARALLEL:
-
-check: check_cpp \
-	check_php \
-	check_php_web 
-
-check_cpp: $(BIN_CPP) 
-	timeout 20 $(BIN_CPP) server &
-	sleep 1
-	$(BIN_CPP) client
-	sleep 10
-
-check_php: $(BIN_PHP) 
-	timeout 20 php -f $(BIN_PHP) server &
-	sleep 1
-	php -f $(BIN_PHP) client
-	sleep 10
-
-check_php_web: $(BIN_PHP_WEB) $(BIN_CPP)
-	timeout 20 php -S 127.0.0.1:9090 router.php &
-	sleep 1
-	$(BIN_CPP) client --transport http
-	sleep 10
-
-
-EXTRA_DIST = \
-             src \
-             cpp.hxml \
-             csharp.hxml \
-             flash.hxml \
-             java.hxml \
-             javascript.hxml \
-             neko.hxml \
-             php.hxml \
-             python.hxml \
-             project.hide \
-             TestClientServer.hxproj \
-             make_all.bat \
-             make_all.sh
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/TestClientServer.hxproj b/vendor/git.apache.org/thrift.git/test/haxe/TestClientServer.hxproj
deleted file mode 100644
index 6696d80..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/TestClientServer.hxproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project version="2">
-  <!-- Output SWF options -->
-  <output>
-    <movie outputType="Application" />
-    <movie input="" />
-    <movie path="bin/TestClientServer" />
-    <movie fps="30" />
-    <movie width="800" />
-    <movie height="600" />
-    <movie version="1" />
-    <movie minorVersion="0" />
-    <movie platform="C++" />
-    <movie background="#FFFFFF" />
-  </output>
-  <!-- Other classes to be compiled into your SWF -->
-  <classpaths>
-    <class path="src" />
-    <class path="gen-haxe" />
-    <class path="../../lib/haxe/src" />
-  </classpaths>
-  <!-- Build options -->
-  <build>
-    <option directives="" />
-    <option flashStrict="False" />
-    <option noInlineOnDebug="False" />
-    <option mainClass="Main" />
-    <option enabledebug="False" />
-    <option additional="" />
-  </build>
-  <!-- haxelib libraries -->
-  <haxelib>
-    <!-- example: <library name="..." /> -->
-  </haxelib>
-  <!-- Class files to compile (other referenced classes will automatically be included) -->
-  <compileTargets>
-    <!-- example: <compile path="..." /> -->
-  </compileTargets>
-  <!-- Paths to exclude from the Project Explorer tree -->
-  <hiddenPaths>
-    <hidden path="obj" />
-    <hidden path="cpp.hxml" />
-    <hidden path="csharp.hxml" />
-    <hidden path="flash.hxml" />
-    <hidden path="java.hxml" />
-    <hidden path="javascript.hxml" />
-    <hidden path="make_all.bat" />
-    <hidden path="make_all.sh" />
-    <hidden path="Makefile.am" />
-    <hidden path="neko.hxml" />
-    <hidden path="php.hxml" />
-    <hidden path="project.hide" />
-    <hidden path="python.hxml" />
-  </hiddenPaths>
-  <!-- Executed before build -->
-  <preBuildCommand>thrift -r -gen haxe  ../ThriftTest.thrift</preBuildCommand>
-  <!-- Executed after build -->
-  <postBuildCommand alwaysRun="False" />
-  <!-- Other project options -->
-  <options>
-    <option showHiddenPaths="False" />
-    <option testMovie="Unknown" />
-    <option testMovieCommand="" />
-  </options>
-  <!-- Plugin storage -->
-  <storage />
-</project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/cpp.hxml b/vendor/git.apache.org/thrift.git/test/haxe/cpp.hxml
deleted file mode 100644
index 6adb52d..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/cpp.hxml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#CPP target
--cpp bin
-
-#To produce 64 bit binaries the file should define the HXCPP_M64 compile variable:
-#-D HXCPP_M64
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/csharp.hxml b/vendor/git.apache.org/thrift.git/test/haxe/csharp.hxml
deleted file mode 100644
index 295c017..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/csharp.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#CSHARP target
--cs bin/Tutorial.exe
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/flash.hxml b/vendor/git.apache.org/thrift.git/test/haxe/flash.hxml
deleted file mode 100644
index a1f0568..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/flash.hxml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Flash target
--swf bin/Tutorial.swf
-
-#Add debug information
--debug
-
-# we need some goodies from sys.net
-# --macro allowPackage("sys")
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/java.hxml b/vendor/git.apache.org/thrift.git/test/haxe/java.hxml
deleted file mode 100644
index c615565..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/java.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src 
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Java target
--java bin/Tutorial.jar
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/javascript.hxml b/vendor/git.apache.org/thrift.git/test/haxe/javascript.hxml
deleted file mode 100644
index b2b3876..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/javascript.hxml
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#JavaScript target
--js bin/Tutorial.js
-
-#You can use -D source-map-content (requires Haxe 3.1+) to have the .hx 
-#files directly embedded into the map file, this way you only have to 
-#upload it, and it will be always in sync with the compiled .js even if 
-#you modify your .hx files.
--D source-map-content
-
-#Generate source map and add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/make_all.bat b/vendor/git.apache.org/thrift.git/test/haxe/make_all.bat
deleted file mode 100644
index eaeba89..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/make_all.bat
+++ /dev/null
@@ -1,68 +0,0 @@
-@echo off
-rem /*
-rem  * Licensed to the Apache Software Foundation (ASF) under one
-rem  * or more contributor license agreements. See the NOTICE file
-rem  * distributed with this work for additional information
-rem  * regarding copyright ownership. The ASF licenses this file
-rem  * to you under the Apache License, Version 2.0 (the
-rem  * "License"); you may not use this file except in compliance
-rem  * with the License. You may obtain a copy of the License at
-rem  *
-rem  *   http://www.apache.org/licenses/LICENSE-2.0
-rem  *
-rem  * Unless required by applicable law or agreed to in writing,
-rem  * software distributed under the License is distributed on an
-rem  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem  * KIND, either express or implied. See the License for the
-rem  * specific language governing permissions and limitations
-rem  * under the License.
-rem  */
-
-setlocal
-if "%HOMEDRIVE%"=="" goto MISSINGVARS
-if "%HOMEPATH%"=="" goto MISSINGVARS
-if "%HAXEPATH%"=="" goto NOTINSTALLED
-
-set path=%HAXEPATH%;%HAXEPATH%\..\neko;%path%
-
-rem # invoke Thrift comnpiler
-thrift -r -gen haxe   ..\ThriftTest.thrift
-if errorlevel 1 goto STOP
-
-rem # invoke Haxe compiler for all targets
-for %%a in (*.hxml) do (
-	rem * filter Python, as it is not supported by Haxe 3.1.3 (but will be in 3.1.4)
-	if not "%%a"=="python.hxml" (
-		echo --------------------------
-		echo Building %%a ...
-		echo --------------------------
-		haxe  --cwd .  %%a
-	)
-)
-
-
-echo.
-echo done.
-pause
-goto eof
-
-:NOTINSTALLED
-echo FATAL: Either Haxe is not installed, or the HAXEPATH variable is not set.
-pause
-goto eof
-
-:MISSINGVARS
-echo FATAL: Unable to locate home folder.
-echo.
-echo Both HOMEDRIVE and HOMEPATH need to be set to point to your Home folder.
-echo The current values are:
-echo HOMEDRIVE=%HOMEDRIVE%
-echo HOMEPATH=%HOMEPATH%
-pause
-goto eof
-
-:STOP
-pause
-goto eof
-
-:eof
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/make_all.sh b/vendor/git.apache.org/thrift.git/test/haxe/make_all.sh
deleted file mode 100644
index 2621258..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/make_all.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# invoke Thrift comnpiler
-thrift -r -gen haxe  ../ThriftTest.thrift
-
-# output folder
-if [ ! -d bin ]; then
-  mkdir  bin
-fi
-
-# invoke Haxe compiler
-for target in *.hxml; do 
-  echo --------------------------
-  echo Building ${target} ...
-  echo --------------------------
-  if [ ! -d bin/${target} ]; then
-    mkdir  bin/${target}
-  fi
-  haxe  --cwd .  ${target} 
-done
-
-
-#eof
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/neko.hxml b/vendor/git.apache.org/thrift.git/test/haxe/neko.hxml
deleted file mode 100644
index 6161f69..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/neko.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#neko target
--neko bin/Tutorial.n
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/php-web-server.hxml b/vendor/git.apache.org/thrift.git/test/haxe/php-web-server.hxml
deleted file mode 100644
index 395a852..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/php-web-server.hxml
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#PHP target
--php bin/php-web-server/
---php-front Main-debug.php
-
-#defines
--D phpwebserver
-
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/php.hxml b/vendor/git.apache.org/thrift.git/test/haxe/php.hxml
deleted file mode 100644
index 9651898..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/php.hxml
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#PHP target
--php bin/php/
---php-front Main-debug.php
-
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/project.hide b/vendor/git.apache.org/thrift.git/test/haxe/project.hide
deleted file mode 100644
index a1c09ba..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/project.hide
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-     "type" : 0
-    ,"target" : 4
-    ,"name" : "Apache Thrift cross-platform test client/server"
-    ,"main" : null
-    ,"projectPackage" : ""
-    ,"company" : "Apache Software Foundation (ASF)"
-    ,"license" : "Apache License, Version 2.0"
-    ,"url" : "http://www.apache.org/licenses/LICENSE-2.0"
-    ,"targetData" : [
-         {
-             "pathToHxml" : "flash.hxml"
-            ,"runActionType" : 1
-            ,"runActionText" : "bin/Tutorial.swf"
-        }
-        ,{
-             "pathToHxml" : "javascript.hxml"
-            ,"runActionType" : 1
-            ,"runActionText" : "bin\\index.html"
-        }
-        ,{
-             "pathToHxml" : "neko.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "neko bin/Tutorial.n"
-        }
-        ,{
-             "pathToHxml" : "php.hxml"
-        }
-        ,{
-             "pathToHxml" : "cpp.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "bin/Main-debug.exe  client --protocol json"
-        }
-        ,{
-             "pathToHxml" : "java.hxml"
-        }
-        ,{
-             "pathToHxml" : "csharp.hxml"
-        }
-        ,{
-             "pathToHxml" : "python.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "python bin/Tutorial.py"
-        }
-    ]
-    ,"files" : [
-         {
-             "path" : "src\\TestClient.hx"
-            ,"useTabs" : true
-            ,"indentSize" : 4
-            ,"foldedRegions" : [
-
-            ]
-            ,"activeLine" : 188
-        }
-        ,{
-             "path" : "src\\TestServer.hx"
-            ,"useTabs" : true
-            ,"indentSize" : 4
-            ,"foldedRegions" : [
-
-            ]
-            ,"activeLine" : 88
-        }
-    ]
-    ,"activeFile" : "src\\TestClient.hx"
-    ,"openFLTarget" : null
-    ,"openFLBuildMode" : "Debug"
-    ,"runActionType" : null
-    ,"runActionText" : null
-    ,"buildActionCommand" : null
-    ,"hiddenItems" : [
-
-    ]
-    ,"showHiddenItems" : false
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/python.hxml b/vendor/git.apache.org/thrift.git/test/haxe/python.hxml
deleted file mode 100644
index f2c19fa..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/python.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Python target
--python bin/Tutorial.py
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/router.php b/vendor/git.apache.org/thrift.git/test/haxe/router.php
deleted file mode 100644
index e34135c..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/router.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-
-
-//router file to run testing web server
-
-//set_time_limit(1);
-
-require_once  dirname(__FILE__) . '/bin/php-web-server/Main-debug.php';
-
-
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/src/Arguments.hx b/vendor/git.apache.org/thrift.git/test/haxe/src/Arguments.hx
deleted file mode 100644
index cc10749..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/src/Arguments.hx
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-import haxe.io.Path;
-
-using StringTools;
-
-
-enum ProtocolType {
-    binary;
-    json;
-    compact;
-}
-
-enum EndpointTransport {
-    socket;
-    http;
-}
-
-enum ServerType {
-    simple;
-    /*
-    threadpool;
-    threaded;
-    nonblocking;
-    */
-}
-
-
-class Arguments
-{
-    public var printHelpOnly(default,null) : Bool = false;
-
-    public var server(default,null) : Bool = false;
-    public var servertype(default,null) : ServerType = simple;
-
-    public var host(default,null) : String = "localhost";
-    public var port(default,null) : Int = 9090;
-
-    public var protocol(default,null) : ProtocolType = binary;
-    public var transport(default,null) : EndpointTransport = socket;
-    public var framed(default,null) : Bool = false;
-    public var buffered(default,null) : Bool = false;
-
-    public var numIterations(default,null) : Int = 1;
-    public var numThreads(default,null) : Int = 1;
-    public var skipSpeedTest(default,null) : Bool = false;
-
-
-    public function new() {
-        #if sys
-          #if !phpwebserver
-          try {
-              ParseArgs();
-          } catch (e : String) {
-            trace(GetHelp());
-            throw e;
-          }
-          #else
-            //forcing server
-            server = true;
-            transport = http;
-          #end
-        #else
-        trace("WN: Platform does not support program arguments, using defaults.");
-        #end
-    }
-
-    #if sys
-
-    private static function GetHelp() : String {
-        var sProg = Path.withoutDirectory( Sys.executablePath());
-        return "\n"
-            +sProg+"  [client|server]  [options]\n"
-            +"\n"
-            +"Modus: Either client or server, the default is client.\n"
-            +"\n"
-            +"Common options:\n"
-            +"  -h [ --help ]               produce help message\n"
-            +"  --port arg (=9090)          Port number to listen / connect to\n"
-            /* not supported yet
-            +"  --domain-socket arg         Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)\n"
-            +"  --named-pipe arg            Windows Named Pipe (e.g. MyThriftPipe)\n"
-            */
-            +"  --protocol arg (=binary)    protocol: binary, compact, json\n"
-            /* not supported yet
-            +"  --ssl                       Encrypted Transport using SSL\n"
-            */
-            +"\n"
-            +"Server only options:\n"
-            +"  --transport arg (=sockets)  Transport: buffered, framed, http, anonpipe\n"
-            /* not supported yet
-            +"  --processor-events          processor-events\n"
-            +"  --server-type arg (=simple) type of server, \"simple\", \"thread-pool\", \n"
-            +"                              \"threaded\", or \"nonblocking\"\n"
-            +"  -n [ --workers ] arg (=4)   Number of thread pools workers. Only valid for \n"
-            +"                              thread-pool server type\n"
-            */
-            +"\n"
-            +"Client only options:\n"
-            +"  --host arg (=localhost)     Host to connect\n"
-            +"  --transport arg (=sockets)  Transport: buffered, framed, http, evhttp\n"
-            /* not supported yet
-            +"  --anon-pipes hRead hWrite   Windows Anonymous Pipes pair (handles)\n"
-            */
-            +"  -n [ --testloops ] arg (=1) Number of Tests\n"
-            +"  -t [ --threads ] arg (=1)   Number of Test threads\n"
-            +"  --skip-speed-test           Skip the speed test\n"
-            +"\n"
-            +"All arguments are optional.\n"
-            ;
-    }
-
-
-    private function ParseArgs() : Void {
-
-        var args = Sys.args().copy();
-        if( (args == null) || (args.length <= 0)) {
-            server = false;
-            numThreads = 1;
-            return;
-        }
-
-        var arg = args.shift();
-        if ( arg == "client") {
-            server = false;
-            numThreads = 1;
-        }
-        else if ( arg == "server") {
-            server = true;
-            numThreads = 4;
-        }
-        else if ( (arg == "-h") || (arg == "--help")) {
-            // -h [ --help ]               produce help message
-            Sys.println( GetHelp());
-            printHelpOnly = true;
-            return;
-        }
-        else {
-            throw "First argument must be 'server' or 'client'";
-        }
-
-
-        while( args.length > 0) {
-            arg = args.shift();
-
-            if ( (arg == "-h") || (arg == "--help")) {
-                // -h [ --help ]               produce help message
-                Sys.println( GetHelp());
-                printHelpOnly = true;
-                return;
-            }
-            else if (arg == "--port") {
-                // --port arg (=9090)          Port number to listen
-                arg = args.shift();
-                var tmp = Std.parseInt(arg);
-                if( tmp != null) {
-                    port = tmp;
-                } else {
-                    throw "Invalid port number "+arg;
-                }
-            }
-            else if (arg == "--domain-socket") {
-                //   --domain-socket arg         Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)
-                throw "domain sockets not supported yet";
-            }
-            else if (arg == "--named-pipe") {
-                //   --named-pipe arg            Windows Named Pipe (e.g. MyThriftPipe)
-                throw "named pipes not supported yet";
-            }
-            else if (arg == "--protocol") {
-                // --protocol arg (=binary)    protocol: binary, compact, json
-                arg = args.shift();
-                if( arg == "binary") {
-                    protocol = binary;
-                } else if( arg == "compact") {
-                    protocol = compact;
-                } else if( arg == "json") {
-                    protocol = json;
-                } else {
-                    InvalidArg(arg);
-                }
-            }
-            else if (arg == "--ssl") {
-                // --ssl                       Encrypted Transport using SSL
-                throw "SSL not supported yet";
-            }
-            else {
-                //Server only options:
-                if( server) {
-                    ParseServerArgument( arg, args);
-                } else {
-                    ParseClientArgument( arg, args);
-                }
-            }
-        }
-    }
-
-
-    private function ParseServerArgument( arg : String, args : Array<String>) : Void {
-        if (arg == "--transport") {
-            //  --transport arg (=sockets)  Transport: buffered, framed, http, anonpipe
-            arg = args.shift();
-            if( arg == "buffered") {
-                buffered = true;
-            } else if( arg == "framed") {
-                framed = true;
-            } else if( arg == "http") {
-                transport = http;
-            } else if( arg == "anonpipe") {
-                throw "Anon pipes transport not supported yet";
-            } else {
-                InvalidArg(arg);
-            }
-        }
-        else if (arg == "--processor-events") {
-            throw "Processor events not supported yet";
-        }
-        else if (arg == "--server-type") {
-            //  --server-type arg (=simple) type of server,
-            // one of "simple", "thread-pool", "threaded", "nonblocking"
-            arg = args.shift();
-            if( arg == "simple") {
-                servertype = simple;
-            } else if( arg == "thread-pool") {
-                throw arg+" server not supported yet";
-            } else if( arg == "threaded") {
-                throw arg+" server not supported yet";
-            } else if( arg == "nonblocking") {
-                throw arg+" server not supported yet";
-            } else {
-                InvalidArg(arg);
-            }
-        }
-        else if ((arg == "-n") || (arg == "--workers")) {
-            //  -n [ --workers ] arg (=4)   Number of thread pools workers. Only valid for
-            //                              thread-pool server type
-            arg = args.shift();
-            var tmp = Std.parseInt(arg);
-            if( tmp != null) {
-                numThreads = tmp;
-            } else{
-                throw "Invalid number "+arg;
-            }
-        }
-        else {
-            InvalidArg(arg);
-        }
-    }
-
-
-    private function ParseClientArgument( arg : String, args : Array<String>) : Void {
-        if (arg == "--host") {
-            //  --host arg (=localhost)     Host to connect
-            host = args.shift();
-        }
-        else if (arg == "--transport") {
-            //  --transport arg (=sockets)  Transport: buffered, framed, http, evhttp
-            arg = args.shift();
-            if( arg == "buffered") {
-                buffered = true;
-            } else if( arg == "framed") {
-                framed = true;
-            } else if( arg == "http") {
-                transport = http;
-            } else if( arg == "evhttp") {
-                throw "evhttp transport not supported yet";
-            } else {
-                InvalidArg(arg);
-            }
-        }
-        else if (arg == "--anon-pipes") {
-            //  --anon-pipes hRead hWrite   Windows Anonymous Pipes pair (handles)
-            throw "Anon pipes transport not supported yet";
-        }
-        else if ((arg == "-n") || (arg == "--testloops")) {
-            //  -n [ --testloops ] arg (=1) Number of Tests
-            arg = args.shift();
-            var tmp = Std.parseInt(arg);
-            if( tmp != null) {
-                numIterations = tmp;
-            } else {
-                throw "Invalid number "+arg;
-            }
-        }
-        else if ((arg == "-t") || (arg == "--threads")) {
-            //  -t [ --threads ] arg (=1)   Number of Test threads
-            arg = args.shift();
-            var tmp = Std.parseInt(arg);
-            if( tmp != null) {
-                numThreads = tmp;
-            } else {
-                throw "Invalid number "+arg;
-            }
-        }
-        else if (arg == "--skip-speed-test") {
-            //  --skip-speed-test              Skip the speed test
-            skipSpeedTest = true;
-        }
-        else {
-            InvalidArg(arg);
-        }
-    }
-
-
-    #end
-
-
-    private function InvalidArg( arg : String) : Void {
-        throw 'Invalid argument $arg';
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/src/Main.hx b/vendor/git.apache.org/thrift.git/test/haxe/src/Main.hx
deleted file mode 100644
index 9eb828f..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/src/Main.hx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-import thrift.test.*;  // generated code
-
-class Main
-{
-    static function main() {
-        #if phpwebserver
-        initPhpWebServer();
-        //check method
-        if(php.Web.getMethod() != 'POST') {
-          Sys.println('http endpoint for thrift test server');
-          return;
-        }
-        #end
-
-        try {
-            var args = new Arguments();
-
-            if( args.printHelpOnly)
-                return;
-
-            if (args.server)
-                TestServer.Execute(args);
-            else
-                TestClient.Execute(args);
-
-            trace("Completed.");
-        } catch (e : String) {
-            trace(e);
-        }
-    }
-
-    #if phpwebserver
-    private static function initPhpWebServer()
-    {
-        //remap trace to error log
-        haxe.Log.trace = function(v:Dynamic, ?infos:haxe.PosInfos)
-        {
-          // handle trace
-          var newValue : Dynamic;
-          if (infos != null && infos.customParams!=null) {
-            var extra:String = "";
-            for( v in infos.customParams )
-              extra += "," + v;
-            newValue = v + extra;
-          }
-          else {
-            newValue = v;
-          }
-          var msg = infos != null ? infos.fileName + ':' + infos.lineNumber + ': ' : '';
-          Sys.stderr().writeString('${msg}${newValue}\n');
-        }
-    }
-    #end
-
-}
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/src/TestClient.hx b/vendor/git.apache.org/thrift.git/test/haxe/src/TestClient.hx
deleted file mode 100644
index aa496dc..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/src/TestClient.hx
+++ /dev/null
@@ -1,932 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import haxe.Int32;
-import haxe.Int64;
-import haxe.io.Bytes;
-import haxe.Timer;
-import haxe.ds.IntMap;
-import haxe.ds.StringMap;
-import haxe.ds.ObjectMap;
-
-import org.apache.thrift.*;
-import org.apache.thrift.helper.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-#if cpp
-import cpp.vm.Thread;
-#else
-// no thread support (yet)
-#end
-
-import thrift.test.*;  // generated code
-
-
-using StringTools;
-
-class TestResults {
-    private var successCnt : Int = 0;
-    private var errorCnt : Int = 0;
-    private var failedTests : String = "";
-    private var print_direct : Bool = false;
-
-    public static var EXITCODE_SUCCESS            = 0x00;  // no errors bits set
-    //
-    public static var EXITCODE_FAILBIT_BASETYPES  = 0x01;
-    public static var EXITCODE_FAILBIT_STRUCTS    = 0x02;
-    public static var EXITCODE_FAILBIT_CONTAINERS = 0x04;
-    public static var EXITCODE_FAILBIT_EXCEPTIONS = 0x08;
-    //
-    public static var EXITCODE_ALL_FAILBITS       = 0x0F;
-    //
-    private var testsExecuted : Int = 0;
-    private var testsFailed : Int = 0;
-    private var currentTest : Int = 0;
-
-
-    public function new(direct : Bool) {
-        print_direct = direct;
-    }
-
-    public function StartTestGroup( groupBit : Int) : Void {
-        currentTest = groupBit;
-        testsExecuted |= groupBit;
-    }
-
-    public function Expect( expr : Bool, msg : String) : Void {
-        if ( expr) {
-            ++successCnt;
-        } else {
-            ++errorCnt;
-            testsFailed |= currentTest;
-            failedTests += "\n  " + msg;
-            if( print_direct) {
-                trace('FAIL: $msg');
-            }
-        }
-    }
-
-    public function CalculateExitCode() : Int {
-        var notExecuted : Int = EXITCODE_ALL_FAILBITS & (~testsExecuted);
-        return testsFailed | notExecuted;
-    }
-
-    public function PrintSummary() : Void {
-        var total = successCnt + errorCnt;
-        var sp = Math.round((1000 * successCnt) / total) / 10;
-        var ep = Math.round((1000 * errorCnt) / total) / 10;
-
-        trace('===========================');
-        trace('Tests executed    $total');
-        trace('Tests succeeded   $successCnt ($sp%)');
-        trace('Tests failed      $errorCnt ($ep%)');
-        if ( errorCnt > 0)
-        {
-            trace('===========================');
-            trace('FAILED TESTS: $failedTests');
-        }
-        trace('===========================');
-    }
-}
-
-
-class TestClient {
-
-    public static function Execute(args : Arguments) :  Void
-    {
-        var exitCode = 0xFF;
-        try
-        {
-            var difft = Timer.stamp();
-
-            if ( args.numThreads > 1) {
-                #if cpp
-                exitCode = MultiThreadClient(args);
-                #else
-                trace('Threads not supported/implemented for this platform.');
-                exitCode = SingleThreadClient(args);
-                #end
-            } else {
-                exitCode = SingleThreadClient(args);
-            }
-
-            difft = Math.round( 1000 * (Timer.stamp() - difft)) / 1000;
-            trace('total test time: $difft seconds');
-        }
-        catch (e : TException)
-        {
-            trace('TException: $e');
-            exitCode = 0xFF;
-        }
-        catch (e : Dynamic)
-        {
-            trace('Exception: $e');
-            exitCode = 0xFF;
-        }
-
-        #if sys
-        Sys.exit( exitCode);
-        #end
-    }
-
-
-    public static function SingleThreadClient(args : Arguments) :  Int
-    {
-        var rslt = new TestResults(true);
-        RunClient(args,rslt);
-        rslt.PrintSummary();
-        return rslt.CalculateExitCode();
-    }
-
-
-    #if cpp
-    public static function MultiThreadClient(args : Arguments) :  Int
-    {
-        var threads = new List<Thread>();
-        for( test in 0 ... args.numThreads) {
-            threads.add( StartThread( args));
-        }
-        var exitCode : Int = 0;
-        for( thread in threads) {
-            exitCode |= Thread.readMessage(true);
-        }
-        return exitCode;
-    }
-    #end
-
-    #if cpp
-    private static function StartThread(args : Arguments) : Thread {
-        var thread = Thread.create(
-            function() : Void {
-                var rslt = new TestResults(false);
-                var main : Thread = Thread.readMessage(true);
-                try
-                {
-                    RunClient(args,rslt);
-                }
-                catch (e : TException)
-                {
-                    rslt.Expect( false, '$e');
-                    trace('$e');
-                }
-                catch (e : Dynamic)
-                {
-                    rslt.Expect( false, '$e');
-                    trace('$e');
-                }
-                main.sendMessage( rslt.CalculateExitCode());
-            });
-
-        thread.sendMessage(Thread.current());
-        return thread;
-    }
-    #end
-
-
-    public static function RunClient(args : Arguments, rslt : TestResults)
-    {
-        var transport : TTransport = null;
-        switch (args.transport)
-        {
-            case socket:
-                transport = new TSocket(args.host, args.port);
-            case http:
-                var uri = 'http://${args.host}:${args.port}';
-                trace('- http client : ${uri}');
-                transport = new THttpClient(uri);
-            default:
-                throw "Unhandled transport";
-        }
-
-        // optional: layered transport
-        if ( args.framed) {
-            trace("- framed transport");
-            transport = new TFramedTransport(transport);
-        }
-        if ( args.buffered) {
-            trace("- buffered transport");
-            transport = new TBufferedTransport(transport);
-        }
-
-        // protocol
-        var protocol : TProtocol = null;
-        switch( args.protocol)
-        {
-        case binary:
-            trace("- binary protocol");
-            protocol = new TBinaryProtocol(transport);
-        case json:
-            trace("- json protocol");
-            protocol = new TJSONProtocol(transport);
-        case compact:
-            trace("- compact protocol");
-            protocol = new TCompactProtocol(transport);
-        }
-
-        // some quick and basic unit tests
-        HaxeBasicsTest( args, rslt);
-        ModuleUnitTests( args, rslt);
-
-        // now run the test code
-        trace('- ${args.numIterations} iterations');
-        for( i in 0 ... args.numIterations) {
-            ClientTest( transport, protocol, args, rslt);
-        }
-    }
-
-
-    public static function HaxeBasicsTest( args : Arguments, rslt : TestResults) : Void
-    {
-        // We need to test a few basic things used in the ClientTest
-        // Anything else beyond this scope should go into /lib/haxe/ instead
-        rslt.StartTestGroup( TestResults.EXITCODE_FAILBIT_BASETYPES);
-
-        var map32 = new IntMap<Int32>();
-        var map64 = new Int64Map<Int32>();
-
-        rslt.Expect( map32.keys().hasNext() == map64.keys().hasNext(), "Int64Map<Int32> Test #1");
-        rslt.Expect( map32.exists( 4711) == map64.exists( Int64.make(47,11)), "Int64Map<Int32> Test #2");
-        rslt.Expect( map32.remove( 4711) == map64.remove( Int64.make(47,11)), "Int64Map<Int32> Test #3");
-        rslt.Expect( map32.get( 4711) == map64.get( Int64.make(47,11)), "Int64Map<Int32> Test #4");
-
-        map32.set( 42, 815);
-        map64.set( Int64.make(0,42), 815);
-        map32.set( -517, 23);
-        map64.set( Int64.neg(Int64.make(0,517)), 23);
-        map32.set( 0, -123);
-        map64.set( Int64.make(0,0), -123);
-
-        //trace('map32 = $map32');
-        //trace('map64 = $map64');
-
-        rslt.Expect( map32.keys().hasNext() == map64.keys().hasNext(), "Int64Map<Int32> Test #10");
-        rslt.Expect( map32.exists( 4711) == map64.exists( Int64.make(47,11)), "Int64Map<Int32> Test #11");
-        rslt.Expect( map32.exists( -517) == map64.exists( Int64.neg(Int64.make(0,517))), "Int64Map<Int32> Test #12");
-        rslt.Expect( map32.exists( 42) == map64.exists( Int64.make(0,42)), "Int64Map<Int32> Test #13");
-        rslt.Expect( map32.exists( 0) == map64.exists( Int64.make(0,0)), "Int64Map<Int32> Test #14");
-        rslt.Expect( map32.get( 4711) == map64.get( Int64.make(47,11)), "Int64Map<Int32> Test #15");
-        rslt.Expect( map32.get( -517) == map64.get( Int64.neg(Int64.make(0,517))), "Int64Map<Int32> Test #16");
-        rslt.Expect( map32.get( 42) == map64.get( Int64.make(0,42)), "Int64Map<Int32> Test #Int64.make(-5,17)");
-        rslt.Expect( map32.get( 0) == map64.get( Int64.make(0,0)), "Int64Map<Int32> Test #18");
-        rslt.Expect( map32.remove( 4711) == map64.remove( Int64.make(47,11)), "Int64Map<Int32> Test #19");
-        rslt.Expect( map32.remove( -517) == map64.remove( Int64.neg(Int64.make(0,517))), "Int64Map<Int32> Test #20");
-        rslt.Expect( map32.exists( 4711) == map64.exists( Int64.make(47,11)), "Int64Map<Int32> Test #21");
-        rslt.Expect( map32.exists( -517) == map64.exists( Int64.neg(Int64.make(0,517))), "Int64Map<Int32> Test #22");
-        rslt.Expect( map32.exists( 42) == map64.exists( Int64.make(0,42)), "Int64Map<Int32> Test #23");
-        rslt.Expect( map32.exists( 0) == map64.exists( Int64.make(0,0)), "Int64Map<Int32> Test #24");
-        rslt.Expect( map32.get( 4711) == map64.get( Int64.make(47,11)), "Int64Map<Int32> Test #25");
-        rslt.Expect( map32.get( -517) == map64.get( Int64.neg(Int64.make(0,517))), "Int64Map<Int32> Test #26");
-        rslt.Expect( map32.get( 42) == map64.get( Int64.make(0,42)), "Int64Map<Int32> Test #27");
-        rslt.Expect( map32.get( 0) == map64.get( Int64.make(0,0)), "Int64Map<Int32> Test #28");
-
-        map32.set( 42, 1);
-        map64.set( Int64.make(0,42), 1);
-        map32.set( -517, -2);
-        map64.set( Int64.neg(Int64.make(0,517)), -2);
-        map32.set( 0, 3);
-        map64.set( Int64.make(0,0), 3);
-
-        var c32 = 0;
-        var ksum32 = 0;
-        for (key in map32.keys()) {
-            ++c32;
-            ksum32 += key;
-        }
-        var c64 = 0;
-        var ksum64 = Int64.make(0,0);
-        for (key in map64.keys()) {
-            ++c64;
-            ksum64 = Int64.add( ksum64, key);
-        }
-        rslt.Expect( c32 == c64, "Int64Map<Int32> Test #30");
-        rslt.Expect( '$ksum64' == '$ksum32', '$ksum64 == $ksum32   Test #31');
-
-        //compare without spaces because differ in php and cpp
-        var s32 = map32.toString().replace(' ', '');
-        var s64 = map64.toString().replace(' ', '');
-        rslt.Expect( s32 == s64, "Int64Map<Int32>.toString(): " + ' ("$s32" == "$s64") Test #32');
-
-        map32.remove( 42);
-        map64.remove( Int64.make(0,42));
-        map32.remove( -517);
-        map64.remove( Int64.neg(Int64.make(0,517)));
-        map32.remove( 0);
-        map64.remove( Int64.make(0,0));
-
-        rslt.Expect( map32.keys().hasNext() == map64.keys().hasNext(), "Int64Map<Int32> Test #90");
-        rslt.Expect( map32.exists( 4711) == map64.exists( Int64.make(47,11)), "Int64Map<Int32> Test #91");
-        rslt.Expect( map32.exists( -517) == map64.exists( Int64.neg(Int64.make(0,517))), "Int64Map<Int32> Test #92");
-        rslt.Expect( map32.exists( 42) == map64.exists( Int64.make(0,42)), "Int64Map<Int32> Test #93");
-        rslt.Expect( map32.exists( 0) == map64.exists( Int64.make(0,0)), "Int64Map<Int32> Test #94");
-        rslt.Expect( map32.get( 4711) == map64.get( Int64.make(47,11)), "Int64Map<Int32> Test #95");
-        rslt.Expect( map32.get( -517) == map64.get( Int64.make(-5,17)), "Int64Map<Int32> Test #96");
-        rslt.Expect( map32.get( 42) == map64.get( Int64.make(0,42)), "Int64Map<Int32> Test #97");
-        rslt.Expect( map32.get( 0) == map64.get( Int64.make(0, 0)), "Int64Map<Int32> Test #98");
-    }
-
-
-    // core module unit tests
-    public static function ModuleUnitTests( args : Arguments, rslt : TestResults) : Void {
-        #if debug
-
-        try {
-            BitConverter.UnitTest();
-            rslt.Expect( true, 'BitConverter.UnitTest  Test #100');
-        }
-        catch( e : Dynamic) {
-            rslt.Expect( false, 'BitConverter.UnitTest: $e  Test #100');
-        }
-
-        try {
-            ZigZag.UnitTest();
-            rslt.Expect( true, 'ZigZag.UnitTest  Test #101');
-        }
-        catch( e : Dynamic) {
-            rslt.Expect( false, 'ZigZag.UnitTest: $e  Test #101');
-        }
-
-        #end
-    }
-
-
-    public static function BytesToHex(data : Bytes) : String {
-        var hex = "";
-        for ( i in 0 ... data.length) {
-            hex += StringTools.hex( data.get(i), 2);
-        }
-        return hex;
-    }
-
-    public static function PrepareTestData(randomDist : Bool) : Bytes    {
-        var retval = Bytes.alloc(0x100);
-        var initLen : Int = (retval.length > 0x100 ? 0x100 : retval.length);
-
-        // linear distribution, unless random is requested
-        if (!randomDist) {
-            for (i in 0 ... initLen) {
-                retval.set(i, i % 0x100);
-            }
-            return retval;
-        }
-
-        // random distribution
-        for (i in 0 ... initLen) {
-            retval.set(i, 0);
-        }
-        for (i in 1 ... initLen) {
-            while( true) {
-                var nextPos = Std.random(initLen);
-                if (retval.get(nextPos) == 0) {
-                    retval.set( nextPos, i % 0x100);
-                    break;
-                }
-            }
-        }
-        return retval;
-    }
-
-
-    public static function ClientTest( transport : TTransport, protocol : TProtocol,
-                                       args : Arguments, rslt : TestResults) : Void
-    {
-        var client = new ThriftTestImpl(protocol,protocol);
-        try
-        {
-            if (!transport.isOpen())
-            {
-                transport.open();
-            }
-        }
-        catch (e : TException)
-        {
-            rslt.Expect( false, 'unable to open transport: $e');
-            return;
-        }
-        catch (e : Dynamic)
-        {
-            rslt.Expect( false, 'unable to open transport: $e');
-            return;
-        }
-
-        var start = Date.now();
-
-        rslt.StartTestGroup( TestResults.EXITCODE_FAILBIT_EXCEPTIONS);
-
-        // if arg == "Xception" throw Xception with errorCode = 1001 and message = arg
-        trace('testException("Xception")');
-        try {
-            client.testException("Xception");
-            rslt.Expect( false, 'testException("Xception") should throw');
-        }
-        catch (e : Xception)
-        {
-            rslt.Expect( e.message == "Xception", 'testException("Xception")  -  e.message == "Xception"');
-            rslt.Expect( e.errorCode == 1001, 'testException("Xception")  -  e.errorCode == 1001');
-        }
-        catch (e : Dynamic)
-        {
-            rslt.Expect( false, 'testException("Xception")  -  $e');
-        }
-
-        // if arg == "TException" throw TException
-        trace('testException("TException")');
-        try {
-            client.testException("TException");
-            rslt.Expect( false, 'testException("TException") should throw');
-        }
-        catch (e : TException)
-        {
-            rslt.Expect( true, 'testException("TException")  -  $e');
-        }
-        catch (e : Dynamic)
-        {
-            rslt.Expect( false, 'testException("TException")  -  $e');
-        }
-
-        // reopen the transport, just in case the server closed his end
-        if (transport.isOpen())
-            transport.close();
-        transport.open();
-
-        // else do not throw anything
-        trace('testException("bla")');
-        try {
-            client.testException("bla");
-            rslt.Expect( true, 'testException("bla") should not throw');
-        }
-        catch (e : Dynamic)
-        {
-            rslt.Expect( false, 'testException("bla")  -  $e');
-        }
-
-        rslt.StartTestGroup( TestResults.EXITCODE_FAILBIT_BASETYPES);
-
-        trace('testVoid()');
-        client.testVoid();
-        trace(' = void');
-        rslt.Expect(true,"testVoid()");  // bump counter
-
-        trace('testBool(${true})');
-        var b = client.testBool(true);
-        trace(' = $b');
-        rslt.Expect(b, '$b == "${true}"');
-        trace('testBool(${false})');
-        b = client.testBool(false);
-        trace(' = $b');
-        rslt.Expect( ! b, '$b == "${false}"');
-
-        trace('testString("Test")');
-        var s = client.testString("Test");
-        trace(' = "$s"');
-        rslt.Expect(s == "Test", '$s == "Test"');
-
-        trace('testByte(1)');
-        var i8 = client.testByte(1);
-        trace(' = $i8');
-        rslt.Expect(i8 == 1, '$i8 == 1');
-
-        trace('testI32(-1)');
-        var i32 = client.testI32(-1);
-        trace(' = $i32');
-        rslt.Expect(i32 == -1, '$i32 == -1');
-
-        trace('testI64(-34359738368)');
-        var i64 = client.testI64( Int64.make( 0xFFFFFFF8, 0x00000000)); // -34359738368
-        trace(' = $i64');
-        rslt.Expect( Int64.compare( i64, Int64.make( 0xFFFFFFF8, 0x00000000)) == 0,
-                     Int64.toStr(i64) +" == "+Int64.toStr(Int64.make( 0xFFFFFFF8, 0x00000000)));
-
-        // edge case: the largest negative Int64 has no positive Int64 equivalent
-        trace('testI64(-9223372036854775808)');
-        i64 = client.testI64( Int64.make( 0x80000000, 0x00000000)); // -9223372036854775808
-        trace(' = $i64');
-        rslt.Expect( Int64.compare( i64, Int64.make( 0x80000000, 0x00000000)) == 0,
-                     Int64.toStr(i64) +" == "+Int64.toStr(Int64.make( 0x80000000, 0x00000000)));
-
-        trace('testDouble(5.325098235)');
-        var dub = client.testDouble(5.325098235);
-        trace(' = $dub');
-        rslt.Expect(dub == 5.325098235, '$dub == 5.325098235');
-
-        var binOut = PrepareTestData(true);
-        trace('testBinary('+BytesToHex(binOut)+')');
-        try {
-            var binIn = client.testBinary(binOut);
-            trace('testBinary() = '+BytesToHex(binIn));
-            rslt.Expect( binIn.length == binOut.length, '${binIn.length} == ${binOut.length}');
-            var len = ((binIn.length < binOut.length)  ?  binIn.length  : binOut.length);
-            for (ofs in 0 ... len) {
-                if (binIn.get(ofs) != binOut.get(ofs)) {
-                    rslt.Expect( false, 'testBinary('+BytesToHex(binOut)+'): content mismatch at offset $ofs');
-                }
-            }
-        }
-        catch (e : TApplicationException) {
-            trace('testBinary('+BytesToHex(binOut)+'): '+e.errorMsg);  // may not be supported by the server
-        }
-
-
-        rslt.StartTestGroup( TestResults.EXITCODE_FAILBIT_STRUCTS);
-
-        trace('testStruct({"Zero", 1, -3, -5})');
-        var o = new Xtruct();
-        o.string_thing = "Zero";
-        o.byte_thing = 1;
-        o.i32_thing = -3;
-        o.i64_thing = Int64.make(0,-5);
-        var i = client.testStruct(o);
-        trace(' = {"' + i.string_thing + '", ' + i.byte_thing +', '
-                      + i.i32_thing +', '+ Int64.toStr(i.i64_thing) + '}');
-        rslt.Expect( i.string_thing == o.string_thing, "i.string_thing == o.string_thing");
-        rslt.Expect( i.byte_thing == o.byte_thing, "i.byte_thing == o.byte_thing");
-        rslt.Expect( i.i32_thing == o.i32_thing, "i.i64_thing == o.i64_thing");
-        rslt.Expect( i.i32_thing == o.i32_thing, "i.i64_thing == o.i64_thing");
-
-        trace('testNest({1, {\"Zero\", 1, -3, -5}, 5})');
-        var o2 = new Xtruct2();
-        o2.byte_thing = 1;
-        o2.struct_thing = o;
-        o2.i32_thing = 5;
-        var i2 = client.testNest(o2);
-        i = i2.struct_thing;
-        trace(" = {" + i2.byte_thing + ", {\"" + i.string_thing + "\", "
-              + i.byte_thing + ", " + i.i32_thing + ", " + Int64.toStr(i.i64_thing) + "}, "
-              + i2.i32_thing + "}");
-        rslt.Expect( i2.byte_thing == o2.byte_thing, "i2.byte_thing == o2.byte_thing");
-        rslt.Expect( i2.i32_thing == o2.i32_thing, "i2.i32_thing == o2.i32_thing");
-        rslt.Expect( i.string_thing == o.string_thing, "i.string_thing == o.string_thing");
-        rslt.Expect( i.byte_thing == o.byte_thing, "i.byte_thing == o.byte_thing");
-        rslt.Expect( i.i32_thing == o.i32_thing, "i.i32_thing == o.i32_thing");
-        rslt.Expect( Int64.compare( i.i64_thing, o.i64_thing) == 0, "i.i64_thing == o.i64_thing");
-
-
-        rslt.StartTestGroup( TestResults.EXITCODE_FAILBIT_CONTAINERS);
-
-        var mapout = new IntMap< haxe.Int32>();
-        for ( j in 0 ... 5)
-        {
-            mapout.set(j, j - 10);
-        }
-        trace("testMap({");
-        var first : Bool = true;
-        for( key in mapout.keys())
-        {
-            if (first)
-            {
-                first = false;
-            }
-            else
-            {
-                trace(", ");
-            }
-            trace(key + " => " + mapout.get(key));
-        }
-        trace("})");
-
-        var mapin = client.testMap(mapout);
-
-        trace(" = {");
-        first = true;
-        for( key in mapin.keys())
-        {
-            if (first)
-            {
-                first = false;
-            }
-            else
-            {
-                trace(", ");
-            }
-            trace(key + " => " + mapin.get(key));
-            rslt.Expect( mapin.get(key) == mapout.get(key), ' mapin.get($key) == mapout.get($key)');
-        }
-        trace("}");
-        for( key in mapout.keys())
-        {
-            rslt.Expect(mapin.exists(key), 'mapin.exists($key)');
-        }
-
-        var listout = new List<Int>();
-        for (j in -2 ... 3)
-        {
-            listout.add(j);
-        }
-        trace("testList({");
-        first = true;
-        for( j in listout)
-        {
-            if (first)
-            {
-                first = false;
-            }
-            else
-            {
-                trace(", ");
-            }
-            trace(j);
-        }
-        trace("})");
-
-        var listin = client.testList(listout);
-
-        trace(" = {");
-        first = true;
-        for( j in listin)
-        {
-            if (first)
-            {
-                first = false;
-            }
-            else
-            {
-                trace(", ");
-            }
-            trace(j);
-        }
-        trace("}");
-
-        rslt.Expect(listin.length == listout.length, "listin.length == listout.length");
-        var literout = listout.iterator();
-        var literin = listin.iterator();
-        while( literin.hasNext()) {
-            rslt.Expect(literin.next() == literout.next(), "literin[i] == literout[i]");
-        }
-
-        //set
-        var setout = new IntSet();
-        for (j in -2 ... 3)
-        {
-            setout.add(j);
-        }
-        trace("testSet({");
-        first = true;
-        for( j in setout)
-        {
-            if (first)
-            {
-                first = false;
-            }
-            else
-            {
-                trace(", ");
-            }
-            trace(j);
-        }
-        trace("})");
-
-        var setin = client.testSet(setout);
-
-        trace(" = {");
-        first = true;
-        for( j in setin)
-        {
-            if (first)
-            {
-                first = false;
-            }
-            else
-            {
-                trace(", ");
-            }
-            trace(j);
-            rslt.Expect(setout.contains(j), 'setout.contains($j)');
-        }
-        trace("}");
-        rslt.Expect(setin.size == setout.size, "setin.length == setout.length");
-
-
-        rslt.StartTestGroup( TestResults.EXITCODE_FAILBIT_BASETYPES);
-
-        trace("testEnum(ONE)");
-        var ret = client.testEnum(Numberz.ONE);
-        trace(" = " + ret);
-        rslt.Expect(ret == Numberz.ONE, '$ret == Numberz.ONE');
-
-        trace("testEnum(TWO)");
-        ret = client.testEnum(Numberz.TWO);
-        trace(" = " + ret);
-        rslt.Expect(ret == Numberz.TWO, '$ret == Numberz.TWO');
-
-        trace("testEnum(THREE)");
-        ret = client.testEnum(Numberz.THREE);
-        trace(" = " + ret);
-        rslt.Expect(ret == Numberz.THREE, '$ret == Numberz.THREE');
-
-        trace("testEnum(FIVE)");
-        ret = client.testEnum(Numberz.FIVE);
-        trace(" = " + ret);
-        rslt.Expect(ret == Numberz.FIVE, '$ret == Numberz.FIVE');
-
-        trace("testEnum(EIGHT)");
-        ret = client.testEnum(Numberz.EIGHT);
-        trace(" = " + ret);
-        rslt.Expect(ret == Numberz.EIGHT, '$ret == Numberz.EIGHT');
-
-        trace("testTypedef(309858235082523)");
-        var uid = client.testTypedef( Int64.make( 0x119D0, 0x7E08671B));  // 309858235082523
-        trace(" = " + uid);
-        rslt.Expect( Int64.compare( uid, Int64.make( 0x119D0, 0x7E08671B)) == 0,
-                     Int64.toStr(uid)+" == "+Int64.toStr(Int64.make( 0x119D0, 0x7E08671B)));
-
-
-        rslt.StartTestGroup( TestResults.EXITCODE_FAILBIT_CONTAINERS);
-
-        trace("testMapMap(1)");
-        var mm = client.testMapMap(1);
-        trace(" = {");
-        for( key in mm.keys())
-        {
-            trace(key + " => {");
-            var m2 = mm.get(key);
-            for( k2 in m2.keys())
-            {
-                trace(k2 + " => " + m2.get(k2) + ", ");
-            }
-            trace("}, ");
-        }
-        trace("}");
-
-        var pos = mm.get(4);
-        var neg = mm.get(-4);
-        rslt.Expect( (pos != null) && (neg != null), "(pos != null) && (neg != null)");
-        for (i in 1 ... 5) {
-            rslt.Expect( pos.get(i) == i, 'pos.get($i) == $i');
-            rslt.Expect( neg.get(-i) == -i, 'neg.get(-$i) == -$i');
-        }
-        rslt.Expect( ! pos.exists(0), '!pos.exists(0)');
-        rslt.Expect( ! neg.exists(-0), '!neg.exists(-0)');
-        rslt.Expect( ! pos.exists(42), '!pos.exists(42)');
-        rslt.Expect( ! neg.exists(-42), '!neg.exists(-42)');
-
-
-        rslt.StartTestGroup( TestResults.EXITCODE_FAILBIT_STRUCTS);
-
-        var insane = new Insanity();
-        insane.userMap = new IntMap< Int64>();
-        insane.userMap.set( Numberz.FIVE, Int64.make(0,5000));
-        var truck = new Xtruct();
-        truck.string_thing = "Truck";
-        truck.byte_thing = 8;
-        truck.i32_thing = 8;
-        truck.i64_thing = Int64.make(0,8);
-        insane.xtructs = new List<Xtruct>();
-        insane.xtructs.add(truck);
-        trace("testInsanity()");
-        var whoa = client.testInsanity(insane);
-        trace(" = {");
-        for( key in whoa.keys())
-        {
-            var val = whoa.get(key);
-            trace(key + " => {");
-
-            for( k2 in val.keys())
-            {
-                var v2 = val.get(k2);
-
-                trace(k2 + " => {");
-                var userMap = v2.userMap;
-
-                trace("{");
-                if (userMap != null)
-                {
-                    for( k3 in userMap.keys())
-                    {
-                        trace(k3 + " => " + userMap.get(k3) + ", ");
-                    }
-                }
-                else
-                {
-                    trace("null");
-                }
-                trace("}, ");
-
-                var xtructs = v2.xtructs;
-
-                trace("{");
-                if (xtructs != null)
-                {
-                    for( x in xtructs)
-                    {
-                        trace("{\"" + x.string_thing + "\", "
-                              + x.byte_thing + ", " + x.i32_thing + ", "
-                              + x.i32_thing + "}, ");
-                    }
-                }
-                else
-                {
-                    trace("null");
-                }
-                trace("}");
-
-                trace("}, ");
-            }
-            trace("}, ");
-        }
-        trace("}");
-
-
-        var first_map = whoa.get(Int64.make(0,1));
-        var second_map = whoa.get(Int64.make(0,2));
-        rslt.Expect( (first_map != null) && (second_map != null), "(first_map != null) && (second_map != null)");
-        if ((first_map != null) && (second_map != null))
-        {
-            var crazy2 = first_map.get(Numberz.TWO);
-            var crazy3 = first_map.get(Numberz.THREE);
-            var looney = second_map.get(Numberz.SIX);
-            rslt.Expect( (crazy2 != null) && (crazy3 != null) && (looney != null),
-                        "(crazy2 != null) && (crazy3 != null) && (looney != null)");
-
-            rslt.Expect( Int64.compare( crazy2.userMap.get(Numberz.EIGHT), Int64.make(0,8)) == 0,
-                        "crazy2.UserMap.get(Numberz.EIGHT) == 8");
-            rslt.Expect( Int64.compare( crazy3.userMap.get(Numberz.EIGHT), Int64.make(0,8)) == 0,
-                        "crazy3.UserMap.get(Numberz.EIGHT) == 8");
-            rslt.Expect( Int64.compare( crazy2.userMap.get(Numberz.FIVE), Int64.make(0,5)) == 0,
-                        "crazy2.UserMap.get(Numberz.FIVE) == 5");
-            rslt.Expect( Int64.compare( crazy3.userMap.get(Numberz.FIVE), Int64.make(0,5)) == 0,
-                        "crazy3.UserMap.get(Numberz.FIVE) == 5");
-
-            var crz2iter = crazy2.xtructs.iterator();
-            var crz3iter = crazy3.xtructs.iterator();
-            rslt.Expect( crz2iter.hasNext() && crz3iter.hasNext(), "crz2iter.hasNext() && crz3iter.hasNext()");
-            var goodbye2 = crz2iter.next();
-            var goodbye3 = crz3iter.next();
-            rslt.Expect( crz2iter.hasNext() && crz3iter.hasNext(), "crz2iter.hasNext() && crz3iter.hasNext()");
-            var hello2 = crz2iter.next();
-            var hello3 = crz3iter.next();
-            rslt.Expect( ! (crz2iter.hasNext() || crz3iter.hasNext()), "! (crz2iter.hasNext() || crz3iter.hasNext())");
-
-            rslt.Expect( hello2.string_thing == "Hello2", 'hello2.String_thing == "Hello2"');
-            rslt.Expect( hello2.byte_thing == 2, 'hello2.Byte_thing == 2');
-            rslt.Expect( hello2.i32_thing == 2, 'hello2.I32_thing == 2');
-            rslt.Expect( Int64.compare( hello2.i64_thing, Int64.make(0,2)) == 0, 'hello2.I64_thing == 2');
-            rslt.Expect( hello3.string_thing == "Hello2", 'hello3.String_thing == "Hello2"');
-            rslt.Expect( hello3.byte_thing == 2, 'hello3.Byte_thing == 2');
-            rslt.Expect( hello3.i32_thing == 2, 'hello3.I32_thing == 2');
-            rslt.Expect( Int64.compare( hello3.i64_thing, Int64.make(0,2)) == 0, 'hello3.I64_thing == 2');
-
-            rslt.Expect( goodbye2.string_thing == "Goodbye4", 'goodbye2.String_thing == "Goodbye4"');
-            rslt.Expect( goodbye2.byte_thing == 4, 'goodbye2.Byte_thing == 4');
-            rslt.Expect( goodbye2.i32_thing == 4, 'goodbye2.I32_thing == 4');
-            rslt.Expect( Int64.compare( goodbye2.i64_thing, Int64.make(0,4)) == 0, 'goodbye2.I64_thing == 4');
-            rslt.Expect( goodbye3.string_thing == "Goodbye4", 'goodbye3.String_thing == "Goodbye4"');
-            rslt.Expect( goodbye3.byte_thing == 4, 'goodbye3.Byte_thing == 4');
-            rslt.Expect( goodbye3.i32_thing == 4, 'goodbye3.I32_thing == 4');
-            rslt.Expect( Int64.compare( goodbye3.i64_thing, Int64.make(0,4)) == 0, 'goodbye3.I64_thing == 4');
-        }
-
-        var arg0 = 1;
-        var arg1 = 2;
-        var arg2 = Int64.make( 0x7FFFFFFF,0xFFFFFFFF);
-        var multiDict = new IntMap< String>();
-        multiDict.set(1, "one");
-        var arg4 = Numberz.FIVE;
-        var arg5 = Int64.make(0,5000000);
-        trace("Test Multi(" + arg0 + "," + arg1 + "," + arg2 + "," + multiDict + "," + arg4 + "," + arg5 + ")");
-        var multiResponse = client.testMulti(arg0, arg1, arg2, multiDict, arg4, arg5);
-        trace(" = Xtruct(byte_thing:" + multiResponse.byte_thing + ",string_thing:" + multiResponse.string_thing
-                    + ",i32_thing:" + multiResponse.i32_thing
-                    + ",i64_thing:" + Int64.toStr(multiResponse.i64_thing) + ")");
-
-        rslt.Expect( multiResponse.string_thing == "Hello2", 'multiResponse.String_thing == "Hello2"');
-        rslt.Expect( multiResponse.byte_thing == arg0, 'multiResponse.Byte_thing == arg0');
-        rslt.Expect( multiResponse.i32_thing == arg1, 'multiResponse.I32_thing == arg1');
-        rslt.Expect( Int64.compare( multiResponse.i64_thing, arg2) == 0, 'multiResponse.I64_thing == arg2');
-
-
-        rslt.StartTestGroup( 0);
-
-        trace("Test Oneway(1)");
-        client.testOneway(1);
-
-        if( ! args.skipSpeedTest) {
-            trace("Test Calltime()");
-            var difft = Timer.stamp();
-            for ( k in 0 ... 1000) {
-                client.testVoid();
-            }
-            difft = Math.round( 1000 * (Timer.stamp() - difft)) / 1000;
-            trace('$difft ms per testVoid() call');
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/src/TestMacro.hx b/vendor/git.apache.org/thrift.git/test/haxe/src/TestMacro.hx
deleted file mode 100644
index a620760..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/src/TestMacro.hx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package ;
-
-import haxe.macro.Context;
-import haxe.macro.Expr;
-
-/****
- * If you call the Thrift compiler this way (e.g. by changing the prebuild command)
- *
- *     thrift -r -gen haxe:buildmacro=TestMacro.handle()   ../ThriftTest.thrift
- *
- * the TestMacro.handle() function implemented below is called for each generated class
- * and interface. Use "thrift --help" to get more info about other available options.
- */
-class TestMacro
-{
-  public static function handle( ) : Array< Field> {
-    trace('TestMacro called for ' + Context.getLocalType());
-    return Context.getBuildFields();
-  }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/src/TestServer.hx b/vendor/git.apache.org/thrift.git/test/haxe/src/TestServer.hx
deleted file mode 100644
index 450c8f2..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/src/TestServer.hx
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-import thrift.test.*;  // generated code
-
-
-class TestServer
-{
-    public static function Execute(args : Arguments) :  Void
-    {
-        try
-        {
-            // Transport
-            var transport : TServerTransport = null;
-            switch( args.transport) {
-            case socket:
-                trace("- socket port "+args.port);
-                transport = new TServerSocket( args.port);
-            case http:
-                trace("- http");
-                #if !phpwebserver
-                  throw "HTTP server not implemented yet";
-                 //transport = new THttpServer( targetHost);
-                #else
-                transport =    new TWrappingServerTransport(
-                        new TStreamTransport(
-                          new TFileStream("php://input", Read),
-                          new TFileStream("php://output", Append)
-                          )
-                        );
-
-                #end
-            default:
-                throw "Unhandled transport";
-            }
-
-            // optional: layered transport
-            var transfactory : TTransportFactory = null;
-            if ( args.framed) {
-                trace("- framed transport");
-                transfactory = new TFramedTransportFactory();
-            }
-            if ( args.buffered) {
-                trace("- buffered transport");
-                transfactory = new TBufferedTransportFactory();
-            }
-
-            // protocol
-            var protfactory : TProtocolFactory = null;
-            switch( args.protocol)
-            {
-            case binary:
-                trace("- binary protocol");
-                protfactory = new TBinaryProtocolFactory();
-            case json:
-                trace("- json protocol");
-                protfactory = new TJSONProtocolFactory();
-            case compact:
-                trace("- compact protocol");
-                protfactory = new TCompactProtocolFactory();
-            }
-
-
-            // Processor
-            var handler = new TestServerHandler();
-            var processor = new ThriftTestProcessor(handler);
-
-            // Simple Server
-            var server : TServer = null;
-            switch( args.servertype)
-            {
-            case simple:
-                var simpleServer = new TSimpleServer( processor, transport, transfactory, protfactory);
-                #if phpwebserver
-                simpleServer.runOnce = true;
-                #end
-                server = simpleServer;
-
-            default:
-                throw "Unhandled server type";
-            }
-
-
-            /*
-            // Server event handler
-            if( args.serverEvents) {
-                var events = new TestServerEventHandler();
-                server.setEventHandler(serverEvents);
-                handler.server = serverEngine;
-            }
-            */
-
-            // Run it
-            server.Serve();
-            trace("done.");
-
-        }
-        catch (x : TException)
-        {
-            trace('$x ${x.errorID} ${x.errorMsg}');
-        }
-        catch (x : Dynamic)
-        {
-            trace('$x');
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/src/TestServerEventHandler.hx b/vendor/git.apache.org/thrift.git/test/haxe/src/TestServerEventHandler.hx
deleted file mode 100644
index d17567c..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/src/TestServerEventHandler.hx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-import thrift.test.*;  // generated code
-
-
-class TestServerEventHandler : TServerEventHandler
-{
-    public int callCount = 0;
-    public void preServe()
-    {
-        callCount++;
-    }
-    public Object createContext(Thrift.Protocol.TProtocol input, Thrift.Protocol.TProtocol output)
-    {
-        callCount++;
-        return null;
-    }
-    public void deleteContext(Object serverContext, Thrift.Protocol.TProtocol input, Thrift.Protocol.TProtocol output)
-    {
-        callCount++;
-    }
-    public void processContext(Object serverContext, Thrift.Transport.TTransport transport)
-    {
-        callCount++;
-    }
-}
-
-    
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/haxe/src/TestServerHandler.hx b/vendor/git.apache.org/thrift.git/test/haxe/src/TestServerHandler.hx
deleted file mode 100644
index 9fba136..0000000
--- a/vendor/git.apache.org/thrift.git/test/haxe/src/TestServerHandler.hx
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.helper.*;
-
-import haxe.Int32;
-import haxe.Int64;
-import haxe.io.Bytes;
-import haxe.ds.IntMap;
-import haxe.ds.StringMap;
-import haxe.ds.ObjectMap;
-
-import thrift.test.*;  // generated code
-
-
-class TestServerHandler implements ThriftTest {
-
-    public var server:TServer;
-
-    public function new() {
-    }
-
-    /**
-    * Prints "testVoid()" and returns nothing.
-    */
-    public function testVoid():Void
-    {
-        trace("testVoid()");
-    }
-
-    /**
-    * Prints 'testBool("%s")' where '%s' with thing as 'true' or 'false'
-    * @param bool  thing - the bool data to print
-    * @return bool  - returns the bool 'thing'
-    *
-    * @param thing
-    */
-    public function testBool(thing : Bool) : Bool
-    {
-        trace('testBool($thing)');
-        return thing;
-    }
-
-    /**
-    * Prints 'testString("%s")' with thing as '%s'
-    * @param string thing - the string to print
-    * @return string - returns the string 'thing'
-    *
-    * @param thing
-    */
-    public function testString(thing:String):String
-    {
-        trace("teststring(\"" + thing + "\")");
-        return thing;
-    }
-
-    /**
-    * Prints 'testByte("%d")' with thing as '%d'
-    * @param byte thing - the byte to print
-    * @return byte - returns the byte 'thing'
-    *
-    * @param thing
-    */
-    public function testByte(thing:haxe.Int32):haxe.Int32
-    {
-        trace("testByte(" + thing + ")");
-        return thing;
-    }
-
-    /**
-    * Prints 'testI32("%d")' with thing as '%d'
-    * @param i32 thing - the i32 to print
-    * @return i32 - returns the i32 'thing'
-    *
-    * @param thing
-    */
-    public function testI32(thing:haxe.Int32):haxe.Int32
-    {
-        trace("testI32(" + thing + ")");
-        return thing;
-    }
-
-    /**
-    * Prints 'testI64("%d")' with thing as '%d'
-    * @param i64 thing - the i64 to print
-    * @return i64 - returns the i64 'thing'
-    *
-    * @param thing
-    */
-    public function testI64(thing:haxe.Int64):haxe.Int64
-    {
-        trace("testI64(" + thing + ")");
-        return thing;
-    }
-
-    /**
-    * Prints 'testDouble("%f")' with thing as '%f'
-    * @param double thing - the double to print
-    * @return double - returns the double 'thing'
-    *
-    * @param thing
-    */
-    public function testDouble(thing:Float):Float
-    {
-        trace("testDouble(" + thing + ")");
-        return thing;
-    }
-
-    /**
-     * Prints 'testBinary("%s")' where '%s' is a hex-formatted string of thing's data
-     * @param binary  thing - the binary data to print
-     * @return binary  - returns the binary 'thing'
-     *
-     * @param thing
-     */
-    public function testBinary(thing : haxe.io.Bytes) : haxe.io.Bytes
-    {
-        var hex = "";
-        for ( i in 0 ... thing.length) {
-            hex += StringTools.hex( thing.get(i), 2);
-        }
-        trace('testBinary($hex)');
-        return thing;
-    }
-
-    /**
-    * Prints 'testStruct("{%s}")' where thing has been formatted
-    *  into a string of comma separated values
-    * @param Xtruct thing - the Xtruct to print
-    * @return Xtruct - returns the Xtruct 'thing'
-    *
-    * @param thing
-    */
-    public function testStruct(thing:Xtruct):Xtruct
-    {
-        trace("testStruct({" +
-                          "\"" + thing.string_thing + "\", " +
-                          thing.byte_thing + ", " +
-                          thing.i32_thing + ", " +
-                          Int64.toStr(thing.i64_thing) + "})");
-        return thing;
-    }
-
-    /**
-    * Prints 'testNest("{%s}")' where thing has been formatted
-    *  into a string of the nested struct
-    * @param Xtruct2 thing - the Xtruct2 to print
-    * @return Xtruct2 - returns the Xtruct2 'thing'
-    *
-    * @param thing
-    */
-    public function testNest(nest:Xtruct2):Xtruct2
-    {
-        var thing:Xtruct = nest.struct_thing;
-        trace("testNest({" +
-                          nest.byte_thing + ", {" +
-                          "\"" + thing.string_thing + "\", " +
-                          thing.byte_thing + ", " +
-                          thing.i32_thing + ", " +
-                          Int64.toStr(thing.i64_thing) + "}, " +
-                          nest.i32_thing + "})");
-        return nest;
-    }
-
-    /**
-    * Prints 'testMap("{%s")' where thing has been formatted
-    *  into a string of  'key => value' pairs
-    *  separated by commas and new lines
-    * @param map<i32,i32> thing - the map<i32,i32> to print
-    * @return map<i32,i32> - returns the map<i32,i32> 'thing'
-    *
-    * @param thing
-    */
-    public function testMap(thing:IntMap<haxe.Int32>):IntMap<haxe.Int32>
-    {
-        trace("testMap({");
-        var first:Bool = true;
-        for (key in thing.keys()) {
-            if (first) {
-                first = false;
-            } else {
-                trace(", ");
-            };
-            trace(key + " => " + thing.get(key));
-        };
-        trace("})");
-        return thing;
-    }
-
-    /**
-    * Prints 'testStringMap("{%s}")' where thing has been formatted
-    *  into a string of  'key => value' pairs
-    *  separated by commas and new lines
-    * @param map<string,string> thing - the map<string,string> to print
-    * @return map<string,string> - returns the map<string,string> 'thing'
-    *
-    * @param thing
-    */
-    public function testStringMap(thing:StringMap<String>):StringMap<String>
-    {
-        trace("testStringMap({");
-        var first:Bool = true;
-        for (key in thing.keys()) {
-            if (first) {
-                first = false;
-            } else {
-                trace(", ");
-            };
-            trace(key + " => " + thing.get(key));
-        };
-        trace("})");
-        return thing;
-    }
-
-    /**
-    * Prints 'testSet("{%s}")' where thing has been formatted
-    *  into a string of  values
-    *  separated by commas and new lines
-    * @param set<i32> thing - the set<i32> to print
-    * @return set<i32> - returns the set<i32> 'thing'
-    *
-    * @param thing
-    */
-    public function testSet(thing:IntSet):IntSet
-    {
-        trace("testSet({");
-        var first:Bool = true;
-        for (elem in thing) {
-            if (first) {
-                first = false;
-            } else {
-                trace(", ");
-            };
-            trace(elem);
-        };
-        trace("})");
-        return thing;
-    }
-
-    /**
-    * Prints 'testList("{%s}")' where thing has been formatted
-    *  into a string of  values
-    *  separated by commas and new lines
-    * @param list<i32> thing - the list<i32> to print
-    * @return list<i32> - returns the list<i32> 'thing'
-    *
-    * @param thing
-    */
-    public function testList(thing:List<haxe.Int32>):List<haxe.Int32>
-    {
-        trace("testList({");
-        var first:Bool = true;
-        for (elem in thing) {
-            if (first) {
-                first = false;
-            } else {
-                trace(", ");
-            };
-            trace(elem);
-        };
-        trace("})");
-        return thing;
-    }
-
-    /**
-    * Prints 'testEnum("%d")' where thing has been formatted into it's numeric value
-    * @param Numberz thing - the Numberz to print
-    * @return Numberz - returns the Numberz 'thing'
-    *
-    * @param thing
-    */
-    public function testEnum(thing:Int):Int
-    {
-        trace("testEnum(" + thing + ")");
-        return thing;
-    }
-
-    /**
-    * Prints 'testTypedef("%d")' with thing as '%d'
-    * @param UserId thing - the UserId to print
-    * @return UserId - returns the UserId 'thing'
-    *
-    * @param thing
-    */
-    public function testTypedef(thing:haxe.Int64):haxe.Int64
-    {
-        trace("testTypedef(" + thing + ")");
-        return thing;
-    }
-
-    /**
-    * Prints 'testMapMap("%d")' with hello as '%d'
-    * @param i32 hello - the i32 to print
-    * @return map<i32,map<i32,i32>> - returns a dictionary with these values:
-    *   {-4 => {-4 => -4, -3 => -3, -2 => -2, -1 => -1, },
-    *     4 => {1 => 1, 2 => 2, 3 => 3, 4 => 4, }, }
-    *
-    * @param hello
-    */
-    public function testMapMap(hello:haxe.Int32):IntMap<IntMap<haxe.Int32>>
-    {
-        trace("testMapMap(" + hello + ")");
-        var mapmap = new IntMap<IntMap<Int>>();
-        var pos = new IntMap<Int>();
-        var neg = new IntMap<Int>();
-        for (i in 1 ... 5) {
-            pos.set(i, i);
-            neg.set(-i, -i);
-        };
-        mapmap.set(4, pos);
-        mapmap.set(-4, neg);
-        return mapmap;
-    }
-
-    /**
-    * So you think you've got this all worked, out eh?
-    *
-    * Creates a the returned map with these values and prints it out:
-    *   { 1 => { 2 => argument,
-    *            3 => argument,
-    *          },
-    *     2 => { 6 => <empty Insanity struct>, },
-    *   }
-    * @return map<UserId, map<Numberz,Insanity>> - a map with the above values
-    *
-    * @param argument
-    */
-    public function testInsanity(argument : Insanity) : Int64Map< IntMap< Insanity>>
-    {
-        trace("testInsanity()");
-
-        var hello = new Xtruct();
-        hello.string_thing = "Hello2";
-        hello.byte_thing = 2;
-        hello.i32_thing = 2;
-        hello.i64_thing = Int64.make(0, 2);
-
-        var goodbye = new Xtruct();
-        goodbye.string_thing = "Goodbye4";
-        goodbye.byte_thing = 4;
-        goodbye.i32_thing = 4;
-        goodbye.i64_thing = Int64.make(0, 4);
-
-        var crazy = new Insanity();
-        crazy.userMap = new IntMap< haxe.Int64>();
-        crazy.userMap.set(Numberz.EIGHT, Int64.make(0,8));
-        crazy.xtructs = new List<Xtruct>();
-        crazy.xtructs.add(goodbye);
-
-        var looney = new Insanity();
-        crazy.userMap.set(Numberz.FIVE, Int64.make(0,5));
-        crazy.xtructs.add(hello);
-
-        var first_map = new IntMap< Insanity>();
-        first_map.set(Numberz.TWO, crazy);
-        first_map.set(Numberz.THREE, crazy);
-
-        var second_map = new IntMap< Insanity>();
-        second_map.set(Numberz.SIX, looney);
-
-        var insane = new Int64Map< IntMap< Insanity>>();
-        insane.set( Int64.make(0,1), first_map);
-        insane.set( Int64.make(0,2), second_map);
-
-        return insane;
-    }
-
-    /**
-    * Prints 'testMulti()'
-    * @param byte arg0 -
-    * @param i32 arg1 -
-    * @param i64 arg2 -
-    * @param map<i16, string> arg3 -
-    * @param Numberz arg4 -
-    * @param UserId arg5 -
-    * @return Xtruct - returns an Xtruct
-    *    with string_thing = "Hello2, byte_thing = arg0, i32_thing = arg1
-    *    and i64_thing = arg2
-    *
-    * @param arg0
-    * @param arg1
-    * @param arg2
-    * @param arg3
-    * @param arg4
-    * @param arg5
-    */
-    public function testMulti(arg0:haxe.Int32, arg1:haxe.Int32, arg2:haxe.Int64,
-        arg3:IntMap<String>, arg4:Int, arg5:haxe.Int64):Xtruct
-    {
-        trace("testMulti()");
-        var hello = new Xtruct();
-        hello.string_thing = "Hello2";
-        hello.byte_thing = arg0;
-        hello.i32_thing = arg1;
-        hello.i64_thing = arg2;
-        return hello;
-    }
-
-    /**
-    * Print 'testException(%s)' with arg as '%s'
-    * @param string arg - a string indication what type of exception to throw
-    * if arg == "Xception" throw Xception with errorCode = 1001 and message = arg
-    * elsen if arg == "TException" throw TException
-    * else do not throw anything
-    *
-    * @param arg
-    */
-    public function testException(arg:String):Void
-    {
-        trace("testException(" + arg + ")");
-        if (arg == "Xception") {
-            var x = new Xception();
-            x.errorCode = 1001;
-            x.message = arg;
-            throw x;
-        };
-        if (arg == "TException") {
-            throw new TException();
-        };
-        return;
-    }
-
-    /**
-    * Print 'testMultiException(%s, %s)' with arg0 as '%s' and arg1 as '%s'
-    * @param string arg - a string indication what type of exception to throw
-    * if arg0 == "Xception"
-    * throw Xception with errorCode = 1001 and message = "This is an Xception"
-    * else if arg0 == "Xception2"
-    * throw Xception2 with errorCode = 2002 and message = "This is an Xception2"
-    * else do not throw anything
-    * @return Xtruct - an Xtruct with string_thing = arg1
-    *
-    * @param arg0
-    * @param arg1
-    */
-    public function testMultiException(arg0:String, arg1:String):Xtruct
-    {
-        trace("testMultiException(" + arg0 + ", " + arg1 + ")");
-        if (arg0 == "Xception") {
-            var x = new Xception();
-            x.errorCode = 1001;
-            x.message = "This is an Xception";
-            throw x;
-        } else if (arg0 == "Xception2") {
-            var x = new Xception2();
-            x.errorCode = 2002;
-            x.struct_thing = new Xtruct();
-            x.struct_thing.string_thing = "This is an Xception2";
-            throw x;
-        };
-        var result = new Xtruct();
-        result.string_thing = arg1;
-        return result;
-    }
-
-    /**
-    * Print 'testOneway(%d): Sleeping...' with secondsToSleep as '%d'
-    * sleep 'secondsToSleep'
-    * Print 'testOneway(%d): done sleeping!' with secondsToSleep as '%d'
-    * @param i32 secondsToSleep - the number of seconds to sleep
-    *
-    * @param secondsToSleep
-    */
-    public function testOneway(secondsToSleep:haxe.Int32):Void
-    {
-        trace("testOneway(" + secondsToSleep + "), sleeping...");
-        Sys.sleep(secondsToSleep);
-        trace("testOneway finished");
-    }
-
-    public function testStop():Void
-    {
-        if (server != null) {
-            server.Stop();
-        };
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/test/hs/CMakeLists.txt b/vendor/git.apache.org/thrift.git/test/hs/CMakeLists.txt
deleted file mode 100644
index eaca3fa..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/CMakeLists.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-set(hs_test_gen
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ConstantsDemo_Consts.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ConstantsDemo_Types.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/DebugProtoTest_Consts.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/DebugProtoTest_Types.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/EmptyService_Client.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/EmptyService.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/EmptyService_Iface.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Include_Consts.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Include_Types.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Inherited_Client.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Inherited.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Inherited_Iface.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ReverseOrderService_Client.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ReverseOrderService.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ReverseOrderService_Iface.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/SecondService_Client.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/SecondService.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/SecondService_Iface.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ServiceForExceptionWithAMap_Client.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ServiceForExceptionWithAMap.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ServiceForExceptionWithAMap_Iface.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Srv_Client.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Srv.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Srv_Iface.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ThriftTest_Client.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ThriftTest_Consts.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ThriftTest.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ThriftTest_Iface.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/ThriftTest_Types.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Yowza_Client.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Yowza.hs
-    ${CMAKE_CURRENT_BINARY_DIR}/gen-hs/Yowza_Iface.hs
-)
-
-set(hs_crosstest_apps
-    ${CMAKE_CURRENT_BINARY_DIR}/TestServer
-    ${CMAKE_CURRENT_BINARY_DIR}/TestClient
-)
-set(hs_crosstest_args
-    -igen-hs
-    -odir=${CMAKE_CURRENT_BINARY_DIR}
-    -hidir=${CMAKE_CURRENT_BINARY_DIR}
-)
-
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(hs_optimize -O0)
-else()
-  set(hs_optimize -O1)
-endif()
-
-add_custom_command(
-    OUTPUT ${hs_crosstest_apps}
-    COMMAND ${GHC} ${hs_optimize} ${hs_crosstest_args} ${CMAKE_CURRENT_SOURCE_DIR}/TestServer.hs -o TestServer
-    COMMAND ${GHC} ${hs_optimize} ${hs_crosstest_args} ${CMAKE_CURRENT_SOURCE_DIR}/TestClient.hs -o TestClient
-    DEPENDS ${hs_test_gen} haskell_library TestServer.hs TestClient.hs
-)
-add_custom_target(haskell_crosstest ALL
-    COMMENT "Building Haskell cross test executables"
-    DEPENDS ${hs_crosstest_apps}
-)
-
-set(hs_test_sources
-    ConstantsDemo_Main.hs
-    DebugProtoTest_Main.hs
-    Include_Main.hs
-    ThriftTest_Main.hs
-)
-set(hs_test_args
-    -Wall
-    -XScopedTypeVariables
-    -i${PROJECT_SOURCE_DIR}/lib/hs/src
-    -i${CMAKE_CURRENT_BINARY_DIR}/gen-hs
-)
-add_custom_target(haskell_tests ALL DEPENDS ${hs_test_gen})
-foreach(SRC ${hs_test_sources})
-    get_filename_component(BASE ${SRC} NAME_WE)
-    add_test(NAME HaskellTests-${BASE}
-        COMMAND ${RUN_HASKELL} ${hs_test_args} ${SRC}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-endforeach()
-
-set(hs_test_gen_sources
-    ${PROJECT_SOURCE_DIR}/test/ConstantsDemo.thrift
-    ${PROJECT_SOURCE_DIR}/test/DebugProtoTest.thrift
-    ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift
-    ${PROJECT_SOURCE_DIR}/test/Include.thrift
-)
-add_custom_command(OUTPUT ${hs_test_gen}
-    COMMAND ${THRIFT_COMPILER} --gen hs ${PROJECT_SOURCE_DIR}/test/ConstantsDemo.thrift
-    COMMAND ${THRIFT_COMPILER} --gen hs ${PROJECT_SOURCE_DIR}/test/DebugProtoTest.thrift
-    COMMAND ${THRIFT_COMPILER} --gen hs ${PROJECT_SOURCE_DIR}/test/ThriftTest.thrift
-    COMMAND ${THRIFT_COMPILER} --gen hs ${PROJECT_SOURCE_DIR}/test/Include.thrift
-    DEPENDS ${hs_test_gen_sources}
-)
diff --git a/vendor/git.apache.org/thrift.git/test/hs/ConstantsDemo_Main.hs b/vendor/git.apache.org/thrift.git/test/hs/ConstantsDemo_Main.hs
deleted file mode 100644
index 28de4f7..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/ConstantsDemo_Main.hs
+++ /dev/null
@@ -1,68 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module Main where
-
-
-import qualified Control.Exception
-import qualified Network
-
-import Thrift.Protocol.Binary
-import Thrift.Server
-import Thrift.Transport.Handle
-
-import qualified ThriftTestUtils
-
-import qualified Yowza
-import qualified Yowza_Client as Client
-import qualified Yowza_Iface as Iface
-
-
-data YowzaHandler = YowzaHandler
-instance Iface.Yowza_Iface YowzaHandler where
-    blingity _ = do
-        ThriftTestUtils.serverLog "SERVER: Got blingity"
-        return ()
-
-    blangity _ = do
-        ThriftTestUtils.serverLog "SERVER: Got blangity"
-        return $ 31
-
-
-client :: (String, Network.PortID) -> IO ()
-client addr = do
-    to <- hOpen addr
-    let ps = (BinaryProtocol to, BinaryProtocol to)
-
-    Client.blingity ps
-
-    rv <- Client.blangity ps
-    ThriftTestUtils.clientLog $ show rv
-
-    tClose to
-
-server :: Network.PortNumber -> IO ()
-server port = do 
-    ThriftTestUtils.serverLog "Ready..."
-    (runBasicServer YowzaHandler Yowza.process port)
-    `Control.Exception.catch`
-    (\(TransportExn s _) -> error $ "FAILURE: " ++ show s)
-
-main :: IO ()
-main = ThriftTestUtils.runTest server client
diff --git a/vendor/git.apache.org/thrift.git/test/hs/DebugProtoTest_Main.hs b/vendor/git.apache.org/thrift.git/test/hs/DebugProtoTest_Main.hs
deleted file mode 100644
index fb28963..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/DebugProtoTest_Main.hs
+++ /dev/null
@@ -1,168 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# LANGUAGE OverloadedStrings #-}
-
-module Main where
-
-
-import qualified Control.Exception
-import qualified Data.ByteString.Lazy as DBL
-import qualified Data.HashMap.Strict as Map
-import qualified Data.HashSet as Set
-import qualified Data.Vector as Vector
-import qualified Network
-
-import Thrift.Protocol.Binary
-import Thrift.Server
-import Thrift.Transport.Handle
-
-import qualified ThriftTestUtils
-
-import qualified DebugProtoTest_Types as Types
-import qualified Inherited
-import qualified Inherited_Client as IClient
-import qualified Inherited_Iface as IIface
-import qualified Srv_Client as SClient
-import qualified Srv_Iface as SIface
-
--- we don't actually need this import, but force it to check the code generator exports proper Haskell syntax
-import qualified Srv()
-
-
-data InheritedHandler = InheritedHandler
-instance SIface.Srv_Iface InheritedHandler where
-    janky _ arg = do
-        ThriftTestUtils.serverLog $ "Got janky method call: " ++ show arg
-        return $ 31
-
-    voidMethod _ = do
-        ThriftTestUtils.serverLog "Got voidMethod method call"
-        return ()
-
-    primitiveMethod _ = do
-        ThriftTestUtils.serverLog "Got primitiveMethod call"
-        return $ 42
-
-    structMethod _ = do
-        ThriftTestUtils.serverLog "Got structMethod call"
-        return $ Types.CompactProtoTestStruct {
-            Types.compactProtoTestStruct_a_byte = 0x01,
-            Types.compactProtoTestStruct_a_i16 = 0x02,
-            Types.compactProtoTestStruct_a_i32 = 0x03,
-            Types.compactProtoTestStruct_a_i64 = 0x04,
-            Types.compactProtoTestStruct_a_double = 0.1,
-            Types.compactProtoTestStruct_a_string = "abcdef",
-            Types.compactProtoTestStruct_a_binary = DBL.empty,
-            Types.compactProtoTestStruct_true_field = True,
-            Types.compactProtoTestStruct_false_field = False,
-            Types.compactProtoTestStruct_empty_struct_field = Types.Empty,
-            
-            Types.compactProtoTestStruct_byte_list = Vector.empty,
-            Types.compactProtoTestStruct_i16_list = Vector.empty,
-            Types.compactProtoTestStruct_i32_list = Vector.empty,
-            Types.compactProtoTestStruct_i64_list = Vector.empty,
-            Types.compactProtoTestStruct_double_list = Vector.empty,
-            Types.compactProtoTestStruct_string_list = Vector.empty,
-            Types.compactProtoTestStruct_binary_list = Vector.empty,
-            Types.compactProtoTestStruct_boolean_list = Vector.empty,
-            Types.compactProtoTestStruct_struct_list = Vector.empty,
-
-            Types.compactProtoTestStruct_byte_set = Set.empty,
-            Types.compactProtoTestStruct_i16_set = Set.empty,
-            Types.compactProtoTestStruct_i32_set = Set.empty,
-            Types.compactProtoTestStruct_i64_set = Set.empty,
-            Types.compactProtoTestStruct_double_set = Set.empty,
-            Types.compactProtoTestStruct_string_set = Set.empty,
-            Types.compactProtoTestStruct_binary_set = Set.empty,
-            Types.compactProtoTestStruct_boolean_set = Set.empty,
-            Types.compactProtoTestStruct_struct_set = Set.empty,
-
-            Types.compactProtoTestStruct_byte_byte_map = Map.empty,
-            Types.compactProtoTestStruct_i16_byte_map = Map.empty,
-            Types.compactProtoTestStruct_i32_byte_map = Map.empty,
-            Types.compactProtoTestStruct_i64_byte_map = Map.empty,
-            Types.compactProtoTestStruct_double_byte_map = Map.empty,
-            Types.compactProtoTestStruct_string_byte_map = Map.empty,
-            Types.compactProtoTestStruct_binary_byte_map = Map.empty,
-            Types.compactProtoTestStruct_boolean_byte_map = Map.empty,
-
-            Types.compactProtoTestStruct_byte_i16_map = Map.empty,
-            Types.compactProtoTestStruct_byte_i32_map = Map.empty,
-            Types.compactProtoTestStruct_byte_i64_map = Map.empty,
-            Types.compactProtoTestStruct_byte_double_map = Map.empty,
-            Types.compactProtoTestStruct_byte_string_map = Map.empty,
-            Types.compactProtoTestStruct_byte_binary_map = Map.empty,
-            Types.compactProtoTestStruct_byte_boolean_map = Map.empty,
-
-            Types.compactProtoTestStruct_list_byte_map = Map.empty,
-            Types.compactProtoTestStruct_set_byte_map = Map.empty,
-            Types.compactProtoTestStruct_map_byte_map = Map.empty,
-
-            Types.compactProtoTestStruct_byte_map_map = Map.empty,
-            Types.compactProtoTestStruct_byte_set_map = Map.empty,
-            Types.compactProtoTestStruct_byte_list_map = Map.empty }
-
-    methodWithDefaultArgs _ arg = do
-        ThriftTestUtils.serverLog $ "Got methodWithDefaultArgs: " ++ show arg
-        return ()
-
-    onewayMethod _ = do
-        ThriftTestUtils.serverLog "Got onewayMethod"
-
-instance IIface.Inherited_Iface InheritedHandler where
-    identity _ arg = do
-        ThriftTestUtils.serverLog $ "Got identity method: " ++ show arg
-        return arg
-
-client :: (String, Network.PortID) -> IO ()
-client addr = do
-    to <- hOpen addr
-    let p =  BinaryProtocol to
-    let ps = (p,p)
-
-    v1 <- SClient.janky ps 42
-    ThriftTestUtils.clientLog $ show v1
-
-    SClient.voidMethod ps
-
-    v2 <- SClient.primitiveMethod ps
-    ThriftTestUtils.clientLog $ show v2
-
-    v3 <- SClient.structMethod ps
-    ThriftTestUtils.clientLog $ show v3
-
-    SClient.methodWithDefaultArgs ps 42
-
-    SClient.onewayMethod ps
-
-    v4 <- IClient.identity ps 42
-    ThriftTestUtils.clientLog $ show v4
-
-    return ()
-
-server :: Network.PortNumber -> IO ()
-server port = do 
-    ThriftTestUtils.serverLog "Ready..."
-    (runBasicServer InheritedHandler Inherited.process port)
-    `Control.Exception.catch`
-    (\(TransportExn s _) -> error $ "FAILURE: " ++ show s)
-
-main :: IO ()
-main = ThriftTestUtils.runTest server client
diff --git a/vendor/git.apache.org/thrift.git/test/hs/Include_Main.hs b/vendor/git.apache.org/thrift.git/test/hs/Include_Main.hs
deleted file mode 100644
index d3977a1..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/Include_Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Main where
-
-import Include_Types
-import ThriftTest_Types
-
-main :: IO ()
-main = putStrLn ("Includes work: " ++ (show (IncludeTest $ Bools True False)))
diff --git a/vendor/git.apache.org/thrift.git/test/hs/Makefile.am b/vendor/git.apache.org/thrift.git/test/hs/Makefile.am
deleted file mode 100644
index 3f35396..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-stubs: $(THRIFT) ../ConstantsDemo.thrift ../DebugProtoTest.thrift ../ThriftTest.thrift ../Include.thrift
-	$(THRIFT) --gen hs ../ConstantsDemo.thrift
-	$(THRIFT) --gen hs ../DebugProtoTest.thrift
-	$(THRIFT) --gen hs ../ThriftTest.thrift
-	$(THRIFT) --gen hs ../Include.thrift
-
-check: stubs
-	sh run-test.sh ConstantsDemo
-	sh run-test.sh DebugProtoTest
-	sh run-test.sh ThriftTest
-	sh run-test.sh Include
-
-clean-local:
-	$(RM) -r gen-hs
-	$(RM) *.hi
-	$(RM) *.o
-
-all-local: stubs
-	ghc -igen-hs TestServer.hs
-	ghc -igen-hs TestClient.hs
-
-precross: all-local
diff --git a/vendor/git.apache.org/thrift.git/test/hs/TestClient.hs b/vendor/git.apache.org/thrift.git/test/hs/TestClient.hs
deleted file mode 100644
index d1ebb3c..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/TestClient.hs
+++ /dev/null
@@ -1,302 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# LANGUAGE OverloadedStrings, RecordWildCards, ScopedTypeVariables #-}
-module Main where
-
-import Control.Exception
-import Control.Monad
-import Data.Functor
-import Data.List.Split
-import Data.String
-import Network
-import Network.URI
-import System.Environment
-import System.Exit
-import qualified Data.ByteString.Lazy as LBS
-import qualified Data.HashMap.Strict as Map
-import qualified Data.HashSet as Set
-import qualified Data.Vector as Vector
-import qualified System.IO as IO
-
-import ThriftTest_Iface
-import ThriftTest_Types
-import qualified ThriftTest_Client as Client
-
-import Thrift.Transport
-import Thrift.Transport.Framed
-import Thrift.Transport.Handle
-import Thrift.Transport.HttpClient
-import Thrift.Protocol
-import Thrift.Protocol.Binary
-import Thrift.Protocol.Compact
-import Thrift.Protocol.JSON
-
-data Options = Options
-  { host         :: String
-  , port         :: Int
-  , domainSocket :: String
-  , transport    :: String
-  , protocol     :: ProtocolType
-  -- TODO: Haskell lib does not have SSL support
-  , ssl          :: Bool
-  , testLoops    :: Int
-  }
-  deriving (Show, Eq)
-
-data TransportType = Buffered IO.Handle
-                   | Framed (FramedTransport IO.Handle)
-                   | Http HttpClient
-                   | NoTransport String
-
-getTransport :: String -> String -> Int -> (IO TransportType)
-getTransport "buffered" host port = do
-  h <- hOpen (host, PortNumber $ fromIntegral port)
-  IO.hSetBuffering h $ IO.BlockBuffering Nothing
-  return $ Buffered h
-getTransport "framed" host port = do
-  h <- hOpen (host, PortNumber $ fromIntegral port)
-  t <- openFramedTransport h
-  return $ Framed t
-getTransport "http" host port = let uriStr = "http://" ++ host ++ ":" ++ show port in
-                                case parseURI uriStr of
-                                  Nothing -> do return (NoTransport $ "Failed to parse URI: " ++ uriStr)
-                                  Just(uri) -> do
-                                    t <- openHttpClient uri
-                                    return $ Http t
-getTransport t host port = do return (NoTransport $ "Unsupported transport: " ++ t)
-
-data ProtocolType = Binary
-                  | Compact
-                  | JSON
-                  deriving (Show, Eq)
-
-getProtocol :: String -> ProtocolType
-getProtocol "binary"  = Binary
-getProtocol "compact" = Compact
-getProtocol "json"    = JSON
-getProtocol p = error $ "Unsupported Protocol: " ++ p
-
-defaultOptions :: Options
-defaultOptions = Options
-  { port         = 9090
-  , domainSocket = ""
-  , host         = "localhost"
-  , transport    = "buffered"
-  , protocol     = Binary
-  , ssl          = False
-  , testLoops    = 1
-  }
-
-runClient :: (Protocol p, Transport t) => p t -> IO ()
-runClient p = do
-  let prot = (p,p)
-  putStrLn "Starting Tests"
-
-  -- VOID Test
-  putStrLn "testVoid"
-  Client.testVoid prot
-
-  -- String Test
-  putStrLn "testString"
-  s <- Client.testString prot "Test"
-  when (s /= "Test") exitFailure
-
-  -- Bool Test
-  putStrLn "testBool"
-  bool <- Client.testBool prot True
-  when (not bool) exitFailure
-  putStrLn "testBool"
-  bool <- Client.testBool prot False
-  when (bool) exitFailure
-
-  -- Byte Test
-  putStrLn "testByte"
-  byte <- Client.testByte prot 1
-  when (byte /= 1) exitFailure
-
-  -- I32 Test
-  putStrLn "testI32"
-  i32 <- Client.testI32 prot (-1)
-  when (i32 /= -1) exitFailure
-
-  -- I64 Test
-  putStrLn "testI64"
-  i64 <- Client.testI64 prot (-34359738368)
-  when (i64 /= -34359738368) exitFailure
-
-  -- Double Test
-  putStrLn "testDouble"
-  dub <- Client.testDouble prot (-5.2098523)
-  when (abs (dub + 5.2098523) > 0.001) exitFailure
-
-  -- Binary Test
-  putStrLn "testBinary"
-  bin <- Client.testBinary prot (LBS.pack . reverse $ [-128..127])
-  when ((reverse [-128..127]) /= LBS.unpack bin) exitFailure
-  
-  -- Struct Test
-  let structIn = Xtruct{ xtruct_string_thing = "Zero"
-                       , xtruct_byte_thing   = 1
-                       , xtruct_i32_thing    = -3
-                       , xtruct_i64_thing    = -5
-                       }
-  putStrLn "testStruct"
-  structOut <- Client.testStruct prot structIn
-  when (structIn /= structOut) exitFailure
-
-  -- Nested Struct Test
-  let nestIn = Xtruct2{ xtruct2_byte_thing   = 1
-                      , xtruct2_struct_thing = structIn
-                      , xtruct2_i32_thing    = 5
-                      }
-  putStrLn "testNest"
-  nestOut <- Client.testNest prot nestIn
-  when (nestIn /= nestOut) exitFailure
-
-  -- Map Test
-  let mapIn = Map.fromList $ map (\i -> (i, i-10)) [1..5]
-  putStrLn "testMap"
-  mapOut <- Client.testMap prot mapIn
-  when (mapIn /= mapOut) exitFailure
-
-  -- Set Test
-  let setIn = Set.fromList [-2..3]
-  putStrLn "testSet"
-  setOut <- Client.testSet prot setIn
-  when (setIn /= setOut) exitFailure
-
-  -- List Test
-  let listIn = Vector.fromList [-2..3]
-  putStrLn "testList"
-  listOut <- Client.testList prot listIn
-  when (listIn /= listOut) exitFailure
-
-  -- Enum Test
-  putStrLn "testEnum"
-  numz1 <- Client.testEnum prot ONE
-  when (numz1 /= ONE) exitFailure
-
-  putStrLn "testEnum"
-  numz2 <- Client.testEnum prot TWO
-  when (numz2 /= TWO) exitFailure
-
-  putStrLn "testEnum"
-  numz5 <- Client.testEnum prot FIVE
-  when (numz5 /= FIVE) exitFailure
-
-  -- Typedef Test
-  putStrLn "testTypedef"
-  uid <- Client.testTypedef prot 309858235082523
-  when (uid /= 309858235082523) exitFailure
-
-  -- Nested Map Test
-  putStrLn "testMapMap"
-  _ <- Client.testMapMap prot 1
-
-  -- Exception Test
-  putStrLn "testException"
-  exn1 <- try $ Client.testException prot "Xception"
-  case exn1 of
-    Left (Xception _ _) -> return ()
-    _ -> putStrLn (show exn1) >> exitFailure
-
-  putStrLn "testException"
-  exn2 <- try $ Client.testException prot "TException"
-  case exn2 of
-    Left (_ :: SomeException) -> return ()
-    Right _ -> exitFailure
-
-  putStrLn "testException"
-  exn3 <- try $ Client.testException prot "success"
-  case exn3 of
-    Left (_ :: SomeException) -> exitFailure
-    Right _ -> return ()
-
-  -- Multi Exception Test
-  putStrLn "testMultiException"
-  multi1 <- try $ Client.testMultiException prot "Xception" "test 1"
-  case multi1 of
-    Left (Xception _ _) -> return ()
-    _ -> exitFailure
-
-  putStrLn "testMultiException"
-  multi2 <- try $ Client.testMultiException prot "Xception2" "test 2"
-  case multi2 of
-    Left (Xception2 _ _) -> return ()
-    _ -> exitFailure
-
-  putStrLn "testMultiException"
-  multi3 <- try $ Client.testMultiException prot "success" "test 3"
-  case multi3 of
-    Left (_ :: SomeException) -> exitFailure
-    Right _ -> return ()
-
-
-main :: IO ()
-main = do
-  options <- flip parseFlags defaultOptions <$> getArgs
-  case options of
-    Nothing -> showHelp
-    Just Options{..} -> do
-      trans <- Main.getTransport transport host port
-      case trans of
-        Buffered t -> runTest testLoops protocol t
-        Framed t   -> runTest testLoops protocol t
-        Http t     -> runTest testLoops protocol t
-        NoTransport err -> putStrLn err
-  where
-    makeClient p t = case p of
-                       Binary  -> runClient $ BinaryProtocol t
-                       Compact -> runClient $ CompactProtocol t
-                       JSON    -> runClient $ JSONProtocol t
-    runTest loops p t = do
-      let client = makeClient p t
-      replicateM_ loops client
-      putStrLn "COMPLETED SUCCESSFULLY"
-
-parseFlags :: [String] -> Options -> Maybe Options
-parseFlags (flag : flags) opts = do
-  let pieces = splitOn "=" flag
-  case pieces of
-    "--port" : arg : _ -> parseFlags flags opts{ port = read arg }
-    "--domain-socket" : arg : _ -> parseFlags flags opts{ domainSocket = read arg }
-    "--host" : arg : _ -> parseFlags flags opts{ host = arg }
-    "--transport" : arg : _ -> parseFlags flags opts{ transport = arg }
-    "--protocol" : arg : _ -> parseFlags flags opts{ protocol = getProtocol arg }
-    "-n" : arg : _ -> parseFlags flags opts{ testLoops = read arg }
-    "--h" : _ -> Nothing
-    "--help" : _ -> Nothing
-    "--ssl" : _ -> parseFlags flags opts{ ssl = True }
-    "--processor-events" : _ -> parseFlags flags opts
-    _ -> Nothing
-parseFlags [] opts = Just opts
-
-showHelp :: IO ()
-showHelp = putStrLn
-  "Allowed options:\n\
-  \  -h [ --help ]               produce help message\n\
-  \  --host arg (=localhost)     Host to connect\n\
-  \  --port arg (=9090)          Port number to connect\n\
-  \  --domain-socket arg         Domain Socket (e.g. /tmp/ThriftTest.thrift),\n\
-  \                              instead of host and port\n\
-  \  --transport arg (=buffered) Transport: buffered, framed, http\n\
-  \  --protocol arg (=binary)    Protocol: binary, compact, json\n\
-  \  --ssl                       Encrypted Transport using SSL\n\
-  \  -n [ --testloops ] arg (=1) Number of Tests"
diff --git a/vendor/git.apache.org/thrift.git/test/hs/TestServer.hs b/vendor/git.apache.org/thrift.git/test/hs/TestServer.hs
deleted file mode 100644
index 4a88649..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/TestServer.hs
+++ /dev/null
@@ -1,303 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# LANGUAGE OverloadedStrings,RecordWildCards #-}
-module Main where
-
-import Control.Exception
-import Control.Monad
-import Data.Functor
-import Data.HashMap.Strict (HashMap)
-import Data.List
-import Data.List.Split
-import Data.String
-import Network
-import System.Environment
-import System.Exit
-import System.IO
-import Control.Concurrent (threadDelay)
-import qualified System.IO as IO
-import qualified Data.HashMap.Strict as Map
-import qualified Data.HashSet as Set
-import qualified Data.Text.Lazy as Text
-import qualified Data.Vector as Vector
-
-import ThriftTest
-import ThriftTest_Iface
-import ThriftTest_Types
-
-import Thrift
-import Thrift.Server
-import Thrift.Transport.Framed
-import Thrift.Transport.Handle
-import Thrift.Protocol.Binary
-import Thrift.Protocol.Compact
-import Thrift.Protocol.JSON
-
-data Options = Options
-  { port         :: Int
-  , domainSocket :: String
-  , serverType   :: ServerType
-  , transport    :: String
-  , protocol     :: ProtocolType
-  , ssl          :: Bool
-  , workers      :: Int
-  }
-
-data ServerType = Simple
-                | ThreadPool
-                | Threaded
-                | NonBlocking
-                deriving (Show, Eq)
-
-instance IsString ServerType where
-  fromString "simple"      = Simple
-  fromString "thread-pool" = ThreadPool
-  fromString "threaded"    = Threaded
-  fromString "nonblocking" = NonBlocking
-  fromString _ = error "not a valid server type"
-
-data TransportType = Buffered (Socket -> (IO IO.Handle))
-                   | Framed (Socket -> (IO (FramedTransport IO.Handle)))
-                   | NoTransport String
-
-getTransport :: String -> TransportType
-getTransport "buffered" = Buffered $ \s -> do
-  (h, _, _) <- (accept s)
-  IO.hSetBuffering h $ IO.BlockBuffering Nothing
-  return h
-getTransport "framed" = Framed $ \s -> do
-  (h, _, _) <- (accept s)
-  openFramedTransport h
-getTransport t = NoTransport $ "Unsupported transport: " ++ t
-
-data ProtocolType = Binary
-                  | Compact
-                  | JSON
-
-getProtocol :: String -> ProtocolType
-getProtocol "binary"  = Binary
-getProtocol "compact" = Compact
-getProtocol "json"    = JSON
-getProtocol p = error $"Unsupported Protocol: " ++ p
-
-defaultOptions :: Options
-defaultOptions = Options
-  { port         = 9090
-  , domainSocket = ""
-  , serverType   = Threaded
-  , transport    = "buffered"
-  , protocol     = Binary
-  -- TODO: Haskell lib does not have SSL support
-  , ssl          = False
-  , workers      = 4
-  }
-
-stringifyMap :: (Show a, Show b) => Map.HashMap a b -> String
-stringifyMap = Data.List.intercalate ", " . Data.List.map joinKV . Map.toList
-  where joinKV (k, v) = show k ++ " => " ++ show v
-
-stringifySet :: Show a => Set.HashSet a -> String
-stringifySet = Data.List.intercalate ", " . Data.List.map show . Set.toList
-
-stringifyList :: Show a => Vector.Vector a -> String
-stringifyList = Data.List.intercalate ", " . Data.List.map show . Vector.toList
-
-data TestHandler = TestHandler
-instance ThriftTest_Iface TestHandler where
-  testVoid _ = System.IO.putStrLn "testVoid()"
-
-  testString _ s = do
-    System.IO.putStrLn $ "testString(" ++ show s ++ ")"
-    return s
-
-  testBool _ x = do
-    System.IO.putStrLn $ "testBool(" ++ show x ++ ")"
-    return x
-
-  testByte _ x = do
-    System.IO.putStrLn $ "testByte(" ++ show x ++ ")"
-    return x
-
-  testI32 _ x = do
-    System.IO.putStrLn $ "testI32(" ++ show x ++ ")"
-    return x
-
-  testI64 _ x = do
-    System.IO.putStrLn $ "testI64(" ++ show x ++ ")"
-    return x
-
-  testDouble _ x = do
-    System.IO.putStrLn $ "testDouble(" ++ show x ++ ")"
-    return x
-
-  testBinary _ x = do
-    System.IO.putStrLn $ "testBinary(" ++ show x ++ ")"
-    return x
-
-  testStruct _ struct@Xtruct{..} = do
-    System.IO.putStrLn $ "testStruct({" ++ show xtruct_string_thing
-                      ++ ", " ++ show xtruct_byte_thing
-                      ++ ", " ++ show xtruct_i32_thing
-                      ++ ", " ++ show xtruct_i64_thing
-                      ++ "})"
-    return struct
-
-  testNest _ nest@Xtruct2{..} = do
-    let Xtruct{..} = xtruct2_struct_thing
-    System.IO.putStrLn $ "testNest({" ++ show xtruct2_byte_thing
-                   ++ "{, " ++ show xtruct_string_thing
-                   ++  ", " ++ show xtruct_byte_thing
-                   ++  ", " ++ show xtruct_i32_thing
-                   ++  ", " ++ show xtruct_i64_thing
-                   ++ "}, " ++ show xtruct2_i32_thing
-    return nest
-
-  testMap _ m = do
-    System.IO.putStrLn $ "testMap({" ++ stringifyMap m ++ "})"
-    return m
-
-  testStringMap _ m = do
-    System.IO.putStrLn $ "testStringMap(" ++ stringifyMap m ++ "})"
-    return m
-
-  testSet _ x = do
-    System.IO.putStrLn $ "testSet({" ++ stringifySet x ++ "})"
-    return x
-
-  testList _ x = do
-    System.IO.putStrLn $ "testList(" ++ stringifyList x ++ "})"
-    return x
-
-  testEnum _ x = do
-    System.IO.putStrLn $ "testEnum(" ++ show x ++ ")"
-    return x
-
-  testTypedef _ x = do
-    System.IO.putStrLn $ "testTypedef(" ++ show x ++ ")"
-    return x
-
-  testMapMap _ x = do
-    System.IO.putStrLn $ "testMapMap(" ++ show x ++ ")"
-    return $ Map.fromList [ (-4, Map.fromList [ (-4, -4)
-                                              , (-3, -3)
-                                              , (-2, -2)
-                                              , (-1, -1)
-                                              ])
-                          , (4,  Map.fromList [ (1, 1)
-                                              , (2, 2)
-                                              , (3, 3)
-                                              , (4, 4)
-                                              ])
-                          ]
-
-  testInsanity _ x = do
-    System.IO.putStrLn "testInsanity()"
-    return $ Map.fromList [ (1, Map.fromList [ (TWO  , x)
-                                             , (THREE, x)
-                                             ])
-                          , (2, Map.fromList [ (SIX, default_Insanity)
-                                             ])
-                          ]
-
-  testMulti _ byte i32 i64 _ _ _ = do
-    System.IO.putStrLn "testMulti()"
-    return Xtruct{ xtruct_string_thing = Text.pack "Hello2"
-                 , xtruct_byte_thing   = byte
-                 , xtruct_i32_thing    = i32
-                 , xtruct_i64_thing    = i64
-                 }
-
-  testException _ s = do
-    System.IO.putStrLn $ "testException(" ++ show s ++ ")"
-    case s of
-      "Xception"   -> throw $ Xception 1001 s
-      "TException" -> throw ThriftException
-      _ -> return ()
-
-  testMultiException _ s1 s2 = do
-    System.IO.putStrLn $ "testMultiException(" ++ show s1 ++ ", " ++ show s2 ++  ")"
-    case s1 of
-      "Xception"   -> throw $ Xception 1001 "This is an Xception"
-      "Xception2"  -> throw $ Xception2 2002 $ Xtruct "This is an Xception2" 0 0 0
-      "TException" -> throw ThriftException
-      _ -> return default_Xtruct{ xtruct_string_thing = s2 }
-
-  testOneway _ i = do
-    System.IO.putStrLn $ "testOneway(" ++ show i ++ "): Sleeping..."
-    threadDelay $ (fromIntegral i) * 1000000
-    System.IO.putStrLn $ "testOneway(" ++ show i ++ "): done sleeping!"
-
-main :: IO ()
-main = do
-  options <- flip parseFlags defaultOptions <$> getArgs
-  case options of
-    Nothing -> showHelp
-    Just Options{..} -> do
-      case Main.getTransport transport of
-        Buffered f -> runServer protocol f port
-        Framed   f -> runServer protocol f port
-        NoTransport err -> putStrLn err
-      System.IO.putStrLn $ "Starting \"" ++ show serverType ++ "\" server (" ++
-        show transport ++ ") listen on: " ++ domainSocket ++ show port
-      where
-        acceptor p f socket = do
-          t <- f socket
-          return (p t, p t)
-
-        doRunServer p f = do
-          runThreadedServer (acceptor p f) TestHandler ThriftTest.process . PortNumber . fromIntegral
-
-        runServer p f port = case p of
-          Binary  -> do doRunServer BinaryProtocol f port
-          Compact -> do doRunServer CompactProtocol f port
-          JSON    -> do doRunServer JSONProtocol f port
-
-parseFlags :: [String] -> Options -> Maybe Options
-parseFlags (flag : flags) opts = do
-  let pieces = splitOn "=" flag
-  case pieces of
-    "--port" : arg : _ -> parseFlags flags opts{ port = read arg }
-    "--domain-socket" : arg : _ -> parseFlags flags opts{ domainSocket = read arg }
-    "--server-type" : arg : _ -> parseFlags flags opts{ serverType = fromString arg }
-    "--transport" : arg : _ -> parseFlags flags opts{ transport = arg }
-    "--protocol" : arg : _ -> parseFlags flags opts{ protocol = getProtocol arg }
-    "--workers" : arg : _ -> parseFlags flags opts{ workers = read arg }
-    "-n" : arg : _ -> parseFlags flags opts{ workers = read arg }
-    "--h" : _ -> Nothing
-    "--help" : _ -> Nothing
-    "--ssl" : _ -> parseFlags flags opts{ ssl = True }
-    "--processor-events" : _ -> parseFlags flags opts
-    _ -> Nothing
-parseFlags [] opts = Just opts
-
-showHelp :: IO ()
-showHelp = System.IO.putStrLn
-  "Allowed options:\n\
-  \  -h [ --help ]               produce help message\n\
-  \  --port arg (=9090)          Port number to listen\n\
-  \  --domain-socket arg         Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)\n\
-  \  --server-type arg (=simple) type of server, \"simple\", \"thread-pool\",\n\
-  \                              \"threaded\", or \"nonblocking\"\n\
-  \  --transport arg (=buffered) transport: buffered, framed\n\
-  \  --protocol arg (=binary)    protocol: binary, compact, json\n\
-  \  --ssl                       Encrypted Transport using SSL\n\
-  \  --processor-events          processor-events\n\
-  \  -n [ --workers ] arg (=4)   Number of thread pools workers. Only valid for\n\
-  \                              thread-pool server type"
diff --git a/vendor/git.apache.org/thrift.git/test/hs/ThriftTestUtils.hs b/vendor/git.apache.org/thrift.git/test/hs/ThriftTestUtils.hs
deleted file mode 100644
index 9c19b56..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/ThriftTestUtils.hs
+++ /dev/null
@@ -1,65 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-module ThriftTestUtils (ClientFunc, ServerFunc, clientLog, serverLog, testLog, runTest) where
-
-
-import qualified Control.Concurrent
-import qualified Network
-import qualified System.IO
-
-
-serverPort :: Network.PortNumber
-serverPort = 9090
-
-serverAddress :: (String, Network.PortID)
-serverAddress = ("localhost", Network.PortNumber serverPort)
-
-
-testLog :: String -> IO ()
-testLog str = do
-    System.IO.hPutStr System.IO.stdout $ str ++ "\n"
-    System.IO.hFlush System.IO.stdout
-
-
-clientLog :: String -> IO ()
-clientLog str = testLog $ "CLIENT: " ++ str
-
-serverLog :: String -> IO ()
-serverLog str = testLog $ "SERVER: " ++ str
-
-
-type ServerFunc = Network.PortNumber -> IO ()
-type ClientFunc = (String, Network.PortID) -> IO ()
-
-runTest :: ServerFunc -> ClientFunc -> IO ()
-runTest server client = do
-    _ <- Control.Concurrent.forkIO (server serverPort)
-
-    -- Fairly horrible; this does not 100% guarantees that the other thread
-    -- has actually opened the socket we need... but not much else we can do
-    -- without this, the client races the server to the socket, and wins every
-    -- time
-    Control.Concurrent.yield
-    Control.Concurrent.threadDelay $ 500 * 1000 -- unit is in _micro_seconds
-    Control.Concurrent.yield
-
-    client serverAddress
-
-    testLog "SUCCESS"
diff --git a/vendor/git.apache.org/thrift.git/test/hs/ThriftTest_Main.hs b/vendor/git.apache.org/thrift.git/test/hs/ThriftTest_Main.hs
deleted file mode 100644
index 670023e..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/ThriftTest_Main.hs
+++ /dev/null
@@ -1,214 +0,0 @@
-{-# LANGUAGE ScopedTypeVariables #-}
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# LANGUAGE OverloadedStrings #-}
-
-module Main where
-
-
-import qualified Control.Exception
-import qualified Data.HashMap.Strict as Map
-import qualified Data.HashSet as Set
-import qualified Data.Vector as Vector
-
-import qualified Network
-
-import Thrift
-import Thrift.Protocol.Binary
-import Thrift.Server
-import Thrift.Transport.Handle
-
-import qualified ThriftTestUtils
-
-import qualified ThriftTest
-import qualified ThriftTest_Client as Client
-import qualified ThriftTest_Iface as Iface
-import qualified ThriftTest_Types as Types
-
-
-data TestHandler = TestHandler
-instance Iface.ThriftTest_Iface TestHandler where
-    testVoid _ = return ()
-
-    testString _ s = do
-        ThriftTestUtils.serverLog $ show s
-        return s
-
-    testByte _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testI32 _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testI64 _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testDouble _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testBinary _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testStruct _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testNest _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testMap _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testStringMap _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testSet _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testList _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testEnum _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testTypedef _ x = do
-        ThriftTestUtils.serverLog $ show x
-        return x
-
-    testMapMap _ _ = do
-        return (Map.fromList [(1, Map.fromList [(2, 2)])])
-
-    testInsanity _ x = do
-        return (Map.fromList [(1, Map.fromList [(Types.ONE, x)])])
-
-    testMulti _ _ _ _ _ _ _ = do
-        return (Types.Xtruct "" 0 0 0)
-
-    testException _ _ = do
-        Control.Exception.throw (Types.Xception 1 "bya")
-
-    testMultiException _ _ _ = do
-        Control.Exception.throw (Types.Xception 1 "xyz")
-
-    testOneway _ i = do
-        ThriftTestUtils.serverLog $ show i
-
-
-client :: (String, Network.PortID) -> IO ()
-client addr = do
-    to <- hOpen addr
-    let ps = (BinaryProtocol to, BinaryProtocol to)
-
-    v1 <- Client.testString ps "bya"
-    ThriftTestUtils.clientLog $ show v1
-
-    v2 <- Client.testByte ps 8
-    ThriftTestUtils.clientLog $ show v2
-
-    v3 <- Client.testByte ps (-8)
-    ThriftTestUtils.clientLog $ show v3
-
-    v4 <- Client.testI32 ps 32
-    ThriftTestUtils.clientLog $ show v4
-
-    v5 <- Client.testI32 ps (-32)
-    ThriftTestUtils.clientLog $ show v5
-
-    v6 <- Client.testI64 ps 64
-    ThriftTestUtils.clientLog $ show v6
-
-    v7 <- Client.testI64 ps (-64)
-    ThriftTestUtils.clientLog $ show v7
-
-    v8 <- Client.testDouble ps 3.14
-    ThriftTestUtils.clientLog $ show v8
-
-    v9 <- Client.testDouble ps (-3.14)
-    ThriftTestUtils.clientLog $ show v9
-
-    -- TODO: Client.testBinary ...
-	
-    v10 <- Client.testMap ps (Map.fromList [(1,1),(2,2),(3,3)])
-    ThriftTestUtils.clientLog $ show v10
-
-    v11 <- Client.testStringMap ps (Map.fromList [("a","123"),("a b","with spaces "),("same","same"),("0","numeric key")])
-    ThriftTestUtils.clientLog $ show v11
-
-    v12 <- Client.testList ps (Vector.fromList [1,2,3,4,5])
-    ThriftTestUtils.clientLog $ show v12
-
-    v13 <- Client.testSet ps (Set.fromList [1,2,3,4,5])
-    ThriftTestUtils.clientLog $ show v13
-
-    v14 <- Client.testStruct ps (Types.Xtruct "hi" 4 5 0)
-    ThriftTestUtils.clientLog $ show v14
-
-    (testException ps "bad") `Control.Exception.catch` testExceptionHandler
-
-    (testMultiException ps "ok") `Control.Exception.catch` testMultiExceptionHandler1
-    (testMultiException ps "bad") `Control.Exception.catch` testMultiExceptionHandler2 `Control.Exception.catch` testMultiExceptionHandler3
-
-    -- (  (Client.testMultiException ps "e" "e2">> ThriftTestUtils.clientLog "bad") `Control.Exception.catch` 
-
-    tClose to
-  where testException ps msg = do
-            _ <- Client.testException ps "e"
-            ThriftTestUtils.clientLog msg
-            return ()
-
-        testExceptionHandler (e :: Types.Xception) = do
-            ThriftTestUtils.clientLog $ show e
-
-        testMultiException ps msg = do
-            _ <- Client.testMultiException ps "e" "e2"
-            ThriftTestUtils.clientLog msg
-            return ()
-
-        testMultiExceptionHandler1 (e :: Types.Xception) = do
-            ThriftTestUtils.clientLog $ show e
-
-        testMultiExceptionHandler2 (e :: Types.Xception2) = do
-            ThriftTestUtils.clientLog $ show e
-
-        testMultiExceptionHandler3 (_ :: Control.Exception.SomeException) = do
-            ThriftTestUtils.clientLog "ok"
-
-
-server :: Network.PortNumber -> IO ()
-server port = do
-    ThriftTestUtils.serverLog "Ready..."
-    (runBasicServer TestHandler ThriftTest.process port)
-    `Control.Exception.catch`
-    (\(TransportExn s _) -> error $ "FAILURE: " ++ s)
-
-
-main :: IO ()
-main = ThriftTestUtils.runTest server client
diff --git a/vendor/git.apache.org/thrift.git/test/hs/run-test.sh b/vendor/git.apache.org/thrift.git/test/hs/run-test.sh
deleted file mode 100755
index ecafc18..0000000
--- a/vendor/git.apache.org/thrift.git/test/hs/run-test.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-if [ "x" = "x$1" ]; then
-  printf "run-test.sh needs an argument, the name of the test to run. Try 'ThriftTest' or 'ProtoDebugTest'\n"
-  exit 2
-fi
-
-# Check some basics
-if [ -z $BASE ]; then
-    BASE=../..
-fi
-
-# Figure out what file to run has a server
-if [ -z $TEST_SOURCE_FILE ]; then
-    TEST_SOURCE_FILE=$BASE/test/hs/$1_Main.hs
-fi
-
-if [ ! -e $TEST_SOURCE_FILE ]; then
-    printf "Missing server code file $TEST_SOURCE_FILE \n"
-    exit 3
-fi
-
-printf "Running test... \n"
-runhaskell -Wall -XScopedTypeVariables -i$BASE/lib/hs/src -igen-hs $TEST_SOURCE_FILE
diff --git a/vendor/git.apache.org/thrift.git/test/index.html b/vendor/git.apache.org/thrift.git/test/index.html
deleted file mode 100644
index 3611a92..0000000
--- a/vendor/git.apache.org/thrift.git/test/index.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<meta charset="utf-8">
-<title>Apache Thrift - integration test suite</title>
-<link rel="stylesheet" type="text/css" href="http://cdn.datatables.net/1.10.4/css/jquery.dataTables.css">
-<script type="text/javascript" charset="utf-8" src="http://code.jquery.com/jquery-2.1.3.min.js"></script>
-<script type="text/javascript" charset="utf-8" src="http://cdn.datatables.net/1.10.4/js/jquery.dataTables.js"></script>
-<script src="result.js">
-</script>
-</head>
-<body>
-<h2>Apache Thrift - integration test suite: Results</h2>
-<table id="test_results" class="display">
-    <thead>
-        <tr>
-            <th>Server</th>
-            <th>Client</th>
-            <th>Protocol</th>
-            <th>Transport</th>
-            <th>Result (log)</th>
-            <th>Expected</th>
-        </tr>
-    </thead>
-</table>
-<h2>Test Information</h2>
-<pre id="test_info"></pre>
-
-<a href="log">browse raw log</a>
-
-</body>
-</html>
diff --git a/vendor/git.apache.org/thrift.git/test/keys/CA.pem b/vendor/git.apache.org/thrift.git/test/keys/CA.pem
deleted file mode 100644
index a747b9a..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/CA.pem
+++ /dev/null
@@ -1,82 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 16582080088954381212 (0xe61f61fc3b34239c)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Maryland, L=Forest Hill, O=The Apache Software Foundation, OU=Apache Thrift, CN=localhost/emailAddress=dev@thrift.apache.org
-        Validity
-            Not Before: Apr  7 18:58:00 2014 GMT
-            Not After : Jun 24 18:58:00 2022 GMT
-        Subject: C=US, ST=Maryland, L=Forest Hill, O=The Apache Software Foundation, OU=Apache Thrift, CN=localhost/emailAddress=dev@thrift.apache.org
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:aa:13:d4:c4:f7:01:17:a7:92:d1:b4:b4:15:0d:
-                    21:90:19:5e:fc:fb:b6:6d:3f:f2:3f:65:a2:7a:43:
-                    a6:46:95:fc:43:16:f6:63:14:5e:f7:b1:e3:61:02:
-                    f9:4a:95:89:bf:8d:f9:48:1d:82:e7:34:e0:b2:48:
-                    df:08:d9:7c:3a:2f:d3:1b:0b:e8:ef:c2:41:0a:7d:
-                    0a:38:78:3a:31:66:73:99:8c:d1:79:27:5f:e5:66:
-                    d0:5e:3a:8c:0c:92:18:73:04:c1:f5:45:db:37:e7:
-                    5f:c7:8c:a3:60:e9:92:a0:d8:29:5d:77:48:fb:1d:
-                    b0:ed:12:2c:4e:2e:02:db:3d:1a:41:71:a6:2b:2e:
-                    b3:4c:6a:c7:f7:1d:a9:7e:c7:cf:db:f2:e7:b6:f3:
-                    1f:77:1d:24:01:1a:66:66:30:85:30:02:29:c4:bb:
-                    f7:cd:3f:89:4b:1a:5f:f4:91:96:fb:e9:39:f2:46:
-                    96:12:3d:8a:23:b5:2e:82:9e:41:fe:40:b6:27:b1:
-                    14:44:5c:96:30:0f:55:e4:bb:ad:8b:8a:99:17:c0:
-                    29:11:4e:76:79:9d:4b:03:31:7e:85:3c:a8:23:40:
-                    54:02:58:35:c6:fc:dd:3d:eb:e3:d1:51:00:02:86:
-                    1a:d7:b0:9f:a0:17:73:6a:5a:d0:e6:b6:b8:55:40:
-                    5e:27
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                28:F2:FD:30:CD:03:F1:DC:41:1E:C4:93:C6:97:13:CA:D4:FA:60:2A
-            X509v3 Authority Key Identifier: 
-                keyid:28:F2:FD:30:CD:03:F1:DC:41:1E:C4:93:C6:97:13:CA:D4:FA:60:2A
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: sha1WithRSAEncryption
-         46:15:18:89:b2:57:17:d1:a2:64:c1:9a:73:4f:04:94:76:07:
-         1f:29:ba:6f:34:46:c2:36:d5:68:85:f4:15:4c:8e:1a:fe:83:
-         79:53:ec:aa:0d:92:60:de:f3:9a:3a:e8:80:66:ac:87:70:89:
-         59:f2:ac:9e:b0:28:11:37:7d:78:4e:5e:3f:25:0f:be:09:6f:
-         26:2a:3d:66:79:38:28:e5:81:71:71:96:26:4f:db:ec:23:70:
-         be:37:39:fc:e0:32:0d:80:8f:66:c7:ac:a4:b4:8b:77:40:e2:
-         99:44:3a:73:c8:f9:14:cf:1b:32:27:c2:78:db:b0:da:8a:60:
-         eb:8d:34:7e:7d:3c:03:d4:38:74:f7:17:9e:32:74:9a:e7:37:
-         95:d4:71:03:c8:94:ea:09:7b:ad:2d:eb:70:43:f2:32:7e:63:
-         01:84:8c:7e:9e:f0:79:7f:ae:e9:cf:f9:be:0e:fe:95:d2:bd:
-         c8:a7:81:c2:71:d9:c3:50:31:89:6d:fa:ad:a2:ab:00:01:34:
-         10:58:ef:96:5a:eb:30:07:a9:8e:84:36:ef:3d:3c:61:46:96:
-         6a:e8:09:20:5a:ab:f8:4b:eb:b7:33:61:8e:af:9a:7d:16:b0:
-         60:6a:f0:30:e5:b2:8e:e7:80:b4:a1:02:a9:37:fe:5f:b5:ae:
-         65:e9:6b:34
------BEGIN CERTIFICATE-----
-MIIENzCCAx+gAwIBAgIJAOYfYfw7NCOcMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITWFyeWxhbmQxFDASBgNVBAcMC0ZvcmVzdCBIaWxs
-MScwJQYDVQQKDB5UaGUgQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xFjAUBgNV
-BAsMDUFwYWNoZSBUaHJpZnQxEjAQBgNVBAMMCWxvY2FsaG9zdDEkMCIGCSqGSIb3
-DQEJARYVZGV2QHRocmlmdC5hcGFjaGUub3JnMB4XDTE0MDQwNzE4NTgwMFoXDTIy
-MDYyNDE4NTgwMFowgbExCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhNYXJ5bGFuZDEU
-MBIGA1UEBwwLRm9yZXN0IEhpbGwxJzAlBgNVBAoMHlRoZSBBcGFjaGUgU29mdHdh
-cmUgRm91bmRhdGlvbjEWMBQGA1UECwwNQXBhY2hlIFRocmlmdDESMBAGA1UEAwwJ
-bG9jYWxob3N0MSQwIgYJKoZIhvcNAQkBFhVkZXZAdGhyaWZ0LmFwYWNoZS5vcmcw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqE9TE9wEXp5LRtLQVDSGQ
-GV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCySN8I2Xw6
-L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/HjKNg6ZKg
-2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQBGmZmMIUw
-AinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xku62LipkX
-wCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDmtrhVQF4n
-AgMBAAGjUDBOMB0GA1UdDgQWBBQo8v0wzQPx3EEexJPGlxPK1PpgKjAfBgNVHSME
-GDAWgBQo8v0wzQPx3EEexJPGlxPK1PpgKjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBGFRiJslcX0aJkwZpzTwSUdgcfKbpvNEbCNtVohfQVTI4a/oN5
-U+yqDZJg3vOaOuiAZqyHcIlZ8qyesCgRN314Tl4/JQ++CW8mKj1meTgo5YFxcZYm
-T9vsI3C+Nzn84DINgI9mx6yktIt3QOKZRDpzyPkUzxsyJ8J427DaimDrjTR+fTwD
-1Dh09xeeMnSa5zeV1HEDyJTqCXutLetwQ/IyfmMBhIx+nvB5f67pz/m+Dv6V0r3I
-p4HCcdnDUDGJbfqtoqsAATQQWO+WWuswB6mOhDbvPTxhRpZq6AkgWqv4S+u3M2GO
-r5p9FrBgavAw5bKO54C0oQKpN/5fta5l6Ws0
------END CERTIFICATE-----
diff --git a/vendor/git.apache.org/thrift.git/test/keys/README.md b/vendor/git.apache.org/thrift.git/test/keys/README.md
deleted file mode 100755
index 010835d..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/README.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Test Keys and Certificates
-This folder is dedicated to test keys and certificates provided in multiple formats.
-Primary use are unit test suites and cross language tests.
-
-    test/keys
-
-**The files in this directory must never be used on production systems.**
-
-## SSL Keys and Certificates
-
-
-## create certificates
-
-we use the following parameters for test key and certificate creation
-
-    C=US,
-    ST=Maryland,
-    L=Forest Hill,
-    O=The Apache Software Foundation,
-    OU=Apache Thrift,
-    CN=localhost/emailAddress=dev@thrift.apache.org
-
-### create self-signed server key and certificate
-
-    openssl req -new -x509 -nodes  -days 3000 -out server.crt -keyout server.key
-    openssl x509 -in server.crt -text > CA.pem
-    cat server.crt server.key > server.pem
-
-Export password is "thrift" without the quotes
-
-    openssl pkcs12 -export -clcerts -in server.crt -inkey server.key -out server.p12
-
-### create client key and certificate
-
-    openssl genrsa -out client.key
-
-create a signing request:
-
-    openssl req -new -key client.key -out client.csr
-
-sign the client certificate with the server.key
-
-    openssl x509 -req -days 3000 -in client.csr -CA CA.pem -CAkey server.key -set_serial 01 -out client.crt
-
-export certificate in PKCS12 format (Export password is "thrift" without the quotes)
-
-    openssl pkcs12 -export -clcerts -in client.crt -inkey client.key -out client.p12
-
-export certificate in PEM format for OpenSSL usage
-
-    openssl pkcs12 -in client.p12 -out client.pem -clcerts
-
-### create client key and certificate with altnames
-
-copy openssl.cnf from your system e.g. /etc/ssl/openssl.cnf and append following to the end of [ v3_req ]
-
-    subjectAltName=@alternate_names
-
-    [ alternate_names ]
-    IP.1=127.0.0.1
-    IP.2=::1
-    IP.3=::ffff:127.0.0.1
-
-create a signing request:
-
-    openssl req -new -key client_v3.key -out client_v3.csr -config openssl.cnf \
-        -subj "/C=US/ST=Maryland/L=Forest Hill/O=The Apache Software Foundation/OU=Apache Thrift/CN=localhost" -extensions v3_req
-
-sign the client certificate with the server.key
-
-    openssl x509 -req -days 3000 -in client_v3.csr -CA CA.pem -CAkey server.key -set_serial 01 -out client_v3.crt -extensions v3_req -extfile openssl.cnf
-
-## Java key and certificate import
-Java Test Environment uses key and trust store password "thrift" without the quotes
-
-list keystore entries
-
-    keytool -list -storepass thrift -keystore ../../lib/java/test/.keystore
-
-list truststore entries
-
-    keytool -list -storepass thrift -keystore ../../lib/java/test/.truststore
-
-
-delete an entry
-
-    keytool -delete -storepass thrift -keystore ../../lib/java/test/.truststore -alias ssltest
-
-
-import certificate into truststore
-
-    keytool -importcert -storepass thrift -keystore ../../lib/java/test/.truststore -alias localhost --file server.crt
-
-import key into keystore
-
-    keytool -importkeystore -storepass thrift -keystore ../../lib/java/test/.keystore -srcstoretype pkcs12 -srckeystore server.p12
-
-# Test SSL server and clients
-
-    openssl s_client -connect localhost:9090
-    openssl s_server -accept 9090 -www
-
diff --git a/vendor/git.apache.org/thrift.git/test/keys/client.crt b/vendor/git.apache.org/thrift.git/test/keys/client.crt
deleted file mode 100644
index 80a9ad0..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/client.crt
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID2DCCAsACAQEwDQYJKoZIhvcNAQELBQAwgbExCzAJBgNVBAYTAlVTMREwDwYD
-VQQIDAhNYXJ5bGFuZDEUMBIGA1UEBwwLRm9yZXN0IEhpbGwxJzAlBgNVBAoMHlRo
-ZSBBcGFjaGUgU29mdHdhcmUgRm91bmRhdGlvbjEWMBQGA1UECwwNQXBhY2hlIFRo
-cmlmdDESMBAGA1UEAwwJbG9jYWxob3N0MSQwIgYJKoZIhvcNAQkBFhVkZXZAdGhy
-aWZ0LmFwYWNoZS5vcmcwHhcNMTUxMjIzMDcwNzUwWhcNMjQwMzEwMDcwNzUwWjCB
-sTELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE1hcnlsYW5kMRQwEgYDVQQHDAtGb3Jl
-c3QgSGlsbDEnMCUGA1UECgweVGhlIEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9u
-MRYwFAYDVQQLDA1BcGFjaGUgVGhyaWZ0MRIwEAYDVQQDDAlsb2NhbGhvc3QxJDAi
-BgkqhkiG9w0BCQEWFWRldkB0aHJpZnQuYXBhY2hlLm9yZzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALl/bJhg17Pu1t785JIuwlh7e2E51eoWFvuxMWfH
-dsUAVqDaOz99O5sv8pgWKXrkPBttE98T+Mx/Pwz5JHs4Qcre3A5adm6cdab0AKug
-eVG1PvHrWzV4aheg4KUfVSiMz8BG2K3Q1VGvZkgMRa/Q409FKjU6Z4D9vBG4Pas3
-PN5FxnAL6P70yWCEr2Vu/tWJlCN+qrRDfSaE2hqmT1irxaoPa61GvuRVsGQ3TeoE
-mGfENtvFqC6qQWuSCbG5aI47Rv66pqoWWxqkrcolNc7+vhx6rW+wdFO3IlqIT8IG
-sdQVp+Y4ir/dGp2ejzqGZCremPJ1uEKjLMpIukdg25ymHC0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEABcRdwc9mdY9zOvTixtThHrciVvqwp6RaiQqMEVomozYilZDR
-J90M3H6KnlADJbCv0FXujsaApB53awq5I7sObAYWFhDJZ9LKlw0lDF7KchLXiAlk
-XVyvL2nJjuJcxPCFPWktwrw5bTguRCBzG12Hzikn+xs6uPur7VQYM33jbXEda5PS
-UEqvAVWaONJCX8MDYOscVoJF0ESyI+fN92ipFaXR7fGajod/rc0AfeN2GVMZETve
-21pkUyDwwCGA44uvNUCd1e32NxE3ah9UApCRn5sGJ64R6urpFTXT3IALF3kaOO7U
-VsMhFrUiZ7+Bw5nIeiK0QOF6Eipj+bJvrLZpSg==
------END CERTIFICATE-----
diff --git a/vendor/git.apache.org/thrift.git/test/keys/client.key b/vendor/git.apache.org/thrift.git/test/keys/client.key
deleted file mode 100644
index 25dcfd7..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/client.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAuX9smGDXs+7W3vzkki7CWHt7YTnV6hYW+7ExZ8d2xQBWoNo7
-P307my/ymBYpeuQ8G20T3xP4zH8/DPkkezhByt7cDlp2bpx1pvQAq6B5UbU+8etb
-NXhqF6DgpR9VKIzPwEbYrdDVUa9mSAxFr9DjT0UqNTpngP28Ebg9qzc83kXGcAvo
-/vTJYISvZW7+1YmUI36qtEN9JoTaGqZPWKvFqg9rrUa+5FWwZDdN6gSYZ8Q228Wo
-LqpBa5IJsblojjtG/rqmqhZbGqStyiU1zv6+HHqtb7B0U7ciWohPwgax1BWn5jiK
-v90anZ6POoZkKt6Y8nW4QqMsyki6R2DbnKYcLQIDAQABAoIBAFotbCmXysUaczLs
-VmIKgUhqn0xgxXGLU5kARzhga4jR5UtFTFBNHVEQOitdesTXd7ENkf98whMIOSqh
-Y+7TJojtVqVTrQeQ4FFNhZXp6ZCjP/pzpF+WLl1WRF+Bn/Cao9ShnGzDfTC8yEh2
-Ttpt/lNnGGHQBslakLc8jh5SODEFfbugX8SdTCwZYsesKNrXm1pS/5IEunPqaRi0
-II0EcnqHEsgqSo+CljpW7uNxSryA2vSAVdlPej6+9FZjdIHLP5AEKYvk7e9D2CMV
-1+grNe/QkQppShizPirbb93tHm86v5bkDFCM9yWrhcMcjvILMXETxIppMGPmacRu
-jqtYcAECgYEA8VDzylTz4kS3+D3n3hTgb41XVYa7feUsh99GWRO1wXIFpHjCIRjA
-9r/BXW9+Rx3puVPhS8hwLQ4BLdA7lFpV1C8ag0e3+vn6zVirnz1jtI+uHMvStzhO
-d6i0nf+w4HYXo7mN6o9ZdHEfC8SFNbymhCoVKh2DILDwb4EX9RXNpy0CgYEAxMj4
-+vrklJ/ilH+Ry1zst4zQYIwmm3QWjarDrypGucHgd4jg5v9A/CJIKUi8x0MjrcuN
-wVb7R8XJyYzFQRXIUXR6GnLeeSnfpxzt4YlifCvXxnOi8w4fv7KeGBV5np1Egpo8
-nWNyZFxdvQDuCopr3SUoS9JI8JPwVgA7T+7DaQECgYAGoavhbo45NJw9pS3fC4HT
-bvXscsRqREcCAN/FCOagx0piZ7MmB7Ed1s0wjSTSPX8zyZtSYtK6Wj0sDiHlBMqB
-Bz5aRzlGG2KKDBrDSIOZ7aziO7Oxt0lovmkgQmuQ743cwPemb4QM0CMDRsZGYMXO
-sf1c5+y3lEU3Ozv2T0AUjQKBgBlnzOUyMQKTJcCAO8ViiNkln91nGrDlKug9TKg3
-sAvZYO5tyINqHuyuTFywHFcpbtjIN9PnM+fPPD7+IpVFh6gkfoMdo2VHJ62+iWOd
-xg475s6jLT1t7GFmYQzA8QOuUCMAYKT9Ks6UMjHthc3skwJpAqvPSUVuBBBGVWH7
-dFUBAoGBAL67ARLujiAEVNHt5rajixB6ncl7/R+Z2uawI1JfmdnCZonAKVZYHuXU
-/4j2+o4QhJIPLtWIoaxAkMigQtAkesqirn3Kk/c7kZRIoN549HTJuwZqYqNp7CB/
-kVi5R335+M9z49i6qA0RZsJGSoSBk7PufG4RmLimcRbGwrY93sPD
------END RSA PRIVATE KEY-----
diff --git a/vendor/git.apache.org/thrift.git/test/keys/client.p12 b/vendor/git.apache.org/thrift.git/test/keys/client.p12
deleted file mode 100644
index 5d2669c12d033a694573f70491b91bb72e252748..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2589
zcmY+^cQhM}8U}D7V(&d_uc{HFMr*~^Qk$Yyh*IN=t))f~ql(t7O_8ec88u3yR*g2O
zRcUIE+G>l0x_ZvN_q+Fx_q^vk&pFSZKQMxtixfZxMo`Uzs3ehw$WuB11)u~$^%aPq
z!d%6JU<5Ggp9)lh0K%^#A5s9x)r0-h0KmK;>VGfL0zhDTASLR0_hCJhJdTu<k|Y`d
zRJos)vHcYU-1FY9Zk?_1iq~<Eor(00n=ieixC}rGb1ze#(N2dJp76!=`v}SfU;%+;
zsimJZ9*u_7S^EsnFN4GbC#f6VgS(SRH+~f5c-ndCEXo6?1A~`Vi|AU+rI-su+G>Zk
zU3r8a>eCDoxo6m3_`4gkdDLFB#T$pV3%q_4oxmfK$;GMyD}TQGg_R#~-E!?k`n<-@
zvn0CrcOS%mk8WD=nmbw0xL;G*&VRu0+RDE5WOYvDz*yLc(OP-yd0cOH>X|~Oa^ou>
zNXYuy6Ut}2-?o!eihrsM36IF}NWHJ}Q2OZXypQJ2Q^$k=RWJ%#R^7O^v#`oomsM}C
zjF^<!Ma6!zM{}zW%3#qBg2U-fW&69|aTZ7|L-Mh_0|S_AIgiF~`=MikSs6w=(nMel
zRoIZ*oKJwRh_6(kQcr!Jnsh7{nuS4!D_bCs`AD?`)=<@Jhm3CezDhjo&-`Q4pT4tj
z&NpsU++t`Q(1s^s>9T=xsw$)b6(X7=imA<ES>>YaGv>Db8|fppCM^)Od8BJcL=4pA
zuLSpBWn&$#RE44jd@Hnio~Iz2Q3ZqID27QtPh;Yad2l7S{O<64+MarKDQ#~u3DpIC
z992{Uf-oz~7Pk4MQDWeme>oWgTXU+<VVB>*c2_6o*~$)cCZz`L>ctXE(m_C1IEQ6>
zhMX?AjFaibx!V@kk`xnkjvDD#<%K--$$6(%3jn&{RzDi{457}ys%Ky0%MW8N6kmx=
zT9WY^4eXHPC@4;L@bEjxQoXUv{D_Yi&7qX6Q$LL7{x#Nn`1j^oP1A~>FDtwDZIBVG
z_gC<;;+@GkCEbKzM`q3*bU%S~K~20}l}CW{xsM>5Wc&FEmWN6&vR2eGyG?PFKOgZs
zd7?R{Ubz$B=y%+&YZq(A9i@EP-<)F#Y>~DOo&dnO?RjR_kj;G|qD{cLaGJ4rX&y!_
zz_e9AN*fW1cO^c+Pl^ip?bo1?!EKwaIRZlYHlx5=S(?W?jyH%kFE_J>GPpml8|N68
z)Gu}yh8%}+JJhIj%F-AQ9YbUi+!hkWi|2DV!eV<dqxGtnoaw*gCNK|$yWZ;U6$?!V
z_L0F$>zRL!AEM{HE!Q1QJ=ORiaK58X^)|hn0-}@1Mqfle)-2NV4kJy<qAt-&XS7Qa
zeiS6sC(-?}v@fYcUo5=b>Lp9l5AV(8@lRTiQ|AdHyi-e}S5mqi<s$qXWBr8gBaD*E
z)TmnwkAoRdkeU8)&we?#VytH}%uW$%qyuvix=^LmXfL&eLSFU;OP-Ya^ZV4OP*5+`
zx!^&$aJD;<!*9%Gj06YwbhWSr(Bg;`L%Wc9iim#FhN4z<Moc);Q&8xb7jNtqJewh7
ze7rd1BomWAgP1*4*vM6#R$V!N(9-9M_YJ4)i-Qpb@Ht`3eqCS$Iplw!DM66S0}<ph
zSFz;PiGgVT!wxlo^vb8*E0{L_Pb0EF8co+NitH$lX#CL#hyV`88&cjcpA)TKg~rqs
zC*lv?9E1-Ui;rk3>&=8dG<cXbLdJi_HPlT|Dut+P=uNf~re8M*a4s;@(r)#(!fy5N
zX=M{y42d7M>{1h_Sl*`hH!M9}7HjY&nPv<qWUWkAF4~xQCTvBH_KGrs3y{3ByA$aN
zyVXXYl2H{n)pC@*|J(Uhtx}-#^AJgzmAXS!$YptNlOlNNhAD+n-dfqs-sZ&X*))_%
z==aNS`^gA3cpYi67TH#svN74^!ss+~+o*+*8tp-*4jqCq$%wJtb-E+>`ot*xldmL*
zq$L5*jbkTg$>j2~xggqj^DwB=>qGI*M~l;Wsb;5(^L=__kj*N%9n<|Y%j!tGZ3e(j
zxoXe}L`YuMGC=*<M<eS%>>B-xpUGB#YaS5L+cyqa(#FPhSvOz1s<G5T$ZjK{No4!|
zLK5W|gBs<>ZVa(LSy54+rb5N_(?xCb+SP(xz#RKgR{OZ>7IXtL8iVtbVfE5iI6YIr
zYA0tZ-ekh{;PUtZ>v>vbQq3!bt}b)Ojw+RNSY=21M0VP^t{E`Zrr0HPuEN6FS3Gl1
z{Ft<e?1C8h5jGt!rJ!s5V4&J?X_my!otcK^wffkYYOIH@6lz+GZA@>z2>aQ#T?(zB
za_%rSx?f>K0W0W%ct=vA=*av3+JstJ2COzrVVomf3Mex=Chd*x9S+J@h(%!$Z}DVl
zkIvz;9y^l4AVPC88#^I_2x+sudAC&V=t$(}(wm%~3iN$ebYL!2TM19xaYViv{U!W@
z^p~>r$mM4W^IMKeTp5$M<EEK9l%Ww%JzTy$x6!26E>oy33}_DhX37Vo?JDWH6#$<k
zfP-wa)U;&%Q~$<@Ur6zu>5?&N_nY<7(({$Mj22(cLN%*Tz)Q*J2V*09;2JI#*1{Qq
zyQc6c_bnNLc!6#n`igIN1()AgNouES?pb9=Uf;=L=fxO@QS5>D7(ZLqpJLsQ{1(<7
z4udQ%U(mCw$#>slKG-qAPb+kDS_YZsZu<91N+||9kT`xZ0B9BUfvdl$BS*R3trUJT
zPcl?TmoQ*UU<x6(?)G+twlH0fjqE!akRucfoh-)9`-<RT=B*j%l9hZZbp`$Jg-Ytt
zI1+yx&+U{D;$pUK+^!aVPk3Riaztm_&n+82Ulz?Ov8bT0_aC}VsL{+$hh^y&fSFSb
z^LWLV&3s&BdK<g?ICzi581uTfaiF@`rhBiF#@{>Jl;sSF@Z2oa8UAc`e3w?KMpNQt
ztY-r&+~z}$zZ>dRk%_#++CW()V;xZ!yJT?F`HNg`Ld>q3{;INH`85=>M-2O;u7_SN
zU*ywn`;j{zGIPV>o>OBS1*+~@;`fU)3-4llpK5wZV_=O2hnz{4A=P8IB<lKwK8XYy
zP1_uJ@udgZ;iUtB-y43wzsl{ezRr<*jj%3K9MQAc&(TuKH*ukD@6;K)+%>4ypF8`7
z<%8+NysXqgr0RE>REWJrV}&NTqU9o~CMLN8m2kp+$X|i+mOe9ck<v@rt<Om-Z~ei7
z41XXIz($=j@|dUBYwE0|ulc*>mh{OuJW-lppY7d*xsAe+=wxDUz!kQ*Jh6`0#p{{z
z504HYGm)#}QY-_w2)LXmSops>QnAUg16ftK)g2@_aI;iTpq^8@`~yq)g<-H9SP)DF
vBELaTM#@c20%Uzh5vW-IGBo836;-aHyNXmK>YV~9>-eMJD}vg${wVn`wx!*G

diff --git a/vendor/git.apache.org/thrift.git/test/keys/client.pem b/vendor/git.apache.org/thrift.git/test/keys/client.pem
deleted file mode 100644
index 66ef626..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/client.pem
+++ /dev/null
@@ -1,60 +0,0 @@
-Bag Attributes
-    localKeyID: 39 EC 3D 5B 28 17 DA DD 09 7A 62 68 D5 44 1F C7 E2 F8 E0 CD 
-subject=/C=US/ST=Maryland/L=Forest Hill/O=The Apache Software Foundation/OU=Apache Thrift/CN=localhost/emailAddress=dev@thrift.apache.org
-issuer=/C=US/ST=Maryland/L=Forest Hill/O=The Apache Software Foundation/OU=Apache Thrift/CN=localhost/emailAddress=dev@thrift.apache.org
------BEGIN CERTIFICATE-----
-MIID2DCCAsACAQEwDQYJKoZIhvcNAQELBQAwgbExCzAJBgNVBAYTAlVTMREwDwYD
-VQQIDAhNYXJ5bGFuZDEUMBIGA1UEBwwLRm9yZXN0IEhpbGwxJzAlBgNVBAoMHlRo
-ZSBBcGFjaGUgU29mdHdhcmUgRm91bmRhdGlvbjEWMBQGA1UECwwNQXBhY2hlIFRo
-cmlmdDESMBAGA1UEAwwJbG9jYWxob3N0MSQwIgYJKoZIhvcNAQkBFhVkZXZAdGhy
-aWZ0LmFwYWNoZS5vcmcwHhcNMTUxMjIzMDcwNzUwWhcNMjQwMzEwMDcwNzUwWjCB
-sTELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE1hcnlsYW5kMRQwEgYDVQQHDAtGb3Jl
-c3QgSGlsbDEnMCUGA1UECgweVGhlIEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9u
-MRYwFAYDVQQLDA1BcGFjaGUgVGhyaWZ0MRIwEAYDVQQDDAlsb2NhbGhvc3QxJDAi
-BgkqhkiG9w0BCQEWFWRldkB0aHJpZnQuYXBhY2hlLm9yZzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALl/bJhg17Pu1t785JIuwlh7e2E51eoWFvuxMWfH
-dsUAVqDaOz99O5sv8pgWKXrkPBttE98T+Mx/Pwz5JHs4Qcre3A5adm6cdab0AKug
-eVG1PvHrWzV4aheg4KUfVSiMz8BG2K3Q1VGvZkgMRa/Q409FKjU6Z4D9vBG4Pas3
-PN5FxnAL6P70yWCEr2Vu/tWJlCN+qrRDfSaE2hqmT1irxaoPa61GvuRVsGQ3TeoE
-mGfENtvFqC6qQWuSCbG5aI47Rv66pqoWWxqkrcolNc7+vhx6rW+wdFO3IlqIT8IG
-sdQVp+Y4ir/dGp2ejzqGZCremPJ1uEKjLMpIukdg25ymHC0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEABcRdwc9mdY9zOvTixtThHrciVvqwp6RaiQqMEVomozYilZDR
-J90M3H6KnlADJbCv0FXujsaApB53awq5I7sObAYWFhDJZ9LKlw0lDF7KchLXiAlk
-XVyvL2nJjuJcxPCFPWktwrw5bTguRCBzG12Hzikn+xs6uPur7VQYM33jbXEda5PS
-UEqvAVWaONJCX8MDYOscVoJF0ESyI+fN92ipFaXR7fGajod/rc0AfeN2GVMZETve
-21pkUyDwwCGA44uvNUCd1e32NxE3ah9UApCRn5sGJ64R6urpFTXT3IALF3kaOO7U
-VsMhFrUiZ7+Bw5nIeiK0QOF6Eipj+bJvrLZpSg==
------END CERTIFICATE-----
-Bag Attributes
-    localKeyID: 39 EC 3D 5B 28 17 DA DD 09 7A 62 68 D5 44 1F C7 E2 F8 E0 CD 
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIRKol42bAS3ACAggA
-MBQGCCqGSIb3DQMHBAjOulcyHMaWsQSCBMgbeXQ8pIYTENKm08UPeqxkCR2nLxSO
-gtRmBxDYjqYv35y4K8KhybBvSBlIPgE5jEWxUCcc1Qvy5ydUQ/X9pmkU8dnmAmDC
-o0zwd3lt2eNPy+4WliqFDVmHrLfYQFOoIrHjuzC0lI4C2iPOjxhfa1zFumedgwGS
-Gx10X5uEVH5N64fW6B3BvzQM0rn2qr0ONuSRmteRtI8NsznfkgeJ9a4CIAF7E5Z2
-JTGI12edNzzUJ1JhX47ZW4miQwCU5Lcy01UZqTFuUpmK7FUQegtLy3e5eDKq+bIg
-ZYq6Hx7lu8hjT5kWZGKy71aYmHKEjI0f727cAbqDTG5uZBHBjwK/3p/znQVQXxBb
-1+E9CiKeFdXj2ElptsnDyoTvrSwJ/Jqu1wkXBcH5Embg7aJMod1IOs6OQB1rPDvd
-FFa84zbqRNWHSxxxYZxcB8YZinL6/dQJnisKu9LMQd3BBGsGWqH8Zz5tEvXjS5Kv
-3g9JRa7QDkSF005x6U+q/678G2MG+W+NWqje3NZx9Psh/Ptm+h+q9n2GSvnibiK5
-mEj9FIwGquGpbZUTK5aXHcKN657dKiICsEJeNar1iZznRmzrMbZJ+DxqJnTw+GAv
-7Yb63/CNAtqSxiyNHGZ6NM2ZA9vAKY1HXn0RVC0y1+9FmNpSRwv3u/+ydSCnJonR
-GEKjzOqM9Dn7qxd+h4UnnA7hXWxITageB6G6KmfiXRxhiWyqtOICdCneCwpq8UZ4
-e0fm05NRW6M2mqGQHsMNSvTWddwz5b8wgw4eVsb+xQytxVdj9lpBuB9KyjQjxUgU
-3oZx4KyWLoEWjkztPAiK3uv5GfotNIMdznRfON1+xm1M5swtn3y3Ru1f6STZC7Sp
-qvbG7jPmpB5gLEUri+chw+aKUYbJ0b820Od4FLQYnwLWr46VelYmV44xuR06wgqP
-1HchMSsHtS+ZlIiQQU9jhdyTrl86EQHH33dh+Sua8AhfewPRy2VFp3Zk34AUsWcX
-EfIYGemhqUD3drG0SMVbFFNOaFGp9e0tQouYOC6/qFBv/SNgQz3mAEkciJYbUuUZ
-V4YQPvtdvSrISV0e7bjFgdSEjG7P7F6CFrWTrjUlHZuWj6/rJ3+/1PHeJViyhsrJ
-ZYFe14W/48PDxBRl4IEAmxcN1Eb2Ez9eCqv0HW77HviG6zIgnkPrhWHjFGUpxKk4
-jLfuB2Tfq9F7ozv4L2QAn+F/yKt1Rm2Hh5J61eUJtAT60pajg+gJtjmpu5Pr4HDn
-b6p3xmYwaL5Let1zCAbbMfdlDK14YjdOdM/BEKpXb9y4EIubX5AMY4ljXeG9gx+T
-B1TuQVdJ0P5wIK/D10TQzAWDKam0kv3RXidlzRxpZ3snRnN/L3EVd58Rntj1Oc0y
-FiIiSKRszDbPzKDxQE2sNgQcdO24JNLSa/sZYtq2gRgspl/YqIDo4ZYqi9x8F5OS
-rdPU5D/H8LWR4vpJLL8DYrHh5qFG3BX2OJIhPRS+48pDYtrRjp7S/1ZU64OJAytk
-99hDqSrn1j2a6yFE8L2Ptz+4UCF2OQXEc9Rqqeb8QEUuMSkNH4oQ+A2F6uzLpZi0
-XH64R2niNC56LxV2i+3T5KREFLahyk8epLZlv8YdxYR4Sb7J/5yiooK3g9hmYVKO
-zLc=
------END ENCRYPTED PRIVATE KEY-----
diff --git a/vendor/git.apache.org/thrift.git/test/keys/client_v3.crt b/vendor/git.apache.org/thrift.git/test/keys/client_v3.crt
deleted file mode 100644
index a47f156..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/client_v3.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIECDCCAvCgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVVMx
-ETAPBgNVBAgMCE1hcnlsYW5kMRQwEgYDVQQHDAtGb3Jlc3QgSGlsbDEnMCUGA1UE
-CgweVGhlIEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMRYwFAYDVQQLDA1BcGFj
-aGUgVGhyaWZ0MRIwEAYDVQQDDAlsb2NhbGhvc3QxJDAiBgkqhkiG9w0BCQEWFWRl
-dkB0aHJpZnQuYXBhY2hlLm9yZzAeFw0xNjAyMjIxMTU4NDFaFw0yNDA1MTAxMTU4
-NDFaMIGLMQswCQYDVQQGEwJVUzERMA8GA1UECAwITWFyeWxhbmQxFDASBgNVBAcM
-C0ZvcmVzdCBIaWxsMScwJQYDVQQKDB5UaGUgQXBhY2hlIFNvZnR3YXJlIEZvdW5k
-YXRpb24xFjAUBgNVBAsMDUFwYWNoZSBUaHJpZnQxEjAQBgNVBAMMCWxvY2FsaG9z
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZ0wiQnXg5QMZZWugd/
-O3woatyHuczJuFSmYiRGWLr3PugB+xtvjy0rTcE2MNx/bdsVxrapCKA+tMFORbEl
-sF6jk0H+B7BzGoIwHr6N8GP1VOoA2esrhsNEz22aJI00VaFTFE8G/qgFcihyaVWH
-ZsLa3MakOzFUmOBaV2tLBjCjaznqXw3eo3XwUI0BkgS9b9vqXjScmfWXDw5+1is4
-bCgumG2zj9EpLypc9qCGNKFBO2YIg0XsIIJ8RprlianjL6P4MfC6GPOyW4NbZaLd
-ESv/bumpVyuV/C/xqkPahvOwBuPE1loxZZPx6Qv368qn7SVNVZOLyX722spooA5G
-6csCAwEAAaNPME0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwMwYDVR0RBCwwKocE
-fwAAAYcQAAAAAAAAAAAAAAAAAAAAAYcQAAAAAAAAAAAAAP//fwAAATANBgkqhkiG
-9w0BAQsFAAOCAQEABUEmeQkG/PS935jMHDrg/5zm4X2xrnFtmTwb0jdxfau6z/7h
-AbxD5ioyY7FUTNCzI6SyMo9vJJtYCTCuEGr84JjT2R7232z60k4c1z/av01W3Orv
-ExHfAZ8llhkfu0209T5TaIYCB7hDFj5KDbta8c6fEcwtmlHQWj3M31lSNsr4ZtWW
-wObhK3sqTsOluHbhKNwlNEat48lbOQUC19I1Wi3dAS6n8lr0lEhfGKvqxu0ViASS
-N1nLfdkREGp39bYpKg0n6EFw5bYyV4qE3cnIedFJp7NIOM/6xndJMh/c5l6N2uyZ
-upArRQpw/3j+HkL1x9bs+900QK0GI6AxgjbopA==
------END CERTIFICATE-----
diff --git a/vendor/git.apache.org/thrift.git/test/keys/client_v3.key b/vendor/git.apache.org/thrift.git/test/keys/client_v3.key
deleted file mode 100644
index b989f73..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/client_v3.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAtnTCJCdeDlAxlla6B387fChq3Ie5zMm4VKZiJEZYuvc+6AH7
-G2+PLStNwTYw3H9t2xXGtqkIoD60wU5FsSWwXqOTQf4HsHMagjAevo3wY/VU6gDZ
-6yuGw0TPbZokjTRVoVMUTwb+qAVyKHJpVYdmwtrcxqQ7MVSY4FpXa0sGMKNrOepf
-Dd6jdfBQjQGSBL1v2+peNJyZ9ZcPDn7WKzhsKC6YbbOP0SkvKlz2oIY0oUE7ZgiD
-RewggnxGmuWJqeMvo/gx8LoY87Jbg1tlot0RK/9u6alXK5X8L/GqQ9qG87AG48TW
-WjFlk/HpC/fryqftJU1Vk4vJfvbaymigDkbpywIDAQABAoIBAQCJpyUhaaIIYnBG
-4D+RkGgsj8Gvh6ah3j53ft/kRj6DMC4BlB0C4fO/PEB5WI0cjfcvpwo4nOapHyX4
-ATmLIMgjXn2m+CSM9wo01mEbmrKWd20M7n96cWhGwg9MvVJ+RdGk2K0lwj02PoWW
-Blt576GTuNN/+j++Q/jiqsXxaLTO0/Wj+4b2gQh3n8I0u6bkolDLoERKIdrLGHH+
-FU3sk8bpUhHmeiUTfwwci+juhtOY9e30AEst6xakCHbq1lRRyEYPtWL7oLds6yv0
-UAKP7wS9Yl6dcekXSF1RZpB+fovTW+qPYn8aEuksaMz0wK96FCOjVNGYxMp+Xnvl
-sKx63UZBAoGBAOCbCbJtO0HsgIauvCvGZ50aZ1vDvQReCwri4ioutEg4JCAXHEsX
-+axz2J5j3UEQhGKr0EX9BG6YbxGW0Mmjf3QxeRB+0WLpMMY2SFt93oC2R1AX9l0I
-h50O6tYv5SXm96pKxwRz01d84mCJgwn/G+cZ/EJj4rfZsNbQst6JQFvzAoGBAM/1
-gLVQt5l+IK+6s68EnADI66i7cKe6sj3rFRTahZJxL2vY28J9EB2mF/XEgARSNJQV
-X/H9zDrwKm9MX87/eCH2nEbc+5qSGpDPQm482C9DqsMitxCKD8bble1BlpjFb8hr
-R0Q3v5q8u5uomLBds5eUBeRKMtu9tOMA9KRSDGjJAoGAF44K2Ux9T2+XFwjSMSEQ
-krhHKKeBdijKrayXnWbif0Rr/XWPAQ0VoRFRIWNFu+IYkCSGpiBfy51u4IBZixv7
-bNsXYDR8jwv3koH02qt7nzH+jpbEvoL7fewnkqjZNj1fsds/vebLvjwZnZguRukb
-KwRdoTTKfQ92bUDb0VzBhCMCgYB7H+3ObDXoCQctRCsyilYbGNp+EkxG4oC5rD/V
-EvRWmfDrt3+VjRpHk5lIB8mLxWgf7O/bhNqwYpWdQ+jN0++6nBo20oudHrff2PaJ
-8jhE85lc42bjwfpJUKVZzaVuWicu0GVnfGJTKT8ikBWnBjNYoWlDmrK164H3jQ9L
-YtC6EQKBgQCabFXXHx5cIJ2XOm4K/nTOG7ClvD80xapqyGroQd9E/cJUHHPp/wQ4
-c1dMO5EViM7JRsKfxkl9vM5o9IM7swlYh4EMFSLJNjzgOY9XVkvQh0uGbiJOBO4f
-inUuWn1YWUj/HFtrT+0No+cYvZVcMKrFAy3K/AwpTbfKCk6roullNA==
------END RSA PRIVATE KEY-----
diff --git a/vendor/git.apache.org/thrift.git/test/keys/server.crt b/vendor/git.apache.org/thrift.git/test/keys/server.crt
deleted file mode 100644
index 8a5ef3c..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/server.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENzCCAx+gAwIBAgIJAOYfYfw7NCOcMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITWFyeWxhbmQxFDASBgNVBAcMC0ZvcmVzdCBIaWxs
-MScwJQYDVQQKDB5UaGUgQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xFjAUBgNV
-BAsMDUFwYWNoZSBUaHJpZnQxEjAQBgNVBAMMCWxvY2FsaG9zdDEkMCIGCSqGSIb3
-DQEJARYVZGV2QHRocmlmdC5hcGFjaGUub3JnMB4XDTE0MDQwNzE4NTgwMFoXDTIy
-MDYyNDE4NTgwMFowgbExCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhNYXJ5bGFuZDEU
-MBIGA1UEBwwLRm9yZXN0IEhpbGwxJzAlBgNVBAoMHlRoZSBBcGFjaGUgU29mdHdh
-cmUgRm91bmRhdGlvbjEWMBQGA1UECwwNQXBhY2hlIFRocmlmdDESMBAGA1UEAwwJ
-bG9jYWxob3N0MSQwIgYJKoZIhvcNAQkBFhVkZXZAdGhyaWZ0LmFwYWNoZS5vcmcw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqE9TE9wEXp5LRtLQVDSGQ
-GV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCySN8I2Xw6
-L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/HjKNg6ZKg
-2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQBGmZmMIUw
-AinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xku62LipkX
-wCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDmtrhVQF4n
-AgMBAAGjUDBOMB0GA1UdDgQWBBQo8v0wzQPx3EEexJPGlxPK1PpgKjAfBgNVHSME
-GDAWgBQo8v0wzQPx3EEexJPGlxPK1PpgKjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBGFRiJslcX0aJkwZpzTwSUdgcfKbpvNEbCNtVohfQVTI4a/oN5
-U+yqDZJg3vOaOuiAZqyHcIlZ8qyesCgRN314Tl4/JQ++CW8mKj1meTgo5YFxcZYm
-T9vsI3C+Nzn84DINgI9mx6yktIt3QOKZRDpzyPkUzxsyJ8J427DaimDrjTR+fTwD
-1Dh09xeeMnSa5zeV1HEDyJTqCXutLetwQ/IyfmMBhIx+nvB5f67pz/m+Dv6V0r3I
-p4HCcdnDUDGJbfqtoqsAATQQWO+WWuswB6mOhDbvPTxhRpZq6AkgWqv4S+u3M2GO
-r5p9FrBgavAw5bKO54C0oQKpN/5fta5l6Ws0
------END CERTIFICATE-----
diff --git a/vendor/git.apache.org/thrift.git/test/keys/server.key b/vendor/git.apache.org/thrift.git/test/keys/server.key
deleted file mode 100644
index 263cfce..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/server.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCqE9TE9wEXp5LR
-tLQVDSGQGV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCy
-SN8I2Xw6L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/H
-jKNg6ZKg2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQB
-GmZmMIUwAinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xk
-u62LipkXwCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDm
-trhVQF4nAgMBAAECggEAW/y52YYW6ypROGbZ94DQpFV0kLO7qT8q0Ksxw5sPNaIt
-fEPRIymDa8ikyHWJS5Oxmw84wo5jnJV26jaLmwe2Lupq7Xf1lqej8f5LJtuv7cQR
-xfzp1vM65KJFFJHp6WqjGqJ6HSSZOpVDsnQYcXQjQCdpyAmaSWd3p+FqYSZ1mQmD
-bFNI7jqpczWSZhTdotQ7p7Hn9TVCehflP3yGIB3bQ+wCcCB85dOBz201L+YgaIck
-Sz43A4NvWaQIRLRDw7s9GW4jY5T0Jv282WIeAlVpVxLIwu48r4R4yGTIx9Ydowvq
-57+Y5iPPjAXxu0V9t00oS3bYxDaKh2DUfc/5zowq8QKBgQDYNVPXmaG0aIH4vjQ9
-7fRdw/UDkYcQbn6CnglQOu77/S8ogQzpKCVJgJgkZNqOVtQMEPzekGEcLTbje1gU
-8Bky2k+PL9UwbFy0emnOVh4rqrNXHsRvJcehNT/PRb5hjF3MUMFV/0iD4b+naFaE
-jrSWiZ2ZXj2qfwAK52GFbtOuBQKBgQDJYQuGiY0r22E4waJmCSKczoBT3cwlVzWj
-V2ljgA9RHLNTVkvNNYQLGu2qngFrtwpeaSnsMDerVG4wKAQWyCnYzxVrlnC4uDrJ
-HXuFEltBWi9Ffbgfsnd3749AT0oBP1NT2tMleguyf5DFgjCR3VRJLdrVaaZ8row/
-LqKcFMqnOwKBgB+OIO99l7E584Y3VG6ZdSneOLtNmRXX2pT7tcZE465ZdHGH7Dd3
-SYHhx9K/+Xn+yDH+pLli/xlarAEldmSP6k2WuTfftlC78AfTOfAId5zN7CDR9791
-Fx67I9X/itq33tS8EIuZl57P6uXm/4GXRloWOa8xpvRkVsBApuYPl8t1AoGATQDS
-y2sllDObBXzlgGbV2WgNIgSZ311toTv3jJiXQsjauW8yJRHln+l4H9mzaWDgkiFc
-ang1kUoDqF5k0eFQPxtQcYdhKwEnWWfwp33RbzfxA32DPnubuzzbZhfrkHaKgnIW
-cyor9uFYlm2l7ODZLfJez2RKyTplXnOSsmQw6akCgYAz3dj9Hskyj+HVJ+ht1OcE
-c7ai/ESkSA7Vajp0tjJp0EKjW/zq8DvUSXOtcdnJgkKycFluLwbmnaN4txBds1C1
-Qr8Rt2sUCCBNZe1L6DHe3XBdbkJe9sgZVNTjtUSQrzy8UhvsCqG4YWeCu07Szcbc
-rdPUV9/uQkdx8VrShxlD8A==
------END PRIVATE KEY-----
diff --git a/vendor/git.apache.org/thrift.git/test/keys/server.p12 b/vendor/git.apache.org/thrift.git/test/keys/server.p12
deleted file mode 100644
index f3908a4389be7cbb88edb3f2aba0938fb6767da9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2685
zcmY+^c{CJ^8U}DPW~>=AWr$Jsv1_c8t?Z2`WS5fp${wPzd<+^I5!o}6J!_0@Y$aQE
z1}Q|=2-!Y{VU)Oi=iGb0d;fUPd(QKm^ZfZk5jcW@0A>_{<1!1o3=u;--~zA$atRzL
z5P?JPcPxb>fad<GSaJ!Vk>AlE5Ww{Nb^X%-P=YKR|6Vu+U_n7ZY|(g~7Rx2udLWRE
zDS`kZnLE)}3JB@CjO7QCxK39wy4T}+NR0I7bSjeayxwDHG~gh?VcSMF9=;2S8%r;@
zO^sNFWK`IW>7;D(8#F07#yMxqt?liY+)h}UzkX@2$Kf>}$q5MNT0hz%spVu0#Em>|
z$RdY(^XEG5R0e#xB+{09NAjU_SxWy?YMU@|X#x4o*pw_0UM%#YvfO;!C~R8DD~a-G
z_9VFYu`fNcD2nF=P31|x=ONsr%*3Ew#hxe8o1A`w;m?<VJe-OXU|{1JEjC50mqF+X
zHXfETS^nOo2_!t3@c@LDIM<!<n&O7c_abG-T%k&L_M;H*fm5k48J(A{nrcg<*+Y|J
znDWQg-7e9l{%uKDllc@bTx96wKO8RgdSH`hTN@7}Y@P4&G(9f93Og0N6>Cx%b<5j2
z^@+D`D6Cm_lCd^li)^!N=GLFbc#>uFsTz_k30!+mIc89TYT%}<muUwkVWN+p5ls%P
z#CFBKH9P-G3AI6H{fg3<va)&OC;vFiPJNbY=xThqX%A7hC6!mjSwBG~T71g$ys@s4
z!}MoHPMv1;gm!~{iQNt7`z$Y&f`Ww5FQP@l&i3Gs3lqU#h!wYNgsx=om=0!YPX4Ji
zJ6cz=wU;da_2j|{Wpn;?wyQ#ODRLD+7o;8N>?VGm;+t0uNJ;)R<o;7GDqJZ+(TJjh
zmH!M*g9%lZ!km`#A>itWASDB=i3n$i{`s2R#Iw*SLOt9BqYtZ`j11WqbD`5MM&sWC
zUibzo)+Y6QDvM528`vu-(N+9v(`k0)WTX5`@azER*4y6LzD%udSSR1l?<((mTnlOU
z<*UvEGC&eJ$2P6zQd*R|GcpFQ-G<ez4ZSa}K*=A=@LksML-ip?O}n@su5%cRubI`I
zM8rpbxR#cY6qjGOR9(_cy+^^~5>@67Aw{pvzYmtwuld(9V6Xg)3~PwerI|dRp;!uS
zw4>1M^^c60XOea3uC7{`b;3hicx6%ll+9wGn@Gg@kh~{}Wh<^!Uxj^&%%k;6wUM8t
z*RCs-*v0%@FqIar_T2cgou;c=jwZGrh)jE?;!&-x7uZli-<U_WT%r8c7#|Aqp|%0F
zDfKzks3`bq;ewYy#U~hv7;TIZYH9ny7|d(zE%;@3ire#Ds5}R)k@(yxL?Wd)@uH3S
zy*<YCRa0S;XmcaIIS)h3(!#<ze^SHHtBz~&u@?Ltd)a-vxNy-AaZf`%mc_>rf5jX$
zTN*0xlJQ3Npkx_mR=U3N9n~>L5WXrPNKO!_^252WCu`hqK2gE~S%<|sTi$l2HU#W(
zIA9#MDV1tbw84l?^ttJ?1o}#Md(N_PoD7<a7tzDZBT9zCq-SDFEM=g`Rk(!Y06vR-
z*A8148gA2lc<anNslxAtSc-i`tYwQ1Q}s5tG#j*WcpItku^N#(?zoxx084v?Bqc<t
z1IKyedfw|zDkq6+w_Z4kqEEX_;--!e&5|T7m0DLkXPe8wV27fF7Zb3rA_9AxkFF{k
z-V~}Trr05}|KX#JBJI}rugg=H%uZOnR(GsIC5<0aPz12<|3H>Y04sqAV1?hY%<n_8
zaQ=ri4gm1Ce_OxdTl+ulnE%$!+BUwjwdcF&-`ar)pk9IRTtq!c`7u;?H9grNX}y2M
zSAkS>@AlQu%t(JT?AWyy^8t5$M>dY5-m|DX-`$>h5SSwZz2o$}M={Qg*xl2BVOW8H
za)FN_R<$Slo}BZMn&IXfz5-7Fx??JcG+xkG#iJd0j-;sMff<&MtZ-sH4z0Xy{!F<;
zJH=;6(n-}wzdEd}`Ms71Tf^bl=NM8;?jA7XKD*G9&bv?lxV2GnhatT9rV{9QYL;2#
ztH4l+XkcY&kn#2FHTzsICz2k*@Vg6Nm6ByfDt(cxIg4Yo*_%&8HNU%@XU_|#M{Hla
z*I~vNtF~gMyd$q^D#je_GJ4r!Ms*^3V7nttRHMC4Ug}-3_<?t19Wu@x_iKU&;f*^@
zS__aDktT@CN*+SA(tmO*Sx0^X((^THM4lH!NCX-QcGw5z*?H@~`J91C*YoiARgt5x
z#6=k~#}<M0@A;8KJgS$Db!_&vKZ(S99Dhj1X@=(b`e~MrAM*N3$fC1n`dGL>VLKc5
zMY|R!iY$gt;|@k{M+Yo>UynXu@)JUK(nh-mrb{$w#I`2%htc<gx;tT$aJFP-J9O#u
zw!=fHpYXbJYk5xk-CU6u%5UfmUIPVObHzb-ez2=YYs)Mu`tl`U_)YDFc4?@(-BN4b
z*s4Cz-KA`zQqC&)#`al6*89e`N6eOEZm6EU6sh)%$<M6$8exvWeNTSg1_s34%?rbt
zd1`*!-Sl*2dox}lQz#M1d~?DYC;XhRc*Cijm?k>|Ff|c3F=g|{nv3USy>;5^@rRig
z1gRY=vZ`&R^*Xw0XPCCm2r`-#!pP<~s%)z8LvOWfdRIWN(|uyX$m-5Zi^s43ctIkK
z&2JV5ox;;;n3Sb`=a-IhTpZxzTHLTl8gy_gXb5Nid>HKYst|gpa!TsmJ)Ty$#<$L9
z_aiIrQqdL->%Jof4jTezPw;X(nQy6uWZ3%_+>O+0=|g`gt;<pkMk|M{HVU_E@mL!<
z&OS1^g+9471ypm`U=7<`-Xr0+gyC?gW=;ix{HFsvdP2N&?Ae8{T{VRD5v|uBGhw5T
z)Z0*24kMA6w@PvG&lFHnAAO&^Z9FJ<69Zap7#K>!*<w@cZag``Uu}#%joK`A852ah
z^o4K`c7DZ6GBfwAI0oS3%e>3!#)_OZGk$00B1Vgku?n55+viH;7daO~PK&v%6Tp6b
z9?F)cGltxKM+g9#PJYA{D6I^*u{5Y$qXG8Vrp9D6Hx8~8%#NjP54ZFJ&JK#d#2`w}
zMuHVsS~3Iz0DK|pWNvBYOGR^wTx&Fii<s{q$2$*&m%3GNW+kua1976gT~Iyu8K?z%
z3=0#t^?^ue_rGnTwo;%??K?OLRgpYa7*SqQj$GEVJ`OeBF-}SiRo4x|882`sUY1eU
z^}z{r_UC@F14jIe;R%ZNYJj+3K`exTkCd_-zHo@IA!3Rm8}jvgo2*ilk%PgK3Ql@z
z;|7qFhz`(Pl)Eev{skg2zvNU#FyTZI&1<%uF2p~3Ge^e=_+ZP5K4q48VLN)EN*9^e
zTKNW2UDkm2CD&WnlfQ`vs!qR$b}pDx=Az7>tglYLGB!iN5GE@QF4Dcpll`Cd_~exp
zEHL&38;TMrvH$AG4p-y_@o?s)>6;a)n88BN4fQR|-mL1npNvvOiJ;h7z_Ji#pa7T&
m#KTS7SYWuH2#E96A8vLFjF9C#H9%}vgu@^UTswJxEBP;7kMQUK

diff --git a/vendor/git.apache.org/thrift.git/test/keys/server.pem b/vendor/git.apache.org/thrift.git/test/keys/server.pem
deleted file mode 100644
index c45a9f8..0000000
--- a/vendor/git.apache.org/thrift.git/test/keys/server.pem
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENzCCAx+gAwIBAgIJAOYfYfw7NCOcMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITWFyeWxhbmQxFDASBgNVBAcMC0ZvcmVzdCBIaWxs
-MScwJQYDVQQKDB5UaGUgQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xFjAUBgNV
-BAsMDUFwYWNoZSBUaHJpZnQxEjAQBgNVBAMMCWxvY2FsaG9zdDEkMCIGCSqGSIb3
-DQEJARYVZGV2QHRocmlmdC5hcGFjaGUub3JnMB4XDTE0MDQwNzE4NTgwMFoXDTIy
-MDYyNDE4NTgwMFowgbExCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhNYXJ5bGFuZDEU
-MBIGA1UEBwwLRm9yZXN0IEhpbGwxJzAlBgNVBAoMHlRoZSBBcGFjaGUgU29mdHdh
-cmUgRm91bmRhdGlvbjEWMBQGA1UECwwNQXBhY2hlIFRocmlmdDESMBAGA1UEAwwJ
-bG9jYWxob3N0MSQwIgYJKoZIhvcNAQkBFhVkZXZAdGhyaWZ0LmFwYWNoZS5vcmcw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqE9TE9wEXp5LRtLQVDSGQ
-GV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCySN8I2Xw6
-L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/HjKNg6ZKg
-2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQBGmZmMIUw
-AinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xku62LipkX
-wCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDmtrhVQF4n
-AgMBAAGjUDBOMB0GA1UdDgQWBBQo8v0wzQPx3EEexJPGlxPK1PpgKjAfBgNVHSME
-GDAWgBQo8v0wzQPx3EEexJPGlxPK1PpgKjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBGFRiJslcX0aJkwZpzTwSUdgcfKbpvNEbCNtVohfQVTI4a/oN5
-U+yqDZJg3vOaOuiAZqyHcIlZ8qyesCgRN314Tl4/JQ++CW8mKj1meTgo5YFxcZYm
-T9vsI3C+Nzn84DINgI9mx6yktIt3QOKZRDpzyPkUzxsyJ8J427DaimDrjTR+fTwD
-1Dh09xeeMnSa5zeV1HEDyJTqCXutLetwQ/IyfmMBhIx+nvB5f67pz/m+Dv6V0r3I
-p4HCcdnDUDGJbfqtoqsAATQQWO+WWuswB6mOhDbvPTxhRpZq6AkgWqv4S+u3M2GO
-r5p9FrBgavAw5bKO54C0oQKpN/5fta5l6Ws0
------END CERTIFICATE-----
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCqE9TE9wEXp5LR
-tLQVDSGQGV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCy
-SN8I2Xw6L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/H
-jKNg6ZKg2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQB
-GmZmMIUwAinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xk
-u62LipkXwCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDm
-trhVQF4nAgMBAAECggEAW/y52YYW6ypROGbZ94DQpFV0kLO7qT8q0Ksxw5sPNaIt
-fEPRIymDa8ikyHWJS5Oxmw84wo5jnJV26jaLmwe2Lupq7Xf1lqej8f5LJtuv7cQR
-xfzp1vM65KJFFJHp6WqjGqJ6HSSZOpVDsnQYcXQjQCdpyAmaSWd3p+FqYSZ1mQmD
-bFNI7jqpczWSZhTdotQ7p7Hn9TVCehflP3yGIB3bQ+wCcCB85dOBz201L+YgaIck
-Sz43A4NvWaQIRLRDw7s9GW4jY5T0Jv282WIeAlVpVxLIwu48r4R4yGTIx9Ydowvq
-57+Y5iPPjAXxu0V9t00oS3bYxDaKh2DUfc/5zowq8QKBgQDYNVPXmaG0aIH4vjQ9
-7fRdw/UDkYcQbn6CnglQOu77/S8ogQzpKCVJgJgkZNqOVtQMEPzekGEcLTbje1gU
-8Bky2k+PL9UwbFy0emnOVh4rqrNXHsRvJcehNT/PRb5hjF3MUMFV/0iD4b+naFaE
-jrSWiZ2ZXj2qfwAK52GFbtOuBQKBgQDJYQuGiY0r22E4waJmCSKczoBT3cwlVzWj
-V2ljgA9RHLNTVkvNNYQLGu2qngFrtwpeaSnsMDerVG4wKAQWyCnYzxVrlnC4uDrJ
-HXuFEltBWi9Ffbgfsnd3749AT0oBP1NT2tMleguyf5DFgjCR3VRJLdrVaaZ8row/
-LqKcFMqnOwKBgB+OIO99l7E584Y3VG6ZdSneOLtNmRXX2pT7tcZE465ZdHGH7Dd3
-SYHhx9K/+Xn+yDH+pLli/xlarAEldmSP6k2WuTfftlC78AfTOfAId5zN7CDR9791
-Fx67I9X/itq33tS8EIuZl57P6uXm/4GXRloWOa8xpvRkVsBApuYPl8t1AoGATQDS
-y2sllDObBXzlgGbV2WgNIgSZ311toTv3jJiXQsjauW8yJRHln+l4H9mzaWDgkiFc
-ang1kUoDqF5k0eFQPxtQcYdhKwEnWWfwp33RbzfxA32DPnubuzzbZhfrkHaKgnIW
-cyor9uFYlm2l7ODZLfJez2RKyTplXnOSsmQw6akCgYAz3dj9Hskyj+HVJ+ht1OcE
-c7ai/ESkSA7Vajp0tjJp0EKjW/zq8DvUSXOtcdnJgkKycFluLwbmnaN4txBds1C1
-Qr8Rt2sUCCBNZe1L6DHe3XBdbkJe9sgZVNTjtUSQrzy8UhvsCqG4YWeCu07Szcbc
-rdPUV9/uQkdx8VrShxlD8A==
------END PRIVATE KEY-----
diff --git a/vendor/git.apache.org/thrift.git/test/known_failures_Linux.json b/vendor/git.apache.org/thrift.git/test/known_failures_Linux.json
deleted file mode 100644
index edf0fbb..0000000
--- a/vendor/git.apache.org/thrift.git/test/known_failures_Linux.json
+++ /dev/null
@@ -1,245 +0,0 @@
-[
-  "cpp-cpp_binary_buffered-ip-ssl",
-  "cpp-cpp_binary_framed-ip-ssl",
-  "cpp-cpp_binary_http-domain",
-  "cpp-cpp_binary_http-ip",
-  "cpp-cpp_binary_http-ip-ssl",
-  "cpp-cpp_compact_buffered-ip-ssl",
-  "cpp-cpp_compact_framed-ip-ssl",
-  "cpp-cpp_compact_http-domain",
-  "cpp-cpp_compact_http-ip",
-  "cpp-cpp_compact_http-ip-ssl",
-  "cpp-cpp_header_buffered-ip-ssl",
-  "cpp-cpp_header_framed-ip-ssl",
-  "cpp-cpp_header_http-ip-ssl",
-  "cpp-cpp_json_buffered-ip-ssl",
-  "cpp-cpp_json_framed-ip",
-  "cpp-cpp_json_framed-ip-ssl",
-  "cpp-cpp_json_http-domain",
-  "cpp-cpp_json_http-ip",
-  "cpp-cpp_json_http-ip-ssl",
-  "cpp-dart_binary_http-ip",
-  "cpp-dart_compact_http-ip",
-  "cpp-dart_json_http-ip",
-  "cpp-go_binary_http-ip",
-  "cpp-go_binary_http-ip-ssl",
-  "cpp-go_compact_http-ip",
-  "cpp-go_compact_http-ip-ssl",
-  "cpp-go_json_http-ip",
-  "cpp-go_json_http-ip-ssl",
-  "cpp-java_binary_http-ip",
-  "cpp-java_binary_http-ip-ssl",
-  "cpp-java_compact_http-ip",
-  "cpp-java_compact_http-ip-ssl",
-  "cpp-java_json_http-ip",
-  "cpp-java_json_http-ip-ssl",
-  "cpp-perl_binary_buffered-ip-ssl",
-  "cpp-perl_binary_framed-ip-ssl",
-  "cpp-py_binary-accel_framed-ip-ssl",
-  "csharp-cpp_binary_buffered-ip-ssl",
-  "csharp-cpp_binary_framed-ip-ssl",
-  "csharp-cpp_compact_buffered-ip-ssl",
-  "csharp-cpp_compact_framed-ip-ssl",
-  "csharp-cpp_json_buffered-ip-ssl",
-  "csharp-cpp_json_framed-ip-ssl",
-  "csharp-d_binary_buffered-ip-ssl",
-  "csharp-d_compact_buffered-ip-ssl",
-  "csharp-d_json_buffered-ip-ssl",
-  "csharp-erl_binary_buffered-ip-ssl",
-  "csharp-erl_binary_framed-ip-ssl",
-  "csharp-erl_compact_buffered-ip-ssl",
-  "csharp-erl_compact_framed-ip-ssl",
-  "csharp-go_binary_buffered-ip-ssl",
-  "csharp-go_binary_framed-ip-ssl",
-  "csharp-go_compact_buffered-ip-ssl",
-  "csharp-go_compact_framed-ip-ssl",
-  "csharp-go_json_buffered-ip-ssl",
-  "csharp-go_json_framed-ip-ssl",
-  "csharp-nodejs_binary_buffered-ip-ssl",
-  "csharp-nodejs_binary_framed-ip-ssl",
-  "csharp-nodejs_compact_buffered-ip-ssl",
-  "csharp-nodejs_compact_framed-ip-ssl",
-  "csharp-nodejs_json_buffered-ip-ssl",
-  "csharp-nodejs_json_framed-ip-ssl",
-  "csharp-perl_binary_buffered-ip-ssl",
-  "csharp-perl_binary_framed-ip-ssl",
-  "csharp-py3_binary-accel_buffered-ip-ssl",
-  "csharp-py3_binary-accel_framed-ip-ssl",
-  "csharp-py3_binary_buffered-ip-ssl",
-  "csharp-py3_binary_framed-ip-ssl",
-  "csharp-py3_compact-accelc_buffered-ip-ssl",
-  "csharp-py3_compact-accelc_framed-ip-ssl",
-  "csharp-py3_compact_buffered-ip-ssl",
-  "csharp-py3_compact_framed-ip-ssl",
-  "csharp-py3_json_buffered-ip-ssl",
-  "csharp-py3_json_framed-ip-ssl",
-  "csharp-py_binary-accel_buffered-ip-ssl",
-  "csharp-py_binary-accel_framed-ip-ssl",
-  "csharp-py_binary_buffered-ip-ssl",
-  "csharp-py_binary_framed-ip-ssl",
-  "csharp-py_compact-accelc_buffered-ip-ssl",
-  "csharp-py_compact-accelc_framed-ip-ssl",
-  "csharp-py_compact_buffered-ip-ssl",
-  "csharp-py_compact_framed-ip-ssl",
-  "csharp-py_json_buffered-ip-ssl",
-  "csharp-py_json_framed-ip-ssl",
-  "d-cpp_binary_buffered-ip",
-  "d-cpp_binary_buffered-ip-ssl",
-  "d-cpp_binary_framed-ip",
-  "d-cpp_binary_framed-ip-ssl",
-  "d-cpp_binary_http-ip",
-  "d-cpp_binary_http-ip-ssl",
-  "d-cpp_compact_buffered-ip",
-  "d-cpp_compact_buffered-ip-ssl",
-  "d-cpp_compact_framed-ip",
-  "d-cpp_compact_framed-ip-ssl",
-  "d-cpp_compact_http-ip",
-  "d-cpp_compact_http-ip-ssl",
-  "d-cpp_json_buffered-ip",
-  "d-cpp_json_buffered-ip-ssl",
-  "d-cpp_json_framed-ip",
-  "d-cpp_json_framed-ip-ssl",
-  "d-cpp_json_http-ip",
-  "d-cpp_json_http-ip-ssl",
-  "d-dart_binary_framed-ip",
-  "d-dart_binary_http-ip",
-  "d-dart_compact_framed-ip",
-  "d-dart_compact_http-ip",
-  "d-dart_json_framed-ip",
-  "d-dart_json_http-ip",
-  "d-go_binary_http-ip",
-  "d-go_binary_http-ip-ssl",
-  "d-go_compact_http-ip",
-  "d-go_compact_http-ip-ssl",
-  "d-go_json_http-ip",
-  "d-go_json_http-ip-ssl",
-  "d-java_binary_http-ip",
-  "d-java_binary_http-ip-ssl",
-  "d-java_compact_http-ip",
-  "d-java_compact_http-ip-ssl",
-  "d-java_json_http-ip",
-  "d-java_json_http-ip-ssl",
-  "d-js_json_http-ip",
-  "d-lua_json_buffered-ip",
-  "d-lua_json_framed-ip",
-  "d-nodejs_binary_buffered-ip",
-  "d-nodejs_binary_buffered-ip-ssl",
-  "d-nodejs_binary_framed-ip",
-  "d-nodejs_binary_framed-ip-ssl",
-  "d-nodejs_compact_buffered-ip",
-  "d-nodejs_compact_buffered-ip-ssl",
-  "d-nodejs_compact_framed-ip",
-  "d-nodejs_compact_framed-ip-ssl",
-  "d-nodejs_json_buffered-ip",
-  "d-nodejs_json_buffered-ip-ssl",
-  "d-nodejs_json_framed-ip",
-  "d-nodejs_json_framed-ip-ssl",
-  "d-perl_binary_buffered-ip-ssl",
-  "d-perl_binary_framed-ip-ssl",
-  "d-py3_binary-accel_buffered-ip",
-  "d-py3_binary-accel_buffered-ip-ssl",
-  "d-py3_binary-accel_framed-ip",
-  "d-py3_binary-accel_framed-ip-ssl",
-  "d-py3_binary_buffered-ip",
-  "d-py3_binary_buffered-ip-ssl",
-  "d-py3_binary_framed-ip",
-  "d-py3_binary_framed-ip-ssl",
-  "d-py3_compact-accelc_buffered-ip",
-  "d-py3_compact-accelc_buffered-ip-ssl",
-  "d-py3_compact-accelc_framed-ip",
-  "d-py3_compact-accelc_framed-ip-ssl",
-  "d-py3_compact_buffered-ip",
-  "d-py3_compact_buffered-ip-ssl",
-  "d-py3_compact_framed-ip",
-  "d-py3_compact_framed-ip-ssl",
-  "d-py3_json_buffered-ip",
-  "d-py3_json_buffered-ip-ssl",
-  "d-py3_json_framed-ip",
-  "d-py3_json_framed-ip-ssl",
-  "d-py_binary-accel_buffered-ip",
-  "d-py_binary-accel_buffered-ip-ssl",
-  "d-py_binary-accel_framed-ip",
-  "d-py_binary-accel_framed-ip-ssl",
-  "d-py_binary_buffered-ip",
-  "d-py_binary_buffered-ip-ssl",
-  "d-py_binary_framed-ip",
-  "d-py_binary_framed-ip-ssl",
-  "d-py_compact-accelc_buffered-ip",
-  "d-py_compact-accelc_buffered-ip-ssl",
-  "d-py_compact-accelc_framed-ip",
-  "d-py_compact-accelc_framed-ip-ssl",
-  "d-py_compact_buffered-ip",
-  "d-py_compact_buffered-ip-ssl",
-  "d-py_compact_framed-ip",
-  "d-py_compact_framed-ip-ssl",
-  "d-py_json_buffered-ip",
-  "d-py_json_buffered-ip-ssl",
-  "d-py_json_framed-ip",
-  "d-py_json_framed-ip-ssl",
-  "erl-nodejs_binary_buffered-ip",
-  "erl-nodejs_compact_buffered-ip",
-  "erl-perl_binary_buffered-ip-ssl",
-  "erl-perl_binary_framed-ip-ssl",
-  "erl-rb_binary-accel_buffered-ip",
-  "erl-rb_binary-accel_framed-ip",
-  "erl-rb_binary_buffered-ip",
-  "erl-rb_binary_framed-ip",
-  "erl-rb_compact_buffered-ip",
-  "erl-rb_compact_framed-ip",
-  "go-cpp_binary_http-ip",
-  "go-cpp_binary_http-ip-ssl",
-  "go-cpp_compact_http-ip",
-  "go-cpp_compact_http-ip-ssl",
-  "go-cpp_json_http-ip",
-  "go-cpp_json_http-ip-ssl",
-  "go-d_binary_http-ip",
-  "go-d_binary_http-ip-ssl",
-  "go-d_compact_http-ip",
-  "go-d_compact_http-ip-ssl",
-  "go-d_json_http-ip",
-  "go-d_json_http-ip-ssl",
-  "go-dart_binary_framed-ip",
-  "go-dart_binary_http-ip",
-  "go-dart_compact_http-ip",
-  "go-dart_json_framed-ip",
-  "go-dart_json_http-ip",
-  "go-java_binary_http-ip",
-  "go-java_binary_http-ip-ssl",
-  "go-java_compact_http-ip",
-  "go-java_compact_http-ip-ssl",
-  "go-java_json_http-ip",
-  "go-java_json_http-ip-ssl",
-  "go-nodejs_json_framed-ip",
-  "go-perl_binary_buffered-ip-ssl",
-  "go-perl_binary_framed-ip-ssl",
-  "hs-csharp_binary_framed-ip",
-  "hs-csharp_compact_framed-ip",
-  "hs-csharp_json_framed-ip",
-  "hs-dart_binary_framed-ip",
-  "hs-dart_compact_framed-ip",
-  "hs-dart_json_framed-ip",
-  "hs-py3_json_buffered-ip",
-  "hs-py3_json_framed-ip",
-  "hs-py_json_buffered-ip",
-  "hs-py_json_framed-ip",
-  "java-d_compact_buffered-ip",
-  "java-d_compact_buffered-ip-ssl",
-  "java-d_compact_framed-ip",
-  "java-perl_binary_buffered-ip-ssl",
-  "java-perl_binary_fastframed-framed-ip-ssl",
-  "java-perl_binary_framed-ip-ssl",
-  "nodejs-perl_binary_buffered-ip-ssl",
-  "nodejs-perl_binary_framed-ip-ssl",
-  "perl-perl_binary_buffered-ip-ssl",
-  "perl-perl_binary_framed-ip-ssl",
-  "perl-php_binary_framed-ip",
-  "py-cpp_compact_buffered-ip",
-  "py-perl_accel-binary_buffered-ip-ssl",
-  "py-perl_accel-binary_framed-ip-ssl",
-  "py-perl_binary_buffered-ip-ssl",
-  "py-perl_binary_framed-ip-ssl",
-  "py3-perl_accel-binary_buffered-ip-ssl",
-  "py3-perl_accel-binary_framed-ip-ssl",
-  "py3-perl_binary_buffered-ip-ssl",
-  "py3-perl_binary_framed-ip-ssl"
-]
diff --git a/vendor/git.apache.org/thrift.git/test/lua/Makefile.am b/vendor/git.apache.org/thrift.git/test/lua/Makefile.am
deleted file mode 100644
index ed8c5ae..0000000
--- a/vendor/git.apache.org/thrift.git/test/lua/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-# Remove "MapType =" line to ignore some map bug for now
-stubs: ../ThriftTest.thrift $(THRIFT)
-	$(THRIFT) --gen lua $<
-	$(SED) -i.bak 's/MapType =//g' gen-lua/ThriftTest_ttypes.lua
-	$(RM) gen-lua/ThriftTest_ttypes.lua.bak
-
-precross: stubs
-
-clean-local:
-	$(RM) -r gen-lua
diff --git a/vendor/git.apache.org/thrift.git/test/lua/test_basic_client.lua b/vendor/git.apache.org/thrift.git/test/lua/test_basic_client.lua
deleted file mode 100644
index 77d8d07..0000000
--- a/vendor/git.apache.org/thrift.git/test/lua/test_basic_client.lua
+++ /dev/null
@@ -1,179 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
-
---   http://www.apache.org/licenses/LICENSE-2.0
-
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-
-require('TSocket')
-require('TBufferedTransport')
-require('TFramedTransport')
-require('THttpTransport')
-require('TCompactProtocol')
-require('TJsonProtocol')
-require('TBinaryProtocol')
-require('ThriftTest_ThriftTest')
-require('liblualongnumber')
-
-local client
-
-function teardown()
-  if client then
-    -- close the connection
-    client:close()
-  end
-end
-
-function parseArgs(rawArgs)
-  local opt = {
-    protocol='binary',
-    transport='buffered',
-    port='9090',
-  }
-  for i, str in pairs(rawArgs) do
-    if i > 0 then
-      k, v = string.match(str, '--(%w+)=(%w+)')
-      assert(opt[k] ~= nil, 'Unknown argument')
-      opt[k] = v
-    end
-  end
-  return opt
-end
-
-function assertEqual(val1, val2, msg)
-  assert(val1 == val2, msg)
-end
-
-function testBasicClient(rawArgs)
-  local opt = parseArgs(rawArgs)
-  local socket = TSocket:new{
-    port = tonumber(opt.port)
-  }
-  assert(socket, 'Failed to create client socket')
-  socket:setTimeout(5000)
-
-  local transports = {
-    buffered = TBufferedTransport,
-    framed = TFramedTransport,
-    http = THttpTransport,
-  }
-  assert(transports[opt.transport] ~= nil)
-  local transport = transports[opt.transport]:new{
-    trans = socket,
-    isServer = false
-  }
-
-  local protocols = {
-    binary = TBinaryProtocol,
-    compact = TCompactProtocol,
-    json = TJSONProtocol,
-  }
-  assert(protocols[opt.protocol] ~= nil)
-  local protocol = protocols[opt.protocol]:new{
-    trans = transport
-  }
-  assert(protocol, 'Failed to create binary protocol')
-
-  client = ThriftTestClient:new{
-    protocol = protocol
-  }
-  assert(client, 'Failed to create client')
-
-  -- Open the transport
-  local status, _ = pcall(transport.open, transport)
-  assert(status, 'Failed to connect to server')
-
-  -- String
-  assertEqual(client:testString('lala'),  'lala',  'Failed testString')
-  assertEqual(client:testString('wahoo'), 'wahoo', 'Failed testString')
-
-  -- Bool
-  assertEqual(client:testBool(true), true, 'Failed testBool true')
-  assertEqual(client:testBool(false), false, 'Failed testBool false')
-
-  -- Byte
-  assertEqual(client:testByte(0x01), 1,    'Failed testByte 1')
-  assertEqual(client:testByte(0x40), 64,   'Failed testByte 2')
-  assertEqual(client:testByte(0x7f), 127,  'Failed testByte 3')
-  assertEqual(client:testByte(0x80), -128, 'Failed testByte 4')
-  assertEqual(client:testByte(0xbf), -65,  'Failed testByte 5')
-  assertEqual(client:testByte(0xff), -1,   'Failed testByte 6')
-  assertEqual(client:testByte(128), -128,  'Failed testByte 7')
-  assertEqual(client:testByte(255), -1,    'Failed testByte 8')
-
-  -- I32
-  assertEqual(client:testI32(0x00000001), 1,           'Failed testI32 1')
-  assertEqual(client:testI32(0x40000000), 1073741824,  'Failed testI32 2')
-  assertEqual(client:testI32(0x7fffffff), 2147483647,  'Failed testI32 3')
-  assertEqual(client:testI32(0x80000000), -2147483648, 'Failed testI32 4')
-  assertEqual(client:testI32(0xbfffffff), -1073741825, 'Failed testI32 5')
-  assertEqual(client:testI32(0xffffffff), -1,          'Failed testI32 6')
-  assertEqual(client:testI32(2147483648), -2147483648, 'Failed testI32 7')
-  assertEqual(client:testI32(4294967295), -1,          'Failed testI32 8')
-
-  -- I64 (lua only supports 16 decimal precision so larger numbers are
-  -- initialized by their string value)
-  local long = liblualongnumber.new
-  assertEqual(client:testI64(long(0x0000000000000001)),
-                   long(1),
-                   'Failed testI64 1')
-  assertEqual(client:testI64(long(0x4000000000000000)),
-                   long(4611686018427387904),
-                   'Failed testI64 2')
-  assertEqual(client:testI64(long('0x7fffffffffffffff')),
-                   long('9223372036854775807'),
-                   'Failed testI64 3')
-  assertEqual(client:testI64(long(0x8000000000000000)),
-                   long(-9223372036854775808),
-                   'Failed testI64 4')
-  assertEqual(client:testI64(long('0xbfffffffffffffff')),
-                   long('-4611686018427387905'),
-                   'Failed testI64 5')
-  assertEqual(client:testI64(long('0xffffffffffffffff')),
-                   long(-1),
-                   'Failed testI64 6')
-
-  -- Double
-  assertEqual(
-      client:testDouble(1.23456789), 1.23456789, 'Failed testDouble 1')
-  assertEqual(
-      client:testDouble(0.123456789), 0.123456789, 'Failed testDouble 2')
-  assertEqual(
-      client:testDouble(0.123456789), 0.123456789, 'Failed testDouble 3')
-
-  -- TODO testBinary() ...
-	  
-  -- Accuracy of 16 decimal digits (rounds)
-  local a, b = 1.12345678906666663, 1.12345678906666661
-  assertEqual(a, b)
-  assertEqual(client:testDouble(a), b, 'Failed testDouble 5')
-
-  -- Struct
-  local o = Xtruct:new{
-    string_thing = 'Zero',
-    byte_thing = 1,
-    i32_thing = -3,
-    i64_thing = long(-5)
-  }
-  local r = client:testStruct(o)
-  assertEqual(o.string_thing, r.string_thing, 'Failed testStruct 1')
-  assertEqual(o.byte_thing, r.byte_thing, 'Failed testStruct 2')
-  assertEqual(o.i32_thing, r.i32_thing, 'Failed testStruct 3')
-  assertEqual(o.i64_thing, r.i64_thing, 'Failed testStruct 4')
-
-  -- TODO add list map set exception etc etc
-end
-
-testBasicClient(arg)
-teardown()
diff --git a/vendor/git.apache.org/thrift.git/test/lua/test_basic_server.lua b/vendor/git.apache.org/thrift.git/test/lua/test_basic_server.lua
deleted file mode 100644
index acd2d79..0000000
--- a/vendor/git.apache.org/thrift.git/test/lua/test_basic_server.lua
+++ /dev/null
@@ -1,142 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
-
---   http://www.apache.org/licenses/LICENSE-2.0
-
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-require('ThriftTest_ThriftTest')
-require('TSocket')
-require('TBufferedTransport')
-require('TFramedTransport')
-require('THttpTransport')
-require('TCompactProtocol')
-require('TJsonProtocol')
-require('TBinaryProtocol')
-require('TServer')
-require('liblualongnumber')
-
---------------------------------------------------------------------------------
--- Handler
-TestHandler = ThriftTestIface:new{}
-
--- Stops the server
-function TestHandler:testVoid()
-end
-
-function TestHandler:testString(str)
-  return str
-end
-
-function TestHandler:testBool(bool)
-  return bool
-end
-
-function TestHandler:testByte(byte)
-  return byte
-end
-
-function TestHandler:testI32(i32)
-  return i32
-end
-
-function TestHandler:testI64(i64)
-  return i64
-end
-
-function TestHandler:testDouble(d)
-  return d
-end
-
-function TestHandler:testBinary(by)
-  return by
-end
-
-function TestHandler:testStruct(thing)
-  return thing
-end
-
---------------------------------------------------------------------------------
--- Test
-local server
-
-function teardown()
-  if server then
-    server:close()
-  end
-end
-
-function parseArgs(rawArgs)
-  local opt = {
-    protocol='binary',
-    transport='buffered',
-    port='9090',
-  }
-  for i, str in pairs(rawArgs) do
-    if i > 0 then
-      k, v = string.match(str, '--(%w+)=(%w+)')
-      assert(opt[k] ~= nil, 'Unknown argument')
-      opt[k] = v
-    end
-  end
-  return opt
-end
-
-function testBasicServer(rawArgs)
-  local opt = parseArgs(rawArgs)
-  -- Handler & Processor
-  local handler = TestHandler:new{}
-  assert(handler, 'Failed to create handler')
-  local processor = ThriftTestProcessor:new{
-    handler = handler
-  }
-  assert(processor, 'Failed to create processor')
-
-  -- Server Socket
-  local socket = TServerSocket:new{
-    port = opt.port
-  }
-  assert(socket, 'Failed to create server socket')
-
-  -- Transport & Factory
-  local transports = {
-    buffered = TBufferedTransportFactory,
-    framed = TFramedTransportFactory,
-    http = THttpTransportFactory,
-  }
-  assert(transports[opt.transport], 'Failed to create framed transport factory')
-  local trans_factory = transports[opt.transport]:new{}
-  local protocols = {
-    binary = TBinaryProtocolFactory,
-    compact = TCompactProtocolFactory,
-    json = TJSONProtocolFactory,
-  }
-  local prot_factory = protocols[opt.protocol]:new{}
-  assert(prot_factory, 'Failed to create binary protocol factory')
-
-  -- Simple Server
-  server = TSimpleServer:new{
-    processor = processor,
-    serverTransport = socket,
-    transportFactory = trans_factory,
-    protocolFactory = prot_factory
-  }
-  assert(server, 'Failed to create server')
-
-  -- Serve
-  server:serve()
-  server = nil
-end
-
-testBasicServer(arg)
-teardown()
diff --git a/vendor/git.apache.org/thrift.git/test/ocaml/client/TestClient.ml b/vendor/git.apache.org/thrift.git/test/ocaml/client/TestClient.ml
deleted file mode 100644
index 91783ae..0000000
--- a/vendor/git.apache.org/thrift.git/test/ocaml/client/TestClient.ml
+++ /dev/null
@@ -1,82 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift;;
-open ThriftTest_types;;
-
-let s = new TSocket.t "127.0.0.1" 9090;;
-let p = new TBinaryProtocol.t s;;
-let c = new ThriftTest.client p p;;
-let sod = function
-    Some v -> v
-  | None -> raise Thrift_error;;
-
-s#opn;
-print_string (c#testString "bya");
-print_char '\n';
-print_int (c#testByte 8);
-print_char '\n';
-print_int (c#testByte (-8));
-print_char '\n';
-print_int (c#testI32 32);
-print_char '\n';
-print_string (Int64.to_string (c#testI64 64L));
-print_char '\n';
-print_float (c#testDouble 3.14);
-print_char '\n';
-
-let l = [1;2;3;4] in
-  if l = (c#testList l) then print_string "list ok\n" else print_string "list fail\n";;
-let h = Hashtbl.create 5 in
-let a = Hashtbl.add h in
-  for i=1 to 10 do
-    a i (10*i)
-  done;
-  let r = c#testMap h in
-    for i=1 to 10 do
-      try
-        let g = Hashtbl.find r i in
-          print_int i;
-          print_char ' ';
-          print_int g;
-          print_char '\n'
-      with Not_found -> print_string ("Can't find "^(string_of_int i)^"\n")
-    done;;
-
-let s = Hashtbl.create 5 in
-let a = Hashtbl.add s in
-  for i = 1 to 10 do
-    a i true
-  done;
-  let r = c#testSet s in
-    for i = 1 to 10 do
-      try
-        let g = Hashtbl.find r i in
-          print_int i;
-          print_char '\n'
-      with Not_found -> print_string ("Can't find "^(string_of_int i)^"\n")
-    done;;
-try
-  c#testException "Xception"
-with Xception _ -> print_string "testException ok\n";;
-try
-  ignore(c#testMultiException "Xception" "bya")
-with Xception e -> Printf.printf "%d %s\n" (sod e#get_errorCode) (sod e#get_message);;
-
-
diff --git a/vendor/git.apache.org/thrift.git/test/ocaml/server/TestServer.ml b/vendor/git.apache.org/thrift.git/test/ocaml/server/TestServer.ml
deleted file mode 100644
index efe0f4b..0000000
--- a/vendor/git.apache.org/thrift.git/test/ocaml/server/TestServer.ml
+++ /dev/null
@@ -1,137 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Thrift
-open ThriftTest_types
-
-let p = Printf.printf;;
-exception Die;;
-let sod = function
-    Some v -> v
-  | None -> raise Die;;
-
-
-class test_handler =
-object (self)
-  inherit ThriftTest.iface
-  method testVoid = p "testVoid()\n"
-  method testString x = p "testString(%s)\n" (sod x); (sod x)
-  method testByte x = p "testByte(%d)\n" (sod x); (sod x)
-  method testI32 x = p "testI32(%d)\n" (sod x); (sod x)
-  method testI64 x = p "testI64(%s)\n" (Int64.to_string (sod x)); (sod x)
-  method testDouble x = p "testDouble(%f)\n" (sod x); (sod x)
-  method testBinary x = p "testBinary(%s)\n" (sod x); (sod x)
-  method testStruct x = p "testStruct(---)\n"; (sod x)
-  method testNest x = p "testNest(---)\n"; (sod x)
-  method testMap x = p "testMap(---)\n"; (sod x)
-  method testSet x = p "testSet(---)\n"; (sod x)
-  method testList x = p "testList(---)\n"; (sod x)
-  method testEnum x = p "testEnum(---)\n"; (sod x)
-  method testTypedef x = p "testTypedef(---)\n"; (sod x)
-  method testMapMap x = p "testMapMap(%d)\n" (sod x);
-    let mm = Hashtbl.create 3 in
-    let pos = Hashtbl.create 7 in
-    let neg = Hashtbl.create 7 in
-      for i=1 to 4 do
-        Hashtbl.add pos i i;
-        Hashtbl.add neg (-i) (-i);
-      done;
-      Hashtbl.add mm 4 pos;
-      Hashtbl.add mm (-4) neg;
-      mm
-  method testInsanity x = p "testInsanity()\n";
-    p "testinsanity()\n";
-    let hello = new xtruct in
-    let goodbye = new xtruct in
-    let crazy = new insanity in
-    let looney = new insanity in
-    let cumap = Hashtbl.create 7 in
-    let insane = Hashtbl.create 7 in
-    let firstmap = Hashtbl.create 7 in
-    let secondmap = Hashtbl.create 7 in
-      hello#set_string_thing "Hello2";
-      hello#set_byte_thing 2;
-      hello#set_i32_thing 2;
-      hello#set_i64_thing 2L;
-      goodbye#set_string_thing "Goodbye4";
-      goodbye#set_byte_thing 4;
-      goodbye#set_i32_thing 4;
-      goodbye#set_i64_thing 4L;
-      Hashtbl.add cumap Numberz.EIGHT 8L;
-      Hashtbl.add cumap Numberz.FIVE 5L;
-      crazy#set_userMap cumap;
-      crazy#set_xtructs [goodbye; hello];
-      Hashtbl.add firstmap Numberz.TWO crazy;
-      Hashtbl.add firstmap Numberz.THREE crazy;
-      Hashtbl.add secondmap Numberz.SIX looney;
-      Hashtbl.add insane 1L firstmap;
-      Hashtbl.add insane 2L secondmap;
-      insane
-  method testMulti a0 a1 a2 a3 a4 a5 =
-    p "testMulti()\n";
-    let hello = new xtruct in
-      hello#set_string_thing "Hello2";
-      hello#set_byte_thing (sod a0);
-      hello#set_i32_thing (sod a1);
-      hello#set_i64_thing (sod a2);
-      hello
-  method testException s =
-    p "testException(%S)\n" (sod s);
-    if (sod s) = "Xception" then
-      let x = new xception in
-        x#set_errorCode 1001;
-        x#set_message "This is an Xception";
-        raise (Xception x)
-    else ()
-  method testMultiException a0 a1 =
-    p "testMultiException(%S, %S)\n" (sod a0) (sod a1);
-    if (sod a0) = "Xception" then
-      let x = new xception in
-        x#set_errorCode 1001;
-        x#set_message "This is an Xception";
-        raise (Xception x)
-    else (if (sod a0) = "Xception2" then
-              let x = new xception2 in
-              let s = new xtruct in
-                x#set_errorCode 2002;
-                s#set_string_thing "This as an Xception2";
-                x#set_struct_thing s;
-                raise (Xception2 x)
-          else ());
-    let res = new xtruct in
-      res#set_string_thing (sod a1);
-      res
-  method testOneway i =
-    Unix.sleep (sod i)
-end;;
-
-let h = new test_handler in
-let proc = new ThriftTest.processor h in
-let port = 9090 in
-let pf = new TBinaryProtocol.factory in
-let server = new TThreadedServer.t
-  proc
-  (new TServerSocket.t port)
-  (new Transport.factory)
-  pf
-  pf
-in
-  server#serve
-
-
diff --git a/vendor/git.apache.org/thrift.git/test/perl/Makefile.am b/vendor/git.apache.org/thrift.git/test/perl/Makefile.am
deleted file mode 100644
index d975f69..0000000
--- a/vendor/git.apache.org/thrift.git/test/perl/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-stubs: ../ThriftTest.thrift
-	$(THRIFT) --gen perl ../ThriftTest.thrift
-
-precross: stubs
-
-check: stubs
-
-clean-local:
-	$(RM) -r gen-perl
-
diff --git a/vendor/git.apache.org/thrift.git/test/perl/TestClient.pl b/vendor/git.apache.org/thrift.git/test/perl/TestClient.pl
deleted file mode 100755
index 7ec32bf..0000000
--- a/vendor/git.apache.org/thrift.git/test/perl/TestClient.pl
+++ /dev/null
@@ -1,427 +0,0 @@
-#!/usr/bin/env perl
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-use Data::Dumper;
-use Getopt::Long qw(GetOptions);
-use Time::HiRes qw(gettimeofday);
-
-use lib '../../lib/perl/lib';
-use lib 'gen-perl';
-
-use Thrift;
-use Thrift::BinaryProtocol;
-use Thrift::BufferedTransport;
-use Thrift::FramedTransport;
-use Thrift::SSLSocket;
-use Thrift::Socket;
-use Thrift::UnixSocket;
-
-use ThriftTest::ThriftTest;
-use ThriftTest::Types;
-
-$|++;
-
-sub usage {
-    print <<EOF;
-Usage: $0 [OPTIONS]
-
-Options:                          (default)
-  --cert                                       Certificate to use.
-                                               Required if using --ssl.
-  --domain-socket <file>                       Use a unix domain socket.
-  --help                                       Show usage.
-  --port <portnum>                9090         Port to use.
-  --protocol {binary}             binary       Protocol to use.
-  --ssl                                        If present, use SSL.
-  --transport {buffered|framed}   buffered     Transport to use.
-                                   
-EOF
-}
-
-my %opts = (
-    'port' => 9090,
-    'protocol' => 'binary',
-    'transport' => 'buffered'
-);
-
-GetOptions(\%opts, qw (
-    cert=s
-    domain-socket=s
-    help
-    host=s
-    port=i
-    protocol=s
-    ssl
-    transport=s
-)) || exit 1;
-
-if ($opts{help}) {
-    usage();
-    exit 0;
-}
-
-if ($opts{ssl} and not defined $opts{cert}) {
-    usage();
-    exit 1;
-}
-
-my $socket = undef;
-if ($opts{"domain-socket"}) {
-    $socket = new Thrift::UnixSocket($opts{"domain-socket"});
-} elsif ($opts{ssl}) {
-	$socket = new Thrift::SSLSocket($opts{host}, $opts{port});
-} else {
-	$socket = new Thrift::Socket($opts{host}, $opts{port});
-}
-
-my $transport;
-if ($opts{transport} eq 'buffered') {
-    $transport = new Thrift::BufferedTransport($socket, 1024, 1024);
-} elsif ($opts{transport} eq 'framed') {
-    $transport = new Thrift::FramedTransport($socket);
-} else {
-    usage();
-    exit 1;
-}
-
-my $protocol;
-if ($opts{protocol} eq 'binary') {
-    $protocol = new Thrift::BinaryProtocol($transport);
-} else {
-    usage();
-    exit 1;
-}
-
-my $testClient = new ThriftTest::ThriftTestClient($protocol);
-
-eval {
-  $transport->open();
-}; 
-if($@){
-    die(Dumper($@));
-}
-my $start = gettimeofday();
-
-#
-# VOID TEST
-#
-print("testVoid()");
-$testClient->testVoid();
-print(" = void\n");
-
-#
-# STRING TEST
-#
-print("testString(\"Test\")");
-my $s = $testClient->testString("Test");
-print(" = \"$s\"\n");
-
-#
-# BOOL TEST
-#
-print("testBool(1)");
-my $t = $testClient->testBool(1);
-print(" = $t\n");
-print("testBool(0)");
-my $f = $testClient->testBool(0);
-print(" = $f\n");
-
-
-#
-# BYTE TEST
-#
-print("testByte(1)");
-my $u8 = $testClient->testByte(1);
-print(" = $u8\n");
-
-#
-# I32 TEST
-#
-print("testI32(-1)");
-my $i32 = $testClient->testI32(-1);
-print(" = $i32\n");
-
-#
-#I64 TEST
-#
-print("testI64(-34359738368)");
-my $i64 = $testClient->testI64(-34359738368);
-print(" = $i64\n");
-
-#
-# DOUBLE TEST
-#
-print("testDouble(-852.234234234)");
-my $dub = $testClient->testDouble(-852.234234234);
-print(" = $dub\n");
-
-#
-# BINARY TEST   ---  TODO
-#
-
-
-#
-# STRUCT TEST
-#
-print("testStruct({\"Zero\", 1, -3, -5})");
-my $out = new ThriftTest::Xtruct();
-$out->string_thing("Zero");
-$out->byte_thing(1);
-$out->i32_thing(-3);
-$out->i64_thing(-5);
-my $in = $testClient->testStruct($out);
-print(" = {\"".$in->string_thing."\", ".
-        $in->byte_thing.", ".
-        $in->i32_thing.", ".
-        $in->i64_thing."}\n");
-
-#
-# NESTED STRUCT TEST
-#
-print("testNest({1, {\"Zero\", 1, -3, -5}, 5}");
-my $out2 = new ThriftTest::Xtruct2();
-$out2->byte_thing(1);
-$out2->struct_thing($out);
-$out2->i32_thing(5);
-my $in2 = $testClient->testNest($out2);
-$in = $in2->struct_thing;
-print(" = {".$in2->byte_thing.", {\"".
-      $in->string_thing."\", ".
-      $in->byte_thing.", ".
-      $in->i32_thing.", ".
-      $in->i64_thing."}, ".
-      $in2->i32_thing."}\n");
-
-#
-# MAP TEST
-#
-my $mapout = {};
-for (my $i = 0; $i < 5; ++$i) {
-  $mapout->{$i} = $i-10;
-}
-print("testMap({");
-my $first = 1;
-while( my($key,$val) = each %$mapout) {
-    if ($first) {
-        $first = 0;
-    } else {
-        print(", ");
-    }
-    print("$key => $val");
-}
-print("})");
-
-
-my $mapin = $testClient->testMap($mapout);
-print(" = {");
-
-$first = 1;
-while( my($key,$val) = each %$mapin){
-    if ($first) {
-        $first = 0;
-    } else {
-        print(", ");
-    }
-    print("$key => $val");
-}
-print("}\n");
-
-#
-# SET TEST
-#
-my $setout = [];
-for (my $i = -2; $i < 3; ++$i) {
-    push(@$setout, $i);
-}
-
-print("testSet({".join(",",@$setout)."})");
-
-my $setin = $testClient->testSet($setout);
-
-print(" = {".join(",",@$setout)."}\n");
-
-#
-# LIST TEST
-#
-my $listout = [];
-for (my $i = -2; $i < 3; ++$i) {
-    push(@$listout, $i);
-}
-
-print("testList({".join(",",@$listout)."})");
-
-my $listin = $testClient->testList($listout);
-
-print(" = {".join(",",@$listin)."}\n");
-
-#
-# ENUM TEST
-#
-print("testEnum(ONE)");
-my $ret = $testClient->testEnum(ThriftTest::Numberz::ONE);
-print(" = $ret\n");
-
-print("testEnum(TWO)");
-$ret = $testClient->testEnum(ThriftTest::Numberz::TWO);
-print(" = $ret\n");
-
-print("testEnum(THREE)");
-$ret = $testClient->testEnum(ThriftTest::Numberz::THREE);
-print(" = $ret\n");
-
-print("testEnum(FIVE)");
-$ret = $testClient->testEnum(ThriftTest::Numberz::FIVE);
-print(" = $ret\n");
-
-print("testEnum(EIGHT)");
-$ret = $testClient->testEnum(ThriftTest::Numberz::EIGHT);
-print(" = $ret\n");
-
-#
-# TYPEDEF TEST
-#
-print("testTypedef(309858235082523)");
-my $uid = $testClient->testTypedef(309858235082523);
-print(" = $uid\n");
-
-#
-# NESTED MAP TEST
-#
-print("testMapMap(1)");
-my $mm = $testClient->testMapMap(1);
-print(" = {");
-while( my ($key,$val) = each %$mm) {
-    print("$key => {");
-    while( my($k2,$v2) = each %$val) {
-        print("$k2 => $v2, ");
-    }
-    print("}, ");
-}
-print("}\n");
-
-#
-# INSANITY TEST
-#
-my $insane = new ThriftTest::Insanity();
-$insane->{userMap}->{ThriftTest::Numberz::FIVE} = 5000;
-my $truck = new ThriftTest::Xtruct();
-$truck->string_thing("Hello2");
-$truck->byte_thing(2);
-$truck->i32_thing(2);
-$truck->i64_thing(2);
-my $truck2 = new ThriftTest::Xtruct();
-$truck2->string_thing("Goodbye4");
-$truck2->byte_thing(4);
-$truck2->i32_thing(4);
-$truck2->i64_thing(4);
-push(@{$insane->{xtructs}}, $truck);
-push(@{$insane->{xtructs}}, $truck2);
-
-print("testInsanity()");
-my $whoa = $testClient->testInsanity($insane);
-print(" = {");
-while( my ($key,$val) = each %$whoa) {
-    print("$key => {");
-    while( my($k2,$v2) = each %$val) {
-        print("$k2 => {");
-        my $userMap = $v2->{userMap};
-        print("{");
-        if (ref($userMap) eq "HASH") {
-            while( my($k3,$v3) = each %$userMap) {
-                print("$k3 => $v3, ");
-            }
-        }
-        print("}, ");
-
-        my $xtructs = $v2->{xtructs};
-        print("{");
-        if (ref($xtructs) eq "ARRAY") {
-            foreach my $x (@$xtructs) {
-                print("{\"".$x->{string_thing}."\", ".
-                      $x->{byte_thing}.", ".$x->{i32_thing}.", ".$x->{i64_thing}."}, ");
-            }
-        }
-        print("}");
-
-        print("}, ");
-    }
-    print("}, ");
-}
-print("}\n");
-
-#
-# EXCEPTION TEST
-#
-print("testException('Xception')");
-eval {
-    $testClient->testException('Xception');
-    print("  void\nFAILURE\n");
-}; if($@ && $@->UNIVERSAL::isa('ThriftTest::Xception')) {
-    print(' caught xception '.$@->{errorCode}.': '.$@->{message}."\n");
-}
-
-
-#
-# Normal tests done.
-#
-my $stop = gettimeofday();
-my $elp  = sprintf("%d",1000*($stop - $start), 0);
-print("Total time: $elp ms\n");
-
-#
-# Extraneous "I don't trust PHP to pack/unpack integer" tests
-#
-
-# Max I32
-my $num = 2**30 + 2**30 - 1;
-my $num2 = $testClient->testI32($num);
-if ($num != $num2) {
-    print "Missed max32 $num = $num2\n";
-}
-
-# Min I32
-$num = 0 - 2**31;
-$num2 = $testClient->testI32($num);
-if ($num != $num2) {
-    print "Missed min32 $num = $num2\n";
-}
-
-# Max Number I can get out of my perl
-$num = 2**40;
-$num2 = $testClient->testI64($num);
-if ($num != $num2) {
-    print "Missed max64 $num = $num2\n";
-}
-
-# Max Number I can get out of my perl
-$num = 0 - 2**40;
-$num2 = $testClient->testI64($num);
-if ($num != $num2) {
-    print "Missed min64 $num = $num2\n";
-}
-
-$transport->close();
-
-
-
diff --git a/vendor/git.apache.org/thrift.git/test/perl/TestServer.pl b/vendor/git.apache.org/thrift.git/test/perl/TestServer.pl
deleted file mode 100644
index 4e0cc79..0000000
--- a/vendor/git.apache.org/thrift.git/test/perl/TestServer.pl
+++ /dev/null
@@ -1,398 +0,0 @@
-#!/usr/bin/env perl
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 5.6.0;
-use strict;
-use warnings;
-use Data::Dumper;
-use Getopt::Long qw(GetOptions);
-use Time::HiRes qw(gettimeofday);
-
-use lib '../../lib/perl/lib';
-use lib 'gen-perl';
-
-use Thrift;
-use Thrift::BinaryProtocol;
-use Thrift::BufferedTransport;
-use Thrift::FramedTransport;
-use Thrift::SSLServerSocket;
-use Thrift::ServerSocket;
-use Thrift::Server;
-use Thrift::UnixServerSocket;
-
-use ThriftTest::ThriftTest;
-use ThriftTest::Types;
-
-$|++;
-
-sub usage {
-    print <<EOF;
-Usage: $0 [OPTIONS]
-
-Options:                          (default)
-  --ca                                         Certificate authority file (optional).
-  --cert                                       Certificate file.
-                                               Required if using --ssl.                                               
-  --domain-socket <file>                       Use a unix domain socket.
-  --help                                       Show usage.
-  --key                                        Private key file for certificate.
-                                               Required if using --ssl and private key is
-                                               not in the certificate file.
-  --port <portnum>                9090         Port to use.
-  --protocol {binary}             binary       Protocol to use.
-  --ssl                                        If present, use SSL/TLS.
-  --transport {buffered|framed}   buffered     Transport to use.
-                                   
-EOF
-}
-
-my %opts = (
-    'port' => 9090,
-    'protocol' => 'binary',
-    'transport' => 'buffered'
-);
-
-GetOptions(\%opts, qw (
-    ca=s
-    cert=s
-    domain-socket=s
-    help
-    host=s
-    key=s
-    port=i
-    protocol=s
-    ssl
-    transport=s
-)) || exit 1;
-
-if ($opts{help}) {
-    usage();
-    exit 0;
-}
-
-if ($opts{ssl} and not defined $opts{cert}) {
-    usage();
-    exit 1;
-}
-
-my $handler = new ThriftTestHandler();
-my $processor = new ThriftTest::ThriftTestProcessor($handler);
-my $serversocket;
-if ($opts{"domain-socket"}) {
-    unlink($opts{"domain-socket"});
-    $serversocket = new Thrift::UnixServerSocket($opts{"domain-socket"});
-} elsif ($opts{ssl}) {
-    $serversocket = new Thrift::SSLServerSocket(\%opts);
-} else {
-    $serversocket = new Thrift::ServerSocket(\%opts);
-}
-my $transport;
-if ($opts{transport} eq 'buffered') {
-    $transport = new Thrift::BufferedTransportFactory();
-} elsif ($opts{transport} eq 'framed') {
-    $transport = new Thrift::FramedTransportFactory();
-} else {
-    usage();
-    exit 1;
-}
-my $protocol;
-if ($opts{protocol} eq 'binary') {
-    $protocol = new Thrift::BinaryProtocolFactory();
-} else {
-    usage();
-    exit 1;
-}
-
-my $ssltag = '';
-if ($opts{ssl}) {
-    $ssltag = "(SSL)";
-}
-my $listening_on = "$opts{port} $ssltag";
-if ($opts{"domain-socket"}) {
-    $listening_on = $opts{"domain-socket"};
-}
-my $server = new Thrift::SimpleServer($processor, $serversocket, $transport, $protocol);
-print "Starting \"simple\" server ($opts{transport}/$opts{protocol}) listen on: $listening_on\n";
-$server->serve();
-
-###    
-### Test server implementation
-###
-
-package ThriftTestHandler;
-
-use base qw( ThriftTest::ThriftTestIf );
-
-sub new {
-    my $classname = shift;
-    my $self = {};
-    return bless($self, $classname);
-}
-
-sub testVoid() {
-  print("testVoid()\n"); 
-}
-
-sub testString() {
-  my $self = shift;
-  my $thing = shift;
-  print("testString($thing)\n");
-  return $thing;
-}
-
-sub testBool() {
-  my $self = shift;
-  my $thing = shift;
-  my $str = $thing ? "true" : "false";
-  print("testBool($str)\n");
-  return $thing;
-}
-
-sub testByte() {
-  my $self = shift;
-  my $thing = shift;
-  print("testByte($thing)\n");
-  return $thing;
-}
-
-sub testI32() {
-  my $self = shift;
-  my $thing = shift;
-  print("testI32($thing)\n");
-  return $thing;
-}
-
-sub testI64() {
-  my $self = shift;
-  my $thing = shift;
-  print("testI64($thing)\n");
-  return $thing;
-}
-
-sub testDouble() {
-  my $self = shift;
-  my $thing = shift;
-  print("testDouble($thing)\n");
-  return $thing;
-}
-
-sub testBinary() {
-    my $self = shift;
-    my $thing = shift;
-    my @bytes = split //, $thing;
-    print("testBinary(");
-    foreach (@bytes)
-    {
-        printf "%02lx", ord $_;
-    }
-    print(")\n");
-    return $thing;
-}
-
-sub testStruct() {
-  my $self = shift;
-  my $thing = shift;
-  printf("testStruct({\"%s\", %d, %d, %lld})\n",
-           $thing->{string_thing},
-           $thing->{byte_thing},
-           $thing->{i32_thing},
-           $thing->{i64_thing});
-  return $thing;
-}
-
-sub testNest() {
-  my $self = shift;
-  my $nest = shift;
-  my $thing = $nest->{struct_thing};
-  printf("testNest({%d, {\"%s\", %d, %d, %lld}, %d})\n",
-           $nest->{byte_thing},
-           $thing->{string_thing},
-           $thing->{byte_thing},
-           $thing->{i32_thing},
-           $thing->{i64_thing},
-           $nest->{i32_thing});
-  return $nest;
-}
-
-sub testMap() {
-  my $self = shift;
-  my $thing = shift;
-  print("testMap({");
-  my $first = 1;
-  foreach my $key (keys %$thing) {
-    if ($first) {
-        $first = 0;
-    } else {
-        print(", ");
-    }
-    print("$key => $thing->{$key}");
-  }
-  print("})\n");
-  return $thing;
-}
-
-sub testStringMap() {
-  my $self = shift;
-  my $thing = shift;
-  print("testStringMap({");
-  my $first = 1;
-  foreach my $key (keys %$thing) {
-    if ($first) {
-        $first = 0;
-    } else {
-        print(", ");
-    }
-    print("$key => $thing->{$key}");
-  }
-  print("})\n");
-  return $thing;
-}
-
-sub testSet() {
-  my $self = shift;
-  my $thing = shift;
-  my @arr;
-  my $result = \@arr;
-  print("testSet({");
-  my $first = 1;
-  foreach my $key (keys %$thing) {
-    if ($first) {
-        $first = 0;
-    } else {
-        print(", ");
-    }
-    print("$key");
-    push($result, $key);
-  }
-  print("})\n");
-  return $result;
-}
-
-sub testList() {
-  my $self = shift;
-  my $thing = shift;
-  print("testList({");
-  my $first = 1;
-  foreach my $key (@$thing) {
-    if ($first) {
-        $first = 0;
-    } else {
-        print(", ");
-    }
-    print("$key");
-  }
-  print("})\n");
-  return $thing;
-}
-
-sub testEnum() {
-  my $self = shift;
-  my $thing = shift;
-  print("testEnum($thing)\n");
-  return $thing;
-}
-
-sub testTypedef() {
-  my $self = shift;
-  my $thing = shift;
-  print("testTypedef($thing)\n");
-  return $thing;
-}
-
-sub testMapMap() {
-  my $self = shift;
-  my $hello = shift;
-  
-  printf("testMapMap(%d)\n", $hello);
-  my $result = { 4 => { 1 => 1, 2 => 2, 3 => 3, 4 => 4 }, -4 => { -1 => -1, -2 => -2, -3 => -3, -4 => -4 } };
-  return $result;
-}
-
-sub testInsanity() {
-  my $self = shift;
-  my $argument = shift;
-  print("testInsanity()\n");
-
-  my $hello = new ThriftTest::Xtruct({string_thing => "Hello2", byte_thing => 2, i32_thing => 2, i64_thing => 2});
-  my @hellos;
-  push(@hellos, $hello);
-  my $goodbye = new ThriftTest::Xtruct({string_thing => "Goodbye4", byte_thing => 4, i32_thing => 4, i64_thing => 4});
-  my @goodbyes;
-  push(@goodbyes, $goodbye);
-  my $crazy = new ThriftTest::Insanity({userMap => { ThriftTest::Numberz::EIGHT => 8 }, xtructs => \@goodbyes});
-  my $loony = new ThriftTest::Insanity();
-  my $result = { 1 => { ThriftTest::Numberz::TWO => $argument, ThriftTest::Numberz::THREE => $argument },
-                 2 => { ThriftTest::Numberz::SIX => $loony } };
-  return $result;
-}
-
-sub testMulti() {
-  my $self = shift;
-  my $arg0 = shift;
-  my $arg1 = shift;
-  my $arg2 = shift;
-  my $arg3 = shift;
-  my $arg4 = shift;
-  my $arg5 = shift;
-  
-  print("testMulti()\n");
-  return new ThriftTest::Xtruct({string_thing => "Hello2", byte_thing => $arg0, i32_thing => $arg1, i64_thing => $arg2});
-}
-
-sub testException() {
-  my $self = shift;
-  my $arg = shift;
-  print("testException($arg)\n");
-  if ($arg eq "Xception") {
-    die new ThriftTest::Xception({errorCode => 1001, message => $arg});
-  } elsif ($arg eq "TException") {
-    die "astring"; # all unhandled exceptions become TExceptions
-  } else {
-    return new ThriftTest::Xtruct({string_thing => $arg});
-  }
-}
-
-sub testMultiException() {
-  my $self = shift;
-  my $arg0 = shift;
-  my $arg1 = shift;
-
-  printf("testMultiException(%s, %s)\n", $arg0, $arg1);
-  if ($arg0 eq "Xception") {
-    die new ThriftTest::Xception({errorCode => 1001, message => "This is an Xception"});
-  } elsif ($arg0 eq "Xception2") {
-    my $struct_thing = new ThriftTest::Xtruct({string_thing => "This is an Xception2"});
-    die new ThriftTest::Xception2({errorCode => 2002, struct_thing => $struct_thing});
-  } else {
-    return new ThriftTest::Xtruct({string_thing => $arg1});
-  }
-}
-
-sub testOneway() {
-  my $self = shift;
-  my $sleepFor = shift;
-  print("testOneway($sleepFor): Sleeping...\n");
-  sleep $sleepFor;
-  print("testOneway($sleepFor): done sleeping!\n");
-}
-
-
-1;
diff --git a/vendor/git.apache.org/thrift.git/test/php/Makefile.am b/vendor/git.apache.org/thrift.git/test/php/Makefile.am
deleted file mode 100755
index 7c4347f..0000000
--- a/vendor/git.apache.org/thrift.git/test/php/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-stubs: ../ThriftTest.thrift
-	$(THRIFT) --gen php ../ThriftTest.thrift
-	$(THRIFT) --gen php:inlined ../ThriftTest.thrift
-	$(MKDIR_P) gen-php-psr4
-	$(THRIFT) -out gen-php-psr4 --gen php:psr4 ../ThriftTest.thrift
-
-precross: stubs
-
-check: stubs
-
-clean-local:
-	$(RM) -r gen-php gen-phpi gen-php-psr4
-
-client: stubs
-	php TestClient.php
diff --git a/vendor/git.apache.org/thrift.git/test/php/TestClient.php b/vendor/git.apache.org/thrift.git/test/php/TestClient.php
deleted file mode 100755
index c1f6435..0000000
--- a/vendor/git.apache.org/thrift.git/test/php/TestClient.php
+++ /dev/null
@@ -1,492 +0,0 @@
-<?php
-
-namespace test\php;
-
-require_once __DIR__.'/../../lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php';
-
-use Thrift\ClassLoader\ThriftClassLoader;
-
-if (!isset($GEN_DIR)) {
-  $GEN_DIR = 'gen-php';
-}
-if (!isset($MODE)) {
-  $MODE = 'normal';
-}
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', __DIR__ . '/../../lib/php/lib');
-if ($GEN_DIR === 'gen-php-psr4') {
-  $loader->registerNamespace('ThriftTest', $GEN_DIR);
-} else {
-  $loader->registerDefinition('ThriftTest', $GEN_DIR);
-}
-$loader->register();
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/** Include the Thrift base */
-/** Include the protocols */
-use Thrift\Protocol\TBinaryProtocol;
-use Thrift\Protocol\TBinaryProtocolAccelerated;
-use Thrift\Protocol\TCompactProtocol;
-use Thrift\Protocol\TJSONProtocol;
-
-/** Include the socket layer */
-use Thrift\Transport\TSocket;
-use Thrift\Transport\TSocketPool;
-
-/** Include the socket layer */
-use Thrift\Transport\TFramedTransport;
-use Thrift\Transport\TBufferedTransport;
-
-function makeProtocol($transport, $PROTO)
-{
-  if ($PROTO == 'binary') {
-    return new TBinaryProtocol($transport);
-  } else if ($PROTO == 'compact') {
-    return new TCompactProtocol($transport);
-  } else if ($PROTO == 'json') {
-    return new TJSONProtocol($transport);
-  } else if ($PROTO == 'accel') {
-    if (!function_exists('thrift_protocol_write_binary')) {
-      echo "Acceleration extension is not loaded\n";
-      exit(1);
-    }
-    return new TBinaryProtocolAccelerated($transport);
-  }
-
-  echo "--protocol must be one of {binary|compact|json|accel}\n";
-  exit(1);
-}
-
-$host = 'localhost';
-$port = 9090;
-
-if ($argc > 1) {
-  $host = $argv[0];
-}
-
-if ($argc > 2) {
-  $host = $argv[1];
-}
-
-foreach ($argv as $arg) {
-  if (substr($arg, 0, 7) == '--port=') {
-    $port = substr($arg, 7);
-  } else if (substr($arg, 0, 12) == '--transport=') {
-    $MODE = substr($arg, 12);
-  } else if (substr($arg, 0, 11) == '--protocol=') {
-    $PROTO = substr($arg, 11);
-  } 
-}
-
-$hosts = array('localhost');
-
-$socket = new TSocket($host, $port);
-$socket = new TSocketPool($hosts, $port);
-$socket->setDebug(TRUE);
-
-if ($MODE == 'inline') {
-  $transport = $socket;
-  $testClient = new \ThriftTest\ThriftTestClient($transport);
-} else if ($MODE == 'framed') {
-  $framedSocket = new TFramedTransport($socket);
-  $transport = $framedSocket;
-  $protocol = makeProtocol($transport, $PROTO);
-  $testClient = new \ThriftTest\ThriftTestClient($protocol);
-} else {
-  $bufferedSocket = new TBufferedTransport($socket, 1024, 1024);
-  $transport = $bufferedSocket;
-  $protocol = makeProtocol($transport, $PROTO);
-  $testClient = new \ThriftTest\ThriftTestClient($protocol);
-}
-
-$transport->open();
-
-$start = microtime(true);
-
-define('ERR_BASETYPES', 1);
-define('ERR_STRUCTS', 2);
-define('ERR_CONTAINERS', 4);
-define('ERR_EXCEPTIONS', 8);
-define('ERR_UNKNOWN', 64);
-$exitcode = 0;
-/**
- * VOID TEST
- */
-print_r("testVoid()");
-$testClient->testVoid();
-print_r(" = void\n");
-
-function roundtrip($testClient, $method, $value) {
-  global $exitcode;
-  print_r("$method($value)");
-  $ret = $testClient->$method($value);
-  print_r(" = \"$ret\"\n");
-  if ($value !== $ret) {
-    print_r("*** FAILED ***\n");
-    $exitcode |= ERR_BASETYPES;
-  }
-}
-
-/**
- * STRING TEST
- */
-roundtrip($testClient, 'testString', "Test");
-
-/**
- * BOOL TEST
- */
-roundtrip($testClient, 'testBool', true);
-roundtrip($testClient, 'testBool', false);
-
-/**
- * BYTE TEST
- */
-roundtrip($testClient, 'testByte', 1);
-roundtrip($testClient, 'testByte', -1);
-roundtrip($testClient, 'testByte', 127);
-roundtrip($testClient, 'testByte', -128);
-
-/**
- * I32 TEST
- */
-roundtrip($testClient, 'testI32', -1);
-
-/**
- * I64 TEST
- */
-roundtrip($testClient, 'testI64', 0);
-roundtrip($testClient, 'testI64', 1);
-roundtrip($testClient, 'testI64', -1);
-roundtrip($testClient, 'testI64', -34359738368);
-
-/**
- * DOUBLE TEST
- */
-roundtrip($testClient, 'testDouble', -852.234234234);
-
-/**
- * BINARY TEST  --  TODO
- */
-
-/**
- * STRUCT TEST
- */
-print_r("testStruct({\"Zero\", 1, -3, -5})");
-$out = new \ThriftTest\Xtruct();
-$out->string_thing = "Zero";
-$out->byte_thing = 1;
-$out->i32_thing = -3;
-$out->i64_thing = -5;
-$in = $testClient->testStruct($out);
-print_r(" = {\"".$in->string_thing."\", ".
-        $in->byte_thing.", ".
-        $in->i32_thing.", ".
-        $in->i64_thing."}\n");
-
-if ($in != $out) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_STRUCTS;
-}
-
-/**
- * NESTED STRUCT TEST
- */
-print_r("testNest({1, {\"Zero\", 1, -3, -5}), 5}");
-$out2 = new \ThriftTest\Xtruct2();
-$out2->byte_thing = 1;
-$out2->struct_thing = $out;
-$out2->i32_thing = 5;
-$in2 = $testClient->testNest($out2);
-$in = $in2->struct_thing;
-print_r(" = {".$in2->byte_thing.", {\"".
-        $in->string_thing."\", ".
-        $in->byte_thing.", ".
-        $in->i32_thing.", ".
-        $in->i64_thing."}, ".
-        $in2->i32_thing."}\n");
-
-if ($in2 != $out2) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_STRUCTS;
-}
-
-/**
- * MAP TEST
- */
-$mapout = array();
-for ($i = 0; $i < 5; ++$i) {
-  $mapout[$i] = $i-10;
-}
-print_r("testMap({");
-$first = true;
-foreach ($mapout as $key => $val) {
-  if ($first) {
-    $first = false;
-  } else {
-    print_r(", ");
-  }
-  print_r("$key => $val");
-}
-print_r("})");
-
-$mapin = $testClient->testMap($mapout);
-print_r(" = {");
-$first = true;
-foreach ($mapin as $key => $val) {
-  if ($first) {
-    $first = false;
-  } else {
-    print_r(", ");
-  }
-  print_r("$key => $val");
-}
-print_r("}\n");
-
-if ($mapin != $mapout) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_CONTAINERS;
-}
-
-/**
- * SET TEST
- */
-$setout = array();;
-for ($i = -2; $i < 3; ++$i) {
-  $setout[$i]= true;
-}
-print_r("testSet({");
-echo implode(',', array_keys($setout));
-print_r("})");
-$setin = $testClient->testSet($setout);
-print_r(" = {");
-echo implode(', ', array_keys($setin));
-print_r("}\n");
-// Order of keys in set does not matter
-ksort($setin);
-if ($setout !== $setin) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_CONTAINERS;
-}
-// Regression test for corrupted array
-if ($setin[2] !== $setout[2] || is_int($setin[2])) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_CONTAINERS;
-}
-
-/**
- * LIST TEST
- */
-$listout = array();
-for ($i = -2; $i < 3; ++$i) {
-  $listout []= $i;
-}
-print_r("testList({");
-$first = true;
-foreach ($listout as $val) {
-  if ($first) {
-    $first = false;
-  } else {
-    print_r(", ");
-  }
-  print_r($val);
-}
-print_r("})");
-$listin = $testClient->testList($listout);
-print_r(" = {");
-$first = true;
-foreach ($listin as $val) {
-  if ($first) {
-    $first = false;
-  } else {
-    print_r(", ");
-  }
-  print_r($val);
-}
-print_r("}\n");
-if ($listin !== $listout) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_CONTAINERS;
-}
-
-/**
- * ENUM TEST
- */
-print_r("testEnum(ONE)");
-$ret = $testClient->testEnum(\ThriftTest\Numberz::ONE);
-print_r(" = $ret\n");
-if ($ret != \ThriftTest\Numberz::ONE) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_STRUCTS;
-}
-
-print_r("testEnum(TWO)");
-$ret = $testClient->testEnum(\ThriftTest\Numberz::TWO);
-print_r(" = $ret\n");
-if ($ret != \ThriftTest\Numberz::TWO) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_STRUCTS;
-}
-
-print_r("testEnum(THREE)");
-$ret = $testClient->testEnum(\ThriftTest\Numberz::THREE);
-print_r(" = $ret\n");
-if ($ret != \ThriftTest\Numberz::THREE) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_STRUCTS;
-}
-
-print_r("testEnum(FIVE)");
-$ret = $testClient->testEnum(\ThriftTest\Numberz::FIVE);
-print_r(" = $ret\n");
-if ($ret != \ThriftTest\Numberz::FIVE) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_STRUCTS;
-}
-
-print_r("testEnum(EIGHT)");
-$ret = $testClient->testEnum(\ThriftTest\Numberz::EIGHT);
-print_r(" = $ret\n");
-if ($ret != \ThriftTest\Numberz::EIGHT) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_STRUCTS;
-}
-
-/**
- * TYPEDEF TEST
- */
-print_r("testTypedef(309858235082523)");
-$uid = $testClient->testTypedef(309858235082523);
-print_r(" = $uid\n");
-if ($uid !== 309858235082523) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_STRUCTS;
-}
-
-/**
- * NESTED MAP TEST
- */
-print_r("testMapMap(1)");
-$mm = $testClient->testMapMap(1);
-print_r(" = {");
-foreach ($mm as $key => $val) {
-  print_r("$key => {");
-  foreach ($val as $k2 => $v2) {
-    print_r("$k2 => $v2, ");
-  }
-  print_r("}, ");
-}
-print_r("}\n");
-$expected_mm = [
-  -4 => [-4 => -4, -3 => -3, -2 => -2, -1 => -1],
-  4 => [4 => 4, 3 => 3, 2 => 2, 1 => 1],
-];
-if ($mm != $expected_mm) {
-    echo "**FAILED**\n";
-    $exitcode |= ERR_CONTAINERS;
-}
-
-/**
- * INSANITY TEST
- */
-$insane = new \ThriftTest\Insanity();
-$insane->userMap[\ThriftTest\Numberz::FIVE] = 5000;
-$truck = new \ThriftTest\Xtruct();
-$truck->string_thing = "Truck";
-$truck->byte_thing = 8;
-$truck->i32_thing = 8;
-$truck->i64_thing = 8;
-$insane->xtructs []= $truck;
-print_r("testInsanity()");
-$whoa = $testClient->testInsanity($insane);
-print_r(" = {");
-foreach ($whoa as $key => $val) {
-  print_r("$key => {");
-  foreach ($val as $k2 => $v2) {
-    print_r("$k2 => {");
-    $userMap = $v2->userMap;
-    print_r("{");
-    if (is_array($userMap)) {
-      foreach ($userMap as $k3 => $v3) {
-        print_r("$k3 => $v3, ");
-      }
-    }
-    print_r("}, ");
-
-    $xtructs = $v2->xtructs;
-    print_r("{");
-    if (is_array($xtructs)) {
-      foreach ($xtructs as $x) {
-        print_r("{\"".$x->string_thing."\", ".
-                $x->byte_thing.", ".$x->i32_thing.", ".$x->i64_thing."}, ");
-      }
-    }
-    print_r("}");
-
-    print_r("}, ");
-  }
-  print_r("}, ");
-}
-print_r("}\n");
-
-/**
- * EXCEPTION TEST
- */
-print_r("testException('Xception')");
-try {
-  $testClient->testException('Xception');
-  print_r("  void\nFAILURE\n");
-  $exitcode |= ERR_EXCEPTIONS;
-} catch (\ThriftTest\Xception $x) {
-  print_r(' caught xception '.$x->errorCode.': '.$x->message."\n");
-}
-
-
-/**
- * Normal tests done.
- */
-
-$stop = microtime(true);
-$elp = round(1000*($stop - $start), 0);
-print_r("Total time: $elp ms\n");
-
-/**
- * Extraneous "I don't trust PHP to pack/unpack integer" tests
- */
-
-// Max I32
-$num = pow(2, 30) + (pow(2, 30) - 1);
-roundtrip($testClient, 'testI32', $num);
-
-// Min I32
-$num = 0 - pow(2, 31);
-roundtrip($testClient, 'testI32', $num);
-
-// Max I64
-$num = pow(2, 62) + (pow(2, 62) - 1);
-roundtrip($testClient, 'testI64', $num);
-
-// Min I64
-$num = 0 - pow(2, 62) - pow(2, 62);
-roundtrip($testClient, 'testI64', $num);
-
-$transport->close();
-exit($exitcode);
diff --git a/vendor/git.apache.org/thrift.git/test/php/TestInline.php b/vendor/git.apache.org/thrift.git/test/php/TestInline.php
deleted file mode 100644
index 7066c46..0000000
--- a/vendor/git.apache.org/thrift.git/test/php/TestInline.php
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-<?php
-$GEN_DIR = 'gen-phpi';
-$MODE = 'inline';
-include_once('TestClient.php');
-?>
diff --git a/vendor/git.apache.org/thrift.git/test/php/TestPsr4.php b/vendor/git.apache.org/thrift.git/test/php/TestPsr4.php
deleted file mode 100644
index d30bf1c..0000000
--- a/vendor/git.apache.org/thrift.git/test/php/TestPsr4.php
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-<?php
-$GEN_DIR = 'gen-php-psr4';
-include_once('TestClient.php');
-?>
diff --git a/vendor/git.apache.org/thrift.git/test/py.tornado/Makefile.am b/vendor/git.apache.org/thrift.git/test/py.tornado/Makefile.am
deleted file mode 100644
index a8e680a..0000000
--- a/vendor/git.apache.org/thrift.git/test/py.tornado/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_srcdir)/compiler/cpp/thrift
-
-thrift_gen: ../ThriftTest.thrift ../SmallTest.thrift
-	$(THRIFT) --gen py:tornado ../ThriftTest.thrift
-	$(THRIFT) --gen py:tornado ../SmallTest.thrift
-
-check: thrift_gen
-	./test_suite.py
-
-clean-local:
-	$(RM) -r gen-py.tornado
diff --git a/vendor/git.apache.org/thrift.git/test/py.tornado/setup.cfg b/vendor/git.apache.org/thrift.git/test/py.tornado/setup.cfg
deleted file mode 100644
index ae587c4..0000000
--- a/vendor/git.apache.org/thrift.git/test/py.tornado/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[flake8]
-ignore = E402
-max-line-length = 100
diff --git a/vendor/git.apache.org/thrift.git/test/py.tornado/test_suite.py b/vendor/git.apache.org/thrift.git/test/py.tornado/test_suite.py
deleted file mode 100755
index 32d1c2e..0000000
--- a/vendor/git.apache.org/thrift.git/test/py.tornado/test_suite.py
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import datetime
-import glob
-import sys
-import os
-import time
-import unittest
-
-basepath = os.path.abspath(os.path.dirname(__file__))
-sys.path.insert(0, basepath + '/gen-py.tornado')
-sys.path.insert(0, glob.glob(os.path.join(basepath, '../../lib/py/build/lib*'))[0])
-
-try:
-    __import__('tornado')
-except ImportError:
-    print("module `tornado` not found, skipping test")
-    sys.exit(0)
-
-from tornado import gen
-from tornado.testing import AsyncTestCase, get_unused_port, gen_test
-
-from thrift import TTornado
-from thrift.protocol import TBinaryProtocol
-from thrift.transport.TTransport import TTransportException
-
-from ThriftTest import ThriftTest
-from ThriftTest.ttypes import Xception, Xtruct
-
-
-class TestHandler(object):
-    def __init__(self, test_instance):
-        self.test_instance = test_instance
-
-    def testVoid(self):
-        pass
-
-    def testString(self, s):
-        return s
-
-    def testByte(self, b):
-        return b
-
-    def testI16(self, i16):
-        return i16
-
-    def testI32(self, i32):
-        return i32
-
-    def testI64(self, i64):
-        return i64
-
-    def testDouble(self, dub):
-        return dub
-
-    def testBinary(self, thing):
-        return thing
-
-    def testStruct(self, thing):
-        return thing
-
-    def testException(self, s):
-        if s == 'Xception':
-            x = Xception()
-            x.errorCode = 1001
-            x.message = s
-            raise x
-        elif s == 'throw_undeclared':
-            raise ValueError("foo")
-
-    def testOneway(self, seconds):
-        start = time.time()
-
-        def fire_oneway():
-            end = time.time()
-            self.test_instance.stop((start, end, seconds))
-
-        self.test_instance.io_loop.add_timeout(
-            datetime.timedelta(seconds=seconds),
-            fire_oneway)
-
-    def testNest(self, thing):
-        return thing
-
-    @gen.coroutine
-    def testMap(self, thing):
-        yield gen.moment
-        raise gen.Return(thing)
-
-    def testSet(self, thing):
-        return thing
-
-    def testList(self, thing):
-        return thing
-
-    def testEnum(self, thing):
-        return thing
-
-    def testTypedef(self, thing):
-        return thing
-
-
-class ThriftTestCase(AsyncTestCase):
-    def setUp(self):
-        super(ThriftTestCase, self).setUp()
-
-        self.port = get_unused_port()
-
-        # server
-        self.handler = TestHandler(self)
-        self.processor = ThriftTest.Processor(self.handler)
-        self.pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-
-        self.server = TTornado.TTornadoServer(self.processor, self.pfactory, io_loop=self.io_loop)
-        self.server.bind(self.port)
-        self.server.start(1)
-
-        # client
-        transport = TTornado.TTornadoStreamTransport('localhost', self.port, io_loop=self.io_loop)
-        pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-        self.io_loop.run_sync(transport.open)
-        self.client = ThriftTest.Client(transport, pfactory)
-
-    @gen_test
-    def test_void(self):
-        v = yield self.client.testVoid()
-        self.assertEqual(v, None)
-
-    @gen_test
-    def test_string(self):
-        v = yield self.client.testString('Python')
-        self.assertEqual(v, 'Python')
-
-    @gen_test
-    def test_byte(self):
-        v = yield self.client.testByte(63)
-        self.assertEqual(v, 63)
-
-    @gen_test
-    def test_i32(self):
-        v = yield self.client.testI32(-1)
-        self.assertEqual(v, -1)
-
-        v = yield self.client.testI32(0)
-        self.assertEqual(v, 0)
-
-    @gen_test
-    def test_i64(self):
-        v = yield self.client.testI64(-34359738368)
-        self.assertEqual(v, -34359738368)
-
-    @gen_test
-    def test_double(self):
-        v = yield self.client.testDouble(-5.235098235)
-        self.assertEqual(v, -5.235098235)
-
-    @gen_test
-    def test_struct(self):
-        x = Xtruct()
-        x.string_thing = "Zero"
-        x.byte_thing = 1
-        x.i32_thing = -3
-        x.i64_thing = -5
-        y = yield self.client.testStruct(x)
-
-        self.assertEqual(y.string_thing, "Zero")
-        self.assertEqual(y.byte_thing, 1)
-        self.assertEqual(y.i32_thing, -3)
-        self.assertEqual(y.i64_thing, -5)
-
-    def test_oneway(self):
-        self.client.testOneway(0)
-        start, end, seconds = self.wait(timeout=1)
-        self.assertAlmostEqual(seconds, (end - start), places=3)
-
-    @gen_test
-    def test_map(self):
-        """
-        TestHandler.testMap is a coroutine, this test checks if gen.Return() from a coroutine works.
-        """
-        expected = {1: 1}
-        res = yield self.client.testMap(expected)
-        self.assertEqual(res, expected)
-
-    @gen_test
-    def test_exception(self):
-        yield self.client.testException('Safe')
-
-        try:
-            yield self.client.testException('Xception')
-        except Xception as ex:
-            self.assertEqual(ex.errorCode, 1001)
-            self.assertEqual(ex.message, 'Xception')
-        else:
-            self.fail("should have gotten exception")
-        try:
-            yield self.client.testException('throw_undeclared')
-        except TTransportException as ex:
-            pass
-        else:
-            self.fail("should have gotten exception")
-
-
-def suite():
-    suite = unittest.TestSuite()
-    loader = unittest.TestLoader()
-    suite.addTest(loader.loadTestsFromTestCase(ThriftTestCase))
-    return suite
-
-
-if __name__ == '__main__':
-    unittest.TestProgram(defaultTest='suite',
-                         testRunner=unittest.TextTestRunner(verbosity=1))
diff --git a/vendor/git.apache.org/thrift.git/test/py.twisted/Makefile.am b/vendor/git.apache.org/thrift.git/test/py.twisted/Makefile.am
deleted file mode 100644
index 78cde22..0000000
--- a/vendor/git.apache.org/thrift.git/test/py.twisted/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-TRIAL ?= trial
-
-stubs: ../ThriftTest.thrift ../SmallTest.thrift
-	$(THRIFT) --gen py:twisted ../ThriftTest.thrift
-	$(THRIFT) --gen py:twisted ../SmallTest.thrift
-
-check: stubs
-	$(TRIAL) ./test_suite.py
-
-clean-local:
-	$(RM) -r gen-py.twisted
diff --git a/vendor/git.apache.org/thrift.git/test/py.twisted/setup.cfg b/vendor/git.apache.org/thrift.git/test/py.twisted/setup.cfg
deleted file mode 100644
index ae587c4..0000000
--- a/vendor/git.apache.org/thrift.git/test/py.twisted/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[flake8]
-ignore = E402
-max-line-length = 100
diff --git a/vendor/git.apache.org/thrift.git/test/py.twisted/test_suite.py b/vendor/git.apache.org/thrift.git/test/py.twisted/test_suite.py
deleted file mode 100755
index 43149a4..0000000
--- a/vendor/git.apache.org/thrift.git/test/py.twisted/test_suite.py
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-import os
-import glob
-import time
-basepath = os.path.abspath(os.path.dirname(__file__))
-sys.path.insert(0, os.path.join(basepath, 'gen-py.twisted'))
-sys.path.insert(0, glob.glob(os.path.join(basepath, '../../lib/py/build/lib.*'))[0])
-
-from ThriftTest import ThriftTest
-from ThriftTest.ttypes import Xception, Xtruct
-from thrift.transport import TTwisted
-from thrift.protocol import TBinaryProtocol
-
-from twisted.trial import unittest
-from twisted.internet import defer, reactor
-from twisted.internet.protocol import ClientCreator
-
-from zope.interface import implements
-
-
-class TestHandler:
-    implements(ThriftTest.Iface)
-
-    def __init__(self):
-        self.onewaysQueue = defer.DeferredQueue()
-
-    def testVoid(self):
-        pass
-
-    def testString(self, s):
-        return s
-
-    def testByte(self, b):
-        return b
-
-    def testI16(self, i16):
-        return i16
-
-    def testI32(self, i32):
-        return i32
-
-    def testI64(self, i64):
-        return i64
-
-    def testDouble(self, dub):
-        return dub
-
-    def testBinary(self, thing):
-        return thing
-
-    def testStruct(self, thing):
-        return thing
-
-    def testException(self, s):
-        if s == 'Xception':
-            x = Xception()
-            x.errorCode = 1001
-            x.message = s
-            raise x
-        elif s == "throw_undeclared":
-            raise ValueError("foo")
-
-    def testOneway(self, seconds):
-        def fireOneway(t):
-            self.onewaysQueue.put((t, time.time(), seconds))
-        reactor.callLater(seconds, fireOneway, time.time())
-
-    def testNest(self, thing):
-        return thing
-
-    def testMap(self, thing):
-        return thing
-
-    def testSet(self, thing):
-        return thing
-
-    def testList(self, thing):
-        return thing
-
-    def testEnum(self, thing):
-        return thing
-
-    def testTypedef(self, thing):
-        return thing
-
-
-class ThriftTestCase(unittest.TestCase):
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        self.handler = TestHandler()
-        self.processor = ThriftTest.Processor(self.handler)
-        self.pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-
-        self.server = reactor.listenTCP(
-            0, TTwisted.ThriftServerFactory(self.processor, self.pfactory), interface="127.0.0.1")
-
-        self.portNo = self.server.getHost().port
-
-        self.txclient = yield ClientCreator(reactor,
-                                            TTwisted.ThriftClientProtocol,
-                                            ThriftTest.Client,
-                                            self.pfactory).connectTCP("127.0.0.1", self.portNo)
-        self.client = self.txclient.client
-
-    @defer.inlineCallbacks
-    def tearDown(self):
-        yield self.server.stopListening()
-        self.txclient.transport.loseConnection()
-
-    @defer.inlineCallbacks
-    def testVoid(self):
-        self.assertEquals((yield self.client.testVoid()), None)
-
-    @defer.inlineCallbacks
-    def testString(self):
-        self.assertEquals((yield self.client.testString('Python')), 'Python')
-
-    @defer.inlineCallbacks
-    def testByte(self):
-        self.assertEquals((yield self.client.testByte(63)), 63)
-
-    @defer.inlineCallbacks
-    def testI32(self):
-        self.assertEquals((yield self.client.testI32(-1)), -1)
-        self.assertEquals((yield self.client.testI32(0)), 0)
-
-    @defer.inlineCallbacks
-    def testI64(self):
-        self.assertEquals((yield self.client.testI64(-34359738368)), -34359738368)
-
-    @defer.inlineCallbacks
-    def testDouble(self):
-        self.assertEquals((yield self.client.testDouble(-5.235098235)), -5.235098235)
-
-    # TODO: def testBinary(self) ...
-
-    @defer.inlineCallbacks
-    def testStruct(self):
-        x = Xtruct()
-        x.string_thing = "Zero"
-        x.byte_thing = 1
-        x.i32_thing = -3
-        x.i64_thing = -5
-        y = yield self.client.testStruct(x)
-
-        self.assertEquals(y.string_thing, "Zero")
-        self.assertEquals(y.byte_thing, 1)
-        self.assertEquals(y.i32_thing, -3)
-        self.assertEquals(y.i64_thing, -5)
-
-    @defer.inlineCallbacks
-    def testException(self):
-        yield self.client.testException('Safe')
-        try:
-            yield self.client.testException('Xception')
-            self.fail("should have gotten exception")
-        except Xception as x:
-            self.assertEquals(x.errorCode, 1001)
-            self.assertEquals(x.message, 'Xception')
-
-        try:
-            yield self.client.testException("throw_undeclared")
-            self.fail("should have thrown exception")
-        except Exception:  # type is undefined
-            pass
-
-    @defer.inlineCallbacks
-    def testOneway(self):
-        yield self.client.testOneway(1)
-        start, end, seconds = yield self.handler.onewaysQueue.get()
-        self.assertAlmostEquals(seconds, (end - start), places=1)
diff --git a/vendor/git.apache.org/thrift.git/test/py/CMakeLists.txt b/vendor/git.apache.org/thrift.git/test/py/CMakeLists.txt
deleted file mode 100644
index fbc2217..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-add_test(NAME python_test_generate
-    COMMAND ${CMAKE_COMMAND}
-            -DTHRIFTCOMPILER=$<TARGET_FILE:thrift-compiler>
-            -DMY_PROJECT_DIR=${PROJECT_SOURCE_DIR}
-            -DMY_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-            -DMY_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/generate.cmake
-)
-
-add_test(NAME python_test
-    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/RunClientServer.py --gen-base=${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS python_test_generate
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
diff --git a/vendor/git.apache.org/thrift.git/test/py/FastbinaryTest.py b/vendor/git.apache.org/thrift.git/test/py/FastbinaryTest.py
deleted file mode 100755
index db3ef8b..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/FastbinaryTest.py
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-r"""
-PYTHONPATH=./gen-py:../../lib/py/build/lib... ./FastbinaryTest.py
-"""
-
-# TODO(dreiss): Test error cases.  Check for memory leaks.
-
-from __future__ import print_function
-
-import math
-import os
-import sys
-import timeit
-
-from copy import deepcopy
-from pprint import pprint
-
-from thrift.transport import TTransport
-from thrift.protocol.TBinaryProtocol import TBinaryProtocol, TBinaryProtocolAccelerated
-from thrift.protocol.TCompactProtocol import TCompactProtocol, TCompactProtocolAccelerated
-
-from DebugProtoTest import Srv
-from DebugProtoTest.ttypes import Backwards, Bonk, Empty, HolyMoley, OneOfEach, RandomStuff, Wrapper
-
-
-class TDevNullTransport(TTransport.TTransportBase):
-    def __init__(self):
-        pass
-
-    def isOpen(self):
-        return True
-
-ooe1 = OneOfEach()
-ooe1.im_true = True
-ooe1.im_false = False
-ooe1.a_bite = 0xd6
-ooe1.integer16 = 27000
-ooe1.integer32 = 1 << 24
-ooe1.integer64 = 6000 * 1000 * 1000
-ooe1.double_precision = math.pi
-ooe1.some_characters = "Debug THIS!"
-ooe1.zomg_unicode = u"\xd7\n\a\t"
-
-ooe2 = OneOfEach()
-ooe2.integer16 = 16
-ooe2.integer32 = 32
-ooe2.integer64 = 64
-ooe2.double_precision = (math.sqrt(5) + 1) / 2
-ooe2.some_characters = ":R (me going \"rrrr\")"
-ooe2.zomg_unicode = u"\xd3\x80\xe2\x85\xae\xce\x9d\x20"\
-                    u"\xd0\x9d\xce\xbf\xe2\x85\xbf\xd0\xbe"\
-                    u"\xc9\xa1\xd0\xb3\xd0\xb0\xcf\x81\xe2\x84\x8e"\
-                    u"\x20\xce\x91\x74\x74\xce\xb1\xe2\x85\xbd\xce\xba"\
-                    u"\xc7\x83\xe2\x80\xbc"
-
-if sys.version_info[0] == 2 and os.environ.get('THRIFT_TEST_PY_NO_UTF8STRINGS'):
-    ooe1.zomg_unicode = ooe1.zomg_unicode.encode('utf8')
-    ooe2.zomg_unicode = ooe2.zomg_unicode.encode('utf8')
-
-hm = HolyMoley(**{"big": [], "contain": set(), "bonks": {}})
-hm.big.append(ooe1)
-hm.big.append(ooe2)
-hm.big[0].a_bite = 0x22
-hm.big[1].a_bite = 0x22
-
-hm.contain.add(("and a one", "and a two"))
-hm.contain.add(("then a one, two", "three!", "FOUR!"))
-hm.contain.add(())
-
-hm.bonks["nothing"] = []
-hm.bonks["something"] = [
-    Bonk(**{"type": 1, "message": "Wait."}),
-    Bonk(**{"type": 2, "message": "What?"}),
-]
-hm.bonks["poe"] = [
-    Bonk(**{"type": 3, "message": "quoth"}),
-    Bonk(**{"type": 4, "message": "the raven"}),
-    Bonk(**{"type": 5, "message": "nevermore"}),
-]
-
-rs = RandomStuff()
-rs.a = 1
-rs.b = 2
-rs.c = 3
-rs.myintlist = list(range(20))
-rs.maps = {1: Wrapper(**{"foo": Empty()}), 2: Wrapper(**{"foo": Empty()})}
-rs.bigint = 124523452435
-rs.triple = 3.14
-
-# make sure this splits two buffers in a buffered protocol
-rshuge = RandomStuff()
-rshuge.myintlist = list(range(10000))
-
-my_zero = Srv.Janky_result(**{"success": 5})
-
-
-class Test(object):
-    def __init__(self, fast, slow):
-        self._fast = fast
-        self._slow = slow
-
-    def _check_write(self, o):
-        trans_fast = TTransport.TMemoryBuffer()
-        trans_slow = TTransport.TMemoryBuffer()
-        prot_fast = self._fast(trans_fast, fallback=False)
-        prot_slow = self._slow(trans_slow)
-
-        o.write(prot_fast)
-        o.write(prot_slow)
-        ORIG = trans_slow.getvalue()
-        MINE = trans_fast.getvalue()
-        if ORIG != MINE:
-            print("actual  : %s\nexpected: %s" % (repr(MINE), repr(ORIG)))
-            raise Exception('write value mismatch')
-
-    def _check_read(self, o):
-        prot = self._slow(TTransport.TMemoryBuffer())
-        o.write(prot)
-
-        slow_version_binary = prot.trans.getvalue()
-
-        prot = self._fast(
-            TTransport.TMemoryBuffer(slow_version_binary), fallback=False)
-        c = o.__class__()
-        c.read(prot)
-        if c != o:
-            print("actual  : ")
-            pprint(repr(c))
-            print("expected: ")
-            pprint(repr(o))
-            raise Exception('read value mismatch')
-
-        prot = self._fast(
-            TTransport.TBufferedTransport(
-                TTransport.TMemoryBuffer(slow_version_binary)), fallback=False)
-        c = o.__class__()
-        c.read(prot)
-        if c != o:
-            print("actual  : ")
-            pprint(repr(c))
-            print("expected: ")
-            pprint(repr(o))
-            raise Exception('read value mismatch')
-
-    def do_test(self):
-        self._check_write(HolyMoley())
-        self._check_read(HolyMoley())
-
-        self._check_write(hm)
-        no_set = deepcopy(hm)
-        no_set.contain = set()
-        self._check_read(no_set)
-        self._check_read(hm)
-
-        self._check_write(rs)
-        self._check_read(rs)
-
-        self._check_write(rshuge)
-        self._check_read(rshuge)
-
-        self._check_write(my_zero)
-        self._check_read(my_zero)
-
-        self._check_read(Backwards(**{"first_tag2": 4, "second_tag1": 2}))
-
-        # One case where the serialized form changes, but only superficially.
-        o = Backwards(**{"first_tag2": 4, "second_tag1": 2})
-        trans_fast = TTransport.TMemoryBuffer()
-        trans_slow = TTransport.TMemoryBuffer()
-        prot_fast = self._fast(trans_fast, fallback=False)
-        prot_slow = self._slow(trans_slow)
-
-        o.write(prot_fast)
-        o.write(prot_slow)
-        ORIG = trans_slow.getvalue()
-        MINE = trans_fast.getvalue()
-        assert id(ORIG) != id(MINE)
-
-        prot = self._fast(TTransport.TMemoryBuffer(), fallback=False)
-        o.write(prot)
-        prot = self._slow(
-            TTransport.TMemoryBuffer(prot.trans.getvalue()))
-        c = o.__class__()
-        c.read(prot)
-        if c != o:
-            print("copy: ")
-            pprint(repr(c))
-            print("orig: ")
-            pprint(repr(o))
-
-
-def do_test(fast, slow):
-    Test(fast, slow).do_test()
-
-
-def do_benchmark(protocol, iters=5000, skip_slow=False):
-    setup = """
-from __main__ import hm, rs, TDevNullTransport
-from thrift.protocol.{0} import {0}{1}
-trans = TDevNullTransport()
-prot = {0}{1}(trans{2})
-"""
-
-    setup_fast = setup.format(protocol, 'Accelerated', ', fallback=False')
-    if not skip_slow:
-        setup_slow = setup.format(protocol, '', '')
-
-    print("Starting Benchmarks")
-
-    if not skip_slow:
-        print("HolyMoley Standard = %f" %
-              timeit.Timer('hm.write(prot)', setup_slow).timeit(number=iters))
-
-    print("HolyMoley Acceler. = %f" %
-          timeit.Timer('hm.write(prot)', setup_fast).timeit(number=iters))
-
-    if not skip_slow:
-        print("FastStruct Standard = %f" %
-              timeit.Timer('rs.write(prot)', setup_slow).timeit(number=iters))
-
-    print("FastStruct Acceler. = %f" %
-          timeit.Timer('rs.write(prot)', setup_fast).timeit(number=iters))
-
-
-if __name__ == '__main__':
-    print('Testing TBinaryAccelerated')
-    do_test(TBinaryProtocolAccelerated, TBinaryProtocol)
-    do_benchmark('TBinaryProtocol')
-    print('Testing TCompactAccelerated')
-    do_test(TCompactProtocolAccelerated, TCompactProtocol)
-    do_benchmark('TCompactProtocol')
diff --git a/vendor/git.apache.org/thrift.git/test/py/Makefile.am b/vendor/git.apache.org/thrift.git/test/py/Makefile.am
deleted file mode 100644
index f105737..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = serial-tests
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-py_unit_tests = RunClientServer.py
-
-thrift_gen =                                    \
-        gen-py/ThriftTest/__init__.py           \
-        gen-py/DebugProtoTest/__init__.py \
-        gen-py-default/ThriftTest/__init__.py           \
-        gen-py-default/DebugProtoTest/__init__.py \
-        gen-py-slots/ThriftTest/__init__.py           \
-        gen-py-slots/DebugProtoTest/__init__.py \
-        gen-py-oldstyle/ThriftTest/__init__.py \
-        gen-py-oldstyle/DebugProtoTest/__init__.py \
-        gen-py-no_utf8strings/ThriftTest/__init__.py \
-        gen-py-no_utf8strings/DebugProtoTest/__init__.py \
-        gen-py-dynamic/ThriftTest/__init__.py           \
-        gen-py-dynamic/DebugProtoTest/__init__.py \
-        gen-py-dynamicslots/ThriftTest/__init__.py           \
-        gen-py-dynamicslots/DebugProtoTest/__init__.py
-
-precross: $(thrift_gen)
-BUILT_SOURCES = $(thrift_gen)
-
-helper_scripts=                                 \
-        TestClient.py                           \
-        TestServer.py
-
-check_SCRIPTS=                                  \
-        $(thrift_gen) \
-        $(py_unit_tests)                        \
-        $(helper_scripts)
-
-TESTS= $(py_unit_tests)
-
-
-gen-py/%/__init__.py: ../%.thrift $(THRIFT)
-	$(THRIFT) --gen py  $<
-
-gen-py-default/%/__init__.py: ../%.thrift $(THRIFT)
-	test -d gen-py-default || $(MKDIR_P) gen-py-default
-	$(THRIFT) --gen py -out gen-py-default $<
-
-gen-py-slots/%/__init__.py: ../%.thrift $(THRIFT)
-	test -d gen-py-slots || $(MKDIR_P) gen-py-slots
-	$(THRIFT) --gen py:slots -out gen-py-slots $<
-
-gen-py-oldstyle/%/__init__.py: ../%.thrift $(THRIFT)
-	test -d gen-py-oldstyle || $(MKDIR_P) gen-py-oldstyle
-	$(THRIFT) --gen py:old_style -out gen-py-oldstyle $<
-
-gen-py-no_utf8strings/%/__init__.py: ../%.thrift $(THRIFT)
-	test -d gen-py-no_utf8strings || $(MKDIR_P) gen-py-no_utf8strings
-	$(THRIFT) --gen py:no_utf8strings -out gen-py-no_utf8strings $<
-
-gen-py-dynamic/%/__init__.py: ../%.thrift $(THRIFT)
-	test -d gen-py-dynamic || $(MKDIR_P) gen-py-dynamic
-	$(THRIFT) --gen py:dynamic -out gen-py-dynamic $<
-
-gen-py-dynamicslots/%/__init__.py: ../%.thrift $(THRIFT)
-	test -d gen-py-dynamicslots || $(MKDIR_P) gen-py-dynamicslots
-	$(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $<
-
-clean-local:
-	$(RM) -r gen-py gen-py-slots gen-py-default gen-py-oldstyle gen-py-no_utf8strings gen-py-dynamic gen-py-dynamicslots
diff --git a/vendor/git.apache.org/thrift.git/test/py/RunClientServer.py b/vendor/git.apache.org/thrift.git/test/py/RunClientServer.py
deleted file mode 100755
index c1443ec..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/RunClientServer.py
+++ /dev/null
@@ -1,321 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from __future__ import division
-from __future__ import print_function
-import platform
-import copy
-import os
-import signal
-import socket
-import subprocess
-import sys
-import time
-from optparse import OptionParser
-
-from util import local_libpath
-
-SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
-
-SCRIPTS = [
-    'FastbinaryTest.py',
-    'TestFrozen.py',
-    'TSimpleJSONProtocolTest.py',
-    'SerializationTest.py',
-    'TestEof.py',
-    'TestSyntax.py',
-    'TestSocket.py',
-]
-FRAMED = ["TNonblockingServer"]
-SKIP_ZLIB = ['TNonblockingServer', 'THttpServer']
-SKIP_SSL = ['TNonblockingServer', 'THttpServer']
-EXTRA_DELAY = dict(TProcessPoolServer=5.5)
-
-PROTOS = [
-    'accel',
-    'accelc',
-    'binary',
-    'compact',
-    'json',
-]
-
-
-def default_servers():
-    servers = [
-        'TSimpleServer',
-        'TThreadedServer',
-        'TThreadPoolServer',
-        'TNonblockingServer',
-        'THttpServer',
-    ]
-    if platform.system() != 'Windows':
-        servers.append('TProcessPoolServer')
-        servers.append('TForkingServer')
-    return servers
-
-
-def relfile(fname):
-    return os.path.join(SCRIPT_DIR, fname)
-
-
-def setup_pypath(libdir, gendir):
-    dirs = [libdir, gendir]
-    env = copy.deepcopy(os.environ)
-    pypath = env.get('PYTHONPATH', None)
-    if pypath:
-        dirs.append(pypath)
-    env['PYTHONPATH'] = os.pathsep.join(dirs)
-    if gendir.endswith('gen-py-no_utf8strings'):
-        env['THRIFT_TEST_PY_NO_UTF8STRINGS'] = '1'
-    return env
-
-
-def runScriptTest(libdir, genbase, genpydir, script):
-    env = setup_pypath(libdir, os.path.join(genbase, genpydir))
-    script_args = [sys.executable, relfile(script)]
-    print('\nTesting script: %s\n----' % (' '.join(script_args)))
-    ret = subprocess.call(script_args, env=env)
-    if ret != 0:
-        print('*** FAILED ***', file=sys.stderr)
-        print('LIBDIR: %s' % libdir, file=sys.stderr)
-        print('PY_GEN: %s' % genpydir, file=sys.stderr)
-        print('SCRIPT: %s' % script, file=sys.stderr)
-        raise Exception("Script subprocess failed, retcode=%d, args: %s" % (ret, ' '.join(script_args)))
-
-
-def runServiceTest(libdir, genbase, genpydir, server_class, proto, port, use_zlib, use_ssl, verbose):
-    env = setup_pypath(libdir, os.path.join(genbase, genpydir))
-    # Build command line arguments
-    server_args = [sys.executable, relfile('TestServer.py')]
-    cli_args = [sys.executable, relfile('TestClient.py')]
-    for which in (server_args, cli_args):
-        which.append('--protocol=%s' % proto)  # accel, binary, compact or json
-        which.append('--port=%d' % port)  # default to 9090
-        if use_zlib:
-            which.append('--zlib')
-        if use_ssl:
-            which.append('--ssl')
-        if verbose == 0:
-            which.append('-q')
-        if verbose == 2:
-            which.append('-v')
-    # server-specific option to select server class
-    server_args.append(server_class)
-    # client-specific cmdline options
-    if server_class in FRAMED:
-        cli_args.append('--transport=framed')
-    else:
-        cli_args.append('--transport=buffered')
-    if server_class == 'THttpServer':
-        cli_args.append('--http=/')
-    if verbose > 0:
-        print('Testing server %s: %s' % (server_class, ' '.join(server_args)))
-    serverproc = subprocess.Popen(server_args, env=env)
-
-    def ensureServerAlive():
-        if serverproc.poll() is not None:
-            print(('FAIL: Server process (%s) failed with retcode %d')
-                  % (' '.join(server_args), serverproc.returncode))
-            raise Exception('Server subprocess %s died, args: %s'
-                            % (server_class, ' '.join(server_args)))
-
-    # Wait for the server to start accepting connections on the given port.
-    sleep_time = 0.1  # Seconds
-    max_attempts = 100
-    attempt = 0
-    while True:
-        sock4 = socket.socket()
-        sock6 = socket.socket(socket.AF_INET6)
-        try:
-            if sock4.connect_ex(('127.0.0.1', port)) == 0 \
-                    or sock6.connect_ex(('::1', port)) == 0:
-                break
-            attempt += 1
-            if attempt >= max_attempts:
-                raise Exception("TestServer not ready on port %d after %.2f seconds"
-                                % (port, sleep_time * attempt))
-            ensureServerAlive()
-            time.sleep(sleep_time)
-        finally:
-            sock4.close()
-            sock6.close()
-
-    try:
-        if verbose > 0:
-            print('Testing client: %s' % (' '.join(cli_args)))
-        ret = subprocess.call(cli_args, env=env)
-        if ret != 0:
-            print('*** FAILED ***', file=sys.stderr)
-            print('LIBDIR: %s' % libdir, file=sys.stderr)
-            print('PY_GEN: %s' % genpydir, file=sys.stderr)
-            raise Exception("Client subprocess failed, retcode=%d, args: %s" % (ret, ' '.join(cli_args)))
-    finally:
-        # check that server didn't die
-        ensureServerAlive()
-        extra_sleep = EXTRA_DELAY.get(server_class, 0)
-        if extra_sleep > 0 and verbose > 0:
-            print('Giving %s (proto=%s,zlib=%s,ssl=%s) an extra %d seconds for child'
-                  'processes to terminate via alarm'
-                  % (server_class, proto, use_zlib, use_ssl, extra_sleep))
-            time.sleep(extra_sleep)
-        sig = signal.SIGKILL if platform.system() != 'Windows' else signal.SIGABRT
-        os.kill(serverproc.pid, sig)
-        serverproc.wait()
-
-
-class TestCases(object):
-    def __init__(self, genbase, libdir, port, gendirs, servers, verbose):
-        self.genbase = genbase
-        self.libdir = libdir
-        self.port = port
-        self.verbose = verbose
-        self.gendirs = gendirs
-        self.servers = servers
-
-    def default_conf(self):
-        return {
-            'gendir': self.gendirs[0],
-            'server': self.servers[0],
-            'proto': PROTOS[0],
-            'zlib': False,
-            'ssl': False,
-        }
-
-    def run(self, conf, test_count):
-        with_zlib = conf['zlib']
-        with_ssl = conf['ssl']
-        try_server = conf['server']
-        try_proto = conf['proto']
-        genpydir = conf['gendir']
-        # skip any servers that don't work with the Zlib transport
-        if with_zlib and try_server in SKIP_ZLIB:
-            return False
-        # skip any servers that don't work with SSL
-        if with_ssl and try_server in SKIP_SSL:
-            return False
-        if self.verbose > 0:
-            print('\nTest run #%d:  (includes %s) Server=%s,  Proto=%s,  zlib=%s,  SSL=%s'
-                  % (test_count, genpydir, try_server, try_proto, with_zlib, with_ssl))
-        runServiceTest(self.libdir, self.genbase, genpydir, try_server, try_proto, self.port, with_zlib, with_ssl, self.verbose)
-        if self.verbose > 0:
-            print('OK: Finished (includes %s)  %s / %s proto / zlib=%s / SSL=%s.   %d combinations tested.'
-                  % (genpydir, try_server, try_proto, with_zlib, with_ssl, test_count))
-        return True
-
-    def test_feature(self, name, values):
-        test_count = 0
-        conf = self.default_conf()
-        for try_server in values:
-            conf[name] = try_server
-            if self.run(conf, test_count):
-                test_count += 1
-        return test_count
-
-    def run_all_tests(self):
-        test_count = 0
-        for try_server in self.servers:
-            for genpydir in self.gendirs:
-                for try_proto in PROTOS:
-                    for with_zlib in (False, True):
-                        # skip any servers that don't work with the Zlib transport
-                        if with_zlib and try_server in SKIP_ZLIB:
-                            continue
-                        for with_ssl in (False, True):
-                            # skip any servers that don't work with SSL
-                            if with_ssl and try_server in SKIP_SSL:
-                                continue
-                            test_count += 1
-                            if self.verbose > 0:
-                                print('\nTest run #%d:  (includes %s) Server=%s,  Proto=%s,  zlib=%s,  SSL=%s'
-                                      % (test_count, genpydir, try_server, try_proto, with_zlib, with_ssl))
-                            runServiceTest(self.libdir, self.genbase, genpydir, try_server, try_proto, self.port, with_zlib, with_ssl)
-                            if self.verbose > 0:
-                                print('OK: Finished (includes %s)  %s / %s proto / zlib=%s / SSL=%s.   %d combinations tested.'
-                                      % (genpydir, try_server, try_proto, with_zlib, with_ssl, test_count))
-        return test_count
-
-
-def main():
-    parser = OptionParser()
-    parser.add_option('--all', action="store_true", dest='all')
-    parser.add_option('--genpydirs', type='string', dest='genpydirs',
-                      default='default,slots,oldstyle,no_utf8strings,dynamic,dynamicslots',
-                      help='directory extensions for generated code, used as suffixes for \"gen-py-*\" added sys.path for individual tests')
-    parser.add_option("--port", type="int", dest="port", default=9090,
-                      help="port number for server to listen on")
-    parser.add_option('-v', '--verbose', action="store_const",
-                      dest="verbose", const=2,
-                      help="verbose output")
-    parser.add_option('-q', '--quiet', action="store_const",
-                      dest="verbose", const=0,
-                      help="minimal output")
-    parser.add_option('-L', '--libdir', dest="libdir", default=local_libpath(),
-                      help="directory path that contains Thrift Python library")
-    parser.add_option('--gen-base', dest="gen_base", default=SCRIPT_DIR,
-                      help="directory path that contains Thrift Python library")
-    parser.set_defaults(verbose=1)
-    options, args = parser.parse_args()
-
-    generated_dirs = []
-    for gp_dir in options.genpydirs.split(','):
-        generated_dirs.append('gen-py-%s' % (gp_dir))
-
-    # commandline permits a single class name to be specified to override SERVERS=[...]
-    servers = default_servers()
-    if len(args) == 1:
-        if args[0] in servers:
-            servers = args
-        else:
-            print('Unavailable server type "%s", please choose one of: %s' % (args[0], servers))
-            sys.exit(0)
-
-    tests = TestCases(options.gen_base, options.libdir, options.port, generated_dirs, servers, options.verbose)
-
-    # run tests without a client/server first
-    print('----------------')
-    print(' Executing individual test scripts with various generated code directories')
-    print(' Directories to be tested: ' + ', '.join(generated_dirs))
-    print(' Scripts to be tested: ' + ', '.join(SCRIPTS))
-    print('----------------')
-    for genpydir in generated_dirs:
-        for script in SCRIPTS:
-            runScriptTest(options.libdir, options.gen_base, genpydir, script)
-
-    print('----------------')
-    print(' Executing Client/Server tests with various generated code directories')
-    print(' Servers to be tested: ' + ', '.join(servers))
-    print(' Directories to be tested: ' + ', '.join(generated_dirs))
-    print(' Protocols to be tested: ' + ', '.join(PROTOS))
-    print(' Options to be tested: ZLIB(yes/no), SSL(yes/no)')
-    print('----------------')
-
-    if options.all:
-        tests.run_all_tests()
-    else:
-        tests.test_feature('gendir', generated_dirs)
-        tests.test_feature('server', servers)
-        tests.test_feature('proto', PROTOS)
-        tests.test_feature('zlib', [False, True])
-        tests.test_feature('ssl', [False, True])
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/vendor/git.apache.org/thrift.git/test/py/SerializationTest.py b/vendor/git.apache.org/thrift.git/test/py/SerializationTest.py
deleted file mode 100755
index efe3c6d..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/SerializationTest.py
+++ /dev/null
@@ -1,390 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from ThriftTest.ttypes import (
-    Bonk,
-    Bools,
-    LargeDeltas,
-    ListBonks,
-    NestedListsBonk,
-    NestedListsI32x2,
-    NestedListsI32x3,
-    NestedMixedx2,
-    Numberz,
-    VersioningTestV1,
-    VersioningTestV2,
-    Xtruct,
-    Xtruct2,
-)
-
-from DebugProtoTest.ttypes import CompactProtoTestStruct, Empty
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol, TCompactProtocol, TJSONProtocol
-from thrift.TSerialization import serialize, deserialize
-import sys
-import unittest
-
-
-class AbstractTest(unittest.TestCase):
-
-    def setUp(self):
-        self.v1obj = VersioningTestV1(
-            begin_in_both=12345,
-            old_string='aaa',
-            end_in_both=54321,
-        )
-
-        self.v2obj = VersioningTestV2(
-            begin_in_both=12345,
-            newint=1,
-            newbyte=2,
-            newshort=3,
-            newlong=4,
-            newdouble=5.0,
-            newstruct=Bonk(message="Hello!", type=123),
-            newlist=[7, 8, 9],
-            newset=set([42, 1, 8]),
-            newmap={1: 2, 2: 3},
-            newstring="Hola!",
-            end_in_both=54321,
-        )
-
-        self.bools = Bools(im_true=True, im_false=False)
-        self.bools_flipped = Bools(im_true=False, im_false=True)
-
-        self.large_deltas = LargeDeltas(
-            b1=self.bools,
-            b10=self.bools_flipped,
-            b100=self.bools,
-            check_true=True,
-            b1000=self.bools_flipped,
-            check_false=False,
-            vertwo2000=VersioningTestV2(newstruct=Bonk(message='World!', type=314)),
-            a_set2500=set(['lazy', 'brown', 'cow']),
-            vertwo3000=VersioningTestV2(newset=set([2, 3, 5, 7, 11])),
-            big_numbers=[2 ** 8, 2 ** 16, 2 ** 31 - 1, -(2 ** 31 - 1)]
-        )
-
-        self.compact_struct = CompactProtoTestStruct(
-            a_byte=127,
-            a_i16=32000,
-            a_i32=1000000000,
-            a_i64=0xffffffffff,
-            a_double=5.6789,
-            a_string="my string",
-            true_field=True,
-            false_field=False,
-            empty_struct_field=Empty(),
-            byte_list=[-127, -1, 0, 1, 127],
-            i16_list=[-1, 0, 1, 0x7fff],
-            i32_list=[-1, 0, 0xff, 0xffff, 0xffffff, 0x7fffffff],
-            i64_list=[-1, 0, 0xff, 0xffff, 0xffffff, 0xffffffff, 0xffffffffff, 0xffffffffffff, 0xffffffffffffff, 0x7fffffffffffffff],
-            double_list=[0.1, 0.2, 0.3],
-            string_list=["first", "second", "third"],
-            boolean_list=[True, True, True, False, False, False],
-            struct_list=[Empty(), Empty()],
-            byte_set=set([-127, -1, 0, 1, 127]),
-            i16_set=set([-1, 0, 1, 0x7fff]),
-            i32_set=set([1, 2, 3]),
-            i64_set=set([-1, 0, 0xff, 0xffff, 0xffffff, 0xffffffff, 0xffffffffff, 0xffffffffffff, 0xffffffffffffff, 0x7fffffffffffffff]),
-            double_set=set([0.1, 0.2, 0.3]),
-            string_set=set(["first", "second", "third"]),
-            boolean_set=set([True, False]),
-            # struct_set=set([Empty()]), # unhashable instance
-            byte_byte_map={1: 2},
-            i16_byte_map={1: 1, -1: 1, 0x7fff: 1},
-            i32_byte_map={1: 1, -1: 1, 0x7fffffff: 1},
-            i64_byte_map={0: 1, 1: 1, -1: 1, 0x7fffffffffffffff: 1},
-            double_byte_map={-1.1: 1, 1.1: 1},
-            string_byte_map={"first": 1, "second": 2, "third": 3, "": 0},
-            boolean_byte_map={True: 1, False: 0},
-            byte_i16_map={1: 1, 2: -1, 3: 0x7fff},
-            byte_i32_map={1: 1, 2: -1, 3: 0x7fffffff},
-            byte_i64_map={1: 1, 2: -1, 3: 0x7fffffffffffffff},
-            byte_double_map={1: 0.1, 2: -0.1, 3: 1000000.1},
-            byte_string_map={1: "", 2: "blah", 3: "loooooooooooooong string"},
-            byte_boolean_map={1: True, 2: False},
-            # list_byte_map # unhashable
-            # set_byte_map={set([1, 2, 3]) : 1, set([0, 1]) : 2, set([]) : 0}, # unhashable
-            # map_byte_map # unhashable
-            byte_map_map={0: {}, 1: {1: 1}, 2: {1: 1, 2: 2}},
-            byte_set_map={0: set([]), 1: set([1]), 2: set([1, 2])},
-            byte_list_map={0: [], 1: [1], 2: [1, 2]},
-        )
-
-        self.nested_lists_i32x2 = NestedListsI32x2(
-            [
-                [1, 1, 2],
-                [2, 7, 9],
-                [3, 5, 8]
-            ]
-        )
-
-        self.nested_lists_i32x3 = NestedListsI32x3(
-            [
-                [
-                    [2, 7, 9],
-                    [3, 5, 8]
-                ],
-                [
-                    [1, 1, 2],
-                    [1, 4, 9]
-                ]
-            ]
-        )
-
-        self.nested_mixedx2 = NestedMixedx2(int_set_list=[
-            set([1, 2, 3]),
-            set([1, 4, 9]),
-            set([1, 2, 3, 5, 8, 13, 21]),
-            set([-1, 0, 1])
-        ],
-            # note, the sets below are sets of chars, since the strings are iterated
-            map_int_strset={10: set('abc'), 20: set('def'), 30: set('GHI')},
-            map_int_strset_list=[
-                {10: set('abc'), 20: set('def'), 30: set('GHI')},
-                {100: set('lmn'), 200: set('opq'), 300: set('RST')},
-                {1000: set('uvw'), 2000: set('wxy'), 3000: set('XYZ')}]
-        )
-
-        self.nested_lists_bonk = NestedListsBonk(
-            [
-                [
-                    [
-                        Bonk(message='inner A first', type=1),
-                        Bonk(message='inner A second', type=1)
-                    ],
-                    [
-                        Bonk(message='inner B first', type=2),
-                        Bonk(message='inner B second', type=2)
-                    ]
-                ]
-            ]
-        )
-
-        self.list_bonks = ListBonks(
-            [
-                Bonk(message='inner A', type=1),
-                Bonk(message='inner B', type=2),
-                Bonk(message='inner C', type=0)
-            ]
-        )
-
-    def _serialize(self, obj):
-        trans = TTransport.TMemoryBuffer()
-        prot = self.protocol_factory.getProtocol(trans)
-        obj.write(prot)
-        return trans.getvalue()
-
-    def _deserialize(self, objtype, data):
-        prot = self.protocol_factory.getProtocol(TTransport.TMemoryBuffer(data))
-        ret = objtype()
-        ret.read(prot)
-        return ret
-
-    def testForwards(self):
-        obj = self._deserialize(VersioningTestV2, self._serialize(self.v1obj))
-        self.assertEquals(obj.begin_in_both, self.v1obj.begin_in_both)
-        self.assertEquals(obj.end_in_both, self.v1obj.end_in_both)
-
-    def testBackwards(self):
-        obj = self._deserialize(VersioningTestV1, self._serialize(self.v2obj))
-        self.assertEquals(obj.begin_in_both, self.v2obj.begin_in_both)
-        self.assertEquals(obj.end_in_both, self.v2obj.end_in_both)
-
-    def testSerializeV1(self):
-        obj = self._deserialize(VersioningTestV1, self._serialize(self.v1obj))
-        self.assertEquals(obj, self.v1obj)
-
-    def testSerializeV2(self):
-        obj = self._deserialize(VersioningTestV2, self._serialize(self.v2obj))
-        self.assertEquals(obj, self.v2obj)
-
-    def testBools(self):
-        self.assertNotEquals(self.bools, self.bools_flipped)
-        self.assertNotEquals(self.bools, self.v1obj)
-        obj = self._deserialize(Bools, self._serialize(self.bools))
-        self.assertEquals(obj, self.bools)
-        obj = self._deserialize(Bools, self._serialize(self.bools_flipped))
-        self.assertEquals(obj, self.bools_flipped)
-        rep = repr(self.bools)
-        self.assertTrue(len(rep) > 0)
-
-    def testLargeDeltas(self):
-        # test large field deltas (meaningful in CompactProto only)
-        obj = self._deserialize(LargeDeltas, self._serialize(self.large_deltas))
-        self.assertEquals(obj, self.large_deltas)
-        rep = repr(self.large_deltas)
-        self.assertTrue(len(rep) > 0)
-
-    def testNestedListsI32x2(self):
-        obj = self._deserialize(NestedListsI32x2, self._serialize(self.nested_lists_i32x2))
-        self.assertEquals(obj, self.nested_lists_i32x2)
-        rep = repr(self.nested_lists_i32x2)
-        self.assertTrue(len(rep) > 0)
-
-    def testNestedListsI32x3(self):
-        obj = self._deserialize(NestedListsI32x3, self._serialize(self.nested_lists_i32x3))
-        self.assertEquals(obj, self.nested_lists_i32x3)
-        rep = repr(self.nested_lists_i32x3)
-        self.assertTrue(len(rep) > 0)
-
-    def testNestedMixedx2(self):
-        obj = self._deserialize(NestedMixedx2, self._serialize(self.nested_mixedx2))
-        self.assertEquals(obj, self.nested_mixedx2)
-        rep = repr(self.nested_mixedx2)
-        self.assertTrue(len(rep) > 0)
-
-    def testNestedListsBonk(self):
-        obj = self._deserialize(NestedListsBonk, self._serialize(self.nested_lists_bonk))
-        self.assertEquals(obj, self.nested_lists_bonk)
-        rep = repr(self.nested_lists_bonk)
-        self.assertTrue(len(rep) > 0)
-
-    def testListBonks(self):
-        obj = self._deserialize(ListBonks, self._serialize(self.list_bonks))
-        self.assertEquals(obj, self.list_bonks)
-        rep = repr(self.list_bonks)
-        self.assertTrue(len(rep) > 0)
-
-    def testCompactStruct(self):
-        # test large field deltas (meaningful in CompactProto only)
-        obj = self._deserialize(CompactProtoTestStruct, self._serialize(self.compact_struct))
-        self.assertEquals(obj, self.compact_struct)
-        rep = repr(self.compact_struct)
-        self.assertTrue(len(rep) > 0)
-
-    def testIntegerLimits(self):
-        if (sys.version_info[0] == 2 and sys.version_info[1] <= 6):
-            print('Skipping testIntegerLimits for Python 2.6')
-            return
-        bad_values = [CompactProtoTestStruct(a_byte=128), CompactProtoTestStruct(a_byte=-129),
-                      CompactProtoTestStruct(a_i16=32768), CompactProtoTestStruct(a_i16=-32769),
-                      CompactProtoTestStruct(a_i32=2147483648), CompactProtoTestStruct(a_i32=-2147483649),
-                      CompactProtoTestStruct(a_i64=9223372036854775808), CompactProtoTestStruct(a_i64=-9223372036854775809)
-                      ]
-
-        for value in bad_values:
-            self.assertRaises(Exception, self._serialize, value)
-
-
-class NormalBinaryTest(AbstractTest):
-    protocol_factory = TBinaryProtocol.TBinaryProtocolFactory()
-
-
-class AcceleratedBinaryTest(AbstractTest):
-    protocol_factory = TBinaryProtocol.TBinaryProtocolAcceleratedFactory(fallback=False)
-
-
-class CompactProtocolTest(AbstractTest):
-    protocol_factory = TCompactProtocol.TCompactProtocolFactory()
-
-
-class AcceleratedCompactTest(AbstractTest):
-    protocol_factory = TCompactProtocol.TCompactProtocolAcceleratedFactory(fallback=False)
-
-
-class JSONProtocolTest(AbstractTest):
-    protocol_factory = TJSONProtocol.TJSONProtocolFactory()
-
-
-class AcceleratedFramedTest(unittest.TestCase):
-    def testSplit(self):
-        """Test FramedTransport and BinaryProtocolAccelerated
-
-        Tests that TBinaryProtocolAccelerated and TFramedTransport
-        play nicely together when a read spans a frame"""
-
-        protocol_factory = TBinaryProtocol.TBinaryProtocolAcceleratedFactory()
-        bigstring = "".join(chr(byte) for byte in range(ord("a"), ord("z") + 1))
-
-        databuf = TTransport.TMemoryBuffer()
-        prot = protocol_factory.getProtocol(databuf)
-        prot.writeI32(42)
-        prot.writeString(bigstring)
-        prot.writeI16(24)
-        data = databuf.getvalue()
-        cutpoint = len(data) // 2
-        parts = [data[:cutpoint], data[cutpoint:]]
-
-        framed_buffer = TTransport.TMemoryBuffer()
-        framed_writer = TTransport.TFramedTransport(framed_buffer)
-        for part in parts:
-            framed_writer.write(part)
-            framed_writer.flush()
-        self.assertEquals(len(framed_buffer.getvalue()), len(data) + 8)
-
-        # Recreate framed_buffer so we can read from it.
-        framed_buffer = TTransport.TMemoryBuffer(framed_buffer.getvalue())
-        framed_reader = TTransport.TFramedTransport(framed_buffer)
-        prot = protocol_factory.getProtocol(framed_reader)
-        self.assertEqual(prot.readI32(), 42)
-        self.assertEqual(prot.readString(), bigstring)
-        self.assertEqual(prot.readI16(), 24)
-
-
-class SerializersTest(unittest.TestCase):
-
-    def testSerializeThenDeserialize(self):
-        obj = Xtruct2(i32_thing=1,
-                      struct_thing=Xtruct(string_thing="foo"))
-
-        s1 = serialize(obj)
-        for i in range(10):
-            self.assertEquals(s1, serialize(obj))
-            objcopy = Xtruct2()
-            deserialize(objcopy, serialize(obj))
-            self.assertEquals(obj, objcopy)
-
-        obj = Xtruct(string_thing="bar")
-        objcopy = Xtruct()
-        deserialize(objcopy, serialize(obj))
-        self.assertEquals(obj, objcopy)
-
-        # test booleans
-        obj = Bools(im_true=True, im_false=False)
-        objcopy = Bools()
-        deserialize(objcopy, serialize(obj))
-        self.assertEquals(obj, objcopy)
-
-        # test enums
-        for num, name in Numberz._VALUES_TO_NAMES.items():
-            obj = Bonk(message='enum Numberz value %d is string %s' % (num, name), type=num)
-            objcopy = Bonk()
-            deserialize(objcopy, serialize(obj))
-            self.assertEquals(obj, objcopy)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    loader = unittest.TestLoader()
-
-    suite.addTest(loader.loadTestsFromTestCase(NormalBinaryTest))
-    suite.addTest(loader.loadTestsFromTestCase(AcceleratedBinaryTest))
-    suite.addTest(loader.loadTestsFromTestCase(AcceleratedCompactTest))
-    suite.addTest(loader.loadTestsFromTestCase(CompactProtocolTest))
-    suite.addTest(loader.loadTestsFromTestCase(JSONProtocolTest))
-    suite.addTest(loader.loadTestsFromTestCase(AcceleratedFramedTest))
-    suite.addTest(loader.loadTestsFromTestCase(SerializersTest))
-    return suite
-
-if __name__ == "__main__":
-    unittest.main(defaultTest="suite", testRunner=unittest.TextTestRunner(verbosity=2))
diff --git a/vendor/git.apache.org/thrift.git/test/py/TSimpleJSONProtocolTest.py b/vendor/git.apache.org/thrift.git/test/py/TSimpleJSONProtocolTest.py
deleted file mode 100644
index 7298760..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/TSimpleJSONProtocolTest.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from ThriftTest.ttypes import Bonk, VersioningTestV1, VersioningTestV2
-from thrift.protocol import TJSONProtocol
-from thrift.transport import TTransport
-
-import json
-import unittest
-
-
-class SimpleJSONProtocolTest(unittest.TestCase):
-    protocol_factory = TJSONProtocol.TSimpleJSONProtocolFactory()
-
-    def _assertDictEqual(self, a, b, msg=None):
-        if hasattr(self, 'assertDictEqual'):
-            # assertDictEqual only in Python 2.7. Depends on your machine.
-            self.assertDictEqual(a, b, msg)
-            return
-
-        # Substitute implementation not as good as unittest library's
-        self.assertEquals(len(a), len(b), msg)
-        for k, v in a.iteritems():
-            self.assertTrue(k in b, msg)
-            self.assertEquals(b.get(k), v, msg)
-
-    def _serialize(self, obj):
-        trans = TTransport.TMemoryBuffer()
-        prot = self.protocol_factory.getProtocol(trans)
-        obj.write(prot)
-        return trans.getvalue()
-
-    def _deserialize(self, objtype, data):
-        prot = self.protocol_factory.getProtocol(TTransport.TMemoryBuffer(data))
-        ret = objtype()
-        ret.read(prot)
-        return ret
-
-    def testWriteOnly(self):
-        self.assertRaises(NotImplementedError,
-                          self._deserialize, VersioningTestV1, b'{}')
-
-    def testSimpleMessage(self):
-        v1obj = VersioningTestV1(
-            begin_in_both=12345,
-            old_string='aaa',
-            end_in_both=54321)
-        expected = dict(begin_in_both=v1obj.begin_in_both,
-                        old_string=v1obj.old_string,
-                        end_in_both=v1obj.end_in_both)
-        actual = json.loads(self._serialize(v1obj).decode('ascii'))
-
-        self._assertDictEqual(expected, actual)
-
-    def testComplicated(self):
-        v2obj = VersioningTestV2(
-            begin_in_both=12345,
-            newint=1,
-            newbyte=2,
-            newshort=3,
-            newlong=4,
-            newdouble=5.0,
-            newstruct=Bonk(message="Hello!", type=123),
-            newlist=[7, 8, 9],
-            newset=set([42, 1, 8]),
-            newmap={1: 2, 2: 3},
-            newstring="Hola!",
-            end_in_both=54321)
-        expected = dict(begin_in_both=v2obj.begin_in_both,
-                        newint=v2obj.newint,
-                        newbyte=v2obj.newbyte,
-                        newshort=v2obj.newshort,
-                        newlong=v2obj.newlong,
-                        newdouble=v2obj.newdouble,
-                        newstruct=dict(message=v2obj.newstruct.message,
-                                       type=v2obj.newstruct.type),
-                        newlist=v2obj.newlist,
-                        newset=list(v2obj.newset),
-                        newmap=v2obj.newmap,
-                        newstring=v2obj.newstring,
-                        end_in_both=v2obj.end_in_both)
-
-        # Need to load/dump because map keys get escaped.
-        expected = json.loads(json.dumps(expected))
-        actual = json.loads(self._serialize(v2obj).decode('ascii'))
-        self._assertDictEqual(expected, actual)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/vendor/git.apache.org/thrift.git/test/py/TestClient.py b/vendor/git.apache.org/thrift.git/test/py/TestClient.py
deleted file mode 100755
index 18ef66b..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/TestClient.py
+++ /dev/null
@@ -1,348 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import os
-import sys
-import time
-import unittest
-from optparse import OptionParser
-
-from util import local_libpath
-
-SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
-
-
-class AbstractTest(unittest.TestCase):
-    def setUp(self):
-        if options.http_path:
-            self.transport = THttpClient.THttpClient(options.host, port=options.port, path=options.http_path)
-        else:
-            if options.ssl:
-                from thrift.transport import TSSLSocket
-                socket = TSSLSocket.TSSLSocket(options.host, options.port, validate=False)
-            else:
-                socket = TSocket.TSocket(options.host, options.port)
-            # frame or buffer depending upon args
-            self.transport = TTransport.TBufferedTransport(socket)
-            if options.trans == 'framed':
-                self.transport = TTransport.TFramedTransport(socket)
-            elif options.trans == 'buffered':
-                self.transport = TTransport.TBufferedTransport(socket)
-            elif options.trans == '':
-                raise AssertionError('Unknown --transport option: %s' % options.trans)
-            if options.zlib:
-                self.transport = TZlibTransport.TZlibTransport(self.transport, 9)
-        self.transport.open()
-        protocol = self.get_protocol(self.transport)
-        self.client = ThriftTest.Client(protocol)
-
-    def tearDown(self):
-        self.transport.close()
-
-    def testVoid(self):
-        print('testVoid')
-        self.client.testVoid()
-
-    def testString(self):
-        print('testString')
-        self.assertEqual(self.client.testString('Python' * 20), 'Python' * 20)
-        self.assertEqual(self.client.testString(''), '')
-        s1 = u'\b\t\n/\\\\\r{}:パイソン"'
-        s2 = u"""Afrikaans, Alemannisch, Aragonés, العربية, مصرى,
-        Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška,
-        Беларуская, Беларуская (тарашкевіца), Български, Bamanankan,
-        বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн,
-        Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg,
-        Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English,
-        Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt,
-        Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego,
-        Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski,
-        Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia,
-        Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa,
-        ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар,
-        Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino,
-        Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa
-        Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, مازِرونی, Bahasa
-        Melayu, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪
-        Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad,
-        Occitan, Иронау, Papiamentu, Deitsch, Polski, پنجابی, پښتو,
-        Norfuk / Pitkern, Português, Runa Simi, Rumantsch, Romani, Română,
-        Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple
-        English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk,
-        Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog,
-        Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük,
-        Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文,
-        Bân-lâm-gú, 粵語"""
-        if sys.version_info[0] == 2 and os.environ.get('THRIFT_TEST_PY_NO_UTF8STRINGS'):
-            s1 = s1.encode('utf8')
-            s2 = s2.encode('utf8')
-        self.assertEqual(self.client.testString(s1), s1)
-        self.assertEqual(self.client.testString(s2), s2)
-
-    def testBool(self):
-        print('testBool')
-        self.assertEqual(self.client.testBool(True), True)
-        self.assertEqual(self.client.testBool(False), False)
-
-    def testByte(self):
-        print('testByte')
-        self.assertEqual(self.client.testByte(63), 63)
-        self.assertEqual(self.client.testByte(-127), -127)
-
-    def testI32(self):
-        print('testI32')
-        self.assertEqual(self.client.testI32(-1), -1)
-        self.assertEqual(self.client.testI32(0), 0)
-
-    def testI64(self):
-        print('testI64')
-        self.assertEqual(self.client.testI64(1), 1)
-        self.assertEqual(self.client.testI64(-34359738368), -34359738368)
-
-    def testDouble(self):
-        print('testDouble')
-        self.assertEqual(self.client.testDouble(-5.235098235), -5.235098235)
-        self.assertEqual(self.client.testDouble(0), 0)
-        self.assertEqual(self.client.testDouble(-1), -1)
-        self.assertEqual(self.client.testDouble(-0.000341012439638598279), -0.000341012439638598279)
-
-    def testBinary(self):
-        print('testBinary')
-        val = bytearray([i for i in range(0, 256)])
-        self.assertEqual(bytearray(self.client.testBinary(bytes(val))), val)
-
-    def testStruct(self):
-        print('testStruct')
-        x = Xtruct()
-        x.string_thing = "Zero"
-        x.byte_thing = 1
-        x.i32_thing = -3
-        x.i64_thing = -5
-        y = self.client.testStruct(x)
-        self.assertEqual(y, x)
-
-    def testNest(self):
-        print('testNest')
-        inner = Xtruct(string_thing="Zero", byte_thing=1, i32_thing=-3, i64_thing=-5)
-        x = Xtruct2(struct_thing=inner, byte_thing=0, i32_thing=0)
-        y = self.client.testNest(x)
-        self.assertEqual(y, x)
-
-    def testMap(self):
-        print('testMap')
-        x = {0: 1, 1: 2, 2: 3, 3: 4, -1: -2}
-        y = self.client.testMap(x)
-        self.assertEqual(y, x)
-
-    def testSet(self):
-        print('testSet')
-        x = set([8, 1, 42])
-        y = self.client.testSet(x)
-        self.assertEqual(y, x)
-
-    def testList(self):
-        print('testList')
-        x = [1, 4, 9, -42]
-        y = self.client.testList(x)
-        self.assertEqual(y, x)
-
-    def testEnum(self):
-        print('testEnum')
-        x = Numberz.FIVE
-        y = self.client.testEnum(x)
-        self.assertEqual(y, x)
-
-    def testTypedef(self):
-        print('testTypedef')
-        x = 0xffffffffffffff  # 7 bytes of 0xff
-        y = self.client.testTypedef(x)
-        self.assertEqual(y, x)
-
-    def testMapMap(self):
-        print('testMapMap')
-        x = {
-            -4: {-4: -4, -3: -3, -2: -2, -1: -1},
-            4: {4: 4, 3: 3, 2: 2, 1: 1},
-        }
-        y = self.client.testMapMap(42)
-        self.assertEqual(y, x)
-
-    def testMulti(self):
-        print('testMulti')
-        xpected = Xtruct(string_thing='Hello2', byte_thing=74, i32_thing=0xff00ff, i64_thing=0xffffffffd0d0)
-        y = self.client.testMulti(xpected.byte_thing,
-                                  xpected.i32_thing,
-                                  xpected.i64_thing,
-                                  {0: 'abc'},
-                                  Numberz.FIVE,
-                                  0xf0f0f0)
-        self.assertEqual(y, xpected)
-
-    def testException(self):
-        print('testException')
-        self.client.testException('Safe')
-        try:
-            self.client.testException('Xception')
-            self.fail("should have gotten exception")
-        except Xception as x:
-            self.assertEqual(x.errorCode, 1001)
-            self.assertEqual(x.message, 'Xception')
-            # TODO ensure same behavior for repr within generated python variants
-            # ensure exception's repr method works
-            # x_repr = repr(x)
-            # self.assertEqual(x_repr, 'Xception(errorCode=1001, message=\'Xception\')')
-
-        try:
-            self.client.testException('TException')
-            self.fail("should have gotten exception")
-        except TException as x:
-            pass
-
-        # Should not throw
-        self.client.testException('success')
-
-    def testMultiException(self):
-        print('testMultiException')
-        try:
-            self.client.testMultiException('Xception', 'ignore')
-        except Xception as ex:
-            self.assertEqual(ex.errorCode, 1001)
-            self.assertEqual(ex.message, 'This is an Xception')
-
-        try:
-            self.client.testMultiException('Xception2', 'ignore')
-        except Xception2 as ex:
-            self.assertEqual(ex.errorCode, 2002)
-            self.assertEqual(ex.struct_thing.string_thing, 'This is an Xception2')
-
-        y = self.client.testMultiException('success', 'foobar')
-        self.assertEqual(y.string_thing, 'foobar')
-
-    def testOneway(self):
-        print('testOneway')
-        start = time.time()
-        self.client.testOneway(1)  # type is int, not float
-        end = time.time()
-        self.assertTrue(end - start < 3,
-                        "oneway sleep took %f sec" % (end - start))
-
-    def testOnewayThenNormal(self):
-        print('testOnewayThenNormal')
-        self.client.testOneway(1)  # type is int, not float
-        self.assertEqual(self.client.testString('Python'), 'Python')
-
-
-class NormalBinaryTest(AbstractTest):
-    def get_protocol(self, transport):
-        return TBinaryProtocol.TBinaryProtocolFactory().getProtocol(transport)
-
-
-class CompactTest(AbstractTest):
-    def get_protocol(self, transport):
-        return TCompactProtocol.TCompactProtocolFactory().getProtocol(transport)
-
-
-class JSONTest(AbstractTest):
-    def get_protocol(self, transport):
-        return TJSONProtocol.TJSONProtocolFactory().getProtocol(transport)
-
-
-class AcceleratedBinaryTest(AbstractTest):
-    def get_protocol(self, transport):
-        return TBinaryProtocol.TBinaryProtocolAcceleratedFactory(fallback=False).getProtocol(transport)
-
-
-class AcceleratedCompactTest(AbstractTest):
-    def get_protocol(self, transport):
-        return TCompactProtocol.TCompactProtocolAcceleratedFactory(fallback=False).getProtocol(transport)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    loader = unittest.TestLoader()
-    if options.proto == 'binary':  # look for --proto on cmdline
-        suite.addTest(loader.loadTestsFromTestCase(NormalBinaryTest))
-    elif options.proto == 'accel':
-        suite.addTest(loader.loadTestsFromTestCase(AcceleratedBinaryTest))
-    elif options.proto == 'compact':
-        suite.addTest(loader.loadTestsFromTestCase(CompactTest))
-    elif options.proto == 'accelc':
-        suite.addTest(loader.loadTestsFromTestCase(AcceleratedCompactTest))
-    elif options.proto == 'json':
-        suite.addTest(loader.loadTestsFromTestCase(JSONTest))
-    else:
-        raise AssertionError('Unknown protocol given with --protocol: %s' % options.proto)
-    return suite
-
-
-class OwnArgsTestProgram(unittest.TestProgram):
-    def parseArgs(self, argv):
-        if args:
-            self.testNames = args
-        else:
-            self.testNames = ([self.defaultTest])
-        self.createTests()
-
-if __name__ == "__main__":
-    parser = OptionParser()
-    parser.add_option('--libpydir', type='string', dest='libpydir',
-                      help='include this directory in sys.path for locating library code')
-    parser.add_option('--genpydir', type='string', dest='genpydir',
-                      help='include this directory in sys.path for locating generated code')
-    parser.add_option("--port", type="int", dest="port",
-                      help="connect to server at port")
-    parser.add_option("--host", type="string", dest="host",
-                      help="connect to server")
-    parser.add_option("--zlib", action="store_true", dest="zlib",
-                      help="use zlib wrapper for compressed transport")
-    parser.add_option("--ssl", action="store_true", dest="ssl",
-                      help="use SSL for encrypted transport")
-    parser.add_option("--http", dest="http_path",
-                      help="Use the HTTP transport with the specified path")
-    parser.add_option('-v', '--verbose', action="store_const",
-                      dest="verbose", const=2,
-                      help="verbose output")
-    parser.add_option('-q', '--quiet', action="store_const",
-                      dest="verbose", const=0,
-                      help="minimal output")
-    parser.add_option('--protocol', dest="proto", type="string",
-                      help="protocol to use, one of: accel, binary, compact, json")
-    parser.add_option('--transport', dest="trans", type="string",
-                      help="transport to use, one of: buffered, framed")
-    parser.set_defaults(framed=False, http_path=None, verbose=1, host='localhost', port=9090, proto='binary')
-    options, args = parser.parse_args()
-
-    if options.genpydir:
-        sys.path.insert(0, os.path.join(SCRIPT_DIR, options.genpydir))
-    sys.path.insert(0, local_libpath())
-
-    from ThriftTest import ThriftTest
-    from ThriftTest.ttypes import Xtruct, Xtruct2, Numberz, Xception, Xception2
-    from thrift.Thrift import TException
-    from thrift.transport import TTransport
-    from thrift.transport import TSocket
-    from thrift.transport import THttpClient
-    from thrift.transport import TZlibTransport
-    from thrift.protocol import TBinaryProtocol
-    from thrift.protocol import TCompactProtocol
-    from thrift.protocol import TJSONProtocol
-
-    OwnArgsTestProgram(defaultTest="suite", testRunner=unittest.TextTestRunner(verbosity=1))
diff --git a/vendor/git.apache.org/thrift.git/test/py/TestEof.py b/vendor/git.apache.org/thrift.git/test/py/TestEof.py
deleted file mode 100755
index cda1050..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/TestEof.py
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from ThriftTest.ttypes import Xtruct
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
-from thrift.protocol import TCompactProtocol
-import unittest
-
-
-class TestEof(unittest.TestCase):
-
-    def make_data(self, pfactory=None):
-        trans = TTransport.TMemoryBuffer()
-        if pfactory:
-            prot = pfactory.getProtocol(trans)
-        else:
-            prot = TBinaryProtocol.TBinaryProtocol(trans)
-
-        x = Xtruct()
-        x.string_thing = "Zero"
-        x.byte_thing = 0
-
-        x.write(prot)
-
-        x = Xtruct()
-        x.string_thing = "One"
-        x.byte_thing = 1
-
-        x.write(prot)
-
-        return trans.getvalue()
-
-    def testTransportReadAll(self):
-        """Test that readAll on any type of transport throws an EOFError"""
-        trans = TTransport.TMemoryBuffer(self.make_data())
-        trans.readAll(1)
-
-        try:
-            trans.readAll(10000)
-        except EOFError:
-            return
-
-        self.fail("Should have gotten EOFError")
-
-    def eofTestHelper(self, pfactory):
-        trans = TTransport.TMemoryBuffer(self.make_data(pfactory))
-        prot = pfactory.getProtocol(trans)
-
-        x = Xtruct()
-        x.read(prot)
-        self.assertEqual(x.string_thing, "Zero")
-        self.assertEqual(x.byte_thing, 0)
-
-        x = Xtruct()
-        x.read(prot)
-        self.assertEqual(x.string_thing, "One")
-        self.assertEqual(x.byte_thing, 1)
-
-        try:
-            x = Xtruct()
-            x.read(prot)
-        except EOFError:
-            return
-
-        self.fail("Should have gotten EOFError")
-
-    def eofTestHelperStress(self, pfactory):
-        """Test the ability of TBinaryProtocol to deal with the removal of every byte in the file"""
-        # TODO: we should make sure this covers more of the code paths
-
-        data = self.make_data(pfactory)
-        for i in range(0, len(data) + 1):
-            trans = TTransport.TMemoryBuffer(data[0:i])
-            prot = pfactory.getProtocol(trans)
-            try:
-                x = Xtruct()
-                x.read(prot)
-                x.read(prot)
-                x.read(prot)
-            except EOFError:
-                continue
-            self.fail("Should have gotten an EOFError")
-
-    def testBinaryProtocolEof(self):
-        """Test that TBinaryProtocol throws an EOFError when it reaches the end of the stream"""
-        self.eofTestHelper(TBinaryProtocol.TBinaryProtocolFactory())
-        self.eofTestHelperStress(TBinaryProtocol.TBinaryProtocolFactory())
-
-    def testBinaryProtocolAcceleratedBinaryEof(self):
-        """Test that TBinaryProtocolAccelerated throws an EOFError when it reaches the end of the stream"""
-        self.eofTestHelper(TBinaryProtocol.TBinaryProtocolAcceleratedFactory(fallback=False))
-        self.eofTestHelperStress(TBinaryProtocol.TBinaryProtocolAcceleratedFactory(fallback=False))
-
-    def testCompactProtocolEof(self):
-        """Test that TCompactProtocol throws an EOFError when it reaches the end of the stream"""
-        self.eofTestHelper(TCompactProtocol.TCompactProtocolFactory())
-        self.eofTestHelperStress(TCompactProtocol.TCompactProtocolFactory())
-
-    def testCompactProtocolAcceleratedCompactEof(self):
-        """Test that TCompactProtocolAccelerated throws an EOFError when it reaches the end of the stream"""
-        self.eofTestHelper(TCompactProtocol.TCompactProtocolAcceleratedFactory(fallback=False))
-        self.eofTestHelperStress(TCompactProtocol.TCompactProtocolAcceleratedFactory(fallback=False))
-
-
-def suite():
-    suite = unittest.TestSuite()
-    loader = unittest.TestLoader()
-    suite.addTest(loader.loadTestsFromTestCase(TestEof))
-    return suite
-
-if __name__ == "__main__":
-    unittest.main(defaultTest="suite", testRunner=unittest.TextTestRunner(verbosity=2))
diff --git a/vendor/git.apache.org/thrift.git/test/py/TestFrozen.py b/vendor/git.apache.org/thrift.git/test/py/TestFrozen.py
deleted file mode 100755
index e568e8c..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/TestFrozen.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from DebugProtoTest.ttypes import CompactProtoTestStruct, Empty, Wrapper
-from thrift.Thrift import TFrozenDict
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol, TCompactProtocol
-import collections
-import unittest
-
-
-class TestFrozenBase(unittest.TestCase):
-    def _roundtrip(self, src, dst):
-        otrans = TTransport.TMemoryBuffer()
-        optoro = self.protocol(otrans)
-        src.write(optoro)
-        itrans = TTransport.TMemoryBuffer(otrans.getvalue())
-        iproto = self.protocol(itrans)
-        return dst.read(iproto) or dst
-
-    def test_dict_is_hashable_only_after_frozen(self):
-        d0 = {}
-        self.assertFalse(isinstance(d0, collections.Hashable))
-        d1 = TFrozenDict(d0)
-        self.assertTrue(isinstance(d1, collections.Hashable))
-
-    def test_struct_with_collection_fields(self):
-        pass
-
-    def test_set(self):
-        """Test that annotated set field can be serialized and deserialized"""
-        x = CompactProtoTestStruct(set_byte_map={
-            frozenset([42, 100, -100]): 99,
-            frozenset([0]): 100,
-            frozenset([]): 0,
-        })
-        x2 = self._roundtrip(x, CompactProtoTestStruct())
-        self.assertEqual(x2.set_byte_map[frozenset([42, 100, -100])], 99)
-        self.assertEqual(x2.set_byte_map[frozenset([0])], 100)
-        self.assertEqual(x2.set_byte_map[frozenset([])], 0)
-
-    def test_map(self):
-        """Test that annotated map field can be serialized and deserialized"""
-        x = CompactProtoTestStruct(map_byte_map={
-            TFrozenDict({42: 42, 100: -100}): 99,
-            TFrozenDict({0: 0}): 100,
-            TFrozenDict({}): 0,
-        })
-        x2 = self._roundtrip(x, CompactProtoTestStruct())
-        self.assertEqual(x2.map_byte_map[TFrozenDict({42: 42, 100: -100})], 99)
-        self.assertEqual(x2.map_byte_map[TFrozenDict({0: 0})], 100)
-        self.assertEqual(x2.map_byte_map[TFrozenDict({})], 0)
-
-    def test_list(self):
-        """Test that annotated list field can be serialized and deserialized"""
-        x = CompactProtoTestStruct(list_byte_map={
-            (42, 100, -100): 99,
-            (0,): 100,
-            (): 0,
-        })
-        x2 = self._roundtrip(x, CompactProtoTestStruct())
-        self.assertEqual(x2.list_byte_map[(42, 100, -100)], 99)
-        self.assertEqual(x2.list_byte_map[(0,)], 100)
-        self.assertEqual(x2.list_byte_map[()], 0)
-
-    def test_empty_struct(self):
-        """Test that annotated empty struct can be serialized and deserialized"""
-        x = CompactProtoTestStruct(empty_struct_field=Empty())
-        x2 = self._roundtrip(x, CompactProtoTestStruct())
-        self.assertEqual(x2.empty_struct_field, Empty())
-
-    def test_struct(self):
-        """Test that annotated struct can be serialized and deserialized"""
-        x = Wrapper(foo=Empty())
-        self.assertEqual(x.foo, Empty())
-        x2 = self._roundtrip(x, Wrapper)
-        self.assertEqual(x2.foo, Empty())
-
-
-class TestFrozen(TestFrozenBase):
-    def protocol(self, trans):
-        return TBinaryProtocol.TBinaryProtocolFactory().getProtocol(trans)
-
-
-class TestFrozenAcceleratedBinary(TestFrozenBase):
-    def protocol(self, trans):
-        return TBinaryProtocol.TBinaryProtocolAcceleratedFactory(fallback=False).getProtocol(trans)
-
-
-class TestFrozenAcceleratedCompact(TestFrozenBase):
-    def protocol(self, trans):
-        return TCompactProtocol.TCompactProtocolAcceleratedFactory(fallback=False).getProtocol(trans)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    loader = unittest.TestLoader()
-    suite.addTest(loader.loadTestsFromTestCase(TestFrozen))
-    suite.addTest(loader.loadTestsFromTestCase(TestFrozenAcceleratedBinary))
-    suite.addTest(loader.loadTestsFromTestCase(TestFrozenAcceleratedCompact))
-    return suite
-
-if __name__ == "__main__":
-    unittest.main(defaultTest="suite", testRunner=unittest.TextTestRunner(verbosity=2))
diff --git a/vendor/git.apache.org/thrift.git/test/py/TestServer.py b/vendor/git.apache.org/thrift.git/test/py/TestServer.py
deleted file mode 100755
index 070560c..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/TestServer.py
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-from __future__ import division
-import logging
-import os
-import sys
-import time
-from optparse import OptionParser
-
-from util import local_libpath
-
-SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
-
-
-class TestHandler(object):
-    def testVoid(self):
-        if options.verbose > 1:
-            logging.info('testVoid()')
-
-    def testString(self, str):
-        if options.verbose > 1:
-            logging.info('testString(%s)' % str)
-        return str
-
-    def testBool(self, boolean):
-        if options.verbose > 1:
-            logging.info('testBool(%s)' % str(boolean).lower())
-        return boolean
-
-    def testByte(self, byte):
-        if options.verbose > 1:
-            logging.info('testByte(%d)' % byte)
-        return byte
-
-    def testI16(self, i16):
-        if options.verbose > 1:
-            logging.info('testI16(%d)' % i16)
-        return i16
-
-    def testI32(self, i32):
-        if options.verbose > 1:
-            logging.info('testI32(%d)' % i32)
-        return i32
-
-    def testI64(self, i64):
-        if options.verbose > 1:
-            logging.info('testI64(%d)' % i64)
-        return i64
-
-    def testDouble(self, dub):
-        if options.verbose > 1:
-            logging.info('testDouble(%f)' % dub)
-        return dub
-
-    def testBinary(self, thing):
-        if options.verbose > 1:
-            logging.info('testBinary()')  # TODO: hex output
-        return thing
-
-    def testStruct(self, thing):
-        if options.verbose > 1:
-            logging.info('testStruct({%s, %s, %s, %s})' % (thing.string_thing, thing.byte_thing, thing.i32_thing, thing.i64_thing))
-        return thing
-
-    def testException(self, arg):
-        # if options.verbose > 1:
-        logging.info('testException(%s)' % arg)
-        if arg == 'Xception':
-            raise Xception(errorCode=1001, message=arg)
-        elif arg == 'TException':
-            raise TException(message='This is a TException')
-
-    def testMultiException(self, arg0, arg1):
-        if options.verbose > 1:
-            logging.info('testMultiException(%s, %s)' % (arg0, arg1))
-        if arg0 == 'Xception':
-            raise Xception(errorCode=1001, message='This is an Xception')
-        elif arg0 == 'Xception2':
-            raise Xception2(
-                errorCode=2002,
-                struct_thing=Xtruct(string_thing='This is an Xception2'))
-        return Xtruct(string_thing=arg1)
-
-    def testOneway(self, seconds):
-        if options.verbose > 1:
-            logging.info('testOneway(%d) => sleeping...' % seconds)
-        time.sleep(seconds / 3)  # be quick
-        if options.verbose > 1:
-            logging.info('done sleeping')
-
-    def testNest(self, thing):
-        if options.verbose > 1:
-            logging.info('testNest(%s)' % thing)
-        return thing
-
-    def testMap(self, thing):
-        if options.verbose > 1:
-            logging.info('testMap(%s)' % thing)
-        return thing
-
-    def testStringMap(self, thing):
-        if options.verbose > 1:
-            logging.info('testStringMap(%s)' % thing)
-        return thing
-
-    def testSet(self, thing):
-        if options.verbose > 1:
-            logging.info('testSet(%s)' % thing)
-        return thing
-
-    def testList(self, thing):
-        if options.verbose > 1:
-            logging.info('testList(%s)' % thing)
-        return thing
-
-    def testEnum(self, thing):
-        if options.verbose > 1:
-            logging.info('testEnum(%s)' % thing)
-        return thing
-
-    def testTypedef(self, thing):
-        if options.verbose > 1:
-            logging.info('testTypedef(%s)' % thing)
-        return thing
-
-    def testMapMap(self, thing):
-        if options.verbose > 1:
-            logging.info('testMapMap(%s)' % thing)
-        return {
-            -4: {
-                -4: -4,
-                -3: -3,
-                -2: -2,
-                -1: -1,
-            },
-            4: {
-                4: 4,
-                3: 3,
-                2: 2,
-                1: 1,
-            },
-        }
-
-    def testInsanity(self, argument):
-        if options.verbose > 1:
-            logging.info('testInsanity(%s)' % argument)
-        return {
-            1: {
-                2: argument,
-                3: argument,
-            },
-            2: {6: Insanity()},
-        }
-
-    def testMulti(self, arg0, arg1, arg2, arg3, arg4, arg5):
-        if options.verbose > 1:
-            logging.info('testMulti(%s)' % [arg0, arg1, arg2, arg3, arg4, arg5])
-        return Xtruct(string_thing='Hello2',
-                      byte_thing=arg0, i32_thing=arg1, i64_thing=arg2)
-
-
-def main(options):
-    # set up the protocol factory form the --protocol option
-    prot_factories = {
-        'binary': TBinaryProtocol.TBinaryProtocolFactory,
-        'accel': TBinaryProtocol.TBinaryProtocolAcceleratedFactory,
-        'compact': TCompactProtocol.TCompactProtocolFactory,
-        'accelc': TCompactProtocol.TCompactProtocolAcceleratedFactory,
-        'json': TJSONProtocol.TJSONProtocolFactory,
-    }
-    pfactory_cls = prot_factories.get(options.proto, None)
-    if pfactory_cls is None:
-        raise AssertionError('Unknown --protocol option: %s' % options.proto)
-    pfactory = pfactory_cls()
-    try:
-        pfactory.string_length_limit = options.string_limit
-        pfactory.container_length_limit = options.container_limit
-    except:
-        # Ignore errors for those protocols that does not support length limit
-        pass
-
-    # get the server type (TSimpleServer, TNonblockingServer, etc...)
-    if len(args) > 1:
-        raise AssertionError('Only one server type may be specified, not multiple types.')
-    server_type = args[0]
-
-    # Set up the handler and processor objects
-    handler = TestHandler()
-    processor = ThriftTest.Processor(handler)
-
-    # Handle THttpServer as a special case
-    if server_type == 'THttpServer':
-        server = THttpServer.THttpServer(processor, ('', options.port), pfactory)
-        server.serve()
-        sys.exit(0)
-
-    # set up server transport and transport factory
-
-    abs_key_path = os.path.join(os.path.dirname(SCRIPT_DIR), 'keys', 'server.pem')
-
-    host = None
-    if options.ssl:
-        from thrift.transport import TSSLSocket
-        transport = TSSLSocket.TSSLServerSocket(host, options.port, certfile=abs_key_path)
-    else:
-        transport = TSocket.TServerSocket(host, options.port)
-    tfactory = TTransport.TBufferedTransportFactory()
-    if options.trans == 'buffered':
-        tfactory = TTransport.TBufferedTransportFactory()
-    elif options.trans == 'framed':
-        tfactory = TTransport.TFramedTransportFactory()
-    elif options.trans == '':
-        raise AssertionError('Unknown --transport option: %s' % options.trans)
-    else:
-        tfactory = TTransport.TBufferedTransportFactory()
-    # if --zlib, then wrap server transport, and use a different transport factory
-    if options.zlib:
-        transport = TZlibTransport.TZlibTransport(transport)  # wrap  with zlib
-        tfactory = TZlibTransport.TZlibTransportFactory()
-
-    # do server-specific setup here:
-    if server_type == "TNonblockingServer":
-        server = TNonblockingServer.TNonblockingServer(processor, transport, inputProtocolFactory=pfactory)
-    elif server_type == "TProcessPoolServer":
-        import signal
-        from thrift.server import TProcessPoolServer
-        server = TProcessPoolServer.TProcessPoolServer(processor, transport, tfactory, pfactory)
-        server.setNumWorkers(5)
-
-        def set_alarm():
-            def clean_shutdown(signum, frame):
-                for worker in server.workers:
-                    if options.verbose > 0:
-                        logging.info('Terminating worker: %s' % worker)
-                    worker.terminate()
-                if options.verbose > 0:
-                    logging.info('Requesting server to stop()')
-                try:
-                    server.stop()
-                except:
-                    pass
-            signal.signal(signal.SIGALRM, clean_shutdown)
-            signal.alarm(4)
-        set_alarm()
-    else:
-        # look up server class dynamically to instantiate server
-        ServerClass = getattr(TServer, server_type)
-        server = ServerClass(processor, transport, tfactory, pfactory)
-    # enter server main loop
-    server.serve()
-
-if __name__ == '__main__':
-    parser = OptionParser()
-    parser.add_option('--libpydir', type='string', dest='libpydir',
-                      help='include this directory to sys.path for locating library code')
-    parser.add_option('--genpydir', type='string', dest='genpydir',
-                      default='gen-py',
-                      help='include this directory to sys.path for locating generated code')
-    parser.add_option("--port", type="int", dest="port",
-                      help="port number for server to listen on")
-    parser.add_option("--zlib", action="store_true", dest="zlib",
-                      help="use zlib wrapper for compressed transport")
-    parser.add_option("--ssl", action="store_true", dest="ssl",
-                      help="use SSL for encrypted transport")
-    parser.add_option('-v', '--verbose', action="store_const",
-                      dest="verbose", const=2,
-                      help="verbose output")
-    parser.add_option('-q', '--quiet', action="store_const",
-                      dest="verbose", const=0,
-                      help="minimal output")
-    parser.add_option('--protocol', dest="proto", type="string",
-                      help="protocol to use, one of: accel, binary, compact, json")
-    parser.add_option('--transport', dest="trans", type="string",
-                      help="transport to use, one of: buffered, framed")
-    parser.add_option('--container-limit', dest='container_limit', type='int', default=None)
-    parser.add_option('--string-limit', dest='string_limit', type='int', default=None)
-    parser.set_defaults(port=9090, verbose=1, proto='binary')
-    options, args = parser.parse_args()
-
-    # Print TServer log to stdout so that the test-runner can redirect it to log files
-    logging.basicConfig(level=options.verbose)
-
-    sys.path.insert(0, os.path.join(SCRIPT_DIR, options.genpydir))
-    sys.path.insert(0, local_libpath())
-
-    from ThriftTest import ThriftTest
-    from ThriftTest.ttypes import Xtruct, Xception, Xception2, Insanity
-    from thrift.Thrift import TException
-    from thrift.transport import TTransport
-    from thrift.transport import TSocket
-    from thrift.transport import TZlibTransport
-    from thrift.protocol import TBinaryProtocol
-    from thrift.protocol import TCompactProtocol
-    from thrift.protocol import TJSONProtocol
-    from thrift.server import TServer, TNonblockingServer, THttpServer
-
-    sys.exit(main(options))
diff --git a/vendor/git.apache.org/thrift.git/test/py/TestSocket.py b/vendor/git.apache.org/thrift.git/test/py/TestSocket.py
deleted file mode 100755
index a3c5ff0..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/TestSocket.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from thrift.transport import TSocket
-import unittest
-import time
-import socket
-import random
-
-
-class TimeoutTest(unittest.TestCase):
-    def setUp(self):
-        for i in range(50):
-            try:
-                # find a port we can use
-                self.listen_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                self.port = random.randint(10000, 30000)
-                self.listen_sock.bind(('localhost', self.port))
-                self.listen_sock.listen(5)
-                break
-            except:
-                if i == 49:
-                    raise
-
-    def testConnectTimeout(self):
-        starttime = time.time()
-
-        try:
-            leaky = []
-            for i in range(100):
-                socket = TSocket.TSocket('localhost', self.port)
-                socket.setTimeout(10)
-                socket.open()
-                leaky.append(socket)
-        except:
-            self.assert_(time.time() - starttime < 5.0)
-
-    def testWriteTimeout(self):
-        starttime = time.time()
-
-        try:
-            socket = TSocket.TSocket('localhost', self.port)
-            socket.setTimeout(10)
-            socket.open()
-            lsock = self.listen_sock.accept()
-            while True:
-                lsock.write("hi" * 100)
-
-        except:
-            self.assert_(time.time() - starttime < 5.0)
-
-if __name__ == '__main__':
-    suite = unittest.TestSuite()
-    loader = unittest.TestLoader()
-
-    suite.addTest(loader.loadTestsFromTestCase(TimeoutTest))
-
-    testRunner = unittest.TextTestRunner(verbosity=2)
-    testRunner.run(suite)
diff --git a/vendor/git.apache.org/thrift.git/test/py/TestSyntax.py b/vendor/git.apache.org/thrift.git/test/py/TestSyntax.py
deleted file mode 100755
index dbe7975..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/TestSyntax.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Just import these generated files to make sure they are syntactically valid
-from DebugProtoTest import EmptyService  # noqa
-from DebugProtoTest import Inherited  # noqa
diff --git a/vendor/git.apache.org/thrift.git/test/py/explicit_module/runtest.sh b/vendor/git.apache.org/thrift.git/test/py/explicit_module/runtest.sh
deleted file mode 100755
index 6d73462..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/explicit_module/runtest.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-rm -rf gen-py
-../../../compiler/cpp/thrift --gen py test1.thrift || exit 1
-../../../compiler/cpp/thrift --gen py test2.thrift || exit 1
-../../../compiler/cpp/thrift --gen py test3.thrift && exit 1  # Fail since test3.thrift has python keywords
-PYTHONPATH=./gen-py python -c 'import foo.bar.baz' || exit 1
-PYTHONPATH=./gen-py python -c 'import test2' || exit 1
-PYTHONPATH=./gen-py python -c 'import test1' &>/dev/null && exit 1  # Should fail.
-cp -r gen-py simple
-../../../compiler/cpp/thrift -r --gen py test2.thrift || exit 1
-PYTHONPATH=./gen-py python -c 'import test2' || exit 1
-diff -ur simple gen-py > thediffs
-file thediffs | grep -s -q empty || exit 1
-rm -rf simple thediffs
-echo 'All tests pass!'
diff --git a/vendor/git.apache.org/thrift.git/test/py/explicit_module/test1.thrift b/vendor/git.apache.org/thrift.git/test/py/explicit_module/test1.thrift
deleted file mode 100644
index ec600d7..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/explicit_module/test1.thrift
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace py foo.bar.baz
-
-struct astruct {
-  1: i32 how_unoriginal;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/py/explicit_module/test2.thrift b/vendor/git.apache.org/thrift.git/test/py/explicit_module/test2.thrift
deleted file mode 100644
index 68f9da4..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/explicit_module/test2.thrift
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-include "test1.thrift"
-
-struct another {
-  1: test1.astruct something;
-}
diff --git a/vendor/git.apache.org/thrift.git/test/py/explicit_module/test3.thrift b/vendor/git.apache.org/thrift.git/test/py/explicit_module/test3.thrift
deleted file mode 100644
index 154786b..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/explicit_module/test3.thrift
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace py validations
-
-struct from {
-  1: i32 def;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/py/generate.cmake b/vendor/git.apache.org/thrift.git/test/py/generate.cmake
deleted file mode 100644
index 44c5357..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/generate.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-macro(GENERATE FILENAME GENERATOR OUTPUTDIR)
-  file(MAKE_DIRECTORY ${MY_CURRENT_BINARY_DIR}/${OUTPUTDIR})
-  execute_process(COMMAND ${THRIFTCOMPILER} --gen ${GENERATOR} -out ${MY_CURRENT_BINARY_DIR}/${OUTPUTDIR} ${FILENAME}
-                  RESULT_VARIABLE CMD_RESULT)
-  if(CMD_RESULT)
-        message(FATAL_ERROR "Error generating ${FILENAME} with generator ${GENERATOR}")
-  endif()
-endmacro(GENERATE)
-
-generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py gen-py-default)
-generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:slots gen-py-slots)
-generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:old_style gen-py-oldstyle)
-generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:no_utf8strings gen-py-no_utf8strings)
-generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:dynamic gen-py-dynamic)
-generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:dynamic,slots gen-py-dynamicslots)
-
-generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py gen-py-default)
-generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:slots gen-py-slots)
-generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:old_style gen-py-oldstyle)
-generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:no_utf8strings gen-py-no_utf8strings)
-generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:dynamic gen-py-dynamic)
-generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:dynamic,slots gen-py-dynamicslots)
diff --git a/vendor/git.apache.org/thrift.git/test/py/setup.cfg b/vendor/git.apache.org/thrift.git/test/py/setup.cfg
deleted file mode 100644
index 7da1f96..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[flake8]
-max-line-length = 100
diff --git a/vendor/git.apache.org/thrift.git/test/py/util.py b/vendor/git.apache.org/thrift.git/test/py/util.py
deleted file mode 100644
index c2b3f5c..0000000
--- a/vendor/git.apache.org/thrift.git/test/py/util.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import os
-import sys
-
-_SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
-_ROOT_DIR = os.path.dirname(os.path.dirname(_SCRIPT_DIR))
-
-
-def local_libpath():
-    globdir = os.path.join(_ROOT_DIR, 'lib', 'py', 'build', 'lib.*')
-    for libpath in glob.glob(globdir):
-        if libpath.endswith('-%d.%d' % (sys.version_info[0], sys.version_info[1])):
-            return libpath
diff --git a/vendor/git.apache.org/thrift.git/test/rb/Gemfile b/vendor/git.apache.org/thrift.git/test/rb/Gemfile
deleted file mode 100644
index 58c04aa..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-require "rubygems"
-
-gem "rack", "~> 1.5.2"
-gem "thin", "~> 1.5.0"
-gem "test-unit"
diff --git a/vendor/git.apache.org/thrift.git/test/rb/Makefile.am b/vendor/git.apache.org/thrift.git/test/rb/Makefile.am
deleted file mode 100644
index 7b74c6c..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-stubs: $(THRIFT) ../ThriftTest.thrift ../SmallTest.thrift
-	$(THRIFT) --gen rb ../ThriftTest.thrift
-	$(THRIFT) --gen rb ../SmallTest.thrift
-
-precross: stubs
-
-check: stubs
-if HAVE_BUNDLER
-	$(BUNDLER) install
-	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
-endif
-
diff --git a/vendor/git.apache.org/thrift.git/test/rb/benchmarks/protocol_benchmark.rb b/vendor/git.apache.org/thrift.git/test/rb/benchmarks/protocol_benchmark.rb
deleted file mode 100644
index 05a8ee5..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/benchmarks/protocol_benchmark.rb
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. .. .. lib rb lib])
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. .. .. lib rb ext])
-
-require 'thrift'
-
-require 'benchmark'
-require 'rubygems'
-require 'set'
-require 'pp'
-
-# require 'ruby-debug'
-# require 'ruby-prof'
-
-require File.join(File.dirname(__FILE__), '../fixtures/structs')
-
-transport1 = Thrift::MemoryBuffer.new
-ruby_binary_protocol = Thrift::BinaryProtocol.new(transport1)
-
-transport2 = Thrift::MemoryBuffer.new
-c_fast_binary_protocol = Thrift::BinaryProtocolAccelerated.new(transport2)
-
-
-ooe = Fixtures::Structs::OneOfEach.new
-ooe.im_true   = true
-ooe.im_false  = false
-ooe.a_bite    = -42
-ooe.integer16 = 27000
-ooe.integer32 = 1<<24
-ooe.integer64 = 6000 * 1000 * 1000
-ooe.double_precision = Math::PI
-ooe.some_characters  = "Debug THIS!"
-ooe.zomg_unicode     = "\xd7\n\a\t"
-
-n1 = Fixtures::Structs::Nested1.new
-n1.a_list = []
-n1.a_list << ooe << ooe << ooe << ooe
-n1.i32_map = {}
-n1.i32_map[1234] = ooe
-n1.i32_map[46345] = ooe
-n1.i32_map[-34264] = ooe
-n1.i64_map = {}
-n1.i64_map[43534986783945] = ooe
-n1.i64_map[-32434639875122] = ooe
-n1.dbl_map = {}
-n1.dbl_map[324.65469834] = ooe
-n1.dbl_map[-9458672340.4986798345112] = ooe
-n1.str_map = {}
-n1.str_map['sdoperuix'] = ooe
-n1.str_map['pwoerxclmn'] = ooe
-
-n2 = Fixtures::Structs::Nested2.new
-n2.a_list = []
-n2.a_list << n1 << n1 << n1 << n1 << n1
-n2.i32_map = {}
-n2.i32_map[398345] = n1
-n2.i32_map[-2345] = n1
-n2.i32_map[12312] = n1
-n2.i64_map = {}
-n2.i64_map[2349843765934] = n1
-n2.i64_map[-123234985495] = n1
-n2.i64_map[0] = n1
-n2.dbl_map = {}
-n2.dbl_map[23345345.38927834] = n1
-n2.dbl_map[-1232349.5489345] = n1
-n2.dbl_map[-234984574.23498725] = n1
-n2.str_map = {}
-n2.str_map[''] = n1
-n2.str_map['sdflkertpioux'] = n1
-n2.str_map['sdfwepwdcjpoi'] = n1
-
-n3 = Fixtures::Structs::Nested3.new
-n3.a_list = []
-n3.a_list << n2 << n2 << n2 << n2 << n2
-n3.i32_map = {}
-n3.i32_map[398345] = n2
-n3.i32_map[-2345] = n2
-n3.i32_map[12312] = n2
-n3.i64_map = {}
-n3.i64_map[2349843765934] = n2
-n3.i64_map[-123234985495] = n2
-n3.i64_map[0] = n2
-n3.dbl_map = {}
-n3.dbl_map[23345345.38927834] = n2
-n3.dbl_map[-1232349.5489345] = n2
-n3.dbl_map[-234984574.23498725] = n2
-n3.str_map = {}
-n3.str_map[''] = n2
-n3.str_map['sdflkertpioux'] = n2
-n3.str_map['sdfwepwdcjpoi'] = n2
-
-n4 = Fixtures::Structs::Nested4.new
-n4.a_list = []
-n4.a_list << n3
-n4.i32_map = {}
-n4.i32_map[-2345] = n3
-n4.i64_map = {}
-n4.i64_map[2349843765934] = n3
-n4.dbl_map = {}
-n4.dbl_map[-1232349.5489345] = n3
-n4.str_map = {}
-n4.str_map[''] = n3
-
-
-# prof = RubyProf.profile do
-#   n4.write(c_fast_binary_protocol)
-#   Fixtures::Structs::Nested4.new.read(c_fast_binary_protocol)
-# end
-# 
-# printer = RubyProf::GraphHtmlPrinter.new(prof)
-# printer.print(STDOUT, :min_percent=>0)
-
-Benchmark.bmbm do |x|
-  x.report("ruby write large (1MB) structure once") do
-    n4.write(ruby_binary_protocol)
-  end
-  
-  x.report("ruby read large (1MB) structure once") do
-    Fixtures::Structs::Nested4.new.read(ruby_binary_protocol)
-  end
-  
-  x.report("c write large (1MB) structure once") do    
-    n4.write(c_fast_binary_protocol)
-  end
-  
-  x.report("c read large (1MB) structure once") do
-    Fixtures::Structs::Nested4.new.read(c_fast_binary_protocol)
-  end
-  
-  
-  
-  x.report("ruby write 10_000 small structures") do
-    10_000.times do
-      ooe.write(ruby_binary_protocol)
-    end
-  end
-  
-  x.report("ruby read 10_000 small structures") do
-    10_000.times do
-      Fixtures::Structs::OneOfEach.new.read(ruby_binary_protocol)
-    end
-  end
-  
-  x.report("c write 10_000 small structures") do
-    10_000.times do
-      ooe.write(c_fast_binary_protocol)
-    end
-  end
-  
-  x.report("c read 10_000 small structures") do
-    10_000.times do
-      Fixtures::Structs::OneOfEach.new.read(c_fast_binary_protocol)
-    end
-  end
-  
-end
diff --git a/vendor/git.apache.org/thrift.git/test/rb/core/test_backwards_compatability.rb b/vendor/git.apache.org/thrift.git/test/rb/core/test_backwards_compatability.rb
deleted file mode 100644
index 0577515..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/core/test_backwards_compatability.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require File.join(File.dirname(__FILE__), '../test_helper')
-
-require 'thrift'
-
-class TestThriftException < Test::Unit::TestCase
-  def test_has_accessible_message
-    msg = "hi there thrift"
-    assert_equal msg, Thrift::Exception.new(msg).message
-  end
-end
-
diff --git a/vendor/git.apache.org/thrift.git/test/rb/core/test_exceptions.rb b/vendor/git.apache.org/thrift.git/test/rb/core/test_exceptions.rb
deleted file mode 100644
index f41587a..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/core/test_exceptions.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require File.join(File.dirname(__FILE__), '../test_helper')
-
-require 'thrift'
-
-class TestException < Test::Unit::TestCase
-  def test_has_accessible_message
-    msg = "hi there thrift"
-    assert_equal msg, Thrift::Exception.new(msg).message
-  end
-end
-
diff --git a/vendor/git.apache.org/thrift.git/test/rb/core/transport/test_transport.rb b/vendor/git.apache.org/thrift.git/test/rb/core/transport/test_transport.rb
deleted file mode 100644
index 37afa85..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/core/transport/test_transport.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require File.join(File.dirname(__FILE__), '../../test_helper')
-
-require 'thrift'
-
-class DummyTransport < Thrift::BaseTransport
-  def initialize(data)
-    @data = data
-  end
-  
-  def read(size)
-    @data.slice!(0, size)
-  end
-end
-
-# TTransport is basically an abstract class, but isn't raising NotImplementedError
-class TestThriftTransport < Test::Unit::TestCase
-  def setup
-    @trans = Thrift::BaseTransport.new
-  end
-  
-  def test_open?
-    assert_nil @trans.open?
-  end
-  
-  def test_open
-    assert_nil @trans.open
-  end
-  
-  def test_close
-    assert_nil @trans.close
-  end
-  
-  # TODO:
-  # This doesn't necessarily test he right thing.
-  # It _looks_ like read isn't guaranteed to return the length
-  # you ask for and read_all is. This means our test needs to check
-  # for blocking. -- Kevin Clark 3/27/08
-  def test_read_all
-    # Implements read
-    t = DummyTransport.new("hello")
-    assert_equal "hello", t.read_all(5)
-  end
-  
-  def test_write
-    assert_nil @trans.write(5) # arbitrary value
-  end
-  
-  def test_flush
-    assert_nil @trans.flush
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/test/rb/fixtures/structs.rb b/vendor/git.apache.org/thrift.git/test/rb/fixtures/structs.rb
deleted file mode 100644
index ebbeb0a..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/fixtures/structs.rb
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'thrift'
-
-module Fixtures
-  module Structs
-    class OneBool
-      include Thrift::Struct
-      attr_accessor :bool
-      FIELDS = {
-        1 => {:type => Thrift::Types::BOOL, :name => 'bool'}
-      }
-
-      def validate
-      end
-    end
-    
-    class OneByte
-      include Thrift::Struct
-      attr_accessor :byte
-      FIELDS = {
-        1 => {:type => Thrift::Types::BYTE, :name => 'byte'}
-      }
-
-      def validate
-      end
-    end
-    
-    class OneI16
-      include Thrift::Struct
-      attr_accessor :i16
-      FIELDS = {
-        1 => {:type => Thrift::Types::I16, :name => 'i16'}
-      }
-
-      def validate
-      end
-    end
-    
-    class OneI32
-      include Thrift::Struct
-      attr_accessor :i32
-      FIELDS = {
-        1 => {:type => Thrift::Types::I32, :name => 'i32'}
-      }
-
-      def validate
-      end
-    end
-    
-    class OneI64
-      include Thrift::Struct
-      attr_accessor :i64
-      FIELDS = {
-        1 => {:type => Thrift::Types::I64, :name => 'i64'}
-      }
-
-      def validate
-      end
-    end
-    
-    class OneDouble
-      include Thrift::Struct
-      attr_accessor :double
-      FIELDS = {
-        1 => {:type => Thrift::Types::DOUBLE, :name => 'double'}
-      }
-
-      def validate
-      end
-    end
-    
-    class OneString
-      include Thrift::Struct
-      attr_accessor :string
-      FIELDS = {
-        1 => {:type => Thrift::Types::STRING, :name => 'string'}
-      }
-
-      def validate
-      end
-    end
-    
-    class OneMap
-      include Thrift::Struct
-      attr_accessor :map
-      FIELDS = {
-        1 => {:type => Thrift::Types::MAP, :name => 'map', :key => {:type => Thrift::Types::STRING}, :value => {:type => Thrift::Types::STRING}}
-      }
-
-      def validate
-      end
-    end
-    
-    class NestedMap
-      include Thrift::Struct
-      attr_accessor :map
-      FIELDS = {
-        0 => {:type => Thrift::Types::MAP, :name => 'map', :key => {:type => Thrift::Types::I32}, :value => {:type => Thrift::Types::MAP, :key => {:type => Thrift::Types::I32}, :value => {:type => Thrift::Types::I32}}}
-      }
-
-      def validate
-      end
-    end
-    
-    class OneList
-      include Thrift::Struct
-      attr_accessor :list
-      FIELDS = {
-        1 => {:type => Thrift::Types::LIST, :name => 'list', :element => {:type => Thrift::Types::STRING}}
-      }
-
-      def validate
-      end
-    end
-    
-    class NestedList
-      include Thrift::Struct
-      attr_accessor :list
-      FIELDS = {
-        0 => {:type => Thrift::Types::LIST, :name => 'list', :element => {:type => Thrift::Types::LIST, :element => { :type => Thrift::Types::I32 } } }
-      }
-
-      def validate
-      end
-    end
-    
-    class OneSet
-      include Thrift::Struct
-      attr_accessor :set
-      FIELDS = {
-        1 => {:type => Thrift::Types::SET, :name => 'set', :element => {:type => Thrift::Types::STRING}}
-      }
-
-      def validate
-      end
-    end
-    
-    class NestedSet
-      include Thrift::Struct
-      attr_accessor :set
-      FIELDS = {
-        1 => {:type => Thrift::Types::SET, :name => 'set', :element => {:type => Thrift::Types::SET, :element => { :type => Thrift::Types::STRING } }}
-      }
-
-      def validate
-      end
-    end
-    
-    # struct OneOfEach {
-    #   1: bool im_true,
-    #   2: bool im_false,
-    #   3: byte a_bite,
-    #   4: i16 integer16,
-    #   5: i32 integer32,
-    #   6: i64 integer64,
-    #   7: double double_precision,
-    #   8: string some_characters,
-    #   9: string zomg_unicode,
-    #   10: bool what_who,
-    #   11: binary base64,
-    # }
-    class OneOfEach
-      include Thrift::Struct
-      attr_accessor :im_true, :im_false, :a_bite, :integer16, :integer32, :integer64, :double_precision, :some_characters, :zomg_unicode, :what_who, :base64
-      FIELDS = {
-        1 => {:type => Thrift::Types::BOOL, :name => 'im_true'},
-        2 => {:type => Thrift::Types::BOOL, :name => 'im_false'},
-        3 => {:type => Thrift::Types::BYTE, :name => 'a_bite'},
-        4 => {:type => Thrift::Types::I16, :name => 'integer16'},
-        5 => {:type => Thrift::Types::I32, :name => 'integer32'},
-        6 => {:type => Thrift::Types::I64, :name => 'integer64'},
-        7 => {:type => Thrift::Types::DOUBLE, :name => 'double_precision'},
-        8 => {:type => Thrift::Types::STRING, :name => 'some_characters'},
-        9 => {:type => Thrift::Types::STRING, :name => 'zomg_unicode'},
-        10 => {:type => Thrift::Types::BOOL, :name => 'what_who'},
-        11 => {:type => Thrift::Types::STRING, :name => 'base64'}
-      }
-
-      # Added for assert_equal
-      def ==(other)
-        [:im_true, :im_false, :a_bite, :integer16, :integer32, :integer64, :double_precision, :some_characters, :zomg_unicode, :what_who, :base64].each do |f|
-          var = "@#{f}"
-          return false if instance_variable_get(var) != other.instance_variable_get(var)
-        end
-        true
-      end
-
-      def validate
-      end
-    end
-
-    # struct Nested1 {
-    #   1: list<OneOfEach> a_list
-    #   2: map<i32, OneOfEach> i32_map
-    #   3: map<i64, OneOfEach> i64_map
-    #   4: map<double, OneOfEach> dbl_map
-    #   5: map<string, OneOfEach> str_map
-    # }
-    class Nested1
-      include Thrift::Struct
-      attr_accessor :a_list, :i32_map, :i64_map, :dbl_map, :str_map
-      FIELDS = {
-        1 => {:type => Thrift::Types::LIST, :name => 'a_list', :element => {:type => Thrift::Types::STRUCT, :class => OneOfEach}},
-        2 => {:type => Thrift::Types::MAP, :name => 'i32_map', :key => {:type => Thrift::Types::I32}, :value => {:type => Thrift::Types::STRUCT, :class => OneOfEach}},
-        3 => {:type => Thrift::Types::MAP, :name => 'i64_map', :key => {:type => Thrift::Types::I64}, :value => {:type => Thrift::Types::STRUCT, :class => OneOfEach}},
-        4 => {:type => Thrift::Types::MAP, :name => 'dbl_map', :key => {:type => Thrift::Types::DOUBLE}, :value => {:type => Thrift::Types::STRUCT, :class => OneOfEach}},
-        5 => {:type => Thrift::Types::MAP, :name => 'str_map', :key => {:type => Thrift::Types::STRING}, :value => {:type => Thrift::Types::STRUCT, :class => OneOfEach}}
-      }
-
-      def validate
-      end
-    end
-
-    # struct Nested2 {
-    #   1: list<Nested1> a_list
-    #   2: map<i32, Nested1> i32_map
-    #   3: map<i64, Nested1> i64_map
-    #   4: map<double, Nested1> dbl_map
-    #   5: map<string, Nested1> str_map
-    # }
-    class Nested2
-      include Thrift::Struct
-      attr_accessor :a_list, :i32_map, :i64_map, :dbl_map, :str_map
-      FIELDS = {
-        1 => {:type => Thrift::Types::LIST, :name => 'a_list', :element => {:type => Thrift::Types::STRUCT, :class => Nested1}},
-        2 => {:type => Thrift::Types::MAP, :name => 'i32_map', :key => {:type => Thrift::Types::I32}, :value => {:type => Thrift::Types::STRUCT, :class => Nested1}},
-        3 => {:type => Thrift::Types::MAP, :name => 'i64_map', :key => {:type => Thrift::Types::I64}, :value => {:type => Thrift::Types::STRUCT, :class => Nested1}},
-        4 => {:type => Thrift::Types::MAP, :name => 'dbl_map', :key => {:type => Thrift::Types::DOUBLE}, :value => {:type => Thrift::Types::STRUCT, :class => Nested1}},
-        5 => {:type => Thrift::Types::MAP, :name => 'str_map', :key => {:type => Thrift::Types::STRING}, :value => {:type => Thrift::Types::STRUCT, :class => Nested1}}
-      }
-
-      def validate
-      end
-    end
-
-    # struct Nested3 {
-    #   1: list<Nested2> a_list
-    #   2: map<i32, Nested2> i32_map
-    #   3: map<i64, Nested2> i64_map
-    #   4: map<double, Nested2> dbl_map
-    #   5: map<string, Nested2> str_map
-    # }
-    class Nested3
-      include Thrift::Struct
-      attr_accessor :a_list, :i32_map, :i64_map, :dbl_map, :str_map
-      FIELDS = {
-        1 => {:type => Thrift::Types::LIST, :name => 'a_list', :element => {:type => Thrift::Types::STRUCT, :class => Nested2}},
-        2 => {:type => Thrift::Types::MAP, :name => 'i32_map', :key => {:type => Thrift::Types::I32}, :value => {:type => Thrift::Types::STRUCT, :class => Nested2}},
-        3 => {:type => Thrift::Types::MAP, :name => 'i64_map', :key => {:type => Thrift::Types::I64}, :value => {:type => Thrift::Types::STRUCT, :class => Nested2}},
-        4 => {:type => Thrift::Types::MAP, :name => 'dbl_map', :key => {:type => Thrift::Types::DOUBLE}, :value => {:type => Thrift::Types::STRUCT, :class => Nested2}},
-        5 => {:type => Thrift::Types::MAP, :name => 'str_map', :key => {:type => Thrift::Types::STRING}, :value => {:type => Thrift::Types::STRUCT, :class => Nested2}}
-      }
-
-      def validate
-      end
-    end
-
-    # struct Nested4 {
-    #   1: list<Nested3> a_list
-    #   2: map<i32, Nested3> i32_map
-    #   3: map<i64, Nested3> i64_map
-    #   4: map<double, Nested3> dbl_map
-    #   5: map<string, Nested3> str_map
-    # }
-    class Nested4
-      include Thrift::Struct
-      attr_accessor :a_list, :i32_map, :i64_map, :dbl_map, :str_map
-      FIELDS = {
-        1 => {:type => Thrift::Types::LIST, :name => 'a_list', :element => {:type => Thrift::Types::STRUCT, :class => Nested3}},
-        2 => {:type => Thrift::Types::MAP, :name => 'i32_map', :key => {:type => Thrift::Types::I32}, :value => {:type => Thrift::Types::STRUCT, :class => Nested3}},
-        3 => {:type => Thrift::Types::MAP, :name => 'i64_map', :key => {:type => Thrift::Types::I64}, :value => {:type => Thrift::Types::STRUCT, :class => Nested3}},
-        4 => {:type => Thrift::Types::MAP, :name => 'dbl_map', :key => {:type => Thrift::Types::DOUBLE}, :value => {:type => Thrift::Types::STRUCT, :class => Nested3}},
-        5 => {:type => Thrift::Types::MAP, :name => 'str_map', :key => {:type => Thrift::Types::STRING}, :value => {:type => Thrift::Types::STRUCT, :class => Nested3}}
-      }
-
-      def validate
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/test/rb/generation/test_enum.rb b/vendor/git.apache.org/thrift.git/test/rb/generation/test_enum.rb
deleted file mode 100644
index 607ea66..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/generation/test_enum.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require File.join(File.dirname(__FILE__), '../test_helper')
-require 'thrift_test'
-
-class TestEnumGeneration < Test::Unit::TestCase
-  include Thrift::Test
-  def test_enum_valid_values
-    assert_equal(Numberz::VALID_VALUES, Set.new([Numberz::ONE, Numberz::TWO, Numberz::THREE, Numberz::FIVE, Numberz::SIX, Numberz::EIGHT]))
-  end
-  
-  def test_enum_hash
-    Numberz::VALID_VALUES.each do |value|
-      assert_equal(Numberz.const_get(Numberz::VALUE_MAP[value].to_sym), value)
-    end
-  end
-end
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/rb/generation/test_struct.rb b/vendor/git.apache.org/thrift.git/test/rb/generation/test_struct.rb
deleted file mode 100644
index 3bd4fc9..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/generation/test_struct.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require File.join(File.dirname(__FILE__), '../test_helper')
-require 'small_service'
-
-class TestStructGeneration < Test::Unit::TestCase
-
-  def test_default_values
-    hello = TestNamespace::Hello.new
-
-    assert_kind_of(TestNamespace::Hello, hello)
-    assert_nil(hello.complexer)
-
-    assert_equal(hello.simple, 53)
-    assert_equal(hello.words, 'words')
-
-    assert_kind_of(TestNamespace::Goodbyez, hello.thinz)
-    assert_equal(hello.thinz.val, 36632)
-
-    assert_kind_of(Hash, hello.complex)
-    assert_equal(hello.complex, { 6243 => 632, 2355 => 532, 23 => 532})
-    
-    bool_passer = TestNamespace::BoolPasser.new(:value => false)
-    assert_equal false, bool_passer.value
-  end
-
-  def test_goodbyez
-    assert_equal(TestNamespace::Goodbyez.new.val, 325)
-  end
-
-end
diff --git a/vendor/git.apache.org/thrift.git/test/rb/integration/TestClient.rb b/vendor/git.apache.org/thrift.git/test/rb/integration/TestClient.rb
deleted file mode 100755
index beebe44..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/integration/TestClient.rb
+++ /dev/null
@@ -1,353 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$:.push File.dirname(__FILE__) + '/..'
-
-require 'test_helper'
-require 'thrift'
-require 'thrift_test'
-
-$protocolType = "binary"
-$host = "localhost"
-$port = 9090
-$transport = "buffered"
-ARGV.each do|a|
-  if a == "--help"
-    puts "Allowed options:"
-    puts "\t -h [ --help ] \t produce help message"
-    puts "\t--host arg (=localhost) \t Host to connect"
-    puts "\t--port arg (=9090) \t Port number to listen"
-    puts "\t--protocol arg (=binary) \t protocol: binary, accel"
-    puts "\t--transport arg (=buffered) transport: buffered, framed, http"
-    exit
-  elsif a.start_with?("--host")
-    $host = a.split("=")[1]
-  elsif a.start_with?("--protocol")
-    $protocolType = a.split("=")[1]
-  elsif a.start_with?("--transport")
-    $transport = a.split("=")[1]
-  elsif a.start_with?("--port")
-    $port = a.split("=")[1].to_i
-  end
-end
-ARGV=[]
-
-class SimpleClientTest < Test::Unit::TestCase
-  def setup
-    unless @socket
-      @socket   = Thrift::Socket.new($host, $port)
-      if $transport == "buffered"
-        transportFactory = Thrift::BufferedTransport.new(@socket)
-      elsif $transport == "framed"
-        transportFactory = Thrift::FramedTransport.new(@socket)
-      else
-        raise 'Unknown transport type'
-      end
-
-      if $protocolType == "binary"
-        @protocol = Thrift::BinaryProtocol.new(transportFactory)
-      elsif $protocolType == "compact"
-        @protocol = Thrift::CompactProtocol.new(transportFactory)
-      elsif $protocolType == "json"
-        @protocol = Thrift::JsonProtocol.new(transportFactory)
-      elsif $protocolType == "accel"
-        @protocol = Thrift::BinaryProtocolAccelerated.new(transportFactory)
-      else
-        raise 'Unknown protocol type'
-      end
-      @client   = Thrift::Test::ThriftTest::Client.new(@protocol)
-      @socket.open
-    end
-  end
-
-  def teardown
-    @socket.close
-  end
-
-  def test_void
-    p 'test_void'
-    @client.testVoid()
-  end
-
-  def test_string
-    p 'test_string'
-    test_string =
-      'quote: \" backslash:' +
-      ' forwardslash-escaped: \/ ' +
-      ' backspace: \b formfeed: \f newline: \n return: \r tab: ' +
-      ' now-all-of-them-together: "\\\/\b\n\r\t' +
-      ' now-a-bunch-of-junk: !@#$%&()(&%$#{}{}<><><' +
-      ' char-to-test-json-parsing: ]] \"]] \\" }}}{ [[[ '
-    test_string = "Afrikaans, Alemannisch, Aragonés, العربية, مصرى, " +
-      "Asturianu, Aymar aru, Azərbaycan, Башҡорт, Boarisch, Žemaitėška, " +
-      "Беларуская, Беларуская (тарашкевіца), Български, Bamanankan, " +
-      "বাংলা, Brezhoneg, Bosanski, Català, Mìng-dĕ̤ng-ngṳ̄, Нохчийн, " +
-      "Cebuano, ᏣᎳᎩ, Česky, Словѣ́ньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ, Чӑвашла, Cymraeg, " +
-      "Dansk, Zazaki, ދިވެހިބަސް, Ελληνικά, Emiliàn e rumagnòl, English, " +
-      "Esperanto, Español, Eesti, Euskara, فارسی, Suomi, Võro, Føroyskt, " +
-      "Français, Arpetan, Furlan, Frysk, Gaeilge, 贛語, Gàidhlig, Galego, " +
-      "Avañe'ẽ, ગુજરાતી, Gaelg, עברית, हिन्दी, Fiji Hindi, Hrvatski, " +
-      "Kreyòl ayisyen, Magyar, Հայերեն, Interlingua, Bahasa Indonesia, " +
-      "Ilokano, Ido, Íslenska, Italiano, 日本語, Lojban, Basa Jawa, " +
-      "ქართული, Kongo, Kalaallisut, ಕನ್ನಡ, 한국어, Къарачай-Малкъар, " +
-      "Ripoarisch, Kurdî, Коми, Kernewek, Кыргызча, Latina, Ladino, " +
-      "Lëtzebuergesch, Limburgs, Lingála, ລາວ, Lietuvių, Latviešu, Basa " +
-      "Banyumasan, Malagasy, Македонски, മലയാളം, मराठी, مازِرونی, Bahasa " +
-      "Melayu, Nnapulitano, Nedersaksisch, नेपाल भाषा, Nederlands, ‪" +
-      "Norsk (nynorsk)‬, ‪Norsk (bokmål)‬, Nouormand, Diné bizaad, " +
-      "Occitan, Иронау, Papiamentu, Deitsch, Polski, پنجابی, پښتو, " +
-      "Norfuk / Pitkern, Português, Runa Simi, Rumantsch, Romani, Română, " +
-      "Русский, Саха тыла, Sardu, Sicilianu, Scots, Sámegiella, Simple " +
-      "English, Slovenčina, Slovenščina, Српски / Srpski, Seeltersk, " +
-      "Svenska, Kiswahili, தமிழ், తెలుగు, Тоҷикӣ, ไทย, Türkmençe, Tagalog, " +
-      "Türkçe, Татарча/Tatarça, Українська, اردو, Tiếng Việt, Volapük, " +
-      "Walon, Winaray, 吴语, isiXhosa, ייִדיש, Yorùbá, Zeêuws, 中文, " +
-      "Bân-lâm-gú, 粵語"
-
-    result_string = @client.testString(test_string)
-    assert_equal(test_string, result_string.force_encoding(Encoding::UTF_8))
-  end
-
-  def test_bool
-    p 'test_bool'
-    assert_equal(@client.testBool(true), true)
-    assert_equal(@client.testBool(false), false)
-  end
-
-  def test_byte
-    p 'test_byte'
-    val = 120
-    assert_equal(@client.testByte(val), val)
-    assert_equal(@client.testByte(-val), -val)
-  end
-
-  def test_i32
-    p 'test_i32'
-    val = 2000000032
-    assert_equal(@client.testI32(val), val)
-    assert_equal(@client.testI32(-val), -val)
-  end
-
-  def test_i64
-    p 'test_i64'
-    val = 9000000000000000064
-    assert_equal(@client.testI64(val), val)
-    assert_equal(@client.testI64(-val), -val)
-  end
-
-  def test_double
-    p 'test_double'
-    val = 3.14159265358979323846
-    assert_equal(@client.testDouble(val), val)
-    assert_equal(@client.testDouble(-val), -val)
-    assert_kind_of(Float, @client.testDouble(val))
-  end
-
-  def test_binary
-    p 'test_binary'
-    val = (0...256).reverse_each.to_a
-    ret = @client.testBinary(val.pack('C*'))
-    assert_equal(val, ret.bytes.to_a)
-  end
-
-  def test_map
-    p 'test_map'
-    val = {1 => 1, 2 => 2, 3 => 3}
-    assert_equal(@client.testMap(val), val)
-    assert_kind_of(Hash, @client.testMap(val))
-  end
-
-  def test_string_map
-    p 'test_string_map'
-    val = {'a' => '2', 'b' => 'blah', 'some' => 'thing'}
-    ret = @client.testStringMap(val)
-    assert_equal(val, ret)
-    assert_kind_of(Hash, ret)
-  end
-
-  def test_list
-    p 'test_list'
-    val = [1,2,3,4,5]
-    assert_equal(@client.testList(val), val)
-    assert_kind_of(Array, @client.testList(val))
-  end
-
-  def test_enum
-    p 'test_enum'
-    val = Thrift::Test::Numberz::SIX
-    ret = @client.testEnum(val)
-
-    assert_equal(ret, 6)
-    assert_kind_of(Fixnum, ret)
-  end
-
-  def test_typedef
-    p 'test_typedef'
-    #UserId  testTypedef(1: UserId thing),
-    assert_equal(@client.testTypedef(309858235082523), 309858235082523)
-    assert_kind_of(Fixnum, @client.testTypedef(309858235082523))
-    true
-  end
-
-  def test_set
-    p 'test_set'
-    val = Set.new([1,2,3])
-    assert_equal(@client.testSet(val), val)
-    assert_kind_of(Set, @client.testSet(val))
-  end
-
-  def get_struct
-    Thrift::Test::Xtruct.new({'string_thing' => 'hi!', 'i32_thing' => 4 })
-  end
-
-  def test_struct
-    p 'test_struct'
-    ret = @client.testStruct(get_struct)
-
-    # TODO: not sure what unspecified "default" requiredness values should be
-    assert(ret.byte_thing == nil || ret.byte_thing == 0)
-    assert(ret.i64_thing == nil || ret.i64_thing == 0)
-
-    assert_equal(ret.string_thing, 'hi!')
-    assert_equal(ret.i32_thing, 4)
-    assert_kind_of(Thrift::Test::Xtruct, ret)
-  end
-
-  def test_nest
-    p 'test_nest'
-    struct2 = Thrift::Test::Xtruct2.new({'struct_thing' => get_struct, 'i32_thing' => 10})
-
-    ret = @client.testNest(struct2)
-
-    # TODO: not sure what unspecified "default" requiredness values should be
-    assert(ret.struct_thing.byte_thing == nil || ret.struct_thing.byte_thing == 0)
-    assert(ret.struct_thing.i64_thing == nil || ret.struct_thing.i64_thing == 0)
-
-    assert_equal(ret.struct_thing.string_thing, 'hi!')
-    assert_equal(ret.struct_thing.i32_thing, 4)
-    assert_equal(ret.i32_thing, 10)
-
-    assert_kind_of(Thrift::Test::Xtruct, ret.struct_thing)
-    assert_kind_of(Thrift::Test::Xtruct2, ret)
-  end
-
-  def test_insanity
-    p 'test_insanity'
-    insane = Thrift::Test::Insanity.new({
-      'userMap' => {
-        Thrift::Test::Numberz::FIVE => 5,
-        Thrift::Test::Numberz::EIGHT => 8,
-      },
-      'xtructs' => [
-        Thrift::Test::Xtruct.new({
-          'string_thing' => 'Goodbye4',
-          'byte_thing' => 4,
-          'i32_thing' => 4,
-          'i64_thing' => 4,
-        }),
-        Thrift::Test::Xtruct.new({
-          'string_thing' => 'Hello2',
-          'byte_thing' => 2,
-          'i32_thing' => 2,
-          'i64_thing' => 2,
-        })
-      ]
-    })
-
-    ret = @client.testInsanity(insane)
-
-    assert_equal(insane, ret[1][2])
-    assert_equal(insane, ret[1][3])
-
-    assert(ret[2][6].userMap == nil || ret[2][6].userMap.length == 0)
-    assert(ret[2][6].xtructs == nil || ret[2][6].xtructs.length == 0)
-  end
-
-  def test_map_map
-    p 'test_map_map'
-    ret = @client.testMapMap(4)
-    assert_kind_of(Hash, ret)
-    expected = {
-      -4 => {
-        -4 => -4,
-        -3 => -3,
-        -2 => -2,
-        -1 => -1,
-      },
-      4 => {
-        4 => 4,
-        3 => 3,
-        2 => 2,
-        1 => 1,
-      }
-    }
-    assert_equal(expected, ret)
-  end
-
-  def test_multi
-    p 'test_multi'
-    ret = @client.testMulti(42, 4242, 424242, {1 => 'blah', 2 => 'thing'}, Thrift::Test::Numberz::EIGHT, 24)
-    expected = Thrift::Test::Xtruct.new({
-      :string_thing => 'Hello2',
-      :byte_thing =>   42,
-      :i32_thing =>    4242,
-      :i64_thing =>    424242
-    })
-    assert_equal(expected, ret)
-  end
-
-  def test_exception
-    p 'test_exception'
-    assert_raise Thrift::Test::Xception do
-      @client.testException('Xception')
-    end
-    begin
-      @client.testException('TException')
-    rescue => e
-      assert e.class.ancestors.include?(Thrift::Exception)
-    end
-    assert_nothing_raised do
-      @client.testException('test')
-    end
-  end
-
-  def test_multi_exception
-    p 'test_multi_exception'
-    assert_raise Thrift::Test::Xception do
-      @client.testMultiException("Xception", "test 1")
-    end
-    assert_raise Thrift::Test::Xception2 do
-      @client.testMultiException("Xception2", "test 2")
-    end
-    assert_equal( @client.testMultiException("Success", "test 3").string_thing, "test 3")
-  end
-
-  def test_oneway
-    p 'test_oneway'
-    time1 = Time.now.to_f
-    @client.testOneway(1)
-    time2 = Time.now.to_f
-    assert_operator (time2-time1), :<, 0.1
-  end
-
-end
-
diff --git a/vendor/git.apache.org/thrift.git/test/rb/integration/TestServer.rb b/vendor/git.apache.org/thrift.git/test/rb/integration/TestServer.rb
deleted file mode 100755
index bab723a..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/integration/TestServer.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/env ruby
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$:.push File.dirname(__FILE__) + '/..'
-
-require 'test_helper'
-require 'thrift'
-require 'thrift_test'
-require 'thrift_test_types'
-
-class SimpleHandler
-  [:testVoid, :testString, :testBool, :testByte, :testI32, :testI64, :testDouble, :testBinary,
-   :testStruct, :testMap, :testStringMap, :testSet, :testList, :testNest, :testEnum, :testTypedef,
-   :testEnum, :testTypedef, :testMultiException].each do |meth|
-
-    define_method(meth) do |thing|
-      p meth
-      p thing
-      thing
-    end
-
-  end
-
-  def testVoid()
-  end
-
-  def testInsanity(thing)
-    return {
-      1 => {
-        2 => thing,
-        3 => thing
-      },
-      2 => {
-        6 => Thrift::Test::Insanity::new()
-      }
-    }
-  end
-
-  def testMapMap(thing)
-    return {
-      -4 => {
-        -4 => -4,
-        -3 => -3,
-        -2 => -2,
-        -1 => -1,
-      },
-      4 => {
-        4 => 4,
-        3 => 3,
-        2 => 2,
-        1 => 1,
-      }
-    }
-  end
-
-  def testMulti(arg0, arg1, arg2, arg3, arg4, arg5)
-    return Thrift::Test::Xtruct.new({
-      'string_thing' => 'Hello2',
-      'byte_thing' => arg0,
-      'i32_thing' => arg1,
-      'i64_thing' => arg2,
-    })
-  end
-
-  def testException(thing)
-    if thing == "Xception"
-      raise Thrift::Test::Xception, :errorCode => 1001, :message => thing
-    elsif thing == "TException"
-      raise Thrift::Exception, :message => thing
-    else
-      # no-op
-    end
-  end
-
-  def testMultiException(arg0, arg1)
-    if arg0 == "Xception2"
-      raise Thrift::Test::Xception2, :errorCode => 2002, :struct_thing => ::Thrift::Test::Xtruct.new({ :string_thing => 'This is an Xception2' })
-    elsif arg0 == "Xception"
-      raise Thrift::Test::Xception, :errorCode => 1001, :message => 'This is an Xception'
-    else
-      return ::Thrift::Test::Xtruct.new({'string_thing' => arg1})
-    end
-  end
-
-  def testOneway(arg0)
-    sleep(arg0)
-  end
-
-end
-
-protocol = "binary"
-port = 9090
-transport = "buffered"
-@transportFactory = Thrift::BufferedTransportFactory.new
-@protocolFactory = Thrift::BinaryProtocolFactory.new
-ARGV.each do|a|
-  if a == "--help"
-    puts "Allowed options:"
-    puts "\t -h [ --help ] \t produce help message"
-    puts "\t--port arg (=9090) \t Port number to listen"
-    puts "\t--protocol arg (=binary) \t protocol: binary, accel"
-    puts "\t--transport arg (=buffered) transport: buffered, framed, http"
-    exit
-  elsif a.start_with?("--protocol")
-    protocol = a.split("=")[1]
-  elsif a.start_with?("--transport")
-    transport = a.split("=")[1]
-  elsif a.start_with?("--port")
-    port = a.split("=")[1].to_i 
-  end
-end
-
-if protocol == "binary"
-  @protocolFactory = Thrift::BinaryProtocolFactory.new
-elsif protocol == ""
-  @protocolFactory = Thrift::BinaryProtocolFactory.new
-elsif protocol == "compact"
-  @protocolFactory = Thrift::CompactProtocolFactory.new
-elsif protocol == "json"
-  @protocolFactory = Thrift::JsonProtocolFactory.new
-elsif protocol == "accel"
-  @protocolFactory = Thrift::BinaryProtocolAcceleratedFactory.new
-else
-  raise 'Unknown protocol type'
-end
-
-if transport == "buffered"
-  @transportFactory = Thrift::BufferedTransportFactory.new
-elsif transport == ""
-  @transportFactory = Thrift::BufferedTransportFactory.new
-elsif transport == "framed"
-  @transportFactory = Thrift::FramedTransportFactory.new
-else
-  raise 'Unknown transport type'
-end
-
-@handler   = SimpleHandler.new
-@processor = Thrift::Test::ThriftTest::Processor.new(@handler)
-@transport = Thrift::ServerSocket.new(port)
-@server    = Thrift::ThreadedServer.new(@processor, @transport, @transportFactory, @protocolFactory)
-@server.serve
diff --git a/vendor/git.apache.org/thrift.git/test/rb/test_helper.rb b/vendor/git.apache.org/thrift.git/test/rb/test_helper.rb
deleted file mode 100644
index c1ed779..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/test_helper.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$:.unshift File.dirname(__FILE__) + '/gen-rb'
-$:.unshift File.join(File.dirname(__FILE__), '../../lib/rb/lib')
-$:.unshift File.join(File.dirname(__FILE__), '../../lib/rb/ext')
-
-require 'test/unit'
-
-module Thrift
-  module Struct
-    def ==(other)
-      return false unless other.is_a? self.class
-      self.class.const_get(:FIELDS).collect {|fid, data| data[:name] }.all? do |field|
-        send(field) == other.send(field)
-      end
-    end
-  end
-end
diff --git a/vendor/git.apache.org/thrift.git/test/rb/test_suite.rb b/vendor/git.apache.org/thrift.git/test/rb/test_suite.rb
deleted file mode 100644
index b157c2c..0000000
--- a/vendor/git.apache.org/thrift.git/test/rb/test_suite.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-Dir["{core,generation}/**/*.rb"].each {|f| require f }
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/test/rebuild_known_failures.sh b/vendor/git.apache.org/thrift.git/test/rebuild_known_failures.sh
deleted file mode 100644
index 08869fe..0000000
--- a/vendor/git.apache.org/thrift.git/test/rebuild_known_failures.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [ -z $1 ]; then
-  echo Usage: $0 LANGUAGE
-  echo Re-list all failures of a specific LANGUAGE into known_failures_Linux.json
-  echo LANGUAGE should be library name like cpp, java, py etc
-  exit 1
-fi
-
-if [ -z $PYTHON]; then
-  PYTHON=python
-fi
-
-TARGET_LANG=$1
-OUT_FILE=known_failures_Linux.json
-echo Rebuilding known failures for $TARGET_LANG
-
-TMPFILE=.__tmp__rebuild__
-grep -v -e "\"$1-" -e "\-$1_" $OUT_FILE > $TMPFILE
-mv $TMPFILE $OUT_FILE
-$PYTHON test.py --client $1
-$PYTHON test.py -U merge
-$PYTHON test.py --server $1
-$PYTHON test.py -U merge
diff --git a/vendor/git.apache.org/thrift.git/test/result.js b/vendor/git.apache.org/thrift.git/test/result.js
deleted file mode 100644
index 18b1a59..0000000
--- a/vendor/git.apache.org/thrift.git/test/result.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
-*/
-
-$.getJSON('results.json', function(results) {
-    $(document).ready(function() {
-        var transport = 3;
-        var socket = 4;
-        var success = 5;
-        var expected = 6;
-        var returnCode = 7;
-        var logFile = 8;
-        testTable = $('#test_results').DataTable({
-            data: results['results'],
-            columnDefs: [
-                {
-                    targets: 3,
-                    render: function(data, type, row) {
-                        return row[transport] + '-' + row[socket];
-                    },
-                },
-                {
-                    targets: 4,
-                    render: function(data, type, row) {
-                        return (row[success] ? 'success' : 'failure')
-                                + '(' + (row[returnCode] == 128 ? 'timeout' : row[returnCode]) + ')'
-                                + '(<a href="' + row[logFile].server + '">Server</a>, '
-                                + '<a href="' + row[logFile].client + '">Client</a>)';
-                    },
-                },
-                {
-                    targets: 5,
-                    render: function(data, type, row) {
-                        // 'yes' rather than 'expected' to ease search
-                        return row[expected] ? 'yes' : 'unexpected';
-                    },
-                }
-            ],
-        });
-        $('#test_results_filter label input').focus().val('unexpected failure');
-        $('#test_info').text(
-            "Test Date:     " + results['date'] + "\n" +
-            "Revision:      " + results['revision'] + "\n" +
-            "Platform:      " + results['platform'] + "\n" +
-            "Test duration: " + results['duration']) + " seconds";
-    });
-});
-
diff --git a/vendor/git.apache.org/thrift.git/test/test.py b/vendor/git.apache.org/thrift.git/test/test.py
deleted file mode 100755
index 9305967..0000000
--- a/vendor/git.apache.org/thrift.git/test/test.py
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Apache Thrift - integration test suite
-#
-# tests different server-client, protocol and transport combinations
-#
-# This script supports python 2.7 and later.
-# python 3.x is recommended for better stability.
-#
-
-from __future__ import print_function
-from itertools import chain
-import json
-import logging
-import multiprocessing
-import argparse
-import os
-import sys
-
-import crossrunner
-from crossrunner.compat import path_join
-
-ROOT_DIR = os.path.dirname(os.path.realpath(os.path.dirname(__file__)))
-TEST_DIR_RELATIVE = 'test'
-TEST_DIR = path_join(ROOT_DIR, TEST_DIR_RELATIVE)
-FEATURE_DIR_RELATIVE = path_join(TEST_DIR_RELATIVE, 'features')
-CONFIG_FILE = 'tests.json'
-
-
-def run_cross_tests(server_match, client_match, jobs, skip_known_failures, retry_count, regex):
-    logger = multiprocessing.get_logger()
-    logger.debug('Collecting tests')
-    with open(path_join(TEST_DIR, CONFIG_FILE), 'r') as fp:
-        j = json.load(fp)
-    tests = crossrunner.collect_cross_tests(j, server_match, client_match, regex)
-    if not tests:
-        print('No test found that matches the criteria', file=sys.stderr)
-        print('  servers: %s' % server_match, file=sys.stderr)
-        print('  clients: %s' % client_match, file=sys.stderr)
-        return False
-    if skip_known_failures:
-        logger.debug('Skipping known failures')
-        known = crossrunner.load_known_failures(TEST_DIR)
-        tests = list(filter(lambda t: crossrunner.test_name(**t) not in known, tests))
-
-    dispatcher = crossrunner.TestDispatcher(TEST_DIR, ROOT_DIR, TEST_DIR_RELATIVE, jobs)
-    logger.debug('Executing %d tests' % len(tests))
-    try:
-        for r in [dispatcher.dispatch(test, retry_count) for test in tests]:
-            r.wait()
-        logger.debug('Waiting for completion')
-        return dispatcher.wait()
-    except (KeyboardInterrupt, SystemExit):
-        logger.debug('Interrupted, shutting down')
-        dispatcher.terminate()
-        return False
-
-
-def run_feature_tests(server_match, feature_match, jobs, skip_known_failures, retry_count, regex):
-    basedir = path_join(ROOT_DIR, FEATURE_DIR_RELATIVE)
-    logger = multiprocessing.get_logger()
-    logger.debug('Collecting tests')
-    with open(path_join(TEST_DIR, CONFIG_FILE), 'r') as fp:
-        j = json.load(fp)
-    with open(path_join(basedir, CONFIG_FILE), 'r') as fp:
-        j2 = json.load(fp)
-    tests = crossrunner.collect_feature_tests(j, j2, server_match, feature_match, regex)
-    if not tests:
-        print('No test found that matches the criteria', file=sys.stderr)
-        print('  servers: %s' % server_match, file=sys.stderr)
-        print('  features: %s' % feature_match, file=sys.stderr)
-        return False
-    if skip_known_failures:
-        logger.debug('Skipping known failures')
-        known = crossrunner.load_known_failures(basedir)
-        tests = list(filter(lambda t: crossrunner.test_name(**t) not in known, tests))
-
-    dispatcher = crossrunner.TestDispatcher(TEST_DIR, ROOT_DIR, FEATURE_DIR_RELATIVE, jobs)
-    logger.debug('Executing %d tests' % len(tests))
-    try:
-        for r in [dispatcher.dispatch(test, retry_count) for test in tests]:
-            r.wait()
-        logger.debug('Waiting for completion')
-        return dispatcher.wait()
-    except (KeyboardInterrupt, SystemExit):
-        logger.debug('Interrupted, shutting down')
-        dispatcher.terminate()
-        return False
-
-
-def default_concurrenty():
-    try:
-        return int(os.environ.get('THRIFT_CROSSTEST_CONCURRENCY'))
-    except (TypeError, ValueError):
-        # Since much time is spent sleeping, use many threads
-        return int(multiprocessing.cpu_count() * 1.25) + 1
-
-
-def main(argv):
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--server', default='', nargs='*',
-                        help='list of servers to test')
-    parser.add_argument('--client', default='', nargs='*',
-                        help='list of clients to test')
-    parser.add_argument('-F', '--features', nargs='*', default=None,
-                        help='run server feature tests instead of cross language tests')
-    parser.add_argument('-R', '--regex', help='test name pattern to run')
-    parser.add_argument('-s', '--skip-known-failures', action='store_true', dest='skip_known_failures',
-                        help='do not execute tests that are known to fail')
-    parser.add_argument('-r', '--retry-count', type=int,
-                        default=0, help='maximum retry on failure')
-    parser.add_argument('-j', '--jobs', type=int,
-                        default=default_concurrenty(),
-                        help='number of concurrent test executions')
-
-    g = parser.add_argument_group(title='Advanced')
-    g.add_argument('-v', '--verbose', action='store_const',
-                   dest='log_level', const=logging.DEBUG, default=logging.WARNING,
-                   help='show debug output for test runner')
-    g.add_argument('-P', '--print-expected-failures', choices=['merge', 'overwrite'],
-                   dest='print_failures',
-                   help="generate expected failures based on last result and print to stdout")
-    g.add_argument('-U', '--update-expected-failures', choices=['merge', 'overwrite'],
-                   dest='update_failures',
-                   help="generate expected failures based on last result and save to default file location")
-    options = parser.parse_args(argv)
-
-    logger = multiprocessing.log_to_stderr()
-    logger.setLevel(options.log_level)
-
-    if options.features is not None and options.client:
-        print('Cannot specify both --features and --client ', file=sys.stderr)
-        return 1
-
-    # Allow multiple args separated with ',' for backward compatibility
-    server_match = list(chain(*[x.split(',') for x in options.server]))
-    client_match = list(chain(*[x.split(',') for x in options.client]))
-
-    if options.update_failures or options.print_failures:
-        dire = path_join(ROOT_DIR, FEATURE_DIR_RELATIVE) if options.features is not None else TEST_DIR
-        res = crossrunner.generate_known_failures(
-            dire, options.update_failures == 'overwrite',
-            options.update_failures, options.print_failures)
-    elif options.features is not None:
-        features = options.features or ['.*']
-        res = run_feature_tests(server_match, features, options.jobs, options.skip_known_failures, options.retry_count, options.regex)
-    else:
-        res = run_cross_tests(server_match, client_match, options.jobs, options.skip_known_failures, options.retry_count, options.regex)
-    return 0 if res else 1
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
diff --git a/vendor/git.apache.org/thrift.git/test/tests.json b/vendor/git.apache.org/thrift.git/test/tests.json
deleted file mode 100644
index 2460b83..0000000
--- a/vendor/git.apache.org/thrift.git/test/tests.json
+++ /dev/null
@@ -1,550 +0,0 @@
-[
-  {
-    "name": "c_glib",
-    "platforms": [
-      "Linux"
-    ],
-    "server": {
-      "command": [
-        "test_server"
-      ]
-    },
-    "client": {
-      "command": [
-        "test_client"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip"
-    ],
-    "protocols": [
-      "binary",
-      "compact"
-    ],
-    "workdir": "c_glib"
-  },
-  {
-    "name": "d",
-    "server": {
-      "command": [
-        "thrift_test_server"
-      ]
-    },
-    "client": {
-      "command": [
-        "thrift_test_client"
-      ]
-    },
-    "transports": [
-      "http",
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip",
-      "ip-ssl"
-    ],
-    "protocols": [
-      "binary",
-      "compact",
-      "json"
-    ],
-    "workdir": "../lib/d/test"
-  },
-  {
-    "name": "go",
-    "server": {
-      "command": [
-        "testserver",
-        "--certPath=../../keys"
-      ]
-    },
-    "client": {
-      "timeout": 6,
-      "command": [
-        "testclient"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "framed",
-      "http"
-    ],
-    "sockets": [
-      "ip",
-      "ip-ssl"
-    ],
-    "protocols": [
-      "binary",
-      "compact",
-      "json"
-    ],
-    "workdir": "go/bin"
-  },
-  {
-    "name": "java",
-    "join_args": true,
-    "command": [
-      "ant",
-      "-f",
-      "build.xml",
-      "-Dno-gen-thrift=\"\"",
-      "-Dtestargs"
-    ],
-    "prepare": [
-      "ant",
-      "-f",
-      "build.xml",
-      "compile-test"
-    ],
-    "server": {
-      "delay": 10,
-      "extra_args": ["run-testserver"]
-    },
-    "client": {
-      "timeout": 13,
-      "extra_args": ["run-testclient"],
-      "transports": [
-        "http"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "framed",
-      "framed:fastframed"
-    ],
-    "sockets": [
-      "ip-ssl",
-      "ip"
-    ],
-    "protocols": [
-      "compact",
-      "binary",
-      "json"
-    ],
-    "workdir": "../lib/java"
-  },
-  {
-    "name": "nodejs",
-    "env": {
-      "NODE_PATH": "../lib"
-    },
-    "server": {
-      "command": [
-        "node",
-        "server.js",
-        "--type=tcp"
-      ]
-    },
-    "client": {
-      "timeout": 2.9,
-      "command": [
-        "node",
-        "client.js",
-        "--type=tcp"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip",
-      "ip-ssl"
-    ],
-    "protocols": [
-      "compact",
-      "binary",
-      "json"
-    ],
-    "workdir": "../lib/nodejs/test"
-  },
-  {
-    "name": "hs",
-    "server": {
-      "command": [
-        "TestServer"
-      ]
-    },
-    "client": {
-      "timeout": 6,
-      "transports": [
-        "http"
-      ],
-      "command": [
-        "TestClient"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip"
-    ],
-    "protocols": [
-      "compact",
-      "binary",
-      "json"
-    ],
-    "workdir": "hs"
-  },
-  {
-    "name": "py",
-    "server": {
-      "extra_args": ["TSimpleServer"],
-      "command": [
-        "TestServer.py",
-        "--verbose",
-        "--genpydir=gen-py"
-      ]
-    },
-    "client": {
-      "timeout": 10,
-      "command": [
-        "TestClient.py",
-        "--verbose",
-        "--host=localhost",
-        "--genpydir=gen-py"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip",
-      "ip-ssl"
-    ],
-    "protocols": [
-      "compact",
-      "binary",
-      "json",
-      "binary:accel",
-      "compact:accelc"
-    ],
-    "workdir": "py"
-  },
-  {
-    "comment": "Using 'python3' executable to test py2 and 3 at once",
-    "name": "py3",
-    "server": {
-      "extra_args": ["TSimpleServer"],
-      "command": [
-        "python3",
-        "TestServer.py",
-        "--verbose",
-        "--genpydir=gen-py"
-      ]
-    },
-    "client": {
-      "timeout": 10,
-      "command": [
-        "python3",
-        "TestClient.py",
-        "--host=localhost",
-        "--genpydir=gen-py"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip-ssl",
-      "ip"
-    ],
-    "protocols": [
-      "compact",
-      "binary",
-      "json",
-      "binary:accel",
-      "compact:accelc"
-    ],
-    "workdir": "py"
-  },
-  {
-    "name": "cpp",
-    "server": {
-      "command": [
-        "TestServer"
-      ]
-    },
-    "client": {
-      "timeout": 8,
-      "command": [
-        "TestClient"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "http",
-      "framed"
-    ],
-    "sockets": [
-      "ip",
-      "ip-ssl",
-      "domain"
-    ],
-    "protocols": [
-      "compact",
-      "binary",
-      "json",
-      "header"
-    ],
-    "workdir": "cpp"
-  },
-  {
-    "name": "rb",
-    "server": {
-      "command": [
-        "ruby",
-        "../integration/TestServer.rb"
-      ]
-    },
-    "client": {
-      "timeout": 5,
-      "command": [
-        "ruby",
-        "../integration/TestClient.rb"
-      ]
-    },
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip"
-    ],
-    "protocols": [
-      "compact",
-      "binary",
-      "json",
-      "binary:accel"
-    ],
-    "workdir": "rb/gen-rb"
-  },
-  {
-    "name": "csharp",
-    "env": {
-      "MONO_PATH": "../../lib/csharp/"
-    },
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip",
-      "ip-ssl"
-    ],
-    "protocols": [
-      "binary",
-      "compact",
-      "json"
-    ],
-    "server": {
-      "command": [
-        "mono",
-        "TestClientServer.exe",
-        "server"
-      ]
-    },
-    "client": {
-      "timeout": 9,
-      "command": [
-        "mono",
-        "TestClientServer.exe",
-        "client"
-      ]
-    },
-    "workdir": "csharp"
-  },
-  {
-    "name": "perl",
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip",
-      "ip-ssl",
-      "domain"
-    ],
-    "protocols": [
-      "binary"
-    ],
-    "client": {
-      "command": [
-        "perl",
-        "-Igen-perl/",
-        "-I../../lib/perl/lib/",
-        "TestClient.pl",
-        "--cert=../keys/client.pem"
-      ]
-    },
-    "server": {
-      "command": [
-        "perl",
-        "-Igen-perl/",
-        "-I../../lib/perl/lib/",
-        "TestServer.pl",
-        "--cert=../keys/server.pem",
-        "--key=../keys/server.key"
-      ]
-    },
-    "workdir": "perl"
-  },
-  {
-    "name": "php",
-    "client": {
-      "timeout": 6,
-      "transports": [
-        "buffered",
-        "framed"
-      ],
-      "sockets": [
-        "ip"
-      ],
-      "protocols": [
-        "binary",
-        "compact",
-        "binary:accel"
-      ],
-      "command": [
-        "php",
-        "-dextension_dir=../../lib/php/src/ext/thrift_protocol/modules/",
-        "--php-ini=../../lib/php/thrift_protocol.ini",
-        "--no-php-ini",
-        "-ddisplay_errors=stderr",
-        "-dlog_errors=0",
-        "-derror_reporting=E_ALL",
-        "TestClient.php"
-      ]
-    },
-    "workdir": "php"
-  },
-  {
-    "name": "dart",
-    "client": {
-      "transports": [
-        "buffered",
-        "framed",
-        "http"
-      ],
-      "sockets": [
-        "ip"
-      ],
-      "protocols": [
-        "binary",
-        "compact",
-        "json"
-      ],
-      "command": [
-        "dart",
-        "test_client/bin/main.dart"
-      ]
-    },
-    "workdir": "dart"
-  },
-  {
-    "name": "erl",
-    "transports": [
-      "buffered",
-      "framed"
-    ],
-    "sockets": [
-      "ip",
-      "ip-ssl"
-    ],
-    "protocols": [
-      "binary",
-      "compact"
-    ],
-    "client": {
-      "command": [
-        "erl",
-        "+K",
-        "true",
-        "-noshell",
-        "-pa",
-        "../../lib/erl/ebin/",
-        "-pa",
-        "./ebin",
-        "-s",
-        "test_client",
-        "-s",
-        "init",
-        "stop",
-        "-extra"
-      ]
-    },
-    "server": {
-      "command": [
-        "erl",
-        "+K",
-        "true",
-        "-noshell",
-        "-pa",
-        "../../lib/erl/ebin/",
-        "-pa",
-        "./ebin",
-        "-s",
-        "test_thrift_server",
-        "-extra"
-      ]
-    },
-    "workdir": "erl"
-  },
-  {
-    "name": "js",
-    "transports": [
-      "http"
-    ],
-    "sockets": [
-      "ip"
-    ],
-    "protocols": [
-      "json"
-    ],
-    "client": {
-      "command": [
-        "phantomjs",
-        "test/phantom-client.js"
-      ]
-    },
-    "workdir": "../lib/js"
-  },
-  {
-    "name": "lua",
-    "TODO": "Add dll to LUA_CPATH",
-    "env": {
-      "LUA_PATH": ";;gen-lua/?.lua;../../lib/lua/?.lua",
-      "LUA_CPATH": ";;../../lib/lua/.libs/?.so"
-    },
-    "client": {
-      "timeout": 5,
-      "transports": [
-        "buffered",
-        "framed",
-        "http"
-      ],
-      "sockets": [
-        "ip"
-      ],
-      "protocols": [
-        "binary",
-        "compact",
-        "json"
-      ],
-      "command": [
-        "lua",
-        "test_basic_client.lua"
-      ]
-    },
-    "workdir": "lua"
-  }
-]
diff --git a/vendor/git.apache.org/thrift.git/test/threads/ThreadsClient.cpp b/vendor/git.apache.org/thrift.git/test/threads/ThreadsClient.cpp
deleted file mode 100644
index 9306a3f..0000000
--- a/vendor/git.apache.org/thrift.git/test/threads/ThreadsClient.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// This autogenerated skeleton file illustrates how to build a server.
-// You should copy it to another filename to avoid overwriting it.
-
-#include "ThreadsTest.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>
-#if _WIN32
-   #include <thrift/windows/TWinsockSingleton.h>
-#endif
-
-using boost::shared_ptr;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::server;
-using namespace apache::thrift::concurrency;
-
-int main(int argc, char **argv) {
-#if _WIN32
-  transport::TWinsockSingleton::create();
-#endif
-  int port = 9090;
-  std::string host = "localhost";
-
-  shared_ptr<TTransport> transport(new TSocket(host, port));
-  shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-
-  transport->open();
-
-  ThreadsTestClient client(protocol);
-  int val;
-  val = client.threadOne(5);
-  fprintf(stderr, "%d\n", val);
-  val = client.stop();
-  fprintf(stderr, "%d\n", val);
-  val = client.threadTwo(5);
-  fprintf(stderr, "%d\n", val);
-
-  transport->close();
-
-  fprintf(stderr, "done.\n");
-
-  return 0;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/threads/ThreadsServer.cpp b/vendor/git.apache.org/thrift.git/test/threads/ThreadsServer.cpp
deleted file mode 100644
index a267c3b..0000000
--- a/vendor/git.apache.org/thrift.git/test/threads/ThreadsServer.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// This autogenerated skeleton file illustrates how to build a server.
-// You should copy it to another filename to avoid overwriting it.
-
-#include "ThreadsTest.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>
-#if _WIN32
-   #include <thrift/windows/TWinsockSingleton.h>
-#endif
-
-using boost::shared_ptr;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::server;
-using namespace apache::thrift::concurrency;
-
-
-class ThreadsTestHandler : virtual public ThreadsTestIf {
- public:
-  ThreadsTestHandler() {
-    // Your initialization goes here
-  }
-
-  int32_t threadOne(const int32_t sleep) {
-    // Your implementation goes here
-    printf("threadOne\n");
-    go2sleep(1, sleep);
-    return 1;
-  }
-
-  int32_t threadTwo(const int32_t sleep) {
-    // Your implementation goes here
-    printf("threadTwo\n");
-    go2sleep(2, sleep);
-    return 1;
-  }
-
-  int32_t threadThree(const int32_t sleep) {
-    // Your implementation goes here
-    printf("threadThree\n");
-    go2sleep(3, sleep);
-    return 1;
-  }
-
-  int32_t threadFour(const int32_t sleep) {
-    // Your implementation goes here
-    printf("threadFour\n");
-    go2sleep(4, sleep);
-    return 1;
-  }
-
-  int32_t stop() {
-    printf("stop\n");
-    server_->stop();
-    return 1;
-  }
-
-  void setServer(boost::shared_ptr<TServer> server) {
-    server_ = server;
-  }
-
-protected:
-  void go2sleep(int thread, int seconds) {
-    Monitor m;
-    Synchronized s(m);
-    for (int i = 0; i < seconds; ++i) {
-      fprintf(stderr, "Thread %d: sleep %d\n", thread, i);
-      try {
-        m.wait(1000);
-      } catch(const TimedOutException&) {
-      }
-    }
-    fprintf(stderr, "THREAD %d DONE\n", thread);
-  }
-
-private:
-  boost::shared_ptr<TServer> server_;
-
-};
-
-int main(int argc, char **argv) {
-#if _WIN32
-  transport::TWinsockSingleton::create();
-#endif
-  int port = 9090;
-  shared_ptr<ThreadsTestHandler> handler(new ThreadsTestHandler());
-  shared_ptr<TProcessor> processor(new ThreadsTestProcessor(handler));
-  shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
-  shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
-  shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
-
-  /*
-  shared_ptr<ThreadManager> threadManager =
-    ThreadManager::newSimpleThreadManager(10);
-  shared_ptr<PlatformThreadFactory> threadFactory =
-    shared_ptr<PlatformThreadFactory>(new PlatformThreadFactory());
-  threadManager->threadFactory(threadFactory);
-  threadManager->start();
-
-  shared_ptr<TServer> server =
-    shared_ptr<TServer>(new TThreadPoolServer(processor,
-                                              serverTransport,
-                                              transportFactory,
-                                              protocolFactory,
-                                              threadManager));
-  */
-
-  shared_ptr<TServer> server =
-    shared_ptr<TServer>(new TThreadedServer(processor,
-                                            serverTransport,
-                                            transportFactory,
-                                            protocolFactory));
-
-  handler->setServer(server);
-
-  server->serve();
-
-  fprintf(stderr, "done.\n");
-
-  return 0;
-}
-
diff --git a/vendor/git.apache.org/thrift.git/test/threads/ThreadsTest.thrift b/vendor/git.apache.org/thrift.git/test/threads/ThreadsTest.thrift
deleted file mode 100644
index caa9346..0000000
--- a/vendor/git.apache.org/thrift.git/test/threads/ThreadsTest.thrift
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-service ThreadsTest {
-  i32 threadOne(1: i32 sleep=15),
-  i32 threadTwo(2: i32 sleep=15),
-  i32 threadThree(3: i32 sleep=15),
-  i32 threadFour(4: i32 sleep=15)
-
-  i32 stop();
-
-}
diff --git a/vendor/git.apache.org/thrift.git/test/valgrind.suppress b/vendor/git.apache.org/thrift.git/test/valgrind.suppress
deleted file mode 100644
index 41f9414..0000000
--- a/vendor/git.apache.org/thrift.git/test/valgrind.suppress
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-   boost/get_once_per_thread_epoch/ignore
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   fun:_ZN5boost6detail25get_once_per_thread_epochEv
-}
-
-
diff --git a/vendor/git.apache.org/thrift.git/tutorial/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/Makefile.am
deleted file mode 100755
index 5865c54..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-SUBDIRS =
-
-if MINGW
-# do nothing, just build the compiler
-else
-
-if WITH_C_GLIB
-SUBDIRS += c_glib
-endif
-
-if WITH_CPP
-SUBDIRS += cpp
-endif
-
-if WITH_D
-SUBDIRS += d
-endif
-
-if WITH_JAVA
-SUBDIRS += java
-SUBDIRS += js
-endif
-
-if WITH_PYTHON
-SUBDIRS += py
-SUBDIRS += py.twisted
-SUBDIRS += py.tornado
-endif
-
-if WITH_RUBY
-SUBDIRS += rb
-endif
-
-if WITH_HASKELL
-SUBDIRS += hs
-endif
-
-if WITH_HAXE
-SUBDIRS += haxe
-endif
-
-if WITH_GO
-SUBDIRS += go
-endif
-
-if WITH_NODEJS
-SUBDIRS += nodejs
-endif
-
-if WITH_DART
-SUBDIRS += dart
-endif
-
-#
-# generate html for ThriftTest.thrift
-#
-all-local:
-	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift
-
-clean-local:
-	rm -rf $(top_srcdir)/tutorial/gen-html
-
-endif
-
-# Any folders or files not listed above being added to SUBDIR need to be placed here in
-# EXTRA_DIST to be included in the release
-EXTRA_DIST = \
-	as3 \
-	csharp \
-	d \
-	delphi \
-	erl \
-	hs \
-	ocaml \
-	perl \
-	php \
-	shared.thrift \
-	tutorial.thrift \
-	README.md
diff --git a/vendor/git.apache.org/thrift.git/tutorial/README.md b/vendor/git.apache.org/thrift.git/tutorial/README.md
deleted file mode 100644
index 7772bf3..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-Thrift Tutorial
-
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-Tutorial
-========
-
-1) First things first, you'll need to install the Thrift compiler and the
-   language libraries. Do that using the instructions in the top level
-   README.md file.
-
-2) Read tutorial.thrift to learn about the syntax of a Thrift file
-
-3) Compile the code for the language of your choice:
-
-     $ thrift
-     $ thrift -r --gen cpp tutorial.thrift
-
-4) Take a look at the generated code.
-
-5) Look in the language directories for sample client/server code.
-
-6) That's about it for now. This tutorial is intentionally brief. It should be
-   just enough to get you started and ready to build your own project.
diff --git a/vendor/git.apache.org/thrift.git/tutorial/as3/build.xml b/vendor/git.apache.org/thrift.git/tutorial/as3/build.xml
deleted file mode 100644
index f7ed32d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/as3/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<project name="tutorial" default="dist" basedir=".">
-
-  <description>Thrift actionscript 3.0 tutorial.</description>
-
-  <property name="gen" location="gen-as3" />
-  <property name="src" location="src" />
-  <property name="thrift.src" location="../../lib/as3/src/" />
-  <property name="dist" location="dist" />
-
-  <property name="final.name" value="as3-tutorial" />
-  <property name="swf.name" value="${dist}/${final.name}.swf" />
-
-  <target name="flex.check" unless="FLEX_HOME">
-    <fail message='You must set the FLEX_HOME property pointing to your flex SDK, eg. ant -DFLEX_HOME="/Applications/Adobe Flex Builder 3/sdks/3.2.0"'/>
-  </target>
-
-  <target name="flex.init" depends="flex.check" unless="flex.finished">
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
-    <property name="flex.finished" value="true"/>
-  </target>
-
-  <target name="init">
-    <tstamp />
-    <mkdir dir="${dist}"/>
-  </target>
-
-  <target name="dist" depends="generate, flex.init, init">
-    <mxmlc output="${swf.name}" file="${src}/CalculatorUI.as">
-      <source-path path-element="${gen}" />
-      <source-path path-element="${src}" />
-      <source-path path-element="${thrift.src}" />
-    </mxmlc>
-  </target>
-
-  <target name="generate">
-    <!-- Generate the thrift gen-java source -->
-    <exec executable="../../compiler/cpp/thrift" failonerror="true">
-      <arg line="--gen as3 ../shared.thrift"/>
-    </exec>
-    <exec executable="../../compiler/cpp/thrift" failonerror="true">
-      <arg line="--gen as3 ../tutorial.thrift"/>
-    </exec>
-  </target>
-
-  <target name="clean">
-    <delete dir="${gen}"/>
-    <delete dir="${dist}" />
-  </target>
-
-</project>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/as3/src/CalculatorUI.as b/vendor/git.apache.org/thrift.git/tutorial/as3/src/CalculatorUI.as
deleted file mode 100644
index d996df5..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/as3/src/CalculatorUI.as
+++ /dev/null
@@ -1,142 +0,0 @@
-package {
-  import flash.display.Sprite;
-  import flash.text.TextField;
-  import flash.text.TextFieldType;
-  import flash.events.MouseEvent;
-  import flash.system.Security;
-
-  import org.apache.thrift.transport.TSocket;
-  import org.apache.thrift.transport.TTransport;
-  import org.apache.thrift.protocol.TProtocol;
-  import org.apache.thrift.protocol.TBinaryProtocol;
-
-  /**
-   * Simple interface and connection logic implementation for tutorial.
-   */
-  public class CalculatorUI extends Sprite {
-    public static const BUTTON_PADDING:uint = 5;
-
-    private var mCalculatorClient:Calculator; // we use calculator through interface
-    private var mTransport:TTransport; // Transport, used to comunicate with server
-
-    private var mAddButton:Sprite;
-    private var mLeft:TextField;
-    private var mRight:TextField;
-    private var mResult:TextField;
-
-    private var pingButton:Sprite;
-
-    public function CalculatorUI() {
-      buildInterface();
-      initSecurity();
-      initConnection();
-    }
-
-    private function initSecurity():void {
-      Security.loadPolicyFile("xmlsocket://127.0.0.1:9092");
-    }
-
-    /**
-     * Example of initializing connection.
-     */
-    private function initConnection():void {
-      mTransport = new TSocket("127.0.0.1", 9090); // we connect to server
-      mTransport.open();
-      // initialize protocol:
-      var protocol:TProtocol = new TBinaryProtocol(mTransport, false, false);
-      mCalculatorClient = new CalculatorImpl(protocol); // finally, we create calculator client instance
-    }
-
-    private function onPingClick(me:MouseEvent):void {
-      if(!mTransport.isOpen()) return;
-      mCalculatorClient.ping(onPingError, onPingSuccess);
-    }
-
-    private function onPingError(error:Error):void {
-      trace("Error, while requesting ping.");
-      throw error;
-    }
-
-    private function onPingSuccess():void {
-      trace("Ping returned successfully");
-    }
-
-    private function onAddClick(me:MouseEvent):void {
-      if(!mTransport.isOpen()) return;
-      var num1:Number = Number(mLeft.text);
-      var num2:Number = Number(mRight.text);
-      mResult.text = "Processing...";
-      mCalculatorClient.add(num1, num2, onAddError, onAddSuccess);
-    }
-
-    private function onAddError(error:Error):void {
-      trace("Error, while requesting add.");
-      throw error;
-    }
-
-    private function onAddSuccess(res:Number):void {
-      mResult.text = String(res);
-    }
-
-    private function buildInterface():void {
-      addChild(pingButton = buildButton("PING"));
-      pingButton.x = (stage.stageWidth - pingButton.width) / 2;
-      pingButton.y = 10;
-      pingButton.addEventListener(MouseEvent.CLICK, onPingClick);
-
-      var top:Number = pingButton.y + pingButton.height + 20;
-      addChild(mLeft = buildDigitInput());
-      mLeft.x = 15;
-      mLeft.y = top + BUTTON_PADDING;
-      addChild(mRight = buildDigitInput());
-      mRight.x = mLeft.x + mLeft.width + 15;
-      mRight.y = top + BUTTON_PADDING;
-      addChild(mAddButton = buildButton("ADD"));
-      mAddButton.x = mRight.x + mRight.width + 15;
-      mAddButton.y = top;
-      mAddButton.addEventListener(MouseEvent.CLICK, onAddClick);
-      addChild(mResult = buildDigitInput());
-      mResult.x = mAddButton.x + mAddButton.width + 15;
-      mResult.y = top + BUTTON_PADDING;
-    }
-
-    /**
-     * Simple digit-only input field.
-     */
-    private function buildDigitInput():TextField {
-      var textField:TextField = new TextField;
-      textField.width = 75;
-      textField.height = 20;
-      textField.restrict = "0987654321.";
-      textField.type = TextFieldType.INPUT;
-      textField.background = true;
-      textField.backgroundColor = 0xaaaaff;
-      textField.textColor = 0xffff00;
-      return textField;
-    }
-
-    /**
-     * Simple button drawing.
-     */
-    private function buildButton(text:String):Sprite {
-      var button:Sprite = new Sprite;
-      var textField:TextField = new TextField;
-      textField.width = 4000;
-      textField.text = text;
-      textField.textColor = 0xffff00;
-      textField.width = textField.textWidth + 4;
-      textField.height = textField.textHeight + 4;
-      textField.mouseEnabled = false;
-      button.graphics.beginFill(0x0000ff);
-      button.graphics.lineStyle(0, 0x000000);
-      button.graphics.drawRoundRect(0, 0, textField.width + BUTTON_PADDING * 2,
-                                    textField.height + BUTTON_PADDING * 2, BUTTON_PADDING);
-      button.graphics.endFill();
-      button.addChild(textField);
-      textField.x = BUTTON_PADDING;
-      textField.y = BUTTON_PADDING;
-      button.useHandCursor = button.buttonMode = true;
-      return button;
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/c_glib/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/c_glib/Makefile.am
deleted file mode 100755
index 565f635..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/c_glib/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = subdir-objects serial-tests
-
-BUILT_SOURCES = \
-	gen-c_glib/calculator.h \
-	gen-c_glib/shared_service.h \
-	gen-c_glib/shared_types.h \
-	gen-c_glib/tutorial_types.h
-
-AM_CFLAGS = -g -Wall -Wextra -pedantic $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) @GCOV_CFLAGS@
-AM_CPPFLAGS = -I$(top_srcdir)/lib/c_glib/src -Igen-c_glib
-AM_LDFLAGS = $(GLIB_LIBS) $(GOBJECT_LIBS) @GCOV_LDFLAGS@
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-noinst_LTLIBRARIES = \
-	libtutorialgencglib.la
-
-nodist_libtutorialgencglib_la_SOURCES = \
-	gen-c_glib/calculator.c \
-	gen-c_glib/calculator.h \
-	gen-c_glib/shared_service.c \
-	gen-c_glib/shared_service.h \
-	gen-c_glib/shared_types.c \
-	gen-c_glib/shared_types.h \
-	gen-c_glib/tutorial_types.c \
-	gen-c_glib/tutorial_types.h
-
-libtutorialgencglib_la_LIBADD = \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
-
-libtutorialgencglib_la_CFLAGS = \
-	$(AM_CFLAGS) -Wno-unused-function
-
-noinst_PROGRAMS = \
-	tutorial_server \
-	tutorial_client
-
-tutorial_server_SOURCES = \
-	c_glib_server.c
-
-tutorial_server_LDADD = \
-	libtutorialgencglib.la \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
-
-tutorial_client_SOURCES = \
-	c_glib_client.c
-
-tutorial_client_LDADD = \
-	libtutorialgencglib.la \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
-
-
-gen-c_glib/calculator.c gen-c_glib/calculator.h gen-c_glib/shared_service.c gen-c_glib/shared_service.h gen-c_glib/shared_types.c gen-c_glib/shared_types.h gen-c_glib/tutorial_types.c gen-c_glib/tutorial_types.h: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen c_glib -r $<
-
-clean-local:
-	$(RM) gen-c_glib/*
-
-tutorialserver: all
-	./tutorial_server
-
-tutorialclient: all
-	./tutorial_client
-
-EXTRA_DIST = \
-	c_glib_server.c \
-	c_glib_client.c
diff --git a/vendor/git.apache.org/thrift.git/tutorial/c_glib/c_glib_client.c b/vendor/git.apache.org/thrift.git/tutorial/c_glib/c_glib_client.c
deleted file mode 100644
index 986d517..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/c_glib/c_glib_client.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <stdio.h>
-#include <glib-object.h>
-
-#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport.h>
-#include <thrift/c_glib/transport/thrift_socket.h>
-
-#include "gen-c_glib/calculator.h"
-
-int main (void)
-{
-  ThriftSocket *socket;
-  ThriftTransport *transport;
-  ThriftProtocol *protocol;
-  CalculatorIf *client;
-
-  GError *error = NULL;
-  InvalidOperation *invalid_operation = NULL;
-
-  Work *work;
-
-  gint32 sum;
-  gint32 diff;
-
-  int exit_status = 0;
-
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  socket    = g_object_new (THRIFT_TYPE_SOCKET,
-                            "hostname",  "localhost",
-                            "port",      9090,
-                            NULL);
-  transport = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT,
-                            "transport", socket,
-                            NULL);
-  protocol  = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL,
-                            "transport", transport,
-                            NULL);
-
-  thrift_transport_open (transport, &error);
-
-
-  /* In the C (GLib) implementation of Thrift, service methods on the
-     server are accessed via a generated client class that implements
-     the service interface. In this tutorial, we access a Calculator
-     service through an instance of CalculatorClient, which implements
-     CalculatorIf. */
-  client = g_object_new (TYPE_CALCULATOR_CLIENT,
-                         "input_protocol",  protocol,
-                         "output_protocol", protocol,
-                         NULL);
-
-  /* Each of the client methods requires at least two parameters: A
-     pointer to the client-interface implementation (the client
-     object), and a handle to a GError structure to receive
-     information about any error that occurs.
-
-     On success, client methods return TRUE. A return value of FALSE
-     indicates an error occurred and the error parameter has been
-     set. */
-  if (!error && calculator_if_ping (client, &error)) {
-    puts ("ping()");
-  }
-
-  /* Service methods that return a value do so by passing the result
-     back via an output parameter (here, "sum"). */
-  if (!error && calculator_if_add (client, &sum, 1, 1, &error)) {
-    printf ("1+1=%d\n", sum);
-  }
-
-  /* Thrift structs are implemented as GObjects, with each of the
-     struct's members exposed as an object property. */
-  work = g_object_new (TYPE_WORK, NULL);
-
-  if (!error) {
-    g_object_set (work,
-                  "num1", 1,
-                  "num2", 0,
-                  "op",   OPERATION_DIVIDE,
-                  NULL);
-
-    /* Exceptions are passed back from service methods in a manner
-       similar to return values. */
-    if (calculator_if_calculate (client,
-                                 NULL,
-                                 1,
-                                 work,
-                                 &invalid_operation,
-                                 &error)) {
-      puts ("Whoa? We can divide by zero!");
-    }
-    else {
-      if (invalid_operation) {
-        gchar *why;
-
-        /* Like structs, exceptions are implemented as objects with
-           properties. */
-        g_object_get (invalid_operation, "why", &why, NULL);
-
-        printf ("InvalidOperation: %s\n", why);
-
-        if (why != NULL)
-          g_free (why);
-        g_object_unref (invalid_operation);
-        invalid_operation = NULL;
-      }
-
-      g_clear_error (&error);
-    }
-  }
-
-  if (!error) {
-    /* Struct objects can be reused across method invocations. */
-    g_object_set (work,
-                  "num1", 15,
-                  "num2", 10,
-                  "op",   OPERATION_SUBTRACT,
-                  NULL);
-
-    if (calculator_if_calculate (client,
-                                 &diff,
-                                 1,
-                                 work,
-                                 &invalid_operation,
-                                 &error)) {
-      printf ("15-10=%d\n", diff);
-    }
-  }
-
-  g_object_unref (work);
-
-  if (!error) {
-    SharedStruct *shared_struct;
-    gchar *value;
-
-    shared_struct = g_object_new (TYPE_SHARED_STRUCT, NULL);
-
-    /* As defined in the Thrift file, the Calculator service extends
-       the SharedService service. Correspondingly, in the generated
-       code CalculatorIf inherits from SharedServiceIf, and the parent
-       service's methods are accessible through a simple cast. */
-    if (shared_service_client_get_struct (SHARED_SERVICE_IF (client),
-                                          &shared_struct,
-                                          1,
-                                          &error)) {
-      g_object_get (shared_struct, "value", &value, NULL);
-      printf ("Check log: %s\n", value);
-      g_free (value);
-    }
-
-    g_object_unref (shared_struct);
-  }
-
-  if (error) {
-    printf ("ERROR: %s\n", error->message);
-    g_clear_error (&error);
-
-    exit_status = 1;
-  }
-
-  thrift_transport_close (transport, NULL);
-
-  g_object_unref (client);
-  g_object_unref (protocol);
-  g_object_unref (transport);
-  g_object_unref (socket);
-
-  return exit_status;
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/c_glib/c_glib_server.c b/vendor/git.apache.org/thrift.git/tutorial/c_glib/c_glib_server.c
deleted file mode 100644
index 47bf47f..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/c_glib/c_glib_server.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <glib-object.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <thrift/c_glib/thrift.h>
-#include <thrift/c_glib/protocol/thrift_binary_protocol_factory.h>
-#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
-#include <thrift/c_glib/server/thrift_server.h>
-#include <thrift/c_glib/server/thrift_simple_server.h>
-#include <thrift/c_glib/transport/thrift_buffered_transport_factory.h>
-#include <thrift/c_glib/transport/thrift_server_socket.h>
-#include <thrift/c_glib/transport/thrift_server_transport.h>
-
-#include "gen-c_glib/calculator.h"
-
-G_BEGIN_DECLS
-
-/* In the C (GLib) implementation of Thrift, the actual work done by a
-   server---that is, the code that runs when a client invokes a
-   service method---is defined in a separate "handler" class that
-   implements the service interface. Here we define the
-   TutorialCalculatorHandler class, which implements the CalculatorIf
-   interface and provides the behavior expected by tutorial clients.
-   (Typically this code would be placed in its own module but for
-   clarity this tutorial is presented entirely in a single file.)
-
-   For each service the Thrift compiler generates an abstract base
-   class from which handler implementations should inherit. In our
-   case TutorialCalculatorHandler inherits from CalculatorHandler,
-   defined in gen-c_glib/calculator.h.
-
-   If you're new to GObject, try not to be intimidated by the quantity
-   of code here---much of it is boilerplate and can mostly be
-   copied-and-pasted from existing work. For more information refer to
-   the GObject Reference Manual, available online at
-   https://developer.gnome.org/gobject/. */
-
-#define TYPE_TUTORIAL_CALCULATOR_HANDLER \
-  (tutorial_calculator_handler_get_type ())
-
-#define TUTORIAL_CALCULATOR_HANDLER(obj)                                \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                   \
-                               TYPE_TUTORIAL_CALCULATOR_HANDLER,        \
-                               TutorialCalculatorHandler))
-#define TUTORIAL_CALCULATOR_HANDLER_CLASS(c)                    \
-  (G_TYPE_CHECK_CLASS_CAST ((c),                                \
-                            TYPE_TUTORIAL_CALCULATOR_HANDLER,   \
-                            TutorialCalculatorHandlerClass))
-#define IS_TUTORIAL_CALCULATOR_HANDLER(obj)                             \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                                   \
-                               TYPE_TUTORIAL_CALCULATOR_HANDLER))
-#define IS_TUTORIAL_CALCULATOR_HANDLER_CLASS(c)                 \
-  (G_TYPE_CHECK_CLASS_TYPE ((c),                                \
-                            TYPE_TUTORIAL_CALCULATOR_HANDLER))
-#define TUTORIAL_CALCULATOR_HANDLER_GET_CLASS(obj)              \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                            \
-                              TYPE_TUTORIAL_CALCULATOR_HANDLER, \
-                              TutorialCalculatorHandlerClass))
-
-struct _TutorialCalculatorHandler {
-  CalculatorHandler parent_instance;
-
-  /* private */
-  GHashTable *log;
-};
-typedef struct _TutorialCalculatorHandler TutorialCalculatorHandler;
-
-struct _TutorialCalculatorHandlerClass {
-  CalculatorHandlerClass parent_class;
-};
-typedef struct _TutorialCalculatorHandlerClass TutorialCalculatorHandlerClass;
-
-GType tutorial_calculator_handler_get_type (void);
-
-G_END_DECLS
-
-/* ---------------------------------------------------------------- */
-
-/* The implementation of TutorialCalculatorHandler follows. */
-
-G_DEFINE_TYPE (TutorialCalculatorHandler,
-               tutorial_calculator_handler,
-               TYPE_CALCULATOR_HANDLER)
-
-/* Each of a handler's methods accepts at least two parameters: A
-   pointer to the service-interface implementation (the handler object
-   itself) and a handle to a GError structure to receive information
-   about any error that occurs.
-
-   On success, a handler method returns TRUE. A return value of FALSE
-   indicates an error occurred and the error parameter has been
-   set. (Methods should not return FALSE without first setting the
-   error parameter.) */
-static gboolean
-tutorial_calculator_handler_ping (CalculatorIf  *iface,
-                                  GError       **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  puts ("ping()");
-
-  return TRUE;
-}
-
-/* Service-method parameters are passed through as parameters to the
-   handler method.
-
-   If the service method returns a value an output parameter, _return,
-   is additionally passed to the handler method. This parameter should
-   be set appropriately before the method returns, whenever it
-   succeeds.
-
-   The return value from this method happens to be of a base type,
-   i32, but note if a method returns a complex type such as a map or
-   list *_return will point to a pre-allocated data structure that
-   does not need to be re-allocated and should not be destroyed. */
-static gboolean
-tutorial_calculator_handler_add (CalculatorIf  *iface,
-                                 gint32        *_return,
-                                 const gint32   num1,
-                                 const gint32   num2,
-                                 GError       **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  printf ("add(%d,%d)\n", num1, num2);
-  *_return = num1 + num2;
-
-  return TRUE;
-}
-
-/* Any handler method can return a ThriftApplicationException to the
-   client by setting its error parameter appropriately and returning
-   FALSE. See the ThriftApplicationExceptionError enumeration defined
-   in thrift_application_exception.h for a list of recognized
-   exception types (GError codes).
-
-   If a service method can also throw a custom exception (that is, one
-   defined in the .thrift file) an additional output parameter will be
-   provided (here, "ouch") to hold an instance of the exception, when
-   necessary. Note there will be a separate parameter added for each
-   type of exception the method can throw.
-
-   Unlike return values, exception objects are never pre-created; this
-   is always the responsibility of the handler method. */
-static gboolean
-tutorial_calculator_handler_calculate (CalculatorIf      *iface,
-                                       gint32            *_return,
-                                       const gint32       logid,
-                                       const Work        *w,
-                                       InvalidOperation **ouch,
-                                       GError           **error)
-{
-  TutorialCalculatorHandler *self;
-
-  gint *log_key;
-  gchar log_value[12];
-  SharedStruct *log_struct;
-
-  gint num1;
-  gint num2;
-  Operation op;
-  gboolean result = TRUE;
-
-  THRIFT_UNUSED_VAR (error);
-
-  g_return_val_if_fail (IS_TUTORIAL_CALCULATOR_HANDLER (iface),
-                        FALSE);
-  self = TUTORIAL_CALCULATOR_HANDLER (iface);
-
-  /* Remember: Exception objects are never pre-created */
-  g_assert (*ouch == NULL);
-
-  /* Fetch the contents of our Work parameter.
-
-     Note that integer properties of thirty-two bits or fewer in width
-     are _always_ of type gint, regardless of the range of values they
-     hold. A common error is trying to retrieve, say, a structure
-     member defined in the .thrift file as type i16 into a variable of
-     type gint16, which will clobber variables adjacent on the
-     stack. Remember: If you're retrieving an integer property the
-     receiving variable must be of either type gint or gint64, as
-     appropriate. */
-  g_object_get ((Work *)w,
-                "num1", &num1,
-                "num2", &num2,
-                "op",   &op,
-                NULL);
-
-  printf ("calculate(%d,{%d,%d,%d})\n", logid, op, num1, num2);
-
-  switch (op) {
-  case OPERATION_ADD:
-    *_return = num1 + num2;
-    break;
-
-  case OPERATION_SUBTRACT:
-    *_return = num1 - num2;
-    break;
-
-  case OPERATION_MULTIPLY:
-    *_return = num1 * num2;
-    break;
-
-  case OPERATION_DIVIDE:
-    if (num2 == 0) {
-      /* For each custom exception type a subclass of ThriftStruct is
-         generated by the Thrift compiler. Throw an exception by
-         setting the corresponding output parameter to a new instance
-         of its type and returning FALSE. */
-      *ouch = g_object_new (TYPE_INVALID_OPERATION,
-                            "whatOp", op,
-                            "why",  g_strdup ("Cannot divide by 0"),
-                            NULL);
-      result = FALSE;
-
-      /* Note the call to g_strdup above: All the memory used by a
-         ThriftStruct's properties belongs to the object itself and
-         will be freed on destruction. Removing this call to g_strdup
-         will lead to a segmentation fault as the object tries to
-         release memory allocated statically to the program. */
-    }
-    else {
-      *_return = num1 / num2;
-    }
-    break;
-
-  default:
-    *ouch = g_object_new (TYPE_INVALID_OPERATION,
-                          "whatOp", op,
-                          "why",  g_strdup ("Invalid Operation"),
-                          NULL);
-    result = FALSE;
-  }
-
-  /* On success, log a record of the result to our hash table */
-  if (result) {
-    log_key = g_malloc (sizeof *log_key);
-    *log_key = logid;
-
-    snprintf (log_value, sizeof log_value, "%d", *_return);
-
-    log_struct = g_object_new (TYPE_SHARED_STRUCT,
-                               "key",   *log_key,
-                               "value",  g_strdup (log_value),
-                               NULL);
-    g_hash_table_replace (self->log, log_key, log_struct);
-  }
-
-  return result;
-}
-
-/* A one-way method has the same signature as an equivalent, regular
-   method that returns no value. */
-static gboolean
-tutorial_calculator_handler_zip (CalculatorIf  *iface,
-                                 GError       **error)
-{
-  THRIFT_UNUSED_VAR (iface);
-  THRIFT_UNUSED_VAR (error);
-
-  puts ("zip()");
-
-  return TRUE;
-}
-
-/* As specified in the .thrift file (tutorial.thrift), the Calculator
-   service extends the SharedService service. Correspondingly, in the
-   generated code the Calculator interface, CalculatorIf, extends the
-   SharedService interface, SharedServiceIf, and subclasses of
-   CalculatorHandler should implement its methods as well.
-
-   Here we provide an implementation for the getStruct method from the
-   parent service. */
-static gboolean
-tutorial_calculator_handler_get_struct (SharedServiceIf  *iface,
-                                        SharedStruct    **_return,
-                                        const gint32      key32,
-                                        GError          **error)
-{
-  gint key = (gint)key32;
-  TutorialCalculatorHandler *self;
-  SharedStruct *log_struct;
-  gint log_key;
-  gchar *log_value;
-
-  THRIFT_UNUSED_VAR (error);
-
-  g_return_val_if_fail (IS_TUTORIAL_CALCULATOR_HANDLER (iface),
-                        FALSE);
-  self = TUTORIAL_CALCULATOR_HANDLER (iface);
-
-  /* Remember: Complex return types are always pre-created and need
-     only be populated */
-  g_assert (*_return != NULL);
-
-  printf ("getStruct(%d)\n", key);
-
-  /* If the key exists in our log, return the corresponding logged
-     data (or an empty SharedStruct structure if it does not).
-
-     Incidentally, note we _must_ here copy the values from the hash
-     table into the return structure. All memory used by the return
-     structure belongs to the structure itself and will be freed once
-     a response is sent to the client. If we merely freed *_return and
-     set it to point to our hash-table entry, that would mean memory
-     would be released (effectively, data erased) out of the hash
-     table! */
-  log_struct = g_hash_table_lookup (self->log, &key);
-  if (log_struct != NULL) {
-    g_object_get (log_struct,
-                  "key",   &log_key,
-                  "value", &log_value,
-                  NULL);
-    g_object_set (*_return,
-                  "key",   log_key,
-                  "value", g_strdup (log_value),
-                  NULL);
-  }
-
-  return TRUE;
-}
-
-/* TutorialCalculatorHandler's instance finalizer (destructor) */
-static void
-tutorial_calculator_handler_finalize (GObject *object)
-{
-  TutorialCalculatorHandler *self =
-    TUTORIAL_CALCULATOR_HANDLER (object);
-
-  /* Free our calculation-log hash table */
-  g_hash_table_unref (self->log);
-  self->log = NULL;
-
-  /* Chain up to the parent class */
-  G_OBJECT_CLASS (tutorial_calculator_handler_parent_class)->
-    finalize (object);
-}
-
-/* TutorialCalculatorHandler's instance initializer (constructor) */
-static void
-tutorial_calculator_handler_init (TutorialCalculatorHandler *self)
-{
-  /* Create our calculation-log hash table */
-  self->log = g_hash_table_new_full (g_int_hash,
-                                     g_int_equal,
-                                     g_free,
-                                     g_object_unref);
-}
-
-/* TutorialCalculatorHandler's class initializer */
-static void
-tutorial_calculator_handler_class_init (TutorialCalculatorHandlerClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  SharedServiceHandlerClass *shared_service_handler_class =
-    SHARED_SERVICE_HANDLER_CLASS (klass);
-  CalculatorHandlerClass *calculator_handler_class =
-    CALCULATOR_HANDLER_CLASS (klass);
-
-  /* Register our destructor */
-  gobject_class->finalize = tutorial_calculator_handler_finalize;
-
-  /* Register our implementations of CalculatorHandler's methods */
-  calculator_handler_class->ping =
-    tutorial_calculator_handler_ping;
-  calculator_handler_class->add =
-    tutorial_calculator_handler_add;
-  calculator_handler_class->calculate =
-    tutorial_calculator_handler_calculate;
-  calculator_handler_class->zip =
-    tutorial_calculator_handler_zip;
-
-  /* Register our implementation of SharedServiceHandler's method */
-  shared_service_handler_class->get_struct =
-    tutorial_calculator_handler_get_struct;
-}
-
-/* ---------------------------------------------------------------- */
-
-/* That ends the implementation of TutorialCalculatorHandler.
-   Everything below is fairly generic code that sets up a minimal
-   Thrift server for tutorial clients. */
-
-
-/* Our server object, declared globally so it is accessible within the
-   SIGINT signal handler */
-ThriftServer *server = NULL;
-
-/* A flag that indicates whether the server was interrupted with
-   SIGINT (i.e. Ctrl-C) so we can tell whether its termination was
-   abnormal */
-gboolean sigint_received = FALSE;
-
-/* Handle SIGINT ("Ctrl-C") signals by gracefully stopping the
-   server */
-static void
-sigint_handler (int signal_number)
-{
-  THRIFT_UNUSED_VAR (signal_number);
-
-  /* Take note we were called */
-  sigint_received = TRUE;
-
-  /* Shut down the server gracefully */
-  if (server != NULL)
-    thrift_server_stop (server);
-}
-
-int main (void)
-{
-  TutorialCalculatorHandler *handler;
-  CalculatorProcessor *processor;
-
-  ThriftServerTransport *server_transport;
-  ThriftTransportFactory *transport_factory;
-  ThriftProtocolFactory *protocol_factory;
-
-  struct sigaction sigint_action;
-
-  GError *error = NULL;
-  int exit_status = 0;
-
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-  g_type_init ();
-#endif
-
-  /* Create an instance of our handler, which provides the service's
-     methods' implementation */
-  handler =
-    g_object_new (TYPE_TUTORIAL_CALCULATOR_HANDLER,
-                  NULL);
-
-  /* Create an instance of the service's processor, automatically
-     generated by the Thrift compiler, which parses incoming messages
-     and dispatches them to the appropriate method in the handler */
-  processor =
-    g_object_new (TYPE_CALCULATOR_PROCESSOR,
-                  "handler", handler,
-                  NULL);
-
-  /* Create our server socket, which binds to the specified port and
-     listens for client connections */
-  server_transport =
-    g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                  "port", 9090,
-                  NULL);
-
-  /* Create our transport factory, used by the server to wrap "raw"
-     incoming connections from the client (in this case with a
-     ThriftBufferedTransport to improve performance) */
-  transport_factory =
-    g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT_FACTORY,
-                  NULL);
-
-  /* Create our protocol factory, which determines which wire protocol
-     the server will use (in this case, Thrift's binary protocol) */
-  protocol_factory =
-    g_object_new (THRIFT_TYPE_BINARY_PROTOCOL_FACTORY,
-                  NULL);
-
-  /* Create the server itself */
-  server =
-    g_object_new (THRIFT_TYPE_SIMPLE_SERVER,
-                  "processor",                processor,
-                  "server_transport",         server_transport,
-                  "input_transport_factory",  transport_factory,
-                  "output_transport_factory", transport_factory,
-                  "input_protocol_factory",   protocol_factory,
-                  "output_protocol_factory",  protocol_factory,
-                  NULL);
-
-  /* Install our SIGINT handler, which handles Ctrl-C being pressed by
-     stopping the server gracefully (not strictly necessary, but a
-     nice touch) */
-  memset (&sigint_action, 0, sizeof (sigint_action));
-  sigint_action.sa_handler = sigint_handler;
-  sigint_action.sa_flags = SA_RESETHAND;
-  sigaction (SIGINT, &sigint_action, NULL);
-
-  /* Start the server, which will run until its stop method is invoked
-     (from within the SIGINT handler, in this case) */
-  puts ("Starting the server...");
-  thrift_server_serve (server, &error);
-
-  /* If the server stopped for any reason other than having been
-     interrupted by the user, report the error */
-  if (!sigint_received) {
-    g_message ("thrift_server_serve: %s",
-               error != NULL ? error->message : "(null)");
-    g_clear_error (&error);
-  }
-
-  puts ("done.");
-
-  g_object_unref (server);
-  g_object_unref (transport_factory);
-  g_object_unref (protocol_factory);
-  g_object_unref (server_transport);
-
-  g_object_unref (processor);
-  g_object_unref (handler);
-
-  return exit_status;
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/cpp/CMakeLists.txt b/vendor/git.apache.org/thrift.git/tutorial/cpp/CMakeLists.txt
deleted file mode 100644
index 1feec2c..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/cpp/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
-
-#Make sure gen-cpp files can be included
-include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/gen-cpp")
-include_directories("${PROJECT_SOURCE_DIR}/lib/cpp/src")
-
-include(ThriftMacros)
-
-set(tutorialgencpp_SOURCES
-    gen-cpp/Calculator.cpp
-    gen-cpp/SharedService.cpp
-    gen-cpp/shared_constants.cpp
-    gen-cpp/shared_types.cpp
-    gen-cpp/tutorial_constants.cpp
-    gen-cpp/tutorial_types.cpp
-)
-add_library(tutorialgencpp STATIC ${tutorialgencpp_SOURCES})
-LINK_AGAINST_THRIFT_LIBRARY(tutorialgencpp thrift)
-
-add_custom_command(OUTPUT gen-cpp/Calculator.cpp gen-cpp/SharedService.cpp gen-cpp/shared_constants.cpp gen-cpp/shared_types.cpp gen-cpp/tutorial_constants.cpp gen-cpp/tutorial_types.cpp
-    COMMAND ${THRIFT_COMPILER} --gen cpp -r ${PROJECT_SOURCE_DIR}/tutorial/tutorial.thrift
-)
-
-add_executable(TutorialServer CppServer.cpp)
-target_link_libraries(TutorialServer tutorialgencpp)
-LINK_AGAINST_THRIFT_LIBRARY(TutorialServer thrift)
-target_link_libraries(TutorialServer ${ZLIB_LIBRARIES})
-
-add_executable(TutorialClient CppClient.cpp)
-target_link_libraries(TutorialClient tutorialgencpp)
-LINK_AGAINST_THRIFT_LIBRARY(TutorialClient thrift)
-target_link_libraries(TutorialClient ${ZLIB_LIBRARIES})
diff --git a/vendor/git.apache.org/thrift.git/tutorial/cpp/CppClient.cpp b/vendor/git.apache.org/thrift.git/tutorial/cpp/CppClient.cpp
deleted file mode 100644
index 2763fee..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/cpp/CppClient.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <iostream>
-
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/transport/TSocket.h>
-#include <thrift/transport/TTransportUtils.h>
-
-#include "../gen-cpp/Calculator.h"
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-
-using namespace tutorial;
-using namespace shared;
-
-int main() {
-  boost::shared_ptr<TTransport> socket(new TSocket("localhost", 9090));
-  boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));
-  boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-  CalculatorClient client(protocol);
-
-  try {
-    transport->open();
-
-    client.ping();
-    cout << "ping()" << endl;
-
-    cout << "1 + 1 = " << client.add(1, 1) << endl;
-
-    Work work;
-    work.op = Operation::DIVIDE;
-    work.num1 = 1;
-    work.num2 = 0;
-
-    try {
-      client.calculate(1, work);
-      cout << "Whoa? We can divide by zero!" << endl;
-    } catch (InvalidOperation& io) {
-      cout << "InvalidOperation: " << io.why << endl;
-      // or using generated operator<<: cout << io << endl;
-      // or by using std::exception native method what(): cout << io.what() << endl;
-    }
-
-    work.op = Operation::SUBTRACT;
-    work.num1 = 15;
-    work.num2 = 10;
-    int32_t diff = client.calculate(1, work);
-    cout << "15 - 10 = " << diff << endl;
-
-    // Note that C++ uses return by reference for complex types to avoid
-    // costly copy construction
-    SharedStruct ss;
-    client.getStruct(ss, 1);
-    cout << "Received log: " << ss << endl;
-
-    transport->close();
-  } catch (TException& tx) {
-    cout << "ERROR: " << tx.what() << endl;
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/cpp/CppServer.cpp b/vendor/git.apache.org/thrift.git/tutorial/cpp/CppServer.cpp
deleted file mode 100644
index eafffa9..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/cpp/CppServer.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <thrift/concurrency/ThreadManager.h>
-#include <thrift/concurrency/PlatformThreadFactory.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/TToString.h>
-
-#include <boost/make_shared.hpp>
-
-#include <iostream>
-#include <stdexcept>
-#include <sstream>
-
-#include "../gen-cpp/Calculator.h"
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::concurrency;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-using namespace apache::thrift::server;
-
-using namespace tutorial;
-using namespace shared;
-
-class CalculatorHandler : public CalculatorIf {
-public:
-  CalculatorHandler() {}
-
-  void ping() { cout << "ping()" << endl; }
-
-  int32_t add(const int32_t n1, const int32_t n2) {
-    cout << "add(" << n1 << ", " << n2 << ")" << endl;
-    return n1 + n2;
-  }
-
-  int32_t calculate(const int32_t logid, const Work& work) {
-    cout << "calculate(" << logid << ", " << work << ")" << endl;
-    int32_t val;
-
-    switch (work.op) {
-    case Operation::ADD:
-      val = work.num1 + work.num2;
-      break;
-    case Operation::SUBTRACT:
-      val = work.num1 - work.num2;
-      break;
-    case Operation::MULTIPLY:
-      val = work.num1 * work.num2;
-      break;
-    case Operation::DIVIDE:
-      if (work.num2 == 0) {
-        InvalidOperation io;
-        io.whatOp = work.op;
-        io.why = "Cannot divide by 0";
-        throw io;
-      }
-      val = work.num1 / work.num2;
-      break;
-    default:
-      InvalidOperation io;
-      io.whatOp = work.op;
-      io.why = "Invalid Operation";
-      throw io;
-    }
-
-    SharedStruct ss;
-    ss.key = logid;
-    ss.value = to_string(val);
-
-    log[logid] = ss;
-
-    return val;
-  }
-
-  void getStruct(SharedStruct& ret, const int32_t logid) {
-    cout << "getStruct(" << logid << ")" << endl;
-    ret = log[logid];
-  }
-
-  void zip() { cout << "zip()" << endl; }
-
-protected:
-  map<int32_t, SharedStruct> log;
-};
-
-/*
-  CalculatorIfFactory is code generated.
-  CalculatorCloneFactory is useful for getting access to the server side of the
-  transport.  It is also useful for making per-connection state.  Without this
-  CloneFactory, all connections will end up sharing the same handler instance.
-*/
-class CalculatorCloneFactory : virtual public CalculatorIfFactory {
- public:
-  virtual ~CalculatorCloneFactory() {}
-  virtual CalculatorIf* getHandler(const ::apache::thrift::TConnectionInfo& connInfo)
-  {
-    boost::shared_ptr<TSocket> sock = boost::dynamic_pointer_cast<TSocket>(connInfo.transport);
-    cout << "Incoming connection\n";
-    cout << "\tSocketInfo: "  << sock->getSocketInfo() << "\n";
-    cout << "\tPeerHost: "    << sock->getPeerHost() << "\n";
-    cout << "\tPeerAddress: " << sock->getPeerAddress() << "\n";
-    cout << "\tPeerPort: "    << sock->getPeerPort() << "\n";
-    return new CalculatorHandler;
-  }
-  virtual void releaseHandler( ::shared::SharedServiceIf* handler) {
-    delete handler;
-  }
-};
-
-int main() {
-  TThreadedServer server(
-    boost::make_shared<CalculatorProcessorFactory>(boost::make_shared<CalculatorCloneFactory>()),
-    boost::make_shared<TServerSocket>(9090), //port
-    boost::make_shared<TBufferedTransportFactory>(),
-    boost::make_shared<TBinaryProtocolFactory>());
-
-  /*
-  // if you don't need per-connection state, do the following instead
-  TThreadedServer server(
-    boost::make_shared<CalculatorProcessor>(boost::make_shared<CalculatorHandler>()),
-    boost::make_shared<TServerSocket>(9090), //port
-    boost::make_shared<TBufferedTransportFactory>(),
-    boost::make_shared<TBinaryProtocolFactory>());
-  */
-
-  /**
-   * Here are some alternate server types...
-
-  // This server only allows one connection at a time, but spawns no threads
-  TSimpleServer server(
-    boost::make_shared<CalculatorProcessor>(boost::make_shared<CalculatorHandler>()),
-    boost::make_shared<TServerSocket>(9090),
-    boost::make_shared<TBufferedTransportFactory>(),
-    boost::make_shared<TBinaryProtocolFactory>());
-
-  const int workerCount = 4;
-
-  boost::shared_ptr<ThreadManager> threadManager =
-    ThreadManager::newSimpleThreadManager(workerCount);
-  threadManager->threadFactory(
-    boost::make_shared<PlatformThreadFactory>());
-  threadManager->start();
-
-  // This server allows "workerCount" connection at a time, and reuses threads
-  TThreadPoolServer server(
-    boost::make_shared<CalculatorProcessorFactory>(boost::make_shared<CalculatorCloneFactory>()),
-    boost::make_shared<TServerSocket>(9090),
-    boost::make_shared<TBufferedTransportFactory>(),
-    boost::make_shared<TBinaryProtocolFactory>(),
-    threadManager);
-  */
-
-  cout << "Starting the server..." << endl;
-  server.serve();
-  cout << "Done." << endl;
-  return 0;
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/cpp/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/cpp/Makefile.am
deleted file mode 100755
index 184a69d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/cpp/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-AUTOMAKE_OPTIONS = subdir-objects serial-tests
-
-BUILT_SOURCES = gen-cpp/shared_types.cpp \
-                gen-cpp/tutorial_types.cpp
-
-noinst_LTLIBRARIES = libtutorialgencpp.la
-nodist_libtutorialgencpp_la_SOURCES = \
-	gen-cpp/Calculator.cpp \
-	gen-cpp/Calculator.h \
-	gen-cpp/SharedService.cpp \
-	gen-cpp/SharedService.h \
-	gen-cpp/shared_constants.cpp \
-	gen-cpp/shared_constants.h \
-	gen-cpp/shared_types.cpp \
-	gen-cpp/shared_types.h \
-	gen-cpp/tutorial_constants.cpp \
-	gen-cpp/tutorial_constants.h \
-	gen-cpp/tutorial_types.cpp \
-	gen-cpp/tutorial_types.h
-
-
-
-libtutorialgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
-
-noinst_PROGRAMS = \
-	TutorialServer \
-	TutorialClient
-
-TutorialServer_SOURCES = \
-	CppServer.cpp
-
-TutorialServer_LDADD = \
-	libtutorialgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la
-
-TutorialClient_SOURCES = \
-	CppClient.cpp
-
-TutorialClient_LDADD = \
-	libtutorialgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la
-
-#
-# Common thrift code generation rules
-#
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-cpp/Calculator.cpp gen-cpp/SharedService.cpp gen-cpp/shared_constants.cpp gen-cpp/shared_types.cpp gen-cpp/tutorial_constants.cpp gen-cpp/tutorial_types.cpp: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen cpp -r $<
-
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
-AM_CXXFLAGS = -Wall -Wextra -pedantic
-AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
-
-clean-local:
-	$(RM) gen-cpp/*
-
-tutorialserver: all
-	./TutorialServer
-
-tutorialclient: all
-	./TutorialClient
-
-style-local:
-	$(CPPSTYLE_CMD)
-
-EXTRA_DIST = \
-	CMakeLists.txt \
-	CppClient.cpp \
-	CppServer.cpp
diff --git a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/CsharpClient.cs b/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/CsharpClient.cs
deleted file mode 100644
index 113a472..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/CsharpClient.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using Thrift;
-using Thrift.Protocol;
-using Thrift.Server;
-using Thrift.Transport;
-
-
-namespace CSharpTutorial
-{
-    public class CSharpClient
-    {
-        public static void Main()
-        {
-            try
-            {
-                TTransport transport = new TSocket("localhost", 9090);
-                TProtocol protocol = new TBinaryProtocol(transport);
-                Calculator.Client client = new Calculator.Client(protocol);
-
-                transport.Open();
-                try
-                {
-                    client.ping();
-                    Console.WriteLine("ping()");
-
-                    int sum = client.add(1, 1);
-                    Console.WriteLine("1+1={0}", sum);
-
-                    Work work = new Work();
-
-                    work.Op = Operation.DIVIDE;
-                    work.Num1 = 1;
-                    work.Num2 = 0;
-                    try
-                    {
-                        int quotient = client.calculate(1, work);
-                        Console.WriteLine("Whoa we can divide by 0");
-                    }
-                    catch (InvalidOperation io)
-                    {
-                        Console.WriteLine("Invalid operation: " + io.Why);
-                    }
-
-                    work.Op = Operation.SUBTRACT;
-                    work.Num1 = 15;
-                    work.Num2 = 10;
-                    try
-                    {
-                        int diff = client.calculate(1, work);
-                        Console.WriteLine("15-10={0}", diff);
-                    }
-                    catch (InvalidOperation io)
-                    {
-                        Console.WriteLine("Invalid operation: " + io.Why);
-                    }
-
-                    SharedStruct log = client.getStruct(1);
-                    Console.WriteLine("Check log: {0}", log.Value);
-
-                }
-                finally
-                {
-                    transport.Close();
-                }
-            }
-            catch (TApplicationException x)
-            {
-                Console.WriteLine(x.StackTrace);
-            }
-
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/CsharpClient.csproj b/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/CsharpClient.csproj
deleted file mode 100644
index 1ea7ff6..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/CsharpClient.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{18F24087-4760-43DA-ACAB-7B9F0E096B11}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CsharpClient</RootNamespace>
-    <AssemblyName>CsharpClient</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\gen-csharp\Calculator.cs">
-      <Link>Calculator.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\InvalidOperation.cs">
-      <Link>InvalidOperation.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\Operation.cs">
-      <Link>Operation.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\SharedService.cs">
-      <Link>SharedService.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\SharedStruct.cs">
-      <Link>SharedStruct.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\tutorial.Constants.cs">
-      <Link>tutorial.Constants.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\Work.cs">
-      <Link>Work.cs</Link>
-    </Compile>
-    <Compile Include="CsharpClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\csharp\src\Thrift.csproj">
-      <Project>{499eb63c-d74c-47e8-ae48-a2fc94538e9d}</Project>
-      <Name>Thrift</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>pushd "$(SolutionDir)"
-thrift  -gen csharp   -r  ../tutorial.thrift
-popd
-</PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs
deleted file mode 100644
index bf4bc5d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpClient/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CsharpClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CsharpClient")]
-[assembly: AssemblyCopyright("Copyright © 2010 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1a461214-fa28-452a-bd1d-d23ca8e947e3")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.10.0.0")]
-[assembly: AssemblyFileVersion("0.10.0.0")]
diff --git a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/CsharpServer.cs b/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/CsharpServer.cs
deleted file mode 100644
index 439790a..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/CsharpServer.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System;
-using System.Collections.Generic;
-using Thrift.Server;
-using Thrift.Transport;
-
-namespace CSharpTutorial
-{
-    public class CalculatorHandler : Calculator.Iface
-    {
-        Dictionary<int, SharedStruct> log;
-
-        public CalculatorHandler()
-        {
-            log = new Dictionary<int, SharedStruct>();
-        }
-
-        public void ping()
-        {
-            Console.WriteLine("ping()");
-        }
-
-        public int add(int n1, int n2)
-        {
-            Console.WriteLine("add({0},{1})", n1, n2);
-            return n1 + n2;
-        }
-
-        public int calculate(int logid, Work work)
-        {
-            Console.WriteLine("calculate({0}, [{1},{2},{3}])", logid, work.Op, work.Num1, work.Num2);
-            int val = 0;
-            switch (work.Op)
-            {
-                case Operation.ADD:
-                    val = work.Num1 + work.Num2;
-                    break;
-
-                case Operation.SUBTRACT:
-                    val = work.Num1 - work.Num2;
-                    break;
-
-                case Operation.MULTIPLY:
-                    val = work.Num1 * work.Num2;
-                    break;
-
-                case Operation.DIVIDE:
-                    if (work.Num2 == 0)
-                    {
-                        InvalidOperation io = new InvalidOperation();
-                        io.WhatOp = (int)work.Op;
-                        io.Why = "Cannot divide by 0";
-                        throw io;
-                    }
-                    val = work.Num1 / work.Num2;
-                    break;
-
-                default:
-                    {
-                        InvalidOperation io = new InvalidOperation();
-                        io.WhatOp = (int)work.Op;
-                        io.Why = "Unknown operation";
-                        throw io;
-                    }
-            }
-
-            SharedStruct entry = new SharedStruct();
-            entry.Key = logid;
-            entry.Value = val.ToString();
-            log[logid] = entry;
-
-            return val;
-        }
-
-        public SharedStruct getStruct(int key)
-        {
-            Console.WriteLine("getStruct({0})", key);
-            return log[key];
-        }
-
-        public void zip()
-        {
-            Console.WriteLine("zip()");
-        }
-    }
-
-    public class CSharpServer
-    {
-        public static void Main()
-        {
-            try
-            {
-                CalculatorHandler handler = new CalculatorHandler();
-                Calculator.Processor processor = new Calculator.Processor(handler);
-                TServerTransport serverTransport = new TServerSocket(9090);
-                TServer server = new TSimpleServer(processor, serverTransport);
-
-                // Use this for a multithreaded server
-                // server = new TThreadPoolServer(processor, serverTransport);
-
-                Console.WriteLine("Starting the server...");
-                server.Serve();
-            }
-            catch (Exception x)
-            {
-                Console.WriteLine(x.StackTrace);
-            }
-            Console.WriteLine("done.");
-        }
-    }
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/CsharpServer.csproj b/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/CsharpServer.csproj
deleted file mode 100644
index 0748180..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/CsharpServer.csproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{66707BAE-BBF9-4F03-B53E-BE3AD58322F8}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CsharpServer</RootNamespace>
-    <AssemblyName>CsharpServer</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\gen-csharp\Calculator.cs">
-      <Link>Calculator.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\InvalidOperation.cs">
-      <Link>InvalidOperation.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\Operation.cs">
-      <Link>Operation.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\SharedService.cs">
-      <Link>SharedService.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\SharedStruct.cs">
-      <Link>SharedStruct.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\tutorial.Constants.cs">
-      <Link>tutorial.Constants.cs</Link>
-    </Compile>
-    <Compile Include="..\gen-csharp\Work.cs">
-      <Link>Work.cs</Link>
-    </Compile>
-    <Compile Include="CsharpServer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\csharp\src\Thrift.csproj">
-      <Project>{499eb63c-d74c-47e8-ae48-a2fc94538e9d}</Project>
-      <Name>Thrift</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>pushd "$(SolutionDir)"
-thrift  -gen csharp   -r  ../tutorial.thrift
-popd
-
-</PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs b/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index c416acc..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CsharpServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CsharpServer")]
-[assembly: AssemblyCopyright("Copyright © 2010 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e3b428f4-b2e9-4fc1-8a34-84abc4339860")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.10.0.0")]
-[assembly: AssemblyFileVersion("0.10.0.0")]
diff --git a/vendor/git.apache.org/thrift.git/tutorial/csharp/tutorial.sln b/vendor/git.apache.org/thrift.git/tutorial/csharp/tutorial.sln
deleted file mode 100644
index ec57a18..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/csharp/tutorial.sln
+++ /dev/null
@@ -1,39 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thrift", "..\..\lib\csharp\src\Thrift.csproj", "{499EB63C-D74C-47E8-AE48-A2FC94538E9D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpClient", "CsharpClient\CsharpClient.csproj", "{18F24087-4760-43DA-ACAB-7B9F0E096B11}"
-    ProjectSection(ProjectDependencies) = postProject
-        {499EB63C-D74C-47E8-AE48-A2FC94538E9D} = {499EB63C-D74C-47E8-AE48-A2FC94538E9D}
-        {66707BAE-BBF9-4F03-B53E-BE3AD58322F8} = {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}
-    EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsharpServer", "CsharpServer\CsharpServer.csproj", "{66707BAE-BBF9-4F03-B53E-BE3AD58322F8}"
-    ProjectSection(ProjectDependencies) = postProject
-        {499EB63C-D74C-47E8-AE48-A2FC94538E9D} = {499EB63C-D74C-47E8-AE48-A2FC94538E9D}
-    EndProjectSection
-EndProject
-Global
-    GlobalSection(SolutionConfigurationPlatforms) = preSolution
-        Debug|Any CPU = Debug|Any CPU
-        Release|Any CPU = Release|Any CPU
-    EndGlobalSection
-    GlobalSection(ProjectConfigurationPlatforms) = postSolution
-        {499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {499EB63C-D74C-47E8-AE48-A2FC94538E9D}.Release|Any CPU.Build.0 = Release|Any CPU
-        {18F24087-4760-43DA-ACAB-7B9F0E096B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {18F24087-4760-43DA-ACAB-7B9F0E096B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {18F24087-4760-43DA-ACAB-7B9F0E096B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {18F24087-4760-43DA-ACAB-7B9F0E096B11}.Release|Any CPU.Build.0 = Release|Any CPU
-        {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {66707BAE-BBF9-4F03-B53E-BE3AD58322F8}.Release|Any CPU.Build.0 = Release|Any CPU
-    EndGlobalSection
-    GlobalSection(SolutionProperties) = preSolution
-        HideSolutionNode = FALSE
-    EndGlobalSection
-EndGlobal
diff --git a/vendor/git.apache.org/thrift.git/tutorial/d/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/d/Makefile.am
deleted file mode 100644
index d8c8b29..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/d/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-LIB_D_DIR = $(top_srcdir)/lib/d
-
-GEN_SRC = gen-d/share/SharedService.d gen-d/share/shared_types.d \
-	gen-d/tutorial/tutorial_types.d gen-d/tutorial/Calculator.d
-
-$(GEN_SRC): $(top_srcdir)/tutorial/tutorial.thrift
-	$(top_builddir)/compiler/cpp/thrift --gen d -r $<
-
-server: server.d $(GEN_SRC)
-	$(DMD) -I${LIB_D_DIR}/src -L-L${LIB_D_DIR} -L-lthriftd server.d ${GEN_SRC}
-
-client: client.d $(GEN_SRC)
-	$(DMD) -I${LIB_D_DIR}/src -L-L${LIB_D_DIR} -L-lthriftd client.d ${GEN_SRC}
-
-PROGS = server client
-
-if WITH_D_EVENT_TESTS
-async_client: async_client.d $(GEN_SRC)
-	$(DMD) -I${LIB_D_DIR}/src -L-L${LIB_D_DIR} -L-lthriftd-event -L-lthriftd -L-levent async_client.d ${GEN_SRC}
-
-PROGS += async_client
-endif
-
-all-local: $(PROGS)
-
-clean:
-	$(RM) -f $(PROGS)
diff --git a/vendor/git.apache.org/thrift.git/tutorial/d/async_client.d b/vendor/git.apache.org/thrift.git/tutorial/d/async_client.d
deleted file mode 100644
index 1defce0..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/d/async_client.d
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module async_client;
-
-import std.exception;
-import std.stdio;
-import thrift.async.libevent;
-import thrift.async.socket;
-import thrift.base;
-import thrift.codegen.async_client;
-import thrift.protocol.binary;
-import thrift.transport.buffered;
-
-import tutorial.Calculator;
-import tutorial.tutorial_types;
-
-void main() {
-  auto asyncManager = new TLibeventAsyncManager;
-
-  // If we are done, gracefully stop the async manager to avoid hanging on
-  // appplication shutdown.
-  scope (exit) asyncManager.stop();
-
-  auto socket = new TAsyncSocket(asyncManager, "localhost", 9090);
-  auto client = new TAsyncClient!Calculator(
-    socket,
-    new TBufferedTransportFactory,
-    new TBinaryProtocolFactory!TBufferedTransport
-  );
-
-  socket.open();
-
-  // Invoke all the methods.
-  auto pingResult = client.ping();
-
-  auto addResult = client.add(1, 1);
-
-  auto work = Work();
-  work.op = Operation.DIVIDE;
-  work.num1 = 1;
-  work.num2 = 0;
-  auto quotientResult = client.calculate(1, work);
-
-  work.op = Operation.SUBTRACT;
-  work.num1 = 15;
-  work.num2 = 10;
-  auto diffResult = client.calculate(1, work);
-
-  auto logResult = client.getStruct(1);
-
-  // Await the responses.
-  pingResult.waitGet();
-  writeln("ping()");
-
-  int sum = addResult.waitGet();
-  writefln("1 + 1 = %s", sum);
-
-  try {
-    quotientResult.waitGet();
-    writeln("Whoa we can divide by 0");
-  } catch (InvalidOperation io) {
-    writeln("Invalid operation: " ~ io.why);
-  }
-
-  writefln("15 - 10 = %s", diffResult.waitGet());
-
-  // TFuture is implicitly convertible to the result type via »alias this«,
-  // for which it (eagerly, of course) awaits completion.
-  writefln("Check log: %s", logResult.value);
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/d/client.d b/vendor/git.apache.org/thrift.git/tutorial/d/client.d
deleted file mode 100644
index 1867a17..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/d/client.d
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module client;
-
-import std.stdio;
-import thrift.base;
-import thrift.codegen.client;
-import thrift.protocol.binary;
-import thrift.transport.buffered;
-import thrift.transport.socket;
-
-import tutorial.Calculator;
-import tutorial.tutorial_types;
-
-void main() {
-  auto socket = new TSocket("localhost", 9090);
-  auto transport = new TBufferedTransport(socket);
-  auto protocol = tBinaryProtocol(transport);
-  auto client = tClient!Calculator(protocol);
-
-  transport.open();
-
-  client.ping();
-  writeln("ping()");
-
-  int sum = client.add(1, 1);
-  writefln("1 + 1 = %s", sum);
-
-  auto work = Work();
-  work.op = Operation.DIVIDE;
-  work.num1 = 1;
-  work.num2 = 0;
-  try {
-    int quotient = client.calculate(1, work);
-    writeln("Whoa we can divide by 0");
-  } catch (InvalidOperation io) {
-    writeln("Invalid operation: " ~ io.why);
-  }
-
-  work.op = Operation.SUBTRACT;
-  work.num1 = 15;
-  work.num2 = 10;
-  int diff = client.calculate(1, work);
-  writefln("15 - 10 = %s", diff);
-
-  auto log = client.getStruct(1);
-  writefln("Check log: %s", log.value);
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/d/server.d b/vendor/git.apache.org/thrift.git/tutorial/d/server.d
deleted file mode 100644
index cbcedcc..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/d/server.d
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-module server;
-
-import std.conv : to;
-import std.stdio;
-import thrift.codegen.processor;
-import thrift.protocol.binary;
-import thrift.server.simple;
-import thrift.server.transport.socket;
-import thrift.transport.buffered;
-
-import share.SharedService;
-import share.shared_types;
-import tutorial.Calculator;
-import tutorial.tutorial_types;
-
-/**
- * The actual implementation of the Calculator interface that is called by
- * the server to answer the requests.
- */
-class CalculatorHandler : Calculator {
-  void ping() {
-    writeln("ping()");
-  }
-
-  int add(int n1, int n2) {
-    writefln("add(%s,%s)", n1, n2);
-    return n1 + n2;
-  }
-
-  int calculate(int logid, ref const(Work) work) {
-    writefln("calculate(%s, {%s, %s, %s})", logid, work.op, work.num1, work.num2);
-    int val;
-
-    switch (work.op) {
-    case Operation.ADD:
-      val = work.num1 + work.num2;
-      break;
-    case Operation.SUBTRACT:
-      val = work.num1 - work.num2;
-      break;
-    case Operation.MULTIPLY:
-      val = work.num1 * work.num2;
-      break;
-    case Operation.DIVIDE:
-      if (work.num2 == 0) {
-        auto io = new InvalidOperation();
-        io.whatOp = work.op;
-        io.why = "Cannot divide by 0";
-        throw io;
-      }
-      val = work.num1 / work.num2;
-      break;
-    default:
-      auto io = new InvalidOperation();
-      io.whatOp = work.op;
-      io.why = "Invalid Operation";
-      throw io;
-    }
-
-    auto ss = SharedStruct();
-    ss.key = logid;
-    ss.value = to!string(val);
-    log[logid] = ss;
-
-    return val;
-  }
-
-  SharedStruct getStruct(int logid) {
-    writefln("getStruct(%s)", logid);
-    return log[logid];
-  }
-
-  void zip() {
-    writeln("zip()");
-  }
-
-protected:
-  SharedStruct[int] log;
-}
-
-void main() {
-  auto protocolFactory = new TBinaryProtocolFactory!();
-  auto processor = new TServiceProcessor!Calculator(new CalculatorHandler);
-  auto serverTransport = new TServerSocket(9090);
-  auto transportFactory = new TBufferedTransportFactory;
-
-  auto server = new TSimpleServer(
-    processor, serverTransport, transportFactory, protocolFactory);
-
-  writeln("Starting the server on port 9090...");
-  server.serve();
-  writeln("done.");
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/dart/Makefile.am
deleted file mode 100644
index ccca598..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-BUILT_SOURCES = gen-dart/tutorial/lib/tutorial.dart gen-dart/shared/lib/shared.dart
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-dart/tutorial/lib/tutorial.dart gen-dart/shared/lib/shared.dart: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen dart -r $<
-
-all-local: gen-dart/tutorial/lib/tutorial.dart pub-get
-
-clean-local:
-	$(RM) -r gen-*
-	find . -type d -name "packages" | xargs $(RM) -r
-	find . -type f -name ".packages" | xargs $(RM)
-
-pub-get: pub-get-gen pub-get-client pub-get-console-client pub-get-server
-
-pub-get-gen: pub-get-tutorial pub-get-shared
-
-pub-get-tutorial: gen-dart/tutorial/lib/tutorial.dart
-	cd gen-dart/tutorial; ${DARTPUB} get
-
-pub-get-shared: gen-dart/shared/lib/shared.dart
-	cd gen-dart/shared; ${DARTPUB} get
-
-pub-get-client:
-	cd client; ${DARTPUB} get
-
-pub-get-console-client:
-	cd console_client; ${DARTPUB} get
-
-pub-get-server:
-	cd server; ${DARTPUB} get
-
-tutorialserver: pub-get-gen pub-get-server
-	${DART} server/bin/main.dart
-
-tutorialclient: pub-get-gen pub-get-client
-	cd client; ${DARTPUB} serve
-
-tutorialconsoleclient: pub-get-console-client
-	${DART} console_client/bin/main.dart
-
-EXTRA_DIST = \
-	client/web/client.dart \
-	client/web/index.html \
-	client/web/styles.css \
-	client/pubspec.yaml \
-	console_client/bin/main.dart \
-	console_client/pubspec.yaml \
-	server/bin/main.dart \
-	server/pubspec.yaml \
-	build.sh
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/build.sh b/vendor/git.apache.org/thrift.git/tutorial/dart/build.sh
deleted file mode 100644
index eabe04a..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/build.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# 'License'); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-set -e;
-rm -r gen-dart || true;
-
-thrift --gen dart ../shared.thrift;
-cd gen-dart/shared;
-pub get;
-cd ../..;
-
-thrift --gen dart ../tutorial.thrift;
-cd gen-dart/tutorial;
-pub get;
-cd ../..;
-
-cd client;
-pub get;
-cd ..;
-
-cd console_client;
-pub get;
-cd ..;
-
-cd server;
-pub get;
-cd ..;
-
-dartfmt -w gen-dart;
-
-echo "\nEnjoy the Dart tutorial!";
-echo "\nTo run the server:";
-echo "> dart server/bin/main.dart";
-echo "\nTo run the client:";
-echo "# Serve the app from the client directory and view in a browser";
-echo "> cd client;";
-echo "> pub serve;";
-echo "\nTo run the console client:";
-echo "> dart console_client/bin/main.dart";
-echo "";
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/client/.analysis_options b/vendor/git.apache.org/thrift.git/tutorial/dart/client/.analysis_options
deleted file mode 100644
index a10d4c5..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/client/.analysis_options
+++ /dev/null
@@ -1,2 +0,0 @@
-analyzer:
-  strong-mode: true
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/client/pubspec.yaml b/vendor/git.apache.org/thrift.git/tutorial/dart/client/pubspec.yaml
deleted file mode 100644
index 5f60f67..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/client/pubspec.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# 'License'); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: tutorial_client
-version: 0.10.0
-description: A Dart client implementation of the Apache Thrift tutorial
-author: Apache Thrift Developers <dev@thrift.apache.org>
-homepage: http://thrift.apache.org
-
-environment:
-  sdk: ">=1.13.0 <2.0.0"
-
-dependencies:
-  browser: ^0.10.0
-  shared:
-    path: ../gen-dart/shared
-  thrift:
-    path: ../../../lib/dart
-  tutorial:
-    path: ../gen-dart/tutorial
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/client.dart b/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/client.dart
deleted file mode 100644
index 4f02d0d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/client.dart
+++ /dev/null
@@ -1,278 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-import 'dart:html';
-
-import 'package:thrift/thrift.dart';
-import 'package:thrift/thrift_browser.dart';
-import 'package:shared/shared.dart';
-import 'package:tutorial/tutorial.dart';
-
-/// Adapted from the AS3 tutorial
-void main() {
-  new CalculatorUI(querySelector('#output')).start();
-}
-
-class CalculatorUI {
-  final DivElement output;
-
-  CalculatorUI(this.output);
-
-  TTransport _transport;
-  Calculator _calculatorClient;
-
-  void start() {
-    _buildInterface();
-    _initConnection();
-  }
-
-  void _validate() {
-    if (!_transport.isOpen) {
-      window.alert("The transport is not open!");
-    }
-  }
-
-  void _initConnection() {
-    _transport = new TAsyncClientSocketTransport(
-        new TWebSocket(Uri.parse('ws://127.0.0.1:9090/ws')),
-        new TMessageReader(new TBinaryProtocolFactory()));
-    TProtocol protocol = new TBinaryProtocol(_transport);
-    _transport.open();
-
-    _calculatorClient = new CalculatorClient(protocol);
-  }
-
-  void _buildInterface() {
-    output.children.forEach((e) {
-      e.remove();
-    });
-
-    _buildPingComponent();
-
-    _buildAddComponent();
-
-    _buildCalculatorComponent();
-
-    _buildGetStructComponent();
-  }
-
-  void _buildPingComponent() {
-    output.append(new HeadingElement.h3()..text = "Ping");
-    ButtonElement pingButton = new ButtonElement()
-      ..text = "PING"
-      ..onClick.listen(_onPingClick);
-    output.append(pingButton);
-  }
-
-  void _onPingClick(MouseEvent e) {
-    _validate();
-
-    _calculatorClient.ping();
-  }
-
-  void _buildAddComponent() {
-    output.append(new HeadingElement.h3()..text = "Add");
-    InputElement num1 = new InputElement()
-      ..id = "add1"
-      ..type = "number"
-      ..style.fontSize = "14px"
-      ..style.width = "50px";
-    output.append(num1);
-    SpanElement op = new SpanElement()
-      ..text = "+"
-      ..style.fontSize = "14px"
-      ..style.marginLeft = "10px";
-    output.append(op);
-    InputElement num2 = new InputElement()
-      ..id = "add2"
-      ..type = "number"
-      ..style.fontSize = "14px"
-      ..style.width = "50px"
-      ..style.marginLeft = "10px";
-    output.append(num2);
-    ButtonElement addButton = new ButtonElement()
-      ..text = "="
-      ..style.fontSize = "14px"
-      ..style.marginLeft = "10px"
-      ..onClick.listen(_onAddClick);
-    output.append(addButton);
-    SpanElement result = new SpanElement()
-      ..id = "addResult"
-      ..style.fontSize = "14px"
-      ..style.marginLeft = "10px";
-    output.append(result);
-  }
-
-  void _onAddClick(MouseEvent e) {
-    _validate();
-
-    InputElement num1 = querySelector("#add1");
-    InputElement num2 = querySelector("#add2");
-    SpanElement result = querySelector("#addResult");
-
-    _calculatorClient
-        .add(int.parse(num1.value), int.parse(num2.value))
-        .then((int n) {
-      result.text = "$n";
-    });
-  }
-
-  void _buildCalculatorComponent() {
-    output.append(new HeadingElement.h3()..text = "Calculator");
-    InputElement num1 = new InputElement()
-      ..id = "calc1"
-      ..type = "number"
-      ..style.fontSize = "14px"
-      ..style.width = "50px";
-    output.append(num1);
-    SelectElement op = new SelectElement()
-      ..id = "calcOp"
-      ..multiple = false
-      ..selectedIndex = 0
-      ..style.fontSize = "16px"
-      ..style.marginLeft = "10px"
-      ..style.width = "50px";
-    OptionElement addOp = new OptionElement()
-      ..text = "+"
-      ..value = Operation.ADD.toString();
-    op.add(addOp, 0);
-    OptionElement subtractOp = new OptionElement()
-      ..text = "-"
-      ..value = Operation.SUBTRACT.toString();
-    op.add(subtractOp, 1);
-    OptionElement multiplyOp = new OptionElement()
-      ..text = "*"
-      ..value = Operation.MULTIPLY.toString();
-    op.add(multiplyOp, 2);
-    OptionElement divideOp = new OptionElement()
-      ..text = "/"
-      ..value = Operation.DIVIDE.toString();
-    op.add(divideOp, 3);
-    output.append(op);
-    InputElement num2 = new InputElement()
-      ..id = "calc2"
-      ..type = "number"
-      ..style.fontSize = "14px"
-      ..style.width = "50px"
-      ..style.marginLeft = "10px";
-    output.append(num2);
-    ButtonElement calcButton = new ButtonElement()
-      ..text = "="
-      ..style.fontSize = "14px"
-      ..style.marginLeft = "10px"
-      ..onClick.listen(_onCalcClick);
-    output.append(calcButton);
-    SpanElement result = new SpanElement()
-      ..id = "calcResult"
-      ..style.fontSize = "14px"
-      ..style.marginLeft = "10px";
-    output.append(result);
-    output.append(new BRElement());
-    output.append(new BRElement());
-    LabelElement logIdLabel = new LabelElement()
-      ..text = "Log ID:"
-      ..style.fontSize = "14px";
-    output.append(logIdLabel);
-    InputElement logId = new InputElement()
-      ..id = "logId"
-      ..type = "number"
-      ..value = "1"
-      ..style.fontSize = "14px"
-      ..style.width = "50px"
-      ..style.marginLeft = "10px";
-    output.append(logId);
-    LabelElement commentLabel = new LabelElement()
-      ..text = "Comment:"
-      ..style.fontSize = "14px"
-      ..style.marginLeft = "10px";
-    output.append(commentLabel);
-    InputElement comment = new InputElement()
-      ..id = "comment"
-      ..style.fontSize = "14px"
-      ..style.width = "100px"
-      ..style.marginLeft = "10px";
-    output.append(comment);
-  }
-
-  void _onCalcClick(MouseEvent e) {
-    _validate();
-
-    InputElement num1 = querySelector("#calc1");
-    InputElement num2 = querySelector("#calc2");
-    SelectElement op = querySelector("#calcOp");
-    SpanElement result = querySelector("#calcResult");
-    InputElement logId = querySelector("#logId");
-    InputElement comment = querySelector("#comment");
-
-    int logIdValue = int.parse(logId.value);
-    logId.value = (logIdValue + 1).toString();
-
-    Work work = new Work();
-    work.num1 = int.parse(num1.value);
-    work.num2 = int.parse(num2.value);
-    work.op = int.parse(op.options[op.selectedIndex].value);
-    work.comment = comment.value;
-
-    _calculatorClient.calculate(logIdValue, work).then((int n) {
-      result.text = "$n";
-    });
-  }
-
-  void _buildGetStructComponent() {
-    output.append(new HeadingElement.h3()..text = "Get Struct");
-    LabelElement logIdLabel = new LabelElement()
-      ..text = "Struct Key:"
-      ..style.fontSize = "14px";
-    output.append(logIdLabel);
-    InputElement logId = new InputElement()
-      ..id = "structKey"
-      ..type = "number"
-      ..value = "1"
-      ..style.fontSize = "14px"
-      ..style.width = "50px"
-      ..style.marginLeft = "10px";
-    output.append(logId);
-    ButtonElement getStructButton = new ButtonElement()
-      ..text = "GET"
-      ..style.fontSize = "14px"
-      ..style.marginLeft = "10px"
-      ..onClick.listen(_onGetStructClick);
-    output.append(getStructButton);
-    output.append(new BRElement());
-    output.append(new BRElement());
-    TextAreaElement result = new TextAreaElement()
-      ..id = "getStructResult"
-      ..style.fontSize = "14px"
-      ..style.width = "300px"
-      ..style.height = "50px"
-      ..style.marginLeft = "10px";
-    output.append(result);
-  }
-
-  void _onGetStructClick(MouseEvent e) {
-    _validate();
-
-    InputElement structKey = querySelector("#structKey");
-    TextAreaElement result = querySelector("#getStructResult");
-
-    _calculatorClient
-        .getStruct(int.parse(structKey.value))
-        .then((SharedStruct s) {
-      result.text = "${s.toString()}";
-    });
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/index.html b/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/index.html
deleted file mode 100644
index 64b184e..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/index.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Thrift Tutorial</title>
-    <link rel="stylesheet" href="styles.css">
-    <script async src="client.dart" type="application/dart"></script>
-    <script async src="packages/browser/dart.js"></script>
-</head>
-
-<body>
-
-  <div id="output"></div>
-
-</body>
-</html>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/styles.css b/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/styles.css
deleted file mode 100644
index c031502..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/client/web/styles.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@import url(https://fonts.googleapis.com/css?family=Roboto);
-
-html, body {
-    width: 100%;
-    height: 100%;
-    margin: 0;
-    padding: 10px;
-    font-family: 'Roboto', sans-serif;
-}
-
-h3 {
-    border-bottom: solid;
-    border-width: thin;
-    padding-top: 20px;
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/.analysis_options b/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/.analysis_options
deleted file mode 100644
index a10d4c5..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/.analysis_options
+++ /dev/null
@@ -1,2 +0,0 @@
-analyzer:
-  strong-mode: true
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/bin/main.dart b/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/bin/main.dart
deleted file mode 100644
index fda206a..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/bin/main.dart
+++ /dev/null
@@ -1,149 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-import 'dart:async';
-import 'dart:io';
-
-import 'package:args/args.dart';
-import 'package:logging/logging.dart';
-import 'package:thrift/thrift.dart';
-import 'package:thrift/thrift_console.dart';
-import 'package:tutorial/tutorial.dart';
-
-TTransport _transport;
-Calculator _calculator;
-int logid = 0;
-
-const Map<String, int> operationLookup = const {
-  '+': Operation.ADD,
-  '-': Operation.SUBTRACT,
-  '*': Operation.MULTIPLY,
-  '/': Operation.DIVIDE
-};
-
-main(List<String> args) {
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((LogRecord rec) {
-    print('${rec.level.name}: ${rec.time}: ${rec.message}');
-  });
-
-  var parser = new ArgParser();
-  parser.addOption('port', defaultsTo: '9090', help: 'The port to connect to');
-
-  ArgResults results;
-  try {
-    results = parser.parse(args);
-  } catch (e) {
-    results = null;
-  }
-
-  if (results == null) {
-    print(parser.usage);
-    exit(0);
-  }
-
-  int port = int.parse(results['port']);
-
-  _initConnection(port).then((_) => _run());
-}
-
-Future _initConnection(int port) async {
-  var socket = await Socket.connect('127.0.0.1', port);
-  _transport = new TAsyncClientSocketTransport(
-      new TTcpSocket(socket), new TMessageReader(new TBinaryProtocolFactory()));
-  TProtocol protocol = new TBinaryProtocol(_transport);
-  await _transport.open();
-
-  _calculator = new CalculatorClient(protocol);
-}
-
-Future _run() async {
-  _help();
-
-  while (true) {
-    stdout.write("> ");
-    var input = stdin.readLineSync();
-    var parts = input.split(' ');
-    var command = parts[0];
-    var args = parts.length > 1 ? parts.sublist(1) : [];
-
-    switch (command) {
-      case 'ping':
-        await _ping();
-        break;
-
-      case 'add':
-        await _add(int.parse(args[0]), int.parse(args[1]));
-        break;
-
-      case 'calc':
-        int op = operationLookup[args[1]];
-        if (!Operation.VALID_VALUES.contains(op)) {
-          stdout.writeln('Unknown operator ${args[1]}');
-          break;
-        }
-
-        var work = new Work()
-          ..num1 = int.parse(args[0])
-          ..op = op
-          ..num2 = int.parse(args[2])
-          ..comment = args.length > 3 ? args[3] : '';
-
-        await _calc(work);
-        break;
-
-      case 'struct':
-        await _struct(int.parse(args[0]));
-        break;
-
-      case 'help':
-      default:
-        _help();
-        break;
-    }
-  }
-}
-
-void _help() {
-  stdout.writeln('Commands:');
-  stdout.writeln('  help');
-  stdout.writeln('  ping');
-  stdout.writeln('  add x y');
-  stdout.writeln('  calc x op y [comment]');
-  stdout.writeln('  struct id');
-  stdout.writeln('');
-}
-
-Future _ping() async {
-  await _calculator.ping();
-  stdout.writeln('ping succeeded');
-}
-
-Future _add(int x, int y) async {
-  int result = await _calculator.add(x, y);
-  stdout.writeln('= $result');
-}
-
-Future _calc(Work work) async {
-  int result = await _calculator.calculate(logid++, work);
-  stdout.writeln('= $result');
-}
-
-Future _struct(int key) async {
-  var struct = await _calculator.getStruct(key);
-  stdout.writeln(struct.toString());
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/pubspec.yaml b/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/pubspec.yaml
deleted file mode 100644
index 32fd4ff..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/console_client/pubspec.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# 'License'); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: tutorial_console_client
-version: 0.10.0
-description: >
-  A Dart console client to implementation of the Apache Thrift tutorial
-author: Apache Thrift Developers <dev@thrift.apache.org>
-homepage: http://thrift.apache.org
-
-environment:
-  sdk: ">=1.13.0 <2.0.0"
-
-dependencies:
-  args: ^0.13.0
-  collection: ^1.1.0
-  shared:
-    path: ../gen-dart/shared
-  thrift:
-    path: ../../../lib/dart
-  tutorial:
-    path: ../gen-dart/tutorial
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/server/.analysis_options b/vendor/git.apache.org/thrift.git/tutorial/dart/server/.analysis_options
deleted file mode 100644
index a10d4c5..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/server/.analysis_options
+++ /dev/null
@@ -1,2 +0,0 @@
-analyzer:
-  strong-mode: true
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/server/bin/main.dart b/vendor/git.apache.org/thrift.git/tutorial/dart/server/bin/main.dart
deleted file mode 100644
index b8ac30d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/server/bin/main.dart
+++ /dev/null
@@ -1,163 +0,0 @@
-/// Licensed to the Apache Software Foundation (ASF) under one
-/// or more contributor license agreements. See the NOTICE file
-/// distributed with this work for additional information
-/// regarding copyright ownership. The ASF licenses this file
-/// to you under the Apache License, Version 2.0 (the
-/// "License"); you may not use this file except in compliance
-/// with the License. You may obtain a copy of the License at
-///
-/// http://www.apache.org/licenses/LICENSE-2.0
-///
-/// Unless required by applicable law or agreed to in writing,
-/// software distributed under the License is distributed on an
-/// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-/// KIND, either express or implied. See the License for the
-/// specific language governing permissions and limitations
-/// under the License.
-
-import 'dart:async';
-import 'dart:io';
-
-import 'package:args/args.dart';
-import 'package:logging/logging.dart';
-import 'package:thrift/thrift.dart';
-import 'package:thrift/thrift_console.dart';
-import 'package:tutorial/tutorial.dart';
-import 'package:shared/shared.dart';
-
-TProtocol _protocol;
-TProcessor _processor;
-WebSocket _webSocket;
-
-main(List<String> args) {
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((LogRecord rec) {
-    print('${rec.level.name}: ${rec.time}: ${rec.message}');
-  });
-
-  var parser = new ArgParser();
-  parser.addOption('port', defaultsTo: '9090', help: 'The port to listen on');
-  parser.addOption('type',
-      defaultsTo: 'ws',
-      allowed: ['ws', 'tcp'],
-      help: 'The type of socket',
-      allowedHelp: {'ws': 'WebSocket', 'tcp': 'TCP Socket'});
-
-  ArgResults results;
-  try {
-    results = parser.parse(args);
-  } catch (e) {
-    results = null;
-  }
-
-  if (results == null) {
-    print(parser.usage);
-    exit(0);
-  }
-
-  int port = int.parse(results['port']);
-  String socketType = results['type'];
-
-  if (socketType == 'tcp') {
-    _runTcpServer(port);
-  } else if (socketType == 'ws') {
-    _runWebSocketServer(port);
-  }
-}
-
-Future _runWebSocketServer(int port) async {
-  var httpServer = await HttpServer.bind('127.0.0.1', port);
-  print('listening for WebSocket connections on $port');
-
-  httpServer.listen((HttpRequest request) async {
-    if (request.uri.path == '/ws') {
-      _webSocket = await WebSocketTransformer.upgrade(request);
-      await _initProcessor(new TWebSocket(_webSocket));
-    } else {
-      print('Invalid path: ${request.uri.path}');
-    }
-  });
-}
-
-Future _runTcpServer(int port) async {
-  var serverSocket = await ServerSocket.bind('127.0.0.1', port);
-  print('listening for TCP connections on $port');
-
-  Socket socket = await serverSocket.first;
-  await _initProcessor(new TTcpSocket(socket));
-}
-
-Future _initProcessor(TSocket socket) async {
-  TServerSocketTransport transport = new TServerSocketTransport(socket);
-  transport.onIncomingMessage.listen(_processMessage);
-  _processor = new CalculatorProcessor(new CalculatorServer());
-  _protocol = new TBinaryProtocol(transport);
-  await _protocol.transport.open();
-
-  print('connected');
-}
-
-Future _processMessage(_) async {
-  _processor.process(_protocol, _protocol);
-}
-
-class CalculatorServer implements Calculator {
-  final Map<int, SharedStruct> _log = {};
-
-  Future ping() async {
-    print('ping()');
-  }
-
-  Future<int> add(int num1, int num2) async {
-    print('add($num1, $num2)');
-
-    return num1 + num2;
-  }
-
-  Future<int> calculate(int logid, Work work) async {
-    print('calulate($logid, ${work.toString()})');
-
-    int val;
-
-    switch (work.op) {
-      case Operation.ADD:
-        val = work.num1 + work.num2;
-        break;
-
-      case Operation.SUBTRACT:
-        val = work.num1 - work.num2;
-        break;
-
-      case Operation.MULTIPLY:
-        val = work.num1 * work.num2;
-        break;
-
-      case Operation.DIVIDE:
-        if (work.num2 == 0) {
-          var x = new InvalidOperation();
-          x.whatOp = work.op;
-          x.why = 'Cannot divide by 0';
-          throw x;
-        }
-        val = (work.num1 / work.num2).floor();
-        break;
-    }
-
-    var log = new SharedStruct();
-    log.key = logid;
-    log.value = '$val "${work.comment}"';
-    this._log[logid] = log;
-
-    return val;
-  }
-
-  Future zip() async {
-    print('zip()');
-  }
-
-  Future<SharedStruct> getStruct(int key) async {
-    print('getStruct($key)');
-
-    return _log[key];
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/dart/server/pubspec.yaml b/vendor/git.apache.org/thrift.git/tutorial/dart/server/pubspec.yaml
deleted file mode 100644
index 2a26448..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/dart/server/pubspec.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# 'License'); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: tutorial_server
-version: 0.10.0
-description: A Dart server to support the Apache Thrift tutorial
-author: Apache Thrift Developers <dev@thrift.apache.org>
-homepage: http://thrift.apache.org
-
-environment:
-  sdk: ">=1.13.0 <2.0.0"
-
-dependencies:
-  args: ^0.13.0
-  shared:
-    path: ../gen-dart/shared
-  thrift:
-    path: ../../../lib/dart
-  tutorial:
-    path: ../gen-dart/tutorial
diff --git a/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiClient/DelphiClient.dpr b/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiClient/DelphiClient.dpr
deleted file mode 100644
index 0f380b0..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiClient/DelphiClient.dpr
+++ /dev/null
@@ -1,114 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-program DelphiClient;
-
-{$APPTYPE CONSOLE}
-{$D 'Copyright (c) 2012 The Apache Software Foundation'}
-
-uses
-  SysUtils,
-  Generics.Collections,
-  Thrift in '..\..\..\lib\delphi\src\Thrift.pas',
-  Thrift.Collections in '..\..\..\lib\delphi\src\Thrift.Collections.pas',
-  Thrift.Console in '..\..\..\lib\delphi\src\Thrift.Console.pas',
-  Thrift.Utils in '..\..\..\lib\delphi\src\Thrift.Utils.pas',
-  Thrift.Stream in '..\..\..\lib\delphi\src\Thrift.Stream.pas',
-  Thrift.Protocol in '..\..\..\lib\delphi\src\Thrift.Protocol.pas',
-  Thrift.Server in '..\..\..\lib\delphi\src\Thrift.Server.pas',
-  Thrift.Transport in '..\..\..\lib\delphi\src\Thrift.Transport.pas',
-  Shared in '..\..\gen-delphi\Shared.pas',
-  Tutorial in '..\..\gen-delphi\Tutorial.pas';
-
-
-type
-  DelphiTutorialClient = class
-  public
-    class procedure Main;
-  end;
-
-
-//--- DelphiTutorialClient ---------------------------------------
-
-
-class procedure DelphiTutorialClient.Main;
-var transport : ITransport;
-    protocol  : IProtocol;
-    client    : TCalculator.Iface;
-    work      : IWork;
-    sum, quotient, diff : Integer;
-    log       : ISharedStruct;
-begin
-  try
-    transport := TSocketImpl.Create( 'localhost', 9090);
-    protocol  := TBinaryProtocolImpl.Create( transport);
-    client    := TCalculator.TClient.Create( protocol);
-
-    transport.Open;
-
-    client.ping;
-    Console.WriteLine('ping()');
-
-    sum := client.add( 1, 1);
-    Console.WriteLine( Format( '1+1=%d', [sum]));
-
-    work := TWorkImpl.Create;
-
-    work.Op   := TOperation.DIVIDE;
-    work.Num1 := 1;
-    work.Num2 := 0;
-    try
-      quotient := client.calculate(1, work);
-      Console.WriteLine( 'Whoa we can divide by 0');
-      Console.WriteLine( Format('1/0=%d',[quotient]));
-    except
-      on io: TInvalidOperation
-      do Console.WriteLine( 'Invalid operation: ' + io.Why);
-    end;
-
-    work.Op   := TOperation.SUBTRACT;
-    work.Num1 := 15;
-    work.Num2 := 10;
-    try
-      diff := client.calculate( 1, work);
-      Console.WriteLine( Format('15-10=%d', [diff]));
-    except
-      on io: TInvalidOperation
-      do Console.WriteLine( 'Invalid operation: ' + io.Why);
-    end;
-
-    log := client.getStruct(1);
-    Console.WriteLine( Format( 'Check log: %s', [log.Value]));
-
-    transport.Close();
-
-  except
-    on e : Exception
-    do Console.WriteLine( e.ClassName+': '+e.Message);
-  end;
-end;
-
-
-begin
-  try
-    DelphiTutorialClient.Main;
-  except
-    on E: Exception do
-      Writeln(E.ClassName, ': ', E.Message);
-  end;
-end.
diff --git a/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiClient/DelphiClient.dproj b/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiClient/DelphiClient.dproj
deleted file mode 100644
index 34aa533..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiClient/DelphiClient.dproj
+++ /dev/null
@@ -1,119 +0,0 @@
-    <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-        <PropertyGroup>
-            <ProjectGuid>{2B8FB3A1-2F9E-4883-8C53-0F56220B34F6}</ProjectGuid>
-            <MainSource>DelphiClient.dpr</MainSource>
-            <ProjectVersion>12.3</ProjectVersion>
-            <Basis>True</Basis>
-            <Config Condition="'$(Config)'==''">Debug</Config>
-            <Platform>Win32</Platform>
-            <AppType>Console</AppType>
-            <FrameworkType>None</FrameworkType>
-            <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
-            <Cfg_1>true</Cfg_1>
-            <CfgParent>Base</CfgParent>
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
-            <Cfg_2>true</Cfg_2>
-            <CfgParent>Base</CfgParent>
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Base)'!=''">
-            <DCC_UnitSearchPath>..\..\..\lib\delphi\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-            <DCC_ImageBase>00400000</DCC_ImageBase>
-            <DCC_DcuOutput>.\dcu\$(Config)\$(Platform)</DCC_DcuOutput>
-            <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
-            <DCC_ExeOutput>..\bin\$(Config)\$(Platform)</DCC_ExeOutput>
-            <DCC_E>false</DCC_E>
-            <DCC_N>false</DCC_N>
-            <DCC_S>false</DCC_S>
-            <DCC_F>false</DCC_F>
-            <DCC_K>false</DCC_K>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Cfg_1)'!=''">
-            <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-            <DCC_Optimize>false</DCC_Optimize>
-            <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Cfg_2)'!=''">
-            <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-            <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-            <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-            <DCC_DebugInformation>false</DCC_DebugInformation>
-        </PropertyGroup>
-        <ItemGroup>
-            <DelphiCompile Include="DelphiClient.dpr">
-                <MainSource>MainSource</MainSource>
-            </DelphiCompile>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Collections.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Console.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Utils.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Stream.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Server.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Transport.pas"/>
-            <DCCReference Include="..\..\gen-delphi\Shared.pas"/>
-            <DCCReference Include="..\..\gen-delphi\Tutorial.pas"/>
-            <BuildConfiguration Include="Release">
-                <Key>Cfg_2</Key>
-                <CfgParent>Base</CfgParent>
-            </BuildConfiguration>
-            <BuildConfiguration Include="Basis">
-                <Key>Base</Key>
-            </BuildConfiguration>
-            <BuildConfiguration Include="Debug">
-                <Key>Cfg_1</Key>
-                <CfgParent>Base</CfgParent>
-            </BuildConfiguration>
-        </ItemGroup>
-        <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-        <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-        <ProjectExtensions>
-            <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-            <Borland.ProjectType/>
-            <BorlandProject>
-                <Delphi.Personality>
-                    <VersionInfo>
-                        <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-                        <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-                        <VersionInfo Name="MajorVer">1</VersionInfo>
-                        <VersionInfo Name="MinorVer">0</VersionInfo>
-                        <VersionInfo Name="Release">0</VersionInfo>
-                        <VersionInfo Name="Build">0</VersionInfo>
-                        <VersionInfo Name="Debug">False</VersionInfo>
-                        <VersionInfo Name="PreRelease">False</VersionInfo>
-                        <VersionInfo Name="Special">False</VersionInfo>
-                        <VersionInfo Name="Private">False</VersionInfo>
-                        <VersionInfo Name="DLL">False</VersionInfo>
-                        <VersionInfo Name="Locale">1033</VersionInfo>
-                        <VersionInfo Name="CodePage">1252</VersionInfo>
-                    </VersionInfo>
-                    <VersionInfoKeys>
-                        <VersionInfoKeys Name="CompanyName"/>
-                        <VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
-                        <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-                        <VersionInfoKeys Name="InternalName">DelphiClient</VersionInfoKeys>
-                        <VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
-                        <VersionInfoKeys Name="LegalTrademarks"/>
-                        <VersionInfoKeys Name="OriginalFilename">DelphiClient.exe</VersionInfoKeys>
-                        <VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
-                        <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-                        <VersionInfoKeys Name="Comments"/>
-                    </VersionInfoKeys>
-                    <Source>
-                        <Source Name="MainSource">DelphiClient.dpr</Source>
-                    </Source>
-                </Delphi.Personality>
-                <Platforms>
-                    <Platform value="Win32">True</Platform>
-                </Platforms>
-            </BorlandProject>
-            <ProjectFileVersion>12</ProjectFileVersion>
-        </ProjectExtensions>
-    </Project>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiServer/DelphiServer.dpr b/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiServer/DelphiServer.dpr
deleted file mode 100644
index 9d54a2e..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiServer/DelphiServer.dpr
+++ /dev/null
@@ -1,173 +0,0 @@
-(*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *)
-program DelphiServer;
-
-{$APPTYPE CONSOLE}
-{$D 'Copyright (c) 2012 The Apache Software Foundation'}
-
-{$Q+}     // throws exceptions on numeric overflows
-
-uses
-  SysUtils,
-  Generics.Collections,
-  Thrift in '..\..\..\lib\delphi\src\Thrift.pas',
-  Thrift.Collections in '..\..\..\lib\delphi\src\Thrift.Collections.pas',
-  Thrift.Console in '..\..\..\lib\delphi\src\Thrift.Console.pas',
-  Thrift.Utils in '..\..\..\lib\delphi\src\Thrift.Utils.pas',
-  Thrift.Stream in '..\..\..\lib\delphi\src\Thrift.Stream.pas',
-  Thrift.Protocol in '..\..\..\lib\delphi\src\Thrift.Protocol.pas',
-  Thrift.Server in '..\..\..\lib\delphi\src\Thrift.Server.pas',
-  Thrift.Transport in '..\..\..\lib\delphi\src\Thrift.Transport.pas',
-  Shared in '..\..\gen-delphi\Shared.pas',
-  Tutorial in '..\..\gen-delphi\Tutorial.pas';
-
-
-type
-  TCalculatorHandler = class( TInterfacedObject, TCalculator.Iface)
-  protected
-    FLog : TDictionary< Integer, ISharedStruct>;
-
-    // TSharedService.Iface
-    function  getStruct(key: Integer): ISharedStruct;
-
-    // TCalculator.Iface
-    procedure ping();
-    function  add(num1: Integer; num2: Integer): Integer;
-    function  calculate(logid: Integer; const w: IWork): Integer;
-    procedure zip();
-
-  public
-    constructor Create;
-    destructor Destroy;  override;
-
-  end;
-
-  DelphiTutorialServer = class
-  public
-    class procedure Main;
-  end;
-
-
-//--- TCalculatorHandler ---------------------------------------------------
-
-
-constructor TCalculatorHandler.Create;
-begin
-  inherited Create;
-  FLog := TDictionary< Integer, ISharedStruct>.Create();
-end;
-
-
-destructor TCalculatorHandler.Destroy;
-begin
-  try
-    FreeAndNil( FLog);
-  finally
-    inherited Destroy;
-  end;
-end;
-
-
-procedure TCalculatorHandler.ping;
-begin
-  Console.WriteLine( 'ping()');
-end;
-
-
-function TCalculatorHandler.add(num1: Integer; num2: Integer): Integer;
-begin
-  Console.WriteLine( Format( 'add( %d, %d)', [num1, num2]));
-  result := num1 + num2;
-end;
-
-
-function TCalculatorHandler.calculate(logid: Integer; const w: IWork): Integer;
-var entry : ISharedStruct;
-begin
-  try
-    Console.WriteLine( Format('calculate( %d, [%d,%d,%d])', [logid, Ord(w.Op), w.Num1, w.Num2]));
-
-    case w.Op of
-      TOperation.ADD      :  result := w.Num1 + w.Num2;
-      TOperation.SUBTRACT :  result := w.Num1 - w.Num2;
-      TOperation.MULTIPLY :  result := w.Num1 * w.Num2;
-      TOperation.DIVIDE   :  result := Round( w.Num1 / w.Num2);
-    else
-      raise TInvalidOperation.Create( Ord(w.Op), 'Unknown operation');
-    end;
-
-  except
-    on e:Thrift.TException do raise;  // let Thrift Exceptions pass through
-    on e:Exception do raise TInvalidOperation.Create( Ord(w.Op), e.Message);  // repackage all other
-  end;
-
-  entry := TSharedStructImpl.Create;
-  entry.Key   := logid;
-  entry.Value := IntToStr( result);
-  FLog.AddOrSetValue( logid, entry);
-end;
-
-
-function TCalculatorHandler.getStruct(key: Integer): ISharedStruct;
-begin
-  Console.WriteLine( Format( 'getStruct(%d)', [key]));
-  result := FLog[key];
-end;
-
-
-procedure TCalculatorHandler.zip;
-begin
-  Console.WriteLine( 'zip()');
-end;
-
-
-//--- DelphiTutorialServer ----------------------------------------------------------------------
-
-
-class procedure DelphiTutorialServer.Main;
-var handler   : TCalculator.Iface;
-    processor : IProcessor;
-    transport : IServerTransport;
-    server    : IServer;
-begin
-  try
-    handler   := TCalculatorHandler.Create;
-    processor := TCalculator.TProcessorImpl.Create( handler);
-    transport := TServerSocketImpl.Create( 9090);
-    server    := TSimpleServer.Create( processor, transport);
-
-    Console.WriteLine( 'Starting the server...');
-    server.Serve();
-
-  except
-    on e: Exception do Console.WriteLine( e.Message);
-  end;
-
-  Console.WriteLine('done.');
-end;
-
-
-begin
-  try
-    DelphiTutorialServer.Main;
-  except
-    on E: Exception do
-      Writeln(E.ClassName, ': ', E.Message);
-  end;
-end.
diff --git a/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiServer/DelphiServer.dproj b/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiServer/DelphiServer.dproj
deleted file mode 100644
index 74811bc..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/delphi/DelphiServer/DelphiServer.dproj
+++ /dev/null
@@ -1,118 +0,0 @@
-    <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-        <PropertyGroup>
-            <ProjectGuid>{2B8FB3A1-2F9E-4883-8C53-0F56220B34F6}</ProjectGuid>
-            <MainSource>DelphiServer.dpr</MainSource>
-            <ProjectVersion>12.3</ProjectVersion>
-            <Basis>True</Basis>
-            <Config Condition="'$(Config)'==''">Debug</Config>
-            <Platform>Win32</Platform>
-            <AppType>Console</AppType>
-            <FrameworkType>None</FrameworkType>
-            <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
-            <Cfg_1>true</Cfg_1>
-            <CfgParent>Base</CfgParent>
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
-            <Cfg_2>true</Cfg_2>
-            <CfgParent>Base</CfgParent>
-            <Base>true</Base>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Base)'!=''">
-            <DCC_ImageBase>00400000</DCC_ImageBase>
-            <DCC_DcuOutput>.\dcu\$(Config)\$(Platform)</DCC_DcuOutput>
-            <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
-            <DCC_ExeOutput>..\bin\$(Config)\$(Platform)</DCC_ExeOutput>
-            <DCC_E>false</DCC_E>
-            <DCC_N>false</DCC_N>
-            <DCC_S>false</DCC_S>
-            <DCC_F>false</DCC_F>
-            <DCC_K>false</DCC_K>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Cfg_1)'!=''">
-            <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-            <DCC_Optimize>false</DCC_Optimize>
-            <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(Cfg_2)'!=''">
-            <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-            <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-            <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-            <DCC_DebugInformation>false</DCC_DebugInformation>
-        </PropertyGroup>
-        <ItemGroup>
-            <DelphiCompile Include="DelphiServer.dpr">
-                <MainSource>MainSource</MainSource>
-            </DelphiCompile>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Collections.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Console.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Utils.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Stream.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Server.pas"/>
-            <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Transport.pas"/>
-            <DCCReference Include="..\..\gen-delphi\Shared.pas"/>
-            <DCCReference Include="..\..\gen-delphi\Tutorial.pas"/>
-            <BuildConfiguration Include="Release">
-                <Key>Cfg_2</Key>
-                <CfgParent>Base</CfgParent>
-            </BuildConfiguration>
-            <BuildConfiguration Include="Basis">
-                <Key>Base</Key>
-            </BuildConfiguration>
-            <BuildConfiguration Include="Debug">
-                <Key>Cfg_1</Key>
-                <CfgParent>Base</CfgParent>
-            </BuildConfiguration>
-        </ItemGroup>
-        <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-        <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-        <ProjectExtensions>
-            <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-            <Borland.ProjectType/>
-            <BorlandProject>
-                <Delphi.Personality>
-                    <VersionInfo>
-                        <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-                        <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-                        <VersionInfo Name="MajorVer">1</VersionInfo>
-                        <VersionInfo Name="MinorVer">0</VersionInfo>
-                        <VersionInfo Name="Release">0</VersionInfo>
-                        <VersionInfo Name="Build">0</VersionInfo>
-                        <VersionInfo Name="Debug">False</VersionInfo>
-                        <VersionInfo Name="PreRelease">False</VersionInfo>
-                        <VersionInfo Name="Special">False</VersionInfo>
-                        <VersionInfo Name="Private">False</VersionInfo>
-                        <VersionInfo Name="DLL">False</VersionInfo>
-                        <VersionInfo Name="Locale">1033</VersionInfo>
-                        <VersionInfo Name="CodePage">1252</VersionInfo>
-                    </VersionInfo>
-                    <VersionInfoKeys>
-                        <VersionInfoKeys Name="CompanyName"/>
-                        <VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
-                        <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-                        <VersionInfoKeys Name="InternalName">DelphiServer</VersionInfoKeys>
-                        <VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
-                        <VersionInfoKeys Name="LegalTrademarks"/>
-                        <VersionInfoKeys Name="OriginalFilename">DelphiServer.exe</VersionInfoKeys>
-                        <VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
-                        <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-                        <VersionInfoKeys Name="Comments"/>
-                    </VersionInfoKeys>
-                    <Source>
-                        <Source Name="MainSource">DelphiServer.dpr</Source>
-                    </Source>
-                </Delphi.Personality>
-                <Platforms>
-                    <Platform value="Win32">True</Platform>
-                </Platforms>
-            </BorlandProject>
-            <ProjectFileVersion>12</ProjectFileVersion>
-        </ProjectExtensions>
-    </Project>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/delphi/Tutorial.groupproj b/vendor/git.apache.org/thrift.git/tutorial/delphi/Tutorial.groupproj
deleted file mode 100644
index 3a2a237..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/delphi/Tutorial.groupproj
+++ /dev/null
@@ -1,48 +0,0 @@
-    <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-        <PropertyGroup>
-            <ProjectGuid>{3D042C7F-3EF2-4574-8304-AB7FB79F814C}</ProjectGuid>
-        </PropertyGroup>
-        <ItemGroup>
-            <Projects Include="DelphiServer\DelphiServer.dproj">
-                <Dependencies/>
-            </Projects>
-            <Projects Include="DelphiClient\DelphiClient.dproj">
-                <Dependencies/>
-            </Projects>
-        </ItemGroup>
-        <ProjectExtensions>
-            <Borland.Personality>Default.Personality.12</Borland.Personality>
-            <Borland.ProjectType/>
-            <BorlandProject>
-                <Default.Personality/>
-            </BorlandProject>
-        </ProjectExtensions>
-        <Target Name="DelphiServer">
-            <MSBuild Projects="DelphiServer\DelphiServer.dproj"/>
-        </Target>
-        <Target Name="DelphiServer:Clean">
-            <MSBuild Projects="DelphiServer\DelphiServer.dproj" Targets="Clean"/>
-        </Target>
-        <Target Name="DelphiServer:Make">
-            <MSBuild Projects="DelphiServer\DelphiServer.dproj" Targets="Make"/>
-        </Target>
-        <Target Name="DelphiClient">
-            <MSBuild Projects="DelphiClient\DelphiClient.dproj"/>
-        </Target>
-        <Target Name="DelphiClient:Clean">
-            <MSBuild Projects="DelphiClient\DelphiClient.dproj" Targets="Clean"/>
-        </Target>
-        <Target Name="DelphiClient:Make">
-            <MSBuild Projects="DelphiClient\DelphiClient.dproj" Targets="Make"/>
-        </Target>
-        <Target Name="Build">
-            <CallTarget Targets="DelphiServer;DelphiClient"/>
-        </Target>
-        <Target Name="Clean">
-            <CallTarget Targets="DelphiServer:Clean;DelphiClient:Clean"/>
-        </Target>
-        <Target Name="Make">
-            <CallTarget Targets="DelphiServer:Make;DelphiClient:Make"/>
-        </Target>
-        <Import Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')" Project="$(BDS)\Bin\CodeGear.Group.Targets"/>
-    </Project>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/erl/README.md b/vendor/git.apache.org/thrift.git/tutorial/erl/README.md
deleted file mode 100644
index 9d17cd0..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/erl/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-To try things out, run
-
-% ./server.sh
-Erlang R14B (erts-5.8.1) [source] [64-bit] [smp:4:4] [rq:4] [async-threads:0] [hipe] [kernel-poll:false]
-
-Eshell V5.8.1  (abort with ^G)
-> server:start().
-> client:t().
diff --git a/vendor/git.apache.org/thrift.git/tutorial/erl/client.erl b/vendor/git.apache.org/thrift.git/tutorial/erl/client.erl
deleted file mode 100644
index 5d40916..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/erl/client.erl
+++ /dev/null
@@ -1,78 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(client).
-
--include("calculator_thrift.hrl").
-
--export([t/0]).
-
-p(X) ->
-    io:format("~p~n", [X]),
-    ok.
-
-t() ->
-    Port = 9999,
-
-    {ok, Client0} = thrift_client_util:new("127.0.0.1",
-                                           Port,
-                                           calculator_thrift,
-                                           []),
-
-    {Client1, {ok, ok}} = thrift_client:call(Client0, ping, []),
-    io:format("ping~n", []),
-
-    {Client2, {ok, Sum}} = thrift_client:call(Client1, add,  [1, 1]),
-    io:format("1+1=~p~n", [Sum]),
-
-    {Client3, {ok, Sum1}} = thrift_client:call(Client2, add, [1, 4]),
-    io:format("1+4=~p~n", [Sum1]),
-
-    Work = #work{op=?tutorial_Operation_SUBTRACT,
-                 num1=15,
-                 num2=10},
-    {Client4, {ok, Diff}} = thrift_client:call(Client3, calculate, [1, Work]),
-    io:format("15-10=~p~n", [Diff]),
-
-    {Client5, {ok, Log}} = thrift_client:call(Client4, getStruct, [1]),
-    io:format("Log: ~p~n", [Log]),
-
-    Client6 =
-        try
-            Work1 = #work{op=?tutorial_Operation_DIVIDE,
-                          num1=1,
-                          num2=0},
-            {ClientS1, {ok, _Quot}} = thrift_client:call(Client5, calculate, [2, Work1]),
-
-            io:format("LAME: exception handling is broken~n", []),
-            ClientS1
-        catch
-            throw:{ClientS2, Z} ->
-                io:format("Got exception where expecting - the " ++
-                          "following is NOT a problem!!!~n"),
-                p(Z),
-                ClientS2
-        end,
-
-
-    {Client7, {ok, ok}} = thrift_client:call(Client6, zip, []),
-    io:format("zip~n", []),
-
-    {_Client8, ok} = thrift_client:close(Client7),
-    ok.
diff --git a/vendor/git.apache.org/thrift.git/tutorial/erl/client.sh b/vendor/git.apache.org/thrift.git/tutorial/erl/client.sh
deleted file mode 120000
index a417e0d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/erl/client.sh
+++ /dev/null
@@ -1 +0,0 @@
-server.sh
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/erl/json_client.erl b/vendor/git.apache.org/thrift.git/tutorial/erl/json_client.erl
deleted file mode 100644
index 312b01e..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/erl/json_client.erl
+++ /dev/null
@@ -1,89 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-%% The JSON protocol over HTTP implementation was created by
-%% Peter Neumark <neumark.peter@gmail.com> based on
-%% the binary protocol + socket tutorial. Use with the same server
-%% that the Javascript tutorial uses!
-
--module(json_client).
-
--include("calculator_thrift.hrl").
-
--export([t/0]).
-
-%% Client constructor for the http transports
-%% with the json protocol
-new_client(Host, Path, Service, _Options) ->
-    {ProtoOpts, TransOpts} = {[],[]},
-    TransportFactory = fun() -> thrift_http_transport:new(Host, Path, TransOpts) end,
-    {ok, ProtocolFactory} = thrift_json_protocol:new_protocol_factory(
-                              TransportFactory, ProtoOpts),
-    {ok, Protocol} = ProtocolFactory(),
-    thrift_client:new(Protocol, Service).
-
-p(X) ->
-    io:format("~p~n", [X]),
-    ok.
-
-t() ->
-    inets:start(),
-    {ok, Client0} = new_client("127.0.0.1:8088", "/thrift/service/tutorial/",
-                                           calculator_thrift,
-                                           []),
-    {Client1, {ok, ok}} = thrift_client:call(Client0, ping, []),
-    io:format("ping~n", []),
-
-    {Client2, {ok, Sum}} = thrift_client:call(Client1, add,  [1, 1]),
-    io:format("1+1=~p~n", [Sum]),
-
-    {Client3, {ok, Sum1}} = thrift_client:call(Client2, add, [1, 4]),
-    io:format("1+4=~p~n", [Sum1]),
-
-    Work = #work{op=?tutorial_Operation_SUBTRACT,
-                 num1=15,
-                 num2=10},
-    {Client4, {ok, Diff}} = thrift_client:call(Client3, calculate, [1, Work]),
-    io:format("15-10=~p~n", [Diff]),
-
-    {Client5, {ok, Log}} = thrift_client:call(Client4, getStruct, [1]),
-    io:format("Log: ~p~n", [Log]),
-
-    Client6 =
-        try
-            Work1 = #work{op=?tutorial_Operation_DIVIDE,
-                          num1=1,
-                          num2=0},
-            {ClientS1, {ok, _Quot}} = thrift_client:call(Client5, calculate, [2, Work1]),
-
-            io:format("LAME: exception handling is broken~n", []),
-            ClientS1
-        catch
-            throw:{ClientS2, Z} ->
-                io:format("Got exception where expecting - the " ++
-                          "following is NOT a problem!!!~n"),
-                p(Z),
-                ClientS2
-        end,
-
-
-    {Client7, {ok, ok}} = thrift_client:call(Client6, zip, []),
-    io:format("zip~n", []),
-
-    {_Client8, ok} = thrift_client:close(Client7),
-    ok.
diff --git a/vendor/git.apache.org/thrift.git/tutorial/erl/server.erl b/vendor/git.apache.org/thrift.git/tutorial/erl/server.erl
deleted file mode 100644
index f1e7357..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/erl/server.erl
+++ /dev/null
@@ -1,82 +0,0 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%%   http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
--module(server).
-
--include("calculator_thrift.hrl").
-
--export([start/0, start/1, handle_function/2,
-         stop/1, ping/0, add/2, calculate/2, getStruct/1, zip/0]).
-
-debug(Format, Data) ->
-    error_logger:info_msg(Format, Data).
-
-ping() ->
-    debug("ping()",[]),
-    ok.
-
-add(N1, N2) ->
-    debug("add(~p,~p)",[N1,N2]),
-    N1+N2.
-
-calculate(Logid, Work) ->
-    { Op, Num1, Num2 } = { Work#work.op, Work#work.num1, Work#work.num2 },
-    debug("calculate(~p, {~p,~p,~p})", [Logid, Op, Num1, Num2]),
-    case Op of
-        ?tutorial_Operation_ADD      -> Num1 + Num2;
-        ?tutorial_Operation_SUBTRACT -> Num1 - Num2;
-        ?tutorial_Operation_MULTIPLY -> Num1 * Num2;
-
-        ?tutorial_Operation_DIVIDE when Num2 == 0 ->
-          throw(#invalidOperation{whatOp=Op, why="Cannot divide by 0"});
-        ?tutorial_Operation_DIVIDE ->
-          Num1 div Num2;
-
-        _Else ->
-          throw(#invalidOperation{whatOp=Op, why="Invalid operation"})
-    end.
-
-getStruct(Key) ->
-    debug("getStruct(~p)", [Key]),
-    #sharedStruct{key=Key, value="RARG"}.
-
-zip() ->
-    debug("zip", []),
-    ok.
-
-%%
-
-start() ->
-    start(9999).
-
-start(Port) ->
-    Handler   = ?MODULE,
-    thrift_socket_server:start([{handler, Handler},
-                                {service, calculator_thrift},
-                                {port, Port},
-                                {name, tutorial_server}]).
-
-stop(Server) ->
-    thrift_socket_server:stop(Server).
-
-handle_function(Function, Args) when is_atom(Function), is_tuple(Args) ->
-    case apply(?MODULE, Function, tuple_to_list(Args)) of
-        ok -> ok;
-        Reply -> {reply, Reply}
-    end.
diff --git a/vendor/git.apache.org/thrift.git/tutorial/erl/server.sh b/vendor/git.apache.org/thrift.git/tutorial/erl/server.sh
deleted file mode 100755
index 775afb6..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/erl/server.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-ERL_THRIFT=../../lib/erl
-
-if ! [ -d ${ERL_THRIFT}/ebin ]; then
-    echo "Please build the Thrift library by running \`make' in ${ERL_THRIFT}"
-    exit 1
-fi
-
-if ! [ -d gen-erl ]; then
-  ../../compiler/cpp/thrift -r --gen erl ../tutorial.thrift
-fi
-
-
-erlc -I ${ERL_THRIFT}/include -I ${ERL_THRIFT}/ebin \
-     -I gen-erl -o gen-erl gen-erl/*.erl &&
-  erlc -I ${ERL_THRIFT}/include -I gen-erl *.erl &&
-  erl +K true -pa ${ERL_THRIFT}/ebin -pa gen-erl
diff --git a/vendor/git.apache.org/thrift.git/tutorial/go/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/go/Makefile.am
deleted file mode 100644
index a707d5d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/go/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-go/tutorial/calculator.go gen-go/shared/shared_service.go: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen go -r $<
-
-all-local: gen-go/tutorial/calculator.go
-
-
-check: src/git.apache.org/thrift.git/lib/go/thrift
-	$(THRIFT) -r --gen go $(top_srcdir)/tutorial/tutorial.thrift
-	cp -r gen-go/* src/
-	GOPATH=`pwd` $(GO) build ./...
-	GOPATH=`pwd` $(GO) build -o go-tutorial src/*.go
-	GOPATH=`pwd` $(GO) build -o calculator-remote src/tutorial/calculator-remote/calculator-remote.go
-
-src/git.apache.org/thrift.git/lib/go/thrift:
-	mkdir -p src/git.apache.org/thrift.git/lib/go
-	ln -sf $(realpath $(top_srcdir)/lib/go/thrift) src/git.apache.org/thrift.git/lib/go/thrift
-
-tutorialserver: all
-	GOPATH=`pwd` $(GO) run src/*.go -server=true
-
-tutorialclient: all
-	GOPATH=`pwd` $(GO) run src/*.go 
-
-tutorialsecureserver: all
-	GOPATH=`pwd` $(GO) run src/*.go -server=true -secure=true
-
-tutorialsecureclient: all
-	GOPATH=`pwd` $(GO) run src/*.go -secure=true
-
-clean-local:
-	$(RM) -r gen-* src/shared src/tutorial src/git.apache.org go-tutorial calculator-remote
-
-EXTRA_DIST = \
-	src/client.go \
-	src/handler.go \
-	src/server.go \
-	src/main.go \
-	server.crt \
-	server.key
-
diff --git a/vendor/git.apache.org/thrift.git/tutorial/go/server.crt b/vendor/git.apache.org/thrift.git/tutorial/go/server.crt
deleted file mode 100644
index 8a5ef3c..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/go/server.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENzCCAx+gAwIBAgIJAOYfYfw7NCOcMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITWFyeWxhbmQxFDASBgNVBAcMC0ZvcmVzdCBIaWxs
-MScwJQYDVQQKDB5UaGUgQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xFjAUBgNV
-BAsMDUFwYWNoZSBUaHJpZnQxEjAQBgNVBAMMCWxvY2FsaG9zdDEkMCIGCSqGSIb3
-DQEJARYVZGV2QHRocmlmdC5hcGFjaGUub3JnMB4XDTE0MDQwNzE4NTgwMFoXDTIy
-MDYyNDE4NTgwMFowgbExCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhNYXJ5bGFuZDEU
-MBIGA1UEBwwLRm9yZXN0IEhpbGwxJzAlBgNVBAoMHlRoZSBBcGFjaGUgU29mdHdh
-cmUgRm91bmRhdGlvbjEWMBQGA1UECwwNQXBhY2hlIFRocmlmdDESMBAGA1UEAwwJ
-bG9jYWxob3N0MSQwIgYJKoZIhvcNAQkBFhVkZXZAdGhyaWZ0LmFwYWNoZS5vcmcw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqE9TE9wEXp5LRtLQVDSGQ
-GV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCySN8I2Xw6
-L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/HjKNg6ZKg
-2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQBGmZmMIUw
-AinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xku62LipkX
-wCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDmtrhVQF4n
-AgMBAAGjUDBOMB0GA1UdDgQWBBQo8v0wzQPx3EEexJPGlxPK1PpgKjAfBgNVHSME
-GDAWgBQo8v0wzQPx3EEexJPGlxPK1PpgKjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBGFRiJslcX0aJkwZpzTwSUdgcfKbpvNEbCNtVohfQVTI4a/oN5
-U+yqDZJg3vOaOuiAZqyHcIlZ8qyesCgRN314Tl4/JQ++CW8mKj1meTgo5YFxcZYm
-T9vsI3C+Nzn84DINgI9mx6yktIt3QOKZRDpzyPkUzxsyJ8J427DaimDrjTR+fTwD
-1Dh09xeeMnSa5zeV1HEDyJTqCXutLetwQ/IyfmMBhIx+nvB5f67pz/m+Dv6V0r3I
-p4HCcdnDUDGJbfqtoqsAATQQWO+WWuswB6mOhDbvPTxhRpZq6AkgWqv4S+u3M2GO
-r5p9FrBgavAw5bKO54C0oQKpN/5fta5l6Ws0
------END CERTIFICATE-----
diff --git a/vendor/git.apache.org/thrift.git/tutorial/go/server.key b/vendor/git.apache.org/thrift.git/tutorial/go/server.key
deleted file mode 100644
index 263cfce..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/go/server.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCqE9TE9wEXp5LR
-tLQVDSGQGV78+7ZtP/I/ZaJ6Q6ZGlfxDFvZjFF73seNhAvlKlYm/jflIHYLnNOCy
-SN8I2Xw6L9MbC+jvwkEKfQo4eDoxZnOZjNF5J1/lZtBeOowMkhhzBMH1Rds351/H
-jKNg6ZKg2Cldd0j7HbDtEixOLgLbPRpBcaYrLrNMasf3Hal+x8/b8ue28x93HSQB
-GmZmMIUwAinEu/fNP4lLGl/0kZb76TnyRpYSPYojtS6CnkH+QLYnsRREXJYwD1Xk
-u62LipkXwCkRTnZ5nUsDMX6FPKgjQFQCWDXG/N096+PRUQAChhrXsJ+gF3NqWtDm
-trhVQF4nAgMBAAECggEAW/y52YYW6ypROGbZ94DQpFV0kLO7qT8q0Ksxw5sPNaIt
-fEPRIymDa8ikyHWJS5Oxmw84wo5jnJV26jaLmwe2Lupq7Xf1lqej8f5LJtuv7cQR
-xfzp1vM65KJFFJHp6WqjGqJ6HSSZOpVDsnQYcXQjQCdpyAmaSWd3p+FqYSZ1mQmD
-bFNI7jqpczWSZhTdotQ7p7Hn9TVCehflP3yGIB3bQ+wCcCB85dOBz201L+YgaIck
-Sz43A4NvWaQIRLRDw7s9GW4jY5T0Jv282WIeAlVpVxLIwu48r4R4yGTIx9Ydowvq
-57+Y5iPPjAXxu0V9t00oS3bYxDaKh2DUfc/5zowq8QKBgQDYNVPXmaG0aIH4vjQ9
-7fRdw/UDkYcQbn6CnglQOu77/S8ogQzpKCVJgJgkZNqOVtQMEPzekGEcLTbje1gU
-8Bky2k+PL9UwbFy0emnOVh4rqrNXHsRvJcehNT/PRb5hjF3MUMFV/0iD4b+naFaE
-jrSWiZ2ZXj2qfwAK52GFbtOuBQKBgQDJYQuGiY0r22E4waJmCSKczoBT3cwlVzWj
-V2ljgA9RHLNTVkvNNYQLGu2qngFrtwpeaSnsMDerVG4wKAQWyCnYzxVrlnC4uDrJ
-HXuFEltBWi9Ffbgfsnd3749AT0oBP1NT2tMleguyf5DFgjCR3VRJLdrVaaZ8row/
-LqKcFMqnOwKBgB+OIO99l7E584Y3VG6ZdSneOLtNmRXX2pT7tcZE465ZdHGH7Dd3
-SYHhx9K/+Xn+yDH+pLli/xlarAEldmSP6k2WuTfftlC78AfTOfAId5zN7CDR9791
-Fx67I9X/itq33tS8EIuZl57P6uXm/4GXRloWOa8xpvRkVsBApuYPl8t1AoGATQDS
-y2sllDObBXzlgGbV2WgNIgSZ311toTv3jJiXQsjauW8yJRHln+l4H9mzaWDgkiFc
-ang1kUoDqF5k0eFQPxtQcYdhKwEnWWfwp33RbzfxA32DPnubuzzbZhfrkHaKgnIW
-cyor9uFYlm2l7ODZLfJez2RKyTplXnOSsmQw6akCgYAz3dj9Hskyj+HVJ+ht1OcE
-c7ai/ESkSA7Vajp0tjJp0EKjW/zq8DvUSXOtcdnJgkKycFluLwbmnaN4txBds1C1
-Qr8Rt2sUCCBNZe1L6DHe3XBdbkJe9sgZVNTjtUSQrzy8UhvsCqG4YWeCu07Szcbc
-rdPUV9/uQkdx8VrShxlD8A==
------END PRIVATE KEY-----
diff --git a/vendor/git.apache.org/thrift.git/tutorial/go/src/client.go b/vendor/git.apache.org/thrift.git/tutorial/go/src/client.go
deleted file mode 100644
index 9106ac9..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/go/src/client.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package main
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import (
-	"crypto/tls"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-	"tutorial"
-)
-
-func handleClient(client *tutorial.CalculatorClient) (err error) {
-	client.Ping()
-	fmt.Println("ping()")
-
-	sum, _ := client.Add(1, 1)
-	fmt.Print("1+1=", sum, "\n")
-
-	work := tutorial.NewWork()
-	work.Op = tutorial.Operation_DIVIDE
-	work.Num1 = 1
-	work.Num2 = 0
-	quotient, err := client.Calculate(1, work)
-	if err != nil {
-		switch v := err.(type) {
-		case *tutorial.InvalidOperation:
-			fmt.Println("Invalid operation:", v)
-		default:
-			fmt.Println("Error during operation:", err)
-		}
-		return err
-	} else {
-		fmt.Println("Whoa we can divide by 0 with new value:", quotient)
-	}
-
-	work.Op = tutorial.Operation_SUBTRACT
-	work.Num1 = 15
-	work.Num2 = 10
-	diff, err := client.Calculate(1, work)
-	if err != nil {
-		switch v := err.(type) {
-		case *tutorial.InvalidOperation:
-			fmt.Println("Invalid operation:", v)
-		default:
-			fmt.Println("Error during operation:", err)
-		}
-		return err
-	} else {
-		fmt.Print("15-10=", diff, "\n")
-	}
-
-	log, err := client.GetStruct(1)
-	if err != nil {
-		fmt.Println("Unable to get struct:", err)
-		return err
-	} else {
-		fmt.Println("Check log:", log.Value)
-	}
-	return err
-}
-
-func runClient(transportFactory thrift.TTransportFactory, protocolFactory thrift.TProtocolFactory, addr string, secure bool) error {
-	var transport thrift.TTransport
-	var err error
-	if secure {
-		cfg := new(tls.Config)
-		cfg.InsecureSkipVerify = true
-		transport, err = thrift.NewTSSLSocket(addr, cfg)
-	} else {
-		transport, err = thrift.NewTSocket(addr)
-	}
-	if err != nil {
-		fmt.Println("Error opening socket:", err)
-		return err
-	}
-	transport, err = transportFactory.GetTransport(transport)
-	if err != nil {
-		return err
-	}
-	defer transport.Close()
-	if err := transport.Open(); err != nil {
-		return err
-	}
-	return handleClient(tutorial.NewCalculatorClientFactory(transport, protocolFactory))
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/go/src/handler.go b/vendor/git.apache.org/thrift.git/tutorial/go/src/handler.go
deleted file mode 100644
index 1763832..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/go/src/handler.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package main
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import (
-	"fmt"
-	"shared"
-	"strconv"
-	"tutorial"
-)
-
-type CalculatorHandler struct {
-	log map[int]*shared.SharedStruct
-}
-
-func NewCalculatorHandler() *CalculatorHandler {
-	return &CalculatorHandler{log: make(map[int]*shared.SharedStruct)}
-}
-
-func (p *CalculatorHandler) Ping() (err error) {
-	fmt.Print("ping()\n")
-	return nil
-}
-
-func (p *CalculatorHandler) Add(num1 int32, num2 int32) (retval17 int32, err error) {
-	fmt.Print("add(", num1, ",", num2, ")\n")
-	return num1 + num2, nil
-}
-
-func (p *CalculatorHandler) Calculate(logid int32, w *tutorial.Work) (val int32, err error) {
-	fmt.Print("calculate(", logid, ", {", w.Op, ",", w.Num1, ",", w.Num2, "})\n")
-	switch w.Op {
-	case tutorial.Operation_ADD:
-		val = w.Num1 + w.Num2
-		break
-	case tutorial.Operation_SUBTRACT:
-		val = w.Num1 - w.Num2
-		break
-	case tutorial.Operation_MULTIPLY:
-		val = w.Num1 * w.Num2
-		break
-	case tutorial.Operation_DIVIDE:
-		if w.Num2 == 0 {
-			ouch := tutorial.NewInvalidOperation()
-			ouch.WhatOp = int32(w.Op)
-			ouch.Why = "Cannot divide by 0"
-			err = ouch
-			return
-		}
-		val = w.Num1 / w.Num2
-		break
-	default:
-		ouch := tutorial.NewInvalidOperation()
-		ouch.WhatOp = int32(w.Op)
-		ouch.Why = "Unknown operation"
-		err = ouch
-		return
-	}
-	entry := shared.NewSharedStruct()
-	entry.Key = logid
-	entry.Value = strconv.Itoa(int(val))
-	k := int(logid)
-	/*
-	   oldvalue, exists := p.log[k]
-	   if exists {
-	     fmt.Print("Replacing ", oldvalue, " with ", entry, " for key ", k, "\n")
-	   } else {
-	     fmt.Print("Adding ", entry, " for key ", k, "\n")
-	   }
-	*/
-	p.log[k] = entry
-	return val, err
-}
-
-func (p *CalculatorHandler) GetStruct(key int32) (*shared.SharedStruct, error) {
-	fmt.Print("getStruct(", key, ")\n")
-	v, _ := p.log[int(key)]
-	return v, nil
-}
-
-func (p *CalculatorHandler) Zip() (err error) {
-	fmt.Print("zip()\n")
-	return nil
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/go/src/main.go b/vendor/git.apache.org/thrift.git/tutorial/go/src/main.go
deleted file mode 100644
index 63154e3..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/go/src/main.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package main
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import (
-	"flag"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-	"os"
-)
-
-func Usage() {
-	fmt.Fprint(os.Stderr, "Usage of ", os.Args[0], ":\n")
-	flag.PrintDefaults()
-	fmt.Fprint(os.Stderr, "\n")
-}
-
-func main() {
-	flag.Usage = Usage
-	server := flag.Bool("server", false, "Run server")
-	protocol := flag.String("P", "binary", "Specify the protocol (binary, compact, json, simplejson)")
-	framed := flag.Bool("framed", false, "Use framed transport")
-	buffered := flag.Bool("buffered", false, "Use buffered transport")
-	addr := flag.String("addr", "localhost:9090", "Address to listen to")
-	secure := flag.Bool("secure", false, "Use tls secure transport")
-
-	flag.Parse()
-
-	var protocolFactory thrift.TProtocolFactory
-	switch *protocol {
-	case "compact":
-		protocolFactory = thrift.NewTCompactProtocolFactory()
-	case "simplejson":
-		protocolFactory = thrift.NewTSimpleJSONProtocolFactory()
-	case "json":
-		protocolFactory = thrift.NewTJSONProtocolFactory()
-	case "binary", "":
-		protocolFactory = thrift.NewTBinaryProtocolFactoryDefault()
-	default:
-		fmt.Fprint(os.Stderr, "Invalid protocol specified", protocol, "\n")
-		Usage()
-		os.Exit(1)
-	}
-
-	var transportFactory thrift.TTransportFactory
-	if *buffered {
-		transportFactory = thrift.NewTBufferedTransportFactory(8192)
-	} else {
-		transportFactory = thrift.NewTTransportFactory()
-	}
-
-	if *framed {
-		transportFactory = thrift.NewTFramedTransportFactory(transportFactory)
-	}
-
-	if *server {
-		if err := runServer(transportFactory, protocolFactory, *addr, *secure); err != nil {
-			fmt.Println("error running server:", err)
-		}
-	} else {
-		if err := runClient(transportFactory, protocolFactory, *addr, *secure); err != nil {
-			fmt.Println("error running client:", err)
-		}
-	}
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/go/src/server.go b/vendor/git.apache.org/thrift.git/tutorial/go/src/server.go
deleted file mode 100644
index e4c4b97..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/go/src/server.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package main
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import (
-	"crypto/tls"
-	"fmt"
-	"git.apache.org/thrift.git/lib/go/thrift"
-	"tutorial"
-)
-
-func runServer(transportFactory thrift.TTransportFactory, protocolFactory thrift.TProtocolFactory, addr string, secure bool) error {
-	var transport thrift.TServerTransport
-	var err error
-	if secure {
-		cfg := new(tls.Config)
-		if cert, err := tls.LoadX509KeyPair("server.crt", "server.key"); err == nil {
-			cfg.Certificates = append(cfg.Certificates, cert)
-		} else {
-			return err
-		}
-		transport, err = thrift.NewTSSLServerSocket(addr, cfg)
-	} else {
-		transport, err = thrift.NewTServerSocket(addr)
-	}
-	
-	if err != nil {
-		return err
-	}
-	fmt.Printf("%T\n", transport)
-	handler := NewCalculatorHandler()
-	processor := tutorial.NewCalculatorProcessor(handler)
-	server := thrift.NewTSimpleServer4(processor, transport, transportFactory, protocolFactory)
-
-	fmt.Println("Starting the simple server... on ", addr)
-	return server.Serve()
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/haxe/Makefile.am
deleted file mode 100644
index e9c8820..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-BIN_CPP = bin/Main-debug
-BIN_PHP = bin/php/Main-debug.php
-BIN_PHP_WEB = bin/php-web-server/Main-debug.php
-
-
-gen-haxe/tutorial/calculator.hx gen-haxe/shared/shared_service.hx: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen haxe -r $<
-
-all-local: $(BIN_CPP) $(BIN_PHP) $(BIN_PHP_WEB)
-
-check: gen-haxe/tutorial/calculator.hx
-
-$(BIN_CPP): \
-		src/*.hx \
-		../../lib/haxe/src/org/apache/thrift/**/*.hx \
-		gen-haxe/tutorial/calculator.hx
-	$(HAXE) --cwd .  cpp.hxml
-
-$(BIN_PHP): \
-		src/*.hx \
-		../../lib/haxe/src/org/apache/thrift/**/*.hx \
-		gen-haxe/tutorial/calculator.hx
-	$(HAXE) --cwd .  php.hxml
-
-$(BIN_PHP_WEB): \
-		src/*.hx \
-		../../lib/haxe/src/org/apache/thrift/**/*.hx \
-		gen-haxe/tutorial/calculator.hx
-	$(HAXE) --cwd .  php-web-server.hxml
-
-tutorialserver: all
-	$(BIN_CPP) server
-
-tutorialserver_php: all
-	php -f $(BIN_PHP) server
-
-tutorialclient: all
-	$(BIN_CPP)
-
-tutorialclient_php: all
-	php -f $(BIN_PHP) 
-
-tutorialsecureserver: all
-	$(BIN_CPP) server secure
-
-tutorialsecureserver_php: all
-	php -f $(BIN_PHP) server secure
-
-tutorialsecureclient: all
-	$(BIN_CPP) secure
-
-tutorialsecureclient_php: all
-	php -f $(BIN_PHP) secure
-
-tutorialserver_php_http: all
-	php -S 127.0.0.1:9090 router.php
-
-tutorialclient_http: all
-	$(BIN_CPP) client http
-
-clean-local:
-	$(RM) -r gen-haxe bin
-
-EXTRA_DIST = \
-             src \
-             cpp.hxml \
-             csharp.hxml \
-             flash.hxml \
-             java.hxml \
-             javascript.hxml \
-             neko.hxml \
-             php.hxml \
-             python.hxml \
-             project.hide \
-             Tutorial.hxproj \
-             make_all.bat \
-             make_all.sh
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/Tutorial.hxproj b/vendor/git.apache.org/thrift.git/tutorial/haxe/Tutorial.hxproj
deleted file mode 100644
index 796f648..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/Tutorial.hxproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project version="2">
-  <!-- Output SWF options -->
-  <output>
-    <movie outputType="Application" />
-    <movie input="" />
-    <movie path="bin/HaxeTutorial" />
-    <movie fps="30" />
-    <movie width="800" />
-    <movie height="600" />
-    <movie version="1" />
-    <movie minorVersion="0" />
-    <movie platform="C++" />
-    <movie background="#FFFFFF" />
-  </output>
-  <!-- Other classes to be compiled into your SWF -->
-  <classpaths>
-    <class path="src" />
-    <class path="gen-haxe" />
-    <class path="../../lib/haxe/src" />
-  </classpaths>
-  <!-- Build options -->
-  <build>
-    <option directives="" />
-    <option flashStrict="False" />
-    <option noInlineOnDebug="False" />
-    <option mainClass="Main" />
-    <option enabledebug="False" />
-    <option additional="" />
-  </build>
-  <!-- haxelib libraries -->
-  <haxelib>
-    <!-- example: <library name="..." /> -->
-  </haxelib>
-  <!-- Class files to compile (other referenced classes will automatically be included) -->
-  <compileTargets>
-    <!-- example: <compile path="..." /> -->
-  </compileTargets>
-  <!-- Paths to exclude from the Project Explorer tree -->
-  <hiddenPaths>
-    <hidden path="obj" />
-    <hidden path="cpp.hxml" />
-    <hidden path="csharp.hxml" />
-    <hidden path="flash.hxml" />
-    <hidden path="java.hxml" />
-    <hidden path="javascript.hxml" />
-    <hidden path="make_all.bat" />
-    <hidden path="make_all.sh" />
-    <hidden path="Makefile.am" />
-    <hidden path="neko.hxml" />
-    <hidden path="php.hxml" />
-    <hidden path="project.hide" />
-    <hidden path="python.hxml" />
-  </hiddenPaths>
-  <!-- Executed before build -->
-  <preBuildCommand>thrift -r -gen haxe  ../tutorial.thrift</preBuildCommand>
-  <!-- Executed after build -->
-  <postBuildCommand alwaysRun="False" />
-  <!-- Other project options -->
-  <options>
-    <option showHiddenPaths="False" />
-    <option testMovie="Unknown" />
-    <option testMovieCommand="" />
-  </options>
-  <!-- Plugin storage -->
-  <storage />
-</project>
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/cpp.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/cpp.hxml
deleted file mode 100644
index 6adb52d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/cpp.hxml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#CPP target
--cpp bin
-
-#To produce 64 bit binaries the file should define the HXCPP_M64 compile variable:
-#-D HXCPP_M64
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/csharp.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/csharp.hxml
deleted file mode 100644
index 295c017..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/csharp.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#CSHARP target
--cs bin/Tutorial.exe
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/flash.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/flash.hxml
deleted file mode 100644
index a1f0568..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/flash.hxml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Flash target
--swf bin/Tutorial.swf
-
-#Add debug information
--debug
-
-# we need some goodies from sys.net
-# --macro allowPackage("sys")
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/java.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/java.hxml
deleted file mode 100644
index c615565..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/java.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src 
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Java target
--java bin/Tutorial.jar
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/javascript.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/javascript.hxml
deleted file mode 100644
index b2b3876..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/javascript.hxml
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#JavaScript target
--js bin/Tutorial.js
-
-#You can use -D source-map-content (requires Haxe 3.1+) to have the .hx 
-#files directly embedded into the map file, this way you only have to 
-#upload it, and it will be always in sync with the compiled .js even if 
-#you modify your .hx files.
--D source-map-content
-
-#Generate source map and add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/make_all.bat b/vendor/git.apache.org/thrift.git/tutorial/haxe/make_all.bat
deleted file mode 100644
index 656dd15..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/make_all.bat
+++ /dev/null
@@ -1,68 +0,0 @@
-@echo off
-rem /*
-rem  * Licensed to the Apache Software Foundation (ASF) under one
-rem  * or more contributor license agreements. See the NOTICE file
-rem  * distributed with this work for additional information
-rem  * regarding copyright ownership. The ASF licenses this file
-rem  * to you under the Apache License, Version 2.0 (the
-rem  * "License"); you may not use this file except in compliance
-rem  * with the License. You may obtain a copy of the License at
-rem  *
-rem  *   http://www.apache.org/licenses/LICENSE-2.0
-rem  *
-rem  * Unless required by applicable law or agreed to in writing,
-rem  * software distributed under the License is distributed on an
-rem  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem  * KIND, either express or implied. See the License for the
-rem  * specific language governing permissions and limitations
-rem  * under the License.
-rem  */
-
-setlocal
-if "%HOMEDRIVE%"=="" goto MISSINGVARS
-if "%HOMEPATH%"=="" goto MISSINGVARS
-if "%HAXEPATH%"=="" goto NOTINSTALLED
-
-set path=%HAXEPATH%;%HAXEPATH%\..\neko;%path%
-
-rem # invoke Thrift comnpiler
-thrift -r -gen haxe   ..\tutorial.thrift
-if errorlevel 1 goto STOP
-
-rem # invoke Haxe compiler for all targets
-for %%a in (*.hxml) do (
-	rem * filter Python, as it is not supported by Haxe 3.1.3 (but will be in 3.1.4)
-	if not "%%a"=="python.hxml" (
-		echo --------------------------
-		echo Building %%a ...
-		echo --------------------------
-		haxe  --cwd .  %%a
-	)
-)
-
-
-echo.
-echo done.
-pause
-goto eof
-
-:NOTINSTALLED
-echo FATAL: Either Haxe is not installed, or the HAXEPATH variable is not set.
-pause
-goto eof
-
-:MISSINGVARS
-echo FATAL: Unable to locate home folder.
-echo.
-echo Both HOMEDRIVE and HOMEPATH need to be set to point to your Home folder.
-echo The current values are:
-echo HOMEDRIVE=%HOMEDRIVE%
-echo HOMEPATH=%HOMEPATH%
-pause
-goto eof
-
-:STOP
-pause
-goto eof
-
-:eof
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/make_all.sh b/vendor/git.apache.org/thrift.git/tutorial/haxe/make_all.sh
deleted file mode 100644
index 2ee650d..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/make_all.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# invoke Thrift comnpiler
-thrift -r -gen haxe  ../tutorial.thrift
-
-# output folder
-if [ ! -d bin ]; then
-  mkdir  bin
-fi
-
-# invoke Haxe compoiler
-for target in *.hxml; do 
-  echo --------------------------
-  echo Building ${target} ...
-  echo --------------------------
-  if [ ! -d bin/${target} ]; then
-    mkdir  bin/${target}
-  fi
-  haxe  --cwd .  ${target} 
-done
-
-
-#eof
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/neko.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/neko.hxml
deleted file mode 100644
index 6161f69..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/neko.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#neko target
--neko bin/Tutorial.n
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/php-web-server.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/php-web-server.hxml
deleted file mode 100644
index 395a852..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/php-web-server.hxml
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#PHP target
--php bin/php-web-server/
---php-front Main-debug.php
-
-#defines
--D phpwebserver
-
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/php.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/php.hxml
deleted file mode 100644
index c2f6887..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/php.hxml
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#PHP target
--php bin/php/
---php-front Main-debug.php
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/project.hide b/vendor/git.apache.org/thrift.git/tutorial/haxe/project.hide
deleted file mode 100644
index 8d5d4ec..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/project.hide
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-     "type" : 0
-    ,"target" : 4
-    ,"name" : "Apache Thrift Tutorial"
-    ,"main" : null
-    ,"projectPackage" : ""
-    ,"company" : "Apache Software Foundation (ASF)"
-    ,"license" : "Apache License, Version 2.0"
-    ,"url" : "http://www.apache.org/licenses/LICENSE-2.0"
-    ,"targetData" : [
-         {
-             "pathToHxml" : "flash.hxml"
-            ,"runActionType" : 1
-            ,"runActionText" : "bin/Tutorial.swf"
-        }
-        ,{
-             "pathToHxml" : "javascript.hxml"
-            ,"runActionType" : 1
-            ,"runActionText" : "bin\\index.html"
-        }
-        ,{
-             "pathToHxml" : "neko.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "neko bin/Tutorial.n"
-        }
-        ,{
-             "pathToHxml" : "php.hxml"
-        }
-        ,{
-             "pathToHxml" : "cpp.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "bin/Main-debug.exe"
-        }
-        ,{
-             "pathToHxml" : "java.hxml"
-        }
-        ,{
-             "pathToHxml" : "csharp.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "bin\\Tutorial.exe\\bin\\Main-Debug.exe"
-        }
-        ,{
-             "pathToHxml" : "python.hxml"
-            ,"runActionType" : 2
-            ,"runActionText" : "python bin/Tutorial.py"
-        }
-    ]
-    ,"files" : [
-         {
-             "path" : "src\\org\\apache\\thrift\\server\\TServer.hx"
-            ,"useTabs" : true
-            ,"indentSize" : 4
-            ,"foldedRegions" : [
-
-            ]
-            ,"activeLine" : 76
-        }
-        ,{
-             "path" : "src\\org\\apache\\thrift\\server\\TSimpleServer.hx"
-            ,"useTabs" : true
-            ,"indentSize" : 4
-            ,"foldedRegions" : [
-
-            ]
-            ,"activeLine" : 100
-        }
-        ,{
-             "path" : "src\\shared\\SharedServiceProcessor.hx"
-            ,"useTabs" : true
-            ,"indentSize" : 4
-            ,"foldedRegions" : [
-
-            ]
-            ,"activeLine" : 20
-        }
-        ,{
-             "path" : "src\\tutorial\\CalculatorProcessor.hx"
-            ,"useTabs" : true
-            ,"indentSize" : 4
-            ,"foldedRegions" : [
-
-            ]
-            ,"activeLine" : 79
-        }
-        ,{
-             "path" : "src\\Main.hx"
-            ,"useTabs" : true
-            ,"indentSize" : 4
-            ,"foldedRegions" : [
-
-            ]
-            ,"activeLine" : 0
-        }
-    ]
-    ,"activeFile" : "src\\Main.hx"
-    ,"openFLTarget" : null
-    ,"openFLBuildMode" : "Debug"
-    ,"runActionType" : null
-    ,"runActionText" : null
-    ,"buildActionCommand" : null
-    ,"hiddenItems" : [
-
-    ]
-    ,"showHiddenItems" : false
-}
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/python.hxml b/vendor/git.apache.org/thrift.git/tutorial/haxe/python.hxml
deleted file mode 100644
index f2c19fa..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/python.hxml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- 
-#integrate files to classpath
--cp src
--cp gen-haxe
--cp ../../lib/haxe/src
-
-#this class wil be used as entry point for your app.
--main Main
-
-#Python target
--python bin/Tutorial.py
-
-#Add debug information
--debug
-
-#dead code elimination : remove unused code
-#"-dce no" : do not remove unused code
-#"-dce std" : remove unused code in the std lib (default)
-#"-dce full" : remove all unused code
--dce full
\ No newline at end of file
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/router.php b/vendor/git.apache.org/thrift.git/tutorial/haxe/router.php
deleted file mode 100644
index e34135c..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/router.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * @package thrift
- */
-
-
-
-//router file to run testing web server
-
-//set_time_limit(1);
-
-require_once  dirname(__FILE__) . '/bin/php-web-server/Main-debug.php';
-
-
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/src/CalculatorHandler.hx b/vendor/git.apache.org/thrift.git/tutorial/haxe/src/CalculatorHandler.hx
deleted file mode 100644
index e9752db..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/src/CalculatorHandler.hx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import haxe.ds.IntMap;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-import tutorial.*;
-import shared.*;
-
-
-class CalculatorHandler implements Calculator {
-
-    private var log = new IntMap<SharedStruct>();
-
-    public function new() {
-    }
-
-    public function ping() : Void {
-        trace("ping()");
-    }
-
-
-    public function add( num1 : haxe.Int32, num2 : haxe.Int32) : haxe.Int32 {
-        trace('add( $num1, $num2)');
-        return num1 + num2;
-    }
-
-    public function calculate( logid : haxe.Int32, work : Work) : haxe.Int32  {
-        trace('calculate( $logid, '+work.op+","+work.num1+","+work.num2+")");
-
-        var val : haxe.Int32 = 0;
-        switch (work.op)
-        {
-            case Operation.ADD:
-                val = work.num1 + work.num2;
-
-            case Operation.SUBTRACT:
-                val = work.num1 - work.num2;
-
-            case Operation.MULTIPLY:
-                val = work.num1 * work.num2;
-
-            case Operation.DIVIDE:
-                if (work.num2 == 0)
-                {
-                    var io = new InvalidOperation();
-                    io.whatOp = work.op;
-                    io.why = "Cannot divide by 0";
-                    throw io;
-                }
-                val = Std.int( work.num1 / work.num2);
-
-            default:
-                var io = new InvalidOperation();
-                io.whatOp = work.op;
-                io.why = "Unknown operation";
-                throw io;
-        }
-
-        var entry = new SharedStruct();
-        entry.key = logid;
-        entry.value = '$val';
-        log.set(logid, entry);
-
-        return val;
-    }
-
-    public function getStruct( key : haxe.Int32) : SharedStruct {
-        trace('getStruct($key)');
-        return log.get(key);
-    }
-
-    // oneway method,  no args
-    public function zip() : Void {
-        trace("zip()");
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/haxe/src/Main.hx b/vendor/git.apache.org/thrift.git/tutorial/haxe/src/Main.hx
deleted file mode 100644
index 6bebe71..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/haxe/src/Main.hx
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package;
-
-import org.apache.thrift.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.server.*;
-import org.apache.thrift.meta_data.*;
-
-import tutorial.*;
-import shared.*;
-
-
-enum Prot {
-    binary;
-    json;
-}
-
-enum Trns {
-    socket;
-    http;
-}
-
-class Main {
-
-    private static var server : Bool = false;
-    private static var framed : Bool = false;
-    private static var buffered : Bool = false;
-    private static var prot : Prot = binary;
-    private static var trns : Trns = socket;
-
-    private static var targetHost : String = "localhost";
-    private static var targetPort : Int = 9090;
-
-    static function main() {
-
-        #if ! (flash || js || phpwebserver)
-        try {
-              ParseArgs();
-        } catch (e : String) {
-            trace(e);
-            trace(GetHelp());
-            return;
-        }
-
-        #elseif  phpwebserver
-        //forcing server
-        server = true;
-        trns = http;
-        initPhpWebServer();
-        //check method
-        if(php.Web.getMethod() != 'POST') {
-          Sys.println('http endpoint for thrift test server');
-          return;
-        }
-        #end
-
-        try {
-            if (server)
-                RunServer();
-            else
-                RunClient();
-        } catch (e : String) {
-            trace(e);
-        }
-
-        trace("Completed.");
-    }
-
-    #if phpwebserver
-    private static function initPhpWebServer()
-    {
-        //remap trace to error log
-        haxe.Log.trace = function(v:Dynamic, ?infos:haxe.PosInfos)
-        {
-          // handle trace
-          var newValue : Dynamic;
-          if (infos != null && infos.customParams!=null) {
-            var extra:String = "";
-            for( v in infos.customParams )
-              extra += "," + v;
-            newValue = v + extra;
-          }
-          else {
-            newValue = v;
-          }
-          var msg = infos != null ? infos.fileName + ':' + infos.lineNumber + ': ' : '';
-          Sys.stderr().writeString('${msg}${newValue}\n');
-        }
-    }
-    #end
-
-
-    #if ! (flash || js)
-
-    private static function GetHelp() : String {
-        return Sys.executablePath()+"  modus  trnsOption  transport  protocol\n"
-        +"Options:\n"
-        +"  modus:       client, server   (default: client)\n"
-        +"  trnsOption:  framed, buffered (default: none)\n"
-        +"  transport:   socket, http     (default: socket)\n"
-        +"  protocol:    binary, json     (default: binary)\n"
-        +"\n"
-        +"All arguments are optional.\n";
-    }
-
-
-    private static function ParseArgs() : Void {
-        var step = 0;
-        for (arg in Sys.args()) {
-
-            // server|client
-            switch(step) {
-            case 0:
-                ++step;
-                if ( arg == "client")
-                    server = false;
-                else if ( arg == "server")
-                    server = true;
-                else
-                    throw "First argument must be 'server' or 'client'";
-
-            case 1:
-                if ( arg == "framed") {
-                    framed = true;
-                } else if ( arg == "buffered") {
-                    buffered = true;
-                } else if ( arg == "socket") {
-                    trns = socket;
-                    ++step;
-                } else if ( arg == "http") {
-                    trns = http;
-                    ++step;
-                } else {
-                    throw "Unknown transport "+arg;
-                }
-
-            case 2:
-                if ( arg == "binary") {
-                    prot = binary;
-                    ++step;
-                } else if ( arg == "json") {
-                    prot = json;
-                    ++step;
-                } else {
-                    throw "Unknown protocol "+arg;
-                }
-
-            default:
-                throw "Unexpected argument "+arg;
-            }
-
-            if ( framed && buffered)
-            {
-                trace("WN: framed supersedes buffered");
-            }
-
-        }
-    }
-
-    #end
-
-    private static function ClientSetup() : Calculator {
-         trace("Client configuration:");
-
-        // endpoint transport
-        var transport : TTransport;
-        switch(trns)
-        {
-        case socket:
-             trace('- socket transport $targetHost:$targetPort');
-            transport = new TSocket( targetHost, targetPort);
-        case http:
-            var uri = 'http://${targetHost}:${targetPort}';
-            trace('- HTTP transport $uri');
-            transport = new THttpClient(uri);
-        default:
-            throw "Unhandled transport";
-        }
-
-
-        // optinal layered transport
-        if ( framed) {
-            trace("- framed transport");
-            transport = new TFramedTransport(transport);
-        } else if ( buffered) {
-            trace("- buffered transport");
-            transport = new TBufferedTransport(transport);
-        }
-
-
-        // protocol
-        var protocol : TProtocol;
-        switch(prot)
-        {
-        case binary:
-             trace("- binary protocol");
-             protocol = new TBinaryProtocol( transport);
-        case json:
-             trace("- JSON protocol");
-             protocol = new TJSONProtocol( transport);
-        default:
-            throw "Unhandled protocol";
-        }
-
-
-        // put everything together
-        transport.open();
-        return new CalculatorImpl(protocol,protocol);
-    }
-
-
-    private static function RunClient() : Void {
-        var client = ClientSetup();
-
-        try {
-              client.ping();
-            trace("ping() successful");
-        } catch(error : TException) {
-            trace('ping() failed: $error');
-        } catch(error : Dynamic) {
-            trace('ping() failed: $error');
-        }
-
-        try {
-            var sum = client.add( 1, 1);
-            trace('1+1=$sum');
-        } catch(error : TException) {
-            trace('add() failed: $error');
-        } catch(error : Dynamic) {
-            trace('add() failed: $error');
-        }
-
-
-        var work = new tutorial.Work();
-        work.op = tutorial.Operation.DIVIDE;
-        work.num1 = 1;
-        work.num2 = 0;
-        try {
-            var quotient = client.calculate( 1, work);
-            trace('Whoa we can divide by 0! Result = $quotient');
-        } catch(error : TException) {
-            trace('calculate() failed: $error');
-        } catch(error : Dynamic) {
-            trace('calculate() failed: $error');
-        }
-
-        work.op = tutorial.Operation.SUBTRACT;
-        work.num1 = 15;
-        work.num2 = 10;
-        try {
-            var diff = client.calculate( 1, work);
-            trace('15-10=$diff');
-        } catch(error : TException) {
-            trace('calculate() failed: $error');
-        } catch(error : Dynamic) {
-            trace('calculate() failed: $error');
-        }
-
-
-        try {
-            var log : SharedStruct = client.getStruct( 1);
-            var logval = log.value;
-            trace('Check log: $logval');
-        } catch(error : TException) {
-            trace('getStruct() failed: $error');
-        } catch(error : Dynamic) {
-            trace('getStruct() failed: $error');
-        }
-    }
-
-
-    private static function ServerSetup() : TServer {
-         trace("Server configuration:");
-
-        // endpoint transport
-        var transport : TServerTransport = null;
-        switch(trns)
-        {
-        case socket:
-            #if (flash || js)
-            throw 'current platform does not support socket servers';
-            #else
-             trace('- socket transport port $targetPort');
-            transport = new TServerSocket( targetPort);
-            #end
-        case http:
-            #if !phpwebserver
-              throw "HTTP server not implemented yet";
-              //trace("- http transport");
-              //transport = new THttpClient( targetHost);
-            #else
-              trace("- http transport");
-              transport = new TWrappingServerTransport(
-                      new TStreamTransport(
-                        new TFileStream("php://input", Read),
-                        new TFileStream("php://output", Append)
-                        )
-                      );
-
-            #end
-        default:
-            throw "Unhandled transport";
-        }
-
-        // optional: layered transport
-        var transfactory : TTransportFactory = null;
-        if ( framed) {
-            trace("- framed transport");
-            transfactory = new TFramedTransportFactory();
-        } else if ( buffered) {
-            trace("- buffered transport");
-            transfactory = new TBufferedTransportFactory();
-        }
-
-        // protocol
-        var protfactory : TProtocolFactory = null;
-        switch(prot)
-        {
-        case binary:
-             trace("- binary protocol");
-             protfactory = new TBinaryProtocolFactory();
-        case json:
-            trace("- JSON protocol");
-             protfactory = new TJSONProtocolFactory();
-        default:
-            throw "Unhandled protocol";
-        }
-
-        var handler = new CalculatorHandler();
-        var processor = new CalculatorProcessor(handler);
-        var server = new TSimpleServer( processor, transport, transfactory, protfactory);
-        #if phpwebserver
-        server.runOnce = true;
-        #end
-
-        return server;
-    }
-
-
-    private static function RunServer() : Void {
-        try
-        {
-            var server = ServerSetup();
-
-            trace("\nStarting the server...");
-            server.Serve();
-        }
-        catch( e : Dynamic)
-        {
-            trace('RunServer() failed: $e');
-        }
-        trace("done.");
-    }
-
-}
-
diff --git a/vendor/git.apache.org/thrift.git/tutorial/hs/HaskellClient.hs b/vendor/git.apache.org/thrift.git/tutorial/hs/HaskellClient.hs
deleted file mode 100644
index bd29df0..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/hs/HaskellClient.hs
+++ /dev/null
@@ -1,76 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-import qualified Calculator
-import qualified Calculator_Client as Client
-import qualified SharedService_Client as SClient
-import Tutorial_Types
-import SharedService_Iface
-import Shared_Types
-
-import Thrift
-import Thrift.Protocol.Binary
-import Thrift.Transport
-import Thrift.Transport.Handle
-import Thrift.Server
-
-import Control.Exception
-import Data.Maybe
-import Data.Text.Lazy
-import Text.Printf
-import Network
-
-main = do
-  transport  <- hOpen ("localhost", PortNumber 9090)
-  let binProto = BinaryProtocol transport
-  let client = (binProto, binProto)
-
-  Client.ping client
-  print "ping()"
-
-  sum <- Client.add client 1 1
-  printf "1+1=%d\n" sum
-
-
-  let work = Work { work_op = DIVIDE,
-                    work_num1 = 1,
-                    work_num2 = 0,
-                    work_comment = Nothing
-                  }
-
-  Control.Exception.catch (printf "1/0=%d\n" =<< Client.calculate client 1 work)
-        (\e -> printf "InvalidOperation %s\n" (show (e :: InvalidOperation)))
-
-
-  let work = Work { work_op = SUBTRACT,
-                    work_num1 = 15,
-                    work_num2 = 10,
-                    work_comment = Nothing
-                  }
-
-  diff <- Client.calculate client 1 work
-  printf "15-10=%d\n" diff
-
-  log <- SClient.getStruct client 1
-  printf "Check log: %s\n" $ unpack $ sharedStruct_value log
-
-  -- Close!
-  tClose transport
-
-
diff --git a/vendor/git.apache.org/thrift.git/tutorial/hs/HaskellServer.hs b/vendor/git.apache.org/thrift.git/tutorial/hs/HaskellServer.hs
deleted file mode 100644
index cfe1344..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/hs/HaskellServer.hs
+++ /dev/null
@@ -1,103 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-{-# LANGUAGE OverloadedStrings #-}
-
-import qualified Calculator
-import Calculator_Iface
-import Tutorial_Types
-import SharedService_Iface
-import Shared_Types
-
-import Thrift
-import Thrift.Protocol.Binary
-import Thrift.Transport
-import Thrift.Server
-
-import Data.Int
-import Data.String
-import Data.Maybe
-import Text.Printf
-import Control.Exception (throw)
-import Control.Concurrent.MVar
-import qualified Data.Map as M
-import Data.Map ((!))
-import Data.Monoid
-
-data CalculatorHandler = CalculatorHandler {mathLog :: MVar (M.Map Int32 SharedStruct)}
-
-newCalculatorHandler = do
-  log <- newMVar mempty
-  return $ CalculatorHandler log
-
-instance SharedService_Iface CalculatorHandler where
-  getStruct self k = do
-    myLog <- readMVar (mathLog self)
-    return $ (myLog ! k)
-
-
-instance Calculator_Iface CalculatorHandler where
-  ping _ =
-    print "ping()"
-
-  add _ n1 n2 = do
-    printf "add(%d,%d)\n" n1 n2
-    return (n1 + n2)
-
-  calculate self mlogid mwork = do
-    printf "calculate(%d, %s)\n" logid (show work)
-
-    let val = case op work of
-                ADD ->
-                    num1 work + num2 work
-                SUBTRACT ->
-                    num1 work - num2 work
-                MULTIPLY ->
-                    num1 work * num2 work
-                DIVIDE ->
-                    if num2 work == 0 then
-                        throw $
-                              InvalidOperation {
-                                 invalidOperation_whatOp = fromIntegral $ fromEnum $ op work,
-                                 invalidOperation_why = "Cannot divide by 0"
-                                            }
-                    else
-                        num1 work `div` num2 work
-
-    let logEntry = SharedStruct logid (fromString $ show $ val)
-    modifyMVar_ (mathLog self) $ return .(M.insert logid logEntry)
-
-    return $! val
-
-   where
-     -- stupid dynamic languages f'ing it up
-     num1 = work_num1
-     num2 = work_num2
-     op = work_op
-     logid = mlogid
-     work = mwork
-
-  zip _ =
-    print "zip()"
-
-main =  do
-  handler <- newCalculatorHandler
-  print "Starting the server..."
-  runBasicServer handler Calculator.process 9090
-  print "done."
diff --git a/vendor/git.apache.org/thrift.git/tutorial/hs/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/hs/Makefile.am
deleted file mode 100755
index f274eb6..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/hs/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-all-local:
-	$(top_builddir)/compiler/cpp/thrift --gen hs -r $(top_srcdir)/tutorial/tutorial.thrift
-	$(CABAL) install
-
-install-exec-hook:
-	$(CABAL) install
-
-# Make sure this doesn't fail if Haskell is not configured.
-clean-local:
-	$(CABAL) clean
-	$(RM) -r gen-*
-
-check-local:
-	$(CABAL) check
-
-tutorialserver: all
-	dist/build/HaskellServer/HaskellServer
-
-tutorialclient: all
-	dist/build/HaskellClient/HaskellClient
diff --git a/vendor/git.apache.org/thrift.git/tutorial/hs/Setup.lhs b/vendor/git.apache.org/thrift.git/tutorial/hs/Setup.lhs
deleted file mode 100644
index c7df182..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/hs/Setup.lhs
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env runhaskell
-
-> -- Licensed to the Apache Software Foundation (ASF) under one
-> -- or more contributor license agreements. See the NOTICE file
-> -- distributed with this work for additional information
-> -- regarding copyright ownership. The ASF licenses this file
-> -- to you under the Apache License, Version 2.0 (the
-> -- "License"); you may not use this file except in compliance
-> -- with the License. You may obtain a copy of the License at
-> --
-> --   http://www.apache.org/licenses/LICENSE-2.0
-> --
-> -- Unless required by applicable law or agreed to in writing,
-> -- software distributed under the License is distributed on an
-> -- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-> -- KIND, either express or implied. See the License for the
-> -- specific language governing permissions and limitations
-> -- under the License.
-
-> import Distribution.Simple
-> main = defaultMain
diff --git a/vendor/git.apache.org/thrift.git/tutorial/hs/ThriftTutorial.cabal b/vendor/git.apache.org/thrift.git/tutorial/hs/ThriftTutorial.cabal
deleted file mode 100755
index d342ad5..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/hs/ThriftTutorial.cabal
+++ /dev/null
@@ -1,73 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-Name:           ThriftTutorial
-Version:        0.10.0
-Cabal-Version:  >= 1.4
-License:        OtherLicense
-Category:       Foreign
-Build-Type:     Simple
-Synopsis:       Thrift Tutorial library package
-Homepage:       http://thrift.apache.org
-Bug-Reports:    https://issues.apache.org/jira/browse/THRIFT
-Maintainer:     dev@thrift.apache.org
-License-File:   ../../LICENSE
-
-Description:
-  Haskell tutorial for the Apache Thrift RPC system. Requires the use of the thrift code generator.
-
-flag network-uri
-   description: Get Network.URI from the network-uri package
-   default: True
-
-Executable HaskellServer
-  Main-is: HaskellServer.hs
-  Hs-Source-Dirs:
-    ., gen-hs/
-  Build-Depends:
-    base >= 4, base < 5, ghc-prim, containers, thrift, vector, unordered-containers, text, hashable, bytestring, QuickCheck
-  Extensions:
-    DeriveDataTypeable,
-    ExistentialQuantification,
-    FlexibleInstances,
-    KindSignatures,
-    MagicHash,
-    RankNTypes,
-    ScopedTypeVariables,
-    TypeSynonymInstances
-
-Executable HaskellClient
-  Main-is: HaskellClient.hs
-  Hs-Source-Dirs:
-    ., gen-hs/
-  Build-Depends:
-    base >= 4, base < 5, ghc-prim, containers, thrift, vector, QuickCheck
-  if flag(network-uri)
-     build-depends: network-uri >= 2.6, network >= 2.6
-  else
-     build-depends: network < 2.6
-  Extensions:
-    DeriveDataTypeable,
-    ExistentialQuantification,
-    FlexibleInstances,
-    KindSignatures,
-    MagicHash,
-    RankNTypes,
-    ScopedTypeVariables,
-    TypeSynonymInstances
diff --git a/vendor/git.apache.org/thrift.git/tutorial/java/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/java/Makefile.am
deleted file mode 100755
index 95908b1..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/java/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-export CLASSPATH
-
-# Make sure this doesn't fail if ant is not configured.
-clean-local:
-	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT $(ANT_FLAGS) clean
-
-all-local:
-	$(ANT) $(ANT_FLAGS) compile
-
-check-local: all
-	$(ANT) $(ANT_FLAGS) test
-
-tutorial: all
-	$(ANT) $(ANT_FLAGS) tutorial
-
-tutorialserver: all
-	$(ANT) $(ANT_FLAGS) tutorialserver
-
-tutorialclient: all
-	$(ANT) $(ANT_FLAGS) tutorialclient
-
-EXTRA_DIST = \
-	build.xml \
-	src \
-	README.md
diff --git a/vendor/git.apache.org/thrift.git/tutorial/java/README.md b/vendor/git.apache.org/thrift.git/tutorial/java/README.md
deleted file mode 100644
index f109fea..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/java/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Thrift Java Tutorial
-==================================================
-1) Compile the Java library
-
-    thrift/lib/java$ make
-or:
-
-    thrift/lib/java$ ant
-
-4) Run the tutorial:
-
-start server and client with one step:
-
-    thrift/tutorial/java$ make tutorial
-
-or:
-
-    thrift/tutorial/java$ make tutorialserver
-    thrift/tutorial/java$ make tutorialclient
-
-or:
-
-    thrift/tutorial/java$ ant tutorialserver
-    thrift/tutorial/java$ ant tutorialclient
diff --git a/vendor/git.apache.org/thrift.git/tutorial/java/build.xml b/vendor/git.apache.org/thrift.git/tutorial/java/build.xml
deleted file mode 100644
index 7638d5b..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/java/build.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project name="tutorial" default="tutorial" basedir=".">
-
-  <description>Thrift Java Tutorial</description>
-
-  <property name="src" location="src" />
-  <property name="gen" location="gen-java" />
-  <property name="build" location="build" />
-
-  <path id="libs.classpath">
-    <fileset dir="../../lib/java/build">
-      <include name="*.jar" />
-      <exclude name="-test.jar" />
-    </fileset>
-    <fileset dir="../../lib/java/build/lib">
-      <include name="*.jar" />
-    </fileset>
-  </path>
-  <path id="build.classpath">
-    <path refid="libs.classpath" />
-    <pathelement path="${gen}" />
-  </path>
-  <path id="tutorial.classpath">
-    <path refid="build.classpath" />
-    <pathelement path="${build}" />
-    <pathelement path="tutorial.jar" />
-  </path>
-  
-  <target name="init">
-    <tstamp />
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build}/log"/>
-  </target>
-
-  <target name="compile" depends="init, generate">
-    <javac includeantruntime="false" srcdir="${gen}" destdir="${build}" classpathref="libs.classpath" />
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="build.classpath" />
-  </target>
-
-  <target name="test" depends="tutorial" />
-
-  <target name="tutorial" description="Run the tutorial" depends="compile">
-    <jar jarfile="tutorial.jar" basedir="${build}"/>
-    <parallel>
-      <java classname="JavaServer" fork="true" timeout="10000"
-        classpathref="tutorial.classpath" failonerror="false" output="${build}/log/tutorial.log">
-      </java>
-      <sequential>
-        <sleep seconds="2"/>
-        <echo>tutorial client simple:</echo>
-        <java classname="JavaClient"
-          classpathref="tutorial.classpath" failonerror="true">
-          <arg line="simple"/>
-        </java>
-        <echo>tutorial client secure:</echo>
-        <java classname="JavaClient"
-          classpathref="tutorial.classpath" failonerror="true">
-          <arg line="secure"/>
-        </java>
-      </sequential>
-    </parallel>
-  </target>
-
-  <target name="generate">
-    <!-- Generate the thrift gen-java source -->
-    <exec executable="../../compiler/cpp/thrift" failonerror="true">
-      <arg line="--gen java -r  ../tutorial.thrift"/>
-    </exec>
-  </target>
-
-  <target name="tutorialclient" description="Run a tutorial client" depends="compile">
-    <echo>tutorial client simple:</echo>
-    <java classname="JavaClient"
-      classpathref="tutorial.classpath" failonerror="true">
-      <arg line="simple"/>
-    </java>
-    <echo>tutorial client secure:</echo>
-    <java classname="JavaClient"
-      classpathref="tutorial.classpath" failonerror="true">
-      <arg line="secure"/>
-    </java>
-  </target>
-
-  <target name="tutorialserver" description="Run a tutorial server" depends="compile">
-      <java classname="JavaServer" fork="true"
-        classpathref="tutorial.classpath" failonerror="false" output="${build}/log/tutorial.log">
-      </java>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build}" />
-    <delete dir="${gen}"/>
-    <delete file="tutorial.jar" />
-  </target>
-
-</project>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/java/src/CalculatorHandler.java b/vendor/git.apache.org/thrift.git/tutorial/java/src/CalculatorHandler.java
deleted file mode 100644
index 92944b0..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/java/src/CalculatorHandler.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.thrift.TException;
-
-// Generated code
-import tutorial.*;
-import shared.*;
-
-import java.util.HashMap;
-
-public class CalculatorHandler implements Calculator.Iface {
-
-  private HashMap<Integer,SharedStruct> log;
-
-  public CalculatorHandler() {
-    log = new HashMap<Integer, SharedStruct>();
-  }
-
-  public void ping() {
-    System.out.println("ping()");
-  }
-
-  public int add(int n1, int n2) {
-    System.out.println("add(" + n1 + "," + n2 + ")");
-    return n1 + n2;
-  }
-
-  public int calculate(int logid, Work work) throws InvalidOperation {
-    System.out.println("calculate(" + logid + ", {" + work.op + "," + work.num1 + "," + work.num2 + "})");
-    int val = 0;
-    switch (work.op) {
-    case ADD:
-      val = work.num1 + work.num2;
-      break;
-    case SUBTRACT:
-      val = work.num1 - work.num2;
-      break;
-    case MULTIPLY:
-      val = work.num1 * work.num2;
-      break;
-    case DIVIDE:
-      if (work.num2 == 0) {
-        InvalidOperation io = new InvalidOperation();
-        io.whatOp = work.op.getValue();
-        io.why = "Cannot divide by 0";
-        throw io;
-      }
-      val = work.num1 / work.num2;
-      break;
-    default:
-      InvalidOperation io = new InvalidOperation();
-      io.whatOp = work.op.getValue();
-      io.why = "Unknown operation";
-      throw io;
-    }
-
-    SharedStruct entry = new SharedStruct();
-    entry.key = logid;
-    entry.value = Integer.toString(val);
-    log.put(logid, entry);
-
-    return val;
-  }
-
-  public SharedStruct getStruct(int key) {
-    System.out.println("getStruct(" + key + ")");
-    return log.get(key);
-  }
-
-  public void zip() {
-    System.out.println("zip()");
-  }
-
-}
-
diff --git a/vendor/git.apache.org/thrift.git/tutorial/java/src/JavaClient.java b/vendor/git.apache.org/thrift.git/tutorial/java/src/JavaClient.java
deleted file mode 100644
index 2e35d41..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/java/src/JavaClient.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Generated code
-import tutorial.*;
-import shared.*;
-
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TSSLTransportFactory;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TSSLTransportFactory.TSSLTransportParameters;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TProtocol;
-
-public class JavaClient {
-  public static void main(String [] args) {
-
-    if (args.length != 1) {
-      System.out.println("Please enter 'simple' or 'secure'");
-      System.exit(0);
-    }
-
-    try {
-      TTransport transport;
-      if (args[0].contains("simple")) {
-        transport = new TSocket("localhost", 9090);
-        transport.open();
-      }
-      else {
-        /*
-         * Similar to the server, you can use the parameters to setup client parameters or
-         * use the default settings. On the client side, you will need a TrustStore which
-         * contains the trusted certificate along with the public key. 
-         * For this example it's a self-signed cert. 
-         */
-        TSSLTransportParameters params = new TSSLTransportParameters();
-        params.setTrustStore("../../lib/java/test/.truststore", "thrift", "SunX509", "JKS");
-        /*
-         * Get a client transport instead of a server transport. The connection is opened on
-         * invocation of the factory method, no need to specifically call open()
-         */
-        transport = TSSLTransportFactory.getClientSocket("localhost", 9091, 0, params);
-      }
-
-      TProtocol protocol = new  TBinaryProtocol(transport);
-      Calculator.Client client = new Calculator.Client(protocol);
-
-      perform(client);
-
-      transport.close();
-    } catch (TException x) {
-      x.printStackTrace();
-    } 
-  }
-
-  private static void perform(Calculator.Client client) throws TException
-  {
-    client.ping();
-    System.out.println("ping()");
-
-    int sum = client.add(1,1);
-    System.out.println("1+1=" + sum);
-
-    Work work = new Work();
-
-    work.op = Operation.DIVIDE;
-    work.num1 = 1;
-    work.num2 = 0;
-    try {
-      int quotient = client.calculate(1, work);
-      System.out.println("Whoa we can divide by 0");
-    } catch (InvalidOperation io) {
-      System.out.println("Invalid operation: " + io.why);
-    }
-
-    work.op = Operation.SUBTRACT;
-    work.num1 = 15;
-    work.num2 = 10;
-    try {
-      int diff = client.calculate(1, work);
-      System.out.println("15-10=" + diff);
-    } catch (InvalidOperation io) {
-      System.out.println("Invalid operation: " + io.why);
-    }
-
-    SharedStruct log = client.getStruct(1);
-    System.out.println("Check log: " + log.value);
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/java/src/JavaServer.java b/vendor/git.apache.org/thrift.git/tutorial/java/src/JavaServer.java
deleted file mode 100644
index 788473a..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/java/src/JavaServer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.thrift.server.TServer;
-import org.apache.thrift.server.TServer.Args;
-import org.apache.thrift.server.TSimpleServer;
-import org.apache.thrift.server.TThreadPoolServer;
-import org.apache.thrift.transport.TSSLTransportFactory;
-import org.apache.thrift.transport.TServerSocket;
-import org.apache.thrift.transport.TServerTransport;
-import org.apache.thrift.transport.TSSLTransportFactory.TSSLTransportParameters;
-
-// Generated code
-import tutorial.*;
-import shared.*;
-
-import java.util.HashMap;
-
-public class JavaServer {
-
-  public static CalculatorHandler handler;
-
-  public static Calculator.Processor processor;
-
-  public static void main(String [] args) {
-    try {
-      handler = new CalculatorHandler();
-      processor = new Calculator.Processor(handler);
-
-      Runnable simple = new Runnable() {
-        public void run() {
-          simple(processor);
-        }
-      };      
-      Runnable secure = new Runnable() {
-        public void run() {
-          secure(processor);
-        }
-      };
-
-      new Thread(simple).start();
-      new Thread(secure).start();
-    } catch (Exception x) {
-      x.printStackTrace();
-    }
-  }
-
-  public static void simple(Calculator.Processor processor) {
-    try {
-      TServerTransport serverTransport = new TServerSocket(9090);
-      TServer server = new TSimpleServer(new Args(serverTransport).processor(processor));
-
-      // Use this for a multithreaded server
-      // TServer server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(processor));
-
-      System.out.println("Starting the simple server...");
-      server.serve();
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  public static void secure(Calculator.Processor processor) {
-    try {
-      /*
-       * Use TSSLTransportParameters to setup the required SSL parameters. In this example
-       * we are setting the keystore and the keystore password. Other things like algorithms,
-       * cipher suites, client auth etc can be set. 
-       */
-      TSSLTransportParameters params = new TSSLTransportParameters();
-      // The Keystore contains the private key
-      params.setKeyStore("../../lib/java/test/.keystore", "thrift", null, null);
-
-      /*
-       * Use any of the TSSLTransportFactory to get a server transport with the appropriate
-       * SSL configuration. You can use the default settings if properties are set in the command line.
-       * Ex: -Djavax.net.ssl.keyStore=.keystore and -Djavax.net.ssl.keyStorePassword=thrift
-       * 
-       * Note: You need not explicitly call open(). The underlying server socket is bound on return
-       * from the factory class. 
-       */
-      TServerTransport serverTransport = TSSLTransportFactory.getServerSocket(9091, 0, null, params);
-      TServer server = new TSimpleServer(new Args(serverTransport).processor(processor));
-
-      // Use this for a multi threaded server
-      // TServer server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(processor));
-
-      System.out.println("Starting the secure server...");
-      server.serve();
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/js/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/js/Makefile.am
deleted file mode 100755
index 3fe0888..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/js/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-export CLASSPATH
-
-# Make sure this doesn't fail if ant is not configured.
-clean-local:
-	ANT=$(ANT) ; if test -z "$$ANT" ; then ANT=: ; fi ; \
-	$$ANT $(ANT_FLAGS) clean
-
-all-local:
-	$(ANT) $(ANT_FLAGS) compile
-
-check-local: all
-	$(ANT) $(ANT_FLAGS) test
-
-tutorialserver: all
-	$(ANT) $(ANT_FLAGS) tutorialserver
-
-EXTRA_DIST = \
-	build.xml \
-	src \
-	tutorial.html
diff --git a/vendor/git.apache.org/thrift.git/tutorial/js/build.xml b/vendor/git.apache.org/thrift.git/tutorial/js/build.xml
deleted file mode 100644
index a9a9ad4..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/js/build.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project name="tutorial" default="test" basedir=".">
-
-  <description>Thrift JavaScript Tutorial</description>
-
-  <property name="src" location="src" />
-  <property name="javasrc" location="../java/src" />
-  <property name="gen" location="../java/gen-java" />
-  <property name="build" location="build" />
-
-  <!-- the root directory, where you unpack thrift distibution (e.g. thrift-0.x.x.tar.gz) -->
-  <property name="thrift.dir" location="../../" />
-  <!-- JavaScript tutorial depends on the java tutorial thrift handler and server infrastructure -->
-  <property name="thrift.java.dir" location="${thrift.dir}/lib/java" />
-
-  <path id="libs.classpath">
-    <fileset dir="../../lib/java/build">
-      <include name="*.jar" />
-      <exclude name="-test.jar" />
-    </fileset>
-    <fileset dir="../../lib/java/build/lib">
-      <include name="*.jar" />
-    </fileset>
-  </path>
-  <path id="build.classpath">
-    <path refid="libs.classpath" />
-    <pathelement path="${gen}" />
-    <pathelement path="${build}" />
-  </path>
-
-  <target name="init">
-    <tstamp />
-    <mkdir dir="${build}"/>
-  </target>
-
-  <target name="compile" depends="init">
-    <javac includeantruntime="false" srcdir="${gen}" destdir="${build}" classpathref="libs.classpath" />
-    <javac includeantruntime="false" srcdir="${javasrc}" destdir="${build}" classpathref="build.classpath">
-      <exclude name="JavaClient.java"/>
-      <exclude name="JavaServer.java"/>
-      <include name="CalculatorHandler.java"/>
-    </javac>
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="build.classpath">
-      <compilerarg value="-Xlint:all"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="tutorial" />
-
-  <target name="tutorial" depends="compile">
-    <jar jarfile="tutorial-js.jar" basedir="${build}"/>
-  </target>
-
-  <target name="tutorialserver" description="run the test server" depends="tutorial, generate">
-    <java classname="Httpd" fork="true"
-      classpathref="build.classpath" failonerror="true">
-      <arg value="../../" />
-    </java>
-  </target>
-
-  <target name="generate">
-    <exec executable="../../compiler/cpp/thrift" failonerror="true">
-      <arg line="--gen js -r  ../tutorial.thrift"/>
-    </exec>
-  </target>
-  
-  <target name="clean">
-    <delete dir="${build}" />
-    <delete dir="gen-js"/>
-    <delete file="tutorial-js.jar" />
-  </target>
-
-</project>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/js/src/Httpd.java b/vendor/git.apache.org/thrift.git/tutorial/js/src/Httpd.java
deleted file mode 100644
index 4985471..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/js/src/Httpd.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.URLDecoder;
-import java.util.Locale;
-
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpServerConnection;
-import org.apache.http.HttpStatus;
-import org.apache.http.MethodNotSupportedException;
-import org.apache.http.entity.ContentProducer;
-import org.apache.http.entity.EntityTemplate;
-import org.apache.http.entity.FileEntity;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.DefaultHttpServerConnection;
-import org.apache.http.impl.NoConnectionReuseStrategy;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.BasicHttpProcessor;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.HttpRequestHandlerRegistry;
-import org.apache.http.protocol.HttpService;
-import org.apache.http.util.EntityUtils;
-import org.apache.thrift.TProcessor;
-import org.apache.thrift.protocol.TJSONProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TMemoryBuffer;
-
-// Generated code
-import tutorial.*;
-import shared.*;
-
-import java.util.HashMap;
-
-/**
- * Basic, yet fully functional and spec compliant, HTTP/1.1 file server.
- * <p>
- * Please note the purpose of this application is demonstrate the usage of
- * HttpCore APIs. It is NOT intended to demonstrate the most efficient way of
- * building an HTTP file server.
- * 
- * 
- */
-public class Httpd {
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 1) {
-            System.err.println("Please specify document root directory");
-            System.exit(1);
-        }
-        Thread t = new RequestListenerThread(8088, args[0]);
-        t.setDaemon(false);
-        t.start();
-    }
-
-    static class HttpFileHandler implements HttpRequestHandler {
-
-        private final String docRoot;
-
-        public HttpFileHandler(final String docRoot) {
-            super();
-            this.docRoot = docRoot;
-        }
-
-        public void handle(final HttpRequest request, final HttpResponse response, final HttpContext context) throws HttpException, IOException {
-
-            String method = request.getRequestLine().getMethod().toUpperCase(Locale.ENGLISH);
-            if (!method.equals("GET") && !method.equals("HEAD") && !method.equals("POST")) {
-                throw new MethodNotSupportedException(method + " method not supported");
-            }
-            String target = request.getRequestLine().getUri();
-
-            if (request instanceof HttpEntityEnclosingRequest && target.equals("/thrift/service/tutorial/")) {
-                HttpEntity entity = ((HttpEntityEnclosingRequest) request).getEntity();
-                byte[] entityContent = EntityUtils.toByteArray(entity);
-                System.out.println("Incoming content: " + new String(entityContent));
-                
-                final String output = this.thriftRequest(entityContent);
-                
-                System.out.println("Outgoing content: "+output);
-                
-                EntityTemplate body = new EntityTemplate(new ContentProducer() {
-
-                    public void writeTo(final OutputStream outstream) throws IOException {
-                        OutputStreamWriter writer = new OutputStreamWriter(outstream, "UTF-8");
-                        writer.write(output);
-                        writer.flush();
-                    }
-
-                });
-                body.setContentType("text/html; charset=UTF-8");
-                response.setEntity(body);
-            } else {
-                final File file = new File(this.docRoot, URLDecoder.decode(target, "UTF-8"));
-                if (!file.exists()) {
-
-                    response.setStatusCode(HttpStatus.SC_NOT_FOUND);
-                    EntityTemplate body = new EntityTemplate(new ContentProducer() {
-
-                        public void writeTo(final OutputStream outstream) throws IOException {
-                            OutputStreamWriter writer = new OutputStreamWriter(outstream, "UTF-8");
-                            writer.write("<html><body><h1>");
-                            writer.write("File ");
-                            writer.write(file.getPath());
-                            writer.write(" not found");
-                            writer.write("</h1></body></html>");
-                            writer.flush();
-                        }
-
-                    });
-                    body.setContentType("text/html; charset=UTF-8");
-                    response.setEntity(body);
-                    System.out.println("File " + file.getPath() + " not found");
-
-                } else if (!file.canRead() || file.isDirectory()) {
-
-                    response.setStatusCode(HttpStatus.SC_FORBIDDEN);
-                    EntityTemplate body = new EntityTemplate(new ContentProducer() {
-
-                        public void writeTo(final OutputStream outstream) throws IOException {
-                            OutputStreamWriter writer = new OutputStreamWriter(outstream, "UTF-8");
-                            writer.write("<html><body><h1>");
-                            writer.write("Access denied");
-                            writer.write("</h1></body></html>");
-                            writer.flush();
-                        }
-
-                    });
-                    body.setContentType("text/html; charset=UTF-8");
-                    response.setEntity(body);
-                    System.out.println("Cannot read file " + file.getPath());
-
-                } else {
-
-                    response.setStatusCode(HttpStatus.SC_OK);
-                    FileEntity body = new FileEntity(file, "text/html");
-                    response.setEntity(body);
-                    System.out.println("Serving file " + file.getPath());
-
-                }
-            }
-        }
-        
-        private String thriftRequest(byte[] input){
-            try{
-            
-                //Input
-                TMemoryBuffer inbuffer = new TMemoryBuffer(input.length);           
-                inbuffer.write(input);              
-                TProtocol  inprotocol   = new TJSONProtocol(inbuffer);                   
-                
-                //Output
-                TMemoryBuffer outbuffer = new TMemoryBuffer(100);           
-                TProtocol outprotocol   = new TJSONProtocol(outbuffer);
-                
-                TProcessor processor = new Calculator.Processor(new CalculatorHandler());      
-                processor.process(inprotocol, outprotocol);
-                
-                byte[] output = new byte[outbuffer.length()];
-                outbuffer.readAll(output, 0, output.length);
-            
-                return new String(output,"UTF-8");
-            }catch(Throwable t){
-                return "Error:"+t.getMessage();
-            }
-             
-                     
-        }
-        
-    }
-
-    static class RequestListenerThread extends Thread {
-
-        private final ServerSocket serversocket;
-        private final HttpParams params;
-        private final HttpService httpService;
-
-        public RequestListenerThread(int port, final String docroot) throws IOException {
-            this.serversocket = new ServerSocket(port);
-            this.params = new BasicHttpParams();
-            this.params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 1000).setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
-                    .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false).setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
-                    .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "HttpComponents/1.1");
-
-            // Set up the HTTP protocol processor
-            HttpProcessor httpproc = new BasicHttpProcessor();
-
-            // Set up request handlers
-            HttpRequestHandlerRegistry reqistry = new HttpRequestHandlerRegistry();
-            reqistry.register("*", new HttpFileHandler(docroot));
-
-            // Set up the HTTP service
-            this.httpService = new HttpService(httpproc, new NoConnectionReuseStrategy(), new DefaultHttpResponseFactory());
-            this.httpService.setParams(this.params);
-            this.httpService.setHandlerResolver(reqistry);
-        }
-
-        public void run() {
-            System.out.println("Listening on port " + this.serversocket.getLocalPort());
-            System.out.println("Point your browser to http://localhost:8088/tutorial/js/tutorial.html");
-            
-            while (!Thread.interrupted()) {
-                try {
-                    // Set up HTTP connection
-                    Socket socket = this.serversocket.accept();
-                    DefaultHttpServerConnection conn = new DefaultHttpServerConnection();
-                    System.out.println("Incoming connection from " + socket.getInetAddress());
-                    conn.bind(socket, this.params);
-
-                    // Start worker thread
-                    Thread t = new WorkerThread(this.httpService, conn);
-                    t.setDaemon(true);
-                    t.start();
-                } catch (InterruptedIOException ex) {
-                    break;
-                } catch (IOException e) {
-                    System.err.println("I/O error initialising connection thread: " + e.getMessage());
-                    break;
-                }
-            }
-        }
-    }
-
-    static class WorkerThread extends Thread {
-
-        private final HttpService httpservice;
-        private final HttpServerConnection conn;
-
-        public WorkerThread(final HttpService httpservice, final HttpServerConnection conn) {
-            super();
-            this.httpservice = httpservice;
-            this.conn = conn;
-        }
-
-        public void run() {
-            System.out.println("New connection thread");
-            HttpContext context = new BasicHttpContext(null);
-            try {
-                while (!Thread.interrupted() && this.conn.isOpen()) {
-                    this.httpservice.handleRequest(this.conn, context);
-                }
-            } catch (ConnectionClosedException ex) {
-                System.err.println("Client closed connection");
-            } catch (IOException ex) {
-                System.err.println("I/O error: " + ex.getMessage());
-            } catch (HttpException ex) {
-                System.err.println("Unrecoverable HTTP protocol violation: " + ex.getMessage());
-            } finally {
-                try {
-                    this.conn.shutdown();
-                } catch (IOException ignore) {
-                }
-            }
-        }
-
-    }
-
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/js/tutorial.html b/vendor/git.apache.org/thrift.git/tutorial/js/tutorial.html
deleted file mode 100755
index d7f3945..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/js/tutorial.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Thrift Javascript Bindings - Tutorial Example</title>
-
-  <script src="../../lib/js/src/thrift.js"  type="text/javascript"></script>
-  <script src="gen-js/tutorial_types.js"    type="text/javascript"></script>
-  <script src="gen-js/shared_types.js"      type="text/javascript"></script>
-  <script src="gen-js/SharedService.js"     type="text/javascript"></script>
-  <script src="gen-js/Calculator.js"        type="text/javascript"></script>
-
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-
-
-  <script type="text/javascript" charset="utf-8">
-  //<![CDATA[
-  $(document).ready(function(){
-    // remove pseudo child required for valid xhtml strict
-    $("#op").children().remove();
-    // add operations to it's dropdown menu
-    $.each(Operation, function(key, value) {
-      $('#op').append($("<option></option>").attr("value",value).text(key)); 
-    });
-    
-     $('table.calculator').attr('width', 500);
-  });
-
-  function calc() {
-    var transport = new Thrift.Transport("/thrift/service/tutorial/");
-    var protocol  = new Thrift.Protocol(transport);
-    var client    = new CalculatorClient(protocol);
-
-    var work = new Work();
-    work.num1 = $("#num1").val();
-    work.num2 = $("#num2").val();
-    work.op = $("#op").val();
-    
-    try {
-      result = client.calculate(1, work);
-      $('#result').val(result);
-      $('#result').css('color', 'black');
-    } catch(ouch){
-      $('#result').val(ouch.why);
-      $('#result').css('color', 'red');
-    }
-  }
-  
-  function auto_calc() {
-    if ($('#autoupdate:checked').val() !== undefined) {
-      calc();
-    }
-  }
-  //]]>
-  </script>
-
-</head>
-<body>
-  <h2>Thrift Javascript Bindings</h2>
-  <form action="">
-  <table class="calculator">
-    <tr>
-      <td>num1</td>
-      <td><input type="text" id="num1" value="20" onkeyup="javascript:auto_calc();"/></td>
-    </tr>
-    <tr>
-      <td>Operation</td>
-      <td><select id="op" size="1" onchange="javascript:auto_calc();"><option></option></select></td>
-    </tr>
-    <tr>
-      <td>num2</td>
-      <td><input type="text" id="num2" value="5" onkeyup="javascript:auto_calc();"/></td></tr>
-    <tr>
-      <td>result</td>
-      <td><input type="text" id="result" value=""/></td></tr>
-    <tr>
-      <td><input type="checkbox" id="autoupdate" checked="checked"/>autoupdate</td>
-      <td><input type="button" id="calculate" value="calculate" onclick="javascript:calc();"/></td>
-    </tr>
-  </table>
-  </form>
-  
-  <p>This Java Script example uses <a href="https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=blob;f=tutorial/tutorial.thrift;hb=HEAD">tutorial.thrift</a> and a Thrift server using JSON protocol and HTTP transport.
-  </p>
-    <p>
-        <a href="http://validator.w3.org/check/referer"><img
-            src="http://www.w3.org/Icons/valid-xhtml10"
-            alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-    </p>
-</body>
-</html>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/nodejs/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/nodejs/Makefile.am
deleted file mode 100644
index ecf3b2b..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/nodejs/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-nodejs/Calculator.js gen-nodejs/SharedService.js: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen js:node -r $<
-
-all-local: gen-nodejs/Calculator.js
-
-tutorialserver: all
-	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServer.js
-
-tutorialclient: all
-	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClient.js
-
-tutorialserver_promise: all
-	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeServerPromise.js
-
-tutorialclient_promise: all
-	NODE_PATH="$(top_builddir)/lib/nodejs:$(top_builddir)/lib/nodejs/lib:$(NODEPATH)" $(NODEJS) NodeClientPromise.js
-
-
-clean-local:
-	$(RM) -r gen-*
-
-EXTRA_DIST = \
-	NodeServer.js \
-	NodeClient.js \
-	NodeServerPromise.js \
-	NodeClientPromise.js
diff --git a/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeClient.js b/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeClient.js
deleted file mode 100644
index 130ba57..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeClient.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var thrift = require('thrift');
-var Calculator = require('./gen-nodejs/Calculator');
-var ttypes = require('./gen-nodejs/tutorial_types');
-
-
-var transport = thrift.TBufferedTransport;
-var protocol = thrift.TBinaryProtocol;
-
-var connection = thrift.createConnection("localhost", 9090, {
-  transport : transport,
-  protocol : protocol
-});
-
-connection.on('error', function(err) {
-  assert(false, err);
-});
-
-// Create a Calculator client with the connection
-var client = thrift.createClient(Calculator, connection);
-
-
-client.ping(function(err, response) {
-  console.log('ping()');
-});
-
-
-client.add(1,1, function(err, response) {
-  console.log("1+1=" + response);
-});
-
-
-work = new ttypes.Work();
-work.op = ttypes.Operation.DIVIDE;
-work.num1 = 1;
-work.num2 = 0;
-
-client.calculate(1, work, function(err, message) {
-  if (err) {
-    console.log("InvalidOperation " + err);
-  } else {
-    console.log('Whoa? You know how to divide by zero?');
-  }
-});
-
-work.op = ttypes.Operation.SUBTRACT;
-work.num1 = 15;
-work.num2 = 10;
-
-client.calculate(1, work, function(err, message) {
-  console.log('15-10=' + message);
-
-  client.getStruct(1, function(err, message){
-    console.log('Check log: ' + message.value);
-
-    //close the connection once we're done
-    connection.end();
-  });
-});
diff --git a/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeClientPromise.js b/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeClientPromise.js
deleted file mode 100644
index fac12ba..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeClientPromise.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var thrift = require('thrift');
-var Calculator = require('./gen-nodejs/Calculator');
-var ttypes = require('./gen-nodejs/tutorial_types');
-
-
-var transport = thrift.TBufferedTransport;
-var protocol = thrift.TBinaryProtocol;
-
-var connection = thrift.createConnection("localhost", 9090, {
-  transport : transport,
-  protocol : protocol
-});
-
-connection.on('error', function(err) {
-  assert(false, err);
-});
-
-// Create a Calculator client with the connection
-var client = thrift.createClient(Calculator, connection);
-
-
-client.ping()
-  .then(function() {
-    console.log('ping()');
-  });
-
-client.add(1,1)
-  .then(function(response) {
-	  console.log("1+1=" + response);
-  });
-
-work = new ttypes.Work();
-work.op = ttypes.Operation.DIVIDE;
-work.num1 = 1;
-work.num2 = 0;
-
-client.calculate(1, work)
-  .then(function(message) {
-	console.log('Whoa? You know how to divide by zero?');
-  })
-  .fail(function(err) {
-    console.log("InvalidOperation " + err);
-  });
-
-
-work.op = ttypes.Operation.SUBTRACT;
-work.num1 = 15;
-work.num2 = 10;
-
-client.calculate(1, work)
-  .then(function(value) {
-	  console.log('15-10=' + value);
-	  return client.getStruct(1);
-  })
-  .then(function(message) {
-      console.log('Check log: ' + message.value);
-  })
-  .fin(function() {
-	  //close the connection once we're done
-      connection.end();
-  });
diff --git a/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeServer.js b/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeServer.js
deleted file mode 100644
index 55d3817..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeServer.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var thrift = require("thrift");
-var Calculator = require("./gen-nodejs/Calculator");
-var ttypes = require("./gen-nodejs/tutorial_types");
-var SharedStruct = require("./gen-nodejs/shared_types").SharedStruct;
-
-var data = {};
-
-var server = thrift.createServer(Calculator, {
-  ping: function(result) {
-    console.log("ping()");
-    result(null);
-  },
-
-  add: function(n1, n2, result) {
-    console.log("add(", n1, ",", n2, ")");
-    result(null, n1 + n2);
-  },
-
-  calculate: function(logid, work, result) {
-    console.log("calculate(", logid, ",", work, ")");
-
-    var val = 0;
-    if (work.op == ttypes.Operation.ADD) {
-      val = work.num1 + work.num2;
-    } else if (work.op === ttypes.Operation.SUBTRACT) {
-      val = work.num1 - work.num2;
-    } else if (work.op === ttypes.Operation.MULTIPLY) {
-      val = work.num1 * work.num2;
-    } else if (work.op === ttypes.Operation.DIVIDE) {
-      if (work.num2 === 0) {
-        var x = new ttypes.InvalidOperation();
-        x.whatOp = work.op;
-        x.why = 'Cannot divide by 0';
-        result(x);
-        return;
-      }
-      val = work.num1 / work.num2;
-    } else {
-      var x = new ttypes.InvalidOperation();
-      x.whatOp = work.op;
-      x.why = 'Invalid operation';
-      result(x);
-      return;
-    }
-
-    var entry = new SharedStruct();
-    entry.key = logid;
-    entry.value = ""+val;
-    data[logid] = entry;
-
-    result(null, val);
-  },
-
-  getStruct: function(key, result) {
-    console.log("getStruct(", key, ")");
-    result(null, data[key]);
-  },
-
-  zip: function() {
-    console.log("zip()");
-    result(null);
-  }
-
-});
-
-server.listen(9090);
diff --git a/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeServerPromise.js b/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeServerPromise.js
deleted file mode 100644
index bff287b..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/nodejs/NodeServerPromise.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var thrift = require("thrift");
-var Calculator = require("./gen-nodejs/Calculator");
-var ttypes = require("./gen-nodejs/tutorial_types");
-var SharedStruct = require("./gen-nodejs/shared_types").SharedStruct;
-
-var data = {};
-
-var server = thrift.createServer(Calculator, {
-  ping: function() {
-    console.log("ping()");
-  },
-
-  add: function(n1, n2) {
-    console.log("add(", n1, ",", n2, ")");
-    return n1 + n2;
-  },
-
-  calculate: function(logid, work) {
-    console.log("calculate(", logid, ",", work, ")");
-
-    var val = 0;
-    if (work.op == ttypes.Operation.ADD) {
-      val = work.num1 + work.num2;
-    } else if (work.op === ttypes.Operation.SUBTRACT) {
-      val = work.num1 - work.num2;
-    } else if (work.op === ttypes.Operation.MULTIPLY) {
-      val = work.num1 * work.num2;
-    } else if (work.op === ttypes.Operation.DIVIDE) {
-      if (work.num2 === 0) {
-        var x = new ttypes.InvalidOperation();
-        x.whatOp = work.op;
-        x.why = 'Cannot divide by 0';
-		throw x;
-      }
-      val = work.num1 / work.num2;
-    } else {
-      var x = new ttypes.InvalidOperation();
-      x.whatOp = work.op;
-      x.why = 'Invalid operation';
-      throw x;
-    }
-
-    var entry = new SharedStruct();
-    entry.key = logid;
-    entry.value = ""+val;
-    data[logid] = entry;
-    return val;
-  },
-
-  getStruct: function(key) {
-    console.log("getStruct(", key, ")");
-    return data[key];
-  },
-
-  zip: function() {
-    console.log("zip()");
-  }
-
-});
-
-server.listen(9090);
diff --git a/vendor/git.apache.org/thrift.git/tutorial/ocaml/CalcClient.ml b/vendor/git.apache.org/thrift.git/tutorial/ocaml/CalcClient.ml
deleted file mode 100755
index 5a8467b..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/ocaml/CalcClient.ml
+++ /dev/null
@@ -1,74 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Arg
-open Thrift
-open Tutorial_types
-open Shared_types
-
-exception Die;;
-let sod = function
-    Some v -> v
-  | None -> raise Die;;
-
-type connection = {
-  trans : Transport.t ;
-  proto : Thrift.Protocol.t;
-  calc : Calculator.client ;
-}
-
-let connect ~host port =
-  let tx = new TSocket.t host port in
-  let proto = new TBinaryProtocol.t tx in
-  let calc = new Calculator.client proto proto in
-    tx#opn;
-    { trans = tx ; proto = proto; calc = calc }
-;;
-
-let doclient () =
-  let cli = connect ~host:"127.0.0.1" 9090 in
-  try
-    cli.calc#ping ;
-    Printf.printf "ping()\n" ; flush stdout ;
-    (let sum = cli.calc#add (Int32.of_int 1) (Int32.of_int 1) in
-       Printf.printf "1+1=%ld\n" sum ;
-       flush stdout) ;
-    (let w = new work in
-       w#set_op Operation.DIVIDE ;
-       w#set_num1 (Int32.of_int 1) ;
-       w#set_num2 (Int32.of_int 0) ;
-       try
-	 let quotient = cli.calc#calculate (Int32.of_int 1) w in
-	   Printf.printf "Whoa? We can divide by zero!\n" ; flush stdout
-       with InvalidOperation io ->
-	 Printf.printf "InvalidOperation: %s\n" io#grab_why ; flush stdout) ;
-    (let w = new work in
-       w#set_op Operation.SUBTRACT ;
-       w#set_num1 (Int32.of_int 15) ;
-       w#set_num2 (Int32.of_int 10) ;
-       let diff = cli.calc#calculate (Int32.of_int 1) w in
-	 Printf.printf "15-10=%ld\n" diff ; flush stdout) ;
-    (let ss = cli.calc#getStruct (Int32.of_int 1) in
-       Printf.printf "Check log: %s\n" ss#grab_value ; flush stdout) ;
-    cli.trans#close
-  with Transport.E (_,what) ->
-    Printf.printf "ERROR: %s\n" what ; flush stdout
-;;
-
-doclient();;
diff --git a/vendor/git.apache.org/thrift.git/tutorial/ocaml/CalcServer.ml b/vendor/git.apache.org/thrift.git/tutorial/ocaml/CalcServer.ml
deleted file mode 100755
index b5facb7..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/ocaml/CalcServer.ml
+++ /dev/null
@@ -1,89 +0,0 @@
-(*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*)
-
-open Arg
-open Thrift
-open Tutorial_types
-open Shared_types
-
-exception Die;;
-let sod = function
-    Some v -> v
-  | None -> raise Die;;
-
-class calc_handler =
-object (self)
-  inherit Calculator.iface
-  val log = Hashtbl.create 23
-  method ping  = Printf.printf "ping()\n" ; flush stdout
-  method add a b =
-    Printf.printf"add(%ld,%ld)\n" (sod a) (sod b); flush stdout ;
-    Int32.add (sod a) (sod b)
-  method calculate logid w =
-    let w = sod w in
-      Printf.printf "calculate(%ld,{%ld,%ld,%ld})\n" (sod logid) (Operation.to_i w#grab_op) w#grab_num1 w#grab_num2; flush stdout ;
-    let rv =
-      match w#grab_op with
-	  Operation.ADD ->
-	    Int32.add w#grab_num1 w#grab_num2
-	| Operation.SUBTRACT ->
-	    Int32.sub w#grab_num1 w#grab_num2
-	| Operation.MULTIPLY ->
-	    Int32.mul w#grab_num1 w#grab_num2
-	| Operation.DIVIDE ->
-	    if w#grab_num2 = Int32.zero then
-	      let io = new invalidOperation in
-		io#set_whatOp (Operation.to_i w#grab_op) ;
-		io#set_why "Cannot divide by 0" ;
-		raise (InvalidOperation io)
-	    else
-	      Int32.div w#grab_num1 w#grab_num2 in
-
-    let ss = new sharedStruct in
-      ss#set_key (sod logid) ;
-    let buffer = Int32.to_string rv in
-      ss#set_value buffer ;
-      Hashtbl.add log (sod logid) ss ;
-      rv
-
-  method zip =
-    Printf.printf "zip()\n"; flush stdout
-
-  method getStruct logid =
-    Printf.printf "getStruct(%ld)\n" (sod logid) ; flush stdout ;
-    Hashtbl.find log (sod logid)
-
-end
-
-let doserver () =
-  let h = new calc_handler in
-  let proc = new Calculator.processor h in
-  let port = 9090 in
-  let pf = new TBinaryProtocol.factory in
-  let server = new TThreadedServer.t
-		 proc
-		 (new TServerSocket.t port)
-		 (new Transport.factory)
-		 pf
-		 pf
-  in
-    server#serve
-;;
-
-doserver();;
diff --git a/vendor/git.apache.org/thrift.git/tutorial/ocaml/README.md b/vendor/git.apache.org/thrift.git/tutorial/ocaml/README.md
deleted file mode 100644
index f68e835..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/ocaml/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-This is the ocaml tutorial example.  It assumes that you've already
-built and installed the thrift ocaml runtime libraries in lib/ocaml.
-
-To compile this, you will need to generate the Thrift sources for
-ocaml in this directory (due to limitations in the OASIS build-tool):
-
-  % thrift -r --gen ocaml ../tutorial.thrift
-  % oasis setup
-  % make
-
-This will produce two executables Calc{Server,Client}.<type> where
-<type> is one of "byte" or "native", depending on your ocaml
-installation.  Just run the server in the background, then the client
-(as you would do for the C++ example).
diff --git a/vendor/git.apache.org/thrift.git/tutorial/ocaml/_oasis b/vendor/git.apache.org/thrift.git/tutorial/ocaml/_oasis
deleted file mode 100644
index 23abdc6..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/ocaml/_oasis
+++ /dev/null
@@ -1,32 +0,0 @@
-Name: tutorial
-Version: 0.10.0
-OASISFormat: 0.3
-Synopsis: OCaml Tutorial example
-Authors: Apache Thrift Developers <dev@thrift.apache.org>
-License: Apache-2.0
-Homepage: http://thrift.apache.org
-BuildTools: ocamlbuild
-Plugins:     META (0.3),
-  DevFiles (0.3)
-
-Library tutorial_thrift
-  Path: gen-ocaml
-  FindlibName: tutorial_thrift
-  buildTools: ocamlbuild
-  BuildDepends: threads,thrift
-  Modules: Calculator,Shared_consts,Tutorial_consts,SharedService,Shared_types,Tutorial_types
-  XMETARequires: threads
-
-Executable CalcClient
-  Path: .
-  MainIs: CalcClient.ml
-  Build$: true
-  CompiledObject: best
-  BuildDepends: thrift, tutorial_thrift, threads
-
-Executable CalcServer
-  Path: .
-  MainIs: CalcServer.ml
-  Build$: true
-  CompiledObject: best
-  BuildDepends: thrift, tutorial_thrift, threads
diff --git a/vendor/git.apache.org/thrift.git/tutorial/perl/PerlClient.pl b/vendor/git.apache.org/thrift.git/tutorial/perl/PerlClient.pl
deleted file mode 100644
index 1d59656..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/perl/PerlClient.pl
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env perl
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use strict;
-use warnings;
-
-use lib '../../lib/perl/lib';
-use lib '../gen-perl';
-
-use Thrift;
-use Thrift::BinaryProtocol;
-use Thrift::Socket;
-use Thrift::BufferedTransport;
-
-use shared::SharedService;
-use tutorial::Calculator;
-use shared::Types;
-use tutorial::Types;
-
-use Data::Dumper;
-
-my $socket    = new Thrift::Socket('localhost',9090);
-my $transport = new Thrift::BufferedTransport($socket,1024,1024);
-my $protocol  = new Thrift::BinaryProtocol($transport);
-my $client    = new tutorial::CalculatorClient($protocol);
-
-
-eval{
-    $transport->open();
-
-    $client->ping();
-    print "ping()\n";
-
-
-    my $sum = $client->add(1,1);
-    print "1+1=$sum\n";
-
-    my $work = new tutorial::Work();
-
-    $work->op(tutorial::Operation::DIVIDE);
-    $work->num1(1);
-    $work->num2(0);
-
-    eval {
-        $client->calculate(1, $work);
-        print "Whoa! We can divide by zero?\n";
-    }; if($@) {
-        warn "InvalidOperation: ".Dumper($@);
-    }
-
-    $work->op(tutorial::Operation::SUBTRACT);
-    $work->num1(15);
-    $work->num2(10);
-    my $diff = $client->calculate(1, $work);
-    print "15-10=$diff\n";
-
-    my $log = $client->getStruct(1);
-    print "Log: $log->{value}\n";
-
-    $transport->close();
-
-}; if($@){
-    warn(Dumper($@));
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/perl/PerlServer.pl b/vendor/git.apache.org/thrift.git/tutorial/perl/PerlServer.pl
deleted file mode 100644
index adec978..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/perl/PerlServer.pl
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/perl
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-use strict;
-use lib '../gen-perl';
-use Thrift::Socket;
-use Thrift::Server;
-use tutorial::Calculator;
-
-package CalculatorHandler;
-use base qw(tutorial::CalculatorIf);
-
-sub new {
-    my $classname = shift;
-    my $self      = {};
-
-    return bless($self,$classname);
-}
-
-
-sub ping
-{
-  print "ping()\n";
-}
-
-sub add
-{
-  my($self, $n1, $n2) = @_;
-  printf("add(%d,%d)\n", $n1, $n2);
-  return $n1 + $n2;
-}
-
-sub calculate
-{
-  my($self, $logid, $work) = @_;
-  my $op   = $work->{op};
-  my $num1 = $work->{num1};
-  my $num2 = $work->{num2};
-  printf("calculate(%d, %d %d %d)\n", $logid, $num1, $num2, $op);
-
-  my $val;
-
-  if ($op == tutorial::Operation::ADD) {
-    $val = $num1 + $num2;
-  } elsif ($op == tutorial::Operation::SUBTRACT) {
-    $val = $num1 - $num2;
-  } elsif ($op == tutorial::Operation::MULTIPLY) {
-    $val = $num1 * $num2;
-  } elsif ($op == tutorial::Operation::DIVIDE) {
-    if ($num2 == 0)
-    {
-      my $x = new tutorial::InvalidOperation;
-      $x->whatOp($op);
-      $x->why('Cannot divide by 0');
-      die $x;
-    }
-    $val = $num1 / $num2;
-  } else {
-    my $x = new tutorial::InvalidOperation;
-    $x->whatOp($op);
-    $x->why('Invalid operation');
-    die $x;
-  }
-
-  my $log = new shared::SharedStruct;
-  $log->key($logid);
-  $log->value(int($val));
-  $self->{log}->{$logid} = $log;
-
-  return $val;
-}
-
-sub getStruct
-{
-  my($self, $key) = @_;
-  printf("getStruct(%d)\n", $key);
-  return $self->{log}->{$key};
-}
-
-sub zip
-{
-  my($self) = @_;
-  print "zip()\n";
-}
-
-
-
-eval {
-  my $handler       = new CalculatorHandler;
-  my $processor     = new tutorial::CalculatorProcessor($handler);
-  my $serversocket  = new Thrift::ServerSocket(9090);
-  my $forkingserver = new Thrift::ForkingServer($processor, $serversocket);
-  print "Starting the server...\n";
-  $forkingserver->serve();
-  print "done.\n";
-}; if ($@) {
-  if ($@ =~ m/TException/ and exists $@->{message}) {
-    my $message = $@->{message};
-    my $code    = $@->{code};
-    my $out     = $code . ':' . $message;
-    die $out;
-  } else {
-    die $@;
-  }
-}
-
diff --git a/vendor/git.apache.org/thrift.git/tutorial/php/PhpClient.php b/vendor/git.apache.org/thrift.git/tutorial/php/PhpClient.php
deleted file mode 100755
index d262b8f..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/php/PhpClient.php
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-namespace tutorial\php;
-
-error_reporting(E_ALL);
-
-require_once __DIR__.'/../../lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php';
-
-use Thrift\ClassLoader\ThriftClassLoader;
-
-$GEN_DIR = realpath(dirname(__FILE__).'/..').'/gen-php';
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', __DIR__ . '/../../lib/php/lib');
-$loader->registerDefinition('shared', $GEN_DIR);
-$loader->registerDefinition('tutorial', $GEN_DIR);
-$loader->register();
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-use Thrift\Protocol\TBinaryProtocol;
-use Thrift\Transport\TSocket;
-use Thrift\Transport\THttpClient;
-use Thrift\Transport\TBufferedTransport;
-use Thrift\Exception\TException;
-
-try {
-  if (array_search('--http', $argv)) {
-    $socket = new THttpClient('localhost', 8080, '/php/PhpServer.php');
-  } else {
-    $socket = new TSocket('localhost', 9090);
-  }
-  $transport = new TBufferedTransport($socket, 1024, 1024);
-  $protocol = new TBinaryProtocol($transport);
-  $client = new \tutorial\CalculatorClient($protocol);
-
-  $transport->open();
-
-  $client->ping();
-  print "ping()\n";
-
-  $sum = $client->add(1,1);
-  print "1+1=$sum\n";
-
-  $work = new \tutorial\Work();
-
-  $work->op = \tutorial\Operation::DIVIDE;
-  $work->num1 = 1;
-  $work->num2 = 0;
-
-  try {
-    $client->calculate(1, $work);
-    print "Whoa! We can divide by zero?\n";
-  } catch (\tutorial\InvalidOperation $io) {
-    print "InvalidOperation: $io->why\n";
-  }
-
-  $work->op = \tutorial\Operation::SUBTRACT;
-  $work->num1 = 15;
-  $work->num2 = 10;
-  $diff = $client->calculate(1, $work);
-  print "15-10=$diff\n";
-
-  $log = $client->getStruct(1);
-  print "Log: $log->value\n";
-
-  $transport->close();
-
-} catch (TException $tx) {
-  print 'TException: '.$tx->getMessage()."\n";
-}
-
-?>
diff --git a/vendor/git.apache.org/thrift.git/tutorial/php/PhpServer.php b/vendor/git.apache.org/thrift.git/tutorial/php/PhpServer.php
deleted file mode 100755
index 22ae43e..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/php/PhpServer.php
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-namespace tutorial\php;
-
-error_reporting(E_ALL);
-
-require_once __DIR__.'/../../lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php';
-
-use Thrift\ClassLoader\ThriftClassLoader;
-
-$GEN_DIR = realpath(dirname(__FILE__).'/..').'/gen-php';
-
-$loader = new ThriftClassLoader();
-$loader->registerNamespace('Thrift', __DIR__ . '/../../lib/php/lib');
-$loader->registerDefinition('shared', $GEN_DIR);
-$loader->registerDefinition('tutorial', $GEN_DIR);
-$loader->register();
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * This is not a stand-alone server.  It should be run as a normal
- * php web script (like through Apache's mod_php) or as a cgi script
- * (like with the included runserver.py).  You can connect to it with
- * THttpClient in any language that supports it.  The PHP tutorial client
- * will work if you pass it the argument "--http".
- */
-
-if (php_sapi_name() == 'cli') {
-  ini_set("display_errors", "stderr");
-}
-
-use Thrift\Protocol\TBinaryProtocol;
-use Thrift\Transport\TPhpStream;
-use Thrift\Transport\TBufferedTransport;
-
-class CalculatorHandler implements \tutorial\CalculatorIf {
-  protected $log = array();
-
-  public function ping() {
-    error_log("ping()");
-  }
-
-  public function add($num1, $num2) {
-    error_log("add({$num1}, {$num2})");
-    return $num1 + $num2;
-  }
-
-  public function calculate($logid, \tutorial\Work $w) {
-    error_log("calculate({$logid}, {{$w->op}, {$w->num1}, {$w->num2}})");
-    switch ($w->op) {
-      case \tutorial\Operation::ADD:
-        $val = $w->num1 + $w->num2;
-        break;
-      case \tutorial\Operation::SUBTRACT:
-        $val = $w->num1 - $w->num2;
-        break;
-      case \tutorial\Operation::MULTIPLY:
-        $val = $w->num1 * $w->num2;
-        break;
-      case \tutorial\Operation::DIVIDE:
-        if ($w->num2 == 0) {
-          $io = new \tutorial\InvalidOperation();
-          $io->whatOp = $w->op;
-          $io->why = "Cannot divide by 0";
-          throw $io;
-        }
-        $val = $w->num1 / $w->num2;
-        break;
-      default:
-        $io = new \tutorial\InvalidOperation();
-        $io->whatOp = $w->op;
-        $io->why = "Invalid Operation";
-        throw $io;
-    }
-
-    $log = new \shared\SharedStruct();
-    $log->key = $logid;
-    $log->value = (string)$val;
-    $this->log[$logid] = $log;
-
-    return $val;
-  }
-
-  public function getStruct($key) {
-    error_log("getStruct({$key})");
-    // This actually doesn't work because the PHP interpreter is
-    // restarted for every request.
-    //return $this->log[$key];
-    return new \shared\SharedStruct(array("key" => $key, "value" => "PHP is stateless!"));
-  }
-
-  public function zip() {
-    error_log("zip()");
-  }
-
-};
-
-header('Content-Type', 'application/x-thrift');
-if (php_sapi_name() == 'cli') {
-  echo "\r\n";
-}
-
-$handler = new CalculatorHandler();
-$processor = new \tutorial\CalculatorProcessor($handler);
-
-$transport = new TBufferedTransport(new TPhpStream(TPhpStream::MODE_R | TPhpStream::MODE_W));
-$protocol = new TBinaryProtocol($transport, true, true);
-
-$transport->open();
-$processor->process($protocol, $protocol);
-$transport->close();
diff --git a/vendor/git.apache.org/thrift.git/tutorial/php/runserver.py b/vendor/git.apache.org/thrift.git/tutorial/php/runserver.py
deleted file mode 100755
index 077daa1..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/php/runserver.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import os
-import BaseHTTPServer
-import CGIHTTPServer
-
-# chdir(2) into the tutorial directory.
-os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
-
-
-class Handler(CGIHTTPServer.CGIHTTPRequestHandler):
-    cgi_directories = ['/php']
-
-BaseHTTPServer.HTTPServer(('', 8080), Handler).serve_forever()
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py.tornado/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/py.tornado/Makefile.am
deleted file mode 100755
index 6ac6023..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py.tornado/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-py.tornado/tutorial/Calculator.py gen-py.tornado/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen py:tornado -r $<
-
-all-local: gen-py.tornado/tutorial/Calculator.py
-
-tutorialserver: all
-	${PYTHON} PythonServer.py
-
-tutorialclient: all
-	${PYTHON} PythonClient.py
-
-clean-local:
-	$(RM) -r gen-*
-
-EXTRA_DIST = \
-	PythonServer.py \
-	PythonClient.py
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py.tornado/PythonClient.py b/vendor/git.apache.org/thrift.git/tutorial/py.tornado/PythonClient.py
deleted file mode 100755
index 426146f..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py.tornado/PythonClient.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import logging
-import sys
-
-sys.path.append('gen-py.tornado')
-sys.path.insert(0, glob.glob('../../lib/py/build/lib*')[0])
-
-from tutorial import Calculator
-from tutorial.ttypes import Operation, Work, InvalidOperation
-
-from thrift import TTornado
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
-
-from tornado import gen
-from tornado import ioloop
-
-
-@gen.coroutine
-def communicate():
-    # create client
-    transport = TTornado.TTornadoStreamTransport('localhost', 9090)
-    # open the transport, bail on error
-    try:
-        yield transport.open()
-        print('Transport is opened')
-    except TTransport.TTransportException as ex:
-        logging.error(ex)
-        raise gen.Return()
-
-    pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-    client = Calculator.Client(transport, pfactory)
-
-    # ping
-    yield client.ping()
-    print("ping()")
-
-    # add
-    sum_ = yield client.add(1, 1)
-    print("1 + 1 = {0}".format(sum_))
-
-    # make a oneway call without a callback (schedule the write and continue
-    # without blocking)
-    client.zip()
-    print("zip() without callback")
-
-    # make a oneway call with a callback (we'll wait for the stream write to
-    # complete before continuing)
-    client.zip()
-    print("zip() with callback")
-
-    # calculate 1/0
-    work = Work()
-    work.op = Operation.DIVIDE
-    work.num1 = 1
-    work.num2 = 0
-
-    try:
-        quotient = yield client.calculate(1, work)
-        print("Whoa? You know how to divide by zero ? -> {0}".format(quotient))
-    except InvalidOperation as io:
-        print("InvalidOperation: {0}".format(io))
-
-    # calculate 15-10
-    work.op = Operation.SUBTRACT
-    work.num1 = 15
-    work.num2 = 10
-
-    diff = yield client.calculate(1, work)
-    print("15 - 10 = {0}".format(diff))
-
-    # getStruct
-    log = yield client.getStruct(1)
-    print("Check log: {0}".format(log.value))
-
-    # close the transport
-    client._transport.close()
-    raise gen.Return()
-
-
-def main():
-    # create an ioloop, do the above, then stop
-    ioloop.IOLoop.current().run_sync(communicate)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py.tornado/PythonServer.py b/vendor/git.apache.org/thrift.git/tutorial/py.tornado/PythonServer.py
deleted file mode 100755
index e0229a2..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py.tornado/PythonServer.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import sys
-
-sys.path.append('gen-py.tornado')
-sys.path.insert(0, glob.glob('../../lib/py/build/lib*')[0])
-
-from tutorial import Calculator
-from tutorial.ttypes import Operation, InvalidOperation
-
-from shared.ttypes import SharedStruct
-
-from thrift import TTornado
-from thrift.protocol import TBinaryProtocol
-
-from tornado import ioloop
-
-
-class CalculatorHandler(object):
-    def __init__(self):
-        self.log = {}
-
-    def ping(self):
-        print("ping()")
-
-    def add(self, n1, n2):
-        print("add({}, {})".format(n1, n2))
-        return n1 + n2
-
-    def calculate(self, logid, work):
-        print("calculate({}, {})".format(logid, work))
-
-        if work.op == Operation.ADD:
-            val = work.num1 + work.num2
-        elif work.op == Operation.SUBTRACT:
-            val = work.num1 - work.num2
-        elif work.op == Operation.MULTIPLY:
-            val = work.num1 * work.num2
-        elif work.op == Operation.DIVIDE:
-            if work.num2 == 0:
-                x = InvalidOperation()
-                x.whatOp = work.op
-                x.why = "Cannot divide by 0"
-                raise x
-            val = work.num1 / work.num2
-        else:
-            x = InvalidOperation()
-            x.whatOp = work.op
-            x.why = "Invalid operation"
-            raise x
-
-        log = SharedStruct()
-        log.key = logid
-        log.value = '%d' % (val)
-        self.log[logid] = log
-        return val
-
-    def getStruct(self, key):
-        print("getStruct({})".format(key))
-        return self.log[key]
-
-    def zip(self):
-        print("zip()")
-
-
-def main():
-    handler = CalculatorHandler()
-    processor = Calculator.Processor(handler)
-    pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-    server = TTornado.TTornadoServer(processor, pfactory)
-
-    print("Starting the server...")
-    server.bind(9090)
-    server.start(1)
-    ioloop.IOLoop.instance().start()
-    print("done.")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py.twisted/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/py.twisted/Makefile.am
deleted file mode 100755
index c6cbd45..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py.twisted/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-py/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen py:twisted -r $<
-
-all-local: gen-py/tutorial/Calculator.py
-
-tutorialserver: all
-	${PYTHON} PythonServer.py
-
-tutorialclient: all
-	${PYTHON} PythonClient.py
-
-clean-local:
-	$(RM) -r gen-*
-
-EXTRA_DIST = \
-	PythonClient.py \
-	PythonServer.py \
-	PythonServer.tac
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonClient.py b/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonClient.py
deleted file mode 100755
index 63dde7e..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonClient.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import sys
-sys.path.append('gen-py.twisted')
-sys.path.insert(0, glob.glob('../../lib/py/build/lib*')[0])
-
-from tutorial import Calculator
-from tutorial.ttypes import InvalidOperation, Operation, Work
-
-from twisted.internet.defer import inlineCallbacks
-from twisted.internet import reactor
-from twisted.internet.protocol import ClientCreator
-
-from thrift.transport import TTwisted
-from thrift.protocol import TBinaryProtocol
-
-
-@inlineCallbacks
-def main(client):
-    yield client.ping()
-    print('ping()')
-
-    sum = yield client.add(1, 1)
-    print(('1+1=%d' % (sum)))
-
-    work = Work()
-
-    work.op = Operation.DIVIDE
-    work.num1 = 1
-    work.num2 = 0
-
-    try:
-        quotient = yield client.calculate(1, work)
-        print('Whoa? You know how to divide by zero?')
-        print('FYI the answer is %d' % quotient)
-    except InvalidOperation as e:
-        print(('InvalidOperation: %r' % e))
-
-    work.op = Operation.SUBTRACT
-    work.num1 = 15
-    work.num2 = 10
-
-    diff = yield client.calculate(1, work)
-    print(('15-10=%d' % (diff)))
-
-    log = yield client.getStruct(1)
-    print(('Check log: %s' % (log.value)))
-    reactor.stop()
-
-if __name__ == '__main__':
-    d = ClientCreator(reactor,
-                      TTwisted.ThriftClientProtocol,
-                      Calculator.Client,
-                      TBinaryProtocol.TBinaryProtocolFactory(),
-                      ).connectTCP("127.0.0.1", 9090)
-    d.addCallback(lambda conn: conn.client)
-    d.addCallback(main)
-
-    reactor.run()
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonServer.py b/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonServer.py
deleted file mode 100755
index 1b0e2d5..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonServer.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import sys
-sys.path.append('gen-py.twisted')
-sys.path.insert(0, glob.glob('../../lib/py/build/lib*')[0])
-
-from tutorial import Calculator
-from tutorial.ttypes import InvalidOperation, Operation
-
-from shared.ttypes import SharedStruct
-
-from zope.interface import implements
-from twisted.internet import reactor
-
-from thrift.transport import TTwisted
-from thrift.protocol import TBinaryProtocol
-
-
-class CalculatorHandler:
-    implements(Calculator.Iface)
-
-    def __init__(self):
-        self.log = {}
-
-    def ping(self):
-        print('ping()')
-
-    def add(self, n1, n2):
-        print('add(%d,%d)' % (n1, n2))
-        return n1 + n2
-
-    def calculate(self, logid, work):
-        print('calculate(%d, %r)' % (logid, work))
-
-        if work.op == Operation.ADD:
-            val = work.num1 + work.num2
-        elif work.op == Operation.SUBTRACT:
-            val = work.num1 - work.num2
-        elif work.op == Operation.MULTIPLY:
-            val = work.num1 * work.num2
-        elif work.op == Operation.DIVIDE:
-            if work.num2 == 0:
-                x = InvalidOperation()
-                x.whatOp = work.op
-                x.why = 'Cannot divide by 0'
-                raise x
-            val = work.num1 / work.num2
-        else:
-            x = InvalidOperation()
-            x.whatOp = work.op
-            x.why = 'Invalid operation'
-            raise x
-
-        log = SharedStruct()
-        log.key = logid
-        log.value = '%d' % (val)
-        self.log[logid] = log
-
-        return val
-
-    def getStruct(self, key):
-        print('getStruct(%d)' % (key))
-        return self.log[key]
-
-    def zip(self):
-        print('zip()')
-
-if __name__ == '__main__':
-    handler = CalculatorHandler()
-    processor = Calculator.Processor(handler)
-    pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-    server = reactor.listenTCP(
-        9090,
-        TTwisted.ThriftServerFactory(processor, pfactory),
-        interface="127.0.0.1")
-    reactor.run()
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonServer.tac b/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonServer.tac
deleted file mode 100755
index 0479636..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py.twisted/PythonServer.tac
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from twisted.application import internet, service
-from thrift.transport import TTwisted
-
-import glob
-import sys
-sys.path.append('gen-py.twisted')
-sys.path.insert(0, glob.glob('../../lib/py/build/lib*')[0])
-from tutorial import Calculator
-from PythonServer import CalculatorHandler
-from thrift.protocol import TBinaryProtocol
-
-
-def make_application():
-    application = service.Application('CalcServer')
-
-    handler = CalculatorHandler()
-    processor = Calculator.Processor(handler)
-
-    serverFactory = TTwisted.ThriftServerFactory(
-        processor,
-        TBinaryProtocol.TBinaryProtocolFactory())
-
-    calcService = internet.TCPServer(9090, serverFactory)
-
-    multiService = service.MultiService()
-    calcService.setServiceParent(multiService)
-    multiService.setServiceParent(application)
-
-    return application
-
-if __name__ == '__main__':
-    application = make_application()
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/py/Makefile.am
deleted file mode 100755
index d891640..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-py/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen py -r $<
-
-all-local: gen-py/tutorial/Calculator.py
-
-tutorialserver: all
-	${PYTHON} PythonServer.py
-
-tutorialclient: all
-	${PYTHON} PythonClient.py
-
-clean-local:
-	$(RM) -r gen-*
-
-EXTRA_DIST = \
-	setup.cfg \
-	PythonServer.py \
-	PythonClient.py
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py/PythonClient.py b/vendor/git.apache.org/thrift.git/tutorial/py/PythonClient.py
deleted file mode 100755
index c659716..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py/PythonClient.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import sys
-import glob
-sys.path.append('gen-py')
-sys.path.insert(0, glob.glob('../../lib/py/build/lib*')[0])
-
-from tutorial import Calculator
-from tutorial.ttypes import InvalidOperation, Operation, Work
-
-from thrift import Thrift
-from thrift.transport import TSocket
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
-
-
-def main():
-    # Make socket
-    transport = TSocket.TSocket('localhost', 9090)
-
-    # Buffering is critical. Raw sockets are very slow
-    transport = TTransport.TBufferedTransport(transport)
-
-    # Wrap in a protocol
-    protocol = TBinaryProtocol.TBinaryProtocol(transport)
-
-    # Create a client to use the protocol encoder
-    client = Calculator.Client(protocol)
-
-    # Connect!
-    transport.open()
-
-    client.ping()
-    print('ping()')
-
-    sum_ = client.add(1, 1)
-    print('1+1=%d' % sum_)
-
-    work = Work()
-
-    work.op = Operation.DIVIDE
-    work.num1 = 1
-    work.num2 = 0
-
-    try:
-        quotient = client.calculate(1, work)
-        print('Whoa? You know how to divide by zero?')
-        print('FYI the answer is %d' % quotient)
-    except InvalidOperation as e:
-        print('InvalidOperation: %r' % e)
-
-    work.op = Operation.SUBTRACT
-    work.num1 = 15
-    work.num2 = 10
-
-    diff = client.calculate(1, work)
-    print('15-10=%d' % diff)
-
-    log = client.getStruct(1)
-    print('Check log: %s' % log.value)
-
-    # Close!
-    transport.close()
-
-if __name__ == '__main__':
-    try:
-        main()
-    except Thrift.TException as tx:
-        print('%s' % tx.message)
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py/PythonServer.py b/vendor/git.apache.org/thrift.git/tutorial/py/PythonServer.py
deleted file mode 100755
index eb132a1..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py/PythonServer.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import glob
-import sys
-sys.path.append('gen-py')
-sys.path.insert(0, glob.glob('../../lib/py/build/lib*')[0])
-
-from tutorial import Calculator
-from tutorial.ttypes import InvalidOperation, Operation
-
-from shared.ttypes import SharedStruct
-
-from thrift.transport import TSocket
-from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol
-from thrift.server import TServer
-
-
-class CalculatorHandler:
-    def __init__(self):
-        self.log = {}
-
-    def ping(self):
-        print('ping()')
-
-    def add(self, n1, n2):
-        print('add(%d,%d)' % (n1, n2))
-        return n1 + n2
-
-    def calculate(self, logid, work):
-        print('calculate(%d, %r)' % (logid, work))
-
-        if work.op == Operation.ADD:
-            val = work.num1 + work.num2
-        elif work.op == Operation.SUBTRACT:
-            val = work.num1 - work.num2
-        elif work.op == Operation.MULTIPLY:
-            val = work.num1 * work.num2
-        elif work.op == Operation.DIVIDE:
-            if work.num2 == 0:
-                x = InvalidOperation()
-                x.whatOp = work.op
-                x.why = 'Cannot divide by 0'
-                raise x
-            val = work.num1 / work.num2
-        else:
-            x = InvalidOperation()
-            x.whatOp = work.op
-            x.why = 'Invalid operation'
-            raise x
-
-        log = SharedStruct()
-        log.key = logid
-        log.value = '%d' % (val)
-        self.log[logid] = log
-
-        return val
-
-    def getStruct(self, key):
-        print('getStruct(%d)' % (key))
-        return self.log[key]
-
-    def zip(self):
-        print('zip()')
-
-if __name__ == '__main__':
-    handler = CalculatorHandler()
-    processor = Calculator.Processor(handler)
-    transport = TSocket.TServerSocket(port=9090)
-    tfactory = TTransport.TBufferedTransportFactory()
-    pfactory = TBinaryProtocol.TBinaryProtocolFactory()
-
-    server = TServer.TSimpleServer(processor, transport, tfactory, pfactory)
-
-    # You could do one of these for a multithreaded server
-    # server = TServer.TThreadedServer(
-    #     processor, transport, tfactory, pfactory)
-    # server = TServer.TThreadPoolServer(
-    #     processor, transport, tfactory, pfactory)
-
-    print('Starting the server...')
-    server.serve()
-    print('done.')
diff --git a/vendor/git.apache.org/thrift.git/tutorial/py/setup.cfg b/vendor/git.apache.org/thrift.git/tutorial/py/setup.cfg
deleted file mode 100644
index 2a7120a..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/py/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[flake8]
-ignore = E402
diff --git a/vendor/git.apache.org/thrift.git/tutorial/rb/Makefile.am b/vendor/git.apache.org/thrift.git/tutorial/rb/Makefile.am
deleted file mode 100755
index 369e903..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/rb/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-THRIFT = $(top_builddir)/compiler/cpp/thrift
-
-gen-py/calculator.rb gen-py/shared_service.rb: $(top_srcdir)/tutorial/tutorial.thrift
-	$(THRIFT) --gen rb -r $<
-
-all-local: gen-py/calculator.rb
-
-tutorialserver: all
-	${RUBY} RubyServer.rb
-
-tutorialclient: all
-	${RUBY} RubyClient.rb
-
-clean-local:
-	$(RM) -r gen-*
-
-EXTRA_DIST = \
-	RubyServer.rb \
-	RubyClient.rb
diff --git a/vendor/git.apache.org/thrift.git/tutorial/rb/RubyClient.rb b/vendor/git.apache.org/thrift.git/tutorial/rb/RubyClient.rb
deleted file mode 100755
index 9a5aa43..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/rb/RubyClient.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env ruby
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$:.push('gen-rb')
-$:.unshift '../../lib/rb/lib'
-
-require 'thrift'
-
-require 'calculator'
-
-begin
-  port = ARGV[0] || 9090
-
-  transport = Thrift::BufferedTransport.new(Thrift::Socket.new('localhost', port))
-  protocol = Thrift::BinaryProtocol.new(transport)
-  client = Calculator::Client.new(protocol)
-
-  transport.open()
-
-  client.ping()
-  print "ping()\n"
-
-  sum = client.add(1,1)
-  print "1+1=", sum, "\n"
-
-  sum = client.add(1,4)
-  print "1+4=", sum, "\n"
-
-  work = Work.new()
-
-  work.op = Operation::SUBTRACT
-  work.num1 = 15
-  work.num2 = 10
-  diff = client.calculate(1, work)
-  print "15-10=", diff, "\n"
-
-  log = client.getStruct(1)
-  print "Log: ", log.value, "\n"
-
-  begin
-    work.op = Operation::DIVIDE
-    work.num1 = 1
-    work.num2 = 0
-    quot = client.calculate(1, work)
-    puts "Whoa, we can divide by 0 now?"
-  rescue InvalidOperation => io
-    print "InvalidOperation: ", io.why, "\n"
-  end
-
-  client.zip()
-  print "zip\n"
-
-  transport.close()
-
-rescue Thrift::Exception => tx
-  print 'Thrift::Exception: ', tx.message, "\n"
-end
diff --git a/vendor/git.apache.org/thrift.git/tutorial/rb/RubyServer.rb b/vendor/git.apache.org/thrift.git/tutorial/rb/RubyServer.rb
deleted file mode 100755
index 1d707d7..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/rb/RubyServer.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env ruby
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-$:.push('gen-rb')
-$:.unshift '../../lib/rb/lib'
-
-require 'thrift'
-
-require 'calculator'
-require 'shared_types'
-
-class CalculatorHandler
-  def initialize()
-    @log = {}
-  end
-
-  def ping()
-    puts "ping()"
-  end
-
-  def add(n1, n2)
-    print "add(", n1, ",", n2, ")\n"
-    return n1 + n2
-  end
-
-  def calculate(logid, work)
-    print "calculate(", logid, ", {", work.op, ",", work.num1, ",", work.num2,"})\n"
-    if work.op == Operation::ADD
-      val = work.num1 + work.num2
-    elsif work.op == Operation::SUBTRACT
-      val = work.num1 - work.num2
-    elsif work.op == Operation::MULTIPLY
-      val = work.num1 * work.num2
-    elsif work.op == Operation::DIVIDE
-      if work.num2 == 0
-        x = InvalidOperation.new()
-        x.whatOp = work.op
-        x.why = "Cannot divide by 0"
-        raise x
-      end
-      val = work.num1 / work.num2
-    else
-      x = InvalidOperation.new()
-      x.whatOp = work.op
-      x.why = "Invalid operation"
-      raise x
-    end
-
-    entry = SharedStruct.new()
-    entry.key = logid
-    entry.value = "#{val}"
-    @log[logid] = entry
-
-    return val
-
-  end
-
-  def getStruct(key)
-    print "getStruct(", key, ")\n"
-    return @log[key]
-  end
-
-  def zip()
-    print "zip\n"
-  end
-
-end
-
-handler = CalculatorHandler.new()
-processor = Calculator::Processor.new(handler)
-transport = Thrift::ServerSocket.new(9090)
-transportFactory = Thrift::BufferedTransportFactory.new()
-server = Thrift::SimpleServer.new(processor, transport, transportFactory)
-
-puts "Starting the server..."
-server.serve()
-puts "done."
diff --git a/vendor/git.apache.org/thrift.git/tutorial/shared.thrift b/vendor/git.apache.org/thrift.git/tutorial/shared.thrift
deleted file mode 100644
index 386000b..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/shared.thrift
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * This Thrift file can be included by other Thrift files that want to share
- * these definitions.
- */
-
-namespace cpp shared
-namespace d share // "shared" would collide with the eponymous D keyword.
-namespace dart shared
-namespace java shared
-namespace perl shared
-namespace php shared
-namespace haxe shared
-
-struct SharedStruct {
-  1: i32 key
-  2: string value
-}
-
-service SharedService {
-  SharedStruct getStruct(1: i32 key)
-}
diff --git a/vendor/git.apache.org/thrift.git/tutorial/tutorial.thrift b/vendor/git.apache.org/thrift.git/tutorial/tutorial.thrift
deleted file mode 100644
index c4a96f0..0000000
--- a/vendor/git.apache.org/thrift.git/tutorial/tutorial.thrift
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-# Thrift Tutorial
-# Mark Slee (mcslee@facebook.com)
-#
-# This file aims to teach you how to use Thrift, in a .thrift file. Neato. The
-# first thing to notice is that .thrift files support standard shell comments.
-# This lets you make your thrift file executable and include your Thrift build
-# step on the top line. And you can place comments like this anywhere you like.
-#
-# Before running this file, you will need to have installed the thrift compiler
-# into /usr/local/bin.
-
-/**
- * The first thing to know about are types. The available types in Thrift are:
- *
- *  bool        Boolean, one byte
- *  i8 (byte)   Signed 8-bit integer
- *  i16         Signed 16-bit integer
- *  i32         Signed 32-bit integer
- *  i64         Signed 64-bit integer
- *  double      64-bit floating point value
- *  string      String
- *  binary      Blob (byte array)
- *  map<t1,t2>  Map from one type to another
- *  list<t1>    Ordered list of one type
- *  set<t1>     Set of unique elements of one type
- *
- * Did you also notice that Thrift supports C style comments?
- */
-
-// Just in case you were wondering... yes. We support simple C comments too.
-
-/**
- * Thrift files can reference other Thrift files to include common struct
- * and service definitions. These are found using the current path, or by
- * searching relative to any paths specified with the -I compiler flag.
- *
- * Included objects are accessed using the name of the .thrift file as a
- * prefix. i.e. shared.SharedObject
- */
-include "shared.thrift"
-
-/**
- * Thrift files can namespace, package, or prefix their output in various
- * target languages.
- */
-namespace cpp tutorial
-namespace d tutorial
-namespace dart tutorial
-namespace java tutorial
-namespace php tutorial
-namespace perl tutorial
-namespace haxe tutorial
-
-/**
- * Thrift lets you do typedefs to get pretty names for your types. Standard
- * C style here.
- */
-typedef i32 MyInteger
-
-/**
- * Thrift also lets you define constants for use across languages. Complex
- * types and structs are specified using JSON notation.
- */
-const i32 INT32CONSTANT = 9853
-const map<string,string> MAPCONSTANT = {'hello':'world', 'goodnight':'moon'}
-
-/**
- * You can define enums, which are just 32 bit integers. Values are optional
- * and start at 1 if not supplied, C style again.
- */
-enum Operation {
-  ADD = 1,
-  SUBTRACT = 2,
-  MULTIPLY = 3,
-  DIVIDE = 4
-}
-
-/**
- * Structs are the basic complex data structures. They are comprised of fields
- * which each have an integer identifier, a type, a symbolic name, and an
- * optional default value.
- *
- * Fields can be declared "optional", which ensures they will not be included
- * in the serialized output if they aren't set.  Note that this requires some
- * manual management in some languages.
- */
-struct Work {
-  1: i32 num1 = 0,
-  2: i32 num2,
-  3: Operation op,
-  4: optional string comment,
-}
-
-/**
- * Structs can also be exceptions, if they are nasty.
- */
-exception InvalidOperation {
-  1: i32 whatOp,
-  2: string why
-}
-
-/**
- * Ahh, now onto the cool part, defining a service. Services just need a name
- * and can optionally inherit from another service using the extends keyword.
- */
-service Calculator extends shared.SharedService {
-
-  /**
-   * A method definition looks like C code. It has a return type, arguments,
-   * and optionally a list of exceptions that it may throw. Note that argument
-   * lists and exception lists are specified using the exact same syntax as
-   * field lists in struct or exception definitions.
-   */
-
-   void ping(),
-
-   i32 add(1:i32 num1, 2:i32 num2),
-
-   i32 calculate(1:i32 logid, 2:Work w) throws (1:InvalidOperation ouch),
-
-   /**
-    * This method has a oneway modifier. That means the client only makes
-    * a request and does not listen for any response at all. Oneway methods
-    * must be void.
-    */
-   oneway void zip()
-
-}
-
-/**
- * That just about covers the basics. Take a look in the test/ folder for more
- * detailed examples. After you run this file, your generated code shows up
- * in folders with names gen-<language>. The generated code isn't too scary
- * to look at. It even has pretty indentation.
- */
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/application_exception.go b/vendor/github.com/apache/thrift/lib/go/thrift/application_exception.go
similarity index 74%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/application_exception.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/application_exception.go
index 6655cc5..b9d7eed 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/application_exception.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/application_exception.go
@@ -30,11 +30,22 @@ const (
 	PROTOCOL_ERROR                 = 7
 )
 
+var defaultApplicationExceptionMessage = map[int32]string{
+	UNKNOWN_APPLICATION_EXCEPTION:  "unknown application exception",
+	UNKNOWN_METHOD:                 "unknown method",
+	INVALID_MESSAGE_TYPE_EXCEPTION: "invalid message type",
+	WRONG_METHOD_NAME:              "wrong method name",
+	BAD_SEQUENCE_ID:                "bad sequence ID",
+	MISSING_RESULT:                 "missing result",
+	INTERNAL_ERROR:                 "unknown internal error",
+	PROTOCOL_ERROR:                 "unknown protocol error",
+}
+
 // Application level Thrift exception
 type TApplicationException interface {
 	TException
 	TypeId() int32
-	Read(iprot TProtocol) (TApplicationException, error)
+	Read(iprot TProtocol) error
 	Write(oprot TProtocol) error
 }
 
@@ -44,7 +55,10 @@ type tApplicationException struct {
 }
 
 func (e tApplicationException) Error() string {
-	return e.message
+	if e.message != "" {
+		return e.message
+	}
+	return defaultApplicationExceptionMessage[e.type_]
 }
 
 func NewTApplicationException(type_ int32, message string) TApplicationException {
@@ -55,10 +69,11 @@ func (p *tApplicationException) TypeId() int32 {
 	return p.type_
 }
 
-func (p *tApplicationException) Read(iprot TProtocol) (TApplicationException, error) {
+func (p *tApplicationException) Read(iprot TProtocol) error {
+	// TODO: this should really be generated by the compiler
 	_, err := iprot.ReadStructBegin()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	message := ""
@@ -67,7 +82,7 @@ func (p *tApplicationException) Read(iprot TProtocol) (TApplicationException, er
 	for {
 		_, ttype, id, err := iprot.ReadFieldBegin()
 		if err != nil {
-			return nil, err
+			return err
 		}
 		if ttype == STOP {
 			break
@@ -76,33 +91,40 @@ func (p *tApplicationException) Read(iprot TProtocol) (TApplicationException, er
 		case 1:
 			if ttype == STRING {
 				if message, err = iprot.ReadString(); err != nil {
-					return nil, err
+					return err
 				}
 			} else {
 				if err = SkipDefaultDepth(iprot, ttype); err != nil {
-					return nil, err
+					return err
 				}
 			}
 		case 2:
 			if ttype == I32 {
 				if type_, err = iprot.ReadI32(); err != nil {
-					return nil, err
+					return err
 				}
 			} else {
 				if err = SkipDefaultDepth(iprot, ttype); err != nil {
-					return nil, err
+					return err
 				}
 			}
 		default:
 			if err = SkipDefaultDepth(iprot, ttype); err != nil {
-				return nil, err
+				return err
 			}
 		}
 		if err = iprot.ReadFieldEnd(); err != nil {
-			return nil, err
+			return err
 		}
 	}
-	return NewTApplicationException(type_, message), iprot.ReadStructEnd()
+	if err := iprot.ReadStructEnd(); err != nil {
+		return err
+	}
+
+	p.message = message
+	p.type_ = type_
+
+	return nil
 }
 
 func (p *tApplicationException) Write(oprot TProtocol) (err error) {
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/application_exception_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/application_exception_test.go
similarity index 88%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/application_exception_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/application_exception_test.go
index 7010f86..7743357 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/application_exception_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/application_exception_test.go
@@ -25,17 +25,17 @@ import (
 
 func TestTApplicationException(t *testing.T) {
 	exc := NewTApplicationException(UNKNOWN_APPLICATION_EXCEPTION, "")
-	if exc.Error() != "" {
+	if exc.Error() != defaultApplicationExceptionMessage[UNKNOWN_APPLICATION_EXCEPTION] {
 		t.Fatalf("Expected empty string for exception but found '%s'", exc.Error())
 	}
 	if exc.TypeId() != UNKNOWN_APPLICATION_EXCEPTION {
-		t.Fatalf("Expected type UNKNOWN for exception but found '%s'", exc.TypeId())
+		t.Fatalf("Expected type UNKNOWN for exception but found '%v'", exc.TypeId())
 	}
 	exc = NewTApplicationException(WRONG_METHOD_NAME, "junk_method")
 	if exc.Error() != "junk_method" {
 		t.Fatalf("Expected 'junk_method' for exception but found '%s'", exc.Error())
 	}
 	if exc.TypeId() != WRONG_METHOD_NAME {
-		t.Fatalf("Expected type WRONG_METHOD_NAME for exception but found '%s'", exc.TypeId())
+		t.Fatalf("Expected type WRONG_METHOD_NAME for exception but found '%v'", exc.TypeId())
 	}
 }
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/binary_protocol.go b/vendor/github.com/apache/thrift/lib/go/thrift/binary_protocol.go
similarity index 97%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/binary_protocol.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/binary_protocol.go
index 690d341..1f90bf4 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/binary_protocol.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/binary_protocol.go
@@ -21,6 +21,7 @@ package thrift
 
 import (
 	"bytes"
+	"context"
 	"encoding/binary"
 	"errors"
 	"fmt"
@@ -447,9 +448,6 @@ func (p *TBinaryProtocol) ReadBinary() ([]byte, error) {
 	if size < 0 {
 		return nil, invalidDataLength
 	}
-	if uint64(size) > p.trans.RemainingBytes() {
-		return nil, invalidDataLength
-	}
 
 	isize := int(size)
 	buf := make([]byte, isize)
@@ -457,8 +455,8 @@ func (p *TBinaryProtocol) ReadBinary() ([]byte, error) {
 	return buf, NewTProtocolException(err)
 }
 
-func (p *TBinaryProtocol) Flush() (err error) {
-	return NewTProtocolException(p.trans.Flush())
+func (p *TBinaryProtocol) Flush(ctx context.Context) (err error) {
+	return NewTProtocolException(p.trans.Flush(ctx))
 }
 
 func (p *TBinaryProtocol) Skip(fieldType TType) (err error) {
@@ -480,9 +478,6 @@ func (p *TBinaryProtocol) readStringBody(size int32) (value string, err error) {
 	if size < 0 {
 		return "", nil
 	}
-	if uint64(size) > p.trans.RemainingBytes() {
-		return "", invalidDataLength
-	}
 
 	var (
 		buf bytes.Buffer
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/binary_protocol_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/binary_protocol_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/binary_protocol_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/binary_protocol_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/buffered_transport.go b/vendor/github.com/apache/thrift/lib/go/thrift/buffered_transport.go
similarity index 95%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/buffered_transport.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/buffered_transport.go
index b754f92..9670206 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/buffered_transport.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/buffered_transport.go
@@ -21,6 +21,7 @@ package thrift
 
 import (
 	"bufio"
+	"context"
 )
 
 type TBufferedTransportFactory struct {
@@ -78,12 +79,12 @@ func (p *TBufferedTransport) Write(b []byte) (int, error) {
 	return n, err
 }
 
-func (p *TBufferedTransport) Flush() error {
+func (p *TBufferedTransport) Flush(ctx context.Context) error {
 	if err := p.ReadWriter.Flush(); err != nil {
 		p.ReadWriter.Writer.Reset(p.tp)
 		return err
 	}
-	return p.tp.Flush()
+	return p.tp.Flush(ctx)
 }
 
 func (p *TBufferedTransport) RemainingBytes() (num_bytes uint64) {
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/buffered_transport_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/buffered_transport_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/buffered_transport_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/buffered_transport_test.go
diff --git a/vendor/github.com/apache/thrift/lib/go/thrift/client.go b/vendor/github.com/apache/thrift/lib/go/thrift/client.go
new file mode 100644
index 0000000..28791cc
--- /dev/null
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/client.go
@@ -0,0 +1,85 @@
+package thrift
+
+import (
+	"context"
+	"fmt"
+)
+
+type TClient interface {
+	Call(ctx context.Context, method string, args, result TStruct) error
+}
+
+type TStandardClient struct {
+	seqId        int32
+	iprot, oprot TProtocol
+}
+
+// TStandardClient implements TClient, and uses the standard message format for Thrift.
+// It is not safe for concurrent use.
+func NewTStandardClient(inputProtocol, outputProtocol TProtocol) *TStandardClient {
+	return &TStandardClient{
+		iprot: inputProtocol,
+		oprot: outputProtocol,
+	}
+}
+
+func (p *TStandardClient) Send(ctx context.Context, oprot TProtocol, seqId int32, method string, args TStruct) error {
+	if err := oprot.WriteMessageBegin(method, CALL, seqId); err != nil {
+		return err
+	}
+	if err := args.Write(oprot); err != nil {
+		return err
+	}
+	if err := oprot.WriteMessageEnd(); err != nil {
+		return err
+	}
+	return oprot.Flush(ctx)
+}
+
+func (p *TStandardClient) Recv(iprot TProtocol, seqId int32, method string, result TStruct) error {
+	rMethod, rTypeId, rSeqId, err := iprot.ReadMessageBegin()
+	if err != nil {
+		return err
+	}
+
+	if method != rMethod {
+		return NewTApplicationException(WRONG_METHOD_NAME, fmt.Sprintf("%s: wrong method name", method))
+	} else if seqId != rSeqId {
+		return NewTApplicationException(BAD_SEQUENCE_ID, fmt.Sprintf("%s: out of order sequence response", method))
+	} else if rTypeId == EXCEPTION {
+		var exception tApplicationException
+		if err := exception.Read(iprot); err != nil {
+			return err
+		}
+
+		if err := iprot.ReadMessageEnd(); err != nil {
+			return err
+		}
+
+		return &exception
+	} else if rTypeId != REPLY {
+		return NewTApplicationException(INVALID_MESSAGE_TYPE_EXCEPTION, fmt.Sprintf("%s: invalid message type", method))
+	}
+
+	if err := result.Read(iprot); err != nil {
+		return err
+	}
+
+	return iprot.ReadMessageEnd()
+}
+
+func (p *TStandardClient) Call(ctx context.Context, method string, args, result TStruct) error {
+	p.seqId++
+	seqId := p.seqId
+
+	if err := p.Send(ctx, p.oprot, seqId, method, args); err != nil {
+		return err
+	}
+
+	// method is oneway
+	if result == nil {
+		return nil
+	}
+
+	return p.Recv(p.iprot, seqId, method, result)
+}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/zlib_transport_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/common_test.go
similarity index 78%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/zlib_transport_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/common_test.go
index f57610c..93597ff 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/zlib_transport_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/common_test.go
@@ -19,15 +19,12 @@
 
 package thrift
 
-import (
-	"compress/zlib"
-	"testing"
-)
+import "context"
 
-func TestZlibTransport(t *testing.T) {
-	trans, err := NewTZlibTransport(NewTMemoryBuffer(), zlib.BestCompression)
-	if err != nil {
-		t.Fatal(err)
-	}
-	TransportTest(t, trans, trans)
+type mockProcessor struct {
+	ProcessFunc func(in, out TProtocol) (bool, TException)
+}
+
+func (m *mockProcessor) Process(ctx context.Context, in, out TProtocol) (bool, TException) {
+	return m.ProcessFunc(in, out)
 }
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/compact_protocol.go b/vendor/github.com/apache/thrift/lib/go/thrift/compact_protocol.go
similarity index 98%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/compact_protocol.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/compact_protocol.go
index 0bc5fdd..1900d50 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/compact_protocol.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/compact_protocol.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"encoding/binary"
 	"fmt"
 	"io"
@@ -561,9 +562,6 @@ func (p *TCompactProtocol) ReadString() (value string, err error) {
 	if length < 0 {
 		return "", invalidDataLength
 	}
-	if uint64(length) > p.trans.RemainingBytes() {
-		return "", invalidDataLength
-	}
 
 	if length == 0 {
 		return "", nil
@@ -590,17 +588,14 @@ func (p *TCompactProtocol) ReadBinary() (value []byte, err error) {
 	if length < 0 {
 		return nil, invalidDataLength
 	}
-	if uint64(length) > p.trans.RemainingBytes() {
-		return nil, invalidDataLength
-	}
 
 	buf := make([]byte, length)
 	_, e = io.ReadFull(p.trans, buf)
 	return buf, NewTProtocolException(e)
 }
 
-func (p *TCompactProtocol) Flush() (err error) {
-	return NewTProtocolException(p.trans.Flush())
+func (p *TCompactProtocol) Flush(ctx context.Context) (err error) {
+	return NewTProtocolException(p.trans.Flush(ctx))
 }
 
 func (p *TCompactProtocol) Skip(fieldType TType) (err error) {
@@ -806,7 +801,7 @@ func (p *TCompactProtocol) getTType(t tCompactType) (TType, error) {
 	case COMPACT_STRUCT:
 		return STRUCT, nil
 	}
-	return STOP, TException(fmt.Errorf("don't know what type: %s", t&0x0f))
+	return STOP, TException(fmt.Errorf("don't know what type: %v", t&0x0f))
 }
 
 // Given a TType value, find the appropriate TCompactProtocol.Types constant.
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/compact_protocol_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/compact_protocol_test.go
similarity index 87%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/compact_protocol_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/compact_protocol_test.go
index f940b4e..65f77f2 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/compact_protocol_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/compact_protocol_test.go
@@ -26,11 +26,18 @@ import (
 
 func TestReadWriteCompactProtocol(t *testing.T) {
 	ReadWriteProtocolTest(t, NewTCompactProtocolFactory())
+
 	transports := []TTransport{
 		NewTMemoryBuffer(),
 		NewStreamTransportRW(bytes.NewBuffer(make([]byte, 0, 16384))),
 		NewTFramedTransport(NewTMemoryBuffer()),
 	}
+
+	zlib0, _ := NewTZlibTransport(NewTMemoryBuffer(), 0)
+	zlib6, _ := NewTZlibTransport(NewTMemoryBuffer(), 6)
+	zlib9, _ := NewTZlibTransport(NewTFramedTransport(NewTMemoryBuffer()), 9)
+	transports = append(transports, zlib0, zlib6, zlib9)
+
 	for _, trans := range transports {
 		p := NewTCompactProtocol(trans)
 		ReadWriteBool(t, p, trans)
diff --git a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TError.m b/vendor/github.com/apache/thrift/lib/go/thrift/context.go
similarity index 92%
rename from vendor/git.apache.org/thrift.git/lib/cocoa/src/TError.m
rename to vendor/github.com/apache/thrift/lib/go/thrift/context.go
index df7f92d..d15c1bc 100644
--- a/vendor/git.apache.org/thrift.git/lib/cocoa/src/TError.m
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/context.go
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-#import "TError.h"
+package thrift
 
+import "context"
 
-NSString *TErrorDomain = @"TErrorDomain";
+var defaultCtx = context.Background()
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/debug_protocol.go b/vendor/github.com/apache/thrift/lib/go/thrift/debug_protocol.go
similarity index 98%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/debug_protocol.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/debug_protocol.go
index d37252c..57943e0 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/debug_protocol.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/debug_protocol.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"log"
 )
 
@@ -258,8 +259,8 @@ func (tdp *TDebugProtocol) Skip(fieldType TType) (err error) {
 	log.Printf("%sSkip(fieldType=%#v) (err=%#v)", tdp.LogPrefix, fieldType, err)
 	return
 }
-func (tdp *TDebugProtocol) Flush() (err error) {
-	err = tdp.Delegate.Flush()
+func (tdp *TDebugProtocol) Flush(ctx context.Context) (err error) {
+	err = tdp.Delegate.Flush(ctx)
 	log.Printf("%sFlush() (err=%#v)", tdp.LogPrefix, err)
 	return
 }
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/deserializer.go b/vendor/github.com/apache/thrift/lib/go/thrift/deserializer.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/deserializer.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/deserializer.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/exception.go b/vendor/github.com/apache/thrift/lib/go/thrift/exception.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/exception.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/exception.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/exception_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/exception_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/exception_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/exception_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/field.go b/vendor/github.com/apache/thrift/lib/go/thrift/field.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/field.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/field.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/framed_transport.go b/vendor/github.com/apache/thrift/lib/go/thrift/framed_transport.go
similarity index 97%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/framed_transport.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/framed_transport.go
index 4ae1425..81fa65a 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/framed_transport.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/framed_transport.go
@@ -22,6 +22,7 @@ package thrift
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"encoding/binary"
 	"fmt"
 	"io"
@@ -135,21 +136,23 @@ func (p *TFramedTransport) WriteString(s string) (n int, err error) {
 	return p.buf.WriteString(s)
 }
 
-func (p *TFramedTransport) Flush() error {
+func (p *TFramedTransport) Flush(ctx context.Context) error {
 	size := p.buf.Len()
 	buf := p.buffer[:4]
 	binary.BigEndian.PutUint32(buf, uint32(size))
 	_, err := p.transport.Write(buf)
 	if err != nil {
+		p.buf.Truncate(0)
 		return NewTTransportExceptionFromError(err)
 	}
 	if size > 0 {
 		if n, err := p.buf.WriteTo(p.transport); err != nil {
 			print("Error while flushing write buffer of size ", size, " to transport, only wrote ", n, " bytes: ", err.Error(), "\n")
+			p.buf.Truncate(0)
 			return NewTTransportExceptionFromError(err)
 		}
 	}
-	err = p.transport.Flush()
+	err = p.transport.Flush(ctx)
 	return NewTTransportExceptionFromError(err)
 }
 
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/framed_transport_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/framed_transport_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/framed_transport_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/framed_transport_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/http_client.go b/vendor/github.com/apache/thrift/lib/go/thrift/http_client.go
similarity index 98%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/http_client.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/http_client.go
index 33f2aa4..5c82bf5 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/http_client.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/http_client.go
@@ -21,6 +21,7 @@ package thrift
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -181,7 +182,7 @@ func (p *THttpClient) WriteString(s string) (n int, err error) {
 	return p.requestBuffer.WriteString(s)
 }
 
-func (p *THttpClient) Flush() error {
+func (p *THttpClient) Flush(ctx context.Context) error {
 	// Close any previous response body to avoid leaking connections.
 	p.closeResponse()
 
@@ -190,6 +191,9 @@ func (p *THttpClient) Flush() error {
 		return NewTTransportExceptionFromError(err)
 	}
 	req.Header = p.header
+	if ctx != nil {
+		req = req.WithContext(ctx)
+	}
 	response, err := p.client.Do(req)
 	if err != nil {
 		return NewTTransportExceptionFromError(err)
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/http_client_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/http_client_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/http_client_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/http_client_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/http_transport.go b/vendor/github.com/apache/thrift/lib/go/thrift/http_transport.go
similarity index 61%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/http_transport.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/http_transport.go
index f6d7458..66f0f38 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/http_transport.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/http_transport.go
@@ -19,16 +19,45 @@
 
 package thrift
 
-import "net/http"
+import (
+	"compress/gzip"
+	"io"
+	"net/http"
+	"strings"
+)
 
 // NewThriftHandlerFunc is a function that create a ready to use Apache Thrift Handler function
 func NewThriftHandlerFunc(processor TProcessor,
 	inPfactory, outPfactory TProtocolFactory) func(w http.ResponseWriter, r *http.Request) {
 
-	return func(w http.ResponseWriter, r *http.Request) {
+	return gz(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/x-thrift")
 
 		transport := NewStreamTransport(r.Body, w)
-		processor.Process(inPfactory.GetProtocol(transport), outPfactory.GetProtocol(transport))
+		processor.Process(r.Context(), inPfactory.GetProtocol(transport), outPfactory.GetProtocol(transport))
+	})
+}
+
+// gz transparently compresses the HTTP response if the client supports it.
+func gz(handler http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if !strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
+			handler(w, r)
+			return
+		}
+		w.Header().Set("Content-Encoding", "gzip")
+		gz := gzip.NewWriter(w)
+		defer gz.Close()
+		gzw := gzipResponseWriter{Writer: gz, ResponseWriter: w}
+		handler(gzw, r)
 	}
 }
+
+type gzipResponseWriter struct {
+	io.Writer
+	http.ResponseWriter
+}
+
+func (w gzipResponseWriter) Write(b []byte) (int, error) {
+	return w.Writer.Write(b)
+}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/iostream_transport.go b/vendor/github.com/apache/thrift/lib/go/thrift/iostream_transport.go
similarity index 98%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/iostream_transport.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/iostream_transport.go
index b18be81..fea93bc 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/iostream_transport.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/iostream_transport.go
@@ -21,6 +21,7 @@ package thrift
 
 import (
 	"bufio"
+	"context"
 	"io"
 )
 
@@ -138,7 +139,7 @@ func (p *StreamTransport) Close() error {
 }
 
 // Flushes the underlying output stream if not null.
-func (p *StreamTransport) Flush() error {
+func (p *StreamTransport) Flush(ctx context.Context) error {
 	if p.Writer == nil {
 		return NewTTransportException(NOT_OPEN, "Cannot flush null outputStream")
 	}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/iostream_transport_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/iostream_transport_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/iostream_transport_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/iostream_transport_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/json_protocol.go b/vendor/github.com/apache/thrift/lib/go/thrift/json_protocol.go
similarity index 99%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/json_protocol.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/json_protocol.go
index 442fa91..7be685d 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/json_protocol.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/json_protocol.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"encoding/base64"
 	"fmt"
 )
@@ -438,10 +439,10 @@ func (p *TJSONProtocol) ReadBinary() ([]byte, error) {
 	return v, p.ParsePostValue()
 }
 
-func (p *TJSONProtocol) Flush() (err error) {
+func (p *TJSONProtocol) Flush(ctx context.Context) (err error) {
 	err = p.writer.Flush()
 	if err == nil {
-		err = p.trans.Flush()
+		err = p.trans.Flush(ctx)
 	}
 	return NewTProtocolException(err)
 }
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/json_protocol_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/json_protocol_test.go
similarity index 95%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/json_protocol_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/json_protocol_test.go
index 7104ce3..59c4d64 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/json_protocol_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/json_protocol_test.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -36,7 +37,7 @@ func TestWriteJSONProtocolBool(t *testing.T) {
 		if e := p.WriteBool(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -68,7 +69,7 @@ func TestReadJSONProtocolBool(t *testing.T) {
 		} else {
 			trans.Write([]byte{'0'}) // not JSON_FALSE
 		}
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadBool()
 		if e != nil {
@@ -94,7 +95,7 @@ func TestWriteJSONProtocolByte(t *testing.T) {
 		if e := p.WriteByte(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -116,7 +117,7 @@ func TestReadJSONProtocolByte(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTJSONProtocol(trans)
 		trans.WriteString(strconv.Itoa(int(value)))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadByte()
 		if e != nil {
@@ -141,7 +142,7 @@ func TestWriteJSONProtocolI16(t *testing.T) {
 		if e := p.WriteI16(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -163,7 +164,7 @@ func TestReadJSONProtocolI16(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTJSONProtocol(trans)
 		trans.WriteString(strconv.Itoa(int(value)))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadI16()
 		if e != nil {
@@ -188,7 +189,7 @@ func TestWriteJSONProtocolI32(t *testing.T) {
 		if e := p.WriteI32(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -210,7 +211,7 @@ func TestReadJSONProtocolI32(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTJSONProtocol(trans)
 		trans.WriteString(strconv.Itoa(int(value)))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadI32()
 		if e != nil {
@@ -235,7 +236,7 @@ func TestWriteJSONProtocolI64(t *testing.T) {
 		if e := p.WriteI64(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -257,7 +258,7 @@ func TestReadJSONProtocolI64(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTJSONProtocol(trans)
 		trans.WriteString(strconv.FormatInt(value, 10))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadI64()
 		if e != nil {
@@ -282,7 +283,7 @@ func TestWriteJSONProtocolDouble(t *testing.T) {
 		if e := p.WriteDouble(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -319,7 +320,7 @@ func TestReadJSONProtocolDouble(t *testing.T) {
 		p := NewTJSONProtocol(trans)
 		n := NewNumericFromDouble(value)
 		trans.WriteString(n.String())
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadDouble()
 		if e != nil {
@@ -358,7 +359,7 @@ func TestWriteJSONProtocolString(t *testing.T) {
 		if e := p.WriteString(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -380,7 +381,7 @@ func TestReadJSONProtocolString(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTJSONProtocol(trans)
 		trans.WriteString(jsonQuote(value))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadString()
 		if e != nil {
@@ -409,7 +410,7 @@ func TestWriteJSONProtocolBinary(t *testing.T) {
 	if e := p.WriteBinary(value); e != nil {
 		t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 	}
-	if e := p.Flush(); e != nil {
+	if e := p.Flush(context.Background()); e != nil {
 		t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 	}
 	s := trans.String()
@@ -441,7 +442,7 @@ func TestReadJSONProtocolBinary(t *testing.T) {
 	trans := NewTMemoryBuffer()
 	p := NewTJSONProtocol(trans)
 	trans.WriteString(jsonQuote(b64String))
-	trans.Flush()
+	trans.Flush(context.Background())
 	s := trans.String()
 	v, e := p.ReadBinary()
 	if e != nil {
@@ -474,7 +475,7 @@ func TestWriteJSONProtocolList(t *testing.T) {
 		}
 	}
 	p.WriteListEnd()
-	if e := p.Flush(); e != nil {
+	if e := p.Flush(context.Background()); e != nil {
 		t.Fatalf("Unable to write %s due to error flushing: %s", thetype, e.Error())
 	}
 	str := trans.String()
@@ -528,7 +529,7 @@ func TestWriteJSONProtocolSet(t *testing.T) {
 		}
 	}
 	p.WriteSetEnd()
-	if e := p.Flush(); e != nil {
+	if e := p.Flush(context.Background()); e != nil {
 		t.Fatalf("Unable to write %s due to error flushing: %s", thetype, e.Error())
 	}
 	str := trans.String()
@@ -585,12 +586,12 @@ func TestWriteJSONProtocolMap(t *testing.T) {
 		}
 	}
 	p.WriteMapEnd()
-	if e := p.Flush(); e != nil {
+	if e := p.Flush(context.Background()); e != nil {
 		t.Fatalf("Unable to write %s due to error flushing: %s", thetype, e.Error())
 	}
 	str := trans.String()
 	if str[0] != '[' || str[len(str)-1] != ']' {
-		t.Fatalf("Bad value for %s, wrote: %q, in go: %q", thetype, str, DOUBLE_VALUES)
+		t.Fatalf("Bad value for %s, wrote: %v, in go: %v", thetype, str, DOUBLE_VALUES)
 	}
 	expectedKeyType, expectedValueType, expectedSize, err := p.ReadMapBegin()
 	if err != nil {
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/lowlevel_benchmarks_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/lowlevel_benchmarks_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/lowlevel_benchmarks_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/lowlevel_benchmarks_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/memory_buffer.go b/vendor/github.com/apache/thrift/lib/go/thrift/memory_buffer.go
similarity index 96%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/memory_buffer.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/memory_buffer.go
index 97a4edf..5936d27 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/memory_buffer.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/memory_buffer.go
@@ -21,6 +21,7 @@ package thrift
 
 import (
 	"bytes"
+	"context"
 )
 
 // Memory buffer-based implementation of the TTransport interface.
@@ -70,7 +71,7 @@ func (p *TMemoryBuffer) Close() error {
 }
 
 // Flushing a memory buffer is a no-op
-func (p *TMemoryBuffer) Flush() error {
+func (p *TMemoryBuffer) Flush(ctx context.Context) error {
 	return nil
 }
 
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/memory_buffer_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/memory_buffer_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/memory_buffer_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/memory_buffer_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/messagetype.go b/vendor/github.com/apache/thrift/lib/go/thrift/messagetype.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/messagetype.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/messagetype.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/multiplexed_protocol.go b/vendor/github.com/apache/thrift/lib/go/thrift/multiplexed_protocol.go
similarity index 96%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/multiplexed_protocol.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/multiplexed_protocol.go
index 3157e0d..d028a30 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/multiplexed_protocol.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/multiplexed_protocol.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"fmt"
 	"strings"
 )
@@ -127,7 +128,7 @@ func (t *TMultiplexedProcessor) RegisterProcessor(name string, processor TProces
 	t.serviceProcessorMap[name] = processor
 }
 
-func (t *TMultiplexedProcessor) Process(in, out TProtocol) (bool, TException) {
+func (t *TMultiplexedProcessor) Process(ctx context.Context, in, out TProtocol) (bool, TException) {
 	name, typeId, seqid, err := in.ReadMessageBegin()
 	if err != nil {
 		return false, err
@@ -140,7 +141,7 @@ func (t *TMultiplexedProcessor) Process(in, out TProtocol) (bool, TException) {
 	if len(v) != 2 {
 		if t.DefaultProcessor != nil {
 			smb := NewStoredMessageProtocol(in, name, typeId, seqid)
-			return t.DefaultProcessor.Process(smb, out)
+			return t.DefaultProcessor.Process(ctx, smb, out)
 		}
 		return false, fmt.Errorf("Service name not found in message name: %s.  Did you forget to use a TMultiplexProtocol in your client?", name)
 	}
@@ -149,7 +150,7 @@ func (t *TMultiplexedProcessor) Process(in, out TProtocol) (bool, TException) {
 		return false, fmt.Errorf("Service name not found: %s.  Did you forget to call registerProcessor()?", v[0])
 	}
 	smb := NewStoredMessageProtocol(in, v[1], typeId, seqid)
-	return actualProcessor.Process(smb, out)
+	return actualProcessor.Process(ctx, smb, out)
 }
 
 //Protocol that use stored message for ReadMessageBegin
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/numeric.go b/vendor/github.com/apache/thrift/lib/go/thrift/numeric.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/numeric.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/numeric.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/pointerize.go b/vendor/github.com/apache/thrift/lib/go/thrift/pointerize.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/pointerize.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/pointerize.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/processor_factory.go b/vendor/github.com/apache/thrift/lib/go/thrift/processor_factory.go
similarity index 83%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/processor_factory.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/processor_factory.go
index 9d645df..e4b132b 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/processor_factory.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/processor_factory.go
@@ -19,6 +19,18 @@
 
 package thrift
 
+import "context"
+
+// A processor is a generic object which operates upon an input stream and
+// writes to some output stream.
+type TProcessor interface {
+	Process(ctx context.Context, in, out TProtocol) (bool, TException)
+}
+
+type TProcessorFunction interface {
+	Process(ctx context.Context, seqId int32, in, out TProtocol) (bool, TException)
+}
+
 // The default processor factory just returns a singleton
 // instance.
 type TProcessorFactory interface {
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/protocol.go b/vendor/github.com/apache/thrift/lib/go/thrift/protocol.go
similarity index 96%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/protocol.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/protocol.go
index 5b77363..615b7a4 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/protocol.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/protocol.go
@@ -20,7 +20,9 @@
 package thrift
 
 import (
+	"context"
 	"errors"
+	"fmt"
 )
 
 const (
@@ -73,7 +75,7 @@ type TProtocol interface {
 	ReadBinary() (value []byte, err error)
 
 	Skip(fieldType TType) (err error)
-	Flush() (err error)
+	Flush(ctx context.Context) (err error)
 
 	Transport() TTransport
 }
@@ -170,6 +172,8 @@ func Skip(self TProtocol, fieldType TType, maxDepth int) (err error) {
 			}
 		}
 		return self.ReadListEnd()
+	default:
+		return NewTProtocolExceptionWithType(INVALID_DATA, errors.New(fmt.Sprintf("Unknown data type %d", fieldType)))
 	}
 	return nil
 }
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/protocol_exception.go b/vendor/github.com/apache/thrift/lib/go/thrift/protocol_exception.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/protocol_exception.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/protocol_exception.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/protocol_factory.go b/vendor/github.com/apache/thrift/lib/go/thrift/protocol_factory.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/protocol_factory.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/protocol_factory.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/protocol_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/protocol_test.go
similarity index 89%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/protocol_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/protocol_test.go
index 2573312..944055c 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/protocol_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/protocol_test.go
@@ -21,6 +21,7 @@ package thrift
 
 import (
 	"bytes"
+	"context"
 	"io/ioutil"
 	"math"
 	"net"
@@ -31,7 +32,6 @@ import (
 const PROTOCOL_BINARY_DATA_SIZE = 155
 
 var (
-	data           string // test data for writing
 	protocol_bdata []byte // test data for writing; same as data
 	BOOL_VALUES    []bool
 	BYTE_VALUES    []int8
@@ -47,7 +47,6 @@ func init() {
 	for i := 0; i < PROTOCOL_BINARY_DATA_SIZE; i++ {
 		protocol_bdata[i] = byte((i + 'a') % 255)
 	}
-	data = string(protocol_bdata)
 	BOOL_VALUES = []bool{false, true, false, false, true}
 	BYTE_VALUES = []int8{117, 0, 1, 32, 127, -128, -1}
 	INT16_VALUES = []int16{459, 0, 1, -1, -128, 127, 32767, -32768}
@@ -120,6 +119,9 @@ func ReadWriteProtocolTest(t *testing.T, protocolFactory TProtocolFactory) {
 		NewTMemoryBufferTransportFactory(1024),
 		NewStreamTransportFactory(buf, buf, true),
 		NewTFramedTransportFactory(NewTMemoryBufferTransportFactory(1024)),
+		NewTZlibTransportFactoryWithFactory(0, NewTMemoryBufferTransportFactory(1024)),
+		NewTZlibTransportFactoryWithFactory(6, NewTMemoryBufferTransportFactory(1024)),
+		NewTZlibTransportFactoryWithFactory(9, NewTFramedTransportFactory(NewTMemoryBufferTransportFactory(1024))),
 		NewTHttpPostClientTransportFactory("http://" + addr.String()),
 	}
 	for _, tf := range transports {
@@ -227,17 +229,17 @@ func ReadWriteBool(t testing.TB, p TProtocol, trans TTransport) {
 	for k, v := range BOOL_VALUES {
 		err = p.WriteBool(v)
 		if err != nil {
-			t.Errorf("%s: %T %T %q Error writing bool in list at index %d: %q", "ReadWriteBool", p, trans, err, k, v)
+			t.Errorf("%s: %T %T %v Error writing bool in list at index %v: %v", "ReadWriteBool", p, trans, err, k, v)
 		}
 	}
 	p.WriteListEnd()
 	if err != nil {
-		t.Errorf("%s: %T %T %q Error writing list end: %q", "ReadWriteBool", p, trans, err, BOOL_VALUES)
+		t.Errorf("%s: %T %T %v Error writing list end: %v", "ReadWriteBool", p, trans, err, BOOL_VALUES)
 	}
-	p.Flush()
+	p.Flush(context.Background())
 	thetype2, thelen2, err := p.ReadListBegin()
 	if err != nil {
-		t.Errorf("%s: %T %T %q Error reading list: %q", "ReadWriteBool", p, trans, err, BOOL_VALUES)
+		t.Errorf("%s: %T %T %v Error reading list: %v", "ReadWriteBool", p, trans, err, BOOL_VALUES)
 	}
 	_, ok := p.(*TSimpleJSONProtocol)
 	if !ok {
@@ -245,16 +247,16 @@ func ReadWriteBool(t testing.TB, p TProtocol, trans TTransport) {
 			t.Errorf("%s: %T %T type %s != type %s", "ReadWriteBool", p, trans, thetype, thetype2)
 		}
 		if thelen != thelen2 {
-			t.Errorf("%s: %T %T len %s != len %s", "ReadWriteBool", p, trans, thelen, thelen2)
+			t.Errorf("%s: %T %T len %v != len %v", "ReadWriteBool", p, trans, thelen, thelen2)
 		}
 	}
 	for k, v := range BOOL_VALUES {
 		value, err := p.ReadBool()
 		if err != nil {
-			t.Errorf("%s: %T %T %q Error reading bool at index %d: %q", "ReadWriteBool", p, trans, err, k, v)
+			t.Errorf("%s: %T %T %v Error reading bool at index %v: %v", "ReadWriteBool", p, trans, err, k, v)
 		}
 		if v != value {
-			t.Errorf("%s: index %d %q %q %q != %q", "ReadWriteBool", k, p, trans, v, value)
+			t.Errorf("%s: index %v %v %v %v != %v", "ReadWriteBool", k, p, trans, v, value)
 		}
 	}
 	err = p.ReadListEnd()
@@ -280,7 +282,7 @@ func ReadWriteByte(t testing.TB, p TProtocol, trans TTransport) {
 	if err != nil {
 		t.Errorf("%s: %T %T %q Error writing list end: %q", "ReadWriteByte", p, trans, err, BYTE_VALUES)
 	}
-	err = p.Flush()
+	err = p.Flush(context.Background())
 	if err != nil {
 		t.Errorf("%s: %T %T %q Error flushing list of bytes: %q", "ReadWriteByte", p, trans, err, BYTE_VALUES)
 	}
@@ -294,7 +296,7 @@ func ReadWriteByte(t testing.TB, p TProtocol, trans TTransport) {
 			t.Errorf("%s: %T %T type %s != type %s", "ReadWriteByte", p, trans, thetype, thetype2)
 		}
 		if thelen != thelen2 {
-			t.Errorf("%s: %T %T len %s != len %s", "ReadWriteByte", p, trans, thelen, thelen2)
+			t.Errorf("%s: %T %T len %v != len %v", "ReadWriteByte", p, trans, thelen, thelen2)
 		}
 	}
 	for k, v := range BYTE_VALUES {
@@ -320,7 +322,7 @@ func ReadWriteI16(t testing.TB, p TProtocol, trans TTransport) {
 		p.WriteI16(v)
 	}
 	p.WriteListEnd()
-	p.Flush()
+	p.Flush(context.Background())
 	thetype2, thelen2, err := p.ReadListBegin()
 	if err != nil {
 		t.Errorf("%s: %T %T %q Error reading list: %q", "ReadWriteI16", p, trans, err, INT16_VALUES)
@@ -331,7 +333,7 @@ func ReadWriteI16(t testing.TB, p TProtocol, trans TTransport) {
 			t.Errorf("%s: %T %T type %s != type %s", "ReadWriteI16", p, trans, thetype, thetype2)
 		}
 		if thelen != thelen2 {
-			t.Errorf("%s: %T %T len %s != len %s", "ReadWriteI16", p, trans, thelen, thelen2)
+			t.Errorf("%s: %T %T len %v != len %v", "ReadWriteI16", p, trans, thelen, thelen2)
 		}
 	}
 	for k, v := range INT16_VALUES {
@@ -357,7 +359,7 @@ func ReadWriteI32(t testing.TB, p TProtocol, trans TTransport) {
 		p.WriteI32(v)
 	}
 	p.WriteListEnd()
-	p.Flush()
+	p.Flush(context.Background())
 	thetype2, thelen2, err := p.ReadListBegin()
 	if err != nil {
 		t.Errorf("%s: %T %T %q Error reading list: %q", "ReadWriteI32", p, trans, err, INT32_VALUES)
@@ -368,7 +370,7 @@ func ReadWriteI32(t testing.TB, p TProtocol, trans TTransport) {
 			t.Errorf("%s: %T %T type %s != type %s", "ReadWriteI32", p, trans, thetype, thetype2)
 		}
 		if thelen != thelen2 {
-			t.Errorf("%s: %T %T len %s != len %s", "ReadWriteI32", p, trans, thelen, thelen2)
+			t.Errorf("%s: %T %T len %v != len %v", "ReadWriteI32", p, trans, thelen, thelen2)
 		}
 	}
 	for k, v := range INT32_VALUES {
@@ -393,7 +395,7 @@ func ReadWriteI64(t testing.TB, p TProtocol, trans TTransport) {
 		p.WriteI64(v)
 	}
 	p.WriteListEnd()
-	p.Flush()
+	p.Flush(context.Background())
 	thetype2, thelen2, err := p.ReadListBegin()
 	if err != nil {
 		t.Errorf("%s: %T %T %q Error reading list: %q", "ReadWriteI64", p, trans, err, INT64_VALUES)
@@ -404,7 +406,7 @@ func ReadWriteI64(t testing.TB, p TProtocol, trans TTransport) {
 			t.Errorf("%s: %T %T type %s != type %s", "ReadWriteI64", p, trans, thetype, thetype2)
 		}
 		if thelen != thelen2 {
-			t.Errorf("%s: %T %T len %s != len %s", "ReadWriteI64", p, trans, thelen, thelen2)
+			t.Errorf("%s: %T %T len %v != len %v", "ReadWriteI64", p, trans, thelen, thelen2)
 		}
 	}
 	for k, v := range INT64_VALUES {
@@ -429,28 +431,28 @@ func ReadWriteDouble(t testing.TB, p TProtocol, trans TTransport) {
 		p.WriteDouble(v)
 	}
 	p.WriteListEnd()
-	p.Flush()
+	p.Flush(context.Background())
 	thetype2, thelen2, err := p.ReadListBegin()
 	if err != nil {
-		t.Errorf("%s: %T %T %q Error reading list: %q", "ReadWriteDouble", p, trans, err, DOUBLE_VALUES)
+		t.Errorf("%s: %T %T %v Error reading list: %v", "ReadWriteDouble", p, trans, err, DOUBLE_VALUES)
 	}
 	if thetype != thetype2 {
 		t.Errorf("%s: %T %T type %s != type %s", "ReadWriteDouble", p, trans, thetype, thetype2)
 	}
 	if thelen != thelen2 {
-		t.Errorf("%s: %T %T len %s != len %s", "ReadWriteDouble", p, trans, thelen, thelen2)
+		t.Errorf("%s: %T %T len %v != len %v", "ReadWriteDouble", p, trans, thelen, thelen2)
 	}
 	for k, v := range DOUBLE_VALUES {
 		value, err := p.ReadDouble()
 		if err != nil {
-			t.Errorf("%s: %T %T %q Error reading double at index %d: %q", "ReadWriteDouble", p, trans, err, k, v)
+			t.Errorf("%s: %T %T %q Error reading double at index %d: %v", "ReadWriteDouble", p, trans, err, k, v)
 		}
 		if math.IsNaN(v) {
 			if !math.IsNaN(value) {
-				t.Errorf("%s: %T %T math.IsNaN(%q) != math.IsNaN(%q)", "ReadWriteDouble", p, trans, v, value)
+				t.Errorf("%s: %T %T math.IsNaN(%v) != math.IsNaN(%v)", "ReadWriteDouble", p, trans, v, value)
 			}
 		} else if v != value {
-			t.Errorf("%s: %T %T %v != %q", "ReadWriteDouble", p, trans, v, value)
+			t.Errorf("%s: %T %T %v != %v", "ReadWriteDouble", p, trans, v, value)
 		}
 	}
 	err = p.ReadListEnd()
@@ -467,7 +469,7 @@ func ReadWriteString(t testing.TB, p TProtocol, trans TTransport) {
 		p.WriteString(v)
 	}
 	p.WriteListEnd()
-	p.Flush()
+	p.Flush(context.Background())
 	thetype2, thelen2, err := p.ReadListBegin()
 	if err != nil {
 		t.Errorf("%s: %T %T %q Error reading list: %q", "ReadWriteString", p, trans, err, STRING_VALUES)
@@ -478,7 +480,7 @@ func ReadWriteString(t testing.TB, p TProtocol, trans TTransport) {
 			t.Errorf("%s: %T %T type %s != type %s", "ReadWriteString", p, trans, thetype, thetype2)
 		}
 		if thelen != thelen2 {
-			t.Errorf("%s: %T %T len %s != len %s", "ReadWriteString", p, trans, thelen, thelen2)
+			t.Errorf("%s: %T %T len %v != len %v", "ReadWriteString", p, trans, thelen, thelen2)
 		}
 	}
 	for k, v := range STRING_VALUES {
@@ -487,7 +489,7 @@ func ReadWriteString(t testing.TB, p TProtocol, trans TTransport) {
 			t.Errorf("%s: %T %T %q Error reading string at index %d: %q", "ReadWriteString", p, trans, err, k, v)
 		}
 		if v != value {
-			t.Errorf("%s: %T %T %d != %d", "ReadWriteString", p, trans, v, value)
+			t.Errorf("%s: %T %T %v != %v", "ReadWriteString", p, trans, v, value)
 		}
 	}
 	if err != nil {
@@ -498,7 +500,7 @@ func ReadWriteString(t testing.TB, p TProtocol, trans TTransport) {
 func ReadWriteBinary(t testing.TB, p TProtocol, trans TTransport) {
 	v := protocol_bdata
 	p.WriteBinary(v)
-	p.Flush()
+	p.Flush(context.Background())
 	value, err := p.ReadBinary()
 	if err != nil {
 		t.Errorf("%s: %T %T Unable to read binary: %s", "ReadWriteBinary", p, trans, err.Error())
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/rich_transport.go b/vendor/github.com/apache/thrift/lib/go/thrift/rich_transport.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/rich_transport.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/rich_transport.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/rich_transport_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/rich_transport_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/rich_transport_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/rich_transport_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/serializer.go b/vendor/github.com/apache/thrift/lib/go/thrift/serializer.go
similarity index 79%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/serializer.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/serializer.go
index 7712229..1ff4d37 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/serializer.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/serializer.go
@@ -19,6 +19,10 @@
 
 package thrift
 
+import (
+	"context"
+)
+
 type TSerializer struct {
 	Transport *TMemoryBuffer
 	Protocol  TProtocol
@@ -38,35 +42,35 @@ func NewTSerializer() *TSerializer {
 		protocol}
 }
 
-func (t *TSerializer) WriteString(msg TStruct) (s string, err error) {
+func (t *TSerializer) WriteString(ctx context.Context, msg TStruct) (s string, err error) {
 	t.Transport.Reset()
 
 	if err = msg.Write(t.Protocol); err != nil {
 		return
 	}
 
-	if err = t.Protocol.Flush(); err != nil {
+	if err = t.Protocol.Flush(ctx); err != nil {
 		return
 	}
-	if err = t.Transport.Flush(); err != nil {
+	if err = t.Transport.Flush(ctx); err != nil {
 		return
 	}
 
 	return t.Transport.String(), nil
 }
 
-func (t *TSerializer) Write(msg TStruct) (b []byte, err error) {
+func (t *TSerializer) Write(ctx context.Context, msg TStruct) (b []byte, err error) {
 	t.Transport.Reset()
 
 	if err = msg.Write(t.Protocol); err != nil {
 		return
 	}
 
-	if err = t.Protocol.Flush(); err != nil {
+	if err = t.Protocol.Flush(ctx); err != nil {
 		return
 	}
 
-	if err = t.Transport.Flush(); err != nil {
+	if err = t.Transport.Flush(ctx); err != nil {
 		return
 	}
 
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/serializer_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/serializer_test.go
similarity index 97%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/serializer_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/serializer_test.go
index 06d27a1..32227ef 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/serializer_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/serializer_test.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"testing"
@@ -88,7 +89,7 @@ func ProtocolTest1(test *testing.T, pf ProtocolFactory) (bool, error) {
 	m.StringSet = make(map[string]struct{}, 5)
 	m.E = 2
 
-	s, err := t.WriteString(&m)
+	s, err := t.WriteString(context.Background(), &m)
 	if err != nil {
 		return false, errors.New(fmt.Sprintf("Unable to Serialize struct\n\t %s", err))
 	}
@@ -122,7 +123,7 @@ func ProtocolTest2(test *testing.T, pf ProtocolFactory) (bool, error) {
 	m.StringSet = make(map[string]struct{}, 5)
 	m.E = 2
 
-	s, err := t.WriteString(&m)
+	s, err := t.WriteString(context.Background(), &m)
 	if err != nil {
 		return false, errors.New(fmt.Sprintf("Unable to Serialize struct\n\t %s", err))
 
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/serializer_types_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/serializer_types_test.go
similarity index 99%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/serializer_types_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/serializer_types_test.go
index c8e3b3b..ef7cc3a 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/serializer_types_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/serializer_types_test.go
@@ -19,7 +19,7 @@
 
 package thrift
 
-// Autogenerated by Thrift Compiler (1.0.0-dev)
+// Autogenerated by Thrift Compiler (0.12.0)
 // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 
 /* THE FOLLOWING THRIFT FILE WAS USED TO CREATE THIS
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/server.go b/vendor/github.com/apache/thrift/lib/go/thrift/server.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/server.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/server.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/server_socket.go b/vendor/github.com/apache/thrift/lib/go/thrift/server_socket.go
similarity index 85%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/server_socket.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/server_socket.go
index d6e9495..7dd24ae 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/server_socket.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/server_socket.go
@@ -47,7 +47,14 @@ func NewTServerSocketTimeout(listenAddr string, clientTimeout time.Duration) (*T
 	return &TServerSocket{addr: addr, clientTimeout: clientTimeout}, nil
 }
 
+// Creates a TServerSocket from a net.Addr
+func NewTServerSocketFromAddrTimeout(addr net.Addr, clientTimeout time.Duration) *TServerSocket {
+	return &TServerSocket{addr: addr, clientTimeout: clientTimeout}
+}
+
 func (p *TServerSocket) Listen() error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
 	if p.IsListening() {
 		return nil
 	}
@@ -67,10 +74,15 @@ func (p *TServerSocket) Accept() (TTransport, error) {
 	if interrupted {
 		return nil, errTransportInterrupted
 	}
-	if p.listener == nil {
+
+	p.mu.Lock()
+	listener := p.listener
+	p.mu.Unlock()
+	if listener == nil {
 		return nil, NewTTransportException(NOT_OPEN, "No underlying server socket")
 	}
-	conn, err := p.listener.Accept()
+
+	conn, err := listener.Accept()
 	if err != nil {
 		return nil, NewTTransportExceptionFromError(err)
 	}
@@ -84,6 +96,8 @@ func (p *TServerSocket) IsListening() bool {
 
 // Connects the socket, creating a new socket object if necessary.
 func (p *TServerSocket) Open() error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
 	if p.IsListening() {
 		return NewTTransportException(ALREADY_OPEN, "Server socket already open")
 	}
@@ -103,20 +117,21 @@ func (p *TServerSocket) Addr() net.Addr {
 }
 
 func (p *TServerSocket) Close() error {
-	defer func() {
-		p.listener = nil
-	}()
+	var err error
+	p.mu.Lock()
 	if p.IsListening() {
-		return p.listener.Close()
+		err = p.listener.Close()
+		p.listener = nil
 	}
-	return nil
+	p.mu.Unlock()
+	return err
 }
 
 func (p *TServerSocket) Interrupt() error {
 	p.mu.Lock()
 	p.interrupted = true
-	p.Close()
 	p.mu.Unlock()
+	p.Close()
 
 	return nil
 }
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/server_socket_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/server_socket_test.go
similarity index 85%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/server_socket_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/server_socket_test.go
index f08e8e9..f1e1983 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/server_socket_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/server_socket_test.go
@@ -41,6 +41,16 @@ func TestSocketIsntListeningAfterInterrupt(t *testing.T) {
 	}
 }
 
+func TestSocketConcurrency(t *testing.T) {
+	host := "127.0.0.1"
+	port := 9090
+	addr := fmt.Sprintf("%s:%d", host, port)
+
+	socket := CreateServerSocket(t, addr)
+	go func() { socket.Listen() }()
+	go func() { socket.Interrupt() }()
+}
+
 func CreateServerSocket(t *testing.T, addr string) *TServerSocket {
 	socket, err := NewTServerSocket(addr)
 	if err != nil {
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/server_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/server_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/server_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/server_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/server_transport.go b/vendor/github.com/apache/thrift/lib/go/thrift/server_transport.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/server_transport.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/server_transport.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/simple_json_protocol.go b/vendor/github.com/apache/thrift/lib/go/thrift/simple_json_protocol.go
similarity index 99%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/simple_json_protocol.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/simple_json_protocol.go
index 7353322..2e8a711 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/simple_json_protocol.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/simple_json_protocol.go
@@ -22,6 +22,7 @@ package thrift
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -552,7 +553,7 @@ func (p *TSimpleJSONProtocol) ReadBinary() ([]byte, error) {
 	return v, p.ParsePostValue()
 }
 
-func (p *TSimpleJSONProtocol) Flush() (err error) {
+func (p *TSimpleJSONProtocol) Flush(ctx context.Context) (err error) {
 	return NewTProtocolException(p.writer.Flush())
 }
 
@@ -1064,7 +1065,7 @@ func (p *TSimpleJSONProtocol) ParseListEnd() error {
 	for _, char := range line {
 		switch char {
 		default:
-			e := fmt.Errorf("Expecting end of list \"]\", but found: \"", line, "\"")
+			e := fmt.Errorf("Expecting end of list \"]\", but found: \"%v\"", line)
 			return NewTProtocolExceptionWithType(INVALID_DATA, e)
 		case ' ', '\n', '\r', '\t', rune(JSON_RBRACKET[0]):
 			break
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/simple_json_protocol_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/simple_json_protocol_test.go
similarity index 95%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/simple_json_protocol_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/simple_json_protocol_test.go
index 8f0dcc9..7b98082 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/simple_json_protocol_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/simple_json_protocol_test.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -37,7 +38,7 @@ func TestWriteSimpleJSONProtocolBool(t *testing.T) {
 		if e := p.WriteBool(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -63,7 +64,7 @@ func TestReadSimpleJSONProtocolBool(t *testing.T) {
 		} else {
 			trans.Write(JSON_FALSE)
 		}
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadBool()
 		if e != nil {
@@ -88,7 +89,7 @@ func TestWriteSimpleJSONProtocolByte(t *testing.T) {
 		if e := p.WriteByte(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -110,7 +111,7 @@ func TestReadSimpleJSONProtocolByte(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTSimpleJSONProtocol(trans)
 		trans.WriteString(strconv.Itoa(int(value)))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadByte()
 		if e != nil {
@@ -135,7 +136,7 @@ func TestWriteSimpleJSONProtocolI16(t *testing.T) {
 		if e := p.WriteI16(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -157,7 +158,7 @@ func TestReadSimpleJSONProtocolI16(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTSimpleJSONProtocol(trans)
 		trans.WriteString(strconv.Itoa(int(value)))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadI16()
 		if e != nil {
@@ -182,7 +183,7 @@ func TestWriteSimpleJSONProtocolI32(t *testing.T) {
 		if e := p.WriteI32(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -204,7 +205,7 @@ func TestReadSimpleJSONProtocolI32(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTSimpleJSONProtocol(trans)
 		trans.WriteString(strconv.Itoa(int(value)))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadI32()
 		if e != nil {
@@ -228,7 +229,7 @@ func TestReadSimpleJSONProtocolI32Null(t *testing.T) {
 	trans := NewTMemoryBuffer()
 	p := NewTSimpleJSONProtocol(trans)
 	trans.WriteString(value)
-	trans.Flush()
+	trans.Flush(context.Background())
 	s := trans.String()
 	v, e := p.ReadI32()
 
@@ -250,7 +251,7 @@ func TestWriteSimpleJSONProtocolI64(t *testing.T) {
 		if e := p.WriteI64(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -272,7 +273,7 @@ func TestReadSimpleJSONProtocolI64(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTSimpleJSONProtocol(trans)
 		trans.WriteString(strconv.FormatInt(value, 10))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadI64()
 		if e != nil {
@@ -296,7 +297,7 @@ func TestReadSimpleJSONProtocolI64Null(t *testing.T) {
 	trans := NewTMemoryBuffer()
 	p := NewTSimpleJSONProtocol(trans)
 	trans.WriteString(value)
-	trans.Flush()
+	trans.Flush(context.Background())
 	s := trans.String()
 	v, e := p.ReadI64()
 
@@ -318,7 +319,7 @@ func TestWriteSimpleJSONProtocolDouble(t *testing.T) {
 		if e := p.WriteDouble(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -355,7 +356,7 @@ func TestReadSimpleJSONProtocolDouble(t *testing.T) {
 		p := NewTSimpleJSONProtocol(trans)
 		n := NewNumericFromDouble(value)
 		trans.WriteString(n.String())
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadDouble()
 		if e != nil {
@@ -394,7 +395,7 @@ func TestWriteSimpleJSONProtocolString(t *testing.T) {
 		if e := p.WriteString(value); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 		}
-		if e := p.Flush(); e != nil {
+		if e := p.Flush(context.Background()); e != nil {
 			t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 		}
 		s := trans.String()
@@ -416,7 +417,7 @@ func TestReadSimpleJSONProtocolString(t *testing.T) {
 		trans := NewTMemoryBuffer()
 		p := NewTSimpleJSONProtocol(trans)
 		trans.WriteString(jsonQuote(value))
-		trans.Flush()
+		trans.Flush(context.Background())
 		s := trans.String()
 		v, e := p.ReadString()
 		if e != nil {
@@ -440,7 +441,7 @@ func TestReadSimpleJSONProtocolStringNull(t *testing.T) {
 	trans := NewTMemoryBuffer()
 	p := NewTSimpleJSONProtocol(trans)
 	trans.WriteString(value)
-	trans.Flush()
+	trans.Flush(context.Background())
 	s := trans.String()
 	v, e := p.ReadString()
 	if e != nil {
@@ -464,7 +465,7 @@ func TestWriteSimpleJSONProtocolBinary(t *testing.T) {
 	if e := p.WriteBinary(value); e != nil {
 		t.Fatalf("Unable to write %s value %v due to error: %s", thetype, value, e.Error())
 	}
-	if e := p.Flush(); e != nil {
+	if e := p.Flush(context.Background()); e != nil {
 		t.Fatalf("Unable to write %s value %v due to error flushing: %s", thetype, value, e.Error())
 	}
 	s := trans.String()
@@ -487,7 +488,7 @@ func TestReadSimpleJSONProtocolBinary(t *testing.T) {
 	trans := NewTMemoryBuffer()
 	p := NewTSimpleJSONProtocol(trans)
 	trans.WriteString(jsonQuote(b64String))
-	trans.Flush()
+	trans.Flush(context.Background())
 	s := trans.String()
 	v, e := p.ReadBinary()
 	if e != nil {
@@ -516,7 +517,7 @@ func TestReadSimpleJSONProtocolBinaryNull(t *testing.T) {
 	trans := NewTMemoryBuffer()
 	p := NewTSimpleJSONProtocol(trans)
 	trans.WriteString(value)
-	trans.Flush()
+	trans.Flush(context.Background())
 	s := trans.String()
 	b, e := p.ReadBinary()
 	v := string(b)
@@ -542,7 +543,7 @@ func TestWriteSimpleJSONProtocolList(t *testing.T) {
 		}
 	}
 	p.WriteListEnd()
-	if e := p.Flush(); e != nil {
+	if e := p.Flush(context.Background()); e != nil {
 		t.Fatalf("Unable to write %s due to error flushing: %s", thetype, e.Error())
 	}
 	str := trans.String()
@@ -596,7 +597,7 @@ func TestWriteSimpleJSONProtocolSet(t *testing.T) {
 		}
 	}
 	p.WriteSetEnd()
-	if e := p.Flush(); e != nil {
+	if e := p.Flush(context.Background()); e != nil {
 		t.Fatalf("Unable to write %s due to error flushing: %s", thetype, e.Error())
 	}
 	str := trans.String()
@@ -653,12 +654,12 @@ func TestWriteSimpleJSONProtocolMap(t *testing.T) {
 		}
 	}
 	p.WriteMapEnd()
-	if e := p.Flush(); e != nil {
+	if e := p.Flush(context.Background()); e != nil {
 		t.Fatalf("Unable to write %s due to error flushing: %s", thetype, e.Error())
 	}
 	str := trans.String()
 	if str[0] != '[' || str[len(str)-1] != ']' {
-		t.Fatalf("Bad value for %s, wrote: %q, in go: %q", thetype, str, DOUBLE_VALUES)
+		t.Fatalf("Bad value for %s, wrote: %v, in go: %v", thetype, str, DOUBLE_VALUES)
 	}
 	l := strings.Split(str[1:len(str)-1], ",")
 	if len(l) < 3 {
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/simple_server.go b/vendor/github.com/apache/thrift/lib/go/thrift/simple_server.go
similarity index 81%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/simple_server.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/simple_server.go
index 1d35b23..6035802 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/simple_server.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/simple_server.go
@@ -23,11 +23,18 @@ import (
 	"log"
 	"runtime/debug"
 	"sync"
+	"sync/atomic"
 )
 
-// Simple, non-concurrent server for testing.
+/*
+ * This is not a typical TSimpleServer as it is not blocked after accept a socket.
+ * It is more like a TThreadedServer that can handle different connections in different goroutines.
+ * This will work if golang user implements a conn-pool like thing in client side.
+ */
 type TSimpleServer struct {
-	quit chan struct{}
+	closed int32
+	wg     sync.WaitGroup
+	mu     sync.Mutex
 
 	processorFactory       TProcessorFactory
 	serverTransport        TServerTransport
@@ -87,7 +94,6 @@ func NewTSimpleServerFactory6(processorFactory TProcessorFactory, serverTranspor
 		outputTransportFactory: outputTransportFactory,
 		inputProtocolFactory:   inputProtocolFactory,
 		outputProtocolFactory:  outputProtocolFactory,
-		quit: make(chan struct{}, 1),
 	}
 }
 
@@ -119,23 +125,37 @@ func (p *TSimpleServer) Listen() error {
 	return p.serverTransport.Listen()
 }
 
+func (p *TSimpleServer) innerAccept() (int32, error) {
+	client, err := p.serverTransport.Accept()
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	closed := atomic.LoadInt32(&p.closed)
+	if closed != 0 {
+		return closed, nil
+	}
+	if err != nil {
+		return 0, err
+	}
+	if client != nil {
+		p.wg.Add(1)
+		go func() {
+			defer p.wg.Done()
+			if err := p.processRequests(client); err != nil {
+				log.Println("error processing request:", err)
+			}
+		}()
+	}
+	return 0, nil
+}
+
 func (p *TSimpleServer) AcceptLoop() error {
 	for {
-		client, err := p.serverTransport.Accept()
+		closed, err := p.innerAccept()
 		if err != nil {
-			select {
-			case <-p.quit:
-				return nil
-			default:
-			}
 			return err
 		}
-		if client != nil {
-			go func() {
-				if err := p.processRequests(client); err != nil {
-					log.Println("error processing request:", err)
-				}
-			}()
+		if closed != 0 {
+			return nil
 		}
 	}
 }
@@ -149,14 +169,15 @@ func (p *TSimpleServer) Serve() error {
 	return nil
 }
 
-var once sync.Once
-
 func (p *TSimpleServer) Stop() error {
-	q := func() {
-		p.quit <- struct{}{}
-		p.serverTransport.Interrupt()
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	if atomic.LoadInt32(&p.closed) != 0 {
+		return nil
 	}
-	once.Do(q)
+	atomic.StoreInt32(&p.closed, 1)
+	p.serverTransport.Interrupt()
+	p.wg.Wait()
 	return nil
 }
 
@@ -177,6 +198,7 @@ func (p *TSimpleServer) processRequests(client TTransport) error {
 			log.Printf("panic in processor: %s: %s", e, debug.Stack())
 		}
 	}()
+
 	if inputTransport != nil {
 		defer inputTransport.Close()
 	}
@@ -184,17 +206,20 @@ func (p *TSimpleServer) processRequests(client TTransport) error {
 		defer outputTransport.Close()
 	}
 	for {
-		ok, err := processor.Process(inputProtocol, outputProtocol)
+		if atomic.LoadInt32(&p.closed) != 0 {
+			return nil
+		}
+
+		ok, err := processor.Process(defaultCtx, inputProtocol, outputProtocol)
 		if err, ok := err.(TTransportException); ok && err.TypeId() == END_OF_FILE {
 			return nil
 		} else if err != nil {
-			log.Printf("error processing request: %s", err)
 			return err
 		}
 		if err, ok := err.(TApplicationException); ok && err.TypeId() == UNKNOWN_METHOD {
 			continue
 		}
- 		if !ok {
+		if !ok {
 			break
 		}
 	}
diff --git a/vendor/github.com/apache/thrift/lib/go/thrift/simple_server_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/simple_server_test.go
new file mode 100644
index 0000000..58149a8
--- /dev/null
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/simple_server_test.go
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package thrift
+
+import (
+	"testing"
+	"errors"
+	"runtime"
+)
+
+type mockServerTransport struct {
+	ListenFunc    func() error
+	AcceptFunc    func() (TTransport, error)
+	CloseFunc     func() error
+	InterruptFunc func() error
+}
+
+func (m *mockServerTransport) Listen() error {
+	return m.ListenFunc()
+}
+
+func (m *mockServerTransport) Accept() (TTransport, error) {
+	return m.AcceptFunc()
+}
+
+func (m *mockServerTransport) Close() error {
+	return m.CloseFunc()
+}
+
+func (m *mockServerTransport) Interrupt() error {
+	return m.InterruptFunc()
+}
+
+type mockTTransport struct {
+	TTransport
+}
+
+func (m *mockTTransport) Close() error {
+	return nil
+}
+
+func TestMultipleStop(t *testing.T) {
+	proc := &mockProcessor{
+		ProcessFunc: func(in, out TProtocol) (bool, TException) {
+			return false, nil
+		},
+	}
+
+	var interruptCalled bool
+	c := make(chan struct{})
+	trans := &mockServerTransport{
+		ListenFunc: func() error {
+			return nil
+		},
+		AcceptFunc: func() (TTransport, error) {
+			<-c
+			return nil, nil
+		},
+		CloseFunc: func() error {
+			c <- struct{}{}
+			return nil
+		},
+		InterruptFunc: func() error {
+			interruptCalled = true
+			return nil
+		},
+	}
+
+	serv := NewTSimpleServer2(proc, trans)
+	go serv.Serve()
+	serv.Stop()
+	if !interruptCalled {
+		t.Error("first server transport should have been interrupted")
+	}
+
+	serv = NewTSimpleServer2(proc, trans)
+	interruptCalled = false
+	go serv.Serve()
+	serv.Stop()
+	if !interruptCalled {
+		t.Error("second server transport should have been interrupted")
+	}
+}
+
+func TestWaitRace(t *testing.T) {
+	proc := &mockProcessor{
+		ProcessFunc: func(in, out TProtocol) (bool, TException) {
+			return false, nil
+		},
+	}
+
+	trans := &mockServerTransport{
+		ListenFunc: func() error {
+			return nil
+		},
+		AcceptFunc: func() (TTransport, error) {
+			return &mockTTransport{}, nil
+		},
+		CloseFunc: func() error {
+			return nil
+		},
+		InterruptFunc: func() error {
+			return nil
+		},
+	}
+
+	serv := NewTSimpleServer2(proc, trans)
+	go serv.Serve()
+	runtime.Gosched()
+	serv.Stop()
+}
+
+func TestNoHangDuringStopFromDanglingLockAcquireDuringAcceptLoop(t *testing.T) {
+	proc := &mockProcessor{
+		ProcessFunc: func(in, out TProtocol) (bool, TException) {
+			return false, nil
+		},
+	}
+
+	trans := &mockServerTransport{
+		ListenFunc: func() error {
+			return nil
+		},
+		AcceptFunc: func() (TTransport, error) {
+			return nil, errors.New("no sir")
+		},
+		CloseFunc: func() error {
+			return nil
+		},
+		InterruptFunc: func() error {
+			return nil
+		},
+	}
+
+	serv := NewTSimpleServer2(proc, trans)
+	go serv.Serve()
+	runtime.Gosched()
+	serv.Stop()
+}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/socket.go b/vendor/github.com/apache/thrift/lib/go/thrift/socket.go
similarity index 98%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/socket.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/socket.go
index 383b1fe..8854279 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/socket.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/socket.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"net"
 	"time"
 )
@@ -148,7 +149,7 @@ func (p *TSocket) Write(buf []byte) (int, error) {
 	return p.conn.Write(buf)
 }
 
-func (p *TSocket) Flush() error {
+func (p *TSocket) Flush(ctx context.Context) error {
 	return nil
 }
 
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/ssl_server_socket.go b/vendor/github.com/apache/thrift/lib/go/thrift/ssl_server_socket.go
similarity index 97%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/ssl_server_socket.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/ssl_server_socket.go
index 58f859b..907afca 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/ssl_server_socket.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/ssl_server_socket.go
@@ -20,9 +20,9 @@
 package thrift
 
 import (
+	"crypto/tls"
 	"net"
 	"time"
-	"crypto/tls"
 )
 
 type TSSLServerSocket struct {
@@ -38,6 +38,9 @@ func NewTSSLServerSocket(listenAddr string, cfg *tls.Config) (*TSSLServerSocket,
 }
 
 func NewTSSLServerSocketTimeout(listenAddr string, cfg *tls.Config, clientTimeout time.Duration) (*TSSLServerSocket, error) {
+	if cfg.MinVersion == 0 {
+		cfg.MinVersion = tls.VersionTLS10
+	}
 	addr, err := net.ResolveTCPAddr("tcp", listenAddr)
 	if err != nil {
 		return nil, err
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/ssl_socket.go b/vendor/github.com/apache/thrift/lib/go/thrift/ssl_socket.go
similarity index 92%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/ssl_socket.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/ssl_socket.go
index 86a68a3..ba63377 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/ssl_socket.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/ssl_socket.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"crypto/tls"
 	"net"
 	"time"
@@ -48,6 +49,9 @@ func NewTSSLSocket(hostPort string, cfg *tls.Config) (*TSSLSocket, error) {
 // NewTSSLSocketTimeout creates a net.Conn-backed TTransport, given a host and port
 // it also accepts a tls Configuration and a timeout as a time.Duration
 func NewTSSLSocketTimeout(hostPort string, cfg *tls.Config, timeout time.Duration) (*TSSLSocket, error) {
+	if cfg.MinVersion == 0 {
+		cfg.MinVersion = tls.VersionTLS10
+	}
 	return &TSSLSocket{hostPort: hostPort, timeout: timeout, cfg: cfg}, nil
 }
 
@@ -87,7 +91,8 @@ func (p *TSSLSocket) Open() error {
 	// If we have a hostname, we need to pass the hostname to tls.Dial for
 	// certificate hostname checks.
 	if p.hostPort != "" {
-		if p.conn, err = tls.Dial("tcp", p.hostPort, p.cfg); err != nil {
+		if p.conn, err = tls.DialWithDialer(&net.Dialer{
+			Timeout: p.timeout}, "tcp", p.hostPort, p.cfg); err != nil {
 			return NewTTransportException(NOT_OPEN, err.Error())
 		}
 	} else {
@@ -103,7 +108,8 @@ func (p *TSSLSocket) Open() error {
 		if len(p.addr.String()) == 0 {
 			return NewTTransportException(NOT_OPEN, "Cannot open bad address.")
 		}
-		if p.conn, err = tls.Dial(p.addr.Network(), p.addr.String(), p.cfg); err != nil {
+		if p.conn, err = tls.DialWithDialer(&net.Dialer{
+			Timeout: p.timeout}, p.addr.Network(), p.addr.String(), p.cfg); err != nil {
 			return NewTTransportException(NOT_OPEN, err.Error())
 		}
 	}
@@ -153,7 +159,7 @@ func (p *TSSLSocket) Write(buf []byte) (int, error) {
 	return p.conn.Write(buf)
 }
 
-func (p *TSSLSocket) Flush() error {
+func (p *TSSLSocket) Flush(ctx context.Context) error {
 	return nil
 }
 
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/transport.go b/vendor/github.com/apache/thrift/lib/go/thrift/transport.go
similarity index 93%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/transport.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/transport.go
index 70a85a8..ba2738a 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/transport.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/transport.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"errors"
 	"io"
 )
@@ -30,6 +31,10 @@ type Flusher interface {
 	Flush() (err error)
 }
 
+type ContextFlusher interface {
+	Flush(ctx context.Context) (err error)
+}
+
 type ReadSizeProvider interface {
 	RemainingBytes() (num_bytes uint64)
 }
@@ -37,7 +42,7 @@ type ReadSizeProvider interface {
 // Encapsulates the I/O layer
 type TTransport interface {
 	io.ReadWriteCloser
-	Flusher
+	ContextFlusher
 	ReadSizeProvider
 
 	// Opens the transport for communication
@@ -60,6 +65,6 @@ type TRichTransport interface {
 	io.ByteReader
 	io.ByteWriter
 	stringWriter
-	Flusher
+	ContextFlusher
 	ReadSizeProvider
 }
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/transport_exception.go b/vendor/github.com/apache/thrift/lib/go/thrift/transport_exception.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/transport_exception.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/transport_exception.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/transport_exception_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/transport_exception_test.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/transport_exception_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/transport_exception_test.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/transport_factory.go b/vendor/github.com/apache/thrift/lib/go/thrift/transport_factory.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/transport_factory.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/transport_factory.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/transport_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/transport_test.go
similarity index 97%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/transport_test.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/transport_test.go
index 864958a..0127803 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/transport_test.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/transport_test.go
@@ -20,6 +20,7 @@
 package thrift
 
 import (
+	"context"
 	"io"
 	"net"
 	"strconv"
@@ -54,7 +55,7 @@ func TransportTest(t *testing.T, writeTrans TTransport, readTrans TTransport) {
 	if err != nil {
 		t.Fatalf("Transport %T cannot write binary data of length %d: %s", writeTrans, len(transport_bdata), err)
 	}
-	err = writeTrans.Flush()
+	err = writeTrans.Flush(context.Background())
 	if err != nil {
 		t.Fatalf("Transport %T cannot flush write of binary data: %s", writeTrans, err)
 	}
@@ -74,7 +75,7 @@ func TransportTest(t *testing.T, writeTrans TTransport, readTrans TTransport) {
 	if err != nil {
 		t.Fatalf("Transport %T cannot write binary data 2 of length %d: %s", writeTrans, len(transport_bdata), err)
 	}
-	err = writeTrans.Flush()
+	err = writeTrans.Flush(context.Background())
 	if err != nil {
 		t.Fatalf("Transport %T cannot flush write binary data 2: %s", writeTrans, err)
 	}
@@ -113,7 +114,7 @@ func TransportHeaderTest(t *testing.T, writeTrans TTransport, readTrans TTranspo
 	if err != nil {
 		t.Fatalf("Transport %T cannot write binary data of length %d: %s", writeTrans, len(transport_bdata), err)
 	}
-	err = writeTrans.Flush()
+	err = writeTrans.Flush(context.Background())
 	if err != nil {
 		t.Fatalf("Transport %T cannot flush write of binary data: %s", writeTrans, err)
 	}
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/type.go b/vendor/github.com/apache/thrift/lib/go/thrift/type.go
similarity index 100%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/type.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/type.go
diff --git a/vendor/git.apache.org/thrift.git/lib/go/thrift/zlib_transport.go b/vendor/github.com/apache/thrift/lib/go/thrift/zlib_transport.go
similarity index 82%
rename from vendor/git.apache.org/thrift.git/lib/go/thrift/zlib_transport.go
rename to vendor/github.com/apache/thrift/lib/go/thrift/zlib_transport.go
index 6f477ca..f3d4267 100644
--- a/vendor/git.apache.org/thrift.git/lib/go/thrift/zlib_transport.go
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/zlib_transport.go
@@ -21,13 +21,15 @@ package thrift
 
 import (
 	"compress/zlib"
+	"context"
 	"io"
 	"log"
 )
 
 // TZlibTransportFactory is a factory for TZlibTransport instances
 type TZlibTransportFactory struct {
-	level int
+	level   int
+	factory TTransportFactory
 }
 
 // TZlibTransport is a TTransport implementation that makes use of zlib compression.
@@ -39,12 +41,26 @@ type TZlibTransport struct {
 
 // GetTransport constructs a new instance of NewTZlibTransport
 func (p *TZlibTransportFactory) GetTransport(trans TTransport) (TTransport, error) {
+	if p.factory != nil {
+		// wrap other factory
+		var err error
+		trans, err = p.factory.GetTransport(trans)
+		if err != nil {
+			return nil, err
+		}
+	}
 	return NewTZlibTransport(trans, p.level)
 }
 
 // NewTZlibTransportFactory constructs a new instance of NewTZlibTransportFactory
 func NewTZlibTransportFactory(level int) *TZlibTransportFactory {
-	return &TZlibTransportFactory{level: level}
+	return &TZlibTransportFactory{level: level, factory: nil}
+}
+
+// NewTZlibTransportFactory constructs a new instance of TZlibTransportFactory
+// as a wrapper over existing transport factory
+func NewTZlibTransportFactoryWithFactory(level int, factory TTransportFactory) *TZlibTransportFactory {
+	return &TZlibTransportFactory{level: level, factory: factory}
 }
 
 // NewTZlibTransport constructs a new instance of TZlibTransport
@@ -76,11 +92,11 @@ func (z *TZlibTransport) Close() error {
 }
 
 // Flush flushes the writer and its underlying transport.
-func (z *TZlibTransport) Flush() error {
+func (z *TZlibTransport) Flush(ctx context.Context) error {
 	if err := z.writer.Flush(); err != nil {
 		return err
 	}
-	return z.transport.Flush()
+	return z.transport.Flush(ctx)
 }
 
 // IsOpen returns true if the transport is open
diff --git a/vendor/github.com/apache/thrift/lib/go/thrift/zlib_transport_test.go b/vendor/github.com/apache/thrift/lib/go/thrift/zlib_transport_test.go
new file mode 100644
index 0000000..3c6f11e
--- /dev/null
+++ b/vendor/github.com/apache/thrift/lib/go/thrift/zlib_transport_test.go
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package thrift
+
+import (
+	"compress/zlib"
+	"testing"
+)
+
+func TestZlibTransport(t *testing.T) {
+	trans, err := NewTZlibTransport(NewTMemoryBuffer(), zlib.BestCompression)
+	if err != nil {
+		t.Fatal(err)
+	}
+	TransportTest(t, trans, trans)
+}
+
+type DummyTransportFactory struct{}
+
+func (p *DummyTransportFactory) GetTransport(trans TTransport) (TTransport, error) {
+	return NewTMemoryBuffer(), nil
+}
+
+func TestZlibFactoryTransportWithFactory(t *testing.T) {
+	factory := NewTZlibTransportFactoryWithFactory(
+		zlib.BestCompression,
+		&DummyTransportFactory{},
+	)
+	buffer := NewTMemoryBuffer()
+	trans, err := factory.GetTransport(buffer)
+	if err != nil {
+		t.Fatal(err)
+	}
+	TransportTest(t, trans, trans)
+}
+
+func TestZlibFactoryTransportWithoutFactory(t *testing.T) {
+	factory := NewTZlibTransportFactoryWithFactory(zlib.BestCompression, nil)
+	buffer := NewTMemoryBuffer()
+	trans, err := factory.GetTransport(buffer)
+	if err != nil {
+		t.Fatal(err)
+	}
+	TransportTest(t, trans, trans)
+}